diff --git a/docs/3d_rendering.md b/docs/3d_rendering.md
index c0ba168c71..cfc588e684 100644
--- a/docs/3d_rendering.md
+++ b/docs/3d_rendering.md
@@ -48,23 +48,23 @@ NNSFndAllocator allocator; // Needed for Animations
 Next we load all of the data:
 ```c
 // Open the title NARC
-NARC *narc = NARC_ctor(NARC_INDEX_DEMO__TITLE__TITLEDEMO, HEAP_ID_FIELD);
+NARC *narc = NARC_ctor(NARC_INDEX_DEMO__TITLE__TITLEDEMO, HEAP_ID_FIELD1);
 
 // Load the model from the title screen NARC. Member index 1 is the model data.
 // There is also Easy3DModel_Load which takes a NARC index and a member index.
-Easy3DModel_LoadFrom(&giratinaModel, narc, 1, HEAP_ID_FIELD);
+Easy3DModel_LoadFrom(&giratinaModel, narc, 1, HEAP_ID_FIELD1);
 Easy3DObject_Init(&giratinaObj, &giratinaModel);
 
 // Initialize the Allocator used by the animations
-Heap_FndInitAllocatorForExpHeap(&allocator, HEAP_ID_FIELD, 4);
+HeapExp_FndInitAllocator(&allocator, HEAP_ID_FIELD1, 4);
 
 // Load the model animation with member index 2.
-Easy3DAnim_LoadFrom(&giratinaModelAnim, &giratinaModel, narc, 2, HEAP_ID_FIELD, &allocator);
+Easy3DAnim_LoadFrom(&giratinaModelAnim, &giratinaModel, narc, 2, HEAP_ID_FIELD1, &allocator);
 // Bind the animation to the object
 Easy3DObject_AddAnim(&giratinaObj, &giratinaModelAnim);
 
 // Do the same for the texture animation
-Easy3DAnim_LoadFrom(&giratinaTexAnim, &giratinaModel, narc, 0, HEAP_ID_FIELD, &allocator);
+Easy3DAnim_LoadFrom(&giratinaTexAnim, &giratinaModel, narc, 0, HEAP_ID_FIELD1, &allocator);
 Easy3DObject_AddAnim(&giratinaObj, &giratinaTexAnim);
 
 NARC_dtor(narc);
diff --git a/include/applications/naming_screen.h b/include/applications/naming_screen.h
index 1ad669b4f9..0d93efe454 100644
--- a/include/applications/naming_screen.h
+++ b/include/applications/naming_screen.h
@@ -40,7 +40,7 @@ typedef struct NamingScreenArgs {
 extern const ApplicationManagerTemplate gNamingScreenAppTemplate;
 
 NamingScreenArgs *NamingScreenArgs_Init(
-    enum HeapId heapID,
+    enum HeapID heapID,
     enum NamingScreenType type,
     int playerGenderOrMonSpecies,
     int maxChars,
diff --git a/include/applications/pokedex/crysub.h b/include/applications/pokedex/crysub.h
index e2a06ce0b3..d998128039 100644
--- a/include/applications/pokedex/crysub.h
+++ b/include/applications/pokedex/crysub.h
@@ -6,7 +6,7 @@
 
 #include "heap.h"
 
-void CrySub_Init(PokedexScreenManager *screenMan, PokedexApp *pokedexApp, enum HeapId heapID);
+void CrySub_Init(PokedexScreenManager *screenMan, PokedexApp *pokedexApp, enum HeapID heapID);
 void CrySub_Free(PokedexScreenManager *screenMan);
 int CrySub_GetPitch(const PokedexScreenManager *screenMan);
 
diff --git a/include/applications/pokedex/funcptr_ov21_021E9B74.h b/include/applications/pokedex/funcptr_ov21_021E9B74.h
index d932df0abf..4161c18102 100644
--- a/include/applications/pokedex/funcptr_ov21_021E9B74.h
+++ b/include/applications/pokedex/funcptr_ov21_021E9B74.h
@@ -6,6 +6,6 @@
 
 #include "heap.h"
 
-typedef void (*UnkFuncPtr_ov21_021E9B74)(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+typedef void (*UnkFuncPtr_ov21_021E9B74)(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 
 #endif // POKEPLATINUM_FUNCPTR_OV21_021E9B74_H
diff --git a/include/applications/pokedex/ov21_021D423C.h b/include/applications/pokedex/ov21_021D423C.h
index 429fbc14ec..d171751245 100644
--- a/include/applications/pokedex/ov21_021D423C.h
+++ b/include/applications/pokedex/ov21_021D423C.h
@@ -6,7 +6,7 @@
 #include "applications/pokedex/struct_ov21_021D423C_decl.h"
 #include "applications/pokedex/struct_ov21_021D4660.h"
 
-UnkStruct_ov21_021D423C *ov21_021D423C(enum HeapId heapID);
+UnkStruct_ov21_021D423C *ov21_021D423C(enum HeapID heapID);
 void ov21_021D426C(UnkStruct_ov21_021D423C *param0, UnkStruct_ov21_021D4660 *param1, int param2);
 const UnkStruct_ov21_021D4660 *ov21_021D4284(UnkStruct_ov21_021D423C *param0, int param1);
 BOOL ov21_021D42D4(UnkStruct_ov21_021D423C *param0);
diff --git a/include/applications/pokedex/ov21_021D4340.h b/include/applications/pokedex/ov21_021D4340.h
index e683efb55d..edba0832f3 100644
--- a/include/applications/pokedex/ov21_021D4340.h
+++ b/include/applications/pokedex/ov21_021D4340.h
@@ -12,19 +12,19 @@ BOOL ov21_021D43A8(UnkStruct_ov21_021D4340_1 *param0);
 BOOL ov21_021D4434(UnkStruct_ov21_021D4340_1 *param0);
 BOOL ov21_021D4558(UnkStruct_ov21_021D4340_1 *param0);
 void ov21_021D4660(UnkStruct_ov21_021D4660 *param0);
-void ov21_021D467C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
-void ov21_021D4704(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
-void ov21_021D475C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
-void ov21_021D47F0(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
-void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, PokedexApp *param1, enum HeapId heapID, int param3);
-void ov21_021D48B8(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
-void ov21_021D491C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
-void ov21_021D4980(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
-void ov21_021D49E4(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
-void ov21_021D4A3C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
-void ov21_021D4A94(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
-void ov21_021D4AF8(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
-void ov21_021D4B50(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
-void ov21_021D4BB4(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
+void ov21_021D467C(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
+void ov21_021D4704(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
+void ov21_021D475C(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
+void ov21_021D47F0(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
+void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, PokedexApp *param1, enum HeapID heapID, int param3);
+void ov21_021D48B8(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
+void ov21_021D491C(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
+void ov21_021D4980(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
+void ov21_021D49E4(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
+void ov21_021D4A3C(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
+void ov21_021D4A94(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
+void ov21_021D4AF8(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
+void ov21_021D4B50(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
+void ov21_021D4BB4(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3);
 
 #endif // POKEPLATINUM_OV21_021D4340_H
diff --git a/include/applications/pokedex/ov21_021D5AEC.h b/include/applications/pokedex/ov21_021D5AEC.h
index 725e9d68a1..07c3bf7e57 100644
--- a/include/applications/pokedex/ov21_021D5AEC.h
+++ b/include/applications/pokedex/ov21_021D5AEC.h
@@ -7,7 +7,7 @@
 
 #include "heap.h"
 
-void ov21_021D5AEC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021D5AEC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021D5B50(PokedexScreenManager *param0);
 BOOL ov21_021D5B68(const UnkStruct_ov21_021D5B68 *param0);
 
diff --git a/include/applications/pokedex/ov21_021D76B0.h b/include/applications/pokedex/ov21_021D76B0.h
index a6c6cf8670..229f1aeaf4 100644
--- a/include/applications/pokedex/ov21_021D76B0.h
+++ b/include/applications/pokedex/ov21_021D76B0.h
@@ -6,7 +6,7 @@
 
 #include "heap.h"
 
-void ov21_021D76B0(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021D76B0(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021D7710(PokedexScreenManager *param0);
 
 #endif // POKEPLATINUM_OV21_021D76B0_H
diff --git a/include/applications/pokedex/ov21_021D94BC.h b/include/applications/pokedex/ov21_021D94BC.h
index 3a43eb5929..bf4dde5e8d 100644
--- a/include/applications/pokedex/ov21_021D94BC.h
+++ b/include/applications/pokedex/ov21_021D94BC.h
@@ -6,7 +6,7 @@
 
 #include "heap.h"
 
-void ov21_021D94BC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021D94BC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021D951C(PokedexScreenManager *param0);
 
 #endif // POKEPLATINUM_OV21_021D94BC_H
diff --git a/include/applications/pokedex/ov21_021DC9BC.h b/include/applications/pokedex/ov21_021DC9BC.h
index a078895a7a..ee973db726 100644
--- a/include/applications/pokedex/ov21_021DC9BC.h
+++ b/include/applications/pokedex/ov21_021DC9BC.h
@@ -6,7 +6,7 @@
 
 #include "heap.h"
 
-void ov21_021DC9BC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021DC9BC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021DCA14(PokedexScreenManager *param0);
 int ov21_021DCA28(const PokedexScreenManager *param0);
 void ov21_021DCA30(PokedexScreenManager *param0, int param1);
diff --git a/include/applications/pokedex/ov21_021DDD2C.h b/include/applications/pokedex/ov21_021DDD2C.h
index 5409664932..98f5c9255c 100644
--- a/include/applications/pokedex/ov21_021DDD2C.h
+++ b/include/applications/pokedex/ov21_021DDD2C.h
@@ -6,7 +6,7 @@
 
 #include "heap.h"
 
-void ov21_021DDD2C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021DDD2C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021DDD8C(PokedexScreenManager *param0);
 
 #endif // POKEPLATINUM_OV21_021DDD2C_H
diff --git a/include/applications/pokedex/ov21_021DE668.h b/include/applications/pokedex/ov21_021DE668.h
index 4b5ee492d4..84f8b46481 100644
--- a/include/applications/pokedex/ov21_021DE668.h
+++ b/include/applications/pokedex/ov21_021DE668.h
@@ -9,11 +9,11 @@
 #include "bg_window.h"
 #include "heap.h"
 
-void ov21_021DE668(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021DE668(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021DE6C0(PokedexScreenManager *param0);
 BOOL ov21_021DE6D4(UnkStruct_ov21_021DE6D4 *param0, int param1);
 BOOL ov21_021DE6D8(UnkStruct_ov21_021DE6D4 *param0, int param1);
-void ov21_021DEB8C(Window *param0, int param1, enum HeapId heapID, int param3, u32 param4);
+void ov21_021DEB8C(Window *param0, int param1, enum HeapID heapID, int param3, u32 param4);
 int PokedexGraphics_GetAnimIDfromType(int monType);
 Window *ov21_021DF30C(PokedexTextManager *textMan, int param1, int param2);
 
diff --git a/include/applications/pokedex/ov21_021DF734.h b/include/applications/pokedex/ov21_021DF734.h
index 0049a624be..c869fc2876 100644
--- a/include/applications/pokedex/ov21_021DF734.h
+++ b/include/applications/pokedex/ov21_021DF734.h
@@ -6,7 +6,7 @@
 
 #include "heap.h"
 
-void ov21_021DF734(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021DF734(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021DF78C(PokedexScreenManager *param0);
 BOOL ov21_021DF7A0(PokedexScreenManager *param0, int param1);
 
diff --git a/include/applications/pokedex/ov21_021E0C68.h b/include/applications/pokedex/ov21_021E0C68.h
index af95afda43..f5a5032ee6 100644
--- a/include/applications/pokedex/ov21_021E0C68.h
+++ b/include/applications/pokedex/ov21_021E0C68.h
@@ -6,7 +6,7 @@
 
 #include "heap.h"
 
-void ov21_021E0C68(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021E0C68(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021E0CC0(PokedexScreenManager *param0);
 void ov21_021E0CD4(PokedexScreenManager *param0, int param1, int param2);
 void ov21_021E0CDC(PokedexScreenManager *param0, int param1);
diff --git a/include/applications/pokedex/ov21_021E1924.h b/include/applications/pokedex/ov21_021E1924.h
index 20c907f014..7e8d74027c 100644
--- a/include/applications/pokedex/ov21_021E1924.h
+++ b/include/applications/pokedex/ov21_021E1924.h
@@ -6,7 +6,7 @@
 
 #include "heap.h"
 
-void ov21_021E1924(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021E1924(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021E1984(PokedexScreenManager *param0);
 
 #endif // POKEPLATINUM_OV21_021E1924_H
diff --git a/include/applications/pokedex/ov21_021E29DC.h b/include/applications/pokedex/ov21_021E29DC.h
index 84dee296da..a11a391806 100644
--- a/include/applications/pokedex/ov21_021E29DC.h
+++ b/include/applications/pokedex/ov21_021E29DC.h
@@ -6,10 +6,10 @@
 
 #include "heap.h"
 
-void ov21_021E29DC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021E29DC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021E2A3C(PokedexScreenManager *param0);
 BOOL ov21_021E2A54(const PokedexScreenManager *param0);
-void ov21_021E332C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021E332C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021E338C(PokedexScreenManager *param0);
 BOOL ov21_021E33A4(const PokedexScreenManager *param0);
 BOOL ov21_021E33AC(const PokedexScreenManager *param0);
diff --git a/include/applications/pokedex/ov21_021E3FFC.h b/include/applications/pokedex/ov21_021E3FFC.h
index 64232c908d..56e816c4d0 100644
--- a/include/applications/pokedex/ov21_021E3FFC.h
+++ b/include/applications/pokedex/ov21_021E3FFC.h
@@ -6,7 +6,7 @@
 
 #include "heap.h"
 
-void ov21_021E3FFC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021E3FFC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021E4054(PokedexScreenManager *param0);
 void ov21_021E4068(PokedexScreenManager *param0, int param1, int param2);
 void ov21_021E4070(PokedexScreenManager *param0, int param1);
diff --git a/include/applications/pokedex/ov21_021E68F4.h b/include/applications/pokedex/ov21_021E68F4.h
index d68ef4fc12..5e43788293 100644
--- a/include/applications/pokedex/ov21_021E68F4.h
+++ b/include/applications/pokedex/ov21_021E68F4.h
@@ -6,7 +6,7 @@
 
 #include "heap.h"
 
-void ov21_021E68F4(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021E68F4(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021E6954(PokedexScreenManager *param0);
 
 #endif // POKEPLATINUM_OV21_021E68F4_H
diff --git a/include/applications/pokedex/ov21_021E737C.h b/include/applications/pokedex/ov21_021E737C.h
index 472ed2775c..c6a2dc4f17 100644
--- a/include/applications/pokedex/ov21_021E737C.h
+++ b/include/applications/pokedex/ov21_021E737C.h
@@ -6,7 +6,7 @@
 
 #include "heap.h"
 
-void ov21_021E737C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021E737C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021E73D4(PokedexScreenManager *param0);
 
 #endif // POKEPLATINUM_OV21_021E737C_H
diff --git a/include/applications/pokedex/ov21_021E8484.h b/include/applications/pokedex/ov21_021E8484.h
index 46ea67f462..3ad045499d 100644
--- a/include/applications/pokedex/ov21_021E8484.h
+++ b/include/applications/pokedex/ov21_021E8484.h
@@ -6,7 +6,7 @@
 
 #include "heap.h"
 
-void ov21_021E8484(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021E8484(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021E84E4(PokedexScreenManager *param0);
 
 #endif // POKEPLATINUM_OV21_021E8484_H
diff --git a/include/applications/pokedex/pokedex_data_manager.h b/include/applications/pokedex/pokedex_data_manager.h
index fb678fb3fd..c23777f281 100644
--- a/include/applications/pokedex/pokedex_data_manager.h
+++ b/include/applications/pokedex/pokedex_data_manager.h
@@ -5,7 +5,7 @@
 
 typedef struct PokedexDataManager {
     int state;
-    enum HeapId heapID;
+    enum HeapID heapID;
     void *pageData;
     BOOL exit;
     BOOL unchanged;
diff --git a/include/applications/pokedex/pokedex_enc_data.h b/include/applications/pokedex/pokedex_enc_data.h
index b29341d5f6..8944ba1978 100644
--- a/include/applications/pokedex/pokedex_enc_data.h
+++ b/include/applications/pokedex/pokedex_enc_data.h
@@ -50,7 +50,7 @@ enum PokedexEncFileCatgegory {
  * @param encounterCategory
  * @param heapID
  */
-void PokedexEncData_PopulateEncounterLocations(EncounterLocations *encounterLocations, int species, int encounterCategory, enum HeapId heapID);
+void PokedexEncData_PopulateEncounterLocations(EncounterLocations *encounterLocations, int species, int encounterCategory, enum HeapID heapID);
 
 /**
  * @brief Frees encounter data from the heap
@@ -69,7 +69,7 @@ void PokedexEncData_FreeEncounterLocations(EncounterLocations *encounterLocation
  * @param numDungeons
  * @return Array of coordinates for each dungeon
  */
-DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(enum HeapId heapID, int *numDungeons);
+DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(enum HeapID heapID, int *numDungeons);
 
 /**
  * @brief Reads field coordinates data from zukan_enc_platinum.narc
@@ -81,7 +81,7 @@ DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(enum HeapId heapID, int
  * @param numFields
  * @return Array of coordinates for each field
  */
-FieldCoordinates *PokedexEncData_GetFieldCoordinates(enum HeapId heapID, int *numFields);
+FieldCoordinates *PokedexEncData_GetFieldCoordinates(enum HeapID heapID, int *numFields);
 
 /**
  * @brief Updates fieldMap with the coordinates occupied by the field
diff --git a/include/applications/pokedex/pokedex_graphics.h b/include/applications/pokedex/pokedex_graphics.h
index c0ef354175..ea028c03e5 100644
--- a/include/applications/pokedex/pokedex_graphics.h
+++ b/include/applications/pokedex/pokedex_graphics.h
@@ -93,7 +93,7 @@ typedef struct PokedexGraphicData {
     NARC *pokedexGraphics;
 } PokedexGraphicData;
 
-void PokedexGraphics_Init(PokedexGraphicData *pokedexGraphicData, enum HeapId heapID);
+void PokedexGraphics_Init(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID);
 void PokedexGraphics_Free(PokedexGraphicData *pokedexGraphicData);
 void PokemonGraphics_UpdateSprites(PokedexGraphicData *pokedexGraphicData);
 void PokemonGraphics_UpdateCharAndPltt(PokedexGraphicData *pokedexGraphicData);
@@ -130,14 +130,14 @@ void PokedexGraphics_SetCursorPosAndSize(PokedexGraphicData *pokedexGraphicData,
 void PokedexGraphics_InitTransformation(CursorTransformation *cursorTransformation, int startX, int endX, int startY, int endY, int numSteps);
 BOOL PokedexGraphics_TakeCursorTransformStep(CursorTransformation *cursorTransformation);
 NARC *PokedexGraphics_GetNARC(PokedexGraphicData *pokedexGraphicData);
-u32 PokedexGraphics_LoadGraphicNarcCharacterData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BgConfig *bgConfig, u32 bgLayer, u32 tileStart, u32 size, BOOL isCompressed, enum HeapId heapID);
-void PokedexGraphics_LoadGraphicNarcPaletteData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, enum PaletteLoadLocation loadLocation, u32 offset, u32 szByte, enum HeapId heapID);
-void *PokedexGraphics_GetGraphicNarcScreenData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dScreenData **screenData, enum HeapId heapID);
-void *PokedexGraphics_GetGraphicNarcPaletteData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, NNSG2dPaletteData **paletteData, enum HeapId heapID);
-void *PokedexGraphics_GetGraphicNarcCharacterData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dCharacterData **characterData, enum HeapId heapID);
-void PokedexGraphics_InitSpeciesLabelGraphics(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteResourceCollection **spriteResourceCollection, enum HeapId heapID, NARC *narc);
+u32 PokedexGraphics_LoadGraphicNarcCharacterData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BgConfig *bgConfig, u32 bgLayer, u32 tileStart, u32 size, BOOL isCompressed, enum HeapID heapID);
+void PokedexGraphics_LoadGraphicNarcPaletteData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, enum PaletteLoadLocation loadLocation, u32 offset, u32 szByte, enum HeapID heapID);
+void *PokedexGraphics_GetGraphicNarcScreenData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dScreenData **screenData, enum HeapID heapID);
+void *PokedexGraphics_GetGraphicNarcPaletteData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, NNSG2dPaletteData **paletteData, enum HeapID heapID);
+void *PokedexGraphics_GetGraphicNarcCharacterData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dCharacterData **characterData, enum HeapID heapID);
+void PokedexGraphics_InitSpeciesLabelGraphics(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteResourceCollection **spriteResourceCollection, enum HeapID heapID, NARC *narc);
 void PokedexGraphics_FreeSpeciesLabelGraphics(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteResourceCollection **spriteResourceCollection);
-void PokedexGraphics_NewSpeciesLabel(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteList *spriteList, SpriteResourceCollection **spriteResourceCollection, enum HeapId heapID, int headerPriority);
+void PokedexGraphics_NewSpeciesLabel(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteList *spriteList, SpriteResourceCollection **spriteResourceCollection, enum HeapID heapID, int headerPriority);
 void PokedexGraphics_FreeSpeciesLabel(PokedexSpeciesLabel *pokedexSpeciesLabel);
 void PokedexGraphics_SetSpeciesLabelDraw(PokedexSpeciesLabel *pokedexSpeciesLabel, BOOL draw);
 
diff --git a/include/applications/pokedex/pokedex_graphics_manager.h b/include/applications/pokedex/pokedex_graphics_manager.h
index 580e034ff5..2d7598559c 100644
--- a/include/applications/pokedex/pokedex_graphics_manager.h
+++ b/include/applications/pokedex/pokedex_graphics_manager.h
@@ -5,7 +5,7 @@
 
 typedef struct PokedexGraphicsManager {
     int state;
-    enum HeapId heapID;
+    enum HeapID heapID;
     void *pageGraphics;
 } PokedexGraphicsManager;
 
diff --git a/include/applications/pokedex/pokedex_height_check.h b/include/applications/pokedex/pokedex_height_check.h
index 2ee5eb3c59..138c35fbbf 100644
--- a/include/applications/pokedex/pokedex_height_check.h
+++ b/include/applications/pokedex/pokedex_height_check.h
@@ -6,7 +6,7 @@
 
 #include "heap.h"
 
-void ov21_021E6014(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void ov21_021E6014(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void ov21_021E6074(PokedexScreenManager *param0);
 
 #endif // POKEPLATINUM_POKEDEX_HEIGHT_CHECK_H
diff --git a/include/applications/pokedex/pokedex_main.h b/include/applications/pokedex/pokedex_main.h
index b5321af681..336444308f 100644
--- a/include/applications/pokedex/pokedex_main.h
+++ b/include/applications/pokedex/pokedex_main.h
@@ -48,9 +48,9 @@ typedef struct {
 int PokedexMain_Init(ApplicationManager *appMan, int *state);
 int PokedexMain_Main(ApplicationManager *appMan, int *state);
 int PokedexMain_Exit(ApplicationManager *appMan, int *state);
-PokedexApp *PokedexMain_NewPokedexApp(enum HeapId heapID, const PokedexOverlayArgs *pokedexOverlayArgs);
+PokedexApp *PokedexMain_NewPokedexApp(enum HeapID heapID, const PokedexOverlayArgs *pokedexOverlayArgs);
 BOOL ov21_021D10B8(PokedexApp *pokedexApp);
-void PokedexMain_InitGX(enum HeapId heapID);
+void PokedexMain_InitGX(enum HeapID heapID);
 void PokedexMain_FreeGraphics(void);
 void ov21_021D12D8(PokedexApp *pokedexApp);
 PokedexUpdater *ov21_021D12EC(PokedexApp *pokedexApp);
@@ -94,6 +94,6 @@ u32 PokedexMain_DisplayDeoxysSprite(PokedexGraphicData *pokedexGraphicData, cons
 u32 PokedexMain_DisplayShayminSprite(PokedexGraphicData *pokedexGraphicData, const PokedexSortData *pokedexSortData, int face, int param3, int param4, int formIndex, int param6);
 u32 PokedexMain_DisplayGiratinaSprite(PokedexGraphicData *pokedexGraphicData, const PokedexSortData *pokedexSortData, int face, int param3, int param4, int formIndex, int param6);
 u32 PokedexMain_DisplayRotomSprite(PokedexGraphicData *pokedexGraphicData, const PokedexSortData *pokedexSortData, int face, int param3, int param4, int formIndex, int param6);
-Strbuf *PokedexMain_GetMessage(int entryID, enum HeapId heapID);
+Strbuf *PokedexMain_GetMessage(int entryID, enum HeapID heapID);
 
 #endif // POKEPLATINUM_POKEDEX_MAIN_H
diff --git a/include/applications/pokedex/pokedex_panel.h b/include/applications/pokedex/pokedex_panel.h
index bbc4e68263..1bb41a8a1f 100644
--- a/include/applications/pokedex/pokedex_panel.h
+++ b/include/applications/pokedex/pokedex_panel.h
@@ -43,7 +43,7 @@ typedef struct PokedexPanelData {
     int row;
 } PokedexPanelData;
 
-PokedexPanelData *PokedexPanel_Alloc(enum HeapId heapID);
+PokedexPanelData *PokedexPanel_Alloc(enum HeapID heapID);
 void PokedexPanel_Free(PokedexPanelData *pokedexPanelData);
 void PokedexPanel_New(PokedexPanelData *pokedexPanelData, const PokedexCursorData *pokedexCursorData, int numCols, int numRows);
 void PokedexPanel_Move(PokedexPanelData *pokedexPanelData, enum PanelMovementType movementType, int val);
diff --git a/include/applications/pokedex/pokedex_search.h b/include/applications/pokedex/pokedex_search.h
index 14729206d1..d490d22e05 100644
--- a/include/applications/pokedex/pokedex_search.h
+++ b/include/applications/pokedex/pokedex_search.h
@@ -15,7 +15,7 @@ enum FilterMethod {
     MAX_FILTER_METHOD
 };
 
-void PokedexSearch_TransitionFunctions(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID);
+void PokedexSearch_TransitionFunctions(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID);
 void PokedexSearch_FreeData(PokedexScreenManager *param0);
 void PokedexSearch_SetFilterMethod(PokedexScreenManager *param0, enum FilterMethod filterMethod);
 enum FilterMethod PokedexSearch_GetFilterMethod(const PokedexScreenManager *param0);
diff --git a/include/applications/pokedex/pokedex_sort.h b/include/applications/pokedex/pokedex_sort.h
index 761a892175..3048b81948 100644
--- a/include/applications/pokedex/pokedex_sort.h
+++ b/include/applications/pokedex/pokedex_sort.h
@@ -88,7 +88,7 @@ typedef struct PokedexDefaultSortParams {
     u32 bootMode;
 } PokedexDefaultSortParams;
 
-void PokedexSort_DefaultPokedexSort(PokedexSortData *param0, PokedexDefaultSortParams *param1, enum HeapId heapID);
+void PokedexSort_DefaultPokedexSort(PokedexSortData *param0, PokedexDefaultSortParams *param1, enum HeapID heapID);
 void PokedexSort_PokedexStatusFreeHWData(PokedexSortData *param0);
 u32 PokedexSort_Gender(const PokedexSortData *param0, int species, int formIndex);
 u32 PokedexSort_UnownForm(const PokedexSortData *param0, int formIndex);
@@ -107,8 +107,8 @@ void PokedexSort_SetCurrentSpecies(PokedexSortData *param0, u32 param1);
 u32 PokedexSort_GetCurrentSpecies(const PokedexSortData *param0);
 void PokedexSort_SetBootMode(PokedexSortData *param0, u32 param1);
 u32 PokedexSort_GetBootMode(const PokedexSortData *param0);
-BOOL PokedexSort_Sort(PokedexSortData *param0, enum SortOrder sortOrder, enum FilterName filterName, enum FilterType typeFilter1, enum FilterType typeFilter2, enum FilterForm filterForm, int isNationalDex, enum HeapId heapID, BOOL isFiltered);
-BOOL PokedexSort_SortUnfiltered(PokedexSortData *param0, enum SortOrder sortOrder, enum FilterName filterName, enum FilterType filterType1, enum FilterType filterType2, enum FilterForm filterForm, int isNationalDex, enum HeapId heapID);
+BOOL PokedexSort_Sort(PokedexSortData *param0, enum SortOrder sortOrder, enum FilterName filterName, enum FilterType typeFilter1, enum FilterType typeFilter2, enum FilterForm filterForm, int isNationalDex, enum HeapID heapID, BOOL isFiltered);
+BOOL PokedexSort_SortUnfiltered(PokedexSortData *param0, enum SortOrder sortOrder, enum FilterName filterName, enum FilterType filterType1, enum FilterType filterType2, enum FilterForm filterForm, int isNationalDex, enum HeapID heapID);
 BOOL ov21_021D36A4(const PokedexSortData *param0, int param1);
 BOOL ov21_021D36C0(PokedexSortData *param0, int param1);
 int PokedexSort_IsNationalDex(const PokedexSortData *param0);
diff --git a/include/applications/pokedex/pokedex_text.h b/include/applications/pokedex/pokedex_text.h
index c398fd0a74..a166016176 100644
--- a/include/applications/pokedex/pokedex_text.h
+++ b/include/applications/pokedex/pokedex_text.h
@@ -7,8 +7,8 @@
 
 void PokedexText_Free(Strbuf *strbuf);
 int PokedexText_ForeignLanguage(int languageIndex);
-Strbuf *PokedexText_NameNumber(int species, int language, enum HeapId heapID);
-Strbuf *PokedexText_Category(int species, int language, enum HeapId heapID);
-Strbuf *PokedexText_DexEntry(int species, int language, int entryOffset, enum HeapId heapID);
+Strbuf *PokedexText_NameNumber(int species, int language, enum HeapID heapID);
+Strbuf *PokedexText_Category(int species, int language, enum HeapID heapID);
+Strbuf *PokedexText_DexEntry(int species, int language, int entryOffset, enum HeapID heapID);
 
 #endif // POKEPLATINUM_POKEDEX_TEXT_H
diff --git a/include/applications/pokedex/pokedex_text_manager.h b/include/applications/pokedex/pokedex_text_manager.h
index 68b7ea641f..9d2fc8b227 100644
--- a/include/applications/pokedex/pokedex_text_manager.h
+++ b/include/applications/pokedex/pokedex_text_manager.h
@@ -25,14 +25,14 @@ typedef struct PokedexTextManager {
     BgConfig *bgConfig;
     PokedexTextData *textData;
     int numTextData;
-    enum HeapId heapID;
+    enum HeapID heapID;
 } PokedexTextManager;
 
 typedef struct PokedexTextManagerTemplate {
     SpriteList *spriteList;
     BgConfig *bgConfig;
     int numTextData;
-    enum HeapId heapID;
+    enum HeapID heapID;
 } PokedexTextManagerTemplate;
 
 typedef struct PokedexDisplayBox {
@@ -45,7 +45,7 @@ typedef struct PokedexDisplayBox {
     int spriteResourcePriority;
     int spriteListPriority;
     enum NNS_G2D_VRAM_TYPE vramType;
-    enum HeapId heapID;
+    enum HeapID heapID;
 } PokedexDisplayBox;
 
 PokedexTextManager *PokedexTextManager_New(const PokedexTextManagerTemplate *textManTemplate);
diff --git a/include/applications/pokedex/pokedex_updater.h b/include/applications/pokedex/pokedex_updater.h
index 7248187aae..f279a8b2b6 100644
--- a/include/applications/pokedex/pokedex_updater.h
+++ b/include/applications/pokedex/pokedex_updater.h
@@ -18,7 +18,7 @@ typedef struct PokedexUpdater {
     PokedexDataFunction dataFunc[3];
     PokedexGraphicsManager graphicsMan;
     PokedexGraphicsFunction graphicsFunc[3];
-    enum HeapId heapID;
+    enum HeapID heapID;
 } PokedexUpdater;
 
 typedef struct PokedexUpdaterTemplate {
@@ -28,7 +28,7 @@ typedef struct PokedexUpdaterTemplate {
     const PokedexGraphicsFunction *graphicsFunc;
 } PokedexUpdaterTemplate;
 
-PokedexUpdater *PokedexUpdater_New(enum HeapId heapID);
+PokedexUpdater *PokedexUpdater_New(enum HeapID heapID);
 void PokedexUpdater_PopulateUpdater(PokedexUpdater *pokedexUpdater, const PokedexUpdaterTemplate *pokedexUpdaterTemplate);
 BOOL PokedexUpdater_UpdateData(PokedexUpdater *pokedexUpdater);
 BOOL PokedexUpdater_UpdateGraphics(PokedexUpdater *pokedexUpdater);
diff --git a/include/applications/poketch/poketch_animation.h b/include/applications/poketch/poketch_animation.h
index 2d37065377..497ba82579 100644
--- a/include/applications/poketch/poketch_animation.h
+++ b/include/applications/poketch/poketch_animation.h
@@ -42,7 +42,7 @@ void PoketchAnimation_SetCParam(PoketchAnimation_AnimatedSpriteData *animatedSpr
 void PoketchAnimation_SetSpriteCharNo(PoketchAnimation_AnimatedSpriteData *animatedSprite, u32 value);
 void PoketchAnimation_SetMosaic(PoketchAnimation_AnimatedSpriteData *animatedSprite, BOOL isMosaic);
 void PoketchAnimation_SetSpriteRotation(PoketchAnimation_AnimatedSpriteData *animatedSprite, u16 rotation);
-BOOL PoketchAnimation_LoadSpriteFromNARC(PoketchAnimation_SpriteData *spriteData, enum NarcID narcID, u32 spriteID, u32 animID, enum HeapId heapID);
+BOOL PoketchAnimation_LoadSpriteFromNARC(PoketchAnimation_SpriteData *spriteData, enum NarcID narcID, u32 spriteID, u32 animID, enum HeapID heapID);
 void PoketchAnimation_FreeSpriteData(PoketchAnimation_SpriteData *spriteData);
 
 #endif // POKEPLATINUM_POKETCH_ANIMATION_H
diff --git a/include/bag.h b/include/bag.h
index 39bf9520d9..70e0ef2579 100644
--- a/include/bag.h
+++ b/include/bag.h
@@ -53,22 +53,22 @@ typedef struct BagCursor {
 } BagCursor;
 
 int Bag_SaveSize(void);
-Bag *Bag_New(enum HeapId heapID);
+Bag *Bag_New(enum HeapID heapID);
 void Bag_Init(Bag *bag);
 void Bag_Copy(const Bag *src, Bag *dst);
 u32 Bag_GetRegisteredItem(const Bag *bag);
 void Bag_RegisterItem(Bag *bag, u32 item);
-BOOL Bag_CanFitItem(Bag *bag, u16 item, u16 count, enum HeapId heapID);
-BOOL Bag_TryAddItem(Bag *bag, u16 item, u16 count, enum HeapId heapID);
-BOOL Bag_TryRemoveItem(Bag *bag, u16 item, u16 count, enum HeapId heapID);
-BOOL Pocket_TryRemoveItem(BagItem *pocket, u32 pocketSize, u16 item, u16 count, enum HeapId heapID);
-BOOL Bag_CanRemoveItem(Bag *bag, u16 item, u16 count, enum HeapId heapID);
+BOOL Bag_CanFitItem(Bag *bag, u16 item, u16 count, enum HeapID heapID);
+BOOL Bag_TryAddItem(Bag *bag, u16 item, u16 count, enum HeapID heapID);
+BOOL Bag_TryRemoveItem(Bag *bag, u16 item, u16 count, enum HeapID heapID);
+BOOL Pocket_TryRemoveItem(BagItem *pocket, u32 pocketSize, u16 item, u16 count, enum HeapID heapID);
+BOOL Bag_CanRemoveItem(Bag *bag, u16 item, u16 count, enum HeapID heapID);
 BOOL Bag_HasItemsInPocket(Bag *bag, u32 pocketID);
-u16 Bag_GetItemQuantity(Bag *bag, u16 item, enum HeapId heapID);
-u16 Pocket_GetItemQuantity(BagItem *pocket, u32 pocketSize, u16 item, enum HeapId heapID);
+u16 Bag_GetItemQuantity(Bag *bag, u16 item, enum HeapID heapID);
+u16 Pocket_GetItemQuantity(BagItem *pocket, u32 pocketSize, u16 item, enum HeapID heapID);
 void Pocket_SortEmpty(BagItem *pocket, const u32 size); // Moves empty slots to the end of the pocket
 void Pocket_Sort(BagItem *pocket, const u32 size); // Same as Pocket_SortEmpty, but also sorts by item ID
-void *sub_0207D824(Bag *bag, const u8 *pockets, enum HeapId heapID);
+void *sub_0207D824(Bag *bag, const u8 *pockets, enum HeapID heapID);
 BagItem *Bag_GetItemSlot(Bag *bag, u16 pocketID, u16 slot);
 Bag *SaveData_GetBag(SaveData *saveData);
 BagCursor *BagCursor_New(u32 heapID);
diff --git a/include/battle_anim/battle_anim_helpers.h b/include/battle_anim/battle_anim_helpers.h
index 169214555e..23215646df 100644
--- a/include/battle_anim/battle_anim_helpers.h
+++ b/include/battle_anim/battle_anim_helpers.h
@@ -209,11 +209,11 @@ BOOL Afterimage_Update(AfterimageContext *ctx);
 void RevolutionContext_InitOvalRevolutions(XYTransformContext *ctx, int revs, int stepsPerRev);
 void AlphaFadeContext_Init(AlphaFadeContext *ctx, s16 sev1, s16 eev1, s16 sev2, s16 eev2, int steps);
 BOOL AlphaFadeContext_IsDone(const AlphaFadeContext *ctx);
-CustomBgScrollContext *CustomBgScrollContext_New(u32 offsetReg, u32 initValue, enum HeapId heapID);
+CustomBgScrollContext *CustomBgScrollContext_New(u32 offsetReg, u32 initValue, enum HeapID heapID);
 void CustomBgScrollContext_Free(CustomBgScrollContext *ctx);
 void *CustomBgScrollContext_GetWriteBuffer(const CustomBgScrollContext *ctx);
 void CustomBgScrollContext_Stop(CustomBgScrollContext *ctx);
-BgScrollContext *BgScrollContext_New(u8 startY, u8 endY, u16 angleIncrement, fx32 amplitude, s16 speed, u32 bgID, u32 priority, u32 initValue, enum HeapId heapID);
+BgScrollContext *BgScrollContext_New(u8 startY, u8 endY, u16 angleIncrement, fx32 amplitude, s16 speed, u32 bgID, u32 priority, u32 initValue, enum HeapID heapID);
 void BgScrollContext_Free(BgScrollContext *ctx);
 void *BgScrollContext_GetWriteBuffer(const BgScrollContext *ctx);
 void BgScrollContext_Stop(BgScrollContext *ctx);
@@ -225,7 +225,7 @@ void ov12_0222676C(s16 param0, s16 param1, s16 param2, s16 param3, u16 *param4);
 BOOL ov12_022267A8(int *param0, int param1, s32 param2);
 BOOL PaletteFadeContext_IsActive(PaletteFadeContext *ctx);
 void PaletteFadeContext_Free(PaletteFadeContext *ctx);
-PaletteFadeContext *PaletteFadeContext_New(PaletteData *paletteData, enum HeapId heapID, enum PaletteBufferID bufferID, u16 index, u16 count, s8 stepFrames, s8 step, u8 startFrac, u8 endFrac, u16 color, int priority);
+PaletteFadeContext *PaletteFadeContext_New(PaletteData *paletteData, enum HeapID heapID, enum PaletteBufferID bufferID, u16 index, u16 count, s8 stepFrames, s8 step, u8 startFrac, u8 endFrac, u16 color, int priority);
 void BattleAnimUtil_MakeBgPalsGrayscale(BattleAnimSystem *ctx);
 void BattleAnimUtil_ReturnBgPalsToNormal(BattleAnimSystem *ctx);
 
diff --git a/include/battle_anim/battle_anim_system.h b/include/battle_anim/battle_anim_system.h
index fbb9e679f1..2f5527d2c3 100644
--- a/include/battle_anim/battle_anim_system.h
+++ b/include/battle_anim/battle_anim_system.h
@@ -192,7 +192,7 @@ typedef struct BgTrackingTask {
 } BgTrackingTask;
 
 typedef struct BattleAnimSystem {
-    enum HeapId heapID;
+    enum HeapID heapID;
     enum NarcID moveArcID;
     BOOL isContest;
     BOOL isActive;
@@ -234,10 +234,10 @@ typedef struct BattleAnimSystem {
 
 typedef void (*BattleAnimScriptCmd)(BattleAnimSystem *);
 
-BattleAnimSystem *BattleAnimSystem_New(enum HeapId heapID);
+BattleAnimSystem *BattleAnimSystem_New(enum HeapID heapID);
 void BattleAnimSystem_SetIsContest(BattleAnimSystem *system, BOOL isContest);
 BOOL BattleAnimSystem_IsContest(BattleAnimSystem *system);
-enum HeapId BattleAnimSystem_GetHeapID(BattleAnimSystem *system);
+enum HeapID BattleAnimSystem_GetHeapID(BattleAnimSystem *system);
 BOOL BattleAnimSystem_Delete(BattleAnimSystem *system);
 BOOL BattleAnimSystem_StartMove(BattleAnimSystem *system, UnkStruct_ov16_02265BBC *param1, u16 move, BattleAnimBattlerContext *param3);
 BOOL BattleAnimSystem_ExecuteScript(BattleAnimSystem *system);
diff --git a/include/battle_anim/battle_particle_util.h b/include/battle_anim/battle_particle_util.h
index 90ab7a00c4..66b3dba6ee 100644
--- a/include/battle_anim/battle_particle_util.h
+++ b/include/battle_anim/battle_particle_util.h
@@ -4,10 +4,10 @@
 #include "narc.h"
 #include "particle_system.h"
 
-ParticleSystem *BattleParticleUtil_CreateParticleSystem(enum HeapId heapID, int narcMemberIndex, BOOL uploadResImmediately);
-ParticleSystem *BattleParticleUtil_CreateParticleSystemEx(enum HeapId heapID, enum NarcID narcID, int memberIndex, BOOL uploadResImmediately);
-void *BattleParticleUtil_ReadMemberFromNARC(NARC *param0, int param1, enum HeapId heapID);
-ParticleSystem *ov12_0222384C(NARC *param0, enum HeapId heapID, int param2, BOOL param3);
+ParticleSystem *BattleParticleUtil_CreateParticleSystem(enum HeapID heapID, int narcMemberIndex, BOOL uploadResImmediately);
+ParticleSystem *BattleParticleUtil_CreateParticleSystemEx(enum HeapID heapID, enum NarcID narcID, int memberIndex, BOOL uploadResImmediately);
+void *BattleParticleUtil_ReadMemberFromNARC(NARC *param0, int param1, enum HeapID heapID);
+ParticleSystem *ov12_0222384C(NARC *param0, enum HeapID heapID, int param2, BOOL param3);
 SPLEmitter *BattleParticleUtil_CreateEmitter(ParticleSystem *param0, int param1, int param2, void *param3);
 void BattleParticleUtil_FreeParticleSystem(ParticleSystem *param0);
 
diff --git a/include/berry_patches.h b/include/berry_patches.h
index 8503c2ff36..d572dedf3f 100644
--- a/include/berry_patches.h
+++ b/include/berry_patches.h
@@ -48,8 +48,8 @@ typedef struct BerryGrowthData {
 } BerryGrowthData;
 
 void BerryPatches_Clear(BerryPatch *patches);
-void BerryPatches_Init(BerryPatch *patches, enum HeapId heapID, const u16 *initPatches, int initSize);
-BerryGrowthData *BerryGrowthData_Init(enum HeapId heapID);
+void BerryPatches_Init(BerryPatch *patches, enum HeapID heapID, const u16 *initPatches, int initSize);
+BerryGrowthData *BerryGrowthData_Init(enum HeapID heapID);
 enum BerryGrowthStage BerryPatches_GetPatchGrowthStage(const BerryPatch *patches, int patchID);
 int BerryPatches_GetPatchBerryID(const BerryPatch *patches, int patchID);
 enum SoilMoisture BerryPatches_GetPatchMoisture(const BerryPatch *patches, int patchID);
diff --git a/include/buffer_manager.h b/include/buffer_manager.h
index 0950f3b7a5..8ec39cd512 100644
--- a/include/buffer_manager.h
+++ b/include/buffer_manager.h
@@ -18,7 +18,7 @@ typedef struct BufferManager {
     u8 padding[2];
 } BufferManager;
 
-BufferManager *BufferManager_New(enum HeapId heapID, void *buffer1, void *buffer2);
+BufferManager *BufferManager_New(enum HeapID heapID, void *buffer1, void *buffer2);
 void BufferManager_Delete(BufferManager *bufferManager);
 void *BufferManager_GetWriteBuffer(const BufferManager *bufferManager);
 const void *BufferManager_GetReadBuffer(const BufferManager *bufferManager);
diff --git a/include/camera.h b/include/camera.h
index 82371bad90..e828820720 100644
--- a/include/camera.h
+++ b/include/camera.h
@@ -69,9 +69,9 @@ typedef struct Camera {
 
 extern GXBufferMode gBufferMode;
 
-void Camera_InitHistory(int historySize, int delay, int delayMask, enum HeapId heapID, Camera *camera);
+void Camera_InitHistory(int historySize, int delay, int delayMask, enum HeapID heapID, Camera *camera);
 void Camera_DeleteHistory(Camera *camera);
-Camera *Camera_Alloc(const enum HeapId heapID);
+Camera *Camera_Alloc(const enum HeapID heapID);
 void Camera_Delete(Camera *camera);
 void Camera_Copy(Camera const *src, Camera *dst);
 void Camera_SetAsActive(Camera *camera);
diff --git a/include/cell_transfer.h b/include/cell_transfer.h
index 4b8c28a80d..6fee824ffd 100644
--- a/include/cell_transfer.h
+++ b/include/cell_transfer.h
@@ -5,7 +5,7 @@
 
 #include "constants/heap.h"
 
-NNSG2dCellTransferState *CellTransfer_New(int capacity, enum HeapId heapID);
+NNSG2dCellTransferState *CellTransfer_New(int capacity, enum HeapID heapID);
 void CellTransfer_Update(void);
 void CellTransfer_Free(NNSG2dCellTransferState *transferStates);
 
diff --git a/include/char_transfer.h b/include/char_transfer.h
index cf9ea72e84..1686f09163 100644
--- a/include/char_transfer.h
+++ b/include/char_transfer.h
@@ -10,7 +10,7 @@ typedef struct CharTransferTemplate {
     int maxTasks;
     int sizeMain;
     int sizeSub;
-    enum HeapId heapID;
+    enum HeapID heapID;
 } CharTransferTemplate;
 
 typedef struct CharTransferTemplateWithModes {
diff --git a/include/constants/heap.h b/include/constants/heap.h
index 9de31797cf..35daec7064 100644
--- a/include/constants/heap.h
+++ b/include/constants/heap.h
@@ -1,19 +1,19 @@
 #ifndef POKEPLATINUM_CONSTANTS_HEAP_H
 #define POKEPLATINUM_CONSTANTS_HEAP_H
 
-enum HeapId {
+enum HeapID {
     HEAP_ID_SYSTEM = 0,
     HEAP_ID_SAVE,
     HEAP_ID_DEBUG,
     HEAP_ID_APPLICATION,
-    HEAP_ID_FIELD,
+    HEAP_ID_FIELD1,
     HEAP_ID_BATTLE,
     HEAP_ID_6,
     HEAP_ID_POKETCH_MAIN,
     HEAP_ID_POKETCH_APP,
     HEAP_ID_BOX_DATA,
     HEAP_ID_BOX_GRAPHICS,
-    HEAP_ID_FIELDMAP,
+    HEAP_ID_FIELD2,
     HEAP_ID_12,
     HEAP_ID_13,
     HEAP_ID_14,
@@ -34,7 +34,7 @@ enum HeapId {
     HEAP_ID_MINING,
     HEAP_ID_DISTORTION_WORLD_WARP,
     HEAP_ID_31,
-    HEAP_ID_FIELD_TASK,
+    HEAP_ID_FIELD3,
     HEAP_ID_33,
     HEAP_ID_34,
     HEAP_ID_35,
diff --git a/include/field_battle_data_transfer.h b/include/field_battle_data_transfer.h
index 46140b3b14..ea33c4e562 100644
--- a/include/field_battle_data_transfer.h
+++ b/include/field_battle_data_transfer.h
@@ -79,10 +79,10 @@ typedef struct FieldBattleDTO {
     u32 unk_19C;
 } FieldBattleDTO;
 
-FieldBattleDTO *FieldBattleDTO_New(enum HeapId heapID, u32 battleType);
-FieldBattleDTO *FieldBattleDTO_NewSafari(enum HeapId heapID, int countSafariBalls);
-FieldBattleDTO *FieldBattleDTO_NewPalPark(enum HeapId heapID, int countParkBalls);
-FieldBattleDTO *FieldBattleDTO_NewCatchingTutorial(enum HeapId heapID, const FieldSystem *fieldSystem);
+FieldBattleDTO *FieldBattleDTO_New(enum HeapID heapID, u32 battleType);
+FieldBattleDTO *FieldBattleDTO_NewSafari(enum HeapID heapID, int countSafariBalls);
+FieldBattleDTO *FieldBattleDTO_NewPalPark(enum HeapID heapID, int countParkBalls);
+FieldBattleDTO *FieldBattleDTO_NewCatchingTutorial(enum HeapID heapID, const FieldSystem *fieldSystem);
 void FieldBattleDTO_Free(FieldBattleDTO *dto);
 void FieldBattleDTO_AddPokemonToBattler(FieldBattleDTO *dto, Pokemon *src, int battler);
 void FieldBattleDTO_CopyPartyToBattler(FieldBattleDTO *dto, const Party *src, int battler);
diff --git a/include/g3d_pipeline.h b/include/g3d_pipeline.h
index 9eac1b59b2..e747e66a51 100644
--- a/include/g3d_pipeline.h
+++ b/include/g3d_pipeline.h
@@ -4,7 +4,7 @@
 #include "constants/heap.h"
 
 typedef struct G3DPipelineBuffers {
-    enum HeapId heapID;
+    enum HeapID heapID;
     void *paletteBuffer;
     void *textureBuffer;
 } G3DPipelineBuffers;
@@ -32,10 +32,10 @@ enum PaletteVramSize {
 
 typedef void (*G3DPipelineSetupCallback)(void);
 
-G3DPipelineBuffers *G3DPipeline_InitEx(enum HeapId heapID, enum VramManagerType texVramManagerType, enum TextureVramSize texVramSize, enum VramManagerType plttVramManagerType, enum PaletteVramSize plttVramSize, G3DPipelineSetupCallback cb);
+G3DPipelineBuffers *G3DPipeline_InitEx(enum HeapID heapID, enum VramManagerType texVramManagerType, enum TextureVramSize texVramSize, enum VramManagerType plttVramManagerType, enum PaletteVramSize plttVramSize, G3DPipelineSetupCallback cb);
 void G3DPipelineBuffers_Free(G3DPipelineBuffers *state);
 
-static inline G3DPipelineBuffers *G3DPipeline_Init(enum HeapId heapID, enum TextureVramSize texVramSize, enum PaletteVramSize plttVramSize, G3DPipelineSetupCallback cb)
+static inline G3DPipelineBuffers *G3DPipeline_Init(enum HeapID heapID, enum TextureVramSize texVramSize, enum PaletteVramSize plttVramSize, G3DPipelineSetupCallback cb)
 {
     return G3DPipeline_InitEx(heapID, VRAM_MANAGER_TYPE_LINKED_LIST, texVramSize, VRAM_MANAGER_TYPE_LINKED_LIST, plttVramSize, cb);
 }
diff --git a/include/heap.h b/include/heap.h
index 5af2f8ddbb..744525494e 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -1,5 +1,5 @@
-#ifndef POKEPLATINUM_UNK_02017E74_H
-#define POKEPLATINUM_UNK_02017E74_H
+#ifndef POKEPLATINUM_HEAP_H
+#define POKEPLATINUM_HEAP_H
 
 #include <nnsys.h>
 
@@ -11,16 +11,16 @@ typedef struct HeapParam {
 } HeapParam;
 
 void Heap_InitSystem(const HeapParam *templates, u32 nTemplates, u32 totalNumHeaps, u32 preSize);
-BOOL Heap_Create(u32 parent, u32 child, u32 size);
-BOOL Heap_CreateAtEnd(u32 parent, u32 child, u32 size);
-void Heap_Destroy(u32 heapID);
-void *Heap_AllocFromHeap(u32 heapID, u32 size);
-void *Heap_AllocFromHeapAtEnd(u32 heapID, u32 size);
+BOOL Heap_Create(enum HeapID parent, enum HeapID child, u32 size);
+BOOL Heap_CreateAtEnd(enum HeapID parent, enum HeapID child, u32 size);
+void Heap_Destroy(enum HeapID heapID);
+void *Heap_Alloc(u32 heapID, u32 size);
+void *Heap_AllocAtEnd(u32 heapID, u32 size);
 void Heap_Free(void *ptr);
 void Heap_FreeExplicit(u32 heapID, void *ptr);
-u32 Heap_FndGetTotalFreeSizeForExpHeap(u32 heapID);
-void Heap_FndInitAllocatorForExpHeap(NNSFndAllocator *pAllocator, u32 heapID, int alignment);
-void Heap_ReallocFromHeap(void *ptr, u32 newSize);
+u32 HeapExp_FndGetTotalFreeSize(u32 heapID);
+void HeapExp_FndInitAllocator(NNSFndAllocator *pAllocator, u32 heapID, int alignment);
+void Heap_Realloc(void *ptr, u32 newSize);
 BOOL GF_heap_c_dummy_return_true(u32 heapID);
 
-#endif // POKEPLATINUM_UNK_02017E74_H
+#endif // POKEPLATINUM_HEAP_H
diff --git a/include/item.h b/include/item.h
index 7762a8eace..f4abc3671b 100644
--- a/include/item.h
+++ b/include/item.h
@@ -328,7 +328,7 @@ u8 Item_IsHerbalMedicine(u16 item);
  * @param heapID    The heap which will own the item table's allocation.
  * @return The full table of item data.
  */
-void *ItemTable_Load(enum HeapId heapID);
+void *ItemTable_Load(enum HeapID heapID);
 
 /**
  * @brief Get the ItemData value at a given index from within a loaded table.
diff --git a/include/item_use_pokemon.h b/include/item_use_pokemon.h
index 2b63a34ecc..04e64b1802 100644
--- a/include/item_use_pokemon.h
+++ b/include/item_use_pokemon.h
@@ -4,10 +4,10 @@
 #include "party.h"
 #include "pokemon.h"
 
-u8 Pokemon_CheckItemEffects(Pokemon *mon, u16 itemId, u16 moveSlot, enum HeapId heapID);
-u8 Pokemon_ApplyItemEffects(Pokemon *mon, u16 itemId, u16 moveSlot, u16 location, enum HeapId heapID);
-u8 Party_CheckItemEffectsOnMember(Party *party, u16 itemId, u8 partySlot, u8 moveSlot, enum HeapId heapID);
-u8 Party_ApplyItemEffectsToMember(Party *party, u16 itemId, u8 partySlot, u8 moveSlot, u16 location, enum HeapId heapID);
+u8 Pokemon_CheckItemEffects(Pokemon *mon, u16 itemId, u16 moveSlot, enum HeapID heapID);
+u8 Pokemon_ApplyItemEffects(Pokemon *mon, u16 itemId, u16 moveSlot, u16 location, enum HeapID heapID);
+u8 Party_CheckItemEffectsOnMember(Party *party, u16 itemId, u8 partySlot, u8 moveSlot, enum HeapID heapID);
+u8 Party_ApplyItemEffectsToMember(Party *party, u16 itemId, u8 partySlot, u8 moveSlot, u16 location, enum HeapID heapID);
 void Party_HealAllMembers(Party *party);
 
 #endif // POKEPLATINUM_ITEM_USE_POKEMON_H
diff --git a/include/main_menu/distribution_cartridge.h b/include/main_menu/distribution_cartridge.h
index 7051dd5677..a496bee251 100644
--- a/include/main_menu/distribution_cartridge.h
+++ b/include/main_menu/distribution_cartridge.h
@@ -3,7 +3,7 @@
 
 #include "constants/heap.h"
 
-void DistributionCartridge_UseHeap(enum HeapId heapID);
+void DistributionCartridge_UseHeap(enum HeapID heapID);
 int DistributionCartridge_ReadLength(void);
 BOOL DistributionCartridge_ReadData(void *dest, int size);
 
diff --git a/include/main_menu/main_menu_util.h b/include/main_menu/main_menu_util.h
index 4fb8549236..e313411044 100644
--- a/include/main_menu/main_menu_util.h
+++ b/include/main_menu/main_menu_util.h
@@ -60,8 +60,8 @@ typedef struct MainMenuWindow {
     int renderDelay;
 } MainMenuWindow;
 
-void MainMenuUtil_Init(enum HeapId heapID);
-void *MainMenuUtil_InitAppAndFadeToBlack(ApplicationManager *appMan, enum HeapId heapID, int appDataSize, enum HeapSize heapSize);
+void MainMenuUtil_Init(enum HeapID heapID);
+void *MainMenuUtil_InitAppAndFadeToBlack(ApplicationManager *appMan, enum HeapID heapID, int appDataSize, enum HeapSize heapSize);
 void MainMenuUtil_InitBGLayer(BgConfig *bgConfig, enum BgLayer bgLayer, u8 screenSize, u32 screenBase, u32 charBase);
 void MainMenuUtil_SetFadeToWhite(BOOL enable);
 void MainMenuUtil_StartScreenFadeToState(enum FadeType fadeType, int destState, int *state, int waitState);
@@ -84,8 +84,8 @@ Sprite *MainMenuUtil_InitSprite(enum DSScreen screen, Sprite *sprite, int x, int
 void MainMenuUtil_FreeSprites(void);
 u32 MainMenuUtil_CalcMysteryGiftVersionBit(enum Version version);
 void MainMenuUtil_LoadGiftSprite(BgConfig *bgConfig, WonderCard *wonderCard);
-void MainMenuUtil_EncryptWonderCard(MysteryGiftEventData *eventData, WonderCard *wonderCard, enum HeapId heapID);
-void MainMenuUtil_DecryptReceivedWonderCard(MysteryGiftEventData *param0, WonderCard *param1, enum HeapId heapID);
+void MainMenuUtil_EncryptWonderCard(MysteryGiftEventData *eventData, WonderCard *wonderCard, enum HeapID heapID);
+void MainMenuUtil_DecryptReceivedWonderCard(MysteryGiftEventData *param0, WonderCard *param1, enum HeapID heapID);
 void MainMenuUtil_ListMenuCursorCB(ListMenu *param0, u32 param1, u8 param2);
 void MainMenuUtil_ToggleTerminateOnGBACartRemoved(BOOL enable);
 void MainMenuUtil_UnsetGBACartIRQFunc(void);
diff --git a/include/main_menu/wonder_cards_app.h b/include/main_menu/wonder_cards_app.h
index ff4035d2ac..38bb83ab3c 100644
--- a/include/main_menu/wonder_cards_app.h
+++ b/include/main_menu/wonder_cards_app.h
@@ -6,6 +6,6 @@
 #include "bg_window.h"
 #include "mystery_gift.h"
 
-void WonderCardsApp_ShowWondercard(BgConfig *bgConfig, WonderCard *wonderCard, enum HeapId heapID);
+void WonderCardsApp_ShowWondercard(BgConfig *bgConfig, WonderCard *wonderCard, enum HeapID heapID);
 
 #endif // POKEPLATINUM_WONDER_CARDS_APP_H
diff --git a/include/map_header_data.h b/include/map_header_data.h
index 1e5462c6f4..b64e0ed8a7 100644
--- a/include/map_header_data.h
+++ b/include/map_header_data.h
@@ -65,7 +65,7 @@ typedef struct MapHeaderData {
     WildEncounters wildEncounters;
 } MapHeaderData;
 
-void MapHeaderData_Init(FieldSystem *fieldSystem, enum HeapId heapID);
+void MapHeaderData_Init(FieldSystem *fieldSystem, enum HeapID heapID);
 void MapHeaderData_Free(FieldSystem *fieldSystem);
 void MapHeaderData_Load(FieldSystem *fieldSystem, int headerID);
 void sub_0203A418(FieldSystem *fieldSystem);
diff --git a/include/math_util.h b/include/math_util.h
index 464e246a9a..81a930f5cf 100644
--- a/include/math_util.h
+++ b/include/math_util.h
@@ -53,6 +53,6 @@ u32 SumBytes(const void *data, u32 size);
 void EncodeData(void *data, u32 size, u32 seed);
 void DecodeData(void *data, u32 size, u32 seed);
 u16 CalcCRC16Checksum(const void *data, u32 dataLen);
-void InitCRC16Table(enum HeapId heapID);
+void InitCRC16Table(enum HeapID heapID);
 
 #endif // POKEPLATINUM_MATH_UTIL_H
diff --git a/include/overlay005/hblank_system.h b/include/overlay005/hblank_system.h
index b8480cdaf7..928e97793d 100644
--- a/include/overlay005/hblank_system.h
+++ b/include/overlay005/hblank_system.h
@@ -20,7 +20,7 @@ typedef struct HBlankSystem {
     HBlankTask tasks[MAX_HBLANK_TASKS];
 } HBlankSystem;
 
-HBlankSystem *HBlankSystem_New(enum HeapId heapID);
+HBlankSystem *HBlankSystem_New(enum HeapID heapID);
 void HBlankSystem_Delete(HBlankSystem *hBlankSystem);
 void HBlankSystem_Start(HBlankSystem *hBlankSystem);
 void HBlankSystem_Stop(HBlankSystem *hBlankSystem);
diff --git a/include/overlay005/motion_blur.h b/include/overlay005/motion_blur.h
index b996f28d56..7a558d6f1c 100644
--- a/include/overlay005/motion_blur.h
+++ b/include/overlay005/motion_blur.h
@@ -18,7 +18,7 @@ typedef struct MotionBlurParams {
     GXCaptureDest captureDestination;
     int blendCoeffA;
     int blendCoeffB;
-    enum HeapId heapID;
+    enum HeapID heapID;
 } MotionBlurParams;
 
 typedef struct MotionBlur {
diff --git a/include/overlay005/save_info_window.h b/include/overlay005/save_info_window.h
index cb74117b1b..1113c9e5eb 100644
--- a/include/overlay005/save_info_window.h
+++ b/include/overlay005/save_info_window.h
@@ -37,7 +37,7 @@ typedef struct SaveInfo {
 
 typedef struct SaveInfoWindow {
     FieldSystem *fieldSystem;
-    enum HeapId heapID;
+    enum HeapID heapID;
     u8 bgLayer;
     BgConfig *bgConfig;
     Window *window;
@@ -50,7 +50,7 @@ typedef struct SaveInfoWindow {
 
 void SaveInfoWindow_Draw(SaveInfoWindow *saveInfoWin);
 void SaveInfoWindow_Erase(SaveInfoWindow *saveInfoWin);
-SaveInfoWindow *SaveInfoWindow_New(FieldSystem *fieldSystem, enum HeapId heapID, u8 bgLayer);
+SaveInfoWindow *SaveInfoWindow_New(FieldSystem *fieldSystem, enum HeapID heapID, u8 bgLayer);
 void SaveInfoWindow_Free(SaveInfoWindow *saveInfoWin);
 BOOL FieldSystem_Save(FieldSystem *fieldSystem);
 void FieldSystem_SaveStateIfCommunicationOff(FieldSystem *fieldSystem);
diff --git a/include/overlay007/accessory_shop.h b/include/overlay007/accessory_shop.h
index eb191faf4b..bfb753e47c 100644
--- a/include/overlay007/accessory_shop.h
+++ b/include/overlay007/accessory_shop.h
@@ -98,11 +98,11 @@ typedef struct AccessoryShopItemList {
 typedef struct AccessoryShopYesNoChoice {
     BOOL active;
     Menu *menu;
-    enum HeapId heapID;
+    enum HeapID heapID;
 } AccessoryShopYesNoChoice;
 
 typedef struct AccessoryShopDataPtrs {
-    enum HeapId heapID;
+    enum HeapID heapID;
     BgConfig *bgConfig;
     AccessoryShopDescBox *descBox;
     const AccessoryShopItem *items;
@@ -116,7 +116,7 @@ typedef struct AccessoryShop {
     UnkStruct_02029D04 *unk_0C;
     Bag *bag;
     BgConfig *bgConfig;
-    enum HeapId heapID;
+    enum HeapID heapID;
     SpriteList *spriteList;
     G2dRenderer g2dRenderer;
     MessageLoader *msgLoader;
@@ -129,7 +129,7 @@ typedef struct AccessoryShop {
     AccessoryShopDataPtrs dataPtr;
 } AccessoryShop;
 
-AccessoryShop *AccessoryShop_New(enum HeapId heapID, SaveData *saveData, BgConfig *bgConfig);
+AccessoryShop *AccessoryShop_New(enum HeapID heapID, SaveData *saveData, BgConfig *bgConfig);
 void AccessoryShop_Free(AccessoryShop *shop);
 BOOL AccessoryShop_Main(AccessoryShop *shop);
 
diff --git a/include/overlay011/particle_helper.h b/include/overlay011/particle_helper.h
index 5cba33474f..071551dd82 100644
--- a/include/overlay011/particle_helper.h
+++ b/include/overlay011/particle_helper.h
@@ -3,8 +3,8 @@
 
 #include "particle_system.h"
 
-ParticleSystem *ParticleHelper_CreateParticleSystem(enum HeapId heapID);
-ParticleSystem *ov11_0221F888(enum HeapId heapID);
+ParticleSystem *ParticleHelper_CreateParticleSystem(enum HeapID heapID);
+ParticleSystem *ov11_0221F888(enum HeapID heapID);
 void ParticleHelper_FreeParticleSystem(ParticleSystem *param0);
 void ParticleHelper_DrawParticleSystems(void);
 
diff --git a/include/overlay070/ov70_0225C858.h b/include/overlay070/ov70_0225C858.h
index 89748a5767..1444551037 100644
--- a/include/overlay070/ov70_0225C858.h
+++ b/include/overlay070/ov70_0225C858.h
@@ -6,7 +6,7 @@
 #include "overlay063/struct_ov63_0222BCE8_decl.h"
 #include "overlay070/struct_ov70_0225C894_decl.h"
 
-UnkStruct_ov70_0225C894 *ov70_0225C858(enum HeapId heapID);
+UnkStruct_ov70_0225C894 *ov70_0225C858(enum HeapID heapID);
 void ov70_0225C894(UnkStruct_ov70_0225C894 *param0);
 u16 ov70_0225C8A8(const UnkStruct_ov70_0225C894 *param0);
 BOOL ov70_0225C8AC(const UnkStruct_ov70_0225C894 *param0, u16 param1, u16 param2);
diff --git a/include/overlay104/ov104_02231F74.h b/include/overlay104/ov104_02231F74.h
index 60308cd268..39d1d93d24 100644
--- a/include/overlay104/ov104_02231F74.h
+++ b/include/overlay104/ov104_02231F74.h
@@ -27,7 +27,7 @@ void ov104_02232624(UnkStruct_ov104_02232B5C *param0);
 void ov104_02232B5C(UnkStruct_ov104_02232B5C *param0);
 void ov104_02232B78(SysTask *param0, void *param1);
 void ov104_02232C80(UnkStruct_ov63_0222CCB8 *param0, UnkStruct_ov63_0222BEC0 *param1, int param2, int param3);
-void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, enum HeapId heapID, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9);
+void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, enum HeapID heapID, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9);
 void ov104_02232E80(UnkStruct_ov104_0223C4CC *param0, int param1);
 void ov104_02232EC0(UnkStruct_ov104_0223C4CC *param0);
 void ov104_02232F28(UnkStruct_ov104_0223C4CC *param0);
diff --git a/include/overlay_manager.h b/include/overlay_manager.h
index 55b2040a54..72d41694f7 100644
--- a/include/overlay_manager.h
+++ b/include/overlay_manager.h
@@ -28,9 +28,9 @@ struct ApplicationManager {
     ApplicationManager *child;
 };
 
-ApplicationManager *ApplicationManager_New(const ApplicationManagerTemplate *template, void *args, const enum HeapId heapID);
+ApplicationManager *ApplicationManager_New(const ApplicationManagerTemplate *template, void *args, const enum HeapID heapID);
 void ApplicationManager_Free(ApplicationManager *appMan);
-void *ApplicationManager_NewData(ApplicationManager *appMan, u32 size, enum HeapId heapID);
+void *ApplicationManager_NewData(ApplicationManager *appMan, u32 size, enum HeapID heapID);
 void *ApplicationManager_Data(ApplicationManager *appMan);
 void ApplicationManager_FreeData(ApplicationManager *appMan);
 void *ApplicationManager_Args(ApplicationManager *appMan);
diff --git a/include/pal_pad.h b/include/pal_pad.h
index 26635c7be3..54bd7d2aac 100644
--- a/include/pal_pad.h
+++ b/include/pal_pad.h
@@ -61,7 +61,7 @@ BOOL PalPad_AreTrainersEqual(const PalPad *first, const PalPad *second);
  * @param destination   The pad to push entries into
  * @param source        The pad to push from
  * @param numberToCopy  The number of elements to take from {source}
- * @param heapId        Heap area for pointer operations
+ * @param heapID        Heap area for pointer operations
  */
 void PalPad_PushEntries(PalPad *destination, PalPad *source, int numberToCopy, int heapID);
 
diff --git a/include/palette.h b/include/palette.h
index 626a82263b..4748b3be18 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -114,7 +114,7 @@ void BlendPalette(const u16 *src, u16 *dest, u16 size, u8 fraction, u16 target);
 void BlendPalettes(const u16 *sources, u16 *dests, u16 toBlend, u8 fraction, u16 target);
 void TintPalette(u16 *palette, int numColorsToTint, int tintR, int tintG, int tintB);
 
-PaletteData *PaletteData_New(enum HeapId heapID);
+PaletteData *PaletteData_New(enum HeapID heapID);
 void PaletteData_Free(PaletteData *paletteData);
 void PaletteData_InitBuffer(PaletteData *paletteData, enum PaletteBufferID bufferID, void *unfaded, void *faded, u32 size);
 void PaletteData_AllocBuffer(PaletteData *paletteData, enum PaletteBufferID bufferID, u32 size, u32 heapID);
diff --git a/include/particle_system.h b/include/particle_system.h
index 41dcca9071..14d6bae266 100644
--- a/include/particle_system.h
+++ b/include/particle_system.h
@@ -59,10 +59,10 @@ void ParticleSystem_ZeroAll(void);
 // When using a custom texture/palette allocator function, be sure to use
 // ParticleSystem_RegisterTextureKey or ParticleSystem_RegisterPaletteKey to register
 // allocated textures in the particle system.
-ParticleSystem *ParticleSystem_New(SPLTexVRAMAllocFunc texAllocFunc, SPLPalVRAMAllocFunc palAllocFunc, void *heap, int heapSize, BOOL hasCamera, enum HeapId heapID);
+ParticleSystem *ParticleSystem_New(SPLTexVRAMAllocFunc texAllocFunc, SPLPalVRAMAllocFunc palAllocFunc, void *heap, int heapSize, BOOL hasCamera, enum HeapID heapID);
 void ParticleSystem_Free(ParticleSystem *particleSystem);
 void ParticleSystem_FreeAll(void);
-void *ParticleSystem_LoadResourceFromNARC(enum NarcID narcID, int memberIndex, enum HeapId heapID);
+void *ParticleSystem_LoadResourceFromNARC(enum NarcID narcID, int memberIndex, enum HeapID heapID);
 void ParticleSystem_SetResource(ParticleSystem *particleSystem, void *resource, enum VRAMAutoRelease autoRelease, BOOL uploadImmediately);
 void ParticleSystem_RegisterTextureKey(NNSGfdTexKey key);
 void ParticleSystem_RegisterPaletteKey(NNSGfdPlttKey key);
diff --git a/include/party.h b/include/party.h
index ec0ef38c49..8b77b28e42 100644
--- a/include/party.h
+++ b/include/party.h
@@ -14,7 +14,7 @@ typedef struct Party {
 } Party;
 
 int Party_SaveSize(void);
-Party *Party_New(enum HeapId 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/pltt_transfer.h b/include/pltt_transfer.h
index c1e9dfe69a..75f94dea18 100644
--- a/include/pltt_transfer.h
+++ b/include/pltt_transfer.h
@@ -12,7 +12,7 @@ typedef struct PlttTransferTaskTemplate {
     u32 resourceID;
 } PlttTransferTaskTemplate;
 
-void PlttTransfer_Init(int capacity, enum HeapId heapID);
+void PlttTransfer_Init(int capacity, enum HeapID heapID);
 void PlttTransfer_MarkReservedSlots(u16 reservedMask, NNS_G2D_VRAM_TYPE vramType);
 void PlttTransfer_Free(void);
 void PlttTransfer_Clear(void);
diff --git a/include/pokedex.h b/include/pokedex.h
index a011196d4b..c6bafa7bdf 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -8,7 +8,7 @@
 #include "savedata.h"
 
 int Pokedex_SaveSize(void);
-Pokedex *Pokedex_New(enum HeapId 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/pokemon.h b/include/pokemon.h
index edcd6763d5..7db0fbaada 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -806,7 +806,7 @@ void PlayCryWithParams(ChatotCry *chatotCry, enum PokemonCryMod cryMod, u16 spec
  */
 void Species_PlayDelayedCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 species, int form, int pan, int volume, int forceDefaultChatot, int heapID, u8 delay);
 BOOL Pokemon_PlayCry(Pokemon *mon);
-void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *trainerInfo, int monPokeball, int metLocation, int metTerrain, enum HeapId heapID);
+void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *trainerInfo, int monPokeball, int metLocation, int metTerrain, enum HeapID heapID);
 void Pokemon_UpdateAfterCatch(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
 void Pokemon_GiveHeldItem(Pokemon *mon, u32 battleType, int itemRates);
 BOOL Pokemon_CanLearnTM(Pokemon *mon, u8 tmID);
diff --git a/include/pokemon_sprite.h b/include/pokemon_sprite.h
index 35412ab3e9..8f9fcf53a9 100644
--- a/include/pokemon_sprite.h
+++ b/include/pokemon_sprite.h
@@ -159,7 +159,7 @@ typedef struct PokemonSpriteManager {
     PokemonSprite sprites[MAX_MON_SPRITES];
     NNSG2dImageProxy imageProxy;
     NNSG2dImagePaletteProxy plttProxy;
-    enum HeapId heapID;
+    enum HeapID heapID;
     u32 charBaseAddr;
     u32 charSize;
     u32 plttBaseAddr;
@@ -188,7 +188,7 @@ typedef struct {
     const SpriteAnimationFrame *animFrames;
 } PokemonSpriteTaskAnim;
 
-void *PokemonSpriteManager_New(enum HeapId heapID);
+void *PokemonSpriteManager_New(enum HeapID heapID);
 void PokemonSpriteManager_DrawSprites(PokemonSpriteManager *monSpriteMan);
 void PokemonSpriteManager_Free(PokemonSpriteManager *monSpriteMan);
 void PokemonSprite_InitAnim(PokemonSprite *monSprite, int dummy);
diff --git a/include/render_oam.h b/include/render_oam.h
index 6085c4dbd3..a633190c50 100644
--- a/include/render_oam.h
+++ b/include/render_oam.h
@@ -25,13 +25,13 @@ void RenderOam_Init(int mainOamStart,
     int subOamCount,
     int subAffineOamStart,
     int subAffineOamCount,
-    enum HeapId heapID);
+    enum HeapID heapID);
 void RenderOam_InitSurface(NNSG2dRenderSurface *surface, NNSG2dViewRect *viewRect, NNSG2dSurfaceType surfaceType, NNSG2dRendererInstance *renderer);
 
 void RenderOam_Transfer(void);
 void RenderOam_Free(void);
 NNSG2dOamManagerInstance *RenderOam_GetScreenOam(enum DSScreen screen);
-void RenderOam_ClearMain(enum HeapId heapID);
-void RenderOam_ClearSub(enum HeapId heapID);
+void RenderOam_ClearMain(enum HeapID heapID);
+void RenderOam_ClearSub(enum HeapID heapID);
 
 #endif // POKEPLATINUM_RENDER_OAM_H
diff --git a/include/render_window.h b/include/render_window.h
index 6506275d2d..57c004d871 100644
--- a/include/render_window.h
+++ b/include/render_window.h
@@ -42,7 +42,7 @@ void *Window_AddWaitDial(Window *window, u32 baseTile);
 void DestroyWaitDial(void *taskData);
 void DestroyWaitDialTaskOnly(void *taskData);
 
-u8 *DrawPokemonPreview(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 palette, u16 baseTile, u16 species, u8 gender, enum HeapId heapID);
-u8 *DrawPokemonPreviewFromStruct(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 palette, u16 baseTile, Pokemon *mon, enum HeapId heapID);
+u8 *DrawPokemonPreview(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 palette, u16 baseTile, u16 species, u8 gender, enum HeapID heapID);
+u8 *DrawPokemonPreviewFromStruct(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 palette, u16 baseTile, Pokemon *mon, enum HeapID heapID);
 
 #endif // POKEPLATINUM_RENDER_WINDOW_H
diff --git a/include/resource_collection.h b/include/resource_collection.h
index 2817d1bf68..57ceed4995 100644
--- a/include/resource_collection.h
+++ b/include/resource_collection.h
@@ -39,11 +39,11 @@ typedef struct TextureResourceManager {
     TextureResource *textures;
 } TextureResourceManager;
 
-ResourceCollection *ResourceCollection_New(s32 maxResources, enum HeapId heapID);
+ResourceCollection *ResourceCollection_New(s32 maxResources, enum HeapID heapID);
 void ResourceCollection_Delete(ResourceCollection *collection);
 BOOL ResourceCollection_IsIDUnused(ResourceCollection *collection, int id);
 Resource *ResourceCollection_Add(ResourceCollection *collection, void *data, int id);
-Resource *ResourceCollection_AddFromFile(ResourceCollection *collection, const char *filename, int id, enum HeapId heapID);
+Resource *ResourceCollection_AddFromFile(ResourceCollection *collection, const char *filename, int id, enum HeapID heapID);
 void ResourceCollection_Remove(ResourceCollection *collection, Resource *resource);
 void ResourceCollection_Clear(ResourceCollection *collection);
 Resource *ResourceCollection_FindResource(ResourceCollection *collection, int id);
@@ -51,11 +51,11 @@ void *Resource_GetData(Resource *resource);
 void Resource_SetData(Resource *resource, void *data);
 int Resource_GetID(Resource *resource);
 
-TextureResourceManager *TextureResourceManager_New(s32 maxTextures, enum HeapId heapID);
+TextureResourceManager *TextureResourceManager_New(s32 maxTextures, enum HeapID heapID);
 void TextureResourceManager_Delete(TextureResourceManager *texMgr);
 BOOL TextureResourceManager_IsIDUnused(const TextureResourceManager *texMgr, int id);
-TextureResource *TextureResourceManager_AddTexture(const TextureResourceManager *texMgr, void *data, int id, enum TextureResourceMode mode, enum HeapId heapID);
-TextureResource *TextureResourceManager_AddTextureAndAllocVRam(TextureResourceManager *texMgr, void *data, int id, enum TextureResourceMode mode, enum HeapId heapID);
+TextureResource *TextureResourceManager_AddTexture(const TextureResourceManager *texMgr, void *data, int id, enum TextureResourceMode mode, enum HeapID heapID);
+TextureResource *TextureResourceManager_AddTextureAndAllocVRam(TextureResourceManager *texMgr, void *data, int id, enum TextureResourceMode mode, enum HeapID heapID);
 void TextureResourceManager_RemoveTexture(TextureResourceManager *texMgr, TextureResource *texResource);
 void TextureResourceManager_RemoveTextureWithID(TextureResourceManager *texMgr, int id);
 void TextureResourceManager_Clear(TextureResourceManager *texMgr);
diff --git a/include/screen_fade.h b/include/screen_fade.h
index 0d8a039f07..dfb9cb9160 100644
--- a/include/screen_fade.h
+++ b/include/screen_fade.h
@@ -94,7 +94,7 @@ typedef struct ScreenFade {
     void *data;
     HardwareWindowSettings *hwSettings;
     ScreenFadeHBlanks *hblanks;
-    enum HeapId heapID;
+    enum HeapID heapID;
     u16 color;
     // u8 padding_26[2];
 
@@ -102,7 +102,7 @@ typedef struct ScreenFade {
     enum FadeMethod method;
 } ScreenFade;
 
-void StartScreenFade(enum FadeMode mode, enum FadeType typeMain, enum FadeType typeSub, u16 color, int steps, int framesPerStep, enum HeapId heapID);
+void StartScreenFade(enum FadeMode mode, enum FadeType typeMain, enum FadeType typeSub, u16 color, int steps, int framesPerStep, enum HeapID heapID);
 void ExecScreenFade(void);
 BOOL IsScreenFadeDone(void);
 void FinishScreenFade(void);
@@ -113,7 +113,7 @@ void SetColorBrightness(u16 color);
 void SetupScreenFadeRegisters(enum DSScreen screen, u16 color);
 void SetScreenBackgroundColor(u16 color);
 void SetScreenMasterBrightness(enum DSScreen screen, int brightness);
-void RequestEnableScreenHBlank(ScreenFadeHBlanks *hblanks, void *data, Callback callback, enum DSScreen screen, enum HeapId heapID);
-void RequestDisableScreenHBlank(ScreenFadeHBlanks *hblanks, enum DSScreen screen, enum HeapId heapID);
+void RequestEnableScreenHBlank(ScreenFadeHBlanks *hblanks, void *data, Callback callback, enum DSScreen screen, enum HeapID heapID);
+void RequestDisableScreenHBlank(ScreenFadeHBlanks *hblanks, enum DSScreen screen, enum HeapID heapID);
 
 #endif // POKEPLATINUM_SCREEN_FADE_H
diff --git a/include/screen_scroll_manager.h b/include/screen_scroll_manager.h
index 0815817486..578eb34088 100644
--- a/include/screen_scroll_manager.h
+++ b/include/screen_scroll_manager.h
@@ -27,7 +27,7 @@ typedef struct ScreenScrollManager {
     s16 scrollSpeed;
 } ScreenScrollManager;
 
-ScreenScrollManager *ScreenScrollManager_New(enum HeapId heapID);
+ScreenScrollManager *ScreenScrollManager_New(enum HeapID heapID);
 void ScreenScrollManager_ScrollX(ScreenScrollManager *screenScrollMgr, u8 start, u8 end, u16 angleIncrement, fx32 amplitude, s16 speed, u32 bg, u32 initValue, u32 priority);
 void ScreenScrollManager_ScrollY(ScreenScrollManager *screenScrollMgr, u8 start, u8 end, u16 angleIncrement, fx32 amplitude, s16 speed, u32 bg, u32 initValue, u32 priority);
 void ScreenScrollManager_Stop(ScreenScrollManager *screenScrollMgr);
diff --git a/include/scroll_prompts.h b/include/scroll_prompts.h
index 1c2bb46a6a..99ed2323fa 100644
--- a/include/scroll_prompts.h
+++ b/include/scroll_prompts.h
@@ -18,7 +18,7 @@ typedef struct ScrollPrompts {
     ManagedSprite *arrowSprites[SCROLL_PROMPT_ARROW_COUNT];
 } ScrollPrompts;
 
-ScrollPrompts *ScrollPrompts_New(enum HeapId heapID);
+ScrollPrompts *ScrollPrompts_New(enum HeapID heapID);
 void ScrollPrompts_Free(ScrollPrompts *prompts);
 void ScrollPrompts_UpdateAnim(ScrollPrompts *prompts);
 void ScrollPrompts_SetPosition(ScrollPrompts *prompts, s16 x, s16 topArrowY, s16 bottomArrowY);
diff --git a/include/sprite.h b/include/sprite.h
index 04a026c77b..77f95a4d85 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -92,7 +92,7 @@ struct SpriteList {
 typedef struct SpriteListParams {
     int maxElements;
     NNSG2dRendererInstance *renderer;
-    enum HeapId heapID;
+    enum HeapID heapID;
 } SpriteListParams;
 
 typedef struct SpriteResourcesHeader {
@@ -126,7 +126,7 @@ typedef struct SpriteListTemplate {
     VecFx32 position;
     u32 priority;
     enum NNS_G2D_VRAM_TYPE vramType;
-    enum HeapId heapID;
+    enum HeapID heapID;
 } SpriteListTemplate;
 
 typedef struct AffineSpriteListTemplate {
@@ -137,7 +137,7 @@ typedef struct AffineSpriteListTemplate {
     u16 affineZRotation;
     u32 priority;
     enum NNS_G2D_VRAM_TYPE vramType;
-    enum HeapId heapID;
+    enum HeapID heapID;
 } AffineSpriteListTemplate;
 
 SpriteList *SpriteList_New(const SpriteListParams *params);
@@ -190,8 +190,8 @@ void Sprite_SetMosaicFlag(Sprite *sprite, BOOL mosaic);
 enum NNS_G2D_VRAM_TYPE Sprite_GetVRamType(const Sprite *sprite);
 BOOL Sprite_IsAnimated(Sprite *sprite);
 void Sprite_SetExplicitOAMMode(Sprite *sprite, GXOamMode mode);
-void Utility_Clear2DMainOAM(enum HeapId heapID);
-void Utility_Clear2DSubOAM(enum HeapId heapID);
+void Utility_Clear2DMainOAM(enum HeapID heapID);
+void Utility_Clear2DSubOAM(enum HeapID heapID);
 u32 Sprite_GetUserAttrForAnimFrame(const Sprite *sprite, u32 animID, u32 frame);
 u32 Sprite_GetUserAttrForCurrentAnimFrame(const Sprite *sprite);
 
diff --git a/include/sprite_resource.h b/include/sprite_resource.h
index e25a78ed78..b6499a08a8 100644
--- a/include/sprite_resource.h
+++ b/include/sprite_resource.h
@@ -64,23 +64,23 @@ typedef struct SpriteResourceList {
     int count;
 } SpriteResourceList;
 
-SpriteResourceCollection *SpriteResourceCollection_New(int capacity, enum SpriteResourceType type, enum HeapId heapID);
+SpriteResourceCollection *SpriteResourceCollection_New(int capacity, enum SpriteResourceType type, enum HeapID heapID);
 void SpriteResourceCollection_Delete(SpriteResourceCollection *spriteResources);
-SpriteResource *SpriteResourceCollection_AddFromTable(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, int index, enum HeapId heapID);
-SpriteResource *SpriteResourceCollection_AddTiles(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID);
-SpriteResource *SpriteResourceCollection_AddPalette(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID);
-SpriteResource *SpriteResourceCollection_Add(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, enum SpriteResourceType type, enum HeapId heapID);
-void SpriteResourceCollection_ModifyTiles(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, enum HeapId heapID);
-void SpriteResourceCollection_ModifyPalette(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, enum HeapId heapID);
-SpriteResource *SpriteResourceCollection_AddTilesFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID);
-SpriteResource *SpriteResourceCollection_AddTilesFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID, BOOL allocAtEnd);
-SpriteResource *SpriteResourceCollection_AddPaletteFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID);
-SpriteResource *SpriteResourceCollection_AddPaletteFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID, BOOL allocAtEnd);
-SpriteResource *SpriteResourceCollection_AddFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, enum SpriteResourceType type, enum HeapId heapID);
-void SpriteResourceCollection_ModifyTilesFrom(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, NARC *narc, int memberIdx, BOOL compressed, enum HeapId heapID);
-int SpriteResourceCollection_Extend(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, SpriteResourceList *outList, enum HeapId heapID);
-void SpriteResoureCollection_ExtendEx(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, int first, int count, SpriteResourceList *outList, enum HeapId heapID);
-SpriteResourceList *SpriteResourceList_New(int capacity, enum HeapId heapID);
+SpriteResource *SpriteResourceCollection_AddFromTable(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, int index, enum HeapID heapID);
+SpriteResource *SpriteResourceCollection_AddTiles(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapID heapID);
+SpriteResource *SpriteResourceCollection_AddPalette(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapID heapID);
+SpriteResource *SpriteResourceCollection_Add(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, enum SpriteResourceType type, enum HeapID heapID);
+void SpriteResourceCollection_ModifyTiles(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, enum HeapID heapID);
+void SpriteResourceCollection_ModifyPalette(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, enum HeapID heapID);
+SpriteResource *SpriteResourceCollection_AddTilesFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapID heapID);
+SpriteResource *SpriteResourceCollection_AddTilesFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapID heapID, BOOL allocAtEnd);
+SpriteResource *SpriteResourceCollection_AddPaletteFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapID heapID);
+SpriteResource *SpriteResourceCollection_AddPaletteFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapID heapID, BOOL allocAtEnd);
+SpriteResource *SpriteResourceCollection_AddFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, enum SpriteResourceType type, enum HeapID heapID);
+void SpriteResourceCollection_ModifyTilesFrom(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, NARC *narc, int memberIdx, BOOL compressed, enum HeapID heapID);
+int SpriteResourceCollection_Extend(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, SpriteResourceList *outList, enum HeapID heapID);
+void SpriteResoureCollection_ExtendEx(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, int first, int count, SpriteResourceList *outList, enum HeapID heapID);
+SpriteResourceList *SpriteResourceList_New(int capacity, enum HeapID heapID);
 void SpriteResourceList_Delete(SpriteResourceList *list);
 BOOL SpriteResourceCollection_IsIDUnused(const SpriteResourceCollection *spriteResources, int id);
 void SpriteResource_ReleaseData(SpriteResource *spriteRes);
@@ -100,7 +100,7 @@ int SpriteResource_GetPaletteIndex(const SpriteResource *spriteRes);
 void SpriteResource_SetVRAMType(SpriteResource *spriteRes, NNS_G2D_VRAM_TYPE vramType);
 int SpriteResourceTable_Size(void);
 SpriteResourceTable *SpriteResourceTable_GetArrayElement(SpriteResourceTable *table, int index);
-void SpriteResourceTable_LoadFromBinary(const void *data, SpriteResourceTable *table, enum HeapId heapID);
+void SpriteResourceTable_LoadFromBinary(const void *data, SpriteResourceTable *table, enum HeapID heapID);
 void SpriteResourceTable_Clear(SpriteResourceTable *table);
 int SpriteResourceTable_GetCount(const SpriteResourceTable *table);
 int SpriteResourceTable_GetEntryID(const SpriteResourceTable *table, int index);
diff --git a/include/sprite_system.h b/include/sprite_system.h
index 28e59b40ba..c3414fa082 100644
--- a/include/sprite_system.h
+++ b/include/sprite_system.h
@@ -16,7 +16,7 @@
 #define SPRITE_RESOURCE_NONE -1
 
 typedef struct SpriteSystem {
-    enum HeapId heapID;
+    enum HeapID heapID;
     int spriteManagerCount;
     BOOL inUse;
     NNSG2dCellTransferState *cellTransferStates;
@@ -86,7 +86,7 @@ typedef union SpriteResourceCapacities {
     } asStruct;
 } SpriteResourceCapacities;
 
-SpriteSystem *SpriteSystem_Alloc(enum HeapId heapID);
+SpriteSystem *SpriteSystem_Alloc(enum HeapID heapID);
 SpriteManager *SpriteManager_New(SpriteSystem *spriteSys);
 G2dRenderer *SpriteSystem_GetRenderer(SpriteSystem *spriteSys);
 BOOL SpriteSystem_Init(SpriteSystem *spriteSys, const RenderOamTemplate *oamTemplate, const CharTransferTemplateWithModes *transferTemplate, int plttCapacity);
diff --git a/include/sprite_util.h b/include/sprite_util.h
index 1cf143c5ce..0c1f8eeed3 100644
--- a/include/sprite_util.h
+++ b/include/sprite_util.h
@@ -43,7 +43,7 @@ void SpriteResourcesHeader_Init(SpriteResourcesHeader *resourceHeader,
 void SpriteResourcesHeader_Clear(SpriteResourcesHeader *resourceHeader);
 
 SpriteResourcesHeaderList *SpriteResourcesHeaderList_NewFromResdat(const ResdatTableEntry *resdatEntries,
-    enum HeapId heapID,
+    enum HeapID heapID,
     SpriteResourceCollection *charResources,
     SpriteResourceCollection *plttResources,
     SpriteResourceCollection *cellResources,
@@ -52,7 +52,7 @@ SpriteResourcesHeaderList *SpriteResourcesHeaderList_NewFromResdat(const ResdatT
     SpriteResourceCollection *manimResources);
 void SpriteResourcesHeaderList_Free(SpriteResourcesHeaderList *param0);
 
-SpriteList *SpriteList_InitRendering(int maxElements, G2dRenderer *g2dRenderer, enum HeapId heapID);
+SpriteList *SpriteList_InitRendering(int maxElements, G2dRenderer *g2dRenderer, enum HeapID heapID);
 void SetMainScreenViewRect(G2dRenderer *g2dRenderer, fx32 x, fx32 y);
 void SetSubScreenViewRect(G2dRenderer *g2dRenderer, fx32 x, fx32 y);
 void ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE vramType, GXOBJVRamModeChar vramMode);
diff --git a/include/system.h b/include/system.h
index bf3f8b8eca..49fd2a0edc 100644
--- a/include/system.h
+++ b/include/system.h
@@ -84,7 +84,7 @@ void ReadKeypadAndTouchpad(void);
 void SetAutorepeat(int rate, int delay);
 void ResetLock(u8 mask);
 void ResetUnlock(u8 mask);
-void InitHeapCanary(enum HeapId param0);
+void InitHeapCanary(enum HeapID param0);
 void FreeHeapCanary(void);
 BOOL HeapCanaryOK(void);
 
diff --git a/include/trainer_info.h b/include/trainer_info.h
index 076ca9024c..cde005a449 100644
--- a/include/trainer_info.h
+++ b/include/trainer_info.h
@@ -35,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(enum HeapId 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_020131EC.h b/include/unk_020131EC.h
index feca306c87..18632a4eac 100644
--- a/include/unk_020131EC.h
+++ b/include/unk_020131EC.h
@@ -9,12 +9,12 @@
 void sub_020133D4(enum NarcID narcID, int param1, int param2, int param3, int param4, int param5, int param6, void *param7);
 void sub_020134E4(int param0, int param1, int param2, int param3, int param4, int param5, int *param6, const void *param7, void *param8);
 void sub_02013560(int param0, int param1, const UnkStruct_02013610 *param2, int *param3, const void *param4, void *param5);
-void sub_020135F0(enum NarcID narcID, int param1, enum HeapId heapID, const UnkStruct_02013610 *param3, void *param4);
-void sub_02013610(enum NarcID narcID, int param1, enum HeapId heapID, void *param3);
-void *sub_0201363C(enum NarcID narcID, int param1, enum HeapId heapID);
-void *sub_02013660(enum NarcID narcID, int param1, enum HeapId heapID);
-void sub_020136A4(enum NarcID narcID, int param1, enum HeapId heapID, int param3, int param4, int param5, int param6, void *param7, u32 param8, BOOL param9, int param10, int param11);
-void sub_02013720(enum NarcID narcID, int param1, enum HeapId heapID, const UnkStruct_02013610 *param3, void *param4, u32 param5, BOOL param6, int param7, int param8);
-void sub_02013750(enum NarcID narcID, int charID, enum HeapId heapID, void *param3, u32 personality, BOOL param5, int param6, int param7);
+void sub_020135F0(enum NarcID narcID, int param1, enum HeapID heapID, const UnkStruct_02013610 *param3, void *param4);
+void sub_02013610(enum NarcID narcID, int param1, enum HeapID heapID, void *param3);
+void *sub_0201363C(enum NarcID narcID, int param1, enum HeapID heapID);
+void *sub_02013660(enum NarcID narcID, int param1, enum HeapID heapID);
+void sub_020136A4(enum NarcID narcID, int param1, enum HeapID heapID, int param3, int param4, int param5, int param6, void *param7, u32 param8, BOOL param9, int param10, int param11);
+void sub_02013720(enum NarcID narcID, int param1, enum HeapID heapID, const UnkStruct_02013610 *param3, void *param4, u32 param5, BOOL param6, int param7, int param8);
+void sub_02013750(enum NarcID narcID, int charID, enum HeapID heapID, void *param3, u32 personality, BOOL param5, int param6, int param7);
 
 #endif // POKEPLATINUM_UNK_020131EC_H
diff --git a/include/unk_02030880.h b/include/unk_02030880.h
index 328c587ea0..351044c2ca 100644
--- a/include/unk_02030880.h
+++ b/include/unk_02030880.h
@@ -12,6 +12,6 @@ void Frontier_Extra_Init(BattleFrontierStage *param0);
 BattleFrontierStage *sub_020308A0(SaveData *saveData, int param1, int *param2);
 int sub_020308A8(SaveData *saveData, BattleFrontierStage *param1);
 u16 sub_020308BC(SaveData *saveData, BattleFrontierStage *param1, int param2, int param3);
-BOOL sub_020309A0(SaveData *saveData, int param1, int param2, int param3, int param4, enum HeapId heapID, int *param6, int *param7);
+BOOL sub_020309A0(SaveData *saveData, int param1, int param2, int param3, int param4, enum HeapID heapID, int *param6, int *param7);
 
 #endif // POKEPLATINUM_UNK_02030880_H
diff --git a/include/unk_0203D1B8.h b/include/unk_0203D1B8.h
index e3fe7fc5d7..2e1dfce897 100644
--- a/include/unk_0203D1B8.h
+++ b/include/unk_0203D1B8.h
@@ -46,7 +46,7 @@ void *sub_0203D578(int param0, FieldSystem *fieldSystem, int param2, int param3,
 void *sub_0203D5C8(int param0, FieldSystem *fieldSystem, int param2);
 void *sub_0203D644(FieldSystem *fieldSystem, int param1);
 PokemonSummary *sub_0203D670(FieldSystem *fieldSystem, int heapID, int mode);
-void *FieldSystem_OpenSummaryScreenSelectMove(enum HeapId heapID, FieldSystem *fieldSystem, u8 partyIndex);
+void *FieldSystem_OpenSummaryScreenSelectMove(enum HeapID heapID, FieldSystem *fieldSystem, u8 partyIndex);
 int PokemonSummary_GetSelectedMoveSlot(void *summary);
 void FieldSystem_OpenPokemonStorage(FieldSystem *fieldSystem, PokemonStorageSession *pokemonStorageSession);
 void sub_0203D80C(FieldTask *param0, u16 *param1, u16 *param2, u16 *param3);
diff --git a/include/unk_02054884.h b/include/unk_02054884.h
index 4cc4d825f9..67ee8a714f 100644
--- a/include/unk_02054884.h
+++ b/include/unk_02054884.h
@@ -8,7 +8,7 @@
 #define PARTY_SLOT_NONE 0xFF
 
 BOOL Pokemon_CanBattle(Pokemon *mon);
-BOOL Pokemon_GiveMonFromScript(enum HeapId heapID, SaveData *saveData, u16 species, u8 level, u16 heldItem, int metLocation, int metTerrain);
+BOOL Pokemon_GiveMonFromScript(enum HeapID heapID, SaveData *saveData, u16 species, u8 level, u16 heldItem, int metLocation, int metTerrain);
 BOOL sub_02054930(int unused, SaveData *saveData, u16 param2, u8 param3, int param4, int param5);
 void sub_02054988(Party *party, int param1, int param2, u16 param3);
 int Party_HasMonWithMove(Party *party, u16 moveID);
diff --git a/include/vram_transfer.h b/include/vram_transfer.h
index e03e98ce5e..f2dc5a1125 100644
--- a/include/vram_transfer.h
+++ b/include/vram_transfer.h
@@ -3,7 +3,7 @@
 
 #include "constants/heap.h"
 
-void VramTransfer_New(u32 capacity, enum HeapId heapID);
+void VramTransfer_New(u32 capacity, enum HeapID heapID);
 void VramTransfer_Free(void);
 BOOL VramTransfer_Request(NNS_GFD_DST_TYPE type, u32 destAddr, void *buf, u32 size);
 void VramTransfer_Process(void);
diff --git a/src/applications/naming_screen.c b/src/applications/naming_screen.c
index 27f527b24f..8e58fbed0a 100644
--- a/src/applications/naming_screen.c
+++ b/src/applications/naming_screen.c
@@ -1472,13 +1472,13 @@ static BOOL NamingScreen_Exit(ApplicationManager *appMan, int *unusedState)
 }
 
 NamingScreenArgs *NamingScreenArgs_Init(
-    enum HeapId heapID,
+    enum HeapID heapID,
     enum NamingScreenType type,
     int playerGenderOrMonSpecies,
     int maxChars,
     Options *options)
 {
-    NamingScreenArgs *args = (NamingScreenArgs *)Heap_AllocFromHeap(heapID, sizeof(NamingScreenArgs));
+    NamingScreenArgs *args = (NamingScreenArgs *)Heap_Alloc(heapID, sizeof(NamingScreenArgs));
 
     args->type = type;
     args->playerGenderOrMonSpecies = playerGenderOrMonSpecies;
diff --git a/src/applications/options_menu.c b/src/applications/options_menu.c
index 868f3f5dc3..f5b49819f7 100644
--- a/src/applications/options_menu.c
+++ b/src/applications/options_menu.c
@@ -77,7 +77,7 @@ typedef struct OptionsMenuEntry {
 } OptionsMenuEntry;
 
 typedef struct OptionsMenuData {
-    enum HeapId heapID;
+    enum HeapID heapID;
     int state;
     int subState;
     int dummy0C;
@@ -545,7 +545,7 @@ static void LoadBgTiles(OptionsMenuData *menuData)
     NARC *narc = NARC_ctor(NARC_INDEX_GRAPHIC__CONFIG_GRA, menuData->heapID);
 
     u32 memberSize = NARC_GetMemberSize(narc, tiles_NCGR);
-    void *memberBuffer = Heap_AllocFromHeapAtEnd(menuData->heapID, memberSize);
+    void *memberBuffer = Heap_AllocAtEnd(menuData->heapID, memberSize);
     NARC_ReadWholeMember(narc, tiles_NCGR, memberBuffer);
     NNS_G2dGetUnpackedCharacterData(memberBuffer, &cursorTiles);
     Bg_LoadTiles(menuData->bgConfig, BG_LAYER_MAIN_0, cursorTiles->pRawData, cursorTiles->szByte, 0);
@@ -553,7 +553,7 @@ static void LoadBgTiles(OptionsMenuData *menuData)
     Heap_Free(memberBuffer);
 
     memberSize = NARC_GetMemberSize(narc, tiles_NCLR);
-    memberBuffer = Heap_AllocFromHeapAtEnd(menuData->heapID, memberSize);
+    memberBuffer = Heap_AllocAtEnd(menuData->heapID, memberSize);
     NARC_ReadWholeMember(narc, tiles_NCLR, memberBuffer);
     NNS_G2dGetUnpackedPaletteData(memberBuffer, &cursorPalette);
     Bg_LoadPalette(BG_LAYER_MAIN_0, cursorPalette->pRawData, PALETTE_SIZE_BYTES, 0);
@@ -561,7 +561,7 @@ static void LoadBgTiles(OptionsMenuData *menuData)
     Heap_Free(memberBuffer);
 
     memberSize = NARC_GetMemberSize(narc, tilemap_bin);
-    menuData->nscrBuffer = Heap_AllocFromHeap(menuData->heapID, memberSize);
+    menuData->nscrBuffer = Heap_Alloc(menuData->heapID, memberSize);
     NARC_ReadWholeMember(narc, tilemap_bin, menuData->nscrBuffer);
     NNS_G2dGetUnpackedScreenData(menuData->nscrBuffer, &(menuData->tilemapData));
 
diff --git a/src/applications/pc_boxes/box_app_manager.c b/src/applications/pc_boxes/box_app_manager.c
index 6960e9bbeb..84421c5431 100644
--- a/src/applications/pc_boxes/box_app_manager.c
+++ b/src/applications/pc_boxes/box_app_manager.c
@@ -3307,7 +3307,7 @@ static void BoxAppMan_Load(BoxApplicationManager *boxAppMan, PokemonStorageSessi
     boxAppMan->natureNameLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_NATURE_NAMES, HEAP_ID_BOX_DATA);
     boxAppMan->abilityNameLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_ABILITY_NAMES, HEAP_ID_BOX_DATA);
     boxAppMan->MessageVariableBuffer = StringTemplate_Default(HEAP_ID_BOX_DATA);
-    boxAppMan->mon = Heap_AllocFromHeap(HEAP_ID_BOX_DATA, Pokemon_StructSize());
+    boxAppMan->mon = Heap_Alloc(HEAP_ID_BOX_DATA, Pokemon_StructSize());
 
     GF_ASSERT(boxAppMan->MessageVariableBuffer);
     boxAppMan->namingScreenArgs = NamingScreenArgs_Init(HEAP_ID_BOX_DATA, NAMING_SCREEN_TYPE_BOX, 0, BOX_NAME_LEN, boxAppMan->options);
@@ -3391,7 +3391,7 @@ static void BoxAppMan_InitCursor(BoxApplicationManager *boxAppMan)
 
 static void BoxMonSelection_Init(BoxMonSelection *selection)
 {
-    selection->boxMon = Heap_AllocFromHeap(HEAP_ID_BOX_DATA, MAX_MONS_PER_BOX * BoxPokemon_GetStructSize());
+    selection->boxMon = Heap_Alloc(HEAP_ID_BOX_DATA, MAX_MONS_PER_BOX * BoxPokemon_GetStructSize());
     selection->selectedMonCount = 0;
     selection->cursorMonIsPartyMon = FALSE;
 }
diff --git a/src/applications/pc_boxes/ov19_021D61B0.c b/src/applications/pc_boxes/ov19_021D61B0.c
index 32ebb13c5f..ebad57b3a6 100644
--- a/src/applications/pc_boxes/ov19_021D61B0.c
+++ b/src/applications/pc_boxes/ov19_021D61B0.c
@@ -206,7 +206,7 @@ static const struct {
 
 BOOL BoxGraphics_Load(UnkStruct_ov19_021D61B0 **param0, const BoxApplication *param1, const BoxApplicationManager *param2)
 {
-    UnkStruct_ov19_021D61B0 *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021D61B0));
+    UnkStruct_ov19_021D61B0 *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021D61B0));
 
     if (v0 != NULL) {
         v0->unk_1C4 = param1;
@@ -325,7 +325,7 @@ void BoxGraphics_TaskHandler(UnkStruct_ov19_021D61B0 *param0, enum BoxGraphicsFu
 
         for (u32 i = 0; i < 4; i++) {
             if (param0->unk_08[i] == NULL) {
-                taskParams = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(BoxTaskParams) + sBoxGraphicsTaskHandlers[function].unk_04);
+                taskParams = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(BoxTaskParams) + sBoxGraphicsTaskHandlers[function].unk_04);
 
                 if (taskParams != NULL) {
                     taskParams->function = function;
diff --git a/src/applications/pc_boxes/ov19_021D79F8.c b/src/applications/pc_boxes/ov19_021D79F8.c
index 58777c9834..ec5adc726e 100644
--- a/src/applications/pc_boxes/ov19_021D79F8.c
+++ b/src/applications/pc_boxes/ov19_021D79F8.c
@@ -439,7 +439,7 @@ static void ov19_021D81B8(UnkStruct_ov19_021D8318 *param0, int param1, int param
     UnkStruct_ov19_021D81B8 *v0;
 
     param0->unk_A3 = 0;
-    v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021D81B8));
+    v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021D81B8));
 
     if (v0) {
         v0->unk_00 = param0;
diff --git a/src/applications/pc_boxes/ov19_021D8B54.c b/src/applications/pc_boxes/ov19_021D8B54.c
index 3736099cef..1025d99ed9 100644
--- a/src/applications/pc_boxes/ov19_021D8B54.c
+++ b/src/applications/pc_boxes/ov19_021D8B54.c
@@ -534,7 +534,7 @@ BOOL ov19_021D9530(UnkStruct_ov19_021D8E00 *param0)
 
 static void ov19_021D9554(UnkStruct_ov19_021D8E00 *param0, Sprite *param1, fx32 param2, s32 param3, u32 param4)
 {
-    UnkStruct_ov19_021D9554 *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021D9554));
+    UnkStruct_ov19_021D9554 *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021D9554));
 
     if (v0) {
         VecFx32 v1;
diff --git a/src/applications/pc_boxes/ov19_021DA92C.c b/src/applications/pc_boxes/ov19_021DA92C.c
index d32a53613c..08293845fc 100644
--- a/src/applications/pc_boxes/ov19_021DA92C.c
+++ b/src/applications/pc_boxes/ov19_021DA92C.c
@@ -235,7 +235,7 @@ static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0)
 static void ov19_021DAC4C(UnkStruct_ov19_021DA9E0 *param0)
 {
     if (param0->unk_4C == NULL) {
-        UnkStruct_ov19_021DAE2C *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DAE2C));
+        UnkStruct_ov19_021DAE2C *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DAE2C));
 
         if (v0) {
             const PCMonPreview *preview = BoxApp_GetPCMonPreview(param0->unk_10);
diff --git a/src/applications/pc_boxes/ov19_021DB8E4.c b/src/applications/pc_boxes/ov19_021DB8E4.c
index 54e7a2f30e..def1a211f9 100644
--- a/src/applications/pc_boxes/ov19_021DB8E4.c
+++ b/src/applications/pc_boxes/ov19_021DB8E4.c
@@ -479,7 +479,7 @@ static void ov19_021DC034(UnkStruct_ov19_021DBA9C *param0, int param1)
         ov19_021DC0A0,
         ov19_021DC1CC,
     };
-    UnkStruct_ov19_021DC034 *v1 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DC034));
+    UnkStruct_ov19_021DC034 *v1 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DC034));
 
     if (v1) {
         v1->unk_00 = param0;
@@ -592,7 +592,7 @@ static void ov19_021DC1CC(SysTask *param0, void *param1)
 
 void ov19_021DC29C(UnkStruct_ov19_021DBA9C *param0)
 {
-    UnkStruct_ov19_021DC29C *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DC29C));
+    UnkStruct_ov19_021DC29C *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DC29C));
 
     if (v0) {
         u32 v1 = BoxApp_GetCursorOrPreviewedItem(param0->unk_0C);
@@ -655,7 +655,7 @@ static void ov19_021DC37C(SysTask *param0, void *param1)
 
 void ov19_021DC3F4(UnkStruct_ov19_021DBA9C *param0)
 {
-    UnkStruct_ov19_021DC29C *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DC29C));
+    UnkStruct_ov19_021DC29C *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DC29C));
 
     if (v0) {
         v0->unk_16 = 0;
diff --git a/src/applications/pc_boxes/ov19_021DC5F0.c b/src/applications/pc_boxes/ov19_021DC5F0.c
index b469b9a05a..fb7db1089c 100644
--- a/src/applications/pc_boxes/ov19_021DC5F0.c
+++ b/src/applications/pc_boxes/ov19_021DC5F0.c
@@ -66,7 +66,7 @@ BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 *param0, UnkStruct_ov19_021D61B0 *par
 
     ov19_021DA3CC(param0->unk_38, param0->unk_3C, 6);
 
-    param0->unk_1C = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(VecFx32) * 6 * 8);
+    param0->unk_1C = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(VecFx32) * 6 * 8);
     param0->unk_14 = Graphics_GetScrnDataFromOpenNARC(param5, 6, 1, &(param0->unk_18), HEAP_ID_BOX_GRAPHICS);
 
     if ((param0->unk_14 == NULL) || (param0->unk_1C == NULL)) {
diff --git a/src/applications/pc_boxes/ov19_021DCF88.c b/src/applications/pc_boxes/ov19_021DCF88.c
index 8e3ec2ab41..ddc735dd53 100644
--- a/src/applications/pc_boxes/ov19_021DCF88.c
+++ b/src/applications/pc_boxes/ov19_021DCF88.c
@@ -305,7 +305,7 @@ BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *pa
         *param0 = NULL;
         return 1;
     } else {
-        UnkStruct_ov19_021DCF88 *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DCF88));
+        UnkStruct_ov19_021DCF88 *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DCF88));
 
         if (v0) {
             int v1;
@@ -1142,7 +1142,7 @@ static void ov19_021DDD80(UnkStruct_ov19_021DCF88 *param0)
     UnkStruct_ov19_021DDBF8 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
+    v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
 
     if (v0) {
         SysTask *v2;
@@ -1257,7 +1257,7 @@ static void ov19_021DDFA8(UnkStruct_ov19_021DCF88 *param0)
     UnkStruct_ov19_021DDBF8 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
+    v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
 
     if (v0) {
         SysTask *v2;
@@ -1316,7 +1316,7 @@ static void ov19_021DE0A0(UnkStruct_ov19_021DCF88 *param0)
     UnkStruct_ov19_021DDBF8 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
+    v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
 
     if (v0) {
         SysTask *v2;
@@ -1440,7 +1440,7 @@ static void ov19_021DE2A4(UnkStruct_ov19_021DCF88 *param0)
     UnkStruct_ov19_021DDBF8 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
+    v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DDBF8));
 
     if (v0) {
         SysTask *v2;
diff --git a/src/applications/pc_boxes/ov19_021DE3E8.c b/src/applications/pc_boxes/ov19_021DE3E8.c
index d0b4b9eeca..507de84c4b 100644
--- a/src/applications/pc_boxes/ov19_021DE3E8.c
+++ b/src/applications/pc_boxes/ov19_021DE3E8.c
@@ -72,7 +72,7 @@ static void ov19_021DE8E0(SysTask *param0, void *param1);
 
 BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 **param0, UnkStruct_ov19_021D61B0 *param1, const BoxApplication *param2, BgConfig *param3, SpriteList *param4)
 {
-    UnkStruct_ov19_021DE3E8 *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DE3E8));
+    UnkStruct_ov19_021DE3E8 *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DE3E8));
 
     if (v0) {
         v0->unk_04 = param1;
@@ -332,7 +332,7 @@ BOOL ov19_021DE800(UnkStruct_ov19_021DE3E8 *param0)
 
 static void ov19_021DE858(UnkStruct_ov19_021DE3E8 *param0, int param1, const VecFx32 *param2, int param3, int param4)
 {
-    UnkStruct_ov19_021DE858 *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DE858));
+    UnkStruct_ov19_021DE858 *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DE858));
 
     if (v0) {
         v0->unk_00 = param0;
diff --git a/src/applications/pc_boxes/ov19_021DEC04.c b/src/applications/pc_boxes/ov19_021DEC04.c
index f5898abc31..7b8b5d40e9 100644
--- a/src/applications/pc_boxes/ov19_021DEC04.c
+++ b/src/applications/pc_boxes/ov19_021DEC04.c
@@ -91,7 +91,7 @@ BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 **param0, UnkStruct_ov19_021D61B0 *pa
         *param0 = NULL;
         return 1;
     } else {
-        UnkStruct_ov19_021DEC04 *v0 = Heap_AllocFromHeap(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DEC04));
+        UnkStruct_ov19_021DEC04 *v0 = Heap_Alloc(HEAP_ID_BOX_GRAPHICS, sizeof(UnkStruct_ov19_021DEC04));
 
         if (v0) {
             v0->unk_04 = param1;
diff --git a/src/applications/pokedex/crysub.c b/src/applications/pokedex/crysub.c
index 94cf246482..076ac767e7 100644
--- a/src/applications/pokedex/crysub.c
+++ b/src/applications/pokedex/crysub.c
@@ -185,9 +185,9 @@ typedef struct PokedexCrySubGraphics {
     BOOL pokeballActive;
 } PokedexCrySubGraphics;
 
-static PokedexCrySubData *LoadAppData(enum HeapId heapID, PokedexApp *pokedexApp);
-static PokedexGraphicData **LoadAppGraphics(enum HeapId heapID, PokedexApp *pokedexApp);
-static UnkStruct_ov21_021D4660 *ScreenStates(enum HeapId heapID, PokedexApp *pokedexApp);
+static PokedexCrySubData *LoadAppData(enum HeapID heapID, PokedexApp *pokedexApp);
+static PokedexGraphicData **LoadAppGraphics(enum HeapID heapID, PokedexApp *pokedexApp);
+static UnkStruct_ov21_021D4660 *ScreenStates(enum HeapID heapID, PokedexApp *pokedexApp);
 static void FreePokedexCrySubData(PokedexCrySubData *pokedexCrySubData);
 static void FreeGraphicData(PokedexGraphicData **graphicData);
 static void FreeScreenStates(UnkStruct_ov21_021D4660 *screenStates);
@@ -202,7 +202,7 @@ static void SetSpriteOAMModesXLU(PokedexCrySubGraphics *pokedexCrySubGraphics);
 static void SetSpriteOAMModesNormal(PokedexCrySubGraphics *pokedexCrySubGraphics);
 static void InitBlendTransition(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, const PokedexCrySubData *pokedexCrySubData, BOOL isEntering);
 static BOOL AdvanceBlendTransition(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, const PokedexCrySubData *pokedexCrySubData, BOOL isEntering);
-static void SetTouchScreen(PokedexCrySubPageData *pokedexCrySubPageData, PokedexCrySubData *pokedexCrySubData, enum HeapId heapID);
+static void SetTouchScreen(PokedexCrySubPageData *pokedexCrySubPageData, PokedexCrySubData *pokedexCrySubData, enum HeapID heapID);
 static void ResetButtons(PokedexCrySubPageData *pokedexCrySubPageData, PokedexCrySubData *pokedexCrySubData);
 static void FreeTouchScreen(PokedexCrySubPageData *pokedexCrySubPageData);
 static void AdjustmentTouchActions(u32 adjustor, enum TouchScreenButtonState buttonState, void *data);
@@ -239,22 +239,22 @@ static void StopReverbFilter(PokedexCrySubPageData *pokedexCrySubPageData);
 static void UpdateWheelPosition(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, const PokedexCrySubPageData *pokedexCrySubPageData);
 static void UpdateEchoVolume(PokedexCrySubPageData *pokedexCrySubPageData, int touchX);
 static void UpdatePan(PokedexCrySubPageData *pokedexCrySubPageData, int touchX);
-static void LoadCrySubGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapId heapID);
-static void FreeGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapId heapID);
-static void LoadBackgroundTileMaps(PokedexGraphicData **graphicData, enum HeapId heapID);
+static void LoadCrySubGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapID heapID);
+static void FreeGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapID heapID);
+static void LoadBackgroundTileMaps(PokedexGraphicData **graphicData, enum HeapID heapID);
 static void FreeBackgroundTileMaps(PokedexGraphicData **graphicData);
-static void LoadCryDialSprite(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapId heapID);
+static void LoadCryDialSprite(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapID heapID);
 static void FreeDialSpriteResource(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData);
-static void AnimateSprites(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapId heapID);
+static void AnimateSprites(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapID heapID);
 static void FreeSprites(PokedexCrySubGraphics *pokedexCrySubGraphics);
-static void LoadSwitchText(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapId heapID);
+static void LoadSwitchText(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapID heapID);
 static void FreeSwitchLabel(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData);
-static void LoadCryPalette(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapId heapID);
+static void LoadCryPalette(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapID heapID);
 static void FreeCryPalette(PokedexCrySubGraphics *pokedexCrySubGraphics);
 static void PokeballPaletteActive(PokedexCrySubGraphics *pokedexCrySubGraphics);
 static void PokeballPaletteDefault(PokedexCrySubGraphics *pokedexCrySubGraphics);
 
-void CrySub_Init(PokedexScreenManager *screenMan, PokedexApp *pokedexApp, enum HeapId heapID)
+void CrySub_Init(PokedexScreenManager *screenMan, PokedexApp *pokedexApp, enum HeapID heapID)
 {
     PokedexCrySubData *pokedexCrySubData = LoadAppData(heapID, pokedexApp);
     PokedexGraphicData **pokedexGraphicData = LoadAppGraphics(heapID, pokedexApp);
@@ -287,9 +287,9 @@ int CrySub_GetPitch(const PokedexScreenManager *screenMan)
     return pokedexCrySubData->pitch;
 }
 
-static PokedexCrySubData *LoadAppData(enum HeapId heapID, PokedexApp *pokedexApp)
+static PokedexCrySubData *LoadAppData(enum HeapID heapID, PokedexApp *pokedexApp)
 {
-    PokedexCrySubData *pokedexCrySubData = Heap_AllocFromHeap(heapID, sizeof(PokedexCrySubData));
+    PokedexCrySubData *pokedexCrySubData = Heap_Alloc(heapID, sizeof(PokedexCrySubData));
 
     GF_ASSERT(pokedexCrySubData);
     memset(pokedexCrySubData, 0, sizeof(PokedexCrySubData));
@@ -301,9 +301,9 @@ static PokedexCrySubData *LoadAppData(enum HeapId heapID, PokedexApp *pokedexApp
     return pokedexCrySubData;
 }
 
-static PokedexGraphicData **LoadAppGraphics(enum HeapId heapID, PokedexApp *pokedexApp)
+static PokedexGraphicData **LoadAppGraphics(enum HeapID heapID, PokedexApp *pokedexApp)
 {
-    PokedexGraphicData **graphicData = Heap_AllocFromHeap(heapID, sizeof(PokedexGraphicData **));
+    PokedexGraphicData **graphicData = Heap_Alloc(heapID, sizeof(PokedexGraphicData **));
 
     GF_ASSERT(graphicData);
     memset(graphicData, 0, sizeof(PokedexGraphicData **));
@@ -313,7 +313,7 @@ static PokedexGraphicData **LoadAppGraphics(enum HeapId heapID, PokedexApp *poke
     return graphicData;
 }
 
-static UnkStruct_ov21_021D4660 *ScreenStates(enum HeapId heapID, PokedexApp *pokedexApp)
+static UnkStruct_ov21_021D4660 *ScreenStates(enum HeapID heapID, PokedexApp *pokedexApp)
 {
     return NULL;
 }
@@ -346,7 +346,7 @@ static BOOL CrySubDataEnter(PokedexDataManager *dataMan, void *data)
     PokedexCrySubPageData *pokedexCrySubPageData = dataMan->pageData;
     enum Species species = PokedexSort_CurrentSpecies(pokedexCrySubData->sortData);
 
-    pokedexCrySubPageData = Heap_AllocFromHeap(dataMan->heapID, sizeof(PokedexCrySubPageData));
+    pokedexCrySubPageData = Heap_Alloc(dataMan->heapID, sizeof(PokedexCrySubPageData));
     memset(pokedexCrySubPageData, 0, sizeof(PokedexCrySubPageData));
 
     SetTouchScreen(pokedexCrySubPageData, pokedexCrySubData, dataMan->heapID);
@@ -417,7 +417,7 @@ static BOOL CrySubGraphicsEnter(void *graphics, PokedexGraphicsManager *graphics
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(PokedexCrySubGraphics));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(PokedexCrySubGraphics));
         memset(graphicsMan->pageGraphics, 0, sizeof(PokedexCrySubGraphics));
         graphicsMan->state++;
         break;
@@ -554,10 +554,10 @@ static BOOL AdvanceBlendTransition(PokedexCrySubGraphics *pokedexCrySubGraphics,
     return FALSE;
 }
 
-static void SetTouchScreen(PokedexCrySubPageData *pokedexCrySubPageData, PokedexCrySubData *pokedexCrySubData, enum HeapId heapID)
+static void SetTouchScreen(PokedexCrySubPageData *pokedexCrySubPageData, PokedexCrySubData *pokedexCrySubData, enum HeapID heapID)
 {
-    pokedexCrySubPageData->asjustorHitTables = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * MAX_CRYSUBADJUSTORS);
-    pokedexCrySubPageData->buttonHitTables = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * MAX_CRYSUBBUTTONS);
+    pokedexCrySubPageData->asjustorHitTables = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * MAX_CRYSUBADJUSTORS);
+    pokedexCrySubPageData->buttonHitTables = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * MAX_CRYSUBBUTTONS);
 
     PokedexMain_SetHitTableRect(&pokedexCrySubPageData->asjustorHitTables[CRYSUB_SWITCH], SWITCH_Y - (SWITCH_HEIGHT / 2), SWITCH_Y + (SWITCH_HEIGHT / 2), SWITCH_X - (SWITCH_WIDTH / 2), SWITCH_X + (SWITCH_WIDTH / 2));
 
@@ -815,7 +815,7 @@ static void AdjustorOOB(enum CrySubAdjustors adjustor, PokedexCrySubData *pokede
     }
 }
 
-static void LoadCrySubGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapId heapID)
+static void LoadCrySubGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapID heapID)
 {
     LoadBackgroundTileMaps(graphicData, heapID);
     LoadCryDialSprite(pokedexCrySubGraphics, graphicData, heapID);
@@ -824,7 +824,7 @@ static void LoadCrySubGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, Pok
     LoadCryPalette(pokedexCrySubGraphics, graphicData, heapID);
 }
 
-static void FreeGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapId heapID)
+static void FreeGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapID heapID)
 {
     FreeSprites(pokedexCrySubGraphics);
     FreeSwitchLabel(pokedexCrySubGraphics, graphicData);
@@ -833,7 +833,7 @@ static void FreeGraphics(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGr
     FreeCryPalette(pokedexCrySubGraphics);
 }
 
-static void LoadBackgroundTileMaps(PokedexGraphicData **graphicData, enum HeapId heapID)
+static void LoadBackgroundTileMaps(PokedexGraphicData **graphicData, enum HeapID heapID)
 {
     NNSG2dScreenData *screenData;
 
@@ -862,7 +862,7 @@ static void FreeBackgroundTileMaps(PokedexGraphicData **graphicData)
     Bg_SetPriority(BG_LAYER_SUB_3, 1);
 }
 
-static void LoadCryDialSprite(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapId heapID)
+static void LoadCryDialSprite(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapID heapID)
 {
     PokedexGraphicData *graphicsData = *graphics;
     NARC *narc = PokedexGraphics_GetNARC(*graphics);
@@ -893,7 +893,7 @@ static void FreeDialSpriteResource(PokedexCrySubGraphics *pokedexCrySubGraphics,
     SpriteResourceCollection_Remove(graphicData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], pokedexCrySubGraphics->dialSpriteResource[SPRITE_RESOURCE_ANIM]);
 }
 
-static void AnimateSprites(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapId heapID)
+static void AnimateSprites(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapID heapID)
 {
     SpriteResourcesHeader spriteResourcesHeader;
     SpriteListTemplate spriteListTemplate;
@@ -970,7 +970,7 @@ static void FreeSprites(PokedexCrySubGraphics *pokedexCrySubGraphics)
     Sprite_Delete(pokedexCrySubGraphics->loopButtonSprite);
 }
 
-static void LoadSwitchText(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapId heapID)
+static void LoadSwitchText(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphics, enum HeapID heapID)
 {
     PokedexDisplayBox displayBox;
     PokedexGraphicData *graphicData = *graphics;
@@ -1330,7 +1330,7 @@ static void SetLoop(PokedexCrySubPageData *pokedexCrySubPageData, BOOL loop)
     pokedexCrySubPageData->cryCooldown = CRY_COOLDOWN;
 }
 
-static void LoadCryPalette(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapId heapID)
+static void LoadCryPalette(PokedexCrySubGraphics *pokedexCrySubGraphics, PokedexGraphicData **graphicData, enum HeapID heapID)
 {
     pokedexCrySubGraphics->backgroundPalette = PokedexGraphics_GetGraphicNarcPaletteData(*graphicData, 20, &pokedexCrySubGraphics->paletteData, heapID);
 }
diff --git a/src/applications/pokedex/ov21_021D423C.c b/src/applications/pokedex/ov21_021D423C.c
index 3b335d5d4d..348ad754c6 100644
--- a/src/applications/pokedex/ov21_021D423C.c
+++ b/src/applications/pokedex/ov21_021D423C.c
@@ -19,9 +19,9 @@ static BOOL ov21_021D42EC(UnkStruct_ov21_021D423C *param0);
 static UnkStruct_ov21_021D4660 *ov21_021D42FC(UnkStruct_ov21_021D423C *param0, int param1);
 static void ov21_021D4334(UnkStruct_ov21_021D423C *param0, UnkStruct_ov21_021D4660 *param1);
 
-UnkStruct_ov21_021D423C *ov21_021D423C(enum HeapId heapID)
+UnkStruct_ov21_021D423C *ov21_021D423C(enum HeapID heapID)
 {
-    UnkStruct_ov21_021D423C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D423C));
+    UnkStruct_ov21_021D423C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D423C));
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D423C));
 
diff --git a/src/applications/pokedex/ov21_021D4340.c b/src/applications/pokedex/ov21_021D4340.c
index 093e4e0b5b..eb19faa9ef 100644
--- a/src/applications/pokedex/ov21_021D4340.c
+++ b/src/applications/pokedex/ov21_021D4340.c
@@ -258,14 +258,14 @@ void ov21_021D4660(UnkStruct_ov21_021D4660 *param0)
     param0->unk_08.unk_08 = NULL;
 }
 
-void ov21_021D467C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
+void ov21_021D467C(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
 {
     UnkStruct_ov21_021D4434 *v0;
 
     param1->unk_00 = param3;
     param1->unk_04 = ov21_021D4434;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4434));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4434));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4434));
@@ -286,14 +286,14 @@ void ov21_021D467C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexA
     param1->unk_08.unk_08 = v0;
 }
 
-void ov21_021D4704(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
+void ov21_021D4704(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
 {
     UnkStruct_ov21_021D43A8 *v0;
 
     param1->unk_00 = param3;
     param1->unk_04 = ov21_021D43A8;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D43A8));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D43A8));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D43A8));
@@ -307,14 +307,14 @@ void ov21_021D4704(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexA
     param1->unk_08.unk_08 = v0;
 }
 
-void ov21_021D475C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
+void ov21_021D475C(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
 {
     UnkStruct_ov21_021D4434 *v0;
 
     param1->unk_00 = param3;
     param1->unk_04 = ov21_021D4434;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4434));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4434));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4434));
@@ -335,14 +335,14 @@ void ov21_021D475C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexA
     param1->unk_08.unk_08 = v0;
 }
 
-void ov21_021D47F0(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
+void ov21_021D47F0(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
 {
     UnkStruct_ov21_021D4434 *v0;
 
     param1->unk_00 = param3;
     param1->unk_04 = ov21_021D4434;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4434));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4434));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4434));
@@ -363,14 +363,14 @@ void ov21_021D47F0(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexA
     param1->unk_08.unk_08 = v0;
 }
 
-void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, PokedexApp *param1, enum HeapId heapID, int param3)
+void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, PokedexApp *param1, enum HeapID heapID, int param3)
 {
     UnkStruct_ov21_021D4340 *v0;
 
     param0->unk_00 = param3;
     param0->unk_04 = ov21_021D4340;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4340));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4340));
     GF_ASSERT(v0);
 
     v0->unk_00 = ov21_021D1410(param1, 0);
@@ -380,14 +380,14 @@ void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, PokedexApp *param1, enum Hea
     param0->unk_08.unk_08 = v0;
 }
 
-void ov21_021D48B8(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
+void ov21_021D48B8(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
 {
     UnkStruct_ov21_021D4558 *v0;
 
     param1->unk_00 = param3;
     param1->unk_04 = ov21_021D4558;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4558));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4558));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4558));
@@ -402,14 +402,14 @@ void ov21_021D48B8(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexA
     param1->unk_08.unk_08 = v0;
 }
 
-void ov21_021D491C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
+void ov21_021D491C(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
 {
     UnkStruct_ov21_021D4558 *v0;
 
     param1->unk_00 = param3;
     param1->unk_04 = ov21_021D4558;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4558));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4558));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4558));
@@ -424,14 +424,14 @@ void ov21_021D491C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexA
     param1->unk_08.unk_08 = v0;
 }
 
-void ov21_021D4980(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
+void ov21_021D4980(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
 {
     UnkStruct_ov21_021D4558 *v0;
 
     param1->unk_00 = param3;
     param1->unk_04 = ov21_021D4558;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4558));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4558));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4558));
@@ -446,14 +446,14 @@ void ov21_021D4980(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexA
     param1->unk_08.unk_08 = v0;
 }
 
-void ov21_021D49E4(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
+void ov21_021D49E4(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
 {
     UnkStruct_ov21_021D4340 *v0;
 
     param1->unk_00 = param3;
     param1->unk_04 = ov21_021D4340;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4340));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4340));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4340));
@@ -465,14 +465,14 @@ void ov21_021D49E4(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexA
     param1->unk_08.unk_08 = v0;
 }
 
-void ov21_021D4A3C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
+void ov21_021D4A3C(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
 {
     UnkStruct_ov21_021D4340 *v0;
 
     param1->unk_00 = param3;
     param1->unk_04 = ov21_021D4340;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4340));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4340));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4340));
@@ -484,14 +484,14 @@ void ov21_021D4A3C(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexA
     param1->unk_08.unk_08 = v0;
 }
 
-void ov21_021D4A94(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
+void ov21_021D4A94(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
 {
     UnkStruct_ov21_021D4558 *v0;
 
     param1->unk_00 = param3;
     param1->unk_04 = ov21_021D4558;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4558));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4558));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4558));
@@ -506,14 +506,14 @@ void ov21_021D4A94(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexA
     param1->unk_08.unk_08 = v0;
 }
 
-void ov21_021D4AF8(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
+void ov21_021D4AF8(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
 {
     UnkStruct_ov21_021D4340 *v0;
 
     param1->unk_00 = param3;
     param1->unk_04 = ov21_021D4340;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4340));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4340));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4340));
@@ -525,14 +525,14 @@ void ov21_021D4AF8(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexA
     param1->unk_08.unk_08 = v0;
 }
 
-void ov21_021D4B50(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
+void ov21_021D4B50(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
 {
     UnkStruct_ov21_021D4558 *v0;
 
     param1->unk_00 = param3;
     param1->unk_04 = ov21_021D4558;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4558));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4558));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4558));
@@ -547,14 +547,14 @@ void ov21_021D4B50(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexA
     param1->unk_08.unk_08 = v0;
 }
 
-void ov21_021D4BB4(enum HeapId heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
+void ov21_021D4BB4(enum HeapID heapID, UnkStruct_ov21_021D4660 *param1, PokedexApp *param2, int param3)
 {
     UnkStruct_ov21_021D4340 *v0;
 
     param1->unk_00 = param3;
     param1->unk_04 = ov21_021D4340;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4340));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4340));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4340));
diff --git a/src/applications/pokedex/ov21_021D5AEC.c b/src/applications/pokedex/ov21_021D5AEC.c
index 82b2d42bed..a923a98b8f 100644
--- a/src/applications/pokedex/ov21_021D5AEC.c
+++ b/src/applications/pokedex/ov21_021D5AEC.c
@@ -66,11 +66,11 @@ typedef struct {
     int unk_144;
 } UnkStruct_ov21_021D71A8;
 
-static UnkStruct_ov21_021D5B68 *ov21_021D5B90(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021D5B68 *ov21_021D5B90(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021D5BCC(UnkStruct_ov21_021D5B68 *param0);
-static PokedexGraphicData **ov21_021D5BE0(enum HeapId heapID, PokedexApp *param1);
+static PokedexGraphicData **ov21_021D5BE0(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021D5C08(PokedexGraphicData **param0);
-static UnkStruct_ov21_021D4660 *ov21_021D5C1C(enum HeapId heapID, PokedexScreenManager *param1, PokedexApp *param2);
+static UnkStruct_ov21_021D4660 *ov21_021D5C1C(enum HeapID heapID, PokedexScreenManager *param1, PokedexApp *param2);
 static void ov21_021D5C7C(UnkStruct_ov21_021D4660 *param0);
 static int ov21_021D5CB4(void);
 static int ov21_021D5CB8(PokedexDataManager *dataMan, void *data);
@@ -172,7 +172,7 @@ const static int Unk_ov21_021E9D40[] = {
     152 * FX32_ONE
 };
 
-void ov21_021D5AEC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void ov21_021D5AEC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021D5B68 *v0;
     PokedexGraphicData **v1;
@@ -211,9 +211,9 @@ BOOL ov21_021D5B68(const UnkStruct_ov21_021D5B68 *param0)
     return 1;
 }
 
-static UnkStruct_ov21_021D5B68 *ov21_021D5B90(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021D5B68 *ov21_021D5B90(enum HeapID heapID, PokedexApp *param1)
 {
-    UnkStruct_ov21_021D5B68 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D5B68));
+    UnkStruct_ov21_021D5B68 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D5B68));
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D5B68));
 
@@ -232,9 +232,9 @@ static void ov21_021D5BCC(UnkStruct_ov21_021D5B68 *param0)
     Heap_Free(param0);
 }
 
-static PokedexGraphicData **ov21_021D5BE0(enum HeapId heapID, PokedexApp *param1)
+static PokedexGraphicData **ov21_021D5BE0(enum HeapID heapID, PokedexApp *param1)
 {
-    PokedexGraphicData **v0 = Heap_AllocFromHeap(heapID, sizeof(PokedexGraphicData **));
+    PokedexGraphicData **v0 = Heap_Alloc(heapID, sizeof(PokedexGraphicData **));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(PokedexGraphicData **));
@@ -250,9 +250,9 @@ static void ov21_021D5C08(PokedexGraphicData **param0)
     Heap_Free(param0);
 }
 
-static UnkStruct_ov21_021D4660 *ov21_021D5C1C(enum HeapId heapID, PokedexScreenManager *param1, PokedexApp *param2)
+static UnkStruct_ov21_021D4660 *ov21_021D5C1C(enum HeapID heapID, PokedexScreenManager *param1, PokedexApp *param2)
 {
-    UnkStruct_ov21_021D4660 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4660) * ov21_021D5CB4());
+    UnkStruct_ov21_021D4660 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4660) * ov21_021D5CB4());
     ov21_021D467C(heapID, &v0[0], param2, (1 << 0));
     ov21_021D475C(heapID, &v0[1], param2, (1 << 1));
     ov21_021D4704(heapID, &v0[2], param2, (1 << 2));
@@ -284,7 +284,7 @@ static int ov21_021D5CB8(PokedexDataManager *dataMan, void *data)
 {
     UnkStruct_ov21_021D5B68 *v0 = data;
 
-    dataMan->pageData = Heap_AllocFromHeap(dataMan->heapID, sizeof(UnkStruct_ov21_021D7464));
+    dataMan->pageData = Heap_Alloc(dataMan->heapID, sizeof(UnkStruct_ov21_021D7464));
 
     GF_ASSERT(dataMan->pageData);
     memset(dataMan->pageData, 0, sizeof(UnkStruct_ov21_021D7464));
@@ -341,7 +341,7 @@ static int ov21_021D5D48(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        v3 = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(UnkStruct_ov21_021D71A8));
+        v3 = Heap_Alloc(graphicsMan->heapID, sizeof(UnkStruct_ov21_021D71A8));
         GF_ASSERT(v3);
         graphicsMan->pageGraphics = v3;
         ov21_021D6C24(v3, v1);
diff --git a/src/applications/pokedex/ov21_021D76B0.c b/src/applications/pokedex/ov21_021D76B0.c
index 26cdd10b38..6b8192fd9c 100644
--- a/src/applications/pokedex/ov21_021D76B0.c
+++ b/src/applications/pokedex/ov21_021D76B0.c
@@ -75,9 +75,9 @@ typedef struct {
     SpriteResource *unk_2C[4];
 } UnkStruct_ov21_021D7C64;
 
-static UnkStruct_ov21_021D77D4 *ov21_021D7728(enum HeapId heapID, PokedexApp *param1);
-static PokedexGraphicData **ov21_021D7770(enum HeapId heapID, PokedexApp *param1);
-static UnkStruct_ov21_021D4660 *ov21_021D7798(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021D77D4 *ov21_021D7728(enum HeapID heapID, PokedexApp *param1);
+static PokedexGraphicData **ov21_021D7770(enum HeapID heapID, PokedexApp *param1);
+static UnkStruct_ov21_021D4660 *ov21_021D7798(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021D77D4(UnkStruct_ov21_021D77D4 *param0);
 static void ov21_021D77E8(PokedexGraphicData **param0);
 static void ov21_021D77FC(UnkStruct_ov21_021D4660 *param0);
@@ -89,14 +89,14 @@ static int ov21_021D78C0(void *graphics, PokedexGraphicsManager *graphicsMan, co
 static int ov21_021D7950(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan);
 static int ov21_021D79E4(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan);
 static void ov21_021D84A8(Sprite *param0, PokedexTextData *textData, int param2, int param3, int param4);
-static void ov21_021D7A64(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1, enum HeapId heapID);
+static void ov21_021D7A64(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1, enum HeapID heapID);
 static void ov21_021D7B20(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1);
 static void ov21_021D7B70(UnkStruct_ov21_021D7A64 *param0);
 static void ov21_021D7B8C(u32 param0, 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, enum HeapId heapID);
-static void ov21_021D7CD8(PokedexGraphicData **param0, const UnkStruct_ov21_021D77D4 *param1, enum HeapId 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);
@@ -116,7 +116,7 @@ static BOOL ov21_021D8508(UnkStruct_ov21_021D7A64 *param0, PokedexSortData *para
 static void ov21_021D8530(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1);
 static fx32 ov21_021D8580(fx32 param0, s32 param1);
 
-void ov21_021D76B0(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void ov21_021D76B0(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021D77D4 *v0;
     PokedexGraphicData **v1;
@@ -146,13 +146,13 @@ void ov21_021D7710(PokedexScreenManager *param0)
     ov21_021D77FC(param0->screenStates);
 }
 
-static UnkStruct_ov21_021D77D4 *ov21_021D7728(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021D77D4 *ov21_021D7728(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021D77D4 *v0;
     PokedexScreenManager *v1;
     int v2;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D77D4));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D77D4));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D77D4));
@@ -170,12 +170,12 @@ static UnkStruct_ov21_021D77D4 *ov21_021D7728(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-static PokedexGraphicData **ov21_021D7770(enum HeapId heapID, PokedexApp *param1)
+static PokedexGraphicData **ov21_021D7770(enum HeapID heapID, PokedexApp *param1)
 {
     PokedexGraphicData **v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(PokedexGraphicData *));
+    v0 = Heap_Alloc(heapID, sizeof(PokedexGraphicData *));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(PokedexGraphicData *));
@@ -185,12 +185,12 @@ static PokedexGraphicData **ov21_021D7770(enum HeapId heapID, PokedexApp *param1
     return v0;
 }
 
-static UnkStruct_ov21_021D4660 *ov21_021D7798(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021D4660 *ov21_021D7798(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021D4660 *v0;
     int v1 = ov21_021D7814();
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4660) * v1);
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4660) * v1);
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4660) * v1);
@@ -231,7 +231,7 @@ static int ov21_021D7818(PokedexDataManager *dataMan, void *data)
     UnkStruct_ov21_021D7A64 *v1;
     int v2;
 
-    dataMan->pageData = Heap_AllocFromHeap(dataMan->heapID, sizeof(UnkStruct_ov21_021D7A64));
+    dataMan->pageData = Heap_Alloc(dataMan->heapID, sizeof(UnkStruct_ov21_021D7A64));
 
     GF_ASSERT(dataMan->pageData);
     memset(dataMan->pageData, 0, sizeof(UnkStruct_ov21_021D7A64));
@@ -291,7 +291,7 @@ static int ov21_021D78C0(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(UnkStruct_ov21_021D7C64));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(UnkStruct_ov21_021D7C64));
         GF_ASSERT(graphicsMan->pageGraphics);
         memset(graphicsMan->pageGraphics, 0, sizeof(UnkStruct_ov21_021D7C64));
         graphicsMan->state++;
@@ -378,11 +378,11 @@ static int ov21_021D79E4(void *graphics, PokedexGraphicsManager *graphicsMan, co
     return 0;
 }
 
-static void ov21_021D7A64(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1, enum HeapId heapID)
+static void ov21_021D7A64(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021D7B8C *v0;
 
-    param0->unk_08 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 7);
+    param0->unk_08 = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * 7);
 
     PokedexMain_SetHitTableRect(&param0->unk_08[0], 40 - (48 / 2), 40 + (48 / 2), 48 - (96 / 2), 48 + (96 / 2));
     PokedexMain_SetHitTableRect(&param0->unk_08[1], 88 - (48 / 2), 88 + (48 / 2), 48 - (96 / 2), 48 + (96 / 2));
@@ -397,7 +397,7 @@ static void ov21_021D7A64(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77
 
     PokedexMain_SetHitTableRect(&param0->unk_08[6], (8 - 8), (8 - 8) + 16, (124 - 8), (124 - 8) + 64);
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D7B8C));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D7B8C));
     v0->unk_00 = param0;
     v0->unk_04 = param1;
 
@@ -517,7 +517,7 @@ static void ov21_021D7C64(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **
     Bg_SetPriority(BG_LAYER_SUB_3, 3);
 }
 
-static void ov21_021D7CAC(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, enum HeapId heapID)
+static void ov21_021D7CAC(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **param1, enum HeapID heapID)
 {
     ov21_021D81EC(param0);
     ov21_021D7FEC(param0);
@@ -527,7 +527,7 @@ static void ov21_021D7CAC(UnkStruct_ov21_021D7C64 *param0, PokedexGraphicData **
     Bg_SetPriority(BG_LAYER_SUB_3, 1);
 }
 
-static void ov21_021D7CD8(PokedexGraphicData **param0, const UnkStruct_ov21_021D77D4 *param1, enum HeapId heapID)
+static void ov21_021D7CD8(PokedexGraphicData **param0, const UnkStruct_ov21_021D77D4 *param1, enum HeapID heapID)
 {
     void *v0;
     NNSG2dScreenData *v1;
diff --git a/src/applications/pokedex/ov21_021D94BC.c b/src/applications/pokedex/ov21_021D94BC.c
index f715127463..02c185eae5 100644
--- a/src/applications/pokedex/ov21_021D94BC.c
+++ b/src/applications/pokedex/ov21_021D94BC.c
@@ -89,9 +89,9 @@ typedef struct {
     BOOL *unk_134;
 } UnkStruct_ov21_021DC96C;
 
-static UnkStruct_ov21_021D95B8 *ov21_021D9534(enum HeapId heapID, PokedexApp *param1);
-static UnkStruct_ov21_021D95CC *ov21_021D957C(enum HeapId heapID, PokedexApp *param1);
-static UnkStruct_ov21_021D4660 *ov21_021D95B4(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021D95B8 *ov21_021D9534(enum HeapID heapID, PokedexApp *param1);
+static UnkStruct_ov21_021D95CC *ov21_021D957C(enum HeapID heapID, PokedexApp *param1);
+static UnkStruct_ov21_021D4660 *ov21_021D95B4(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021D95B8(UnkStruct_ov21_021D95B8 *param0);
 static void ov21_021D95CC(UnkStruct_ov21_021D95CC *param0);
 static void ov21_021D95E0(UnkStruct_ov21_021D4660 *param0);
@@ -141,14 +141,14 @@ static void ov21_021DC088(UnkStruct_ov21_021DC96C *param0, PokedexDisplayBox *di
 static void ov21_021DC12C(UnkStruct_ov21_021DC96C *param0, PokedexDisplayBox *displayBox, PokedexTextManager *textMan);
 static void ov21_021DC1E8(UnkStruct_ov21_021DC96C *param0, PokedexDisplayBox *displayBox, PokedexTextManager *textMan);
 static void ov21_021DC2A4(UnkStruct_ov21_021DC96C *param0, PokedexDisplayBox *displayBox, PokedexTextManager *textMan);
-static void ov21_021D9ADC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID);
+static void ov21_021D9ADC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID);
 static void ov21_021D9B24(UnkStruct_ov21_021D9B24 *param0);
-static void ov21_021D9B34(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID);
-static void ov21_021D9B58(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID, int param3, int param4);
+static void ov21_021D9B34(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID);
+static void ov21_021D9B58(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID, int param3, int param4);
 static void ov21_021D9B98(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
 static void ov21_021D9BB0(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2, int param3);
 static void ov21_021D9B04(UnkStruct_ov21_021D9B24 *param0);
-static void ov21_021D9BEC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID);
+static void ov21_021D9BEC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID);
 static void ov21_021D9C90(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
 static void ov21_021D9D00(UnkStruct_ov21_021D9B24 *param0);
 static void ov21_021D9D18(u32 param0, enum TouchScreenButtonState param1, void *param2);
@@ -156,41 +156,41 @@ static void ov21_021D9CA8(UnkStruct_ov21_021D9B24 *param0);
 static void ov21_021D9CB8(UnkStruct_ov21_021D9B24 *param0, int param1);
 static void ov21_021D9D50(UnkStruct_ov21_021D9B24 *param0);
 static void ov21_021D9D68(UnkStruct_ov21_021D9B24 *param0);
-static void ov21_021D9D78(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID);
+static void ov21_021D9D78(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID);
 static void ov21_021D9E08(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
 static void ov21_021D9E90(u32 param0, enum TouchScreenButtonState param1, void *param2);
-static void ov21_021D9EB4(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID);
+static void ov21_021D9EB4(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID);
 static void ov21_021D9F44(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
 static void ov21_021D9FF8(u32 param0, enum TouchScreenButtonState param1, void *param2);
-static void ov21_021DA018(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID);
+static void ov21_021DA018(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID);
 static void ov21_021DA0BC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
 static void ov21_021DA18C(u32 param0, enum TouchScreenButtonState param1, void *param2);
 static void ov21_021DA0FC(UnkStruct_ov21_021D9B24 *param0, int param1);
-static void ov21_021DA1C8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID);
+static void ov21_021DA1C8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID);
 static void ov21_021DA280(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
 static void ov21_021DA2C0(u32 param0, enum TouchScreenButtonState param1, void *param2);
 static void ov21_021DA308(UnkStruct_ov21_021D9B24 *param0, int param1);
-static void ov21_021DA38C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID);
+static void ov21_021DA38C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID);
 static void ov21_021DA41C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
 static void ov21_021DA514(u32 param0, enum TouchScreenButtonState param1, void *param2);
 static void ov21_021DB3C8(UnkStruct_ov21_021D9B24 *param0);
-static void ov21_021DB3E0(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID);
-static void ov21_021DB3EC(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID, int param2, int param3);
+static void ov21_021DB3E0(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID);
+static void ov21_021DB3EC(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID, int param2, int param3);
 static void ov21_021DB428(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
 static void ov21_021DB2FC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
 static void ov21_021DB38C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2, int param3);
-static void ov21_021DB468(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID);
+static void ov21_021DB468(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID);
 static void ov21_021DA534(PokedexCursorData *param0, int param1);
 static void ov21_021DA5A8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
-static void ov21_021DA6B0(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID);
+static void ov21_021DA6B0(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID);
 static void ov21_021DA7B0(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
-static void ov21_021DA888(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID);
+static void ov21_021DA888(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID);
 static void ov21_021DA988(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
-static void ov21_021DAAD4(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID);
+static void ov21_021DAAD4(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID);
 static void ov21_021DAC08(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
-static void ov21_021DAD74(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID);
+static void ov21_021DAD74(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID);
 static void ov21_021DAED8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
-static void ov21_021DB02C(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID);
+static void ov21_021DB02C(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID);
 static void ov21_021DB12C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
 static void ov21_021DB480(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D9B24 *param1, const UnkStruct_ov21_021D95B8 *param2);
 static void ov21_021DB49C(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D9B24 *param1, const UnkStruct_ov21_021D95B8 *param2);
@@ -207,7 +207,7 @@ static void ov21_021DC600(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95
 static void ov21_021DC67C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2);
 static void ov21_021DC720(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1);
 
-void ov21_021D94BC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void ov21_021D94BC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021D95B8 *v0 = ov21_021D9534(heapID, param1);
     UnkStruct_ov21_021D95CC *v1 = ov21_021D957C(heapID, param1);
@@ -232,12 +232,12 @@ void ov21_021D951C(PokedexScreenManager *param0)
     ov21_021D95E0(param0->screenStates);
 }
 
-static UnkStruct_ov21_021D95B8 *ov21_021D9534(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021D95B8 *ov21_021D9534(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021D95B8 *v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D95B8));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D95B8));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D95B8));
@@ -250,12 +250,12 @@ static UnkStruct_ov21_021D95B8 *ov21_021D9534(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-static UnkStruct_ov21_021D95CC *ov21_021D957C(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021D95CC *ov21_021D957C(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021D95CC *v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D95CC));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D95CC));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D95CC));
@@ -265,7 +265,7 @@ static UnkStruct_ov21_021D95CC *ov21_021D957C(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-static UnkStruct_ov21_021D4660 *ov21_021D95B4(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021D4660 *ov21_021D95B4(enum HeapID heapID, PokedexApp *param1)
 {
     return NULL;
 }
@@ -298,7 +298,7 @@ static int ov21_021D95E8(PokedexDataManager *dataMan, void *data)
     UnkStruct_ov21_021D9B24 *v1;
     int v2;
 
-    v1 = Heap_AllocFromHeap(dataMan->heapID, sizeof(UnkStruct_ov21_021D9B24));
+    v1 = Heap_Alloc(dataMan->heapID, sizeof(UnkStruct_ov21_021D9B24));
 
     GF_ASSERT(v1);
     memset(v1, 0, sizeof(UnkStruct_ov21_021D9B24));
@@ -422,7 +422,7 @@ static int ov21_021D97A0(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(UnkStruct_ov21_021DC96C));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(UnkStruct_ov21_021DC96C));
         memset(graphicsMan->pageGraphics, 0, sizeof(UnkStruct_ov21_021DC96C));
         graphicsMan->state++;
         break;
@@ -591,7 +591,7 @@ static void ov21_021D9A74(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_
     Bg_ScheduleTilemapTransfer(param0->unk_00->bgConfig, 6);
 }
 
-static void ov21_021D9ADC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID)
+static void ov21_021D9ADC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID)
 {
     ov21_021D9BEC(param0, param1, heapID);
     ov21_021D9B58(param0, param1, heapID, param0->unk_24, param0->unk_28);
@@ -617,13 +617,13 @@ static void ov21_021D9B24(UnkStruct_ov21_021D9B24 *param0)
     ov21_021D9D50(param0);
 }
 
-static void ov21_021D9B34(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID)
+static void ov21_021D9B34(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID)
 {
     ov21_021D9D50(param0);
     ov21_021D9B58(param0, param1, heapID, param0->unk_24, param0->unk_28);
 }
 
-static void ov21_021D9B58(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID, int param3, int param4)
+static void ov21_021D9B58(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID, int param3, int param4)
 {
     switch (param3) {
     case 0:
@@ -677,9 +677,9 @@ static void ov21_021D9BB0(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95
     }
 }
 
-static void ov21_021D9BEC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID)
+static void ov21_021D9BEC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID)
 {
-    param0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 6);
+    param0->unk_04 = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * 6);
 
     PokedexMain_SetHitTableRect(&param0->unk_04[1], 48 - (32 / 2), 48 + (32 / 2), 224 - (64 / 2), 224 + (64 / 2));
     PokedexMain_SetHitTableRect(&param0->unk_04[0], 16 - (32 / 2), 16 + (32 / 2), 212 - (48 / 2), 212 + (48 / 2));
@@ -781,12 +781,12 @@ static void ov21_021D9D68(UnkStruct_ov21_021D9B24 *param0)
     }
 }
 
-static void ov21_021D9D78(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID)
+static void ov21_021D9D78(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID)
 {
     int v0, v1;
     int v2, v3;
 
-    param0->unk_0C = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 6);
+    param0->unk_0C = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * 6);
 
     for (v0 = 0; v0 < 3; v0++) {
         v3 = 48 + (v0 * (48 - 16));
@@ -864,12 +864,12 @@ static void ov21_021D9E90(u32 param0, enum TouchScreenButtonState param1, void *
     }
 }
 
-static void ov21_021D9EB4(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID)
+static void ov21_021D9EB4(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID)
 {
     int v0, v1;
     int v2, v3;
 
-    param0->unk_0C = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 10);
+    param0->unk_0C = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * 10);
 
     for (v0 = 0; v0 < 5; v0++) {
         v3 = 16 + (v0 * (48 - 16));
@@ -964,12 +964,12 @@ static void ov21_021D9FF8(u32 param0, enum TouchScreenButtonState param1, void *
     }
 }
 
-static void ov21_021DA018(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID)
+static void ov21_021DA018(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID)
 {
     int v0, v1;
     int v2, v3;
 
-    param0->unk_0C = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 11);
+    param0->unk_0C = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * 11);
 
     for (v0 = 0; v0 < 5; v0++) {
         v3 = 16 + (v0 * (48 - 16));
@@ -1078,12 +1078,12 @@ static void ov21_021DA18C(u32 param0, enum TouchScreenButtonState param1, void *
     }
 }
 
-static void ov21_021DA1C8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID)
+static void ov21_021DA1C8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID)
 {
     int v0, v1;
     int v2, v3;
 
-    param0->unk_0C = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 10);
+    param0->unk_0C = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * 10);
 
     for (v0 = 0; v0 < 4; v0++) {
         v3 = 16 + (v0 * (48 - 16));
@@ -1197,12 +1197,12 @@ static void ov21_021DA308(UnkStruct_ov21_021D9B24 *param0, int param1)
     }
 }
 
-static void ov21_021DA38C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapId heapID)
+static void ov21_021DA38C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, enum HeapID heapID)
 {
     int v0, v1;
     int v2, v3;
 
-    param0->unk_0C = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 15);
+    param0->unk_0C = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * 15);
 
     for (v0 = 0; v0 < 5; v0++) {
         v3 = 16 + (v0 * (48 - 16));
@@ -1416,14 +1416,14 @@ static void ov21_021DA5A8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95
     }
 }
 
-static void ov21_021DA6B0(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID)
+static void ov21_021DA6B0(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID)
 {
     int v0, v1;
     int v2, v3;
     int v4;
     int v5;
 
-    param0->unk_1C = Heap_AllocFromHeap(heapID, sizeof(PokedexCursorData) * (3 * 6));
+    param0->unk_1C = Heap_Alloc(heapID, sizeof(PokedexCursorData) * (3 * 6));
 
     for (v0 = 0; v0 < 6; v0++) {
         v3 = 16 + (v0 * (48 - 16));
@@ -1527,14 +1527,14 @@ static void ov21_021DA7B0(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95
     }
 }
 
-static void ov21_021DA888(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID)
+static void ov21_021DA888(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID)
 {
     int v0, v1;
     int v2, v3;
     int v4;
     int v5;
 
-    param0->unk_1C = Heap_AllocFromHeap(heapID, sizeof(PokedexCursorData) * (3 * 6));
+    param0->unk_1C = Heap_Alloc(heapID, sizeof(PokedexCursorData) * (3 * 6));
 
     for (v0 = 0; v0 < 6; v0++) {
         v3 = 16 + (v0 * (48 - 16));
@@ -1654,7 +1654,7 @@ static void ov21_021DA988(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95
     }
 }
 
-static void ov21_021DAAD4(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID)
+static void ov21_021DAAD4(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID)
 {
     int v0, v1;
     int v2, v3;
@@ -1662,7 +1662,7 @@ static void ov21_021DAAD4(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID)
     int v6;
     int v7;
 
-    param0->unk_1C = Heap_AllocFromHeap(heapID, sizeof(PokedexCursorData) * (3 * 6));
+    param0->unk_1C = Heap_Alloc(heapID, sizeof(PokedexCursorData) * (3 * 6));
 
     for (v0 = 0; v0 < 6; v0++) {
         v3 = 16 + (v0 * (48 - 16));
@@ -1806,7 +1806,7 @@ static void ov21_021DAC08(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95
     }
 }
 
-static void ov21_021DAD74(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID)
+static void ov21_021DAD74(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID)
 {
     int v0, v1;
     int v2, v3;
@@ -1814,7 +1814,7 @@ static void ov21_021DAD74(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID)
     int v6, v7;
     int v8;
 
-    param0->unk_1C = Heap_AllocFromHeap(heapID, sizeof(PokedexCursorData) * (3 * 6));
+    param0->unk_1C = Heap_Alloc(heapID, sizeof(PokedexCursorData) * (3 * 6));
 
     for (v0 = 0; v0 < 6; v0++) {
         v3 = 16 + (v0 * (48 - 16));
@@ -1968,14 +1968,14 @@ static void ov21_021DAED8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95
     }
 }
 
-static void ov21_021DB02C(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID)
+static void ov21_021DB02C(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID)
 {
     int v0, v1;
     int v2, v3;
     int v4;
     int v5;
 
-    param0->unk_1C = Heap_AllocFromHeap(heapID, sizeof(PokedexCursorData) * (4 * 6));
+    param0->unk_1C = Heap_Alloc(heapID, sizeof(PokedexCursorData) * (4 * 6));
 
     for (v0 = 0; v0 < 6; v0++) {
         v3 = 16 + (v0 * (48 - 16));
@@ -2173,12 +2173,12 @@ static void ov21_021DB3C8(UnkStruct_ov21_021D9B24 *param0)
     param0->unk_1C = NULL;
 }
 
-static void ov21_021DB3E0(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID)
+static void ov21_021DB3E0(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID)
 {
     ov21_021DB3EC(param0, heapID, param0->unk_24, param0->unk_28);
 }
 
-static void ov21_021DB3EC(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID, int param2, int param3)
+static void ov21_021DB3EC(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID, int param2, int param3)
 {
     switch (param2) {
     case 0:
@@ -2227,7 +2227,7 @@ static void ov21_021DB428(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95
     PokedexPanel_Move(param0->unk_18, 4, v0);
 }
 
-static void ov21_021DB468(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID)
+static void ov21_021DB468(UnkStruct_ov21_021D9B24 *param0, enum HeapID heapID)
 {
     ov21_021DB3C8(param0);
     ov21_021DB3EC(param0, heapID, param0->unk_24, param0->unk_28);
diff --git a/src/applications/pokedex/ov21_021DC9BC.c b/src/applications/pokedex/ov21_021DC9BC.c
index ca5b630a87..40f7f9466c 100644
--- a/src/applications/pokedex/ov21_021DC9BC.c
+++ b/src/applications/pokedex/ov21_021DC9BC.c
@@ -130,8 +130,8 @@ typedef struct PokedexMapDisplay {
     u32 fieldsZero;
 } PokedexMapDisplay;
 
-static UnkStruct_ov21_021DCACC *ov21_021DCA5C(enum HeapId heapID, PokedexApp *param1);
-static UnkStruct_ov21_021DCAE0 *ov21_021DCAA0(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021DCACC *ov21_021DCA5C(enum HeapID heapID, PokedexApp *param1);
+static UnkStruct_ov21_021DCAE0 *ov21_021DCAA0(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021DCACC(UnkStruct_ov21_021DCACC *param0);
 static void ov21_021DCAE0(UnkStruct_ov21_021DCAE0 *param0);
 static int ov21_021DCAF4(void);
@@ -148,21 +148,21 @@ static void ov21_021DD490(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0
 static BOOL ov21_021DD508(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, BOOL param3);
 static void ov21_021DD554(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, BOOL param3);
 static BOOL ov21_021DD5E4(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, BOOL param3);
-static void ov21_021DCDD0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, const EncounterCollection *encounterCollection, enum HeapId heapID);
+static void ov21_021DCDD0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, const EncounterCollection *encounterCollection, enum HeapID heapID);
 static void ov21_021DCE20(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1);
-static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_021DCACC *param1, enum HeapId heapID);
-static void ov21_021DD668(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapId heapID);
+static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_021DCACC *param1, enum HeapID heapID);
+static void ov21_021DD668(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapID heapID);
 static void ov21_021DD6C0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1);
-static void ov21_021DCFC8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapId heapID);
+static void ov21_021DCFC8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapID heapID);
 static void ov21_021DD114(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1);
-static void ov21_021DD1A8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapId heapID);
+static void ov21_021DD1A8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapID heapID);
 static void PokedexMapDisplay_DeleteCellActors(PokedexMapDisplay *mapDisplay);
-static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, enum HeapId heapID);
+static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, enum HeapID heapID);
 static void ov21_021DD3FC(PokedexMapDisplay *mapDisplay);
 static void ov21_021DD9E8(PokedexMapDisplay *mapDisplay, const EncounterCollection *encounterCollection);
 static void ov21_021DDA48(PokedexMapDisplay *mapDisplay, int param1);
 static void ov21_021DDA80(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, const EncounterCollection *encounterCollection, int param4);
-static void ov21_021DD710(PokedexMapDisplay *mapDisplay, const UnkStruct_ov21_021DCACC *param1, const EncounterCollection *encounterCollection, enum HeapId heapID);
+static void ov21_021DD710(PokedexMapDisplay *mapDisplay, const UnkStruct_ov21_021DCACC *param1, const EncounterCollection *encounterCollection, enum HeapID heapID);
 static void ov21_021DD8B4(PokedexMapDisplay *mapDisplay);
 static u8 *PokedexEncounters_InvisibleFields(u32 heapID, const UnkStruct_ov21_021DCACC *param1, u32 *param2);
 static u8 *PokedexEncounters_InvisibleDungeons(u32 heapID, const UnkStruct_ov21_021DCACC *param1, u32 *param2);
@@ -170,10 +170,10 @@ static void ov21_021DD964(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0
 static void ov21_021DDB8C(PokedexMapDisplay *mapDisplay);
 static void ov21_021DDBCC(PokedexMapDisplay *mapDisplay);
 static void ov21_021DDC14(PokedexMapDisplay *mapDisplay);
-static void PokedexSort_PopulateDexStatus(EncounterCollection *encounterCollection, UnkStruct_ov21_021DCACC *param1, enum HeapId heapID);
+static void PokedexSort_PopulateDexStatus(EncounterCollection *encounterCollection, UnkStruct_ov21_021DCACC *param1, enum HeapID heapID);
 static void ov21_021DDB68(EncounterCollection *encounterCollection);
 
-void ov21_021DC9BC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void ov21_021DC9BC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021DCACC *v0 = ov21_021DCA5C(heapID, param1);
     UnkStruct_ov21_021DCAE0 *v1 = ov21_021DCAA0(heapID, param1);
@@ -230,9 +230,9 @@ void ov21_021DCA54(PokedexScreenManager *param0, int param1)
     v0->unk_10 = param1;
 }
 
-static UnkStruct_ov21_021DCACC *ov21_021DCA5C(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021DCACC *ov21_021DCA5C(enum HeapID heapID, PokedexApp *param1)
 {
-    UnkStruct_ov21_021DCACC *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021DCACC));
+    UnkStruct_ov21_021DCACC *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021DCACC));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021DCACC));
@@ -243,12 +243,12 @@ static UnkStruct_ov21_021DCACC *ov21_021DCA5C(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-static UnkStruct_ov21_021DCAE0 *ov21_021DCAA0(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021DCAE0 *ov21_021DCAA0(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021DCAE0 *v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021DCAE0));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021DCAE0));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021DCAE0));
@@ -280,7 +280,7 @@ static int PokedexEncounters_PopulateEncounterCollection(PokedexDataManager *dat
     UnkStruct_ov21_021DCACC *v0 = data;
     EncounterCollection *encounterCollection;
 
-    encounterCollection = Heap_AllocFromHeap(dataMan->heapID, sizeof(EncounterCollection));
+    encounterCollection = Heap_Alloc(dataMan->heapID, sizeof(EncounterCollection));
 
     GF_ASSERT(encounterCollection);
     memset(encounterCollection, 0, sizeof(EncounterCollection));
@@ -359,7 +359,7 @@ static int ov21_021DCBD8(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(PokedexMapDisplay));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(PokedexMapDisplay));
         memset(graphicsMan->pageGraphics, 0, sizeof(PokedexMapDisplay));
 
         mapDisplay = graphicsMan->pageGraphics;
@@ -467,7 +467,7 @@ static int ov21_021DCD04(void *graphics, PokedexGraphicsManager *graphicsMan, co
     return 0;
 }
 
-static void ov21_021DCDD0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, const EncounterCollection *encounterCollection, enum HeapId heapID)
+static void ov21_021DCDD0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, const EncounterCollection *encounterCollection, enum HeapID heapID)
 {
     ov21_021DCE40(param1, param2, heapID);
     ov21_021DD668(mapDisplay, param1, heapID);
@@ -486,7 +486,7 @@ static void ov21_021DCE20(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0
     ov21_021DD114(mapDisplay, param1);
 }
 
-static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_021DCACC *param1, enum HeapId heapID)
+static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_021DCACC *param1, enum HeapID heapID)
 {
     void *v0;
     NNSG2dScreenData *v1;
@@ -529,7 +529,7 @@ static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_
     Bg_ScheduleTilemapTransfer(param0->unk_00->bgConfig, 3);
 }
 
-static void ov21_021DCFC8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapId heapID)
+static void ov21_021DCFC8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapID heapID)
 {
     PokedexGraphicData *v0 = param1->unk_00;
     NARC *v1 = PokedexGraphics_GetNARC(param1->unk_00);
@@ -571,7 +571,7 @@ static void ov21_021DD114(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0
     SpriteResourceCollection_Remove(v0->spriteResourceCollection[3], mapDisplay->unk_D0[3]);
 }
 
-static void ov21_021DD1A8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapId heapID)
+static void ov21_021DD1A8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapID heapID)
 {
     SpriteResourcesHeader v0;
     SpriteListTemplate v1;
@@ -621,7 +621,7 @@ static void PokedexMapDisplay_DeleteCellActors(PokedexMapDisplay *mapDisplay)
     }
 }
 
-static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, enum HeapId heapID)
+static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, enum HeapID heapID)
 {
     Window *v0;
     PokedexDisplayBox displayBox;
@@ -797,7 +797,7 @@ static BOOL ov21_021DD5E4(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0
     return 0;
 }
 
-static void ov21_021DD668(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapId heapID)
+static void ov21_021DD668(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapID heapID)
 {
     Window_FillTilemap(&param1->unk_00->window, 0);
 
@@ -824,7 +824,7 @@ static void ov21_021DD6C0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0
     Window_SetPalette(&param1->unk_00->window, 0);
 }
 
-static void ov21_021DD710(PokedexMapDisplay *mapDisplay, const UnkStruct_ov21_021DCACC *param1, const EncounterCollection *encounterCollection, enum HeapId heapID)
+static void ov21_021DD710(PokedexMapDisplay *mapDisplay, const UnkStruct_ov21_021DCACC *param1, const EncounterCollection *encounterCollection, enum HeapID heapID)
 {
     int index, v1;
     int v2, v3;
@@ -837,7 +837,7 @@ static void ov21_021DD710(PokedexMapDisplay *mapDisplay, const UnkStruct_ov21_02
 
     mapDisplay->numVisibleFields = PokedexEncData_LocateVisibleFields(mapDisplay->pokedexFieldMap_1, POKEDEXMAPHEIGHT, POKEDEXMAPWIDTH, mapDisplay->fieldCoordinatesArray, &encounterCollection->fieldsEncounteredOn, encounterCollection->invisibleFields, encounterCollection->numInvisibleFields);
     numCombinedMaps = (encounterCollection->fieldsEncounteredOn.numLocations - 1) + encounterCollection->numInvisibleFields;
-    combinedMapArray = Heap_AllocFromHeapAtEnd(heapID, numCombinedMaps);
+    combinedMapArray = Heap_AllocAtEnd(heapID, numCombinedMaps);
 
     for (index = 0; index < numCombinedMaps; index++) {
         if (index < encounterCollection->numInvisibleFields) {
@@ -871,7 +871,7 @@ static void ov21_021DD710(PokedexMapDisplay *mapDisplay, const UnkStruct_ov21_02
     mapDisplay->numDungeons = PokedexEncData_LocateVisibleDungeons(mapDisplay->cellActorArray, mapDisplay->numDungeons, (NUMDUNGEONS * 2), xOffset, yOffset, POKEDEXMAPXSCALE, POKEDEXMAPYSCALE, mapDisplay->dungeonCoordinatesArray, &encounterCollection->dungeonsEncounteredOn, 2, v2, encounterCollection->invisibleDungeons, encounterCollection->numInvisibleDungeons, &mapDisplay->numVisibleDungeons);
 
     numCombinedMaps = (encounterCollection->dungeonsEncounteredOn.numLocations - 1) + encounterCollection->numInvisibleDungeons;
-    combinedMapArray = Heap_AllocFromHeapAtEnd(heapID, numCombinedMaps);
+    combinedMapArray = Heap_AllocAtEnd(heapID, numCombinedMaps);
 
     for (index = 0; index < numCombinedMaps; index++) {
         if (index < encounterCollection->numInvisibleDungeons) {
@@ -945,7 +945,7 @@ static u8 *PokedexEncounters_InvisibleFields(u32 heapID, const UnkStruct_ov21_02
     }
 
     if (fieldCount > 0) {
-        invisibleFields = Heap_AllocFromHeap(heapID, sizeof(u8) * fieldCount);
+        invisibleFields = Heap_Alloc(heapID, sizeof(u8) * fieldCount);
     } else {
         invisibleFields = NULL;
     }
@@ -1042,7 +1042,7 @@ static u8 *PokedexEncounters_InvisibleDungeons(u32 heapID, const UnkStruct_ov21_
     }
 
     if (dungeonCount > 0) {
-        invisibleDungeons = Heap_AllocFromHeap(heapID, sizeof(u8) * dungeonCount);
+        invisibleDungeons = Heap_Alloc(heapID, sizeof(u8) * dungeonCount);
     } else {
         invisibleDungeons = NULL;
     }
@@ -1139,7 +1139,7 @@ static void ov21_021DDA80(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0
     }
 }
 
-static void PokedexSort_PopulateDexStatus(EncounterCollection *encounterCollection, UnkStruct_ov21_021DCACC *param1, enum HeapId heapID)
+static void PokedexSort_PopulateDexStatus(EncounterCollection *encounterCollection, UnkStruct_ov21_021DCACC *param1, enum HeapID heapID)
 {
     int dungeonCategory;
     int fieldCategory;
diff --git a/src/applications/pokedex/ov21_021DDD2C.c b/src/applications/pokedex/ov21_021DDD2C.c
index a2199b0d0c..405689ff0e 100644
--- a/src/applications/pokedex/ov21_021DDD2C.c
+++ b/src/applications/pokedex/ov21_021DDD2C.c
@@ -63,9 +63,9 @@ typedef struct {
     int unk_28;
 } UnkStruct_ov21_021DDEC8;
 
-static UnkStruct_ov21_021DDDA4 *ov21_021DDDA4(enum HeapId heapID, PokedexApp *param1);
-static PokedexGraphicData **ov21_021DDDF0(enum HeapId heapID, PokedexApp *param1);
-static UnkStruct_ov21_021D4660 *ov21_021DDE18(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021DDDA4 *ov21_021DDDA4(enum HeapID heapID, PokedexApp *param1);
+static PokedexGraphicData **ov21_021DDDF0(enum HeapID heapID, PokedexApp *param1);
+static UnkStruct_ov21_021D4660 *ov21_021DDE18(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021DDE1C(UnkStruct_ov21_021DDDA4 *param0);
 static void ov21_021DDE30(PokedexGraphicData **param0);
 static void ov21_021DDE44(UnkStruct_ov21_021D4660 *param0);
@@ -80,7 +80,7 @@ static void ov21_021DE040(UnkStruct_ov21_021DDEC8 *param0);
 static void ov21_021DE04C(UnkStruct_ov21_021DDEC8 *param0);
 static void ov21_021DE058(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021DDDA4 *param2, BOOL param3);
 static BOOL ov21_021DE0C4(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021DDDA4 *param2, BOOL param3);
-static void ov21_021DE2EC(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1, enum HeapId heapID);
+static void ov21_021DE2EC(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1, enum HeapID heapID);
 static void ov21_021DE334(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1);
 static void ov21_021DE44C(u32 param0, enum TouchScreenButtonState param1, void *param2);
 static void ov21_021DE484(UnkStruct_ov21_021DDE4C *param0);
@@ -99,7 +99,7 @@ static void ov21_021DE49C(UnkStruct_ov21_021DDEC8 *param0, const UnkStruct_ov21_
 static int ov21_021DE5DC(int param0);
 static void ov21_021DE4D4(UnkStruct_ov21_021DDEC8 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021DDDA4 *param2, int heapID);
 
-void ov21_021DDD2C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void ov21_021DDD2C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021DDDA4 *v0;
     PokedexGraphicData **v1;
@@ -129,9 +129,9 @@ void ov21_021DDD8C(PokedexScreenManager *param0)
     ov21_021DDE44(param0->screenStates);
 }
 
-static UnkStruct_ov21_021DDDA4 *ov21_021DDDA4(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021DDDA4 *ov21_021DDDA4(enum HeapID heapID, PokedexApp *param1)
 {
-    UnkStruct_ov21_021DDDA4 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021DDDA4));
+    UnkStruct_ov21_021DDDA4 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021DDDA4));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021DDDA4));
@@ -143,9 +143,9 @@ static UnkStruct_ov21_021DDDA4 *ov21_021DDDA4(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-static PokedexGraphicData **ov21_021DDDF0(enum HeapId heapID, PokedexApp *param1)
+static PokedexGraphicData **ov21_021DDDF0(enum HeapID heapID, PokedexApp *param1)
 {
-    PokedexGraphicData **v0 = Heap_AllocFromHeap(heapID, sizeof(PokedexGraphicData **));
+    PokedexGraphicData **v0 = Heap_Alloc(heapID, sizeof(PokedexGraphicData **));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(PokedexGraphicData **));
@@ -155,7 +155,7 @@ static PokedexGraphicData **ov21_021DDDF0(enum HeapId heapID, PokedexApp *param1
     return v0;
 }
 
-static UnkStruct_ov21_021D4660 *ov21_021DDE18(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021D4660 *ov21_021DDE18(enum HeapID heapID, PokedexApp *param1)
 {
     return NULL;
 }
@@ -187,7 +187,7 @@ static int ov21_021DDE4C(PokedexDataManager *dataMan, void *data)
     UnkStruct_ov21_021DDDA4 *v0 = data;
     UnkStruct_ov21_021DDE4C *v1;
 
-    v1 = Heap_AllocFromHeap(dataMan->heapID, sizeof(UnkStruct_ov21_021DDE4C));
+    v1 = Heap_Alloc(dataMan->heapID, sizeof(UnkStruct_ov21_021DDE4C));
 
     GF_ASSERT(v1);
     memset(v1, 0, sizeof(UnkStruct_ov21_021DDE4C));
@@ -240,7 +240,7 @@ static int ov21_021DDEC8(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(UnkStruct_ov21_021DDEC8));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(UnkStruct_ov21_021DDEC8));
         memset(graphicsMan->pageGraphics, 0, sizeof(UnkStruct_ov21_021DDEC8));
         graphicsMan->state++;
         break;
@@ -442,9 +442,9 @@ static void ov21_021DE2E0(UnkStruct_ov21_021DDEC8 *param0)
     Sprite_Delete(param0->unk_00);
 }
 
-static void ov21_021DE2EC(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1, enum HeapId heapID)
+static void ov21_021DE2EC(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1, enum HeapID heapID)
 {
-    param0->unk_14 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 1);
+    param0->unk_14 = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * 1);
     param0->unk_14[0].circle.code = TOUCHSCREEN_USE_CIRCLE;
     param0->unk_14[0].circle.x = param0->unk_00;
     param0->unk_14[0].circle.y = param0->unk_04;
diff --git a/src/applications/pokedex/ov21_021DE668.c b/src/applications/pokedex/ov21_021DE668.c
index 18ff9e2c26..d32ccca000 100644
--- a/src/applications/pokedex/ov21_021DE668.c
+++ b/src/applications/pokedex/ov21_021DE668.c
@@ -47,8 +47,8 @@ typedef struct {
     CursorTransformation unk_54;
 } UnkStruct_ov21_021DF374;
 
-static UnkStruct_ov21_021DE6D4 *ov21_021DE6E8(enum HeapId heapID, PokedexApp *param1);
-static PokedexGraphicData **ov21_021DE724(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021DE6D4 *ov21_021DE6E8(enum HeapID heapID, PokedexApp *param1);
+static PokedexGraphicData **ov21_021DE724(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021DE74C(UnkStruct_ov21_021DE6D4 *param0);
 static void ov21_021DE760(PokedexGraphicData **param0);
 static int ov21_021DE774(void);
@@ -95,7 +95,7 @@ static void ov21_021DEF3C(PokedexGraphicData **param0);
 static void ov21_021DEF54(PokedexGraphicData **param0, const UnkStruct_ov21_021DE6D4 *param1);
 static void ov21_021DEF8C(PokedexGraphicData **param0);
 
-void ov21_021DE668(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void ov21_021DE668(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021DE6D4 *v0;
     PokedexGraphicData **v1;
@@ -139,12 +139,12 @@ BOOL ov21_021DE6D8(UnkStruct_ov21_021DE6D4 *param0, int param1)
     return v0;
 }
 
-static UnkStruct_ov21_021DE6D4 *ov21_021DE6E8(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021DE6D4 *ov21_021DE6E8(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021DE6D4 *v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021DE6D4));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021DE6D4));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021DE6D4));
@@ -157,12 +157,12 @@ static UnkStruct_ov21_021DE6D4 *ov21_021DE6E8(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-static PokedexGraphicData **ov21_021DE724(enum HeapId heapID, PokedexApp *param1)
+static PokedexGraphicData **ov21_021DE724(enum HeapID heapID, PokedexApp *param1)
 {
     PokedexGraphicData **v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(PokedexGraphicData **));
+    v0 = Heap_Alloc(heapID, sizeof(PokedexGraphicData **));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(PokedexGraphicData **));
@@ -242,7 +242,7 @@ static int ov21_021DE804(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(UnkStruct_ov21_021DF374));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(UnkStruct_ov21_021DF374));
         memset(graphicsMan->pageGraphics, 0, sizeof(UnkStruct_ov21_021DF374));
         graphicsMan->state++;
         break;
@@ -416,7 +416,7 @@ static void ov21_021DEB58(PokedexGraphicData **param0, const UnkStruct_ov21_021D
     ov21_021DEB8C(&(*param0)->window, species, param2, param1->unk_18, TEXT_COLOR(2, 1, 0));
 }
 
-void ov21_021DEB8C(Window *param0, int param1, enum HeapId heapID, int param3, u32 param4)
+void ov21_021DEB8C(Window *param0, int param1, enum HeapID heapID, int param3, u32 param4)
 {
     Strbuf *v0 = Strbuf_Init(64, heapID);
     MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID);
diff --git a/src/applications/pokedex/ov21_021DF734.c b/src/applications/pokedex/ov21_021DF734.c
index 89d8f1c824..7c55efeec8 100644
--- a/src/applications/pokedex/ov21_021DF734.c
+++ b/src/applications/pokedex/ov21_021DF734.c
@@ -61,8 +61,8 @@ typedef struct {
 } UnkStruct_ov21_021DFFF8;
 
 static inline int inline_ov21_021E00F4(int param0, int param1);
-static UnkStruct_ov21_021DF844 *ov21_021DF7CC(enum HeapId heapID, PokedexApp *param1);
-static UnkStruct_ov21_021DF858 *ov21_021DF80C(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021DF844 *ov21_021DF7CC(enum HeapID heapID, PokedexApp *param1);
+static UnkStruct_ov21_021DF858 *ov21_021DF80C(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021DF844(UnkStruct_ov21_021DF844 *param0);
 static void ov21_021DF858(UnkStruct_ov21_021DF858 *param0);
 static int ov21_021DF86C(void);
@@ -128,7 +128,7 @@ static void ov21_021E0BF8(UnkStruct_ov21_021DFFF8 *param0);
 static void ov21_021E0C10(UnkStruct_ov21_021DFFF8 *param0);
 static void ov21_021E0C30(UnkStruct_ov21_021DFFF8 *param0);
 
-void ov21_021DF734(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void ov21_021DF734(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021DF844 *v0 = ov21_021DF7CC(heapID, param1);
     UnkStruct_ov21_021DF858 *v1 = ov21_021DF80C(heapID, param1);
@@ -172,12 +172,12 @@ BOOL ov21_021DF7A0(PokedexScreenManager *param0, int param1)
     return 0;
 }
 
-static UnkStruct_ov21_021DF844 *ov21_021DF7CC(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021DF844 *ov21_021DF7CC(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021DF844 *v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021DF844));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021DF844));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021DF844));
@@ -190,12 +190,12 @@ static UnkStruct_ov21_021DF844 *ov21_021DF7CC(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-static UnkStruct_ov21_021DF858 *ov21_021DF80C(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021DF858 *ov21_021DF80C(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021DF858 *v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021DF858));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021DF858));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021DF858));
@@ -293,7 +293,7 @@ static int ov21_021DF8C4(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(UnkStruct_ov21_021DFFF8));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(UnkStruct_ov21_021DFFF8));
         memset(graphicsMan->pageGraphics, 0, sizeof(UnkStruct_ov21_021DFFF8));
         v2 = graphicsMan->pageGraphics;
         v2->unk_C8 = v0->unk_0C;
diff --git a/src/applications/pokedex/ov21_021E0C68.c b/src/applications/pokedex/ov21_021E0C68.c
index 7522e5afb0..ea2355adfe 100644
--- a/src/applications/pokedex/ov21_021E0C68.c
+++ b/src/applications/pokedex/ov21_021E0C68.c
@@ -50,8 +50,8 @@ typedef struct {
     CursorTransformation unk_38;
 } UnkStruct_ov21_021E14D4;
 
-static UnkStruct_ov21_021E0D68 *ov21_021E0D04(enum HeapId heapID, PokedexApp *param1);
-static PokedexGraphicData **ov21_021E0D40(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021E0D68 *ov21_021E0D04(enum HeapID heapID, PokedexApp *param1);
+static PokedexGraphicData **ov21_021E0D40(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021E0D68(UnkStruct_ov21_021E0D68 *param0);
 static void ov21_021E0D7C(PokedexGraphicData **param0);
 static int ov21_021E0D90(void);
@@ -77,7 +77,7 @@ static BOOL ov21_021E1840(UnkStruct_ov21_021E14D4 *param0, PokedexGraphicData **
 static void ov21_021E0F4C(UnkStruct_ov21_021E14D4 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021E0D68 *param2, int heapID);
 static void ov21_021E0F94(UnkStruct_ov21_021E14D4 *param0, PokedexGraphicData **param1);
 static void ov21_021E0FBC(PokedexGraphicData **param0, int heapID);
-static void ov21_021E10D0(PokedexGraphicData **param0, const UnkStruct_ov21_021E0D68 *param1, enum HeapId heapID);
+static void ov21_021E10D0(PokedexGraphicData **param0, const UnkStruct_ov21_021E0D68 *param1, enum HeapID heapID);
 static void ov21_021E1188(PokedexGraphicData **param0, int param1, int param2, int param3, int param4);
 static int LanguageMessage(int param0);
 static void ov21_021E18A0(PokedexGraphicData **param0, int param1, int param2, int param3);
@@ -92,7 +92,7 @@ static void ov21_021E1210(PokedexGraphicData **param0);
 static void ov21_021E1228(PokedexGraphicData **param0, const UnkStruct_ov21_021E0D68 *param1);
 static void ov21_021E1260(PokedexGraphicData **param0);
 
-void ov21_021E0C68(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void ov21_021E0C68(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021E0D68 *v0;
     PokedexGraphicData **v1;
@@ -161,12 +161,12 @@ void ov21_021E0CF8(PokedexScreenManager *param0, int param1)
     v0->unk_1C = 0;
 }
 
-static UnkStruct_ov21_021E0D68 *ov21_021E0D04(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021E0D68 *ov21_021E0D04(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021E0D68 *v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E0D68));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021E0D68));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021E0D68));
@@ -181,12 +181,12 @@ static UnkStruct_ov21_021E0D68 *ov21_021E0D04(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-static PokedexGraphicData **ov21_021E0D40(enum HeapId heapID, PokedexApp *param1)
+static PokedexGraphicData **ov21_021E0D40(enum HeapID heapID, PokedexApp *param1)
 {
     PokedexGraphicData **v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(PokedexGraphicData *));
+    v0 = Heap_Alloc(heapID, sizeof(PokedexGraphicData *));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(PokedexGraphicData *));
@@ -247,7 +247,7 @@ static int ov21_021E0DAC(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E14D4));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E14D4));
         memset(graphicsMan->pageGraphics, 0, sizeof(UnkStruct_ov21_021E14D4));
         graphicsMan->state++;
         break;
@@ -406,7 +406,7 @@ static void ov21_021E0FBC(PokedexGraphicData **param0, int heapID)
     Bg_ScheduleTilemapTransfer((*param0)->bgConfig, 3);
 }
 
-static void ov21_021E10D0(PokedexGraphicData **param0, const UnkStruct_ov21_021E0D68 *param1, enum HeapId heapID)
+static void ov21_021E10D0(PokedexGraphicData **param0, const UnkStruct_ov21_021E0D68 *param1, enum HeapID heapID)
 {
     Strbuf *v0 = Strbuf_Init(64, heapID);
     MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID);
diff --git a/src/applications/pokedex/ov21_021E1924.c b/src/applications/pokedex/ov21_021E1924.c
index dc7eebccad..5369922a54 100644
--- a/src/applications/pokedex/ov21_021E1924.c
+++ b/src/applications/pokedex/ov21_021E1924.c
@@ -73,9 +73,9 @@ typedef struct {
     u32 unk_C0;
 } UnkStruct_ov21_021E2588;
 
-static UnkStruct_ov21_021E1A7C *ov21_021E199C(enum HeapId heapID, PokedexApp *param1);
-static PokedexGraphicData **ov21_021E19FC(enum HeapId heapID, PokedexApp *param1);
-static UnkStruct_ov21_021D4660 *ov21_021E1A24(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021E1A7C *ov21_021E199C(enum HeapID heapID, PokedexApp *param1);
+static PokedexGraphicData **ov21_021E19FC(enum HeapID heapID, PokedexApp *param1);
+static UnkStruct_ov21_021D4660 *ov21_021E1A24(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021E1A7C(UnkStruct_ov21_021E1A7C *param0);
 static void ov21_021E1A90(PokedexGraphicData **param0);
 static void ov21_021E1AA4(UnkStruct_ov21_021D4660 *param0);
@@ -90,7 +90,7 @@ static void ov21_021E2588(UnkStruct_ov21_021E2588 *param0);
 static void ov21_021E25C0(UnkStruct_ov21_021E2588 *param0);
 static void ov21_021E25F8(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021E1A7C *param2, BOOL param3);
 static BOOL ov21_021E2664(UnkStruct_ov21_021E2588 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021E1A7C *param2, BOOL param3);
-static void ov21_021E1D40(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1, enum HeapId heapID);
+static void ov21_021E1D40(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1, enum HeapID heapID);
 static void ov21_021E1E00(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1);
 static void ov21_021E1E74(UnkStruct_ov21_021E1E74 *param0);
 static void ov21_021E1E8C(u32 param0, enum TouchScreenButtonState param1, void *param2);
@@ -131,7 +131,7 @@ static u32 const Unk_ov21_021E9D98[(7 - 2 + 1)] = {
     0x0
 };
 
-void ov21_021E1924(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void ov21_021E1924(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021E1A7C *v0;
     PokedexGraphicData **v1;
@@ -161,14 +161,14 @@ void ov21_021E1984(PokedexScreenManager *param0)
     ov21_021E1AA4(param0->screenStates);
 }
 
-static UnkStruct_ov21_021E1A7C *ov21_021E199C(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021E1A7C *ov21_021E199C(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021E1A7C *v0;
     PokedexScreenManager *v1;
     PokedexSortData *v2;
     int v3;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E1A7C));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021E1A7C));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021E1A7C));
@@ -191,12 +191,12 @@ static UnkStruct_ov21_021E1A7C *ov21_021E199C(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-static PokedexGraphicData **ov21_021E19FC(enum HeapId heapID, PokedexApp *param1)
+static PokedexGraphicData **ov21_021E19FC(enum HeapID heapID, PokedexApp *param1)
 {
     PokedexGraphicData **v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(PokedexGraphicData **));
+    v0 = Heap_Alloc(heapID, sizeof(PokedexGraphicData **));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(PokedexGraphicData **));
@@ -206,12 +206,12 @@ static PokedexGraphicData **ov21_021E19FC(enum HeapId heapID, PokedexApp *param1
     return v0;
 }
 
-static UnkStruct_ov21_021D4660 *ov21_021E1A24(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021D4660 *ov21_021E1A24(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021D4660 *v0;
     int v1 = ov21_021E1ACC();
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4660) * v1);
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4660) * v1);
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4660) * v1);
@@ -256,7 +256,7 @@ static int ov21_021E1AD0(PokedexDataManager *dataMan, void *data)
     UnkStruct_ov21_021E1E74 *v1 = dataMan->pageData;
     int v2;
 
-    v1 = Heap_AllocFromHeap(dataMan->heapID, sizeof(UnkStruct_ov21_021E1E74));
+    v1 = Heap_Alloc(dataMan->heapID, sizeof(UnkStruct_ov21_021E1E74));
     memset(v1, 0, sizeof(UnkStruct_ov21_021E1E74));
 
     for (v2 = 0; v2 < 8; v2++) {
@@ -315,7 +315,7 @@ static int ov21_021E1B68(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E2588));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E2588));
         memset(graphicsMan->pageGraphics, 0, sizeof(UnkStruct_ov21_021E2588));
         graphicsMan->state++;
         break;
@@ -418,9 +418,9 @@ static int ov21_021E1CB8(void *graphics, PokedexGraphicsManager *graphicsMan, co
     return 0;
 }
 
-static void ov21_021E1D40(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1, enum HeapId heapID)
+static void ov21_021E1D40(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1, enum HeapID heapID)
 {
-    param0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 8);
+    param0->unk_04 = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * 8);
 
     PokedexMain_SetHitTableRect(&param0->unk_04[0], 132 - (40 / 2), 132 + (40 / 2), 128 - (160 / 2), 128 + (160 / 2));
     PokedexMain_SetHitTableRect(&param0->unk_04[1], 76 - (40 / 2), 76 + (40 / 2), 128 - (160 / 2), 128 + (160 / 2));
diff --git a/src/applications/pokedex/ov21_021E29DC.c b/src/applications/pokedex/ov21_021E29DC.c
index 6da7b41065..25566715d9 100644
--- a/src/applications/pokedex/ov21_021E29DC.c
+++ b/src/applications/pokedex/ov21_021E29DC.c
@@ -90,9 +90,9 @@ typedef struct {
     SpriteResource *unk_18[4];
 } UnkStruct_ov21_021E3900;
 
-static UnkStruct_ov21_021E2BA8 *ov21_021E2A5C(enum HeapId heapID, PokedexApp *param1);
-static PokedexGraphicData **ov21_021E2AE0(enum HeapId heapID, PokedexApp *param1);
-static UnkStruct_ov21_021D4660 *ov21_021E2B08(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021E2BA8 *ov21_021E2A5C(enum HeapID heapID, PokedexApp *param1);
+static PokedexGraphicData **ov21_021E2AE0(enum HeapID heapID, PokedexApp *param1);
+static UnkStruct_ov21_021D4660 *ov21_021E2B08(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021E2BA8(UnkStruct_ov21_021E2BA8 *param0);
 static void ov21_021E2BBC(PokedexGraphicData **param0);
 static void ov21_021E2BD0(UnkStruct_ov21_021D4660 *param0);
@@ -121,9 +121,9 @@ static void ov21_021E3304(UnkStruct_ov21_021E326C *param0);
 static void ov21_021E3FC0(UnkStruct_ov21_021E326C *param0, int param1, int param2);
 static void ov21_021E3BE0(UnkStruct_ov21_021E326C *param0);
 static void ov21_021E3BFC(UnkStruct_ov21_021E326C *param0);
-static UnkStruct_ov21_021E342C *ov21_021E33C4(enum HeapId heapID, PokedexApp *param1);
-static PokedexGraphicData **ov21_021E3400(enum HeapId heapID, PokedexApp *param1);
-static UnkStruct_ov21_021D4660 *ov21_021E3428(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021E342C *ov21_021E33C4(enum HeapID heapID, PokedexApp *param1);
+static PokedexGraphicData **ov21_021E3400(enum HeapID heapID, PokedexApp *param1);
+static UnkStruct_ov21_021D4660 *ov21_021E3428(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021E342C(UnkStruct_ov21_021E342C *param0);
 static void ov21_021E3440(PokedexGraphicData **param0);
 static void ov21_021E3454(UnkStruct_ov21_021D4660 *param0);
@@ -135,12 +135,12 @@ static int ov21_021E3540(void *graphics, PokedexGraphicsManager *graphicsMan, co
 static int ov21_021E35D0(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan);
 static int ov21_021E3604(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan);
 static BOOL ov21_021E3C18(UnkStruct_ov21_021E342C *param0, int param1, int param2);
-static void ov21_021E3688(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, enum HeapId heapID);
+static void ov21_021E3688(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, enum HeapID heapID);
 static void ov21_021E3724(UnkStruct_ov21_021E342C *param0);
 static void ov21_021E3734(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1);
 static void ov21_021E37B4(UnkStruct_ov21_021E37B4 *param0);
 static void ov21_021E37CC(u32 param0, enum TouchScreenButtonState param1, void *param2);
-static void ov21_021E3C6C(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, enum HeapId heapID);
+static void ov21_021E3C6C(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, enum HeapID heapID);
 static void ov21_021E3D48(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1);
 static void ov21_021E3E74(UnkStruct_ov21_021E37B4 *param0);
 static void ov21_021E3E8C(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1);
@@ -163,7 +163,7 @@ static void ov21_021E3FE4(UnkStruct_ov21_021E3900 *param0, const UnkStruct_ov21_
 static void ov21_021E3BD8(UnkStruct_ov21_021E3900 *param0, PokedexGraphicData **param1, int param2);
 static void ov21_021E3BDC(UnkStruct_ov21_021E3900 *param0);
 
-void ov21_021E29DC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void ov21_021E29DC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021E2BA8 *v0;
     PokedexGraphicData **v1;
@@ -199,12 +199,12 @@ BOOL ov21_021E2A54(const PokedexScreenManager *param0)
     return v0->unk_28;
 }
 
-static UnkStruct_ov21_021E2BA8 *ov21_021E2A5C(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021E2BA8 *ov21_021E2A5C(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021E2BA8 *v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E2BA8));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021E2BA8));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021E2BA8));
@@ -240,12 +240,12 @@ static UnkStruct_ov21_021E2BA8 *ov21_021E2A5C(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-static PokedexGraphicData **ov21_021E2AE0(enum HeapId heapID, PokedexApp *param1)
+static PokedexGraphicData **ov21_021E2AE0(enum HeapID heapID, PokedexApp *param1)
 {
     PokedexGraphicData **v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(PokedexGraphicData **));
+    v0 = Heap_Alloc(heapID, sizeof(PokedexGraphicData **));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(PokedexGraphicData **));
@@ -255,12 +255,12 @@ static PokedexGraphicData **ov21_021E2AE0(enum HeapId heapID, PokedexApp *param1
     return v0;
 }
 
-static UnkStruct_ov21_021D4660 *ov21_021E2B08(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021D4660 *ov21_021E2B08(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021D4660 *v0;
     int v1 = ov21_021E2C20();
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4660) * v1);
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4660) * v1);
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4660) * v1);
@@ -356,7 +356,7 @@ static int ov21_021E2C64(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E326C));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E326C));
         memset(graphicsMan->pageGraphics, 0, sizeof(UnkStruct_ov21_021E326C));
         v3 = graphicsMan->pageGraphics;
         v3->unk_00 = v0->unk_08;
@@ -739,7 +739,7 @@ static void ov21_021E3320(UnkStruct_ov21_021E2BA8 *param0)
     param0->unk_10->unk_14 = 1;
 }
 
-void ov21_021E332C(PokedexScreenManager *screenMan, PokedexApp *param1, enum HeapId heapID)
+void ov21_021E332C(PokedexScreenManager *screenMan, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021E342C *v0;
     PokedexGraphicData **v1;
@@ -793,12 +793,12 @@ BOOL ov21_021E33BC(const PokedexScreenManager *screenMan)
     return v0->unk_30;
 }
 
-static UnkStruct_ov21_021E342C *ov21_021E33C4(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021E342C *ov21_021E33C4(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021E342C *v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E342C));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021E342C));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021E342C));
@@ -811,12 +811,12 @@ static UnkStruct_ov21_021E342C *ov21_021E33C4(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-static PokedexGraphicData **ov21_021E3400(enum HeapId heapID, PokedexApp *param1)
+static PokedexGraphicData **ov21_021E3400(enum HeapID heapID, PokedexApp *param1)
 {
     PokedexGraphicData **v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(PokedexGraphicData **));
+    v0 = Heap_Alloc(heapID, sizeof(PokedexGraphicData **));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(PokedexGraphicData **));
@@ -826,7 +826,7 @@ static PokedexGraphicData **ov21_021E3400(enum HeapId heapID, PokedexApp *param1
     return v0;
 }
 
-static UnkStruct_ov21_021D4660 *ov21_021E3428(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021D4660 *ov21_021E3428(enum HeapID heapID, PokedexApp *param1)
 {
     return NULL;
 }
@@ -859,7 +859,7 @@ static int ov21_021E345C(PokedexDataManager *dataMan, void *data)
     UnkStruct_ov21_021E37B4 *v1 = dataMan->pageData;
     int v2;
 
-    v1 = Heap_AllocFromHeap(dataMan->heapID, sizeof(UnkStruct_ov21_021E37B4));
+    v1 = Heap_Alloc(dataMan->heapID, sizeof(UnkStruct_ov21_021E37B4));
     memset(v1, 0, sizeof(UnkStruct_ov21_021E37B4));
 
     ov21_021E3688(v1, v0, dataMan->heapID);
@@ -933,7 +933,7 @@ static int ov21_021E3540(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E3900));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E3900));
         memset(graphicsMan->pageGraphics, 0, sizeof(UnkStruct_ov21_021E3900));
         graphicsMan->state++;
         break;
@@ -1013,9 +1013,9 @@ static int ov21_021E3604(void *graphics, PokedexGraphicsManager *graphicsMan, co
     return 0;
 }
 
-static void ov21_021E3688(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, enum HeapId heapID)
+static void ov21_021E3688(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, enum HeapID heapID)
 {
-    param0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 6);
+    param0->unk_04 = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * 6);
 
     PokedexMain_SetHitTableRect(&param0->unk_04[0], 24 - (32 / 2), 24 + (32 / 2), 28 - (40 / 2), 28 + (40 / 2));
     PokedexMain_SetHitTableRect(&param0->unk_04[5], 24 - (32 / 2), 24 + (32 / 2), 228 - (40 / 2), 228 + (40 / 2));
@@ -1364,11 +1364,11 @@ static void ov21_021E3C64(UnkStruct_ov21_021E342C *param0)
     param0->unk_2C = 0;
 }
 
-static void ov21_021E3C6C(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, enum HeapId heapID)
+static void ov21_021E3C6C(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, enum HeapID heapID)
 {
     int v0;
 
-    param0->unk_18 = Heap_AllocFromHeap(heapID, sizeof(PokedexCursorData) * 6);
+    param0->unk_18 = Heap_Alloc(heapID, sizeof(PokedexCursorData) * 6);
 
     PokedexPanel_InitCursorData(&param0->unk_18[0], 28, 24, 24, 16, 0, 0, 0);
     PokedexPanel_InitCursorData(&param0->unk_18[1], 68, 24, 24, 16, 0, 0, 1);
diff --git a/src/applications/pokedex/ov21_021E3FFC.c b/src/applications/pokedex/ov21_021E3FFC.c
index 81be246158..c4b887540d 100644
--- a/src/applications/pokedex/ov21_021E3FFC.c
+++ b/src/applications/pokedex/ov21_021E3FFC.c
@@ -72,8 +72,8 @@ typedef struct {
     int unk_32C;
 } UnkStruct_ov21_021E4360;
 
-static UnkStruct_ov21_021E40F4 *ov21_021E4080(enum HeapId heapID, PokedexApp *param1);
-static UnkStruct_ov21_021E4108 *ov21_021E40C8(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021E40F4 *ov21_021E4080(enum HeapID heapID, PokedexApp *param1);
+static UnkStruct_ov21_021E4108 *ov21_021E40C8(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021E40F4(UnkStruct_ov21_021E40F4 *param0);
 static void ov21_021E4108(UnkStruct_ov21_021E4108 *param0);
 static int ov21_021E411C(void);
@@ -113,7 +113,7 @@ static void ov21_021E4B30(UnkStruct_ov21_021E4B30 *param0, int param1);
 static void ov21_021E4B94(UnkStruct_ov21_021E4B30 *param0, int param1);
 static void ov21_021E4C38(Sprite *param0, int param1);
 
-void ov21_021E3FFC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void ov21_021E3FFC(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021E40F4 *v0 = ov21_021E4080(heapID, param1);
     UnkStruct_ov21_021E4108 *v1 = ov21_021E40C8(heapID, param1);
@@ -156,12 +156,12 @@ void ov21_021E4078(PokedexScreenManager *param0, int param1)
     v0->unk_10 = param1;
 }
 
-static UnkStruct_ov21_021E40F4 *ov21_021E4080(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021E40F4 *ov21_021E4080(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021E40F4 *v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E40F4));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021E40F4));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021E40F4));
@@ -174,12 +174,12 @@ static UnkStruct_ov21_021E40F4 *ov21_021E4080(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-static UnkStruct_ov21_021E4108 *ov21_021E40C8(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021E4108 *ov21_021E40C8(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021E4108 *v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E4108));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021E4108));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021E4108));
@@ -212,7 +212,7 @@ static int ov21_021E4120(PokedexDataManager *dataMan, void *data)
     UnkStruct_ov21_021E4898 *v1;
     int species = PokedexSort_CurrentSpecies(v0->unk_04);
 
-    v1 = Heap_AllocFromHeap(dataMan->heapID, sizeof(UnkStruct_ov21_021E4898));
+    v1 = Heap_Alloc(dataMan->heapID, sizeof(UnkStruct_ov21_021E4898));
 
     GF_ASSERT(v1);
     memset(v1, 0, sizeof(UnkStruct_ov21_021E4898));
@@ -266,7 +266,7 @@ static int ov21_021E41A8(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E4360));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E4360));
         memset(graphicsMan->pageGraphics, 0, sizeof(UnkStruct_ov21_021E4360));
         graphicsMan->state++;
         break;
diff --git a/src/applications/pokedex/ov21_021E68F4.c b/src/applications/pokedex/ov21_021E68F4.c
index 1fd2dfc4a7..6f39795663 100644
--- a/src/applications/pokedex/ov21_021E68F4.c
+++ b/src/applications/pokedex/ov21_021E68F4.c
@@ -62,9 +62,9 @@ typedef struct {
     void *unk_38[2];
 } UnkStruct_ov21_021E6C60;
 
-static UnkStruct_ov21_021E6A20 *ov21_021E696C(enum HeapId heapID, PokedexApp *param1);
-static PokedexGraphicData **ov21_021E69B0(enum HeapId heapID, PokedexApp *param1);
-static UnkStruct_ov21_021D4660 *ov21_021E69D8(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021E6A20 *ov21_021E696C(enum HeapID heapID, PokedexApp *param1);
+static PokedexGraphicData **ov21_021E69B0(enum HeapID heapID, PokedexApp *param1);
+static UnkStruct_ov21_021D4660 *ov21_021E69D8(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021E6A20(UnkStruct_ov21_021E6A20 *param0);
 static void ov21_021E6A34(PokedexGraphicData **param0);
 static void ov21_021E6A48(UnkStruct_ov21_021D4660 *param0);
@@ -79,7 +79,7 @@ static void ov21_021E6C60(UnkStruct_ov21_021E6C60 *param0);
 static void ov21_021E6C88(UnkStruct_ov21_021E6C60 *param0);
 static void ov21_021E6CB0(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021E6A20 *param2, BOOL param3);
 static BOOL ov21_021E6D1C(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021E6A20 *param2, BOOL param3);
-static void ov21_021E6D58(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1, enum HeapId heapID);
+static void ov21_021E6D58(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1, enum HeapID heapID);
 static void ov21_021E6DAC(UnkStruct_ov21_021E6DAC *param0);
 static void ov21_021E6DBC(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1);
 static void ov21_021E6DEC(UnkStruct_ov21_021E6DAC *param0);
@@ -99,7 +99,7 @@ static void ov21_021E70BC(UnkStruct_ov21_021E6C60 *param0);
 static void ov21_021E70D4(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1, int param2);
 static void ov21_021E71B8(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **param1);
 
-void ov21_021E68F4(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void ov21_021E68F4(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021E6A20 *v0;
     PokedexGraphicData **v1;
@@ -129,9 +129,9 @@ void ov21_021E6954(PokedexScreenManager *param0)
     ov21_021E6A48(param0->screenStates);
 }
 
-static UnkStruct_ov21_021E6A20 *ov21_021E696C(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021E6A20 *ov21_021E696C(enum HeapID heapID, PokedexApp *param1)
 {
-    UnkStruct_ov21_021E6A20 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E6A20));
+    UnkStruct_ov21_021E6A20 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021E6A20));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021E6A20));
@@ -144,12 +144,12 @@ static UnkStruct_ov21_021E6A20 *ov21_021E696C(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-static PokedexGraphicData **ov21_021E69B0(enum HeapId heapID, PokedexApp *param1)
+static PokedexGraphicData **ov21_021E69B0(enum HeapID heapID, PokedexApp *param1)
 {
     PokedexGraphicData **v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(PokedexGraphicData **));
+    v0 = Heap_Alloc(heapID, sizeof(PokedexGraphicData **));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(PokedexGraphicData **));
@@ -159,12 +159,12 @@ static PokedexGraphicData **ov21_021E69B0(enum HeapId heapID, PokedexApp *param1
     return v0;
 }
 
-static UnkStruct_ov21_021D4660 *ov21_021E69D8(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021D4660 *ov21_021E69D8(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021D4660 *v0;
     int v1 = ov21_021E6A68();
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4660) * v1);
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4660) * v1);
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4660) * v1);
@@ -208,7 +208,7 @@ static int ov21_021E6A6C(PokedexDataManager *dataMan, void *data)
     UnkStruct_ov21_021E6DAC *v1 = dataMan->pageData;
     int v2;
 
-    v1 = Heap_AllocFromHeap(dataMan->heapID, sizeof(UnkStruct_ov21_021E6DAC));
+    v1 = Heap_Alloc(dataMan->heapID, sizeof(UnkStruct_ov21_021E6DAC));
     memset(v1, 0, sizeof(UnkStruct_ov21_021E6DAC));
 
     for (v2 = 0; v2 < 2; v2++) {
@@ -271,7 +271,7 @@ static int ov21_021E6B20(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E6C60));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E6C60));
         memset(graphicsMan->pageGraphics, 0, sizeof(UnkStruct_ov21_021E6C60));
         graphicsMan->state++;
         break;
@@ -399,9 +399,9 @@ static BOOL ov21_021E6D1C(UnkStruct_ov21_021E6C60 *param0, PokedexGraphicData **
     return 0;
 }
 
-static void ov21_021E6D58(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1, enum HeapId heapID)
+static void ov21_021E6D58(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1, enum HeapID heapID)
 {
-    param0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 2);
+    param0->unk_04 = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * 2);
 
     PokedexMain_SetHitTableRect(&param0->unk_04[0], 120 - (112 / 2), 120 + (112 / 2), 68 - (120 / 2), 68 + (120 / 2));
     PokedexMain_SetHitTableRect(&param0->unk_04[1], 120 - (112 / 2), 120 + (112 / 2), 188 - (120 / 2), 188 + (120 / 2));
diff --git a/src/applications/pokedex/ov21_021E737C.c b/src/applications/pokedex/ov21_021E737C.c
index 64b47c4541..a0650f0acf 100644
--- a/src/applications/pokedex/ov21_021E737C.c
+++ b/src/applications/pokedex/ov21_021E737C.c
@@ -130,8 +130,8 @@ typedef struct {
     u16 *unk_C0;
 } UnkStruct_ov21_021E7714;
 
-static UnkStruct_ov21_021E7468 *ov21_021E73E8(enum HeapId heapID, PokedexApp *param1);
-static UnkStruct_ov21_021E747C *ov21_021E7424(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021E7468 *ov21_021E73E8(enum HeapID heapID, PokedexApp *param1);
+static UnkStruct_ov21_021E747C *ov21_021E7424(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021E7468(UnkStruct_ov21_021E7468 *param0);
 static void ov21_021E747C(UnkStruct_ov21_021E747C *param0);
 static int ov21_021E749C(void);
@@ -145,17 +145,17 @@ static void ov21_021E7714(UnkStruct_ov21_021E7714 *param0);
 static void ov21_021E7718(UnkStruct_ov21_021E7714 *param0);
 static void ov21_021E771C(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, BOOL param3);
 static BOOL ov21_021E77A4(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, BOOL param3);
-static void ov21_021E7800(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, const UnkStruct_ov21_021E74A0 *param3, enum HeapId heapID);
+static void ov21_021E7800(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, const UnkStruct_ov21_021E74A0 *param3, enum HeapID heapID);
 static void ov21_021E785C(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1);
-static void ov21_021E789C(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, enum HeapId heapID);
-static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapId heapID);
+static void ov21_021E789C(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, enum HeapID heapID);
+static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapID heapID);
 static void ov21_021E7AA0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1);
-static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapId heapID);
+static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapID heapID);
 static void ov21_021E7CCC(UnkStruct_ov21_021E7714 *param0);
-static void ov21_021E7CF0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapId heapID);
+static void ov21_021E7CF0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapID heapID);
 static void ov21_021E7CF4(UnkStruct_ov21_021E7714 *param0);
-static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, enum HeapId heapID);
-static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, enum HeapId heapID);
+static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, enum HeapID heapID);
+static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, enum HeapID heapID);
 static void ov21_021E7EC0(UnkStruct_ov21_021E747C *param0, int heapID);
 static void ov21_021E7F20(UnkStruct_ov21_021E747C *param0);
 static void ov21_021E7F40(UnkStruct_ov21_021E747C *param0, int param1);
@@ -191,7 +191,7 @@ const static UnkStruct_ov21_021E9DB0 Unk_ov21_021E9DB0[17] = {
     { 0xFFFF, 0x0, 0x480, 0xAAA, 0x1, 0xFFFFFFFFFFFFFFF0 }
 };
 
-void ov21_021E737C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void ov21_021E737C(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021E7468 *v0 = ov21_021E73E8(heapID, param1);
     UnkStruct_ov21_021E747C *v1 = ov21_021E7424(heapID, param1);
@@ -214,9 +214,9 @@ void ov21_021E73D4(PokedexScreenManager *param0)
     ov21_021E747C(param0->pageGraphics);
 }
 
-static UnkStruct_ov21_021E7468 *ov21_021E73E8(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021E7468 *ov21_021E73E8(enum HeapID heapID, PokedexApp *param1)
 {
-    UnkStruct_ov21_021E7468 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E7468));
+    UnkStruct_ov21_021E7468 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021E7468));
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021E7468));
 
@@ -226,12 +226,12 @@ static UnkStruct_ov21_021E7468 *ov21_021E73E8(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-UnkStruct_ov21_021E747C *ov21_021E7424(enum HeapId heapID, PokedexApp *param1)
+UnkStruct_ov21_021E747C *ov21_021E7424(enum HeapID heapID, PokedexApp *param1)
 {
     UnkStruct_ov21_021E747C *v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E747C));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021E747C));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021E747C));
@@ -273,7 +273,7 @@ static int ov21_021E74A0(PokedexDataManager *dataMan, void *data)
     int v3;
     int species;
 
-    v1 = Heap_AllocFromHeap(dataMan->heapID, sizeof(UnkStruct_ov21_021E74A0));
+    v1 = Heap_Alloc(dataMan->heapID, sizeof(UnkStruct_ov21_021E74A0));
 
     GF_ASSERT(v1);
     memset(v1, 0, sizeof(UnkStruct_ov21_021E74A0));
@@ -335,7 +335,7 @@ static int ov21_021E7530(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E7714));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E7714));
         memset(graphicsMan->pageGraphics, 0, sizeof(UnkStruct_ov21_021E7714));
         v3 = graphicsMan->pageGraphics;
         v3->unk_B8 = 1;
@@ -499,7 +499,7 @@ static BOOL ov21_021E77A4(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74
     return 0;
 }
 
-static void ov21_021E7800(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, const UnkStruct_ov21_021E74A0 *param3, enum HeapId heapID)
+static void ov21_021E7800(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, const UnkStruct_ov21_021E74A0 *param3, enum HeapID heapID)
 {
     ov21_021E789C(param1, param2, heapID);
     ov21_021E7CF8(param1, heapID);
@@ -525,7 +525,7 @@ static void ov21_021E785C(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74
     sub_020152BC(param1->unk_0C, 0);
 }
 
-static void ov21_021E789C(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, enum HeapId heapID)
+static void ov21_021E789C(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, enum HeapID heapID)
 {
     void *v0;
     NNSG2dScreenData *v1;
@@ -539,7 +539,7 @@ static void ov21_021E789C(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_
     Bg_ScheduleTilemapTransfer(param0->unk_00->bgConfig, 3);
 }
 
-static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapId heapID)
+static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapID heapID)
 {
     PokedexGraphicData *v0 = param1->unk_00;
     int v1, v2, v3, v4;
@@ -565,7 +565,7 @@ static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74
     GF_ASSERT(v6);
 
     {
-        param0->unk_BC = Heap_AllocFromHeap(heapID, 32 * 3);
+        param0->unk_BC = Heap_Alloc(heapID, 32 * 3);
     }
 
     param0->unk_14[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v9, v3, 0, 8000, 2, heapID);
@@ -580,7 +580,7 @@ static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74
     SpriteTransfer_RequestPlttFreeSpace(param0->unk_24[1]);
 
     {
-        param0->unk_C0 = Heap_AllocFromHeap(heapID, 32 * 5);
+        param0->unk_C0 = Heap_Alloc(heapID, 32 * 5);
     }
 
     param0->unk_24[2] = SpriteResourceCollection_AddFrom(v0->spriteResourceCollection[2], v7, 91, 1, 91 + 7000, 2, heapID);
@@ -613,7 +613,7 @@ static void ov21_021E7AA0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74
     Heap_Free(param0->unk_C0);
 }
 
-static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapId heapID)
+static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapID heapID)
 {
     SpriteResourcesHeader v0;
     SpriteListTemplate v1;
@@ -685,7 +685,7 @@ static void ov21_021E7CCC(UnkStruct_ov21_021E7714 *param0)
     Sprite_Delete(param0->unk_0C[1]);
 }
 
-static void ov21_021E7CF0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapId heapID)
+static void ov21_021E7CF0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapID heapID)
 {
     return;
 }
@@ -695,7 +695,7 @@ static void ov21_021E7CF4(UnkStruct_ov21_021E7714 *param0)
     return;
 }
 
-static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, enum HeapId heapID)
+static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, enum HeapID heapID)
 {
     Strbuf *v0 = Strbuf_Init(32, heapID);
     MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID);
@@ -715,7 +715,7 @@ static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, enum HeapId heapID)
     MessageLoader_Free(pokedexMessageBank);
 }
 
-static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, enum HeapId heapID)
+static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, enum HeapID heapID)
 {
     Strbuf *v0 = Strbuf_Init(32, heapID);
     int species = PokedexSort_CurrentSpecies(param1->unk_00);
diff --git a/src/applications/pokedex/ov21_021E8484.c b/src/applications/pokedex/ov21_021E8484.c
index f6d06f9442..677e98afcd 100644
--- a/src/applications/pokedex/ov21_021E8484.c
+++ b/src/applications/pokedex/ov21_021E8484.c
@@ -62,9 +62,9 @@ typedef struct {
     void *unk_2C[1];
 } UnkStruct_ov21_021E8794;
 
-static UnkStruct_ov21_021E8570 *ov21_021E84FC(enum HeapId heapID, PokedexApp *param1);
-static PokedexGraphicData **ov21_021E8544(enum HeapId heapID, PokedexApp *param1);
-static UnkStruct_ov21_021D4660 *ov21_021E856C(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021E8570 *ov21_021E84FC(enum HeapID heapID, PokedexApp *param1);
+static PokedexGraphicData **ov21_021E8544(enum HeapID heapID, PokedexApp *param1);
+static UnkStruct_ov21_021D4660 *ov21_021E856C(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021E8570(UnkStruct_ov21_021E8570 *param0);
 static void ov21_021E8584(PokedexGraphicData **param0);
 static void ov21_021E8598(UnkStruct_ov21_021D4660 *param0);
@@ -79,7 +79,7 @@ static void ov21_021E8794(UnkStruct_ov21_021E8794 *param0);
 static void ov21_021E87AC(UnkStruct_ov21_021E8794 *param0);
 static void ov21_021E87C4(UnkStruct_ov21_021E8794 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021E8570 *param2, BOOL param3);
 static BOOL ov21_021E8830(UnkStruct_ov21_021E8794 *param0, PokedexGraphicData **param1, const UnkStruct_ov21_021E8570 *param2, BOOL param3);
-static void ov21_021E886C(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1, enum HeapId heapID);
+static void ov21_021E886C(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1, enum HeapID heapID);
 static void ov21_021E88B0(UnkStruct_ov21_021E88B0 *param0);
 static void ov21_021E88B8(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1);
 static void ov21_021E88D0(UnkStruct_ov21_021E88B0 *param0);
@@ -100,7 +100,7 @@ static void ov21_021E8B34(UnkStruct_ov21_021E8794 *param0);
 static void ov21_021E8B40(UnkStruct_ov21_021E8794 *param0, PokedexGraphicData **param1, int param2);
 static void ov21_021E8BDC(UnkStruct_ov21_021E8794 *param0, PokedexGraphicData **param1);
 
-void ov21_021E8484(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void ov21_021E8484(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021E8570 *v0;
     PokedexGraphicData **v1;
@@ -130,9 +130,9 @@ void ov21_021E84E4(PokedexScreenManager *param0)
     ov21_021E8598(param0->screenStates);
 }
 
-static UnkStruct_ov21_021E8570 *ov21_021E84FC(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021E8570 *ov21_021E84FC(enum HeapID heapID, PokedexApp *param1)
 {
-    UnkStruct_ov21_021E8570 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E8570));
+    UnkStruct_ov21_021E8570 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021E8570));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021E8570));
@@ -145,12 +145,12 @@ static UnkStruct_ov21_021E8570 *ov21_021E84FC(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-static PokedexGraphicData **ov21_021E8544(enum HeapId heapID, PokedexApp *param1)
+static PokedexGraphicData **ov21_021E8544(enum HeapID heapID, PokedexApp *param1)
 {
     PokedexGraphicData **v0;
     PokedexScreenManager *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(PokedexGraphicData **));
+    v0 = Heap_Alloc(heapID, sizeof(PokedexGraphicData **));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(PokedexGraphicData **));
@@ -160,7 +160,7 @@ static PokedexGraphicData **ov21_021E8544(enum HeapId heapID, PokedexApp *param1
     return v0;
 }
 
-static UnkStruct_ov21_021D4660 *ov21_021E856C(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021D4660 *ov21_021E856C(enum HeapID heapID, PokedexApp *param1)
 {
     return NULL;
 }
@@ -193,7 +193,7 @@ static int ov21_021E85A0(PokedexDataManager *dataMan, void *data)
     UnkStruct_ov21_021E88B0 *v1 = dataMan->pageData;
     int v2;
 
-    v1 = Heap_AllocFromHeap(dataMan->heapID, sizeof(UnkStruct_ov21_021E88B0));
+    v1 = Heap_Alloc(dataMan->heapID, sizeof(UnkStruct_ov21_021E88B0));
     memset(v1, 0, sizeof(UnkStruct_ov21_021E88B0));
 
     for (v2 = 0; v2 < 1; v2++) {
@@ -259,7 +259,7 @@ static int ov21_021E8654(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E8794));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(UnkStruct_ov21_021E8794));
         memset(graphicsMan->pageGraphics, 0, sizeof(UnkStruct_ov21_021E8794));
         graphicsMan->state++;
         break;
@@ -387,9 +387,9 @@ static BOOL ov21_021E8830(UnkStruct_ov21_021E8794 *param0, PokedexGraphicData **
     return 0;
 }
 
-static void ov21_021E886C(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1, enum HeapId heapID)
+static void ov21_021E886C(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1, enum HeapID heapID)
 {
-    param0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTable) * 1);
+    param0->unk_04 = Heap_Alloc(heapID, sizeof(TouchScreenHitTable) * 1);
 
     PokedexMain_SetHitTableRect(&param0->unk_04[0], 144 - (80 / 2), 144 + (80 / 2), 128 - (240 / 2), 128 + (240 / 2));
 
diff --git a/src/applications/pokedex/ov21_021E8D48.c b/src/applications/pokedex/ov21_021E8D48.c
index cbfc237707..3b57dc361b 100644
--- a/src/applications/pokedex/ov21_021E8D48.c
+++ b/src/applications/pokedex/ov21_021E8D48.c
@@ -112,7 +112,7 @@ static void ov21_021E968C(UnkStruct_ov21_021E968C *param0);
 static void ov21_021E96A8(BgConfig *param0, int param1, NARC *param2);
 static void ov21_021E97C4(BgConfig *param0, int param1, NARC *param2);
 static void ov21_021E9968(Window *param0, int param1, int param2);
-static void ov21_021E998C(Window *param0, enum HeapId heapID);
+static void ov21_021E998C(Window *param0, enum HeapID heapID);
 static void ov21_021E9A0C(int param0);
 static void ov21_021E9A38(void);
 static void ov21_021E9A40(UnkStruct_ov21_021E9A9C *param0, int param1, int param2, NARC *param3);
@@ -123,7 +123,7 @@ static void ov21_021E9B08(UnkStruct_ov21_021E9A9C *param0, int param1);
 
 UnkStruct_ov21_021E8D48 *ov21_021E8D48(const UnkStruct_ov21_021E8E0C *param0)
 {
-    UnkStruct_ov21_021E8D48 *v0 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov21_021E8D48));
+    UnkStruct_ov21_021E8D48 *v0 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_ov21_021E8D48));
 
     memset(v0, 0, sizeof(UnkStruct_ov21_021E8D48));
 
@@ -727,7 +727,7 @@ static void ov21_021E9968(Window *param0, int param1, int param2)
     ov21_021E998C(param0, param1);
 }
 
-static void ov21_021E998C(Window *param0, enum HeapId heapID)
+static void ov21_021E998C(Window *param0, enum HeapID heapID)
 {
     Strbuf *v0 = Strbuf_Init(64, heapID);
     MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID);
diff --git a/src/applications/pokedex/pokedex_enc_data.c b/src/applications/pokedex/pokedex_enc_data.c
index 4c0b3770f8..758aaa77bb 100644
--- a/src/applications/pokedex/pokedex_enc_data.c
+++ b/src/applications/pokedex/pokedex_enc_data.c
@@ -21,7 +21,7 @@ enum PokedexEncFileIndex {
     PEFI_FIELDSPECIALNATDEX = (4 + MAX_SPECIES * 9),
 };
 
-void PokedexEncData_PopulateEncounterLocations(EncounterLocations *encounterLocations, int species, int encounterCategory, enum HeapId heapID)
+void PokedexEncData_PopulateEncounterLocations(EncounterLocations *encounterLocations, int species, int encounterCategory, enum HeapID heapID)
 {
     int fileIndex;
     u32 fileSize;
@@ -74,7 +74,7 @@ void PokedexEncData_FreeEncounterLocations(EncounterLocations *encounterLocation
     encounterLocations->numLocations = 0;
 }
 
-DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(enum HeapId heapID, int *numDungeons)
+DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(enum HeapID heapID, int *numDungeons)
 {
     u32 fileSize;
 
@@ -87,7 +87,7 @@ DungeonCoordinates *PokedexEncData_GetDungeonCoordinates(enum HeapId heapID, int
     return dungeonCoordinatesArray;
 }
 
-FieldCoordinates *PokedexEncData_GetFieldCoordinates(enum HeapId heapID, int *numFields)
+FieldCoordinates *PokedexEncData_GetFieldCoordinates(enum HeapID heapID, int *numFields)
 {
     u32 fileSize;
 
diff --git a/src/applications/pokedex/pokedex_graphics.c b/src/applications/pokedex/pokedex_graphics.c
index ca13e836a8..a80622ae94 100644
--- a/src/applications/pokedex/pokedex_graphics.c
+++ b/src/applications/pokedex/pokedex_graphics.c
@@ -13,19 +13,19 @@
 #include "unk_02012744.h"
 #include "unk_02015064.h"
 
-static void InitBackgrounds(BgConfig *bgConfig, enum HeapId heapID);
+static void InitBackgrounds(BgConfig *bgConfig, enum HeapID heapID);
 static void FreeBackgrounds(BgConfig *bgConfig);
-static void InitWindow(PokedexGraphicData *pokedexGraphicData, enum HeapId heapID);
+static void InitWindow(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID);
 static void FreeWindow(PokedexGraphicData *pokedexGraphicData);
-static void NewPokemonSprite(PokedexGraphicData *pokedexGraphicData, enum HeapId heapID);
+static void NewPokemonSprite(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID);
 static void FreePokemonSprite(PokedexGraphicData *pokedexGraphicData);
-static void InitSpeciesLabelGraphics(PokedexGraphicData *pokedexGraphicData, enum HeapId heapID);
+static void InitSpeciesLabelGraphics(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID);
 static void FreeSpeciesLabelGraphics(PokedexGraphicData *pokedexGraphicData);
-static void InitSpeciesLabel(PokedexGraphicData *pokedexGraphicData, enum HeapId heapID);
+static void InitSpeciesLabel(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID);
 static void FreeSpeciesLabel(PokedexGraphicData *pokedexGraphicData);
-static void InitCursorGraphics(PokedexGraphicData *pokedexGraphicData, enum HeapId heapID);
+static void InitCursorGraphics(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID);
 static void FreeCursorGraphics(PokedexGraphicData *pokedexGraphicData);
-static void InitCursor(PokedexGraphicData *pokedexGraphicData, enum HeapId heapID);
+static void InitCursor(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID);
 static void FreeCursor(PokedexGraphicData *pokedexGraphicData);
 static void StartCursorPulse(PokedexGraphicData *pokedexGraphicData);
 static void EndCursorPulse(PokedexGraphicData *pokedexGraphicData);
@@ -36,7 +36,7 @@ static void EndCursorTransform(PokedexGraphicData *pokedexGraphicData);
 static void InsitigateCursorTransformation(PokedexGraphicData *pokedexGraphicData, int x, int y, int width, int height);
 static void TransformCursor(SysTask *sysTask, void *data);
 
-void PokedexGraphics_Init(PokedexGraphicData *pokedexGraphicData, enum HeapId heapID)
+void PokedexGraphics_Init(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID)
 {
     GraphicsModes graphicsModes;
     PokedexTextManagerTemplate textManTemplate;
@@ -426,13 +426,13 @@ NARC *PokedexGraphics_GetNARC(PokedexGraphicData *pokedexGraphicData)
     return pokedexGraphicData->pokedexGraphics;
 }
 
-static void *LoadGraphicsFile(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, enum HeapId heapID)
+static void *LoadGraphicsFile(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, enum HeapID heapID)
 {
     void *graphicFile = NARC_AllocAndReadWholeMember(pokedexGraphicData->pokedexGraphics, memberIndex, heapID);
 
     if (graphicFile != NULL) {
         if (isCompressed) {
-            void *uncompressedGraphicFile = Heap_AllocFromHeap(heapID, MI_GetUncompressedSize(graphicFile));
+            void *uncompressedGraphicFile = Heap_Alloc(heapID, MI_GetUncompressedSize(graphicFile));
 
             if (uncompressedGraphicFile) {
                 MI_UncompressLZ8(graphicFile, uncompressedGraphicFile);
@@ -446,7 +446,7 @@ static void *LoadGraphicsFile(PokedexGraphicData *pokedexGraphicData, u32 member
     return graphicFile;
 }
 
-u32 PokedexGraphics_LoadGraphicNarcCharacterData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BgConfig *bgConfig, u32 bgLayer, u32 tileStart, u32 size, BOOL isCompressed, enum HeapId heapID)
+u32 PokedexGraphics_LoadGraphicNarcCharacterData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BgConfig *bgConfig, u32 bgLayer, u32 tileStart, u32 size, BOOL isCompressed, enum HeapID heapID)
 {
     void *graphicFile = LoadGraphicsFile(pokedexGraphicData, memberIndex, isCompressed, heapID);
 
@@ -467,7 +467,7 @@ u32 PokedexGraphics_LoadGraphicNarcCharacterData(PokedexGraphicData *pokedexGrap
     return size;
 }
 
-void PokedexGraphics_LoadGraphicNarcPaletteData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, enum PaletteLoadLocation loadLocation, u32 offset, u32 szByte, enum HeapId heapID)
+void PokedexGraphics_LoadGraphicNarcPaletteData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, enum PaletteLoadLocation loadLocation, u32 offset, u32 szByte, enum HeapID heapID)
 {
     static void (*const sPaletteLoadFuncs[])(const void *, u32, u32) = {
         GX_LoadBGPltt,
@@ -498,7 +498,7 @@ void PokedexGraphics_LoadGraphicNarcPaletteData(PokedexGraphicData *pokedexGraph
     }
 }
 
-void *PokedexGraphics_GetGraphicNarcScreenData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dScreenData **screenData, enum HeapId heapID)
+void *PokedexGraphics_GetGraphicNarcScreenData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dScreenData **screenData, enum HeapID heapID)
 {
     void *graphicFile = LoadGraphicsFile(pokedexGraphicData, memberIndex, isCompressed, heapID);
 
@@ -512,7 +512,7 @@ void *PokedexGraphics_GetGraphicNarcScreenData(PokedexGraphicData *pokedexGraphi
     return graphicFile;
 }
 
-void *PokedexGraphics_GetGraphicNarcPaletteData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, NNSG2dPaletteData **paletteData, enum HeapId heapID)
+void *PokedexGraphics_GetGraphicNarcPaletteData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, NNSG2dPaletteData **paletteData, enum HeapID heapID)
 {
     void *graphicFile = LoadGraphicsFile(pokedexGraphicData, memberIndex, FALSE, heapID);
 
@@ -526,7 +526,7 @@ void *PokedexGraphics_GetGraphicNarcPaletteData(PokedexGraphicData *pokedexGraph
     return graphicFile;
 }
 
-void *PokedexGraphics_GetGraphicNarcCharacterData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dCharacterData **characterData, enum HeapId heapID)
+void *PokedexGraphics_GetGraphicNarcCharacterData(PokedexGraphicData *pokedexGraphicData, u32 memberIndex, BOOL isCompressed, NNSG2dCharacterData **characterData, enum HeapID heapID)
 {
     void *graphicFile = LoadGraphicsFile(pokedexGraphicData, memberIndex, isCompressed, heapID);
 
@@ -540,7 +540,7 @@ void *PokedexGraphics_GetGraphicNarcCharacterData(PokedexGraphicData *pokedexGra
     return graphicFile;
 }
 
-static void InitBackgrounds(BgConfig *bgConfig, enum HeapId heapID)
+static void InitBackgrounds(BgConfig *bgConfig, enum HeapID heapID)
 {
     BgTemplate bgT0 = {
         .x = 0,
@@ -670,7 +670,7 @@ static void FreeBackgrounds(BgConfig *bgConfig)
     Bg_FreeTilemapBuffer(bgConfig, BG_LAYER_SUB_2);
 }
 
-static void InitWindow(PokedexGraphicData *pokedexGraphicData, enum HeapId heapID)
+static void InitWindow(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID)
 {
     Window_Add(pokedexGraphicData->bgConfig, &pokedexGraphicData->window, 1, 0, 0, 32, 32, 0, 0);
     Window_FillTilemap(&pokedexGraphicData->window, 0);
@@ -682,7 +682,7 @@ static void FreeWindow(PokedexGraphicData *pokedexGraphicData)
     Window_Remove(&pokedexGraphicData->window);
 }
 
-static void NewPokemonSprite(PokedexGraphicData *pokedexGraphicData, enum HeapId heapID)
+static void NewPokemonSprite(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID)
 {
     pokedexGraphicData->spriteMan = PokemonSpriteManager_New(heapID);
 
@@ -721,7 +721,7 @@ static void FreePokemonSprite(PokedexGraphicData *pokedexGraphicData)
     sub_020150A8(pokedexGraphicData->unk_164);
 }
 
-static void InitSpeciesLabelGraphics(PokedexGraphicData *pokedexGraphicData, enum HeapId heapID)
+static void InitSpeciesLabelGraphics(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID)
 {
     PokedexSpeciesLabel *pokedexSpeciesLabel = &pokedexGraphicData->pokedexSpeciesLabel;
     NARC *pokedexGraphicsNARC = PokedexGraphics_GetNARC(pokedexGraphicData);
@@ -740,7 +740,7 @@ static void InitSpeciesLabelGraphics(PokedexGraphicData *pokedexGraphicData, enu
     pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_ANIM] = SpriteResourceCollection_AddFrom(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], pokedexGraphicsNARC, 77, 1, 3000, 3, heapID);
 }
 
-void PokedexGraphics_InitSpeciesLabelGraphics(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteResourceCollection **spriteResourceCollection, enum HeapId heapID, NARC *narc)
+void PokedexGraphics_InitSpeciesLabelGraphics(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteResourceCollection **spriteResourceCollection, enum HeapID heapID, NARC *narc)
 {
     pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_CHAR] = SpriteResourceCollection_AddTilesFrom(spriteResourceCollection[SPRITE_RESOURCE_CHAR], narc, 78, 1, 3000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
 
@@ -780,7 +780,7 @@ void PokedexGraphics_FreeSpeciesLabelGraphics(PokedexSpeciesLabel *pokedexSpecie
     SpriteResourceCollection_Remove(spriteResourceCollection[SPRITE_RESOURCE_ANIM], pokedexSpeciesLabel->spriteResource[SPRITE_RESOURCE_ANIM]);
 }
 
-static void InitSpeciesLabel(PokedexGraphicData *pokedexGraphicData, enum HeapId heapID)
+static void InitSpeciesLabel(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID)
 {
     SpriteResourcesHeader spriteResourcesHeader;
     SpriteListTemplate spriteListTemplate;
@@ -827,7 +827,7 @@ static void FreeSpeciesLabel(PokedexGraphicData *pokedexGraphicData)
     }
 }
 
-void PokedexGraphics_NewSpeciesLabel(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteList *spriteList, SpriteResourceCollection **spriteResourceCollection, enum HeapId heapID, int headerPriority)
+void PokedexGraphics_NewSpeciesLabel(PokedexSpeciesLabel *pokedexSpeciesLabel, SpriteList *spriteList, SpriteResourceCollection **spriteResourceCollection, enum HeapID heapID, int headerPriority)
 {
     SpriteResourcesHeader spriteResourcesHeader;
     SpriteListTemplate spriteListTemplate;
@@ -889,7 +889,7 @@ void PokedexGraphics_SetSpeciesLabelDraw(PokedexSpeciesLabel *pokedexSpeciesLabe
     }
 }
 
-static void InitCursorGraphics(PokedexGraphicData *pokedexGraphicData, enum HeapId heapID)
+static void InitCursorGraphics(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID)
 {
     PokedexCursorGraphics *pokedexCursorGraphics = &pokedexGraphicData->cursorGraphics;
     NARC *pokedexGraphicsNARC = PokedexGraphics_GetNARC(pokedexGraphicData);
@@ -921,7 +921,7 @@ static void FreeCursorGraphics(PokedexGraphicData *pokedexGraphicData)
     SpriteResourceCollection_Remove(pokedexGraphicData->spriteResourceCollection[SPRITE_RESOURCE_ANIM], pokedexCursorGraphics->spriteResource[SPRITE_RESOURCE_ANIM]);
 }
 
-static void InitCursor(PokedexGraphicData *pokedexGraphicData, enum HeapId heapID)
+static void InitCursor(PokedexGraphicData *pokedexGraphicData, enum HeapID heapID)
 {
     SpriteResourcesHeader resourceData;
     SpriteListTemplate spriteListTemplate;
diff --git a/src/applications/pokedex/pokedex_height_check.c b/src/applications/pokedex/pokedex_height_check.c
index ac74a1541d..c98c5daac3 100644
--- a/src/applications/pokedex/pokedex_height_check.c
+++ b/src/applications/pokedex/pokedex_height_check.c
@@ -43,9 +43,9 @@ typedef struct {
     Sprite *trainerHeightCellActor;
 } HeightCheckVisuals;
 
-static UnkStruct_ov21_021E6104 *ov21_021E608C(enum HeapId heapID, PokedexApp *param1);
-static PokedexGraphicData **ov21_021E60D8(enum HeapId heapID, PokedexApp *param1);
-static UnkStruct_ov21_021D4660 *ov21_021E6100(enum HeapId heapID, PokedexApp *param1);
+static UnkStruct_ov21_021E6104 *ov21_021E608C(enum HeapID heapID, PokedexApp *param1);
+static PokedexGraphicData **ov21_021E60D8(enum HeapID heapID, PokedexApp *param1);
+static UnkStruct_ov21_021D4660 *ov21_021E6100(enum HeapID heapID, PokedexApp *param1);
 static void ov21_021E6104(UnkStruct_ov21_021E6104 *param0);
 static void ov21_021E6118(PokedexGraphicData **param0);
 static void DummyForMatching1(UnkStruct_ov21_021D4660 *param0);
@@ -60,17 +60,17 @@ static void SetTrainerHeightLarge(HeightCheckVisuals *heightCheckVisuals);
 static void SetTrainerHeightNormal(HeightCheckVisuals *heightCheckVisuals);
 static void ov21_021E628C(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3);
 static BOOL ov21_021E62F8(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3);
-static void DisplayHeightCheck(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, const UnkStruct_ov21_021E6104 *param2, const int *param3, enum HeapId heapID);
+static void DisplayHeightCheck(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, const UnkStruct_ov21_021E6104 *param2, const int *param3, enum HeapID heapID);
 static void FreeVisuals(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1);
-static void DisplayBackground(PokedexGraphicData **param0, const UnkStruct_ov21_021E6104 *param1, enum HeapId heapID);
-static void GetHeightCheckGraphics(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, enum HeapId heapID);
+static void DisplayBackground(PokedexGraphicData **param0, const UnkStruct_ov21_021E6104 *param1, enum HeapID heapID);
+static void GetHeightCheckGraphics(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, enum HeapID heapID);
 static void FreeSprites(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1);
-static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, const UnkStruct_ov21_021E6104 *param2, enum HeapId heapID);
+static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, const UnkStruct_ov21_021E6104 *param2, enum HeapID heapID);
 static void FreeTrainerHeight(HeightCheckVisuals *heightCheckVisuals);
-static void DummyForMatching2(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, const UnkStruct_ov21_021E6104 *param2, enum HeapId heapID);
+static void DummyForMatching2(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, const UnkStruct_ov21_021E6104 *param2, enum HeapID heapID);
 static void DummyForMatching3(HeightCheckVisuals *heightCheckVisuals);
-static void DisplayHeightLabels(PokedexGraphicData **param0, enum HeapId heapID);
-static void DisplayHeightValues(PokedexGraphicData **param0, const UnkStruct_ov21_021E6104 *param1, enum HeapId heapID);
+static void DisplayHeightLabels(PokedexGraphicData **param0, enum HeapID heapID);
+static void DisplayHeightValues(PokedexGraphicData **param0, const UnkStruct_ov21_021E6104 *param1, enum HeapID heapID);
 static void DisplaySpeciesHeight(PokedexGraphicData **param0, const UnkStruct_ov21_021E6104 *param1);
 static void ClearSpeciesSprite(PokedexGraphicData **param0);
 static void SetTrainerPosition(Sprite *trainerHeightSprite, short trainerPos);
@@ -78,7 +78,7 @@ static void SetSpeciesPosition(PokemonSprite *speciesSprite, short pokemonPos);
 static void SetTrainerScale(Sprite *trainerHeightSprite, short trainerScale);
 static void SetSpeciesScale(PokemonSprite *speciesSprite, short pokemonScale);
 
-void ov21_021E6014(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void ov21_021E6014(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     UnkStruct_ov21_021E6104 *v0 = ov21_021E608C(heapID, param1);
     PokedexGraphicData **v1 = ov21_021E60D8(heapID, param1);
@@ -104,9 +104,9 @@ void ov21_021E6074(PokedexScreenManager *param0)
     DummyForMatching1(param0->screenStates);
 }
 
-static UnkStruct_ov21_021E6104 *ov21_021E608C(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021E6104 *ov21_021E608C(enum HeapID heapID, PokedexApp *param1)
 {
-    UnkStruct_ov21_021E6104 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021E6104));
+    UnkStruct_ov21_021E6104 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021E6104));
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021E6104));
 
@@ -117,9 +117,9 @@ static UnkStruct_ov21_021E6104 *ov21_021E608C(enum HeapId heapID, PokedexApp *pa
     return v0;
 }
 
-PokedexGraphicData **ov21_021E60D8(enum HeapId heapID, PokedexApp *param1)
+PokedexGraphicData **ov21_021E60D8(enum HeapID heapID, PokedexApp *param1)
 {
-    PokedexGraphicData **v0 = Heap_AllocFromHeap(heapID, sizeof(PokedexGraphicData *));
+    PokedexGraphicData **v0 = Heap_Alloc(heapID, sizeof(PokedexGraphicData *));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(PokedexGraphicData *));
@@ -129,7 +129,7 @@ PokedexGraphicData **ov21_021E60D8(enum HeapId heapID, PokedexApp *param1)
     return v0;
 }
 
-static UnkStruct_ov21_021D4660 *ov21_021E6100(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021D4660 *ov21_021E6100(enum HeapID heapID, PokedexApp *param1)
 {
     return NULL;
 }
@@ -158,7 +158,7 @@ static int ov21_021E6130(void)
 
 static int ov21_021E6134(PokedexDataManager *dataMan, void *data)
 {
-    int *v1 = Heap_AllocFromHeap(dataMan->heapID, sizeof(int));
+    int *v1 = Heap_Alloc(dataMan->heapID, sizeof(int));
 
     GF_ASSERT(v1);
     memset(v1, 0, sizeof(int));
@@ -196,7 +196,7 @@ static int ov21_021E617C(void *graphics, PokedexGraphicsManager *graphicsMan, co
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(HeightCheckVisuals));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(HeightCheckVisuals));
         memset(graphicsMan->pageGraphics, 0, sizeof(HeightCheckVisuals));
         graphicsMan->state++;
         break;
@@ -297,7 +297,7 @@ static BOOL ov21_021E62F8(HeightCheckVisuals *heightCheckVisuals, PokedexGraphic
     return FALSE;
 }
 
-static void DisplayHeightCheck(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, const UnkStruct_ov21_021E6104 *param2, const int *param3, enum HeapId heapID)
+static void DisplayHeightCheck(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, const UnkStruct_ov21_021E6104 *param2, const int *param3, enum HeapID heapID)
 {
     DisplayBackground(param1, param2, heapID);
     DisplayHeightLabels(param1, heapID);
@@ -320,7 +320,7 @@ static void FreeVisuals(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicDa
     ClearSpeciesSprite(param1);
 }
 
-static void DisplayBackground(PokedexGraphicData **param0, const UnkStruct_ov21_021E6104 *param1, enum HeapId heapID)
+static void DisplayBackground(PokedexGraphicData **param0, const UnkStruct_ov21_021E6104 *param1, enum HeapID heapID)
 {
     NNSG2dScreenData *v1;
 
@@ -333,7 +333,7 @@ static void DisplayBackground(PokedexGraphicData **param0, const UnkStruct_ov21_
     Bg_ScheduleTilemapTransfer((*param0)->bgConfig, 3);
 }
 
-static void GetHeightCheckGraphics(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, enum HeapId heapID)
+static void GetHeightCheckGraphics(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, enum HeapID heapID)
 {
     PokedexGraphicData *v0 = *param1;
     NARC *pokedexGraphicsNarc = PokedexGraphics_GetNARC(v0);
@@ -364,7 +364,7 @@ static void FreeSprites(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicDa
     SpriteResourceCollection_Remove(v0->spriteResourceCollection[3], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_ANIM]);
 }
 
-static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, const UnkStruct_ov21_021E6104 *param2, enum HeapId heapID)
+static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, const UnkStruct_ov21_021E6104 *param2, enum HeapID heapID)
 {
     SpriteResourcesHeader trainerResource;
     SpriteListTemplate trainerCellParams;
@@ -402,7 +402,7 @@ static void FreeTrainerHeight(HeightCheckVisuals *heightCheckVisuals)
     Sprite_Delete(heightCheckVisuals->trainerHeightCellActor);
 }
 
-static void DummyForMatching2(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, const UnkStruct_ov21_021E6104 *param2, enum HeapId heapID)
+static void DummyForMatching2(HeightCheckVisuals *heightCheckVisuals, PokedexGraphicData **param1, const UnkStruct_ov21_021E6104 *param2, enum HeapID heapID)
 {
     return;
 }
@@ -412,7 +412,7 @@ static void DummyForMatching3(HeightCheckVisuals *heightCheckVisuals)
     return;
 }
 
-static void DisplayHeightLabels(PokedexGraphicData **param0, enum HeapId heapID)
+static void DisplayHeightLabels(PokedexGraphicData **param0, enum HeapID heapID)
 {
     Strbuf *strbuf = Strbuf_Init(32, heapID);
     MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID);
@@ -432,7 +432,7 @@ static void DisplayHeightLabels(PokedexGraphicData **param0, enum HeapId heapID)
     MessageLoader_Free(pokedexMessageBank);
 }
 
-static void DisplayHeightValues(PokedexGraphicData **param0, const UnkStruct_ov21_021E6104 *param1, enum HeapId heapID)
+static void DisplayHeightValues(PokedexGraphicData **param0, const UnkStruct_ov21_021E6104 *param1, enum HeapID heapID)
 {
     Strbuf *strbuf = Strbuf_Init(32, heapID);
     int species = PokedexSort_CurrentSpecies(param1->unk_04);
diff --git a/src/applications/pokedex/pokedex_main.c b/src/applications/pokedex/pokedex_main.c
index b9e989f700..b10bf4a321 100644
--- a/src/applications/pokedex/pokedex_main.c
+++ b/src/applications/pokedex/pokedex_main.c
@@ -77,7 +77,7 @@ static void ExitTransition(PokedexApp **appPtr);
 static BOOL TransitionComplete(PokedexApp **appPtr);
 static void FreePokedexApp(PokedexApp *pokedexApp);
 static void SetGXBanks(void);
-static void InitG2(enum HeapId heapID);
+static void InitG2(enum HeapID heapID);
 static void InitG3(void);
 static void ResetFrm(void);
 static void ov21_021D1EEC(PokedexApp *pokedexApp);
@@ -249,12 +249,12 @@ const static UnkFuncPtr_ov21_021E9B9C Unk_ov21_021E9B54[8] = {
     ov21_021E84E4
 };
 
-PokedexApp *PokedexMain_NewPokedexApp(enum HeapId heapID, const PokedexOverlayArgs *pokedexOverlayArgs)
+PokedexApp *PokedexMain_NewPokedexApp(enum HeapID heapID, const PokedexOverlayArgs *pokedexOverlayArgs)
 {
     int i;
     PokedexDefaultSortParams sortParams;
 
-    PokedexApp *pokedexApp = Heap_AllocFromHeap(heapID, sizeof(PokedexApp));
+    PokedexApp *pokedexApp = Heap_Alloc(heapID, sizeof(PokedexApp));
 
     GF_ASSERT(pokedexApp);
     memset(pokedexApp, 0, sizeof(PokedexApp));
@@ -363,7 +363,7 @@ BOOL ov21_021D10B8(PokedexApp *pokedexApp)
     return 0;
 }
 
-void PokedexMain_InitGX(enum HeapId heapID)
+void PokedexMain_InitGX(enum HeapID heapID)
 {
     SetGXBanks();
     InitG2(heapID);
@@ -890,7 +890,7 @@ u32 PokedexMain_DisplayRotomSprite(PokedexGraphicData *pokedexGraphicData, const
     return form;
 }
 
-Strbuf *PokedexMain_GetMessage(int entryID, enum HeapId heapID)
+Strbuf *PokedexMain_GetMessage(int entryID, enum HeapID heapID)
 {
     MessageLoader *pokedexMessageBank = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID);
 
@@ -973,7 +973,7 @@ static void SetGXBanks(void)
     GXLayers_SetBanks(&banks);
 }
 
-static void InitG2(enum HeapId heapID)
+static void InitG2(enum HeapID heapID)
 {
     NNS_G2dInitOamManagerModule();
     RenderOam_Init(0, 128, 0, 32, 0, 128, 0, 32, heapID);
diff --git a/src/applications/pokedex/pokedex_panel.c b/src/applications/pokedex/pokedex_panel.c
index 7e88c877d5..44acc821b9 100644
--- a/src/applications/pokedex/pokedex_panel.c
+++ b/src/applications/pokedex/pokedex_panel.c
@@ -13,9 +13,9 @@ static void WalkCols(PokedexPanelData *pokedexPanelData, int distance);
 static void WalkRows(PokedexPanelData *pokedexPanelData, int distance);
 static void JumpToButton(PokedexPanelData *pokedexPanelData, int button);
 
-PokedexPanelData *PokedexPanel_Alloc(enum HeapId heapID)
+PokedexPanelData *PokedexPanel_Alloc(enum HeapID heapID)
 {
-    PokedexPanelData *pokedexPanelData = Heap_AllocFromHeap(heapID, sizeof(PokedexPanelData));
+    PokedexPanelData *pokedexPanelData = Heap_Alloc(heapID, sizeof(PokedexPanelData));
     memset(pokedexPanelData, 0, sizeof(PokedexPanelData));
 
     return pokedexPanelData;
diff --git a/src/applications/pokedex/pokedex_search.c b/src/applications/pokedex/pokedex_search.c
index 22e3abe3cb..713c5fb414 100644
--- a/src/applications/pokedex/pokedex_search.c
+++ b/src/applications/pokedex/pokedex_search.c
@@ -75,9 +75,9 @@ typedef struct {
     NNSG2dScreenData *screenData;
 } PokedexSearchDisplay;
 
-static PokedexSearchSettings *InitSearchSettings(enum HeapId heapID, PokedexApp *param1);
-static PokedexGraphicData **ov21_021D8724(enum HeapId heapID, PokedexApp *param1);
-static UnkStruct_ov21_021D4660 *ov21_021D874C(enum HeapId heapID, PokedexApp *param1);
+static PokedexSearchSettings *InitSearchSettings(enum HeapID heapID, PokedexApp *param1);
+static PokedexGraphicData **ov21_021D8724(enum HeapID heapID, PokedexApp *param1);
+static UnkStruct_ov21_021D4660 *ov21_021D874C(enum HeapID heapID, PokedexApp *param1);
 static void FreeSearchSettings(PokedexSearchSettings *searchSettings);
 static void ov21_021D879C(PokedexGraphicData **param0);
 static void ov21_021D87B0(UnkStruct_ov21_021D4660 *param0);
@@ -88,32 +88,32 @@ static int ov21_021D8928(PokedexDataManager *dataMan, void *data);
 static int EnterPokedexSearch(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan);
 static int UpdateDisplay(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan);
 static int ExitPokedexSearch(void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan);
-static void LoadingScreenTransition(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapId heapID);
-static void LoadingScreenAnimation(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapId heapID);
-static void SearchingMessage(PokedexGraphicData **param0, enum HeapId heapID);
-static void ReturnSearchDisplay(PokedexGraphicData **param0, PokedexSearchDisplay *searchDisplay, enum HeapId heapID);
+static void LoadingScreenTransition(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapID heapID);
+static void LoadingScreenAnimation(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapID heapID);
+static void SearchingMessage(PokedexGraphicData **param0, enum HeapID heapID);
+static void ReturnSearchDisplay(PokedexGraphicData **param0, PokedexSearchDisplay *searchDisplay, enum HeapID heapID);
 static void DefaultDisplay(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, const int *param3, int heapID);
 static void ClearScreen(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1);
-static void ov21_021D8B8C(PokedexGraphicData **param0, const PokedexSearchSettings *searchSettings, enum HeapId heapID);
-static void GetSearchGraphics(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, enum HeapId heapID);
+static void ov21_021D8B8C(PokedexGraphicData **param0, const PokedexSearchSettings *searchSettings, enum HeapID heapID);
+static void GetSearchGraphics(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, enum HeapID heapID);
 static void FreeSearchGraphics(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1);
-static void InitCellActors(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapId heapID);
+static void InitCellActors(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapID heapID);
 static void FreeCellActors(PokedexSearchDisplay *searchDisplay);
-static void GetDisplayMap(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapId heapID, int param4);
+static void GetDisplayMap(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapID heapID, int param4);
 static void FreeDisplayMap(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1);
-static void UpdateSelectionDisplay(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapId heapID);
-static void FilterMethodMap(PokedexGraphicData **param0, int filterMethod, enum HeapId heapID);
-static void DescriptionMessage(PokedexGraphicData **param0, int filterMethod, enum HeapId heapID);
-static void SortOrderMessage(PokedexGraphicData **param0, int sortOrder, enum HeapId heapID);
-static void FilterNameMessage(PokedexGraphicData **param0, int filterName, enum HeapId heapID);
-static void FilterType1Message(PokedexGraphicData **param0, int typeFilter1, enum HeapId heapID);
-static void FilterType2Message(PokedexGraphicData **param0, int typeFilter2, enum HeapId heapID);
-static void FilterTypeMessage(PokedexGraphicData **param0, int typeFilter, enum HeapId heapID, int y);
+static void UpdateSelectionDisplay(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapID heapID);
+static void FilterMethodMap(PokedexGraphicData **param0, int filterMethod, enum HeapID heapID);
+static void DescriptionMessage(PokedexGraphicData **param0, int filterMethod, enum HeapID heapID);
+static void SortOrderMessage(PokedexGraphicData **param0, int sortOrder, enum HeapID heapID);
+static void FilterNameMessage(PokedexGraphicData **param0, int filterName, enum HeapID heapID);
+static void FilterType1Message(PokedexGraphicData **param0, int typeFilter1, enum HeapID heapID);
+static void FilterType2Message(PokedexGraphicData **param0, int typeFilter2, enum HeapID heapID);
+static void FilterTypeMessage(PokedexGraphicData **param0, int typeFilter, enum HeapID heapID, int y);
 static void FilterFormSilhouette(PokedexSearchDisplay *searchDisplay, int filterForm);
-static void EmptyDexMessage(PokedexGraphicData **param0, enum HeapId heapID);
+static void EmptyDexMessage(PokedexGraphicData **param0, enum HeapID heapID);
 static void ov21_021D8C00(PokedexGraphicData **param0);
 
-void PokedexSearch_TransitionFunctions(PokedexScreenManager *param0, PokedexApp *param1, enum HeapId heapID)
+void PokedexSearch_TransitionFunctions(PokedexScreenManager *param0, PokedexApp *param1, enum HeapID heapID)
 {
     PokedexSearchSettings *searchSettings = InitSearchSettings(heapID, param1);
     PokedexGraphicData **v1 = ov21_021D8724(heapID, param1);
@@ -245,9 +245,9 @@ int PokedexSearch_GetScreenTimer(const PokedexScreenManager *param0)
     return searchSettings->screenTimer;
 }
 
-static PokedexSearchSettings *InitSearchSettings(enum HeapId heapID, PokedexApp *param1)
+static PokedexSearchSettings *InitSearchSettings(enum HeapID heapID, PokedexApp *param1)
 {
-    PokedexSearchSettings *searchSettings = Heap_AllocFromHeap(heapID, sizeof(PokedexSearchSettings));
+    PokedexSearchSettings *searchSettings = Heap_Alloc(heapID, sizeof(PokedexSearchSettings));
 
     GF_ASSERT(searchSettings);
     memset(searchSettings, 0, sizeof(PokedexSearchSettings));
@@ -260,9 +260,9 @@ static PokedexSearchSettings *InitSearchSettings(enum HeapId heapID, PokedexApp
     return searchSettings;
 }
 
-static PokedexGraphicData **ov21_021D8724(enum HeapId heapID, PokedexApp *param1)
+static PokedexGraphicData **ov21_021D8724(enum HeapID heapID, PokedexApp *param1)
 {
-    PokedexGraphicData **v0 = Heap_AllocFromHeap(heapID, sizeof(PokedexGraphicData **));
+    PokedexGraphicData **v0 = Heap_Alloc(heapID, sizeof(PokedexGraphicData **));
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(PokedexGraphicData **));
@@ -272,11 +272,11 @@ static PokedexGraphicData **ov21_021D8724(enum HeapId heapID, PokedexApp *param1
     return v0;
 }
 
-static UnkStruct_ov21_021D4660 *ov21_021D874C(enum HeapId heapID, PokedexApp *param1)
+static UnkStruct_ov21_021D4660 *ov21_021D874C(enum HeapID heapID, PokedexApp *param1)
 {
     int v1 = ov21_021D87C8();
 
-    UnkStruct_ov21_021D4660 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov21_021D4660) * v1);
+    UnkStruct_ov21_021D4660 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov21_021D4660) * v1);
 
     GF_ASSERT(v0);
     memset(v0, 0, sizeof(UnkStruct_ov21_021D4660) * v1);
@@ -314,7 +314,7 @@ static int ov21_021D87C8(void)
 static int ResetSearchSettings(PokedexDataManager *dataMan, void *data)
 {
     PokedexSearchSettings *searchSettings = data;
-    int *v1 = Heap_AllocFromHeap(dataMan->heapID, sizeof(int));
+    int *v1 = Heap_Alloc(dataMan->heapID, sizeof(int));
 
     GF_ASSERT(v1);
     memset(v1, 0, sizeof(int));
@@ -438,7 +438,7 @@ static int EnterPokedexSearch(void *graphics, PokedexGraphicsManager *graphicsMa
 
     switch (graphicsMan->state) {
     case 0:
-        graphicsMan->pageGraphics = Heap_AllocFromHeap(graphicsMan->heapID, sizeof(PokedexSearchDisplay));
+        graphicsMan->pageGraphics = Heap_Alloc(graphicsMan->heapID, sizeof(PokedexSearchDisplay));
         memset(graphicsMan->pageGraphics, 0, sizeof(PokedexSearchDisplay));
         graphicsMan->state++;
         break;
@@ -550,13 +550,13 @@ static void ClearScreen(PokedexSearchDisplay *searchDisplay, PokedexGraphicData
     Bg_SetPriority(BG_LAYER_MAIN_2, 1);
 }
 
-static void ov21_021D8B8C(PokedexGraphicData **param0, const PokedexSearchSettings *searchSettings, enum HeapId heapID)
+static void ov21_021D8B8C(PokedexGraphicData **param0, const PokedexSearchSettings *searchSettings, enum HeapID heapID)
 {
     PokedexGraphics_LoadGraphicNarcCharacterData(*param0, 28, (*param0)->bgConfig, 3, 0, 0, 1, heapID);
     PokedexGraphics_LoadGraphicNarcPaletteData(*param0, 5, 0, 0, 32, heapID);
 }
 
-static void GetDisplayMap(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapId heapID, int param4)
+static void GetDisplayMap(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapID heapID, int param4)
 {
     int mapIndex;
 
@@ -584,7 +584,7 @@ static void ov21_021D8C00(PokedexGraphicData **param0)
     PokemonSprite_ClearFade(v0);
 }
 
-static void GetSearchGraphics(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, enum HeapId heapID)
+static void GetSearchGraphics(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, enum HeapID heapID)
 {
     PokedexGraphicData *v0 = *param1;
     NARC *pokedexGraphics = PokedexGraphics_GetNARC(v0);
@@ -616,7 +616,7 @@ static void FreeSearchGraphics(PokedexSearchDisplay *searchDisplay, PokedexGraph
     SpriteResourceCollection_Remove(v0->spriteResourceCollection[3], searchDisplay->searchGraphics[SPRITE_RESOURCE_ANIM]);
 }
 
-static void InitCellActors(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapId heapID)
+static void InitCellActors(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapID heapID)
 {
     SpriteResourcesHeader v0;
     SpriteListTemplate v1;
@@ -653,7 +653,7 @@ static void FreeCellActors(PokedexSearchDisplay *searchDisplay)
     Sprite_Delete(searchDisplay->pokeball);
 }
 
-static void DescriptionMessage(PokedexGraphicData **param0, int filterMethod, enum HeapId heapID)
+static void DescriptionMessage(PokedexGraphicData **param0, int filterMethod, enum HeapID heapID)
 {
     PokedexGraphicData *v0 = *param0;
     int entryID;
@@ -686,7 +686,7 @@ static void DescriptionMessage(PokedexGraphicData **param0, int filterMethod, en
     Strbuf_Free(descriptionMessage);
 }
 
-static void EmptyDexMessage(PokedexGraphicData **param0, enum HeapId heapID)
+static void EmptyDexMessage(PokedexGraphicData **param0, enum HeapID heapID)
 {
     PokedexGraphicData *v0 = *param0;
 
@@ -703,7 +703,7 @@ static void EmptyDexMessage(PokedexGraphicData **param0, enum HeapId heapID)
     Strbuf_Free(noneMessage);
 }
 
-static void UpdateSelectionDisplay(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapId heapID)
+static void UpdateSelectionDisplay(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapID heapID)
 {
     if (searchSettings->noneFound != searchDisplay->noneFound) {
         searchDisplay->noneFound = searchSettings->noneFound;
@@ -753,7 +753,7 @@ static void UpdateSelectionDisplay(PokedexSearchDisplay *searchDisplay, PokedexG
     }
 }
 
-static void FilterMethodMap(PokedexGraphicData **param0, int filterMethod, enum HeapId heapID)
+static void FilterMethodMap(PokedexGraphicData **param0, int filterMethod, enum HeapID heapID)
 {
     void *v0;
     NNSG2dScreenData *v1;
@@ -793,7 +793,7 @@ static void FilterMethodMap(PokedexGraphicData **param0, int filterMethod, enum
     Bg_ScheduleTilemapTransfer((*param0)->bgConfig, 3);
 }
 
-static void SortOrderMessage(PokedexGraphicData **param0, int sortOrder, enum HeapId heapID)
+static void SortOrderMessage(PokedexGraphicData **param0, int sortOrder, enum HeapID heapID)
 {
     PokedexGraphicData *v0 = *param0;
 
@@ -808,7 +808,7 @@ static void SortOrderMessage(PokedexGraphicData **param0, int sortOrder, enum He
     Strbuf_Free(sortMessage);
 }
 
-static void FilterNameMessage(PokedexGraphicData **param0, int filterName, enum HeapId heapID)
+static void FilterNameMessage(PokedexGraphicData **param0, int filterName, enum HeapID heapID)
 {
     PokedexGraphicData *v0 = *param0;
     int entryID;
@@ -858,7 +858,7 @@ static void FilterNameMessage(PokedexGraphicData **param0, int filterName, enum
     Strbuf_Free(filterMessage);
 }
 
-static void FilterTypeMessage(PokedexGraphicData **param0, int typeFilter, enum HeapId heapID, int y)
+static void FilterTypeMessage(PokedexGraphicData **param0, int typeFilter, enum HeapID heapID, int y)
 {
     PokedexGraphicData *v0 = *param0;
     int entryID;
@@ -932,12 +932,12 @@ static void FilterTypeMessage(PokedexGraphicData **param0, int typeFilter, enum
     Strbuf_Free(filterMessage);
 }
 
-static void FilterType1Message(PokedexGraphicData **param0, int typeFilter1, enum HeapId heapID)
+static void FilterType1Message(PokedexGraphicData **param0, int typeFilter1, enum HeapID heapID)
 {
     FilterTypeMessage(param0, typeFilter1, heapID, 102);
 }
 
-static void FilterType2Message(PokedexGraphicData **param0, int typeFilter2, enum HeapId heapID)
+static void FilterType2Message(PokedexGraphicData **param0, int typeFilter2, enum HeapID heapID)
 {
     FilterTypeMessage(param0, typeFilter2, heapID, 120);
 }
@@ -998,7 +998,7 @@ static void FilterFormSilhouette(PokedexSearchDisplay *searchDisplay, int filter
     }
 }
 
-static void LoadingScreenTransition(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapId heapID)
+static void LoadingScreenTransition(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapID heapID)
 {
     if (searchSettings->screenTimer == 4) {
         if (searchSettings->screenState == SS_SEARCH) {
@@ -1013,7 +1013,7 @@ static void LoadingScreenTransition(PokedexSearchDisplay *searchDisplay, Pokedex
     PokedexMain_LoadingScreenMove(&searchDisplay->loadingScreen);
 }
 
-static void LoadingScreenAnimation(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapId heapID)
+static void LoadingScreenAnimation(PokedexSearchDisplay *searchDisplay, PokedexGraphicData **param1, const PokedexSearchSettings *searchSettings, enum HeapID heapID)
 {
     if (searchSettings->screenTimer == 32) {
         Sprite_SetDrawFlag(searchDisplay->pokeball, TRUE);
@@ -1031,7 +1031,7 @@ static void LoadingScreenAnimation(PokedexSearchDisplay *searchDisplay, PokedexG
     Sprite_SetAffineZRotation(searchDisplay->pokeball, (u16)angle);
 }
 
-static void SearchingMessage(PokedexGraphicData **param0, enum HeapId heapID)
+static void SearchingMessage(PokedexGraphicData **param0, enum HeapID heapID)
 {
     PokedexGraphicData *v0 = *param0;
 
@@ -1048,7 +1048,7 @@ static void SearchingMessage(PokedexGraphicData **param0, enum HeapId heapID)
     Bg_SetPriority(BG_LAYER_MAIN_2, 1);
 }
 
-static void ReturnSearchDisplay(PokedexGraphicData **param0, PokedexSearchDisplay *searchDisplay, enum HeapId heapID)
+static void ReturnSearchDisplay(PokedexGraphicData **param0, PokedexSearchDisplay *searchDisplay, enum HeapID heapID)
 {
     Bg_SetPriority(BG_LAYER_MAIN_1, 1);
     Bg_SetPriority(BG_LAYER_MAIN_2, 0);
diff --git a/src/applications/pokedex/pokedex_sort.c b/src/applications/pokedex/pokedex_sort.c
index e6da0ec92c..535319acda 100644
--- a/src/applications/pokedex/pokedex_sort.c
+++ b/src/applications/pokedex/pokedex_sort.c
@@ -80,13 +80,13 @@ static void UpdateCaughtStatus(SortedPokedex *sortedPokedex, const Pokedex *poke
 static void PopulateDisplayPokedex_Blanks(SortedPokedex *sortedPokedex, const u16 *fullDex, int pokedexLength);
 static void PopulateDisplayPokedex(SortedPokedex *sortedPokedex);
 static void NumEncounteredAndCaught(SortedPokedex *sortedPokedex, int *caughtStatusLength, int *numCaught);
-static u16 *PokedexFromNARC(enum HeapId heapID, int pokedexSort, int *pokedexLength);
-static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex);
-static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex);
-static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex);
-static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex);
+static u16 *PokedexFromNARC(enum HeapID heapID, int pokedexSort, int *pokedexLength);
+static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapID heapID, const Pokedex *pokedex);
+static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapID heapID, const Pokedex *pokedex);
+static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapID heapID, const Pokedex *pokedex);
+static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapID heapID, const Pokedex *pokedex);
 
-void PokedexSort_DefaultPokedexSort(PokedexSortData *param0, PokedexDefaultSortParams *param1, enum HeapId heapID)
+void PokedexSort_DefaultPokedexSort(PokedexSortData *param0, PokedexDefaultSortParams *param1, enum HeapID heapID)
 {
     int sortOrder;
     int filterName;
@@ -263,7 +263,7 @@ u32 PokedexSort_GetBootMode(const PokedexSortData *param0)
     return param0->bootMode;
 }
 
-BOOL PokedexSort_Sort(PokedexSortData *param0, enum SortOrder sortOrder, enum FilterName filterName, enum FilterType filterType1, enum FilterType filterType2, enum FilterForm filterForm, int isNationalDex, enum HeapId heapID, BOOL isFiltered)
+BOOL PokedexSort_Sort(PokedexSortData *param0, enum SortOrder sortOrder, enum FilterName filterName, enum FilterType filterType1, enum FilterType filterType2, enum FilterForm filterForm, int isNationalDex, enum HeapID heapID, BOOL isFiltered)
 {
     u16 *encounteredPokedex;
     int caughtStatusLength;
@@ -273,13 +273,13 @@ BOOL PokedexSort_Sort(PokedexSortData *param0, enum SortOrder sortOrder, enum Fi
     int fullDexLength;
     BOOL dexExists;
 
-    encounteredPokedex = Heap_AllocFromHeapAtEnd(heapID, sizeof(u16) * NATIONAL_DEX_COUNT);
+    encounteredPokedex = Heap_AllocAtEnd(heapID, sizeof(u16) * NATIONAL_DEX_COUNT);
 
     GF_ASSERT(encounteredPokedex);
     memset(encounteredPokedex, 0, sizeof(u16) * NATIONAL_DEX_COUNT);
 
     caughtStatusLength = 0;
-    resultingPokedex = Heap_AllocFromHeapAtEnd(heapID, sizeof(u16) * NATIONAL_DEX_COUNT);
+    resultingPokedex = Heap_AllocAtEnd(heapID, sizeof(u16) * NATIONAL_DEX_COUNT);
 
     GF_ASSERT(resultingPokedex);
     memset(resultingPokedex, 0, sizeof(u16) * NATIONAL_DEX_COUNT);
@@ -379,7 +379,7 @@ BOOL PokedexSort_Sort(PokedexSortData *param0, enum SortOrder sortOrder, enum Fi
     return dexExists;
 }
 
-BOOL PokedexSort_SortUnfiltered(PokedexSortData *param0, enum SortOrder sortOrder, enum FilterName filterName, enum FilterType filterType1, enum FilterType filterType2, enum FilterForm filterForm, int isNationalDex, enum HeapId heapID)
+BOOL PokedexSort_SortUnfiltered(PokedexSortData *param0, enum SortOrder sortOrder, enum FilterName filterName, enum FilterType filterType1, enum FilterType filterType2, enum FilterForm filterForm, int isNationalDex, enum HeapID heapID)
 {
     return PokedexSort_Sort(param0, sortOrder, filterName, filterType1, filterType2, filterForm, isNationalDex, heapID, FALSE);
 }
@@ -713,7 +713,7 @@ static void PopulateDisplayPokedex(SortedPokedex *sortedPokedex)
     }
 }
 
-static u16 *PokedexFromNARC(enum HeapId heapID, int pokedexSort, int *pokedexLength)
+static u16 *PokedexFromNARC(enum HeapID heapID, int pokedexSort, int *pokedexLength)
 {
     u32 pokedexSize;
 
@@ -726,7 +726,7 @@ static u16 *PokedexFromNARC(enum HeapId heapID, int pokedexSort, int *pokedexLen
     return pokedexFromFile;
 }
 
-static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex)
+static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapID heapID, const Pokedex *pokedex)
 {
     u16 *pokedexFromFile;
     int pokedexLength;
@@ -766,7 +766,7 @@ static void DexSortOrder(int sortOrder, u16 *resultingPokedex, int *numResulting
     }
 }
 
-static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex)
+static void FilterByName(int filterName, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapID heapID, const Pokedex *pokedex)
 {
     u16 *pokedexFromFile;
     int pokedexLength;
@@ -816,7 +816,7 @@ static void FilterByName(int filterName, u16 *resultingPokedex, int *numResultin
     }
 }
 
-static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex)
+static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapID heapID, const Pokedex *pokedex)
 {
     u16 *pokedexFromFile;
     int pokedexLength;
@@ -890,7 +890,7 @@ static void FilterByType(int typeFilter, u16 *resultingPokedex, int *numResultin
     }
 }
 
-static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapId heapID, const Pokedex *pokedex)
+static void FilterByForm(int filterForm, u16 *resultingPokedex, int *numResulting, const u16 *encounteredPokedex, int caughtStatusLength, enum HeapID heapID, const Pokedex *pokedex)
 {
     u16 *pokedexFromFile;
     int pokedexLength;
diff --git a/src/applications/pokedex/pokedex_text.c b/src/applications/pokedex/pokedex_text.c
index 83f6ffc7ec..2aa2d37e42 100644
--- a/src/applications/pokedex/pokedex_text.c
+++ b/src/applications/pokedex/pokedex_text.c
@@ -29,7 +29,7 @@ static const u8 messageBankLanguageOrder[NUM_LANGUAGES] = {
 
 static inline int LanguageIndex_Guarded(int languageIndex);
 static inline BOOL ValidLanguage(int species, int languageIndex);
-static Strbuf *LoadMessage(int bankID, int entryID, enum HeapId heapID);
+static Strbuf *LoadMessage(int bankID, int entryID, enum HeapID heapID);
 static void GetLanguageIndex(int species, int language, int *dexNum, int *languageIndexUnguarded, int *languageIndex);
 
 void PokedexText_Free(Strbuf *strbuf)
@@ -42,7 +42,7 @@ int PokedexText_ForeignLanguage(int languageIndex)
     return PokedexLanguage_IndexToLanguage(messageBankLanguageOrder[languageIndex + 1]);
 }
 
-Strbuf *PokedexText_NameNumber(int species, int language, enum HeapId heapID)
+Strbuf *PokedexText_NameNumber(int species, int language, enum HeapID heapID)
 {
     int dexNum;
     int languageIndex_unguarded;
@@ -69,7 +69,7 @@ Strbuf *PokedexText_NameNumber(int species, int language, enum HeapId heapID)
     return LoadMessage(bankID, index, heapID);
 }
 
-Strbuf *PokedexText_Category(int species, int language, enum HeapId heapID)
+Strbuf *PokedexText_Category(int species, int language, enum HeapID heapID)
 {
     int dexNum;
     int languageIndex_unguarded;
@@ -97,7 +97,7 @@ Strbuf *PokedexText_Category(int species, int language, enum HeapId heapID)
     return LoadMessage(bankID, index, heapID);
 }
 
-Strbuf *PokedexText_DexEntry(int species, int language, int entryOffset, enum HeapId heapID)
+Strbuf *PokedexText_DexEntry(int species, int language, int entryOffset, enum HeapID heapID)
 {
     int dexNum;
     int languageIndex_unguarded;
@@ -136,7 +136,7 @@ static inline BOOL ValidLanguage(int species, int languageIndex)
     return TRUE;
 }
 
-static Strbuf *LoadMessage(int bankID, int entryID, enum HeapId heapID)
+static Strbuf *LoadMessage(int bankID, int entryID, enum HeapID heapID)
 {
     MessageLoader *messageLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, bankID, heapID);
 
diff --git a/src/applications/pokedex/pokedex_text_manager.c b/src/applications/pokedex/pokedex_text_manager.c
index 707350e16b..43ab09ce5f 100644
--- a/src/applications/pokedex/pokedex_text_manager.c
+++ b/src/applications/pokedex/pokedex_text_manager.c
@@ -15,13 +15,13 @@ static PokedexTextData *NextEmptyText(PokedexTextManager *textMan);
 
 PokedexTextManager *PokedexTextManager_New(const PokedexTextManagerTemplate *textManTemplate)
 {
-    PokedexTextManager *textMan = Heap_AllocFromHeap(textManTemplate->heapID, sizeof(PokedexTextManager));
+    PokedexTextManager *textMan = Heap_Alloc(textManTemplate->heapID, sizeof(PokedexTextManager));
 
     GF_ASSERT(textMan);
     memset(textMan, 0, sizeof(PokedexTextManager));
 
     textMan->unk_00 = sub_02012744(textManTemplate->numTextData, textManTemplate->heapID);
-    textMan->textData = Heap_AllocFromHeap(textManTemplate->heapID, sizeof(PokedexTextData) * textManTemplate->numTextData);
+    textMan->textData = Heap_Alloc(textManTemplate->heapID, sizeof(PokedexTextData) * textManTemplate->numTextData);
 
     GF_ASSERT(textMan->textData);
     memset(textMan->textData, 0, sizeof(PokedexTextData) * textManTemplate->numTextData);
diff --git a/src/applications/pokedex/pokedex_updater.c b/src/applications/pokedex/pokedex_updater.c
index 879726445f..8e68e134d2 100644
--- a/src/applications/pokedex/pokedex_updater.c
+++ b/src/applications/pokedex/pokedex_updater.c
@@ -17,9 +17,9 @@ static void ResetGraphicsMan(PokedexGraphicsManager *graphicsMan);
 static BOOL RunDataFunction(PokedexDataFunction dataFunc, PokedexDataManager *dataMan, void *data);
 static BOOL RunGraphicsFunction(PokedexGraphicsFunction graphicsFunc, void *graphics, PokedexGraphicsManager *graphicsMan, const void *data, const PokedexDataManager *dataMan);
 
-PokedexUpdater *PokedexUpdater_New(enum HeapId heapID)
+PokedexUpdater *PokedexUpdater_New(enum HeapID heapID)
 {
-    PokedexUpdater *pokedexUpdater = Heap_AllocFromHeap(heapID, sizeof(PokedexUpdater));
+    PokedexUpdater *pokedexUpdater = Heap_Alloc(heapID, sizeof(PokedexUpdater));
 
     GF_ASSERT(pokedexUpdater);
     memset(pokedexUpdater, 0, sizeof(PokedexUpdater));
diff --git a/src/applications/poketch/digital_watch/graphics.c b/src/applications/poketch/digital_watch/graphics.c
index f6778195f2..952d66d92c 100644
--- a/src/applications/poketch/digital_watch/graphics.c
+++ b/src/applications/poketch/digital_watch/graphics.c
@@ -21,7 +21,7 @@ static void DrawClockDigits(PoketchDigitalWatchGraphics *graphics);
 
 BOOL PoketchDigitalWatchGraphics_New(PoketchDigitalWatchGraphics **graphics, const WatchData *watchData, BgConfig *bgConfig)
 {
-    PoketchDigitalWatchGraphics *digitalWatchGraphics = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(PoketchDigitalWatchGraphics));
+    PoketchDigitalWatchGraphics *digitalWatchGraphics = Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(PoketchDigitalWatchGraphics));
 
     if (digitalWatchGraphics != NULL) {
         NNSG2dScreenData *screenData;
diff --git a/src/applications/poketch/digital_watch/main.c b/src/applications/poketch/digital_watch/main.c
index 21d018f8d0..e6f27b9ceb 100644
--- a/src/applications/poketch/digital_watch/main.c
+++ b/src/applications/poketch/digital_watch/main.c
@@ -67,7 +67,7 @@ static void NitroStaticInit(void)
 
 static BOOL New(void **appData, PoketchSystem *poketchSys, BgConfig *bgConfig, u32 appID)
 {
-    PoketchDigitalWatch *digitalWatch = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(PoketchDigitalWatch));
+    PoketchDigitalWatch *digitalWatch = Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(PoketchDigitalWatch));
 
     if (digitalWatch != NULL) {
         if (Init(digitalWatch, poketchSys, bgConfig, appID)
diff --git a/src/applications/poketch/move_tester/graphics.c b/src/applications/poketch/move_tester/graphics.c
index 0bc10895bc..10506fae24 100644
--- a/src/applications/poketch/move_tester/graphics.c
+++ b/src/applications/poketch/move_tester/graphics.c
@@ -117,7 +117,7 @@ static void DisplayExclamation(PoketchMoveTesterGraphics *graphics, u32 exclamCo
 
 BOOL PoketchMoveTesterGraphics_New(PoketchMoveTesterGraphics **graphics, const MoveTesterData *moveTesterData, BgConfig *bgConfig)
 {
-    PoketchMoveTesterGraphics *moveTesterGraphics = (PoketchMoveTesterGraphics *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(PoketchMoveTesterGraphics));
+    PoketchMoveTesterGraphics *moveTesterGraphics = (PoketchMoveTesterGraphics *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(PoketchMoveTesterGraphics));
 
     if (moveTesterGraphics != NULL) {
         PoketchTask_InitActiveTaskList(moveTesterGraphics->activeTasks, NUM_TASK_SLOTS);
diff --git a/src/applications/poketch/move_tester/main.c b/src/applications/poketch/move_tester/main.c
index 1091b15e08..e45010f9ce 100644
--- a/src/applications/poketch/move_tester/main.c
+++ b/src/applications/poketch/move_tester/main.c
@@ -129,7 +129,7 @@ static void NitroStaticInit(void)
 
 static BOOL New(void **appData, PoketchSystem *poketchSys, BgConfig *bgConfig, u32 appID)
 {
-    PoketchMoveTester *moveTester = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(PoketchMoveTester));
+    PoketchMoveTester *moveTester = Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(PoketchMoveTester));
 
     if (moveTester != NULL) {
         if (Init(moveTester, poketchSys, bgConfig, appID)) {
diff --git a/src/applications/poketch/poketch_animation.c b/src/applications/poketch/poketch_animation.c
index 3acfc66271..327fc584b5 100644
--- a/src/applications/poketch/poketch_animation.c
+++ b/src/applications/poketch/poketch_animation.c
@@ -58,7 +58,7 @@ PoketchAnimation_AnimationManager *PoketchAnimation_SetupAnimationManager(NNSG2d
     BOOL success = FALSE;
 
     do {
-        animMan = Heap_AllocFromHeap(heapID, sizeof(PoketchAnimation_AnimationManager));
+        animMan = Heap_Alloc(heapID, sizeof(PoketchAnimation_AnimationManager));
 
         if (animMan == NULL) {
             break;
@@ -70,19 +70,19 @@ PoketchAnimation_AnimationManager *PoketchAnimation_SetupAnimationManager(NNSG2d
         animMan->oamMan = oamMan;
         animMan->heapID = heapID;
         animMan->numSlots = NNS_G2dGetOamManagerOamCapacity(oamMan);
-        animMan->oam = Heap_AllocFromHeap(heapID, sizeof(GXOamAttr) * animMan->numSlots);
+        animMan->oam = Heap_Alloc(heapID, sizeof(GXOamAttr) * animMan->numSlots);
 
         if (animMan->oam == NULL) {
             break;
         }
 
-        animMan->animatedSpritePool = Heap_AllocFromHeap(heapID, sizeof(PoketchAnimation_AnimatedSpriteData) * animMan->numSlots);
+        animMan->animatedSpritePool = Heap_Alloc(heapID, sizeof(PoketchAnimation_AnimatedSpriteData) * animMan->numSlots);
 
         if (animMan->animatedSpritePool == NULL) {
             break;
         }
 
-        animMan->animatedSpritePtrArray = Heap_AllocFromHeap(heapID, sizeof(PoketchAnimation_AnimatedSpriteData *) * animMan->numSlots);
+        animMan->animatedSpritePtrArray = Heap_Alloc(heapID, sizeof(PoketchAnimation_AnimatedSpriteData *) * animMan->numSlots);
 
         if (animMan->animatedSpritePtrArray == NULL) {
             break;
@@ -299,7 +299,7 @@ void PoketchAnimation_SetSpriteRotation(PoketchAnimation_AnimatedSpriteData *ani
     animatedSprite->rotZ = rotation;
 }
 
-BOOL PoketchAnimation_LoadSpriteFromNARC(PoketchAnimation_SpriteData *spriteData, enum NarcID narcID, u32 spriteID, u32 animID, enum HeapId heapID)
+BOOL PoketchAnimation_LoadSpriteFromNARC(PoketchAnimation_SpriteData *spriteData, enum NarcID narcID, u32 spriteID, u32 animID, enum HeapID heapID)
 {
     spriteData->heapID = heapID;
     spriteData->compressedSprite = LoadCompressedMemberFromNARC(narcID, spriteID, heapID);
diff --git a/src/applications/poketch/poketch_button.c b/src/applications/poketch/poketch_button.c
index d95618dc82..07d256b176 100644
--- a/src/applications/poketch/poketch_button.c
+++ b/src/applications/poketch/poketch_button.c
@@ -20,7 +20,7 @@ PoketchButtonManager *PoketchButtonManager_New(const TouchScreenHitTable *hitTab
 {
     GF_ASSERT(numButtons > 0);
 
-    PoketchButtonManager *buttonManager = Heap_AllocFromHeap(heapID, sizeof(PoketchButtonManager));
+    PoketchButtonManager *buttonManager = Heap_Alloc(heapID, sizeof(PoketchButtonManager));
 
     if (buttonManager) {
         buttonManager->heapID = heapID;
@@ -28,7 +28,7 @@ PoketchButtonManager *PoketchButtonManager_New(const TouchScreenHitTable *hitTab
         buttonManager->hitTable = hitTable;
         buttonManager->numButtons = numButtons;
         buttonManager->buttonCallbackData = callbackData;
-        buttonManager->buttons = Heap_AllocFromHeap(heapID, sizeof(PoketchButton) * numButtons);
+        buttonManager->buttons = Heap_Alloc(heapID, sizeof(PoketchButton) * numButtons);
 
         if (buttonManager->buttons) {
             for (u32 i = 0; i < numButtons; i++) {
diff --git a/src/applications/poketch/poketch_graphics.c b/src/applications/poketch/poketch_graphics.c
index a09a5ade83..cf13ace580 100644
--- a/src/applications/poketch/poketch_graphics.c
+++ b/src/applications/poketch/poketch_graphics.c
@@ -109,7 +109,7 @@ static void PoketchGraphics_FreeTilemapBufferTask(SysTask *task, void *taskMan);
 
 BOOL PoketchGraphics_Main(PoketchGraphics_TaskData **taskDataPtr, const PoketchGraphics_ConstTaskData *constTaskData, NNSG2dOamManagerInstance *oamMan, PoketchSystem *poketchSys)
 {
-    *taskDataPtr = Heap_AllocFromHeap(HEAP_ID_POKETCH_MAIN, sizeof(PoketchGraphics_TaskData));
+    *taskDataPtr = Heap_Alloc(HEAP_ID_POKETCH_MAIN, sizeof(PoketchGraphics_TaskData));
 
     if (*taskDataPtr != NULL) {
         PoketchGraphics_TaskData *newTaskData = *taskDataPtr;
diff --git a/src/applications/poketch/poketch_system.c b/src/applications/poketch/poketch_system.c
index 86b6c47c30..d8b920c242 100644
--- a/src/applications/poketch/poketch_system.c
+++ b/src/applications/poketch/poketch_system.c
@@ -121,7 +121,7 @@ void PoketchSystem_Create(FieldSystem *fieldSystem, PoketchSystem **poketchSys,
     Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_POKETCH_MAIN, HEAP_SIZE_POKETCH_MAIN);
     Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_POKETCH_APP, HEAP_SIZE_POKETCH_APP);
 
-    PoketchSystem *new_system = Heap_AllocFromHeap(HEAP_ID_POKETCH_MAIN, sizeof(PoketchSystem));
+    PoketchSystem *new_system = Heap_Alloc(HEAP_ID_POKETCH_MAIN, sizeof(PoketchSystem));
 
     if (new_system != NULL) {
         *poketchSys = new_system;
diff --git a/src/applications/poketch/poketch_task.c b/src/applications/poketch/poketch_task.c
index 5d401d64a5..85901958aa 100644
--- a/src/applications/poketch/poketch_task.c
+++ b/src/applications/poketch/poketch_task.c
@@ -94,7 +94,7 @@ void PoketchTask_Start(const PoketchTask *appTasks, u32 taskId, void *taskData,
     for (u32 slot = 0; appTasks[slot].taskId != POKETCH_EMPTY_TASK; slot++) {
         if (appTasks[slot].taskId == taskId) {
             u32 size = sizeof(PoketchTaskManager) + appTasks[slot].extraDataSize;
-            PoketchTaskManager *poketchTaskMan = Heap_AllocFromHeap(heapID, size);
+            PoketchTaskManager *poketchTaskMan = Heap_Alloc(heapID, size);
 
             if (poketchTaskMan != NULL) {
                 if (appTasks[slot].extraDataSize != 0) {
@@ -179,7 +179,7 @@ void ov25_02255258(u16 *tileBuffer, u32 param1, u32 param2, u32 param3, u32 para
 
 void PoketchTask_MapToActivePaletteFromLuminance(u16 *rawData, u32 numPaletteEntries)
 {
-    u16 *activePalette = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, PALETTE_SIZE_BYTES);
+    u16 *activePalette = Heap_Alloc(HEAP_ID_POKETCH_APP, PALETTE_SIZE_BYTES);
 
     if (activePalette) {
         static const u8 paletteEntries[] = {
@@ -209,10 +209,10 @@ void PoketchTask_MapToActivePaletteFromLuminance(u16 *rawData, u32 numPaletteEnt
 
 void PoketchTask_FillPaletteFromActivePaletteSlot(u32 slot, u32 offset)
 {
-    u16 *activePalette = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, PALETTE_SIZE_BYTES);
+    u16 *activePalette = Heap_Alloc(HEAP_ID_POKETCH_APP, PALETTE_SIZE_BYTES);
 
     if (activePalette) {
-        u16 *newPalette = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, PALETTE_SIZE_BYTES);
+        u16 *newPalette = Heap_Alloc(HEAP_ID_POKETCH_APP, PALETTE_SIZE_BYTES);
 
         PoketchGraphics_CopyActivePalette(activePalette);
 
@@ -251,7 +251,7 @@ void PoketchTask_LoadPokemonIcons(u32 offset, const u32 *iconIdxList, u32 numIco
 {
     static const u16 iconSize[2] = { 512, 1024 };
     static const u16 readSize[2] = { 640, 1152 };
-    u8 *ncgrFile = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, readSize[isLarge]);
+    u8 *ncgrFile = Heap_Alloc(HEAP_ID_POKETCH_APP, readSize[isLarge]);
 
     if (ncgrFile) {
         NARC *iconNARC = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, HEAP_ID_POKETCH_APP);
diff --git a/src/applications/rowan_intro/rowan_intro_app.c b/src/applications/rowan_intro/rowan_intro_app.c
index 6092271020..aac39f244c 100644
--- a/src/applications/rowan_intro/rowan_intro_app.c
+++ b/src/applications/rowan_intro/rowan_intro_app.c
@@ -223,7 +223,7 @@ enum DisplayTextBlockState {
 };
 
 typedef struct RowanIntro {
-    enum HeapId heapID;
+    enum HeapID heapID;
     SaveData *saveData;
     Options *options;
     enum RowanIntroState state;
@@ -332,8 +332,8 @@ BOOL RowanIntro_Init(ApplicationManager *appMan, int *unusedState)
     manager->bgLayer2TilemapIndex = 0;
     manager->bgSubLayer3TilemapIndex = 0;
     manager->delayUpdateCounter = 0;
-    manager->bunearyPalette = Heap_AllocFromHeap(heapID, 0x20);
-    manager->bunearyBlendedPalette = Heap_AllocFromHeap(heapID, 0x20);
+    manager->bunearyPalette = Heap_Alloc(heapID, 0x20);
+    manager->bunearyBlendedPalette = Heap_Alloc(heapID, 0x20);
 
     return TRUE;
 }
@@ -429,7 +429,7 @@ BOOL RowanIntro_Main(ApplicationManager *appMan, int *state)
 BOOL RowanIntro_Exit(ApplicationManager *appMan, int *unusedState)
 {
     RowanIntro *manager = ApplicationManager_Data(appMan);
-    enum HeapId heapID = manager->heapID;
+    enum HeapID heapID = manager->heapID;
 
     Heap_Free(manager->bunearyPalette);
     Heap_Free(manager->bunearyBlendedPalette);
@@ -1567,7 +1567,7 @@ static void RowanIntro_LoadBunearySprite(RowanIntro *manager)
         NULL,
         NULL);
 
-    rawData = Heap_AllocFromHeap(manager->heapID, (10 * 10) * 2);
+    rawData = Heap_Alloc(manager->heapID, (10 * 10) * 2);
 
     {
         int i;
diff --git a/src/applications/rowan_intro/tv_app.c b/src/applications/rowan_intro/tv_app.c
index fe97712512..5a5802eb4d 100644
--- a/src/applications/rowan_intro/tv_app.c
+++ b/src/applications/rowan_intro/tv_app.c
@@ -39,7 +39,7 @@ enum RowanIntroTvState {
 };
 
 typedef struct {
-    enum HeapId heapID;
+    enum HeapID heapID;
     BgConfig *bgConfig;
     MessageLoader *msgLoader;
     enum RowanIntroTvState state;
@@ -62,7 +62,7 @@ static void RowanIntroTv_ShiftCrtOverlay(RowanIntroTv *tv);
 BOOL RowanIntroTv_Init(ApplicationManager *appMan, enum RowanIntroTvAppState *unusedState)
 {
     RowanIntroTv *tv;
-    // changing this to enum HeapId breaks the checksum.
+    // changing this to enum HeapID breaks the checksum.
     int heapID = HEAP_ID_ROWAN_INTRO_TV;
 
     Heap_Create(HEAP_ID_APPLICATION, heapID, 0x40000);
@@ -179,7 +179,7 @@ BOOL RowanIntroTv_Main(ApplicationManager *appMan, enum RowanIntroTvAppState *st
 BOOL RowanIntroTv_Exit(ApplicationManager *appMan, enum RowanIntroTvAppState *unusedState)
 {
     RowanIntroTv *tv = ApplicationManager_Data(appMan);
-    enum HeapId heapID = tv->heapID;
+    enum HeapID heapID = tv->heapID;
 
     ApplicationManager_FreeData(appMan);
     Heap_Destroy(heapID);
diff --git a/src/applications/title_screen.c b/src/applications/title_screen.c
index 8428615f40..e0fdce6a70 100644
--- a/src/applications/title_screen.c
+++ b/src/applications/title_screen.c
@@ -225,22 +225,22 @@ static void TitleScreen_InitBgs(TitleScreenAppData *appData);
 static void TitleScreen_ReleaseBgs(TitleScreenAppData *appData);
 static void TitleScreen_Init3DPipeline(TitleScreenAppData *appData);
 static void TitleScreen_Free3DPipelineBuffers(TitleScreenAppData *appData);
-static void TitleScreen_Load3DGfx(TitleScreenGraphics *gfx, int giratinaModel, int giratinaTexAnim, enum HeapId heapID);
+static void TitleScreen_Load3DGfx(TitleScreenGraphics *gfx, int giratinaModel, int giratinaTexAnim, enum HeapID heapID);
 static void TitleScreen_Release3DGfx(TitleScreenGraphics *gfx);
 static void TitleScreen_Render(TitleScreen *titleScreen, TitleScreenGraphics *gfx);
 static BOOL TitleScreen_ShouldSkipIntro(void);
-static BOOL TitleScreen_LoadGfx(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapId heapID);
-static BOOL TitleScreen_ShowIntro(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapId heapID);
-static BOOL TitleScreen_RenderMain(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapId heapID);
-static BOOL TitleScreen_ReleaseGfx(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapId heapID);
-static void TitleScreen_LoadCutscene3DGfx(TitleScreenGraphics *gfx, enum HeapId heapID);
+static BOOL TitleScreen_LoadGfx(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapID heapID);
+static BOOL TitleScreen_ShowIntro(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapID heapID);
+static BOOL TitleScreen_RenderMain(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapID heapID);
+static BOOL TitleScreen_ReleaseGfx(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapID heapID);
+static void TitleScreen_LoadCutscene3DGfx(TitleScreenGraphics *gfx, enum HeapID heapID);
 static void TitleScreen_ReleaseIntro3DGfx(TitleScreenGraphics *gfx);
 static void TitleScreen_RenderIntroGraphics(TitleScreenGraphics *gfx);
 static void TitleScreen_UpdateIntroCamera(TitleScreen *titleScreen, TitleScreenGraphics *gfx);
-static void TitleScreen_ShowBlurEffect(BgConfig *bgConfig, enum HeapId heapID);
+static void TitleScreen_ShowBlurEffect(BgConfig *bgConfig, enum HeapID heapID);
 static void EmptyCameraFunction(Camera *camera);
-static void TitleScreen_Load2DGfx(BgConfig *bgConfig, enum HeapId heapID, TitleScreen *titleScreen);
-static void TitleScreen_Release2DGfx(BgConfig *bgConfig, enum HeapId heapID, TitleScreen *titleScreen);
+static void TitleScreen_Load2DGfx(BgConfig *bgConfig, enum HeapID heapID, TitleScreen *titleScreen);
+static void TitleScreen_Release2DGfx(BgConfig *bgConfig, enum HeapID heapID, TitleScreen *titleScreen);
 static void TitleScreen_InitCoordinates(TitleScreen *titleScreen);
 static void TitleScreen_UpdateLight1(TitleScreen *titleScreen);
 
@@ -451,7 +451,7 @@ static BOOL TitleScreen_Main(ApplicationManager *appMan, int *state)
 static BOOL TitleScreen_Exit(ApplicationManager *appMan, int *state)
 {
     TitleScreenAppData *appData = ApplicationManager_Data(appMan);
-    enum HeapId heapID = appData->heapID;
+    enum HeapID heapID = appData->heapID;
     enum TitleScreenNextApp nextApp = appData->nextApp;
 
     SetVBlankCallback(NULL, NULL);
@@ -523,9 +523,9 @@ static void TitleScreen_Free3DPipelineBuffers(TitleScreenAppData *appData)
     G3DPipelineBuffers_Free(appData->buffers);
 }
 
-static void TitleScreen_Load3DGfx(TitleScreenGraphics *gfx, int giratinaModel, int giratinaTexAnim, enum HeapId heapID)
+static void TitleScreen_Load3DGfx(TitleScreenGraphics *gfx, int giratinaModel, int giratinaTexAnim, enum HeapID heapID)
 {
-    Heap_FndInitAllocatorForExpHeap(&gfx->allocator, heapID, 4);
+    HeapExp_FndInitAllocator(&gfx->allocator, heapID, 4);
 
     gfx->giratinaModelRes = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_DEMO__TITLE__TITLEDEMO, giratinaModel, heapID);
     gfx->giratinaTexAnimRes = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_DEMO__TITLE__TITLEDEMO, giratinaTexAnim, heapID);
@@ -559,7 +559,7 @@ static void TitleScreen_Load3DGfx(TitleScreenGraphics *gfx, int giratinaModel, i
     TitleScreen_LoadCutscene3DGfx(gfx, heapID);
 }
 
-static void TitleScreen_LoadCutscene3DGfx(TitleScreenGraphics *gfx, enum HeapId heapID)
+static void TitleScreen_LoadCutscene3DGfx(TitleScreenGraphics *gfx, enum HeapID heapID)
 {
     NARC *narc = NARC_ctor(NARC_INDEX_DEMO__TITLE__TITLEDEMO, heapID);
 
@@ -919,7 +919,7 @@ static const WindowTemplate sPressStartWindowTemplate = {
     .baseTile = 1
 };
 
-static BOOL TitleScreen_LoadGfx(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapId heapID)
+static BOOL TitleScreen_LoadGfx(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapID heapID)
 {
     TitleScreen_InitCoordinates(titleScreen);
     TitleScreen_Load2DGfx(bgConfig, heapID, titleScreen);
@@ -995,7 +995,7 @@ static void TitleScreen_UpdateTitleCam(TitleScreen *titleScreen)
     titleScreen->titleCamPos.z += (titleScreen->titleCamEndPos.z - titleScreen->titleCamStartPos.z) / steps;
 }
 
-static void TitleScreen_LoadTopScreenBg(BgConfig *bgConfig, enum HeapId heapID)
+static void TitleScreen_LoadTopScreenBg(BgConfig *bgConfig, enum HeapID heapID)
 {
     Bg_FreeTilemapBuffer(bgConfig, TITLE_SCREEN_LAYER_LOGO_BG_2);
 
@@ -1025,7 +1025,7 @@ static void TitleScreen_LoadTopScreenBg(BgConfig *bgConfig, enum HeapId heapID)
     ToggleLogoBg2Layer(TRUE);
 }
 
-static void TitleScreen_ShowBlurEffect(BgConfig *bgConfig, enum HeapId heapID)
+static void TitleScreen_ShowBlurEffect(BgConfig *bgConfig, enum HeapID heapID)
 {
     // This function loads the logo tilemap a second time into a different layer,
     // offsets that layer slightly, and applies alpha blending to both layers.
@@ -1064,7 +1064,7 @@ static void TitleScreen_ShowBlurEffect(BgConfig *bgConfig, enum HeapId heapID)
     TogglePressStartLayer(TRUE);
 }
 
-static BOOL TitleScreen_ShowIntro(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapId heapID)
+static BOOL TitleScreen_ShowIntro(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapID heapID)
 {
     BOOL done = FALSE;
 
@@ -1224,7 +1224,7 @@ static BOOL TitleScreen_ShowIntro(TitleScreen *titleScreen, BgConfig *bgConfig,
     return done;
 }
 
-static BOOL TitleScreen_RenderMain(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapId heapID)
+static BOOL TitleScreen_RenderMain(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapID heapID)
 {
     BOOL result = FALSE;
 
@@ -1270,7 +1270,7 @@ static BOOL TitleScreen_RenderMain(TitleScreen *titleScreen, BgConfig *bgConfig,
     return result;
 }
 
-static BOOL TitleScreen_ReleaseGfx(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapId heapID)
+static BOOL TitleScreen_ReleaseGfx(TitleScreen *titleScreen, BgConfig *bgConfig, enum HeapID heapID)
 {
     Camera_Delete(titleScreen->graphics.titleCamera);
     Camera_Delete(titleScreen->graphics.introCamera);
@@ -1287,7 +1287,7 @@ static BOOL TitleScreen_ReleaseGfx(TitleScreen *titleScreen, BgConfig *bgConfig,
     return TRUE;
 }
 
-static void TitleScreen_Load2DGfx(BgConfig *bgConfig, enum HeapId heapID, TitleScreen *titleScreen)
+static void TitleScreen_Load2DGfx(BgConfig *bgConfig, enum HeapID heapID, TitleScreen *titleScreen)
 {
     // Borders
     Graphics_LoadTilesToBgLayer(NARC_INDEX_DEMO__TITLE__TITLEDEMO, top_screen_border_NCGR, bgConfig, TITLE_SCREEN_LAYER_LOGO_BG, 0, 0, FALSE, heapID);
@@ -1352,7 +1352,7 @@ static void TitleScreen_Load2DGfx(BgConfig *bgConfig, enum HeapId heapID, TitleS
     Bg_LoadPalette(TITLE_SCREEN_LAYER_PRESS_START, &shadowColor, sizeof(u16), PLTT_OFFSET(2) + 2 * sizeof(u16));
 }
 
-static void TitleScreen_Release2DGfx(BgConfig *bgConfig, enum HeapId heapID, TitleScreen *titleScreen)
+static void TitleScreen_Release2DGfx(BgConfig *bgConfig, enum HeapID heapID, TitleScreen *titleScreen)
 {
     Window_Remove(&titleScreen->pressStartWindow);
 }
diff --git a/src/bag.c b/src/bag.c
index 22d8d27824..586cc71b2a 100644
--- a/src/bag.c
+++ b/src/bag.c
@@ -18,16 +18,16 @@
 #define BAG_MAX_QUANTITY_ITEM 999
 #define BAG_MAX_QUANTITY_TMHM 99
 
-static u32 Bag_GetPocketForItem(Bag *bag, u16 item, BagItem **outPocket, u32 *outMax, enum HeapId heapID);
+static u32 Bag_GetPocketForItem(Bag *bag, u16 item, BagItem **outPocket, u32 *outMax, enum HeapID heapID);
 
 int Bag_SaveSize(void)
 {
     return sizeof(Bag);
 }
 
-Bag *Bag_New(enum HeapId heapID)
+Bag *Bag_New(enum HeapID heapID)
 {
-    Bag *bag = Heap_AllocFromHeap(heapID, sizeof(Bag));
+    Bag *bag = Heap_Alloc(heapID, sizeof(Bag));
     Bag_Init(bag);
 
     return bag;
@@ -53,7 +53,7 @@ void Bag_RegisterItem(Bag *bag, u32 item)
     bag->registeredItem = item;
 }
 
-static u32 Bag_GetPocketForItem(Bag *bag, u16 item, BagItem **outPocket, u32 *outMax, enum HeapId heapID)
+static u32 Bag_GetPocketForItem(Bag *bag, u16 item, BagItem **outPocket, u32 *outMax, enum HeapID heapID)
 {
     u32 pocket = Item_LoadParam(item, ITEM_PARAM_FIELD_POCKET, heapID);
 
@@ -119,7 +119,7 @@ static BagItem *Pocket_FindSlotToAddItem(BagItem *pocket, u32 pocketSize, u16 it
     return slot == BAG_SLOT_INVALID ? NULL : &pocket[slot];
 }
 
-static BagItem *Bag_FindSlotToAddItem(Bag *bag, u16 item, u16 count, enum HeapId heapID)
+static BagItem *Bag_FindSlotToAddItem(Bag *bag, u16 item, u16 count, enum HeapID heapID)
 {
     BagItem *pocketItems;
     u32 pocketSize;
@@ -132,12 +132,12 @@ static BagItem *Bag_FindSlotToAddItem(Bag *bag, u16 item, u16 count, enum HeapId
     return Pocket_FindSlotToAddItem(pocketItems, pocketSize, item, count, BAG_MAX_QUANTITY_ITEM);
 }
 
-BOOL Bag_CanFitItem(Bag *bag, u16 item, u16 count, enum HeapId heapID)
+BOOL Bag_CanFitItem(Bag *bag, u16 item, u16 count, enum HeapID heapID)
 {
     return Bag_FindSlotToAddItem(bag, item, count, heapID) != NULL;
 }
 
-BOOL Bag_TryAddItem(Bag *bag, u16 item, u16 count, enum HeapId heapID)
+BOOL Bag_TryAddItem(Bag *bag, u16 item, u16 count, enum HeapID heapID)
 {
     BagItem *slot = Bag_FindSlotToAddItem(bag, item, count, heapID);
     if (slot == NULL) {
@@ -167,7 +167,7 @@ static BagItem *Pocket_FindSlotWithItemQuantity(BagItem *pocket, u32 pocketSize,
     return NULL;
 }
 
-static BagItem *Bag_FindSlotWithItemQuantity(Bag *bag, u16 item, u16 count, enum HeapId heapID)
+static BagItem *Bag_FindSlotWithItemQuantity(Bag *bag, u16 item, u16 count, enum HeapID heapID)
 {
     BagItem *pocket;
     u32 pocketSize;
@@ -176,7 +176,7 @@ static BagItem *Bag_FindSlotWithItemQuantity(Bag *bag, u16 item, u16 count, enum
     return Pocket_FindSlotWithItemQuantity(pocket, pocketSize, item, count);
 }
 
-BOOL Bag_TryRemoveItem(Bag *bag, u16 item, u16 count, enum HeapId heapID)
+BOOL Bag_TryRemoveItem(Bag *bag, u16 item, u16 count, enum HeapID heapID)
 {
     BagItem *slot = Bag_FindSlotWithItemQuantity(bag, item, count, heapID);
     if (slot == NULL) {
@@ -196,7 +196,7 @@ BOOL Bag_TryRemoveItem(Bag *bag, u16 item, u16 count, enum HeapId heapID)
     return TRUE;
 }
 
-BOOL Pocket_TryRemoveItem(BagItem *pocket, u32 pocketSize, u16 item, u16 count, enum HeapId heapID)
+BOOL Pocket_TryRemoveItem(BagItem *pocket, u32 pocketSize, u16 item, u16 count, enum HeapID heapID)
 {
     BagItem *slot = Pocket_FindSlotWithItemQuantity(pocket, pocketSize, item, count);
     if (slot == NULL) {
@@ -214,7 +214,7 @@ BOOL Pocket_TryRemoveItem(BagItem *pocket, u32 pocketSize, u16 item, u16 count,
     return TRUE;
 }
 
-BOOL Bag_CanRemoveItem(Bag *bag, u16 item, u16 count, enum HeapId heapID)
+BOOL Bag_CanRemoveItem(Bag *bag, u16 item, u16 count, enum HeapID heapID)
 {
     return Bag_FindSlotWithItemQuantity(bag, item, count, heapID) != NULL;
 }
@@ -270,7 +270,7 @@ BOOL Bag_HasItemsInPocket(Bag *bag, u32 pocketID)
     return FALSE;
 }
 
-u16 Bag_GetItemQuantity(Bag *bag, u16 item, enum HeapId heapID)
+u16 Bag_GetItemQuantity(Bag *bag, u16 item, enum HeapID heapID)
 {
     BagItem *slot = Bag_FindSlotWithItemQuantity(bag, item, 1, heapID);
     if (slot == NULL) {
@@ -280,7 +280,7 @@ u16 Bag_GetItemQuantity(Bag *bag, u16 item, enum HeapId heapID)
     return slot->quantity;
 }
 
-u16 Pocket_GetItemQuantity(BagItem *pocket, u32 pocketSize, u16 item, enum HeapId heapID)
+u16 Pocket_GetItemQuantity(BagItem *pocket, u32 pocketSize, u16 item, enum HeapID heapID)
 {
     BagItem *slot = Pocket_FindSlotWithItemQuantity(pocket, pocketSize, item, 1);
     if (slot == NULL) {
@@ -319,7 +319,7 @@ void Pocket_Sort(BagItem *pocket, const u32 size)
     }
 }
 
-void *sub_0207D824(Bag *bag, const u8 *pockets, enum HeapId heapID)
+void *sub_0207D824(Bag *bag, const u8 *pockets, enum HeapID heapID)
 {
     BagSystem *v0;
     int i;
@@ -408,7 +408,7 @@ Bag *SaveData_GetBag(SaveData *saveData)
 
 BagCursor *BagCursor_New(u32 heapID)
 {
-    BagCursor *cursor = Heap_AllocFromHeap(heapID, sizeof(BagCursor));
+    BagCursor *cursor = Heap_Alloc(heapID, sizeof(BagCursor));
     MI_CpuClear16(cursor, sizeof(BagCursor));
     return cursor;
 }
diff --git a/src/bag_system.c b/src/bag_system.c
index e7db6d84e7..4b91d274d2 100644
--- a/src/bag_system.c
+++ b/src/bag_system.c
@@ -33,7 +33,7 @@ static u32 GetNumBattlePoints(SaveData *saveData);
 
 BagSystem *BagSystem_New(u8 heapID)
 {
-    BagSystem *bagSystem = Heap_AllocFromHeap(heapID, sizeof(BagSystem));
+    BagSystem *bagSystem = Heap_Alloc(heapID, sizeof(BagSystem));
     memset(bagSystem, 0, sizeof(BagSystem));
     return bagSystem;
 }
diff --git a/src/battle/battle_controller.c b/src/battle/battle_controller.c
index e3b3be5869..12160a29ae 100644
--- a/src/battle/battle_controller.c
+++ b/src/battle/battle_controller.c
@@ -177,7 +177,7 @@ static const BattleControlFunc sBattleControlCommands[] = {
 
 void *BattleContext_New(BattleSystem *battleSys)
 {
-    BattleContext *battleContext = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleContext));
+    BattleContext *battleContext = Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattleContext));
 
     MI_CpuClearFast(battleContext, sizeof(BattleContext));
 
diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c
index 009c01f631..31a0673948 100644
--- a/src/battle/battle_display.c
+++ b/src/battle/battle_display.c
@@ -232,7 +232,7 @@ static const u16 Unk_ov16_0226F1AE[] = {
 
 void ov16_0225CBB8(BattleSystem *battleSys, BattlerData *param1)
 {
-    UnkStruct_ov16_0225CBB8 *v0 = (UnkStruct_ov16_0225CBB8 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225CBB8));
+    UnkStruct_ov16_0225CBB8 *v0 = (UnkStruct_ov16_0225CBB8 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225CBB8));
     v0->unk_00 = battleSys;
     v0->unk_14 = 0;
     v0->unk_15 = 0;
@@ -256,7 +256,7 @@ void ov16_0225CBDC(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
 
     v2 = ov16_0223E000(battleSys);
     battleType = BattleSystem_BattleType(battleSys);
-    v4 = (UnkStruct_ov16_0225E4E8 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225E4E8));
+    v4 = (UnkStruct_ov16_0225E4E8 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225E4E8));
 
     v4->unk_12 = 0;
 
@@ -331,7 +331,7 @@ void ov16_0225CE1C(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     int v0;
     UnkStruct_ov16_0225EA80 *v1;
     int battleType = BattleSystem_BattleType(battleSys);
-    v1 = (UnkStruct_ov16_0225EA80 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225EA80));
+    v1 = (UnkStruct_ov16_0225EA80 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225EA80));
 
     if (param1->battlerType & 0x1) {
         v1->unk_84 = 2;
@@ -380,7 +380,7 @@ void ov16_0225CF70(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     int v1;
     UnkStruct_ov16_0225EA80 *v2;
     int battleType = BattleSystem_BattleType(battleSys);
-    v2 = (UnkStruct_ov16_0225EA80 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225EA80));
+    v2 = (UnkStruct_ov16_0225EA80 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225EA80));
     v2->unk_83 = 0;
 
     if (param1->battlerType & 0x1) {
@@ -434,7 +434,7 @@ void ov16_0225CF70(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
 void ov16_0225D118(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_02264EF8 *param2)
 {
     int i;
-    UnkStruct_ov16_0225F764 *v1 = (UnkStruct_ov16_0225F764 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225F764));
+    UnkStruct_ov16_0225F764 *v1 = (UnkStruct_ov16_0225F764 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225F764));
     v1->unk_00 = battleSys;
     v1->unk_04 = param1;
     v1->unk_08 = param1->unk_20;
@@ -459,7 +459,7 @@ void ov16_0225D118(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
 
 void ov16_0225D1C4(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_02265050 *param2)
 {
-    UnkStruct_ov16_0225D1C4 *v0 = (UnkStruct_ov16_0225D1C4 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D1C4));
+    UnkStruct_ov16_0225D1C4 *v0 = (UnkStruct_ov16_0225D1C4 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D1C4));
 
     v0->unk_00 = battleSys;
     v0->unk_04 = param1->unk_20;
@@ -480,7 +480,7 @@ void ov16_0225D228(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     UnkStruct_ov16_02264650_1 *v1;
     int v2;
 
-    v1 = (UnkStruct_ov16_02264650_1 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_02264650_1));
+    v1 = (UnkStruct_ov16_02264650_1 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_02264650_1));
     v1->unk_0E = 0;
 
     if (param1->battlerType & 0x1) {
@@ -518,7 +518,7 @@ void ov16_0225D228(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
 
 void ov16_0225D360(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_02265154 *param2)
 {
-    UnkStruct_ov16_0225D360 *v0 = (UnkStruct_ov16_0225D360 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D360));
+    UnkStruct_ov16_0225D360 *v0 = (UnkStruct_ov16_0225D360 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D360));
 
     v0->unk_0A = 0;
     v0->unk_00 = battleSys;
@@ -543,7 +543,7 @@ void ov16_0225D360(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
 
 void ov16_0225D3CC(BattleSystem *battleSys, BattlerData *param1)
 {
-    UnkStruct_ov16_0225D3CC *v0 = (UnkStruct_ov16_0225D3CC *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D3CC));
+    UnkStruct_ov16_0225D3CC *v0 = (UnkStruct_ov16_0225D3CC *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D3CC));
 
     v0->unk_0A = 0;
     v0->unk_00 = battleSys;
@@ -569,7 +569,7 @@ void ov16_0225D414(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     u32 v4;
 
     v2 = ov16_0223E000(battleSys);
-    v3 = (UnkStruct_ov16_02260384 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_02260384));
+    v3 = (UnkStruct_ov16_02260384 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_02260384));
     v3->unk_0A = 0;
 
     if (param1->battlerType & 0x1) {
@@ -634,7 +634,7 @@ void ov16_0225D5B8(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     UnkStruct_ov16_0225D5B8 *v0;
     int i, j;
 
-    v0 = (UnkStruct_ov16_0225D5B8 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D5B8));
+    v0 = (UnkStruct_ov16_0225D5B8 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D5B8));
     MI_CpuClearFast(v0, sizeof(UnkStruct_ov16_0225D5B8));
 
     v0->unk_0A = 0;
@@ -682,7 +682,7 @@ void ov16_0225D698(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     UnkStruct_ov16_0225D698 *v0;
     int i;
 
-    v0 = (UnkStruct_ov16_0225D698 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D698));
+    v0 = (UnkStruct_ov16_0225D698 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D698));
 
     v0->unk_20 = 0;
     v0->unk_00 = battleSys;
@@ -710,7 +710,7 @@ void ov16_0225D708(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     u32 battleType;
     u8 v4[6];
 
-    v0 = (UnkStruct_ov16_0225D708 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D708));
+    v0 = (UnkStruct_ov16_0225D708 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D708));
 
     v0->unk_0F = 0;
     v0->unk_00 = battleSys;
@@ -738,10 +738,10 @@ void ov16_0225D794(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     UnkStruct_ov16_0225D794 *v0;
     int i, j;
 
-    v0 = (UnkStruct_ov16_0225D794 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D794));
+    v0 = (UnkStruct_ov16_0225D794 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D794));
 
-    v0->unk_08 = (UnkStruct_ov16_0225D840 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D840));
-    v0->unk_08->unk_04 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattlePartyContext));
+    v0->unk_08 = (UnkStruct_ov16_0225D840 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D840));
+    v0->unk_08->unk_04 = Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattlePartyContext));
     v0->unk_08->unk_04->party = Party_New(HEAP_ID_BATTLE);
     v0->unk_0E = 0;
     v0->unk_00 = battleSys;
@@ -770,7 +770,7 @@ void ov16_0225D840(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     UnkStruct_ov16_0225D840 *v0;
     int i, j;
 
-    v0 = (UnkStruct_ov16_0225D840 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D840));
+    v0 = (UnkStruct_ov16_0225D840 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D840));
 
     v0->unk_0A = 0;
     v0->unk_00 = battleSys;
@@ -795,7 +795,7 @@ void ov16_0225D840(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
 
 void ov16_0225D8AC(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_0225C2D8 *param2)
 {
-    UnkStruct_ov16_0225D8AC *v0 = (UnkStruct_ov16_0225D8AC *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D8AC));
+    UnkStruct_ov16_0225D8AC *v0 = (UnkStruct_ov16_0225D8AC *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D8AC));
 
     v0->unk_0E = 0;
     v0->unk_00 = battleSys;
@@ -824,7 +824,7 @@ void ov16_0225D8F0(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     BattleMessage v2;
 
     v1 = ov16_0223E060(battleSys);
-    v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
+    v0 = (BattleMessageWaitTask *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
 
     v0->battleSys = battleSys;
     v0->command = param2->unk_00;
@@ -842,7 +842,7 @@ void ov16_0225D8F0(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
 void BattleDisplay_PrintMessage(BattleSystem *battleSys, BattlerData *battlerData, BattleMessage *battleMsg)
 {
     MessageLoader *msgLoader = BattleSystem_MessageLoader(battleSys);
-    BattleMessageWaitTask *taskData = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
+    BattleMessageWaitTask *taskData = Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
 
     taskData->battleSys = battleSys;
     taskData->command = battlerData->data[0];
@@ -854,7 +854,7 @@ void BattleDisplay_PrintMessage(BattleSystem *battleSys, BattlerData *battlerDat
 
 void ov16_0225D9A8(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_02265BBC *param2)
 {
-    UnkStruct_ov16_0225D9A8 *v0 = (UnkStruct_ov16_0225D9A8 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D9A8));
+    UnkStruct_ov16_0225D9A8 *v0 = (UnkStruct_ov16_0225D9A8 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225D9A8));
 
     v0->unk_6A = 0;
     v0->unk_00 = battleSys;
@@ -879,7 +879,7 @@ void ov16_0225D9A8(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
 
 void ov16_0225DA44(BattleSystem *battleSys, BattlerData *param1)
 {
-    UnkStruct_ov16_0225DA44 *v0 = (UnkStruct_ov16_0225DA44 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225DA44));
+    UnkStruct_ov16_0225DA44 *v0 = (UnkStruct_ov16_0225DA44 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225DA44));
 
     v0->unk_09 = 0;
     v0->unk_00 = battleSys;
@@ -946,7 +946,7 @@ void ov16_0225DB74(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     UnkStruct_ov16_0225DB74 *v0;
     int i;
 
-    v0 = (UnkStruct_ov16_0225DB74 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225DB74));
+    v0 = (UnkStruct_ov16_0225DB74 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225DB74));
 
     if (param1->battlerType & 0x1) {
         v0->unk_67 = 2;
@@ -994,7 +994,7 @@ void ov16_0225DC4C(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
 
 void ov16_0225DC7C(BattleSystem *battleSys, BattlerData *param1)
 {
-    UnkStruct_ov16_0225DC7C *v0 = (UnkStruct_ov16_0225DC7C *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225DC7C));
+    UnkStruct_ov16_0225DC7C *v0 = (UnkStruct_ov16_0225DC7C *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225DC7C));
 
     v0->unk_06 = 0;
     v0->unk_00 = battleSys;
@@ -1009,7 +1009,7 @@ void ov16_0225DCB0(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     UnkStruct_ov16_0225DCB0 *v0;
     int i;
 
-    v0 = (UnkStruct_ov16_0225DCB0 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225DCB0));
+    v0 = (UnkStruct_ov16_0225DCB0 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225DCB0));
 
     v0->unk_00 = battleSys;
     v0->unk_04 = param1;
@@ -1044,7 +1044,7 @@ void ov16_0225DD7C(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
 {
     BattleMessageWaitTask *v0;
     int v1 = Battler_TrainerID(battleSys, param1->battler);
-    v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
+    v0 = (BattleMessageWaitTask *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
 
     v0->battleSys = battleSys;
     v0->command = param2->unk_00;
@@ -1063,7 +1063,7 @@ void ov16_0225DDD8(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     ov16_02263C1C(battleSys, param1, param2, &v2);
 
     v1 = BattleSystem_MessageLoader(battleSys);
-    v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
+    v0 = (BattleMessageWaitTask *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
 
     v0->battleSys = battleSys;
     v0->command = param2->unk_00;
@@ -1082,7 +1082,7 @@ void ov16_0225DE30(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     ov16_02263CF0(battleSys, param1, param2, &v2);
 
     v1 = BattleSystem_MessageLoader(battleSys);
-    v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
+    v0 = (BattleMessageWaitTask *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
 
     v0->battleSys = battleSys;
     v0->command = param2->unk_00;
@@ -1101,7 +1101,7 @@ void ov16_0225DE88(BattleSystem *battleSys, BattlerData *param1)
     ov16_02263DD0(battleSys, param1, &v2);
 
     v1 = BattleSystem_MessageLoader(battleSys);
-    v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
+    v0 = (BattleMessageWaitTask *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
 
     v0->battleSys = battleSys;
     v0->command = 34;
@@ -1120,7 +1120,7 @@ void ov16_0225DEDC(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     ov16_02263E7C(battleSys, param1, param2, &v2);
 
     v1 = BattleSystem_MessageLoader(battleSys);
-    v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
+    v0 = (BattleMessageWaitTask *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
 
     v0->battleSys = battleSys;
     v0->command = param2->unk_00;
@@ -1132,7 +1132,7 @@ void ov16_0225DEDC(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
 
 void ov16_0225DF34(BattleSystem *battleSys, BattlerData *param1)
 {
-    UnkStruct_ov16_0225DF34 *v0 = (UnkStruct_ov16_0225DF34 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225DF34));
+    UnkStruct_ov16_0225DF34 *v0 = (UnkStruct_ov16_0225DF34 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225DF34));
 
     v0->unk_00 = battleSys;
     v0->unk_08 = param1->data[0];
@@ -1150,7 +1150,7 @@ void ov16_0225DF6C(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
 
     if (param1->bootState == 0x0) {
         v1 = BattleSystem_MessageLoader(battleSys);
-        v0 = (UnkStruct_ov16_0225DF6C *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225DF6C));
+        v0 = (UnkStruct_ov16_0225DF6C *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225DF6C));
 
         v0->unk_00 = battleSys;
         v0->unk_04 = param2->unk_00;
@@ -1199,7 +1199,7 @@ void ov16_0225E008(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
 
 void ov16_0225E0BC(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_0225C65C *param2)
 {
-    UnkStruct_ov16_0225E0BC *v0 = (UnkStruct_ov16_0225E0BC *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225E0BC));
+    UnkStruct_ov16_0225E0BC *v0 = (UnkStruct_ov16_0225E0BC *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225E0BC));
 
     v0->unk_0A = 0;
     v0->unk_00 = battleSys;
@@ -1213,7 +1213,7 @@ void ov16_0225E0BC(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
 
 void ov16_0225E0F4(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_022664F8 *param2)
 {
-    UnkStruct_ov16_0225E0F4 *v0 = (UnkStruct_ov16_0225E0F4 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225E0F4));
+    UnkStruct_ov16_0225E0F4 *v0 = (UnkStruct_ov16_0225E0F4 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225E0F4));
 
     v0->unk_0A = 0;
     v0->unk_00 = battleSys;
@@ -1239,7 +1239,7 @@ typedef struct PartyGaugeTask {
 
 void BattleDisplay_ShowBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge)
 {
-    PartyGaugeTask *task = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(PartyGaugeTask));
+    PartyGaugeTask *task = Heap_Alloc(HEAP_ID_BATTLE, sizeof(PartyGaugeTask));
 
     task->state = 0;
     task->battleSys = battleSys;
@@ -1257,7 +1257,7 @@ void BattleDisplay_ShowBattleStartPartyGauge(BattleSystem *battleSys, BattlerDat
 
 void BattleDisplay_HideBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge)
 {
-    PartyGaugeTask *task = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(PartyGaugeTask));
+    PartyGaugeTask *task = Heap_Alloc(HEAP_ID_BATTLE, sizeof(PartyGaugeTask));
 
     task->state = 0;
     task->battleSys = battleSys;
@@ -1271,7 +1271,7 @@ void BattleDisplay_HideBattleStartPartyGauge(BattleSystem *battleSys, BattlerDat
 
 void BattleDisplay_ShowPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge)
 {
-    PartyGaugeTask *task = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(PartyGaugeTask));
+    PartyGaugeTask *task = Heap_Alloc(HEAP_ID_BATTLE, sizeof(PartyGaugeTask));
 
     task->state = 0;
     task->battleSys = battleSys;
@@ -1289,7 +1289,7 @@ void BattleDisplay_ShowPartyGauge(BattleSystem *battleSys, BattlerData *battlerD
 
 void BattleDisplay_HidePartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge)
 {
-    PartyGaugeTask *task = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(PartyGaugeTask));
+    PartyGaugeTask *task = Heap_Alloc(HEAP_ID_BATTLE, sizeof(PartyGaugeTask));
 
     task->state = 0;
     task->battleSys = battleSys;
@@ -1330,7 +1330,7 @@ void ov16_0225E294(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
 
 void ov16_0225E2C8(BattleSystem *battleSys, BattlerData *param1)
 {
-    UnkStruct_ov16_0225E2C8 *v0 = (UnkStruct_ov16_0225E2C8 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225E2C8));
+    UnkStruct_ov16_0225E2C8 *v0 = (UnkStruct_ov16_0225E2C8 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225E2C8));
 
     v0->unk_0E = 0;
     v0->unk_00 = battleSys;
@@ -1344,7 +1344,7 @@ void ov16_0225E2C8(BattleSystem *battleSys, BattlerData *param1)
 
 void ov16_0225E300(BattleSystem *battleSys, BattlerData *param1)
 {
-    UnkStruct_ov16_0225E300 *v0 = (UnkStruct_ov16_0225E300 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225E300));
+    UnkStruct_ov16_0225E300 *v0 = (UnkStruct_ov16_0225E300 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0225E300));
 
     v0->unk_0E = 0;
     v0->unk_00 = battleSys;
@@ -1365,7 +1365,7 @@ void ov16_0225E338(BattleSystem *battleSys, BattlerData *param1)
     ov16_022641B4(battleSys, param1, &v2);
 
     v1 = BattleSystem_MessageLoader(battleSys);
-    v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
+    v0 = (BattleMessageWaitTask *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
 
     v0->battleSys = battleSys;
     v0->command = 59;
@@ -1384,7 +1384,7 @@ void ov16_0225E38C(BattleSystem *battleSys, BattlerData *param1, UnkStruct_ov16_
     ov16_02264270(battleSys, param1, param2, &v2);
 
     v1 = BattleSystem_MessageLoader(battleSys);
-    v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
+    v0 = (BattleMessageWaitTask *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
 
     v0->battleSys = battleSys;
     v0->command = 60;
@@ -1403,7 +1403,7 @@ void ov16_0225E3E0(BattleSystem *battleSys, BattlerData *param1)
     ov16_02264360(battleSys, param1, &v2);
 
     v1 = BattleSystem_MessageLoader(battleSys);
-    v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
+    v0 = (BattleMessageWaitTask *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask));
 
     v0->battleSys = battleSys;
     v0->command = 61;
@@ -3542,7 +3542,7 @@ static void ov16_022611DC(SysTask *param0, void *param1)
             {
                 ov16_0223B384(v0->unk_00);
 
-                v0->unk_04 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleBagContext));
+                v0->unk_04 = Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattleBagContext));
                 memset(v0->unk_04, 0, sizeof(BattleBagContext));
 
                 v0->unk_04->battleSystem = v0->unk_00;
@@ -4141,7 +4141,7 @@ static void ov16_02261E8C(SysTask *param0, void *param1)
 
                 ov16_0223B384(v0->unk_00);
 
-                v0->unk_04 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattlePartyContext));
+                v0->unk_04 = Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattlePartyContext));
                 v0->unk_04->party = Party_New(HEAP_ID_BATTLE);
 
                 if (((BattleSystem_BattleType(v0->unk_00) & (BATTLE_TYPE_LINK | BATTLE_TYPE_2vs2)) == (BATTLE_TYPE_LINK | BATTLE_TYPE_2vs2)) || (BattleSystem_BattleType(v0->unk_00) == ((BATTLE_TYPE_TRAINER_DOUBLES | BATTLE_TYPE_2vs2 | BATTLE_TYPE_AI) | BATTLE_TYPE_FRONTIER))) {
@@ -5175,7 +5175,7 @@ static void ov16_022633A4(SysTask *param0, void *param1)
         if (PaletteData_GetSelectedBuffersMask(v1) == 0) {
             ov16_0223B384(v0->unk_00);
 
-            v0->unk_04 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattlePartyContext));
+            v0->unk_04 = Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattlePartyContext));
             v0->unk_04->party = BattleSystem_Party(v0->unk_00, v0->unk_09);
             v0->unk_04->battleSystem = v0->unk_00;
             v0->unk_04->heapID = HEAP_ID_BATTLE;
@@ -6201,7 +6201,7 @@ static BOOL ov16_02264650(UnkStruct_ov16_02264650_1 *param0, ManagedSprite *para
     case 1:
         if (param0->unk_12_0 == 0) {
             param0->unk_12_0 = 1;
-            v0 = (UnkStruct_ov16_02264650 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_02264650));
+            v0 = (UnkStruct_ov16_02264650 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_02264650));
             v0->unk_00 = 0;
             v0->unk_04 = 0;
 
diff --git a/src/battle/battle_io_command.c b/src/battle/battle_io_command.c
index 8cfc7af60e..d11e333cfb 100644
--- a/src/battle/battle_io_command.c
+++ b/src/battle/battle_io_command.c
@@ -158,7 +158,7 @@ BattlerData *ov16_0225BFFC(BattleSystem *battleSys, UnkStruct_ov16_0223C2C0 *par
     BattlerData *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattlerData));
+    v0 = Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattlerData));
     MI_CpuClearFast(v0, sizeof(BattlerData));
 
     v0->battler = param1->unk_00;
diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c
index 4dad855568..ae53c76be0 100644
--- a/src/battle/battle_script.c
+++ b/src/battle/battle_script.c
@@ -2536,7 +2536,7 @@ static BOOL BtlCmd_StartGetExpTask(BattleSystem *battleSys, BattleContext *battl
 {
     BattleScript_Iter(battleCtx, 1);
 
-    battleCtx->taskData = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleScriptTaskData));
+    battleCtx->taskData = Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattleScriptTaskData));
     battleCtx->taskData->battleSys = battleSys;
     battleCtx->taskData->battleCtx = battleCtx;
     battleCtx->taskData->seqNum = SEQ_GET_EXP_START;
@@ -2792,7 +2792,7 @@ static BOOL BtlCmd_StartCatchMonTask(BattleSystem *battleSys, BattleContext *bat
     BattleScript_Iter(battleCtx, 1);
     BOOL safariCapture = BattleScript_Read(battleCtx);
 
-    battleCtx->taskData = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleScriptTaskData));
+    battleCtx->taskData = Heap_Alloc(HEAP_ID_BATTLE, sizeof(BattleScriptTaskData));
     battleCtx->taskData->battleSys = battleSys;
     battleCtx->taskData->battleCtx = battleCtx;
     battleCtx->taskData->seqNum = 0;
@@ -3863,7 +3863,7 @@ static BOOL BtlCmd_PrintTrainerMessage(BattleSystem *battleSys, BattleContext *b
 static u32 BattleScript_CalcPrizeMoney(BattleSystem *battleSys, BattleContext *battleCtx, int battler)
 {
     u8 lastLevel = 0;
-    void *rawParty = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(TrainerMonWithMovesAndItem) * MAX_PARTY_SIZE);
+    void *rawParty = Heap_Alloc(HEAP_ID_BATTLE, sizeof(TrainerMonWithMovesAndItem) * MAX_PARTY_SIZE);
 
     Trainer trainer;
     Trainer_Load(battleSys->trainerIDs[battler], &trainer);
@@ -10072,7 +10072,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData)
             int level = Pokemon_GetValue(mon, MON_DATA_LEVEL, NULL);
 
             // Cache the stats from the previous level for later
-            data->battleCtx->tmpData = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(PokemonStats));
+            data->battleCtx->tmpData = Heap_Alloc(HEAP_ID_BATTLE, sizeof(PokemonStats));
             PokemonStats *oldStats = data->battleCtx->tmpData;
             for (i = 0; i < STAT_MAX; i++) {
                 oldStats->stat[i] = Pokemon_GetValue(mon, statParams[i], NULL);
diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c
index bb48cfc9fa..1e43960cea 100644
--- a/src/battle/healthbar.c
+++ b/src/battle/healthbar.c
@@ -1153,8 +1153,8 @@ static void Healthbar_DrawLevelNumber(Healthbar *param0)
     int v3, v4, v5, v6;
 
     v3 = 3 * 0x20;
-    v0 = Heap_AllocFromHeap(HEAP_ID_BATTLE, v3);
-    v1 = Heap_AllocFromHeap(HEAP_ID_BATTLE, v3 * 2);
+    v0 = Heap_Alloc(HEAP_ID_BATTLE, v3);
+    v1 = Heap_Alloc(HEAP_ID_BATTLE, v3 * 2);
 
     MI_CpuFill8(v0, 0xf | (0xf << 4), v3);
     FontSpecialChars_DrawBattleScreenText(ov16_0223E054(param0->battleSys), param0->unk_48, 3, 0, v0);
@@ -1197,7 +1197,7 @@ static void Healthbar_DrawCurrentHP(Healthbar *param0, u32 param1)
     u8 *v0;
     NNSG2dImageProxy *v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_BATTLE, 3 * 0x20);
+    v0 = Heap_Alloc(HEAP_ID_BATTLE, 3 * 0x20);
 
     MI_CpuFill8(v0, 0xf | (0xf << 4), 3 * 0x20);
     FontSpecialChars_DrawBattleScreenText(ov16_0223E04C(param0->battleSys), param1, 3, 1, v0);
@@ -1222,7 +1222,7 @@ static void Healthbar_DrawMaxHP(Healthbar *param0)
     u8 *v0;
     NNSG2dImageProxy *v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_BATTLE, 3 * 0x20);
+    v0 = Heap_Alloc(HEAP_ID_BATTLE, 3 * 0x20);
 
     MI_CpuFill8(v0, 0xf | (0xf << 4), 3 * 0x20);
     FontSpecialChars_DrawBattleScreenText(ov16_0223E04C(param0->battleSys), param0->maxHP, 3, 0, v0);
@@ -1740,7 +1740,7 @@ void ov16_0226834C(Healthbar *param0, u8 *param1)
 
     *param1 = 0;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0226834C));
+    v0 = Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0226834C));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov16_0226834C));
 
     v0->unk_00 = param0;
diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c
index 397dfb649d..fb5b2d6e64 100644
--- a/src/battle/ov16_0223B140.c
+++ b/src/battle/ov16_0223B140.c
@@ -546,7 +546,7 @@ static void ov16_0223B790(ApplicationManager *appMan)
     battleSys->windows = Window_New(HEAP_ID_BATTLE, 3);
 
     for (idx = 0; idx < 4; idx++) {
-        battleSys->pokemonSpriteDataArray[idx].tiles = Heap_AllocFromHeap(HEAP_ID_BATTLE, 32 * 10 * 10);
+        battleSys->pokemonSpriteDataArray[idx].tiles = Heap_Alloc(HEAP_ID_BATTLE, 32 * 10 * 10);
     }
 
     VramTransfer_New(64, HEAP_ID_BATTLE);
@@ -2008,7 +2008,7 @@ static BOOL ov16_0223D800(ApplicationManager *appMan)
         return 0;
     }
 
-    battleSys->unk_1C0 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov10_0221F800));
+    battleSys->unk_1C0 = Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov10_0221F800));
     MI_CpuClearFast(battleSys->unk_1C0, sizeof(UnkStruct_ov10_0221F800));
     v2 = CommSys_CurNetId();
 
@@ -2076,7 +2076,7 @@ static BOOL ov16_0223D98C(ApplicationManager *appMan)
     }
 
     v2 = CommSys_CurNetId();
-    battleSys->unk_1C0 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov10_0221F800));
+    battleSys->unk_1C0 = Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov10_0221F800));
 
     MI_CpuClearFast(battleSys->unk_1C0, sizeof(UnkStruct_ov10_0221F800));
 
@@ -2138,7 +2138,7 @@ static BOOL ov16_0223DB1C(ApplicationManager *appMan)
 
     v2 = CommSys_CurNetId();
     Overlay_LoadByID(FS_OVERLAY_ID(overlay10), 2);
-    v1 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov10_0221F800));
+    v1 = Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov10_0221F800));
 
     v0->unk_170 = v1;
     MI_CpuClearFast(v1, sizeof(UnkStruct_ov10_0221F800));
diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c
index 61b1e279d4..c7be50d3c2 100644
--- a/src/battle/ov16_0223DF00.c
+++ b/src/battle/ov16_0223DF00.c
@@ -1124,8 +1124,8 @@ void ov16_0223EF8C(BattleSystem *battleSystem)
     int v1, v2, v3, v4, v5, v6;
     u8 *v7;
 
-    battleSystem->unk_21C = Heap_AllocFromHeap(HEAP_ID_BATTLE, 0x10000);
-    battleSystem->unk_220 = Heap_AllocFromHeap(HEAP_ID_BATTLE, 0x200);
+    battleSystem->unk_21C = Heap_Alloc(HEAP_ID_BATTLE, 0x10000);
+    battleSystem->unk_220 = Heap_Alloc(HEAP_ID_BATTLE, 0x200);
 
     MI_CpuCopy32((void *)(HW_BG_VRAM + 0x10000), battleSystem->unk_21C, 0x10000);
     MI_CpuCopy32(PaletteData_GetUnfadedBuffer(battleSystem->paletteSys, 0), battleSystem->unk_220, HW_BG_PLTT_SIZE);
diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c
index c596a5a71b..edfadc7174 100644
--- a/src/battle/ov16_0226871C.c
+++ b/src/battle/ov16_0226871C.c
@@ -1068,7 +1068,7 @@ static const struct {
 
 static void *ov16_0226871C(void)
 {
-    UnkStruct_ov16_02268A14 *v0 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_02268A14));
+    UnkStruct_ov16_02268A14 *v0 = Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_02268A14));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov16_02268A14));
     v0->unk_66B = -1;
 
@@ -1132,7 +1132,7 @@ void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *battleSys, int par
         int v6;
 
         for (i = 0; i < 7; i++) {
-            v0->unk_3C[i] = Heap_AllocFromHeap(HEAP_ID_BATTLE, 0x800);
+            v0->unk_3C[i] = Heap_Alloc(HEAP_ID_BATTLE, 0x800);
 
             if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_FRONTIER) && (Unk_ov16_02270264[i] == 49)) {
                 v6 = 170;
@@ -1152,7 +1152,7 @@ void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *battleSys, int par
         int v8;
 
         v8 = (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_FRONTIER) ? 340 : 242;
-        v0->unk_58 = Heap_AllocFromHeap(HEAP_ID_BATTLE, 0x200);
+        v0->unk_58 = Heap_Alloc(HEAP_ID_BATTLE, 0x200);
 
         PaletteData_LoadBufferFromFileStart(v1, 7, v8, 5, 1, 0, 0);
 
@@ -1177,7 +1177,7 @@ void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *battleSys, int par
 
         for (i = 0; i < 4; i++) {
             for (j = 0; j < 4; j++) {
-                v0->unk_68[i].moveIcons[j] = Heap_AllocFromHeap(HEAP_ID_BATTLE, sub_0208C098(6));
+                v0->unk_68[i].moveIcons[j] = Heap_Alloc(HEAP_ID_BATTLE, sub_0208C098(6));
             }
         }
     }
@@ -1187,8 +1187,8 @@ void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *battleSys, int par
         void *v14;
         int v15;
 
-        v0->unk_5C = Heap_AllocFromHeap(HEAP_ID_BATTLE, 0x40);
-        v0->unk_60 = Heap_AllocFromHeap(HEAP_ID_BATTLE, 0x40);
+        v0->unk_5C = Heap_Alloc(HEAP_ID_BATTLE, 0x40);
+        v0->unk_60 = Heap_Alloc(HEAP_ID_BATTLE, 0x40);
 
         MI_CpuCopy16(v0->unk_58, v0->unk_5C, 0x20);
         MI_CpuCopy16(&v0->unk_58[7 * 16], &v0->unk_5C[16 * 1], 0x20);
@@ -1753,7 +1753,7 @@ static void ov16_02269550(UnkStruct_ov16_02268A14 *param0, int param1)
     G2S_SetWnd1Position(0, 18 * 8, 255, 192);
     GXS_SetVisibleWnd(GX_WNDMASK_W0 | GX_WNDMASK_W1);
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0226B988));
+    v1 = Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0226B988));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov16_0226B988));
 
     v1->unk_00 = param0;
diff --git a/src/battle/ov16_0226DB7C.c b/src/battle/ov16_0226DB7C.c
index 53213f5a97..a964600d12 100644
--- a/src/battle/ov16_0226DB7C.c
+++ b/src/battle/ov16_0226DB7C.c
@@ -68,7 +68,7 @@ UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteSystem *param0, SpriteManager *para
     v1.priority = param7;
     v1.bgPriority = param8;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov16_0226DC24));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov16_0226DC24));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov16_0226DC24));
 
     for (v2 = 0; v2 < 5; v2++) {
diff --git a/src/battle/ov16_0226DE44.c b/src/battle/ov16_0226DE44.c
index 1e112a4013..929b69c274 100644
--- a/src/battle/ov16_0226DE44.c
+++ b/src/battle/ov16_0226DE44.c
@@ -80,7 +80,7 @@ UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteSystem *param0, SpriteManager *para
     v1.priority = param7;
     v1.bgPriority = param8;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov16_0226DEEC));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov16_0226DEEC));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov16_0226DEEC));
 
     v0->unk_00 = SpriteSystem_NewSprite(param0, param1, &v1);
diff --git a/src/battle/ov16_0226E148.c b/src/battle/ov16_0226E148.c
index b3adb5ebf9..27c0c3695d 100644
--- a/src/battle/ov16_0226E148.c
+++ b/src/battle/ov16_0226E148.c
@@ -28,7 +28,7 @@ SysTask *ov16_0226E148(BattleSystem *battleSys)
     UnkStruct_ov16_0226E148 *v0;
     SysTask *v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0226E148));
+    v0 = Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov16_0226E148));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov16_0226E148));
 
     v0->unk_00 = battleSys;
diff --git a/src/battle/party_gauge.c b/src/battle/party_gauge.c
index a320ba58ba..a320e7bbc3 100644
--- a/src/battle/party_gauge.c
+++ b/src/battle/party_gauge.c
@@ -219,7 +219,7 @@ void PartyGauge_FreeGraphics(SpriteManager *spriteMan)
 
 static PartyGauge *NewPartyGauge()
 {
-    PartyGauge *gauge = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(PartyGauge));
+    PartyGauge *gauge = Heap_Alloc(HEAP_ID_BATTLE, sizeof(PartyGauge));
     MI_CpuClear8(gauge, sizeof(PartyGauge));
     return gauge;
 }
diff --git a/src/battle_anim/battle_anim_helpers.c b/src/battle_anim/battle_anim_helpers.c
index 8bfada95cb..c2ecb56177 100644
--- a/src/battle_anim/battle_anim_helpers.c
+++ b/src/battle_anim/battle_anim_helpers.c
@@ -855,9 +855,9 @@ static void CustomBgScrollContext_DoDMA(void *param)
     CustomBgScrollContext_DoDMAImpl(ctx);
 }
 
-CustomBgScrollContext *CustomBgScrollContext_New(u32 offsetReg, u32 initValue, enum HeapId heapID)
+CustomBgScrollContext *CustomBgScrollContext_New(u32 offsetReg, u32 initValue, enum HeapID heapID)
 {
-    CustomBgScrollContext *ctx = Heap_AllocFromHeap(heapID, sizeof(CustomBgScrollContext));
+    CustomBgScrollContext *ctx = Heap_Alloc(heapID, sizeof(CustomBgScrollContext));
     memset(ctx, 0, sizeof(CustomBgScrollContext));
 
     GF_ASSERT(ctx);
@@ -913,9 +913,9 @@ static void BgScrollContext_DoDMA(void *param)
     ScreenScrollManager_RestartDMA(ctx->screenScrollMgr);
 }
 
-BgScrollContext *BgScrollContext_New(u8 startY, u8 endY, u16 angleIncrement, fx32 amplitude, s16 speed, u32 bgID, u32 priority, u32 initValue, enum HeapId heapID)
+BgScrollContext *BgScrollContext_New(u8 startY, u8 endY, u16 angleIncrement, fx32 amplitude, s16 speed, u32 bgID, u32 priority, u32 initValue, enum HeapID heapID)
 {
-    BgScrollContext *ctx = Heap_AllocFromHeap(heapID, sizeof(BgScrollContext));
+    BgScrollContext *ctx = Heap_Alloc(heapID, sizeof(BgScrollContext));
     GF_ASSERT(ctx);
 
     memset(ctx, 0, sizeof(BgScrollContext));
@@ -1073,9 +1073,9 @@ void PaletteFadeContext_Free(PaletteFadeContext *ctx)
     Heap_Free(ctx);
 }
 
-PaletteFadeContext *PaletteFadeContext_New(PaletteData *paletteData, enum HeapId heapID, enum PaletteBufferID bufferID, u16 index, u16 count, s8 stepFrames, s8 step, u8 startFrac, u8 endFrac, u16 color, int priority)
+PaletteFadeContext *PaletteFadeContext_New(PaletteData *paletteData, enum HeapID heapID, enum PaletteBufferID bufferID, u16 index, u16 count, s8 stepFrames, s8 step, u8 startFrac, u8 endFrac, u16 color, int priority)
 {
-    PaletteFadeContext *ctx = Heap_AllocFromHeap(heapID, sizeof(PaletteFadeContext));
+    PaletteFadeContext *ctx = Heap_Alloc(heapID, sizeof(PaletteFadeContext));
     GF_ASSERT(ctx != NULL);
 
     ctx->paletteData = paletteData;
diff --git a/src/battle_anim/battle_anim_system.c b/src/battle_anim/battle_anim_system.c
index 0245fa9100..18dadc923a 100644
--- a/src/battle_anim/battle_anim_system.c
+++ b/src/battle_anim/battle_anim_system.c
@@ -321,10 +321,10 @@ static void BattleAnimSystem_EndTask(u8 kind, BattleAnimSystem *system, SysTask
     SysTask_Done(task);
 }
 
-BattleAnimSystem *BattleAnimSystem_New(enum HeapId heapID)
+BattleAnimSystem *BattleAnimSystem_New(enum HeapID heapID)
 {
     int i;
-    BattleAnimSystem *system = Heap_AllocFromHeap(heapID, sizeof(BattleAnimSystem));
+    BattleAnimSystem *system = Heap_Alloc(heapID, sizeof(BattleAnimSystem));
 
     if (system == NULL) {
         GF_ASSERT(system != NULL);
@@ -335,7 +335,7 @@ BattleAnimSystem *BattleAnimSystem_New(enum HeapId heapID)
 
     system->heapID = heapID;
     system->isContest = FALSE;
-    system->context = Heap_AllocFromHeap(system->heapID, sizeof(BattleAnimContext));
+    system->context = Heap_Alloc(system->heapID, sizeof(BattleAnimContext));
     system->arcs[BATTLE_ANIM_SYSTEM_ARC_BATT_BG] = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, heapID);
     system->arcs[BATTLE_ANIM_SYSTEM_ARC_BATT_OBJ] = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, heapID);
     system->arcs[BATTLE_ANIM_SYSTEM_ARC_WECHAR] = NARC_ctor(NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECHAR, heapID);
@@ -379,7 +379,7 @@ BOOL BattleAnimSystem_IsContest(BattleAnimSystem *system)
     return system->isContest;
 }
 
-enum HeapId BattleAnimSystem_GetHeapID(BattleAnimSystem *system)
+enum HeapID BattleAnimSystem_GetHeapID(BattleAnimSystem *system)
 {
     GF_ASSERT(system != NULL);
     return system->heapID;
@@ -672,7 +672,7 @@ static BOOL (*const sBattleAnimSoundFuncs[BATTLE_ANIM_SOUND_TASK_COUNT])(BattleA
 
 static BattleAnimSoundContext *BattleAnimSystem_CreateSoundContext(BattleAnimSystem *system)
 {
-    BattleAnimSoundContext *ctx = Heap_AllocFromHeap(system->heapID, sizeof(BattleAnimSoundContext));
+    BattleAnimSoundContext *ctx = Heap_Alloc(system->heapID, sizeof(BattleAnimSoundContext));
     if (ctx == NULL) {
         GF_ASSERT(FALSE);
         return NULL;
@@ -1825,7 +1825,7 @@ static void BattleAnimScriptCmd_LoadPokemonSpriteIntoBg(BattleAnimSystem *system
         system->heapID);
 
     if (trackBattler == TRUE) {
-        system->bgTrackingTask = Heap_AllocFromHeap(system->heapID, sizeof(SpriteTrackingTask));
+        system->bgTrackingTask = Heap_Alloc(system->heapID, sizeof(SpriteTrackingTask));
         system->bgTrackingTask->bg = system->bgConfig;
         system->bgTrackingTask->data.sprite = BattleAnimSystem_GetBattlerSprite(system, battler);
         system->bgTrackingTask->data.frameCount = 0;
@@ -2033,7 +2033,7 @@ static void BattleAnimScriptCmd_AddPokemonSprite(BattleAnimSystem *system)
             return;
         }
 
-        system->spriteTrackingTasks[spriteID] = Heap_AllocFromHeap(system->heapID, sizeof(SpriteTrackingTask));
+        system->spriteTrackingTasks[spriteID] = Heap_Alloc(system->heapID, sizeof(SpriteTrackingTask));
         system->spriteTrackingTasks[spriteID]->sprite = sprite;
         system->spriteTrackingTasks[spriteID]->data.sprite = BattleAnimSystem_GetBattlerSprite(system, battler);
         system->spriteTrackingTasks[spriteID]->data.frameCount = 0;
@@ -2360,7 +2360,7 @@ static void BattleBgSwitch_ApplyFlags(BattleBgSwitch *bgSwitch)
 
 static BattleBgSwitch *BattleAnimSystem_CreateBgSwitch(BattleAnimSystem *system)
 {
-    BattleBgSwitch *bgSwitch = Heap_AllocFromHeap(system->heapID, sizeof(BattleBgSwitch));
+    BattleBgSwitch *bgSwitch = Heap_Alloc(system->heapID, sizeof(BattleBgSwitch));
     if (bgSwitch == NULL) {
         GF_ASSERT(FALSE);
         return NULL;
@@ -2770,7 +2770,7 @@ static BOOL BattleBgSwitch_AnimNone(BattleBgSwitch *bgSwitch)
 
 static BOOL BattleBgSwitch_AnimMoveStart(BattleBgSwitch *bgSwitch)
 {
-    BattleBgAnim *bgAnim = Heap_AllocFromHeap(bgSwitch->battleAnimSystem->heapID, sizeof(BattleBgAnim));
+    BattleBgAnim *bgAnim = Heap_Alloc(bgSwitch->battleAnimSystem->heapID, sizeof(BattleBgAnim));
 
     bgAnim->bgConfig = bgSwitch->battleAnimSystem->bgConfig;
     bgAnim->offsetX = bgSwitch->battleAnimSystem->scriptVars[BATTLE_ANIM_VAR_BG_MOVE_START_X];
@@ -2805,9 +2805,9 @@ static BOOL ov12_0222240C(BattleBgSwitch *param0)
     BattleBgAnim *v3;
 
     system = param0->battleAnimSystem;
-    v3 = Heap_AllocFromHeap(param0->battleAnimSystem->heapID, sizeof(BattleBgAnim));
+    v3 = Heap_Alloc(param0->battleAnimSystem->heapID, sizeof(BattleBgAnim));
 
-    v3->unk_1C = Heap_AllocFromHeap(system->heapID, sizeof(UnkStruct_ov12_022224F8));
+    v3->unk_1C = Heap_Alloc(system->heapID, sizeof(UnkStruct_ov12_022224F8));
     system->bgAnim = v3;
 
     param0->unk_44_1 = 1;
@@ -3933,7 +3933,7 @@ UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *battleSys, int heapID, int
 {
     int v0;
     int v1[] = { 0, 0, 20, 10, 10, 20 };
-    UnkStruct_ov12_02223764 *v2 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov12_02223764));
+    UnkStruct_ov12_02223764 *v2 = Heap_Alloc(heapID, sizeof(UnkStruct_ov12_02223764));
 
     v2->heapID = heapID;
     v2->unk_04 = param2;
diff --git a/src/battle_anim/battle_anim_util.c b/src/battle_anim/battle_anim_util.c
index cbfea1affb..e4b0599fde 100644
--- a/src/battle_anim/battle_anim_util.c
+++ b/src/battle_anim/battle_anim_util.c
@@ -909,8 +909,8 @@ void *BattleAnimUtil_Alloc(BattleAnimSystem *system, int size)
 {
     GF_ASSERT(system != NULL);
 
-    enum HeapId heapID = BattleAnimSystem_GetHeapID(system);
-    void *ptr = Heap_AllocFromHeap(heapID, size);
+    enum HeapID heapID = BattleAnimSystem_GetHeapID(system);
+    void *ptr = Heap_Alloc(heapID, size);
 
     GF_ASSERT(ptr != NULL);
     memset(ptr, 0, size);
diff --git a/src/battle_anim/battle_particle_util.c b/src/battle_anim/battle_particle_util.c
index 3ca3a5fbfc..fd30347e97 100644
--- a/src/battle_anim/battle_particle_util.c
+++ b/src/battle_anim/battle_particle_util.c
@@ -44,7 +44,7 @@ static void ov12_022237EC(SPLEmitter *param0)
     return;
 }
 
-ParticleSystem *BattleParticleUtil_CreateParticleSystem(enum HeapId heapID, int narcMemberIndex, BOOL uploadResImmediately)
+ParticleSystem *BattleParticleUtil_CreateParticleSystem(enum HeapID heapID, int narcMemberIndex, BOOL uploadResImmediately)
 {
     ParticleSystem *ps = ParticleHelper_CreateParticleSystem(heapID);
     void *resource = ParticleSystem_LoadResourceFromNARC(NARC_INDEX_WAZAEFFECT__EFFECTDATA__WAZA_PARTICLE, narcMemberIndex, heapID);
@@ -53,7 +53,7 @@ ParticleSystem *BattleParticleUtil_CreateParticleSystem(enum HeapId heapID, int
     return ps;
 }
 
-ParticleSystem *BattleParticleUtil_CreateParticleSystemEx(enum HeapId heapID, enum NarcID narcID, int memberIndex, BOOL uploadResImmediately)
+ParticleSystem *BattleParticleUtil_CreateParticleSystemEx(enum HeapID heapID, enum NarcID narcID, int memberIndex, BOOL uploadResImmediately)
 {
     ParticleSystem *ps = ParticleHelper_CreateParticleSystem(heapID);
     void *resource = ParticleSystem_LoadResourceFromNARC(narcID, memberIndex, heapID);
@@ -62,12 +62,12 @@ ParticleSystem *BattleParticleUtil_CreateParticleSystemEx(enum HeapId heapID, en
     return ps;
 }
 
-void *BattleParticleUtil_ReadMemberFromNARC(NARC *narc, int memberIdx, enum HeapId heapID)
+void *BattleParticleUtil_ReadMemberFromNARC(NARC *narc, int memberIdx, enum HeapID heapID)
 {
     return NARC_AllocAndReadWholeMember(narc, memberIdx, heapID);
 }
 
-ParticleSystem *ov12_0222384C(NARC *param0, enum HeapId heapID, int param2, int param3)
+ParticleSystem *ov12_0222384C(NARC *param0, enum HeapID heapID, int param2, int param3)
 {
     ParticleSystem *v0;
     void *v1;
diff --git a/src/battle_anim/ov12_0222421C.c b/src/battle_anim/ov12_0222421C.c
index b614215f91..9a97a8ea79 100644
--- a/src/battle_anim/ov12_0222421C.c
+++ b/src/battle_anim/ov12_0222421C.c
@@ -670,7 +670,7 @@ static void ov12_02224EB8(SPLEmitter *param0, UnkStruct_ov12_02225640 *param1)
 void ov12_02224F14(SPLEmitter *param0)
 {
     BattleAnimSystem *v0 = ParticleSystem_GetEmitterCallbackParam();
-    UnkStruct_ov12_02225640 *v1 = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(v0), sizeof(UnkStruct_ov12_02225640));
+    UnkStruct_ov12_02225640 *v1 = Heap_Alloc(BattleAnimSystem_GetHeapID(v0), sizeof(UnkStruct_ov12_02225640));
 
     v1->unk_00 = v0;
     v1->unk_04 = BattleAnimSystem_GetCurrentParticleSystem(v1->unk_00);
diff --git a/src/battle_anim/ov12_02235E94.c b/src/battle_anim/ov12_02235E94.c
index e95eccd103..3b8b22d294 100644
--- a/src/battle_anim/ov12_02235E94.c
+++ b/src/battle_anim/ov12_02235E94.c
@@ -326,7 +326,7 @@ UnkStruct_ov12_02235FE0 *ov12_02235FE0(int heapID)
 {
     UnkStruct_ov12_02235FE0 *v0 = NULL;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov12_02235FE0));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov12_02235FE0));
 
     if (v0 == NULL) {
         GF_ASSERT(0);
@@ -662,7 +662,7 @@ static void ov12_0223646C(UnkStruct_ov12_02235FE0 *param0, SPLEmitterCallback pa
         ParticleSystem_SetCameraProjection(param0->unk_14[0], 1);
     } else {
         for (v0 = 0; v0 < param0->unk_10; v0++) {
-            UnkStruct_02236430 *v4 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02236430));
+            UnkStruct_02236430 *v4 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_02236430));
 
             GF_ASSERT(v4 != NULL);
 
@@ -819,7 +819,7 @@ static void ov12_02236648(SPLEmitter *param0)
 
 UnkStruct_ov12_02236648 *ov12_02236690(UnkStruct_ov12_02236690 *param0)
 {
-    UnkStruct_ov12_02236648 *v0 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov12_02236648));
+    UnkStruct_ov12_02236648 *v0 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_ov12_02236648));
     GF_ASSERT(v0 != NULL);
 
     v0->unk_00 = *param0;
@@ -1978,7 +1978,7 @@ BallRotation *ov12_02237728(BallThrow *param0)
 {
     BallRotation *v0 = NULL;
 
-    v0 = Heap_AllocFromHeap(param0->heapID, sizeof(BallRotation));
+    v0 = Heap_Alloc(param0->heapID, sizeof(BallRotation));
     MI_CpuClear8(v0, sizeof(BallRotation));
 
     GF_ASSERT(v0 != NULL);
diff --git a/src/battle_anim/ov12_02237EFC.c b/src/battle_anim/ov12_02237EFC.c
index 2458204443..17a5fb3743 100644
--- a/src/battle_anim/ov12_02237EFC.c
+++ b/src/battle_anim/ov12_02237EFC.c
@@ -39,7 +39,7 @@ static int ov12_02238088(int param0);
 UnkStruct_ov12_02237F98 *ov12_02237EFC(int heapID, UnkStruct_ov12_02237EFC *param1)
 {
     UnkStruct_ov12_02237F98 *v0 = NULL;
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov12_02237F98));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov12_02237F98));
 
     if (v0 == NULL) {
         GF_ASSERT(0);
@@ -135,7 +135,7 @@ UnkStruct_ov12_02238004 *ov12_02237FC8(int heapID, UnkStruct_ov12_02237F38 *para
 
     v0 == NULL;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov12_02238004));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov12_02238004));
 
     if (v0 == NULL) {
         GF_ASSERT(0);
diff --git a/src/battle_anim/script_func_examples.c b/src/battle_anim/script_func_examples.c
index 880fd07c40..4ad132e53f 100644
--- a/src/battle_anim/script_func_examples.c
+++ b/src/battle_anim/script_func_examples.c
@@ -61,7 +61,7 @@ static void BattleAnimTask_AnimExample(SysTask *task, void *param)
 
 void BattleAnimScriptFunc_AnimExample(BattleAnimSystem *system)
 {
-    AnimExampleContext *ctx = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(AnimExampleContext));
+    AnimExampleContext *ctx = Heap_Alloc(HEAP_ID_BATTLE, sizeof(AnimExampleContext));
 
     ctx->state = TASK_STATE_RUNNING;
     ctx->system = system;
@@ -86,7 +86,7 @@ static void BattleAnimTask_SoundExample(SysTask *task, void *param)
 
 void BattleAnimScriptFunc_SoundExample(BattleAnimSystem *system)
 {
-    SoundExampleContext *ctx = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(SoundExampleContext));
+    SoundExampleContext *ctx = Heap_Alloc(HEAP_ID_BATTLE, sizeof(SoundExampleContext));
 
     ctx->state = TASK_STATE_RUNNING;
     ctx->system = system;
@@ -111,7 +111,7 @@ static void BattleAnimtTask_GenericExample(SysTask *task, void *param)
 
 void BattleAnimScriptFunc_GenericExample(BattleAnimSystem *system)
 {
-    GenericExampleContext *ctx = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(GenericExampleContext));
+    GenericExampleContext *ctx = Heap_Alloc(HEAP_ID_BATTLE, sizeof(GenericExampleContext));
 
     ctx->state = TASK_STATE_RUNNING;
     ctx->system = system;
@@ -150,7 +150,7 @@ void ov12_02226B1C(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager
     UnkStruct_ov12_02226AAC *v0;
     SpriteTemplate v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_ov12_02226AAC));
+    v0 = Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_ov12_02226AAC));
 
     GF_ASSERT(v0 != NULL);
 
diff --git a/src/battle_anim/script_funcs_0.c b/src/battle_anim/script_funcs_0.c
index 9acb81c6d1..7eeebc0357 100644
--- a/src/battle_anim/script_funcs_0.c
+++ b/src/battle_anim/script_funcs_0.c
@@ -704,7 +704,7 @@ void ov12_0222AE68(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager
     UnkStruct_ov12_0222AC70 *v1;
     SpriteTemplate v2;
 
-    v1 = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(param0), sizeof(UnkStruct_ov12_0222AC70));
+    v1 = Heap_Alloc(BattleAnimSystem_GetHeapID(param0), sizeof(UnkStruct_ov12_0222AC70));
 
     GF_ASSERT(v1 != NULL);
 
@@ -830,7 +830,7 @@ static void BattleAnimTask_Strength(SysTask *task, void *param)
 
 void BattleAnimScriptFunc_Strength(BattleAnimSystem *system)
 {
-    StrengthContext *ctx = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(system), sizeof(StrengthContext));
+    StrengthContext *ctx = Heap_Alloc(BattleAnimSystem_GetHeapID(system), sizeof(StrengthContext));
 
     ctx->blinkCounter = 0;
     ctx->state = STRENGTH_STATE_SHRINK;
@@ -948,7 +948,7 @@ static void BattleAnimTask_BulkUp(SysTask *task, void *param)
 
 void BattleAnimScriptFunc_BulkUp(BattleAnimSystem *system)
 {
-    BulkUpContext *ctx = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(system), sizeof(BulkUpContext));
+    BulkUpContext *ctx = Heap_Alloc(BattleAnimSystem_GetHeapID(system), sizeof(BulkUpContext));
 
     ctx->state = BULK_UP_STATE_SQUISH_Y;
     ctx->battleAnimSys = system;
@@ -1073,7 +1073,7 @@ static void BattleAnimTask_DoubleTeam(SysTask *task, void *param)
 
 void BattleAnimScriptFunc_DoubleTeam(BattleAnimSystem *system)
 {
-    DoubleTeamContext *ctx = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(system), sizeof(DoubleTeamContext));
+    DoubleTeamContext *ctx = Heap_Alloc(BattleAnimSystem_GetHeapID(system), sizeof(DoubleTeamContext));
 
     ctx->state = 0;
     ctx->iteration = 0;
diff --git a/src/battle_anim/script_funcs_2.c b/src/battle_anim/script_funcs_2.c
index 35aa7fdb04..2eb86948be 100644
--- a/src/battle_anim/script_funcs_2.c
+++ b/src/battle_anim/script_funcs_2.c
@@ -938,7 +938,7 @@ static void BattleAnimTask_QuickAttack(SysTask *task, void *param)
 
 void BattleAnimScriptFunc_QuickAttack(BattleAnimSystem *system)
 {
-    QuickAttackContext *ctx = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(system), sizeof(QuickAttackContext));
+    QuickAttackContext *ctx = Heap_Alloc(BattleAnimSystem_GetHeapID(system), sizeof(QuickAttackContext));
 
     ctx->battleAnimSys = system;
     ctx->pokemonSpriteManager = BattleAnimSystem_GetPokemonSpriteManager(ctx->battleAnimSys);
@@ -1045,7 +1045,7 @@ static void BattleAnimTask_DrillPeck(SysTask *task, void *param)
 void BattleAnimScriptFunc_DrillPeck(BattleAnimSystem *system)
 {
     // BUG: Should be sizeof(DrillPeckContext), not sizeof(QuickAttackContext)
-    DrillPeckContext *ctx = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(system), sizeof(QuickAttackContext));
+    DrillPeckContext *ctx = Heap_Alloc(BattleAnimSystem_GetHeapID(system), sizeof(QuickAttackContext));
 
     ctx->battleAnimSys = system;
     ctx->state = DRILL_PECK_STATE_MOVE_BWD;
@@ -1230,7 +1230,7 @@ void ov12_0222FE30(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager
     int v3;
     int v4;
 
-    v0 = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(param0), sizeof(UnkStruct_ov12_0222FC44));
+    v0 = Heap_Alloc(BattleAnimSystem_GetHeapID(param0), sizeof(UnkStruct_ov12_0222FC44));
 
     v0->unk_00 = param0;
     v0->unk_04 = param1;
@@ -1339,7 +1339,7 @@ static void BattleAnimTask_Confusion(SysTask *task, void *param)
 
 void BattleAnimScriptFunc_Confusion(BattleAnimSystem *system)
 {
-    ConfusionContext *ctx = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(system), sizeof(ConfusionContext));
+    ConfusionContext *ctx = Heap_Alloc(BattleAnimSystem_GetHeapID(system), sizeof(ConfusionContext));
 
     ctx->battleAnimSys = system;
     ctx->pokemonSpriteManager = BattleAnimSystem_GetPokemonSpriteManager(ctx->battleAnimSys);
@@ -1488,7 +1488,7 @@ static void BattleAnimTask_AcidArmor(SysTask *task, void *param)
 
 void BattleAnimScriptFunc_AcidArmor(BattleAnimSystem *system)
 {
-    AcidArmorContext *ctx = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(system), sizeof(AcidArmorContext));
+    AcidArmorContext *ctx = Heap_Alloc(BattleAnimSystem_GetHeapID(system), sizeof(AcidArmorContext));
     memset(ctx, 0, sizeof(AcidArmorContext));
 
     ctx->battleAnimSys = system;
@@ -1667,7 +1667,7 @@ static void BattleAnimTask_NightShadeDefender(SysTask *task, void *param)
 
 void BattleAnimScriptFunc_NightShadeAttacker(BattleAnimSystem *system)
 {
-    NightShaderAttackerContext *ctx = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(system), sizeof(NightShaderAttackerContext));
+    NightShaderAttackerContext *ctx = Heap_Alloc(BattleAnimSystem_GetHeapID(system), sizeof(NightShaderAttackerContext));
     memset(ctx, 0, sizeof(NightShaderAttackerContext));
 
     ctx->battleAnimSys = system;
@@ -1705,7 +1705,7 @@ void BattleAnimScriptFunc_NightShadeAttacker(BattleAnimSystem *system)
 
 void BattleAnimScriptFunc_NightShadeDefender(BattleAnimSystem *system)
 {
-    NightShadeDefenderContext *ctx = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(system), sizeof(NightShadeDefenderContext));
+    NightShadeDefenderContext *ctx = Heap_Alloc(BattleAnimSystem_GetHeapID(system), sizeof(NightShadeDefenderContext));
     memset(ctx, 0, sizeof(NightShadeDefenderContext));
 
     ctx->battleAnimSys = system;
diff --git a/src/battle_anim/script_funcs_3.c b/src/battle_anim/script_funcs_3.c
index 2512b94f0a..2ab7ab2181 100644
--- a/src/battle_anim/script_funcs_3.c
+++ b/src/battle_anim/script_funcs_3.c
@@ -1261,7 +1261,7 @@ static void BattleAnimTask_RotateMon(SysTask *task, void *param)
 
 void BattleAnimScriptFunc_RotateMon(BattleAnimSystem *system)
 {
-    RotateMonContext *ctx = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(system), sizeof(RotateMonContext));
+    RotateMonContext *ctx = Heap_Alloc(BattleAnimSystem_GetHeapID(system), sizeof(RotateMonContext));
 
     ctx->state = 0;
     ctx->system = system;
@@ -1318,7 +1318,7 @@ static void BattleAnimTask_Submission(SysTask *task, void *param)
 
 void BattleAnimScriptFunc_Submission(BattleAnimSystem *system)
 {
-    SubmissionContext *ctx = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(system), sizeof(SubmissionContext));
+    SubmissionContext *ctx = Heap_Alloc(BattleAnimSystem_GetHeapID(system), sizeof(SubmissionContext));
     ctx->battleAnimSys = system;
 
     RevolutionContext_InitOvalRevolutions(
@@ -2330,7 +2330,7 @@ static void BattleAnimTask_ShakeAndScaleAttacker(SysTask *task, void *param)
 
 void BattleAnimScriptFunc_ShakeAndScaleAttacker(BattleAnimSystem *system)
 {
-    ShakeAndScaleAttackerContext *ctx = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(system), sizeof(ShakeAndScaleAttackerContext));
+    ShakeAndScaleAttackerContext *ctx = Heap_Alloc(BattleAnimSystem_GetHeapID(system), sizeof(ShakeAndScaleAttackerContext));
 
     ctx->unused1 = 0;
     ctx->state = SHAKE_AND_SCALE_ATTACKER_STATE_SCALE_1;
@@ -2423,7 +2423,7 @@ static void BattleAnimTask_ShakeAndScaleAttacker2(SysTask *task, void *param)
 
 void BattleAnimScriptFunc_ShakeAndScaleAttacker2(BattleAnimSystem *system)
 {
-    ShakeAndScaleAttacker2Context *ctx = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(system), sizeof(ShakeAndScaleAttacker2Context));
+    ShakeAndScaleAttacker2Context *ctx = Heap_Alloc(BattleAnimSystem_GetHeapID(system), sizeof(ShakeAndScaleAttacker2Context));
 
     ctx->unused1 = 0;
     ctx->state = SHAKE_AND_SCALE_ATTACKER_2_STATE_SCALE_1;
diff --git a/src/battle_anim/script_funcs_4.c b/src/battle_anim/script_funcs_4.c
index 3204e6a0d1..7a096fa87e 100644
--- a/src/battle_anim/script_funcs_4.c
+++ b/src/battle_anim/script_funcs_4.c
@@ -203,7 +203,7 @@ void ov12_0222D7C0(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager
     UnkStruct_ov12_0222D6B0 *v1;
     SpriteTemplate v2;
 
-    v1 = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(param0), sizeof(UnkStruct_ov12_0222D6B0));
+    v1 = Heap_Alloc(BattleAnimSystem_GetHeapID(param0), sizeof(UnkStruct_ov12_0222D6B0));
 
     GF_ASSERT(v1 != NULL);
 
@@ -422,7 +422,7 @@ void ov12_0222DB60(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager
     UnkStruct_ov12_0222D934 *v1;
     SpriteTemplate v2;
 
-    v1 = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(param0), sizeof(UnkStruct_ov12_0222D934));
+    v1 = Heap_Alloc(BattleAnimSystem_GetHeapID(param0), sizeof(UnkStruct_ov12_0222D934));
 
     GF_ASSERT(v1 != NULL);
 
@@ -639,7 +639,7 @@ void ov12_0222DEFC(BattleAnimSystem *param0, SpriteSystem *param1, SpriteManager
     UnkStruct_ov12_0222DE24 *v2;
     SpriteTemplate v3;
 
-    v2 = Heap_AllocFromHeap(BattleAnimSystem_GetHeapID(param0), sizeof(UnkStruct_ov12_0222DE24));
+    v2 = Heap_Alloc(BattleAnimSystem_GetHeapID(param0), sizeof(UnkStruct_ov12_0222DE24));
     GF_ASSERT(v2 != NULL);
 
     v2->unk_01 = 0;
diff --git a/src/battle_anim/script_funcs_stat_change.c b/src/battle_anim/script_funcs_stat_change.c
index 6fa36dd4c6..47465d37a6 100644
--- a/src/battle_anim/script_funcs_stat_change.c
+++ b/src/battle_anim/script_funcs_stat_change.c
@@ -88,7 +88,7 @@ static void StatChangeParam_SetInitAlpha(StatChangeParam *param, u16 overlayAlph
 
 static void StatChangeContext_LoadBg(StatChangeContext *ctx, enum BgLayer bgLayer)
 {
-    enum HeapId heapID = BattleAnimSystem_GetHeapID(ctx->common.battleAnimSys);
+    enum HeapID heapID = BattleAnimSystem_GetHeapID(ctx->common.battleAnimSys);
     int bgPriority = BattleAnimSystem_GetBgPriority(ctx->common.battleAnimSys, BATTLE_ANIM_BG_POKEMON);
 
     Bg_SetPriority(bgLayer, bgPriority);
diff --git a/src/berry_patches.c b/src/berry_patches.c
index 64a395c0ab..59764fb884 100644
--- a/src/berry_patches.c
+++ b/src/berry_patches.c
@@ -31,7 +31,7 @@ void BerryPatches_Clear(BerryPatch *patches)
     }
 }
 
-void BerryPatches_Init(BerryPatch *patches, enum HeapId heapID, const u16 *initPatches, int initSize)
+void BerryPatches_Init(BerryPatch *patches, enum HeapID heapID, const u16 *initPatches, int initSize)
 {
     BerryGrowthData *growthData = BerryGrowthData_Init(heapID);
 
@@ -49,12 +49,12 @@ void BerryPatches_Init(BerryPatch *patches, enum HeapId heapID, const u16 *initP
     Heap_Free(growthData);
 }
 
-BerryGrowthData *BerryGrowthData_Init(enum HeapId heapID)
+BerryGrowthData *BerryGrowthData_Init(enum HeapID heapID)
 {
     BerryGrowthData *growthData;
     BerryData *berryData;
     NARC *narc = BerryData_NARC_ctor(heapID);
-    growthData = Heap_AllocFromHeap(heapID, sizeof(BerryGrowthData) * NUM_BERRIES);
+    growthData = Heap_Alloc(heapID, sizeof(BerryGrowthData) * NUM_BERRIES);
 
     for (int i = 0; i < NUM_BERRIES; i++) {
         berryData = BerryData_LoadFromOpenNARC(narc, i, heapID);
diff --git a/src/bg_window.c b/src/bg_window.c
index ed4ec3fb69..52366e460b 100644
--- a/src/bg_window.c
+++ b/src/bg_window.c
@@ -46,7 +46,7 @@ static void RunScheduledTilemapTransfers(BgConfig *bgConfig);
 
 BgConfig *BgConfig_New(u32 heapID)
 {
-    BgConfig *bgConfig = Heap_AllocFromHeap(heapID, sizeof(BgConfig));
+    BgConfig *bgConfig = Heap_Alloc(heapID, sizeof(BgConfig));
 
     memset(bgConfig, 0, sizeof(BgConfig));
 
@@ -206,7 +206,7 @@ void Bg_InitFromTemplate(BgConfig *bgConfig, u8 bgLayer, const BgTemplate *bgTem
     bgConfig->bgs[bgLayer].yCenter = 0;
 
     if (bgTemplate->bufferSize) {
-        bgConfig->bgs[bgLayer].tilemapBuffer = Heap_AllocFromHeap(bgConfig->heapID, bgTemplate->bufferSize);
+        bgConfig->bgs[bgLayer].tilemapBuffer = Heap_Alloc(bgConfig->heapID, bgTemplate->bufferSize);
 
         MI_CpuClear16(bgConfig->bgs[bgLayer].tilemapBuffer, bgTemplate->bufferSize);
 
@@ -792,7 +792,7 @@ void Bg_CopyTilemapBufferRangeToVRAM(BgConfig *bgConfig, u8 bgLayer, void *src,
         }
 
         u32 decompressedSize = MI_GetUncompressedSize(src);
-        void *tmp = Heap_AllocFromHeapAtEnd(bgConfig->heapID, decompressedSize);
+        void *tmp = Heap_AllocAtEnd(bgConfig->heapID, decompressedSize);
 
         CopyOrDecompressData(src, tmp, size);
         LoadBgVRAMScr(bgLayer, tmp, offset * 2, decompressedSize);
@@ -861,7 +861,7 @@ void Bg_LoadTilesToVRAM(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size, u32
 {
     if (size == 0) {
         u32 decompressedSize = MI_GetUncompressedSize(src);
-        void *tmp = Heap_AllocFromHeapAtEnd(bgConfig->heapID, decompressedSize);
+        void *tmp = Heap_AllocAtEnd(bgConfig->heapID, decompressedSize);
 
         CopyOrDecompressData(src, tmp, size);
         LoadBgVRAMChar(bgLayer, tmp, offset, decompressedSize);
@@ -914,7 +914,7 @@ static void LoadBgVRAMChar(u8 bgLayer, void *src, u32 offset, u32 size)
 
 void Bg_ClearTilesRange(u8 bgLayer, u32 size, u32 offset, u32 heapID)
 {
-    u32 *buf = (u32 *)Heap_AllocFromHeapAtEnd(heapID, size);
+    u32 *buf = (u32 *)Heap_AllocAtEnd(heapID, size);
 
     memset(buf, 0, size);
 
@@ -926,7 +926,7 @@ void Bg_FillTilesRange(BgConfig *bgConfig, u32 bgLayer, u32 fillVal, u32 numTile
 {
     u32 *buf;
     u32 size = numTiles * bgConfig->bgs[bgLayer].tileSize;
-    buf = Heap_AllocFromHeapAtEnd(bgConfig->heapID, size);
+    buf = Heap_AllocAtEnd(bgConfig->heapID, size);
 
     if (bgConfig->bgs[bgLayer].tileSize == TILE_SIZE_4BPP) {
         fillVal = (fillVal << 12) | (fillVal << 8) | (fillVal << 4) | fillVal;
@@ -1322,7 +1322,7 @@ static void Copy4bppTo8bpp(const u8 *src, u32 size, u8 *dest, u8 palette)
 
 static void *Convert4bppTo8bpp(const u8 *src, u32 size, u8 palette, u32 heapID)
 {
-    void *dest = Heap_AllocFromHeap(heapID, size * 2);
+    void *dest = Heap_Alloc(heapID, size * 2);
     Copy4bppTo8bpp(src, size, dest, palette);
 
     return dest;
@@ -1584,7 +1584,7 @@ void Bitmap_FillRect8bpp(const Bitmap *bitmap, u16 x, u16 y, u16 width, u16 heig
 
 Window *Window_New(u32 heapID, u8 winCount)
 {
-    Window *windows = (Window *)Heap_AllocFromHeap(heapID, sizeof(Window) * winCount);
+    Window *windows = (Window *)Heap_Alloc(heapID, sizeof(Window) * winCount);
 
     for (u16 i = 0; i < winCount; i++) {
         Window_Init(&windows[i]);
@@ -1623,7 +1623,7 @@ void Window_Add(BgConfig *bgConfig, Window *window, u8 bgLayer, u8 tilemapLeft,
     }
 
     u32 size = width * height * bgConfig->bgs[bgLayer].tileSize;
-    void *pixels = Heap_AllocFromHeap(bgConfig->heapID, size);
+    void *pixels = Heap_Alloc(bgConfig->heapID, size);
 
     if (pixels == NULL) {
         return;
@@ -1644,7 +1644,7 @@ void Window_Add(BgConfig *bgConfig, Window *window, u8 bgLayer, u8 tilemapLeft,
 void Window_AddToTopLeftCorner(BgConfig *bgConfig, Window *window, u8 width, u8 height, u16 baseTile, u8 fillVal)
 {
     u32 size = width * height * TILE_SIZE_4BPP;
-    void *pixels = Heap_AllocFromHeap(bgConfig->heapID, size);
+    void *pixels = Heap_Alloc(bgConfig->heapID, size);
 
     fillVal |= fillVal << 4;
     memset(pixels, fillVal, size);
@@ -2617,7 +2617,7 @@ u8 Bg_DoesPixelAtXYMatchVal(BgConfig *bgConfig, u8 bgLayer, u16 x, u16 y, u16 *s
 
     if (bgConfig->bgs[bgLayer].colorMode == GX_BG_COLORMODE_16) {
         u16 *tilemapBuffer = bgConfig->bgs[bgLayer].tilemapBuffer;
-        u8 *tile = Heap_AllocFromHeapAtEnd(bgConfig->heapID, 64);
+        u8 *tile = Heap_AllocAtEnd(bgConfig->heapID, 64);
 
         charPtr += (tilemapBuffer[tilemapIndex] & 0x3FF) * TILE_SIZE_4BPP;
 
@@ -2636,7 +2636,7 @@ u8 Bg_DoesPixelAtXYMatchVal(BgConfig *bgConfig, u8 bgLayer, u16 x, u16 y, u16 *s
     } else {
         if (bgConfig->bgs[bgLayer].type != BG_TYPE_AFFINE) {
             u16 *tilemapBuffer = bgConfig->bgs[bgLayer].tilemapBuffer;
-            u8 *tile = Heap_AllocFromHeapAtEnd(bgConfig->heapID, 64);
+            u8 *tile = Heap_AllocAtEnd(bgConfig->heapID, 64);
 
             memcpy(tile, &charPtr[(tilemapBuffer[tilemapIndex] & 0x3FF) * TILE_SIZE_8BPP], 64);
             ApplyFlipFlagsToTile(bgConfig, (tilemapBuffer[tilemapIndex] >> 10) & 3, tile);
@@ -2669,7 +2669,7 @@ static void ApplyFlipFlagsToTile(BgConfig *bgConfig, u8 flags, u8 *tile)
         return;
     }
 
-    u8 *buf = Heap_AllocFromHeapAtEnd(bgConfig->heapID, 64);
+    u8 *buf = Heap_AllocAtEnd(bgConfig->heapID, 64);
 
     if (flags & 1) {
         for (u8 i = 0; i < 8; i++) {
diff --git a/src/boat_cutscene/boat_cutscene.c b/src/boat_cutscene/boat_cutscene.c
index dcfdbe8384..3f68b98e27 100644
--- a/src/boat_cutscene/boat_cutscene.c
+++ b/src/boat_cutscene/boat_cutscene.c
@@ -79,7 +79,7 @@ void FieldSystem_PlayBoatCutscene(FieldSystem *fieldSystem, const u8 travelDir,
     int targetMapPropModelID;
     int goalDistance;
 
-    boatCutscene = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(BoatCutscene));
+    boatCutscene = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(BoatCutscene));
 
     boatCutscene->travelDir = travelDir;
     boatCutscene->exitDir = exitDir;
@@ -145,7 +145,7 @@ void FieldSystem_PlayBoatCutscene(FieldSystem *fieldSystem, const u8 travelDir,
 
 static void FieldSystem_PlayBoatTravelCutscene(FieldSystem *fieldSystem, const u8 travelDir, ModelAttributes *areaModelAttrs)
 {
-    BoatTravelCutscene *taskEnv = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(BoatTravelCutscene));
+    BoatTravelCutscene *taskEnv = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(BoatTravelCutscene));
 
     taskEnv->areaModelAttrs = areaModelAttrs;
     taskEnv->travelDir = travelDir;
@@ -213,7 +213,7 @@ static BOOL FieldSystem_PlayBoatCutsceneStep(FieldTask *taskMan)
         }
     } break;
     case BOAT_CUTSCENE_STATE_FADE_OUT_START:
-        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELDMAP);
+        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD2);
         Sound_FadeOutBGM(0, 6);
         boatCutscene->state = BOAT_CUTSCENE_STATE_FADE_OUT_END;
         break;
diff --git a/src/boat_cutscene/canalave_ship.c b/src/boat_cutscene/canalave_ship.c
index 24fc6c80a9..028da34c46 100644
--- a/src/boat_cutscene/canalave_ship.c
+++ b/src/boat_cutscene/canalave_ship.c
@@ -234,7 +234,7 @@ static void BoatCutscene_CanalaveShip_LoadAnimations(BoatCutscene_CanalaveShip *
     NNSG3dResTex *texture;
     void *animation;
     NARC *narc = NARC_ctor(NARC_INDEX_ARC__SHIP_DEMO, HEAP_ID_BOAT_CUTSCENE);
-    Heap_FndInitAllocatorForExpHeap(&cutsceneData->allocator, HEAP_ID_BOAT_CUTSCENE, 4);
+    HeapExp_FndInitAllocator(&cutsceneData->allocator, HEAP_ID_BOAT_CUTSCENE, 4);
 
     cutsceneData->modelFile = NARC_AllocAndReadWholeMember(narc, narcMemberIndexes[cutsceneData->travelDir].modelMemberIndex, HEAP_ID_BOAT_CUTSCENE);
     Easy3D_InitRenderObjFromResource(&cutsceneData->renderObj, &cutsceneData->model, &cutsceneData->modelFile);
diff --git a/src/boat_cutscene/snowpoint_ship.c b/src/boat_cutscene/snowpoint_ship.c
index ebdfa86ae4..ab2a40d8ba 100644
--- a/src/boat_cutscene/snowpoint_ship.c
+++ b/src/boat_cutscene/snowpoint_ship.c
@@ -234,7 +234,7 @@ static void BoatCutscene_SnowpointShip_LoadAnimations(BoatCutscene_SnowpointShip
     NNSG3dResTex *texture;
     void *animation;
     NARC *narc = NARC_ctor(NARC_INDEX_ARC__SHIP_DEMO_PL, HEAP_ID_BOAT_CUTSCENE);
-    Heap_FndInitAllocatorForExpHeap(&cutsceneData->allocator, HEAP_ID_BOAT_CUTSCENE, 4);
+    HeapExp_FndInitAllocator(&cutsceneData->allocator, HEAP_ID_BOAT_CUTSCENE, 4);
 
     cutsceneData->modelFile = NARC_AllocAndReadWholeMember(narc, narcMemberIndexes[cutsceneData->travelDir].modelMemberIndex, HEAP_ID_BOAT_CUTSCENE);
     Easy3D_InitRenderObjFromResource(&cutsceneData->renderObj, &cutsceneData->model, &cutsceneData->modelFile);
diff --git a/src/camera.c b/src/camera.c
index 0a438b0b2d..e2659e3a9e 100644
--- a/src/camera.c
+++ b/src/camera.c
@@ -105,7 +105,7 @@ static void Camera_UpdateHistory(Camera const *camera, const VecFx32 *inPos, Vec
     }
 }
 
-void Camera_InitHistory(int historySize, int delay, int delayMask, enum HeapId heapID, Camera *camera)
+void Camera_InitHistory(int historySize, int delay, int delayMask, enum HeapID heapID, Camera *camera)
 {
     if (camera->targetPos == NULL) {
         return;
@@ -113,8 +113,8 @@ void Camera_InitHistory(int historySize, int delay, int delayMask, enum HeapId h
 
     GF_ASSERT(delay + 1 <= historySize);
 
-    CameraPositionHistory *history = Heap_AllocFromHeap(heapID, sizeof(CameraPositionHistory));
-    history->positions = Heap_AllocFromHeap(heapID, sizeof(VecFx32) * historySize);
+    CameraPositionHistory *history = Heap_Alloc(heapID, sizeof(CameraPositionHistory));
+    history->positions = Heap_Alloc(heapID, sizeof(VecFx32) * historySize);
 
     for (int i = 0; i < historySize; i++) {
         history->positions[i].x = 0;
@@ -155,9 +155,9 @@ void Camera_DeleteHistory(Camera *camera)
     }
 }
 
-Camera *Camera_Alloc(const enum HeapId heapID)
+Camera *Camera_Alloc(const enum HeapID heapID)
 {
-    return Heap_AllocFromHeap(heapID, sizeof(Camera));
+    return Heap_Alloc(heapID, sizeof(Camera));
 }
 
 void Camera_Delete(Camera *camera)
diff --git a/src/catching_show.c b/src/catching_show.c
index 1a983e3ae8..e3189c45d3 100644
--- a/src/catching_show.c
+++ b/src/catching_show.c
@@ -126,7 +126,7 @@ static void InitSpeciesData(FieldSystem *fieldSystem, CatchingShow *catchingShow
     SpeciesPalPark speciesData;
     u16 monSpecies;
     PalParkTransfer *transferData = SaveData_GetPalParkTransfer(fieldSystem->saveData);
-    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD);
+    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD1);
 
     for (i = 0; i < CATCHING_SHOW_MONS; i++) {
         catchingShow->caughtMonsOrder[i] = 0;
@@ -256,10 +256,10 @@ static void UpdateBattleResultInternal(FieldSystem *fieldSystem, FieldBattleDTO
 
 static FieldBattleDTO *SetupBattleDTO(FieldSystem *fieldSystem, CatchingShow *catchingShow)
 {
-    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD_TASK);
+    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD3);
     PalParkTransfer *transferData = SaveData_GetPalParkTransfer(fieldSystem->saveData);
     int parkBallCount = CatchingShow_GetParkBallCount(fieldSystem);
-    FieldBattleDTO *dto = FieldBattleDTO_NewPalPark(HEAP_ID_FIELDMAP, parkBallCount);
+    FieldBattleDTO *dto = FieldBattleDTO_NewPalPark(HEAP_ID_FIELD2, parkBallCount);
 
     FieldBattleDTO_Init(dto, fieldSystem);
     TransferDataToMon(transferData, catchingShow->currentEncounterIndex, mon);
diff --git a/src/cell_transfer.c b/src/cell_transfer.c
index 001d8dc6ae..a85629306a 100644
--- a/src/cell_transfer.c
+++ b/src/cell_transfer.c
@@ -9,9 +9,9 @@
 
 static BOOL RegisterTransferTaskCB(NNS_GFD_DST_TYPE type, u32 destAddr, void *buf, u32 size);
 
-NNSG2dCellTransferState *CellTransfer_New(int capacity, enum HeapId heapID)
+NNSG2dCellTransferState *CellTransfer_New(int capacity, enum HeapID heapID)
 {
-    NNSG2dCellTransferState *transferStates = Heap_AllocFromHeap(heapID, sizeof(NNSG2dCellTransferState) * capacity);
+    NNSG2dCellTransferState *transferStates = Heap_Alloc(heapID, sizeof(NNSG2dCellTransferState) * capacity);
     NNS_G2dInitCellTransferStateManager(transferStates, capacity, RegisterTransferTaskCB);
     return transferStates;
 }
diff --git a/src/char_transfer.c b/src/char_transfer.c
index 3b82a63f72..07bdceba27 100644
--- a/src/char_transfer.c
+++ b/src/char_transfer.c
@@ -79,7 +79,7 @@ static void CalcByteAndBitIndices(int val, u32 *top, u8 *bottom);
 static void FixOffsetAndSize(u32 base, u32 offset, u32 size, int *outOffset, int *outSize);
 static u32 GetNumBlocks(u8 *buf);
 
-static void InitTransferBuffers(u32 numBlocksMain, u32 numBlocksSub, enum HeapId heapID);
+static void InitTransferBuffers(u32 numBlocksMain, u32 numBlocksSub, enum HeapID heapID);
 static void FreeBlockTransferBuffer(u8 *buf);
 static void ReserveTransferRange(u32 start, u32 count, u8 *buf);
 static void ReserveVramSpace(u32 size, NNS_G2D_VRAM_TYPE vramType);
@@ -99,11 +99,11 @@ void CharTransfer_Init(const CharTransferTemplate *template)
 void CharTransfer_InitWithVramModes(const CharTransferTemplate *template, GXOBJVRamModeChar modeMain, GXOBJVRamModeChar modeSub)
 {
     if (sTaskManager == NULL) {
-        sTaskManager = Heap_AllocFromHeap(template->heapID, sizeof(CharTransferTaskManager));
+        sTaskManager = Heap_Alloc(template->heapID, sizeof(CharTransferTaskManager));
         MI_CpuClear32(sTaskManager, sizeof(CharTransferTaskManager));
 
         sTaskManager->capacity = template->maxTasks;
-        sTaskManager->tasks = Heap_AllocFromHeap(template->heapID, sizeof(CharTransferTask) * sTaskManager->capacity);
+        sTaskManager->tasks = Heap_Alloc(template->heapID, sizeof(CharTransferTask) * sTaskManager->capacity);
         for (int i = 0; i < template->maxTasks; i++) {
             InitTransferTask(sTaskManager->tasks + i);
         }
@@ -779,7 +779,7 @@ static void ClearBothTransferBuffers(void)
     ClearTransferBuffer(sTaskManager->bufSub);
 }
 
-static void InitTransferBuffers(u32 numBlocksMain, u32 numBlocksSub, enum HeapId heapID)
+static void InitTransferBuffers(u32 numBlocksMain, u32 numBlocksSub, enum HeapID heapID)
 {
     sTaskManager->numBlocksMain = numBlocksMain;
     sTaskManager->numBlocksSub = numBlocksSub;
@@ -793,11 +793,11 @@ static void InitTransferBuffers(u32 numBlocksMain, u32 numBlocksSub, enum HeapId
     }
 
     if (sTaskManager->numBlocksMain != 0) {
-        sTaskManager->bufMain = Heap_AllocFromHeap(heapID, numBlocksMain / 8);
+        sTaskManager->bufMain = Heap_Alloc(heapID, numBlocksMain / 8);
     }
 
     if (sTaskManager->numBlocksSub != 0) {
-        sTaskManager->bufSub = Heap_AllocFromHeap(heapID, numBlocksSub / 8);
+        sTaskManager->bufSub = Heap_Alloc(heapID, numBlocksSub / 8);
     }
 
     ClearBothTransferBuffers();
diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c
index ca2f3e49a9..fefd542986 100644
--- a/src/choose_starter/choose_starter_app.c
+++ b/src/choose_starter/choose_starter_app.c
@@ -227,15 +227,15 @@ static u16 GetSelectedSpecies(u16 cursorPosition);
 static BOOL IsSelectionMade(ChooseStarterApp *param0, int param1);
 static void UpdateGraphics(ChooseStarterApp *param0, int heapID);
 static void DrawScene(ChooseStarterApp *param0);
-static void SetupDrawing(ChooseStarterApp *app, enum HeapId heapID);
+static void SetupDrawing(ChooseStarterApp *app, enum HeapID heapID);
 static void ov78_021D10DC(void);
 static void SetupVRAMBank(void);
-static void SetupOAM(enum HeapId heapID);
+static void SetupOAM(enum HeapID heapID);
 static void Setup3D(ChooseStarterApp *app);
 static void ov78_021D1218(void);
-static void SetupBGL(BgConfig *bgl, enum HeapId heapID);
+static void SetupBGL(BgConfig *bgl, enum HeapID heapID);
 static void ov78_021D12EC(BgConfig *param0);
-static void MakeMessageWindow(ChooseStarterApp *app, enum HeapId heapID);
+static void MakeMessageWindow(ChooseStarterApp *app, enum HeapID heapID);
 static void ov78_021D13A0(ChooseStarterApp *param0);
 static u8 ov78_021D1FB4(Window *param0, int heapID, int param2, int param3, TextColor param4, u32 param5);
 static u8 ov78_021D201C(Window *param0, int heapID, int param2, int param3, u32 param4, u32 param5, Strbuf **param6);
@@ -245,16 +245,16 @@ static void ov78_021D2884(ChooseStarterApp *param0);
 static void ov78_021D28A8(Window *param0, int heapID, int param2, int param3, TextColor param4);
 static void ov78_021D2904(ChooseStarterApp *param0);
 static void MakeConfirmationWindow(ChooseStarterApp *param0, int param1);
-static void MakeSprite(ChooseStarterApp *app, enum HeapId heapID);
+static void MakeSprite(ChooseStarterApp *app, enum HeapID heapID);
 static void ov78_021D14BC(ChooseStarterApp *param0);
-static void MakeSpriteDisplay(ChooseStarterApp *app, enum HeapId heapID);
+static void MakeSpriteDisplay(ChooseStarterApp *app, enum HeapID heapID);
 static void ov78_021D1518(ChooseStarterApp *param0);
 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);
 static void ov78_021D1B90(ChooseStarterApp *param0);
-static void Make3DObjects(ChooseStarterApp *param0, enum HeapId heapID);
+static void Make3DObjects(ChooseStarterApp *param0, enum HeapID heapID);
 static void ov78_021D1908(ChooseStarterApp *param0);
 static void ov78_021D192C(ChooseStarterApp *param0);
 static void MakeCursorOAM(ChooseStarterApp *param0, ChooseStarterCursor *param1, int param2);
@@ -279,8 +279,8 @@ static void ov78_021D17CC(ChooseStarter3DGraphics *param0, u16 param1, u16 param
 static BOOL ov78_021D17E4(ChooseStarter3DGraphics *param0);
 static void ov78_021D180C(ChooseStarter3DGraphics *param0);
 static void ov78_021D182C(ChooseStarter3DGraphics *param0, fx32 param1);
-static void ov78_021D1630(ChooseStarter3DGraphics *param0, int param1, enum HeapId heapID);
-static void ov78_021D1694(ChooseStarter3DGraphics *param0, int param1, enum HeapId heapID, NNSFndAllocator *param3);
+static void ov78_021D1630(ChooseStarter3DGraphics *param0, int param1, enum HeapID heapID);
+static void ov78_021D1694(ChooseStarter3DGraphics *param0, int param1, enum HeapID heapID, NNSFndAllocator *param3);
 static void MakePreviewWindow(StarterPreviewWindow *param0, ChooseStarterApp *param1, int param2);
 static void ov78_021D24E4(StarterPreviewWindow *param0);
 static void ov78_021D2508(StarterPreviewWindow *param0, BOOL param1);
@@ -316,7 +316,7 @@ BOOL ChooseStarter_Init(ApplicationManager *appMan, int *param1)
     GF_ASSERT(app);
     memset(app, 0, sizeof(ChooseStarterApp));
 
-    Heap_FndInitAllocatorForExpHeap(&app->unk_2B4, HEAP_ID_CHOOSE_STARTER_APP, 32);
+    HeapExp_FndInitAllocator(&app->unk_2B4, HEAP_ID_CHOOSE_STARTER_APP, 32);
 
     ChooseStarterData *data = ApplicationManager_Args(appMan);
     app->messageFrame = Options_Frame(data->options);
@@ -487,7 +487,7 @@ static BOOL IsFadeDone(ChooseStarterApp *param0)
     return IsScreenFadeDone();
 }
 
-static void SetupDrawing(ChooseStarterApp *app, enum HeapId heap)
+static void SetupDrawing(ChooseStarterApp *app, enum HeapID heap)
 {
     SetupVRAMBank();
     SetupOAM(heap);
@@ -521,7 +521,7 @@ static void SetupVRAMBank(void)
     GXLayers_SetBanks(&banks);
 }
 
-static void SetupOAM(enum HeapId heapID)
+static void SetupOAM(enum HeapID heapID)
 {
     NNS_G2dInitOamManagerModule();
 
@@ -572,7 +572,7 @@ static void ov78_021D1218(void)
     NNS_GfdResetFrmPlttVramState();
 }
 
-static void SetupBGL(BgConfig *bgl, enum HeapId heapID)
+static void SetupBGL(BgConfig *bgl, enum HeapID heapID)
 {
     G2_SetBG0Priority(1);
 
@@ -647,7 +647,7 @@ static void ov78_021D12EC(BgConfig *param0)
     Bg_FreeTilemapBuffer(param0, BG_LAYER_MAIN_3);
 }
 
-static void MakeMessageWindow(ChooseStarterApp *app, enum HeapId heapID)
+static void MakeMessageWindow(ChooseStarterApp *app, enum HeapID heapID)
 {
     app->messageWindow = Window_New(heapID, 1);
     Window_Init(app->messageWindow);
@@ -666,7 +666,7 @@ static void ov78_021D13A0(ChooseStarterApp *param0)
     Heap_Free(param0->messageWindow);
 }
 
-static void MakeSprite(ChooseStarterApp *app, enum HeapId heapID)
+static void MakeSprite(ChooseStarterApp *app, enum HeapID heapID)
 {
     app->spriteManager = PokemonSpriteManager_New(heapID);
 
@@ -714,7 +714,7 @@ static void ov78_021D14BC(ChooseStarterApp *param0)
     PokemonSpriteManager_Free(param0->spriteManager);
 }
 
-static void MakeSpriteDisplay(ChooseStarterApp *param0, enum HeapId heapID)
+static void MakeSpriteDisplay(ChooseStarterApp *param0, enum HeapID heapID)
 {
     UnkStruct_ov22_022550D4 v0 = {
         .unk_00 = 1,
@@ -753,7 +753,7 @@ static void ov78_021D1594(ChooseStarterApp *param0)
     SpriteResourceCollection_Delete(param0->unk_24C[3]);
 }
 
-static void ov78_021D15CC(ChooseStarter3DGraphics *param0, int param1, int param2, enum HeapId heapID, NNSFndAllocator *param4)
+static void ov78_021D15CC(ChooseStarter3DGraphics *param0, int param1, int param2, enum HeapID heapID, NNSFndAllocator *param4)
 {
     memset(param0, 0, sizeof(ChooseStarter3DGraphics));
 
@@ -762,7 +762,7 @@ static void ov78_021D15CC(ChooseStarter3DGraphics *param0, int param1, int param
     ov78_021D17B4(param0, FX32_ONE, FX32_ONE, FX32_ONE);
 }
 
-static void ov78_021D1604(ChooseStarter3DGraphics *param0, int param1, enum HeapId heapID)
+static void ov78_021D1604(ChooseStarter3DGraphics *param0, int param1, enum HeapID heapID)
 {
     memset(param0, 0, sizeof(ChooseStarter3DGraphics));
 
@@ -770,7 +770,7 @@ static void ov78_021D1604(ChooseStarter3DGraphics *param0, int param1, enum Heap
     ov78_021D17B4(param0, FX32_ONE, FX32_ONE, FX32_ONE);
 }
 
-static void ov78_021D1630(ChooseStarter3DGraphics *param0, int param1, enum HeapId heapID)
+static void ov78_021D1630(ChooseStarter3DGraphics *param0, int param1, enum HeapID heapID)
 {
     param0->unk_54 = LoadMemberFromNARC(NARC_INDEX_GRAPHIC__EV_POKESELECT, param1, 0, heapID, 0);
     param0->unk_58 = NNS_G3dGetMdlSet(param0->unk_54);
@@ -783,7 +783,7 @@ static void ov78_021D1630(ChooseStarter3DGraphics *param0, int param1, enum Heap
     NNS_G3dRenderObjInit(&param0->unk_00, param0->unk_5C);
 }
 
-static void ov78_021D1694(ChooseStarter3DGraphics *param0, int param1, enum HeapId heapID, NNSFndAllocator *param3)
+static void ov78_021D1694(ChooseStarter3DGraphics *param0, int param1, enum HeapID heapID, NNSFndAllocator *param3)
 {
     param0->unk_64 = LoadMemberFromNARC(NARC_INDEX_GRAPHIC__EV_POKESELECT, param1, 0, heapID, 0);
     param0->unk_68 = NNS_G3dGetAnmByIdx(param0->unk_64, 0);
@@ -883,7 +883,7 @@ static void ov78_021D182C(ChooseStarter3DGraphics *param0, fx32 param1)
     NNS_G3dAnmObjSetFrame(param0->unk_6C, param1);
 }
 
-static void Make3DObjects(ChooseStarterApp *param0, enum HeapId heapID)
+static void Make3DObjects(ChooseStarterApp *param0, enum HeapID heapID)
 {
     int v0;
 
diff --git a/src/colored_arrow.c b/src/colored_arrow.c
index ded117ddec..e211788c3f 100644
--- a/src/colored_arrow.c
+++ b/src/colored_arrow.c
@@ -17,7 +17,7 @@ ColoredArrow *ColoredArrow_New(u32 heapID)
         CHAR_ARROW_MENU,
         CHAR_EOS,
     };
-    ColoredArrow *arrow = Heap_AllocFromHeap(heapID, sizeof(ColoredArrow));
+    ColoredArrow *arrow = Heap_Alloc(heapID, sizeof(ColoredArrow));
 
     if (arrow) {
         arrow->color = TEXT_COLOR(1, 2, 15);
diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c
index a83da7bac7..617c28cf09 100644
--- a/src/comm_player_manager.c
+++ b/src/comm_player_manager.c
@@ -83,7 +83,7 @@ BOOL CommPlayerMan_Init(void *dest, FieldSystem *fieldSystem, BOOL isUnderground
     sCommPlayerManager->unk_04 = NULL;
 
     if (isUnderground) {
-        sCommPlayerManager->unk_04 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, ov23_02249918());
+        sCommPlayerManager->unk_04 = Heap_Alloc(HEAP_ID_COMMUNICATION, ov23_02249918());
         ov23_0224991C(sCommPlayerManager->unk_04);
     }
 
diff --git a/src/communication_information.c b/src/communication_information.c
index 4c060f2e5a..b12e983b13 100644
--- a/src/communication_information.c
+++ b/src/communication_information.c
@@ -73,7 +73,7 @@ void CommInfo_Init(SaveData *saveData, const BattleRegulation *regulation)
         return;
     }
 
-    sCommInfo = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sizeof(CommunicationInformation));
+    sCommInfo = Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommunicationInformation));
     MI_CpuClear8(sCommInfo, sizeof(CommunicationInformation));
 
     for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
diff --git a/src/communication_system.c b/src/communication_system.c
index dc2507eb66..b0bba590aa 100644
--- a/src/communication_system.c
+++ b/src/communication_system.c
@@ -155,7 +155,7 @@ static BOOL CommSys_Init(BOOL shouldAlloc, int maxPacketSize)
 
         CommTool_Init(HEAP_ID_COMMUNICATION);
 
-        Unk_021C07C8 = (u32)Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sizeof(CommunicationSystem) + 32);
+        Unk_021C07C8 = (u32)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommunicationSystem) + 32);
         sCommunicationSystem = (CommunicationSystem *)(32 - (Unk_021C07C8 % 32) + Unk_021C07C8);
 
         MI_CpuClear8(sCommunicationSystem, sizeof(CommunicationSystem));
@@ -169,10 +169,10 @@ static BOOL CommSys_Init(BOOL shouldAlloc, int maxPacketSize)
         sCommunicationSystem->allocSize = sCommunicationSystem->maxPacketSize * maxMachines;
         sCommunicationSystem->transmissionType = TRANSMISSION_TYPE_SERVER_CLIENT;
         sCommunicationSystem->unk_6A6 = 38;
-        sCommunicationSystem->recvBufferRing = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sCommunicationSystem->maxPacketSize * 2);
-        sCommunicationSystem->tempBuffer = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sCommunicationSystem->maxPacketSize);
-        sCommunicationSystem->recvBufferRingServer = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sCommunicationSystem->allocSize);
-        sCommunicationSystem->unk_488 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sCommunicationSystem->allocSize);
+        sCommunicationSystem->recvBufferRing = Heap_Alloc(HEAP_ID_COMMUNICATION, sCommunicationSystem->maxPacketSize * 2);
+        sCommunicationSystem->tempBuffer = Heap_Alloc(HEAP_ID_COMMUNICATION, sCommunicationSystem->maxPacketSize);
+        sCommunicationSystem->recvBufferRingServer = Heap_Alloc(HEAP_ID_COMMUNICATION, sCommunicationSystem->allocSize);
+        sCommunicationSystem->unk_488 = Heap_Alloc(HEAP_ID_COMMUNICATION, sCommunicationSystem->allocSize);
 
         if (sub_0203895C() == 10) {
             CommQueueMan_Init(&sCommunicationSystem->commQueueManSend, 100, &sCommunicationSystem->sendRing);
diff --git a/src/dw_warp/dw_warp.c b/src/dw_warp/dw_warp.c
index e406a0136b..6a41d3f6af 100644
--- a/src/dw_warp/dw_warp.c
+++ b/src/dw_warp/dw_warp.c
@@ -238,7 +238,7 @@ static void DWWarp_DeleteCamera(DistortionWorldWarp *warp)
 
 static void DWWarp_InitModel(DistortionWorldWarp *warp)
 {
-    Heap_FndInitAllocatorForExpHeap(&warp->allocator, HEAP_ID_DISTORTION_WORLD_WARP, 4);
+    HeapExp_FndInitAllocator(&warp->allocator, HEAP_ID_DISTORTION_WORLD_WARP, 4);
 
     NARC *narc = NARC_ctor(NARC_INDEX_DEMO__TITLE__TITLEDEMO, HEAP_ID_DISTORTION_WORLD_WARP);
 
diff --git a/src/encounter.c b/src/encounter.c
index dd250c75c2..70bfbb75c9 100644
--- a/src/encounter.c
+++ b/src/encounter.c
@@ -123,7 +123,7 @@ static void CallBattleTask(FieldTask *task, FieldBattleDTO *dto)
 
 static Encounter *NewEncounter(FieldBattleDTO *dto, int introEffectID, int battleBGM, int *resultMaskPtr)
 {
-    Encounter *encounter = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(Encounter));
+    Encounter *encounter = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(Encounter));
     encounter->resultMaskPtr = resultMaskPtr;
     if (resultMaskPtr != NULL) {
         *resultMaskPtr = BATTLE_IN_PROGRESS;
@@ -321,7 +321,7 @@ static BOOL FieldTask_WiFiEncounter(FieldTask *task)
 
 static WildEncounter *NewWildEncounter(FieldBattleDTO *dto, int introEffectID, int battleBGM, int *resultMaskPtr)
 {
-    WildEncounter *encounter = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(WildEncounter));
+    WildEncounter *encounter = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(WildEncounter));
     encounter->resultMaskPtr = resultMaskPtr;
 
     if (resultMaskPtr != NULL) {
@@ -537,7 +537,7 @@ void Encounter_NewVsHoneyTree(FieldTask *task, int *resultMaskPtr)
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task);
     RadarChain_Clear(fieldSystem->chain);
 
-    dto = FieldBattleDTO_New(HEAP_ID_FIELDMAP, BATTLE_TYPE_WILD_MON);
+    dto = FieldBattleDTO_New(HEAP_ID_FIELD2, BATTLE_TYPE_WILD_MON);
     FieldBattleDTO_Init(dto, fieldSystem);
 
     dto->background = BACKGROUND_PLAIN;
@@ -555,7 +555,7 @@ void Encounter_NewVsSpeciesAtLevel(FieldTask *task, u16 species, u8 level, int *
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task);
     RadarChain_Clear(fieldSystem->chain);
 
-    dto = FieldBattleDTO_New(HEAP_ID_FIELDMAP, BATTLE_TYPE_WILD_MON);
+    dto = FieldBattleDTO_New(HEAP_ID_FIELD2, BATTLE_TYPE_WILD_MON);
     FieldBattleDTO_Init(dto, fieldSystem);
 
     CreateWildMon_Scripted(fieldSystem, species, level, dto);
@@ -574,7 +574,7 @@ void Encounter_NewFatefulVsSpeciesAtLevel(FieldTask *taskMan, u16 species, u8 le
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan);
     RadarChain_Clear(fieldSystem->chain);
 
-    dto = FieldBattleDTO_New(HEAP_ID_FIELDMAP, BATTLE_TYPE_WILD_MON);
+    dto = FieldBattleDTO_New(HEAP_ID_FIELD2, BATTLE_TYPE_WILD_MON);
     FieldBattleDTO_Init(dto, fieldSystem);
 
     CreateWildMon_Scripted(fieldSystem, species, level, dto);
@@ -656,7 +656,7 @@ void Encounter_NewVsPalParkTransfer(FieldSystem *fieldSystem, FieldBattleDTO *dt
 void Encounter_NewVsFirstBattle(FieldTask *task, int trainerID, int heapID, int *resultMaskPtr)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task);
-    FieldBattleDTO *dto = FieldBattleDTO_New(HEAP_ID_FIELDMAP, BATTLE_TYPE_TRAINER);
+    FieldBattleDTO *dto = FieldBattleDTO_New(HEAP_ID_FIELD2, BATTLE_TYPE_TRAINER);
     FieldBattleDTO_Init(dto, fieldSystem);
 
     dto->battleStatusMask = BATTLE_STATUS_FIRST_BATTLE;
@@ -718,7 +718,7 @@ static BOOL FieldTask_CatchingTutorialEncounter(FieldTask *task)
 void Encounter_NewCatchingTutorial(FieldTask *task)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task);
-    FieldBattleDTO *dto = FieldBattleDTO_NewCatchingTutorial(HEAP_ID_FIELDMAP, fieldSystem);
+    FieldBattleDTO *dto = FieldBattleDTO_NewCatchingTutorial(HEAP_ID_FIELD2, fieldSystem);
     Encounter *encounter = NewEncounter(dto, EncEffects_CutInEffect(dto), EncEffects_BGM(dto), NULL);
 
     FieldTask_InitCall(task, FieldTask_CatchingTutorialEncounter, encounter);
@@ -743,7 +743,7 @@ void Encounter_NewVsTrainer(FieldTask *taskMan, int enemyTrainer1ID, int enemyTr
     }
 
     RadarChain_Clear(fieldSystem->chain);
-    dto = FieldBattleDTO_New(HEAP_ID_FIELDMAP, battleType);
+    dto = FieldBattleDTO_New(HEAP_ID_FIELD2, battleType);
     FieldBattleDTO_Init(dto, fieldSystem);
 
     if (fieldSystem->location->mapId >= MAP_HEADER_DISTORTION_WORLD_1F
@@ -764,7 +764,7 @@ void Encounter_NewVsLink(FieldTask *task, const u8 *partyOrder, int battleType)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task);
     Encounter *encounter;
-    FieldBattleDTO *dto = FieldBattleDTO_New(HEAP_ID_FIELDMAP, battleType);
+    FieldBattleDTO *dto = FieldBattleDTO_New(HEAP_ID_FIELD2, battleType);
     FieldBattleDTO_InitWithPartyOrderFromSave(dto, fieldSystem, partyOrder);
 
     encounter = NewEncounter(dto, EncEffects_CutInEffect(dto), EncEffects_BGM(dto), NULL);
@@ -800,25 +800,25 @@ void Encounter_NewVsWiFi(FieldTask *task, int param1, int normalizedLevel, int w
 
     if (wifiBattleType == 0) {
         battleType = BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER;
-        dto = FieldBattleDTO_New(HEAP_ID_FIELDMAP, battleType);
+        dto = FieldBattleDTO_New(HEAP_ID_FIELD2, battleType);
         v5 = (UnkEnum_0202F510_00);
     } else if (wifiBattleType == 1) {
         battleType = BATTLE_TYPE_LINK_DOUBLES;
-        dto = FieldBattleDTO_New(HEAP_ID_FIELDMAP, battleType);
+        dto = FieldBattleDTO_New(HEAP_ID_FIELD2, battleType);
         v5 = (UnkEnum_0202F510_07);
     } else {
         battleType = BATTLE_TYPE_FRONTIER_DOUBLES | BATTLE_TYPE_LINK | BATTLE_TYPE_2vs2;
-        dto = FieldBattleDTO_New(HEAP_ID_FIELDMAP, battleType);
+        dto = FieldBattleDTO_New(HEAP_ID_FIELD2, battleType);
         dto->trainerIDs[BATTLER_ENEMY_1] = 1;
         dto->trainerIDs[BATTLER_ENEMY_2] = 2;
 
-        Trainer_Encounter(dto, fieldSystem->saveData, HEAP_ID_FIELDMAP);
+        Trainer_Encounter(dto, fieldSystem->saveData, HEAP_ID_FIELD2);
 
         v5 = (UnkEnum_0202F510_14);
     }
 
     FieldBattleDTO_InitWithNormalizedMonLevels(dto, fieldSystem, normalizedLevel);
-    sub_0202F1F8(fieldSystem->saveData, HEAP_ID_FIELDMAP, &recordingResultCode);
+    sub_0202F1F8(fieldSystem->saveData, HEAP_ID_FIELD2, &recordingResultCode);
     dto->unk_18A = v5;
 
     encounter = NewEncounter(dto, EncEffects_CutInEffect(dto), EncEffects_BGM(dto), NULL);
@@ -853,11 +853,11 @@ static BOOL FieldTask_LinkEncounterWithRecording(FieldTask *task)
 
 void Encounter_NewVsLinkWithRecording(FieldSystem *fieldSystem, const u8 *partyOrder, int battleType)
 {
-    FieldBattleDTO *dto = FieldBattleDTO_New(HEAP_ID_FIELDMAP, battleType);
+    FieldBattleDTO *dto = FieldBattleDTO_New(HEAP_ID_FIELD2, battleType);
     FieldBattleDTO_InitWithPartyOrderFromSave(dto, fieldSystem, partyOrder);
 
     int recordingResultCode;
-    sub_0202F1F8(fieldSystem->saveData, HEAP_ID_FIELDMAP, &recordingResultCode);
+    sub_0202F1F8(fieldSystem->saveData, HEAP_ID_FIELD2, &recordingResultCode);
     dto->unk_18A = sub_020516C8(fieldSystem->unk_B0, battleType);
 
     Encounter *encounter = NewEncounter(dto, EncEffects_CutInEffect(dto), EncEffects_BGM(dto), NULL);
@@ -866,11 +866,11 @@ void Encounter_NewVsLinkWithRecording(FieldSystem *fieldSystem, const u8 *partyO
 
 void Encounter_NewVsLinkWithRecordingAndParty(FieldSystem *fieldSystem, const Party *party, int battleType)
 {
-    FieldBattleDTO *dto = FieldBattleDTO_New(HEAP_ID_FIELDMAP, battleType);
+    FieldBattleDTO *dto = FieldBattleDTO_New(HEAP_ID_FIELD2, battleType);
     FieldBattleDTO_InitWithPartyOrder(dto, fieldSystem, party, NULL);
 
     int recordingResultCode;
-    sub_0202F1F8(fieldSystem->saveData, HEAP_ID_FIELDMAP, &recordingResultCode);
+    sub_0202F1F8(fieldSystem->saveData, HEAP_ID_FIELD2, &recordingResultCode);
     dto->unk_18A = sub_020516C8(fieldSystem->unk_B0, battleType);
 
     Encounter *encounter = NewEncounter(dto, EncEffects_CutInEffect(dto), EncEffects_BGM(dto), NULL);
@@ -953,19 +953,19 @@ static void UpdateJournal(FieldSystem *fieldSystem, FieldBattleDTO *dto)
 
             if (fieldSystem->wildBattleMetadata.wildMonDefeated >= 5) {
                 caughtMon = Party_GetPokemonBySlotIndex(dto->parties[1], 0);
-                journalEntryMon = JournalEntry_CreateEventMonDefeated(SaveData_GetPlayTime(fieldSystem->saveData), Pokemon_GetValue(caughtMon, MON_DATA_SPECIES, 0), Pokemon_GetValue(caughtMon, MON_DATA_GENDER, 0), dto->timeOfDay, HEAP_ID_FIELDMAP);
+                journalEntryMon = JournalEntry_CreateEventMonDefeated(SaveData_GetPlayTime(fieldSystem->saveData), Pokemon_GetValue(caughtMon, MON_DATA_SPECIES, 0), Pokemon_GetValue(caughtMon, MON_DATA_GENDER, 0), dto->timeOfDay, HEAP_ID_FIELD2);
                 JournalEntry_SaveData(fieldSystem->journalEntry, journalEntryMon, JOURNAL_MON);
             }
         } else if (resultMask == BATTLE_RESULT_CAPTURED_MON) {
             int caughtBattlerIdx = dto->caughtBattlerIdx;
             caughtMon = Party_GetPokemonBySlotIndex(dto->parties[caughtBattlerIdx], 0);
-            journalEntryMon = JournalEntry_CreateEventMonCaught(SaveData_GetPlayTime(fieldSystem->saveData), Pokemon_GetValue(caughtMon, MON_DATA_SPECIES, 0), Pokemon_GetValue(caughtMon, MON_DATA_GENDER, 0), dto->timeOfDay, HEAP_ID_FIELDMAP);
+            journalEntryMon = JournalEntry_CreateEventMonCaught(SaveData_GetPlayTime(fieldSystem->saveData), Pokemon_GetValue(caughtMon, MON_DATA_SPECIES, 0), Pokemon_GetValue(caughtMon, MON_DATA_GENDER, 0), dto->timeOfDay, HEAP_ID_FIELD2);
 
             JournalEntry_SaveData(fieldSystem->journalEntry, journalEntryMon, JOURNAL_MON);
         }
     } else if ((battleType & BATTLE_TYPE_TRAINER) || (battleType & BATTLE_TYPE_TAG)) {
         if (resultMask == BATTLE_RESULT_WIN) {
-            JournalEntry_CreateAndSaveEventTrainer(fieldSystem->journalEntry, fieldSystem->location->mapId, dto->trainerIDs[BATTLER_ENEMY_1], HEAP_ID_FIELDMAP);
+            JournalEntry_CreateAndSaveEventTrainer(fieldSystem->journalEntry, fieldSystem->location->mapId, dto->trainerIDs[BATTLER_ENEMY_1], HEAP_ID_FIELD2);
         }
     }
 }
@@ -976,7 +976,7 @@ void Encounter_NewVsGiratinaOrigin(FieldTask *task, u16 species, u8 level, int *
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task);
     RadarChain_Clear(fieldSystem->chain);
 
-    dto = FieldBattleDTO_New(HEAP_ID_FIELDMAP, BATTLE_TYPE_WILD_MON);
+    dto = FieldBattleDTO_New(HEAP_ID_FIELD2, BATTLE_TYPE_WILD_MON);
     FieldBattleDTO_Init(dto, fieldSystem);
 
     CreateWildMon_Scripted(fieldSystem, species, level, dto);
diff --git a/src/evolution.c b/src/evolution.c
index 0a78b3f334..4c5cf8ea7d 100644
--- a/src/evolution.c
+++ b/src/evolution.c
@@ -93,7 +93,7 @@ EvolutionData *Evolution_Begin(Party *param0, Pokemon *param1, int param2, Optio
     PokemonSpriteTemplate v1;
     int v2;
 
-    v0 = (EvolutionData *)Heap_AllocFromHeap(heapID, sizeof(EvolutionData));
+    v0 = (EvolutionData *)Heap_Alloc(heapID, sizeof(EvolutionData));
 
     MI_CpuClearFast(v0, sizeof(EvolutionData));
     MI_CpuFill16((void *)GetHardwareMainBgPaletteAddress(), 0x0, GetHardwareMainBgPaletteSize());
@@ -138,7 +138,7 @@ EvolutionData *Evolution_Begin(Party *param0, Pokemon *param1, int param2, Optio
     v0->unk_08 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_BATTLE_STRINGS, heapID);
     v0->unk_0C = StringTemplate_Default(heapID);
     v0->unk_10 = Strbuf_Init(2 * 160, heapID);
-    v0->unk_3C = Heap_AllocFromHeap(heapID, sizeof(PokemonSummary));
+    v0->unk_3C = Heap_Alloc(heapID, sizeof(PokemonSummary));
 
     MI_CpuClearFast(v0->unk_3C, sizeof(PokemonSummary));
 
@@ -316,7 +316,7 @@ static void sub_0207B180(EvolutionData *param0)
                 PokemonSprite_StartFade(param0->unk_1C[0], 0, 16, 4, 0x7fff);
                 PokemonSprite_StartFade(param0->unk_1C[1], 0, 16, 4, 0x7fff);
 
-                GF_ASSERT(Heap_FndGetTotalFreeSizeForExpHeap(param0->heapID) > 0x8000);
+                GF_ASSERT(HeapExp_FndGetTotalFreeSize(param0->heapID) > 0x8000);
                 Sound_PlayEffect(SEQ_SE_DP_W025);
             }
             param0->unk_66 = 40;
diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c
index e98ee06bcb..70e9180cf1 100644
--- a/src/field_battle_data_transfer.c
+++ b/src/field_battle_data_transfer.c
@@ -65,10 +65,10 @@
 static int CalcTerrain(const FieldSystem *fieldSystem, enum BattleBackground background);
 static void SetBackgroundAndTerrain(FieldBattleDTO *dto, const FieldSystem *fieldSystem);
 
-FieldBattleDTO *FieldBattleDTO_New(enum HeapId heapID, u32 battleType)
+FieldBattleDTO *FieldBattleDTO_New(enum HeapID heapID, u32 battleType)
 {
     int i;
-    FieldBattleDTO *dto = Heap_AllocFromHeap(heapID, sizeof(FieldBattleDTO));
+    FieldBattleDTO *dto = Heap_Alloc(heapID, sizeof(FieldBattleDTO));
     MI_CpuClear8(dto, sizeof(FieldBattleDTO));
 
     dto->battleType = battleType;
@@ -133,21 +133,21 @@ FieldBattleDTO *FieldBattleDTO_New(enum HeapId heapID, u32 battleType)
     return dto;
 }
 
-FieldBattleDTO *FieldBattleDTO_NewSafari(enum HeapId heapID, int countSafariBalls)
+FieldBattleDTO *FieldBattleDTO_NewSafari(enum HeapID heapID, int countSafariBalls)
 {
     FieldBattleDTO *dto = FieldBattleDTO_New(heapID, BATTLE_TYPE_SAFARI);
     dto->countSafariBalls = countSafariBalls;
     return dto;
 }
 
-FieldBattleDTO *FieldBattleDTO_NewPalPark(enum HeapId heapID, int countParkBalls)
+FieldBattleDTO *FieldBattleDTO_NewPalPark(enum HeapID heapID, int countParkBalls)
 {
     FieldBattleDTO *dto = FieldBattleDTO_New(heapID, BATTLE_TYPE_PAL_PARK);
     dto->countSafariBalls = countParkBalls;
     return dto;
 }
 
-FieldBattleDTO *FieldBattleDTO_NewCatchingTutorial(enum HeapId heapID, const FieldSystem *fieldSystem)
+FieldBattleDTO *FieldBattleDTO_NewCatchingTutorial(enum HeapID heapID, const FieldSystem *fieldSystem)
 {
     TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData);
     Options *options = SaveData_GetOptions(fieldSystem->saveData);
@@ -302,7 +302,7 @@ void FieldBattleDTO_InitWithNormalizedMonLevels(FieldBattleDTO *dto, const Field
 
     FieldBattleDTO_CopyTrainerInfoToBattler(dto, trainerInfo, BATTLER_PLAYER_1);
 
-    Pokemon *mon = Pokemon_New(HEAP_ID_FIELDMAP);
+    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD2);
     Party_InitWithCapacity(dto->parties[BATTLER_PLAYER_1], Party_GetCurrentCount(party));
     for (i = 0; i < Party_GetCurrentCount(party); i++) {
         Pokemon_Copy(Party_GetPokemonBySlotIndex(party, i), mon);
@@ -366,7 +366,7 @@ void FieldBattleDTO_InitWithPartyOrder(FieldBattleDTO *dto, const FieldSystem *f
         if (numToCopy == 0) {
             FieldBattleDTO_CopyPartyToBattler(dto, party, BATTLER_PLAYER_1);
         } else {
-            mon = Pokemon_New(HEAP_ID_FIELDMAP);
+            mon = Pokemon_New(HEAP_ID_FIELD2);
             Party_InitWithCapacity(dto->parties[BATTLER_PLAYER_1], numToCopy);
             for (i = 0; i < numToCopy; i++) {
                 Pokemon_Copy(Party_GetPokemonBySlotIndex(party, partyOrder[i] - 1), mon);
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index 8ba0de1e74..023be3e3fb 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -82,7 +82,7 @@ void FieldCommMan_Init(FieldSystem *fieldSystem)
 
     CommFieldCmd_Init(fieldSystem);
 
-    sFieldCommMan = (FieldCommunicationManager *)Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sizeof(FieldCommunicationManager));
+    sFieldCommMan = (FieldCommunicationManager *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(FieldCommunicationManager));
     MI_CpuFill8(sFieldCommMan, 0, sizeof(FieldCommunicationManager));
 
     sFieldCommMan->timer = 50;
@@ -176,7 +176,7 @@ void FieldCommMan_EnterBattleRoom(FieldSystem *fieldSystem)
 
         for (netJd = 0; netJd < CommSys_ConnectedCount(); netJd++) {
             if (sFieldCommMan->trainerCard[netJd] == NULL) {
-                sFieldCommMan->trainerCard[netJd] = Heap_AllocFromHeap(HEAP_ID_SYSTEM, sizeof(TrainerCard));
+                sFieldCommMan->trainerCard[netJd] = Heap_Alloc(HEAP_ID_SYSTEM, sizeof(TrainerCard));
             }
         }
 
@@ -286,7 +286,7 @@ static void sub_02059984(void)
     void *v0;
 
     if (CommTiming_IsSyncState(98)) {
-        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, CommPlayer_Size());
+        v0 = Heap_Alloc(HEAP_ID_COMMUNICATION, CommPlayer_Size());
         CommPlayerMan_Init(v0, sFieldCommMan->fieldSystem, 0);
         sub_02059524();
         CommSys_DisableSendMovementData();
@@ -310,7 +310,7 @@ static void sub_020599E4(void)
     }
 
     if (CommTiming_IsSyncState(92)) {
-        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         ResetVisibleHardwareWindows(DS_SCREEN_MAIN);
         ResetVisibleHardwareWindows(DS_SCREEN_SUB);
         CommPlayerMan_Restart();
@@ -357,7 +357,7 @@ static void sub_02059AB4(void)
     void *v0;
 
     if (CommTiming_IsSyncState(98)) {
-        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, CommPlayer_Size());
+        v0 = Heap_Alloc(HEAP_ID_COMMUNICATION, CommPlayer_Size());
         CommPlayerMan_Init(v0, sFieldCommMan->fieldSystem, 0);
         sub_02059524();
         CommTiming_StartSync(92);
@@ -386,7 +386,7 @@ static void sub_02059B10(void)
         u8 v0 = 1;
         CommSys_SendDataFixedSize(94, &v0);
 
-        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         ResetVisibleHardwareWindows(DS_SCREEN_MAIN);
         ResetVisibleHardwareWindows(DS_SCREEN_SUB);
         FieldCommMan_SetTask(sub_02059CD8, 0);
@@ -434,7 +434,7 @@ static void sub_02059BF4(void)
 static void sub_02059C2C(BOOL param0, const Party *party)
 {
     if (party) {
-        sFieldCommMan->party = Party_New(HEAP_ID_FIELDMAP);
+        sFieldCommMan->party = Party_New(HEAP_ID_FIELD2);
         Party_Copy(party, sFieldCommMan->party);
     }
 
diff --git a/src/field_map_change.c b/src/field_map_change.c
index adebbba3bd..f6bdce39ea 100644
--- a/src/field_map_change.c
+++ b/src/field_map_change.c
@@ -607,7 +607,7 @@ void FieldSystem_StartLoadMapFromErrorTask(FieldSystem *fieldSystem)
         }
     }
 
-    errorData = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(MapChangeFromErrorData));
+    errorData = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(MapChangeFromErrorData));
     errorData->finishedFlag = FALSE;
 
     Location_Set(&errorData->location, 466, -1, 8, 14, 0);
@@ -651,7 +651,7 @@ static BOOL FieldTask_ChangeMap(FieldTask *task)
 
 void FieldSystem_StartChangeMapTask(FieldTask *task, const Location *nextLocation)
 {
-    MapChangeData *mapChangeData = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(MapChangeData));
+    MapChangeData *mapChangeData = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(MapChangeData));
 
     mapChangeData->state = 0;
     mapChangeData->nextLocation = *nextLocation;
@@ -689,7 +689,7 @@ static BOOL FieldTask_ChangeMapSub(FieldTask *task)
 void FieldTask_ChangeMapByLocation(FieldTask *task, const Location *nextLocation)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task);
-    MapChangeSubData *mapChangeSub = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(MapChangeSubData));
+    MapChangeSubData *mapChangeSub = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(MapChangeSubData));
 
     if (FieldSystem_HasParentProcess(fieldSystem)) {
         GF_ASSERT(FALSE);
@@ -745,7 +745,7 @@ static BOOL FieldTask_ChangeMapFull(FieldTask *task)
 
 void FieldTask_StartMapChangeFull(FieldTask *task, int mapId, int warpId, int x, int z, int dir)
 {
-    MapChangeSubData *mapChangeSub = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(MapChangeSubData));
+    MapChangeSubData *mapChangeSub = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(MapChangeSubData));
 
     mapChangeSub->state = 0;
 
@@ -759,7 +759,7 @@ void FieldTask_StartMapChangeFly(FieldSystem *fieldSystem, int mapId, int warpId
 
     Location_Set(&location, mapId, warpId, x, z, dir);
 
-    MapChangeFlyData *mapChangeData = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(MapChangeFlyData));
+    MapChangeFlyData *mapChangeData = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(MapChangeFlyData));
 
     mapChangeData->state = 0;
     mapChangeData->task = NULL;
@@ -774,7 +774,7 @@ void FieldTask_ChangeMapChangeFly(FieldTask *task, int mapId, int warpId, int x,
 
     Location_Set(&location, mapId, warpId, x, z, dir);
 
-    MapChangeFlyData *mapChangeData = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(MapChangeFlyData));
+    MapChangeFlyData *mapChangeData = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(MapChangeFlyData));
 
     mapChangeData->state = 0;
     mapChangeData->task = NULL;
@@ -895,7 +895,7 @@ static BOOL FieldTask_WaitFadeInFly(FieldTask *task)
 
 void FieldTask_ChangeMapChangeByDig(FieldTask *task, const Location *location, u32 param2)
 {
-    MapChangeDigData *mapChangeData = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(MapChangeDigData));
+    MapChangeDigData *mapChangeData = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(MapChangeDigData));
 
     mapChangeData->state = 0;
     mapChangeData->unk_04 = param2;
@@ -1008,7 +1008,7 @@ static void sub_02053E5C(FieldTask *task)
         return;
     }
 
-    void *v2 = ov6_022472C8(fieldSystem, HEAP_ID_FIELD, mapChangeData->unk_04);
+    void *v2 = ov6_022472C8(fieldSystem, HEAP_ID_FIELD1, mapChangeData->unk_04);
     FieldTask_InitCall(task, ov6_022472E8, v2);
 }
 
@@ -1064,7 +1064,7 @@ static BOOL FieldTask_MapChangeWarp(FieldTask *task)
 void FieldSystem_StartMapChangeWarpTask(FieldSystem *fieldSystem, int param1, int param2)
 {
     Location nextLocation;
-    MapChangeWarpData *mapChangeWarpData = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(MapChangeWarpData));
+    MapChangeWarpData *mapChangeWarpData = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(MapChangeWarpData));
 
     MI_CpuClear8(mapChangeWarpData, sizeof(MapChangeWarpData));
 
@@ -1078,7 +1078,7 @@ void *sub_02053FAC(FieldSystem *fieldSystem)
     MapChangeUndergroundData *mapChangeUndergroundData;
     Location *location = FieldOverworldState_GetSpecialLocation(SaveData_GetFieldOverworldState(fieldSystem->saveData));
 
-    mapChangeUndergroundData = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(MapChangeUndergroundData));
+    mapChangeUndergroundData = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(MapChangeUndergroundData));
     mapChangeUndergroundData->state = 0;
     mapChangeUndergroundData->unk_04 = 0;
 
@@ -1142,7 +1142,7 @@ BOOL FieldTask_MapChangeToUnderground(FieldTask *task)
 
     switch (mapChangeUndergroundData->state) {
     case 0:
-        MessageLoader *msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0221, HEAP_ID_FIELDMAP);
+        MessageLoader *msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0221, HEAP_ID_FIELD2);
 
         mapChangeUndergroundData->unk_34 = MessageLoader_GetNewStrbuf(msgLoader, 124);
         MessageLoader_Free(msgLoader);
@@ -1155,7 +1155,7 @@ BOOL FieldTask_MapChangeToUnderground(FieldTask *task)
     case 1:
         if (FieldMessage_FinishedPrinting(mapChangeUndergroundData->unk_38) == 1) {
             Strbuf_Free(mapChangeUndergroundData->unk_34);
-            LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 0, HEAP_ID_FIELDMAP);
+            LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 0, HEAP_ID_FIELD2);
             mapChangeUndergroundData->unk_3C = Menu_MakeYesNoChoice(fieldSystem->bgConfig, &Unk_020EC3A0, 1024 - (18 + 12) - 9, 11, 11);
             mapChangeUndergroundData->state = 2;
         }
@@ -1178,7 +1178,7 @@ BOOL FieldTask_MapChangeToUnderground(FieldTask *task)
             ScriptManager_Start(task, 2034, NULL, NULL);
         } else {
             sub_020287E0(fieldSystem->saveData);
-            mapChangeUndergroundData->saveInfoWin = SaveInfoWindow_New(fieldSystem, HEAP_ID_FIELDMAP, BG_LAYER_MAIN_3);
+            mapChangeUndergroundData->saveInfoWin = SaveInfoWindow_New(fieldSystem, HEAP_ID_FIELD2, BG_LAYER_MAIN_3);
             SaveInfoWindow_Draw(mapChangeUndergroundData->saveInfoWin);
             mapChangeUndergroundData->unk_1C = 0;
             ScriptManager_Start(task, 2005, NULL, &mapChangeUndergroundData->unk_1C);
@@ -1377,7 +1377,7 @@ static BOOL sub_02054494(FieldTask *task)
 void sub_020544F0(FieldTask *task, const Location *nextLocation)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task);
-    MapChangeSubData *mapChangeData = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(MapChangeSubData));
+    MapChangeSubData *mapChangeData = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(MapChangeSubData));
 
     if (FieldSystem_HasParentProcess(fieldSystem)) {
         GF_ASSERT(FALSE);
@@ -1437,7 +1437,7 @@ static BOOL sub_02054538(FieldTask *task)
 void sub_020545EC(FieldSystem *fieldSystem)
 {
     Location *location = FieldOverworldState_GetSpecialLocation(SaveData_GetFieldOverworldState(fieldSystem->saveData));
-    MapChangeUnionData *mapChangeData = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(MapChangeUnionData));
+    MapChangeUnionData *mapChangeData = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(MapChangeUnionData));
 
     MI_CpuClear8(mapChangeData, sizeof(MapChangeUnionData));
 
@@ -1502,7 +1502,7 @@ void sub_02054708(FieldTask *task)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task);
     Location *location = FieldOverworldState_GetSpecialLocation(SaveData_GetFieldOverworldState(fieldSystem->saveData));
-    MapChangeUnionData *mapChangeData = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(MapChangeUnionData));
+    MapChangeUnionData *mapChangeData = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(MapChangeUnionData));
 
     MI_CpuClear8(mapChangeData, sizeof(MapChangeUnionData));
     Location_SetToPlayerLocation(location, fieldSystem);
@@ -1560,7 +1560,7 @@ void FieldTask_StartChangeMapColosseum(FieldTask *task, int mapId, int warpId, i
 
     fieldSystem->mapLoadType = MAP_LOAD_TYPE_COLOSSEUM;
 
-    MapChangeData *mapChangeData = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(MapChangeData));
+    MapChangeData *mapChangeData = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(MapChangeData));
 
     Location_Set(&nextLocation, mapId, warpId, x, z, dir);
 
diff --git a/src/field_message.c b/src/field_message.c
index 25469d8d26..7a977f8373 100644
--- a/src/field_message.c
+++ b/src/field_message.c
@@ -20,8 +20,8 @@ void FieldMessage_LoadTextPalettes(enum PaletteLoadLocation palLocation, u32 res
         Text_ResetAllPrinters();
     }
 
-    Font_LoadTextPalette(palLocation, PLTT_OFFSET(FIELD_MESSAGE_PALETTE_INDEX), HEAP_ID_FIELD);
-    Font_LoadScreenIndicatorsPalette(palLocation, PLTT_OFFSET(12), HEAP_ID_FIELD);
+    Font_LoadTextPalette(palLocation, PLTT_OFFSET(FIELD_MESSAGE_PALETTE_INDEX), HEAP_ID_FIELD1);
+    Font_LoadScreenIndicatorsPalette(palLocation, PLTT_OFFSET(12), HEAP_ID_FIELD1);
 }
 
 void FieldMessage_AddWindow(BgConfig *bgConfig, Window *window, u32 bgLayer)
@@ -35,7 +35,7 @@ void FieldMessage_AddWindow(BgConfig *bgConfig, Window *window, u32 bgLayer)
 
 void FieldMessage_DrawWindow(Window *window, const Options *options)
 {
-    LoadMessageBoxGraphics(window->bgConfig, Window_GetBgLayer(window), 1024 - (18 + 12), 10, Options_Frame(options), HEAP_ID_FIELD);
+    LoadMessageBoxGraphics(window->bgConfig, Window_GetBgLayer(window), 1024 - (18 + 12), 10, Options_Frame(options), HEAP_ID_FIELD1);
     FieldMessage_ClearWindow(window);
     Window_DrawMessageBoxWithScrollCursor(window, FALSE, 1024 - (18 + 12), 10);
 }
@@ -96,7 +96,7 @@ void FieldMessage_AddSignpostWindow(BgConfig *bgConfig, Window *window, u16 sign
 // used only in one instance, together with FieldMessage_AddSignpostWindow
 void FieldMessage_LoadAndDrawSignpost(Window *window, u16 signpostType, u16 signpostNARCMemberIdx)
 {
-    LoadSignpostContentGraphics(window->bgConfig, Window_GetBgLayer(window), ((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)), 9, signpostType, signpostNARCMemberIdx, HEAP_ID_FIELD);
+    LoadSignpostContentGraphics(window->bgConfig, Window_GetBgLayer(window), ((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)), 9, signpostType, signpostNARCMemberIdx, HEAP_ID_FIELD1);
     Window_FillTilemap(window, 15);
     Window_DrawSignpost(window, FALSE, ((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)), 9, signpostType);
 }
diff --git a/src/field_move_tasks.c b/src/field_move_tasks.c
index 2f902bb344..f9c006d33a 100644
--- a/src/field_move_tasks.c
+++ b/src/field_move_tasks.c
@@ -257,7 +257,7 @@ static void FieldMoves_CanUseSurfDistortionWorld(FieldSystem *fieldSystem, Field
 
 static FieldMoveTaskData *FieldMoves_AllocateTaskData(const FieldMovePokemon *fieldMoveMon, const FieldMoveContext *fieldMoveContext)
 {
-    FieldMoveTaskData *taskData = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, sizeof(FieldMoveTaskData));
+    FieldMoveTaskData *taskData = Heap_Alloc(HEAP_ID_FIELD3, sizeof(FieldMoveTaskData));
 
     taskData->magicNumber = 0x19740205;
     taskData->mapObj = fieldMoveContext->mapObj;
@@ -343,11 +343,11 @@ static void FieldMoves_SetFlyTask(FieldMovePokemon *fieldMoveMon, const FieldMov
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(fieldMoveMon->fieldTask);
     StartMenu *menu = FieldTask_GetEnv(fieldMoveMon->fieldTask);
 
-    u32 *fieldMonID = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(u32));
+    u32 *fieldMonID = Heap_Alloc(HEAP_ID_FIELD2, sizeof(u32));
     *fieldMonID = fieldMoveMon->fieldMonId;
     menu->unk_260 = fieldMonID;
 
-    menu->taskData = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0203D8AC));
+    menu->taskData = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0203D8AC));
 
     sub_0206B70C(fieldSystem, menu->taskData, 1);
     sub_0203D884(fieldSystem, menu->taskData);
@@ -681,7 +681,7 @@ static void FieldMoves_SetTeleportTask(FieldMovePokemon *fieldMoveMon, const Fie
 
     FieldSystem_StartFieldMap(fieldSystem);
 
-    UnkStruct_020711C8 *v2 = sub_020711C8(HEAP_ID_FIELDMAP, fieldMoveMon->fieldMonId, fieldSystem->saveData);
+    UnkStruct_020711C8 *v2 = sub_020711C8(HEAP_ID_FIELD2, fieldMoveMon->fieldMonId, fieldSystem->saveData);
 
     menu->callback = FieldMoves_TeleportTask;
     menu->taskData = v2;
@@ -692,7 +692,7 @@ static BOOL FieldMoves_TeleportTask(FieldTask *param0)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
     UnkStruct_020711C8 *v1 = FieldTask_GetEnv(param0);
-    void *v2 = ov6_02247530(fieldSystem, v1->unk_00, HEAP_ID_FIELD);
+    void *v2 = ov6_02247530(fieldSystem, v1->unk_00, HEAP_ID_FIELD1);
 
     Heap_Free(v1);
     FieldTask_InitJump(param0, ov6_02247554, v2);
@@ -724,7 +724,7 @@ static void FieldMoves_SetDigTask(FieldMovePokemon *fieldMoveMon, const FieldMov
 
     FieldSystem_StartFieldMap(fieldSystem);
 
-    UnkStruct_020711C8 *v2 = sub_020711C8(HEAP_ID_FIELDMAP, fieldMoveMon->fieldMonId, fieldSystem->saveData);
+    UnkStruct_020711C8 *v2 = sub_020711C8(HEAP_ID_FIELD2, fieldMoveMon->fieldMonId, fieldSystem->saveData);
 
     v1->callback = FieldMoves_DigTask;
     v1->taskData = v2;
@@ -735,9 +735,9 @@ static BOOL FieldMoves_DigTask(FieldTask *param0)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
     UnkStruct_020711C8 *v1 = FieldTask_GetEnv(param0);
-    void *v2 = ov6_02247488(fieldSystem, v1->unk_00, HEAP_ID_FIELDMAP);
+    void *v2 = ov6_02247488(fieldSystem, v1->unk_00, HEAP_ID_FIELD2);
 
-    void *journalEntryLocationEvent = JournalEntry_CreateEventUsedMove(LOCATION_EVENT_USED_DIG - LOCATION_EVENT_USED_CUT, fieldSystem->location->mapId, HEAP_ID_FIELD);
+    void *journalEntryLocationEvent = JournalEntry_CreateEventUsedMove(LOCATION_EVENT_USED_DIG - LOCATION_EVENT_USED_CUT, fieldSystem->location->mapId, HEAP_ID_FIELD1);
     JournalEntry_SaveData(fieldSystem->journalEntry, journalEntryLocationEvent, JOURNAL_LOCATION);
 
     Heap_Free(v1);
@@ -763,7 +763,7 @@ static void FieldMoves_SetSweetScentTask(FieldMovePokemon *fieldMoveMon, const F
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(fieldMoveMon->fieldTask);
     StartMenu *startMenu = FieldTask_GetEnv(fieldMoveMon->fieldTask);
-    UnkStruct_020711C8 *v2 = sub_020711C8(HEAP_ID_FIELDMAP, fieldMoveMon->fieldMonId, fieldSystem->saveData);
+    UnkStruct_020711C8 *v2 = sub_020711C8(HEAP_ID_FIELD2, fieldMoveMon->fieldMonId, fieldSystem->saveData);
     int unused;
     void *v4;
 
@@ -773,7 +773,7 @@ static void FieldMoves_SetSweetScentTask(FieldMovePokemon *fieldMoveMon, const F
     startMenu->taskData = v2;
     startMenu->state = START_MENU_STATE_10;
 
-    v4 = JournalEntry_CreateEventUsedMove(LOCATION_EVENT_LURED_POKEMON - LOCATION_EVENT_USED_CUT, fieldSystem->location->mapId, HEAP_ID_FIELDMAP);
+    v4 = JournalEntry_CreateEventUsedMove(LOCATION_EVENT_LURED_POKEMON - LOCATION_EVENT_USED_CUT, fieldSystem->location->mapId, HEAP_ID_FIELD2);
     JournalEntry_SaveData(fieldSystem->journalEntry, v4, JOURNAL_LOCATION);
 }
 
diff --git a/src/field_system.c b/src/field_system.c
index 0a2bb1233a..ea8de030b4 100644
--- a/src/field_system.c
+++ b/src/field_system.c
@@ -114,7 +114,7 @@ void FieldSystem_StartFieldMapInner(FieldSystem *fieldSystem)
 
     fieldSystem->runningFieldMap = FALSE;
     fieldSystem->processManager->pause = FALSE;
-    fieldSystem->processManager->parent = ApplicationManager_New(&gFieldMapTemplate, fieldSystem, HEAP_ID_FIELDMAP);
+    fieldSystem->processManager->parent = ApplicationManager_New(&gFieldMapTemplate, fieldSystem, HEAP_ID_FIELD2);
 }
 
 void FieldSystem_FlagNotRunningFieldMap(FieldSystem *fieldSystem)
@@ -141,19 +141,19 @@ void FieldSystem_StartChildProcess(FieldSystem *fieldSystem, const ApplicationMa
 {
     GF_ASSERT(fieldSystem->processManager->child == NULL);
     FieldSystem_FlagNotRunningFieldMap(fieldSystem);
-    fieldSystem->processManager->child = ApplicationManager_New(appTemplate, appArgs, HEAP_ID_FIELDMAP);
+    fieldSystem->processManager->child = ApplicationManager_New(appTemplate, appArgs, HEAP_ID_FIELD2);
 }
 
 static FieldSystem *InitFieldSystem(ApplicationManager *appMan)
 {
-    Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_FIELDMAP, HEAP_SIZE_FIELDMAP);
-    Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_FIELD_TASK, HEAP_SIZE_FIELD_TASK);
+    Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_FIELD2, HEAP_SIZE_FIELDMAP);
+    Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_FIELD3, HEAP_SIZE_FIELD_TASK);
     Heap_Create(HEAP_ID_SYSTEM, HEAP_ID_91, 0x300);
 
-    FieldSystem *fieldSystem = ApplicationManager_NewData(appMan, sizeof(FieldSystem), HEAP_ID_FIELDMAP);
+    FieldSystem *fieldSystem = ApplicationManager_NewData(appMan, sizeof(FieldSystem), HEAP_ID_FIELD2);
     MI_CpuClear8(fieldSystem, sizeof(FieldSystem));
 
-    fieldSystem->processManager = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(FieldProcessManager));
+    fieldSystem->processManager = Heap_Alloc(HEAP_ID_FIELD2, sizeof(FieldProcessManager));
     fieldSystem->processManager->parent = NULL;
     fieldSystem->processManager->child = NULL;
     fieldSystem->processManager->pause = FALSE;
@@ -163,15 +163,15 @@ static FieldSystem *InitFieldSystem(ApplicationManager *appMan)
     fieldSystem->location = FieldOverworldState_GetPlayerLocation(SaveData_GetFieldOverworldState(fieldSystem->saveData));
     fieldSystem->mapMatrix = MapMatrix_New();
 
-    MapHeaderData_Init(fieldSystem, HEAP_ID_FIELDMAP);
+    MapHeaderData_Init(fieldSystem, HEAP_ID_FIELD2);
 
-    fieldSystem->bagCursor = BagCursor_New(HEAP_ID_FIELDMAP);
+    fieldSystem->bagCursor = BagCursor_New(HEAP_ID_FIELD2);
 
-    fieldSystem->chain = RadarChain_Init(HEAP_ID_FIELDMAP);
+    fieldSystem->chain = RadarChain_Init(HEAP_ID_FIELD2);
     RadarChain_Clear(fieldSystem->chain);
 
-    fieldSystem->pokedexMemory = PokedexMemory_New(HEAP_ID_FIELDMAP);
-    fieldSystem->battleSubscreenCursorOn = sub_0209C370(HEAP_ID_FIELDMAP);
+    fieldSystem->pokedexMemory = PokedexMemory_New(HEAP_ID_FIELD2);
+    fieldSystem->battleSubscreenCursorOn = sub_0209C370(HEAP_ID_FIELD2);
 
     return fieldSystem;
 }
@@ -190,8 +190,8 @@ static void TeardownFieldSystem(ApplicationManager *appMan)
     Heap_Free(fieldSystem->processManager);
     ApplicationManager_FreeData(appMan);
     Heap_Destroy(HEAP_ID_91);
-    Heap_Destroy(HEAP_ID_FIELDMAP);
-    Heap_Destroy(HEAP_ID_FIELD_TASK);
+    Heap_Destroy(HEAP_ID_FIELD2);
+    Heap_Destroy(HEAP_ID_FIELD3);
 }
 
 static void ExecuteAndCleanupIfDone(ApplicationManager **appManPtr)
diff --git a/src/field_task.c b/src/field_task.c
index 2fe5b1d42f..bf0cb8b216 100644
--- a/src/field_task.c
+++ b/src/field_task.c
@@ -16,7 +16,7 @@ typedef struct FieldTaskEnv {
 
 static FieldTask *CreateTaskManager(FieldSystem *fieldSys, FieldTaskFunc taskFunc, void *taskEnv)
 {
-    FieldTask *task = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD_TASK, sizeof(FieldTask));
+    FieldTask *task = Heap_AllocAtEnd(HEAP_ID_FIELD3, sizeof(FieldTask));
     task->prev = NULL;
     task->func = taskFunc;
     task->state = 0;
@@ -24,7 +24,7 @@ static FieldTask *CreateTaskManager(FieldSystem *fieldSys, FieldTaskFunc taskFun
     task->dummy10 = 0;
     task->dummy14 = NULL;
     task->fieldSys = fieldSys;
-    task->dummy1C = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD_TASK, sizeof(u32));
+    task->dummy1C = Heap_AllocAtEnd(HEAP_ID_FIELD3, sizeof(u32));
 
     return task;
 }
@@ -137,7 +137,7 @@ static BOOL RunChildApplication(FieldTask *task)
 
 void FieldTask_RunApplication(FieldTask *task, const ApplicationManagerTemplate *appTemplate, void *appArgs)
 {
-    FieldTaskEnv *env = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD_TASK, sizeof(FieldTaskEnv));
+    FieldTaskEnv *env = Heap_AllocAtEnd(HEAP_ID_FIELD3, sizeof(FieldTaskEnv));
     env->state = 0;
     env->appTemplate = appTemplate;
     env->appArgs = appArgs;
diff --git a/src/field_transition.c b/src/field_transition.c
index 33b34e847c..4e906a168e 100644
--- a/src/field_transition.c
+++ b/src/field_transition.c
@@ -47,7 +47,7 @@ static BOOL FieldTask_RunEncounterEffect(FieldTask *task)
 
 void FieldTransition_StartEncounterEffect(FieldTask *task, int encEffectID, int battleBGM)
 {
-    EncounterEffectTaskData *data = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(EncounterEffectTaskData));
+    EncounterEffectTaskData *data = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(EncounterEffectTaskData));
 
     data->taskState = 0;
     data->done = FALSE;
@@ -118,7 +118,7 @@ void FieldTransition_FadeOut(FieldTask *task)
         return;
     }
 
-    StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+    StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
     FieldTask_InitCall(task, FieldTask_WaitUntilScreenTransitionDone, NULL);
 }
 
@@ -130,7 +130,7 @@ void FieldTransition_FadeIn(FieldTask *task)
         return;
     }
 
-    StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+    StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
     FieldTask_InitCall(task, FieldTask_WaitUntilScreenTransitionDone, NULL);
 }
 
diff --git a/src/font_manager.c b/src/font_manager.c
index 41d1d93b38..a282b9c386 100644
--- a/src/font_manager.c
+++ b/src/font_manager.c
@@ -47,7 +47,7 @@ static void (*const sFreeGlyphFuncs[])(FontManager *fontManager) = {
 
 FontManager *FontManager_New(enum NarcID narcID, u32 arcFileIdx, enum GlyphAccessMode glyphAccessMode, BOOL isMonospace, u32 heapID)
 {
-    FontManager *fontManager = Heap_AllocFromHeap(heapID, sizeof(FontManager));
+    FontManager *fontManager = Heap_Alloc(heapID, sizeof(FontManager));
 
     if (fontManager) {
         FontManager_Init(fontManager, narcID, arcFileIdx, isMonospace, heapID);
@@ -90,7 +90,7 @@ static void FontManager_Init(FontManager *fontManager, enum NarcID narcID, u32 a
     } else {
         GF_ASSERT(fontManager->header.widthTableOffset);
 
-        fontManager->glyphWidths = Heap_AllocFromHeap(heapID, fontManager->header.numGlyphs);
+        fontManager->glyphWidths = Heap_Alloc(heapID, fontManager->header.numGlyphs);
         fontManager->glyphWidthFunc = GlyphWidthFunc_VariableWidth;
 
         NARC_ReadFromMember(fontManager->narc, arcFileIdx, fontManager->header.widthTableOffset, fontManager->header.numGlyphs, fontManager->glyphWidths);
@@ -125,7 +125,7 @@ static void FontManager_LoadGlyphImmediate(FontManager *fontManager, u32 heapID)
 {
     u32 size = fontManager->glyphSize * fontManager->header.numGlyphs;
 
-    fontManager->narcBuf = Heap_AllocFromHeap(heapID, size);
+    fontManager->narcBuf = Heap_Alloc(heapID, size);
     fontManager->glyphBitmapFunc = DecompressGlyph_FromRAM;
 
     NARC_ReadFromMember(fontManager->narc, fontManager->arcFileIdx, fontManager->header.size, size, fontManager->narcBuf);
diff --git a/src/font_special_chars.c b/src/font_special_chars.c
index dc55029841..72823d6969 100644
--- a/src/font_special_chars.c
+++ b/src/font_special_chars.c
@@ -30,7 +30,7 @@ static const struct {
 
 FontSpecialCharsContext *FontSpecialChars_Init(u32 fgColor, u32 shadowColor, u32 bgColor, u32 heapID)
 {
-    FontSpecialCharsContext *context = Heap_AllocFromHeap(heapID, sizeof(FontSpecialCharsContext));
+    FontSpecialCharsContext *context = Heap_Alloc(heapID, sizeof(FontSpecialCharsContext));
 
     if (context) {
         u32 idx;
diff --git a/src/g3d_pipeline.c b/src/g3d_pipeline.c
index f9092c6b9d..5207a4f18a 100644
--- a/src/g3d_pipeline.c
+++ b/src/g3d_pipeline.c
@@ -13,9 +13,9 @@
 
 static void SetupDefaultPipelineState(void);
 
-G3DPipelineBuffers *G3DPipeline_InitEx(enum HeapId heapID, enum VramManagerType texVramManagerType, enum TextureVramSize texVramSize, enum VramManagerType plttVramManagerType, enum PaletteVramSize plttVramSize, G3DPipelineSetupCallback cb)
+G3DPipelineBuffers *G3DPipeline_InitEx(enum HeapID heapID, enum VramManagerType texVramManagerType, enum TextureVramSize texVramSize, enum VramManagerType plttVramManagerType, enum PaletteVramSize plttVramSize, G3DPipelineSetupCallback cb)
 {
-    G3DPipelineBuffers *buffers = Heap_AllocFromHeap(heapID, sizeof(G3DPipelineBuffers));
+    G3DPipelineBuffers *buffers = Heap_Alloc(heapID, sizeof(G3DPipelineBuffers));
     buffers->heapID = heapID;
 
     NNS_G3dInit();
@@ -25,7 +25,7 @@ G3DPipelineBuffers *G3DPipeline_InitEx(enum HeapId heapID, enum VramManagerType
 
     if (texVramManagerType == VRAM_MANAGER_TYPE_LINKED_LIST) {
         int bufferSize = NNS_GfdGetLnkTexVramManagerWorkSize(128 * texVramSize);
-        buffers->textureBuffer = Heap_AllocFromHeap(buffers->heapID, bufferSize);
+        buffers->textureBuffer = Heap_Alloc(buffers->heapID, bufferSize);
         NNS_GfdInitLnkTexVramManager(texVramSize * TEXTURE_VRAM_BLOCK_SIZE, 0, buffers->textureBuffer, bufferSize, TRUE);
     } else {
         NNS_GfdInitFrmTexVramManager(texVramSize, TRUE);
@@ -33,7 +33,7 @@ G3DPipelineBuffers *G3DPipeline_InitEx(enum HeapId heapID, enum VramManagerType
 
     if (plttVramManagerType == VRAM_MANAGER_TYPE_LINKED_LIST) {
         int bufferSize = NNS_GfdGetLnkPlttVramManagerWorkSize(256 * plttVramSize);
-        buffers->paletteBuffer = Heap_AllocFromHeap(buffers->heapID, bufferSize);
+        buffers->paletteBuffer = Heap_Alloc(buffers->heapID, bufferSize);
         NNS_GfdInitLnkPlttVramManager(plttVramSize * PALETTE_VRAM_BLOCK_SIZE, buffers->paletteBuffer, bufferSize, TRUE);
     } else {
         // BUG: This should be NNS_GfdInitFrmPlttVramManager
diff --git a/src/game_opening/ov77_021D25B0.c b/src/game_opening/ov77_021D25B0.c
index 64b61c9843..bbdf84ddb9 100644
--- a/src/game_opening/ov77_021D25B0.c
+++ b/src/game_opening/ov77_021D25B0.c
@@ -1308,9 +1308,9 @@ static void ov77_021D34A8(UnkStruct_ov77_021D2E9C *param0)
     v1 = ov77_021D555C();
     v2 = ov77_021D6CB8();
 
-    param0->unk_34.unk_14 = Heap_AllocFromHeap(HEAP_ID_76, v1);
+    param0->unk_34.unk_14 = Heap_Alloc(HEAP_ID_76, v1);
     param0->unk_34.unk_18 = ov77_021D6734(16);
-    param0->unk_34.unk_1C = Heap_AllocFromHeap(HEAP_ID_76, v2);
+    param0->unk_34.unk_1C = Heap_Alloc(HEAP_ID_76, v2);
 
     memset(param0->unk_34.unk_14, 0, v1);
     memset(param0->unk_34.unk_1C, 0, v2);
@@ -1551,7 +1551,7 @@ static void ov77_021D3B5C(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
     Graphics_LoadPaletteFromOpenNARC(v1, 72, 0, 0, 0, HEAP_ID_76);
     Graphics_LoadPaletteFromOpenNARC(v1, 72, 4, 0, 0, HEAP_ID_76);
 
-    param1->unk_240 = Heap_AllocFromHeap(HEAP_ID_76, 0x200);
+    param1->unk_240 = Heap_Alloc(HEAP_ID_76, 0x200);
 
     MI_CpuCopy16((void *)HW_BG_PLTT, param1->unk_240, 0x200);
     MI_CpuClear16(param1->unk_240, 2);
@@ -1657,7 +1657,7 @@ static void ov77_021D3EDC(UnkStruct_ov77_021D37C0 *param0, int param1)
         v1 = (u8 *)param0->unk_20.unk_04 + param0->unk_20.unk_04->texInfo.ofsTex;
         v2 = (u32)(v1 - (u8 *)param0->unk_20.unk_00);
 
-        Heap_ReallocFromHeap(param0->unk_20.unk_00, v2);
+        Heap_Realloc(param0->unk_20.unk_00, v2);
     }
 }
 
diff --git a/src/game_opening/ov77_021D6670.c b/src/game_opening/ov77_021D6670.c
index f1bd20d091..146ca9c6a5 100644
--- a/src/game_opening/ov77_021D6670.c
+++ b/src/game_opening/ov77_021D6670.c
@@ -115,7 +115,7 @@ static void ov77_021D66A0(UnkStruct_ov77_021D6800 *param0, AffineSpriteListTempl
 UnkStruct_ov77_021D670C *ov77_021D670C(void)
 {
     int v0 = sizeof(UnkStruct_ov77_021D670C);
-    UnkStruct_ov77_021D670C *v1 = Heap_AllocFromHeap(HEAP_ID_76, v0);
+    UnkStruct_ov77_021D670C *v1 = Heap_Alloc(HEAP_ID_76, v0);
 
     memset(v1, 0, v0);
 
@@ -128,9 +128,9 @@ UnkStruct_ov77_021D670C *ov77_021D670C(void)
 UnkStruct_ov77_021D6734 *ov77_021D6734(const int param0)
 {
     int v0;
-    UnkStruct_ov77_021D6734 *v1 = Heap_AllocFromHeap(HEAP_ID_76, sizeof(UnkStruct_ov77_021D6734));
+    UnkStruct_ov77_021D6734 *v1 = Heap_Alloc(HEAP_ID_76, sizeof(UnkStruct_ov77_021D6734));
     v0 = sizeof(UnkStruct_ov77_021D6ADC) * param0;
-    v1->unk_04 = Heap_AllocFromHeap(HEAP_ID_76, v0);
+    v1->unk_04 = Heap_Alloc(HEAP_ID_76, v0);
 
     memset(v1->unk_04, 0, v0);
     v1->unk_00 = param0;
diff --git a/src/game_opening/ov77_021D6C70.c b/src/game_opening/ov77_021D6C70.c
index 0aa4e92ca3..6e80a1a9ab 100644
--- a/src/game_opening/ov77_021D6C70.c
+++ b/src/game_opening/ov77_021D6C70.c
@@ -147,7 +147,7 @@ void ov77_021D6CFC(UnkStruct_ov77_021D6CFC *param0)
 
     ParticleSystem_ZeroAll();
 
-    param0->unk_14 = Heap_AllocFromHeap(HEAP_ID_76, 0x4800);
+    param0->unk_14 = Heap_Alloc(HEAP_ID_76, 0x4800);
     param0->unk_18 = ParticleSystem_New(ov77_021D6C70, ov77_021D6C94, param0->unk_14, 0x4800, 1, HEAP_ID_76);
     camera = ParticleSystem_GetCamera(param0->unk_18);
 
diff --git a/src/game_options.c b/src/game_options.c
index 4c8c2047ef..dcccb520b9 100644
--- a/src/game_options.c
+++ b/src/game_options.c
@@ -11,7 +11,7 @@
 
 Options *Options_New(u32 heapID)
 {
-    Options *options = Heap_AllocFromHeap(heapID, sizeof(Options));
+    Options *options = Heap_Alloc(heapID, sizeof(Options));
     Options_Init(options);
 
     return options;
diff --git a/src/game_start.c b/src/game_start.c
index f4ca00a87d..173f6df69a 100644
--- a/src/game_start.c
+++ b/src/game_start.c
@@ -37,7 +37,7 @@ static int GameStartLoadSave_Init(ApplicationManager *appMan, int *state);
 static int GameStartLoadSave_Main(ApplicationManager *appMan, int *state);
 static int GameStartLoadSave_Exit(ApplicationManager *appMan, int *state);
 
-static void InitializeNewSave(enum HeapId heapID, SaveData *saveData, BOOL setTrainerID);
+static void InitializeNewSave(enum HeapID heapID, SaveData *saveData, BOOL setTrainerID);
 static void TryLoadingSave(int unused, SaveData *saveData);
 static void StartNewSave(int unused, SaveData *saveData);
 
@@ -141,7 +141,7 @@ static int GameStartLoadSave_Exit(ApplicationManager *appMan, int *state)
 
 #include "data/berry_init.h"
 
-static void InitializeNewSave(enum HeapId heapID, SaveData *saveData, BOOL setTrainerID)
+static void InitializeNewSave(enum HeapID heapID, SaveData *saveData, BOOL setTrainerID)
 {
     u32 rnd;
     BerryPatch *berryPatches;
diff --git a/src/graphics.c b/src/graphics.c
index 3cd2626609..94718b7d27 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -107,9 +107,9 @@ void *LoadMemberFromNARC(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed,
     void *data;
 
     if (compressed || allocAtEnd == TRUE) {
-        data = Heap_AllocFromHeapAtEnd(heapID, NARC_GetMemberSizeByIndexPair(narcID, narcMemberIdx));
+        data = Heap_AllocAtEnd(heapID, NARC_GetMemberSizeByIndexPair(narcID, narcMemberIdx));
     } else {
-        data = Heap_AllocFromHeap(heapID, NARC_GetMemberSizeByIndexPair(narcID, narcMemberIdx));
+        data = Heap_Alloc(heapID, NARC_GetMemberSizeByIndexPair(narcID, narcMemberIdx));
     }
 
     if (data != NULL) {
@@ -119,9 +119,9 @@ void *LoadMemberFromNARC(enum NarcID narcID, u32 narcMemberIdx, BOOL compressed,
             void *uncompBuf;
 
             if (allocAtEnd == FALSE) {
-                uncompBuf = Heap_AllocFromHeap(heapID, MI_GetUncompressedSize(data));
+                uncompBuf = Heap_Alloc(heapID, MI_GetUncompressedSize(data));
             } else {
-                uncompBuf = Heap_AllocFromHeapAtEnd(heapID, MI_GetUncompressedSize(data));
+                uncompBuf = Heap_AllocAtEnd(heapID, MI_GetUncompressedSize(data));
             }
 
             if (uncompBuf) {
@@ -142,9 +142,9 @@ void *LoadMemberFromNARC_OutFileSize(enum NarcID narcID, u32 narcMemberIdx, BOOL
     *fileSize = NARC_GetMemberSizeByIndexPair(narcID, narcMemberIdx);
 
     if (compressed || allocAtEnd == TRUE) {
-        data = Heap_AllocFromHeapAtEnd(heapID, *fileSize);
+        data = Heap_AllocAtEnd(heapID, *fileSize);
     } else {
-        data = Heap_AllocFromHeap(heapID, *fileSize);
+        data = Heap_Alloc(heapID, *fileSize);
     }
 
     if (data != NULL) {
@@ -155,9 +155,9 @@ void *LoadMemberFromNARC_OutFileSize(enum NarcID narcID, u32 narcMemberIdx, BOOL
 
             void *uncompBuf;
             if (allocAtEnd == FALSE) {
-                uncompBuf = Heap_AllocFromHeap(heapID, *fileSize);
+                uncompBuf = Heap_Alloc(heapID, *fileSize);
             } else {
-                uncompBuf = Heap_AllocFromHeapAtEnd(heapID, *fileSize);
+                uncompBuf = Heap_AllocAtEnd(heapID, *fileSize);
             }
 
             if (uncompBuf) {
@@ -249,9 +249,9 @@ void *LoadMemberFromOpenNARC_OutFileSize(NARC *narc, u32 narcMemberIdx, BOOL com
     *fileSize = NARC_GetMemberSize(narc, narcMemberIdx);
 
     if (compressed || allocAtEnd == TRUE) {
-        data = Heap_AllocFromHeapAtEnd(heapID, *fileSize);
+        data = Heap_AllocAtEnd(heapID, *fileSize);
     } else {
-        data = Heap_AllocFromHeap(heapID, *fileSize);
+        data = Heap_Alloc(heapID, *fileSize);
     }
 
     if (data != NULL) {
@@ -262,9 +262,9 @@ void *LoadMemberFromOpenNARC_OutFileSize(NARC *narc, u32 narcMemberIdx, BOOL com
 
             void *uncompBuf;
             if (allocAtEnd == FALSE) {
-                uncompBuf = Heap_AllocFromHeap(heapID, *fileSize);
+                uncompBuf = Heap_Alloc(heapID, *fileSize);
             } else {
-                uncompBuf = Heap_AllocFromHeapAtEnd(heapID, *fileSize);
+                uncompBuf = Heap_AllocAtEnd(heapID, *fileSize);
             }
 
             if (uncompBuf) {
diff --git a/src/great_marsh_lookout.c b/src/great_marsh_lookout.c
index a996361ba8..7a553fe576 100644
--- a/src/great_marsh_lookout.c
+++ b/src/great_marsh_lookout.c
@@ -38,10 +38,10 @@ static BOOL Task_GreatMarshLookout(FieldTask *taskMan);
 
 void GreatMarshLookout_Init(FieldSystem *fieldSystem)
 {
-    LookoutData *lookout = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(LookoutData));
+    LookoutData *lookout = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(LookoutData));
 
-    lookout->spriteResources = GreatMarshLookout_AllocSpriteResources(HEAP_ID_FIELDMAP);
-    lookout->binocularsData = GreatMarshBinoculars_InitData(HEAP_ID_FIELDMAP, fieldSystem);
+    lookout->spriteResources = GreatMarshLookout_AllocSpriteResources(HEAP_ID_FIELD2);
+    lookout->binocularsData = GreatMarshBinoculars_InitData(HEAP_ID_FIELD2, fieldSystem);
     lookout->state = 0;
     lookout->numCycles = 0;
 
@@ -96,7 +96,7 @@ static BOOL Task_GreatMarshLookout(FieldTask *taskMan)
             ov6_022427F4(lookout->spriteResources);
             lookout->timer = 0;
             Sound_PlayEffect(SEQ_SE_DP_KASYA); // binoculars switch
-            sub_02056B30(taskMan, 3, 17, 0xffff, 0x0, 6, 1, HEAP_ID_FIELDMAP);
+            sub_02056B30(taskMan, 3, 17, 0xffff, 0x0, 6, 1, HEAP_ID_FIELD2);
             lookout->state = 5;
         } else {
             MapObject_SetHidden(playerAvatar, 0);
@@ -111,7 +111,7 @@ static BOOL Task_GreatMarshLookout(FieldTask *taskMan)
             GreatMarshBinoculars_SetNextLocationWithCoords(lookout->numCycles, lookout->binocularsData);
             lookout->nextLocation = GreatMarshBinoculars_GetLocation(lookout->binocularsData);
             Sound_PlayEffect(SEQ_SE_DP_KASYA);
-            sub_02056B30(taskMan, 3, 16, 0xffff, 0x0, 6, 1, HEAP_ID_FIELDMAP);
+            sub_02056B30(taskMan, 3, 16, 0xffff, 0x0, 6, 1, HEAP_ID_FIELD2);
             lookout->state = 6;
         }
         break;
diff --git a/src/heap.c b/src/heap.c
index 0403d2e5bd..86e2c818b3 100644
--- a/src/heap.c
+++ b/src/heap.c
@@ -25,7 +25,7 @@ typedef struct {
 } MemoryBlock;
 
 static int FindFirstAvailableHeapHandle(void);
-static BOOL CreateHeapInternal(u32 parent, u32 child, u32 size, s32 alignment);
+static BOOL CreateHeapInternal(enum HeapID parent, enum HeapID child, u32 size, s32 alignment);
 static void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignment, u32 heapID);
 
 static HeapInfo sHeapInfo = { 0 };
@@ -71,7 +71,7 @@ void Heap_InitSystem(const HeapParam *templates, u32 nTemplates, u32 totalNumHea
             sHeapInfo.heapHandles[i] = NNS_FndCreateExpHeap(ptr, templates[i].size);
             sHeapInfo.heapIdxs[i] = i;
         } else {
-            GF_ASSERT(0);
+            GF_ASSERT(FALSE);
         }
     }
 
@@ -100,17 +100,17 @@ static int FindFirstAvailableHeapHandle(void)
     return -1;
 }
 
-BOOL Heap_Create(u32 parent, u32 child, u32 size)
+BOOL Heap_Create(enum HeapID parent, enum HeapID child, u32 size)
 {
     return CreateHeapInternal(parent, child, size, 4);
 }
 
-BOOL Heap_CreateAtEnd(u32 parent, u32 child, u32 size)
+BOOL Heap_CreateAtEnd(enum HeapID parent, enum HeapID child, u32 size)
 {
     return CreateHeapInternal(parent, child, size, -4);
 }
 
-static BOOL CreateHeapInternal(u32 parent, u32 child, u32 size, s32 alignment)
+static BOOL CreateHeapInternal(enum HeapID parent, enum HeapID child, u32 size, s32 alignment)
 {
     GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ);
 
@@ -133,25 +133,25 @@ static BOOL CreateHeapInternal(u32 parent, u32 child, u32 size, s32 alignment)
 
                         return TRUE;
                     } else {
-                        GF_ASSERT(0);
+                        GF_ASSERT(FALSE);
                     }
                 } else {
-                    GF_ASSERT(0);
+                    GF_ASSERT(FALSE);
                 }
             } else {
-                GF_ASSERT(0);
+                GF_ASSERT(FALSE);
             }
         } else {
-            GF_ASSERT(0);
+            GF_ASSERT(FALSE);
         }
     } else {
-        GF_ASSERT(0);
+        GF_ASSERT(FALSE);
     }
 
     return FALSE;
 }
 
-void Heap_Destroy(u32 heapID)
+void Heap_Destroy(enum HeapID heapID)
 {
     GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ);
 
@@ -170,7 +170,7 @@ void Heap_Destroy(u32 heapID)
         if ((parentHeap != NNS_FND_HEAP_INVALID_HANDLE) && (childRaw != NULL)) {
             NNS_FndFreeToExpHeap(parentHeap, childRaw);
         } else {
-            GF_ASSERT(0);
+            GF_ASSERT(FALSE);
         }
 
         sHeapInfo.heapHandles[sHeapInfo.heapIdxs[heapID]] = (void *)0;
@@ -208,7 +208,7 @@ static void AllocFail(void)
     }
 }
 
-void *Heap_AllocFromHeap(u32 heapID, u32 size)
+void *Heap_Alloc(u32 heapID, u32 size)
 {
     void *ptr = NULL;
 
@@ -227,7 +227,7 @@ void *Heap_AllocFromHeap(u32 heapID, u32 size)
     return ptr;
 }
 
-void *Heap_AllocFromHeapAtEnd(u32 heapID, u32 size)
+void *Heap_AllocAtEnd(u32 heapID, u32 size)
 {
     void *ptr = NULL;
 
@@ -273,7 +273,7 @@ void Heap_Free(void *ptr)
             OS_RestoreInterrupts(intrMode);
         }
     } else {
-        GF_ASSERT(0);
+        GF_ASSERT(FALSE);
     }
 }
 
@@ -290,7 +290,7 @@ void Heap_FreeExplicit(u32 heapID, void *ptr)
         ptr -= sizeof(MemoryBlock);
 
         if (((MemoryBlock *)ptr)->heapID != heapID) {
-            GF_ASSERT(0);
+            GF_ASSERT(FALSE);
         }
 
         NNS_FndFreeToExpHeap(heap, ptr);
@@ -298,11 +298,11 @@ void Heap_FreeExplicit(u32 heapID, void *ptr)
         GF_ASSERT(sHeapInfo.numMemBlocks[heapID]);
         sHeapInfo.numMemBlocks[heapID]--;
     } else {
-        GF_ASSERT(0);
+        GF_ASSERT(FALSE);
     }
 }
 
-u32 Heap_FndGetTotalFreeSizeForExpHeap(u32 heapID)
+u32 HeapExp_FndGetTotalFreeSize(u32 heapID)
 {
     if (heapID < sHeapInfo.totalNumHeaps) {
         u8 index = sHeapInfo.heapIdxs[heapID];
@@ -310,22 +310,22 @@ u32 Heap_FndGetTotalFreeSizeForExpHeap(u32 heapID)
         return NNS_FndGetTotalFreeSizeForExpHeap(heap);
     }
 
-    GF_ASSERT(0);
+    GF_ASSERT(FALSE);
     return 0;
 }
 
-void Heap_FndInitAllocatorForExpHeap(NNSFndAllocator *pAllocator, u32 heapID, int alignment)
+void HeapExp_FndInitAllocator(NNSFndAllocator *pAllocator, u32 heapID, int alignment)
 {
     if (heapID < sHeapInfo.totalNumHeaps) {
         u8 index = sHeapInfo.heapIdxs[heapID];
         NNSFndHeapHandle heap = sHeapInfo.heapHandles[index];
         NNS_FndInitAllocatorForExpHeap(pAllocator, heap, alignment);
     } else {
-        GF_ASSERT(0);
+        GF_ASSERT(FALSE);
     }
 }
 
-void Heap_ReallocFromHeap(void *ptr, u32 newSize)
+void Heap_Realloc(void *ptr, u32 newSize)
 {
     GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ);
 
@@ -339,7 +339,7 @@ void Heap_ReallocFromHeap(void *ptr, u32 newSize)
 
         NNS_FndResizeForMBlockExpHeap(heap, ptr, newSize);
     } else {
-        GF_ASSERT(0);
+        GF_ASSERT(FALSE);
     }
 }
 
diff --git a/src/item.c b/src/item.c
index 8ed0c2a093..f65240e77d 100644
--- a/src/item.c
+++ b/src/item.c
@@ -1053,7 +1053,7 @@ u8 Item_IsHerbalMedicine(u16 item)
         || item == ITEM_REVIVAL_HERB;
 }
 
-void *ItemTable_Load(enum HeapId heapID)
+void *ItemTable_Load(enum HeapID heapID)
 {
     int maxItem = Item_FileID(NUM_ITEMS, ITEM_FILE_TYPE_DATA);
     return NARC_AllocAndReadFromMemberByIndexPair(NARC_INDEX_ITEMTOOL__ITEMDATA__PL_ITEM_DATA, 0, heapID, 0, sizeof(ItemData) * maxItem);
diff --git a/src/item_use_functions.c b/src/item_use_functions.c
index 8892960c7d..4ef3a5913a 100644
--- a/src/item_use_functions.c
+++ b/src/item_use_functions.c
@@ -240,7 +240,7 @@ static void sub_020684D0(FieldSystem *fieldSystem, ItemUseContext *usageContext)
 
 static UnkStruct_0206851C *sub_0206851C(u32 param0, u16 param1, u16 param2, u16 param3, u16 param4)
 {
-    UnkStruct_0206851C *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, sizeof(UnkStruct_0206851C));
+    UnkStruct_0206851C *v0 = Heap_Alloc(HEAP_ID_FIELD3, sizeof(UnkStruct_0206851C));
 
     v0->unk_00 = param0;
     v0->unk_04 = param1;
@@ -300,7 +300,7 @@ static void UseHealingItemFromMenu(ItemMenuUseContext *usageContext, const ItemU
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(usageContext->fieldTask);
     StartMenu *menu = FieldTask_GetEnv(usageContext->fieldTask);
-    PartyManagementData *partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PartyManagementData));
 
     memset(partyMan, 0, sizeof(PartyManagementData));
 
@@ -534,7 +534,7 @@ static void UseTMHMFromMenu(ItemMenuUseContext *usageContext, const ItemUseConte
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(usageContext->fieldTask);
     StartMenu *menu = FieldTask_GetEnv(usageContext->fieldTask);
-    PartyManagementData *partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PartyManagementData));
 
     memset(partyMan, 0, sizeof(PartyManagementData));
 
@@ -559,7 +559,7 @@ static void UseMailFromMenu(ItemMenuUseContext *usageContext, const ItemUseConte
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(usageContext->fieldTask);
     StartMenu *menu = FieldTask_GetEnv(usageContext->fieldTask);
-    UnkStruct_02097728 *v2 = sub_0203D94C(fieldSystem, 3, Item_MailNumber(usageContext->item), HEAP_ID_FIELDMAP);
+    UnkStruct_02097728 *v2 = sub_0203D94C(fieldSystem, 3, Item_MailNumber(usageContext->item), HEAP_ID_FIELD2);
 
     menu->unk_260 = sub_0203C540(usageContext->item, 3, 0);
     menu->taskData = v2;
@@ -601,7 +601,7 @@ static void UsePoffinCaseFromMenu(ItemMenuUseContext *usageContext, const ItemUs
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(usageContext->fieldTask);
     StartMenu *menu = FieldTask_GetEnv(usageContext->fieldTask);
-    UnkStruct_0203D9B8 *v2 = sub_0203D9B8(fieldSystem, HEAP_ID_FIELDMAP);
+    UnkStruct_0203D9B8 *v2 = sub_0203D9B8(fieldSystem, HEAP_ID_FIELD2);
 
     menu->taskData = v2;
     sub_0203B674(menu, sub_0203C710);
@@ -615,7 +615,7 @@ static BOOL UsePoffinCaseInField(ItemFieldUseContext *usageContext)
 
 static void *sub_02068B9C(void *some_param)
 {
-    return sub_0203D9B8(some_param, HEAP_ID_FIELDMAP);
+    return sub_0203D9B8(some_param, HEAP_ID_FIELD2);
 }
 
 static void UsePalPadFromMenu(ItemMenuUseContext *usageContext, const ItemUseContext *additionalContext)
@@ -644,7 +644,7 @@ static void UsePokeRadarFromMenu(ItemMenuUseContext *usageContext, const ItemUse
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(usageContext->fieldTask);
     StartMenu *menu = FieldTask_GetEnv(usageContext->fieldTask);
-    int *v2 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(int));
+    int *v2 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(int));
 
     (*v2) = 0;
     FieldSystem_StartFieldMap(fieldSystem);
@@ -656,7 +656,7 @@ static void UsePokeRadarFromMenu(ItemMenuUseContext *usageContext, const ItemUse
 
 static BOOL UsePokeRadarInField(ItemFieldUseContext *usageContext)
 {
-    int *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(int));
+    int *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(int));
 
     *v0 = 0;
     FieldSystem_CreateTask(usageContext->fieldSystem, RefreshRadarChain, v0);
@@ -732,7 +732,7 @@ static void UseHoneyFromMenu(ItemMenuUseContext *usageContext, const ItemUseCont
     FieldSystem_StartFieldMap(fieldSystem);
 
     v3 = ov5_021F0484();
-    v2 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, v3);
+    v2 = Heap_AllocAtEnd(HEAP_ID_FIELD2, v3);
 
     memset(v2, 0, v3);
 
@@ -740,7 +740,7 @@ static void UseHoneyFromMenu(ItemMenuUseContext *usageContext, const ItemUseCont
     menu->taskData = v2;
     menu->state = START_MENU_STATE_10;
 
-    Bag_TryRemoveItem(SaveData_GetBag(fieldSystem->saveData), usageContext->item, 1, HEAP_ID_FIELDMAP);
+    Bag_TryRemoveItem(SaveData_GetBag(fieldSystem->saveData), usageContext->item, 1, HEAP_ID_FIELD2);
 }
 
 static void UseVsSeekerFromMenu(ItemMenuUseContext *usageContext, const ItemUseContext *additionalContext)
@@ -771,13 +771,13 @@ static void UseOldRodFromMenu(ItemMenuUseContext *usageContext, const ItemUseCon
     FieldSystem_StartFieldMap(fieldSystem);
 
     menu->callback = FieldTask_Fishing;
-    menu->taskData = FishingContext_Init(fieldSystem, HEAP_ID_FIELDMAP, FISHING_TYPE_OLD_ROD);
+    menu->taskData = FishingContext_Init(fieldSystem, HEAP_ID_FIELD2, FISHING_TYPE_OLD_ROD);
     menu->state = START_MENU_STATE_10;
 }
 
 static BOOL UseOldRodInField(ItemFieldUseContext *usageContext)
 {
-    void *fishingContext = FishingContext_Init(usageContext->fieldSystem, HEAP_ID_FIELD, FISHING_TYPE_OLD_ROD);
+    void *fishingContext = FishingContext_Init(usageContext->fieldSystem, HEAP_ID_FIELD1, FISHING_TYPE_OLD_ROD);
 
     FieldSystem_CreateTask(usageContext->fieldSystem, FieldTask_Fishing, fishingContext);
     return FALSE;
@@ -791,13 +791,13 @@ static void UseGoodRodFromMenu(ItemMenuUseContext *usageContext, const ItemUseCo
     FieldSystem_StartFieldMap(fieldSystem);
 
     menu->callback = FieldTask_Fishing;
-    menu->taskData = FishingContext_Init(fieldSystem, HEAP_ID_FIELDMAP, FISHING_TYPE_GOOD_ROD);
+    menu->taskData = FishingContext_Init(fieldSystem, HEAP_ID_FIELD2, FISHING_TYPE_GOOD_ROD);
     menu->state = START_MENU_STATE_10;
 }
 
 static BOOL UseGoodRodInField(ItemFieldUseContext *usageContext)
 {
-    void *fishingContext = FishingContext_Init(usageContext->fieldSystem, HEAP_ID_FIELD, FISHING_TYPE_GOOD_ROD);
+    void *fishingContext = FishingContext_Init(usageContext->fieldSystem, HEAP_ID_FIELD1, FISHING_TYPE_GOOD_ROD);
 
     FieldSystem_CreateTask(usageContext->fieldSystem, FieldTask_Fishing, fishingContext);
     return FALSE;
@@ -811,13 +811,13 @@ static void UseSuperRodFromMenu(ItemMenuUseContext *usageContext, const ItemUseC
     FieldSystem_StartFieldMap(fieldSystem);
 
     menu->callback = FieldTask_Fishing;
-    menu->taskData = FishingContext_Init(fieldSystem, HEAP_ID_FIELDMAP, FISHING_TYPE_SUPER_ROD);
+    menu->taskData = FishingContext_Init(fieldSystem, HEAP_ID_FIELD2, FISHING_TYPE_SUPER_ROD);
     menu->state = START_MENU_STATE_10;
 }
 
 static BOOL UseSuperRodInField(ItemFieldUseContext *usageContext)
 {
-    void *fishingContext = FishingContext_Init(usageContext->fieldSystem, HEAP_ID_FIELD, FISHING_TYPE_SUPER_ROD);
+    void *fishingContext = FishingContext_Init(usageContext->fieldSystem, HEAP_ID_FIELD1, FISHING_TYPE_SUPER_ROD);
 
     FieldSystem_CreateTask(usageContext->fieldSystem, FieldTask_Fishing, fishingContext);
     return FALSE;
@@ -860,10 +860,10 @@ static u32 CanUseFishingRod(const ItemUseContext *usageContext)
 
 static BOOL UseBagMessageItem(ItemFieldUseContext *usageContext)
 {
-    UnkStruct_02068EFC *v0 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_02068EFC));
+    UnkStruct_02068EFC *v0 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_02068EFC));
 
     v0->unk_16 = 0;
-    v0->unk_10 = Strbuf_Init(128, HEAP_ID_FIELDMAP);
+    v0->unk_10 = Strbuf_Init(128, HEAP_ID_FIELD2);
 
     BagSystem_FormatUsageMessage(usageContext->fieldSystem->saveData, v0->unk_10, Bag_GetRegisteredItem(SaveData_GetBag(usageContext->fieldSystem->saveData)), 11);
     FieldSystem_CreateTask(usageContext->fieldSystem, PrintRegisteredKeyItemUseMessage, v0);
@@ -911,7 +911,7 @@ static void UseEvoStoneFromMenu(ItemMenuUseContext *usageContext, const ItemUseC
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(usageContext->fieldTask);
     StartMenu *menu = FieldTask_GetEnv(usageContext->fieldTask);
-    PartyManagementData *partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PartyManagementData));
 
     memset(partyMan, 0, sizeof(PartyManagementData));
 
@@ -942,7 +942,7 @@ static void UseEscapeRopeFromMenu(ItemMenuUseContext *usageContext, const ItemUs
     menu->taskData = NULL;
     menu->state = START_MENU_STATE_10;
 
-    Bag_TryRemoveItem(SaveData_GetBag(fieldSystem->saveData), usageContext->item, 1, HEAP_ID_FIELDMAP);
+    Bag_TryRemoveItem(SaveData_GetBag(fieldSystem->saveData), usageContext->item, 1, HEAP_ID_FIELD2);
 }
 
 static u32 CanUseEscapeRope(const ItemUseContext *usageContext)
@@ -961,7 +961,7 @@ static u32 CanUseEscapeRope(const ItemUseContext *usageContext)
 static BOOL sub_020690F0(FieldTask *task)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task);
-    void *v1 = ov6_02247100(fieldSystem, HEAP_ID_FIELDMAP);
+    void *v1 = ov6_02247100(fieldSystem, HEAP_ID_FIELD2);
 
     FieldTask_InitJump(task, ov6_02247120, v1);
     return FALSE;
@@ -1034,7 +1034,7 @@ static void UseGracideaFromMenu(ItemMenuUseContext *usageContext, const ItemUseC
     fieldSystem = FieldTask_GetFieldSystem(usageContext->fieldTask);
     menu = FieldTask_GetEnv(usageContext->fieldTask);
 
-    menu->taskData = sub_0203E598(fieldSystem, HEAP_ID_FIELDMAP, 466);
+    menu->taskData = sub_0203E598(fieldSystem, HEAP_ID_FIELD2, 466);
 
     sub_0203B674(menu, sub_0203B7C0);
 }
@@ -1047,7 +1047,7 @@ static BOOL UseGracideaInField(ItemFieldUseContext *usageContext)
 
 static void *sub_02069228(void *some_param)
 {
-    return sub_0203E598(some_param, HEAP_ID_FIELDMAP, 466);
+    return sub_0203E598(some_param, HEAP_ID_FIELD2, 466);
 }
 
 BOOL sub_02069238(FieldSystem *fieldSystem)
@@ -1068,7 +1068,7 @@ BOOL sub_02069238(FieldSystem *fieldSystem)
     }
 
     item = (u16)Bag_GetRegisteredItem(SaveData_GetBag(fieldSystem->saveData));
-    itemUseFuncIdx = (u16)Item_LoadParam(item, ITEM_PARAM_FIELD_USE_FUNC, HEAP_ID_FIELDMAP);
+    itemUseFuncIdx = (u16)Item_LoadParam(item, ITEM_PARAM_FIELD_USE_FUNC, HEAP_ID_FIELD2);
     checkUse = (ItemCheckUseFunc)GetItemUseFunction(USE_ITEM_TASK_CHECK, itemUseFuncIdx);
     useInField = (ItemFieldUseFunc)GetItemUseFunction(USE_ITEM_TASK_FIELD, itemUseFuncIdx);
 
@@ -1076,7 +1076,7 @@ BOOL sub_02069238(FieldSystem *fieldSystem)
         return FALSE;
     }
 
-    usageContext = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(ItemFieldUseContext));
+    usageContext = Heap_Alloc(HEAP_ID_FIELD2, sizeof(ItemFieldUseContext));
     memset(usageContext, 0, sizeof(ItemFieldUseContext));
 
     usageContext->fieldSystem = fieldSystem;
@@ -1107,12 +1107,12 @@ BOOL sub_02069238(FieldSystem *fieldSystem)
 
 static void PrintRegisteredKeyItemError(ItemFieldUseContext *usageContext, u32 error)
 {
-    UnkStruct_02068EFC *v0 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_02068EFC));
+    UnkStruct_02068EFC *v0 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_02068EFC));
 
     v0->unk_16 = 0;
-    v0->unk_10 = Strbuf_Init(128, HEAP_ID_FIELDMAP);
+    v0->unk_10 = Strbuf_Init(128, HEAP_ID_FIELD2);
 
-    BagSystem_FormatErrorMessage(SaveData_GetTrainerInfo(usageContext->fieldSystem->saveData), v0->unk_10, usageContext->unk_28, error, HEAP_ID_FIELDMAP);
+    BagSystem_FormatErrorMessage(SaveData_GetTrainerInfo(usageContext->fieldSystem->saveData), v0->unk_10, usageContext->unk_28, error, HEAP_ID_FIELD2);
     FieldSystem_CreateTask(usageContext->fieldSystem, PrintRegisteredKeyItemUseMessage, v0);
 }
 
diff --git a/src/item_use_pokemon.c b/src/item_use_pokemon.c
index 57514afea3..721c46ddec 100644
--- a/src/item_use_pokemon.c
+++ b/src/item_use_pokemon.c
@@ -129,9 +129,9 @@ static u8 IncreaseMovePPUps(Pokemon *mon, u32 moveSlot, u32 amount);
 static void RestorePokemonHP(Pokemon *mon, u32 currentHp, u32 maxHp, u32 amount);
 static s32 CalculateEVUpdate(s32 current, s32 sumOthers, s32 change);
 static u8 CheckFriendshipItemEffect(Pokemon *mon, ItemData *item);
-static u8 UpdatePokemonFriendship(Pokemon *mon, s32 current, s32 change, u16 location, enum HeapId heapID);
+static u8 UpdatePokemonFriendship(Pokemon *mon, s32 current, s32 change, u16 location, enum HeapID heapID);
 
-u8 Pokemon_CheckItemEffects(Pokemon *mon, u16 itemId, u16 moveSlot, enum HeapId heapID)
+u8 Pokemon_CheckItemEffects(Pokemon *mon, u16 itemId, u16 moveSlot, enum HeapID heapID)
 {
     // For some reason, the original developer decided to use an array to store what should have been individual variables
     // For more clarity on what each slot is used for, and to make them look more like individual variables,
@@ -228,13 +228,13 @@ u8 Pokemon_CheckItemEffects(Pokemon *mon, u16 itemId, u16 moveSlot, enum HeapId
     return FALSE;
 }
 
-u8 Party_CheckItemEffectsOnMember(Party *party, u16 itemId, u8 partySlot, u8 moveSlot, enum HeapId heapID)
+u8 Party_CheckItemEffectsOnMember(Party *party, u16 itemId, u8 partySlot, u8 moveSlot, enum HeapID heapID)
 {
     Pokemon *mon = Party_GetPokemonBySlotIndex(party, partySlot);
     return Pokemon_CheckItemEffects(mon, itemId, moveSlot, heapID);
 }
 
-u8 Pokemon_ApplyItemEffects(Pokemon *mon, u16 itemId, u16 moveSlot, u16 location, enum HeapId heapID)
+u8 Pokemon_ApplyItemEffects(Pokemon *mon, u16 itemId, u16 moveSlot, u16 location, enum HeapID heapID)
 {
     // For some reason, the original developer decided to use an array to store what should have been individual variables
     // For more clarity on what each slot is used for, and to make them look more like individual variables,
@@ -389,7 +389,7 @@ u8 Pokemon_ApplyItemEffects(Pokemon *mon, u16 itemId, u16 moveSlot, u16 location
     return effectApplied;
 }
 
-u8 Party_ApplyItemEffectsToMember(Party *party, u16 itemId, u8 partySlot, u8 moveSlot, u16 location, enum HeapId heapID)
+u8 Party_ApplyItemEffectsToMember(Party *party, u16 itemId, u8 partySlot, u8 moveSlot, u16 location, enum HeapID heapID)
 {
     Pokemon *mon = Party_GetPokemonBySlotIndex(party, partySlot);
     return Pokemon_ApplyItemEffects(mon, itemId, moveSlot, location, heapID);
@@ -562,7 +562,7 @@ static u8 CheckFriendshipItemEffect(Pokemon *mon, ItemData *item)
     return FALSE;
 }
 
-static u8 UpdatePokemonFriendship(Pokemon *mon, s32 current, s32 change, u16 location, enum HeapId heapID)
+static u8 UpdatePokemonFriendship(Pokemon *mon, s32 current, s32 change, u16 location, enum HeapID heapID)
 {
     if (current == MAX_FRIENDSHIP_VALUE && change > 0) {
         return FALSE;
diff --git a/src/journal.c b/src/journal.c
index 2873e1f349..2cc39a0992 100644
--- a/src/journal.c
+++ b/src/journal.c
@@ -580,7 +580,7 @@ static void JournalEntry_SaveOnlineEventMinigame(u8 *onlineEvent, JournalEntryOn
 
 void *JournalEntry_CreateTitle(u16 mapID, u32 heapID)
 {
-    JournalEntryTitle *journalEntryTitle = Heap_AllocFromHeap(heapID, sizeof(JournalEntryTitle));
+    JournalEntryTitle *journalEntryTitle = Heap_Alloc(heapID, sizeof(JournalEntryTitle));
     RTCDate currDate;
 
     GetCurrentDate(&currDate);
@@ -596,7 +596,7 @@ void *JournalEntry_CreateTitle(u16 mapID, u32 heapID)
 
 static JournalEntryLocationEvent *JournalEntry_CreateLocationEvent(u32 heapID)
 {
-    JournalEntryLocationEvent *journalEntryLocationEvent = Heap_AllocFromHeap(heapID, sizeof(JournalEntryLocationEvent));
+    JournalEntryLocationEvent *journalEntryLocationEvent = Heap_Alloc(heapID, sizeof(JournalEntryLocationEvent));
 
     memset(journalEntryLocationEvent, 0, sizeof(JournalEntryLocationEvent));
     return journalEntryLocationEvent;
@@ -799,7 +799,7 @@ void *JournalEntry_CreateEventBattleFacility(u32 heapID, u32 eventType)
 
 static JournalEntryMon *JournalEntry_CreateMon(u32 heapID)
 {
-    JournalEntryMon *journalEntryMon = Heap_AllocFromHeap(heapID, sizeof(JournalEntryMon));
+    JournalEntryMon *journalEntryMon = Heap_Alloc(heapID, sizeof(JournalEntryMon));
 
     memset(journalEntryMon, 0, sizeof(JournalEntryMon));
     return journalEntryMon;
@@ -853,7 +853,7 @@ void *JournalEntry_CreateEventMonDefeated(const PlayTime *playTime, u16 species,
 
 void *JournalEntry_CreateEventStandardTrainer(u16 mapID, u16 trainerID, u32 heapID)
 {
-    JournalEntryTrainer *journalEntryTrainer = Heap_AllocFromHeap(heapID, sizeof(JournalEntryTrainer));
+    JournalEntryTrainer *journalEntryTrainer = Heap_Alloc(heapID, sizeof(JournalEntryTrainer));
 
     journalEntryTrainer->standard = 1;
     journalEntryTrainer->mapID = mapID;
@@ -864,7 +864,7 @@ void *JournalEntry_CreateEventStandardTrainer(u16 mapID, u16 trainerID, u32 heap
 
 static JournalEntryOnlineEvent *JournalEntry_CreateOnlineEvent(u32 heapID)
 {
-    JournalEntryOnlineEvent *journalEntryOnlineEvent = Heap_AllocFromHeap(heapID, sizeof(JournalEntryOnlineEvent));
+    JournalEntryOnlineEvent *journalEntryOnlineEvent = Heap_Alloc(heapID, sizeof(JournalEntryOnlineEvent));
 
     memset(journalEntryOnlineEvent, 0, sizeof(JournalEntryOnlineEvent));
     return journalEntryOnlineEvent;
diff --git a/src/list_menu.c b/src/list_menu.c
index 3978a20650..4524d7a2d9 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -23,7 +23,7 @@ static void InvokeCursorCallback(ListMenu *menu, u8 onInit);
 
 ListMenu *ListMenu_New(const ListMenuTemplate *template, u16 startListPos, u16 startCursorPos, u8 heapID)
 {
-    ListMenu *menu = Heap_AllocFromHeap(heapID, sizeof(ListMenu));
+    ListMenu *menu = Heap_Alloc(heapID, sizeof(ListMenu));
 
     menu->template = *template;
     menu->cursor = ColoredArrow_New(heapID);
diff --git a/src/mail.c b/src/mail.c
index 0ae4ac6ee4..5a62017189 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -75,7 +75,7 @@ BOOL Mail_IsEmpty(Mail *mail)
 
 Mail *Mail_New(int heapID)
 {
-    Mail *mail = Heap_AllocFromHeapAtEnd(heapID, sizeof(Mail));
+    Mail *mail = Heap_AllocAtEnd(heapID, sizeof(Mail));
     Mail_Init(mail);
 
     return mail;
diff --git a/src/main_menu/distribution_cartridge.c b/src/main_menu/distribution_cartridge.c
index 147bc2a1d7..eba8740c01 100644
--- a/src/main_menu/distribution_cartridge.c
+++ b/src/main_menu/distribution_cartridge.c
@@ -66,14 +66,14 @@ static const u8 sSignaturePubKey[] = {
 
 static u32 sHeapID;
 
-void DistributionCartridge_UseHeap(enum HeapId heapID)
+void DistributionCartridge_UseHeap(enum HeapID heapID)
 {
     sHeapID = heapID;
 }
 
 static void *DistributionCartridge_Alloc(u32 size)
 {
-    return Heap_AllocFromHeap(sHeapID, size);
+    return Heap_Alloc(sHeapID, size);
 }
 
 inline u32 FlipEndianness(u32 val)
diff --git a/src/main_menu/gba_migrator.c b/src/main_menu/gba_migrator.c
index 0d8cb8197c..e2cfe72582 100644
--- a/src/main_menu/gba_migrator.c
+++ b/src/main_menu/gba_migrator.c
@@ -626,7 +626,7 @@ static void ov97_02234190(TouchScreenRect *rect, int param1, int param2, int par
 
 static void *ov97_022341B4(u32 narcID, u32 memberIndex, NNSG2dCharacterData **param2, u32 heapID)
 {
-    void *v0 = Heap_AllocFromHeapAtEnd(heapID, 4096);
+    void *v0 = Heap_AllocAtEnd(heapID, 4096);
 
     if (v0 != NULL) {
         NARC_ReadWholeMemberByIndexPair(v0, narcID, memberIndex);
@@ -752,7 +752,7 @@ static void ov97_022343A8(GBAMigrator *migrator)
     u32 personality;
     void *v6;
     NARC *v7 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, HEAP_ID_MIGRATE_FROM_GBA);
-    v6 = Heap_AllocFromHeapAtEnd(HEAP_ID_MIGRATE_FROM_GBA, 4096);
+    v6 = Heap_AllocAtEnd(HEAP_ID_MIGRATE_FROM_GBA, 4096);
 
     for (i = 0; i < GBA_MAX_MONS_PER_BOX; i++) {
         if (GBABoxPokemon_GetData(&(migrator->pokemonStorage->boxes[migrator->currentBox][i]), GBA_MON_DATA_SANITY_HAS_SPECIES, NULL)) {
diff --git a/src/main_menu/main_menu_util.c b/src/main_menu/main_menu_util.c
index fa7b9870db..93a0fc53ce 100644
--- a/src/main_menu/main_menu_util.c
+++ b/src/main_menu/main_menu_util.c
@@ -74,7 +74,7 @@ static void TransferGraphicsOnVBlank(void *unused);
 
 static MainMenuUtilManager sMainMenuUtilManager;
 
-void MainMenuUtil_Init(enum HeapId heapID)
+void MainMenuUtil_Init(enum HeapID heapID)
 {
     MainMenuUtilManager *utilMan = &sMainMenuUtilManager;
 
@@ -84,7 +84,7 @@ void MainMenuUtil_Init(enum HeapId heapID)
     utilMan->heapID = heapID;
 }
 
-void *MainMenuUtil_InitAppAndFadeToBlack(ApplicationManager *appMan, enum HeapId heapID, int appDataSize, enum HeapSize heapSize)
+void *MainMenuUtil_InitAppAndFadeToBlack(ApplicationManager *appMan, enum HeapID heapID, int appDataSize, enum HeapSize heapSize)
 {
     void *newAppData;
 
@@ -711,10 +711,10 @@ void MainMenuUtil_LoadGiftSprite(BgConfig *bgConfig, WonderCard *wonderCard)
     Sprite_SetDrawFlag(utilMan->mysteryGiftSprite, FALSE);
 }
 
-void MainMenuUtil_EncryptWonderCard(MysteryGiftEventData *eventData, WonderCard *wonderCard, enum HeapId heapID)
+void MainMenuUtil_EncryptWonderCard(MysteryGiftEventData *eventData, WonderCard *wonderCard, enum HeapID heapID)
 {
 
-    MATHCRC16Table *crcTable = Heap_AllocFromHeap(heapID, sizeof(MATHCRC16Table));
+    MATHCRC16Table *crcTable = Heap_Alloc(heapID, sizeof(MATHCRC16Table));
     MATH_CRC16InitTable(crcTable);
 
     u16 headerCRC = MATH_CalcCRC16(crcTable, &eventData->header, sizeof(MysteryGiftEventHeader));
@@ -732,7 +732,7 @@ void MainMenuUtil_EncryptWonderCard(MysteryGiftEventData *eventData, WonderCard
         magic = key[i];
     }
 
-    CRYPTORC4Context *cryptoCtx = Heap_AllocFromHeap(heapID, sizeof(CRYPTORC4Context));
+    CRYPTORC4Context *cryptoCtx = Heap_Alloc(heapID, sizeof(CRYPTORC4Context));
 
     CRYPTO_RC4Init(cryptoCtx, key, sizeof(key));
     CRYPTO_RC4Encrypt(cryptoCtx, &eventData->wonderCard, sizeof(WonderCard), wonderCard);
@@ -740,9 +740,9 @@ void MainMenuUtil_EncryptWonderCard(MysteryGiftEventData *eventData, WonderCard
     Heap_Free(cryptoCtx);
 }
 
-void MainMenuUtil_DecryptReceivedWonderCard(MysteryGiftEventData *eventData, WonderCard *wonderCard, enum HeapId heapID)
+void MainMenuUtil_DecryptReceivedWonderCard(MysteryGiftEventData *eventData, WonderCard *wonderCard, enum HeapID heapID)
 {
-    MATHCRC16Table *crcTable = Heap_AllocFromHeap(heapID, sizeof(MATHCRC16Table));
+    MATHCRC16Table *crcTable = Heap_Alloc(heapID, sizeof(MATHCRC16Table));
     MATH_CRC16InitTable(crcTable);
 
     u16 headerCRC = MATH_CalcCRC16(crcTable, &eventData->header, sizeof(MysteryGiftEventHeader));
@@ -761,7 +761,7 @@ void MainMenuUtil_DecryptReceivedWonderCard(MysteryGiftEventData *eventData, Won
         magic = key[i];
     }
 
-    CRYPTORC4Context *cryptoCtx = Heap_AllocFromHeap(heapID, sizeof(CRYPTORC4Context));
+    CRYPTORC4Context *cryptoCtx = Heap_Alloc(heapID, sizeof(CRYPTORC4Context));
 
     CRYPTO_RC4Init(cryptoCtx, key, sizeof(key));
     CRYPTO_RC4Encrypt(cryptoCtx, &eventData->wonderCard, sizeof(WonderCard), wonderCard);
diff --git a/src/main_menu/mystery_gift_app.c b/src/main_menu/mystery_gift_app.c
index 5d1b3015fe..0d8d957779 100644
--- a/src/main_menu/mystery_gift_app.c
+++ b/src/main_menu/mystery_gift_app.c
@@ -2070,7 +2070,7 @@ static BOOL MysteryGiftApp_Main(ApplicationManager *appMan, enum MysteryGiftAppS
             EraseStdFrameIfInUse(&appData->wonderCardTitleWindow, FALSE);
 
             {
-                MysteryGiftAnimationManager *animMan = Heap_AllocFromHeap(HEAP_ID_MYSTERY_GIFT_APP, sizeof(MysteryGiftAnimationManager));
+                MysteryGiftAnimationManager *animMan = Heap_Alloc(HEAP_ID_MYSTERY_GIFT_APP, sizeof(MysteryGiftAnimationManager));
 
                 memset(animMan, 0, sizeof(MysteryGiftAnimationManager));
 
@@ -2560,7 +2560,7 @@ static void UpdateLocalWirelessDistributionState(MysteryGiftAppData *appData)
     case WIRELESS_DISTRIBUTION_STATE_38:
         if (WirelessDriver_IsReady() == 1) {
             Unk_ov97_0223F1B4 = 0;
-            Unk_ov97_0223F1AC = Heap_AllocFromHeap(HEAP_ID_MYSTERY_GIFT_APP, ov97_02238D4C());
+            Unk_ov97_0223F1AC = Heap_Alloc(HEAP_ID_MYSTERY_GIFT_APP, ov97_02238D4C());
             ov97_02238A4C(appData->wirelessDistributionBuffer, ov97_02230280, Unk_ov97_0223F1AC);
             sWirelessDistribState = WIRELESS_DISTRIBUTION_STATE_39;
             sub_02039734();
diff --git a/src/main_menu/ov97_0222C174.c b/src/main_menu/ov97_0222C174.c
index 6ff27091ca..4cce8ecad7 100644
--- a/src/main_menu/ov97_0222C174.c
+++ b/src/main_menu/ov97_0222C174.c
@@ -430,7 +430,7 @@ enum {
 static void ov97_0222C388(UnkStruct_ov97_0222C388 *param0);
 int ov97_0222CB10(UnkStruct_ov97_0222C388 *param0);
 MysteryGift *SaveData_GetMysteryGift(SaveData *saveData);
-void WonderCardsApp_ShowWondercard(BgConfig *bgConfig, WonderCard *wonderCard, enum HeapId heapID);
+void WonderCardsApp_ShowWondercard(BgConfig *bgConfig, WonderCard *wonderCard, enum HeapID heapID);
 
 static u16 ov97_0222C174(u16 param0)
 {
diff --git a/src/main_menu/ov97_0222D04C.c b/src/main_menu/ov97_0222D04C.c
index 454319e134..84ea538b8f 100644
--- a/src/main_menu/ov97_0222D04C.c
+++ b/src/main_menu/ov97_0222D04C.c
@@ -57,7 +57,7 @@ static void ov97_0222D04C(MysteryGiftAppData *param0)
 
     ov97_0222D2F8((void *)param0);
 
-    Unk_ov97_0223F1A4 = (UnkStruct_ov97_0223F1A4 *)Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_ov97_0223F1A4));
+    Unk_ov97_0223F1A4 = (UnkStruct_ov97_0223F1A4 *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_ov97_0223F1A4));
     MI_CpuFill8(Unk_ov97_0223F1A4, 0, sizeof(UnkStruct_ov97_0223F1A4));
 
     Unk_ov97_0223F1A4->unk_24 = 50;
diff --git a/src/main_menu/ov97_02238D74.c b/src/main_menu/ov97_02238D74.c
index d27c4507e2..f70b978966 100644
--- a/src/main_menu/ov97_02238D74.c
+++ b/src/main_menu/ov97_02238D74.c
@@ -33,7 +33,7 @@ static void *ov97_02238D74(DWCAllocType param0, u32 param1, int param2)
 
     param1 = (((param1 + sizeof(void *)) + 32) & ~31) + 32;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_MYSTERY_GIFT_APP, param1);
+    v0 = Heap_Alloc(HEAP_ID_MYSTERY_GIFT_APP, param1);
     v1 = (u32 *)(((u32)v0 + 32) & ~31);
 
     v1--;
diff --git a/src/main_menu/wonder_cards_app.c b/src/main_menu/wonder_cards_app.c
index eebd02c8c1..0e0c374b56 100644
--- a/src/main_menu/wonder_cards_app.c
+++ b/src/main_menu/wonder_cards_app.c
@@ -1849,11 +1849,11 @@ const ApplicationManagerTemplate gWonderCardsAppTemplate = {
     FS_OVERLAY_ID_NONE
 };
 
-void WonderCardsApp_ShowWondercard(BgConfig *bgConfig, WonderCard *wonderCard, enum HeapId heapID)
+void WonderCardsApp_ShowWondercard(BgConfig *bgConfig, WonderCard *wonderCard, enum HeapID heapID)
 {
     ov97_02232074(bgConfig);
 
-    WonderCardsAppData *appData = Heap_AllocFromHeapAtEnd(heapID, sizeof(WonderCardsAppData));
+    WonderCardsAppData *appData = Heap_AllocAtEnd(heapID, sizeof(WonderCardsAppData));
     memset(appData, 0, sizeof(WonderCardsAppData));
 
     appData->bgConfig = bgConfig;
diff --git a/src/map_header_data.c b/src/map_header_data.c
index 569d33329f..c66fe4d504 100644
--- a/src/map_header_data.c
+++ b/src/map_header_data.c
@@ -17,10 +17,10 @@ static void MapHeaderData_LoadEvents(MapHeaderData *data, int headerID);
 static void MapHeaderData_ParseEvents(MapHeaderData *data);
 static void MapHeaderData_LoadInitScripts(MapHeaderData *data, int headerID);
 
-void MapHeaderData_Init(FieldSystem *fieldSystem, enum HeapId heapID)
+void MapHeaderData_Init(FieldSystem *fieldSystem, enum HeapID heapID)
 {
     GF_ASSERT(fieldSystem->mapHeaderData == NULL);
-    fieldSystem->mapHeaderData = Heap_AllocFromHeap(heapID, sizeof(MapHeaderData));
+    fieldSystem->mapHeaderData = Heap_Alloc(heapID, sizeof(MapHeaderData));
 }
 
 void MapHeaderData_Free(FieldSystem *fieldSystem)
diff --git a/src/map_matrix.c b/src/map_matrix.c
index 2ff646b730..429196dfa5 100644
--- a/src/map_matrix.c
+++ b/src/map_matrix.c
@@ -27,7 +27,7 @@ static void MapMatrixData_Load(MapMatrixData *mapMatrixData, const u16 mapMatrix
         mapMatrixData->modelNamePrefix[i] = 0;
     }
 
-    void *buffer = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__MAPMATRIX__MAP_MATRIX, mapMatrixID, HEAP_ID_FIELDMAP);
+    void *buffer = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__MAPMATRIX__MAP_MATRIX, mapMatrixID, HEAP_ID_FIELD2);
     u8 *iter = (u8 *)buffer;
 
     mapMatrixData->width = *(iter++);
@@ -59,12 +59,12 @@ static void MapMatrixData_Load(MapMatrixData *mapMatrixData, const u16 mapMatrix
 
 MapMatrix *MapMatrix_New(void)
 {
-    return MapMatrix_NewWithHeapID(HEAP_ID_FIELDMAP);
+    return MapMatrix_NewWithHeapID(HEAP_ID_FIELD2);
 }
 
 MapMatrix *MapMatrix_NewWithHeapID(u32 heapID)
 {
-    MapMatrix *mapMatrix = Heap_AllocFromHeap(heapID, sizeof(MapMatrix));
+    MapMatrix *mapMatrix = Heap_Alloc(heapID, sizeof(MapMatrix));
     mapMatrix->width = 0;
     mapMatrix->height = 0;
     mapMatrix->matrixID = 0;
@@ -148,7 +148,7 @@ int MapMatrix_GetAltitudeAtCoords(const MapMatrix *mapMatrix, const int param1,
 
 MainMapMatrixData *MainMapMatrixData_Load(const u32 heapID)
 {
-    MainMapMatrixData *mainMapMatrixData = Heap_AllocFromHeap(heapID, sizeof(MainMapMatrixData));
+    MainMapMatrixData *mainMapMatrixData = Heap_Alloc(heapID, sizeof(MainMapMatrixData));
     void *buffer = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__MAPMATRIX__MAP_MATRIX, 0, heapID);
     u8 *iter = (u8 *)buffer;
 
diff --git a/src/map_object.c b/src/map_object.c
index 7c10577ad5..273647d159 100644
--- a/src/map_object.c
+++ b/src/map_object.c
@@ -171,8 +171,8 @@ MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int maxObjs, int pa
 
 void MapObjectMan_Delete(MapObjectManager *mapObjMan)
 {
-    Heap_FreeExplicit(HEAP_ID_FIELDMAP, MapObjectMan_GetMapObject(mapObjMan));
-    Heap_FreeExplicit(HEAP_ID_FIELDMAP, mapObjMan);
+    Heap_FreeExplicit(HEAP_ID_FIELD2, MapObjectMan_GetMapObject(mapObjMan));
+    Heap_FreeExplicit(HEAP_ID_FIELD2, mapObjMan);
 }
 
 void sub_0206184C(MapObjectManager *mapObjMan, int mapID, int param2, int objEventCount, const ObjectEvent *objectEvent)
@@ -208,13 +208,13 @@ static MapObjectManager *MapObjectMan_Alloc(int maxObjs)
 {
     int size;
     MapObject *mapObj;
-    MapObjectManager *mapObjMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(MapObjectManager));
+    MapObjectManager *mapObjMan = Heap_Alloc(HEAP_ID_FIELD2, sizeof(MapObjectManager));
 
     GF_ASSERT(mapObjMan != NULL);
     memset(mapObjMan, 0, sizeof(MapObjectManager));
 
     size = sizeof(MapObject) * maxObjs;
-    mapObj = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, size);
+    mapObj = Heap_Alloc(HEAP_ID_FIELD2, size);
 
     GF_ASSERT(mapObj != NULL);
     memset(mapObj, 0, size);
@@ -598,12 +598,12 @@ void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, con
     GF_ASSERT(param2);
 
     v0 = sizeof(ObjectEvent) * param2;
-    v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, v0);
+    v1 = Heap_AllocAtEnd(HEAP_ID_FIELD2, v0);
 
     GF_ASSERT(v1 != NULL);
     memcpy(v1, objectEvent, v0);
 
-    v2 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_020620C4));
+    v2 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_020620C4));
     GF_ASSERT(v2 != NULL);
 
     v2->unk_00 = param1;
@@ -634,8 +634,8 @@ static void sub_020620C4(UnkStruct_020620C4 *param0)
         param0->unk_08++;
     } while (param0->unk_08 < param0->unk_04);
 
-    Heap_FreeExplicit(HEAP_ID_FIELDMAP, param0->objectEvent);
-    Heap_FreeExplicit(HEAP_ID_FIELDMAP, param0);
+    Heap_FreeExplicit(HEAP_ID_FIELD2, param0->objectEvent);
+    Heap_FreeExplicit(HEAP_ID_FIELD2, param0);
 }
 
 static MapObject *sub_02062120(const MapObjectManager *mapObjMan)
diff --git a/src/math_util.c b/src/math_util.c
index 0bc836f2b2..e43a175278 100644
--- a/src/math_util.c
+++ b/src/math_util.c
@@ -240,9 +240,9 @@ u16 CalcCRC16Checksum(const void *data, u32 dataLen)
     return MATH_CalcCRC16CCITT(sCRC16Table, data, dataLen);
 }
 
-void InitCRC16Table(enum HeapId heapID)
+void InitCRC16Table(enum HeapID heapID)
 {
     GF_ASSERT(sCRC16Table == NULL);
-    sCRC16Table = Heap_AllocFromHeap(heapID, sizeof(MATHCRC16Table));
+    sCRC16Table = Heap_Alloc(heapID, sizeof(MATHCRC16Table));
     MATH_CRC16CCITTInitTable(sCRC16Table);
 }
diff --git a/src/menu.c b/src/menu.c
index 766691110b..d3fdd26667 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -25,7 +25,7 @@ static void CalcCursorDrawCoords(Menu *menu, u8 *outX, u8 *outY, u8 cursorPos);
 
 Menu *Menu_New(const MenuTemplate *template, u8 xOffset, u8 yOffset, u8 cursorStart, u8 heapID, u32 cancelKeys)
 {
-    Menu *menu = Heap_AllocFromHeap(heapID, sizeof(Menu));
+    Menu *menu = Heap_Alloc(heapID, sizeof(Menu));
 
     menu->template = *template;
     menu->cursor = ColoredArrow_New(heapID);
diff --git a/src/message.c b/src/message.c
index afb52ab050..1fd4a4b60f 100644
--- a/src/message.c
+++ b/src/message.c
@@ -101,7 +101,7 @@ void MessageBank_GetStrbuf(const MessageBank *bank, u32 entryID, Strbuf *strbuf)
         DecodeEntry(&entry, entryID, bank->seed);
 
         u32 size = entry.length * sizeof(charcode_t);
-        charcode_t *cstr = Heap_AllocFromHeapAtEnd(HEAP_ID_SYSTEM, size);
+        charcode_t *cstr = Heap_AllocAtEnd(HEAP_ID_SYSTEM, size);
         if (cstr) {
             MI_CpuCopy16(EntryOffsetAddress(bank, entry.offset), cstr, size);
             DecodeString(cstr, entry.length, entryID, bank->seed);
@@ -125,7 +125,7 @@ Strbuf *MessageBank_GetNewStrbuf(const MessageBank *bank, u32 entryID, u32 heapI
         DecodeEntry(&entry, entryID, bank->seed);
 
         u32 size = entry.length * sizeof(u16);
-        charcode_t *cstr = Heap_AllocFromHeapAtEnd(heapID, size);
+        charcode_t *cstr = Heap_AllocAtEnd(heapID, size);
         if (cstr) {
             MI_CpuCopy16(EntryOffsetAddress(bank, entry.offset), cstr, size);
             DecodeString(cstr, entry.length, entryID, bank->seed);
@@ -167,7 +167,7 @@ void MessageBank_GetStrbufFromHandle(NARC *narc, u32 bankID, u32 entryID, u32 he
         DecodeEntry(&entry, entryID, bank.seed);
 
         u32 size = entry.length * sizeof(charcode_t);
-        charcode_t *cstr = Heap_AllocFromHeapAtEnd(heapID, size);
+        charcode_t *cstr = Heap_AllocAtEnd(heapID, size);
         if (cstr) {
             NARC_ReadFromMember(narc, bankID, entry.offset, size, cstr);
             DecodeString(cstr, entry.length, entryID, bank.seed);
@@ -212,7 +212,7 @@ Strbuf *MessageBank_GetNewStrbufFromHandle(NARC *narc, u32 bankID, u32 entryID,
         Strbuf *strbuf = Strbuf_Init(entry.length, heapID);
         if (strbuf) {
             u32 size = entry.length * sizeof(charcode_t);
-            charcode_t *cstr = Heap_AllocFromHeapAtEnd(heapID, size);
+            charcode_t *cstr = Heap_AllocAtEnd(heapID, size);
 
             if (cstr) {
                 NARC_ReadFromMember(narc, bankID, entry.offset, size, cstr);
@@ -246,7 +246,7 @@ u32 MessageBank_NARCEntryCount(enum NarcID narcID, u32 bankID)
 
 MessageLoader *MessageLoader_Init(enum MessageLoaderType type, enum NarcID narcID, u32 bankID, u32 heapID)
 {
-    MessageLoader *loader = Heap_AllocFromHeapAtEnd(heapID, sizeof(MessageLoader));
+    MessageLoader *loader = Heap_AllocAtEnd(heapID, sizeof(MessageLoader));
 
     if (loader) {
         if (type == MESSAGE_LOADER_BANK_HANDLE) {
diff --git a/src/narc.c b/src/narc.c
index f35dacaa5f..084af97f9d 100644
--- a/src/narc.c
+++ b/src/narc.c
@@ -301,9 +301,9 @@ static void *AllocAndReadFromNarcMemberByPathAndIndex(const char *path, int memb
     GF_ASSERT(btafStart != 0);
 
     if (allocAtEnd == 0) {
-        dest = Heap_AllocFromHeap(heapID, btafStart);
+        dest = Heap_Alloc(heapID, btafStart);
     } else {
-        dest = Heap_AllocFromHeapAtEnd(heapID, btafStart);
+        dest = Heap_AllocAtEnd(heapID, btafStart);
     }
 
     FS_ReadFile(&file, dest, btafStart);
@@ -388,7 +388,7 @@ u32 NARC_GetMemberSizeByIndexPair(enum NarcID narcID, int memberIndex)
 
 NARC *NARC_ctor(enum NarcID narcID, u32 heapID)
 {
-    NARC *narc = Heap_AllocFromHeap(heapID, sizeof(NARC));
+    NARC *narc = Heap_Alloc(heapID, sizeof(NARC));
 
     if (narc) {
         u32 btnfStart;
@@ -434,7 +434,7 @@ void *NARC_AllocAndReadWholeMember(NARC *narc, u32 memberIndex, u32 heapID)
     FS_ReadFile(&narc->file, &fileEnd, 4);
     FS_SeekFile(&narc->file, narc->fimgStart + 8 + fileStart, FS_SEEK_SET);
 
-    dest = Heap_AllocFromHeap(heapID, fileEnd - fileStart);
+    dest = Heap_Alloc(heapID, fileEnd - fileStart);
 
     if (dest) {
         FS_ReadFile(&narc->file, dest, fileEnd - fileStart);
diff --git a/src/overlay004/ov4_021D0D80.c b/src/overlay004/ov4_021D0D80.c
index f450d4de04..857f48f363 100644
--- a/src/overlay004/ov4_021D0D80.c
+++ b/src/overlay004/ov4_021D0D80.c
@@ -109,7 +109,7 @@ int ov4_021D0D80(SaveData *saveData, int heapID, int param2, int param3)
 
     GF_ASSERT(Unk_ov4_0221A400 == NULL);
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov4_0221A400) + 32);
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov4_0221A400) + 32);
     MI_CpuClear8(v0, sizeof(UnkStruct_ov4_0221A400) + 32);
 
     Unk_ov4_0221A400 = (UnkStruct_ov4_0221A400 *)(((u32)v0 + 31) / 32 * 32);
@@ -122,7 +122,7 @@ int ov4_021D0D80(SaveData *saveData, int heapID, int param2, int param3)
     Unk_ov4_0221A400->unk_1078 = heapID;
     Unk_ov4_0221A400->unk_107C = heapID;
     Unk_ov4_0221A400->unk_1080 = param2;
-    Unk_ov4_0221A400->unk_F84 = Heap_AllocFromHeap(heapID, param2 + ((4 * 1024) * 3) + 32);
+    Unk_ov4_0221A400->unk_F84 = Heap_Alloc(heapID, param2 + ((4 * 1024) * 3) + 32);
     Unk_ov4_0221A400->unk_F8C = NULL;
     Unk_ov4_0221A400->unk_F88 = NNS_FndCreateExpHeap((void *)(((u32)Unk_ov4_0221A400->unk_F84 + 31) / 32 * 32), param2);
     Unk_ov4_0221A400->unk_F90 = NULL;
@@ -1537,7 +1537,7 @@ void ov4_021D2618(BOOL param0, int heapID)
         Unk_ov4_0221A400->unk_107C = 11;
 
         if (Unk_ov4_0221A400->unk_F8C == NULL) {
-            Unk_ov4_0221A400->unk_F8C = Heap_AllocFromHeap(heapID, 0xf000 + 32);
+            Unk_ov4_0221A400->unk_F8C = Heap_Alloc(heapID, 0xf000 + 32);
             Unk_ov4_0221A400->unk_F90 = NNS_FndCreateExpHeap((void *)(((u32)Unk_ov4_0221A400->unk_F8C + 31) / 32 * 32), 0xf000);
             NNS_FndSetGroupIDForExpHeap(Unk_ov4_0221A400->unk_F90, 16);
             Unk_ov4_0221A400->unk_F94 = NNS_FndGetTotalFreeSizeForExpHeap(Unk_ov4_0221A400->unk_F90);
@@ -1583,7 +1583,7 @@ void ov4_021D2748(int param0)
 
     if (Unk_ov4_0221A400->unk_F74[param0] == NULL) {
         if (Unk_ov4_0221A400->unk_107C == 11) {
-            Unk_ov4_0221A400->unk_F74[param0] = Heap_AllocFromHeap(Unk_ov4_0221A400->unk_107C, (4 * 1024) + 32);
+            Unk_ov4_0221A400->unk_F74[param0] = Heap_Alloc(Unk_ov4_0221A400->unk_107C, (4 * 1024) + 32);
             Unk_ov4_0221A400->unk_10D5[param0] = 1;
         } else {
             Unk_ov4_0221A400->unk_F74[param0] = ov4_021D1AA0(0, (4 * 1024), 32);
diff --git a/src/overlay004/ov4_021D2808.c b/src/overlay004/ov4_021D2808.c
index 9dc2478f08..a7edb3d22f 100644
--- a/src/overlay004/ov4_021D2808.c
+++ b/src/overlay004/ov4_021D2808.c
@@ -385,7 +385,7 @@ BOOL ov4_021D2C70(int param0, void *param1, int param2)
 
 static void ov4_021D2C98(void **param0, void **param1, int param2, int heapID)
 {
-    *param0 = Heap_AllocFromHeap(heapID, param2 + 32);
+    *param0 = Heap_Alloc(heapID, param2 + 32);
     MI_CpuClear8(*param0, param2 + 32);
     *param1 = (UnkStruct_ov4_0221A408 *)(((u32)*param0 + 31) / 32 * 32);
 }
diff --git a/src/overlay005/area_data.c b/src/overlay005/area_data.c
index c0287af14c..3c81a2e1dc 100644
--- a/src/overlay005/area_data.c
+++ b/src/overlay005/area_data.c
@@ -40,14 +40,14 @@ static void AreaData_StripTextureData(void *resourceFile, NNSG3dResTex *texture)
     u8 *textureData = (u8 *)texture + texture->texInfo.ofsTex;
     u32 strippedTextureDataSize = (u32)(textureData - (u8 *)resourceFile);
 
-    Heap_ReallocFromHeap(resourceFile, strippedTextureDataSize);
+    Heap_Realloc(resourceFile, strippedTextureDataSize);
 }
 
 AreaDataManager *AreaDataManager_Alloc(const int areaDataArchiveID, MapPropAnimationManager *mapPropAnimMan)
 {
-    AreaDataManager *areaDataManager = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(AreaDataManager));
+    AreaDataManager *areaDataManager = Heap_Alloc(HEAP_ID_FIELD1, sizeof(AreaDataManager));
 
-    areaDataManager->loadData = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(AreaDataManagerLoadData));
+    areaDataManager->loadData = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(AreaDataManagerLoadData));
     areaDataManager->loadData->areaDataArchiveID = areaDataArchiveID;
     areaDataManager->loadData->mapPropAnimMan = mapPropAnimMan;
     areaDataManager->loadData->dummy0C = 0;
@@ -61,14 +61,14 @@ void AreaDataManager_Load(AreaDataManager *areaDataManager)
 
     NARC_ReadWholeMemberByIndexPair(&areaDataManager->areaData, NARC_INDEX_FIELDDATA__AREADATA__AREA_DATA, loadData->areaDataArchiveID);
 
-    areaDataManager->mapPropModelIDs = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__AREADATA__AREA_BUILD_MODEL__AREA_BUILD, areaDataManager->areaData.mapPropArchivesID, HEAP_ID_FIELD);
+    areaDataManager->mapPropModelIDs = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__AREADATA__AREA_BUILD_MODEL__AREA_BUILD, areaDataManager->areaData.mapPropArchivesID, HEAP_ID_FIELD1);
     loadData->mapPropModelIDsCount = areaDataManager->mapPropModelIDs[0];
 
     GF_ASSERT(loadData->mapPropModelIDsCount < MAX_MAP_PROP_MODEL_FILES);
 
     areaDataManager->mapTexture = NULL;
-    areaDataManager->mapTextureFile = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__AREADATA__AREA_MAP_TEX__MAP_TEX_SET, areaDataManager->areaData.mapTextureArchiveID, HEAP_ID_FIELD);
-    areaDataManager->mapPropTextureFile = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__AREADATA__AREA_BUILD_MODEL__AREABM_TEXSET, areaDataManager->areaData.mapPropArchivesID, HEAP_ID_FIELD);
+    areaDataManager->mapTextureFile = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__AREADATA__AREA_MAP_TEX__MAP_TEX_SET, areaDataManager->areaData.mapTextureArchiveID, HEAP_ID_FIELD1);
+    areaDataManager->mapPropTextureFile = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__AREADATA__AREA_BUILD_MODEL__AREABM_TEXSET, areaDataManager->areaData.mapPropArchivesID, HEAP_ID_FIELD1);
     areaDataManager->mapTexture = NNS_G3dGetTex((NNSG3dResFileHeader *)areaDataManager->mapTextureFile);
 
     if (loadData->mapPropModelIDsCount != 0) {
@@ -95,7 +95,7 @@ void AreaDataManager_Load(AreaDataManager *areaDataManager)
 
     areaDataManager->mapPropMatShp = NULL;
 
-    NARC *narc = NARC_ctor(NARC_INDEX_FIELDDATA__BUILD_MODEL__BUILD_MODEL, HEAP_ID_FIELD);
+    NARC *narc = NARC_ctor(NARC_INDEX_FIELDDATA__BUILD_MODEL__BUILD_MODEL, HEAP_ID_FIELD1);
 
     int i;
     int mapPropModelAnimeListNARCFileCount = MapPropAnimationManager_GetAnimeListNARCFileCount(loadData->mapPropAnimMan);
@@ -104,7 +104,7 @@ void AreaDataManager_Load(AreaDataManager *areaDataManager)
         u16 mapPropModelID = areaDataManager->mapPropModelIDs[i + 1];
 
         GF_ASSERT(areaDataManager->mapPropModelFiles[mapPropModelID] == NULL);
-        areaDataManager->mapPropModelFiles[mapPropModelID] = NARC_AllocAndReadWholeMember(narc, mapPropModelID, HEAP_ID_FIELD);
+        areaDataManager->mapPropModelFiles[mapPropModelID] = NARC_AllocAndReadWholeMember(narc, mapPropModelID, HEAP_ID_FIELD1);
 
         if (mapPropModelID < mapPropModelAnimeListNARCFileCount) {
             NNSG3dResMdl *mapPropModel = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(areaDataManager->mapPropModelFiles[mapPropModelID]), 0);
@@ -117,7 +117,7 @@ void AreaDataManager_Load(AreaDataManager *areaDataManager)
 
     // Make sure the dummy box ("dmybox00") model is always loaded
     if (areaDataManager->mapPropModelFiles[0] == NULL) {
-        areaDataManager->mapPropModelFiles[0] = NARC_AllocAndReadWholeMember(narc, 0, HEAP_ID_FIELD);
+        areaDataManager->mapPropModelFiles[0] = NARC_AllocAndReadWholeMember(narc, 0, HEAP_ID_FIELD1);
         NNSG3dResTex *texture = NNS_G3dGetTex(areaDataManager->mapPropModelFiles[0]);
 
         if (texture != NULL) {
diff --git a/src/overlay005/area_light.c b/src/overlay005/area_light.c
index 90bc9118fe..505ccafaac 100644
--- a/src/overlay005/area_light.c
+++ b/src/overlay005/area_light.c
@@ -28,7 +28,7 @@ AreaLightManager *AreaLightManager_New(ModelAttributes *areaModelAttrs, const u8
 {
     GF_ASSERT(archiveID < AREA_LIGHT_FILE_COUNT);
 
-    AreaLightManager *areaLightMan = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(AreaLightManager));
+    AreaLightManager *areaLightMan = Heap_Alloc(HEAP_ID_FIELD1, sizeof(AreaLightManager));
 
     areaLightMan->areaModelAttrs = areaModelAttrs;
     areaLightMan->templateCount = AreaLightTemplate_New(archiveID, &areaLightMan->templates);
@@ -54,7 +54,7 @@ void AreaLightManager_Free(AreaLightManager **areaLightMan)
     GF_ASSERT(areaLightMan);
 
     AreaLightTemplate_Free(&(*areaLightMan)->templates);
-    Heap_FreeExplicit(HEAP_ID_FIELD, *areaLightMan);
+    Heap_FreeExplicit(HEAP_ID_FIELD1, *areaLightMan);
 
     *areaLightMan = NULL;
 }
@@ -126,7 +126,7 @@ static u32 AreaLightTemplate_New(u32 archiveID, AreaLightTemplate **templates)
     char lineBuffer[SCRATCH_BUFFER_SIZE];
     char endTimeBuffer[SCRATCH_BUFFER_SIZE];
 
-    void *fileBuffer = LoadMemberFromNARC(NARC_INDEX_DATA__AREALIGHT, archiveID, FALSE, HEAP_ID_FIELD, FALSE);
+    void *fileBuffer = LoadMemberFromNARC(NARC_INDEX_DATA__AREALIGHT, archiveID, FALSE, HEAP_ID_FIELD1, FALSE);
     void *fileIter = fileBuffer;
     int templateCount = 0;
 
@@ -147,7 +147,7 @@ static u32 AreaLightTemplate_New(u32 archiveID, AreaLightTemplate **templates)
         }
     } while (!(lineBuffer[0] == 'E' && lineBuffer[1] == 'O' && lineBuffer[2] == 'F'));
 
-    *templates = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(AreaLightTemplate) * templateCount);
+    *templates = Heap_Alloc(HEAP_ID_FIELD1, sizeof(AreaLightTemplate) * templateCount);
     MI_CpuClear8(*templates, sizeof(AreaLightTemplate) * templateCount);
     fileIter = fileBuffer;
 
@@ -175,14 +175,14 @@ static u32 AreaLightTemplate_New(u32 archiveID, AreaLightTemplate **templates)
         fileIter = Ascii_CopyToTerminator(fileIter, lineBuffer, '\r');
     }
 
-    Heap_FreeExplicit(HEAP_ID_FIELD, fileBuffer);
+    Heap_FreeExplicit(HEAP_ID_FIELD1, fileBuffer);
 
     return templateCount;
 }
 
 static void AreaLightTemplate_Free(AreaLightTemplate **template)
 {
-    Heap_FreeExplicit(HEAP_ID_FIELD, *template);
+    Heap_FreeExplicit(HEAP_ID_FIELD1, *template);
     *template = NULL;
 }
 
diff --git a/src/overlay005/bdhc.c b/src/overlay005/bdhc.c
index 47a6f48853..0618f518fc 100644
--- a/src/overlay005/bdhc.c
+++ b/src/overlay005/bdhc.c
@@ -366,7 +366,7 @@ static void BDHC_LazyLoadTask(SysTask *sysTask, void *sysTaskParam)
 
 BDHC *BDHC_New(void)
 {
-    BDHC *bdhc = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(BDHC));
+    BDHC *bdhc = Heap_Alloc(HEAP_ID_FIELD1, sizeof(BDHC));
 
     bdhc->points = NULL;
     bdhc->normals = NULL;
@@ -382,7 +382,7 @@ BDHC *BDHC_New(void)
 
 void BDHC_Load(NARC *narc, const int bdhcSize, BDHC *bdhc, u8 *buffer)
 {
-    BDHCHeader *bdhcHeader = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(BDHCHeader));
+    BDHCHeader *bdhcHeader = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(BDHCHeader));
 
     BDHC_LoadHeader(narc, bdhcHeader);
     bdhc->stripsCount = bdhcHeader->stripsCount;
@@ -425,7 +425,7 @@ void BDHC_Reset(BDHC *bdhc)
 
 SysTask *BDHC_LazyLoad(NARC *landDataNARC, const int unused1, BDHC *bdhc, BOOL *loadTaskRunning, u8 **buffer, BOOL *mapModelLoadTaskRunning)
 {
-    BDHCLoaderTaskContext *ctx = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(BDHCLoaderTaskContext));
+    BDHCLoaderTaskContext *ctx = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(BDHCLoaderTaskContext));
 
     ctx->currentSubTask = BDHC_LOADER_SUBTASK_PREPARE_FILE_LOAD;
     ctx->landDataNARC = landDataNARC;
diff --git a/src/overlay005/daycare.c b/src/overlay005/daycare.c
index 01e573ec7d..8819dc085b 100644
--- a/src/overlay005/daycare.c
+++ b/src/overlay005/daycare.c
@@ -169,7 +169,7 @@ static void ov5_021E63E0(Pokemon *param0)
 
 static int Daycare_MoveToPartyFromDaycareMon(Party *party, DaycareMon *daycareMon, StringTemplate *template)
 {
-    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD);
+    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD1);
     BoxPokemon *boxMon = DaycareMon_GetBoxMon(daycareMon);
     DaycareMail *daycareMail = DaycareMon_GetDaycareMail(daycareMon);
     u32 experience;
@@ -211,7 +211,7 @@ u16 Daycare_MoveToPartyFromDaycareSlot(Party *party, StringTemplate *template, D
 
 int BoxPokemon_GiveExperience(BoxPokemon *boxMon, u32 givenExp)
 {
-    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD);
+    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD1);
     BoxPokemon *boxMonRef = Pokemon_GetBoxPokemon(mon);
     int level;
     u32 exp;
@@ -472,7 +472,7 @@ static u8 LoadSpeciesEggMoves(Pokemon *mon, u16 *eggMoves)
 static void Egg_BuildMoveset(Pokemon *egg, BoxPokemon *father, BoxPokemon *mother)
 {
     u16 i, j, v2, species, levelUpMoveCount, eggMoveCount, form;
-    EggMoveBuilder *builder = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(EggMoveBuilder));
+    EggMoveBuilder *builder = Heap_Alloc(HEAP_ID_FIELD1, sizeof(EggMoveBuilder));
 
     v2 = 0;
 
@@ -688,7 +688,7 @@ void Egg_CreateEgg(Pokemon *egg, u16 species, u8 param2, TrainerInfo *trainerInf
     isEgg = TRUE;
     Pokemon_SetValue(egg, MON_DATA_IS_EGG, &isEgg);
 
-    eggName = MessageUtil_SpeciesName(SPECIES_EGG, HEAP_ID_FIELD);
+    eggName = MessageUtil_SpeciesName(SPECIES_EGG, HEAP_ID_FIELD1);
     Pokemon_SetValue(egg, MON_DATA_NICKNAME_STRBUF, eggName);
     Strbuf_Free(eggName);
 
@@ -742,7 +742,7 @@ static void Egg_SetInitialData(Pokemon *mon, u16 species, Daycare *daycare, u32
     Pokemon_SetValue(mon, MON_DATA_MET_LEVEL, &level);
     Pokemon_SetValue(mon, MON_DATA_FORM, &form);
 
-    strBuf = MessageUtil_SpeciesName(SPECIES_EGG, HEAP_ID_FIELD);
+    strBuf = MessageUtil_SpeciesName(SPECIES_EGG, HEAP_ID_FIELD1);
 
     Pokemon_SetValue(mon, MON_DATA_NICKNAME_STRBUF, strBuf);
     Strbuf_Free(strBuf);
@@ -752,7 +752,7 @@ void Daycare_GiveEggFromDaycare(Daycare *daycare, Party *party, TrainerInfo *tra
 {
     u16 species;
     u8 parentSlots[NUM_DAYCARE_MONS], isEgg;
-    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD);
+    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD1);
 
     species = Egg_DetermineEggSpeciesAndParentSlots(daycare, parentSlots);
     species = Daycare_AlterEggSpeciesWithIncenseItem(species, daycare);
@@ -766,7 +766,7 @@ void Daycare_GiveEggFromDaycare(Daycare *daycare, Party *party, TrainerInfo *tra
     Egg_InheritIVs(mon, daycare);
     Egg_BuildMoveset(mon, Daycare_GetBoxMon(daycare, parentSlots[1]), Daycare_GetBoxMon(daycare, parentSlots[0]));
 
-    UpdateMonStatusAndTrainerInfo(mon, trainerInfo, 3, SpecialMetLoc_GetId(1, 0), HEAP_ID_FIELD);
+    UpdateMonStatusAndTrainerInfo(mon, trainerInfo, 3, SpecialMetLoc_GetId(1, 0), HEAP_ID_FIELD1);
 
     if (species == SPECIES_PICHU) {
         Egg_TryGiveVoltTackle(mon, daycare);
diff --git a/src/overlay005/dynamic_terrain_height.c b/src/overlay005/dynamic_terrain_height.c
index 14d8cad045..f2d3ec3c09 100644
--- a/src/overlay005/dynamic_terrain_height.c
+++ b/src/overlay005/dynamic_terrain_height.c
@@ -22,9 +22,9 @@ static BOOL DynamicTerrainHeightPlate_IsTileInPlate(const int tileX, const int t
 
 DynamicTerrainHeightManager *DynamicTerrainHeightManager_New(const u8 platesCount, const u8 heapID)
 {
-    DynamicTerrainHeightManager *dynamicTerrainHeightMan = Heap_AllocFromHeap(heapID, sizeof(DynamicTerrainHeightManager));
+    DynamicTerrainHeightManager *dynamicTerrainHeightMan = Heap_Alloc(heapID, sizeof(DynamicTerrainHeightManager));
 
-    dynamicTerrainHeightMan->plates = Heap_AllocFromHeap(heapID, sizeof(DynamicTerrainHeightPlate) * platesCount);
+    dynamicTerrainHeightMan->plates = Heap_Alloc(heapID, sizeof(DynamicTerrainHeightPlate) * platesCount);
     dynamicTerrainHeightMan->platesCount = platesCount;
 
     for (u8 i = 0; i < platesCount; i++) {
diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c
index af4cd59c68..0a393b2afd 100644
--- a/src/overlay005/encounter_effect.c
+++ b/src/overlay005/encounter_effect.c
@@ -179,11 +179,11 @@ static UnkStruct_ov5_02202120 *Unk_ov5_02202120 = NULL;
 
 void EncounterEffect_Start(enum EncEffectCutIn effect, FieldSystem *fieldSystem, BOOL *done)
 {
-    SysTask *effectTask = SysTask_StartAndAllocateParam(sEncounterEffectTaskFuncs[effect], sizeof(EncounterEffect), 5, HEAP_ID_FIELD);
+    SysTask *effectTask = SysTask_StartAndAllocateParam(sEncounterEffectTaskFuncs[effect], sizeof(EncounterEffect), 5, HEAP_ID_FIELD1);
     EncounterEffect *encEffect = SysTask_GetParam(effectTask);
     encEffect->fieldSystem = fieldSystem;
     encEffect->done = done;
-    encEffect->narc = NARC_ctor(NARC_INDEX_GRAPHIC__FIELD_ENCOUNTEFFECT, HEAP_ID_FIELD);
+    encEffect->narc = NARC_ctor(NARC_INDEX_GRAPHIC__FIELD_ENCOUNTEFFECT, HEAP_ID_FIELD1);
 
     if (encEffect->done != NULL) {
         *(encEffect->done) = FALSE;
@@ -195,13 +195,13 @@ void EncounterEffect_Start(enum EncEffectCutIn effect, FieldSystem *fieldSystem,
 void EncounterEffect_Finish(EncounterEffect *encEffect, SysTask *effectTask)
 {
     NARC_dtor(encEffect->narc);
-    Heap_FreeExplicit(HEAP_ID_FIELD, encEffect->param);
+    Heap_FreeExplicit(HEAP_ID_FIELD1, encEffect->param);
     SysTask_FinishAndFreeParam(effectTask);
 }
 
 void EncounterEffect_Flash(enum Screen screen, u32 screenFlashColor, u32 otherScreenFlashColor, BOOL *done, u32 numFlashes)
 {
-    ScreenFlash *screenFlash = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(ScreenFlash));
+    ScreenFlash *screenFlash = Heap_Alloc(HEAP_ID_FIELD1, sizeof(ScreenFlash));
     memset(screenFlash, 0, sizeof(ScreenFlash));
     SysTask_Start(EncounterEffect_FlashTask, screenFlash, 5);
 
@@ -398,7 +398,7 @@ static void BrightnessFadeTask_SetBrightness(SysTask *task, void *param)
 
 ScreenSliceEffect *ScreenSliceEffect_New(void)
 {
-    ScreenSliceEffect *efx = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(ScreenSliceEffect));
+    ScreenSliceEffect *efx = Heap_Alloc(HEAP_ID_FIELD1, sizeof(ScreenSliceEffect));
     memset(efx, 0, sizeof(ScreenSliceEffect));
 
     G2_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, TRUE);
@@ -531,7 +531,7 @@ static void ScreenSliceEffect_HBlankCallback(HBlankTask *task, void *param)
 
 ScreenSplitEffect *ScreenSplitEffect_New(void)
 {
-    ScreenSplitEffect *screenSplitEfx = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(ScreenSplitEffect));
+    ScreenSplitEffect *screenSplitEfx = Heap_Alloc(HEAP_ID_FIELD1, sizeof(ScreenSplitEffect));
     memset(screenSplitEfx, 0, sizeof(ScreenSplitEffect));
 
     G2_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, TRUE);
@@ -707,10 +707,10 @@ void ov5_021DE3D0(NARC *param0, u32 param1, u32 param2, u32 param3, u32 param4,
     void *v0;
     NNSG2dScreenData *v1;
 
-    Graphics_LoadPaletteFromOpenNARC(param0, param3, 0, param4 * 32, param5 * 32, HEAP_ID_FIELD);
-    Graphics_LoadTilesToBgLayerFromOpenNARC(param0, param2, param6, param7, 0, 0, 0, HEAP_ID_FIELD);
+    Graphics_LoadPaletteFromOpenNARC(param0, param3, 0, param4 * 32, param5 * 32, HEAP_ID_FIELD1);
+    Graphics_LoadTilesToBgLayerFromOpenNARC(param0, param2, param6, param7, 0, 0, 0, HEAP_ID_FIELD1);
 
-    v0 = Graphics_GetScrnDataFromOpenNARC(param0, param1, 0, &v1, HEAP_ID_FIELD);
+    v0 = Graphics_GetScrnDataFromOpenNARC(param0, param1, 0, &v1, HEAP_ID_FIELD1);
 
     Bg_LoadToTilemapRect(param6, param7, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Bg_ChangeTilemapRectPalette(param6, param7, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8, param4);
@@ -722,10 +722,10 @@ void ov5_021DE47C(UnkStruct_ov5_021DE47C *param0, int param1, int param2)
 {
     int v0;
 
-    param0->unk_00 = SpriteList_InitRendering(param1, &param0->unk_04, HEAP_ID_FIELD);
+    param0->unk_00 = SpriteList_InitRendering(param1, &param0->unk_04, HEAP_ID_FIELD1);
 
     for (v0 = 0; v0 < 4; v0++) {
-        param0->unk_190[v0] = SpriteResourceCollection_New(param2, v0, HEAP_ID_FIELD);
+        param0->unk_190[v0] = SpriteResourceCollection_New(param2, v0, HEAP_ID_FIELD1);
     }
 }
 
@@ -743,9 +743,9 @@ void ov5_021DE4AC(UnkStruct_ov5_021DE47C *param0)
 void ov5_021DE4CC(NARC *param0, UnkStruct_ov5_021DE47C *param1, UnkStruct_ov5_021DE5A4 *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
 {
     param2->unk_00[0] = SpriteResourceCollection_AddTilesFromEx(param1->unk_190[0], param0, param5, 0, param8, NNS_G2D_VRAM_TYPE_2DMAIN, 4, HEAP_ID_SAVE);
-    param2->unk_00[1] = SpriteResourceCollection_AddPaletteFrom(param1->unk_190[1], param0, param3, 0, param8, NNS_G2D_VRAM_TYPE_2DMAIN, param4, HEAP_ID_FIELD);
-    param2->unk_00[2] = SpriteResourceCollection_AddFrom(param1->unk_190[2], param0, param6, 0, param8, 2, HEAP_ID_FIELD);
-    param2->unk_00[3] = SpriteResourceCollection_AddFrom(param1->unk_190[3], param0, param7, 0, param8, 3, HEAP_ID_FIELD);
+    param2->unk_00[1] = SpriteResourceCollection_AddPaletteFrom(param1->unk_190[1], param0, param3, 0, param8, NNS_G2D_VRAM_TYPE_2DMAIN, param4, HEAP_ID_FIELD1);
+    param2->unk_00[2] = SpriteResourceCollection_AddFrom(param1->unk_190[2], param0, param6, 0, param8, 2, HEAP_ID_FIELD1);
+    param2->unk_00[3] = SpriteResourceCollection_AddFrom(param1->unk_190[3], param0, param7, 0, param8, 3, HEAP_ID_FIELD1);
 
     SpriteTransfer_RequestCharAtEnd(param2->unk_00[0]);
     SpriteResource_ReleaseData(param2->unk_00[0]);
@@ -773,7 +773,7 @@ void ov5_021DE5D0(Sprite *param0, u32 heapID, u32 param2, u8 param3, u16 param4)
     u16 *v3;
 
     sub_02076AAC(param2, 2, &v0);
-    v3 = Heap_AllocFromHeap(heapID, 32);
+    v3 = Heap_Alloc(heapID, 32);
     v2 = Graphics_GetPlttData(v0.narcID, v0.unk_08, &v1, heapID);
     BlendPalette(v1->pRawData, v3, 16, param3, param4);
 
@@ -795,7 +795,7 @@ Sprite *ov5_021DE62C(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_021DE5A4 *par
     v0.position.z = param4;
     v0.priority = param5;
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v0.heapID = HEAP_ID_FIELD;
+    v0.heapID = HEAP_ID_FIELD1;
 
     v1 = SpriteList_Add(&v0);
     GF_ASSERT(v1);
@@ -817,7 +817,7 @@ static void ov5_021DE67C(Sprite *param0, void *param1, u32 param2)
 
 UnkStruct_ov5_021DE6BC *ov5_021DE6A4(u32 heapID)
 {
-    UnkStruct_ov5_021DE6BC *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021DE6BC));
+    UnkStruct_ov5_021DE6BC *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov5_021DE6BC));
     memset(v0, 0, sizeof(UnkStruct_ov5_021DE6BC));
 
     return v0;
@@ -866,7 +866,7 @@ BOOL ov5_021DE71C(UnkStruct_ov5_021DE6BC *param0)
 
 static UnkStruct_ov5_021DE79C *ov5_021DE784(u32 heapID)
 {
-    UnkStruct_ov5_021DE79C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021DE79C));
+    UnkStruct_ov5_021DE79C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov5_021DE79C));
 
     memset(v0, 0, sizeof(UnkStruct_ov5_021DE79C));
     return v0;
@@ -953,7 +953,7 @@ UnkStruct_ov5_021DE928 *ov5_021DE8F8(u32 heapID)
     UnkStruct_ov5_021DE928 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021DE928));
+    v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021DE928));
     memset(v0, 0, sizeof(UnkStruct_ov5_021DE928));
 
     for (v1 = 0; v1 < 48; v1++) {
@@ -1030,7 +1030,7 @@ BOOL ov5_021DE988(UnkStruct_ov5_021DE928 *param0)
 
 UnkStruct_ov5_021DEA98 *ov5_021DEA80(u32 heapID)
 {
-    UnkStruct_ov5_021DEA98 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021DEA98));
+    UnkStruct_ov5_021DEA98 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov5_021DEA98));
     memset(v0, 0, sizeof(UnkStruct_ov5_021DEA98));
     return v0;
 }
@@ -1118,7 +1118,7 @@ UnkStruct_ov5_021DEC18 *ov5_021DEBEC(u32 heapID)
     UnkStruct_ov5_021DEC18 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021DEC18));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov5_021DEC18));
     memset(v0, 0, sizeof(UnkStruct_ov5_021DEC18));
 
     for (v1 = 0; v1 < 8; v1++) {
@@ -1174,7 +1174,7 @@ BOOL ov5_021DECB8(UnkStruct_ov5_021DEC18 *param0)
 
 UnkStruct_ov5_021DED04 *ov5_021DECEC(void)
 {
-    UnkStruct_ov5_021DED04 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021DED04));
+    UnkStruct_ov5_021DED04 *v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021DED04));
     memset(v0, 0, sizeof(UnkStruct_ov5_021DED04));
 
     return v0;
@@ -1353,7 +1353,7 @@ void ov5_021DEFA0(FieldSystem *fieldSystem)
 {
     GF_ASSERT(Unk_ov5_02202120 == NULL);
 
-    Unk_ov5_02202120 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_02202120));
+    Unk_ov5_02202120 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_02202120));
     memset(Unk_ov5_02202120, 0, sizeof(UnkStruct_ov5_02202120));
 
     Unk_ov5_02202120->unk_00 = 0;
@@ -1415,8 +1415,8 @@ void ov5_021DF0CC(NARC *param0, u32 param1)
     GF_ASSERT(Unk_ov5_02202120);
     GF_ASSERT(Unk_ov5_02202120->unk_08 == NULL);
 
-    Unk_ov5_02202120->unk_0C = Heap_AllocFromHeap(HEAP_ID_FIELD, 0x4800);
-    Unk_ov5_02202120->unk_08 = ParticleSystem_New(ov5_021DF3E8, ov5_021DF414, Unk_ov5_02202120->unk_0C, 0x4800, 1, HEAP_ID_FIELD);
+    Unk_ov5_02202120->unk_0C = Heap_Alloc(HEAP_ID_FIELD1, 0x4800);
+    Unk_ov5_02202120->unk_08 = ParticleSystem_New(ov5_021DF3E8, ov5_021DF414, Unk_ov5_02202120->unk_0C, 0x4800, 1, HEAP_ID_FIELD1);
     GF_ASSERT(Unk_ov5_02202120->unk_08);
 
     ParticleSystem_SetCameraProjection(Unk_ov5_02202120->unk_08, 1);
@@ -1424,7 +1424,7 @@ void ov5_021DF0CC(NARC *param0, u32 param1)
     v1 = ParticleSystem_GetCamera(Unk_ov5_02202120->unk_08);
     Camera_SetClipping(FX32_ONE, FX32_ONE * 900, v1);
 
-    v0 = LoadMemberFromOpenNARC(param0, param1, 0, HEAP_ID_FIELD, 0);
+    v0 = LoadMemberFromOpenNARC(param0, param1, 0, HEAP_ID_FIELD1, 0);
     ParticleSystem_SetResource(Unk_ov5_02202120->unk_08, v0, 0 | 0, 0);
 }
 
@@ -1597,7 +1597,7 @@ static void ov5_021DF30C(FieldSystem *fieldSystem)
             };
 
             Bg_InitFromTemplate(fieldSystem->bgConfig, BG_LAYER_MAIN_2, &v3, 0);
-            Bg_ClearTilesRange(BG_LAYER_MAIN_2, 32, 0, HEAP_ID_FIELD);
+            Bg_ClearTilesRange(BG_LAYER_MAIN_2, 32, 0, HEAP_ID_FIELD1);
             Bg_ClearTilemap(fieldSystem->bgConfig, BG_LAYER_MAIN_2);
         }
     }
diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c
index bfd1382316..4ef8774e84 100644
--- a/src/overlay005/encounter_effect_core.c
+++ b/src/overlay005/encounter_effect_core.c
@@ -100,7 +100,7 @@ typedef struct CaveEncounterEffect {
 
 static SysTask *ScreenShakeEffect_CreateDMATransferTask(ScreenShakeEffect *screenShake);
 static void ScreenShakeEffect_DMATransfer(SysTask *task, void *param);
-static void ScreenShakeEffect_Init(ScreenShakeEffect *screenShake, enum HeapId heapID);
+static void ScreenShakeEffect_Init(ScreenShakeEffect *screenShake, enum HeapID heapID);
 static void ScreenShakeEffect_Finish(ScreenShakeEffect *screenShake);
 static void ScreenShakeEffect_Start(ScreenShakeEffect *screenShake, u8 startX, u8 endX, u16 angleIncrement, fx32 amplitude, s16 shakeSpeed, u32 bg, u32 defaultValue, u32 priority);
 static void ScreenShakeEffect_InvertBuffer(ScreenShakeEffect *screenShake, u32 interval);
@@ -114,7 +114,7 @@ void EncounterEffect_Grass_HigherLevel(SysTask *task, void *param)
 
     switch (encEffect->state) {
     case 0:
-        encEffect->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(GrassEncounterEffect));
+        encEffect->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(GrassEncounterEffect));
         memset(encEffect->param, 0, sizeof(GrassEncounterEffect));
         grassEffect = encEffect->param;
         grassEffect->screenSliceEfx = ScreenSliceEffect_New();
@@ -207,7 +207,7 @@ void EncounterEffect_Grass_LowerLevel(SysTask *task, void *param)
 
     switch (encEffect->state) {
     case 0:
-        encEffect->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(GrassEncounterEffect));
+        encEffect->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(GrassEncounterEffect));
         memset(encEffect->param, 0, sizeof(GrassEncounterEffect));
         grassEffect = encEffect->param;
         grassEffect->screenSliceEfx = ScreenSliceEffect_New();
@@ -298,10 +298,10 @@ void EncounterEffect_Water_LowerLevel(SysTask *task, void *param)
 
     switch (encEffect->state) {
     case 0:
-        encEffect->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(WaterEncounterEffect));
+        encEffect->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(WaterEncounterEffect));
         memset(encEffect->param, 0, sizeof(WaterEncounterEffect));
         waterEffect = encEffect->param;
-        ScreenShakeEffect_Init(&waterEffect->screenShakeEfx, HEAP_ID_FIELD);
+        ScreenShakeEffect_Init(&waterEffect->screenShakeEfx, HEAP_ID_FIELD1);
         HBlankSystem_Stop(encEffect->fieldSystem->unk_04->hBlankSystem);
         encEffect->state++;
         break;
@@ -327,7 +327,7 @@ void EncounterEffect_Water_LowerLevel(SysTask *task, void *param)
         }
         break;
     case 4:
-        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_30, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_30, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD1);
         encEffect->state++;
         break;
     case 5:
@@ -356,10 +356,10 @@ void EncounterEffect_Water_HigherLevel(SysTask *task, void *param)
 
     switch (encEffect->state) {
     case 0:
-        encEffect->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(WaterEncounterEffect));
+        encEffect->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(WaterEncounterEffect));
         memset(encEffect->param, 0, sizeof(WaterEncounterEffect));
         waterEffect = encEffect->param;
-        ScreenShakeEffect_Init(&waterEffect->screenShakeEfx, HEAP_ID_FIELD);
+        ScreenShakeEffect_Init(&waterEffect->screenShakeEfx, HEAP_ID_FIELD1);
         HBlankSystem_Stop(encEffect->fieldSystem->unk_04->hBlankSystem);
         encEffect->state++;
         break;
@@ -385,7 +385,7 @@ void EncounterEffect_Water_HigherLevel(SysTask *task, void *param)
         }
         break;
     case 4:
-        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_30, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_30, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD1);
         encEffect->state++;
         break;
     case 5:
@@ -425,7 +425,7 @@ static void ScreenShakeEffect_DMATransfer(SysTask *task, void *param)
     screenShakeEfx->dmaCounter++;
 }
 
-static void ScreenShakeEffect_Init(ScreenShakeEffect *screenShake, enum HeapId heapID)
+static void ScreenShakeEffect_Init(ScreenShakeEffect *screenShake, enum HeapID heapID)
 {
     screenShake->screenScrollMgr = ScreenScrollManager_New(heapID);
     screenShake->dmaCounter = 0;
@@ -467,7 +467,7 @@ void EncounterEffect_Cave_LowerLevel(SysTask *task, void *param)
 
     switch (encEffect->state) {
     case 0:
-        encEffect->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(CaveEncounterEffect));
+        encEffect->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(CaveEncounterEffect));
         memset(encEffect->param, 0, sizeof(CaveEncounterEffect));
         caveEffect = encEffect->param;
         encEffect->state++;
@@ -483,7 +483,7 @@ void EncounterEffect_Cave_LowerLevel(SysTask *task, void *param)
         break;
     case 3:
         HBlankSystem_Stop(encEffect->fieldSystem->unk_04->hBlankSystem);
-        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, COLOR_BLACK, 12, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, COLOR_BLACK, 12, 1, HEAP_ID_FIELD1);
 
         caveEffect->camera = encEffect->fieldSystem->camera;
         distance = Camera_GetDistance(caveEffect->camera);
@@ -525,7 +525,7 @@ void EncounterEffect_Cave_HigherLevel(SysTask *task, void *param)
 
     switch (encEffect->state) {
     case 0:
-        encEffect->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(CaveEncounterEffect));
+        encEffect->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(CaveEncounterEffect));
         memset(encEffect->param, 0, sizeof(CaveEncounterEffect));
         caveEffect = encEffect->param;
         encEffect->state++;
@@ -541,7 +541,7 @@ void EncounterEffect_Cave_HigherLevel(SysTask *task, void *param)
         break;
     case 3:
         HBlankSystem_Stop(encEffect->fieldSystem->unk_04->hBlankSystem);
-        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, COLOR_BLACK, 12, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, COLOR_BLACK, 12, 1, HEAP_ID_FIELD1);
 
         caveEffect->camera = encEffect->fieldSystem->camera;
         distance = Camera_GetDistance(caveEffect->camera);
@@ -669,7 +669,7 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
 
     switch (encEffect->state) {
     case 0:
-        encEffect->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(TrainerGrassEncounterEffect));
+        encEffect->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(TrainerGrassEncounterEffect));
         memset(encEffect->param, 0, sizeof(TrainerGrassEncounterEffect));
         trainerEffect = encEffect->param;
 
@@ -830,7 +830,7 @@ void EncounterEffect_Trainer_Grass_HigherLevel(SysTask *param0, void *param1)
 
     switch (encEffect->state) {
     case 0:
-        encEffect->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021E2EB0));
+        encEffect->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021E2EB0));
         memset(encEffect->param, 0, sizeof(UnkStruct_ov5_021E2EB0));
         v1 = encEffect->param;
 
@@ -977,13 +977,13 @@ void EncounterEffect_Trainer_Water_LowerLevel(SysTask *param0, void *param1)
 
     switch (v0->state) {
     case 0:
-        v0->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021E31A4));
+        v0->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021E31A4));
         memset(v0->param, 0, sizeof(UnkStruct_ov5_021E31A4));
         v1 = v0->param;
 
         v1->camera = v0->fieldSystem->camera;
 
-        ScreenShakeEffect_Init(&v1->unk_40, HEAP_ID_FIELD);
+        ScreenShakeEffect_Init(&v1->unk_40, HEAP_ID_FIELD1);
         v1->unk_248 = 12;
 
         ov5_021DE47C(&v1->unk_50, 2, 1);
@@ -1084,7 +1084,7 @@ void EncounterEffect_Trainer_Water_LowerLevel(SysTask *param0, void *param1)
         v4 = Camera_GetDistance(v1->camera);
         QuadraticInterpolationTaskFX32_Init(&v1->unk_230, v4, v4 + (-FX32_CONST(500)), -FX32_CONST(10), 8);
 
-        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_24, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_24, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD1);
         v0->state++;
         break;
 
@@ -1148,13 +1148,13 @@ void EncounterEffect_Trainer_Water_HigherLevel(SysTask *param0, void *param1)
 
     switch (v0->state) {
     case 0:
-        v0->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021E3560));
+        v0->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021E3560));
         memset(v0->param, 0, sizeof(UnkStruct_ov5_021E3560));
         v1 = v0->param;
 
         v1->camera = v0->fieldSystem->camera;
 
-        ScreenShakeEffect_Init(&v1->unk_274, HEAP_ID_FIELD);
+        ScreenShakeEffect_Init(&v1->unk_274, HEAP_ID_FIELD1);
         v1->unk_2A0 = 14;
 
         ov5_021DE47C(&v1->unk_00, 3, 1);
@@ -1168,12 +1168,12 @@ void EncounterEffect_Trainer_Water_HigherLevel(SysTask *param0, void *param1)
             Sprite_SetDrawFlag(v1->unk_1D4[v3], FALSE);
             Sprite_SetAffineOverwriteMode(v1->unk_1D4[v3], 2);
 
-            v1->unk_258[v3] = ov5_021DE6A4(HEAP_ID_FIELD);
+            v1->unk_258[v3] = ov5_021DE6A4(HEAP_ID_FIELD1);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
-        v1->unk_270 = Window_New(HEAP_ID_FIELD, 1);
+        v1->unk_270 = Window_New(HEAP_ID_FIELD1, 1);
         Window_Add(v0->fieldSystem->bgConfig, v1->unk_270, 3, 0, 0, 32, 32, 0, 0);
 
         {
@@ -1309,7 +1309,7 @@ void EncounterEffect_Trainer_Water_HigherLevel(SysTask *param0, void *param1)
         Window_Remove(v1->unk_270);
         Windows_Delete(v1->unk_270, 1);
 
-        Bg_ClearTilesRange(BG_LAYER_MAIN_3, 32, 0, HEAP_ID_FIELD);
+        Bg_ClearTilesRange(BG_LAYER_MAIN_3, 32, 0, HEAP_ID_FIELD1);
         Bg_ClearTilemap(v0->fieldSystem->bgConfig, 3);
 
         EncounterEffect_Finish(v0, param0);
@@ -1360,7 +1360,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel(SysTask *param0, void *param1)
 
     switch (v0->state) {
     case 0:
-        v0->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021E3AD0));
+        v0->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021E3AD0));
         memset(v0->param, 0, sizeof(UnkStruct_ov5_021E3AD0));
         v1 = v0->param;
 
@@ -1439,7 +1439,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel(SysTask *param0, void *param1)
         v3 = Camera_GetDistance(v1->camera);
         QuadraticInterpolationTaskFX32_Init(&v1->unk_238, v3, v3 + (-FX32_CONST(1000)), FX32_CONST(10), 8);
 
-        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_18, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_18, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD1);
         v0->state++;
         break;
 
@@ -1486,7 +1486,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel(SysTask *param0, void *param1)
 
     switch (v0->state) {
     case 0:
-        v0->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021E3D8C));
+        v0->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021E3D8C));
         memset(v0->param, 0, sizeof(UnkStruct_ov5_021E3D8C));
         v1 = v0->param;
 
@@ -1505,7 +1505,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel(SysTask *param0, void *param1)
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
-        v1->unk_264 = Window_New(HEAP_ID_FIELD, 1);
+        v1->unk_264 = Window_New(HEAP_ID_FIELD1, 1);
         Window_Add(v0->fieldSystem->bgConfig, v1->unk_264, 3, 0, 0, 32, 32, 0, 0);
 
         {
@@ -1517,7 +1517,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel(SysTask *param0, void *param1)
         Window_FillTilemap(v1->unk_264, 0);
         Window_ScheduleCopyToVRAM(v1->unk_264);
 
-        v1->unk_268 = ov5_021DE8F8(HEAP_ID_FIELD);
+        v1->unk_268 = ov5_021DE8F8(HEAP_ID_FIELD1);
 
         v0->state++;
         break;
@@ -1656,7 +1656,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel(SysTask *param0, void *param1)
         Window_Remove(v1->unk_264);
         Windows_Delete(v1->unk_264, 1);
 
-        Bg_ClearTilesRange(BG_LAYER_MAIN_3, 32, 0, HEAP_ID_FIELD);
+        Bg_ClearTilesRange(BG_LAYER_MAIN_3, 32, 0, HEAP_ID_FIELD1);
         Bg_ClearTilemap(v0->fieldSystem->bgConfig, 3);
 
         EncounterEffect_Finish(v0, param0);
@@ -1712,7 +1712,7 @@ void EncounterEffect_Frontier(SysTask *param0, void *param1)
 
     switch (v0->state) {
     case 0:
-        v0->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021E4260));
+        v0->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021E4260));
         memset(v0->param, 0, sizeof(UnkStruct_ov5_021E4260));
         v1 = v0->param;
 
@@ -1777,7 +1777,7 @@ void EncounterEffect_Frontier(SysTask *param0, void *param1)
         }
 
         HBlankSystem_Stop(v0->fieldSystem->unk_04->hBlankSystem);
-        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         v0->state++;
         break;
 
@@ -1827,7 +1827,7 @@ void EncounterEffect_Double(SysTask *param0, void *param1)
 
     switch (v0->state) {
     case 0:
-        v0->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021E44C0));
+        v0->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021E44C0));
         memset(v0->param, 0, sizeof(UnkStruct_ov5_021E44C0));
         v1 = v0->param;
 
@@ -1901,7 +1901,7 @@ void EncounterEffect_Double(SysTask *param0, void *param1)
     case 5:
 
         HBlankSystem_Stop(v0->fieldSystem->unk_04->hBlankSystem);
-        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_34, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_34, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD1);
         v0->state++;
         break;
 
@@ -1981,7 +1981,7 @@ void EncounterEffect_GalacticGrunt(SysTask *param0, void *param1)
 
     switch (v0->state) {
     case 0:
-        v0->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021E4738));
+        v0->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021E4738));
         memset(v0->param, 0, sizeof(UnkStruct_ov5_021E4738));
         v1 = v0->param;
 
@@ -2061,7 +2061,7 @@ void EncounterEffect_GalacticGrunt(SysTask *param0, void *param1)
 
         HBlankSystem_Stop(v0->fieldSystem->unk_04->hBlankSystem);
 
-        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_34, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 12, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_34, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 12, 1, HEAP_ID_FIELD1);
         v0->state++;
         break;
 
@@ -2127,7 +2127,7 @@ void EncounterEffect_GalacticBoss(SysTask *param0, void *param1)
 
     switch (v0->state) {
     case 0:
-        v0->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021E4B3C));
+        v0->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021E4B3C));
         memset(v0->param, 0, sizeof(UnkStruct_ov5_021E4B3C));
         v1 = v0->param;
 
@@ -2143,9 +2143,9 @@ void EncounterEffect_GalacticBoss(SysTask *param0, void *param1)
         Sprite_SetExplicitPriority(v1->unk_1DC, 1);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
-        v1->unk_04 = ov5_021DEBEC(HEAP_ID_FIELD);
+        v1->unk_04 = ov5_021DEBEC(HEAP_ID_FIELD1);
 
-        v1->unk_00 = Window_New(HEAP_ID_FIELD, 1);
+        v1->unk_00 = Window_New(HEAP_ID_FIELD1, 1);
         Window_Add(v0->fieldSystem->bgConfig, v1->unk_00, 3, 0, 0, 32, 32, 0, 0);
 
         {
@@ -2233,7 +2233,7 @@ void EncounterEffect_GalacticBoss(SysTask *param0, void *param1)
         Window_Remove(v1->unk_00);
         Windows_Delete(v1->unk_00, 1);
 
-        Bg_ClearTilesRange(BG_LAYER_MAIN_3, 32, 0, HEAP_ID_FIELD);
+        Bg_ClearTilesRange(BG_LAYER_MAIN_3, 32, 0, HEAP_ID_FIELD1);
         Bg_ClearTilemap(v0->fieldSystem->bgConfig, 3);
 
         G2_SetOBJMosaicSize(0, 0);
@@ -2405,7 +2405,7 @@ void EncounterEffect_Mythical(SysTask *task, void *param)
 
     switch (encEffect->state) {
     case 0:
-        encEffect->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(MythicalEncounterEffect));
+        encEffect->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(MythicalEncounterEffect));
         memset(encEffect->param, 0, sizeof(MythicalEncounterEffect));
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
@@ -2451,7 +2451,7 @@ void EncounterEffect_Mythical(SysTask *task, void *param)
         break;
 
     case 5:
-        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 10, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 10, 1, HEAP_ID_FIELD1);
         encEffect->state++;
         break;
 
@@ -2488,7 +2488,7 @@ void EncounterEffect_Legendary(SysTask *task, void *param)
 
     switch (encEffect->state) {
     case 0:
-        encEffect->param = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(LegendaryEncounterEffect));
+        encEffect->param = Heap_Alloc(HEAP_ID_FIELD1, sizeof(LegendaryEncounterEffect));
         memset(encEffect->param, 0, sizeof(LegendaryEncounterEffect));
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
@@ -2554,7 +2554,7 @@ void EncounterEffect_Legendary(SysTask *task, void *param)
         break;
 
     case 7:
-        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 60, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 60, 1, HEAP_ID_FIELD1);
         encEffect->state++;
         break;
 
@@ -2879,7 +2879,7 @@ static Strbuf *EncounterEffect_GetGymLeaderName(u32 trainerClass, u32 heapID)
     return result;
 }
 
-static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId heapID, const GymLeaderEncounterParam *param)
+static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapID heapID, const GymLeaderEncounterParam *param)
 {
     UnkStruct_ov5_021E52A8 *v0 = encEffect->param;
     BOOL v1;
@@ -2892,7 +2892,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
 
     switch (encEffect->state) {
     case 0:
-        encEffect->param = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021E52A8));
+        encEffect->param = Heap_Alloc(heapID, sizeof(UnkStruct_ov5_021E52A8));
         memset(encEffect->param, 0, sizeof(UnkStruct_ov5_021E52A8));
         v0 = encEffect->param;
 
@@ -3063,7 +3063,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
 
     case 13:
 
-        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 15, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 15, 1, HEAP_ID_FIELD1);
         encEffect->state++;
         break;
 
@@ -3115,7 +3115,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
 void EncounterEffect_LeaderRoark(SysTask *task, void *param)
 {
     EncounterEffect *encEffect = param;
-    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD, &sGymLeaderEncounterParams[0]);
+    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD1, &sGymLeaderEncounterParams[0]);
 
     if (done == TRUE) {
         EncounterEffect_Finish(encEffect, task);
@@ -3125,7 +3125,7 @@ void EncounterEffect_LeaderRoark(SysTask *task, void *param)
 void EncounterEffect_LeaderGardenia(SysTask *task, void *param)
 {
     EncounterEffect *encEffect = param;
-    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD, &sGymLeaderEncounterParams[1]);
+    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD1, &sGymLeaderEncounterParams[1]);
 
     if (done == TRUE) {
         EncounterEffect_Finish(encEffect, task);
@@ -3135,7 +3135,7 @@ void EncounterEffect_LeaderGardenia(SysTask *task, void *param)
 void EncounterEffect_LeaderWake(SysTask *task, void *param)
 {
     EncounterEffect *encEffect = param;
-    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD, &sGymLeaderEncounterParams[2]);
+    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD1, &sGymLeaderEncounterParams[2]);
 
     if (done == TRUE) {
         EncounterEffect_Finish(encEffect, task);
@@ -3145,7 +3145,7 @@ void EncounterEffect_LeaderWake(SysTask *task, void *param)
 void EncounterEffect_LeaderMaylene(SysTask *task, void *param)
 {
     EncounterEffect *encEffect = param;
-    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD, &sGymLeaderEncounterParams[3]);
+    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD1, &sGymLeaderEncounterParams[3]);
 
     if (done == TRUE) {
         EncounterEffect_Finish(encEffect, task);
@@ -3155,7 +3155,7 @@ void EncounterEffect_LeaderMaylene(SysTask *task, void *param)
 void EncounterEffect_LeaderFantina(SysTask *task, void *param)
 {
     EncounterEffect *encEffect = param;
-    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD, &sGymLeaderEncounterParams[4]);
+    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD1, &sGymLeaderEncounterParams[4]);
 
     if (done == TRUE) {
         EncounterEffect_Finish(encEffect, task);
@@ -3165,7 +3165,7 @@ void EncounterEffect_LeaderFantina(SysTask *task, void *param)
 void EncounterEffect_LeaderCandice(SysTask *task, void *param)
 {
     EncounterEffect *encEffect = param;
-    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD, &sGymLeaderEncounterParams[5]);
+    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD1, &sGymLeaderEncounterParams[5]);
 
     if (done == TRUE) {
         EncounterEffect_Finish(encEffect, task);
@@ -3175,7 +3175,7 @@ void EncounterEffect_LeaderCandice(SysTask *task, void *param)
 void EncounterEffect_LeaderByron(SysTask *task, void *param)
 {
     EncounterEffect *encEffect = param;
-    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD, &sGymLeaderEncounterParams[6]);
+    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD1, &sGymLeaderEncounterParams[6]);
 
     if (done == TRUE) {
         EncounterEffect_Finish(encEffect, task);
@@ -3185,7 +3185,7 @@ void EncounterEffect_LeaderByron(SysTask *task, void *param)
 void EncounterEffect_LeaderVolkner(SysTask *task, void *param)
 {
     EncounterEffect *encEffect = param;
-    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD, &sGymLeaderEncounterParams[7]);
+    BOOL done = EncounterEffect_GymLeader(encEffect, HEAP_ID_FIELD1, &sGymLeaderEncounterParams[7]);
 
     if (done == TRUE) {
         EncounterEffect_Finish(encEffect, task);
@@ -3197,7 +3197,7 @@ static u32 FieldSystem_GetTrainerGender(FieldSystem *fieldSystem)
     return TrainerInfo_Gender(SaveData_GetTrainerInfo(fieldSystem->saveData));
 }
 
-static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum HeapId heapID, const EliterFourChampionEncounterParam *param)
+static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum HeapID heapID, const EliterFourChampionEncounterParam *param)
 {
     UnkStruct_ov5_021E5890 *v0 = encEffect->param;
     BOOL v1, v2;
@@ -3210,7 +3210,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
 
     switch (encEffect->state) {
     case 0:
-        encEffect->param = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021E5890));
+        encEffect->param = Heap_Alloc(heapID, sizeof(UnkStruct_ov5_021E5890));
         memset(encEffect->param, 0, sizeof(UnkStruct_ov5_021E5890));
         v0 = encEffect->param;
 
@@ -3506,7 +3506,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
             QuadraticInterpolationTaskFX32_Init(&v0->unk_00, 0, FX32_CONST(192.0f), FX32_CONST(24.0f), 16);
             QuadraticInterpolationTaskFX32_Init(&v0->unk_18, 0, FX32_CONST(192.0f), FX32_CONST(24.0f), 16);
 
-            StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 8, 1, HEAP_ID_FIELD);
+            StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 8, 1, HEAP_ID_FIELD1);
         }
 
         break;
@@ -3582,7 +3582,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
 void EncounterEffect_EliteFourAaron(SysTask *task, void *param)
 {
     EncounterEffect *encEffect = param;
-    BOOL done = EncounterEffect_EliteFourChampion(encEffect, HEAP_ID_FIELD, &sEliteFourChampionEncounterParams[0]);
+    BOOL done = EncounterEffect_EliteFourChampion(encEffect, HEAP_ID_FIELD1, &sEliteFourChampionEncounterParams[0]);
 
     if (done == TRUE) {
         EncounterEffect_Finish(encEffect, task);
@@ -3592,7 +3592,7 @@ void EncounterEffect_EliteFourAaron(SysTask *task, void *param)
 void EncounterEffect_EliteFourBertha(SysTask *task, void *param)
 {
     EncounterEffect *encEffect = param;
-    BOOL done = EncounterEffect_EliteFourChampion(encEffect, HEAP_ID_FIELD, &sEliteFourChampionEncounterParams[1]);
+    BOOL done = EncounterEffect_EliteFourChampion(encEffect, HEAP_ID_FIELD1, &sEliteFourChampionEncounterParams[1]);
 
     if (done == TRUE) {
         EncounterEffect_Finish(encEffect, task);
@@ -3602,7 +3602,7 @@ void EncounterEffect_EliteFourBertha(SysTask *task, void *param)
 void EncounterEffect_EliteFourFlint(SysTask *task, void *param)
 {
     EncounterEffect *encEffect = param;
-    BOOL done = EncounterEffect_EliteFourChampion(encEffect, HEAP_ID_FIELD, &sEliteFourChampionEncounterParams[2]);
+    BOOL done = EncounterEffect_EliteFourChampion(encEffect, HEAP_ID_FIELD1, &sEliteFourChampionEncounterParams[2]);
 
     if (done == TRUE) {
         EncounterEffect_Finish(encEffect, task);
@@ -3612,7 +3612,7 @@ void EncounterEffect_EliteFourFlint(SysTask *task, void *param)
 void EncounterEffect_EliteFourLucian(SysTask *task, void *param)
 {
     EncounterEffect *encEffect = param;
-    BOOL done = EncounterEffect_EliteFourChampion(encEffect, HEAP_ID_FIELD, &sEliteFourChampionEncounterParams[3]);
+    BOOL done = EncounterEffect_EliteFourChampion(encEffect, HEAP_ID_FIELD1, &sEliteFourChampionEncounterParams[3]);
 
     if (done == TRUE) {
         EncounterEffect_Finish(encEffect, task);
@@ -3622,7 +3622,7 @@ void EncounterEffect_EliteFourLucian(SysTask *task, void *param)
 void EncounterEffect_ChampionCynthia(SysTask *task, void *param)
 {
     EncounterEffect *encEffect = param;
-    BOOL done = EncounterEffect_EliteFourChampion(encEffect, HEAP_ID_FIELD, &sEliteFourChampionEncounterParams[4]);
+    BOOL done = EncounterEffect_EliteFourChampion(encEffect, HEAP_ID_FIELD1, &sEliteFourChampionEncounterParams[4]);
 
     if (done == TRUE) {
         EncounterEffect_Finish(encEffect, task);
diff --git a/src/overlay005/field_camera.c b/src/overlay005/field_camera.c
index 17f1420124..c0d47bcbc9 100644
--- a/src/overlay005/field_camera.c
+++ b/src/overlay005/field_camera.c
@@ -168,14 +168,14 @@ void FieldCamera_Create(const VecFx32 *_target, FieldSystem *fieldSystem, const
 
     GF_ASSERT(configID < NELEMS(sCameraTypes));
 
-    fieldSystem->camera = Camera_Alloc(HEAP_ID_FIELD);
+    fieldSystem->camera = Camera_Alloc(HEAP_ID_FIELD1);
 
     Camera_InitWithTarget(target, config->distance, &config->cameraAngle, config->verticalFov, config->projection, TRUE, fieldSystem->camera);
     Camera_SetAsActive(fieldSystem->camera);
     Camera_SetClipping(config->nearPlaneDist, config->farPlaneDist, fieldSystem->camera);
 
     if (withHistory) {
-        Camera_InitHistory(FIELD_CAMERA_HISTORY_SIZE, FIELD_CAMERA_DELAY, CAMERA_DELAY_Y, HEAP_ID_FIELD, fieldSystem->camera);
+        Camera_InitHistory(FIELD_CAMERA_HISTORY_SIZE, FIELD_CAMERA_DELAY, CAMERA_DELAY_Y, HEAP_ID_FIELD1, fieldSystem->camera);
     }
 }
 
diff --git a/src/overlay005/field_menu.c b/src/overlay005/field_menu.c
index 23405d0fd1..6b5237d34f 100644
--- a/src/overlay005/field_menu.c
+++ b/src/overlay005/field_menu.c
@@ -84,7 +84,7 @@ static void FieldMenuManager_Init(FieldSystem *fieldSystem, FieldMenuManager *me
     int i;
 
     if (messageLoader == NULL) {
-        menuManager->messageLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MENU_ENTRIES, HEAP_ID_FIELD);
+        menuManager->messageLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MENU_ENTRIES, HEAP_ID_FIELD1);
         menuManager->freeMsgLoaderOnDelete = TRUE;
     } else {
         menuManager->messageLoader = messageLoader;
@@ -122,7 +122,7 @@ static void FieldMenuManager_Init(FieldSystem *fieldSystem, FieldMenuManager *me
     }
 
     for (i = 0; i < FIELD_MENU_ENTRIES_MAX; i++) {
-        menuManager->choicesStringsBuffers[i] = Strbuf_Init(80, HEAP_ID_FIELD);
+        menuManager->choicesStringsBuffers[i] = Strbuf_Init(80, HEAP_ID_FIELD1);
     }
 
     *menuManager->selectedOptionPtr = LIST_MENU_NO_SELECTION_YET;
@@ -130,7 +130,7 @@ static void FieldMenuManager_Init(FieldSystem *fieldSystem, FieldMenuManager *me
 
 FieldMenuManager *FieldMenuManager_New(FieldSystem *fieldSystem, u8 anchorX, u8 anchorY, u8 initialCursorPos, u8 canExitWithB, u16 *selectedOptionPtr, StringTemplate *stringTemplate, Window *parentWindow, MessageLoader *messageLoader)
 {
-    FieldMenuManager *menuManager = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(FieldMenuManager));
+    FieldMenuManager *menuManager = Heap_Alloc(HEAP_ID_FIELD1, sizeof(FieldMenuManager));
 
     if (menuManager == NULL) {
         return NULL;
@@ -162,18 +162,18 @@ void FieldMenuManager_ShowSingleColumnMenu(FieldMenuManager *menuManager)
     }
 
     Window_Add(menuManager->fieldSystem->bgConfig, &menuManager->menuWindow, BG_LAYER_MAIN_3, menuManager->anchorX, menuManager->anchorY, menuWidth, menuManager->optionsCount * GLYPH_ROW_TILES_HEIGHT, PLTT_13, ((1 + (10 * 4)) + (10 * 2)));
-    LoadStandardWindowGraphics(menuManager->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(menuManager->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD1);
     Window_DrawStandardFrame(&menuManager->menuWindow, TRUE, 1024 - (18 + 12) - 9, PLTT_11);
 
     FieldMenuManager_SetupSingleColumnMenu(menuManager);
 
-    menuManager->menu = Menu_NewSimple(&menuManager->menuTemplate, menuManager->initialCursorPos, HEAP_ID_FIELD);
+    menuManager->menu = Menu_NewSimple(&menuManager->menuTemplate, menuManager->initialCursorPos, HEAP_ID_FIELD1);
     menuManager->sysTask = SysTask_Start(MenuSysTaskCallback, menuManager, 0);
 }
 
 static void _FieldMenuManager_AddMenuEntry(FieldMenuManager *menuManager, u32 entryID, u32 index)
 {
-    Strbuf *entryBuf = Strbuf_Init(80, HEAP_ID_FIELD);
+    Strbuf *entryBuf = Strbuf_Init(80, HEAP_ID_FIELD1);
 
     MessageLoader_GetStrbuf(menuManager->messageLoader, entryID, entryBuf);
     StringTemplate_Format(menuManager->stringTemplate, menuManager->choicesStringsBuffers[menuManager->optionsCount], entryBuf);
@@ -315,11 +315,11 @@ static void _FieldMenuManager_ShowListMenuWithWidth(FieldMenuManager *menuManage
         Window_Add(menuManager->fieldSystem->bgConfig, &menuManager->menuWindow, BG_LAYER_MAIN_3, menuManager->anchorX, menuManager->anchorY, windowWidth, menuManager->optionsCount * GLYPH_ROW_TILES_HEIGHT, PLTT_13, ((1 + (10 * 4)) + (10 * 2)));
     }
 
-    LoadStandardWindowGraphics(menuManager->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(menuManager->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD1);
     Window_DrawStandardFrame(&menuManager->menuWindow, TRUE, 1024 - (18 + 12) - 9, PLTT_11);
 
     FieldMenuManager_InitListMenuTemplate(menuManager);
-    menuManager->listMenu = ListMenu_New((const ListMenuTemplate *)&menuManager->listMenuTemplate, 0, menuManager->initialCursorPos, HEAP_ID_FIELD);
+    menuManager->listMenu = ListMenu_New((const ListMenuTemplate *)&menuManager->listMenuTemplate, 0, menuManager->initialCursorPos, HEAP_ID_FIELD1);
 
     FieldMenuManager_UpdateListMenuAltText(menuManager);
     menuManager->sysTask = SysTask_Start(ListMenuSysTaskCallback, menuManager, 0);
@@ -337,7 +337,7 @@ void FieldMenuManager_ShowListMenuWithCursorPosition(FieldMenuManager *menuManag
         Window_Add(menuManager->fieldSystem->bgConfig, &menuManager->menuWindow, BG_LAYER_MAIN_3, menuManager->anchorX, menuManager->anchorY, menuWidth, menuManager->optionsCount * GLYPH_ROW_TILES_HEIGHT, PLTT_13, ((1 + (10 * 4)) + (10 * 2)));
     }
 
-    LoadStandardWindowGraphics(menuManager->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(menuManager->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD1);
     Window_DrawStandardFrame(&menuManager->menuWindow, TRUE, 1024 - (18 + 12) - 9, PLTT_11);
 
     FieldMenuManager_InitListMenuTemplate(menuManager);
@@ -345,7 +345,7 @@ void FieldMenuManager_ShowListMenuWithCursorPosition(FieldMenuManager *menuManag
     menuManager->listMenuListOffsetPtr = listOffsetPtr;
     menuManager->listMenuCursorPosPtr = cursorPosPtr;
     menuManager->cursorPos = ((*menuManager->listMenuListOffsetPtr) + (*menuManager->listMenuCursorPosPtr));
-    menuManager->listMenu = ListMenu_New((const ListMenuTemplate *)&menuManager->listMenuTemplate, *listOffsetPtr, *cursorPosPtr, HEAP_ID_FIELD);
+    menuManager->listMenu = ListMenu_New((const ListMenuTemplate *)&menuManager->listMenuTemplate, *listOffsetPtr, *cursorPosPtr, HEAP_ID_FIELD1);
 
     FieldMenuManager_UpdateListMenuAltText(menuManager);
 
@@ -354,7 +354,7 @@ void FieldMenuManager_ShowListMenuWithCursorPosition(FieldMenuManager *menuManag
 
 static void _FieldMenuManager_AddListMenuEntry(FieldMenuManager *menuManager, u32 entryID, u32 altTextStringID, u32 entryIndex)
 {
-    Strbuf *fmtString = Strbuf_Init(80, HEAP_ID_FIELD);
+    Strbuf *fmtString = Strbuf_Init(80, HEAP_ID_FIELD1);
 
     MessageLoader_GetStrbuf(menuManager->messageLoader, entryID, fmtString);
     StringTemplate_Format(menuManager->stringTemplate, menuManager->choicesStringsBuffers[menuManager->optionsCount], fmtString);
@@ -502,8 +502,8 @@ static void FieldMenuManager_DeleteWithListMenu(FieldMenuManager *menuManager)
 
 static void FieldMenuManager_PrintListMenyAltText(FieldMenuManager *menuManager, u16 entryID, u32 printerDelay)
 {
-    Strbuf *v0 = Strbuf_Init(80, HEAP_ID_FIELD);
-    Strbuf *v1 = Strbuf_Init(80, HEAP_ID_FIELD);
+    Strbuf *v0 = Strbuf_Init(80, HEAP_ID_FIELD1);
+    Strbuf *v1 = Strbuf_Init(80, HEAP_ID_FIELD1);
 
     Window_FillTilemap(menuManager->parentWindow, 15);
     MessageLoader_GetStrbuf(menuManager->messageLoader, entryID, v0);
@@ -536,7 +536,7 @@ void FieldMenu_ShowCurrentFloorWindow(FieldSystem *fieldSystem, u8 tilemapLeft,
     }
 
     Window_Add(menuManager->fieldSystem->bgConfig, &menuManager->menuWindow, BG_LAYER_MAIN_3, menuManager->anchorX, menuManager->anchorY, width, CURRENT_FLOOR_WINDOW_HEIGHT, PLTT_13, ((1 + (10 * 4)) + (10 * 2)) + (16 * 10));
-    LoadStandardWindowGraphics(menuManager->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(menuManager->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD1);
     Window_DrawStandardFrame(&menuManager->menuWindow, TRUE, 1024 - (18 + 12) - 9, PLTT_11);
     Window_FillRectWithColor(&menuManager->menuWindow, 15, 0, 0, (width * TILE_SIDELENGTH), (MONEY_WINDOW_HEIGHT * TILE_SIDELENGTH));
 
@@ -550,8 +550,8 @@ void FieldMenu_ShowCurrentFloorWindow(FieldSystem *fieldSystem, u8 tilemapLeft,
 
 static void FieldMenuManager_PrintString(FieldMenuManager *menuManager, u16 entryID, u8 xOffset, u8 yOffset)
 {
-    Strbuf *fmtString = Strbuf_Init(80, HEAP_ID_FIELD);
-    Strbuf *formatted = Strbuf_Init(80, HEAP_ID_FIELD);
+    Strbuf *fmtString = Strbuf_Init(80, HEAP_ID_FIELD1);
+    Strbuf *formatted = Strbuf_Init(80, HEAP_ID_FIELD1);
 
     MessageLoader_GetStrbuf(menuManager->messageLoader, entryID, fmtString);
     StringTemplate_Format(menuManager->stringTemplate, formatted, fmtString);
@@ -660,12 +660,12 @@ void FieldMenuManager_ShowMultiColumnMenu(FieldMenuManager *menuManager, u8 colu
     }
 
     Window_Add(menuManager->fieldSystem->bgConfig, &menuManager->menuWindow, BG_LAYER_MAIN_3, menuManager->anchorX, menuManager->anchorY, (menuWidth * columnsCount), rowsCount * GLYPH_ROW_TILES_HEIGHT, PLTT_13, ((1 + (10 * 4)) + (10 * 2)));
-    LoadStandardWindowGraphics(menuManager->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(menuManager->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD1);
     Window_DrawStandardFrame(&menuManager->menuWindow, TRUE, 1024 - (18 + 12) - 9, PLTT_11);
 
     FieldMenuManager_SetupMultiColumnMenu(menuManager, columnsCount, rowsCount);
 
-    menuManager->menu = Menu_NewSimple(&menuManager->menuTemplate, menuManager->initialCursorPos, HEAP_ID_FIELD);
+    menuManager->menu = Menu_NewSimple(&menuManager->menuTemplate, menuManager->initialCursorPos, HEAP_ID_FIELD1);
     menuManager->sysTask = SysTask_Start(MenuSysTaskCallback, menuManager, 0);
 }
 
@@ -682,14 +682,14 @@ static void FieldMenuManager_SetupMultiColumnMenu(FieldMenuManager *menuManager,
 
 Window *FieldMenu_CreateMoneyWindow(FieldSystem *fieldSystem, u8 tilemapTop, u8 tilemapLeft)
 {
-    Window *window = Window_New(HEAP_ID_FIELD, 1);
+    Window *window = Window_New(HEAP_ID_FIELD1, 1);
 
     Window_Add(fieldSystem->bgConfig, window, BG_LAYER_MAIN_3, tilemapTop, tilemapLeft, MONEY_WINDOW_WIDTH, MONEY_WINDOW_HEIGHT, PLTT_13, 1);
-    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD1);
     Window_DrawStandardFrame(window, TRUE, 1024 - (18 + 12) - 9, PLTT_11);
     Window_FillTilemap(window, 15);
 
-    MessageLoader *messageLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0543, HEAP_ID_FIELD);
+    MessageLoader *messageLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0543, HEAP_ID_FIELD1);
     Strbuf *strbuf = MessageLoader_GetNewStrbuf(messageLoader, pl_msg_00000543_00018);
 
     Text_AddPrinterWithParams(window, FONT_SYSTEM, strbuf, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
@@ -711,9 +711,9 @@ void FieldMenu_PrintMoneyToWindow(FieldSystem *fieldSystem, Window *window)
 {
     Window_FillRectWithColor(window, 15, 0, GLYPH_ROW_HEIGHT, MONEY_WINDOW_WIDTH * TILE_SIDELENGTH, MONEY_WINDOW_HEIGHT * TILE_SIDELENGTH - GLYPH_ROW_HEIGHT);
 
-    MessageLoader *messageLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0543, HEAP_ID_FIELD);
-    StringTemplate *stringTemplate = StringTemplate_Default(HEAP_ID_FIELD);
-    Strbuf *strbuf = Strbuf_Init(16, HEAP_ID_FIELD);
+    MessageLoader *messageLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0543, HEAP_ID_FIELD1);
+    StringTemplate *stringTemplate = StringTemplate_Default(HEAP_ID_FIELD1);
+    Strbuf *strbuf = Strbuf_Init(16, HEAP_ID_FIELD1);
     Strbuf *fmtString = MessageLoader_GetNewStrbuf(messageLoader, pl_msg_00000543_00019);
     u32 money = TrainerInfo_Money(SaveData_GetTrainerInfo(fieldSystem->saveData));
 
@@ -732,10 +732,10 @@ void FieldMenu_PrintMoneyToWindow(FieldSystem *fieldSystem, Window *window)
 
 Window *FieldMenu_DrawCoinWindow(FieldSystem *fieldSystem, u8 tilemapLeft, u8 tilemapTop)
 {
-    Window *window = Window_New(HEAP_ID_FIELD, 1);
+    Window *window = Window_New(HEAP_ID_FIELD1, 1);
 
     Window_Add(fieldSystem->bgConfig, window, BG_LAYER_MAIN_3, tilemapLeft, tilemapTop, COIN_BP_WINDOW_WIDTH, COIN_BP_WINDOW_HEIGHT, PLTT_13, (1 + (10 * 4)));
-    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD1);
     Window_DrawStandardFrame(window, TRUE, 1024 - (18 + 12) - 9, PLTT_11);
 
     FieldMenu_PrintCoinsToWindow(fieldSystem, window);
@@ -753,9 +753,9 @@ void FieldMenu_PrintCoinsToWindow(FieldSystem *fieldSystem, Window *window)
 {
     Window_FillTilemap(window, 15);
 
-    MessageLoader *messageLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MENU_ENTRIES, HEAP_ID_FIELD);
-    StringTemplate *stringTemplate = StringTemplate_Default(HEAP_ID_FIELD);
-    Strbuf *strbuf = Strbuf_Init(16, HEAP_ID_FIELD);
+    MessageLoader *messageLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MENU_ENTRIES, HEAP_ID_FIELD1);
+    StringTemplate *stringTemplate = StringTemplate_Default(HEAP_ID_FIELD1);
+    Strbuf *strbuf = Strbuf_Init(16, HEAP_ID_FIELD1);
     Strbuf *fmtString = MessageLoader_GetNewStrbuf(messageLoader, pl_msg_00000361_00197);
     u32 coins = Coins_GetValue(SaveData_GetCoins(fieldSystem->saveData));
 
@@ -774,10 +774,10 @@ void FieldMenu_PrintCoinsToWindow(FieldSystem *fieldSystem, Window *window)
 
 Window *FieldMenu_DrawBPWindow(FieldSystem *fieldSystem, u8 tilemapLeft, u8 tilemapTop)
 {
-    Window *window = Window_New(HEAP_ID_FIELD, 1);
+    Window *window = Window_New(HEAP_ID_FIELD1, 1);
 
     Window_Add(fieldSystem->bgConfig, window, BG_LAYER_MAIN_3, tilemapLeft, tilemapTop, COIN_BP_WINDOW_WIDTH, COIN_BP_WINDOW_HEIGHT, PLTT_13, (1 + (10 * 4)));
-    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD1);
     Window_DrawStandardFrame(window, TRUE, 1024 - (18 + 12) - 9, PLTT_11);
 
     FieldMenu_PrintBPToWindow(fieldSystem, window);
@@ -789,9 +789,9 @@ void FieldMenu_PrintBPToWindow(FieldSystem *fieldSystem, Window *window)
 {
     Window_FillTilemap(window, 15);
 
-    MessageLoader *messageLaoder = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MENU_ENTRIES, HEAP_ID_FIELD);
-    StringTemplate *stringTemplate = StringTemplate_Default(HEAP_ID_FIELD);
-    Strbuf *strbuf = Strbuf_Init(16, HEAP_ID_FIELD);
+    MessageLoader *messageLaoder = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MENU_ENTRIES, HEAP_ID_FIELD1);
+    StringTemplate *stringTemplate = StringTemplate_Default(HEAP_ID_FIELD1);
+    Strbuf *strbuf = Strbuf_Init(16, HEAP_ID_FIELD1);
     Strbuf *fmtString = MessageLoader_GetNewStrbuf(messageLaoder, pl_msg_00000361_00230);
     u16 battlePoints = sub_0202D230(sub_0202D750(fieldSystem->saveData), 0, 0);
 
@@ -813,7 +813,7 @@ FieldMenuManager *FieldMenuManager_NewMoveTutorCostWindow(FieldSystem *fieldSyst
     FieldMenuManager *menuManager = FieldMenuManager_New(fieldSystem, anchorX, anchorY, 0, FALSE, selectedOptionPtr, stringTemplate, NULL, NULL);
 
     Window_Add(menuManager->fieldSystem->bgConfig, &menuManager->menuWindow, BG_LAYER_MAIN_3, menuManager->anchorX, menuManager->anchorY, SHARD_COST_WINDOW_WIDTH, SHARD_COST_WINDOW_HEIGHT, PLTT_13, ((1 + (10 * 4)) + (10 * 2)));
-    LoadStandardWindowGraphics(menuManager->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(menuManager->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, PLTT_11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD1);
     Window_DrawStandardFrame(&menuManager->menuWindow, TRUE, 1024 - (18 + 12) - 9, PLTT_11);
     Window_FillRectWithColor(&menuManager->menuWindow, 15, 0, 0, (SHARD_COST_WINDOW_WIDTH * TILE_SIDELENGTH), (SHARD_COST_WINDOW_HEIGHT * TILE_SIDELENGTH));
 
diff --git a/src/overlay005/field_motion_blur.c b/src/overlay005/field_motion_blur.c
index 29d80a57bb..db5395c612 100644
--- a/src/overlay005/field_motion_blur.c
+++ b/src/overlay005/field_motion_blur.c
@@ -20,7 +20,7 @@ FieldMotionBlur *FieldMotionBlur_Start(int coeffA, int coeffB)
 
     GX_ResetBankForBG();
 
-    fieldMotionBlur = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(FieldMotionBlur));
+    fieldMotionBlur = Heap_Alloc(HEAP_ID_FIELD1, sizeof(FieldMotionBlur));
     MI_CpuClear32(fieldMotionBlur, sizeof(FieldMotionBlur));
 
     {
@@ -52,5 +52,5 @@ void FieldMotionBlur_Stop(FieldMotionBlur **fieldMotionBlur)
     MotionBlur_Delete(&(*fieldMotionBlur)->motionBlur, GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D);
     GX_SetBankForBG(GX_VRAM_BG_128_C);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3, 1);
-    Heap_FreeExplicit(HEAP_ID_FIELD, *fieldMotionBlur);
+    Heap_FreeExplicit(HEAP_ID_FIELD1, *fieldMotionBlur);
 }
diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c
index ed802598de..3d59a79bb0 100644
--- a/src/overlay005/fieldmap.c
+++ b/src/overlay005/fieldmap.c
@@ -180,24 +180,24 @@ static BOOL FieldMap_Init(ApplicationManager *appMan, int *param1)
             }
         }
 
-        Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_FIELD, fieldSystem->mapLoadMode->unk_04);
+        Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_FIELD1, fieldSystem->mapLoadMode->unk_04);
         GF_ASSERT(fieldSystem->unk_04 == NULL);
 
-        fieldSystem->unk_04 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(FieldSystem_sub2));
+        fieldSystem->unk_04 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(FieldSystem_sub2));
         MI_CpuClear8(fieldSystem->unk_04, sizeof(FieldSystem_sub2));
-        fieldSystem->unk_04->unk_04 = ov5_021D1A94(fieldSystem, HEAP_ID_FIELD, 8);
+        fieldSystem->unk_04->unk_04 = ov5_021D1A94(fieldSystem, HEAP_ID_FIELD1, 8);
 
         ov5_021D1414();
 
-        VramTransfer_New(128, HEAP_ID_FIELD);
-        sub_02020B90(4, HEAP_ID_FIELD);
-        Easy3D_Init(HEAP_ID_FIELD);
+        VramTransfer_New(128, HEAP_ID_FIELD1);
+        sub_02020B90(4, HEAP_ID_FIELD1);
+        Easy3D_Init(HEAP_ID_FIELD1);
 
         ov5_021D15B4();
         ov5_021D154C();
 
         GXLayers_SwapDisplay();
-        fieldSystem->bgConfig = BgConfig_New(HEAP_ID_FIELD);
+        fieldSystem->bgConfig = BgConfig_New(HEAP_ID_FIELD1);
         ov5_021D1444(fieldSystem->bgConfig);
         FieldMessage_LoadTextPalettes(PAL_LOAD_MAIN_BG, TRUE);
         FieldSystem_RunInitScript(fieldSystem, INIT_SCRIPT_TYPE_FIXED_UNK_4);
@@ -206,7 +206,7 @@ static BOOL FieldMap_Init(ApplicationManager *appMan, int *param1)
         ov5_021D1790(fieldSystem);
         AreaDataManager_Load(fieldSystem->areaDataManager);
 
-        fieldSystem->mapPropManager = MapPropManager_New(HEAP_ID_FIELD);
+        fieldSystem->mapPropManager = MapPropManager_New(HEAP_ID_FIELD1);
 
         ov5_021F0824(fieldSystem);
         ov5_021D17EC(fieldSystem);
@@ -221,9 +221,9 @@ static BOOL FieldMap_Init(ApplicationManager *appMan, int *param1)
         sub_020556A0(fieldSystem, fieldSystem->location->mapId);
         FieldSystem_RunInitScript(fieldSystem, INIT_SCRIPT_TYPE_FIXED_UNK_3);
 
-        fieldSystem->unk_04->hBlankSystem = HBlankSystem_New(HEAP_ID_FIELD);
+        fieldSystem->unk_04->hBlankSystem = HBlankSystem_New(HEAP_ID_FIELD1);
         HBlankSystem_Start(fieldSystem->unk_04->hBlankSystem);
-        fieldSystem->unk_04->unk_20 = ov5_021EF4BC(HEAP_ID_FIELD, fieldSystem->unk_04->hBlankSystem);
+        fieldSystem->unk_04->unk_20 = ov5_021EF4BC(HEAP_ID_FIELD1, fieldSystem->unk_04->hBlankSystem);
         break;
     case 2:
         ov5_021D5BD8(fieldSystem);
@@ -340,7 +340,7 @@ static BOOL FieldMap_Exit(ApplicationManager *appMan, int *param1)
 
             fieldSystem->unk_04 = NULL;
 
-            Heap_Destroy(HEAP_ID_FIELD);
+            Heap_Destroy(HEAP_ID_FIELD1);
 
             if (fieldSystem->mapLoadMode->unk_00_20) {
                 Overlay_UnloadByID(FS_OVERLAY_ID(overlay6));
@@ -581,7 +581,7 @@ static void ov5_021D1444(BgConfig *bgl)
         };
 
         Bg_InitFromTemplate(bgl, BG_LAYER_MAIN_1, &v1, 0);
-        Bg_ClearTilesRange(BG_LAYER_MAIN_1, 32, 0, HEAP_ID_FIELD);
+        Bg_ClearTilesRange(BG_LAYER_MAIN_1, 32, 0, HEAP_ID_FIELD1);
         Bg_ClearTilemap(bgl, BG_LAYER_MAIN_1);
     }
 
@@ -602,7 +602,7 @@ static void ov5_021D1444(BgConfig *bgl)
         };
 
         Bg_InitFromTemplate(bgl, BG_LAYER_MAIN_2, &v2, 0);
-        Bg_ClearTilesRange(BG_LAYER_MAIN_2, 32, 0, HEAP_ID_FIELD);
+        Bg_ClearTilesRange(BG_LAYER_MAIN_2, 32, 0, HEAP_ID_FIELD1);
         Bg_ClearTilemap(bgl, BG_LAYER_MAIN_2);
     }
     {
@@ -622,7 +622,7 @@ static void ov5_021D1444(BgConfig *bgl)
         };
 
         Bg_InitFromTemplate(bgl, BG_LAYER_MAIN_3, &v3, 0);
-        Bg_ClearTilesRange(BG_LAYER_MAIN_3, 32, 0, HEAP_ID_FIELD);
+        Bg_ClearTilesRange(BG_LAYER_MAIN_3, 32, 0, HEAP_ID_FIELD1);
         Bg_ClearTilemap(bgl, BG_LAYER_MAIN_3);
     }
 
@@ -672,7 +672,7 @@ void ov5_021D15B4(void)
         CharTransfer_InitWithVramModes(&v0, GX_OBJVRAMMODE_CHAR_1D_32K, GX_OBJVRAMMODE_CHAR_1D_32K);
     }
 
-    PlttTransfer_Init(20, HEAP_ID_FIELD);
+    PlttTransfer_Init(20, HEAP_ID_FIELD1);
     CharTransfer_ClearBuffers();
     PlttTransfer_Clear();
 }
@@ -762,9 +762,9 @@ static void ov5_021D173C(FieldSystem *fieldSystem)
 void ov5_021D1744(const u8 param0)
 {
     if (param0 == 1) {
-        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
     } else if (param0 == 0) {
-        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
     } else {
         GF_ASSERT(FALSE);
     }
@@ -804,7 +804,7 @@ static void ov5_021D17EC(FieldSystem *fieldSystem)
         LandDataManager_SetSkipMapProps(fieldSystem->landDataMan, TRUE);
     }
 
-    fieldSystem->dynamicTerrainHeightMan = DynamicTerrainHeightManager_New(8, HEAP_ID_FIELD);
+    fieldSystem->dynamicTerrainHeightMan = DynamicTerrainHeightManager_New(8, HEAP_ID_FIELD1);
     fieldSystem->unk_A8 = HoneyTree_ShakeDataInit();
 
     if (fieldSystem->mapLoadType == MAP_LOAD_TYPE_OVERWORLD) {
@@ -816,7 +816,7 @@ static void ov5_021D17EC(FieldSystem *fieldSystem)
 
 static void ov5_021D1878(FieldSystem *fieldSystem)
 {
-    fieldSystem->unk_40 = ov5_021DF440(fieldSystem, 34, HEAP_ID_FIELD);
+    fieldSystem->unk_40 = ov5_021DF440(fieldSystem, 34, HEAP_ID_FIELD1);
 
     {
         int v0 = 80;
@@ -828,7 +828,7 @@ static void ov5_021D1878(FieldSystem *fieldSystem)
         ov5_021DF47C(fieldSystem->unk_40, v0);
     }
 
-    ov5_021DF488(fieldSystem->unk_40, HEAP_ID_FIELD, 32, 32, 32, 32, 0x500 * (32 / 2), 0x80 * (32 / 2), 0x800 * 32);
+    ov5_021DF488(fieldSystem->unk_40, HEAP_ID_FIELD1, 32, 32, 32, 32, 0x500 * (32 / 2), 0x80 * (32 / 2), 0x800 * 32);
 
     if ((fieldSystem->mapLoadType == MAP_LOAD_TYPE_UNDERGROUND) || (fieldSystem->mapLoadType == MAP_LOAD_TYPE_UNION)) {
         MapObjectMan_SetEndMovement(fieldSystem->mapObjMan, 0);
@@ -899,7 +899,7 @@ static void ov5_021D1968(FieldSystem *fieldSystem)
     }
 
     fieldSystem->unk_04->unk_08 = MapNamePopUp_Create(fieldSystem->bgConfig);
-    fieldSystem->signpost = Signpost_Init(HEAP_ID_FIELD);
+    fieldSystem->signpost = Signpost_Init(HEAP_ID_FIELD1);
     fieldSystem->unk_04->unk_10 = ov5_021D5CB0();
 
     ov5_021D5CE4(fieldSystem->unk_04->unk_10, AreaDataManager_GetMapTexture(fieldSystem->areaDataManager));
@@ -912,7 +912,7 @@ static UnkStruct_ov5_021D1A68 *ov5_021D1A14(int fieldSystem, int param1)
 {
     int v0;
     u16 *v1;
-    UnkStruct_ov5_021D1A68 *v2 = Heap_AllocFromHeap(fieldSystem, sizeof(UnkStruct_ov5_021D1A68));
+    UnkStruct_ov5_021D1A68 *v2 = Heap_Alloc(fieldSystem, sizeof(UnkStruct_ov5_021D1A68));
     v1 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__MM_LIST__MOVE_MODEL_LIST, param1, fieldSystem);
 
     for (v0 = 0; v0 < 24; v0++) {
diff --git a/src/overlay005/fishing.c b/src/overlay005/fishing.c
index c5ffe7e86e..c0a75aebba 100644
--- a/src/overlay005/fishing.c
+++ b/src/overlay005/fishing.c
@@ -108,7 +108,7 @@ const int sRodTypeHookTimingWindow[];
 
 void *FishingContext_Init(FieldSystem *fieldSystem, u32 heapID, enum EncounterFishingRodType rodType)
 {
-    FishingContext *fishingContext = Heap_AllocFromHeapAtEnd(heapID, sizeof(FishingContext));
+    FishingContext *fishingContext = Heap_AllocAtEnd(heapID, sizeof(FishingContext));
 
     memset(fishingContext, 0, sizeof(FishingContext));
 
@@ -486,7 +486,7 @@ static BOOL (*const sFishingActions[])(FishingTask *, PlayerAvatar *, MapObject
 
 static void *FishingTask_New(u32 fishingTaskSize)
 {
-    void *fishingTask = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, fishingTaskSize);
+    void *fishingTask = Heap_AllocAtEnd(HEAP_ID_FIELD1, fishingTaskSize);
 
     GF_ASSERT(fishingTask != NULL);
     memset(fishingTask, 0, fishingTaskSize);
@@ -514,10 +514,10 @@ static int TryPressAOrB(void)
 
 static void FishingTask_Init(FishingTask *fishingTask)
 {
-    fishingTask->messageLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_COMMON_STRINGS, HEAP_ID_FIELD);
-    fishingTask->formattedFishingMessage = Strbuf_Init(0x400, HEAP_ID_FIELD);
-    fishingTask->fishingMessage = Strbuf_Init(0x400, HEAP_ID_FIELD);
-    fishingTask->strTemplate = StringTemplate_New(8, 64, HEAP_ID_FIELD);
+    fishingTask->messageLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_COMMON_STRINGS, HEAP_ID_FIELD1);
+    fishingTask->formattedFishingMessage = Strbuf_Init(0x400, HEAP_ID_FIELD1);
+    fishingTask->fishingMessage = Strbuf_Init(0x400, HEAP_ID_FIELD1);
+    fishingTask->strTemplate = StringTemplate_New(8, 64, HEAP_ID_FIELD1);
 }
 
 static void FishingTask_Free(FishingTask *fishingTask)
diff --git a/src/overlay005/hblank_system.c b/src/overlay005/hblank_system.c
index 20367583e6..c888950fb2 100644
--- a/src/overlay005/hblank_system.c
+++ b/src/overlay005/hblank_system.c
@@ -12,9 +12,9 @@ static void HBlankSystem_HBlankCallback(void *param);
 static void HBlankTask_DummyCallback(HBlankTask *task, void *param);
 static HBlankTask *HBlankSystem_GetAvailableTask(HBlankSystem *hBlankSystem);
 
-HBlankSystem *HBlankSystem_New(enum HeapId heapID)
+HBlankSystem *HBlankSystem_New(enum HeapID heapID)
 {
-    HBlankSystem *hBlankSystem = Heap_AllocFromHeap(heapID, sizeof(HBlankSystem));
+    HBlankSystem *hBlankSystem = Heap_Alloc(heapID, sizeof(HBlankSystem));
     HBlankSystem_Init(hBlankSystem);
 
     return hBlankSystem;
diff --git a/src/overlay005/honey_tree.c b/src/overlay005/honey_tree.c
index 43461a7eef..230cdafa1d 100644
--- a/src/overlay005/honey_tree.c
+++ b/src/overlay005/honey_tree.c
@@ -77,7 +77,7 @@ static const int sEncounterTableIndexes_P_Unused[] = {
 
 HoneyTreeShakeList *HoneyTree_ShakeDataInit(void)
 {
-    HoneyTreeShakeList *data = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(HoneyTreeShakeList));
+    HoneyTreeShakeList *data = Heap_Alloc(HEAP_ID_FIELD1, sizeof(HoneyTreeShakeList));
 
     for (u8 i = 0; i < NUM_HONEY_TREES; i++) {
         data->trees[i].shakeValue = 0;
@@ -452,9 +452,9 @@ int HoneyTree_GetSpecies(FieldSystem *fieldSystem)
     HoneyTree *tree = SpecialEncounter_GetHoneyTree(treeId, treeDat);
 
     if ((GAME_VERSION == VERSION_DIAMOND) || (GAME_VERSION == VERSION_PLATINUM)) {
-        narcData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, sEncounterTableIndexes_DPt[tree->encounterTableIndex], HEAP_ID_FIELD);
+        narcData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, sEncounterTableIndexes_DPt[tree->encounterTableIndex], HEAP_ID_FIELD1);
     } else {
-        narcData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, sEncounterTableIndexes_P_Unused[tree->encounterTableIndex], HEAP_ID_FIELD);
+        narcData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, sEncounterTableIndexes_P_Unused[tree->encounterTableIndex], HEAP_ID_FIELD1);
     }
 
     species = narcData[tree->encounterSlot];
diff --git a/src/overlay005/land_data.c b/src/overlay005/land_data.c
index 1b47a2e623..c733e0d21c 100644
--- a/src/overlay005/land_data.c
+++ b/src/overlay005/land_data.c
@@ -385,7 +385,7 @@ static void LandData_CalculateLoadedMapMatrixIndexes(const BOOL inDistortionWorl
 static void LandDataManager_NewLoadedMaps(LandDataManager *landDataMan)
 {
     for (u8 i = 0; i < QUADRANT_COUNT; i++) {
-        LoadedMap *loadedMap = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(LoadedMap));
+        LoadedMap *loadedMap = Heap_Alloc(HEAP_ID_FIELD1, sizeof(LoadedMap));
         landDataMan->loadedMaps[i] = loadedMap;
         landDataMan->loadedMaps[i]->valid = FALSE;
 
@@ -393,7 +393,7 @@ static void LandDataManager_NewLoadedMaps(LandDataManager *landDataMan)
         LoadedMapBuffers_GetBDHCFileBufPtr(i, landDataMan->loadedMapBufs, (void **)&landDataMan->loadedMaps[i]->bdhcFile);
 
         if (landDataMan->skipMapProps == FALSE) {
-            landDataMan->loadedMaps[i]->mapPropManager = MapPropManager_New(HEAP_ID_FIELD);
+            landDataMan->loadedMaps[i]->mapPropManager = MapPropManager_New(HEAP_ID_FIELD1);
         } else {
             landDataMan->loadedMaps[i]->mapPropManager = NULL;
         }
@@ -406,12 +406,12 @@ static void LandDataManager_NewLoadedMaps(LandDataManager *landDataMan)
 void LandDataManager_DistortionWorldNewLoadedMapsWithoutAttributesAndModel(LandDataManager *landDataMan)
 {
     for (u8 i = 0; i < QUADRANT_COUNT; i++) {
-        LoadedMap *loadedMap = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(LoadedMap));
+        LoadedMap *loadedMap = Heap_Alloc(HEAP_ID_FIELD1, sizeof(LoadedMap));
         landDataMan->loadedMaps[i] = loadedMap;
         landDataMan->loadedMaps[i]->valid = FALSE;
 
         if (landDataMan->skipMapProps == FALSE) {
-            landDataMan->loadedMaps[i]->mapPropManager = MapPropManager_New(HEAP_ID_FIELD);
+            landDataMan->loadedMaps[i]->mapPropManager = MapPropManager_New(HEAP_ID_FIELD1);
         } else {
             landDataMan->loadedMaps[i]->mapPropManager = NULL;
         }
@@ -423,14 +423,14 @@ void LandDataManager_DistortionWorldNewLoadedMapsWithoutAttributesAndModel(LandD
 static void LandDataManager_NewLoadedMapsWithoutAttributes(LandDataManager *landDataMan)
 {
     for (u8 i = 0; i < QUADRANT_COUNT; i++) {
-        LoadedMap *loadedMap = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(LoadedMap));
+        LoadedMap *loadedMap = Heap_Alloc(HEAP_ID_FIELD1, sizeof(LoadedMap));
         landDataMan->loadedMaps[i] = loadedMap;
         landDataMan->loadedMaps[i]->valid = FALSE;
 
         LoadedMapBuffers_GetMapModelFileBufPtr(i, landDataMan->loadedMapBufs, (void **)&landDataMan->loadedMaps[i]->mapModelFile);
 
         if (landDataMan->skipMapProps == FALSE) {
-            landDataMan->loadedMaps[i]->mapPropManager = MapPropManager_New(HEAP_ID_FIELD);
+            landDataMan->loadedMaps[i]->mapPropManager = MapPropManager_New(HEAP_ID_FIELD1);
         } else {
             landDataMan->loadedMaps[i]->mapPropManager = NULL;
         }
@@ -459,11 +459,11 @@ static void LandDataHeader_Load(NARC *landDataNARC, const int landDataID, LandDa
     int bufferSize = sizeof(LandDataHeader);
 
     if (landDataNARC != NULL) {
-        buffer = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, bufferSize);
+        buffer = Heap_AllocAtEnd(HEAP_ID_FIELD1, bufferSize);
         NARC_ReadFromMember(landDataNARC, landDataID, 0, bufferSize, buffer);
     } else {
         GF_ASSERT(FALSE);
-        buffer = NARC_AllocAtEndAndReadFromMemberByIndexPair(NARC_INDEX_FIELDDATA__LAND_DATA__LAND_DATA, landDataID, HEAP_ID_FIELD, 0, bufferSize);
+        buffer = NARC_AllocAtEndAndReadFromMemberByIndexPair(NARC_INDEX_FIELDDATA__LAND_DATA__LAND_DATA, landDataID, HEAP_ID_FIELD1, 0, bufferSize);
     }
 
     int *iter = (int *)buffer;
@@ -1577,7 +1577,7 @@ LandDataManager *LandDataManager_New(MapMatrix *mapMatrix, AreaDataManager *area
 {
     BOOL allocBDHCFiles;
 
-    LandDataManager *landDataMan = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(LandDataManager));
+    LandDataManager *landDataMan = Heap_Alloc(HEAP_ID_FIELD1, sizeof(LandDataManager));
     MI_CpuClear8(landDataMan, sizeof(LandDataManager));
 
     if (skipAttributes == FALSE) {
@@ -1603,7 +1603,7 @@ LandDataManager *LandDataManager_New(MapMatrix *mapMatrix, AreaDataManager *area
 
     landDataMan->ending = FALSE;
     landDataMan->lazyLoaderSubTask = LAZY_LOADER_SUBTASK_IDLE;
-    landDataMan->landDataNARC = NARC_ctor(NARC_INDEX_FIELDDATA__LAND_DATA__LAND_DATA, HEAP_ID_FIELD);
+    landDataMan->landDataNARC = NARC_ctor(NARC_INDEX_FIELDDATA__LAND_DATA__LAND_DATA, HEAP_ID_FIELD1);
     landDataMan->mapLoadedCb = NULL;
 
     return landDataMan;
@@ -1956,7 +1956,7 @@ static void LandDataManager_LazyLoadMapModelTask(SysTask *sysTask, void *sysTask
 
 SysTask *LandDataManager_LazyLoadMapModel(NARC *landDataNARC, const int mapModelDataSize, NNSG3dRenderObj *mapRenderObj, NNSG3dResFileHeader **mapModelFile, NNSG3dResTex *mapTexture, BOOL *loadedMapValid, BOOL *loadTaskRunning)
 {
-    MapModelLoaderTaskContext *ctx = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(MapModelLoaderTaskContext));
+    MapModelLoaderTaskContext *ctx = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(MapModelLoaderTaskContext));
 
     ctx->landDataNARC = landDataNARC;
     ctx->mapModelDataSize = mapModelDataSize;
@@ -2001,7 +2001,7 @@ NARC *LandDataManager_GetLandDataNARC(LandDataManager *landDataMan)
 
 LandDataManager *LandDataManager_DistortionWorldNew(MapMatrix *mapMatrix, AreaDataManager *areaDataMan, NARC *landDataNARC)
 {
-    LandDataManager *landDataMan = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(LandDataManager));
+    LandDataManager *landDataMan = Heap_Alloc(HEAP_ID_FIELD1, sizeof(LandDataManager));
     MI_CpuClear8(landDataMan, sizeof(LandDataManager));
 
     landDataMan->loadedMapBufs = LoadedMapBuffers_NewWithHeapMapModelFiles(FALSE);
@@ -2021,7 +2021,7 @@ LandDataManager *LandDataManager_DistortionWorldNew(MapMatrix *mapMatrix, AreaDa
     landDataMan->landDataNARC = landDataNARC;
 
     if (landDataNARC == NULL) {
-        landDataMan->landDataNARC = NARC_ctor(NARC_INDEX_FIELDDATA__LAND_DATA__LAND_DATA, HEAP_ID_FIELD);
+        landDataMan->landDataNARC = NARC_ctor(NARC_INDEX_FIELDDATA__LAND_DATA__LAND_DATA, HEAP_ID_FIELD1);
     }
 
     return landDataMan;
@@ -2043,7 +2043,7 @@ void LandDataManager_DistortionWorldInit(LandDataManager *landDataMan, MapMatrix
     landDataMan->landDataNARC = landDataNARC;
 
     if (landDataNARC == NULL) {
-        landDataMan->landDataNARC = NARC_ctor(NARC_INDEX_FIELDDATA__LAND_DATA__LAND_DATA, HEAP_ID_FIELD);
+        landDataMan->landDataNARC = NARC_ctor(NARC_INDEX_FIELDDATA__LAND_DATA__LAND_DATA, HEAP_ID_FIELD1);
     }
 }
 
diff --git a/src/overlay005/loaded_map_buffers.c b/src/overlay005/loaded_map_buffers.c
index 9b0d6e7404..51fce72146 100644
--- a/src/overlay005/loaded_map_buffers.c
+++ b/src/overlay005/loaded_map_buffers.c
@@ -21,7 +21,7 @@ static u8 sGlobalMapModelFiles[LOADED_MAP_BUFFERS_FILE_COUNT][MAP_MODEL_FILE_SIZ
 
 LoadedMapBuffers *LoadedMapBuffers_New(const BOOL allocBDHCFiles)
 {
-    LoadedMapBuffers *buffers = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(LoadedMapBuffers));
+    LoadedMapBuffers *buffers = Heap_Alloc(HEAP_ID_FIELD1, sizeof(LoadedMapBuffers));
 
     memset(buffers, 0, sizeof(LoadedMapBuffers));
     buffers->mapModelAllocType = LOADED_MAP_BUFFERS_ALLOC_STATIC;
@@ -40,7 +40,7 @@ LoadedMapBuffers *LoadedMapBuffers_New(const BOOL allocBDHCFiles)
         }
 
         if (allocBDHCFiles) {
-            buffers->bdhcFiles[i] = Heap_AllocFromHeap(HEAP_ID_FIELD, BDHC_BUFFER_SIZE);
+            buffers->bdhcFiles[i] = Heap_Alloc(HEAP_ID_FIELD1, BDHC_BUFFER_SIZE);
 
             if (buffers->bdhcFiles[i] == NULL) {
                 return NULL;
@@ -98,7 +98,7 @@ static void LoadedMapBuffers_InitFileBuffers(const u8 index, const int mapModelF
 
 LoadedMapBuffers *LoadedMapBuffers_NewWithHeapMapModelFiles(const BOOL allocBDHCFiles)
 {
-    LoadedMapBuffers *buffers = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(LoadedMapBuffers));
+    LoadedMapBuffers *buffers = Heap_Alloc(HEAP_ID_FIELD1, sizeof(LoadedMapBuffers));
 
     memset(buffers, 0, sizeof(LoadedMapBuffers));
     buffers->mapModelAllocType = LOADED_MAP_BUFFERS_ALLOC_HEAP;
@@ -108,11 +108,11 @@ LoadedMapBuffers *LoadedMapBuffers_NewWithHeapMapModelFiles(const BOOL allocBDHC
     }
 
     for (u32 i = 0; i < LOADED_MAP_BUFFERS_FILE_COUNT; i++) {
-        buffers->mapModelFiles[i] = Heap_AllocFromHeap(HEAP_ID_FIELD, MAP_MODEL_FILE_SIZE);
+        buffers->mapModelFiles[i] = Heap_Alloc(HEAP_ID_FIELD1, MAP_MODEL_FILE_SIZE);
         MI_CpuClear8(buffers->mapModelFiles[i], MAP_MODEL_FILE_SIZE);
 
         if (allocBDHCFiles == TRUE) {
-            buffers->bdhcFiles[i] = Heap_AllocFromHeap(HEAP_ID_FIELD, BDHC_BUFFER_SIZE);
+            buffers->bdhcFiles[i] = Heap_Alloc(HEAP_ID_FIELD1, BDHC_BUFFER_SIZE);
             MI_CpuClear8(buffers->bdhcFiles[i], BDHC_BUFFER_SIZE);
         }
     }
diff --git a/src/overlay005/map_name_popup.c b/src/overlay005/map_name_popup.c
index 3706623e0d..2282606750 100644
--- a/src/overlay005/map_name_popup.c
+++ b/src/overlay005/map_name_popup.c
@@ -72,9 +72,9 @@ static void MapNamePopUp_LoadAreaGfx(MapNamePopUp *mapPopUp, u8 bgLayer, u16 til
     NNSG2dPaletteData *paletteData;
     u8 narcMemberIdx = mapPopUp->windowID * 2;
 
-    mapPopUp->tiles = Graphics_GetCharData(NARC_INDEX_ARC__AREA_WIN_GRA, narcMemberIdx, FALSE, &mapPopUp->unk_34, HEAP_ID_FIELD);
+    mapPopUp->tiles = Graphics_GetCharData(NARC_INDEX_ARC__AREA_WIN_GRA, narcMemberIdx, FALSE, &mapPopUp->unk_34, HEAP_ID_FIELD1);
     Bg_LoadTiles(mapPopUp->bgConfig, bgLayer, mapPopUp->unk_34->pRawData, mapPopUp->unk_34->szByte, tileStart);
-    ptr = Graphics_GetPlttData(NARC_INDEX_ARC__AREA_WIN_GRA, narcMemberIdx + 1, &paletteData, HEAP_ID_FIELD);
+    ptr = Graphics_GetPlttData(NARC_INDEX_ARC__AREA_WIN_GRA, narcMemberIdx + 1, &paletteData, HEAP_ID_FIELD1);
 
     MapNamePopUp_LoadPalette(paletteData->pRawData, 1, offset);
     Heap_Free(ptr);
@@ -227,13 +227,13 @@ static void MapNamePopUp_StartSlideOut(MapNamePopUp *mapPopUp)
 
 MapNamePopUp *MapNamePopUp_Create(BgConfig *bgConfig)
 {
-    MapNamePopUp *mapPopUp = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(MapNamePopUp));
-    mapPopUp->strbuf = Strbuf_Init(22, HEAP_ID_FIELD);
+    MapNamePopUp *mapPopUp = Heap_Alloc(HEAP_ID_FIELD1, sizeof(MapNamePopUp));
+    mapPopUp->strbuf = Strbuf_Init(22, HEAP_ID_FIELD1);
 
     MapNamePopUp_SetBgConfig(mapPopUp, bgConfig);
     MapNamePopUp_CreateWindow(mapPopUp);
 
-    mapPopUp->msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_LOCATION_NAMES, HEAP_ID_FIELD);
+    mapPopUp->msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_LOCATION_NAMES, HEAP_ID_FIELD1);
     return mapPopUp;
 }
 
diff --git a/src/overlay005/map_prop.c b/src/overlay005/map_prop.c
index 83ca2b422f..3300c30953 100644
--- a/src/overlay005/map_prop.c
+++ b/src/overlay005/map_prop.c
@@ -29,7 +29,7 @@ typedef struct {
 
 MapPropManager *MapPropManager_New(const u8 heapID)
 {
-    MapPropManager *mapPropManager = Heap_AllocFromHeap(heapID, sizeof(MapPropManager));
+    MapPropManager *mapPropManager = Heap_Alloc(heapID, sizeof(MapPropManager));
     MapPropManager_Init(mapPropManager);
 
     return mapPropManager;
@@ -78,7 +78,7 @@ void MapPropManager_Load(NARC *landDataNARC, const int mapPropFilesSize, AreaDat
     u32 mapPropFilesCount;
 
     if (mapPropFilesSize != 0) {
-        mapPropFiles = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, mapPropFilesSize);
+        mapPropFiles = Heap_AllocAtEnd(HEAP_ID_FIELD1, mapPropFilesSize);
         NARC_ReadFile(landDataNARC, mapPropFilesSize, mapPropFiles);
         mapPropFilesCount = mapPropFilesSize / sizeof(MapPropFile);
     } else {
diff --git a/src/overlay005/map_prop_animation.c b/src/overlay005/map_prop_animation.c
index 011f4f7c3c..f87c082285 100644
--- a/src/overlay005/map_prop_animation.c
+++ b/src/overlay005/map_prop_animation.c
@@ -41,7 +41,7 @@ static void *MapPropAnimation_LoadAnimationObj(NARC *animeNARC, const u32 animeA
     void *animation;
 
     GF_ASSERT(animeArchiveID != ANIME_ARCHIVE_ID_NONE);
-    void *animationFile = NARC_AllocAndReadWholeMember(animeNARC, animeArchiveID, HEAP_ID_FIELD);
+    void *animationFile = NARC_AllocAndReadWholeMember(animeNARC, animeArchiveID, HEAP_ID_FIELD1);
     GF_ASSERT(animationFile != NULL);
 
     animation = NNS_G3dGetAnmByIdx(animationFile, 0);
@@ -82,7 +82,7 @@ static void BicycleSlopeAnimation_ResetFinishedAnimations(BicycleSlopeAnimation
 MapPropAnimationManager *MapPropAnimationManager_New(void)
 {
     int i;
-    MapPropAnimationManager *manager = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(MapPropAnimationManager));
+    MapPropAnimationManager *manager = Heap_Alloc(HEAP_ID_FIELD1, sizeof(MapPropAnimationManager));
 
     for (i = 0; i < MAP_PROP_ANIMATION_MANAGER_MAX_ANIMATIONS; i++) {
         manager->animations[i].loaded = FALSE;
@@ -104,10 +104,10 @@ MapPropAnimationManager *MapPropAnimationManager_New(void)
         manager->bicycleSlopeAnimations[i].animeArchiveID = 0;
     }
 
-    Heap_FndInitAllocatorForExpHeap(&manager->allocator, HEAP_ID_FIELD, 4);
+    HeapExp_FndInitAllocator(&manager->allocator, HEAP_ID_FIELD1, 4);
 
-    manager->animeNARC = NARC_ctor(NARC_INDEX_ARC__BM_ANIME, HEAP_ID_FIELD);
-    manager->animeListNARC = NARC_ctor(NARC_INDEX_ARC__BM_ANIME_LIST, HEAP_ID_FIELD);
+    manager->animeNARC = NARC_ctor(NARC_INDEX_ARC__BM_ANIME, HEAP_ID_FIELD1);
+    manager->animeListNARC = NARC_ctor(NARC_INDEX_ARC__BM_ANIME_LIST, HEAP_ID_FIELD1);
 
     return manager;
 }
@@ -692,7 +692,7 @@ static void MapPropAnimationManager_UnloadOneShotAnimation(MapPropAnimationManag
 MapPropOneShotAnimationManager *MapPropOneShotAnimationManager_New(void)
 {
     int oneShotAnimationManagerSize = sizeof(MapPropOneShotAnimationManager);
-    MapPropOneShotAnimationManager *oneShotAnimMan = Heap_AllocFromHeap(HEAP_ID_FIELD, oneShotAnimationManagerSize);
+    MapPropOneShotAnimationManager *oneShotAnimMan = Heap_Alloc(HEAP_ID_FIELD1, oneShotAnimationManagerSize);
 
     MI_CpuClearFast(oneShotAnimMan, oneShotAnimationManagerSize);
 
diff --git a/src/overlay005/map_prop_material_shape.c b/src/overlay005/map_prop_material_shape.c
index 2336c1f9a1..7d3e21de35 100644
--- a/src/overlay005/map_prop_material_shape.c
+++ b/src/overlay005/map_prop_material_shape.c
@@ -9,7 +9,7 @@
 
 MapPropMaterialShape *MapPropMaterialShape_Alloc(void)
 {
-    MapPropMaterialShape *propMatShp = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(MapPropMaterialShape));
+    MapPropMaterialShape *propMatShp = Heap_Alloc(HEAP_ID_FIELD1, sizeof(MapPropMaterialShape));
     GF_ASSERT(propMatShp != NULL);
 
     return propMatShp;
@@ -32,10 +32,10 @@ void MapPropMaterialShape_Load(const char *path, MapPropMaterialShape *propMatSh
         int idsLocatorsSize = sizeof(MapPropMaterialShapeIDsLocator) * idsLocatorsCount;
         int idsSize = sizeof(MapPropMaterialShapeIDs) * idsCount;
 
-        propMatShp->idsLocators = Heap_AllocFromHeap(HEAP_ID_FIELD, idsLocatorsSize);
+        propMatShp->idsLocators = Heap_Alloc(HEAP_ID_FIELD1, idsLocatorsSize);
         GF_ASSERT(propMatShp->idsLocators != NULL);
 
-        propMatShp->ids = Heap_AllocFromHeap(HEAP_ID_FIELD, idsSize);
+        propMatShp->ids = Heap_Alloc(HEAP_ID_FIELD1, idsSize);
         GF_ASSERT(propMatShp->ids != NULL);
 
         readLength = FS_ReadFile(&file, propMatShp->idsLocators, idsLocatorsSize);
diff --git a/src/overlay005/model_attributes.c b/src/overlay005/model_attributes.c
index d0f6a732d0..cf2b3b15ce 100644
--- a/src/overlay005/model_attributes.c
+++ b/src/overlay005/model_attributes.c
@@ -10,7 +10,7 @@
 
 ModelAttributes *ModelAttributes_New(void)
 {
-    ModelAttributes *modelAttrs = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(ModelAttributes));
+    ModelAttributes *modelAttrs = Heap_Alloc(HEAP_ID_FIELD1, sizeof(ModelAttributes));
     MI_CpuClear32(modelAttrs, sizeof(ModelAttributes));
 
     return modelAttrs;
@@ -18,7 +18,7 @@ ModelAttributes *ModelAttributes_New(void)
 
 void ModelAttributes_Free(ModelAttributes **modelAttrs)
 {
-    Heap_FreeExplicit(HEAP_ID_FIELD, *modelAttrs);
+    Heap_FreeExplicit(HEAP_ID_FIELD1, *modelAttrs);
     *modelAttrs = NULL;
 }
 
diff --git a/src/overlay005/ov5_021D1A94.c b/src/overlay005/ov5_021D1A94.c
index ad591843fa..f6e164600b 100644
--- a/src/overlay005/ov5_021D1A94.c
+++ b/src/overlay005/ov5_021D1A94.c
@@ -35,18 +35,18 @@ UnkStruct_ov5_021D1A94 *ov5_021D1A94(FieldSystem *fieldSystem, int heapID, int p
     UnkStruct_ov5_021D1A94 *v0;
     u32 v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021D1A94));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov5_021D1A94));
 
     v0->fieldSystem = fieldSystem;
     v0->heapID = heapID;
     v0->unk_08 = param2;
-    v0->unk_0C = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021D1BEC) * param2);
+    v0->unk_0C = Heap_Alloc(heapID, sizeof(UnkStruct_ov5_021D1BEC) * param2);
 
     MI_CpuClear32(v0->unk_0C, sizeof(UnkStruct_ov5_021D1BEC) * param2);
 
     v1 = SysTaskManager_GetRequiredSize(param2);
 
-    v0->unk_10 = Heap_AllocFromHeap(heapID, v1);
+    v0->unk_10 = Heap_Alloc(heapID, v1);
     v0->unk_10 = SysTaskManager_Init(param2, v0->unk_10);
 
     return v0;
@@ -108,7 +108,7 @@ UnkStruct_ov5_021D1BEC *ov5_021D1B6C(UnkStruct_ov5_021D1A94 *param0, const UnkSt
             GF_ASSERT(v1->unk_08 != NULL);
 
             if (param1->unk_04 != 0) {
-                v1->unk_10 = Heap_AllocFromHeap(param0->heapID, param1->unk_04);
+                v1->unk_10 = Heap_Alloc(param0->heapID, param1->unk_04);
             }
 
             if (param1->unk_08) {
diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c
index 8b7884ebb4..74cfbb646b 100644
--- a/src/overlay005/ov5_021D2F14.c
+++ b/src/overlay005/ov5_021D2F14.c
@@ -35,7 +35,7 @@ void ov5_021D2F14(UnkStruct_ov5_021D30A8 *param0, const SpriteResourceDataPaths
         param0->unk_1C4 = 6;
     }
 
-    v1 = Heap_AllocFromHeap(heapID, SpriteResourceTable_Size() * param0->unk_1C4);
+    v1 = Heap_Alloc(heapID, SpriteResourceTable_Size() * param0->unk_1C4);
 
     for (v4 = 0; v4 < param0->unk_1C4; v4++) {
         v0 = SpriteResourceTable_GetArrayElement(v1, v4);
@@ -331,10 +331,10 @@ ManagedSprite *ov5_021D3584(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplate
     AffineSpriteListTemplate v3;
     int v4[6];
 
-    v2 = Heap_AllocFromHeap(param0->heapID, sizeof(ManagedSprite));
+    v2 = Heap_Alloc(param0->heapID, sizeof(ManagedSprite));
 
-    v2->resourceHeaderList = Heap_AllocFromHeap(param0->heapID, sizeof(SpriteResourcesHeaderList));
-    v2->resourceHeaderList->headers = Heap_AllocFromHeap(param0->heapID, sizeof(SpriteResourcesHeader));
+    v2->resourceHeaderList = Heap_Alloc(param0->heapID, sizeof(SpriteResourcesHeaderList));
+    v2->resourceHeaderList->headers = Heap_Alloc(param0->heapID, sizeof(SpriteResourcesHeader));
     v2->resourceHeader = v2->resourceHeaderList->headers;
 
     for (v0 = 0; v0 < 6; v0++) {
diff --git a/src/overlay005/ov5_021D431C.c b/src/overlay005/ov5_021D431C.c
index d189fc6bb4..e8a3cada9d 100644
--- a/src/overlay005/ov5_021D431C.c
+++ b/src/overlay005/ov5_021D431C.c
@@ -50,7 +50,7 @@ static u8 ov5_021D481C(const int param0);
 
 UnkStruct_ov5_021D432C *ov5_021D431C(void)
 {
-    UnkStruct_ov5_021D432C *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021D432C));
+    UnkStruct_ov5_021D432C *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021D432C));
     v0->unk_00 = 0;
 
     return v0;
@@ -293,7 +293,7 @@ BOOL ov5_021D453C(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1)
         (param1->unk_00)++;
     } break;
     case 1:
-        sub_02056B30(fieldSystem->task, 0, 9, 1, 0x0, 6, 1, HEAP_ID_FIELDMAP);
+        sub_02056B30(fieldSystem->task, 0, 9, 1, 0x0, 6, 1, HEAP_ID_FIELD2);
         {
             int v9;
             int v10;
@@ -818,7 +818,7 @@ void ov5_021D4CEC(FieldSystem *fieldSystem, const u8 param1)
 
 void ov5_021D4D48(FieldSystem *fieldSystem, const u8 param1)
 {
-    u8 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(u8));
+    u8 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(u8));
 
     *v0 = param1;
     FieldTask_InitCall(fieldSystem->task, ov5_021D4BC8, v0);
@@ -865,7 +865,7 @@ void ov5_021D4D78(const int param0, const int param1, const int param2, FieldSys
 
 UnkStruct_ov5_021D4E00 *ov5_021D4E00(void)
 {
-    UnkStruct_ov5_021D4E00 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021D4E00));
+    UnkStruct_ov5_021D4E00 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021D4E00));
     v0->unk_00 = 0;
 
     return v0;
@@ -897,7 +897,7 @@ BOOL ov5_021D4E10(FieldTask *param0)
             Camera_AdjustFOV(-96, fieldSystem->camera);
         }
 
-        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 6, 1, HEAP_ID_FIELDMAP);
+        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 6, 1, HEAP_ID_FIELD2);
         v2->unk_08 = 1;
         break;
     case 1:
@@ -946,7 +946,7 @@ BOOL ov5_021D4F14(FieldTask *param0)
         v1->unk_04 = 0;
 
         Sound_PlayEffect(SEQ_SE_DP_KAIDAN2);
-        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 6, 1, HEAP_ID_FIELDMAP);
+        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 6, 1, HEAP_ID_FIELD2);
 
         v1->unk_08 = 1;
         (v1->unk_00)++;
@@ -977,7 +977,7 @@ BOOL ov5_021D4FA0(FieldTask *param0)
         v1->unk_04 = 0;
 
         Sound_PlayEffect(SEQ_SE_DP_KAIDAN2);
-        sub_02056B30(param0, 0, 16, 0, 0x0, 6, 1, HEAP_ID_FIELDMAP);
+        sub_02056B30(param0, 0, 16, 0, 0x0, 6, 1, HEAP_ID_FIELD2);
 
         v1->unk_08 = 1;
         (v1->unk_00)++;
@@ -1044,7 +1044,7 @@ BOOL ov5_021D5020(FieldTask *param0)
             GF_ASSERT(0);
         }
 
-        sub_02056B30(param0, 0, v4, 1, 0x0, 6, 1, HEAP_ID_FIELDMAP);
+        sub_02056B30(param0, 0, v4, 1, 0x0, 6, 1, HEAP_ID_FIELD2);
         v2->unk_08 = 1;
     } break;
     case 1:
@@ -1098,7 +1098,7 @@ BOOL ov5_021D5150(FieldTask *param0)
             (v2->unk_00) = 3;
         }
 
-        sub_02056B30(param0, 0, 1, 1, 0x0, 6, 1, HEAP_ID_FIELDMAP);
+        sub_02056B30(param0, 0, 1, 1, 0x0, 6, 1, HEAP_ID_FIELD2);
     } break;
     case 1:
         v0 = Player_MapObject(fieldSystem->playerAvatar);
diff --git a/src/overlay005/ov5_021D57BC.c b/src/overlay005/ov5_021D57BC.c
index f09462315b..d50aa7ba67 100644
--- a/src/overlay005/ov5_021D57BC.c
+++ b/src/overlay005/ov5_021D57BC.c
@@ -17,7 +17,7 @@ typedef struct UnkStruct_ov5_021D57D8_t {
 
 UnkStruct_ov5_021D57D8 *ov5_021D57BC(void)
 {
-    UnkStruct_ov5_021D57D8 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021D57D8));
+    UnkStruct_ov5_021D57D8 *v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021D57D8));
     MI_CpuClear32(v0, sizeof(UnkStruct_ov5_021D57D8));
 
     return v0;
@@ -25,7 +25,7 @@ UnkStruct_ov5_021D57D8 *ov5_021D57BC(void)
 
 void ov5_021D57D8(UnkStruct_ov5_021D57D8 **param0)
 {
-    Heap_FreeExplicit(HEAP_ID_FIELD, *param0);
+    Heap_FreeExplicit(HEAP_ID_FIELD1, *param0);
     *param0 = NULL;
 }
 
diff --git a/src/overlay005/ov5_021D5CB0.c b/src/overlay005/ov5_021D5CB0.c
index 0b37de3433..b2e742c54b 100644
--- a/src/overlay005/ov5_021D5CB0.c
+++ b/src/overlay005/ov5_021D5CB0.c
@@ -41,7 +41,7 @@ UnkStruct_ov5_021D5CB0 *ov5_021D5CB0(void)
     int v0;
     UnkStruct_ov5_021D5CB0 *v1 = NULL;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021D5CB0));
+    v1 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021D5CB0));
 
     GF_ASSERT(v1);
 
@@ -60,7 +60,7 @@ UnkStruct_ov5_021D5CB0 *ov5_021D5CB0(void)
 int ov5_021D5CE4(UnkStruct_ov5_021D5CB0 *param0, NNSG3dResTex *param1)
 {
     int v0, v1 = 0;
-    NARC *v2 = NARC_ctor(NARC_INDEX_DATA__FLDTANIME, HEAP_ID_FIELD);
+    NARC *v2 = NARC_ctor(NARC_INDEX_DATA__FLDTANIME, HEAP_ID_FIELD1);
 
     param0->unk_00 = NARC_AllocAndReadWholeMember(v2, 0, 4);
     param0->unk_04 = (UnkStruct_ov5_021D5CE4 *)param0->unk_00;
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index ef68d6ca02..ee72ef0f89 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -371,7 +371,7 @@ static void ov5_021DB588(fx32 param0, int param1, int param2, int param3, int *p
 
 UnkStruct_ov5_021D5EF8 *ov5_021D5EB8(FieldSystem *fieldSystem)
 {
-    UnkStruct_ov5_021D5EF8 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021D5EF8));
+    UnkStruct_ov5_021D5EF8 *v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021D5EF8));
     memset(v0, 0, sizeof(UnkStruct_ov5_021D5EF8));
 
     v0->unk_00 = ov5_021D6364(fieldSystem);
@@ -778,11 +778,11 @@ static void ov5_021D61D0(UnkStruct_ov5_021D61D0 *param0)
     RenderOam_InitSurface(&param0->unk_C0, &v0, NNS_G2D_SURFACETYPE_MAIN2D, &param0->unk_14);
 
     for (v1 = 0; v1 < 4; v1++) {
-        param0->unk_00[v1] = SpriteResourceCollection_New(31, v1, HEAP_ID_FIELD);
+        param0->unk_00[v1] = SpriteResourceCollection_New(31, v1, HEAP_ID_FIELD1);
     }
 
     v2 = SpriteResourceTable_Size();
-    param0->unk_10 = Heap_AllocFromHeap(HEAP_ID_FIELD, v2 * 4);
+    param0->unk_10 = Heap_Alloc(HEAP_ID_FIELD1, v2 * 4);
 
     ov5_021D6290(param0->unk_10, 0, 63);
     ov5_021D6290(param0->unk_10, 1, 64);
@@ -794,7 +794,7 @@ static void ov5_021D61D0(UnkStruct_ov5_021D61D0 *param0)
 
         v3.maxElements = 96;
         v3.renderer = &param0->unk_14;
-        v3.heapID = HEAP_ID_FIELD;
+        v3.heapID = HEAP_ID_FIELD1;
 
         param0->unk_130 = SpriteList_New(&v3);
         param0->unk_134 = SysTask_Start(ov5_021D6284, param0, 10);
@@ -810,9 +810,9 @@ static void ov5_021D6284(SysTask *param0, void *param1)
 static void ov5_021D6290(SpriteResourceTable *param0, int param1, int param2)
 {
     SpriteResourceTable *v0 = SpriteResourceTable_GetArrayElement(param0, param1);
-    void *v1 = LoadMemberFromNARC(NARC_INDEX_DATA__WEATHER_SYS, param2, 0, HEAP_ID_FIELD, 1);
+    void *v1 = LoadMemberFromNARC(NARC_INDEX_DATA__WEATHER_SYS, param2, 0, HEAP_ID_FIELD1, 1);
 
-    SpriteResourceTable_LoadFromBinary(v1, v0, HEAP_ID_FIELD);
+    SpriteResourceTable_LoadFromBinary(v1, v0, HEAP_ID_FIELD1);
     Heap_Free(v1);
 }
 
@@ -861,14 +861,14 @@ static void ov5_021D630C(Sprite *param0, VecFx32 *param1)
 
 UnkStruct_ov5_021D6594 *ov5_021D6364(FieldSystem *fieldSystem)
 {
-    UnkStruct_ov5_021D6594 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021D6594));
+    UnkStruct_ov5_021D6594 *v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021D6594));
     v0->fieldSystem = fieldSystem;
 
     ov5_021D61D0(&v0->unk_08);
 
     v0->unk_00 = Unk_ov5_02201D78;
     v0->unk_04 = Unk_ov5_021F8D90;
-    v0->unk_144 = NARC_ctor(NARC_INDEX_DATA__WEATHER_SYS, HEAP_ID_FIELD);
+    v0->unk_144 = NARC_ctor(NARC_INDEX_DATA__WEATHER_SYS, HEAP_ID_FIELD1);
 
     return v0;
 }
@@ -890,7 +890,7 @@ void ov5_021D63A4(UnkStruct_ov5_021D6594 **param0)
         ov5_021D62BC(&(*param0)->unk_08);
 
         NARC_dtor((*param0)->unk_144);
-        Heap_FreeExplicit(HEAP_ID_FIELD, *param0);
+        Heap_FreeExplicit(HEAP_ID_FIELD1, *param0);
 
         *param0 = NULL;
     }
@@ -1046,10 +1046,10 @@ static SpriteResource *ov5_021D65C0(SpriteResourceTable *param0, int param1, int
         v1 = SpriteResourceCollection_AddPaletteFromEx(param3, param4, v2, v3, v6, v4, v5, 4, param5);
         break;
     case 2:
-        v1 = SpriteResourceCollection_AddFrom(param3, param4, v2, v3, v6, 2, HEAP_ID_FIELD);
+        v1 = SpriteResourceCollection_AddFrom(param3, param4, v2, v3, v6, 2, HEAP_ID_FIELD1);
         break;
     case 3:
-        v1 = SpriteResourceCollection_AddFrom(param3, param4, v2, v3, v6, 3, HEAP_ID_FIELD);
+        v1 = SpriteResourceCollection_AddFrom(param3, param4, v2, v3, v6, 3, HEAP_ID_FIELD1);
         break;
     }
 
@@ -1164,7 +1164,7 @@ static BOOL ov5_021D676C(UnkStruct_ov5_021D6594 *param0, int param1, int param2,
     v0->unk_08->unk_B8C = *(NNS_G3dGlbGetCameraTarget());
 
     if (v0->unk_04 > 0) {
-        v0->unk_08->unk_B98 = Heap_AllocFromHeap(HEAP_ID_FIELD, v0->unk_04);
+        v0->unk_08->unk_B98 = Heap_Alloc(HEAP_ID_FIELD1, v0->unk_04);
         memset(v0->unk_08->unk_B98, 0, v0->unk_04);
     } else {
         v0->unk_08->unk_B98 = NULL;
@@ -1214,7 +1214,7 @@ static void ov5_021D68B8(UnkStruct_ov5_021D6594 *param0, int param1)
 
     if (v0->unk_0C != NULL) {
         ov5_021D6690(param0, v0->unk_00, v0->unk_0C);
-        Heap_FreeExplicit(HEAP_ID_FIELD, v0->unk_0C);
+        Heap_FreeExplicit(HEAP_ID_FIELD1, v0->unk_0C);
         v0->unk_0C = NULL;
 
         if (v0->unk_14 != NULL) {
@@ -1235,7 +1235,7 @@ static void ov5_021D68B8(UnkStruct_ov5_021D6594 *param0, int param1)
         }
 
         if (v0->unk_08->unk_B98 != NULL) {
-            Heap_FreeExplicit(HEAP_ID_FIELD, v0->unk_08->unk_B98);
+            Heap_FreeExplicit(HEAP_ID_FIELD1, v0->unk_08->unk_B98);
             v0->unk_08->unk_B98 = NULL;
         }
 
@@ -1249,7 +1249,7 @@ static void ov5_021D68B8(UnkStruct_ov5_021D6594 *param0, int param1)
             }
         }
 
-        Heap_FreeExplicit(HEAP_ID_FIELD, v0->unk_08);
+        Heap_FreeExplicit(HEAP_ID_FIELD1, v0->unk_08);
         v0->unk_08 = NULL;
     }
 
@@ -1369,7 +1369,7 @@ static BOOL ov5_021D6B60(UnkStruct_ov5_021D6594 *param0, UnkStruct_ov5_021D69B8
         return 1;
     }
 
-    param1->unk_08 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021DB4B8));
+    param1->unk_08 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021DB4B8));
 
     if (param1->unk_08 == NULL) {
         return 0;
@@ -1395,7 +1395,7 @@ static BOOL ov5_021D6BC4(UnkStruct_ov5_021D69B8 *param0)
             return 1;
         }
 
-        param0->unk_0C = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021D6690));
+        param0->unk_0C = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021D6690));
 
         if (param0->unk_0C == NULL) {
             return 0;
@@ -5359,8 +5359,8 @@ static void ov5_021DB614(UnkStruct_ov5_021DB614 *param0, HBlankSystem *param1)
 
     memset(param0, 0, sizeof(UnkStruct_ov5_021DB614));
 
-    param0->bufferManagers[0] = BufferManager_New(HEAP_ID_FIELD, param0->unk_2C[0], param0->unk_2C[1]);
-    param0->bufferManagers[1] = BufferManager_New(HEAP_ID_FIELD, param0->unk_2C[2], param0->unk_2C[3]);
+    param0->bufferManagers[0] = BufferManager_New(HEAP_ID_FIELD1, param0->unk_2C[0], param0->unk_2C[1]);
+    param0->bufferManagers[1] = BufferManager_New(HEAP_ID_FIELD1, param0->unk_2C[2], param0->unk_2C[3]);
 
     for (v0 = 0; v0 < 192; v0++) {
         param0->unk_2C[2][v0] = 255;
diff --git a/src/overlay005/ov5_021DDAE4.c b/src/overlay005/ov5_021DDAE4.c
index 9771ae0f4d..c933291ab9 100644
--- a/src/overlay005/ov5_021DDAE4.c
+++ b/src/overlay005/ov5_021DDAE4.c
@@ -66,7 +66,7 @@ static BOOL ov5_021DDAE4(FieldTask *param0)
 
 void ov5_021DDBC8(FieldTask *param0)
 {
-    UnkStruct_ov5_021DDBC8 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov5_021DDBC8));
+    UnkStruct_ov5_021DDBC8 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov5_021DDBC8));
 
     v0->unk_00 = 0;
     FieldTask_InitCall(param0, ov5_021DDAE4, v0);
diff --git a/src/overlay005/ov5_021DF440.c b/src/overlay005/ov5_021DF440.c
index ed0d31e8b2..a8e68fbaf1 100644
--- a/src/overlay005/ov5_021DF440.c
+++ b/src/overlay005/ov5_021DF440.c
@@ -110,13 +110,13 @@ static void ov5_021DFADC(SysTask *param0, void *param1);
 
 UnkStruct_ov5_021DF47C *ov5_021DF440(FieldSystem *fieldSystem, u32 param1, u32 heapID)
 {
-    UnkStruct_ov5_021DF47C *v0 = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_ov5_021DF47C)));
+    UnkStruct_ov5_021DF47C *v0 = Heap_Alloc(heapID, (sizeof(UnkStruct_ov5_021DF47C)));
     memset(v0, 0, (sizeof(UnkStruct_ov5_021DF47C)));
 
     v0->heapID = heapID;
     v0->unk_04 = param1;
     v0->fieldSystem = fieldSystem;
-    v0->unk_14 = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_ov5_021DF6AC)) * param1);
+    v0->unk_14 = Heap_Alloc(heapID, (sizeof(UnkStruct_ov5_021DF6AC)) * param1);
 
     ov5_021DF5E8(v0);
     ov5_021DF588(v0);
@@ -182,9 +182,9 @@ void *ov5_021DF528(const UnkStruct_ov5_021DF47C *param0, u32 param1, int param2)
     void *v0;
 
     if (param2 == 0) {
-        v0 = Heap_AllocFromHeap(param0->heapID, param1);
+        v0 = Heap_Alloc(param0->heapID, param1);
     } else {
-        v0 = Heap_AllocFromHeapAtEnd(param0->heapID, param1);
+        v0 = Heap_AllocAtEnd(param0->heapID, param1);
     }
 
     return v0;
diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c
index 20292e662c..a33b79ddb4 100644
--- a/src/overlay005/ov5_021DFB54.c
+++ b/src/overlay005/ov5_021DFB54.c
@@ -1647,7 +1647,7 @@ static SysTask *ov5_021E0F54(FieldSystem *fieldSystem, u32 param1)
     {
         SysTask *v2;
         MapObject *v3 = Player_MapObject(playerAvatar);
-        UnkStruct_ov5_021E0FF0 *v4 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021E0FF0));
+        UnkStruct_ov5_021E0FF0 *v4 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021E0FF0));
 
         v4->unk_00 = 0;
         v4->fieldSystem = fieldSystem;
@@ -1773,7 +1773,7 @@ static MapObject *ov5_021E10D4(PlayerAvatar *playerAvatar, int param1)
 
 static void *MonRideTaskEnv_New(int size)
 {
-    void *monRideTaskEnv = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, size);
+    void *monRideTaskEnv = Heap_AllocAtEnd(HEAP_ID_FIELD1, size);
 
     GF_ASSERT(monRideTaskEnv != NULL);
     memset(monRideTaskEnv, 0, size);
@@ -1783,7 +1783,7 @@ static void *MonRideTaskEnv_New(int size)
 
 static void MonRideTaskEnv_Free(void *taskEnv)
 {
-    Heap_FreeExplicit(HEAP_ID_FIELD, taskEnv);
+    Heap_FreeExplicit(HEAP_ID_FIELD1, taskEnv);
 }
 
 static Pokemon *GetPokemonByIndex(FieldSystem *fieldSystem, int partySlot)
diff --git a/src/overlay005/ov5_021E1154.c b/src/overlay005/ov5_021E1154.c
index eda9abba61..c65a260fae 100644
--- a/src/overlay005/ov5_021E1154.c
+++ b/src/overlay005/ov5_021E1154.c
@@ -153,7 +153,7 @@ static BOOL ov5_021E120C(FieldTask *param0)
 
 static void *ov5_021E132C(int param0)
 {
-    void *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, param0);
+    void *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD1, param0);
 
     GF_ASSERT(v0 != NULL);
     memset(v0, 0, param0);
@@ -163,5 +163,5 @@ static void *ov5_021E132C(int param0)
 
 static void ov5_021E1350(void *param0)
 {
-    Heap_FreeExplicit(HEAP_ID_FIELD, param0);
+    Heap_FreeExplicit(HEAP_ID_FIELD1, param0);
 }
diff --git a/src/overlay005/ov5_021E135C.c b/src/overlay005/ov5_021E135C.c
index d89d7e1e7e..102c0f5f7b 100644
--- a/src/overlay005/ov5_021E135C.c
+++ b/src/overlay005/ov5_021E135C.c
@@ -67,7 +67,7 @@ static void ov5_021E139C(SysTask *param0, void *param1)
         v0->unk_0C++;
 
         if (v0->unk_0C == 20) {
-            StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+            StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         } else if ((v0->unk_0C > 20) && IsScreenFadeDone()) {
             *v0->unk_04 = 1;
             Heap_Free(v0);
@@ -109,7 +109,7 @@ static void ov5_021E1470(SysTask *param0, void *param1)
         v0->unk_0C++;
 
         if (v0->unk_0C == 2) {
-            StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+            StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         }
 
         if (v0->unk_0C > 20) {
@@ -129,7 +129,7 @@ static void ov5_021E1470(SysTask *param0, void *param1)
 
 void FieldSystem_StartWarpAnimation(FieldSystem *fieldSystem, BOOL param1, BOOL *param2)
 {
-    UnkStruct_ov5_021E135C *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021E135C));
+    UnkStruct_ov5_021E135C *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021E135C));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_ov5_021E135C));
 
diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c
index 4c79cecf49..615e605e81 100644
--- a/src/overlay005/ov5_021EA874.c
+++ b/src/overlay005/ov5_021EA874.c
@@ -62,14 +62,14 @@ static BOOL ov5_021EA874(UnkStruct_ov5_021EAE78 *param0)
     DWCFriendData *v2 = sub_0202AED8(SaveData_GetWiFiList(param0->saveData), 0);
     DWCFriendData *v3;
 
-    if (0 == sub_020391DC(param0->saveData, param0->unk_4C, HEAP_ID_FIELD)) {
+    if (0 == sub_020391DC(param0->saveData, param0->unk_4C, HEAP_ID_FIELD1)) {
         return 1;
     }
 
     param0->unk_8C = 0;
 
-    LoadMessageBoxGraphics(param0->fieldSystem->bgConfig, 3, (512 - (18 + 12)), 10, Options_Frame(SaveData_GetOptions(param0->saveData)), HEAP_ID_FIELD);
-    LoadStandardWindowGraphics(param0->fieldSystem->bgConfig, 3, 1024 - (18 + 12) - 9, 11, 0, HEAP_ID_FIELD);
+    LoadMessageBoxGraphics(param0->fieldSystem->bgConfig, 3, (512 - (18 + 12)), 10, Options_Frame(SaveData_GetOptions(param0->saveData)), HEAP_ID_FIELD1);
+    LoadStandardWindowGraphics(param0->fieldSystem->bgConfig, 3, 1024 - (18 + 12) - 9, 11, 0, HEAP_ID_FIELD1);
 
     param0->unk_48 = 1;
     return 0;
@@ -94,7 +94,7 @@ static BOOL ov5_021EA8F0(UnkStruct_ov5_021EAE78 *param0)
         return 1;
     }
 
-    if (Bag_CanRemoveItem(SaveData_GetBag(param0->saveData), ITEM_PAL_PAD, 1, HEAP_ID_FIELD) == TRUE) {
+    if (Bag_CanRemoveItem(SaveData_GetBag(param0->saveData), ITEM_PAL_PAD, 1, HEAP_ID_FIELD1) == TRUE) {
         v1 = CommInfo_TrainerInfo(param0->unk_8C);
         StringTemplate_SetPlayerName(param0->unk_38, 0, v1);
         ov5_021EAE78(param0, 57);
@@ -107,7 +107,7 @@ static BOOL ov5_021EA8F0(UnkStruct_ov5_021EAE78 *param0)
 
         for (v0 = 0; v0 < 32; v0++) {
             if (!sub_0202AF78(v2, v0)) {
-                sub_02039298(param0->saveData, param0->unk_8C, v0, HEAP_ID_FIELD, 0);
+                sub_02039298(param0->saveData, param0->unk_8C, v0, HEAP_ID_FIELD1, 0);
                 break;
             }
         }
@@ -141,7 +141,7 @@ static BOOL ov5_021EA9F8(UnkStruct_ov5_021EAE78 *param0)
     DWCFriendData *v0;
     Strbuf *v1;
     int v2;
-    int v3 = Menu_ProcessInputAndHandleExit(param0->unk_44, HEAP_ID_FIELD);
+    int v3 = Menu_ProcessInputAndHandleExit(param0->unk_44, HEAP_ID_FIELD1);
 
     if (v3 == 0xffffffff) {
         return 0;
@@ -150,7 +150,7 @@ static BOOL ov5_021EA9F8(UnkStruct_ov5_021EAE78 *param0)
 
         for (v2 = 0; v2 < 32; v2++) {
             if (!sub_0202AF78(v4, v2)) {
-                sub_02039298(param0->saveData, param0->unk_8C, v2, HEAP_ID_FIELD, 0);
+                sub_02039298(param0->saveData, param0->unk_8C, v2, HEAP_ID_FIELD1, 0);
                 break;
             }
         }
@@ -257,7 +257,7 @@ static BOOL ov5_021EAB58(UnkStruct_ov5_021EAE78 *param0)
     int v2 = sub_0202AF94(v0);
     int v3 = 5;
 
-    param0->unk_00 = StringList_New(v2 + 1, HEAP_ID_FIELD);
+    param0->unk_00 = StringList_New(v2 + 1, HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_20, 3, 19, 1, 12, v3 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (10 * (v3 + 2) * 2));
     Window_DrawStandardFrame(&param0->unk_20, 1, 1024 - (18 + 12) - 9, 11);
@@ -285,7 +285,7 @@ static BOOL ov5_021EAB58(UnkStruct_ov5_021EAE78 *param0)
     v1.cursorCallback = ov5_021EAF90;
     v1.parent = param0;
 
-    param0->unk_04 = ListMenu_New(&v1, 0, 0, HEAP_ID_FIELD);
+    param0->unk_04 = ListMenu_New(&v1, 0, 0, HEAP_ID_FIELD1);
     Window_CopyToVRAM(&param0->unk_20);
     param0->unk_48 = 9;
 
@@ -312,7 +312,7 @@ static BOOL ov5_021EAC44(UnkStruct_ov5_021EAE78 *param0)
         param0->unk_90 = v1;
 
         WiFiList *v2 = SaveData_GetWiFiList(param0->saveData);
-        TrainerInfo *v3 = TrainerInfo_New(HEAP_ID_FIELD);
+        TrainerInfo *v3 = TrainerInfo_New(HEAP_ID_FIELD1);
 
         TrainerInfo_SetName(v3, sub_0202AEF0(v2, v1));
         StringTemplate_SetPlayerName(param0->unk_38, 0, v3);
@@ -347,14 +347,14 @@ static BOOL ov5_021EAD38(UnkStruct_ov5_021EAE78 *param0)
     TrainerInfo *v1;
     DWCFriendData *v2;
     Strbuf *v3;
-    int v4 = Menu_ProcessInputAndHandleExit(param0->unk_44, HEAP_ID_FIELD);
+    int v4 = Menu_ProcessInputAndHandleExit(param0->unk_44, HEAP_ID_FIELD1);
 
     if (v4 == 0xffffffff) {
         return 0;
     } else if (v4 == 0) {
         sub_02030788(SaveData_GetBattleFrontier(param0->saveData), param0->unk_90);
         sub_0202AFD4(v0, param0->unk_90);
-        sub_02039298(param0->saveData, param0->unk_8C, 32 - 1, HEAP_ID_FIELD, 0);
+        sub_02039298(param0->saveData, param0->unk_8C, 32 - 1, HEAP_ID_FIELD1, 0);
         param0->unk_48 = 1;
     } else {
         v1 = CommInfo_TrainerInfo(param0->unk_8C);
@@ -440,10 +440,10 @@ static void ov5_021EAEE0(UnkStruct_ov5_021EAE78 *param0)
 {
     MI_CpuClear8(param0, sizeof(UnkStruct_ov5_021EAE78));
 
-    param0->unk_38 = StringTemplate_Default(HEAP_ID_FIELD);
-    param0->unk_3C = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0675, HEAP_ID_FIELD);
-    param0->unk_0C = Strbuf_Init(110, HEAP_ID_FIELD);
-    param0->unk_08 = Strbuf_Init(110, HEAP_ID_FIELD);
+    param0->unk_38 = StringTemplate_Default(HEAP_ID_FIELD1);
+    param0->unk_3C = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0675, HEAP_ID_FIELD1);
+    param0->unk_0C = Strbuf_Init(110, HEAP_ID_FIELD1);
+    param0->unk_08 = Strbuf_Init(110, HEAP_ID_FIELD1);
 }
 
 static void ov5_021EAF1C(UnkStruct_ov5_021EAE78 *param0)
@@ -463,7 +463,7 @@ void ov5_021EAF50(FieldSystem *fieldSystem)
     UnkStruct_ov5_021EAE78 *v0;
     FieldTask *v1 = fieldSystem->task;
 
-    v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov5_021EAE78));
+    v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov5_021EAE78));
     ov5_021EAEE0(v0);
 
     v0->fieldSystem = fieldSystem;
diff --git a/src/overlay005/ov5_021EAFA4.c b/src/overlay005/ov5_021EAFA4.c
index c6b0b1ec2e..3aae2bb041 100644
--- a/src/overlay005/ov5_021EAFA4.c
+++ b/src/overlay005/ov5_021EAFA4.c
@@ -79,7 +79,7 @@ VecFx32 ov5_021EAFA4(const u16 param0, const u16 param1, const UnkStruct_ov5_021
 
 UnkStruct_ov5_021EB0E0 *ov5_021EB0C8(Camera *const param0)
 {
-    UnkStruct_ov5_021EB0E0 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021EB0E0));
+    UnkStruct_ov5_021EB0E0 *v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021EB0E0));
     ov5_021EB0E0(v0, param0);
 
     return v0;
diff --git a/src/overlay005/ov5_021ECC20.c b/src/overlay005/ov5_021ECC20.c
index 6dbd1d1120..9cba84937c 100644
--- a/src/overlay005/ov5_021ECC20.c
+++ b/src/overlay005/ov5_021ECC20.c
@@ -49,7 +49,7 @@ void ov5_021ECC78(MapObjectManager *param0)
 
 static void ov5_021ECCA4(MapObjectManager *param0)
 {
-    NARC *v0 = NARC_ctor(NARC_INDEX_DATA__MMODEL__MMODEL, HEAP_ID_FIELD);
+    NARC *v0 = NARC_ctor(NARC_INDEX_DATA__MMODEL__MMODEL, HEAP_ID_FIELD1);
     MapObjectMan_SetNARC(param0, v0);
 }
 
@@ -122,9 +122,9 @@ void *ov5_021ECD68(const MapObjectManager *param0, u32 param1, int param2)
     u32 v2 = NARC_GetMemberSize(v1, param1);
 
     if (param2 == 1) {
-        v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, v2);
+        v0 = Heap_Alloc(HEAP_ID_FIELD1, v2);
     } else {
-        v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, v2);
+        v0 = Heap_AllocAtEnd(HEAP_ID_FIELD1, v2);
     }
 
     NARC_ReadWholeMember(v1, param1, v0);
diff --git a/src/overlay005/ov5_021ECE40.c b/src/overlay005/ov5_021ECE40.c
index 1ef9423fe1..41067c22f8 100644
--- a/src/overlay005/ov5_021ECE40.c
+++ b/src/overlay005/ov5_021ECE40.c
@@ -338,13 +338,13 @@ static void ov5_021ED0A4(UnkStruct_ov5_021ED0A4 *param0, int param1)
     UnkStruct_ov5_021ED110 *v3;
 
     v0 = sizeof(UnkStruct_ov5_021DF84C) * param1;
-    v2 = Heap_AllocFromHeap(HEAP_ID_FIELD, v0);
+    v2 = Heap_Alloc(HEAP_ID_FIELD1, v0);
 
     param0->unk_E4 = v2;
     GF_ASSERT(v2 != NULL);
 
     v0 = (sizeof(UnkStruct_ov5_021ED110)) * param1;
-    v3 = Heap_AllocFromHeap(HEAP_ID_FIELD, v0);
+    v3 = Heap_Alloc(HEAP_ID_FIELD1, v0);
 
     param0->unk_F4 = v3;
     GF_ASSERT(v3 != NULL);
@@ -364,8 +364,8 @@ static void ov5_021ED0F0(UnkStruct_ov5_021ED0A4 *param0)
 {
     ov5_021ED1A4(param0);
 
-    Heap_FreeExplicit(HEAP_ID_FIELD, param0->unk_E4);
-    Heap_FreeExplicit(HEAP_ID_FIELD, param0->unk_F4);
+    Heap_FreeExplicit(HEAP_ID_FIELD1, param0->unk_E4);
+    Heap_FreeExplicit(HEAP_ID_FIELD1, param0->unk_F4);
 }
 
 static UnkStruct_ov5_021DF84C *ov5_021ED110(UnkStruct_ov5_021ED0A4 *param0, u32 param1)
@@ -487,14 +487,14 @@ static int ov5_021ED1C8(const MapObjectManager *param0, const MapObject *param1,
 static void ov5_021ED224(UnkStruct_ov5_021ED0A4 *param0, int param1, int param2, int param3, int param4, int param5, int param6)
 {
     {
-        param0->unk_F8 = ov5_021F067C(HEAP_ID_FIELD, HEAP_ID_64, 0x1000 * param1, param1);
+        param0->unk_F8 = ov5_021F067C(HEAP_ID_FIELD1, HEAP_ID_64, 0x1000 * param1, param1);
         ov5_021ED558(param0);
         ov5_021EDCC4(param0, param2);
         ov5_021EDCCC(param0, param1 - param2);
     }
 
     {
-        param0->unk_FC = ov5_021F067C(HEAP_ID_FIELD, HEAP_ID_65, 0x80 * param3, param3);
+        param0->unk_FC = ov5_021F067C(HEAP_ID_FIELD1, HEAP_ID_65, 0x80 * param3, param3);
         ov5_021ED694(param0);
         ov5_021EDCD4(param0, param4);
         ov5_021EDCDC(param0, param3 - param4);
@@ -503,7 +503,7 @@ static void ov5_021ED224(UnkStruct_ov5_021ED0A4 *param0, int param1, int param2,
     {
         TextureResourceManager *v0;
 
-        v0 = TextureResourceManager_New(param5, HEAP_ID_FIELD);
+        v0 = TextureResourceManager_New(param5, HEAP_ID_FIELD1);
 
         ov5_021EDCA8(param0, v0);
         ov5_021ED7D0(param0);
@@ -1365,7 +1365,7 @@ static void ov5_021EDDAC(UnkStruct_ov5_021ED0A4 *param0, int param1)
     UnkStruct_02020C44 *v1;
 
     v0.unk_00 = param1;
-    v0.heapID = HEAP_ID_FIELD;
+    v0.heapID = HEAP_ID_FIELD1;
 
     v1 = sub_02020C44(&v0);
     ov5_021EDC84(param0, v1);
@@ -1618,7 +1618,7 @@ static void ov5_021EE030(SysTask *param0, void *param1)
 
 static void ov5_021EE0E8(UnkStruct_ov5_021ED0A4 *param0, int param1, void *param2, int param3)
 {
-    TextureResource *v0 = TextureResourceManager_AddTextureAndAllocVRam(param0->unk_F0, param2, param1, 1, HEAP_ID_FIELD);
+    TextureResource *v0 = TextureResourceManager_AddTextureAndAllocVRam(param0->unk_F0, param2, param1, 1, HEAP_ID_FIELD1);
 
     GF_ASSERT(v0 != NULL);
     ov5_021EE134(param0, param1);
@@ -1818,7 +1818,7 @@ static void ov5_021EE320(UnkStruct_ov5_021ED0A4 *param0, int param1, int param2)
     v3 = (sizeof(UnkStruct_ov5_021EDFBC)) * param1;
     v2 = (sizeof(UnkStruct_ov5_021EE134)) * param1;
     v1 = (sizeof(UnkStruct_ov5_021EDF3C)) + v2 + v3 + v4;
-    v5 = Heap_AllocFromHeap(HEAP_ID_FIELD, v1);
+    v5 = Heap_Alloc(HEAP_ID_FIELD1, v1);
 
     GF_ASSERT(v5 != NULL);
     memset(v5, 0, v1);
@@ -1884,7 +1884,7 @@ static UnkStruct_020216E0 *ov5_021EE454(MapObject *param0, int param1, UnkFuncPt
     UnkStruct_ov5_021ED0A4 *v8 = ov5_021EDEA8(param0);
     UnkStruct_02020C44 *v9 = ov5_021EDC8C(v8);
     UnkStruct_020216E0 *v10 = ov5_021EB1A0(param0);
-    UnkStruct_ov5_021EE698 *v11 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021EE698));
+    UnkStruct_ov5_021EE698 *v11 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021EE698));
 
     memset(v11, 0, sizeof(UnkStruct_ov5_021EE698));
 
diff --git a/src/overlay005/ov5_021EF4BC.c b/src/overlay005/ov5_021EF4BC.c
index 3ae5a9c713..029be0bfed 100644
--- a/src/overlay005/ov5_021EF4BC.c
+++ b/src/overlay005/ov5_021EF4BC.c
@@ -38,7 +38,7 @@ static void ov5_021EF710(UnkStruct_ov5_021EF4F8 *param0);
 
 UnkStruct_ov5_021EF4F8 *ov5_021EF4BC(u32 heapID, HBlankSystem *param1)
 {
-    UnkStruct_ov5_021EF4F8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov5_021EF4F8));
+    UnkStruct_ov5_021EF4F8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov5_021EF4F8));
     memset(v0, 0, sizeof(UnkStruct_ov5_021EF4F8));
 
     v0->unk_00 = 0;
diff --git a/src/overlay005/ov5_021F007C.c b/src/overlay005/ov5_021F007C.c
index d5b2e8978f..d2ed079cea 100644
--- a/src/overlay005/ov5_021F007C.c
+++ b/src/overlay005/ov5_021F007C.c
@@ -60,7 +60,7 @@ static void ov5_021F007C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
 {
     UnkStruct_ov5_021F007C *v0 = param2;
 
-    v0->unk_00 = Graphics_GetPlttData(NARC_INDEX_DATA__WEATHER_SYS, 55, &v0->unk_04, HEAP_ID_FIELD);
+    v0->unk_00 = Graphics_GetPlttData(NARC_INDEX_DATA__WEATHER_SYS, 55, &v0->unk_04, HEAP_ID_FIELD1);
     v0->unk_3C = 0;
 
     ov5_021F02B8(&v0->unk_28, 0, 8, 19);
@@ -74,7 +74,7 @@ static void ov5_021F00BC(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
 {
     UnkStruct_ov5_021F007C *v0 = param2;
 
-    v0->unk_00 = Graphics_GetPlttData(NARC_INDEX_DATA__WEATHER_SYS, 55, &v0->unk_04, HEAP_ID_FIELD);
+    v0->unk_00 = Graphics_GetPlttData(NARC_INDEX_DATA__WEATHER_SYS, 55, &v0->unk_04, HEAP_ID_FIELD1);
     v0->unk_3C = 0;
 
     ov5_021F02B8(&v0->unk_28, 8, 0, 19);
@@ -243,7 +243,7 @@ static void ov5_021F0260(BgConfig *param0)
 
     Bg_LoadPalette(2, &v0, sizeof(short), (6 * 32) + 2);
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(u8) * 32);
+    v1 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(u8) * 32);
     memset(v1, 0x11, sizeof(u8) * 32);
 
     Bg_LoadTiles(param0, 2, v1, sizeof(u8) * 32, 1);
diff --git a/src/overlay005/ov5_021F067C.c b/src/overlay005/ov5_021F067C.c
index 01950140d5..ffa3fdef2e 100644
--- a/src/overlay005/ov5_021F067C.c
+++ b/src/overlay005/ov5_021F067C.c
@@ -44,7 +44,7 @@ UnkStruct_ov5_021F06D8 *ov5_021F067C(u32 parentHeapID, u32 childHeapID, u32 para
     }
 
     param2 = v1 - param2;
-    v2 = Heap_AllocFromHeap(childHeapID, param2);
+    v2 = Heap_Alloc(childHeapID, param2);
 
     GF_ASSERT(v2 != NULL);
     memset(v2, 0, param2);
@@ -140,9 +140,9 @@ static void *ov5_021F07B4(UnkStruct_ov5_021F06D8 *param0, u32 param1, int param2
     void *v0;
 
     if (param2 == 0) {
-        v0 = Heap_AllocFromHeap(param0->childHeapID, param1);
+        v0 = Heap_Alloc(param0->childHeapID, param1);
     } else {
-        v0 = Heap_AllocFromHeapAtEnd(param0->childHeapID, param1);
+        v0 = Heap_AllocAtEnd(param0->childHeapID, param1);
     }
 
     GF_ASSERT(v0 != NULL);
diff --git a/src/overlay005/ov5_021F0EB0.c b/src/overlay005/ov5_021F0EB0.c
index 2c4665d2c1..773f12b56f 100644
--- a/src/overlay005/ov5_021F0EB0.c
+++ b/src/overlay005/ov5_021F0EB0.c
@@ -37,7 +37,7 @@ static void (*const Unk_ov5_0220020C[4])(UnkStruct_ov5_021F0FB8 *);
 SysTask *ov5_021F0EB0(FieldSystem *fieldSystem, u32 heapID)
 {
     SysTask *task;
-    UnkStruct_ov5_021F0FB8 *v1 = Heap_AllocFromHeapAtEnd(heapID, (sizeof(UnkStruct_ov5_021F0FB8)));
+    UnkStruct_ov5_021F0FB8 *v1 = Heap_AllocAtEnd(heapID, (sizeof(UnkStruct_ov5_021F0FB8)));
 
     memset(v1, 0, (sizeof(UnkStruct_ov5_021F0FB8)));
 
diff --git a/src/overlay005/ov5_021F101C.c b/src/overlay005/ov5_021F101C.c
index 95872339dd..1e11e68173 100644
--- a/src/overlay005/ov5_021F101C.c
+++ b/src/overlay005/ov5_021F101C.c
@@ -29,13 +29,13 @@ BOOL ov5_021F101C(FieldTask *param0)
 
     switch (*v2) {
     case 0:
-        v1->unk_04 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov5_021F101C));
+        v1->unk_04 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov5_021F101C));
         (*v2)++;
         break;
     case 1: {
         int v4 = ov5_021F0484();
 
-        v3->unk_04 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, v4);
+        v3->unk_04 = Heap_AllocAtEnd(HEAP_ID_FIELD2, v4);
         memset(v3->unk_04, 0, v4);
     }
         (*v2)++;
diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c
index bd480a8279..37a305300c 100644
--- a/src/overlay005/ov5_021F6454.c
+++ b/src/overlay005/ov5_021F6454.c
@@ -145,7 +145,7 @@ BOOL ScrCmd_2DE(ScriptContext *ctx)
 
     ctx->data[0] = v13;
 
-    v6 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPECIES_NAME, HEAP_ID_FIELD_TASK);
+    v6 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPECIES_NAME, HEAP_ID_FIELD3);
     v9 = ov5_021F6704(fieldSystem, 20, 1, 0, 1, FieldSystem_GetVarPointer(fieldSystem, v13), *v10, FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_WINDOW), v6, FieldSystem_GetVarPointer(fieldSystem, v14), FieldSystem_GetVarPointer(fieldSystem, v15));
     v1 = sub_020308A0(fieldSystem->saveData, 11, &v0);
 
@@ -167,7 +167,7 @@ BOOL ScrCmd_2DE(ScriptContext *ctx)
         Heap_Free(v1);
     }
 
-    v7 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MENU_ENTRIES, HEAP_ID_FIELD_TASK);
+    v7 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MENU_ENTRIES, HEAP_ID_FIELD3);
 
     ov5_021F661C(v9, v7);
     ov5_021F6760(v9, 12, 0xff, 0xfffe);
@@ -240,7 +240,7 @@ static void ov5_021F6624(FieldSystem *fieldSystem, UnkStruct_ov5_021F6704 *param
     }
 
     for (v0 = 0; v0 < 120; v0++) {
-        param1->unk_1C[v0] = Strbuf_Init((40 * 2), HEAP_ID_FIELD);
+        param1->unk_1C[v0] = Strbuf_Init((40 * 2), HEAP_ID_FIELD1);
     }
 
     *param1->unk_210 = 0xeeee;
@@ -252,7 +252,7 @@ UnkStruct_ov5_021F6704 *ov5_021F6704(FieldSystem *fieldSystem, u8 param1, u8 par
     UnkStruct_ov5_021F6704 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021F6704));
+    v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021F6704));
 
     if (v0 == NULL) {
         return NULL;
@@ -278,11 +278,11 @@ static void ov5_021F6768(UnkStruct_ov5_021F6704 *param0)
         Window_Add(param0->fieldSystem->bgConfig, &param0->unk_08, 3, param0->unk_208, param0->unk_209, 11, param0->unk_20B * 2, 13, 1);
     }
 
-    LoadStandardWindowGraphics(param0->fieldSystem->bgConfig, 3, 1024 - (18 + 12) - 9, 11, 0, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(param0->fieldSystem->bgConfig, 3, 1024 - (18 + 12) - 9, 11, 0, HEAP_ID_FIELD1);
     Window_DrawStandardFrame(&param0->unk_08, 1, 1024 - (18 + 12) - 9, 11);
     ov5_021F68BC(param0);
 
-    param0->unk_23C = ListMenu_New((const ListMenuTemplate *)&param0->unk_21C, *param0->unk_214, *param0->unk_218, HEAP_ID_FIELD);
+    param0->unk_23C = ListMenu_New((const ListMenuTemplate *)&param0->unk_21C, *param0->unk_214, *param0->unk_218, HEAP_ID_FIELD1);
     param0->unk_04 = SysTask_Start(ov5_021F6A34, param0, 0);
 
     return;
@@ -294,7 +294,7 @@ static void ov5_021F6830(UnkStruct_ov5_021F6704 *param0, u32 param1, u32 param2,
     void *v1;
 
     {
-        Strbuf *v2 = Strbuf_Init((40 * 2), HEAP_ID_FIELD);
+        Strbuf *v2 = Strbuf_Init((40 * 2), HEAP_ID_FIELD1);
 
         MessageLoader_GetStrbuf(param0->unk_1FC, param1, v2);
         StringTemplate_Format(param0->unk_200, param0->unk_1C[param0->unk_20B], v2);
@@ -511,7 +511,7 @@ BOOL ScrCmd_31D(ScriptContext *param0)
     }
 
     if (v9 > 0) {
-        v4 = Bag_TryAddItem(SaveData_GetBag(fieldSystem->saveData), ITEM_GRISEOUS_ORB, v9, HEAP_ID_FIELD);
+        v4 = Bag_TryAddItem(SaveData_GetBag(fieldSystem->saveData), ITEM_GRISEOUS_ORB, v9, HEAP_ID_FIELD1);
 
         if (v4 == 0) {
             *v11 = 0xff;
@@ -576,7 +576,7 @@ BOOL ScrCmd_TryRevertPokemonForm(ScriptContext *param0)
     currentHeldItem = Pokemon_GetValue(pokemon, MON_DATA_HELD_ITEM, NULL);
 
     if (currentHeldItem == ITEM_GRISEOUS_ORB) {
-        bagNotFull = Bag_TryAddItem(SaveData_GetBag(fieldSystem->saveData), ITEM_GRISEOUS_ORB, 1, HEAP_ID_FIELD);
+        bagNotFull = Bag_TryAddItem(SaveData_GetBag(fieldSystem->saveData), ITEM_GRISEOUS_ORB, 1, HEAP_ID_FIELD1);
 
         if (bagNotFull == 0) {
             *result = 0xff;
diff --git a/src/overlay005/ov5_021F8370.c b/src/overlay005/ov5_021F8370.c
index 305e188069..54d6425819 100644
--- a/src/overlay005/ov5_021F8370.c
+++ b/src/overlay005/ov5_021F8370.c
@@ -65,7 +65,7 @@ void Villa_DynamicMapFeaturesInit(FieldSystem *fieldSystem)
     int v0;
     PersistedMapFeatures *v1 = MiscSaveBlock_GetPersistedMapFeatures(FieldSystem_GetSaveData(fieldSystem));
     UnkStruct_02071C34 *v2 = PersistedMapFeatures_GetBuffer(v1, DYNAMIC_MAP_FEATURES_VILLA);
-    UnkStruct_ov5_021F8480 *v3 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov5_021F8480));
+    UnkStruct_ov5_021F8480 *v3 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov5_021F8480));
 
     memset(v3, 0, sizeof(UnkStruct_ov5_021F8480));
 
diff --git a/src/overlay005/save_info_window.c b/src/overlay005/save_info_window.c
index 4e104ded76..3b23833523 100644
--- a/src/overlay005/save_info_window.c
+++ b/src/overlay005/save_info_window.c
@@ -143,7 +143,7 @@ static void SaveInfoWindow_PrintText(const SaveInfoWindow *saveInfoWin)
 
 void SaveInfoWindow_Draw(SaveInfoWindow *saveInfoWin)
 {
-    saveInfoWin->window = Heap_AllocFromHeap(saveInfoWin->heapID, sizeof(Window));
+    saveInfoWin->window = Heap_Alloc(saveInfoWin->heapID, sizeof(Window));
 
     Window_Add(saveInfoWin->bgConfig, saveInfoWin->window, saveInfoWin->bgLayer, 1, 1, saveInfoWin->width, saveInfoWin->height, FIELD_MESSAGE_PALETTE_INDEX, SAVE_INFO_MESSAGE_BASE_TILE);
     LoadStandardWindowGraphics(saveInfoWin->bgConfig, saveInfoWin->bgLayer, SAVE_INFO_WINDOW_BASE_TILE, FIELD_WINDOW_PALETTE_INDEX, STANDARD_WINDOW_SYSTEM, saveInfoWin->heapID);
@@ -160,9 +160,9 @@ void SaveInfoWindow_Erase(SaveInfoWindow *saveInfoWin)
     Heap_Free(saveInfoWin->window);
 }
 
-SaveInfoWindow *SaveInfoWindow_New(FieldSystem *fieldSystem, enum HeapId heapID, u8 bgLayer)
+SaveInfoWindow *SaveInfoWindow_New(FieldSystem *fieldSystem, enum HeapID heapID, u8 bgLayer)
 {
-    SaveInfoWindow *saveInfoWin = Heap_AllocFromHeap(heapID, sizeof(SaveInfoWindow));
+    SaveInfoWindow *saveInfoWin = Heap_Alloc(heapID, sizeof(SaveInfoWindow));
 
     saveInfoWin->fieldSystem = fieldSystem;
     saveInfoWin->heapID = heapID;
diff --git a/src/overlay005/scrcmd_move_tutor.c b/src/overlay005/scrcmd_move_tutor.c
index 607a95ac9f..fca4ec33ba 100644
--- a/src/overlay005/scrcmd_move_tutor.c
+++ b/src/overlay005/scrcmd_move_tutor.c
@@ -142,19 +142,19 @@ BOOL ScrCmd_CheckCanAffordMove(ScriptContext *ctx)
 
     *canTeach = TRUE;
 
-    if (redCost && Bag_CanRemoveItem(bag, ITEM_RED_SHARD, redCost, HEAP_ID_FIELD_TASK) == FALSE) {
+    if (redCost && Bag_CanRemoveItem(bag, ITEM_RED_SHARD, redCost, HEAP_ID_FIELD3) == FALSE) {
         *canTeach = FALSE;
     }
 
-    if (blueCost && Bag_CanRemoveItem(bag, ITEM_BLUE_SHARD, blueCost, HEAP_ID_FIELD_TASK) == FALSE) {
+    if (blueCost && Bag_CanRemoveItem(bag, ITEM_BLUE_SHARD, blueCost, HEAP_ID_FIELD3) == FALSE) {
         *canTeach = FALSE;
     }
 
-    if (yellowCost && Bag_CanRemoveItem(bag, ITEM_YELLOW_SHARD, yellowCost, HEAP_ID_FIELD_TASK) == FALSE) {
+    if (yellowCost && Bag_CanRemoveItem(bag, ITEM_YELLOW_SHARD, yellowCost, HEAP_ID_FIELD3) == FALSE) {
         *canTeach = FALSE;
     }
 
-    if (greenCost && Bag_CanRemoveItem(bag, ITEM_GREEN_SHARD, greenCost, HEAP_ID_FIELD_TASK) == FALSE) {
+    if (greenCost && Bag_CanRemoveItem(bag, ITEM_GREEN_SHARD, greenCost, HEAP_ID_FIELD3) == FALSE) {
         *canTeach = FALSE;
     }
 
@@ -183,10 +183,10 @@ BOOL ScrCmd_PayShardsCost(ScriptContext *ctx)
         GF_ASSERT(FALSE);
     }
 
-    Bag_TryRemoveItem(bag, ITEM_RED_SHARD, redCost, HEAP_ID_FIELD_TASK);
-    Bag_TryRemoveItem(bag, ITEM_BLUE_SHARD, blueCost, HEAP_ID_FIELD_TASK);
-    Bag_TryRemoveItem(bag, ITEM_YELLOW_SHARD, yellowCost, HEAP_ID_FIELD_TASK);
-    Bag_TryRemoveItem(bag, ITEM_GREEN_SHARD, greenCost, HEAP_ID_FIELD_TASK);
+    Bag_TryRemoveItem(bag, ITEM_RED_SHARD, redCost, HEAP_ID_FIELD3);
+    Bag_TryRemoveItem(bag, ITEM_BLUE_SHARD, blueCost, HEAP_ID_FIELD3);
+    Bag_TryRemoveItem(bag, ITEM_YELLOW_SHARD, yellowCost, HEAP_ID_FIELD3);
+    Bag_TryRemoveItem(bag, ITEM_GREEN_SHARD, greenCost, HEAP_ID_FIELD3);
 
     return FALSE;
 }
@@ -317,7 +317,7 @@ BOOL ScrCmd_ShowMoveTutorMoveSelectionMenu(ScriptContext *scriptContext)
         pokemon = Party_GetPokemonBySlotIndex(SaveData_GetParty(scriptContext->fieldSystem->saveData), partySlot);
     }
 
-    moveNamesLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MOVE_NAMES, HEAP_ID_FIELD_TASK);
+    moveNamesLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MOVE_NAMES, HEAP_ID_FIELD3);
     moveTutorManager = MoveTutorManager_New(fieldSystem, 20, 1, 0, TRUE, FieldSystem_GetVarPointer(fieldSystem, selectedOptionVar), *stringTemplate, FieldSystem_GetScriptMemberPtr(scriptContext->fieldSystem, SCRIPT_MANAGER_WINDOW), moveNamesLoader);
 
     for (i = 0; i < NELEMS(sTeachableMoves); i++) {
@@ -364,7 +364,7 @@ BOOL ScrCmd_ShowMoveTutorMoveSelectionMenu(ScriptContext *scriptContext)
         MoveTutorManager_AddMenuEntry(moveTutorManager, learnableMoves[i], 0xff, learnableMoves[i]);
     }
 
-    miscMessageLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MENU_ENTRIES, HEAP_ID_FIELD_TASK);
+    miscMessageLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MENU_ENTRIES, HEAP_ID_FIELD3);
 
     MoveTutorManager_SetMessageLoader(moveTutorManager, miscMessageLoader);
     MoveTutorManager_AddMenuEntry(moveTutorManager, pl_msg_00000361_00005, 0xff, (u16)LIST_CANCEL); // cast required to match
@@ -420,7 +420,7 @@ static void MoveTutorManager_Init(FieldSystem *fieldSystem, MoveTutorManager *mo
     }
 
     for (moveIndex = 0; moveIndex < (NELEMS(sTeachableMoves) + 1); moveIndex++) {
-        moveTutorManager->moveNames[moveIndex] = Strbuf_Init((40 * 2), HEAP_ID_FIELD);
+        moveTutorManager->moveNames[moveIndex] = Strbuf_Init((40 * 2), HEAP_ID_FIELD1);
     }
 
     *moveTutorManager->selectedOptionPtr = LIST_MENU_NO_SELECTION_YET;
@@ -428,7 +428,7 @@ static void MoveTutorManager_Init(FieldSystem *fieldSystem, MoveTutorManager *mo
 
 MoveTutorManager *MoveTutorManager_New(FieldSystem *fieldSystem, u8 tilemapLeft, u8 tilemapTop, u8 initialCursorPos, u8 canExitWithB, u16 *selectedOptionPtr, StringTemplate *stringTemplate, Window *window, MessageLoader *messageLoader)
 {
-    MoveTutorManager *moveTutorManager = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(MoveTutorManager));
+    MoveTutorManager *moveTutorManager = Heap_Alloc(HEAP_ID_FIELD1, sizeof(MoveTutorManager));
 
     if (moveTutorManager == NULL) {
         return NULL;
@@ -453,18 +453,18 @@ static void MoveTutorManager_ShowMoveSelectionMenu(MoveTutorManager *moveTutorMa
         Window_Add(moveTutorManager->fieldSystem->bgConfig, &moveTutorManager->moveSelectWindow, 3, moveTutorManager->tilemapLeft, moveTutorManager->tilemapTop, 11, moveTutorManager->menuOptionsCount * 2, 13, 1);
     }
 
-    LoadStandardWindowGraphics(moveTutorManager->fieldSystem->bgConfig, 3, 1024 - (18 + 12) - 9, 11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(moveTutorManager->fieldSystem->bgConfig, 3, 1024 - (18 + 12) - 9, 11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD1);
     Window_DrawStandardFrame(&moveTutorManager->moveSelectWindow, TRUE, 1024 - (18 + 12) - 9, 11);
     MoveTutorManager_InitMenuTemplate(moveTutorManager);
 
-    moveTutorManager->moveSelectionMenu = ListMenu_New((const ListMenuTemplate *)&moveTutorManager->menuTemplate, 0, moveTutorManager->initialCursorPos, HEAP_ID_FIELD);
+    moveTutorManager->moveSelectionMenu = ListMenu_New((const ListMenuTemplate *)&moveTutorManager->menuTemplate, 0, moveTutorManager->initialCursorPos, HEAP_ID_FIELD1);
     moveTutorManager->sysTask = SysTask_Start(SysTaskCallback, moveTutorManager, 0);
 }
 
 static void _MoveTutorManager_AddMenuEntry(MoveTutorManager *moveTutorManager, u32 stringEntryID, u32 param2, u32 index)
 {
     {
-        Strbuf *strbuf = Strbuf_Init((40 * 2), HEAP_ID_FIELD);
+        Strbuf *strbuf = Strbuf_Init((40 * 2), HEAP_ID_FIELD1);
 
         MessageLoader_GetStrbuf(moveTutorManager->messageLoader, stringEntryID, strbuf);
         StringTemplate_Format(moveTutorManager->stringTemplate, moveTutorManager->moveNames[moveTutorManager->menuOptionsCount], strbuf);
diff --git a/src/overlay005/script_message.c b/src/overlay005/script_message.c
index bb29d59a0b..fd6f2fbb95 100644
--- a/src/overlay005/script_message.c
+++ b/src/overlay005/script_message.c
@@ -154,7 +154,7 @@ static void GetStrBufFromSentence(ScriptMessage *msgData, u16 sentenceType, u16
     sub_02014CF8(&sentence, 0, word1);
     sub_02014CF8(&sentence, 1, word2);
 
-    strBuf = sub_02014B34(&sentence, HEAP_ID_FIELD_TASK);
+    strBuf = sub_02014B34(&sentence, HEAP_ID_FIELD3);
 
     Strbuf_Copy(msgData->msgBuf, strBuf);
     Strbuf_Free(strBuf);
diff --git a/src/overlay005/signpost.c b/src/overlay005/signpost.c
index fc680cd975..ca523e1c76 100644
--- a/src/overlay005/signpost.c
+++ b/src/overlay005/signpost.c
@@ -18,7 +18,7 @@ static BOOL Signpost_ScrollOut(FieldSystem *fieldSystem);
 
 void *Signpost_Init(u32 heapID)
 {
-    void *signpost = Heap_AllocFromHeap(heapID, sizeof(Signpost));
+    void *signpost = Heap_Alloc(heapID, sizeof(Signpost));
 
     memset(signpost, 0, sizeof(Signpost));
     return signpost;
diff --git a/src/overlay005/size_contest.c b/src/overlay005/size_contest.c
index 460c1aa612..3d3e2a537f 100644
--- a/src/overlay005/size_contest.c
+++ b/src/overlay005/size_contest.c
@@ -98,8 +98,8 @@ static u8 GetApproxIntervalIdx(u16 sizeFactor)
 
 static u32 CalcMillimeterSize(u16 species, u16 sizeFactor)
 {
-    HeightWeightData *heightWeightData = Pokedex_HeightWeightData(HEAP_ID_FIELD);
-    Pokedex_HeightWeightData_Load(heightWeightData, FALSE, HEAP_ID_FIELD);
+    HeightWeightData *heightWeightData = Pokedex_HeightWeightData(HEAP_ID_FIELD1);
+    Pokedex_HeightWeightData_Load(heightWeightData, FALSE, HEAP_ID_FIELD1);
 
     u32 height = Pokedex_HeightWeightData_Height(heightWeightData, species);
     Pokedex_HeightWeightData_Release(heightWeightData);
diff --git a/src/overlay005/vs_seeker.c b/src/overlay005/vs_seeker.c
index a1ede2bc87..a5b4391473 100644
--- a/src/overlay005/vs_seeker.c
+++ b/src/overlay005/vs_seeker.c
@@ -375,7 +375,7 @@ static const MapObjectAnimCmd sVsSeekerAnimSingleExclamationMark[] = {
 void VsSeeker_Start(FieldTask *taskMan, StringTemplate *template, u16 *outResult)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan);
-    VsSeekerSystem *vsSeeker = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(VsSeekerSystem));
+    VsSeekerSystem *vsSeeker = Heap_Alloc(HEAP_ID_FIELD1, sizeof(VsSeekerSystem));
 
     if (vsSeeker == NULL) {
         GF_ASSERT(FALSE);
@@ -571,7 +571,7 @@ BOOL VsSeeker_UpdateStepCount(FieldSystem *fieldSystem)
     u16 battery = SystemVars_GetVsSeekerBattery(varsFlags);
     u16 activeStepCount = SystemVars_GetVsSeekerStepCount(varsFlags);
 
-    if (Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), ITEM_VS_SEEKER, 1, HEAP_ID_FIELD) == TRUE
+    if (Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), ITEM_VS_SEEKER, 1, HEAP_ID_FIELD1) == TRUE
         && battery < VS_SEEKER_MAX_BATTERY) {
         battery++;
         SystemVars_SetVsSeekerBattery(varsFlags, battery);
@@ -619,7 +619,7 @@ static void VsSeekerSystem_StartAnimation(VsSeekerSystem *vsSeeker, MapObject *m
 
 static void VsSeekerSystem_StartAnimationTask(VsSeekerSystem *vsSeeker, SysTask *animTask)
 {
-    VsSeekerAnimationTask *vssAnimTask = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(VsSeekerAnimationTask));
+    VsSeekerAnimationTask *vssAnimTask = Heap_Alloc(HEAP_ID_FIELD1, sizeof(VsSeekerAnimationTask));
     if (vssAnimTask == NULL) {
         GF_ASSERT(FALSE);
         return;
@@ -643,7 +643,7 @@ static void VsSeeker_TrackAnimation(SysTask *task, void *param)
 
         MapObject_FinishAnimation(vssAnimTask->animationTask);
         SysTask_Done(vssAnimTask->trackingTask);
-        Heap_FreeExplicit(HEAP_ID_FIELD, param);
+        Heap_FreeExplicit(HEAP_ID_FIELD1, param);
     }
 }
 
diff --git a/src/overlay006/feebas_fishing.c b/src/overlay006/feebas_fishing.c
index 6ec0bdb9e0..b87c13875e 100644
--- a/src/overlay006/feebas_fishing.c
+++ b/src/overlay006/feebas_fishing.c
@@ -52,7 +52,7 @@ BOOL PlayerAvatar_IsFacingFeebasTile(FieldSystem *fieldSystem)
     randTiles[3] = rand & 0xff;
 
     // The first 3 members of this narc are (2, 228, 300) from encounters_mt_coronet_b1f.json. They are u32, hence the cast to int
-    narcData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, 1, HEAP_ID_FIELD);
+    narcData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, 1, HEAP_ID_FIELD1);
     mapCoordsSize = ((int *)narcData)[0];
     numFishingtiles = 0;
 
@@ -105,7 +105,7 @@ void LoadFeebasLevelRange(u8 *maxLevel, u8 *minLevel)
 // I guess they didn't want to hardcode this...for some reason...
 void LoadFeebasFromNARC(int *species)
 {
-    int *narcData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, 0, HEAP_ID_FIELD);
+    int *narcData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, 0, HEAP_ID_FIELD1);
     (*species) = (*narcData);
 
     Heap_Free(narcData);
diff --git a/src/overlay006/great_marsh_binoculars.c b/src/overlay006/great_marsh_binoculars.c
index 9cf0396a8e..29ce915930 100644
--- a/src/overlay006/great_marsh_binoculars.c
+++ b/src/overlay006/great_marsh_binoculars.c
@@ -42,11 +42,11 @@ int GreatMarshBinoculars_GetMonSpecies(FieldSystem *fieldSystem)
 GreatMarshBinoculars *GreatMarshBinoculars_InitData(const int heapID, FieldSystem *fieldSystem)
 {
     u8 i;
-    GreatMarshBinoculars *binocularsData = Heap_AllocFromHeapAtEnd(heapID, sizeof(GreatMarshBinoculars));
+    GreatMarshBinoculars *binocularsData = Heap_AllocAtEnd(heapID, sizeof(GreatMarshBinoculars));
     binocularsData->fieldSystem = fieldSystem;
 
     u8 randIndex;
-    BinocularCoords *coordData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, 11, HEAP_ID_FIELD);
+    BinocularCoords *coordData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, 11, HEAP_ID_FIELD1);
 
     for (i = 0; i < BINOCULARS_CYCLE_COUNT; i++) {
         randIndex = LCRNG_RandMod(36);
diff --git a/src/overlay006/great_marsh_daily_encounters.c b/src/overlay006/great_marsh_daily_encounters.c
index 5d328d9ae2..68f4e4a95e 100644
--- a/src/overlay006/great_marsh_daily_encounters.c
+++ b/src/overlay006/great_marsh_daily_encounters.c
@@ -21,7 +21,7 @@ void ReplaceGreatMarshDailyEncounters(const int dailyMon, const BOOL nationalDex
         encDataGroup = 10;
     }
 
-    narc = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, encDataGroup, HEAP_ID_FIELD);
+    narc = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, encDataGroup, HEAP_ID_FIELD1);
     encounterIndex = ((dailyMon >> (5 * areaNum)) & 0x1f);
     encounterIndex %= 32;
 
diff --git a/src/overlay006/hm_cut_in.c b/src/overlay006/hm_cut_in.c
index 7e116ed1c1..b9dd5c8755 100644
--- a/src/overlay006/hm_cut_in.c
+++ b/src/overlay006/hm_cut_in.c
@@ -368,18 +368,18 @@ static void FlyLanding_InitResourceData(FlyResources *flyResources, int maxSprit
     flyResources->resource2ID = resource2ID;
     flyResources->resource3ID = resource3ID;
     flyResources->resource4ID = resource4ID;
-    flyResources->spriteList = SpriteList_InitRendering(maxSpriteListElements, &flyResources->g2dRenderer, HEAP_ID_FIELD);
+    flyResources->spriteList = SpriteList_InitRendering(maxSpriteListElements, &flyResources->g2dRenderer, HEAP_ID_FIELD1);
 
     SetSubScreenViewRect(&flyResources->g2dRenderer, 0, FX32_CONST(512));
 
-    flyResources->charLocation = SpriteResourceCollection_New(resource1Count, SPRITE_RESOURCE_CHAR, HEAP_ID_FIELD);
-    flyResources->paletteLocation = SpriteResourceCollection_New(resource2Count, SPRITE_RESOURCE_PLTT, HEAP_ID_FIELD);
-    flyResources->cellLocation = SpriteResourceCollection_New(resource3Count, SPRITE_RESOURCE_CELL, HEAP_ID_FIELD);
-    flyResources->animLocation = SpriteResourceCollection_New(resource4Count, SPRITE_RESOURCE_ANIM, HEAP_ID_FIELD);
-    flyResources->charSourceWrapper = FlyLanding_AllocFromHeapAtEnd(HEAP_ID_FIELD, (sizeof(SpriteResourceWithLocation)) * resource1Count);
-    flyResources->paletteSourceWrapper = FlyLanding_AllocFromHeapAtEnd(HEAP_ID_FIELD, (sizeof(SpriteResourceWithLocation)) * resource2Count);
-    flyResources->cellSourceWrapper = FlyLanding_AllocFromHeapAtEnd(HEAP_ID_FIELD, (sizeof(SpriteResourceWithLocation)) * resource3Count);
-    flyResources->animSourceWrapper = FlyLanding_AllocFromHeapAtEnd(HEAP_ID_FIELD, (sizeof(SpriteResourceWithLocation)) * resource4Count);
+    flyResources->charLocation = SpriteResourceCollection_New(resource1Count, SPRITE_RESOURCE_CHAR, HEAP_ID_FIELD1);
+    flyResources->paletteLocation = SpriteResourceCollection_New(resource2Count, SPRITE_RESOURCE_PLTT, HEAP_ID_FIELD1);
+    flyResources->cellLocation = SpriteResourceCollection_New(resource3Count, SPRITE_RESOURCE_CELL, HEAP_ID_FIELD1);
+    flyResources->animLocation = SpriteResourceCollection_New(resource4Count, SPRITE_RESOURCE_ANIM, HEAP_ID_FIELD1);
+    flyResources->charSourceWrapper = FlyLanding_AllocFromHeapAtEnd(HEAP_ID_FIELD1, (sizeof(SpriteResourceWithLocation)) * resource1Count);
+    flyResources->paletteSourceWrapper = FlyLanding_AllocFromHeapAtEnd(HEAP_ID_FIELD1, (sizeof(SpriteResourceWithLocation)) * resource2Count);
+    flyResources->cellSourceWrapper = FlyLanding_AllocFromHeapAtEnd(HEAP_ID_FIELD1, (sizeof(SpriteResourceWithLocation)) * resource3Count);
+    flyResources->animSourceWrapper = FlyLanding_AllocFromHeapAtEnd(HEAP_ID_FIELD1, (sizeof(SpriteResourceWithLocation)) * resource4Count);
 
     for (i = 0; i < resource1Count; flyResources->charSourceWrapper[i].resourceId = resource1ID, i++) {}
 
@@ -436,7 +436,7 @@ static void FlyLanding_LoadCharResources(FlyResources *flyResources, NARC *narc,
         if (flyResources->charSourceWrapper[i].resourceId == flyResources->resource1ID) {
             flyResources->charSourceWrapper[i].resourceId = resourceId;
             flyResources->charSourceWrapper[i].memberIdx = 0;
-            flyResources->charSourceWrapper[i].spriteResource = SpriteResourceCollection_AddTilesFrom(flyResources->charLocation, narc, memberIdx, FALSE, resourceId, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD);
+            flyResources->charSourceWrapper[i].spriteResource = SpriteResourceCollection_AddTilesFrom(flyResources->charLocation, narc, memberIdx, FALSE, resourceId, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD1);
             return;
         }
     }
@@ -566,7 +566,7 @@ static Sprite *FlyLanding_CreateSprite(FlyResources *flyResources, const VecFx32
     spriteListTemplate.position = *position;
     spriteListTemplate.priority = listPriority;
     spriteListTemplate.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-    spriteListTemplate.heapID = HEAP_ID_FIELD;
+    spriteListTemplate.heapID = HEAP_ID_FIELD1;
 
     sprite = SpriteList_Add(&spriteListTemplate);
     GF_ASSERT(sprite != NULL);
@@ -734,7 +734,7 @@ static void FlyLanding_InitEnv(UnkStruct_ov101_021D5D90 *param0)
     Sprite_SetDrawFlag(env->birdSprite, TRUE);
 
     env->unk_6C = PushPlayerUp(env->resourcesWithPlayer.unk_00, env->resourcesWithPlayer.playerSprite);
-    env->task = ov5_021F0EB0(env->resourcesWithPlayer.fieldSystem, HEAP_ID_FIELD);
+    env->task = ov5_021F0EB0(env->resourcesWithPlayer.fieldSystem, HEAP_ID_FIELD1);
 
     ov5_021F0F10(env->task, 1, -(FX32_ONE * 120), 12);
 
@@ -1019,17 +1019,17 @@ static int (*const *const FlyLandingAnimFuncCollections[])(FlyLandingEnvExtended
 
 static NARC *FlyLanding_GetCutInNarc(void)
 {
-    return NARC_ctor(NARC_INDEX_DATA__FIELD_CUTIN, HEAP_ID_FIELD);
+    return NARC_ctor(NARC_INDEX_DATA__FIELD_CUTIN, HEAP_ID_FIELD1);
 }
 
 static void FadeIn(void)
 {
-    StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 6, 1, HEAP_ID_FIELD);
+    StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 6, 1, HEAP_ID_FIELD1);
 }
 
 static void FadeOut(void)
 {
-    StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 6, 1, HEAP_ID_FIELD);
+    StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 6, 1, HEAP_ID_FIELD1);
 }
 
 static void HidePlayerMapObj(FieldSystem *fieldSystem, BOOL hidden)
@@ -1072,7 +1072,7 @@ void SysTask_HMCutIn_SetTaskDone(SysTask *cutInTask)
 
 static HMCutIn *CreateHMCutIn(FieldSystem *fieldSystem)
 {
-    HMCutIn *cutIn = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(HMCutIn));
+    HMCutIn *cutIn = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(HMCutIn));
 
     memset(cutIn, 0, sizeof(HMCutIn));
     cutIn->fieldSystem = fieldSystem;
@@ -1701,7 +1701,7 @@ static void CutIn_InitSpriteResources(HMCutIn *cutIn)
     CutIn_LoadSpriteResources(cutIn, narc);
 
     NARC_dtor(narc);
-    cutIn->unk_244 = sub_020711EC(HEAP_ID_FIELD, 32);
+    cutIn->unk_244 = sub_020711EC(HEAP_ID_FIELD1, 32);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1);
 }
 
@@ -1722,7 +1722,7 @@ static void CutIn_DeleteSprites(HMCutIn *cutIn)
 
 static NARC *CutIn_GetCutInNarc(void)
 {
-    return NARC_ctor(NARC_INDEX_DATA__FIELD_CUTIN, HEAP_ID_FIELD);
+    return NARC_ctor(NARC_INDEX_DATA__FIELD_CUTIN, HEAP_ID_FIELD1);
 }
 
 static void CutIn_LoadSpriteResources(HMCutIn *cutIn, NARC *narc)
@@ -1730,24 +1730,24 @@ static void CutIn_LoadSpriteResources(HMCutIn *cutIn, NARC *narc)
     int i;
 
     CutIn_BuildPokemonSpriteTemplate(cutIn, &cutIn->pokemonSpriteTemplate);
-    cutIn->spriteList = SpriteList_InitRendering(32, &cutIn->g2dRenderer, HEAP_ID_FIELD);
+    cutIn->spriteList = SpriteList_InitRendering(32, &cutIn->g2dRenderer, HEAP_ID_FIELD1);
     SetSubScreenViewRect(&cutIn->g2dRenderer, 0, FX32_CONST(512));
 
-    cutIn->charLocation = SpriteResourceCollection_New(4, 0, HEAP_ID_FIELD);
-    cutIn->paletteLocation = SpriteResourceCollection_New(3, 1, HEAP_ID_FIELD);
-    cutIn->cellLocation = SpriteResourceCollection_New(4, 2, HEAP_ID_FIELD);
-    cutIn->animLocation = SpriteResourceCollection_New(2, 3, HEAP_ID_FIELD);
+    cutIn->charLocation = SpriteResourceCollection_New(4, 0, HEAP_ID_FIELD1);
+    cutIn->paletteLocation = SpriteResourceCollection_New(3, 1, HEAP_ID_FIELD1);
+    cutIn->cellLocation = SpriteResourceCollection_New(4, 2, HEAP_ID_FIELD1);
+    cutIn->animLocation = SpriteResourceCollection_New(2, 3, HEAP_ID_FIELD1);
 
     // Char Index 0: White Clouds
     for (i = 0; i < 1; i++) {
-        cutIn->charSource[i] = SpriteResourceCollection_AddTilesFrom(cutIn->charLocation, narc, sCutInWindParticleChar[i].memberIdx, FALSE, sCutInWindParticleChar[i].resourceId, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD);
+        cutIn->charSource[i] = SpriteResourceCollection_AddTilesFrom(cutIn->charLocation, narc, sCutInWindParticleChar[i].memberIdx, FALSE, sCutInWindParticleChar[i].resourceId, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD1);
     }
 
     // Char Index 1: Player
     if (cutIn->playerGender == 0) {
-        cutIn->charSource[i] = SpriteResourceCollection_AddTilesFrom(cutIn->charLocation, narc, 13, FALSE, 2, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD);
+        cutIn->charSource[i] = SpriteResourceCollection_AddTilesFrom(cutIn->charLocation, narc, 13, FALSE, 2, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD1);
     } else {
-        cutIn->charSource[i] = SpriteResourceCollection_AddTilesFrom(cutIn->charLocation, narc, 16, FALSE, 2, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD);
+        cutIn->charSource[i] = SpriteResourceCollection_AddTilesFrom(cutIn->charLocation, narc, 16, FALSE, 2, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD1);
     }
 
     i++;
@@ -1756,13 +1756,13 @@ static void CutIn_LoadSpriteResources(HMCutIn *cutIn, NARC *narc)
 
     // Palette Index 0: White Clouds
     for (i = 0; i < 1; i++) {
-        cutIn->paletteSource[i] = SpriteResourceCollection_AddPaletteFrom(cutIn->paletteLocation, narc, sCutInWindParticlePalette[i].memberIdx, FALSE, sCutInWindParticlePalette[i].resourceId, NNS_G2D_VRAM_TYPE_2DMAIN, PLTT_1, HEAP_ID_FIELD);
+        cutIn->paletteSource[i] = SpriteResourceCollection_AddPaletteFrom(cutIn->paletteLocation, narc, sCutInWindParticlePalette[i].memberIdx, FALSE, sCutInWindParticlePalette[i].resourceId, NNS_G2D_VRAM_TYPE_2DMAIN, PLTT_1, HEAP_ID_FIELD1);
     }
 
     // Palette Index 1: Player Female
     if (cutIn->playerGender == 0) {
     } else {
-        cutIn->paletteSource[i] = SpriteResourceCollection_AddPaletteFrom(cutIn->paletteLocation, narc, 4, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, PLTT_1, HEAP_ID_FIELD);
+        cutIn->paletteSource[i] = SpriteResourceCollection_AddPaletteFrom(cutIn->paletteLocation, narc, 4, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, PLTT_1, HEAP_ID_FIELD1);
         i++;
     }
 
@@ -1771,34 +1771,34 @@ static void CutIn_LoadSpriteResources(HMCutIn *cutIn, NARC *narc)
 
     // Cell Index 0: White Clouds
     for (i = 0; i < 1; i++) {
-        cutIn->cellSource[i] = SpriteResourceCollection_AddFrom(cutIn->cellLocation, narc, sCutInWindParticleCell[i].memberIdx, FALSE, sCutInWindParticleCell[i].resourceId, SPRITE_RESOURCE_CELL, HEAP_ID_FIELD);
+        cutIn->cellSource[i] = SpriteResourceCollection_AddFrom(cutIn->cellLocation, narc, sCutInWindParticleCell[i].memberIdx, FALSE, sCutInWindParticleCell[i].resourceId, SPRITE_RESOURCE_CELL, HEAP_ID_FIELD1);
     }
 
     // Cell Index 1: Player
     if (cutIn->playerGender == 0) {
-        cutIn->cellSource[i] = SpriteResourceCollection_AddFrom(cutIn->cellLocation, narc, 14, FALSE, 2, SPRITE_RESOURCE_CELL, HEAP_ID_FIELD);
+        cutIn->cellSource[i] = SpriteResourceCollection_AddFrom(cutIn->cellLocation, narc, 14, FALSE, 2, SPRITE_RESOURCE_CELL, HEAP_ID_FIELD1);
     } else {
-        cutIn->cellSource[i] = SpriteResourceCollection_AddFrom(cutIn->cellLocation, narc, 17, FALSE, 2, SPRITE_RESOURCE_CELL, HEAP_ID_FIELD);
+        cutIn->cellSource[i] = SpriteResourceCollection_AddFrom(cutIn->cellLocation, narc, 17, FALSE, 2, SPRITE_RESOURCE_CELL, HEAP_ID_FIELD1);
     }
 
     i++;
     // Cell Index 2: Player's Pokemon
-    cutIn->cellSource[i] = SpriteResourceCollection_AddFrom(cutIn->cellLocation, narc, 6, FALSE, 3, SPRITE_RESOURCE_CELL, HEAP_ID_FIELD);
+    cutIn->cellSource[i] = SpriteResourceCollection_AddFrom(cutIn->cellLocation, narc, 6, FALSE, 3, SPRITE_RESOURCE_CELL, HEAP_ID_FIELD1);
 
     // Animation Index 0: White Clouds
     for (i = 0; i < 1; i++) {
-        cutIn->animSource[i] = SpriteResourceCollection_AddFrom(cutIn->animLocation, narc, sCutInWindParticleAnim[i].memberIdx, FALSE, sCutInWindParticleAnim[i].resourceId, SPRITE_RESOURCE_ANIM, HEAP_ID_FIELD);
+        cutIn->animSource[i] = SpriteResourceCollection_AddFrom(cutIn->animLocation, narc, sCutInWindParticleAnim[i].memberIdx, FALSE, sCutInWindParticleAnim[i].resourceId, SPRITE_RESOURCE_ANIM, HEAP_ID_FIELD1);
     }
 
     // Animation Index 1: Player
     if (cutIn->playerGender == 0) {
-        cutIn->animSource[i] = SpriteResourceCollection_AddFrom(cutIn->animLocation, narc, 15, FALSE, 1, SPRITE_RESOURCE_ANIM, HEAP_ID_FIELD);
+        cutIn->animSource[i] = SpriteResourceCollection_AddFrom(cutIn->animLocation, narc, 15, FALSE, 1, SPRITE_RESOURCE_ANIM, HEAP_ID_FIELD1);
     } else {
-        cutIn->animSource[i] = SpriteResourceCollection_AddFrom(cutIn->animLocation, narc, 18, FALSE, 1, SPRITE_RESOURCE_ANIM, HEAP_ID_FIELD);
+        cutIn->animSource[i] = SpriteResourceCollection_AddFrom(cutIn->animLocation, narc, 18, FALSE, 1, SPRITE_RESOURCE_ANIM, HEAP_ID_FIELD1);
     }
 
-    cutIn->pokemonCharSource = CutIn_GetPokemonSpriteSource(cutIn->pokemon, &cutIn->pokemonSpriteTemplate, HEAP_ID_FIELD);
-    cutIn->pokemonPaletteSource = CutIn_GetPokemonPaletteSource(&cutIn->pokemonSpriteTemplate, HEAP_ID_FIELD);
+    cutIn->pokemonCharSource = CutIn_GetPokemonSpriteSource(cutIn->pokemon, &cutIn->pokemonSpriteTemplate, HEAP_ID_FIELD1);
+    cutIn->pokemonPaletteSource = CutIn_GetPokemonPaletteSource(&cutIn->pokemonSpriteTemplate, HEAP_ID_FIELD1);
 }
 
 static void CutIn_DeleteSpriteResources(HMCutIn *cutIn)
@@ -1891,7 +1891,7 @@ static Sprite *CreateSprite(HMCutIn *cutIn, const VecFx32 *position, u32 charRes
     spriteListTemplate.position = *position;
     spriteListTemplate.priority = listPriority;
     spriteListTemplate.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-    spriteListTemplate.heapID = HEAP_ID_FIELD;
+    spriteListTemplate.heapID = HEAP_ID_FIELD1;
 
     sprite = SpriteList_Add(&spriteListTemplate);
     GF_ASSERT(sprite != NULL);
@@ -1953,7 +1953,7 @@ static void CutIn_LoadBirdSpriteResources(HMCutIn *cutIn)
 
     for (i = 0; i < 4; i++) {
         if (cutIn->charSource[i] == NULL) {
-            cutIn->charSource[i] = SpriteResourceCollection_AddTilesFrom(cutIn->charLocation, narc, 7, FALSE, 0, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD);
+            cutIn->charSource[i] = SpriteResourceCollection_AddTilesFrom(cutIn->charLocation, narc, 7, FALSE, 0, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD1);
             break;
         }
     }
@@ -1962,7 +1962,7 @@ static void CutIn_LoadBirdSpriteResources(HMCutIn *cutIn)
 
     for (i = 0; i < 4; i++) {
         if (cutIn->cellSource[i] == NULL) {
-            cutIn->cellSource[i] = SpriteResourceCollection_AddFrom(cutIn->cellLocation, narc, 8, FALSE, 0, SPRITE_RESOURCE_CELL, HEAP_ID_FIELD);
+            cutIn->cellSource[i] = SpriteResourceCollection_AddFrom(cutIn->cellLocation, narc, 8, FALSE, 0, SPRITE_RESOURCE_CELL, HEAP_ID_FIELD1);
             break;
         }
     }
@@ -1973,7 +1973,7 @@ static void CutIn_LoadBirdSpriteResources(HMCutIn *cutIn)
 
 static void CutIn_LoadBgPalette(NARC *narc, u32 memberIndex, NNSG2dPaletteData **paletteData)
 {
-    void *nclrFile = NARC_AllocAndReadWholeMember(narc, memberIndex, HEAP_ID_FIELD);
+    void *nclrFile = NARC_AllocAndReadWholeMember(narc, memberIndex, HEAP_ID_FIELD1);
 
     NNS_G2dGetUnpackedPaletteData(nclrFile, paletteData);
 
@@ -1983,7 +1983,7 @@ static void CutIn_LoadBgPalette(NARC *narc, u32 memberIndex, NNSG2dPaletteData *
 
 static void CutIn_LoadBgPatternChar(BgConfig *bgConfig, NARC *narc, u32 memberIndex, NNSG2dCharacterData **charData)
 {
-    void *ncgrFile = NARC_AllocAndReadWholeMember(narc, memberIndex, HEAP_ID_FIELD);
+    void *ncgrFile = NARC_AllocAndReadWholeMember(narc, memberIndex, HEAP_ID_FIELD1);
     NNS_G2dGetUnpackedCharacterData(ncgrFile, charData);
 
     Bg_LoadTiles(bgConfig, BG_LAYER_MAIN_3, (*charData)->pRawData, (*charData)->szByte, 0);
@@ -1997,7 +1997,7 @@ static void CutIn_LoadBgPatternPalette(BgConfig *bgConfig, NARC *narc, u32 membe
     Bg_SetOffset(bgConfig, BG_LAYER_MAIN_3, 0, 0);
     Bg_SetOffset(bgConfig, BG_LAYER_MAIN_3, 3, 0);
 
-    nscrFile = NARC_AllocAndReadWholeMember(narc, memberIndex, HEAP_ID_FIELD);
+    nscrFile = NARC_AllocAndReadWholeMember(narc, memberIndex, HEAP_ID_FIELD1);
     NNS_G2dGetUnpackedScreenData(nscrFile, screenData);
 
     Bg_LoadTilemapBuffer(bgConfig, BG_LAYER_MAIN_3, (void *)(*screenData)->rawData, (*screenData)->szByte);
@@ -2090,7 +2090,7 @@ static void CutIn_BuildPokemonSpriteTemplate(HMCutIn *cutIn, PokemonSpriteTempla
 
 static void *CutIn_GetPokemonSpriteSource(Pokemon *pokemon, PokemonSpriteTemplate *spriteTemplate, u32 heapID)
 {
-    void *spriteSource = Heap_AllocFromHeap(HEAP_ID_FIELD, (32 * 10) * 10);
+    void *spriteSource = Heap_Alloc(HEAP_ID_FIELD1, (32 * 10) * 10);
 
     GF_ASSERT(spriteSource != NULL);
 
@@ -2108,7 +2108,7 @@ static void *CutIn_GetPokemonPaletteSource(PokemonSpriteTemplate *spriteTemplate
 
 static SpriteResource *CutIn_GetParticleCharResource(HMCutIn *cutIn, NARC *narc)
 {
-    SpriteResource *spriteResource = SpriteResourceCollection_AddTilesFrom(cutIn->charLocation, narc, 5, FALSE, 3, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD);
+    SpriteResource *spriteResource = SpriteResourceCollection_AddTilesFrom(cutIn->charLocation, narc, 5, FALSE, 3, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD1);
     return spriteResource;
 }
 
@@ -2128,7 +2128,7 @@ static void CutIn_LoadPokemonChar(HMCutIn *cutIn, void *pokemonSpriteSource)
 
 static SpriteResource *CutIn_GetPlayerMalePlttResource(HMCutIn *cutIn, NARC *narc)
 {
-    SpriteResource *spriteResource = SpriteResourceCollection_AddPaletteFrom(cutIn->paletteLocation, narc, 3, FALSE, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 1, HEAP_ID_FIELD);
+    SpriteResource *spriteResource = SpriteResourceCollection_AddPaletteFrom(cutIn->paletteLocation, narc, 3, FALSE, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 1, HEAP_ID_FIELD1);
     return spriteResource;
 }
 
@@ -2531,7 +2531,7 @@ static void Fly_PrepareBirdForDescent(HMCutIn *cutIn)
 
     env->unk_60 = PushPlayerUp(cutIn->unk_244, cutIn->playerSprite);
     cutIn->forceDrawPlayerSprite = TRUE;
-    env->task = ov5_021F0EB0(cutIn->fieldSystem, HEAP_ID_FIELD);
+    env->task = ov5_021F0EB0(cutIn->fieldSystem, HEAP_ID_FIELD1);
 
     ov5_021F0F10(env->task, 1, FX32_CONST(-120), 12);
 
@@ -2899,7 +2899,7 @@ static const UnkStruct_ov101_021D86B0 s_ = {
 
 SysTask *FieldTask_FlyLanding_InitTask(FieldSystem *fieldSystem, int playerGender)
 {
-    FlyLandingEnv *taskEnv = FlyLanding_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(FlyLandingEnv));
+    FlyLandingEnv *taskEnv = FlyLanding_AllocFromHeapAtEnd(HEAP_ID_FIELD1, sizeof(FlyLandingEnv));
 
     taskEnv->playerGender = playerGender;
     taskEnv->fieldSystem = fieldSystem;
@@ -2947,7 +2947,7 @@ static BOOL FlyLanding_HidePlayerMapObj(FlyLandingEnv *taskEnv)
 
 static BOOL FlyLanding_LoadResources(FlyLandingEnv *taskEnv)
 {
-    taskEnv->unk_1D4 = sub_020711EC(HEAP_ID_FIELD, 32);
+    taskEnv->unk_1D4 = sub_020711EC(HEAP_ID_FIELD1, 32);
     FlyLanding_InitResourceData(&taskEnv->unk_18, 32, 2, 2, 2, 1, 4, 3, 4, 2);
 
     {
@@ -3042,7 +3042,7 @@ static BOOL (*const sFlyLandingFuncs[])(FlyLandingEnv *) = {
 
 static void *FlyLanding_AllocFromHeapAtEnd(u32 heapID, int size)
 {
-    void *ptr = Heap_AllocFromHeapAtEnd(heapID, size);
+    void *ptr = Heap_AllocAtEnd(heapID, size);
 
     GF_ASSERT(ptr != NULL);
     memset(ptr, 0, size);
diff --git a/src/overlay006/npc_trade.c b/src/overlay006/npc_trade.c
index 5d8ad02f04..72e84ec713 100644
--- a/src/overlay006/npc_trade.c
+++ b/src/overlay006/npc_trade.c
@@ -29,7 +29,7 @@ NpcTradeData *NpcTrade_Init(u32 heapID, u32 npcTradeID)
 {
     GF_ASSERT(npcTradeID < MAX_NPC_TRADES);
 
-    NpcTradeData *data = Heap_AllocFromHeap(heapID, sizeof(NpcTradeData));
+    NpcTradeData *data = Heap_Alloc(heapID, sizeof(NpcTradeData));
     memset(data, 0, sizeof(NpcTradeData));
 
     data->npcTradeMon = LoadMemberFromNARC(NARC_INDEX_FIELDDATA__POKEMON_TRADE__FLD_TRADE, npcTradeID, FALSE, heapID, FALSE);
diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c
index ef3cbc8d84..7f691bebc2 100644
--- a/src/overlay006/ov6_0223E140.c
+++ b/src/overlay006/ov6_0223E140.c
@@ -397,7 +397,7 @@ static void ov6_0223E1D0(BgConfig *param0)
         };
 
         Bg_InitFromTemplate(param0, BG_LAYER_MAIN_3, &v1, 0);
-        Bg_ClearTilesRange(BG_LAYER_MAIN_3, 32, 0, HEAP_ID_FIELD);
+        Bg_ClearTilesRange(BG_LAYER_MAIN_3, 32, 0, HEAP_ID_FIELD1);
         Bg_ClearTilemap(param0, BG_LAYER_MAIN_3);
     }
 }
@@ -521,10 +521,10 @@ static BOOL ov6_0223E33C(FieldTask *taskMan)
 void ov6_0223E384(FieldTask *taskMan)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan);
-    UnkStruct_ov6_0223E33C *v1 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov6_0223E33C));
+    UnkStruct_ov6_0223E33C *v1 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov6_0223E33C));
 
     memset(v1, 0, sizeof(UnkStruct_ov6_0223E33C));
-    v1->unk_00 = ov6_0223FDE4(HEAP_ID_FIELD);
+    v1->unk_00 = ov6_0223FDE4(HEAP_ID_FIELD1);
 
     ov6_0223FE1C(v1->unk_00, FX32_CONST(2.0f), 0, 1, 16, fieldSystem->camera);
     FieldTask_InitCall(taskMan, ov6_0223E33C, v1);
@@ -608,10 +608,10 @@ static BOOL ov6_0223E408(FieldTask *param0)
 void ov6_0223E4EC(FieldTask *param0)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
-    UnkStruct_ov6_0223E33C *v1 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov6_0223E33C));
+    UnkStruct_ov6_0223E33C *v1 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov6_0223E33C));
 
     memset(v1, 0, sizeof(UnkStruct_ov6_0223E33C));
-    v1->unk_00 = ov6_0223FDE4(HEAP_ID_FIELD);
+    v1->unk_00 = ov6_0223FDE4(HEAP_ID_FIELD1);
 
     ov6_0223FE1C(v1->unk_00, FX32_CONST(4.0f), 0, 1, 24, fieldSystem->camera);
 
@@ -625,7 +625,7 @@ static void ov6_0223E548(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
 
     memset(v0, 0, sizeof(UnkStruct_ov6_0223E548));
 
-    v0->unk_48 = ov6_02240104(HEAP_ID_FIELD, fieldSystem);
+    v0->unk_48 = ov6_02240104(HEAP_ID_FIELD1, fieldSystem);
     v0->unk_00 = 0;
 }
 
@@ -684,7 +684,7 @@ static void ov6_0223E574(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
 
         if (v0->unk_6C.unk_00 == 3) {
             if (ov6_02240060(v0->unk_6C.unk_08) == 13) {
-                v0->unk_54 = ov6_02240B9C(HEAP_ID_FIELD, fieldSystem);
+                v0->unk_54 = ov6_02240B9C(HEAP_ID_FIELD1, fieldSystem);
             }
         }
 
@@ -829,7 +829,7 @@ static void ov6_0223E7B4(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
     v3 = 0;
     v4 = MapObject_GetZ(v1);
 
-    v0->unk_00 = ov6_02240768(HEAP_ID_FIELD);
+    v0->unk_00 = ov6_02240768(HEAP_ID_FIELD1);
     ov6_0224077C(v0->unk_00, v2, v3, v4);
 }
 
@@ -904,8 +904,8 @@ static void ov6_0223E830(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
     Camera_SetClipping(14 * FX32_ONE, 2031 * FX32_ONE, fieldSystem->camera);
 #endif
 
-    v0->unk_04 = ov6_022409F4(HEAP_ID_FIELD);
-    v0->unk_08 = ov6_02240AC8(HEAP_ID_FIELD);
+    v0->unk_04 = ov6_022409F4(HEAP_ID_FIELD1);
+    v0->unk_08 = ov6_02240AC8(HEAP_ID_FIELD1);
 
     v1 = Camera_GetTarget(fieldSystem->camera);
 
@@ -938,8 +938,8 @@ static void ov6_0223E8D0(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
 
     fieldSystem->areaLightMan = AreaLightManager_New(fieldSystem->areaModelAttrs, 3);
 
-    v0->unk_04 = ov6_022409F4(HEAP_ID_FIELD);
-    v0->unk_08 = ov6_02240AC8(HEAP_ID_FIELD);
+    v0->unk_04 = ov6_022409F4(HEAP_ID_FIELD1);
+    v0->unk_08 = ov6_02240AC8(HEAP_ID_FIELD1);
 
     v1 = Camera_GetTarget(fieldSystem->camera);
 
@@ -972,8 +972,8 @@ static void ov6_0223E984(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
 
     fieldSystem->areaLightMan = AreaLightManager_New(fieldSystem->areaModelAttrs, 3);
 
-    v0->unk_04 = ov6_022409F4(HEAP_ID_FIELD);
-    v0->unk_08 = ov6_02240AC8(HEAP_ID_FIELD);
+    v0->unk_04 = ov6_022409F4(HEAP_ID_FIELD1);
+    v0->unk_08 = ov6_02240AC8(HEAP_ID_FIELD1);
 
     v1 = Camera_GetTarget(fieldSystem->camera);
 
@@ -1038,11 +1038,11 @@ static void ov6_0223EA98(UnkStruct_ov6_0223EA98 *param0)
         { 10, 9 }
     };
 
-    v2 = NARC_ctor(NARC_INDEX_ARC__DEMO_TENGAN_GRA, HEAP_ID_FIELD);
+    v2 = NARC_ctor(NARC_INDEX_ARC__DEMO_TENGAN_GRA, HEAP_ID_FIELD1);
     v0 = v3[param0->unk_10][0];
     v1 = v3[param0->unk_10][1];
 
-    Easy3DModel_LoadFrom(&param0->unk_9C, v2, v0, HEAP_ID_FIELD);
+    Easy3DModel_LoadFrom(&param0->unk_9C, v2, v0, HEAP_ID_FIELD1);
     Easy3DObject_Init(&param0->unk_24, &param0->unk_9C);
     Easy3DObject_SetPosition(&param0->unk_24, 0, 0, 0);
     Easy3DObject_SetScale(&param0->unk_24, FX32_CONST(1.00f), FX32_CONST(1.00f), FX32_CONST(1.00f));
@@ -1075,7 +1075,7 @@ static void ov6_0223EB4C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
     v0->unk_10C = MapObjMan_LocalMapObjByIndex(v0->fieldSystem->mapObjMan, 0);
     v0->unk_110 = Player_MapObject(sub_0205EF3C(v0->fieldSystem));
 
-    Heap_FndInitAllocatorForExpHeap(&v0->unk_C0, HEAP_ID_FIELD, 32);
+    HeapExp_FndInitAllocator(&v0->unk_C0, HEAP_ID_FIELD1, 32);
     ov6_0223EA98(v0);
     GX_SetMasterBrightness(v0->unk_0C);
 
@@ -1117,7 +1117,7 @@ static BOOL ov6_0223EBDC(UnkStruct_ov6_0223EA98 *param0)
         Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
 
         if (v0[0] && v0[1]) {
-            Sound_PlayPokemonCryEx(POKECRY_NORMAL, SPECIES_UXIE, 0, 100, HEAP_ID_FIELD, 0);
+            Sound_PlayPokemonCryEx(POKECRY_NORMAL, SPECIES_UXIE, 0, 100, HEAP_ID_FIELD1, 0);
             param0->unk_18++;
         }
         break;
@@ -1340,7 +1340,7 @@ static BOOL ov6_0223EE5C(UnkStruct_ov6_0223EA98 *param0)
         }
 
         param0->unk_D0 = 0;
-        Sound_PlayPokemonCryEx(POKECRY_NORMAL, SPECIES_MESPRIT, 0, 100, HEAP_ID_FIELD, 0);
+        Sound_PlayPokemonCryEx(POKECRY_NORMAL, SPECIES_MESPRIT, 0, 100, HEAP_ID_FIELD1, 0);
         param0->unk_18++;
         break;
     case 16:
@@ -1481,7 +1481,7 @@ static BOOL ov6_0223F744(UnkStruct_ov6_0223EA98 *param0)
         Easy3DObject_SetPosition(&param0->unk_24, param0->unk_E4.unk_00, v2, param0->unk_F4.unk_00);
 
         if (v0[0] && v0[1]) {
-            Sound_PlayPokemonCryEx(POKECRY_NORMAL, SPECIES_AZELF, 0, 100, HEAP_ID_FIELD, 0);
+            Sound_PlayPokemonCryEx(POKECRY_NORMAL, SPECIES_AZELF, 0, 100, HEAP_ID_FIELD1, 0);
             param0->unk_18++;
         }
 
@@ -1819,7 +1819,7 @@ static void ov6_0223FDDC(Easy3DObject *param0, u16 param1, u32 param2)
 
 UnkStruct_ov6_0223FDE4 *ov6_0223FDE4(u32 heapID)
 {
-    UnkStruct_ov6_0223FDE4 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov6_0223FDE4));
+    UnkStruct_ov6_0223FDE4 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov6_0223FDE4));
     memset(v0, 0, sizeof(UnkStruct_ov6_0223FDE4));
     v0->camera1 = Camera_Alloc(heapID);
     v0->unk_40 = 5;
@@ -1997,12 +1997,12 @@ static void ov6_02240064(SysTask *param0, void *param1)
 
 UnkStruct_ov6_022400A8 *ov6_02240074(FieldSystem *fieldSystem)
 {
-    UnkStruct_ov6_022400A8 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov6_022400A8));
+    UnkStruct_ov6_022400A8 *v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov6_022400A8));
     memset(v0, 0, sizeof(UnkStruct_ov6_022400A8));
     v0->fieldSystem = fieldSystem;
     v0->unk_12C = 5;
 
-    Heap_FndInitAllocatorForExpHeap(&v0->unk_11C, HEAP_ID_FIELD, 32);
+    HeapExp_FndInitAllocator(&v0->unk_11C, HEAP_ID_FIELD1, 32);
 
     return v0;
 }
@@ -2031,13 +2031,13 @@ void ov6_022400C4(UnkStruct_ov6_022400A8 *param0)
 
 UnkStruct_ov6_022401B8 *ov6_02240104(u32 heapID, FieldSystem *fieldSystem)
 {
-    UnkStruct_ov6_022401B8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov6_022401B8));
+    UnkStruct_ov6_022401B8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov6_022401B8));
     memset(v0, 0, sizeof(UnkStruct_ov6_022401B8));
     v0->fieldSystem = fieldSystem;
     v0->unk_00 = 0;
     v0->heapID = heapID;
 
-    Heap_FndInitAllocatorForExpHeap(&v0->unk_10C, heapID, 32);
+    HeapExp_FndInitAllocator(&v0->unk_10C, heapID, 32);
     ov6_02240260(&v0->unk_34, v0->heapID, &v0->unk_10C);
 
     {
@@ -2385,7 +2385,7 @@ static void ov6_02240600(UnkStruct_ov6_02240260 *param0)
 
 static UnkStruct_ov6_02240774 *ov6_0224060C(u32 heapID, u32 param1)
 {
-    UnkStruct_ov6_02240774 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov6_02240774));
+    UnkStruct_ov6_02240774 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov6_02240774));
     memset(v0, 0, sizeof(UnkStruct_ov6_02240774));
 
     ov6_0223FD58(&v0->unk_00, 98, param1, heapID);
@@ -2554,10 +2554,10 @@ static UnkStruct_ov6_02240A00 *ov6_022408C8(u32 heapID, u32 param1)
     int v1;
     NARC *v2;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov6_02240A00));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov6_02240A00));
     memset(v0, 0, sizeof(UnkStruct_ov6_02240A00));
 
-    Heap_FndInitAllocatorForExpHeap(&v0->unk_C4, heapID, 32);
+    HeapExp_FndInitAllocator(&v0->unk_C4, heapID, 32);
     v2 = NARC_ctor(NARC_INDEX_DATA__DEMO_CLIMAX, heapID);
     ov6_0223FD60(&v0->unk_78, v2, param1, heapID);
 
@@ -2758,13 +2758,13 @@ UnkStruct_ov6_02240C44 *ov6_02240B9C(u32 heapID, FieldSystem *fieldSystem)
     int v1;
     NARC *v2;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov6_02240C44));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov6_02240C44));
     memset(v0, 0, sizeof(UnkStruct_ov6_02240C44));
 
     v2 = NARC_ctor(NARC_INDEX_DATA__DEMO_CLIMAX, heapID);
     v0->fieldSystem = fieldSystem;
 
-    Heap_FndInitAllocatorForExpHeap(&v0->unk_DC, heapID, 32);
+    HeapExp_FndInitAllocator(&v0->unk_DC, heapID, 32);
     ov6_0223FD60(&v0->unk_78, v2, 15, heapID);
 
     for (v1 = 0; v1 < 4; v1++) {
diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c
index a3bf2481ea..4a3a6ce7c6 100644
--- a/src/overlay006/ov6_022426AC.c
+++ b/src/overlay006/ov6_022426AC.c
@@ -31,7 +31,7 @@ static const u8 Unk_ov6_02249030[] = {
 
 GreatMarshLookout_SpriteResources *GreatMarshLookout_AllocSpriteResources(const int heapID)
 {
-    return Heap_AllocFromHeapAtEnd(heapID, sizeof(GreatMarshLookout_SpriteResources));
+    return Heap_AllocAtEnd(heapID, sizeof(GreatMarshLookout_SpriteResources));
 }
 
 void GreatMarshLookout_FreeSpriteResources(GreatMarshLookout_SpriteResources *resources)
@@ -69,19 +69,19 @@ void GreatMarshLookout_CreateLookoutMonSprite(GreatMarshLookout_SpriteResources
 
     BuildPokemonSpriteTemplate(&resources->unk_28, species, gender, 2, 0, NULL, NULL);
 
-    resources->unk_38 = SpriteList_InitRendering(1, &resources->unk_3C, HEAP_ID_FIELD);
-    v1 = NARC_ctor(NARC_INDEX_DATA__FIELD_CUTIN, HEAP_ID_FIELD);
+    resources->unk_38 = SpriteList_InitRendering(1, &resources->unk_3C, HEAP_ID_FIELD1);
+    v1 = NARC_ctor(NARC_INDEX_DATA__FIELD_CUTIN, HEAP_ID_FIELD1);
 
     for (i = 0; i < 4; i++) {
-        resources->unk_00[i] = SpriteResourceCollection_New(Unk_ov6_02249030[i], i, HEAP_ID_FIELD);
+        resources->unk_00[i] = SpriteResourceCollection_New(Unk_ov6_02249030[i], i, HEAP_ID_FIELD1);
     }
 
-    resources->unk_10[0] = SpriteResourceCollection_AddTilesFrom(resources->unk_00[0], v1, 5, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD);
-    resources->unk_10[1] = SpriteResourceCollection_AddPaletteFrom(resources->unk_00[1], v1, 3, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 1, HEAP_ID_FIELD);
-    resources->unk_10[2] = SpriteResourceCollection_AddFrom(resources->unk_00[2], v1, 6, 0, 2, 2, HEAP_ID_FIELD);
-    resources->unk_10[3] = SpriteResourceCollection_AddFrom(resources->unk_00[3], v1, 12, 0, 3, 3, HEAP_ID_FIELD);
-    resources->unk_20 = sub_0201363C(resources->unk_28.narcID, resources->unk_28.character, HEAP_ID_FIELD);
-    resources->unk_24 = sub_02013660(resources->unk_28.narcID, resources->unk_28.palette, HEAP_ID_FIELD);
+    resources->unk_10[0] = SpriteResourceCollection_AddTilesFrom(resources->unk_00[0], v1, 5, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD1);
+    resources->unk_10[1] = SpriteResourceCollection_AddPaletteFrom(resources->unk_00[1], v1, 3, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 1, HEAP_ID_FIELD1);
+    resources->unk_10[2] = SpriteResourceCollection_AddFrom(resources->unk_00[2], v1, 6, 0, 2, 2, HEAP_ID_FIELD1);
+    resources->unk_10[3] = SpriteResourceCollection_AddFrom(resources->unk_00[3], v1, 12, 0, 3, 3, HEAP_ID_FIELD1);
+    resources->unk_20 = sub_0201363C(resources->unk_28.narcID, resources->unk_28.character, HEAP_ID_FIELD1);
+    resources->unk_24 = sub_02013660(resources->unk_28.narcID, resources->unk_28.palette, HEAP_ID_FIELD1);
 
     ov6_02242880(resources->unk_00[0], resources->unk_00[1], resources->unk_20, resources->unk_24);
 
@@ -186,7 +186,7 @@ static void ov6_022428F8(GreatMarshLookout_SpriteResources *param0)
         v2.affineZRotation = 0;
         v2.priority = 0;
         v2.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v2.heapID = HEAP_ID_FIELD;
+        v2.heapID = HEAP_ID_FIELD1;
         v2.position.x = FX32_ONE * (256 / 2);
         v2.position.y = FX32_ONE * (192 / 2);
 
diff --git a/src/overlay006/ov6_02242AF0.c b/src/overlay006/ov6_02242AF0.c
index 87ba17c8ae..9755fe1edd 100644
--- a/src/overlay006/ov6_02242AF0.c
+++ b/src/overlay006/ov6_02242AF0.c
@@ -113,7 +113,7 @@ void ov6_02242B58(FieldSystem *fieldSystem, const u16 param1, const u16 param2)
 {
     PersistedMapFeatures *v0 = MiscSaveBlock_GetPersistedMapFeatures(FieldSystem_GetSaveData(fieldSystem));
     UnkStruct_ov6_02242AF0 *v1 = (UnkStruct_ov6_02242AF0 *)PersistedMapFeatures_GetBuffer(v0, DYNAMIC_MAP_FEATURES_GREAT_MARSH);
-    UnkStruct_ov6_02242B58 *v2 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov6_02242B58));
+    UnkStruct_ov6_02242B58 *v2 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov6_02242B58));
 
     memset(v2, 0, sizeof(UnkStruct_ov6_02242B58));
 
diff --git a/src/overlay006/ov6_02246444.c b/src/overlay006/ov6_02246444.c
index f2e5d59001..acbd8e24f2 100644
--- a/src/overlay006/ov6_02246444.c
+++ b/src/overlay006/ov6_02246444.c
@@ -92,7 +92,7 @@ int ov6_022464A4(const UnkStruct_ov6_022465F4 *param0)
 
 static UnkStruct_ov6_022465F4 *ov6_022464A8(FieldSystem *fieldSystem, UnkStruct_0202E794 *param1)
 {
-    UnkStruct_ov6_022465F4 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov6_022465F4));
+    UnkStruct_ov6_022465F4 *v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov6_022465F4));
 
     ov6_02246444(v0);
     ov6_0224645C(v0, sub_0202E4C8(param1));
@@ -106,7 +106,7 @@ static UnkStruct_ov6_022465F4 *ov6_022464A8(FieldSystem *fieldSystem, UnkStruct_
 static UnkStruct_ov6_022465F4 *ov6_022464F8(FieldSystem *fieldSystem, UnkStruct_0202E768 *param1)
 {
     TrainerInfo *v0 = SaveData_GetTrainerInfo(fieldSystem->saveData);
-    UnkStruct_ov6_022465F4 *v1 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov6_022465F4));
+    UnkStruct_ov6_022465F4 *v1 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov6_022465F4));
 
     ov6_02246444(v1);
     ov6_0224645C(v1, TrainerInfo_Name(v0));
@@ -121,7 +121,7 @@ static UnkStruct_ov6_022465F4 *ov6_022464F8(FieldSystem *fieldSystem, UnkStruct_
 static UnkStruct_ov6_022465F4 *ov6_02246550(FieldSystem *fieldSystem, int param1)
 {
     TrainerInfo *v0 = SaveData_GetTrainerInfo(fieldSystem->saveData);
-    UnkStruct_ov6_022465F4 *v1 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov6_022465F4));
+    UnkStruct_ov6_022465F4 *v1 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov6_022465F4));
 
     ov6_02246444(v1);
     v1->unk_00 = param1;
diff --git a/src/overlay006/ov6_02246C24.c b/src/overlay006/ov6_02246C24.c
index e32e3da367..50234709f6 100644
--- a/src/overlay006/ov6_02246C24.c
+++ b/src/overlay006/ov6_02246C24.c
@@ -46,7 +46,7 @@ void ov6_02246C24(FieldSystem *fieldSystem, const u8 param1)
     v0 = FieldSystem_FindLoadedMapPropByModelID(fieldSystem, v3, &v1, &v2);
 
     if (v0) {
-        UnkStruct_ov6_02246C24 *v4 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov6_02246C24));
+        UnkStruct_ov6_02246C24 *v4 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov6_02246C24));
 
         v4->unk_0C = param1;
         v4->unk_0D = 0;
diff --git a/src/overlay006/ov6_02246F00.c b/src/overlay006/ov6_02246F00.c
index c7c424830f..7ef940005b 100644
--- a/src/overlay006/ov6_02246F00.c
+++ b/src/overlay006/ov6_02246F00.c
@@ -29,7 +29,7 @@ void ov6_02246F00(FieldSystem *fieldSystem, const u8 param1, const u8 param2)
     BOOL v0 = FieldSystem_FindLoadedMapPropByModelID(fieldSystem, MAP_PROP_MODEL_ELEVATOR_LIGHTS, NULL, NULL);
 
     if (v0) {
-        UnkStruct_ov6_02246F00 *v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov6_02246F00));
+        UnkStruct_ov6_02246F00 *v1 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov6_02246F00));
 
         v1->unk_00 = param2;
         v1->unk_01 = param1;
diff --git a/src/overlay006/ov6_02247100.c b/src/overlay006/ov6_02247100.c
index f6238c0024..0182b7d6b3 100644
--- a/src/overlay006/ov6_02247100.c
+++ b/src/overlay006/ov6_02247100.c
@@ -80,7 +80,7 @@ BOOL ov6_02247120(FieldTask *task)
 
 static int ov6_0224715C(FieldTask *task, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2)
 {
-    param2->unk_14 = ov5_021F0EB0(fieldSystem, HEAP_ID_FIELD);
+    param2->unk_14 = ov5_021F0EB0(fieldSystem, HEAP_ID_FIELD1);
     ov5_021F0F10(param2->unk_14, 1, (FX32_ONE * -150), 15);
     param2->unk_0C = MapObject_StartAnimation(param2->unk_18, Unk_ov6_02249608);
     param2->unk_00++;
@@ -116,9 +116,9 @@ static int ov6_022471C0(FieldTask *task, FieldSystem *fieldSystem, UnkStruct_ov6
     }
 
     if (param2->unk_08 == 2) {
-        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
     } else {
-        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 6, 1, HEAP_ID_FIELD1);
     }
 
     param2->unk_00++;
@@ -205,7 +205,7 @@ static void ov6_0224732C(FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param
     void *journalEntryLocationEvent;
 
     if (param1->unk_08 == 2) {
-        journalEntryLocationEvent = JournalEntry_CreateEventUsedMove(LOCATION_EVENT_WARPED_TO_LOCATION - LOCATION_EVENT_USED_CUT, fieldSystem->location->mapId, HEAP_ID_FIELD);
+        journalEntryLocationEvent = JournalEntry_CreateEventUsedMove(LOCATION_EVENT_WARPED_TO_LOCATION - LOCATION_EVENT_USED_CUT, fieldSystem->location->mapId, HEAP_ID_FIELD1);
     } else {
         return;
     }
@@ -216,12 +216,12 @@ static void ov6_0224732C(FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param
 static int ov6_02247354(FieldTask *task, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2)
 {
     if (param2->unk_08 == 2) {
-        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
     } else {
-        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 6, 1, HEAP_ID_FIELD1);
     }
 
-    param2->unk_14 = ov5_021F0EB0(fieldSystem, HEAP_ID_FIELD);
+    param2->unk_14 = ov5_021F0EB0(fieldSystem, HEAP_ID_FIELD1);
     ov5_021F0F10(param2->unk_14, 1, (FX32_ONE * -150), 1);
     param2->unk_0C = MapObject_StartAnimation(param2->unk_18, Unk_ov6_022495DC);
     param2->unk_00++;
@@ -379,7 +379,7 @@ BOOL ov6_02247554(FieldTask *task)
 
 static void *ov6_02247590(u32 heapID, u32 param1)
 {
-    void *v0 = Heap_AllocFromHeapAtEnd(heapID, param1);
+    void *v0 = Heap_AllocAtEnd(heapID, param1);
 
     GF_ASSERT(v0 != NULL);
     memset(v0, 0, param1);
diff --git a/src/overlay006/ov6_02247A0C.c b/src/overlay006/ov6_02247A0C.c
index 91630c63e0..e7c66c0795 100644
--- a/src/overlay006/ov6_02247A0C.c
+++ b/src/overlay006/ov6_02247A0C.c
@@ -90,7 +90,7 @@ static const UnkStruct_ov6_022496F4 Unk_ov6_0224971C[][4] = {
 
 void ov6_02247A0C(FieldTask *param0)
 {
-    UnkStruct_ov6_02247A0C *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov6_02247A0C));
+    UnkStruct_ov6_02247A0C *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov6_02247A0C));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov6_02247A0C));
 
     FieldTask_InitCall(param0, ov6_02247A34, v0);
@@ -130,19 +130,19 @@ void *ov6_02247A90(void *param0)
 
     v1 = FieldSystem_GetBgConfig(param0);
     saveData = FieldSystem_GetSaveData(param0);
-    v0 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov6_02247A90));
+    v0 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov6_02247A90));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_ov6_02247A90));
 
-    v0->unk_10 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0208, HEAP_ID_FIELDMAP);
-    v0->unk_14 = StringTemplate_Default(HEAP_ID_FIELDMAP);
+    v0->unk_10 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0208, HEAP_ID_FIELD2);
+    v0->unk_14 = StringTemplate_Default(HEAP_ID_FIELD2);
 
     Window_Add(v1, &v0->unk_00, 3, 1, 3, 30, 17, 12, (1 + 10));
-    LoadStandardWindowGraphics(v1, BG_LAYER_MAIN_3, 1, 11, 0, HEAP_ID_FIELDMAP);
+    LoadStandardWindowGraphics(v1, BG_LAYER_MAIN_3, 1, 11, 0, HEAP_ID_FIELD2);
     Window_DrawStandardFrame(&v0->unk_00, 1, 1, 11);
     Window_FillTilemap(&v0->unk_00, 15);
 
-    v3 = Strbuf_Init(100, HEAP_ID_FIELDMAP);
+    v3 = Strbuf_Init(100, HEAP_ID_FIELD2);
     v2 = MessageLoader_GetNewStrbuf(v0->unk_10, 0);
 
     StringTemplate_SetPlayerName(v0->unk_14, 0, SaveData_GetTrainerInfo(saveData));
diff --git a/src/overlay006/ov6_02247D30.c b/src/overlay006/ov6_02247D30.c
index 9ffdb8156f..e0aa983ced 100644
--- a/src/overlay006/ov6_02247D30.c
+++ b/src/overlay006/ov6_02247D30.c
@@ -45,7 +45,7 @@ void ov6_02247D30(FieldSystem *fieldSystem, const u8 param1)
     v0 = FieldSystem_FindLoadedMapPropByModelID(fieldSystem, v3, &v1, &v2);
 
     if (v0) {
-        UnkStruct_ov6_02247D30 *v4 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov6_02247D30));
+        UnkStruct_ov6_02247D30 *v4 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov6_02247D30));
 
         v4->unk_0C = param1;
         v4->unk_0D = 0;
diff --git a/src/overlay006/ov6_02248050.c b/src/overlay006/ov6_02248050.c
index edb3592d8f..c5f6a522c6 100644
--- a/src/overlay006/ov6_02248050.c
+++ b/src/overlay006/ov6_02248050.c
@@ -146,7 +146,7 @@ static void ov6_02248140(UnkStruct_ov6_02248140 *param0, NARC *param1, u32 param
 
     memset(param0, 0, sizeof(UnkStruct_ov6_02248140));
 
-    Easy3DModel_LoadFrom(&param0->unk_78, param1, param2, HEAP_ID_FIELD);
+    Easy3DModel_LoadFrom(&param0->unk_78, param1, param2, HEAP_ID_FIELD1);
     Easy3DObject_Init(&param0->unk_00, &param0->unk_78);
 
     param0->unk_D8 = param4;
@@ -201,9 +201,9 @@ static void ov6_0224825C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
     NARC *v2;
 
     memset(v0, 0, sizeof(UnkStruct_ov6_0224825C));
-    Heap_FndInitAllocatorForExpHeap(&v0->unk_DC, HEAP_ID_FIELD, 32);
+    HeapExp_FndInitAllocator(&v0->unk_DC, HEAP_ID_FIELD1, 32);
 
-    v2 = NARC_ctor(NARC_INDEX_GRAPHIC__HIDEN_EFFECT, HEAP_ID_FIELD);
+    v2 = NARC_ctor(NARC_INDEX_GRAPHIC__HIDEN_EFFECT, HEAP_ID_FIELD1);
 
     ov6_02248140(&v0->unk_00, v2, 3, 0, 3, &v0->unk_DC);
     NARC_dtor(v2);
@@ -280,9 +280,9 @@ static void ov6_02248340(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
     NARC *v2;
 
     memset(v0, 0, sizeof(UnkStruct_ov6_02248340));
-    Heap_FndInitAllocatorForExpHeap(&v0->unk_DC, HEAP_ID_FIELD, 32);
+    HeapExp_FndInitAllocator(&v0->unk_DC, HEAP_ID_FIELD1, 32);
 
-    v2 = NARC_ctor(NARC_INDEX_GRAPHIC__HIDEN_EFFECT, HEAP_ID_FIELD);
+    v2 = NARC_ctor(NARC_INDEX_GRAPHIC__HIDEN_EFFECT, HEAP_ID_FIELD1);
 
     ov6_02248140(&v0->unk_00, v2, 8, 4, 4, &v0->unk_DC);
     NARC_dtor(v2);
@@ -300,9 +300,9 @@ static void ov6_022483A0(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
     NARC *v2;
 
     memset(v0, 0, sizeof(UnkStruct_ov6_02248340));
-    Heap_FndInitAllocatorForExpHeap(&v0->unk_DC, HEAP_ID_FIELD, 32);
+    HeapExp_FndInitAllocator(&v0->unk_DC, HEAP_ID_FIELD1, 32);
 
-    v2 = NARC_ctor(NARC_INDEX_GRAPHIC__HIDEN_EFFECT, HEAP_ID_FIELD);
+    v2 = NARC_ctor(NARC_INDEX_GRAPHIC__HIDEN_EFFECT, HEAP_ID_FIELD1);
 
     ov6_02248140(&v0->unk_00, v2, 8, 4, 4, &v0->unk_DC);
     ov6_02248050(fieldSystem->mapObjMan, 0, &v0->unk_00.unk_00);
@@ -398,9 +398,9 @@ static void ov6_02248498(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
     NARC *v2;
 
     memset(v0, 0, sizeof(UnkStruct_ov6_02248498));
-    Heap_FndInitAllocatorForExpHeap(&v0->unk_1B8, HEAP_ID_FIELD, 32);
+    HeapExp_FndInitAllocator(&v0->unk_1B8, HEAP_ID_FIELD1, 32);
 
-    v2 = NARC_ctor(NARC_INDEX_GRAPHIC__HIDEN_EFFECT, HEAP_ID_FIELD);
+    v2 = NARC_ctor(NARC_INDEX_GRAPHIC__HIDEN_EFFECT, HEAP_ID_FIELD1);
 
     ov6_02248140(&v0->unk_00[0], v2, 14, 12, 2, &v0->unk_1B8);
     ov6_02248124(fieldSystem->playerAvatar, &v0->unk_00[0].unk_00);
@@ -429,7 +429,7 @@ static void ov6_02248520(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
 
     switch (v0->unk_1C8) {
     case 0:
-        v2 = NARC_ctor(NARC_INDEX_GRAPHIC__HIDEN_EFFECT, HEAP_ID_FIELD);
+        v2 = NARC_ctor(NARC_INDEX_GRAPHIC__HIDEN_EFFECT, HEAP_ID_FIELD1);
         ov6_02248140(&v0->unk_00[1], v2, 11, 9, 2, &v0->unk_1B8);
         NARC_dtor(v2);
         ov6_02248124(fieldSystem->playerAvatar, &v0->unk_00[1].unk_00);
@@ -600,14 +600,14 @@ static void ov6_022487F8(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
     NARC *v2;
 
     memset(v0, 0, sizeof(UnkStruct_ov6_022487F8));
-    Heap_FndInitAllocatorForExpHeap(&v0->unk_CFC, HEAP_ID_FIELD, 32);
+    HeapExp_FndInitAllocator(&v0->unk_CFC, HEAP_ID_FIELD1, 32);
 
-    v2 = NARC_ctor(NARC_INDEX_GRAPHIC__HIDEN_EFFECT, HEAP_ID_FIELD);
+    v2 = NARC_ctor(NARC_INDEX_GRAPHIC__HIDEN_EFFECT, HEAP_ID_FIELD1);
 
-    Easy3DModel_LoadFrom(&v0->unk_00, v2, 8, HEAP_ID_FIELD);
+    Easy3DModel_LoadFrom(&v0->unk_00, v2, 8, HEAP_ID_FIELD1);
 
     for (v1 = 0; v1 < 4; v1++) {
-        v0->unk_CD0[v1] = LoadMemberFromOpenNARC(v2, 4 + v1, 0, HEAP_ID_FIELD, 0);
+        v0->unk_CD0[v1] = LoadMemberFromOpenNARC(v2, 4 + v1, 0, HEAP_ID_FIELD1, 0);
     }
 
     for (v1 = 0; v1 < 16; v1++) {
diff --git a/src/overlay006/ov6_02248948.c b/src/overlay006/ov6_02248948.c
index d20fdc955f..b3002a5c27 100644
--- a/src/overlay006/ov6_02248948.c
+++ b/src/overlay006/ov6_02248948.c
@@ -62,7 +62,7 @@ static void ov6_02248948(SysTask *param0, void *param1)
 
 void ov6_0224899C(FieldSystem *fieldSystem, u16 *param1, u32 param2, u32 heapID)
 {
-    UnkStruct_ov6_02248948 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov6_02248948));
+    UnkStruct_ov6_02248948 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov6_02248948));
 
     memset(v0, 0, sizeof(UnkStruct_ov6_02248948));
 
diff --git a/src/overlay006/ov6_022489E4.c b/src/overlay006/ov6_022489E4.c
index c8ac40b902..c6c42ff009 100644
--- a/src/overlay006/ov6_022489E4.c
+++ b/src/overlay006/ov6_022489E4.c
@@ -98,7 +98,7 @@ BOOL ov6_02248AF0(UnkStruct_02095C48 *param0, int param1, const Pokemon *param2)
     int v2;
 
     v1 = Pokemon_StructSize();
-    v0 = Heap_AllocFromHeap(HEAP_ID_20, v1 + 1);
+    v0 = Heap_Alloc(HEAP_ID_20, v1 + 1);
     MI_CpuCopy8(param2, v0, v1);
     v0[v1] = param1;
 
@@ -177,7 +177,7 @@ BOOL ov6_02248BE8(UnkStruct_02095C48 *param0, int param1, const UnkStruct_ov6_02
     int v2;
 
     v1 = sizeof(UnkStruct_ov6_02248BE8);
-    v0 = Heap_AllocFromHeap(HEAP_ID_20, v1 + 1);
+    v0 = Heap_Alloc(HEAP_ID_20, v1 + 1);
     MI_CpuCopy8(param2, v0, v1);
     v0[v1] = param1;
 
@@ -217,7 +217,7 @@ BOOL ov6_02248C68(UnkStruct_02095C48 *param0, int param1, const UnkStruct_020954
     int v3;
     const UnkStruct_020954F0 *v4 = param2;
     v1 = sizeof(UnkStruct_020954F0) * (1 + 2) + 1;
-    v0 = Heap_AllocFromHeap(HEAP_ID_20, v1);
+    v0 = Heap_Alloc(HEAP_ID_20, v1);
 
     for (v3 = 0; v3 < (1 + 2); v3++) {
         MI_CpuCopy8(v4, &v0[sizeof(UnkStruct_020954F0) * v3], sizeof(UnkStruct_020954F0));
@@ -267,7 +267,7 @@ BOOL ov6_02248CE8(UnkStruct_02095C48 *param0, int param1, const Strbuf *param2)
 
     Strbuf_ToChars(param2, v4, 8); // Possibly TRAINER_NAME_LEN + 1
 
-    v2 = Heap_AllocFromHeap(HEAP_ID_20, v0 + v1);
+    v2 = Heap_Alloc(HEAP_ID_20, v0 + v1);
     MI_CpuCopy8(v4, &v2[v1], v0);
     v2[0] = param1;
     v2[1] = v0;
@@ -351,7 +351,7 @@ BOOL ov6_02248DD8(UnkStruct_02095C48 *param0, int param1, const UnkStruct_ov6_02
     int v2;
 
     v1 = sizeof(UnkStruct_ov6_02248DD8);
-    v0 = Heap_AllocFromHeap(HEAP_ID_20, v1 + 1);
+    v0 = Heap_Alloc(HEAP_ID_20, v1 + 1);
     MI_CpuCopy8(param2, v0, v1);
     v0[v1] = param1;
 
diff --git a/src/overlay006/trophy_garden_daily_encounters.c b/src/overlay006/trophy_garden_daily_encounters.c
index 0511c3c797..dec622738a 100644
--- a/src/overlay006/trophy_garden_daily_encounters.c
+++ b/src/overlay006/trophy_garden_daily_encounters.c
@@ -16,7 +16,7 @@ void TrophyGarden_AddNewMon(SaveData *saveData)
     u16 newMonIndex;
     u16 index1, index2;
     int currentMons[2];
-    int *encData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, 8, HEAP_ID_FIELD);
+    int *encData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, 8, HEAP_ID_FIELD1);
 
     SpecialEncounter_GetTrophyGardenMons(saveData, &index1, &index2);
 
@@ -54,7 +54,7 @@ int TrophyGarden_GetSlot1Species(SaveData *saveData)
 
     GF_ASSERT(slot1 != TROPHY_GARDEN_SLOT_NONE);
 
-    encData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, 8, HEAP_ID_FIELD);
+    encData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, 8, HEAP_ID_FIELD1);
     species = encData[slot1];
 
     Heap_Free(encData);
diff --git a/src/overlay006/wild_encounters.c b/src/overlay006/wild_encounters.c
index 3102300b7e..6b9afd8bd3 100644
--- a/src/overlay006/wild_encounters.c
+++ b/src/overlay006/wild_encounters.c
@@ -213,7 +213,7 @@ static void WildEncounters_ReplaceTrophyGardenEncounters(FieldSystem *fieldSyste
         SpecialEncounter_GetTrophyGardenMons(fieldSystem->saveData, &index1, &index2);
 
         if (nationalDexObtained) {
-            int *trophyGardenData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, 8, HEAP_ID_FIELD);
+            int *trophyGardenData = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, 8, HEAP_ID_FIELD1);
 
             if (index1 != TROPHY_GARDEN_SLOT_NONE) {
                 *trophySlot1 = trophyGardenData[index1];
@@ -300,7 +300,7 @@ BOOL WildEncounters_TryWildEncounter(FieldSystem *fieldSystem)
 
         if (TryEncounterRoamer(fieldSystem, &roamer)) {
             if (!RepelPreventsEncounter(Roamer_GetData(roamer, ROAMER_DATA_LEVEL), &encounterFieldParams)) {
-                battleParams = FieldBattleDTO_New(HEAP_ID_FIELDMAP, BATTLE_TYPE_ROAMER);
+                battleParams = FieldBattleDTO_New(HEAP_ID_FIELD2, BATTLE_TYPE_ROAMER);
 
                 FieldBattleDTO_Init(battleParams, fieldSystem);
                 AddRoamerToEnemyParty(encounterFieldParams.trainerID, roamer, battleParams);
@@ -317,7 +317,7 @@ BOOL WildEncounters_TryWildEncounter(FieldSystem *fieldSystem)
         safariGameActive = SystemFlag_CheckSafariGameActive(SaveData_GetVarsFlags(fieldSystem->saveData));
         CreateWildSingleBattle(fieldSystem, safariGameActive, &battleParams);
     } else {
-        battleParams = FieldBattleDTO_New(HEAP_ID_FIELDMAP, BATTLE_TYPE_AI_PARTNER);
+        battleParams = FieldBattleDTO_New(HEAP_ID_FIELD2, BATTLE_TYPE_AI_PARTNER);
     }
 
     FieldBattleDTO_Init(battleParams, fieldSystem);
@@ -342,7 +342,7 @@ BOOL WildEncounters_TryWildEncounter(FieldSystem *fieldSystem)
             encounterSuccess = TryGenerateGrassEncounter_WithRadar(fieldSystem, firstPartyMon, battleParams, encounterData, encounterTable, &encounterFieldParams, &radarData);
         } else {
             battleParams->trainerIDs[BATTLER_PLAYER_2] = SystemVars_GetPartnerTrainerID(SaveData_GetVarsFlags(fieldSystem->saveData));
-            Trainer_Encounter(battleParams, fieldSystem->saveData, HEAP_ID_FIELDMAP);
+            Trainer_Encounter(battleParams, fieldSystem->saveData, HEAP_ID_FIELD2);
             encounterSuccess = TryGenerateGrassEncounter_DoubleBattle(fieldSystem, firstPartyMon, battleParams, encounterTable, &encounterFieldParams);
         }
     } else if (encounterType == ENCOUNTER_TYPE_SURF) {
@@ -365,8 +365,8 @@ BOOL WildEncounters_TryWildEncounter(FieldSystem *fieldSystem)
         gettingEncounter = FALSE;
     }
 
-    GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_FIELD));
-    GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_FIELDMAP));
+    GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_FIELD1));
+    GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_FIELD2));
 
     if (!gettingEncounter) {
         FieldBattleDTO_Free(battleParams);
@@ -490,7 +490,7 @@ BOOL WildEncounters_TrySweetScentEncounter(FieldSystem *fieldSystem, FieldTask *
         Roamer *roamer;
 
         if (TryEncounterRoamer(fieldSystem, &roamer)) {
-            battleParams = FieldBattleDTO_New(HEAP_ID_FIELDMAP, BATTLE_TYPE_ROAMER);
+            battleParams = FieldBattleDTO_New(HEAP_ID_FIELD2, BATTLE_TYPE_ROAMER);
 
             FieldBattleDTO_Init(battleParams, fieldSystem);
             AddRoamerToEnemyParty(encounterFieldParams.trainerID, roamer, battleParams);
@@ -504,7 +504,7 @@ BOOL WildEncounters_TrySweetScentEncounter(FieldSystem *fieldSystem, FieldTask *
         safariGameActive = SystemFlag_CheckSafariGameActive(SaveData_GetVarsFlags(fieldSystem->saveData));
         CreateWildSingleBattle(fieldSystem, safariGameActive, &battleParams);
     } else {
-        battleParams = FieldBattleDTO_New(HEAP_ID_FIELDMAP, BATTLE_TYPE_AI_PARTNER);
+        battleParams = FieldBattleDTO_New(HEAP_ID_FIELD2, BATTLE_TYPE_AI_PARTNER);
     }
 
     FieldBattleDTO_Init(battleParams, fieldSystem);
@@ -529,7 +529,7 @@ BOOL WildEncounters_TrySweetScentEncounter(FieldSystem *fieldSystem, FieldTask *
             encounterSuccess = TryGenerateGrassEncounter_WithRadar(fieldSystem, firstPartyMon, battleParams, encounterData, encounterTable, &encounterFieldParams, &radarData);
         } else {
             battleParams->trainerIDs[BATTLER_PLAYER_2] = SystemVars_GetPartnerTrainerID(SaveData_GetVarsFlags(fieldSystem->saveData));
-            Trainer_Encounter(battleParams, fieldSystem->saveData, HEAP_ID_FIELDMAP);
+            Trainer_Encounter(battleParams, fieldSystem->saveData, HEAP_ID_FIELD2);
             encounterSuccess = TryGenerateGrassEncounter_DoubleBattle(fieldSystem, firstPartyMon, battleParams, encounterTable, &encounterFieldParams);
         }
     } else if (encounterType == ENCOUNTER_TYPE_SURF) {
@@ -618,7 +618,7 @@ BOOL WildEncounters_TryMudEncounter(FieldSystem *fieldSystem, FieldBattleDTO **b
 
         if (TryEncounterRoamer(fieldSystem, &roamer)) {
             if (!RepelPreventsEncounter(Roamer_GetData(roamer, ROAMER_DATA_LEVEL), &encounterFieldParams)) {
-                *battleParams = FieldBattleDTO_New(HEAP_ID_FIELDMAP, BATTLE_TYPE_ROAMER);
+                *battleParams = FieldBattleDTO_New(HEAP_ID_FIELD2, BATTLE_TYPE_ROAMER);
 
                 FieldBattleDTO_Init(*battleParams, fieldSystem);
                 AddRoamerToEnemyParty(encounterFieldParams.trainerID, roamer, *battleParams);
@@ -634,7 +634,7 @@ BOOL WildEncounters_TryMudEncounter(FieldSystem *fieldSystem, FieldBattleDTO **b
         safariGameActive = SystemFlag_CheckSafariGameActive(SaveData_GetVarsFlags(fieldSystem->saveData));
         CreateWildSingleBattle(fieldSystem, safariGameActive, battleParams);
     } else {
-        *battleParams = FieldBattleDTO_New(HEAP_ID_FIELDMAP, BATTLE_TYPE_AI_PARTNER);
+        *battleParams = FieldBattleDTO_New(HEAP_ID_FIELD2, BATTLE_TYPE_AI_PARTNER);
     }
 
     FieldBattleDTO_Init(*battleParams, fieldSystem);
@@ -659,7 +659,7 @@ BOOL WildEncounters_TryMudEncounter(FieldSystem *fieldSystem, FieldBattleDTO **b
             encounterSuccess = TryGenerateGrassEncounter_WithRadar(fieldSystem, firstPartyMon, *battleParams, encounterData, encounterTable, &encounterFieldParams, &radarData);
         } else {
             (*battleParams)->trainerIDs[BATTLER_PLAYER_2] = SystemVars_GetPartnerTrainerID(SaveData_GetVarsFlags(fieldSystem->saveData));
-            Trainer_Encounter(*battleParams, fieldSystem->saveData, HEAP_ID_FIELDMAP);
+            Trainer_Encounter(*battleParams, fieldSystem->saveData, HEAP_ID_FIELD2);
             encounterSuccess = TryGenerateGrassEncounter_DoubleBattle(fieldSystem, firstPartyMon, *battleParams, encounterTable, &encounterFieldParams);
         }
     } else {
@@ -672,8 +672,8 @@ BOOL WildEncounters_TryMudEncounter(FieldSystem *fieldSystem, FieldBattleDTO **b
         gettingEncounter = FALSE;
     }
 
-    GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_FIELD));
-    GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_FIELDMAP));
+    GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_FIELD1));
+    GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_FIELD2));
 
     if (!gettingEncounter) {
         FieldBattleDTO_Free(*battleParams);
@@ -985,7 +985,7 @@ static void CreateWildMonShinyWithGenderOrNature(const u16 species, const u8 lev
     u8 firstMonGender;
     u8 firstMonNature;
 
-    Pokemon *newEncounter = Pokemon_New(HEAP_ID_FIELDMAP);
+    Pokemon *newEncounter = Pokemon_New(HEAP_ID_FIELD2);
     Pokemon_Init(newEncounter);
 
     BOOL abilityInEffect = FALSE;
@@ -1046,7 +1046,7 @@ static void CreateWildMonShinyWithGenderOrNature(const u16 species, const u8 lev
 
 static void CreateWildMon(u16 species, u8 level, const int partyDest, const WildEncounters_FieldParams *encounterFieldParams, Pokemon *firstPartyMon, FieldBattleDTO *battleParams)
 {
-    Pokemon *newEncounter = Pokemon_New(HEAP_ID_FIELDMAP);
+    Pokemon *newEncounter = Pokemon_New(HEAP_ID_FIELD2);
     Pokemon_Init(newEncounter);
     BOOL hasRandomGender = TRUE;
 
@@ -1380,10 +1380,10 @@ static BOOL FirstMonAbilityPreventsEncounter(const WildEncounters_FieldParams *e
 static void CreateWildSingleBattle(FieldSystem *fieldSystem, const BOOL safariGameActive, FieldBattleDTO **battleParams)
 {
     if (!safariGameActive) {
-        *battleParams = FieldBattleDTO_New(HEAP_ID_FIELDMAP, (0x0 | 0x0));
+        *battleParams = FieldBattleDTO_New(HEAP_ID_FIELD2, (0x0 | 0x0));
     } else {
         u16 *safariBallsCount = FieldOverworldState_GetSafariBallCount(SaveData_GetFieldOverworldState(fieldSystem->saveData));
-        *battleParams = FieldBattleDTO_NewSafari(HEAP_ID_FIELDMAP, *safariBallsCount);
+        *battleParams = FieldBattleDTO_NewSafari(HEAP_ID_FIELD2, *safariBallsCount);
     }
 }
 
@@ -1401,7 +1401,7 @@ static BOOL RepelPreventsEncounter(const u8 wildLevel, const WildEncounters_Fiel
 
 static void AddRoamerToEnemyParty(const u32 trainerID, Roamer *roamer, FieldBattleDTO *battle)
 {
-    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD);
+    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD1);
     int roamerSpecies = Roamer_GetData(roamer, ROAMER_DATA_SPECIES);
     u8 roamerLevel = Roamer_GetData(roamer, ROAMER_DATA_LEVEL);
     u32 roamerCombinedIVs = Roamer_GetData(roamer, ROAMER_DATA_IVS);
diff --git a/src/overlay007/accessory_shop.c b/src/overlay007/accessory_shop.c
index 3b99fc88e4..6a40594ff0 100644
--- a/src/overlay007/accessory_shop.c
+++ b/src/overlay007/accessory_shop.c
@@ -59,36 +59,36 @@ static void AccessoryShop_ClearInterface(AccessoryShop *shop);
 static void AccessoryShop_InitSpriteList(AccessoryShop *shop);
 static void AccessoryShop_DeleteSpriteList(AccessoryShop *shop);
 static void AccessoryShop_LoadOptions(AccessoryShop *shop);
-static void AccessoryShop_ShowMsgBox(AccessoryShopMessageBox *msgbox, BgConfig *bgConfig, enum HeapId heapID, u32 renderDelay);
+static void AccessoryShop_ShowMsgBox(AccessoryShopMessageBox *msgbox, BgConfig *bgConfig, enum HeapID heapID, u32 renderDelay);
 static void AccessoryShop_DeleteMsgBox(AccessoryShopMessageBox *msgbox);
-static void AccessoryShop_PrintStrbufToMsgBox(AccessoryShopMessageBox *msgbox, Strbuf *strbuf, enum HeapId heapID);
+static void AccessoryShop_PrintStrbufToMsgBox(AccessoryShopMessageBox *msgbox, Strbuf *strbuf, enum HeapID heapID);
 static BOOL AccessoryShop_HasMsgBoxFinishedPrinting(AccessoryShopMessageBox *msgbox);
-static void AccessoryShop_LoadConfirmPurchaseMsg(AccessoryShopMessageBox *msgbox, MessageLoader *msgLoader, enum HeapId heapID, const AccessoryShopItem *items, u32 idx);
-static void AccessoryShop_LoadSuccessfulPurchaseMsg(AccessoryShopMessageBox *msgbox, MessageLoader *msgLoader, enum HeapId heapID, const AccessoryShopItem *items, u32 idx);
-static void AccessoryShop_ShowDescBox(AccessoryShopDescBox *descBox, BgConfig *bgConfig, MessageLoader *msgLoader, enum HeapId heapID);
+static void AccessoryShop_LoadConfirmPurchaseMsg(AccessoryShopMessageBox *msgbox, MessageLoader *msgLoader, enum HeapID heapID, const AccessoryShopItem *items, u32 idx);
+static void AccessoryShop_LoadSuccessfulPurchaseMsg(AccessoryShopMessageBox *msgbox, MessageLoader *msgLoader, enum HeapID heapID, const AccessoryShopItem *items, u32 idx);
+static void AccessoryShop_ShowDescBox(AccessoryShopDescBox *descBox, BgConfig *bgConfig, MessageLoader *msgLoader, enum HeapID heapID);
 static void AccessoryShop_DeleteDescBox(AccessoryShopDescBox *descBox);
 static void AccessoryShop_UpdateDescBox(AccessoryShopDescBox *descBox, u32 berryId, u32 totalAmount, u32 inBagAmount);
-static void AccessoryShop_ShowItemList(AccessoryShopItemList *itemList, BgConfig *bgConfig, enum HeapId heapID, const AccessoryShopItem *items, u32 maxItems, MessageLoader *msgLoader, void *param6, AccessoryShopUpdateFunc updateFunc, SpriteList *spriteList);
+static void AccessoryShop_ShowItemList(AccessoryShopItemList *itemList, BgConfig *bgConfig, enum HeapID heapID, const AccessoryShopItem *items, u32 maxItems, MessageLoader *msgLoader, void *param6, AccessoryShopUpdateFunc updateFunc, SpriteList *spriteList);
 static void AccessoryShop_DeleteItemList(AccessoryShopItemList *itemList);
 static u32 AccessoryShop_SelectItemListMenu(AccessoryShopItemList *itemList);
 static void AccessoryShop_UpdateItemListMenu(AccessoryShopItemList *itemList);
 static void AccessoryShop_HideScrollArrows(AccessoryShopItemList *itemList);
-static void AccessoryShop_LoadScrollArrowGfx(SpriteResourcesHeader *scrollArrowResource, AccessoryShopItemList *itemList, enum HeapId heapID);
+static void AccessoryShop_LoadScrollArrowGfx(SpriteResourcesHeader *scrollArrowResource, AccessoryShopItemList *itemList, enum HeapID heapID);
 static void AccessoryShop_UnloadScrollArrowGfx(AccessoryShopItemList *itemList);
 static void AccessoryShop_UpdateScrollArrowsVisibility(AccessoryShopItemList *itemList);
-static void AccessoryShop_ShowYesNoChoice(AccessoryShopYesNoChoice *yesNoChoice, BgConfig *bgConfig, enum HeapId heapID);
+static void AccessoryShop_ShowYesNoChoice(AccessoryShopYesNoChoice *yesNoChoice, BgConfig *bgConfig, enum HeapID heapID);
 static void AccessoryShop_DeleteYesNoChoice(AccessoryShopYesNoChoice *yesNoChoice);
 static u32 AccessoryShop_SelectYesNoChoice(AccessoryShopYesNoChoice *yesNoChoice);
-static void AccessoryShop_SetDataPointers(AccessoryShopDataPtrs *dataPtr, AccessoryShopDescBox *descBox, const AccessoryShopItem *items, Bag *bag, enum HeapId heapID, BgConfig *bgConfig);
+static void AccessoryShop_SetDataPointers(AccessoryShopDataPtrs *dataPtr, AccessoryShopDescBox *descBox, const AccessoryShopItem *items, Bag *bag, enum HeapID heapID, BgConfig *bgConfig);
 static void AccessoryShop_Update(void *ptr, u32 cursorPos);
 static BOOL AccessoryShop_HasAllAccessories(const UnkStruct_02029D04 *param0, const AccessoryShopItem *items, u32 maxItems);
-static BOOL AccessoryShop_HasEnoughBerries(Bag *bag, const AccessoryShopItem *items, u32 idx, enum HeapId heapID);
+static BOOL AccessoryShop_HasEnoughBerries(Bag *bag, const AccessoryShopItem *items, u32 idx, enum HeapID heapID);
 static BOOL ov7_0224CCE4(const UnkStruct_02029D04 *param0, const AccessoryShopItem *items, u32 idx);
-static void AccessoryShop_DoPurchase(UnkStruct_02029D04 *param0, Bag *bag, const AccessoryShopItem *items, u32 idx, enum HeapId heapID);
+static void AccessoryShop_DoPurchase(UnkStruct_02029D04 *param0, Bag *bag, const AccessoryShopItem *items, u32 idx, enum HeapID heapID);
 
-AccessoryShop *AccessoryShop_New(enum HeapId heapID, SaveData *saveData, BgConfig *bgConfig)
+AccessoryShop *AccessoryShop_New(enum HeapID heapID, SaveData *saveData, BgConfig *bgConfig)
 {
-    AccessoryShop *shop = Heap_AllocFromHeap(heapID, sizeof(AccessoryShop));
+    AccessoryShop *shop = Heap_Alloc(heapID, sizeof(AccessoryShop));
 
     memset(shop, 0, sizeof(AccessoryShop));
 
@@ -301,7 +301,7 @@ static void AccessoryShop_DeleteSpriteList(AccessoryShop *shop)
     SpriteList_Delete(shop->spriteList);
 }
 
-static void AccessoryShop_ShowMsgBox(AccessoryShopMessageBox *msgbox, BgConfig *bgConfig, enum HeapId heapID, u32 renderDelay)
+static void AccessoryShop_ShowMsgBox(AccessoryShopMessageBox *msgbox, BgConfig *bgConfig, enum HeapID heapID, u32 renderDelay)
 {
     if (msgbox->active == TRUE) {
         return;
@@ -330,7 +330,7 @@ static void AccessoryShop_DeleteMsgBox(AccessoryShopMessageBox *msgbox)
     msgbox->active = FALSE;
 }
 
-static void AccessoryShop_PrintStrbufToMsgBox(AccessoryShopMessageBox *msgbox, Strbuf *strbuf, enum HeapId heapID)
+static void AccessoryShop_PrintStrbufToMsgBox(AccessoryShopMessageBox *msgbox, Strbuf *strbuf, enum HeapID heapID)
 {
     GF_ASSERT(msgbox->strbuf == NULL);
 
@@ -356,7 +356,7 @@ static BOOL AccessoryShop_HasMsgBoxFinishedPrinting(AccessoryShopMessageBox *msg
     return FALSE;
 }
 
-static void AccessoryShop_LoadConfirmPurchaseMsg(AccessoryShopMessageBox *msgbox, MessageLoader *msgLoader, enum HeapId heapID, const AccessoryShopItem *items, u32 idx)
+static void AccessoryShop_LoadConfirmPurchaseMsg(AccessoryShopMessageBox *msgbox, MessageLoader *msgLoader, enum HeapID heapID, const AccessoryShopItem *items, u32 idx)
 {
     Strbuf *fmtString, *strbuf;
     StringTemplate *strTemplate = StringTemplate_Default(heapID);
@@ -380,7 +380,7 @@ static void AccessoryShop_LoadConfirmPurchaseMsg(AccessoryShopMessageBox *msgbox
     Strbuf_Free(fmtString);
 }
 
-static void AccessoryShop_LoadSuccessfulPurchaseMsg(AccessoryShopMessageBox *msgbox, MessageLoader *msgLoader, enum HeapId heapID, const AccessoryShopItem *items, u32 idx)
+static void AccessoryShop_LoadSuccessfulPurchaseMsg(AccessoryShopMessageBox *msgbox, MessageLoader *msgLoader, enum HeapID heapID, const AccessoryShopItem *items, u32 idx)
 {
     Strbuf *fmtString, *strbuf;
     StringTemplate *strTemplate = StringTemplate_Default(heapID);
@@ -404,7 +404,7 @@ static void AccessoryShop_LoadSuccessfulPurchaseMsg(AccessoryShopMessageBox *msg
     Strbuf_Free(fmtString);
 }
 
-static void AccessoryShop_ShowDescBox(AccessoryShopDescBox *descBox, BgConfig *bgConfig, MessageLoader *msgLoader, enum HeapId heapID)
+static void AccessoryShop_ShowDescBox(AccessoryShopDescBox *descBox, BgConfig *bgConfig, MessageLoader *msgLoader, enum HeapID heapID)
 {
     if (descBox->active == TRUE) {
         return;
@@ -457,7 +457,7 @@ static void AccessoryShop_UpdateDescBox(AccessoryShopDescBox *descBox, u32 berry
     Window_DrawStandardFrame(descBox->window, FALSE, (1 + (18 + 12)), FIELD_WINDOW_PALETTE_INDEX);
 }
 
-static void AccessoryShop_ShowItemList(AccessoryShopItemList *itemList, BgConfig *bgConfig, enum HeapId heapID, const AccessoryShopItem *items, u32 maxItems, MessageLoader *msgLoader, void *param6, AccessoryShopUpdateFunc updateFunc, SpriteList *spriteList)
+static void AccessoryShop_ShowItemList(AccessoryShopItemList *itemList, BgConfig *bgConfig, enum HeapID heapID, const AccessoryShopItem *items, u32 maxItems, MessageLoader *msgLoader, void *param6, AccessoryShopUpdateFunc updateFunc, SpriteList *spriteList)
 {
     int i;
     Strbuf *fmtString;
@@ -616,7 +616,7 @@ static void AccessoryShop_HideScrollArrows(AccessoryShopItemList *itemList)
     Sprite_SetDrawFlag(itemList->sprites[ACCESSORY_SHOP_SPRITE_SCROLL_BOTTOM_ARROW], FALSE);
 }
 
-static void AccessoryShop_LoadScrollArrowGfx(SpriteResourcesHeader *scrollArrowResource, AccessoryShopItemList *itemList, enum HeapId heapID)
+static void AccessoryShop_LoadScrollArrowGfx(SpriteResourcesHeader *scrollArrowResource, AccessoryShopItemList *itemList, enum HeapID heapID)
 {
     NARC *narc = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, heapID);
 
@@ -660,7 +660,7 @@ static void AccessoryShop_UpdateScrollArrowsVisibility(AccessoryShopItemList *it
     }
 }
 
-static void AccessoryShop_SetDataPointers(AccessoryShopDataPtrs *dataPtr, AccessoryShopDescBox *descBox, const AccessoryShopItem *items, Bag *bag, enum HeapId heapID, BgConfig *bgConfig)
+static void AccessoryShop_SetDataPointers(AccessoryShopDataPtrs *dataPtr, AccessoryShopDescBox *descBox, const AccessoryShopItem *items, Bag *bag, enum HeapID heapID, BgConfig *bgConfig)
 {
     dataPtr->bgConfig = bgConfig;
     dataPtr->descBox = descBox;
@@ -683,7 +683,7 @@ static void AccessoryShop_Update(void *ptr, u32 cursorPos)
     }
 }
 
-static void AccessoryShop_ShowYesNoChoice(AccessoryShopYesNoChoice *yesNoChoice, BgConfig *bgConfig, enum HeapId heapID)
+static void AccessoryShop_ShowYesNoChoice(AccessoryShopYesNoChoice *yesNoChoice, BgConfig *bgConfig, enum HeapID heapID)
 {
     static const WindowTemplate winTemplate = {
         .bgLayer = BG_LAYER_MAIN_3,
@@ -729,7 +729,7 @@ static BOOL AccessoryShop_HasAllAccessories(const UnkStruct_02029D04 *param0, co
     return TRUE;
 }
 
-static BOOL AccessoryShop_HasEnoughBerries(Bag *bag, const AccessoryShopItem *items, u32 idx, enum HeapId heapID)
+static BOOL AccessoryShop_HasEnoughBerries(Bag *bag, const AccessoryShopItem *items, u32 idx, enum HeapID heapID)
 {
     u32 inBagAmount = Bag_GetItemQuantity(bag, items[idx].itemBerryID + FIRST_BERRY_IDX, heapID);
 
@@ -745,7 +745,7 @@ static BOOL ov7_0224CCE4(const UnkStruct_02029D04 *param0, const AccessoryShopIt
     return sub_02029D50(param0, items[idx].accessoryID, 1);
 }
 
-static void AccessoryShop_DoPurchase(UnkStruct_02029D04 *param0, Bag *bag, const AccessoryShopItem *items, u32 idx, enum HeapId heapID)
+static void AccessoryShop_DoPurchase(UnkStruct_02029D04 *param0, Bag *bag, const AccessoryShopItem *items, u32 idx, enum HeapID heapID)
 {
     u32 accessoryID = items[idx].accessoryID;
     u32 itemId = items[idx].itemBerryID + FIRST_BERRY_IDX;
diff --git a/src/overlay007/communication_club.c b/src/overlay007/communication_club.c
index bfd5c501cb..699c3f981e 100644
--- a/src/overlay007/communication_club.c
+++ b/src/overlay007/communication_club.c
@@ -203,7 +203,7 @@ static void CommClubMan_CreateList(ListMenuTemplate param0, u8 param1, u8 param2
     v0.choices = sCommClubMan->unk_64;
     v0.window = &sCommClubMan->unk_20;
 
-    sCommClubMan->unk_5C = ListMenu_New(&v0, 0, 0, HEAP_ID_FIELD);
+    sCommClubMan->unk_5C = ListMenu_New(&v0, 0, 0, HEAP_ID_FIELD1);
     Window_CopyToVRAM(&sCommClubMan->unk_20);
 }
 
@@ -213,23 +213,23 @@ static void CommClubMan_Init(FieldSystem *fieldSystem)
 
     GF_ASSERT(sCommClubMan == NULL);
 
-    sCommClubMan = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(CommClubManager));
+    sCommClubMan = Heap_Alloc(HEAP_ID_FIELD1, sizeof(CommClubManager));
     MI_CpuFill8(sCommClubMan, 0, sizeof(CommClubManager));
 
     sCommClubMan->retCode = 0;
     sCommClubMan->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->msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0353, HEAP_ID_FIELD1);
     sCommClubMan->trainerInfoPersonal = SaveData_GetTrainerInfo(FieldSystem_GetSaveData(sCommClubMan->fieldSystem));
-    sCommClubMan->unk_7C = TrainerInfo_New(HEAP_ID_FIELD);
+    sCommClubMan->unk_7C = TrainerInfo_New(HEAP_ID_FIELD1);
 
     Window_Init(&sCommClubMan->unk_20);
     Window_Init(&sCommClubMan->unk_30);
     Window_Init(&sCommClubMan->msgWindow);
 
-    sCommClubMan->unk_50 = StringTemplate_Default(HEAP_ID_FIELD);
-    sCommClubMan->unk_54 = StringTemplate_Default(HEAP_ID_FIELD);
-    sCommClubMan->strTempMsg = StringTemplate_Default(HEAP_ID_FIELD);
+    sCommClubMan->unk_50 = StringTemplate_Default(HEAP_ID_FIELD1);
+    sCommClubMan->unk_54 = StringTemplate_Default(HEAP_ID_FIELD1);
+    sCommClubMan->strTempMsg = StringTemplate_Default(HEAP_ID_FIELD1);
     sCommClubMan->unk_98 = 0;
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
@@ -237,7 +237,7 @@ static void CommClubMan_Init(FieldSystem *fieldSystem)
     }
 
     for (v0 = 0; v0 < 8; v0++) {
-        sCommClubMan->strBuff[v0] = Strbuf_Init((70 * 2), HEAP_ID_FIELD);
+        sCommClubMan->strBuff[v0] = Strbuf_Init((70 * 2), HEAP_ID_FIELD1);
     }
 }
 
@@ -430,7 +430,7 @@ static void ov7_02249F54(SysTask *task, void *data)
     if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) {
         int v2;
 
-        sCommClubMan->unk_64 = StringList_New(16, HEAP_ID_FIELD);
+        sCommClubMan->unk_64 = StringList_New(16, HEAP_ID_FIELD1);
 
         for (v2 = 0; v2 < 16; v2++) {
             StringTemplate_SetNumber(sCommClubMan->unk_50, 0, v2 + 1, 2, 2, 1);
@@ -842,7 +842,7 @@ static void ov7_0224A72C(SysTask *task, void *param1)
     if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) {
         int netId;
 
-        sCommClubMan->unk_64 = StringList_New(5, HEAP_ID_FIELD);
+        sCommClubMan->unk_64 = StringList_New(5, HEAP_ID_FIELD1);
 
         for (netId = 0; netId < 5; netId++) {
             StringList_AddFromMessageBank(sCommClubMan->unk_64, sCommClubMan->msgLoader, pl_msg_00000353_00069, 0);
diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c
index 18045cabc1..42e45381b8 100644
--- a/src/overlay007/ov7_0224B4E8.c
+++ b/src/overlay007/ov7_0224B4E8.c
@@ -111,7 +111,7 @@ static void ov7_0224B558(UnkStruct_ov7_0224B4E8 *param0, BOOL param1)
 
 static void ov7_0224B57C(UnkStruct_ov7_0224B4E8 *param0, int param1)
 {
-    sub_0202616C(param0->fieldSystem->saveData, param1, param0->unk_1C, HEAP_ID_FIELD);
+    sub_0202616C(param0->fieldSystem->saveData, param1, param0->unk_1C, HEAP_ID_FIELD1);
     StringTemplate_SetStrbuf(param0->unk_64, 0, param0->unk_1C, 0, 1, GAME_LANGUAGE);
 }
 
@@ -129,7 +129,7 @@ static void ov7_0224B5A8(UnkStruct_ov7_0224B4E8 *param0)
     if (Window_IsInUse(v1) == 0) {
         int v4;
 
-        param0->unk_08 = StringList_New(v3 + 2, HEAP_ID_FIELD);
+        param0->unk_08 = StringList_New(v3 + 2, HEAP_ID_FIELD1);
 
         Window_Add(param0->fieldSystem->bgConfig, v1, 3, 1, 1, 16, (v3 + 2) * 2, 13, 1);
         Window_DrawStandardFrame(&param0->unk_34, 1, 1024 - (18 + 12) - 9, 11);
@@ -153,7 +153,7 @@ static void ov7_0224B5A8(UnkStruct_ov7_0224B4E8 *param0)
     v0.window = &param0->unk_34;
     v0.parent = param0;
 
-    param0->unk_00 = ListMenu_New(&v0, 0, param0->unk_78, HEAP_ID_FIELD);
+    param0->unk_00 = ListMenu_New(&v0, 0, param0->unk_78, HEAP_ID_FIELD1);
     Window_CopyToVRAM(&param0->unk_34);
 }
 
@@ -222,7 +222,7 @@ static void ov7_0224B788(UnkStruct_ov7_0224B4E8 *param0)
     int v5 = 22;
     UnkStruct_ov7_0224F4D8 *v6 = Unk_ov7_0224F4D8;
 
-    param0->unk_0C = StringList_New(v1, HEAP_ID_FIELD);
+    param0->unk_0C = StringList_New(v1, HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_44, 3, v5, v3, v4, v1 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - v4 * v1 * 2);
     Window_DrawStandardFrame(&param0->unk_44, 1, 1024 - (18 + 12) - 9, 11);
@@ -243,7 +243,7 @@ static void ov7_0224B788(UnkStruct_ov7_0224B4E8 *param0)
     v0.window = &param0->unk_44;
     v0.parent = param0;
 
-    param0->unk_04 = ListMenu_New(&v0, 0, param0->unk_7A, HEAP_ID_FIELD);
+    param0->unk_04 = ListMenu_New(&v0, 0, param0->unk_7A, HEAP_ID_FIELD1);
     Window_CopyToVRAM(&param0->unk_44);
 }
 
@@ -326,9 +326,9 @@ static void ov7_0224B8DC(UnkStruct_ov7_0224B4E8 *param0)
     const int v12 = 55;
     const int v13 = (24 * 8) - 1;
 
-    v0 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0353, HEAP_ID_FIELD);
-    v2 = Strbuf_Init((90 * 2), HEAP_ID_FIELD);
-    v3 = Strbuf_Init((90 * 2), HEAP_ID_FIELD);
+    v0 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0353, HEAP_ID_FIELD1);
+    v2 = Strbuf_Init((90 * 2), HEAP_ID_FIELD1);
+    v3 = Strbuf_Init((90 * 2), HEAP_ID_FIELD1);
     v4 = &param0->unk_24;
 
     Window_Add(param0->fieldSystem->bgConfig, v4, 3, 4, 2, 24, 19, 13, 1);
@@ -551,20 +551,20 @@ static BOOL ov7_0224BC74(FieldTask *param0)
 
 static UnkStruct_ov7_0224B4E8 *ov7_0224BE10(FieldSystem *fieldSystem)
 {
-    UnkStruct_ov7_0224B4E8 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov7_0224B4E8));
+    UnkStruct_ov7_0224B4E8 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov7_0224B4E8));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_ov7_0224B4E8));
 
     v0->unk_7C = 0;
     v0->fieldSystem = fieldSystem;
     v0->fieldSystem->unk_B0 = NULL;
-    v0->unk_64 = StringTemplate_Default(HEAP_ID_FIELD);
-    v0->unk_68 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0221, HEAP_ID_FIELD);
-    v0->unk_14 = Strbuf_Init((90 * 2), HEAP_ID_FIELD);
-    v0->unk_18 = Strbuf_Init((90 * 2), HEAP_ID_FIELD);
-    v0->unk_1C = Strbuf_Init((90 * 2), HEAP_ID_FIELD);
-    v0->unk_20 = Strbuf_Init((90 * 2), HEAP_ID_FIELD);
-    v0->unk_6C = sub_0207A2A8(HEAP_ID_FIELDMAP);
+    v0->unk_64 = StringTemplate_Default(HEAP_ID_FIELD1);
+    v0->unk_68 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0221, HEAP_ID_FIELD1);
+    v0->unk_14 = Strbuf_Init((90 * 2), HEAP_ID_FIELD1);
+    v0->unk_18 = Strbuf_Init((90 * 2), HEAP_ID_FIELD1);
+    v0->unk_1C = Strbuf_Init((90 * 2), HEAP_ID_FIELD1);
+    v0->unk_20 = Strbuf_Init((90 * 2), HEAP_ID_FIELD1);
+    v0->unk_6C = sub_0207A2A8(HEAP_ID_FIELD2);
 
     return v0;
 }
diff --git a/src/overlay007/shop_menu.c b/src/overlay007/shop_menu.c
index 493471846a..80f58d3d07 100644
--- a/src/overlay007/shop_menu.c
+++ b/src/overlay007/shop_menu.c
@@ -219,7 +219,7 @@ static void Shop_SetItemsForSale(ShopMenu *shopMenu, u16 *itemsPtr)
     }
 
     shopMenu->itemsCount = i;
-    shopMenu->itemsPtr = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, shopMenu->itemsCount * sizeof(u16));
+    shopMenu->itemsPtr = Heap_Alloc(HEAP_ID_FIELD2, shopMenu->itemsCount * sizeof(u16));
 
     for (i = 0; i < shopMenu->itemsCount; i++) {
         shopMenu->itemsPtr[i] = itemsPtr[i];
@@ -228,7 +228,7 @@ static void Shop_SetItemsForSale(ShopMenu *shopMenu, u16 *itemsPtr)
 
 static ShopMenu *Shop_Alloc(void)
 {
-    ShopMenu *shopMenu = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(ShopMenu));
+    ShopMenu *shopMenu = Heap_Alloc(HEAP_ID_FIELD2, sizeof(ShopMenu));
 
     memset(shopMenu, 0, sizeof(ShopMenu));
     return shopMenu;
@@ -240,7 +240,7 @@ void Shop_Start(FieldTask *task, FieldSystem *fieldSystem, u16 *shopItems, u8 ma
 
     shopMenu->bgConfig = fieldSystem->bgConfig;
 
-    shopMenu->strbuf = Strbuf_Init(96, HEAP_ID_FIELDMAP);
+    shopMenu->strbuf = Strbuf_Init(96, HEAP_ID_FIELD2);
     shopMenu->trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData);
     shopMenu->options = SaveData_GetOptions(fieldSystem->saveData);
     shopMenu->records = SaveData_GetGameRecords(fieldSystem->saveData);
@@ -250,7 +250,7 @@ void Shop_Start(FieldTask *task, FieldSystem *fieldSystem, u16 *shopItems, u8 ma
     shopMenu->journalEntry = fieldSystem->journalEntry;
     shopMenu->martType = martType;
     shopMenu->saveData = fieldSystem->saveData;
-    shopMenu->unk_2B4 = FontSpecialChars_Init(1, 2, 0, HEAP_ID_FIELDMAP);
+    shopMenu->unk_2B4 = FontSpecialChars_Init(1, 2, 0, HEAP_ID_FIELD2);
 
     if (shopMenu->martType == MART_TYPE_NORMAL) {
         shopMenu->destInventory = SaveData_GetBag(fieldSystem->saveData);
@@ -364,8 +364,8 @@ static void Shop_ShowContextMenu(ShopMenu *shopMenu)
 
 static void Shop_InitStringUtil(ShopMenu *shopMenu)
 {
-    shopMenu->msgLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0543, HEAP_ID_FIELDMAP);
-    shopMenu->strTemplate = StringTemplate_Default(HEAP_ID_FIELDMAP);
+    shopMenu->msgLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0543, HEAP_ID_FIELD2);
+    shopMenu->strTemplate = StringTemplate_Default(HEAP_ID_FIELD2);
 }
 
 static void Shop_InitContextMenu(ShopMenu *shopMenu)
@@ -375,7 +375,7 @@ static void Shop_InitContextMenu(ShopMenu *shopMenu)
 
     if (shopMenu->martType == MART_TYPE_NORMAL) {
         maxOptions = 3;
-        shopMenu->optionsList = StringList_New(maxOptions, HEAP_ID_FIELDMAP);
+        shopMenu->optionsList = StringList_New(maxOptions, HEAP_ID_FIELD2);
 
         StringList_AddFromMessageBank(shopMenu->optionsList, shopMenu->msgLoader, pl_msg_00000543_00015, SHOP_STATE_INIT_CAMERA);
         StringList_AddFromMessageBank(shopMenu->optionsList, shopMenu->msgLoader, pl_msg_00000543_00016, 14);
@@ -383,14 +383,14 @@ static void Shop_InitContextMenu(ShopMenu *shopMenu)
         Window_Add(shopMenu->bgConfig, &shopMenu->windows[0], BG_LAYER_MAIN_3, 1, 1, 13, 6, FIELD_MESSAGE_PALETTE_INDEX, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6)));
     } else if (shopMenu->martType == MART_TYPE_FRONTIER) {
         maxOptions = 2;
-        shopMenu->optionsList = StringList_New(maxOptions, HEAP_ID_FIELDMAP);
+        shopMenu->optionsList = StringList_New(maxOptions, HEAP_ID_FIELD2);
 
         StringList_AddFromMessageBank(shopMenu->optionsList, shopMenu->msgLoader, pl_msg_00000543_00029, SHOP_STATE_INIT_CAMERA);
         StringList_AddFromMessageBank(shopMenu->optionsList, shopMenu->msgLoader, pl_msg_00000543_00030, LIST_CANCEL);
         Window_Add(shopMenu->bgConfig, &shopMenu->windows[0], BG_LAYER_MAIN_3, 23, 13, 7, 4, FIELD_MESSAGE_PALETTE_INDEX, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6)));
     } else {
         maxOptions = 2;
-        shopMenu->optionsList = StringList_New(maxOptions, HEAP_ID_FIELDMAP);
+        shopMenu->optionsList = StringList_New(maxOptions, HEAP_ID_FIELD2);
 
         StringList_AddFromMessageBank(shopMenu->optionsList, shopMenu->msgLoader, pl_msg_00000543_00015, SHOP_STATE_INIT_CAMERA);
         StringList_AddFromMessageBank(shopMenu->optionsList, shopMenu->msgLoader, pl_msg_00000543_00017, LIST_CANCEL);
@@ -406,10 +406,10 @@ static void Shop_InitContextMenu(ShopMenu *shopMenu)
     menuTemplate.suppressCursor = FALSE;
     menuTemplate.loopAround = FALSE;
 
-    LoadStandardWindowGraphics(shopMenu->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, FIELD_WINDOW_PALETTE_INDEX, 0, HEAP_ID_FIELDMAP);
+    LoadStandardWindowGraphics(shopMenu->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, FIELD_WINDOW_PALETTE_INDEX, 0, HEAP_ID_FIELD2);
     Window_DrawStandardFrame(&shopMenu->windows[0], TRUE, 1024 - (18 + 12) - 9, FIELD_WINDOW_PALETTE_INDEX);
 
-    shopMenu->choiceMenu = Menu_NewAndCopyToVRAM(&menuTemplate, 8, 0, 0, HEAP_ID_FIELDMAP, PAD_BUTTON_B);
+    shopMenu->choiceMenu = Menu_NewAndCopyToVRAM(&menuTemplate, 8, 0, 0, HEAP_ID_FIELD2, PAD_BUTTON_B);
 }
 
 static u8 Shop_SelectContextMenu(ShopMenu *shopMenu)
@@ -457,19 +457,19 @@ static u8 Shop_Exit(FieldSystem *fieldSystem, ShopMenu *shopMenu)
             && fieldSystem->location->mapId != MAP_HEADER_ETERNA_CITY_NORTH_HOUSE
             && fieldSystem->location->mapId != MAP_HEADER_CELESTIC_TOWN_NORTHWEST_HOUSE) {
             if (shopMenu->itemPurchaseCount != 0 && shopMenu->itemSoldCount != 0) {
-                journalEntryLocationEvent = JournalEntry_CreateEventBusinessAtMart(HEAP_ID_FIELDMAP);
+                journalEntryLocationEvent = JournalEntry_CreateEventBusinessAtMart(HEAP_ID_FIELD2);
                 JournalEntry_SaveData(shopMenu->journalEntry, journalEntryLocationEvent, JOURNAL_LOCATION);
             } else if (shopMenu->itemPurchaseCount > 1) {
-                journalEntryLocationEvent = JournalEntry_CreateEventLotsOfShopping(HEAP_ID_FIELDMAP);
+                journalEntryLocationEvent = JournalEntry_CreateEventLotsOfShopping(HEAP_ID_FIELD2);
                 JournalEntry_SaveData(shopMenu->journalEntry, journalEntryLocationEvent, JOURNAL_LOCATION);
             } else if (shopMenu->itemSoldCount > 1) {
-                journalEntryLocationEvent = JournalEntry_CreateEventSoldALot(HEAP_ID_FIELDMAP);
+                journalEntryLocationEvent = JournalEntry_CreateEventSoldALot(HEAP_ID_FIELD2);
                 JournalEntry_SaveData(shopMenu->journalEntry, journalEntryLocationEvent, JOURNAL_LOCATION);
             } else if (shopMenu->itemPurchaseCount != 0) {
-                journalEntryLocationEvent = JournalEntry_CreateEventShoppedAtMart(HEAP_ID_FIELDMAP);
+                journalEntryLocationEvent = JournalEntry_CreateEventShoppedAtMart(HEAP_ID_FIELD2);
                 JournalEntry_SaveData(shopMenu->journalEntry, journalEntryLocationEvent, JOURNAL_LOCATION);
             } else if (shopMenu->itemSoldCount != 0) {
-                journalEntryLocationEvent = JournalEntry_CreateEventSoldALittle(HEAP_ID_FIELDMAP);
+                journalEntryLocationEvent = JournalEntry_CreateEventSoldALittle(HEAP_ID_FIELD2);
                 JournalEntry_SaveData(shopMenu->journalEntry, journalEntryLocationEvent, JOURNAL_LOCATION);
             }
         }
@@ -491,7 +491,7 @@ static void Shop_InitCamera(FieldSystem *fieldSystem, ShopMenu *shopMenu)
     Shop_CloseContextMenu(shopMenu);
     Shop_LoadWindows(shopMenu);
 
-    shopMenu->camera = Camera_Alloc(HEAP_ID_FIELDMAP);
+    shopMenu->camera = Camera_Alloc(HEAP_ID_FIELD2);
 
     Camera_Copy(fieldSystem->camera, shopMenu->camera);
     Camera_SetAsActive(shopMenu->camera);
@@ -524,24 +524,24 @@ static void Shop_DestroyStaticWindows(ShopMenu *shopMenu)
 
 static void Shop_LoadGraphics(ShopMenu *shopMenu)
 {
-    NARC *narc = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, HEAP_ID_FIELDMAP);
+    NARC *narc = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, HEAP_ID_FIELD2);
 
-    Graphics_LoadTilesToBgLayerFromOpenNARC(narc, tiles_NCGR, shopMenu->bgConfig, BG_LAYER_MAIN_1, 0, 0, FALSE, HEAP_ID_FIELDMAP);
+    Graphics_LoadTilesToBgLayerFromOpenNARC(narc, tiles_NCGR, shopMenu->bgConfig, BG_LAYER_MAIN_1, 0, 0, FALSE, HEAP_ID_FIELD2);
 
     if ((shopMenu->martType == MART_TYPE_NORMAL) || (shopMenu->martType == MART_TYPE_FRONTIER)) {
-        Graphics_LoadTilemapToBgLayerFromOpenNARC(narc, tilemap_NSCR, shopMenu->bgConfig, BG_LAYER_MAIN_1, 0, 0, FALSE, HEAP_ID_FIELDMAP);
+        Graphics_LoadTilemapToBgLayerFromOpenNARC(narc, tilemap_NSCR, shopMenu->bgConfig, BG_LAYER_MAIN_1, 0, 0, FALSE, HEAP_ID_FIELD2);
     } else {
-        Graphics_LoadTilemapToBgLayerFromOpenNARC(narc, tilemap_no_item_NSCR, shopMenu->bgConfig, BG_LAYER_MAIN_1, 0, 0, FALSE, HEAP_ID_FIELDMAP);
+        Graphics_LoadTilemapToBgLayerFromOpenNARC(narc, tilemap_no_item_NSCR, shopMenu->bgConfig, BG_LAYER_MAIN_1, 0, 0, FALSE, HEAP_ID_FIELD2);
     }
 
     if (shopMenu->martType == MART_TYPE_FRONTIER) {
-        Graphics_LoadPaletteFromOpenNARC(narc, frontier_NCLR, 0, PLTT_OFFSET(0), PALETTE_SIZE_BYTES, HEAP_ID_FIELDMAP);
+        Graphics_LoadPaletteFromOpenNARC(narc, frontier_NCLR, 0, PLTT_OFFSET(0), PALETTE_SIZE_BYTES, HEAP_ID_FIELD2);
     } else {
-        Graphics_LoadPaletteFromOpenNARC(narc, default_NCLR, 0, PLTT_OFFSET(0), PALETTE_SIZE_BYTES, HEAP_ID_FIELDMAP);
+        Graphics_LoadPaletteFromOpenNARC(narc, default_NCLR, 0, PLTT_OFFSET(0), PALETTE_SIZE_BYTES, HEAP_ID_FIELD2);
     }
 
-    LoadStandardWindowGraphics(shopMenu->bgConfig, BG_LAYER_MAIN_3, (1 + (18 + 12)), FIELD_WINDOW_PALETTE_INDEX, 0, HEAP_ID_FIELDMAP);
-    LoadMessageBoxGraphics(shopMenu->bgConfig, BG_LAYER_MAIN_3, 1, 10, Options_Frame(shopMenu->options), HEAP_ID_FIELDMAP);
+    LoadStandardWindowGraphics(shopMenu->bgConfig, BG_LAYER_MAIN_3, (1 + (18 + 12)), FIELD_WINDOW_PALETTE_INDEX, 0, HEAP_ID_FIELD2);
+    LoadMessageBoxGraphics(shopMenu->bgConfig, BG_LAYER_MAIN_3, 1, 10, Options_Frame(shopMenu->options), HEAP_ID_FIELD2);
     NARC_dtor(narc);
 }
 
@@ -638,15 +638,15 @@ static void Shop_InitItemsList(ShopMenu *shopMenu)
     BOOL isTMShop = FALSE;
 
     if ((shopMenu->martType == MART_TYPE_NORMAL) || (shopMenu->martType == MART_TYPE_FRONTIER)) {
-        itemNames = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_ITEM_NAMES, HEAP_ID_FIELDMAP);
-        moveNames = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MOVE_NAMES, HEAP_ID_FIELDMAP);
+        itemNames = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_ITEM_NAMES, HEAP_ID_FIELD2);
+        moveNames = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MOVE_NAMES, HEAP_ID_FIELD2);
     } else if (shopMenu->martType == MART_TYPE_DECOR) {
-        itemNames = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_GOODS, HEAP_ID_FIELDMAP);
+        itemNames = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_GOODS, HEAP_ID_FIELD2);
     } else {
-        itemNames = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_BALL_SEAL_NAMES, HEAP_ID_FIELDMAP);
+        itemNames = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_BALL_SEAL_NAMES, HEAP_ID_FIELD2);
     }
 
-    shopMenu->itemsList = StringList_New(shopMenu->itemsCount + 1, HEAP_ID_FIELDMAP);
+    shopMenu->itemsList = StringList_New(shopMenu->itemsCount + 1, HEAP_ID_FIELD2);
 
     for (i = 0; i < shopMenu->itemsCount; i++) {
         itemId = Shop_GetItemId(shopMenu, shopMenu->itemsPtr[i]);
@@ -689,7 +689,7 @@ static void Shop_InitItemsList(ShopMenu *shopMenu)
     listTemplate.count = shopMenu->itemsCount + 1;
     listTemplate.parent = (void *)shopMenu;
 
-    shopMenu->listMenu = ListMenu_New(&listTemplate, 0, 0, HEAP_ID_FIELDMAP);
+    shopMenu->listMenu = ListMenu_New(&listTemplate, 0, 0, HEAP_ID_FIELD2);
 }
 
 static void Shop_MenuCursorCallback(ListMenu *menu, u32 index, u8 onInit)
@@ -706,21 +706,21 @@ static void Shop_MenuCursorCallback(ListMenu *menu, u32 index, u8 onInit)
         Strbuf *strbuf;
 
         if (shopMenu->martType == MART_TYPE_NORMAL) {
-            strbuf = Strbuf_Init(130, HEAP_ID_FIELDMAP);
-            Item_LoadDescription(strbuf, index, HEAP_ID_FIELDMAP);
+            strbuf = Strbuf_Init(130, HEAP_ID_FIELD2);
+            Item_LoadDescription(strbuf, index, HEAP_ID_FIELD2);
         } else if (shopMenu->martType == MART_TYPE_FRONTIER) {
-            strbuf = Strbuf_Init(130, HEAP_ID_FIELDMAP);
-            Item_LoadDescription(strbuf, index, HEAP_ID_FIELDMAP);
+            strbuf = Strbuf_Init(130, HEAP_ID_FIELD2);
+            Item_LoadDescription(strbuf, index, HEAP_ID_FIELD2);
         } else if (shopMenu->martType == MART_TYPE_DECOR) {
             MessageLoader *loader;
 
-            loader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_GOODS, HEAP_ID_FIELDMAP);
+            loader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_GOODS, HEAP_ID_FIELD2);
             strbuf = MessageLoader_GetNewStrbuf(loader, pl_msg_00000626_00139 + index - 1);
             MessageLoader_Free(loader);
         } else {
             MessageLoader *loader;
 
-            loader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0542, HEAP_ID_FIELDMAP);
+            loader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0542, HEAP_ID_FIELD2);
             strbuf = MessageLoader_GetNewStrbuf(loader, sub_020981F4(index));
 
             MessageLoader_Free(loader);
@@ -772,7 +772,7 @@ static void Shop_MenuPrintCallback(ListMenu *menu, u32 index, u8 yOffset)
         }
 
         price = Shop_GetItemPrice(shopMenu, index);
-        strbuf = Strbuf_Init(12, HEAP_ID_FIELDMAP);
+        strbuf = Strbuf_Init(12, HEAP_ID_FIELD2);
 
         if (shopMenu->martType == MART_TYPE_FRONTIER) {
             fmtString = MessageLoader_GetNewStrbuf(shopMenu->msgLoader, pl_msg_00000543_00032);
@@ -813,7 +813,7 @@ static void Shop_PrintCurrentMoney(ShopMenu *shopMenu, u8 clearCurrMoney)
             Window_FillRectWithColor(&shopMenu->windows[SHOP_WINDOW_CURRENT_MONEY], 15, 0, 0, (9 * 8), 16);
         }
 
-        strbuf = Strbuf_Init(16, HEAP_ID_FIELDMAP);
+        strbuf = Strbuf_Init(16, HEAP_ID_FIELD2);
         fmtString = MessageLoader_GetNewStrbuf(shopMenu->msgLoader, pl_msg_00000543_00038);
         currMoney = Shop_GetCurrentMoney(shopMenu);
 
@@ -836,7 +836,7 @@ static void Shop_PrintCurrentMoney(ShopMenu *shopMenu, u8 clearCurrMoney)
             Window_FillRectWithColor(&shopMenu->windows[SHOP_WINDOW_CURRENT_MONEY], 15, 0, 16, (9 * 8), 16);
         }
 
-        strbuf = Strbuf_Init(16, HEAP_ID_FIELDMAP);
+        strbuf = Strbuf_Init(16, HEAP_ID_FIELD2);
         fmtString = MessageLoader_GetNewStrbuf(shopMenu->msgLoader, pl_msg_00000543_00019);
         currMoney = Shop_GetCurrentMoney(shopMenu);
 
@@ -968,9 +968,9 @@ static void Shop_ShowQtyWithinInventory(ShopMenu *shopMenu)
     u16 inventoryQty;
 
     if (shopMenu->martType == MART_TYPE_NORMAL) {
-        inventoryQty = Bag_GetItemQuantity(shopMenu->destInventory, shopMenu->itemId, HEAP_ID_FIELDMAP);
+        inventoryQty = Bag_GetItemQuantity(shopMenu->destInventory, shopMenu->itemId, HEAP_ID_FIELD2);
     } else if (shopMenu->martType == MART_TYPE_FRONTIER) {
-        inventoryQty = Bag_GetItemQuantity(shopMenu->destInventory, shopMenu->itemId, HEAP_ID_FIELDMAP);
+        inventoryQty = Bag_GetItemQuantity(shopMenu->destInventory, shopMenu->itemId, HEAP_ID_FIELD2);
     } else if (shopMenu->martType == MART_TYPE_SEAL) {
         inventoryQty = sub_0202CBC8(shopMenu->destInventory, shopMenu->itemId);
     } else {
@@ -980,7 +980,7 @@ static void Shop_ShowQtyWithinInventory(ShopMenu *shopMenu)
     Window_FillTilemap(&shopMenu->windows[SHOP_WINDOW_ITEMS_IN_BAG], 15);
     Window_DrawStandardFrame(&shopMenu->windows[SHOP_WINDOW_ITEMS_IN_BAG], TRUE, (1 + (18 + 12)), FIELD_WINDOW_PALETTE_INDEX);
 
-    strbuf = Strbuf_Init(24, HEAP_ID_FIELDMAP);
+    strbuf = Strbuf_Init(24, HEAP_ID_FIELD2);
     fmtString = MessageLoader_GetNewStrbuf(shopMenu->msgLoader, pl_msg_00000543_00020);
 
     StringTemplate_SetNumber(shopMenu->strTemplate, 0, inventoryQty, 3, PADDING_MODE_SPACES, CHARSET_MODE_EN);
@@ -1037,9 +1037,9 @@ static u8 Shop_ShowPurchaseMessage(ShopMenu *shopMenu)
     BOOL canFitItem;
 
     if (shopMenu->martType == MART_TYPE_NORMAL) {
-        canFitItem = Bag_CanFitItem(shopMenu->destInventory, shopMenu->itemId, shopMenu->itemAmount, HEAP_ID_FIELDMAP);
+        canFitItem = Bag_CanFitItem(shopMenu->destInventory, shopMenu->itemId, shopMenu->itemAmount, HEAP_ID_FIELD2);
     } else if (shopMenu->martType == MART_TYPE_FRONTIER) {
-        canFitItem = Bag_CanFitItem(shopMenu->destInventory, shopMenu->itemId, shopMenu->itemAmount, HEAP_ID_FIELDMAP);
+        canFitItem = Bag_CanFitItem(shopMenu->destInventory, shopMenu->itemId, shopMenu->itemAmount, HEAP_ID_FIELD2);
     } else if (shopMenu->martType == MART_TYPE_DECOR) {
         if (Underground_GetGoodsCountPC(shopMenu->destInventory) == MAX_GOODS_PC_SLOTS) {
             canFitItem = FALSE;
@@ -1111,7 +1111,7 @@ static void Shop_ShowQtyTotalItemPurchase(ShopMenu *shopMenu, u8 dontDrawFrame)
         Window_DrawStandardFrame(&shopMenu->windows[SHOP_WINDOW_QUANTITY_TOTAL_PRICE], TRUE, (1 + (18 + 12)), FIELD_WINDOW_PALETTE_INDEX);
     }
 
-    strbuf = Strbuf_Init(24, HEAP_ID_FIELDMAP);
+    strbuf = Strbuf_Init(24, HEAP_ID_FIELD2);
     fmtString = MessageLoader_GetNewStrbuf(shopMenu->msgLoader, pl_msg_00000543_00021);
 
     StringTemplate_SetNumber(shopMenu->strTemplate, 0, shopMenu->itemAmount, 2, PADDING_MODE_ZEROES, CHARSET_MODE_EN);
@@ -1142,13 +1142,13 @@ static u8 Shop_ShowConfirmPurchase(ShopMenu *shopMenu)
         return SHOP_STATE_SHOW_CONFIRM_PURCHASE;
     }
 
-    shopMenu->choiceMenu = Menu_MakeYesNoChoice(shopMenu->bgConfig, &sShop_YesNoChoiceWindowTemplate, (1 + (18 + 12)), FIELD_WINDOW_PALETTE_INDEX, HEAP_ID_FIELDMAP);
+    shopMenu->choiceMenu = Menu_MakeYesNoChoice(shopMenu->bgConfig, &sShop_YesNoChoiceWindowTemplate, (1 + (18 + 12)), FIELD_WINDOW_PALETTE_INDEX, HEAP_ID_FIELD2);
     return SHOP_STATE_SELECT_CONFIRM_PURCHASE;
 }
 
 static u8 Shop_SelectConfirmPurchase(ShopMenu *shopMenu)
 {
-    switch (Menu_ProcessInputAndHandleExit(shopMenu->choiceMenu, HEAP_ID_FIELDMAP)) {
+    switch (Menu_ProcessInputAndHandleExit(shopMenu->choiceMenu, HEAP_ID_FIELD2)) {
     case 0: {
         Strbuf *strbuf;
 
@@ -1161,7 +1161,7 @@ static u8 Shop_SelectConfirmPurchase(ShopMenu *shopMenu)
                 StringTemplate_SetItemNamePlural(shopMenu->strTemplate, 0, shopMenu->itemId);
             }
 
-            StringTemplate_SetBagPocketName(shopMenu->strTemplate, 1, Item_LoadParam(shopMenu->itemId, ITEM_PARAM_FIELD_POCKET, HEAP_ID_FIELDMAP));
+            StringTemplate_SetBagPocketName(shopMenu->strTemplate, 1, Item_LoadParam(shopMenu->itemId, ITEM_PARAM_FIELD_POCKET, HEAP_ID_FIELD2));
         } else if (shopMenu->martType == MART_TYPE_FRONTIER) {
             if (shopMenu->itemAmount == 1) {
                 StringTemplate_SetItemName(shopMenu->strTemplate, 0, shopMenu->itemId);
@@ -1170,7 +1170,7 @@ static u8 Shop_SelectConfirmPurchase(ShopMenu *shopMenu)
             }
 
             strbuf = MessageLoader_GetNewStrbuf(shopMenu->msgLoader, pl_msg_00000543_00006);
-            StringTemplate_SetBagPocketName(shopMenu->strTemplate, 1, Item_LoadParam(shopMenu->itemId, ITEM_PARAM_FIELD_POCKET, HEAP_ID_FIELDMAP));
+            StringTemplate_SetBagPocketName(shopMenu->strTemplate, 1, Item_LoadParam(shopMenu->itemId, ITEM_PARAM_FIELD_POCKET, HEAP_ID_FIELD2));
         } else {
             if (shopMenu->martType == MART_TYPE_DECOR) {
                 Shop_SetItemNameToIndex(shopMenu, shopMenu->itemId, 0);
@@ -1213,10 +1213,10 @@ static u8 Shop_ConfirmItemPurchase(ShopMenu *shopMenu)
     }
 
     if (shopMenu->martType == MART_TYPE_NORMAL) {
-        Bag_TryAddItem(shopMenu->destInventory, shopMenu->itemId, shopMenu->itemAmount, HEAP_ID_FIELDMAP);
+        Bag_TryAddItem(shopMenu->destInventory, shopMenu->itemId, shopMenu->itemAmount, HEAP_ID_FIELD2);
         sub_0206D504(shopMenu->saveData, shopMenu->itemId, shopMenu->itemAmount);
     } else if (shopMenu->martType == MART_TYPE_FRONTIER) {
-        Bag_TryAddItem(shopMenu->destInventory, shopMenu->itemId, shopMenu->itemAmount, HEAP_ID_FIELDMAP);
+        Bag_TryAddItem(shopMenu->destInventory, shopMenu->itemId, shopMenu->itemAmount, HEAP_ID_FIELD2);
     } else if (shopMenu->martType == MART_TYPE_DECOR) {
         Underground_TryAddGoodPC(shopMenu->destInventory, shopMenu->itemId);
     } else {
@@ -1256,7 +1256,7 @@ static u8 Shop_FinishPurchase(ShopMenu *shopMenu)
         }
 
         if (((shopMenu->martType == MART_TYPE_NORMAL) || (shopMenu->martType == MART_TYPE_FRONTIER)) && (shopMenu->itemId == ITEM_POKE_BALL) && (shopMenu->itemAmount >= 10)) {
-            if (Bag_TryAddItem(shopMenu->destInventory, ITEM_PREMIER_BALL, 1, HEAP_ID_FIELDMAP) == TRUE) {
+            if (Bag_TryAddItem(shopMenu->destInventory, ITEM_PREMIER_BALL, 1, HEAP_ID_FIELD2) == TRUE) {
                 Strbuf *strbuf = MessageLoader_GetNewStrbuf(shopMenu->msgLoader, pl_msg_00000543_00010);
 
                 StringTemplate_Format(shopMenu->strTemplate, shopMenu->strbuf, strbuf);
@@ -1322,7 +1322,7 @@ static void Shop_SetItemNameToIndex(ShopMenu *shopMenu, u16 itemId, u16 idx)
 static u32 Shop_GetItemPrice(ShopMenu *shopMenu, u16 itemId)
 {
     if (shopMenu->martType == MART_TYPE_NORMAL) {
-        return Item_LoadParam(itemId, ITEM_PARAM_PRICE, HEAP_ID_FIELDMAP);
+        return Item_LoadParam(itemId, ITEM_PARAM_PRICE, HEAP_ID_FIELD2);
     } else if (shopMenu->martType == MART_TYPE_FRONTIER) {
         return Shop_GetItemBPPrice(shopMenu, itemId);
     } else if (shopMenu->martType == MART_TYPE_DECOR) {
@@ -1540,7 +1540,7 @@ static const SpriteTemplateFromResourceHeader sShop_SpriteTemplates[] = {
 
 static void Shop_DrawSprites(ShopMenu *shopMenu)
 {
-    ov5_021D2F14(&shopMenu->unk_94, &sShop_SpriteResourcePaths, 4, HEAP_ID_FIELDMAP);
+    ov5_021D2F14(&shopMenu->unk_94, &sShop_SpriteResourcePaths, 4, HEAP_ID_FIELD2);
 
     for (u32 i = 0; i < SHOP_SPRITE_MAX; i++) {
         shopMenu->sprites[i] = ov5_021D3104(&shopMenu->unk_94, &sShop_SpriteTemplates[i]);
@@ -1580,12 +1580,12 @@ static void Shop_ChangeItemIconGfx(ShopMenu *shopMenu, u16 itemId)
 
     spriteRes = SpriteResourceCollection_Find(shopMenu->unk_94.unk_194[0], 2);
 
-    SpriteResourceCollection_ModifyTiles(shopMenu->unk_94.unk_194[0], spriteRes, 16, Item_FileID(itemId, ITEM_FILE_TYPE_ICON), FALSE, HEAP_ID_FIELDMAP);
+    SpriteResourceCollection_ModifyTiles(shopMenu->unk_94.unk_194[0], spriteRes, 16, Item_FileID(itemId, ITEM_FILE_TYPE_ICON), FALSE, HEAP_ID_FIELD2);
     SpriteTransfer_RetransferCharData(spriteRes);
 
     spriteRes = SpriteResourceCollection_Find(shopMenu->unk_94.unk_194[1], 1);
 
-    SpriteResourceCollection_ModifyPalette(shopMenu->unk_94.unk_194[1], spriteRes, 16, Item_FileID(itemId, ITEM_FILE_TYPE_PALETTE), FALSE, HEAP_ID_FIELDMAP);
+    SpriteResourceCollection_ModifyPalette(shopMenu->unk_94.unk_194[1], spriteRes, 16, Item_FileID(itemId, ITEM_FILE_TYPE_PALETTE), FALSE, HEAP_ID_FIELD2);
     SpriteTransfer_ReplacePlttData(spriteRes);
 }
 
@@ -1615,7 +1615,7 @@ static void Shop_FinishScreenTransition(FieldTask *task)
     Shop_CloseContextMenu(shopMenu);
 
     Bag *bag = SaveData_GetBag(fieldSystem->saveData);
-    shopMenu->unk_04 = sub_0207D824(bag, sShop_BagPockets, HEAP_ID_FIELDMAP);
+    shopMenu->unk_04 = sub_0207D824(bag, sShop_BagPockets, HEAP_ID_FIELD2);
 
     BagSystem_Init(shopMenu->unk_04, fieldSystem->saveData, 2, fieldSystem->bagCursor);
     sub_0203D1E4(fieldSystem, shopMenu->unk_04);
diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c
index b86130d592..893cb268bb 100644
--- a/src/overlay008/ov8_02249960.c
+++ b/src/overlay008/ov8_02249960.c
@@ -365,7 +365,7 @@ void ov8_0224997C(FieldSystem *fieldSystem)
         v7 = MiscSaveBlock_GetPersistedMapFeatures(FieldSystem_GetSaveData(fieldSystem));
         v8 = (UnkStruct_02071B10 *)PersistedMapFeatures_GetBuffer(v7, DYNAMIC_MAP_FEATURES_PASTORIA_GYM);
 
-        v6 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov8_0224997C));
+        v6 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov8_0224997C));
         v6->unk_00 = 0;
 
         if (v4 == 239) {
@@ -743,7 +743,7 @@ void include_ov8_02249960(void)
 
 void ov8_02249FB8(FieldSystem *fieldSystem)
 {
-    UnkStruct_ov8_0224997C *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov8_0224997C));
+    UnkStruct_ov8_0224997C *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov8_0224997C));
     v0->unk_00 = 0;
 
     {
@@ -1238,7 +1238,7 @@ static void ov8_0224A254(UnkStruct_ov8_0224A1E4 *param0, const u8 param1)
     UnkStruct_ov8_0224997C *v2;
     PersistedMapFeatures *v3 = MiscSaveBlock_GetPersistedMapFeatures(FieldSystem_GetSaveData(param0->fieldSystem));
     UnkStruct_02071B30 *v4 = (UnkStruct_02071B30 *)PersistedMapFeatures_GetBuffer(v3, DYNAMIC_MAP_FEATURES_CANALAVE_GYM);
-    v2 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov8_0224997C));
+    v2 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov8_0224997C));
 
     v2->unk_00 = 0;
     param0->unk_E8 = param1;
@@ -1554,7 +1554,7 @@ void CanalaveGym_DynamicMapFeaturesInit(FieldSystem *fieldSystem)
     PersistedMapFeatures *v1 = MiscSaveBlock_GetPersistedMapFeatures(FieldSystem_GetSaveData(fieldSystem));
     UnkStruct_02071B30 *v2 = (UnkStruct_02071B30 *)PersistedMapFeatures_GetBuffer(v1, DYNAMIC_MAP_FEATURES_CANALAVE_GYM);
 
-    fieldSystem->unk_04->dynamicMapFeaturesData = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov8_0224A1E4));
+    fieldSystem->unk_04->dynamicMapFeaturesData = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov8_0224A1E4));
 
     v0 = fieldSystem->unk_04->dynamicMapFeaturesData;
     v0->fieldSystem = fieldSystem;
@@ -2058,7 +2058,7 @@ void SunyshoreGym_DynamicMapFeaturesInit(FieldSystem *fieldSystem)
     PersistedMapFeatures *v1 = MiscSaveBlock_GetPersistedMapFeatures(FieldSystem_GetSaveData(fieldSystem));
     UnkStruct_02071B6C *v2 = (UnkStruct_02071B6C *)PersistedMapFeatures_GetBuffer(v1, DYNAMIC_MAP_FEATURES_SUNYSHORE_GYM);
 
-    fieldSystem->unk_04->dynamicMapFeaturesData = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov8_0224ABD4));
+    fieldSystem->unk_04->dynamicMapFeaturesData = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov8_0224ABD4));
 
     v0 = fieldSystem->unk_04->dynamicMapFeaturesData;
 
@@ -2140,7 +2140,7 @@ void ov8_0224AD34(FieldSystem *fieldSystem, const u8 param1)
     PersistedMapFeatures *v2 = MiscSaveBlock_GetPersistedMapFeatures(FieldSystem_GetSaveData(fieldSystem));
     UnkStruct_02071B6C *v3 = (UnkStruct_02071B6C *)PersistedMapFeatures_GetBuffer(v2, DYNAMIC_MAP_FEATURES_SUNYSHORE_GYM);
     v1 = (UnkStruct_ov8_0224ABD4 *)fieldSystem->unk_04->dynamicMapFeaturesData;
-    v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov8_0224997C));
+    v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov8_0224997C));
 
     v0->unk_00 = 0;
 
@@ -2395,7 +2395,7 @@ void EternaGym_DynamicMapFeaturesInit(FieldSystem *fieldSystem)
 {
     PersistedMapFeatures *v0 = MiscSaveBlock_GetPersistedMapFeatures(FieldSystem_GetSaveData(fieldSystem));
     UnkStruct_02071BD0 *v1 = PersistedMapFeatures_GetBuffer(v0, DYNAMIC_MAP_FEATURES_ETERNA_GYM);
-    UnkStruct_ov8_0224AF00 *v2 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov8_0224AF00));
+    UnkStruct_ov8_0224AF00 *v2 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov8_0224AF00));
 
     memset(v2, 0, sizeof(UnkStruct_ov8_0224AF00));
     fieldSystem->unk_04->dynamicMapFeaturesData = v2;
@@ -2849,7 +2849,7 @@ BOOL ov8_0224B67C(FieldSystem *fieldSystem, Window *param1, MessageLoader *param
         UnkStruct_ov8_0224AF00 *v3 = fieldSystem->unk_04->dynamicMapFeaturesData;
         const UnkStruct_ov8_0224C774 *v4 = &Unk_ov8_0224C774[v1->unk_00];
 
-        v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov8_0224B67C));
+        v2 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov8_0224B67C));
         memset(v2, 0, sizeof(UnkStruct_ov8_0224B67C));
 
         v2->unk_44 = param1;
@@ -2929,7 +2929,7 @@ void VeilstoneGym_DynamicMapFeaturesInit(FieldSystem *fieldSystem)
 {
     PersistedMapFeatures *v0 = MiscSaveBlock_GetPersistedMapFeatures(FieldSystem_GetSaveData(fieldSystem));
     UnkStruct_02071BF8 *v1 = PersistedMapFeatures_GetBuffer(v0, DYNAMIC_MAP_FEATURES_VEILSTONE_GYM);
-    UnkStruct_ov8_0224B8D0 *v2 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov8_0224B8D0));
+    UnkStruct_ov8_0224B8D0 *v2 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov8_0224B8D0));
 
     memset(v2, 0, sizeof(UnkStruct_ov8_0224B8D0));
 
@@ -3435,7 +3435,7 @@ static int (*const Unk_ov8_0224C818[11])(UnkStruct_ov8_0224C098 *) = {
 
 static UnkStruct_ov8_0224C098 *ov8_0224BED8(UnkStruct_ov8_0224B8D0 *param0, UnkStruct_ov8_0224BCA8 *param1, int param2)
 {
-    UnkStruct_ov8_0224C098 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov8_0224C098));
+    UnkStruct_ov8_0224C098 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov8_0224C098));
     GF_ASSERT(v0 != NULL);
 
     memset(v0, 0, sizeof(UnkStruct_ov8_0224C098));
@@ -3664,7 +3664,7 @@ void HearthomeGym_DynamicMapFeaturesInit(FieldSystem *fieldSystem)
 {
     PersistedMapFeatures *v0 = MiscSaveBlock_GetPersistedMapFeatures(FieldSystem_GetSaveData(fieldSystem));
     UnkStruct_02071C18 *v1 = PersistedMapFeatures_GetBuffer(v0, DYNAMIC_MAP_FEATURES_HEARTHOME_GYM);
-    UnkStruct_ov8_0224C444 *v2 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov8_0224C444));
+    UnkStruct_ov8_0224C444 *v2 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov8_0224C444));
 
     memset(v2, 0, sizeof(UnkStruct_ov8_0224C444));
 
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index 6b534c5773..4da7224596 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -1203,7 +1203,7 @@ void DistWorld_DynamicMapFeaturesInit(FieldSystem *fieldSystem)
 {
     PersistedMapFeatures *persistedMapFeatures = MiscSaveBlock_GetPersistedMapFeatures(FieldSystem_GetSaveData(fieldSystem));
     DistWorldPersistedData *data = PersistedMapFeatures_GetBuffer(persistedMapFeatures, DYNAMIC_MAP_FEATURES_DISTORTION_WORLD);
-    DistWorldSystem *dwSystem = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(DistWorldSystem));
+    DistWorldSystem *dwSystem = Heap_Alloc(HEAP_ID_FIELD1, sizeof(DistWorldSystem));
 
     memset(dwSystem, 0, sizeof(DistWorldSystem));
 
@@ -1356,9 +1356,9 @@ static void ov9_02249C60(DistWorldSystem *param0, u32 param1)
 
 static void OpenArchives(DistWorldSystem *system)
 {
-    system->distortionWorldNARC = NARC_ctor(NARC_INDEX_FIELDDATA__TORNWORLD__TW_ARC, HEAP_ID_FIELD);
-    system->distortionWorldAttrNARC = NARC_ctor(NARC_INDEX_FIELDDATA__TORNWORLD__TW_ARC_ATTR, HEAP_ID_FIELD);
-    system->unk_10 = NARC_ctor(NARC_INDEX_DATA__TW_ARC_ETC, HEAP_ID_FIELD);
+    system->distortionWorldNARC = NARC_ctor(NARC_INDEX_FIELDDATA__TORNWORLD__TW_ARC, HEAP_ID_FIELD1);
+    system->distortionWorldAttrNARC = NARC_ctor(NARC_INDEX_FIELDDATA__TORNWORLD__TW_ARC_ATTR, HEAP_ID_FIELD1);
+    system->unk_10 = NARC_ctor(NARC_INDEX_DATA__TW_ARC_ETC, HEAP_ID_FIELD1);
 }
 
 static void CloseArchives(DistWorldSystem *system)
@@ -1761,10 +1761,10 @@ static void ov9_0224A1E4(DistWorldSystem *param0, int param1)
 
     v0->unk_00 = param1;
     param1 *= sizeof(UnkStruct_ov9_0224A294);
-    v0->unk_04 = Heap_AllocFromHeap(HEAP_ID_FIELD, param1);
+    v0->unk_04 = Heap_Alloc(HEAP_ID_FIELD1, param1);
 
     memset(v0->unk_04, 0, param1);
-    Heap_FndInitAllocatorForExpHeap(&v0->unk_10, HEAP_ID_FIELD, 4);
+    HeapExp_FndInitAllocator(&v0->unk_10, HEAP_ID_FIELD1, 4);
 
     v0->unk_08 = ov5_021DF5C0(param0->fieldSystem->unk_40, 197, 1);
     v0->unk_0C = NNS_G3dGetAnmByIdx(v0->unk_08, 0);
@@ -2658,22 +2658,22 @@ static void ov9_0224AED8(DistWorldSystem *param0)
 
 static void ov9_0224AEE4(DistWorldSystem *param0, UnkStruct_ov9_0224B064 *param1, NARC *param2)
 {
-    param1->unk_00 = SpriteList_InitRendering(16, &param1->unk_04, HEAP_ID_FIELD);
+    param1->unk_00 = SpriteList_InitRendering(16, &param1->unk_04, HEAP_ID_FIELD1);
     SetMainScreenViewRect(&param1->unk_04, (FX32_ONE * 0), (FX32_ONE * -512));
-    param1->unk_190 = SpriteResourceCollection_New(7, 0, HEAP_ID_FIELD);
-    param1->unk_194 = SpriteResourceCollection_New(1, 1, HEAP_ID_FIELD);
-    param1->unk_198 = SpriteResourceCollection_New(7, 2, HEAP_ID_FIELD);
-    param1->unk_19C = SpriteResourceCollection_New(7, 3, HEAP_ID_FIELD);
+    param1->unk_190 = SpriteResourceCollection_New(7, 0, HEAP_ID_FIELD1);
+    param1->unk_194 = SpriteResourceCollection_New(1, 1, HEAP_ID_FIELD1);
+    param1->unk_198 = SpriteResourceCollection_New(7, 2, HEAP_ID_FIELD1);
+    param1->unk_19C = SpriteResourceCollection_New(7, 3, HEAP_ID_FIELD1);
 
     {
         int v0;
 
         for (v0 = 0; v0 < 7; v0++) {
-            param1->unk_1A0[v0] = SpriteResourceCollection_AddTilesFrom(param1->unk_190, param2, Unk_ov9_02251E58[v0], 0, ((v0) + 0xff), NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD);
+            param1->unk_1A0[v0] = SpriteResourceCollection_AddTilesFrom(param1->unk_190, param2, Unk_ov9_02251E58[v0], 0, ((v0) + 0xff), NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD1);
             SpriteTransfer_RequestCharAtEnd(param1->unk_1A0[v0]);
         }
 
-        param1->unk_1BC[0] = SpriteResourceCollection_AddPaletteFrom(param1->unk_194, param2, Unk_ov9_02251210[0], 0, (0 + 0xff), NNS_G2D_VRAM_TYPE_2DMAIN, 5, HEAP_ID_FIELD);
+        param1->unk_1BC[0] = SpriteResourceCollection_AddPaletteFrom(param1->unk_194, param2, Unk_ov9_02251210[0], 0, (0 + 0xff), NNS_G2D_VRAM_TYPE_2DMAIN, 5, HEAP_ID_FIELD1);
 
         {
             NNSG2dPaletteData *v1;
@@ -2696,11 +2696,11 @@ static void ov9_0224AEE4(DistWorldSystem *param0, UnkStruct_ov9_0224B064 *param1
         SpriteTransfer_RequestPlttFreeSpace(param1->unk_1BC[0]);
 
         for (v0 = 0; v0 < 7; v0++) {
-            param1->unk_1C0[v0] = SpriteResourceCollection_AddFrom(param1->unk_198, param2, Unk_ov9_02251E90[v0], 0, ((v0) + 0xff), 2, HEAP_ID_FIELD);
+            param1->unk_1C0[v0] = SpriteResourceCollection_AddFrom(param1->unk_198, param2, Unk_ov9_02251E90[v0], 0, ((v0) + 0xff), 2, HEAP_ID_FIELD1);
         }
 
         for (v0 = 0; v0 < 7; v0++) {
-            param1->unk_1DC[v0] = SpriteResourceCollection_AddFrom(param1->unk_19C, param2, Unk_ov9_02251EAC[v0], 0, ((v0) + 0xff), 3, HEAP_ID_FIELD);
+            param1->unk_1DC[v0] = SpriteResourceCollection_AddFrom(param1->unk_19C, param2, Unk_ov9_02251EAC[v0], 0, ((v0) + 0xff), 3, HEAP_ID_FIELD1);
         }
     }
 
@@ -2771,7 +2771,7 @@ static Sprite *ov9_0224B130(UnkStruct_ov9_0224B064 *param0, const VecFx32 *param
     v1.position = *param1;
     v1.priority = param7;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.heapID = HEAP_ID_FIELD;
+    v1.heapID = HEAP_ID_FIELD1;
 
     v2 = SpriteList_Add(&v1);
     GF_ASSERT(v2 != NULL);
@@ -2926,7 +2926,7 @@ static void ov9_0224B3F8(DistWorldSystem *param0, UnkStruct_ov9_0224B528 *param1
         GF_ASSERT(param1->unk_04);
 
         v0 = param1->unk_04 * sizeof(UnkStruct_ov101_021D5D90 *);
-        param1->unk_08 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, v0);
+        param1->unk_08 = Heap_AllocAtEnd(HEAP_ID_FIELD1, v0);
 
         memset((u8 *)param1->unk_08, 0, v0);
         ov9_0224B6CC(param0, param1, param3, param4);
@@ -3668,7 +3668,7 @@ static void ov9_0224BF8C(NARC *distortionWorldNARC, UnkStruct_ov9_0224BFE0 *para
 {
     u32 v0 = NARC_GetMemberSize(distortionWorldNARC, 0);
 
-    param1->unk_08 = Heap_AllocFromHeap(HEAP_ID_FIELD, v0);
+    param1->unk_08 = Heap_Alloc(HEAP_ID_FIELD1, v0);
     NARC_ReadWholeMember(distortionWorldNARC, 0, param1->unk_08);
 
     param1->unk_00 = *(int *)param1->unk_08;
@@ -3755,7 +3755,7 @@ static void DistWorldFile_Load(DistWorldSystem *system, DistWorldFile *file, enu
         narcIndex = FindNARCIndex(system, mapHeaderID);
         narcMemberSize = NARC_GetMemberSize(system->distortionWorldNARC, narcIndex);
 
-        file->buffer = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, narcMemberSize);
+        file->buffer = Heap_AllocAtEnd(HEAP_ID_FIELD1, narcMemberSize);
         NARC_ReadWholeMember(system->distortionWorldNARC, narcIndex, file->buffer);
 
         header = file->buffer;
@@ -4112,7 +4112,7 @@ static void LoadFloatingPlatformTerrainAttributes(DistWorldSystem *system, u32 d
     }
 
     floatingPlatformMan->terrainAttributesSize = NARC_GetMemberSize(system->distortionWorldAttrNARC, distortionWorldAttrID);
-    floatingPlatformMan->terrainAttributes = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, floatingPlatformMan->terrainAttributesSize);
+    floatingPlatformMan->terrainAttributes = Heap_AllocAtEnd(HEAP_ID_FIELD1, floatingPlatformMan->terrainAttributesSize);
 
     NARC_ReadWholeMember(system->distortionWorldAttrNARC, distortionWorldAttrID, floatingPlatformMan->terrainAttributes);
 }
@@ -5424,7 +5424,7 @@ static void ov9_0224D814(DistWorldSystem *param0, u32 param1)
         u32 v1 = Unk_ov9_022514A4[param1];
         u32 v2 = ov5_021DF5A8(param0->fieldSystem->unk_40, v1);
 
-        v0->unk_258[param1].unk_04 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, v2);
+        v0->unk_258[param1].unk_04 = Heap_AllocAtEnd(HEAP_ID_FIELD1, v2);
         ov5_021DF5B4(param0->fieldSystem->unk_40, v1, v0->unk_258[param1].unk_04);
         v0->unk_258[param1].unk_00 = param1;
     }
@@ -5533,7 +5533,7 @@ static void ov9_0224D9BC(DistWorldSystem *param0, u32 param1, u32 param2, UnkStr
         }
 
         sub_02073994(param4, v0->unk_258[param2].unk_04, 0);
-        sub_02073A3C(param4, &v0->unk_00[param1].unk_04, HEAP_ID_FIELD);
+        sub_02073A3C(param4, &v0->unk_00[param1].unk_04, HEAP_ID_FIELD1);
         sub_02073A5C(param4, &v0->unk_00[param1].unk_04);
         sub_02073B84(param3, param4);
     }
@@ -7384,7 +7384,7 @@ BOOL ov9_0224F2B0(const MapObject *param0)
 
 UnkStruct_ov9_0224F6EC *ov9_0224F2BC(FieldSystem *fieldSystem, FieldTask *param1, MapObject *param2)
 {
-    UnkStruct_ov9_0224F6EC *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov9_0224F6EC));
+    UnkStruct_ov9_0224F6EC *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov9_0224F6EC));
     memset(v0, 0, sizeof(UnkStruct_ov9_0224F6EC));
 
     v0->unk_00 = fieldSystem->unk_04->dynamicMapFeaturesData;
@@ -9503,7 +9503,7 @@ BOOL DistWorld_GetTileBehaviorOnCurrentFloatingPlatform(FieldSystem *fieldSystem
 void ov9_02251094(int param0, int *param1, int *param2, int *param3)
 {
     UnkStruct_ov9_0224BFE0 v0;
-    NARC *v1 = NARC_ctor(NARC_INDEX_FIELDDATA__TORNWORLD__TW_ARC, HEAP_ID_FIELD);
+    NARC *v1 = NARC_ctor(NARC_INDEX_FIELDDATA__TORNWORLD__TW_ARC, HEAP_ID_FIELD1);
 
     ov9_0224BF8C(v1, &v0);
     ov9_0224C050(&v0, param0, param1, param2, param3);
diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c
index 2c4ec77e4e..73dc125f6d 100644
--- a/src/overlay010/ov10_0221F800.c
+++ b/src/overlay010/ov10_0221F800.c
@@ -1726,7 +1726,7 @@ static void ov10_022217CC(UnkStruct_ov10_0221FB28 *param0)
     G3X_AlphaBlend(1);
     ParticleSystem_ZeroAll();
 
-    param0->unk_B54 = Heap_AllocFromHeap(param0->unk_00->heapID, 0x4800);
+    param0->unk_B54 = Heap_Alloc(param0->unk_00->heapID, 0x4800);
     param0->unk_B50 = ParticleSystem_New(ov10_02221928, ov10_0222194C, param0->unk_B54, 0x4800, 1, param0->unk_00->heapID);
 
     camera = ParticleSystem_GetCamera(param0->unk_B50);
@@ -2367,7 +2367,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0)
 
     if (MapHeader_IsUnionRoom(param0->unk_00->mapHeaderID) == 1) {
         opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].header.trainerType);
-        opponentName1 = Heap_AllocFromHeap(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1));
+        opponentName1 = Heap_Alloc(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1));
 
         Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1);
         journalEntryOnlineEvent = JournalEntry_CreateEventUnionBattle(opponentName1, opponentGender1, battleResult, param0->heapID);
@@ -2376,7 +2376,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0)
         switch (sub_0203895C()) {
         case 1:
             opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].header.trainerType);
-            opponentName1 = Heap_AllocFromHeap(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1));
+            opponentName1 = Heap_Alloc(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1));
 
             Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1);
 
@@ -2385,7 +2385,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0)
             break;
         case 2:
             opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].header.trainerType);
-            opponentName1 = Heap_AllocFromHeap(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1));
+            opponentName1 = Heap_Alloc(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1));
 
             Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1);
 
@@ -2394,7 +2394,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0)
             break;
         case 3:
             opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].header.trainerType);
-            opponentName1 = Heap_AllocFromHeap(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1));
+            opponentName1 = Heap_Alloc(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1));
 
             Strbuf_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1);
 
@@ -2402,8 +2402,8 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0)
             Heap_Free(opponentName1);
             break;
         case 4:
-            opponentName1 = Heap_AllocFromHeap(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1));
-            opponentName2 = Heap_AllocFromHeap(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1));
+            opponentName1 = Heap_Alloc(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1));
+            opponentName2 = Heap_Alloc(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1));
 
             if (ov10_02220AD0() == 1) {
                 opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[1].header.trainerType);
diff --git a/src/overlay011/particle_helper.c b/src/overlay011/particle_helper.c
index 174da7229b..7ebdac66aa 100644
--- a/src/overlay011/particle_helper.c
+++ b/src/overlay011/particle_helper.c
@@ -8,9 +8,9 @@
 static u32 ParticleHelper_AllocTexVram(u32 param0, BOOL param1);
 static u32 ParticleHelper_AllocPalVram(u32 param0, BOOL param1);
 
-ParticleSystem *ParticleHelper_CreateParticleSystem(enum HeapId heapID)
+ParticleSystem *ParticleHelper_CreateParticleSystem(enum HeapID heapID)
 {
-    void *heap = Heap_AllocFromHeap(heapID, 0x4800);
+    void *heap = Heap_Alloc(heapID, 0x4800);
     ParticleSystem *ps = ParticleSystem_New(ParticleHelper_AllocTexVram, ParticleHelper_AllocPalVram, heap, 0x4800, TRUE, heapID);
     Camera *camera = ParticleSystem_GetCamera(ps);
 
@@ -21,9 +21,9 @@ ParticleSystem *ParticleHelper_CreateParticleSystem(enum HeapId heapID)
     return ps;
 }
 
-ParticleSystem *ov11_0221F888(enum HeapId heapID)
+ParticleSystem *ov11_0221F888(enum HeapID heapID)
 {
-    void *heap = Heap_AllocFromHeap(heapID, 0x4200);
+    void *heap = Heap_Alloc(heapID, 0x4200);
     if (heap == NULL) {
         return NULL;
     }
diff --git a/src/overlay013/battle_bag_buttons.c b/src/overlay013/battle_bag_buttons.c
index a415032f4a..30daf054fb 100644
--- a/src/overlay013/battle_bag_buttons.c
+++ b/src/overlay013/battle_bag_buttons.c
@@ -376,7 +376,7 @@ static void RetrieveButtonData(BattleBag *battleBag, u16 *buttonData, u8 button,
 
 static void DrawButton(BattleBag *battleBag, u8 button, u8 buttonState, u8 screen)
 {
-    u16 *buttonData = Heap_AllocFromHeap(battleBag->context->heapID, sButtonDimensions[button].width * sButtonDimensions[button].height * sizeof(u16));
+    u16 *buttonData = Heap_Alloc(battleBag->context->heapID, sButtonDimensions[button].width * sButtonDimensions[button].height * sizeof(u16));
 
     RetrieveButtonData(battleBag, buttonData, button, buttonState, screen);
 
diff --git a/src/overlay013/battle_party.c b/src/overlay013/battle_party.c
index 53800f0626..5f693e0249 100644
--- a/src/overlay013/battle_party.c
+++ b/src/overlay013/battle_party.c
@@ -1270,7 +1270,7 @@ static void LoadGraphicsData(BattleParty *battleParty)
     PaletteData_LoadBufferFromFileStart(battleParty->palette, NARC_INDEX_GRAPHIC__PL_WINFRAME, GetMessageBoxPaletteNARCMember(optionsFrame), battleParty->context->heapID, PLTTBUF_SUB_BG, PALETTE_SIZE_BYTES, 224);
 
     u16 *rawPaletteData = PaletteData_GetUnfadedBuffer(battleParty->palette, PLTTBUF_SUB_BG);
-    u16 *paletteData = Heap_AllocFromHeap(battleParty->context->heapID, PALETTE_SIZE_BYTES);
+    u16 *paletteData = Heap_Alloc(battleParty->context->heapID, PALETTE_SIZE_BYTES);
 
     memcpy(paletteData, &rawPaletteData[208], PALETTE_SIZE_BYTES);
     memcpy(&paletteData[7], &rawPaletteData[154], 4);
diff --git a/src/overlay013/battle_sub_menu_cursor.c b/src/overlay013/battle_sub_menu_cursor.c
index 8496daaef2..71f5bfddc1 100644
--- a/src/overlay013/battle_sub_menu_cursor.c
+++ b/src/overlay013/battle_sub_menu_cursor.c
@@ -12,7 +12,7 @@
 
 BattleSubMenuCursor *MakeBattleSubMenuCursor(u32 heapID)
 {
-    BattleSubMenuCursor *cursor = Heap_AllocFromHeap(heapID, sizeof(BattleSubMenuCursor));
+    BattleSubMenuCursor *cursor = Heap_Alloc(heapID, sizeof(BattleSubMenuCursor));
     memset(cursor, 0, sizeof(BattleSubMenuCursor));
     return cursor;
 }
diff --git a/src/overlay013/ov13_02225710.c b/src/overlay013/ov13_02225710.c
index 4da92fe374..f75bf23725 100644
--- a/src/overlay013/ov13_02225710.c
+++ b/src/overlay013/ov13_02225710.c
@@ -435,7 +435,7 @@ static void ov13_02225C4C(BattleParty *param0, u16 *param1, u8 param2, u8 param3
 
 static void ov13_02225D8C(BattleParty *param0, u8 param1, u8 param2, u8 param3)
 {
-    u16 *v0 = Heap_AllocFromHeap(param0->context->heapID, Unk_ov13_02229924[param1].unk_02 * Unk_ov13_02229924[param1].unk_03 * 2);
+    u16 *v0 = Heap_Alloc(param0->context->heapID, Unk_ov13_02229924[param1].unk_02 * Unk_ov13_02229924[param1].unk_03 * 2);
 
     ov13_02225C4C(param0, v0, param1, param2, param3);
 
diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c
index 783e295471..356ca554cc 100644
--- a/src/overlay017/ov17_0223B140.c
+++ b/src/overlay017/ov17_0223B140.c
@@ -663,8 +663,8 @@ static void ov17_0223BBA8(UnkStruct_ov17_02246F24 *param0, NARC *param1)
     {
         u16 *v0, *v1, *v2, *v3;
 
-        v0 = Heap_AllocFromHeap(HEAP_ID_21, 0x20);
-        v1 = Heap_AllocFromHeap(HEAP_ID_21, 0x20);
+        v0 = Heap_Alloc(HEAP_ID_21, 0x20);
+        v1 = Heap_Alloc(HEAP_ID_21, 0x20);
         v2 = PaletteData_GetUnfadedBuffer(param0->unk_0C.unk_50, 0);
         v3 = PaletteData_GetFadedBuffer(param0->unk_0C.unk_50, 0);
 
diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c
index 6a7297ba96..217f09fad3 100644
--- a/src/overlay017/ov17_0223DAD0.c
+++ b/src/overlay017/ov17_0223DAD0.c
@@ -251,7 +251,7 @@ int ov17_0223DAD0(ApplicationManager *appMan, int *param1)
     PaletteData_AllocBuffer(v0->unk_14.unk_90, 2, ((16 - 2) * 16) * sizeof(u16), HEAP_ID_23);
     PaletteData_AllocBuffer(v0->unk_14.unk_90, 3, 0x200, HEAP_ID_23);
 
-    v0->unk_1050.unk_00 = Heap_AllocFromHeap(HEAP_ID_23, 0x200);
+    v0->unk_1050.unk_00 = Heap_Alloc(HEAP_ID_23, 0x200);
     ov17_0224CDB4(v0, 1);
     v0->unk_14.unk_60 = BgConfig_New(HEAP_ID_23);
 
@@ -827,7 +827,7 @@ static void ov17_0223E778(UnkStruct_ov17_0224DF54 *param0)
 
     GF_ASSERT(param0->unk_0C == NULL);
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_23, 0x4800);
+    v0 = Heap_Alloc(HEAP_ID_23, 0x4800);
     param0->unk_0C = ParticleSystem_New(ov17_0223E800, ov17_0223E81C, v0, 0x4800, 1, HEAP_ID_23);
 
     camera = ParticleSystem_GetCamera(param0->unk_0C);
diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c
index fe19eb438e..14e2d91b12 100644
--- a/src/overlay017/ov17_0223F118.c
+++ b/src/overlay017/ov17_0223F118.c
@@ -393,7 +393,7 @@ static void ov17_0223F6E8(SysTask *param0, void *param1)
 
 UnkStruct_ov17_0223F744 *ov17_0223F70C(int heapID, PaletteData *param1, const u16 *param2, int param3, int param4, u32 param5)
 {
-    UnkStruct_ov17_0223F744 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov17_0223F744));
+    UnkStruct_ov17_0223F744 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov17_0223F744));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0223F744));
 
     v0->unk_04 = param1;
diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c
index ccf6d9b28e..b7d6f43b76 100644
--- a/src/overlay017/ov17_0223F7E4.c
+++ b/src/overlay017/ov17_0223F7E4.c
@@ -576,7 +576,7 @@ __attribute__((aligned(4))) static const UnkStruct_ov17_02253388 Unk_ov17_022533
 
 static void *ov17_0223F7E4(void)
 {
-    UnkStruct_ov17_0223F7E4 *v0 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_0223F7E4));
+    UnkStruct_ov17_0223F7E4 *v0 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_0223F7E4));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0223F7E4));
     v0->unk_2C8 = -1;
 
@@ -625,7 +625,7 @@ void *ov17_0223F88C(UnkStruct_02095C48 *param0, UnkStruct_ov17_0223F88C *param1,
         int v4;
 
         for (v4 = 0; v4 < 5; v4++) {
-            v0->unk_20[v4] = Heap_AllocFromHeap(HEAP_ID_21, 0x800);
+            v0->unk_20[v4] = Heap_Alloc(HEAP_ID_21, 0x800);
             v3 = Graphics_GetScrnDataFromOpenNARC(v1, Unk_ov17_02253250[v4], 1, &v2, HEAP_ID_21);
             MI_CpuCopy32(v2->rawData, v0->unk_20[v4], 0x800);
             Heap_Free(v3);
@@ -640,7 +640,7 @@ void *ov17_0223F88C(UnkStruct_02095C48 *param0, UnkStruct_ov17_0223F88C *param1,
         v6 = v0->unk_04->unk_50;
 
         for (v7 = 0; v7 < 2; v7++) {
-            v0->unk_34[v7] = Heap_AllocFromHeap(HEAP_ID_21, 0x200);
+            v0->unk_34[v7] = Heap_Alloc(HEAP_ID_21, 0x200);
             PaletteData_LoadBufferFromFileStart(v6, 45, Unk_ov17_02253238[v7], 21, 1, 0, 0);
             v5 = PaletteData_GetUnfadedBuffer(v6, 1);
             MI_CpuCopy16(v5, v0->unk_34[v7], 0x200);
diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c
index 8ce5552bf9..eff9ae46d2 100644
--- a/src/overlay017/ov17_022413D8.c
+++ b/src/overlay017/ov17_022413D8.c
@@ -415,7 +415,7 @@ void ov17_02241428(UnkStruct_ov17_02246F24 *param0)
 
 UnkStruct_ov17_0224145C *ov17_0224145C(UnkStruct_ov17_02246F24 *param0, int param1)
 {
-    UnkStruct_ov17_0224145C *v0 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_0224145C));
+    UnkStruct_ov17_0224145C *v0 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_0224145C));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0224145C));
 
     v0->unk_00 = param0->unk_0C.unk_50;
@@ -497,7 +497,7 @@ void ov17_022415E4(UnkStruct_ov17_0223F88C *param0)
     for (v0 = 0; v0 < 4; v0++) {
         GF_ASSERT(param0->pokemonSpriteDataArray[v0].tiles == NULL);
 
-        param0->pokemonSpriteDataArray[v0].tiles = Heap_AllocFromHeap(HEAP_ID_21, (32 * 10 * 10));
+        param0->pokemonSpriteDataArray[v0].tiles = Heap_Alloc(HEAP_ID_21, (32 * 10 * 10));
         param0->unk_08[v0] = sub_02095484(param0->unk_04, v0, param0->unk_00->unk_00[v0], 0, &param0->pokemonSpriteDataArray[v0], HEAP_ID_21, (256 - 40) - 32 * v0, (104 + 8) - 32 * v0, -0x200);
 
         PokemonSprite_SetAttribute(param0->unk_08[v0], MON_SPRITE_HIDE, 1);
@@ -517,7 +517,7 @@ void ov17_022415E4(UnkStruct_ov17_0223F88C *param0)
 
     GF_ASSERT(param0->pokemonSpriteData.tiles == NULL);
 
-    param0->pokemonSpriteData.tiles = Heap_AllocFromHeap(HEAP_ID_21, (32 * 10 * 10));
+    param0->pokemonSpriteData.tiles = Heap_Alloc(HEAP_ID_21, (32 * 10 * 10));
     param0->pokemonSpriteData.palette = param0->pokemonSpriteDataArray[0].palette;
     param0->pokemonSpriteData.narcID = param0->pokemonSpriteDataArray[0].narcID;
 
@@ -733,7 +733,7 @@ void ov17_02241B1C(UnkStruct_ov17_0223F88C *param0)
 
 void ov17_02241B3C(UnkStruct_ov17_02246F24 *param0, int param1, int param2, u8 *param3)
 {
-    UnkStruct_ov17_02241B3C *v0 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02241B3C));
+    UnkStruct_ov17_02241B3C *v0 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02241B3C));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_02241B3C));
 
     *param3 = 0;
@@ -963,7 +963,7 @@ void ov17_02241F34(UnkStruct_ov17_0223F88C *param0, int param1, int param2, int
 
 static void ov17_02242048(ManagedSprite *param0)
 {
-    UnkStruct_ov17_02242048 *v0 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02242048));
+    UnkStruct_ov17_02242048 *v0 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02242048));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_02242048));
     v0->unk_00 = param0;
 
@@ -1174,7 +1174,7 @@ void ov17_022424D4(UnkStruct_ov17_0223F88C *param0, int param1, int param2)
             param0->unk_124[param1][v1] = ov17_02242260(param0->unk_18, param0->unk_1C, Unk_ov17_022536D8[param1][0] + v1 * 5, Unk_ov17_022536D8[param1][1]);
             ManagedSprite_SetDrawFlag(param0->unk_124[param1][v1], 0);
 
-            v2 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_022422B8));
+            v2 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_022422B8));
             MI_CpuClear8(v2, sizeof(UnkStruct_ov17_022422B8));
 
             v2->unk_00 = param0;
@@ -1237,7 +1237,7 @@ void ov17_022426E8(UnkStruct_ov17_02246F24 *param0, int param1, u8 *param2)
 
     *param2 = 0;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_022426E8));
+    v0 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_022426E8));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_022426E8));
 
     v0->unk_00 = param0;
@@ -1698,7 +1698,7 @@ void ov17_022431A0(UnkStruct_ov17_02246F24 *param0, int param1, u8 param2, int p
 
     *param5 = 0;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_022431A0));
+    v0 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_022431A0));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_022431A0));
 
@@ -1832,7 +1832,7 @@ void ov17_0224331C(UnkStruct_ov17_02246F24 *param0, int param1, int param2, u8 *
             }
         }
 
-        v0 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_0224331C));
+        v0 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_0224331C));
         MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0224331C));
 
         v0->unk_04 = param4;
@@ -1912,7 +1912,7 @@ static void ov17_022434E0(SysTask *param0, void *param1)
 
 UnkStruct_ov17_0224365C *ov17_0224365C(UnkStruct_ov17_02246F24 *param0, int param1)
 {
-    UnkStruct_ov17_0224365C *v0 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_0224365C));
+    UnkStruct_ov17_0224365C *v0 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_0224365C));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0224365C));
 
     v0->unk_00 = param0;
@@ -1958,7 +1958,7 @@ void ov17_022436D0(UnkStruct_ov17_02246F24 *param0, int param1, int param2, int
             continue;
         }
 
-        v0 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_022436D0));
+        v0 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_022436D0));
         MI_CpuClear8(v0, sizeof(UnkStruct_ov17_022436D0));
 
         v0->unk_00 = param0;
diff --git a/src/overlay017/ov17_02243C28.c b/src/overlay017/ov17_02243C28.c
index d12414526c..a39603212a 100644
--- a/src/overlay017/ov17_02243C28.c
+++ b/src/overlay017/ov17_02243C28.c
@@ -186,7 +186,7 @@ static int ov17_02243CDC(UnkStruct_ov17_0224F30C *param0, void *param1, int para
 static void ov17_02243CF4(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3)
 {
     UnkStruct_ov17_02246F24 *v0 = param1;
-    UnkStruct_ov17_02243D34 *v1 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02243D34));
+    UnkStruct_ov17_02243D34 *v1 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02243D34));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02243D34));
 
     v1->unk_00 = v0;
@@ -236,7 +236,7 @@ static void ov17_02243DCC(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_02246F24 *v0 = param1;
     UnkStruct_ov17_02246F24_sub1 *v1 = param3;
-    UnkStruct_ov17_02243DCC *v2 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02243DCC));
+    UnkStruct_ov17_02243DCC *v2 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02243DCC));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02243DCC));
 
     v2->unk_00 = v0;
@@ -301,7 +301,7 @@ static void ov17_02243F10(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_02246F24 *v0 = param1;
     UnkStruct_ov17_02246F24_sub1 *v2 = param3;
-    UnkStruct_ov17_02243F10 *v1 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02243F10));
+    UnkStruct_ov17_02243F10 *v1 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02243F10));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02243F10));
 
@@ -392,7 +392,7 @@ static void ov17_022440E0(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     int v3, v4;
 
     v2 = param3;
-    v1 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02243F10));
+    v1 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02243F10));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02243F10));
 
@@ -458,7 +458,7 @@ static void ov17_02244240(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_02244240 *v1;
     UnkStruct_ov17_02246F24_sub1 *v2 = param3;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02244240));
+    v1 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02244240));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244240));
 
     v1->unk_00 = v0;
@@ -556,7 +556,7 @@ static void ov17_022443F8(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_022443F8 *v1;
     UnkStruct_ov17_02246F24_sub1 *v2 = param3;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_022443F8));
+    v1 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_022443F8));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_022443F8));
 
     v1->unk_00 = v0;
@@ -800,7 +800,7 @@ static void ov17_02244970(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_02244970 *v1;
     UnkStruct_ov17_02246F24_sub1 *v2 = param3;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02244970));
+    v1 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02244970));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244970));
 
     v1->unk_00 = v0;
@@ -959,7 +959,7 @@ static void ov17_02244C08(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_02244C08 *v1;
     UnkStruct_ov17_02246F24_sub1 *v2 = param3;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02244C08));
+    v1 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02244C08));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244C08));
 
     v1->unk_00 = v0;
@@ -1024,7 +1024,7 @@ static void ov17_02244D38(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_02244C08 *v1;
     UnkStruct_ov17_02246F24_sub1 *v2 = param3;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02244C08));
+    v1 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02244C08));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244C08));
 
     v1->unk_00 = v0;
@@ -1163,7 +1163,7 @@ static void ov17_02244FD4(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_02244C08 *v1;
     UnkStruct_ov17_02246F24_sub1 *v2 = param3;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02244C08));
+    v1 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02244C08));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244C08));
 
     v1->unk_00 = v0;
@@ -1243,7 +1243,7 @@ static void ov17_0224513C(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_02244C08 *v1;
     UnkStruct_ov17_02246F24_sub1 *v2 = param3;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02244C08));
+    v1 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02244C08));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244C08));
 
     v1->unk_00 = v0;
@@ -1446,7 +1446,7 @@ static void ov17_02245528(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_02244C08 *v1;
     UnkStruct_ov17_02246F24_sub1 *v2 = param3;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02244C08));
+    v1 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02244C08));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244C08));
 
     v1->unk_00 = v0;
@@ -1527,7 +1527,7 @@ static void ov17_02245690(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_02245690 *v1;
     UnkStruct_ov17_02246F24_sub1 *v2 = param3;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02245690));
+    v1 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02245690));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02245690));
 
     v1->unk_00 = v0;
@@ -1691,7 +1691,7 @@ static void ov17_02245974(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_02244C08 *v1;
     UnkStruct_ov17_02246F24_sub1 *v2 = param3;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02244C08));
+    v1 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02244C08));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244C08));
 
     v1->unk_00 = v0;
@@ -1802,7 +1802,7 @@ static void ov17_02245B60(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_02244C08 *v1;
     UnkStruct_ov17_02246F24_sub1 *v2 = param3;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02244C08));
+    v1 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02244C08));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244C08));
 
     v1->unk_00 = v0;
@@ -1855,7 +1855,7 @@ static void ov17_02245C60(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_02246F24 *v0 = param1;
     UnkStruct_ov17_02246F24_sub1 *v1 = param3;
-    UnkStruct_ov17_02245C60 *v2 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02245C60));
+    UnkStruct_ov17_02245C60 *v2 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02245C60));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02245C60));
 
     v2->unk_00 = v0;
@@ -1947,7 +1947,7 @@ static void ov17_02245E14(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_02246F24 *v0 = param1;
     UnkStruct_ov17_02246F24_sub1 *v1 = param3;
-    UnkStruct_ov17_02245E14 *v2 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02245E14));
+    UnkStruct_ov17_02245E14 *v2 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02245E14));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02245E14));
 
     v2->unk_00 = v0;
diff --git a/src/overlay017/ov17_02246ECC.c b/src/overlay017/ov17_02246ECC.c
index ed5f134fb6..824ca89739 100644
--- a/src/overlay017/ov17_02246ECC.c
+++ b/src/overlay017/ov17_02246ECC.c
@@ -1259,7 +1259,7 @@ static const UnkStruct_ov17_02253C30 Unk_ov17_02253C30[] = {
 void ov17_02246ECC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BE58 *param1)
 {
     int v0;
-    UnkStruct_ov17_02246F9C *v1 = Heap_AllocFromHeap(HEAP_ID_21, sizeof(UnkStruct_ov17_02246F9C));
+    UnkStruct_ov17_02246F9C *v1 = Heap_Alloc(HEAP_ID_21, sizeof(UnkStruct_ov17_02246F9C));
 
     for (v0 = param0->unk_00->unk_00.unk_117; v0 < 4; v0++) {
         ov17_02246F24(param0, v1, v0);
diff --git a/src/overlay017/ov17_022476F8.c b/src/overlay017/ov17_022476F8.c
index e27477c51b..b8d3b4fd21 100644
--- a/src/overlay017/ov17_022476F8.c
+++ b/src/overlay017/ov17_022476F8.c
@@ -107,7 +107,7 @@ void ov17_02247798(SpriteManager *param0)
 
 void ov17_022477B8(UnkStruct_ov17_02247A48 *param0, int param1, int param2, fx32 param3, int param4)
 {
-    UnkStruct_ov17_022477B8 *v0 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_022477B8));
+    UnkStruct_ov17_022477B8 *v0 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_022477B8));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_022477B8));
 
     v0->unk_04 = SpriteSystem_NewSprite(param0->unk_0C.unk_1C, param0->unk_0C.unk_20, &Unk_ov17_022543F8);
diff --git a/src/overlay017/ov17_02247A48.c b/src/overlay017/ov17_02247A48.c
index 55bc8e3132..dc9768bb29 100644
--- a/src/overlay017/ov17_02247A48.c
+++ b/src/overlay017/ov17_02247A48.c
@@ -209,7 +209,7 @@ static void ov17_02247B00(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     s32 v3;
     int v4;
 
-    v2 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_02247DC8));
+    v2 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_02247DC8));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02247DC8));
 
     v2->unk_00 = v0;
@@ -310,7 +310,7 @@ static void ov17_02247D7C(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_02247A48 *v0 = param1;
     UnkStruct_ov17_02249260 *v1 = param3;
-    UnkStruct_ov17_02247DC8 *v2 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_02247DC8));
+    UnkStruct_ov17_02247DC8 *v2 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_02247DC8));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02247DC8));
 
     v2->unk_00 = v0;
@@ -363,7 +363,7 @@ static void ov17_02247E8C(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_02247A48 *v0 = param1;
     UnkStruct_ov17_02249260 *v1 = param3;
-    UnkStruct_ov17_02247F8C *v2 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_02247F8C));
+    UnkStruct_ov17_02247F8C *v2 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_02247F8C));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02247F8C));
 
     v2->unk_00 = v0;
@@ -379,7 +379,7 @@ static void ov17_02247EDC(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_02247A48 *v0 = param1;
     UnkStruct_ov17_02249260 *v1 = param3;
-    UnkStruct_ov17_02247F8C *v2 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_02247F8C));
+    UnkStruct_ov17_02247F8C *v2 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_02247F8C));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02247F8C));
 
     v2->unk_00 = v0;
@@ -395,7 +395,7 @@ static void ov17_02247F2C(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_02247A48 *v0 = param1;
     UnkStruct_ov17_02249260 *v1 = param3;
-    UnkStruct_ov17_02247F8C *v2 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_02247F8C));
+    UnkStruct_ov17_02247F8C *v2 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_02247F8C));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02247F8C));
 
     v2->unk_00 = v0;
@@ -513,7 +513,7 @@ static void ov17_0224814C(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_02247A48 *v0 = param1;
     UnkStruct_ov17_02249260 *v1 = param3;
-    UnkStruct_ov17_02248198 *v2 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_02248198));
+    UnkStruct_ov17_02248198 *v2 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_02248198));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02248198));
 
     v2->unk_00 = v0;
@@ -564,7 +564,7 @@ static int ov17_02248258(UnkStruct_ov17_0224F30C *param0, void *param1, int para
 static void ov17_0224826C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3)
 {
     UnkStruct_ov17_02247A48 *v0 = param1;
-    UnkStruct_ov17_022482B0 *v1 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_022482B0));
+    UnkStruct_ov17_022482B0 *v1 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_022482B0));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_022482B0));
 
     v1->unk_00 = v0;
@@ -661,7 +661,7 @@ static int ov17_0224840C(UnkStruct_ov17_0224F30C *param0, void *param1, int para
 static void ov17_02248420(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3)
 {
     UnkStruct_ov17_02247A48 *v0 = param1;
-    UnkStruct_ov17_02248464 *v1 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_02248464));
+    UnkStruct_ov17_02248464 *v1 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_02248464));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02248464));
 
     v1->unk_00 = v0;
@@ -766,7 +766,7 @@ static void ov17_022485FC(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_02247A48 *v0 = param1;
     UnkStruct_ov17_02249260 *v1 = param3;
-    UnkStruct_ov17_02248744 *v2 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_02248744));
+    UnkStruct_ov17_02248744 *v2 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_02248744));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02248744));
 
     v2->unk_00 = v0;
@@ -817,7 +817,7 @@ static void ov17_022486F8(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_02247A48 *v0 = param1;
     UnkStruct_ov17_02249260 *v1 = param3;
-    UnkStruct_ov17_02248744 *v2 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_02248744));
+    UnkStruct_ov17_02248744 *v2 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_02248744));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02248744));
 
     v2->unk_00 = v0;
@@ -869,7 +869,7 @@ static void ov17_022487FC(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_02247A48 *v0 = param1;
     UnkStruct_ov17_02249260 *v1 = param3;
-    UnkStruct_ov17_02248860 *v2 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_02248860));
+    UnkStruct_ov17_02248860 *v2 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_02248860));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02248860));
 
     v2->unk_00 = v0;
@@ -1123,7 +1123,7 @@ static void ov17_02248D3C(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_02247A48 *v0 = param1;
     UnkStruct_ov17_02249260 *v1 = param3;
-    UnkStruct_ov17_02248DA4 *v2 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_02248DA4));
+    UnkStruct_ov17_02248DA4 *v2 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_02248DA4));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02248DA4));
 
     v2->unk_00 = v0;
@@ -1190,7 +1190,7 @@ static void ov17_02248E6C(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_02248EC4 *v1;
     UnkStruct_ov17_02249260 *v2 = param3;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_02248EC4));
+    v1 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_02248EC4));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02248EC4));
 
     v1->unk_00 = v0;
@@ -1251,7 +1251,7 @@ static int ov17_02248FBC(UnkStruct_ov17_0224F30C *param0, void *param1, int para
 static void ov17_02248FD0(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3)
 {
     UnkStruct_ov17_02247A48 *v0 = param1;
-    UnkStruct_ov17_02249014 *v1 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_02249014));
+    UnkStruct_ov17_02249014 *v1 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_02249014));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02249014));
 
     v1->unk_00 = v0;
@@ -1385,7 +1385,7 @@ static void ov17_02249260(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_02247A48 *v0 = param1;
     UnkStruct_ov17_02249260 *v1 = param3;
-    UnkStruct_ov17_022492AC *v2 = Heap_AllocFromHeap(HEAP_ID_22, sizeof(UnkStruct_ov17_022492AC));
+    UnkStruct_ov17_022492AC *v2 = Heap_Alloc(HEAP_ID_22, sizeof(UnkStruct_ov17_022492AC));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_022492AC));
 
     v2->unk_00 = v0;
diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c
index a40787e9ae..0dc4af4732 100644
--- a/src/overlay017/ov17_022492DC.c
+++ b/src/overlay017/ov17_022492DC.c
@@ -267,7 +267,7 @@ static const UnkStruct_ov17_02254630 Unk_ov17_02254630[][4] = {
 
 static void *ov17_022492DC(void)
 {
-    UnkStruct_ov17_022492DC *v0 = Heap_AllocFromHeap(HEAP_ID_23, sizeof(UnkStruct_ov17_022492DC));
+    UnkStruct_ov17_022492DC *v0 = Heap_Alloc(HEAP_ID_23, sizeof(UnkStruct_ov17_022492DC));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_022492DC));
     v0->unk_8A = -1;
 
@@ -331,17 +331,17 @@ static void ov17_022493DC(UnkStruct_ov17_022492DC *param0)
     NNSG2dScreenData *v1;
     void *v2;
 
-    param0->unk_C4[0] = Heap_AllocFromHeap(HEAP_ID_23, 0x8000 - (0x800 * 4));
-    param0->unk_C4[1] = Heap_AllocFromHeap(HEAP_ID_23, 0x8000 - (0x800 * 4));
-    param0->unk_C4[2] = Heap_AllocFromHeap(HEAP_ID_23, 6 * 12 * 0x20 * 3);
+    param0->unk_C4[0] = Heap_Alloc(HEAP_ID_23, 0x8000 - (0x800 * 4));
+    param0->unk_C4[1] = Heap_Alloc(HEAP_ID_23, 0x8000 - (0x800 * 4));
+    param0->unk_C4[2] = Heap_Alloc(HEAP_ID_23, 6 * 12 * 0x20 * 3);
 
-    param0->unk_D0[0] = Heap_AllocFromHeap(HEAP_ID_23, 0x800);
-    param0->unk_D0[1] = Heap_AllocFromHeap(HEAP_ID_23, 0x800);
-    param0->unk_D0[2] = Heap_AllocFromHeap(HEAP_ID_23, 0x800);
-    param0->unk_D0[3] = Heap_AllocFromHeap(HEAP_ID_23, 0x800);
+    param0->unk_D0[0] = Heap_Alloc(HEAP_ID_23, 0x800);
+    param0->unk_D0[1] = Heap_Alloc(HEAP_ID_23, 0x800);
+    param0->unk_D0[2] = Heap_Alloc(HEAP_ID_23, 0x800);
+    param0->unk_D0[3] = Heap_Alloc(HEAP_ID_23, 0x800);
 
-    param0->unk_E0[0] = Heap_AllocFromHeap(HEAP_ID_23, 0x200);
-    param0->unk_E0[1] = Heap_AllocFromHeap(HEAP_ID_23, 0x200);
+    param0->unk_E0[0] = Heap_Alloc(HEAP_ID_23, 0x200);
+    param0->unk_E0[1] = Heap_Alloc(HEAP_ID_23, 0x200);
 
     v2 = Graphics_GetCharData(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_BG, 9, 1, &v0, HEAP_ID_23);
     MI_CpuCopy32(v0->pRawData, param0->unk_C4[0], 0x8000 - (0x800 * 4));
@@ -599,7 +599,7 @@ static int ov17_02249A0C(UnkStruct_ov17_022492DC *param0, int param1)
 
 static UnkStruct_ov17_02249B30 *ov17_02249AAC(UnkStruct_ov17_022492DC *param0, int param1, u16 param2, u32 param3, const UnkStruct_ov17_02254630 *param4, int param5)
 {
-    UnkStruct_ov17_02249B30 *v0 = Heap_AllocFromHeap(HEAP_ID_23, sizeof(UnkStruct_ov17_02249B30));
+    UnkStruct_ov17_02249B30 *v0 = Heap_Alloc(HEAP_ID_23, sizeof(UnkStruct_ov17_02249B30));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_02249B30));
 
     if (param3 != 0xffffffff) {
diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c
index 3b51c6c10f..b09662a5b2 100644
--- a/src/overlay017/ov17_0224A0FC.c
+++ b/src/overlay017/ov17_0224A0FC.c
@@ -1964,7 +1964,7 @@ void ov17_0224C384(UnkStruct_ov17_0224DF54 *param0, SpriteSystem *param1, Sprite
 
     GF_ASSERT(param0->unk_14.unk_1FC == NULL);
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_23, sizeof(UnkStruct_ov17_0224C384));
+    v0 = Heap_Alloc(HEAP_ID_23, sizeof(UnkStruct_ov17_0224C384));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0224C384));
 
     param0->unk_14.unk_1FC = v0;
@@ -2128,7 +2128,7 @@ void ov17_0224C6B0(UnkStruct_ov17_0224DF54 *param0, int param1, u8 *param2)
 
     *param2 = 0;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_23, sizeof(UnkStruct_ov17_0224C6B0));
+    v0 = Heap_Alloc(HEAP_ID_23, sizeof(UnkStruct_ov17_0224C6B0));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0224C6B0));
 
     v0->unk_00 = param0;
@@ -2519,7 +2519,7 @@ void ov17_0224CE28(UnkStruct_ov17_0224DF54 *param0)
 
 void ov17_0224CEE4(UnkStruct_ov17_0224DF54 *param0, int param1, GXRgb param2, GXRgb param3, int param4, int param5, u8 *param6)
 {
-    UnkStruct_ov17_0224CEE4 *v0 = Heap_AllocFromHeap(HEAP_ID_23, sizeof(UnkStruct_ov17_0224CEE4));
+    UnkStruct_ov17_0224CEE4 *v0 = Heap_Alloc(HEAP_ID_23, sizeof(UnkStruct_ov17_0224CEE4));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0224CEE4));
 
     v0->unk_00 = param0->unk_14.unk_04[param1].unk_00;
diff --git a/src/overlay017/ov17_0224CFB8.c b/src/overlay017/ov17_0224CFB8.c
index f4ba1f6602..4fac21403d 100644
--- a/src/overlay017/ov17_0224CFB8.c
+++ b/src/overlay017/ov17_0224CFB8.c
@@ -170,7 +170,7 @@ static int ov17_0224D020(UnkStruct_ov17_0224F30C *param0, void *param1, int para
 static void ov17_0224D034(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3)
 {
     UnkStruct_ov17_0224DF54 *v0 = param1;
-    UnkStruct_ov17_0224D078 *v1 = Heap_AllocFromHeap(HEAP_ID_23, sizeof(UnkStruct_ov17_0224D078));
+    UnkStruct_ov17_0224D078 *v1 = Heap_Alloc(HEAP_ID_23, sizeof(UnkStruct_ov17_0224D078));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_0224D078));
 
     v1->unk_00 = v0;
@@ -267,7 +267,7 @@ static int ov17_0224D1D4(UnkStruct_ov17_0224F30C *param0, void *param1, int para
 static void ov17_0224D1E8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3)
 {
     UnkStruct_ov17_0224DF54 *v0 = param1;
-    UnkStruct_ov17_0224D240 *v1 = Heap_AllocFromHeap(HEAP_ID_23, sizeof(UnkStruct_ov17_0224D240));
+    UnkStruct_ov17_0224D240 *v1 = Heap_Alloc(HEAP_ID_23, sizeof(UnkStruct_ov17_0224D240));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_0224D240));
 
     v1->unk_00 = v0;
@@ -371,7 +371,7 @@ static int ov17_0224D3C4(UnkStruct_ov17_0224F30C *param0, void *param1, int para
 static void ov17_0224D3D8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3)
 {
     UnkStruct_ov17_0224DF54 *v0 = param1;
-    UnkStruct_ov17_0224D41C *v1 = Heap_AllocFromHeap(HEAP_ID_23, sizeof(UnkStruct_ov17_0224D41C));
+    UnkStruct_ov17_0224D41C *v1 = Heap_Alloc(HEAP_ID_23, sizeof(UnkStruct_ov17_0224D41C));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_0224D41C));
 
     v1->unk_00 = v0;
@@ -465,7 +465,7 @@ static void ov17_0224D558(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_0224D710 *v2;
     int v3, v4;
 
-    v2 = Heap_AllocFromHeap(HEAP_ID_23, sizeof(UnkStruct_ov17_0224D710));
+    v2 = Heap_Alloc(HEAP_ID_23, sizeof(UnkStruct_ov17_0224D710));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_0224D710));
 
     v2->unk_00 = v0;
@@ -509,7 +509,7 @@ static void ov17_0224D558(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 
 static UnkStruct_ov17_0224D69C *ov17_0224D668(UnkStruct_ov17_0224DF54 *param0, int param1)
 {
-    UnkStruct_ov17_0224D69C *v0 = Heap_AllocFromHeap(HEAP_ID_23, sizeof(UnkStruct_ov17_0224D69C));
+    UnkStruct_ov17_0224D69C *v0 = Heap_Alloc(HEAP_ID_23, sizeof(UnkStruct_ov17_0224D69C));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0224D69C));
 
     v0->unk_04 = param0;
@@ -1013,7 +1013,7 @@ static void ov17_0224DF9C(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_0224DF54 *v0 = param1;
     UnkStruct_ov17_0224DF54_sub2 *v1 = param3;
-    UnkStruct_ov17_0224DFF8 *v2 = Heap_AllocFromHeap(HEAP_ID_23, sizeof(UnkStruct_ov17_0224DFF8));
+    UnkStruct_ov17_0224DFF8 *v2 = Heap_Alloc(HEAP_ID_23, sizeof(UnkStruct_ov17_0224DFF8));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_0224DFF8));
 
     v2->unk_00 = v0;
@@ -1229,7 +1229,7 @@ static void ov17_0224E450(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_0224E4A8 *v1;
     UnkStruct_ov17_0224DF54_sub2 *v2 = param3;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_23, sizeof(UnkStruct_ov17_0224E4A8));
+    v1 = Heap_Alloc(HEAP_ID_23, sizeof(UnkStruct_ov17_0224E4A8));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_0224E4A8));
 
     v1->unk_00 = v0;
@@ -1278,7 +1278,7 @@ static void ov17_0224E52C(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_0224E584 *v1;
     UnkStruct_ov17_0224DF54_sub2 *v2 = param3;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_23, sizeof(UnkStruct_ov17_0224E584));
+    v1 = Heap_Alloc(HEAP_ID_23, sizeof(UnkStruct_ov17_0224E584));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_0224E584));
 
     v1->unk_00 = v0;
@@ -1347,7 +1347,7 @@ static void ov17_0224E65C(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_0224DF54 *v0 = param1;
     UnkStruct_ov17_0224DF54_sub2 *v1 = param3;
-    UnkStruct_ov17_0224E6C8 *v2 = Heap_AllocFromHeap(HEAP_ID_23, sizeof(UnkStruct_ov17_0224E6C8));
+    UnkStruct_ov17_0224E6C8 *v2 = Heap_Alloc(HEAP_ID_23, sizeof(UnkStruct_ov17_0224E6C8));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_0224E6C8));
 
     v2->unk_00 = v0;
@@ -1450,7 +1450,7 @@ static void ov17_0224E814(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_0224DF54 *v0 = param1;
     UnkStruct_ov17_0224DF54_sub2 *v1 = param3;
-    UnkStruct_ov17_0224E86C *v2 = Heap_AllocFromHeap(HEAP_ID_23, sizeof(UnkStruct_ov17_0224E86C));
+    UnkStruct_ov17_0224E86C *v2 = Heap_Alloc(HEAP_ID_23, sizeof(UnkStruct_ov17_0224E86C));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_0224E86C));
 
     v2->unk_00 = v0;
diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c
index a47509db72..dbbaf9d233 100644
--- a/src/overlay017/ov17_02250744.c
+++ b/src/overlay017/ov17_02250744.c
@@ -189,7 +189,7 @@ void ov17_02250744(UnkStruct_ov17_0224FCA0 *param0)
 
         GF_ASSERT(param0->unk_10.pokemonSpriteDataArray[v1].tiles == NULL);
 
-        param0->unk_10.pokemonSpriteDataArray[v1].tiles = Heap_AllocFromHeap(HEAP_ID_24, (32 * 10 * 10));
+        param0->unk_10.pokemonSpriteDataArray[v1].tiles = Heap_Alloc(HEAP_ID_24, (32 * 10 * 10));
         param0->unk_10.unk_08[v1] = sub_02095484(param0->unk_10.unk_04, v0, param0->unk_10.unk_00->unk_00[v1], 2, &param0->unk_10.pokemonSpriteDataArray[v1], HEAP_ID_24, Unk_ov17_02254BF4[v0][0], Unk_ov17_02254BF4[v0][1], Unk_ov17_02254BF4[v0][2]);
     }
 }
@@ -467,7 +467,7 @@ void ov17_02250FE4(UnkStruct_ov17_0224FCA0 *param0)
     UnkStruct_ov17_02250FE4 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_24, sizeof(UnkStruct_ov17_02250FE4));
+    v0 = Heap_Alloc(HEAP_ID_24, sizeof(UnkStruct_ov17_02250FE4));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_02250FE4));
 
     v0->unk_00 = param0;
@@ -510,7 +510,7 @@ static void ov17_02251070(UnkStruct_ov17_0224FCA0 *param0)
     UnkStruct_ov17_02251070 *v1;
     s32 v2, v3;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_24, sizeof(UnkStruct_ov17_02251070));
+    v1 = Heap_Alloc(HEAP_ID_24, sizeof(UnkStruct_ov17_02251070));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02251070));
 
     v1->unk_00 = param0;
@@ -708,7 +708,7 @@ void ov17_02251598(UnkStruct_ov17_0224FCA0 *param0, int param1, u8 *param2)
     UnkStruct_ov17_02251598 *v0;
 
     *param2 = 0;
-    v0 = Heap_AllocFromHeap(HEAP_ID_24, sizeof(UnkStruct_ov17_02251598));
+    v0 = Heap_Alloc(HEAP_ID_24, sizeof(UnkStruct_ov17_02251598));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_02251598));
 
@@ -795,7 +795,7 @@ void ov17_02251718(UnkStruct_ov17_0224FCA0 *param0, int param1, int param2, u8 *
     UnkStruct_ov17_02251718 *v0;
 
     *param3 = 0;
-    v0 = Heap_AllocFromHeap(HEAP_ID_24, sizeof(UnkStruct_ov17_02251718));
+    v0 = Heap_Alloc(HEAP_ID_24, sizeof(UnkStruct_ov17_02251718));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_02251718));
 
diff --git a/src/overlay017/ov17_02251D6C.c b/src/overlay017/ov17_02251D6C.c
index 80ed9024ac..98aca69c85 100644
--- a/src/overlay017/ov17_02251D6C.c
+++ b/src/overlay017/ov17_02251D6C.c
@@ -167,7 +167,7 @@ static int ov17_02251E54(UnkStruct_ov17_0224F30C *param0, void *param1, int para
 static void ov17_02251E68(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3)
 {
     UnkStruct_ov17_0224FCA0 *v0 = param1;
-    UnkStruct_ov17_02251EAC *v1 = Heap_AllocFromHeap(HEAP_ID_24, sizeof(UnkStruct_ov17_02251EAC));
+    UnkStruct_ov17_02251EAC *v1 = Heap_Alloc(HEAP_ID_24, sizeof(UnkStruct_ov17_02251EAC));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02251EAC));
 
     v1->unk_00 = v0;
@@ -264,7 +264,7 @@ static int ov17_02252008(UnkStruct_ov17_0224F30C *param0, void *param1, int para
 static void ov17_0225201C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3)
 {
     UnkStruct_ov17_0224FCA0 *v0 = param1;
-    UnkStruct_ov17_0225201C *v1 = Heap_AllocFromHeap(HEAP_ID_24, sizeof(UnkStruct_ov17_0225201C));
+    UnkStruct_ov17_0225201C *v1 = Heap_Alloc(HEAP_ID_24, sizeof(UnkStruct_ov17_0225201C));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_0225201C));
 
     v1->unk_00 = v0;
@@ -383,7 +383,7 @@ static void ov17_02252224(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_0224FCA0 *v0 = param1;
     UnkStruct_ov17_0224FCA0_sub2 *v1 = param3;
-    UnkStruct_ov17_0225228C *v2 = Heap_AllocFromHeap(HEAP_ID_24, sizeof(UnkStruct_ov17_0225228C));
+    UnkStruct_ov17_0225228C *v2 = Heap_Alloc(HEAP_ID_24, sizeof(UnkStruct_ov17_0225228C));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_0225228C));
 
     v2->unk_00 = v0;
@@ -455,7 +455,7 @@ static void ov17_02252358(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 
     v0->unk_39A = *((UnkStruct_ov17_0224FCA0_sub1 *)param3);
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_24, sizeof(UnkStruct_ov17_022523AC));
+    v1 = Heap_Alloc(HEAP_ID_24, sizeof(UnkStruct_ov17_022523AC));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_022523AC));
 
     v1->unk_00 = v0;
@@ -548,7 +548,7 @@ static void ov17_02252528(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_02252580 *v2;
     int v3;
 
-    v2 = Heap_AllocFromHeap(HEAP_ID_24, sizeof(UnkStruct_ov17_02252580));
+    v2 = Heap_Alloc(HEAP_ID_24, sizeof(UnkStruct_ov17_02252580));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02252580));
 
     v2->unk_00 = v0;
@@ -610,7 +610,7 @@ static void ov17_02252620(UnkStruct_ov17_0224F30C *param0, void *param1, const U
 {
     UnkStruct_ov17_0224FCA0 *v0 = param1;
     UnkStruct_ov17_0224FCA0_sub2 *v1 = param3;
-    UnkStruct_ov17_0225266C *v2 = Heap_AllocFromHeap(HEAP_ID_24, sizeof(UnkStruct_ov17_0225266C));
+    UnkStruct_ov17_0225266C *v2 = Heap_Alloc(HEAP_ID_24, sizeof(UnkStruct_ov17_0225266C));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_0225266C));
 
     v2->unk_00 = v0;
@@ -691,7 +691,7 @@ static void ov17_022527AC(UnkStruct_ov17_0224F30C *param0, void *param1, const U
     UnkStruct_ov17_02252858 *v2;
     int v3;
 
-    v2 = Heap_AllocFromHeap(HEAP_ID_24, sizeof(UnkStruct_ov17_02252858));
+    v2 = Heap_Alloc(HEAP_ID_24, sizeof(UnkStruct_ov17_02252858));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02252858));
 
     v2->unk_00 = v0;
@@ -805,7 +805,7 @@ static int ov17_02252970(UnkStruct_ov17_0224F30C *param0, void *param1, int para
 static void ov17_02252984(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3)
 {
     UnkStruct_ov17_0224FCA0 *v0 = param1;
-    UnkStruct_ov17_022529C8 *v1 = Heap_AllocFromHeap(HEAP_ID_24, sizeof(UnkStruct_ov17_022529C8));
+    UnkStruct_ov17_022529C8 *v1 = Heap_Alloc(HEAP_ID_24, sizeof(UnkStruct_ov17_022529C8));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov17_022529C8));
 
     v1->unk_00 = v0;
diff --git a/src/overlay017/ov17_02252AB0.c b/src/overlay017/ov17_02252AB0.c
index 3a548eff34..9228a3b6da 100644
--- a/src/overlay017/ov17_02252AB0.c
+++ b/src/overlay017/ov17_02252AB0.c
@@ -63,7 +63,7 @@ UnkStruct_ov17_02252B48 *ov17_02252B48(SpriteSystem *param0, SpriteManager *para
     v1.priority = param7;
     v1.bgPriority = param8;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov17_02252B48));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov17_02252B48));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_02252B48));
 
     for (v2 = 0; v2 < 5; v2++) {
diff --git a/src/overlay018/ov18_0221F800.c b/src/overlay018/ov18_0221F800.c
index 0c4947b4a4..22bb2a369d 100644
--- a/src/overlay018/ov18_0221F800.c
+++ b/src/overlay018/ov18_0221F800.c
@@ -19,7 +19,7 @@ void ov18_0221F800(int heapID)
 
     v0 = OS_DisableInterrupts();
     DWC_SetAuthServer(DWC_CONNECTINET_AUTH_RELEASE);
-    v1 = Heap_AllocFromHeap(heapID, DWC_UTILITY_WORK_SIZE);
+    v1 = Heap_Alloc(heapID, DWC_UTILITY_WORK_SIZE);
 
     (void)DWC_StartUtility(v1, DWC_LANGUAGE_ENGLISH, DWC_UTILITY_TOP_MENU_COMMON);
 
diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c
index cd4ef7504e..26ae6ae7cc 100644
--- a/src/overlay020/ov20_021D2098.c
+++ b/src/overlay020/ov20_021D2098.c
@@ -100,7 +100,7 @@ static void ov20_021D2DD8(SysTask *param0, void *param1);
 
 UnkStruct_ov20_021D2128 *ov20_021D2098(const UnkStruct_ov20_021D16E8 *param0, const UnkStruct_020998EC *param1)
 {
-    UnkStruct_ov20_021D2128 *v0 = Heap_AllocFromHeap(HEAP_ID_35, sizeof(UnkStruct_ov20_021D2128));
+    UnkStruct_ov20_021D2128 *v0 = Heap_Alloc(HEAP_ID_35, sizeof(UnkStruct_ov20_021D2128));
 
     if (v0) {
         int v1;
@@ -206,7 +206,7 @@ void ov20_021D21A0(UnkStruct_ov20_021D2128 *param0, int param1)
     };
 
     if (param1 < NELEMS(v0)) {
-        UnkStruct_ov20_021D2238 *v1 = Heap_AllocFromHeap(HEAP_ID_35, sizeof(UnkStruct_ov20_021D2238));
+        UnkStruct_ov20_021D2238 *v1 = Heap_Alloc(HEAP_ID_35, sizeof(UnkStruct_ov20_021D2238));
 
         if (v1) {
             int v2;
diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c
index 43b4ae0dd7..a2af0f8a3b 100644
--- a/src/overlay020/ov20_021D2EA4.c
+++ b/src/overlay020/ov20_021D2EA4.c
@@ -72,7 +72,7 @@ static void ov20_021D375C(UnkStruct_ov20_021D30F8 *param0, BOOL param1);
 
 UnkStruct_ov20_021D30F8 *ov20_021D2EA4(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2)
 {
-    UnkStruct_ov20_021D30F8 *v0 = Heap_AllocFromHeap(HEAP_ID_35, sizeof(UnkStruct_ov20_021D30F8));
+    UnkStruct_ov20_021D30F8 *v0 = Heap_Alloc(HEAP_ID_35, sizeof(UnkStruct_ov20_021D30F8));
 
     v0->unk_00 = param0;
     v0->unk_04 = param1;
diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c
index 6f84fffed4..b4ce323142 100644
--- a/src/overlay020/ov20_021D3864.c
+++ b/src/overlay020/ov20_021D3864.c
@@ -31,7 +31,7 @@ static void ov20_021D3980(UnkStruct_ov20_021D3980 *param0);
 
 UnkStruct_ov20_021D3980 *ov20_021D3864(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2)
 {
-    UnkStruct_ov20_021D3980 *v0 = Heap_AllocFromHeap(HEAP_ID_35, sizeof(UnkStruct_ov20_021D3980));
+    UnkStruct_ov20_021D3980 *v0 = Heap_Alloc(HEAP_ID_35, sizeof(UnkStruct_ov20_021D3980));
 
     v0->unk_00 = param0;
     v0->unk_04 = param1;
diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c
index a72e873233..68d2001998 100644
--- a/src/overlay020/ov20_021D3A54.c
+++ b/src/overlay020/ov20_021D3A54.c
@@ -47,7 +47,7 @@ static void ov20_021D3E0C(UnkStruct_ov20_021D3E0C *param0);
 
 UnkStruct_ov20_021D3E0C *ov20_021D3A54(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2)
 {
-    UnkStruct_ov20_021D3E0C *v0 = Heap_AllocFromHeap(HEAP_ID_35, sizeof(UnkStruct_ov20_021D3E0C));
+    UnkStruct_ov20_021D3E0C *v0 = Heap_Alloc(HEAP_ID_35, sizeof(UnkStruct_ov20_021D3E0C));
 
     v0->unk_00 = param0;
     v0->unk_04 = param1;
diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c
index fa7ab1786d..0bc4186def 100644
--- a/src/overlay020/ov20_021D40E8.c
+++ b/src/overlay020/ov20_021D40E8.c
@@ -47,7 +47,7 @@ static void ov20_021D4658(UnkStruct_ov20_021D4210 *param0, u32 param1, u32 param
 
 UnkStruct_ov20_021D4210 *ov20_021D40E8(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2)
 {
-    UnkStruct_ov20_021D4210 *v0 = Heap_AllocFromHeap(HEAP_ID_35, sizeof(UnkStruct_ov20_021D4210));
+    UnkStruct_ov20_021D4210 *v0 = Heap_Alloc(HEAP_ID_35, sizeof(UnkStruct_ov20_021D4210));
 
     v0->unk_00 = param0;
     v0->unk_04 = param1;
diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c
index a228382379..2d11dec5ec 100644
--- a/src/overlay020/ov20_021D4728.c
+++ b/src/overlay020/ov20_021D4728.c
@@ -69,7 +69,7 @@ static Sprite *ov20_021D4B40(UnkStruct_ov20_021D4AD4 *param0, NNSG2dImageProxy *
 
 UnkStruct_ov20_021D4AD4 *ov20_021D4728(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2)
 {
-    UnkStruct_ov20_021D4AD4 *v0 = Heap_AllocFromHeap(HEAP_ID_35, sizeof(UnkStruct_ov20_021D4AD4));
+    UnkStruct_ov20_021D4AD4 *v0 = Heap_Alloc(HEAP_ID_35, sizeof(UnkStruct_ov20_021D4AD4));
 
     v0->unk_00 = param0;
     v0->unk_04 = param1;
@@ -281,7 +281,7 @@ static Sprite *ov20_021D4B40(UnkStruct_ov20_021D4AD4 *param0, NNSG2dImageProxy *
 
 void ov20_021D4BA4(UnkStruct_ov20_021D4AD4 *param0)
 {
-    UnkStruct_ov20_021D4BA4 *v0 = Heap_AllocFromHeap(HEAP_ID_35, sizeof(UnkStruct_ov20_021D4BA4));
+    UnkStruct_ov20_021D4BA4 *v0 = Heap_Alloc(HEAP_ID_35, sizeof(UnkStruct_ov20_021D4BA4));
 
     if (v0) {
         static const struct {
diff --git a/src/overlay022/ov22_02254DE0.c b/src/overlay022/ov22_02254DE0.c
index e979f869d1..6282431b81 100644
--- a/src/overlay022/ov22_02254DE0.c
+++ b/src/overlay022/ov22_02254DE0.c
@@ -22,8 +22,8 @@ static void ov22_02255040(UnkStruct_ov22_02255040 *param0, TouchScreenHitTable *
 
 UnkStruct_ov22_02254DE0 *ov22_02254DE0(int param0, int heapID)
 {
-    UnkStruct_ov22_02254DE0 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov22_02254DE0));
-    v0->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov22_02255040) * param0);
+    UnkStruct_ov22_02254DE0 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov22_02254DE0));
+    v0->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov22_02255040) * param0);
     memset(v0->unk_00, 0, sizeof(UnkStruct_ov22_02255040) * param0);
     v0->unk_04 = param0;
 
diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c
index 3ccde5ea8a..9b0268152b 100644
--- a/src/overlay022/ov22_02255094.c
+++ b/src/overlay022/ov22_02255094.c
@@ -487,10 +487,10 @@ static void ov22_02255738(void)
 static void ov22_02255748(UnkStruct_ov22_0225A0E4 *param0, const UnkStruct_ov22_022550D4 *param1)
 {
     param0->unk_00 = sub_02015064(param1);
-    param0->unk_04 = Heap_AllocFromHeap(param1->heapID, sizeof(UnkStruct_02015128 *) * (100 + 18));
+    param0->unk_04 = Heap_Alloc(param1->heapID, sizeof(UnkStruct_02015128 *) * (100 + 18));
     param0->unk_08 = (100 + 18);
     param0->unk_0C = 0;
-    param0->unk_10 = Heap_AllocFromHeap(param1->heapID, sizeof(UnkStruct_020151A4 *) * (1 + 18));
+    param0->unk_10 = Heap_Alloc(param1->heapID, sizeof(UnkStruct_020151A4 *) * (1 + 18));
     param0->unk_14 = (1 + 18);
     param0->unk_18 = 0;
     param0->unk_1C = 1;
@@ -661,7 +661,7 @@ static void ov22_02255984(UnkStruct_ov22_0225A0E4 *param0)
 static void ov22_022559B4(UnkStruct_ov22_0225A0E4 *param0)
 {
     param0->unk_34 = ResourceCollection_New((100 + 18) + 1, HEAP_ID_14);
-    param0->unk_38 = Heap_AllocFromHeap(HEAP_ID_14, sizeof(NNSG2dCharacterData *) * ((100 + 18) + 1));
+    param0->unk_38 = Heap_Alloc(HEAP_ID_14, sizeof(NNSG2dCharacterData *) * ((100 + 18) + 1));
     memset(param0->unk_38, 0, sizeof(NNSG2dCharacterData *) * ((100 + 18) + 1));
     param0->unk_3C = ((100 + 18) + 1);
 }
@@ -810,12 +810,12 @@ static void ov22_02255C90(UnkStruct_ov22_0225A0E4 *param0)
 
 static void ov22_02255CB8(UnkStruct_ov22_02255CB8 *param0, int param1, int param2, int heapID)
 {
-    param0->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov22_022557A0) * param1);
+    param0->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov22_022557A0) * param1);
     memset(param0->unk_00, 0, sizeof(UnkStruct_ov22_022557A0) * param1);
     param0->unk_10 = ResourceCollection_New(param1, heapID);
     param0->unk_04 = param1;
 
-    param0->unk_08 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov22_02255800) * param2);
+    param0->unk_08 = Heap_Alloc(heapID, sizeof(UnkStruct_ov22_02255800) * param2);
     memset(param0->unk_08, 0, sizeof(UnkStruct_ov22_02255800) * param2);
     param0->unk_14 = ResourceCollection_New(param2, heapID);
     param0->unk_0C = param2;
diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c
index b58ceaad7c..c80d18130f 100644
--- a/src/overlay022/ov22_02255D44.c
+++ b/src/overlay022/ov22_02255D44.c
@@ -1177,7 +1177,7 @@ static void ov22_02256FD8(UnkStruct_02029C88 *param0, UnkStruct_ov22_02257964 *p
     Strbuf *v4;
     int v5;
 
-    v2 = Heap_AllocFromHeap(HEAP_ID_13, sizeof(UnkStruct_ov22_02256FD8));
+    v2 = Heap_Alloc(HEAP_ID_13, sizeof(UnkStruct_ov22_02256FD8));
     ov22_0225764C(v2);
 
     sub_0202A284(param0, param1->unk_2C.unk_4C.unk_0C, &param1->unk_2C.unk_4C);
diff --git a/src/overlay022/ov22_02257F50.c b/src/overlay022/ov22_02257F50.c
index c82a13b888..24eedf9fd1 100644
--- a/src/overlay022/ov22_02257F50.c
+++ b/src/overlay022/ov22_02257F50.c
@@ -496,7 +496,7 @@ static void ov22_022584F0(UnkStruct_ov22_02257F50_sub1_sub1 *param0, int param1)
 {
     int v0;
 
-    param0->unk_00 = Heap_AllocFromHeap(HEAP_ID_14, sizeof(UnkStruct_ov22_02259560) * param1);
+    param0->unk_00 = Heap_Alloc(HEAP_ID_14, sizeof(UnkStruct_ov22_02259560) * param1);
     param0->unk_04 = param1;
     param0->unk_08 = 0;
 
@@ -610,7 +610,7 @@ static void ov22_0225864C(UnkStruct_ov22_02257F50 *param0, int param1, int param
     v1->unk_20 = ov22_022585A8(param0, param1, param2);
     v1->unk_24 = ov22_022585A8(param0, param3, param4);
     v1->unk_2C = v1->unk_20 + v1->unk_24;
-    v1->unk_28 = Heap_AllocFromHeap(HEAP_ID_13, sizeof(UnkStruct_ov22_0225886C) * v1->unk_2C);
+    v1->unk_28 = Heap_Alloc(HEAP_ID_13, sizeof(UnkStruct_ov22_0225886C) * v1->unk_2C);
 
     GF_ASSERT(v1->unk_28);
 
diff --git a/src/overlay022/ov22_022589E0.c b/src/overlay022/ov22_022589E0.c
index 602332dfce..02366171eb 100644
--- a/src/overlay022/ov22_022589E0.c
+++ b/src/overlay022/ov22_022589E0.c
@@ -80,7 +80,7 @@ void ov22_022589E0(UnkStruct_ov22_02258A48 *param0, UnkStruct_ov22_02257964 *par
 
     ov22_022588F0(param0);
 
-    param0->unk_00 = Heap_AllocFromHeap(HEAP_ID_13, sizeof(UnkStruct_ov22_02258EE4));
+    param0->unk_00 = Heap_Alloc(HEAP_ID_13, sizeof(UnkStruct_ov22_02258EE4));
     memset(param0->unk_00, 0, sizeof(UnkStruct_ov22_02258EE4));
     v0 = param0->unk_00;
 
diff --git a/src/overlay022/ov22_02259484.c b/src/overlay022/ov22_02259484.c
index d907b1abb2..6e6b161c58 100644
--- a/src/overlay022/ov22_02259484.c
+++ b/src/overlay022/ov22_02259484.c
@@ -10,7 +10,7 @@
 
 void ov22_02259484(UnkStruct_ov22_02259484 *param0, int param1, int heapID)
 {
-    param0->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov22_02259560) * param1);
+    param0->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov22_02259560) * param1);
     GF_ASSERT(param0->unk_00);
     memset(param0->unk_00, 0, sizeof(UnkStruct_ov22_02259560) * param1);
     param0->unk_04 = param1;
diff --git a/src/overlay022/ov22_022597BC.c b/src/overlay022/ov22_022597BC.c
index 63fb77b1cf..623af7858d 100644
--- a/src/overlay022/ov22_022597BC.c
+++ b/src/overlay022/ov22_022597BC.c
@@ -224,7 +224,7 @@ static void ov22_02259ABC(BgConfig *param0, int param1, const NNSG2dScreenData *
 
 static void ov22_02259B3C(enum NarcID narcID, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 heapID)
 {
-    UnkStruct_ov22_02259B3C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov22_02259B3C));
+    UnkStruct_ov22_02259B3C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov22_02259B3C));
     memset(v0, 0, sizeof(UnkStruct_ov22_02259B3C));
 
     v0->unk_08 = Graphics_GetCharData(narcID, param1, 0, &v0->unk_04, heapID);
@@ -237,7 +237,7 @@ static void ov22_02259B3C(enum NarcID narcID, u32 param1, BgConfig *param2, u32
 
 static void ov22_02259B8C(enum NarcID narcID, u32 param1, int param2, u32 param3, u32 param4, u32 heapID)
 {
-    UnkStruct_ov22_02259B8C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov22_02259B8C));
+    UnkStruct_ov22_02259B8C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov22_02259B8C));
     memset(v0, 0, sizeof(UnkStruct_ov22_02259B8C));
 
     v0->unk_04 = Graphics_GetPlttData(narcID, param1, &v0->unk_00, heapID);
diff --git a/src/overlay022/ov22_0225AF8C.c b/src/overlay022/ov22_0225AF8C.c
index 0b256f1607..f011b2ae33 100644
--- a/src/overlay022/ov22_0225AF8C.c
+++ b/src/overlay022/ov22_0225AF8C.c
@@ -237,7 +237,7 @@ static UnkStruct_ov22_0225B1BC *ov22_0225B1BC(const UnkStruct_ov22_0225B4E4 *par
     UnkStruct_ov22_0225B1BC *v0;
     BOOL v1;
 
-    v0 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov22_0225B1BC));
+    v0 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_ov22_0225B1BC));
     memset(v0, 0, sizeof(UnkStruct_ov22_0225B1BC));
 
     v0->unk_29C = param0->heapID;
@@ -267,7 +267,7 @@ static UnkStruct_ov22_0225B1BC *ov22_0225B258(const UnkStruct_ov22_0225B4E4 *par
     UnkStruct_ov22_0225B1BC *v0;
     BOOL v1;
 
-    v0 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov22_0225B1BC));
+    v0 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_ov22_0225B1BC));
     memset(v0, 0, sizeof(UnkStruct_ov22_0225B1BC));
 
     v0->unk_29C = param0->heapID;
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index 2b3bd7b4a0..e007f5ed2e 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -1388,7 +1388,7 @@ static void ov23_0223F118(SysTask *param0, void *param1)
         break;
     case 1:
         ov23_0224942C(fieldSystem->unk_6C);
-        StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_16, FADE_TYPE_UNK_18, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_16, FADE_TYPE_UNK_18, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         (v0->state)++;
         break;
     case 2:
@@ -1549,7 +1549,7 @@ static void ov23_0223F118(SysTask *param0, void *param1)
             sub_02039734();
             CommPlayerMan_PauseFieldSystem();
             HBlankSystem_Stop(v0->fieldSystem->unk_04->hBlankSystem);
-            StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_17, FADE_TYPE_UNK_19, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+            StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_17, FADE_TYPE_UNK_19, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
             (v0->state)++;
             break;
         }
@@ -1561,8 +1561,8 @@ static void ov23_0223F118(SysTask *param0, void *param1)
             HBlankSystem_Stop(v0->fieldSystem->unk_04->hBlankSystem);
             HBlankSystem_Start(v0->fieldSystem->unk_04->hBlankSystem);
 
-            Graphics_LoadPalette(NARC_INDEX_DATA__UG_TRAP, 52, PAL_LOAD_MAIN_BG, 10 * 0x20, 4 * 0x20, HEAP_ID_FIELD);
-            LoadStandardWindowGraphics(v0->fieldSystem->bgConfig, 3, 1024 - (18 + 12) - 9, 11, 2, HEAP_ID_FIELD);
+            Graphics_LoadPalette(NARC_INDEX_DATA__UG_TRAP, 52, PAL_LOAD_MAIN_BG, 10 * 0x20, 4 * 0x20, HEAP_ID_FIELD1);
+            LoadStandardWindowGraphics(v0->fieldSystem->bgConfig, 3, 1024 - (18 + 12) - 9, 11, 2, HEAP_ID_FIELD1);
             CommPlayerMan_Restart();
 
             ov23_0224B460();
@@ -1638,10 +1638,10 @@ static void ov23_0223F118(SysTask *param0, void *param1)
 static void ov23_0223F70C(FieldSystem *fieldSystem)
 {
     UnkStruct_ov23_0223EE80 *v0;
-    void *journalEntryLocationEvent = JournalEntry_CreateEventDugUnderground(HEAP_ID_FIELDMAP);
+    void *journalEntryLocationEvent = JournalEntry_CreateEventDugUnderground(HEAP_ID_FIELD2);
 
     JournalEntry_SaveData(fieldSystem->journalEntry, journalEntryLocationEvent, JOURNAL_LOCATION);
-    v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov23_0223EE80));
+    v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov23_0223EE80));
 
     MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov23_0223EE80));
     v0->fieldSystem = fieldSystem;
@@ -2908,7 +2908,7 @@ void ov23_022412F0(void)
     GF_ASSERT(!Unk_ov23_02257740->unk_8D0);
     GF_ASSERT(!Unk_ov23_02257740->unk_8C4);
 
-    v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov23_022412CC));
+    v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov23_022412CC));
 
     MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov23_022412CC));
     Link_Message(71);
diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c
index 14a8d0b074..24ebaf4741 100644
--- a/src/overlay023/ov23_02241F74.c
+++ b/src/overlay023/ov23_02241F74.c
@@ -140,9 +140,9 @@ static void CommManUnderground_Init(CommManUnderground *param0, FieldSystem *fie
     sCommManUnderground->decorateBaseTextPrinter = UndergroundTextPrinter_New(TEXT_BANK_UNDERGROUND_DECORATE_BASE, HEAP_ID_33, fieldSystem->bgConfig, renderDelay, 0);
     sCommManUnderground->itemNameTextPrinter = UndergroundTextPrinter_New(TEXT_BANK_UNDERGROUND_TRAP_NAMES, HEAP_ID_33, fieldSystem->bgConfig, renderDelay, 0);
 
-    LoadMessageBoxGraphics(sCommManUnderground->fieldSystem->bgConfig, 3, (1024 - (18 + 12)), 10, 0, HEAP_ID_FIELD);
-    Graphics_LoadPalette(NARC_INDEX_DATA__UG_TRAP, 52, 0, 10 * 0x20, 4 * 0x20, HEAP_ID_FIELD);
-    LoadStandardWindowGraphics(sCommManUnderground->fieldSystem->bgConfig, 3, 1024 - (18 + 12) - 9, 11, 2, HEAP_ID_FIELD);
+    LoadMessageBoxGraphics(sCommManUnderground->fieldSystem->bgConfig, 3, (1024 - (18 + 12)), 10, 0, HEAP_ID_FIELD1);
+    Graphics_LoadPalette(NARC_INDEX_DATA__UG_TRAP, 52, 0, 10 * 0x20, 4 * 0x20, HEAP_ID_FIELD1);
+    LoadStandardWindowGraphics(sCommManUnderground->fieldSystem->bgConfig, 3, 1024 - (18 + 12) - 9, 11, 2, HEAP_ID_FIELD1);
 
     for (i = 0; i < (7 + 1); i++) {
         sCommManUnderground->unk_C2[i] = 0xff;
@@ -219,8 +219,8 @@ BOOL ov23_0224223C(TrainerInfo *param0, TrainerInfo *param1, int param2, Strbuf
     Strbuf *v1;
 
     if (param0 && param1) {
-        v0 = StringTemplate_Default(HEAP_ID_FIELD);
-        v1 = Strbuf_Init((50 * 2), HEAP_ID_FIELD);
+        v0 = StringTemplate_Default(HEAP_ID_FIELD1);
+        v1 = Strbuf_Init((50 * 2), HEAP_ID_FIELD1);
 
         StringTemplate_SetPlayerName(v0, 0, param0);
         StringTemplate_SetPlayerName(v0, 1, param1);
@@ -241,8 +241,8 @@ BOOL ov23_022422A8(TrainerInfo *param0, int param1, int param2, Strbuf *param3)
     Strbuf *v1;
 
     if (param0) {
-        v0 = StringTemplate_Default(HEAP_ID_FIELD);
-        v1 = Strbuf_Init((50 * 2), HEAP_ID_FIELD);
+        v0 = StringTemplate_Default(HEAP_ID_FIELD1);
+        v1 = Strbuf_Init((50 * 2), HEAP_ID_FIELD1);
 
         StringTemplate_SetPlayerName(v0, param1, param0);
         MessageLoader_GetStrbuf(UndergroundTextPrinter_GetMessageLoader(CommManUnderground_GetCommonTextPrinter()), param2, v1);
@@ -761,25 +761,25 @@ void ov23_02242BC0(FieldSystem *fieldSystem)
     void *v0;
 
     if (sCommManUnderground == NULL) {
-        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sizeof(CommManUnderground));
+        v0 = Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommManUnderground));
         CommManUnderground_Init(v0, fieldSystem);
 
-        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, CommPlayer_Size());
+        v0 = Heap_Alloc(HEAP_ID_COMMUNICATION, CommPlayer_Size());
         CommPlayerMan_Init(v0, fieldSystem, 1);
 
-        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, ov23_02243858());
+        v0 = Heap_Alloc(HEAP_ID_COMMUNICATION, ov23_02243858());
         ov23_022434BC(v0, fieldSystem);
 
-        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, ov23_0224B5C4());
+        v0 = Heap_Alloc(HEAP_ID_COMMUNICATION, ov23_0224B5C4());
         ov23_0224B144(v0, fieldSystem);
 
-        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, BuriedSpheresEnv_Size());
+        v0 = Heap_Alloc(HEAP_ID_COMMUNICATION, BuriedSpheresEnv_Size());
         BuriedSpheresEnv_Init(v0, fieldSystem);
 
-        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, ov23_0223E2E8());
+        v0 = Heap_Alloc(HEAP_ID_COMMUNICATION, ov23_0223E2E8());
         ov23_0223E1E4(v0, fieldSystem);
 
-        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, ov23_02253608());
+        v0 = Heap_Alloc(HEAP_ID_COMMUNICATION, ov23_02253608());
         ov23_02253598(v0, SaveData_UndergroundRecord(FieldSystem_GetSaveData(fieldSystem)), FieldSystem_GetSaveData(fieldSystem));
         ov23_0224F588(SaveData_GetUnderground(FieldSystem_GetSaveData(fieldSystem)));
     }
@@ -810,7 +810,7 @@ void ov23_02242CB4(void)
         ov23_022435A8();
         ov23_0223E2F4();
         sCommManUnderground->unk_14B = 0;
-        LoadMessageBoxGraphics(sCommManUnderground->fieldSystem->bgConfig, 3, (1024 - (18 + 12)), 10, 0, HEAP_ID_FIELD);
+        LoadMessageBoxGraphics(sCommManUnderground->fieldSystem->bgConfig, 3, (1024 - (18 + 12)), 10, 0, HEAP_ID_FIELD1);
     }
 }
 
@@ -1045,8 +1045,8 @@ void UndergroundMan_SetReturnLog(int param0)
         if (sCommManUnderground->unk_DC[param0] == NULL) {
             sCommManUnderground->unk_DC[param0] = Strbuf_Init((50 * 2), HEAP_ID_COMMUNICATION);
 
-            v0 = StringTemplate_Default(HEAP_ID_FIELDMAP);
-            v1 = Strbuf_Init((50 * 2), HEAP_ID_FIELDMAP);
+            v0 = StringTemplate_Default(HEAP_ID_FIELD2);
+            v1 = Strbuf_Init((50 * 2), HEAP_ID_FIELD2);
 
             StringTemplate_SetPlayerName(v0, 0, CommInfo_TrainerInfo(param0));
             MessageLoader_GetStrbuf(UndergroundTextPrinter_GetMessageLoader(CommManUnderground_GetCommonTextPrinter()), 115, v1);
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index 01226ad17a..3bc688dc07 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -777,18 +777,18 @@ static void ov23_02243754(void)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        Unk_ov23_02257764->unk_1D4[1][v0] = SpriteResourceCollection_New(1, v0, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1D4[1][v0] = SpriteResourceCollection_New(1, v0, HEAP_ID_FIELD1);
     }
 
     {
         NARC *v1;
 
-        v1 = NARC_ctor(NARC_INDEX_DATA__UG_TRAP, HEAP_ID_FIELD);
+        v1 = NARC_ctor(NARC_INDEX_DATA__UG_TRAP, HEAP_ID_FIELD1);
 
-        Unk_ov23_02257764->unk_1F4[1][0] = SpriteResourceCollection_AddTilesFrom(Unk_ov23_02257764->unk_1D4[1][0], v1, 17, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD);
-        Unk_ov23_02257764->unk_1F4[1][1] = SpriteResourceCollection_AddPaletteFrom(Unk_ov23_02257764->unk_1D4[1][1], v1, 18, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 7, HEAP_ID_FIELD);
-        Unk_ov23_02257764->unk_1F4[1][2] = SpriteResourceCollection_AddFrom(Unk_ov23_02257764->unk_1D4[1][2], v1, 16, 0, 0, 2, HEAP_ID_FIELD);
-        Unk_ov23_02257764->unk_1F4[1][3] = SpriteResourceCollection_AddFrom(Unk_ov23_02257764->unk_1D4[1][3], v1, 15, 0, 0, 3, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[1][0] = SpriteResourceCollection_AddTilesFrom(Unk_ov23_02257764->unk_1D4[1][0], v1, 17, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD1);
+        Unk_ov23_02257764->unk_1F4[1][1] = SpriteResourceCollection_AddPaletteFrom(Unk_ov23_02257764->unk_1D4[1][1], v1, 18, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 7, HEAP_ID_FIELD1);
+        Unk_ov23_02257764->unk_1F4[1][2] = SpriteResourceCollection_AddFrom(Unk_ov23_02257764->unk_1D4[1][2], v1, 16, 0, 0, 2, HEAP_ID_FIELD1);
+        Unk_ov23_02257764->unk_1F4[1][3] = SpriteResourceCollection_AddFrom(Unk_ov23_02257764->unk_1D4[1][3], v1, 15, 0, 0, 3, HEAP_ID_FIELD1);
 
         NARC_dtor(v1);
     }
@@ -2074,7 +2074,7 @@ static void ov23_02244C70(SysTask *param0, void *param1)
 
 static void ov23_02244D80(FieldSystem *fieldSystem, int param1, int param2, BOOL param3)
 {
-    UnkStruct_ov23_02244C70 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_02244C70));
+    UnkStruct_ov23_02244C70 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_02244C70));
     MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov23_02244C70));
 
     GF_ASSERT(Unk_ov23_02257764->unk_300 == NULL);
@@ -2145,7 +2145,7 @@ static UnkStruct_ov23_02243DA8 *ov23_02244EA0(UnkStruct_ov23_02243DA8 *param0)
 
 static void ov23_02244EA4(FieldSystem *fieldSystem, BOOL param1, int param2)
 {
-    UnkStruct_ov23_022451BC *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_022451BC));
+    UnkStruct_ov23_022451BC *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_022451BC));
     MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov23_022451BC));
 
     Unk_ov23_02257764->unk_300 = v0;
@@ -2338,23 +2338,23 @@ static void ov23_022451C8(SysTask *param0, void *param1)
         break;
     case 1:
         BrightnessController_StartTransition(1, 10, 0, GX_BLEND_PLANEMASK_BG0, BRIGHTNESS_MAIN_SCREEN);
-        Graphics_LoadTilesToBgLayer(NARC_INDEX_DATA__UG_TRAP, 9, v0->unk_10, 2, 0, 8 * 6 * 6, 0, HEAP_ID_FIELD);
+        Graphics_LoadTilesToBgLayer(NARC_INDEX_DATA__UG_TRAP, 9, v0->unk_10, 2, 0, 8 * 6 * 6, 0, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 2:
-        Graphics_LoadPalette(NARC_INDEX_DATA__UG_TRAP, 10, 0, 0, 32, HEAP_ID_FIELD);
+        Graphics_LoadPalette(NARC_INDEX_DATA__UG_TRAP, 10, 0, 0, 32, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 3:
         BrightnessController_StartTransition(1, 0, 10, GX_BLEND_PLANEMASK_BG0, BRIGHTNESS_MAIN_SCREEN);
 
         if (Unk_ov23_02257764->unk_B9F == 19) {
-            Graphics_LoadTilemapToBgLayer(NARC_INDEX_DATA__UG_TRAP, 8, v0->unk_10, 2, 0, 32 * 24 * 2, 0, HEAP_ID_FIELD);
+            Graphics_LoadTilemapToBgLayer(NARC_INDEX_DATA__UG_TRAP, 8, v0->unk_10, 2, 0, 32 * 24 * 2, 0, HEAP_ID_FIELD1);
         } else {
             u16 v2[] = { 11, 12, 13, 14 };
             u16 v3 = LCRNG_Next() % 4;
 
-            Graphics_LoadTilemapToBgLayer(NARC_INDEX_DATA__UG_TRAP, v2[v3], v0->unk_10, 2, 0, 32 * 24 * 2, 0, HEAP_ID_FIELD);
+            Graphics_LoadTilemapToBgLayer(NARC_INDEX_DATA__UG_TRAP, v2[v3], v0->unk_10, 2, 0, 32 * 24 * 2, 0, HEAP_ID_FIELD1);
         }
 
         Bg_SetPriority(BG_LAYER_MAIN_0, 3);
@@ -2629,7 +2629,7 @@ void ov23_02245728(void)
         return;
     }
 
-    v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_02245700));
+    v0 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_02245700));
     MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov23_02245700));
     Link_Message(46);
 
@@ -2799,7 +2799,7 @@ static void ov23_0224599C(SysTask *param0, void *param1)
 static void ov23_02245A58(BOOL param0)
 {
     int v0;
-    UnkStruct_ov23_0224590C *v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_0224590C));
+    UnkStruct_ov23_0224590C *v1 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_0224590C));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov23_0224590C));
 
     v1->unk_00 = 0;
@@ -3002,7 +3002,7 @@ static void ov23_02245BA8(SysTask *param0, void *param1)
 static void ov23_02245DF8(BOOL param0, BOOL param1, int param2)
 {
     int v0;
-    UnkStruct_ov23_02245AA4 *v1 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_02245AA4));
+    UnkStruct_ov23_02245AA4 *v1 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_02245AA4));
     MI_CpuClear8(v1, sizeof(UnkStruct_ov23_02245AA4));
 
     v1->unk_00 = 0;
@@ -3092,7 +3092,7 @@ static void ov23_02245F94(SysTask *param0, void *param1)
             v2 = 28;
         }
 
-        Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddTiles(Unk_ov23_02257764->unk_1D4[0][0], 50, v2, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddTiles(Unk_ov23_02257764->unk_1D4[0][0], 50, v2, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 2:
@@ -3102,7 +3102,7 @@ static void ov23_02245F94(SysTask *param0, void *param1)
             v2 = 29;
         }
 
-        Unk_ov23_02257764->unk_1F4[0][1] = SpriteResourceCollection_AddPalette(Unk_ov23_02257764->unk_1D4[0][1], 50, v2, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 7, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][1] = SpriteResourceCollection_AddPalette(Unk_ov23_02257764->unk_1D4[0][1], 50, v2, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 7, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 3:
@@ -3114,7 +3114,7 @@ static void ov23_02245F94(SysTask *param0, void *param1)
             v2 = 27;
         }
 
-        Unk_ov23_02257764->unk_1F4[0][2] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][2], 50, v2, 0, 0, 2, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][2] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][2], 50, v2, 0, 0, 2, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 4:
@@ -3124,7 +3124,7 @@ static void ov23_02245F94(SysTask *param0, void *param1)
             v2 = 26;
         }
 
-        Unk_ov23_02257764->unk_1F4[0][3] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][3], 50, v2, 0, 0, 3, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][3] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][3], 50, v2, 0, 0, 3, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 5:
@@ -3215,7 +3215,7 @@ static void ov23_02246220(int param0, BOOL param1)
 static void ov23_022462A8(FieldSystem *fieldSystem, BOOL param1, int param2)
 {
     int v0;
-    UnkStruct_ov23_02245ED4 *v1 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_02245ED4));
+    UnkStruct_ov23_02245ED4 *v1 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_02245ED4));
     MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov23_02245ED4));
 
     v1->unk_113 = param1;
@@ -3237,11 +3237,11 @@ static void ov23_02246324(void)
 {
     int v0;
 
-    Unk_ov23_02257764->unk_44 = SpriteList_InitRendering(32, &Unk_ov23_02257764->unk_48, HEAP_ID_FIELD);
+    Unk_ov23_02257764->unk_44 = SpriteList_InitRendering(32, &Unk_ov23_02257764->unk_48, HEAP_ID_FIELD1);
     SetSubScreenViewRect(&Unk_ov23_02257764->unk_48, 0, (192 << FX32_SHIFT) * 2);
 
     for (v0 = 0; v0 < 4; v0++) {
-        Unk_ov23_02257764->unk_1D4[0][v0] = SpriteResourceCollection_New(2, v0, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1D4[0][v0] = SpriteResourceCollection_New(2, v0, HEAP_ID_FIELD1);
     }
 }
 
@@ -3306,7 +3306,7 @@ static void ov23_0224644C(int param0)
         v0.affineZRotation = 0;
         v0.priority = 0;
         v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v0.heapID = HEAP_ID_FIELD;
+        v0.heapID = HEAP_ID_FIELD1;
 
         for (v1 = 0; v1 < param0; v1++) {
             v0.position.x = FX32_ONE * 300;
@@ -3537,21 +3537,21 @@ static void ov23_02246A80(SysTask *param0, void *param1)
         v0->unk_00++;
         break;
     case 1:
-        Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddTiles(Unk_ov23_02257764->unk_1D4[0][0], 50, 6, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddTiles(Unk_ov23_02257764->unk_1D4[0][0], 50, 6, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD1);
         BrightnessController_StartTransition(1, 10, 0, GX_BLEND_PLANEMASK_BG0, BRIGHTNESS_MAIN_SCREEN);
         v0->unk_00++;
         break;
     case 2:
-        Unk_ov23_02257764->unk_1F4[0][1] = SpriteResourceCollection_AddPalette(Unk_ov23_02257764->unk_1D4[0][1], 50, 7, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 7, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][1] = SpriteResourceCollection_AddPalette(Unk_ov23_02257764->unk_1D4[0][1], 50, 7, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 7, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 3:
         BrightnessController_StartTransition(1, 0, 10, GX_BLEND_PLANEMASK_BG0, BRIGHTNESS_MAIN_SCREEN);
-        Unk_ov23_02257764->unk_1F4[0][2] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][2], 50, 5, 0, 0, 2, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][2] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][2], 50, 5, 0, 0, 2, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 4:
-        Unk_ov23_02257764->unk_1F4[0][3] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][3], 50, 4, 0, 0, 3, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][3] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][3], 50, 4, 0, 0, 3, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 5:
@@ -3623,7 +3623,7 @@ static void ov23_02246A80(SysTask *param0, void *param1)
 static void ov23_02246CF0(BgConfig *param0, BOOL param1, int param2)
 {
     int v0;
-    UnkStruct_ov23_022468DC *v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_022468DC));
+    UnkStruct_ov23_022468DC *v1 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_022468DC));
     MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov23_022468DC));
     v1->unk_15E = param1;
 
@@ -3654,7 +3654,7 @@ static void ov23_02246D44(UnkStruct_ov23_022468DC *param0)
         v0.affineZRotation = 0;
         v0.priority = 0;
         v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v0.heapID = HEAP_ID_FIELD;
+        v0.heapID = HEAP_ID_FIELD1;
 
         for (v1 = 0; v1 < ov23_022468C0(); v1++) {
             v0.position.x = FX32_ONE * 300;
@@ -3832,7 +3832,7 @@ static void ov23_022471D8(UnkStruct_ov23_022471D8 *param0)
         v0.affineZRotation = 0;
         v0.priority = 0;
         v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v0.heapID = HEAP_ID_FIELD;
+        v0.heapID = HEAP_ID_FIELD1;
 
         for (v1 = 0; v1 < 15; v1++) {
             v0.position.x = FX32_ONE * 100;
@@ -4106,10 +4106,10 @@ static void ov23_022479F4(UnkStruct_ov23_022471D8 *param0)
     {
         NARC *v2;
 
-        v2 = NARC_ctor(NARC_INDEX_DATA__UG_TRAP, HEAP_ID_FIELD);
+        v2 = NARC_ctor(NARC_INDEX_DATA__UG_TRAP, HEAP_ID_FIELD1);
 
         if (v1 < (7 - 1)) {
-            param0->unk_F8[v1 + 1] = SpriteResourceCollection_AddTilesFrom(Unk_ov23_02257764->unk_1D4[0][0], v2, v0[v1], 0, v1 + 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD);
+            param0->unk_F8[v1 + 1] = SpriteResourceCollection_AddTilesFrom(Unk_ov23_02257764->unk_1D4[0][0], v2, v0[v1], 0, v1 + 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD1);
         }
 
         NARC_dtor(v2);
@@ -4140,32 +4140,32 @@ static void ov23_02247A8C(SysTask *param0, void *param1)
         {
             int v2;
 
-            Unk_ov23_02257764->unk_44 = SpriteList_InitRendering(32, &Unk_ov23_02257764->unk_48, HEAP_ID_FIELD);
+            Unk_ov23_02257764->unk_44 = SpriteList_InitRendering(32, &Unk_ov23_02257764->unk_48, HEAP_ID_FIELD1);
             SetSubScreenViewRect(&Unk_ov23_02257764->unk_48, 0, (192 << FX32_SHIFT) * 2);
 
             for (v2 = 0; v2 < 4; v2++) {
-                Unk_ov23_02257764->unk_1D4[0][v2] = SpriteResourceCollection_New(7 + 1, v2, HEAP_ID_FIELD);
+                Unk_ov23_02257764->unk_1D4[0][v2] = SpriteResourceCollection_New(7 + 1, v2, HEAP_ID_FIELD1);
             }
         }
         v0->unk_00++;
         break;
     case 1:
         BrightnessController_StartTransition(1, 10, 0, GX_BLEND_PLANEMASK_BG0, BRIGHTNESS_MAIN_SCREEN);
-        Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddTiles(Unk_ov23_02257764->unk_1D4[0][0], 50, 32, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddTiles(Unk_ov23_02257764->unk_1D4[0][0], 50, 32, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD1);
         v0->unk_F8[0] = Unk_ov23_02257764->unk_1F4[0][0];
         v0->unk_00++;
         break;
     case 2:
-        Unk_ov23_02257764->unk_1F4[0][1] = SpriteResourceCollection_AddPalette(Unk_ov23_02257764->unk_1D4[0][1], 50, 51, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 7, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][1] = SpriteResourceCollection_AddPalette(Unk_ov23_02257764->unk_1D4[0][1], 50, 51, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 7, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 3:
         BrightnessController_StartTransition(1, 0, 10, GX_BLEND_PLANEMASK_BG0, BRIGHTNESS_MAIN_SCREEN);
-        Unk_ov23_02257764->unk_1F4[0][2] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][2], 50, 31, 0, 0, 2, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][2] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][2], 50, 31, 0, 0, 2, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 4:
-        Unk_ov23_02257764->unk_1F4[0][3] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][3], 50, 30, 0, 0, 3, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][3] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][3], 50, 30, 0, 0, 3, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 5:
@@ -4232,7 +4232,7 @@ static void ov23_02247A8C(SysTask *param0, void *param1)
 static void ov23_02247D28(BgConfig *param0, BOOL param1, int param2)
 {
     int v0;
-    UnkStruct_ov23_022471D8 *v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_022471D8));
+    UnkStruct_ov23_022471D8 *v1 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_022471D8));
     MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov23_022471D8));
 
     v1->unk_127 = param1;
@@ -4304,7 +4304,7 @@ static void ov23_02247E38(UnkStruct_ov23_02247E38 *param0)
         v0.affineZRotation = 0;
         v0.priority = 0;
         v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v0.heapID = HEAP_ID_FIELD;
+        v0.heapID = HEAP_ID_FIELD1;
 
         for (v1 = 0; v1 < 1; v1++) {
             v0.position.x = FX32_ONE * 128;
@@ -4435,11 +4435,11 @@ static void ov23_022480C4(SysTask *param0, void *param1)
             v2 = 25;
         }
 
-        Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddTiles(Unk_ov23_02257764->unk_1D4[0][0], 50, v2, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][0] = SpriteResourceCollection_AddTiles(Unk_ov23_02257764->unk_1D4[0][0], 50, v2, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 2:
-        Unk_ov23_02257764->unk_1F4[0][1] = SpriteResourceCollection_AddPalette(Unk_ov23_02257764->unk_1D4[0][1], 50, 19, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 7, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][1] = SpriteResourceCollection_AddPalette(Unk_ov23_02257764->unk_1D4[0][1], 50, 19, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 7, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 3:
@@ -4451,7 +4451,7 @@ static void ov23_022480C4(SysTask *param0, void *param1)
             v2 = 24;
         }
 
-        Unk_ov23_02257764->unk_1F4[0][2] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][2], 50, v2, 0, 0, 2, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][2] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][2], 50, v2, 0, 0, 2, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 4:
@@ -4461,7 +4461,7 @@ static void ov23_022480C4(SysTask *param0, void *param1)
             v2 = 23;
         }
 
-        Unk_ov23_02257764->unk_1F4[0][3] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][3], 50, v2, 0, 0, 3, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_1F4[0][3] = SpriteResourceCollection_Add(Unk_ov23_02257764->unk_1D4[0][3], 50, v2, 0, 0, 3, HEAP_ID_FIELD1);
         v0->unk_00++;
         break;
     case 5:
@@ -4526,7 +4526,7 @@ static void ov23_022480C4(SysTask *param0, void *param1)
 static void ov23_02248318(BgConfig *param0, BOOL param1, int param2)
 {
     int v0;
-    UnkStruct_ov23_02247E38 *v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_02247E38));
+    UnkStruct_ov23_02247E38 *v1 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_02247E38));
     MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov23_02247E38));
 
     v1->unk_2A = param1;
@@ -4646,7 +4646,7 @@ static void ov23_02248418(SysTask *param0, void *param1)
 static void ov23_0224852C(BgConfig *param0, BOOL param1, int param2)
 {
     int v0;
-    UnkStruct_ov23_02248418 *v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_02248418));
+    UnkStruct_ov23_02248418 *v1 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_02248418));
     MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov23_02248418));
 
     v1->unk_11 = param1;
@@ -4760,7 +4760,7 @@ static void ov23_02248748(UnkStruct_ov23_02248748 *param0)
         v0.affineZRotation = 0;
         v0.priority = 0;
         v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v0.heapID = HEAP_ID_FIELD;
+        v0.heapID = HEAP_ID_FIELD1;
 
         for (v1 = 0; v1 < 25; v1++) {
             v0.position.x = FX32_ONE * 300;
@@ -4802,7 +4802,7 @@ static void ov23_02248884(SysTask *param0, void *param1)
         CommPlayerMan_PauseFieldSystem();
         Sound_PlayEffect(SEQ_SE_PL_UG_006);
 
-        Unk_ov23_02257764->unk_44 = SpriteList_InitRendering(32, &Unk_ov23_02257764->unk_48, HEAP_ID_FIELD);
+        Unk_ov23_02257764->unk_44 = SpriteList_InitRendering(32, &Unk_ov23_02257764->unk_48, HEAP_ID_FIELD1);
         SetSubScreenViewRect(&Unk_ov23_02257764->unk_48, 0, (192 << FX32_SHIFT) * 2);
         v0->unk_00 = 5;
         break;
@@ -4852,7 +4852,7 @@ void ov23_022489F8(FieldSystem *fieldSystem, int param1, int param2, int param3,
         return;
     }
 
-    v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_02248748));
+    v1 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_02248748));
     MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov23_02248748));
 
     v1->unk_00 = 0;
@@ -4945,7 +4945,7 @@ static void ov23_02248B3C(int param0, int param1)
     }
 
     if (Unk_ov23_02257764->unk_00[param0] == NULL) {
-        v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_02248A6C));
+        v1 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_02248A6C));
         MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov23_02248A6C));
         Unk_ov23_02257764->unk_00[param0] = v1;
         Unk_ov23_02257764->unk_20[param0] = SysTask_Start(ov23_02248A6C, v1, 100);
diff --git a/src/overlay023/ov23_02248C08.c b/src/overlay023/ov23_02248C08.c
index af19f47f99..dbb9932a40 100644
--- a/src/overlay023/ov23_02248C08.c
+++ b/src/overlay023/ov23_02248C08.c
@@ -20,7 +20,7 @@
 
 UnkStruct_ov23_02248D20 *ov23_02248C08(ListMenuTemplate *param0, u16 param1, u16 param2, u8 heapID, UnkFuncPtr_ov23_02248D20 param4, Underground *underground, BOOL param6)
 {
-    UnkStruct_ov23_02248D20 *v0 = (UnkStruct_ov23_02248D20 *)Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov23_02248D20));
+    UnkStruct_ov23_02248D20 *v0 = (UnkStruct_ov23_02248D20 *)Heap_Alloc(heapID, sizeof(UnkStruct_ov23_02248D20));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_ov23_02248D20));
 
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index d1b416ce2e..9a22e68960 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -112,7 +112,7 @@ static void ov23_02248F1C(SysTask *param0, void *param1)
             v3.affineZRotation = 0;
             v3.priority = 0;
             v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
-            v3.heapID = HEAP_ID_FIELD;
+            v3.heapID = HEAP_ID_FIELD1;
 
             for (v2 = 0; v2 < (7 + 1); v2++) {
                 v0->unk_390[v2] = SpriteList_AddAffine(&v3);
@@ -406,19 +406,19 @@ static void ov23_0224944C(BgConfig *param0, Window *param1)
     {
         NARC *v3;
 
-        v3 = NARC_ctor(NARC_INDEX_DATA__UNDERG_RADAR, HEAP_ID_FIELD);
+        v3 = NARC_ctor(NARC_INDEX_DATA__UNDERG_RADAR, HEAP_ID_FIELD1);
 
-        Graphics_LoadPaletteFromOpenNARC(v3, 0, 4, 0, 0x20 * 2, HEAP_ID_FIELD);
-        Graphics_LoadTilesToBgLayerFromOpenNARC(v3, 1, param0, 4, 0, 32 * 5 * 0x20, 0, HEAP_ID_FIELD);
-        Graphics_LoadTilemapToBgLayerFromOpenNARC(v3, 2, param0, 4, 0, 32 * 24 * 2, 0, HEAP_ID_FIELD);
+        Graphics_LoadPaletteFromOpenNARC(v3, 0, 4, 0, 0x20 * 2, HEAP_ID_FIELD1);
+        Graphics_LoadTilesToBgLayerFromOpenNARC(v3, 1, param0, 4, 0, 32 * 5 * 0x20, 0, HEAP_ID_FIELD1);
+        Graphics_LoadTilemapToBgLayerFromOpenNARC(v3, 2, param0, 4, 0, 32 * 24 * 2, 0, HEAP_ID_FIELD1);
         NARC_dtor(v3);
     }
 
     FieldMessage_LoadTextPalettes(4, FALSE);
-    Bg_ClearTilesRange(7, 32, 0, HEAP_ID_FIELD);
+    Bg_ClearTilesRange(7, 32, 0, HEAP_ID_FIELD1);
     FieldMessage_AddWindow(param0, param1, 7);
     Window_FillTilemap(param1, 0);
-    Graphics_LoadPalette(NARC_INDEX_DATA__UG_TRAP, 52, 4, 10 * 0x20, 4 * 0x20, HEAP_ID_FIELD);
+    Graphics_LoadPalette(NARC_INDEX_DATA__UG_TRAP, 52, 4, 10 * 0x20, 4 * 0x20, HEAP_ID_FIELD1);
     ResetScreenMasterBrightness(DS_SCREEN_SUB);
 }
 
@@ -426,21 +426,21 @@ static void ov23_02249584(UnkStruct_ov23_0224942C *param0)
 {
     int v0;
 
-    param0->unk_1BC = SpriteList_InitRendering((7 + 1) + 16 + 1, &param0->unk_1C0, HEAP_ID_FIELD);
+    param0->unk_1BC = SpriteList_InitRendering((7 + 1) + 16 + 1, &param0->unk_1C0, HEAP_ID_FIELD1);
 
     for (v0 = 0; v0 < 4; v0++) {
-        param0->unk_34C[v0] = SpriteResourceCollection_New(1, v0, HEAP_ID_FIELD);
+        param0->unk_34C[v0] = SpriteResourceCollection_New(1, v0, HEAP_ID_FIELD1);
     }
 
     {
         NARC *v1;
 
-        v1 = NARC_ctor(NARC_INDEX_DATA__UNDERG_RADAR, HEAP_ID_FIELD);
+        v1 = NARC_ctor(NARC_INDEX_DATA__UNDERG_RADAR, HEAP_ID_FIELD1);
 
-        param0->unk_35C[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_34C[0], v1, 4, 0, 1000, NNS_G2D_VRAM_TYPE_2DSUB, HEAP_ID_FIELD);
-        param0->unk_35C[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_34C[1], v1, 3, 0, 1000, NNS_G2D_VRAM_TYPE_2DSUB, 2, HEAP_ID_FIELD);
-        param0->unk_35C[2] = SpriteResourceCollection_AddFrom(param0->unk_34C[2], v1, 5, 0, 1000, 2, HEAP_ID_FIELD);
-        param0->unk_35C[3] = SpriteResourceCollection_AddFrom(param0->unk_34C[3], v1, 6, 0, 1000, 3, HEAP_ID_FIELD);
+        param0->unk_35C[0] = SpriteResourceCollection_AddTilesFrom(param0->unk_34C[0], v1, 4, 0, 1000, NNS_G2D_VRAM_TYPE_2DSUB, HEAP_ID_FIELD1);
+        param0->unk_35C[1] = SpriteResourceCollection_AddPaletteFrom(param0->unk_34C[1], v1, 3, 0, 1000, NNS_G2D_VRAM_TYPE_2DSUB, 2, HEAP_ID_FIELD1);
+        param0->unk_35C[2] = SpriteResourceCollection_AddFrom(param0->unk_34C[2], v1, 5, 0, 1000, 2, HEAP_ID_FIELD1);
+        param0->unk_35C[3] = SpriteResourceCollection_AddFrom(param0->unk_34C[3], v1, 6, 0, 1000, 3, HEAP_ID_FIELD1);
 
         NARC_dtor(v1);
     }
@@ -490,15 +490,15 @@ static void ov23_02249724(UnkStruct_ov23_02249724 *param0)
     int v0;
 
     for (v0 = 0; v0 < 32; v0++) {
-        param0->unk_00[v0] = Strbuf_Init(50 * 2, HEAP_ID_FIELD);
+        param0->unk_00[v0] = Strbuf_Init(50 * 2, HEAP_ID_FIELD1);
     }
 
     param0->unk_8C = 0;
     param0->unk_90 = 0;
-    param0->unk_80 = Strbuf_Init(50 * 2, HEAP_ID_FIELD);
+    param0->unk_80 = Strbuf_Init(50 * 2, HEAP_ID_FIELD1);
 
     for (v0 = 0; v0 < 2; v0++) {
-        param0->unk_84[v0] = Strbuf_Init(20 * 2 * 2, HEAP_ID_FIELD);
+        param0->unk_84[v0] = Strbuf_Init(20 * 2 * 2, HEAP_ID_FIELD1);
     }
 }
 
diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c
index a2e90f369d..973e613219 100644
--- a/src/overlay023/ov23_0224A1D0.c
+++ b/src/overlay023/ov23_0224A1D0.c
@@ -311,7 +311,7 @@ static void ov23_0224A5CC(SysTask *param0, void *param1)
 static void ov23_0224A620(int param0)
 {
     CommPlayerManager *commPlayerMan = CommPlayerMan_Get();
-    UnkStruct_ov23_0224A5CC *v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov23_0224A5CC));
+    UnkStruct_ov23_0224A5CC *v1 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov23_0224A5CC));
 
     v1->unk_00 = 0;
     v1->unk_04 = param0;
diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c
index c111223b33..a54298f635 100644
--- a/src/overlay023/ov23_0224B05C.c
+++ b/src/overlay023/ov23_0224B05C.c
@@ -935,7 +935,7 @@ static void ov23_0224BC5C(FieldSystem *fieldSystem, int param1, int param2, int
     UnkStruct_ov23_0224BA48 *v0 = NULL;
 
     ov23_0224DC08();
-    v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_0224BA48));
+    v0 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_0224BA48));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov23_0224BA48));
 
     v0->unk_18 = -1;
@@ -957,7 +957,7 @@ static UnkStruct_ov23_0224BA48 *ov23_0224BCC4(FieldSystem *fieldSystem, int para
     UnkStruct_ov23_0224BA48 *v0 = NULL;
 
     if (fieldSystem->task == NULL) {
-        v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov23_0224BA48));
+        v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov23_0224BA48));
         MI_CpuClear8(v0, sizeof(UnkStruct_ov23_0224BA48));
 
         v0->unk_18 = -1;
@@ -1098,7 +1098,7 @@ static void ov23_0224BE28(SysTask *param0, void *param1)
         break;
     case 6:
         if (UndergroundTextPrinter_IsPrinterActive(CommManUnderground_GetCommonTextPrinter()) == FALSE) {
-            v0->unk_04 = ov23_0224BD90(fieldSystem->bgConfig, &Unk_ov23_0225686C, 1024 - (18 + 12) - 9, 11, HEAP_ID_FIELD);
+            v0->unk_04 = ov23_0224BD90(fieldSystem->bgConfig, &Unk_ov23_0225686C, 1024 - (18 + 12) - 9, 11, HEAP_ID_FIELD1);
             v0->unk_0C = 7;
         }
         break;
@@ -1165,7 +1165,7 @@ static void ov23_0224C090(FieldSystem *fieldSystem, int param1, int param2, int
 {
     UnkStruct_ov23_0224BA48 *v0 = NULL;
 
-    v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_0224BA48));
+    v0 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_0224BA48));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov23_0224BA48));
 
     v0->unk_18 = -1;
@@ -1579,7 +1579,7 @@ static BOOL ov23_0224C790(FieldTask *param0)
         break;
     case 1:
         FinishScreenFade();
-        StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_16, FADE_TYPE_UNK_18, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_16, FADE_TYPE_UNK_18, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         ov23_0224942C(fieldSystem->unk_6C);
         Sound_PlayEffect(SEQ_SE_DP_KAIDAN2);
         v1->unk_0C++;
@@ -1613,7 +1613,7 @@ static BOOL ov23_0224C790(FieldTask *param0)
     case 6:
         fieldSystem->unk_6C = ov23_02249404(fieldSystem);
         FinishScreenFade();
-        StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_17, FADE_TYPE_UNK_19, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_17, FADE_TYPE_UNK_19, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         (v1->unk_0C)++;
         break;
     case 7:
@@ -1630,8 +1630,8 @@ static BOOL ov23_0224C790(FieldTask *param0)
         CommSys_EnableSendMovementData();
         CommPlayerMan_PauseFieldSystem();
 
-        Graphics_LoadPalette(NARC_INDEX_DATA__UG_TRAP, 52, 0, 10 * 0x20, 4 * 0x20, HEAP_ID_FIELD);
-        LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 2, HEAP_ID_FIELD);
+        Graphics_LoadPalette(NARC_INDEX_DATA__UG_TRAP, 52, 0, 10 * 0x20, 4 * 0x20, HEAP_ID_FIELD1);
+        LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 2, HEAP_ID_FIELD1);
 
         if (v1->unk_2D) {
             sub_020594EC();
@@ -1960,7 +1960,7 @@ static void ov23_0224CEC8(void)
 
     ov23_0224DC08();
 
-    v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_0224CB1C));
+    v0 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_0224CB1C));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov23_0224CB1C));
 
     v0->unk_0C = 0;
@@ -2009,7 +2009,7 @@ void ov23_0224CF18(int param0, int param1, void *param2, void *param3)
         }
 
         if (v0->unk_01 == 3 || v0->unk_01 == 4) {
-            void *journalEntryLocationEvent = JournalEntry_CreateEventBuiltSecretBase(HEAP_ID_FIELDMAP);
+            void *journalEntryLocationEvent = JournalEntry_CreateEventBuiltSecretBase(HEAP_ID_FIELD2);
 
             JournalEntry_SaveData(Unk_ov23_022577AC->fieldSystem->journalEntry, journalEntryLocationEvent, JOURNAL_LOCATION);
             GameRecords_IncrementTrainerScore(SaveData_GetGameRecords(Unk_ov23_022577AC->fieldSystem->saveData), TRAINER_SCORE_EVENT_UNDERGROUND_NEW_SECRET_BASE);
@@ -2376,7 +2376,7 @@ static void ov23_0224D5BC(SysTask *param0, void *param1)
         }
         break;
     case 3:
-        StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         break;
     case 4:
         Heap_Free(param1);
@@ -2404,7 +2404,7 @@ void ov23_0224D6AC(int param0, int param1, void *param2, void *param3)
     SysTask *v2;
 
     if (v1[0] == CommSys_CurNetId()) {
-        UnkStruct_ov23_0224D54C *v3 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov23_0224D54C));
+        UnkStruct_ov23_0224D54C *v3 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov23_0224D54C));
 
         MI_CpuClear8(v3, sizeof(v3));
 
diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c
index 06bcbb95a8..ff184179ad 100644
--- a/src/overlay023/ov23_0224DC40.c
+++ b/src/overlay023/ov23_0224DC40.c
@@ -207,7 +207,7 @@ void ov23_0224DCB8(int param0, UnkFuncPtr_ov23_0224DCB8 param1, FieldSystem *fie
     UnkStruct_ov23_0224E280 *v0;
     ListMenuTemplate v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_33, sizeof(UnkStruct_ov23_0224E280));
+    v0 = Heap_Alloc(HEAP_ID_33, sizeof(UnkStruct_ov23_0224E280));
     MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov23_0224E280));
 
     Unk_ov23_022577B4 = v0;
@@ -231,7 +231,7 @@ static void ov23_0224DD2C(UnkStruct_ov23_0224E280 *param0)
 {
     ListMenuTemplate v0;
 
-    param0->unk_1C = StringList_New(NELEMS(Unk_ov23_022568B4), HEAP_ID_FIELD);
+    param0->unk_1C = StringList_New(NELEMS(Unk_ov23_022568B4), HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_0C, 3, 1, 1, 10, NELEMS(Unk_ov23_022568B4) * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (10 * NELEMS(Unk_ov23_022568B4) * 2));
     Window_DrawStandardFrame(&param0->unk_0C, 1, 1024 - (18 + 12) - 9, 11);
@@ -240,7 +240,7 @@ static void ov23_0224DD2C(UnkStruct_ov23_0224E280 *param0)
         MessageLoader *v1;
         int v2;
 
-        v1 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_COMMON, HEAP_ID_FIELD);
+        v1 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_COMMON, HEAP_ID_FIELD1);
 
         for (v2 = 0; v2 < NELEMS(Unk_ov23_022568B4); v2++) {
             StringList_AddFromMessageBank(param0->unk_1C, v1, Unk_ov23_022568B4[v2].unk_00, Unk_ov23_022568B4[v2].unk_04);
@@ -257,7 +257,7 @@ static void ov23_0224DD2C(UnkStruct_ov23_0224E280 *param0)
     v0.maxDisplay = NELEMS(Unk_ov23_022568B4);
 
     param0->unk_3A = 0;
-    param0->unk_20 = ListMenu_New(&v0, 0, 0, HEAP_ID_FIELD);
+    param0->unk_20 = ListMenu_New(&v0, 0, 0, HEAP_ID_FIELD1);
 
     Window_CopyToVRAM(&param0->unk_0C);
     CommPlayerMan_PauseFieldSystem();
@@ -292,7 +292,7 @@ static void ov23_0224DE3C(UnkStruct_ov23_0224E280 *param0)
 {
     ListMenuTemplate v0;
 
-    param0->unk_1C = StringList_New(4, HEAP_ID_FIELD);
+    param0->unk_1C = StringList_New(4, HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_0C, 3, 1, 1, 16, 4 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (16 * 4 * 2));
     Window_DrawStandardFrame(&param0->unk_0C, 1, 1024 - (18 + 12) - 9, 11);
@@ -302,7 +302,7 @@ static void ov23_0224DE3C(UnkStruct_ov23_0224E280 *param0)
         int v2, v3;
         u8 v4[4];
 
-        v1 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_QUESTIONS, HEAP_ID_FIELD);
+        v1 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_QUESTIONS, HEAP_ID_FIELD1);
 
         for (v2 = 0; v2 < 4; v2++) {
             u32 v5 = MTRNG_Next() % 12;
@@ -329,7 +329,7 @@ static void ov23_0224DE3C(UnkStruct_ov23_0224E280 *param0)
     v0.window = &param0->unk_0C;
 
     param0->unk_3A = 0;
-    param0->unk_20 = ListMenu_New(&v0, 0, 0, HEAP_ID_FIELD);
+    param0->unk_20 = ListMenu_New(&v0, 0, 0, HEAP_ID_FIELD1);
 
     Window_CopyToVRAM(&param0->unk_0C);
 }
@@ -380,7 +380,7 @@ static void ov23_0224DFA0(UnkStruct_ov23_0224E280 *param0)
 {
     ListMenuTemplate v0;
 
-    param0->unk_1C = StringList_New(4, HEAP_ID_FIELD);
+    param0->unk_1C = StringList_New(4, HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_0C, 3, 1, 1, 16, 4 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (16 * 4 * 2));
     Window_DrawStandardFrame(&param0->unk_0C, 1, 1024 - (18 + 12) - 9, 11);
@@ -389,7 +389,7 @@ static void ov23_0224DFA0(UnkStruct_ov23_0224E280 *param0)
         MessageLoader *v1;
         int v2;
 
-        v1 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_ANSWERS, HEAP_ID_FIELD);
+        v1 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_ANSWERS, HEAP_ID_FIELD1);
 
         for (v2 = 0; v2 < 4; v2++) {
             u32 v3 = 4 * param0->unk_32 + v2;
@@ -405,7 +405,7 @@ static void ov23_0224DFA0(UnkStruct_ov23_0224E280 *param0)
     v0.window = &param0->unk_0C;
 
     param0->unk_3A = 0;
-    param0->unk_20 = ListMenu_New(&v0, 0, 0, HEAP_ID_FIELD);
+    param0->unk_20 = ListMenu_New(&v0, 0, 0, HEAP_ID_FIELD1);
 
     Window_CopyToVRAM(&param0->unk_0C);
 }
@@ -966,7 +966,7 @@ static void ov23_0224EAA4(UnkStruct_ov23_022577B0 *param0)
     ListMenuTemplate v0;
     const int v1 = 4 + 1;
 
-    param0->unk_18 = StringList_New(v1, HEAP_ID_FIELD);
+    param0->unk_18 = StringList_New(v1, HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_08, 3, 1, 1, 16, v1 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (16 * v1 * 2));
     Window_DrawStandardFrame(&param0->unk_08, 1, 1024 - (18 + 12) - 9, 11);
@@ -974,7 +974,7 @@ static void ov23_0224EAA4(UnkStruct_ov23_022577B0 *param0)
         MessageLoader *v2;
         int v3;
 
-        v2 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_ANSWERS, HEAP_ID_FIELD);
+        v2 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_ANSWERS, HEAP_ID_FIELD1);
 
         for (v3 = 0; v3 < 4; v3++) {
             u32 v4 = 4 * param0->unk_2E + v3;
@@ -993,7 +993,7 @@ static void ov23_0224EAA4(UnkStruct_ov23_022577B0 *param0)
     v0.maxDisplay = v1;
 
     param0->unk_36 = 0;
-    param0->unk_1C = ListMenu_New(&v0, 0, 0, HEAP_ID_FIELD);
+    param0->unk_1C = ListMenu_New(&v0, 0, 0, HEAP_ID_FIELD1);
 
     Window_CopyToVRAM(&param0->unk_08);
 }
@@ -1267,7 +1267,7 @@ void ov23_0224F07C(int param0, int param1, FieldSystem *fieldSystem)
         return;
     }
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_33, sizeof(UnkStruct_ov23_022577B0));
+    v0 = Heap_Alloc(HEAP_ID_33, sizeof(UnkStruct_ov23_022577B0));
     MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov23_022577B0));
 
     Unk_ov23_022577B0 = v0;
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index ed2e9d41e2..996cf61cd4 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -181,9 +181,9 @@ static void ov23_0224F294(UnkStruct_ov23_02250CD4 *param0, u8 *param1, u32 param
         8, 1, 2, 2, 0, 0
     };
     u32 v1;
-    NARC *narc = NARC_ctor(NARC_INDEX_GRAPHIC__MENU_GRA, HEAP_ID_FIELDMAP);
+    NARC *narc = NARC_ctor(NARC_INDEX_GRAPHIC__MENU_GRA, HEAP_ID_FIELD2);
 
-    ov5_021D3190(&param0->unk_74, &v0, (7 + 1), HEAP_ID_FIELDMAP);
+    ov5_021D3190(&param0->unk_74, &v0, (7 + 1), HEAP_ID_FIELD2);
     ov5_021D32E8(&param0->unk_74, narc, 9, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 14528);
     ov5_021D3374(&param0->unk_74, narc, 1, 0, 14528);
     ov5_021D339C(&param0->unk_74, narc, 0, 0, 14528);
@@ -272,7 +272,7 @@ static void ov23_0224F560(Sprite *param0)
 
 void ov23_0224F588(Underground *underground)
 {
-    Unk_ov23_022577B8 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_ov23_022577B8));
+    Unk_ov23_022577B8 = Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_ov23_022577B8));
     MI_CpuClear8(Unk_ov23_022577B8, sizeof(UnkStruct_ov23_022577B8));
     Unk_ov23_022577B8->selectedSlot = 0;
     Unk_ov23_022577B8->selectedID = 0;
@@ -419,16 +419,16 @@ void ov23_0224F758(UnkFuncPtr_ov23_0224F758 param0, FieldSystem *fieldSystem)
     Sound_PlayEffect(SEQ_SE_DP_WIN_OPEN);
     ov23_022430D0(2);
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_02250CD4));
+    v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_02250CD4));
 
     MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov23_02250CD4));
 
     v0->fieldSystem = fieldSystem;
     v0->unk_260 = param0;
     v0->unk_2AA = 0;
-    v0->strbuf = Strbuf_Init((50 * 2), HEAP_ID_FIELD);
-    v0->fmtString = Strbuf_Init((50 * 2), HEAP_ID_FIELD);
-    v0->template = StringTemplate_Default(HEAP_ID_FIELD);
+    v0->strbuf = Strbuf_Init((50 * 2), HEAP_ID_FIELD1);
+    v0->fmtString = Strbuf_Init((50 * 2), HEAP_ID_FIELD1);
+    v0->template = StringTemplate_Default(HEAP_ID_FIELD1);
     v0->unk_04 = SysTask_Start(ov23_0224F914, v0, 10000);
 
     ov23_022431EC(v0, v0->unk_04, ov23_02251270);
@@ -468,7 +468,7 @@ static void ov23_0224F7F4(UnkStruct_ov23_02250CD4 *param0)
     const int v1 = 4;
     u8 v2[7];
     int v3 = ov23_0224F7D4(v2);
-    param0->unk_40 = StringList_New(NELEMS(Unk_ov23_02256924), HEAP_ID_FIELD);
+    param0->unk_40 = StringList_New(NELEMS(Unk_ov23_02256924), HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_10, 3, 20, 1, 11, NELEMS(Unk_ov23_02256924) * 3, 13, (1024 - (18 + 12) - 9 - 11 * 22));
     Window_DrawStandardFrame(&param0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
@@ -482,7 +482,7 @@ static void ov23_0224F7F4(UnkStruct_ov23_02250CD4 *param0)
         for (v4 = 0; v4 < NELEMS(Unk_ov23_02256924); v4++) {
             if (v4 == v1) {
                 const TrainerInfo *v5 = SaveData_GetTrainerInfo(FieldSystem_GetSaveData(param0->fieldSystem));
-                Strbuf *v6 = TrainerInfo_NameNewStrbuf(v5, HEAP_ID_FIELD);
+                Strbuf *v6 = TrainerInfo_NameNewStrbuf(v5, HEAP_ID_FIELD1);
 
                 StringList_AddFromStrbuf(param0->unk_40, v6, Unk_ov23_02256924[v4].unk_04);
                 Strbuf_Free(v6);
@@ -508,7 +508,7 @@ static void ov23_0224F7F4(UnkStruct_ov23_02250CD4 *param0)
         v0.loopAround = FALSE;
     }
 
-    param0->unk_54 = Menu_New(&v0, 28, 4, param0->unk_29C, HEAP_ID_FIELDMAP, PAD_BUTTON_B | PAD_BUTTON_X);
+    param0->unk_54 = Menu_New(&v0, 28, 4, param0->unk_29C, HEAP_ID_FIELD2, PAD_BUTTON_B | PAD_BUTTON_X);
     param0->unk_48 = NULL;
 
     Window_ScheduleCopyToVRAM(&param0->unk_10);
@@ -632,7 +632,7 @@ static BOOL ov23_0224FA58(SysTask *param0, void *param1)
         break;
     default:
         if ((v0->unk_2A0 == (u32)ov23_0224FDE0) || (v0->unk_2A0 == (u32)ov23_022501BC) || (v0->unk_2A0 == (u32)ov23_02250CD4) || (v0->unk_2A0 == (u32)ov23_02250598)) {
-            v0->unk_08 = ScrollPrompts_New(HEAP_ID_FIELD);
+            v0->unk_08 = ScrollPrompts_New(HEAP_ID_FIELD1);
             ScrollPrompts_SetPosition(v0->unk_08, 200, 20, 122);
             ScrollPrompts_SetDrawFlag(v0->unk_08, SCROLL_PROMPT_TOP_ARROW, FALSE);
             ScrollPrompts_SetDrawFlag(v0->unk_08, SCROLL_PROMPT_BOTTOM_ARROW, FALSE);
@@ -723,7 +723,7 @@ static void ov23_0224FBFC(UnkStruct_ov23_02250CD4 *param0, int param1)
         break;
     }
 
-    param0->unk_44 = StringList_New(v1, HEAP_ID_FIELD);
+    param0->unk_44 = StringList_New(v1, HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_20, 3, v5, v3, v4, v1 * 2, 13, (1024 - (18 + 12) - 9 - 11 * 22));
     Window_DrawStandardFrame(&param0->unk_20, 1, 1024 - (18 + 12) - 9, 11);
@@ -747,7 +747,7 @@ static void ov23_0224FBFC(UnkStruct_ov23_02250CD4 *param0, int param1)
     v0.window = &param0->unk_20;
     v0.parent = param0;
 
-    param0->unk_50 = ListMenu_New(&v0, 0, 0, HEAP_ID_FIELD);
+    param0->unk_50 = ListMenu_New(&v0, 0, 0, HEAP_ID_FIELD1);
 }
 
 static void ov23_0224FCF4(UnkStruct_ov23_02250CD4 *param0)
@@ -835,7 +835,7 @@ static void ov23_0224FE38(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
     ov23_0224FB7C(param0);
     UndergroundTextPrinter_ChangeMessageLoaderBank(CommManUnderground_GetItemNameTextPrinter(), TEXT_BANK_UNDERGROUND_TRAP_NAMES, MESSAGE_LOADER_BANK_HANDLE);
 
-    param0->unk_40 = StringList_New(v3 + 1, HEAP_ID_FIELD);
+    param0->unk_40 = StringList_New(v3 + 1, HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_10, 3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2)));
     Window_DrawStandardFrame(&param0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
@@ -864,7 +864,7 @@ static void ov23_0224FE38(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
 
     ov23_02251238(param0, v4, v2.count);
 
-    param0->unk_4C = ov23_02248C08(&v2, param0->unk_294, param0->unk_290, HEAP_ID_FIELD, param1, Unk_ov23_022577B8->underground, 0);
+    param0->unk_4C = ov23_02248C08(&v2, param0->unk_294, param0->unk_290, HEAP_ID_FIELD1, param1, Unk_ov23_022577B8->underground, 0);
     param0->unk_2AA = 5;
 }
 
@@ -1027,7 +1027,7 @@ static void ov23_0225021C(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
     ov23_0224FB7C(param0);
     UndergroundTextPrinter_ChangeMessageLoaderBank(CommManUnderground_GetItemNameTextPrinter(), TEXT_BANK_UNDERGROUND_ITEM_NAMES, MESSAGE_LOADER_BANK_HANDLE);
 
-    param0->unk_40 = StringList_New(v4 + 1, HEAP_ID_FIELD);
+    param0->unk_40 = StringList_New(v4 + 1, HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_10, 3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2)));
     Window_DrawStandardFrame(&param0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
@@ -1059,7 +1059,7 @@ static void ov23_0225021C(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
 
     ov23_02251238(param0, v5, v3.count);
 
-    param0->unk_4C = ov23_02248C08(&v3, param0->unk_294, param0->unk_290, HEAP_ID_FIELD, param1, Unk_ov23_022577B8->underground, 0);
+    param0->unk_4C = ov23_02248C08(&v3, param0->unk_294, param0->unk_290, HEAP_ID_FIELD1, param1, Unk_ov23_022577B8->underground, 0);
     param0->unk_2AA = 6;
 }
 
@@ -1204,7 +1204,7 @@ static void ov23_022505EC(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
     ov23_0224FB7C(param0);
     UndergroundTextPrinter_ChangeMessageLoaderBank(CommManUnderground_GetItemNameTextPrinter(), TEXT_BANK_UNDERGROUND_ITEM_NAMES, MESSAGE_LOADER_BANK_HANDLE);
 
-    param0->unk_40 = StringList_New(v3 + 1, HEAP_ID_FIELD);
+    param0->unk_40 = StringList_New(v3 + 1, HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_10, 3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2)));
     Window_DrawStandardFrame(&param0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
@@ -1232,7 +1232,7 @@ static void ov23_022505EC(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
 
     ov23_02251238(param0, v4, v2.count);
 
-    param0->unk_4C = ov23_02248C08(&v2, param0->unk_294, param0->unk_290, HEAP_ID_FIELD, param1, Unk_ov23_022577B8->underground, 0);
+    param0->unk_4C = ov23_02248C08(&v2, param0->unk_294, param0->unk_290, HEAP_ID_FIELD1, param1, Unk_ov23_022577B8->underground, 0);
     param0->unk_2AA = 7;
 }
 
@@ -1316,7 +1316,7 @@ static BOOL Underground_HandleTreasureSelectedMenu(SysTask *param0, void *param1
 
             Sound_PlayEffect(SEQ_SE_CONFIRM);
 
-            if (Bag_TryAddItem(v4, item, 1, HEAP_ID_FIELD)) {
+            if (Bag_TryAddItem(v4, item, 1, HEAP_ID_FIELD1)) {
                 Underground_RemoveTreasureAtSlot(Unk_ov23_022577B8->underground, Unk_ov23_022577B8->selectedSlot);
                 UndergroundTextPrinter_SetUndergroundItemName(CommManUnderground_GetCommonTextPrinter(), 0, Unk_ov23_022577B8->selectedID);
 
@@ -1370,7 +1370,7 @@ static void ov23_02250998(SysTask *param0, void *param1)
     UnkStruct_ov23_02250CD4 *v0 = param1;
 
     if (UndergroundTextPrinter_IsPrinterActive(CommManUnderground_GetCommonTextPrinter()) == FALSE) {
-        v0->unk_5C = Menu_MakeYesNoChoice(v0->fieldSystem->bgConfig, &sWindowTemplate, 1024 - (18 + 12) - 9, 11, HEAP_ID_FIELD);
+        v0->unk_5C = Menu_MakeYesNoChoice(v0->fieldSystem->bgConfig, &sWindowTemplate, 1024 - (18 + 12) - 9, 11, HEAP_ID_FIELD1);
         v0->unk_2AA = 12;
     }
 }
@@ -1411,16 +1411,16 @@ void ov23_02250A50(UnkFuncPtr_ov23_0224F758 param0, FieldSystem *fieldSystem)
     UnkStruct_ov23_02250CD4 *v0;
     ListMenuTemplate v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_02250CD4));
+    v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_02250CD4));
 
     MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov23_02250CD4));
 
     v0->fieldSystem = fieldSystem;
     v0->unk_260 = param0;
     v0->unk_2AA = 0;
-    v0->strbuf = Strbuf_Init((50 * 2), HEAP_ID_FIELD);
-    v0->fmtString = Strbuf_Init((50 * 2), HEAP_ID_FIELD);
-    v0->template = StringTemplate_Default(HEAP_ID_FIELD);
+    v0->strbuf = Strbuf_Init((50 * 2), HEAP_ID_FIELD1);
+    v0->fmtString = Strbuf_Init((50 * 2), HEAP_ID_FIELD1);
+    v0->template = StringTemplate_Default(HEAP_ID_FIELD1);
 
     CommPlayerMan_PauseFieldSystem();
 
@@ -1606,7 +1606,7 @@ static void ov23_02250D90(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
     ov23_0224FB7C(param0);
     UndergroundTextPrinter_ChangeMessageLoaderBank(CommManUnderground_GetItemNameTextPrinter(), TEXT_BANK_UNDERGROUND_GOODS, MESSAGE_LOADER_BANK_HANDLE);
 
-    param0->unk_40 = StringList_New(v3 + 1, HEAP_ID_FIELD);
+    param0->unk_40 = StringList_New(v3 + 1, HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_10, BG_LAYER_MAIN_3, 19, 3, 12, (6 * 2), 13, ((1024 - (18 + 12) - 9 - 11 * 22) - 12 * (6 * 2)));
     Window_DrawStandardFrame(&param0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
@@ -1635,7 +1635,7 @@ static void ov23_02250D90(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248
 
     ov23_02251238(param0, v4, v2.count);
 
-    param0->unk_4C = ov23_02248C08(&v2, param0->unk_294, param0->unk_290, HEAP_ID_FIELD, param1, Unk_ov23_022577B8->underground, 0);
+    param0->unk_4C = ov23_02248C08(&v2, param0->unk_294, param0->unk_290, HEAP_ID_FIELD1, param1, Unk_ov23_022577B8->underground, 0);
     param0->unk_2AA = 8;
 }
 
@@ -1835,7 +1835,7 @@ void *ov23_022511B0(UnkFuncPtr_ov23_0224F758 param0, FieldSystem *fieldSystem)
     UnkStruct_ov23_02250CD4 *v0;
     ListMenuTemplate v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_02250CD4));
+    v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_02250CD4));
 
     MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov23_02250CD4));
 
@@ -1845,9 +1845,9 @@ void *ov23_022511B0(UnkFuncPtr_ov23_0224F758 param0, FieldSystem *fieldSystem)
     v0->unk_25C = 0;
     v0->unk_48 = NULL;
     v0->cursorCallback = NULL;
-    v0->strbuf = Strbuf_Init((50 * 2), HEAP_ID_FIELD);
-    v0->fmtString = Strbuf_Init((50 * 2), HEAP_ID_FIELD);
-    v0->template = StringTemplate_Default(HEAP_ID_FIELD);
+    v0->strbuf = Strbuf_Init((50 * 2), HEAP_ID_FIELD1);
+    v0->fmtString = Strbuf_Init((50 * 2), HEAP_ID_FIELD1);
+    v0->template = StringTemplate_Default(HEAP_ID_FIELD1);
 
     ov23_02250CD4(v0);
 
diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c
index f4a3f550fe..98ad0884f4 100644
--- a/src/overlay023/ov23_0225128C.c
+++ b/src/overlay023/ov23_0225128C.c
@@ -348,7 +348,7 @@ static void ov23_022515D8(UnkStruct_ov23_02250CD4 *param0, int param1, int param
 
     ov23_0224FB7C(param0);
 
-    param0->unk_40 = StringList_New(v1, HEAP_ID_FIELD);
+    param0->unk_40 = StringList_New(v1, HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_10, 3, 17, 3, 14, v1 * 2, 13, 2);
     Window_DrawStandardFrame(&param0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
@@ -357,7 +357,7 @@ static void ov23_022515D8(UnkStruct_ov23_02250CD4 *param0, int param1, int param
         MessageLoader *v3;
         int v4 = 0;
 
-        v3 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_BASE_PC, HEAP_ID_FIELD);
+        v3 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_BASE_PC, HEAP_ID_FIELD1);
 
         for (v4 = 0; v4 < v1; v4++) {
             if (v4 == (v1 - 1)) {
@@ -383,7 +383,7 @@ static void ov23_022515D8(UnkStruct_ov23_02250CD4 *param0, int param1, int param
 
     v0.parent = param0;
     ov23_02251238(param0, v1, v0.count);
-    param0->unk_48 = ListMenu_New(&v0, param0->unk_294, param0->unk_290, HEAP_ID_FIELD);
+    param0->unk_48 = ListMenu_New(&v0, param0->unk_294, param0->unk_290, HEAP_ID_FIELD1);
 }
 
 static void ov23_022516E8(UnkStruct_ov23_02250CD4 *param0, int param1, int param2, CursorCallback cursorCallback, int param4)
@@ -394,7 +394,7 @@ static void ov23_022516E8(UnkStruct_ov23_02250CD4 *param0, int param1, int param
 
     ov23_0224FB7C(param0);
 
-    param0->unk_40 = StringList_New(v1, HEAP_ID_FIELD);
+    param0->unk_40 = StringList_New(v1, HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_10, 3, 17, 3, 14, v1 * 2, 13, (2 + 14 * 16));
     Window_DrawStandardFrame(&param0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
@@ -403,7 +403,7 @@ static void ov23_022516E8(UnkStruct_ov23_02250CD4 *param0, int param1, int param
         MessageLoader *v3;
         int v4 = 0;
 
-        v3 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_BASE_PC, HEAP_ID_FIELD);
+        v3 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_BASE_PC, HEAP_ID_FIELD1);
 
         for (v4 = 0; v4 < v1; v4++) {
             if (v4 == param2) {
@@ -429,7 +429,7 @@ static void ov23_022516E8(UnkStruct_ov23_02250CD4 *param0, int param1, int param
 
     v0.parent = param0;
     ov23_02251238(param0, v1, v0.count);
-    param0->unk_48 = ListMenu_New(&v0, param0->unk_294, param0->unk_290, HEAP_ID_FIELD);
+    param0->unk_48 = ListMenu_New(&v0, param0->unk_294, param0->unk_290, HEAP_ID_FIELD1);
 }
 
 static BOOL ov23_022517E0(SysTask *param0, void *param1)
@@ -611,7 +611,7 @@ static BOOL ov23_02251ACC(FieldTask *param0)
     switch (v1->unk_00) {
     case 0:
         Sound_PlayEffect(SEQ_SE_DP_PC_LOGIN);
-        StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         v1->unk_00 = 1;
         break;
     case 1:
@@ -632,7 +632,7 @@ static BOOL ov23_02251ACC(FieldTask *param0)
     case 4:
         PlayerAvatar_SetHidden(fieldSystem->playerAvatar, 1);
         ov23_02251A84(0, fieldSystem);
-        StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         v1->unk_00 = 5;
         break;
     case 5:
@@ -779,7 +779,7 @@ static void ov23_02251C04(SysTask *param0, void *param1)
         break;
     case 3:
         if (v0->fieldSystem->task == NULL) {
-            v2 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov23_02251ACC));
+            v2 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov23_02251ACC));
             MI_CpuClear8(v2, sizeof(UnkStruct_ov23_02251ACC));
             v2->unk_00 = 0;
             v2->unk_04 = 0;
@@ -834,17 +834,17 @@ static void ov23_02251F94(FieldSystem *fieldSystem)
 
     ov23_022430D0(1);
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_02250CD4));
+    v1 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_02250CD4));
     MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov23_02250CD4));
     v1->fieldSystem = fieldSystem;
 
     UndergroundTextPrinter_ChangeMessageLoaderBank(CommManUnderground_GetMiscTextPrinter(), TEXT_BANK_UNDERGROUND_BASE_PC, MESSAGE_LOADER_NARC_HANDLE);
 
     v1->unk_2AA = 0;
-    v1->strbuf = Strbuf_Init((50 * 2), HEAP_ID_FIELD);
-    v1->fmtString = Strbuf_Init((50 * 2), HEAP_ID_FIELD);
-    v1->template = StringTemplate_Default(HEAP_ID_FIELD);
-    v1->unk_08 = ScrollPrompts_New(HEAP_ID_FIELD);
+    v1->strbuf = Strbuf_Init((50 * 2), HEAP_ID_FIELD1);
+    v1->fmtString = Strbuf_Init((50 * 2), HEAP_ID_FIELD1);
+    v1->template = StringTemplate_Default(HEAP_ID_FIELD1);
+    v1->unk_08 = ScrollPrompts_New(HEAP_ID_FIELD1);
 
     ScrollPrompts_SetPosition(v1->unk_08, 200, 20, 122);
     ScrollPrompts_SetDrawFlag(v1->unk_08, SCROLL_PROMPT_TOP_ARROW, FALSE);
@@ -904,7 +904,7 @@ static void ov23_022520C8(SysTask *param0, void *param1)
 
 static void ov23_022520E8(FieldSystem *fieldSystem, UnkStruct_ov23_022513B0 *param1)
 {
-    UnkStruct_ov23_02252038 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_02250CD4));
+    UnkStruct_ov23_02252038 *v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_02250CD4));
 
     MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov23_02252038));
 
diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c
index a78f1f6e5e..8951a1ded5 100644
--- a/src/overlay023/ov23_022521F0.c
+++ b/src/overlay023/ov23_022521F0.c
@@ -214,7 +214,7 @@ static void *ov23_022524B8(UnkStruct_ov23_02250CD4 *param0)
 
     ov23_0224FB7C(param0);
 
-    param0->unk_40 = StringList_New(v1, HEAP_ID_FIELD);
+    param0->unk_40 = StringList_New(v1, HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_10, 3, 19, 3, 12, v1 * 2, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - 12 * 6));
     Window_DrawStandardFrame(&param0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
@@ -253,7 +253,7 @@ static void *ov23_022524B8(UnkStruct_ov23_02250CD4 *param0)
 
     ov23_02251238(param0, v0.maxDisplay, v0.count);
 
-    param0->unk_48 = ListMenu_New(&v0, param0->unk_294, param0->unk_290, HEAP_ID_FIELD);
+    param0->unk_48 = ListMenu_New(&v0, param0->unk_294, param0->unk_290, HEAP_ID_FIELD1);
     param0->unk_2AE = param0->unk_290;
 
     Window_CopyToVRAM(&param0->unk_10);
@@ -396,7 +396,7 @@ static void ov23_02252A18(UnkStruct_ov23_02250CD4 *param0)
     const int v1 = 5 + 1;
 
     ov23_0224FB7C(param0);
-    param0->unk_40 = StringList_New(v1, HEAP_ID_FIELD);
+    param0->unk_40 = StringList_New(v1, HEAP_ID_FIELD1);
 
     Window_Add(param0->fieldSystem->bgConfig, &param0->unk_10, 3, 19, 3, 12, v1 * 2, 13, (((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - 12 * 6) - 12 * 12));
     Window_DrawStandardFrame(&param0->unk_10, 1, 1024 - (18 + 12) - 9, 11);
@@ -406,13 +406,13 @@ static void ov23_02252A18(UnkStruct_ov23_02250CD4 *param0)
         int v3;
 
         if (param0->unk_2AC == 1) {
-            v2 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_TRAP_NAMES, HEAP_ID_FIELD);
+            v2 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_TRAP_NAMES, HEAP_ID_FIELD1);
             UndergroundTextPrinter_ChangeMessageLoaderBank(CommManUnderground_GetItemNameTextPrinter(), TEXT_BANK_UNDERGROUND_TRAP_NAMES, MESSAGE_LOADER_BANK_HANDLE);
         } else if (param0->unk_2AC == 0) {
-            v2 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_GOODS, HEAP_ID_FIELD);
+            v2 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_GOODS, HEAP_ID_FIELD1);
             UndergroundTextPrinter_ChangeMessageLoaderBank(CommManUnderground_GetItemNameTextPrinter(), TEXT_BANK_UNDERGROUND_GOODS, MESSAGE_LOADER_BANK_HANDLE);
         } else {
-            v2 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_ITEM_NAMES, HEAP_ID_FIELD);
+            v2 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_ITEM_NAMES, HEAP_ID_FIELD1);
             UndergroundTextPrinter_ChangeMessageLoaderBank(CommManUnderground_GetItemNameTextPrinter(), TEXT_BANK_UNDERGROUND_ITEM_NAMES, MESSAGE_LOADER_BANK_HANDLE);
         }
 
@@ -439,7 +439,7 @@ static void ov23_02252A18(UnkStruct_ov23_02250CD4 *param0)
     param0->unk_2AE = param0->unk_290;
 
     ov23_02251238(param0, v0.maxDisplay, v0.count);
-    param0->unk_48 = ListMenu_New(&v0, param0->unk_294, param0->unk_290, HEAP_ID_FIELD);
+    param0->unk_48 = ListMenu_New(&v0, param0->unk_294, param0->unk_290, HEAP_ID_FIELD1);
     Window_CopyToVRAM(&param0->unk_10);
 }
 
@@ -921,15 +921,15 @@ void ov23_022534A0(FieldSystem *fieldSystem)
 
     ov23_022430D0(3 + v7);
 
-    v4 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_02250CD4));
+    v4 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_02250CD4));
     MI_CpuClear8(v4, sizeof(UnkStruct_ov23_02250CD4));
 
     v4->fieldSystem = fieldSystem;
     v4->unk_2AC = v7;
     v4->unk_288 = v6;
-    v4->strbuf = Strbuf_Init((50 * 2), HEAP_ID_FIELD);
-    v4->fmtString = Strbuf_Init((50 * 2), HEAP_ID_FIELD);
-    v4->template = StringTemplate_Default(HEAP_ID_FIELD);
+    v4->strbuf = Strbuf_Init((50 * 2), HEAP_ID_FIELD1);
+    v4->fmtString = Strbuf_Init((50 * 2), HEAP_ID_FIELD1);
+    v4->template = StringTemplate_Default(HEAP_ID_FIELD1);
     v4->unk_2AA = 0;
 
     Sound_PlayEffect(SEQ_SE_CONFIRM);
diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c
index caf88c402d..d71e153328 100644
--- a/src/overlay023/ov23_02253598.c
+++ b/src/overlay023/ov23_02253598.c
@@ -129,9 +129,9 @@ static void ov23_0225360C(Window *param0, MessageLoader *param1, TrainerInfo *pa
     const int v11 = 146;
     const int v12 = 146;
 
-    v0 = StringTemplate_Default(HEAP_ID_FIELD);
-    v1 = Strbuf_Init(30, HEAP_ID_FIELD);
-    v2 = Strbuf_Init(30, HEAP_ID_FIELD);
+    v0 = StringTemplate_Default(HEAP_ID_FIELD1);
+    v1 = Strbuf_Init(30, HEAP_ID_FIELD1);
+    v2 = Strbuf_Init(30, HEAP_ID_FIELD1);
 
     MessageLoader_GetStrbuf(param1, 0, v1);
     Text_AddPrinterWithParams(param0, FONT_SYSTEM, v1, v7, 1, TEXT_SPEED_NO_TRANSFER, NULL);
@@ -214,7 +214,7 @@ void ov23_02253834(BgConfig *param0, TrainerInfo *param1, UnkFuncPtr_ov23_022538
     MessageLoader *v1;
     ListMenuTemplate v2;
     int v3 = 10;
-    UnkStruct_ov23_022537D4 *v4 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_022537D4));
+    UnkStruct_ov23_022537D4 *v4 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_022537D4));
 
     MI_CpuClear8(v4, sizeof(UnkStruct_ov23_022537D4));
 
@@ -224,7 +224,7 @@ void ov23_02253834(BgConfig *param0, TrainerInfo *param1, UnkFuncPtr_ov23_022538
     Window_Add(param0, &v4->unk_08, 3, 4, 2, 24, 19, 13, 1);
     Window_DrawStandardFrame(&v4->unk_08, 1, 1024 - (18 + 12) - 9, 11);
 
-    v1 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_RECORDS, HEAP_ID_FIELD);
+    v1 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_RECORDS, HEAP_ID_FIELD1);
     Window_FillTilemap(&v4->unk_08, 15);
 
     if (param4) {
@@ -248,7 +248,7 @@ void ov23_022538FC(int param0)
 {
     int undergroundRecordSize = UndergroundRecord_Size();
     int trainerScore = GameRecords_GetTrainerScore(SaveData_GetGameRecords(Unk_ov23_022577BC->saveData));
-    u8 *v2 = Heap_AllocFromHeap(HEAP_ID_FIELD, undergroundRecordSize + 1);
+    u8 *v2 = Heap_Alloc(HEAP_ID_FIELD1, undergroundRecordSize + 1);
 
     MI_CpuClear8(v2, undergroundRecordSize + 1);
     v2[0] = param0;
@@ -318,7 +318,7 @@ void ov23_02253A00(UndergroundRecord *undergroundRecord, int param1)
     CommPlayerMan_PauseFieldSystem();
     UndergroundTextPrinter_ChangeMessageLoaderBank(CommManUnderground_GetMiscTextPrinter(), TEXT_BANK_UNDERGROUND_RECORDS, MESSAGE_LOADER_NARC_HANDLE);
 
-    undergroundRecordBuffer = UndergroundRecord_Init(HEAP_ID_FIELD);
+    undergroundRecordBuffer = UndergroundRecord_Init(HEAP_ID_FIELD1);
     MI_CpuCopy8(undergroundRecord, undergroundRecordBuffer, UndergroundRecord_Size());
 
     v0 = v2(undergroundRecordBuffer);
@@ -343,9 +343,9 @@ static void ov23_02253A78(Window *param0, MessageLoader *param1, TrainerInfo *pa
     const int v11 = 146;
     const int v12 = 100;
 
-    v0 = StringTemplate_Default(HEAP_ID_FIELD);
-    v1 = Strbuf_Init(40, HEAP_ID_FIELD);
-    v2 = Strbuf_Init(40, HEAP_ID_FIELD);
+    v0 = StringTemplate_Default(HEAP_ID_FIELD1);
+    v1 = Strbuf_Init(40, HEAP_ID_FIELD1);
+    v2 = Strbuf_Init(40, HEAP_ID_FIELD1);
 
     StringTemplate_SetPlayerName(v0, 1, param2);
     MessageLoader_GetStrbuf(param1, 12, v1);
@@ -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, HEAP_ID_FIELD, v3);
+        TrainerInfo *v13 = sub_020288C8(param4, HEAP_ID_FIELD1, v3);
 
         if (v13) {
             StringTemplate_SetPlayerName(v0, 0, v13);
@@ -397,7 +397,7 @@ void *ov23_02253C64(BgConfig *param0, TrainerInfo *param1, Underground *undergro
     MessageLoader *v1;
     ListMenuTemplate v2;
     int v3 = 10;
-    UnkStruct_ov23_022537D4 *v4 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_022537D4));
+    UnkStruct_ov23_022537D4 *v4 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_022537D4));
 
     MI_CpuClear8(v4, sizeof(UnkStruct_ov23_022537D4));
 
@@ -407,7 +407,7 @@ void *ov23_02253C64(BgConfig *param0, TrainerInfo *param1, Underground *undergro
     Window_Add(param0, &v4->unk_08, 3, 4, 2, 24, 19, 13, 1);
     Window_DrawStandardFrame(&v4->unk_08, 1, 1024 - (18 + 12) - 9, 11);
 
-    v1 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_BASE_PC, HEAP_ID_FIELD);
+    v1 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_BASE_PC, HEAP_ID_FIELD1);
     Window_FillTilemap(&v4->unk_08, 15);
 
     v0 = Unk_ov23_022577BC->unk_0C;
diff --git a/src/overlay023/ov23_022542CC.c b/src/overlay023/ov23_022542CC.c
index 225c19d940..ae9ad7258f 100644
--- a/src/overlay023/ov23_022542CC.c
+++ b/src/overlay023/ov23_022542CC.c
@@ -91,7 +91,7 @@ static const ListMenuTemplate Unk_ov23_02256B3C = {
 
 UnkStruct_ov23_022542D8 *ov23_022542CC(void)
 {
-    UnkStruct_ov23_022542D8 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_022542D8));
+    UnkStruct_ov23_022542D8 *v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_022542D8));
 
     return v0;
 }
@@ -104,7 +104,7 @@ void ov23_022542D8(UnkStruct_ov23_022542D8 *param0, FieldSystem *fieldSystem, u1
     param0->unk_34 = param3;
     param0->unk_40 = 0;
 
-    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 2, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 2, HEAP_ID_FIELD1);
 }
 
 void ov23_0225430C(UnkStruct_ov23_022542D8 *param0)
@@ -154,7 +154,7 @@ static void ov23_0225437C(UnkStruct_ov23_022542D8 *param0)
     int v3 = 3;
     int v4 = 4;
 
-    param0->unk_24 = StringList_New(v3 + 1, HEAP_ID_FIELD);
+    param0->unk_24 = StringList_New(v3 + 1, HEAP_ID_FIELD1);
 
     v1 = 12 * v4 * 2;
     v2 = 7 * (1 * 2);
@@ -175,7 +175,7 @@ static void ov23_0225437C(UnkStruct_ov23_022542D8 *param0)
             4,
         };
 
-        v5 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_DECORATE_BASE, HEAP_ID_FIELD);
+        v5 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_DECORATE_BASE, HEAP_ID_FIELD1);
 
         {
             Strbuf *v8;
@@ -200,7 +200,7 @@ static void ov23_0225437C(UnkStruct_ov23_022542D8 *param0)
     v0.window = &param0->unk_04;
     v0.cursorCallback = ov23_02254350;
 
-    param0->unk_28 = ListMenu_New(&v0, *(param0->unk_30), *(param0->unk_34), HEAP_ID_FIELD);
+    param0->unk_28 = ListMenu_New(&v0, *(param0->unk_30), *(param0->unk_34), HEAP_ID_FIELD1);
     Window_CopyToVRAM(&param0->unk_04);
     Window_CopyToVRAM(&param0->unk_14);
     param0->unk_38 = 1;
@@ -262,7 +262,7 @@ static void ov23_02254564(ListMenu *param0, u32 param1, u8 param2)
 
 UnkStruct_ov23_02254594 *ov23_02254588(void)
 {
-    UnkStruct_ov23_02254594 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_ov23_02254594));
+    UnkStruct_ov23_02254594 *v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_ov23_02254594));
     return v0;
 }
 
@@ -274,7 +274,7 @@ void ov23_02254594(UnkStruct_ov23_02254594 *param0, FieldSystem *fieldSystem, u1
     param0->unk_38 = param2;
     param0->unk_3C = param3;
 
-    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 2, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 2, HEAP_ID_FIELD1);
 }
 
 void ov23_022545C4(UnkStruct_ov23_02254594 *param0, const u8 param1, const u8 param2)
@@ -389,7 +389,7 @@ static void ov23_022546E0(UnkStruct_ov23_02254594 *param0)
         v5 = 7;
     }
 
-    param0->unk_28 = StringList_New(v4 + 1, HEAP_ID_FIELD);
+    param0->unk_28 = StringList_New(v4 + 1, HEAP_ID_FIELD1);
 
     v2 = 12 * 7 * 2;
     v3 = 8 * (2 * 2);
@@ -407,7 +407,7 @@ static void ov23_022546E0(UnkStruct_ov23_02254594 *param0)
         int v10;
         u8 v11;
 
-        v6 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_GOODS, HEAP_ID_FIELD);
+        v6 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_GOODS, HEAP_ID_FIELD1);
 
         {
             MessageLoader *v12;
@@ -416,16 +416,16 @@ static void ov23_022546E0(UnkStruct_ov23_02254594 *param0)
             Strbuf *v15;
             StringTemplate *v16;
 
-            v12 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_DECORATE_BASE, HEAP_ID_FIELD);
+            v12 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNDERGROUND_DECORATE_BASE, HEAP_ID_FIELD1);
 
             Window_FillTilemap(&param0->unk_18, 15);
 
             v13 = MessageLoader_GetNewStrbuf(v12, 9);
             v14 = MessageLoader_GetNewStrbuf(v12, 10);
-            v15 = Strbuf_Init(6, HEAP_ID_FIELD);
+            v15 = Strbuf_Init(6, HEAP_ID_FIELD1);
 
             Text_AddPrinterWithParams(&param0->unk_18, FONT_SYSTEM, v13, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
-            v16 = StringTemplate_Default(HEAP_ID_FIELD);
+            v16 = StringTemplate_Default(HEAP_ID_FIELD1);
 
             StringTemplate_SetNumber(v16, 0, param0->unk_40, 2, 1, 1);
             StringTemplate_SetNumber(v16, 1, param0->unk_41, 2, 1, 1);
@@ -471,12 +471,12 @@ static void ov23_022546E0(UnkStruct_ov23_02254594 *param0)
     v1.cursorCallback = ov23_022546A0;
     v1.parent = v0;
 
-    param0->unk_2C = ov23_02248C08(&v1, *(param0->unk_38), *(param0->unk_3C), HEAP_ID_FIELD, Underground_MoveGoodPC, v0, 1);
+    param0->unk_2C = ov23_02248C08(&v1, *(param0->unk_38), *(param0->unk_3C), HEAP_ID_FIELD1, Underground_MoveGoodPC, v0, 1);
 
     Window_CopyToVRAM(&param0->unk_08);
     Window_CopyToVRAM(&param0->unk_18);
 
-    param0->unk_04 = ScrollPrompts_New(HEAP_ID_FIELD);
+    param0->unk_04 = ScrollPrompts_New(HEAP_ID_FIELD1);
 
     ScrollPrompts_SetPosition(param0->unk_04, 200, 10 + 8 * 2, 118 + 8 * 2);
     ScrollPrompts_SetDrawFlag(param0->unk_04, SCROLL_PROMPT_TOP_ARROW, FALSE);
diff --git a/src/overlay023/ov23_02254A14.c b/src/overlay023/ov23_02254A14.c
index 275e7fd7c2..4eae0b1c54 100644
--- a/src/overlay023/ov23_02254A14.c
+++ b/src/overlay023/ov23_02254A14.c
@@ -221,7 +221,7 @@ static BOOL ov23_02254AD4(FieldTask *param0)
         ov23_02255EBC(1, v1);
         break;
     case 1:
-        StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_41, FADE_TYPE_UNK_41, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_41, FADE_TYPE_UNK_41, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         ov23_02255EBC(2, v1);
         break;
     case 2:
@@ -254,7 +254,7 @@ static BOOL ov23_02254AD4(FieldTask *param0)
         break;
     case 9:
         Sound_PlayEffect(SEQ_SE_DP_PC_LOGOFF);
-        StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_40, FADE_TYPE_UNK_40, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_40, FADE_TYPE_UNK_40, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         ov23_02255EBC(10, v1);
         break;
     case 10:
@@ -334,7 +334,7 @@ static BOOL ov23_02254C84(FieldTask *param0)
 
 void ov23_02254D98(FieldSystem *fieldSystem, FieldTask *param1)
 {
-    UnkStruct_ov23_02256098 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov23_02256098));
+    UnkStruct_ov23_02256098 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov23_02256098));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_ov23_02256098));
     ov23_02255EBC(0, v0);
diff --git a/src/overlay023/underground_spheres.c b/src/overlay023/underground_spheres.c
index db08d31752..f0b6c4a58c 100644
--- a/src/overlay023/underground_spheres.c
+++ b/src/overlay023/underground_spheres.c
@@ -482,8 +482,8 @@ BOOL UndergroundSpheres_CheckForRetrievedSphereNotification(Strbuf *strbuf)
 
     for (netID = 0; netID < MAX_CONNECTED_PLAYERS; netID++) {
         if (buriedSpheresEnv->retrievedSpheres[netID] != SPHERE_NONE) {
-            template = StringTemplate_Default(HEAP_ID_FIELD);
-            fmtString = Strbuf_Init(100, HEAP_ID_FIELD);
+            template = StringTemplate_Default(HEAP_ID_FIELD1);
+            fmtString = Strbuf_Init(100, HEAP_ID_FIELD1);
 
             StringTemplate_SetUndergroundItemNameWithArticle(template, 2, buriedSpheresEnv->retrievedSpheres[netID]);
             StringTemplate_CapitalizeArgAtIndex(template, 2);
@@ -540,7 +540,7 @@ void SphereRadar_Start(void)
     GF_ASSERT(!buriedSpheresEnv->sphereRadarTimer);
     GF_ASSERT(!buriedSpheresEnv->sysTask);
 
-    SphereRadarTimer *radarTimer = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(SphereRadarTimer));
+    SphereRadarTimer *radarTimer = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(SphereRadarTimer));
     MI_CpuFill8(radarTimer, 0, sizeof(SphereRadarTimer));
     radarTimer->timer = 100;
 
diff --git a/src/overlay023/underground_text_printer.c b/src/overlay023/underground_text_printer.c
index 71b4bffb7b..3710bf9b66 100644
--- a/src/overlay023/underground_text_printer.c
+++ b/src/overlay023/underground_text_printer.c
@@ -52,7 +52,7 @@ const ListMenuTemplate *UndergroundTextPrinter_GetListMenuTemplate(void)
 UndergroundTextPrinter *UndergroundTextPrinter_New(int bankID, int heapID, BgConfig *bgConfig, int renderDelay, int strbufSize)
 {
     int size = strbufSize;
-    UndergroundTextPrinter *textPrinter = Heap_AllocFromHeap(heapID, sizeof(UndergroundTextPrinter));
+    UndergroundTextPrinter *textPrinter = Heap_Alloc(heapID, sizeof(UndergroundTextPrinter));
 
     MI_CpuClear8(textPrinter, sizeof(UndergroundTextPrinter));
 
diff --git a/src/overlay027/ov27_022561C0.c b/src/overlay027/ov27_022561C0.c
index f895ea2929..227ceb964e 100644
--- a/src/overlay027/ov27_022561C0.c
+++ b/src/overlay027/ov27_022561C0.c
@@ -72,7 +72,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov27_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov27_0225621C *v0 = (UnkStruct_ov27_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov27_0225621C));
+    UnkStruct_ov27_0225621C *v0 = (UnkStruct_ov27_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov27_0225621C));
 
     if (v0 != NULL) {
         if (ov27_0225621C(v0, param2, param3)) {
diff --git a/src/overlay027/ov27_0225680C.c b/src/overlay027/ov27_0225680C.c
index 4ffb7ef408..45ab23fad4 100644
--- a/src/overlay027/ov27_0225680C.c
+++ b/src/overlay027/ov27_0225680C.c
@@ -56,7 +56,7 @@ struct PoketchSystem *FieldSystem_GetPoketchSystem(void);
 
 BOOL ov27_0225680C(UnkStruct_ov27_0225680C **param0, const UnkStruct_ov27_0225680C_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov27_0225680C *v0 = (UnkStruct_ov27_0225680C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov27_0225680C));
+    UnkStruct_ov27_0225680C *v0 = (UnkStruct_ov27_0225680C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov27_0225680C));
 
     if (v0 != NULL) {
         v0->unk_00 = param1;
diff --git a/src/overlay028/ov28_022561C0.c b/src/overlay028/ov28_022561C0.c
index 21959672ed..89599876cc 100644
--- a/src/overlay028/ov28_022561C0.c
+++ b/src/overlay028/ov28_022561C0.c
@@ -84,7 +84,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov28_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov28_02256210 *v0 = (UnkStruct_ov28_02256210 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_02256210));
+    UnkStruct_ov28_02256210 *v0 = (UnkStruct_ov28_02256210 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_02256210));
 
     if (v0 != NULL) {
         if (ov28_02256210(v0, param3, param2)) {
diff --git a/src/overlay028/ov28_0225697C.c b/src/overlay028/ov28_0225697C.c
index 9fad4e5b75..d8df05de4e 100644
--- a/src/overlay028/ov28_0225697C.c
+++ b/src/overlay028/ov28_0225697C.c
@@ -457,7 +457,7 @@ static const struct {
 
 BOOL ov28_0225697C(UnkStruct_ov28_0225697C **param0, const UnkStruct_ov28_0225697C_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov28_0225697C *v0 = (UnkStruct_ov28_0225697C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_0225697C));
+    UnkStruct_ov28_0225697C *v0 = (UnkStruct_ov28_0225697C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_0225697C));
 
     if (v0 != NULL) {
         v0->unk_00 = param1;
diff --git a/src/overlay028/ov28_02256E9C.c b/src/overlay028/ov28_02256E9C.c
index a88b9742c3..7fbd6c1543 100644
--- a/src/overlay028/ov28_02256E9C.c
+++ b/src/overlay028/ov28_02256E9C.c
@@ -35,7 +35,7 @@ static void ov28_022575EC(const UnkStruct_ov28_02256E9C *param0, const UnkStruct
 
 BOOL ov28_02256E9C(UnkStruct_ov28_02256E9C **param0, u32 param1)
 {
-    *param0 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_02256E9C));
+    *param0 = Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_02256E9C));
 
     if (*param0) {
         (*param0)->unk_0A = param1;
diff --git a/src/overlay029/ov29_022561C0.c b/src/overlay029/ov29_022561C0.c
index 56d4e602d2..5a172eb49c 100644
--- a/src/overlay029/ov29_022561C0.c
+++ b/src/overlay029/ov29_022561C0.c
@@ -54,7 +54,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov29_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov29_0225621C *v0 = (UnkStruct_ov29_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov29_0225621C));
+    UnkStruct_ov29_0225621C *v0 = (UnkStruct_ov29_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov29_0225621C));
 
     if (v0 != NULL) {
         if (ov29_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay029/ov29_022566C8.c b/src/overlay029/ov29_022566C8.c
index 25adda470d..7836eed14f 100644
--- a/src/overlay029/ov29_022566C8.c
+++ b/src/overlay029/ov29_022566C8.c
@@ -39,7 +39,7 @@ static void ov29_02256B18(UnkStruct_ov29_022566C8 *param0);
 
 BOOL ov29_022566C8(UnkStruct_ov29_022566C8 **param0, const UnkStruct_ov29_022566C8_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov29_022566C8 *v0 = (UnkStruct_ov29_022566C8 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov29_022566C8));
+    UnkStruct_ov29_022566C8 *v0 = (UnkStruct_ov29_022566C8 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov29_022566C8));
 
     if (v0 != NULL) {
         GF_ASSERT(GF_heap_c_dummy_return_true(HEAP_ID_POKETCH_MAIN));
diff --git a/src/overlay030/ov30_022561C0.c b/src/overlay030/ov30_022561C0.c
index c0855b3ca2..0fa5bdcb81 100644
--- a/src/overlay030/ov30_022561C0.c
+++ b/src/overlay030/ov30_022561C0.c
@@ -55,7 +55,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov30_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov30_0225621C *v0 = (UnkStruct_ov30_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov30_0225621C));
+    UnkStruct_ov30_0225621C *v0 = (UnkStruct_ov30_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov30_0225621C));
 
     if (v0 != NULL) {
         if (ov30_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay030/ov30_022563EC.c b/src/overlay030/ov30_022563EC.c
index 50ab361fe8..6e47610e45 100644
--- a/src/overlay030/ov30_022563EC.c
+++ b/src/overlay030/ov30_022563EC.c
@@ -37,7 +37,7 @@ static void ov30_02256658(UnkStruct_ov30_022563EC *param0);
 
 BOOL ov30_022563EC(UnkStruct_ov30_022563EC **param0, const UnkStruct_ov30_022563EC_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov30_022563EC *v0 = (UnkStruct_ov30_022563EC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov30_022563EC));
+    UnkStruct_ov30_022563EC *v0 = (UnkStruct_ov30_022563EC *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov30_022563EC));
 
     if (v0 != NULL) {
         NNSG2dScreenData *v1;
diff --git a/src/overlay031/ov31_022561C0.c b/src/overlay031/ov31_022561C0.c
index a5450d9486..835009e68d 100644
--- a/src/overlay031/ov31_022561C0.c
+++ b/src/overlay031/ov31_022561C0.c
@@ -53,7 +53,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov31_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov31_02256228 *v0 = (UnkStruct_ov31_02256228 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov31_02256228));
+    UnkStruct_ov31_02256228 *v0 = (UnkStruct_ov31_02256228 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov31_02256228));
 
     if (v0 != NULL) {
         if (ov31_02256228(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay031/ov31_02256554.c b/src/overlay031/ov31_02256554.c
index 83a5572c7c..c021a17434 100644
--- a/src/overlay031/ov31_02256554.c
+++ b/src/overlay031/ov31_02256554.c
@@ -27,7 +27,7 @@ static void ov31_0225672C(BgConfig *param0, const UnkStruct_ov31_02256554_1 *par
 
 BOOL ov31_02256554(UnkStruct_ov31_02256554 **param0, const UnkStruct_ov31_02256554_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov31_02256554 *v0 = (UnkStruct_ov31_02256554 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov31_02256554));
+    UnkStruct_ov31_02256554 *v0 = (UnkStruct_ov31_02256554 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov31_02256554));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
@@ -113,7 +113,7 @@ static void ov31_022565E0(SysTask *param0, void *param1)
 
 static void ov31_02256644(BgConfig *param0)
 {
-    u8 *v0 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, 0x20 * 16);
+    u8 *v0 = Heap_Alloc(HEAP_ID_POKETCH_APP, 0x20 * 16);
 
     if (v0) {
         int v1;
diff --git a/src/overlay032/ov32_022561C0.c b/src/overlay032/ov32_022561C0.c
index c608716b7b..435494ee3f 100644
--- a/src/overlay032/ov32_022561C0.c
+++ b/src/overlay032/ov32_022561C0.c
@@ -43,7 +43,7 @@ static void NitroStaticInit(void)
 
 static BOOL PoketchPartyStatus_New(void **appData, PoketchSystem *poketchSys, BgConfig *bgConfig, u32 unused)
 {
-    PoketchPartyStatus *partyStatusData = (PoketchPartyStatus *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(PoketchPartyStatus));
+    PoketchPartyStatus *partyStatusData = (PoketchPartyStatus *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(PoketchPartyStatus));
 
     if (partyStatusData != NULL) {
         if (PoketchPartyStatus_Init(partyStatusData, poketchSys, bgConfig, unused)
diff --git a/src/overlay032/ov32_02256470.c b/src/overlay032/ov32_02256470.c
index 15e0595daf..5dfc71b15e 100644
--- a/src/overlay032/ov32_02256470.c
+++ b/src/overlay032/ov32_02256470.c
@@ -45,7 +45,7 @@ static const struct MonIconCoords {
 
 BOOL PartyStatusGraphics_New(PoketchPartyStatusGraphics **dest, const PlayerPartyStatus *playerParty, BgConfig *bgConfig)
 {
-    PoketchPartyStatusGraphics *graphicsData = (PoketchPartyStatusGraphics *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(PoketchPartyStatusGraphics));
+    PoketchPartyStatusGraphics *graphicsData = (PoketchPartyStatusGraphics *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(PoketchPartyStatusGraphics));
 
     if (graphicsData != NULL) {
         PoketchTask_InitActiveTaskList(graphicsData->activeTaskIds, 8);
diff --git a/src/overlay033/ov33_022561C0.c b/src/overlay033/ov33_022561C0.c
index 619c0814e3..30a5057e02 100644
--- a/src/overlay033/ov33_022561C0.c
+++ b/src/overlay033/ov33_022561C0.c
@@ -46,7 +46,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov33_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov33_0225621C *v0 = (UnkStruct_ov33_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov33_0225621C));
+    UnkStruct_ov33_0225621C *v0 = (UnkStruct_ov33_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov33_0225621C));
 
     if (v0 != NULL) {
         if (ov33_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay033/ov33_02256474.c b/src/overlay033/ov33_02256474.c
index 2a20416130..3f1d6dbb82 100644
--- a/src/overlay033/ov33_02256474.c
+++ b/src/overlay033/ov33_02256474.c
@@ -108,7 +108,7 @@ static void ov33_022572A0(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_
 
 BOOL ov33_02256474(UnkStruct_ov33_02256474 **param0, const UnkStruct_ov33_02256474_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov33_02256474 *v0 = (UnkStruct_ov33_02256474 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov33_02256474));
+    UnkStruct_ov33_02256474 *v0 = (UnkStruct_ov33_02256474 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov33_02256474));
 
     if (v0 != NULL) {
         int v1;
diff --git a/src/overlay034/ov34_022561C0.c b/src/overlay034/ov34_022561C0.c
index 1d83fbf847..dedbcb133d 100644
--- a/src/overlay034/ov34_022561C0.c
+++ b/src/overlay034/ov34_022561C0.c
@@ -46,7 +46,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov34_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov34_0225621C *v0 = (UnkStruct_ov34_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov34_0225621C));
+    UnkStruct_ov34_0225621C *v0 = (UnkStruct_ov34_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov34_0225621C));
 
     if (v0 != NULL) {
         if (ov34_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay034/ov34_02256540.c b/src/overlay034/ov34_02256540.c
index 984e4e70bc..1d0ad539d9 100644
--- a/src/overlay034/ov34_02256540.c
+++ b/src/overlay034/ov34_02256540.c
@@ -41,7 +41,7 @@ static void ov34_022569E8(UnkStruct_ov34_02256540 *param0);
 
 BOOL ov34_02256540(UnkStruct_ov34_02256540 **param0, const DowsingMachineTaskData *param1, BgConfig *param2)
 {
-    UnkStruct_ov34_02256540 *v0 = (UnkStruct_ov34_02256540 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov34_02256540));
+    UnkStruct_ov34_02256540 *v0 = (UnkStruct_ov34_02256540 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov34_02256540));
 
     if (v0 != NULL) {
         int v1;
diff --git a/src/overlay035/ov35_022561C0.c b/src/overlay035/ov35_022561C0.c
index 8c63916814..49055742de 100644
--- a/src/overlay035/ov35_022561C0.c
+++ b/src/overlay035/ov35_022561C0.c
@@ -47,7 +47,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov35_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov35_0225621C *v0 = (UnkStruct_ov35_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov35_0225621C));
+    UnkStruct_ov35_0225621C *v0 = (UnkStruct_ov35_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov35_0225621C));
 
     if (v0 != NULL) {
         if (ov35_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay035/ov35_02256410.c b/src/overlay035/ov35_02256410.c
index a4ad00c652..33b37aee73 100644
--- a/src/overlay035/ov35_02256410.c
+++ b/src/overlay035/ov35_02256410.c
@@ -37,7 +37,7 @@ static void ov35_022566A8(UnkStruct_ov35_02256410 *param0, const UnkStruct_ov35_
 
 BOOL ov35_02256410(UnkStruct_ov35_02256410 **param0, const UnkStruct_ov35_02256410_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov35_02256410 *v0 = (UnkStruct_ov35_02256410 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov35_02256410));
+    UnkStruct_ov35_02256410 *v0 = (UnkStruct_ov35_02256410 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov35_02256410));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
diff --git a/src/overlay036/ov36_022561C0.c b/src/overlay036/ov36_022561C0.c
index ad3360b8e5..042af46456 100644
--- a/src/overlay036/ov36_022561C0.c
+++ b/src/overlay036/ov36_022561C0.c
@@ -45,7 +45,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov36_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov36_0225621C *v0 = (UnkStruct_ov36_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov36_0225621C));
+    UnkStruct_ov36_0225621C *v0 = (UnkStruct_ov36_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov36_0225621C));
 
     if (v0 != NULL) {
         if (ov36_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay036/ov36_02256404.c b/src/overlay036/ov36_02256404.c
index 40e8d0d161..5f8746709b 100644
--- a/src/overlay036/ov36_02256404.c
+++ b/src/overlay036/ov36_02256404.c
@@ -34,7 +34,7 @@ static void ov36_0225669C(UnkStruct_ov36_02256404 *param0, const UnkStruct_ov36_
 
 BOOL ov36_02256404(UnkStruct_ov36_02256404 **param0, const UnkStruct_ov36_02256404_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov36_02256404 *v0 = (UnkStruct_ov36_02256404 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov36_02256404));
+    UnkStruct_ov36_02256404 *v0 = (UnkStruct_ov36_02256404 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov36_02256404));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
diff --git a/src/overlay037/ov37_022561C0.c b/src/overlay037/ov37_022561C0.c
index fb859cde30..18db700c87 100644
--- a/src/overlay037/ov37_022561C0.c
+++ b/src/overlay037/ov37_022561C0.c
@@ -46,7 +46,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov37_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov37_0225621C *v0 = (UnkStruct_ov37_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov37_0225621C));
+    UnkStruct_ov37_0225621C *v0 = (UnkStruct_ov37_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov37_0225621C));
 
     if (v0 != NULL) {
         if (ov37_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay037/ov37_022563D4.c b/src/overlay037/ov37_022563D4.c
index d94f7f4399..7ee794e481 100644
--- a/src/overlay037/ov37_022563D4.c
+++ b/src/overlay037/ov37_022563D4.c
@@ -33,7 +33,7 @@ static void ov37_02256588(SysTask *param0, void *param1);
 
 BOOL ov37_022563D4(UnkStruct_ov37_022563D4 **param0, const UnkStruct_ov37_022563D4_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov37_022563D4 *v0 = (UnkStruct_ov37_022563D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov37_022563D4));
+    UnkStruct_ov37_022563D4 *v0 = (UnkStruct_ov37_022563D4 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov37_022563D4));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
diff --git a/src/overlay038/ov38_022561C0.c b/src/overlay038/ov38_022561C0.c
index f7c38725ae..d73dda32ad 100644
--- a/src/overlay038/ov38_022561C0.c
+++ b/src/overlay038/ov38_022561C0.c
@@ -40,7 +40,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov38_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov38_0225621C *v0 = (UnkStruct_ov38_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov38_0225621C));
+    UnkStruct_ov38_0225621C *v0 = (UnkStruct_ov38_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov38_0225621C));
 
     if (v0 != NULL) {
         if (ov38_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay038/ov38_0225632C.c b/src/overlay038/ov38_0225632C.c
index 218d5813e6..cdc8ba3a3c 100644
--- a/src/overlay038/ov38_0225632C.c
+++ b/src/overlay038/ov38_0225632C.c
@@ -25,7 +25,7 @@ static void ov38_02256458(SysTask *param0, void *param1);
 
 BOOL ov38_0225632C(UnkStruct_ov38_0225632C **param0, const UnkStruct_ov38_0225632C_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov38_0225632C *v0 = (UnkStruct_ov38_0225632C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov38_0225632C));
+    UnkStruct_ov38_0225632C *v0 = (UnkStruct_ov38_0225632C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov38_0225632C));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
diff --git a/src/overlay039/ov39_022561C0.c b/src/overlay039/ov39_022561C0.c
index 1a8e52f217..99755265df 100644
--- a/src/overlay039/ov39_022561C0.c
+++ b/src/overlay039/ov39_022561C0.c
@@ -46,7 +46,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov39_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov39_0225621C *v0 = (UnkStruct_ov39_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov39_0225621C));
+    UnkStruct_ov39_0225621C *v0 = (UnkStruct_ov39_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov39_0225621C));
 
     if (v0 != NULL) {
         if (ov39_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay039/ov39_022563DC.c b/src/overlay039/ov39_022563DC.c
index 7acde4cc5a..dee7dd07be 100644
--- a/src/overlay039/ov39_022563DC.c
+++ b/src/overlay039/ov39_022563DC.c
@@ -28,7 +28,7 @@ static void ov39_0225659C(UnkStruct_ov39_022563DC *param0, u32 param1, BOOL para
 
 BOOL ov39_022563DC(UnkStruct_ov39_022563DC **param0, const UnkStruct_ov39_022563DC_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov39_022563DC *v0 = (UnkStruct_ov39_022563DC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov39_022563DC));
+    UnkStruct_ov39_022563DC *v0 = (UnkStruct_ov39_022563DC *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov39_022563DC));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
diff --git a/src/overlay040/ov40_022561C0.c b/src/overlay040/ov40_022561C0.c
index 8e0a5d134e..b94559b255 100644
--- a/src/overlay040/ov40_022561C0.c
+++ b/src/overlay040/ov40_022561C0.c
@@ -50,7 +50,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov40_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov40_0225621C *v0 = (UnkStruct_ov40_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov40_0225621C));
+    UnkStruct_ov40_0225621C *v0 = (UnkStruct_ov40_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov40_0225621C));
 
     if (v0 != NULL) {
         if (ov40_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay040/ov40_0225645C.c b/src/overlay040/ov40_0225645C.c
index d7079453b6..58b423cf93 100644
--- a/src/overlay040/ov40_0225645C.c
+++ b/src/overlay040/ov40_0225645C.c
@@ -49,7 +49,7 @@ static void ov40_02256A14(PoketchAnimation_AnimatedSpriteData *param0, u32 param
 
 BOOL ov40_0225645C(UnkStruct_ov40_0225645C **param0, const UnkStruct_ov40_0225645C_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov40_0225645C *v0 = (UnkStruct_ov40_0225645C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov40_0225645C));
+    UnkStruct_ov40_0225645C *v0 = (UnkStruct_ov40_0225645C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov40_0225645C));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
diff --git a/src/overlay041/ov41_022561C0.c b/src/overlay041/ov41_022561C0.c
index 4613515942..da82669995 100644
--- a/src/overlay041/ov41_022561C0.c
+++ b/src/overlay041/ov41_022561C0.c
@@ -51,7 +51,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov41_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov41_02256220 *v0 = (UnkStruct_ov41_02256220 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov41_02256220));
+    UnkStruct_ov41_02256220 *v0 = (UnkStruct_ov41_02256220 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov41_02256220));
 
     if (v0 != NULL) {
         if (ov41_02256220(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay041/ov41_022567B0.c b/src/overlay041/ov41_022567B0.c
index 8b0ed7647c..8d7cbf8386 100644
--- a/src/overlay041/ov41_022567B0.c
+++ b/src/overlay041/ov41_022567B0.c
@@ -50,7 +50,7 @@ static void ov41_02256D1C(SysTask *param0, void *param1);
 
 BOOL ov41_022567B0(UnkStruct_ov41_022567B0 **param0, const UnkStruct_ov41_022567B0_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov41_022567B0 *v0 = (UnkStruct_ov41_022567B0 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov41_022567B0));
+    UnkStruct_ov41_022567B0 *v0 = (UnkStruct_ov41_022567B0 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov41_022567B0));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
diff --git a/src/overlay042/ov42_022561C0.c b/src/overlay042/ov42_022561C0.c
index 291360e70e..80e317f5cd 100644
--- a/src/overlay042/ov42_022561C0.c
+++ b/src/overlay042/ov42_022561C0.c
@@ -44,7 +44,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov42_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov42_0225621C *v0 = (UnkStruct_ov42_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov42_0225621C));
+    UnkStruct_ov42_0225621C *v0 = (UnkStruct_ov42_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov42_0225621C));
 
     if (v0 != NULL) {
         if (ov42_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay042/ov42_022563D4.c b/src/overlay042/ov42_022563D4.c
index 112a791694..d33f3e0e49 100644
--- a/src/overlay042/ov42_022563D4.c
+++ b/src/overlay042/ov42_022563D4.c
@@ -39,7 +39,7 @@ static void ov42_022565C4(SysTask *param0, void *param1);
 
 BOOL ov42_022563D4(UnkStruct_ov42_022563D4 **param0, const UnkStruct_ov42_022563D4_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov42_022563D4 *v0 = (UnkStruct_ov42_022563D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov42_022563D4));
+    UnkStruct_ov42_022563D4 *v0 = (UnkStruct_ov42_022563D4 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov42_022563D4));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
diff --git a/src/overlay044/ov44_022561C0.c b/src/overlay044/ov44_022561C0.c
index 9779a55643..a8ead8e1a1 100644
--- a/src/overlay044/ov44_022561C0.c
+++ b/src/overlay044/ov44_022561C0.c
@@ -54,7 +54,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov44_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov44_0225621C *v0 = (UnkStruct_ov44_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov44_0225621C));
+    UnkStruct_ov44_0225621C *v0 = (UnkStruct_ov44_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov44_0225621C));
 
     if (v0 != NULL) {
         if (ov44_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay044/ov44_022565BC.c b/src/overlay044/ov44_022565BC.c
index c3e64c8917..2556a2902d 100644
--- a/src/overlay044/ov44_022565BC.c
+++ b/src/overlay044/ov44_022565BC.c
@@ -53,7 +53,7 @@ static BOOL ov44_02256AC8(UnkStruct_ov44_022565BC *param0, const UnkStruct_ov44_
 
 BOOL ov44_022565BC(UnkStruct_ov44_022565BC **param0, const UnkStruct_ov44_022565BC_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov44_022565BC *v0 = (UnkStruct_ov44_022565BC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov44_022565BC));
+    UnkStruct_ov44_022565BC *v0 = (UnkStruct_ov44_022565BC *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov44_022565BC));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
diff --git a/src/overlay045/ov45_022561C0.c b/src/overlay045/ov45_022561C0.c
index aa16ab845d..cb0fa073a6 100644
--- a/src/overlay045/ov45_022561C0.c
+++ b/src/overlay045/ov45_022561C0.c
@@ -59,7 +59,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov45_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov45_022561D4 *v0 = (UnkStruct_ov45_022561D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov45_022561D4));
+    UnkStruct_ov45_022561D4 *v0 = (UnkStruct_ov45_022561D4 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov45_022561D4));
 
     if (v0 != NULL) {
         if (ov45_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay045/ov45_022566EC.c b/src/overlay045/ov45_022566EC.c
index e2c94d84e9..a4b84ad668 100644
--- a/src/overlay045/ov45_022566EC.c
+++ b/src/overlay045/ov45_022566EC.c
@@ -42,7 +42,7 @@ static void ov45_02256B78(SysTask *param0, void *param1);
 
 BOOL ov45_022566EC(UnkStruct_ov45_022566EC **param0, const UnkStruct_ov45_022566EC_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov45_022566EC *v0 = (UnkStruct_ov45_022566EC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov45_022566EC));
+    UnkStruct_ov45_022566EC *v0 = (UnkStruct_ov45_022566EC *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov45_022566EC));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
diff --git a/src/overlay046/ov46_022561C0.c b/src/overlay046/ov46_022561C0.c
index ccfae9cfbe..1a1357bd41 100644
--- a/src/overlay046/ov46_022561C0.c
+++ b/src/overlay046/ov46_022561C0.c
@@ -90,7 +90,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov46_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov46_0225621C *v0 = (UnkStruct_ov46_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov46_0225621C));
+    UnkStruct_ov46_0225621C *v0 = (UnkStruct_ov46_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov46_0225621C));
 
     if (v0 != NULL) {
         if (ov46_02256310(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay046/ov46_02256BCC.c b/src/overlay046/ov46_02256BCC.c
index bc01857c81..ed7fd4ac83 100644
--- a/src/overlay046/ov46_02256BCC.c
+++ b/src/overlay046/ov46_02256BCC.c
@@ -45,7 +45,7 @@ static void ov46_022570C4(UnkStruct_ov46_02256BCC *param0, BOOL param1);
 
 BOOL ov46_02256BCC(UnkStruct_ov46_02256BCC **param0, const UnkStruct_ov46_02256BCC_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov46_02256BCC *v0 = (UnkStruct_ov46_02256BCC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov46_02256BCC));
+    UnkStruct_ov46_02256BCC *v0 = (UnkStruct_ov46_02256BCC *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov46_02256BCC));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
diff --git a/src/overlay047/ov47_022561C0.c b/src/overlay047/ov47_022561C0.c
index 6600d85d8c..2faa34ff15 100644
--- a/src/overlay047/ov47_022561C0.c
+++ b/src/overlay047/ov47_022561C0.c
@@ -56,7 +56,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov47_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov47_0225621C *v0 = (UnkStruct_ov47_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov47_0225621C));
+    UnkStruct_ov47_0225621C *v0 = (UnkStruct_ov47_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov47_0225621C));
 
     if (v0 != NULL) {
         if (ov47_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay047/ov47_02256634.c b/src/overlay047/ov47_02256634.c
index 5adaba33f1..4b4ee40722 100644
--- a/src/overlay047/ov47_02256634.c
+++ b/src/overlay047/ov47_02256634.c
@@ -38,7 +38,7 @@ static void ov47_02256968(SysTask *param0, void *param1);
 
 BOOL ov47_02256634(UnkStruct_ov47_02256634 **param0, const UnkStruct_ov47_02256634_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov47_02256634 *v0 = (UnkStruct_ov47_02256634 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov47_02256634));
+    UnkStruct_ov47_02256634 *v0 = (UnkStruct_ov47_02256634 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov47_02256634));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
diff --git a/src/overlay048/ov48_022561C0.c b/src/overlay048/ov48_022561C0.c
index 3c6afe9b0b..3acd91139c 100644
--- a/src/overlay048/ov48_022561C0.c
+++ b/src/overlay048/ov48_022561C0.c
@@ -172,7 +172,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov48_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov48_0225621C *v0 = (UnkStruct_ov48_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov48_0225621C));
+    UnkStruct_ov48_0225621C *v0 = (UnkStruct_ov48_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov48_0225621C));
 
     if (v0 != NULL) {
         if (ov48_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay048/ov48_0225650C.c b/src/overlay048/ov48_0225650C.c
index 898bb10735..5258f73bc3 100644
--- a/src/overlay048/ov48_0225650C.c
+++ b/src/overlay048/ov48_0225650C.c
@@ -48,7 +48,7 @@ static void ov48_022569FC(SysTask *param0, void *param1);
 
 BOOL ov48_0225650C(UnkStruct_ov48_0225650C **param0, const UnkStruct_ov48_0225650C_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov48_0225650C *v0 = (UnkStruct_ov48_0225650C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov48_0225650C));
+    UnkStruct_ov48_0225650C *v0 = (UnkStruct_ov48_0225650C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov48_0225650C));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
diff --git a/src/overlay049/ov49_022561C0.c b/src/overlay049/ov49_022561C0.c
index f6bb84e3f2..4fe5b371c3 100644
--- a/src/overlay049/ov49_022561C0.c
+++ b/src/overlay049/ov49_022561C0.c
@@ -45,7 +45,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov49_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov49_0225621C *v0 = (UnkStruct_ov49_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov49_0225621C));
+    UnkStruct_ov49_0225621C *v0 = (UnkStruct_ov49_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov49_0225621C));
 
     if (v0 != NULL) {
         if (ov49_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay049/ov49_022563D4.c b/src/overlay049/ov49_022563D4.c
index cc1402a776..2829d707e3 100644
--- a/src/overlay049/ov49_022563D4.c
+++ b/src/overlay049/ov49_022563D4.c
@@ -33,7 +33,7 @@ static void ov49_02256594(SysTask *param0, void *param1);
 
 BOOL ov49_022563D4(UnkStruct_ov49_022563D4 **param0, const UnkStruct_ov49_022563D4_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov49_022563D4 *v0 = (UnkStruct_ov49_022563D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov49_022563D4));
+    UnkStruct_ov49_022563D4 *v0 = (UnkStruct_ov49_022563D4 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov49_022563D4));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
diff --git a/src/overlay050/ov50_022561C0.c b/src/overlay050/ov50_022561C0.c
index a2378d2e36..71d51fb487 100644
--- a/src/overlay050/ov50_022561C0.c
+++ b/src/overlay050/ov50_022561C0.c
@@ -52,7 +52,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov50_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov50_022561D4 *v0 = (UnkStruct_ov50_022561D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov50_022561D4));
+    UnkStruct_ov50_022561D4 *v0 = (UnkStruct_ov50_022561D4 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov50_022561D4));
 
     if (v0 != NULL) {
         if (ov50_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay050/ov50_02256510.c b/src/overlay050/ov50_02256510.c
index e34d6f4d1d..97347a953b 100644
--- a/src/overlay050/ov50_02256510.c
+++ b/src/overlay050/ov50_02256510.c
@@ -38,7 +38,7 @@ static void ov50_02256894(BgConfig *param0, u32 param1, u32 param2);
 
 BOOL ov50_02256510(UnkStruct_ov50_02256510 **param0, const UnkStruct_ov50_02256510_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov50_02256510 *v0 = (UnkStruct_ov50_02256510 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov50_02256510));
+    UnkStruct_ov50_02256510 *v0 = (UnkStruct_ov50_02256510 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov50_02256510));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
diff --git a/src/overlay051/ov51_022561C0.c b/src/overlay051/ov51_022561C0.c
index cbe799a3f5..d8e1cab1cc 100644
--- a/src/overlay051/ov51_022561C0.c
+++ b/src/overlay051/ov51_022561C0.c
@@ -40,7 +40,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov51_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov51_0225621C *v0 = (UnkStruct_ov51_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov51_0225621C));
+    UnkStruct_ov51_0225621C *v0 = (UnkStruct_ov51_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov51_0225621C));
 
     if (v0 != NULL) {
         if (ov51_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay051/ov51_0225632C.c b/src/overlay051/ov51_0225632C.c
index 915a007aee..d9e7d48980 100644
--- a/src/overlay051/ov51_0225632C.c
+++ b/src/overlay051/ov51_0225632C.c
@@ -25,7 +25,7 @@ static void ov51_02256458(SysTask *param0, void *param1);
 
 BOOL ov51_0225632C(UnkStruct_ov51_0225632C **param0, const UnkStruct_ov51_0225632C_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov51_0225632C *v0 = (UnkStruct_ov51_0225632C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov51_0225632C));
+    UnkStruct_ov51_0225632C *v0 = (UnkStruct_ov51_0225632C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov51_0225632C));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
diff --git a/src/overlay052/ov52_022561C0.c b/src/overlay052/ov52_022561C0.c
index aa5df3d03c..61db656ad4 100644
--- a/src/overlay052/ov52_022561C0.c
+++ b/src/overlay052/ov52_022561C0.c
@@ -60,7 +60,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov52_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov52_0225621C *v0 = (UnkStruct_ov52_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov52_0225621C));
+    UnkStruct_ov52_0225621C *v0 = (UnkStruct_ov52_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov52_0225621C));
 
     if (v0 != NULL) {
         if (ov52_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay052/ov52_02256694.c b/src/overlay052/ov52_02256694.c
index 38c0c7cd26..44b7625001 100644
--- a/src/overlay052/ov52_02256694.c
+++ b/src/overlay052/ov52_02256694.c
@@ -50,7 +50,7 @@ static void ov52_02256C64(UnkStruct_ov52_02256694 *param0, const UnkStruct_ov52_
 
 BOOL ov52_02256694(UnkStruct_ov52_02256694 **param0, const UnkStruct_ov52_02256694_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov52_02256694 *v0 = (UnkStruct_ov52_02256694 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov52_02256694));
+    UnkStruct_ov52_02256694 *v0 = (UnkStruct_ov52_02256694 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov52_02256694));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
diff --git a/src/overlay053/ov53_022561C0.c b/src/overlay053/ov53_022561C0.c
index a5d8235238..a9b94dac17 100644
--- a/src/overlay053/ov53_022561C0.c
+++ b/src/overlay053/ov53_022561C0.c
@@ -50,7 +50,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov53_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov53_0225621C *v0 = (UnkStruct_ov53_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov53_0225621C));
+    UnkStruct_ov53_0225621C *v0 = (UnkStruct_ov53_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov53_0225621C));
 
     if (v0 != NULL) {
         if (ov53_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay053/ov53_02256420.c b/src/overlay053/ov53_02256420.c
index 386792f7e5..a313a0e13b 100644
--- a/src/overlay053/ov53_02256420.c
+++ b/src/overlay053/ov53_02256420.c
@@ -44,7 +44,7 @@ static void ov53_02256874(PoketchAnimation_AnimatedSpriteData **param0, u32 para
 
 BOOL ov53_02256420(UnkStruct_ov53_02256420 **param0, const UnkStruct_ov53_02256420_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov53_02256420 *v0 = (UnkStruct_ov53_02256420 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov53_02256420));
+    UnkStruct_ov53_02256420 *v0 = (UnkStruct_ov53_02256420 *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov53_02256420));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
diff --git a/src/overlay054/ov54_022561C0.c b/src/overlay054/ov54_022561C0.c
index c146673761..b1a2a2bad4 100644
--- a/src/overlay054/ov54_022561C0.c
+++ b/src/overlay054/ov54_022561C0.c
@@ -47,7 +47,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov54_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov54_0225621C *v0 = (UnkStruct_ov54_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov54_0225621C));
+    UnkStruct_ov54_0225621C *v0 = (UnkStruct_ov54_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov54_0225621C));
 
     if (v0 != NULL) {
         if (ov54_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay054/ov54_0225642C.c b/src/overlay054/ov54_0225642C.c
index e9b97ab8de..9b66985967 100644
--- a/src/overlay054/ov54_0225642C.c
+++ b/src/overlay054/ov54_0225642C.c
@@ -36,7 +36,7 @@ static void ov54_022566A8(UnkStruct_ov54_0225642C *param0);
 
 BOOL ov54_0225642C(UnkStruct_ov54_0225642C **param0, const UnkStruct_ov54_0225642C_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov54_0225642C *v0 = (UnkStruct_ov54_0225642C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov54_0225642C));
+    UnkStruct_ov54_0225642C *v0 = (UnkStruct_ov54_0225642C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov54_0225642C));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
diff --git a/src/overlay055/ov55_022561C0.c b/src/overlay055/ov55_022561C0.c
index 6d97f0b448..f233a6ea03 100644
--- a/src/overlay055/ov55_022561C0.c
+++ b/src/overlay055/ov55_022561C0.c
@@ -40,7 +40,7 @@ static void NitroStaticInit(void)
 
 static BOOL ov55_022561D4(void **param0, PoketchSystem *poketchSys, BgConfig *param2, u32 param3)
 {
-    UnkStruct_ov55_0225621C *v0 = (UnkStruct_ov55_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov55_0225621C));
+    UnkStruct_ov55_0225621C *v0 = (UnkStruct_ov55_0225621C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov55_0225621C));
 
     if (v0 != NULL) {
         if (ov55_0225621C(v0, poketchSys, param2, param3)) {
diff --git a/src/overlay055/ov55_0225632C.c b/src/overlay055/ov55_0225632C.c
index dcbb418171..9906f105cf 100644
--- a/src/overlay055/ov55_0225632C.c
+++ b/src/overlay055/ov55_0225632C.c
@@ -25,7 +25,7 @@ static void ov55_02256468(SysTask *param0, void *param1);
 
 BOOL ov55_0225632C(UnkStruct_ov55_0225632C **param0, const UnkStruct_ov55_0225632C_1 *param1, BgConfig *param2)
 {
-    UnkStruct_ov55_0225632C *v0 = (UnkStruct_ov55_0225632C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov55_0225632C));
+    UnkStruct_ov55_0225632C *v0 = (UnkStruct_ov55_0225632C *)Heap_Alloc(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov55_0225632C));
 
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c
index 9fd3a814c6..0aca276b66 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -180,8 +180,8 @@ static void ov56_02256294(UnkStruct_ov56_02256468 *param0)
     param0->unk_2D8.unk_02 = 0;
     param0->unk_2D8.unk_04 = 0;
     param0->unk_2D8.unk_06 = 0;
-    param0->unk_18 = StringTemplate_Default(HEAP_ID_FIELD);
-    param0->unk_1C = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNION_ROOM, HEAP_ID_FIELD);
+    param0->unk_18 = StringTemplate_Default(HEAP_ID_FIELD1);
+    param0->unk_1C = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNION_ROOM, HEAP_ID_FIELD1);
     param0->unk_20 = Graphics_GetScrnData(NARC_INDEX_GRAPHIC__UNIONROOM, 3, 1, &(param0->unk_24), 4);
 }
 
@@ -358,9 +358,9 @@ static void ov56_02256508(BgConfig *param0)
         GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0);
     }
 
-    Graphics_LoadPalette(NARC_INDEX_GRAPHIC__UNIONROOM, 0, 4, 0, 0x20 * 3, HEAP_ID_FIELD);
-    Graphics_LoadTilesToBgLayer(NARC_INDEX_GRAPHIC__UNIONROOM, 2, param0, 7, 0, (32 * 5) * 0x20, 1, HEAP_ID_FIELD);
-    Graphics_LoadTilemapToBgLayer(NARC_INDEX_GRAPHIC__UNIONROOM, 4, param0, 7, 0, 32 * 24 * 2, 1, HEAP_ID_FIELD);
+    Graphics_LoadPalette(NARC_INDEX_GRAPHIC__UNIONROOM, 0, 4, 0, 0x20 * 3, HEAP_ID_FIELD1);
+    Graphics_LoadTilesToBgLayer(NARC_INDEX_GRAPHIC__UNIONROOM, 2, param0, 7, 0, (32 * 5) * 0x20, 1, HEAP_ID_FIELD1);
+    Graphics_LoadTilemapToBgLayer(NARC_INDEX_GRAPHIC__UNIONROOM, 4, param0, 7, 0, 32 * 24 * 2, 1, HEAP_ID_FIELD1);
     FieldMessage_LoadTextPalettes(4, FALSE);
 }
 
@@ -368,16 +368,16 @@ static void ov56_02256634(UnkStruct_ov56_02256468 *param0)
 {
     int v0;
 
-    param0->unk_28 = SpriteList_InitRendering(10, &param0->unk_2C, HEAP_ID_FIELD);
+    param0->unk_28 = SpriteList_InitRendering(10, &param0->unk_2C, HEAP_ID_FIELD1);
 
     for (v0 = 0; v0 < 4; v0++) {
-        param0->unk_1B8[v0] = SpriteResourceCollection_New(1, v0, HEAP_ID_FIELD);
+        param0->unk_1B8[v0] = SpriteResourceCollection_New(1, v0, HEAP_ID_FIELD1);
     }
 
-    param0->unk_1C8[0] = SpriteResourceCollection_AddTiles(param0->unk_1B8[0], 74, 5, 1, 999, NNS_G2D_VRAM_TYPE_2DSUB, HEAP_ID_FIELD);
-    param0->unk_1C8[1] = SpriteResourceCollection_AddPalette(param0->unk_1B8[1], 74, 1, 0, 999, NNS_G2D_VRAM_TYPE_2DSUB, 1, HEAP_ID_FIELD);
-    param0->unk_1C8[2] = SpriteResourceCollection_Add(param0->unk_1B8[2], 74, 6, 1, 999, 2, HEAP_ID_FIELD);
-    param0->unk_1C8[3] = SpriteResourceCollection_Add(param0->unk_1B8[3], 74, 7, 1, 999, 3, HEAP_ID_FIELD);
+    param0->unk_1C8[0] = SpriteResourceCollection_AddTiles(param0->unk_1B8[0], 74, 5, 1, 999, NNS_G2D_VRAM_TYPE_2DSUB, HEAP_ID_FIELD1);
+    param0->unk_1C8[1] = SpriteResourceCollection_AddPalette(param0->unk_1B8[1], 74, 1, 0, 999, NNS_G2D_VRAM_TYPE_2DSUB, 1, HEAP_ID_FIELD1);
+    param0->unk_1C8[2] = SpriteResourceCollection_Add(param0->unk_1B8[2], 74, 6, 1, 999, 2, HEAP_ID_FIELD1);
+    param0->unk_1C8[3] = SpriteResourceCollection_Add(param0->unk_1B8[3], 74, 7, 1, 999, 3, HEAP_ID_FIELD1);
 
     SpriteTransfer_RequestCharAtEnd(param0->unk_1C8[0]);
     SpriteTransfer_RequestPlttFreeSpace(param0->unk_1C8[1]);
@@ -407,7 +407,7 @@ static void ov56_02256704(UnkStruct_ov56_02256468 *param0)
         v1.affineZRotation = 0;
         v1.priority = 0;
         v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
-        v1.heapID = HEAP_ID_FIELD;
+        v1.heapID = HEAP_ID_FIELD1;
 
         for (v0 = 0; v0 < 3; v0++) {
             v1.position.x = FX32_CONST(256 - 24);
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 0585d26b44..77282c87b7 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -543,7 +543,7 @@ static void ov58_021D12C4(UnkStruct_02095EAC *param0)
 
     MessageLoader_GetStrbuf(param0->unk_10, 7, param0->unk_28);
 
-    param0->unk_442C = Heap_AllocFromHeap(HEAP_ID_39, 30 * 16 * 32);
+    param0->unk_442C = Heap_Alloc(HEAP_ID_39, 30 * 16 * 32);
     param0->unk_9454 = sub_02015920(HEAP_ID_39);
     param0->unk_378 = 0;
 }
diff --git a/src/overlay059/ov59_021D2B44.c b/src/overlay059/ov59_021D2B44.c
index 11fe485529..da538cebac 100644
--- a/src/overlay059/ov59_021D2B44.c
+++ b/src/overlay059/ov59_021D2B44.c
@@ -173,7 +173,7 @@ static void ov59_021D2B90(SaveData *saveData, UnkStruct_0202E794 *param1, UnkStr
 
 UnkStruct_0202E794 *ov59_021D2C28(SaveData *saveData, int heapID, u32 param2)
 {
-    UnkStruct_0202E794 *v0 = Heap_AllocFromHeapAtEnd(heapID, param2);
+    UnkStruct_0202E794 *v0 = Heap_AllocAtEnd(heapID, param2);
     TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
 
     GF_ASSERT(param2 == ov59_021D2B44(saveData));
@@ -184,7 +184,7 @@ UnkStruct_0202E794 *ov59_021D2C28(SaveData *saveData, int heapID, u32 param2)
 
 UnkStruct_0202E794 *ov59_021D2C70(SaveData *saveData, int heapID, u32 param2)
 {
-    UnkStruct_0202E794 *v0 = Heap_AllocFromHeapAtEnd(heapID, param2);
+    UnkStruct_0202E794 *v0 = Heap_AllocAtEnd(heapID, param2);
     TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
 
     GF_ASSERT(param2 == ov59_021D2B4C(saveData));
@@ -195,7 +195,7 @@ UnkStruct_0202E794 *ov59_021D2C70(SaveData *saveData, int heapID, u32 param2)
 
 UnkStruct_0202E794 *ov59_021D2CB4(SaveData *saveData, int heapID, u32 param2)
 {
-    UnkStruct_0202E794 *v0 = Heap_AllocFromHeapAtEnd(heapID, param2);
+    UnkStruct_0202E794 *v0 = Heap_AllocAtEnd(heapID, param2);
     TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
 
     GF_ASSERT(param2 == ov59_021D2B54(saveData));
@@ -206,7 +206,7 @@ UnkStruct_0202E794 *ov59_021D2CB4(SaveData *saveData, int heapID, u32 param2)
 
 UnkStruct_0202E794 *ov59_021D2CF8(SaveData *saveData, int heapID, u32 param2)
 {
-    UnkStruct_0202E794 *v0 = Heap_AllocFromHeapAtEnd(heapID, param2);
+    UnkStruct_0202E794 *v0 = Heap_AllocAtEnd(heapID, param2);
     TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
 
     GF_ASSERT(param2 == ov59_021D2B44(saveData));
@@ -217,7 +217,7 @@ UnkStruct_0202E794 *ov59_021D2CF8(SaveData *saveData, int heapID, u32 param2)
 
 UnkStruct_0202E794 *ov59_021D2D3C(SaveData *saveData, int heapID, u32 param2)
 {
-    UnkStruct_0202E794 *v0 = Heap_AllocFromHeapAtEnd(heapID, param2);
+    UnkStruct_0202E794 *v0 = Heap_AllocAtEnd(heapID, param2);
     TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
 
     GF_ASSERT(param2 == ov59_021D2B4C(saveData));
@@ -228,7 +228,7 @@ UnkStruct_0202E794 *ov59_021D2D3C(SaveData *saveData, int heapID, u32 param2)
 
 UnkStruct_0202E794 *ov59_021D2D80(SaveData *saveData, int heapID, u32 param2)
 {
-    UnkStruct_0202E794 *v0 = Heap_AllocFromHeapAtEnd(heapID, param2);
+    UnkStruct_0202E794 *v0 = Heap_AllocAtEnd(heapID, param2);
     TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
 
     GF_ASSERT(param2 == ov59_021D2B54(saveData));
diff --git a/src/overlay059/ov59_021D2F88.c b/src/overlay059/ov59_021D2F88.c
index c7ce22fcdb..daf9da986b 100644
--- a/src/overlay059/ov59_021D2F88.c
+++ b/src/overlay059/ov59_021D2F88.c
@@ -53,7 +53,7 @@ static u32 ov59_021D2F88(SaveData *saveData)
 static void *ov59_021D2F94(SaveData *saveData, int heapID, u32 param2)
 {
     RecordMixedRNG *v0 = SaveData_GetRecordMixedRNG(saveData);
-    void *v1 = Heap_AllocFromHeapAtEnd(heapID, param2);
+    void *v1 = Heap_AllocAtEnd(heapID, param2);
 
     MI_CpuCopyFast(ov59_021D2A30(v0), v1, param2);
 
@@ -76,7 +76,7 @@ static void *ov59_021D2FE0(SaveData *saveData, int heapID, u32 param2)
 {
     UnkStruct_02029C68 *v0;
     UnkStruct_0202A750 *v1 = sub_0202A750(saveData);
-    void *v2 = Heap_AllocFromHeapAtEnd(heapID, param2);
+    void *v2 = Heap_AllocAtEnd(heapID, param2);
 
     v0 = sub_02029CA8(v1, 0);
     MI_CpuCopyFast(v0, v2, param2);
@@ -122,7 +122,7 @@ static void ov59_021D3090(const UnkStruct_ov59_021D2FBC *param0)
 
 static void *ov59_021D30B4(SaveData *saveData, int heapID, u32 param2)
 {
-    UnkStruct_ov96_0223B450_sub1 *v0 = Heap_AllocFromHeapAtEnd(heapID, param2);
+    UnkStruct_ov96_0223B450_sub1 *v0 = Heap_AllocAtEnd(heapID, param2);
     MI_CpuClear8(v0, param2);
     sub_02073700(saveData, 0, v0);
 
diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c
index 1691e3b86c..88a2a53646 100644
--- a/src/overlay061/ov61_0222B008.c
+++ b/src/overlay061/ov61_0222B008.c
@@ -90,7 +90,7 @@ int ov61_0222B008(UnkStruct_ov62_022349A8 *param0, const UnkStruct_ov62_02241130
     param0->unk_14C = -1;
     param0->unk_3E8 = 23004;
     param0->unk_3EC = 23004;
-    param0->unk_3B4 = Heap_AllocFromHeap(param1->heapID, ov61_0222DE8C(-1));
+    param0->unk_3B4 = Heap_Alloc(param1->heapID, ov61_0222DE8C(-1));
 
     MI_CpuClear8(param0->unk_3B4, ov61_0222DE8C(-1));
 
@@ -785,7 +785,7 @@ static void *ov61_0222BBF0(int heapID)
     void *v2;
     int v3 = 0x2000;
 
-    v0 = Heap_AllocFromHeap(heapID, v3);
+    v0 = Heap_Alloc(heapID, v3);
     v2 = v0;
     v1 = (void *)((u32)v0 + v3);
     v0 = OS_InitAlloc(OS_ARENA_MAIN, v0, v1, 1);
diff --git a/src/overlay062/ov62_02234A10.c b/src/overlay062/ov62_02234A10.c
index 4caa4226c1..42155f1369 100644
--- a/src/overlay062/ov62_02234A10.c
+++ b/src/overlay062/ov62_02234A10.c
@@ -278,7 +278,7 @@ BOOL ov62_02235008(UnkStruct_0208C06C *param0)
     switch (param0->unk_08) {
     case 0:
 
-        v0 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_02235008));
+        v0 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_02235008));
         MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov62_02235008));
         param0->unk_860 = v0;
         v0->unk_50 = 16;
diff --git a/src/overlay062/ov62_02235278.c b/src/overlay062/ov62_02235278.c
index 97d41c0a16..26162bbdc0 100644
--- a/src/overlay062/ov62_02235278.c
+++ b/src/overlay062/ov62_02235278.c
@@ -228,14 +228,14 @@ static BOOL ov62_02235580(UnkStruct_0208C06C *param0)
     case 0: {
         int v1;
         UnkStruct_ov62_022354A4 *v2;
-        UnkStruct_ov62_02235580 *v3 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_02235580));
+        UnkStruct_ov62_02235580 *v3 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_02235580));
 
         MI_CpuFill8(v3, 0, sizeof(UnkStruct_ov62_02235580));
         param0->unk_860 = v3;
         v3->unk_08 = 0;
 
         for (v1 = 0; v1 < param0->unk_534.unk_1AC; v1++) {
-            v2 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_022354A4));
+            v2 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_022354A4));
             memset(v2, 0, sizeof(UnkStruct_ov62_022354A4));
             ov62_02230E74(param0->unk_534.unk_C8[v1].unk_00, &v2->unk_00, &v2->unk_02);
 
@@ -287,7 +287,7 @@ static BOOL ov62_02235580(UnkStruct_0208C06C *param0)
                     v0->unk_08 = 1;
 
                     do {
-                        v5 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_022354A4));
+                        v5 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_022354A4));
                         memset(v5, 0, sizeof(UnkStruct_ov62_022354A4));
                         ov62_02230E74(param0->unk_534.unk_00[v4].unk_00, &v5->unk_00, &v5->unk_02);
 
@@ -362,13 +362,13 @@ static BOOL ov62_02235854(UnkStruct_0208C06C *param0)
         int v1;
         UnkStruct_ov62_022354A4 *v2;
 
-        v0 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_02235580));
+        v0 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_02235580));
         MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov62_02235580));
         param0->unk_860 = v0;
         v1 = 0;
 
         do {
-            v2 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_022354A4));
+            v2 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_022354A4));
 
             memset(v2, 0, sizeof(UnkStruct_ov62_022354A4));
             ov62_02230E74(param0->unk_534.unk_00[v1].unk_00, &v2->unk_00, &v2->unk_02);
@@ -404,7 +404,7 @@ static BOOL ov62_02235854(UnkStruct_0208C06C *param0)
 
             if (v0->unk_0C == 1) {
                 for (v3 = 0; v3 < param0->unk_534.unk_1AC; v3++) {
-                    v4 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_022354A4));
+                    v4 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_022354A4));
                     memset(v4, 0, sizeof(UnkStruct_ov62_022354A4));
                     ov62_02230E74(param0->unk_534.unk_C8[v3].unk_00, &v4->unk_00, &v4->unk_02);
 
diff --git a/src/overlay062/ov62_02235E64.c b/src/overlay062/ov62_02235E64.c
index d22eb54c3e..5470157e87 100644
--- a/src/overlay062/ov62_02235E64.c
+++ b/src/overlay062/ov62_02235E64.c
@@ -83,7 +83,7 @@ static const TouchScreenRect Unk_ov62_02248C1C[] = {
 
 static BOOL ov62_02235E64(UnkStruct_0208C06C *param0)
 {
-    UnkStruct_ov62_02235E64 *v0 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_02235E64));
+    UnkStruct_ov62_02235E64 *v0 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_02235E64));
 
     memset(v0, 0, sizeof(UnkStruct_ov62_02235E64));
     param0->unk_860 = v0;
diff --git a/src/overlay062/ov62_02236CBC.c b/src/overlay062/ov62_02236CBC.c
index 2f1ecae00d..5a96d2984c 100644
--- a/src/overlay062/ov62_02236CBC.c
+++ b/src/overlay062/ov62_02236CBC.c
@@ -572,7 +572,7 @@ static BOOL ov62_02237884(UnkStruct_0208C06C *param0)
     UnkStruct_ov62_02236CBC *v0;
 
     if (param0->unk_08 == 0) {
-        v0 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_02236CBC));
+        v0 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_02236CBC));
         MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov62_02236CBC));
         param0->unk_860 = v0;
         v0->unk_00 = 0;
diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c
index cdab9d3fd0..8ffa6b5a84 100644
--- a/src/overlay062/ov62_02237D24.c
+++ b/src/overlay062/ov62_02237D24.c
@@ -203,7 +203,7 @@ static const UnkStruct_ov62_02248CDC Unk_ov62_02248CDC = {
 
 static BOOL ov62_02237D24(UnkStruct_0208C06C *param0)
 {
-    UnkStruct_ov62_02237D24 *v0 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_02237D24));
+    UnkStruct_ov62_02237D24 *v0 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_02237D24));
 
     memset(v0, 0, sizeof(UnkStruct_ov62_02237D24));
     param0->unk_860 = v0;
@@ -1546,7 +1546,7 @@ static void ov62_02239A0C(UnkStruct_0208C06C *param0, int param1)
 
         Heap_Free(v0);
 
-        v4->unk_1E8 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_02249380) * v4->unk_1D4.unk_00);
+        v4->unk_1E8 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_02249380) * v4->unk_1D4.unk_00);
         MI_CpuFill8(v4->unk_1E8, 0, sizeof(UnkStruct_ov62_02249380) * v4->unk_1D4.unk_00);
 
         for (v5 = 0; v5 < v4->unk_1D4.unk_00; v5++) {
diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c
index ca6c3662af..ec760b043c 100644
--- a/src/overlay062/ov62_02239D60.c
+++ b/src/overlay062/ov62_02239D60.c
@@ -445,7 +445,7 @@ static void ov62_0223A154(SaveData *saveData, const PCBoxes *pcBoxes, int boxID,
 
 static BOOL ov62_0223A17C(UnkStruct_0208C06C *param0)
 {
-    UnkStruct_ov62_02239DBC *v0 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_02239DBC));
+    UnkStruct_ov62_02239DBC *v0 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_02239DBC));
 
     memset(v0, 0, sizeof(UnkStruct_ov62_02239DBC));
 
diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c
index 580c72ed9e..9d7c788b54 100644
--- a/src/overlay062/ov62_0223CAEC.c
+++ b/src/overlay062/ov62_0223CAEC.c
@@ -606,7 +606,7 @@ static void ov62_0223D540(u32 param0, enum TouchScreenButtonState param1, void *
 
 static BOOL ov62_0223D5A4(UnkStruct_0208C06C *param0)
 {
-    UnkStruct_ov62_0223D518 *v0 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_0223D518));
+    UnkStruct_ov62_0223D518 *v0 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_0223D518));
 
     memset(v0, 0, sizeof(UnkStruct_ov62_0223D518));
 
diff --git a/src/overlay062/ov62_0223DFA8.c b/src/overlay062/ov62_0223DFA8.c
index 4ad9ad98f8..149a4b3bf2 100644
--- a/src/overlay062/ov62_0223DFA8.c
+++ b/src/overlay062/ov62_0223DFA8.c
@@ -945,7 +945,7 @@ static void ov62_0223F160(UnkStruct_0208C06C *param0)
 
 static BOOL ov62_0223F19C(UnkStruct_0208C06C *param0)
 {
-    UnkStruct_ov62_0223E01C *v0 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_0223E01C));
+    UnkStruct_ov62_0223E01C *v0 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_0223E01C));
 
     memset(v0, 0, sizeof(UnkStruct_ov62_0223E01C));
 
diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c
index 116e2da2c4..4a710bbfcb 100644
--- a/src/overlay062/ov62_02241204.c
+++ b/src/overlay062/ov62_02241204.c
@@ -1488,7 +1488,7 @@ static void ov62_022427D0(UnkStruct_0208C06C *param0, int param1)
 
         Heap_Free(v0);
 
-        v4->unk_4DC = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_02249380) * v4->unk_4C8.unk_00);
+        v4->unk_4DC = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_02249380) * v4->unk_4C8.unk_00);
         MI_CpuFill8(v4->unk_4DC, 0, sizeof(UnkStruct_ov62_02249380) * v4->unk_4C8.unk_00);
 
         for (v5 = 0; v5 < v4->unk_4C8.unk_00; v5++) {
@@ -2494,7 +2494,7 @@ BOOL (*const Unk_ov62_02249618[])(UnkStruct_0208C06C *) = {
 
 static BOOL ov62_02243DC8(UnkStruct_0208C06C *param0)
 {
-    UnkStruct_ov62_02241204 *v0 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_02241204));
+    UnkStruct_ov62_02241204 *v0 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_02241204));
 
     memset(v0, 0, sizeof(UnkStruct_ov62_02241204));
     param0->unk_860 = v0;
diff --git a/src/overlay062/ov62_02246B00.c b/src/overlay062/ov62_02246B00.c
index 3b6a74eb6d..301e363d58 100644
--- a/src/overlay062/ov62_02246B00.c
+++ b/src/overlay062/ov62_02246B00.c
@@ -27,7 +27,7 @@ UnkStruct_ov62_02246B00 *ov62_02246B00(int heapID, int param1, int param2[], Opt
     int v0;
     UnkStruct_ov62_02246B00 *v1 = NULL;
 
-    v1 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov62_02246B00));
+    v1 = Heap_Alloc(heapID, sizeof(UnkStruct_ov62_02246B00));
     MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov62_02246B00));
     v1->unk_00 = param1;
     v1->unk_18 = Strbuf_Init(param1 + 1, heapID);
diff --git a/src/overlay062/ov62_02247D74.c b/src/overlay062/ov62_02247D74.c
index 972f336188..f8525f6285 100644
--- a/src/overlay062/ov62_02247D74.c
+++ b/src/overlay062/ov62_02247D74.c
@@ -136,7 +136,7 @@ static void ov62_02247F7C(UnkStruct_0208C06C *param0)
 
 static BOOL ov62_02247FA8(UnkStruct_0208C06C *param0)
 {
-    UnkStruct_ov62_02247F7C *v0 = Heap_AllocFromHeap(HEAP_ID_102, sizeof(UnkStruct_ov62_02247F7C));
+    UnkStruct_ov62_02247F7C *v0 = Heap_Alloc(HEAP_ID_102, sizeof(UnkStruct_ov62_02247F7C));
 
     memset(v0, 0, sizeof(UnkStruct_ov62_02247F7C));
     param0->unk_860 = v0;
diff --git a/src/overlay062/ov62_02248408.c b/src/overlay062/ov62_02248408.c
index b025b2f050..ea14f275f4 100644
--- a/src/overlay062/ov62_02248408.c
+++ b/src/overlay062/ov62_02248408.c
@@ -39,7 +39,7 @@ void ov62_02248408(BattleRecording *param0, FieldBattleDTO *param1, int heapID)
     sub_0202F4C0(v1->unk_26, &v2, &v3);
     v6 = Strbuf_Init(v9, heapID);
     v7 = Strbuf_Init(v9, heapID);
-    v8 = Heap_AllocFromHeap(heapID, sizeof(u16) * v9);
+    v8 = Heap_Alloc(heapID, sizeof(u16) * v9);
 
     for (v4 = 0; v4 < v2; v4++) {
         for (v10 = TRAINER_NAME_LEN; v10 > -1; v10--) {
diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c
index 8b0b48b2f8..940998395c 100644
--- a/src/overlay063/ov63_0222AE60.c
+++ b/src/overlay063/ov63_0222AE60.c
@@ -299,7 +299,7 @@ UnkStruct_ov63_0222AE60 *ov63_0222AE60(SpriteList *param0, PaletteData *param1,
     UnkStruct_ov63_0222AE60 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222AE60));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222AE60));
     memset(v0, 0, sizeof(UnkStruct_ov63_0222AE60));
 
     v0->unk_00 = param0;
@@ -320,7 +320,7 @@ UnkStruct_ov63_0222AE60 *ov63_0222AE60(SpriteList *param0, PaletteData *param1,
     }
 
     v0->unk_0C = param2;
-    v0->unk_08 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222BB38) * v0->unk_0C);
+    v0->unk_08 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222BB38) * v0->unk_0C);
     memset(v0->unk_08, 0, sizeof(UnkStruct_ov63_0222BB38) * v0->unk_0C);
 
     return v0;
diff --git a/src/overlay063/ov63_0222BCE8.c b/src/overlay063/ov63_0222BCE8.c
index ddc42f254d..4a8176ec16 100644
--- a/src/overlay063/ov63_0222BCE8.c
+++ b/src/overlay063/ov63_0222BCE8.c
@@ -15,13 +15,13 @@ typedef struct UnkStruct_ov63_0222BCE8_t {
 
 UnkStruct_ov63_0222BCE8 *ov63_0222BCE8(u16 param0, u16 param1, u32 heapID)
 {
-    UnkStruct_ov63_0222BCE8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222BCE8));
+    UnkStruct_ov63_0222BCE8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222BCE8));
     GF_ASSERT(v0);
 
     v0->unk_00 = param0;
     v0->unk_02 = param1;
 
-    v0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(UnkUnion_ov63_0222BDAC) * (v0->unk_00 * v0->unk_02));
+    v0->unk_04 = Heap_Alloc(heapID, sizeof(UnkUnion_ov63_0222BDAC) * (v0->unk_00 * v0->unk_02));
     GF_ASSERT(v0->unk_04);
     memset(v0->unk_04, 0, sizeof(UnkUnion_ov63_0222BDAC) * (v0->unk_00 * v0->unk_02));
 
diff --git a/src/overlay063/ov63_0222BE18.c b/src/overlay063/ov63_0222BE18.c
index 67cd21adf9..620c1ab15a 100644
--- a/src/overlay063/ov63_0222BE18.c
+++ b/src/overlay063/ov63_0222BE18.c
@@ -55,11 +55,11 @@ static BOOL ov63_0222CA14(UnkStruct_ov63_0222BEC0 *param0);
 
 UnkStruct_ov63_0222BE18 *ov63_0222BE18(u32 param0, u32 heapID)
 {
-    UnkStruct_ov63_0222BE18 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222BE18));
+    UnkStruct_ov63_0222BE18 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222BE18));
     GF_ASSERT(v0);
 
     v0->unk_04 = param0;
-    v0->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222BEC0) * v0->unk_04);
+    v0->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222BEC0) * v0->unk_04);
     GF_ASSERT(v0->unk_00);
 
     memset(v0->unk_00, 0, sizeof(UnkStruct_ov63_0222BEC0) * v0->unk_04);
diff --git a/src/overlay063/ov63_0222CCE4.c b/src/overlay063/ov63_0222CCE4.c
index 41b26d9972..f339ea1f3e 100644
--- a/src/overlay063/ov63_0222CCE4.c
+++ b/src/overlay063/ov63_0222CCE4.c
@@ -24,10 +24,10 @@ static void ov63_0222D110(UnkStruct_ov63_0222CE44 *param0, int param1, int param
 
 UnkStruct_ov63_0222CD2C *ov63_0222CCE4(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3, u32 heapID)
 {
-    UnkStruct_ov63_0222CD2C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222CD2C));
+    UnkStruct_ov63_0222CD2C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222CD2C));
     v0->unk_00 = ov63_0222AE60(param0, param1, param2, heapID);
     v0->unk_08 = param2;
-    v0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222CE44) * v0->unk_08);
+    v0->unk_04 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222CE44) * v0->unk_08);
 
     memset(v0->unk_04, 0, sizeof(UnkStruct_ov63_0222CE44) * v0->unk_08);
 
@@ -39,10 +39,10 @@ UnkStruct_ov63_0222CD2C *ov63_0222CCE4(SpriteList *param0, PaletteData *param1,
 
 UnkStruct_ov63_0222CD2C *ov63_0222CD2C(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3, int param4, u32 param5, u32 heapID)
 {
-    UnkStruct_ov63_0222CD2C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222CD2C));
+    UnkStruct_ov63_0222CD2C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222CD2C));
     v0->unk_00 = ov63_0222AE60(param0, param1, param2, heapID);
     v0->unk_08 = param2;
-    v0->unk_04 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222CE44) * v0->unk_08);
+    v0->unk_04 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222CE44) * v0->unk_08);
 
     memset(v0->unk_04, 0, sizeof(UnkStruct_ov63_0222CE44) * v0->unk_08);
 
diff --git a/src/overlay063/ov63_0222D1C0.c b/src/overlay063/ov63_0222D1C0.c
index ac07e407a7..4d87c853c8 100644
--- a/src/overlay063/ov63_0222D1C0.c
+++ b/src/overlay063/ov63_0222D1C0.c
@@ -33,7 +33,7 @@ static const void *ov63_0222D6BC(const u8 *param0, u8 param1, u8 param2, u8 para
 
 UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(G2dRenderer *param0, BgConfig *param1, const UnkStruct_ov65_0223582C *param2, u32 heapID)
 {
-    UnkStruct_ov63_0222D1C0 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222D1C0));
+    UnkStruct_ov63_0222D1C0 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222D1C0));
     memset(v0, 0, sizeof(UnkStruct_ov63_0222D1C0));
 
     v0->unk_00 = param0;
diff --git a/src/overlay063/ov63_0222D77C.c b/src/overlay063/ov63_0222D77C.c
index 1cc8cfc2b4..94a7b76046 100644
--- a/src/overlay063/ov63_0222D77C.c
+++ b/src/overlay063/ov63_0222D77C.c
@@ -24,11 +24,11 @@ typedef struct UnkStruct_ov63_0222D848_t {
 
 UnkStruct_ov63_0222D77C *ov63_0222D77C(u32 param0, u32 heapID)
 {
-    UnkStruct_ov63_0222D77C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222D77C));
+    UnkStruct_ov63_0222D77C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222D77C));
     GF_ASSERT(v0);
 
     v0->unk_04 = param0 + 1;
-    v0->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222CCB8) * v0->unk_04);
+    v0->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222CCB8) * v0->unk_04);
 
     memset(v0->unk_00, 0, sizeof(UnkStruct_ov63_0222CCB8) * v0->unk_04);
 
@@ -69,11 +69,11 @@ BOOL ov63_0222D810(UnkStruct_ov63_0222D77C *param0, UnkStruct_ov63_0222CCB8 *par
 
 UnkStruct_ov63_0222D848 *ov63_0222D848(u32 param0, u32 heapID)
 {
-    UnkStruct_ov63_0222D848 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222D848));
+    UnkStruct_ov63_0222D848 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222D848));
     GF_ASSERT(v0);
 
     v0->unk_04 = param0 + 1;
-    v0->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov63_0222D894) * v0->unk_04);
+    v0->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov63_0222D894) * v0->unk_04);
 
     memset(v0->unk_00, 0, sizeof(UnkStruct_ov63_0222D894) * v0->unk_04);
 
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index 9ed0f90a92..2bc4ec34a4 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -3150,7 +3150,7 @@ static void ov64_02231164(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0
     u32 v1 = sub_0202AD2C(wifiList, param1->unk_08.unk_04[param1->unk_07], 7);
     sub_02076AAC(sub_0205CA14(v0, v1, 1), 2, &v3);
 
-    void *buffer = Heap_AllocFromHeap(heapID, 0xC80);
+    void *buffer = Heap_Alloc(heapID, 0xC80);
     sub_020133D4(v3.narcID, v3.unk_14, heapID, 0, 0, 10, 10, buffer);
     Window_BlitBitmapRect(&param0->unk_0C[0][4], buffer, 0, 0, 80, 80, 4, 4, 80, 80);
     Heap_Free(buffer);
diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c
index b10ea48948..1e8b9450ed 100644
--- a/src/overlay066/ov66_0222DDF0.c
+++ b/src/overlay066/ov66_0222DDF0.c
@@ -413,7 +413,7 @@ static const UnkStruct_ov66_022589B4 Unk_ov66_022589B4[8] = {
 
 UnkStruct_ov66_0222DFF8 *ov66_0222DDF0(SaveData *saveData, u32 heapID)
 {
-    UnkStruct_ov66_0222DFF8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_0222DFF8));
+    UnkStruct_ov66_0222DFF8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_0222DFF8));
     memset(v0, 0, sizeof(UnkStruct_ov66_0222DFF8));
 
     v0->saveData = saveData;
@@ -2521,7 +2521,7 @@ static void ov66_0222FC00(UnkStruct_ov66_0222FBF0 *param0)
 
 static void ov66_0222FC0C(UnkStruct_ov66_0222FBF0 *param0, const UnkStruct_ov66_0222F6C4 *param1, u32 heapID)
 {
-    UnkStruct_ov66_0222E71C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_0222E71C));
+    UnkStruct_ov66_0222E71C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_0222E71C));
 
     MI_CpuCopyFast(&param1->unk_20, v0, sizeof(UnkStruct_ov66_0222E71C));
     MI_CpuCopy8(param1->unk_10, v0->unk_08, sizeof(u16) * (7 + 1));
diff --git a/src/overlay066/ov66_02230C44.c b/src/overlay066/ov66_02230C44.c
index d8e756bd29..dff7b62ee8 100644
--- a/src/overlay066/ov66_02230C44.c
+++ b/src/overlay066/ov66_02230C44.c
@@ -115,7 +115,7 @@ static int ov66_02231404(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4
 
 UnkStruct_ov66_02230C90 *ov66_02230C44(BOOL param0, SaveData *saveData, UnkStruct_ov66_0222DCE0_sub1 *param2, UnkStruct_ov66_0222DFF8 *param3, u32 heapID)
 {
-    UnkStruct_ov66_02230C90 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02230C90));
+    UnkStruct_ov66_02230C90 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_02230C90));
     memset(v0, 0, sizeof(UnkStruct_ov66_02230C90));
 
     v0->unk_3C = param3;
@@ -319,7 +319,7 @@ static void ov66_02230E28(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
 {
     UnkStruct_ov66_02230E68 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02230E68));
+    param1->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_02230E68));
     memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02230E68));
 
     v0 = param1->unk_00;
@@ -401,7 +401,7 @@ static void ov66_02230F1C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
 {
     UnkStruct_ov66_02230F50 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02230F50));
+    param1->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_02230F50));
     memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02230F50));
 
     v0 = param1->unk_00;
@@ -448,7 +448,7 @@ static void ov66_02230FA0(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
 {
     UnkStruct_ov66_02230FA0 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02230FA0));
+    param1->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_02230FA0));
     memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02230FA0));
 
     v0 = param1->unk_00;
@@ -489,7 +489,7 @@ static void ov66_02231024(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
 {
     UnkStruct_ov66_02231024 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02231024));
+    param1->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_02231024));
     memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02231024));
 
     v0 = param1->unk_00;
@@ -533,7 +533,7 @@ static void ov66_0223108C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
 {
     UnkStruct_ov115_02260440 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov115_02260440));
+    param1->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov115_02260440));
     memset(param1->unk_00, 0, sizeof(UnkStruct_ov115_02260440));
 
     v0 = param1->unk_00;
@@ -600,7 +600,7 @@ static void ov66_02231134(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
 {
     UnkStruct_ov66_02231134 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02231134));
+    param1->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_02231134));
     memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02231134));
 
     v0 = param1->unk_00;
@@ -667,7 +667,7 @@ static void ov66_022311D4(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
 {
     UnkStruct_ov117_02260440 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov117_02260440));
+    param1->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov117_02260440));
     memset(param1->unk_00, 0, sizeof(UnkStruct_ov117_02260440));
 
     v0 = param1->unk_00;
@@ -733,7 +733,7 @@ static void ov66_0223127C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
 {
     UnkStruct_ov66_0223127C *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_0223127C));
+    param1->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_0223127C));
     memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_0223127C));
 
     v0 = param1->unk_00;
@@ -798,7 +798,7 @@ static void ov66_02231300(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
 {
     UnkStruct_ov66_02231300 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02231300));
+    param1->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_02231300));
     memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02231300));
 
     v0 = param1->unk_00;
@@ -848,7 +848,7 @@ static void ov66_02231374(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
 {
     UnkStruct_ov66_02231374 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02231374));
+    param1->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_02231374));
     memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02231374));
 
     v0 = param1->unk_00;
@@ -861,7 +861,7 @@ static void ov66_022313AC(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E
 {
     UnkStruct_ov66_02231374 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02231374));
+    param1->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_02231374));
     memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02231374));
 
     v0 = param1->unk_00;
diff --git a/src/overlay066/ov66_0223177C.c b/src/overlay066/ov66_0223177C.c
index 4c26352c76..a179241eb3 100644
--- a/src/overlay066/ov66_0223177C.c
+++ b/src/overlay066/ov66_0223177C.c
@@ -99,7 +99,7 @@ static BOOL ov66_022324D0(enum PlazaMinigame param0, u32 param1);
 
 UnkStruct_ov66_0223177C *ov66_0223177C(u32 heapID)
 {
-    UnkStruct_ov66_0223177C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_0223177C));
+    UnkStruct_ov66_0223177C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_0223177C));
     memset(v0, 0, sizeof(UnkStruct_ov66_0223177C));
 
     ov66_02231D38(&v0->unk_08);
diff --git a/src/overlay066/ov66_022324F0.c b/src/overlay066/ov66_022324F0.c
index 579f902b2b..db024d7e8f 100644
--- a/src/overlay066/ov66_022324F0.c
+++ b/src/overlay066/ov66_022324F0.c
@@ -157,7 +157,7 @@ void ov66_022324F0(u32 heapID, SaveData *saveData, u32 param2, const UnkStruct_o
     GF_ASSERT(Unk_ov66_0225B6C0 == NULL);
     GF_ASSERT(param2 < PPW_LOBBY_MAX_BINARY_SIZE);
 
-    Unk_ov66_0225B6C0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_022336C4));
+    Unk_ov66_0225B6C0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_022336C4));
     memset(Unk_ov66_0225B6C0, 0, sizeof(UnkStruct_ov66_022336C4));
 
     Unk_ov66_0225B6C0->saveData = saveData;
@@ -1196,7 +1196,7 @@ static BOOL ov66_022336C4(UnkStruct_ov66_022336C4 *param0)
 
 static void ov66_02233758(UnkStruct_ov66_022336C4 *param0, u32 param1, u32 heapID)
 {
-    Unk_ov66_0225B6C0->unk_24 = Heap_AllocFromHeap(heapID, param1 * PPW_LOBBY_MAX_PLAYER_NUM_MAIN);
+    Unk_ov66_0225B6C0->unk_24 = Heap_Alloc(heapID, param1 * PPW_LOBBY_MAX_PLAYER_NUM_MAIN);
     memset(Unk_ov66_0225B6C0->unk_24, 0, param1 * PPW_LOBBY_MAX_PLAYER_NUM_MAIN);
     Unk_ov66_0225B6C0->unk_28 = param1;
 }
@@ -1300,7 +1300,7 @@ static void ov66_022338C8(UnkStruct_ov66_022336C4 *param0, u32 param1, u32 param
         }
 
         param0->unk_11C[v0].unk_00 = 0;
-        param0->unk_11C[v0].unk_04 = Heap_AllocFromHeap(heapID, sizeof(s32) * v1);
+        param0->unk_11C[v0].unk_04 = Heap_Alloc(heapID, sizeof(s32) * v1);
         param0->unk_11C[v0].unk_02 = v1;
 
         ov66_02233950(param0, v0);
@@ -1879,7 +1879,7 @@ static u32 ov66_022342CC(const PPW_LobbySchedule *param0, PPW_LOBBY_TIME_EVENT p
 
 static void ov66_022342F4(UnkStruct_ov66_022342F4 *param0, u32 param1, u32 heapID)
 {
-    param0->unk_00 = Heap_AllocFromHeap(heapID, sizeof(PPW_LobbyVipRecord) * param1);
+    param0->unk_00 = Heap_Alloc(heapID, sizeof(PPW_LobbyVipRecord) * param1);
     param0->unk_04 = param1;
     param0->unk_06 = 0;
 }
diff --git a/src/overlay066/ov66_022343A8.c b/src/overlay066/ov66_022343A8.c
index 68ebed3e28..d6533b4545 100644
--- a/src/overlay066/ov66_022343A8.c
+++ b/src/overlay066/ov66_022343A8.c
@@ -143,13 +143,13 @@ static const UnkStruct_ov66_02258B38 Unk_ov66_02258B38[20] = {
 
 UnkStruct_ov66_02234548 *ov66_022343A8(u32 param0, u32 param1, u32 heapID, u32 heapID2)
 {
-    UnkStruct_ov66_02234548 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02234548));
+    UnkStruct_ov66_02234548 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_02234548));
     memset(v0, 0, sizeof(UnkStruct_ov66_02234548));
 
     {
         int v1;
 
-        v0->unk_10 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02234798) * param0);
+        v0->unk_10 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_02234798) * param0);
         v0->unk_14 = param0;
 
         for (v1 = 0; v1 < v0->unk_14; v1++) {
diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c
index d91911a9db..fe1aaba442 100644
--- a/src/overlay069/ov69_0225C700.c
+++ b/src/overlay069/ov69_0225C700.c
@@ -307,7 +307,7 @@ static u32 ov69_0225DA1C(const UnkStruct_ov69_0225CA7C *param0, int param1);
 static u32 ov69_0225DA38(const UnkStruct_ov69_0225CA7C *param0, int param1);
 static u32 ov69_0225DA54(const UnkStruct_ov69_0225CA7C *param0, int param1);
 static u32 ov69_0225DA70(const UnkStruct_ov69_0225CA7C *param0);
-static void ov69_0225DA74(UnkStruct_ov69_0225DAEC *param0, UnkStruct_ov69_0225DA74 param1, enum HeapId param2);
+static void ov69_0225DA74(UnkStruct_ov69_0225DAEC *param0, UnkStruct_ov69_0225DA74 param1, enum HeapID param2);
 static void ov69_0225DAEC(UnkStruct_ov69_0225DAEC *param0);
 static void ov69_0225DAF8(const UnkStruct_ov69_0225DAEC *param0);
 static void ov69_0225DB00(UnkStruct_ov69_0225DAEC *param0);
@@ -1702,7 +1702,7 @@ static u32 ov69_0225DA70(const UnkStruct_ov69_0225CA7C *param0)
     return param0->unk_00.unk_00;
 }
 
-static void ov69_0225DA74(UnkStruct_ov69_0225DAEC *param0, UnkStruct_ov69_0225DA74 param1, enum HeapId heapID)
+static void ov69_0225DA74(UnkStruct_ov69_0225DAEC *param0, UnkStruct_ov69_0225DA74 param1, enum HeapID heapID)
 {
     param0->camera = Camera_Alloc(heapID);
 
diff --git a/src/overlay070/ov70_0225C700.c b/src/overlay070/ov70_0225C700.c
index 74ab419325..e0718da180 100644
--- a/src/overlay070/ov70_0225C700.c
+++ b/src/overlay070/ov70_0225C700.c
@@ -49,7 +49,7 @@ void ov70_0225C730(void **param0, NARC *param1, u32 param2, u32 heapID)
 
     {
         v0 = Utility_GetStrippedTextureResourceSize(v1);
-        *param0 = Heap_AllocFromHeap(heapID, v0);
+        *param0 = Heap_Alloc(heapID, v0);
         memcpy(*param0, v1, v0);
     }
 
diff --git a/src/overlay070/ov70_0225C858.c b/src/overlay070/ov70_0225C858.c
index 3bc2fc34fb..52a483e705 100644
--- a/src/overlay070/ov70_0225C858.c
+++ b/src/overlay070/ov70_0225C858.c
@@ -15,12 +15,12 @@ typedef struct UnkStruct_ov70_0225C894_t {
     UnkStruct_ov63_0222BCE8 *unk_00;
 } UnkStruct_ov70_0225C894;
 
-UnkStruct_ov70_0225C894 *ov70_0225C858(enum HeapId heapID)
+UnkStruct_ov70_0225C894 *ov70_0225C858(enum HeapID heapID)
 {
     UnkStruct_ov70_0225C894 *v0;
     void *v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_0225C894));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_0225C894));
     v0->unk_00 = ov63_0222BCE8(35, 42, heapID);
 
     v1 = LoadMemberFromNARC(NARC_INDEX_APPLICATION__WIFI_LOBBY__MAP_CONV__WFLBY_MAP, 0, 0, heapID, 1);
diff --git a/src/overlay070/ov70_0225C9B4.c b/src/overlay070/ov70_0225C9B4.c
index 95db97ee88..4b063b874b 100644
--- a/src/overlay070/ov70_0225C9B4.c
+++ b/src/overlay070/ov70_0225C9B4.c
@@ -176,14 +176,14 @@ static const u32 Unk_ov70_0226D518[6] = {
 
 UnkStruct_ov70_0225CA20 *ov70_0225C9B4(u32 param0, u32 param1, const UnkStruct_ov70_0225C894 *param2, u32 heapID, u32 heapID2)
 {
-    UnkStruct_ov70_0225CA20 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_0225CA20));
+    UnkStruct_ov70_0225CA20 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_0225CA20));
     memset(v0, 0, sizeof(UnkStruct_ov70_0225CA20));
 
     v0->unk_00 = ov63_0222BE18(param0, heapID);
     v0->unk_04 = ov66_022343A8(param0, param1, heapID, heapID2);
     v0->unk_10 = ov63_0222D848(32, heapID);
     v0->unk_0C = param0;
-    v0->unk_08 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_0225CC54) * param0);
+    v0->unk_08 = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_0225CC54) * param0);
 
     memset(v0->unk_08, 0, sizeof(UnkStruct_ov70_0225CC54) * param0);
 
diff --git a/src/overlay070/ov70_02260A70.c b/src/overlay070/ov70_02260A70.c
index 0961a3b404..87d67c0941 100644
--- a/src/overlay070/ov70_02260A70.c
+++ b/src/overlay070/ov70_02260A70.c
@@ -26,7 +26,7 @@ UnkStruct_ov70_02260AD4 *ov70_02260A70(u32 heapID)
     UnkStruct_ov70_02260AD4 *v0;
     VecFx32 v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_02260AD4));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_02260AD4));
     memset(v0, 0, sizeof(UnkStruct_ov70_02260AD4));
     v0->camera = Camera_Alloc(heapID);
 
diff --git a/src/overlay070/ov70_02260B44.c b/src/overlay070/ov70_02260B44.c
index 25eaa38821..d71b307d3a 100644
--- a/src/overlay070/ov70_02260B44.c
+++ b/src/overlay070/ov70_02260B44.c
@@ -89,7 +89,7 @@ typedef struct UnkStruct_ov70_02260BB8_t {
     NNSFndAllocator unk_494;
 } UnkStruct_ov70_02260BB8;
 
-static UnkStruct_ov70_02261418 *ov70_022613F4(int param0, int param1, enum HeapId heapID);
+static UnkStruct_ov70_02261418 *ov70_022613F4(int param0, int param1, enum HeapID heapID);
 static void ov70_02261418(UnkStruct_ov70_02261418 *param0);
 static void ov70_0226146C(Easy3DModel *param0);
 static void ov70_02261474(fx32 *param0, const Easy3DAnim *param1, fx32 param2);
@@ -115,11 +115,11 @@ static void ov70_02261C60(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610
 
 UnkStruct_ov70_02260BB8 *ov70_02260B44(u32 param0, u32 param1, u32 heapID, u32 heapID2)
 {
-    UnkStruct_ov70_02260BB8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_02260BB8));
+    UnkStruct_ov70_02260BB8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_02260BB8));
     memset(v0, 0, sizeof(UnkStruct_ov70_02260BB8));
 
-    v0->unk_11C = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_02260E8C) * param0);
-    v0->unk_120 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_022610B8) * param1);
+    v0->unk_11C = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_02260E8C) * param0);
+    v0->unk_120 = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_022610B8) * param1);
 
     memset(v0->unk_11C, 0, sizeof(UnkStruct_ov70_02260E8C) * param0);
     memset(v0->unk_120, 0, sizeof(UnkStruct_ov70_022610B8) * param1);
@@ -197,7 +197,7 @@ void ov70_02260CE4(UnkStruct_ov70_02260BB8 *param0, int param1, int param2, u32
     v1 = ov70_022613F4(param1, param2, heapID);
     v0 = NARC_ctor(NARC_INDEX_GRAPHIC__WIFI_LOBBY, heapID);
 
-    Heap_FndInitAllocatorForExpHeap(&param0->unk_494, heapID2, 4);
+    HeapExp_FndInitAllocator(&param0->unk_494, heapID2, 4);
 
     ov70_022614F4(&param0->unk_12C, v0, v1, heapID2, &param0->unk_494);
     ov70_02261B24(&param0->unk_29C, v0, &param0->unk_494, v1, heapID2);
@@ -556,7 +556,7 @@ void ov70_022613E8(UnkStruct_ov70_022610B8 *param0, fx32 param1, fx32 param2, fx
     Easy3DObject_SetScale(&param0->unk_04, param1, param2, param3);
 }
 
-static UnkStruct_ov70_02261418 *ov70_022613F4(int param0, int param1, enum HeapId heapID)
+static UnkStruct_ov70_02261418 *ov70_022613F4(int param0, int param1, enum HeapID heapID)
 {
     void *v0;
     u32 v1 = (param1 * 5) + param0;
diff --git a/src/overlay070/ov70_02261E10.c b/src/overlay070/ov70_02261E10.c
index 0d2c30f338..23ecafe9bc 100644
--- a/src/overlay070/ov70_02261E10.c
+++ b/src/overlay070/ov70_02261E10.c
@@ -146,7 +146,7 @@ UnkStruct_ov70_02261E10 *ov70_02261E10(int param0, int param1, const UnkStruct_o
     UnkStruct_ov70_02261E10 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_02261E10));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_02261E10));
     memset(v0, 0, sizeof(UnkStruct_ov70_02261E10));
 
     v0->unk_00 = param2;
diff --git a/src/overlay070/ov70_02262DA8.c b/src/overlay070/ov70_02262DA8.c
index 0be00a61ca..786123e77f 100644
--- a/src/overlay070/ov70_02262DA8.c
+++ b/src/overlay070/ov70_02262DA8.c
@@ -46,7 +46,7 @@ static void ov70_02263098(UnkStruct_ov70_0226308C *param0);
 
 UnkStruct_ov70_022630A4 *ov70_02262DA8(UnkStruct_ov70_0225DEE8 *param0, u32 heapID)
 {
-    UnkStruct_ov70_022630A4 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_022630A4));
+    UnkStruct_ov70_022630A4 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_022630A4));
     memset(v0, 0, sizeof(UnkStruct_ov70_022630A4));
 
     v0->unk_00 = heapID;
@@ -98,7 +98,7 @@ void *ov70_02262E3C(UnkStruct_ov70_02263344 *param0, u32 param1)
 {
     GF_ASSERT(param0->unk_04.unk_04 == NULL);
 
-    param0->unk_04.unk_04 = Heap_AllocFromHeap(param0->heapID, param1);
+    param0->unk_04.unk_04 = Heap_Alloc(param0->heapID, param1);
     memset(param0->unk_04.unk_04, 0, param1);
 
     return param0->unk_04.unk_04;
diff --git a/src/overlay070/ov70_02269190.c b/src/overlay070/ov70_02269190.c
index 8eaf47f636..9c50477e55 100644
--- a/src/overlay070/ov70_02269190.c
+++ b/src/overlay070/ov70_02269190.c
@@ -627,7 +627,7 @@ static const UnkStruct_ov70_0226E5A4 Unk_ov70_0226E5A4[39] = {
 
 UnkStruct_ov70_02269204 *ov70_02269190(UnkStruct_ov66_0222DFF8 *param0, UnkStruct_ov70_0225C894 *param1, UnkStruct_ov70_02260AD4 *param2, UnkStruct_ov70_0225CA20 *param3, u32 heapID, u32 heapID2)
 {
-    UnkStruct_ov70_02269204 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_02269204));
+    UnkStruct_ov70_02269204 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_02269204));
     memset(v0, 0, sizeof(UnkStruct_ov70_02269204));
 
     v0->unk_00 = param0;
@@ -640,7 +640,7 @@ UnkStruct_ov70_02269204 *ov70_02269190(UnkStruct_ov66_0222DFF8 *param0, UnkStruc
 
         v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WIFI_LOBBY_OTHER, heapID);
 
-        Heap_FndInitAllocatorForExpHeap(&v0->unk_1081C, heapID2, 4);
+        HeapExp_FndInitAllocator(&v0->unk_1081C, heapID2, 4);
 
         ov70_02269540(v0, v1, heapID2);
         ov70_022695E0(v0, v1, heapID2);
diff --git a/src/overlay070/ov70_0226C338.c b/src/overlay070/ov70_0226C338.c
index ee1d26ef90..0b8fd84684 100644
--- a/src/overlay070/ov70_0226C338.c
+++ b/src/overlay070/ov70_0226C338.c
@@ -99,7 +99,7 @@ UnkStruct_ov70_0226C39C *ov70_0226C338(u32 heapID, int param1, int param2, int p
     UnkStruct_ov70_0226C39C *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_0226C39C));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_0226C39C));
     memset(v0, 0, sizeof(UnkStruct_ov70_0226C39C));
 
     ov70_0226C568(&v0->unk_00, &Unk_ov70_0226E678[param1]);
diff --git a/src/overlay070/ov70_0226C60C.c b/src/overlay070/ov70_0226C60C.c
index 6a4217d721..f06568f7d5 100644
--- a/src/overlay070/ov70_0226C60C.c
+++ b/src/overlay070/ov70_0226C60C.c
@@ -42,7 +42,7 @@ UnkStruct_ov70_0226C6F8 *ov70_0226C60C(u32 heapID, UnkStruct_ov70_0225DEE8 *para
     u32 v1, v2, v3;
     u32 v4, v5, v6, v7, v8, v9;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_0226C6F8));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_0226C6F8));
     memset(v0, 0, sizeof(UnkStruct_ov70_0226C6F8));
 
     v0->unk_00 = param1;
diff --git a/src/overlay070/ov70_0226C8B4.c b/src/overlay070/ov70_0226C8B4.c
index 3d7033733c..1ec391bec4 100644
--- a/src/overlay070/ov70_0226C8B4.c
+++ b/src/overlay070/ov70_0226C8B4.c
@@ -137,7 +137,7 @@ UnkStruct_ov70_0226C914 *ov70_0226C8B4(const UnkStruct_ov66_0222DFF8 *param0, Un
     UnkStruct_ov70_0226C914 *v0;
     u32 v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_0226C914));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_0226C914));
     memset(v0, 0, sizeof(UnkStruct_ov70_0226C914));
 
     v0->unk_00 = param0;
diff --git a/src/overlay070/ov70_0226CE54.c b/src/overlay070/ov70_0226CE54.c
index 0a59c5922e..49b86a9cea 100644
--- a/src/overlay070/ov70_0226CE54.c
+++ b/src/overlay070/ov70_0226CE54.c
@@ -122,7 +122,7 @@ UnkStruct_ov70_0226CF38 *ov70_0226CE54(UnkStruct_ov70_0225DEE8 *param0, u32 heap
         61,
     };
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov70_0226CF38));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov70_0226CF38));
     memset(v0, 0, sizeof(UnkStruct_ov70_0226CF38));
 
     v0->unk_00 = param0;
diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c
index 6c6811f73a..523b562212 100644
--- a/src/overlay075/ov75_021D0D80.c
+++ b/src/overlay075/ov75_021D0D80.c
@@ -692,7 +692,7 @@ static void ov75_021D1598(UnkStruct_ov75_021D1184 *param0)
     LoadMessageBoxGraphics(param0->unk_18, BG_LAYER_MAIN_0, 1 + 9, UnkEnum_ov75_021D1598_06, param0->unk_0A, param0->heapID);
 
     v1 = NARC_GetMemberSize(v5, v6);
-    v2 = Heap_AllocFromHeapAtEnd(param0->heapID, v1);
+    v2 = Heap_AllocAtEnd(param0->heapID, v1);
     NARC_ReadWholeMember(v5, v6, (void *)v2);
 
     NNS_G2dGetUnpackedCharacterData(v2, &v3);
@@ -701,7 +701,7 @@ static void ov75_021D1598(UnkStruct_ov75_021D1184 *param0)
     Heap_Free(v2);
 
     v1 = NARC_GetMemberSize(v5, v8);
-    v2 = Heap_AllocFromHeapAtEnd(param0->heapID, v1);
+    v2 = Heap_AllocAtEnd(param0->heapID, v1);
     NARC_ReadWholeMember(v5, v8, (void *)v2);
 
     NNS_G2dGetUnpackedPaletteData(v2, &v4);
@@ -729,12 +729,12 @@ static void ov75_021D1598(UnkStruct_ov75_021D1184 *param0)
     Heap_Free(v2);
 
     v1 = NARC_GetMemberSize(v5, v7);
-    param0->unk_34 = Heap_AllocFromHeap(param0->heapID, v1);
+    param0->unk_34 = Heap_Alloc(param0->heapID, v1);
     NARC_ReadWholeMember(v5, v7, (void *)param0->unk_34);
     NNS_G2dGetUnpackedScreenData(param0->unk_34, &(param0->unk_3C));
 
     v1 = NARC_GetMemberSize(v5, 36);
-    param0->unk_38 = Heap_AllocFromHeap(param0->heapID, v1);
+    param0->unk_38 = Heap_Alloc(param0->heapID, v1);
     NARC_ReadWholeMember(v5, 36, (void *)param0->unk_38);
     NNS_G2dGetUnpackedScreenData(param0->unk_38, &(param0->unk_40));
 
diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c
index efa4161f40..0248252880 100644
--- a/src/overlay076/ov76_0223B870.c
+++ b/src/overlay076/ov76_0223B870.c
@@ -331,7 +331,7 @@ static void ov76_0223BCA0(SysTask *param0, void *param1)
 
 void ov76_0223BD30(UnkStruct_ov76_0223DE00 *param0, s8 param1, int param2)
 {
-    UnkStruct_ov76_0223BCA0 *v0 = Heap_AllocFromHeap(HEAP_ID_53, sizeof(UnkStruct_ov76_0223BCA0));
+    UnkStruct_ov76_0223BCA0 *v0 = Heap_Alloc(HEAP_ID_53, sizeof(UnkStruct_ov76_0223BCA0));
     v0->unk_164 = param0->unk_D4.unk_10;
 
     {
diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c
index 41033e30f5..3a8b926545 100644
--- a/src/overlay076/ov76_0223D338.c
+++ b/src/overlay076/ov76_0223D338.c
@@ -496,7 +496,7 @@ static void ov76_0223D9AC(SysTask *param0, void *param1)
 
 static void ov76_0223DA00(ManagedSprite *param0, FontOAM *param1)
 {
-    UnkStruct_ov76_0223D9AC *v0 = Heap_AllocFromHeap(HEAP_ID_53, sizeof(UnkStruct_ov76_0223D9AC));
+    UnkStruct_ov76_0223D9AC *v0 = Heap_Alloc(HEAP_ID_53, sizeof(UnkStruct_ov76_0223D9AC));
 
     v0->unk_00 = 1;
     v0->unk_04 = param0;
diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c
index c3b703cbc9..e5b74942d9 100644
--- a/src/overlay080/ov80_021D1458.c
+++ b/src/overlay080/ov80_021D1458.c
@@ -132,7 +132,7 @@ int ov80_021D1458(UnkStruct_ov80_021D2A08 *param0)
 {
     UnkStruct_ov80_021D1478 *v0;
 
-    param0->unk_34 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov80_021D1478));
+    param0->unk_34 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_ov80_021D1478));
     v0 = (UnkStruct_ov80_021D1478 *)param0->unk_34;
 
     memset(v0, 0, sizeof(UnkStruct_ov80_021D1478));
diff --git a/src/overlay080/ov80_021D2AF4.c b/src/overlay080/ov80_021D2AF4.c
index 3a17a52a09..4a46b31c2b 100644
--- a/src/overlay080/ov80_021D2AF4.c
+++ b/src/overlay080/ov80_021D2AF4.c
@@ -46,11 +46,11 @@ UnkStruct_ov80_021D2C1C *ov80_021D2AF4(SpriteSystem *param0, SpriteManager *para
         4, 0, 0, 0, 0, 10, 5, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 0, 0, 0
     };
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov80_021D2C1C));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov80_021D2C1C));
     memset(v0, 0, sizeof(UnkStruct_ov80_021D2C1C));
 
     v0->unk_00 = param3;
-    v0->unk_08 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov80_021D2C5C) * v0->unk_00);
+    v0->unk_08 = Heap_Alloc(heapID, sizeof(UnkStruct_ov80_021D2C5C) * v0->unk_00);
     memset(v0->unk_08, 0, sizeof(UnkStruct_ov80_021D2C5C) * v0->unk_00);
 
     v2 = Unk_ov80_021D31D8;
@@ -208,10 +208,10 @@ UnkStruct_ov80_021D2E10 *ov80_021D2D70(const char *param0, int heapID)
     v1 = FS_ReadFile(&v0, &v3, 4);
     GF_ASSERT(v1 >= 0);
 
-    v4 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov80_021D2E10));
+    v4 = Heap_Alloc(heapID, sizeof(UnkStruct_ov80_021D2E10));
     memset(v4, 0, sizeof(UnkStruct_ov80_021D2E10));
 
-    v4->unk_04 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov80_021D2AF4) * v3);
+    v4->unk_04 = Heap_Alloc(heapID, sizeof(UnkStruct_ov80_021D2AF4) * v3);
     memset(v4->unk_04, 0, sizeof(UnkStruct_ov80_021D2AF4) * v3);
 
     v4->unk_00 = v3;
diff --git a/src/overlay083/ov83_0223D4CC.c b/src/overlay083/ov83_0223D4CC.c
index dfb5a9a0c0..cae143f669 100644
--- a/src/overlay083/ov83_0223D4CC.c
+++ b/src/overlay083/ov83_0223D4CC.c
@@ -41,7 +41,7 @@ static BOOL ov83_0223D638(UnkStruct_ov83_0223D584 *param0, int param1, const voi
 
 UnkStruct_ov83_0223D4CC *ov83_0223D4CC(const CommCmdTable *param0, int param1, void *param2, int param3, int heapID)
 {
-    UnkStruct_ov83_0223D4CC *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov83_0223D4CC));
+    UnkStruct_ov83_0223D4CC *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov83_0223D4CC));
     v0->unk_00 = param3;
     v0->unk_04 = NULL;
 
@@ -99,7 +99,7 @@ int ov83_0223D570(UnkStruct_ov83_0223D4CC *param0)
 
 static UnkStruct_ov83_0223D584 *ov83_0223D584(const CommCmdTable *param0, int param1, void *param2, int heapID)
 {
-    UnkStruct_ov83_0223D584 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov83_0223D584));
+    UnkStruct_ov83_0223D584 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov83_0223D584));
     memset(v0, 0, sizeof(UnkStruct_ov83_0223D584));
 
     v0->unk_190 = param0;
diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c
index 340e868a39..baffb13b20 100644
--- a/src/overlay085/ov85_02241440.c
+++ b/src/overlay085/ov85_02241440.c
@@ -420,7 +420,7 @@ static void ov85_02241718(UnkStruct_ov85_022417E4 *param0, NARC *param1)
         u16 *v0;
         u32 v1;
 
-        v0 = (u16 *)Heap_AllocFromHeap(HEAP_ID_36, 8 * 8 * 2);
+        v0 = (u16 *)Heap_Alloc(HEAP_ID_36, 8 * 8 * 2);
 
         for (v1 = 0; v1 < 8 * 8; v1++) {
             v0[v1] = (3 << 12) + 1 + v1;
diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c
index dfd322203d..3866c0166c 100644
--- a/src/overlay086/ov86_0223B140.c
+++ b/src/overlay086/ov86_0223B140.c
@@ -917,7 +917,7 @@ static void ov86_0223BDE0(UnkStruct_ov86_0223B3C8 *param0, int param1, int param
     UnkStruct_ov86_0223BDE0 *v1;
     int v2;
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_63, sizeof(UnkStruct_ov86_0223BDE0));
+    v1 = Heap_Alloc(HEAP_ID_63, sizeof(UnkStruct_ov86_0223BDE0));
     v2 = param1 & 1;
 
     ov86_0223BDC4(&v1->unk_00, v1, &(param0->unk_1C34[param2]));
@@ -947,7 +947,7 @@ static void ov86_0223BE6C(SysTask *param0, void *param1)
 
 static void ov86_0223BEA0(UnkStruct_ov86_0223B3C8 *param0, int param1)
 {
-    UnkStruct_ov86_0223BEA0 *v0 = Heap_AllocFromHeap(HEAP_ID_63, sizeof(UnkStruct_ov86_0223BEA0));
+    UnkStruct_ov86_0223BEA0 *v0 = Heap_Alloc(HEAP_ID_63, sizeof(UnkStruct_ov86_0223BEA0));
     ov86_0223BDC4(&v0->unk_00, v0, &(param0->unk_1C34[param1]));
 
     v0->unk_08 = param0->unk_1CC;
@@ -1105,7 +1105,7 @@ static void ov86_0223C104(UnkStruct_ov86_0223B3C8 *param0, int param1, int param
     };
     UnkStruct_ov86_0223BF44 *v1;
     int v2 = param1 & 1;
-    v1 = Heap_AllocFromHeap(HEAP_ID_63, sizeof(UnkStruct_ov86_0223BF44));
+    v1 = Heap_Alloc(HEAP_ID_63, sizeof(UnkStruct_ov86_0223BF44));
 
     ov86_0223BDC4(&v1->unk_00, v1, &(param0->unk_1C34[param2]));
     ov86_0223D264(&v1->unk_08, v0[v2].unk_00, v0[v2].unk_04, 28);
@@ -1121,7 +1121,7 @@ static void ov86_0223C158(UnkStruct_ov86_0223B3C8 *param0, int param1, int param
     };
     UnkStruct_ov86_0223BFAC *v1;
     int v2 = param1 & 1;
-    v1 = Heap_AllocFromHeap(HEAP_ID_63, sizeof(UnkStruct_ov86_0223BFAC));
+    v1 = Heap_Alloc(HEAP_ID_63, sizeof(UnkStruct_ov86_0223BFAC));
 
     ov86_0223BDC4(&v1->unk_00, v1, &(param0->unk_1C34[param2]));
     ov86_0223D264(&v1->unk_08, FX32_CONST(32), FX32_CONST(-160), 28);
@@ -1135,7 +1135,7 @@ static void ov86_0223C158(UnkStruct_ov86_0223B3C8 *param0, int param1, int param
 
 static void ov86_0223C1B8(UnkStruct_ov86_0223B3C8 *param0, int param1)
 {
-    UnkStruct_ov86_0223BFAC *v0 = Heap_AllocFromHeap(HEAP_ID_63, sizeof(UnkStruct_ov86_0223BFAC));
+    UnkStruct_ov86_0223BFAC *v0 = Heap_Alloc(HEAP_ID_63, sizeof(UnkStruct_ov86_0223BFAC));
 
     ov86_0223BDC4(&v0->unk_00, v0, &(param0->unk_1C34[param1]));
     ov86_0223D264(&v0->unk_08, FX32_CONST(-144), FX32_CONST(24), 28);
@@ -1149,7 +1149,7 @@ static void ov86_0223C1B8(UnkStruct_ov86_0223B3C8 *param0, int param1)
 
 static void ov86_0223C20C(UnkStruct_ov86_0223B3C8 *param0, int param1)
 {
-    UnkStruct_ov86_0223C01C *v0 = Heap_AllocFromHeap(HEAP_ID_63, sizeof(UnkStruct_ov86_0223C01C));
+    UnkStruct_ov86_0223C01C *v0 = Heap_Alloc(HEAP_ID_63, sizeof(UnkStruct_ov86_0223C01C));
 
     ov86_0223BDC4(&v0->unk_00, v0, &(param0->unk_1C34[param1]));
     ov86_0223D264(&v0->unk_08, FX32_CONST(88), 0, 12);
@@ -1163,7 +1163,7 @@ static void ov86_0223C20C(UnkStruct_ov86_0223B3C8 *param0, int param1)
 
 static void ov86_0223C26C(UnkStruct_ov86_0223B3C8 *param0, int param1)
 {
-    UnkStruct_ov86_0223C090 *v0 = Heap_AllocFromHeap(HEAP_ID_63, sizeof(UnkStruct_ov86_0223C090));
+    UnkStruct_ov86_0223C090 *v0 = Heap_Alloc(HEAP_ID_63, sizeof(UnkStruct_ov86_0223C090));
 
     ov86_0223BDC4(&v0->unk_00, v0, &(param0->unk_1C34[param1]));
     ov86_0223D264(&v0->unk_08, FX32_CONST(24), FX32_CONST(96), 24);
@@ -1180,7 +1180,7 @@ static void ov86_0223C2CC(UnkStruct_ov86_0223B3C8 *param0, int param1, BOOL para
     UnkStruct_ov86_0223C2CC *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_63, sizeof(UnkStruct_ov86_0223C2CC));
+    v0 = Heap_Alloc(HEAP_ID_63, sizeof(UnkStruct_ov86_0223C2CC));
     ov86_0223BDC4(&v0->unk_00, v0, &(param0->unk_1C34[param3]));
 
     v0->unk_08 = param0->unk_1B4[param1];
@@ -1225,7 +1225,7 @@ static void ov86_0223C3E4(UnkStruct_ov86_0223B3C8 *param0, int param1, int param
     UnkStruct_ov86_0223C3E4 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_63, sizeof(UnkStruct_ov86_0223C3E4));
+    v0 = Heap_Alloc(HEAP_ID_63, sizeof(UnkStruct_ov86_0223C3E4));
     ov86_0223BDC4(&v0->unk_00, v0, &(param0->unk_1C34[param2]));
 
     v0->unk_08 = param0;
@@ -1341,7 +1341,7 @@ static void ov86_0223C664(UnkStruct_ov86_0223B3C8 *param0, int param1)
     UnkStruct_ov86_0223C664 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_63, sizeof(UnkStruct_ov86_0223C664));
+    v0 = Heap_Alloc(HEAP_ID_63, sizeof(UnkStruct_ov86_0223C664));
 
     ov86_0223BDC4(&v0->unk_00, v0, &(param0->unk_1C34[param1]));
 
@@ -1424,7 +1424,7 @@ static void ov86_0223C840(UnkStruct_ov86_0223B3C8 *param0, int param1)
     UnkStruct_ov86_0223C840 *v2;
     int v3;
 
-    v2 = Heap_AllocFromHeap(HEAP_ID_63, sizeof(UnkStruct_ov86_0223C840));
+    v2 = Heap_Alloc(HEAP_ID_63, sizeof(UnkStruct_ov86_0223C840));
 
     ov86_0223BDC4(&v2->unk_00, v2, &(param0->unk_1C34[param1]));
 
@@ -1480,7 +1480,7 @@ static BOOL Unk_ov86_0223D540 = 1;
 
 static SysTask *ov86_0223C9B0(UnkStruct_ov86_0223B3C8 *param0)
 {
-    UnkStruct_ov86_0223C9B0 *v0 = Heap_AllocFromHeap(HEAP_ID_63, sizeof(UnkStruct_ov86_0223C9B0));
+    UnkStruct_ov86_0223C9B0 *v0 = Heap_Alloc(HEAP_ID_63, sizeof(UnkStruct_ov86_0223C9B0));
 
     if (v0) {
         SysTask *v1;
@@ -1555,7 +1555,7 @@ static SysTask *ov86_0223CAE4(UnkStruct_ov86_0223C9B0 *param0, fx16 param1, fx32
         0xb00,
         0xa00
     };
-    UnkStruct_ov86_0223CAE4 *v2 = Heap_AllocFromHeap(HEAP_ID_63, sizeof(UnkStruct_ov86_0223CAE4));
+    UnkStruct_ov86_0223CAE4 *v2 = Heap_Alloc(HEAP_ID_63, sizeof(UnkStruct_ov86_0223CAE4));
 
     if (v2) {
         v2->unk_00 = &(param0->unk_00);
@@ -1682,7 +1682,7 @@ static SysTask *ov86_0223CD94(UnkStruct_ov86_0223B3C8 *param0)
     int v3, v4, v5, v6;
     s16 v7, v8, v9;
 
-    v2 = Heap_AllocFromHeap(HEAP_ID_63, sizeof(UnkStruct_ov86_0223CD94));
+    v2 = Heap_Alloc(HEAP_ID_63, sizeof(UnkStruct_ov86_0223CD94));
     v5 = LCRNG_Next();
 
     LCRNG_SetSeed(13716);
diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c
index 9d9736f818..ba7aace59d 100644
--- a/src/overlay087/ov87_021D106C.c
+++ b/src/overlay087/ov87_021D106C.c
@@ -83,7 +83,7 @@ static BOOL (*Unk_ov87_021D1BA0[])(UnkStruct_ov87_021D106C *, int *) = {
 
 UnkStruct_ov87_021D106C *ov87_021D106C(UnkStruct_ov87_021D0D80 *param0, const UnkStruct_ov87_021D12C0 *param1)
 {
-    UnkStruct_ov87_021D106C *v0 = Heap_AllocFromHeap(HEAP_ID_61, sizeof(UnkStruct_ov87_021D106C));
+    UnkStruct_ov87_021D106C *v0 = Heap_Alloc(HEAP_ID_61, sizeof(UnkStruct_ov87_021D106C));
 
     if (v0) {
         v0->unk_00 = param0;
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index c446279321..23460ad4f8 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -1130,7 +1130,7 @@ static void ov88_0223C370(UnkStruct_02095E80 *param0, ApplicationManager *appMan
     param0->unk_2270 = v0->unk_08;
     param0->unk_227C = v0->unk_0C;
     param0->saveData = v0->saveData;
-    param0->unk_2274 = Heap_AllocFromHeap(HEAP_ID_26, Party_SaveSize());
+    param0->unk_2274 = Heap_Alloc(HEAP_ID_26, Party_SaveSize());
 
     Party_InitWithCapacity(param0->unk_2274, 6);
     memset(param0->unk_2274, 0xff, Party_SaveSize());
@@ -2481,7 +2481,7 @@ static void ov88_0223E694(Party *param0, Party *param1, int param2, int param3,
         Pokemon_SetValue(v1, MON_DATA_FRIENDSHIP, &v3);
     }
 
-    UpdateMonStatusAndTrainerInfo(v1, CommInfo_TrainerInfo(CommSys_CurNetId()), 5, 0, HEAP_ID_FIELDMAP);
+    UpdateMonStatusAndTrainerInfo(v1, CommInfo_TrainerInfo(CommSys_CurNetId()), 5, 0, HEAP_ID_FIELD2);
     Pokemon_ClearBallCapsuleData(v1);
     Pokemon_Copy(v0, param4->unk_3C);
     Pokemon_Copy(v1, param4->unk_40);
diff --git a/src/overlay094/application.c b/src/overlay094/application.c
index c4c6fe96c0..9c2adb7314 100644
--- a/src/overlay094/application.c
+++ b/src/overlay094/application.c
@@ -128,7 +128,7 @@ BOOL GTSApplication_Init(ApplicationManager *appMan, int *loopState)
 
         Sound_SetSceneAndPlayBGM(SOUND_SCENE_11, SEQ_WIFILOBBY, 1);
 
-        appState->dwcHeapPointer = Heap_AllocFromHeap(HEAP_ID_62, 0x20000 + 32);
+        appState->dwcHeapPointer = Heap_Alloc(HEAP_ID_62, 0x20000 + 32);
         appState->dwcHeapHandle = NNS_FndCreateExpHeap((void *)(((u32)appState->dwcHeapPointer + 31) / 32 * 32), 0x20000);
         *loopState = 1;
         break;
diff --git a/src/overlay094/screens/deposit.c b/src/overlay094/screens/deposit.c
index 5189be4c9d..9c96e7846a 100644
--- a/src/overlay094/screens/deposit.c
+++ b/src/overlay094/screens/deposit.c
@@ -482,7 +482,7 @@ static void ov94_022418B8(GTSApplicationState *appState)
 {
     appState->genericMessageBuffer = Strbuf_Init(90 * 2, HEAP_ID_62);
     appState->title = MessageLoader_GetNewStrbuf(appState->gtsMessageLoader, GTS_Text_DepositPokemon);
-    appState->unk_10E4 = Heap_AllocFromHeap(HEAP_ID_62, sizeof(GTSApplicationState_sub3));
+    appState->unk_10E4 = Heap_Alloc(HEAP_ID_62, sizeof(GTSApplicationState_sub3));
 
     MI_CpuClearFast(appState->unk_10E4, sizeof(GTSApplicationState_sub3));
 
@@ -986,7 +986,7 @@ u16 *ov94_Pokedex_Alphabetical(int heapID, int unused, int *pokedexLength)
 u8 *ov94_02242548(int heapID)
 {
     u32 nationalDexSize, nationalDexLength;
-    u8 *nationalDex = Heap_AllocFromHeap(HEAP_ID_62, NATIONAL_DEX_COUNT + 1);
+    u8 *nationalDex = Heap_Alloc(HEAP_ID_62, NATIONAL_DEX_COUNT + 1);
 
     MI_CpuClearFast(nationalDex, NATIONAL_DEX_COUNT + 1);
 
diff --git a/src/overlay094/screens/listing.c b/src/overlay094/screens/listing.c
index dae56720e1..f7d7cb52a6 100644
--- a/src/overlay094/screens/listing.c
+++ b/src/overlay094/screens/listing.c
@@ -574,7 +574,7 @@ void ov94_0223DA78(MessageLoader *param0, Window param1[], u16 *param2, Pokemon
 void ov94_0223DB2C(Pokemon *param0)
 {
     PokemonSpriteTemplate v0;
-    u8 *v1 = Heap_AllocFromHeap(HEAP_ID_62, 0x20 * 10 * 10);
+    u8 *v1 = Heap_Alloc(HEAP_ID_62, 0x20 * 10 * 10);
 
     Pokemon_BuildSpriteTemplate(&v0, param0, 2);
 
diff --git a/src/overlay094/screens/search.c b/src/overlay094/screens/search.c
index 688c204224..bdf9f0c906 100644
--- a/src/overlay094/screens/search.c
+++ b/src/overlay094/screens/search.c
@@ -374,7 +374,7 @@ static void ov94_0223E9B8(GTSApplicationState *param0)
 
     param0->genericMessageBuffer = Strbuf_Init(90 * 2, HEAP_ID_62);
     param0->title = MessageLoader_GetNewStrbuf(param0->gtsMessageLoader, GTS_Text_SeekPokemon);
-    param0->unk_10E4 = Heap_AllocFromHeap(HEAP_ID_62, sizeof(GTSApplicationState_sub3));
+    param0->unk_10E4 = Heap_Alloc(HEAP_ID_62, sizeof(GTSApplicationState_sub3));
 
     MI_CpuClearFast(param0->unk_10E4, sizeof(GTSApplicationState_sub3));
 
diff --git a/src/overlay094/screens/select_pokemon.c b/src/overlay094/screens/select_pokemon.c
index 6571d8fcd7..645195e0af 100644
--- a/src/overlay094/screens/select_pokemon.c
+++ b/src/overlay094/screens/select_pokemon.c
@@ -476,7 +476,7 @@ static void ov94_022401E0(GTSApplicationState *param0)
         param0->unk_112 = 0;
     }
 
-    param0->boxCriteria = Heap_AllocFromHeap(HEAP_ID_62, sizeof(GTSBoxPokemonCriteria));
+    param0->boxCriteria = Heap_Alloc(HEAP_ID_62, sizeof(GTSBoxPokemonCriteria));
 }
 
 static void ov94_02240268(GTSApplicationState *param0)
@@ -1122,7 +1122,7 @@ static void ov94_02240FA0(GTSApplicationState *appState, int boxID)
     NARC *v6; // compiler
     PokemonIcon *icons;
 
-    appState->selectPokemonIconHeapPtr = icons = Heap_AllocFromHeapAtEnd(HEAP_ID_APPLICATION, sizeof(PokemonIcon) * MAX_MONS_PER_BOX);
+    appState->selectPokemonIconHeapPtr = icons = Heap_AllocAtEnd(HEAP_ID_APPLICATION, sizeof(PokemonIcon) * MAX_MONS_PER_BOX);
     v6 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, HEAP_ID_62);
 
     if ((boxID >= 0) && (boxID < MAX_PC_BOXES)) {
diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c
index 1c8253f60e..1685fd8aa2 100644
--- a/src/overlay095/ov95_02246C20.c
+++ b/src/overlay095/ov95_02246C20.c
@@ -245,7 +245,7 @@ static void ov95_02246F0C(SysTask *param0, void *param1)
 
 UnkStruct_ov95_02247004 *ov95_02246F30(BOOL *param0, int param1)
 {
-    UnkStruct_ov95_02247004 *v0 = Heap_AllocFromHeap(HEAP_ID_57, sizeof(UnkStruct_ov95_02247004));
+    UnkStruct_ov95_02247004 *v0 = Heap_Alloc(HEAP_ID_57, sizeof(UnkStruct_ov95_02247004));
 
     *param0 = 0;
 
@@ -374,7 +374,7 @@ static void ov95_02247148(UnkStruct_ov95_02247004 *param0, int param1, int param
 static void ov95_02247170(UnkStruct_ov95_02247004 *param0)
 {
     if (param0->unk_C4[param0->unk_F8] == NULL) {
-        UnkStruct_ov95_02247170 *v0 = Heap_AllocFromHeap(HEAP_ID_57, sizeof(UnkStruct_ov95_02247170));
+        UnkStruct_ov95_02247170 *v0 = Heap_Alloc(HEAP_ID_57, sizeof(UnkStruct_ov95_02247170));
 
         if (v0) {
             v0->unk_00 = param0;
@@ -443,7 +443,7 @@ static void ov95_02247254(SysTask *param0, void *param1)
 
 UnkStruct_ov95_022472C4 *ov95_022472C4(BgConfig *param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, int param5, volatile BOOL *param6)
 {
-    UnkStruct_ov95_022472C4 *v0 = Heap_AllocFromHeap(HEAP_ID_57, sizeof(UnkStruct_ov95_022472C4));
+    UnkStruct_ov95_022472C4 *v0 = Heap_Alloc(HEAP_ID_57, sizeof(UnkStruct_ov95_022472C4));
 
     *param6 = 1;
 
@@ -532,7 +532,7 @@ void ov95_022473E8(TradeSequenceData *param0, int param1, u32 param2, u32 param3
     void *v3;
 
     v2 = (param4) ? 0x20 * 200 : 0x20 * 100;
-    v3 = Heap_AllocFromHeapAtEnd(HEAP_ID_57, v2);
+    v3 = Heap_AllocAtEnd(HEAP_ID_57, v2);
 
     if (v3) {
         UnkStruct_02013610 v4 = {
diff --git a/src/overlay095/ov95_022476F0.c b/src/overlay095/ov95_022476F0.c
index 7df65dfb8c..c8b17b3f21 100644
--- a/src/overlay095/ov95_022476F0.c
+++ b/src/overlay095/ov95_022476F0.c
@@ -44,14 +44,14 @@ static void ov95_02247B5C(UnkStruct_ov95_0224773C *param0);
 
 UnkStruct_ov95_0224773C *ov95_022476F0(u32 param0, fx32 param1, fx32 param2, fx32 param3)
 {
-    UnkStruct_ov95_0224773C *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_0224773C));
+    UnkStruct_ov95_0224773C *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_0224773C));
 
     if (v0) {
         u32 v1;
 
         ov95_02247AF0(v0, param1, param2, param3);
 
-        v0->unk_18 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_02247958) * param0);
+        v0->unk_18 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_02247958) * param0);
         v0->unk_1C = param0;
 
         for (v1 = 0; v1 < param0; v1++) {
diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c
index b49431303e..676a816b38 100644
--- a/src/overlay095/ov95_02247B6C.c
+++ b/src/overlay095/ov95_02247B6C.c
@@ -95,7 +95,7 @@ static void ov95_022484B0(SysTask *param0, void *param1);
 
 void *ov95_02247B6C(TradeSequenceData *param0)
 {
-    UnkStruct_ov95_02247C6C *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_02247C6C));
+    UnkStruct_ov95_02247C6C *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_02247C6C));
 
     if (v0) {
         int v1;
@@ -502,7 +502,7 @@ static void ov95_02248340(UnkStruct_ov95_02247C6C *param0)
 
 static void ov95_02248364(UnkStruct_ov95_02247C6C *param0, int param1, int param2, int param3)
 {
-    UnkStruct_ov95_02248364 *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_02248364));
+    UnkStruct_ov95_02248364 *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_02248364));
 
     if (v0) {
         v0->unk_00 = param0;
@@ -548,7 +548,7 @@ static void ov95_022483E4(SysTask *param0, void *param1)
 
 static void ov95_02248420(UnkStruct_ov95_02247C6C *param0)
 {
-    UnkStruct_ov95_02248420 *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_02248420));
+    UnkStruct_ov95_02248420 *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_02248420));
 
     if (v0) {
         v0->unk_00 = param0;
diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c
index 469ce15744..94eb9419fd 100644
--- a/src/overlay095/ov95_02248590.c
+++ b/src/overlay095/ov95_02248590.c
@@ -206,7 +206,7 @@ static void ov95_02249700(SysTask *param0, void *param1);
 
 void *ov95_02248590(TradeSequenceData *param0)
 {
-    UnkStruct_ov95_02248688 *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_02248688));
+    UnkStruct_ov95_02248688 *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_02248688));
 
     if (v0) {
         int v1;
@@ -496,7 +496,7 @@ static void ov95_022488A4(UnkStruct_ov95_02248688 *param0)
     Graphics_LoadTilemapToBgLayer(NARC_INDEX_GRAPHIC__DEMO_TRADE, 4, param0->unk_C0, 7, 0, 0, 1, HEAP_ID_58);
 
     {
-        u8 *v7 = Heap_AllocFromHeap(HEAP_ID_58, 96);
+        u8 *v7 = Heap_Alloc(HEAP_ID_58, 96);
 
         if (v7) {
             MI_CpuClear32(v7, 96);
@@ -732,7 +732,7 @@ static void ov95_02248F94(SysTask *param0)
 
 static void ov95_02248FAC(UnkStruct_ov95_02248688 *param0, SysTask **param1)
 {
-    UnkStruct_ov95_02248FAC *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_02248FAC));
+    UnkStruct_ov95_02248FAC *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_02248FAC));
 
     if (v0) {
         v0->unk_00 = param0;
@@ -785,7 +785,7 @@ static void ov95_022490A4(SysTask *param0)
 
 static void ov95_022490D0(UnkStruct_ov95_02247958 *param0, int param1, int param2, int param3)
 {
-    UnkStruct_ov95_022490D0 *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_022490D0));
+    UnkStruct_ov95_022490D0 *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_022490D0));
 
     if (v0) {
         v0->unk_00 = param1 << 12;
diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c
index 7891f1149f..54291a152d 100644
--- a/src/overlay095/ov95_02249740.c
+++ b/src/overlay095/ov95_02249740.c
@@ -116,7 +116,7 @@ static void ov95_02249F38(SysTask *param0, void *param1);
 
 void *ov95_02249740(TradeSequenceData *param0)
 {
-    UnkStruct_ov95_022497D8 *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_022497D8));
+    UnkStruct_ov95_022497D8 *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_022497D8));
 
     if (v0) {
         int v1;
diff --git a/src/overlay095/ov95_02249F90.c b/src/overlay095/ov95_02249F90.c
index 3a5c250f43..1074f2562c 100644
--- a/src/overlay095/ov95_02249F90.c
+++ b/src/overlay095/ov95_02249F90.c
@@ -46,7 +46,7 @@ static void ov95_0224A358(BgConfig *param0, int param1, int param2);
 
 void *ov95_02249F90(TradeSequenceData *param0)
 {
-    UnkStruct_ov95_02249FF8 *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_02249FF8));
+    UnkStruct_ov95_02249FF8 *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_02249FF8));
 
     if (v0) {
         int v1;
diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c
index 71613321b7..9978c9fadb 100644
--- a/src/overlay095/ov95_0224A390.c
+++ b/src/overlay095/ov95_0224A390.c
@@ -113,7 +113,7 @@ static BOOL Unk_ov95_0224C2C0 = 1;
 
 void *ov95_0224A390(TradeSequenceData *param0)
 {
-    UnkStruct_ov95_0224A42C *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_0224A42C));
+    UnkStruct_ov95_0224A42C *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_0224A42C));
 
     if (v0) {
         int v1;
diff --git a/src/overlay095/ov95_0224ABC0.c b/src/overlay095/ov95_0224ABC0.c
index ca1e772769..df55ce4102 100644
--- a/src/overlay095/ov95_0224ABC0.c
+++ b/src/overlay095/ov95_0224ABC0.c
@@ -121,7 +121,7 @@ static void ov95_0224B3BC(SysTask *param0);
 
 void *ov95_0224ABC0(TradeSequenceData *param0)
 {
-    UnkStruct_ov95_0224AC64 *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_0224AC64));
+    UnkStruct_ov95_0224AC64 *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_0224AC64));
 
     if (v0) {
         int v1;
@@ -373,7 +373,7 @@ static void ov95_0224AE1C(UnkStruct_ov95_0224AC64 *param0)
     Graphics_LoadTilemapToBgLayer(NARC_INDEX_GRAPHIC__DEMO_TRADE, 4, param0->unk_0C, 7, 0, 0, 1, HEAP_ID_58);
 
     {
-        u8 *v7 = Heap_AllocFromHeap(HEAP_ID_58, 96);
+        u8 *v7 = Heap_Alloc(HEAP_ID_58, 96);
 
         if (v7) {
             MI_CpuClear32(v7, 96);
@@ -473,7 +473,7 @@ static void ov95_0224B194(UnkStruct_ov95_0224AC64 *param0)
 
 static void ov95_0224B1A8(UnkStruct_ov95_0224AC64 *param0, SysTask **param1)
 {
-    UnkStruct_ov95_0224B1A8 *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_0224B1A8));
+    UnkStruct_ov95_0224B1A8 *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_0224B1A8));
 
     if (v0) {
         v0->unk_00 = param0;
@@ -521,7 +521,7 @@ static void ov95_0224B258(SysTask *param0)
 
 static void ov95_0224B274(UnkStruct_ov95_0224AC64 *param0, SysTask **param1)
 {
-    UnkStruct_ov95_0224B274 *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_0224B274));
+    UnkStruct_ov95_0224B274 *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_0224B274));
 
     if (v0) {
         v0->unk_00 = param1;
@@ -568,7 +568,7 @@ static void ov95_0224B308(SysTask *param0)
 
 static void ov95_0224B324(UnkStruct_ov95_02247958 *param0, int param1, int param2, int param3, SysTask **param4)
 {
-    UnkStruct_ov95_0224B324 *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_0224B324));
+    UnkStruct_ov95_0224B324 *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_0224B324));
 
     if (v0) {
         v0->unk_00 = param4;
diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c
index e0ffa83da9..3d757792f1 100644
--- a/src/overlay095/ov95_0224B3D8.c
+++ b/src/overlay095/ov95_0224B3D8.c
@@ -119,7 +119,7 @@ static void ov95_0224BD5C(SysTask *param0, void *param1);
 
 void *ov95_0224B3D8(TradeSequenceData *param0)
 {
-    UnkStruct_ov95_0224B4D4 *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_0224B4D4));
+    UnkStruct_ov95_0224B4D4 *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_0224B4D4));
 
     if (v0) {
         int v1;
@@ -544,7 +544,7 @@ static void ov95_0224BB8C(UnkStruct_ov95_0224B4D4 *param0)
 
 static void ov95_0224BBB0(UnkStruct_ov95_0224B4D4 *param0, int param1, int param2, int param3)
 {
-    UnkStruct_ov95_0224BBB0 *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_0224BBB0));
+    UnkStruct_ov95_0224BBB0 *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_0224BBB0));
 
     if (v0) {
         v0->unk_00 = param0;
@@ -590,7 +590,7 @@ static void ov95_0224BC30(SysTask *param0, void *param1)
 
 static void ov95_0224BC6C(UnkStruct_ov95_0224B4D4 *param0, SysTask **param1)
 {
-    UnkStruct_ov95_0224BC6C *v0 = Heap_AllocFromHeap(HEAP_ID_58, sizeof(UnkStruct_ov95_0224BC6C));
+    UnkStruct_ov95_0224BC6C *v0 = Heap_Alloc(HEAP_ID_58, sizeof(UnkStruct_ov95_0224BC6C));
 
     if (v0) {
         v0->unk_04 = 0;
diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c
index 23a066a6b7..a595d3cb1b 100644
--- a/src/overlay096/ov96_0223B6A0.c
+++ b/src/overlay096/ov96_0223B6A0.c
@@ -98,7 +98,7 @@ int ov96_0223B6A0(ApplicationManager *appMan, int *param1)
         ov96_0223BC64(v0);
         Sound_SetSceneAndPlayBGM(SOUND_SCENE_SUB_52, SEQ_NONE, 0);
 
-        v0->unk_24 = Heap_AllocFromHeap(HEAP_ID_68, 0x20000 + 32);
+        v0->unk_24 = Heap_Alloc(HEAP_ID_68, 0x20000 + 32);
         v0->unk_28 = NNS_FndCreateExpHeap((void *)(((u32)v0->unk_24 + 31) / 32 * 32), 0x20000);
 
         Sound_SetSceneAndPlayBGM(SOUND_SCENE_11, SEQ_WIFILOBBY, 1);
diff --git a/src/overlay098/ov98_02246C20.c b/src/overlay098/ov98_02246C20.c
index eab9edb20a..4a1ecb63ec 100644
--- a/src/overlay098/ov98_02246C20.c
+++ b/src/overlay098/ov98_02246C20.c
@@ -190,7 +190,7 @@ static void ov98_02246E08(UnkStruct_ov98_02246E88 *param0)
     if (param0->unk_80 == 0) {
         Overlay_LoadByID(FS_OVERLAY_ID(overlay94), 2);
 
-        param0->unk_0C = Heap_AllocFromHeap(HEAP_ID_108, 0x20000 + 32);
+        param0->unk_0C = Heap_Alloc(HEAP_ID_108, 0x20000 + 32);
         param0->unk_10 = NNS_FndCreateExpHeap((void *)(((u32)param0->unk_0C + 31) / 32 * 32), 0x20000);
 
         sub_02099550();
@@ -270,7 +270,7 @@ static void ov98_02246ED4(DWCAllocType param0, void *param1, u32 param2)
 
 void ov98_02246EF8(UnkStruct_ov98_02246E88 *param0)
 {
-    char *v0 = Heap_AllocFromHeap(HEAP_ID_108, sizeof(char) * 100);
+    char *v0 = Heap_Alloc(HEAP_ID_108, sizeof(char) * 100);
 
     ov98_022499C8(param0->unk_114, v0, HEAP_ID_108);
     sub_02030D38(param0->saveData, v0);
@@ -420,7 +420,7 @@ void ov98_02247134(UnkStruct_ov98_02246E88 *param0)
 
 static void *ov98_02247168(UnkStruct_ov98_02246E88 *param0)
 {
-    UnkStruct_ov98_02247168 *v0 = Heap_AllocFromHeap(HEAP_ID_108, sizeof(UnkStruct_ov98_02247168));
+    UnkStruct_ov98_02247168 *v0 = Heap_Alloc(HEAP_ID_108, sizeof(UnkStruct_ov98_02247168));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov98_02247168));
 
     v0->saveData = param0->saveData;
diff --git a/src/overlay098/ov98_022499C8.c b/src/overlay098/ov98_022499C8.c
index 059155777a..93d717f017 100644
--- a/src/overlay098/ov98_022499C8.c
+++ b/src/overlay098/ov98_022499C8.c
@@ -38,7 +38,7 @@ void ov98_022499C8(Strbuf *param0, char *param1, int heapID)
         param1[v2] = Unk_ov98_02249D1C[v0++];
     }
 
-    v1 = Heap_AllocFromHeap(heapID, sizeof(charcode_t) * 100);
+    v1 = Heap_Alloc(heapID, sizeof(charcode_t) * 100);
     Strbuf_ToChars(param0, v1, 100);
 
     v0 = 0;
@@ -71,7 +71,7 @@ int ov98_02249A80(Strbuf *param0, int heapID)
     BOOL v1 = TRUE;
     int v2;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(charcode_t) * 100);
+    v0 = Heap_Alloc(heapID, sizeof(charcode_t) * 100);
     Strbuf_ToChars(param0, v0, 100);
 
     for (v2 = 0; v0[v2] != CHAR_EOS; v2++) {
diff --git a/src/overlay099/ov99_021D1A54.c b/src/overlay099/ov99_021D1A54.c
index 51556f36f7..fd44d89a7b 100644
--- a/src/overlay099/ov99_021D1A54.c
+++ b/src/overlay099/ov99_021D1A54.c
@@ -388,7 +388,7 @@ static void ov99_021D1BC4(UnkStruct_ov99_021D2CB0 *param0, ManagedSprite **param
             v5 = 32;
         }
 
-        param0->unk_10F4 = Heap_AllocFromHeap(HEAP_ID_75, (0x20 * 8));
+        param0->unk_10F4 = Heap_Alloc(HEAP_ID_75, (0x20 * 8));
         v3 = Graphics_GetCharDataFromOpenNARC(param0->unk_10F8, v5, 0, &v4, HEAP_ID_75);
 
         MI_CpuCopy32(v4->pRawData, param0->unk_10F4, (0x20 * 8));
diff --git a/src/overlay099/ov99_021D3E78.c b/src/overlay099/ov99_021D3E78.c
index d5f4843e2b..2bcf0204a9 100644
--- a/src/overlay099/ov99_021D3E78.c
+++ b/src/overlay099/ov99_021D3E78.c
@@ -279,7 +279,7 @@ static void ov99_021D4104(SysTask *param0, void *param1);
 
 UnkStruct_ov99_021D3E78 *ov99_021D3E78(BgConfig *param0, int param1, int param2, int param3, MessageLoader *param4)
 {
-    UnkStruct_ov99_021D3E78 *v0 = Heap_AllocFromHeap(HEAP_ID_75, sizeof(UnkStruct_ov99_021D3E78));
+    UnkStruct_ov99_021D3E78 *v0 = Heap_Alloc(HEAP_ID_75, sizeof(UnkStruct_ov99_021D3E78));
 
     if (v0) {
         v0->unk_20 = param0;
diff --git a/src/overlay100/ov100_021D0D80.c b/src/overlay100/ov100_021D0D80.c
index 034682c299..c7c4170352 100644
--- a/src/overlay100/ov100_021D0D80.c
+++ b/src/overlay100/ov100_021D0D80.c
@@ -229,7 +229,7 @@ static void ov100_021D1034(UnkStruct_ov100_021D46C8 *param0)
     ov100_021D0FA0(param0);
 
     G3X_AlphaBlend(1);
-    Heap_FndInitAllocatorForExpHeap(&param0->unk_1C, HEAP_ID_111, 32);
+    HeapExp_FndInitAllocator(&param0->unk_1C, HEAP_ID_111, 32);
 }
 
 static void ov100_021D111C(UnkStruct_ov100_021D46C8 *param0)
diff --git a/src/overlay100/ov100_021D13E4.c b/src/overlay100/ov100_021D13E4.c
index ba6b1c74f9..627b6d934b 100644
--- a/src/overlay100/ov100_021D13E4.c
+++ b/src/overlay100/ov100_021D13E4.c
@@ -34,7 +34,7 @@ static void ov100_021D1758(Camera *camera, VecFx32 *param1);
 
 void *ov100_021D13E4(UnkStruct_ov100_021D4DD8 *param0)
 {
-    UnkStruct_ov100_021D1808 *v0 = Heap_AllocFromHeap(HEAP_ID_111, sizeof(UnkStruct_ov100_021D1808));
+    UnkStruct_ov100_021D1808 *v0 = Heap_Alloc(HEAP_ID_111, sizeof(UnkStruct_ov100_021D1808));
 
     memset(v0, 0, sizeof(UnkStruct_ov100_021D1808));
 
diff --git a/src/overlay100/ov100_021D1C44.c b/src/overlay100/ov100_021D1C44.c
index 144cd3a04e..538e7d9670 100644
--- a/src/overlay100/ov100_021D1C44.c
+++ b/src/overlay100/ov100_021D1C44.c
@@ -252,7 +252,7 @@ static void ov100_021D2324(UnkStruct_ov100_021D1C98 *param0)
 
 void *ov100_021D2340(UnkStruct_ov100_021D4DD8 *param0)
 {
-    UnkStruct_ov100_021D1C98 *v0 = Heap_AllocFromHeap(HEAP_ID_111, sizeof(UnkStruct_ov100_021D1C98));
+    UnkStruct_ov100_021D1C98 *v0 = Heap_Alloc(HEAP_ID_111, sizeof(UnkStruct_ov100_021D1C98));
 
     memset(v0, 0, sizeof(UnkStruct_ov100_021D1C98));
 
diff --git a/src/overlay100/ov100_021D2F0C.c b/src/overlay100/ov100_021D2F0C.c
index 439b59b44b..d93a71a03e 100644
--- a/src/overlay100/ov100_021D2F0C.c
+++ b/src/overlay100/ov100_021D2F0C.c
@@ -237,7 +237,7 @@ static void ov100_021D3558(UnkStruct_ov100_021D3084 *param0)
 
 void *ov100_021D3620(UnkStruct_ov100_021D4DD8 *param0)
 {
-    UnkStruct_ov100_021D3084 *v0 = Heap_AllocFromHeap(HEAP_ID_111, sizeof(UnkStruct_ov100_021D3084));
+    UnkStruct_ov100_021D3084 *v0 = Heap_Alloc(HEAP_ID_111, sizeof(UnkStruct_ov100_021D3084));
 
     memset(v0, 0, sizeof(UnkStruct_ov100_021D3084));
 
diff --git a/src/overlay101/ov101_021D0D80.c b/src/overlay101/ov101_021D0D80.c
index 7b1a2cbf31..3ed74365a9 100644
--- a/src/overlay101/ov101_021D0D80.c
+++ b/src/overlay101/ov101_021D0D80.c
@@ -661,7 +661,7 @@ static void ov101_021D197C(void *param0)
 
 void *ov101_021D1998(u32 param0)
 {
-    void *v0 = Heap_AllocFromHeap(HEAP_ID_79, param0);
+    void *v0 = Heap_Alloc(HEAP_ID_79, param0);
 
     GF_ASSERT(v0 != NULL);
     memset(v0, 0, param0);
@@ -685,9 +685,9 @@ void *ov101_021D19E4(UnkStruct_ov101_021D13C8 *param0, u32 param1, int param2)
     u32 v1 = NARC_GetMemberSize(param0->unk_438, param1);
 
     if (param2 == 1) {
-        v0 = Heap_AllocFromHeap(HEAP_ID_79, v1);
+        v0 = Heap_Alloc(HEAP_ID_79, v1);
     } else {
-        v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_79, v1);
+        v0 = Heap_AllocAtEnd(HEAP_ID_79, v1);
     }
 
     GF_ASSERT(v0 != NULL);
diff --git a/src/overlay101/ov101_021D1A28.c b/src/overlay101/ov101_021D1A28.c
index a3e9a0d286..8c6ae06e06 100644
--- a/src/overlay101/ov101_021D1A28.c
+++ b/src/overlay101/ov101_021D1A28.c
@@ -4225,7 +4225,7 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D8700 = {
 
 static void ov101_021D53B0(UnkStruct_ov101_021D13C8 *param0)
 {
-    UnkStruct_ov101_021D53B0 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_79, sizeof(UnkStruct_ov101_021D53B0));
+    UnkStruct_ov101_021D53B0 *v0 = Heap_AllocAtEnd(HEAP_ID_79, sizeof(UnkStruct_ov101_021D53B0));
 
     v0->unk_00 = 0;
     v0->unk_04 = 0;
@@ -4236,7 +4236,7 @@ static void ov101_021D53B0(UnkStruct_ov101_021D13C8 *param0)
 
 static void ov101_021D53D4(UnkStruct_ov101_021D13C8 *param0)
 {
-    UnkStruct_ov101_021D53B0 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_79, sizeof(UnkStruct_ov101_021D53B0));
+    UnkStruct_ov101_021D53B0 *v0 = Heap_AllocAtEnd(HEAP_ID_79, sizeof(UnkStruct_ov101_021D53B0));
 
     v0->unk_00 = 0;
     v0->unk_04 = 0;
@@ -4247,7 +4247,7 @@ static void ov101_021D53D4(UnkStruct_ov101_021D13C8 *param0)
 
 static void ov101_021D53F8(UnkStruct_ov101_021D13C8 *param0, int param1)
 {
-    UnkStruct_ov101_021D53B0 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_79, sizeof(UnkStruct_ov101_021D53B0));
+    UnkStruct_ov101_021D53B0 *v0 = Heap_AllocAtEnd(HEAP_ID_79, sizeof(UnkStruct_ov101_021D53B0));
 
     v0->unk_00 = 0;
     v0->unk_08 = param1;
diff --git a/src/overlay101/ov101_021D7E48.c b/src/overlay101/ov101_021D7E48.c
index 64defae2d8..3a1abda9c5 100644
--- a/src/overlay101/ov101_021D7E48.c
+++ b/src/overlay101/ov101_021D7E48.c
@@ -45,7 +45,7 @@ typedef struct UnkStruct_ov101_021D7E48_t {
 
 UnkStruct_ov101_021D7E48 *ov101_021D7E48(u32 heapID, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9, u32 param10)
 {
-    UnkStruct_ov101_021D7E48 *v0 = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_ov101_021D7E48)));
+    UnkStruct_ov101_021D7E48 *v0 = Heap_Alloc(heapID, (sizeof(UnkStruct_ov101_021D7E48)));
 
     GF_ASSERT(v0 != NULL);
 
@@ -67,10 +67,10 @@ UnkStruct_ov101_021D7E48 *ov101_021D7E48(u32 heapID, u32 param1, u32 param2, u32
     v0->unk_1A4 = SpriteResourceCollection_New(param4, 1, heapID);
     v0->unk_1A8 = SpriteResourceCollection_New(param5, 2, heapID);
     v0->unk_1AC = SpriteResourceCollection_New(param6, 3, heapID);
-    v0->unk_1B0 = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param3);
-    v0->unk_1B4 = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param4);
-    v0->unk_1B8 = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param5);
-    v0->unk_1BC = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param6);
+    v0->unk_1B0 = Heap_Alloc(heapID, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param3);
+    v0->unk_1B4 = Heap_Alloc(heapID, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param4);
+    v0->unk_1B8 = Heap_Alloc(heapID, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param5);
+    v0->unk_1BC = Heap_Alloc(heapID, (sizeof(UnkStruct_ov101_021D7E48_sub1)) * param6);
 
     {
         u32 v1;
diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c
index ec2028fb04..d35f8e73f5 100644
--- a/src/overlay104/ov104_0222DCE0.c
+++ b/src/overlay104/ov104_0222DCE0.c
@@ -298,7 +298,7 @@ void ov104_0222DF40(const FrontierPokemonDataDTO *param0, Pokemon *param1, u8 pa
     Pokemon_SetValue(param1, MON_DATA_FRIENDSHIP, &param0->friendship);
 
     if (param0->unk_14_val1_30) {
-        MessageLoader *v7 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPECIES_NAME, HEAP_ID_FIELD);
+        MessageLoader *v7 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPECIES_NAME, HEAP_ID_FIELD1);
         Strbuf *v8 = MessageLoader_GetNewStrbuf(v7, param0->species);
 
         Pokemon_SetValue(param1, MON_DATA_NICKNAME_STRBUF, v8);
@@ -336,9 +336,9 @@ void ov104_0222E134(SaveData *saveData, Pokemon *param1)
     Pokemon_UpdateAfterCatch(param1, SaveData_GetTrainerInfo(saveData), 4, 0, 0, 11);
 
     v3 = MapHeader_GetMapLabelTextID(562);
-    UpdateMonStatusAndTrainerInfo(param1, v5, v4, v3, HEAP_ID_FIELDMAP);
+    UpdateMonStatusAndTrainerInfo(param1, v5, v4, v3, HEAP_ID_FIELD2);
 
-    v2 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0363, HEAP_ID_FIELDMAP);
+    v2 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0363, HEAP_ID_FIELD2);
     v1 = MessageLoader_GetNewStrbuf(v2, 0);
 
     Pokemon_SetValue(param1, MON_DATA_OTNAME_STRBUF, v1);
@@ -547,7 +547,7 @@ void ov104_0222E4BC(u8 param0, u16 param1, u16 param2, u16 *param3, FrontierPoke
     FrontierTrainerDataDTO v4;
     BattleFrontierPokemonData v6;
 
-    BattleFrontierTrainerData *v5 = ov104_0222DD04(&v4, param1, HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR);
+    BattleFrontierTrainerData *v5 = ov104_0222DD04(&v4, param1, HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR);
 
     for (v0 = 0; v0 < param0; v0++) {
         param5[v0] = ov104_0222E3A8(param1);
@@ -565,7 +565,7 @@ void ov104_0222E4BC(u8 param0, u16 param1, u16 param2, u16 *param3, FrontierPoke
         }
 
         Heap_Free(v5);
-        v5 = ov104_0222DD04(&v4, param2, HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR);
+        v5 = ov104_0222DD04(&v4, param2, HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR);
         ov104_0222E3E4(v5, v2, v3, (param0 / 2), (param0 / 2), &param3[param0 / 2], 11);
 
         for (v0 = 0; v0 < (param0 / 2); v0++) {
diff --git a/src/overlay104/ov104_0222E63C.c b/src/overlay104/ov104_0222E63C.c
index 4270a71662..a48bb201e7 100644
--- a/src/overlay104/ov104_0222E63C.c
+++ b/src/overlay104/ov104_0222E63C.c
@@ -32,7 +32,7 @@ static void ov104_0222E904(UnkStruct_ov104_0222E930 *param0, int param1);
 
 UnkStruct_ov104_022320B4 *ov104_0222E63C(UnkStruct_0209B75C *param0, int heapID, int param2)
 {
-    UnkStruct_ov104_022320B4 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_022320B4));
+    UnkStruct_ov104_022320B4 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov104_022320B4));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov104_022320B4));
 
     v0->unk_00 = param0;
@@ -101,7 +101,7 @@ void ov104_0222E710(UnkStruct_ov104_022320B4 *param0)
 
 void ov104_0222E748(UnkStruct_ov104_022320B4 *param0, int param1, int param2)
 {
-    UnkStruct_ov104_0222E930 *v0 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov104_0222E930));
+    UnkStruct_ov104_0222E930 *v0 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_ov104_0222E930));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0222E930));
 
     ov104_0222E930(v0, Unk_ov104_0223F674, Unk_ov104_0223F63C);
@@ -197,7 +197,7 @@ void ov104_0222E86C(UnkStruct_ov104_022320B4 *param0, int param1, int heapID)
 
 UnkStruct_ov104_0222E8C8 *ov104_0222E8C8(UnkStruct_ov104_022320B4 *param0, int heapID)
 {
-    UnkStruct_ov104_0222E8C8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_0222E8C8));
+    UnkStruct_ov104_0222E8C8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov104_0222E8C8));
     *v0 = param0->unk_24;
 
     return v0;
diff --git a/src/overlay104/ov104_0222EA90.c b/src/overlay104/ov104_0222EA90.c
index ab8bd5a356..5db55862cf 100644
--- a/src/overlay104/ov104_0222EA90.c
+++ b/src/overlay104/ov104_0222EA90.c
@@ -412,7 +412,7 @@ void ov104_0222EBA4(UnkStruct_ov104_0223C4CC *param0, void **param1, int param2)
 
 static void ov104_0222EBBC(UnkStruct_ov104_0223C4CC *param0, void **param1)
 {
-    *param1 = Heap_AllocFromHeap(HEAP_ID_94, 32);
+    *param1 = Heap_Alloc(HEAP_ID_94, 32);
 }
 
 static void ov104_0222EBCC(UnkStruct_ov104_0223C4CC *param0, void **param1)
diff --git a/src/overlay104/ov104_0222ECE8.c b/src/overlay104/ov104_0222ECE8.c
index dcc51bc674..a99c9f1f08 100644
--- a/src/overlay104/ov104_0222ECE8.c
+++ b/src/overlay104/ov104_0222ECE8.c
@@ -1087,7 +1087,7 @@ void ov104_0222F7BC(int param0, int param1, void *param2, void *param3)
 
     v0 = ov104_0223B7A8(v5->unk_10, 0);
     v3 = Pokemon_StructSize();
-    v4 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v4 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v1 = 0; v1 < v0; v1++) {
         MI_CpuCopy8(&v6[v3 * v1], v4, v3);
@@ -1380,7 +1380,7 @@ void ov104_0222FB34(int param0, int param1, void *param2, void *param3)
 
     v0 = ov104_0223BD70(v5->unk_10, 0);
     v3 = Pokemon_StructSize();
-    v4 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v4 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v1 = 0; v1 < v0; v1++) {
         MI_CpuCopy8(&v6[v3 * v1], v4, v3);
diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c
index 972d67fd7b..9c1c56806f 100644
--- a/src/overlay104/ov104_0222FBE4.c
+++ b/src/overlay104/ov104_0222FBE4.c
@@ -820,7 +820,7 @@ static BOOL ov104_0222FF90(UnkStruct_ov104_0222E930 *param0)
     u16 v2 = ov104_0222EA48(param0);
     u16 v3 = ov104_0222EA48(param0);
 
-    StartScreenFade(FADE_BOTH_SCREENS, v2, v2, v3, v0, v1, HEAP_ID_FIELDMAP);
+    StartScreenFade(FADE_BOTH_SCREENS, v2, v2, v3, v0, v1, HEAP_ID_FIELD2);
     ResetVisibleHardwareWindows(DS_SCREEN_MAIN);
     ResetVisibleHardwareWindows(DS_SCREEN_SUB);
 
@@ -1192,7 +1192,7 @@ static BOOL ov104_0223050C(UnkStruct_ov104_0222E930 *param0)
 
 static void ov104_0223056C(u16 param0, UnkStruct_ov104_0223C634 *param1, const UnkStruct_ov104_02232B78_sub1 *param2, UnkStruct_ov63_0222D77C *param3, u8 *param4, int heapID)
 {
-    UnkStruct_ov104_02232B78 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_02232B78));
+    UnkStruct_ov104_02232B78 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov104_02232B78));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov104_02232B78));
 
     v0->unk_14 = param1;
@@ -1419,7 +1419,7 @@ static void ov104_0223088C(UnkStruct_ov104_0222E930 *param0, int param1, int par
 
     GF_ASSERT(param2 <= 7);
 
-    v1 = Heap_AllocFromHeap(v0->heapID, sizeof(s16) * param2);
+    v1 = Heap_Alloc(v0->heapID, sizeof(s16) * param2);
     v2 = ov104_0222FC00(param0);
 
     for (v3 = 0; v3 < 3; v3++) {
@@ -1447,7 +1447,7 @@ static BOOL ov104_02230900(UnkStruct_ov104_0222E930 *param0)
 static BOOL ov104_02230910(UnkStruct_ov104_0222E930 *param0)
 {
     UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00);
-    void *v0 = NamingScreenArgs_Init(HEAP_ID_FIELDMAP, NAMING_SCREEN_TYPE_PLAYER, 0, 8, (void *)v1->options);
+    void *v0 = NamingScreenArgs_Init(HEAP_ID_FIELD2, NAMING_SCREEN_TYPE_PLAYER, 0, 8, (void *)v1->options);
 
     sub_0209B988(param0->unk_00->unk_00, &gNamingScreenAppTemplate, v0, 0, ov104_02230950);
 
@@ -1464,7 +1464,7 @@ static BOOL ov104_02230958(UnkStruct_ov104_0222E930 *param0)
     int v0;
     UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00);
 
-    sub_0202F1F8(v1->saveData, HEAP_ID_FIELDMAP, &v0);
+    sub_0202F1F8(v1->saveData, HEAP_ID_FIELD2, &v0);
     return 0;
 }
 
@@ -1632,7 +1632,7 @@ static BOOL ov104_02230B50(UnkStruct_ov104_0222E930 *param0)
     FieldBattleDTO *v1;
     UnkStruct_ov104_02230BE4 *v2 = sub_0209B970(param0->unk_00->unk_00);
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(FieldBattleDTO));
+    v1 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(FieldBattleDTO));
     MI_CpuClear8(v1, sizeof(FieldBattleDTO));
 
     sub_0202F298(v2->saveData, 11, &v0, v1, 0);
@@ -1815,7 +1815,7 @@ BOOL ov104_02230E40(UnkStruct_ov104_0222E930 *param0)
     u16 v1 = ov104_0222FC00(param0);
     u16 v2 = ov104_0222EA48(param0);
     u8 v3 = (*((param0)->unk_1C++));
-    Strbuf *v4 = ov104_02230E90(v1, HEAP_ID_FIELDMAP);
+    Strbuf *v4 = ov104_02230E90(v1, HEAP_ID_FIELD2);
 
     StringTemplate_SetStrbuf(param0->unk_00->unk_44, v0, v4, v2, v3, GAME_LANGUAGE);
     Strbuf_Free(v4);
@@ -2045,7 +2045,7 @@ static BOOL ov104_02231148(UnkStruct_ov104_02231148 *param0)
 
         ResetVisibleHardwareWindows(DS_SCREEN_MAIN);
         ResetVisibleHardwareWindows(DS_SCREEN_SUB);
-        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_32, FADE_TYPE_UNK_32, COLOR_BLACK, 12, 1, HEAP_ID_FIELDMAP);
+        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_32, FADE_TYPE_UNK_32, COLOR_BLACK, 12, 1, HEAP_ID_FIELD2);
         param0->unk_04++;
         break;
     default:
@@ -2070,14 +2070,14 @@ static BOOL ov104_022311BC(UnkStruct_ov104_02231148 *param0)
             break;
         }
 
-        param0->unk_28 = Window_New(HEAP_ID_FIELDMAP, 1);
+        param0->unk_28 = Window_New(HEAP_ID_FIELD2, 1);
 
         Window_Add(param0->unk_00->unk_00, param0->unk_28, 1, 0, 0, 32, 32, 0, 0);
         PaletteData_FillBufferRange(param0->unk_00->unk_04, 0, 2, 0x0, 0, 16);
         Window_FillTilemap(param0->unk_28, 0);
         Window_ScheduleCopyToVRAM(param0->unk_28);
 
-        param0->unk_2C = ov104_0223EBA0(HEAP_ID_FIELDMAP);
+        param0->unk_2C = ov104_0223EBA0(HEAP_ID_FIELD2);
         param0->unk_04++;
     case 2:
         ov104_0223EBF0(param0->unk_2C, 1, 1, param0->unk_28, 15);
@@ -2101,7 +2101,7 @@ static BOOL ov104_022311BC(UnkStruct_ov104_02231148 *param0)
             Windows_Delete(param0->unk_28, 1);
             SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
             SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
-            Bg_ClearTilesRange(BG_LAYER_MAIN_1, 32, 0, HEAP_ID_FIELDMAP);
+            Bg_ClearTilesRange(BG_LAYER_MAIN_1, 32, 0, HEAP_ID_FIELD2);
             Bg_ClearTilemap(param0->unk_00->unk_00, 1);
 
             return 0;
@@ -2124,14 +2124,14 @@ static BOOL ov104_022312D8(UnkStruct_ov104_02231148 *param0)
             break;
         }
 
-        param0->unk_28 = Window_New(HEAP_ID_FIELDMAP, 1);
+        param0->unk_28 = Window_New(HEAP_ID_FIELD2, 1);
 
         Window_Add(param0->unk_00->unk_00, param0->unk_28, 1, 0, 0, 32, 32, 0, 0);
         PaletteData_FillBufferRange(param0->unk_00->unk_04, 0, 2, 0x0, 0, 16);
         Window_FillTilemap(param0->unk_28, 0);
         Window_ScheduleCopyToVRAM(param0->unk_28);
 
-        param0->unk_2C = ov104_0223EBA0(HEAP_ID_FIELDMAP);
+        param0->unk_2C = ov104_0223EBA0(HEAP_ID_FIELD2);
         param0->unk_04++;
     case 2:
         ov104_0223EBF0(param0->unk_2C, 1, 1, param0->unk_28, 15);
@@ -2158,7 +2158,7 @@ static BOOL ov104_022312D8(UnkStruct_ov104_02231148 *param0)
             SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
             SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
 
-            Bg_ClearTilesRange(BG_LAYER_MAIN_1, 32, 0, HEAP_ID_FIELDMAP);
+            Bg_ClearTilesRange(BG_LAYER_MAIN_1, 32, 0, HEAP_ID_FIELD2);
             Bg_ClearTilemap(param0->unk_00->unk_00, 1);
 
             return 0;
@@ -2329,7 +2329,7 @@ static BOOL ov104_02231720(UnkStruct_ov104_02231148 *param0)
         MI_CpuClear8(&v0, sizeof(UnkStruct_ov104_0223F1B4));
 
         param0->unk_10 = 0;
-        param0->unk_24 = Heap_AllocFromHeap(HEAP_ID_94, sizeof(UnkStruct_ov104_022313FC));
+        param0->unk_24 = Heap_Alloc(HEAP_ID_94, sizeof(UnkStruct_ov104_022313FC));
         param0->unk_24->unk_604 = 1;
         param0->unk_24->unk_600 = ov104_0223F1B4(((u32)&reg_G2_BG2PA), &v0, HEAP_ID_94);
 
@@ -2389,7 +2389,7 @@ static BOOL ov104_02231864(UnkStruct_ov104_02231148 *param0)
         MI_CpuClear8(&v0, sizeof(UnkStruct_ov104_0223F1B4));
 
         param0->unk_10 = 0;
-        param0->unk_24 = Heap_AllocFromHeap(HEAP_ID_94, sizeof(UnkStruct_ov104_022313FC));
+        param0->unk_24 = Heap_Alloc(HEAP_ID_94, sizeof(UnkStruct_ov104_022313FC));
         param0->unk_24->unk_604 = 2;
         param0->unk_24->unk_600 = ov104_0223F1B4(((u32)&reg_G2_BG2PA), &v0, HEAP_ID_94);
 
@@ -2470,7 +2470,7 @@ static BOOL ov104_02231A28(UnkStruct_ov104_0222E930 *param0)
 
     Sound_SetSceneAndPlayBGM(SOUND_SCENE_BATTLE, SEQ_BATTLE_TRAINER, 1);
 
-    v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_02231148));
+    v1 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov104_02231148));
     v1->unk_14 = sub_0209B978(param0->unk_00->unk_00);
     v1->unk_04 = 0;
     v1->unk_08 = param0->unk_78[0];
@@ -2690,7 +2690,7 @@ static BOOL ov104_02231D1C(UnkStruct_ov104_0222E930 *param0)
     v8 = 8;
     v9 = (GX_RGB(0, 0, 0));
 
-    ov104_02232CE0(v3, v1, HEAP_ID_FIELDMAP, v7, v5, v6, 0, 0, v8, v9);
+    ov104_02232CE0(v3, v1, HEAP_ID_FIELD2, v7, v5, v6, 0, 0, v8, v9);
     return 0;
 }
 
diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c
index f7855d1c4e..68aec1b18b 100644
--- a/src/overlay104/ov104_02231F74.c
+++ b/src/overlay104/ov104_02231F74.c
@@ -221,7 +221,7 @@ static void ov104_022320FC(Strbuf *param0, u16 param1, u16 param2, u16 param3, u
     sub_02014CF8(&v0, 0, param3);
     sub_02014CF8(&v0, 1, param4);
 
-    v1 = sub_02014B34(&v0, HEAP_ID_FIELD_TASK);
+    v1 = sub_02014B34(&v0, HEAP_ID_FIELD3);
     Strbuf_Copy(param0, v1);
     Strbuf_Free(v1);
 }
@@ -279,7 +279,7 @@ UnkStruct_ov104_02232B5C *ov104_02232258(UnkStruct_ov104_022320B4 *param0, u8 pa
     UnkStruct_ov104_02232B5C *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov104_02232B5C));
+    v0 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_ov104_02232B5C));
 
     if (v0 == NULL) {
         return NULL;
@@ -853,7 +853,7 @@ void ov104_02232C80(UnkStruct_ov63_0222CCB8 *param0, UnkStruct_ov63_0222BEC0 *pa
     }
 }
 
-void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, enum HeapId heapID, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9)
+void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, enum HeapID heapID, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9)
 {
     SpriteSystem *v0 = param0->unk_34.unk_00;
     SpriteManager *v1 = param0->unk_34.unk_04;
@@ -901,7 +901,7 @@ void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, enum Heap
     {
         u32 v9, v10;
 
-        v4 = Heap_AllocFromHeap(heapID, (10 * 10 * ((8 / 2) * 8)));
+        v4 = Heap_Alloc(heapID, (10 * 10 * ((8 / 2) * 8)));
         v9 = Pokemon_GetValue(param1, MON_DATA_PERSONALITY, NULL);
         v10 = Pokemon_GetValue(param1, MON_DATA_SPECIES, NULL);
 
@@ -1071,7 +1071,7 @@ void ov104_0223310C(UnkStruct_ov104_0222E930 *param0, u16 *param1, u32 param2)
     UnkStruct_ov104_02230BE4 *v2 = sub_0209B970(param0->unk_00->unk_00);
 
     if (param1[0] == 0xFFFF) {
-        v1 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, param2, HEAP_ID_FIELD_TASK);
+        v1 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, param2, HEAP_ID_FIELD3);
 
         ov104_02231F74(param0->unk_00, v1, param1[1], 1, NULL);
         MessageLoader_Free(v1);
diff --git a/src/overlay104/ov104_022332B4.c b/src/overlay104/ov104_022332B4.c
index edea630cc9..ca37bb9718 100644
--- a/src/overlay104/ov104_022332B4.c
+++ b/src/overlay104/ov104_022332B4.c
@@ -110,7 +110,7 @@ BOOL ov104_02233324(UnkStruct_ov104_0222E930 *param0)
     };
 
     v1 = sub_0209B978(param0->unk_00->unk_00);
-    v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_02234130));
+    v2 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov104_02234130));
 
     MI_CpuClear8(v2, sizeof(UnkStruct_ov104_02234130));
 
@@ -174,7 +174,7 @@ BOOL ov104_022333F8(UnkStruct_ov104_0222E930 *param0)
         v1->unk_4DC[v0] = 0;
     }
 
-    v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_02234130));
+    v2 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov104_02234130));
     MI_CpuClear8(v2, sizeof(UnkStruct_ov104_02234130));
 
     v2->saveData = v3->saveData;
@@ -290,7 +290,7 @@ BOOL ov104_022334DC(UnkStruct_ov104_0222E930 *param0)
         *v15 = v4->unk_3F0[v13].moves[v14];
         break;
     case 17:
-        v3 = Pokemon_New(HEAP_ID_FIELDMAP);
+        v3 = Pokemon_New(HEAP_ID_FIELD2);
         ov104_0222DF40(&v4->unk_3F0[v13], v3, ov104_0223ADA0(v4));
         *v15 = Pokemon_GetValue(v3, MON_DATA_TYPE_1, NULL);
         Heap_Free(v3);
@@ -302,7 +302,7 @@ BOOL ov104_022334DC(UnkStruct_ov104_0222E930 *param0)
             v0[v10] = 0;
         }
 
-        v3 = Pokemon_New(HEAP_ID_FIELDMAP);
+        v3 = Pokemon_New(HEAP_ID_FIELD2);
 
         for (v10 = 0; v10 < v5; v10++) {
             ov104_0222DF40(&v4->unk_3F0[v10], v3, ov104_0223ADA0(v4));
@@ -381,8 +381,8 @@ BOOL ov104_022334DC(UnkStruct_ov104_0222E930 *param0)
         }
         break;
     case 33:
-        ov104_0222E278(&(v4->unk_34[0]), v4->unk_18[v4->unk_06], HEAP_ID_FIELDMAP, 178);
-        ov104_0222E278(&(v4->unk_34[1]), v4->unk_18[v4->unk_06 + 7], HEAP_ID_FIELDMAP, 178);
+        ov104_0222E278(&(v4->unk_34[0]), v4->unk_18[v4->unk_06], HEAP_ID_FIELD2, 178);
+        ov104_0222E278(&(v4->unk_34[1]), v4->unk_18[v4->unk_06 + 7], HEAP_ID_FIELD2, 178);
         break;
     case 34:
         v6 = ov104_0223AA50(v4->unk_04);
diff --git a/src/overlay104/ov104_022339B4.c b/src/overlay104/ov104_022339B4.c
index 6f48845a0d..dcc3649ea9 100644
--- a/src/overlay104/ov104_022339B4.c
+++ b/src/overlay104/ov104_022339B4.c
@@ -59,14 +59,14 @@ UnkStruct_ov104_0223ADA0 *ov104_022339B4(SaveData *saveData, u16 param1, u8 para
     u32 v6;
     static UnkStruct_ov104_0223ADA0 *v7;
 
-    v7 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_0223ADA0));
+    v7 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov104_0223ADA0));
     MI_CpuClear8(v7, sizeof(UnkStruct_ov104_0223ADA0));
 
     v7->unk_4F4 = sub_0202FF58(saveData);
     v7->saveData = saveData;
     v7->unk_00 = 11;
-    v7->unk_4D4 = Party_New(HEAP_ID_FIELDMAP);
-    v7->unk_4D8 = Party_New(HEAP_ID_FIELDMAP);
+    v7->unk_4D4 = Party_New(HEAP_ID_FIELD2);
+    v7->unk_4D8 = Party_New(HEAP_ID_FIELD2);
 
     v0 = v7->unk_4F4;
     v1 = sub_020300F4(saveData);
@@ -169,7 +169,7 @@ static void ov104_02233BAC(UnkStruct_ov104_0223ADA0 *param0)
     ov104_0223AB0C(ov104_0223AA74(param0->unk_04, 1), param0->unk_18[param0->unk_06], param0->unk_05, v2, param0->unk_3D2, param0->unk_3F0, param0->unk_3DA, param0->unk_3E0, v1);
 
     for (v0 = 0; v0 < 6; v0++) {
-        v4 = Pokemon_New(HEAP_ID_FIELDMAP);
+        v4 = Pokemon_New(HEAP_ID_FIELD2);
         ov104_0222DF40(&param0->unk_280[v0], v4, ov104_0223ADA0(param0));
         ov104_0222E1C0(param0->saveData, param0->unk_4D4, v4);
         Heap_Free(v4);
@@ -249,9 +249,9 @@ static void ov104_02233F1C(UnkStruct_ov104_0223ADA0 *param0)
         param0->unk_4E8[v0] = v6[v0];
     }
 
-    ov104_0222E330(v4, v6, v5, v7, NULL, 4, HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDPM);
+    ov104_0222E330(v4, v6, v5, v7, NULL, 4, HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDPM);
 
-    Pokemon *v1 = Pokemon_New(HEAP_ID_FIELDMAP);
+    Pokemon *v1 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v0 = 0; v0 < 4; v0++) {
         ov104_0222DF40(&v4[v0], v1, ov104_0223ADA0(param0));
@@ -270,7 +270,7 @@ static void ov104_02233F1C(UnkStruct_ov104_0223ADA0 *param0)
 
     ov104_0222E330(v4, v6, v5, v7, NULL, 4, 11, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDPM);
 
-    v1 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v1 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v0 = 0; v0 < 4; v0++) {
         ov104_0222DF40(&v4[v0], v1, ov104_0223ADA0(param0));
@@ -437,7 +437,7 @@ u16 ov104_02234440(UnkStruct_ov104_0223ADA0 *param0, u8 param1)
     FrontierTrainerDataDTO v0;
     u8 v2 = param0->unk_06 + (param1 * 7);
 
-    Heap_Free(ov104_0222DD04(&v0, param0->unk_18[v2], HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
+    Heap_Free(ov104_0222DD04(&v0, param0->unk_18[v2], HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
 
     return ov104_0222E10C(v0.trainerType);
 }
@@ -474,7 +474,7 @@ void ov104_0223449C(UnkStruct_ov104_0223ADA0 *param0)
 
     Party_Init(param0->unk_4D4);
 
-    v3 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v3 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v0 = 0; v0 < v1; v0++) {
         ov104_0222DF40(&param0->unk_280[param0->unk_4DC[v0]], v3, ov104_0223ADA0(param0));
@@ -565,7 +565,7 @@ void ov104_0223470C(UnkStruct_ov104_0223ADA0 *param0)
 
     Party_Init(param0->unk_4D8);
 
-    v3 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v3 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v0 = 0; v0 < v2; v0++) {
         ov104_0222DF40(&param0->unk_3F0[v0], v3, ov104_0223ADA0(param0));
diff --git a/src/overlay104/ov104_02234838.c b/src/overlay104/ov104_02234838.c
index 6d4806a605..77fc2c49d6 100644
--- a/src/overlay104/ov104_02234838.c
+++ b/src/overlay104/ov104_02234838.c
@@ -106,7 +106,7 @@ BOOL ov104_022348BC(UnkStruct_ov104_0222E930 *param0)
     };
 
     v3 = sub_0209B978(param0->unk_00->unk_00);
-    v4 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_02235208));
+    v4 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov104_02235208));
 
     MI_CpuClear8(v4, sizeof(UnkStruct_ov104_02235208));
 
@@ -276,8 +276,8 @@ BOOL ov104_02234A1C(UnkStruct_ov104_0222E930 *param0)
         }
         break;
     case 32:
-        ov104_0222E278(&(v3->unk_40[0]), v3->unk_18[v3->unk_05 * 2], HEAP_ID_FIELDMAP, 178);
-        ov104_0222E278(&(v3->unk_40[1]), v3->unk_18[v3->unk_05 * 2 + 1], HEAP_ID_FIELDMAP, 178);
+        ov104_0222E278(&(v3->unk_40[0]), v3->unk_18[v3->unk_05 * 2], HEAP_ID_FIELD2, 178);
+        ov104_0222E278(&(v3->unk_40[1]), v3->unk_18[v3->unk_05 * 2 + 1], HEAP_ID_FIELD2, 178);
         break;
     case 33:
         *v11 = sub_020301E0(v3->unk_6F5, &v3->unk_704[v3->unk_04][0]);
diff --git a/src/overlay104/ov104_02234DB4.c b/src/overlay104/ov104_02234DB4.c
index 478d0e6d74..4949f045f7 100644
--- a/src/overlay104/ov104_02234DB4.c
+++ b/src/overlay104/ov104_02234DB4.c
@@ -53,14 +53,14 @@ UnkStruct_ov104_0223B5C0 *ov104_02234DB4(SaveData *saveData, u16 param1, u8 para
     Pokemon *v9;
     static UnkStruct_ov104_0223B5C0 *v10;
 
-    v10 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_0223B5C0));
+    v10 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov104_0223B5C0));
     MI_CpuClear8(v10, sizeof(UnkStruct_ov104_0223B5C0));
 
     v10->unk_6F8 = sub_02030114(saveData);
     v10->saveData = saveData;
     v10->unk_00 = 11;
-    v10->unk_264 = Party_New(HEAP_ID_FIELDMAP);
-    v10->unk_D8C = Pokemon_New(HEAP_ID_FIELDMAP);
+    v10->unk_264 = Party_New(HEAP_ID_FIELD2);
+    v10->unk_D8C = Pokemon_New(HEAP_ID_FIELD2);
 
     v0 = v10->unk_6F8;
     v1 = sub_0203026C(saveData);
@@ -329,7 +329,7 @@ u16 ov104_022354C0(UnkStruct_ov104_0223B5C0 *param0, u8 param1)
     FrontierTrainerDataDTO v0;
     u8 v2 = (param0->unk_05 * 2) + param1;
 
-    Heap_Free(ov104_0222DD04(&v0, param0->unk_18[v2], HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
+    Heap_Free(ov104_0222DD04(&v0, param0->unk_18[v2], HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
 
     return ov104_0222E10C(v0.trainerType);
 }
diff --git a/src/overlay104/ov104_022358E8.c b/src/overlay104/ov104_022358E8.c
index d0b8623f90..8be699903b 100644
--- a/src/overlay104/ov104_022358E8.c
+++ b/src/overlay104/ov104_022358E8.c
@@ -118,7 +118,7 @@ BOOL ov104_0223597C(UnkStruct_ov104_0222E930 *param0)
     };
 
     v1 = sub_0209B978(param0->unk_00->unk_00);
-    v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_0223597C));
+    v2 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov104_0223597C));
 
     MI_CpuClear8(v2, sizeof(UnkStruct_ov104_0223597C));
     v2->saveData = v3->saveData;
@@ -146,7 +146,7 @@ BOOL ov104_022359D0(UnkStruct_ov104_0222E930 *param0)
     };
 
     v1 = sub_0209B978(param0->unk_00->unk_00);
-    v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_0223597C));
+    v2 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov104_0223597C));
 
     MI_CpuClear8(v2, sizeof(UnkStruct_ov104_0223597C));
     v2->saveData = v3->saveData;
@@ -222,7 +222,7 @@ BOOL ov104_02235AE8(UnkStruct_ov104_0222E930 *param0)
     };
 
     v1 = sub_0209B978(param0->unk_00->unk_00);
-    v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_0223597C));
+    v2 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov104_0223597C));
 
     MI_CpuClear8(v2, sizeof(UnkStruct_ov104_0223597C));
     v2->saveData = v3->saveData;
@@ -436,8 +436,8 @@ BOOL ov104_02235BC0(UnkStruct_ov104_0222E930 *param0)
         ov104_0223BB84(v12->unk_00, v3, 3);
         break;
     case 37:
-        ov104_0222E278(&(v3->unk_4C[0]), v3->unk_30[v3->unk_11], HEAP_ID_FIELDMAP, 178);
-        ov104_0222E278(&(v3->unk_4C[1]), v3->unk_30[v3->unk_11 + 7], HEAP_ID_FIELDMAP, 178);
+        ov104_0222E278(&(v3->unk_4C[0]), v3->unk_30[v3->unk_11], HEAP_ID_FIELD2, 178);
+        ov104_0222E278(&(v3->unk_4C[1]), v3->unk_30[v3->unk_11 + 7], HEAP_ID_FIELD2, 178);
         break;
     case 38:
         *v17 = ov104_02237338(v3);
diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c
index ffc1b8c833..e682ac9a89 100644
--- a/src/overlay104/ov104_022361B4.c
+++ b/src/overlay104/ov104_022361B4.c
@@ -71,14 +71,14 @@ UnkStruct_ov104_0223BA10 *ov104_022361B4(SaveData *saveData, u16 param1, u8 para
     static UnkStruct_ov104_0223BA10 *v9;
     UnkStruct_0203041C *v10;
 
-    v9 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_0223BA10));
+    v9 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov104_0223BA10));
     MI_CpuClear8(v9, sizeof(UnkStruct_ov104_0223BA10));
 
     v9->unk_08 = sub_020302DC(saveData);
     v9->saveData = saveData;
     v9->unk_00 = 11;
-    v9->unk_28 = Party_New(HEAP_ID_FIELDMAP);
-    v9->unk_2C = Party_New(HEAP_ID_FIELDMAP);
+    v9->unk_28 = Party_New(HEAP_ID_FIELD2);
+    v9->unk_2C = Party_New(HEAP_ID_FIELD2);
     v9->unk_A20 = param6;
 
     v4 = v9->unk_08;
@@ -213,7 +213,7 @@ static void ov104_022365F8(UnkStruct_ov104_0223BA10 *param0)
 
     ov104_0222E330(v4, v6, v5, NULL, v7, 4, 11, 179);
 
-    v2 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v2 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v1 = 0; v1 < 4; v1++) {
         ov104_0222DF40(&v4[v1], v2, ov104_0223BA10(param0));
@@ -437,7 +437,7 @@ u16 ov104_02236B58(UnkStruct_ov104_0223BA10 *param0, u8 param1)
     FrontierTrainerDataDTO v0;
     u8 v2 = param0->unk_11 + (param1 * 7);
 
-    Heap_Free(ov104_0222DD04(&v0, param0->unk_30[v2], HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
+    Heap_Free(ov104_0222DD04(&v0, param0->unk_30[v2], HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
 
     return ov104_0222E10C(v0.trainerType);
 }
@@ -683,12 +683,12 @@ void ov104_02236FC0(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 *
     GF_ASSERT(param0->unk_AC == NULL);
 
     if (ov104_0223BA14(param1->unk_10) == 0) {
-        param0->unk_A8 = Window_New(HEAP_ID_FIELDMAP, 1);
+        param0->unk_A8 = Window_New(HEAP_ID_FIELD2, 1);
         Window_Add(v0->unk_00, param0->unk_A8, 1, 1, 1, 10, 4, 14, (((((1024 - (18 + 12)) - 9) - (27 * 4)) - (11 * 22)) - (10 * 4)));
         ov104_022370C0(v0->unk_00, param0->unk_A8);
     } else {
-        param0->unk_A8 = Window_New(HEAP_ID_FIELDMAP, 1);
-        param0->unk_AC = Window_New(HEAP_ID_FIELDMAP, 1);
+        param0->unk_A8 = Window_New(HEAP_ID_FIELD2, 1);
+        param0->unk_AC = Window_New(HEAP_ID_FIELD2, 1);
 
         Window_Add(v0->unk_00, param0->unk_A8, 1, 1, 1, 10, 4, 14, (((((1024 - (18 + 12)) - 9) - (27 * 4)) - (11 * 22)) - (10 * 4)));
         Window_Add(v0->unk_00, param0->unk_AC, 1, 21, 1, 10, 4, 14, ((((((1024 - (18 + 12)) - 9) - (27 * 4)) - (11 * 22)) - (10 * 4)) - (10 * 4)));
@@ -776,7 +776,7 @@ static void ov104_02237284(UnkStruct_ov104_022320B4 *param0, Window *param1, Tra
     Strbuf *v1 = Strbuf_Init((10 * 2), param0->heapID);
     Strbuf *v2 = Strbuf_Init((10 * 2), param0->heapID);
 
-    v0 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0199, HEAP_ID_FIELDMAP);
+    v0 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0199, HEAP_ID_FIELD2);
 
     StringTemplate_SetNumber(param0->unk_44, 0, param3, 4, 1, 1);
     MessageLoader_GetStrbuf(v0, 2, v1);
diff --git a/src/overlay104/ov104_02237378.c b/src/overlay104/ov104_02237378.c
index c40fc59168..519d97a6d2 100644
--- a/src/overlay104/ov104_02237378.c
+++ b/src/overlay104/ov104_02237378.c
@@ -126,7 +126,7 @@ BOOL ov104_0223740C(UnkStruct_ov104_0222E930 *param0)
     };
 
     v1 = sub_0209B978(param0->unk_00->unk_00);
-    v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_02238240));
+    v2 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov104_02238240));
 
     MI_CpuClear8(v2, sizeof(UnkStruct_ov104_02238240));
     v2->saveData = v3->saveData;
@@ -492,8 +492,8 @@ BOOL ov104_02237748(UnkStruct_ov104_0222E930 *param0)
         ov104_02237C0C(param0, v3, v18);
         break;
     case 40:
-        ov104_0222E278(&(v3->unk_F4[0]), v3->unk_78[v3->unk_11], HEAP_ID_FIELDMAP, 178);
-        ov104_0222E278(&(v3->unk_F4[1]), v3->unk_78[v3->unk_11 + 7], HEAP_ID_FIELDMAP, 178);
+        ov104_0222E278(&(v3->unk_F4[0]), v3->unk_78[v3->unk_11], HEAP_ID_FIELD2, 178);
+        ov104_0222E278(&(v3->unk_F4[1]), v3->unk_78[v3->unk_11 + 7], HEAP_ID_FIELD2, 178);
         break;
     case 41:
         ov104_0223886C(v3, v15, v18, v19);
diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c
index 8c6f7a51c1..086b4f44dd 100644
--- a/src/overlay104/ov104_02237DD8.c
+++ b/src/overlay104/ov104_02237DD8.c
@@ -148,14 +148,14 @@ UnkStruct_ov104_0223BFFC *ov104_02237DD8(SaveData *saveData, u16 param1, u8 para
     static UnkStruct_ov104_0223BFFC *v9;
     UnkStruct_020305B8 *v10;
 
-    v9 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_0223BFFC));
+    v9 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov104_0223BFFC));
     MI_CpuClear8(v9, sizeof(UnkStruct_ov104_0223BFFC));
 
     v9->unk_08 = sub_020304A0(saveData);
     v9->saveData = saveData;
     v9->unk_00 = 11;
-    v9->unk_70 = Party_New(HEAP_ID_FIELDMAP);
-    v9->unk_74 = Party_New(HEAP_ID_FIELDMAP);
+    v9->unk_70 = Party_New(HEAP_ID_FIELD2);
+    v9->unk_74 = Party_New(HEAP_ID_FIELD2);
     v9->unk_A80 = param6;
     v9->unk_13 = 32;
 
@@ -279,9 +279,9 @@ static void ov104_02238114(UnkStruct_ov104_0223BFFC *param0)
         param0->unk_314[v1] = v6[v1];
     }
 
-    ov104_0222E330(v4, v6, v5, NULL, v7, 4, HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDPM);
+    ov104_0222E330(v4, v6, v5, NULL, v7, 4, HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDPM);
 
-    Pokemon *v2 = Pokemon_New(HEAP_ID_FIELDMAP);
+    Pokemon *v2 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v1 = 0; v1 < 4; v1++) {
         ov104_0222DF40(&v4[v1], v2, ov104_0223BFFC(param0));
@@ -444,7 +444,7 @@ u16 ov104_02238464(UnkStruct_ov104_0223BFFC *param0, u8 param1)
     FrontierTrainerDataDTO v0;
     u8 v2 = ov104_02238498(param0, param1);
 
-    Heap_Free(ov104_0222DD04(&v0, param0->unk_78[v2], HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
+    Heap_Free(ov104_0222DD04(&v0, param0->unk_78[v2], HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
 
     return ov104_0222E10C(v0.trainerType);
 }
@@ -860,7 +860,7 @@ void ov104_02238AB4(u8 param0, u8 param1)
         v1 = (9 * 16) * 2;
     }
 
-    v5 = Heap_AllocFromHeap(HEAP_ID_94, 0x1000 * 2);
+    v5 = Heap_Alloc(HEAP_ID_94, 0x1000 * 2);
     memset(v5, 0, 0x1000 * 2);
 
     v4 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, HEAP_ID_94);
diff --git a/src/overlay104/ov104_02239C58.c b/src/overlay104/ov104_02239C58.c
index 5e8e5bddc8..6c3e5ecc61 100644
--- a/src/overlay104/ov104_02239C58.c
+++ b/src/overlay104/ov104_02239C58.c
@@ -36,7 +36,7 @@ UnkStruct_0209BBA4 *ov104_02239C58(SaveData *saveData)
 {
     static UnkStruct_0209BBA4 *v0;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0209BBA4));
+    v0 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0209BBA4));
     MI_CpuClear8(v0, sizeof(UnkStruct_0209BBA4));
 
     v0->saveData = saveData;
@@ -92,7 +92,7 @@ void ov104_02239CD0(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, u16
         ov104_02239F38(param0, param1, fieldSystem, 11);
         break;
     case 2:
-        ov104_02239FB0(param0, param1, fieldSystem, HEAP_ID_FIELDMAP);
+        ov104_02239FB0(param0, param1, fieldSystem, HEAP_ID_FIELD2);
         break;
     case 3:
         ov104_0223A090(param0, param1, fieldSystem, 11);
@@ -108,7 +108,7 @@ static void ov104_02239D1C(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param
 {
     u8 v0;
 
-    param1->unk_A8 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    param1->unk_A8 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PartyManagementData));
     MI_CpuClearFast(param1->unk_A8, sizeof(PartyManagementData));
 
     param1->unk_A8->party = SaveData_GetParty(param1->saveData);
@@ -194,7 +194,7 @@ static void ov104_02239FB0(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param
         0, 1, 2, 4, 3, 5, 6, 7, 8
     };
 
-    param1->unk_AC = Heap_AllocFromHeapAtEnd(heapID, sizeof(PokemonSummary));
+    param1->unk_AC = Heap_AllocAtEnd(heapID, sizeof(PokemonSummary));
     MI_CpuClear8(param1->unk_AC, sizeof(PokemonSummary));
 
     param1->unk_AC->options = SaveData_GetOptions(param1->saveData);
diff --git a/src/overlay104/ov104_0223A7F4.c b/src/overlay104/ov104_0223A7F4.c
index 108269f53f..9545551059 100644
--- a/src/overlay104/ov104_0223A7F4.c
+++ b/src/overlay104/ov104_0223A7F4.c
@@ -323,7 +323,7 @@ void ov104_0223AB0C(u8 param0, u16 param1, u8 param2, FrontierPokemonDataDTO *pa
     }
 
     ov104_0223A918(v3, v4, param8, param0, param4, 11, v2, 0, param6);
-    ov104_0222E330(param5, param4, param6, NULL, param7, param0, HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDPM);
+    ov104_0222E330(param5, param4, param6, NULL, param7, param0, HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDPM);
 
     return;
 }
@@ -343,14 +343,14 @@ FieldBattleDTO *ov104_0223ABA0(UnkStruct_ov104_0223ADA0 *param0, UnkStruct_ov104
     Party_HealAllMembers(param0->unk_4D4);
     Party_HealAllMembers(param0->unk_4D8);
 
-    v4 = FieldBattleDTO_New(HEAP_ID_FIELDMAP, ov104_0223AD74(param0->unk_04));
+    v4 = FieldBattleDTO_New(HEAP_ID_FIELD2, ov104_0223AD74(param0->unk_04));
     FieldBattleDTO_InitFromGameState(v4, NULL, param1->saveData, param1->unk_1C, param1->journalEntry, param1->bagCursor, param1->unk_20);
 
     v4->background = BACKGROUND_BATTLE_FACTORY;
     v4->terrain = TERRAIN_BATTLE_FACTORY;
 
     Party_InitWithCapacity(v4->parties[0], v2);
-    v5 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v5 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v0 = 0; v0 < v2; v0++) {
         Pokemon_Copy(Party_GetPokemonBySlotIndex(param0->unk_4D4, v0), v5);
@@ -360,7 +360,7 @@ FieldBattleDTO *ov104_0223ABA0(UnkStruct_ov104_0223ADA0 *param0, UnkStruct_ov104
     Heap_Free(v5);
     FieldBattleDTO_CopyPlayerInfoToTrainerData(v4);
 
-    Heap_Free(ov104_0222DD04(&v6, param0->unk_18[param0->unk_06], HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
+    Heap_Free(ov104_0222DD04(&v6, param0->unk_18[param0->unk_06], HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
 
     ov104_0222E284(v4, &v6, v3, 1, 11);
     Party_InitWithCapacity(v4->parties[1], ov104_0223AA74(param0->unk_04, 0));
@@ -369,7 +369,7 @@ FieldBattleDTO *ov104_0223ABA0(UnkStruct_ov104_0223ADA0 *param0, UnkStruct_ov104
         v4->trainer[v0].header.aiMask = ov104_0223AEE4(param0);
     }
 
-    v5 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v5 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v0 = 0; v0 < v3; v0++) {
         Pokemon_Copy(Party_GetPokemonBySlotIndex(param0->unk_4D8, v0), v5);
@@ -385,12 +385,12 @@ FieldBattleDTO *ov104_0223ABA0(UnkStruct_ov104_0223ADA0 *param0, UnkStruct_ov104
 
         TrainerInfo_Copy(CommInfo_TrainerInfo(1 - CommSys_CurNetId()), v4->trainerInfo[2]);
 
-        Heap_Free(ov104_0222DD04(&v6, param0->unk_18[param0->unk_06 + 7], HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
+        Heap_Free(ov104_0222DD04(&v6, param0->unk_18[param0->unk_06 + 7], HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
 
         ov104_0222E284(v4, &v6, v3, 3, 11);
         Party_InitWithCapacity(v4->parties[3], ov104_0223AA74(param0->unk_04, 0));
 
-        v5 = Pokemon_New(HEAP_ID_FIELDMAP);
+        v5 = Pokemon_New(HEAP_ID_FIELD2);
 
         for (v0 = 0; v0 < v3; v0++) {
             Pokemon_Copy(Party_GetPokemonBySlotIndex(param0->unk_4D8, (v3 + v0)), v5);
@@ -437,7 +437,7 @@ void ov104_0223ADB0(UnkStruct_ov104_0223ADA0 *param0)
     ov104_0222E330(param0->unk_280, param0->unk_254, param0->unk_260, param0->unk_268, NULL, 6, 11, 179);
     Party_Init(param0->unk_4D4);
 
-    v1 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v1 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v0 = 0; v0 < 6; v0++) {
         ov104_0222DF40(&param0->unk_280[v0], v1, ov104_0223ADA0(param0));
@@ -463,7 +463,7 @@ void ov104_0223AE30(UnkStruct_ov104_0223ADA0 *param0)
 
     ov104_0222E330(v3, param0->unk_584, param0->unk_590, param0->unk_598, NULL, 2, 11, 179);
 
-    v2 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v2 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v0 = 0; v0 < 2; v0++) {
         ov104_0222DF40(&v3[v0], v2, ov104_0223ADA0(param0));
diff --git a/src/overlay104/ov104_0223AF58.c b/src/overlay104/ov104_0223AF58.c
index 5b8b92c543..6c15033b7b 100644
--- a/src/overlay104/ov104_0223AF58.c
+++ b/src/overlay104/ov104_0223AF58.c
@@ -1575,14 +1575,14 @@ FieldBattleDTO *ov104_0223B250(UnkStruct_ov104_0223B5C0 *param0, UnkStruct_ov104
 
     Party_HealAllMembers(v13);
 
-    FieldBattleDTO *v8 = FieldBattleDTO_New(HEAP_ID_FIELDMAP, ov104_0223B4D4(param0->unk_04));
+    FieldBattleDTO *v8 = FieldBattleDTO_New(HEAP_ID_FIELD2, ov104_0223B4D4(param0->unk_04));
     FieldBattleDTO_InitFromGameState(v8, NULL, param1->saveData, param1->unk_1C, param1->journalEntry, param1->bagCursor, param1->unk_20);
 
     v8->background = BACKGROUND_BATTLE_HALL;
     v8->terrain = TERRAIN_BATTLE_HALL;
     Party_InitWithCapacity(v8->parties[0], v4);
 
-    v9 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v9 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v1 = 0; v1 < v4; v1++) {
         Pokemon_Copy(Party_GetPokemonBySlotIndex(v13, param0->unk_260[v1]), v9);
@@ -1592,7 +1592,7 @@ FieldBattleDTO *ov104_0223B250(UnkStruct_ov104_0223B5C0 *param0, UnkStruct_ov104
     Heap_Free(v9);
     FieldBattleDTO_CopyPlayerInfoToTrainerData(v8);
 
-    Heap_Free(ov104_0222DD04(&v10, param0->unk_18[v6], HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
+    Heap_Free(ov104_0222DD04(&v10, param0->unk_18[v6], HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
     ov104_0222E284(v8, &v10, v5, 1, 11);
     Party_InitWithCapacity(v8->parties[1], v5);
 
@@ -1608,9 +1608,9 @@ FieldBattleDTO *ov104_0223B250(UnkStruct_ov104_0223B5C0 *param0, UnkStruct_ov104
         v8->trainer[v1].header.aiMask = v2;
     }
 
-    ov104_0223B518(&param0->unk_290[v6], v7, param0->unk_18[v6], &param0->unk_268[v6], v5, HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_STAGE__PL_BSDPM);
+    ov104_0223B518(&param0->unk_290[v6], v7, param0->unk_18[v6], &param0->unk_268[v6], v5, HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_STAGE__PL_BSDPM);
 
-    v9 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v9 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v1 = 0; v1 < v5; v1++) {
         while (TRUE) {
@@ -1634,12 +1634,12 @@ FieldBattleDTO *ov104_0223B250(UnkStruct_ov104_0223B5C0 *param0, UnkStruct_ov104
 
         TrainerInfo_Copy(CommInfo_TrainerInfo(1 - CommSys_CurNetId()), v8->trainerInfo[2]);
 
-        Heap_Free(ov104_0222DD04(&v10, param0->unk_18[v6 + 1], HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
+        Heap_Free(ov104_0222DD04(&v10, param0->unk_18[v6 + 1], HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
 
         ov104_0222E284(v8, &v10, v5, 3, 11);
         Party_InitWithCapacity(v8->parties[3], v5);
 
-        v9 = Pokemon_New(HEAP_ID_FIELDMAP);
+        v9 = Pokemon_New(HEAP_ID_FIELD2);
 
         while (TRUE) {
             if (ov104_0223B4A4(param0, v6) == 0) {
diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c
index 051aa042a2..b95ca3473f 100644
--- a/src/overlay104/ov104_0223B6F4.c
+++ b/src/overlay104/ov104_0223B6F4.c
@@ -163,7 +163,7 @@ FieldBattleDTO *ov104_0223B810(UnkStruct_ov104_0223BA10 *param0, UnkStruct_ov104
     u8 v3 = ov104_0223B7DC(param0->unk_10, 0);
 
     Party_HealAllMembers(param0->unk_2C);
-    FieldBattleDTO *v5 = FieldBattleDTO_New(HEAP_ID_FIELDMAP, ov104_0223B9E4(param0->unk_10));
+    FieldBattleDTO *v5 = FieldBattleDTO_New(HEAP_ID_FIELD2, ov104_0223B9E4(param0->unk_10));
     FieldBattleDTO_InitFromGameState(v5, NULL, param1->saveData, param1->unk_1C, param1->journalEntry, param1->bagCursor, param1->unk_20);
 
     v5->background = BACKGROUND_BATTLE_CASTLE;
@@ -177,7 +177,7 @@ FieldBattleDTO *ov104_0223B810(UnkStruct_ov104_0223BA10 *param0, UnkStruct_ov104
         v4 = 2;
     }
 
-    v6 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v6 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v0 = 0; v0 < v2; v0++) {
         Pokemon_Copy(Party_GetPokemonBySlotIndex(param0->unk_28, (v4 + v0)), v6);
@@ -188,7 +188,7 @@ FieldBattleDTO *ov104_0223B810(UnkStruct_ov104_0223BA10 *param0, UnkStruct_ov104
     Heap_Free(v6);
     FieldBattleDTO_CopyPlayerInfoToTrainerData(v5);
 
-    Heap_Free(ov104_0222DD04(&v7, param0->unk_30[param0->unk_11], HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
+    Heap_Free(ov104_0222DD04(&v7, param0->unk_30[param0->unk_11], HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
     ov104_0222E284(v5, &v7, v3, 1, 11);
     Party_InitWithCapacity(v5->parties[1], ov104_0223B7DC(param0->unk_10, 0));
 
@@ -196,7 +196,7 @@ FieldBattleDTO *ov104_0223B810(UnkStruct_ov104_0223BA10 *param0, UnkStruct_ov104
         v5->trainer[v0].header.aiMask = ov104_0223BB10(param0);
     }
 
-    v6 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v6 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v0 = 0; v0 < v3; v0++) {
         Pokemon_Copy(Party_GetPokemonBySlotIndex(param0->unk_2C, v0), v6);
@@ -212,12 +212,12 @@ FieldBattleDTO *ov104_0223B810(UnkStruct_ov104_0223BA10 *param0, UnkStruct_ov104
 
         TrainerInfo_Copy(CommInfo_TrainerInfo(1 - CommSys_CurNetId()), v5->trainerInfo[2]);
 
-        Heap_Free(ov104_0222DD04(&v7, param0->unk_30[param0->unk_11 + 7], HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
+        Heap_Free(ov104_0222DD04(&v7, param0->unk_30[param0->unk_11 + 7], HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR));
 
         ov104_0222E284(v5, &v7, v3, 3, 11);
         Party_InitWithCapacity(v5->parties[3], ov104_0223B7DC(param0->unk_10, 0));
 
-        v6 = Pokemon_New(HEAP_ID_FIELDMAP);
+        v6 = Pokemon_New(HEAP_ID_FIELD2);
 
         for (v0 = 0; v0 < v3; v0++) {
             Pokemon_Copy(Party_GetPokemonBySlotIndex(param0->unk_2C, (v3 + v0)), v6);
@@ -312,7 +312,7 @@ void ov104_0223BAB8(UnkStruct_ov104_0223BA10 *param0)
     Party_Init(param0->unk_2C);
 
     v2 = ov104_0223B7DC(param0->unk_10, 1);
-    v3 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v3 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v0 = 0; v0 < v2; v0++) {
         ov104_0222DF40(&param0->unk_288[v0], v3, ov104_0223BA10(param0));
diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c
index 2e661c0bba..5117d746c6 100644
--- a/src/overlay104/ov104_0223BCBC.c
+++ b/src/overlay104/ov104_0223BCBC.c
@@ -168,7 +168,7 @@ FieldBattleDTO *ov104_0223BDD8(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104
 
     v2 = ov104_0223BD70(param0->unk_10, 0);
     v3 = ov104_0223BDA4(param0->unk_10, 0);
-    FieldBattleDTO *v5 = FieldBattleDTO_New(HEAP_ID_FIELDMAP, ov104_0223BFD0(param0->unk_10));
+    FieldBattleDTO *v5 = FieldBattleDTO_New(HEAP_ID_FIELD2, ov104_0223BFD0(param0->unk_10));
 
     FieldBattleDTO_InitFromGameState(v5, NULL, param1->saveData, param1->unk_1C, param1->journalEntry, param1->bagCursor, param1->unk_20);
 
@@ -192,7 +192,7 @@ FieldBattleDTO *ov104_0223BDD8(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104
         v4 = 2;
     }
 
-    v6 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v6 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v0 = 0; v0 < v2; v0++) {
         Pokemon_Copy(Party_GetPokemonBySlotIndex(v12, (v4 + v0)), v6);
@@ -202,7 +202,7 @@ FieldBattleDTO *ov104_0223BDD8(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104
     Heap_Free(v6);
     FieldBattleDTO_CopyPlayerInfoToTrainerData(v5);
 
-    BattleFrontierTrainerData *v8 = ov104_0222DD04(&v7, param0->unk_78[param0->unk_11], HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR);
+    BattleFrontierTrainerData *v8 = ov104_0222DD04(&v7, param0->unk_78[param0->unk_11], HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR);
 
     Heap_Free(v8);
     ov104_0222E284(v5, &v7, v3, 1, 11);
@@ -212,7 +212,7 @@ FieldBattleDTO *ov104_0223BDD8(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104
         v5->trainer[v0].header.aiMask = ov104_0223C0D0(param0);
     }
 
-    v6 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v6 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v0 = 0; v0 < v3; v0++) {
         Pokemon_Copy(Party_GetPokemonBySlotIndex(v13, v0), v6);
@@ -228,13 +228,13 @@ FieldBattleDTO *ov104_0223BDD8(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104
 
         TrainerInfo_Copy(CommInfo_TrainerInfo(1 - CommSys_CurNetId()), v5->trainerInfo[2]);
 
-        v8 = ov104_0222DD04(&v7, param0->unk_78[param0->unk_11 + 7], HEAP_ID_FIELDMAP, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR);
+        v8 = ov104_0222DD04(&v7, param0->unk_78[param0->unk_11 + 7], HEAP_ID_FIELD2, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR);
         Heap_Free(v8);
 
         ov104_0222E284(v5, &v7, v3, 3, 11);
         Party_InitWithCapacity(v5->parties[3], ov104_0223BDA4(param0->unk_10, 0));
 
-        v6 = Pokemon_New(HEAP_ID_FIELDMAP);
+        v6 = Pokemon_New(HEAP_ID_FIELD2);
 
         for (v0 = 0; v0 < v3; v0++) {
             Pokemon_Copy(Party_GetPokemonBySlotIndex(v13, (v3 + v0)), v6);
@@ -308,7 +308,7 @@ void ov104_0223C04C(UnkStruct_ov104_0223BFFC *param0)
     Party_Init(param0->unk_74);
 
     v3 = ov104_0223BDA4(param0->unk_10, 1);
-    v5 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v5 = Pokemon_New(HEAP_ID_FIELD2);
 
     for (v1 = 0; v1 < v3; v1++) {
         ov104_0222DF40(&param0->unk_330[v1], v5, ov104_0223BFFC(param0));
diff --git a/src/overlay104/ov104_0223C164.c b/src/overlay104/ov104_0223C164.c
index fe7998c4bc..222c8cca23 100644
--- a/src/overlay104/ov104_0223C164.c
+++ b/src/overlay104/ov104_0223C164.c
@@ -29,7 +29,7 @@ static void ov104_0223C208(u16 *param0, u8 param1);
 
 UnkStruct_ov104_0223C23C *ov104_0223C164(BgConfig *param0)
 {
-    UnkStruct_ov104_0223C23C *v0 = Heap_AllocFromHeap(HEAP_ID_94, sizeof(UnkStruct_ov104_0223C23C));
+    UnkStruct_ov104_0223C23C *v0 = Heap_Alloc(HEAP_ID_94, sizeof(UnkStruct_ov104_0223C23C));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223C23C));
     v0->unk_04 = ov104_0223C188(param0);
 
@@ -38,7 +38,7 @@ UnkStruct_ov104_0223C23C *ov104_0223C164(BgConfig *param0)
 
 static UnkStruct_ov104_0223C188 *ov104_0223C188(BgConfig *param0)
 {
-    UnkStruct_ov104_0223C188 *v0 = Heap_AllocFromHeap(HEAP_ID_94, sizeof(UnkStruct_ov104_0223C188));
+    UnkStruct_ov104_0223C188 *v0 = Heap_Alloc(HEAP_ID_94, sizeof(UnkStruct_ov104_0223C188));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223C188));
 
     v0->unk_04 = param0;
diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c
index 765245df65..5f2ff4e8dc 100644
--- a/src/overlay104/ov104_0223C2D4.c
+++ b/src/overlay104/ov104_0223C2D4.c
@@ -135,7 +135,7 @@ UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0)
 
     Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_94, 0x90000);
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_94, sizeof(UnkStruct_ov104_0223C4CC));
+    v0 = Heap_Alloc(HEAP_ID_94, sizeof(UnkStruct_ov104_0223C4CC));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223C4CC));
 
     v0->unk_08 = param0;
diff --git a/src/overlay104/ov104_0223D5D0.c b/src/overlay104/ov104_0223D5D0.c
index 6304157c23..42efc900bd 100644
--- a/src/overlay104/ov104_0223D5D0.c
+++ b/src/overlay104/ov104_0223D5D0.c
@@ -19,7 +19,7 @@ static void ov104_0223D708(ParticleSystem *param0);
 
 UnkStruct_ov104_0223D5F0 *ov104_0223D5D0(int heapID)
 {
-    UnkStruct_ov104_0223D5F0 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_0223D5F0));
+    UnkStruct_ov104_0223D5F0 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov104_0223D5F0));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223D5F0));
 
     v0->heapID = heapID;
@@ -51,7 +51,7 @@ ParticleSystem *ov104_0223D614(UnkStruct_ov104_0223D5F0 *param0, int param1, int
 
     GF_ASSERT(param0->unk_00[param1] == NULL);
 
-    v1 = Heap_AllocFromHeap(param0->heapID, 0x4800);
+    v1 = Heap_Alloc(param0->heapID, 0x4800);
     v0 = ParticleSystem_New(ov104_0223D720, ov104_0223D744, v1, 0x4800, 1, param0->heapID);
     camera = ParticleSystem_GetCamera(v0);
 
diff --git a/src/overlay104/ov104_0223D9E4.c b/src/overlay104/ov104_0223D9E4.c
index 44faddef34..b31cf6fb3d 100644
--- a/src/overlay104/ov104_0223D9E4.c
+++ b/src/overlay104/ov104_0223D9E4.c
@@ -61,7 +61,7 @@ static const u16 Unk_ov104_022418B0[] = {
 
 UnkStruct_ov104_0223DA28 *ov104_0223D9E4(BgConfig *param0, PaletteData *param1)
 {
-    UnkStruct_ov104_0223DA28 *v0 = Heap_AllocFromHeap(HEAP_ID_94, sizeof(UnkStruct_ov104_0223DA28));
+    UnkStruct_ov104_0223DA28 *v0 = Heap_Alloc(HEAP_ID_94, sizeof(UnkStruct_ov104_0223DA28));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223DA28));
 
     v0->unk_00 = ov104_0223DA40(param0);
@@ -85,7 +85,7 @@ static UnkStruct_ov104_0223DB34 *ov104_0223DA40(BgConfig *param0)
 
     GF_ASSERT(2 == NELEMS(Unk_ov104_022418B0));
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_94, sizeof(UnkStruct_ov104_0223DB34));
+    v0 = Heap_Alloc(HEAP_ID_94, sizeof(UnkStruct_ov104_0223DB34));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223DB34));
     v0->unk_04 = param0;
 
@@ -160,7 +160,7 @@ static void ov104_0223DB48(SysTask *param0, void *param1)
 
 static UnkStruct_ov104_0223DC04 *ov104_0223DBB8(PaletteData *param0)
 {
-    UnkStruct_ov104_0223DC04 *v0 = Heap_AllocFromHeap(HEAP_ID_94, sizeof(UnkStruct_ov104_0223DC04));
+    UnkStruct_ov104_0223DC04 *v0 = Heap_Alloc(HEAP_ID_94, sizeof(UnkStruct_ov104_0223DC04));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223DC04));
 
     v0->unk_04 = param0;
diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c
index 3a54766008..1a7a403c9e 100644
--- a/src/overlay104/ov104_0223DC7C.c
+++ b/src/overlay104/ov104_0223DC7C.c
@@ -243,7 +243,7 @@ static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 heapID, const U
 
     switch (param0->unk_00) {
     case 0:
-        param0->unk_0C = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_0223DDE4));
+        param0->unk_0C = Heap_Alloc(heapID, sizeof(UnkStruct_ov104_0223DDE4));
         memset(param0->unk_0C, 0, sizeof(UnkStruct_ov104_0223DDE4));
 
         v0 = param0->unk_0C;
diff --git a/src/overlay104/ov104_0223E894.c b/src/overlay104/ov104_0223E894.c
index b4d3234b58..6d80baa7da 100644
--- a/src/overlay104/ov104_0223E894.c
+++ b/src/overlay104/ov104_0223E894.c
@@ -82,7 +82,7 @@ static void ov104_0223F070(SysTask *param0, void *param1);
 void ov104_0223E894(int param0, u32 param1, u32 param2, BOOL *param3, u32 param4)
 {
     SysTask *v0;
-    UnkStruct_ov104_0223E894 *v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_0223E894));
+    UnkStruct_ov104_0223E894 *v1 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov104_0223E894));
     memset(v1, 0, sizeof(UnkStruct_ov104_0223E894));
 
     SysTask_Start(ov104_0223E8D8, v1, 5);
@@ -214,7 +214,7 @@ BOOL ov104_0223EA38(UnkStruct_ov104_0223EA38 *param0)
 
 UnkStruct_ov104_0223EA84 *ov104_0223EA64(u32 heapID)
 {
-    UnkStruct_ov104_0223EA84 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_0223EA84));
+    UnkStruct_ov104_0223EA84 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov104_0223EA84));
     memset(v0, 0, sizeof(UnkStruct_ov104_0223EA84));
 
     return v0;
@@ -300,7 +300,7 @@ UnkStruct_ov104_0223EBD0 *ov104_0223EBA0(u32 heapID)
     UnkStruct_ov104_0223EBD0 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_0223EBD0));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov104_0223EBD0));
     memset(v0, 0, sizeof(UnkStruct_ov104_0223EBD0));
 
     for (v1 = 0; v1 < ((256 / 16) * (192 / 32)); v1++) {
@@ -597,7 +597,7 @@ UnkStruct_ov104_0223F174 *ov104_0223F1B4(u32 param0, UnkStruct_ov104_0223F1B4 *p
     UnkStruct_ov104_0223F174 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov104_0223F174));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov104_0223F174));
     memset(v0, 0, sizeof(UnkStruct_ov104_0223F174));
 
     GF_ASSERT(v0);
diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c
index 4b32b78119..62df78b950 100644
--- a/src/overlay105/ov105_02241AE0.c
+++ b/src/overlay105/ov105_02241AE0.c
@@ -2869,7 +2869,7 @@ static void ov105_022453F8(UnkStruct_ov105_02241FF4 *param0, u8 param1, u8 param
 
 static void ov105_02245464(UnkStruct_ov105_02241FF4 *param0)
 {
-    param0->unk_140 = Heap_AllocFromHeap(HEAP_ID_93, sizeof(PokemonSummary));
+    param0->unk_140 = Heap_Alloc(HEAP_ID_93, sizeof(PokemonSummary));
     memset(param0->unk_140, 0, sizeof(PokemonSummary));
 
     param0->unk_140->monData = param0->unk_31C;
diff --git a/src/overlay105/ov105_02245DC4.c b/src/overlay105/ov105_02245DC4.c
index 4f0be38613..b7594b57fd 100644
--- a/src/overlay105/ov105_02245DC4.c
+++ b/src/overlay105/ov105_02245DC4.c
@@ -22,7 +22,7 @@ BOOL ov105_02245E48(UnkStruct_ov105_02245E1C *param0);
 
 UnkStruct_ov105_02245E1C *ov105_02245DC4(UnkStruct_ov105_02245AAC *param0, u32 param1, int param2, int param3, u32 heapID)
 {
-    UnkStruct_ov105_02245E1C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov105_02245E1C));
+    UnkStruct_ov105_02245E1C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov105_02245E1C));
     memset(v0, 0, sizeof(UnkStruct_ov105_02245E1C));
 
     v0->unk_00 = param2;
diff --git a/src/overlay105/ov105_02245E54.c b/src/overlay105/ov105_02245E54.c
index a4febe307a..7cc7207ca0 100644
--- a/src/overlay105/ov105_02245E54.c
+++ b/src/overlay105/ov105_02245E54.c
@@ -35,7 +35,7 @@ void ov105_02245FAC(UnkStruct_ov105_02245EA8 *param0, u32 param1);
 
 UnkStruct_ov105_02245EA8 *ov105_02245E54(UnkStruct_ov105_02245AAC *param0, int param1, int param2, u32 heapID)
 {
-    UnkStruct_ov105_02245EA8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov105_02245EA8));
+    UnkStruct_ov105_02245EA8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov105_02245EA8));
     memset(v0, 0, sizeof(UnkStruct_ov105_02245EA8));
 
     v0->unk_00 = 0;
diff --git a/src/overlay105/ov105_02245FB8.c b/src/overlay105/ov105_02245FB8.c
index a09e28d0b0..185da51ceb 100644
--- a/src/overlay105/ov105_02245FB8.c
+++ b/src/overlay105/ov105_02245FB8.c
@@ -36,7 +36,7 @@ UnkStruct_ov105_02246060 *ov105_02245FB8(UnkStruct_ov105_02245AAC *param0, u8 pa
     UnkStruct_ov105_02246060 *v0;
     VecFx32 v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_93, sizeof(UnkStruct_ov105_02246060));
+    v0 = Heap_Alloc(HEAP_ID_93, sizeof(UnkStruct_ov105_02246060));
     memset(v0, 0, sizeof(UnkStruct_ov105_02246060));
 
     v0->unk_00 = param1;
diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c
index 06c2761a81..ab4d4ec0fa 100644
--- a/src/overlay106/ov106_02241AE0.c
+++ b/src/overlay106/ov106_02241AE0.c
@@ -1199,7 +1199,7 @@ static void ov106_02242C2C(UnkStruct_ov106_02243118 *param0, Window *param1)
 
 static void ov106_02242CA4(UnkStruct_ov106_02243118 *param0)
 {
-    param0->unk_BC = Heap_AllocFromHeap(HEAP_ID_98, sizeof(PokemonSummary));
+    param0->unk_BC = Heap_Alloc(HEAP_ID_98, sizeof(PokemonSummary));
     memset(param0->unk_BC, 0, sizeof(PokemonSummary));
 
     param0->unk_BC->monData = param0->unk_290;
diff --git a/src/overlay106/ov106_022435FC.c b/src/overlay106/ov106_022435FC.c
index a0f4280110..b74af58481 100644
--- a/src/overlay106/ov106_022435FC.c
+++ b/src/overlay106/ov106_022435FC.c
@@ -32,7 +32,7 @@ UnkStruct_ov106_02243650 *ov106_022435FC(UnkStruct_ov106_02243310 *param0, u32 p
     UnkStruct_ov106_02243650 *v0;
     VecFx32 v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_98, sizeof(UnkStruct_ov106_02243650));
+    v0 = Heap_Alloc(HEAP_ID_98, sizeof(UnkStruct_ov106_02243650));
     memset(v0, 0, sizeof(UnkStruct_ov106_02243650));
 
     v0->unk_0C = param5;
diff --git a/src/overlay107/ov107_02249B1C.c b/src/overlay107/ov107_02249B1C.c
index 5cccbf455e..962eca493c 100644
--- a/src/overlay107/ov107_02249B1C.c
+++ b/src/overlay107/ov107_02249B1C.c
@@ -38,7 +38,7 @@ UnkStruct_ov107_02249B8C *ov107_02249B1C(UnkStruct_ov107_02249954 *param0, u32 p
     UnkStruct_ov107_02249B8C *v0;
     VecFx32 v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_100, sizeof(UnkStruct_ov107_02249B8C));
+    v0 = Heap_Alloc(HEAP_ID_100, sizeof(UnkStruct_ov107_02249B8C));
     memset(v0, 0, sizeof(UnkStruct_ov107_02249B8C));
 
     v0->unk_00 = param5;
diff --git a/src/overlay108/ov108_0224351C.c b/src/overlay108/ov108_0224351C.c
index fde7b6bbb2..c55ec40a9a 100644
--- a/src/overlay108/ov108_0224351C.c
+++ b/src/overlay108/ov108_0224351C.c
@@ -36,7 +36,7 @@ UnkStruct_ov108_02243594 *ov108_0224351C(UnkStruct_ov108_02243030 *param0, u32 p
     UnkStruct_ov108_02243594 *v0;
     VecFx32 v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_103, sizeof(UnkStruct_ov108_02243594));
+    v0 = Heap_Alloc(HEAP_ID_103, sizeof(UnkStruct_ov108_02243594));
     memset(v0, 0, sizeof(UnkStruct_ov108_02243594));
 
     v0->unk_10 = ov108_022430F0(param0, param1, param2, param3, param4, param7, param8, param9);
diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c
index 33431d713b..45e09d8c16 100644
--- a/src/overlay109/ov109_021D0D80.c
+++ b/src/overlay109/ov109_021D0D80.c
@@ -2583,7 +2583,7 @@ static SysTask *ov109_021D2FE0(UnkStruct_ov109_021D0F70 *param0, int param1, int
     param6->unk_00 = 1;
     param6->unk_08 = 0;
 
-    v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_95, sizeof(UnkStruct_ov109_021D2FE0));
+    v1 = Heap_AllocAtEnd(HEAP_ID_95, sizeof(UnkStruct_ov109_021D2FE0));
     memset(v1, 0, sizeof(UnkStruct_ov109_021D2FE0));
     v1->unk_14 = param0;
     v1->unk_10 = param6;
@@ -3075,7 +3075,7 @@ static void ov109_021D3600(SysTask *param0, void *param1)
 static SysTask *ov109_021D3684(UnkStruct_ov109_021D0F70 *param0)
 {
     SpriteTemplate v0;
-    UnkStruct_ov109_021D3600 *v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_95, sizeof(UnkStruct_ov109_021D3600));
+    UnkStruct_ov109_021D3600 *v1 = Heap_AllocAtEnd(HEAP_ID_95, sizeof(UnkStruct_ov109_021D3600));
 
     memset(v1, 0, sizeof(UnkStruct_ov109_021D3600));
 
@@ -3297,7 +3297,7 @@ static void ov109_021D3990(UnkStruct_ov109_021D0F70 *param0, int param1)
 {
     SysTask *v0;
     u32 v1[2] = { 0, 8 };
-    UnkStruct_ov109_021D3948 *v2 = Heap_AllocFromHeapAtEnd(HEAP_ID_95, sizeof(UnkStruct_ov109_021D3948));
+    UnkStruct_ov109_021D3948 *v2 = Heap_AllocAtEnd(HEAP_ID_95, sizeof(UnkStruct_ov109_021D3948));
 
     v2->unk_00 = param0;
     v2->unk_04 = param1;
@@ -3342,9 +3342,9 @@ static void *ov109_021D3A2C(UnkStruct_ov109_021D0F70 *param0, u32 param1, BOOL p
     u32 v1 = NARC_GetMemberSize(param0->unk_D80, param1);
 
     if (param2 == 1) {
-        v0 = Heap_AllocFromHeap(HEAP_ID_95, v1);
+        v0 = Heap_Alloc(HEAP_ID_95, v1);
     } else {
-        v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_95, v1);
+        v0 = Heap_AllocAtEnd(HEAP_ID_95, v1);
     }
 
     NARC_ReadWholeMember(param0->unk_D80, param1, v0);
@@ -3460,7 +3460,7 @@ static void ov109_021D3B70(UnkStruct_ov109_021D0F70 *param0, int param1)
     v4 = Party_GetPokemonBySlotIndex(v2, v0);
     v5 = Party_GetPokemonBySlotIndex(v3, v1);
 
-    UpdateMonStatusAndTrainerInfo(v5, CommInfo_TrainerInfo(CommSys_CurNetId()), 5, 0, HEAP_ID_FIELDMAP);
+    UpdateMonStatusAndTrainerInfo(v5, CommInfo_TrainerInfo(CommSys_CurNetId()), 5, 0, HEAP_ID_FIELD2);
     Pokemon_Copy(v5, v4);
 }
 
diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c
index ce69c1b4f2..d83475e540 100644
--- a/src/overlay111/ov111_021D0D80.c
+++ b/src/overlay111/ov111_021D0D80.c
@@ -2111,7 +2111,7 @@ static void ov111_021D2E4C(UnkStruct_ov111_021D0F7C *param0)
 
 static void ov111_021D2E8C(UnkStruct_ov111_021D0F7C *param0)
 {
-    param0->unk_3F8 = Heap_AllocFromHeap(HEAP_ID_115, param0->unk_3F4->szByte);
+    param0->unk_3F8 = Heap_Alloc(HEAP_ID_115, param0->unk_3F4->szByte);
 
     if (param0->unk_3F8 == NULL) {
         GF_ASSERT(param0->unk_3F8 != NULL);
diff --git a/src/overlay111/ov111_021D33F4.c b/src/overlay111/ov111_021D33F4.c
index 5bf9365888..ebe0f0ef5e 100644
--- a/src/overlay111/ov111_021D33F4.c
+++ b/src/overlay111/ov111_021D33F4.c
@@ -38,7 +38,7 @@ UnkStruct_ov111_021D33F4 *ov111_021D33F4(UnkStruct_ov111_021D2F80 *param0, u32 p
     UnkStruct_ov111_021D33F4 *v0;
     VecFx32 v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_115, sizeof(UnkStruct_ov111_021D33F4));
+    v0 = Heap_Alloc(HEAP_ID_115, sizeof(UnkStruct_ov111_021D33F4));
     memset(v0, 0, sizeof(UnkStruct_ov111_021D33F4));
     v0->unk_0C = ov111_021D3280(param0, param1, param2, param6, param7, param5);
     v0->unk_02 = param5;
diff --git a/src/overlay113/ov113_0225E368.c b/src/overlay113/ov113_0225E368.c
index 73e7ff8d8d..3e20e196f9 100644
--- a/src/overlay113/ov113_0225E368.c
+++ b/src/overlay113/ov113_0225E368.c
@@ -539,7 +539,7 @@ static UnkStruct_ov113_0225E6B8 *ov113_0225E6B8(UnkStruct_ov113_0225DBCC *param0
     fx32 v1, v2;
     BOOL v3;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_118, sizeof(UnkStruct_ov113_0225E6B8));
+    v0 = Heap_Alloc(HEAP_ID_118, sizeof(UnkStruct_ov113_0225E6B8));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov113_0225E6B8));
 
     v0->unk_240_24 = 0xff;
@@ -775,7 +775,7 @@ static void ov113_0225EA60(NNSG3dResTex *param0, int param1)
     int v2, v3, v4, v5, v6;
 
     v0 = (u32 *)((u8 *)param0 + param0->texInfo.ofsTex);
-    v1 = Heap_AllocFromHeap(HEAP_ID_118, (16 * 16 / 4));
+    v1 = Heap_Alloc(HEAP_ID_118, (16 * 16 / 4));
 
     MI_CpuCopy16(v0, v1, (16 * 16 / 4));
     MI_CpuClear16(v0, (16 * 16 / 4));
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index c268311988..145a5805fa 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -1083,7 +1083,7 @@ BOOL ov114_0225CA98(const UnkStruct_ov114_0225C76C *param0)
 
 UnkStruct_ov114_0225CAD4 *ov114_0225CAD4(SpriteList *param0, u32 heapID)
 {
-    UnkStruct_ov114_0225CAD4 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov114_0225CAD4));
+    UnkStruct_ov114_0225CAD4 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov114_0225CAD4));
     memset(v0, 0, sizeof(UnkStruct_ov114_0225CAD4));
 
     v0->unk_08 = param0;
@@ -1212,7 +1212,7 @@ static void ov114_0225CCD0(UnkStruct_ov114_0225CCD0 *param0, u32 param1, u32 hea
         param0->unk_00[v0] = SpriteResourceCollection_New(param1, v0, heapID);
     }
 
-    param0->unk_10 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov114_0225CDB4) * param1);
+    param0->unk_10 = Heap_Alloc(heapID, sizeof(UnkStruct_ov114_0225CDB4) * param1);
     memset(param0->unk_10, 0, sizeof(UnkStruct_ov114_0225CDB4) * param1);
     param0->unk_14 = param1;
 }
@@ -1612,7 +1612,7 @@ static UnkStruct_ov114_0225D678 *ov114_0225D48C(const UnkStruct_ov114_0225C76C *
 
     Sound_SetSceneAndPlayBGM(SOUND_SCENE_19, SEQ_PL_WIFIGAME, 0);
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov114_0225D678));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov114_0225D678));
     memset(v0, 0, sizeof(UnkStruct_ov114_0225D678));
     memcpy(&v0->unk_08, param0, sizeof(UnkStruct_ov114_0225C76C));
 
@@ -2452,7 +2452,7 @@ static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *
     UnkStruct_ov114_0225E854 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov114_0225E854));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov114_0225E854));
     memset(v0, 0, sizeof(UnkStruct_ov114_0225E854));
     memcpy(&v0->unk_1C, param1, sizeof(UnkStruct_ov114_0225C9A8));
     memcpy(&v0->unk_0C, param0, sizeof(UnkStruct_ov114_0225C76C));
diff --git a/src/overlay115/ov115_02260BBC.c b/src/overlay115/ov115_02260BBC.c
index 1a5610b5d3..7724195fc0 100644
--- a/src/overlay115/ov115_02260BBC.c
+++ b/src/overlay115/ov115_02260BBC.c
@@ -26,7 +26,7 @@ static u32 ov115_02260CCC(const UnkStruct_ov115_02260BE4 *param0);
 
 UnkStruct_ov115_02260BE4 *ov115_02260BBC(u32 heapID, u32 param1, u32 param2, const UnkStruct_ov115_02262F50 *param3)
 {
-    UnkStruct_ov115_02260BE4 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov115_02260BE4));
+    UnkStruct_ov115_02260BE4 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov115_02260BE4));
     memset(v0, 0, sizeof(UnkStruct_ov115_02260BE4));
 
     v0->unk_00 = param1;
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index f5c0c7eb98..c3f5203ede 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -711,7 +711,7 @@ UnkStruct_ov115_02260D78 *ov115_02260CEC(u32 heapID, u32 param1, u32 param2, u32
     UnkStruct_ov115_02260D78 *v0;
     u32 v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov115_02260D78));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov115_02260D78));
     memset(v0, 0, sizeof(UnkStruct_ov115_02260D78));
 
     v0->unk_04 = 1;
@@ -2873,7 +2873,7 @@ static void ov115_022633FC(UnkStruct_ov115_02260D78 *param0, u32 heapID)
 {
     NARC *v0;
 
-    Heap_FndInitAllocatorForExpHeap(&param0->unk_1AB4.unk_6BBC, heapID, 32);
+    HeapExp_FndInitAllocator(&param0->unk_1AB4.unk_6BBC, heapID, 32);
 
     ov115_02263308();
     ov115_022633B4(&param0->unk_1AB4, param0->unk_10, param0->unk_14, heapID);
diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c
index 490b2b1968..57a837d4ee 100644
--- a/src/overlay116/ov116_022604C4.c
+++ b/src/overlay116/ov116_022604C4.c
@@ -792,7 +792,7 @@ static void ov116_022612CC(UnkStruct_ov116_0226139C *param0)
         G3X_SetEdgeColorTable(v0);
     }
 
-    Heap_FndInitAllocatorForExpHeap(&param0->unk_48.unk_24, HEAP_ID_106, 32);
+    HeapExp_FndInitAllocator(&param0->unk_48.unk_24, HEAP_ID_106, 32);
 }
 
 void ov116_0226139C(UnkStruct_ov116_0226139C *param0)
diff --git a/src/overlay116/ov116_02262A44.c b/src/overlay116/ov116_02262A44.c
index 3381d4277f..26d83efd04 100644
--- a/src/overlay116/ov116_02262A44.c
+++ b/src/overlay116/ov116_02262A44.c
@@ -10,7 +10,7 @@
 
 UnkStruct_ov116_02262A44 *ov116_02262A44(int param0, UnkStruct_ov116_022649E4 *param1)
 {
-    UnkStruct_ov116_02262A44 *v0 = Heap_AllocFromHeap(HEAP_ID_106, sizeof(UnkStruct_ov116_02262A44));
+    UnkStruct_ov116_02262A44 *v0 = Heap_Alloc(HEAP_ID_106, sizeof(UnkStruct_ov116_02262A44));
 
     memset(v0, 0, sizeof(UnkStruct_ov116_02262A44));
 
diff --git a/src/overlay116/ov116_02262A8C.c b/src/overlay116/ov116_02262A8C.c
index 77d8537572..df420c8c78 100644
--- a/src/overlay116/ov116_02262A8C.c
+++ b/src/overlay116/ov116_02262A8C.c
@@ -185,7 +185,7 @@ void include_unk_ov116_02267C4C(void)
 
 UnkStruct_ov116_02262A8C *ov116_02262A8C(int param0, u32 param1, UnkStruct_ov116_022649E4 *param2)
 {
-    UnkStruct_ov116_02262A8C *v0 = Heap_AllocFromHeap(HEAP_ID_106, sizeof(UnkStruct_ov116_02262A8C));
+    UnkStruct_ov116_02262A8C *v0 = Heap_Alloc(HEAP_ID_106, sizeof(UnkStruct_ov116_02262A8C));
 
     memset(v0, 0, sizeof(UnkStruct_ov116_02262A8C));
 
@@ -291,7 +291,7 @@ void ov116_02262C84(UnkStruct_ov116_02262A8C *param0)
 
 static void ov116_02262CB8(UnkStruct_ov116_02262A8C *param0, int param1)
 {
-    UnkStruct_ov116_02262CB8 *v0 = Heap_AllocFromHeap(HEAP_ID_106, sizeof(UnkStruct_ov116_02262CB8));
+    UnkStruct_ov116_02262CB8 *v0 = Heap_Alloc(HEAP_ID_106, sizeof(UnkStruct_ov116_02262CB8));
 
     memset(v0, 0, sizeof(UnkStruct_ov116_02262CB8));
 
@@ -347,7 +347,7 @@ static void ov116_02262D64(UnkStruct_ov116_02262A8C *param0, int param1)
 
 static void ov116_02262DC0(UnkStruct_ov116_02262A8C *param0)
 {
-    UnkStruct_ov116_02262DC0 *v0 = Heap_AllocFromHeap(HEAP_ID_106, sizeof(UnkStruct_ov116_02262DC0));
+    UnkStruct_ov116_02262DC0 *v0 = Heap_Alloc(HEAP_ID_106, sizeof(UnkStruct_ov116_02262DC0));
 
     memset(v0, 0, sizeof(UnkStruct_ov116_02262DC0));
 
diff --git a/src/overlay116/ov116_0226432C.c b/src/overlay116/ov116_0226432C.c
index 18d06240db..3d10dee7e9 100644
--- a/src/overlay116/ov116_0226432C.c
+++ b/src/overlay116/ov116_0226432C.c
@@ -596,7 +596,7 @@ static void ov116_022649E4(SysTask *param0, void *param1)
 
 void ov116_02264FEC(UnkStruct_ov116_02262A8C *param0, BOOL *param1)
 {
-    UnkStruct_ov116_02264FEC *v0 = Heap_AllocFromHeap(HEAP_ID_106, sizeof(UnkStruct_ov116_02264FEC));
+    UnkStruct_ov116_02264FEC *v0 = Heap_Alloc(HEAP_ID_106, sizeof(UnkStruct_ov116_02264FEC));
 
     v0->unk_00 = param0;
     v0->unk_04 = 0;
diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c
index d0be0ecf09..c0696586ea 100644
--- a/src/overlay117/ov117_02260668.c
+++ b/src/overlay117/ov117_02260668.c
@@ -191,7 +191,7 @@ int ov117_02260668(ApplicationManager *appMan, int *param1)
 
     v0 = ApplicationManager_NewData(appMan, sizeof(UnkStruct_ov117_02261280), HEAP_ID_110);
     MI_CpuClear8(v0, sizeof(UnkStruct_ov117_02261280));
-    Heap_FndInitAllocatorForExpHeap(&v0->unk_A8, HEAP_ID_110, 32);
+    HeapExp_FndInitAllocator(&v0->unk_A8, HEAP_ID_110, 32);
 
     v0->unk_98 = ov117_02260E14(HEAP_ID_110);
     v0->unk_00 = ApplicationManager_Args(appMan);
@@ -903,7 +903,7 @@ static void ov117_02261574(UnkStruct_ov117_02261280 *param0)
 
     ParticleSystem_ZeroAll();
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_110, 0x4800);
+    v0 = Heap_Alloc(HEAP_ID_110, 0x4800);
     param0->unk_A4 = ParticleSystem_New(ov117_02261644, ov117_02261668, v0, 0x4800, 1, HEAP_ID_110);
     camera = ParticleSystem_GetCamera(param0->unk_A4);
 
diff --git a/src/overlay117/ov117_022626B0.c b/src/overlay117/ov117_022626B0.c
index 668a321808..ce92daa6ea 100644
--- a/src/overlay117/ov117_022626B0.c
+++ b/src/overlay117/ov117_022626B0.c
@@ -158,7 +158,7 @@ inline void inline_ov117_02262EAC(int param0)
 
 UnkStruct_ov117_022626B0 *ov117_022626B0(UnkStruct_ov117_02261280 *param0)
 {
-    UnkStruct_ov117_022626B0 *v0 = Heap_AllocFromHeap(HEAP_ID_110, sizeof(UnkStruct_ov117_022626B0));
+    UnkStruct_ov117_022626B0 *v0 = Heap_Alloc(HEAP_ID_110, sizeof(UnkStruct_ov117_022626B0));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov117_022626B0));
     v0->unk_270 = param0->unk_00->unk_34;
 
@@ -416,8 +416,8 @@ static void ov117_02262B98(UnkStruct_ov117_022626B0 *param0)
 
         GF_ASSERT(param0->unk_24C == NULL);
 
-        param0->unk_24C = Heap_AllocFromHeap(HEAP_ID_110, v0);
-        param0->unk_250 = Heap_AllocFromHeap(HEAP_ID_110, v0);
+        param0->unk_24C = Heap_Alloc(HEAP_ID_110, v0);
+        param0->unk_250 = Heap_Alloc(HEAP_ID_110, v0);
 
         MI_CpuCopy8(v1, param0->unk_24C, v0);
         MI_CpuCopy8(v1, param0->unk_250, v0);
@@ -437,7 +437,7 @@ static void ov117_02262B98(UnkStruct_ov117_022626B0 *param0)
         v3 = (u8 *)param0->unk_04 + param0->unk_04->texInfo.ofsTex;
         v4 = (u32)(v3 - (u8 *)param0->unk_00);
 
-        Heap_ReallocFromHeap(param0->unk_00, v4);
+        Heap_Realloc(param0->unk_00, v4);
     }
 }
 
diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c
index debab9c8d2..6bf51b407e 100644
--- a/src/overlay118/ov118_021D0D80.c
+++ b/src/overlay118/ov118_021D0D80.c
@@ -61,7 +61,7 @@ void ov118_021D0D80(GameWindowLayout *param0)
 {
     GF_ASSERT(param0->unk_B24 == NULL);
 
-    param0->unk_B24 = Heap_AllocFromHeap(HEAP_ID_12, sizeof(OverlayMetadata));
+    param0->unk_B24 = Heap_Alloc(HEAP_ID_12, sizeof(OverlayMetadata));
     MI_CpuClear8(param0->unk_B24, sizeof(OverlayMetadata));
     param0->unk_B24->unk_14 = param0->partySlot;
 }
@@ -189,7 +189,7 @@ static void ov118_021D0FDC(OverlayMetadata *param0)
 
     ParticleSystem_ZeroAll();
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_12, 0x4800);
+    v0 = Heap_Alloc(HEAP_ID_12, 0x4800);
     param0->unk_18 = ParticleSystem_New(ov118_021D1128, ov118_021D114C, v0, 0x4800, 1, HEAP_ID_12);
     camera = ParticleSystem_GetCamera(param0->unk_18);
 
diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c
index 8c74e89347..83ad106302 100644
--- a/src/overlay119/ov119_021D0D80.c
+++ b/src/overlay119/ov119_021D0D80.c
@@ -410,7 +410,7 @@ static ParticleSystem *ov119_021D13EC(int heapID)
     void *v1;
     Camera *camera;
 
-    v1 = Heap_AllocFromHeap(heapID, 0x4800);
+    v1 = Heap_Alloc(heapID, 0x4800);
     v0 = ParticleSystem_New(ov119_021D13B4, ov119_021D13D0, v1, 0x4800, 1, heapID);
     camera = ParticleSystem_GetCamera(v0);
 
@@ -451,7 +451,7 @@ UnkStruct_ov119_021D14DC *ov119_021D14AC(UnkStruct_ov119_021D1930 *param0)
     int v1;
     int v2;
     int v3;
-    UnkStruct_ov119_021D14DC *v4 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_ov119_021D14DC));
+    UnkStruct_ov119_021D14DC *v4 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_ov119_021D14DC));
 
     GF_ASSERT(v4 != NULL);
 
diff --git a/src/overlay_manager.c b/src/overlay_manager.c
index 0c177b3dbf..3d63ed556a 100644
--- a/src/overlay_manager.c
+++ b/src/overlay_manager.c
@@ -6,9 +6,9 @@
 #include "game_overlay.h"
 #include "heap.h"
 
-ApplicationManager *ApplicationManager_New(const ApplicationManagerTemplate *template, void *args, const enum HeapId heapID)
+ApplicationManager *ApplicationManager_New(const ApplicationManagerTemplate *template, void *args, const enum HeapID heapID)
 {
-    ApplicationManager *appMan = Heap_AllocFromHeap(heapID, sizeof(ApplicationManager));
+    ApplicationManager *appMan = Heap_Alloc(heapID, sizeof(ApplicationManager));
 
     appMan->template = *template;
     appMan->execState = 0;
@@ -26,9 +26,9 @@ void ApplicationManager_Free(ApplicationManager *appMan)
     Heap_Free(appMan);
 }
 
-void *ApplicationManager_NewData(ApplicationManager *appMan, u32 size, enum HeapId heapID)
+void *ApplicationManager_NewData(ApplicationManager *appMan, u32 size, enum HeapID heapID)
 {
-    appMan->data = Heap_AllocFromHeap(heapID, size);
+    appMan->data = Heap_Alloc(heapID, size);
     return appMan->data;
 }
 
diff --git a/src/pal_pad.c b/src/pal_pad.c
index a4b8121110..1fb7b6ddd4 100644
--- a/src/pal_pad.c
+++ b/src/pal_pad.c
@@ -53,7 +53,7 @@ void PalPad_PushEntries(PalPad *destination, PalPad *source, int numberToCopy, i
 {
     int i;
     int diffs[5];
-    PalPad *newPad = Heap_AllocFromHeap(heapID, sizeof(PalPad) * PAL_PAD_ENTRIES);
+    PalPad *newPad = Heap_Alloc(heapID, sizeof(PalPad) * PAL_PAD_ENTRIES);
     PalPad_Init(newPad);
 
     for (i = 0; i < numberToCopy; i++) {
diff --git a/src/palette.c b/src/palette.c
index 738f5cfc49..ae847971b9 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -24,9 +24,9 @@ static void UpdateFadeBlendStep(PaletteData *paletteData, u8 bufferID, PaletteFa
 
 static void SysTask_FadePalette(SysTask *task, void *data);
 
-PaletteData *PaletteData_New(enum HeapId heapID)
+PaletteData *PaletteData_New(enum HeapID heapID)
 {
-    PaletteData *paletteData = Heap_AllocFromHeap(heapID, sizeof(PaletteData));
+    PaletteData *paletteData = Heap_Alloc(heapID, sizeof(PaletteData));
     MI_CpuClear8(paletteData, sizeof(PaletteData));
 
     return paletteData;
@@ -46,8 +46,8 @@ void PaletteData_InitBuffer(PaletteData *paletteData, enum PaletteBufferID buffe
 
 void PaletteData_AllocBuffer(PaletteData *paletteData, enum PaletteBufferID bufferID, u32 size, u32 heapID)
 {
-    void *unfaded = Heap_AllocFromHeap(heapID, size);
-    void *faded = Heap_AllocFromHeap(heapID, size);
+    void *unfaded = Heap_Alloc(heapID, size);
+    void *faded = Heap_Alloc(heapID, size);
     PaletteData_InitBuffer(paletteData, bufferID, unfaded, faded, size);
 }
 
diff --git a/src/particle_system.c b/src/particle_system.c
index 3125cc4cbe..1283b1b38c 100644
--- a/src/particle_system.c
+++ b/src/particle_system.c
@@ -86,7 +86,7 @@ void ParticleSystem_ZeroAll(void)
     }
 }
 
-ParticleSystem *ParticleSystem_New(SPLTexVRAMAllocFunc texAllocFunc, SPLPalVRAMAllocFunc palAllocFunc, void *heap, int heapSize, BOOL hasCamera, enum HeapId heapID)
+ParticleSystem *ParticleSystem_New(SPLTexVRAMAllocFunc texAllocFunc, SPLPalVRAMAllocFunc palAllocFunc, void *heap, int heapSize, BOOL hasCamera, enum HeapID heapID)
 {
     ParticleSystem *particleSystem;
     int id;
@@ -101,7 +101,7 @@ ParticleSystem *ParticleSystem_New(SPLTexVRAMAllocFunc texAllocFunc, SPLPalVRAMA
         return NULL;
     }
 
-    particleSystem = Heap_AllocFromHeap(heapID, sizeof(ParticleSystem));
+    particleSystem = Heap_Alloc(heapID, sizeof(ParticleSystem));
     if (particleSystem == NULL) {
         GF_ASSERT(FALSE);
     }
@@ -308,7 +308,7 @@ static void *ParticleSystem15_AllocMemory(u32 size)
     return ParticleSystem_AllocMemory(sParticleSystems[15], size);
 }
 
-void *ParticleSystem_LoadResourceFromNARC(enum NarcID narcID, int memberIndex, enum HeapId heapID)
+void *ParticleSystem_LoadResourceFromNARC(enum NarcID narcID, int memberIndex, enum HeapID heapID)
 {
     return NARC_AllocAndReadWholeMemberByIndexPair(narcID, memberIndex, heapID);
 }
diff --git a/src/party.c b/src/party.c
index 548085e3ae..6748b5fa3e 100644
--- a/src/party.c
+++ b/src/party.c
@@ -19,9 +19,9 @@ int Party_SaveSize(void)
     return sizeof(Party);
 }
 
-Party *Party_New(enum HeapId heapID)
+Party *Party_New(enum HeapID heapID)
 {
-    Party *party = Heap_AllocFromHeap(heapID, sizeof(Party));
+    Party *party = Heap_Alloc(heapID, sizeof(Party));
     Party_Init(party);
 
     return party;
@@ -109,7 +109,7 @@ BOOL Party_SwapSlots(Party *party, int slotA, int slotB)
     PARTY_ASSERT_SLOT(party, slotA);
     PARTY_ASSERT_SLOT(party, slotB);
 
-    tempPokemon = Heap_AllocFromHeap(HEAP_ID_SYSTEM, sizeof(Pokemon));
+    tempPokemon = Heap_Alloc(HEAP_ID_SYSTEM, sizeof(Pokemon));
     *tempPokemon = party->pokemon[slotA];
 
     party->pokemon[slotA] = party->pokemon[slotB];
diff --git a/src/platform_lift.c b/src/platform_lift.c
index dccb6192c8..3136ef67b8 100644
--- a/src/platform_lift.c
+++ b/src/platform_lift.c
@@ -333,7 +333,7 @@ void PlatformLift_Trigger(FieldSystem *fieldSystem)
         return;
     }
 
-    PlatformLiftFieldTaskEnv *taskEnv = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(PlatformLiftFieldTaskEnv));
+    PlatformLiftFieldTaskEnv *taskEnv = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(PlatformLiftFieldTaskEnv));
     taskEnv->state = PLATFORM_LIFT_STATE_START_MOVING;
     taskEnv->isIronIslandB2FLeftRoom = sPerMapPlatformLiftConfiguration[data->id].isIronIslandB2FLeftRoom;
     taskEnv->kind = data->kind;
diff --git a/src/player_avatar.c b/src/player_avatar.c
index 516a123bac..f7b118856d 100644
--- a/src/player_avatar.c
+++ b/src/player_avatar.c
@@ -128,7 +128,7 @@ void Player_DeleteAll(PlayerAvatar *playerAvatar)
 
 static PlayerAvatar *PlayerAvatar_Alloc(void)
 {
-    PlayerAvatar *playerAvatar = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, (sizeof(PlayerAvatar)));
+    PlayerAvatar *playerAvatar = Heap_Alloc(HEAP_ID_FIELD2, (sizeof(PlayerAvatar)));
     GF_ASSERT(playerAvatar != NULL);
     memset(playerAvatar, 0, (sizeof(PlayerAvatar)));
 
diff --git a/src/pltt_transfer.c b/src/pltt_transfer.c
index d442bc9886..3daea75579 100644
--- a/src/pltt_transfer.c
+++ b/src/pltt_transfer.c
@@ -63,14 +63,14 @@ static void ResetBothTransferRanges(PlttTransferTaskManager *task);
 
 static PlttTransferTaskManager *sTaskManager = NULL;
 
-void PlttTransfer_Init(int capacity, enum HeapId heapID)
+void PlttTransfer_Init(int capacity, enum HeapID heapID)
 {
     if (sTaskManager == NULL) {
-        sTaskManager = Heap_AllocFromHeap(heapID, sizeof(PlttTransferTaskManager));
+        sTaskManager = Heap_Alloc(heapID, sizeof(PlttTransferTaskManager));
         MI_CpuClear32(sTaskManager, sizeof(PlttTransferTaskManager));
 
         sTaskManager->capacity = capacity;
-        sTaskManager->tasks = Heap_AllocFromHeap(heapID, sizeof(PlttTransferTask) * capacity);
+        sTaskManager->tasks = Heap_Alloc(heapID, sizeof(PlttTransferTask) * capacity);
 
         for (int i = 0; i < capacity; i++) {
             InitTransferTask(sTaskManager->tasks + i);
diff --git a/src/poffin.c b/src/poffin.c
index 401476b221..0b01415032 100644
--- a/src/poffin.c
+++ b/src/poffin.c
@@ -39,7 +39,7 @@ void Poffin_Clear(Poffin *poffin)
 
 Poffin *Poffin_New(int heapID)
 {
-    Poffin *poffin = Heap_AllocFromHeapAtEnd(heapID, sizeof(Poffin));
+    Poffin *poffin = Heap_AllocAtEnd(heapID, sizeof(Poffin));
     Poffin_Clear(poffin);
 
     return poffin;
diff --git a/src/pokedex.c b/src/pokedex.c
index 00b584ba50..35bd956b90 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -61,9 +61,9 @@ int Pokedex_SaveSize(void)
     return sizeof(Pokedex);
 }
 
-Pokedex *Pokedex_New(enum HeapId heapID)
+Pokedex *Pokedex_New(enum HeapID heapID)
 {
-    Pokedex *pokedexData = Heap_AllocFromHeap(heapID, sizeof(Pokedex));
+    Pokedex *pokedexData = Heap_Alloc(heapID, sizeof(Pokedex));
     Pokedex_Init(pokedexData);
 
     return pokedexData;
diff --git a/src/pokedex_heightweight.c b/src/pokedex_heightweight.c
index 7c95ee8246..14f4a51668 100644
--- a/src/pokedex_heightweight.c
+++ b/src/pokedex_heightweight.c
@@ -26,7 +26,7 @@ static void Pokedex_Comparison_Scale_F_Array(NARC *pokedexDataNARC, short **trai
 
 HeightWeightData *Pokedex_HeightWeightData(int heapID)
 {
-    HeightWeightData *HWData = Heap_AllocFromHeap(heapID, sizeof(HeightWeightData));
+    HeightWeightData *HWData = Heap_Alloc(heapID, sizeof(HeightWeightData));
     memset(HWData, 0, sizeof(HeightWeightData));
 
     return HWData;
diff --git a/src/pokedex_memory.c b/src/pokedex_memory.c
index b895752a06..d8b1a8d1b6 100644
--- a/src/pokedex_memory.c
+++ b/src/pokedex_memory.c
@@ -7,7 +7,7 @@
 
 PokedexMemory *PokedexMemory_New(u32 heapID)
 {
-    PokedexMemory *pokedexMemory = Heap_AllocFromHeap(heapID, sizeof(PokedexMemory));
+    PokedexMemory *pokedexMemory = Heap_Alloc(heapID, sizeof(PokedexMemory));
     memset(pokedexMemory, 0, sizeof(PokedexMemory));
     pokedexMemory->bootMode = POKEDEX_BOOT_DEFAULT;
     return pokedexMemory;
diff --git a/src/pokemon.c b/src/pokemon.c
index 0191962292..d884357525 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -269,7 +269,7 @@ static BOOL Pokemon_HasMove(Pokemon *mon, u16 moveID);
 static s8 BoxPokemon_GetFlavorAffinity(BoxPokemon *boxMon, enum Flavor flavor);
 static BOOL IsBoxPokemonInfectedWithPokerus(BoxPokemon *boxMon);
 static BOOL BoxPokemonHasCuredPokerus(BoxPokemon *boxMon);
-static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *trainerInfo, int monPokeball, int metLocation, int metTerrain, enum HeapId heapID);
+static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *trainerInfo, int monPokeball, int metLocation, int metTerrain, enum HeapID heapID);
 static void PostCaptureBoxPokemonProcessing(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
 static BOOL CanBoxPokemonLearnTM(BoxPokemon *boxMon, u8 tmID);
 static void BoxPokemon_CalcAbility(BoxPokemon *boxMon);
@@ -303,7 +303,7 @@ int Pokemon_StructSize(void)
 
 Pokemon *Pokemon_New(u32 heapID)
 {
-    Pokemon *mon = Heap_AllocFromHeap(heapID, sizeof(Pokemon));
+    Pokemon *mon = Heap_Alloc(heapID, sizeof(Pokemon));
     Pokemon_Init(mon);
     return mon;
 }
@@ -585,7 +585,7 @@ void Pokemon_CalcStats(Pokemon *mon)
 
     int monForm = Pokemon_GetValue(mon, MON_DATA_FORM, NULL);
     int monSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL);
-    SpeciesData *speciesData = Heap_AllocFromHeap(HEAP_ID_SYSTEM, sizeof(SpeciesData));
+    SpeciesData *speciesData = Heap_Alloc(HEAP_ID_SYSTEM, sizeof(SpeciesData));
 
     SpeciesData_LoadForm(monSpecies, monForm, speciesData);
 
@@ -2132,7 +2132,7 @@ static void BoxPokemon_IncreaseDataInternal(BoxPokemon *boxMon, enum PokemonData
 
 SpeciesData *SpeciesData_FromMonForm(int monSpecies, int monForm, int heapID)
 {
-    SpeciesData *speciesData = Heap_AllocFromHeap(heapID, sizeof(SpeciesData));
+    SpeciesData *speciesData = Heap_Alloc(heapID, sizeof(SpeciesData));
     SpeciesData_LoadForm(monSpecies, monForm, speciesData);
 
     return speciesData;
@@ -2140,7 +2140,7 @@ SpeciesData *SpeciesData_FromMonForm(int monSpecies, int monForm, int heapID)
 
 SpeciesData *SpeciesData_FromMonSpecies(int monSpecies, int heapID)
 {
-    SpeciesData *speciesData = Heap_AllocFromHeap(heapID, sizeof(SpeciesData));
+    SpeciesData *speciesData = Heap_Alloc(heapID, sizeof(SpeciesData));
     SpeciesData_LoadSpecies(monSpecies, speciesData);
 
     return speciesData;
@@ -2335,7 +2335,7 @@ static u32 Pokemon_GetExpRateBaseExpAt(enum ExpRate monExpRate, int monLevel)
     GF_ASSERT(monExpRate < EXP_RATE_COUNT);
     GF_ASSERT(monLevel <= MAX_POKEMON_LEVEL + 1);
 
-    u32 *expTable = Heap_AllocFromHeap(HEAP_ID_SYSTEM, (MAX_POKEMON_LEVEL + 1) * 4);
+    u32 *expTable = Heap_Alloc(HEAP_ID_SYSTEM, (MAX_POKEMON_LEVEL + 1) * 4);
     Pokemon_LoadExperienceTableOf(monExpRate, expTable);
 
     u32 result = expTable[monLevel];
@@ -3549,7 +3549,7 @@ u16 Pokemon_GetEvolutionTargetSpecies(Party *party, Pokemon *mon, u8 evoClass, u
         evoTypeResult = &stackVar;
     }
 
-    SpeciesEvolution *speciesEvolutions = Heap_AllocFromHeap(HEAP_ID_SYSTEM, sizeof(SpeciesEvolution) * MAX_EVOLUTIONS);
+    SpeciesEvolution *speciesEvolutions = Heap_Alloc(HEAP_ID_SYSTEM, sizeof(SpeciesEvolution) * MAX_EVOLUTIONS);
     LoadSpeciesEvolutions(monSpecies, speciesEvolutions);
 
     switch (evoClass) {
@@ -3817,7 +3817,7 @@ u16 sub_02076FD4(const u16 monSpecies)
 static void BoxPokemon_SetDefaultMoves(BoxPokemon *boxMon)
 {
     BOOL reencrypt; // must pre-declare to match
-    u16 *monLevelUpMoves = Heap_AllocFromHeap(HEAP_ID_SYSTEM, sizeof(SpeciesLearnset));
+    u16 *monLevelUpMoves = Heap_Alloc(HEAP_ID_SYSTEM, sizeof(SpeciesLearnset));
     reencrypt = BoxPokemon_EnterDecryptionContext(boxMon);
 
     u16 monSpecies = BoxPokemon_GetValue(boxMon, MON_DATA_SPECIES, NULL);
@@ -3933,7 +3933,7 @@ static void BoxPokemon_SetMoveSlot(BoxPokemon *boxMon, u16 moveID, u8 moveSlot)
 u16 Pokemon_LevelUpMove(Pokemon *mon, int *index, u16 *moveID)
 {
     u16 result = MOVE_NONE;
-    u16 *monLevelUpMoves = Heap_AllocFromHeap(HEAP_ID_SYSTEM, sizeof(SpeciesLearnset));
+    u16 *monLevelUpMoves = Heap_Alloc(HEAP_ID_SYSTEM, sizeof(SpeciesLearnset));
     u16 monSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL);
     int monForm = Pokemon_GetValue(mon, MON_DATA_FORM, NULL);
     u8 monLevel = Pokemon_GetValue(mon, MON_DATA_LEVEL, NULL);
@@ -4129,7 +4129,7 @@ s8 Pokemon_GetFlavorAffinityOf(u32 monPersonality, enum Flavor flavor)
 
 int Pokemon_LoadLevelUpMoveIdsOf(int monSpecies, int monForm, u16 *monLevelUpMoveIDs)
 {
-    u16 *monLevelUpMoves = Heap_AllocFromHeap(HEAP_ID_SYSTEM, sizeof(SpeciesLearnset));
+    u16 *monLevelUpMoves = Heap_Alloc(HEAP_ID_SYSTEM, sizeof(SpeciesLearnset));
 
     Pokemon_LoadLevelUpMovesOf(monSpecies, monForm, monLevelUpMoves);
 
@@ -4645,7 +4645,7 @@ BOOL Pokemon_PlayCry(Pokemon *mon)
     return Sound_PlayPokemonCry(species, form);
 }
 
-void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *trainerInfo, int monPokeball, int metLocation, int metTerrain, enum HeapId heapID)
+void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *trainerInfo, int monPokeball, int metLocation, int metTerrain, enum HeapID heapID)
 {
     InitializeBoxPokemonAfterCapture(&mon->box, trainerInfo, monPokeball, metLocation, metTerrain, heapID);
 
@@ -4658,7 +4658,7 @@ void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *trainerInfo, int monPokebal
     }
 }
 
-static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *trainer, int monPokeball, int metLocation, int metTerrain, enum HeapId heapID)
+static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *trainer, int monPokeball, int metLocation, int metTerrain, enum HeapID heapID)
 {
     UpdateBoxMonStatusAndTrainerInfo(boxMon, trainer, 0, metLocation, heapID);
     BoxPokemon_SetValue(boxMon, MON_DATA_MET_GAME, &gGameVersion);
diff --git a/src/pokemon_sprite.c b/src/pokemon_sprite.c
index 0e87a22008..9fe7566ce7 100644
--- a/src/pokemon_sprite.c
+++ b/src/pokemon_sprite.c
@@ -397,9 +397,9 @@ static void PokemonSprite_TickAnim(PokemonSprite *monSprite);
 static u8 SwapNybbles(u8 value);
 static void TryDrawSpindaSpots(PokemonSprite *monSprite, u8 *rawCharData);
 
-void *PokemonSpriteManager_New(enum HeapId heapID)
+void *PokemonSpriteManager_New(enum HeapID heapID)
 {
-    PokemonSpriteManager *monSpriteMan = Heap_AllocFromHeap(heapID, sizeof(PokemonSpriteManager));
+    PokemonSpriteManager *monSpriteMan = Heap_Alloc(heapID, sizeof(PokemonSpriteManager));
 
     monSpriteMan->heapID = heapID;
     monSpriteMan->dummy330 = 0;
@@ -407,11 +407,11 @@ void *PokemonSpriteManager_New(enum HeapId heapID)
     monSpriteMan->charSize = MON_SPRITE_CHAR_BUF_SIZE;
     monSpriteMan->plttBaseAddr = 0;
     monSpriteMan->plttSize = PALETTE_SIZE_BYTES * MAX_MON_SPRITES;
-    monSpriteMan->charRawData = Heap_AllocFromHeap(heapID, MON_SPRITE_CHAR_BUF_SIZE);
-    monSpriteMan->plttRawData = Heap_AllocFromHeap(heapID, MON_SPRITE_PLTT_BUF_SIZE);
+    monSpriteMan->charRawData = Heap_Alloc(heapID, MON_SPRITE_CHAR_BUF_SIZE);
+    monSpriteMan->plttRawData = Heap_Alloc(heapID, MON_SPRITE_PLTT_BUF_SIZE);
 
     MI_CpuClearFast(monSpriteMan->plttRawData, sizeof(u32));
-    monSpriteMan->plttRawDataUnfaded = Heap_AllocFromHeap(heapID, MON_SPRITE_PLTT_BUF_SIZE);
+    monSpriteMan->plttRawDataUnfaded = Heap_Alloc(heapID, MON_SPRITE_PLTT_BUF_SIZE);
     MI_CpuClearFast(monSpriteMan->plttRawDataUnfaded, sizeof(u32));
 
     for (int i = 0; i < MAX_MON_SPRITES; i++) {
diff --git a/src/pokeradar.c b/src/pokeradar.c
index 8ec5053584..743210b3f7 100644
--- a/src/pokeradar.c
+++ b/src/pokeradar.c
@@ -63,7 +63,7 @@ static void IncWithCap(int *param0);
 
 RadarChain *RadarChain_Init(const int heapID)
 {
-    RadarChain *chain = Heap_AllocFromHeap(heapID, sizeof(RadarChain));
+    RadarChain *chain = Heap_Alloc(heapID, sizeof(RadarChain));
     GFXBoxTest_MakeBox(FX32_ONE * 16, FX32_ONE * 8, FX32_ONE * 16, &chain->grassPatchVolume);
     return chain;
 }
@@ -499,7 +499,7 @@ void RadarChargeStep(FieldSystem *fieldSystem)
 {
     u8 *v0;
 
-    if (Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), ITEM_POKE_RADAR, 1, HEAP_ID_FIELD) == TRUE) {
+    if (Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), ITEM_POKE_RADAR, 1, HEAP_ID_FIELD1) == TRUE) {
         v0 = SpecialEncounter_GetRadarCharge(SaveData_GetSpecialEncounters(fieldSystem->saveData));
         if ((*v0) < RADAR_BATTERY_STEPS) {
             (*v0)++;
diff --git a/src/render_oam.c b/src/render_oam.c
index 2035baf617..8ce5a697c1 100644
--- a/src/render_oam.c
+++ b/src/render_oam.c
@@ -17,10 +17,10 @@
 typedef struct OamManager {
     NNSG2dOamManagerInstance mainScreenOam;
     NNSG2dOamManagerInstance subScreenOam;
-    enum HeapId heapID;
+    enum HeapID heapID;
 } OamManager;
 
-static void InitOamManager(int mainOamStart, int mainOamCount, int mainAffineOamStart, int mainAffineOamCount, int subOamStart, int subOamCount, int subAffineOamStart, int subAffineOamCount, enum HeapId heapID);
+static void InitOamManager(int mainOamStart, int mainOamCount, int mainAffineOamStart, int mainAffineOamCount, int subOamStart, int subOamCount, int subAffineOamStart, int subAffineOamCount, enum HeapID heapID);
 static BOOL AddToMainOamManager(const GXOamAttr *oam, u16 affineIdx, BOOL unused);
 static BOOL AddToSubOamManager(const GXOamAttr *oam, u16 affineIdx, BOOL unused);
 static u16 AddAffineToMainOamManager(const MtxFx22 *affineTransform);
@@ -28,7 +28,7 @@ static u16 AddAffineToSubOamManager(const MtxFx22 *affineTransform);
 
 static OamManager *sOamManager;
 
-void RenderOam_Init(int mainOamStart, int mainOamCount, int mainAffineOamStart, int mainAffineOamCount, int subOamStart, int subOamCount, int subAffineOamStart, int subAffineOamCount, enum HeapId heapID)
+void RenderOam_Init(int mainOamStart, int mainOamCount, int mainAffineOamStart, int mainAffineOamCount, int subOamStart, int subOamCount, int subAffineOamStart, int subAffineOamCount, enum HeapID heapID)
 {
     int trueMainOamStart;
     int trueMainOamCount;
@@ -74,10 +74,10 @@ void RenderOam_Init(int mainOamStart, int mainOamCount, int mainAffineOamStart,
         heapID);
 }
 
-static void InitOamManager(int mainOamStart, int mainOamCount, int mainAffineOamStart, int mainAffineOamCount, int subOamStart, int subOamCount, int subAffineOamStart, int subAffineOamCount, enum HeapId heapID)
+static void InitOamManager(int mainOamStart, int mainOamCount, int mainAffineOamStart, int mainAffineOamCount, int subOamStart, int subOamCount, int subAffineOamStart, int subAffineOamCount, enum HeapID heapID)
 {
     GF_ASSERT(sOamManager == NULL);
-    sOamManager = Heap_AllocFromHeap(heapID, sizeof(OamManager));
+    sOamManager = Heap_Alloc(heapID, sizeof(OamManager));
     GF_ASSERT(sOamManager);
 
     sOamManager->heapID = heapID;
@@ -126,12 +126,12 @@ NNSG2dOamManagerInstance *RenderOam_GetScreenOam(enum DSScreen screen)
     return manager;
 }
 
-void RenderOam_ClearMain(enum HeapId heapID)
+void RenderOam_ClearMain(enum HeapID heapID)
 {
     Utility_Clear2DMainOAM(heapID);
 }
 
-void RenderOam_ClearSub(enum HeapId heapID)
+void RenderOam_ClearSub(enum HeapID heapID)
 {
     Utility_Clear2DSubOAM(heapID);
 }
diff --git a/src/render_window.c b/src/render_window.c
index c73059b0f6..a75c67ad00 100644
--- a/src/render_window.c
+++ b/src/render_window.c
@@ -371,7 +371,7 @@ static void DrawMessageBoxScrollCursor(Window *window, u16 baseTile)
 
     u32 heapID = BgConfig_GetHeapID(window->bgConfig);
     u8 bgLayer = Window_GetBgLayer(window);
-    u8 *cursorBlit = Heap_AllocFromHeap(heapID, SCROLL_CURSOR_GRAPHICS_SIZE);
+    u8 *cursorBlit = Heap_Alloc(heapID, SCROLL_CURSOR_GRAPHICS_SIZE);
     u8 *bgGfx = Bg_GetCharPtr(bgLayer);
 
     NNSG2dCharacterData *cursorCharData;
@@ -424,7 +424,7 @@ void ReplaceTransparentTiles(BgConfig *bgConfig, u8 bgLayer, u16 bgBaseTile, u8
         FALSE,
         &chars,
         heapID);
-    src = Heap_AllocFromHeap(heapID, TILE_SIZE_4BPP * 18);
+    src = Heap_Alloc(heapID, TILE_SIZE_4BPP * 18);
     memcpy(src, chars->pRawData, TILE_SIZE_4BPP * 18);
 
     for (i = 0; i < TILE_SIZE_4BPP * 18; i++) {
@@ -613,11 +613,11 @@ void *Window_AddWaitDial(Window *window, u32 baseTile)
     heapID = BgConfig_GetHeapID(window->bgConfig);
     bgLayer = Window_GetBgLayer(window);
     bgCharPtr = Bg_GetCharPtr(bgLayer);
-    dial = Heap_AllocFromHeap(heapID, sizeof(WaitDial));
+    dial = Heap_Alloc(heapID, sizeof(WaitDial));
 
     memcpy(dial->messageBoxPixels, &bgCharPtr[(baseTile + 18) * TILE_SIZE_4BPP], WAIT_DIAL_FRAME_SIZE);
 
-    tmp = Heap_AllocFromHeap(heapID, WAIT_DIAL_FRAME_SIZE);
+    tmp = Heap_Alloc(heapID, WAIT_DIAL_FRAME_SIZE);
 
     memcpy(&tmp[TILE_SIZE_4BPP * 0], &bgCharPtr[(baseTile + 10) * TILE_SIZE_4BPP], TILE_SIZE_4BPP);
     memcpy(&tmp[TILE_SIZE_4BPP * 1], &bgCharPtr[(baseTile + 11) * TILE_SIZE_4BPP], TILE_SIZE_4BPP);
@@ -738,7 +738,7 @@ void DestroyWaitDialTaskOnly(void *taskData)
     dial->deleteMode = DIAL_DELETE_MODE_DESTROY;
 }
 
-u8 *DrawPokemonPreview(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 palette, u16 baseTile, u16 species, u8 gender, enum HeapId heapID)
+u8 *DrawPokemonPreview(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 palette, u16 baseTile, u16 species, u8 gender, enum HeapID heapID)
 {
     PokemonPreview *preview = CreatePokemonPreviewTask(bgConfig, bgLayer, x, y, heapID);
 
@@ -752,7 +752,7 @@ u8 *DrawPokemonPreview(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 palette, u
     return &preview->state;
 }
 
-u8 *DrawPokemonPreviewFromStruct(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 palette, u16 baseTile, Pokemon *mon, enum HeapId heapID)
+u8 *DrawPokemonPreviewFromStruct(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 palette, u16 baseTile, Pokemon *mon, enum HeapID heapID)
 {
     PokemonPreview *preview = CreatePokemonPreviewTask(bgConfig, bgLayer, x, y, heapID);
 
@@ -886,7 +886,7 @@ static void DrawPokemonPreviewSprite(UnkStruct_ov5_021D30A8 *param0, PokemonSpri
     NNSG2dImageProxy *imageProxy;
     const NNSG2dImagePaletteProxy *paletteProxy;
 
-    buf = Heap_AllocFromHeap(param0->heapID, POKEMON_SPRITE_WHOLE_SIZE_BYTES);
+    buf = Heap_Alloc(param0->heapID, POKEMON_SPRITE_WHOLE_SIZE_BYTES);
 
     // frame 0
     UnkStruct_02013610 v6 = { 0, 0, 10, 10 };
diff --git a/src/resource_collection.c b/src/resource_collection.c
index d78ea21ecf..efdec702c9 100644
--- a/src/resource_collection.c
+++ b/src/resource_collection.c
@@ -20,15 +20,15 @@ static NNSG3dResTex *TextureResource_GetTexResWithData(const TextureResource *te
 static void TexRes_UploadToVRam(NNSG3dResTex *texRes, TextureResource *texResource);
 static void TexRes_AssignVRamKeys(NNSG3dResTex *texRes, NNSGfdTexKey texKey, NNSGfdTexKey tex4x4Key, NNSGfdPlttKey paletteKey);
 static void TexRes_ReleaseVRamKeys(NNSG3dResTex *texRes);
-static void *CreateStrippedTexture(void *resFile, enum HeapId heapID);
+static void *CreateStrippedTexture(void *resFile, enum HeapID heapID);
 static u32 GetStrippedTextureResourceSize(const void *resFile);
 
-ResourceCollection *ResourceCollection_New(s32 capacity, enum HeapId heapID)
+ResourceCollection *ResourceCollection_New(s32 capacity, enum HeapID heapID)
 {
-    ResourceCollection *resMgr = Heap_AllocFromHeap(heapID, sizeof(ResourceCollection));
+    ResourceCollection *resMgr = Heap_Alloc(heapID, sizeof(ResourceCollection));
     GF_ASSERT(resMgr);
 
-    resMgr->resources = Heap_AllocFromHeap(heapID, sizeof(Resource) * capacity);
+    resMgr->resources = Heap_Alloc(heapID, sizeof(Resource) * capacity);
     GF_ASSERT(resMgr->resources);
 
     for (int i = 0; i < capacity; i++) {
@@ -72,7 +72,7 @@ Resource *ResourceCollection_Add(ResourceCollection *collection, void *data, int
     return resource;
 }
 
-Resource *ResourceCollection_AddFromFile(ResourceCollection *collection, const char *filename, int id, enum HeapId heapID)
+Resource *ResourceCollection_AddFromFile(ResourceCollection *collection, const char *filename, int id, enum HeapID heapID)
 {
     GF_ASSERT(collection);
     GF_ASSERT(filename);
@@ -174,12 +174,12 @@ static void Resource_Init(Resource *resource)
     resource->data = NULL;
 }
 
-TextureResourceManager *TextureResourceManager_New(s32 maxTextures, enum HeapId heapID)
+TextureResourceManager *TextureResourceManager_New(s32 maxTextures, enum HeapID heapID)
 {
-    TextureResourceManager *texMgr = Heap_AllocFromHeap(heapID, sizeof(TextureResourceManager));
+    TextureResourceManager *texMgr = Heap_Alloc(heapID, sizeof(TextureResourceManager));
 
     texMgr->resources = ResourceCollection_New(maxTextures, heapID);
-    texMgr->textures = Heap_AllocFromHeap(heapID, sizeof(TextureResource) * maxTextures);
+    texMgr->textures = Heap_Alloc(heapID, sizeof(TextureResource) * maxTextures);
 
     for (int i = 0; i < maxTextures; i++) {
         TextureResource_Init(texMgr->textures + i);
@@ -204,7 +204,7 @@ BOOL TextureResourceManager_IsIDUnused(const TextureResourceManager *texMgr, int
     return ResourceCollection_IsIDUnused(texMgr->resources, id);
 }
 
-TextureResource *TextureResourceManager_AddTexture(const TextureResourceManager *texMgr, void *data, int id, enum TextureResourceMode mode, enum HeapId heapID)
+TextureResource *TextureResourceManager_AddTexture(const TextureResourceManager *texMgr, void *data, int id, enum TextureResourceMode mode, enum HeapID heapID)
 {
     TextureResource *texResource;
     void *resourceData;
@@ -227,7 +227,7 @@ TextureResource *TextureResourceManager_AddTexture(const TextureResourceManager
     return texResource;
 }
 
-TextureResource *TextureResourceManager_AddTextureAndAllocVRam(TextureResourceManager *texMgr, void *data, int id, enum TextureResourceMode mode, enum HeapId heapID)
+TextureResource *TextureResourceManager_AddTextureAndAllocVRam(TextureResourceManager *texMgr, void *data, int id, enum TextureResourceMode mode, enum HeapID heapID)
 {
     TextureResource *texResource = TextureResourceManager_AddTexture(texMgr, data, id, mode, heapID);
     TextureResource_AllocVRam(texResource);
@@ -484,10 +484,10 @@ static void TexRes_ReleaseVRamKeys(NNSG3dResTex *texRes)
 }
 
 // Duplicates a texture resource without the actual texture data
-static void *CreateStrippedTexture(void *resFile, enum HeapId heapID)
+static void *CreateStrippedTexture(void *resFile, enum HeapID heapID)
 {
     u32 size = GetStrippedTextureResourceSize(resFile);
-    void *stripped = Heap_AllocFromHeap(heapID, size);
+    void *stripped = Heap_Alloc(heapID, size);
     memcpy(stripped, resFile, size);
 
     return stripped;
diff --git a/src/roaming_pokemon.c b/src/roaming_pokemon.c
index a7a6f53f41..4fb771f78e 100644
--- a/src/roaming_pokemon.c
+++ b/src/roaming_pokemon.c
@@ -318,7 +318,7 @@ void RoamingPokemon_ActivateSlot(SaveData *saveData, const u8 slot)
     Roamer_SetData(newRoamer, ROAMER_DATA_LEVEL, level);
 
     trainer = SaveData_GetTrainerInfo(saveData);
-    roamerMonData = Pokemon_New(HEAP_ID_FIELD);
+    roamerMonData = Pokemon_New(HEAP_ID_FIELD1);
 
     Pokemon_Init(roamerMonData);
     Pokemon_InitWith(roamerMonData, species, level, INIT_IVS_RANDOM, FALSE, 0, OTID_SET, TrainerInfo_ID_LowHalf(trainer));
diff --git a/src/savedata.c b/src/savedata.c
index d1207f79ac..d24a38406f 100644
--- a/src/savedata.c
+++ b/src/savedata.c
@@ -38,7 +38,7 @@ static BOOL sSaveComplete;
 
 SaveData *SaveData_Init(void)
 {
-    SaveData *saveData = Heap_AllocFromHeap(HEAP_ID_SAVE, sizeof(SaveData));
+    SaveData *saveData = Heap_Alloc(HEAP_ID_SAVE, sizeof(SaveData));
     ;
 
     MI_CpuClearFast(saveData, sizeof(SaveData));
@@ -117,7 +117,7 @@ const void *SaveData_SaveTableConst(const SaveData *saveData, int saveTableID)
 
 BOOL SaveData_Erase(SaveData *saveData)
 {
-    u8 *saveBuffer = Heap_AllocFromHeapAtEnd(HEAP_ID_APPLICATION, SAVE_SECTOR_SIZE);
+    u8 *saveBuffer = Heap_AllocAtEnd(HEAP_ID_APPLICATION, SAVE_SECTOR_SIZE);
 
     SleepLock(SLEEP_TYPE_SAVE_DATA);
 
@@ -440,8 +440,8 @@ static void SaveData_SetBlockCheckInfo(SaveData *saveData, const SaveCheckInfo *
 
 static int SaveData_LoadCheck(SaveData *saveData)
 {
-    u8 *primaryBuffer = Heap_AllocFromHeapAtEnd(HEAP_ID_APPLICATION, SAVE_SECTOR_SIZE * SAVE_PAGE_MAX);
-    u8 *backupBuffer = Heap_AllocFromHeapAtEnd(HEAP_ID_APPLICATION, SAVE_SECTOR_SIZE * SAVE_PAGE_MAX);
+    u8 *primaryBuffer = Heap_AllocAtEnd(HEAP_ID_APPLICATION, SAVE_SECTOR_SIZE * SAVE_PAGE_MAX);
+    u8 *backupBuffer = Heap_AllocAtEnd(HEAP_ID_APPLICATION, SAVE_SECTOR_SIZE * SAVE_PAGE_MAX);
 
     SaveCheckInfo normalInfo[SECTOR_ID_MAX];
     SaveCheckInfo boxInfo[SECTOR_ID_MAX];
@@ -1053,7 +1053,7 @@ void *SaveDataExtra_Get(SaveData *saveData, int heapID, int extraSaveID, int *lo
     GF_ASSERT(saveTable->dataID == extraSaveID);
 
     u32 size = saveTable->sizeFunc() + sizeof(SaveCheckFooter);
-    void *ret = Heap_AllocFromHeap(heapID, size);
+    void *ret = Heap_Alloc(heapID, size);
 
     SaveData_CardLoad((PRIMARY_SECTOR_START + saveTable->blockID) * SAVE_SECTOR_SIZE, ret, size);
 
@@ -1118,7 +1118,7 @@ void *SaveDataExtra_Mirror(SaveData *saveData, int heapID, int extraSaveID, int
     GF_ASSERT(saveTable->dataID == extraSaveID);
 
     size = saveTable->sizeFunc() + sizeof(SaveCheckFooter);
-    ret = Heap_AllocFromHeap(heapID, size);
+    ret = Heap_Alloc(heapID, size);
 
     u32 primaryKey, backupKey, currKey, oldKey;
     u8 keyFlag;
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 1e88bc048c..493659ff83 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -2045,7 +2045,7 @@ static BOOL ScrCmd_Unused_1FA(ScriptContext *ctx)
     u16 v1 = ScriptContext_GetVar(ctx);
     u16 v2 = ScriptContext_GetVar(ctx);
 
-    MessageLoader *msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, v1, HEAP_ID_FIELD_TASK);
+    MessageLoader *msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, v1, HEAP_ID_FIELD3);
 
     ScriptMessage_ShowInstant(ctx, msgLoader, v2);
     MessageLoader_Free(msgLoader);
@@ -2058,7 +2058,7 @@ static BOOL ScrCmd_1FB(ScriptContext *ctx)
     u16 v1 = ScriptContext_GetVar(ctx);
     u16 v2 = ScriptContext_GetVar(ctx);
 
-    MessageLoader *msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, v1, HEAP_ID_FIELD_TASK);
+    MessageLoader *msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, v1, HEAP_ID_FIELD3);
     ScriptMessage_Show(ctx, msgLoader, v2, TRUE, NULL);
 
     MessageLoader_Free(msgLoader);
@@ -2104,7 +2104,7 @@ static BOOL ScrCmd_1FE(ScriptContext *ctx)
     u16 *v0 = v1->unk_78[v3].unk_00.unk_18;
 
     if (v0[0] == 0xFFFF) {
-        MessageLoader *msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0613, HEAP_ID_FIELD_TASK);
+        MessageLoader *msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0613, HEAP_ID_FIELD3);
         ScriptMessage_Show(ctx, msgLoader, v0[1], TRUE, NULL);
         MessageLoader_Free(msgLoader);
     } else {
@@ -2600,7 +2600,7 @@ static BOOL ScrCmd_ShowYesNoMenu(ScriptContext *ctx)
     Menu **menu = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_UI_CONTROL);
     u16 destVarID = ScriptContext_ReadHalfWord(ctx);
 
-    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, STANDARD_WINDOW_SYSTEM, HEAP_ID_FIELD1);
 
     *menu = Menu_MakeYesNoChoice(fieldSystem->bgConfig, &sYesNoWindowTemplate, 1024 - (18 + 12) - 9, 11, 4);
     ctx->data[0] = destVarID;
@@ -2616,7 +2616,7 @@ static BOOL ScriptContext_WaitForYesNoResult(ScriptContext *ctx)
     Menu **menu = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_UI_CONTROL);
     u16 *destVar = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]);
 
-    u32 result = Menu_ProcessInputAndHandleExit(*menu, HEAP_ID_FIELD);
+    u32 result = Menu_ProcessInputAndHandleExit(*menu, HEAP_ID_FIELD1);
 
     if (result == MENU_NOTHING_CHOSEN) {
         return FALSE;
@@ -2902,7 +2902,7 @@ static BOOL ScrCmd_Unused_2A1(ScriptContext *ctx)
         GF_ASSERT(FALSE);
     }
 
-    MapObjectAnimCmd *v10 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(MapObjectAnimCmd) * 64);
+    MapObjectAnimCmd *v10 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(MapObjectAnimCmd) * 64);
     u16 v8 = MapObject_GetX(v4);
     u16 v9 = MapObject_GetZ(v4);
     int v11 = 0;
@@ -2977,7 +2977,7 @@ static void sub_02040F28(FieldSystem *fieldSystem, SysTask *param1, MapObjectAni
 {
     UnkStruct_02040F28 *v0 = NULL;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_02040F28));
+    v0 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_02040F28));
 
     if (v0 == NULL) {
         GF_ASSERT(FALSE);
@@ -3448,7 +3448,7 @@ static BOOL ScrCmd_2A5(ScriptContext *ctx)
 static BOOL ScrCmd_192(ScriptContext *ctx)
 {
     void **v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
-    *v0 = sub_0203D50C(ctx->fieldSystem->task, HEAP_ID_FIELD_TASK);
+    *v0 = sub_0203D50C(ctx->fieldSystem->task, HEAP_ID_FIELD3);
 
     return TRUE;
 }
@@ -3737,7 +3737,7 @@ static BOOL ScriptContext_WaitForPokemonStorageClose(ScriptContext *ctx)
     if (pokemonStorageSession->recordBoxUseInJournal == TRUE) {
         void *journalEntryLocationEvent;
 
-        journalEntryLocationEvent = JournalEntry_CreateEventUsedPCBox(HEAP_ID_FIELDMAP);
+        journalEntryLocationEvent = JournalEntry_CreateEventUsedPCBox(HEAP_ID_FIELD2);
         JournalEntry_SaveData(fieldSystem->journalEntry, journalEntryLocationEvent, JOURNAL_LOCATION);
     }
 
@@ -3804,7 +3804,7 @@ static UnkStruct_02041DC8 *sub_02041DC8(int heapID, FieldSystem *fieldSystem, in
         return NULL;
     }
 
-    UnkStruct_02041DC8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02041DC8));
+    UnkStruct_02041DC8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02041DC8));
     memset(v0, 0, sizeof(UnkStruct_02041DC8));
 
     v0->unk_00 = v3;
@@ -3852,8 +3852,8 @@ static BOOL ScrCmd_DrawPokemonPreview(ScriptContext *ctx)
     u16 species = ScriptContext_GetVar(ctx);
     u16 gender = ScriptContext_GetVar(ctx);
 
-    LoadStandardWindowGraphics(ctx->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 0, HEAP_ID_FIELD);
-    *v0 = DrawPokemonPreview(ctx->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 10, 5, 11, 1024 - (18 + 12) - 9, species, gender, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(ctx->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 0, HEAP_ID_FIELD1);
+    *v0 = DrawPokemonPreview(ctx->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 10, 5, 11, 1024 - (18 + 12) - 9, species, gender, HEAP_ID_FIELD1);
     FieldSystem_WriteSpeciesSeen(ctx->fieldSystem, species);
 
     return FALSE;
@@ -3865,9 +3865,9 @@ static BOOL ScrCmd_DrawPokemonPreviewFromPartySlot(ScriptContext *ctx)
     u16 partySlot = ScriptContext_GetVar(ctx);
 
     Pokemon *pokemon = Party_GetPokemonBySlotIndex(SaveData_GetParty(ctx->fieldSystem->saveData), partySlot);
-    LoadStandardWindowGraphics(ctx->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 0, HEAP_ID_FIELD);
+    LoadStandardWindowGraphics(ctx->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 0, HEAP_ID_FIELD1);
 
-    *v1 = DrawPokemonPreviewFromStruct(ctx->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 10, 5, 11, 1024 - (18 + 12) - 9, pokemon, HEAP_ID_FIELD);
+    *v1 = DrawPokemonPreviewFromStruct(ctx->fieldSystem->bgConfig, BG_LAYER_MAIN_3, 10, 5, 11, 1024 - (18 + 12) - 9, pokemon, HEAP_ID_FIELD1);
     FieldSystem_WriteSpeciesSeen(ctx->fieldSystem, Pokemon_GetValue(pokemon, MON_DATA_SPECIES, NULL));
 
     return FALSE;
@@ -3970,7 +3970,7 @@ static BOOL ScrCmd_0A7(ScriptContext *ctx)
     int v1 = ScriptContext_ReadHalfWord(ctx);
     u16 *v2 = ScriptContext_GetVarPointer(ctx);
 
-    *v0 = sub_02041DC8(HEAP_ID_FIELDMAP, ctx->fieldSystem, 0, v1);
+    *v0 = sub_02041DC8(HEAP_ID_FIELD2, ctx->fieldSystem, 0, v1);
 
     if (*v0 == NULL) {
         *v2 = 1;
@@ -3992,7 +3992,7 @@ static BOOL ScrCmd_0A8(ScriptContext *ctx)
     int v1 = ScriptContext_ReadHalfWord(ctx);
     u16 *v2 = ScriptContext_GetVarPointer(ctx);
 
-    *v0 = sub_02041DC8(HEAP_ID_FIELDMAP, ctx->fieldSystem, 1, v1);
+    *v0 = sub_02041DC8(HEAP_ID_FIELD2, ctx->fieldSystem, 1, v1);
 
     if (*v0 == NULL) {
         *v2 = 1;
@@ -4077,7 +4077,7 @@ static BOOL ScrCmd_0AA(ScriptContext *ctx)
 {
     void **v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
 
-    *v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0203D8AC));
+    *v1 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0203D8AC));
 
     sub_0206B70C(ctx->fieldSystem, *v1, 2);
     sub_0203D884(ctx->fieldSystem, *v1);
@@ -4091,7 +4091,7 @@ static BOOL ScrCmd_1D7(ScriptContext *ctx)
     void **v2 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
 
     u8 v0 = ScriptContext_ReadHalfWord(ctx);
-    *v2 = sub_02099674(ctx->fieldSystem, v0, HEAP_ID_FIELDMAP);
+    *v2 = sub_02099674(ctx->fieldSystem, v0, HEAP_ID_FIELD2);
 
     ScriptContext_Pause(ctx, sub_02041CC8);
     return TRUE;
@@ -4121,7 +4121,7 @@ static BOOL ScrCmd_1D9(ScriptContext *ctx)
     u16 v2 = ScriptContext_GetVar(ctx);
     void **v3 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
 
-    *v3 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov90_021D0D80));
+    *v3 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_ov90_021D0D80));
 
     UnkStruct_ov90_021D0D80 *v0 = (UnkStruct_ov90_021D0D80 *)*v3;
     MI_CpuClear8(v0, sizeof(UnkStruct_ov90_021D0D80));
@@ -4139,7 +4139,7 @@ static BOOL ScrCmd_1D9(ScriptContext *ctx)
 static BOOL ScrCmd_OpenPokemonStorage(ScriptContext *ctx)
 {
     void **partyManagementData = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
-    PokemonStorageSession *pokemonStorageSession = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PokemonStorageSession));
+    PokemonStorageSession *pokemonStorageSession = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PokemonStorageSession));
 
     pokemonStorageSession->saveData = ctx->fieldSystem->saveData;
     pokemonStorageSession->boxMode = ScriptContext_ReadByte(ctx);
@@ -4202,7 +4202,7 @@ static BOOL ScrCmd_0B1(ScriptContext *ctx)
 static BOOL ScrCmd_336(ScriptContext *ctx)
 {
     int v1;
-    HallOfFame *v2 = SaveData_HallOfFame(ctx->fieldSystem->saveData, HEAP_ID_FIELD, &v1);
+    HallOfFame *v2 = SaveData_HallOfFame(ctx->fieldSystem->saveData, HEAP_ID_FIELD1, &v1);
     u16 *v0 = ScriptContext_GetVarPointer(ctx);
     *v0 = 0;
 
@@ -4242,7 +4242,7 @@ static BOOL ScrCmd_StartChooseStarterScene(ScriptContext *ctx)
 {
     void **fieldSysDataPtr = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
 
-    *fieldSysDataPtr = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(ChooseStarterData));
+    *fieldSysDataPtr = Heap_Alloc(HEAP_ID_FIELD2, sizeof(ChooseStarterData));
     ChooseStarterData *chooseStarterData = *fieldSysDataPtr;
 
     chooseStarterData->options = SaveData_GetOptions(ctx->fieldSystem->saveData);
@@ -4396,7 +4396,7 @@ static BOOL ScrCmd_FadeScreen(ScriptContext *ctx)
     u16 type = ScriptContext_ReadHalfWord(ctx);
     u16 color = ScriptContext_ReadHalfWord(ctx);
 
-    StartScreenFade(FADE_BOTH_SCREENS, type, type, color, transition, frames, HEAP_ID_FIELD);
+    StartScreenFade(FADE_BOTH_SCREENS, type, type, color, transition, frames, HEAP_ID_FIELD1);
     ResetVisibleHardwareWindows(DS_SCREEN_MAIN);
     ResetVisibleHardwareWindows(DS_SCREEN_SUB);
 
@@ -4643,7 +4643,7 @@ static BOOL ScrCmd_PrintTrainerDialogue(ScriptContext *ctx)
     u16 trainerID = ScriptContext_GetVar(ctx);
     u16 msgType = ScriptContext_GetVar(ctx);
 
-    Trainer_LoadMessage(trainerID, msgType, *strbuf, HEAP_ID_FIELDMAP);
+    Trainer_LoadMessage(trainerID, msgType, *strbuf, HEAP_ID_FIELD2);
     Window_FillTilemap(FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW), SCRIPT_MANAGER_STR_TEMPLATE);
 
     *printerID = FieldMessage_Print(FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_WINDOW), *strbuf, SaveData_GetOptions(ctx->fieldSystem->saveData), SCRIPT_MANAGER_WINDOW);
@@ -4892,7 +4892,7 @@ static BOOL ScrCmd_StartFirstBattle(ScriptContext *ctx)
     int *battleResultMaskPtr = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_BATTLE_RESULT);
     u16 trainerID = ScriptContext_GetVar(ctx);
 
-    Encounter_NewVsFirstBattle(ctx->task, trainerID, HEAP_ID_FIELDMAP, battleResultMaskPtr);
+    Encounter_NewVsFirstBattle(ctx->task, trainerID, HEAP_ID_FIELD2, battleResultMaskPtr);
     return TRUE;
 }
 
@@ -5884,15 +5884,15 @@ static BOOL ScrCmd_CreateJournalEvent(ScriptContext *ctx)
     switch (eventType) {
     case LOCATION_EVENT_GAME_CORNER:
         dataType = JOURNAL_LOCATION;
-        *data = JournalEntry_CreateEventGameCorner(HEAP_ID_FIELD);
+        *data = JournalEntry_CreateEventGameCorner(HEAP_ID_FIELD1);
         break;
     case LOCATION_EVENT_SAFARI_GAME:
         dataType = JOURNAL_LOCATION;
-        *data = JournalEntry_CreateEventSafariGame(HEAP_ID_FIELD);
+        *data = JournalEntry_CreateEventSafariGame(HEAP_ID_FIELD1);
         break;
     case LOCATION_EVENT_ITEM_WAS_OBTAINED:
         dataType = JOURNAL_LOCATION;
-        *data = JournalEntry_CreateEventObtainedItem(eventParam, HEAP_ID_FIELD);
+        *data = JournalEntry_CreateEventObtainedItem(eventParam, HEAP_ID_FIELD1);
         break;
     case LOCATION_EVENT_USED_CUT:
     case LOCATION_EVENT_USED_SURF:
@@ -5902,7 +5902,7 @@ static BOOL ScrCmd_CreateJournalEvent(ScriptContext *ctx)
     case LOCATION_EVENT_USED_WATERFALL:
     case LOCATION_EVENT_USED_ROCK_CLIMB:
         dataType = JOURNAL_LOCATION;
-        *data = JournalEntry_CreateEventUsedMove(eventType - LOCATION_EVENT_USED_CUT, eventParam, HEAP_ID_FIELD);
+        *data = JournalEntry_CreateEventUsedMove(eventType - LOCATION_EVENT_USED_CUT, eventParam, HEAP_ID_FIELD1);
         break;
     case LOCATION_EVENT_BATTLE_TOWER:
     case LOCATION_EVENT_BATTLE_FACTORY:
@@ -5910,7 +5910,7 @@ static BOOL ScrCmd_CreateJournalEvent(ScriptContext *ctx)
     case LOCATION_EVENT_BATTLE_HALL:
     case LOCATION_EVENT_BATTLE_ARCADE:
         dataType = JOURNAL_LOCATION;
-        *data = JournalEntry_CreateEventBattleFacility(HEAP_ID_FIELD, eventType);
+        *data = JournalEntry_CreateEventBattleFacility(HEAP_ID_FIELD1, eventType);
         break;
     default:
         return TRUE;
@@ -6023,7 +6023,7 @@ static BOOL ScrCmd_1EA(ScriptContext *ctx)
 {
     void **v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
 
-    *v0 = sub_0203E53C(ctx->fieldSystem, HEAP_ID_FIELD_TASK, 0);
+    *v0 = sub_0203E53C(ctx->fieldSystem, HEAP_ID_FIELD3, 0);
     ScriptContext_Pause(ctx, sub_02041CC8);
 
     return TRUE;
@@ -6033,7 +6033,7 @@ static BOOL ScrCmd_1EB(ScriptContext *ctx)
 {
     void **v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
 
-    *v0 = sub_0203E53C(ctx->fieldSystem, HEAP_ID_FIELD_TASK, 1);
+    *v0 = sub_0203E53C(ctx->fieldSystem, HEAP_ID_FIELD3, 1);
     ScriptContext_Pause(ctx, sub_02041CC8);
 
     return TRUE;
@@ -6145,7 +6145,7 @@ static BOOL ScrCmd_202(ScriptContext *ctx)
     case 1:
         SystemFlag_ClearSafariGameActive(v3);
         sub_0206D720(ctx->fieldSystem);
-        void *journalEntryLocationEvent = JournalEntry_CreateEventSafariGame(HEAP_ID_FIELD);
+        void *journalEntryLocationEvent = JournalEntry_CreateEventSafariGame(HEAP_ID_FIELD1);
 
         JournalEntry_SaveData(ctx->fieldSystem->journalEntry, journalEntryLocationEvent, JOURNAL_LOCATION);
         *v0 = 0;
@@ -6268,7 +6268,7 @@ static BOOL ScrCmd_ActivateRoamingPokemon(ScriptContext *ctx)
 static BOOL ScrCmd_StartNpcTrade(ScriptContext *ctx)
 {
     void **data = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
-    *data = NpcTrade_Init(HEAP_ID_FIELDMAP, ScriptContext_ReadByte(ctx));
+    *data = NpcTrade_Init(HEAP_ID_FIELD2, ScriptContext_ReadByte(ctx));
     return FALSE;
 }
 
@@ -6291,7 +6291,7 @@ static BOOL ScrCmd_GetNpcTradeRequestedSpecies(ScriptContext *ctx)
 static BOOL ScrCmd_229(ScriptContext *ctx)
 {
     void **data = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_DATA_PTR);
-    sub_0206C740(ctx->task, (NpcTradeData *)*data, ScriptContext_GetVar(ctx), HEAP_ID_FIELDMAP);
+    sub_0206C740(ctx->task, (NpcTradeData *)*data, ScriptContext_GetVar(ctx), HEAP_ID_FIELD2);
     return TRUE;
 }
 
@@ -6494,7 +6494,7 @@ static BOOL ScrCmd_24D(ScriptContext *ctx)
 static void FieldSystem_WriteSpeciesSeen(FieldSystem *fieldSystem, u16 species)
 {
     Pokedex *pokedex = SaveData_GetPokedex(fieldSystem->saveData);
-    Pokemon *pokemon = Pokemon_New(HEAP_ID_FIELD_TASK);
+    Pokemon *pokemon = Pokemon_New(HEAP_ID_FIELD3);
 
     Pokemon_Init(pokemon);
     Pokemon_InitWith(pokemon, species, 50, INIT_IVS_RANDOM, FALSE, 0, OTID_NOT_SET, 0);
@@ -7061,7 +7061,7 @@ static BOOL ScrCmd_GivePoffin(ScriptContext *ctx)
     }
 
     u8 smoothness = ScriptContext_GetVar(ctx);
-    Poffin *poffin = Poffin_New(HEAP_ID_FIELD);
+    Poffin *poffin = Poffin_New(HEAP_ID_FIELD1);
     int poffinFlavor = Poffin_MakePoffin(poffin, flavors, smoothness, FALSE);
     PoffinCase *poffinCase = SaveData_GetPoffinCase(ctx->fieldSystem->saveData);
     u16 slotId = PoffinCase_AddPoffin(poffinCase, poffin);
@@ -7203,13 +7203,13 @@ static BOOL ScrCmd_29E(ScriptContext *ctx)
 
     switch (v0) {
     case 0:
-        ov6_0224899C(fieldSystem, v1, 0, HEAP_ID_FIELD_TASK);
+        ov6_0224899C(fieldSystem, v1, 0, HEAP_ID_FIELD3);
         break;
     case 1:
-        ov6_0224899C(fieldSystem, v1, 1, HEAP_ID_FIELD_TASK);
+        ov6_0224899C(fieldSystem, v1, 1, HEAP_ID_FIELD3);
         break;
     case 2:
-        ov6_0224899C(fieldSystem, v1, 2, HEAP_ID_FIELD_TASK);
+        ov6_0224899C(fieldSystem, v1, 2, HEAP_ID_FIELD3);
         break;
     default:
         GF_ASSERT(0);
@@ -7290,15 +7290,15 @@ static BOOL ScrCmd_2AA(ScriptContext *ctx)
     u16 v3 = ScriptContext_GetVar(ctx);
     u16 v4 = ScriptContext_GetVar(ctx);
     u16 v5 = ScriptContext_GetVar(ctx);
-    StringTemplate *v6 = StringTemplate_Default(HEAP_ID_FIELD_TASK);
-    MessageLoader *v7 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0372, HEAP_ID_FIELD_TASK);
+    StringTemplate *v6 = StringTemplate_Default(HEAP_ID_FIELD3);
+    MessageLoader *v7 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0372, HEAP_ID_FIELD3);
 
     StringTemplate_SetCustomMessageWord(v6, 0, v2);
     StringTemplate_SetCustomMessageWord(v6, 1, v3);
     StringTemplate_SetCustomMessageWord(v6, 2, v4);
     StringTemplate_SetCustomMessageWord(v6, 3, v5);
 
-    Strbuf *v8 = MessageUtil_ExpandedStrbuf(v6, v7, 1, HEAP_ID_FIELD_TASK);
+    Strbuf *v8 = MessageUtil_ExpandedStrbuf(v6, v7, 1, HEAP_ID_FIELD3);
     Strbuf *v9 = MessageLoader_GetNewStrbuf(v7, 0);
     *v1 = (Strbuf_Compare(v8, v9) == 0);
 
@@ -7394,7 +7394,7 @@ static BOOL ScrCmd_OpenSaveInfo(ScriptContext *ctx)
     SaveInfoWindow **saveInfoWin = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_SAVE_INFO_WINDOW);
 
     if (!SaveData_OverwriteCheck(fieldSystem->saveData)) {
-        *saveInfoWin = SaveInfoWindow_New(fieldSystem, HEAP_ID_FIELD, BG_LAYER_MAIN_3);
+        *saveInfoWin = SaveInfoWindow_New(fieldSystem, HEAP_ID_FIELD1, BG_LAYER_MAIN_3);
         SaveInfoWindow_Draw(*saveInfoWin);
     }
 
@@ -7424,7 +7424,7 @@ static BOOL ScrCmd_2C4(ScriptContext *ctx)
 {
     void **v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
     u8 v1 = ScriptContext_ReadByte(ctx);
-    UnkStruct_ov104_02230BE4 *v2 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_02230BE4));
+    UnkStruct_ov104_02230BE4 *v2 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov104_02230BE4));
 
     MI_CpuClear8(v2, sizeof(UnkStruct_ov104_02230BE4));
 
@@ -7553,7 +7553,7 @@ BOOL ScrCmd_2C8(ScriptContext *ctx)
     u16 v2 = ScriptContext_GetVar(ctx);
     u16 v3 = ScriptContext_GetVar(ctx);
 
-    *v0 = sub_0203E564(ctx->fieldSystem, v1, v2, v3, HEAP_ID_FIELD_TASK);
+    *v0 = sub_0203E564(ctx->fieldSystem, v1, v2, v3, HEAP_ID_FIELD3);
     ScriptContext_Pause(ctx, sub_02041CC8);
 
     return TRUE;
@@ -7563,7 +7563,7 @@ BOOL ScrCmd_2E2(ScriptContext *ctx)
 {
     void **v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
 
-    *v0 = sub_0203E608(ctx->fieldSystem, HEAP_ID_FIELD_TASK);
+    *v0 = sub_0203E608(ctx->fieldSystem, HEAP_ID_FIELD3);
     ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit);
 
     return TRUE;
@@ -7883,9 +7883,9 @@ static BOOL ScrCmd_CheckHeapMemory(ScriptContext *ctx)
 {
     FieldSystem *fieldSystem = ctx->fieldSystem;
     u16 assertUnchangedFreeMemory = ScriptContext_GetVar(ctx);
-    u32 fieldMapFreeMemory = Heap_FndGetTotalFreeSizeForExpHeap(HEAP_ID_FIELDMAP);
-    u32 fieldFreeMemory = Heap_FndGetTotalFreeSizeForExpHeap(HEAP_ID_FIELD);
-    u32 fieldTaskFreeMemory = Heap_FndGetTotalFreeSizeForExpHeap(HEAP_ID_FIELD_TASK);
+    u32 fieldMapFreeMemory = HeapExp_FndGetTotalFreeSize(HEAP_ID_FIELD2);
+    u32 fieldFreeMemory = HeapExp_FndGetTotalFreeSize(HEAP_ID_FIELD1);
+    u32 fieldTaskFreeMemory = HeapExp_FndGetTotalFreeSize(HEAP_ID_FIELD3);
 
     if (assertUnchangedFreeMemory == FALSE) {
         sFieldMapLastFreeMemory = fieldMapFreeMemory;
diff --git a/src/scrcmd_catching_show.c b/src/scrcmd_catching_show.c
index 223d84ad8e..39996f44c5 100644
--- a/src/scrcmd_catching_show.c
+++ b/src/scrcmd_catching_show.c
@@ -47,7 +47,7 @@ BOOL ScrCmd_SetClearInCatchingShowFlag(ScriptContext *ctx)
 BOOL ScrCmd_CheckHasEnoughMonForCatchingShow(ScriptContext *ctx)
 {
     PalParkTransfer *transferData = SaveData_GetPalParkTransfer(ctx->fieldSystem->saveData);
-    Pokemon *dummy = Pokemon_New(HEAP_ID_FIELD_TASK);
+    Pokemon *dummy = Pokemon_New(HEAP_ID_FIELD3);
     u16 *destVar = ScriptContext_GetVarPointer(ctx);
 
     if (GetPalParkTransferMonCount(transferData) == CATCHING_SHOW_MONS) {
@@ -64,14 +64,14 @@ BOOL ScrCmd_MoveCatchingShowMonsToPCBoxes(ScriptContext *ctx)
 {
     PalParkTransfer *transferData = SaveData_GetPalParkTransfer(ctx->fieldSystem->saveData);
     PCBoxes *pcBoxes = SaveData_GetPCBoxes(ctx->fieldSystem->saveData);
-    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD_TASK);
+    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD3);
     TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(ctx->fieldSystem->saveData);
     Pokedex *pokedex = SaveData_GetPokedex(ctx->fieldSystem->saveData);
     BOOL success;
 
     for (int i = 0; i < CATCHING_SHOW_MONS; i++) {
         TransferDataToMon(transferData, i, mon);
-        UpdateMonStatusAndTrainerInfo(mon, trainerInfo, 2, 0, HEAP_ID_FIELD_TASK);
+        UpdateMonStatusAndTrainerInfo(mon, trainerInfo, 2, 0, HEAP_ID_FIELD3);
         success = PCBoxes_TryStoreBoxMon(pcBoxes, Pokemon_GetBoxPokemon(mon));
         GF_ASSERT(success);
         SaveData_UpdateCatchRecords(ctx->fieldSystem->saveData, mon);
diff --git a/src/scrcmd_item.c b/src/scrcmd_item.c
index de3f2fef4c..cf32516704 100644
--- a/src/scrcmd_item.c
+++ b/src/scrcmd_item.c
@@ -20,7 +20,7 @@ BOOL ScrCmd_AddItem(ScriptContext *ctx)
     u16 count = ScriptContext_GetVar(ctx);
     u16 *destVar = ScriptContext_GetVarPointer(ctx);
 
-    *destVar = Bag_TryAddItem(SaveData_GetBag(fieldSystem->saveData), item, count, HEAP_ID_FIELD);
+    *destVar = Bag_TryAddItem(SaveData_GetBag(fieldSystem->saveData), item, count, HEAP_ID_FIELD1);
     return FALSE;
 }
 
@@ -31,7 +31,7 @@ BOOL ScrCmd_RemoveItem(ScriptContext *ctx)
     u16 count = ScriptContext_GetVar(ctx);
     u16 *destVar = ScriptContext_GetVarPointer(ctx);
 
-    *destVar = Bag_TryRemoveItem(SaveData_GetBag(fieldSystem->saveData), item, count, HEAP_ID_FIELD);
+    *destVar = Bag_TryRemoveItem(SaveData_GetBag(fieldSystem->saveData), item, count, HEAP_ID_FIELD1);
     return FALSE;
 }
 
@@ -42,7 +42,7 @@ BOOL ScrCmd_CanFitItem(ScriptContext *ctx)
     u16 count = ScriptContext_GetVar(ctx);
     u16 *destVar = ScriptContext_GetVarPointer(ctx);
 
-    *destVar = Bag_CanFitItem(SaveData_GetBag(fieldSystem->saveData), item, count, HEAP_ID_FIELD);
+    *destVar = Bag_CanFitItem(SaveData_GetBag(fieldSystem->saveData), item, count, HEAP_ID_FIELD1);
     return FALSE;
 }
 
@@ -53,7 +53,7 @@ BOOL ScrCmd_CheckItem(ScriptContext *ctx)
     u16 count = ScriptContext_GetVar(ctx);
     u16 *destVar = ScriptContext_GetVarPointer(ctx);
 
-    *destVar = Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), item, count, HEAP_ID_FIELDMAP);
+    *destVar = Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), item, count, HEAP_ID_FIELD2);
     return FALSE;
 }
 
@@ -63,7 +63,7 @@ BOOL ScrCmd_GetItemQuantity(ScriptContext *ctx)
     u16 item = ScriptContext_GetVar(ctx);
     u16 *destVar = ScriptContext_GetVarPointer(ctx);
 
-    *destVar = Bag_GetItemQuantity(SaveData_GetBag(fieldSystem->saveData), item, HEAP_ID_FIELDMAP);
+    *destVar = Bag_GetItemQuantity(SaveData_GetBag(fieldSystem->saveData), item, HEAP_ID_FIELD2);
     return FALSE;
 }
 
@@ -83,7 +83,7 @@ BOOL ScrCmd_GetItemPocket(ScriptContext *ctx)
     u16 item = ScriptContext_GetVar(ctx);
     u16 *pocket = ScriptContext_GetVarPointer(ctx);
 
-    *pocket = (u16)Item_LoadParam(item, ITEM_PARAM_FIELD_POCKET, HEAP_ID_FIELDMAP);
+    *pocket = (u16)Item_LoadParam(item, ITEM_PARAM_FIELD_POCKET, HEAP_ID_FIELD2);
     return FALSE;
 }
 
diff --git a/src/scrcmd_mystery_gift.c b/src/scrcmd_mystery_gift.c
index 2527e15e08..c46bdc4ffa 100644
--- a/src/scrcmd_mystery_gift.c
+++ b/src/scrcmd_mystery_gift.c
@@ -164,7 +164,7 @@ static BOOL CanReceivePokemon(FieldSystem *fieldSystem, GiftData *dummy)
 
 static void GenerateManaphyEgg(FieldSystem *fieldSystem, GiftData *dummy)
 {
-    sub_02054930(HEAP_ID_FIELD_TASK, fieldSystem->saveData, SPECIES_MANAPHY, 1, 2, 1);
+    sub_02054930(HEAP_ID_FIELD3, fieldSystem->saveData, SPECIES_MANAPHY, 1, 2, 1);
 }
 
 static void PrepReceivedManaphyEggMsg(MystGiftGiveMsgFormatter *formatter, u16 *outTextBank, u16 *outStringID)
@@ -273,11 +273,11 @@ static void GivePokemon(FieldSystem *fieldSystem, GiftData *dummy)
     }
 
     if (giftData->pokemonGiftData.hasCustomOT == FALSE) {
-        Strbuf *playerName = TrainerInfo_NameNewStrbuf(trainerInfo, HEAP_ID_FIELD_TASK);
+        Strbuf *playerName = TrainerInfo_NameNewStrbuf(trainerInfo, HEAP_ID_FIELD3);
         u32 playerID = TrainerInfo_ID(trainerInfo);
         u32 playerGender = TrainerInfo_Gender(trainerInfo);
 
-        tmpPoke = Pokemon_New(HEAP_ID_FIELD_TASK);
+        tmpPoke = Pokemon_New(HEAP_ID_FIELD3);
 
         Pokemon_Copy(pokemon, tmpPoke);
         Pokemon_SetValue(tmpPoke, MON_DATA_OTNAME_STRBUF, playerName);
@@ -288,7 +288,7 @@ static void GivePokemon(FieldSystem *fieldSystem, GiftData *dummy)
         Strbuf_Free(playerName);
     }
 
-    UpdateMonStatusAndTrainerInfo(pokemon, trainerInfo, 4, SpecialMetLoc_GetId(2, metLocation), HEAP_ID_FIELD_TASK);
+    UpdateMonStatusAndTrainerInfo(pokemon, trainerInfo, 4, SpecialMetLoc_GetId(2, metLocation), HEAP_ID_FIELD3);
 
     if (Pokemon_GetValue(pokemon, MON_DATA_SPECIES, NULL) == SPECIES_ARCEUS) {
         if (Pokemon_GetValue(pokemon, MON_DATA_FATEFUL_ENCOUNTER, NULL) == TRUE) {
@@ -354,7 +354,7 @@ static BOOL CanReceiveItem(FieldSystem *fieldSystem, GiftData *dummy)
     Bag *bag = SaveData_GetBag(fieldSystem->saveData);
     GiftData *giftData = GetCurrentPgtData(fieldSystem);
 
-    return Bag_CanFitItem(bag, giftData->itemGiftData.item, 1, HEAP_ID_FIELD_TASK);
+    return Bag_CanFitItem(bag, giftData->itemGiftData.item, 1, HEAP_ID_FIELD3);
 }
 
 static void GiveItem(FieldSystem *fieldSystem, GiftData *dummy)
@@ -363,7 +363,7 @@ static void GiveItem(FieldSystem *fieldSystem, GiftData *dummy)
     GiftData *giftData = GetCurrentPgtData(fieldSystem);
     u16 itemID = giftData->itemGiftData.item;
 
-    Bag_TryAddItem(bag, itemID, 1, HEAP_ID_FIELD_TASK);
+    Bag_TryAddItem(bag, itemID, 1, HEAP_ID_FIELD3);
 }
 
 static void PrepReceivedItemMsg(MystGiftGiveMsgFormatter *formatter, u16 *outTextBank, u16 *outStringID)
@@ -413,7 +413,7 @@ static void PrepReceivedRulesMsg(MystGiftGiveMsgFormatter *formatter, u16 *outTe
 
     StringTemplate_SetPlayerName(formatter->stringTemplate, 0, SaveData_GetTrainerInfo(formatter->fieldSystem->saveData));
 
-    Strbuf *battleRegName = sub_0202605C(battleReg, HEAP_ID_FIELD_TASK);
+    Strbuf *battleRegName = sub_0202605C(battleReg, HEAP_ID_FIELD3);
     StringTemplate_SetStrbuf(formatter->stringTemplate, 1, battleRegName, 0, 1, GAME_LANGUAGE);
     Strbuf_Free(battleRegName);
 }
@@ -529,7 +529,7 @@ static BOOL CanReceiveMemberCard(FieldSystem *fieldSystem, GiftData *dummy)
     Bag *bag = SaveData_GetBag(fieldSystem->saveData);
     GiftData *giftData = GetCurrentPgtData(fieldSystem);
 
-    return Bag_CanFitItem(bag, ITEM_MEMBER_CARD, 1, HEAP_ID_FIELD_TASK);
+    return Bag_CanFitItem(bag, ITEM_MEMBER_CARD, 1, HEAP_ID_FIELD3);
 }
 
 static void InitDarkraiEvent(FieldSystem *fieldSystem, GiftData *dummy)
@@ -538,7 +538,7 @@ static void InitDarkraiEvent(FieldSystem *fieldSystem, GiftData *dummy)
     GiftData *giftData = GetCurrentPgtData(fieldSystem);
     VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData);
 
-    Bag_TryAddItem(bag, ITEM_MEMBER_CARD, 1, HEAP_ID_FIELD_TASK);
+    Bag_TryAddItem(bag, ITEM_MEMBER_CARD, 1, HEAP_ID_FIELD3);
     SystemVars_SetDistributionEventMagic(varsFlags, DISTRIBUTION_EVENT_DARKRAI);
 }
 
@@ -571,7 +571,7 @@ static BOOL CanReceiveOaksLetter(FieldSystem *fieldSystem, GiftData *dummy)
     Bag *bag = SaveData_GetBag(fieldSystem->saveData);
     GiftData *giftData = GetCurrentPgtData(fieldSystem);
 
-    return Bag_CanFitItem(bag, ITEM_OAKS_LETTER, 1, HEAP_ID_FIELD_TASK);
+    return Bag_CanFitItem(bag, ITEM_OAKS_LETTER, 1, HEAP_ID_FIELD3);
 }
 
 static void InitShayminEvent(FieldSystem *fieldSystem, GiftData *dummy)
@@ -580,7 +580,7 @@ static void InitShayminEvent(FieldSystem *fieldSystem, GiftData *dummy)
     GiftData *giftData = GetCurrentPgtData(fieldSystem);
     VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData);
 
-    Bag_TryAddItem(bag, ITEM_OAKS_LETTER, 1, HEAP_ID_FIELD_TASK);
+    Bag_TryAddItem(bag, ITEM_OAKS_LETTER, 1, HEAP_ID_FIELD3);
     SystemVars_SetDistributionEventMagic(varsFlags, DISTRIBUTION_EVENT_SHAYMIN);
 
     if (SystemVars_GetShayminEventState(varsFlags) == 0) {
@@ -617,7 +617,7 @@ static BOOL CanReceiveSecretKey(FieldSystem *fieldSystem, GiftData *dummy)
     Bag *bag = SaveData_GetBag(fieldSystem->saveData);
     GiftData *giftData = GetCurrentPgtData(fieldSystem);
 
-    return Bag_CanFitItem(bag, ITEM_SECRET_KEY, 1, HEAP_ID_FIELD_TASK);
+    return Bag_CanFitItem(bag, ITEM_SECRET_KEY, 1, HEAP_ID_FIELD3);
 }
 
 static void InitRotomEvent(FieldSystem *fieldSystem, GiftData *dummy)
@@ -626,7 +626,7 @@ static void InitRotomEvent(FieldSystem *fieldSystem, GiftData *dummy)
     GiftData *giftData = GetCurrentPgtData(fieldSystem);
     VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData);
 
-    Bag_TryAddItem(bag, ITEM_SECRET_KEY, 1, HEAP_ID_FIELD_TASK);
+    Bag_TryAddItem(bag, ITEM_SECRET_KEY, 1, HEAP_ID_FIELD3);
     SystemVars_SetDistributionEventMagic(varsFlags, DISTRIBUTION_EVENT_ROTOM);
 }
 
@@ -659,7 +659,7 @@ static BOOL CanReceiveAzureFlute(FieldSystem *fieldSystem, GiftData *dummy)
     Bag *bag = SaveData_GetBag(fieldSystem->saveData);
     GiftData *giftData = GetCurrentPgtData(fieldSystem);
 
-    return Bag_CanFitItem(bag, ITEM_AZURE_FLUTE, 1, HEAP_ID_FIELD_TASK);
+    return Bag_CanFitItem(bag, ITEM_AZURE_FLUTE, 1, HEAP_ID_FIELD3);
 }
 
 static void InitArceusEvent(FieldSystem *fieldSystem, GiftData *dummy)
@@ -668,7 +668,7 @@ static void InitArceusEvent(FieldSystem *fieldSystem, GiftData *dummy)
     GiftData *unused = GetCurrentPgtData(fieldSystem);
     VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData);
 
-    Bag_TryAddItem(bag, ITEM_AZURE_FLUTE, 1, HEAP_ID_FIELD_TASK);
+    Bag_TryAddItem(bag, ITEM_AZURE_FLUTE, 1, HEAP_ID_FIELD3);
     SystemVars_SetDistributionEventMagic(varsFlags, DISTRIBUTION_EVENT_ARCEUS);
 }
 
diff --git a/src/scrcmd_trainer.c b/src/scrcmd_trainer.c
index 7f0154a7f1..09151acef8 100644
--- a/src/scrcmd_trainer.c
+++ b/src/scrcmd_trainer.c
@@ -138,7 +138,7 @@ BOOL ScrCmd_StartTrainerBattle(ScriptContext *ctx)
         enemyTrainer1,
         enemyTrainer2,
         partnerTrainer,
-        HEAP_ID_FIELDMAP,
+        HEAP_ID_FIELD2,
         battleResultMaskPtr);
     return TRUE;
 }
@@ -155,7 +155,7 @@ BOOL ScrCmd_StartTagBattle(ScriptContext *ctx)
         enemyTrainer1,
         enemyTrainer2,
         partnerTrainer,
-        HEAP_ID_FIELDMAP,
+        HEAP_ID_FIELD2,
         battleResultMaskPtr);
     return TRUE;
 }
@@ -292,7 +292,7 @@ BOOL ScrCmd_StartDummyTrainerBattle(ScriptContext *ctx)
 {
     FieldSystem *fieldSystem = ctx->fieldSystem;
     int *battleResultMaskPtr = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_BATTLE_RESULT);
-    Encounter_NewVsTrainer(ctx->task, TRAINER_YOUNGSTER_TRISTAN, TRAINER_NONE, TRAINER_NONE, HEAP_ID_FIELDMAP, battleResultMaskPtr);
+    Encounter_NewVsTrainer(ctx->task, TRAINER_YOUNGSTER_TRISTAN, TRAINER_NONE, TRAINER_NONE, HEAP_ID_FIELD2, battleResultMaskPtr);
     return TRUE;
 }
 
diff --git a/src/screen_fade.c b/src/screen_fade.c
index 27c245fd66..a4f4ce9b9c 100644
--- a/src/screen_fade.c
+++ b/src/screen_fade.c
@@ -62,7 +62,7 @@ static BOOL TryScreenFade(ScreenFadeParams *screen, ScreenFade *fadeMain, Screen
 static void TryScreenFadeFunc(BOOL *running, ScreenFade *fade);
 static BOOL CallScreenFadeFunc(ScreenFade *fade);
 static void SetupScreenFadeParams(enum FadeMode mode, ScreenFadeParams *params);
-static void InitScreenFade(ScreenFade *fade, enum FadeType type, int steps, int framesPerStep, enum FadeState state, void *data, enum DSScreen screen, HardwareWindowSettings *hwSettings, ScreenFadeHBlanks *hblanks, enum HeapId heapID, u16 color);
+static void InitScreenFade(ScreenFade *fade, enum FadeType type, int steps, int framesPerStep, enum FadeState state, void *data, enum DSScreen screen, HardwareWindowSettings *hwSettings, ScreenFadeHBlanks *hblanks, enum HeapID heapID, u16 color);
 static void InitScreenFadeParams(ScreenFadeParams *params, enum ScreenFadeOrder order, BOOL fadeMain, BOOL fadeSub);
 static void EnableScreenHBlank(ScreenFadeHBlanks *hblanks, void *data, Callback callback, enum DSScreen screen);
 static void DisableScreenHBlank(ScreenFadeHBlanks *hblanks, enum DSScreen screen);
@@ -124,7 +124,7 @@ static const ScreenFadeFunc sScreenFadeFuncs[FADE_TYPE_MAX] = {
 
 static ScreenFadeManager sScreenFadeManager;
 
-void StartScreenFade(enum FadeMode mode, enum FadeType typeMain, enum FadeType typeSub, u16 color, int steps, int framesPerStep, enum HeapId heapID)
+void StartScreenFade(enum FadeMode mode, enum FadeType typeMain, enum FadeType typeSub, u16 color, int steps, int framesPerStep, enum HeapID heapID)
 {
     GF_ASSERT(steps);
     GF_ASSERT(framesPerStep);
@@ -367,7 +367,7 @@ static void InitScreenFadeParams(ScreenFadeParams *params, enum ScreenFadeOrder
     params->existsSub = fadeSub;
 }
 
-static void InitScreenFade(ScreenFade *fade, enum FadeType type, int steps, int framesPerStep, enum FadeState state, void *data, enum DSScreen screen, HardwareWindowSettings *hwSettings, ScreenFadeHBlanks *hblanks, enum HeapId heapID, u16 color)
+static void InitScreenFade(ScreenFade *fade, enum FadeType type, int steps, int framesPerStep, enum FadeState state, void *data, enum DSScreen screen, HardwareWindowSettings *hwSettings, ScreenFadeHBlanks *hblanks, enum HeapID heapID, u16 color)
 {
     fade->type = type;
     fade->steps = steps;
@@ -433,9 +433,9 @@ static void DisableScreenHBlank(ScreenFadeHBlanks *hblanks, enum DSScreen screen
     hblanks->data[screen] = NULL;
 }
 
-void RequestEnableScreenHBlank(ScreenFadeHBlanks *hblanks, void *data, Callback callback, enum DSScreen screen, enum HeapId heapID)
+void RequestEnableScreenHBlank(ScreenFadeHBlanks *hblanks, void *data, Callback callback, enum DSScreen screen, enum HeapID heapID)
 {
-    EnableHBlankTemplate *template = Heap_AllocFromHeapAtEnd(heapID, sizeof(EnableHBlankTemplate));
+    EnableHBlankTemplate *template = Heap_AllocAtEnd(heapID, sizeof(EnableHBlankTemplate));
     template->hblanks = hblanks;
     template->data = data;
     template->callback = callback;
@@ -444,9 +444,9 @@ void RequestEnableScreenHBlank(ScreenFadeHBlanks *hblanks, void *data, Callback
     SysTask_ExecuteAfterVBlank(Task_EnableScreenHBlank, template, LOCAL_TASK_PRIORIITY);
 }
 
-void RequestDisableScreenHBlank(ScreenFadeHBlanks *hblanks, enum DSScreen screen, enum HeapId heapID)
+void RequestDisableScreenHBlank(ScreenFadeHBlanks *hblanks, enum DSScreen screen, enum HeapID heapID)
 {
-    DisableHBlankTemplate *template = Heap_AllocFromHeapAtEnd(heapID, sizeof(DisableHBlankTemplate));
+    DisableHBlankTemplate *template = Heap_AllocAtEnd(heapID, sizeof(DisableHBlankTemplate));
     template->hblanks = hblanks;
     template->screen = screen;
 
diff --git a/src/screen_fade_funcs.c b/src/screen_fade_funcs.c
index 1bb2837eaf..d3fd4efa69 100644
--- a/src/screen_fade_funcs.c
+++ b/src/screen_fade_funcs.c
@@ -1473,7 +1473,7 @@ static void sub_02010238(ScreenFade *param0, int param1)
     int v0, v1;
     UnkStruct_02010318 *v2;
 
-    param0->data = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02010318));
+    param0->data = Heap_Alloc(param0->heapID, sizeof(UnkStruct_02010318));
     memset(param0->data, 0, sizeof(UnkStruct_02010318));
     v2 = param0->data;
 
@@ -1634,7 +1634,7 @@ static void sub_02010588(UnkStruct_02010588 *param0, int param1, int param2, int
     switch (param1) {
     case 0:
     case 1:
-        param0->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02010FC0));
+        param0->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_02010FC0));
         param0->unk_04 = 1;
         param0->unk_08 = param2;
         param0->unk_00->unk_600 = param1;
@@ -1642,7 +1642,7 @@ static void sub_02010588(UnkStruct_02010588 *param0, int param1, int param2, int
     case 2: {
         int v0;
 
-        param0->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02010FC0) * 2);
+        param0->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_02010FC0) * 2);
         param0->unk_04 = 2;
         param0->unk_08 = param2;
 
@@ -1844,7 +1844,7 @@ static void sub_02010CF4(ScreenFade *param0, const UnkStruct_0200F980 *param1)
 {
     UnkStruct_02010EA4 *v0;
 
-    param0->data = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02010EA4));
+    param0->data = Heap_Alloc(param0->heapID, sizeof(UnkStruct_02010EA4));
 
     v0 = (UnkStruct_02010EA4 *)param0->data;
 
@@ -1898,7 +1898,7 @@ static void sub_02010D94(ScreenFade *param0, const UnkStruct_0200F980 *param1, c
 {
     UnkStruct_02010D94 *v0;
 
-    param0->data = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02010D94));
+    param0->data = Heap_Alloc(param0->heapID, sizeof(UnkStruct_02010D94));
     v0 = (UnkStruct_02010D94 *)param0->data;
 
     sub_02010E48(&v0->unk_00, param1, param0->steps, param0->framesPerStep, param0->screen, param0->hwSettings);
@@ -1981,7 +1981,7 @@ static void sub_02010F2C(ScreenFade *param0, const UnkStruct_0200FB7C *param1)
 {
     UnkStruct_0201109C *v0;
 
-    param0->data = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_0201109C));
+    param0->data = Heap_Alloc(param0->heapID, sizeof(UnkStruct_0201109C));
     v0 = (UnkStruct_0201109C *)param0->data;
 
     sub_02010FC0(v0, param1, param0->steps, param0->framesPerStep, param0->screen, param0->hwSettings, param0->hblanks, param0->heapID);
@@ -2146,7 +2146,7 @@ static void sub_02011204(ScreenFade *param0, const UnkStruct_0200FC2C *param1)
 {
     UnkStruct_02011360 *v0;
 
-    param0->data = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02011360));
+    param0->data = Heap_Alloc(param0->heapID, sizeof(UnkStruct_02011360));
     v0 = (UnkStruct_02011360 *)param0->data;
 
     sub_02011298(v0, param1, param0->steps, param0->framesPerStep, param0->screen, param0->hwSettings, param0->hblanks, param0->heapID);
@@ -2258,7 +2258,7 @@ static void sub_02011408(ScreenFade *param0, const UnkStruct_0200FD34 *param1)
 {
     UnkStruct_02011568 *v0;
 
-    param0->data = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02011568));
+    param0->data = Heap_Alloc(param0->heapID, sizeof(UnkStruct_02011568));
     v0 = (UnkStruct_02011568 *)param0->data;
 
     sub_02011494(v0, param1, param0->steps, param0->framesPerStep, param0->screen, param0->hwSettings, param0->hblanks, param0->heapID);
@@ -2406,7 +2406,7 @@ static void sub_020116A0(ScreenFade *param0, const UnkStruct_02011738 *param1)
 {
     UnkStruct_0201184C *v0;
 
-    param0->data = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_0201184C));
+    param0->data = Heap_Alloc(param0->heapID, sizeof(UnkStruct_0201184C));
     v0 = (UnkStruct_0201184C *)param0->data;
 
     sub_02011738(v0, param1, param0->steps, param0->framesPerStep, param0->screen, param0->hwSettings, param0->hblanks, param0->heapID);
@@ -2454,7 +2454,7 @@ static void sub_02011738(UnkStruct_0201184C *param0, const UnkStruct_02011738 *p
     int v0;
     UnkStruct_02010FC0 *v1;
 
-    param0->unk_0C = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0201184C_sub1) * param1->unk_08);
+    param0->unk_0C = Heap_Alloc(heapID, sizeof(UnkStruct_0201184C_sub1) * param1->unk_08);
     GF_ASSERT(param0->unk_0C != NULL);
     param0->unk_10 = param1->unk_08;
 
@@ -2557,7 +2557,7 @@ static void sub_02011960(ScreenFade *param0, UnkStruct_0200FEA4 *param1)
 {
     UnkStruct_02011AFC *v0;
 
-    param0->data = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02011AFC));
+    param0->data = Heap_Alloc(param0->heapID, sizeof(UnkStruct_02011AFC));
     memset(param0->data, 0, sizeof(UnkStruct_02011AFC));
 
     v0 = param0->data;
@@ -2732,7 +2732,7 @@ static void sub_02011C94(ScreenFade *param0, UnkStruct_0200FF30 *param1)
 {
     UnkStruct_02011E04 *v0;
 
-    param0->data = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02011E04));
+    param0->data = Heap_Alloc(param0->heapID, sizeof(UnkStruct_02011E04));
     memset(param0->data, 0, sizeof(UnkStruct_02011E04));
 
     v0 = param0->data;
@@ -2886,7 +2886,7 @@ static void sub_02011F44(ScreenFade *param0, UnkStruct_0200FE6C *param1)
 {
     UnkStruct_020120D4 *v0;
 
-    param0->data = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_020120D4));
+    param0->data = Heap_Alloc(param0->heapID, sizeof(UnkStruct_020120D4));
     memset(param0->data, 0, sizeof(UnkStruct_020120D4));
 
     v0 = param0->data;
@@ -3050,7 +3050,7 @@ static void sub_020121C4(ScreenFade *param0, UnkStruct_0201006C *param1)
 {
     UnkStruct_02012290 *v0;
 
-    param0->data = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02012290));
+    param0->data = Heap_Alloc(param0->heapID, sizeof(UnkStruct_02012290));
     memset(param0->data, 0, sizeof(UnkStruct_02012290));
 
     v0 = param0->data;
diff --git a/src/screen_scroll_manager.c b/src/screen_scroll_manager.c
index 7bc4afe0a7..83ef7966de 100644
--- a/src/screen_scroll_manager.c
+++ b/src/screen_scroll_manager.c
@@ -15,9 +15,9 @@ static void ScreenScrollManager_StartDMA(const ScreenScrollManager *screenScroll
 static void ScreenScrollManager_UpdateScrollX(SysTask *task, void *param);
 static void ScreenScrollManager_UpdateScrollY(SysTask *task, void *param);
 
-BufferManager *BufferManager_New(enum HeapId heapID, void *buffer1, void *buffer2)
+BufferManager *BufferManager_New(enum HeapID heapID, void *buffer1, void *buffer2)
 {
-    BufferManager *bufferManager = Heap_AllocFromHeap(heapID, sizeof(BufferManager));
+    BufferManager *bufferManager = Heap_Alloc(heapID, sizeof(BufferManager));
     memset(bufferManager, 0, sizeof(BufferManager));
 
     bufferManager->mode = BUFFER_MANAGER_MODE_DOUBLE;
@@ -80,9 +80,9 @@ void BufferManager_StartDMA(const void *src, void *dst, int size, enum BufferMan
     }
 }
 
-ScreenScrollManager *ScreenScrollManager_New(enum HeapId heapID)
+ScreenScrollManager *ScreenScrollManager_New(enum HeapID heapID)
 {
-    ScreenScrollManager *screenScrollMgr = Heap_AllocFromHeap(heapID, sizeof(ScreenScrollManager));
+    ScreenScrollManager *screenScrollMgr = Heap_Alloc(heapID, sizeof(ScreenScrollManager));
     memset(screenScrollMgr, 0, sizeof(ScreenScrollManager));
     screenScrollMgr->bufferManager = BufferManager_New(heapID, screenScrollMgr->buffer1, screenScrollMgr->buffer2);
 
diff --git a/src/script_manager.c b/src/script_manager.c
index deae34669b..3632421292 100644
--- a/src/script_manager.c
+++ b/src/script_manager.c
@@ -94,9 +94,9 @@ static BOOL FieldTask_RunScript(FieldTask *taskManager)
     case 0:
         scriptManager->ctx[SCRIPT_CONTEXT_MAIN] = ScriptContext_CreateAndStart(fieldSystem, scriptManager->scriptID);
         scriptManager->numActiveContexts = 1;
-        scriptManager->strTemplate = StringTemplate_New(8, 64, HEAP_ID_FIELDMAP);
-        scriptManager->msgBuf = Strbuf_Init(1024, HEAP_ID_FIELDMAP);
-        scriptManager->tmpBuf = Strbuf_Init(1024, HEAP_ID_FIELDMAP);
+        scriptManager->strTemplate = StringTemplate_New(8, 64, HEAP_ID_FIELD2);
+        scriptManager->msgBuf = Strbuf_Init(1024, HEAP_ID_FIELD2);
+        scriptManager->tmpBuf = Strbuf_Init(1024, HEAP_ID_FIELD2);
         scriptManager->state++;
     case 1:
         for (i = 0; i < NUM_SCRIPT_CONTEXTS; i++) {
@@ -135,7 +135,7 @@ static BOOL FieldTask_RunScript(FieldTask *taskManager)
 
 static ScriptManager *ScriptManager_New()
 {
-    ScriptManager *scriptManager = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(ScriptManager));
+    ScriptManager *scriptManager = Heap_Alloc(HEAP_ID_FIELD2, sizeof(ScriptManager));
 
     GF_ASSERT(scriptManager != NULL);
 
@@ -171,7 +171,7 @@ static void ScriptManager_Init(FieldSystem *fieldSystem, ScriptManager *scriptMa
 
 ScriptContext *ScriptContext_CreateAndStart(FieldSystem *fieldSystem, u16 scriptID)
 {
-    ScriptContext *ctx = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(ScriptContext));
+    ScriptContext *ctx = Heap_Alloc(HEAP_ID_FIELD2, sizeof(ScriptContext));
 
     GF_ASSERT(ctx != NULL);
 
@@ -300,14 +300,14 @@ static void ScriptContext_Load(FieldSystem *fieldSystem, ScriptContext *ctx, int
 {
     u8 *scripts = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__SCRIPT__SCR_SEQ, scriptFile, 11);
     ctx->scripts = scripts;
-    ctx->loader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, textBank, HEAP_ID_FIELDMAP);
+    ctx->loader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, textBank, HEAP_ID_FIELD2);
 }
 
 static void ScriptContext_LoadFromCurrentMap(FieldSystem *fieldSystem, ScriptContext *ctx)
 {
     u8 *scripts = ScriptContext_LoadScripts(fieldSystem->location->mapId);
     ctx->scripts = scripts;
-    ctx->loader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, MapHeaderToMsgArchive(fieldSystem->location->mapId), HEAP_ID_FIELDMAP);
+    ctx->loader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, MapHeaderToMsgArchive(fieldSystem->location->mapId), HEAP_ID_FIELD2);
 }
 
 void *ScriptManager_GetMemberPtr(ScriptManager *scriptManager, u32 member)
@@ -677,7 +677,7 @@ HiddenItemTilePosition *FieldSystem_GetNearbyHiddenItems(FieldSystem *fieldSyste
     itemIndex = 0;
     numBgEvents = MapHeaderData_GetNumBgEvents(fieldSystem);
     numBgEvents++;
-    hiddenItems = Heap_AllocFromHeap(heapID, sizeof(HiddenItemTilePosition) * numBgEvents);
+    hiddenItems = Heap_Alloc(heapID, sizeof(HiddenItemTilePosition) * numBgEvents);
 
     if (numBgEvents == 1) {
         hiddenItems[0].range = 0xff;
diff --git a/src/scroll_prompts.c b/src/scroll_prompts.c
index f6689ccfb1..658b115189 100644
--- a/src/scroll_prompts.c
+++ b/src/scroll_prompts.c
@@ -39,7 +39,7 @@ static const SpriteTemplate sArrowSpriteTemplates[] = {
     },
 };
 
-ScrollPrompts *ScrollPrompts_New(enum HeapId heapID)
+ScrollPrompts *ScrollPrompts_New(enum HeapID heapID)
 {
     SpriteResourceCapacities capacities = {
         .asStruct = {
@@ -51,10 +51,10 @@ ScrollPrompts *ScrollPrompts_New(enum HeapId heapID)
             .manimCapacity = 0,
         }
     };
-    ScrollPrompts *prompts = Heap_AllocFromHeap(heapID, sizeof(ScrollPrompts));
+    ScrollPrompts *prompts = Heap_Alloc(heapID, sizeof(ScrollPrompts));
     MI_CpuClear8(prompts, sizeof(ScrollPrompts));
 
-    ov5_021D3190(&prompts->unk_00, &capacities, 2, HEAP_ID_FIELDMAP);
+    ov5_021D3190(&prompts->unk_00, &capacities, 2, HEAP_ID_FIELD2);
 
     NARC *narc = NARC_ctor(NARC_INDEX_GRAPHIC__FLD_COMACT, heapID);
 
diff --git a/src/sound.c b/src/sound.c
index 138db58b49..dea86516de 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -872,7 +872,7 @@ BOOL Sound_PlayWaveOutReversed(u16 waveArcID, int volume, int pan, enum WaveOutC
     }
 
     if (channel == WAVE_OUT_CHANNEL_PRIMARY) {
-        *reverseBuffer = Heap_AllocFromHeap(heapID, fileSize);
+        *reverseBuffer = Heap_Alloc(heapID, fileSize);
         if (*reverseBuffer == NULL) {
             GF_ASSERT(FALSE);
             return FALSE;
diff --git a/src/sound_chatot.c b/src/sound_chatot.c
index 76027845b7..ba8464d13f 100644
--- a/src/sound_chatot.c
+++ b/src/sound_chatot.c
@@ -164,7 +164,7 @@ BOOL Sound_PlayChatotCry(ChatotCry *cry, u32 unused, int volume, int pan)
 
     if (success == FALSE) {
         Sound_SetUsingDefaultChatotCry(TRUE);
-        success = Sound_PlayPokemonCryEx(POKECRY_NORMAL, SPECIES_CHATOT, pan, volume, HEAP_ID_FIELDMAP, 0);
+        success = Sound_PlayPokemonCryEx(POKECRY_NORMAL, SPECIES_CHATOT, pan, volume, HEAP_ID_FIELD2, 0);
     }
 
     return success;
@@ -183,7 +183,7 @@ BOOL Sound_PlayDelayedChatotCry(ChatotCry *cry, u32 unused, int volume, int pan,
 
     if (success == FALSE) {
         Sound_SetUsingDefaultChatotCry(TRUE);
-        Sound_PlayDelayedPokemonCryEx(POKECRY_NORMAL, SPECIES_CHATOT, pan, volume, HEAP_ID_FIELDMAP, delay, 0);
+        Sound_PlayDelayedPokemonCryEx(POKECRY_NORMAL, SPECIES_CHATOT, pan, volume, HEAP_ID_FIELD2, delay, 0);
         success = TRUE;
     }
 
diff --git a/src/sound_playback.c b/src/sound_playback.c
index 23fa8362ae..c0921cd758 100644
--- a/src/sound_playback.c
+++ b/src/sound_playback.c
@@ -366,7 +366,7 @@ BOOL Sound_PlayPokemonCry(u16 species, u8 form)
 
 BOOL Sound_PlayDelayedPokemonCry(u16 species, u8 delay, u8 form)
 {
-    Sound_PlayDelayedPokemonCryEx(POKECRY_NORMAL, species, 0, SOUND_VOLUME_MAX, HEAP_ID_FIELDMAP, delay, form);
+    Sound_PlayDelayedPokemonCryEx(POKECRY_NORMAL, species, 0, SOUND_VOLUME_MAX, HEAP_ID_FIELD2, delay, form);
     return TRUE;
 }
 
@@ -606,7 +606,7 @@ void Sound_SetPokemonCryDuration(int duration, int heapID)
 
     Sound_Impl_DestroyCryDurationTask();
 
-    param = Heap_AllocFromHeap(heapID, sizeof(PokemonCryDurationParam));
+    param = Heap_Alloc(heapID, sizeof(PokemonCryDurationParam));
     if (param == NULL) {
         GF_ASSERT(FALSE);
         return;
diff --git a/src/sprite.c b/src/sprite.c
index 75c72c0af8..7c2b16bb5a 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -15,13 +15,13 @@ static void Sprite_SetCellBank(const NNSG2dCellDataBank *cellBank, Sprite *sprit
 static void Sprite_SetCellAnimBank(const NNSG2dCellAnimBankData *cellAnimBank, Sprite *sprite);
 static void Sprite_SetMultiCellBank(const NNSG2dMultiCellDataBank *multiCellBank, Sprite *sprite);
 static void Sprite_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBankData *multiCellAnimBank, Sprite *sprite);
-static void Sprite_CreateCellAnim(Sprite *sprite, enum HeapId heapID);
-static void Sprite_CreateVRamCellAnim(const SpriteResourcesHeader *resourceData, Sprite *sprite, enum HeapId heapID);
-static void Sprite_CreateMultiCellAnim(Sprite *sprite, enum HeapId heapID);
+static void Sprite_CreateCellAnim(Sprite *sprite, enum HeapID heapID);
+static void Sprite_CreateVRamCellAnim(const SpriteResourcesHeader *resourceData, Sprite *sprite, enum HeapID heapID);
+static void Sprite_CreateMultiCellAnim(Sprite *sprite, enum HeapID heapID);
 static BOOL SpriteList_InitSprite(const SpriteList *list,
     const SpriteResourcesHeader *resourceData,
     Sprite *sprite,
-    enum HeapId heapID);
+    enum HeapID heapID);
 static u32 GetPaletteIndexForProxy(const NNSG2dImagePaletteProxy *paletteProxy, u32 vramType);
 static void SpriteList_DrawSprite(const SpriteList *list, Sprite *sprite);
 static void SpriteList_DrawSprite_Stub(const SpriteList *list, Sprite *sprite);
@@ -38,16 +38,16 @@ SpriteList *SpriteList_New(const SpriteListParams *params)
     GF_ASSERT(params);
     GF_ASSERT(params->renderer);
 
-    SpriteList *list = Heap_AllocFromHeap(params->heapID, sizeof(SpriteList));
+    SpriteList *list = Heap_Alloc(params->heapID, sizeof(SpriteList));
     GF_ASSERT(list);
 
     SpriteList_Reset(list);
 
-    list->sprites = Heap_AllocFromHeap(params->heapID, sizeof(Sprite) * params->maxElements);
+    list->sprites = Heap_Alloc(params->heapID, sizeof(Sprite) * params->maxElements);
     GF_ASSERT(list->sprites);
     list->capacity = params->maxElements;
 
-    list->freeSprites = Heap_AllocFromHeap(params->heapID, sizeof(Sprite *) * params->maxElements);
+    list->freeSprites = Heap_Alloc(params->heapID, sizeof(Sprite *) * params->maxElements);
     GF_ASSERT(list->freeSprites);
 
     SpriteList_InitSprites(list);
@@ -583,9 +583,9 @@ void Sprite_SetExplicitOAMMode(Sprite *sprite, GXOamMode mode)
     }
 }
 
-void Utility_Clear2DMainOAM(enum HeapId heapID)
+void Utility_Clear2DMainOAM(enum HeapID heapID)
 {
-    GXOamAttr *oam = Heap_AllocFromHeap(heapID, sizeof(GXOamAttr) * MAX_SPRITES);
+    GXOamAttr *oam = Heap_Alloc(heapID, sizeof(GXOamAttr) * MAX_SPRITES);
 
     MI_CpuFill16(oam, 0x2C0, sizeof(GXOamAttr) * MAX_SPRITES);
     DC_FlushRange(oam, sizeof(GXOamAttr) * MAX_SPRITES);
@@ -594,9 +594,9 @@ void Utility_Clear2DMainOAM(enum HeapId heapID)
     Heap_Free(oam);
 }
 
-void Utility_Clear2DSubOAM(enum HeapId heapID)
+void Utility_Clear2DSubOAM(enum HeapID heapID)
 {
-    GXOamAttr *oam = Heap_AllocFromHeap(heapID, sizeof(GXOamAttr) * MAX_SPRITES);
+    GXOamAttr *oam = Heap_Alloc(heapID, sizeof(GXOamAttr) * MAX_SPRITES);
 
     MI_CpuFill16(oam, 0x2C0, sizeof(GXOamAttr) * MAX_SPRITES);
     // According to the NitroSDK docs there should be a call to DC_FlushRange here.
@@ -646,7 +646,7 @@ u32 Sprite_GetUserAttrForCurrentAnimFrame(const Sprite *sprite)
 static BOOL SpriteList_InitSprite(const SpriteList *list,
     const SpriteResourcesHeader *resourceData,
     Sprite *sprite,
-    enum HeapId heapID)
+    enum HeapID heapID)
 {
     sprite->type = SpriteResourcesHeader_GetCellType(resourceData);
     sprite->imageProxy = *resourceData->imageProxy;
@@ -712,7 +712,7 @@ static void Sprite_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBankData *multi
     multiCellAnim->animBank = multiCellAnimBank;
 }
 
-static void Sprite_CreateCellAnim(Sprite *sprite, enum HeapId heapID)
+static void Sprite_CreateCellAnim(Sprite *sprite, enum HeapID heapID)
 {
     CellAnimationData *cellAnim = (CellAnimationData *)&sprite->animData;
     NNS_G2dInitCellAnimation(
@@ -721,7 +721,7 @@ static void Sprite_CreateCellAnim(Sprite *sprite, enum HeapId heapID)
         cellAnim->cellBank);
 }
 
-static void Sprite_CreateVRamCellAnim(const SpriteResourcesHeader *resourceData, Sprite *sprite, enum HeapId heapID)
+static void Sprite_CreateVRamCellAnim(const SpriteResourcesHeader *resourceData, Sprite *sprite, enum HeapID heapID)
 {
     VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&sprite->animData;
     vramCellAnim->transferHandle = NNS_G2dGetNewCellTransferStateHandle();
@@ -740,13 +740,13 @@ static void Sprite_CreateVRamCellAnim(const SpriteResourcesHeader *resourceData,
         charData->szByte);
 }
 
-static void Sprite_CreateMultiCellAnim(Sprite *sprite, enum HeapId heapID)
+static void Sprite_CreateMultiCellAnim(Sprite *sprite, enum HeapID heapID)
 {
     MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&sprite->animData;
     const NNSG2dMultiCellAnimSequence *animSequence = NNS_G2dGetAnimSequenceByIdx(multiCellAnim->animBank, 0);
     u16 maxNodes = NNS_G2dGetMCBankNumNodesRequired(multiCellAnim->cellBank);
-    multiCellAnim->nodes = Heap_AllocFromHeap(heapID, sizeof(NNSG2dNode) * maxNodes);
-    multiCellAnim->cellAnims = Heap_AllocFromHeap(heapID, sizeof(NNSG2dCellAnimation) * maxNodes);
+    multiCellAnim->nodes = Heap_Alloc(heapID, sizeof(NNSG2dNode) * maxNodes);
+    multiCellAnim->cellAnims = Heap_Alloc(heapID, sizeof(NNSG2dCellAnimation) * maxNodes);
 
     NNS_G2dInitMCAnimation(
         &multiCellAnim->anim,
diff --git a/src/sprite_resource.c b/src/sprite_resource.c
index aeb732ef4c..543639ec3c 100644
--- a/src/sprite_resource.c
+++ b/src/sprite_resource.c
@@ -51,26 +51,26 @@ typedef struct SpriteResourceTableBinary {
 } SpriteResourceTableBinary;
 
 static SpriteResource *SpriteResourceCollection_AllocResource(SpriteResourceCollection *spriteResources);
-static void SpriteResourceCollection_InitResFromFile(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, const char *filename, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapId heapID);
-static void SpriteResourceCollection_InitRes(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapId heapID, BOOL allocAtEnd);
-static void SpriteResourceCollection_InitResFromNARC(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapId heapID, BOOL allocAtEnd);
+static void SpriteResourceCollection_InitResFromFile(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, const char *filename, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapID heapID);
+static void SpriteResourceCollection_InitRes(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapID heapID, BOOL allocAtEnd);
+static void SpriteResourceCollection_InitResFromNARC(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapID heapID, BOOL allocAtEnd);
 static void *SpriteUtil_ReadNARCMember(NARC *narc, u32 memberIdx, BOOL compressed, u32 heapID, BOOL allocAtEnd);
-static void SpriteResource_UnpackData(SpriteResource *spriteRes, enum SpriteResourceType type, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID);
-static TileResourceData *SpriteUtil_UnpackTileResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID);
-static PaletteResourceData *SpriteUtil_UnpackPaletteResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID);
-static SpriteResourceData *SpriteUtil_UnpackSpriteResource(void *rawData, enum HeapId heapID);
-static SpriteAnimResourceData *SpriteUtil_UnpackSpriteAnimResource(void *rawData, enum HeapId heapID);
-static MultiSpriteResourceData *SpriteUtil_UnpackMultiSpriteResource(void *rawData, enum HeapId heapID);
-static MultiSpriteAnimResourceData *SpriteUtil_UnpackMultiSpriteAnimResource(void *rawData, enum HeapId heapID);
+static void SpriteResource_UnpackData(SpriteResource *spriteRes, enum SpriteResourceType type, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapID heapID);
+static TileResourceData *SpriteUtil_UnpackTileResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, enum HeapID heapID);
+static PaletteResourceData *SpriteUtil_UnpackPaletteResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapID heapID);
+static SpriteResourceData *SpriteUtil_UnpackSpriteResource(void *rawData, enum HeapID heapID);
+static SpriteAnimResourceData *SpriteUtil_UnpackSpriteAnimResource(void *rawData, enum HeapID heapID);
+static MultiSpriteResourceData *SpriteUtil_UnpackMultiSpriteResource(void *rawData, enum HeapID heapID);
+static MultiSpriteAnimResourceData *SpriteUtil_UnpackMultiSpriteAnimResource(void *rawData, enum HeapID heapID);
 static void *SpriteResource_GetData(const SpriteResource *spriteRes);
 static void SpriteResource_FreeData(SpriteResource *spriteRes);
 static int SpriteResourceTableEntryNARC_GetEntryCount(const SpriteResourceTableEntryNARC *entries);
 
-SpriteResourceCollection *SpriteResourceCollection_New(int capacity, enum SpriteResourceType type, enum HeapId heapID)
+SpriteResourceCollection *SpriteResourceCollection_New(int capacity, enum SpriteResourceType type, enum HeapID heapID)
 {
-    SpriteResourceCollection *spriteResources = Heap_AllocFromHeap(heapID, sizeof(SpriteResourceCollection));
+    SpriteResourceCollection *spriteResources = Heap_Alloc(heapID, sizeof(SpriteResourceCollection));
     spriteResources->collection = ResourceCollection_New(capacity, heapID);
-    spriteResources->resources = Heap_AllocFromHeap(heapID, sizeof(SpriteResource) * capacity);
+    spriteResources->resources = Heap_Alloc(heapID, sizeof(SpriteResource) * capacity);
 
     memset(spriteResources->resources, 0, sizeof(SpriteResource) * capacity);
 
@@ -99,7 +99,7 @@ void SpriteResourceCollection_Delete(SpriteResourceCollection *spriteResources)
     spriteResources = NULL;
 }
 
-SpriteResource *SpriteResourceCollection_AddFromTable(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, int index, enum HeapId heapID)
+SpriteResource *SpriteResourceCollection_AddFromTable(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, int index, enum HeapID heapID)
 {
     GF_ASSERT(spriteResources);
     GF_ASSERT(table);
@@ -142,7 +142,7 @@ SpriteResource *SpriteResourceCollection_AddFromTable(SpriteResourceCollection *
     return spriteRes;
 }
 
-SpriteResource *SpriteResourceCollection_AddTiles(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID)
+SpriteResource *SpriteResourceCollection_AddTiles(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapID heapID)
 {
     GF_ASSERT(spriteResources);
     GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_CHAR);
@@ -167,7 +167,7 @@ SpriteResource *SpriteResourceCollection_AddTiles(SpriteResourceCollection *spri
     return spriteRes;
 }
 
-SpriteResource *SpriteResourceCollection_AddPalette(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID)
+SpriteResource *SpriteResourceCollection_AddPalette(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapID heapID)
 {
     GF_ASSERT(spriteResources);
     GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_PLTT);
@@ -192,7 +192,7 @@ SpriteResource *SpriteResourceCollection_AddPalette(SpriteResourceCollection *sp
     return spriteRes;
 }
 
-SpriteResource *SpriteResourceCollection_Add(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, enum SpriteResourceType type, enum HeapId heapID)
+SpriteResource *SpriteResourceCollection_Add(SpriteResourceCollection *spriteResources, enum NarcID narcID, int memberIdx, BOOL compressed, int id, enum SpriteResourceType type, enum HeapID heapID)
 {
     GF_ASSERT(spriteResources);
 
@@ -205,7 +205,7 @@ SpriteResource *SpriteResourceCollection_Add(SpriteResourceCollection *spriteRes
     return spriteRes;
 }
 
-void SpriteResourceCollection_ModifyTiles(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, enum HeapId heapID)
+void SpriteResourceCollection_ModifyTiles(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, enum HeapID heapID)
 {
     GF_ASSERT(spriteResources);
     GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_CHAR);
@@ -219,7 +219,7 @@ void SpriteResourceCollection_ModifyTiles(SpriteResourceCollection *spriteResour
     SpriteResourceCollection_InitRes(spriteResources, spriteRes, narcID, memberIdx, compressed, id, vramType, 0, SPRITE_RESOURCE_CHAR, heapID, FALSE);
 }
 
-void SpriteResourceCollection_ModifyPalette(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, enum HeapId heapID)
+void SpriteResourceCollection_ModifyPalette(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, enum HeapID heapID)
 {
 
     GF_ASSERT(spriteResources);
@@ -246,7 +246,7 @@ void SpriteResourceCollection_ModifyPalette(SpriteResourceCollection *spriteReso
         FALSE);
 }
 
-SpriteResource *SpriteResourceCollection_AddTilesFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID)
+SpriteResource *SpriteResourceCollection_AddTilesFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapID heapID)
 {
     GF_ASSERT(spriteResources);
     GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_CHAR);
@@ -271,7 +271,7 @@ SpriteResource *SpriteResourceCollection_AddTilesFrom(SpriteResourceCollection *
     return spriteRes;
 }
 
-SpriteResource *SpriteResourceCollection_AddTilesFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID, BOOL allocAtEnd)
+SpriteResource *SpriteResourceCollection_AddTilesFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapID heapID, BOOL allocAtEnd)
 {
     GF_ASSERT(spriteResources);
     GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_CHAR);
@@ -296,7 +296,7 @@ SpriteResource *SpriteResourceCollection_AddTilesFromEx(SpriteResourceCollection
     return spriteRes;
 }
 
-SpriteResource *SpriteResourceCollection_AddPaletteFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID)
+SpriteResource *SpriteResourceCollection_AddPaletteFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapID heapID)
 {
     GF_ASSERT(spriteResources);
     GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_PLTT);
@@ -321,7 +321,7 @@ SpriteResource *SpriteResourceCollection_AddPaletteFrom(SpriteResourceCollection
     return spriteRes;
 }
 
-SpriteResource *SpriteResourceCollection_AddPaletteFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID, BOOL allocAtEnd)
+SpriteResource *SpriteResourceCollection_AddPaletteFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapID heapID, BOOL allocAtEnd)
 {
     GF_ASSERT(spriteResources);
     GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_PLTT);
@@ -346,7 +346,7 @@ SpriteResource *SpriteResourceCollection_AddPaletteFromEx(SpriteResourceCollecti
     return spriteRes;
 }
 
-SpriteResource *SpriteResourceCollection_AddFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, enum SpriteResourceType type, enum HeapId heapID)
+SpriteResource *SpriteResourceCollection_AddFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, enum SpriteResourceType type, enum HeapID heapID)
 {
     GF_ASSERT(spriteResources);
 
@@ -370,7 +370,7 @@ SpriteResource *SpriteResourceCollection_AddFrom(SpriteResourceCollection *sprit
     return spriteRes;
 }
 
-void SpriteResourceCollection_ModifyTilesFrom(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, NARC *narc, int memberIdx, BOOL compressed, enum HeapId heapID)
+void SpriteResourceCollection_ModifyTilesFrom(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, NARC *narc, int memberIdx, BOOL compressed, enum HeapID heapID)
 {
     GF_ASSERT(spriteResources);
     GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_CHAR);
@@ -395,7 +395,7 @@ void SpriteResourceCollection_ModifyTilesFrom(SpriteResourceCollection *spriteRe
         FALSE);
 }
 
-int SpriteResourceCollection_Extend(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, SpriteResourceList *outList, enum HeapId heapID)
+int SpriteResourceCollection_Extend(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, SpriteResourceList *outList, enum HeapID heapID)
 {
     GF_ASSERT(spriteResources);
     GF_ASSERT(table);
@@ -404,7 +404,7 @@ int SpriteResourceCollection_Extend(SpriteResourceCollection *spriteResources, c
     return table->count;
 }
 
-void SpriteResoureCollection_ExtendEx(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, int first, int count, SpriteResourceList *outList, enum HeapId heapID)
+void SpriteResoureCollection_ExtendEx(SpriteResourceCollection *spriteResources, const SpriteResourceTable *table, int first, int count, SpriteResourceList *outList, enum HeapID heapID)
 {
     for (int i = first; i < first + count; i++) {
         SpriteResource *spriteRes = SpriteResourceCollection_AddFromTable(spriteResources, table, i, heapID);
@@ -416,11 +416,11 @@ void SpriteResoureCollection_ExtendEx(SpriteResourceCollection *spriteResources,
     }
 }
 
-SpriteResourceList *SpriteResourceList_New(int capacity, enum HeapId heapID)
+SpriteResourceList *SpriteResourceList_New(int capacity, enum HeapID heapID)
 {
-    SpriteResourceList *list = Heap_AllocFromHeap(heapID, sizeof(SpriteResourceList));
+    SpriteResourceList *list = Heap_Alloc(heapID, sizeof(SpriteResourceList));
 
-    list->resources = Heap_AllocFromHeap(heapID, sizeof(SpriteResource *) * capacity);
+    list->resources = Heap_Alloc(heapID, sizeof(SpriteResource *) * capacity);
     list->capacity = capacity;
     list->count = 0;
 
@@ -600,7 +600,7 @@ SpriteResourceTable *SpriteResourceTable_GetArrayElement(SpriteResourceTable *ta
     return table + index;
 }
 
-void SpriteResourceTable_LoadFromBinary(const void *data, SpriteResourceTable *table, enum HeapId heapID)
+void SpriteResourceTable_LoadFromBinary(const void *data, SpriteResourceTable *table, enum HeapID heapID)
 {
     GF_ASSERT(table);
 
@@ -610,7 +610,7 @@ void SpriteResourceTable_LoadFromBinary(const void *data, SpriteResourceTable *t
     table->count = SpriteResourceTableEntryNARC_GetEntryCount(tableBin->narcEntries);
 
     if (table->count > 0) {
-        table->entries = Heap_AllocFromHeap(heapID, sizeof(SpriteResourceTableEntryNARC) * table->count);
+        table->entries = Heap_Alloc(heapID, sizeof(SpriteResourceTableEntryNARC) * table->count);
     } else {
         table->entries = NULL;
     }
@@ -719,7 +719,7 @@ static SpriteResource *SpriteResourceCollection_AllocResource(SpriteResourceColl
     return NULL;
 }
 
-static void SpriteResource_UnpackData(SpriteResource *spriteRes, enum SpriteResourceType type, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID)
+static void SpriteResource_UnpackData(SpriteResource *spriteRes, enum SpriteResourceType type, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapID heapID)
 {
     void *rawData = Resource_GetData(spriteRes->rawResource);
 
@@ -745,18 +745,18 @@ static void SpriteResource_UnpackData(SpriteResource *spriteRes, enum SpriteReso
     }
 }
 
-static TileResourceData *SpriteUtil_UnpackTileResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID)
+static TileResourceData *SpriteUtil_UnpackTileResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, enum HeapID heapID)
 {
-    TileResourceData *tileData = Heap_AllocFromHeap(heapID, sizeof(TileResourceData));
+    TileResourceData *tileData = Heap_Alloc(heapID, sizeof(TileResourceData));
     NNS_G2dGetUnpackedCharacterData(rawData, &tileData->tileData);
     tileData->vramType = vramType;
 
     return tileData;
 }
 
-static PaletteResourceData *SpriteUtil_UnpackPaletteResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID)
+static PaletteResourceData *SpriteUtil_UnpackPaletteResource(void *rawData, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapID heapID)
 {
-    PaletteResourceData *paletteData = Heap_AllocFromHeap(heapID, sizeof(PaletteResourceData));
+    PaletteResourceData *paletteData = Heap_Alloc(heapID, sizeof(PaletteResourceData));
     NNS_G2dGetUnpackedPaletteData(rawData, &paletteData->paletteData);
 
     paletteData->vramType = vramType;
@@ -765,33 +765,33 @@ static PaletteResourceData *SpriteUtil_UnpackPaletteResource(void *rawData, NNS_
     return paletteData;
 }
 
-static SpriteResourceData *SpriteUtil_UnpackSpriteResource(void *rawData, enum HeapId heapID)
+static SpriteResourceData *SpriteUtil_UnpackSpriteResource(void *rawData, enum HeapID heapID)
 {
-    SpriteResourceData *spriteResData = Heap_AllocFromHeap(heapID, sizeof(SpriteResourceData));
+    SpriteResourceData *spriteResData = Heap_Alloc(heapID, sizeof(SpriteResourceData));
     NNS_G2dGetUnpackedCellBank(rawData, &spriteResData->spriteBank);
 
     return spriteResData;
 }
 
-static SpriteAnimResourceData *SpriteUtil_UnpackSpriteAnimResource(void *rawData, enum HeapId heapID)
+static SpriteAnimResourceData *SpriteUtil_UnpackSpriteAnimResource(void *rawData, enum HeapID heapID)
 {
-    SpriteAnimResourceData *spriteAnimData = Heap_AllocFromHeap(heapID, sizeof(SpriteAnimResourceData));
+    SpriteAnimResourceData *spriteAnimData = Heap_Alloc(heapID, sizeof(SpriteAnimResourceData));
     NNS_G2dGetUnpackedAnimBank(rawData, &spriteAnimData->animBank);
 
     return spriteAnimData;
 }
 
-static MultiSpriteResourceData *SpriteUtil_UnpackMultiSpriteResource(void *rawData, enum HeapId heapID)
+static MultiSpriteResourceData *SpriteUtil_UnpackMultiSpriteResource(void *rawData, enum HeapID heapID)
 {
-    MultiSpriteResourceData *multiSpriteData = Heap_AllocFromHeap(heapID, sizeof(MultiSpriteResourceData));
+    MultiSpriteResourceData *multiSpriteData = Heap_Alloc(heapID, sizeof(MultiSpriteResourceData));
     NNS_G2dGetUnpackedMultiCellBank(rawData, &multiSpriteData->multiSpriteBank);
 
     return multiSpriteData;
 }
 
-static MultiSpriteAnimResourceData *SpriteUtil_UnpackMultiSpriteAnimResource(void *rawData, enum HeapId heapID)
+static MultiSpriteAnimResourceData *SpriteUtil_UnpackMultiSpriteAnimResource(void *rawData, enum HeapID heapID)
 {
-    MultiSpriteAnimResourceData *multiSpriteAnimData = Heap_AllocFromHeap(heapID, sizeof(MultiSpriteAnimResourceData));
+    MultiSpriteAnimResourceData *multiSpriteAnimData = Heap_Alloc(heapID, sizeof(MultiSpriteAnimResourceData));
     NNS_G2dGetUnpackedMCAnimBank(rawData, &multiSpriteAnimData->multiSpriteAnimBank);
 
     return multiSpriteAnimData;
@@ -814,7 +814,7 @@ static void *SpriteResource_GetData(const SpriteResource *spriteRes)
     return spriteRes->data;
 }
 
-static void SpriteResourceCollection_InitResFromFile(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, const char *filename, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapId heapID)
+static void SpriteResourceCollection_InitResFromFile(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, const char *filename, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapID heapID)
 {
     spriteRes->rawResource = ResourceCollection_AddFromFile(spriteResources->collection, filename, id, heapID);
     spriteRes->type = type;
@@ -822,7 +822,7 @@ static void SpriteResourceCollection_InitResFromFile(SpriteResourceCollection *s
     SpriteResource_UnpackData(spriteRes, type, vramType, paletteIdx, heapID);
 }
 
-static void SpriteResourceCollection_InitRes(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapId heapID, BOOL allocAtEnd)
+static void SpriteResourceCollection_InitRes(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, enum NarcID narcID, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapID heapID, BOOL allocAtEnd)
 {
     void *data = LoadMemberFromNARC(narcID, memberIdx, compressed, heapID, allocAtEnd);
 
@@ -832,7 +832,7 @@ static void SpriteResourceCollection_InitRes(SpriteResourceCollection *spriteRes
     SpriteResource_UnpackData(spriteRes, type, vramType, paletteIdx, heapID);
 }
 
-static void SpriteResourceCollection_InitResFromNARC(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapId heapID, BOOL allocAtEnd)
+static void SpriteResourceCollection_InitResFromNARC(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum SpriteResourceType type, enum HeapID heapID, BOOL allocAtEnd)
 {
     void *data = SpriteUtil_ReadNARCMember(narc, memberIdx, compressed, heapID, allocAtEnd);
 
@@ -861,9 +861,9 @@ static void *SpriteUtil_ReadNARCMember(NARC *narc, u32 memberIdx, BOOL compresse
             void *decompressed;
 
             if (allocAtEnd == FALSE) {
-                decompressed = Heap_AllocFromHeap(heapID, MI_GetUncompressedSize(data));
+                decompressed = Heap_Alloc(heapID, MI_GetUncompressedSize(data));
             } else {
-                decompressed = Heap_AllocFromHeapAtEnd(heapID, MI_GetUncompressedSize(data));
+                decompressed = Heap_AllocAtEnd(heapID, MI_GetUncompressedSize(data));
             }
 
             if (decompressed) {
diff --git a/src/sprite_system.c b/src/sprite_system.c
index 053410dfa7..7448eb97ae 100644
--- a/src/sprite_system.c
+++ b/src/sprite_system.c
@@ -43,9 +43,9 @@ static void GetSpriteAffineScale(Sprite *sprite, f32 *outXScale, f32 *outYOffset
 static void SetSpriteAffineZRotation(Sprite *sprite, u16 angle);
 static void OffsetSpriteAffineZRotation(Sprite *sprite, s32 offset);
 
-SpriteSystem *SpriteSystem_Alloc(enum HeapId heapID)
+SpriteSystem *SpriteSystem_Alloc(enum HeapID heapID)
 {
-    SpriteSystem *spriteSys = Heap_AllocFromHeap(heapID, sizeof(SpriteSystem));
+    SpriteSystem *spriteSys = Heap_Alloc(heapID, sizeof(SpriteSystem));
     if (spriteSys == NULL) {
         return NULL;
     }
@@ -61,7 +61,7 @@ SpriteManager *SpriteManager_New(SpriteSystem *spriteSys)
 {
     GF_ASSERT(spriteSys != NULL);
 
-    SpriteManager *spriteMan = Heap_AllocFromHeap(spriteSys->heapID, sizeof(SpriteManager));
+    SpriteManager *spriteMan = Heap_Alloc(spriteSys->heapID, sizeof(SpriteManager));
     if (spriteMan == NULL) {
         return NULL;
     }
@@ -214,7 +214,7 @@ BOOL SpriteSystem_LoadResourceDataFromFilepaths(SpriteSystem *spriteSys, SpriteM
 
     spriteMan->numResourceTypes = numResourceTypes;
     int resourceCount = SpriteResourceTable_Size();
-    spriteMan->resourcePaths = Heap_AllocFromHeap(spriteSys->heapID, resourceCount * numResourceTypes);
+    spriteMan->resourcePaths = Heap_Alloc(spriteSys->heapID, resourceCount * numResourceTypes);
 
     for (int i = 0; i < numResourceTypes; i++) {
         SpriteResourceTable *resourceTable = SpriteResourceTable_GetArrayElement(spriteMan->resourcePaths, i);
@@ -482,17 +482,17 @@ ManagedSprite *SpriteSystem_NewSprite(SpriteSystem *spriteSys, SpriteManager *sp
     AffineSpriteListTemplate innerTemplate;
     int resourceIDs[SPRITE_RESOURCE_MAX];
 
-    managedSprite = Heap_AllocFromHeap(spriteSys->heapID, sizeof(ManagedSprite));
+    managedSprite = Heap_Alloc(spriteSys->heapID, sizeof(ManagedSprite));
     if (managedSprite == NULL) {
         return NULL;
     }
 
-    managedSprite->resourceHeaderList = Heap_AllocFromHeap(spriteSys->heapID, sizeof(SpriteResourcesHeaderList));
+    managedSprite->resourceHeaderList = Heap_Alloc(spriteSys->heapID, sizeof(SpriteResourcesHeaderList));
     if (managedSprite->resourceHeaderList == NULL) {
         return NULL;
     }
 
-    managedSprite->resourceHeaderList->headers = Heap_AllocFromHeap(spriteSys->heapID, sizeof(SpriteResourcesHeader));
+    managedSprite->resourceHeaderList->headers = Heap_Alloc(spriteSys->heapID, sizeof(SpriteResourcesHeader));
     managedSprite->resourceHeader = managedSprite->resourceHeaderList->headers;
     if (managedSprite->resourceHeaderList->headers == NULL) {
         if (managedSprite->resourceHeaderList) {
diff --git a/src/sprite_util.c b/src/sprite_util.c
index ae3694851a..cba2e5f6c3 100644
--- a/src/sprite_util.c
+++ b/src/sprite_util.c
@@ -90,15 +90,15 @@ void SpriteResourcesHeader_Clear(SpriteResourcesHeader *resourceHeader)
     memset(resourceHeader, 0, sizeof(SpriteResourcesHeader));
 }
 
-SpriteResourcesHeaderList *SpriteResourcesHeaderList_NewFromResdat(const ResdatTableEntry *resdatEntries, enum HeapId heapID, SpriteResourceCollection *charResources, SpriteResourceCollection *plttResources, SpriteResourceCollection *cellResources, SpriteResourceCollection *animResources, SpriteResourceCollection *mcellResources, SpriteResourceCollection *manimResources)
+SpriteResourcesHeaderList *SpriteResourcesHeaderList_NewFromResdat(const ResdatTableEntry *resdatEntries, enum HeapID heapID, SpriteResourceCollection *charResources, SpriteResourceCollection *plttResources, SpriteResourceCollection *cellResources, SpriteResourceCollection *animResources, SpriteResourceCollection *mcellResources, SpriteResourceCollection *manimResources)
 {
     int resdatLength = 0;
     while (resdatEntries[resdatLength].charResourceID != RESDAT_TABLE_TERMINATOR) {
         resdatLength++;
     }
 
-    SpriteResourcesHeaderList *headerList = Heap_AllocFromHeap(heapID, sizeof(SpriteResourcesHeaderList));
-    headerList->headers = Heap_AllocFromHeap(heapID, sizeof(SpriteResourcesHeader) * resdatLength);
+    SpriteResourcesHeaderList *headerList = Heap_Alloc(heapID, sizeof(SpriteResourcesHeaderList));
+    headerList->headers = Heap_Alloc(heapID, sizeof(SpriteResourcesHeader) * resdatLength);
     headerList->length = resdatLength;
 
     for (int i = 0; i < headerList->length; i++) {
@@ -132,7 +132,7 @@ void SpriteResourcesHeaderList_Free(SpriteResourcesHeaderList *headerList)
     Heap_Free(headerList);
 }
 
-SpriteList *SpriteList_InitRendering(int maxElements, G2dRenderer *g2dRenderer, enum HeapId heapID)
+SpriteList *SpriteList_InitRendering(int maxElements, G2dRenderer *g2dRenderer, enum HeapID heapID)
 {
     SpriteListParams template;
     NNSG2dViewRect viewRect;
diff --git a/src/start_menu.c b/src/start_menu.c
index 5ea354dd01..ecd5a951aa 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -361,7 +361,7 @@ void StartMenu_Open(FieldSystem *fieldSystem)
 
 static StartMenu *StartMenu_Alloc(void)
 {
-    StartMenu *menu = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(StartMenu));
+    StartMenu *menu = Heap_Alloc(HEAP_ID_FIELD2, sizeof(StartMenu));
 
     menu->state = START_MENU_STATE_INIT;
     menu->unk_28 = 0;
@@ -537,12 +537,12 @@ static void sub_0203ADFC(FieldTask *taskMan)
     optionCount = StartMenu_MakeList(menu, menu->options);
 
     Window_Add(fieldSystem->bgConfig, &menu->unk_00, 3, 20, 1, 11, optionCount * 3, 12, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (11 * 22)));
-    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 1, HEAP_ID_FIELDMAP);
+    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 1, HEAP_ID_FIELD2);
     Window_DrawStandardFrame(&menu->unk_00, 1, 1024 - (18 + 12) - 9, 11);
 
-    v2 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_START_MENU, HEAP_ID_FIELDMAP);
+    v2 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_START_MENU, HEAP_ID_FIELD2);
 
-    menu->unk_24 = StringList_New(optionCount, HEAP_ID_FIELDMAP);
+    menu->unk_24 = StringList_New(optionCount, HEAP_ID_FIELD2);
     menu->unk_28 = 0;
 
     for (i = 0; i < optionCount; i++) {
@@ -551,8 +551,8 @@ static void sub_0203ADFC(FieldTask *taskMan)
             Strbuf *v7;
             Strbuf *v8;
 
-            v6 = StringTemplate_Default(HEAP_ID_FIELDMAP);
-            v7 = Strbuf_Init(8, HEAP_ID_FIELDMAP);
+            v6 = StringTemplate_Default(HEAP_ID_FIELD2);
+            v7 = Strbuf_Init(8, HEAP_ID_FIELD2);
             v8 = MessageLoader_GetNewStrbuf(v2, sStartMenuActions[menu->options[i]].text);
 
             StringTemplate_SetPlayerName(v6, 0, SaveData_GetTrainerInfo(fieldSystem->saveData));
@@ -589,7 +589,7 @@ static void sub_0203ADFC(FieldTask *taskMan)
         v3.loopAround = FALSE;
     }
 
-    menu->unk_20 = Menu_New(&v3, 28, 4, menu->unk_28, HEAP_ID_FIELDMAP, PAD_BUTTON_B | PAD_BUTTON_X);
+    menu->unk_20 = Menu_New(&v3, 28, 4, menu->unk_28, HEAP_ID_FIELD2, PAD_BUTTON_B | PAD_BUTTON_X);
 
     Window_ScheduleCopyToVRAM(&menu->unk_00);
     sub_0203B318(menu, menu->options, optionCount, TrainerInfo_Gender(SaveData_GetTrainerInfo(fieldSystem->saveData)));
@@ -678,11 +678,11 @@ static void sub_0203B094(FieldTask *taskMan)
     }
 
     Window_Add(fieldSystem->bgConfig, &menu->unk_10, 3, 1, 1, 12, 4, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)));
-    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 1, HEAP_ID_FIELDMAP);
+    LoadStandardWindowGraphics(fieldSystem->bgConfig, BG_LAYER_MAIN_3, 1024 - (18 + 12) - 9, 11, 1, HEAP_ID_FIELD2);
     Window_DrawStandardFrame(&menu->unk_10, 1, 1024 - (18 + 12) - 9, 11);
     Window_FillTilemap(&menu->unk_10, 15);
 
-    v2 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_START_MENU, HEAP_ID_FIELDMAP);
+    v2 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_START_MENU, HEAP_ID_FIELD2);
 
     if (v6 == 0) {
         v5 = MessageLoader_GetNewStrbuf(v2, 9);
@@ -693,8 +693,8 @@ static void sub_0203B094(FieldTask *taskMan)
     Text_AddPrinterWithParams(&menu->unk_10, FONT_SYSTEM, v5, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
     Strbuf_Free(v5);
 
-    v3 = StringTemplate_Default(HEAP_ID_FIELDMAP);
-    v4 = Strbuf_Init(32, HEAP_ID_FIELDMAP);
+    v3 = StringTemplate_Default(HEAP_ID_FIELD2);
+    v4 = Strbuf_Init(32, HEAP_ID_FIELD2);
     v5 = MessageLoader_GetNewStrbuf(v2, 11);
 
     if (v6 == 0) {
@@ -790,9 +790,9 @@ static void sub_0203B318(StartMenu *menu, u8 *options, u32 optionCount, u8 gende
     u32 i;
     NARC *v2;
 
-    ov5_021D3190(&menu->unk_38, &v0, (7 + 1), HEAP_ID_FIELDMAP);
+    ov5_021D3190(&menu->unk_38, &v0, (7 + 1), HEAP_ID_FIELD2);
 
-    v2 = NARC_ctor(NARC_INDEX_GRAPHIC__MENU_GRA, HEAP_ID_FIELDMAP);
+    v2 = NARC_ctor(NARC_INDEX_GRAPHIC__MENU_GRA, HEAP_ID_FIELD2);
 
     ov5_021D32E8(&menu->unk_38, v2, 5, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 13528);
     ov5_021D3374(&menu->unk_38, v2, 1, 0, 13528);
@@ -944,7 +944,7 @@ static BOOL StartMenu_OpenPokedex(FieldTask *taskMan)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan);
     StartMenu *menu = FieldTask_GetEnv(taskMan);
-    PokedexOverlayArgs *pokedexArgs = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PokedexOverlayArgs));
+    PokedexOverlayArgs *pokedexArgs = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PokedexOverlayArgs));
     Pokedex *pokedex = SaveData_GetPokedex(fieldSystem->saveData);
     TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData);
     VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData);
@@ -974,7 +974,7 @@ static BOOL StartMenu_PokedexEnd(FieldTask *taskMan)
     FieldSystem_StartFieldMap(fieldSystem);
 
     if (menu->taskData != NULL) {
-        Heap_FreeExplicit(HEAP_ID_FIELDMAP, menu->taskData);
+        Heap_FreeExplicit(HEAP_ID_FIELD2, menu->taskData);
     }
 
     menu->state = START_MENU_STATE_12;
@@ -1009,14 +1009,14 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan);
     StartMenu *menu = FieldTask_GetEnv(taskMan);
-    PartyManagementData *partyMan = (PartyManagementData *)Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = (PartyManagementData *)Heap_Alloc(HEAP_ID_FIELD2, sizeof(PartyManagementData));
 
     memcpy(partyMan, menu->taskData, sizeof(PartyManagementData));
     Heap_Free(menu->taskData);
 
     switch (partyMan->menuSelectionResult) {
     case 1: {
-        PokemonSummary *summary = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PokemonSummary));
+        PokemonSummary *summary = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PokemonSummary));
 
         summary->monData = SaveData_GetParty(fieldSystem->saveData);
         summary->options = SaveData_GetOptions(fieldSystem->saveData);
@@ -1038,7 +1038,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         sub_0203B674(menu, sub_0203C1C8);
     } break;
     case 4: {
-        PokemonSummary *summary = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PokemonSummary));
+        PokemonSummary *summary = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PokemonSummary));
 
         summary->monData = SaveData_GetParty(fieldSystem->saveData);
         summary->options = SaveData_GetOptions(fieldSystem->saveData);
@@ -1055,7 +1055,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         PokemonSummaryScreen_SetPlayerProfile(summary, SaveData_GetTrainerInfo(fieldSystem->saveData));
         FieldSystem_OpenSummaryScreen(fieldSystem, summary);
 
-        UnkStruct_0203C1C8 *v5 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0203C1C8));
+        UnkStruct_0203C1C8 *v5 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0203C1C8));
 
         v5->unk_00 = partyMan->usedItemID;
         v5->unk_02 = 0;
@@ -1065,7 +1065,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         sub_0203B674(menu, sub_0203C1C8);
     } break;
     case 5: {
-        PokemonSummary *summary = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PokemonSummary));
+        PokemonSummary *summary = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PokemonSummary));
 
         summary->monData = SaveData_GetParty(fieldSystem->saveData);
         summary->options = SaveData_GetOptions(fieldSystem->saveData);
@@ -1082,7 +1082,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         PokemonSummaryScreen_SetPlayerProfile(summary, SaveData_GetTrainerInfo(fieldSystem->saveData));
         FieldSystem_OpenSummaryScreen(fieldSystem, summary);
 
-        UnkStruct_0203C1C8 *v7 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0203C1C8));
+        UnkStruct_0203C1C8 *v7 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0203C1C8));
 
         v7->unk_00 = 0;
         v7->unk_02 = (u16)partyMan->unk_34;
@@ -1094,7 +1094,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
     case 6: {
         UnkStruct_02097728 *v8;
 
-        v8 = sub_0203D920(fieldSystem, 2, partyMan->selectedMonSlot, Item_MailNumber(partyMan->usedItemID), HEAP_ID_FIELDMAP);
+        v8 = sub_0203D920(fieldSystem, 2, partyMan->selectedMonSlot, Item_MailNumber(partyMan->usedItemID), HEAP_ID_FIELD2);
         menu->taskData = v8;
 
         if (partyMan->unk_20 == 10) {
@@ -1112,7 +1112,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         Pokemon *v10;
 
         v10 = Party_GetPokemonBySlotIndex(SaveData_GetParty(fieldSystem->saveData), partyMan->selectedMonSlot);
-        v9 = sub_0203D984(fieldSystem, v10, HEAP_ID_FIELDMAP);
+        v9 = sub_0203D984(fieldSystem, v10, HEAP_ID_FIELD2);
 
         menu->taskData = v9;
         menu->unk_260 = sub_0203C540(partyMan->usedItemID, 2, partyMan->selectedMonSlot);
@@ -1120,13 +1120,13 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         sub_0203B674(menu, sub_0203C558);
     } break;
     case 3: {
-        u32 *v13 = (u32 *)Heap_AllocFromHeap(HEAP_ID_FIELDMAP, 4);
+        u32 *v13 = (u32 *)Heap_Alloc(HEAP_ID_FIELD2, 4);
         *v13 = partyMan->selectedMonSlot;
         menu->unk_260 = (void *)v13;
 
         Bag *bag = SaveData_GetBag(fieldSystem->saveData);
         TrainerInfo *v12 = SaveData_GetTrainerInfo(fieldSystem->saveData);
-        menu->taskData = sub_0207D824(bag, Unk_020EA020, HEAP_ID_FIELDMAP);
+        menu->taskData = sub_0207D824(bag, Unk_020EA020, HEAP_ID_FIELD2);
 
         BagSystem_Init(menu->taskData, fieldSystem->saveData, 1, fieldSystem->bagCursor);
 
@@ -1134,7 +1134,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         sub_0203B674(menu, sub_0203BC5C);
     } break;
     case 8: {
-        UnkStruct_0203C7B8 *v14 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0203C7B8));
+        UnkStruct_0203C7B8 *v14 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0203C7B8));
 
         v14->unk_02 = partyMan->usedItemID;
         v14->unk_01 = 3;
@@ -1146,7 +1146,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         menu->state = START_MENU_STATE_EVOLVE_INIT;
     } break;
     case 9: {
-        UnkStruct_0203C7B8 *v15 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0203C7B8));
+        UnkStruct_0203C7B8 *v15 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0203C7B8));
 
         v15->unk_02 = MapHeader_GetMapEvolutionMethod(fieldSystem->location->mapId);
         v15->unk_01 = 0;
@@ -1238,7 +1238,7 @@ static BOOL sub_0203BC5C(FieldTask *taskMan)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan);
     StartMenu *menu = FieldTask_GetEnv(taskMan);
-    BagSystem *v2 = BagSystem_New(HEAP_ID_FIELDMAP);
+    BagSystem *v2 = BagSystem_New(HEAP_ID_FIELD2);
 
     memcpy(v2, menu->taskData, BagSystem_GetSize());
     Heap_Free(menu->taskData);
@@ -1252,7 +1252,7 @@ static BOOL sub_0203BC5C(FieldTask *taskMan)
         v4.item = BagSystem_GetItem(v2);
         v4.selectedMonSlot = BagSystem_GetSelectedMonSlot(v2);
         v4.fieldTask = taskMan;
-        v5 = Item_LoadParam(v4.item, ITEM_PARAM_FIELD_USE_FUNC, HEAP_ID_FIELDMAP);
+        v5 = Item_LoadParam(v4.item, ITEM_PARAM_FIELD_USE_FUNC, HEAP_ID_FIELD2);
         v3 = (ItemMenuUseFunc)GetItemUseFunction(USE_ITEM_TASK_MENU, v5);
         v3(&v4, &menu->unk_230);
     } break;
@@ -1262,7 +1262,7 @@ static BOOL sub_0203BC5C(FieldTask *taskMan)
     case 2: {
         PartyManagementData *partyMan;
 
-        partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+        partyMan = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PartyManagementData));
         memset(partyMan, 0, sizeof(PartyManagementData));
 
         partyMan->party = SaveData_GetParty(fieldSystem->saveData);
@@ -1291,14 +1291,14 @@ static BOOL sub_0203BC5C(FieldTask *taskMan)
             UnkStruct_02097728 *v11;
             UnkStruct_0203C540 *v12;
 
-            v11 = sub_0203D920(fieldSystem, 2, v9, Item_MailNumber(item), HEAP_ID_FIELDMAP);
+            v11 = sub_0203D920(fieldSystem, 2, v9, Item_MailNumber(item), HEAP_ID_FIELD2);
             menu->taskData = v11;
             menu->unk_260 = sub_0203C540(item, 0, (u8)v9);
             sub_0203B674(menu, sub_0203C558);
         } else {
             PartyManagementData *partyMan;
 
-            partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+            partyMan = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PartyManagementData));
             memset(partyMan, 0, sizeof(PartyManagementData));
 
             partyMan->party = party;
@@ -1350,7 +1350,7 @@ static BOOL StartMenu_TrainerCard(FieldTask *taskMan)
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan);
     StartMenu *menu = FieldTask_GetEnv(taskMan);
 
-    menu->taskData = TrainerCard_New(HEAP_ID_FIELDMAP);
+    menu->taskData = TrainerCard_New(HEAP_ID_FIELD2);
 
     TrainerCard_Init(TRUE, TRUE, 0, 0xFF, fieldSystem, (TrainerCard *)menu->taskData);
     FieldSystem_OpenTrainerCardScreen(fieldSystem, (TrainerCard *)menu->taskData);
@@ -1397,7 +1397,7 @@ static void StartMenu_Save(FieldTask *taskMan)
     if (SaveData_OverwriteCheck(fieldSystem->saveData)) {
         ScriptManager_Start(taskMan, 2034, NULL, NULL);
     } else {
-        menu->taskData = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, sizeof(SaveMenu));
+        menu->taskData = Heap_Alloc(HEAP_ID_FIELD3, sizeof(SaveMenu));
         saveMenu = menu->taskData;
         saveMenu->unk_04 = 0;
 
@@ -1483,7 +1483,7 @@ static BOOL sub_0203C0A0(FieldTask *taskMan)
     fieldSystem = FieldTask_GetFieldSystem(taskMan);
     menu = FieldTask_GetEnv(taskMan);
 
-    menu->taskData = sub_0209747C(2, 0, fieldSystem->saveData, HEAP_ID_FIELDMAP);
+    menu->taskData = sub_0209747C(2, 0, fieldSystem->saveData, HEAP_ID_FIELD2);
 
     sub_02014A9C(&v2, 4);
     sub_02097500(menu->taskData, &v2);
@@ -1545,7 +1545,7 @@ static BOOL sub_0203C1C8(FieldTask *taskMan)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan);
     StartMenu *menu = FieldTask_GetEnv(taskMan);
-    PokemonSummary *v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PokemonSummary));
+    PokemonSummary *v2 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PokemonSummary));
 
     memcpy(v2, menu->taskData, sizeof(PokemonSummary));
     Heap_Free(menu->taskData);
@@ -1555,7 +1555,7 @@ static BOOL sub_0203C1C8(FieldTask *taskMan)
         PartyManagementData *partyMan;
         UnkStruct_0203C1C8 *v4;
 
-        partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+        partyMan = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PartyManagementData));
         v4 = (UnkStruct_0203C1C8 *)menu->unk_260;
 
         memset(partyMan, 0, sizeof(PartyManagementData));
@@ -1604,7 +1604,7 @@ static void sub_0203C2D8(FieldTask *taskMan, u16 item)
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan);
     StartMenu *menu = FieldTask_GetEnv(taskMan);
 
-    menu->taskData = sub_020972FC(HEAP_ID_FIELDMAP);
+    menu->taskData = sub_020972FC(HEAP_ID_FIELD2);
     Bag *bag = SaveData_GetBag(fieldSystem->saveData);
     sub_02097320(menu->taskData, item, 1);
     v6 = 0;
@@ -1612,7 +1612,7 @@ static void sub_0203C2D8(FieldTask *taskMan, u16 item)
     for (i = 0; i < NUM_BERRIES; i++) {
         item = Item_ForBerryNumber(i);
 
-        if (Bag_CanRemoveItem(bag, item, 1, HEAP_ID_FIELDMAP) == TRUE) {
+        if (Bag_CanRemoveItem(bag, item, 1, HEAP_ID_FIELD2) == TRUE) {
             sub_02097320(menu->taskData, item, 0);
             v6++;
         }
@@ -1636,7 +1636,7 @@ static BOOL sub_0203C390(FieldTask *taskMan)
 
     sub_02097390(menu->taskData, &v2, &v3);
     BagCursor_SetFieldPocketPosition(fieldSystem->bagCursor, 4, v3, v2);
-    Heap_FreeExplicit(HEAP_ID_FIELDMAP, menu->taskData);
+    Heap_FreeExplicit(HEAP_ID_FIELD2, menu->taskData);
 
     menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230);
     sub_0203B674(menu, sub_0203BC5C);
@@ -1649,7 +1649,7 @@ BOOL sub_0203C3F4(FieldTask *taskMan)
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan);
     StartMenu *menu = FieldTask_GetEnv(taskMan);
 
-    Heap_FreeExplicit(HEAP_ID_FIELDMAP, menu->taskData);
+    Heap_FreeExplicit(HEAP_ID_FIELD2, menu->taskData);
     menu->taskData = sub_0203D20C(fieldSystem, &menu->unk_230);
     sub_0203B674(menu, sub_0203BC5C);
 
@@ -1667,12 +1667,12 @@ BOOL sub_0203C434(FieldTask *taskMan)
     menu = FieldTask_GetEnv(taskMan);
     v3 = *((u32 *)menu->unk_260);
 
-    Heap_FreeExplicit(HEAP_ID_FIELDMAP, menu->unk_260);
+    Heap_FreeExplicit(HEAP_ID_FIELD2, menu->unk_260);
 
     v2 = (UnkStruct_0203D8AC *)menu->taskData;
 
     if (!(v2->unk_10)) {
-        Heap_FreeExplicit(HEAP_ID_FIELDMAP, menu->taskData);
+        Heap_FreeExplicit(HEAP_ID_FIELD2, menu->taskData);
         menu->taskData = sub_0203D390(fieldSystem, &menu->fieldMoveContext, v3);
         sub_0203B674(menu, sub_0203B7C0);
     } else {
@@ -1681,11 +1681,11 @@ BOOL sub_0203C434(FieldTask *taskMan)
         void *journalEntryLocationEvent;
 
         mon = Party_GetPokemonBySlotIndex(SaveData_GetParty(fieldSystem->saveData), v3);
-        v5 = sub_0207064C(HEAP_ID_FIELDMAP, fieldSystem, mon, v2->unk_1C, v2->unk_14 * 32 + 16, v2->unk_18 * 32 + 16);
-        journalEntryLocationEvent = JournalEntry_CreateEventUsedMove(LOCATION_EVENT_FLEW_TO_LOCATION - LOCATION_EVENT_USED_CUT, v2->unk_1C, HEAP_ID_FIELDMAP);
+        v5 = sub_0207064C(HEAP_ID_FIELD2, fieldSystem, mon, v2->unk_1C, v2->unk_14 * 32 + 16, v2->unk_18 * 32 + 16);
+        journalEntryLocationEvent = JournalEntry_CreateEventUsedMove(LOCATION_EVENT_FLEW_TO_LOCATION - LOCATION_EVENT_USED_CUT, v2->unk_1C, HEAP_ID_FIELD2);
 
         JournalEntry_SaveData(fieldSystem->journalEntry, journalEntryLocationEvent, JOURNAL_LOCATION);
-        Heap_FreeExplicit(HEAP_ID_FIELDMAP, menu->taskData);
+        Heap_FreeExplicit(HEAP_ID_FIELD2, menu->taskData);
         FieldSystem_StartFieldMap(fieldSystem);
 
         menu->callback = sub_02070680;
@@ -1711,7 +1711,7 @@ static void sub_0203C668(FieldSystem *fieldSystem, StartMenu *param1, u8 param2)
 
 void *sub_0203C540(u16 fieldSystem, u8 param1, u8 param2)
 {
-    UnkStruct_0203C540 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0203C540));
+    UnkStruct_0203C540 *v0 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0203C540));
 
     v0->unk_00 = fieldSystem;
     v0->unk_02 = param2;
@@ -1764,7 +1764,7 @@ BOOL sub_0203C558(FieldTask *taskMan)
 static void sub_0203C668(FieldSystem *fieldSystem, StartMenu *menu, u8 param2)
 {
     UnkStruct_0203C540 *v0 = menu->unk_260;
-    PartyManagementData *partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PartyManagementData));
 
     memset(partyMan, 0, sizeof(PartyManagementData));
     partyMan->party = SaveData_GetParty(fieldSystem->saveData);
@@ -1847,7 +1847,7 @@ static void StartMenu_EvolveInit(FieldTask *taskMan)
     }
 
     {
-        u32 *v6 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, 4);
+        u32 *v6 = Heap_Alloc(HEAP_ID_FIELD2, 4);
 
         *v6 = v2->unk_00;
         menu->unk_260 = v6;
diff --git a/src/strbuf.c b/src/strbuf.c
index 7606c11988..d7fa1b91a6 100644
--- a/src/strbuf.c
+++ b/src/strbuf.c
@@ -18,7 +18,7 @@ static inline void Strbuf_Check(const Strbuf *strbuf)
 
 Strbuf *Strbuf_Init(u32 size, u32 heapID)
 {
-    Strbuf *strbuf = Heap_AllocFromHeap(heapID, SIZEOF_STRBUF_HEADER + (size * sizeof(charcode_t)));
+    Strbuf *strbuf = Heap_Alloc(heapID, SIZEOF_STRBUF_HEADER + (size * sizeof(charcode_t)));
 
     if (strbuf) {
         strbuf->integrity = STRBUF_MAGIC_NUMBER;
diff --git a/src/string_list.c b/src/string_list.c
index 0d01ad0e2f..3bf1be12cc 100644
--- a/src/string_list.c
+++ b/src/string_list.c
@@ -12,7 +12,7 @@ static void FreeEntries(StringList *list);
 
 StringList *StringList_New(u32 capacity, u32 heapID)
 {
-    StringList *list = Heap_AllocFromHeap(heapID, sizeof(StringList) * (capacity + 1));
+    StringList *list = Heap_Alloc(heapID, sizeof(StringList) * (capacity + 1));
 
     if (list) {
         u32 i;
diff --git a/src/string_template.c b/src/string_template.c
index 79dc303b9c..d643209930 100644
--- a/src/string_template.c
+++ b/src/string_template.c
@@ -50,7 +50,7 @@ StringTemplate *StringTemplate_New(u32 maxArgs, u32 maxLen, u32 heapID)
     GF_ASSERT(maxArgs);
     GF_ASSERT(maxLen);
 
-    StringTemplate *tmp = Heap_AllocFromHeapAtEnd(heapID, sizeof(StringTemplate));
+    StringTemplate *tmp = Heap_AllocAtEnd(heapID, sizeof(StringTemplate));
     if (tmp == NULL) {
         goto cleanup;
     }
@@ -62,7 +62,7 @@ StringTemplate *StringTemplate_New(u32 maxArgs, u32 maxLen, u32 heapID)
         goto cleanup;
     }
 
-    tmp->args = Heap_AllocFromHeapAtEnd(heapID, sizeof(StringTemplateArg) * maxArgs);
+    tmp->args = Heap_AllocAtEnd(heapID, sizeof(StringTemplateArg) * maxArgs);
     if (tmp->args == NULL) {
         goto cleanup;
     }
@@ -528,7 +528,7 @@ void StringTemplate_SetUnionGroupName(StringTemplate *template, SaveData *saveDa
 
     gender = RecordMixedRNG_GetEntryGender(group, groupID);
     countryCode = RecordMixedRNG_GetEntryCountryCode(group, groupID);
-    groupName = Strbuf_Init(64, HEAP_ID_FIELD);
+    groupName = Strbuf_Init(64, HEAP_ID_FIELD1);
 
     Strbuf_CopyChars(groupName, RecordMixedRNG_GetEntryName(group, groupID, nameType));
     StringTemplate_SetStrbuf(template, idx, groupName, gender, 1, countryCode);
diff --git a/src/system.c b/src/system.c
index 03658eadd1..1ea64a3ad0 100644
--- a/src/system.c
+++ b/src/system.c
@@ -199,7 +199,7 @@ void *ReadFileToHeap(int heapID, const char *filename)
     void *buf;
     if (FS_OpenFile(&file, filename)) {
         u32 length = FS_GetLength(&file);
-        buf = Heap_AllocFromHeap(heapID, length);
+        buf = Heap_Alloc(heapID, length);
         if (buf != NULL) {
             if (FS_ReadFile(&file, buf, length) != length) {
                 Heap_FreeExplicit(heapID, buf);
@@ -436,11 +436,11 @@ void ResetUnlock(u8 mask)
 
 #define HEAP_CANARY 0x2F93A1BC
 
-void InitHeapCanary(enum HeapId heapID)
+void InitHeapCanary(enum HeapID heapID)
 {
     GF_ASSERT(gSystem.heapCanary == NULL);
 
-    gSystem.heapCanary = Heap_AllocFromHeapAtEnd(heapID, sizeof(u32));
+    gSystem.heapCanary = Heap_AllocAtEnd(heapID, sizeof(u32));
     *(gSystem.heapCanary) = HEAP_CANARY;
 }
 
diff --git a/src/terrain_attributes.c b/src/terrain_attributes.c
index fa6ade7bcd..20127c5060 100644
--- a/src/terrain_attributes.c
+++ b/src/terrain_attributes.c
@@ -17,7 +17,7 @@ static const u8 TerrainAttributes_GetOrPushLandDataID(const u16 landDataID, u16
 void TerrainAttributes_New(FieldSystem *fieldSystem, const u8 blockCount)
 {
     if (fieldSystem->terrainAttributes == NULL) {
-        fieldSystem->terrainAttributes = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(TerrainAttributes));
+        fieldSystem->terrainAttributes = Heap_Alloc(HEAP_ID_FIELD2, sizeof(TerrainAttributes));
 
         TerrainAttributes_Load(fieldSystem->mapMatrix, fieldSystem->terrainAttributes, blockCount);
     }
@@ -58,7 +58,7 @@ static void TerrainAttributes_Load(MapMatrix *mapMatrix, TerrainAttributes *terr
         }
     }
 
-    NARC *landDataNARC = NARC_ctor(NARC_INDEX_FIELDDATA__LAND_DATA__LAND_DATA, HEAP_ID_FIELDMAP);
+    NARC *landDataNARC = NARC_ctor(NARC_INDEX_FIELDDATA__LAND_DATA__LAND_DATA, HEAP_ID_FIELD2);
 
     for (i = 0; i < blockCount; i++) {
         landDataID = blockIndexToLandDataID[i];
diff --git a/src/text.c b/src/text.c
index 6025c85b19..02605bb0f4 100644
--- a/src/text.c
+++ b/src/text.c
@@ -174,7 +174,7 @@ u8 Text_AddPrinter(const TextPrinterTemplate *template, u32 renderDelay, TextPri
         return 0xFF;
     }
 
-    TextPrinter *printer = Heap_AllocFromHeap(HEAP_ID_SYSTEM, sizeof(TextPrinter));
+    TextPrinter *printer = Heap_Alloc(HEAP_ID_SYSTEM, sizeof(TextPrinter));
 
     printer->active = TRUE;
     printer->state = 0;
@@ -325,7 +325,7 @@ static u8 *Text_LoadScreenIndicatorGfx(void)
 {
     NNSG2dCharacterData *g2dCharData;
 
-    u8 *gfx = Heap_AllocFromHeap(HEAP_ID_SYSTEM, 24 * 64); // These numbers are file dimensions. Curiously, this only loads the bottom-screen indicators.
+    u8 *gfx = Heap_Alloc(HEAP_ID_SYSTEM, 24 * 64); // These numbers are file dimensions. Curiously, this only loads the bottom-screen indicators.
     void *ncgr = Graphics_GetCharData(NARC_INDEX_GRAPHIC__PL_FONT, screen_indicators_NCGR, FALSE, &g2dCharData, HEAP_ID_SYSTEM);
 
     MI_CpuCopy32(g2dCharData->pRawData, gfx, 24 * 64);
diff --git a/src/touch_screen_actions.c b/src/touch_screen_actions.c
index ac4da90864..9286a4c0cd 100644
--- a/src/touch_screen_actions.c
+++ b/src/touch_screen_actions.c
@@ -21,14 +21,14 @@ TouchScreenActions *TouchScreenActions_RegisterHandler(const TouchScreenHitTable
 {
     GF_ASSERT(hitTableLength > 0);
 
-    TouchScreenActions *buttonAction = Heap_AllocFromHeap(heapID, sizeof(TouchScreenActions));
+    TouchScreenActions *buttonAction = Heap_Alloc(heapID, sizeof(TouchScreenActions));
 
     if (buttonAction) {
         buttonAction->hitTables = hitTable;
         buttonAction->hitTablesLength = hitTableLength;
         buttonAction->action = action;
         buttonAction->hitTableContext = context;
-        buttonAction->actionStates = Heap_AllocFromHeap(heapID, sizeof(TouchScreenHitTableActionStateInternal) * hitTableLength);
+        buttonAction->actionStates = Heap_Alloc(heapID, sizeof(TouchScreenHitTableActionStateInternal) * hitTableLength);
 
         if (buttonAction->actionStates) {
             for (u32 i = 0; i < hitTableLength; i++) {
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 370c2958ef..ca107079be 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -91,7 +91,7 @@ void TrainerCard_Init(u8 badgesInteractable, u8 liveTimeDisplay, u8 gymLeadersTo
 
 TrainerCard *TrainerCard_New(u16 heapID)
 {
-    TrainerCard *trainerCard = Heap_AllocFromHeap(heapID, sizeof(TrainerCard));
+    TrainerCard *trainerCard = Heap_Alloc(heapID, sizeof(TrainerCard));
 
     memset(trainerCard, 0, sizeof(TrainerCard));
     return trainerCard;
@@ -247,7 +247,7 @@ void TrainerCard_SaveBadgePolish(FieldSystem *fieldSystem, const TrainerCard *tr
 
 void sub_02072204(FieldSystem *fieldSystem)
 {
-    UnkStruct_02072204 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_02072204));
+    UnkStruct_02072204 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_02072204));
 
     v0->unk_00 = 0;
     v0->unk_04 = (TrainerCard *)sub_0205C17C(fieldSystem->unk_7C);
diff --git a/src/trainer_data.c b/src/trainer_data.c
index 20200c62e1..72a3a56941 100644
--- a/src/trainer_data.c
+++ b/src/trainer_data.c
@@ -186,7 +186,7 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, int heapID)
 
     // alloc enough space to support the maximum possible data size
     Party_InitWithCapacity(dto->parties[battler], MAX_PARTY_SIZE);
-    buf = Heap_AllocFromHeap(heapID, sizeof(TrainerMonWithMovesAndItem) * MAX_PARTY_SIZE);
+    buf = Heap_Alloc(heapID, sizeof(TrainerMonWithMovesAndItem) * MAX_PARTY_SIZE);
     mon = Pokemon_New(heapID);
 
     Trainer_LoadParty(dto->trainerIDs[battler], buf);
diff --git a/src/trainer_info.c b/src/trainer_info.c
index 37207266fb..b0442cf67f 100644
--- a/src/trainer_info.c
+++ b/src/trainer_info.c
@@ -16,9 +16,9 @@ int TrainerInfo_Size(void)
     return sizeof(TrainerInfo);
 }
 
-TrainerInfo *TrainerInfo_New(enum HeapId heapID)
+TrainerInfo *TrainerInfo_New(enum HeapID heapID)
 {
-    TrainerInfo *info = Heap_AllocFromHeap(heapID, sizeof(TrainerInfo));
+    TrainerInfo *info = Heap_Alloc(heapID, sizeof(TrainerInfo));
     TrainerInfo_Init(info);
 
     return info;
diff --git a/src/unk_0200679C.c b/src/unk_0200679C.c
index 52b6e04d42..3347def2c6 100644
--- a/src/unk_0200679C.c
+++ b/src/unk_0200679C.c
@@ -12,7 +12,7 @@ SysTask *SysTask_StartAndAllocateParam(SysTaskFunc callback, int paramSize, u32
     void *param;
 
     if (paramSize) {
-        param = Heap_AllocFromHeap(heapID, paramSize);
+        param = Heap_Alloc(heapID, paramSize);
 
         if (param == NULL) {
             return NULL;
diff --git a/src/unk_02012744.c b/src/unk_02012744.c
index 6c2971e62e..077cc2df8c 100644
--- a/src/unk_02012744.c
+++ b/src/unk_02012744.c
@@ -95,7 +95,7 @@ UnkStruct_02012744 *sub_02012744(int param0, int heapID)
     UnkStruct_02012744 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02012744));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02012744));
     GF_ASSERT(v0);
 
     for (v1 = 0; v1 < 12; v1++) {
@@ -104,7 +104,7 @@ UnkStruct_02012744 *sub_02012744(int param0, int heapID)
         GF_ASSERT(v0->unk_00[v1]);
     }
 
-    v0->unk_60 = Heap_AllocFromHeap(heapID, sizeof(FontOAM) * param0);
+    v0->unk_60 = Heap_Alloc(heapID, sizeof(FontOAM) * param0);
     GF_ASSERT(v0->unk_60);
 
     v0->unk_64 = param0;
@@ -147,9 +147,9 @@ FontOAM *sub_020127E8(const UnkStruct_020127E8 *param0)
     v1.unk_10 = &v1;
 
     v2 = sub_02012DE4(param0->unk_04->width, param0->unk_04->height, param0->heapID, &v1);
-    v3 = Heap_AllocFromHeapAtEnd(param0->heapID, sizeof(NNSG2dImageProxy) * v2);
+    v3 = Heap_AllocAtEnd(param0->heapID, sizeof(NNSG2dImageProxy) * v2);
 
-    v0->unk_00 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02012CE0_sub1) * v2);
+    v0->unk_00 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_02012CE0_sub1) * v2);
     v0->unk_04 = v2;
 
     sub_02012E6C(param0->unk_04, &v1, v3, param0->unk_14, param0->unk_28, param0->heapID);
@@ -333,7 +333,7 @@ void sub_02012AF0(FontOAM *param0, GXOamMode param1)
 
 UnkStruct_02012B20 *sub_02012B20(const Window *param0, int heapID)
 {
-    UnkStruct_02012B20 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02012B20));
+    UnkStruct_02012B20 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02012B20));
 
     v0->unk_00.unk_0C = &v0->unk_00;
     v0->unk_00.unk_10 = &v0->unk_00;
@@ -367,9 +367,9 @@ FontOAM *sub_02012B60(const UnkStruct_020127E8 *param0, const UnkStruct_02012B20
     v0->unk_0C = param0->unk_18;
     v0->unk_10 = param0->unk_1C;
 
-    v1 = Heap_AllocFromHeapAtEnd(param0->heapID, sizeof(NNSG2dImageProxy) * param1->unk_14);
+    v1 = Heap_AllocAtEnd(param0->heapID, sizeof(NNSG2dImageProxy) * param1->unk_14);
 
-    v0->unk_00 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02012CE0_sub1) * param1->unk_14);
+    v0->unk_00 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_02012CE0_sub1) * param1->unk_14);
     v0->unk_04 = param1->unk_14;
 
     sub_02012E6C(param0->unk_04, &param1->unk_00, v1, param0->unk_14, param0->unk_28, param0->heapID);
@@ -392,7 +392,7 @@ void sub_02012BE0(FontOAM *param0, const UnkStruct_02012B20 *param1, const Windo
     Sprite *v3 = param0->unk_00[0].unk_00;
     int v4 = Sprite_GetVRamType(v3);
     v0 = sub_02012B58(param1, v4);
-    v1 = (char *)Heap_AllocFromHeapAtEnd(heapID, v0);
+    v1 = (char *)Heap_AllocAtEnd(heapID, v0);
 
     memset(v1, 0, v0);
 
@@ -587,7 +587,7 @@ static int sub_02012EE0(const Window *param0, const UnkStruct_02013034 *param1,
     }
 
     v1 *= 32;
-    v0 = Heap_AllocFromHeapAtEnd(heapID, v1);
+    v0 = Heap_AllocAtEnd(heapID, v1);
 
     sub_02012C60(param0, v2, v3, param1->unk_00, param1->unk_04, v0);
     DC_FlushRange(v0, v1);
@@ -757,7 +757,7 @@ static Sprite *sub_02013100(const UnkStruct_020127E8 *param0, const UnkStruct_02
 
 static UnkStruct_02013034 *sub_02013188(int heapID)
 {
-    UnkStruct_02013034 *v0 = Heap_AllocFromHeapAtEnd(heapID, sizeof(UnkStruct_02013034));
+    UnkStruct_02013034 *v0 = Heap_AllocAtEnd(heapID, sizeof(UnkStruct_02013034));
     GF_ASSERT(v0);
 
     v0->unk_0C = NULL;
diff --git a/src/unk_020131EC.c b/src/unk_020131EC.c
index f133ad55b4..79f7b3fa04 100644
--- a/src/unk_020131EC.c
+++ b/src/unk_020131EC.c
@@ -116,11 +116,11 @@ static void sub_02013338(enum NarcID narcID, int param1, int param2, int param3,
     sub_02013260(param3, param4, param5, param6, v1, param7);
 }
 
-static void *sub_02013388(enum NarcID narcID, int param1, enum HeapId heapID, int param3, int param4, int param5, int param6, u32 param7, BOOL param8, int param9, int param10)
+static void *sub_02013388(enum NarcID narcID, int param1, enum HeapID heapID, int param3, int param4, int param5, int param6, u32 param7, BOOL param8, int param9, int param10)
 {
     void *v0;
     int v1 = ((param5 * param6) * ((8 / 2) * 8));
-    v0 = Heap_AllocFromHeap(heapID, v1);
+    v0 = Heap_Alloc(heapID, v1);
 
     sub_02013338(narcID, param1, heapID, param3, param4, param5, param6, v0, param7, param8, param9, param10);
 
@@ -173,11 +173,11 @@ void sub_020133D4(enum NarcID narcID, int param1, int param2, int param3, int pa
     Heap_Free(v0);
 }
 
-static void *sub_020134A8(enum NarcID narcID, int param1, enum HeapId heapID, int param3, int param4, int param5, int param6)
+static void *sub_020134A8(enum NarcID narcID, int param1, enum HeapID heapID, int param3, int param4, int param5, int param6)
 {
     void *v0;
     int v1 = ((param5 * param6) * ((8 / 2) * 8));
-    v0 = Heap_AllocFromHeap(heapID, v1);
+    v0 = Heap_Alloc(heapID, v1);
 
     sub_020133D4(narcID, param1, heapID, param3, param4, param5, param6, v0);
 
@@ -238,12 +238,12 @@ void sub_02013584(enum NarcID narcID, int param1, int heapID, int param3, int pa
     Heap_Free(v3);
 }
 
-void sub_020135F0(enum NarcID narcID, int param1, enum HeapId heapID, const UnkStruct_02013610 *param3, void *param4)
+void sub_020135F0(enum NarcID narcID, int param1, enum HeapID heapID, const UnkStruct_02013610 *param3, void *param4)
 {
     sub_02013584(narcID, param1, heapID, param3->unk_00, param3->unk_04, param3->unk_08, param3->unk_0C, param4);
 }
 
-void sub_02013610(enum NarcID narcID, int param1, enum HeapId heapID, void *param3)
+void sub_02013610(enum NarcID narcID, int param1, enum HeapID heapID, void *param3)
 {
     const UnkStruct_02013610 v0 = {
         0x0,
@@ -255,18 +255,18 @@ void sub_02013610(enum NarcID narcID, int param1, enum HeapId heapID, void *para
     sub_020135F0(narcID, param1, heapID, &v0, param3);
 }
 
-void *sub_0201363C(enum NarcID narcID, int param1, enum HeapId heapID)
+void *sub_0201363C(enum NarcID narcID, int param1, enum HeapID heapID)
 {
     void *v0 = NULL;
     int v1 = (10 * 10 * ((8 / 2) * 8));
-    v0 = Heap_AllocFromHeap(heapID, v1);
+    v0 = Heap_Alloc(heapID, v1);
 
     sub_02013610(narcID, param1, heapID, v0);
 
     return v0;
 }
 
-void *sub_02013660(enum NarcID narcID, int param1, enum HeapId heapID)
+void *sub_02013660(enum NarcID narcID, int param1, enum HeapID heapID)
 {
     NNSG2dPaletteData *v0;
     void *v1;
@@ -274,7 +274,7 @@ void *sub_02013660(enum NarcID narcID, int param1, enum HeapId heapID)
     int v3;
     BOOL v4;
 
-    v2 = Heap_AllocFromHeap(heapID, 0x20);
+    v2 = Heap_Alloc(heapID, 0x20);
     v1 = NARC_AllocAndReadWholeMemberByIndexPair(narcID, param1, heapID);
     v4 = NNS_G2dGetUnpackedPaletteData(v1, &v0);
 
@@ -286,7 +286,7 @@ void *sub_02013660(enum NarcID narcID, int param1, enum HeapId heapID)
     return v2;
 }
 
-void sub_020136A4(enum NarcID narcID, int param1, enum HeapId heapID, int param3, int param4, int param5, int param6, void *param7, u32 param8, BOOL param9, int param10, int param11)
+void sub_020136A4(enum NarcID narcID, int param1, enum HeapID heapID, int param3, int param4, int param5, int param6, void *param7, u32 param8, BOOL param9, int param10, int param11)
 {
     int v0;
     int v1;
@@ -313,12 +313,12 @@ void sub_020136A4(enum NarcID narcID, int param1, enum HeapId heapID, int param3
     Heap_Free(v3);
 }
 
-void sub_02013720(enum NarcID narcID, int charID, enum HeapId heapID, const UnkStruct_02013610 *param3, void *param4, u32 personality, BOOL param6, int param7, int param8)
+void sub_02013720(enum NarcID narcID, int charID, enum HeapID heapID, const UnkStruct_02013610 *param3, void *param4, u32 personality, BOOL param6, int param7, int param8)
 {
     sub_020136A4(narcID, charID, heapID, param3->unk_00, param3->unk_04, param3->unk_08, param3->unk_0C, param4, personality, param6, param7, param8);
 }
 
-void sub_02013750(enum NarcID narcID, int charID, enum HeapId heapID, void *param3, u32 personality, BOOL param5, int param6, int param7)
+void sub_02013750(enum NarcID narcID, int charID, enum HeapID heapID, void *param3, u32 personality, BOOL param5, int param6, int param7)
 {
     const UnkStruct_02013610 v0 = {
         0x0,
diff --git a/src/unk_02014D38.c b/src/unk_02014D38.c
index 1be4fade0d..2b7f9c86e6 100644
--- a/src/unk_02014D38.c
+++ b/src/unk_02014D38.c
@@ -145,7 +145,7 @@ void include_unk_020E5538(void)
 UnkStruct_02014D38 *sub_02014D38(u32 heapID)
 {
     int v0;
-    UnkStruct_02014D38 *v1 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02014D38));
+    UnkStruct_02014D38 *v1 = Heap_Alloc(heapID, sizeof(UnkStruct_02014D38));
 
     for (v0 = 0; v0 < 11; v0++) {
         v1->heapID = heapID;
@@ -346,7 +346,7 @@ UnkStruct_02014FB0 *sub_02014FB0(u32 heapID)
     UnkStruct_02014FB0 *v0;
     u32 fileSize;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02014FB0));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02014FB0));
     memset(v0, 0, sizeof(UnkStruct_02014FB0));
 
     v0->unk_04 = LoadMemberFromNARC_OutFileSize(NARC_INDEX_RESOURCE__ENG__PMS_AIKOTOBA__PMS_AIKOTOBA, 0, 0, heapID, 0, &fileSize);
diff --git a/src/unk_02015064.c b/src/unk_02015064.c
index 973ee69a7d..310345bfd1 100644
--- a/src/unk_02015064.c
+++ b/src/unk_02015064.c
@@ -70,7 +70,7 @@ UnkStruct_02015064 *sub_02015064(const UnkStruct_ov22_022550D4 *param0)
     UnkStruct_02015064 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02015064));
+    v0 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_02015064));
     GF_ASSERT(v0);
 
     v0->unk_00 = sub_020152F8(param0->unk_00, param0->heapID);
@@ -309,7 +309,7 @@ static void sub_020152EC(UnkStruct_020151A4 *param0)
 
 static UnkStruct_02015214 *sub_020152F8(int param0, int heapID)
 {
-    UnkStruct_02015214 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02015214) * param0);
+    UnkStruct_02015214 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02015214) * param0);
     GF_ASSERT(v0);
 
     for (int i = 0; i < param0; i++) {
@@ -321,7 +321,7 @@ static UnkStruct_02015214 *sub_020152F8(int param0, int heapID)
 
 static UnkStruct_02015128 *sub_02015328(int param0, int heapID)
 {
-    UnkStruct_02015128 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02015128) * param0);
+    UnkStruct_02015128 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02015128) * param0);
     GF_ASSERT(v0);
 
     for (int i = 0; i < param0; i++) {
@@ -333,7 +333,7 @@ static UnkStruct_02015128 *sub_02015328(int param0, int heapID)
 
 static UnkStruct_020151A4 *sub_02015358(int param0, int heapID)
 {
-    UnkStruct_020151A4 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_020151A4) * param0);
+    UnkStruct_020151A4 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_020151A4) * param0);
     GF_ASSERT(v0);
 
     for (int i = 0; i < param0; i++) {
diff --git a/src/unk_020158A8.c b/src/unk_020158A8.c
index edf541d86d..29e47a7c10 100644
--- a/src/unk_020158A8.c
+++ b/src/unk_020158A8.c
@@ -14,7 +14,7 @@ UnkStruct_020158A8 *sub_020158A8(int heapID)
     UnkStruct_020158A8 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_020158A8));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_020158A8));
     MI_CpuClear8(v0, sizeof(UnkStruct_020158A8));
 
     v0->unk_00 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POFFIN_NAMES, heapID);
diff --git a/src/unk_02015920.c b/src/unk_02015920.c
index 1edda14b05..2b20a1d166 100644
--- a/src/unk_02015920.c
+++ b/src/unk_02015920.c
@@ -102,7 +102,7 @@ static void sub_02015F54(const NNSG2dScreenData *param0, int param1);
 
 UnkStruct_02015920 *sub_02015920(u32 heapID)
 {
-    UnkStruct_02015920 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02015920));
+    UnkStruct_02015920 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02015920));
     sub_02015A80(v0, heapID);
 
     return v0;
@@ -366,7 +366,7 @@ static u32 sub_02015DA0(const UnkStruct_02015D8C *param0)
 
 static void sub_02015DCC(enum NarcID narcID, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 heapID)
 {
-    UnkStruct_02015DCC *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02015DCC));
+    UnkStruct_02015DCC *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02015DCC));
     memset(v0, 0, sizeof(UnkStruct_02015DCC));
 
     v0->unk_08 = Graphics_GetCharData(narcID, param1, 1, &v0->unk_04, heapID);
@@ -379,7 +379,7 @@ static void sub_02015DCC(enum NarcID narcID, u32 param1, BgConfig *param2, u32 p
 
 static void sub_02015E1C(enum NarcID narcID, u32 param1, int param2, u32 param3, u32 param4, u32 heapID)
 {
-    UnkStruct_02015E1C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02015E1C));
+    UnkStruct_02015E1C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02015E1C));
     memset(v0, 0, sizeof(UnkStruct_02015E1C));
 
     v0->unk_04 = Graphics_GetPlttData(narcID, param1, &v0->unk_00, heapID);
diff --git a/src/unk_02015F84.c b/src/unk_02015F84.c
index 6779059209..34eb7a94c0 100644
--- a/src/unk_02015F84.c
+++ b/src/unk_02015F84.c
@@ -174,11 +174,11 @@ static const UnkStruct_020E5598 Unk_020E5598[] = {
 
 PokemonAnimationSys *sub_02015F84(const int heapID, const int param1, const u8 param2)
 {
-    PokemonAnimationSys *v0 = Heap_AllocFromHeap(heapID, sizeof(PokemonAnimationSys));
+    PokemonAnimationSys *v0 = Heap_Alloc(heapID, sizeof(PokemonAnimationSys));
     v0->reverse = param2;
     v0->animation = param1;
     v0->heapID = heapID;
-    v0->pokeAnimation = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02016E64) * param1);
+    v0->pokeAnimation = Heap_Alloc(heapID, sizeof(UnkStruct_02016E64) * param1);
 
     MI_CpuClear8(v0->pokeAnimation, sizeof(UnkStruct_02016E64) * param1);
 
diff --git a/src/unk_02017498.c b/src/unk_02017498.c
index b4e23b660d..fcc7d5c122 100644
--- a/src/unk_02017498.c
+++ b/src/unk_02017498.c
@@ -145,7 +145,7 @@ int sub_02017658(ApplicationManager *appMan, int *param1)
 static void sub_0201767C(UnkStruct_02017498 *param0)
 {
     if (param0->unk_88 == 0) {
-        param0->unk_18 = Heap_AllocFromHeap(HEAP_ID_116, 0x20000 + 32);
+        param0->unk_18 = Heap_Alloc(HEAP_ID_116, 0x20000 + 32);
         param0->unk_1C = NNS_FndCreateExpHeap((void *)(((u32)param0->unk_18 + 31) / 32 * 32), 0x20000);
 
         sub_02099550();
diff --git a/src/unk_0201DD00.c b/src/unk_0201DD00.c
index 9a36241793..77671544bb 100644
--- a/src/unk_0201DD00.c
+++ b/src/unk_0201DD00.c
@@ -37,9 +37,9 @@ UnkStruct_0201DD00 *sub_0201DD00(int param0, int heapID)
     UnkStruct_0201DD00 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0201DD00));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0201DD00));
 
-    v0->unk_00 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0201DDF4) * param0);
+    v0->unk_00 = Heap_Alloc(heapID, sizeof(UnkStruct_0201DDF4) * param0);
     v0->unk_04 = param0;
 
     for (v1 = 0; v1 < v0->unk_04; v1++) {
diff --git a/src/unk_02020AEC.c b/src/unk_02020AEC.c
index 445bdd5e6f..6190d828e8 100644
--- a/src/unk_02020AEC.c
+++ b/src/unk_02020AEC.c
@@ -147,7 +147,7 @@ void sub_02020B90(int param0, int heapID)
 
     GF_ASSERT(Unk_021C0774 == NULL);
 
-    Unk_021C0774 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02020C44) * param0);
+    Unk_021C0774 = Heap_Alloc(heapID, sizeof(UnkStruct_02020C44) * param0);
     Unk_021C0778 = param0;
 
     for (v0 = 0; v0 < param0; v0++) {
@@ -195,19 +195,19 @@ UnkStruct_02020C44 *sub_02020C44(const UnkStruct_ov5_021EDDAC *param0)
 
     v0->unk_00 = 1;
     v0->unk_01 = 1;
-    v0->unk_04 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_020216E0) * param0->unk_00);
+    v0->unk_04 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_020216E0) * param0->unk_00);
     v0->unk_08 = param0->unk_00;
 
     sub_02020B14(&v0->unk_0C);
 
     v0->unk_0C.unk_BC = &v0->unk_0C;
     v0->unk_0C.unk_C0 = &v0->unk_0C;
-    v0->unk_CC = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_020216E0 *) * param0->unk_00);
+    v0->unk_CC = Heap_Alloc(param0->heapID, sizeof(UnkStruct_020216E0 *) * param0->unk_00);
 
     sub_020216A8(v0);
-    v0->unk_D4 = Heap_AllocFromHeap(param0->heapID, sizeof(NNSFndAllocator));
+    v0->unk_D4 = Heap_Alloc(param0->heapID, sizeof(NNSFndAllocator));
 
-    Heap_FndInitAllocatorForExpHeap(v0->unk_D4, param0->heapID, 4);
+    HeapExp_FndInitAllocator(v0->unk_D4, param0->heapID, 4);
     v0->unk_D8 = sub_0201DD00(param0->unk_00, param0->heapID);
 
     return v0;
diff --git a/src/unk_0202854C.c b/src/unk_0202854C.c
index 6d91b7cbd2..ea8d9586ca 100644
--- a/src/unk_0202854C.c
+++ b/src/unk_0202854C.c
@@ -98,7 +98,7 @@ int UndergroundRecord_Size(void)
 
 UndergroundRecord *UndergroundRecord_Init(u32 heapID)
 {
-    UndergroundRecord *undergroundRecord = Heap_AllocFromHeap(heapID, sizeof(UndergroundRecord));
+    UndergroundRecord *undergroundRecord = Heap_Alloc(heapID, sizeof(UndergroundRecord));
     MI_CpuFill8(undergroundRecord, 0, sizeof(UndergroundRecord));
     return undergroundRecord;
 }
diff --git a/src/unk_020298BC.c b/src/unk_020298BC.c
index 0f5d4892ae..7c9bf10586 100644
--- a/src/unk_020298BC.c
+++ b/src/unk_020298BC.c
@@ -338,7 +338,7 @@ int sub_02029C64(void)
 
 UnkStruct_02029C68 *sub_02029C68(u32 heapID)
 {
-    UnkStruct_02029C68 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02029C68));
+    UnkStruct_02029C68 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02029C68));
     inline_02029BFC(v0);
 
     return v0;
@@ -346,7 +346,7 @@ UnkStruct_02029C68 *sub_02029C68(u32 heapID)
 
 UnkStruct_02029C88 *sub_02029C88(u32 heapID)
 {
-    UnkStruct_02029C88 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02029C88));
+    UnkStruct_02029C88 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02029C88));
     inline_02029BFC_1(v0);
 
     return v0;
diff --git a/src/unk_0202CC64.c b/src/unk_0202CC64.c
index 0c07dd9c89..4454b88373 100644
--- a/src/unk_0202CC64.c
+++ b/src/unk_0202CC64.c
@@ -21,7 +21,7 @@ void ChatotCry_Init(ChatotCry *param0)
 
 ChatotCry *ChatotCry_New(int heapID)
 {
-    ChatotCry *cry = Heap_AllocFromHeap(heapID, sizeof(ChatotCry));
+    ChatotCry *cry = Heap_Alloc(heapID, sizeof(ChatotCry));
 
     ChatotCry_Init(cry);
     return cry;
diff --git a/src/unk_0202D05C.c b/src/unk_0202D05C.c
index a7f466e2f1..c492aa9942 100644
--- a/src/unk_0202D05C.c
+++ b/src/unk_0202D05C.c
@@ -495,7 +495,7 @@ void sub_0202D63C(UnkStruct_0202D764 *param0, UnkStruct_ov104_0223A348 *param1,
     v0->trainerType = v2->unk_C9;
 
     if (v2->unk_C8_val1_unk_00_0) {
-        MessageLoader *v3 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0022, HEAP_ID_FIELDMAP);
+        MessageLoader *v3 = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0022, HEAP_ID_FIELD2);
 
         MessageLoader_Get(v3, 22 + v2->unk_C8_val1_unk_00_1, v0->trainerName);
         MessageLoader_Free(v3);
@@ -526,7 +526,7 @@ void sub_0202D708(UnkStruct_0202D764 *param0, UnkStruct_02049A68 *param1)
 
 UnkStruct_ov90_021D1750 *sub_0202D71C(UnkStruct_0202D764 *param0, int heapID)
 {
-    UnkStruct_ov90_021D1750 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov90_021D1750) * 30);
+    UnkStruct_ov90_021D1750 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov90_021D1750) * 30);
     MI_CpuCopy8(param0->unk_740, v0, sizeof(UnkStruct_ov90_021D1750) * 30);
 
     return v0;
diff --git a/src/unk_0202E840.c b/src/unk_0202E840.c
index 1f9b17a455..c79c3a0a63 100644
--- a/src/unk_0202E840.c
+++ b/src/unk_0202E840.c
@@ -141,7 +141,7 @@ static u32 *sub_0202E924(SaveData *saveData, int heapID)
 
     v2 = SaveData_GetGameRecords(saveData);
     frontier = SaveData_GetBattleFrontier(saveData);
-    v4 = Heap_AllocFromHeapAtEnd(heapID, 4 * 13);
+    v4 = Heap_AllocAtEnd(heapID, 4 * 13);
 
     for (v0 = 0; v0 < 13; v0++) {
         switch (v0) {
@@ -192,7 +192,7 @@ void *sub_0202E9FC(SaveData *saveData, int heapID)
     TrainerInfo *v5 = SaveData_GetTrainerInfo(saveData);
     u32 *v6;
 
-    v3 = Heap_AllocFromHeapAtEnd(heapID, sizeof(UnkStruct_0202E91C));
+    v3 = Heap_AllocAtEnd(heapID, sizeof(UnkStruct_0202E91C));
     MI_CpuClear8(v3, sizeof(UnkStruct_0202E91C));
 
     v1 = RecordMixedRNG_GetEntrySeed(SaveData_GetRecordMixedRNG(saveData), 1);
@@ -335,7 +335,7 @@ static void sub_0202EAEC(UnkStruct_0202E8C0 *param0, UnkStruct_0202EABC *param1,
 static void sub_0202ECB0(UnkStruct_0202E8C0 *param0, u32 param1, u8 param2, UnkStruct_0202E91C **param3, u8 param4, int heapID)
 {
     int v0, v1;
-    UnkStruct_0202EABC *v2 = Heap_AllocFromHeapAtEnd(heapID, sizeof(UnkStruct_0202EABC));
+    UnkStruct_0202EABC *v2 = Heap_AllocAtEnd(heapID, sizeof(UnkStruct_0202EABC));
 
     sub_0202EAEC(param0, v2, param1, param2, 0, param3, param4, heapID);
 
@@ -390,7 +390,7 @@ UnkStruct_0202EE10 *sub_0202ED8C(SaveData *saveData, int param1, int heapID)
     UnkStruct_0202EE10 *v3;
     u32 *v4;
     TrainerInfo *v5 = SaveData_GetTrainerInfo(saveData);
-    v3 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0202EE10));
+    v3 = Heap_Alloc(heapID, sizeof(UnkStruct_0202EE10));
 
     MI_CpuClear8(v3, sizeof(UnkStruct_0202EE10));
 
@@ -415,7 +415,7 @@ UnkStruct_0202EE10 *sub_0202EE10(UnkStruct_0202E8C0 *param0, int param1, int hea
     UnkStruct_0202EE10 *v1;
     UnkStruct_0202EA80 *v2;
 
-    v1 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0202EE10));
+    v1 = Heap_Alloc(heapID, sizeof(UnkStruct_0202EE10));
     MI_CpuClear8(v1, sizeof(UnkStruct_0202EE10));
     v2 = &(param0->unk_00[param1]);
 
diff --git a/src/unk_0202F1D4.c b/src/unk_0202F1D4.c
index faaba452a6..d8b50b4b02 100644
--- a/src/unk_0202F1D4.c
+++ b/src/unk_0202F1D4.c
@@ -602,7 +602,7 @@ static void sub_0202FD30(UnkStruct_0202FD30 *param0, Party *party)
     Pokemon *v1;
     u8 v2 = 0;
 
-    v1 = Pokemon_New(HEAP_ID_FIELDMAP);
+    v1 = Pokemon_New(HEAP_ID_FIELD2);
 
     Party_InitWithCapacity(party, param0->unk_00);
 
@@ -621,7 +621,7 @@ UnkStruct_0202F41C *sub_0202FD88(int heapID)
 
     GF_ASSERT(Unk_021C07A4 != NULL);
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0202F41C));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0202F41C));
     MI_CpuCopy32(&Unk_021C07A4->unk_84, v0, sizeof(UnkStruct_0202F41C));
 
     return v0;
@@ -633,7 +633,7 @@ UnkStruct_02030A80 *sub_0202FDB8(int heapID)
 
     GF_ASSERT(Unk_021C07A4 != NULL);
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02030A80));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02030A80));
     MI_CpuCopy32(&Unk_021C07A4->unk_04, v0, sizeof(UnkStruct_02030A80));
 
     return v0;
@@ -706,7 +706,7 @@ u64 sub_0202FE98(UnkStruct_0202F41C *param0, int param1, int param2)
 
 UnkStruct_0202F41C *sub_0202FF2C(int heapID)
 {
-    UnkStruct_0202F41C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0202F41C));
+    UnkStruct_0202F41C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0202F41C));
     MI_CpuClear8(v0, sizeof(UnkStruct_0202F41C));
 
     return v0;
diff --git a/src/unk_02030880.c b/src/unk_02030880.c
index 0f73c74843..9aa423913f 100644
--- a/src/unk_02030880.c
+++ b/src/unk_02030880.c
@@ -117,7 +117,7 @@ static u16 sub_02030954(SaveData *saveData, BattleFrontierStage *param1, int par
     }
 }
 
-BOOL sub_020309A0(SaveData *saveData, int param1, int param2, int param3, int param4, enum HeapId heapID, int *param6, int *param7)
+BOOL sub_020309A0(SaveData *saveData, int param1, int param2, int param3, int param4, enum HeapID heapID, int *param6, int *param7)
 {
     BattleFrontier *frontier;
     BattleFrontierStage *v1;
diff --git a/src/unk_02030A80.c b/src/unk_02030A80.c
index 39455ab2b3..e7cf7f79f4 100644
--- a/src/unk_02030A80.c
+++ b/src/unk_02030A80.c
@@ -25,7 +25,7 @@
 
 UnkStruct_02030A80 *sub_02030A80(int heapID)
 {
-    UnkStruct_02030A80 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02030A80));
+    UnkStruct_02030A80 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02030A80));
     MI_CpuClear8(v0, sizeof(UnkStruct_02030A80));
 
     return v0;
diff --git a/src/unk_020322D8.c b/src/unk_020322D8.c
index 14083c8bf4..8dddf561fd 100644
--- a/src/unk_020322D8.c
+++ b/src/unk_020322D8.c
@@ -281,7 +281,7 @@ BOOL sub_02032574(CommQueueMan *param0, UnkStruct_0203233C *param1, BOOL param2)
 void CommQueueMan_Init(CommQueueMan *param0, int param1, CommRing *param2)
 {
     MI_CpuFill8(param0, 0, sizeof(CommQueueMan));
-    param0->unk_18 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_020322D8) * param1);
+    param0->unk_18 = Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_020322D8) * param1);
 
     MI_CpuFill8(param0->unk_18, 0, sizeof(UnkStruct_020322D8) * param1);
     param0->unk_1C = param1;
diff --git a/src/unk_02032798.c b/src/unk_02032798.c
index 83b8f86d61..d50d059ec8 100644
--- a/src/unk_02032798.c
+++ b/src/unk_02032798.c
@@ -60,7 +60,7 @@ void CommCmd_Init(const CommCmdTable *cmdTable, int param1, void *param2)
     int v0;
 
     if (!sCommCmdManager) {
-        sCommCmdManager = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sizeof(CommCmdManager));
+        sCommCmdManager = Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommCmdManager));
     }
 
     sCommCmdManager->cmdTable = cmdTable;
diff --git a/src/unk_02033200.c b/src/unk_02033200.c
index 299d31c5f0..90dc792813 100644
--- a/src/unk_02033200.c
+++ b/src/unk_02033200.c
@@ -76,16 +76,16 @@ void CommServerClient_Init(TrainerInfo *trainerInfo, BOOL param1)
         return;
     }
 
-    sCommServerClient = (CommServerClient *)Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sizeof(CommServerClient));
+    sCommServerClient = (CommServerClient *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(CommServerClient));
     MI_CpuClear8(sCommServerClient, sizeof(CommServerClient));
 
-    sCommServerClient->unk_14E8 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sub_02031C50());
+    sCommServerClient->unk_14E8 = Heap_Alloc(HEAP_ID_COMMUNICATION, sub_02031C50());
     MI_CpuClear8(sCommServerClient->unk_14E8, sub_02031C50());
 
-    sCommServerClient->unk_1500 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sub_0202602C());
+    sCommServerClient->unk_1500 = Heap_Alloc(HEAP_ID_COMMUNICATION, sub_0202602C());
     MI_CpuClear8(sCommServerClient->unk_1500, sub_0202602C());
 
-    sCommServerClient->unk_1508 = (u32)Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, WM_SIZE_USER_GAMEINFO + 32);
+    sCommServerClient->unk_1508 = (u32)Heap_Alloc(HEAP_ID_COMMUNICATION, WM_SIZE_USER_GAMEINFO + 32);
     sCommServerClient->unk_150C = (u16 *)(32 - (sCommServerClient->unk_1508 % 32) + sCommServerClient->unk_1508);
 
     sCommServerClient->unk_1504 = 0x333;
diff --git a/src/unk_020363E8.c b/src/unk_020363E8.c
index ae96793065..fdf31d9f2f 100644
--- a/src/unk_020363E8.c
+++ b/src/unk_020363E8.c
@@ -28,7 +28,7 @@ static CommTool *sCommTool = NULL;
 void CommTool_Init(int netId)
 {
     if (!sCommTool) {
-        sCommTool = Heap_AllocFromHeap(netId, sizeof(CommTool));
+        sCommTool = Heap_Alloc(netId, sizeof(CommTool));
         MI_CpuFill8(sCommTool, 0, sizeof(CommTool));
     }
 
diff --git a/src/unk_020366A0.c b/src/unk_020366A0.c
index fc5f2f4ebe..cdb7886283 100644
--- a/src/unk_020366A0.c
+++ b/src/unk_020366A0.c
@@ -155,7 +155,7 @@ static void sub_020366A0(SaveData *saveData, int param1)
     GF_ASSERT(saveData);
     WirelessDriver_Init();
 
-    Unk_021C07D4 = (UnkStruct_021C07D4 *)Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_021C07D4));
+    Unk_021C07D4 = (UnkStruct_021C07D4 *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_021C07D4));
     MI_CpuFill8(Unk_021C07D4, 0, sizeof(UnkStruct_021C07D4));
 
     Unk_021C07D4->unk_40 = 50;
@@ -2067,7 +2067,7 @@ void sub_02038438(SaveData *saveData)
 {
     if (!Unk_021C07D4) {
         Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x100);
-        Unk_021C07D4 = (UnkStruct_021C07D4 *)Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_021C07D4));
+        Unk_021C07D4 = (UnkStruct_021C07D4 *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_021C07D4));
         MI_CpuFill8(Unk_021C07D4, 0, sizeof(UnkStruct_021C07D4));
         Unk_021C07D4->unk_4A = 24;
         Unk_021C07D4->unk_51 = 1;
@@ -2092,7 +2092,7 @@ void sub_020384C0(SaveData *saveData)
 {
     if (!Unk_021C07D4) {
         Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x100);
-        Unk_021C07D4 = (UnkStruct_021C07D4 *)Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_021C07D4));
+        Unk_021C07D4 = (UnkStruct_021C07D4 *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_021C07D4));
         MI_CpuFill8(Unk_021C07D4, 0, sizeof(UnkStruct_021C07D4));
         Unk_021C07D4->unk_4A = 25;
         Unk_021C07D4->unk_51 = 1;
@@ -2117,7 +2117,7 @@ void sub_02038548(SaveData *saveData)
 {
     if (!Unk_021C07D4) {
         Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x100);
-        Unk_021C07D4 = (UnkStruct_021C07D4 *)Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_021C07D4));
+        Unk_021C07D4 = (UnkStruct_021C07D4 *)Heap_Alloc(HEAP_ID_COMMUNICATION, sizeof(UnkStruct_021C07D4));
         MI_CpuFill8(Unk_021C07D4, 0, sizeof(UnkStruct_021C07D4));
         Unk_021C07D4->unk_4A = 36;
         Unk_021C07D4->unk_51 = 1;
@@ -2231,7 +2231,7 @@ void *sub_0203871C(SaveData *saveData, int param1)
     ResetLock(RESET_LOCK_0x1);
     Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_COMMUNICATION, 0x7080);
     sub_020366A0(saveData, 23);
-    Unk_021C07D4->unk_00 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, param1);
+    Unk_021C07D4->unk_00 = Heap_Alloc(HEAP_ID_COMMUNICATION, param1);
     MI_CpuFill8(Unk_021C07D4->unk_00, 0, param1);
 
     Unk_021C07D4->unk_4B = 0;
diff --git a/src/unk_02038FFC.c b/src/unk_02038FFC.c
index 3f4f5d74c7..6f71c09bca 100644
--- a/src/unk_02038FFC.c
+++ b/src/unk_02038FFC.c
@@ -20,7 +20,7 @@ int sub_02038FFC(int heapID)
     sub_02099550();
     Overlay_LoadHttpOverlay();
 
-    v1 = Heap_AllocFromHeap(heapID, DWC_INIT_WORK_SIZE + 32);
+    v1 = Heap_Alloc(heapID, DWC_INIT_WORK_SIZE + 32);
     v2 = (u8 *)(((u32)v1 + 31) / 32 * 32);
     v0 = DWC_Init(v2);
 
diff --git a/src/unk_020393C8.c b/src/unk_020393C8.c
index ead6672591..34ee5093d6 100644
--- a/src/unk_020393C8.c
+++ b/src/unk_020393C8.c
@@ -31,7 +31,7 @@ NetworkIcon *CreateNetworkIcon(u32 unused0, u32 heapID, int x, int y, BOOL isWif
     sub_020394D0(vramType, isWifi, (16 * 2 * 14), heapID);
     sub_02039530(vramType, isWifi, heapID);
 
-    v0 = (NetworkIcon *)Heap_AllocFromHeapAtEnd(heapID, sizeof(NetworkIcon));
+    v0 = (NetworkIcon *)Heap_AllocAtEnd(heapID, sizeof(NetworkIcon));
 
     v0->unk_18 = SysTask_ExecuteAfterVBlank(sub_02039428, v0, 5);
     v0->x = x;
@@ -134,7 +134,7 @@ void sub_02039474(NetworkIcon *param0, BOOL param1, u32 heapID)
 
 void *sub_020394A8(u32 heapID)
 {
-    void *heapPtr = Heap_AllocFromHeapAtEnd(heapID, 600);
+    void *heapPtr = Heap_AllocAtEnd(heapID, 600);
 
     ReadFileToBuffer("data/pl_wm.NCLR", &heapPtr);
     DC_FlushRange(heapPtr, 600);
@@ -144,7 +144,7 @@ void *sub_020394A8(u32 heapID)
 
 static void sub_020394D0(int vramType, BOOL unusedIsWifi, u32 offset, u32 heapID)
 {
-    void *heapPtr = Heap_AllocFromHeapAtEnd(heapID, 600);
+    void *heapPtr = Heap_AllocAtEnd(heapID, 600);
 
     if (heapPtr) {
         NNSG2dPaletteData *paletteData;
@@ -165,7 +165,7 @@ static void sub_020394D0(int vramType, BOOL unusedIsWifi, u32 offset, u32 heapID
 
 static void sub_02039530(int vramType, BOOL isWifi, u32 heapID)
 {
-    void *v0 = Heap_AllocFromHeapAtEnd(heapID, 600);
+    void *v0 = Heap_AllocAtEnd(heapID, 600);
 
     if (v0) {
         NNSG2dCharacterData *v1;
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index 8490704c5e..5616050c35 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -281,7 +281,7 @@ void sub_0203D1E4(FieldSystem *fieldSystem, void *param1)
 void *sub_0203D20C(FieldSystem *fieldSystem, ItemUseContext *param1)
 {
     Bag *v0 = SaveData_GetBag(fieldSystem->saveData);
-    void *v1 = sub_0207D824(v0, Unk_020EA164, HEAP_ID_FIELDMAP);
+    void *v1 = sub_0207D824(v0, Unk_020EA164, HEAP_ID_FIELD2);
 
     BagSystem_Init(v1, fieldSystem->saveData, 0, fieldSystem->bagCursor);
     BagSystem_SetMapLoadType(v1, fieldSystem->mapLoadType);
@@ -315,7 +315,7 @@ void *sub_0203D264(FieldSystem *fieldSystem, int param1)
         GF_ASSERT(0);
     }
 
-    v0 = sub_0207D824(v4, v1, HEAP_ID_FIELD_TASK);
+    v0 = sub_0207D824(v4, v1, HEAP_ID_FIELD3);
 
     BagSystem_Init(v0, fieldSystem->saveData, 3, fieldSystem->bagCursor);
     sub_0203D1E4(fieldSystem, v0);
@@ -369,7 +369,7 @@ void FieldSystem_OpenSummaryScreen(FieldSystem *fieldSystem, void *appArgs)
 
 static PartyManagementData *PartyManagementData_New(int heapID, FieldSystem *fieldSystem, int param2, int param3)
 {
-    PartyManagementData *partyMan = Heap_AllocFromHeap(heapID, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_Alloc(heapID, sizeof(PartyManagementData));
 
     MI_CpuClearFast(partyMan, sizeof(PartyManagementData));
 
@@ -386,7 +386,7 @@ static PartyManagementData *PartyManagementData_New(int heapID, FieldSystem *fie
 
 void *sub_0203D390(FieldSystem *fieldSystem, FieldMoveContext *param1, u8 param2)
 {
-    PartyManagementData *partyMan = PartyManagementData_New(HEAP_ID_FIELDMAP, fieldSystem, 0, 0);
+    PartyManagementData *partyMan = PartyManagementData_New(HEAP_ID_FIELD2, fieldSystem, 0, 0);
 
     partyMan->fieldMoveContext = param1;
     partyMan->selectedMonSlot = param2;
@@ -398,7 +398,7 @@ void *sub_0203D390(FieldSystem *fieldSystem, FieldMoveContext *param1, u8 param2
 
 void *FieldSystem_SelectMoveTutorPokemon(int unused, FieldSystem *fieldSystem)
 {
-    PartyManagementData *partyMan = PartyManagementData_New(HEAP_ID_FIELDMAP, fieldSystem, 0, 3);
+    PartyManagementData *partyMan = PartyManagementData_New(HEAP_ID_FIELD2, fieldSystem, 0, 3);
 
     FieldSystem_StartChildProcess(fieldSystem, &gPokemonPartyAppTemplate, partyMan);
     return partyMan;
@@ -406,7 +406,7 @@ void *FieldSystem_SelectMoveTutorPokemon(int unused, FieldSystem *fieldSystem)
 
 void *sub_0203D3E4(int param0, FieldSystem *fieldSystem)
 {
-    PartyManagementData *partyMan = PartyManagementData_New(HEAP_ID_FIELDMAP, fieldSystem, 0, 19);
+    PartyManagementData *partyMan = PartyManagementData_New(HEAP_ID_FIELD2, fieldSystem, 0, 19);
 
     FieldSystem_StartChildProcess(fieldSystem, &gPokemonPartyAppTemplate, partyMan);
     return partyMan;
@@ -419,7 +419,7 @@ int PartyManagementData_GetSelectedSlot(PartyManagementData *partyMan)
 
 void *sub_0203D410(int param0, FieldSystem *fieldSystem, int param2)
 {
-    PartyManagementData *partyMan = PartyManagementData_New(HEAP_ID_FIELDMAP, fieldSystem, 0, 18);
+    PartyManagementData *partyMan = PartyManagementData_New(HEAP_ID_FIELD2, fieldSystem, 0, 18);
 
     partyMan->selectedMonSlot = param2;
     FieldSystem_StartChildProcess(fieldSystem, &gPokemonPartyAppTemplate, partyMan);
@@ -492,7 +492,7 @@ void *sub_0203D50C(FieldTask *taskMan, int heapID)
     PartyManagementData *partyMan;
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan);
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0203D444));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0203D444));
     v0->heapID = heapID;
     partyMan = PartyManagementData_New(heapID, fieldSystem, 0, 2);
     partyMan->unk_32_0 = 2;
@@ -508,7 +508,7 @@ void *sub_0203D50C(FieldTask *taskMan, int heapID)
 
 void *sub_0203D578(int param0, FieldSystem *fieldSystem, int param2, int param3, int param4, int param5)
 {
-    PartyManagementData *partyMan = PartyManagementData_New(HEAP_ID_FIELDMAP, fieldSystem, 0, 13);
+    PartyManagementData *partyMan = PartyManagementData_New(HEAP_ID_FIELD2, fieldSystem, 0, 13);
 
     partyMan->selectedMonSlot = param5;
     partyMan->unk_29 = 2;
@@ -527,7 +527,7 @@ void *sub_0203D578(int param0, FieldSystem *fieldSystem, int param2, int param3,
 
 void *sub_0203D5C8(int param0, FieldSystem *fieldSystem, int param2)
 {
-    PokemonSummary *v0 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PokemonSummary));
+    PokemonSummary *v0 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PokemonSummary));
 
     v0->monData = SaveData_GetParty(fieldSystem->saveData);
     v0->options = SaveData_GetOptions(fieldSystem->saveData);
@@ -550,7 +550,7 @@ void *sub_0203D5C8(int param0, FieldSystem *fieldSystem, int param2)
 
 void *sub_0203D644(FieldSystem *fieldSystem, int param1)
 {
-    PartyManagementData *partyMan = PartyManagementData_New(HEAP_ID_FIELDMAP, fieldSystem, 0, 21);
+    PartyManagementData *partyMan = PartyManagementData_New(HEAP_ID_FIELD2, fieldSystem, 0, 21);
 
     partyMan->selectedMonSlot = param1;
     FieldSystem_StartChildProcess(fieldSystem, &gPokemonPartyAppTemplate, partyMan);
@@ -567,7 +567,7 @@ PokemonSummary *sub_0203D670(FieldSystem *fieldSystem, int heapID, int mode)
     };
 
     saveData = fieldSystem->saveData;
-    v0 = Heap_AllocFromHeapAtEnd(heapID, sizeof(PokemonSummary));
+    v0 = Heap_AllocAtEnd(heapID, sizeof(PokemonSummary));
 
     MI_CpuClear8(v0, sizeof(PokemonSummary));
 
@@ -594,9 +594,9 @@ static const u8 Unk_020EA160[] = {
     0x8
 };
 
-void *FieldSystem_OpenSummaryScreenSelectMove(enum HeapId heapID, FieldSystem *fieldSystem, u8 partySlot)
+void *FieldSystem_OpenSummaryScreenSelectMove(enum HeapID heapID, FieldSystem *fieldSystem, u8 partySlot)
 {
-    PokemonSummary *summary = Heap_AllocFromHeap(heapID, sizeof(PokemonSummary));
+    PokemonSummary *summary = Heap_Alloc(heapID, sizeof(PokemonSummary));
 
     memset(summary, 0, sizeof(PokemonSummary));
 
@@ -683,16 +683,16 @@ void sub_0203D80C(FieldTask *taskMan, u16 *param1, u16 *param2, u16 *param3)
     UnkStruct_0203D764 *v0;
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan);
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, sizeof(UnkStruct_0203D764));
+    v0 = Heap_Alloc(HEAP_ID_FIELD3, sizeof(UnkStruct_0203D764));
     v0->unk_00 = param1;
     v0->unk_04 = param2;
     v0->unk_08 = param3;
 
     if (param3 == NULL) {
-        v0->unk_0C = sub_0209747C(0, 0, fieldSystem->saveData, HEAP_ID_FIELD_TASK);
+        v0->unk_0C = sub_0209747C(0, 0, fieldSystem->saveData, HEAP_ID_FIELD3);
         sub_020974F4(v0->unk_0C, *param2);
     } else {
-        v0->unk_0C = sub_0209747C(1, 0, fieldSystem->saveData, HEAP_ID_FIELD_TASK);
+        v0->unk_0C = sub_0209747C(1, 0, fieldSystem->saveData, HEAP_ID_FIELD3);
         sub_020974F8(v0->unk_0C, *param2, *param3);
     }
 
@@ -734,7 +734,7 @@ void *sub_0203D8AC(FieldSystem *fieldSystem)
     int v2 = 0, v3 = 0;
     FieldOverworldState_GetMapHistory(SaveData_GetFieldOverworldState(fieldSystem->saveData));
 
-    v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0203D8AC));
+    v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_0203D8AC));
 
     sub_0206B70C(fieldSystem, v0, 0);
     sub_0203D884(fieldSystem, v0);
@@ -758,7 +758,7 @@ static void OpenOptionsMenu(FieldSystem *fieldSystem, Options *options)
 
 void *FieldSystem_OpenOptionsMenu(FieldSystem *fieldSystem)
 {
-    OptionsMenu *optionsMenu = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(OptionsMenu));
+    OptionsMenu *optionsMenu = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(OptionsMenu));
     Options *options = SaveData_GetOptions(FieldSystem_GetSaveData(fieldSystem));
     OpenOptionsMenu(fieldSystem, options);
 
@@ -774,7 +774,7 @@ static void sub_0203D910(FieldSystem *fieldSystem, UnkStruct_02097728 *param1)
 
 UnkStruct_02097728 *sub_0203D920(FieldSystem *fieldSystem, int param1, u8 param2, u8 mailType, int unusedHeapID)
 {
-    UnkStruct_02097728 *v0 = sub_02097624(FieldSystem_GetSaveData(fieldSystem), param1, param2, mailType, HEAP_ID_FIELDMAP);
+    UnkStruct_02097728 *v0 = sub_02097624(FieldSystem_GetSaveData(fieldSystem), param1, param2, mailType, HEAP_ID_FIELD2);
     sub_0203D910(fieldSystem, v0);
 
     return v0;
@@ -839,7 +839,7 @@ static UnkStruct_0203DA00 *sub_0203DA00(int heapID, SaveData *saveData, int para
     UnkStruct_02029C68 *v4;
     UnkStruct_02029D04 *v5;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0203DA00));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0203DA00));
     memset(v0, 0, sizeof(UnkStruct_0203DA00));
     v1 = Party_GetPokemonBySlotIndex(SaveData_GetParty(saveData), param2);
 
@@ -891,10 +891,10 @@ static BOOL sub_0203DA64(FieldTask *param0)
 
 void sub_0203DAC0(FieldTask *param0, u16 *param1, SaveData *saveData, u16 param3, u16 param4)
 {
-    UnkStruct_0203DA64 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, sizeof(UnkStruct_0203DA64));
+    UnkStruct_0203DA64 *v0 = Heap_Alloc(HEAP_ID_FIELD3, sizeof(UnkStruct_0203DA64));
     memset(v0, 0, sizeof(UnkStruct_0203DA64));
 
-    v0->unk_0C = sub_0203DA00(HEAP_ID_FIELD_TASK, saveData, param3, &v0->unk_08, param4);
+    v0->unk_0C = sub_0203DA00(HEAP_ID_FIELD3, saveData, param3, &v0->unk_08, param4);
     v0->unk_04 = param1;
 
     FieldTask_InitCall(param0, sub_0203DA64, v0);
@@ -958,9 +958,9 @@ static void sub_0203DB38(UnkStruct_ov88_0223C370 *param0, FieldSystem *fieldSyst
     param0->saveData = fieldSystem->saveData;
     param0->unk_1C = fieldSystem->journalEntry;
     param0->records = SaveData_GetGameRecords(fieldSystem->saveData);
-    param0->unk_38 = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, TrainerInfo_Size());
-    param0->unk_3C = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, Pokemon_GetStructSize());
-    param0->unk_40 = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, Pokemon_GetStructSize());
+    param0->unk_38 = Heap_Alloc(HEAP_ID_FIELD3, TrainerInfo_Size());
+    param0->unk_3C = Heap_Alloc(HEAP_ID_FIELD3, Pokemon_GetStructSize());
+    param0->unk_40 = Heap_Alloc(HEAP_ID_FIELD3, Pokemon_GetStructSize());
     param0->fieldSystem = fieldSystem;
     param0->unk_34 = 0;
 }
@@ -1083,7 +1083,7 @@ BOOL sub_0203DBF0(FieldTask *param0)
 
 void sub_0203DDDC(FieldTask *param0)
 {
-    UnkStruct_0203DBF0 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, sizeof(UnkStruct_0203DBF0));
+    UnkStruct_0203DBF0 *v0 = Heap_Alloc(HEAP_ID_FIELD3, sizeof(UnkStruct_0203DBF0));
 
     v0->unk_00 = 0;
     FieldTask_InitCall(param0, sub_0203DBF0, v0);
@@ -1105,7 +1105,7 @@ const ApplicationManagerTemplate Unk_020EA248 = {
 
 void sub_0203DDFC(FieldSystem *fieldSystem)
 {
-    UnkStruct_0203DDFC *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, sizeof(UnkStruct_0203DDFC));
+    UnkStruct_0203DDFC *v0 = Heap_Alloc(HEAP_ID_FIELD3, sizeof(UnkStruct_0203DDFC));
 
     v0->unk_00 = fieldSystem->unk_80;
     v0->unk_04 = fieldSystem->journalEntry;
@@ -1116,7 +1116,7 @@ void sub_0203DDFC(FieldSystem *fieldSystem)
 
 void *sub_0203DE34(FieldSystem *fieldSystem)
 {
-    UnkStruct_0203DE34 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0203DE34));
+    UnkStruct_0203DE34 *v0 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0203DE34));
 
     v0->saveData = fieldSystem->saveData;
     v0->unk_04 = fieldSystem->unk_80;
@@ -1240,13 +1240,13 @@ void sub_0203DFE8(
 {
     Pokemon *v0;
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
-    UnkStruct_0203DE98 *v2 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0203DE98));
+    UnkStruct_0203DE98 *v2 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_0203DE98));
 
     v2->unk_00 = 0;
     v2->unk_04 = param4;
     v2->unk_08 = param6;
-    v2->unk_0C = NamingScreenArgs_Init(HEAP_ID_FIELDMAP, type, param2, param3, SaveData_GetOptions(fieldSystem->saveData));
-    v2->unk_10 = Strbuf_Init(12, HEAP_ID_FIELDMAP);
+    v2->unk_0C = NamingScreenArgs_Init(HEAP_ID_FIELD2, type, param2, param3, SaveData_GetOptions(fieldSystem->saveData));
+    v2->unk_10 = Strbuf_Init(12, HEAP_ID_FIELD2);
 
     switch (type) {
     case NAMING_SCREEN_TYPE_POKEMON:
@@ -1341,7 +1341,7 @@ void FieldSystem_LaunchGTSApp(FieldSystem *fieldSystem, BOOL connectToWiFi)
         FS_OVERLAY_ID(overlay94)
     };
 
-    GTSPlayerData *playerData = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(GTSPlayerData));
+    GTSPlayerData *playerData = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(GTSPlayerData));
 
     playerData->globalTrade = SaveData_GetGlobalTrade(fieldSystem->saveData);
     playerData->systemData = SaveData_GetSystemData(fieldSystem->saveData);
@@ -1377,7 +1377,7 @@ void *sub_0203E1AC(FieldSystem *fieldSystem, int param1, int param2)
         FS_OVERLAY_ID(overlay96)
     };
 
-    v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0206BC70));
+    v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_0206BC70));
 
     v0->unk_00 = sub_0202D750(fieldSystem->saveData);
     v0->unk_04 = sub_0202D764(fieldSystem->saveData);
@@ -1571,7 +1571,7 @@ void sub_0203E414(FieldTask *task, int slotMachineID)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task);
     Options *options = SaveData_GetOptions(fieldSystem->saveData);
-    UnkStruct_0203E35C *v2 = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, sizeof(UnkStruct_0203E35C));
+    UnkStruct_0203E35C *v2 = Heap_Alloc(HEAP_ID_FIELD3, sizeof(UnkStruct_0203E35C));
 
     v2->unk_0C.unk_00 = &v2->unk_00;
     v2->unk_00 = Coins_GetValue(SaveData_GetCoins(fieldSystem->saveData));
@@ -1656,7 +1656,7 @@ static BOOL FieldTask_AccessoryShop(FieldTask *task)
 void AccessoryShop_Init(FieldTask *task)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task);
-    AccessoryShop *shop = AccessoryShop_New(HEAP_ID_FIELD, fieldSystem->saveData, fieldSystem->bgConfig);
+    AccessoryShop *shop = AccessoryShop_New(HEAP_ID_FIELD1, fieldSystem->saveData, fieldSystem->bgConfig);
 
     FieldTask_InitCall(task, FieldTask_AccessoryShop, shop);
 }
@@ -1671,7 +1671,7 @@ void *sub_0203E53C(FieldSystem *fieldSystem, int heapID, int param2)
         ov102_021D0F50,
         FS_OVERLAY_ID(overlay102),
     };
-    UnkStruct_0203E53C *v1 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0203E53C));
+    UnkStruct_0203E53C *v1 = Heap_Alloc(heapID, sizeof(UnkStruct_0203E53C));
 
     {
         v1->unk_04 = param2;
@@ -1696,7 +1696,7 @@ void *sub_0203E564(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3, i
         FS_OVERLAY_ID(overlay110)
     };
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0203E564));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0203E564));
 
     v0->unk_04 = param1;
     v0->unk_05 = param2;
@@ -1710,7 +1710,7 @@ void *sub_0203E564(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3, i
 
 PartyManagementData *sub_0203E598(FieldSystem *fieldSystem, int heapID, int param2)
 {
-    PartyManagementData *partyMan = Heap_AllocFromHeap(heapID, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_Alloc(heapID, sizeof(PartyManagementData));
     memset(partyMan, 0, sizeof(PartyManagementData));
 
     partyMan->party = SaveData_GetParty(fieldSystem->saveData);
@@ -1743,7 +1743,7 @@ void *sub_0203E608(FieldSystem *fieldSystem, int heapID)
         FS_OVERLAY_ID(overlay111)
     };
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0203E608));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0203E608));
     memset(v0, 0, sizeof(UnkStruct_0203E608));
 
     v0->saveData = fieldSystem->saveData;
@@ -1760,7 +1760,7 @@ static const u8 sTeachMoveSummaryPages[] = {
 
 void *FieldSystem_OpenSummaryScreenTeachMove(int unused, FieldSystem *fieldSystem, u16 partySlot, u16 move)
 {
-    PokemonSummary *summary = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PokemonSummary));
+    PokemonSummary *summary = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PokemonSummary));
 
     summary->monData = Party_GetPokemonBySlotIndex(SaveData_GetParty(fieldSystem->saveData), partySlot);
     summary->options = SaveData_GetOptions(fieldSystem->saveData);
@@ -1794,7 +1794,7 @@ void sub_0203E6C0(FieldSystem *fieldSystem, int param1, int param2)
         FS_OVERLAY_ID(overlay61)
     };
 
-    v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0203E6C0));
+    v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_0203E6C0));
     MI_CpuClear8(v0, sizeof(UnkStruct_0203E6C0));
 
     v0->fieldSystem = fieldSystem;
diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c
index 1b0c879a20..2dd458ea02 100644
--- a/src/unk_020474B8.c
+++ b/src/unk_020474B8.c
@@ -262,7 +262,7 @@ BOOL ScrCmd_BufferSpeciesNameFromVar(ScriptContext *ctx)
     u16 species = ScriptContext_GetVar(ctx);
     u16 v4 = ScriptContext_ReadHalfWord(ctx);
     u8 v5 = ScriptContext_ReadByte(ctx);
-    Strbuf *buffer = GetSpeciesNameStrbuf(species, HEAP_ID_FIELD);
+    Strbuf *buffer = GetSpeciesNameStrbuf(species, HEAP_ID_FIELD1);
 
     StringTemplate_SetStrbuf(*template, bufferId, buffer, v4, v5, GAME_LANGUAGE);
     Strbuf_Free(buffer);
@@ -284,7 +284,7 @@ BOOL ScrCmd_BufferPlayerStarterSpeciesName(ScriptContext *ctx)
     StringTemplate **stringTemplate = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
     u8 templateArg = ScriptContext_ReadByte(ctx);
     u16 species = SystemVars_GetPlayerStarter(SaveData_GetVarsFlags(ctx->fieldSystem->saveData));
-    Strbuf *speciesName = GetSpeciesNameStrbuf(species, HEAP_ID_FIELD);
+    Strbuf *speciesName = GetSpeciesNameStrbuf(species, HEAP_ID_FIELD1);
 
     StringTemplate_SetStrbuf(*stringTemplate, templateArg, speciesName, 0, 1, GAME_LANGUAGE);
     Strbuf_Free(speciesName);
@@ -297,7 +297,7 @@ BOOL ScrCmd_BufferRivalStarterSpeciesName(ScriptContext *ctx)
     StringTemplate **stringTemplate = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
     u8 templateArg = ScriptContext_ReadByte(ctx);
     u16 species = SystemVars_GetRivalStarter(SaveData_GetVarsFlags(ctx->fieldSystem->saveData));
-    Strbuf *speciesName = GetSpeciesNameStrbuf(species, HEAP_ID_FIELD);
+    Strbuf *speciesName = GetSpeciesNameStrbuf(species, HEAP_ID_FIELD1);
 
     StringTemplate_SetStrbuf(*stringTemplate, templateArg, speciesName, 0, 1, GAME_LANGUAGE);
     Strbuf_Free(speciesName);
@@ -310,7 +310,7 @@ BOOL ScrCmd_BufferPlayerCounterpartStarterSpeciesName(ScriptContext *ctx)
     StringTemplate **stringTemplate = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
     u8 templateArg = ScriptContext_ReadByte(ctx);
     u16 species = SystemVars_GetPlayerCounterpartStarter(SaveData_GetVarsFlags(ctx->fieldSystem->saveData));
-    Strbuf *speciesName = GetSpeciesNameStrbuf(species, HEAP_ID_FIELD);
+    Strbuf *speciesName = GetSpeciesNameStrbuf(species, HEAP_ID_FIELD1);
 
     StringTemplate_SetStrbuf(*stringTemplate, templateArg, speciesName, 0, 1, GAME_LANGUAGE);
     Strbuf_Free(speciesName);
@@ -353,7 +353,7 @@ BOOL ScrCmd_BufferUndergroundItemName(ScriptContext *ctx)
 
 BOOL ScrCmd_0E2(ScriptContext *param0)
 {
-    Strbuf *v0 = Strbuf_Init(22, HEAP_ID_FIELD);
+    Strbuf *v0 = Strbuf_Init(22, HEAP_ID_FIELD1);
     StringTemplate **v1 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
     u8 v2 = ScriptContext_ReadByte(param0);
     u16 v3 = ScriptContext_GetVar(param0);
@@ -407,7 +407,7 @@ BOOL ScrCmd_272(ScriptContext *param0)
     StringTemplate **v2 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
     u8 v3 = ScriptContext_ReadByte(param0);
 
-    v0 = Strbuf_Init(10 + 1, HEAP_ID_FIELDMAP);
+    v0 = Strbuf_Init(10 + 1, HEAP_ID_FIELD2);
 
     Strbuf_CopyChars(v0, MiscSaveBlock_TabletName(SaveData_MiscSaveBlock(param0->fieldSystem->saveData)));
     StringTemplate_SetStrbuf(*v2, v3, v0, 0, 0, gGameLanguage);
diff --git a/src/unk_02048BD0.c b/src/unk_02048BD0.c
index 6250cd3bef..4d9183fcbc 100644
--- a/src/unk_02048BD0.c
+++ b/src/unk_02048BD0.c
@@ -80,7 +80,7 @@ BOOL ScrCmd_21D(ScriptContext *param0)
     }
         return 0;
     case 6: {
-        Strbuf *v14 = Strbuf_Init(64, HEAP_ID_FIELD_TASK);
+        Strbuf *v14 = Strbuf_Init(64, HEAP_ID_FIELD3);
         TrainerInfo *v15 = SaveData_GetTrainerInfo(param0->fieldSystem->saveData);
 
         TrainerInfo_NameStrbuf(v15, v14);
diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c
index 85f0dce82d..9af3c5791f 100644
--- a/src/unk_02048DD8.c
+++ b/src/unk_02048DD8.c
@@ -197,7 +197,7 @@ BOOL ScrCmd_27C(ScriptContext *param0)
         Party *party = SaveData_GetParty(param0->fieldSystem->saveData);
         Pokemon *v2 = Party_GetPokemonBySlotIndex(party, ScriptContext_GetVar(param0));
 
-        sub_0206CF48(broadcast, v2, HEAP_ID_FIELD);
+        sub_0206CF48(broadcast, v2, HEAP_ID_FIELD1);
     } break;
     case 1:
         sub_0206CFB4(broadcast, ScriptContext_GetVar(param0));
@@ -254,7 +254,7 @@ static BOOL sub_020491F4(FieldSystem *fieldSystem, int param1)
 
 static void sub_0204922C(StringTemplate *param0, int param1, const u16 *param2, int param3, int param4, int param5)
 {
-    Strbuf *v0 = Strbuf_Init(64, HEAP_ID_FIELD);
+    Strbuf *v0 = Strbuf_Init(64, HEAP_ID_FIELD1);
 
     Strbuf_CopyChars(v0, param2);
     StringTemplate_SetStrbuf(param0, param1, v0, param3, param5, param4);
@@ -281,7 +281,7 @@ static void sub_020492A0(FieldSystem *fieldSystem, StringTemplate *param1)
     TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
     UnkStruct_0202E7E4 *v2 = sub_0202E7E4(broadcast);
 
-    MessageLoader_GetSpeciesName(v2->unk_02, HEAP_ID_FIELD, v0);
+    MessageLoader_GetSpeciesName(v2->unk_02, HEAP_ID_FIELD1, v0);
     sub_0204922C(param1, 0, v0, 0, GAME_LANGUAGE, 1);
 }
 
@@ -291,7 +291,7 @@ static void sub_020492D4(FieldSystem *fieldSystem, StringTemplate *param1)
     TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
     UnkStruct_0202E810 *v2 = sub_0202E810(broadcast);
 
-    MessageLoader_GetSpeciesName(v2->unk_02, HEAP_ID_FIELD, v0);
+    MessageLoader_GetSpeciesName(v2->unk_02, HEAP_ID_FIELD1, v0);
     sub_0204922C(param1, 0, v0, 0, GAME_LANGUAGE, 1);
 }
 
@@ -301,7 +301,7 @@ static void sub_02049308(FieldSystem *fieldSystem, StringTemplate *param1)
     TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
     UnkStruct_0202E81C *v2 = sub_0202E81C(broadcast);
 
-    v0 = Strbuf_Init(64, HEAP_ID_FIELD);
+    v0 = Strbuf_Init(64, HEAP_ID_FIELD1);
 
     Strbuf_CopyChars(v0, v2->unk_06);
     StringTemplate_SetStrbuf(param1, 0, v0, v2->unk_02, 1, GAME_LANGUAGE);
diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c
index f8e9fb4785..321e9b0cbb 100644
--- a/src/unk_02049D08.c
+++ b/src/unk_02049D08.c
@@ -319,10 +319,10 @@ UnkStruct_0204AFC4 *sub_0204A124(SaveData *saveData, u16 param1, u16 param2)
     BattleFrontier *frontier;
     GameRecords *v5;
 
-    v3 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0204AFC4));
+    v3 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0204AFC4));
     MI_CpuClear8(v3, sizeof(UnkStruct_0204AFC4));
 
-    v3->heapID = HEAP_ID_FIELDMAP;
+    v3->heapID = HEAP_ID_FIELD2;
     v3->unk_70 = sub_0202D740(saveData);
     v3->unk_74 = sub_0202D750(saveData);
     v3->unk_00 = 0x12345678;
@@ -696,7 +696,7 @@ void sub_0204A7A4(UnkStruct_0204AFC4 *param0, SaveData *saveData, JournalEntry *
     sub_0204ACC8(param0);
     sub_0204A5EC(param0, saveData, 1, v0);
 
-    if (param0->unk_0F == HEAP_ID_FIELD) {
+    if (param0->unk_0F == HEAP_ID_FIELD1) {
         journalEntryOnlineEvent = JournalEntry_CreateEventBattleRoom(param0->heapID);
         JournalEntry_SaveData(journalEntry, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT);
     }
@@ -1025,7 +1025,7 @@ static void sub_0204ACFC(FrontierPokemonDataDTO *param0, Pokemon *mon)
 
 static void sub_0204AE20(UnkStruct_0204AFC4 *param0, SaveData *saveData, int param2)
 {
-    FrontierPokemonDataDTO *v1 = Heap_AllocFromHeapAtEnd(param0->heapID, sizeof(FrontierPokemonDataDTO) * 3);
+    FrontierPokemonDataDTO *v1 = Heap_AllocAtEnd(param0->heapID, sizeof(FrontierPokemonDataDTO) * 3);
     MI_CpuClear8(v1, sizeof(FrontierPokemonDataDTO) * 3);
     Party *party = SaveData_GetParty(saveData);
 
diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c
index 172d9077ca..b75aed89f9 100644
--- a/src/unk_0204AEE8.c
+++ b/src/unk_0204AEE8.c
@@ -111,11 +111,11 @@ StringTemplate *sub_0204AEE8(SaveData *saveData, u16 param1, u16 param2, u8 para
     StringTemplate *v5;
     MessageLoader *v6;
 
-    v2 = Strbuf_Init(12 + 2, HEAP_ID_FIELD);
-    v3 = Strbuf_Init(2, HEAP_ID_FIELD);
+    v2 = Strbuf_Init(12 + 2, HEAP_ID_FIELD1);
+    v3 = Strbuf_Init(2, HEAP_ID_FIELD1);
     pokedex = SaveData_GetPokedex(saveData);
-    v6 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPECIES_NAME, HEAP_ID_FIELD);
-    v5 = StringTemplate_New(18 + 1, 12 + 2, HEAP_ID_FIELD);
+    v6 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPECIES_NAME, HEAP_ID_FIELD1);
+    v5 = StringTemplate_New(18 + 1, 12 + 2, HEAP_ID_FIELD1);
 
     StringTemplate_SetNumber(v5, 0, param1, 1, 0, 1);
 
diff --git a/src/unk_0204CFFC.c b/src/unk_0204CFFC.c
index e201d3a235..06061711e1 100644
--- a/src/unk_0204CFFC.c
+++ b/src/unk_0204CFFC.c
@@ -41,7 +41,7 @@ BOOL ScrCmd_GivePokemon(ScriptContext *ctx)
     u16 *partyHasRoom = ScriptContext_GetVarPointer(ctx);
 
     playerParty = SaveData_GetParty(fieldSystem->saveData);
-    *partyHasRoom = Pokemon_GiveMonFromScript(HEAP_ID_FIELDMAP, fieldSystem->saveData, species, level, heldItem, metLocation, metTerrain);
+    *partyHasRoom = Pokemon_GiveMonFromScript(HEAP_ID_FIELD2, fieldSystem->saveData, species, level, heldItem, metLocation, metTerrain);
 
     return FALSE;
 }
@@ -102,7 +102,7 @@ BOOL ScrCmd_GiveEgg(ScriptContext *ctx)
     partyCount = Party_GetCurrentCount(playerParty);
 
     if (partyCount < 6) {
-        egg = Pokemon_New(HEAP_ID_FIELDMAP);
+        egg = Pokemon_New(HEAP_ID_FIELD2);
         Pokemon_Init(egg);
 
         specialMetLoc = SpecialMetLoc_GetId(1, eggGiver);
@@ -306,7 +306,7 @@ BOOL ScrCmd_1BA(ScriptContext *param0)
     v4 = Pokemon_GetValue(v1, MON_DATA_FRIENDSHIP, NULL);
 
     if (v2 > 0) {
-        if (Item_LoadParam(Pokemon_GetValue(v1, MON_DATA_HELD_ITEM, NULL), ITEM_PARAM_HOLD_EFFECT, HEAP_ID_FIELDMAP) == 53) {
+        if (Item_LoadParam(Pokemon_GetValue(v1, MON_DATA_HELD_ITEM, NULL), ITEM_PARAM_HOLD_EFFECT, HEAP_ID_FIELD2) == 53) {
             v2 = v2 * 150 / 100;
         }
 
diff --git a/src/unk_0204E240.c b/src/unk_0204E240.c
index da0a97b7fe..6322ad93fb 100644
--- a/src/unk_0204E240.c
+++ b/src/unk_0204E240.c
@@ -27,7 +27,7 @@ BOOL ScrCmd_1F1(ScriptContext *param0)
     u16 *v4 = ScriptContext_GetVarPointer(param0);
 
     for (v1 = 0, v3 = 0; v1 < 7; v1++) {
-        v3 += Bag_GetItemQuantity(SaveData_GetBag(fieldSystem->saveData), Unk_020EBFFC[v1][0], HEAP_ID_FIELD);
+        v3 += Bag_GetItemQuantity(SaveData_GetBag(fieldSystem->saveData), Unk_020EBFFC[v1][0], HEAP_ID_FIELD1);
     }
 
     *v4 = v3;
@@ -66,7 +66,7 @@ BOOL ScrCmd_1F5(ScriptContext *param0)
     *v5 = 0;
 
     for (v1 = 0, v3 = 0; v1 < 7; v1++) {
-        v3 += Bag_GetItemQuantity(SaveData_GetBag(fieldSystem->saveData), Unk_020EBFFC[v1][0], HEAP_ID_FIELD);
+        v3 += Bag_GetItemQuantity(SaveData_GetBag(fieldSystem->saveData), Unk_020EBFFC[v1][0], HEAP_ID_FIELD1);
 
         if (v3 >= v6) {
             *v4 = Unk_020EBFFC[v1][0];
diff --git a/src/unk_0204EDA4.c b/src/unk_0204EDA4.c
index 65d5f006fe..325717598e 100644
--- a/src/unk_0204EDA4.c
+++ b/src/unk_0204EDA4.c
@@ -25,7 +25,7 @@ BOOL ScrCmd_SelectPartyMonMove(ScriptContext *ctx)
 {
     u16 partySlot = ScriptContext_GetVar(ctx);
     void **partyData = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
-    *partyData = FieldSystem_OpenSummaryScreenSelectMove(HEAP_ID_FIELD_TASK, ctx->fieldSystem, partySlot);
+    *partyData = FieldSystem_OpenSummaryScreenSelectMove(HEAP_ID_FIELD3, ctx->fieldSystem, partySlot);
 
     ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit);
     return TRUE;
@@ -61,7 +61,7 @@ BOOL ScrCmd_21F(ScriptContext *param0)
     u16 v3 = ScriptContext_GetVar(param0);
 
     mon = Party_GetPokemonBySlotIndex(SaveData_GetParty(param0->fieldSystem->saveData), v3);
-    v1 = sub_020997D8(mon, HEAP_ID_FIELD_TASK);
+    v1 = sub_020997D8(mon, HEAP_ID_FIELD3);
     *v2 = sub_020998D8(v1);
 
     Heap_Free(v1);
@@ -71,7 +71,7 @@ BOOL ScrCmd_21F(ScriptContext *param0)
 static void sub_0204EE90(ScriptContext *param0, u16 param1, Pokemon *param2, u16 *param3)
 {
     void **v0 = FieldSystem_GetScriptMemberPtr(param0->fieldSystem, 19);
-    UnkStruct_020997B8 *v1 = sub_020997B8(HEAP_ID_FIELD_TASK);
+    UnkStruct_020997B8 *v1 = sub_020997B8(HEAP_ID_FIELD3);
     *v0 = v1;
 
     v1->unk_00 = param2;
@@ -97,7 +97,7 @@ BOOL ScrCmd_221(ScriptContext *param0)
     u16 *v2;
 
     mon = Party_GetPokemonBySlotIndex(SaveData_GetParty(param0->fieldSystem->saveData), v1);
-    v2 = sub_020997D8(mon, HEAP_ID_FIELD_TASK);
+    v2 = sub_020997D8(mon, HEAP_ID_FIELD3);
 
     sub_0204EE90(param0, 1, mon, v2);
 
@@ -112,7 +112,7 @@ BOOL ScrCmd_224(ScriptContext *param0)
     u16 *v3;
 
     v0 = Party_GetPokemonBySlotIndex(SaveData_GetParty(param0->fieldSystem->saveData), v1);
-    v3 = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, (1 + 1) * 2);
+    v3 = Heap_Alloc(HEAP_ID_FIELD3, (1 + 1) * 2);
 
     *(v3 + 0) = v2;
     *(v3 + 1) = 0xffff;
diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c
index 1eabed9f3d..67f0fb0f22 100644
--- a/src/unk_0204F13C.c
+++ b/src/unk_0204F13C.c
@@ -236,7 +236,7 @@ BOOL ScrCmd_2CF(ScriptContext *param0)
 
 void sub_0204F3D0(FieldTask *param0, u16 param1, u16 *param2)
 {
-    UnkStruct_0204F3D0 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0204F3D0));
+    UnkStruct_0204F3D0 *v0 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0204F3D0));
     memset(v0, 0, sizeof(UnkStruct_0204F3D0));
 
     v0->unk_04 = param1;
@@ -285,7 +285,7 @@ static BOOL sub_0204F414(FieldTask *param0)
 void sub_0204F470(FieldTask *param0, void **param1, u8 param2)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
-    UnkStruct_0204F470 *v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0204F470));
+    UnkStruct_0204F470 *v1 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0204F470));
     MI_CpuClear8(v1, sizeof(UnkStruct_0204F470));
 
     v1->unk_04 = param2;
@@ -310,7 +310,7 @@ static BOOL sub_0204F4A4(FieldTask *param0)
         break;
 
     case UnkEnum_0204F13C_3:
-        v1->unk_00 = sub_0204F628(v1, fieldSystem, HEAP_ID_FIELDMAP);
+        v1->unk_00 = sub_0204F628(v1, fieldSystem, HEAP_ID_FIELD2);
         break;
 
     case UnkEnum_0204F13C_4:
@@ -329,7 +329,7 @@ static int sub_0204F50C(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, in
 {
     u8 v0;
 
-    PartyManagementData *partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PartyManagementData));
     MI_CpuClearFast(partyMan, sizeof(PartyManagementData));
 
     partyMan->party = SaveData_GetParty(fieldSystem->saveData);
@@ -415,7 +415,7 @@ static int sub_0204F628(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, in
 
     saveData = fieldSystem->saveData;
 
-    v0 = Heap_AllocFromHeapAtEnd(heapID, sizeof(PokemonSummary));
+    v0 = Heap_AllocAtEnd(heapID, sizeof(PokemonSummary));
     MI_CpuClear8(v0, sizeof(PokemonSummary));
 
     v0->options = SaveData_GetOptions(saveData);
diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c
index 009fb57f75..49388a8fab 100644
--- a/src/unk_0204FAB4.c
+++ b/src/unk_0204FAB4.c
@@ -161,7 +161,7 @@ BOOL ScrCmd_2D3(ScriptContext *param0)
 
 static void sub_0204FCF8(FieldTask *param0, u16 param1, u16 param2, u16 *param3)
 {
-    UnkStruct_0204FCF8 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0204FCF8));
+    UnkStruct_0204FCF8 *v0 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0204FCF8));
     memset(v0, 0, sizeof(UnkStruct_0204FCF8));
 
     v0->unk_04[0] = param1;
@@ -210,7 +210,7 @@ static BOOL sub_0204FD38(FieldTask *param0)
 static void sub_0204FDB4(FieldTask *param0, void **param1, u8 param2)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
-    UnkStruct_0204FE50 *v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0204FE50));
+    UnkStruct_0204FE50 *v1 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0204FE50));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_0204FE50));
 
@@ -234,7 +234,7 @@ static BOOL sub_0204FDE8(FieldTask *param0)
         v1->unk_00 = sub_0204FF1C(v1, fieldSystem);
         break;
     case 2:
-        v1->unk_00 = sub_0204FF6C(v1, fieldSystem, HEAP_ID_FIELDMAP);
+        v1->unk_00 = sub_0204FF6C(v1, fieldSystem, HEAP_ID_FIELD2);
         break;
     case 3:
         v1->unk_00 = sub_0204FFF4(v1, fieldSystem);
@@ -250,7 +250,7 @@ static BOOL sub_0204FDE8(FieldTask *param0)
 static int sub_0204FE50(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, int param2)
 {
     u8 v0;
-    PartyManagementData *partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PartyManagementData));
 
     MI_CpuClearFast(partyMan, sizeof(PartyManagementData));
 
@@ -321,7 +321,7 @@ static int sub_0204FF6C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, in
     };
 
     saveData = fieldSystem->saveData;
-    v0 = Heap_AllocFromHeapAtEnd(heapID, sizeof(PokemonSummary));
+    v0 = Heap_AllocAtEnd(heapID, sizeof(PokemonSummary));
 
     MI_CpuClear8(v0, sizeof(PokemonSummary));
 
diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c
index a4ad944f54..c873ee88a8 100644
--- a/src/unk_0205003C.c
+++ b/src/unk_0205003C.c
@@ -153,7 +153,7 @@ BOOL ScrCmd_2DA(ScriptContext *param0)
 
 void sub_02050224(FieldTask *param0, u16 param1, u16 param2, u16 *param3)
 {
-    UnkStruct_02050224 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_02050224));
+    UnkStruct_02050224 *v0 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_02050224));
     memset(v0, 0, sizeof(UnkStruct_02050224));
 
     v0->unk_04[0] = param1;
@@ -200,7 +200,7 @@ static BOOL sub_02050264(FieldTask *param0)
 void sub_020502E0(FieldTask *param0, void **param1, u8 param2)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
-    UnkStruct_0205037C *v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0205037C));
+    UnkStruct_0205037C *v1 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0205037C));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_0205037C));
 
@@ -224,7 +224,7 @@ static BOOL sub_02050314(FieldTask *param0)
         v1->unk_00 = sub_02050448(v1, fieldSystem);
         break;
     case 2:
-        v1->unk_00 = sub_02050498(v1, fieldSystem, HEAP_ID_FIELDMAP);
+        v1->unk_00 = sub_02050498(v1, fieldSystem, HEAP_ID_FIELD2);
         break;
     case 3:
         v1->unk_00 = sub_02050520(v1, fieldSystem);
@@ -240,7 +240,7 @@ static BOOL sub_02050314(FieldTask *param0)
 static int sub_0205037C(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, int param2)
 {
     u8 v0;
-    PartyManagementData *partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PartyManagementData));
 
     MI_CpuClearFast(partyMan, sizeof(PartyManagementData));
 
@@ -309,7 +309,7 @@ static int sub_02050498(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, in
     };
 
     saveData = fieldSystem->saveData;
-    v0 = Heap_AllocFromHeapAtEnd(heapID, sizeof(PokemonSummary));
+    v0 = Heap_AllocAtEnd(heapID, sizeof(PokemonSummary));
 
     MI_CpuClear8(v0, sizeof(PokemonSummary));
 
diff --git a/src/unk_02050568.c b/src/unk_02050568.c
index 2c614cf1b8..6e0fba1f60 100644
--- a/src/unk_02050568.c
+++ b/src/unk_02050568.c
@@ -40,7 +40,7 @@ static void sub_0205075C(FieldSystem *fieldSystem);
 
 void sub_02050568(FieldSystem *fieldSystem)
 {
-    UnkStruct_02050568 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_02050568));
+    UnkStruct_02050568 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_02050568));
 
     memset(v0, 0, sizeof(UnkStruct_02050568));
     FieldTask_InitCall(fieldSystem->task, sub_020505A0, v0);
@@ -82,7 +82,7 @@ static BOOL sub_020505A0(FieldTask *taskMan)
     case 4:
         sub_0205074C(fieldSystem->playerAvatar, 1);
         sub_0205075C(fieldSystem);
-        sub_02056B30(taskMan, 3, 17, 0xffff, 0x0, 6, 1, HEAP_ID_FIELDMAP);
+        sub_02056B30(taskMan, 3, 17, 0xffff, 0x0, 6, 1, HEAP_ID_FIELD2);
         Sound_PlayEffect(SEQ_SE_DP_KASYA);
         v1->unk_08++;
         break;
@@ -92,7 +92,7 @@ static BOOL sub_020505A0(FieldTask *taskMan)
         }
         break;
     case 6:
-        sub_02056B30(taskMan, 3, 16, 0xffff, 0x0, 6, 1, HEAP_ID_FIELDMAP);
+        sub_02056B30(taskMan, 3, 16, 0xffff, 0x0, 6, 1, HEAP_ID_FIELD2);
         Sound_PlayEffect(SEQ_SE_DP_KASYA);
         v1->unk_08++;
         break;
diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c
index 61ae43d86d..8bf0338323 100644
--- a/src/unk_020528D0.c
+++ b/src/unk_020528D0.c
@@ -99,12 +99,12 @@ static void sub_020528D0(BgConfig *param0)
     GXLayers_SetBanks(&v0);
     SetAllGraphicsModes(&v1);
     Bg_InitFromTemplate(param0, BG_LAYER_MAIN_3, &v2, 0);
-    Graphics_LoadPalette(NARC_INDEX_GRAPHIC__PL_FONT, 6, 0, 13 * 0x20, 0x20, HEAP_ID_FIELDMAP);
+    Graphics_LoadPalette(NARC_INDEX_GRAPHIC__PL_FONT, 6, 0, 13 * 0x20, 0x20, HEAP_ID_FIELD2);
 }
 
 static void sub_02052914(FieldSystem *fieldSystem, FieldTask *task)
 {
-    UnkStruct_02052AA4 *v0 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_02052AA4));
+    UnkStruct_02052AA4 *v0 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_02052AA4));
 
     if (v0 == NULL) {
         GF_ASSERT(FALSE);
@@ -114,12 +114,12 @@ static void sub_02052914(FieldSystem *fieldSystem, FieldTask *task)
 
     v0->unk_00 = 0;
     v0->fieldSystem = fieldSystem;
-    v0->unk_08 = BgConfig_New(HEAP_ID_FIELDMAP);
+    v0->unk_08 = BgConfig_New(HEAP_ID_FIELD2);
 
     sub_020528D0(v0->unk_08);
 
-    v0->unk_1C = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_BLACK_OUT_SCENE, HEAP_ID_FIELDMAP);
-    v0->unk_20 = StringTemplate_Default(HEAP_ID_FIELDMAP);
+    v0->unk_1C = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_BLACK_OUT_SCENE, HEAP_ID_FIELD2);
+    v0->unk_20 = StringTemplate_Default(HEAP_ID_FIELD2);
 
     Window_AddFromTemplate(v0->unk_08, &v0->unk_0C, &Unk_020EC2F0);
     StringTemplate_SetPlayerName(v0->unk_20, 0, SaveData_GetTrainerInfo(FieldSystem_GetSaveData(fieldSystem)));
@@ -142,7 +142,7 @@ static BOOL sub_020529C4(FieldTask *task)
 
     switch (v0->unk_00) {
     case 0:
-        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_MAX, COLOR_BLACK, 8, 1, HEAP_ID_FIELD_TASK);
+        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_MAX, COLOR_BLACK, 8, 1, HEAP_ID_FIELD3);
         v0->unk_00++;
         break;
     case 1:
@@ -152,7 +152,7 @@ static BOOL sub_020529C4(FieldTask *task)
         break;
     case 2:
         if ((gSystem.pressedKeys & PAD_BUTTON_A) || (gSystem.pressedKeys & PAD_BUTTON_B)) {
-            StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD_TASK);
+            StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD3);
             v0->unk_00++;
         }
         break;
@@ -179,8 +179,8 @@ static BOOL sub_020529C4(FieldTask *task)
 
 static void sub_02052AA4(UnkStruct_02052AA4 *param0, u16 param1, u8 param2, u8 param3)
 {
-    Strbuf *v0 = Strbuf_Init(1024, HEAP_ID_FIELDMAP);
-    Strbuf *v1 = Strbuf_Init(1024, HEAP_ID_FIELDMAP);
+    Strbuf *v0 = Strbuf_Init(1024, HEAP_ID_FIELD2);
+    Strbuf *v1 = Strbuf_Init(1024, HEAP_ID_FIELD2);
 
     Window_FillTilemap(&param0->unk_0C, 0);
     MessageLoader_GetStrbuf(param0->unk_1C, param1, v0);
diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c
index 261e21a951..9cfc4ef76f 100644
--- a/src/unk_02052C6C.c
+++ b/src/unk_02052C6C.c
@@ -98,9 +98,9 @@ static BOOL sub_02052CBC(FieldTask *param0)
         break;
     case 1:
         if (!FieldSystem_IsRunningApplication(fieldSystem)) {
-            Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_FIELD, 0x20000);
+            Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_FIELD1, 0x20000);
             sub_02052F28(fieldSystem, v3);
-            StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 8, 1, HEAP_ID_FIELD_TASK);
+            StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 8, 1, HEAP_ID_FIELD3);
             (*v4)++;
         }
         break;
@@ -145,7 +145,7 @@ static BOOL sub_02052CBC(FieldTask *param0)
         }
         break;
     case 7:
-        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD_TASK);
+        StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD3);
         (*v4)++;
         break;
     case 8:
@@ -158,7 +158,7 @@ static BOOL sub_02052CBC(FieldTask *param0)
     case 9:
         if (!FieldSystem_IsRunningApplication(fieldSystem)) {
             Heap_Free(v3);
-            Heap_Destroy(HEAP_ID_FIELD);
+            Heap_Destroy(HEAP_ID_FIELD1);
             OS_ResetSystem(0);
             return 1;
         }
@@ -179,7 +179,7 @@ void sub_02052E58(FieldTask *param0)
     Party *v7;
 
     fieldSystem = FieldTask_GetFieldSystem(param0);
-    v5 = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, sizeof(UnkStruct_0205300C));
+    v5 = Heap_Alloc(HEAP_ID_FIELD3, sizeof(UnkStruct_0205300C));
     v3 = SaveData_GetVarsFlags(fieldSystem->saveData);
     v4 = SaveData_GetTrainerInfo(fieldSystem->saveData);
     v1 = FieldOverworldState_GetSpecialLocation(SaveData_GetFieldOverworldState(fieldSystem->saveData));
@@ -258,7 +258,7 @@ static void sub_02052F28(FieldSystem *fieldSystem, UnkStruct_0205300C *param1)
     SetAllGraphicsModes(&v1);
     Bg_MaskPalette(BG_LAYER_MAIN_3, 0x0);
     Bg_InitFromTemplate(fieldSystem->bgConfig, BG_LAYER_MAIN_3, &v2, 0);
-    Bg_ClearTilesRange(BG_LAYER_MAIN_3, 0x20, 0, HEAP_ID_FIELD_TASK);
+    Bg_ClearTilesRange(BG_LAYER_MAIN_3, 0x20, 0, HEAP_ID_FIELD3);
     Bg_FillTilemapRect(fieldSystem->bgConfig, 3, 0x0, 0, 0, 32, 32, 17);
     Bg_CopyTilemapBufferToVRAM(fieldSystem->bgConfig, 3);
 }
@@ -290,14 +290,14 @@ static void sub_0205300C(UnkStruct_0205300C *param0)
 
 static void sub_02053028(FieldSystem *fieldSystem, UnkStruct_0205300C *param1, int param2)
 {
-    MessageLoader *v0 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_COMMON_STRINGS, HEAP_ID_FIELD);
+    MessageLoader *v0 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_COMMON_STRINGS, HEAP_ID_FIELD1);
 
     if (param2 == 2) {
         StringTemplate *v1;
 
-        v1 = StringTemplate_Default(HEAP_ID_FIELD);
+        v1 = StringTemplate_Default(HEAP_ID_FIELD1);
         StringTemplate_SetPlayerName(v1, 0, SaveData_GetTrainerInfo(fieldSystem->saveData));
-        param1->unk_2C = MessageUtil_ExpandedStrbuf(v1, v0, 16, HEAP_ID_FIELD);
+        param1->unk_2C = MessageUtil_ExpandedStrbuf(v1, v0, 16, HEAP_ID_FIELD1);
         StringTemplate_Free(v1);
     } else {
         param1->unk_2C = MessageLoader_GetNewStrbuf(v0, 18);
diff --git a/src/unk_02054884.c b/src/unk_02054884.c
index e7118b5ac4..a422f62712 100644
--- a/src/unk_02054884.c
+++ b/src/unk_02054884.c
@@ -29,7 +29,7 @@ BOOL Pokemon_CanBattle(Pokemon *mon)
     return !Pokemon_GetValue(mon, MON_DATA_IS_EGG, NULL);
 }
 
-BOOL Pokemon_GiveMonFromScript(enum HeapId heapID, SaveData *saveData, u16 species, u8 level, u16 heldItem, int metLocation, int metTerrain)
+BOOL Pokemon_GiveMonFromScript(enum HeapID heapID, SaveData *saveData, u16 species, u8 level, u16 heldItem, int metLocation, int metTerrain)
 {
     BOOL result;
     Pokemon *mon;
@@ -63,7 +63,7 @@ BOOL sub_02054930(int unused, SaveData *saveData, u16 param2, u8 param3, int par
     BOOL result;
     TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(saveData);
     Party *party = SaveData_GetParty(saveData);
-    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD_TASK);
+    Pokemon *mon = Pokemon_New(HEAP_ID_FIELD3);
 
     Pokemon_Init(mon);
 
diff --git a/src/unk_02055C50.c b/src/unk_02055C50.c
index 8f59738984..f0eff3b316 100644
--- a/src/unk_02055C50.c
+++ b/src/unk_02055C50.c
@@ -85,7 +85,7 @@ static int sub_02055C80(int param0)
 
 UnkStruct_02055CBC *sub_02055C8C(FieldSystem *fieldSystem, int heapID)
 {
-    UnkStruct_02055CBC *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02055CBC));
+    UnkStruct_02055CBC *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02055CBC));
     MI_CpuClear8(v0, sizeof(UnkStruct_02055CBC));
 
     v0->heapID = heapID;
@@ -124,7 +124,7 @@ static void sub_02055D14(FieldSystem *fieldSystem, UnkStruct_02055CBC *param1)
     UnkStruct_ov5_021DF47C *v0 = fieldSystem->unk_40;
     u32 v1 = ov5_021DF5A8(v0, 17);
 
-    param1->unk_60 = Heap_AllocFromHeap(param1->heapID, v1);
+    param1->unk_60 = Heap_Alloc(param1->heapID, v1);
 
     ov5_021DF5B4(v0, 17, param1->unk_60);
     Easy3D_InitRenderObjFromResource(&param1->unk_08, &param1->unk_5C, &param1->unk_60);
@@ -178,7 +178,7 @@ BOOL sub_02055E00(FieldSystem *fieldSystem, MapObject *param1)
     BerryPatches_HarvestPatch(v3, v0);
     sub_02067834(param1);
 
-    return Bag_TryAddItem(SaveData_GetBag(fieldSystem->saveData), sub_02055C50(v2), v1, HEAP_ID_FIELD);
+    return Bag_TryAddItem(SaveData_GetBag(fieldSystem->saveData), sub_02055C50(v2), v1, HEAP_ID_FIELD1);
 }
 
 void sub_02055E80(FieldSystem *fieldSystem, MapObject *param1, u16 param2)
@@ -453,7 +453,7 @@ static BOOL sub_02056124(FieldTask *taskMan)
 
 void sub_020562AC(FieldSystem *fieldSystem)
 {
-    UnkStruct_020562AC *v0 = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, sizeof(UnkStruct_020562AC));
+    UnkStruct_020562AC *v0 = Heap_Alloc(HEAP_ID_FIELD3, sizeof(UnkStruct_020562AC));
 
     v0->unk_00 = 0;
     v0->unk_0C = NULL;
diff --git a/src/unk_02056B30.c b/src/unk_02056B30.c
index 1751c26781..ea140dd5ff 100644
--- a/src/unk_02056B30.c
+++ b/src/unk_02056B30.c
@@ -102,7 +102,7 @@ static const UnkFuncPtr_020EC57C Unk_020EC57C[7] = {
 
 void sub_02056B30(FieldTask *taskMan, int param1, int param2, int param3, u16 param4, int param5, int param6, int heapID)
 {
-    UnkStruct_02056B30 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02056B30));
+    UnkStruct_02056B30 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_02056B30));
 
     v0->unk_04 = param1;
     v0->unk_08 = param2;
@@ -140,7 +140,7 @@ static BOOL sub_02056B70(FieldTask *taskMan)
 
 void sub_02056BDC(FieldSystem *fieldSystem, const int param1, const int param2, const int param3, const int param4, const int param5, const int param6)
 {
-    UnkStruct_02056BDC *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_02056BDC));
+    UnkStruct_02056BDC *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_02056BDC));
 
     v0->unk_00 = 0;
     v0->unk_04 = 0;
@@ -156,7 +156,7 @@ void sub_02056C18(FieldSystem *fieldSystem, const int param1, const int param2,
 {
     int v0;
     int v1;
-    UnkStruct_02056BDC *v2 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_02056BDC));
+    UnkStruct_02056BDC *v2 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_02056BDC));
 
     v2->unk_00 = 0;
     v2->unk_04 = 0;
diff --git a/src/unk_0205749C.c b/src/unk_0205749C.c
index 189d4579e1..5293a33362 100644
--- a/src/unk_0205749C.c
+++ b/src/unk_0205749C.c
@@ -29,7 +29,7 @@ static const ApplicationManagerTemplate Unk_020ED4CC = {
 
 void sub_0205749C(FieldTask *param0, BOOL param1)
 {
-    UnkStruct_0205749C *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0205749C));
+    UnkStruct_0205749C *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_0205749C));
     memset(v0, 0, sizeof(UnkStruct_0205749C));
 
     v0->unk_02 = param1;
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index 58bb0601ef..eb2a4d096b 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -124,7 +124,7 @@ static void sub_0205A0D8(UnkStruct_0205A0D8 *param0, FieldSystem *fieldSystem, P
     };
 
     saveData = fieldSystem->saveData;
-    v0 = Heap_AllocFromHeapAtEnd(heapID, sizeof(PokemonSummary));
+    v0 = Heap_AllocAtEnd(heapID, sizeof(PokemonSummary));
 
     MI_CpuClear8(v0, sizeof(PokemonSummary));
     PokemonSummaryScreen_SetPlayerProfile(v0, SaveData_GetTrainerInfo(fieldSystem->saveData));
@@ -149,7 +149,7 @@ static void sub_0205A0D8(UnkStruct_0205A0D8 *param0, FieldSystem *fieldSystem, P
 static void sub_0205A164(UnkStruct_0205A0D8 *param0, int heapID)
 {
     int v0;
-    PartyManagementData *partyMan = Heap_AllocFromHeap(heapID, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_Alloc(heapID, sizeof(PartyManagementData));
 
     MI_CpuClear8(partyMan, sizeof(PartyManagementData));
 
@@ -355,7 +355,7 @@ static BOOL sub_0205A324(FieldTask *param0)
         break;
     case 15:
         sub_0205AAA0(v0, 0);
-        sub_0205A164(v0, HEAP_ID_FIELDMAP);
+        sub_0205A164(v0, HEAP_ID_FIELD2);
         v0->unk_34 = 16;
         break;
     case 16:
@@ -374,7 +374,7 @@ static BOOL sub_0205A324(FieldTask *param0)
         }
         break;
     case 17:
-        sub_0205A0D8(v0, v0->fieldSystem, SaveData_GetParty(v0->fieldSystem->saveData), v0->unk_3C, 0, HEAP_ID_FIELDMAP);
+        sub_0205A0D8(v0, v0->fieldSystem, SaveData_GetParty(v0->fieldSystem->saveData), v0->unk_3C, 0, HEAP_ID_FIELD2);
         v0->unk_34 = 18;
         break;
     case 18:
@@ -549,7 +549,7 @@ static BOOL sub_0205A324(FieldTask *param0)
     case 33:
         if (IsScreenFadeDone()) {
             sub_0205AAA0(v0, 0);
-            sub_0205A0D8(v0, v0->fieldSystem, v0->unk_50, v0->unk_84, 1, HEAP_ID_FIELDMAP);
+            sub_0205A0D8(v0, v0->fieldSystem, v0->unk_50, v0->unk_84, 1, HEAP_ID_FIELD2);
             v0->unk_34 = 34;
         }
         break;
@@ -658,22 +658,22 @@ void sub_0205AB10(FieldSystem *fieldSystem, UnkFuncPtr_0205AB10 *param1)
         return;
     }
 
-    v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0205A0D8));
+    v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_0205A0D8));
     MI_CpuClear8(v0, sizeof(UnkStruct_0205A0D8));
 
     v0->unk_43 = 5;
     v0->fieldSystem = fieldSystem;
     v0->unk_08 = param1;
-    v0->unk_28 = StringTemplate_Default(HEAP_ID_FIELDMAP);
-    v0->unk_2C = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0011, HEAP_ID_FIELDMAP);
-    v0->unk_0C = Strbuf_Init((100 * 2), HEAP_ID_FIELDMAP);
-    v0->unk_10 = Strbuf_Init((100 * 2), HEAP_ID_FIELDMAP);
+    v0->unk_28 = StringTemplate_Default(HEAP_ID_FIELD2);
+    v0->unk_2C = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0011, HEAP_ID_FIELD2);
+    v0->unk_0C = Strbuf_Init((100 * 2), HEAP_ID_FIELD2);
+    v0->unk_10 = Strbuf_Init((100 * 2), HEAP_ID_FIELD2);
 
     Window_Init(&v0->unk_14);
     Window_Init(&v0->unk_54);
     Window_Init(&v0->unk_64);
 
-    v0->unk_78 = ColoredArrow_New(HEAP_ID_FIELDMAP);
+    v0->unk_78 = ColoredArrow_New(HEAP_ID_FIELD2);
     v0->unk_88 = sub_0203895C();
     v0->unk_4C = NULL;
     v0->unk_48 = NULL;
@@ -686,9 +686,9 @@ void sub_0205AB10(FieldSystem *fieldSystem, UnkFuncPtr_0205AB10 *param1)
     case 3: {
         u32 v2 = sub_0205B0E4();
 
-        v0->unk_4C = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, v2);
-        v0->unk_48 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, v2);
-        v0->unk_50 = Party_New(HEAP_ID_FIELDMAP);
+        v0->unk_4C = Heap_AllocAtEnd(HEAP_ID_FIELD2, v2);
+        v0->unk_48 = Heap_AllocAtEnd(HEAP_ID_FIELD2, v2);
+        v0->unk_50 = Party_New(HEAP_ID_FIELD2);
 
         Party_InitWithCapacity(v0->unk_50, 3);
 
@@ -866,11 +866,11 @@ static void sub_0205ADF8(UnkStruct_0205A0D8 *param0, int param1)
         int v1, v2, v3;
         MessageLoader *v4;
 
-        v4 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPECIES_NAME, HEAP_ID_FIELD);
+        v4 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPECIES_NAME, HEAP_ID_FIELD1);
         v3 = Pokemon_GetStructSize();
 
         Window_Add(param0->fieldSystem->bgConfig, v0, 3, 21, 9, 10, 8, 13, 10);
-        LoadStandardWindowGraphics(param0->fieldSystem->bgConfig, 3, 1, 11, 0, HEAP_ID_FIELD);
+        LoadStandardWindowGraphics(param0->fieldSystem->bgConfig, 3, 1, 11, 0, HEAP_ID_FIELD1);
         Window_FillTilemap(v0, 15);
 
         for (v1 = 0; v1 < 3; v1++) {
@@ -902,7 +902,7 @@ static void sub_0205AF18(UnkStruct_0205A0D8 *param0, int param1)
         int v1;
 
         Window_Add(param0->fieldSystem->bgConfig, v0, 3, 20, 11, 11, 6, 13, 90);
-        LoadStandardWindowGraphics(param0->fieldSystem->bgConfig, 3, 1, 11, 0, HEAP_ID_FIELD);
+        LoadStandardWindowGraphics(param0->fieldSystem->bgConfig, 3, 1, 11, 0, HEAP_ID_FIELD1);
         Window_FillTilemap(v0, 15);
 
         for (v1 = 0; v1 < 3; v1++) {
@@ -1007,10 +1007,10 @@ static BOOL sub_0205B140(FieldTask *param0)
 
     switch (v1->unk_28) {
     case 0:
-        v1->unk_18 = StringTemplate_Default(HEAP_ID_FIELD);
-        v1->unk_1C = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0011, HEAP_ID_FIELD);
-        v1->unk_00 = Strbuf_Init((100 * 2), HEAP_ID_FIELD);
-        v1->unk_04 = Strbuf_Init((100 * 2), HEAP_ID_FIELD);
+        v1->unk_18 = StringTemplate_Default(HEAP_ID_FIELD1);
+        v1->unk_1C = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0011, HEAP_ID_FIELD1);
+        v1->unk_00 = Strbuf_Init((100 * 2), HEAP_ID_FIELD1);
+        v1->unk_04 = Strbuf_Init((100 * 2), HEAP_ID_FIELD1);
 
         MessageLoader_GetStrbuf(v1->unk_1C, 2 + v2->stars, v1->unk_00);
         StringTemplate_SetPlayerName(v1->unk_18, 0, CommInfo_TrainerInfo(v1->unk_24));
@@ -1084,7 +1084,7 @@ void sub_0205B2D4(FieldSystem *fieldSystem)
         }
 
         if ((v2 == CommPlayer_XPos(v0)) && (v3 == CommPlayer_ZPos(v0))) {
-            UnkStruct_0205B2D4 *v4 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0205B2D4));
+            UnkStruct_0205B2D4 *v4 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_0205B2D4));
 
             v4->unk_24 = v0;
             v4->unk_28 = 0;
diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c
index 2894b1da43..7131fae3bd 100644
--- a/src/unk_0205B33C.c
+++ b/src/unk_0205B33C.c
@@ -152,7 +152,7 @@ static UnkStruct_0205B43C *sub_0205B3A0(FieldSystem *fieldSystem)
     saveData = FieldSystem_GetSaveData(fieldSystem);
     sub_020369EC(saveData);
 
-    v2 = (UnkStruct_0205B43C *)Heap_AllocFromHeap(HEAP_ID_31, sizeof(UnkStruct_0205B43C));
+    v2 = (UnkStruct_0205B43C *)Heap_Alloc(HEAP_ID_31, sizeof(UnkStruct_0205B43C));
     MI_CpuClear8(v2, sizeof(UnkStruct_0205B43C));
 
     v2->unk_10 = NULL;
@@ -1267,7 +1267,7 @@ void sub_0205C040(StringTemplate *param0, int param1, int param2, TrainerInfo *p
 {
     TrainerInfo *v0;
     Strbuf *v1;
-    MessageLoader *v2 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNION_ROOM, HEAP_ID_FIELD);
+    MessageLoader *v2 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNION_ROOM, HEAP_ID_FIELD1);
     int v3, v4;
 
     param2--;
diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c
index dc1a0e51cb..3778a71cbe 100644
--- a/src/unk_0205C22C.c
+++ b/src/unk_0205C22C.c
@@ -59,7 +59,7 @@ static void sub_0205C8DC(UnkStruct_0205C924 *param0);
 
 UnkStruct_0205C22C *sub_0205C22C(UnkStruct_0205B43C *param0)
 {
-    UnkStruct_0205C22C *v0 = (UnkStruct_0205C22C *)Heap_AllocFromHeap(HEAP_ID_31, sizeof(UnkStruct_0205C22C));
+    UnkStruct_0205C22C *v0 = (UnkStruct_0205C22C *)Heap_Alloc(HEAP_ID_31, sizeof(UnkStruct_0205C22C));
 
     MI_CpuClearFast(v0, sizeof(UnkStruct_0205C22C));
 
@@ -70,7 +70,7 @@ UnkStruct_0205C22C *sub_0205C22C(UnkStruct_0205B43C *param0)
     v0->unk_474 = SaveData_SaveTable(v0->fieldSystem->saveData, SAVE_TABLE_ENTRY_PAL_PAD);
     v0->playerAvatar = v0->fieldSystem->playerAvatar;
 
-    Heap_CreateAtEnd(HEAP_ID_FIELDMAP, HEAP_ID_89, 10000);
+    Heap_CreateAtEnd(HEAP_ID_FIELD2, HEAP_ID_89, 10000);
     v0->unk_478 = sub_0205C95C(HEAP_ID_89);
     sub_0205C2C8(v0);
 
@@ -534,7 +534,7 @@ static void sub_0205C944(UnkStruct_0205C95C *param0)
 
 UnkStruct_0205C95C *sub_0205C95C(int heapID)
 {
-    UnkStruct_0205C95C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0205C95C));
+    UnkStruct_0205C95C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0205C95C));
 
     sub_0205C900(v0);
     return v0;
diff --git a/src/unk_0205C980.c b/src/unk_0205C980.c
index 18a1160f6f..dd97c62ba9 100644
--- a/src/unk_0205C980.c
+++ b/src/unk_0205C980.c
@@ -106,7 +106,7 @@ u16 *sub_0205CA4C(int heapID)
     int v6;
 
     v0 = Graphics_GetPlttData(NARC_INDEX_GRAPHIC__RECORD, 7, &v2, heapID);
-    v4 = Heap_AllocFromHeap(heapID, 16 * 18 * 2);
+    v4 = Heap_Alloc(heapID, 16 * 18 * 2);
     v5 = (u16 *)v2->pRawData;
 
     for (v6 = 0; v6 < 16 * 16; v6++) {
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index 5105d53550..c33fba43d5 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -142,7 +142,7 @@ void sub_0205CA94(SysTask *param0, void *param1)
         }
 
         if (v1[0] == 2) {
-            StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+            StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         }
 
         for (v2 = 0; v2 < v0->unk_1E0; v2++) {
@@ -197,7 +197,7 @@ void sub_0205CBFC(SysTask *param0, void *param1)
         GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0);
         GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 0);
         sub_0205D274(v0, &v0->unk_1C0[0], 2);
-        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD1);
         Sound_PlayEffect(SEQ_SE_DP_PYUU);
         v0->unk_1E0 = 1;
         v0->unk_1E4++;
@@ -265,7 +265,7 @@ void sub_0205CD3C(SysTask *param0, void *param1)
 
         if (v1 == 2) {
             v0->unk_1E8 = 0;
-            StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 6, 1, HEAP_ID_FIELD);
+            StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 6, 1, HEAP_ID_FIELD1);
         }
 
         if (v1 == 0) {
@@ -310,7 +310,7 @@ void sub_0205CE7C(SysTask *param0, void *param1)
         v0->unk_1E4++;
         break;
     case 1:
-        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 6, 1, HEAP_ID_FIELD);
+        StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 6, 1, HEAP_ID_FIELD1);
         v0->unk_1E4++;
         break;
     case 2:
@@ -414,7 +414,7 @@ void sub_0205D0AC(UnkStruct_0205D094 *param0)
 
 static void sub_0205D0B4(UnkStruct_0205D094 *param0)
 {
-    param0->unk_00 = SpriteList_InitRendering(2, &param0->unk_30, HEAP_ID_FIELD);
+    param0->unk_00 = SpriteList_InitRendering(2, &param0->unk_30, HEAP_ID_FIELD1);
 
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -426,7 +426,7 @@ static void sub_0205D0D8(UnkStruct_0205D094 *param0, int param1, u32 param2)
     void *v1;
 
     for (v0 = 0; v0 < 4; v0++) {
-        param0->unk_08[v0] = SpriteResourceCollection_New(2, v0, HEAP_ID_FIELD);
+        param0->unk_08[v0] = SpriteResourceCollection_New(2, v0, HEAP_ID_FIELD1);
     }
 
     param0->unk_20[0] = sub_0205D1C4(param0->unk_08[0], &param0->unk_18[0], Unk_020ED8B4[0][param1]);
@@ -447,7 +447,7 @@ static void sub_0205D0D8(UnkStruct_0205D094 *param0, int param1, u32 param2)
     SpriteTransfer_RequestCharListAtEnd(param0->unk_18[0]);
     SpriteTransfer_RequestPlttFreeSpaceList(param0->unk_18[1]);
 
-    v1 = LoadMemberFromNARC(NARC_INDEX_DATA__UGROUNDEFFECT, 4, 0, HEAP_ID_FIELD, 0);
+    v1 = LoadMemberFromNARC(NARC_INDEX_DATA__UGROUNDEFFECT, 4, 0, HEAP_ID_FIELD1, 0);
     param0->unk_04 = SpriteResourcesHeaderList_NewFromResdat(v1, 4, param0->unk_08[0], param0->unk_08[1], param0->unk_08[2], param0->unk_08[3], NULL, NULL);
 
     Heap_Free(v1);
@@ -460,21 +460,21 @@ static int sub_0205D1C4(SpriteResourceCollection *param0, SpriteResourceList **p
     int v2;
     void *v3;
 
-    v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, SpriteResourceTable_Size());
-    v3 = LoadMemberFromNARC(NARC_INDEX_DATA__UGROUNDEFFECT, param2, 0, HEAP_ID_FIELD, 0);
+    v0 = Heap_AllocAtEnd(HEAP_ID_FIELD1, SpriteResourceTable_Size());
+    v3 = LoadMemberFromNARC(NARC_INDEX_DATA__UGROUNDEFFECT, param2, 0, HEAP_ID_FIELD1, 0);
 
-    SpriteResourceTable_LoadFromBinary(v3, v0, HEAP_ID_FIELD);
+    SpriteResourceTable_LoadFromBinary(v3, v0, HEAP_ID_FIELD1);
     Heap_Free(v3);
 
     if (param1 != NULL) {
         v2 = SpriteResourceTable_GetCount(v0);
-        *param1 = SpriteResourceList_New(v2, HEAP_ID_FIELD);
+        *param1 = SpriteResourceList_New(v2, HEAP_ID_FIELD1);
         v1 = *param1;
     } else {
         v1 = NULL;
     }
 
-    v2 = SpriteResourceCollection_Extend(param0, v0, v1, HEAP_ID_FIELD);
+    v2 = SpriteResourceCollection_Extend(param0, v0, v1, HEAP_ID_FIELD1);
 
     SpriteResourceTable_Clear(v0);
     Heap_Free(v0);
@@ -558,7 +558,7 @@ static Sprite *sub_0205D344(UnkStruct_0205D094 *param0, int param1, VecFx32 *par
     v0.affineScale = v2;
     v0.priority = param3;
     v0.vramType = param4;
-    v0.heapID = HEAP_ID_FIELD;
+    v0.heapID = HEAP_ID_FIELD1;
 
     v1 = SpriteList_AddAffine(&v0);
     GF_ASSERT(v1);
@@ -576,7 +576,7 @@ void sub_0205D3C4(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param
 {
     UnkStruct_0205D3C4 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_0205D3C4));
+    param1->unk_00 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_0205D3C4));
     memset(param1->unk_00, 0, sizeof(UnkStruct_0205D3C4));
 
     v0 = (UnkStruct_0205D3C4 *)param1->unk_00;
@@ -592,7 +592,7 @@ void sub_0205D404(struct UnkStruct_0205D3AC_t *param0)
 
     if (param0->unk_00 != NULL) {
         Sprite_Delete(v0->unk_0C);
-        Heap_FreeExplicit(HEAP_ID_FIELD, param0->unk_00);
+        Heap_FreeExplicit(HEAP_ID_FIELD1, param0->unk_00);
 
         param0->unk_00 = NULL;
     }
@@ -625,7 +625,7 @@ void sub_0205D4A4(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param
 {
     UnkStruct_0205D4A4 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_0205D4A4));
+    param1->unk_00 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_0205D4A4));
     memset(param1->unk_00, 0, sizeof(UnkStruct_0205D4A4));
 
     v0 = (UnkStruct_0205D4A4 *)param1->unk_00;
@@ -641,7 +641,7 @@ void sub_0205D4E0(struct UnkStruct_0205D3AC_t *param0)
 
     if (param0->unk_00 != NULL) {
         Sprite_Delete(v0->unk_0C);
-        Heap_FreeExplicit(HEAP_ID_FIELD, param0->unk_00);
+        Heap_FreeExplicit(HEAP_ID_FIELD1, param0->unk_00);
 
         param0->unk_00 = NULL;
     }
@@ -664,7 +664,7 @@ void sub_0205D524(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param
 {
     UnkStruct_0205D3C4 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_0205D3C4));
+    param1->unk_00 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_0205D3C4));
     memset(param1->unk_00, 0, sizeof(UnkStruct_0205D3C4));
 
     v0 = (UnkStruct_0205D3C4 *)param1->unk_00;
@@ -680,7 +680,7 @@ void sub_0205D564(struct UnkStruct_0205D3AC_t *param0)
 
     if (param0->unk_00 != NULL) {
         Sprite_Delete(v0->unk_0C);
-        Heap_FreeExplicit(HEAP_ID_FIELD, param0->unk_00);
+        Heap_FreeExplicit(HEAP_ID_FIELD1, param0->unk_00);
         param0->unk_00 = NULL;
     }
 }
@@ -714,7 +714,7 @@ void sub_0205D5E0(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param
 {
     UnkStruct_0205D5E0 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_0205D5E0));
+    param1->unk_00 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_0205D5E0));
     memset(param1->unk_00, 0, sizeof(UnkStruct_0205D5E0));
 
     v0 = (UnkStruct_0205D5E0 *)param1->unk_00;
@@ -732,7 +732,7 @@ void sub_0205D624(struct UnkStruct_0205D3AC_t *param0)
 
     if (param0->unk_00 != NULL) {
         Sprite_Delete(v0->unk_0C);
-        Heap_FreeExplicit(HEAP_ID_FIELD, param0->unk_00);
+        Heap_FreeExplicit(HEAP_ID_FIELD1, param0->unk_00);
 
         param0->unk_00 = NULL;
     }
@@ -794,7 +794,7 @@ void sub_0205D714(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param
 {
     UnkStruct_0205D5E0 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_0205D5E0));
+    param1->unk_00 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_0205D5E0));
     memset(param1->unk_00, 0, sizeof(UnkStruct_0205D5E0));
 
     v0 = (UnkStruct_0205D5E0 *)param1->unk_00;
@@ -814,7 +814,7 @@ void sub_0205D768(struct UnkStruct_0205D3AC_t *param0)
 
     if (param0->unk_00 != NULL) {
         Sprite_Delete(v0->unk_0C);
-        Heap_FreeExplicit(HEAP_ID_FIELD, param0->unk_00);
+        Heap_FreeExplicit(HEAP_ID_FIELD1, param0->unk_00);
         param0->unk_00 = NULL;
     }
 }
@@ -862,7 +862,7 @@ void sub_0205D844(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param
 {
     UnkStruct_0205D4A4 *v0;
 
-    param1->unk_00 = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(UnkStruct_0205D4A4));
+    param1->unk_00 = Heap_Alloc(HEAP_ID_FIELD1, sizeof(UnkStruct_0205D4A4));
     memset(param1->unk_00, 0, sizeof(UnkStruct_0205D4A4));
 
     v0 = (UnkStruct_0205D4A4 *)param1->unk_00;
@@ -880,7 +880,7 @@ void sub_0205D888(struct UnkStruct_0205D3AC_t *param0)
 
     if (param0->unk_00 != NULL) {
         Sprite_Delete(v0->unk_0C);
-        Heap_FreeExplicit(HEAP_ID_FIELD, param0->unk_00);
+        Heap_FreeExplicit(HEAP_ID_FIELD1, param0->unk_00);
         param0->unk_00 = NULL;
     }
 }
diff --git a/src/unk_0205DFC4.c b/src/unk_0205DFC4.c
index e3a8d63c62..4fac948816 100644
--- a/src/unk_0205DFC4.c
+++ b/src/unk_0205DFC4.c
@@ -314,7 +314,7 @@ static BOOL sub_0205E268(FieldTask *param0)
 void sub_0205E318(FieldTask *param0, MapObject *param1, u16 param2, u16 param3, u16 param4, u16 param5)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
-    UnkStruct_0205E268 *v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0205E268));
+    UnkStruct_0205E268 *v1 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_0205E268));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_0205E268));
 
@@ -350,7 +350,7 @@ static BOOL sub_0205E3AC(FieldTask *param0)
 void sub_0205E3F4(FieldTask *param0, MapObject *param1, u16 param2, u16 param3)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
-    UnkStruct_0205E3AC *v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0205E3AC));
+    UnkStruct_0205E3AC *v1 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_0205E3AC));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_0205E3AC));
 
diff --git a/src/unk_020655F4.c b/src/unk_020655F4.c
index fd9334fe18..0e0cb7fe11 100644
--- a/src/unk_020655F4.c
+++ b/src/unk_020655F4.c
@@ -184,7 +184,7 @@ void sub_020656DC(MapObject *mapObj)
 
 SysTask *MapObject_StartAnimation(MapObject *mapObj, const MapObjectAnimCmd *animCmd)
 {
-    MoveAnimData *data = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(MoveAnimData));
+    MoveAnimData *data = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(MoveAnimData));
     GF_ASSERT(data != NULL);
     memset(data, 0, sizeof(MoveAnimData));
 
@@ -211,7 +211,7 @@ void MapObject_FinishAnimation(SysTask *task)
     GF_ASSERT(LocalMapObj_CheckAnimationFinished(data->mapObj) == TRUE);
 
     sub_020656AC(data->mapObj);
-    Heap_FreeExplicit(HEAP_ID_FIELD, data);
+    Heap_FreeExplicit(HEAP_ID_FIELD1, data);
     SysTask_Done(task);
 }
 
diff --git a/src/unk_02067A84.c b/src/unk_02067A84.c
index 9b940acc26..03ce95ad17 100644
--- a/src/unk_02067A84.c
+++ b/src/unk_02067A84.c
@@ -414,7 +414,7 @@ void sub_02067FE8(SysTask *task)
 static SysTask *sub_02067FF0(FieldSystem *fieldSystem, MapObject *mapObj, PlayerAvatar *playerAvatar, int direction, int sightRange, int param5, int param6, int approachNum)
 {
     SysTask *task;
-    UnkStruct_020EF6D0 *v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, (sizeof(UnkStruct_020EF6D0)));
+    UnkStruct_020EF6D0 *v1 = Heap_AllocAtEnd(HEAP_ID_FIELD1, (sizeof(UnkStruct_020EF6D0)));
     GF_ASSERT(v1 != NULL);
 
     memset(v1, 0, (sizeof(UnkStruct_020EF6D0)));
@@ -444,7 +444,7 @@ static void sub_02068054(SysTask *task)
 {
     UnkStruct_020EF6D0 *v0 = SysTask_GetParam(task);
 
-    Heap_FreeExplicit(HEAP_ID_FIELD, v0);
+    Heap_FreeExplicit(HEAP_ID_FIELD1, v0);
     SysTask_Done(task);
 }
 
diff --git a/src/unk_0206B70C.c b/src/unk_0206B70C.c
index a4bf94c3e1..b85ffbe951 100644
--- a/src/unk_0206B70C.c
+++ b/src/unk_0206B70C.c
@@ -169,7 +169,7 @@ static void sub_0206B878(FieldSystem *fieldSystem, UnkStruct_0203D8AC *param1, c
     v1 = FS_ReadFile(&v0, &v3, 4);
     GF_ASSERT(v1 >= 0);
 
-    v4 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0206B878));
+    v4 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_0206B878));
     MI_CpuClear8(v4, sizeof(UnkStruct_0206B878));
 
     param1->unk_13A = v3;
diff --git a/src/unk_0206B9D8.c b/src/unk_0206B9D8.c
index 339ba937a0..7470ecf1e7 100644
--- a/src/unk_0206B9D8.c
+++ b/src/unk_0206B9D8.c
@@ -70,7 +70,7 @@ static int sub_0206B9D8(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem, in
 {
     u8 v0;
     SaveData *saveData;
-    PartyManagementData *partyMan = Heap_AllocFromHeapAtEnd(heapID, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_AllocAtEnd(heapID, sizeof(PartyManagementData));
 
     saveData = fieldSystem->saveData;
     MI_CpuClear8(partyMan, sizeof(PartyManagementData));
@@ -134,7 +134,7 @@ static int sub_0206BAE0(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem, in
     };
 
     saveData = fieldSystem->saveData;
-    v0 = Heap_AllocFromHeapAtEnd(heapID, sizeof(PokemonSummary));
+    v0 = Heap_AllocAtEnd(heapID, sizeof(PokemonSummary));
     MI_CpuClear8(v0, sizeof(PokemonSummary));
 
     v0->options = SaveData_GetOptions(saveData);
@@ -179,13 +179,13 @@ static BOOL sub_0206BB94(FieldTask *param0)
 
     switch (v1->unk_04) {
     case 0:
-        v1->unk_04 = sub_0206B9D8(v1, v0, HEAP_ID_FIELDMAP);
+        v1->unk_04 = sub_0206B9D8(v1, v0, HEAP_ID_FIELD2);
         break;
     case 1:
         v1->unk_04 = sub_0206BA84(v1, v0);
         break;
     case 2:
-        v1->unk_04 = sub_0206BAE0(v1, v0, HEAP_ID_FIELDMAP);
+        v1->unk_04 = sub_0206BAE0(v1, v0, HEAP_ID_FIELD2);
         break;
     case 3:
         v1->unk_04 = sub_0206BB6C(v1, v0);
@@ -201,7 +201,7 @@ static BOOL sub_0206BB94(FieldTask *param0)
 void sub_0206BBFC(FieldTask *param0, void **param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
-    UnkStruct_0206B9D8 *v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0206B9D8));
+    UnkStruct_0206B9D8 *v1 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0206B9D8));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_0206B9D8));
 
@@ -270,7 +270,7 @@ static BOOL sub_0206BC94(FieldTask *param0)
 void sub_0206BCE4(FieldTask *param0, u16 param1, u16 param2, u16 param3)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
-    UnkStruct_0206BC48 *v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0206BC48));
+    UnkStruct_0206BC48 *v1 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0206BC48));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_0206BC48));
 
@@ -314,7 +314,7 @@ static BOOL sub_0206BD1C(FieldTask *param0)
 void sub_0206BD88(FieldTask *param0, u16 param1, u16 param2)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
-    UnkStruct_0206BD88 *v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0206BD88));
+    UnkStruct_0206BD88 *v1 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0206BD88));
 
     MI_CpuClear8(v1, sizeof(UnkStruct_0206BD88));
 
diff --git a/src/unk_0206C660.c b/src/unk_0206C660.c
index e4f0392680..0f4a498028 100644
--- a/src/unk_0206C660.c
+++ b/src/unk_0206C660.c
@@ -89,7 +89,7 @@ static BOOL sub_0206C680(FieldTask *param0)
 
 void sub_0206C740(FieldTask *param0, NpcTradeData *param1, int param2, u32 heapID)
 {
-    UnkStruct_0206C660 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0206C660));
+    UnkStruct_0206C660 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0206C660));
 
     memset(v0, 0, sizeof(UnkStruct_0206C660));
 
diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c
index df06cea5de..84731446e7 100644
--- a/src/unk_0206CCB0.c
+++ b/src/unk_0206CCB0.c
@@ -450,7 +450,7 @@ static void sub_0206CD7C(SaveData *saveData, int param1, int param2, const void
 
 static void sub_0206CD94(StringTemplate *param0, int param1, const u16 *speciesName, int gender, int param4, int param5)
 {
-    Strbuf *v0 = Strbuf_Init(64, HEAP_ID_FIELD);
+    Strbuf *v0 = Strbuf_Init(64, HEAP_ID_FIELD1);
 
     Strbuf_CopyChars(v0, speciesName);
     StringTemplate_SetStrbuf(param0, param1, v0, gender, param5, param4);
@@ -483,7 +483,7 @@ static void sub_0206CE74(StringTemplate *param0, int param1, u16 species, u8 gen
 {
     u16 speciesName[11];
 
-    MessageLoader_GetSpeciesName(species, HEAP_ID_FIELD, speciesName);
+    MessageLoader_GetSpeciesName(species, HEAP_ID_FIELD1, speciesName);
     sub_0206CD94(param0, param1, speciesName, gender, language, 1);
 }
 
@@ -491,7 +491,7 @@ static void sub_0206CEA4(StringTemplate *param0, int param1, u16 param2)
 {
     u16 v0[11];
 
-    MessageLoader_GetSpeciesName(param2, HEAP_ID_FIELD, v0);
+    MessageLoader_GetSpeciesName(param2, HEAP_ID_FIELD1, v0);
     sub_0206CD94(param0, param1, v0, 0, GAME_LANGUAGE, 1);
 }
 
@@ -607,7 +607,7 @@ void sub_0206D048(TVBroadcast *broadcast, Pokemon *mon)
     sub_0206CE38(mon, &v0->unk_02, &v0->unk_04, &v0->unk_05, &v0->unk_06);
     v0->unk_07 = Pokemon_GetValue(mon, MON_DATA_HAS_NICKNAME, NULL);
 
-    sub_0206CED0(HEAP_ID_FIELDMAP, mon, &v0->unk_07, v0->unk_08);
+    sub_0206CED0(HEAP_ID_FIELD2, mon, &v0->unk_07, v0->unk_08);
     SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
 }
 
@@ -673,7 +673,7 @@ void sub_0206D12C(TVBroadcast *broadcast)
 
 UnkStruct_0206D140 *sub_0206D140(int heapID)
 {
-    UnkStruct_0206D140 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0206D140));
+    UnkStruct_0206D140 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0206D140));
     MI_CpuClearFast(v0, sizeof(UnkStruct_0206D140));
 
     return v0;
@@ -939,7 +939,7 @@ void sub_0206D60C(FieldSystem *fieldSystem, Pokemon *mon)
     UnkStruct_0206D644 *v1 = &v0.val8;
 
     sub_0206CE38(mon, &v1->unk_00, &v1->unk_02, &v1->unk_03, &v1->unk_04);
-    sub_0206CE08(HEAP_ID_FIELD, v1->unk_06, mon);
+    sub_0206CE08(HEAP_ID_FIELD1, v1->unk_06, mon);
     sub_0206CD70(fieldSystem, 2, 10, v1);
 }
 
@@ -1218,7 +1218,7 @@ static int sub_0206DAFC(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr
 
 static BOOL sub_0206DB08(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1)
 {
-    return Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), ITEM_EXPLORER_KIT, 1, HEAP_ID_FIELD_TASK);
+    return Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), ITEM_EXPLORER_KIT, 1, HEAP_ID_FIELD3);
 }
 
 void sub_0206DB20(FieldSystem *fieldSystem)
@@ -1388,7 +1388,7 @@ void sub_0206DDB8(SaveData *saveData, Pokemon *mon, u32 monDataParam)
         }
 
         sub_0206CE38(mon, &v3->unk_1C, &v3->unk_19, &v3->unk_1A, &v3->unk_1B);
-        sub_0206CED0(HEAP_ID_FIELD_TASK, mon, &v3->unk_18, v3->unk_00);
+        sub_0206CED0(HEAP_ID_FIELD3, mon, &v3->unk_18, v3->unk_00);
 
         v3->unk_16 = Ribbon_MonDataParamToNameID(monDataParam);
         v3->unk_17 = v1;
@@ -1540,7 +1540,7 @@ static int sub_0206DF88(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr
 
 static BOOL sub_0206DFC8(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1)
 {
-    return Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), ITEM_EXPLORER_KIT, 1, HEAP_ID_FIELD_TASK);
+    return Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), ITEM_EXPLORER_KIT, 1, HEAP_ID_FIELD3);
 }
 
 void sub_0206DFE0(SaveData *saveData)
@@ -1644,7 +1644,7 @@ void sub_0206E174(FieldSystem *fieldSystem, u16 param1)
     Pokemon *v2 = Party_FindFirstHatchedMon(SaveData_GetParty(fieldSystem->saveData));
 
     sub_0206CE38(v2, &v1->unk_00, &v1->unk_02, &v1->unk_03, &v1->unk_04);
-    sub_0206CED0(HEAP_ID_FIELD_TASK, v2, &v1->unk_05, v1->unk_06);
+    sub_0206CED0(HEAP_ID_FIELD3, v2, &v1->unk_05, v1->unk_06);
 
     v1->unk_1C = param1;
     sub_0206CD70(fieldSystem, 1, 4, v1);
@@ -1991,7 +1991,7 @@ static int sub_0206E7AC(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr
 {
     int v0;
     UnkStruct_0206E768 *v1 = ov6_02246498(param2);
-    Strbuf *v2 = Strbuf_Init(64, HEAP_ID_FIELD);
+    Strbuf *v2 = Strbuf_Init(64, HEAP_ID_FIELD1);
 
     sub_0206CDD0(param1, 0, param2);
     Strbuf_CopyChars(v2, v1->unk_00.unk_06);
@@ -2607,13 +2607,13 @@ static int sub_0206EDAC(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr
     SpecialEncounter *v1;
     u16 v2, v3;
     u32 v4, v5;
-    Strbuf *v6 = Strbuf_Init(22, HEAP_ID_FIELD);
+    Strbuf *v6 = Strbuf_Init(22, HEAP_ID_FIELD1);
     TrainerInfo *v7 = SaveData_GetTrainerInfo(FieldSystem_GetSaveData(fieldSystem));
 
     v1 = SaveData_GetSpecialEncounters(fieldSystem->saveData);
     v2 = (LCRNG_Next() % 29);
 
-    MapHeader_LoadName(RoamingPokemon_GetRouteFromId(v2), HEAP_ID_FIELD, v6);
+    MapHeader_LoadName(RoamingPokemon_GetRouteFromId(v2), HEAP_ID_FIELD1, v6);
     StringTemplate_SetStrbuf(param1, 0, v6, 0, 1, GAME_LANGUAGE);
     Strbuf_Free(v6);
 
@@ -2689,7 +2689,7 @@ static int sub_0206EEBC(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr
 
     {
         u16 v6;
-        Strbuf *v7 = Strbuf_Init(7 + 1, HEAP_ID_FIELD);
+        Strbuf *v7 = Strbuf_Init(7 + 1, HEAP_ID_FIELD1);
         int v8 = sub_0202A1C0(v0);
 
         sub_0202A1A0(v0, v7);
@@ -2752,7 +2752,7 @@ static int sub_0206F01C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr
         }
     }
 
-    v0 = sub_0206F0D8(v3, HEAP_ID_FIELD);
+    v0 = sub_0206F0D8(v3, HEAP_ID_FIELD1);
 
     StringTemplate_SetStrbuf(param1, 0, v0, 0, 1, GAME_LANGUAGE);
     Strbuf_Free(v0);
@@ -2835,7 +2835,7 @@ static int sub_0206F160(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr
 
     for (v2 = 1; v2 <= NATIONAL_DEX_COUNT; v2++) {
         if (Pokedex_HasSeenSpecies(pokedex, v1) == TRUE) {
-            v0 = sub_0206F0D8(v1, HEAP_ID_FIELD);
+            v0 = sub_0206F0D8(v1, HEAP_ID_FIELD1);
             StringTemplate_SetStrbuf(param1, 2, v0, 0, 1, GAME_LANGUAGE);
             Strbuf_Free(v0);
             break;
diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c
index a31d216fd3..768a4c2cdb 100644
--- a/src/unk_0206F314.c
+++ b/src/unk_0206F314.c
@@ -187,7 +187,7 @@ static int sub_0206F314(UnkStruct_0206F314 *param0, FieldSystem *fieldSystem, u1
 
     Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_80, 0x6000);
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_80, sizeof(UnkStruct_0206F7F8));
+    v0 = Heap_Alloc(HEAP_ID_80, sizeof(UnkStruct_0206F7F8));
     MI_CpuClear8(v0, sizeof(UnkStruct_0206F7F8));
 
     v0->heapID = HEAP_ID_80;
@@ -457,7 +457,7 @@ static void sub_0206F7F8(UnkStruct_0206F7F8 *param0, SaveData *saveData)
     int v0, v1, v2, v3;
     UnkStruct_0202EE10 *v4;
 
-    param0->unk_324 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02070050) * param0->unk_18);
+    param0->unk_324 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_02070050) * param0->unk_18);
     MI_CpuClear8(param0->unk_324, sizeof(UnkStruct_02070050) * param0->unk_18);
     param0->unk_308[0] = sub_0202ED8C(saveData, param0->unk_16, param0->heapID);
 
@@ -900,7 +900,7 @@ static BOOL sub_020702D0(FieldTask *param0)
 void sub_020703FC(FieldTask *param0, u16 param1)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
-    UnkStruct_0206F314 *v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0206F314));
+    UnkStruct_0206F314 *v1 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0206F314));
 
     v1->unk_00 = 0;
     v1->unk_04 = param1;
diff --git a/src/unk_02070428.c b/src/unk_02070428.c
index 1032b50400..53681f9337 100644
--- a/src/unk_02070428.c
+++ b/src/unk_02070428.c
@@ -136,7 +136,7 @@ static BOOL sub_020705DC(FieldSystem *fieldSystem)
     int v0 = sub_0203A87C(fieldSystem->location->mapId);
 
     if (v0 != 0 && sub_0203A920(fieldSystem, v0) == 0) {
-        JournalEntry_CreateAndSaveEventArrivedInLocation(fieldSystem->journalEntry, fieldSystem->location->mapId, HEAP_ID_FIELD_TASK);
+        JournalEntry_CreateAndSaveEventArrivedInLocation(fieldSystem->journalEntry, fieldSystem->location->mapId, HEAP_ID_FIELD3);
         return TRUE;
     }
 
@@ -148,7 +148,7 @@ static BOOL sub_02070610(FieldSystem *fieldSystem)
     Location *location = FieldOverworldState_GetPrevLocation(SaveData_GetFieldOverworldState(fieldSystem->saveData));
 
     if (location->mapId != fieldSystem->location->mapId) {
-        JournalEntry_CreateAndSaveEventMapTransition(SaveData_GetTrainerInfo(fieldSystem->saveData), fieldSystem->journalEntry, fieldSystem->location->mapId, location->mapId, HEAP_ID_FIELD_TASK);
+        JournalEntry_CreateAndSaveEventMapTransition(SaveData_GetTrainerInfo(fieldSystem->saveData), fieldSystem->journalEntry, fieldSystem->location->mapId, location->mapId, HEAP_ID_FIELD3);
         return TRUE;
     }
 
diff --git a/src/unk_0207064C.c b/src/unk_0207064C.c
index 8796a5e259..80ceb0fb25 100644
--- a/src/unk_0207064C.c
+++ b/src/unk_0207064C.c
@@ -27,7 +27,7 @@ typedef struct {
 
 void *sub_0207064C(u32 heapID, FieldSystem *fieldSystem, Pokemon *param2, u16 param3, s16 param4, s16 param5)
 {
-    FlyTaskEnv *v0 = Heap_AllocFromHeapAtEnd(heapID, sizeof(FlyTaskEnv));
+    FlyTaskEnv *v0 = Heap_AllocAtEnd(heapID, sizeof(FlyTaskEnv));
 
     memset(v0, 0, sizeof(FlyTaskEnv));
 
diff --git a/src/unk_020711C8.c b/src/unk_020711C8.c
index ddbab7e056..9b1d47bcbc 100644
--- a/src/unk_020711C8.c
+++ b/src/unk_020711C8.c
@@ -11,7 +11,7 @@
 
 UnkStruct_020711C8 *sub_020711C8(const int heapID, const u8 param1, SaveData *saveData)
 {
-    UnkStruct_020711C8 *v0 = Heap_AllocFromHeapAtEnd(heapID, sizeof(UnkStruct_020711C8));
+    UnkStruct_020711C8 *v0 = Heap_AllocAtEnd(heapID, sizeof(UnkStruct_020711C8));
     v0->unk_00 = Party_GetPokemonBySlotIndex(SaveData_GetParty(saveData), param1);
     v0->unk_04 = NULL;
 
diff --git a/src/unk_020711EC.c b/src/unk_020711EC.c
index 7ca05afd37..fcbdc91c38 100644
--- a/src/unk_020711EC.c
+++ b/src/unk_020711EC.c
@@ -241,7 +241,7 @@ static void sub_02071420(SysTask *param0, void *param1)
 
 static UnkStruct_020711EC *sub_0207142C(int heapID)
 {
-    UnkStruct_020711EC *v0 = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_020711EC)));
+    UnkStruct_020711EC *v0 = Heap_Alloc(heapID, (sizeof(UnkStruct_020711EC)));
     GF_ASSERT(v0 != NULL);
 
     memset(v0, 0, (sizeof(UnkStruct_020711EC)));
@@ -258,7 +258,7 @@ static UnkStruct_ov101_021D5D90 *sub_0207145C(int heapID, int param1)
     UnkStruct_ov101_021D5D90 *v0;
 
     param1 *= (sizeof(UnkStruct_ov101_021D5D90));
-    v0 = Heap_AllocFromHeap(heapID, param1);
+    v0 = Heap_Alloc(heapID, param1);
 
     GF_ASSERT(v0 != NULL);
     memset(v0, 0, param1);
diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c
new file mode 100644
index 0000000000..8d9be88f0e
--- /dev/null
+++ b/src/unk_02071D40.c
@@ -0,0 +1,307 @@
+#include "unk_02071D40.h"
+
+#include <nitro.h>
+#include <string.h>
+
+#include "generated/game_records.h"
+
+#include "struct_decls/struct_0202C834_decl.h"
+#include "struct_decls/struct_0202C844_decl.h"
+#include "struct_defs/battle_frontier.h"
+#include "struct_defs/struct_02072014.h"
+#include "struct_defs/underground_record.h"
+
+#include "field/field_system.h"
+
+#include "charcode_util.h"
+#include "field_system.h"
+#include "field_task.h"
+#include "game_records.h"
+#include "heap.h"
+#include "play_time.h"
+#include "pokedex.h"
+#include "save_player.h"
+#include "savedata.h"
+#include "system_flags.h"
+#include "trainer_info.h"
+#include "unk_0202854C.h"
+#include "unk_0202C7FC.h"
+#include "unk_0203061C.h"
+#include "unk_0203D1B8.h"
+#include "unk_020559DC.h"
+#include "unk_0205B33C.h"
+#include "vars_flags.h"
+
+typedef struct {
+    int unk_00;
+    TrainerCard *unk_04;
+} UnkStruct_02072204;
+
+static void sub_02072014(const u8 param0, const u8 param1, const u8 param2, const u8 param3, const u8 param4, TrainerCard *param5);
+static void sub_02072038(const u16 param0, const u8 param1, const u16 *param2, const u32 param3, const u32 param4, const BOOL param5, const u32 param6, TrainerCard *param7);
+static void sub_0207207C(const u8 param0, const PlayTime *playTime, const RTCDate *param2, const RTCDate *param3, const RTCTime *param4, const u8 param5, TrainerCard *param6);
+static void sub_02072120(const u32 param0, const u32 param1, const u32 param2, const u32 param3, const u8 *param4, TrainerCard *param5);
+static void sub_0207216C(TrainerInfo *param0, FieldSystem *fieldSystem, TrainerCard *param2);
+static BOOL sub_02072230(FieldTask *param0);
+
+void sub_02071D40(const u8 param0, const u8 param1, const u8 param2, const u8 param3, FieldSystem *fieldSystem, TrainerCard *param5)
+{
+    TrainerInfo *trainerInfo;
+    GameRecords *gameRecords;
+    SaveData *saveData = FieldSystem_GetSaveData(fieldSystem);
+    trainerInfo = SaveData_GetTrainerInfo(saveData);
+    gameRecords = SaveData_GetGameRecords(saveData);
+
+    param5->unk_05 = param3;
+
+    {
+        u8 v3;
+
+        v3 = sub_02071F28(fieldSystem);
+        sub_02072014(param0, GAME_VERSION, v3, param2, TrainerInfo_RegionCode(trainerInfo), param5);
+    }
+
+    sub_02072038(TrainerInfo_ID_LowHalf(trainerInfo), TrainerInfo_Gender(trainerInfo), TrainerInfo_Name(trainerInfo), TrainerInfo_Money(trainerInfo), Pokedex_CountSeen(SaveData_GetPokedex(fieldSystem->saveData)), Pokedex_IsObtained(SaveData_GetPokedex(fieldSystem->saveData)), GameRecords_GetTrainerScore(gameRecords), param5);
+
+    {
+        RTCDate v4;
+        RTCDate v5;
+        RTCTime v6;
+        PlayTime *playTime;
+
+        playTime = SaveData_GetPlayTime(saveData);
+
+        sub_02055BF4(fieldSystem, &v4, &v6);
+        sub_02055C10(fieldSystem, &v5, &v6);
+        sub_0207207C(SystemFlag_CheckGameCompleted(SaveData_GetVarsFlags(fieldSystem->saveData)), playTime, &v4, &v5, &v6, param1, param5);
+    }
+
+    {
+        u32 v8, v9, v10, v11;
+        UnkStruct_0202C834 *v12;
+
+        v12 = sub_0202C834(fieldSystem->saveData);
+        v8 = GameRecords_GetRecordValue(gameRecords, RECORD_UNK_091) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_019) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_024) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_020) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_025) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_032);
+        v9 = GameRecords_GetRecordValue(gameRecords, RECORD_UNK_021) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_026);
+        v10 = GameRecords_GetRecordValue(gameRecords, RECORD_UNK_022) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_027);
+        v11 = GameRecords_GetRecordValue(gameRecords, RECORD_UNK_019) + GameRecords_GetRecordValue(gameRecords, RECORD_UNK_024);
+
+        sub_02072120(v8, v9, v10, v11, sub_0202C840(v12), param5);
+    }
+
+    sub_0207216C(trainerInfo, fieldSystem, param5);
+
+    {
+        int v13, v14 = 0;
+        u8 *v15 = (u8 *)param5;
+
+        for (v13 = 0; v13 < sizeof(TrainerCard); v13++) {
+            v14 ^= v15[v13];
+        }
+
+        param5->unk_668 = v14;
+    }
+
+    param5->unk_66A = 0;
+}
+
+TrainerCard *sub_02071F04(const u16 heapID)
+{
+    TrainerCard *v0 = Heap_Alloc(heapID, sizeof(TrainerCard));
+
+    memset(v0, 0, sizeof(TrainerCard));
+    return v0;
+}
+
+void sub_02071F20(TrainerCard *param0)
+{
+    Heap_Free(param0);
+}
+
+u8 sub_02071F28(FieldSystem *fieldSystem)
+{
+    u8 trainerCardStars;
+    SaveData *saveData;
+    GameRecords *gameRecords;
+    VarsFlags *varsFlags;
+    UndergroundRecord *undergroundRecord;
+    BattleFrontier *frontier;
+
+    saveData = FieldSystem_GetSaveData(fieldSystem);
+    gameRecords = SaveData_GetGameRecords(saveData);
+    varsFlags = SaveData_GetVarsFlags(saveData);
+    undergroundRecord = SaveData_UndergroundRecord(saveData);
+    frontier = SaveData_GetBattleFrontier(saveData);
+    trainerCardStars = 0;
+
+    if (SystemFlag_CheckGameCompleted(varsFlags)) {
+        trainerCardStars++;
+    }
+
+    if (Pokedex_NationalDexCompleted(SaveData_GetPokedex(saveData))) {
+        trainerCardStars++;
+    }
+
+    if ((sub_02030698(frontier, 0, 0xff) >= 100) || (sub_02030698(frontier, 2, 0xff) >= 100) || (sub_02030698(frontier, 4, 0xff) >= 100) || (sub_02030698(frontier, 6, 0xff) >= 100) || (sub_02030698(frontier, 8, 0xff) >= 100)) {
+        trainerCardStars++;
+    }
+
+    if (SystemFlag_CheckContestMaster(varsFlags, 0) || SystemFlag_CheckContestMaster(varsFlags, 1) || SystemFlag_CheckContestMaster(varsFlags, 3) || SystemFlag_CheckContestMaster(varsFlags, 4) || SystemFlag_CheckContestMaster(varsFlags, 2)) {
+        trainerCardStars++;
+    }
+
+    if (UndergroundRecord_HasPlatBaseFlag(undergroundRecord) == TRUE) {
+        trainerCardStars++;
+    }
+
+    return trainerCardStars;
+}
+
+static void sub_02072014(const u8 param0, const u8 param1, const u8 param2, const u8 param3, const u8 param4, TrainerCard *param5)
+{
+    param5->unk_04_0 = param0;
+    param5->unk_00 = param1;
+    param5->unk_03 = param2;
+    param5->unk_01 = param4;
+    param5->unk_02 = param3;
+}
+
+static void sub_02072038(const u16 param0, const u8 param1, const u16 *param2, const u32 param3, const u32 param4, const BOOL param5, const u32 param6, TrainerCard *param7)
+{
+    param7->unk_28 = param0;
+    param7->unk_04_2 = param1;
+
+    CharCode_CopyNumChars(param7->unk_08, param2, 7 + 1);
+
+    param7->unk_1C = param3;
+    param7->unk_20 = param4;
+    param7->unk_04_3 = param5;
+    param7->unk_24 = param6;
+}
+
+static void sub_0207207C(const u8 param0, const PlayTime *playTime, const RTCDate *param2, const RTCDate *param3, const RTCTime *param4, const u8 param5, TrainerCard *trainerCard)
+{
+    trainerCard->playTimeHours = PlayTime_GetHours(playTime);
+    trainerCard->playTimeMinutes = PlayTime_GetMinutes(playTime);
+    trainerCard->unk_2F = param2->year;
+    trainerCard->unk_30 = param2->month;
+    trainerCard->unk_31 = param2->day;
+
+    if (param0) {
+        trainerCard->unk_32 = param3->year;
+        trainerCard->unk_33 = param3->month;
+        trainerCard->unk_34 = param3->day;
+        trainerCard->unk_2C = param4->hour;
+        trainerCard->unk_35 = param4->minute;
+    } else {
+        trainerCard->unk_32 = 0;
+        trainerCard->unk_33 = 0;
+        trainerCard->unk_34 = 0;
+        trainerCard->unk_2C = 0;
+        trainerCard->unk_35 = 0;
+    }
+
+    trainerCard->unk_04_1 = param5;
+
+    if (param5) {
+        trainerCard->playTime = playTime;
+    } else {
+        trainerCard->playTime = NULL;
+    }
+}
+
+static void sub_02072120(const u32 param0, const u32 param1, const u32 param2, const u32 param3, const u8 *param4, TrainerCard *param5)
+{
+    param5->unk_38 = param0;
+
+    if (param5->unk_38 > 999999) {
+        param5->unk_38 = 999999;
+    }
+
+    param5->unk_3C = param1;
+    param5->unk_40 = param2;
+
+    if (param5->unk_3C > 9999) {
+        param5->unk_3C = 9999;
+    }
+
+    if (param5->unk_40 > 9999) {
+        param5->unk_40 = 9999;
+    }
+
+    param5->unk_44 = param3;
+
+    if (param5->unk_44 > 99999) {
+        param5->unk_44 = 99999;
+    }
+
+    MI_CpuCopy8(param4, param5->unk_68, 24 * 8 * 8);
+}
+
+static void sub_0207216C(TrainerInfo *param0, FieldSystem *fieldSystem, TrainerCard *param2)
+{
+    u8 v0;
+    UnkStruct_0202C834 *v1 = sub_0202C834(fieldSystem->saveData);
+    UnkStruct_0202C844 *v2 = sub_0202C844(v1);
+
+    for (v0 = 0; v0 < 8; v0++) {
+        if (TrainerInfo_HasBadge(param0, v0)) {
+            param2->unk_48[v0].unk_00_0 = 1;
+        } else {
+            param2->unk_48[v0].unk_00_0 = 0;
+        }
+
+        param2->unk_48[v0].unk_00_1 = sub_0202C848(v0, v2);
+    }
+}
+
+void sub_020721D4(FieldSystem *fieldSystem, const TrainerCard *param1)
+{
+    u8 v0;
+    UnkStruct_0202C834 *v1 = sub_0202C834(fieldSystem->saveData);
+    UnkStruct_0202C844 *v2 = sub_0202C844(v1);
+
+    for (v0 = 0; v0 < 8; v0++) {
+        sub_0202C850(v0, param1->unk_48[v0].unk_00_1, v2);
+    }
+}
+
+void sub_02072204(FieldSystem *fieldSystem)
+{
+    UnkStruct_02072204 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_02072204));
+
+    v0->unk_00 = 0;
+    v0->unk_04 = (TrainerCard *)sub_0205C17C(fieldSystem->unk_7C);
+
+    FieldTask_InitCall(fieldSystem->task, sub_02072230, v0);
+}
+
+static BOOL sub_02072230(FieldTask *param0)
+{
+    FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
+    UnkStruct_02072204 *v1 = FieldTask_GetEnv(param0);
+
+    switch (v1->unk_00) {
+    case 0:
+        sub_0205C214(fieldSystem->unk_7C);
+        v1->unk_00 = 1;
+    case 1:
+        if (v1->unk_04->unk_66A != 0) {
+            v1->unk_00 = 10;
+        }
+        break;
+    case 10:
+        sub_0203E09C(fieldSystem, v1->unk_04);
+        v1->unk_00 = 11;
+        break;
+    case 11:
+        if (!FieldSystem_IsRunningApplication(fieldSystem)) {
+            sub_0205C1F0(fieldSystem->unk_7C);
+            Heap_Free(v1);
+            return 1;
+        }
+        break;
+    }
+
+    return 0;
+}
diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c
index 7da4763e64..773313b51d 100644
--- a/src/unk_020722AC.c
+++ b/src/unk_020722AC.c
@@ -195,7 +195,7 @@ void sub_020722AC(void *param0, int *param1)
 
     Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_43, 0x5000);
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_43, sizeof(UnkStruct_02072334));
+    v0 = Heap_Alloc(HEAP_ID_43, sizeof(UnkStruct_02072334));
     MI_CpuClear8(v0, sizeof(UnkStruct_02072334));
     v0->unk_04 = param1;
 
@@ -1197,7 +1197,7 @@ static int sub_02073524(UnkStruct_02072334 *param0, int param1)
 
     switch (param0->unk_12) {
     case 0:
-        partyMan = Heap_AllocFromHeap(param0->heapID, sizeof(PartyManagementData));
+        partyMan = Heap_Alloc(param0->heapID, sizeof(PartyManagementData));
         MI_CpuClear8(partyMan, sizeof(PartyManagementData));
 
         partyMan->party = SaveData_GetParty(FieldSystem_GetSaveData(param0->fieldSystem));
@@ -1289,7 +1289,7 @@ static BOOL sub_02073694(FieldTask *param0)
 void sub_020736D8(FieldTask *param0)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
-    UnkStruct_020736D8 *v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_020736D8));
+    UnkStruct_020736D8 *v1 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_020736D8));
 
     v1->unk_00 = 0;
     v1->unk_04 = 0;
diff --git a/src/unk_02073838.c b/src/unk_02073838.c
index 092af1c2f6..4d1cefcf1e 100644
--- a/src/unk_02073838.c
+++ b/src/unk_02073838.c
@@ -164,7 +164,7 @@ void sub_020739F0(UnkStruct_02073974 *param0)
 
 void sub_02073A14(UnkStruct_02073974 *param0, const NNSG3dResMdl *param1, u32 heapID)
 {
-    Heap_FndInitAllocatorForExpHeap(&param0->unk_14, heapID, 4);
+    HeapExp_FndInitAllocator(&param0->unk_14, heapID, 4);
     param0->unk_10 = NNS_G3dAllocAnmObj(&param0->unk_14, param0->unk_0C, param1);
 
     GF_ASSERT(param0->unk_10 != NULL);
diff --git a/src/unk_0207A6DC.c b/src/unk_0207A6DC.c
index 22149aa7b8..fe57c3845a 100644
--- a/src/unk_0207A6DC.c
+++ b/src/unk_0207A6DC.c
@@ -104,8 +104,8 @@ void sub_0207A6DC(void *param0)
         return;
     }
 
-    v2 = (UnkStruct_0207ACB4 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_0207ACB4));
-    v3 = (UnkStruct_0207AD40 *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_0207AD40));
+    v2 = (UnkStruct_0207ACB4 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_0207ACB4));
+    v3 = (UnkStruct_0207AD40 *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_0207AD40));
 
     CommCmd_Init(Unk_020F099C, v0, param0);
 
@@ -235,7 +235,7 @@ void sub_0207A81C(BattleSystem *battleSys, int param1, int param2, void *param3,
     u16 *v4;
     u16 *v5;
 
-    v1 = (UnkStruct_0207A81C *)Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(UnkStruct_0207A81C));
+    v1 = (UnkStruct_0207A81C *)Heap_Alloc(HEAP_ID_BATTLE, sizeof(UnkStruct_0207A81C));
     v3 = ov16_0223E06C(battleSys);
     v4 = ov16_0223E08C(battleSys);
     v5 = ov16_0223E098(battleSys);
@@ -460,7 +460,7 @@ BOOL sub_0207AAFC(UnkStruct_0207A778 *param0)
         int v2;
 
         for (v2 = 0; v2 < 4; v2++) { // 4 pal pads
-            param0->unk_10[v2] = Heap_AllocFromHeap(HEAP_ID_BATTLE, 136);
+            param0->unk_10[v2] = Heap_Alloc(HEAP_ID_BATTLE, 136);
         }
     }
 
diff --git a/src/unk_0207C63C.c b/src/unk_0207C63C.c
index 39fbb1bc58..5bb5307667 100644
--- a/src/unk_0207C63C.c
+++ b/src/unk_0207C63C.c
@@ -130,7 +130,7 @@ static ParticleSystem *sub_0207C7CC(int heapID)
     void *v1;
     Camera *camera;
 
-    v1 = Heap_AllocFromHeap(heapID, 0x4800);
+    v1 = Heap_Alloc(heapID, 0x4800);
     v0 = ParticleSystem_New(sub_0207C794, sub_0207C7B0, v1, 0x4800, 1, heapID);
     camera = ParticleSystem_GetCamera(v0);
 
@@ -173,7 +173,7 @@ UnkStruct_0207C8C4 *sub_0207C894(UnkStruct_0207C894 *param0)
     int v1;
     int v2;
     int v3;
-    UnkStruct_0207C8C4 *v4 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_0207C8C4));
+    UnkStruct_0207C8C4 *v4 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_0207C8C4));
 
     GF_ASSERT(v4 != NULL);
 
diff --git a/src/unk_0207DA28.c b/src/unk_0207DA28.c
index ad0ed67bfd..d9837cf3fb 100644
--- a/src/unk_0207DA28.c
+++ b/src/unk_0207DA28.c
@@ -201,7 +201,7 @@ static BOOL sub_0207DA28(FieldTask *task)
         v2->unk_04++;
         return 1;
     case 12:
-        sub_0207DE04(v2, fieldSystem, HEAP_ID_FIELDMAP, 0);
+        sub_0207DE04(v2, fieldSystem, HEAP_ID_FIELD2, 0);
         v2->unk_04++;
         break;
     case 13:
@@ -210,7 +210,7 @@ static BOOL sub_0207DA28(FieldTask *task)
         }
         break;
     case 14:
-        v2->unk_10 = (void *)sub_020996A0(fieldSystem, HEAP_ID_FIELDMAP, v2->unk_14);
+        v2->unk_10 = (void *)sub_020996A0(fieldSystem, HEAP_ID_FIELD2, v2->unk_14);
         v2->unk_04++;
         break;
     case 15:
@@ -231,7 +231,7 @@ static BOOL sub_0207DA28(FieldTask *task)
         }
         break;
     case 18:
-        sub_0207DE04(v2, fieldSystem, HEAP_ID_FIELDMAP, 1);
+        sub_0207DE04(v2, fieldSystem, HEAP_ID_FIELD2, 1);
         v2->unk_04++;
         break;
     case 19:
@@ -241,7 +241,7 @@ static BOOL sub_0207DA28(FieldTask *task)
         break;
     case 20:
         sub_0207DF9C(fieldSystem);
-        v2->unk_10 = sub_0207DE90(fieldSystem, HEAP_ID_FIELDMAP, v2->unk_14);
+        v2->unk_10 = sub_0207DE90(fieldSystem, HEAP_ID_FIELD2, v2->unk_14);
         v2->unk_04++;
         break;
     case 21:
@@ -251,7 +251,7 @@ static BOOL sub_0207DA28(FieldTask *task)
         }
         break;
     case 22:
-        sub_0207DE04(v2, fieldSystem, HEAP_ID_FIELDMAP, 2);
+        sub_0207DE04(v2, fieldSystem, HEAP_ID_FIELD2, 2);
         v2->unk_04++;
         break;
     case 23:
@@ -261,7 +261,7 @@ static BOOL sub_0207DA28(FieldTask *task)
         break;
     case 24:
         sub_0207DF9C(fieldSystem);
-        v2->unk_10 = sub_0207DEEC(fieldSystem, HEAP_ID_FIELDMAP, v2->unk_14);
+        v2->unk_10 = sub_0207DEEC(fieldSystem, HEAP_ID_FIELD2, v2->unk_14);
         v2->unk_04++;
         break;
     case 25:
@@ -271,7 +271,7 @@ static BOOL sub_0207DA28(FieldTask *task)
         }
         break;
     case 26:
-        sub_0207DE04(v2, fieldSystem, HEAP_ID_FIELDMAP, 3);
+        sub_0207DE04(v2, fieldSystem, HEAP_ID_FIELD2, 3);
         v2->unk_04++;
         break;
     case 27:
@@ -281,7 +281,7 @@ static BOOL sub_0207DA28(FieldTask *task)
         break;
     case 28:
         sub_0207DF9C(fieldSystem);
-        v2->unk_10 = sub_0207DF40(fieldSystem, HEAP_ID_FIELDMAP, v2->unk_14);
+        v2->unk_10 = sub_0207DF40(fieldSystem, HEAP_ID_FIELD2, v2->unk_14);
         v2->unk_04++;
         break;
     case 29:
@@ -299,10 +299,10 @@ static BOOL sub_0207DA28(FieldTask *task)
 
 static UnkStruct_0207DE40 *sub_0207DD94(void)
 {
-    UnkStruct_0207DE40 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0207DE40));
+    UnkStruct_0207DE40 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_0207DE40));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_0207DE40));
-    v0->unk_00 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov98_02247168));
+    v0->unk_00 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov98_02247168));
     MI_CpuClear8(v0->unk_00, sizeof(UnkStruct_ov98_02247168));
     return v0;
 }
@@ -327,7 +327,7 @@ void sub_0207DDE0(FieldTask *param0, u16 *param1)
 
 static void sub_0207DE04(UnkStruct_0207DE40 *param0, FieldSystem *fieldSystem, u32 heapID, u32 param3)
 {
-    UnkStruct_0207DE04 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0207DE04));
+    UnkStruct_0207DE04 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0207DE04));
 
     v0->unk_00 = param3;
     v0->unk_01 = 2;
@@ -385,7 +385,7 @@ static UnkStruct_ov115_02260440 *sub_0207DE90(FieldSystem *fieldSystem, u32 heap
             FS_OVERLAY_ID(overlay115),
         };
 
-        v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov115_02260440));
+        v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov115_02260440));
         memset(v0, 0, sizeof(UnkStruct_ov115_02260440));
 
         v0->unk_38 = param2;
@@ -420,7 +420,7 @@ static UnkStruct_ov66_02231134 *sub_0207DEEC(FieldSystem *fieldSystem, u32 heapI
             FS_OVERLAY_ID(overlay116),
         };
 
-        v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov66_02231134));
+        v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov66_02231134));
         memset(v0, 0, sizeof(UnkStruct_ov66_02231134));
         v0->unk_3C = param2;
         v0->unk_38 = 0;
@@ -455,7 +455,7 @@ static UnkStruct_ov117_02260440 *sub_0207DF40(FieldSystem *fieldSystem, u32 heap
             FS_OVERLAY_ID(overlay117),
         };
 
-        v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov117_02260440));
+        v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov117_02260440));
         MI_CpuClear8(v0, sizeof(UnkStruct_ov117_02260440));
 
         v0->unk_38 = param2;
diff --git a/src/unk_0207E060.c b/src/unk_0207E060.c
index 77224b575d..3408e96a67 100644
--- a/src/unk_0207E060.c
+++ b/src/unk_0207E060.c
@@ -15,7 +15,7 @@ UnkStruct_0207E060 *sub_0207E060(const TrainerInfo *info, u32 heapID)
     UnkStruct_0207E060 *v0;
     BOOL v1;
 
-    v0 = Heap_AllocFromHeap(heapID, (sizeof(UnkStruct_0207E060)));
+    v0 = Heap_Alloc(heapID, (sizeof(UnkStruct_0207E060)));
     memset(v0, 0, (sizeof(UnkStruct_0207E060)));
 
     v0->unk_1B = 28;
diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c
index e01e525ffc..dbfb3a2e74 100644
--- a/src/unk_0207E0B8.c
+++ b/src/unk_0207E0B8.c
@@ -1670,7 +1670,7 @@ static void sub_0207FFC8(GameWindowLayout *param0)
     u8 v1;
 
     Window_EraseMessageBox(&param0->unk_04[32], 1);
-    v0 = Heap_AllocFromHeap(HEAP_ID_12, 8);
+    v0 = Heap_Alloc(HEAP_ID_12, 8);
 
     switch (param0->partyManagementData->unk_20) {
     case 0:
diff --git a/src/unk_02083370.c b/src/unk_02083370.c
index 4ac4699386..0e969dfd11 100644
--- a/src/unk_02083370.c
+++ b/src/unk_02083370.c
@@ -624,7 +624,7 @@ static void sub_02084134(GameWindowLayout *param0)
 
     v1 = &param0->unk_7F8;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_12, sizeof(StrBufWrapper));
+    v0 = Heap_Alloc(HEAP_ID_12, sizeof(StrBufWrapper));
     *v0 = param0->unk_704[v1->unk_300[0]];
 
     param0->unk_704[v1->unk_300[0]] = param0->unk_704[v1->unk_300[1]];
diff --git a/src/unk_020890F4.c b/src/unk_020890F4.c
index 78ccc8e3c8..8018bbdbb9 100644
--- a/src/unk_020890F4.c
+++ b/src/unk_020890F4.c
@@ -156,7 +156,7 @@ static UnkStruct_02089438 *sub_020893B4(int heapID, int param1, int param2[], Op
     int i;
     UnkStruct_02089438 *v1 = NULL;
 
-    v1 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_02089438));
+    v1 = Heap_Alloc(heapID, sizeof(UnkStruct_02089438));
 
     v1->unk_00 = param1;
     v1->unk_1C = Strbuf_Init(param1 + 1, heapID);
diff --git a/src/unk_0208B284.c b/src/unk_0208B284.c
index 9d4ab4aec1..7871117083 100644
--- a/src/unk_0208B284.c
+++ b/src/unk_0208B284.c
@@ -40,7 +40,7 @@ static const int Unk_020F2FB0[] = {
 
 UnkStruct_0208B878 *sub_0208B284(UnkStruct_0208B284 param0, SpriteSystem *param1, SpriteManager *param2, PaletteData *param3)
 {
-    UnkStruct_0208B878 *v0 = Heap_AllocFromHeap(param0.heapID, sizeof(UnkStruct_0208B878));
+    UnkStruct_0208B878 *v0 = Heap_Alloc(param0.heapID, sizeof(UnkStruct_0208B878));
     v0->unk_10.unk_00 = param0.unk_00;
     v0->unk_10.heapID = param0.heapID;
     v0->unk_10.unk_08 = param0.unk_08;
diff --git a/src/unk_0208BA78.c b/src/unk_0208BA78.c
index 7026aaf5ad..7a13bb38e7 100644
--- a/src/unk_0208BA78.c
+++ b/src/unk_0208BA78.c
@@ -95,7 +95,7 @@ static void sub_0208BAAC(ApplicationManager *appMan, int param1)
 
     v0->fieldSystem = ApplicationManager_Args(appMan);
     v0->saveData = v0->fieldSystem->saveData;
-    v0->unk_14 = Heap_AllocFromHeap(HEAP_ID_119, sizeof(UnkStruct_0208C06C));
+    v0->unk_14 = Heap_Alloc(HEAP_ID_119, sizeof(UnkStruct_0208C06C));
 
     MI_CpuFill8(v0->unk_14, 0, sizeof(UnkStruct_0208C06C));
 
diff --git a/src/unk_0208C098.c b/src/unk_0208C098.c
index c80f2a3486..52019b021d 100644
--- a/src/unk_0208C098.c
+++ b/src/unk_0208C098.c
@@ -158,7 +158,7 @@ void sub_0208C210(BgConfig *param0, int heapID, NARC *param2, int param3, int pa
     NNSG2dPaletteData *v4;
 
     v0 = NARC_GetMemberSize(param2, param4);
-    v1 = Heap_AllocFromHeapAtEnd(heapID, v0);
+    v1 = Heap_AllocAtEnd(heapID, v0);
 
     NARC_ReadWholeMember(param2, param4, (void *)v1);
 
@@ -204,7 +204,7 @@ void *sub_0208C2F4(NARC *param0, int param1, int param2, NNSG2dScreenData **para
     void *v1;
 
     v0 = NARC_GetMemberSize(param0, param2);
-    v1 = Heap_AllocFromHeap(heapID, v0);
+    v1 = Heap_Alloc(heapID, v0);
 
     NARC_ReadWholeMember(param0, param2, v1);
     NNS_G2dGetUnpackedScreenData(v1, param3);
diff --git a/src/unk_02092494.c b/src/unk_02092494.c
index 138a57baab..23e962264f 100644
--- a/src/unk_02092494.c
+++ b/src/unk_02092494.c
@@ -32,7 +32,7 @@ static void BoxPokemon_SetFatefulEncounterFlag(BoxPokemon *boxMon);
 
 PokemonInfoDisplayStruct *sub_02092494(Pokemon *param0, BOOL param1, int heapID)
 {
-    PokemonInfoDisplayStruct *v0 = Heap_AllocFromHeap(heapID, sizeof(PokemonInfoDisplayStruct));
+    PokemonInfoDisplayStruct *v0 = Heap_Alloc(heapID, sizeof(PokemonInfoDisplayStruct));
     v0->heapID = heapID;
     v0->unk_04 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEMON_SUMMARY_SCREEN, v0->heapID);
     v0->unk_08 = StringTemplate_New(9, 32, v0->heapID);
diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c
index 1e27b30672..380841d96f 100644
--- a/src/unk_020933F8.c
+++ b/src/unk_020933F8.c
@@ -153,7 +153,7 @@ __attribute__((aligned(4))) static const u8 Unk_020F55D0[][6] = {
 
 void sub_020933F8(FieldTask *param0, UnkStruct_02095C48 *param1)
 {
-    UnkStruct_020933F8 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_020933F8));
+    UnkStruct_020933F8 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_020933F8));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_020933F8));
     v0->unk_00 = param1;
@@ -382,7 +382,7 @@ static UnkStruct_02095C48 *sub_020937C4(void)
     UnkStruct_02095C48 *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_20, sizeof(UnkStruct_02095C48));
+    v0 = Heap_Alloc(HEAP_ID_20, sizeof(UnkStruct_02095C48));
     MI_CpuClear8(v0, sizeof(UnkStruct_02095C48));
 
     v0->unk_00.unk_113 = 0;
@@ -403,7 +403,7 @@ UnkStruct_02095C48 *sub_02093800(const UnkStruct_02093800 *param0)
     int v1 = 4 - 1;
     int v2;
 
-    Heap_Create(HEAP_ID_FIELDMAP, HEAP_ID_20, (0x3000 + 0x1000));
+    Heap_Create(HEAP_ID_FIELD2, HEAP_ID_20, (0x3000 + 0x1000));
 
     v0 = sub_020937C4();
     v0->unk_19A4 = LCRNG_GetSeed();
@@ -431,7 +431,7 @@ UnkStruct_02095C48 *sub_02093800(const UnkStruct_02093800 *param0)
         v0->unk_00.unk_E8[v2] = sub_02029C88(HEAP_ID_20);
     }
 
-    sub_020954F0(v0, HEAP_ID_FIELDMAP, v0->unk_00.unk_10E, v0->unk_00.unk_10F, v0->unk_00.unk_110);
+    sub_020954F0(v0, HEAP_ID_FIELD2, v0->unk_00.unk_10E, v0->unk_00.unk_10F, v0->unk_00.unk_110);
     v0->unk_148 = Party_New(HEAP_ID_20);
 
     for (v2 = 0; v2 < 4; v2++) {
@@ -488,7 +488,7 @@ static void sub_020939E0(UnkStruct_02095C48 *param0, int param1, int param2)
     int v0 = 4 - 1;
     int v1;
 
-    sub_02094F04(param0, HEAP_ID_FIELDMAP, v0, param0->unk_00.unk_10F, param0->unk_00.unk_110, param0->unk_00.unk_111, param1, param2);
+    sub_02094F04(param0, HEAP_ID_FIELD2, v0, param0->unk_00.unk_10F, param0->unk_00.unk_110, param0->unk_00.unk_111, param1, param2);
 
     for (v1 = 1; v1 < 4; v1++) {
         sub_02095380(&param0->unk_00.unk_10[v1], param0->unk_00.unk_00[v1], HEAP_ID_20);
@@ -583,7 +583,7 @@ void sub_02093BBC(UnkStruct_02095C48 *param0)
 
     sub_0202A25C(param0->unk_00.unk_E8[param0->unk_00.unk_113]);
 
-    v0 = Heap_AllocFromHeap(HEAP_ID_20, sizeof(UnkStruct_02093BBC));
+    v0 = Heap_Alloc(HEAP_ID_20, sizeof(UnkStruct_02093BBC));
     MI_CpuClear8(v0, sizeof(UnkStruct_02093BBC));
 
     v0->unk_00 = param0->unk_00.unk_00[param0->unk_00.unk_113];
@@ -1449,7 +1449,7 @@ void sub_02094A58(UnkStruct_02095C48 *param0, int param1)
 
     GF_ASSERT(param0->unk_19A0 == NULL);
 
-    v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(UnkStruct_02094A58));
+    v0 = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(UnkStruct_02094A58));
     MI_CpuClear8(v0, sizeof(UnkStruct_02094A58));
     v0->unk_0C = sub_02095904(param1);
 
diff --git a/src/unk_02094EDC.c b/src/unk_02094EDC.c
index 3657d9c4e9..8c734d334a 100644
--- a/src/unk_02094EDC.c
+++ b/src/unk_02094EDC.c
@@ -417,7 +417,7 @@ void sub_02094F04(UnkStruct_02095C48 *param0, int heapID, int param2, int param3
 
     v9 = LoadMemberFromNARC(NARC_INDEX_CONTEST__DATA__CONTEST_DATA, 0, 0, heapID, 1);
     v6 = NARC_GetMemberSizeByIndexPair(NARC_INDEX_CONTEST__DATA__CONTEST_DATA, 0) / sizeof(UnkStruct_ov6_02248BE8);
-    v2 = Heap_AllocFromHeapAtEnd(heapID, v6 + 1);
+    v2 = Heap_AllocAtEnd(heapID, v6 + 1);
 
     if ((param6 == 1) && (param7 == 1)) {
         v5 = 1;
@@ -691,8 +691,8 @@ void sub_020954F0(UnkStruct_02095C48 *param0, int heapID, int param2, int param3
 
     v6 = LoadMemberFromNARC(NARC_INDEX_CONTEST__DATA__CONTEST_DATA, 1, 0, heapID, 1);
     v5 = NARC_GetMemberSizeByIndexPair(NARC_INDEX_CONTEST__DATA__CONTEST_DATA, 1) / sizeof(UnkStruct_020954F0);
-    v7 = Heap_AllocFromHeapAtEnd(heapID, v5 + 1);
-    v8 = Heap_AllocFromHeapAtEnd(heapID, v5 + 1);
+    v7 = Heap_AllocAtEnd(heapID, v5 + 1);
+    v8 = Heap_AllocAtEnd(heapID, v5 + 1);
 
     for (v0 = 0; v0 < v5; v0++) {
         if (param4 != v6[v0].unk_04_10) {
diff --git a/src/unk_02095AF0.c b/src/unk_02095AF0.c
index aef478520b..7620871867 100644
--- a/src/unk_02095AF0.c
+++ b/src/unk_02095AF0.c
@@ -98,7 +98,7 @@ BOOL sub_02095B5C(UnkStruct_02095C48 *param0, int param1, const UnkStruct_02029C
     int v2;
 
     v1 = sub_02029C64();
-    v0 = Heap_AllocFromHeap(HEAP_ID_20, v1 + 1);
+    v0 = Heap_Alloc(HEAP_ID_20, v1 + 1);
     MI_CpuCopy8(param2, v0, v1);
     v0[v1] = param1;
 
diff --git a/src/unk_020972FC.c b/src/unk_020972FC.c
index ff99477587..d7ba626969 100644
--- a/src/unk_020972FC.c
+++ b/src/unk_020972FC.c
@@ -13,7 +13,7 @@ static void sub_02097344(u32 *param0, u16 param1);
 
 UnkStruct_020972FC *sub_020972FC(u8 heapID)
 {
-    UnkStruct_020972FC *v0 = (UnkStruct_020972FC *)Heap_AllocFromHeap(heapID, sizeof(UnkStruct_020972FC));
+    UnkStruct_020972FC *v0 = (UnkStruct_020972FC *)Heap_Alloc(heapID, sizeof(UnkStruct_020972FC));
     memset(v0, 0, sizeof(UnkStruct_020972FC));
     return v0;
 }
diff --git a/src/unk_0209747C.c b/src/unk_0209747C.c
index db67300ba5..7bbede06db 100644
--- a/src/unk_0209747C.c
+++ b/src/unk_0209747C.c
@@ -35,7 +35,7 @@ struct UnkStruct_0209747C_t {
 
 UnkStruct_0209747C *sub_0209747C(u32 param0, u32 param1, SaveData *saveData, u32 heapID)
 {
-    UnkStruct_0209747C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0209747C));
+    UnkStruct_0209747C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0209747C));
 
     v0->unk_00 = param0;
     v0->unk_01 = param1;
diff --git a/src/unk_02097624.c b/src/unk_02097624.c
index a8a2fb187d..082a08609a 100644
--- a/src/unk_02097624.c
+++ b/src/unk_02097624.c
@@ -60,7 +60,7 @@ UnkStruct_02097728 *sub_02097624(SaveData *saveData, int param1, u8 param2, u8 p
     int v2;
 
     Mailbox *mailbox = SaveData_GetMailbox(saveData);
-    v0 = Heap_AllocFromHeapAtEnd(heapID, sizeof(UnkStruct_02097728));
+    v0 = Heap_AllocAtEnd(heapID, sizeof(UnkStruct_02097728));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_02097728));
 
@@ -81,7 +81,7 @@ UnkStruct_02097728 *sub_02097624(SaveData *saveData, int param1, u8 param2, u8 p
 
 UnkStruct_02097728 *sub_0209767C(SaveData *saveData, int param1, u16 param2, int heapID)
 {
-    UnkStruct_02097728 *v0 = Heap_AllocFromHeapAtEnd(heapID, sizeof(UnkStruct_02097728));
+    UnkStruct_02097728 *v0 = Heap_AllocAtEnd(heapID, sizeof(UnkStruct_02097728));
     MI_CpuClear8(v0, sizeof(UnkStruct_02097728));
 
     v0->unk_00 = 0;
@@ -99,7 +99,7 @@ UnkStruct_02097728 *sub_0209767C(SaveData *saveData, int param1, u16 param2, int
 
 UnkStruct_02097728 *sub_020976BC(SaveData *saveData, Pokemon *param1, int heapID)
 {
-    UnkStruct_02097728 *v0 = Heap_AllocFromHeapAtEnd(heapID, sizeof(UnkStruct_02097728));
+    UnkStruct_02097728 *v0 = Heap_AllocAtEnd(heapID, sizeof(UnkStruct_02097728));
     MI_CpuClear8(v0, sizeof(UnkStruct_02097728));
 
     v0->unk_00 = 0;
@@ -112,7 +112,7 @@ UnkStruct_02097728 *sub_020976BC(SaveData *saveData, Pokemon *param1, int heapID
 
 UnkStruct_02097728 *sub_020976F4(SaveData *saveData, u8 param1, int heapID)
 {
-    UnkStruct_02097728 *v0 = Heap_AllocFromHeapAtEnd(heapID, sizeof(UnkStruct_02097728));
+    UnkStruct_02097728 *v0 = Heap_AllocAtEnd(heapID, sizeof(UnkStruct_02097728));
     MI_CpuClear8(v0, sizeof(UnkStruct_02097728));
 
     v0->unk_00 = 0;
@@ -200,7 +200,7 @@ int sub_020977E4(Mailbox *mailbox, u16 param1, Pokemon *mon, int heapID)
 UnkStruct_020978D8 *sub_02097834(const Mail *mail, int heapID)
 {
     u16 i;
-    UnkStruct_020978D8 *v1 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_020978D8));
+    UnkStruct_020978D8 *v1 = Heap_Alloc(heapID, sizeof(UnkStruct_020978D8));
     MI_CpuClear8(v1, sizeof(UnkStruct_020978D8));
 
     v1->unk_00 = 0;
diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c
index 5ed418ce44..edfe43c13f 100644
--- a/src/unk_02097B18.c
+++ b/src/unk_02097B18.c
@@ -409,15 +409,15 @@ static BOOL sub_02097F38(FieldTask *param0)
 
 void sub_020980DC(FieldTask *param0, SaveData *saveData)
 {
-    UnkStruct_02097F38 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_02097F38));
+    UnkStruct_02097F38 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_02097F38));
 
     memset(v0, 0, sizeof(UnkStruct_02097F38));
     v0->saveData = saveData;
-    v0->unk_08 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_02097F18));
+    v0->unk_08 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_02097F18));
     memset(v0->unk_08, 0, sizeof(UnkStruct_02097F18));
     v0->unk_08->options = SaveData_GetOptions(saveData);
     v0->unk_08->saveData = saveData;
-    v0->unk_0C = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    v0->unk_0C = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PartyManagementData));
     memset(v0->unk_0C, 0, sizeof(PartyManagementData));
 
     FieldTask_InitCall(param0, sub_02097F38, v0);
diff --git a/src/unk_02098218.c b/src/unk_02098218.c
index b306935bba..7b946e98b8 100644
--- a/src/unk_02098218.c
+++ b/src/unk_02098218.c
@@ -195,7 +195,7 @@ static BOOL sub_0209843C(FieldTask *param0)
 
     switch (v0->unk_00) {
     case 0:
-        Egg_CreateHatchedMon(v0->unk_0C.unk_00, HEAP_ID_FIELDMAP);
+        Egg_CreateHatchedMon(v0->unk_0C.unk_00, HEAP_ID_FIELD2);
         FieldTransition_FinishMap(param0);
         v0->unk_00++;
         break;
@@ -211,7 +211,7 @@ static BOOL sub_0209843C(FieldTask *param0)
             TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(FieldSystem_GetSaveData(fieldSystem));
             int v4 = 6;
             int location = MapHeader_GetMapLabelTextID(fieldSystem->location->mapId);
-            int heapID = HEAP_ID_FIELDMAP;
+            int heapID = HEAP_ID_FIELD2;
             int isEgg = FALSE;
 
             Pokemon_SetValue(mon, MON_DATA_IS_EGG, &isEgg);
@@ -235,7 +235,7 @@ static BOOL sub_0209843C(FieldTask *param0)
 
         v9 = Pokemon_GetValue(v0->unk_0C.unk_00, MON_DATA_SPECIES, 0);
 
-        v0->unk_08 = NamingScreenArgs_Init(HEAP_ID_FIELDMAP, NAMING_SCREEN_TYPE_POKEMON, v9, MON_NAME_LEN, SaveData_GetOptions(FieldSystem_GetSaveData(fieldSystem)));
+        v0->unk_08 = NamingScreenArgs_Init(HEAP_ID_FIELD2, NAMING_SCREEN_TYPE_POKEMON, v9, MON_NAME_LEN, SaveData_GetOptions(FieldSystem_GetSaveData(fieldSystem)));
         v0->unk_08->monGender = Pokemon_GetValue(v0->unk_0C.unk_00, MON_DATA_GENDER, NULL);
         v0->unk_08->monForm = Pokemon_GetValue(v0->unk_0C.unk_00, MON_DATA_FORM, NULL);
         FieldTask_RunApplication(param0, &gNamingScreenAppTemplate, v0->unk_08);
@@ -273,7 +273,7 @@ void sub_020985AC(FieldTask *param0, void *param1)
     UnkStruct_0209843C *v0;
     UnkStruct_0203E2FC *v1;
 
-    v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0209843C));
+    v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_0209843C));
     memset(v0, 0, sizeof(UnkStruct_0209843C));
 
     v1 = (UnkStruct_0203E2FC *)param1;
diff --git a/src/unk_020985E4.c b/src/unk_020985E4.c
index 91fd4a2e7e..4a12ccaf9a 100644
--- a/src/unk_020985E4.c
+++ b/src/unk_020985E4.c
@@ -22,8 +22,8 @@ FS_EXTERN_OVERLAY(overlay100);
 
 void sub_020985E4(FieldTask *param0, SaveData *saveData)
 {
-    UnkStruct_0209862C *v0 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0209862C));
-    UnkStruct_020985E4 *v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_020985E4));
+    UnkStruct_0209862C *v0 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0209862C));
+    UnkStruct_020985E4 *v1 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_020985E4));
 
     v1->options = SaveData_GetOptions(saveData);
     v1->unk_08 = SaveData_GetTrainerInfo(saveData);
diff --git a/src/unk_020989DC.c b/src/unk_020989DC.c
index 74b5d30ffa..3622fd316f 100644
--- a/src/unk_020989DC.c
+++ b/src/unk_020989DC.c
@@ -99,7 +99,7 @@ UnkStruct_0203D9B8 *sub_020989DC(SaveData *saveData, int heapID)
     u8 v5 = 0, v6 = 0, v7 = 0;
     u8 v8 = 0;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0203D9B8));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0203D9B8));
     MI_CpuClear8(v0, sizeof(UnkStruct_0203D9B8));
 
     v0->poffinCase = SaveData_GetPoffinCase(saveData);
@@ -283,7 +283,7 @@ static int sub_02098C44(UnkStruct_02098BE4 *param0)
 
     param0->unk_0C->unk_02 = 0;
 
-    partyMan = Heap_AllocFromHeap(param0->heapID, sizeof(PartyManagementData));
+    partyMan = Heap_Alloc(param0->heapID, sizeof(PartyManagementData));
     MI_CpuClear8(partyMan, sizeof(PartyManagementData));
     partyMan->party = param0->unk_0C->unk_10;
     partyMan->bag = param0->unk_0C->unk_14;
@@ -319,7 +319,7 @@ static int sub_02098CB0(UnkStruct_02098BE4 *param0)
         return 0;
     }
 
-    v2 = Heap_AllocFromHeap(param0->heapID, sizeof(PokemonSummary));
+    v2 = Heap_Alloc(param0->heapID, sizeof(PokemonSummary));
 
     v2->monData = param0->unk_0C->unk_10;
     v2->options = param0->unk_0C->options;
@@ -375,7 +375,7 @@ static int sub_02098D7C(UnkStruct_02098BE4 *param0)
         ov79_021D2460,
         FS_OVERLAY_ID(overlay79),
     };
-    UnkStruct_02098DE8 *v1 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_02098DE8));
+    UnkStruct_02098DE8 *v1 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_02098DE8));
     MI_CpuClear8(v1, sizeof(UnkStruct_02098DE8));
 
     v1->unk_08 = param0->unk_0C->unk_1C[param0->unk_0C->unk_01].unk_02;
@@ -415,7 +415,7 @@ static int sub_02098E0C(UnkStruct_02098BE4 *param0)
         4, 8
     };
 
-    v1 = Heap_AllocFromHeap(param0->heapID, sizeof(PokemonSummary));
+    v1 = Heap_Alloc(param0->heapID, sizeof(PokemonSummary));
     v2 = PoffinCase_AllocateForSlot(param0->unk_0C->poffinCase, param0->unk_0C->unk_1C[param0->unk_0C->unk_01].unk_00, param0->heapID);
 
     v1->monData = param0->unk_0C->unk_10;
diff --git a/src/unk_02098FFC.c b/src/unk_02098FFC.c
index ea33c53ac1..45883e08ed 100644
--- a/src/unk_02098FFC.c
+++ b/src/unk_02098FFC.c
@@ -22,7 +22,7 @@ static s16 sub_020994B8(UnkStruct_0209903C *param0, u8 param1);
 
 UnkStruct_0209903C *sub_02098FFC(int heapID, u16 param1, u16 param2, u16 param3, int param4)
 {
-    UnkStruct_0209903C *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0209903C));
+    UnkStruct_0209903C *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0209903C));
     MI_CpuClear8(v0, sizeof(UnkStruct_0209903C));
 
     v0->heapID = heapID;
@@ -68,7 +68,7 @@ static void sub_02099058(UnkStruct_0209903C *param0)
 
     sub_020993A8(param0);
 
-    param0->unk_1C4 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_0209903C_sub1));
+    param0->unk_1C4 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_0209903C_sub1));
     MI_CpuClear8(param0->unk_1C4, sizeof(UnkStruct_0209903C_sub1));
 }
 
@@ -109,7 +109,7 @@ UnkStruct_0209916C *sub_0209916C(UnkStruct_0209903C *param0, int param1, u16 par
         return NULL;
     }
 
-    v3 = Heap_AllocFromHeap(param0->heapID, sizeof(UnkStruct_0209916C));
+    v3 = Heap_Alloc(param0->heapID, sizeof(UnkStruct_0209916C));
     MI_CpuClear8(v3, sizeof(UnkStruct_0209916C));
     v3->unk_00 = v1;
 
@@ -124,10 +124,10 @@ UnkStruct_0209916C *sub_0209916C(UnkStruct_0209903C *param0, int param1, u16 par
     SpriteResourceCollection_ModifyPalette(param0->unk_1A4[1], param0->unk_1B4[1]->resources[v1], 88, 3 + param1, 0, param0->heapID);
     SpriteTransfer_ReplacePlttData(param0->unk_1B4[1]->resources[v1]);
 
-    v4 = Heap_AllocFromHeap(param0->heapID, sizeof(ManagedSprite));
+    v4 = Heap_Alloc(param0->heapID, sizeof(ManagedSprite));
 
-    v4->resourceHeaderList = Heap_AllocFromHeap(param0->heapID, sizeof(SpriteResourcesHeaderList));
-    v4->resourceHeaderList->headers = Heap_AllocFromHeap(param0->heapID, sizeof(SpriteResourcesHeader));
+    v4->resourceHeaderList = Heap_Alloc(param0->heapID, sizeof(SpriteResourcesHeaderList));
+    v4->resourceHeaderList->headers = Heap_Alloc(param0->heapID, sizeof(SpriteResourcesHeader));
     v4->resourceHeader = v4->resourceHeaderList->headers;
 
     SpriteResourcesHeader_Init(v4->resourceHeader, 0xe000, 0xe000 + v1, 0xe000, 0xe000, 0xffffffff, 0xffffffff, 0, param5, param0->unk_1A4[0], param0->unk_1A4[1], param0->unk_1A4[2], param0->unk_1A4[3], NULL, NULL);
diff --git a/src/unk_02099604.c b/src/unk_02099604.c
index 62b571153c..40e5bc14fa 100644
--- a/src/unk_02099604.c
+++ b/src/unk_02099604.c
@@ -17,7 +17,7 @@ FS_EXTERN_OVERLAY(overlay82);
 
 static UnkStruct_ov82_0223B164 *sub_02099604(int param0, SaveData *saveData, int heapID, JournalEntry *journalEntry)
 {
-    UnkStruct_ov82_0223B164 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_ov82_0223B164));
+    UnkStruct_ov82_0223B164 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_ov82_0223B164));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov82_0223B164));
 
     v0->saveData = saveData;
diff --git a/src/unk_020997B8.c b/src/unk_020997B8.c
index cc2cc3a73b..8bfae6c0ef 100644
--- a/src/unk_020997B8.c
+++ b/src/unk_020997B8.c
@@ -10,7 +10,7 @@
 
 UnkStruct_020997B8 *sub_020997B8(u32 heapID)
 {
-    UnkStruct_020997B8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_020997B8));
+    UnkStruct_020997B8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_020997B8));
 
     memset(v0, 0, sizeof(UnkStruct_020997B8));
     return v0;
@@ -39,8 +39,8 @@ u16 *sub_020997D8(Pokemon *mon, u32 heapID)
         v2[v7] = (u16)Pokemon_GetValue(mon, MON_DATA_MOVE1 + v7, NULL);
     }
 
-    v0 = Heap_AllocFromHeap(heapID, (44 / 2) * 2);
-    v1 = Heap_AllocFromHeap(heapID, (44 / 2) * 2);
+    v0 = Heap_Alloc(heapID, (44 / 2) * 2);
+    v1 = Heap_Alloc(heapID, (44 / 2) * 2);
 
     Pokemon_LoadLevelUpMovesOf(v3, v5, v0);
 
diff --git a/src/unk_020998EC.c b/src/unk_020998EC.c
index 9856cc2ca1..c6b7ba4871 100644
--- a/src/unk_020998EC.c
+++ b/src/unk_020998EC.c
@@ -3165,7 +3165,7 @@ UnkStruct_020998EC *sub_020998EC(u32 heapID, const UnkStruct_0209747C *param1)
     UnkStruct_020998EC *v0;
     int v1;
 
-    v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_020998EC));
+    v0 = Heap_Alloc(heapID, sizeof(UnkStruct_020998EC));
     v0->unk_00 = param1;
     v0->unk_04 = sub_02014D38(heapID);
 
diff --git a/src/unk_0209ACF4.c b/src/unk_0209ACF4.c
index 67e8287723..105de7325c 100644
--- a/src/unk_0209ACF4.c
+++ b/src/unk_0209ACF4.c
@@ -63,15 +63,15 @@ static int sub_0209B288(UnkStruct_0209AD84 *param0);
 void sub_0209ACF4(FieldTask *param0)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
-    UnkStruct_0209AD84 *v1 = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, sizeof(UnkStruct_0209AD84));
+    UnkStruct_0209AD84 *v1 = Heap_Alloc(HEAP_ID_FIELD3, sizeof(UnkStruct_0209AD84));
 
     v1->fieldSystem = fieldSystem;
-    v1->unk_04 = Strbuf_Init(400, HEAP_ID_FIELD_TASK);
-    v1->unk_08 = Strbuf_Init(400, HEAP_ID_FIELD_TASK);
-    v1->unk_0C = StringTemplate_Default(HEAP_ID_FIELD_TASK);
-    v1->unk_10 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0420, HEAP_ID_FIELD_TASK);
-    v1->unk_14 = ColoredArrow_New(HEAP_ID_FIELD_TASK);
-    v1->unk_50 = sub_0209747C(2, 0, v1->fieldSystem->saveData, HEAP_ID_FIELD_TASK);
+    v1->unk_04 = Strbuf_Init(400, HEAP_ID_FIELD3);
+    v1->unk_08 = Strbuf_Init(400, HEAP_ID_FIELD3);
+    v1->unk_0C = StringTemplate_Default(HEAP_ID_FIELD3);
+    v1->unk_10 = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0420, HEAP_ID_FIELD3);
+    v1->unk_14 = ColoredArrow_New(HEAP_ID_FIELD3);
+    v1->unk_50 = sub_0209747C(2, 0, v1->fieldSystem->saveData, HEAP_ID_FIELD3);
 
     sub_02097520(v1->unk_50);
     Window_Init(&(v1->unk_18));
@@ -296,7 +296,7 @@ static void sub_0209B12C(UnkStruct_0209AD84 *param0)
     if (Window_IsInUse(v0) == 0) {
         int v1;
 
-        LoadStandardWindowGraphics(param0->fieldSystem->bgConfig, 3, 155, 11, 0, HEAP_ID_FIELD_TASK);
+        LoadStandardWindowGraphics(param0->fieldSystem->bgConfig, 3, 155, 11, 0, HEAP_ID_FIELD3);
         Window_Add(param0->fieldSystem->bgConfig, v0, 3, 1, 1, 13, 10, 13, 1);
         Window_FillTilemap(v0, 15);
 
@@ -328,7 +328,7 @@ static void sub_0209B1D8(UnkStruct_0209AD84 *param0)
     if (Window_IsInUse(v0) == 0) {
         int v1;
 
-        LoadStandardWindowGraphics(param0->fieldSystem->bgConfig, 3, 155, 11, 0, HEAP_ID_FIELD_TASK);
+        LoadStandardWindowGraphics(param0->fieldSystem->bgConfig, 3, 155, 11, 0, HEAP_ID_FIELD3);
         Window_Add(param0->fieldSystem->bgConfig, v0, 3, 25, 13, 6, 4, 13, 131);
         Window_FillTilemap(v0, 15);
 
diff --git a/src/unk_0209B344.c b/src/unk_0209B344.c
index 935a678283..cd23c4796f 100644
--- a/src/unk_0209B344.c
+++ b/src/unk_0209B344.c
@@ -35,11 +35,11 @@ static BOOL sub_0209B3C4(FieldTask *param0);
 void sub_0209B344(FieldTask *param0, u16 *param1)
 {
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0);
-    UnkStruct_0209B3AC *v1 = Heap_AllocFromHeap(HEAP_ID_FIELD_TASK, sizeof(UnkStruct_0209B3AC));
+    UnkStruct_0209B3AC *v1 = Heap_Alloc(HEAP_ID_FIELD3, sizeof(UnkStruct_0209B3AC));
 
     v1->fieldSystem = fieldSystem;
-    v1->unk_04 = StringTemplate_Default(HEAP_ID_FIELD_TASK);
-    v1->unk_10 = sub_0209747C(2, 0, v1->fieldSystem->saveData, HEAP_ID_FIELD_TASK);
+    v1->unk_04 = StringTemplate_Default(HEAP_ID_FIELD3);
+    v1->unk_10 = sub_0209747C(2, 0, v1->fieldSystem->saveData, HEAP_ID_FIELD3);
     v1->unk_14 = SaveData_MiscSaveBlock(fieldSystem->saveData);
     v1->unk_20 = param1;
 
diff --git a/src/unk_0209B6F8.c b/src/unk_0209B6F8.c
index 0f115fb6d8..3d3a869be1 100644
--- a/src/unk_0209B6F8.c
+++ b/src/unk_0209B6F8.c
@@ -72,7 +72,7 @@ int sub_0209B6F8(ApplicationManager *appMan, int *param1)
 
     sub_0209B924();
 
-    v0 = ApplicationManager_NewData(appMan, sizeof(UnkStruct_0209B75C), HEAP_ID_FIELDMAP);
+    v0 = ApplicationManager_NewData(appMan, sizeof(UnkStruct_0209B75C), HEAP_ID_FIELD2);
     MI_CpuClear8(v0, sizeof(UnkStruct_0209B75C));
 
     sub_0209B8E8(v0);
@@ -81,7 +81,7 @@ int sub_0209B6F8(ApplicationManager *appMan, int *param1)
     v0->unk_00 = ApplicationManager_Args(appMan);
     GF_ASSERT(v0->unk_00 != NULL);
 
-    v0->unk_14 = ov104_0222E63C(v0, HEAP_ID_FIELDMAP, v0->unk_00->unk_24);
+    v0->unk_14 = ov104_0222E63C(v0, HEAP_ID_FIELD2, v0->unk_00->unk_24);
     ov104_0222E748(v0->unk_14, v0->unk_00->unk_24, 0);
 
     sub_0209B8C8(v0);
@@ -162,14 +162,14 @@ int sub_0209B75C(ApplicationManager *appMan, int *param1)
         sub_0209B8C8(v0);
 
         if (v0->unk_20 == 0xffff) {
-            ov104_0222E86C(v0->unk_14, v0->unk_00->unk_24, HEAP_ID_FIELDMAP);
+            ov104_0222E86C(v0->unk_14, v0->unk_00->unk_24, HEAP_ID_FIELD2);
         } else {
             UnkStruct_ov104_0222E8C8 *v2;
 
-            v2 = ov104_0222E8C8(v0->unk_14, HEAP_ID_FIELDMAP);
+            v2 = ov104_0222E8C8(v0->unk_14, HEAP_ID_FIELD2);
             ov104_0222E710(v0->unk_14);
 
-            v0->unk_14 = ov104_0222E63C(v0, HEAP_ID_FIELDMAP, v0->unk_00->unk_24);
+            v0->unk_14 = ov104_0222E63C(v0, HEAP_ID_FIELD2, v0->unk_00->unk_24);
             ov104_0222E748(v0->unk_14, v0->unk_00->unk_24, v0->unk_20);
             ov104_0222E8E8(v0->unk_14, v2);
         }
@@ -259,7 +259,7 @@ void sub_0209B980(UnkStruct_0209B75C *param0, void *param1)
 void sub_0209B988(UnkStruct_0209B75C *param0, const ApplicationManagerTemplate *param1, void *param2, int param3, UnkFuncPtr_0209B988 param4)
 {
     GF_ASSERT(param0->appMan == NULL);
-    param0->appMan = ApplicationManager_New(param1, param2, HEAP_ID_FIELDMAP);
+    param0->appMan = ApplicationManager_New(param1, param2, HEAP_ID_FIELD2);
     param0->unk_08 = param2;
     param0->unk_10 = param3;
     param0->unk_0C = param4;
diff --git a/src/unk_0209BA18.c b/src/unk_0209BA18.c
index 11d4e66db6..bea11c1da2 100644
--- a/src/unk_0209BA18.c
+++ b/src/unk_0209BA18.c
@@ -25,7 +25,7 @@ static BOOL ov104_02239C88(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2);
 
 UnkStruct_ov104_02230BE4 *sub_0209BA18(FieldSystem *fieldSystem, void *param1)
 {
-    UnkStruct_ov104_02230BE4 *v0 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_ov104_02230BE4));
+    UnkStruct_ov104_02230BE4 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov104_02230BE4));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_ov104_02230BE4));
 
diff --git a/src/unk_0209BDF8.c b/src/unk_0209BDF8.c
index 3dc818cee3..fcec2ab7f4 100644
--- a/src/unk_0209BDF8.c
+++ b/src/unk_0209BDF8.c
@@ -37,13 +37,13 @@ static const UnkFuncPtr_020F8E60 Unk_020F8E60[18];
 
 UnkStruct_0209BDF8 *sub_0209BDF8(UnkStruct_0209C194 *param0, u32 heapID)
 {
-    UnkStruct_0209BDF8 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0209BDF8));
+    UnkStruct_0209BDF8 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0209BDF8));
     GF_ASSERT(v0 != NULL);
     memset(v0, 0, sizeof(UnkStruct_0209BDF8));
 
     v0->unk_00 = param0;
-    v0->unk_4C = Heap_AllocFromHeap(heapID, 5 * (236 * 6 + 4 * 2));
-    v0->unk_50 = Heap_AllocFromHeap(heapID, 5 * (236 * 6 + 4 * 2));
+    v0->unk_4C = Heap_Alloc(heapID, 5 * (236 * 6 + 4 * 2));
+    v0->unk_50 = Heap_Alloc(heapID, 5 * (236 * 6 + 4 * 2));
 
     return v0;
 }
diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c
index 7eec2de02f..524af667a3 100644
--- a/src/unk_0209C194.c
+++ b/src/unk_0209C194.c
@@ -41,7 +41,7 @@ static const ApplicationManagerTemplate Unk_020F950C;
 
 UnkStruct_0209C194 *sub_0209C194(UnkStruct_0209C194_1 *param0, u32 heapID)
 {
-    UnkStruct_0209C194 *v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0209C194));
+    UnkStruct_0209C194 *v0 = Heap_Alloc(heapID, sizeof(UnkStruct_0209C194));
     memset(v0, 0, sizeof(UnkStruct_0209C194));
     v0->unk_14 = *param0;
     v0->unk_34 = sub_0209BDF8(v0, heapID);
@@ -63,7 +63,7 @@ BOOL sub_0209C1E8(UnkStruct_0209C194 *param0)
 
 void *sub_0209C1EC(FieldSystem *fieldSystem)
 {
-    UnkStruct_0209C1EC *v0 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0209C1EC));
+    UnkStruct_0209C1EC *v0 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_0209C1EC));
     memset(v0, 0, sizeof(UnkStruct_0209C1EC));
 
     v0->fieldSystem = fieldSystem;
@@ -92,7 +92,7 @@ BOOL sub_0209C238(void *param0)
 
 static BOOL sub_0209C25C(UnkStruct_0209C1EC *param0)
 {
-    param0->unk_28 = sub_0209C194(&param0->unk_08, HEAP_ID_FIELDMAP);
+    param0->unk_28 = sub_0209C194(&param0->unk_08, HEAP_ID_FIELD2);
     param0->unk_00 = 1;
     FieldSystem_StartChildProcess(param0->fieldSystem, &Unk_020F94FC, param0->unk_28);
     return 0;
diff --git a/src/unk_0209C370.c b/src/unk_0209C370.c
index 4b5002f7df..868e05bafb 100644
--- a/src/unk_0209C370.c
+++ b/src/unk_0209C370.c
@@ -4,7 +4,7 @@
 
 u8 *sub_0209C370(int heapID)
 {
-    u8 *v0 = Heap_AllocFromHeap(heapID, sizeof(void *));
+    u8 *v0 = Heap_Alloc(heapID, sizeof(void *));
     MI_CpuClear8(v0, sizeof(void *));
     return v0;
 }
diff --git a/src/vram_transfer.c b/src/vram_transfer.c
index c2fcb76d33..69b822d73a 100644
--- a/src/vram_transfer.c
+++ b/src/vram_transfer.c
@@ -16,13 +16,13 @@ typedef struct VramTransferTaskManager {
 
 static VramTransferTaskManager *sTransferTaskManager;
 
-void VramTransfer_New(u32 capacity, enum HeapId heapID)
+void VramTransfer_New(u32 capacity, enum HeapID heapID)
 {
     GF_ASSERT(sTransferTaskManager == NULL);
-    sTransferTaskManager = Heap_AllocFromHeap(heapID, sizeof(VramTransferTaskManager));
+    sTransferTaskManager = Heap_Alloc(heapID, sizeof(VramTransferTaskManager));
     GF_ASSERT(sTransferTaskManager);
 
-    sTransferTaskManager->tasks = Heap_AllocFromHeap(heapID, sizeof(NNSGfdVramTransferTask) * capacity);
+    sTransferTaskManager->tasks = Heap_Alloc(heapID, sizeof(NNSGfdVramTransferTask) * capacity);
     sTransferTaskManager->max = capacity;
     sTransferTaskManager->cur = 0;