From d1d8305e33279dd4ade5c98dfcec7d12d227e318 Mon Sep 17 00:00:00 2001 From: h2o-DS <71458559+h2o-DS@users.noreply.github.com> Date: Sun, 12 Jan 2025 15:11:11 -0500 Subject: [PATCH 1/5] Pokedex_Weight_Check ov21_021E6014 -> pokedex_weight_check message_bank_unk_0697 -> message_bank_pokedex Identified all uses of message_bank_pokedex Started documentation of pokedex_weight_check --- ...ov21_021E6014.h => pokedex_weight_check.h} | 6 +- include/overlay021/struct_ov21_021D13FC.h | 2 +- platinum.us/main.lsf | 2 +- res/text/meson.build | 2 +- ..._unk_0697.gmm => message_bank_pokedex.gmm} | 0 res/text/message_banks.order | 2 +- src/meson.build | 2 +- src/overlay021/ov21_021D0D80.c | 11 +- src/overlay021/ov21_021D1FA4.c | 8 +- src/overlay021/ov21_021D4C0C.c | 4 +- src/overlay021/ov21_021D5AEC.c | 35 +- src/overlay021/ov21_021D76B0.c | 11 +- src/overlay021/ov21_021D94BC.c | 19 +- src/overlay021/ov21_021DC9BC.c | 5 +- src/overlay021/ov21_021DE668.c | 19 +- src/overlay021/ov21_021DF734.c | 3 +- src/overlay021/ov21_021E0C68.c | 17 +- src/overlay021/ov21_021E1924.c | 5 +- src/overlay021/ov21_021E29DC.c | 3 +- src/overlay021/ov21_021E4CA4.c | 5 +- src/overlay021/ov21_021E6014.c | 574 ------------------ src/overlay021/ov21_021E68F4.c | 5 +- src/overlay021/ov21_021E737C.c | 17 +- src/overlay021/ov21_021E8484.c | 3 +- src/overlay021/ov21_021E8D48.c | 11 +- src/overlay021/pokedex_weight_check.c | 548 +++++++++++++++++ 26 files changed, 654 insertions(+), 665 deletions(-) rename include/overlay021/{ov21_021E6014.h => pokedex_weight_check.h} (65%) rename res/text/{message_bank_unk_0697.gmm => message_bank_pokedex.gmm} (100%) delete mode 100644 src/overlay021/ov21_021E6014.c create mode 100644 src/overlay021/pokedex_weight_check.c diff --git a/include/overlay021/ov21_021E6014.h b/include/overlay021/pokedex_weight_check.h similarity index 65% rename from include/overlay021/ov21_021E6014.h rename to include/overlay021/pokedex_weight_check.h index ab71b4c9c7..aadb96ed46 100644 --- a/include/overlay021/ov21_021E6014.h +++ b/include/overlay021/pokedex_weight_check.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_OV21_021E6014_H -#define POKEPLATINUM_OV21_021E6014_H +#ifndef POKEPLATINUM_POKEDEX_WEIGHT_CHECK_H +#define POKEPLATINUM_POKEDEX_WEIGHT_CHECK_H #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" @@ -7,4 +7,4 @@ void ov21_021E6014(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); void ov21_021E6074(UnkStruct_ov21_021E68F4 *param0); -#endif // POKEPLATINUM_OV21_021E6014_H +#endif // POKEPLATINUM_POKEDEX_WEIGHT_CHECK_H diff --git a/include/overlay021/struct_ov21_021D13FC.h b/include/overlay021/struct_ov21_021D13FC.h index 4d5d7e4624..d17921f3a8 100644 --- a/include/overlay021/struct_ov21_021D13FC.h +++ b/include/overlay021/struct_ov21_021D13FC.h @@ -35,7 +35,7 @@ typedef struct { UnkStruct_ov21_021D3124 unk_218; SysTask *unk_270; SysTask *unk_274; - NARC *unk_278; + NARC *pokedexGraphics; } UnkStruct_ov21_021D13FC; #endif // POKEPLATINUM_STRUCT_OV21_021D13FC_H diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index bc91520794..33bbfff8ea 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -807,7 +807,7 @@ Overlay overlay21 Object main.nef.p/src_overlay021_ov21_021E29DC.c.o Object main.nef.p/src_overlay021_ov21_021E3FFC.c.o Object main.nef.p/src_overlay021_ov21_021E4CA4.c.o - Object main.nef.p/src_overlay021_ov21_021E6014.c.o + Object main.nef.p/src_overlay021_pokedex_weight_check.c.o Object main.nef.p/src_overlay021_ov21_021E68F4.c.o Object main.nef.p/src_overlay021_ov21_021E737C.c.o Object main.nef.p/src_overlay021_ov21_021E8484.c.o diff --git a/res/text/meson.build b/res/text/meson.build index f0bba3c1d4..319ea18a3b 100644 --- a/res/text/meson.build +++ b/res/text/meson.build @@ -694,7 +694,7 @@ message_bank_files = files( 'message_bank_country_names.gmm', 'message_bank_unk_0695.gmm', 'message_bank_unk_0696.gmm', - 'message_bank_unk_0697.gmm', + 'message_bank_pokedex.gmm', 'message_bank_unk_0698.gmm', 'message_bank_unk_0699.gmm', 'message_bank_unk_0700.gmm', diff --git a/res/text/message_bank_unk_0697.gmm b/res/text/message_bank_pokedex.gmm similarity index 100% rename from res/text/message_bank_unk_0697.gmm rename to res/text/message_bank_pokedex.gmm diff --git a/res/text/message_banks.order b/res/text/message_banks.order index 6b839b12d8..5f70d650ef 100644 --- a/res/text/message_banks.order +++ b/res/text/message_banks.order @@ -695,7 +695,7 @@ message_bank_unk_0693 message_bank_country_names message_bank_unk_0695 message_bank_unk_0696 -message_bank_unk_0697 +message_bank_pokedex message_bank_unk_0698 message_bank_unk_0699 message_bank_unk_0700 diff --git a/src/meson.build b/src/meson.build index 7df5287087..9c03c7d104 100644 --- a/src/meson.build +++ b/src/meson.build @@ -618,7 +618,7 @@ pokeplatinum_c = files( 'overlay021/ov21_021E29DC.c', 'overlay021/ov21_021E3FFC.c', 'overlay021/ov21_021E4CA4.c', - 'overlay021/ov21_021E6014.c', + 'overlay021/pokedex_weight_check.c', 'overlay021/ov21_021E68F4.c', 'overlay021/ov21_021E737C.c', 'overlay021/ov21_021E8484.c', diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index 8a14073fc3..0268b312bc 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -27,12 +27,12 @@ #include "overlay021/ov21_021E29DC.h" #include "overlay021/ov21_021E3FFC.h" #include "overlay021/ov21_021E4CA4.h" -#include "overlay021/ov21_021E6014.h" #include "overlay021/ov21_021E68F4.h" #include "overlay021/ov21_021E737C.h" #include "overlay021/ov21_021E8484.h" #include "overlay021/pokedex_sort.h" #include "overlay021/pokedex_text.h" +#include "overlay021/pokedex_weight_check.h" #include "overlay021/species_caught_status.h" #include "overlay021/struct_ov21_021D0D80.h" #include "overlay021/struct_ov21_021D13FC.h" @@ -48,6 +48,7 @@ #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021E68F4.h" #include "overlay022/struct_ov22_022559F8.h" +#include "text/pl_msg.naix" #include "bg_window.h" #include "cell_actor.h" @@ -968,13 +969,13 @@ u32 ov21_021D1C88(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 return v0; } -Strbuf *ov21_021D1CE0(int param0, int param1) +Strbuf *ov21_021D1CE0(int param0, int heapID) { Strbuf *v0; - MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param1); + MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); - v0 = MessageLoader_GetNewStrbuf(v1, param0); - MessageLoader_Free(v1); + v0 = MessageLoader_GetNewStrbuf(pokedexTextBank, param0); + MessageLoader_Free(pokedexTextBank); return v0; } diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c index a2868ab558..283f0b8efa 100644 --- a/src/overlay021/ov21_021D1FA4.c +++ b/src/overlay021/ov21_021D1FA4.c @@ -63,7 +63,7 @@ void ov21_021D1FA4(UnkStruct_ov21_021D13FC *param0, int param1) GraphicsModes v0; UnkStruct_ov21_021D1FA4 v1; - param0->unk_278 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__ZUKAN__ZUKAN, param1); + param0->pokedexGraphics = NARC_ctor(NARC_INDEX_RESOURCE__ENG__ZUKAN__ZUKAN, param1); param0->unk_00 = BgConfig_New(param1); v0.displayMode = GX_DISPMODE_GRAPHICS; @@ -120,7 +120,7 @@ void ov21_021D2098(UnkStruct_ov21_021D13FC *param0) ov21_021D4C6C(param0->unk_14C); Font_Free(FONT_SUBSCREEN); ov21_021D2AB4(param0); - NARC_dtor(param0->unk_278); + NARC_dtor(param0->pokedexGraphics); memset(param0, 0, sizeof(UnkStruct_ov21_021D13FC)); } @@ -466,14 +466,14 @@ BOOL ov21_021D2664(UnkStruct_ov21_021D2648 *param0) NARC *ov21_021D26E0(UnkStruct_ov21_021D13FC *param0) { - return param0->unk_278; + return param0->pokedexGraphics; } void *ov21_021D26E8(UnkStruct_ov21_021D13FC *param0, u32 param1, BOOL param2, u32 param3) { void *v0; - v0 = NARC_AllocAndReadWholeMember(param0->unk_278, param1, param3); + v0 = NARC_AllocAndReadWholeMember(param0->pokedexGraphics, param1, param3); if (v0 != NULL) { if (param2) { diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c index 478fd2bbed..56fcc40a6a 100644 --- a/src/overlay021/ov21_021D4C0C.c +++ b/src/overlay021/ov21_021D4C0C.c @@ -146,7 +146,7 @@ u32 ov21_021D4DAC(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u Strbuf *v1; u32 v2; - v0 = MessageLoader_Init(0, 26, param2, param0->unk_14); + v0 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, param2, param0->unk_14); GF_ASSERT(v0); v1 = MessageLoader_GetNewStrbuf(v0, param3); @@ -166,7 +166,7 @@ void ov21_021D4E10(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, int v2; int v3; - v0 = MessageLoader_Init(0, 26, param2, param0->unk_14); + v0 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, param2, param0->unk_14); GF_ASSERT(v0); v1 = MessageLoader_GetNewStrbuf(v0, param3); diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c index bf2fe8e30f..c538b24666 100644 --- a/src/overlay021/ov21_021D5AEC.c +++ b/src/overlay021/ov21_021D5AEC.c @@ -22,6 +22,7 @@ #include "overlay021/struct_ov21_021E68F4.h" #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "text/pl_msg.naix" #include "bg_window.h" #include "cell_actor.h" @@ -732,15 +733,15 @@ static void ov21_021D63C0(UnkStruct_ov21_021D71A8 *param0) param0->unk_DC = NULL; } -static void ov21_021D63DC(UnkStruct_ov21_021D13FC *param0, int param1, int param2, int param3) +static void ov21_021D63DC(UnkStruct_ov21_021D13FC *param0, int heapID, int param2, int param3) { - Strbuf *v0 = Strbuf_Init(32, param1); - MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param1); + Strbuf *v0 = Strbuf_Init(32, heapID); + MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); - MessageLoader_GetStrbuf(v1, 0, v0); + MessageLoader_GetStrbuf(pokedexTextBank, 0, v0); Text_AddPrinterWithParamsAndColor(¶m0->unk_04, FONT_SYSTEM, v0, 8, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); - MessageLoader_GetStrbuf(v1, 1, v0); + MessageLoader_GetStrbuf(pokedexTextBank, 1, v0); Text_AddPrinterWithParamsAndColor(¶m0->unk_04, FONT_SYSTEM, v0, 128, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); Strbuf_FormatInt(v0, param2, 3, 2, 1); @@ -750,21 +751,21 @@ static void ov21_021D63DC(UnkStruct_ov21_021D13FC *param0, int param1, int param Text_AddPrinterWithParamsAndColor(¶m0->unk_04, FONT_SYSTEM, v0, 180, 170, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); Strbuf_Free(v0); - MessageLoader_Free(v1); + MessageLoader_Free(pokedexTextBank); Bg_ScheduleTilemapTransfer(param0->unk_00, 1); } -static void ov21_021D64B0(UnkStruct_ov21_021D13FC *param0, int param1, int param2) +static void ov21_021D64B0(UnkStruct_ov21_021D13FC *param0, int heapID, int param2) { - Strbuf *v0 = Strbuf_Init(32, param1); - MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param1); + Strbuf *v0 = Strbuf_Init(32, heapID); + MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); - MessageLoader_GetStrbuf(v1, 109, v0); + MessageLoader_GetStrbuf(pokedexTextBank, 109, v0); Text_AddPrinterWithParamsAndColor(¶m0->unk_04, FONT_SYSTEM, v0, 8, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); Strbuf_FormatInt(v0, param2, 3, 2, 1); Text_AddPrinterWithParamsAndColor(¶m0->unk_04, FONT_SYSTEM, v0, 48, 170, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); Strbuf_Free(v0); - MessageLoader_Free(v1); + MessageLoader_Free(pokedexTextBank); Bg_ScheduleTilemapTransfer(param0->unk_00, 1); } @@ -1282,12 +1283,12 @@ static void ov21_021D6D78(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13 ov21_021D4DA0(v1); } -static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, int param2, int param3, int param4) +static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, int heapID, int param3, int param4) { UnkStruct_ov21_021D4CB8 v0; Window *v1; - Strbuf *v2 = Strbuf_Init(32, param2); - MessageLoader *v3 = MessageLoader_Init(0, 26, 697, param2); + Strbuf *v2 = Strbuf_Init(32, heapID); + MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); v0.unk_00 = param1->unk_14C; v0.unk_08 = param0->unk_90.paletteProxy; @@ -1297,13 +1298,13 @@ static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13 v0.unk_18 = 2; v0.unk_1C = 0; v0.unk_20 = NNS_G2D_VRAM_TYPE_2DMAIN; - v0.heapID = param2; + v0.heapID = heapID; v1 = ov21_021D4D6C(param1->unk_14C, 15, 2); Strbuf_FormatInt(v2, param4, 3, 2, 1); Text_AddPrinterWithParamsAndColor(v1, FONT_SUBSCREEN, v2, 22, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL); - MessageLoader_GetStrbuf(v3, 99, v2); + MessageLoader_GetStrbuf(pokedexTextBank, 99, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SUBSCREEN, v2, 49, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL); if (param0->unk_28[param3]) { @@ -1316,7 +1317,7 @@ static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13 ov21_021D4DA0(v1); Strbuf_Free(v2); - MessageLoader_Free(v3); + MessageLoader_Free(pokedexTextBank); } static void ov21_021D6ED0(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1) diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c index 8afcf7bd07..61bd4706e6 100644 --- a/src/overlay021/ov21_021D76B0.c +++ b/src/overlay021/ov21_021D76B0.c @@ -21,6 +21,7 @@ #include "overlay021/struct_ov21_021E68F4.h" #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "text/pl_msg.naix" #include "bg_window.h" #include "cell_actor.h" @@ -691,7 +692,7 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(v3->unk_14C, 10, 4); - ov21_021D4DAC(v3->unk_14C, v0, 697, 7, 0, 0); + ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 7, 0, 0); v1.unk_04 = v0; v1.unk_0C = param0->unk_00[0]; @@ -705,7 +706,7 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 ov21_021D4DA0(v0); v0 = ov21_021D4D6C(v3->unk_14C, 10, 4); - ov21_021D4DAC(v3->unk_14C, v0, 697, 5, 0, 0); + ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 5, 0, 0); v1.unk_04 = v0; v1.unk_0C = param0->unk_00[1]; @@ -719,7 +720,7 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 ov21_021D4DA0(v0); v0 = ov21_021D4D6C(v3->unk_14C, 10, 4); - ov21_021D4DAC(v3->unk_14C, v0, 697, 29, 0, 0); + ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 29, 0, 0); v1.unk_04 = v0; v1.unk_0C = param0->unk_00[2]; @@ -731,9 +732,9 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 v0 = ov21_021D4D6C(v3->unk_14C, 14, 2); if (param2->unk_1C->unk_04->unk_1740 == 0) { - ov21_021D4DAC(v3->unk_14C, v0, 697, 107, 0, 0); + ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 107, 0, 0); } else { - ov21_021D4DAC(v3->unk_14C, v0, 697, 108, 0, 0); + ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 108, 0, 0); } v1.unk_04 = v0; diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c index a524cdd3a9..1a6b5535a9 100644 --- a/src/overlay021/ov21_021D94BC.c +++ b/src/overlay021/ov21_021D94BC.c @@ -24,6 +24,7 @@ #include "overlay021/struct_ov21_021E68F4.h" #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "text/pl_msg.naix" #include "bg_window.h" #include "cell_actor.h" @@ -2751,7 +2752,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C v1 = sub_0201FAB4(param1->unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(param2, 8, 2); - v2 = ov21_021D4DAC(param2, v0, 697, 50, 0, 0); + v2 = ov21_021D4DAC(param2, v0, message_bank_pokedex, 50, 0, 0); param1->unk_04 = v0; param1->unk_0C = param0->unk_00[1]; @@ -2763,7 +2764,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C ov21_021D4DA0(v0); v0 = ov21_021D4D6C(param2, 8, 2); - v2 = ov21_021D4DAC(param2, v0, 697, 47, 0, 0); + v2 = ov21_021D4DAC(param2, v0, message_bank_pokedex, 47, 0, 0); param1->unk_04 = v0; param1->unk_0C = param0->unk_00[2]; @@ -2775,7 +2776,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C ov21_021D4DA0(v0); v0 = ov21_021D4D6C(param2, 8, 2); - v2 = ov21_021D4DAC(param2, v0, 697, 48, 0, 0); + v2 = ov21_021D4DAC(param2, v0, message_bank_pokedex, 48, 0, 0); param1->unk_04 = v0; param1->unk_0C = param0->unk_00[3]; @@ -2787,7 +2788,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C ov21_021D4DA0(v0); v0 = ov21_021D4D6C(param2, 8, 2); - v2 = ov21_021D4DAC(param2, v0, 697, 49, 0, 0); + v2 = ov21_021D4DAC(param2, v0, message_bank_pokedex, 49, 0, 0); param1->unk_04 = v0; param1->unk_0C = param0->unk_00[4]; @@ -2799,7 +2800,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C ov21_021D4DA0(v0); v0 = ov21_021D4D6C(param2, 8, 2); - v2 = ov21_021D4DAC(param2, v0, 697, 51, 0, 0); + v2 = ov21_021D4DAC(param2, v0, message_bank_pokedex, 51, 0, 0); param1->unk_04 = v0; param1->unk_0C = param0->unk_00[5]; @@ -2868,7 +2869,7 @@ static void ov21_021DC088(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C break; } - v4 = ov21_021D4DAC(param2, v0, 697, v3, 0, 0); + v4 = ov21_021D4DAC(param2, v0, message_bank_pokedex, v3, 0, 0); param1->unk_10 = -v4 / 2; param1->unk_04 = v0; @@ -2927,7 +2928,7 @@ static void ov21_021DC12C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C break; } - v5 = ov21_021D4DAC(param2, v0, 697, v4, 0, 0); + v5 = ov21_021D4DAC(param2, v0, message_bank_pokedex, v4, 0, 0); param1->unk_10 = -v5 / 2; param1->unk_04 = v0; @@ -2986,7 +2987,7 @@ static void ov21_021DC1E8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C break; } - v5 = ov21_021D4DAC(param2, v0, 697, v4, 0, 0); + v5 = ov21_021D4DAC(param2, v0, message_bank_pokedex, v4, 0, 0); param1->unk_10 = -v5 / 2; param1->unk_04 = v0; @@ -3042,7 +3043,7 @@ static void ov21_021DC2A4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C break; } - v5 = ov21_021D4DAC(param2, v0, 697, v4, 0, 0); + v5 = ov21_021D4DAC(param2, v0, message_bank_pokedex, v4, 0, 0); param1->unk_10 = -v5 / 2; param1->unk_04 = v0; diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c index ce71debb09..bd672f460f 100644 --- a/src/overlay021/ov21_021DC9BC.c +++ b/src/overlay021/ov21_021DC9BC.c @@ -21,6 +21,7 @@ #include "overlay021/struct_ov21_021E68F4.h" #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "text/pl_msg.naix" #include "bg_window.h" #include "cell_actor.h" @@ -653,7 +654,7 @@ static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DMAIN); v0 = ov21_021D4D6C(v3->unk_14C, 16, 2); - v6 = ov21_021D4DAC(v3->unk_14C, v0, 697, 35, 0, 0); + v6 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 35, 0, 0); v1.unk_04 = v0; v1.unk_0C = mapDisplay->AreaUnknownCellActor; @@ -667,7 +668,7 @@ static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 for (v5 = 0; v5 < 3; v5++) { v0 = ov21_021D4D6C(v3->unk_14C, 9, 2); - v6 = ov21_021D4DAC(v3->unk_14C, v0, 697, 36 + v5, 0, 0); + v6 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 36 + v5, 0, 0); v1.unk_04 = v0; v1.unk_0C = NULL; diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c index 432b0a48a4..ce9e60e05e 100644 --- a/src/overlay021/ov21_021DE668.c +++ b/src/overlay021/ov21_021DE668.c @@ -22,6 +22,7 @@ #include "overlay021/struct_ov21_021E68F4.h" #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "text/pl_msg.naix" #include "bg_window.h" #include "cell_actor.h" @@ -423,22 +424,22 @@ static void ov21_021DEB58(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_ ov21_021DEB8C(¶m0->unk_00->unk_04, species, param2, param1->unk_18, TEXT_COLOR(2, 1, 0)); } -void ov21_021DEB8C(Window *param0, int param1, int param2, int param3, u32 param4) +void ov21_021DEB8C(Window *param0, int param1, int heapID, int param3, u32 param4) { - Strbuf *v0 = Strbuf_Init(64, param2); - MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param2); + Strbuf *v0 = Strbuf_Init(64, heapID); + MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); - MessageLoader_GetStrbuf(v1, 9, v0); + MessageLoader_GetStrbuf(pokedexTextBank, 9, v0); Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v0, 152, 88, TEXT_SPEED_INSTANT, param4, NULL); - MessageLoader_GetStrbuf(v1, 10, v0); + MessageLoader_GetStrbuf(pokedexTextBank, 10, v0); Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v0, 152, 104, TEXT_SPEED_INSTANT, param4, NULL); Strbuf_Free(v0); - MessageLoader_Free(v1); + MessageLoader_Free(pokedexTextBank); - ov21_021DEC2C(param0, param2, param1, param4); - ov21_021DEC80(param0, param2, param1, param4); - ov21_021DECD4(param0, param2, param1, param3, param4); + ov21_021DEC2C(param0, heapID, param1, param4); + ov21_021DEC80(param0, heapID, param1, param4); + ov21_021DECD4(param0, heapID, param1, param3, param4); } static void ov21_021DEC2C(Window *param0, int param1, int param2, u32 param3) diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c index 2d8a83fcf1..ea2f85fc1b 100644 --- a/src/overlay021/ov21_021DF734.c +++ b/src/overlay021/ov21_021DF734.c @@ -17,6 +17,7 @@ #include "overlay021/struct_ov21_021E68F4.h" #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "text/pl_msg.naix" #include "bg_window.h" #include "cell_actor.h" @@ -1073,7 +1074,7 @@ static void ov21_021E09A4(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF8 v3 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DMAIN); v0 = ov21_021D4D6C(v2->unk_14C, 16, 2); - ov21_021D4E10(v2->unk_14C, v0, 697, v4); + ov21_021D4E10(v2->unk_14C, v0, message_bank_pokedex, v4); v1.unk_04 = v0; v1.unk_0C = param0->unk_00[param6]; diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c index 37b5d85f68..d3bee26bcc 100644 --- a/src/overlay021/ov21_021E0C68.c +++ b/src/overlay021/ov21_021E0C68.c @@ -20,6 +20,7 @@ #include "overlay021/struct_ov21_021E68F4.h" #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "text/pl_msg.naix" #include "bg_window.h" #include "cell_actor.h" @@ -414,10 +415,10 @@ static void ov21_021E0FBC(UnkStruct_ov21_021E0D7C *param0, int param1) Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); } -static void ov21_021E10D0(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1, int param2) +static void ov21_021E10D0(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1, int heapID) { - Strbuf *v0 = Strbuf_Init(64, param2); - MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param2); + Strbuf *v0 = Strbuf_Init(64, heapID); + MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); int species = PokedexSort_CurrentSpecies(param1->unk_04); int v3; int v4; @@ -429,18 +430,18 @@ static void ov21_021E10D0(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_ v3 = ov21_021E185C(param1->unk_18); - MessageLoader_GetStrbuf(v1, v3, v0); + MessageLoader_GetStrbuf(pokedexTextBank, v3, v0); v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v0, 0); v4 /= 2; Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, v0, 176 - v4, 72, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); Strbuf_Free(v0); - MessageLoader_Free(v1); + MessageLoader_Free(pokedexTextBank); - ov21_021E1188(param0, param2, species, param1->unk_18, param1->unk_1C); - ov21_021E18A0(param0, param2, species, param1->unk_18); - ov21_021E18DC(param0, param2, species, param1->unk_18); + ov21_021E1188(param0, heapID, species, param1->unk_18, param1->unk_1C); + ov21_021E18A0(param0, heapID, species, param1->unk_18); + ov21_021E18DC(param0, heapID, species, param1->unk_18); } static void ov21_021E1188(UnkStruct_ov21_021E0D7C *param0, int param1, int param2, int param3, int param4) diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c index 403a22bda2..87d1e8c7da 100644 --- a/src/overlay021/ov21_021E1924.c +++ b/src/overlay021/ov21_021E1924.c @@ -24,6 +24,7 @@ #include "overlay021/struct_ov21_021E68F4.h" #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "text/pl_msg.naix" #include "bg_window.h" #include "cell_actor.h" @@ -798,7 +799,7 @@ static void ov21_021E2478(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(v3->unk_14C, 8, 4); - ov21_021D4DAC(v3->unk_14C, v0, 697, 33, 0, 0); + ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 33, 0, 0); v1.unk_04 = v0; v1.unk_0C = param0->unk_00[0]; @@ -812,7 +813,7 @@ static void ov21_021E2478(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A v0 = ov21_021D4D6C(v3->unk_14C, 8, 4); { - u32 v6 = ov21_021D4DAC(v3->unk_14C, v0, 697, 34, 0, 0); + u32 v6 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 34, 0, 0); v1.unk_10 = 32 - v6; } diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c index 98698290cc..b98eae6b0b 100644 --- a/src/overlay021/ov21_021E29DC.c +++ b/src/overlay021/ov21_021E29DC.c @@ -27,6 +27,7 @@ #include "overlay021/struct_ov21_021E68F4.h" #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "text/pl_msg.naix" #include "bg_window.h" #include "cell_actor.h" @@ -731,7 +732,7 @@ static void ov21_021E3270(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E32 for (v4 = 0; v4 < 5; v4++) { v0 = ov21_021D4D6C(v2->unk_14C, 8, 2); - ov21_021D4DAC(v2->unk_14C, v0, 697, 102 + v4, 0, 0); + ov21_021D4DAC(v2->unk_14C, v0, message_bank_pokedex, 102 + v4, 0, 0); v1.unk_04 = v0; param1->unk_04[v4] = ov21_021D4CA0(&v1); diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c index 840c7ac0d6..ac1df0753e 100644 --- a/src/overlay021/ov21_021E4CA4.c +++ b/src/overlay021/ov21_021E4CA4.c @@ -19,6 +19,7 @@ #include "overlay021/struct_ov21_021E68F4.h" #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "text/pl_msg.naix" #include "bg_window.h" #include "cell_actor.h" @@ -937,7 +938,7 @@ static void ov21_021E58B8(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(v3->unk_14C, 8, 2); - v5 = ov21_021D4DAC(v3->unk_14C, v0, 697, 41, 0, 0); + v5 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 41, 0, 0); v1.unk_10 = 64 - v5 / 2; v1.unk_04 = v0; @@ -947,7 +948,7 @@ static void ov21_021E58B8(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D ov21_021D4DA0(v0); v0 = ov21_021D4D6C(v3->unk_14C, 8, 2); - v5 = ov21_021D4DAC(v3->unk_14C, v0, 697, 42, 0, 0); + v5 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 42, 0, 0); v1.unk_10 = 64 - v5 / 2; v1.unk_04 = v0; diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c deleted file mode 100644 index 2cd0219b99..0000000000 --- a/src/overlay021/ov21_021E6014.c +++ /dev/null @@ -1,574 +0,0 @@ -#include "overlay021/ov21_021E6014.h" - -#include -#include - -#include "struct_decls/sprite_decl.h" - -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021E29DC.h" -#include "overlay021/pokedex_sort.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" -#include "overlay021/struct_ov21_021D13FC.h" -#include "overlay021/struct_ov21_021D3320.h" -#include "overlay021/struct_ov21_021D4660.h" -#include "overlay021/struct_ov21_021E68F4.h" -#include "overlay021/struct_ov21_021E6A68.h" -#include "overlay021/struct_ov21_021E6B20.h" - -#include "bg_window.h" -#include "cell_actor.h" -#include "font.h" -#include "heap.h" -#include "message.h" -#include "message_util.h" -#include "narc.h" -#include "pokedex_data_index.h" -#include "pokedex_heightweight.h" -#include "sprite_resource.h" -#include "strbuf.h" -#include "text.h" -#include "unk_0200762C.h" -#include "unk_020093B4.h" -#include "unk_0200A328.h" - -typedef struct { - int *unk_00; - UnkStruct_ov21_021D3320 *unk_04; - UnkStruct_ov21_021E68F4 *unk_08; -} UnkStruct_ov21_021E6104; - -typedef struct { - UnkStruct_ov21_021D13FC *unk_00; -} UnkStruct_ov21_021E6118; - -typedef struct { - int unk_00; -} UnkStruct_ov21_021E6134; - -typedef struct { - SpriteResource *unk_00[4]; - CellActor *unk_10; -} UnkStruct_ov21_021E6274; - -static UnkStruct_ov21_021E6104 *ov21_021E608C(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021E6118 *ov21_021E60D8(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021D4660 *ov21_021E6100(int param0, UnkStruct_ov21_021D0F60 *param1); -static void ov21_021E6104(UnkStruct_ov21_021E6104 *param0); -static void ov21_021E6118(UnkStruct_ov21_021E6118 *param0); -static void ov21_021E612C(UnkStruct_ov21_021D4660 *param0); -static int ov21_021E6130(void); -static int ov21_021E6134(UnkStruct_ov21_021E6A68 *param0, void *param1); -static int ov21_021E6158(UnkStruct_ov21_021E6A68 *param0, void *param1); -static int ov21_021E6168(UnkStruct_ov21_021E6A68 *param0, void *param1); -static int ov21_021E617C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); -static int ov21_021E6200(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); -static int ov21_021E6204(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); -static void ov21_021E6274(UnkStruct_ov21_021E6274 *param0); -static void ov21_021E6280(UnkStruct_ov21_021E6274 *param0); -static void ov21_021E628C(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3); -static BOOL ov21_021E62F8(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3); -static void ov21_021E6338(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const UnkStruct_ov21_021E6134 *param3, int param4); -static void ov21_021E638C(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1); -static void ov21_021E63C0(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int param2); -static void ov21_021E6428(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, int param2); -static void ov21_021E64D4(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1); -static void ov21_021E6518(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int param3); -static void ov21_021E65EC(UnkStruct_ov21_021E6274 *param0); -static void ov21_021E65F8(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int param3); -static void ov21_021E65FC(UnkStruct_ov21_021E6274 *param0); -static void ov21_021E6600(UnkStruct_ov21_021E6118 *param0, int param1); -static void ov21_021E66B0(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int param2); -static void ov21_021E67C8(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1); -static void ov21_021E6844(UnkStruct_ov21_021E6118 *param0); -static void ov21_021E6860(CellActor *param0, short param1); -static void ov21_021E687C(Sprite *param0, short param1); -static void ov21_021E688C(CellActor *param0, short param1); -static void ov21_021E68B0(Sprite *param0, short param1); - -void ov21_021E6014(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) -{ - UnkStruct_ov21_021E6104 *v0; - UnkStruct_ov21_021E6118 *v1; - UnkStruct_ov21_021D4660 *v2; - - v0 = ov21_021E608C(param2, param1); - v1 = ov21_021E60D8(param2, param1); - v2 = ov21_021E6100(param2, param1); - - param0->unk_00 = v0; - param0->unk_04 = v1; - param0->unk_20 = v2; - param0->unk_24 = ov21_021E6130(); - - param0->unk_08[0] = ov21_021E6134; - param0->unk_08[1] = ov21_021E6158; - param0->unk_08[2] = ov21_021E6168; - param0->unk_14[0] = ov21_021E617C; - param0->unk_14[1] = ov21_021E6200; - param0->unk_14[2] = ov21_021E6204; -} - -void ov21_021E6074(UnkStruct_ov21_021E68F4 *param0) -{ - ov21_021E6104(param0->unk_00); - ov21_021E6118(param0->unk_04); - ov21_021E612C(param0->unk_20); -} - -static UnkStruct_ov21_021E6104 *ov21_021E608C(int param0, UnkStruct_ov21_021D0F60 *param1) -{ - UnkStruct_ov21_021E6104 *v0; - - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E6104)); - GF_ASSERT(v0); - memset(v0, 0, sizeof(UnkStruct_ov21_021E6104)); - - v0->unk_00 = ov21_021D138C(param1); - v0->unk_04 = ov21_021D13EC(param1); - v0->unk_08 = ov21_021D1410(param1, 5); - - return v0; -} - -UnkStruct_ov21_021E6118 *ov21_021E60D8(int param0, UnkStruct_ov21_021D0F60 *param1) -{ - UnkStruct_ov21_021E6118 *v0; - UnkStruct_ov21_021E68F4 *v1; - - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E6118)); - GF_ASSERT(v0); - memset(v0, 0, sizeof(UnkStruct_ov21_021E6118)); - - v0->unk_00 = ov21_021D13FC(param1); - - return v0; -} - -static UnkStruct_ov21_021D4660 *ov21_021E6100(int param0, UnkStruct_ov21_021D0F60 *param1) -{ - return NULL; -} - -static void ov21_021E6104(UnkStruct_ov21_021E6104 *param0) -{ - GF_ASSERT(param0); - Heap_FreeToHeap(param0); -} - -static void ov21_021E6118(UnkStruct_ov21_021E6118 *param0) -{ - GF_ASSERT(param0); - Heap_FreeToHeap(param0); -} - -static void ov21_021E612C(UnkStruct_ov21_021D4660 *param0) -{ - return; -} - -static int ov21_021E6130(void) -{ - return 0; -} - -static int ov21_021E6134(UnkStruct_ov21_021E6A68 *param0, void *param1) -{ - UnkStruct_ov21_021E6104 *v0 = param1; - UnkStruct_ov21_021E6134 *v1; - - v1 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov21_021E6134)); - - GF_ASSERT(v1); - memset(v1, 0, sizeof(UnkStruct_ov21_021E6134)); - - param0->unk_08 = v1; - - return 1; -} - -static int ov21_021E6158(UnkStruct_ov21_021E6A68 *param0, void *param1) -{ - UnkStruct_ov21_021E6104 *v0 = param1; - UnkStruct_ov21_021E6134 *v1 = param0->unk_08; - - if (param0->unk_0C == 1) { - return 1; - } - - if (param0->unk_10 == 1) { - return 0; - } - - return 0; -} - -static int ov21_021E6168(UnkStruct_ov21_021E6A68 *param0, void *param1) -{ - UnkStruct_ov21_021E6104 *v0 = param1; - UnkStruct_ov21_021E6134 *v1 = param0->unk_08; - - Heap_FreeToHeap(v1); - param0->unk_08 = NULL; - - return 1; -} - -static int ov21_021E617C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) -{ - const UnkStruct_ov21_021E6104 *v0 = param2; - const UnkStruct_ov21_021E6134 *v1 = param3->unk_08; - UnkStruct_ov21_021E6118 *v2 = param0; - UnkStruct_ov21_021E6274 *v3 = param1->unk_08; - - switch (param1->unk_00) { - case 0: - param1->unk_08 = Heap_AllocFromHeap(param1->heapID, sizeof(UnkStruct_ov21_021E6274)); - memset(param1->unk_08, 0, sizeof(UnkStruct_ov21_021E6274)); - param1->unk_00++; - break; - case 1: - ov21_021E6338(v3, v2, v0, v1, param1->heapID); - ov21_021E628C(v3, v2, v0, 1); - param1->unk_00++; - break; - case 2: - if (ov21_021E62F8(v3, v2, v0, 1)) { - param1->unk_00++; - } - break; - case 3: - return 1; - } - - return 0; -} - -static int ov21_021E6200(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) -{ - const UnkStruct_ov21_021E6104 *v0 = param2; - const UnkStruct_ov21_021E6134 *v1 = param3->unk_08; - UnkStruct_ov21_021E6118 *v2 = param0; - UnkStruct_ov21_021E6274 *v3 = param1->unk_08; - - return 0; -} - -static int ov21_021E6204(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) -{ - const UnkStruct_ov21_021E6104 *v0 = param2; - const UnkStruct_ov21_021E6134 *v1 = param3->unk_08; - UnkStruct_ov21_021E6118 *v2 = param0; - UnkStruct_ov21_021E6274 *v3 = param1->unk_08; - - switch (param1->unk_00) { - case 0: - ov21_021E628C(v3, v2, param2, 0); - param1->unk_00++; - break; - case 1: - if (ov21_021E62F8(v3, v2, param2, 0)) { - param1->unk_00++; - } - break; - case 2: - ov21_021E638C(v3, v2); - param1->unk_00++; - break; - case 3: - Heap_FreeToHeap(param1->unk_08); - param1->unk_08 = NULL; - param1->unk_00++; - break; - case 4: - return 1; - } - - return 0; -} - -static void ov21_021E6274(UnkStruct_ov21_021E6274 *param0) -{ - CellActor_SetExplicitOAMMode(param0->unk_10, GX_OAM_MODE_XLU); -} - -static void ov21_021E6280(UnkStruct_ov21_021E6274 *param0) -{ - CellActor_SetExplicitOAMMode(param0->unk_10, GX_OAM_MODE_NORMAL); -} - -static void ov21_021E628C(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3) -{ - ov21_021E6274(param0); - - if (ov21_021E2A54(param2->unk_08)) { - if (param3) { - ov21_021D23F8(¶m1->unk_00->unk_168, 1, -16, 0, 0, 16, (GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD), (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD), 0); - } else { - ov21_021D23F8(¶m1->unk_00->unk_168, 1, 0, -16, 16, 0, (GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD), (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD), 0); - } - } -} - -static BOOL ov21_021E62F8(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3) -{ - BOOL v0; - - if (ov21_021E2A54(param2->unk_08)) { - v0 = ov21_021D2424(¶m1->unk_00->unk_168); - } else { - v0 = ov21_021D24EC(¶m1->unk_00->unk_168); - } - - if (v0) { - if (param3) { - ov21_021E6280(param0); - } - - return 1; - } - - return 0; -} - -static void ov21_021E6338(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const UnkStruct_ov21_021E6134 *param3, int param4) -{ - ov21_021E63C0(param1, param2, param4); - ov21_021E6600(param1, param4); - ov21_021E66B0(param1, param2, param4); - ov21_021E6428(param0, param1, param4); - ov21_021E6518(param0, param1, param2, param4); - ov21_021E65F8(param0, param1, param2, param4); - ov21_021E67C8(param1, param2); -} - -static void ov21_021E638C(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1) -{ - ov21_021E65FC(param0); - ov21_021E65EC(param0); - ov21_021E64D4(param0, param1); - - Window_FillTilemap(¶m1->unk_00->unk_04, 0); - Bg_ClearTilemap(param1->unk_00->unk_00, 1); - - ov21_021E6844(param1); -} - -static void ov21_021E63C0(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int param2) -{ - void *v0; - NNSG2dScreenData *v1; - - ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, param2); - - v0 = ov21_021D27B8(param0->unk_00, 74, 1, &v1, param2); - - Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); - Heap_FreeToHeap(v0); - Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); -} - -static void ov21_021E6428(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, int param2) -{ - UnkStruct_ov21_021D13FC *v0 = param1->unk_00; - NARC *v1 = ov21_021D26E0(v0); - - param0->unk_00[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v1, 93, 1, 93 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); - - sub_0200A3DC(param0->unk_00[0]); - SpriteResource_ReleaseData(param0->unk_00[0]); - - param0->unk_00[1] = SpriteResourceCollection_AddPaletteFrom(v0->unk_13C[1], v1, 14, 0, 14 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, param2); - - sub_0200A640(param0->unk_00[1]); - SpriteResource_ReleaseData(param0->unk_00[1]); - - param0->unk_00[2] = SpriteResourceCollection_AddFrom(v0->unk_13C[2], v1, 91, 1, 91 + 7000, 2, param2); - param0->unk_00[3] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], v1, 92, 1, 92 + 7000, 3, param2); -} - -static void ov21_021E64D4(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1) -{ - UnkStruct_ov21_021D13FC *v0 = param1->unk_00; - - sub_0200A4E4(param0->unk_00[0]); - sub_0200A6DC(param0->unk_00[1]); - SpriteResourceCollection_Remove(v0->unk_13C[0], param0->unk_00[0]); - SpriteResourceCollection_Remove(v0->unk_13C[1], param0->unk_00[1]); - SpriteResourceCollection_Remove(v0->unk_13C[2], param0->unk_00[2]); - SpriteResourceCollection_Remove(v0->unk_13C[3], param0->unk_00[3]); -} - -static void ov21_021E6518(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int param3) -{ - CellActorResourceData v0; - CellActorInitParams v1; - UnkStruct_ov21_021D13FC *v2 = param1->unk_00; - VecFx32 v3; - short v4; - short v5; - int species = PokedexSort_CurrentSpecies(param2->unk_04); - - sub_020093B4(&v0, 93 + 7000, 14 + 7000, 91 + 7000, 92 + 7000, 0xffffffff, 0xffffffff, 0, 1, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); - - v1.collection = v2->unk_138; - v1.resourceData = &v0; - v1.priority = 31; - v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN; - v1.heapID = param3; - - v4 = Pokedex_HeightWeightData_TrainerPos(param2->unk_04->HWData, species); - v5 = Pokedex_HeightWeightData_TrainerScale(param2->unk_04->HWData, species); - - v1.position.x = 168 << FX32_SHIFT; - v1.position.y = (88 + v4) << FX32_SHIFT; - - param0->unk_10 = CellActorCollection_Add(&v1); - - if (PokedexSort_TrainerGender(param2->unk_04) == 0) { - CellActor_SetAnim(param0->unk_10, 5); - } else { - CellActor_SetAnim(param0->unk_10, 6); - } - - ov21_021E6860(param0->unk_10, v4); - ov21_021E688C(param0->unk_10, v5); -} - -static void ov21_021E65EC(UnkStruct_ov21_021E6274 *param0) -{ - CellActor_Delete(param0->unk_10); -} - -static void ov21_021E65F8(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int param3) -{ - return; -} - -static void ov21_021E65FC(UnkStruct_ov21_021E6274 *param0) -{ - return; -} - -static void ov21_021E6600(UnkStruct_ov21_021E6118 *param0, int param1) -{ - Strbuf *v0 = Strbuf_Init(32, param1); - MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param1); - - MessageLoader_GetStrbuf(v1, 43, v0); - - { - u32 v2 = Font_CalcCenterAlignment(FONT_SYSTEM, v0, 0, 256); - Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, v0, v2, 24, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); - } - - MessageLoader_GetStrbuf(v1, 9, v0); - Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, v0, 32, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); - MessageLoader_GetStrbuf(v1, 9, v0); - Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, v0, 152, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); - Strbuf_Free(v0); - MessageLoader_Free(v1); -} - -static void ov21_021E66B0(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int param2) -{ - Strbuf *v0 = Strbuf_Init(32, param2); - int species = PokedexSort_CurrentSpecies(param1->unk_04); - Strbuf *v3 = MessageUtil_SpeciesName(species, param2); - - int heightMessageBankIndex = Height_Message_Bank_Index(); - MessageLoader *v1 = MessageLoader_Init(0, 26, heightMessageBankIndex, param2); - - Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, v3, 26, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); - MessageLoader_GetStrbuf(v1, species, v0); - - { - u32 v5 = 32 + 78 - Font_CalcStrbufWidth(FONT_SYSTEM, v0, 0); - Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, v0, v5, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); - } - - Strbuf_Free(v3); - MessageLoader_Free(v1); - - v1 = MessageLoader_Init(0, 26, 697, param2); - - Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, PokedexSort_TrainerName(param1->unk_04), 146, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); - - if (PokedexSort_TrainerGender(param1->unk_04) == 0) { - MessageLoader_GetStrbuf(v1, 95, v0); - } else { - MessageLoader_GetStrbuf(v1, 96, v0); - } - - { - u32 v6 = 152 + 78 - Font_CalcStrbufWidth(FONT_SYSTEM, v0, 0); - Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, v0, v6, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); - } - - Strbuf_Free(v0); - MessageLoader_Free(v1); -} - -static void ov21_021E67C8(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1) -{ - Sprite *v0 = ov21_021D2170(param0->unk_00); - short v1; - short v2; - int species = PokedexSort_CurrentSpecies(param1->unk_04); - - v1 = Pokedex_HeightWeightData_PokemonPos(param1->unk_04->HWData, species); - v2 = Pokedex_HeightWeightData_PokemonScale(param1->unk_04->HWData, species); - - ov21_021D1890(param0->unk_00, param1->unk_04, species, 2, 88, 88 + v1); - - sub_02007DEC(v0, 6, 0); - sub_020086FC(v0, 15, 15, 0, 0); - - ov21_021E687C(v0, v1); - ov21_021E68B0(v0, v2); -} - -static void ov21_021E6844(UnkStruct_ov21_021E6118 *param0) -{ - Sprite *v0 = ov21_021D2170(param0->unk_00); - - sub_02007DEC(v0, 6, 1); - sub_02008780(v0); -} - -static void ov21_021E6860(CellActor *param0, short param1) -{ - VecFx32 v0; - - v0.x = 168 << FX32_SHIFT; - v0.y = (88 + param1) << FX32_SHIFT; - - CellActor_SetPosition(param0, &v0); -} - -static void ov21_021E687C(Sprite *param0, short param1) -{ - sub_02007DEC(param0, 1, 88 + param1); -} - -static void ov21_021E688C(CellActor *param0, short param1) -{ - VecFx32 v0; - - v0.x = FX_Div(0x100 << FX32_SHIFT, param1 << FX32_SHIFT); - v0.y = v0.x; - - CellActor_SetAffineScaleEx(param0, &v0, 2); -} - -static void ov21_021E68B0(Sprite *param0, short param1) -{ - fx32 v0; - - v0 = FX_Div(0x100 << FX32_SHIFT, param1 << FX32_SHIFT); - param1 = FX_Mul(v0, 0x100 << FX32_SHIFT) >> FX32_SHIFT; - - sub_02007DEC(param0, 12, param1); - sub_02007DEC(param0, 13, param1); -} diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c index 0f0befad88..c20ae1b1c5 100644 --- a/src/overlay021/ov21_021E68F4.c +++ b/src/overlay021/ov21_021E68F4.c @@ -20,6 +20,7 @@ #include "overlay021/struct_ov21_021E68F4.h" #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "text/pl_msg.naix" #include "bg_window.h" #include "cell_actor.h" @@ -621,7 +622,7 @@ static void ov21_021E70D4(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(v3->unk_14C, 12, 2); - v5 = ov21_021D4DAC(v3->unk_14C, v0, 697, 45, 0, 0); + v5 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 45, 0, 0); v1.unk_10 = -(v5 / 2); v1.unk_04 = v0; @@ -633,7 +634,7 @@ static void ov21_021E70D4(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A ov21_021D4DA0(v0); v0 = ov21_021D4D6C(v3->unk_14C, 12, 2); - v5 = ov21_021D4DAC(v3->unk_14C, v0, 697, 46, 0, 0); + v5 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 46, 0, 0); v1.unk_10 = -(v5 / 2); v1.unk_04 = v0; diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c index 53c96b4f70..3fd05716d4 100644 --- a/src/overlay021/ov21_021E737C.c +++ b/src/overlay021/ov21_021E737C.c @@ -20,6 +20,7 @@ #include "overlay021/struct_ov21_021E7F40.h" #include "overlay022/struct_ov22_022557A0.h" #include "overlay022/struct_ov22_02255800.h" +#include "text/pl_msg.naix" #include "bg_window.h" #include "cell_actor.h" @@ -701,24 +702,24 @@ static void ov21_021E7CF4(UnkStruct_ov21_021E7714 *param0) return; } -static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, int param1) +static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, int heapID) { - Strbuf *v0 = Strbuf_Init(32, param1); - MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param1); + Strbuf *v0 = Strbuf_Init(32, heapID); + MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); - MessageLoader_GetStrbuf(v1, 44, v0); + MessageLoader_GetStrbuf(pokedexTextBank, 44, v0); { u32 v2 = Font_CalcCenterAlignment(FONT_SYSTEM, v0, 0, 256); Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, v0, v2, 24, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); } - MessageLoader_GetStrbuf(v1, 10, v0); + MessageLoader_GetStrbuf(pokedexTextBank, 10, v0); Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, v0, 32, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); - MessageLoader_GetStrbuf(v1, 10, v0); + MessageLoader_GetStrbuf(pokedexTextBank, 10, v0); Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, v0, 152, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); Strbuf_Free(v0); - MessageLoader_Free(v1); + MessageLoader_Free(pokedexTextBank); } static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, int heapID) @@ -741,7 +742,7 @@ static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_ Strbuf_Free(v3); MessageLoader_Free(v1); - v1 = MessageLoader_Init(0, 26, 697, heapID); + v1 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, PokedexSort_TrainerName(param1->unk_00), 146, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c index 29e2ce74a7..9f651781e9 100644 --- a/src/overlay021/ov21_021E8484.c +++ b/src/overlay021/ov21_021E8484.c @@ -20,6 +20,7 @@ #include "overlay021/struct_ov21_021E68F4.h" #include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" +#include "text/pl_msg.naix" #include "bg_window.h" #include "cell_actor.h" @@ -585,7 +586,7 @@ static void ov21_021E8B40(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E85 v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(v3->unk_14C, 16, 2); - v5 = ov21_021D4DAC(v3->unk_14C, v0, 697, 101, 0, 0); + v5 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 101, 0, 0); v1.unk_10 = -(v5 / 2); v1.unk_04 = v0; diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index 98910a1ee9..b87569e8c6 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -20,6 +20,7 @@ #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021E8E0C.h" #include "overlay022/struct_ov22_022559F8.h" +#include "text/pl_msg.naix" #include "bg_window.h" #include "cell_actor.h" @@ -745,16 +746,16 @@ static void ov21_021E9968(Window *param0, int param1, int param2) ov21_021E998C(param0, param1); } -static void ov21_021E998C(Window *param0, int param1) +static void ov21_021E998C(Window *param0, int heapID) { - Strbuf *v0 = Strbuf_Init(64, param1); - MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param1); + Strbuf *v0 = Strbuf_Init(64, heapID); + MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); - MessageLoader_GetStrbuf(v1, 110, v0); + MessageLoader_GetStrbuf(pokedexTextBank, 110, v0); Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v0, 32, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(3, 4, 0), NULL); Strbuf_Free(v0); - MessageLoader_Free(v1); + MessageLoader_Free(pokedexTextBank); } static Sprite *ov21_021E99E0(UnkStruct_02007768 *param0, Pokemon *param1, int param2, int param3, int param4) diff --git a/src/overlay021/pokedex_weight_check.c b/src/overlay021/pokedex_weight_check.c new file mode 100644 index 0000000000..499aab1c64 --- /dev/null +++ b/src/overlay021/pokedex_weight_check.c @@ -0,0 +1,548 @@ +#include "overlay021/pokedex_weight_check.h" + +#include +#include + +#include "struct_decls/sprite_decl.h" + +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021E29DC.h" +#include "overlay021/pokedex_sort.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" +#include "overlay021/struct_ov21_021D13FC.h" +#include "overlay021/struct_ov21_021D3320.h" +#include "overlay021/struct_ov21_021D4660.h" +#include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" +#include "overlay021/struct_ov21_021E6B20.h" +#include "text/pl_msg.naix" + +#include "bg_window.h" +#include "cell_actor.h" +#include "font.h" +#include "heap.h" +#include "message.h" +#include "message_util.h" +#include "narc.h" +#include "pokedex_data_index.h" +#include "pokedex_heightweight.h" +#include "sprite_resource.h" +#include "strbuf.h" +#include "text.h" +#include "unk_0200762C.h" +#include "unk_020093B4.h" +#include "unk_0200A328.h" + +typedef struct { + int *unk_00; + UnkStruct_ov21_021D3320 *unk_04; + UnkStruct_ov21_021E68F4 *unk_08; +} UnkStruct_ov21_021E6104; + +typedef struct { + UnkStruct_ov21_021D13FC *unk_00; +} UnkStruct_ov21_021E6118; + +typedef struct { + int unk_00; +} UnkStruct_ov21_021E6134; + +typedef struct { + SpriteResource *weightCheckGraphics[4]; + CellActor *trainerWeightCellActor; +} WeightCheckVisuals; + +enum WeightCheckGraphics { + WCG_TILES, + WCG_PALETTE, + WCG_CELLS, + WCG_ANIMATION, +}; + +static UnkStruct_ov21_021E6104 *ov21_021E608C(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E6118 *ov21_021E60D8(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021E6100(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021E6104(UnkStruct_ov21_021E6104 *param0); +static void ov21_021E6118(UnkStruct_ov21_021E6118 *param0); +static void ForMatching1(UnkStruct_ov21_021D4660 *param0); +static int ov21_021E6130(void); +static int ov21_021E6134(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E6158(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E6168(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E617C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E6200(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E6204(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void SetTrainerWeightLarge(WeightCheckVisuals *weightCheckVisuals); +static void SetTrainerWeightNormal(WeightCheckVisuals *weightCheckVisuals); +static void ov21_021E628C(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3); +static BOOL ov21_021E62F8(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3); +static void DisplayWeightCheck(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const UnkStruct_ov21_021E6134 *param3, int heapID); +static void FreeVisuals(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1); +static void DisplayBackground(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int heapID); +static void GetWeightCheckGraphics(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, int heapID); +static void RemoveVisuals(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1); +static void DisplayTrainerWeight(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID); +static void DeleteTrainerWeight(WeightCheckVisuals *weightCheckVisuals); +static void ForMatching2(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID); +static void ForMatching3(WeightCheckVisuals *weightCheckVisuals); +static void DisplayHeightLabels(UnkStruct_ov21_021E6118 *param0, int heapID); +static void DisplayHeightValues(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int heapID); +static void DisplaySpeciesWeight(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1); +static void ClearSpeciesSprite(UnkStruct_ov21_021E6118 *param0); +static void SetTrainerPosition(CellActor *trainerWeightCellActor, short trainerPos); +static void SetSpeciesPosition(Sprite *speciesSprite, short pokemonPos); +static void SetTrainerScale(CellActor *trainerWeightCellActor, short trainerScale); +static void SetSpeciesScale(Sprite *speciesSprite, short pokemonScale); + +void ov21_021E6014(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +{ + UnkStruct_ov21_021E6104 *v0 = ov21_021E608C(param2, param1); + UnkStruct_ov21_021E6118 *v1 = ov21_021E60D8(param2, param1); + UnkStruct_ov21_021D4660 *v2 = ov21_021E6100(param2, param1); + + param0->unk_00 = v0; + param0->unk_04 = v1; + param0->unk_20 = v2; + param0->unk_24 = ov21_021E6130(); + + param0->unk_08[0] = ov21_021E6134; + param0->unk_08[1] = ov21_021E6158; + param0->unk_08[2] = ov21_021E6168; + param0->unk_14[0] = ov21_021E617C; + param0->unk_14[1] = ov21_021E6200; + param0->unk_14[2] = ov21_021E6204; +} + +void ov21_021E6074(UnkStruct_ov21_021E68F4 *param0) +{ + ov21_021E6104(param0->unk_00); + ov21_021E6118(param0->unk_04); + ForMatching1(param0->unk_20); +} + +static UnkStruct_ov21_021E6104 *ov21_021E608C(int param0, UnkStruct_ov21_021D0F60 *param1) +{ + UnkStruct_ov21_021E6104 *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E6104)); + GF_ASSERT(v0); + memset(v0, 0, sizeof(UnkStruct_ov21_021E6104)); + + v0->unk_00 = ov21_021D138C(param1); + v0->unk_04 = ov21_021D13EC(param1); + v0->unk_08 = ov21_021D1410(param1, 5); + + return v0; +} + +UnkStruct_ov21_021E6118 *ov21_021E60D8(int param0, UnkStruct_ov21_021D0F60 *param1) +{ + UnkStruct_ov21_021E6118 *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E6118)); + + GF_ASSERT(v0); + memset(v0, 0, sizeof(UnkStruct_ov21_021E6118)); + + v0->unk_00 = ov21_021D13FC(param1); + + return v0; +} + +static UnkStruct_ov21_021D4660 *ov21_021E6100(int param0, UnkStruct_ov21_021D0F60 *param1) +{ + return NULL; +} + +static void ov21_021E6104(UnkStruct_ov21_021E6104 *param0) +{ + GF_ASSERT(param0); + Heap_FreeToHeap(param0); +} + +static void ov21_021E6118(UnkStruct_ov21_021E6118 *param0) +{ + GF_ASSERT(param0); + Heap_FreeToHeap(param0); +} + +static void ForMatching1(UnkStruct_ov21_021D4660 *param0) +{ + return; +} + +static int ov21_021E6130(void) +{ + return 0; +} + +static int ov21_021E6134(UnkStruct_ov21_021E6A68 *param0, void *param1) +{ + UnkStruct_ov21_021E6134 *v1 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov21_021E6134)); + + GF_ASSERT(v1); + memset(v1, 0, sizeof(UnkStruct_ov21_021E6134)); + + param0->unk_08 = v1; + + return 1; +} + +static int ov21_021E6158(UnkStruct_ov21_021E6A68 *param0, void *param1) +{ + if (param0->unk_0C == TRUE) { + return 1; + } + + return 0; +} + +static int ov21_021E6168(UnkStruct_ov21_021E6A68 *param0, void *param1) +{ + UnkStruct_ov21_021E6134 *v1 = param0->unk_08; + + Heap_FreeToHeap(v1); + param0->unk_08 = NULL; + + return 1; +} + +static int ov21_021E617C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) +{ + const UnkStruct_ov21_021E6104 *v0 = param2; + const UnkStruct_ov21_021E6134 *v1 = param3->unk_08; + UnkStruct_ov21_021E6118 *v2 = param0; + WeightCheckVisuals *weightCheckVisuals = param1->unk_08; + + switch (param1->unk_00) { + case 0: + param1->unk_08 = Heap_AllocFromHeap(param1->heapID, sizeof(WeightCheckVisuals)); + memset(param1->unk_08, 0, sizeof(WeightCheckVisuals)); + param1->unk_00++; + break; + case 1: + DisplayWeightCheck(weightCheckVisuals, v2, v0, v1, param1->heapID); + ov21_021E628C(weightCheckVisuals, v2, v0, 1); + param1->unk_00++; + break; + case 2: + if (ov21_021E62F8(weightCheckVisuals, v2, v0, 1)) { + param1->unk_00++; + } + break; + case 3: + return 1; + } + + return 0; +} + +static int ov21_021E6200(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) +{ + return 0; +} + +static int ov21_021E6204(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) +{ + UnkStruct_ov21_021E6118 *v2 = param0; + WeightCheckVisuals *weightCheckVisuals = param1->unk_08; + + switch (param1->unk_00) { + case 0: + ov21_021E628C(weightCheckVisuals, v2, param2, 0); + param1->unk_00++; + break; + case 1: + if (ov21_021E62F8(weightCheckVisuals, v2, param2, 0)) { + param1->unk_00++; + } + break; + case 2: + FreeVisuals(weightCheckVisuals, v2); + param1->unk_00++; + break; + case 3: + Heap_FreeToHeap(param1->unk_08); + param1->unk_08 = NULL; + param1->unk_00++; + break; + case 4: + return 1; + } + + return 0; +} + +static void SetTrainerWeightLarge(WeightCheckVisuals *weightCheckVisuals) +{ + CellActor_SetExplicitOAMMode(weightCheckVisuals->trainerWeightCellActor, GX_OAM_MODE_XLU); +} + +static void SetTrainerWeightNormal(WeightCheckVisuals *weightCheckVisuals) +{ + CellActor_SetExplicitOAMMode(weightCheckVisuals->trainerWeightCellActor, GX_OAM_MODE_NORMAL); +} + +static void ov21_021E628C(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3) +{ + SetTrainerWeightLarge(weightCheckVisuals); + + if (ov21_021E2A54(param2->unk_08)) { + if (param3) { + ov21_021D23F8(¶m1->unk_00->unk_168, 1, -16, 0, 0, 16, (GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD), (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD), 0); + } else { + ov21_021D23F8(¶m1->unk_00->unk_168, 1, 0, -16, 16, 0, (GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD), (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD), 0); + } + } +} + +static BOOL ov21_021E62F8(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3) +{ + BOOL v0; + + if (ov21_021E2A54(param2->unk_08)) { + v0 = ov21_021D2424(¶m1->unk_00->unk_168); + } else { + v0 = ov21_021D24EC(¶m1->unk_00->unk_168); + } + + if (v0) { + if (param3) { + SetTrainerWeightNormal(weightCheckVisuals); + } + + return TRUE; + } + + return FALSE; +} + +static void DisplayWeightCheck(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const UnkStruct_ov21_021E6134 *param3, int heapID) +{ + DisplayBackground(param1, param2, heapID); + DisplayHeightLabels(param1, heapID); + DisplayHeightValues(param1, param2, heapID); + GetWeightCheckGraphics(weightCheckVisuals, param1, heapID); + DisplayTrainerWeight(weightCheckVisuals, param1, param2, heapID); + ForMatching2(weightCheckVisuals, param1, param2, heapID); + DisplaySpeciesWeight(param1, param2); +} + +static void FreeVisuals(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1) +{ + ForMatching3(weightCheckVisuals); + DeleteTrainerWeight(weightCheckVisuals); + RemoveVisuals(weightCheckVisuals, param1); + + Window_FillTilemap(¶m1->unk_00->unk_04, 0); + Bg_ClearTilemap(param1->unk_00->unk_00, 1); + + ClearSpeciesSprite(param1); +} + +static void DisplayBackground(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int heapID) +{ + NNSG2dScreenData *v1; + + ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, heapID); + + void *v0 = ov21_021D27B8(param0->unk_00, 74, 1, &v1, heapID); + + Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); + Heap_FreeToHeap(v0); + Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); +} + +static void GetWeightCheckGraphics(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, int heapID) +{ + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *pokedexGraphicsNarc = ov21_021D26E0(v0); + + weightCheckVisuals->weightCheckGraphics[WCG_TILES] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], pokedexGraphicsNarc, 93, 1, 93 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); + + sub_0200A3DC(weightCheckVisuals->weightCheckGraphics[WCG_TILES]); + SpriteResource_ReleaseData(weightCheckVisuals->weightCheckGraphics[WCG_TILES]); + + weightCheckVisuals->weightCheckGraphics[WCG_PALETTE] = SpriteResourceCollection_AddPaletteFrom(v0->unk_13C[1], pokedexGraphicsNarc, 14, 0, 14 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, heapID); + + sub_0200A640(weightCheckVisuals->weightCheckGraphics[WCG_PALETTE]); + SpriteResource_ReleaseData(weightCheckVisuals->weightCheckGraphics[WCG_PALETTE]); + + weightCheckVisuals->weightCheckGraphics[WCG_CELLS] = SpriteResourceCollection_AddFrom(v0->unk_13C[2], pokedexGraphicsNarc, 91, 1, 91 + 7000, 2, heapID); + weightCheckVisuals->weightCheckGraphics[WCG_ANIMATION] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], pokedexGraphicsNarc, 92, 1, 92 + 7000, 3, heapID); +} + +static void RemoveVisuals(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1) +{ + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + + sub_0200A4E4(weightCheckVisuals->weightCheckGraphics[WCG_TILES]); + sub_0200A6DC(weightCheckVisuals->weightCheckGraphics[WCG_PALETTE]); + SpriteResourceCollection_Remove(v0->unk_13C[0], weightCheckVisuals->weightCheckGraphics[WCG_TILES]); + SpriteResourceCollection_Remove(v0->unk_13C[1], weightCheckVisuals->weightCheckGraphics[WCG_PALETTE]); + SpriteResourceCollection_Remove(v0->unk_13C[2], weightCheckVisuals->weightCheckGraphics[WCG_CELLS]); + SpriteResourceCollection_Remove(v0->unk_13C[3], weightCheckVisuals->weightCheckGraphics[WCG_ANIMATION]); +} + +static void DisplayTrainerWeight(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID) +{ + CellActorResourceData trainerResource; + CellActorInitParams trainerCellParams; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; + int species = PokedexSort_CurrentSpecies(param2->unk_04); + + sub_020093B4(&trainerResource, 93 + 7000, 14 + 7000, 91 + 7000, 92 + 7000, 0xffffffff, 0xffffffff, 0, 1, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); + + trainerCellParams.collection = v2->unk_138; + trainerCellParams.resourceData = &trainerResource; + trainerCellParams.priority = 31; + trainerCellParams.vramType = NNS_G2D_VRAM_TYPE_2DMAIN; + trainerCellParams.heapID = heapID; + + short trainerPos = Pokedex_HeightWeightData_TrainerPos(param2->unk_04->HWData, species); + short trainerScale = Pokedex_HeightWeightData_TrainerScale(param2->unk_04->HWData, species); + + trainerCellParams.position.x = 168 << FX32_SHIFT; + trainerCellParams.position.y = (88 + trainerPos) << FX32_SHIFT; + + weightCheckVisuals->trainerWeightCellActor = CellActorCollection_Add(&trainerCellParams); + + if (PokedexSort_TrainerGender(param2->unk_04) == GENDER_MALE) { + CellActor_SetAnim(weightCheckVisuals->trainerWeightCellActor, 5); + } else { + CellActor_SetAnim(weightCheckVisuals->trainerWeightCellActor, 6); + } + + SetTrainerPosition(weightCheckVisuals->trainerWeightCellActor, trainerPos); + SetTrainerScale(weightCheckVisuals->trainerWeightCellActor, trainerScale); +} + +static void DeleteTrainerWeight(WeightCheckVisuals *weightCheckVisuals) +{ + CellActor_Delete(weightCheckVisuals->trainerWeightCellActor); +} + +static void ForMatching2(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID) +{ + return; +} + +static void ForMatching3(WeightCheckVisuals *weightCheckVisuals) +{ + return; +} + +static void DisplayHeightLabels(UnkStruct_ov21_021E6118 *param0, int heapID) +{ + Strbuf *strbuf = Strbuf_Init(32, heapID); + MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); + + MessageLoader_GetStrbuf(pokedexTextBank, 43, strbuf); + + { + u32 xOffset = Font_CalcCenterAlignment(FONT_SYSTEM, strbuf, 0, 256); + Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, strbuf, xOffset, 24, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); + } + + MessageLoader_GetStrbuf(pokedexTextBank, 9, strbuf); + Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, strbuf, 32, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); + MessageLoader_GetStrbuf(pokedexTextBank, 9, strbuf); + Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, strbuf, 152, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); + Strbuf_Free(strbuf); + MessageLoader_Free(pokedexTextBank); +} + +static void DisplayHeightValues(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int heapID) +{ + Strbuf *strbuf = Strbuf_Init(32, heapID); + int species = PokedexSort_CurrentSpecies(param1->unk_04); + Strbuf *speciesName = MessageUtil_SpeciesName(species, heapID); + + int heightMessageBankIndex = Height_Message_Bank_Index(); + MessageLoader *messageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, heightMessageBankIndex, heapID); + + Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, speciesName, 26, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); + MessageLoader_GetStrbuf(messageBank, species, strbuf); + + { + u32 v5 = 32 + 78 - Font_CalcStrbufWidth(FONT_SYSTEM, strbuf, 0); + Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, strbuf, v5, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); + } + + Strbuf_Free(speciesName); + MessageLoader_Free(messageBank); + + messageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); + + Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, PokedexSort_TrainerName(param1->unk_04), 146, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); + + if (PokedexSort_TrainerGender(param1->unk_04) == GENDER_MALE) { + MessageLoader_GetStrbuf(messageBank, 95, strbuf); + } else { + MessageLoader_GetStrbuf(messageBank, 96, strbuf); + } + + { + u32 v6 = 152 + 78 - Font_CalcStrbufWidth(FONT_SYSTEM, strbuf, 0); + Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, strbuf, v6, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); + } + + Strbuf_Free(strbuf); + MessageLoader_Free(messageBank); +} + +static void DisplaySpeciesWeight(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1) +{ + Sprite *speciesSprite = ov21_021D2170(param0->unk_00); + int species = PokedexSort_CurrentSpecies(param1->unk_04); + + short pokemonPos = Pokedex_HeightWeightData_PokemonPos(param1->unk_04->HWData, species); + short pokemonScale = Pokedex_HeightWeightData_PokemonScale(param1->unk_04->HWData, species); + + ov21_021D1890(param0->unk_00, param1->unk_04, species, 2, 88, 88 + pokemonPos); + + sub_02007DEC(speciesSprite, 6, 0); + sub_020086FC(speciesSprite, 15, 15, 0, 0); + + SetSpeciesPosition(speciesSprite, pokemonPos); + SetSpeciesScale(speciesSprite, pokemonScale); +} + +static void ClearSpeciesSprite(UnkStruct_ov21_021E6118 *param0) +{ + Sprite *speciesSprite = ov21_021D2170(param0->unk_00); + + sub_02007DEC(speciesSprite, 6, 1); + sub_02008780(speciesSprite); +} + +static void SetTrainerPosition(CellActor *trainerWeightCellActor, short trainerPos) +{ + VecFx32 position; + + position.x = 168 << FX32_SHIFT; + position.y = (88 + trainerPos) << FX32_SHIFT; + + CellActor_SetPosition(trainerWeightCellActor, &position); +} + +static void SetSpeciesPosition(Sprite *speciesSprite, short pokemonPos) +{ + sub_02007DEC(speciesSprite, 1, 88 + pokemonPos); +} + +static void SetTrainerScale(CellActor *trainerWeightCellActor, short trainerScale) +{ + VecFx32 scale; + + scale.x = FX_Div(0x100 << FX32_SHIFT, trainerScale << FX32_SHIFT); + scale.y = scale.x; + + CellActor_SetAffineScaleEx(trainerWeightCellActor, &scale, 2); +} + +static void SetSpeciesScale(Sprite *speciesSprite, short pokemonScale) +{ + fx32 scale = FX_Div(0x100 << FX32_SHIFT, pokemonScale << FX32_SHIFT); + pokemonScale = FX_Mul(scale, 0x100 << FX32_SHIFT) >> FX32_SHIFT; + + sub_02007DEC(speciesSprite, 12, pokemonScale); + sub_02007DEC(speciesSprite, 13, pokemonScale); +} From 47205d06e9c57cf9062424fca8f4fb4cd3de2e3d Mon Sep 17 00:00:00 2001 From: h2o-DS <71458559+h2o-DS@users.noreply.github.com> Date: Sun, 12 Jan 2025 15:41:17 -0500 Subject: [PATCH 2/5] Pokedex_Height_Check Fixed Misidentifications --- ..._weight_check.h => pokedex_height_check.h} | 6 +- platinum.us/main.lsf | 2 +- src/meson.build | 2 +- src/overlay021/ov21_021D0D80.c | 2 +- ..._weight_check.c => pokedex_height_check.c} | 166 +++++++++--------- 5 files changed, 89 insertions(+), 89 deletions(-) rename include/overlay021/{pokedex_weight_check.h => pokedex_height_check.h} (65%) rename src/overlay021/{pokedex_weight_check.c => pokedex_height_check.c} (76%) diff --git a/include/overlay021/pokedex_weight_check.h b/include/overlay021/pokedex_height_check.h similarity index 65% rename from include/overlay021/pokedex_weight_check.h rename to include/overlay021/pokedex_height_check.h index aadb96ed46..0f702dc936 100644 --- a/include/overlay021/pokedex_weight_check.h +++ b/include/overlay021/pokedex_height_check.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_POKEDEX_WEIGHT_CHECK_H -#define POKEPLATINUM_POKEDEX_WEIGHT_CHECK_H +#ifndef POKEPLATINUM_POKEDEX_HEIGHT_CHECK_H +#define POKEPLATINUM_POKEDEX_HEIGHT_CHECK_H #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" @@ -7,4 +7,4 @@ void ov21_021E6014(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); void ov21_021E6074(UnkStruct_ov21_021E68F4 *param0); -#endif // POKEPLATINUM_POKEDEX_WEIGHT_CHECK_H +#endif // POKEPLATINUM_POKEDEX_HEIGHT_CHECK_H diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 33bbfff8ea..fb95db408a 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -807,7 +807,7 @@ Overlay overlay21 Object main.nef.p/src_overlay021_ov21_021E29DC.c.o Object main.nef.p/src_overlay021_ov21_021E3FFC.c.o Object main.nef.p/src_overlay021_ov21_021E4CA4.c.o - Object main.nef.p/src_overlay021_pokedex_weight_check.c.o + Object main.nef.p/src_overlay021_pokedex_height_check.c.o Object main.nef.p/src_overlay021_ov21_021E68F4.c.o Object main.nef.p/src_overlay021_ov21_021E737C.c.o Object main.nef.p/src_overlay021_ov21_021E8484.c.o diff --git a/src/meson.build b/src/meson.build index 9c03c7d104..b1140e1155 100644 --- a/src/meson.build +++ b/src/meson.build @@ -618,7 +618,7 @@ pokeplatinum_c = files( 'overlay021/ov21_021E29DC.c', 'overlay021/ov21_021E3FFC.c', 'overlay021/ov21_021E4CA4.c', - 'overlay021/pokedex_weight_check.c', + 'overlay021/pokedex_height_check.c', 'overlay021/ov21_021E68F4.c', 'overlay021/ov21_021E737C.c', 'overlay021/ov21_021E8484.c', diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index 0268b312bc..c674cf0ada 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -30,9 +30,9 @@ #include "overlay021/ov21_021E68F4.h" #include "overlay021/ov21_021E737C.h" #include "overlay021/ov21_021E8484.h" +#include "overlay021/pokedex_height_check.h" #include "overlay021/pokedex_sort.h" #include "overlay021/pokedex_text.h" -#include "overlay021/pokedex_weight_check.h" #include "overlay021/species_caught_status.h" #include "overlay021/struct_ov21_021D0D80.h" #include "overlay021/struct_ov21_021D13FC.h" diff --git a/src/overlay021/pokedex_weight_check.c b/src/overlay021/pokedex_height_check.c similarity index 76% rename from src/overlay021/pokedex_weight_check.c rename to src/overlay021/pokedex_height_check.c index 499aab1c64..d214b577df 100644 --- a/src/overlay021/pokedex_weight_check.c +++ b/src/overlay021/pokedex_height_check.c @@ -1,4 +1,4 @@ -#include "overlay021/pokedex_weight_check.h" +#include "overlay021/pokedex_height_check.h" #include #include @@ -49,15 +49,15 @@ typedef struct { } UnkStruct_ov21_021E6134; typedef struct { - SpriteResource *weightCheckGraphics[4]; - CellActor *trainerWeightCellActor; -} WeightCheckVisuals; - -enum WeightCheckGraphics { - WCG_TILES, - WCG_PALETTE, - WCG_CELLS, - WCG_ANIMATION, + SpriteResource *heightCheckGraphics[4]; + CellActor *trainerHeightCellActor; +} HeightCheckVisuals; + +enum HeightCheckGraphics { + HCG_TILES, + HCG_PALETTE, + HCG_CELLS, + HCG_ANIMATION, }; static UnkStruct_ov21_021E6104 *ov21_021E608C(int param0, UnkStruct_ov21_021D0F60 *param1); @@ -73,26 +73,26 @@ static int ov21_021E6168(UnkStruct_ov21_021E6A68 *param0, void *param1); static int ov21_021E617C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); static int ov21_021E6200(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); static int ov21_021E6204(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); -static void SetTrainerWeightLarge(WeightCheckVisuals *weightCheckVisuals); -static void SetTrainerWeightNormal(WeightCheckVisuals *weightCheckVisuals); -static void ov21_021E628C(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3); -static BOOL ov21_021E62F8(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3); -static void DisplayWeightCheck(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const UnkStruct_ov21_021E6134 *param3, int heapID); -static void FreeVisuals(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1); +static void SetTrainerHeightLarge(HeightCheckVisuals *heightCheckVisuals); +static void SetTrainerHeightNormal(HeightCheckVisuals *heightCheckVisuals); +static void ov21_021E628C(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3); +static BOOL ov21_021E62F8(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3); +static void DisplayHeightCheck(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const UnkStruct_ov21_021E6134 *param3, int heapID); +static void FreeVisuals(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1); static void DisplayBackground(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int heapID); -static void GetWeightCheckGraphics(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, int heapID); -static void RemoveVisuals(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1); -static void DisplayTrainerWeight(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID); -static void DeleteTrainerWeight(WeightCheckVisuals *weightCheckVisuals); -static void ForMatching2(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID); -static void ForMatching3(WeightCheckVisuals *weightCheckVisuals); +static void GetHeightCheckGraphics(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, int heapID); +static void RemoveVisuals(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1); +static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID); +static void DeleteTrainerHeight(HeightCheckVisuals *heightCheckVisuals); +static void ForMatching2(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID); +static void ForMatching3(HeightCheckVisuals *heightCheckVisuals); static void DisplayHeightLabels(UnkStruct_ov21_021E6118 *param0, int heapID); static void DisplayHeightValues(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int heapID); -static void DisplaySpeciesWeight(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1); +static void DisplaySpeciesHeight(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1); static void ClearSpeciesSprite(UnkStruct_ov21_021E6118 *param0); -static void SetTrainerPosition(CellActor *trainerWeightCellActor, short trainerPos); +static void SetTrainerPosition(CellActor *trainerHeightCellActor, short trainerPos); static void SetSpeciesPosition(Sprite *speciesSprite, short pokemonPos); -static void SetTrainerScale(CellActor *trainerWeightCellActor, short trainerScale); +static void SetTrainerScale(CellActor *trainerHeightCellActor, short trainerScale); static void SetSpeciesScale(Sprite *speciesSprite, short pokemonScale); void ov21_021E6014(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) @@ -209,21 +209,21 @@ static int ov21_021E617C(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo const UnkStruct_ov21_021E6104 *v0 = param2; const UnkStruct_ov21_021E6134 *v1 = param3->unk_08; UnkStruct_ov21_021E6118 *v2 = param0; - WeightCheckVisuals *weightCheckVisuals = param1->unk_08; + HeightCheckVisuals *heightCheckVisuals = param1->unk_08; switch (param1->unk_00) { case 0: - param1->unk_08 = Heap_AllocFromHeap(param1->heapID, sizeof(WeightCheckVisuals)); - memset(param1->unk_08, 0, sizeof(WeightCheckVisuals)); + param1->unk_08 = Heap_AllocFromHeap(param1->heapID, sizeof(HeightCheckVisuals)); + memset(param1->unk_08, 0, sizeof(HeightCheckVisuals)); param1->unk_00++; break; case 1: - DisplayWeightCheck(weightCheckVisuals, v2, v0, v1, param1->heapID); - ov21_021E628C(weightCheckVisuals, v2, v0, 1); + DisplayHeightCheck(heightCheckVisuals, v2, v0, v1, param1->heapID); + ov21_021E628C(heightCheckVisuals, v2, v0, 1); param1->unk_00++; break; case 2: - if (ov21_021E62F8(weightCheckVisuals, v2, v0, 1)) { + if (ov21_021E62F8(heightCheckVisuals, v2, v0, 1)) { param1->unk_00++; } break; @@ -242,20 +242,20 @@ static int ov21_021E6200(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo static int ov21_021E6204(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { UnkStruct_ov21_021E6118 *v2 = param0; - WeightCheckVisuals *weightCheckVisuals = param1->unk_08; + HeightCheckVisuals *heightCheckVisuals = param1->unk_08; switch (param1->unk_00) { case 0: - ov21_021E628C(weightCheckVisuals, v2, param2, 0); + ov21_021E628C(heightCheckVisuals, v2, param2, 0); param1->unk_00++; break; case 1: - if (ov21_021E62F8(weightCheckVisuals, v2, param2, 0)) { + if (ov21_021E62F8(heightCheckVisuals, v2, param2, 0)) { param1->unk_00++; } break; case 2: - FreeVisuals(weightCheckVisuals, v2); + FreeVisuals(heightCheckVisuals, v2); param1->unk_00++; break; case 3: @@ -270,19 +270,19 @@ static int ov21_021E6204(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo return 0; } -static void SetTrainerWeightLarge(WeightCheckVisuals *weightCheckVisuals) +static void SetTrainerHeightLarge(HeightCheckVisuals *heightCheckVisuals) { - CellActor_SetExplicitOAMMode(weightCheckVisuals->trainerWeightCellActor, GX_OAM_MODE_XLU); + CellActor_SetExplicitOAMMode(heightCheckVisuals->trainerHeightCellActor, GX_OAM_MODE_XLU); } -static void SetTrainerWeightNormal(WeightCheckVisuals *weightCheckVisuals) +static void SetTrainerHeightNormal(HeightCheckVisuals *heightCheckVisuals) { - CellActor_SetExplicitOAMMode(weightCheckVisuals->trainerWeightCellActor, GX_OAM_MODE_NORMAL); + CellActor_SetExplicitOAMMode(heightCheckVisuals->trainerHeightCellActor, GX_OAM_MODE_NORMAL); } -static void ov21_021E628C(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3) +static void ov21_021E628C(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3) { - SetTrainerWeightLarge(weightCheckVisuals); + SetTrainerHeightLarge(heightCheckVisuals); if (ov21_021E2A54(param2->unk_08)) { if (param3) { @@ -293,7 +293,7 @@ static void ov21_021E628C(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21 } } -static BOOL ov21_021E62F8(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3) +static BOOL ov21_021E62F8(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3) { BOOL v0; @@ -305,7 +305,7 @@ static BOOL ov21_021E62F8(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21 if (v0) { if (param3) { - SetTrainerWeightNormal(weightCheckVisuals); + SetTrainerHeightNormal(heightCheckVisuals); } return TRUE; @@ -314,22 +314,22 @@ static BOOL ov21_021E62F8(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21 return FALSE; } -static void DisplayWeightCheck(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const UnkStruct_ov21_021E6134 *param3, int heapID) +static void DisplayHeightCheck(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const UnkStruct_ov21_021E6134 *param3, int heapID) { DisplayBackground(param1, param2, heapID); DisplayHeightLabels(param1, heapID); DisplayHeightValues(param1, param2, heapID); - GetWeightCheckGraphics(weightCheckVisuals, param1, heapID); - DisplayTrainerWeight(weightCheckVisuals, param1, param2, heapID); - ForMatching2(weightCheckVisuals, param1, param2, heapID); - DisplaySpeciesWeight(param1, param2); + GetHeightCheckGraphics(heightCheckVisuals, param1, heapID); + DisplayTrainerHeight(heightCheckVisuals, param1, param2, heapID); + ForMatching2(heightCheckVisuals, param1, param2, heapID); + DisplaySpeciesHeight(param1, param2); } -static void FreeVisuals(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1) +static void FreeVisuals(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1) { - ForMatching3(weightCheckVisuals); - DeleteTrainerWeight(weightCheckVisuals); - RemoveVisuals(weightCheckVisuals, param1); + ForMatching3(heightCheckVisuals); + DeleteTrainerHeight(heightCheckVisuals); + RemoveVisuals(heightCheckVisuals, param1); Window_FillTilemap(¶m1->unk_00->unk_04, 0); Bg_ClearTilemap(param1->unk_00->unk_00, 1); @@ -350,38 +350,38 @@ static void DisplayBackground(UnkStruct_ov21_021E6118 *param0, const UnkStruct_o Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); } -static void GetWeightCheckGraphics(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, int heapID) +static void GetHeightCheckGraphics(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, int heapID) { UnkStruct_ov21_021D13FC *v0 = param1->unk_00; NARC *pokedexGraphicsNarc = ov21_021D26E0(v0); - weightCheckVisuals->weightCheckGraphics[WCG_TILES] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], pokedexGraphicsNarc, 93, 1, 93 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); + heightCheckVisuals->heightCheckGraphics[HCG_TILES] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], pokedexGraphicsNarc, 93, 1, 93 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); - sub_0200A3DC(weightCheckVisuals->weightCheckGraphics[WCG_TILES]); - SpriteResource_ReleaseData(weightCheckVisuals->weightCheckGraphics[WCG_TILES]); + sub_0200A3DC(heightCheckVisuals->heightCheckGraphics[HCG_TILES]); + SpriteResource_ReleaseData(heightCheckVisuals->heightCheckGraphics[HCG_TILES]); - weightCheckVisuals->weightCheckGraphics[WCG_PALETTE] = SpriteResourceCollection_AddPaletteFrom(v0->unk_13C[1], pokedexGraphicsNarc, 14, 0, 14 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, heapID); + heightCheckVisuals->heightCheckGraphics[HCG_PALETTE] = SpriteResourceCollection_AddPaletteFrom(v0->unk_13C[1], pokedexGraphicsNarc, 14, 0, 14 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, heapID); - sub_0200A640(weightCheckVisuals->weightCheckGraphics[WCG_PALETTE]); - SpriteResource_ReleaseData(weightCheckVisuals->weightCheckGraphics[WCG_PALETTE]); + sub_0200A640(heightCheckVisuals->heightCheckGraphics[HCG_PALETTE]); + SpriteResource_ReleaseData(heightCheckVisuals->heightCheckGraphics[HCG_PALETTE]); - weightCheckVisuals->weightCheckGraphics[WCG_CELLS] = SpriteResourceCollection_AddFrom(v0->unk_13C[2], pokedexGraphicsNarc, 91, 1, 91 + 7000, 2, heapID); - weightCheckVisuals->weightCheckGraphics[WCG_ANIMATION] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], pokedexGraphicsNarc, 92, 1, 92 + 7000, 3, heapID); + heightCheckVisuals->heightCheckGraphics[HCG_CELLS] = SpriteResourceCollection_AddFrom(v0->unk_13C[2], pokedexGraphicsNarc, 91, 1, 91 + 7000, 2, heapID); + heightCheckVisuals->heightCheckGraphics[HCG_ANIMATION] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], pokedexGraphicsNarc, 92, 1, 92 + 7000, 3, heapID); } -static void RemoveVisuals(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1) +static void RemoveVisuals(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1) { UnkStruct_ov21_021D13FC *v0 = param1->unk_00; - sub_0200A4E4(weightCheckVisuals->weightCheckGraphics[WCG_TILES]); - sub_0200A6DC(weightCheckVisuals->weightCheckGraphics[WCG_PALETTE]); - SpriteResourceCollection_Remove(v0->unk_13C[0], weightCheckVisuals->weightCheckGraphics[WCG_TILES]); - SpriteResourceCollection_Remove(v0->unk_13C[1], weightCheckVisuals->weightCheckGraphics[WCG_PALETTE]); - SpriteResourceCollection_Remove(v0->unk_13C[2], weightCheckVisuals->weightCheckGraphics[WCG_CELLS]); - SpriteResourceCollection_Remove(v0->unk_13C[3], weightCheckVisuals->weightCheckGraphics[WCG_ANIMATION]); + sub_0200A4E4(heightCheckVisuals->heightCheckGraphics[HCG_TILES]); + sub_0200A6DC(heightCheckVisuals->heightCheckGraphics[HCG_PALETTE]); + SpriteResourceCollection_Remove(v0->unk_13C[0], heightCheckVisuals->heightCheckGraphics[HCG_TILES]); + SpriteResourceCollection_Remove(v0->unk_13C[1], heightCheckVisuals->heightCheckGraphics[HCG_PALETTE]); + SpriteResourceCollection_Remove(v0->unk_13C[2], heightCheckVisuals->heightCheckGraphics[HCG_CELLS]); + SpriteResourceCollection_Remove(v0->unk_13C[3], heightCheckVisuals->heightCheckGraphics[HCG_ANIMATION]); } -static void DisplayTrainerWeight(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID) +static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID) { CellActorResourceData trainerResource; CellActorInitParams trainerCellParams; @@ -402,29 +402,29 @@ static void DisplayTrainerWeight(WeightCheckVisuals *weightCheckVisuals, UnkStru trainerCellParams.position.x = 168 << FX32_SHIFT; trainerCellParams.position.y = (88 + trainerPos) << FX32_SHIFT; - weightCheckVisuals->trainerWeightCellActor = CellActorCollection_Add(&trainerCellParams); + heightCheckVisuals->trainerHeightCellActor = CellActorCollection_Add(&trainerCellParams); if (PokedexSort_TrainerGender(param2->unk_04) == GENDER_MALE) { - CellActor_SetAnim(weightCheckVisuals->trainerWeightCellActor, 5); + CellActor_SetAnim(heightCheckVisuals->trainerHeightCellActor, 5); } else { - CellActor_SetAnim(weightCheckVisuals->trainerWeightCellActor, 6); + CellActor_SetAnim(heightCheckVisuals->trainerHeightCellActor, 6); } - SetTrainerPosition(weightCheckVisuals->trainerWeightCellActor, trainerPos); - SetTrainerScale(weightCheckVisuals->trainerWeightCellActor, trainerScale); + SetTrainerPosition(heightCheckVisuals->trainerHeightCellActor, trainerPos); + SetTrainerScale(heightCheckVisuals->trainerHeightCellActor, trainerScale); } -static void DeleteTrainerWeight(WeightCheckVisuals *weightCheckVisuals) +static void DeleteTrainerHeight(HeightCheckVisuals *heightCheckVisuals) { - CellActor_Delete(weightCheckVisuals->trainerWeightCellActor); + CellActor_Delete(heightCheckVisuals->trainerHeightCellActor); } -static void ForMatching2(WeightCheckVisuals *weightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID) +static void ForMatching2(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID) { return; } -static void ForMatching3(WeightCheckVisuals *weightCheckVisuals) +static void ForMatching3(HeightCheckVisuals *heightCheckVisuals) { return; } @@ -488,7 +488,7 @@ static void DisplayHeightValues(UnkStruct_ov21_021E6118 *param0, const UnkStruct MessageLoader_Free(messageBank); } -static void DisplaySpeciesWeight(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1) +static void DisplaySpeciesHeight(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1) { Sprite *speciesSprite = ov21_021D2170(param0->unk_00); int species = PokedexSort_CurrentSpecies(param1->unk_04); @@ -513,14 +513,14 @@ static void ClearSpeciesSprite(UnkStruct_ov21_021E6118 *param0) sub_02008780(speciesSprite); } -static void SetTrainerPosition(CellActor *trainerWeightCellActor, short trainerPos) +static void SetTrainerPosition(CellActor *trainerHeightCellActor, short trainerPos) { VecFx32 position; position.x = 168 << FX32_SHIFT; position.y = (88 + trainerPos) << FX32_SHIFT; - CellActor_SetPosition(trainerWeightCellActor, &position); + CellActor_SetPosition(trainerHeightCellActor, &position); } static void SetSpeciesPosition(Sprite *speciesSprite, short pokemonPos) @@ -528,14 +528,14 @@ static void SetSpeciesPosition(Sprite *speciesSprite, short pokemonPos) sub_02007DEC(speciesSprite, 1, 88 + pokemonPos); } -static void SetTrainerScale(CellActor *trainerWeightCellActor, short trainerScale) +static void SetTrainerScale(CellActor *trainerHeightCellActor, short trainerScale) { VecFx32 scale; scale.x = FX_Div(0x100 << FX32_SHIFT, trainerScale << FX32_SHIFT); scale.y = scale.x; - CellActor_SetAffineScaleEx(trainerWeightCellActor, &scale, 2); + CellActor_SetAffineScaleEx(trainerHeightCellActor, &scale, 2); } static void SetSpeciesScale(Sprite *speciesSprite, short pokemonScale) From 9beed2fc351e9ba8d7d87c4f5d578d710c960a22 Mon Sep 17 00:00:00 2001 From: h2o-DS <71458559+h2o-DS@users.noreply.github.com> Date: Sun, 19 Jan 2025 01:07:16 -0500 Subject: [PATCH 3/5] Pokedex gmm Constants Added all found gmm constants for message_bank_pokedex Renamed message_bank_pokedex gmm constants Documented several simple functions --- include/overlay021/ov21_021D0D80.h | 2 +- include/overlay021/ov21_021D4C0C.h | 2 +- include/overlay021/pokedex_sort.h | 24 +-- res/text/message_bank_pokedex.gmm | 256 +++++++++++++------------- src/overlay021/ov21_021D0D80.c | 43 ++--- src/overlay021/ov21_021D4C0C.c | 24 +-- src/overlay021/ov21_021D5AEC.c | 21 ++- src/overlay021/ov21_021D76B0.c | 11 +- src/overlay021/ov21_021D85B0.c | 87 ++++----- src/overlay021/ov21_021D94BC.c | 97 +++++----- src/overlay021/ov21_021DC9BC.c | 5 +- src/overlay021/ov21_021DE668.c | 13 +- src/overlay021/ov21_021DF734.c | 193 ++++++++----------- src/overlay021/ov21_021E0C68.c | 33 ++-- src/overlay021/ov21_021E1924.c | 5 +- src/overlay021/ov21_021E29DC.c | 3 +- src/overlay021/ov21_021E4CA4.c | 5 +- src/overlay021/ov21_021E68F4.c | 5 +- src/overlay021/ov21_021E737C.c | 19 +- src/overlay021/ov21_021E8484.c | 3 +- src/overlay021/ov21_021E8D48.c | 7 +- src/overlay021/pokedex_height_check.c | 61 +++--- src/overlay021/pokedex_sort.c | 79 +++----- 23 files changed, 472 insertions(+), 526 deletions(-) diff --git a/include/overlay021/ov21_021D0D80.h b/include/overlay021/ov21_021D0D80.h index 42b8a2b106..d455329291 100644 --- a/include/overlay021/ov21_021D0D80.h +++ b/include/overlay021/ov21_021D0D80.h @@ -70,6 +70,6 @@ u32 ov21_021D1B94(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 u32 ov21_021D1BD8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6); u32 ov21_021D1C30(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6); u32 ov21_021D1C88(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6); -Strbuf *ov21_021D1CE0(int param0, int param1); +Strbuf *GetPokedexMessage(int entryID, int heapID); #endif // POKEPLATINUM_OV21_021D0D80_H diff --git a/include/overlay021/ov21_021D4C0C.h b/include/overlay021/ov21_021D4C0C.h index 092a00839c..d2e4ce00cc 100644 --- a/include/overlay021/ov21_021D4C0C.h +++ b/include/overlay021/ov21_021D4C0C.h @@ -17,7 +17,7 @@ void ov21_021D4D1C(UnkStruct_ov21_021D4CA0 *param0); void ov21_021D4D3C(UnkStruct_ov21_021D4C0C *param0); Window *ov21_021D4D6C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2); void ov21_021D4DA0(Window *param0); -u32 ov21_021D4DAC(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u32 param3, int param4, int param5); +u32 DisplayMessage(UnkStruct_ov21_021D4C0C *param0, Window *window, u32 bankID, u32 entryID, int xOffset, int yOffset); void ov21_021D4E10(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u32 param3); void ov21_021D4E80(UnkStruct_ov21_021D4C0C *param0, Window *param1, Strbuf *param2, int param3, int param4); diff --git a/include/overlay021/pokedex_sort.h b/include/overlay021/pokedex_sort.h index c9bbc45ef3..31209331b7 100644 --- a/include/overlay021/pokedex_sort.h +++ b/include/overlay021/pokedex_sort.h @@ -70,18 +70,18 @@ enum FilterForm { // called form in game, but refers to body shape void PokedexSort_PopulatePokedexStatus(UnkStruct_ov21_021D3320 *param0, UnkStruct_ov21_021D3208 *param1, int heapID); void PokedexSort_PokedexStatusFreeHWData(UnkStruct_ov21_021D3320 *param0); -u32 ov21_021D334C(const UnkStruct_ov21_021D3320 *param0, int param1, int param2); -u32 ov21_021D335C(const UnkStruct_ov21_021D3320 *param0, int param1); -u32 ov21_021D3374(const UnkStruct_ov21_021D3320 *param0, int param1); -u32 ov21_021D338C(const UnkStruct_ov21_021D3320 *param0, int param1); -u32 ov21_021D33A4(const UnkStruct_ov21_021D3320 *param0, int param1); -u32 ov21_021D33BC(const UnkStruct_ov21_021D3320 *param0, int param1); -u32 ov21_021D33D4(const UnkStruct_ov21_021D3320 *param0, u32 param1); -u32 ov21_021D33E0(const UnkStruct_ov21_021D3320 *param0, int param1); -u32 ov21_021D33F8(const UnkStruct_ov21_021D3320 *param0); -u32 ov21_021D3404(const UnkStruct_ov21_021D3320 *param0, int param1); -u32 ov21_021D3410(const UnkStruct_ov21_021D3320 *param0, u32 param1, int param2); -u32 ov21_021D341C(const UnkStruct_ov21_021D3320 *param0, u32 param1); +u32 PokedexSort_Gender(const UnkStruct_ov21_021D3320 *param0, int species, int formIndex); +u32 PokedexSort_UnownForm(const UnkStruct_ov21_021D3320 *param0, int formIndex); +u32 PokedexSort_ShellosForm(const UnkStruct_ov21_021D3320 *param0, int formIndex); +u32 PokedexSort_GastrodonForm(const UnkStruct_ov21_021D3320 *param0, int formIndex); +u32 PokedexSort_BurmyForm(const UnkStruct_ov21_021D3320 *param0, int formIndex); +u32 PokedexSort_WormadamForm(const UnkStruct_ov21_021D3320 *param0, int formIndex); +u32 PokedexSort_DefaultForm(const UnkStruct_ov21_021D3320 *param0, u32 species); +u32 PokedexSort_NumGendersVisible(const UnkStruct_ov21_021D3320 *param0, int species); +u32 PokedexSort_SpindaForm(const UnkStruct_ov21_021D3320 *param0); +u32 PokedexSort_DeoxysForm(const UnkStruct_ov21_021D3320 *param0, int formIndex); +u32 PokedexSort_Form(const UnkStruct_ov21_021D3320 *param0, u32 species, int formIndex); +u32 PokedexSort_NumFormsSeem(const UnkStruct_ov21_021D3320 *param0, u32 species); BOOL PokedexSort_IsNationalUnlocked(const UnkStruct_ov21_021D3320 *param0); void ov21_021D3434(UnkStruct_ov21_021D3320 *param0, u32 param1); u32 ov21_021D3440(const UnkStruct_ov21_021D3320 *param0); diff --git a/res/text/message_bank_pokedex.gmm b/res/text/message_bank_pokedex.gmm index e1120f5123..6e4e5fa3c7 100644 --- a/res/text/message_bank_pokedex.gmm +++ b/res/text/message_bank_pokedex.gmm @@ -1,531 +1,531 @@ - + used SEEN - + used OBTAINED - + garbage XXXXXXXX - + garbage XXXXXXXXX - + garbage XXXXXXXXX - + used SWITCH\nPOKéDEX - + garbage XXXXXXXXXX - + used SEARCH\nPOKéMON - + garbage XXXX - + used HT - + used WT - + used ft. - + used lbs. - + used Male - + used Female - + used West sea - + used East sea - + used Plant cloak - + used Sandy cloak - + used Trash cloak - + used One form - + garbage - + used English Pokédex - + used French Pokédex - + used German Pokédex - + used Italian Pokédex - + used Spanish Pokédex - + used Pokémon - + garbage XXX - + used CHECK\nPOKéDEX - + garbage XXX - + garbage XXXX - + garbage XXXX - + used NEXT - + used BACK - + used Area Unknown - + used Morning - + used Day - + used Night - + garbage XX - + garbage XXX - + used CHORUS - + used PAN - + used Height Check - + used Weight Check - + used Height Check - + used Weight Check - + used NAME - + used TYPE - + used FORM - + used ORDER - + used OK - + garbage XXX - + used - - + used ABC - + used DEF - + used GHI - + used JKL - + used MNO - + used PQR - + used STU - + used VWX - + used YZ - + garbage - + used Normal - + used Fire - + used Water - + used Electric - + used Grass - + used Ice - + used Fight - + used Poison - + used Ground - + used Flying - + used Psychic - + used Bug - + used Rock - + used Ghost - + used Dragon - + used Dark - + used Steel - + used Numerical - + used A to Z - + used Heaviest - + used Lightest - + used Tallest - + used Smallest - + used List by the first letter\nin the name. - + used List by type. - + used List by body style. - + used Select the Pokédex listing mode. - + garbage XXXXXXXXXXXXXXXXXXXXXX - + garbage XXXXXXXXXXXXXXX - + used No matching Pokémon were found. - + used Searching... - + used 4’8” - + used 4’6” - + used 83.8 lbs. - + used 75.0 lbs. - + used ----- - + used --- - + used See another form. - + used INFO - + used AREA - + used CRY - + used SIZE - + used FORMS - + used QUIT - + used CANCEL - + used RESULTS - + used Pokédex registration completed. - + used Normal Forme - + used Attack Forme - + used Defense Forme - + used Speed Forme - + used Land Forme - + used Sky Forme - + used Altered Forme - + used Origin Forme - + used ROTOM - + used HEAT ROTOM - + used WASH ROTOM - + used FROST ROTOM - + used FAN ROTOM - + used MOW ROTOM - + used Japanese Pokédex - + used - - - - - - + used - - - - diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index c674cf0ada..8e4256c737 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -7,6 +7,7 @@ #include "struct_decls/struct_0209ACBC_decl.h" #include "struct_defs/struct_02099F80.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/funcptr_ov21_021E9B74.h" #include "overlay021/funcptr_ov21_021E9B9C.h" #include "overlay021/ov21_021D1FA4.h" @@ -662,7 +663,7 @@ void ov21_021D1650(Window *param0, int param1, int param2, int param3) v0 = Strbuf_Init(4, param3); Strbuf_FormatInt(v0, param1, 3, 2, 1); } else { - v0 = ov21_021D1CE0(100, param3); + v0 = GetPokedexMessage(pl_msg_pokedex_none, param3); } v1 = PokedexText_NameNumber(param2, GAME_LANGUAGE, param3); @@ -827,10 +828,10 @@ u32 ov21_021D19D8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 u32 v1 = 0; if (param2 == 327) { - v1 = ov21_021D33F8(param1); + v1 = PokedexSort_SpindaForm(param1); } - v0 = ov21_021D334C(param1, param2, param6); + v0 = PokedexSort_Gender(param1, param2, param6); if (v0 != -1) { ov21_021D2188(param0, param2, v0, param3, 0, 0, v1, param4, param5, param7); @@ -843,7 +844,7 @@ u32 ov21_021D1A34(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 { int v0; - v0 = ov21_021D335C(param1, param5); + v0 = PokedexSort_UnownForm(param1, param5); if (v0 != -1) { ov21_021D2188(param0, 201, 2, param2, 0, v0, 0, param3, param4, param6); @@ -856,7 +857,7 @@ u32 ov21_021D1A78(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 { int v0; - v0 = ov21_021D3374(param1, param5); + v0 = PokedexSort_ShellosForm(param1, param5); if (v0 != -1) { ov21_021D2188(param0, 422, 0, param2, 0, v0, 0, param3, param4, param6); @@ -869,7 +870,7 @@ u32 ov21_021D1AC0(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 { int v0; - v0 = ov21_021D338C(param1, param5); + v0 = PokedexSort_GastrodonForm(param1, param5); if (v0 != -1) { ov21_021D2188(param0, 423, 0, param2, 0, v0, 0, param3, param4, param6); @@ -882,7 +883,7 @@ u32 ov21_021D1B08(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 { int v0; - v0 = ov21_021D33A4(param1, param5); + v0 = PokedexSort_BurmyForm(param1, param5); if (v0 != -1) { ov21_021D2188(param0, 412, 0, param2, 0, v0, 0, param3, param4, param6); @@ -895,7 +896,7 @@ u32 ov21_021D1B4C(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 { int v0; - v0 = ov21_021D33BC(param1, param5); + v0 = PokedexSort_WormadamForm(param1, param5); if (v0 != -1) { ov21_021D2188(param0, 413, 1, param2, 0, v0, 0, param3, param4, param6); @@ -908,7 +909,7 @@ u32 ov21_021D1B94(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 { int v0; - v0 = ov21_021D3404(param1, param5); + v0 = PokedexSort_DeoxysForm(param1, param5); if (v0 != 15) { ov21_021D2188(param0, 386, 1, param2, 0, v0, 0, param3, param4, param6); @@ -922,10 +923,10 @@ u32 ov21_021D1BD8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 int v0; int v1; - v1 = ov21_021D341C(param1, 492); + v1 = PokedexSort_NumFormsSeem(param1, 492); if (v1 > param5) { - v0 = ov21_021D3410(param1, 492, param5); + v0 = PokedexSort_Form(param1, 492, param5); ov21_021D2188(param0, 492, 1, param2, 0, v0, 0, param3, param4, param6); } else { v0 = -1; @@ -939,10 +940,10 @@ u32 ov21_021D1C30(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 int v0; int v1; - v1 = ov21_021D341C(param1, 487); + v1 = PokedexSort_NumFormsSeem(param1, 487); if (v1 > param5) { - v0 = ov21_021D3410(param1, 487, param5); + v0 = PokedexSort_Form(param1, 487, param5); ov21_021D2188(param0, 487, 1, param2, 0, v0, 0, param3, param4, param6); } else { v0 = -1; @@ -956,10 +957,10 @@ u32 ov21_021D1C88(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 int v0; int v1; - v1 = ov21_021D341C(param1, 479); + v1 = PokedexSort_NumFormsSeem(param1, 479); if (v1 > param5) { - v0 = ov21_021D3410(param1, 479, param5); + v0 = PokedexSort_Form(param1, 479, param5); ov21_021D2188(param0, 479, 1, param2, 0, v0, 0, param3, param4, param6); } else { @@ -969,15 +970,15 @@ u32 ov21_021D1C88(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 return v0; } -Strbuf *ov21_021D1CE0(int param0, int heapID) +Strbuf *GetPokedexMessage(int entryID, int heapID) { - Strbuf *v0; - MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); + Strbuf *pokedexMessage; + MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); - v0 = MessageLoader_GetNewStrbuf(pokedexTextBank, param0); - MessageLoader_Free(pokedexTextBank); + pokedexMessage = MessageLoader_GetNewStrbuf(pokedexMessageBank, entryID); + MessageLoader_Free(pokedexMessageBank); - return v0; + return pokedexMessage; } static void ov21_021D1D08(UnkStruct_ov21_021D0F60 *param0) diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c index 56fcc40a6a..79487c4979 100644 --- a/src/overlay021/ov21_021D4C0C.c +++ b/src/overlay021/ov21_021D4C0C.c @@ -140,23 +140,23 @@ void ov21_021D4DA0(Window *param0) Windows_Delete(param0, 1); } -u32 ov21_021D4DAC(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u32 param3, int param4, int param5) +u32 DisplayMessage(UnkStruct_ov21_021D4C0C *param0, Window *window, u32 bankID, u32 entryID, int xOffset, int yOffset) { - MessageLoader *v0; - Strbuf *v1; - u32 v2; + MessageLoader *messageLoader; + Strbuf *strbuf; + u32 strWidth; - v0 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, param2, param0->unk_14); - GF_ASSERT(v0); + messageLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, bankID, param0->unk_14); + GF_ASSERT(messageLoader); - v1 = MessageLoader_GetNewStrbuf(v0, param3); - Text_AddPrinterWithParamsAndColor(param1, FONT_SUBSCREEN, v1, param4, param5, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL); - v2 = Font_CalcStrbufWidth(FONT_SUBSCREEN, v1, 0); + strbuf = MessageLoader_GetNewStrbuf(messageLoader, entryID); + Text_AddPrinterWithParamsAndColor(window, FONT_SUBSCREEN, strbuf, xOffset, yOffset, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL); + strWidth = Font_CalcStrbufWidth(FONT_SUBSCREEN, strbuf, 0); - Strbuf_Free(v1); - MessageLoader_Free(v0); + Strbuf_Free(strbuf); + MessageLoader_Free(messageLoader); - return v2; + return strWidth; } void ov21_021D4E10(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u32 param3) diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c index c538b24666..021f2daf51 100644 --- a/src/overlay021/ov21_021D5AEC.c +++ b/src/overlay021/ov21_021D5AEC.c @@ -5,6 +5,7 @@ #include "struct_decls/sprite_decl.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" #include "overlay021/ov21_021D4340.h" @@ -736,12 +737,12 @@ static void ov21_021D63C0(UnkStruct_ov21_021D71A8 *param0) static void ov21_021D63DC(UnkStruct_ov21_021D13FC *param0, int heapID, int param2, int param3) { Strbuf *v0 = Strbuf_Init(32, heapID); - MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); + MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); - MessageLoader_GetStrbuf(pokedexTextBank, 0, v0); + MessageLoader_GetStrbuf(pokedexMessageBank, pl_msg_pokedex_seen, v0); Text_AddPrinterWithParamsAndColor(¶m0->unk_04, FONT_SYSTEM, v0, 8, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); - MessageLoader_GetStrbuf(pokedexTextBank, 1, v0); + MessageLoader_GetStrbuf(pokedexMessageBank, pl_msg_pokedex_obtained, v0); Text_AddPrinterWithParamsAndColor(¶m0->unk_04, FONT_SYSTEM, v0, 128, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); Strbuf_FormatInt(v0, param2, 3, 2, 1); @@ -751,21 +752,21 @@ static void ov21_021D63DC(UnkStruct_ov21_021D13FC *param0, int heapID, int param Text_AddPrinterWithParamsAndColor(¶m0->unk_04, FONT_SYSTEM, v0, 180, 170, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); Strbuf_Free(v0); - MessageLoader_Free(pokedexTextBank); + MessageLoader_Free(pokedexMessageBank); Bg_ScheduleTilemapTransfer(param0->unk_00, 1); } static void ov21_021D64B0(UnkStruct_ov21_021D13FC *param0, int heapID, int param2) { Strbuf *v0 = Strbuf_Init(32, heapID); - MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); + MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); - MessageLoader_GetStrbuf(pokedexTextBank, 109, v0); + MessageLoader_GetStrbuf(pokedexMessageBank, pl_msg_pokedex_results, v0); Text_AddPrinterWithParamsAndColor(¶m0->unk_04, FONT_SYSTEM, v0, 8, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); Strbuf_FormatInt(v0, param2, 3, 2, 1); Text_AddPrinterWithParamsAndColor(¶m0->unk_04, FONT_SYSTEM, v0, 48, 170, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); Strbuf_Free(v0); - MessageLoader_Free(pokedexTextBank); + MessageLoader_Free(pokedexMessageBank); Bg_ScheduleTilemapTransfer(param0->unk_00, 1); } @@ -1288,7 +1289,7 @@ static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13 UnkStruct_ov21_021D4CB8 v0; Window *v1; Strbuf *v2 = Strbuf_Init(32, heapID); - MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); + MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); v0.unk_00 = param1->unk_14C; v0.unk_08 = param0->unk_90.paletteProxy; @@ -1304,7 +1305,7 @@ static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13 Strbuf_FormatInt(v2, param4, 3, 2, 1); Text_AddPrinterWithParamsAndColor(v1, FONT_SUBSCREEN, v2, 22, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL); - MessageLoader_GetStrbuf(pokedexTextBank, 99, v2); + MessageLoader_GetStrbuf(pokedexMessageBank, pl_msg_pokedex_noname, v2); Text_AddPrinterWithParamsAndColor(v1, FONT_SUBSCREEN, v2, 49, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL); if (param0->unk_28[param3]) { @@ -1317,7 +1318,7 @@ static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13 ov21_021D4DA0(v1); Strbuf_Free(v2); - MessageLoader_Free(pokedexTextBank); + MessageLoader_Free(pokedexMessageBank); } static void ov21_021D6ED0(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1) diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c index 61bd4706e6..754cecdebc 100644 --- a/src/overlay021/ov21_021D76B0.c +++ b/src/overlay021/ov21_021D76B0.c @@ -5,6 +5,7 @@ #include "struct_decls/struct_02023FCC_decl.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" #include "overlay021/ov21_021D4340.h" @@ -692,7 +693,7 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(v3->unk_14C, 10, 4); - ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 7, 0, 0); + DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_search, 0, 0); v1.unk_04 = v0; v1.unk_0C = param0->unk_00[0]; @@ -706,7 +707,7 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 ov21_021D4DA0(v0); v0 = ov21_021D4D6C(v3->unk_14C, 10, 4); - ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 5, 0, 0); + DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_switch, 0, 0); v1.unk_04 = v0; v1.unk_0C = param0->unk_00[1]; @@ -720,7 +721,7 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 ov21_021D4DA0(v0); v0 = ov21_021D4D6C(v3->unk_14C, 10, 4); - ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 29, 0, 0); + DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_check, 0, 0); v1.unk_04 = v0; v1.unk_0C = param0->unk_00[2]; @@ -732,9 +733,9 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 v0 = ov21_021D4D6C(v3->unk_14C, 14, 2); if (param2->unk_1C->unk_04->unk_1740 == 0) { - ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 107, 0, 0); + DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_quit, 0, 0); } else { - ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 108, 0, 0); + DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_cancel, 0, 0); } v1.unk_04 = v0; diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c index 568359823c..4f1f92f422 100644 --- a/src/overlay021/ov21_021D85B0.c +++ b/src/overlay021/ov21_021D85B0.c @@ -5,6 +5,7 @@ #include "struct_decls/sprite_decl.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" #include "overlay021/ov21_021D4340.h" @@ -679,28 +680,28 @@ static void ov21_021D8DD4(UnkStruct_ov21_021D879C *param0, int param1, int param { UnkStruct_ov21_021D13FC *v0 = param0->unk_00; Strbuf *v1; - int v2; + int entryID; Window_FillRectWithColor(&v0->unk_04, 0, 24, 8, 208, 32); switch (param1) { case 0: - v2 = 90; + entryID = pl_msg_pokedex_listing_description; break; case 1: - v2 = 87; + entryID = pl_msg_pokedex_alphabetical_description; break; case 2: - v2 = 88; + entryID = pl_msg_pokedex_type_description; break; case 3: - v2 = 89; + entryID = pl_msg_pokedex_body_description; break; default: break; } - v1 = ov21_021D1CE0(v2, param2); + v1 = GetPokedexMessage(entryID, param2); { u32 v3 = 24 + (208 - Font_CalcMaxLineWidth(FONT_SYSTEM, v1, 0)) / 2; @@ -718,7 +719,7 @@ static void ov21_021D8E68(UnkStruct_ov21_021D879C *param0, int param1) Window_FillRectWithColor(&v0->unk_04, 0, 24, 8, 208, 32); - v1 = ov21_021D1CE0(93, param1); + v1 = GetPokedexMessage(pl_msg_pokedex_nonefound, param1); { u32 v2 = 24 + (208 - Font_CalcMaxLineWidth(FONT_SYSTEM, v1, 0)) / 2; @@ -825,12 +826,12 @@ static void ov21_021D9054(UnkStruct_ov21_021D879C *param0, int param1, int param { UnkStruct_ov21_021D13FC *v0 = param0->unk_00; Strbuf *v1; - int v2; + int entryID; Window_FillRectWithColor(&v0->unk_04, 0, 88, 52, 80, 16); - v2 = 81 + param1; - v1 = ov21_021D1CE0(v2, param2); + entryID = pl_msg_pokedex_numerical + param1; + v1 = GetPokedexMessage(entryID, param2); { u32 v3 = 88 + Font_CalcCenterAlignment(FONT_SYSTEM, v1, 0, 80); @@ -844,45 +845,45 @@ static void ov21_021D90B4(UnkStruct_ov21_021D879C *param0, int param1, int param { UnkStruct_ov21_021D13FC *v0 = param0->unk_00; Strbuf *v1; - int v2; + int entryID; int v3; Window_FillRectWithColor(&v0->unk_04, 0, 88, 77, 80, 16); switch (param1) { case 0: - v2 = 126; + entryID = pl_msg_pokedex_nonealphabetical; break; case 1: - v2 = 54; + entryID = pl_msg_pokedex_abc; break; case 2: - v2 = 55; + entryID = pl_msg_pokedex_def; break; case 3: - v2 = 56; + entryID = pl_msg_pokedex_ghi; break; case 4: - v2 = 57; + entryID = pl_msg_pokedex_jkl; break; case 5: - v2 = 58; + entryID = pl_msg_pokedex_mno; break; case 6: - v2 = 59; + entryID = pl_msg_pokedex_pqr; break; case 7: - v2 = 60; + entryID = pl_msg_pokedex_stu; break; case 8: - v2 = 61; + entryID = pl_msg_pokedex_vwx; break; case 9: - v2 = 62; + entryID = pl_msg_pokedex_yz; break; } - v1 = ov21_021D1CE0(v2, param2); + v1 = GetPokedexMessage(entryID, param2); { u32 v4 = 88 + Font_CalcCenterAlignment(FONT_SYSTEM, v1, 0, 80); @@ -896,69 +897,69 @@ static void ov21_021D915C(UnkStruct_ov21_021D879C *param0, int param1, int param { UnkStruct_ov21_021D13FC *v0 = param0->unk_00; Strbuf *v1; - int v2; + int entryID; int v3; Window_FillRectWithColor(&v0->unk_04, 0, 88, param3, 80, 16); switch (param1) { case 0: - v2 = 53; + entryID = pl_msg_pokedex_dash; break; case 1: - v2 = 64; + entryID = pl_msg_pokedex_normal; break; case 2: - v2 = 70; + entryID = pl_msg_pokedex_fight; break; case 3: - v2 = 73; + entryID = pl_msg_pokedex_flying; break; case 4: - v2 = 71; + entryID = pl_msg_pokedex_poison; break; case 5: - v2 = 72; + entryID = pl_msg_pokedex_ground; break; case 6: - v2 = 76; + entryID = pl_msg_pokedex_rock; break; case 7: - v2 = 75; + entryID = pl_msg_pokedex_bug; break; case 8: - v2 = 77; + entryID = pl_msg_pokedex_ghost; break; case 9: - v2 = 80; + entryID = pl_msg_pokedex_steel; break; case 10: - v2 = 65; + entryID = pl_msg_pokedex_fire; break; case 11: - v2 = 66; + entryID = pl_msg_pokedex_water; break; case 12: - v2 = 68; + entryID = pl_msg_pokedex_grass; break; case 13: - v2 = 67; + entryID = pl_msg_pokedex_electric; break; case 14: - v2 = 74; + entryID = pl_msg_pokedex_psychic; break; case 15: - v2 = 69; + entryID = pl_msg_pokedex_ice; break; case 16: - v2 = 78; + entryID = pl_msg_pokedex_dragon; break; case 17: - v2 = 79; + entryID = pl_msg_pokedex_dark; break; } - v1 = ov21_021D1CE0(v2, param2); + v1 = GetPokedexMessage(entryID, param2); { u32 v4 = 88 + Font_CalcCenterAlignment(FONT_SYSTEM, v1, 0, 80); @@ -1078,7 +1079,7 @@ static void ov21_021D93F4(UnkStruct_ov21_021D879C *param0, int param1) Window_FillTilemap(¶m0->unk_00->unk_04, 0); - v1 = ov21_021D1CE0(94, param1); + v1 = GetPokedexMessage(pl_msg_pokedex_searching, param1); { u32 v3 = (256 - Font_CalcMaxLineWidth(FONT_SYSTEM, v1, 0)) / 2; diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c index 1a6b5535a9..9b1f30ac5f 100644 --- a/src/overlay021/ov21_021D94BC.c +++ b/src/overlay021/ov21_021D94BC.c @@ -5,6 +5,7 @@ #include "struct_decls/struct_02023FCC_decl.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" #include "overlay021/ov21_021D4C0C.h" @@ -2752,7 +2753,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C v1 = sub_0201FAB4(param1->unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(param2, 8, 2); - v2 = ov21_021D4DAC(param2, v0, message_bank_pokedex, 50, 0, 0); + v2 = DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_order, 0, 0); param1->unk_04 = v0; param1->unk_0C = param0->unk_00[1]; @@ -2764,7 +2765,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C ov21_021D4DA0(v0); v0 = ov21_021D4D6C(param2, 8, 2); - v2 = ov21_021D4DAC(param2, v0, message_bank_pokedex, 47, 0, 0); + v2 = DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_name, 0, 0); param1->unk_04 = v0; param1->unk_0C = param0->unk_00[2]; @@ -2776,7 +2777,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C ov21_021D4DA0(v0); v0 = ov21_021D4D6C(param2, 8, 2); - v2 = ov21_021D4DAC(param2, v0, message_bank_pokedex, 48, 0, 0); + v2 = DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_type, 0, 0); param1->unk_04 = v0; param1->unk_0C = param0->unk_00[3]; @@ -2788,7 +2789,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C ov21_021D4DA0(v0); v0 = ov21_021D4D6C(param2, 8, 2); - v2 = ov21_021D4DAC(param2, v0, message_bank_pokedex, 49, 0, 0); + v2 = DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_form, 0, 0); param1->unk_04 = v0; param1->unk_0C = param0->unk_00[4]; @@ -2800,7 +2801,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C ov21_021D4DA0(v0); v0 = ov21_021D4D6C(param2, 8, 2); - v2 = ov21_021D4DAC(param2, v0, message_bank_pokedex, 51, 0, 0); + v2 = DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_ok, 0, 0); param1->unk_04 = v0; param1->unk_0C = param0->unk_00[5]; @@ -2840,7 +2841,7 @@ static void ov21_021DC088(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C Window *v0; int v1; int v2; - int v3; + int entryID; u32 v4; v1 = sub_0201FAB4(param1->unk_08, NNS_G2D_VRAM_TYPE_2DSUB); @@ -2850,26 +2851,26 @@ static void ov21_021DC088(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C switch (v2) { case 0: - v3 = 81; + entryID = pl_msg_pokedex_numerical; break; case 1: - v3 = 82; + entryID = pl_msg_pokedex_alphabetical; break; case 2: - v3 = 83; + entryID = pl_msg_pokedex_heaviest; break; case 3: - v3 = 84; + entryID = pl_msg_pokedex_lightest; break; case 4: - v3 = 85; + entryID = pl_msg_pokedex_tallest; break; case 5: - v3 = 86; + entryID = pl_msg_pokedex_smallest; break; } - v4 = ov21_021D4DAC(param2, v0, message_bank_pokedex, v3, 0, 0); + v4 = DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0); param1->unk_10 = -v4 / 2; param1->unk_04 = v0; @@ -2887,7 +2888,7 @@ static void ov21_021DC12C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C Window *v0; int v1; int v2, v3; - int v4; + int entryID; u32 v5; v1 = sub_0201FAB4(param1->unk_08, NNS_G2D_VRAM_TYPE_2DSUB); @@ -2897,38 +2898,38 @@ static void ov21_021DC12C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C switch (v2) { case 0: - v4 = 54; + entryID = pl_msg_pokedex_abc; break; case 1: - v4 = 55; + entryID = pl_msg_pokedex_def; break; case 2: - v4 = 56; + entryID = pl_msg_pokedex_ghi; break; case 3: - v4 = 57; + entryID = pl_msg_pokedex_jkl; break; case 4: - v4 = 58; + entryID = pl_msg_pokedex_mno; break; case 5: - v4 = 59; + entryID = pl_msg_pokedex_pqr; break; case 6: - v4 = 60; + entryID = pl_msg_pokedex_stu; break; case 7: - v4 = 61; + entryID = pl_msg_pokedex_vwx; break; case 8: - v4 = 62; + entryID = pl_msg_pokedex_yz; break; case 9: - v4 = 126; + entryID = pl_msg_pokedex_nonealphabetical; break; } - v5 = ov21_021D4DAC(param2, v0, message_bank_pokedex, v4, 0, 0); + v5 = DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0); param1->unk_10 = -v5 / 2; param1->unk_04 = v0; @@ -2946,7 +2947,7 @@ static void ov21_021DC1E8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C Window *v0; int v1; int v2, v3; - int v4; + int entryID; u32 v5; v1 = sub_0201FAB4(param1->unk_08, NNS_G2D_VRAM_TYPE_2DSUB); @@ -2956,38 +2957,38 @@ static void ov21_021DC1E8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C switch (v2) { case 0: - v4 = 64; + entryID = pl_msg_pokedex_normal; break; case 1: - v4 = 70; + entryID = pl_msg_pokedex_fight; break; case 2: - v4 = 73; + entryID = pl_msg_pokedex_flying; break; case 3: - v4 = 71; + entryID = pl_msg_pokedex_poison; break; case 4: - v4 = 72; + entryID = pl_msg_pokedex_ground; break; case 5: - v4 = 76; + entryID = pl_msg_pokedex_rock; break; case 6: - v4 = 75; + entryID = pl_msg_pokedex_bug; break; case 7: - v4 = 77; + entryID = pl_msg_pokedex_ghost; break; case 8: - v4 = 80; + entryID = pl_msg_pokedex_steel; break; case 9: - v4 = 127; + entryID = pl_msg_pokedex_nonetype; break; } - v5 = ov21_021D4DAC(param2, v0, message_bank_pokedex, v4, 0, 0); + v5 = DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0); param1->unk_10 = -v5 / 2; param1->unk_04 = v0; @@ -3005,7 +3006,7 @@ static void ov21_021DC2A4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C Window *v0; int v1; int v2, v3; - int v4; + int entryID; u32 v5; v1 = sub_0201FAB4(param1->unk_08, NNS_G2D_VRAM_TYPE_2DSUB); @@ -3015,35 +3016,35 @@ static void ov21_021DC2A4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C switch (v2) { case 0: - v4 = 65; + entryID = pl_msg_pokedex_fire; break; case 1: - v4 = 66; + entryID = pl_msg_pokedex_water; break; case 2: - v4 = 68; + entryID = pl_msg_pokedex_grass; break; case 3: - v4 = 67; + entryID = pl_msg_pokedex_electric; break; case 4: - v4 = 74; + entryID = pl_msg_pokedex_psychic; break; case 5: - v4 = 69; + entryID = pl_msg_pokedex_ice; break; case 6: - v4 = 78; + entryID = pl_msg_pokedex_dragon; break; case 7: - v4 = 79; + entryID = pl_msg_pokedex_dark; break; case 8: - v4 = 127; + entryID = pl_msg_pokedex_nonetype; break; } - v5 = ov21_021D4DAC(param2, v0, message_bank_pokedex, v4, 0, 0); + v5 = DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0); param1->unk_10 = -v5 / 2; param1->unk_04 = v0; diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c index bd672f460f..9e5e3bf128 100644 --- a/src/overlay021/ov21_021DC9BC.c +++ b/src/overlay021/ov21_021DC9BC.c @@ -5,6 +5,7 @@ #include "struct_decls/sprite_decl.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" #include "overlay021/ov21_021D4C0C.h" @@ -654,7 +655,7 @@ static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DMAIN); v0 = ov21_021D4D6C(v3->unk_14C, 16, 2); - v6 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 35, 0, 0); + v6 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_areaunknown, 0, 0); v1.unk_04 = v0; v1.unk_0C = mapDisplay->AreaUnknownCellActor; @@ -668,7 +669,7 @@ static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 for (v5 = 0; v5 < 3; v5++) { v0 = ov21_021D4D6C(v3->unk_14C, 9, 2); - v6 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 36 + v5, 0, 0); + v6 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_morning + v5, 0, 0); v1.unk_04 = v0; v1.unk_0C = NULL; diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c index ce9e60e05e..cce72d3894 100644 --- a/src/overlay021/ov21_021DE668.c +++ b/src/overlay021/ov21_021DE668.c @@ -5,6 +5,7 @@ #include "struct_decls/sprite_decl.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1F90.h" #include "overlay021/ov21_021D1FA4.h" @@ -427,15 +428,15 @@ static void ov21_021DEB58(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_ void ov21_021DEB8C(Window *param0, int param1, int heapID, int param3, u32 param4) { Strbuf *v0 = Strbuf_Init(64, heapID); - MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); + MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); - MessageLoader_GetStrbuf(pokedexTextBank, 9, v0); + MessageLoader_GetStrbuf(pokedexMessageBank, pl_msg_pokedex_ht, v0); Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v0, 152, 88, TEXT_SPEED_INSTANT, param4, NULL); - MessageLoader_GetStrbuf(pokedexTextBank, 10, v0); + MessageLoader_GetStrbuf(pokedexMessageBank, pl_msg_pokedex_wt, v0); Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v0, 152, 104, TEXT_SPEED_INSTANT, param4, NULL); Strbuf_Free(v0); - MessageLoader_Free(pokedexTextBank); + MessageLoader_Free(pokedexMessageBank); ov21_021DEC2C(param0, heapID, param1, param4); ov21_021DEC80(param0, heapID, param1, param4); @@ -481,7 +482,7 @@ static void ov21_021DECD4(Window *param0, int param1, int param2, int param3, u3 static void ov21_021DED24(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, int param3) { int species = PokedexSort_CurrentSpecies(param2->unk_04); - int v1 = ov21_021D33D4(param2->unk_04, species); + int v1 = PokedexSort_DefaultForm(param2->unk_04, species); if ((species == 487) && (v1 > 0)) { species = 11; @@ -629,7 +630,7 @@ static void ov21_021DF098(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE7 UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int species = PokedexSort_CurrentSpecies(param2->unk_04); int v4, v5; - int v6 = ov21_021D33D4(param2->unk_04, species); + int v6 = PokedexSort_DefaultForm(param2->unk_04, species); v4 = PokemonPersonalData_GetFormValue(species, v6, 6); v5 = PokemonPersonalData_GetFormValue(species, v6, 7); diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c index ea2f85fc1b..de4844f749 100644 --- a/src/overlay021/ov21_021DF734.c +++ b/src/overlay021/ov21_021DF734.c @@ -3,6 +3,7 @@ #include #include +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" #include "overlay021/ov21_021D4C0C.h" @@ -110,21 +111,21 @@ static void ov21_021E0B24(int param0, int *param1, int *param2); static void ov21_021DFD00(UnkStruct_ov21_021DF858 *param0); static void ov21_021E08D0(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5); static void ov21_021E0944(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5); -static void ov21_021E09A4(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5, int param6, int param7); -static int ov21_021E0A4C(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); -static int ov21_021E0A8C(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); -static int ov21_021E0A90(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); -static int ov21_021E0A94(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); -static int ov21_021E0A98(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); -static int ov21_021E0AA8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); -static int ov21_021E0AB8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); -static int ov21_021E0AC8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); -static int ov21_021E0AD8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); -static int ov21_021E0ADC(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); -static int ov21_021E0AEC(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); -static int ov21_021E0AFC(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); -static int ov21_021E0B10(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); -static int ov21_021E0B64(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2, int param3); +static void ov21_021E09A4(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int formIndex, int param6, int param7); +static int SpeciesGenderMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex); +static int SpeciesMaleMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex); +static int SpeciesFemaleMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex); +static int BlankMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex); +static int BurmyFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex); +static int WormadamFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex); +static int ShellosFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex); +static int GastrodonFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex); +static int ov21_021E0AD8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex); +static int DeoxysFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex); +static int ShayminFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex); +static int GiratinaFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex); +static int RotomFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex); +static int FormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2, int formIndex); static void ov21_021E0BF8(UnkStruct_ov21_021DFFF8 *param0); static void ov21_021E0C10(UnkStruct_ov21_021DFFF8 *param0); static void ov21_021E0C30(UnkStruct_ov21_021DFFF8 *param0); @@ -784,12 +785,12 @@ static int ov21_021E0268(int param0, const UnkStruct_ov21_021DF844 *param1) case 492: case 487: case 479: - return ov21_021D341C(param1->unk_04, param0); + return PokedexSort_NumFormsSeem(param1->unk_04, param0); default: break; } - return ov21_021D33E0(param1->unk_04, param0); + return PokedexSort_NumGendersVisible(param1->unk_04, param0); } static int ov21_021E02F0(int param0, const UnkStruct_ov21_021DF844 *param1) @@ -811,10 +812,10 @@ static int ov21_021E02F0(int param0, const UnkStruct_ov21_021DF844 *param1) return 3; } - v1 = ov21_021D33E0(param1->unk_04, param0); + v1 = PokedexSort_NumGendersVisible(param1->unk_04, param0); if (v1 == 1) { - v0 = ov21_021D334C(param1->unk_04, param0, 0); + v0 = PokedexSort_Gender(param1->unk_04, param0, 0); GF_ASSERT(v0 != -1); if (v0 == 0) { @@ -1050,17 +1051,17 @@ static void ov21_021E0944(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF8 ov21_021E09A4(param0, param1, param2, param3, param4, v0, v1, v2); } -static void ov21_021E09A4(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5, int param6, int param7) +static void ov21_021E09A4(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int formIndex, int param6, int param7) { Window *v0; UnkStruct_ov21_021D4CB8 v1; UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3; - int v4; + int entryID; GF_ASSERT(param0->unk_00[param6]); - v4 = ov21_021E0B64(param1, param2, param4, param5); + entryID = FormMessage(param1, param2, param4, formIndex); v1.unk_00 = v2->unk_14C; v1.unk_08 = sub_0200A72C(param0->unk_10[1], NULL); @@ -1074,7 +1075,7 @@ static void ov21_021E09A4(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF8 v3 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DMAIN); v0 = ov21_021D4D6C(v2->unk_14C, 16, 2); - ov21_021D4E10(v2->unk_14C, v0, message_bank_pokedex, v4); + ov21_021D4E10(v2->unk_14C, v0, message_bank_pokedex, entryID); v1.unk_04 = v0; v1.unk_0C = param0->unk_00[param6]; @@ -1085,131 +1086,87 @@ static void ov21_021E09A4(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF8 ov21_021D4DA0(v0); } -static int ov21_021E0A4C(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) +static int SpeciesGenderMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex) { - int v0; - int v1; + int entryID; int species = PokedexSort_CurrentSpecies(param1->unk_04); - v1 = ov21_021D334C(param1->unk_04, species, param2); - GF_ASSERT(v1 != -1); + int gender = PokedexSort_Gender(param1->unk_04, species, formIndex); + GF_ASSERT(gender != -1); - switch (v1) { - case 0: - v0 = 13; + switch (gender) { + case GENDER_MALE: + entryID = pl_msg_pokedex_male; break; - case 1: - v0 = 14; + case GENDER_FEMALE: + entryID = pl_msg_pokedex_female; break; default: - GF_ASSERT(0); + GF_ASSERT(FALSE); break; } - return v0; + return entryID; } -static int ov21_021E0A8C(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) +static int SpeciesMaleMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex) { - int v0; - - v0 = 13; - return v0; + return pl_msg_pokedex_male; } -static int ov21_021E0A90(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) +static int SpeciesFemaleMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex) { - int v0; - - v0 = 14; - return v0; + return pl_msg_pokedex_female; } -static int ov21_021E0A94(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) +static int BlankMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex) { - int v0 = 21; - - return v0; + return pl_msg_pokedex_blank; } -static int ov21_021E0A98(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) +static int BurmyFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex) { - int v0; - int v1 = ov21_021D33A4(param1->unk_04, param2); - - v0 = 17 + v1; - return v0; + return pl_msg_pokedex_plantcloak + PokedexSort_BurmyForm(param1->unk_04, formIndex); } -static int ov21_021E0AA8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) +static int WormadamFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex) { - int v0; - int v1 = ov21_021D33BC(param1->unk_04, param2); - - v0 = 17 + v1; - - return v0; + return pl_msg_pokedex_plantcloak + PokedexSort_WormadamForm(param1->unk_04, formIndex); } -static int ov21_021E0AB8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) +static int ShellosFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex) { - int v0; - int v1 = ov21_021D3374(param1->unk_04, param2); - - v0 = 15 + v1; - - return v0; + return pl_msg_pokedex_westsea + PokedexSort_ShellosForm(param1->unk_04, formIndex); } -static int ov21_021E0AC8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) +static int GastrodonFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex) { - int v0; - int v1 = ov21_021D338C(param1->unk_04, param2); - - v0 = 15 + v1; - return v0; + return pl_msg_pokedex_westsea + PokedexSort_GastrodonForm(param1->unk_04, formIndex); } -static int ov21_021E0AD8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) +static int ov21_021E0AD8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex) { - int v0 = 20; - return v0; + return pl_msg_pokedex_oneform; } -static int ov21_021E0ADC(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) +static int DeoxysFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex) { - int v0; - int v1 = ov21_021D3404(param1->unk_04, param2); - - v0 = 111 + v1; - return v0; + return pl_msg_pokedex_normalforme + PokedexSort_DeoxysForm(param1->unk_04, formIndex); } -static int ov21_021E0AEC(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) +static int ShayminFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex) { - int v0; - int v1 = ov21_021D3410(param1->unk_04, 492, param2); - - v0 = 115 + v1; - return v0; + return pl_msg_pokedex_landforme + PokedexSort_Form(param1->unk_04, SPECIES_SHAYMIN, formIndex); } -static int ov21_021E0AFC(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) +static int GiratinaFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex) { - int v0; - int v1 = ov21_021D3410(param1->unk_04, 487, param2); - - v0 = 117 + v1; - return v0; + return pl_msg_pokedex_alteredforme + PokedexSort_Form(param1->unk_04, SPECIES_GIRATINA, formIndex); } -static int ov21_021E0B10(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) +static int RotomFormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int formIndex) { - int v0; - int v1 = ov21_021D3410(param1->unk_04, 479, param2); - - v0 = 119 + v1; - return v0; + return pl_msg_pokedex_rotom + PokedexSort_Form(param1->unk_04, SPECIES_ROTOM, formIndex); } static inline int inline_ov21_021E00F4(int param0, int param1) @@ -1254,55 +1211,55 @@ static void ov21_021E0B24(int param0, int *param1, int *param2) *param2 = v1; } -static int ov21_021E0B64(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2, int param3) +static int FormMessage(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2, int formIndex) { - int v0; + int entryID; switch (param2) { case 0: - v0 = ov21_021E0A4C(param0, param1, param3); + entryID = SpeciesGenderMessage(param0, param1, formIndex); break; case 1: - v0 = ov21_021E0A8C(param0, param1, param3); + entryID = SpeciesMaleMessage(param0, param1, formIndex); break; case 2: - v0 = ov21_021E0A90(param0, param1, param3); + entryID = SpeciesFemaleMessage(param0, param1, formIndex); break; case 3: - v0 = ov21_021E0A94(param0, param1, param3); + entryID = BlankMessage(param0, param1, formIndex); break; case 6: - v0 = ov21_021E0A98(param0, param1, param3); + entryID = BurmyFormMessage(param0, param1, formIndex); break; case 7: - v0 = ov21_021E0AA8(param0, param1, param3); + entryID = WormadamFormMessage(param0, param1, formIndex); break; case 4: - v0 = ov21_021E0AB8(param0, param1, param3); + entryID = ShellosFormMessage(param0, param1, formIndex); break; case 5: - v0 = ov21_021E0AC8(param0, param1, param3); + entryID = GastrodonFormMessage(param0, param1, formIndex); break; case 8: - v0 = ov21_021E0AD8(param0, param1, param3); + entryID = ov21_021E0AD8(param0, param1, formIndex); break; case 9: - v0 = ov21_021E0ADC(param0, param1, param3); + entryID = DeoxysFormMessage(param0, param1, formIndex); break; case 10: - v0 = ov21_021E0AEC(param0, param1, param3); + entryID = ShayminFormMessage(param0, param1, formIndex); break; case 11: - v0 = ov21_021E0AFC(param0, param1, param3); + entryID = GiratinaFormMessage(param0, param1, formIndex); break; case 12: - v0 = ov21_021E0B10(param0, param1, param3); + entryID = RotomFormMessage(param0, param1, formIndex); break; default: break; } - return v0; + return entryID; } static void ov21_021E0BF8(UnkStruct_ov21_021DFFF8 *param0) diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c index d3bee26bcc..da76043fcb 100644 --- a/src/overlay021/ov21_021E0C68.c +++ b/src/overlay021/ov21_021E0C68.c @@ -5,6 +5,7 @@ #include "struct_decls/sprite_decl.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" #include "overlay021/ov21_021D4C0C.h" @@ -88,7 +89,7 @@ static void ov21_021E0F94(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D static void ov21_021E0FBC(UnkStruct_ov21_021E0D7C *param0, int param1); static void ov21_021E10D0(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1, int param2); static void ov21_021E1188(UnkStruct_ov21_021E0D7C *param0, int param1, int param2, int param3, int param4); -static int ov21_021E185C(int param0); +static int LanguageMessage(int param0); static void ov21_021E18A0(UnkStruct_ov21_021E0D7C *param0, int param1, int param2, int param3); static void ov21_021E18DC(UnkStruct_ov21_021E0D7C *param0, int param1, int param2, int param3); static void ov21_021E136C(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, int param3); @@ -418,9 +419,9 @@ static void ov21_021E0FBC(UnkStruct_ov21_021E0D7C *param0, int param1) static void ov21_021E10D0(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1, int heapID) { Strbuf *v0 = Strbuf_Init(64, heapID); - MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); + MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); int species = PokedexSort_CurrentSpecies(param1->unk_04); - int v3; + int entryID; int v4; if (PokedexSort_CurrentCaughtStatus(param1->unk_04) != 2) { @@ -428,16 +429,16 @@ static void ov21_021E10D0(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_ GF_ASSERT(0); } - v3 = ov21_021E185C(param1->unk_18); + entryID = LanguageMessage(param1->unk_18); - MessageLoader_GetStrbuf(pokedexTextBank, v3, v0); + MessageLoader_GetStrbuf(pokedexMessageBank, entryID, v0); v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v0, 0); v4 /= 2; Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, v0, 176 - v4, 72, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); Strbuf_Free(v0); - MessageLoader_Free(pokedexTextBank); + MessageLoader_Free(pokedexMessageBank); ov21_021E1188(param0, heapID, species, param1->unk_18, param1->unk_1C); ov21_021E18A0(param0, heapID, species, param1->unk_18); @@ -786,35 +787,35 @@ static BOOL ov21_021E1840(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D return v0; } -static int ov21_021E185C(int param0) +static int LanguageMessage(int param0) { - int v0; + int entryID; switch (param0) { case 1: - v0 = 125; + entryID = pl_msg_pokedex_japanese; break; case 2: - v0 = 22; + entryID = pl_msg_pokedex_english; break; case 3: - v0 = 23; + entryID = pl_msg_pokedex_french; break; case 4: - v0 = 25; + entryID = pl_msg_pokedex_italian; break; case 5: - v0 = 24; + entryID = pl_msg_pokedex_german; break; case 7: - v0 = 26; + entryID = pl_msg_pokedex_spanish; break; default: - GF_ASSERT(0); + GF_ASSERT(FALSE); break; } - return v0; + return entryID; } static void ov21_021E18A0(UnkStruct_ov21_021E0D7C *param0, int param1, int param2, int param3) diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c index 87d1e8c7da..04c65997dd 100644 --- a/src/overlay021/ov21_021E1924.c +++ b/src/overlay021/ov21_021E1924.c @@ -5,6 +5,7 @@ #include "struct_decls/struct_02023FCC_decl.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" #include "overlay021/ov21_021D4340.h" @@ -799,7 +800,7 @@ static void ov21_021E2478(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(v3->unk_14C, 8, 4); - ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 33, 0, 0); + DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_next, 0, 0); v1.unk_04 = v0; v1.unk_0C = param0->unk_00[0]; @@ -813,7 +814,7 @@ static void ov21_021E2478(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A v0 = ov21_021D4D6C(v3->unk_14C, 8, 4); { - u32 v6 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 34, 0, 0); + u32 v6 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_back, 0, 0); v1.unk_10 = 32 - v6; } diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c index b98eae6b0b..0c811268ac 100644 --- a/src/overlay021/ov21_021E29DC.c +++ b/src/overlay021/ov21_021E29DC.c @@ -5,6 +5,7 @@ #include "struct_decls/struct_02023FCC_decl.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" #include "overlay021/ov21_021D4340.h" @@ -732,7 +733,7 @@ static void ov21_021E3270(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E32 for (v4 = 0; v4 < 5; v4++) { v0 = ov21_021D4D6C(v2->unk_14C, 8, 2); - ov21_021D4DAC(v2->unk_14C, v0, message_bank_pokedex, 102 + v4, 0, 0); + DisplayMessage(v2->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_info + v4, 0, 0); v1.unk_04 = v0; param1->unk_04[v4] = ov21_021D4CA0(&v1); diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c index ac1df0753e..def907c956 100644 --- a/src/overlay021/ov21_021E4CA4.c +++ b/src/overlay021/ov21_021E4CA4.c @@ -5,6 +5,7 @@ #include "struct_decls/struct_02023FCC_decl.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" #include "overlay021/ov21_021D4C0C.h" @@ -938,7 +939,7 @@ static void ov21_021E58B8(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(v3->unk_14C, 8, 2); - v5 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 41, 0, 0); + v5 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_chorus, 0, 0); v1.unk_10 = 64 - v5 / 2; v1.unk_04 = v0; @@ -948,7 +949,7 @@ static void ov21_021E58B8(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D ov21_021D4DA0(v0); v0 = ov21_021D4D6C(v3->unk_14C, 8, 2); - v5 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 42, 0, 0); + v5 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_pan, 0, 0); v1.unk_10 = 64 - v5 / 2; v1.unk_04 = v0; diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c index c20ae1b1c5..6b7c15dfa8 100644 --- a/src/overlay021/ov21_021E68F4.c +++ b/src/overlay021/ov21_021E68F4.c @@ -5,6 +5,7 @@ #include "struct_decls/struct_02023FCC_decl.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" #include "overlay021/ov21_021D4340.h" @@ -622,7 +623,7 @@ static void ov21_021E70D4(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(v3->unk_14C, 12, 2); - v5 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 45, 0, 0); + v5 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_heightcheck_button, 0, 0); v1.unk_10 = -(v5 / 2); v1.unk_04 = v0; @@ -634,7 +635,7 @@ static void ov21_021E70D4(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A ov21_021D4DA0(v0); v0 = ov21_021D4D6C(v3->unk_14C, 12, 2); - v5 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 46, 0, 0); + v5 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_weightcheck_button, 0, 0); v1.unk_10 = -(v5 / 2); v1.unk_04 = v0; diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c index 3fd05716d4..3e6d659e51 100644 --- a/src/overlay021/ov21_021E737C.c +++ b/src/overlay021/ov21_021E737C.c @@ -7,6 +7,7 @@ #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02015214_decl.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" #include "overlay021/ov21_021E29DC.h" @@ -555,7 +556,7 @@ static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74 NARC *v9; v9 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, param3); - v8 = ov21_021D33D4(param2->unk_00, species); + v8 = PokedexSort_DefaultForm(param2->unk_00, species); v1 = PokeIconSpriteIndex(species, 0, v8); v2 = PokeIconPalettesFileIndex(); v3 = PokeIconCellsFileIndex(); @@ -629,7 +630,7 @@ static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74 short v4; short v5; int species = PokedexSort_CurrentSpecies(param2->unk_00); - int v7 = ov21_021D33D4(param2->unk_00, species); + int v7 = PokedexSort_DefaultForm(param2->unk_00, species); sub_020093B4(&v0, 93 + 7000, 14 + 7000, 91 + 7000, 92 + 7000, 0xffffffff, 0xffffffff, 0, 3, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -705,21 +706,21 @@ static void ov21_021E7CF4(UnkStruct_ov21_021E7714 *param0) static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, int heapID) { Strbuf *v0 = Strbuf_Init(32, heapID); - MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); + MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); - MessageLoader_GetStrbuf(pokedexTextBank, 44, v0); + MessageLoader_GetStrbuf(pokedexMessageBank, pl_msg_pokedex_weightcheck_topscreen, v0); { u32 v2 = Font_CalcCenterAlignment(FONT_SYSTEM, v0, 0, 256); Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, v0, v2, 24, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); } - MessageLoader_GetStrbuf(pokedexTextBank, 10, v0); + MessageLoader_GetStrbuf(pokedexMessageBank, pl_msg_pokedex_wt, v0); Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, v0, 32, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); - MessageLoader_GetStrbuf(pokedexTextBank, 10, v0); + MessageLoader_GetStrbuf(pokedexMessageBank, pl_msg_pokedex_wt, v0); Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, v0, 152, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); Strbuf_Free(v0); - MessageLoader_Free(pokedexTextBank); + MessageLoader_Free(pokedexMessageBank); } static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, int heapID) @@ -747,9 +748,9 @@ static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_ Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, PokedexSort_TrainerName(param1->unk_00), 146, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); if (PokedexSort_TrainerGender(param1->unk_00) == 0) { - MessageLoader_GetStrbuf(v1, 97, v0); + MessageLoader_GetStrbuf(v1, pl_msg_pokedex_lucasweight, v0); } else { - MessageLoader_GetStrbuf(v1, 98, v0); + MessageLoader_GetStrbuf(v1, pl_msg_pokedex_dawnweight, v0); } { diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c index 9f651781e9..14b588c35b 100644 --- a/src/overlay021/ov21_021E8484.c +++ b/src/overlay021/ov21_021E8484.c @@ -5,6 +5,7 @@ #include "struct_decls/struct_02023FCC_decl.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" #include "overlay021/ov21_021D4C0C.h" @@ -586,7 +587,7 @@ static void ov21_021E8B40(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E85 v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(v3->unk_14C, 16, 2); - v5 = ov21_021D4DAC(v3->unk_14C, v0, message_bank_pokedex, 101, 0, 0); + v5 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_anotherform, 0, 0); v1.unk_10 = -(v5 / 2); v1.unk_04 = v0; diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index b87569e8c6..6aca3050c1 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -8,6 +8,7 @@ #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0200C738.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1F90.h" #include "overlay021/ov21_021D1FA4.h" @@ -749,13 +750,13 @@ static void ov21_021E9968(Window *param0, int param1, int param2) static void ov21_021E998C(Window *param0, int heapID) { Strbuf *v0 = Strbuf_Init(64, heapID); - MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); + MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); - MessageLoader_GetStrbuf(pokedexTextBank, 110, v0); + MessageLoader_GetStrbuf(pokedexMessageBank, pl_msg_pokedex_registered, v0); Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v0, 32, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(3, 4, 0), NULL); Strbuf_Free(v0); - MessageLoader_Free(pokedexTextBank); + MessageLoader_Free(pokedexMessageBank); } static Sprite *ov21_021E99E0(UnkStruct_02007768 *param0, Pokemon *param1, int param2, int param3, int param4) diff --git a/src/overlay021/pokedex_height_check.c b/src/overlay021/pokedex_height_check.c index d214b577df..01130b8186 100644 --- a/src/overlay021/pokedex_height_check.c +++ b/src/overlay021/pokedex_height_check.c @@ -5,6 +5,7 @@ #include "struct_decls/sprite_decl.h" +#include "gmm/message_bank_pokedex.h" #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D1FA4.h" #include "overlay021/ov21_021E29DC.h" @@ -44,10 +45,6 @@ typedef struct { UnkStruct_ov21_021D13FC *unk_00; } UnkStruct_ov21_021E6118; -typedef struct { - int unk_00; -} UnkStruct_ov21_021E6134; - typedef struct { SpriteResource *heightCheckGraphics[4]; CellActor *trainerHeightCellActor; @@ -65,7 +62,7 @@ static UnkStruct_ov21_021E6118 *ov21_021E60D8(int param0, UnkStruct_ov21_021D0F6 static UnkStruct_ov21_021D4660 *ov21_021E6100(int param0, UnkStruct_ov21_021D0F60 *param1); static void ov21_021E6104(UnkStruct_ov21_021E6104 *param0); static void ov21_021E6118(UnkStruct_ov21_021E6118 *param0); -static void ForMatching1(UnkStruct_ov21_021D4660 *param0); +static void DummyForMatching1(UnkStruct_ov21_021D4660 *param0); static int ov21_021E6130(void); static int ov21_021E6134(UnkStruct_ov21_021E6A68 *param0, void *param1); static int ov21_021E6158(UnkStruct_ov21_021E6A68 *param0, void *param1); @@ -77,15 +74,15 @@ static void SetTrainerHeightLarge(HeightCheckVisuals *heightCheckVisuals); static void SetTrainerHeightNormal(HeightCheckVisuals *heightCheckVisuals); static void ov21_021E628C(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3); static BOOL ov21_021E62F8(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3); -static void DisplayHeightCheck(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const UnkStruct_ov21_021E6134 *param3, int heapID); +static void DisplayHeightCheck(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const int *param3, int heapID); static void FreeVisuals(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1); static void DisplayBackground(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int heapID); static void GetHeightCheckGraphics(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, int heapID); -static void RemoveVisuals(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1); +static void FreeSprites(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1); static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID); -static void DeleteTrainerHeight(HeightCheckVisuals *heightCheckVisuals); -static void ForMatching2(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID); -static void ForMatching3(HeightCheckVisuals *heightCheckVisuals); +static void FreeTrainerHeight(HeightCheckVisuals *heightCheckVisuals); +static void DummyForMatching2(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID); +static void DummyForMatching3(HeightCheckVisuals *heightCheckVisuals); static void DisplayHeightLabels(UnkStruct_ov21_021E6118 *param0, int heapID); static void DisplayHeightValues(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int heapID); static void DisplaySpeciesHeight(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1); @@ -118,7 +115,7 @@ void ov21_021E6074(UnkStruct_ov21_021E68F4 *param0) { ov21_021E6104(param0->unk_00); ov21_021E6118(param0->unk_04); - ForMatching1(param0->unk_20); + DummyForMatching1(param0->unk_20); } static UnkStruct_ov21_021E6104 *ov21_021E608C(int param0, UnkStruct_ov21_021D0F60 *param1) @@ -163,7 +160,7 @@ static void ov21_021E6118(UnkStruct_ov21_021E6118 *param0) Heap_FreeToHeap(param0); } -static void ForMatching1(UnkStruct_ov21_021D4660 *param0) +static void DummyForMatching1(UnkStruct_ov21_021D4660 *param0) { return; } @@ -175,10 +172,10 @@ static int ov21_021E6130(void) static int ov21_021E6134(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E6134 *v1 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov21_021E6134)); + int *v1 = Heap_AllocFromHeap(param0->heapID, sizeof(int)); GF_ASSERT(v1); - memset(v1, 0, sizeof(UnkStruct_ov21_021E6134)); + memset(v1, 0, sizeof(int)); param0->unk_08 = v1; @@ -196,7 +193,7 @@ static int ov21_021E6158(UnkStruct_ov21_021E6A68 *param0, void *param1) static int ov21_021E6168(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E6134 *v1 = param0->unk_08; + int *v1 = param0->unk_08; Heap_FreeToHeap(v1); param0->unk_08 = NULL; @@ -207,7 +204,7 @@ static int ov21_021E6168(UnkStruct_ov21_021E6A68 *param0, void *param1) static int ov21_021E617C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { const UnkStruct_ov21_021E6104 *v0 = param2; - const UnkStruct_ov21_021E6134 *v1 = param3->unk_08; + const int *v1 = param3->unk_08; UnkStruct_ov21_021E6118 *v2 = param0; HeightCheckVisuals *heightCheckVisuals = param1->unk_08; @@ -314,22 +311,22 @@ static BOOL ov21_021E62F8(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21 return FALSE; } -static void DisplayHeightCheck(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const UnkStruct_ov21_021E6134 *param3, int heapID) +static void DisplayHeightCheck(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const int *param3, int heapID) { DisplayBackground(param1, param2, heapID); DisplayHeightLabels(param1, heapID); DisplayHeightValues(param1, param2, heapID); GetHeightCheckGraphics(heightCheckVisuals, param1, heapID); DisplayTrainerHeight(heightCheckVisuals, param1, param2, heapID); - ForMatching2(heightCheckVisuals, param1, param2, heapID); + DummyForMatching2(heightCheckVisuals, param1, param2, heapID); DisplaySpeciesHeight(param1, param2); } static void FreeVisuals(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1) { - ForMatching3(heightCheckVisuals); - DeleteTrainerHeight(heightCheckVisuals); - RemoveVisuals(heightCheckVisuals, param1); + DummyForMatching3(heightCheckVisuals); + FreeTrainerHeight(heightCheckVisuals); + FreeSprites(heightCheckVisuals, param1); Window_FillTilemap(¶m1->unk_00->unk_04, 0); Bg_ClearTilemap(param1->unk_00->unk_00, 1); @@ -369,7 +366,7 @@ static void GetHeightCheckGraphics(HeightCheckVisuals *heightCheckVisuals, UnkSt heightCheckVisuals->heightCheckGraphics[HCG_ANIMATION] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], pokedexGraphicsNarc, 92, 1, 92 + 7000, 3, heapID); } -static void RemoveVisuals(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1) +static void FreeSprites(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1) { UnkStruct_ov21_021D13FC *v0 = param1->unk_00; @@ -414,17 +411,17 @@ static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, UnkStru SetTrainerScale(heightCheckVisuals->trainerHeightCellActor, trainerScale); } -static void DeleteTrainerHeight(HeightCheckVisuals *heightCheckVisuals) +static void FreeTrainerHeight(HeightCheckVisuals *heightCheckVisuals) { CellActor_Delete(heightCheckVisuals->trainerHeightCellActor); } -static void ForMatching2(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID) +static void DummyForMatching2(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID) { return; } -static void ForMatching3(HeightCheckVisuals *heightCheckVisuals) +static void DummyForMatching3(HeightCheckVisuals *heightCheckVisuals) { return; } @@ -432,21 +429,21 @@ static void ForMatching3(HeightCheckVisuals *heightCheckVisuals) static void DisplayHeightLabels(UnkStruct_ov21_021E6118 *param0, int heapID) { Strbuf *strbuf = Strbuf_Init(32, heapID); - MessageLoader *pokedexTextBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); + MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); - MessageLoader_GetStrbuf(pokedexTextBank, 43, strbuf); + MessageLoader_GetStrbuf(pokedexMessageBank, pl_msg_pokedex_heightcheck_topscreen, strbuf); { u32 xOffset = Font_CalcCenterAlignment(FONT_SYSTEM, strbuf, 0, 256); Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, strbuf, xOffset, 24, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); } - MessageLoader_GetStrbuf(pokedexTextBank, 9, strbuf); + MessageLoader_GetStrbuf(pokedexMessageBank, pl_msg_pokedex_ht, strbuf); Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, strbuf, 32, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); - MessageLoader_GetStrbuf(pokedexTextBank, 9, strbuf); + MessageLoader_GetStrbuf(pokedexMessageBank, pl_msg_pokedex_ht, strbuf); Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, strbuf, 152, 168, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); Strbuf_Free(strbuf); - MessageLoader_Free(pokedexTextBank); + MessageLoader_Free(pokedexMessageBank); } static void DisplayHeightValues(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int heapID) @@ -474,9 +471,9 @@ static void DisplayHeightValues(UnkStruct_ov21_021E6118 *param0, const UnkStruct Text_AddPrinterWithParamsAndColor(¶m0->unk_00->unk_04, FONT_SYSTEM, PokedexSort_TrainerName(param1->unk_04), 146, 152, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); if (PokedexSort_TrainerGender(param1->unk_04) == GENDER_MALE) { - MessageLoader_GetStrbuf(messageBank, 95, strbuf); + MessageLoader_GetStrbuf(messageBank, pl_msg_pokedex_lucasheight, strbuf); } else { - MessageLoader_GetStrbuf(messageBank, 96, strbuf); + MessageLoader_GetStrbuf(messageBank, pl_msg_pokedex_dawnheight, strbuf); } { diff --git a/src/overlay021/pokedex_sort.c b/src/overlay021/pokedex_sort.c index 89012c9688..089d4f2b04 100644 --- a/src/overlay021/pokedex_sort.c +++ b/src/overlay021/pokedex_sort.c @@ -167,98 +167,75 @@ void PokedexSort_PokedexStatusFreeHWData(UnkStruct_ov21_021D3320 *param0) param0->HWData = NULL; } -u32 ov21_021D334C(const UnkStruct_ov21_021D3320 *param0, int param1, int param2) +u32 PokedexSort_Gender(const UnkStruct_ov21_021D3320 *param0, int species, int formIndex) { - u32 v0; - - v0 = PokedexData_DisplayedGender(param0->dexData, param1, param2); - return v0; + return PokedexData_DisplayedGender(param0->dexData, species, formIndex); } -u32 ov21_021D335C(const UnkStruct_ov21_021D3320 *param0, int param1) +u32 PokedexSort_UnownForm(const UnkStruct_ov21_021D3320 *param0, int formIndex) { - int v0; - - GF_ASSERT(param1 < 28); - v0 = PokedexData_GetForm_Unown(param0->dexData, param1); - - return v0; + GF_ASSERT(formIndex < 28); + return PokedexData_GetForm_Unown(param0->dexData, formIndex); } -u32 ov21_021D3374(const UnkStruct_ov21_021D3320 *param0, int param1) +u32 PokedexSort_ShellosForm(const UnkStruct_ov21_021D3320 *param0, int formIndex) { - u32 v0; - - GF_ASSERT(param1 < 2); - v0 = PokedexData_GetForm_Shellos(param0->dexData, param1); - - return v0; + GF_ASSERT(formIndex < 2); + return PokedexData_GetForm_Shellos(param0->dexData, formIndex); } -u32 ov21_021D338C(const UnkStruct_ov21_021D3320 *param0, int param1) +u32 PokedexSort_GastrodonForm(const UnkStruct_ov21_021D3320 *param0, int formIndex) { - u32 v0; - - GF_ASSERT(param1 < 2); - - v0 = PokedexData_GetForm_Gastrodon(param0->dexData, param1); - return v0; + GF_ASSERT(formIndex < 2); + return PokedexData_GetForm_Gastrodon(param0->dexData, formIndex); } -u32 ov21_021D33A4(const UnkStruct_ov21_021D3320 *param0, int param1) +u32 PokedexSort_BurmyForm(const UnkStruct_ov21_021D3320 *param0, int formIndex) { - u32 v0; - - GF_ASSERT(param1 < 3); - - v0 = PokedexData_GetForm_Burmy(param0->dexData, param1); - return v0; + GF_ASSERT(formIndex < 3); + return PokedexData_GetForm_Burmy(param0->dexData, formIndex); } -u32 ov21_021D33BC(const UnkStruct_ov21_021D3320 *param0, int param1) +u32 PokedexSort_WormadamForm(const UnkStruct_ov21_021D3320 *param0, int formIndex) { - u32 v0; - - GF_ASSERT(param1 < 3); - - v0 = PokedexData_GetForm_Wormadam(param0->dexData, param1); - return v0; + GF_ASSERT(formIndex < 3); + return PokedexData_GetForm_Wormadam(param0->dexData, formIndex); } -u32 ov21_021D33D4(const UnkStruct_ov21_021D3320 *param0, u32 species) +u32 PokedexSort_DefaultForm(const UnkStruct_ov21_021D3320 *param0, u32 species) { return PokedexData_GetDisplayForm(param0->dexData, species, 0); } -u32 ov21_021D33E0(const UnkStruct_ov21_021D3320 *param0, int param1) +u32 PokedexSort_NumGendersVisible(const UnkStruct_ov21_021D3320 *param0, int species) { - int v0 = ov21_021D334C(param0, param1, 1); + int gender = PokedexSort_Gender(param0, species, 1); - if (v0 == -1) { + if (gender == -1) { return 1; } return 2; } -u32 ov21_021D33F8(const UnkStruct_ov21_021D3320 *param0) +u32 PokedexSort_SpindaForm(const UnkStruct_ov21_021D3320 *param0) { return PokedexData_GetForm_Spinda(param0->dexData, 0); } -u32 ov21_021D3404(const UnkStruct_ov21_021D3320 *param0, int param1) +u32 PokedexSort_DeoxysForm(const UnkStruct_ov21_021D3320 *param0, int formIndex) { - return PokedexData_GetForm_Deoxys(param0->dexData, param1); + return PokedexData_GetForm_Deoxys(param0->dexData, formIndex); } -u32 ov21_021D3410(const UnkStruct_ov21_021D3320 *param0, u32 param1, int param2) +u32 PokedexSort_Form(const UnkStruct_ov21_021D3320 *param0, u32 species, int formIndex) { - return PokedexData_GetDisplayForm(param0->dexData, param1, param2); + return PokedexData_GetDisplayForm(param0->dexData, species, formIndex); } -u32 ov21_021D341C(const UnkStruct_ov21_021D3320 *param0, u32 param1) +u32 PokedexSort_NumFormsSeem(const UnkStruct_ov21_021D3320 *param0, u32 species) { - return PokedexData_NumFormsSeen(param0->dexData, param1); + return PokedexData_NumFormsSeen(param0->dexData, species); } BOOL PokedexSort_IsNationalUnlocked(const UnkStruct_ov21_021D3320 *param0) From ea785f7519a2a3ac76731597a713b0f2babe78ac Mon Sep 17 00:00:00 2001 From: h2o-DS <71458559+h2o-DS@users.noreply.github.com> Date: Sun, 19 Jan 2025 18:43:34 -0500 Subject: [PATCH 4/5] enum HeapId Changed instances of `int heapID` in overlay021 to `enum HeapId heapID` --- include/overlay021/funcptr_ov21_021E9B74.h | 4 +- include/overlay021/ov21_021D0D80.h | 5 +- include/overlay021/ov21_021D3FE0.h | 4 +- include/overlay021/ov21_021D423C.h | 4 +- include/overlay021/ov21_021D4340.h | 30 ++-- include/overlay021/ov21_021D4EE4.h | 4 +- include/overlay021/ov21_021D5AEC.h | 4 +- include/overlay021/ov21_021D76B0.h | 4 +- include/overlay021/ov21_021D85B0.h | 4 +- include/overlay021/ov21_021D94BC.h | 4 +- include/overlay021/ov21_021DC9BC.h | 4 +- include/overlay021/ov21_021DDD2C.h | 4 +- include/overlay021/ov21_021DE668.h | 5 +- include/overlay021/ov21_021DF734.h | 4 +- include/overlay021/ov21_021E0C68.h | 4 +- include/overlay021/ov21_021E1924.h | 4 +- include/overlay021/ov21_021E29DC.h | 6 +- include/overlay021/ov21_021E3FFC.h | 4 +- include/overlay021/ov21_021E4CA4.h | 4 +- include/overlay021/ov21_021E68F4.h | 4 +- include/overlay021/ov21_021E737C.h | 4 +- include/overlay021/ov21_021E8484.h | 4 +- include/overlay021/pokedex_enc_data.h | 7 +- include/overlay021/pokedex_height_check.h | 4 +- include/overlay021/pokedex_sort.h | 7 +- include/overlay021/pokedex_text.h | 7 +- src/overlay021/ov21_021D0D80.c | 34 ++--- src/overlay021/ov21_021D3FE0.c | 6 +- src/overlay021/ov21_021D423C.c | 4 +- src/overlay021/ov21_021D4340.c | 56 +++---- src/overlay021/ov21_021D4EE4.c | 4 +- src/overlay021/ov21_021D5AEC.c | 36 ++--- src/overlay021/ov21_021D76B0.c | 40 ++--- src/overlay021/ov21_021D85B0.c | 28 ++-- src/overlay021/ov21_021D94BC.c | 166 ++++++++++----------- src/overlay021/ov21_021DC9BC.c | 44 +++--- src/overlay021/ov21_021DDD2C.c | 32 ++-- src/overlay021/ov21_021DE668.c | 20 +-- src/overlay021/ov21_021DF734.c | 18 +-- src/overlay021/ov21_021E0C68.c | 22 +-- src/overlay021/ov21_021E1924.c | 40 ++--- src/overlay021/ov21_021E29DC.c | 82 +++++----- src/overlay021/ov21_021E3FFC.c | 18 +-- src/overlay021/ov21_021E4CA4.c | 36 ++--- src/overlay021/ov21_021E68F4.c | 38 ++--- src/overlay021/ov21_021E737C.c | 92 ++++++------ src/overlay021/ov21_021E8484.c | 32 ++-- src/overlay021/ov21_021E8D48.c | 4 +- src/overlay021/pokedex_enc_data.c | 6 +- src/overlay021/pokedex_height_check.c | 52 +++---- src/overlay021/pokedex_sort.c | 26 ++-- src/overlay021/pokedex_text.c | 11 +- 52 files changed, 569 insertions(+), 521 deletions(-) diff --git a/include/overlay021/funcptr_ov21_021E9B74.h b/include/overlay021/funcptr_ov21_021E9B74.h index fef4ce8467..6dbee878fc 100644 --- a/include/overlay021/funcptr_ov21_021E9B74.h +++ b/include/overlay021/funcptr_ov21_021E9B74.h @@ -4,6 +4,8 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -typedef void (*UnkFuncPtr_ov21_021E9B74)(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +typedef void (*UnkFuncPtr_ov21_021E9B74)(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); #endif // POKEPLATINUM_FUNCPTR_OV21_021E9B74_H diff --git a/include/overlay021/ov21_021D0D80.h b/include/overlay021/ov21_021D0D80.h index d455329291..42c8aa58b1 100644 --- a/include/overlay021/ov21_021D0D80.h +++ b/include/overlay021/ov21_021D0D80.h @@ -17,6 +17,7 @@ #include "bg_window.h" #include "cell_actor.h" +#include "heap.h" #include "overlay_manager.h" #include "strbuf.h" #include "touch_screen.h" @@ -24,7 +25,7 @@ int ov21_021D0D80(OverlayManager *param0, int *param1); int ov21_021D0E3C(OverlayManager *param0, int *param1); int ov21_021D0EC8(OverlayManager *param0, int *param1); -UnkStruct_ov21_021D0F60 *ov21_021D0F60(int param0, const UnkStruct_ov21_021D0D80 *param1); +UnkStruct_ov21_021D0F60 *ov21_021D0F60(enum HeapId heapID, const UnkStruct_ov21_021D0D80 *param1); BOOL ov21_021D10B8(UnkStruct_ov21_021D0F60 *param0); void ov21_021D12B0(int param0); void ov21_021D12C4(void); @@ -70,6 +71,6 @@ u32 ov21_021D1B94(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 u32 ov21_021D1BD8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6); u32 ov21_021D1C30(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6); u32 ov21_021D1C88(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6); -Strbuf *GetPokedexMessage(int entryID, int heapID); +Strbuf *GetPokedexMessage(int entryID, enum HeapId heapID); #endif // POKEPLATINUM_OV21_021D0D80_H diff --git a/include/overlay021/ov21_021D3FE0.h b/include/overlay021/ov21_021D3FE0.h index 13387051d5..da8169dc82 100644 --- a/include/overlay021/ov21_021D3FE0.h +++ b/include/overlay021/ov21_021D3FE0.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D3FE0_decl.h" #include "overlay021/struct_ov21_021D4008.h" -UnkStruct_ov21_021D3FE0 *ov21_021D3FE0(int param0); +#include "heap.h" + +UnkStruct_ov21_021D3FE0 *ov21_021D3FE0(enum HeapId heapID); void ov21_021D4008(UnkStruct_ov21_021D3FE0 *param0, const UnkStruct_ov21_021D4008 *param1); int ov21_021D4078(UnkStruct_ov21_021D3FE0 *param0); int ov21_021D4100(UnkStruct_ov21_021D3FE0 *param0); diff --git a/include/overlay021/ov21_021D423C.h b/include/overlay021/ov21_021D423C.h index cea4aee333..9c305b7539 100644 --- a/include/overlay021/ov21_021D423C.h +++ b/include/overlay021/ov21_021D423C.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D423C_decl.h" #include "overlay021/struct_ov21_021D4660.h" -UnkStruct_ov21_021D423C *ov21_021D423C(int param0); +#include "heap.h" + +UnkStruct_ov21_021D423C *ov21_021D423C(enum HeapId heapID); void ov21_021D426C(UnkStruct_ov21_021D423C *param0, UnkStruct_ov21_021D4660 *param1, int param2); const UnkStruct_ov21_021D4660 *ov21_021D4284(UnkStruct_ov21_021D423C *param0, int param1); BOOL ov21_021D42D4(UnkStruct_ov21_021D423C *param0); diff --git a/include/overlay021/ov21_021D4340.h b/include/overlay021/ov21_021D4340.h index a343529178..d75d68d3b1 100644 --- a/include/overlay021/ov21_021D4340.h +++ b/include/overlay021/ov21_021D4340.h @@ -5,24 +5,26 @@ #include "overlay021/struct_ov21_021D4340_1.h" #include "overlay021/struct_ov21_021D4660.h" +#include "heap.h" + BOOL ov21_021D4340(UnkStruct_ov21_021D4340_1 *param0); BOOL ov21_021D43A8(UnkStruct_ov21_021D4340_1 *param0); BOOL ov21_021D4434(UnkStruct_ov21_021D4340_1 *param0); BOOL ov21_021D4558(UnkStruct_ov21_021D4340_1 *param0); void ov21_021D4660(UnkStruct_ov21_021D4660 *param0); -void ov21_021D467C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); -void ov21_021D4704(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); -void ov21_021D475C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); -void ov21_021D47F0(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); -void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, UnkStruct_ov21_021D0F60 *param1, int param2, int param3); -void ov21_021D48B8(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); -void ov21_021D491C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); -void ov21_021D4980(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); -void ov21_021D49E4(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); -void ov21_021D4A3C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); -void ov21_021D4A94(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); -void ov21_021D4AF8(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); -void ov21_021D4B50(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); -void ov21_021D4BB4(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D467C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4704(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D475C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D47F0(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID, int param3); +void ov21_021D48B8(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D491C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4980(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D49E4(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4A3C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4A94(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4AF8(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4B50(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4BB4(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); #endif // POKEPLATINUM_OV21_021D4340_H diff --git a/include/overlay021/ov21_021D4EE4.h b/include/overlay021/ov21_021D4EE4.h index 4b69d4436e..42148eda8d 100644 --- a/include/overlay021/ov21_021D4EE4.h +++ b/include/overlay021/ov21_021D4EE4.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D4EE4_decl.h" #include "overlay021/struct_ov21_021D4FE4.h" -UnkStruct_ov21_021D4EE4 *ov21_021D4EE4(int param0); +#include "heap.h" + +UnkStruct_ov21_021D4EE4 *ov21_021D4EE4(enum HeapId heapID); void ov21_021D4EFC(UnkStruct_ov21_021D4EE4 *param0); void ov21_021D4F04(UnkStruct_ov21_021D4EE4 *param0, const UnkStruct_ov21_021D4FE4 *param1, int param2, int param3); void ov21_021D4F20(UnkStruct_ov21_021D4EE4 *param0, int param1, int param2); diff --git a/include/overlay021/ov21_021D5AEC.h b/include/overlay021/ov21_021D5AEC.h index 4f22aaf29b..de970b4e65 100644 --- a/include/overlay021/ov21_021D5AEC.h +++ b/include/overlay021/ov21_021D5AEC.h @@ -5,7 +5,9 @@ #include "overlay021/struct_ov21_021D5B68.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021D5AEC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +void ov21_021D5AEC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021D5B50(UnkStruct_ov21_021E68F4 *param0); BOOL ov21_021D5B68(const UnkStruct_ov21_021D5B68 *param0); diff --git a/include/overlay021/ov21_021D76B0.h b/include/overlay021/ov21_021D76B0.h index 958d6a5ee6..f305387a20 100644 --- a/include/overlay021/ov21_021D76B0.h +++ b/include/overlay021/ov21_021D76B0.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021D76B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +void ov21_021D76B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021D7710(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021D76B0_H diff --git a/include/overlay021/ov21_021D85B0.h b/include/overlay021/ov21_021D85B0.h index 14d4d2f6e5..b6e3eb8ec8 100644 --- a/include/overlay021/ov21_021D85B0.h +++ b/include/overlay021/ov21_021D85B0.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021D85B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +void ov21_021D85B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021D8610(UnkStruct_ov21_021E68F4 *param0); void ov21_021D8628(UnkStruct_ov21_021E68F4 *param0, int param1); int ov21_021D863C(const UnkStruct_ov21_021E68F4 *param0); diff --git a/include/overlay021/ov21_021D94BC.h b/include/overlay021/ov21_021D94BC.h index 97870d2779..ad8610548e 100644 --- a/include/overlay021/ov21_021D94BC.h +++ b/include/overlay021/ov21_021D94BC.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021D94BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +void ov21_021D94BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021D951C(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021D94BC_H diff --git a/include/overlay021/ov21_021DC9BC.h b/include/overlay021/ov21_021DC9BC.h index 8e35b79d3d..425b4711ce 100644 --- a/include/overlay021/ov21_021DC9BC.h +++ b/include/overlay021/ov21_021DC9BC.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021DC9BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int heapID); +#include "heap.h" + +void ov21_021DC9BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021DCA14(UnkStruct_ov21_021E68F4 *param0); int ov21_021DCA28(const UnkStruct_ov21_021E68F4 *param0); void ov21_021DCA30(UnkStruct_ov21_021E68F4 *param0, int param1); diff --git a/include/overlay021/ov21_021DDD2C.h b/include/overlay021/ov21_021DDD2C.h index ac870e272b..dfe8c1c841 100644 --- a/include/overlay021/ov21_021DDD2C.h +++ b/include/overlay021/ov21_021DDD2C.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021DDD2C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +void ov21_021DDD2C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021DDD8C(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021DDD2C_H diff --git a/include/overlay021/ov21_021DE668.h b/include/overlay021/ov21_021DE668.h index d53ebf5629..cdfe138750 100644 --- a/include/overlay021/ov21_021DE668.h +++ b/include/overlay021/ov21_021DE668.h @@ -7,12 +7,13 @@ #include "overlay021/struct_ov21_021E68F4.h" #include "bg_window.h" +#include "heap.h" -void ov21_021DE668(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021DE668(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021DE6C0(UnkStruct_ov21_021E68F4 *param0); BOOL ov21_021DE6D4(UnkStruct_ov21_021DE6D4 *param0, int param1); BOOL ov21_021DE6D8(UnkStruct_ov21_021DE6D4 *param0, int param1); -void ov21_021DEB8C(Window *param0, int param1, int param2, int param3, u32 param4); +void ov21_021DEB8C(Window *param0, int param1, enum HeapId heapID, int param3, u32 param4); int ov21_021DF180(int param0); Window *ov21_021DF30C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2); diff --git a/include/overlay021/ov21_021DF734.h b/include/overlay021/ov21_021DF734.h index 1179d6989f..3e16b6a651 100644 --- a/include/overlay021/ov21_021DF734.h +++ b/include/overlay021/ov21_021DF734.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021DF734(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +void ov21_021DF734(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021DF78C(UnkStruct_ov21_021E68F4 *param0); BOOL ov21_021DF7A0(UnkStruct_ov21_021E68F4 *param0, int param1); diff --git a/include/overlay021/ov21_021E0C68.h b/include/overlay021/ov21_021E0C68.h index 2a62e25ccb..e042c23361 100644 --- a/include/overlay021/ov21_021E0C68.h +++ b/include/overlay021/ov21_021E0C68.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E0C68(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +void ov21_021E0C68(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021E0CC0(UnkStruct_ov21_021E68F4 *param0); void ov21_021E0CD4(UnkStruct_ov21_021E68F4 *param0, int param1, int param2); void ov21_021E0CDC(UnkStruct_ov21_021E68F4 *param0, int param1); diff --git a/include/overlay021/ov21_021E1924.h b/include/overlay021/ov21_021E1924.h index b66575b6d6..7cf3ccd062 100644 --- a/include/overlay021/ov21_021E1924.h +++ b/include/overlay021/ov21_021E1924.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E1924(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +void ov21_021E1924(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021E1984(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021E1924_H diff --git a/include/overlay021/ov21_021E29DC.h b/include/overlay021/ov21_021E29DC.h index 22a4a65ccc..b7a04db896 100644 --- a/include/overlay021/ov21_021E29DC.h +++ b/include/overlay021/ov21_021E29DC.h @@ -4,10 +4,12 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E29DC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +void ov21_021E29DC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021E2A3C(UnkStruct_ov21_021E68F4 *param0); BOOL ov21_021E2A54(const UnkStruct_ov21_021E68F4 *param0); -void ov21_021E332C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021E332C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021E338C(UnkStruct_ov21_021E68F4 *param0); BOOL ov21_021E33A4(const UnkStruct_ov21_021E68F4 *param0); BOOL ov21_021E33AC(const UnkStruct_ov21_021E68F4 *param0); diff --git a/include/overlay021/ov21_021E3FFC.h b/include/overlay021/ov21_021E3FFC.h index d8865ca0d4..ba941cc27f 100644 --- a/include/overlay021/ov21_021E3FFC.h +++ b/include/overlay021/ov21_021E3FFC.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E3FFC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +void ov21_021E3FFC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021E4054(UnkStruct_ov21_021E68F4 *param0); void ov21_021E4068(UnkStruct_ov21_021E68F4 *param0, int param1, int param2); void ov21_021E4070(UnkStruct_ov21_021E68F4 *param0, int param1); diff --git a/include/overlay021/ov21_021E4CA4.h b/include/overlay021/ov21_021E4CA4.h index 1c08101afb..5500538aae 100644 --- a/include/overlay021/ov21_021E4CA4.h +++ b/include/overlay021/ov21_021E4CA4.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E4CA4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +void ov21_021E4CA4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021E4D04(UnkStruct_ov21_021E68F4 *param0); int ov21_021E4D1C(const UnkStruct_ov21_021E68F4 *param0); diff --git a/include/overlay021/ov21_021E68F4.h b/include/overlay021/ov21_021E68F4.h index f231f79e0a..477b2cda1a 100644 --- a/include/overlay021/ov21_021E68F4.h +++ b/include/overlay021/ov21_021E68F4.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E68F4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +void ov21_021E68F4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021E6954(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021E68F4_H diff --git a/include/overlay021/ov21_021E737C.h b/include/overlay021/ov21_021E737C.h index aa4b7c263b..f2e79079b7 100644 --- a/include/overlay021/ov21_021E737C.h +++ b/include/overlay021/ov21_021E737C.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E737C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +void ov21_021E737C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021E73D4(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021E737C_H diff --git a/include/overlay021/ov21_021E8484.h b/include/overlay021/ov21_021E8484.h index eff3d31156..01e73279dd 100644 --- a/include/overlay021/ov21_021E8484.h +++ b/include/overlay021/ov21_021E8484.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E8484(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +void ov21_021E8484(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021E84E4(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021E8484_H diff --git a/include/overlay021/pokedex_enc_data.h b/include/overlay021/pokedex_enc_data.h index d077b38c0a..65fce45071 100644 --- a/include/overlay021/pokedex_enc_data.h +++ b/include/overlay021/pokedex_enc_data.h @@ -4,6 +4,7 @@ #include "constants/species.h" #include "cell_actor.h" +#include "heap.h" typedef struct EncounterLocations { int *locations; @@ -49,7 +50,7 @@ enum PokedexEncFileCatgegory { * @param encounterCategory * @param heapID */ -void PokedexEncData_PopulateEncounterLocations(EncounterLocations *encounterLocations, int species, int encounterCategory, int heapID); +void PokedexEncData_PopulateEncounterLocations(EncounterLocations *encounterLocations, int species, int encounterCategory, enum HeapId heapID); /** * @brief Frees encounter data from the heap @@ -68,7 +69,7 @@ void PokedexEncData_FreeEncounterLocations(EncounterLocations *encounterLocation * @param numDungeons * @return Array of coordinates for each dungeon */ -DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(int heapID, int *numDungeons); +DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(enum HeapId heapID, int *numDungeons); /** * @brief Reads field coordinates data from zukan_enc_platinum.narc @@ -80,7 +81,7 @@ DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(int heapID, int *numDun * @param numFields * @return Array of coordinates for each field */ -FieldCoordinates *PokedexEncData_GetFieldCoordinates(int heapID, int *numFields); +FieldCoordinates *PokedexEncData_GetFieldCoordinates(enum HeapId heapID, int *numFields); /** * @brief Updates fieldMap with the coordinates occupied by the field diff --git a/include/overlay021/pokedex_height_check.h b/include/overlay021/pokedex_height_check.h index 0f702dc936..5b0bbcfc79 100644 --- a/include/overlay021/pokedex_height_check.h +++ b/include/overlay021/pokedex_height_check.h @@ -4,7 +4,9 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E6014(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +#include "heap.h" + +void ov21_021E6014(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID); void ov21_021E6074(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_POKEDEX_HEIGHT_CHECK_H diff --git a/include/overlay021/pokedex_sort.h b/include/overlay021/pokedex_sort.h index 31209331b7..64a3f1c3fc 100644 --- a/include/overlay021/pokedex_sort.h +++ b/include/overlay021/pokedex_sort.h @@ -5,6 +5,7 @@ #include "overlay021/struct_ov21_021D3208.h" #include "overlay021/struct_ov21_021D3320.h" +#include "heap.h" #include "strbuf.h" enum SortOrder { @@ -68,7 +69,7 @@ enum FilterForm { // called form in game, but refers to body shape FF_MULTIBODY }; -void PokedexSort_PopulatePokedexStatus(UnkStruct_ov21_021D3320 *param0, UnkStruct_ov21_021D3208 *param1, int heapID); +void PokedexSort_PopulatePokedexStatus(UnkStruct_ov21_021D3320 *param0, UnkStruct_ov21_021D3208 *param1, enum HeapId heapID); void PokedexSort_PokedexStatusFreeHWData(UnkStruct_ov21_021D3320 *param0); u32 PokedexSort_Gender(const UnkStruct_ov21_021D3320 *param0, int species, int formIndex); u32 PokedexSort_UnownForm(const UnkStruct_ov21_021D3320 *param0, int formIndex); @@ -87,8 +88,8 @@ void ov21_021D3434(UnkStruct_ov21_021D3320 *param0, u32 param1); u32 ov21_021D3440(const UnkStruct_ov21_021D3320 *param0); void ov21_021D344C(UnkStruct_ov21_021D3320 *param0, u32 param1); u32 ov21_021D3458(const UnkStruct_ov21_021D3320 *param0); -BOOL PokedexSort_Sort(UnkStruct_ov21_021D3320 *param0, int sortCategory, int firstLetterFilter, int typeFilter1, int typeFilter2, int bodyShapeFilter, int isNationalDex, int heapID, BOOL isFiltered); -BOOL PokedexSort_SortUnfiltered(UnkStruct_ov21_021D3320 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7); +BOOL PokedexSort_Sort(UnkStruct_ov21_021D3320 *param0, int sortCategory, int firstLetterFilter, int typeFilter1, int typeFilter2, int bodyShapeFilter, int isNationalDex, enum HeapId heapID, BOOL isFiltered); +BOOL PokedexSort_SortUnfiltered(UnkStruct_ov21_021D3320 *param0, int sortOrder, int filterName, int filterType1, int filterType2, int filterForm, int isNationalDex, enum HeapId heapID); BOOL ov21_021D36A4(const UnkStruct_ov21_021D3320 *param0, int param1); BOOL ov21_021D36C0(UnkStruct_ov21_021D3320 *param0, int param1); int PokedexStatus_IsNationalDex(const UnkStruct_ov21_021D3320 *param0); diff --git a/include/overlay021/pokedex_text.h b/include/overlay021/pokedex_text.h index 5341d1f771..5256c5261f 100644 --- a/include/overlay021/pokedex_text.h +++ b/include/overlay021/pokedex_text.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_POKEDEX_TEXT_H #define POKEPLATINUM_POKEDEX_TEXT_H +#include "heap.h" #include "strbuf.h" void PokedexText_Free(Strbuf *strbuf); int PokedexText_ForeignLanguage(int languageIndex); -Strbuf *PokedexText_NameNumber(int species, int language, int heapID); -Strbuf *PokedexText_Category(int species, int language, int heapID); -Strbuf *PokedexText_DexEntry(int species, int language, int entryOffset, int heapID); +Strbuf *PokedexText_NameNumber(int species, int language, enum HeapId heapID); +Strbuf *PokedexText_Category(int species, int language, enum HeapId heapID); +Strbuf *PokedexText_DexEntry(int species, int language, int entryOffset, enum HeapId heapID); #endif // POKEPLATINUM_POKEDEX_TEXT_H diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index b79c592ee0..6745e394d0 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -293,27 +293,27 @@ const static UnkFuncPtr_ov21_021E9B9C Unk_ov21_021E9B54[8] = { ov21_021E84E4 }; -UnkStruct_ov21_021D0F60 *ov21_021D0F60(int param0, const UnkStruct_ov21_021D0D80 *param1) +UnkStruct_ov21_021D0F60 *ov21_021D0F60(enum HeapId heapID, const UnkStruct_ov21_021D0D80 *param1) { UnkStruct_ov21_021D0F60 *v0; int v1; UnkStruct_ov21_021D3208 v2; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D0F60)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D0F60)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D0F60)); - v0->unk_04 = param0; + v0->unk_04 = heapID; v0->unk_08 = param1->unk_1C; - v0->unk_1A70 = ov21_021D423C(param0); - v0->unk_1A74 = ov21_021D423C(param0); - v0->unk_1A78 = ov21_021D423C(param0); - v0->unk_1A7C = ov21_021D423C(param0); - v0->unk_1D64 = ov21_021D3FE0(param0); - v0->unk_1D68 = ov21_021D3FE0(param0); - v0->unk_1D6C = ov21_021D3FE0(param0); - v0->unk_1D70 = ov21_021D3FE0(param0); + v0->unk_1A70 = ov21_021D423C(heapID); + v0->unk_1A74 = ov21_021D423C(heapID); + v0->unk_1A78 = ov21_021D423C(heapID); + v0->unk_1A7C = ov21_021D423C(heapID); + v0->unk_1D64 = ov21_021D3FE0(heapID); + v0->unk_1D68 = ov21_021D3FE0(heapID); + v0->unk_1D6C = ov21_021D3FE0(heapID); + v0->unk_1D70 = ov21_021D3FE0(heapID); v2.pokedex = param1->pokedex; v2.unk_04 = param1->trainerInfo; @@ -325,22 +325,22 @@ UnkStruct_ov21_021D0F60 *ov21_021D0F60(int param0, const UnkStruct_ov21_021D0D80 v2.unk_1C = sub_0209ACE4(param1->unk_1C); v2.unk_20 = sub_0209ACEC(param1->unk_1C); - PokedexSort_PopulatePokedexStatus(&v0->unk_0C, &v2, param0); - ov21_021D1FA4(&v0->unk_177C, param0); + PokedexSort_PopulatePokedexStatus(&v0->unk_0C, &v2, heapID); + ov21_021D1FA4(&v0->unk_177C, heapID); for (v1 = 0; v1 < 10; v1++) { if (Unk_ov21_021E9B74[v1]) { - Unk_ov21_021E9B74[v1](&v0->unk_1A94[v1], v0, param0); + Unk_ov21_021E9B74[v1](&v0->unk_1A94[v1], v0, heapID); } } for (v1 = 0; v1 < 8; v1++) { if (Unk_ov21_021E9B34[v1]) { - Unk_ov21_021E9B34[v1](&v0->unk_1C24[v1], v0, param0); + Unk_ov21_021E9B34[v1](&v0->unk_1C24[v1], v0, heapID); } } - ov21_021D47F0(param0, &v0->unk_1A80, v0, 1); + ov21_021D47F0(heapID, &v0->unk_1A80, v0, 1); ov21_021D1EEC(v0); return v0; @@ -966,7 +966,7 @@ u32 ov21_021D1C88(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 return v0; } -Strbuf *GetPokedexMessage(int entryID, int heapID) +Strbuf *GetPokedexMessage(int entryID, enum HeapId heapID) { Strbuf *pokedexMessage; MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); diff --git a/src/overlay021/ov21_021D3FE0.c b/src/overlay021/ov21_021D3FE0.c index 7c810a7b2e..ed06eb9500 100644 --- a/src/overlay021/ov21_021D3FE0.c +++ b/src/overlay021/ov21_021D3FE0.c @@ -27,17 +27,17 @@ static void ov21_021D41E4(UnkStruct_ov21_021E6B20 *param0); static int ov21_021D41EC(UnkFuncPtr_ov21_021D41EC param0, UnkStruct_ov21_021E6A68 *param1, void *param2); static int ov21_021D420C(UnkFuncPtr_ov21_021D420C param0, void *param1, UnkStruct_ov21_021E6B20 *param2, const void *param3, const UnkStruct_ov21_021E6A68 *param4); -UnkStruct_ov21_021D3FE0 *ov21_021D3FE0(int param0) +UnkStruct_ov21_021D3FE0 *ov21_021D3FE0(enum HeapId heapID) { UnkStruct_ov21_021D3FE0 *v0; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D3FE0)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D3FE0)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D3FE0)); v0->unk_08 = 5; - v0->heapID = param0; + v0->heapID = heapID; return v0; } diff --git a/src/overlay021/ov21_021D423C.c b/src/overlay021/ov21_021D423C.c index 7d41a7bd76..b36d527186 100644 --- a/src/overlay021/ov21_021D423C.c +++ b/src/overlay021/ov21_021D423C.c @@ -17,11 +17,11 @@ static BOOL ov21_021D42EC(UnkStruct_ov21_021D423C *param0); static UnkStruct_ov21_021D4660 *ov21_021D42FC(UnkStruct_ov21_021D423C *param0, int param1); static void ov21_021D4334(UnkStruct_ov21_021D423C *param0, UnkStruct_ov21_021D4660 *param1); -UnkStruct_ov21_021D423C *ov21_021D423C(int param0) +UnkStruct_ov21_021D423C *ov21_021D423C(enum HeapId heapID) { UnkStruct_ov21_021D423C *v0; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D423C)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D423C)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D423C)); diff --git a/src/overlay021/ov21_021D4340.c b/src/overlay021/ov21_021D4340.c index cc48b61e3c..9ab140bb9f 100644 --- a/src/overlay021/ov21_021D4340.c +++ b/src/overlay021/ov21_021D4340.c @@ -258,14 +258,14 @@ void ov21_021D4660(UnkStruct_ov21_021D4660 *param0) param0->unk_08.unk_08 = NULL; } -void ov21_021D467C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) +void ov21_021D467C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { UnkStruct_ov21_021D4434 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4434; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4434)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4434)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4434)); @@ -286,14 +286,14 @@ void ov21_021D467C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_0 param1->unk_08.unk_08 = v0; } -void ov21_021D4704(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) +void ov21_021D4704(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { UnkStruct_ov21_021D43A8 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D43A8; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D43A8)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D43A8)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D43A8)); @@ -307,14 +307,14 @@ void ov21_021D4704(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_0 param1->unk_08.unk_08 = v0; } -void ov21_021D475C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) +void ov21_021D475C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { UnkStruct_ov21_021D4434 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4434; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4434)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4434)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4434)); @@ -335,14 +335,14 @@ void ov21_021D475C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_0 param1->unk_08.unk_08 = v0; } -void ov21_021D47F0(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) +void ov21_021D47F0(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { UnkStruct_ov21_021D4434 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4434; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4434)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4434)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4434)); @@ -363,14 +363,14 @@ void ov21_021D47F0(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_0 param1->unk_08.unk_08 = v0; } -void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, UnkStruct_ov21_021D0F60 *param1, int param2, int param3) +void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID, int param3) { UnkStruct_ov21_021D4340 *v0; param0->unk_00 = param3; param0->unk_04 = ov21_021D4340; - v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov21_021D4340)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4340)); GF_ASSERT(v0); v0->unk_00 = ov21_021D1410(param1, 0); @@ -380,14 +380,14 @@ void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, UnkStruct_ov21_021D0F60 *par param0->unk_08.unk_08 = v0; } -void ov21_021D48B8(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) +void ov21_021D48B8(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { UnkStruct_ov21_021D4558 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4558; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4558)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4558)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4558)); @@ -402,14 +402,14 @@ void ov21_021D48B8(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_0 param1->unk_08.unk_08 = v0; } -void ov21_021D491C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) +void ov21_021D491C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { UnkStruct_ov21_021D4558 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4558; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4558)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4558)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4558)); @@ -424,14 +424,14 @@ void ov21_021D491C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_0 param1->unk_08.unk_08 = v0; } -void ov21_021D4980(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) +void ov21_021D4980(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { UnkStruct_ov21_021D4558 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4558; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4558)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4558)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4558)); @@ -446,14 +446,14 @@ void ov21_021D4980(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_0 param1->unk_08.unk_08 = v0; } -void ov21_021D49E4(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) +void ov21_021D49E4(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { UnkStruct_ov21_021D4340 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4340; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4340)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4340)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4340)); @@ -465,14 +465,14 @@ void ov21_021D49E4(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_0 param1->unk_08.unk_08 = v0; } -void ov21_021D4A3C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) +void ov21_021D4A3C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { UnkStruct_ov21_021D4340 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4340; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4340)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4340)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4340)); @@ -484,14 +484,14 @@ void ov21_021D4A3C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_0 param1->unk_08.unk_08 = v0; } -void ov21_021D4A94(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) +void ov21_021D4A94(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { UnkStruct_ov21_021D4558 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4558; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4558)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4558)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4558)); @@ -506,14 +506,14 @@ void ov21_021D4A94(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_0 param1->unk_08.unk_08 = v0; } -void ov21_021D4AF8(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) +void ov21_021D4AF8(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { UnkStruct_ov21_021D4340 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4340; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4340)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4340)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4340)); @@ -525,14 +525,14 @@ void ov21_021D4AF8(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_0 param1->unk_08.unk_08 = v0; } -void ov21_021D4B50(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) +void ov21_021D4B50(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { UnkStruct_ov21_021D4558 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4558; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4558)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4558)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4558)); @@ -547,14 +547,14 @@ void ov21_021D4B50(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_0 param1->unk_08.unk_08 = v0; } -void ov21_021D4BB4(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) +void ov21_021D4BB4(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { UnkStruct_ov21_021D4340 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4340; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4340)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4340)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4340)); diff --git a/src/overlay021/ov21_021D4EE4.c b/src/overlay021/ov21_021D4EE4.c index 8c12b3f6d0..17ec34e2f0 100644 --- a/src/overlay021/ov21_021D4EE4.c +++ b/src/overlay021/ov21_021D4EE4.c @@ -26,11 +26,11 @@ static void ov21_021D50E0(UnkStruct_ov21_021D4EE4 *param0, int param1); static void ov21_021D5110(UnkStruct_ov21_021D4EE4 *param0, int param1); static void ov21_021D5140(UnkStruct_ov21_021D4EE4 *param0, int param1); -UnkStruct_ov21_021D4EE4 *ov21_021D4EE4(int param0) +UnkStruct_ov21_021D4EE4 *ov21_021D4EE4(enum HeapId heapID) { UnkStruct_ov21_021D4EE4 *v0; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4EE4)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4EE4)); memset(v0, 0, sizeof(UnkStruct_ov21_021D4EE4)); return v0; diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c index 021f2daf51..4cdcecbb8d 100644 --- a/src/overlay021/ov21_021D5AEC.c +++ b/src/overlay021/ov21_021D5AEC.c @@ -77,11 +77,11 @@ typedef struct { int unk_144; } UnkStruct_ov21_021D71A8; -static UnkStruct_ov21_021D5B68 *ov21_021D5B90(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D5B68 *ov21_021D5B90(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021D5BCC(UnkStruct_ov21_021D5B68 *param0); -static UnkStruct_ov21_021D5C08 *ov21_021D5BE0(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D5C08 *ov21_021D5BE0(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021D5C08(UnkStruct_ov21_021D5C08 *param0); -static UnkStruct_ov21_021D4660 *ov21_021D5C1C(int param0, UnkStruct_ov21_021E68F4 *param1, UnkStruct_ov21_021D0F60 *param2); +static UnkStruct_ov21_021D4660 *ov21_021D5C1C(enum HeapId heapID, UnkStruct_ov21_021E68F4 *param1, UnkStruct_ov21_021D0F60 *param2); static void ov21_021D5C7C(UnkStruct_ov21_021D4660 *param0); static int ov21_021D5CB4(void); static int ov21_021D5CB8(UnkStruct_ov21_021E6A68 *param0, void *param1); @@ -183,15 +183,15 @@ const static int Unk_ov21_021E9D40[] = { 152 * FX32_ONE }; -void ov21_021D5AEC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021D5AEC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021D5B68 *v0; UnkStruct_ov21_021D5C08 *v1; UnkStruct_ov21_021D4660 *v2; - v0 = ov21_021D5B90(param2, param1); - v1 = ov21_021D5BE0(param2, param1); - v2 = ov21_021D5C1C(param2, param0, param1); + v0 = ov21_021D5B90(heapID, param1); + v1 = ov21_021D5BE0(heapID, param1); + v2 = ov21_021D5C1C(heapID, param0, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -222,11 +222,11 @@ BOOL ov21_021D5B68(const UnkStruct_ov21_021D5B68 *param0) return 1; } -static UnkStruct_ov21_021D5B68 *ov21_021D5B90(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D5B68 *ov21_021D5B90(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021D5B68 *v0; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D5B68)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D5B68)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D5B68)); @@ -245,11 +245,11 @@ static void ov21_021D5BCC(UnkStruct_ov21_021D5B68 *param0) Heap_FreeToHeap(param0); } -static UnkStruct_ov21_021D5C08 *ov21_021D5BE0(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D5C08 *ov21_021D5BE0(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021D5C08 *v0; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D5C08)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D5C08)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D5C08)); @@ -265,16 +265,16 @@ static void ov21_021D5C08(UnkStruct_ov21_021D5C08 *param0) Heap_FreeToHeap(param0); } -static UnkStruct_ov21_021D4660 *ov21_021D5C1C(int param0, UnkStruct_ov21_021E68F4 *param1, UnkStruct_ov21_021D0F60 *param2) +static UnkStruct_ov21_021D4660 *ov21_021D5C1C(enum HeapId heapID, UnkStruct_ov21_021E68F4 *param1, UnkStruct_ov21_021D0F60 *param2) { UnkStruct_ov21_021D4660 *v0; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4660) * ov21_021D5CB4()); - ov21_021D467C(param0, &v0[0], param2, (1 << 0)); - ov21_021D475C(param0, &v0[1], param2, (1 << 1)); - ov21_021D4704(param0, &v0[2], param2, (1 << 2)); - ov21_021D4878(&v0[3], param2, param0, (1 << 3)); - ov21_021D47F0(param0, &v0[4], param2, (1 << 4)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4660) * ov21_021D5CB4()); + ov21_021D467C(heapID, &v0[0], param2, (1 << 0)); + ov21_021D475C(heapID, &v0[1], param2, (1 << 1)); + ov21_021D4704(heapID, &v0[2], param2, (1 << 2)); + ov21_021D4878(&v0[3], param2, heapID, (1 << 3)); + ov21_021D47F0(heapID, &v0[4], param2, (1 << 4)); return v0; } diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c index 754cecdebc..1830898103 100644 --- a/src/overlay021/ov21_021D76B0.c +++ b/src/overlay021/ov21_021D76B0.c @@ -80,9 +80,9 @@ typedef struct { SpriteResource *unk_2C[4]; } UnkStruct_ov21_021D7C64; -static UnkStruct_ov21_021D77D4 *ov21_021D7728(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021D77E8 *ov21_021D7770(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021D4660 *ov21_021D7798(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D77D4 *ov21_021D7728(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D77E8 *ov21_021D7770(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021D7798(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021D77D4(UnkStruct_ov21_021D77D4 *param0); static void ov21_021D77E8(UnkStruct_ov21_021D77E8 *param0); static void ov21_021D77FC(UnkStruct_ov21_021D4660 *param0); @@ -94,7 +94,7 @@ static int ov21_021D78C0(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo static int ov21_021D7950(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); static int ov21_021D79E4(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); static void ov21_021D84A8(CellActor *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4); -static void ov21_021D7A64(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1, int param2); +static void ov21_021D7A64(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1, enum HeapId heapID); static void ov21_021D7B20(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1); static void ov21_021D7B70(UnkStruct_ov21_021D7A64 *param0); static void ov21_021D7B8C(u32 param0, u32 param1, void *param2); @@ -121,15 +121,15 @@ static BOOL ov21_021D8508(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D33 static void ov21_021D8530(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1); static fx32 ov21_021D8580(fx32 param0, s32 param1); -void ov21_021D76B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021D76B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021D77D4 *v0; UnkStruct_ov21_021D77E8 *v1; UnkStruct_ov21_021D4660 *v2; - v0 = ov21_021D7728(param2, param1); - v1 = ov21_021D7770(param2, param1); - v2 = ov21_021D7798(param2, param1); + v0 = ov21_021D7728(heapID, param1); + v1 = ov21_021D7770(heapID, param1); + v2 = ov21_021D7798(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -151,13 +151,13 @@ void ov21_021D7710(UnkStruct_ov21_021E68F4 *param0) ov21_021D77FC(param0->unk_20); } -static UnkStruct_ov21_021D77D4 *ov21_021D7728(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D77D4 *ov21_021D7728(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021D77D4 *v0; UnkStruct_ov21_021E68F4 *v1; int v2; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D77D4)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D77D4)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D77D4)); @@ -170,17 +170,17 @@ static UnkStruct_ov21_021D77D4 *ov21_021D7728(int param0, UnkStruct_ov21_021D0F6 } v0->unk_20 = ov21_021D13A0(param1); - v0->unk_24 = param0; + v0->unk_24 = heapID; return v0; } -static UnkStruct_ov21_021D77E8 *ov21_021D7770(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D77E8 *ov21_021D7770(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021D77E8 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D77E8)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D77E8)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D77E8)); @@ -190,17 +190,17 @@ static UnkStruct_ov21_021D77E8 *ov21_021D7770(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021D4660 *ov21_021D7798(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D4660 *ov21_021D7798(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021D4660 *v0; int v1 = ov21_021D7814(); - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4660) * v1); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4660) * v1); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4660) * v1); - ov21_021D4878(&v0[0], param1, param0, (0x1 << 0)); + ov21_021D4878(&v0[0], param1, heapID, (0x1 << 0)); return v0; } @@ -383,11 +383,11 @@ static int ov21_021D79E4(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo return 0; } -static void ov21_021D7A64(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1, int param2) +static void ov21_021D7A64(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1, enum HeapId heapID) { UnkStruct_ov21_021D7B8C *v0; - param0->unk_08 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 7); + param0->unk_08 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 7); ov21_021D154C(¶m0->unk_08[0], 40 - (48 / 2), 40 + (48 / 2), 48 - (96 / 2), 48 + (96 / 2)); ov21_021D154C(¶m0->unk_08[1], 88 - (48 / 2), 88 + (48 / 2), 48 - (96 / 2), 48 + (96 / 2)); @@ -402,12 +402,12 @@ static void ov21_021D7A64(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77 ov21_021D154C(¶m0->unk_08[6], (8 - 8), (8 - 8) + 16, (124 - 8), (124 - 8) + 64); - v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov21_021D7B8C)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D7B8C)); v0->unk_00 = param0; v0->unk_04 = param1; param0->unk_04 = v0; - param0->unk_00 = sub_02023FCC(param0->unk_08, 7, ov21_021D7B8C, v0, param2); + param0->unk_00 = sub_02023FCC(param0->unk_08, 7, ov21_021D7B8C, v0, heapID); } static void ov21_021D7B20(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1) diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c index 4f1f92f422..0b252f49c6 100644 --- a/src/overlay021/ov21_021D85B0.c +++ b/src/overlay021/ov21_021D85B0.c @@ -76,9 +76,9 @@ typedef struct { NNSG2dScreenData *unk_60; } UnkStruct_ov21_021D9320; -static UnkStruct_ov21_021D8788 *ov21_021D86E8(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021D879C *ov21_021D8724(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021D4660 *ov21_021D874C(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D8788 *ov21_021D86E8(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D879C *ov21_021D8724(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021D874C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021D8788(UnkStruct_ov21_021D8788 *param0); static void ov21_021D879C(UnkStruct_ov21_021D879C *param0); static void ov21_021D87B0(UnkStruct_ov21_021D4660 *param0); @@ -114,15 +114,15 @@ static void ov21_021D924C(UnkStruct_ov21_021D9320 *param0, int param1); static void ov21_021D8E68(UnkStruct_ov21_021D879C *param0, int param1); static void ov21_021D8C00(UnkStruct_ov21_021D879C *param0); -void ov21_021D85B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021D85B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021D8788 *v0; UnkStruct_ov21_021D879C *v1; UnkStruct_ov21_021D4660 *v2; - v0 = ov21_021D86E8(param2, param1); - v1 = ov21_021D8724(param2, param1); - v2 = ov21_021D874C(param2, param1); + v0 = ov21_021D86E8(heapID, param1); + v1 = ov21_021D8724(heapID, param1); + v2 = ov21_021D874C(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -250,12 +250,12 @@ int ov21_021D86E0(const UnkStruct_ov21_021E68F4 *param0) return v0->unk_34; } -static UnkStruct_ov21_021D8788 *ov21_021D86E8(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D8788 *ov21_021D86E8(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021D8788 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D8788)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D8788)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D8788)); @@ -268,12 +268,12 @@ static UnkStruct_ov21_021D8788 *ov21_021D86E8(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021D879C *ov21_021D8724(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D879C *ov21_021D8724(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021D879C *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D879C)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D879C)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D879C)); @@ -283,17 +283,17 @@ static UnkStruct_ov21_021D879C *ov21_021D8724(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021D4660 *ov21_021D874C(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D4660 *ov21_021D874C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021D4660 *v0; int v1 = ov21_021D87C8(); - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4660) * v1); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4660) * v1); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4660) * v1); - ov21_021D47F0(param0, &v0[0], param1, (0x1 << 1)); + ov21_021D47F0(heapID, &v0[0], param1, (0x1 << 1)); return v0; } diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c index 9b1f30ac5f..62012e7588 100644 --- a/src/overlay021/ov21_021D94BC.c +++ b/src/overlay021/ov21_021D94BC.c @@ -98,9 +98,9 @@ typedef struct { BOOL *unk_134; } UnkStruct_ov21_021DC96C; -static UnkStruct_ov21_021D95B8 *ov21_021D9534(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021D95CC *ov21_021D957C(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021D4660 *ov21_021D95B4(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D95B8 *ov21_021D9534(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D95CC *ov21_021D957C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021D95B4(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021D95B8(UnkStruct_ov21_021D95B8 *param0); static void ov21_021D95CC(UnkStruct_ov21_021D95CC *param0); static void ov21_021D95E0(UnkStruct_ov21_021D4660 *param0); @@ -150,14 +150,14 @@ static void ov21_021DC088(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C static void ov21_021DC12C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4CB8 *param1, UnkStruct_ov21_021D4C0C *param2); static void ov21_021DC1E8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4CB8 *param1, UnkStruct_ov21_021D4C0C *param2); static void ov21_021DC2A4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4CB8 *param1, UnkStruct_ov21_021D4C0C *param2); -static void ov21_021D9ADC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021D9ADC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID); static void ov21_021D9B24(UnkStruct_ov21_021D9B24 *param0); -static void ov21_021D9B34(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); -static void ov21_021D9B58(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2, int param3, int param4); +static void ov21_021D9B34(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID); +static void ov21_021D9B58(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID, int param3, int param4); static void ov21_021D9B98(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); static void ov21_021D9BB0(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2, int param3); static void ov21_021D9B04(UnkStruct_ov21_021D9B24 *param0); -static void ov21_021D9BEC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021D9BEC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID); static void ov21_021D9C90(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); static void ov21_021D9D00(UnkStruct_ov21_021D9B24 *param0); static void ov21_021D9D18(u32 param0, u32 param1, void *param2); @@ -165,41 +165,41 @@ static void ov21_021D9CA8(UnkStruct_ov21_021D9B24 *param0); static void ov21_021D9CB8(UnkStruct_ov21_021D9B24 *param0, int param1); static void ov21_021D9D50(UnkStruct_ov21_021D9B24 *param0); static void ov21_021D9D68(UnkStruct_ov21_021D9B24 *param0); -static void ov21_021D9D78(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021D9D78(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID); static void ov21_021D9E08(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); static void ov21_021D9E90(u32 param0, u32 param1, void *param2); -static void ov21_021D9EB4(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021D9EB4(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID); static void ov21_021D9F44(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); static void ov21_021D9FF8(u32 param0, u32 param1, void *param2); -static void ov21_021DA018(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021DA018(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID); static void ov21_021DA0BC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); static void ov21_021DA18C(u32 param0, u32 param1, void *param2); static void ov21_021DA0FC(UnkStruct_ov21_021D9B24 *param0, int param1); -static void ov21_021DA1C8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021DA1C8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID); static void ov21_021DA280(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); static void ov21_021DA2C0(u32 param0, u32 param1, void *param2); static void ov21_021DA308(UnkStruct_ov21_021D9B24 *param0, int param1); -static void ov21_021DA38C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021DA38C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID); static void ov21_021DA41C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); static void ov21_021DA514(u32 param0, u32 param1, void *param2); static void ov21_021DB3C8(UnkStruct_ov21_021D9B24 *param0); -static void ov21_021DB3E0(UnkStruct_ov21_021D9B24 *param0, int param1); -static void ov21_021DB3EC(UnkStruct_ov21_021D9B24 *param0, int param1, int param2, int param3); +static void ov21_021DB3E0(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID); +static void ov21_021DB3EC(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID, int param2, int param3); static void ov21_021DB428(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); static void ov21_021DB2FC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); static void ov21_021DB38C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2, int param3); -static void ov21_021DB468(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021DB468(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID); static void ov21_021DA534(UnkStruct_ov21_021D4FE4 *param0, int param1); static void ov21_021DA5A8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); -static void ov21_021DA6B0(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021DA6B0(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID); static void ov21_021DA7B0(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); -static void ov21_021DA888(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021DA888(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID); static void ov21_021DA988(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); -static void ov21_021DAAD4(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021DAAD4(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID); static void ov21_021DAC08(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); -static void ov21_021DAD74(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021DAD74(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID); static void ov21_021DAED8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); -static void ov21_021DB02C(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021DB02C(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID); static void ov21_021DB12C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); static void ov21_021DB480(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D9B24 *param1, const UnkStruct_ov21_021D95B8 *param2); static void ov21_021DB49C(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D9B24 *param1, const UnkStruct_ov21_021D95B8 *param2); @@ -216,15 +216,15 @@ static void ov21_021DC600(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95 static void ov21_021DC67C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); static void ov21_021DC720(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); -void ov21_021D94BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021D94BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021D95B8 *v0; UnkStruct_ov21_021D95CC *v1; UnkStruct_ov21_021D4660 *v2; - v0 = ov21_021D9534(param2, param1); - v1 = ov21_021D957C(param2, param1); - v2 = ov21_021D95B4(param2, param1); + v0 = ov21_021D9534(heapID, param1); + v1 = ov21_021D957C(heapID, param1); + v2 = ov21_021D95B4(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -245,12 +245,12 @@ void ov21_021D951C(UnkStruct_ov21_021E68F4 *param0) ov21_021D95E0(param0->unk_20); } -static UnkStruct_ov21_021D95B8 *ov21_021D9534(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D95B8 *ov21_021D9534(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021D95B8 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D95B8)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D95B8)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D95B8)); @@ -263,12 +263,12 @@ static UnkStruct_ov21_021D95B8 *ov21_021D9534(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021D95CC *ov21_021D957C(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D95CC *ov21_021D957C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021D95CC *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D95CC)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D95CC)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D95CC)); @@ -278,7 +278,7 @@ static UnkStruct_ov21_021D95CC *ov21_021D957C(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021D4660 *ov21_021D95B4(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D4660 *ov21_021D95B4(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { return NULL; } @@ -604,10 +604,10 @@ static void ov21_021D9A74(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_ Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 6); } -static void ov21_021D9ADC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) +static void ov21_021D9ADC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID) { - ov21_021D9BEC(param0, param1, param2); - ov21_021D9B58(param0, param1, param2, param0->unk_24, param0->unk_28); + ov21_021D9BEC(param0, param1, heapID); + ov21_021D9B58(param0, param1, heapID, param0->unk_24, param0->unk_28); ov21_021D9B04(param0); } @@ -630,30 +630,30 @@ static void ov21_021D9B24(UnkStruct_ov21_021D9B24 *param0) ov21_021D9D50(param0); } -static void ov21_021D9B34(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) +static void ov21_021D9B34(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID) { ov21_021D9D50(param0); - ov21_021D9B58(param0, param1, param2, param0->unk_24, param0->unk_28); + ov21_021D9B58(param0, param1, heapID, param0->unk_24, param0->unk_28); } -static void ov21_021D9B58(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2, int param3, int param4) +static void ov21_021D9B58(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID, int param3, int param4) { switch (param3) { case 0: - ov21_021D9D78(param0, param1, param2); + ov21_021D9D78(param0, param1, heapID); break; case 1: - ov21_021D9EB4(param0, param1, param2); + ov21_021D9EB4(param0, param1, heapID); break; case 2: if (param4 == 0) { - ov21_021DA018(param0, param1, param2); + ov21_021DA018(param0, param1, heapID); } else { - ov21_021DA1C8(param0, param1, param2); + ov21_021DA1C8(param0, param1, heapID); } break; case 3: - ov21_021DA38C(param0, param1, param2); + ov21_021DA38C(param0, param1, heapID); break; default: break; @@ -690,9 +690,9 @@ static void ov21_021D9BB0(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95 } } -static void ov21_021D9BEC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) +static void ov21_021D9BEC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID) { - param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 6); + param0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 6); ov21_021D154C(¶m0->unk_04[1], 48 - (32 / 2), 48 + (32 / 2), 224 - (64 / 2), 224 + (64 / 2)); ov21_021D154C(¶m0->unk_04[0], 16 - (32 / 2), 16 + (32 / 2), 212 - (48 / 2), 212 + (48 / 2)); @@ -703,7 +703,7 @@ static void ov21_021D9BEC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95 param0->unk_10.unk_00 = param1; param0->unk_10.unk_04 = param0; - param0->unk_00 = sub_02023FCC(param0->unk_04, 6, ov21_021D9D18, ¶m0->unk_10, param2); + param0->unk_00 = sub_02023FCC(param0->unk_04, 6, ov21_021D9D18, ¶m0->unk_10, heapID); } static void ov21_021D9C90(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) @@ -794,12 +794,12 @@ static void ov21_021D9D68(UnkStruct_ov21_021D9B24 *param0) } } -static void ov21_021D9D78(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) +static void ov21_021D9D78(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID) { int v0, v1; int v2, v3; - param0->unk_0C = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 6); + param0->unk_0C = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 6); for (v0 = 0; v0 < 3; v0++) { v3 = 48 + (v0 * (48 - 16)); @@ -812,7 +812,7 @@ static void ov21_021D9D78(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95 param0->unk_10.unk_00 = param1; param0->unk_10.unk_04 = param0; - param0->unk_08 = sub_02023FCC(param0->unk_0C, 6, ov21_021D9E90, ¶m0->unk_10, param2); + param0->unk_08 = sub_02023FCC(param0->unk_0C, 6, ov21_021D9E90, ¶m0->unk_10, heapID); } static void ov21_021D9E08(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) @@ -877,12 +877,12 @@ static void ov21_021D9E90(u32 param0, u32 param1, void *param2) } } -static void ov21_021D9EB4(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) +static void ov21_021D9EB4(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID) { int v0, v1; int v2, v3; - param0->unk_0C = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 10); + param0->unk_0C = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 10); for (v0 = 0; v0 < 5; v0++) { v3 = 16 + (v0 * (48 - 16)); @@ -895,7 +895,7 @@ static void ov21_021D9EB4(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95 param0->unk_10.unk_00 = param1; param0->unk_10.unk_04 = param0; - param0->unk_08 = sub_02023FCC(param0->unk_0C, 10, ov21_021D9FF8, ¶m0->unk_10, param2); + param0->unk_08 = sub_02023FCC(param0->unk_0C, 10, ov21_021D9FF8, ¶m0->unk_10, heapID); } static void ov21_021D9F44(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) @@ -977,12 +977,12 @@ static void ov21_021D9FF8(u32 param0, u32 param1, void *param2) } } -static void ov21_021DA018(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) +static void ov21_021DA018(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID) { int v0, v1; int v2, v3; - param0->unk_0C = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 11); + param0->unk_0C = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 11); for (v0 = 0; v0 < 5; v0++) { v3 = 16 + (v0 * (48 - 16)); @@ -1000,7 +1000,7 @@ static void ov21_021DA018(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95 param0->unk_10.unk_00 = param1; param0->unk_10.unk_04 = param0; - param0->unk_08 = sub_02023FCC(param0->unk_0C, 11, ov21_021DA18C, ¶m0->unk_10, param2); + param0->unk_08 = sub_02023FCC(param0->unk_0C, 11, ov21_021DA18C, ¶m0->unk_10, heapID); } static void ov21_021DA0BC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) @@ -1091,12 +1091,12 @@ static void ov21_021DA18C(u32 param0, u32 param1, void *param2) } } -static void ov21_021DA1C8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) +static void ov21_021DA1C8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID) { int v0, v1; int v2, v3; - param0->unk_0C = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 10); + param0->unk_0C = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 10); for (v0 = 0; v0 < 4; v0++) { v3 = 16 + (v0 * (48 - 16)); @@ -1119,7 +1119,7 @@ static void ov21_021DA1C8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95 param0->unk_10.unk_00 = param1; param0->unk_10.unk_04 = param0; - param0->unk_08 = sub_02023FCC(param0->unk_0C, 10, ov21_021DA2C0, ¶m0->unk_10, param2); + param0->unk_08 = sub_02023FCC(param0->unk_0C, 10, ov21_021DA2C0, ¶m0->unk_10, heapID); } static void ov21_021DA280(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) @@ -1210,12 +1210,12 @@ static void ov21_021DA308(UnkStruct_ov21_021D9B24 *param0, int param1) } } -static void ov21_021DA38C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) +static void ov21_021DA38C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID) { int v0, v1; int v2, v3; - param0->unk_0C = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 15); + param0->unk_0C = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 15); for (v0 = 0; v0 < 5; v0++) { v3 = 16 + (v0 * (48 - 16)); @@ -1229,7 +1229,7 @@ static void ov21_021DA38C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95 param0->unk_10.unk_00 = param1; param0->unk_10.unk_04 = param0; - param0->unk_08 = sub_02023FCC(param0->unk_0C, 15, ov21_021DA514, ¶m0->unk_10, param2); + param0->unk_08 = sub_02023FCC(param0->unk_0C, 15, ov21_021DA514, ¶m0->unk_10, heapID); } static void ov21_021DA41C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) @@ -1429,14 +1429,14 @@ static void ov21_021DA5A8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95 } } -static void ov21_021DA6B0(UnkStruct_ov21_021D9B24 *param0, int param1) +static void ov21_021DA6B0(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID) { int v0, v1; int v2, v3; int v4; int v5; - param0->unk_1C = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov21_021D4FE4) * (3 * 6)); + param0->unk_1C = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4FE4) * (3 * 6)); for (v0 = 0; v0 < 6; v0++) { v3 = 16 + (v0 * (48 - 16)); @@ -1498,7 +1498,7 @@ static void ov21_021DA6B0(UnkStruct_ov21_021D9B24 *param0, int param1) } } - param0->unk_18 = ov21_021D4EE4(param1); + param0->unk_18 = ov21_021D4EE4(heapID); ov21_021D4F04(param0->unk_18, param0->unk_1C, 3, 6); } @@ -1540,14 +1540,14 @@ static void ov21_021DA7B0(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95 } } -static void ov21_021DA888(UnkStruct_ov21_021D9B24 *param0, int param1) +static void ov21_021DA888(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID) { int v0, v1; int v2, v3; int v4; int v5; - param0->unk_1C = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov21_021D4FE4) * (3 * 6)); + param0->unk_1C = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4FE4) * (3 * 6)); for (v0 = 0; v0 < 6; v0++) { v3 = 16 + (v0 * (48 - 16)); @@ -1609,7 +1609,7 @@ static void ov21_021DA888(UnkStruct_ov21_021D9B24 *param0, int param1) } } - param0->unk_18 = ov21_021D4EE4(param1); + param0->unk_18 = ov21_021D4EE4(heapID); ov21_021D4F04(param0->unk_18, param0->unk_1C, 3, 6); } @@ -1667,7 +1667,7 @@ static void ov21_021DA988(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95 } } -static void ov21_021DAAD4(UnkStruct_ov21_021D9B24 *param0, int param1) +static void ov21_021DAAD4(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID) { int v0, v1; int v2, v3; @@ -1675,7 +1675,7 @@ static void ov21_021DAAD4(UnkStruct_ov21_021D9B24 *param0, int param1) int v6; int v7; - param0->unk_1C = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov21_021D4FE4) * (3 * 6)); + param0->unk_1C = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4FE4) * (3 * 6)); for (v0 = 0; v0 < 6; v0++) { v3 = 16 + (v0 * (48 - 16)); @@ -1756,7 +1756,7 @@ static void ov21_021DAAD4(UnkStruct_ov21_021D9B24 *param0, int param1) } } - param0->unk_18 = ov21_021D4EE4(param1); + param0->unk_18 = ov21_021D4EE4(heapID); ov21_021D4F04(param0->unk_18, param0->unk_1C, 3, 6); } @@ -1819,7 +1819,7 @@ static void ov21_021DAC08(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95 } } -static void ov21_021DAD74(UnkStruct_ov21_021D9B24 *param0, int param1) +static void ov21_021DAD74(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID) { int v0, v1; int v2, v3; @@ -1827,7 +1827,7 @@ static void ov21_021DAD74(UnkStruct_ov21_021D9B24 *param0, int param1) int v6, v7; int v8; - param0->unk_1C = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov21_021D4FE4) * (3 * 6)); + param0->unk_1C = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4FE4) * (3 * 6)); for (v0 = 0; v0 < 6; v0++) { v3 = 16 + (v0 * (48 - 16)); @@ -1922,7 +1922,7 @@ static void ov21_021DAD74(UnkStruct_ov21_021D9B24 *param0, int param1) } } - param0->unk_18 = ov21_021D4EE4(param1); + param0->unk_18 = ov21_021D4EE4(heapID); ov21_021D4F04(param0->unk_18, param0->unk_1C, 3, 6); } @@ -1981,14 +1981,14 @@ static void ov21_021DAED8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95 } } -static void ov21_021DB02C(UnkStruct_ov21_021D9B24 *param0, int param1) +static void ov21_021DB02C(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID) { int v0, v1; int v2, v3; int v4; int v5; - param0->unk_1C = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov21_021D4FE4) * (4 * 6)); + param0->unk_1C = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4FE4) * (4 * 6)); for (v0 = 0; v0 < 6; v0++) { v3 = 16 + (v0 * (48 - 16)); @@ -2050,7 +2050,7 @@ static void ov21_021DB02C(UnkStruct_ov21_021D9B24 *param0, int param1) } } - param0->unk_18 = ov21_021D4EE4(param1); + param0->unk_18 = ov21_021D4EE4(heapID); ov21_021D4F04(param0->unk_18, param0->unk_1C, 4, 6); } @@ -2186,29 +2186,29 @@ static void ov21_021DB3C8(UnkStruct_ov21_021D9B24 *param0) param0->unk_1C = NULL; } -static void ov21_021DB3E0(UnkStruct_ov21_021D9B24 *param0, int param1) +static void ov21_021DB3E0(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID) { - ov21_021DB3EC(param0, param1, param0->unk_24, param0->unk_28); + ov21_021DB3EC(param0, heapID, param0->unk_24, param0->unk_28); } -static void ov21_021DB3EC(UnkStruct_ov21_021D9B24 *param0, int param1, int param2, int param3) +static void ov21_021DB3EC(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID, int param2, int param3) { switch (param2) { case 0: - ov21_021DA6B0(param0, param1); + ov21_021DA6B0(param0, heapID); break; case 1: - ov21_021DA888(param0, param1); + ov21_021DA888(param0, heapID); break; case 2: if (param3 == 0) { - ov21_021DAAD4(param0, param1); + ov21_021DAAD4(param0, heapID); } else { - ov21_021DAD74(param0, param1); + ov21_021DAD74(param0, heapID); } break; case 3: - ov21_021DB02C(param0, param1); + ov21_021DB02C(param0, heapID); break; default: break; @@ -2240,10 +2240,10 @@ static void ov21_021DB428(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95 ov21_021D4F20(param0->unk_18, 4, v0); } -static void ov21_021DB468(UnkStruct_ov21_021D9B24 *param0, int param1) +static void ov21_021DB468(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID) { ov21_021DB3C8(param0); - ov21_021DB3EC(param0, param1, param0->unk_24, param0->unk_28); + ov21_021DB3EC(param0, heapID, param0->unk_24, param0->unk_28); } static void ov21_021DB480(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D9B24 *param1, const UnkStruct_ov21_021D95B8 *param2) diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c index 36088ce16c..e4ad055f52 100644 --- a/src/overlay021/ov21_021DC9BC.c +++ b/src/overlay021/ov21_021DC9BC.c @@ -136,8 +136,8 @@ typedef struct { u32 fieldsZero; } PokedexMapDisplay; -static UnkStruct_ov21_021DCACC *ov21_021DCA5C(int heapID, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021DCAE0 *ov21_021DCAA0(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021DCACC *ov21_021DCA5C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021DCAE0 *ov21_021DCAA0(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021DCACC(UnkStruct_ov21_021DCACC *param0); static void ov21_021DCAE0(UnkStruct_ov21_021DCAE0 *param0); static int ov21_021DCAF4(void); @@ -154,21 +154,21 @@ static void ov21_021DD490(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 static BOOL ov21_021DD508(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, BOOL param3); static void ov21_021DD554(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, BOOL param3); static BOOL ov21_021DD5E4(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, BOOL param3); -static void ov21_021DCDD0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, const EncounterCollection *encounterCollection, int param4); +static void ov21_021DCDD0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, const EncounterCollection *encounterCollection, enum HeapId heapID); static void ov21_021DCE20(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1); -static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_021DCACC *param1, int param2); -static void ov21_021DD668(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, int param2); +static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_021DCACC *param1, enum HeapId heapID); +static void ov21_021DD668(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapId heapID); static void ov21_021DD6C0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1); -static void ov21_021DCFC8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, int param2); +static void ov21_021DCFC8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapId heapID); static void ov21_021DD114(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1); -static void ov21_021DD1A8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, int heapID); +static void ov21_021DD1A8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapId heapID); static void PokedexMapDisplay_DeleteCellActors(PokedexMapDisplay *mapDisplay); -static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, int param3); +static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, enum HeapId heapID); static void ov21_021DD3FC(PokedexMapDisplay *mapDisplay); static void ov21_021DD9E8(PokedexMapDisplay *mapDisplay, const EncounterCollection *encounterCollection); static void ov21_021DDA48(PokedexMapDisplay *mapDisplay, int param1); static void ov21_021DDA80(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, const EncounterCollection *encounterCollection, int param4); -static void ov21_021DD710(PokedexMapDisplay *mapDisplay, const UnkStruct_ov21_021DCACC *param1, const EncounterCollection *encounterCollection, int param3); +static void ov21_021DD710(PokedexMapDisplay *mapDisplay, const UnkStruct_ov21_021DCACC *param1, const EncounterCollection *encounterCollection, enum HeapId heapID); static void ov21_021DD8B4(PokedexMapDisplay *mapDisplay); static u8 *PokedexEncounters_InvisibleFields(u32 heapID, const UnkStruct_ov21_021DCACC *param1, u32 *param2); static u8 *PokedexEncounters_InvisibleDungeons(u32 param0, const UnkStruct_ov21_021DCACC *param1, u32 *param2); @@ -176,10 +176,10 @@ static void ov21_021DD964(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 static void ov21_021DDB8C(PokedexMapDisplay *mapDisplay); static void ov21_021DDBCC(PokedexMapDisplay *mapDisplay); static void ov21_021DDC14(PokedexMapDisplay *mapDisplay); -static void PokedexSort_PopulateDexStatus(EncounterCollection *encounterCollection, UnkStruct_ov21_021DCACC *param1, int heapID); +static void PokedexSort_PopulateDexStatus(EncounterCollection *encounterCollection, UnkStruct_ov21_021DCACC *param1, enum HeapId heapID); static void ov21_021DDB68(EncounterCollection *encounterCollection); -void ov21_021DC9BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int heapID) +void ov21_021DC9BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021DCACC *v0; UnkStruct_ov21_021DCAE0 *v1; @@ -239,7 +239,7 @@ void ov21_021DCA54(UnkStruct_ov21_021E68F4 *param0, int param1) v0->unk_10 = param1; } -static UnkStruct_ov21_021DCACC *ov21_021DCA5C(int heapID, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021DCACC *ov21_021DCA5C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021DCACC *v0; @@ -254,12 +254,12 @@ static UnkStruct_ov21_021DCACC *ov21_021DCA5C(int heapID, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021DCAE0 *ov21_021DCAA0(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021DCAE0 *ov21_021DCAA0(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021DCAE0 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021DCAE0)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021DCAE0)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021DCAE0)); @@ -478,7 +478,7 @@ static int ov21_021DCD04(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo return 0; } -static void ov21_021DCDD0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, const EncounterCollection *encounterCollection, int heapID) +static void ov21_021DCDD0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, const EncounterCollection *encounterCollection, enum HeapId heapID) { ov21_021DCE40(param1, param2, heapID); ov21_021DD668(mapDisplay, param1, heapID); @@ -497,7 +497,7 @@ static void ov21_021DCE20(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 ov21_021DD114(mapDisplay, param1); } -static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_021DCACC *param1, int heapID) +static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_021DCACC *param1, enum HeapId heapID) { void *v0; NNSG2dScreenData *v1; @@ -540,7 +540,7 @@ static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_ Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); } -static void ov21_021DCFC8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, int heapID) +static void ov21_021DCFC8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapId heapID) { UnkStruct_ov21_021D13FC *v0 = param1->unk_00; NARC *v1 = ov21_021D26E0(param1->unk_00); @@ -582,7 +582,7 @@ static void ov21_021DD114(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 SpriteResourceCollection_Remove(v0->unk_13C[3], mapDisplay->unk_D0[3]); } -static void ov21_021DD1A8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, int heapID) +static void ov21_021DD1A8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapId heapID) { CellActorResourceData v0; CellActorInitParams v1; @@ -632,7 +632,7 @@ static void PokedexMapDisplay_DeleteCellActors(PokedexMapDisplay *mapDisplay) } } -static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, int heapID) +static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, enum HeapId heapID) { Window *v0; UnkStruct_ov21_021D4CB8 v1; @@ -808,7 +808,7 @@ static BOOL ov21_021DD5E4(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 return 0; } -static void ov21_021DD668(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, int heapID) +static void ov21_021DD668(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapId heapID) { Window_FillTilemap(¶m1->unk_00->unk_04, 0); @@ -835,7 +835,7 @@ static void ov21_021DD6C0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 Window_SetPalette(¶m1->unk_00->unk_04, 0); } -static void ov21_021DD710(PokedexMapDisplay *mapDisplay, const UnkStruct_ov21_021DCACC *param1, const EncounterCollection *encounterCollection, int heapID) +static void ov21_021DD710(PokedexMapDisplay *mapDisplay, const UnkStruct_ov21_021DCACC *param1, const EncounterCollection *encounterCollection, enum HeapId heapID) { int index, v1; int v2, v3; @@ -1150,7 +1150,7 @@ static void ov21_021DDA80(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 } } -static void PokedexSort_PopulateDexStatus(EncounterCollection *encounterCollection, UnkStruct_ov21_021DCACC *param1, int heapID) +static void PokedexSort_PopulateDexStatus(EncounterCollection *encounterCollection, UnkStruct_ov21_021DCACC *param1, enum HeapId heapID) { int dungeonCategory; int fieldCategory; diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c index ad413772a6..bf09d28989 100644 --- a/src/overlay021/ov21_021DDD2C.c +++ b/src/overlay021/ov21_021DDD2C.c @@ -70,9 +70,9 @@ typedef struct { int unk_28; } UnkStruct_ov21_021DDEC8; -static UnkStruct_ov21_021DDDA4 *ov21_021DDDA4(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021DDDF0 *ov21_021DDDF0(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021D4660 *ov21_021DDE18(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021DDDA4 *ov21_021DDDA4(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021DDDF0 *ov21_021DDDF0(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021DDE18(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021DDE1C(UnkStruct_ov21_021DDDA4 *param0); static void ov21_021DDE30(UnkStruct_ov21_021DDDF0 *param0); static void ov21_021DDE44(UnkStruct_ov21_021D4660 *param0); @@ -87,7 +87,7 @@ static void ov21_021DE040(UnkStruct_ov21_021DDEC8 *param0); static void ov21_021DE04C(UnkStruct_ov21_021DDEC8 *param0); static void ov21_021DE058(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, const UnkStruct_ov21_021DDDA4 *param2, BOOL param3); static BOOL ov21_021DE0C4(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, const UnkStruct_ov21_021DDDA4 *param2, BOOL param3); -static void ov21_021DE2EC(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1, int param2); +static void ov21_021DE2EC(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1, enum HeapId heapID); static void ov21_021DE334(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1); static void ov21_021DE44C(u32 param0, u32 param1, void *param2); static void ov21_021DE484(UnkStruct_ov21_021DDE4C *param0); @@ -106,15 +106,15 @@ static void ov21_021DE49C(UnkStruct_ov21_021DDEC8 *param0, const UnkStruct_ov21_ static int ov21_021DE5DC(int param0); static void ov21_021DE4D4(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, const UnkStruct_ov21_021DDDA4 *param2, int param3); -void ov21_021DDD2C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021DDD2C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021DDDA4 *v0; UnkStruct_ov21_021DDDF0 *v1; UnkStruct_ov21_021D4660 *v2; - v0 = ov21_021DDDA4(param2, param1); - v1 = ov21_021DDDF0(param2, param1); - v2 = ov21_021DDE18(param2, param1); + v0 = ov21_021DDDA4(heapID, param1); + v1 = ov21_021DDDF0(heapID, param1); + v2 = ov21_021DDE18(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -136,11 +136,11 @@ void ov21_021DDD8C(UnkStruct_ov21_021E68F4 *param0) ov21_021DDE44(param0->unk_20); } -static UnkStruct_ov21_021DDDA4 *ov21_021DDDA4(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021DDDA4 *ov21_021DDDA4(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021DDDA4 *v0; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021DDDA4)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021DDDA4)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021DDDA4)); @@ -152,11 +152,11 @@ static UnkStruct_ov21_021DDDA4 *ov21_021DDDA4(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021DDDF0 *ov21_021DDDF0(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021DDDF0 *ov21_021DDDF0(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021DDDF0 *v0; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021DDDF0)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021DDDF0)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021DDDF0)); @@ -166,7 +166,7 @@ static UnkStruct_ov21_021DDDF0 *ov21_021DDDF0(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021D4660 *ov21_021DDE18(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D4660 *ov21_021DDE18(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { return NULL; } @@ -453,16 +453,16 @@ static void ov21_021DE2E0(UnkStruct_ov21_021DDEC8 *param0) CellActor_Delete(param0->unk_00); } -static void ov21_021DE2EC(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1, int param2) +static void ov21_021DE2EC(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1, enum HeapId heapID) { - param0->unk_14 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 1); + param0->unk_14 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 1); param0->unk_14[0].circle.code = TOUCHSCREEN_USE_CIRCLE; param0->unk_14[0].circle.x = param0->unk_00; param0->unk_14[0].circle.y = param0->unk_04; param0->unk_14[0].circle.r = 32; param0->unk_18.unk_00 = param1; param0->unk_18.unk_04 = param0; - param0->unk_10 = sub_02023FCC(param0->unk_14, 1, ov21_021DE44C, ¶m0->unk_18, param2); + param0->unk_10 = sub_02023FCC(param0->unk_14, 1, ov21_021DE44C, ¶m0->unk_18, heapID); } static void ov21_021DE334(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1) diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c index cce72d3894..7cdd4d06c9 100644 --- a/src/overlay021/ov21_021DE668.c +++ b/src/overlay021/ov21_021DE668.c @@ -56,8 +56,8 @@ typedef struct { UnkStruct_ov21_021D2648 unk_54; } UnkStruct_ov21_021DF374; -static UnkStruct_ov21_021DE6D4 *ov21_021DE6E8(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021DE760 *ov21_021DE724(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021DE6D4 *ov21_021DE6E8(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021DE760 *ov21_021DE724(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021DE74C(UnkStruct_ov21_021DE6D4 *param0); static void ov21_021DE760(UnkStruct_ov21_021DE760 *param0); static int ov21_021DE774(void); @@ -104,13 +104,13 @@ static void ov21_021DEF3C(UnkStruct_ov21_021DE760 *param0); static void ov21_021DEF54(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_021DE6D4 *param1); static void ov21_021DEF8C(UnkStruct_ov21_021DE760 *param0); -void ov21_021DE668(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021DE668(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021DE6D4 *v0; UnkStruct_ov21_021DE760 *v1; - v0 = ov21_021DE6E8(param2, param1); - v1 = ov21_021DE724(param2, param1); + v0 = ov21_021DE6E8(heapID, param1); + v1 = ov21_021DE724(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -148,12 +148,12 @@ BOOL ov21_021DE6D8(UnkStruct_ov21_021DE6D4 *param0, int param1) return v0; } -static UnkStruct_ov21_021DE6D4 *ov21_021DE6E8(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021DE6D4 *ov21_021DE6E8(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021DE6D4 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021DE6D4)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021DE6D4)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021DE6D4)); @@ -166,12 +166,12 @@ static UnkStruct_ov21_021DE6D4 *ov21_021DE6E8(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021DE760 *ov21_021DE724(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021DE760 *ov21_021DE724(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021DE760 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021DE760)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021DE760)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021DE760)); @@ -425,7 +425,7 @@ static void ov21_021DEB58(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_ ov21_021DEB8C(¶m0->unk_00->unk_04, species, param2, param1->unk_18, TEXT_COLOR(2, 1, 0)); } -void ov21_021DEB8C(Window *param0, int param1, int heapID, int param3, u32 param4) +void ov21_021DEB8C(Window *param0, int param1, enum HeapId heapID, int param3, u32 param4) { Strbuf *v0 = Strbuf_Init(64, heapID); MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c index de4844f749..e6430fd37f 100644 --- a/src/overlay021/ov21_021DF734.c +++ b/src/overlay021/ov21_021DF734.c @@ -63,8 +63,8 @@ typedef struct { } UnkStruct_ov21_021DFFF8; static inline int inline_ov21_021E00F4(int param0, int param1); -static UnkStruct_ov21_021DF844 *ov21_021DF7CC(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021DF858 *ov21_021DF80C(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021DF844 *ov21_021DF7CC(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021DF858 *ov21_021DF80C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021DF844(UnkStruct_ov21_021DF844 *param0); static void ov21_021DF858(UnkStruct_ov21_021DF858 *param0); static int ov21_021DF86C(void); @@ -130,13 +130,13 @@ static void ov21_021E0BF8(UnkStruct_ov21_021DFFF8 *param0); static void ov21_021E0C10(UnkStruct_ov21_021DFFF8 *param0); static void ov21_021E0C30(UnkStruct_ov21_021DFFF8 *param0); -void ov21_021DF734(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021DF734(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021DF844 *v0; UnkStruct_ov21_021DF858 *v1; - v0 = ov21_021DF7CC(param2, param1); - v1 = ov21_021DF80C(param2, param1); + v0 = ov21_021DF7CC(heapID, param1); + v1 = ov21_021DF80C(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -177,12 +177,12 @@ BOOL ov21_021DF7A0(UnkStruct_ov21_021E68F4 *param0, int param1) return 0; } -static UnkStruct_ov21_021DF844 *ov21_021DF7CC(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021DF844 *ov21_021DF7CC(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021DF844 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021DF844)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021DF844)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021DF844)); @@ -195,12 +195,12 @@ static UnkStruct_ov21_021DF844 *ov21_021DF7CC(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021DF858 *ov21_021DF80C(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021DF858 *ov21_021DF80C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021DF858 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021DF858)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021DF858)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021DF858)); diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c index da76043fcb..bca94fe837 100644 --- a/src/overlay021/ov21_021E0C68.c +++ b/src/overlay021/ov21_021E0C68.c @@ -60,8 +60,8 @@ typedef struct { UnkStruct_ov21_021D2648 unk_38; } UnkStruct_ov21_021E14D4; -static UnkStruct_ov21_021E0D68 *ov21_021E0D04(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021E0D7C *ov21_021E0D40(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E0D68 *ov21_021E0D04(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E0D7C *ov21_021E0D40(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021E0D68(UnkStruct_ov21_021E0D68 *param0); static void ov21_021E0D7C(UnkStruct_ov21_021E0D7C *param0); static int ov21_021E0D90(void); @@ -87,7 +87,7 @@ static BOOL ov21_021E1840(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D static void ov21_021E0F4C(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, int param3); static void ov21_021E0F94(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1); static void ov21_021E0FBC(UnkStruct_ov21_021E0D7C *param0, int param1); -static void ov21_021E10D0(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1, int param2); +static void ov21_021E10D0(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1, enum HeapId heapID); static void ov21_021E1188(UnkStruct_ov21_021E0D7C *param0, int param1, int param2, int param3, int param4); static int LanguageMessage(int param0); static void ov21_021E18A0(UnkStruct_ov21_021E0D7C *param0, int param1, int param2, int param3); @@ -102,13 +102,13 @@ static void ov21_021E1210(UnkStruct_ov21_021E0D7C *param0); static void ov21_021E1228(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1); static void ov21_021E1260(UnkStruct_ov21_021E0D7C *param0); -void ov21_021E0C68(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021E0C68(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021E0D68 *v0; UnkStruct_ov21_021E0D7C *v1; - v0 = ov21_021E0D04(param2, param1); - v1 = ov21_021E0D40(param2, param1); + v0 = ov21_021E0D04(heapID, param1); + v1 = ov21_021E0D40(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -171,12 +171,12 @@ void ov21_021E0CF8(UnkStruct_ov21_021E68F4 *param0, int param1) v0->unk_1C = 0; } -static UnkStruct_ov21_021E0D68 *ov21_021E0D04(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E0D68 *ov21_021E0D04(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E0D68 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E0D68)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E0D68)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E0D68)); @@ -191,12 +191,12 @@ static UnkStruct_ov21_021E0D68 *ov21_021E0D04(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021E0D7C *ov21_021E0D40(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E0D7C *ov21_021E0D40(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E0D7C *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E0D7C)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E0D7C)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E0D7C)); @@ -416,7 +416,7 @@ static void ov21_021E0FBC(UnkStruct_ov21_021E0D7C *param0, int param1) Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); } -static void ov21_021E10D0(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1, int heapID) +static void ov21_021E10D0(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1, enum HeapId heapID) { Strbuf *v0 = Strbuf_Init(64, heapID); MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c index 04c65997dd..7f8cf83510 100644 --- a/src/overlay021/ov21_021E1924.c +++ b/src/overlay021/ov21_021E1924.c @@ -82,9 +82,9 @@ typedef struct { u32 unk_C0; } UnkStruct_ov21_021E2588; -static UnkStruct_ov21_021E1A7C *ov21_021E199C(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021E1A90 *ov21_021E19FC(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021D4660 *ov21_021E1A24(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E1A7C *ov21_021E199C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E1A90 *ov21_021E19FC(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021E1A24(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021E1A7C(UnkStruct_ov21_021E1A7C *param0); static void ov21_021E1A90(UnkStruct_ov21_021E1A90 *param0); static void ov21_021E1AA4(UnkStruct_ov21_021D4660 *param0); @@ -99,7 +99,7 @@ static void ov21_021E2588(UnkStruct_ov21_021E2588 *param0); static void ov21_021E25C0(UnkStruct_ov21_021E2588 *param0); static void ov21_021E25F8(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, const UnkStruct_ov21_021E1A7C *param2, BOOL param3); static BOOL ov21_021E2664(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, const UnkStruct_ov21_021E1A7C *param2, BOOL param3); -static void ov21_021E1D40(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1, int param2); +static void ov21_021E1D40(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1, enum HeapId heapID); static void ov21_021E1E00(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1); static void ov21_021E1E74(UnkStruct_ov21_021E1E74 *param0); static void ov21_021E1E8C(u32 param0, u32 param1, void *param2); @@ -140,15 +140,15 @@ static u32 const Unk_ov21_021E9D98[(7 - 2 + 1)] = { 0x0 }; -void ov21_021E1924(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021E1924(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021E1A7C *v0; UnkStruct_ov21_021E1A90 *v1; UnkStruct_ov21_021D4660 *v2; - v0 = ov21_021E199C(param2, param1); - v1 = ov21_021E19FC(param2, param1); - v2 = ov21_021E1A24(param2, param1); + v0 = ov21_021E199C(heapID, param1); + v1 = ov21_021E19FC(heapID, param1); + v2 = ov21_021E1A24(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -170,14 +170,14 @@ void ov21_021E1984(UnkStruct_ov21_021E68F4 *param0) ov21_021E1AA4(param0->unk_20); } -static UnkStruct_ov21_021E1A7C *ov21_021E199C(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E1A7C *ov21_021E199C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E1A7C *v0; UnkStruct_ov21_021E68F4 *v1; UnkStruct_ov21_021D3320 *v2; int v3; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E1A7C)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E1A7C)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E1A7C)); @@ -200,12 +200,12 @@ static UnkStruct_ov21_021E1A7C *ov21_021E199C(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021E1A90 *ov21_021E19FC(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E1A90 *ov21_021E19FC(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E1A90 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E1A90)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E1A90)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E1A90)); @@ -215,19 +215,19 @@ static UnkStruct_ov21_021E1A90 *ov21_021E19FC(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021D4660 *ov21_021E1A24(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D4660 *ov21_021E1A24(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021D4660 *v0; int v1 = ov21_021E1ACC(); - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4660) * v1); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4660) * v1); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4660) * v1); - ov21_021D4A94(param0, &v0[0], param1, (1 << 0)); - ov21_021D4BB4(param0, &v0[1], param1, (1 << 1)); - ov21_021D4AF8(param0, &v0[2], param1, (1 << 2)); + ov21_021D4A94(heapID, &v0[0], param1, (1 << 0)); + ov21_021D4BB4(heapID, &v0[1], param1, (1 << 1)); + ov21_021D4AF8(heapID, &v0[2], param1, (1 << 2)); return v0; } @@ -427,9 +427,9 @@ static int ov21_021E1CB8(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo return 0; } -static void ov21_021E1D40(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1, int param2) +static void ov21_021E1D40(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1, enum HeapId heapID) { - param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 8); + param0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 8); ov21_021D154C(¶m0->unk_04[0], 132 - (40 / 2), 132 + (40 / 2), 128 - (160 / 2), 128 + (160 / 2)); ov21_021D154C(¶m0->unk_04[1], 76 - (40 / 2), 76 + (40 / 2), 128 - (160 / 2), 128 + (160 / 2)); @@ -442,7 +442,7 @@ static void ov21_021E1D40(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A param0->unk_08.unk_00 = param1; param0->unk_08.unk_04 = param0; - param0->unk_00 = sub_02023FCC(param0->unk_04, 8, ov21_021E1E8C, ¶m0->unk_08, param2); + param0->unk_00 = sub_02023FCC(param0->unk_04, 8, ov21_021E1E8C, ¶m0->unk_08, heapID); } static void ov21_021E1E00(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1) diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c index 0c811268ac..754a7758ab 100644 --- a/src/overlay021/ov21_021E29DC.c +++ b/src/overlay021/ov21_021E29DC.c @@ -109,9 +109,9 @@ typedef struct { SpriteResource *unk_18[4]; } UnkStruct_ov21_021E3900; -static UnkStruct_ov21_021E2BA8 *ov21_021E2A5C(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021E2BBC *ov21_021E2AE0(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021D4660 *ov21_021E2B08(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E2BA8 *ov21_021E2A5C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E2BBC *ov21_021E2AE0(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021E2B08(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021E2BA8(UnkStruct_ov21_021E2BA8 *param0); static void ov21_021E2BBC(UnkStruct_ov21_021E2BBC *param0); static void ov21_021E2BD0(UnkStruct_ov21_021D4660 *param0); @@ -140,9 +140,9 @@ static void ov21_021E3304(UnkStruct_ov21_021E326C *param0); static void ov21_021E3FC0(UnkStruct_ov21_021E326C *param0, int param1, int param2); static void ov21_021E3BE0(UnkStruct_ov21_021E326C *param0); static void ov21_021E3BFC(UnkStruct_ov21_021E326C *param0); -static UnkStruct_ov21_021E342C *ov21_021E33C4(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021E3440 *ov21_021E3400(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021D4660 *ov21_021E3428(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E342C *ov21_021E33C4(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E3440 *ov21_021E3400(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021E3428(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021E342C(UnkStruct_ov21_021E342C *param0); static void ov21_021E3440(UnkStruct_ov21_021E3440 *param0); static void ov21_021E3454(UnkStruct_ov21_021D4660 *param0); @@ -154,12 +154,12 @@ static int ov21_021E3540(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo static int ov21_021E35D0(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); static int ov21_021E3604(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); static BOOL ov21_021E3C18(UnkStruct_ov21_021E342C *param0, int param1, int param2); -static void ov21_021E3688(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, int param2); +static void ov21_021E3688(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, enum HeapId heapID); static void ov21_021E3724(UnkStruct_ov21_021E342C *param0); static void ov21_021E3734(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1); static void ov21_021E37B4(UnkStruct_ov21_021E37B4 *param0); static void ov21_021E37CC(u32 param0, u32 param1, void *param2); -static void ov21_021E3C6C(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, int param2); +static void ov21_021E3C6C(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, enum HeapId heapID); static void ov21_021E3D48(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1); static void ov21_021E3E74(UnkStruct_ov21_021E37B4 *param0); static void ov21_021E3E8C(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1); @@ -182,15 +182,15 @@ static void ov21_021E3FE4(UnkStruct_ov21_021E3900 *param0, const UnkStruct_ov21_ static void ov21_021E3BD8(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1, int param2); static void ov21_021E3BDC(UnkStruct_ov21_021E3900 *param0); -void ov21_021E29DC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021E29DC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021E2BA8 *v0; UnkStruct_ov21_021E2BBC *v1; UnkStruct_ov21_021D4660 *v2; - v0 = ov21_021E2A5C(param2, param1); - v1 = ov21_021E2AE0(param2, param1); - v2 = ov21_021E2B08(param2, param1); + v0 = ov21_021E2A5C(heapID, param1); + v1 = ov21_021E2AE0(heapID, param1); + v2 = ov21_021E2B08(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -218,12 +218,12 @@ BOOL ov21_021E2A54(const UnkStruct_ov21_021E68F4 *param0) return v0->unk_28; } -static UnkStruct_ov21_021E2BA8 *ov21_021E2A5C(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E2BA8 *ov21_021E2A5C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E2BA8 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E2BA8)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E2BA8)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E2BA8)); @@ -259,12 +259,12 @@ static UnkStruct_ov21_021E2BA8 *ov21_021E2A5C(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021E2BBC *ov21_021E2AE0(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E2BBC *ov21_021E2AE0(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E2BBC *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E2BBC)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E2BBC)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E2BBC)); @@ -274,24 +274,24 @@ static UnkStruct_ov21_021E2BBC *ov21_021E2AE0(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021D4660 *ov21_021E2B08(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D4660 *ov21_021E2B08(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021D4660 *v0; int v1 = ov21_021E2C20(); - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4660) * v1); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4660) * v1); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4660) * v1); - ov21_021D47F0(param0, &v0[0], param1, (0x1 << 1)); - ov21_021D4A94(param0, &v0[1], param1, (0x1 << 2)); - ov21_021D48B8(param0, &v0[2], param1, (0x1 << 3)); - ov21_021D491C(param0, &v0[3], param1, (0x1 << 4)); - ov21_021D4980(param0, &v0[4], param1, (0x1 << 5)); - ov21_021D49E4(param0, &v0[5], param1, (0x1 << 6)); - ov21_021D4A3C(param0, &v0[6], param1, (0x1 << 7)); - ov21_021D4B50(param0, &v0[7], param1, (0x1 << 8)); + ov21_021D47F0(heapID, &v0[0], param1, (0x1 << 1)); + ov21_021D4A94(heapID, &v0[1], param1, (0x1 << 2)); + ov21_021D48B8(heapID, &v0[2], param1, (0x1 << 3)); + ov21_021D491C(heapID, &v0[3], param1, (0x1 << 4)); + ov21_021D4980(heapID, &v0[4], param1, (0x1 << 5)); + ov21_021D49E4(heapID, &v0[5], param1, (0x1 << 6)); + ov21_021D4A3C(heapID, &v0[6], param1, (0x1 << 7)); + ov21_021D4B50(heapID, &v0[7], param1, (0x1 << 8)); return v0; } @@ -765,15 +765,15 @@ static void ov21_021E3320(UnkStruct_ov21_021E2BA8 *param0) param0->unk_10->unk_14 = 1; } -void ov21_021E332C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021E332C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021E342C *v0; UnkStruct_ov21_021E3440 *v1; UnkStruct_ov21_021D4660 *v2; - v0 = ov21_021E33C4(param2, param1); - v1 = ov21_021E3400(param2, param1); - v2 = ov21_021E3428(param2, param1); + v0 = ov21_021E33C4(heapID, param1); + v1 = ov21_021E3400(heapID, param1); + v2 = ov21_021E3428(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -819,12 +819,12 @@ BOOL ov21_021E33BC(const UnkStruct_ov21_021E68F4 *param0) return v0->unk_30; } -static UnkStruct_ov21_021E342C *ov21_021E33C4(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E342C *ov21_021E33C4(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E342C *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E342C)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E342C)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E342C)); @@ -837,12 +837,12 @@ static UnkStruct_ov21_021E342C *ov21_021E33C4(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021E3440 *ov21_021E3400(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E3440 *ov21_021E3400(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E3440 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E3440)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E3440)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E3440)); @@ -852,7 +852,7 @@ static UnkStruct_ov21_021E3440 *ov21_021E3400(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021D4660 *ov21_021E3428(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D4660 *ov21_021E3428(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { return NULL; } @@ -1040,9 +1040,9 @@ static int ov21_021E3604(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo return 0; } -static void ov21_021E3688(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, int param2) +static void ov21_021E3688(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, enum HeapId heapID) { - param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 6); + param0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 6); ov21_021D154C(¶m0->unk_04[0], 24 - (32 / 2), 24 + (32 / 2), 28 - (40 / 2), 28 + (40 / 2)); ov21_021D154C(¶m0->unk_04[5], 24 - (32 / 2), 24 + (32 / 2), 228 - (40 / 2), 228 + (40 / 2)); @@ -1053,7 +1053,7 @@ static void ov21_021E3688(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E34 param0->unk_08.unk_00 = param1; param0->unk_08.unk_04 = param0; - param0->unk_00 = sub_02023FCC(param0->unk_04, 6, ov21_021E37CC, ¶m0->unk_08, param2); + param0->unk_00 = sub_02023FCC(param0->unk_04, 6, ov21_021E37CC, ¶m0->unk_08, heapID); } static void ov21_021E3724(UnkStruct_ov21_021E342C *param0) @@ -1393,11 +1393,11 @@ static void ov21_021E3C64(UnkStruct_ov21_021E342C *param0) param0->unk_2C = 0; } -static void ov21_021E3C6C(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, int param2) +static void ov21_021E3C6C(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, enum HeapId heapID) { int v0; - param0->unk_18 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov21_021D4FE4) * 6); + param0->unk_18 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4FE4) * 6); ov21_021D4FE4(¶m0->unk_18[0], 28, 24, 24, 16, 0, 0, 0); ov21_021D4FE4(¶m0->unk_18[1], 68, 24, 24, 16, 0, 0, 1); @@ -1413,7 +1413,7 @@ static void ov21_021E3C6C(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E34 ov21_021D4FE4(¶m0->unk_18[4], 188, 24, 24, 16, v0, v0, 4); ov21_021D4FE4(¶m0->unk_18[5], 228, 24, 24, 16, 0, 0, 5); - param0->unk_14 = ov21_021D4EE4(param2); + param0->unk_14 = ov21_021D4EE4(heapID); ov21_021D4F04(param0->unk_14, param0->unk_18, 6, 1); } diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c index e32168a5bc..44233624df 100644 --- a/src/overlay021/ov21_021E3FFC.c +++ b/src/overlay021/ov21_021E3FFC.c @@ -76,8 +76,8 @@ typedef struct { int unk_32C; } UnkStruct_ov21_021E4360; -static UnkStruct_ov21_021E40F4 *ov21_021E4080(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021E4108 *ov21_021E40C8(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E40F4 *ov21_021E4080(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E4108 *ov21_021E40C8(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021E40F4(UnkStruct_ov21_021E40F4 *param0); static void ov21_021E4108(UnkStruct_ov21_021E4108 *param0); static int ov21_021E411C(void); @@ -117,13 +117,13 @@ static void ov21_021E4B30(UnkStruct_ov21_021E4B30 *param0, int param1); static void ov21_021E4B94(UnkStruct_ov21_021E4B30 *param0, int param1); static void ov21_021E4C38(CellActor *param0, int param1); -void ov21_021E3FFC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021E3FFC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021E40F4 *v0; UnkStruct_ov21_021E4108 *v1; - v0 = ov21_021E4080(param2, param1); - v1 = ov21_021E40C8(param2, param1); + v0 = ov21_021E4080(heapID, param1); + v1 = ov21_021E40C8(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -163,12 +163,12 @@ void ov21_021E4078(UnkStruct_ov21_021E68F4 *param0, int param1) v0->unk_10 = param1; } -static UnkStruct_ov21_021E40F4 *ov21_021E4080(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E40F4 *ov21_021E4080(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E40F4 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E40F4)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E40F4)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E40F4)); @@ -181,12 +181,12 @@ static UnkStruct_ov21_021E40F4 *ov21_021E4080(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021E4108 *ov21_021E40C8(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E4108 *ov21_021E40C8(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E4108 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E4108)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E4108)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E4108)); diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c index def907c956..adb847a4fd 100644 --- a/src/overlay021/ov21_021E4CA4.c +++ b/src/overlay021/ov21_021E4CA4.c @@ -112,9 +112,9 @@ typedef struct { BOOL unk_70; } UnkStruct_ov21_021E5004; -static UnkStruct_ov21_021E4D90 *ov21_021E4D24(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021E4DA4 *ov21_021E4D64(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021D4660 *ov21_021E4D8C(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E4D90 *ov21_021E4D24(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E4DA4 *ov21_021E4D64(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021E4D8C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021E4D90(UnkStruct_ov21_021E4D90 *param0); static void ov21_021E4DA4(UnkStruct_ov21_021E4DA4 *param0); static void ov21_021E4DB8(UnkStruct_ov21_021D4660 *param0); @@ -129,7 +129,7 @@ static void ov21_021E5004(UnkStruct_ov21_021E5004 *param0); static void ov21_021E5040(UnkStruct_ov21_021E5004 *param0); static void ov21_021E507C(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, const UnkStruct_ov21_021E4D90 *param2, BOOL param3); static BOOL ov21_021E50EC(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, const UnkStruct_ov21_021E4D90 *param2, BOOL param3); -static void ov21_021E5128(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1, int param2); +static void ov21_021E5128(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1, enum HeapId heapID); static void ov21_021E51DC(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1); static void ov21_021E5200(UnkStruct_ov21_021E51DC *param0); static void ov21_021E5228(u32 param0, u32 param1, void *param2); @@ -181,15 +181,15 @@ static void ov21_021E5E98(UnkStruct_ov21_021E5004 *param0); static void ov21_021E5EAC(UnkStruct_ov21_021E5004 *param0); static void ov21_021E5EC0(UnkStruct_ov21_021E5004 *param0); -void ov21_021E4CA4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021E4CA4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021E4D90 *v0; UnkStruct_ov21_021E4DA4 *v1; UnkStruct_ov21_021D4660 *v2; - v0 = ov21_021E4D24(param2, param1); - v1 = ov21_021E4D64(param2, param1); - v2 = ov21_021E4D8C(param2, param1); + v0 = ov21_021E4D24(heapID, param1); + v1 = ov21_021E4D64(heapID, param1); + v2 = ov21_021E4D8C(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -218,11 +218,11 @@ int ov21_021E4D1C(const UnkStruct_ov21_021E68F4 *param0) return v0->unk_0C; } -static UnkStruct_ov21_021E4D90 *ov21_021E4D24(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E4D90 *ov21_021E4D24(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E4D90 *v0; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E4D90)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E4D90)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E4D90)); @@ -234,12 +234,12 @@ static UnkStruct_ov21_021E4D90 *ov21_021E4D24(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021E4DA4 *ov21_021E4D64(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E4DA4 *ov21_021E4D64(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E4DA4 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E4DA4)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E4DA4)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E4DA4)); @@ -249,7 +249,7 @@ static UnkStruct_ov21_021E4DA4 *ov21_021E4D64(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021D4660 *ov21_021E4D8C(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D4660 *ov21_021E4D8C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { return NULL; } @@ -491,10 +491,10 @@ static BOOL ov21_021E50EC(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D return 0; } -static void ov21_021E5128(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1, int param2) +static void ov21_021E5128(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1, enum HeapId heapID) { - param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 3); - param0->unk_10 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 2); + param0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 3); + param0->unk_10 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 2); ov21_021D154C(¶m0->unk_04[0], 67 - 14, 67 + 14, 64 - 42, 64 + 42); @@ -514,8 +514,8 @@ static void ov21_021E5128(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D param0->unk_08.unk_00 = param1; param0->unk_08.unk_04 = param0; - param0->unk_00 = sub_02023FCC(param0->unk_04, 3, ov21_021E5228, ¶m0->unk_08, param2); - param0->unk_14 = sub_02023FCC(param0->unk_10, 2, ov21_021E5268, ¶m0->unk_08, param2); + param0->unk_00 = sub_02023FCC(param0->unk_04, 3, ov21_021E5228, ¶m0->unk_08, heapID); + param0->unk_14 = sub_02023FCC(param0->unk_10, 2, ov21_021E5268, ¶m0->unk_08, heapID); } static void ov21_021E51DC(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1) diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c index 6b7c15dfa8..4bdc35ba78 100644 --- a/src/overlay021/ov21_021E68F4.c +++ b/src/overlay021/ov21_021E68F4.c @@ -71,9 +71,9 @@ typedef struct { void *unk_38[2]; } UnkStruct_ov21_021E6C60; -static UnkStruct_ov21_021E6A20 *ov21_021E696C(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021E6A34 *ov21_021E69B0(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021D4660 *ov21_021E69D8(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E6A20 *ov21_021E696C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E6A34 *ov21_021E69B0(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021E69D8(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021E6A20(UnkStruct_ov21_021E6A20 *param0); static void ov21_021E6A34(UnkStruct_ov21_021E6A34 *param0); static void ov21_021E6A48(UnkStruct_ov21_021D4660 *param0); @@ -88,7 +88,7 @@ static void ov21_021E6C60(UnkStruct_ov21_021E6C60 *param0); static void ov21_021E6C88(UnkStruct_ov21_021E6C60 *param0); static void ov21_021E6CB0(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, const UnkStruct_ov21_021E6A20 *param2, BOOL param3); static BOOL ov21_021E6D1C(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, const UnkStruct_ov21_021E6A20 *param2, BOOL param3); -static void ov21_021E6D58(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1, int param2); +static void ov21_021E6D58(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1, enum HeapId heapID); static void ov21_021E6DAC(UnkStruct_ov21_021E6DAC *param0); static void ov21_021E6DBC(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1); static void ov21_021E6DEC(UnkStruct_ov21_021E6DAC *param0); @@ -109,15 +109,15 @@ static void ov21_021E70BC(UnkStruct_ov21_021E6C60 *param0); static void ov21_021E70D4(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, int param2); static void ov21_021E71B8(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1); -void ov21_021E68F4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021E68F4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021E6A20 *v0; UnkStruct_ov21_021E6A34 *v1; UnkStruct_ov21_021D4660 *v2; - v0 = ov21_021E696C(param2, param1); - v1 = ov21_021E69B0(param2, param1); - v2 = ov21_021E69D8(param2, param1); + v0 = ov21_021E696C(heapID, param1); + v1 = ov21_021E69B0(heapID, param1); + v2 = ov21_021E69D8(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -139,11 +139,11 @@ void ov21_021E6954(UnkStruct_ov21_021E68F4 *param0) ov21_021E6A48(param0->unk_20); } -static UnkStruct_ov21_021E6A20 *ov21_021E696C(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E6A20 *ov21_021E696C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E6A20 *v0; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E6A20)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E6A20)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E6A20)); @@ -156,12 +156,12 @@ static UnkStruct_ov21_021E6A20 *ov21_021E696C(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021E6A34 *ov21_021E69B0(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E6A34 *ov21_021E69B0(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E6A34 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E6A34)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E6A34)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E6A34)); @@ -171,18 +171,18 @@ static UnkStruct_ov21_021E6A34 *ov21_021E69B0(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021D4660 *ov21_021E69D8(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D4660 *ov21_021E69D8(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021D4660 *v0; int v1 = ov21_021E6A68(); - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4660) * v1); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4660) * v1); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021D4660) * v1); - ov21_021D49E4(param0, &v0[0], param1, (1 << 0)); - ov21_021D4A3C(param0, &v0[1], param1, (1 << 1)); + ov21_021D49E4(heapID, &v0[0], param1, (1 << 0)); + ov21_021D4A3C(heapID, &v0[1], param1, (1 << 1)); return v0; } @@ -411,16 +411,16 @@ static BOOL ov21_021E6D1C(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A return 0; } -static void ov21_021E6D58(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1, int param2) +static void ov21_021E6D58(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1, enum HeapId heapID) { - param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 2); + param0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 2); ov21_021D154C(¶m0->unk_04[0], 120 - (112 / 2), 120 + (112 / 2), 68 - (120 / 2), 68 + (120 / 2)); ov21_021D154C(¶m0->unk_04[1], 120 - (112 / 2), 120 + (112 / 2), 188 - (120 / 2), 188 + (120 / 2)); param0->unk_08.unk_00 = param1; param0->unk_08.unk_04 = param0; - param0->unk_00 = sub_02023FCC(param0->unk_04, 2, ov21_021E6E04, ¶m0->unk_08, param2); + param0->unk_00 = sub_02023FCC(param0->unk_04, 2, ov21_021E6E04, ¶m0->unk_08, heapID); } static void ov21_021E6DAC(UnkStruct_ov21_021E6DAC *param0) diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c index 3e6d659e51..ed2ef8b059 100644 --- a/src/overlay021/ov21_021E737C.c +++ b/src/overlay021/ov21_021E737C.c @@ -131,8 +131,8 @@ typedef struct { u16 *unk_C0; } UnkStruct_ov21_021E7714; -static UnkStruct_ov21_021E7468 *ov21_021E73E8(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021E747C *ov21_021E7424(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E7468 *ov21_021E73E8(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E747C *ov21_021E7424(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021E7468(UnkStruct_ov21_021E7468 *param0); static void ov21_021E747C(UnkStruct_ov21_021E747C *param0); static int ov21_021E749C(void); @@ -146,17 +146,17 @@ static void ov21_021E7714(UnkStruct_ov21_021E7714 *param0); static void ov21_021E7718(UnkStruct_ov21_021E7714 *param0); static void ov21_021E771C(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, BOOL param3); static BOOL ov21_021E77A4(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, BOOL param3); -static void ov21_021E7800(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, const UnkStruct_ov21_021E74A0 *param3, int param4); +static void ov21_021E7800(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, const UnkStruct_ov21_021E74A0 *param3, enum HeapId heapID); static void ov21_021E785C(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1); -static void ov21_021E789C(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, int param2); -static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, int param3); +static void ov21_021E789C(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, enum HeapId heapID); +static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapId heapID); static void ov21_021E7AA0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1); -static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, int param3); +static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapId heapID); static void ov21_021E7CCC(UnkStruct_ov21_021E7714 *param0); -static void ov21_021E7CF0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, int param3); +static void ov21_021E7CF0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapId heapID); static void ov21_021E7CF4(UnkStruct_ov21_021E7714 *param0); -static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, int param1); -static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, int param2); +static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, enum HeapId heapID); +static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, enum HeapId heapID); static void ov21_021E7EC0(UnkStruct_ov21_021E747C *param0, int param1); static void ov21_021E7F20(UnkStruct_ov21_021E747C *param0); static void ov21_021E7F40(UnkStruct_ov21_021E747C *param0, int param1); @@ -192,13 +192,13 @@ const static UnkStruct_ov21_021E9DB0 Unk_ov21_021E9DB0[17] = { { 0xFFFF, 0x0, 0x480, 0xAAA, 0x1, 0xFFFFFFFFFFFFFFF0 } }; -void ov21_021E737C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021E737C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021E7468 *v0; UnkStruct_ov21_021E747C *v1; - v0 = ov21_021E73E8(param2, param1); - v1 = ov21_021E7424(param2, param1); + v0 = ov21_021E73E8(heapID, param1); + v1 = ov21_021E7424(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -218,11 +218,11 @@ void ov21_021E73D4(UnkStruct_ov21_021E68F4 *param0) ov21_021E747C(param0->unk_04); } -static UnkStruct_ov21_021E7468 *ov21_021E73E8(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E7468 *ov21_021E73E8(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E7468 *v0; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E7468)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E7468)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E7468)); @@ -232,20 +232,20 @@ static UnkStruct_ov21_021E7468 *ov21_021E73E8(int param0, UnkStruct_ov21_021D0F6 return v0; } -UnkStruct_ov21_021E747C *ov21_021E7424(int param0, UnkStruct_ov21_021D0F60 *param1) +UnkStruct_ov21_021E747C *ov21_021E7424(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E747C *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E747C)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E747C)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E747C)); v0->unk_00 = ov21_021D13FC(param1); - ov21_021E7EC0(v0, param0); - ov21_021E7F40(v0, param0); + ov21_021E7EC0(v0, heapID); + ov21_021E7F40(v0, heapID); sub_02015240(v0->unk_0C, 0); return v0; @@ -505,14 +505,14 @@ static BOOL ov21_021E77A4(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74 return 0; } -static void ov21_021E7800(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, const UnkStruct_ov21_021E74A0 *param3, int param4) +static void ov21_021E7800(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, const UnkStruct_ov21_021E74A0 *param3, enum HeapId heapID) { - ov21_021E789C(param1, param2, param4); - ov21_021E7CF8(param1, param4); - ov21_021E7DA8(param1, param2, param4); - ov21_021E7904(param0, param1, param2, param4); - ov21_021E7B34(param0, param1, param2, param4); - ov21_021E7CF0(param0, param1, param2, param4); + ov21_021E789C(param1, param2, heapID); + ov21_021E7CF8(param1, heapID); + ov21_021E7DA8(param1, param2, heapID); + ov21_021E7904(param0, param1, param2, heapID); + ov21_021E7B34(param0, param1, param2, heapID); + ov21_021E7CF0(param0, param1, param2, heapID); sub_020152BC(param1->unk_0C, 0); sub_02015240(param1->unk_0C, 1); @@ -531,21 +531,21 @@ static void ov21_021E785C(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74 sub_020152BC(param1->unk_0C, 0); } -static void ov21_021E789C(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, int param2) +static void ov21_021E789C(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, enum HeapId heapID) { void *v0; NNSG2dScreenData *v1; - ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, param2); + ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, heapID); - v0 = ov21_021D27B8(param0->unk_00, 73, 1, &v1, param2); + v0 = ov21_021D27B8(param0->unk_00, 73, 1, &v1, heapID); Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); } -static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, int param3) +static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapId heapID) { UnkStruct_ov21_021D13FC *v0 = param1->unk_00; int v1, v2, v3, v4; @@ -555,44 +555,44 @@ static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74 int v8; NARC *v9; - v9 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, param3); + v9 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, heapID); v8 = PokedexSort_DefaultForm(param2->unk_00, species); v1 = PokeIconSpriteIndex(species, 0, v8); v2 = PokeIconPalettesFileIndex(); v3 = PokeIconCellsFileIndex(); v4 = PokeIconAnimationFileIndex(); - param0->unk_14[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v9, v1, 0, 8000, NNS_G2D_VRAM_TYPE_2DMAIN, param3); + param0->unk_14[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v9, v1, 0, 8000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); sub_0200A450(param0->unk_14[0]); SpriteResource_ReleaseData(param0->unk_14[0]); - param0->unk_14[1] = SpriteResourceCollection_AddPaletteFrom(v0->unk_13C[1], v9, v2, 0, 8000, NNS_G2D_VRAM_TYPE_2DMAIN, 3, param3); + param0->unk_14[1] = SpriteResourceCollection_AddPaletteFrom(v0->unk_13C[1], v9, v2, 0, 8000, NNS_G2D_VRAM_TYPE_2DMAIN, 3, heapID); v6 = sub_0200A640(param0->unk_14[1]); GF_ASSERT(v6); { - param0->unk_BC = Heap_AllocFromHeap(param3, 32 * 3); + param0->unk_BC = Heap_AllocFromHeap(heapID, 32 * 3); } - param0->unk_14[2] = SpriteResourceCollection_AddFrom(v0->unk_13C[2], v9, v3, 0, 8000, 2, param3); - param0->unk_14[3] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], v9, v4, 0, 8000, 3, param3); - param0->unk_24[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v7, 93, 1, 93 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, param3); + param0->unk_14[2] = SpriteResourceCollection_AddFrom(v0->unk_13C[2], v9, v3, 0, 8000, 2, heapID); + param0->unk_14[3] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], v9, v4, 0, 8000, 3, heapID); + param0->unk_24[0] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], v7, 93, 1, 93 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID); sub_0200A3DC(param0->unk_24[0]); SpriteResource_ReleaseData(param0->unk_24[0]); - param0->unk_24[1] = SpriteResourceCollection_AddPaletteFrom(v0->unk_13C[1], v7, 14, 0, 14 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, param3); + param0->unk_24[1] = SpriteResourceCollection_AddPaletteFrom(v0->unk_13C[1], v7, 14, 0, 14 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, heapID); sub_0200A640(param0->unk_24[1]); { - param0->unk_C0 = Heap_AllocFromHeap(param3, 32 * 5); + param0->unk_C0 = Heap_AllocFromHeap(heapID, 32 * 5); } - param0->unk_24[2] = SpriteResourceCollection_AddFrom(v0->unk_13C[2], v7, 91, 1, 91 + 7000, 2, param3); - param0->unk_24[3] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], v7, 92, 1, 92 + 7000, 3, param3); + param0->unk_24[2] = SpriteResourceCollection_AddFrom(v0->unk_13C[2], v7, 91, 1, 91 + 7000, 2, heapID); + param0->unk_24[3] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], v7, 92, 1, 92 + 7000, 3, heapID); NARC_dtor(v9); } @@ -621,7 +621,7 @@ static void ov21_021E7AA0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74 Heap_FreeToHeap(param0->unk_C0); } -static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, int param3) +static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapId heapID) { CellActorResourceData v0; CellActorInitParams v1; @@ -638,7 +638,7 @@ static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74 v1.resourceData = &v0; v1.priority = 31; v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN; - v1.heapID = param3; + v1.heapID = heapID; v1.position.x = 184 << FX32_SHIFT; v1.position.y = 64 << FX32_SHIFT; @@ -676,7 +676,7 @@ static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74 v1.resourceData = &v0; v1.priority = 31; v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN; - v1.heapID = param3; + v1.heapID = heapID; v1.position.x = 72 << FX32_SHIFT; v1.position.y = 64 << FX32_SHIFT; @@ -693,7 +693,7 @@ static void ov21_021E7CCC(UnkStruct_ov21_021E7714 *param0) CellActor_Delete(param0->unk_0C[1]); } -static void ov21_021E7CF0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, int param3) +static void ov21_021E7CF0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapId heapID) { return; } @@ -703,7 +703,7 @@ static void ov21_021E7CF4(UnkStruct_ov21_021E7714 *param0) return; } -static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, int heapID) +static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, enum HeapId heapID) { Strbuf *v0 = Strbuf_Init(32, heapID); MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); @@ -723,7 +723,7 @@ static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, int heapID) MessageLoader_Free(pokedexMessageBank); } -static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, int heapID) +static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, enum HeapId heapID) { Strbuf *v0 = Strbuf_Init(32, heapID); int species = PokedexSort_CurrentSpecies(param1->unk_00); diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c index 14b588c35b..610e8225f6 100644 --- a/src/overlay021/ov21_021E8484.c +++ b/src/overlay021/ov21_021E8484.c @@ -71,9 +71,9 @@ typedef struct { void *unk_2C[1]; } UnkStruct_ov21_021E8794; -static UnkStruct_ov21_021E8570 *ov21_021E84FC(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021E8584 *ov21_021E8544(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021D4660 *ov21_021E856C(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E8570 *ov21_021E84FC(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E8584 *ov21_021E8544(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021E856C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021E8570(UnkStruct_ov21_021E8570 *param0); static void ov21_021E8584(UnkStruct_ov21_021E8584 *param0); static void ov21_021E8598(UnkStruct_ov21_021D4660 *param0); @@ -88,7 +88,7 @@ static void ov21_021E8794(UnkStruct_ov21_021E8794 *param0); static void ov21_021E87AC(UnkStruct_ov21_021E8794 *param0); static void ov21_021E87C4(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, const UnkStruct_ov21_021E8570 *param2, BOOL param3); static BOOL ov21_021E8830(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, const UnkStruct_ov21_021E8570 *param2, BOOL param3); -static void ov21_021E886C(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1, int param2); +static void ov21_021E886C(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1, enum HeapId heapID); static void ov21_021E88B0(UnkStruct_ov21_021E88B0 *param0); static void ov21_021E88B8(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1); static void ov21_021E88D0(UnkStruct_ov21_021E88B0 *param0); @@ -110,15 +110,15 @@ static void ov21_021E8B34(UnkStruct_ov21_021E8794 *param0); static void ov21_021E8B40(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, int param2); static void ov21_021E8BDC(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1); -void ov21_021E8484(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021E8484(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { UnkStruct_ov21_021E8570 *v0; UnkStruct_ov21_021E8584 *v1; UnkStruct_ov21_021D4660 *v2; - v0 = ov21_021E84FC(param2, param1); - v1 = ov21_021E8544(param2, param1); - v2 = ov21_021E856C(param2, param1); + v0 = ov21_021E84FC(heapID, param1); + v1 = ov21_021E8544(heapID, param1); + v2 = ov21_021E856C(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -140,11 +140,11 @@ void ov21_021E84E4(UnkStruct_ov21_021E68F4 *param0) ov21_021E8598(param0->unk_20); } -static UnkStruct_ov21_021E8570 *ov21_021E84FC(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E8570 *ov21_021E84FC(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E8570 *v0; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E8570)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E8570)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E8570)); @@ -157,12 +157,12 @@ static UnkStruct_ov21_021E8570 *ov21_021E84FC(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021E8584 *ov21_021E8544(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E8584 *ov21_021E8544(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { UnkStruct_ov21_021E8584 *v0; UnkStruct_ov21_021E68F4 *v1; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E8584)); + v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E8584)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E8584)); @@ -172,7 +172,7 @@ static UnkStruct_ov21_021E8584 *ov21_021E8544(int param0, UnkStruct_ov21_021D0F6 return v0; } -static UnkStruct_ov21_021D4660 *ov21_021E856C(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D4660 *ov21_021E856C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { return NULL; } @@ -399,15 +399,15 @@ static BOOL ov21_021E8830(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E85 return 0; } -static void ov21_021E886C(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1, int param2) +static void ov21_021E886C(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1, enum HeapId heapID) { - param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 1); + param0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 1); ov21_021D154C(¶m0->unk_04[0], 144 - (80 / 2), 144 + (80 / 2), 128 - (240 / 2), 128 + (240 / 2)); param0->unk_08.unk_00 = param1; param0->unk_08.unk_04 = param0; - param0->unk_00 = sub_02023FCC(param0->unk_04, 1, ov21_021E88E8, ¶m0->unk_08, param2); + param0->unk_00 = sub_02023FCC(param0->unk_04, 1, ov21_021E88E8, ¶m0->unk_08, heapID); } static void ov21_021E88B0(UnkStruct_ov21_021E88B0 *param0) diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index 6aca3050c1..db2d03024d 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -123,7 +123,7 @@ static void ov21_021E968C(UnkStruct_ov21_021E968C *param0); static void ov21_021E96A8(BgConfig *param0, int param1, NARC *param2); static void ov21_021E97C4(BgConfig *param0, int param1, NARC *param2); static void ov21_021E9968(Window *param0, int param1, int param2); -static void ov21_021E998C(Window *param0, int param1); +static void ov21_021E998C(Window *param0, enum HeapId heapID); static void ov21_021E9A0C(int param0); static void ov21_021E9A38(void); static void ov21_021E9A40(UnkStruct_ov21_021E9A9C *param0, int param1, int param2, NARC *param3); @@ -747,7 +747,7 @@ static void ov21_021E9968(Window *param0, int param1, int param2) ov21_021E998C(param0, param1); } -static void ov21_021E998C(Window *param0, int heapID) +static void ov21_021E998C(Window *param0, enum HeapId heapID) { Strbuf *v0 = Strbuf_Init(64, heapID); MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); diff --git a/src/overlay021/pokedex_enc_data.c b/src/overlay021/pokedex_enc_data.c index c9237b2eec..7a77a27060 100644 --- a/src/overlay021/pokedex_enc_data.c +++ b/src/overlay021/pokedex_enc_data.c @@ -21,7 +21,7 @@ enum PokedexEncFileIndex { PEFI_FIELDSPECIALNATDEX = (4 + MAX_SPECIES * 9), }; -void PokedexEncData_PopulateEncounterLocations(EncounterLocations *encounterLocations, int species, int encounterCategory, int heapID) +void PokedexEncData_PopulateEncounterLocations(EncounterLocations *encounterLocations, int species, int encounterCategory, enum HeapId heapID) { int fileIndex; u32 fileSize; @@ -74,7 +74,7 @@ void PokedexEncData_FreeEncounterLocations(EncounterLocations *encounterLocation encounterLocations->numLocations = 0; } -DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(int heapID, int *numDungeons) +DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(enum HeapId heapID, int *numDungeons) { u32 fileSize; @@ -87,7 +87,7 @@ DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(int heapID, int *numDun return dungeonCoordinatesArray; } -FieldCoordinates *PokedexEncData_GetFieldCoordinates(int heapID, int *numFields) +FieldCoordinates *PokedexEncData_GetFieldCoordinates(enum HeapId heapID, int *numFields) { u32 fileSize; diff --git a/src/overlay021/pokedex_height_check.c b/src/overlay021/pokedex_height_check.c index 01130b8186..ff4b524cd7 100644 --- a/src/overlay021/pokedex_height_check.c +++ b/src/overlay021/pokedex_height_check.c @@ -57,9 +57,9 @@ enum HeightCheckGraphics { HCG_ANIMATION, }; -static UnkStruct_ov21_021E6104 *ov21_021E608C(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021E6118 *ov21_021E60D8(int param0, UnkStruct_ov21_021D0F60 *param1); -static UnkStruct_ov21_021D4660 *ov21_021E6100(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E6104 *ov21_021E608C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E6118 *ov21_021E60D8(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021E6100(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1); static void ov21_021E6104(UnkStruct_ov21_021E6104 *param0); static void ov21_021E6118(UnkStruct_ov21_021E6118 *param0); static void DummyForMatching1(UnkStruct_ov21_021D4660 *param0); @@ -74,17 +74,17 @@ static void SetTrainerHeightLarge(HeightCheckVisuals *heightCheckVisuals); static void SetTrainerHeightNormal(HeightCheckVisuals *heightCheckVisuals); static void ov21_021E628C(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3); static BOOL ov21_021E62F8(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3); -static void DisplayHeightCheck(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const int *param3, int heapID); +static void DisplayHeightCheck(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const int *param3, enum HeapId heapID); static void FreeVisuals(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1); -static void DisplayBackground(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int heapID); -static void GetHeightCheckGraphics(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, int heapID); +static void DisplayBackground(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, enum HeapId heapID); +static void GetHeightCheckGraphics(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, enum HeapId heapID); static void FreeSprites(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1); -static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID); +static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, enum HeapId heapID); static void FreeTrainerHeight(HeightCheckVisuals *heightCheckVisuals); -static void DummyForMatching2(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID); +static void DummyForMatching2(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, enum HeapId heapID); static void DummyForMatching3(HeightCheckVisuals *heightCheckVisuals); -static void DisplayHeightLabels(UnkStruct_ov21_021E6118 *param0, int heapID); -static void DisplayHeightValues(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int heapID); +static void DisplayHeightLabels(UnkStruct_ov21_021E6118 *param0, enum HeapId heapID); +static void DisplayHeightValues(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, enum HeapId heapID); static void DisplaySpeciesHeight(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1); static void ClearSpeciesSprite(UnkStruct_ov21_021E6118 *param0); static void SetTrainerPosition(CellActor *trainerHeightCellActor, short trainerPos); @@ -92,11 +92,11 @@ static void SetSpeciesPosition(Sprite *speciesSprite, short pokemonPos); static void SetTrainerScale(CellActor *trainerHeightCellActor, short trainerScale); static void SetSpeciesScale(Sprite *speciesSprite, short pokemonScale); -void ov21_021E6014(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +void ov21_021E6014(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID) { - UnkStruct_ov21_021E6104 *v0 = ov21_021E608C(param2, param1); - UnkStruct_ov21_021E6118 *v1 = ov21_021E60D8(param2, param1); - UnkStruct_ov21_021D4660 *v2 = ov21_021E6100(param2, param1); + UnkStruct_ov21_021E6104 *v0 = ov21_021E608C(heapID, param1); + UnkStruct_ov21_021E6118 *v1 = ov21_021E60D8(heapID, param1); + UnkStruct_ov21_021D4660 *v2 = ov21_021E6100(heapID, param1); param0->unk_00 = v0; param0->unk_04 = v1; @@ -118,9 +118,9 @@ void ov21_021E6074(UnkStruct_ov21_021E68F4 *param0) DummyForMatching1(param0->unk_20); } -static UnkStruct_ov21_021E6104 *ov21_021E608C(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021E6104 *ov21_021E608C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E6104 *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E6104)); + UnkStruct_ov21_021E6104 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E6104)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E6104)); @@ -131,9 +131,9 @@ static UnkStruct_ov21_021E6104 *ov21_021E608C(int param0, UnkStruct_ov21_021D0F6 return v0; } -UnkStruct_ov21_021E6118 *ov21_021E60D8(int param0, UnkStruct_ov21_021D0F60 *param1) +UnkStruct_ov21_021E6118 *ov21_021E60D8(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E6118 *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E6118)); + UnkStruct_ov21_021E6118 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E6118)); GF_ASSERT(v0); memset(v0, 0, sizeof(UnkStruct_ov21_021E6118)); @@ -143,7 +143,7 @@ UnkStruct_ov21_021E6118 *ov21_021E60D8(int param0, UnkStruct_ov21_021D0F60 *para return v0; } -static UnkStruct_ov21_021D4660 *ov21_021E6100(int param0, UnkStruct_ov21_021D0F60 *param1) +static UnkStruct_ov21_021D4660 *ov21_021E6100(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1) { return NULL; } @@ -311,7 +311,7 @@ static BOOL ov21_021E62F8(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21 return FALSE; } -static void DisplayHeightCheck(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const int *param3, int heapID) +static void DisplayHeightCheck(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const int *param3, enum HeapId heapID) { DisplayBackground(param1, param2, heapID); DisplayHeightLabels(param1, heapID); @@ -334,7 +334,7 @@ static void FreeVisuals(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_0 ClearSpeciesSprite(param1); } -static void DisplayBackground(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int heapID) +static void DisplayBackground(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, enum HeapId heapID) { NNSG2dScreenData *v1; @@ -347,7 +347,7 @@ static void DisplayBackground(UnkStruct_ov21_021E6118 *param0, const UnkStruct_o Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3); } -static void GetHeightCheckGraphics(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, int heapID) +static void GetHeightCheckGraphics(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, enum HeapId heapID) { UnkStruct_ov21_021D13FC *v0 = param1->unk_00; NARC *pokedexGraphicsNarc = ov21_021D26E0(v0); @@ -378,7 +378,7 @@ static void FreeSprites(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_0 SpriteResourceCollection_Remove(v0->unk_13C[3], heightCheckVisuals->heightCheckGraphics[HCG_ANIMATION]); } -static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID) +static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, enum HeapId heapID) { CellActorResourceData trainerResource; CellActorInitParams trainerCellParams; @@ -416,7 +416,7 @@ static void FreeTrainerHeight(HeightCheckVisuals *heightCheckVisuals) CellActor_Delete(heightCheckVisuals->trainerHeightCellActor); } -static void DummyForMatching2(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int heapID) +static void DummyForMatching2(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, enum HeapId heapID) { return; } @@ -426,7 +426,7 @@ static void DummyForMatching3(HeightCheckVisuals *heightCheckVisuals) return; } -static void DisplayHeightLabels(UnkStruct_ov21_021E6118 *param0, int heapID) +static void DisplayHeightLabels(UnkStruct_ov21_021E6118 *param0, enum HeapId heapID) { Strbuf *strbuf = Strbuf_Init(32, heapID); MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_pokedex, heapID); @@ -446,7 +446,7 @@ static void DisplayHeightLabels(UnkStruct_ov21_021E6118 *param0, int heapID) MessageLoader_Free(pokedexMessageBank); } -static void DisplayHeightValues(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int heapID) +static void DisplayHeightValues(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, enum HeapId heapID) { Strbuf *strbuf = Strbuf_Init(32, heapID); int species = PokedexSort_CurrentSpecies(param1->unk_04); diff --git a/src/overlay021/pokedex_sort.c b/src/overlay021/pokedex_sort.c index 638e5d0eb5..5eaa7b04f3 100644 --- a/src/overlay021/pokedex_sort.c +++ b/src/overlay021/pokedex_sort.c @@ -80,13 +80,13 @@ static void UpdateCaughtStatus(SortedPokedex *sortedPokedex, const Pokedex *poke static void PopulateDisplayPokedex_Blanks(SortedPokedex *sortedPokedex, const u16 *fullDex, int pokedexLength); static void PopulateDisplayPokedex(SortedPokedex *sortedPokedex); static void NumEncounteredAndCaught(SortedPokedex *sortedPokedex, int *caughtStatusLength, int *numCaught); -static u16 *PokedexFromNARC(int heapID, int pokedexSort, int *pokedexLength); -static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex); -static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex); -static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex); -static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex); +static u16 *PokedexFromNARC(enum HeapId heapID, int pokedexSort, int *pokedexLength); +static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex); +static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex); +static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex); +static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex); -void PokedexSort_PopulatePokedexStatus(UnkStruct_ov21_021D3320 *param0, UnkStruct_ov21_021D3208 *param1, int heapID) +void PokedexSort_PopulatePokedexStatus(UnkStruct_ov21_021D3320 *param0, UnkStruct_ov21_021D3208 *param1, enum HeapId heapID) { int sortOrder; int filterName; @@ -263,7 +263,7 @@ u32 ov21_021D3458(const UnkStruct_ov21_021D3320 *param0) return param0->unk_175E; } -BOOL PokedexSort_Sort(UnkStruct_ov21_021D3320 *param0, int sortOrder, int filterName, int filterType1, int filterType2, int filterForm, int isNationalDex, int heapID, BOOL isFiltered) +BOOL PokedexSort_Sort(UnkStruct_ov21_021D3320 *param0, int sortOrder, int filterName, int filterType1, int filterType2, int filterForm, int isNationalDex, enum HeapId heapID, BOOL isFiltered) { u16 *encounteredPokedex; int caughtStatusLength; @@ -379,7 +379,7 @@ BOOL PokedexSort_Sort(UnkStruct_ov21_021D3320 *param0, int sortOrder, int filter return dexExists; } -BOOL PokedexSort_SortUnfiltered(UnkStruct_ov21_021D3320 *param0, int sortOrder, int filterName, int filterType1, int filterType2, int filterForm, int isNationalDex, int heapID) +BOOL PokedexSort_SortUnfiltered(UnkStruct_ov21_021D3320 *param0, int sortOrder, int filterName, int filterType1, int filterType2, int filterForm, int isNationalDex, enum HeapId heapID) { return PokedexSort_Sort(param0, sortOrder, filterName, filterType1, filterType2, filterForm, isNationalDex, heapID, FALSE); } @@ -713,7 +713,7 @@ static void PopulateDisplayPokedex(SortedPokedex *sortedPokedex) } } -static u16 *PokedexFromNARC(int heapID, int pokedexSort, int *pokedexLength) +static u16 *PokedexFromNARC(enum HeapId heapID, int pokedexSort, int *pokedexLength) { u32 pokedexSize; @@ -726,7 +726,7 @@ static u16 *PokedexFromNARC(int heapID, int pokedexSort, int *pokedexLength) return pokedexFromFile; } -static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex) +static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex) { u16 *pokedexFromFile; int pokedexLength; @@ -766,7 +766,7 @@ static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting } } -static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex) +static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex) { u16 *pokedexFromFile; int pokedexLength; @@ -816,7 +816,7 @@ static void FilterByName(int filterName, u16 *resultingPokedex, int *numResultin } } -static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex) +static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex) { u16 *pokedexFromFile; int pokedexLength; @@ -890,7 +890,7 @@ static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResultin } } -static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, int heapID, const Pokedex *pokedex) +static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex) { u16 *pokedexFromFile; int pokedexLength; diff --git a/src/overlay021/pokedex_text.c b/src/overlay021/pokedex_text.c index 26ac94a1a3..144137567e 100644 --- a/src/overlay021/pokedex_text.c +++ b/src/overlay021/pokedex_text.c @@ -9,6 +9,7 @@ #include "text/pl_msg.naix" #include "error_handling.h" +#include "heap.h" #include "inlines.h" #include "message.h" #include "message_util.h" @@ -35,7 +36,7 @@ static const u8 messageBankLanguageOrder[NUM_LANGUAGES] = { static inline int LanguageIndex_Guarded(int languageIndex); static inline BOOL ValidLanguage(int species, int languageIndex); -static Strbuf *LoadMessage(int bankID, int entryID, int heapID); +static Strbuf *LoadMessage(int bankID, int entryID, enum HeapId heapID); static void GetLanguageIndex(int species, int language, int *dexNum, int *languageIndexUnguarded, int *languageIndex); void PokedexText_Free(Strbuf *strbuf) @@ -48,7 +49,7 @@ int PokedexText_ForeignLanguage(int languageIndex) return PokedexLanguage_IndexToLanguage(messageBankLanguageOrder[languageIndex + 1]); } -Strbuf *PokedexText_NameNumber(int species, int language, int heapID) +Strbuf *PokedexText_NameNumber(int species, int language, enum HeapId heapID) { int dexNum; int languageIndex_unguarded; @@ -75,7 +76,7 @@ Strbuf *PokedexText_NameNumber(int species, int language, int heapID) return LoadMessage(bankID, index, heapID); } -Strbuf *PokedexText_Category(int species, int language, int heapID) +Strbuf *PokedexText_Category(int species, int language, enum HeapId heapID) { int dexNum; int languageIndex_unguarded; @@ -103,7 +104,7 @@ Strbuf *PokedexText_Category(int species, int language, int heapID) return LoadMessage(bankID, index, heapID); } -Strbuf *PokedexText_DexEntry(int species, int language, int entryOffset, int heapID) +Strbuf *PokedexText_DexEntry(int species, int language, int entryOffset, enum HeapId heapID) { int dexNum; int languageIndex_unguarded; @@ -142,7 +143,7 @@ static inline BOOL ValidLanguage(int species, int languageIndex) return TRUE; } -static Strbuf *LoadMessage(int bankID, int entryID, int heapID) +static Strbuf *LoadMessage(int bankID, int entryID, enum HeapId heapID) { MessageLoader *messageLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, bankID, heapID); From d0ab8179e7236d3ba5b7787932bcff0b7d3822cc Mon Sep 17 00:00:00 2001 From: h2o-DS <71458559+h2o-DS@users.noreply.github.com> Date: Sun, 19 Jan 2025 18:48:37 -0500 Subject: [PATCH 5/5] DisplayMessage DisplayMessage -> Pokedex_DisplayMessage --- include/overlay021/ov21_021D4C0C.h | 2 +- src/overlay021/ov21_021D4C0C.c | 2 +- src/overlay021/ov21_021D76B0.c | 10 +++++----- src/overlay021/ov21_021D94BC.c | 18 +++++++++--------- src/overlay021/ov21_021DC9BC.c | 4 ++-- src/overlay021/ov21_021E1924.c | 4 ++-- src/overlay021/ov21_021E29DC.c | 2 +- src/overlay021/ov21_021E4CA4.c | 4 ++-- src/overlay021/ov21_021E68F4.c | 4 ++-- src/overlay021/ov21_021E8484.c | 2 +- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/overlay021/ov21_021D4C0C.h b/include/overlay021/ov21_021D4C0C.h index d2e4ce00cc..572271352e 100644 --- a/include/overlay021/ov21_021D4C0C.h +++ b/include/overlay021/ov21_021D4C0C.h @@ -17,7 +17,7 @@ void ov21_021D4D1C(UnkStruct_ov21_021D4CA0 *param0); void ov21_021D4D3C(UnkStruct_ov21_021D4C0C *param0); Window *ov21_021D4D6C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2); void ov21_021D4DA0(Window *param0); -u32 DisplayMessage(UnkStruct_ov21_021D4C0C *param0, Window *window, u32 bankID, u32 entryID, int xOffset, int yOffset); +u32 Pokedex_DisplayMessage(UnkStruct_ov21_021D4C0C *param0, Window *window, u32 bankID, u32 entryID, int xOffset, int yOffset); void ov21_021D4E10(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u32 param3); void ov21_021D4E80(UnkStruct_ov21_021D4C0C *param0, Window *param1, Strbuf *param2, int param3, int param4); diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c index 79487c4979..45ae32d76a 100644 --- a/src/overlay021/ov21_021D4C0C.c +++ b/src/overlay021/ov21_021D4C0C.c @@ -140,7 +140,7 @@ void ov21_021D4DA0(Window *param0) Windows_Delete(param0, 1); } -u32 DisplayMessage(UnkStruct_ov21_021D4C0C *param0, Window *window, u32 bankID, u32 entryID, int xOffset, int yOffset) +u32 Pokedex_DisplayMessage(UnkStruct_ov21_021D4C0C *param0, Window *window, u32 bankID, u32 entryID, int xOffset, int yOffset) { MessageLoader *messageLoader; Strbuf *strbuf; diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c index 1830898103..48bfaf2137 100644 --- a/src/overlay021/ov21_021D76B0.c +++ b/src/overlay021/ov21_021D76B0.c @@ -693,7 +693,7 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(v3->unk_14C, 10, 4); - DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_search, 0, 0); + Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_search, 0, 0); v1.unk_04 = v0; v1.unk_0C = param0->unk_00[0]; @@ -707,7 +707,7 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 ov21_021D4DA0(v0); v0 = ov21_021D4D6C(v3->unk_14C, 10, 4); - DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_switch, 0, 0); + Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_switch, 0, 0); v1.unk_04 = v0; v1.unk_0C = param0->unk_00[1]; @@ -721,7 +721,7 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 ov21_021D4DA0(v0); v0 = ov21_021D4D6C(v3->unk_14C, 10, 4); - DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_check, 0, 0); + Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_check, 0, 0); v1.unk_04 = v0; v1.unk_0C = param0->unk_00[2]; @@ -733,9 +733,9 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77 v0 = ov21_021D4D6C(v3->unk_14C, 14, 2); if (param2->unk_1C->unk_04->unk_1740 == 0) { - DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_quit, 0, 0); + Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_quit, 0, 0); } else { - DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_cancel, 0, 0); + Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_cancel, 0, 0); } v1.unk_04 = v0; diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c index 62012e7588..0fbe2c9885 100644 --- a/src/overlay021/ov21_021D94BC.c +++ b/src/overlay021/ov21_021D94BC.c @@ -2753,7 +2753,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C v1 = sub_0201FAB4(param1->unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(param2, 8, 2); - v2 = DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_order, 0, 0); + v2 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_order, 0, 0); param1->unk_04 = v0; param1->unk_0C = param0->unk_00[1]; @@ -2765,7 +2765,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C ov21_021D4DA0(v0); v0 = ov21_021D4D6C(param2, 8, 2); - v2 = DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_name, 0, 0); + v2 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_name, 0, 0); param1->unk_04 = v0; param1->unk_0C = param0->unk_00[2]; @@ -2777,7 +2777,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C ov21_021D4DA0(v0); v0 = ov21_021D4D6C(param2, 8, 2); - v2 = DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_type, 0, 0); + v2 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_type, 0, 0); param1->unk_04 = v0; param1->unk_0C = param0->unk_00[3]; @@ -2789,7 +2789,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C ov21_021D4DA0(v0); v0 = ov21_021D4D6C(param2, 8, 2); - v2 = DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_form, 0, 0); + v2 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_form, 0, 0); param1->unk_04 = v0; param1->unk_0C = param0->unk_00[4]; @@ -2801,7 +2801,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C ov21_021D4DA0(v0); v0 = ov21_021D4D6C(param2, 8, 2); - v2 = DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_ok, 0, 0); + v2 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_ok, 0, 0); param1->unk_04 = v0; param1->unk_0C = param0->unk_00[5]; @@ -2870,7 +2870,7 @@ static void ov21_021DC088(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C break; } - v4 = DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0); + v4 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0); param1->unk_10 = -v4 / 2; param1->unk_04 = v0; @@ -2929,7 +2929,7 @@ static void ov21_021DC12C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C break; } - v5 = DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0); + v5 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0); param1->unk_10 = -v5 / 2; param1->unk_04 = v0; @@ -2988,7 +2988,7 @@ static void ov21_021DC1E8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C break; } - v5 = DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0); + v5 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0); param1->unk_10 = -v5 / 2; param1->unk_04 = v0; @@ -3044,7 +3044,7 @@ static void ov21_021DC2A4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C break; } - v5 = DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0); + v5 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0); param1->unk_10 = -v5 / 2; param1->unk_04 = v0; diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c index e4ad055f52..48b3a29212 100644 --- a/src/overlay021/ov21_021DC9BC.c +++ b/src/overlay021/ov21_021DC9BC.c @@ -655,7 +655,7 @@ static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DMAIN); v0 = ov21_021D4D6C(v3->unk_14C, 16, 2); - v6 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_areaunknown, 0, 0); + v6 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_areaunknown, 0, 0); v1.unk_04 = v0; v1.unk_0C = mapDisplay->AreaUnknownCellActor; @@ -669,7 +669,7 @@ static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 for (v5 = 0; v5 < 3; v5++) { v0 = ov21_021D4D6C(v3->unk_14C, 9, 2); - v6 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_morning + v5, 0, 0); + v6 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_morning + v5, 0, 0); v1.unk_04 = v0; v1.unk_0C = NULL; diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c index 7f8cf83510..5a1f36d9ca 100644 --- a/src/overlay021/ov21_021E1924.c +++ b/src/overlay021/ov21_021E1924.c @@ -800,7 +800,7 @@ static void ov21_021E2478(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(v3->unk_14C, 8, 4); - DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_next, 0, 0); + Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_next, 0, 0); v1.unk_04 = v0; v1.unk_0C = param0->unk_00[0]; @@ -814,7 +814,7 @@ static void ov21_021E2478(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A v0 = ov21_021D4D6C(v3->unk_14C, 8, 4); { - u32 v6 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_back, 0, 0); + u32 v6 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_back, 0, 0); v1.unk_10 = 32 - v6; } diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c index 754a7758ab..29506b3b5e 100644 --- a/src/overlay021/ov21_021E29DC.c +++ b/src/overlay021/ov21_021E29DC.c @@ -733,7 +733,7 @@ static void ov21_021E3270(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E32 for (v4 = 0; v4 < 5; v4++) { v0 = ov21_021D4D6C(v2->unk_14C, 8, 2); - DisplayMessage(v2->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_info + v4, 0, 0); + Pokedex_DisplayMessage(v2->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_info + v4, 0, 0); v1.unk_04 = v0; param1->unk_04[v4] = ov21_021D4CA0(&v1); diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c index adb847a4fd..5eb154616d 100644 --- a/src/overlay021/ov21_021E4CA4.c +++ b/src/overlay021/ov21_021E4CA4.c @@ -939,7 +939,7 @@ static void ov21_021E58B8(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(v3->unk_14C, 8, 2); - v5 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_chorus, 0, 0); + v5 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_chorus, 0, 0); v1.unk_10 = 64 - v5 / 2; v1.unk_04 = v0; @@ -949,7 +949,7 @@ static void ov21_021E58B8(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D ov21_021D4DA0(v0); v0 = ov21_021D4D6C(v3->unk_14C, 8, 2); - v5 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_pan, 0, 0); + v5 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_pan, 0, 0); v1.unk_10 = 64 - v5 / 2; v1.unk_04 = v0; diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c index 4bdc35ba78..b9145eabf6 100644 --- a/src/overlay021/ov21_021E68F4.c +++ b/src/overlay021/ov21_021E68F4.c @@ -623,7 +623,7 @@ static void ov21_021E70D4(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(v3->unk_14C, 12, 2); - v5 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_heightcheck_button, 0, 0); + v5 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_heightcheck_button, 0, 0); v1.unk_10 = -(v5 / 2); v1.unk_04 = v0; @@ -635,7 +635,7 @@ static void ov21_021E70D4(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A ov21_021D4DA0(v0); v0 = ov21_021D4D6C(v3->unk_14C, 12, 2); - v5 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_weightcheck_button, 0, 0); + v5 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_weightcheck_button, 0, 0); v1.unk_10 = -(v5 / 2); v1.unk_04 = v0; diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c index 610e8225f6..9b2f632b2e 100644 --- a/src/overlay021/ov21_021E8484.c +++ b/src/overlay021/ov21_021E8484.c @@ -587,7 +587,7 @@ static void ov21_021E8B40(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E85 v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB); v0 = ov21_021D4D6C(v3->unk_14C, 16, 2); - v5 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_anotherform, 0, 0); + v5 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_anotherform, 0, 0); v1.unk_10 = -(v5 / 2); v1.unk_04 = v0;