diff --git a/include/overlay005/ov5_021D2F14.h b/include/overlay005/ov5_021D2F14.h
index 48ab076371..1c8273c7e0 100644
--- a/include/overlay005/ov5_021D2F14.h
+++ b/include/overlay005/ov5_021D2F14.h
@@ -10,7 +10,7 @@
 void ov5_021D2F14(UnkStruct_ov5_021D30A8 *param0, const SpriteResourceDataPaths *param1, u32 param2, u32 heapID);
 void ov5_021D30A8(UnkStruct_ov5_021D30A8 *param0);
 Sprite *ov5_021D3104(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplateFromResourceHeader *param1);
-void ov5_021D3190(UnkStruct_ov5_021D30A8 *param0, SpriteResourceCapacities *param1, u32 param2, u32 param3);
+void ov5_021D3190(UnkStruct_ov5_021D30A8 *param0, SpriteResourceCapacities *param1, u32 param2, u32 heapID);
 void ov5_021D3270(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, int param3, int param4, int param5, int param6);
 void ov5_021D32E8(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, int param3, int param4, int param5, int param6);
 void ov5_021D3360(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, int param3, int param4);
diff --git a/include/overlay083/ov83_0223D6A8.h b/include/overlay083/ov83_0223D6A8.h
index f50ce95791..3594da1e58 100644
--- a/include/overlay083/ov83_0223D6A8.h
+++ b/include/overlay083/ov83_0223D6A8.h
@@ -30,7 +30,7 @@
 #include "sprite.h"
 #include "sprite_resource.h"
 
