From 944becf56da5bf79fcd149e4dcfbf44eb7205ac8 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 18 Oct 2024 13:54:04 -0700 Subject: [PATCH] Reformat previously untouched files --- src/overlay019/ov19_021D0D80.c | 936 ++++++++++++++++---------------- src/overlay020/ov20_021D4728.c | 104 ++-- src/overlay022/ov22_02259C58.c | 98 ++-- src/overlay023/ov23_02253598.c | 92 ++-- src/overlay062/ov62_02231690.c | 528 +++++++++--------- src/overlay062/ov62_02237D24.c | 271 ++++----- src/overlay112/ov112_0225C700.c | 280 +++++----- src/overlay117/ov117_02260668.c | 350 ++++++------ src/unk_02089604.c | 72 +-- 9 files changed, 1368 insertions(+), 1363 deletions(-) diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index 5b8cb19c75..cdd72bf7a4 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -1,33 +1,22 @@ -#include "enums.h" +#include "overlay019/ov19_021D0D80.h" #include #include -#include "inlines.h" -#include "core_sys.h" - #include "constants/species.h" -#include "message.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "struct_defs/chatot_cry.h" -#include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" -#include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207CB08_decl.h" -#include "savedata.h" -#include "overlay019/struct_ov19_021D61B0_decl.h" - -#include "constdata/const_020F410C.h" -#include "overlay084/const_ov84_02241130.h" -#include "constdata/const_020F2DAC.h" - - -#include "touch_screen.h" +#include "struct_decls/struct_party_decl.h" +#include "struct_defs/chatot_cry.h" +#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02042434.h" #include "struct_defs/struct_0208737C.h" -#include "struct_defs/pokemon_summary.h" + +#include "overlay019/ov19_021D603C.h" +#include "overlay019/ov19_021D61B0.h" +#include "overlay019/ov19_021DF964.h" #include "overlay019/struct_ov19_021D3CFC.h" #include "overlay019/struct_ov19_021D4DE4.h" #include "overlay019/struct_ov19_021D4DF0.h" @@ -39,59 +28,65 @@ #include "overlay019/struct_ov19_021D5D20.h" #include "overlay019/struct_ov19_021D5FAC.h" #include "overlay019/struct_ov19_021D6104.h" +#include "overlay019/struct_ov19_021D61B0_decl.h" +#include "overlay084/const_ov84_02241130.h" +#include "savedata/save_table.h" -#include "unk_02005474.h" +#include "bag.h" +#include "core_sys.h" +#include "enums.h" +#include "game_options.h" #include "game_overlay.h" -#include "overlay_manager.h" +#include "heap.h" +#include "inlines.h" +#include "item.h" #include "message.h" +#include "overlay_manager.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" +#include "save_player.h" +#include "savedata.h" +#include "strbuf.h" #include "string_template.h" #include "sys_task.h" -#include "heap.h" -#include "strbuf.h" +#include "sys_task_manager.h" +#include "touch_screen.h" +#include "unk_02005474.h" #include "unk_02023FCC.h" -#include "savedata/save_table.h" -#include "savedata.h" -#include "save_player.h" -#include "game_options.h" #include "unk_0202CC64.h" #include "unk_0202D778.h" -#include "pokemon.h" #include "unk_020797C8.h" -#include "party.h" #include "unk_0207A274.h" #include "unk_0207CB08.h" -#include "item.h" -#include "bag.h" #include "unk_0208694C.h" -#include "pokemon_summary_app.h" -#include "overlay019/ov19_021D0D80.h" -#include "overlay019/ov19_021D603C.h" -#include "overlay019/ov19_021D61B0.h" -#include "overlay019/ov19_021DF964.h" + +#include "constdata/const_020F2DAC.h" +#include "constdata/const_020F410C.h" FS_EXTERN_OVERLAY(overlay84); static const TouchScreenHitTable Unk_ov19_021DFDF6[] = { - {0xFE, 0x0, 0xB8, 0x28}, - {0xFE, 0xFF, 0xB8, 0x28}, - {0xFF, 0x0, 0x0, 0x0} + { 0xFE, 0x0, 0xB8, 0x28 }, + { 0xFE, 0xFF, 0xB8, 0x28 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenHitTable Unk_ov19_021DFE02[] = { - {0xFE, 0x0, 0xB8, 0x28}, - {0xFE, 0xFF, 0xB8, 0x28}, - {0xFE, 0x80, 0xB2, 0xC}, - {0xFF, 0x0, 0x0, 0x0} + { 0xFE, 0x0, 0xB8, 0x28 }, + { 0xFE, 0xFF, 0xB8, 0x28 }, + { 0xFE, 0x80, 0xB2, 0xC }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenHitTable Unk_ov19_021DFE12[] = { - {0xFE, 0x98, 0xA8, 0x10}, - {0xFE, 0xA3, 0x86, 0x10}, - {0xFE, 0xB8, 0x68, 0x10}, - {0xFE, 0xD8, 0x54, 0x10}, - {0xFE, 0xF0, 0x34, 0x10}, - {0xFE, 0xF0, 0x10, 0x10}, - {0xFF, 0x0, 0x0, 0x0} + { 0xFE, 0x98, 0xA8, 0x10 }, + { 0xFE, 0xA3, 0x86, 0x10 }, + { 0xFE, 0xB8, 0x68, 0x10 }, + { 0xFE, 0xD8, 0x54, 0x10 }, + { 0xFE, 0xF0, 0x34, 0x10 }, + { 0xFE, 0xF0, 0x10, 0x10 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const u16 Unk_ov19_021DFDF0[] = { @@ -114,35 +109,35 @@ typedef struct { u8 unk_03; u8 unk_04[NELEMS(Unk_ov19_021DFDF0)]; u16 unk_08[NELEMS(Unk_ov19_021DFDF0)]; - BoxPokemon * unk_10; - PCBoxes * unk_14; - Party * unk_18; + BoxPokemon *unk_10; + PCBoxes *unk_14; + Party *unk_18; BOOL unk_1C; } UnkStruct_ov19_021D38E0; typedef struct UnkStruct_ov19_021D5DF8_t { UnkStruct_ov19_021D4DF0 unk_00; - UnkStruct_ov19_021D61B0 * unk_114; - UnkStruct_02042434 * unk_118; - SaveData * unk_11C; - PCBoxes * unk_120; - Party * unk_124; - UnkStruct_0208737C * unk_128; + UnkStruct_ov19_021D61B0 *unk_114; + UnkStruct_02042434 *unk_118; + SaveData *unk_11C; + PCBoxes *unk_120; + Party *unk_124; + UnkStruct_0208737C *unk_128; PokemonSummary unk_12C; UnkStruct_ov19_021D38E0 unk_15C; - UnkStruct_02023FCC * unk_17C; - UnkStruct_02023FCC * unk_180; + UnkStruct_02023FCC *unk_17C; + UnkStruct_02023FCC *unk_180; u32 unk_184; u32 unk_188; - MessageLoader * unk_18C; - MessageLoader * unk_190; - MessageLoader * unk_194; - MessageLoader * unk_198; - StringTemplate * unk_19C; - Pokemon * unk_1A0; - Options * unk_1A4; - int (* unk_1A8)(struct UnkStruct_ov19_021D5DF8_t * param0); - void (* unk_1AC)(struct UnkStruct_ov19_021D5DF8_t * param0, u32 * param1); + MessageLoader *unk_18C; + MessageLoader *unk_190; + MessageLoader *unk_194; + MessageLoader *unk_198; + StringTemplate *unk_19C; + Pokemon *unk_1A0; + Options *unk_1A4; + int (*unk_1A8)(struct UnkStruct_ov19_021D5DF8_t *param0); + void (*unk_1AC)(struct UnkStruct_ov19_021D5DF8_t *param0, u32 *param1); u32 unk_1B0; u32 unk_1B4; s32 unk_1B8; @@ -154,132 +149,132 @@ typedef struct UnkStruct_ov19_021D5DF8_t { BOOL unk_204; BOOL unk_208; int unk_20C; - OverlayManager * unk_210; - void * unk_214; + OverlayManager *unk_210; + void *unk_214; u32 unk_218; } UnkStruct_ov19_021D5DF8; -typedef int (* UnkFuncPtr_ov19_021D0EA0)(UnkStruct_ov19_021D5DF8 *); -typedef void (* UnkFuncPtr_ov19_021D0EB0)(UnkStruct_ov19_021D5DF8 *, u32 *); - -static void ov19_021D0EA0(UnkStruct_ov19_021D5DF8 * param0, UnkFuncPtr_ov19_021D0EA0 param1); -static void ov19_021D0EB0(UnkStruct_ov19_021D5DF8 * param0, UnkFuncPtr_ov19_021D0EB0 param1); -static void ov19_021D0EC0(UnkStruct_ov19_021D5DF8 * param0); -static UnkFuncPtr_ov19_021D0EA0 ov19_021D0ECC(UnkStruct_ov19_021D5DF8 * param0); -static void ov19_021D0F14(UnkStruct_ov19_021D5DF8 * param0); -static void ov19_021D0F20(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D0F88(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static inline int inline_ov19_021D0FF0(UnkStruct_ov19_021D5DF8 * param0); -static int ov19_021D0FF0(UnkStruct_ov19_021D5DF8 * param0); -static BOOL ov19_021D1238(UnkStruct_ov19_021D5DF8 * param0, int * param1); -static int ov19_021D1270(UnkStruct_ov19_021D5DF8 * param0); -static int ov19_021D15C0(UnkStruct_ov19_021D5DF8 * param0); -static int ov19_021D17AC(UnkStruct_ov19_021D5DF8 * param0); -static int ov19_021D19B8(UnkStruct_ov19_021D5DF8 * param0); -static void ov19_021D1C84(UnkStruct_ov19_021D5DF8 * param0); -static int ov19_021D1DAC(UnkStruct_ov19_021D5DF8 * param0); -static void ov19_021D1DEC(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D1F5C(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D20A4(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D2308(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D2694(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D27E8(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D2890(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D2A5C(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D2B54(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static BOOL ov19_021D2DD0(const UnkStruct_ov19_021D4DF0 * param0); -static void ov19_021D2E1C(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D2F14(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D3010(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D30D0(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D3294(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static BOOL ov19_021D34E4(UnkStruct_ov19_021D5DF8 * param0); -static BOOL ov19_021D357C(UnkStruct_ov19_021D5DF8 * param0, int * param1); -static void ov19_021D35F8(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D38E0(UnkStruct_ov19_021D5DF8 * param0); -static void ov19_021D3978(SysTask * param0, void * param1); -static BOOL ov19_021D3AC8(BoxPokemon * param0, u16 param1); -static void ov19_021D3B34(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D3C28(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D3CFC(UnkStruct_ov19_021D4DF0 * param0, UnkStruct_ov19_021D5DF8 * param1); -static void ov19_021D3D44(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D3FB0(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D4184(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D4390(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D443C(UnkStruct_ov19_021D5DF8 * param0, u32 param1, u32 param2); -static void ov19_021D4458(UnkStruct_ov19_021D5DF8 * param0); -static BOOL ov19_021D4468(UnkStruct_ov19_021D5DF8 * param0); -static void ov19_021D45A8(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D4640(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static void ov19_021D4938(UnkStruct_ov19_021D5DF8 * param0, u32 * param1); -static BOOL ov19_021D4B88(UnkStruct_ov19_021D5DF8 * param0); -static void ov19_021D4BB0(u32 param0, u32 param1, void * param2); -static void ov19_021D4BE0(UnkStruct_ov19_021D5DF8 * param0, UnkStruct_02042434 * param1); -static void ov19_021D4D58(UnkStruct_ov19_021D5DF8 * param0); -static void ov19_021D4DE4(UnkStruct_ov19_021D4DE4 * param0, int param1); -static void ov19_021D4DF0(UnkStruct_ov19_021D5DF8 * param0); -static void ov19_021D4E30(UnkStruct_ov19_021D5594 * param0); -static void ov19_021D4E50(UnkStruct_ov19_021D5594 * param0); -static void ov19_021D4E5C(PCBoxes * param0, UnkStruct_ov19_021D4F5C * param1); -static void ov19_021D4E7C(UnkStruct_ov19_021D4F5C * param0); -static void ov19_021D4E88(UnkStruct_ov19_021D5BAC * param0); -static void ov19_021D4EC0(UnkStruct_ov19_021D5BAC * param0); -static void ov19_021D4EE4(UnkStruct_ov19_021D4EE4 * param0); -static void ov19_021D4F18(UnkStruct_ov19_021D4EE4 * param0); -static void ov19_021D4F34(UnkStruct_ov19_021D4F34 * param0); -static void ov19_021D4F40(const PCBoxes * param0, UnkStruct_ov19_021D4F5C * param1); -static void ov19_021D4F5C(UnkStruct_ov19_021D4DF0 * param0, PCBoxes * param1); -static BOOL ov19_021D4F74(u32 param0, UnkStruct_ov19_021D5DF8 * param1); -static BOOL ov19_021D4FDC(UnkStruct_ov19_021D4DF0 * param0, int param1, int param2); -static int ov19_021D5150(u32 param0, UnkStruct_ov19_021D5DF8 * param1); -static int ov19_021D51CC(UnkStruct_ov19_021D4DF0 * param0, int param1, int param2); -static void ov19_021D5290(UnkStruct_ov19_021D5DF8 * param0); -static void ov19_021D52D0(UnkStruct_ov19_021D5DF8 * param0); -static BOOL ov19_021D52F4(UnkStruct_ov19_021D5DF8 * param0); -static BOOL ov19_021D538C(UnkStruct_ov19_021D5DF8 * param0); -static void ov19_021D53B8(u32 param0, u32 param1, void * param2); -static void ov19_021D5408(UnkStruct_ov19_021D4DF0 * param0, u32 param1); -static void ov19_021D5410(UnkStruct_ov19_021D4DF0 * param0, u32 param1, u32 param2); -static void ov19_021D5420(UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1); -static void ov19_021D54A4(UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1); -static void ov19_021D5594(UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1); -static void ov19_021D55B0(UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1); -static void ov19_021D55C4(UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1); -static void ov19_021D56AC(UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1); -static void ov19_021D5734(UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1); -static BOOL ov19_021D57D8(UnkStruct_ov19_021D5DF8 * param0, u32 param1); -static BOOL ov19_021D5800(UnkStruct_ov19_021D5DF8 * param0, u32 param1); -static void ov19_021D5834(UnkStruct_ov19_021D5DF8 * param0); -static void ov19_021D584C(UnkStruct_ov19_021D5DF8 * param0); -static void ov19_021D5888(UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1, UnkStruct_ov19_021D5DF8 * param2); -static void ov19_021D58AC(UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1, UnkStruct_ov19_021D5DF8 * param2); -static void ov19_021D59F4(UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1, UnkStruct_ov19_021D5DF8 * param2); -static void ov19_021D5B70(UnkStruct_ov19_021D4DF0 * param0); -static void ov19_021D5B80(UnkStruct_ov19_021D4DF0 * param0); -static void ov19_021D5BA0(UnkStruct_ov19_021D4DF0 * param0, BOOL param1); -static void ov19_021D5BA8(UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1); -static void ov19_021D5BAC(UnkStruct_ov19_021D4DF0 * param0); -static void ov19_021D5BE8(UnkStruct_ov19_021D4DF0 * param0, u16 param1, UnkStruct_ov19_021D5DF8 * param2); -static void ov19_021D5CBC(UnkStruct_ov19_021D4DF0 * param0); -static void ov19_021D5CE8(UnkStruct_ov19_021D4DF0 * param0); -static void ov19_021D5D08(UnkStruct_ov19_021D4DF0 * param0, u32 param1); -static void ov19_021D5D20(UnkStruct_ov19_021D4DF0 * param0, u32 param1); -static void ov19_021D5D28(UnkStruct_ov19_021D4DF0 * param0, UnkStruct_ov19_021D5DF8 * param1); -static void ov19_021D5D54(UnkStruct_ov19_021D4DF0 * param0); -static void ov19_021D5D60(UnkStruct_ov19_021D4DF0 * param0, UnkStruct_ov19_021D5DF8 * param1); -static void ov19_021D5D78(UnkStruct_ov19_021D4DF0 * param0, UnkStruct_ov19_021D5DF8 * param1); -static void ov19_021D5D94(UnkStruct_ov19_021D4DF0 * param0, u32 param1); -static void ov19_021D5D9C(UnkStruct_ov19_021D4DF0 * param0, u32 param1); -static void ov19_021D5DA4(UnkStruct_ov19_021D4DF0 * param0, u32 param1); -static void ov19_021D5DAC(UnkStruct_ov19_021D4DF0 * param0, int param1); -static void ov19_021D5DB4(UnkStruct_ov19_021D4DF0 * param0, u32 param1); -static void ov19_021D5DD8(UnkStruct_ov19_021D4DF0 * param0); -static u32 ov19_021D5FD0(UnkStruct_ov19_021D4DF0 * param0, int param1, void * param2); -static u32 ov19_021D6014(UnkStruct_ov19_021D4DF0 * param0, int param1, void * param2); - -int ov19_021D0D80 (OverlayManager * param0, int * param1) -{ - UnkStruct_ov19_021D5DF8 * v0; +typedef int (*UnkFuncPtr_ov19_021D0EA0)(UnkStruct_ov19_021D5DF8 *); +typedef void (*UnkFuncPtr_ov19_021D0EB0)(UnkStruct_ov19_021D5DF8 *, u32 *); + +static void ov19_021D0EA0(UnkStruct_ov19_021D5DF8 *param0, UnkFuncPtr_ov19_021D0EA0 param1); +static void ov19_021D0EB0(UnkStruct_ov19_021D5DF8 *param0, UnkFuncPtr_ov19_021D0EB0 param1); +static void ov19_021D0EC0(UnkStruct_ov19_021D5DF8 *param0); +static UnkFuncPtr_ov19_021D0EA0 ov19_021D0ECC(UnkStruct_ov19_021D5DF8 *param0); +static void ov19_021D0F14(UnkStruct_ov19_021D5DF8 *param0); +static void ov19_021D0F20(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D0F88(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static inline int inline_ov19_021D0FF0(UnkStruct_ov19_021D5DF8 *param0); +static int ov19_021D0FF0(UnkStruct_ov19_021D5DF8 *param0); +static BOOL ov19_021D1238(UnkStruct_ov19_021D5DF8 *param0, int *param1); +static int ov19_021D1270(UnkStruct_ov19_021D5DF8 *param0); +static int ov19_021D15C0(UnkStruct_ov19_021D5DF8 *param0); +static int ov19_021D17AC(UnkStruct_ov19_021D5DF8 *param0); +static int ov19_021D19B8(UnkStruct_ov19_021D5DF8 *param0); +static void ov19_021D1C84(UnkStruct_ov19_021D5DF8 *param0); +static int ov19_021D1DAC(UnkStruct_ov19_021D5DF8 *param0); +static void ov19_021D1DEC(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D1F5C(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D20A4(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D2308(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D2694(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D27E8(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D2890(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D2A5C(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D2B54(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static BOOL ov19_021D2DD0(const UnkStruct_ov19_021D4DF0 *param0); +static void ov19_021D2E1C(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D2F14(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D3010(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D30D0(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D3294(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static BOOL ov19_021D34E4(UnkStruct_ov19_021D5DF8 *param0); +static BOOL ov19_021D357C(UnkStruct_ov19_021D5DF8 *param0, int *param1); +static void ov19_021D35F8(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D38E0(UnkStruct_ov19_021D5DF8 *param0); +static void ov19_021D3978(SysTask *param0, void *param1); +static BOOL ov19_021D3AC8(BoxPokemon *param0, u16 param1); +static void ov19_021D3B34(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D3C28(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D3CFC(UnkStruct_ov19_021D4DF0 *param0, UnkStruct_ov19_021D5DF8 *param1); +static void ov19_021D3D44(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D3FB0(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D4184(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D4390(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D443C(UnkStruct_ov19_021D5DF8 *param0, u32 param1, u32 param2); +static void ov19_021D4458(UnkStruct_ov19_021D5DF8 *param0); +static BOOL ov19_021D4468(UnkStruct_ov19_021D5DF8 *param0); +static void ov19_021D45A8(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D4640(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static void ov19_021D4938(UnkStruct_ov19_021D5DF8 *param0, u32 *param1); +static BOOL ov19_021D4B88(UnkStruct_ov19_021D5DF8 *param0); +static void ov19_021D4BB0(u32 param0, u32 param1, void *param2); +static void ov19_021D4BE0(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_02042434 *param1); +static void ov19_021D4D58(UnkStruct_ov19_021D5DF8 *param0); +static void ov19_021D4DE4(UnkStruct_ov19_021D4DE4 *param0, int param1); +static void ov19_021D4DF0(UnkStruct_ov19_021D5DF8 *param0); +static void ov19_021D4E30(UnkStruct_ov19_021D5594 *param0); +static void ov19_021D4E50(UnkStruct_ov19_021D5594 *param0); +static void ov19_021D4E5C(PCBoxes *param0, UnkStruct_ov19_021D4F5C *param1); +static void ov19_021D4E7C(UnkStruct_ov19_021D4F5C *param0); +static void ov19_021D4E88(UnkStruct_ov19_021D5BAC *param0); +static void ov19_021D4EC0(UnkStruct_ov19_021D5BAC *param0); +static void ov19_021D4EE4(UnkStruct_ov19_021D4EE4 *param0); +static void ov19_021D4F18(UnkStruct_ov19_021D4EE4 *param0); +static void ov19_021D4F34(UnkStruct_ov19_021D4F34 *param0); +static void ov19_021D4F40(const PCBoxes *param0, UnkStruct_ov19_021D4F5C *param1); +static void ov19_021D4F5C(UnkStruct_ov19_021D4DF0 *param0, PCBoxes *param1); +static BOOL ov19_021D4F74(u32 param0, UnkStruct_ov19_021D5DF8 *param1); +static BOOL ov19_021D4FDC(UnkStruct_ov19_021D4DF0 *param0, int param1, int param2); +static int ov19_021D5150(u32 param0, UnkStruct_ov19_021D5DF8 *param1); +static int ov19_021D51CC(UnkStruct_ov19_021D4DF0 *param0, int param1, int param2); +static void ov19_021D5290(UnkStruct_ov19_021D5DF8 *param0); +static void ov19_021D52D0(UnkStruct_ov19_021D5DF8 *param0); +static BOOL ov19_021D52F4(UnkStruct_ov19_021D5DF8 *param0); +static BOOL ov19_021D538C(UnkStruct_ov19_021D5DF8 *param0); +static void ov19_021D53B8(u32 param0, u32 param1, void *param2); +static void ov19_021D5408(UnkStruct_ov19_021D4DF0 *param0, u32 param1); +static void ov19_021D5410(UnkStruct_ov19_021D4DF0 *param0, u32 param1, u32 param2); +static void ov19_021D5420(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_ov19_021D4DF0 *param1); +static void ov19_021D54A4(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_ov19_021D4DF0 *param1); +static void ov19_021D5594(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_ov19_021D4DF0 *param1); +static void ov19_021D55B0(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_ov19_021D4DF0 *param1); +static void ov19_021D55C4(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_ov19_021D4DF0 *param1); +static void ov19_021D56AC(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_ov19_021D4DF0 *param1); +static void ov19_021D5734(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_ov19_021D4DF0 *param1); +static BOOL ov19_021D57D8(UnkStruct_ov19_021D5DF8 *param0, u32 param1); +static BOOL ov19_021D5800(UnkStruct_ov19_021D5DF8 *param0, u32 param1); +static void ov19_021D5834(UnkStruct_ov19_021D5DF8 *param0); +static void ov19_021D584C(UnkStruct_ov19_021D5DF8 *param0); +static void ov19_021D5888(UnkStruct_ov19_021D4DF0 *param0, BoxPokemon *param1, UnkStruct_ov19_021D5DF8 *param2); +static void ov19_021D58AC(UnkStruct_ov19_021D4DF0 *param0, BoxPokemon *param1, UnkStruct_ov19_021D5DF8 *param2); +static void ov19_021D59F4(UnkStruct_ov19_021D4DF0 *param0, BoxPokemon *param1, UnkStruct_ov19_021D5DF8 *param2); +static void ov19_021D5B70(UnkStruct_ov19_021D4DF0 *param0); +static void ov19_021D5B80(UnkStruct_ov19_021D4DF0 *param0); +static void ov19_021D5BA0(UnkStruct_ov19_021D4DF0 *param0, BOOL param1); +static void ov19_021D5BA8(UnkStruct_ov19_021D4DF0 *param0, BoxPokemon *param1); +static void ov19_021D5BAC(UnkStruct_ov19_021D4DF0 *param0); +static void ov19_021D5BE8(UnkStruct_ov19_021D4DF0 *param0, u16 param1, UnkStruct_ov19_021D5DF8 *param2); +static void ov19_021D5CBC(UnkStruct_ov19_021D4DF0 *param0); +static void ov19_021D5CE8(UnkStruct_ov19_021D4DF0 *param0); +static void ov19_021D5D08(UnkStruct_ov19_021D4DF0 *param0, u32 param1); +static void ov19_021D5D20(UnkStruct_ov19_021D4DF0 *param0, u32 param1); +static void ov19_021D5D28(UnkStruct_ov19_021D4DF0 *param0, UnkStruct_ov19_021D5DF8 *param1); +static void ov19_021D5D54(UnkStruct_ov19_021D4DF0 *param0); +static void ov19_021D5D60(UnkStruct_ov19_021D4DF0 *param0, UnkStruct_ov19_021D5DF8 *param1); +static void ov19_021D5D78(UnkStruct_ov19_021D4DF0 *param0, UnkStruct_ov19_021D5DF8 *param1); +static void ov19_021D5D94(UnkStruct_ov19_021D4DF0 *param0, u32 param1); +static void ov19_021D5D9C(UnkStruct_ov19_021D4DF0 *param0, u32 param1); +static void ov19_021D5DA4(UnkStruct_ov19_021D4DF0 *param0, u32 param1); +static void ov19_021D5DAC(UnkStruct_ov19_021D4DF0 *param0, int param1); +static void ov19_021D5DB4(UnkStruct_ov19_021D4DF0 *param0, u32 param1); +static void ov19_021D5DD8(UnkStruct_ov19_021D4DF0 *param0); +static u32 ov19_021D5FD0(UnkStruct_ov19_021D4DF0 *param0, int param1, void *param2); +static u32 ov19_021D6014(UnkStruct_ov19_021D4DF0 *param0, int param1, void *param2); + +int ov19_021D0D80(OverlayManager *param0, int *param1) +{ + UnkStruct_ov19_021D5DF8 *v0; Heap_Create(3, 9, 16384); Heap_Create(3, 10, 245760); @@ -299,9 +294,9 @@ int ov19_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov19_021D0DEC (OverlayManager * param0, int * param1) +int ov19_021D0DEC(OverlayManager *param0, int *param1) { - UnkStruct_ov19_021D5DF8 * v0 = OverlayManager_Data(param0); + UnkStruct_ov19_021D5DF8 *v0 = OverlayManager_Data(param0); if (v0->unk_1AC != NULL) { v0->unk_1AC(v0, &(v0->unk_1B4)); @@ -324,12 +319,12 @@ int ov19_021D0DEC (OverlayManager * param0, int * param1) return 1; } -int ov19_021D0E58 (OverlayManager * param0, int * param1) +int ov19_021D0E58(OverlayManager *param0, int *param1) { - UnkStruct_ov19_021D5DF8 * v0 = OverlayManager_Data(param0); + UnkStruct_ov19_021D5DF8 *v0 = OverlayManager_Data(param0); if (Party_HasSpecies(v0->unk_124, 441) == 0) { - ChatotCry * v1 = GetChatotCryDataFromSave(v0->unk_11C); + ChatotCry *v1 = GetChatotCryDataFromSave(v0->unk_11C); ResetChatotCryDataStatus(v1); } @@ -343,24 +338,24 @@ int ov19_021D0E58 (OverlayManager * param0, int * param1) return 1; } -static void ov19_021D0EA0 (UnkStruct_ov19_021D5DF8 * param0, UnkFuncPtr_ov19_021D0EA0 param1) +static void ov19_021D0EA0(UnkStruct_ov19_021D5DF8 *param0, UnkFuncPtr_ov19_021D0EA0 param1) { param0->unk_1A8 = param1; param0->unk_1B0 = 0; } -static void ov19_021D0EB0 (UnkStruct_ov19_021D5DF8 * param0, UnkFuncPtr_ov19_021D0EB0 param1) +static void ov19_021D0EB0(UnkStruct_ov19_021D5DF8 *param0, UnkFuncPtr_ov19_021D0EB0 param1) { param0->unk_1AC = param1; param0->unk_1B4 = 0; } -static void ov19_021D0EC0 (UnkStruct_ov19_021D5DF8 * param0) +static void ov19_021D0EC0(UnkStruct_ov19_021D5DF8 *param0) { param0->unk_1AC = NULL; } -static UnkFuncPtr_ov19_021D0EA0 ov19_021D0ECC (UnkStruct_ov19_021D5DF8 * param0) +static UnkFuncPtr_ov19_021D0EA0 ov19_021D0ECC(UnkStruct_ov19_021D5DF8 *param0) { switch (ov19_021D5E10(&(param0->unk_00))) { case 0: @@ -377,12 +372,12 @@ static UnkFuncPtr_ov19_021D0EA0 ov19_021D0ECC (UnkStruct_ov19_021D5DF8 * param0) } } -static void ov19_021D0F14 (UnkStruct_ov19_021D5DF8 * param0) +static void ov19_021D0F14(UnkStruct_ov19_021D5DF8 *param0) { param0->unk_118->unk_08 = 1; } -static void ov19_021D0F20 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D0F20(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { switch (*param1) { case 0: @@ -403,7 +398,7 @@ static void ov19_021D0F20 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D0F88 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D0F88(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { switch (*param1) { case 0: @@ -424,7 +419,7 @@ static void ov19_021D0F88 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static inline void inline_ov19_021D0FF0_sub1 (UnkStruct_ov19_021D5DF8 * wk) +static inline void inline_ov19_021D0FF0_sub1(UnkStruct_ov19_021D5DF8 *wk) { ov19_021D5B70(&wk->unk_00); ov19_021D5888(&wk->unk_00, wk->unk_00.unk_08.unk_00, wk); @@ -432,7 +427,7 @@ static inline void inline_ov19_021D0FF0_sub1 (UnkStruct_ov19_021D5DF8 * wk) ov19_021D6594(wk->unk_114, 6); } -static inline int inline_ov19_021D0FF0 (UnkStruct_ov19_021D5DF8 * param0) +static inline int inline_ov19_021D0FF0(UnkStruct_ov19_021D5DF8 *param0) { if (ov19_021D538C(param0)) { if (ov19_021D5E08(¶m0->unk_00) != 4) { @@ -480,7 +475,7 @@ static inline int inline_ov19_021D0FF0 (UnkStruct_ov19_021D5DF8 * param0) return 0; } -static int ov19_021D0FF0 (UnkStruct_ov19_021D5DF8 * param0) +static int ov19_021D0FF0(UnkStruct_ov19_021D5DF8 *param0) { switch (param0->unk_1B0) { case 0: @@ -542,7 +537,7 @@ static int ov19_021D0FF0 (UnkStruct_ov19_021D5DF8 * param0) return 0; } -static BOOL ov19_021D1238 (UnkStruct_ov19_021D5DF8 * param0, int * param1) +static BOOL ov19_021D1238(UnkStruct_ov19_021D5DF8 *param0, int *param1) { if (Item_IsMail(ov19_021D5E74(¶m0->unk_00))) { *param1 = 30; @@ -557,7 +552,7 @@ static BOOL ov19_021D1238 (UnkStruct_ov19_021D5DF8 * param0, int * param1) return 0; } -static int ov19_021D1270 (UnkStruct_ov19_021D5DF8 * param0) +static int ov19_021D1270(UnkStruct_ov19_021D5DF8 *param0) { switch (param0->unk_1B0) { case 0: @@ -659,7 +654,7 @@ static int ov19_021D1270 (UnkStruct_ov19_021D5DF8 * param0) return 0; } -static int ov19_021D15C0 (UnkStruct_ov19_021D5DF8 * param0) +static int ov19_021D15C0(UnkStruct_ov19_021D5DF8 *param0) { switch (param0->unk_1B0) { case 0: @@ -708,7 +703,7 @@ static int ov19_021D15C0 (UnkStruct_ov19_021D5DF8 * param0) return 0; } -static int ov19_021D17AC (UnkStruct_ov19_021D5DF8 * param0) +static int ov19_021D17AC(UnkStruct_ov19_021D5DF8 *param0) { switch (param0->unk_1B0) { case 0: @@ -762,7 +757,7 @@ static int ov19_021D17AC (UnkStruct_ov19_021D5DF8 * param0) return 0; } -static int ov19_021D19B8 (UnkStruct_ov19_021D5DF8 * param0) +static int ov19_021D19B8(UnkStruct_ov19_021D5DF8 *param0) { switch (param0->unk_1B0) { case 0: @@ -849,14 +844,14 @@ static int ov19_021D19B8 (UnkStruct_ov19_021D5DF8 * param0) return 0; } -static void ov19_021D1C84 (UnkStruct_ov19_021D5DF8 * param0) +static void ov19_021D1C84(UnkStruct_ov19_021D5DF8 *param0) { static const u8 v0[] = { 0, 1, 2, 4, 3, 5, 6, 7, 8 }; if (ov19_021D5E38(¶m0->unk_00) == 2) { - UnkStruct_ov19_021D5594 * v1 = ¶m0->unk_00.unk_14; + UnkStruct_ov19_021D5594 *v1 = ¶m0->unk_00.unk_14; param0->unk_12C.monData = param0->unk_00.unk_14.unk_00; param0->unk_12C.dataType = (v1->unk_0B) ? 0 : 2; @@ -890,7 +885,7 @@ static void ov19_021D1C84 (UnkStruct_ov19_021D5DF8 * param0) PokemonSummary_SetPlayerProfile(&(param0->unk_12C), SaveData_GetTrainerInfo(param0->unk_11C)); } -static int ov19_021D1DAC (UnkStruct_ov19_021D5DF8 * param0) +static int ov19_021D1DAC(UnkStruct_ov19_021D5DF8 *param0) { switch (param0->unk_1B0) { case 0: @@ -906,9 +901,9 @@ static int ov19_021D1DAC (UnkStruct_ov19_021D5DF8 * param0) return 0; } -static void ov19_021D1DEC (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D1DEC(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { - switch ((*param1)) { + switch (*param1) { case 0: if ((ov19_021D5E08(&(param0->unk_00)) == 3) && (ov19_021D5F7C(&(param0->unk_00)) != 0)) { ov19_021D0EB0(param0, ov19_021D4184); @@ -973,9 +968,9 @@ static void ov19_021D1DEC (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D1F5C (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D1F5C(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { - switch ((*param1)) { + switch (*param1) { case 0: if (ov19_021D5E38(&(param0->unk_00)) != 1) { Sound_PlayEffect(1523); @@ -1029,9 +1024,9 @@ static void ov19_021D1F5C (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D20A4 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D20A4(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { - switch ((*param1)) { + switch (*param1) { case 0: StringTemplate_SetNickname(param0->unk_19C, 0, ov19_021D5E9C(¶m0->unk_00)); ov19_021D5408(¶m0->unk_00, 0); @@ -1104,15 +1099,13 @@ static void ov19_021D20A4 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) case UnkEnum_021DFB94_37: ov19_021D0EB0(param0, ov19_021D3C28); break; - case UnkEnum_021DFB94_40: - { + case UnkEnum_021DFB94_40: { if (ov19_021D5E74(¶m0->unk_00) == 0) { ov19_021D0EB0(param0, ov19_021D3D44); } else { ov19_021D0EB0(param0, ov19_021D3FB0); } - } - break; + } break; case UnkEnum_021DFB94_52: case UnkEnum_021DFB94_53: ov19_021D5B70(¶m0->unk_00); @@ -1138,11 +1131,10 @@ static void ov19_021D20A4 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D2308 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D2308(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { - switch ((*param1)) { - case 0: - { + switch (*param1) { + case 0: { u32 v0 = ov19_021D5F7C(¶m0->unk_00); if (v0 != 0) { @@ -1289,9 +1281,9 @@ static void ov19_021D2308 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D2694 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D2694(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { - switch ((*param1)) { + switch (*param1) { case 0: ov19_021D5408(¶m0->unk_00, 7); ov19_021DFB50(¶m0->unk_00); @@ -1358,9 +1350,9 @@ static void ov19_021D2694 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D27E8 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D27E8(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { - switch ((*param1)) { + switch (*param1) { case 0: ov19_021D443C(param0, ov19_021D5E68(¶m0->unk_00), 8); (*param1) = 1; @@ -1390,9 +1382,9 @@ static void ov19_021D27E8 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D2890 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D2890(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { - switch ((*param1)) { + switch (*param1) { case 0: param0->unk_1B8 = UnkEnum_021DFB94_04; (*param1) = 1; @@ -1481,9 +1473,9 @@ static void ov19_021D2890 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D2A5C (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D2A5C(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { - switch ((*param1)) { + switch (*param1) { case 0: ov19_021DFC80(¶m0->unk_00); ov19_021D5408(¶m0->unk_00, 1); @@ -1652,12 +1644,12 @@ static void ov19_021D2B54(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) } } -static BOOL ov19_021D2DD0 (const UnkStruct_ov19_021D4DF0 * param0) +static BOOL ov19_021D2DD0(const UnkStruct_ov19_021D4DF0 *param0) { - BoxPokemon * v0; + BoxPokemon *v0; int v1, v2, v3, v4; - const UnkStruct_ov19_021D3CFC * v5 = ¶m0->unk_08; - const UnkStruct_ov19_021D5594 * v6 = ¶m0->unk_14; + const UnkStruct_ov19_021D3CFC *v5 = ¶m0->unk_08; + const UnkStruct_ov19_021D5594 *v6 = ¶m0->unk_14; v3 = ov19_021D5F3C(param0); v2 = v6->unk_09; @@ -1674,7 +1666,7 @@ static BOOL ov19_021D2DD0 (const UnkStruct_ov19_021D4DF0 * param0) return 1; } -static void ov19_021D2E1C (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D2E1C(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { switch (*param1) { case 0: @@ -1718,7 +1710,7 @@ static void ov19_021D2E1C (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D2F14 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D2F14(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { switch (*param1) { case 0: @@ -1726,7 +1718,7 @@ static void ov19_021D2F14 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) ov19_021D6594(param0->unk_114, 10); Sound_PlayEffect(1514); - if ((ov19_021D5E10(¶m0->unk_00) == 1)) { + if (ov19_021D5E10(¶m0->unk_00) == 1) { u32 v0, v1; v0 = ov19_021D5E2C(¶m0->unk_00); @@ -1757,7 +1749,7 @@ static void ov19_021D2F14 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static BOOL ov19_021D2FC8 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static BOOL ov19_021D2FC8(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { if (ov19_021D34E4(param0)) { if (ov19_021D5FD0(¶m0->unk_00, 173, NULL)) { @@ -1776,11 +1768,10 @@ static BOOL ov19_021D2FC8 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) return 0; } -static void ov19_021D3010 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D3010(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { switch (*param1) { - case 0: - { + case 0: { u32 v0; if (ov19_021D2FC8(param0, &v0)) { @@ -1795,8 +1786,7 @@ static void ov19_021D3010 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) ov19_021D6594(param0->unk_114, 6); (*param1) = 2; } - } - break; + } break; case 1: if (ov19_021D6600(param0->unk_114, 24) == 0) { break; @@ -1816,9 +1806,9 @@ static void ov19_021D3010 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D30D0 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D30D0(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { - switch ((*param1)) { + switch (*param1) { case 0: if (Party_GetCurrentCount(param0->unk_124) != 6) { ov19_021D6594(param0->unk_114, 26); @@ -1893,9 +1883,9 @@ static void ov19_021D30D0 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D3294 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D3294(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { - switch ((*param1)) { + switch (*param1) { case 0: if ((ov19_021D5E38(¶m0->unk_00) == 1) && (ov19_021D34E4(param0) == 1)) { Sound_PlayEffect(1523); @@ -1998,9 +1988,9 @@ static void ov19_021D3294 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static BOOL ov19_021D34E4 (UnkStruct_ov19_021D5DF8 * param0) +static BOOL ov19_021D34E4(UnkStruct_ov19_021D5DF8 *param0) { - Pokemon * v0; + Pokemon *v0; int v1, v2, v3; BOOL v4; @@ -2032,7 +2022,7 @@ static BOOL ov19_021D34E4 (UnkStruct_ov19_021D5DF8 * param0) return 1; } -static BOOL ov19_021D357C (UnkStruct_ov19_021D5DF8 * param0, int * param1) +static BOOL ov19_021D357C(UnkStruct_ov19_021D5DF8 *param0, int *param1) { if (ov19_021D5FD0(¶m0->unk_00, 173, NULL)) { *param1 = 31; @@ -2065,11 +2055,10 @@ static BOOL ov19_021D357C (UnkStruct_ov19_021D5DF8 * param0, int * param1) return 1; } -static void ov19_021D35F8 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D35F8(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { - switch ((*param1)) { - case 0: - { + switch (*param1) { + case 0: { int v0; if (ov19_021D357C(param0, &v0)) { @@ -2084,8 +2073,7 @@ static void ov19_021D35F8 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) ov19_021D6594(param0->unk_114, 24); (*param1) = 8; } - } - break; + } break; case 1: if (ov19_021D6628(param0->unk_114) == 0) { @@ -2210,9 +2198,9 @@ static void ov19_021D35F8 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D38E0 (UnkStruct_ov19_021D5DF8 * param0) +static void ov19_021D38E0(UnkStruct_ov19_021D5DF8 *param0) { - UnkStruct_ov19_021D38E0 * v0 = &(param0->unk_15C); + UnkStruct_ov19_021D38E0 *v0 = &(param0->unk_15C); int v1, v2; v0->unk_10 = param0->unk_00.unk_4C.unk_00; @@ -2246,10 +2234,10 @@ static void ov19_021D38E0 (UnkStruct_ov19_021D5DF8 * param0) } } -static void ov19_021D3978 (SysTask * param0, void * param1) +static void ov19_021D3978(SysTask *param0, void *param1) { - UnkStruct_ov19_021D38E0 * v0 = param1; - BoxPokemon * v1; + UnkStruct_ov19_021D38E0 *v0 = param1; + BoxPokemon *v1; int v2, v3; if (v0->unk_02 < 18) { @@ -2312,7 +2300,7 @@ static void ov19_021D3978 (SysTask * param0, void * param1) } } -static BOOL ov19_021D3AC8 (BoxPokemon * param0, u16 param1) +static BOOL ov19_021D3AC8(BoxPokemon *param0, u16 param1) { BOOL v0, v1; @@ -2334,15 +2322,15 @@ static BOOL ov19_021D3AC8 (BoxPokemon * param0, u16 param1) return v0; } -BOOL ov19_021D3B18 (const UnkStruct_ov19_021D5DF8 * param0) +BOOL ov19_021D3B18(const UnkStruct_ov19_021D5DF8 *param0) { - const UnkStruct_ov19_021D38E0 * v0 = &(param0->unk_15C); + const UnkStruct_ov19_021D38E0 *v0 = &(param0->unk_15C); return v0->unk_00; } -BOOL ov19_021D3B20 (const UnkStruct_ov19_021D5DF8 * param0) +BOOL ov19_021D3B20(const UnkStruct_ov19_021D5DF8 *param0) { - const UnkStruct_ov19_021D38E0 * v0 = &(param0->unk_15C); + const UnkStruct_ov19_021D38E0 *v0 = &(param0->unk_15C); if (v0->unk_00) { return v0->unk_01; @@ -2351,9 +2339,9 @@ BOOL ov19_021D3B20 (const UnkStruct_ov19_021D5DF8 * param0) return 0; } -static void ov19_021D3B34 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D3B34(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { - switch ((*param1)) { + switch (*param1) { case 0: ov19_021D6594(param0->unk_114, 3); (*param1)++; @@ -2383,9 +2371,9 @@ static void ov19_021D3B34 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D3C28 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D3C28(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { - switch ((*param1)) { + switch (*param1) { case 0: ov19_021D6594(param0->unk_114, 3); (*param1)++; @@ -2417,9 +2405,9 @@ static void ov19_021D3C28 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D3CFC (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_ov19_021D5DF8 * param1) +static void ov19_021D3CFC(UnkStruct_ov19_021D4DF0 *param0, UnkStruct_ov19_021D5DF8 *param1) { - UnkStruct_ov19_021D3CFC * v0 = ¶m0->unk_08; + UnkStruct_ov19_021D3CFC *v0 = ¶m0->unk_08; switch (v0->unk_04) { case 0: @@ -2437,7 +2425,7 @@ static void ov19_021D3CFC (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_ov19_021D ov19_021D52F4(param1); } -static void ov19_021D3D44 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D3D44(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { FS_EXTERN_OVERLAY(overlay84); @@ -2446,14 +2434,14 @@ static void ov19_021D3D44 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) }; static u32 v1; - switch ((*param1)) { + switch (*param1) { case 0: ov19_021D6594(param0->unk_114, 3); (*param1)++; break; case 1: if (ov19_021D6600(param0->unk_114, 3)) { - Bag * v2; + Bag *v2; ov19_021D64A0(param0->unk_114); Heap_Destroy(10); @@ -2528,7 +2516,7 @@ static void ov19_021D3D44 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D3FB0 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D3FB0(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { static u32 v0; @@ -2605,7 +2593,7 @@ static void ov19_021D3FB0 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D4184 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D4184(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { static u32 v0; @@ -2694,7 +2682,7 @@ static void ov19_021D4184 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D4390 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D4390(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { switch (*param1) { case 0: @@ -2726,7 +2714,7 @@ static void ov19_021D4390 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D443C (UnkStruct_ov19_021D5DF8 * param0, u32 param1, u32 param2) +static void ov19_021D443C(UnkStruct_ov19_021D5DF8 *param0, u32 param1, u32 param2) { param0->unk_1BC.unk_00 = 0; param0->unk_1BC.unk_05 = param1; @@ -2734,15 +2722,15 @@ static void ov19_021D443C (UnkStruct_ov19_021D5DF8 * param0, u32 param1, u32 par param0->unk_1BC.unk_04 = 0; } -static void ov19_021D4458 (UnkStruct_ov19_021D5DF8 * param0) +static void ov19_021D4458(UnkStruct_ov19_021D5DF8 *param0) { param0->unk_1BC.unk_00 = 0; param0->unk_1BC.unk_04 = 1; } -static BOOL ov19_021D4468 (UnkStruct_ov19_021D5DF8 * param0) +static BOOL ov19_021D4468(UnkStruct_ov19_021D5DF8 *param0) { - UnkStruct_ov19_021D4468 * v0 = &(param0->unk_1BC); + UnkStruct_ov19_021D4468 *v0 = &(param0->unk_1BC); switch (v0->unk_00) { case 0: @@ -2815,7 +2803,7 @@ static BOOL ov19_021D4468 (UnkStruct_ov19_021D5DF8 * param0) return 0; } -static void ov19_021D45A8 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D45A8(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { switch (*param1) { case 0: @@ -2842,7 +2830,7 @@ static void ov19_021D45A8 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D4640 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D4640(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { switch (*param1) { case 0: @@ -2909,8 +2897,7 @@ static void ov19_021D4640 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) param0->unk_20C = 0; param0->unk_208 = 0; break; - case 2: - { + case 2: { int v1; v1 = ov19_021D614C(¶m0->unk_1C8); @@ -2934,10 +2921,8 @@ static void ov19_021D4640 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) Sound_PlayEffect(1500); (*param1) = 2; } - } - break; - case 3: - { + } break; + case 3: { int v4, v5; v4 = ov19_021D5E68(¶m0->unk_00); @@ -2946,8 +2931,7 @@ static void ov19_021D4640 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) param0->unk_204 = (v4 != v5); param0->unk_200 = 0; param0->unk_208 = 1; - } - break; + } break; } break; case 2: @@ -2991,7 +2975,7 @@ static void ov19_021D4640 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static void ov19_021D4938 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) +static void ov19_021D4938(UnkStruct_ov19_021D5DF8 *param0, u32 *param1) { switch (*param1) { case 0: @@ -3038,8 +3022,7 @@ static void ov19_021D4938 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) param0->unk_20C = 0; param0->unk_208 = 0; break; - case 2: - { + case 2: { int v0; v0 = ov19_021D614C(¶m0->unk_1C8); @@ -3065,10 +3048,8 @@ static void ov19_021D4938 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) Sound_PlayEffect(1500); (*param1) = 2; } - } - break; - case 3: - { + } break; + case 3: { int v3, v4; v3 = ov19_021D5E68(¶m0->unk_00); @@ -3077,8 +3058,7 @@ static void ov19_021D4938 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) param0->unk_204 = (v3 != v4); param0->unk_200 = 0; param0->unk_208 = 1; - } - break; + } break; } break; case 2: @@ -3107,7 +3087,7 @@ static void ov19_021D4938 (UnkStruct_ov19_021D5DF8 * param0, u32 * param1) } } -static BOOL ov19_021D4B88 (UnkStruct_ov19_021D5DF8 * param0) +static BOOL ov19_021D4B88(UnkStruct_ov19_021D5DF8 *param0) { param0->unk_188 = 8; @@ -3120,9 +3100,9 @@ static BOOL ov19_021D4B88 (UnkStruct_ov19_021D5DF8 * param0) return 0; } -static void ov19_021D4BB0 (u32 param0, u32 param1, void * param2) +static void ov19_021D4BB0(u32 param0, u32 param1, void *param2) { - UnkStruct_ov19_021D5DF8 * v0 = (UnkStruct_ov19_021D5DF8 *)param2; + UnkStruct_ov19_021D5DF8 *v0 = (UnkStruct_ov19_021D5DF8 *)param2; if (v0->unk_188 == 8) { if (param1 == 0) { @@ -3140,7 +3120,7 @@ static void ov19_021D4BB0 (u32 param0, u32 param1, void * param2) } } -static void ov19_021D4BE0 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_02042434 * param1) +static void ov19_021D4BE0(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_02042434 *param1) { param0->unk_120 = SaveData_PCBoxes(param1->unk_00); param0->unk_11C = param1->unk_00; @@ -3179,7 +3159,7 @@ static void ov19_021D4BE0 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_02042434 ov19_021D4F34(&(param0->unk_00.unk_9C)); } -static void ov19_021D4D58 (UnkStruct_ov19_021D5DF8 * param0) +static void ov19_021D4D58(UnkStruct_ov19_021D5DF8 *param0) { sub_02024034(param0->unk_180); sub_02024034(param0->unk_17C); @@ -3203,17 +3183,17 @@ static void ov19_021D4D58 (UnkStruct_ov19_021D5DF8 * param0) Heap_FreeToHeap(param0); } -static void ov19_021D4DE4 (UnkStruct_ov19_021D4DE4 * param0, int param1) +static void ov19_021D4DE4(UnkStruct_ov19_021D4DE4 *param0, int param1) { param0->unk_00 = param1; param0->unk_01 = 0; param0->unk_02 = 0; } -static void ov19_021D4DF0 (UnkStruct_ov19_021D5DF8 * param0) +static void ov19_021D4DF0(UnkStruct_ov19_021D5DF8 *param0) { - UnkStruct_ov19_021D4DF0 * v0 = &(param0->unk_00); - UnkStruct_ov19_021D3CFC * v1 = &(v0->unk_08); + UnkStruct_ov19_021D4DF0 *v0 = &(param0->unk_00); + UnkStruct_ov19_021D3CFC *v1 = &(v0->unk_08); ov19_021D5410(v0, 0, 0); @@ -3236,31 +3216,31 @@ static void ov19_021D4DF0 (UnkStruct_ov19_021D5DF8 * param0) ov19_021D52F4(param0); } -static void ov19_021D4E30 (UnkStruct_ov19_021D5594 * param0) +static void ov19_021D4E30(UnkStruct_ov19_021D5594 *param0) { param0->unk_00 = Heap_AllocFromHeap(9, (5 * 6) * BoxPokemon_GetStructSize()); param0->unk_08 = 0; param0->unk_0B = 0; } -static void ov19_021D4E50 (UnkStruct_ov19_021D5594 * param0) +static void ov19_021D4E50(UnkStruct_ov19_021D5594 *param0) { Heap_FreeToHeap(param0->unk_00); } -static void ov19_021D4E5C (PCBoxes * param0, UnkStruct_ov19_021D4F5C * param1) +static void ov19_021D4E5C(PCBoxes *param0, UnkStruct_ov19_021D4F5C *param1) { param1->unk_00 = sub_0207999C(param0); param1->unk_04 = Strbuf_Init(20, 9); ov19_021D4F40(param0, param1); } -static void ov19_021D4E7C (UnkStruct_ov19_021D4F5C * param0) +static void ov19_021D4E7C(UnkStruct_ov19_021D4F5C *param0) { Strbuf_Free(param0->unk_04); } -static void ov19_021D4E88 (UnkStruct_ov19_021D5BAC * param0) +static void ov19_021D4E88(UnkStruct_ov19_021D5BAC *param0) { param0->unk_14 = Strbuf_Init(12, 9); param0->unk_18 = Strbuf_Init(12, 9); @@ -3269,7 +3249,7 @@ static void ov19_021D4E88 (UnkStruct_ov19_021D5BAC * param0) param0->unk_24 = Strbuf_Init(16, 9); } -static void ov19_021D4EC0 (UnkStruct_ov19_021D5BAC * param0) +static void ov19_021D4EC0(UnkStruct_ov19_021D5BAC *param0) { Strbuf_Free(param0->unk_14); Strbuf_Free(param0->unk_18); @@ -3278,7 +3258,7 @@ static void ov19_021D4EC0 (UnkStruct_ov19_021D5BAC * param0) Strbuf_Free(param0->unk_24); } -static void ov19_021D4EE4 (UnkStruct_ov19_021D4EE4 * param0) +static void ov19_021D4EE4(UnkStruct_ov19_021D4EE4 *param0) { int v0; @@ -3293,7 +3273,7 @@ static void ov19_021D4EE4 (UnkStruct_ov19_021D4EE4 * param0) } } -static void ov19_021D4F18 (UnkStruct_ov19_021D4EE4 * param0) +static void ov19_021D4F18(UnkStruct_ov19_021D4EE4 *param0) { int v0; @@ -3303,7 +3283,7 @@ static void ov19_021D4F18 (UnkStruct_ov19_021D4EE4 * param0) } } -static void ov19_021D4F34 (UnkStruct_ov19_021D4F34 * param0) +static void ov19_021D4F34(UnkStruct_ov19_021D4F34 *param0) { param0->unk_00 = 0; param0->unk_02 = 0; @@ -3311,19 +3291,19 @@ static void ov19_021D4F34 (UnkStruct_ov19_021D4F34 * param0) param0->unk_04 = 0; } -static void ov19_021D4F40 (const PCBoxes * param0, UnkStruct_ov19_021D4F5C * param1) +static void ov19_021D4F40(const PCBoxes *param0, UnkStruct_ov19_021D4F5C *param1) { param1->unk_01 = sub_02079AA8(param0, param1->unk_00); sub_02079AF4(param0, param1->unk_00, param1->unk_04); } -static void ov19_021D4F5C (UnkStruct_ov19_021D4DF0 * param0, PCBoxes * param1) +static void ov19_021D4F5C(UnkStruct_ov19_021D4DF0 *param0, PCBoxes *param1) { - UnkStruct_ov19_021D4F5C * v0 = &(param0->unk_40); + UnkStruct_ov19_021D4F5C *v0 = &(param0->unk_40); v0->unk_01 = sub_02079AA8(param1, v0->unk_00); } -static BOOL ov19_021D4F74 (u32 param0, UnkStruct_ov19_021D5DF8 * param1) +static BOOL ov19_021D4F74(u32 param0, UnkStruct_ov19_021D5DF8 *param1) { BOOL v0 = 0; @@ -3356,9 +3336,9 @@ static BOOL ov19_021D4F74 (u32 param0, UnkStruct_ov19_021D5DF8 * param1) return v0; } -static BOOL ov19_021D4FDC (UnkStruct_ov19_021D4DF0 * param0, int param1, int param2) +static BOOL ov19_021D4FDC(UnkStruct_ov19_021D4DF0 *param0, int param1, int param2) { - UnkStruct_ov19_021D3CFC * v0 = ¶m0->unk_08; + UnkStruct_ov19_021D3CFC *v0 = ¶m0->unk_08; switch (v0->unk_04) { case 0: @@ -3431,8 +3411,7 @@ static BOOL ov19_021D4FDC (UnkStruct_ov19_021D4DF0 * param0, int param1, int par return 1; } break; - case 1: - { + case 1: { u32 v3 = v0->unk_08; if (param2 < 0) { @@ -3471,14 +3450,13 @@ static BOOL ov19_021D4FDC (UnkStruct_ov19_021D4DF0 * param0, int param1, int par return 1; } break; - } - break; + } break; } return 0; } -static int ov19_021D5150 (u32 param0, UnkStruct_ov19_021D5DF8 * param1) +static int ov19_021D5150(u32 param0, UnkStruct_ov19_021D5DF8 *param1) { int v0 = 0; @@ -3521,10 +3499,10 @@ static int ov19_021D5150 (u32 param0, UnkStruct_ov19_021D5DF8 * param1) return v0; } -static int ov19_021D51CC (UnkStruct_ov19_021D4DF0 * param0, int param1, int param2) +static int ov19_021D51CC(UnkStruct_ov19_021D4DF0 *param0, int param1, int param2) { - UnkStruct_ov19_021D3CFC * v0 = ¶m0->unk_08; - const UnkStruct_ov19_021D5594 * v1 = ¶m0->unk_14; + UnkStruct_ov19_021D3CFC *v0 = ¶m0->unk_08; + const UnkStruct_ov19_021D5594 *v1 = ¶m0->unk_14; if (v0->unk_04 == 0) { if (param1 != 0) { @@ -3592,10 +3570,10 @@ static int ov19_021D51CC (UnkStruct_ov19_021D4DF0 * param0, int param1, int para return 0; } -static void ov19_021D5290 (UnkStruct_ov19_021D5DF8 * param0) +static void ov19_021D5290(UnkStruct_ov19_021D5DF8 *param0) { - UnkStruct_ov19_021D4DF0 * v0 = ¶m0->unk_00; - UnkStruct_ov19_021D3CFC * v1 = &v0->unk_08; + UnkStruct_ov19_021D4DF0 *v0 = ¶m0->unk_00; + UnkStruct_ov19_021D3CFC *v1 = &v0->unk_08; u32 v2; if (ov19_021D5E38(v0) == 2) { @@ -3614,9 +3592,9 @@ static void ov19_021D5290 (UnkStruct_ov19_021D5DF8 * param0) ov19_021D52F4(param0); } -static void ov19_021D52D0 (UnkStruct_ov19_021D5DF8 * param0) +static void ov19_021D52D0(UnkStruct_ov19_021D5DF8 *param0) { - UnkStruct_ov19_021D3CFC * v0 = &(param0->unk_00.unk_08); + UnkStruct_ov19_021D3CFC *v0 = &(param0->unk_00.unk_08); v0->unk_04 = 0; @@ -3627,11 +3605,11 @@ static void ov19_021D52D0 (UnkStruct_ov19_021D5DF8 * param0) ov19_021D52F4(param0); } -static BOOL ov19_021D52F4 (UnkStruct_ov19_021D5DF8 * param0) +static BOOL ov19_021D52F4(UnkStruct_ov19_021D5DF8 *param0) { - UnkStruct_ov19_021D4DF0 * v0 = ¶m0->unk_00; - UnkStruct_ov19_021D5BAC * v1 = &v0->unk_4C; - UnkStruct_ov19_021D3CFC * v2 = &v0->unk_08; + UnkStruct_ov19_021D4DF0 *v0 = ¶m0->unk_00; + UnkStruct_ov19_021D5BAC *v1 = &v0->unk_4C; + UnkStruct_ov19_021D3CFC *v2 = &v0->unk_08; u32 v3; v2->unk_0A = 0; @@ -3670,7 +3648,7 @@ static BOOL ov19_021D52F4 (UnkStruct_ov19_021D5DF8 * param0) return 0; } -static BOOL ov19_021D538C (UnkStruct_ov19_021D5DF8 * param0) +static BOOL ov19_021D538C(UnkStruct_ov19_021D5DF8 *param0) { param0->unk_184 = 65535; sub_0202404C(param0->unk_17C); @@ -3678,9 +3656,9 @@ static BOOL ov19_021D538C (UnkStruct_ov19_021D5DF8 * param0) return param0->unk_184 != 65535; } -static void ov19_021D53B8 (u32 param0, u32 param1, void * param2) +static void ov19_021D53B8(u32 param0, u32 param1, void *param2) { - UnkStruct_ov19_021D5DF8 * v0 = (UnkStruct_ov19_021D5DF8 *)param2; + UnkStruct_ov19_021D5DF8 *v0 = (UnkStruct_ov19_021D5DF8 *)param2; if ((param1 == 0) && (v0->unk_184 == 65535)) { v0->unk_184 = param0; @@ -3701,24 +3679,24 @@ static void ov19_021D53B8 (u32 param0, u32 param1, void * param2) } } -static void ov19_021D5408 (UnkStruct_ov19_021D4DF0 * param0, u32 param1) +static void ov19_021D5408(UnkStruct_ov19_021D4DF0 *param0, u32 param1) { param0->unk_10C = param1; } -static void ov19_021D5410 (UnkStruct_ov19_021D4DF0 * param0, u32 param1, u32 param2) +static void ov19_021D5410(UnkStruct_ov19_021D4DF0 *param0, u32 param1, u32 param2) { - UnkStruct_ov19_021D3CFC * v0 = ¶m0->unk_08; + UnkStruct_ov19_021D3CFC *v0 = ¶m0->unk_08; v0->unk_05 = param1; v0->unk_06 = param2; v0->unk_07 = param2 * 6 + param1; } -static void ov19_021D5420 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1) +static void ov19_021D5420(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_ov19_021D4DF0 *param1) { - UnkStruct_ov19_021D5594 * v0 = ¶m1->unk_14; - UnkStruct_ov19_021D3CFC * v1 = ¶m1->unk_08; + UnkStruct_ov19_021D5594 *v0 = ¶m1->unk_14; + UnkStruct_ov19_021D3CFC *v1 = ¶m1->unk_08; if (ov19_021D5E10(param1) == 0) { MI_CpuCopy32(v1->unk_00, v0->unk_00, BoxPokemon_GetStructSize()); @@ -3739,12 +3717,12 @@ static void ov19_021D5420 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D param1->unk_08.unk_0A = 0; } -static void ov19_021D54A4 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1) +static void ov19_021D54A4(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_ov19_021D4DF0 *param1) { u32 v0, v1, v2, v3, v4, v5, v6, v7, v8, v9; - BoxPokemon * v10; - UnkStruct_ov19_021D5594 * v11; - void * v12; + BoxPokemon *v10; + UnkStruct_ov19_021D5594 *v11; + void *v12; v11 = ¶m1->unk_14; @@ -3784,29 +3762,29 @@ static void ov19_021D54A4 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D param1->unk_08.unk_0A = 0; } -static void ov19_021D5594 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1) +static void ov19_021D5594(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_ov19_021D4DF0 *param1) { - UnkStruct_ov19_021D5594 * v0 = ¶m1->unk_14; - UnkStruct_ov19_021D3CFC * v1 = ¶m1->unk_08; + UnkStruct_ov19_021D5594 *v0 = ¶m1->unk_14; + UnkStruct_ov19_021D3CFC *v1 = ¶m1->unk_08; v0->unk_04 = v0->unk_06 = v1->unk_05; v0->unk_05 = v0->unk_07 = v1->unk_06; } -static void ov19_021D55B0 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1) +static void ov19_021D55B0(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_ov19_021D4DF0 *param1) { - UnkStruct_ov19_021D5594 * v0 = ¶m1->unk_14; - UnkStruct_ov19_021D3CFC * v1 = ¶m1->unk_08; + UnkStruct_ov19_021D5594 *v0 = ¶m1->unk_14; + UnkStruct_ov19_021D3CFC *v1 = ¶m1->unk_08; v0->unk_06 = v1->unk_05; v0->unk_07 = v1->unk_06; } -static void ov19_021D55C4 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1) +static void ov19_021D55C4(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_ov19_021D4DF0 *param1) { - UnkStruct_ov19_021D5594 * v0 = ¶m1->unk_14; - UnkStruct_ov19_021D3CFC * v1 = ¶m1->unk_08; - BoxPokemon * v2; + UnkStruct_ov19_021D5594 *v0 = ¶m1->unk_14; + UnkStruct_ov19_021D3CFC *v1 = ¶m1->unk_08; + BoxPokemon *v2; int v3 = 0, v4; BOOL v5; @@ -3841,12 +3819,12 @@ static void ov19_021D55C4 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D param1->unk_08.unk_0A = 1; } -static void ov19_021D56AC (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1) +static void ov19_021D56AC(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_ov19_021D4DF0 *param1) { - BoxPokemon * v0; + BoxPokemon *v0; int v1, v2, v3, v4, v5; - UnkStruct_ov19_021D3CFC * v6 = ¶m1->unk_08; - UnkStruct_ov19_021D5594 * v7 = ¶m1->unk_14; + UnkStruct_ov19_021D3CFC *v6 = ¶m1->unk_08; + UnkStruct_ov19_021D5594 *v7 = ¶m1->unk_14; v3 = ov19_021D5F3C(param1); v2 = v7->unk_09; @@ -3866,12 +3844,12 @@ static void ov19_021D56AC (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D param1->unk_08.unk_0B = 1; } -static void ov19_021D5734 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D4DF0 * param1) +static void ov19_021D5734(UnkStruct_ov19_021D5DF8 *param0, UnkStruct_ov19_021D4DF0 *param1) { u32 v0; - void * v1; - UnkStruct_ov19_021D5594 * v2; - UnkStruct_ov19_021D3CFC * v3; + void *v1; + UnkStruct_ov19_021D5594 *v2; + UnkStruct_ov19_021D3CFC *v3; v2 = ¶m1->unk_14; v0 = Pokemon_GetStructSize(); @@ -3898,11 +3876,11 @@ static void ov19_021D5734 (UnkStruct_ov19_021D5DF8 * param0, UnkStruct_ov19_021D ov19_021D5888(param1, v2->unk_00, param0); } -static BOOL ov19_021D57D8 (UnkStruct_ov19_021D5DF8 * param0, u32 param1) +static BOOL ov19_021D57D8(UnkStruct_ov19_021D5DF8 *param0, u32 param1) { - UnkStruct_ov19_021D4DF0 * v0; - UnkStruct_ov19_021D3CFC * v1; - UnkStruct_ov19_021D5594 * v2; + UnkStruct_ov19_021D4DF0 *v0; + UnkStruct_ov19_021D3CFC *v1; + UnkStruct_ov19_021D5594 *v2; v0 = &(param0->unk_00); v1 = &v0->unk_08; @@ -3917,10 +3895,10 @@ static BOOL ov19_021D57D8 (UnkStruct_ov19_021D5DF8 * param0, u32 param1) return 0; } -static BOOL ov19_021D5800 (UnkStruct_ov19_021D5DF8 * param0, u32 param1) +static BOOL ov19_021D5800(UnkStruct_ov19_021D5DF8 *param0, u32 param1) { - UnkStruct_ov19_021D4DF0 * v0; - UnkStruct_ov19_021D3CFC * v1; + UnkStruct_ov19_021D4DF0 *v0; + UnkStruct_ov19_021D3CFC *v1; v0 = &(param0->unk_00); v1 = &v0->unk_08; @@ -3934,11 +3912,11 @@ static BOOL ov19_021D5800 (UnkStruct_ov19_021D5DF8 * param0, u32 param1) return 0; } -static void ov19_021D5834 (UnkStruct_ov19_021D5DF8 * param0) +static void ov19_021D5834(UnkStruct_ov19_021D5DF8 *param0) { - UnkStruct_ov19_021D4DF0 * v0; - UnkStruct_ov19_021D3CFC * v1; - UnkStruct_ov19_021D5594 * v2; + UnkStruct_ov19_021D4DF0 *v0; + UnkStruct_ov19_021D3CFC *v1; + UnkStruct_ov19_021D5594 *v2; v0 = &(param0->unk_00); v1 = &v0->unk_08; @@ -3949,10 +3927,10 @@ static void ov19_021D5834 (UnkStruct_ov19_021D5DF8 * param0) ov19_021D52F4(param0); } -static void ov19_021D584C (UnkStruct_ov19_021D5DF8 * param0) +static void ov19_021D584C(UnkStruct_ov19_021D5DF8 *param0) { - UnkStruct_ov19_021D4DF0 * v0 = &(param0->unk_00); - UnkStruct_ov19_021D3CFC * v1 = &v0->unk_08; + UnkStruct_ov19_021D4DF0 *v0 = &(param0->unk_00); + UnkStruct_ov19_021D3CFC *v1 = &v0->unk_08; if (ov19_021D5E10(v0) == 0) { sub_02079968(param0->unk_120, 0xffffffff, v1->unk_07); @@ -3963,7 +3941,7 @@ static void ov19_021D584C (UnkStruct_ov19_021D5DF8 * param0) ov19_021D52F4(param0); } -static void ov19_021D5888 (UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1, UnkStruct_ov19_021D5DF8 * param2) +static void ov19_021D5888(UnkStruct_ov19_021D4DF0 *param0, BoxPokemon *param1, UnkStruct_ov19_021D5DF8 *param2) { ov19_021D58AC(param0, param1, param2); @@ -3972,11 +3950,11 @@ static void ov19_021D5888 (UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1 } } -static void ov19_021D58AC (UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1, UnkStruct_ov19_021D5DF8 * param2) +static void ov19_021D58AC(UnkStruct_ov19_021D4DF0 *param0, BoxPokemon *param1, UnkStruct_ov19_021D5DF8 *param2) { - UnkStruct_ov19_021D5BAC * v0 = &(param0->unk_4C); + UnkStruct_ov19_021D5BAC *v0 = &(param0->unk_4C); BOOL v1 = BoxPokemon_EnterDecryptionContext(param1); - PokemonPersonalData * v2; + PokemonPersonalData *v2; v0->unk_00 = param1; v0->unk_04 = BoxPokemon_GetValue(param1, MON_DATA_SPECIES, NULL); @@ -4022,10 +4000,10 @@ static void ov19_021D58AC (UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1 BoxPokemon_ExitDecryptionContext(param1, v1); } -static void ov19_021D59F4 (UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1, UnkStruct_ov19_021D5DF8 * param2) +static void ov19_021D59F4(UnkStruct_ov19_021D4DF0 *param0, BoxPokemon *param1, UnkStruct_ov19_021D5DF8 *param2) { - UnkStruct_ov19_021D5BAC * v0 = &(param0->unk_4C); - UnkStruct_ov19_021D5FAC * v1 = &(param0->unk_A4.unk_08[param0->unk_A4.unk_00]); + UnkStruct_ov19_021D5BAC *v0 = &(param0->unk_4C); + UnkStruct_ov19_021D5FAC *v1 = &(param0->unk_A4.unk_08[param0->unk_A4.unk_00]); BOOL v2; v1->unk_00 = param1; @@ -4066,31 +4044,31 @@ static void ov19_021D59F4 (UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1 param0->unk_A4.unk_02[param0->unk_A4.unk_00] = 1; } -static void ov19_021D5B70 (UnkStruct_ov19_021D4DF0 * param0) +static void ov19_021D5B70(UnkStruct_ov19_021D4DF0 *param0) { param0->unk_A4.unk_00 ^= 1; } -static void ov19_021D5B80 (UnkStruct_ov19_021D4DF0 * param0) +static void ov19_021D5B80(UnkStruct_ov19_021D4DF0 *param0) { if (++(param0->unk_A4.unk_01) >= 3) { param0->unk_A4.unk_01 = 0; } } -static void ov19_021D5BA0 (UnkStruct_ov19_021D4DF0 * param0, BOOL param1) +static void ov19_021D5BA0(UnkStruct_ov19_021D4DF0 *param0, BOOL param1) { param0->unk_A4.unk_04 = param1; } -static void ov19_021D5BA8 (UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1) +static void ov19_021D5BA8(UnkStruct_ov19_021D4DF0 *param0, BoxPokemon *param1) { param0->unk_4C.unk_00 = param1; } -static void ov19_021D5BAC (UnkStruct_ov19_021D4DF0 * param0) +static void ov19_021D5BAC(UnkStruct_ov19_021D4DF0 *param0) { - UnkStruct_ov19_021D5BAC * v0; + UnkStruct_ov19_021D5BAC *v0; u8 v1; v0 = &(param0->unk_4C); @@ -4104,9 +4082,9 @@ static void ov19_021D5BAC (UnkStruct_ov19_021D4DF0 * param0) } } -static void ov19_021D5BE8 (UnkStruct_ov19_021D4DF0 * param0, u16 param1, UnkStruct_ov19_021D5DF8 * param2) +static void ov19_021D5BE8(UnkStruct_ov19_021D4DF0 *param0, u16 param1, UnkStruct_ov19_021D5DF8 *param2) { - UnkStruct_ov19_021D5BAC * v0; + UnkStruct_ov19_021D5BAC *v0; v0 = &(param0->unk_4C); v0->unk_06 = param1; @@ -4141,9 +4119,9 @@ static void ov19_021D5BE8 (UnkStruct_ov19_021D4DF0 * param0, u16 param1, UnkStru } } -static void ov19_021D5CBC (UnkStruct_ov19_021D4DF0 * param0) +static void ov19_021D5CBC(UnkStruct_ov19_021D4DF0 *param0) { - UnkStruct_ov19_021D4F5C * v0 = &(param0->unk_40); + UnkStruct_ov19_021D4F5C *v0 = &(param0->unk_40); if (++(v0->unk_00) >= 18) { v0->unk_00 = 0; @@ -4152,9 +4130,9 @@ static void ov19_021D5CBC (UnkStruct_ov19_021D4DF0 * param0) ov19_021D4F40(param0->unk_00, v0); } -static void ov19_021D5CE8 (UnkStruct_ov19_021D4DF0 * param0) +static void ov19_021D5CE8(UnkStruct_ov19_021D4DF0 *param0) { - UnkStruct_ov19_021D4F5C * v0 = &(param0->unk_40); + UnkStruct_ov19_021D4F5C *v0 = &(param0->unk_40); if (v0->unk_00) { v0->unk_00--; @@ -4165,23 +4143,23 @@ static void ov19_021D5CE8 (UnkStruct_ov19_021D4DF0 * param0) ov19_021D4F40(param0->unk_00, v0); } -static void ov19_021D5D08 (UnkStruct_ov19_021D4DF0 * param0, u32 param1) +static void ov19_021D5D08(UnkStruct_ov19_021D4DF0 *param0, u32 param1) { - UnkStruct_ov19_021D4F5C * v0 = &(param0->unk_40); + UnkStruct_ov19_021D4F5C *v0 = &(param0->unk_40); v0->unk_00 = param1; ov19_021D4F40(param0->unk_00, v0); } -static void ov19_021D5D20 (UnkStruct_ov19_021D4DF0 * param0, u32 param1) +static void ov19_021D5D20(UnkStruct_ov19_021D4DF0 *param0, u32 param1) { - UnkStruct_ov19_021D5D20 * v0 = &(param0->unk_98); + UnkStruct_ov19_021D5D20 *v0 = &(param0->unk_98); v0->unk_00 = param1; } -static void ov19_021D5D28 (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_ov19_021D5DF8 * param1) +static void ov19_021D5D28(UnkStruct_ov19_021D4DF0 *param0, UnkStruct_ov19_021D5DF8 *param1) { - UnkStruct_ov19_021D5BAC * v0 = &(param0->unk_4C); + UnkStruct_ov19_021D5BAC *v0 = &(param0->unk_4C); u16 v1 = 0; param0->unk_112 = v0->unk_06; @@ -4190,14 +4168,14 @@ static void ov19_021D5D28 (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_ov19_021D ov19_021D5BE8(param0, v1, param1); } -static void ov19_021D5D54 (UnkStruct_ov19_021D4DF0 * param0) +static void ov19_021D5D54(UnkStruct_ov19_021D4DF0 *param0) { param0->unk_112 = 0; } -static void ov19_021D5D60 (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_ov19_021D5DF8 * param1) +static void ov19_021D5D60(UnkStruct_ov19_021D4DF0 *param0, UnkStruct_ov19_021D5DF8 *param1) { - UnkStruct_ov19_021D5BAC * v0 = &(param0->unk_4C); + UnkStruct_ov19_021D5BAC *v0 = &(param0->unk_4C); u16 v1; v1 = param0->unk_112; @@ -4206,9 +4184,9 @@ static void ov19_021D5D60 (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_ov19_021D ov19_021D5BE8(param0, v1, param1); } -static void ov19_021D5D78 (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_ov19_021D5DF8 * param1) +static void ov19_021D5D78(UnkStruct_ov19_021D4DF0 *param0, UnkStruct_ov19_021D5DF8 *param1) { - UnkStruct_ov19_021D5BAC * v0 = &(param0->unk_4C); + UnkStruct_ov19_021D5BAC *v0 = &(param0->unk_4C); u16 v1; v1 = param0->unk_112; @@ -4217,27 +4195,27 @@ static void ov19_021D5D78 (UnkStruct_ov19_021D4DF0 * param0, UnkStruct_ov19_021D ov19_021D5BE8(param0, v1, param1); } -static void ov19_021D5D94 (UnkStruct_ov19_021D4DF0 * param0, u32 param1) +static void ov19_021D5D94(UnkStruct_ov19_021D4DF0 *param0, u32 param1) { param0->unk_9C.unk_00 = param1; } -static void ov19_021D5D9C (UnkStruct_ov19_021D4DF0 * param0, u32 param1) +static void ov19_021D5D9C(UnkStruct_ov19_021D4DF0 *param0, u32 param1) { param0->unk_9C.unk_02 = param1; } -static void ov19_021D5DA4 (UnkStruct_ov19_021D4DF0 * param0, u32 param1) +static void ov19_021D5DA4(UnkStruct_ov19_021D4DF0 *param0, u32 param1) { param0->unk_9C.unk_01 = param1; } -static void ov19_021D5DAC (UnkStruct_ov19_021D4DF0 * param0, int param1) +static void ov19_021D5DAC(UnkStruct_ov19_021D4DF0 *param0, int param1) { param0->unk_9C.unk_04 = param1; } -static void ov19_021D5DB4 (UnkStruct_ov19_021D4DF0 * param0, u32 param1) +static void ov19_021D5DB4(UnkStruct_ov19_021D4DF0 *param0, u32 param1) { if (param1 == 0) { param0->unk_48.unk_02 = 0; @@ -4246,67 +4224,67 @@ static void ov19_021D5DB4 (UnkStruct_ov19_021D4DF0 * param0, u32 param1) } } -static void ov19_021D5DD8 (UnkStruct_ov19_021D4DF0 * param0) +static void ov19_021D5DD8(UnkStruct_ov19_021D4DF0 *param0) { param0->unk_48.unk_01 ^= 1; } -MessageLoader * ov19_021D5DE8 (const UnkStruct_ov19_021D5DF8 * param0) +MessageLoader *ov19_021D5DE8(const UnkStruct_ov19_021D5DF8 *param0) { return param0->unk_18C; } -const StringTemplate * ov19_021D5DF0 (const UnkStruct_ov19_021D5DF8 * param0) +const StringTemplate *ov19_021D5DF0(const UnkStruct_ov19_021D5DF8 *param0) { return param0->unk_19C; } -int ov19_021D5DF8 (const UnkStruct_ov19_021D5DF8 * param0) +int ov19_021D5DF8(const UnkStruct_ov19_021D5DF8 *param0) { return Options_Frame(param0->unk_1A4); } -u32 ov19_021D5E08 (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5E08(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_48.unk_00; } -u32 ov19_021D5E10 (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5E10(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_08.unk_04; } -u32 ov19_021D5E14 (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5E14(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_08.unk_05; } -u32 ov19_021D5E1C (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5E1C(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_08.unk_06; } -u32 ov19_021D5E24 (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5E24(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_08.unk_07; } -u32 ov19_021D5E2C (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5E2C(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_08.unk_08; } -BOOL ov19_021D5E34 (const UnkStruct_ov19_021D4DF0 * param0) +BOOL ov19_021D5E34(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_08.unk_0A; } -u32 ov19_021D5E38 (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5E38(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_08.unk_0B; } -BOOL ov19_021D5E3C (const UnkStruct_ov19_021D4DF0 * param0) +BOOL ov19_021D5E3C(const UnkStruct_ov19_021D4DF0 *param0) { if (param0->unk_08.unk_0B) { return param0->unk_14.unk_0B; @@ -4315,10 +4293,10 @@ BOOL ov19_021D5E3C (const UnkStruct_ov19_021D4DF0 * param0) return 0; } -BOOL ov19_021D5E4C (const UnkStruct_ov19_021D4DF0 * param0) +BOOL ov19_021D5E4C(const UnkStruct_ov19_021D4DF0 *param0) { - const UnkStruct_ov19_021D5594 * v0; - const UnkStruct_ov19_021D3CFC * v1; + const UnkStruct_ov19_021D5594 *v0; + const UnkStruct_ov19_021D3CFC *v1; v0 = ¶m0->unk_14; v1 = ¶m0->unk_08; @@ -4334,17 +4312,17 @@ BOOL ov19_021D5E4C (const UnkStruct_ov19_021D4DF0 * param0) return 0; } -u32 ov19_021D5E68 (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5E68(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_40.unk_00; } -const UnkStruct_ov19_021D5BAC * ov19_021D5E70 (const UnkStruct_ov19_021D4DF0 * param0) +const UnkStruct_ov19_021D5BAC *ov19_021D5E70(const UnkStruct_ov19_021D4DF0 *param0) { return &(param0->unk_4C); } -u32 ov19_021D5E74 (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5E74(const UnkStruct_ov19_021D4DF0 *param0) { if (ov19_021D5E4C(param0)) { return param0->unk_4C.unk_06; @@ -4353,52 +4331,52 @@ u32 ov19_021D5E74 (const UnkStruct_ov19_021D4DF0 * param0) return 0; } -const UnkStruct_ov19_021D4F5C * ov19_021D5E8C (const UnkStruct_ov19_021D4DF0 * param0) +const UnkStruct_ov19_021D4F5C *ov19_021D5E8C(const UnkStruct_ov19_021D4DF0 *param0) { return &(param0->unk_40); } -const PCBoxes * ov19_021D5E90 (const UnkStruct_ov19_021D4DF0 * param0) +const PCBoxes *ov19_021D5E90(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_00; } -u32 ov19_021D5E94 (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5E94(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_10C; } -BoxPokemon * ov19_021D5E9C (const UnkStruct_ov19_021D4DF0 * param0) +BoxPokemon *ov19_021D5E9C(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_4C.unk_00; } -u32 ov19_021D5EA0 (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5EA0(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_4C.unk_0B; } -u32 ov19_021D5EA8 (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5EA8(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_98.unk_00; } -s32 ov19_021D5EB0 (const UnkStruct_ov19_021D4DF0 * param0) +s32 ov19_021D5EB0(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_9C.unk_04; } -u32 ov19_021D5EB8 (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5EB8(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_9C.unk_02; } -u32 ov19_021D5EC0 (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5EC0(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_9C.unk_01; } -u32 ov19_021D5EC8 (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5EC8(const UnkStruct_ov19_021D4DF0 *param0) { if (ov19_021D5E08(param0) != 3) { return param0->unk_48.unk_02; @@ -4407,14 +4385,14 @@ u32 ov19_021D5EC8 (const UnkStruct_ov19_021D4DF0 * param0) } } -BOOL ov19_021D5EE0 (const UnkStruct_ov19_021D4DF0 * param0) +BOOL ov19_021D5EE0(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_48.unk_01; } -void ov19_021D5EE8 (const UnkStruct_ov19_021D4DF0 * param0, u32 * param1, u32 * param2, u32 * param3, u32 * param4) +void ov19_021D5EE8(const UnkStruct_ov19_021D4DF0 *param0, u32 *param1, u32 *param2, u32 *param3, u32 *param4) { - const UnkStruct_ov19_021D5594 * v0; + const UnkStruct_ov19_021D5594 *v0; v0 = ¶m0->unk_14; @@ -4435,9 +4413,9 @@ void ov19_021D5EE8 (const UnkStruct_ov19_021D4DF0 * param0, u32 * param1, u32 * } } -BOOL ov19_021D5F20 (const UnkStruct_ov19_021D4DF0 * param0) +BOOL ov19_021D5F20(const UnkStruct_ov19_021D4DF0 *param0) { - const UnkStruct_ov19_021D5594 * v0; + const UnkStruct_ov19_021D5594 *v0; v0 = ¶m0->unk_14; @@ -4448,9 +4426,9 @@ BOOL ov19_021D5F20 (const UnkStruct_ov19_021D4DF0 * param0) return 0; } -u32 ov19_021D5F3C (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5F3C(const UnkStruct_ov19_021D4DF0 *param0) { - const UnkStruct_ov19_021D5594 * v0; + const UnkStruct_ov19_021D5594 *v0; int v1, v2; v0 = ¶m0->unk_14; @@ -4468,18 +4446,18 @@ u32 ov19_021D5F3C (const UnkStruct_ov19_021D4DF0 * param0) return v2 * 6 + v1; } -u32 ov19_021D5F6C (const UnkStruct_ov19_021D4DF0 * param0, u32 param1) +u32 ov19_021D5F6C(const UnkStruct_ov19_021D4DF0 *param0, u32 param1) { - const UnkStruct_ov19_021D5594 * v0 = ¶m0->unk_14; + const UnkStruct_ov19_021D5594 *v0 = ¶m0->unk_14; return v0->unk_0C[param1] - v0->unk_09; } -u32 ov19_021D5F7C (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5F7C(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_112; } -u32 ov19_021D5F88 (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5F88(const UnkStruct_ov19_021D4DF0 *param0) { u32 v0 = ov19_021D5F7C(param0); @@ -4490,44 +4468,44 @@ u32 ov19_021D5F88 (const UnkStruct_ov19_021D4DF0 * param0) return ov19_021D5E74(param0); } -u32 ov19_021D5F9C (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5F9C(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_A4.unk_00; } -u32 ov19_021D5FA4 (const UnkStruct_ov19_021D4DF0 * param0) +u32 ov19_021D5FA4(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_A4.unk_01; } -const UnkStruct_ov19_021D5FAC * ov19_021D5FAC (const UnkStruct_ov19_021D4DF0 * param0, int param1) +const UnkStruct_ov19_021D5FAC *ov19_021D5FAC(const UnkStruct_ov19_021D4DF0 *param0, int param1) { return ¶m0->unk_A4.unk_08[param1]; } -BOOL ov19_021D5FB8 (const UnkStruct_ov19_021D4DF0 * param0, int param1) +BOOL ov19_021D5FB8(const UnkStruct_ov19_021D4DF0 *param0, int param1) { return param0->unk_A4.unk_02[param1]; } -BOOL ov19_021D5FC0 (const UnkStruct_ov19_021D4DF0 * param0) +BOOL ov19_021D5FC0(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_A4.unk_04; } -BOOL ov19_021D5FC8 (const UnkStruct_ov19_021D4DF0 * param0) +BOOL ov19_021D5FC8(const UnkStruct_ov19_021D4DF0 *param0) { return param0->unk_4C.unk_0F; } -static u32 ov19_021D5FD0 (UnkStruct_ov19_021D4DF0 * param0, int param1, void * param2) +static u32 ov19_021D5FD0(UnkStruct_ov19_021D4DF0 *param0, int param1, void *param2) { if (ov19_021D5E38(param0) == 1) { if (ov19_021D5E10(param0) == 0) { return BoxPokemon_GetValue(param0->unk_4C.unk_00, param1, param2); } } else { - UnkStruct_ov19_021D5594 * v0 = ¶m0->unk_14; + UnkStruct_ov19_021D5594 *v0 = ¶m0->unk_14; if (v0->unk_0B == 0) { return BoxPokemon_GetValue(param0->unk_4C.unk_00, param1, param2); @@ -4537,7 +4515,7 @@ static u32 ov19_021D5FD0 (UnkStruct_ov19_021D4DF0 * param0, int param1, void * p return Pokemon_GetValue(param0->unk_4C.unk_00, param1, param2); } -static u32 ov19_021D6014 (UnkStruct_ov19_021D4DF0 * param0, int param1, void * param2) +static u32 ov19_021D6014(UnkStruct_ov19_021D4DF0 *param0, int param1, void *param2) { if (ov19_021D5E10(param0) == 0) { return BoxPokemon_GetValue(param0->unk_4C.unk_00, param1, param2); diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c index 7936d00da2..596c232b48 100644 --- a/src/overlay020/ov20_021D4728.c +++ b/src/overlay020/ov20_021D4728.c @@ -28,27 +28,27 @@ #include "unk_02018340.h" typedef struct { - void * unk_00; - NNSG2dCellDataBank * unk_04; - void * unk_08; - NNSG2dAnimBankData * unk_0C; + void *unk_00; + NNSG2dCellDataBank *unk_04; + void *unk_08; + NNSG2dAnimBankData *unk_0C; } UnkStruct_ov20_021D4B2C; typedef struct UnkStruct_ov20_021D4AD4_t { - UnkStruct_ov20_021D2128 * unk_00; - const UnkStruct_ov20_021D16E8 * unk_04; - const UnkStruct_020998EC * unk_08; - BGL * unk_0C; - CellActorCollection * unk_10; - CellActor * unk_14; - CellActor * unk_18; + UnkStruct_ov20_021D2128 *unk_00; + const UnkStruct_ov20_021D16E8 *unk_04; + const UnkStruct_020998EC *unk_08; + BGL *unk_0C; + CellActorCollection *unk_10; + CellActor *unk_14; + CellActor *unk_18; UnkStruct_ov20_021D4B2C unk_1C; u16 unk_2C[8][77]; - SysTask * unk_4FC; + SysTask *unk_4FC; } UnkStruct_ov20_021D4AD4; typedef struct { - UnkStruct_ov20_021D4AD4 * unk_00; + UnkStruct_ov20_021D4AD4 *unk_00; int unk_04; u16 unk_08; u16 unk_0A; @@ -60,19 +60,19 @@ typedef struct { u16 unk_16; } UnkStruct_ov20_021D4BA4; -static void ov20_021D4874(UnkStruct_ov20_021D4AD4 * param0, NARC * param1); -static void ov20_021D48C4(UnkStruct_ov20_021D4AD4 * param0, NARC * param1); -static void ov20_021D498C(Window * param0, BGL * param1, const Strbuf *param2, int param3); -static void ov20_021D4A24(UnkStruct_ov20_021D4AD4 * param0, NARC * param1); -static void ov20_021D4AD4(UnkStruct_ov20_021D4AD4 * param0); -static void ov20_021D4AF8(UnkStruct_ov20_021D4B2C * param0, NARC * param1, u32 param2, u32 param3); -static void ov20_021D4B2C(UnkStruct_ov20_021D4B2C * param0); -static void ov20_021D4C40(SysTask * param0, void * param1); -static CellActor * ov20_021D4B40(UnkStruct_ov20_021D4AD4 * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, UnkStruct_ov20_021D4B2C * param3, int param4, int param5, int param6, int param7); - -UnkStruct_ov20_021D4AD4 * ov20_021D4728 (UnkStruct_ov20_021D2128 * param0, const UnkStruct_ov20_021D16E8 * param1, const UnkStruct_020998EC * param2) +static void ov20_021D4874(UnkStruct_ov20_021D4AD4 *param0, NARC *param1); +static void ov20_021D48C4(UnkStruct_ov20_021D4AD4 *param0, NARC *param1); +static void ov20_021D498C(Window *param0, BGL *param1, const Strbuf *param2, int param3); +static void ov20_021D4A24(UnkStruct_ov20_021D4AD4 *param0, NARC *param1); +static void ov20_021D4AD4(UnkStruct_ov20_021D4AD4 *param0); +static void ov20_021D4AF8(UnkStruct_ov20_021D4B2C *param0, NARC *param1, u32 param2, u32 param3); +static void ov20_021D4B2C(UnkStruct_ov20_021D4B2C *param0); +static void ov20_021D4C40(SysTask *param0, void *param1); +static CellActor *ov20_021D4B40(UnkStruct_ov20_021D4AD4 *param0, NNSG2dImageProxy *param1, NNSG2dImagePaletteProxy *param2, UnkStruct_ov20_021D4B2C *param3, int param4, int param5, int param6, int param7); + +UnkStruct_ov20_021D4AD4 *ov20_021D4728(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2) { - UnkStruct_ov20_021D4AD4 * v0 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D4AD4)); + UnkStruct_ov20_021D4AD4 *v0 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D4AD4)); v0->unk_00 = param0; v0->unk_04 = param1; @@ -86,13 +86,13 @@ UnkStruct_ov20_021D4AD4 * ov20_021D4728 (UnkStruct_ov20_021D2128 * param0, const return v0; } -void ov20_021D4764 (UnkStruct_ov20_021D4AD4 * param0) +void ov20_021D4764(UnkStruct_ov20_021D4AD4 *param0) { ov20_021D4AD4(param0); Heap_FreeToHeap(param0); } -void ov20_021D4774 (UnkStruct_ov20_021D4AD4 * param0, NARC * param1) +void ov20_021D4774(UnkStruct_ov20_021D4AD4 *param0, NARC *param1) { sub_02007130(param1, 21, 4, 0, 0x40, 35); sub_0200710C(param1, 11, param0->unk_0C, 4, 0, 0, 1, 35); @@ -112,14 +112,21 @@ void ov20_021D4774 (UnkStruct_ov20_021D4AD4 * param0, NARC * param1) sub_02019448(param0->unk_0C, 4); } -static void ov20_021D4874 (UnkStruct_ov20_021D4AD4 * param0, NARC * param1) +static void ov20_021D4874(UnkStruct_ov20_021D4AD4 *param0, NARC *param1) { static const u16 v0[] = { - 12, 13, 14, 15, 16, 17, 18, 19, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, }; int v1; - void * v2; - NNSG2dScreenData * v3; + void *v2; + NNSG2dScreenData *v3; for (v1 = 0; v1 < NELEMS(v0); v1++) { v2 = sub_020071D0(param1, v0[v1], 1, &v3, 35); @@ -165,7 +172,10 @@ static void ov20_021D48C4(UnkStruct_ov20_021D4AD4 *param0, NARC *param1) } static const s16 Unk_ov20_021D52EC[] = { - 22, (22 + 56 * 1) - 1, (22 + 56 * 2) - 2, (22 + 56 * 3) - 1, + 22, + (22 + 56 * 1) - 1, + (22 + 56 * 2) - 2, + (22 + 56 * 3) - 1, }; static void ov20_021D498C(Window *param0, BGL *param1, const Strbuf *param2, int param3) @@ -190,7 +200,7 @@ static void ov20_021D498C(Window *param0, BGL *param1, const Strbuf *param2, int Strbuf_Free(v5); } -static void ov20_021D4A24 (UnkStruct_ov20_021D4AD4 * param0, NARC * param1) +static void ov20_021D4A24(UnkStruct_ov20_021D4AD4 *param0, NARC *param1) { NNSG2dImagePaletteProxy v0; NNSG2dImageProxy v1; @@ -212,7 +222,7 @@ static void ov20_021D4A24 (UnkStruct_ov20_021D4AD4 * param0, NARC * param1) CellActor_SetDrawFlag(param0->unk_18, 0); } -static void ov20_021D4AD4 (UnkStruct_ov20_021D4AD4 * param0) +static void ov20_021D4AD4(UnkStruct_ov20_021D4AD4 *param0) { if (param0->unk_14) { CellActor_Delete(param0->unk_14); @@ -225,23 +235,23 @@ static void ov20_021D4AD4 (UnkStruct_ov20_021D4AD4 * param0) ov20_021D4B2C(¶m0->unk_1C); } -static void ov20_021D4AF8 (UnkStruct_ov20_021D4B2C * param0, NARC * param1, u32 param2, u32 param3) +static void ov20_021D4AF8(UnkStruct_ov20_021D4B2C *param0, NARC *param1, u32 param2, u32 param3) { param0->unk_00 = sub_02007204(param1, param2, 1, &(param0->unk_04), 35); param0->unk_08 = sub_02007220(param1, param3, 1, &(param0->unk_0C), 35); } -static void ov20_021D4B2C (UnkStruct_ov20_021D4B2C * param0) +static void ov20_021D4B2C(UnkStruct_ov20_021D4B2C *param0) { Heap_FreeToHeap(param0->unk_00); Heap_FreeToHeap(param0->unk_08); } -static CellActor * ov20_021D4B40 (UnkStruct_ov20_021D4AD4 * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, UnkStruct_ov20_021D4B2C * param3, int param4, int param5, int param6, int param7) +static CellActor *ov20_021D4B40(UnkStruct_ov20_021D4AD4 *param0, NNSG2dImageProxy *param1, NNSG2dImagePaletteProxy *param2, UnkStruct_ov20_021D4B2C *param3, int param4, int param5, int param6, int param7) { CellActorResourceData v0; CellActorInitParams v1; - CellActor * v2; + CellActor *v2; v0.imageProxy = param1; v0.paletteProxy = param2; @@ -272,9 +282,9 @@ static CellActor * ov20_021D4B40 (UnkStruct_ov20_021D4AD4 * param0, NNSG2dImageP return v2; } -void ov20_021D4BA4 (UnkStruct_ov20_021D4AD4 * param0) +void ov20_021D4BA4(UnkStruct_ov20_021D4AD4 *param0) { - UnkStruct_ov20_021D4BA4 * v0 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D4BA4)); + UnkStruct_ov20_021D4BA4 *v0 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D4BA4)); if (v0) { static const struct { @@ -286,8 +296,8 @@ void ov20_021D4BA4 (UnkStruct_ov20_021D4AD4 * param0) u16 unk_0A; u16 unk_0C; } v1[] = { - {0x1, 0x3, 0x3, 0x3, 0x4, 0x3, 0xE}, - {0x5, 0x7, 0x3, 0xE, 0x0, 0x3, 0x3} + { 0x1, 0x3, 0x3, 0x3, 0x4, 0x3, 0xE }, + { 0x5, 0x7, 0x3, 0xE, 0x0, 0x3, 0x3 } }; int v2 = ov20_021D1F94(param0->unk_04); @@ -308,14 +318,14 @@ void ov20_021D4BA4 (UnkStruct_ov20_021D4AD4 * param0) } } -BOOL ov20_021D4C2C (UnkStruct_ov20_021D4AD4 * param0) +BOOL ov20_021D4C2C(UnkStruct_ov20_021D4AD4 *param0) { return param0->unk_4FC == NULL; } -static void ov20_021D4C40 (SysTask * param0, void * param1) +static void ov20_021D4C40(SysTask *param0, void *param1) { - UnkStruct_ov20_021D4BA4 * v0 = param1; + UnkStruct_ov20_021D4BA4 *v0 = param1; switch (v0->unk_04) { case 0: @@ -350,7 +360,7 @@ static void ov20_021D4C40 (SysTask * param0, void * param1) } } -void ov20_021D4DBC (UnkStruct_ov20_021D4AD4 * param0, BOOL param1) +void ov20_021D4DBC(UnkStruct_ov20_021D4AD4 *param0, BOOL param1) { if (param1) { CellActor_SetDrawFlag(param0->unk_14, ov20_021D204C(param0->unk_04)); @@ -361,7 +371,7 @@ void ov20_021D4DBC (UnkStruct_ov20_021D4AD4 * param0, BOOL param1) } } -void ov20_021D4DF4 (UnkStruct_ov20_021D4AD4 * param0, int param1, int param2) +void ov20_021D4DF4(UnkStruct_ov20_021D4AD4 *param0, int param1, int param2) { switch (param1) { case 0: diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c index 119896b4af..d52b31a3ea 100644 --- a/src/overlay022/ov22_02259C58.c +++ b/src/overlay022/ov22_02259C58.c @@ -33,22 +33,22 @@ #include "unk_0201F834.h" #include "unk_02023FCC.h" -static void ov22_02259D94(UnkStruct_ov22_02259C58 * param0, void * param1); -static void ov22_0225A0E4(UnkStruct_ov22_02259C58 * param0, int param1, UnkStruct_ov22_0225A0E4 * param2, int param3, int param4, int param5, int param6); -static void ov22_0225A154(UnkStruct_ov22_0225A154 * param0, int param1, UnkStruct_ov22_0225A0E4 * param2, const UnkStruct_02012744 * param3, const Window * param4, int param5, int param6, int param7, int param8); +static void ov22_02259D94(UnkStruct_ov22_02259C58 *param0, void *param1); +static void ov22_0225A0E4(UnkStruct_ov22_02259C58 *param0, int param1, UnkStruct_ov22_0225A0E4 *param2, int param3, int param4, int param5, int param6); +static void ov22_0225A154(UnkStruct_ov22_0225A154 *param0, int param1, UnkStruct_ov22_0225A0E4 *param2, const UnkStruct_02012744 *param3, const Window *param4, int param5, int param6, int param7, int param8); static void ov22_0225A200(TouchScreenHitTable *hitTable, int param1, int param2, int param3, int param4, int param5); -static void ov22_0225A218(UnkStruct_ov22_0225A0E4 * param0); -static void ov22_0225A2A8(UnkStruct_ov22_0225A0E4 * param0); -static Window * ov22_0225A348(UnkStruct_ov22_0225A0E4 * param0, u32 param1, u32 param2, u32 param3, int param4, int param5); -static void ov22_0225A3D0(Window * param0); -static void ov22_0225A2D0(UnkStruct_ov22_02259C58 * param0, int param1); -static void ov22_0225A338(UnkStruct_ov22_02259C58 * param0, int param1, int param2, int param3); -static void ov22_0225A2F4(UnkStruct_ov22_0225A154 * param0, int param1); -static void ov22_0225A3DC(UnkStruct_ov22_02259C58 * param0, int param1, int param2); -static void ov22_0225A418(UnkStruct_ov22_0225A154 * param0, int param1, int param2); -static void ov22_0225A02C(u32 param0, u32 param1, void * param2); - -void ov22_02259C58 (UnkStruct_ov22_02259C58 * param0, UnkStruct_ov22_02259C58_1 * param1) +static void ov22_0225A218(UnkStruct_ov22_0225A0E4 *param0); +static void ov22_0225A2A8(UnkStruct_ov22_0225A0E4 *param0); +static Window *ov22_0225A348(UnkStruct_ov22_0225A0E4 *param0, u32 param1, u32 param2, u32 param3, int param4, int param5); +static void ov22_0225A3D0(Window *param0); +static void ov22_0225A2D0(UnkStruct_ov22_02259C58 *param0, int param1); +static void ov22_0225A338(UnkStruct_ov22_02259C58 *param0, int param1, int param2, int param3); +static void ov22_0225A2F4(UnkStruct_ov22_0225A154 *param0, int param1); +static void ov22_0225A3DC(UnkStruct_ov22_02259C58 *param0, int param1, int param2); +static void ov22_0225A418(UnkStruct_ov22_0225A154 *param0, int param1, int param2); +static void ov22_0225A02C(u32 param0, u32 param1, void *param2); + +void ov22_02259C58(UnkStruct_ov22_02259C58 *param0, UnkStruct_ov22_02259C58_1 *param1) { GF_ASSERT(param0); GF_ASSERT(param1); @@ -66,7 +66,7 @@ void ov22_02259C58 (UnkStruct_ov22_02259C58 * param0, UnkStruct_ov22_02259C58_1 } } -void ov22_02259C9C (UnkStruct_ov22_0225A154 * param0, UnkStruct_ov22_02259C9C * param1) +void ov22_02259C9C(UnkStruct_ov22_0225A154 *param0, UnkStruct_ov22_02259C9C *param1) { UnkStruct_020127E8 v0; @@ -88,30 +88,30 @@ void ov22_02259C9C (UnkStruct_ov22_0225A154 * param0, UnkStruct_ov22_02259C9C * param0->unk_10 = sub_020127E8(&v0); } -void ov22_02259CE8 (UnkStruct_ov22_02259C58 * param0) +void ov22_02259CE8(UnkStruct_ov22_02259C58 *param0) { CellActor_Delete(param0->unk_00); memset(param0, 0, sizeof(UnkStruct_ov22_02259C58)); } -void ov22_02259D00 (UnkStruct_ov22_0225A154 * param0) +void ov22_02259D00(UnkStruct_ov22_0225A154 *param0) { ov22_02259CE8(¶m0->unk_00); sub_02012870(param0->unk_10); memset(param0, 0, sizeof(UnkStruct_ov22_0225A154)); } -void ov22_02259D1C (UnkStruct_ov22_02259C58 * param0, int param1) +void ov22_02259D1C(UnkStruct_ov22_02259C58 *param0, int param1) { if (param1 == param0->unk_04) { param0->unk_0C(param0, param0->unk_08); } } -void ov22_02259D2C (UnkStruct_ov22_02259D2C * param0, int param1, int param2) +void ov22_02259D2C(UnkStruct_ov22_02259D2C *param0, int param1, int param2) { int v0; - UnkStruct_ov22_02259C58 * v1; + UnkStruct_ov22_02259C58 *v1; for (v0 = 2; v0 <= 3; v0++) { v1 = param0->unk_00 + v0; @@ -132,7 +132,7 @@ void ov22_02259D2C (UnkStruct_ov22_02259D2C * param0, int param1, int param2) } } -void ov22_02259D78 (UnkStruct_ov22_02259C58 * param0, UnkFuncPtr_ov22_02259D78 param1, void * param2, int param3) +void ov22_02259D78(UnkStruct_ov22_02259C58 *param0, UnkFuncPtr_ov22_02259D78 param1, void *param2, int param3) { GF_ASSERT(param0); @@ -141,29 +141,29 @@ void ov22_02259D78 (UnkStruct_ov22_02259C58 * param0, UnkFuncPtr_ov22_02259D78 p param0->unk_0C = param1; } -static void ov22_02259D94 (UnkStruct_ov22_02259C58 * param0, void * param1) +static void ov22_02259D94(UnkStruct_ov22_02259C58 *param0, void *param1) { return; } -void ov22_02259D98 (UnkStruct_ov22_02259C58 * param0) +void ov22_02259D98(UnkStruct_ov22_02259C58 *param0) { SpriteActor_SetAnimFrame(param0->unk_00, 2); } -void ov22_02259DA4 (UnkStruct_ov22_02259C58 * param0) +void ov22_02259DA4(UnkStruct_ov22_02259C58 *param0) { SpriteActor_SetAnimFrame(param0->unk_00, 0); } -void ov22_02259DB0 (UnkStruct_ov22_02259C58 * param0) +void ov22_02259DB0(UnkStruct_ov22_02259C58 *param0) { SpriteActor_SetAnimFrame(param0->unk_00, 1); } -void ov22_02259DBC (UnkStruct_ov22_02259D2C * param0, UnkStruct_ov22_0225A0E4 * param1) +void ov22_02259DBC(UnkStruct_ov22_02259D2C *param0, UnkStruct_ov22_0225A0E4 *param1) { - Window * v0; + Window *v0; param0->unk_64 = sub_02012744(1, 13); @@ -199,7 +199,7 @@ void ov22_02259DBC (UnkStruct_ov22_02259D2C * param0, UnkStruct_ov22_0225A0E4 * param0->unk_68 = sub_02023FCC(param0->unk_6C, 5, ov22_0225A02C, param0, 13); } -void ov22_02259F24 (UnkStruct_ov22_02259D2C * param0, UnkStruct_ov22_0225A0E4 * param1) +void ov22_02259F24(UnkStruct_ov22_02259D2C *param0, UnkStruct_ov22_0225A0E4 *param1) { int v0; @@ -224,20 +224,20 @@ void ov22_02259F24 (UnkStruct_ov22_02259D2C * param0, UnkStruct_ov22_0225A0E4 * param0->unk_68 = NULL; } -void ov22_02259F88 (UnkStruct_ov22_02259D2C * param0) +void ov22_02259F88(UnkStruct_ov22_02259D2C *param0) { GF_ASSERT(param0->unk_68); sub_0202404C(param0->unk_68); } -void ov22_02259FA0 (UnkStruct_ov22_02259D2C * param0) +void ov22_02259FA0(UnkStruct_ov22_02259D2C *param0) { ov22_0225A2D0(¶m0->unk_40.unk_00, 3); ov22_0225A2F4(¶m0->unk_40, 3); ov22_02259D2C(param0, 2, 3); } -void ov22_02259FC4 (UnkStruct_ov22_02259D2C * param0, int param1, int param2) +void ov22_02259FC4(UnkStruct_ov22_02259D2C *param0, int param1, int param2) { int v0; @@ -248,7 +248,7 @@ void ov22_02259FC4 (UnkStruct_ov22_02259D2C * param0, int param1, int param2) ov22_0225A418(¶m0->unk_40, param1, param2); } -void ov22_02259FF4 (UnkStruct_ov22_02259D2C * param0, int param1, UnkFuncPtr_ov22_02259D78 param2, void * param3, int param4) +void ov22_02259FF4(UnkStruct_ov22_02259D2C *param0, int param1, UnkFuncPtr_ov22_02259D78 param2, void *param3, int param4) { GF_ASSERT(param0); @@ -261,9 +261,9 @@ void ov22_02259FF4 (UnkStruct_ov22_02259D2C * param0, int param1, UnkFuncPtr_ov2 } } -static void ov22_0225A02C (u32 param0, u32 param1, void * param2) +static void ov22_0225A02C(u32 param0, u32 param1, void *param2) { - UnkStruct_ov22_02259D2C * v0 = param2; + UnkStruct_ov22_02259D2C *v0 = param2; switch (param0) { case 0: @@ -357,7 +357,7 @@ static void ov22_0225A154(UnkStruct_ov22_0225A154 *param0, int param1, UnkStruct ov22_02259C9C(param0, &v0); } -static void ov22_0225A200 (TouchScreenHitTable *hitTable, int param1, int param2, int param3, int param4, int param5) +static void ov22_0225A200(TouchScreenHitTable *hitTable, int param1, int param2, int param3, int param4, int param5) { hitTable[param1].rect.top = param3; hitTable[param1].rect.left = param2; @@ -365,7 +365,7 @@ static void ov22_0225A200 (TouchScreenHitTable *hitTable, int param1, int param2 hitTable[param1].rect.right = param2 + param4; } -static void ov22_0225A218 (UnkStruct_ov22_0225A0E4 * param0) +static void ov22_0225A218(UnkStruct_ov22_0225A0E4 *param0) { int v0; @@ -379,7 +379,7 @@ static void ov22_0225A218 (UnkStruct_ov22_0225A0E4 * param0) ov22_02255268(param0, param0->unk_5C, 120, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 2, 1); } -static void ov22_0225A2A8 (UnkStruct_ov22_0225A0E4 * param0) +static void ov22_0225A2A8(UnkStruct_ov22_0225A0E4 *param0) { int v0; @@ -391,7 +391,7 @@ static void ov22_0225A2A8 (UnkStruct_ov22_0225A0E4 * param0) ov22_022552D8(param0, 1); } -static void ov22_0225A2D0 (UnkStruct_ov22_02259C58 * param0, int param1) +static void ov22_0225A2D0(UnkStruct_ov22_02259C58 *param0, int param1) { if (param1 == 0) { ov22_02259DB0(param0); @@ -402,7 +402,7 @@ static void ov22_0225A2D0 (UnkStruct_ov22_02259C58 * param0, int param1) } } -static void ov22_0225A2F4 (UnkStruct_ov22_0225A154 * param0, int param1) +static void ov22_0225A2F4(UnkStruct_ov22_0225A154 *param0, int param1) { if (param1 == 0) { sub_020128C4(param0->unk_10, 0, 15); @@ -419,18 +419,18 @@ static void ov22_0225A2F4 (UnkStruct_ov22_0225A154 * param0, int param1) } } -static void ov22_0225A338 (UnkStruct_ov22_02259C58 * param0, int param1, int param2, int param3) +static void ov22_0225A338(UnkStruct_ov22_02259C58 *param0, int param1, int param2, int param3) { if (param3 == param2) { Sound_PlayEffect(param1); } } -static Window * ov22_0225A348 (UnkStruct_ov22_0225A0E4 * param0, u32 param1, u32 param2, u32 param3, int param4, int param5) +static Window *ov22_0225A348(UnkStruct_ov22_0225A0E4 *param0, u32 param1, u32 param2, u32 param3, int param4, int param5) { - MessageLoader * v0; - Strbuf* v1; - Window * v2; + MessageLoader *v0; + Strbuf *v1; + Window *v2; v0 = MessageLoader_Init(0, param1, param2, 13); GF_ASSERT(v0); @@ -451,14 +451,14 @@ static Window * ov22_0225A348 (UnkStruct_ov22_0225A0E4 * param0, u32 param1, u32 return v2; } -static void ov22_0225A3D0 (Window * param0) +static void ov22_0225A3D0(Window *param0) { sub_0201A928(param0, 1); } -static void ov22_0225A3DC (UnkStruct_ov22_02259C58 * param0, int param1, int param2) +static void ov22_0225A3DC(UnkStruct_ov22_02259C58 *param0, int param1, int param2) { - const VecFx32 * v0; + const VecFx32 *v0; VecFx32 v1; v0 = CellActor_GetPosition(param0->unk_00); @@ -468,7 +468,7 @@ static void ov22_0225A3DC (UnkStruct_ov22_02259C58 * param0, int param1, int par CellActor_SetPosition(param0->unk_00, &v1); } -static void ov22_0225A418 (UnkStruct_ov22_0225A154 * param0, int param1, int param2) +static void ov22_0225A418(UnkStruct_ov22_0225A154 *param0, int param1, int param2) { ov22_0225A3DC(¶m0->unk_00, param1, param2); sub_02012938(param0->unk_10); diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c index d631d2617b..2211d56c59 100644 --- a/src/overlay023/ov23_02253598.c +++ b/src/overlay023/ov23_02253598.c @@ -38,33 +38,33 @@ #include "unk_02018340.h" #include "unk_0202854C.h" -typedef int (* UnkFuncPtr_ov23_022576EC)(const SecretBaseRecord *); +typedef int (*UnkFuncPtr_ov23_022576EC)(const SecretBaseRecord *); typedef struct { UnkFuncPtr_ov23_02253834 unk_00; - void * unk_04; + void *unk_04; Window unk_08; - ResourceMetadata * unk_18; - BmpList * unk_1C; + ResourceMetadata *unk_18; + BmpList *unk_1C; UnkFuncPtr_ov23_0224DCB8 unk_20; u16 unk_24; int unk_28; } UnkStruct_ov23_022537D4; typedef struct UnkStruct_ov23_02253598_t { - UnkStruct_ov23_022537D4 * unk_00; - SysTask * unk_04; - SaveData * unk_08; - SecretBaseRecord * unk_0C; - SecretBaseRecord * unk_10; + UnkStruct_ov23_022537D4 *unk_00; + SysTask *unk_04; + SaveData *unk_08; + SecretBaseRecord *unk_0C; + SecretBaseRecord *unk_10; MATHRandContext32 unk_14; u8 unk_2C; }; -static UnkStruct_ov23_02253598 * Unk_ov23_022577BC = NULL; -static void ov23_022537D4(SysTask * param0, void * param1); +static UnkStruct_ov23_02253598 *Unk_ov23_022577BC = NULL; +static void ov23_022537D4(SysTask *param0, void *param1); -void ov23_02253598 (UnkStruct_ov23_02253598 * param0, SecretBaseRecord * param1, SaveData * param2) +void ov23_02253598(UnkStruct_ov23_02253598 *param0, SecretBaseRecord *param1, SaveData *param2) { MI_CpuFill8(param0, 0, sizeof(UnkStruct_ov23_02253598)); @@ -76,7 +76,7 @@ void ov23_02253598 (UnkStruct_ov23_02253598 * param0, SecretBaseRecord * param1, CommSys_Seed(&Unk_ov23_022577BC->unk_14); } -void ov23_022535CC (void) +void ov23_022535CC(void) { Heap_FreeToHeap(Unk_ov23_022577BC->unk_10); Heap_FreeToHeap(Unk_ov23_022577BC); @@ -84,19 +84,19 @@ void ov23_022535CC (void) Unk_ov23_022577BC = NULL; } -void ov23_022535EC (void) +void ov23_022535EC(void) { if (Unk_ov23_022577BC->unk_04) { ov23_022537D4(Unk_ov23_022577BC->unk_04, Unk_ov23_022577BC->unk_00); } } -void ov23_02253604 (void) +void ov23_02253604(void) { return; } -int ov23_02253608 (void) +int ov23_02253608(void) { return sizeof(UnkStruct_ov23_02253598); } @@ -180,9 +180,9 @@ static void ov23_0225360C(Window *param0, MessageLoader *param1, TrainerInfo *pa StringTemplate_Free(v0); } -static void ov23_022537D4 (SysTask * param0, void * param1) +static void ov23_022537D4(SysTask *param0, void *param1) { - UnkStruct_ov23_022537D4 * v0 = param1; + UnkStruct_ov23_022537D4 *v0 = param1; Window_Clear(&v0->unk_08, 0); sub_0201ACF4(&v0->unk_08); @@ -203,22 +203,22 @@ static void ov23_022537D4 (SysTask * param0, void * param1) Unk_ov23_022577BC->unk_00 = NULL; } -static void ov23_0225381C (SysTask * param0, void * param1) +static void ov23_0225381C(SysTask *param0, void *param1) { - UnkStruct_ov23_022537D4 * v0 = param1; + UnkStruct_ov23_022537D4 *v0 = param1; if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { ov23_022537D4(param0, param1); } } -void ov23_02253834 (BGL * param0, TrainerInfo * param1, UnkFuncPtr_ov23_02253834 param2, void * param3, BOOL param4) +void ov23_02253834(BGL *param0, TrainerInfo *param1, UnkFuncPtr_ov23_02253834 param2, void *param3, BOOL param4) { - SecretBaseRecord * v0; - MessageLoader * v1; + SecretBaseRecord *v0; + MessageLoader *v1; UnkStruct_ov84_02240FA8 v2; int v3 = 10; - UnkStruct_ov23_022537D4 * v4 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov23_022537D4)); + UnkStruct_ov23_022537D4 *v4 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov23_022537D4)); MI_CpuClear8(v4, sizeof(UnkStruct_ov23_022537D4)); @@ -248,11 +248,11 @@ void ov23_02253834 (BGL * param0, TrainerInfo * param1, UnkFuncPtr_ov23_02253834 MessageLoader_Free(v1); } -void ov23_022538FC (int param0) +void ov23_022538FC(int param0) { int v0 = sub_02028558(); int v1 = GameRecords_GetTrainerScore(SaveData_GetGameRecordsPtr(Unk_ov23_022577BC->unk_08)); - u8 * v2 = Heap_AllocFromHeap(4, v0 + 1); + u8 *v2 = Heap_AllocFromHeap(4, v0 + 1); MI_CpuClear8(v2, v0 + 1); v2[0] = param0; @@ -269,7 +269,7 @@ void ov23_022538FC (int param0) Heap_FreeToHeap(v2); } -void ov23_02253968 (void) +void ov23_02253968(void) { int v0 = GameRecords_GetTrainerScore(SaveData_GetGameRecordsPtr(Unk_ov23_022577BC->unk_08)); @@ -280,14 +280,14 @@ void ov23_02253968 (void) sub_020294D4(Unk_ov23_022577BC->unk_0C, v0); } -void ov23_02253998 (int param0, int param1, void * param2, void * param3) +void ov23_02253998(int param0, int param1, void *param2, void *param3) { CommSys_SendDataServer(82, param2, param1); } -void ov23_022539A8 (int param0, int param1, void * param2, void * param3) +void ov23_022539A8(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; if (v0[0] == CommSys_CurNetId()) { MI_CpuCopy8(&v0[1], Unk_ov23_022577BC->unk_10, param1 - 1); @@ -295,25 +295,25 @@ void ov23_022539A8 (int param0, int param1, void * param2, void * param3) } } -BOOL ov23_022539D8 (void) +BOOL ov23_022539D8(void) { return Unk_ov23_022577BC->unk_2C; } -void ov23_022539E8 (void) +void ov23_022539E8(void) { Unk_ov23_022577BC->unk_2C = 0; } -static void ov23_022539F8 (int param0) +static void ov23_022539F8(int param0) { sub_02059514(); } -void ov23_02253A00 (SecretBaseRecord * param0, int param1) +void ov23_02253A00(SecretBaseRecord *param0, int param1) { s32 v0; - SecretBaseRecord * v1; + SecretBaseRecord *v1; UnkFuncPtr_ov23_022576EC v2 = Unk_ov23_022576EC[param1 - 32]; GF_ASSERT(param1 >= 32); @@ -332,11 +332,11 @@ void ov23_02253A00 (SecretBaseRecord * param0, int param1) ov23_02253F40(ov23_022421BC(), param1, 1, ov23_022539F8); } -static void ov23_02253A78 (Window * param0, MessageLoader * param1, TrainerInfo * param2, const SecretBaseRecord * param3, const UndergroundData * param4) +static void ov23_02253A78(Window *param0, MessageLoader *param1, TrainerInfo *param2, const SecretBaseRecord *param3, const UndergroundData *param4) { - StringTemplate * v0; - Strbuf* v1; - Strbuf* v2; + StringTemplate *v0; + Strbuf *v1; + Strbuf *v2; int v3, v4; const int v5 = 17; const int v6 = 39; @@ -368,7 +368,7 @@ static void ov23_02253A78 (Window * param0, MessageLoader * param1, TrainerInfo Text_AddPrinterWithParams(param0, 0, v1, v7, 1 + v8 * 3, 0xff, NULL); for (v3 = 0; v3 < 5; v3++) { - TrainerInfo * v13 = sub_020288C8(param4, 4, v3); + TrainerInfo *v13 = sub_020288C8(param4, 4, v3); if (v13) { StringTemplate_SetPlayerName(v0, 0, v13); @@ -395,13 +395,13 @@ static void ov23_02253A78 (Window * param0, MessageLoader * param1, TrainerInfo StringTemplate_Free(v0); } -void * ov23_02253C64 (BGL * param0, TrainerInfo * param1, UndergroundData * param2, UnkFuncPtr_ov23_02253834 param3, void * param4) +void *ov23_02253C64(BGL *param0, TrainerInfo *param1, UndergroundData *param2, UnkFuncPtr_ov23_02253834 param3, void *param4) { - SecretBaseRecord * v0; - MessageLoader * v1; + SecretBaseRecord *v0; + MessageLoader *v1; UnkStruct_ov84_02240FA8 v2; int v3 = 10; - UnkStruct_ov23_022537D4 * v4 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov23_022537D4)); + UnkStruct_ov23_022537D4 *v4 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov23_022537D4)); MI_CpuClear8(v4, sizeof(UnkStruct_ov23_022537D4)); @@ -424,9 +424,9 @@ void * ov23_02253C64 (BGL * param0, TrainerInfo * param1, UndergroundData * para return v4; } -void ov23_02253D10 (void * param0) +void ov23_02253D10(void *param0) { - UnkStruct_ov23_022537D4 * v0 = param0; + UnkStruct_ov23_022537D4 *v0 = param0; Window_Clear(&v0->unk_08, 0); sub_0201ACF4(&v0->unk_08); diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index ba5455afc4..c854668f65 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -66,25 +66,37 @@ static void ov62_022349E4(Strbuf *param0, int param1); -StringTemplate * ov62_02231690 (u32 param0) +StringTemplate *ov62_02231690(u32 param0) { - StringTemplate * v0 = StringTemplate_New(4, 64, param0); + StringTemplate *v0 = StringTemplate_New(4, 64, param0); return v0; } -int ov62_022316A0 (UnkStruct_0208C06C * param0) +int ov62_022316A0(UnkStruct_0208C06C *param0) { u32 v0[] = { - 0x73fa, 0x771f, 0x6f7b, 0x6fff, 0x4ebf, 0x575e, 0x5b9f, + 0x73fa, + 0x771f, + 0x6f7b, + 0x6fff, + 0x4ebf, + 0x575e, + 0x5b9f, }; return v0[param0->unk_14.unk_48]; } -int ov62_022316D0 (UnkStruct_0208C06C * param0) +int ov62_022316D0(UnkStruct_0208C06C *param0) { u32 v0[] = { - 0x1642, 0x357f, 0x3def, 0x31f, 0xbc, 0x131, 0x23f, + 0x1642, + 0x357f, + 0x3def, + 0x31f, + 0xbc, + 0x131, + 0x23f, }; if (param0->unk_00 != 0) { @@ -94,19 +106,43 @@ int ov62_022316D0 (UnkStruct_0208C06C * param0) return v0[param0->unk_14.unk_48]; } -int ov62_02231710 (UnkStruct_0208C06C * param0, int param1) +int ov62_02231710(UnkStruct_0208C06C *param0, int param1) { int v0[] = { - 102, 103, 104, 105, 106, 129, 134, + 102, + 103, + 104, + 105, + 106, + 129, + 134, }; int v1[] = { - 107, 108, 109, 110, 111, 130, 135, + 107, + 108, + 109, + 110, + 111, + 130, + 135, }; int v2[] = { - 117, 118, 119, 120, 121, 132, 137, + 117, + 118, + 119, + 120, + 121, + 132, + 137, }; int v3[] = { - 112, 113, 114, 115, 116, 131, 136, + 112, + 113, + 114, + 115, + 116, + 131, + 136, }; int v4; @@ -128,12 +164,12 @@ int ov62_02231710 (UnkStruct_0208C06C * param0, int param1) return v0[0]; } -void ov62_022317CC (UnkStruct_0208C06C * param0, int param1) +void ov62_022317CC(UnkStruct_0208C06C *param0, int param1) { - PaletteData * v0 = param0->unk_14.unk_14; - SpriteRenderer * v1 = param0->unk_14.unk_04; - SpriteGfxHandler * v2 = param0->unk_14.unk_08; - NARC * v3 = param0->unk_14.unk_00; + PaletteData *v0 = param0->unk_14.unk_14; + SpriteRenderer *v1 = param0->unk_14.unk_04; + SpriteGfxHandler *v2 = param0->unk_14.unk_08; + NARC *v3 = param0->unk_14.unk_00; PaletteSys_LoadPalette(v0, 162, ov62_02231710(param0, 3), 102, 0, 0x20 * (8 + 1), 0); PaletteSys_LoadPalette(v0, 162, ov62_02231710(param0, 3), 102, 1, 0x20 * (8 + 1), 0); @@ -147,7 +183,7 @@ void ov62_022317CC (UnkStruct_0208C06C * param0, int param1) SpriteRenderer_LoadPalette(v0, 3, v1, v2, v3, ov62_02231710(param0, 2), 0, 3, NNS_G2D_VRAM_TYPE_2DSUB, 10000); } -void ov62_022318E8 (UnkStruct_0208C06C * param0) +void ov62_022318E8(UnkStruct_0208C06C *param0) { sub_02003A2C(param0->unk_14.unk_14, 2, 0xFFFF, 0, param0->unk_14.unk_44); sub_02003A2C(param0->unk_14.unk_14, 0, 0xFFFF, 0, param0->unk_14.unk_44); @@ -155,10 +191,10 @@ void ov62_022318E8 (UnkStruct_0208C06C * param0) sub_02003A2C(param0->unk_14.unk_14, 1, 0xFFFF, 0, param0->unk_14.unk_44); } -u16 * ov62_Pokedex_Alphabetical (int heapID, int unused, int * pokedexLength) +u16 *ov62_Pokedex_Alphabetical(int heapID, int unused, int *pokedexLength) { u32 pokedexSize; - u16 * pokedexAlphabetical; + u16 *pokedexAlphabetical; pokedexAlphabetical = sub_02007068(NARC_INDEX_APPLICATION__ZUKANLIST__ZKN_DATA__ZUKAN_DATA, 13, 0, heapID, 0, &pokedexSize); *pokedexLength = pokedexSize / sizeof(u16); @@ -166,20 +202,20 @@ u16 * ov62_Pokedex_Alphabetical (int heapID, int unused, int * pokedexLength) return pokedexAlphabetical; } -void ov62_0223196C (UnkStruct_0208C06C * param0, BOOL param1) +void ov62_0223196C(UnkStruct_0208C06C *param0, BOOL param1) { param0->unk_870 = param1; } -BOOL ov62_02231974 (UnkStruct_0208C06C * param0) +BOOL ov62_02231974(UnkStruct_0208C06C *param0) { return param0->unk_870; } -void ov62_0223197C (UnkStruct_0208C06C * param0, int param1) +void ov62_0223197C(UnkStruct_0208C06C *param0, int param1) { - Strbuf* v0; - Window * v1 = ¶m0->unk_8A4; + Strbuf *v0; + Window *v1 = ¶m0->unk_8A4; if (param0->unk_8A0 == 1) { return; @@ -202,7 +238,7 @@ void ov62_0223197C (UnkStruct_0208C06C * param0, int param1) Strbuf_Free(v0); } -void ov62_02231A1C (UnkStruct_0208C06C * param0) +void ov62_02231A1C(UnkStruct_0208C06C *param0) { if (param0->unk_8A0 == 0) { return; @@ -220,17 +256,17 @@ void ov62_02231A1C (UnkStruct_0208C06C * param0) G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_OBJ, 7, 8); } -void ov62_02231A88 (UnkStruct_0208C06C * param0) +void ov62_02231A88(UnkStruct_0208C06C *param0) { sub_0201ACF4(¶m0->unk_8A4); BGL_DeleteWindow(¶m0->unk_8A4); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); } -void ov62_02231AAC (UnkStruct_0208C06C * param0, int param1) +void ov62_02231AAC(UnkStruct_0208C06C *param0, int param1) { - Strbuf* v0; - Window * v1 = ¶m0->unk_8A4; + Strbuf *v0; + Window *v1 = ¶m0->unk_8A4; if (param0->unk_8A0 == 1) { return; @@ -251,10 +287,10 @@ void ov62_02231AAC (UnkStruct_0208C06C * param0, int param1) Strbuf_Free(v0); } -void ov62_02231B3C (UnkStruct_0208C06C * param0, int param1) +void ov62_02231B3C(UnkStruct_0208C06C *param0, int param1) { - Strbuf* v0; - Window * v1 = ¶m0->unk_8A4; + Strbuf *v0; + Window *v1 = ¶m0->unk_8A4; if (param0->unk_8A0 == 0) { return; @@ -268,7 +304,7 @@ void ov62_02231B3C (UnkStruct_0208C06C * param0, int param1) Strbuf_Free(v0); } -void ov62_02231B8C (UnkStruct_0208C06C * param0) +void ov62_02231B8C(UnkStruct_0208C06C *param0) { if (param0->unk_8A0 == 0) { return; @@ -282,10 +318,10 @@ void ov62_02231B8C (UnkStruct_0208C06C * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); } -void ov62_02231BC4 (UnkStruct_0208C06C * param0, int param1) +void ov62_02231BC4(UnkStruct_0208C06C *param0, int param1) { - Strbuf* v0; - Window * v1 = ¶m0->unk_8A4; + Strbuf *v0; + Window *v1 = ¶m0->unk_8A4; if (param0->unk_8A0 == 1) { return; @@ -314,14 +350,14 @@ void ov62_02231BC4 (UnkStruct_0208C06C * param0, int param1) Strbuf_Free(v0); } -static void ov62_02231C78(UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1); -static void ov62_02232080(UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1); -static void ov62_022320A0(UnkStruct_ov62_022323B8 * param0, int param1); -static void ov62_022320B0(UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1); -static void ov62_022320EC(UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1); -static void ov62_022321F4(UnkStruct_ov62_022323B8 * param0, int param1); -static void ov62_02232200(UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1); -static void ov62_0223226C(UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1); +static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1); +static void ov62_02232080(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1); +static void ov62_022320A0(UnkStruct_ov62_022323B8 *param0, int param1); +static void ov62_022320B0(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1); +static void ov62_022320EC(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1); +static void ov62_022321F4(UnkStruct_ov62_022323B8 *param0, int param1); +static void ov62_02232200(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1); +static void ov62_0223226C(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1); static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1) { @@ -504,7 +540,7 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p } } -static void ov62_02232080 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1) +static void ov62_02232080(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1) { int v0; @@ -514,14 +550,14 @@ static void ov62_02232080 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C } } -static void ov62_022320A0 (UnkStruct_ov62_022323B8 * param0, int param1) +static void ov62_022320A0(UnkStruct_ov62_022323B8 *param0, int param1) { if (param0->unk_04) { SpriteActor_EnableObject(param0->unk_04, param1); } } -static void ov62_022320B0 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1) +static void ov62_022320B0(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1) { SpriteGfxHandler_UnloadCharObjById(param1->unk_14.unk_08, 100000); SpriteGfxHandler_UnloadPlttObjById(param1->unk_14.unk_08, 100000); @@ -534,16 +570,16 @@ static void ov62_022320B0 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C } } -static void ov62_022320EC (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1) +static void ov62_022320EC(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1) { int v0; int v1; int v2; int v3; u8 v4; - SpriteRenderer * v5; - SpriteGfxHandler * v6; - PaletteData * v7; + SpriteRenderer *v5; + SpriteGfxHandler *v6; + PaletteData *v7; SpriteTemplate v8; v5 = param1->unk_14.unk_04; @@ -601,12 +637,12 @@ static void ov62_022320EC (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C } } -static void ov62_022321F4 (UnkStruct_ov62_022323B8 * param0, int param1) +static void ov62_022321F4(UnkStruct_ov62_022323B8 *param0, int param1) { SpriteActor_EnableObject(param0->unk_08, param1); } -static void ov62_02232200 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1) +static void ov62_02232200(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1) { SpriteGfxHandler_UnloadCharObjById(param1->unk_14.unk_08, 165535); SpriteGfxHandler_UnloadPlttObjById(param1->unk_14.unk_08, 165535); @@ -616,25 +652,25 @@ static void ov62_02232200 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C } static const int Unk_ov62_02248AD8[16][4] = { - {0x3, 0x3C, 0x11, 0x12}, - {0x5, 0x6, 0x13, 0x14}, - {0xB, 0x18, 0x15, 0x16}, - {0x1F, 0x39, 0x17, 0x18}, - {0x32, 0x30, 0x19, 0x1A}, - {0x33, 0xE, 0x1B, 0x1C}, - {0x3E, 0x20, 0x1D, 0x1E}, - {0x46, 0x31, 0x1F, 0x20}, - {0x6, 0x3, 0x21, 0x22}, - {0x7, 0xA, 0x23, 0x24}, - {0xD, 0x24, 0x25, 0x26}, - {0xE, 0x19, 0x27, 0x28}, - {0x23, 0x55, 0x29, 0x2A}, - {0x25, 0x23, 0x2B, 0x2C}, - {0x2A, 0x12, 0x2D, 0x2E}, - {0x3F, 0x21, 0x2F, 0x30} + { 0x3, 0x3C, 0x11, 0x12 }, + { 0x5, 0x6, 0x13, 0x14 }, + { 0xB, 0x18, 0x15, 0x16 }, + { 0x1F, 0x39, 0x17, 0x18 }, + { 0x32, 0x30, 0x19, 0x1A }, + { 0x33, 0xE, 0x1B, 0x1C }, + { 0x3E, 0x20, 0x1D, 0x1E }, + { 0x46, 0x31, 0x1F, 0x20 }, + { 0x6, 0x3, 0x21, 0x22 }, + { 0x7, 0xA, 0x23, 0x24 }, + { 0xD, 0x24, 0x25, 0x26 }, + { 0xE, 0x19, 0x27, 0x28 }, + { 0x23, 0x55, 0x29, 0x2A }, + { 0x25, 0x23, 0x2B, 0x2C }, + { 0x2A, 0x12, 0x2D, 0x2E }, + { 0x3F, 0x21, 0x2F, 0x30 } }; -int ov62_02232234 (int param0, int param1) +int ov62_02232234(int param0, int param1) { int v0 = param0; @@ -654,12 +690,12 @@ int ov62_02232234 (int param0, int param1) return Unk_ov62_02248AD8[v0][param1]; } -static void ov62_0223226C (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1) +static void ov62_0223226C(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1) { int v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; - PaletteData * v3; + SpriteRenderer *v1; + SpriteGfxHandler *v2; + PaletteData *v3; SpriteTemplate v4; int v5 = 13; int v6 = 14; @@ -713,14 +749,14 @@ static void ov62_0223226C (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C sub_0200D330(param0->unk_08); } -void ov62_02232378 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1) +void ov62_02232378(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1) { ov62_02231C78(param0, param1); ov62_0223226C(param0, param1); ov62_022320EC(param0, param1); } -void ov62_02232394 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1) +void ov62_02232394(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1) { ov62_02232080(param0, param1); ov62_022323B8(param0, 0); @@ -728,18 +764,18 @@ void ov62_02232394 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param ov62_022320B0(param0, param1); } -void ov62_022323B8 (UnkStruct_ov62_022323B8 * param0, int param1) +void ov62_022323B8(UnkStruct_ov62_022323B8 *param0, int param1) { ov62_022320A0(param0, param1); ov62_022321F4(param0, param1); } -static void ov62_022323CC (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1) +static void ov62_022323CC(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1) { - Strbuf* v0; - Strbuf* v1; - StringTemplate * v2; - Window * v3; + Strbuf *v0; + Strbuf *v1; + StringTemplate *v2; + Window *v3; int v4 = sub_02030BFC(param1->unk_88C[0]); int v5 = sub_02030C08(param1->unk_88C[0]); @@ -771,11 +807,11 @@ static void ov62_022323CC (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C Strbuf_Free(v0); } -void ov62_022324A0 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, const UnkStruct_ov62_02248CDC * param2) +void ov62_022324A0(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, const UnkStruct_ov62_02248CDC *param2) { int v0; - Window * v1; - Strbuf* v2; + Window *v1; + Strbuf *v2; v1 = ¶m0->unk_18; @@ -811,11 +847,11 @@ void ov62_022324A0 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param sub_0201A9A4(v1); } -void ov62_02232594 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, MessageLoader * param2, const UnkStruct_ov62_02248CDC * param3) +void ov62_02232594(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, MessageLoader *param2, const UnkStruct_ov62_02248CDC *param3) { int v0; - Window * v1; - Strbuf* v2; + Window *v1; + Strbuf *v2; v1 = ¶m0->unk_18; @@ -853,9 +889,9 @@ void ov62_02232594 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param } } else { int v3; - Strbuf* v4; - Strbuf* v5; - Strbuf* v6; + Strbuf *v4; + Strbuf *v5; + Strbuf *v6; int v7; for (v0 = 0; v0 < param0->unk_10; v0++) { @@ -1003,10 +1039,10 @@ void ov62_02232778(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, StringTemplate_Free(v7); } -void ov62_02232AAC (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, const UnkStruct_ov62_02248CDC * param2, Strbuf *param3[20][2]) +void ov62_02232AAC(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, const UnkStruct_ov62_02248CDC *param2, Strbuf *param3[20][2]) { int v0; - Window * v1; + Window *v1; v1 = ¶m0->unk_18; @@ -1040,11 +1076,11 @@ void ov62_02232AAC (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param sub_0201A9A4(v1); } -int ov62_02232BB4 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, Strbuf *param2[20][2]) +int ov62_02232BB4(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, Strbuf *param2[20][2]) { int v0; int v1 = 0; - Window * v2; + Window *v2; if (param0->unk_38.unk_00 == param0->unk_0C) { return v1; @@ -1453,12 +1489,12 @@ asm int ov62_02232C78 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * pa } // clang-format on -int ov62_02232F68 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1) +int ov62_02232F68(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1) { int v0; int v1 = 0; - Window * v2; - Strbuf* v3; + Window *v2; + Strbuf *v3; if (param0->unk_28->unk_28 != NULL) { for (v0 = 0; v0 < param0->unk_10; v0++) { @@ -1505,12 +1541,12 @@ int ov62_02232F68 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1 return v1; } -int ov62_02233064 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1) +int ov62_02233064(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1) { int v0; int v1 = 0; - Window * v2; - Strbuf* v3; + Window *v2; + Strbuf *v3; if (param0->unk_38.unk_00 == param0->unk_0C) { return v1; @@ -1527,9 +1563,9 @@ int ov62_02233064 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1 int v4; int v5 = 0; int v6; - Strbuf* v7; - Strbuf* v8; - Strbuf* v9; + Strbuf *v7; + Strbuf *v8; + Strbuf *v9; int v10; int v11; @@ -1567,7 +1603,7 @@ int ov62_02233064 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1 return v1; } -void ov62_022331C8 (UnkStruct_ov62_02233310 * param0, s16 param1) +void ov62_022331C8(UnkStruct_ov62_02233310 *param0, s16 param1) { s16 v0 = 0; int v1 = 0xFF; @@ -1640,7 +1676,7 @@ void ov62_022331C8 (UnkStruct_ov62_02233310 * param0, s16 param1) } } -void ov62_022332AC (UnkStruct_ov62_02233310 * param0, s16 param1) +void ov62_022332AC(UnkStruct_ov62_02233310 *param0, s16 param1) { s16 v0 = param0->unk_08; @@ -1665,26 +1701,26 @@ void ov62_022332AC (UnkStruct_ov62_02233310 * param0, s16 param1) ov62_02233454(param0); } -void ov62_022332FC (UnkStruct_ov62_02233310 * param0) +void ov62_022332FC(UnkStruct_ov62_02233310 *param0) { sub_0201ACF4(¶m0->unk_18); BGL_DeleteWindow(¶m0->unk_18); } -void ov62_02233310 (UnkStruct_ov62_02233310 * param0) +void ov62_02233310(UnkStruct_ov62_02233310 *param0) { memset(param0, 0, sizeof(UnkStruct_ov62_02233310)); } -void ov62_0223331C (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, int param2) +void ov62_0223331C(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, int param2) { - CellActorData * v0; + CellActorData *v0; SpriteTemplate v1; - NARC * v2 = param1->unk_14.unk_00; - BGL * v3 = param1->unk_14.unk_10; - SpriteRenderer * v4 = param1->unk_14.unk_04; - SpriteGfxHandler * v5 = param1->unk_14.unk_08; - PaletteData * v6 = param1->unk_14.unk_14; + NARC *v2 = param1->unk_14.unk_00; + BGL *v3 = param1->unk_14.unk_10; + SpriteRenderer *v4 = param1->unk_14.unk_04; + SpriteGfxHandler *v5 = param1->unk_14.unk_08; + PaletteData *v6 = param1->unk_14.unk_14; SpriteRenderer_LoadCharResObjFromOpenNarc(v4, v5, v2, 127, 0, param2, 200000); SpriteRenderer_LoadCellResObjFromOpenNarc(v4, v5, v2, 126, 0, 200000); @@ -1733,13 +1769,13 @@ void ov62_0223331C (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param ov62_02233454(param0); } -void ov62_02233434 (UnkStruct_ov62_02233310 * param0, s16 param1, s16 param2) +void ov62_02233434(UnkStruct_ov62_02233310 *param0, s16 param1, s16 param2) { SpriteActor_SetSpritePositionXY(param0->unk_2C[0], 256 / 2, param1); SpriteActor_SetSpritePositionXY(param0->unk_2C[1], 256 / 2, param2); } -void ov62_02233454 (UnkStruct_ov62_02233310 * param0) +void ov62_02233454(UnkStruct_ov62_02233310 *param0) { SpriteActor_EnableObject(param0->unk_2C[0], 1); SpriteActor_EnableObject(param0->unk_2C[1], 1); @@ -1756,7 +1792,7 @@ void ov62_02233454 (UnkStruct_ov62_02233310 * param0) sub_0200D33C(param0->unk_2C[1]); } -void ov62_0223349C (UnkStruct_ov62_02233310 * param0) +void ov62_0223349C(UnkStruct_ov62_02233310 *param0) { SpriteActor_EnableObject(param0->unk_2C[0], 1); SpriteActor_EnableObject(param0->unk_2C[1], 1); @@ -1778,7 +1814,7 @@ void ov62_0223349C (UnkStruct_ov62_02233310 * param0) sub_0200D33C(param0->unk_2C[1]); } -void ov62_022334FC (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1) +void ov62_022334FC(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1) { SpriteGfxHandler_UnloadCharObjById(param1->unk_14.unk_08, 200000); SpriteGfxHandler_UnloadCellObjById(param1->unk_14.unk_08, 200000); @@ -1787,9 +1823,9 @@ void ov62_022334FC (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param sub_0200D0F4(param0->unk_2C[1]); } -static CellActorData * ov62_0223352C (UnkStruct_ov62_0223359C * param0, UnkStruct_0208C06C * param1, int param2, int param3) +static CellActorData *ov62_0223352C(UnkStruct_ov62_0223359C *param0, UnkStruct_0208C06C *param1, int param2, int param3) { - CellActorData * v0; + CellActorData *v0; SpriteTemplate v1; v1.x = 128; @@ -1821,18 +1857,18 @@ static CellActorData * ov62_0223352C (UnkStruct_ov62_0223359C * param0, UnkStruc return v0; } -static void ov62_0223359C (UnkStruct_ov62_0223359C * param0) +static void ov62_0223359C(UnkStruct_ov62_0223359C *param0) { sub_0200D0F4(param0->unk_18[0]); sub_0200D0F4(param0->unk_18[1]); } -void ov62_022335B0 (UnkStruct_ov62_0223359C * param0, UnkStruct_0208C06C * param1) +void ov62_022335B0(UnkStruct_ov62_0223359C *param0, UnkStruct_0208C06C *param1) { ov62_022335BC(param0, param1, 5); } -void ov62_022335BC (UnkStruct_ov62_0223359C * param0, UnkStruct_0208C06C * param1, int param2) +void ov62_022335BC(UnkStruct_ov62_0223359C *param0, UnkStruct_0208C06C *param1, int param2) { param0->unk_18[0] = ov62_0223352C(param0, param1, 2, param2); param0->unk_18[1] = ov62_0223352C(param0, param1, 2, param2); @@ -1841,17 +1877,17 @@ void ov62_022335BC (UnkStruct_ov62_0223359C * param0, UnkStruct_0208C06C * param SpriteActor_SetSpritePositionXY(param0->unk_18[1], 256 - 24, 72 + 64); } -void ov62_022335F4 (UnkStruct_ov62_0223359C * param0) +void ov62_022335F4(UnkStruct_ov62_0223359C *param0) { memset(param0, 0, sizeof(UnkStruct_ov62_0223359C)); } -void ov62_02233600 (UnkStruct_ov62_0223359C * param0) +void ov62_02233600(UnkStruct_ov62_0223359C *param0) { ov62_0223359C(param0); } -void ov62_02233608 (UnkStruct_ov62_0223359C * param0, u32 param1) +void ov62_02233608(UnkStruct_ov62_0223359C *param0, u32 param1) { s32 v0 = param1 - param0->unk_0C; @@ -1868,11 +1904,11 @@ void ov62_02233608 (UnkStruct_ov62_0223359C * param0, u32 param1) } static const TouchScreenHitTable Unk_ov62_022488F0[] = { - {0x8, 0x80, 0x8, 0x20}, - {0x8, 0x80, 0xE0, 0xF8} + { 0x8, 0x80, 0x8, 0x20 }, + { 0x8, 0x80, 0xE0, 0xF8 } }; -void ov62_02233638 (UnkStruct_ov62_0223359C * param0, UnkStruct_ov62_02233310 * param1) +void ov62_02233638(UnkStruct_ov62_0223359C *param0, UnkStruct_ov62_02233310 *param1) { if (param1->unk_48) { if (param1->unk_04 < 2) { @@ -1889,7 +1925,7 @@ void ov62_02233638 (UnkStruct_ov62_0223359C * param0, UnkStruct_ov62_02233310 * } } -void ov62_02233664 (UnkStruct_ov62_0223359C * param0) +void ov62_02233664(UnkStruct_ov62_0223359C *param0) { u32 v0, v1; s16 v2; @@ -1937,31 +1973,31 @@ void ov62_02233664 (UnkStruct_ov62_0223359C * param0) } } -void ov62_02233704 (UnkStruct_0208C06C * param0, u32 param1) +void ov62_02233704(UnkStruct_0208C06C *param0, u32 param1) { - GameRecords * v0; + GameRecords *v0; v0 = SaveData_GetGameRecordsPtr(param0->unk_830); GameRecords_IncrementTrainerScore(v0, param1); } -void ov62_0223371C (UnkStruct_0208C06C * param0) +void ov62_0223371C(UnkStruct_0208C06C *param0) { int v0; sub_0202F1F8(param0->unk_830, 119, &v0); { - UnkStruct_02030A80 * v1 = ( UnkStruct_02030A80 * )(¶m0->unk_8B4.unk_00->unk_00); - UnkStruct_0202F41C * v2 = ( UnkStruct_0202F41C * )(¶m0->unk_8B4.unk_00->unk_80); - UnkStruct_0202F298 * v3 = ( UnkStruct_0202F298 * )(¶m0->unk_8B4.unk_00->unk_E4); + UnkStruct_02030A80 *v1 = (UnkStruct_02030A80 *)(¶m0->unk_8B4.unk_00->unk_00); + UnkStruct_0202F41C *v2 = (UnkStruct_0202F41C *)(¶m0->unk_8B4.unk_00->unk_80); + UnkStruct_0202F298 *v3 = (UnkStruct_0202F298 *)(¶m0->unk_8B4.unk_00->unk_E4); sub_0202FE20(v1, v2, v3, NULL, param0->unk_830); } } -static void ov62_02233750 (SysTask * param0, void * param1) +static void ov62_02233750(SysTask *param0, void *param1) { - UnkStruct_ov62_02233750 * v0 = param1; + UnkStruct_ov62_02233750 *v0 = param1; ov62_0222F824(v0->unk_00); sub_02039720(); @@ -1969,7 +2005,7 @@ static void ov62_02233750 (SysTask * param0, void * param1) SysTask_Done(param0); } -void ov62_0223376C (UnkStruct_0208C06C * param0, int param1) +void ov62_0223376C(UnkStruct_0208C06C *param0, int param1) { param0->unk_52C.unk_00 = param1; param0->unk_52C.unk_04 = 0; @@ -1977,14 +2013,14 @@ void ov62_0223376C (UnkStruct_0208C06C * param0, int param1) SysTask_ExecuteOnVBlank(ov62_02233750, ¶m0->unk_52C, 4); } -BOOL ov62_02233790 (UnkStruct_0208C06C * param0) +BOOL ov62_02233790(UnkStruct_0208C06C *param0) { return param0->unk_52C.unk_04; } -static void ov62_02233798 (SysTask * param0, void * param1) +static void ov62_02233798(SysTask *param0, void *param1) { - UnkStruct_0208C06C * v0 = param1; + UnkStruct_0208C06C *v0 = param1; if (v0->unk_14.unk_08 == NULL) { return; @@ -2007,12 +2043,12 @@ static void ov62_02233798 (SysTask * param0, void * param1) v0->unk_14.unk_510 = 0; } -void ov62_022337D4 (UnkStruct_0208C06C * param0) +void ov62_022337D4(UnkStruct_0208C06C *param0) { param0->unk_41E8 = SysTask_ExecuteOnVBlank(ov62_02233798, param0, 5); } -BOOL ov62_022337F0 (UnkStruct_0208C06C * param0, int param1, u8 param2) +BOOL ov62_022337F0(UnkStruct_0208C06C *param0, int param1, u8 param2) { int v0; @@ -2025,15 +2061,15 @@ BOOL ov62_022337F0 (UnkStruct_0208C06C * param0, int param1, u8 param2) return 1; } -void ov62_0223381C (UnkStruct_0208C06C * param0, BOOL param1) +void ov62_0223381C(UnkStruct_0208C06C *param0, BOOL param1) { param0->unk_874 = param1; } -void ov62_02233828 (void * param0, const UnkStruct_ov62_0223CAA4 * param1) +void ov62_02233828(void *param0, const UnkStruct_ov62_0223CAA4 *param1) { - UnkStruct_0208C06C * v0 = param0; - UnkStruct_ov62_02233828 * v1 = &v0->unk_8B4; + UnkStruct_0208C06C *v0 = param0; + UnkStruct_ov62_02233828 *v1 = &v0->unk_8B4; if (param1->unk_00 == 1) { (void)0; @@ -2052,7 +2088,7 @@ void ov62_02233828 (void * param0, const UnkStruct_ov62_0223CAA4 * param1) } } -void ov62_022338A8 (UnkStruct_0208C06C * param0) +void ov62_022338A8(UnkStruct_0208C06C *param0) { int v0; int v1; @@ -2105,7 +2141,7 @@ void ov62_022338A8 (UnkStruct_0208C06C * param0) } } -void ov62_022339A0 (UnkStruct_0208C06C * param0) +void ov62_022339A0(UnkStruct_0208C06C *param0) { int v0; @@ -2122,11 +2158,11 @@ void ov62_022339A0 (UnkStruct_0208C06C * param0) } } -void ov62_022339DC (UnkStruct_0208C06C * param0) +void ov62_022339DC(UnkStruct_0208C06C *param0) { - SpriteRenderer * v0; - SpriteGfxHandler * v1; - PaletteData * v2; + SpriteRenderer *v0; + SpriteGfxHandler *v1; + PaletteData *v2; v0 = param0->unk_14.unk_04; v1 = param0->unk_14.unk_08; @@ -2137,32 +2173,32 @@ void ov62_022339DC (UnkStruct_0208C06C * param0) sub_0200CE3C(v0, v1, 19, PokeIcon64KAnimationFileIndex(), 0, 100000); } -void ov62_02233A44 (UnkStruct_0208C06C * param0) +void ov62_02233A44(UnkStruct_0208C06C *param0) { SpriteGfxHandler_UnloadPlttObjById(param0->unk_14.unk_08, 100000); SpriteGfxHandler_UnloadCellObjById(param0->unk_14.unk_08, 100000); SpriteGfxHandler_UnloadAnimObjById(param0->unk_14.unk_08, 100000); } -NARC * ov62_02233A68 (int param0) +NARC *ov62_02233A68(int param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 102); return v0; } -void ov62_02233A74 (NARC * param0) +void ov62_02233A74(NARC *param0) { NARC_dtor(param0); } -CellActorData * ov62_02233A7C (UnkStruct_0208C06C * param0, NARC * param1, int param2, int param3, int param4, int param5) +CellActorData *ov62_02233A7C(UnkStruct_0208C06C *param0, NARC *param1, int param2, int param3, int param4, int param5) { - CellActorData * v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; - PaletteData * v3; + CellActorData *v0; + SpriteRenderer *v1; + SpriteGfxHandler *v2; + PaletteData *v3; SpriteTemplate v4; int v5; @@ -2202,7 +2238,7 @@ CellActorData * ov62_02233A7C (UnkStruct_0208C06C * param0, NARC * param1, int p return v0; } -void ov62_02233B24 (UnkStruct_0208C06C * param0, int param1, CellActorData * param2) +void ov62_02233B24(UnkStruct_0208C06C *param0, int param1, CellActorData *param2) { int v0; @@ -2214,7 +2250,7 @@ void ov62_02233B24 (UnkStruct_0208C06C * param0, int param1, CellActorData * par sub_0200D0F4(param2); } -void ov62_02233B40 (UnkStruct_0208C06C * param0, int param1, CellActorData * param2) +void ov62_02233B40(UnkStruct_0208C06C *param0, int param1, CellActorData *param2) { int v0; @@ -2225,20 +2261,20 @@ void ov62_02233B40 (UnkStruct_0208C06C * param0, int param1, CellActorData * par sub_0200D0F4(param2); } -static void ov62_02233B50 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C * param1) +static void ov62_02233B50(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *param1) { int v0; int v1; - Window * v2; - Strbuf* v3; + Window *v2; + Strbuf *v3; { s16 v4[][4] = { - {0x4, 0x4, 0x18, 0x2}, - {0x4, 0x6, 0x18, 0x4}, - {0x4, 0xB, 0x5, 0x2}, - {0x4, 0xD, 0x5, 0x2}, - {0x4, 0x15, 0x18, 0x2} + { 0x4, 0x4, 0x18, 0x2 }, + { 0x4, 0x6, 0x18, 0x4 }, + { 0x4, 0xB, 0x5, 0x2 }, + { 0x4, 0xD, 0x5, 0x2 }, + { 0x4, 0x15, 0x18, 0x2 } }; int v5[] = { @@ -2268,12 +2304,12 @@ static void ov62_02233B50 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C } { - Strbuf* v6; - Strbuf* v7; - Strbuf* v8; - StringTemplate * v9; - Window * v10; - UnkStruct_02030A80 * v11; + Strbuf *v6; + Strbuf *v7; + Strbuf *v8; + StringTemplate *v9; + Window *v10; + UnkStruct_02030A80 *v11; v11 = param0->unk_00; v9 = ov62_02231690(102); @@ -2337,9 +2373,9 @@ static void ov62_02233B50 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C u64 v14 = sub_0202FE98(param0->unk_04, 4, 0); u64 v15 = v14; u32 v16[3]; - Strbuf* v17 = Strbuf_Init(255, 102); - Strbuf* v18 = Strbuf_Init(255, 102); - Strbuf* v19 = Strbuf_Init(255, 102); + Strbuf *v17 = Strbuf_Init(255, 102); + Strbuf *v18 = Strbuf_Init(255, 102); + Strbuf *v19 = Strbuf_Init(255, 102); v10 = ¶m0->unk_3C[4]; v16[0] = v15 % 100000; @@ -2382,7 +2418,7 @@ static void ov62_02233B50 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C } } -static void ov62_02233F74 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C * param1) +static void ov62_02233F74(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *param1) { int v0; @@ -2392,7 +2428,7 @@ static void ov62_02233F74 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C } } -BOOL ov62_02233F94 (UnkStruct_0202F41C * param0) +BOOL ov62_02233F94(UnkStruct_0202F41C *param0) { int v0; BOOL v1 = 0; @@ -2417,12 +2453,12 @@ BOOL ov62_02233F94 (UnkStruct_0202F41C * param0) return v1; } -static BOOL ov62_02233FE0 (UnkStruct_ov62_02233F74 * param0) +static BOOL ov62_02233FE0(UnkStruct_ov62_02233F74 *param0) { return ov62_02233F94(param0->unk_04); } -int ov62_02233FEC (UnkStruct_ov62_02233F74 * param0) +int ov62_02233FEC(UnkStruct_ov62_02233F74 *param0) { if (ov62_02233FE0(param0) == 1) { return 81; @@ -2431,7 +2467,7 @@ int ov62_02233FEC (UnkStruct_ov62_02233F74 * param0) return 82; } -static void ov62_02234000 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C * param1) +static void ov62_02234000(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *param1) { int v0; int v1; @@ -2443,37 +2479,37 @@ static void ov62_02234000 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C int v7[12]; int v8[12]; int v9; - SpriteRenderer * v10; - SpriteGfxHandler * v11; - PaletteData * v12; + SpriteRenderer *v10; + SpriteGfxHandler *v11; + PaletteData *v12; s16 v13[][12][2] = { { - {11 * 8, 13 * 8}, - {14 * 8, 13 * 8}, - {17 * 8, 13 * 8}, - {20 * 8, 13 * 8}, - {23 * 8, 13 * 8}, - {26 * 8, 13 * 8}, - {3 * 8, 19 * 8}, - {6 * 8, 19 * 8}, - {9 * 8, 19 * 8}, - {12 * 8, 19 * 8}, - {15 * 8, 19 * 8}, - {18 * 8, 19 * 8}, + { 11 * 8, 13 * 8 }, + { 14 * 8, 13 * 8 }, + { 17 * 8, 13 * 8 }, + { 20 * 8, 13 * 8 }, + { 23 * 8, 13 * 8 }, + { 26 * 8, 13 * 8 }, + { 3 * 8, 19 * 8 }, + { 6 * 8, 19 * 8 }, + { 9 * 8, 19 * 8 }, + { 12 * 8, 19 * 8 }, + { 15 * 8, 19 * 8 }, + { 18 * 8, 19 * 8 }, }, { - {3 * 8, 17 * 8}, - {6 * 8, 17 * 8}, - {9 * 8, 17 * 8}, - {5 * 8, 20 * 8}, - {8 * 8, 20 * 8}, - {11 * 8, 20 * 8}, - {18 * 8, 17 * 8}, - {21 * 8, 17 * 8}, - {24 * 8, 17 * 8}, - {20 * 8, 20 * 8}, - {23 * 8, 20 * 8}, - {26 * 8, 20 * 8}, + { 3 * 8, 17 * 8 }, + { 6 * 8, 17 * 8 }, + { 9 * 8, 17 * 8 }, + { 5 * 8, 20 * 8 }, + { 8 * 8, 20 * 8 }, + { 11 * 8, 20 * 8 }, + { 18 * 8, 17 * 8 }, + { 21 * 8, 17 * 8 }, + { 24 * 8, 17 * 8 }, + { 20 * 8, 20 * 8 }, + { 23 * 8, 20 * 8 }, + { 26 * 8, 20 * 8 }, }, }; @@ -2576,13 +2612,13 @@ static void ov62_02234000 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C } } -void ov62_02234214 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C * param1) +void ov62_02234214(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *param1) { ov62_02233B50(param0, param1); ov62_02234000(param0, param1); } -void ov62_02234228 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C * param1) +void ov62_02234228(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *param1) { int v0; @@ -2601,7 +2637,7 @@ void ov62_02234228 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C * param ov62_02233F74(param0, param1); } -void ov62_0223427C (UnkStruct_ov62_02233F74 * param0, int param1) +void ov62_0223427C(UnkStruct_ov62_02233F74 *param0, int param1) { int v0; @@ -2612,7 +2648,7 @@ void ov62_0223427C (UnkStruct_ov62_02233F74 * param0, int param1) } } -int ov62_0223429C (Window * param0, Strbuf *param1) +int ov62_0223429C(Window *param0, Strbuf *param1) { int v0 = Font_CalcStrbufWidth(FONT_SYSTEM, param1, 0); int v1 = (sub_0201C294(param0) * 8 - v0) / 2; @@ -2620,15 +2656,15 @@ int ov62_0223429C (Window * param0, Strbuf *param1) return v1; } -void ov62_022342BC (UnkStruct_0208C06C * param0) +void ov62_022342BC(UnkStruct_0208C06C *param0) { param0->unk_834 = 0; param0->unk_836 = 0; } -BOOL ov62_022342CC (UnkStruct_0208C06C * param0) +BOOL ov62_022342CC(UnkStruct_0208C06C *param0) { - MiscSaveBlock * v0 = SaveData_MiscSaveBlock(param0->unk_830); + MiscSaveBlock *v0 = SaveData_MiscSaveBlock(param0->unk_830); u32 v1, v2; u8 v3; @@ -2638,7 +2674,7 @@ BOOL ov62_022342CC (UnkStruct_0208C06C * param0) return 1; } -void ov62_02234314 (void) +void ov62_02234314(void) { BGL_SetPriority(0, 1); BGL_SetPriority(1, 3); @@ -2650,7 +2686,7 @@ void ov62_02234314 (void) BGL_SetPriority(7, 1); } -void ov62_02234358 (UnkStruct_0208C06C * param0, UnkStruct_0208B878 * param1, s16 param2, s16 param3) +void ov62_02234358(UnkStruct_0208C06C *param0, UnkStruct_0208B878 *param1, s16 param2, s16 param3) { if (param0->unk_14.unk_30 == 0) { sub_0208B9E0(param1, 1); @@ -2664,7 +2700,7 @@ void ov62_02234358 (UnkStruct_0208C06C * param0, UnkStruct_0208B878 * param1, s1 } } -int ov62_0223438C (u64 param0) +int ov62_0223438C(u64 param0) { int v0 = 1; u64 v1 = param0; @@ -2677,14 +2713,14 @@ int ov62_0223438C (u64 param0) return v0; } -void ov62_022343B8 (UnkStruct_0208C06C * param0, int param1, int param2) +void ov62_022343B8(UnkStruct_0208C06C *param0, int param1, int param2) { sub_0200710C(param0->unk_14.unk_00, param1, param0->unk_14.unk_10, param2, 0, 0, 0, 102); } -static void ov62_022343D8 (SysTask * param0, void * param1) +static void ov62_022343D8(SysTask *param0, void *param1) { - UnkStruct_0208C06C * v0 = param1; + UnkStruct_0208C06C *v0 = param1; s16 v1; if ((++v0->unk_41D8.unk_04) >= 7) { @@ -2702,7 +2738,7 @@ static void ov62_022343D8 (SysTask * param0, void * param1) sub_0208BA08(v0->unk_41D8.unk_08, v1, v1); } -static void ov62_02234440 (UnkStruct_0208C06C * param0) +static void ov62_02234440(UnkStruct_0208C06C *param0) { u32 v0, v1; s16 v2 = 0; @@ -2742,23 +2778,23 @@ static void ov62_02234440 (UnkStruct_0208C06C * param0) } } -void ov62_02234520 (UnkStruct_0208C06C * param0) +void ov62_02234520(UnkStruct_0208C06C *param0) { ov62_02234440(param0); Sound_PlayEffect(1379); } -BOOL ov62_02234534 (UnkStruct_0208C06C * param0) +BOOL ov62_02234534(UnkStruct_0208C06C *param0) { return param0->unk_14.unk_514; } -void ov62_02234540 (UnkStruct_0208C06C * param0, BOOL param1) +void ov62_02234540(UnkStruct_0208C06C *param0, BOOL param1) { param0->unk_14.unk_514 = param1; } -void ov62_0223454C (UnkStruct_0208C06C * param0, UnkStruct_ov62_022312B0 * param1, int param2, int param3, s16 param4, s16 param5, s16 param6, s16 param7, int param8, BOOL param9) +void ov62_0223454C(UnkStruct_0208C06C *param0, UnkStruct_ov62_022312B0 *param1, int param2, int param3, s16 param4, s16 param5, s16 param6, s16 param7, int param8, BOOL param9) { param1->unk_08 = ov62_022313E0(param0, param2); @@ -2770,13 +2806,13 @@ void ov62_0223454C (UnkStruct_0208C06C * param0, UnkStruct_ov62_022312B0 * param sub_0200D364(param1->unk_08, param8); } -void ov62_022345A8 (UnkStruct_ov62_022312B0 * param0) +void ov62_022345A8(UnkStruct_ov62_022312B0 *param0) { ov62_022312B0(param0); sub_0200D0F4(param0->unk_08); } -int ov62_022345B8 (UnkStruct_0208C06C * param0, int param1, int param2, int param3) +int ov62_022345B8(UnkStruct_0208C06C *param0, int param1, int param2, int param3) { param0->unk_14.unk_4F0.unk_00 = param0->unk_04; param0->unk_14.unk_4F0.unk_04 = param0->unk_08; @@ -2876,8 +2912,7 @@ int ov62_022345B8 (UnkStruct_0208C06C * param0, int param1, int param2, int para break; } break; - case 2: - { + case 2: { switch (param1) { case 0: switch (param2) { @@ -3084,8 +3119,7 @@ int ov62_022345B8 (UnkStruct_0208C06C * param0, int param1, int param2, int para GF_ASSERT(0); break; } - } - break; + } break; } param0->unk_14.unk_4F0.unk_0C = v0; @@ -3094,7 +3128,7 @@ int ov62_022345B8 (UnkStruct_0208C06C * param0, int param1, int param2, int para return param0->unk_14.unk_4F0.unk_0C; } -void ov62_022348B8 (UnkStruct_0208C06C * param0, int param1, int param2, int param3) +void ov62_022348B8(UnkStruct_0208C06C *param0, int param1, int param2, int param3) { param0->unk_14.unk_4F0.unk_00 = param0->unk_04; param0->unk_14.unk_4F0.unk_04 = param0->unk_08; @@ -3106,7 +3140,7 @@ void ov62_022348B8 (UnkStruct_0208C06C * param0, int param1, int param2, int par *param0->unk_10 = 18; } -void ov62_022348FC (UnkStruct_0208C06C * param0) +void ov62_022348FC(UnkStruct_0208C06C *param0) { switch (param0->unk_14.unk_4F0.unk_10) { case 0: @@ -3136,7 +3170,7 @@ void ov62_022348FC (UnkStruct_0208C06C * param0) } } -BOOL ov62_02234970 (UnkStruct_0208C06C * param0, u64 param1) +BOOL ov62_02234970(UnkStruct_0208C06C *param0, u64 param1) { u64 v0; int v1; @@ -3156,10 +3190,10 @@ BOOL ov62_02234970 (UnkStruct_0208C06C * param0, u64 param1) return 0; } -void ov62_022349A8 (UnkStruct_0208C06C * param0, Strbuf *param1) +void ov62_022349A8(UnkStruct_0208C06C *param0, Strbuf *param1) { - UnkStruct_ov62_022349A8 * v0 = ov62_0224112C(param0); - Strbuf* v1; + UnkStruct_ov62_022349A8 *v0 = ov62_0224112C(param0); + Strbuf *v1; int v2 = 64; v1 = Strbuf_Init(v2, v0->unk_144); @@ -3171,9 +3205,9 @@ void ov62_022349A8 (UnkStruct_0208C06C * param0, Strbuf *param1) Strbuf_Free(v1); } -static void ov62_022349E4 (Strbuf *param0, int param1) +static void ov62_022349E4(Strbuf *param0, int param1) { - MessageLoader * v0; + MessageLoader *v0; Strbuf_Clear(param0); v0 = MessageLoader_Init(1, 26, 10, param1); diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index 6e2c6aad1b..cedf0865fb 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -59,8 +59,8 @@ FS_EXTERN_OVERLAY(overlay22); typedef struct { int unk_00; int unk_04; - UnkStruct_02029C68 * unk_08; - UnkStruct_ov61_0222BC90 * unk_0C[5]; + UnkStruct_02029C68 *unk_08; + UnkStruct_ov61_0222BC90 *unk_0C[5]; } UnkStruct_ov62_02237D24_sub1; typedef struct { @@ -73,57 +73,56 @@ typedef struct { int unk_190; int unk_194; UnkStruct_ov62_022312B0 unk_198[2]; - UnkStruct_02023FCC * unk_1D0[1]; + UnkStruct_02023FCC *unk_1D0[1]; UnkStruct_ov62_0223E01C_sub1 unk_1D4; - UnkStruct_ov62_02249380 * unk_1E8; + UnkStruct_ov62_02249380 *unk_1E8; UnkStruct_ov62_02248CDC unk_1EC; UnkStruct_ov22_0225AF8C unk_218; - UnkStruct_ov22_0225B1BC * unk_228; - UnkStruct_02029C68 * unk_22C; + UnkStruct_ov22_0225B1BC *unk_228; + UnkStruct_02029C68 *unk_22C; UnkStruct_ov62_02237D24_sub1 unk_230; UnkStruct_ov62_022323B8 unk_250; - UnkStruct_02030A80 * unk_2DC; + UnkStruct_02030A80 *unk_2DC; int unk_2E0; int unk_2E4; } UnkStruct_ov62_02237D24; -static BOOL ov62_02237D24(UnkStruct_0208C06C * param0); -static BOOL ov62_02237DB8(UnkStruct_0208C06C * param0); -static BOOL ov62_02237F08(UnkStruct_0208C06C * param0); -static BOOL ov62_02238048(UnkStruct_0208C06C * param0); -static BOOL ov62_022380B0(UnkStruct_0208C06C * param0); -static BOOL ov62_022383E4(UnkStruct_0208C06C * param0); -static BOOL ov62_022385EC(UnkStruct_0208C06C * param0); -static BOOL ov62_02238610(UnkStruct_0208C06C * param0); -static BOOL ov62_02238794(UnkStruct_0208C06C * param0); -static BOOL ov62_0223896C(UnkStruct_0208C06C * param0); -static BOOL ov62_02238B70(UnkStruct_0208C06C * param0); -static BOOL ov62_02238D04(UnkStruct_0208C06C * param0); -static BOOL ov62_02238E54(UnkStruct_0208C06C * param0); -static BOOL ov62_02238F24(UnkStruct_0208C06C * param0); -static BOOL ov62_0223900C(UnkStruct_0208C06C * param0); -static BOOL ov62_0223921C(UnkStruct_0208C06C * param0); -static void ov62_02239424(UnkStruct_0208C06C * param0); -static void ov62_02239440(UnkStruct_0208C06C * param0, int param1); -static void ov62_02239498(UnkStruct_0208C06C * param0); -static void ov62_022394D8(void * param0); +static BOOL ov62_02237D24(UnkStruct_0208C06C *param0); +static BOOL ov62_02237DB8(UnkStruct_0208C06C *param0); +static BOOL ov62_02237F08(UnkStruct_0208C06C *param0); +static BOOL ov62_02238048(UnkStruct_0208C06C *param0); +static BOOL ov62_022380B0(UnkStruct_0208C06C *param0); +static BOOL ov62_022383E4(UnkStruct_0208C06C *param0); +static BOOL ov62_022385EC(UnkStruct_0208C06C *param0); +static BOOL ov62_02238610(UnkStruct_0208C06C *param0); +static BOOL ov62_02238794(UnkStruct_0208C06C *param0); +static BOOL ov62_0223896C(UnkStruct_0208C06C *param0); +static BOOL ov62_02238B70(UnkStruct_0208C06C *param0); +static BOOL ov62_02238D04(UnkStruct_0208C06C *param0); +static BOOL ov62_02238E54(UnkStruct_0208C06C *param0); +static BOOL ov62_02238F24(UnkStruct_0208C06C *param0); +static BOOL ov62_0223900C(UnkStruct_0208C06C *param0); +static BOOL ov62_0223921C(UnkStruct_0208C06C *param0); +static void ov62_02239424(UnkStruct_0208C06C *param0); +static void ov62_02239440(UnkStruct_0208C06C *param0, int param1); +static void ov62_02239498(UnkStruct_0208C06C *param0); +static void ov62_022394D8(void *param0); static void ov62_02239518(void); static void ov62_0223956C(void); -static void ov62_0223958C(UnkStruct_0208C06C * param0, int param1); -static void ov62_02239608(UnkStruct_0208C06C * param0); -static void ov62_022396E8(UnkStruct_0208C06C * param0); -static void ov62_02239724(UnkStruct_0208C06C * param0); -static void ov62_02239854(UnkStruct_0208C06C * param0, int param1); -static BOOL ov62_02239984(UnkStruct_0208C06C * param0, int param1); -static void ov62_02239A0C(UnkStruct_0208C06C * param0, int param1); -static void ov62_02239B7C(UnkStruct_0208C06C * param0); -static void ov62_02239BAC(u32 param0, u32 param1, void * param2); -static void ov62_02239BD8(UnkStruct_0208C06C * param0); -static void ov62_02239CE8(UnkStruct_0208C06C * param0); -static void ov62_02239D0C(UnkStruct_0208C06C * param0); -void ov62_02239D34(void * param0, const UnkStruct_ov62_0223CAA4 * param1); -void ov62_02239D38(void * param0, const UnkStruct_ov62_0223CAA4 * param1); - +static void ov62_0223958C(UnkStruct_0208C06C *param0, int param1); +static void ov62_02239608(UnkStruct_0208C06C *param0); +static void ov62_022396E8(UnkStruct_0208C06C *param0); +static void ov62_02239724(UnkStruct_0208C06C *param0); +static void ov62_02239854(UnkStruct_0208C06C *param0, int param1); +static BOOL ov62_02239984(UnkStruct_0208C06C *param0, int param1); +static void ov62_02239A0C(UnkStruct_0208C06C *param0, int param1); +static void ov62_02239B7C(UnkStruct_0208C06C *param0); +static void ov62_02239BAC(u32 param0, u32 param1, void *param2); +static void ov62_02239BD8(UnkStruct_0208C06C *param0); +static void ov62_02239CE8(UnkStruct_0208C06C *param0); +static void ov62_02239D0C(UnkStruct_0208C06C *param0); +void ov62_02239D34(void *param0, const UnkStruct_ov62_0223CAA4 *param1); +void ov62_02239D38(void *param0, const UnkStruct_ov62_0223CAA4 *param1); static u16 Unk_ov62_022497D4[] = { 0x0, @@ -138,7 +137,8 @@ static u16 Unk_ov62_022497D4[] = { 0x1ED }; -BOOL(*const Unk_ov62_02248D08[])(UnkStruct_0208C06C *) = { +// clang-format off +BOOL (*const Unk_ov62_02248D08[])(UnkStruct_0208C06C *) = { ov62_02237D24, ov62_02237DB8, ov62_02237F08, @@ -146,8 +146,10 @@ BOOL(*const Unk_ov62_02248D08[])(UnkStruct_0208C06C *) = { ov62_022380B0, ov62_022383E4, }; +// clang-format on -BOOL(*const Unk_ov62_02248D20[])(UnkStruct_0208C06C *) = { +// clang-format off +BOOL (*const Unk_ov62_02248D20[])(UnkStruct_0208C06C *) = { ov62_02237D24, ov62_02237DB8, ov62_022385EC, @@ -161,29 +163,30 @@ BOOL(*const Unk_ov62_02248D20[])(UnkStruct_0208C06C *) = { ov62_0223900C, ov62_0223921C, }; +// clang-format on static const TouchScreenRect Unk_ov62_02248CB0[] = { - {0x98, 0xB8, 0x20, 0x80}, - {0x98, 0xB8, 0x80, 0xE0} + { 0x98, 0xB8, 0x20, 0x80 }, + { 0x98, 0xB8, 0x80, 0xE0 } }; static const TouchScreenRect Unk_ov62_02248CAC[] = { - {0x98, 0xB8, 0x50, 0xB0} + { 0x98, 0xB8, 0x50, 0xB0 } }; static const TouchScreenRect Unk_ov62_02248CC4[] = { - {0x18, 0x28, 0x38, 0xC0}, - {0x28, 0x38, 0x38, 0xC0}, - {0x38, 0x48, 0x38, 0xC0}, - {0x48, 0x58, 0x38, 0xC0}, - {0x58, 0x68, 0x38, 0xC0}, - {0x68, 0x78, 0x38, 0xC0} + { 0x18, 0x28, 0x38, 0xC0 }, + { 0x28, 0x38, 0x38, 0xC0 }, + { 0x38, 0x48, 0x38, 0xC0 }, + { 0x48, 0x58, 0x38, 0xC0 }, + { 0x58, 0x68, 0x38, 0xC0 }, + { 0x68, 0x78, 0x38, 0xC0 } }; static const TouchScreenRect Unk_ov62_02248CB8[] = { - {0x10, 0x30, 0x38, 0xC8}, - {0x48, 0x68, 0x18, 0x48}, - {0x48, 0x68, 0xB8, 0xE8} + { 0x10, 0x30, 0x38, 0xC8 }, + { 0x48, 0x68, 0x18, 0x48 }, + { 0x48, 0x68, 0xB8, 0xE8 } }; static const UnkStruct_ov62_02248CDC Unk_ov62_02248CDC = { @@ -200,9 +203,9 @@ static const UnkStruct_ov62_02248CDC Unk_ov62_02248CDC = { Unk_ov62_02248CC4 }; -static BOOL ov62_02237D24 (UnkStruct_0208C06C * param0) +static BOOL ov62_02237D24(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = Heap_AllocFromHeap(102, sizeof(UnkStruct_ov62_02237D24)); + UnkStruct_ov62_02237D24 *v0 = Heap_AllocFromHeap(102, sizeof(UnkStruct_ov62_02237D24)); memset(v0, 0, sizeof(UnkStruct_ov62_02237D24)); param0->unk_860 = v0; @@ -231,9 +234,9 @@ static BOOL ov62_02237D24 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02237DB8 (UnkStruct_0208C06C * param0) +static BOOL ov62_02237DB8(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -281,9 +284,9 @@ static BOOL ov62_02237DB8 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02237F08 (UnkStruct_0208C06C * param0) +static BOOL ov62_02237F08(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -336,9 +339,9 @@ static BOOL ov62_02237F08 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02238048 (UnkStruct_0208C06C * param0) +static BOOL ov62_02238048(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; if (TouchScreen_LocationPressed(&Unk_ov62_02248CB0[0])) { ov62_02234520(param0); @@ -359,10 +362,10 @@ static BOOL ov62_02238048 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_022380B0 (UnkStruct_0208C06C * param0) +static BOOL ov62_022380B0(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; - UnkStruct_ov62_0223CAA4 * v1; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; + UnkStruct_ov62_0223CAA4 *v1; if (ov62_022411B8(param0) == 0) { return 0; @@ -488,9 +491,9 @@ static BOOL ov62_022380B0 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_022383E4 (UnkStruct_0208C06C * param0) +static BOOL ov62_022383E4(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -576,9 +579,9 @@ static BOOL ov62_022383E4 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_022385EC (UnkStruct_0208C06C * param0) +static BOOL ov62_022385EC(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -593,9 +596,9 @@ static BOOL ov62_022385EC (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02238610 (UnkStruct_0208C06C * param0) +static BOOL ov62_02238610(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -660,9 +663,9 @@ static BOOL ov62_02238610 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02238794 (UnkStruct_0208C06C * param0) +static BOOL ov62_02238794(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -739,9 +742,9 @@ static BOOL ov62_02238794 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223896C (UnkStruct_0208C06C * param0) +static BOOL ov62_0223896C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -827,10 +830,10 @@ static BOOL ov62_0223896C (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02238B70 (UnkStruct_0208C06C * param0) +static BOOL ov62_02238B70(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; - UnkStruct_ov62_0223CAA4 * v1; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; + UnkStruct_ov62_0223CAA4 *v1; if (ov62_022411B8(param0) == 0) { return 0; @@ -897,9 +900,9 @@ static BOOL ov62_02238B70 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02238D04 (UnkStruct_0208C06C * param0) +static BOOL ov62_02238D04(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -953,9 +956,9 @@ static BOOL ov62_02238D04 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02238E54 (UnkStruct_0208C06C * param0) +static BOOL ov62_02238E54(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; if (TouchScreen_LocationPressed(&Unk_ov62_02248CAC[0])) { ov62_02234520(param0); @@ -994,9 +997,9 @@ static BOOL ov62_02238E54 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02238F24 (UnkStruct_0208C06C * param0) +static BOOL ov62_02238F24(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -1042,9 +1045,9 @@ static BOOL ov62_02238F24 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223900C (UnkStruct_0208C06C * param0) +static BOOL ov62_0223900C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -1134,9 +1137,9 @@ static BOOL ov62_0223900C (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223921C (UnkStruct_0208C06C * param0) +static BOOL ov62_0223921C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -1226,19 +1229,19 @@ static BOOL ov62_0223921C (UnkStruct_0208C06C * param0) return 0; } -static void ov62_02239424 (UnkStruct_0208C06C * param0) +static void ov62_02239424(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; sub_0201ACF4(&v0->unk_D0[0]); BGL_DeleteWindow(&v0->unk_D0[0]); } -static void ov62_02239440 (UnkStruct_0208C06C * param0, int param1) +static void ov62_02239440(UnkStruct_0208C06C *param0, int param1) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; - Window * v1; - Strbuf* v2; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; + Window *v1; + Strbuf *v2; int v3; v1 = &v0->unk_D0[0]; @@ -1253,10 +1256,10 @@ static void ov62_02239440 (UnkStruct_0208C06C * param0, int param1) sub_0201A9A4(v1); } -static void ov62_02239498 (UnkStruct_0208C06C * param0) +static void ov62_02239498(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; - Window * v1; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; + Window *v1; int v2 = 1; v1 = &v0->unk_D0[0]; @@ -1266,10 +1269,10 @@ static void ov62_02239498 (UnkStruct_0208C06C * param0) ov62_02239440(param0, 121); } -static void ov62_022394D8 (void * param0) +static void ov62_022394D8(void *param0) { - UnkStruct_0208C06C * v0 = param0; - UnkStruct_ov62_02237D24 * v1 = v0->unk_860; + UnkStruct_0208C06C *v0 = param0; + UnkStruct_ov62_02237D24 *v1 = v0->unk_860; if (v1->unk_228) { ov22_0225B06C(v1->unk_228); @@ -1282,7 +1285,7 @@ static void ov62_022394D8 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov62_02239518 (void) +static void ov62_02239518(void) { GX_SetVisibleWnd(GX_WNDMASK_W0); G2_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 1); @@ -1290,15 +1293,15 @@ static void ov62_02239518 (void) G2_SetWnd0Position(9 * 8, 2 * 8, 9 * 8 + 14 * 8, 2 * 8 + 16 * 8); } -static void ov62_0223956C (void) +static void ov62_0223956C(void) { GX_SetVisibleWnd(GX_WNDMASK_NONE); GXS_SetVisibleWnd(GX_WNDMASK_NONE); } -static void ov62_0223958C (UnkStruct_0208C06C * param0, int param1) +static void ov62_0223958C(UnkStruct_0208C06C *param0, int param1) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; if (param1 == 0) { SpriteActor_EnableObject(v0->unk_198[1].unk_08, 1); @@ -1314,9 +1317,9 @@ static void ov62_0223958C (UnkStruct_0208C06C * param0, int param1) sub_020128C4(v0->unk_198[1].unk_0C, 36, -8); } -static void ov62_02239608 (UnkStruct_0208C06C * param0) +static void ov62_02239608(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; ov62_022312CC(param0, NNS_G2D_VRAM_TYPE_2DSUB); @@ -1340,9 +1343,9 @@ static void ov62_02239608 (UnkStruct_0208C06C * param0) ov62_0223958C(param0, 0); } -static void ov62_022396E8 (UnkStruct_0208C06C * param0) +static void ov62_022396E8(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; ov62_022312B0(&v0->unk_198[0]); ov62_022312B0(&v0->unk_198[1]); @@ -1451,15 +1454,15 @@ static void ov62_02239854(UnkStruct_0208C06C *param0, int param1) StringTemplate_Free(v4); } -static BOOL ov62_02239984 (UnkStruct_0208C06C * param0, int param1) +static BOOL ov62_02239984(UnkStruct_0208C06C *param0, int param1) { BOOL v0 = 0; - u16 * v1; + u16 *v1; int v2; int v3; int v4; int pokedexLength; - UnkStruct_ov62_02237D24 * v6 = param0->unk_860; + UnkStruct_ov62_02237D24 *v6 = param0->unk_860; v4 = Unk_ov62_022497D4[param1 + 1]; v3 = Unk_ov62_022497D4[param1]; @@ -1470,7 +1473,7 @@ static BOOL ov62_02239984 (UnkStruct_0208C06C * param0, int param1) int v7; int v8 = 0; BOOL v9; - PokedexData * v10 = SaveData_Pokedex(param0->unk_830); + PokedexData *v10 = SaveData_Pokedex(param0->unk_830); for (v7 = v3; v7 < v4; v7++) { v9 = sub_02026FE8(v10, v1[v7]); @@ -1495,13 +1498,13 @@ static BOOL ov62_02239984 (UnkStruct_0208C06C * param0, int param1) return v0; } -static void ov62_02239A0C (UnkStruct_0208C06C * param0, int param1) +static void ov62_02239A0C(UnkStruct_0208C06C *param0, int param1) { - u16 * v0; + u16 *v0; int v1; int v2; int v3; - UnkStruct_ov62_02237D24 * v4 = param0->unk_860; + UnkStruct_ov62_02237D24 *v4 = param0->unk_860; v3 = Unk_ov62_022497D4[param1 + 1]; v2 = Unk_ov62_022497D4[param1]; @@ -1514,7 +1517,7 @@ static void ov62_02239A0C (UnkStruct_0208C06C * param0, int param1) int v5; int v6 = 0; BOOL v7; - PokedexData * v8 = SaveData_Pokedex(param0->unk_830); + PokedexData *v8 = SaveData_Pokedex(param0->unk_830); v4->unk_1D4.unk_00 = 0; @@ -1557,9 +1560,9 @@ static void ov62_02239A0C (UnkStruct_0208C06C * param0, int param1) v4->unk_1D4.unk_10 = 1; } -static void ov62_02239B7C (UnkStruct_0208C06C * param0) +static void ov62_02239B7C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; MessageLoader_Free(v0->unk_1D4.unk_0C); Heap_FreeToHeap(v0->unk_1E8); @@ -1568,10 +1571,10 @@ static void ov62_02239B7C (UnkStruct_0208C06C * param0) v0->unk_1D4.unk_10 = 0; } -static void ov62_02239BAC (u32 param0, u32 param1, void * param2) +static void ov62_02239BAC(u32 param0, u32 param1, void *param2) { - UnkStruct_0208C06C * v0 = param2; - UnkStruct_ov62_02237D24 * v1 = v0->unk_860; + UnkStruct_0208C06C *v0 = param2; + UnkStruct_ov62_02237D24 *v1 = v0->unk_860; if (param1 != 0) { return; @@ -1619,11 +1622,11 @@ static void ov62_02239BD8(UnkStruct_0208C06C *param0) } } -static void ov62_02239CE8 (UnkStruct_0208C06C * param0) +static void ov62_02239CE8(UnkStruct_0208C06C *param0) { u32 v0; - Window * v1; - UnkStruct_ov62_02237D24 * v2 = param0->unk_860; + Window *v1; + UnkStruct_ov62_02237D24 *v2 = param0->unk_860; for (v0 = 0; v0 < 9; v0++) { v1 = &v2->unk_D0[v0]; @@ -1632,9 +1635,9 @@ static void ov62_02239CE8 (UnkStruct_0208C06C * param0) } } -static void ov62_02239D0C (UnkStruct_0208C06C * param0) +static void ov62_02239D0C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02237D24 * v0 = param0->unk_860; + UnkStruct_ov62_02237D24 *v0 = param0->unk_860; if (BGL_WindowAdded(&v0->unk_10[0]) == 1) { sub_0201ACF4(&v0->unk_10[0]); @@ -1642,10 +1645,10 @@ static void ov62_02239D0C (UnkStruct_0208C06C * param0) } } -void ov62_02239D34 (void * param0, const UnkStruct_ov62_0223CAA4 * param1) +void ov62_02239D34(void *param0, const UnkStruct_ov62_0223CAA4 *param1) { - UnkStruct_0208C06C * v0 = param0; - UnkStruct_ov62_02237D24 * v1 = v0->unk_860; + UnkStruct_0208C06C *v0 = param0; + UnkStruct_ov62_02237D24 *v1 = v0->unk_860; if (param1->unk_00 == 1) { (void)0; @@ -1654,10 +1657,10 @@ void ov62_02239D34 (void * param0, const UnkStruct_ov62_0223CAA4 * param1) } } -void ov62_02239D38 (void * param0, const UnkStruct_ov62_0223CAA4 * param1) +void ov62_02239D38(void *param0, const UnkStruct_ov62_0223CAA4 *param1) { - UnkStruct_0208C06C * v0 = param0; - UnkStruct_ov62_02237D24 * v1 = v0->unk_860; + UnkStruct_0208C06C *v0 = param0; + UnkStruct_ov62_02237D24 *v1 = v0->unk_860; if (param1->unk_00 == 1) { (void)0; diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index afc4b44045..b65940492c 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -64,8 +64,8 @@ typedef struct { } UnkStruct_ov112_0225D880; typedef struct { - void * unk_00; - NNSG2dScreenData * unk_04; + void *unk_00; + NNSG2dScreenData *unk_04; } UnkStruct_ov112_0225CC84; typedef struct { @@ -91,7 +91,7 @@ typedef struct { u16 unk_02; u16 unk_04; u16 unk_06; - Strbuf* unk_08; + Strbuf *unk_08; Window unk_0C; UnkStruct_ov112_0225D180 unk_1C; } UnkStruct_ov112_0225D44C; @@ -99,9 +99,9 @@ typedef struct { typedef struct { UnkStruct_ov112_0225D44C unk_00[3]; Window unk_60[3]; - Strbuf* unk_90; - void * unk_94; - NNSG2dPaletteData * unk_98; + Strbuf *unk_90; + void *unk_94; + NNSG2dPaletteData *unk_98; } UnkStruct_ov112_0225D2D0; typedef struct { @@ -118,16 +118,16 @@ typedef struct { } UnkStruct_ov112_0225D6DC; typedef struct { - BGL * unk_00; - CellActorCollection * unk_04; + BGL *unk_00; + CellActorCollection *unk_04; UnkStruct_0200C738 unk_08; - SpriteResourceCollection * unk_194[4]; - NARC * unk_1A4; + SpriteResourceCollection *unk_194[4]; + NARC *unk_1A4; } UnkStruct_ov112_0225C9BC; typedef struct { - UnkStruct_ov66_0223177C * unk_00; - const UnkStruct_ov66_02231428 * unk_04; + UnkStruct_ov66_0223177C *unk_00; + const UnkStruct_ov66_02231428 *unk_04; UnkStruct_ov112_0225C9BC unk_08; UnkStruct_ov112_0225CC84 unk_1B0; UnkStruct_ov112_0225CDF8 unk_1B8; @@ -136,53 +136,53 @@ typedef struct { UnkStruct_ov112_0225D6DC unk_264; } UnkStruct_ov112_0225C970; -static void ov112_0225C964(void * param0); -static void ov112_0225C970(UnkStruct_ov112_0225C970 * param0, const UnkStruct_ov66_0222DFF8 * param1); -static void ov112_0225C9BC(UnkStruct_ov112_0225C9BC * param0, u32 param1); -static void ov112_0225C9F4(UnkStruct_ov112_0225C9BC * param0); -static void ov112_0225CA14(UnkStruct_ov112_0225C9BC * param0); -static void ov112_0225CA20(UnkStruct_ov112_0225C9BC * param0); -static void ov112_0225CA34(UnkStruct_ov112_0225C9BC * param0, u32 param1); -static void ov112_0225CB60(UnkStruct_ov112_0225C9BC * param0); -static void ov112_0225CB98(UnkStruct_ov112_0225C9BC * param0, u32 param1); -static void ov112_0225CC38(UnkStruct_ov112_0225C9BC * param0); -static void ov112_0225CC64(UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0225C9BC * param1, u32 param2); -static void ov112_0225CC84(UnkStruct_ov112_0225CC84 * param0); -static void ov112_0225CC90(UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0225C9BC * param1, u32 param2, u8 param3, u8 param4); -static void ov112_0225CCE8(UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0225C9BC * param1, u8 param2, u8 param3, u32 param4, u32 param5, BOOL param6, BOOL param7, BOOL param8); -static void ov112_0225CDA8(UnkStruct_ov112_0225CDF8 * param0, UnkStruct_ov112_0225C9BC * param1, UnkStruct_ov112_0225CC84 * param2, const UnkStruct_ov66_0223177C * param3, const UnkStruct_ov66_02231428 * param4, const UnkStruct_ov66_0222DFF8 * param5, u32 param6); -static void ov112_0225CDF8(UnkStruct_ov112_0225CDF8 * param0); -static BOOL ov112_0225CDFC(UnkStruct_ov112_0225CDF8 * param0, const UnkStruct_ov66_0223177C * param1, const UnkStruct_ov66_02231428 * param2); -static void ov112_0225CE60(UnkStruct_ov112_0225CDF8 * param0, UnkStruct_ov112_0225CC84 * param1, UnkStruct_ov112_0225C9BC * param2); -static void ov112_0225CE74(UnkStruct_ov112_0225CDF8 * param0, UnkStruct_ov112_0225CC84 * param1, UnkStruct_ov112_0225C9BC * param2); -static void ov112_0225CE88(UnkStruct_ov112_0225CDF8 * param0, UnkStruct_ov112_0225CC84 * param1, UnkStruct_ov112_0225C9BC * param2); -static void ov112_0225CFC0(UnkStruct_ov112_0225CFD4 * param0, UnkStruct_ov112_0225C9BC * param1, UnkStruct_ov112_0225CC84 * param2, const UnkStruct_ov66_0223177C * param3, const UnkStruct_ov66_0222DFF8 * param4, u32 param5); -static void ov112_0225CFD4(UnkStruct_ov112_0225CFD4 * param0); -static BOOL ov112_0225CFD8(UnkStruct_ov112_0225CFD4 * param0, const UnkStruct_ov66_0223177C * param1); -static void ov112_0225D004(UnkStruct_ov112_0225CFD4 * param0, UnkStruct_ov112_0225CC84 * param1, UnkStruct_ov112_0225C9BC * param2, const UnkStruct_ov66_0223177C * param3, const UnkStruct_ov66_0222DFF8 * param4); -static void ov112_0225D08C(UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0225C9BC * param1, const UnkStruct_ov66_0223177C * param2, const UnkStruct_ov66_0222DFF8 * param3, u32 param4); -static void ov112_0225D144(UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0225C9BC * param1, const UnkStruct_ov66_0223177C * param2, const UnkStruct_ov66_0222DFF8 * param3, u32 param4); -static void ov112_0225D164(UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0225C9BC * param1, const UnkStruct_ov66_0223177C * param2, const UnkStruct_ov66_0222DFF8 * param3, u32 param4); -static void ov112_0225D180(UnkStruct_ov112_0225D180 * param0, const UnkStruct_ov66_0223177C * param1, int param2, const UnkStruct_ov66_0222DFF8 * param3); -static void ov112_0225D1B8(const UnkStruct_ov112_0225D180 * param0, const NNSG2dPaletteData * param1, u32 param2); -static void ov112_0225D1EC(UnkStruct_ov112_0225D2D0 * param0, UnkStruct_ov112_0225C9BC * param1, u32 param2); -static void ov112_0225D2D0(UnkStruct_ov112_0225D2D0 * param0); -static BOOL ov112_0225D304(UnkStruct_ov112_0225D2D0 * param0, UnkStruct_ov66_0223177C * param1, const UnkStruct_ov66_0222DFF8 * param2, u32 param3); -static void ov112_0225D3E0(UnkStruct_ov112_0225D2D0 * param0); -static void ov112_0225D408(UnkStruct_ov112_0225D44C * param0, UnkStruct_ov112_0225C9BC * param1, u32 param2, u32 param3); -static void ov112_0225D44C(UnkStruct_ov112_0225D44C * param0); -static void ov112_0225D460(UnkStruct_ov112_0225D44C * param0, const Strbuf *param1, u32 param2, const UnkStruct_ov112_0225D180 * param3, const NNSG2dPaletteData * param4); -static void ov112_0225D4DC(UnkStruct_ov112_0225D44C * param0); -static BOOL ov112_0225D4E4(UnkStruct_ov112_0225D44C * param0); -static void ov112_0225D4F8(const UnkStruct_ov112_0225D44C * param0, Window * param1); -static void ov112_0225D57C(UnkStruct_ov112_0225D6DC * param0, UnkStruct_ov112_0225C9BC * param1, u32 param2); -static void ov112_0225D6DC(UnkStruct_ov112_0225D6DC * param0); -static void ov112_0225D700(UnkStruct_ov112_0225D6DC * param0); -static void ov112_0225D718(UnkStruct_ov112_0225D6DC * param0, u32 param1); -static void ov112_0225D73C(UnkStruct_ov112_0225D73C * param0, u16 param1, u32 param2); -static void ov112_0225D75C(UnkStruct_ov112_0225D73C * param0); -static void ov112_0225D778(UnkStruct_ov112_0225D73C * param0); -static void ov112_0225D784(UnkStruct_ov112_0225D73C * param0); +static void ov112_0225C964(void *param0); +static void ov112_0225C970(UnkStruct_ov112_0225C970 *param0, const UnkStruct_ov66_0222DFF8 *param1); +static void ov112_0225C9BC(UnkStruct_ov112_0225C9BC *param0, u32 param1); +static void ov112_0225C9F4(UnkStruct_ov112_0225C9BC *param0); +static void ov112_0225CA14(UnkStruct_ov112_0225C9BC *param0); +static void ov112_0225CA20(UnkStruct_ov112_0225C9BC *param0); +static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, u32 param1); +static void ov112_0225CB60(UnkStruct_ov112_0225C9BC *param0); +static void ov112_0225CB98(UnkStruct_ov112_0225C9BC *param0, u32 param1); +static void ov112_0225CC38(UnkStruct_ov112_0225C9BC *param0); +static void ov112_0225CC64(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2); +static void ov112_0225CC84(UnkStruct_ov112_0225CC84 *param0); +static void ov112_0225CC90(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2, u8 param3, u8 param4); +static void ov112_0225CCE8(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u8 param2, u8 param3, u32 param4, u32 param5, BOOL param6, BOOL param7, BOOL param8); +static void ov112_0225CDA8(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_02231428 *param4, const UnkStruct_ov66_0222DFF8 *param5, u32 param6); +static void ov112_0225CDF8(UnkStruct_ov112_0225CDF8 *param0); +static BOOL ov112_0225CDFC(UnkStruct_ov112_0225CDF8 *param0, const UnkStruct_ov66_0223177C *param1, const UnkStruct_ov66_02231428 *param2); +static void ov112_0225CE60(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2); +static void ov112_0225CE74(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2); +static void ov112_0225CE88(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2); +static void ov112_0225CFC0(UnkStruct_ov112_0225CFD4 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_0222DFF8 *param4, u32 param5); +static void ov112_0225CFD4(UnkStruct_ov112_0225CFD4 *param0); +static BOOL ov112_0225CFD8(UnkStruct_ov112_0225CFD4 *param0, const UnkStruct_ov66_0223177C *param1); +static void ov112_0225D004(UnkStruct_ov112_0225CFD4 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_0222DFF8 *param4); +static void ov112_0225D08C(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, const UnkStruct_ov66_0223177C *param2, const UnkStruct_ov66_0222DFF8 *param3, u32 param4); +static void ov112_0225D144(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, const UnkStruct_ov66_0223177C *param2, const UnkStruct_ov66_0222DFF8 *param3, u32 param4); +static void ov112_0225D164(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, const UnkStruct_ov66_0223177C *param2, const UnkStruct_ov66_0222DFF8 *param3, u32 param4); +static void ov112_0225D180(UnkStruct_ov112_0225D180 *param0, const UnkStruct_ov66_0223177C *param1, int param2, const UnkStruct_ov66_0222DFF8 *param3); +static void ov112_0225D1B8(const UnkStruct_ov112_0225D180 *param0, const NNSG2dPaletteData *param1, u32 param2); +static void ov112_0225D1EC(UnkStruct_ov112_0225D2D0 *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2); +static void ov112_0225D2D0(UnkStruct_ov112_0225D2D0 *param0); +static BOOL ov112_0225D304(UnkStruct_ov112_0225D2D0 *param0, UnkStruct_ov66_0223177C *param1, const UnkStruct_ov66_0222DFF8 *param2, u32 param3); +static void ov112_0225D3E0(UnkStruct_ov112_0225D2D0 *param0); +static void ov112_0225D408(UnkStruct_ov112_0225D44C *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2, u32 param3); +static void ov112_0225D44C(UnkStruct_ov112_0225D44C *param0); +static void ov112_0225D460(UnkStruct_ov112_0225D44C *param0, const Strbuf *param1, u32 param2, const UnkStruct_ov112_0225D180 *param3, const NNSG2dPaletteData *param4); +static void ov112_0225D4DC(UnkStruct_ov112_0225D44C *param0); +static BOOL ov112_0225D4E4(UnkStruct_ov112_0225D44C *param0); +static void ov112_0225D4F8(const UnkStruct_ov112_0225D44C *param0, Window *param1); +static void ov112_0225D57C(UnkStruct_ov112_0225D6DC *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2); +static void ov112_0225D6DC(UnkStruct_ov112_0225D6DC *param0); +static void ov112_0225D700(UnkStruct_ov112_0225D6DC *param0); +static void ov112_0225D718(UnkStruct_ov112_0225D6DC *param0, u32 param1); +static void ov112_0225D73C(UnkStruct_ov112_0225D73C *param0, u16 param1, u32 param2); +static void ov112_0225D75C(UnkStruct_ov112_0225D73C *param0); +static void ov112_0225D778(UnkStruct_ov112_0225D73C *param0); +static void ov112_0225D784(UnkStruct_ov112_0225D73C *param0); static const UnkStruct_ov22_022559F8 Unk_ov112_0225D814 = { 0x20, @@ -220,8 +220,7 @@ static const u32 Unk_ov112_0225D844[5] = { }; static const UnkStruct_ov97_0222DB78 Unk_ov112_0225D8C0[5] = { - { - 0x0, + { 0x0, 0x0, 0x800, 0x0, @@ -233,10 +232,8 @@ static const UnkStruct_ov97_0222DB78 Unk_ov112_0225D8C0[5] = { 0x0, 0x0, 0x0, - 0x0 - }, - { - 0x0, + 0x0 }, + { 0x0, 0x0, 0x800, 0x0, @@ -248,10 +245,8 @@ static const UnkStruct_ov97_0222DB78 Unk_ov112_0225D8C0[5] = { 0x1, 0x0, 0x0, - 0x0 - }, - { - 0x0, + 0x0 }, + { 0x0, 0x0, 0x800, 0x0, @@ -263,10 +258,8 @@ static const UnkStruct_ov97_0222DB78 Unk_ov112_0225D8C0[5] = { 0x3, 0x0, 0x0, - 0x0 - }, - { - 0x0, + 0x0 }, + { 0x0, 0x0, 0x800, 0x0, @@ -278,10 +271,8 @@ static const UnkStruct_ov97_0222DB78 Unk_ov112_0225D8C0[5] = { 0x2, 0x0, 0x0, - 0x0 - }, - { - 0x0, + 0x0 }, + { 0x0, 0x0, 0x800, 0x0, @@ -293,8 +284,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov112_0225D8C0[5] = { 0x0, 0x0, 0x0, - 0x0 - } + 0x0 } }; static const u8 Unk_ov112_0225D804[3] = { @@ -310,17 +300,17 @@ static const u32 Unk_ov112_0225D808[3] = { }; static const UnkStruct_ov112_0225D824 Unk_ov112_0225D824[4] = { - {0x1}, - {0x4}, - {0x5}, - {0x6} + { 0x1 }, + { 0x4 }, + { 0x5 }, + { 0x6 } }; static const UnkStruct_ov112_0225D880 Unk_ov112_0225D880[4] = { - {0x6, 0x0, 0x14, 0x8, 0x1, 0xA, 0x50, 0x6, 0x1, 0x30400}, - {0x0, 0x6, 0x6, 0x3, 0xA1, 0x7, 0x10, 0x4, 0x1, 0xD0E00}, - {0xF, 0x6, 0x6, 0x5, 0xB3, 0x7, 0x18, 0x4, 0x1, 0xD0E00}, - {0x4, 0xC, 0x12, 0x3, 0xD1, 0x7, 0x4, 0x4, 0x0, 0xD0E00} + { 0x6, 0x0, 0x14, 0x8, 0x1, 0xA, 0x50, 0x6, 0x1, 0x30400 }, + { 0x0, 0x6, 0x6, 0x3, 0xA1, 0x7, 0x10, 0x4, 0x1, 0xD0E00 }, + { 0xF, 0x6, 0x6, 0x5, 0xB3, 0x7, 0x18, 0x4, 0x1, 0xD0E00 }, + { 0x4, 0xC, 0x12, 0x3, 0xD1, 0x7, 0x4, 0x4, 0x0, 0xD0E00 } }; static u16 Unk_ov112_0225D960[4] = { @@ -337,10 +327,10 @@ static u32 Unk_ov112_0225D968[4] = { 0x5E3 }; -int ov112_0225C700 (OverlayManager * param0, int * param1) +int ov112_0225C700(OverlayManager *param0, int *param1) { - UnkStruct_ov112_0225C970 * v0; - UnkStruct_ov66_02230FA0 * v1; + UnkStruct_ov112_0225C970 *v0; + UnkStruct_ov66_02230FA0 *v1; v1 = OverlayManager_Args(param0); Heap_Create(3, 107, 0x50000); @@ -364,10 +354,10 @@ int ov112_0225C700 (OverlayManager * param0, int * param1) return 1; } -int ov112_0225C7C4 (OverlayManager * param0, int * param1) +int ov112_0225C7C4(OverlayManager *param0, int *param1) { - UnkStruct_ov112_0225C970 * v0; - UnkStruct_ov66_02230FA0 * v1; + UnkStruct_ov112_0225C970 *v0; + UnkStruct_ov66_02230FA0 *v1; BOOL v2; v0 = OverlayManager_Data(param0); @@ -388,7 +378,7 @@ int ov112_0225C7C4 (OverlayManager * param0, int * param1) break; case 2: if ((gCoreSys.pressedKeys & PAD_BUTTON_B) || (ov66_0222E12C(v1->unk_08) == 1) || (ov66_02231760() == 1)) { - if ((ov66_0222E12C(v1->unk_08) == 1)) { + if (ov66_0222E12C(v1->unk_08) == 1) { ov66_0222E2A4(v1->unk_08); } (*param1) = 3; @@ -430,10 +420,10 @@ int ov112_0225C7C4 (OverlayManager * param0, int * param1) return 0; } -int ov112_0225C8FC (OverlayManager * param0, int * param1) +int ov112_0225C8FC(OverlayManager *param0, int *param1) { - UnkStruct_ov112_0225C970 * v0; - UnkStruct_ov66_02230FA0 * v1; + UnkStruct_ov112_0225C970 *v0; + UnkStruct_ov66_02230FA0 *v1; v0 = OverlayManager_Data(param0); v1 = OverlayManager_Args(param0); @@ -455,13 +445,13 @@ int ov112_0225C8FC (OverlayManager * param0, int * param1) return 1; } -static void ov112_0225C964 (void * param0) +static void ov112_0225C964(void *param0) { - UnkStruct_ov112_0225C970 * v0 = param0; + UnkStruct_ov112_0225C970 *v0 = param0; ov112_0225CA20(&v0->unk_08); } -static void ov112_0225C970 (UnkStruct_ov112_0225C970 * param0, const UnkStruct_ov66_0222DFF8 * param1) +static void ov112_0225C970(UnkStruct_ov112_0225C970 *param0, const UnkStruct_ov66_0222DFF8 *param1) { ov112_0225CE60(¶m0->unk_1B8, ¶m0->unk_1B0, ¶m0->unk_08); ov112_0225D004(¶m0->unk_1C4, ¶m0->unk_1B0, ¶m0->unk_08, param0->unk_00, param1); @@ -470,7 +460,7 @@ static void ov112_0225C970 (UnkStruct_ov112_0225C970 * param0, const UnkStruct_o ov112_0225CA14(¶m0->unk_08); } -static void ov112_0225C9BC (UnkStruct_ov112_0225C9BC * param0, u32 param1) +static void ov112_0225C9BC(UnkStruct_ov112_0225C9BC *param0, u32 param1) { param0->unk_1A4 = NARC_ctor(NARC_INDEX_GRAPHIC__LOBBY_NEWS, param1); @@ -481,7 +471,7 @@ static void ov112_0225C9BC (UnkStruct_ov112_0225C9BC * param0, u32 param1) ov112_0225CB98(param0, param1); } -static void ov112_0225C9F4 (UnkStruct_ov112_0225C9BC * param0) +static void ov112_0225C9F4(UnkStruct_ov112_0225C9BC *param0) { NARC_dtor(param0->unk_1A4); sub_0201DC3C(); @@ -490,19 +480,19 @@ static void ov112_0225C9F4 (UnkStruct_ov112_0225C9BC * param0) ov112_0225CC38(param0); } -static void ov112_0225CA14 (UnkStruct_ov112_0225C9BC * param0) +static void ov112_0225CA14(UnkStruct_ov112_0225C9BC *param0) { CellActorCollection_Update(param0->unk_04); } -static void ov112_0225CA20 (UnkStruct_ov112_0225C9BC * param0) +static void ov112_0225CA20(UnkStruct_ov112_0225C9BC *param0) { sub_0201C2B8(param0->unk_00); sub_0200A858(); sub_0201DCAC(); } -static void ov112_0225CA34 (UnkStruct_ov112_0225C9BC * param0, u32 param1) +static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, u32 param1) { sub_02018368(&Unk_ov112_0225D834); @@ -536,7 +526,7 @@ static void ov112_0225CA34 (UnkStruct_ov112_0225C9BC * param0, u32 param1) } } -static void ov112_0225CB60 (UnkStruct_ov112_0225C9BC * param0) +static void ov112_0225CB60(UnkStruct_ov112_0225C9BC *param0) { { int v0; @@ -551,7 +541,7 @@ static void ov112_0225CB60 (UnkStruct_ov112_0225C9BC * param0) GXLayers_SwapDisplay(); } -static void ov112_0225CB98 (UnkStruct_ov112_0225C9BC * param0, u32 param1) +static void ov112_0225CB98(UnkStruct_ov112_0225C9BC *param0, u32 param1) { int v0; @@ -578,7 +568,7 @@ static void ov112_0225CB98 (UnkStruct_ov112_0225C9BC * param0, u32 param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov112_0225CC38 (UnkStruct_ov112_0225C9BC * param0) +static void ov112_0225CC38(UnkStruct_ov112_0225C9BC *param0) { int v0; @@ -593,23 +583,23 @@ static void ov112_0225CC38 (UnkStruct_ov112_0225C9BC * param0) sub_0200A878(); } -static void ov112_0225CC64 (UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0225C9BC * param1, u32 param2) +static void ov112_0225CC64(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2) { param0->unk_00 = sub_020071D0(param1->unk_1A4, 5, 0, ¶m0->unk_04, param2); } -static void ov112_0225CC84 (UnkStruct_ov112_0225CC84 * param0) +static void ov112_0225CC84(UnkStruct_ov112_0225CC84 *param0) { Heap_FreeToHeap(param0->unk_00); } -static void ov112_0225CC90 (UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0225C9BC * param1, u32 param2, u8 param3, u8 param4) +static void ov112_0225CC90(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2, u8 param3, u8 param4) { sub_020198E8(param1->unk_00, 3, 5 + (param3 * 1), 4 + (param4 * 2), 1, 2, param0->unk_04->rawData, 6 + param2, 0, param0->unk_04->screenWidth / 8, param0->unk_04->screenHeight / 8); sub_0201C3C0(param1->unk_00, 3); } -static void ov112_0225CCE8 (UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0225C9BC * param1, u8 param2, u8 param3, u32 param4, u32 param5, BOOL param6, BOOL param7, BOOL param8) +static void ov112_0225CCE8(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u8 param2, u8 param3, u32 param4, u32 param5, BOOL param6, BOOL param7, BOOL param8) { u32 v0, v1; @@ -637,7 +627,7 @@ static void ov112_0225CCE8 (UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0 sub_0201C3C0(param1->unk_00, 3); } -static void ov112_0225CDA8 (UnkStruct_ov112_0225CDF8 * param0, UnkStruct_ov112_0225C9BC * param1, UnkStruct_ov112_0225CC84 * param2, const UnkStruct_ov66_0223177C * param3, const UnkStruct_ov66_02231428 * param4, const UnkStruct_ov66_0222DFF8 * param5, u32 param6) +static void ov112_0225CDA8(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_02231428 *param4, const UnkStruct_ov66_0222DFF8 *param5, u32 param6) { u32 v0; u32 v1; @@ -657,12 +647,12 @@ static void ov112_0225CDA8 (UnkStruct_ov112_0225CDF8 * param0, UnkStruct_ov112_0 ov112_0225CE60(param0, param2, param1); } -static void ov112_0225CDF8 (UnkStruct_ov112_0225CDF8 * param0) +static void ov112_0225CDF8(UnkStruct_ov112_0225CDF8 *param0) { return; } -static BOOL ov112_0225CDFC (UnkStruct_ov112_0225CDF8 * param0, const UnkStruct_ov66_0223177C * param1, const UnkStruct_ov66_02231428 * param2) +static BOOL ov112_0225CDFC(UnkStruct_ov112_0225CDF8 *param0, const UnkStruct_ov66_0223177C *param1, const UnkStruct_ov66_02231428 *param2) { BOOL v0; UnkStruct_ov66_02231428 v1; @@ -695,7 +685,7 @@ static BOOL ov112_0225CDFC (UnkStruct_ov112_0225CDF8 * param0, const UnkStruct_o return v4; } -static void ov112_0225CE60 (UnkStruct_ov112_0225CDF8 * param0, UnkStruct_ov112_0225CC84 * param1, UnkStruct_ov112_0225C9BC * param2) +static void ov112_0225CE60(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2) { if (param0->unk_04 == 1) { ov112_0225CE74(param0, param1, param2); @@ -704,7 +694,7 @@ static void ov112_0225CE60 (UnkStruct_ov112_0225CDF8 * param0, UnkStruct_ov112_0 } } -static void ov112_0225CE74 (UnkStruct_ov112_0225CDF8 * param0, UnkStruct_ov112_0225CC84 * param1, UnkStruct_ov112_0225C9BC * param2) +static void ov112_0225CE74(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2) { param0->unk_06++; @@ -713,7 +703,7 @@ static void ov112_0225CE74 (UnkStruct_ov112_0225CDF8 * param0, UnkStruct_ov112_0 } } -static void ov112_0225CE88 (UnkStruct_ov112_0225CDF8 * param0, UnkStruct_ov112_0225CC84 * param1, UnkStruct_ov112_0225C9BC * param2) +static void ov112_0225CE88(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2) { int v0, v1; u32 v2; @@ -784,19 +774,19 @@ static void ov112_0225CE88 (UnkStruct_ov112_0225CDF8 * param0, UnkStruct_ov112_0 } } -static void ov112_0225CFC0 (UnkStruct_ov112_0225CFD4 * param0, UnkStruct_ov112_0225C9BC * param1, UnkStruct_ov112_0225CC84 * param2, const UnkStruct_ov66_0223177C * param3, const UnkStruct_ov66_0222DFF8 * param4, u32 param5) +static void ov112_0225CFC0(UnkStruct_ov112_0225CFD4 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_0222DFF8 *param4, u32 param5) { { ov112_0225D08C(param2, param1, param3, param4, 0); } } -static void ov112_0225CFD4 (UnkStruct_ov112_0225CFD4 * param0) +static void ov112_0225CFD4(UnkStruct_ov112_0225CFD4 *param0) { return; } -static BOOL ov112_0225CFD8 (UnkStruct_ov112_0225CFD4 * param0, const UnkStruct_ov66_0223177C * param1) +static BOOL ov112_0225CFD8(UnkStruct_ov112_0225CFD4 *param0, const UnkStruct_ov66_0223177C *param1) { u32 v0; BOOL v1 = 0; @@ -819,7 +809,7 @@ static BOOL ov112_0225CFD8 (UnkStruct_ov112_0225CFD4 * param0, const UnkStruct_o return v1; } -static void ov112_0225D004 (UnkStruct_ov112_0225CFD4 * param0, UnkStruct_ov112_0225CC84 * param1, UnkStruct_ov112_0225C9BC * param2, const UnkStruct_ov66_0223177C * param3, const UnkStruct_ov66_0222DFF8 * param4) +static void ov112_0225D004(UnkStruct_ov112_0225CFD4 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_0222DFF8 *param4) { switch (param0->unk_02) { case 0: @@ -852,7 +842,7 @@ static void ov112_0225D004 (UnkStruct_ov112_0225CFD4 * param0, UnkStruct_ov112_0 } } -static void ov112_0225D08C (UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0225C9BC * param1, const UnkStruct_ov66_0223177C * param2, const UnkStruct_ov66_0222DFF8 * param3, u32 param4) +static void ov112_0225D08C(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, const UnkStruct_ov66_0223177C *param2, const UnkStruct_ov66_0222DFF8 *param3, u32 param4) { int v0, v1; u32 v2; @@ -890,7 +880,7 @@ static void ov112_0225D08C (UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0 } } -static void ov112_0225D144 (UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0225C9BC * param1, const UnkStruct_ov66_0223177C * param2, const UnkStruct_ov66_0222DFF8 * param3, u32 param4) +static void ov112_0225D144(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, const UnkStruct_ov66_0223177C *param2, const UnkStruct_ov66_0222DFF8 *param3, u32 param4) { u32 v0; @@ -907,7 +897,7 @@ static void ov112_0225D144 (UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0 } } -static void ov112_0225D164 (UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0225C9BC * param1, const UnkStruct_ov66_0223177C * param2, const UnkStruct_ov66_0222DFF8 * param3, u32 param4) +static void ov112_0225D164(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, const UnkStruct_ov66_0223177C *param2, const UnkStruct_ov66_0222DFF8 *param3, u32 param4) { u32 v0; @@ -924,7 +914,7 @@ static void ov112_0225D164 (UnkStruct_ov112_0225CC84 * param0, UnkStruct_ov112_0 } } -static void ov112_0225D180 (UnkStruct_ov112_0225D180 * param0, const UnkStruct_ov66_0223177C * param1, int param2, const UnkStruct_ov66_0222DFF8 * param3) +static void ov112_0225D180(UnkStruct_ov112_0225D180 *param0, const UnkStruct_ov66_0223177C *param1, int param2, const UnkStruct_ov66_0222DFF8 *param3) { int v0; u32 v1; @@ -945,11 +935,11 @@ static void ov112_0225D180 (UnkStruct_ov112_0225D180 * param0, const UnkStruct_o } } -static void ov112_0225D1B8 (const UnkStruct_ov112_0225D180 * param0, const NNSG2dPaletteData * param1, u32 param2) +static void ov112_0225D1B8(const UnkStruct_ov112_0225D180 *param0, const NNSG2dPaletteData *param1, u32 param2) { BOOL v0; int v1; - const u8 * v2; + const u8 *v2; v2 = param1->pRawData; @@ -959,7 +949,7 @@ static void ov112_0225D1B8 (const UnkStruct_ov112_0225D180 * param0, const NNSG2 } } -static void ov112_0225D1EC (UnkStruct_ov112_0225D2D0 * param0, UnkStruct_ov112_0225C9BC * param1, u32 param2) +static void ov112_0225D1EC(UnkStruct_ov112_0225D2D0 *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2) { int v0; @@ -979,7 +969,7 @@ static void ov112_0225D1EC (UnkStruct_ov112_0225D2D0 * param0, UnkStruct_ov112_0 sub_0201972C(0, &((u8 *)param0->unk_98->pRawData)[(7 * 0x20) + (7 * 2)], 0x4, (9 * 0x20) + (13 * 2)); } -static void ov112_0225D2D0 (UnkStruct_ov112_0225D2D0 * param0) +static void ov112_0225D2D0(UnkStruct_ov112_0225D2D0 *param0) { int v0; @@ -992,7 +982,7 @@ static void ov112_0225D2D0 (UnkStruct_ov112_0225D2D0 * param0) } } -static BOOL ov112_0225D304 (UnkStruct_ov112_0225D2D0 * param0, UnkStruct_ov66_0223177C * param1, const UnkStruct_ov66_0222DFF8 * param2, u32 param3) +static BOOL ov112_0225D304(UnkStruct_ov112_0225D2D0 *param0, UnkStruct_ov66_0223177C *param1, const UnkStruct_ov66_0222DFF8 *param2, u32 param3) { int v0; BOOL v1; @@ -1035,7 +1025,7 @@ static BOOL ov112_0225D304 (UnkStruct_ov112_0225D2D0 * param0, UnkStruct_ov66_02 return 0; } -static void ov112_0225D3E0 (UnkStruct_ov112_0225D2D0 * param0) +static void ov112_0225D3E0(UnkStruct_ov112_0225D2D0 *param0) { int v0; @@ -1046,7 +1036,7 @@ static void ov112_0225D3E0 (UnkStruct_ov112_0225D2D0 * param0) } } -static void ov112_0225D408 (UnkStruct_ov112_0225D44C * param0, UnkStruct_ov112_0225C9BC * param1, u32 param2, u32 param3) +static void ov112_0225D408(UnkStruct_ov112_0225D44C *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2, u32 param3) { param0->unk_00 = 0; param0->unk_02 = 0; @@ -1056,13 +1046,13 @@ static void ov112_0225D408 (UnkStruct_ov112_0225D44C * param0, UnkStruct_ov112_0 BGL_AddWindow(param1->unk_00, ¶m0->unk_0C, 3, 0, 0, 180, 2, 7, 0); } -static void ov112_0225D44C (UnkStruct_ov112_0225D44C * param0) +static void ov112_0225D44C(UnkStruct_ov112_0225D44C *param0) { Strbuf_Free(param0->unk_08); BGL_DeleteWindow(¶m0->unk_0C); } -static void ov112_0225D460 (UnkStruct_ov112_0225D44C * param0, const Strbuf *param1, u32 param2, const UnkStruct_ov112_0225D180 * param3, const NNSG2dPaletteData * param4) +static void ov112_0225D460(UnkStruct_ov112_0225D44C *param0, const Strbuf *param1, u32 param2, const UnkStruct_ov112_0225D180 *param3, const NNSG2dPaletteData *param4) { Strbuf_Copy(param0->unk_08, param1); @@ -1082,12 +1072,12 @@ static void ov112_0225D460 (UnkStruct_ov112_0225D44C * param0, const Strbuf *par ov112_0225D1B8(¶m0->unk_1C, param4, param0->unk_01); } -static void ov112_0225D4DC (UnkStruct_ov112_0225D44C * param0) +static void ov112_0225D4DC(UnkStruct_ov112_0225D44C *param0) { param0->unk_00 = 0; } -static BOOL ov112_0225D4E4 (UnkStruct_ov112_0225D44C * param0) +static BOOL ov112_0225D4E4(UnkStruct_ov112_0225D44C *param0) { BOOL v0 = 1; @@ -1099,7 +1089,7 @@ static BOOL ov112_0225D4E4 (UnkStruct_ov112_0225D44C * param0) return v0; } -static void ov112_0225D4F8 (const UnkStruct_ov112_0225D44C * param0, Window * param1) +static void ov112_0225D4F8(const UnkStruct_ov112_0225D44C *param0, Window *param1) { s32 v0; s32 v1; @@ -1178,7 +1168,7 @@ static void ov112_0225D57C(UnkStruct_ov112_0225D6DC *param0, UnkStruct_ov112_022 MessageLoader_Free(v1); } -static void ov112_0225D6DC (UnkStruct_ov112_0225D6DC * param0) +static void ov112_0225D6DC(UnkStruct_ov112_0225D6DC *param0) { int v0; @@ -1188,7 +1178,7 @@ static void ov112_0225D6DC (UnkStruct_ov112_0225D6DC * param0) } } -static void ov112_0225D700 (UnkStruct_ov112_0225D6DC * param0) +static void ov112_0225D700(UnkStruct_ov112_0225D6DC *param0) { int v0; @@ -1197,7 +1187,7 @@ static void ov112_0225D700 (UnkStruct_ov112_0225D6DC * param0) } } -static void ov112_0225D718 (UnkStruct_ov112_0225D6DC * param0, u32 param1) +static void ov112_0225D718(UnkStruct_ov112_0225D6DC *param0, u32 param1) { GF_ASSERT(param1 < 4); GF_ASSERT(param1 != 0); @@ -1205,25 +1195,25 @@ static void ov112_0225D718 (UnkStruct_ov112_0225D6DC * param0, u32 param1) ov112_0225D778(¶m0->unk_40[param1]); } -static void ov112_0225D73C (UnkStruct_ov112_0225D73C * param0, u16 param1, u32 param2) +static void ov112_0225D73C(UnkStruct_ov112_0225D73C *param0, u16 param1, u32 param2) { memset(param0, 0, sizeof(UnkStruct_ov112_0225D73C)); param0->unk_06 = param1; param0->unk_08 = param2; } -static void ov112_0225D75C (UnkStruct_ov112_0225D73C * param0) +static void ov112_0225D75C(UnkStruct_ov112_0225D73C *param0) { memset(param0, 0, sizeof(UnkStruct_ov112_0225D73C)); } -static void ov112_0225D778 (UnkStruct_ov112_0225D73C * param0) +static void ov112_0225D778(UnkStruct_ov112_0225D73C *param0) { param0->unk_00 = 1; param0->unk_02 = 0; } -static void ov112_0225D784 (UnkStruct_ov112_0225D73C * param0) +static void ov112_0225D784(UnkStruct_ov112_0225D73C *param0) { u32 v0; u16 v1; diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index 6afa45db74..88a48bad7a 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -64,53 +64,53 @@ #include "unk_020366A0.h" #include "unk_020393C8.h" -static void ov117_02260DA0(void * param0); -static GenericPointerData * ov117_02260E14(int param0); +static void ov117_02260DA0(void *param0); +static GenericPointerData *ov117_02260E14(int param0); static void ov117_02260E34(void); -static void ov117_02260EB8(GenericPointerData * param0); -static void ov117_02260F7C(SysTask * param0, void * param1); -static void ov117_022610D8(BGL * param0); -static void ov117_02261280(UnkStruct_ov117_02261280 * param0); -static void ov117_02261574(UnkStruct_ov117_02261280 * param0); -static void ov117_022615E0(UnkStruct_ov117_02261280 * param0); -static void ov117_0226168C(UnkStruct_ov117_02261280 * param0, NARC * param1); -static void ov117_022618E8(UnkStruct_ov117_02261280 * param0); -static void ov117_02261940(UnkStruct_ov117_02261280 * param0, NARC * param1); -static void ov117_022619F8(UnkStruct_ov117_02261280 * param0); -static void ov117_02261A2C(UnkStruct_ov117_02261280 * param0, NARC * param1); -static void ov117_02261AC4(UnkStruct_ov117_02261280 * param0); -static void ov117_02261AC8(UnkStruct_ov117_02261280 * param0, NARC * param1); -static void ov117_02261C28(UnkStruct_ov117_02261280 * param0); -static void ov117_02261C2C(UnkStruct_ov117_02261280 * param0, NARC * param1); -static void ov117_02261DD0(UnkStruct_ov117_02261280 * param0); -static void ov117_02260EC0(UnkStruct_ov117_02261280 * param0); -static void ov117_02260F64(UnkStruct_ov117_02261280 * param0); -BOOL ov117_02261FF4(UnkStruct_ov117_02261280 * param0); -void ov117_02262044(UnkStruct_ov117_02261280 * param0, int param1, const UnkStruct_ov117_022621D4 * param2); -UnkStruct_ov117_022621D4 * ov117_022620A0(UnkStruct_ov117_02261280 * param0, int param1); -static BOOL ov117_022620E0(UnkStruct_ov117_02261280 * param0, int param1, const UnkStruct_ov117_022621D4 * param2); -void ov117_02262130(UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1); -static BOOL ov117_0226217C(UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1); -UnkStruct_ov117_022621D4 * ov117_022621D4(UnkStruct_ov117_02261280 * param0); -static int ov117_02262200(UnkStruct_ov117_02261280 * param0); -static void ov117_02262270(UnkStruct_ov117_02261280 * param0); -int ov117_022622B8(UnkStruct_ov117_02261280 * param0); -int ov117_0226200C(UnkStruct_ov117_02261280 * param0); -static BOOL ov117_022623B0(UnkStruct_ov117_02261280 * param0); -static int ov117_02262448(UnkStruct_ov117_02261280 * param0, int param1); -static int ov117_02262484(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02262664 * param1); -static int ov117_0226251C(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02262664 * param1); -static int ov117_022625F8(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02262664 * param1); -static BOOL ov117_02262664(UnkStruct_ov117_02261280 * param0); -static void ov117_02261368(UnkStruct_ov117_02261280 * param0); -static void ov117_022613B8(UnkStruct_ov117_02261280 * param0); -static void ov117_022613EC(UnkStruct_ov117_02261280 * param0); -static void ov117_022614AC(UnkStruct_ov117_02261280 * param0, int param1); -BOOL ov117_02261E38(UnkStruct_ov117_02261280 * param0, int param1); -void ov117_02261F08(UnkStruct_ov117_02261280 * param0, int param1, int param2); -void ov117_02261F3C(UnkStruct_ov117_02261280 * param0); -void ov117_02261FA4(UnkStruct_ov117_02261280 * param0); -static void ov117_022626AC(Camera * camera); +static void ov117_02260EB8(GenericPointerData *param0); +static void ov117_02260F7C(SysTask *param0, void *param1); +static void ov117_022610D8(BGL *param0); +static void ov117_02261280(UnkStruct_ov117_02261280 *param0); +static void ov117_02261574(UnkStruct_ov117_02261280 *param0); +static void ov117_022615E0(UnkStruct_ov117_02261280 *param0); +static void ov117_0226168C(UnkStruct_ov117_02261280 *param0, NARC *param1); +static void ov117_022618E8(UnkStruct_ov117_02261280 *param0); +static void ov117_02261940(UnkStruct_ov117_02261280 *param0, NARC *param1); +static void ov117_022619F8(UnkStruct_ov117_02261280 *param0); +static void ov117_02261A2C(UnkStruct_ov117_02261280 *param0, NARC *param1); +static void ov117_02261AC4(UnkStruct_ov117_02261280 *param0); +static void ov117_02261AC8(UnkStruct_ov117_02261280 *param0, NARC *param1); +static void ov117_02261C28(UnkStruct_ov117_02261280 *param0); +static void ov117_02261C2C(UnkStruct_ov117_02261280 *param0, NARC *param1); +static void ov117_02261DD0(UnkStruct_ov117_02261280 *param0); +static void ov117_02260EC0(UnkStruct_ov117_02261280 *param0); +static void ov117_02260F64(UnkStruct_ov117_02261280 *param0); +BOOL ov117_02261FF4(UnkStruct_ov117_02261280 *param0); +void ov117_02262044(UnkStruct_ov117_02261280 *param0, int param1, const UnkStruct_ov117_022621D4 *param2); +UnkStruct_ov117_022621D4 *ov117_022620A0(UnkStruct_ov117_02261280 *param0, int param1); +static BOOL ov117_022620E0(UnkStruct_ov117_02261280 *param0, int param1, const UnkStruct_ov117_022621D4 *param2); +void ov117_02262130(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1); +static BOOL ov117_0226217C(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1); +UnkStruct_ov117_022621D4 *ov117_022621D4(UnkStruct_ov117_02261280 *param0); +static int ov117_02262200(UnkStruct_ov117_02261280 *param0); +static void ov117_02262270(UnkStruct_ov117_02261280 *param0); +int ov117_022622B8(UnkStruct_ov117_02261280 *param0); +int ov117_0226200C(UnkStruct_ov117_02261280 *param0); +static BOOL ov117_022623B0(UnkStruct_ov117_02261280 *param0); +static int ov117_02262448(UnkStruct_ov117_02261280 *param0, int param1); +static int ov117_02262484(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02262664 *param1); +static int ov117_0226251C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02262664 *param1); +static int ov117_022625F8(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02262664 *param1); +static BOOL ov117_02262664(UnkStruct_ov117_02261280 *param0); +static void ov117_02261368(UnkStruct_ov117_02261280 *param0); +static void ov117_022613B8(UnkStruct_ov117_02261280 *param0); +static void ov117_022613EC(UnkStruct_ov117_02261280 *param0); +static void ov117_022614AC(UnkStruct_ov117_02261280 *param0, int param1); +BOOL ov117_02261E38(UnkStruct_ov117_02261280 *param0, int param1); +void ov117_02261F08(UnkStruct_ov117_02261280 *param0, int param1, int param2); +void ov117_02261F3C(UnkStruct_ov117_02261280 *param0); +void ov117_02261FA4(UnkStruct_ov117_02261280 *param0); +static void ov117_022626AC(Camera *camera); static u32 ov117_02261644(u32 param0, BOOL param1); static u32 ov117_02261668(u32 param0, BOOL param1); @@ -120,24 +120,26 @@ static const CameraAngle Unk_ov117_02266918 = { 0x0 }; -static int(*const Unk_ov117_02266920[])(UnkStruct_ov117_02261280 *, UnkStruct_ov117_02262664 *) = { - ov117_02262484, ov117_0226251C, ov117_022625F8, +static int (*const Unk_ov117_02266920[])(UnkStruct_ov117_02261280 *, UnkStruct_ov117_02262664 *) = { + ov117_02262484, + ov117_0226251C, + ov117_022625F8, }; __attribute__((aligned(4))) static const u8 Unk_ov117_02266954[][4] = { - {0x0}, - {0x0}, - {0x0, 0x1}, - {0x0, 0x2, 0x1}, - {0x0, 0x3, 0x1, 0x2} + { 0x0 }, + { 0x0 }, + { 0x0, 0x1 }, + { 0x0, 0x2, 0x1 }, + { 0x0, 0x3, 0x1, 0x2 } }; __attribute__((aligned(4))) static const u8 Unk_ov117_02266968[][4] = { - {0x0}, - {0x0}, - {0x0, 0x1}, - {0x0, 0x3, 0x2}, - {0x0, 0x3, 0x1, 0x2} + { 0x0 }, + { 0x0 }, + { 0x0, 0x1 }, + { 0x0, 0x3, 0x2 }, + { 0x0, 0x3, 0x1, 0x2 } }; static const UnkStruct_ov104_0224133C Unk_ov117_022669A8 = { @@ -175,15 +177,15 @@ static const struct { u32 unk_0C; u32 unk_10; } Unk_ov117_022669F0[] = { - {0x20, 0x27, 0x28, 0x29, 0x2A}, - {0x21, 0x2F, 0x30, 0x31, 0x32}, - {0x22, 0x33, 0x34, 0x35, 0x36}, - {0x1F, 0x2B, 0x2C, 0x2D, 0x2E} + { 0x20, 0x27, 0x28, 0x29, 0x2A }, + { 0x21, 0x2F, 0x30, 0x31, 0x32 }, + { 0x22, 0x33, 0x34, 0x35, 0x36 }, + { 0x1F, 0x2B, 0x2C, 0x2D, 0x2E } }; -int ov117_02260668 (OverlayManager * param0, int * param1) +int ov117_02260668(OverlayManager *param0, int *param1) { - UnkStruct_ov117_02261280 * v0; + UnkStruct_ov117_02261280 *v0; SetMainCallback(NULL, NULL); GXLayers_DisableEngineALayers(); @@ -240,7 +242,7 @@ int ov117_02260668 (OverlayManager * param0, int * param1) ov117_02265210(v0, &v0->unk_1468); { - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_APPLICATION__BALLOON__GRAPHIC__BALLOON_GRA, 110); ov117_02261A2C(v0, v1); @@ -294,9 +296,9 @@ int ov117_02260668 (OverlayManager * param0, int * param1) return 1; } -int ov117_0226098C (OverlayManager * param0, int * param1) +int ov117_0226098C(OverlayManager *param0, int *param1) { - UnkStruct_ov117_02261280 * v0 = OverlayManager_Data(param0); + UnkStruct_ov117_02261280 *v0 = OverlayManager_Data(param0); int v1; if (v0->unk_00->unk_3D == 1) { @@ -427,9 +429,9 @@ int ov117_0226098C (OverlayManager * param0, int * param1) return 0; } -int ov117_02260C10 (OverlayManager * param0, int * param1) +int ov117_02260C10(OverlayManager *param0, int *param1) { - UnkStruct_ov117_02261280 * v0 = OverlayManager_Data(param0); + UnkStruct_ov117_02261280 *v0 = OverlayManager_Data(param0); int v1; v0->unk_00->unk_10.unk_14 = v0->unk_2FD0; @@ -491,9 +493,9 @@ int ov117_02260C10 (OverlayManager * param0, int * param1) return 1; } -static void ov117_02260DA0 (void * param0) +static void ov117_02260DA0(void *param0) { - UnkStruct_ov117_02261280 * v0 = param0; + UnkStruct_ov117_02261280 *v0 = param0; ov117_02262950(v0, v0->unk_D4); @@ -513,15 +515,15 @@ static void ov117_02260DA0 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static GenericPointerData * ov117_02260E14 (int param0) +static GenericPointerData *ov117_02260E14(int param0) { - GenericPointerData * v0; + GenericPointerData *v0; v0 = sub_02024220(param0, 0, 1, 0, 2, ov117_02260E34); return v0; } -static void ov117_02260E34 (void) +static void ov117_02260E34(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -536,37 +538,37 @@ static void ov117_02260E34 (void) G3_ViewPort(0, 0, 255, 191); } -static void ov117_02260EB8 (GenericPointerData * param0) +static void ov117_02260EB8(GenericPointerData *param0) { sub_020242C4(param0); } -static void ov117_02260EC0 (UnkStruct_ov117_02261280 * param0) +static void ov117_02260EC0(UnkStruct_ov117_02261280 *param0) { - VecFx32 v0 = {0, 0x1881e, 0}; - VecFx32 v1 = {0, 0x1881e, (FX32_ONE * 5)}; + VecFx32 v0 = { 0, 0x1881e, 0 }; + VecFx32 v1 = { 0, 0x1881e, (FX32_ONE * 5) }; param0->camera1 = Camera_Alloc(110); - Camera_InitWithTarget(&v0, (0x7b << FX32_SHIFT), &Unk_ov117_02266918, (((22 * 0xffff) / 360)), 1, 0, param0->camera1); + Camera_InitWithTarget(&v0, (0x7b << FX32_SHIFT), &Unk_ov117_02266918, ((22 * 0xffff) / 360), 1, 0, param0->camera1); Camera_SetClipping((FX32_ONE), (FX32_ONE * 900), param0->camera1); Camera_SetAsActive(param0->camera1); param0->camera2 = Camera_Alloc(110); - Camera_InitWithTarget(&v0, (80 << FX32_SHIFT), &Unk_ov117_02266918, (((22 * 0xffff) / 360)), 1, 0, param0->camera2); + Camera_InitWithTarget(&v0, (80 << FX32_SHIFT), &Unk_ov117_02266918, ((22 * 0xffff) / 360), 1, 0, param0->camera2); Camera_SetClipping((FX32_ONE), (FX32_ONE * 900), param0->camera2); } -static void ov117_02260F64 (UnkStruct_ov117_02261280 * param0) +static void ov117_02260F64(UnkStruct_ov117_02261280 *param0) { Camera_Delete(param0->camera1); Camera_Delete(param0->camera2); } -static void ov117_02260F7C (SysTask * param0, void * param1) +static void ov117_02260F7C(SysTask *param0, void *param1) { - UnkStruct_ov117_02261280 * v0 = param1; + UnkStruct_ov117_02261280 *v0 = param1; VecFx32 v1, v2; MtxFx33 v3; @@ -635,7 +637,7 @@ static void ov117_02260F7C (SysTask * param0, void * param1) sub_02038A1C(110, v0->unk_2C); } -static void ov117_022610D8 (BGL * param0) +static void ov117_022610D8(BGL *param0) { GXLayers_DisableEngineALayers(); @@ -674,8 +676,7 @@ static void ov117_022610D8 (BGL * param0) { UnkStruct_ov97_0222DB78 v2[] = { - { - 0, + { 0, 0, 0x1000, 0, @@ -687,11 +688,9 @@ static void ov117_022610D8 (BGL * param0) 0, 0, 0, - 0 - }, + 0 }, - { - 0, + { 0, 0, 0x2000, 0, @@ -703,11 +702,9 @@ static void ov117_022610D8 (BGL * param0) 1, 0, 0, - 0 - }, + 0 }, - { - 0, + { 0, 0, 0x1000, 0, @@ -719,8 +716,7 @@ static void ov117_022610D8 (BGL * param0) 2, 0, 0, - 0 - }, + 0 }, }; sub_020183C4(param0, 1, &v2[0], 0); @@ -743,8 +739,7 @@ static void ov117_022610D8 (BGL * param0) { int v3; static const UnkStruct_ov97_0222DB78 v4[] = { - { - 0, + { 0, 0, 0x800, 0, @@ -756,11 +751,9 @@ static void ov117_022610D8 (BGL * param0) 1, 0, 0, - 0 - }, + 0 }, - { - 0, + { 0, 0, 0x800, 0, @@ -772,11 +765,9 @@ static void ov117_022610D8 (BGL * param0) 3, 0, 0, - 0 - }, + 0 }, - { - 0, + { 0, 0, 0x1000, 0, @@ -788,11 +779,9 @@ static void ov117_022610D8 (BGL * param0) 3, 0, 0, - 0 - }, + 0 }, - { - 0, + { 0, 0, 0x400, 0, @@ -804,8 +793,7 @@ static void ov117_022610D8 (BGL * param0) 0, 0, 0, - 0 - }, + 0 }, }; for (v3 = 0; v3 < NELEMS(v4); v3++) { @@ -825,11 +813,11 @@ static void ov117_022610D8 (BGL * param0) } } -static void ov117_02261280 (UnkStruct_ov117_02261280 * param0) +static void ov117_02261280(UnkStruct_ov117_02261280 *param0) { int v0; - BGL_AddWindow(param0->unk_2C, ¶m0->unk_30[0], 1, 11, 0x13, 20, 4, 0xe, (((0x8000 - 0x2000) / 32))); + BGL_AddWindow(param0->unk_2C, ¶m0->unk_30[0], 1, 11, 0x13, 20, 4, 0xe, ((0x8000 - 0x2000) / 32)); BGL_AddWindow(param0->unk_2C, ¶m0->unk_30[1], 4, 0x12, 1, 10, 2, 5, (((0x8000 - 0x2000) / 32) + (10 * 2))); BGL_AddWindow(param0->unk_2C, ¶m0->unk_30[2], 4, 0x15, 0xe, 10, 2, 5, ((((0x8000 - 0x2000) / 32) + (10 * 2)) + (10 * 2))); BGL_AddWindow(param0->unk_2C, ¶m0->unk_30[3], 4, 1, 14, 10, 2, 5, (((((0x8000 - 0x2000) / 32) + (10 * 2)) + (10 * 2)) + (10 * 2))); @@ -840,9 +828,9 @@ static void ov117_02261280 (UnkStruct_ov117_02261280 * param0) BGL_FillWindow(¶m0->unk_30[4], 0xf); } -static void ov117_02261368 (UnkStruct_ov117_02261280 * param0) +static void ov117_02261368(UnkStruct_ov117_02261280 *param0) { - Strbuf* v0; + Strbuf *v0; Window_Show(¶m0->unk_30[4], 1, ((((((0x8000 - 0x2000) / 32) + (10 * 2)) + (10 * 2)) + (10 * 2)) + (10 * 2)), 6); @@ -853,17 +841,17 @@ static void ov117_02261368 (UnkStruct_ov117_02261280 * param0) sub_0201A9A4(¶m0->unk_30[4]); } -static void ov117_022613B8 (UnkStruct_ov117_02261280 * param0) +static void ov117_022613B8(UnkStruct_ov117_02261280 *param0) { sub_02019CB8(param0->unk_2C, 4, 1023, 2 - 1, 0x13 - 1, 0x1c + 2, 4 + 2, 17); sub_0201C3C0(param0->unk_2C, 4); } -static void ov117_022613EC (UnkStruct_ov117_02261280 * param0) +static void ov117_022613EC(UnkStruct_ov117_02261280 *param0) { int v0, v1; - TrainerInfo * v2; - Strbuf* v3; + TrainerInfo *v2; + Strbuf *v3; int v4; u32 v5; int v6, v7; @@ -895,7 +883,7 @@ static void ov117_022613EC (UnkStruct_ov117_02261280 * param0) } } -static void ov117_022614AC (UnkStruct_ov117_02261280 * param0, int param1) +static void ov117_022614AC(UnkStruct_ov117_02261280 *param0, int param1) { if (param1 == 1) { sub_02019CB8(param0->unk_2C, 4, 1023, 0, 13, 12, 4, 17); @@ -916,11 +904,11 @@ static void ov117_022614AC (UnkStruct_ov117_02261280 * param0, int param1) sub_0201C3C0(param0->unk_2C, 4); } -static void ov117_02261574 (UnkStruct_ov117_02261280 * param0) +static void ov117_02261574(UnkStruct_ov117_02261280 *param0) { - void * v0; - Camera * camera; - void * v2; + void *v0; + Camera *camera; + void *v2; sub_02014000(); @@ -933,9 +921,9 @@ static void ov117_02261574 (UnkStruct_ov117_02261280 * param0) sub_020144CC(param0->unk_A4, v2, (1 << 1) | (1 << 3), 1); } -static void ov117_022615E0 (UnkStruct_ov117_02261280 * param0) +static void ov117_022615E0(UnkStruct_ov117_02261280 *param0) { - void * v0; + void *v0; v0 = sub_02014730(param0->unk_A4); @@ -943,7 +931,7 @@ static void ov117_022615E0 (UnkStruct_ov117_02261280 * param0) Heap_FreeToHeap(v0); } -void ov117_02261600 (UnkStruct_ov117_02261280 * param0, int param1) +void ov117_02261600(UnkStruct_ov117_02261280 *param0, int param1) { switch (param1) { case 0: @@ -961,7 +949,7 @@ void ov117_02261600 (UnkStruct_ov117_02261280 * param0, int param1) } } -static u32 ov117_02261644 (u32 param0, BOOL param1) +static u32 ov117_02261644(u32 param0, BOOL param1) { NNSGfdTexKey v0; @@ -972,7 +960,7 @@ static u32 ov117_02261644 (u32 param0, BOOL param1) return NNS_GfdGetTexKeyAddr(v0); } -static u32 ov117_02261668 (u32 param0, BOOL param1) +static u32 ov117_02261668(u32 param0, BOOL param1) { NNSGfdPlttKey v0; @@ -1023,7 +1011,7 @@ static void ov117_0226168C(UnkStruct_ov117_02261280 *param0, NARC *param1) param0->unk_174C.unk_00 = ov117_02266244(param0); } -static void ov117_022618E8 (UnkStruct_ov117_02261280 * param0) +static void ov117_022618E8(UnkStruct_ov117_02261280 *param0) { int v0; @@ -1038,7 +1026,7 @@ static void ov117_022618E8 (UnkStruct_ov117_02261280 * param0) ov117_02266268(param0, param0->unk_174C.unk_00); } -static void ov117_02261940 (UnkStruct_ov117_02261280 * param0, NARC * param1) +static void ov117_02261940(UnkStruct_ov117_02261280 *param0, NARC *param1) { SpriteRenderer_LoadPalette(param0->unk_8C, 3, param0->unk_24, param0->unk_28, param1, 23, 0, 9, NNS_G2D_VRAM_TYPE_2DSUB, 10006); SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_24, param0->unk_28, param1, 20, 0, NNS_G2D_VRAM_TYPE_2DSUB, 10004); @@ -1053,7 +1041,7 @@ static void ov117_02261940 (UnkStruct_ov117_02261280 * param0, NARC * param1) ov117_02264D1C(param0); } -static void ov117_022619F8 (UnkStruct_ov117_02261280 * param0) +static void ov117_022619F8(UnkStruct_ov117_02261280 *param0) { ov117_02264914(param0); ov117_0226504C(param0, ¶m0->unk_1458); @@ -1061,7 +1049,7 @@ static void ov117_022619F8 (UnkStruct_ov117_02261280 * param0) ov117_02265B3C(param0, ¶m0->unk_1560); } -static void ov117_02261A2C (UnkStruct_ov117_02261280 * param0, NARC * param1) +static void ov117_02261A2C(UnkStruct_ov117_02261280 *param0, NARC *param1) { PaletteSys_LoadPalette(param0->unk_8C, 173, 4, 110, 0, 0, 0); sub_020070E8(param1, 2, param0->unk_2C, 3, 0, 0, 0, 110); @@ -1071,12 +1059,12 @@ static void ov117_02261A2C (UnkStruct_ov117_02261280 * param0, NARC * param1) sub_020038B0(param0->unk_8C, 0, 2, 0x0, 0, 1); } -static void ov117_02261AC4 (UnkStruct_ov117_02261280 * param0) +static void ov117_02261AC4(UnkStruct_ov117_02261280 *param0) { return; } -static void ov117_02261AC8 (UnkStruct_ov117_02261280 * param0, NARC * param1) +static void ov117_02261AC8(UnkStruct_ov117_02261280 *param0, NARC *param1) { PaletteSys_LoadPalette(param0->unk_8C, 173, 5, 110, 1, 5 * 0x20, 0); sub_02002FEC(param0->unk_8C, 173, 6, 110, 1, (0x20 * 10), 6 * 16, 6 * 16); @@ -1107,18 +1095,18 @@ static void ov117_02261AC8 (UnkStruct_ov117_02261280 * param0, NARC * param1) sub_020038B0(param0->unk_8C, 1, 2, 0x0, 0, 1); } -static void ov117_02261C28 (UnkStruct_ov117_02261280 * param0) +static void ov117_02261C28(UnkStruct_ov117_02261280 *param0) { return; } -static void ov117_02261C2C (UnkStruct_ov117_02261280 * param0, NARC * param1) +static void ov117_02261C2C(UnkStruct_ov117_02261280 *param0, NARC *param1) { int v0, v1; - UnkStruct_ov117_02261F08 * v2 = ¶m0->unk_D8; - UnkStruct_ov117_02261C2C * v3 = ¶m0->unk_13A0; + UnkStruct_ov117_02261F08 *v2 = ¶m0->unk_D8; + UnkStruct_ov117_02261C2C *v3 = ¶m0->unk_13A0; int v4; - void * v5 = NULL; + void *v5 = NULL; v4 = ov117_0226235C(param0, CommSys_CurNetId()); @@ -1152,10 +1140,10 @@ static void ov117_02261C2C (UnkStruct_ov117_02261280 * param0, NARC * param1) Easy3DObject_SetVisibility(&v3->unk_10, 1); } -static void ov117_02261DD0 (UnkStruct_ov117_02261280 * param0) +static void ov117_02261DD0(UnkStruct_ov117_02261280 *param0) { int v0, v1; - UnkStruct_ov117_02261F08 * v2 = ¶m0->unk_D8; + UnkStruct_ov117_02261F08 *v2 = ¶m0->unk_D8; Easy3DModel_Release(&v2->unk_00); @@ -1172,10 +1160,10 @@ static void ov117_02261DD0 (UnkStruct_ov117_02261280 * param0) Easy3DModel_Release(¶m0->unk_13A0.unk_00); } -BOOL ov117_02261E38 (UnkStruct_ov117_02261280 * param0, int param1) +BOOL ov117_02261E38(UnkStruct_ov117_02261280 *param0, int param1) { - UnkStruct_ov117_02261F08 * v0 = ¶m0->unk_D8; - Easy3DModel * v1; + UnkStruct_ov117_02261F08 *v0 = ¶m0->unk_D8; + Easy3DModel *v1; int v2, v3; if (param1 > 1200) { @@ -1209,17 +1197,17 @@ BOOL ov117_02261E38 (UnkStruct_ov117_02261280 * param0, int param1) return 0; } -void ov117_02261F08 (UnkStruct_ov117_02261280 * param0, int param1, int param2) +void ov117_02261F08(UnkStruct_ov117_02261280 *param0, int param1, int param2) { - UnkStruct_ov117_02261F08 * v0 = ¶m0->unk_D8; + UnkStruct_ov117_02261F08 *v0 = ¶m0->unk_D8; Easy3DObject_RemoveAnim(&v0->unk_C8[param1][param2].unk_04, &v0->unk_C8[param1][param2].unk_7C); v0->unk_C8[param1][param2].unk_00 = 0; } -void ov117_02261F3C (UnkStruct_ov117_02261280 * param0) +void ov117_02261F3C(UnkStruct_ov117_02261280 *param0) { - UnkStruct_ov117_02261F08 * v0 = ¶m0->unk_D8; + UnkStruct_ov117_02261F08 *v0 = ¶m0->unk_D8; int v1, v2; for (v1 = 0; v1 < 8; v1++) { @@ -1233,9 +1221,9 @@ void ov117_02261F3C (UnkStruct_ov117_02261280 * param0) } } -void ov117_02261FA4 (UnkStruct_ov117_02261280 * param0) +void ov117_02261FA4(UnkStruct_ov117_02261280 *param0) { - UnkStruct_ov117_02261F08 * v0 = ¶m0->unk_D8; + UnkStruct_ov117_02261F08 *v0 = ¶m0->unk_D8; int v1, v2; for (v1 = 0; v1 < 8; v1++) { @@ -1247,7 +1235,7 @@ void ov117_02261FA4 (UnkStruct_ov117_02261280 * param0) } } -BOOL ov117_02261FF4 (UnkStruct_ov117_02261280 * param0) +BOOL ov117_02261FF4(UnkStruct_ov117_02261280 *param0) { if (param0->unk_04 == CommSys_CurNetId()) { return 1; @@ -1256,7 +1244,7 @@ BOOL ov117_02261FF4 (UnkStruct_ov117_02261280 * param0) return 0; } -int ov117_0226200C (UnkStruct_ov117_02261280 * param0) +int ov117_0226200C(UnkStruct_ov117_02261280 *param0) { int v0, v1; u32 v2; @@ -1275,9 +1263,9 @@ int ov117_0226200C (UnkStruct_ov117_02261280 * param0) return param0->unk_04; } -void ov117_02262044 (UnkStruct_ov117_02261280 * param0, int param1, const UnkStruct_ov117_022621D4 * param2) +void ov117_02262044(UnkStruct_ov117_02261280 *param0, int param1, const UnkStruct_ov117_022621D4 *param2) { - UnkStruct_ov117_022621D4 * v0; + UnkStruct_ov117_022621D4 *v0; int v1; if (ov117_022620E0(param0, param1, param2) == 1) { @@ -1294,9 +1282,9 @@ void ov117_02262044 (UnkStruct_ov117_02261280 * param0, int param1, const UnkStr *v0 = *param2; } -UnkStruct_ov117_022621D4 * ov117_022620A0 (UnkStruct_ov117_02261280 * param0, int param1) +UnkStruct_ov117_022621D4 *ov117_022620A0(UnkStruct_ov117_02261280 *param0, int param1) { - UnkStruct_ov117_022621D4 * v0; + UnkStruct_ov117_022621D4 *v0; int v1; v1 = param0->unk_2F14[param1] % 60; @@ -1310,7 +1298,7 @@ UnkStruct_ov117_022621D4 * ov117_022620A0 (UnkStruct_ov117_02261280 * param0, in return NULL; } -static BOOL ov117_022620E0 (UnkStruct_ov117_02261280 * param0, int param1, const UnkStruct_ov117_022621D4 * param2) +static BOOL ov117_022620E0(UnkStruct_ov117_02261280 *param0, int param1, const UnkStruct_ov117_022621D4 *param2) { switch (param2->unk_00) { case 2: @@ -1327,9 +1315,9 @@ static BOOL ov117_022620E0 (UnkStruct_ov117_02261280 * param0, int param1, const return 0; } -void ov117_02262130 (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1) +void ov117_02262130(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1) { - UnkStruct_ov117_022621D4 * v0; + UnkStruct_ov117_022621D4 *v0; int v1; if (ov117_0226217C(param0, param1) == 1) { @@ -1346,7 +1334,7 @@ void ov117_02262130 (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_02 *v0 = *param1; } -static BOOL ov117_0226217C (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1) +static BOOL ov117_0226217C(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1) { switch (param1->unk_00) { case 2: @@ -1370,9 +1358,9 @@ static BOOL ov117_0226217C (UnkStruct_ov117_02261280 * param0, const UnkStruct_o return 0; } -UnkStruct_ov117_022621D4 * ov117_022621D4 (UnkStruct_ov117_02261280 * param0) +UnkStruct_ov117_022621D4 *ov117_022621D4(UnkStruct_ov117_02261280 *param0) { - UnkStruct_ov117_022621D4 * v0; + UnkStruct_ov117_022621D4 *v0; int v1; v1 = param0->unk_2F28 % 60; @@ -1384,9 +1372,9 @@ UnkStruct_ov117_022621D4 * ov117_022621D4 (UnkStruct_ov117_02261280 * param0) return NULL; } -static int ov117_02262200 (UnkStruct_ov117_02261280 * param0) +static int ov117_02262200(UnkStruct_ov117_02261280 *param0) { - UnkStruct_ov117_022621D4 * v0; + UnkStruct_ov117_022621D4 *v0; if (param0->unk_2FC4 > 0) { param0->unk_2FC4--; @@ -1417,10 +1405,10 @@ static int ov117_02262200 (UnkStruct_ov117_02261280 * param0) return 0; } -static void ov117_02262270 (UnkStruct_ov117_02261280 * param0) +static void ov117_02262270(UnkStruct_ov117_02261280 *param0) { int v0, v1; - UnkStruct_ov117_022621D4 * v2; + UnkStruct_ov117_022621D4 *v2; int v3, v4; v4 = param0->unk_2EF0.unk_00; @@ -1449,18 +1437,18 @@ static void ov117_02262270 (UnkStruct_ov117_02261280 * param0) } } -int ov117_022622B8 (UnkStruct_ov117_02261280 * param0) +int ov117_022622B8(UnkStruct_ov117_02261280 *param0) { return param0->unk_2FC8; } -int ov117_022622C4 (UnkStruct_ov117_02261280 * param0, int param1) +int ov117_022622C4(UnkStruct_ov117_02261280 *param0, int param1) { int v0, v1, v2; int v3, v4; int v5, v6; int v7; - const u8 * v8; + const u8 *v8; v6 = CommSys_CurNetId(); v3 = 0xff; @@ -1497,7 +1485,7 @@ int ov117_022622C4 (UnkStruct_ov117_02261280 * param0, int param1) return v2; } -int ov117_0226235C (UnkStruct_ov117_02261280 * param0, int param1) +int ov117_0226235C(UnkStruct_ov117_02261280 *param0, int param1) { int v0; @@ -1511,7 +1499,7 @@ int ov117_0226235C (UnkStruct_ov117_02261280 * param0, int param1) return 0; } -void ov117_0226238C (UnkStruct_ov117_02261280 * param0, int param1, u8 param2) +void ov117_0226238C(UnkStruct_ov117_02261280 *param0, int param1, u8 param2) { GF_ASSERT(param0->unk_2FD4 == 0); @@ -1519,7 +1507,7 @@ void ov117_0226238C (UnkStruct_ov117_02261280 * param0, int param1, u8 param2) param0->unk_2FD8 = param2; } -static BOOL ov117_022623B0 (UnkStruct_ov117_02261280 * param0) +static BOOL ov117_022623B0(UnkStruct_ov117_02261280 *param0) { int v0 = 0; @@ -1567,7 +1555,7 @@ static BOOL ov117_022623B0 (UnkStruct_ov117_02261280 * param0) return 0; } -static int ov117_02262448 (UnkStruct_ov117_02261280 * param0, int param1) +static int ov117_02262448(UnkStruct_ov117_02261280 *param0, int param1) { if (param0->unk_2FD4 != 7) { return 0; @@ -1585,7 +1573,7 @@ static int ov117_02262448 (UnkStruct_ov117_02261280 * param0, int param1) return 0; } -static int ov117_02262484 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02262664 * param1) +static int ov117_02262484(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02262664 *param1) { switch (param1->unk_0C) { case 0: @@ -1622,7 +1610,7 @@ static int ov117_02262484 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02 return 0; } -static int ov117_0226251C (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02262664 * param1) +static int ov117_0226251C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02262664 *param1) { if (param0->unk_2FB4 > (43 * 30 + 12)) { if ((param0->unk_2FD4 == 0) && (param0->unk_2EDC.unk_00 == 0) && (param0->unk_2EF0.unk_00 == 0)) { @@ -1661,7 +1649,7 @@ static int ov117_0226251C (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02 return 0; } -static int ov117_022625F8 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02262664 * param1) +static int ov117_022625F8(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02262664 *param1) { switch (param1->unk_0C) { case 0: @@ -1695,10 +1683,10 @@ static int ov117_022625F8 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02 return 0; } -static BOOL ov117_02262664 (UnkStruct_ov117_02261280 * param0) +static BOOL ov117_02262664(UnkStruct_ov117_02261280 *param0) { int v0; - UnkStruct_ov117_02262664 * v1; + UnkStruct_ov117_02262664 *v1; if (ov117_02261FF4(param0) == 0) { return 0; @@ -1722,7 +1710,7 @@ static BOOL ov117_02262664 (UnkStruct_ov117_02261280 * param0) return 0; } -static void ov117_022626AC (Camera * camera) +static void ov117_022626AC(Camera *camera) { return; } diff --git a/src/unk_02089604.c b/src/unk_02089604.c index 12b4b4d5a7..305039c9b7 100644 --- a/src/unk_02089604.c +++ b/src/unk_02089604.c @@ -17,7 +17,7 @@ #include "unk_020393C8.h" #include "unk_0208A3F4.h" -void sub_02089604 (UnkStruct_02089688 * param0, int param1) +void sub_02089604(UnkStruct_02089688 *param0, int param1) { int v0; @@ -64,7 +64,7 @@ void sub_02089688(UnkStruct_02089688 *param0) } param0->unk_3C0--; - v2 = 8 *(param0->unk_2A4 + param0->unk_3C0); + v2 = 8 * (param0->unk_2A4 + param0->unk_3C0); param0->unk_274[0] = 112 - v2 / 2; for (v0 = 0; v0 < 4; v0++) { @@ -97,7 +97,7 @@ void sub_02089688(UnkStruct_02089688 *param0) } } -void sub_02089808 (UnkStruct_02089688 * param0, int param1) +void sub_02089808(UnkStruct_02089688 *param0, int param1) { param0->unk_294 = param1; param0->unk_298 = 0; @@ -105,7 +105,7 @@ void sub_02089808 (UnkStruct_02089688 * param0, int param1) param0->unk_2A0 = 0; } -BOOL sub_02089820 (UnkStruct_02089688 * param0) +BOOL sub_02089820(UnkStruct_02089688 *param0) { sub_0208A490(param0); sub_0208ADA4(param0); @@ -119,8 +119,8 @@ BOOL sub_02089820 (UnkStruct_02089688 * param0) sub_0208B1C4(param0->unk_2C0.unk_0C, ¶m0->unk_2C0.unk_B0, 4, 2, 21, 27, 2, 100, param0->unk_38C.unk_2C); if (param0->unk_38C.unk_30 != 0) { - NNSG2dPaletteData * v0; - void * v1 = sub_020394A8(101); + NNSG2dPaletteData *v0; + void *v1 = sub_020394A8(101); NNS_G2dGetUnpackedPaletteData(v1, &v0); sub_02002FBC(param0->unk_2C0.unk_10, v0->pRawData, 0x1 | 0x2, 0xe0, 0x20); @@ -133,7 +133,7 @@ BOOL sub_02089820 (UnkStruct_02089688 * param0) return 0; } -BOOL sub_020898DC (UnkStruct_02089688 * param0) +BOOL sub_020898DC(UnkStruct_02089688 *param0) { switch (param0->unk_29C) { case 0: @@ -152,7 +152,7 @@ BOOL sub_020898DC (UnkStruct_02089688 * param0) return 0; } -BOOL sub_02089938 (UnkStruct_02089688 * param0) +BOOL sub_02089938(UnkStruct_02089688 *param0) { switch (param0->unk_29C) { case 0: @@ -170,7 +170,7 @@ BOOL sub_02089938 (UnkStruct_02089688 * param0) return 0; } -BOOL sub_02089974 (UnkStruct_02089688 * param0) +BOOL sub_02089974(UnkStruct_02089688 *param0) { int v0; static f32 v1[] = { @@ -275,14 +275,14 @@ BOOL sub_02089974 (UnkStruct_02089688 * param0) return 0; } -static BOOL(*const Unk_020F2EB8[])(UnkStruct_02089688 *) = { +static BOOL (*const Unk_020F2EB8[])(UnkStruct_02089688 *) = { sub_02089820, sub_02089938, sub_02089974, sub_020898DC, }; -BOOL sub_02089BEC (UnkStruct_02089688 * param0) +BOOL sub_02089BEC(UnkStruct_02089688 *param0) { BOOL v0; @@ -296,7 +296,9 @@ BOOL sub_02089BEC (UnkStruct_02089688 * param0) } const int Unk_020F2EC8[][5] = { - {0, 1, 2, 3, 4}, {5, 6, 7, 8, 9}, {10, 10, 10, 11, 11}, + { 0, 1, 2, 3, 4 }, + { 5, 6, 7, 8, 9 }, + { 10, 10, 10, 11, 11 }, }; extern void _s32_div_f(void); @@ -745,11 +747,11 @@ asm void sub_02089C20 (UnkStruct_02089688 * param0) } // clang-format on -void sub_02089F80 (UnkStruct_02089688 * param0) +void sub_02089F80(UnkStruct_02089688 *param0) { int v0; u32 v1 = 0; - Strbuf* v2 = Strbuf_Init(100, 101); + Strbuf *v2 = Strbuf_Init(100, 101); param0->unk_240[1].unk_00 = 1; param0->unk_240[1].unk_14.unk_04 = 0; @@ -769,7 +771,7 @@ void sub_02089F80 (UnkStruct_02089688 * param0) sub_02089808(param0, 3); } -void sub_02089FFC (UnkStruct_02089688 * param0) +void sub_02089FFC(UnkStruct_02089688 *param0) { int v0; int v1; @@ -812,7 +814,7 @@ void sub_02089FFC (UnkStruct_02089688 * param0) } } -void sub_0208A0B8 (UnkStruct_02089688 * param0) +void sub_0208A0B8(UnkStruct_02089688 *param0) { int v0; @@ -822,21 +824,21 @@ void sub_0208A0B8 (UnkStruct_02089688 * param0) { const s16 v1[][4] = { - {32, 80, 20, 20}, - {80, 80, 20, 20}, - {128, 80, 20, 20}, - {176, 80, 20, 20}, - {224, 80, 20, 20}, - {32, 128, 20, 20}, - {80, 128, 20, 20}, - {128, 128, 20, 20}, - {176, 128, 20, 20}, - {224, 128, 20, 20}, - {64, 176, 60, 12}, - {192, 176, 60, 12}, + { 32, 80, 20, 20 }, + { 80, 80, 20, 20 }, + { 128, 80, 20, 20 }, + { 176, 80, 20, 20 }, + { 224, 80, 20, 20 }, + { 32, 128, 20, 20 }, + { 80, 128, 20, 20 }, + { 128, 128, 20, 20 }, + { 176, 128, 20, 20 }, + { 224, 128, 20, 20 }, + { 64, 176, 60, 12 }, + { 192, 176, 60, 12 }, }; - for ( ; v0 < 0x1c; v0++) { + for (; v0 < 0x1c; v0++) { param0->unk_2C0.unk_18[v0].rect.top = v1[v0 - 16][1] - v1[v0 - 16][3]; param0->unk_2C0.unk_18[v0].rect.left = v1[v0 - 16][0] - v1[v0 - 16][2]; param0->unk_2C0.unk_18[v0].rect.bottom = v1[v0 - 16][1] + v1[v0 - 16][3]; @@ -847,9 +849,9 @@ void sub_0208A0B8 (UnkStruct_02089688 * param0) param0->unk_2C0.unk_14 = sub_02023FCC(param0->unk_2C0.unk_18, 0x1c, sub_0208A180, param0, 101); } -void sub_0208A180 (u32 param0, u32 param1, void * param2) +void sub_0208A180(u32 param0, u32 param1, void *param2) { - UnkStruct_02089688 * v0 = param2; + UnkStruct_02089688 *v0 = param2; if (v0->unk_294 != 1) { return; @@ -939,7 +941,7 @@ void sub_0208A180 (u32 param0, u32 param1, void * param2) } } -void sub_0208A328 (UnkStruct_02089688 * param0) +void sub_0208A328(UnkStruct_02089688 *param0) { switch (param0->unk_380.unk_00) { case 0: @@ -960,14 +962,14 @@ void sub_0208A328 (UnkStruct_02089688 * param0) } } -void sub_0208A384 (UnkStruct_02089688 * param0) +void sub_0208A384(UnkStruct_02089688 *param0) { param0->unk_380.unk_00 = 0; param0->unk_380.unk_04 = 0; param0->unk_380.unk_08 = 0; } -int sub_0208A398 (UnkStruct_02089688 * param0, int param1) +int sub_0208A398(UnkStruct_02089688 *param0, int param1) { int v0; @@ -980,7 +982,7 @@ int sub_0208A398 (UnkStruct_02089688 * param0, int param1) return 0; } -int sub_0208A3C0 (UnkStruct_02089688 * param0, int param1) +int sub_0208A3C0(UnkStruct_02089688 *param0, int param1) { int v0; int v1 = 0;