From 24873e689abce753deb1844bd5bfec95f1fda5fc Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Thu, 6 Mar 2025 12:46:06 -0300 Subject: [PATCH] Heap_FreeToHeapExplicit heapIDs --- src/overlay005/encounter_effect.c | 2 +- src/overlay005/field_motion_blur.c | 2 +- src/overlay005/ov5_021D57BC.c | 2 +- src/overlay005/ov5_021D5EB8.c | 8 ++++---- src/overlay005/ov5_021DFB54.c | 2 +- src/overlay005/ov5_021E1154.c | 2 +- src/overlay005/ov5_021ECE40.c | 4 ++-- src/overlay005/vs_seeker.c | 2 +- src/overlay084/ov84_0223B5A0.c | 2 +- src/overlay084/ov84_0223F040.c | 8 ++++---- src/overlay085/ov85_02241440.c | 2 +- src/overlay088/ov88_0223B140.c | 2 +- src/overlay091/ov91_021D0D80.c | 2 +- src/overlay097/ov97_0222D04C.c | 2 +- src/overlay104/ov104_0223DC7C.c | 2 +- src/scrcmd.c | 6 +++--- src/start_menu.c | 6 +++--- src/unk_0205CA94.c | 12 ++++++------ src/unk_020655F4.c | 2 +- src/unk_02067A84.c | 2 +- src/unk_0207E0B8.c | 6 +++--- src/unk_02083370.c | 2 +- src/unk_0208694C.c | 8 ++++---- 23 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c index 7215f20ae6..456630f9fb 100644 --- a/src/overlay005/encounter_effect.c +++ b/src/overlay005/encounter_effect.c @@ -199,7 +199,7 @@ void EncounterEffect_Start(enum EncEffectCutIn effect, FieldSystem *fieldSystem, void EncounterEffect_Finish(EncounterEffect *encEffect, SysTask *effectTask) { NARC_dtor(encEffect->narc); - Heap_FreeToHeapExplicit(4, encEffect->param); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, encEffect->param); SysTask_FinishAndFreeParam(effectTask); } diff --git a/src/overlay005/field_motion_blur.c b/src/overlay005/field_motion_blur.c index dcd8fc2599..ea4687825d 100644 --- a/src/overlay005/field_motion_blur.c +++ b/src/overlay005/field_motion_blur.c @@ -52,5 +52,5 @@ void FieldMotionBlur_Stop(FieldMotionBlur **fieldMotionBlur) MotionBlur_Delete(&(*fieldMotionBlur)->motionBlur, GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D); GX_SetBankForBG(GX_VRAM_BG_128_C); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3, 1); - Heap_FreeToHeapExplicit(4, *fieldMotionBlur); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, *fieldMotionBlur); } diff --git a/src/overlay005/ov5_021D57BC.c b/src/overlay005/ov5_021D57BC.c index dcae8df3f2..836eb3d2a2 100644 --- a/src/overlay005/ov5_021D57BC.c +++ b/src/overlay005/ov5_021D57BC.c @@ -25,7 +25,7 @@ UnkStruct_ov5_021D57D8 *ov5_021D57BC(void) void ov5_021D57D8(UnkStruct_ov5_021D57D8 **param0) { - Heap_FreeToHeapExplicit(4, *param0); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, *param0); *param0 = NULL; } diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c index 9bf4ce398e..8ad5018540 100644 --- a/src/overlay005/ov5_021D5EB8.c +++ b/src/overlay005/ov5_021D5EB8.c @@ -891,7 +891,7 @@ void ov5_021D63A4(UnkStruct_ov5_021D6594 **param0) ov5_021D62BC(&(*param0)->unk_08); NARC_dtor((*param0)->unk_144); - Heap_FreeToHeapExplicit(4, *param0); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, *param0); *param0 = NULL; } @@ -1215,7 +1215,7 @@ static void ov5_021D68B8(UnkStruct_ov5_021D6594 *param0, int param1) if (v0->unk_0C != NULL) { ov5_021D6690(param0, v0->unk_00, v0->unk_0C); - Heap_FreeToHeapExplicit(4, v0->unk_0C); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, v0->unk_0C); v0->unk_0C = NULL; if (v0->unk_14 != NULL) { @@ -1236,7 +1236,7 @@ static void ov5_021D68B8(UnkStruct_ov5_021D6594 *param0, int param1) } if (v0->unk_08->unk_B98 != NULL) { - Heap_FreeToHeapExplicit(4, v0->unk_08->unk_B98); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, v0->unk_08->unk_B98); v0->unk_08->unk_B98 = NULL; } @@ -1250,7 +1250,7 @@ static void ov5_021D68B8(UnkStruct_ov5_021D6594 *param0, int param1) } } - Heap_FreeToHeapExplicit(4, v0->unk_08); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, v0->unk_08); v0->unk_08 = NULL; } diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c index c825d9a306..11f3c4420a 100644 --- a/src/overlay005/ov5_021DFB54.c +++ b/src/overlay005/ov5_021DFB54.c @@ -1761,7 +1761,7 @@ static void *ov5_021E1110(int param0) static void ov5_021E1134(void *param0) { - Heap_FreeToHeapExplicit(4, param0); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, param0); } static Pokemon *ov5_021E1140(FieldSystem *fieldSystem, int param1) diff --git a/src/overlay005/ov5_021E1154.c b/src/overlay005/ov5_021E1154.c index ed66677bbd..4f81b7f650 100644 --- a/src/overlay005/ov5_021E1154.c +++ b/src/overlay005/ov5_021E1154.c @@ -163,5 +163,5 @@ static void *ov5_021E132C(int param0) static void ov5_021E1350(void *param0) { - Heap_FreeToHeapExplicit(4, param0); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, param0); } diff --git a/src/overlay005/ov5_021ECE40.c b/src/overlay005/ov5_021ECE40.c index 696a6cf8d3..2217c2829a 100644 --- a/src/overlay005/ov5_021ECE40.c +++ b/src/overlay005/ov5_021ECE40.c @@ -364,8 +364,8 @@ static void ov5_021ED0F0(UnkStruct_ov5_021ED0A4 *param0) { ov5_021ED1A4(param0); - Heap_FreeToHeapExplicit(4, param0->unk_E4); - Heap_FreeToHeapExplicit(4, param0->unk_F4); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, param0->unk_E4); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, param0->unk_F4); } static UnkStruct_ov5_021DF84C *ov5_021ED110(UnkStruct_ov5_021ED0A4 *param0, u32 param1) diff --git a/src/overlay005/vs_seeker.c b/src/overlay005/vs_seeker.c index 6a15c6c84b..b125b6a77e 100644 --- a/src/overlay005/vs_seeker.c +++ b/src/overlay005/vs_seeker.c @@ -645,7 +645,7 @@ static void VsSeeker_TrackAnimation(SysTask *task, void *param) MapObject_FinishAnimation(vssAnimTask->animationTask); SysTask_Done(vssAnimTask->trackingTask); - Heap_FreeToHeapExplicit(4, param); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, param); } } diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index ff62778351..15e430aee8 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -804,7 +804,7 @@ static void ov84_0223BBC4(BgConfig *param0) Bg_FreeTilemapBuffer(param0, 2); Bg_FreeTilemapBuffer(param0, 1); Bg_FreeTilemapBuffer(param0, 0); - Heap_FreeToHeapExplicit(6, param0); + Heap_FreeToHeapExplicit(HEAP_ID_6, param0); } static void ov84_0223BC1C(UnkStruct_ov84_0223B5A0 *param0) diff --git a/src/overlay084/ov84_0223F040.c b/src/overlay084/ov84_0223F040.c index dbec7ed8b6..4b85e1c0a2 100644 --- a/src/overlay084/ov84_0223F040.c +++ b/src/overlay084/ov84_0223F040.c @@ -156,7 +156,7 @@ void ov84_0223F3AC(UnkStruct_ov84_0223B5A0 *param0, u8 param1, u8 param2) Window_BlitBitmapRect(¶m0->unk_04[5], v0->pRawData, v2, 0, 32 * 8, 16, param0->unk_427 + param0->unk_428 * param1, 3, 10, 10); Window_ScheduleCopyToVRAM(¶m0->unk_04[5]); - Heap_FreeToHeapExplicit(6, v1); + Heap_FreeToHeapExplicit(HEAP_ID_6, v1); } void ov84_0223F438(UnkStruct_ov84_0223B5A0 *param0) @@ -180,7 +180,7 @@ void ov84_0223F438(UnkStruct_ov84_0223B5A0 *param0) } Window_ScheduleCopyToVRAM(¶m0->unk_04[5]); - Heap_FreeToHeapExplicit(6, v1); + Heap_FreeToHeapExplicit(HEAP_ID_6, v1); } static void ov84_0223F4E8(UnkStruct_ov84_0223B5A0 *param0, u32 param1, u32 param2) @@ -341,7 +341,7 @@ static void ov84_0223F9B0(UnkStruct_ov84_0223B5A0 *param0, u32 param1) v1 = ov84_0223F994(param0, &v0); Window_BlitBitmapRect(¶m0->unk_04[0], v0->pRawData, 40, 0, 64, 16, 0, param1, 24, 16); - Heap_FreeToHeapExplicit(6, v1); + Heap_FreeToHeapExplicit(HEAP_ID_6, v1); } void ov84_0223F9F0(UnkStruct_ov84_0223B5A0 *param0, u32 param1) @@ -361,7 +361,7 @@ void ov84_0223FA44(UnkStruct_ov84_0223B5A0 *param0, u32 param1) v1 = ov84_0223F994(param0, &v0); Window_BlitBitmapRect(¶m0->unk_04[0], v0->pRawData, 0, 0, 64, 16, 96, param1, 40, 16); - Heap_FreeToHeapExplicit(6, v1); + Heap_FreeToHeapExplicit(HEAP_ID_6, v1); } void ov84_0223FA88(UnkStruct_ov84_0223B5A0 *param0) diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index ba835dd1ff..11d4486d86 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -412,7 +412,7 @@ static void ov85_022416E8(BgConfig *param0) Bg_FreeTilemapBuffer(param0, 3); Bg_FreeTilemapBuffer(param0, 2); Bg_FreeTilemapBuffer(param0, 1); - Heap_FreeToHeapExplicit(36, param0); + Heap_FreeToHeapExplicit(HEAP_ID_36, param0); } static void ov85_02241718(UnkStruct_ov85_022417E4 *param0, NARC *param1) diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 294e637ed5..f2bcc32a62 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -879,7 +879,7 @@ int ov88_0223C03C(OverlayManager *param0, int *param1) ov88_0223EC04(v0->unk_49C); ov88_0223C44C(v0->unk_174); - Heap_FreeToHeapExplicit(26, v0->unk_174); + Heap_FreeToHeapExplicit(HEAP_ID_26, v0->unk_174); MessageLoader_Free(v0->unk_184); StringTemplate_Free(v0->unk_180); StringTemplate_Free(v0->unk_17C); diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index a2da64d8d9..1756c4d40c 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -584,7 +584,7 @@ static void ov91_021D1098(BgConfig *param0) Bg_FreeTilemapBuffer(param0, 2); Bg_FreeTilemapBuffer(param0, 1); Bg_FreeTilemapBuffer(param0, 0); - Heap_FreeToHeapExplicit(67, param0); + Heap_FreeToHeapExplicit(HEAP_ID_67, param0); } static void ov91_021D10C8(UnkStruct_ov91_021D0ED8 *param0, NARC *param1) diff --git a/src/overlay097/ov97_0222D04C.c b/src/overlay097/ov97_0222D04C.c index d055072d13..f032100c67 100644 --- a/src/overlay097/ov97_0222D04C.c +++ b/src/overlay097/ov97_0222D04C.c @@ -248,7 +248,7 @@ void ov97_0222D2C4(int param0, int param1, void *param2, void *param3) void ov97_0222D2DC(void) { - Heap_FreeToHeapExplicit(15, Unk_ov97_0223F1A4); + Heap_FreeToHeapExplicit(HEAP_ID_COMMUNICATION, Unk_ov97_0223F1A4); Unk_ov97_0223F1A4 = NULL; sub_02036978(); } diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c index f2275065b4..df9bab3c81 100644 --- a/src/overlay104/ov104_0223DC7C.c +++ b/src/overlay104/ov104_0223DC7C.c @@ -211,7 +211,7 @@ static void ov104_0223DD30(UnkStruct_ov104_0223DD30 *param0, SysTask *param1) SysTask_Done(param0->unk_140); SysTask_Done(param0->unk_34); NARC_dtor(param0->unk_24); - Heap_FreeToHeapExplicit(94, param0->unk_0C); + Heap_FreeToHeapExplicit(HEAP_ID_94, param0->unk_0C); SysTask_FinishAndFreeParam(param1); } diff --git a/src/scrcmd.c b/src/scrcmd.c index 1f92624bf6..8b3b585b85 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -8151,9 +8151,9 @@ static BOOL ScrCmd_313(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; u16 v1 = ScriptContext_GetVar(ctx); - u32 v2 = Heap_FndGetTotalFreeSizeForExpHeap(11); - u32 v3 = Heap_FndGetTotalFreeSizeForExpHeap(4); - u32 v4 = Heap_FndGetTotalFreeSizeForExpHeap(32); + u32 v2 = Heap_FndGetTotalFreeSizeForExpHeap(HEAP_ID_FIELDMAP); + u32 v3 = Heap_FndGetTotalFreeSizeForExpHeap(HEAP_ID_FIELD); + u32 v4 = Heap_FndGetTotalFreeSizeForExpHeap(HEAP_ID_FIELD_TASK); if (v1 == 0) { Unk_021C07E8 = v2; diff --git a/src/start_menu.c b/src/start_menu.c index f2d608970a..e25ab025ab 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -967,7 +967,7 @@ static BOOL StartMenu_PokedexEnd(FieldTask *taskMan) FieldSystem_StartFieldMap(fieldSystem); if (menu->unk_25C != NULL) { - Heap_FreeToHeapExplicit(11, menu->unk_25C); + Heap_FreeToHeapExplicit(HEAP_ID_FIELDMAP, menu->unk_25C); } menu->state = START_MENU_STATE_12; @@ -1674,7 +1674,7 @@ static BOOL sub_0203C390(FieldTask *taskMan) sub_02097390(menu->unk_25C, &v2, &v3); BagCursor_SetFieldPocketPosition(fieldSystem->unk_98, 4, v3, v2); - Heap_FreeToHeapExplicit(11, menu->unk_25C); + Heap_FreeToHeapExplicit(HEAP_ID_FIELDMAP, menu->unk_25C); menu->unk_25C = sub_0203D20C(fieldSystem, &menu->unk_230); sub_0203B674(menu, sub_0203BC5C); @@ -1690,7 +1690,7 @@ BOOL sub_0203C3F4(FieldTask *taskMan) fieldSystem = FieldTask_GetFieldSystem(taskMan); menu = FieldTask_GetEnv(taskMan); - Heap_FreeToHeapExplicit(11, menu->unk_25C); + Heap_FreeToHeapExplicit(HEAP_ID_FIELDMAP, menu->unk_25C); menu->unk_25C = sub_0203D20C(fieldSystem, &menu->unk_230); sub_0203B674(menu, sub_0203BC5C); diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c index d8661e0fca..fe0a3d52ba 100644 --- a/src/unk_0205CA94.c +++ b/src/unk_0205CA94.c @@ -592,7 +592,7 @@ void sub_0205D404(struct UnkStruct_0205D3AC_t *param0) if (param0->unk_00 != NULL) { Sprite_Delete(v0->unk_0C); - Heap_FreeToHeapExplicit(4, param0->unk_00); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, param0->unk_00); param0->unk_00 = NULL; } @@ -641,7 +641,7 @@ void sub_0205D4E0(struct UnkStruct_0205D3AC_t *param0) if (param0->unk_00 != NULL) { Sprite_Delete(v0->unk_0C); - Heap_FreeToHeapExplicit(4, param0->unk_00); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, param0->unk_00); param0->unk_00 = NULL; } @@ -680,7 +680,7 @@ void sub_0205D564(struct UnkStruct_0205D3AC_t *param0) if (param0->unk_00 != NULL) { Sprite_Delete(v0->unk_0C); - Heap_FreeToHeapExplicit(4, param0->unk_00); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, param0->unk_00); param0->unk_00 = NULL; } } @@ -732,7 +732,7 @@ void sub_0205D624(struct UnkStruct_0205D3AC_t *param0) if (param0->unk_00 != NULL) { Sprite_Delete(v0->unk_0C); - Heap_FreeToHeapExplicit(4, param0->unk_00); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, param0->unk_00); param0->unk_00 = NULL; } @@ -814,7 +814,7 @@ void sub_0205D768(struct UnkStruct_0205D3AC_t *param0) if (param0->unk_00 != NULL) { Sprite_Delete(v0->unk_0C); - Heap_FreeToHeapExplicit(4, param0->unk_00); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, param0->unk_00); param0->unk_00 = NULL; } } @@ -880,7 +880,7 @@ void sub_0205D888(struct UnkStruct_0205D3AC_t *param0) if (param0->unk_00 != NULL) { Sprite_Delete(v0->unk_0C); - Heap_FreeToHeapExplicit(4, param0->unk_00); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, param0->unk_00); param0->unk_00 = NULL; } } diff --git a/src/unk_020655F4.c b/src/unk_020655F4.c index d54d4bd5dc..96a200cc15 100644 --- a/src/unk_020655F4.c +++ b/src/unk_020655F4.c @@ -214,7 +214,7 @@ void MapObject_FinishAnimation(SysTask *task) GF_ASSERT(LocalMapObj_CheckAnimationFinished(v0->unk_0C) == 1); sub_020656AC(v0->unk_0C); - Heap_FreeToHeapExplicit(4, v0); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, v0); SysTask_Done(task); } diff --git a/src/unk_02067A84.c b/src/unk_02067A84.c index 1cfb1b201b..bf0335f6b8 100644 --- a/src/unk_02067A84.c +++ b/src/unk_02067A84.c @@ -440,7 +440,7 @@ static void sub_02068054(SysTask *task) { UnkStruct_020EF6D0 *v0 = SysTask_GetParam(task); - Heap_FreeToHeapExplicit(4, v0); + Heap_FreeToHeapExplicit(HEAP_ID_FIELD, v0); SysTask_Done(task); } diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index 4d7af6057c..918ba52f03 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -860,7 +860,7 @@ static void sub_0207EA24(BgConfig *param0) Bg_FreeTilemapBuffer(param0, 2); Bg_FreeTilemapBuffer(param0, 1); Bg_FreeTilemapBuffer(param0, 0); - Heap_FreeToHeapExplicit(12, param0); + Heap_FreeToHeapExplicit(HEAP_ID_12, param0); } void sub_0207EA74(GameWindowLayout *param0, int param1) @@ -920,7 +920,7 @@ static void sub_0207EB6C(GameWindowLayout *param0, NARC *param1) v2 = (u16 *)v0->pRawData; memcpy(param0->unk_4A4, &v2[3 * 16], 32 * 8); - Heap_FreeToHeapExplicit(12, v1); + Heap_FreeToHeapExplicit(HEAP_ID_12, v1); } Font_LoadScreenIndicatorsPalette(0, 13 * 32, 12); @@ -1709,7 +1709,7 @@ static void sub_0207FFC8(GameWindowLayout *param0) } sub_02081CF4(param0, v0, v1); - Heap_FreeToHeapExplicit(12, v0); + Heap_FreeToHeapExplicit(HEAP_ID_12, v0); sub_02081E08(param0); sub_020826F4(param0, 0xffffffff, 1); Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1); diff --git a/src/unk_02083370.c b/src/unk_02083370.c index 257a001b2a..eb4e8ae5d5 100644 --- a/src/unk_02083370.c +++ b/src/unk_02083370.c @@ -634,7 +634,7 @@ static void sub_02084134(GameWindowLayout *param0) param0->unk_704[v1->unk_300[0]] = param0->unk_704[v1->unk_300[1]]; param0->unk_704[v1->unk_300[1]] = *v0; - Heap_FreeToHeapExplicit(12, v0); + Heap_FreeToHeapExplicit(HEAP_ID_12, v0); v3 = param0->unk_704[v1->unk_300[0]].unk_16; param0->unk_704[v1->unk_300[0]].unk_16 = param0->unk_704[v1->unk_300[1]].unk_16; diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index db97ecaacd..521bdfcc2f 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -1150,11 +1150,11 @@ static int sub_02086F3C(OverlayManager *param0, int *param1) SpriteList_Delete(v0->unk_188); RenderOam_Free(); - Heap_FreeToHeapExplicit(18, v0->unk_510); + Heap_FreeToHeapExplicit(HEAP_ID_18, v0->unk_510); if (v0->unk_00 == 1) { - Heap_FreeToHeapExplicit(18, v0->unk_518); - Heap_FreeToHeapExplicit(18, v0->unk_520); + Heap_FreeToHeapExplicit(HEAP_ID_18, v0->unk_518); + Heap_FreeToHeapExplicit(HEAP_ID_18, v0->unk_520); } Bg_FreeTilemapBuffer(v0->unk_160, 7); @@ -1492,7 +1492,7 @@ static void sub_0208765C(BgConfig *param0, Window *param1) Bg_FreeTilemapBuffer(param0, 2); Bg_FreeTilemapBuffer(param0, 1); Bg_FreeTilemapBuffer(param0, 0); - Heap_FreeToHeapExplicit(18, param0); + Heap_FreeToHeapExplicit(HEAP_ID_18, param0); } static void sub_0208769C(UnkStruct_02087A10 *param0, NARC *param1)