-void ov83_0223D754(UnkStruct_ov83_0223D784 *param0, int param1, int param2, int param3);
+void ov83_0223D754(UnkStruct_ov83_0223D784 *param0, int param1, int param2, int heapID);
 void ov83_0223D784(UnkStruct_ov83_0223D784 *param0);
 void ov83_0223D7A8(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1, NARC *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9);
 void ov83_0223D894(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1, NARC *param2, SpriteResource *param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
diff --git a/include/party.h b/include/party.h
index 16474dd16d..ec0ef38c49 100644
--- a/include/party.h
+++ b/include/party.h
@@ -1,6 +1,8 @@
 #ifndef POKEPLATINUM_PARTY_H
 #define POKEPLATINUM_PARTY_H
 
+#include "constants/heap.h"
+
 #include "struct_defs/pokemon.h"
 
 #include "savedata.h"
@@ -12,7 +14,7 @@ typedef struct Party {
 } Party;
 
 int Party_SaveSize(void);
-Party *Party_New(u32 heapID);
+Party *Party_New(enum HeapId heapID);
 void Party_Init(Party *party);
 void Party_InitWithCapacity(Party *party, int capacity);
 BOOL Party_AddPokemon(Party *party, Pokemon *pokemon);
diff --git a/include/pokedex.h b/include/pokedex.h
index d79250d79c..a011196d4b 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -3,11 +3,12 @@
 
 #include "struct_decls/pokedexdata_decl.h"
 
+#include "heap.h"
 #include "pokemon.h"
 #include "savedata.h"
 
 int Pokedex_SaveSize(void);
-Pokedex *Pokedex_New(u32 heapID);
+Pokedex *Pokedex_New(enum HeapId heapID);
 void Pokedex_Copy(const Pokedex *src, Pokedex *dest);
 void Pokedex_Init(Pokedex *pokedex);
 u16 Pokedex_CountCaught_National(const Pokedex *pokedex);
diff --git a/include/trainer_info.h b/include/trainer_info.h
index a647a0c644..076ca9024c 100644
--- a/include/trainer_info.h
+++ b/include/trainer_info.h
@@ -3,6 +3,7 @@
 
 #include "constants/string.h"
 
+#include "heap.h"
 #include "strbuf.h"
 
 typedef struct TrainerInfo {
@@ -34,7 +35,7 @@ int TrainerInfo_Size(void);
  * @param heapID    Heap on which to allocate the new struct.
  * @return Address of the new struct.
  */
-TrainerInfo *TrainerInfo_New(u32 heapID);
+TrainerInfo *TrainerInfo_New(enum HeapId heapID);
 
 /**
  * @brief Copy a source TrainerInfo struct into a destination struct, byte-for-byte.
diff --git a/include/unk_0202854C.h b/include/unk_0202854C.h
index 0b3484fa93..757c768335 100644
--- a/include/unk_0202854C.h
+++ b/include/unk_0202854C.h
@@ -23,7 +23,7 @@ void sub_020287F8(SaveData *saveData);
 BOOL sub_02028810(SaveData *saveData);
 void UndergroundData_SetUnusedField(UndergroundData *undergroundData);
 void sub_02028830(UndergroundData *param0, const TrainerInfo *param1);
-TrainerInfo *sub_020288C8(const UndergroundData *param0, int param1, int param2);
+TrainerInfo *sub_020288C8(const UndergroundData *param0, int heapID, int param2);
 u32 sub_02028930(UndergroundData *param0);
 int sub_02028938(int param0);
 BOOL sub_0202895C(UndergroundData *param0, int param1);
diff --git a/src/applications/pokedex/ov21_021D5AEC.c b/src/applications/pokedex/ov21_021D5AEC.c
index 225012447f..13911a0dfb 100644
--- a/src/applications/pokedex/ov21_021D5AEC.c
+++ b/src/applications/pokedex/ov21_021D5AEC.c
@@ -115,7 +115,7 @@ static void ov21_021D637C(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *p
 static void ov21_021D63C0(UnkStruct_ov21_021D71A8 *param0);
 static void ov21_021D63DC(PokedexGraphicData *param0, int param1, int param2, int param3);
 static void ov21_021D64B0(PokedexGraphicData *param0, int param1, int param2);
-static void ov21_021D6538(UnkStruct_ov21_021D71A8 *param0, int param1);
+static void ov21_021D6538(UnkStruct_ov21_021D71A8 *param0, int heapID);
 static void ov21_021D6580(UnkStruct_ov21_021D71A8 *param0);
 static void ov21_021D65DC(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, int param2);
 static void ov21_021D6744(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, int param2);
@@ -753,12 +753,12 @@ static void ov21_021D64B0(PokedexGraphicData *param0, int heapID, int param2)
     Bg_ScheduleTilemapTransfer(param0->bgConfig, 1);
 }
 
-static void ov21_021D6538(UnkStruct_ov21_021D71A8 *param0, int param1)
+static void ov21_021D6538(UnkStruct_ov21_021D71A8 *param0, int heapID)
 {
-    param0->unk_80[0] = SpriteResourceCollection_New(2, 0, param1);
-    param0->unk_80[1] = SpriteResourceCollection_New(2, 1, param1);
-    param0->unk_80[2] = SpriteResourceCollection_New(2, 2, param1);
-    param0->unk_80[3] = SpriteResourceCollection_New(2, 3, param1);
+    param0->unk_80[0] = SpriteResourceCollection_New(2, 0, heapID);
+    param0->unk_80[1] = SpriteResourceCollection_New(2, 1, heapID);
+    param0->unk_80[2] = SpriteResourceCollection_New(2, 2, heapID);
+    param0->unk_80[3] = SpriteResourceCollection_New(2, 3, heapID);
 }
 
 static void ov21_021D6580(UnkStruct_ov21_021D71A8 *param0)
diff --git a/src/applications/pokedex/ov21_021D76B0.c b/src/applications/pokedex/ov21_021D76B0.c
index 9f47294d5f..8379f3c3cd 100644
--- a/src/applications/pokedex/ov21_021D76B0.c
+++ b/src/applications/pokedex/ov21_021D76B0.c
@@ -95,8 +95,8 @@ static void ov21_021D7B70(UnkStruct_ov21_021D7A64 *param0);
 static void ov21_021D7B8C(u32 param0, enum TouchScreenButtonState param1, void *param2);
 static void ov21_021D84B8(UnkStruct_ov21_021D77D4 *param0);
 static void ov21_021D7C64(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021D77D4 *param2, int heapID);
-static void ov21_021D7CAC(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, int param2);
-static void ov21_021D7CD8(PokedexGraphicData **param0, const UnkStruct_ov21_021D77D4 *param1, int heapID);
+static void ov21_021D7CAC(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, enum HeapId heapID);
+static void ov21_021D7CD8(PokedexGraphicData **param0, const UnkStruct_ov21_021D77D4 *param1, enum HeapId heapID);
 static void ov21_021D7D8C(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, int param2);
 static void ov21_021D7E3C(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1);
 static void ov21_021D7E80(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021D77D4 *param2, int param3);
@@ -104,7 +104,7 @@ static void ov21_021D7FEC(UnkStruct_ov21_021D7C64 *param0);
 static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021D77D4 *param2, int param3);
 static void ov21_021D81EC(UnkStruct_ov21_021D7C64 *param0);
 static void ov21_021D820C(PokedexGraphicData **param0, int heapID);
-static void ov21_021D828C(PokedexGraphicData **param0, int param1);
+static void ov21_021D828C(PokedexGraphicData **param0, int heapID);
 static void ov21_021D853C(UnkStruct_ov21_021D77D4 *param0, int param1);
 static void ov21_021D82A8(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1);
 static void ov21_021D8324(UnkStruct_ov21_021D7A64 *param0);
@@ -517,17 +517,17 @@ static void ov21_021D7C64(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **
     Bg_SetPriority(7, 3);
 }
 
-static void ov21_021D7CAC(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, int param2)
+static void ov21_021D7CAC(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, enum HeapId heapID)
 {
     ov21_021D81EC(param0);
     ov21_021D7FEC(param0);
     ov21_021D7E3C(param0, param1);
-    ov21_021D828C(param1, param2);
+    ov21_021D828C(param1, heapID);
 
     Bg_SetPriority(7, 1);
 }
 
-static void ov21_021D7CD8(PokedexGraphicData **param0, const UnkStruct_ov21_021D77D4 *param1, int heapID)
+static void ov21_021D7CD8(PokedexGraphicData **param0, const UnkStruct_ov21_021D77D4 *param1, enum HeapId heapID)
 {
     void *v0;
     NNSG2dScreenData *v1;
@@ -768,11 +768,11 @@ static void ov21_021D820C(PokedexGraphicData **param0, int heapID)
     Bg_SetOffset(v2, 7, 3, 0);
 }
 
-static void ov21_021D828C(PokedexGraphicData **param0, int param1)
+static void ov21_021D828C(PokedexGraphicData **param0, int heapID)
 {
     BgConfig *v0 = (*param0)->bgConfig;
 
-    Bg_ClearTilesRange(7, 64, 0, param1);
+    Bg_ClearTilesRange(7, 64, 0, heapID);
     Bg_ClearTilemap(v0, 7);
 }
 
diff --git a/src/applications/pokedex/ov21_021E8D48.c b/src/applications/pokedex/ov21_021E8D48.c
index c4a8a795d1..8eb695eacb 100644
--- a/src/applications/pokedex/ov21_021E8D48.c
+++ b/src/applications/pokedex/ov21_021E8D48.c
@@ -84,11 +84,11 @@ static void ov21_021E98F8(PaletteData *param0, PokemonSprite *param1, int param2
 static BOOL ov21_021E9948(PaletteData *param0, PokemonSprite *param1);
 static void ov21_021E8E0C(UnkStruct_ov21_021E8D48 *param0, const UnkStruct_ov21_021E8E0C *param1);
 static void ov21_021E900C(UnkStruct_ov21_021E8D48 *param0);
-static void ov21_021E90B0(BgConfig *param0, int param1);
+static void ov21_021E90B0(BgConfig *param0, int heapID);
 static void ov21_021E9194(BgConfig *param0);
 static Window *ov21_021E91B0(BgConfig *param0, int param1);
 static void ov21_021E91F0(Window *param0);
-static void ov21_021E9208(SpriteResourceCollection **param0, int param1);
+static void ov21_021E9208(SpriteResourceCollection **param0, int heapID);
 static void ov21_021E9228(SpriteResourceCollection **param0);
 static void ov21_021E9240(PokedexSpeciesLabel *param0, PokedexTextManager *textMan, int param2, int param3, int param4);
 static void ov21_021E92B0(PokedexSpeciesLabel *param0);
@@ -263,7 +263,7 @@ static void ov21_021E900C(UnkStruct_ov21_021E8D48 *param0)
     ov21_021E9A38();
 }
 
-static void ov21_021E90B0(BgConfig *param0, int param1)
+static void ov21_021E90B0(BgConfig *param0, int heapID)
 {
     {
         BgTemplate v0 = {
@@ -284,7 +284,7 @@ static void ov21_021E90B0(BgConfig *param0, int param1)
 
         Bg_FreeTilemapBuffer(param0, 1);
         Bg_InitFromTemplate(param0, 1, &v0, 0);
-        Bg_ClearTilesRange(1, 32, 0, param1);
+        Bg_ClearTilesRange(1, 32, 0, heapID);
         Bg_ClearTilemap(param0, 1);
     }
 
@@ -307,7 +307,7 @@ static void ov21_021E90B0(BgConfig *param0, int param1)
 
         Bg_FreeTilemapBuffer(param0, 2);
         Bg_InitFromTemplate(param0, 2, &v1, 0);
-        Bg_ClearTilesRange(2, 32, 0, param1);
+        Bg_ClearTilesRange(2, 32, 0, heapID);
         Bg_ClearTilemap(param0, 2);
     }
 
@@ -334,7 +334,7 @@ static void ov21_021E90B0(BgConfig *param0, int param1)
 
         Bg_FreeTilemapBuffer(param0, 3);
         Bg_InitFromTemplate(param0, 3, &v2, 0);
-        Bg_ClearTilesRange(3, 32, 0, param1);
+        Bg_ClearTilesRange(3, 32, 0, heapID);
         Bg_ClearTilemap(param0, 3);
     }
 }
@@ -364,12 +364,12 @@ static void ov21_021E91F0(Window *param0)
     Windows_Delete(param0, 1);
 }
 
-static void ov21_021E9208(SpriteResourceCollection **param0, int param1)
+static void ov21_021E9208(SpriteResourceCollection **param0, int heapID)
 {
-    int v0;
+    int i;
 
-    for (v0 = 0; v0 < 4; v0++) {
-        param0[v0] = SpriteResourceCollection_New(8, v0, param1);
+    for (i = 0; i < 4; i++) {
+        param0[i] = SpriteResourceCollection_New(8, i, heapID);
     }
 }
 
diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c
index 66daae9584..ef722130ad 100644
--- a/src/battle/ov16_0223B140.c
+++ b/src/battle/ov16_0223B140.c
@@ -1081,7 +1081,7 @@ static void ov16_0223C2C0(BattleSystem *battleSys, FieldBattleDTO *param1)
     battleSys->bag = Bag_New(HEAP_ID_BATTLE);
 
     Bag_Copy(param1->bag, battleSys->bag);
-    battleSys->pokedex = Pokedex_New(5);
+    battleSys->pokedex = Pokedex_New(HEAP_ID_BATTLE);
     Pokedex_Copy(param1->pokedex, battleSys->pokedex);
 
     battleSys->pcBoxes = param1->pcBoxes;
diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c
index a62047bb2e..a86313dad1 100644
--- a/src/choose_starter/choose_starter_app.c
+++ b/src/choose_starter/choose_starter_app.c
@@ -249,7 +249,7 @@ static void MakeSprite(ChooseStarterApp *app, enum HeapId heapID);
 static void ov78_021D14BC(ChooseStarterApp *param0);
 static void MakeSpriteDisplay(ChooseStarterApp *app, enum HeapId heapID);
 static void ov78_021D1518(ChooseStarterApp *param0);
-static void MakeCellActors(ChooseStarterApp *param0, int param1);
+static void MakeCellActors(ChooseStarterApp *param0, int heapID);
 static void ov78_021D1594(ChooseStarterApp *param0);
 static void MakeCamera(ChooseStarterApp *param0, int param1);
 static void ov78_021D1B3C(Camera *camera, VecFx32 *param1);
@@ -737,13 +737,13 @@ static void ov78_021D1518(ChooseStarterApp *param0)
     sub_020150A8(param0->spriteDisplay);
 }
 
-static void MakeCellActors(ChooseStarterApp *param0, int param1)
+static void MakeCellActors(ChooseStarterApp *param0, int heapID)
 {
-    param0->unk_248 = SpriteList_InitRendering(2, &param0->unk_BC, param1);
-    param0->unk_24C[0] = SpriteResourceCollection_New(2, 0, param1);
-    param0->unk_24C[1] = SpriteResourceCollection_New(2, 1, param1);
-    param0->unk_24C[2] = SpriteResourceCollection_New(2, 2, param1);
-    param0->unk_24C[3] = SpriteResourceCollection_New(2, 3, param1);
+    param0->unk_248 = SpriteList_InitRendering(2, &param0->unk_BC, heapID);
+    param0->unk_24C[0] = SpriteResourceCollection_New(2, 0, heapID);
+    param0->unk_24C[1] = SpriteResourceCollection_New(2, 1, heapID);
+    param0->unk_24C[2] = SpriteResourceCollection_New(2, 2, heapID);
+    param0->unk_24C[3] = SpriteResourceCollection_New(2, 3, heapID);
 
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1);
diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c
index 3c316d529d..a4256c5b3d 100644
--- a/src/overlay005/ov5_021D2F14.c
+++ b/src/overlay005/ov5_021D2F14.c
@@ -117,7 +117,7 @@ Sprite *ov5_021D3104(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplateFromRes
     return v1;
 }
 
-void ov5_021D3190(UnkStruct_ov5_021D30A8 *param0, SpriteResourceCapacities *param1, u32 param2, u32 param3)
+void ov5_021D3190(UnkStruct_ov5_021D30A8 *param0, SpriteResourceCapacities *param1, u32 param2, u32 heapID)
 {
     SpriteResourceTable *v0;
     SpriteResourceTable *v1;
@@ -125,8 +125,8 @@ void ov5_021D3190(UnkStruct_ov5_021D30A8 *param0, SpriteResourceCapacities *para
     u32 v3;
     u32 v4, v5;
 
-    param0->unk_00 = SpriteList_InitRendering(param2, &param0->unk_04, param3);
-    param0->heapID = param3;
+    param0->unk_00 = SpriteList_InitRendering(param2, &param0->unk_04, heapID);
+    param0->heapID = heapID;
 
     if ((param1->asStruct.mcellCapacity == 0) || (param1->asStruct.manimCapacity == 0)) {
         param0->unk_1C4 = 6 - 2;
@@ -137,7 +137,7 @@ void ov5_021D3190(UnkStruct_ov5_021D30A8 *param0, SpriteResourceCapacities *para
     }
 
     for (v4 = 0; v4 < param0->unk_1C4; v4++) {
-        param0->unk_194[v4] = SpriteResourceCollection_New(param1->asArray[v4], v4, param3);
+        param0->unk_194[v4] = SpriteResourceCollection_New(param1->asArray[v4], v4, heapID);
     }
 
     for (v4 = 0; v4 < param0->unk_1C4; v4++) {
@@ -145,7 +145,7 @@ void ov5_021D3190(UnkStruct_ov5_021D30A8 *param0, SpriteResourceCapacities *para
             continue;
         }
 
-        param0->unk_1AC[v4] = SpriteResourceList_New(param1->asArray[v4], param3);
+        param0->unk_1AC[v4] = SpriteResourceList_New(param1->asArray[v4], heapID);
 
         for (v5 = 0; v5 < param0->unk_1AC[v4]->capacity; v5++) {
             param0->unk_1AC[v4]->resources[v5] = NULL;
diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c
index 8f49d615e8..1f39d73d5f 100644
--- a/src/overlay005/ov5_021EA874.c
+++ b/src/overlay005/ov5_021EA874.c
@@ -311,14 +311,12 @@ static BOOL ov5_021EAC44(UnkStruct_ov5_021EAE78 *param0)
         Sound_PlayEffect(SEQ_SE_CONFIRM);
         param0->unk_90 = v1;
 
-        {
-            WiFiList *v2 = SaveData_GetWiFiList(param0->saveData);
-            TrainerInfo *v3 = TrainerInfo_New(4);
+        WiFiList *v2 = SaveData_GetWiFiList(param0->saveData);
+        TrainerInfo *v3 = TrainerInfo_New(HEAP_ID_FIELD);
 
-            TrainerInfo_SetName(v3, sub_0202AEF0(v2, v1));
-            StringTemplate_SetPlayerName(param0->unk_38, 0, v3);
-            Heap_FreeToHeap(v3);
-        }
+        TrainerInfo_SetName(v3, sub_0202AEF0(v2, v1));
+        StringTemplate_SetPlayerName(param0->unk_38, 0, v3);
+        Heap_FreeToHeap(v3);
 
         ov5_021EAE78(param0, 60);
         param0->unk_48 = 10;
diff --git a/src/overlay007/communication_club.c b/src/overlay007/communication_club.c
index 9672dab374..f56282b108 100644
--- a/src/overlay007/communication_club.c
+++ b/src/overlay007/communication_club.c
@@ -221,7 +221,7 @@ static void CommClubMan_Init(FieldSystem *fieldSystem)
     sCommClubMan->unk_97 = 0;
     sCommClubMan->msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0353, HEAP_ID_FIELD);
     sCommClubMan->trainerInfoPersonal = SaveData_GetTrainerInfo(FieldSystem_GetSaveData(sCommClubMan->fieldSystem));
-    sCommClubMan->unk_7C = TrainerInfo_New(4);
+    sCommClubMan->unk_7C = TrainerInfo_New(HEAP_ID_FIELD);
 
     Window_Init(&sCommClubMan->unk_20);
     Window_Init(&sCommClubMan->unk_30);
diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c
index 48cda56bcc..45a531aa1b 100644
--- a/src/overlay023/ov23_0224A1D0.c
+++ b/src/overlay023/ov23_0224A1D0.c
@@ -531,7 +531,7 @@ void ov23_0224AAB0(void)
     if (commPlayerMan->unk_290[CommSys_CurNetId()]) {
         CommSys_SendDataFixedSize(91, commPlayerMan->unk_290[CommSys_CurNetId()]);
     } else {
-        TrainerInfo *v0 = TrainerInfo_New(15);
+        TrainerInfo *v0 = TrainerInfo_New(HEAP_ID_COMMUNICATION);
         Strbuf *v1 = Strbuf_Init(20, HEAP_ID_COMMUNICATION);
 
         GF_ASSERT(v0);
@@ -595,7 +595,7 @@ void ov23_0224ABC4(int param0, int param1, void *param2, void *param3)
             Heap_FreeToHeap(commPlayerMan->unk_290[v3]);
         }
 
-        commPlayerMan->unk_290[v3] = TrainerInfo_New(15);
+        commPlayerMan->unk_290[v3] = TrainerInfo_New(HEAP_ID_COMMUNICATION);
         TrainerInfo_Copy((TrainerInfo *)v1->unk_00, commPlayerMan->unk_290[v3]);
         commPlayerMan->unk_FA[v3] = 1;
     }
@@ -796,7 +796,7 @@ BOOL ov23_0224AEC4(int param0, int param1)
         TrainerInfo *v1 = CommInfo_TrainerInfo(param1);
 
         if (v1) {
-            v0->unk_290[param0] = TrainerInfo_New(15);
+            v0->unk_290[param0] = TrainerInfo_New(HEAP_ID_COMMUNICATION);
             TrainerInfo_Copy(v1, v0->unk_290[param0]);
 
             v0->unk_FA[param0] = 1;
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index d2cbeb1b15..8393060775 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -181,7 +181,7 @@ static void ov23_0224F294(UnkStruct_ov23_02250CD4 *param0, u8 *param1, u32 param
     u32 v1;
     NARC *v2 = NARC_ctor(NARC_INDEX_GRAPHIC__MENU_GRA, HEAP_ID_FIELDMAP);
 
-    ov5_021D3190(&param0->unk_74, &v0, (7 + 1), 11);
+    ov5_021D3190(&param0->unk_74, &v0, (7 + 1), HEAP_ID_FIELDMAP);
     ov5_021D32E8(&param0->unk_74, v2, 9, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 14528);
     ov5_021D3374(&param0->unk_74, v2, 1, 0, 14528);
     ov5_021D339C(&param0->unk_74, v2, 0, 0, 14528);
diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c
index 664ed22d71..8fdc511674 100644
--- a/src/overlay023/ov23_02253598.c
+++ b/src/overlay023/ov23_02253598.c
@@ -364,7 +364,7 @@ static void ov23_02253A78(Window *param0, MessageLoader *param1, TrainerInfo *pa
     Text_AddPrinterWithParams(param0, FONT_SYSTEM, v1, v7, 1 + v8 * 3, TEXT_SPEED_NO_TRANSFER, NULL);
 
     for (v3 = 0; v3 < 5; v3++) {
-        TrainerInfo *v13 = sub_020288C8(param4, 4, v3);
+        TrainerInfo *v13 = sub_020288C8(param4, HEAP_ID_FIELD, v3);
 
         if (v13) {
             StringTemplate_SetPlayerName(v0, 0, v13);
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index 2c283edd0d..33b913f840 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -252,9 +252,9 @@ static void ov64_0222E21C(UnkStruct_ov64_0222E21C *param0);
 static void ov64_0222E228(UnkStruct_ov64_0222E21C *param0);
 static void ov64_0222E23C(UnkStruct_ov64_0222E21C *param0);
 static void ov64_0222E270(void);
-static void ov64_0222E290(UnkStruct_ov64_0222E21C *param0, u32 param1);
+static void ov64_0222E290(UnkStruct_ov64_0222E21C *param0, u32 heapID);
 static void ov64_0222E3AC(UnkStruct_ov64_0222E21C *param0);
-static void ov64_0222E3D8(UnkStruct_ov64_0222E21C *param0, u32 param1);
+static void ov64_0222E3D8(UnkStruct_ov64_0222E21C *param0, u32 heapID);
 static void ov64_0222E570(UnkStruct_ov64_0222E21C *param0);
 static void ov64_0222E5D8(UnkStruct_ov64_0222E21C *param0, u32 param1);
 static void ov64_0222E604(UnkStruct_ov64_0222E21C *param0);
@@ -336,13 +336,13 @@ static void ov64_02230804(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E0
 static void ov64_0223081C(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2);
 static void ov64_0223087C(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E21C *param1);
 static void ov64_022308DC(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID);
-static int ov64_02230904(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3);
+static int ov64_02230904(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID);
 static void ov64_02230A50(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2);
 static void ov64_02230A58(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3);
 static BOOL ov64_02230A9C(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3);
 static void ov64_02230B1C(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID);
 static void ov64_02230BA0(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2);
-static void ov64_02230BD8(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3);
+static void ov64_02230BD8(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID);
 static void ov64_02230C1C(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E21C *param1);
 static void ov64_02230C50(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3, u32 param4, u32 param5);
 static void ov64_02230C8C(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, u32 param3);
@@ -632,7 +632,7 @@ int ov64_0222DDAC(ApplicationManager *appMan, int *param1)
             v1 = ov64_02230628(&v0->unk_41C, &v0->unk_28C, &v0->unk_04);
             break;
         case 4:
-            v1 = ov64_02230904(&v0->unk_444, &v0->unk_28C, &v0->unk_04, 52);
+            v1 = ov64_02230904(&v0->unk_444, &v0->unk_28C, &v0->unk_04, HEAP_ID_52);
             break;
         case 5:
             return 1;
@@ -889,11 +889,11 @@ static void ov64_0222E270(void)
     GXLayers_SetBanks(&v0);
 }
 
-static void ov64_0222E290(UnkStruct_ov64_0222E21C *param0, u32 param1)
+static void ov64_0222E290(UnkStruct_ov64_0222E21C *param0, u32 heapID)
 {
     int v0;
 
-    param0->unk_00 = BgConfig_New(param1);
+    param0->unk_00 = BgConfig_New(heapID);
 
     {
         GraphicsModes v1 = {
@@ -908,19 +908,19 @@ static void ov64_0222E290(UnkStruct_ov64_0222E21C *param0, u32 param1)
 
     for (v0 = 0; v0 < 5; v0++) {
         Bg_InitFromTemplate(param0->unk_00, Unk_ov64_02232258[v0], &Unk_ov64_02232390[v0], 0);
-        Bg_ClearTilesRange(Unk_ov64_02232258[v0], 32, 0, param1);
+        Bg_ClearTilesRange(Unk_ov64_02232258[v0], 32, 0, heapID);
         Bg_ClearTilemap(param0->unk_00, Unk_ov64_02232258[v0]);
     }
 
-    Graphics_LoadPaletteFromOpenNARC(param0->unk_21C, 0, 0, 0, ((6 + 1) - 0) * 32, param1);
-    Graphics_LoadPaletteFromOpenNARC(param0->unk_21C, 0, 4, 0, ((4 + 1) - 0) * 32, param1);
+    Graphics_LoadPaletteFromOpenNARC(param0->unk_21C, 0, 0, 0, ((6 + 1) - 0) * 32, heapID);
+    Graphics_LoadPaletteFromOpenNARC(param0->unk_21C, 0, 4, 0, ((4 + 1) - 0) * 32, heapID);
 
-    Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_21C, 18, param0->unk_00, Unk_ov64_02232258[0], 0, 0, 0, param1);
-    Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_21C, 18, param0->unk_00, Unk_ov64_02232258[2], 0, 0, 0, param1);
-    Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_21C, 13, param0->unk_00, Unk_ov64_02232258[4], 0, 0, 0, param1);
+    Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_21C, 18, param0->unk_00, Unk_ov64_02232258[0], 0, 0, 0, heapID);
+    Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_21C, 18, param0->unk_00, Unk_ov64_02232258[2], 0, 0, 0, heapID);
+    Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_21C, 13, param0->unk_00, Unk_ov64_02232258[4], 0, 0, 0, heapID);
 
-    Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_21C, 12, param0->unk_00, Unk_ov64_02232258[0], 0, 0, 0, param1);
-    Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_21C, 14, param0->unk_00, Unk_ov64_02232258[4], 0, 0, 0, param1);
+    Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_21C, 12, param0->unk_00, Unk_ov64_02232258[0], 0, 0, 0, heapID);
+    Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_21C, 14, param0->unk_00, Unk_ov64_02232258[4], 0, 0, 0, heapID);
 }
 
 static void ov64_0222E3AC(UnkStruct_ov64_0222E21C *param0)
@@ -935,41 +935,41 @@ static void ov64_0222E3AC(UnkStruct_ov64_0222E21C *param0)
     param0->unk_00 = NULL;
 }
 
-static void ov64_0222E3D8(UnkStruct_ov64_0222E21C *param0, u32 param1)
+static void ov64_0222E3D8(UnkStruct_ov64_0222E21C *param0, u32 heapID)
 {
     int v0;
     BOOL v1;
 
     NNS_G2dInitOamManagerModule();
 
-    VramTransfer_New(16, param1);
-    RenderOam_Init(0, 126, 0, 30, 0, 126, 0, 30, param1);
+    VramTransfer_New(16, heapID);
+    RenderOam_Init(0, 126, 0, 30, 0, 126, 0, 30, heapID);
 
     {
         CharTransferTemplate v2 = {
             64, 0x14000, 0, 0
         };
 
-        v2.heapID = param1;
+        v2.heapID = heapID;
         CharTransfer_InitWithVramModes(&v2, GX_OBJVRAMMODE_CHAR_1D_128K, GX_OBJVRAMMODE_CHAR_1D_128K);
     }
 
-    PlttTransfer_Init(64, param1);
+    PlttTransfer_Init(64, heapID);
     CharTransfer_ClearBuffers();
     PlttTransfer_Clear();
 
-    param0->unk_04 = SpriteList_InitRendering(64, &param0->unk_78, param1);
+    param0->unk_04 = SpriteList_InitRendering(64, &param0->unk_78, heapID);
 
     RenderOam_InitSurface(&param0->unk_08, &Unk_ov64_02232460, NNS_G2D_SURFACETYPE_MAIN2D, &param0->unk_78.renderer);
 
     for (v0 = 0; v0 < 4; v0++) {
-        param0->unk_204[v0] = SpriteResourceCollection_New(64, v0, param1);
+        param0->unk_204[v0] = SpriteResourceCollection_New(64, v0, heapID);
     }
 
-    param0->unk_260[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_204[0], param0->unk_21C, 15, 0, 100, NNS_G2D_VRAM_TYPE_2DMAIN, param1);
-    param0->unk_260[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_204[1], param0->unk_21C, 0, 0, 100, NNS_G2D_VRAM_TYPE_2DMAIN, 5, param1);
-    param0->unk_260[2] = SpriteResourceCollection_AddFrom(param0->unk_204[2], param0->unk_21C, 16, 0, 100, 2, param1);
-    param0->unk_260[3] = SpriteResourceCollection_AddFrom(param0->unk_204[3], param0->unk_21C, 17, 0, 100, 3, param1);
+    param0->unk_260[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_204[0], param0->unk_21C, 15, 0, 100, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
+    param0->unk_260[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_204[1], param0->unk_21C, 0, 0, 100, NNS_G2D_VRAM_TYPE_2DMAIN, 5, heapID);
+    param0->unk_260[2] = SpriteResourceCollection_AddFrom(param0->unk_204[2], param0->unk_21C, 16, 0, 100, 2, heapID);
+    param0->unk_260[3] = SpriteResourceCollection_AddFrom(param0->unk_204[3], param0->unk_21C, 17, 0, 100, 3, heapID);
 
     v1 = SpriteTransfer_RequestCharAtEnd(param0->unk_260[0]);
     GF_ASSERT(v1);
@@ -1097,22 +1097,19 @@ static void ov64_0222E7F8(UnkStruct_ov64_0222E21C *param0, u64 param1)
     StringTemplate_SetNumber(param0->unk_214, 3, v0, 4, 2, 1);
 }
 
-static void ov64_0222E880(UnkStruct_ov64_0222E21C *param0, SaveData *saveData, u32 param2, u32 param3)
+static void ov64_0222E880(UnkStruct_ov64_0222E21C *param0, SaveData *saveData, u32 param2, u32 heapID)
 {
-    WiFiList *v0;
-    TrainerInfo *v1;
-
-    v0 = SaveData_GetWiFiList(saveData);
-    v1 = TrainerInfo_New(param3);
+    WiFiList *v0 = SaveData_GetWiFiList(saveData);
+    TrainerInfo *v1 = TrainerInfo_New(heapID);
 
     TrainerInfo_SetName(v1, sub_0202AEF0(v0, param2));
     StringTemplate_SetPlayerName(param0->unk_214, 0, v1);
     Heap_FreeToHeap(v1);
 }
 
-static void ov64_0222E8C0(UnkStruct_ov64_0222E21C *param0, SaveData *saveData, u32 param2, u32 param3)
+static void ov64_0222E8C0(UnkStruct_ov64_0222E21C *param0, SaveData *saveData, u32 param2, u32 heapID)
 {
-    TrainerInfo *v0 = TrainerInfo_New(param3);
+    TrainerInfo *v0 = TrainerInfo_New(heapID);
     WiFiList *v1 = SaveData_GetWiFiList(saveData);
 
     TrainerInfo_SetName(v0, sub_0202AF34(v1, param2));
@@ -3117,7 +3114,7 @@ static void ov64_022308DC(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E0
     ov64_02230B1C(param0, param1, param2, heapID);
 }
 
-static int ov64_02230904(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3)
+static int ov64_02230904(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID)
 {
     BOOL v0;
 
@@ -3126,7 +3123,7 @@ static int ov64_02230904(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E06
         param0->unk_0E = 0;
         param0->unk_00 = 0;
     case 1:
-        ov64_02230BD8(param0, param1, param2, param3);
+        ov64_02230BD8(param0, param1, param2, heapID);
         param1->unk_04 = 2;
         break;
     case 2:
@@ -3158,12 +3155,12 @@ static int ov64_02230904(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E06
         }
         break;
     case 3:
-        ov64_02230A58(param0, param1, param2, param3);
-        ov64_02230A9C(param0, param1, param2, param3);
+        ov64_02230A58(param0, param1, param2, heapID);
+        ov64_02230A9C(param0, param1, param2, heapID);
         param1->unk_04 = 4;
         break;
     case 4:
-        v0 = ov64_02230A9C(param0, param1, param2, param3);
+        v0 = ov64_02230A9C(param0, param1, param2, heapID);
 
         if (v0 == 1) {
             param1->unk_04 = 2;
@@ -3307,11 +3304,11 @@ static void ov64_02230BA0(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E0
     ov64_02230F60(&param0->unk_DC);
 }
 
-static void ov64_02230BD8(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 param3)
+static void ov64_02230BD8(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E060 *param1, UnkStruct_ov64_0222E21C *param2, u32 heapID)
 {
-    ov64_0222E880(param2, param1->saveData, param1->unk_08.unk_04[param1->unk_07], param3);
+    ov64_0222E880(param2, param1->saveData, param1->unk_08.unk_04[param1->unk_07], heapID);
     ov64_0222E738(param2, 13);
-    ov64_02230C50(param0, param1, param2, 0, param0->unk_00, param3);
+    ov64_02230C50(param0, param1, param2, 0, param0->unk_00, heapID);
     ov64_0222EA28(param2, 1);
 }
 
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index 370b4b69fd..961e0e5706 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -4789,7 +4789,7 @@ static void ov65_02232CA8(UnkStruct_ov65_0222EBE0 *param0, int param1)
 static void ov65_02232DC0(UnkStruct_ov65_0222EBE0 *param0, int param1)
 {
     if (param1 != -1) {
-        TrainerInfo *v0 = TrainerInfo_New(54);
+        TrainerInfo *v0 = TrainerInfo_New(HEAP_ID_54);
 
         TrainerInfo_SetName(v0, sub_0202AEF0(param0->unk_00, param1));
         StringTemplate_SetPlayerName(param0->unk_164, 0, v0);
@@ -6860,7 +6860,7 @@ static BOOL ov65_02234E8C(UnkStruct_ov65_02234E50 *param0, u32 param1, u32 param
 static void ov65_02234F68(UnkStruct_ov65_0222EBE0 *param0, int param1)
 {
     if (param1 != -1) {
-        TrainerInfo *v0 = TrainerInfo_New(54);
+        TrainerInfo *v0 = TrainerInfo_New(HEAP_ID_54);
 
         TrainerInfo_SetName(v0, sub_0202AEF0(param0->unk_00, param1));
         StringTemplate_SetPlayerName(param0->unk_BE0.unk_00, 0, v0);
diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c
index ab8664ec91..fb8241b762 100644
--- a/src/overlay065/ov65_02235060.c
+++ b/src/overlay065/ov65_02235060.c
@@ -59,7 +59,7 @@ static void ov65_022357E8(UnkStruct_ov65_02235130 *param0, u32 param1, u32 heapI
 static void ov65_0223581C(UnkStruct_ov65_02235130 *param0);
 static void ov65_0223582C(UnkStruct_ov65_02235130 *param0, u32 heapID, NARC *param2, u32 param3);
 static void ov65_0223586C(UnkStruct_ov65_02235130 *param0);
-static void ov65_0223587C(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *param2);
+static void ov65_0223587C(UnkStruct_ov65_022358CC *param0, u32 heapID, NARC *param2);
 static void ov65_022358CC(UnkStruct_ov65_022358CC *param0);
 static void ov65_022358F8(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *param2);
 static void ov65_02235900(UnkStruct_ov65_022358CC *param0);
@@ -568,19 +568,19 @@ static void ov65_0223586C(UnkStruct_ov65_02235130 *param0)
     ov63_0222D214(param0->unk_758);
 }
 
-static void ov65_0223587C(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *param2)
+static void ov65_0223587C(UnkStruct_ov65_022358CC *param0, u32 heapID, NARC *param2)
 {
-    int v0;
+    int i;
 
-    param0->unk_00 = SpriteList_InitRendering(96, &param0->unk_04, param1);
+    param0->unk_00 = SpriteList_InitRendering(96, &param0->unk_04, heapID);
     SetSubScreenViewRect(&param0->unk_04, 0, (800 * FX32_ONE));
 
-    for (v0 = 0; v0 < 4; v0++) {
-        param0->unk_190[v0] = SpriteResourceCollection_New(16, v0, param1);
+    for (i = 0; i < 4; i++) {
+        param0->unk_190[i] = SpriteResourceCollection_New(16, i, heapID);
     }
 
-    ov65_022358F8(param0, param1, param2);
-    ov65_02235908(param0, param1);
+    ov65_022358F8(param0, heapID, param2);
+    ov65_02235908(param0, heapID);
 }
 
 static void ov65_022358CC(UnkStruct_ov65_022358CC *param0)
diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c
index 38566fd972..6629b97deb 100644
--- a/src/overlay066/ov66_0222DDF0.c
+++ b/src/overlay066/ov66_0222DDF0.c
@@ -278,7 +278,7 @@ static void ov66_0222FBAC(const UnkStruct_ov66_0222FB64 *param0);
 static void ov66_0222FBC8(UnkStruct_ov66_0222FBC8 *param0);
 static BOOL ov66_0222FBD0(const UnkStruct_ov66_0222FBC8 *param0);
 static void ov66_0222FBE0(UnkStruct_ov66_0222FBC8 *param0);
-static void ov66_0222FBF0(UnkStruct_ov66_0222FBF0 *param0, u32 param1);
+static void ov66_0222FBF0(UnkStruct_ov66_0222FBF0 *param0, u32 heapID);
 static void ov66_0222FC00(UnkStruct_ov66_0222FBF0 *param0);
 static void ov66_0222FC0C(UnkStruct_ov66_0222FBF0 *param0, const UnkStruct_ov66_0222F6C4 *param1, u32 heapID);
 static void ov66_0222FC4C(UnkStruct_ov66_0222FBC8 *param0);
@@ -1724,9 +1724,9 @@ void ov66_0222EEF4(UnkStruct_ov66_0222DFF8 *param0, u32 param1)
     v0 = (UnkStruct_ov66_0222E71C *)ov66_0222E374(param0, param1);
 
     if (v0 != NULL) {
-        trainerInfo = TrainerInfo_New(112);
-        ov66_0222E640(v0, trainerInfo, 112);
-        journalEntryOnlineEvent = JournalEntry_CreateEventInteraction(TrainerInfo_Name(trainerInfo), v0->unk_38, 112, ONLINE_EVENT_CHATTED_IN_PLAZA);
+        trainerInfo = TrainerInfo_New(HEAP_ID_112);
+        ov66_0222E640(v0, trainerInfo, HEAP_ID_112);
+        journalEntryOnlineEvent = JournalEntry_CreateEventInteraction(TrainerInfo_Name(trainerInfo), v0->unk_38, HEAP_ID_112, ONLINE_EVENT_CHATTED_IN_PLAZA);
 
         JournalEntry_SaveData(journalEntry, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT);
         Heap_FreeToHeap(trainerInfo);
@@ -1742,9 +1742,9 @@ void ov66_0222EF44(UnkStruct_ov66_0222DFF8 *param0, u32 param1)
     v0 = (UnkStruct_ov66_0222E71C *)ov66_0222E374(param0, param1);
 
     if (v0 != NULL) {
-        trainerInfo = TrainerInfo_New(112);
-        ov66_0222E640(v0, trainerInfo, 112);
-        journalEntryOnlineEvent = JournalEntry_CreateEventInteraction(TrainerInfo_Name(trainerInfo), v0->unk_38, 112, ONLINE_EVENT_GOT_TAP_TOY);
+        trainerInfo = TrainerInfo_New(HEAP_ID_112);
+        ov66_0222E640(v0, trainerInfo, HEAP_ID_112);
+        journalEntryOnlineEvent = JournalEntry_CreateEventInteraction(TrainerInfo_Name(trainerInfo), v0->unk_38, HEAP_ID_112, ONLINE_EVENT_GOT_TAP_TOY);
 
         JournalEntry_SaveData(journalEntry, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT);
         Heap_FreeToHeap(trainerInfo);
@@ -2509,9 +2509,9 @@ static void ov66_0222FBE0(UnkStruct_ov66_0222FBC8 *param0)
     }
 }
 
-static void ov66_0222FBF0(UnkStruct_ov66_0222FBF0 *param0, u32 param1)
+static void ov66_0222FBF0(UnkStruct_ov66_0222FBF0 *param0, u32 heapID)
 {
-    param0->unk_00 = TrainerInfo_New(param1);
+    param0->unk_00 = TrainerInfo_New(heapID);
 }
 
 static void ov66_0222FC00(UnkStruct_ov66_0222FBF0 *param0)
diff --git a/src/overlay066/ov66_02230C44.c b/src/overlay066/ov66_02230C44.c
index 5e0aafdde8..56ae0448fc 100644
--- a/src/overlay066/ov66_02230C44.c
+++ b/src/overlay066/ov66_02230C44.c
@@ -272,12 +272,12 @@ static int ov66_02230D7C(UnkStruct_ov66_02230C90 *param0, u32 param1)
     return v0[param1](param0, &param0->unk_04[param1]);
 }
 
-static void ov66_02230DA0(UnkStruct_ov66_02230DBC *param0, u32 param1)
+static void ov66_02230DA0(UnkStruct_ov66_02230DBC *param0, u32 heapID)
 {
-    int v0;
+    int i;
 
-    for (v0 = 0; v0 < 4; v0++) {
-        param0->unk_20[v0] = TrainerInfo_New(param1);
+    for (i = 0; i < 4; i++) {
+        param0->unk_20[i] = TrainerInfo_New(heapID);
     }
 }
 
diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c
index 46c3124a4f..d7140e210a 100644
--- a/src/overlay068/ov68_0225C700.c
+++ b/src/overlay068/ov68_0225C700.c
@@ -126,16 +126,16 @@ static void ov68_0225C91C(UnkStruct_ov68_0225C91C *param0, SaveData *saveData, u
 static void ov68_0225C960(UnkStruct_ov68_0225C91C *param0);
 static void ov68_0225C980(UnkStruct_ov68_0225C91C *param0);
 static void ov68_0225C98C(UnkStruct_ov68_0225C91C *param0);
-static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *param1, u32 param2);
+static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *param1, u32 heapID);
 static void ov68_0225CA8C(UnkStruct_ov68_0225C91C *param0);
-static void ov68_0225CAB4(UnkStruct_ov68_0225C91C *param0, u32 param1);
+static void ov68_0225CAB4(UnkStruct_ov68_0225C91C *param0, u32 heapID);
 static void ov68_0225CB44(UnkStruct_ov68_0225C91C *param0);
 static void ov68_0225CB70(UnkStruct_ov68_0225CB70 *param0, UnkStruct_ov66_0222DFF8 *param1, u32 param2);
 static void ov68_0225CBC0(UnkStruct_ov68_0225CB70 *param0);
 static Strbuf *ov68_0225CBEC(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 param2);
 static Strbuf *ov68_0225CC18(UnkStruct_ov68_0225CB70 *param0, u32 param1);
 static Strbuf *ov68_0225CC44(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 param2);
-static void ov68_0225CC78(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 param2);
+static void ov68_0225CC78(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 heapID);
 static void ov68_0225DB8C(UnkStruct_ov68_0225DB8C *param0, BOOL param1, u32 param2);
 static void ov68_0225DC24(UnkStruct_ov68_0225DB8C *param0);
 static Strbuf *ov68_0225DC40(const UnkStruct_ov68_0225DB8C *param0, UnkStruct_ov68_0225CB70 *param1);
@@ -159,7 +159,7 @@ static void ov68_0225D388(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB
 static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 heapID);
 static void ov68_0225D868(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2);
 static void ov68_0225D89C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, u32 param2, TextColor param3);
-static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DB8C *param1, UnkStruct_ov68_0225CB70 *param2, UnkStruct_ov68_0225C91C *param3, const UnkStruct_ov66_0222E908 *param4, u32 param5, u32 param6, u32 param7, BOOL param8);
+static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DB8C *param1, UnkStruct_ov68_0225CB70 *param2, UnkStruct_ov68_0225C91C *param3, const UnkStruct_ov66_0222E908 *param4, u32 heapID, u32 param6, u32 param7, BOOL param8);
 static void ov68_0225DA30(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DC74 *param1, UnkStruct_ov68_0225C91C *param2, u32 param3);
 static BOOL ov68_0225DA74(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225C91C *param1);
 static void ov68_0225DB3C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, u32 param3);
@@ -461,11 +461,11 @@ static void ov68_0225C98C(UnkStruct_ov68_0225C91C *param0)
     VramTransfer_Process();
 }
 
-static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *param1, u32 param2)
+static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *param1, u32 heapID)
 {
     SetAllGraphicsModes(&Unk_ov68_0225DD48);
 
-    param0->unk_00 = BgConfig_New(param2);
+    param0->unk_00 = BgConfig_New(heapID);
     gSystem.whichScreenIs3D = DS_SCREEN_MAIN;
 
     GXLayers_SwapDisplay();
@@ -475,24 +475,24 @@ static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *param1, u32
 
         for (v0 = 0; v0 < 4; v0++) {
             Bg_InitFromTemplate(param0->unk_00, Unk_ov68_0225DD68[v0], &Unk_ov68_0225DE18[v0], 0);
-            Bg_ClearTilesRange(Unk_ov68_0225DD68[v0], 32, 0, param2);
+            Bg_ClearTilesRange(Unk_ov68_0225DD68[v0], 32, 0, heapID);
             Bg_ClearTilemap(param0->unk_00, Unk_ov68_0225DD68[v0]);
         }
     }
 
-    Font_LoadScreenIndicatorsPalette(0, 4 * 0x20, param2);
+    Font_LoadScreenIndicatorsPalette(0, 4 * 0x20, heapID);
 
     {
         u8 v1 = Options_Frame(param1);
-        LoadMessageBoxGraphics(param0->unk_00, 1, 1, 5, v1, param2);
+        LoadMessageBoxGraphics(param0->unk_00, 1, 1, 5, v1, heapID);
     }
 
-    LoadStandardWindowGraphics(param0->unk_00, 1, (1 + (18 + 12)), 6, 0, param2);
+    LoadStandardWindowGraphics(param0->unk_00, 1, (1 + (18 + 12)), 6, 0, heapID);
 
     {
-        Graphics_LoadTilesToBgLayer(169, 2, param0->unk_00, 4, 0, 0, 0, param2);
-        Graphics_LoadTilemapToBgLayer(169, 6, param0->unk_00, 4, 0, 0, 0, param2);
-        Graphics_LoadPalette(169, 0, 4, 0, 0, param2);
+        Graphics_LoadTilesToBgLayer(169, 2, param0->unk_00, 4, 0, 0, 0, heapID);
+        Graphics_LoadTilemapToBgLayer(169, 6, param0->unk_00, 4, 0, 0, 0, heapID);
+        Graphics_LoadPalette(169, 0, 4, 0, 0, heapID);
     }
 }
 
@@ -509,24 +509,24 @@ static void ov68_0225CA8C(UnkStruct_ov68_0225C91C *param0)
     Heap_FreeToHeap(param0->unk_00);
 }
 
-static void ov68_0225CAB4(UnkStruct_ov68_0225C91C *param0, u32 param1)
+static void ov68_0225CAB4(UnkStruct_ov68_0225C91C *param0, u32 heapID)
 {
     int v0;
 
     NNS_G2dInitOamManagerModule();
 
-    RenderOam_Init(0, 126, 0, 31, 0, 126, 0, 31, param1);
+    RenderOam_Init(0, 126, 0, 31, 0, 126, 0, 31, heapID);
     CharTransfer_InitWithVramModes(&Unk_ov68_0225DD58, GX_OBJVRAMMODE_CHAR_1D_32K, GX_OBJVRAMMODE_CHAR_1D_32K);
-    PlttTransfer_Init(32, param1);
+    PlttTransfer_Init(32, heapID);
     CharTransfer_ClearBuffers();
     PlttTransfer_Clear();
     ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_32K);
     ReserveSlotsForWirelessIconPalette(NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    param0->unk_04 = SpriteList_InitRendering(32, &param0->unk_08, param1);
+    param0->unk_04 = SpriteList_InitRendering(32, &param0->unk_08, heapID);
 
     for (v0 = 0; v0 < 4; v0++) {
-        param0->unk_194[v0] = SpriteResourceCollection_New(32, v0, param1);
+        param0->unk_194[v0] = SpriteResourceCollection_New(32, v0, heapID);
     }
 
     sub_02039734();
@@ -626,15 +626,12 @@ static Strbuf *ov68_0225CC44(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 pa
     return ov68_0225CBEC(param0, 6 + param2, param1 - 50);
 }
 
-static void ov68_0225CC78(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 param2)
+static void ov68_0225CC78(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 heapID)
 {
-    TrainerInfo *v0;
-    const UnkStruct_ov66_0222E71C *v1;
+    TrainerInfo *v0 = TrainerInfo_New(heapID);
+    const UnkStruct_ov66_0222E71C *v1 = ov66_0222E3BC(param0->unk_30);
 
-    v0 = TrainerInfo_New(param2);
-    v1 = ov66_0222E3BC(param0->unk_30);
-
-    ov66_0222E640(v1, v0, param2);
+    ov66_0222E640(v1, v0, heapID);
     StringTemplate_SetPlayerName(param0->unk_24, param1, v0);
     Heap_FreeToHeap(v0);
 }
@@ -1303,7 +1300,7 @@ static void ov68_0225D89C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB
     Window_ScheduleCopyToVRAM(&param0->unk_00[0]);
 }
 
-static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DB8C *param1, UnkStruct_ov68_0225CB70 *param2, UnkStruct_ov68_0225C91C *param3, const UnkStruct_ov66_0222E908 *param4, u32 param5, u32 param6, u32 param7, BOOL param8)
+static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DB8C *param1, UnkStruct_ov68_0225CB70 *param2, UnkStruct_ov68_0225C91C *param3, const UnkStruct_ov66_0222E908 *param4, u32 heapID, u32 param6, u32 param7, BOOL param8)
 {
     Strbuf *v0;
 
@@ -1330,7 +1327,7 @@ static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_
             v3 = param6;
         }
 
-        ov68_0225CC78(param2, 0, param5);
+        ov68_0225CC78(param2, 0, heapID);
 
         v0 = ov68_0225CBEC(param2, 0, 110);
         v1 = Font_CalcStrbufWidth(FONT_MESSAGE, v0, 0);
diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c
index 2e51e30404..79fe6b2313 100644
--- a/src/overlay069/ov69_0225C700.c
+++ b/src/overlay069/ov69_0225C700.c
@@ -285,7 +285,7 @@ static void ov69_0225D384(UnkStruct_ov69_0225D35C *param0);
 static void ov69_0225D390(UnkStruct_ov69_0225D35C *param0);
 static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 param2);
 static void ov69_0225D504(UnkStruct_ov69_0225D35C *param0);
-static void ov69_0225D53C(UnkStruct_ov69_0225D35C *param0, u32 param1);
+static void ov69_0225D53C(UnkStruct_ov69_0225D35C *param0, u32 heapID);
 static void ov69_0225D5D8(UnkStruct_ov69_0225D35C *param0);
 static void ov69_0225D604(UnkStruct_ov69_0225D35C *param0, u32 heapID);
 static void ov69_0225D63C(UnkStruct_ov69_0225D35C *param0);
@@ -1393,47 +1393,45 @@ static void ov69_0225D390(UnkStruct_ov69_0225D35C *param0)
     VramTransfer_Process();
 }
 
-static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 param2)
+static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 heapID)
 {
     SetAllGraphicsModes(&Unk_ov69_0225F040);
 
-    param0->unk_00 = BgConfig_New(param2);
+    param0->unk_00 = BgConfig_New(heapID);
     gSystem.whichScreenIs3D = DS_SCREEN_SUB;
 
     GXLayers_SwapDisplay();
 
-    {
-        int v0;
+    int v0;
 
-        for (v0 = 0; v0 < 5; v0++) {
-            Bg_InitFromTemplate(param0->unk_00, Unk_ov69_0225F060[v0], &Unk_ov69_0225F154[v0], 0);
-            Bg_ClearTilesRange(Unk_ov69_0225F060[v0], 32, 0, param2);
-            Bg_ClearTilemap(param0->unk_00, Unk_ov69_0225F060[v0]);
-        }
+    for (v0 = 0; v0 < 5; v0++) {
+        Bg_InitFromTemplate(param0->unk_00, Unk_ov69_0225F060[v0], &Unk_ov69_0225F154[v0], 0);
+        Bg_ClearTilesRange(Unk_ov69_0225F060[v0], 32, 0, heapID);
+        Bg_ClearTilemap(param0->unk_00, Unk_ov69_0225F060[v0]);
     }
 
-    Graphics_LoadPaletteFromOpenNARC(param0->unk_1A8, 5, 4, 0, 0, param2);
+    Graphics_LoadPaletteFromOpenNARC(param0->unk_1A8, 5, 4, 0, 0, heapID);
 
     {
-        Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A8, 11, param0->unk_00, 4, 0, 0, 0, param2);
-        Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A8, 12, param0->unk_00, 4, 0, 0, 0, param2);
+        Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A8, 11, param0->unk_00, 4, 0, 0, 0, heapID);
+        Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A8, 12, param0->unk_00, 4, 0, 0, 0, heapID);
     }
 
     {
-        Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A8, 4, param0->unk_00, 6, 0, 0, 0, param2);
-        Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A8, 18, param0->unk_00, 7, 0, 0, 0, param2);
+        Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A8, 4, param0->unk_00, 6, 0, 0, 0, heapID);
+        Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A8, 18, param0->unk_00, 7, 0, 0, 0, heapID);
     }
 
-    Font_LoadScreenIndicatorsPalette(0, 1 * 0x20, param2);
-    Font_LoadScreenIndicatorsPalette(4, 11 * 0x20, param2);
-    LoadStandardWindowGraphics(param0->unk_00, 1, (1 + (18 + 12)), 0, 0, param2);
-    LoadStandardWindowGraphics(param0->unk_00, 1, (1 + (18 + 12)), 0, 0, param2);
+    Font_LoadScreenIndicatorsPalette(0, 1 * 0x20, heapID);
+    Font_LoadScreenIndicatorsPalette(4, 11 * 0x20, heapID);
+    LoadStandardWindowGraphics(param0->unk_00, 1, (1 + (18 + 12)), 0, 0, heapID);
+    LoadStandardWindowGraphics(param0->unk_00, 1, (1 + (18 + 12)), 0, 0, heapID);
 
     {
         u8 v1 = Options_Frame(param1);
 
-        LoadMessageBoxGraphics(param0->unk_00, 4, 10, 10, v1, param2);
-        LoadMessageBoxGraphics(param0->unk_00, 1, 1, 2, v1, param2);
+        LoadMessageBoxGraphics(param0->unk_00, 4, 10, 10, v1, heapID);
+        LoadMessageBoxGraphics(param0->unk_00, 1, 1, 2, v1, heapID);
     }
 
     Bg_MaskPalette(0, 0x72ca);
@@ -1454,26 +1452,26 @@ static void ov69_0225D504(UnkStruct_ov69_0225D35C *param0)
     GXLayers_SwapDisplay();
 }
 
-static void ov69_0225D53C(UnkStruct_ov69_0225D35C *param0, u32 param1)
+static void ov69_0225D53C(UnkStruct_ov69_0225D35C *param0, u32 heapID)
 {
-    int v0;
+    int i;
 
     NNS_G2dInitOamManagerModule();
 
-    RenderOam_Init(0, 126, 0, 31, 0, 126, 0, 31, param1);
+    RenderOam_Init(0, 126, 0, 31, 0, 126, 0, 31, heapID);
     CharTransfer_InitWithVramModes(&Unk_ov69_0225F050, GX_OBJVRAMMODE_CHAR_1D_32K, GX_OBJVRAMMODE_CHAR_1D_32K);
-    PlttTransfer_Init(32, param1);
+    PlttTransfer_Init(32, heapID);
     CharTransfer_ClearBuffers();
     PlttTransfer_Clear();
     ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_32K);
     ReserveSlotsForWirelessIconPalette(NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    param0->unk_04 = SpriteList_InitRendering(32, &param0->unk_08, param1);
+    param0->unk_04 = SpriteList_InitRendering(32, &param0->unk_08, heapID);
 
     SetSubScreenViewRect(&param0->unk_08, 0, (FX32_CONST(256)));
 
-    for (v0 = 0; v0 < 4; v0++) {
-        param0->unk_194[v0] = SpriteResourceCollection_New(32, v0, param1);
+    for (i = 0; i < 4; i++) {
+        param0->unk_194[i] = SpriteResourceCollection_New(32, i, heapID);
     }
 
     sub_02039734();
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index 802243d183..fab55e55eb 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -302,7 +302,7 @@ static BOOL ov70_0225F7FC(const UnkStruct_ov70_0225F350 *param0);
 static BOOL ov70_0225F814(const UnkStruct_ov70_0225F350 *param0);
 static BOOL ov70_0225F828(const UnkStruct_ov70_0225F350 *param0);
 static BOOL ov70_0225F834(const UnkStruct_ov70_0225F350 *param0);
-static void ov70_0225F844(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2, UnkStruct_ov70_0225F208 *param3, BOOL param4, u32 param5, const UnkStruct_ov66_0222E71C *param6, const UnkStruct_ov66_0222E71C *param7, BOOL param8, BOOL param9, const UnkStruct_ov66_02230914 *param10, BOOL param11);
+static void ov70_0225F844(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2, UnkStruct_ov70_0225F208 *param3, BOOL param4, u32 heapID, const UnkStruct_ov66_0222E71C *param6, const UnkStruct_ov66_0222E71C *param7, BOOL param8, BOOL param9, const UnkStruct_ov66_02230914 *param10, BOOL param11);
 static void ov70_0225F89C(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2);
 static void ov70_0225F8AC(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, UnkStruct_ov70_0225F208 *param2, u32 param3, const UnkStruct_ov66_0222E71C *param4);
 static void ov70_0225F8F0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 param3);
@@ -315,7 +315,7 @@ static void ov70_0225FA10(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4
 static void ov70_0225FA84(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3);
 static void ov70_0225FAA8(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2);
 static void ov70_0225FACC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9C8 *param1);
-static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225FA84 *param2, UnkStruct_ov70_0225E4EC *param3, UnkStruct_ov70_0225F208 *param4, BOOL param5, NARC *param6, u32 param7, const UnkStruct_ov66_0222E71C *param8, const UnkStruct_ov66_0222E71C *param9, BOOL param10, BOOL param11, const UnkStruct_ov66_02230914 *param12, BOOL param13);
+static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225FA84 *param2, UnkStruct_ov70_0225E4EC *param3, UnkStruct_ov70_0225F208 *param4, BOOL param5, NARC *param6, u32 heapID, const UnkStruct_ov66_0222E71C *param8, const UnkStruct_ov66_0222E71C *param9, BOOL param10, BOOL param11, const UnkStruct_ov66_02230914 *param12, BOOL param13);
 static void ov70_0225FDA0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225FA84 *param1, UnkStruct_ov70_0225E4EC *param2, u32 param3, const UnkStruct_ov66_0222E71C *param4);
 static void ov70_0225FE80(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2);
 static void ov70_0225FEC4(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4);
@@ -1071,7 +1071,7 @@ void ov70_0225E234(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2)
     TrainerInfo *v0;
     const UnkStruct_ov66_0222E71C *v1;
 
-    v0 = TrainerInfo_New(112);
+    v0 = TrainerInfo_New(HEAP_ID_112);
 
     if (param1 == ov66_0222E338(param0->unk_34)) {
         v1 = ov66_0222E3BC(param0->unk_34);
@@ -1079,7 +1079,7 @@ void ov70_0225E234(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2)
         v1 = ov66_0222E374(param0->unk_34, param1);
     }
 
-    ov66_0222E640(v1, v0, 112);
+    ov66_0222E640(v1, v0, HEAP_ID_112);
     ov70_0225F2C8(&param0->unk_340, v0, param2);
     Heap_FreeToHeap(v0);
 }
@@ -2351,13 +2351,13 @@ static BOOL ov70_0225F834(const UnkStruct_ov70_0225F350 *param0)
     return 0;
 }
 
-static void ov70_0225F844(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2, UnkStruct_ov70_0225F208 *param3, BOOL param4, u32 param5, const UnkStruct_ov66_0222E71C *param6, const UnkStruct_ov66_0222E71C *param7, BOOL param8, BOOL param9, const UnkStruct_ov66_02230914 *param10, BOOL param11)
+static void ov70_0225F844(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2, UnkStruct_ov70_0225F208 *param3, BOOL param4, u32 heapID, const UnkStruct_ov66_0222E71C *param6, const UnkStruct_ov66_0222E71C *param7, BOOL param8, BOOL param9, const UnkStruct_ov66_02230914 *param10, BOOL param11)
 {
     if (param0->unk_01 == 2) {
         ov70_0225F89C(param0, param1, param2);
     }
 
-    ov70_0225FAD0(param0, param1, &param0->unk_08, param2, param3, param4, param0->unk_14C, param5, param6, param7, param8, param9, param10, param11);
+    ov70_0225FAD0(param0, param1, &param0->unk_08, param2, param3, param4, param0->unk_14C, heapID, param6, param7, param8, param9, param10, param11);
     param0->unk_01 = 2;
 }
 
@@ -2503,7 +2503,7 @@ static void ov70_0225FACC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9
     return;
 }
 
-static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225FA84 *param2, UnkStruct_ov70_0225E4EC *param3, UnkStruct_ov70_0225F208 *param4, BOOL param5, NARC *param6, u32 param7, const UnkStruct_ov66_0222E71C *param8, const UnkStruct_ov66_0222E71C *param9, BOOL param10, BOOL param11, const UnkStruct_ov66_02230914 *param12, BOOL param13)
+static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225FA84 *param2, UnkStruct_ov70_0225E4EC *param3, UnkStruct_ov70_0225F208 *param4, BOOL param5, NARC *param6, u32 heapID, const UnkStruct_ov66_0222E71C *param8, const UnkStruct_ov66_0222E71C *param9, BOOL param10, BOOL param11, const UnkStruct_ov66_02230914 *param12, BOOL param13)
 {
     u32 v0;
     TrainerInfo *v1;
@@ -2514,17 +2514,17 @@ static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9
         v0 = TEXT_COLOR(7, 8, 0);
 
         if (param10 == 0) {
-            ov70_0225F940(param0, param3, 86, param7);
+            ov70_0225F940(param0, param3, 86, heapID);
         } else {
-            ov70_0225F940(param0, param3, 88, param7);
+            ov70_0225F940(param0, param3, 88, heapID);
         }
     } else {
         v0 = TEXT_COLOR(3, 4, 0);
 
         if (param10 == 0) {
-            ov70_0225F940(param0, param3, 87, param7);
+            ov70_0225F940(param0, param3, 87, heapID);
         } else {
-            ov70_0225F940(param0, param3, 88, param7);
+            ov70_0225F940(param0, param3, 88, heapID);
         }
     }
 
@@ -2533,10 +2533,10 @@ static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9
     Bg_ScheduleFillTilemap(param3->unk_00, Unk_ov70_0226D5CC[3], 0);
 
     ov70_022602C0(param2);
-    ov70_0225FA14(param3, param6, 92, Unk_ov70_0226D5CC[1], 0, param7);
+    ov70_0225FA14(param3, param6, 92, Unk_ov70_0226D5CC[1], 0, heapID);
 
-    v1 = TrainerInfo_New(param7);
-    ov66_0222E640(param8, v1, param7);
+    v1 = TrainerInfo_New(heapID);
+    ov66_0222E640(param8, v1, heapID);
 
     {
         u32 v2;
@@ -2579,10 +2579,10 @@ static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9
 
         ov70_022602DC(param2, param4, 4, 48, 8, 0, v0);
         ov70_02260360(param2, 4);
-        ov70_022603CC(param2, param3, param6, param7, param8, param9);
+        ov70_022603CC(param2, param3, param6, heapID, param8, param9);
     }
 
-    ov70_0225FEF0(param2, param3, param6, param7, ov66_0222E8C4(param8), param13);
+    ov70_0225FEF0(param2, param3, param6, heapID, ov66_0222E8C4(param8), param13);
 
     {
         u32 v3;
@@ -2597,10 +2597,10 @@ static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9
             v3 = ov66_0222E858(param8);
         }
 
-        ov70_02260080(param2, param3, param6, param7, v3);
+        ov70_02260080(param2, param3, param6, heapID, v3);
     }
 
-    ov70_0225FDA0(param0, param2, param3, param7, param8);
+    ov70_0225FDA0(param0, param2, param3, heapID, param8);
 
     Heap_FreeToHeap(v1);
 }
diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c
index d126e31fe7..1c6a7980df 100644
--- a/src/overlay077/ov77_021D54B0.c
+++ b/src/overlay077/ov77_021D54B0.c
@@ -134,71 +134,71 @@ const int ov77_021D555C(void)
 
 void ov77_021D5564(UnkStruct_ov77_021D5564 *param0)
 {
-    int v0;
-    const int v1 = 76;
+    int i;
+    const int heapID = HEAP_ID_76;
 
     GX_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K);
     GXS_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K);
 
     ov77_021D54B0();
     NNS_G2dInitOamManagerModule();
-    RenderOam_Init(0, 128, 0, 32, 0, 128, 0, 32, v1);
+    RenderOam_Init(0, 128, 0, 32, 0, 128, 0, 32, heapID);
 
-    param0->unk_00 = SpriteList_InitRendering(((3 + 1 + 1 + 2 + 4) + 6 + 16), &param0->unk_04, v1);
-    param0->unk_300 = CellTransfer_New(3, v1);
+    param0->unk_00 = SpriteList_InitRendering(((3 + 1 + 1 + 2 + 4) + 6 + 16), &param0->unk_04, heapID);
+    param0->unk_300 = CellTransfer_New(3, heapID);
 
-    for (v0 = 0; v0 < 4; v0++) {
-        param0->unk_190[v0] = SpriteResourceCollection_New(Unk_ov77_021D7914[v0], v0, v1);
+    for (i = 0; i < 4; i++) {
+        param0->unk_190[i] = SpriteResourceCollection_New(Unk_ov77_021D7914[i], i, heapID);
     }
 
-    param0->unk_1A0[0][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 46, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
-    param0->unk_1A0[1][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 46, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, v1);
-    param0->unk_1A0[2][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 50, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
-    param0->unk_1A0[3][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 87, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
-    param0->unk_1A0[4][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 22, 0, 4, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
-    param0->unk_1A0[5][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 23, 0, 5, NNS_G2D_VRAM_TYPE_2DSUB, v1);
-    param0->unk_1A0[6][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 91, 0, 6, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
-    param0->unk_1A0[7][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 83, 0, 7, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
-    param0->unk_1A0[8][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 83, 0, 8, NNS_G2D_VRAM_TYPE_2DSUB, v1);
-    param0->unk_1A0[9][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 54, 0, 9, NNS_G2D_VRAM_TYPE_2DMAIN, v1);
-    param0->unk_1A0[10][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 54, 0, 10, NNS_G2D_VRAM_TYPE_2DSUB, v1);
-    param0->unk_1A0[0][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 49, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v1);
-    param0->unk_1A0[1][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 49, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 1, v1);
-    param0->unk_1A0[2][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 53, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v1);
-    param0->unk_1A0[3][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 90, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v1);
-    param0->unk_1A0[4][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 20, 0, 4, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v1);
-    param0->unk_1A0[5][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 21, 0, 5, NNS_G2D_VRAM_TYPE_2DSUB, 1, v1);
-    param0->unk_1A0[6][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 94, 0, 6, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v1);
-    param0->unk_1A0[7][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 86, 0, 7, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v1);
-    param0->unk_1A0[8][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 86, 0, 8, NNS_G2D_VRAM_TYPE_2DSUB, 1, v1);
-    param0->unk_1A0[9][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 57, 0, 9, NNS_G2D_VRAM_TYPE_2DMAIN, 3, v1);
-    param0->unk_1A0[10][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 57, 0, 10, NNS_G2D_VRAM_TYPE_2DSUB, 3, v1);
-    param0->unk_1A0[0][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 48, 0, 0, 2, v1);
-    param0->unk_1A0[1][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 48, 0, 1, 2, v1);
-    param0->unk_1A0[2][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 51, 0, 2, 2, v1);
-    param0->unk_1A0[3][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 89, 0, 3, 2, v1);
-    param0->unk_1A0[4][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 24, 0, 4, 2, v1);
-    param0->unk_1A0[6][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 93, 0, 6, 2, v1);
-    param0->unk_1A0[7][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 85, 0, 7, 2, v1);
-    param0->unk_1A0[8][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 85, 0, 8, 2, v1);
-    param0->unk_1A0[9][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 55, 0, 9, 2, v1);
-    param0->unk_1A0[10][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 55, 0, 10, 2, v1);
-    param0->unk_1A0[5][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 25, 0, 5, 2, v1);
-    param0->unk_1A0[0][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 47, 0, 0, 3, v1);
-    param0->unk_1A0[1][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 47, 0, 1, 3, v1);
-    param0->unk_1A0[2][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 52, 0, 2, 3, v1);
-    param0->unk_1A0[3][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 88, 0, 3, 3, v1);
-    param0->unk_1A0[4][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 26, 0, 4, 3, v1);
-    param0->unk_1A0[5][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 27, 0, 5, 3, v1);
-    param0->unk_1A0[6][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 92, 0, 6, 3, v1);
-    param0->unk_1A0[7][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 84, 0, 7, 3, v1);
-    param0->unk_1A0[8][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 84, 0, 8, 3, v1);
-    param0->unk_1A0[9][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 56, 0, 9, 3, v1);
-    param0->unk_1A0[10][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 56, 0, 10, 3, v1);
+    param0->unk_1A0[0][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 46, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
+    param0->unk_1A0[1][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 46, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, heapID);
+    param0->unk_1A0[2][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 50, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
+    param0->unk_1A0[3][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 87, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
+    param0->unk_1A0[4][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 22, 0, 4, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
+    param0->unk_1A0[5][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 23, 0, 5, NNS_G2D_VRAM_TYPE_2DSUB, heapID);
+    param0->unk_1A0[6][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 91, 0, 6, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
+    param0->unk_1A0[7][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 83, 0, 7, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
+    param0->unk_1A0[8][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 83, 0, 8, NNS_G2D_VRAM_TYPE_2DSUB, heapID);
+    param0->unk_1A0[9][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 54, 0, 9, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
+    param0->unk_1A0[10][0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 54, 0, 10, NNS_G2D_VRAM_TYPE_2DSUB, heapID);
+    param0->unk_1A0[0][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 49, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, heapID);
+    param0->unk_1A0[1][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 49, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 1, heapID);
+    param0->unk_1A0[2][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 53, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 1, heapID);
+    param0->unk_1A0[3][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 90, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 1, heapID);
+    param0->unk_1A0[4][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 20, 0, 4, NNS_G2D_VRAM_TYPE_2DMAIN, 1, heapID);
+    param0->unk_1A0[5][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 21, 0, 5, NNS_G2D_VRAM_TYPE_2DSUB, 1, heapID);
+    param0->unk_1A0[6][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 94, 0, 6, NNS_G2D_VRAM_TYPE_2DMAIN, 1, heapID);
+    param0->unk_1A0[7][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 86, 0, 7, NNS_G2D_VRAM_TYPE_2DMAIN, 1, heapID);
+    param0->unk_1A0[8][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 86, 0, 8, NNS_G2D_VRAM_TYPE_2DSUB, 1, heapID);
+    param0->unk_1A0[9][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 57, 0, 9, NNS_G2D_VRAM_TYPE_2DMAIN, 3, heapID);
+    param0->unk_1A0[10][1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 57, 0, 10, NNS_G2D_VRAM_TYPE_2DSUB, 3, heapID);
+    param0->unk_1A0[0][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 48, 0, 0, 2, heapID);
+    param0->unk_1A0[1][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 48, 0, 1, 2, heapID);
+    param0->unk_1A0[2][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 51, 0, 2, 2, heapID);
+    param0->unk_1A0[3][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 89, 0, 3, 2, heapID);
+    param0->unk_1A0[4][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 24, 0, 4, 2, heapID);
+    param0->unk_1A0[6][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 93, 0, 6, 2, heapID);
+    param0->unk_1A0[7][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 85, 0, 7, 2, heapID);
+    param0->unk_1A0[8][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 85, 0, 8, 2, heapID);
+    param0->unk_1A0[9][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 55, 0, 9, 2, heapID);
+    param0->unk_1A0[10][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 55, 0, 10, 2, heapID);
+    param0->unk_1A0[5][2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 25, 0, 5, 2, heapID);
+    param0->unk_1A0[0][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 47, 0, 0, 3, heapID);
+    param0->unk_1A0[1][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 47, 0, 1, 3, heapID);
+    param0->unk_1A0[2][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 52, 0, 2, 3, heapID);
+    param0->unk_1A0[3][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 88, 0, 3, 3, heapID);
+    param0->unk_1A0[4][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 26, 0, 4, 3, heapID);
+    param0->unk_1A0[5][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 27, 0, 5, 3, heapID);
+    param0->unk_1A0[6][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 92, 0, 6, 3, heapID);
+    param0->unk_1A0[7][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 84, 0, 7, 3, heapID);
+    param0->unk_1A0[8][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 84, 0, 8, 3, heapID);
+    param0->unk_1A0[9][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 56, 0, 9, 3, heapID);
+    param0->unk_1A0[10][3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 56, 0, 10, 3, heapID);
 
-    for (v0 = 0; v0 < 11; v0++) {
-        SpriteTransfer_RequestCharAtEnd(param0->unk_1A0[v0][0]);
-        SpriteTransfer_RequestPlttFreeSpace(param0->unk_1A0[v0][1]);
+    for (i = 0; i < 11; i++) {
+        SpriteTransfer_RequestCharAtEnd(param0->unk_1A0[i][0]);
+        SpriteTransfer_RequestPlttFreeSpace(param0->unk_1A0[i][1]);
     }
 
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
diff --git a/src/overlay077/ov77_021D6670.c b/src/overlay077/ov77_021D6670.c
index d348f84cc4..be4eaef864 100644
--- a/src/overlay077/ov77_021D6670.c
+++ b/src/overlay077/ov77_021D6670.c
@@ -181,8 +181,8 @@ void ov77_021D67B0(UnkStruct_ov77_021D670C *param0)
 
 static void ov77_021D6800(UnkStruct_ov77_021D6800 *param0)
 {
-    int v0;
-    const int v1 = 76;
+    int i;
+    const int heapID = HEAP_ID_76;
 
     GX_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K);
     GXS_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K);
@@ -190,18 +190,18 @@ static void ov77_021D6800(UnkStruct_ov77_021D6800 *param0)
     ov77_021D6670();
 
     NNS_G2dInitOamManagerModule();
-    RenderOam_Init(0, 128, 0, 32, 0, 128, 0, 32, v1);
+    RenderOam_Init(0, 128, 0, 32, 0, 128, 0, 32, heapID);
 
-    param0->unk_00 = SpriteList_InitRendering(10, &param0->unk_04, v1);
+    param0->unk_00 = SpriteList_InitRendering(10, &param0->unk_04, heapID);
 
-    for (v0 = 0; v0 < 4; v0++) {
-        param0->unk_190[v0] = SpriteResourceCollection_New(Unk_ov77_021D7930[v0], v0, v1);
+    for (i = 0; i < 4; i++) {
+        param0->unk_190[i] = SpriteResourceCollection_New(Unk_ov77_021D7930[i], i, heapID);
     }
 
-    param0->unk_1A0[0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 4, 0, 0, NNS_G2D_VRAM_TYPE_MAX, v1);
-    param0->unk_1A0[1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 3, 0, 0, NNS_G2D_VRAM_TYPE_MAX, 1, v1);
-    param0->unk_1A0[2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 5, 0, 0, 2, v1);
-    param0->unk_1A0[3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 6, 0, 0, 3, v1);
+    param0->unk_1A0[0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 4, 0, 0, NNS_G2D_VRAM_TYPE_MAX, heapID);
+    param0->unk_1A0[1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 3, 0, 0, NNS_G2D_VRAM_TYPE_MAX, 1, heapID);
+    param0->unk_1A0[2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 5, 0, 0, 2, heapID);
+    param0->unk_1A0[3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 6, 0, 0, 3, heapID);
 
     SpriteTransfer_RequestChar(param0->unk_1A0[0]);
     SpriteTransfer_RequestPlttWholeRange(param0->unk_1A0[1]);
diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c
index 26ead45744..c2f3095e50 100644
--- a/src/overlay083/ov83_0223C958.c
+++ b/src/overlay083/ov83_0223C958.c
@@ -26,7 +26,7 @@
 #include "unk_02015064.h"
 #include "unk_0202419C.h"
 
-static void ov83_0223CC30(BgConfig **param0, int param1);
+static void ov83_0223CC30(BgConfig **param0, int heapID);
 static void ov83_0223CCCC(BgConfig **param0);
 static void ov83_0223CCF8(UnkStruct_ov83_0223B784 *param0);
 static void ov83_0223CD1C(UnkStruct_ov83_0223B784 *param0);
@@ -161,13 +161,13 @@ static void ov83_0223CC10(void)
     GXLayers_SetBanks(&v0);
 }
 
-static void ov83_0223CC30(BgConfig **param0, int param1)
+static void ov83_0223CC30(BgConfig **param0, int heapID)
 {
     int v0 = 0, v1;
 
     ov83_0223CC10();
 
-    *param0 = BgConfig_New(param1);
+    *param0 = BgConfig_New(heapID);
 
     {
         GraphicsModes v2 = {
@@ -252,7 +252,7 @@ static void ov83_0223CC30(BgConfig **param0, int param1)
 
             Bg_InitFromTemplate(*param0, v4[v0], &(v3[v0]), 0);
             Bg_ClearTilemap(*param0, v4[v0]);
-            Bg_ClearTilesRange(v4[v0], 32, 0, param1);
+            Bg_ClearTilesRange(v4[v0], 32, 0, heapID);
         }
     }
 }
diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c
index 1f67cc1874..2e1c5d405a 100644
--- a/src/overlay083/ov83_0223D6A8.c
+++ b/src/overlay083/ov83_0223D6A8.c
@@ -178,14 +178,14 @@ static UnkStruct_02015214 *ov83_0223D720(UnkStruct_02015064 *param0, UnkStruct_0
     return v1;
 }
 
-void ov83_0223D754(UnkStruct_ov83_0223D784 *param0, int param1, int param2, int param3)
+void ov83_0223D754(UnkStruct_ov83_0223D784 *param0, int param1, int param2, int heapID)
 {
-    int v0;
+    int i;
 
-    param0->unk_00 = SpriteList_InitRendering(param1, &param0->unk_04, param3);
+    param0->unk_00 = SpriteList_InitRendering(param1, &param0->unk_04, heapID);
 
-    for (v0 = 0; v0 < 4; v0++) {
-        param0->unk_190[v0] = SpriteResourceCollection_New(param2, v0, param3);
+    for (i = 0; i < 4; i++) {
+        param0->unk_190[i] = SpriteResourceCollection_New(param2, i, heapID);
     }
 }
 
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index 42c9b49ca1..6fecd72ef8 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -1862,13 +1862,11 @@ static int ov88_0223D5B8(UnkStruct_02095E80 *param0)
         Sound_PlayEffect(SEQ_SE_CONFIRM);
         param0->unk_36C8 = v0;
 
-        {
-            TrainerInfo *v2 = TrainerInfo_New(26);
+        TrainerInfo *v2 = TrainerInfo_New(HEAP_ID_26);
 
-            TrainerInfo_SetName(v2, sub_0202AEF0(param0->unk_36EC, v0));
-            StringTemplate_SetPlayerName(param0->unk_36CC, 0, v2);
-            Heap_FreeToHeap(v2);
-        }
+        TrainerInfo_SetName(v2, sub_0202AEF0(param0->unk_36EC, v0));
+        StringTemplate_SetPlayerName(param0->unk_36CC, 0, v2);
+        Heap_FreeToHeap(v2);
 
         ov88_0223D49C(param0, 60);
         param0->unk_226C = ov88_0223D514;
diff --git a/src/overlay094/ov94_022444C8.c b/src/overlay094/ov94_022444C8.c
index 8187446e83..aa00e7f712 100644
--- a/src/overlay094/ov94_022444C8.c
+++ b/src/overlay094/ov94_022444C8.c
@@ -161,7 +161,7 @@ int ov94_0224484C(UnkStruct_ov94_0223FD4C *param0, int param1)
 
 static TrainerInfo *ov94_02244870(UnkStruct_ov94_0223BA88 *param0)
 {
-    TrainerInfo *v0 = TrainerInfo_New(62);
+    TrainerInfo *v0 = TrainerInfo_New(HEAP_ID_62);
 
     TrainerInfo_Init(v0);
     TrainerInfo_SetName(v0, param0->unk_10C);
diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c
index a76c69f724..cde2a69f10 100644
--- a/src/overlay112/ov112_0225C700.c
+++ b/src/overlay112/ov112_0225C700.c
@@ -136,11 +136,11 @@ static void ov112_0225C9BC(UnkStruct_ov112_0225C9BC *param0, u32 param1);
 static void ov112_0225C9F4(UnkStruct_ov112_0225C9BC *param0);
 static void ov112_0225CA14(UnkStruct_ov112_0225C9BC *param0);
 static void ov112_0225CA20(UnkStruct_ov112_0225C9BC *param0);
-static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, u32 param1);
+static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, u32 heapID);
 static void ov112_0225CB60(UnkStruct_ov112_0225C9BC *param0);
-static void ov112_0225CB98(UnkStruct_ov112_0225C9BC *param0, u32 param1);
+static void ov112_0225CB98(UnkStruct_ov112_0225C9BC *param0, u32 heapID);
 static void ov112_0225CC38(UnkStruct_ov112_0225C9BC *param0);
-static void ov112_0225CC64(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2);
+static void ov112_0225CC64(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u32 heapID);
 static void ov112_0225CC84(UnkStruct_ov112_0225CC84 *param0);
 static void ov112_0225CC90(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2, u8 param3, u8 param4);
 static void ov112_0225CCE8(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u8 param2, u8 param3, u32 param4, u32 param5, BOOL param6, BOOL param7, BOOL param8);
@@ -150,7 +150,7 @@ static BOOL ov112_0225CDFC(UnkStruct_ov112_0225CDF8 *param0, const UnkStruct_ov6
 static void ov112_0225CE60(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2);
 static void ov112_0225CE74(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2);
 static void ov112_0225CE88(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2);
-static void ov112_0225CFC0(UnkStruct_ov112_0225CFD4 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_0222DFF8 *param4, u32 param5);
+static void ov112_0225CFC0(UnkStruct_ov112_0225CFD4 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_0222DFF8 *param4, u32 heapID);
 static void ov112_0225CFD4(UnkStruct_ov112_0225CFD4 *param0);
 static BOOL ov112_0225CFD8(UnkStruct_ov112_0225CFD4 *param0, const UnkStruct_ov66_0223177C *param1);
 static void ov112_0225D004(UnkStruct_ov112_0225CFD4 *param0, UnkStruct_ov112_0225CC84 *param1, UnkStruct_ov112_0225C9BC *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_0222DFF8 *param4);
@@ -333,12 +333,12 @@ int ov112_0225C700(ApplicationManager *appMan, int *param1)
     v0->unk_00 = v1->unk_00;
     v0->unk_04 = v1->unk_04;
 
-    ov112_0225C9BC(&v0->unk_08, 107);
-    ov112_0225CC64(&v0->unk_1B0, &v0->unk_08, 107);
-    ov112_0225CDA8(&v0->unk_1B8, &v0->unk_08, &v0->unk_1B0, v0->unk_00, v0->unk_04, v1->unk_08, 107);
-    ov112_0225CFC0(&v0->unk_1C4, &v0->unk_08, &v0->unk_1B0, v0->unk_00, v1->unk_08, 107);
-    ov112_0225D1EC(&v0->unk_1C8, &v0->unk_08, 107);
-    ov112_0225D57C(&v0->unk_264, &v0->unk_08, 107);
+    ov112_0225C9BC(&v0->unk_08, HEAP_ID_107);
+    ov112_0225CC64(&v0->unk_1B0, &v0->unk_08, HEAP_ID_107);
+    ov112_0225CDA8(&v0->unk_1B8, &v0->unk_08, &v0->unk_1B0, v0->unk_00, v0->unk_04, v1->unk_08, HEAP_ID_107);
+    ov112_0225CFC0(&v0->unk_1C4, &v0->unk_08, &v0->unk_1B0, v0->unk_00, v1->unk_08, HEAP_ID_107);
+    ov112_0225D1EC(&v0->unk_1C8, &v0->unk_08, HEAP_ID_107);
+    ov112_0225D57C(&v0->unk_264, &v0->unk_08, HEAP_ID_107);
 
     SetVBlankCallback(ov112_0225C964, v0);
     DisableHBlank();
@@ -484,11 +484,11 @@ static void ov112_0225CA20(UnkStruct_ov112_0225C9BC *param0)
     VramTransfer_Process();
 }
 
-static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, u32 param1)
+static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, u32 heapID)
 {
     SetAllGraphicsModes(&Unk_ov112_0225D834);
 
-    param0->unk_00 = BgConfig_New(param1);
+    param0->unk_00 = BgConfig_New(heapID);
     gSystem.whichScreenIs3D = DS_SCREEN_MAIN;
 
     GXLayers_SwapDisplay();
@@ -498,23 +498,23 @@ static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, u32 param1)
 
         for (v0 = 0; v0 < 5; v0++) {
             Bg_InitFromTemplate(param0->unk_00, Unk_ov112_0225D844[v0], &Unk_ov112_0225D8C0[v0], 0);
-            Bg_ClearTilesRange(Unk_ov112_0225D844[v0], 32, 0, param1);
+            Bg_ClearTilesRange(Unk_ov112_0225D844[v0], 32, 0, heapID);
             Bg_ClearTilemap(param0->unk_00, Unk_ov112_0225D844[v0]);
         }
     }
 
     {
-        Graphics_LoadPaletteFromOpenNARC(param0->unk_1A4, 0, 0, 0, 0, param1);
-        Font_LoadScreenIndicatorsPalette(0, 10 * 32, param1);
-        Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A4, 1, param0->unk_00, 1, 0, 0, 0, param1);
-        Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A4, 3, param0->unk_00, 1, 0, 0, 0, param1);
-        Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A4, 4, param0->unk_00, 2, 0, 0, 0, param1);
+        Graphics_LoadPaletteFromOpenNARC(param0->unk_1A4, 0, 0, 0, 0, heapID);
+        Font_LoadScreenIndicatorsPalette(0, 10 * 32, heapID);
+        Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A4, 1, param0->unk_00, 1, 0, 0, 0, heapID);
+        Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A4, 3, param0->unk_00, 1, 0, 0, 0, heapID);
+        Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A4, 4, param0->unk_00, 2, 0, 0, 0, heapID);
     }
 
     {
-        Graphics_LoadPaletteFromOpenNARC(param0->unk_1A4, 0, 4, 0, 0, param1);
-        Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A4, 2, param0->unk_00, 4, 0, 0, 0, param1);
-        Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A4, 6, param0->unk_00, 4, 0, 0, 0, param1);
+        Graphics_LoadPaletteFromOpenNARC(param0->unk_1A4, 0, 4, 0, 0, heapID);
+        Graphics_LoadTilesToBgLayerFromOpenNARC(param0->unk_1A4, 2, param0->unk_00, 4, 0, 0, 0, heapID);
+        Graphics_LoadTilemapToBgLayerFromOpenNARC(param0->unk_1A4, 6, param0->unk_00, 4, 0, 0, 0, heapID);
     }
 }
 
@@ -533,26 +533,26 @@ static void ov112_0225CB60(UnkStruct_ov112_0225C9BC *param0)
     GXLayers_SwapDisplay();
 }
 
-static void ov112_0225CB98(UnkStruct_ov112_0225C9BC *param0, u32 param1)
+static void ov112_0225CB98(UnkStruct_ov112_0225C9BC *param0, u32 heapID)
 {
-    int v0;
+    int i;
 
     NNS_G2dInitOamManagerModule();
 
-    RenderOam_Init(0, 126, 0, 31, 0, 126, 0, 31, param1);
+    RenderOam_Init(0, 126, 0, 31, 0, 126, 0, 31, heapID);
     CharTransfer_InitWithVramModes(&Unk_ov112_0225D814, GX_OBJVRAMMODE_CHAR_1D_128K, GX_OBJVRAMMODE_CHAR_1D_32K);
-    PlttTransfer_Init(32, param1);
+    PlttTransfer_Init(32, heapID);
     CharTransfer_ClearBuffers();
     PlttTransfer_Clear();
     ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_128K);
     ReserveSlotsForWirelessIconPalette(NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    param0->unk_04 = SpriteList_InitRendering(32, &param0->unk_08, param1);
+    param0->unk_04 = SpriteList_InitRendering(32, &param0->unk_08, heapID);
 
     SetSubScreenViewRect(&param0->unk_08, 0, (FX32_CONST(256)));
 
-    for (v0 = 0; v0 < 4; v0++) {
-        param0->unk_194[v0] = SpriteResourceCollection_New(32, v0, param1);
+    for (i = 0; i < 4; i++) {
+        param0->unk_194[i] = SpriteResourceCollection_New(32, i, heapID);
     }
 
     sub_02039734();
@@ -575,9 +575,9 @@ static void ov112_0225CC38(UnkStruct_ov112_0225C9BC *param0)
     RenderOam_Free();
 }
 
-static void ov112_0225CC64(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u32 param2)
+static void ov112_0225CC64(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_0225C9BC *param1, u32 heapID)
 {
-    param0->unk_00 = Graphics_GetScrnDataFromOpenNARC(param1->unk_1A4, 5, 0, &param0->unk_04, param2);
+    param0->unk_00 = Graphics_GetScrnDataFromOpenNARC(param1->unk_1A4, 5, 0, &param0->unk_04, heapID);
 }
 
 static void ov112_0225CC84(UnkStruct_ov112_0225CC84 *param0)
@@ -617,7 +617,7 @@ static void ov112_0225CCE8(UnkStruct_ov112_0225CC84 *param0, UnkStruct_ov112_022
     Bg_ScheduleTilemapTransfer(param1->unk_00, 3);
 }
 
-static void ov112_0225CDA8(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_02231428 *param4, const UnkStruct_ov66_0222DFF8 *param5, u32 param6)
+static void ov112_0225CDA8(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_02231428 *param4, const UnkStruct_ov66_0222DFF8 *param5, u32 heapID)
 {
     u32 v0;
     u32 v1;
@@ -764,11 +764,9 @@ static void ov112_0225CE88(UnkStruct_ov112_0225CDF8 *param0, UnkStruct_ov112_022
     }
 }
 
-static void ov112_0225CFC0(UnkStruct_ov112_0225CFD4 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_0222DFF8 *param4, u32 param5)
+static void ov112_0225CFC0(UnkStruct_ov112_0225CFD4 *param0, UnkStruct_ov112_0225C9BC *param1, UnkStruct_ov112_0225CC84 *param2, const UnkStruct_ov66_0223177C *param3, const UnkStruct_ov66_0222DFF8 *param4, u32 heapID)
 {
-    {
-        ov112_0225D08C(param2, param1, param3, param4, 0);
-    }
+    ov112_0225D08C(param2, param1, param3, param4, 0);
 }
 
 static void ov112_0225CFD4(UnkStruct_ov112_0225CFD4 *param0)
diff --git a/src/overlay113/ov113_02260620.c b/src/overlay113/ov113_02260620.c
index 44028f2d0f..c9d94aaa69 100644
--- a/src/overlay113/ov113_02260620.c
+++ b/src/overlay113/ov113_02260620.c
@@ -82,10 +82,10 @@ void ov113_02260620(MessageLoader *param0, StringTemplate *param1, Window param2
         return;
     }
 
-    v1 = TrainerInfo_New(118);
-    ov66_0222E640(v0, v1, 118);
+    v1 = TrainerInfo_New(HEAP_ID_118);
+    ov66_0222E640(v0, v1, HEAP_ID_118);
 
-    v4 = TrainerInfo_NameNewStrbuf(v1, 118);
+    v4 = TrainerInfo_NameNewStrbuf(v1, HEAP_ID_118);
     v6 = TrainerInfo_Gender(v1);
 
     StringTemplate_SetStrbuf(param1, 0, v4, v6, 1, GAME_LANGUAGE);
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index 1b34a8b43d..348f8b5e6b 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -272,7 +272,7 @@ static UnkStruct_ov114_0225CDB4 *ov114_0225CD54(UnkStruct_ov114_0225CCD0 *param0
 static Sprite *ov114_0225CDB4(UnkStruct_ov114_0225CDB4 *param0, SpriteList *param1, s16 param2, s16 param3, u16 param4, u32 param5);
 static void ov114_0225CDE0(UnkStruct_ov114_0225CCD0 *param0, UnkStruct_ov114_0225CDB4 *param1, NARC *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9);
 static void ov114_0225CEB8(UnkStruct_ov114_0225CCD0 *param0, UnkStruct_ov114_0225CDB4 *param1);
-static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const GraphicsModes *param1, const UnkStruct_ov114_02260284 *param2, u32 param3, u32 param4);
+static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const GraphicsModes *param1, const UnkStruct_ov114_02260284 *param2, u32 param3, u32 heapID);
 static void ov114_0225CF84(UnkStruct_ov114_0225CEF0 *param0);
 static void ov114_0225CFC0(UnkStruct_ov114_0225CEF0 *param0);
 static void ov114_0225CFCC(UnkStruct_ov114_0225CFCC *param0, u32 param1, u32 param2, u32 param3, u32 param4);
@@ -1319,11 +1319,11 @@ static void ov114_0225CEB8(UnkStruct_ov114_0225CCD0 *param0, UnkStruct_ov114_022
     }
 }
 
-static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const GraphicsModes *param1, const UnkStruct_ov114_02260284 *param2, u32 param3, u32 param4)
+static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const GraphicsModes *param1, const UnkStruct_ov114_02260284 *param2, u32 param3, u32 heapID)
 {
     SetAllGraphicsModes(param1);
 
-    param0->unk_00 = BgConfig_New(param4);
+    param0->unk_00 = BgConfig_New(heapID);
     param0->unk_04 = param2;
     param0->unk_08 = param3;
 
@@ -1335,7 +1335,7 @@ static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const GraphicsModes
 
         for (v0 = 0; v0 < param3; v0++) {
             Bg_InitFromTemplate(param0->unk_00, param2[v0].unk_00, &param2[v0].unk_04, 0);
-            Bg_ClearTilesRange(param2[v0].unk_00, 32, 0, param4);
+            Bg_ClearTilesRange(param2[v0].unk_00, 32, 0, heapID);
             Bg_ClearTilemap(param0->unk_00, param2[v0].unk_00);
             Bg_SetOffset(param0->unk_00, param2[v0].unk_00, 0, 0);
             Bg_SetOffset(param0->unk_00, param2[v0].unk_00, 3, 0);
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index 7afcf40e73..963a002dc8 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -424,7 +424,7 @@ static void ov115_02263308(void);
 static void ov115_02263328(void);
 static void ov115_022633B4(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 heapID);
 static void ov115_022633EC(UnkStruct_ov115_02261ADC *param0);
-static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1);
+static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 heapID);
 static void ov115_02263954(UnkStruct_ov115_02261ADC *param0);
 static void ov115_02263990(UnkStruct_ov115_02261ADC *param0, u32 heapID);
 static void ov115_02263A3C(UnkStruct_ov115_02261ADC *param0);
@@ -2973,9 +2973,9 @@ static void ov115_0226369C(const UnkStruct_ov115_02260D78 *param0, UnkStruct_ov1
     SpriteList_Update(param1->unk_1C);
 }
 
-static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1)
+static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 heapID)
 {
-    param0->unk_00 = BgConfig_New(param1);
+    param0->unk_00 = BgConfig_New(heapID);
 
     {
         GraphicsModes v0 = {
@@ -3006,7 +3006,7 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1)
         };
 
         Bg_InitFromTemplate(param0->unk_00, 1, &v1, 0);
-        Bg_ClearTilesRange(1, 32, 0, param1);
+        Bg_ClearTilesRange(1, 32, 0, heapID);
         Bg_ClearTilemap(param0->unk_00, 1);
     }
 
@@ -3028,7 +3028,7 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1)
         };
 
         Bg_InitFromTemplate(param0->unk_00, 2, &v2, 0);
-        Bg_ClearTilesRange(2, 32, 0, param1);
+        Bg_ClearTilesRange(2, 32, 0, heapID);
         Bg_ClearTilemap(param0->unk_00, 2);
     }
 
@@ -3050,7 +3050,7 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1)
         };
 
         Bg_InitFromTemplate(param0->unk_00, 4, &v3, 0);
-        Bg_ClearTilesRange(4, 32, 0, param1);
+        Bg_ClearTilesRange(4, 32, 0, heapID);
         Bg_ClearTilemap(param0->unk_00, 4);
     }
 
@@ -3072,7 +3072,7 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1)
         };
 
         Bg_InitFromTemplate(param0->unk_00, 5, &v4, 0);
-        Bg_ClearTilesRange(5, 32, 0, param1);
+        Bg_ClearTilesRange(5, 32, 0, heapID);
         Bg_ClearTilemap(param0->unk_00, 5);
     }
 
@@ -3094,7 +3094,7 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1)
         };
 
         Bg_InitFromTemplate(param0->unk_00, 6, &v5, 0);
-        Bg_ClearTilesRange(6, 32, 0, param1);
+        Bg_ClearTilesRange(6, 32, 0, heapID);
         Bg_ClearTilemap(param0->unk_00, 6);
     }
 
@@ -3116,7 +3116,7 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1)
         };
 
         Bg_InitFromTemplate(param0->unk_00, 7, &v6, 0);
-        Bg_ClearTilesRange(7, 32, 0, param1);
+        Bg_ClearTilesRange(7, 32, 0, heapID);
         Bg_ClearTilemap(param0->unk_00, 7);
     }
 
@@ -3130,8 +3130,8 @@ static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1)
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 1);
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 1);
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1);
-    Font_LoadScreenIndicatorsPalette(0, 5 * 0x20, param1);
-    LoadStandardWindowGraphics(param0->unk_00, 1, 1, 4, 0, param1);
+    Font_LoadScreenIndicatorsPalette(0, 5 * 0x20, heapID);
+    LoadStandardWindowGraphics(param0->unk_00, 1, 1, 4, 0, heapID);
 }
 
 static void ov115_02263954(UnkStruct_ov115_02261ADC *param0)
diff --git a/src/party.c b/src/party.c
index 3aab6af5f8..221aec1db5 100644
--- a/src/party.c
+++ b/src/party.c
@@ -19,7 +19,7 @@ int Party_SaveSize(void)
     return sizeof(Party);
 }
 
-Party *Party_New(u32 heapID)
+Party *Party_New(enum HeapId heapID)
 {
     Party *party = Heap_AllocFromHeap(heapID, sizeof(Party));
     Party_Init(party);
diff --git a/src/pokedex.c b/src/pokedex.c
index b13e7190de..1807e53dea 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -6,7 +6,6 @@
 #include "constants/forms.h"
 #include "generated/gender_ratios.h"
 
-#include "heap.h"
 #include "inlines.h"
 #include "pokedex_language.h"
 #include "pokemon.h"
@@ -60,7 +59,7 @@ int Pokedex_SaveSize(void)
     return sizeof(Pokedex);
 }
 
-Pokedex *Pokedex_New(u32 heapID)
+Pokedex *Pokedex_New(enum HeapId heapID)
 {
     Pokedex *pokedexData = Heap_AllocFromHeap(heapID, sizeof(Pokedex));
     Pokedex_Init(pokedexData);
diff --git a/src/start_menu.c b/src/start_menu.c
index ef3449dab7..4118bc084e 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -775,7 +775,7 @@ static void sub_0203B318(StartMenu *menu, u8 *param1, u32 param2, u8 param3)
     u32 i;
     NARC *v2;
 
-    ov5_021D3190(&menu->unk_38, &v0, (7 + 1), 11);
+    ov5_021D3190(&menu->unk_38, &v0, (7 + 1), HEAP_ID_FIELDMAP);
 
     v2 = NARC_ctor(NARC_INDEX_GRAPHIC__MENU_GRA, HEAP_ID_FIELDMAP);
 
diff --git a/src/trainer_info.c b/src/trainer_info.c
index c2e58c581a..37207266fb 100644
--- a/src/trainer_info.c
+++ b/src/trainer_info.c
@@ -16,7 +16,7 @@ int TrainerInfo_Size(void)
     return sizeof(TrainerInfo);
 }
 
-TrainerInfo *TrainerInfo_New(u32 heapID)
+TrainerInfo *TrainerInfo_New(enum HeapId heapID)
 {
     TrainerInfo *info = Heap_AllocFromHeap(heapID, sizeof(TrainerInfo));
     TrainerInfo_Init(info);
diff --git a/src/unk_0202854C.c b/src/unk_0202854C.c
index ebfe6d16f1..fc6606e746 100644
--- a/src/unk_0202854C.c
+++ b/src/unk_0202854C.c
@@ -288,7 +288,7 @@ void sub_02028830(UndergroundData *param0, const TrainerInfo *param1)
     }
 }
 
-TrainerInfo *sub_020288C8(const UndergroundData *param0, int param1, int param2)
+TrainerInfo *sub_020288C8(const UndergroundData *param0, int heapID, int param2)
 {
     int v0 = (sizeof(u16) * (7 + 1));
     int v1;
@@ -300,7 +300,7 @@ TrainerInfo *sub_020288C8(const UndergroundData *param0, int param1, int param2)
     }
 
     if (param0->unk_B0[v3][0] != 0) {
-        v2 = TrainerInfo_New(param1);
+        v2 = TrainerInfo_New(heapID);
 
         TrainerInfo_SetName(v2, param0->unk_B0[v3]);
         TrainerInfo_SetGameCode(v2, param0->unk_105[v3]);
diff --git a/src/unk_0206A780.c b/src/unk_0206A780.c
index f6249c602b..093d69135d 100644
--- a/src/unk_0206A780.c
+++ b/src/unk_0206A780.c
@@ -51,7 +51,7 @@ UnkStruct_0206A844 *sub_0206A780(int heapID)
     v2 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0206A844));
     MI_CpuClear8(v2, sizeof(UnkStruct_0206A844));
 
-    ov5_021D3190(&v2->unk_00, &v0, 2, 11);
+    ov5_021D3190(&v2->unk_00, &v0, 2, HEAP_ID_FIELDMAP);
 
     v3 = NARC_ctor(NARC_INDEX_GRAPHIC__FLD_COMACT, heapID);