From fca52fe00fba66cf267a67889939403d06301d0b Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Thu, 6 Mar 2025 16:07:16 -0300 Subject: [PATCH] sub_0200C440 heap IDs --- src/battle/ov16_0223B140.c | 4 ++-- src/overlay007/shop_menu.c | 2 +- src/overlay019/ov19_021DA92C.c | 4 ++-- src/overlay019/ov19_021DB8E4.c | 2 +- src/overlay084/ov84_0223B5A0.c | 2 +- src/overlay085/ov85_02241440.c | 2 +- src/overlay106/ov106_02241AE0.c | 2 +- src/overlay107/ov107_02241AE0.c | 2 +- src/overlay107/ov107_02245EB0.c | 2 +- src/overlay111/ov111_021D0D80.c | 2 +- src/unk_0207E0B8.c | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index f542c69905..f99268113d 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -533,9 +533,9 @@ static void ov16_0223B790(OverlayManager *param0) Font_InitManager(FONT_SUBSCREEN, HEAP_ID_BATTLE); if (battleSys->battleType & BATTLE_TYPE_SAFARI) { - battleSys->unk_1A4 = sub_0200C440(0xe, 2, 0xf, 5); + battleSys->unk_1A4 = sub_0200C440(0xe, 2, 0xf, HEAP_ID_BATTLE); } else { - battleSys->unk_1A4 = sub_0200C440(0xe, 2, 0xf, 5); + battleSys->unk_1A4 = sub_0200C440(0xe, 2, 0xf, HEAP_ID_BATTLE); } battleSys->unk_1A8 = battleSys->unk_1A4; diff --git a/src/overlay007/shop_menu.c b/src/overlay007/shop_menu.c index 232607ae39..98910cad1b 100644 --- a/src/overlay007/shop_menu.c +++ b/src/overlay007/shop_menu.c @@ -252,7 +252,7 @@ void Shop_Start(FieldTask *task, FieldSystem *fieldSystem, u16 *shopItems, u8 ma shopMenu->journalEntry = fieldSystem->journalEntry; shopMenu->martType = martType; shopMenu->saveData = fieldSystem->saveData; - shopMenu->unk_2B4 = sub_0200C440(1, 2, 0, 11); + shopMenu->unk_2B4 = sub_0200C440(1, 2, 0, HEAP_ID_FIELDMAP); if (shopMenu->martType == MART_TYPE_NORMAL) { shopMenu->destInventory = SaveData_GetBag(fieldSystem->saveData); diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index b87db9b22c..82e7ed1966 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -72,8 +72,8 @@ BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *par param0->unk_4C = NULL; param0->unk_24 = NULL; param0->unk_20 = ov19_021D7818(param1); - param0->unk_18 = sub_0200C440(9, 6, 15, 10); - param0->unk_1C = sub_0200C440(1, 2, 15, 10); + param0->unk_18 = sub_0200C440(9, 6, 15, HEAP_ID_10); + param0->unk_1C = sub_0200C440(1, 2, 15, HEAP_ID_10); param0->unk_28 = Graphics_GetCellBankFromOpenNARC(param6, 16, 1, &(param0->unk_2C), 10); param0->unk_30 = NULL; param0->unk_44 = MessageLoader_GetNewStrbuf(param5, 21); diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c index 6765b26633..ae62868531 100644 --- a/src/overlay019/ov19_021DB8E4.c +++ b/src/overlay019/ov19_021DB8E4.c @@ -116,7 +116,7 @@ BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *par param0->unk_1C = Graphics_GetCellBankFromOpenNARC(param5, 18, 1, &(param0->unk_20), 10); param0->unk_34 = Graphics_GetScrnDataFromOpenNARC(param5, 2, 1, &(param0->unk_38), 10); param0->unk_2C = Graphics_GetScrnDataFromOpenNARC(param5, 3, 1, &(param0->unk_30), 10); - param0->unk_44 = sub_0200C440(2, 13, 4, 10); + param0->unk_44 = sub_0200C440(2, 13, 4, HEAP_ID_10); param0->unk_4BFC = Strbuf_Init(500, HEAP_ID_10); param0->unk_10 = NULL; param0->unk_3C.pixels = param0->unk_18->pRawData; diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index 2e56ed3c47..37066c828a 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -831,7 +831,7 @@ static void ov84_0223BC1C(UnkStruct_ov84_0223B5A0 *param0) static void ov84_0223BDB4(UnkStruct_ov84_0223B5A0 *param0) { param0->unk_114 = MessageLoader_Init(0, 26, 7, HEAP_ID_6); - param0->unk_110 = sub_0200C440(1, 2, 0, 6); + param0->unk_110 = sub_0200C440(1, 2, 0, HEAP_ID_6); param0->unk_118 = StringTemplate_Default(6); param0->unk_11C = MessageLoader_Init(0, 26, 392, HEAP_ID_6); param0->unk_120 = MessageLoader_Init(0, 26, 647, HEAP_ID_6); diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index 44abadfc86..6d6c3b5a1b 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -448,7 +448,7 @@ static void ov85_022417CC(void) static void ov85_022417E4(UnkStruct_ov85_022417E4 *param0) { param0->unk_C4 = MessageLoader_Init(0, 26, 398, HEAP_ID_36); - param0->unk_CC = sub_0200C440(15, 2, 0, 36); + param0->unk_CC = sub_0200C440(15, 2, 0, HEAP_ID_36); param0->unk_C8 = StringTemplate_Default(36); } diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index a1c21662e8..76950c3e17 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -814,7 +814,7 @@ static void ov106_02242500(UnkStruct_ov106_02243118 *param0) Font_LoadTextPalette(0, 13 * 32, HEAP_ID_98); Font_LoadScreenIndicatorsPalette(0, 12 * 32, 98); - param0->unk_B0 = sub_0200C440(15, 14, 0, 98); + param0->unk_B0 = sub_0200C440(15, 14, 0, HEAP_ID_98); ov106_022436E0(param0->unk_48, param0->unk_4C); ov106_02242F4C(param0, param0->unk_48); diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index bf145a7c0c..4160e17474 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -1453,7 +1453,7 @@ static void ov107_02242F5C (UnkStruct_ov107_02241D6C * param0) Font_LoadTextPalette(0, 13 * 32, HEAP_ID_100); Font_LoadScreenIndicatorsPalette(0, 12 * 32, 100); - param0->unk_1C4 = sub_0200C440(1, 2, 0, 100); + param0->unk_1C4 = sub_0200C440(1, 2, 0, HEAP_ID_100); ov107_02249D14(param0->unk_4C, param0->unk_50, 0); ov107_02244E14(param0, &v9, &v10, &v11, &v12); diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index fe6f32888b..8d7e7ced5d 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -1127,7 +1127,7 @@ static void ov107_02246EE4 (UnkStruct_ov107_02246170 * param0) Font_LoadTextPalette(0, 13 * 32, HEAP_ID_100); Font_LoadScreenIndicatorsPalette(0, 12 * 32, 100); - param0->unk_144 = sub_0200C440(1, 2, 0, 100); + param0->unk_144 = sub_0200C440(1, 2, 0, HEAP_ID_100); ov107_02249D14(param0->unk_4C, param0->unk_50, 1); ov107_022484DC(param0, &v7, &v8, &v9, &v10); diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index b3ce59ddfa..55fb059c5e 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -1159,7 +1159,7 @@ static void ov111_021D1D68(UnkStruct_ov111_021D0F7C *param0) Font_LoadScreenIndicatorsPalette(4, 12 * 32, 115); Font_InitManager(FONT_SUBSCREEN, 115); - param0->unk_160 = sub_0200C440(15, 14, 0, 115); + param0->unk_160 = sub_0200C440(15, 14, 0, HEAP_ID_115); ov111_021D3548(param0->unk_58, param0->unk_5C); param0->unk_34 = sub_0201567C(NULL, 1, 12, 115); diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index 68df398043..837a6cbe59 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -954,7 +954,7 @@ static GameWindowLayout *sub_0207ECC0(OverlayManager *param0) } v0->unk_69C = MessageLoader_Init(0, 26, 453, HEAP_ID_12); - v0->unk_698 = sub_0200C440(15, 14, 0, 12); + v0->unk_698 = sub_0200C440(15, 14, 0, HEAP_ID_12); v0->unk_6A0 = StringTemplate_Default(12); for (v1 = 0; v1 < 6; v1++) {