Restyle function names

include/error_handling.h

@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_ERROR_HANDLING_H
 #define POKEPLATINUM_ERROR_HANDLING_H
 
-void GF_AssertFail(void);
+void ErrorHandling_AssertFail(void);
 
 #endif // POKEPLATINUM_ERROR_HANDLING_H

include/error_message_reset.h

@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_ERROR_MESSAGE_RESET_H
 #define POKEPLATINUM_ERROR_MESSAGE_RESET_H
 
-void PrintErrorMessageAndReset(void);
+void ErrorMessageReset_PrintErrorAndReset(void);
 
 #endif // POKEPLATINUM_ERROR_MESSAGE_RESET_H

include/game_overlay.h

@@ -9,8 +9,8 @@ typedef enum PMOverlayLoadType {
     OVERLAY_LOAD_ASYNC
 } PMOverlayLoadType;
 
-void UnloadOverlayByID(const FSOverlayID param0);
-int GetOverlayLoadDestination(const FSOverlayID param0);
-BOOL HandleLoadOverlay(const FSOverlayID param0, int param1);
+void Overlay_UnloadByID(const FSOverlayID param0);
+int Overlay_GetLoadDestination(const FSOverlayID param0);
+BOOL Overlay_LoadByID(const FSOverlayID param0, int param1);
 
 #endif // POKEPLATINUM_UNK_020064F0_H

include/global/assert.h

@@ -8,18 +8,18 @@
  * Pass NO_GF_ASSERT=1 to make to remove these.
  */
 #ifdef PM_KEEP_ASSERTS
-#define GF_ASSERT(expr) ((expr) ? (void)0 : GF_AssertFail())
+#define GF_ASSERT(expr) ((expr) ? (void)0 : ErrorHandling_AssertFail())
 #else
 #define GF_ASSERT(...) ((void)0)
 #endif //PM_KEEP_ASSERTS
 
 /*
- * void GF_AssertFail(void)
+ * void ErrorHandling_AssertFail(void)
  *
  * Called when an assertion fails.
  * Do not use this directly.
  * Instead, use the GF_ASSERT macro defined above.
  */
-void GF_AssertFail(void);
+void ErrorHandling_AssertFail(void);
 
 #endif //POKEPLATINUM_ASSERT_H

include/gx_layers.h

@@ -3,15 +3,15 @@
 
 #include "struct_defs/struct_02099F80.h"
 
-void GX_SetBanks(const UnkStruct_02099F80 * banks);
-void GX_DisableEngineALayers(void);
-void GX_EngineAToggleLayers(u8 layerMask, u8 enable);
-void GX_EngineASetLayers(int layers);
-void GX_DisableEngineBLayers(void);
-void GX_EngineBToggleLayers(u8 layerMask, u8 enable);
-void GX_EngineBSetLayers(int layers);
-void GX_BothDispOn(void);
-void GX_SwapDisplay(void);
-int  GX_EngineAGetLayers(void);
+void GXLayers_SetBanks(const UnkStruct_02099F80 * banks);
+void GXLayers_DisableEngineALayers(void);
+void GXLayers_EngineAToggleLayers(u8 layerMask, u8 enable);
+void GXLayers_EngineASetLayers(int layers);
+void GXLayers_DisableEngineBLayers(void);
+void GXLayers_EngineBToggleLayers(u8 layerMask, u8 enable);
+void GXLayers_EngineBSetLayers(int layers);
+void GXLayers_TurnBothDispOn(void);
+void GXLayers_SwapDisplay(void);
+int  GXLayers_EngineAGetLayers(void);
 
 #endif // POKEPLATINUM_GX_LAYERS_H

include/heap.h

@@ -5,16 +5,16 @@
 
 #include <nnsys.h>
 
-BOOL CreateHeap(u32 parent, u32 child, u32 size);
-BOOL CreateHeapAtEnd(u32 parent, u32 child, u32 size);
-void DestroyHeap(u32 heapID);
-void * AllocFromHeap(u32 heapID, u32 size);
-void * AllocFromHeapAtEnd(u32 heapID, u32 size);
-void FreeToHeap(void * ptr);
-void FreeToHeapExplicit(u32 heapID, void * ptr);
-u32 GF_ExpHeap_FndGetTotalFreeSize(u32 heapID);
-void GF_ExpHeap_FndInitAllocator(NNSFndAllocator * pAllocator, u32 heapID, int alignment);
-void ReallocFromHeap(void * ptr, u32 newSize);
+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);
+void Heap_FreeToHeap(void * ptr);
+void Heap_FreeToHeapExplicit(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);
 BOOL GF_heap_c_dummy_return_true(u32 heapID);
 
 #endif // POKEPLATINUM_UNK_02017E74_H

include/inlines.h

@@ -40,7 +40,7 @@ static inline void inline_ov61_0222C3B0 (UnkStruct_ov61_0222C3B0 * param0, NARC
 
     MI_CpuCopy16(&((u16 *)(v0->pRawData))[0 * 16], param0->unk_08, 4 * 0x20);
     MI_CpuCopy16(&((u16 *)(v0->pRawData))[0 * 16], param0->unk_88, 4 * 0x20);
-    FreeToHeap(v1);
+    Heap_FreeToHeap(v1);
     inline_ov61_0222C3B0_sub_1(param0);
 
     param0->unk_04 = 1;

include/item.h

@@ -7,23 +7,23 @@
 void sub_0207CDEC(void * param0, u16 param1, u16 param2);
 u16 sub_0207CE78(u16 param0, u16 param1);
 u16 sub_0207CF10(u16 param0);
-u16 GetItemIconCellArchiveIndex(void);
-u16 GetItemIconCellAnimationArchiveIndex(void);
-void * LoadItemDataOrGfx(u16 param0, u16 param1, u32 param2);
-void GetItemNameIntoString(UnkStruct_02023790 * param0, u16 param1, u32 param2);
-void GetItemDescriptionIntoString(UnkStruct_02023790 * param0, u16 param1, u16 param2);
-s32 GetItemAttribute(u16 param0, u16 param1, u32 param2);
-s32 GetItemAttributeFromStruct(UnkStruct_0207D3B0 * param0, u16 param1);
+u16 Item_GetIndexOfIconNCER(void);
+u16 Item_GetIndexOfIconNANR(void);
+void * Item_LoadDataOrGFX(u16 param0, u16 param1, u32 param2);
+void Item_GetNameIntoString(UnkStruct_02023790 * param0, u16 param1, u32 param2);
+void Item_GetDescriptionIntoString(UnkStruct_02023790 * param0, u16 param1, u16 param2);
+s32 Item_GetAttribute(u16 param0, u16 param1, u32 param2);
+s32 Item_GetAttributeFromStruct(UnkStruct_0207D3B0 * param0, u16 param1);
 const u16 GetMoveFromTMOrHMItemID(u16 param0);
-u8 IsMoveHM(u16 param0);
-u8 GetTMOrHMNumberFromItemID(u16 param0);
-u8 IsItemMail(u16 param0);
+u8 Item_IsMoveHM(u16 param0);
+u8 Item_GetTMOrHMNumberFromID(u16 param0);
+u8 Item_IsMail(u16 param0);
 u8 sub_0207D2F0(u16 param0);
 u16 sub_0207D310(u8 param0);
-u8 IsItemBerry(u16 param0);
+u8 Item_IsBerry(u16 param0);
 u8 sub_0207D344(u16 param0);
 u16 sub_0207D354(u8 param0);
-u8 IsItemHerbalMedicine(u16 param0);
+u8 Item_IsHerbalMedicine(u16 param0);
 void * sub_0207D388(int param0);
 UnkStruct_0207D3B0 * sub_0207D3B0(UnkStruct_0207D3B0 * param0, u16 param1);
 

include/map_header.h

@@ -24,7 +24,7 @@ typedef struct {
     u16 isFlyAllowed : 1;
 } MapHeader;
 
-u32 HeaderIdBoundsCheck(u32 param0);
+u32 MapHeader_IDBoundsCheck(u32 param0);
 const u16 sub_0203A038(u32 param0);
 const u16 sub_0203A04C(u32 param0);
 const u16 MapHeader_GetMapMatrixID(u32 param0);

include/move_table.h

@@ -18,9 +18,9 @@ typedef enum MoveAttribute {
     MOVEATTRIBUTE_CONTEST_TYPE,
 } MoveAttribute;
 
-void LoadMoveTable(void * dest);
-u32 GetMoveAttribute(int moveID, int attrno);
-u8 GetMoveMaxPP(u16 moveID, u8 ppUps);
-u32 GetMoveTableAttribute(MoveTable * moveTable, int attribute);
+void MoveTable_Load(void * dest);
+u32 MoveTable_GetMoveAttribute(int moveID, int attrno);
+u8 MoveTable_GetMoveMaxPP(u16 moveID, u8 ppUps);
+u32 MoveTable_GetAttribute(MoveTable * moveTable, int attribute);
 
 #endif // POKEPLATINUM_UNK_020790B0_H

include/narc.h

@@ -23,7 +23,7 @@ struct NARC {
  * @param narcIndex:      Index of NARC to read
  * @param memebrIndex:    Index of FAT member within the NARC
  */
-void ReadWholeNarcMemberByIndexPair(void * dest, int narcIndex, int memberIndex);
+void NARC_ReadWholeMemberByIndexPair(void * dest, int narcIndex, int memberIndex);
 
 /*
  * Creates a new buffer large enough to hold the content of the archive member, then reads its data.
@@ -35,8 +35,8 @@ void ReadWholeNarcMemberByIndexPair(void * dest, int narcIndex, int memberIndex)
  *
  * @returns: Pointer to the allocated buffer which contains the data that was read.
  */
-void * AllocAndReadWholeNarcMemberByIndexPair(int narcIndex, int memberIndex, int heapID);
-void * AllocAtEndAndReadWholeNarcMemberByIndexPair(int narcIndex, int memberIndex, int heapID);
+void * NARC_AllocAndReadWholeMemberByIndexPair(int narcIndex, int memberIndex, int heapID);
+void * NARC_AllocAtEndAndReadWholeMemberByIndexPair(int narcIndex, int memberIndex, int heapID);
 
 /*
  * Reads a portion of an archive member into an existing buffer
@@ -47,7 +47,7 @@ void * AllocAtEndAndReadWholeNarcMemberByIndexPair(int narcIndex, int memberInde
  * @param offset:         Byte offset to start reading, relative to start of member, up to the end of member
  * @param bytesToRead:    Number of bytes to read, up to the total bytesToRead of member minus offset
  */
-void ReadFromNarcMemberByIndexPair(void * dest, int narcIndex, int memberIndex, int offset, int bytesToRead);
+void NARC_ReadFromMemberByIndexPair(void * dest, int narcIndex, int memberIndex, int offset, int bytesToRead);
 
 /*
  * Creates a new buffer large enough to hold the size of the data to read, then reads the specified data slice.
@@ -61,8 +61,8 @@ void ReadFromNarcMemberByIndexPair(void * dest, int narcIndex, int memberIndex,
  *
  * @returns: Pointer to the allocated buffer which contains the data that was read.
  */
-void * AllocAndReadFromNarcMemberByIndexPair(int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead);
-void * AllocAtEndAndReadFromNarcMemberByIndexPair(int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead);
+void * NARC_AllocAndReadFromMemberByIndexPair(int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead);
+void * NARC_AllocAtEndAndReadFromMemberByIndexPair(int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead);
 
 /*
  * Gets the size of a NARC member. Useful when managing the read buffer yourself and the NARC has variable
@@ -73,7 +73,7 @@ void * AllocAtEndAndReadFromNarcMemberByIndexPair(int narcIndex, int memberIndex
  *
  * @returns: Size in bytes of the member
  */
-u32 GetNarcMemberSizeByIndexPair(int narcIndex, int memberIndex);
+u32 NARC_GetMemberSizeByIndexPair(int narcIndex, int memberIndex);
 
 /*
  * Constructs a new NARC which contains an open FSFile to the corresponding archive.

include/party.h

@@ -18,6 +18,6 @@ void sub_0207A128(Party * party, int slot, UnkStruct_02073C74 * param2);
 BOOL Party_SwapSlots(Party * party, int slotA, int slotB);
 void Party_cpy(const Party * src, Party * dest);
 BOOL Party_HasSpecies(const Party * party, int species);
-Party * GetPartyFromSavedata(UnkStruct_021C0794 * party);
+Party * Party_GetFromSavedata(UnkStruct_021C0794 * party);
 
 #endif // POKEPLATINUM_UNK_02079FEC_H

main.lsf

@@ -21,10 +21,10 @@ Static main
 	Object src/unk_020041CC.o
 	Object src/unk_02005474.o
 	Object src/unk_02006224.o
-	Object src/poke_overlay.o
+	Object src/game_overlay.o
 	Object src/unk_0200679C.o
 	Object src/unk_020067E8.o
-	Object src/filesystem.o
+	Object src/narc.o
 	Object src/unk_02006E3C.o
 	Object src/unk_0200762C.o
 	Object src/unk_020093B4.o

src/error_handling.c

@@ -5,11 +5,11 @@
 #include "unk_020366A0.h"
 #include "error_message_reset.h"
 
-void GF_AssertFail(void);
+void ErrorHandling_AssertFail(void);
 
-void GF_AssertFail (void)
+void ErrorHandling_AssertFail (void)
 {
     if (sub_02036780() && (OS_GetProcMode() != OS_PROCMODE_IRQ)) {
-        PrintErrorMessageAndReset();
+        ErrorMessageReset_PrintErrorAndReset();
     }
 }

src/error_message_reset.c

@@ -91,7 +91,7 @@ static void VBlankIntr (void)
     MI_WaitDma(GX_DEFAULT_DMAID);
 }
 
-void PrintErrorMessageAndReset (void)
+void ErrorMessageReset_PrintErrorAndReset (void)
 {
     UnkStruct_02018340 * bgConfig;
     UnkStruct_0205AA50 window;
@@ -107,7 +107,7 @@ void PrintErrorMessageAndReset (void)
     sErrorMessagePrinterLock = TRUE;
 
     OS_InitArenaHiAndLo(OS_ARENA_MAIN);
-    InitHeapSystem(sErrorMessageHeapParams, NELEMS(sErrorMessageHeapParams), NELEMS(sErrorMessageHeapParams), 0);
+    Heap_InitSystem(sErrorMessageHeapParams, NELEMS(sErrorMessageHeapParams), NELEMS(sErrorMessageHeapParams), 0);
 
     v4 = 3;
 
@@ -121,22 +121,22 @@ void PrintErrorMessageAndReset (void)
     sub_02017798(NULL, NULL);
     sub_020177BC(NULL, NULL);
 
-    GX_DisableEngineALayers();
-    GX_DisableEngineBLayers();
+    GXLayers_DisableEngineALayers();
+    GXLayers_DisableEngineBLayers();
 
     GX_SetVisiblePlane(0);
     GXS_SetVisiblePlane(0);
 
     sub_02017DD4(4, 8);
     Unk_021BF67C.unk_65 = 0;
-    GX_SwapDisplay();
+    GXLayers_SwapDisplay();
 
     G2_BlendNone();
     G2S_BlendNone();
     GX_SetVisibleWnd(GX_WNDMASK_NONE);
     GXS_SetVisibleWnd(GX_WNDMASK_NONE);
 
-    GX_SetBanks(&sErrorMessageBanksConfig);
+    GXLayers_SetBanks(&sErrorMessageBanksConfig);
     bgConfig = sub_02018340(v5);
 
     sub_02018368(&sErrorMessageBgModeSet);
@@ -160,7 +160,7 @@ void PrintErrorMessageAndReset (void)
     sub_0201D738(&window, 0, errorString, 0, 0, 0, NULL);
     sub_020237BC(errorString);
 
-    GX_BothDispOn();
+    GXLayers_TurnBothDispOn();
     sub_0200F338(0);
     sub_0200F338(1);
     sub_0200AB4C(0, (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), 3);
@@ -192,7 +192,7 @@ void PrintErrorMessageAndReset (void)
 
     sub_0201A8FC(&window);
     sub_0200B190(errorMsgData);
-    FreeToHeap(bgConfig);
+    Heap_FreeToHeap(bgConfig);
 
     OS_ResetSystem(0);
 }

src/game_overlay.c

@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "poke_overlay.h"
+#include "game_overlay.h"
 
 typedef enum PMiOverlayRegion {
     OVERLAY_REGION_MAIN,
@@ -28,9 +28,9 @@ static BOOL GetOverlayRamBounds(const FSOverlayID param0, u32 * param1, u32 * pa
 static BOOL LoadOverlayNormal(MIProcessor param0, FSOverlayID param1);
 static BOOL LoadOverlayNoInit(MIProcessor param0, FSOverlayID param1);
 static BOOL LoadOverlayNoInitAsync(MIProcessor param0, FSOverlayID param1);
-void UnloadOverlayByID(const FSOverlayID param0);
-int GetOverlayLoadDestination(const FSOverlayID param0);
-BOOL HandleLoadOverlay(const FSOverlayID param0, int param1);
+void Overlay_UnloadByID(const FSOverlayID param0);
+int Overlay_GetLoadDestination(const FSOverlayID param0);
+BOOL Overlay_LoadByID(const FSOverlayID param0, int param1);
 
 static UnkStruct_021BF370 Unk_021BF370;
 
@@ -42,12 +42,12 @@ static void FreeOverlayAllocation (PMiLoadedOverlay * param0)
     param0->isActive = 0;
 }
 
-void UnloadOverlayByID (const FSOverlayID overlayID)
+void Overlay_UnloadByID (const FSOverlayID overlayID)
 {
     PMiLoadedOverlay * table;
     int i;
 
-    table = GetLoadedOverlaysInRegion(GetOverlayLoadDestination(overlayID));
+    table = GetLoadedOverlaysInRegion(Overlay_GetLoadDestination(overlayID));
 
     for (i = 0; i < 8; i++) {
         if ((table[i].isActive == 1) && (table[i].id == overlayID)) {
@@ -57,7 +57,7 @@ void UnloadOverlayByID (const FSOverlayID overlayID)
     }
 }
 
-int GetOverlayLoadDestination (const FSOverlayID overlayID)
+int Overlay_GetLoadDestination (const FSOverlayID overlayID)
 {
     FSOverlayInfo info;
     u32 v2;
@@ -74,7 +74,7 @@ int GetOverlayLoadDestination (const FSOverlayID overlayID)
     return OVERLAY_REGION_MAIN;
 }
 
-BOOL HandleLoadOverlay (const FSOverlayID overlayID, int loadType)
+BOOL Overlay_LoadByID (const FSOverlayID overlayID, int loadType)
 {
     BOOL result;
     u32 dmaBak = FS_DMA_NOT_USE;
@@ -86,7 +86,7 @@ BOOL HandleLoadOverlay (const FSOverlayID overlayID, int loadType)
         return FALSE;
     }
 
-    overlayRegion = GetOverlayLoadDestination(overlayID);
+    overlayRegion = Overlay_GetLoadDestination(overlayID);
     loadedOverlays = GetLoadedOverlaysInRegion(overlayRegion);
 
     for (i = 0; i < 8; i++) {
@@ -144,7 +144,7 @@ static BOOL CanOverlayBeLoaded (const FSOverlayID param0)
         return FALSE;
     }
 
-    loadedOverlay = GetLoadedOverlaysInRegion(GetOverlayLoadDestination(param0));
+    loadedOverlay = GetLoadedOverlaysInRegion(Overlay_GetLoadDestination(param0));
 
     for (i = 0; i < 8; i++) {
         if (loadedOverlay[i].isActive == TRUE && GetOverlayRamBounds(loadedOverlay[i].id, &theirStart, &theirEnd) == TRUE) {

src/gx_layers.c

@@ -11,7 +11,7 @@
 static int sEngineALayers;
 static int sEngineBLayers;
 
-void GX_SetBanks (const UnkStruct_02099F80 * banks)
+void GXLayers_SetBanks (const UnkStruct_02099F80 * banks)
 {
     GX_ResetBankForBG();
     GX_ResetBankForBGExtPltt();
@@ -36,12 +36,12 @@ void GX_SetBanks (const UnkStruct_02099F80 * banks)
     GX_SetBankForTexPltt(banks->unk_24);
 }
 
-void GX_DisableEngineALayers (void)
+void GXLayers_DisableEngineALayers (void)
 {
     sEngineALayers = 0;
 }
 
-void GX_EngineAToggleLayers (u8 layerMask, u8 enable)
+void GXLayers_EngineAToggleLayers (u8 layerMask, u8 enable)
 {
     if (enable == 1) {
         if (sEngineALayers & layerMask) {
@@ -57,18 +57,18 @@ void GX_EngineAToggleLayers (u8 layerMask, u8 enable)
     GX_SetVisiblePlane(sEngineALayers);
 }
 
-void GX_EngineASetLayers (int layers)
+void GXLayers_EngineASetLayers (int layers)
 {
     sEngineALayers = layers;
     GX_SetVisiblePlane(sEngineALayers);
 }
 
-void GX_DisableEngineBLayers (void)
+void GXLayers_DisableEngineBLayers (void)
 {
     sEngineBLayers = 0;
 }
 
-void GX_EngineBToggleLayers (u8 layerMask, u8 enable)
+void GXLayers_EngineBToggleLayers (u8 layerMask, u8 enable)
 {
     if (enable == 1) {
         if (sEngineBLayers & layerMask) {
@@ -84,19 +84,19 @@ void GX_EngineBToggleLayers (u8 layerMask, u8 enable)
     GXS_SetVisiblePlane(sEngineBLayers);
 }
 
-void GX_EngineBSetLayers (int layers)
+void GXLayers_EngineBSetLayers (int layers)
 {
     sEngineBLayers = layers;
     GXS_SetVisiblePlane(sEngineBLayers);
 }
 
-void GX_BothDispOn (void)
+void GXLayers_TurnBothDispOn (void)
 {
     GX_DispOn();
     GXS_DispOn();
 }
 
-void GX_SwapDisplay (void)
+void GXLayers_SwapDisplay (void)
 {
     if (Unk_021BF67C.unk_65 == 0) {
         GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB);
@@ -105,7 +105,7 @@ void GX_SwapDisplay (void)
     }
 }
 
-int GX_EngineAGetLayers (void)
+int GXLayers_EngineAGetLayers (void)
 {
     return sEngineALayers;
 }

src/heap.c

@@ -31,7 +31,7 @@ static void * AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignme
 
 static HeapInfo sHeapInfo = { 0 };
 
-void InitHeapSystem (const HeapParam * templates, u32 nTemplates, u32 totalNumHeaps, u32 pre_size)
+void Heap_InitSystem (const HeapParam * templates, u32 nTemplates, u32 totalNumHeaps, u32 pre_size)
 {
     void * ptr;
     u32 unk_size, i;
@@ -106,12 +106,12 @@ static int FindFirstAvailableHeapHandle (void)
     return -1;
 }
 
-BOOL CreateHeap (u32 parent, u32 child, u32 size)
+BOOL Heap_Create (u32 parent, u32 child, u32 size)
 {
     return CreateHeapInternal(parent, child, size, 4);
 }
 
-BOOL CreateHeapAtEnd (u32 parent, u32 child, u32 size)
+BOOL Heap_CreateAtEnd (u32 parent, u32 child, u32 size)
 {
     return CreateHeapInternal(parent, child, size, -4);
 }
@@ -157,7 +157,7 @@ static BOOL CreateHeapInternal (u32 parent, u32 child, u32 size, s32 alignment)
     return FALSE;
 }
 
-void DestroyHeap (u32 heapID)
+void Heap_Destroy (u32 heapID)
 {
     GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ);
 
@@ -212,11 +212,11 @@ static void * AllocFromHeapInternal (NNSFndHeapHandle heap, u32 size, s32 alignm
 static void AllocFail (void)
 {
     if (sub_02036780()) {
-        PrintErrorMessageAndReset();
+        ErrorMessageReset_PrintErrorAndReset();
     }
 }
 
-void * AllocFromHeap (u32 heapID, u32 size)
+void * Heap_AllocFromHeap (u32 heapID, u32 size)
 {
     void * ptr = NULL;
 
@@ -235,7 +235,7 @@ void * AllocFromHeap (u32 heapID, u32 size)
     return ptr;
 }
 
-void * AllocFromHeapAtEnd (u32 heapID, u32 size)
+void * Heap_AllocFromHeapAtEnd (u32 heapID, u32 size)
 {
     void * ptr = NULL;
 
@@ -254,7 +254,7 @@ void * AllocFromHeapAtEnd (u32 heapID, u32 size)
     return ptr;
 }
 
-void FreeToHeap (void * ptr)
+void Heap_FreeToHeap (void * ptr)
 {
     (u8 *)ptr -= sizeof(MemoryBlock);
     u32 heapID = ((MemoryBlock *)ptr)->heapID;
@@ -285,7 +285,7 @@ void FreeToHeap (void * ptr)
     }
 }
 
-void FreeToHeapExplicit (u32 heapID, void * ptr)
+void Heap_FreeToHeapExplicit (u32 heapID, void * ptr)
 {
     GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ);
 
@@ -310,7 +310,7 @@ void FreeToHeapExplicit (u32 heapID, void * ptr)
     }
 }
 
-u32 GF_ExpHeap_FndGetTotalFreeSize (u32 heapID)
+u32 Heap_FndGetTotalFreeSizeForExpHeap (u32 heapID)
 {
     if (heapID < sHeapInfo.totalNumHeaps) {
         u8 index = sHeapInfo.heapIdxs[heapID];
@@ -322,7 +322,7 @@ u32 GF_ExpHeap_FndGetTotalFreeSize (u32 heapID)
     return 0;
 }
 
-void GF_ExpHeap_FndInitAllocator (NNSFndAllocator * pAllocator, u32 heapID, int alignment)
+void Heap_FndInitAllocatorForExpHeap (NNSFndAllocator * pAllocator, u32 heapID, int alignment)
 {
     if (heapID < sHeapInfo.totalNumHeaps) {
         u8 index = sHeapInfo.heapIdxs[heapID];
@@ -333,7 +333,7 @@ void GF_ExpHeap_FndInitAllocator (NNSFndAllocator * pAllocator, u32 heapID, int
     }
 }
 
-void ReallocFromHeap (void * ptr, u32 newSize)
+void Heap_ReallocFromHeap (void * ptr, u32 newSize)
 {
     GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ);
 

src/item.c

@@ -9,7 +9,7 @@
 
 #include "struct_defs/struct_0207D0B0.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "unk_0200AC5C.h"
 #include "heap.h"
 #include "item.h"
@@ -762,17 +762,17 @@ u16 sub_0207CF10 (u16 param0)
     return 0;
 }
 
-u16 GetItemIconCellArchiveIndex (void)
+u16 Item_GetIndexOfIconNCER (void)
 {
     return 1;
 }
 
-u16 GetItemIconCellAnimationArchiveIndex (void)
+u16 Item_GetIndexOfIconNANR (void)
 {
     return 0;
 }
 
-void * LoadItemDataOrGfx (u16 itemID, u16 attributeID, u32 heapID)
+void * Item_LoadDataOrGFX (u16 itemID, u16 attributeID, u32 heapID)
 {
     if (itemID > 467) {
         itemID = 0;
@@ -780,17 +780,17 @@ void * LoadItemDataOrGfx (u16 itemID, u16 attributeID, u32 heapID)
 
     switch (attributeID) {
     case 0:
-        return AllocAndReadWholeNarcMemberByIndexPair(15, sItemNarcIDs[itemID].dataArchiveID, heapID);
+        return NARC_AllocAndReadWholeMemberByIndexPair(15, sItemNarcIDs[itemID].dataArchiveID, heapID);
     case 1:
-        return AllocAndReadWholeNarcMemberByIndexPair(16, sItemNarcIDs[itemID].imageArchiveID, heapID);
+        return NARC_AllocAndReadWholeMemberByIndexPair(16, sItemNarcIDs[itemID].imageArchiveID, heapID);
     case 2:
-        return AllocAndReadWholeNarcMemberByIndexPair(16, sItemNarcIDs[itemID].palArchiveID, heapID);
+        return NARC_AllocAndReadWholeMemberByIndexPair(16, sItemNarcIDs[itemID].palArchiveID, heapID);
     }
 
     return NULL;
 }
 
-void GetItemNameIntoString (UnkStruct_02023790 * dest, u16 itemID, u32 heapID)
+void Item_GetNameIntoString (UnkStruct_02023790 * dest, u16 itemID, u32 heapID)
 {
     UnkStruct_0200B144 * msgData = sub_0200B144(1, 26, 392, heapID);
 
@@ -798,7 +798,7 @@ void GetItemNameIntoString (UnkStruct_02023790 * dest, u16 itemID, u32 heapID)
     sub_0200B190(msgData);
 }
 
-void GetItemDescriptionIntoString (UnkStruct_02023790 * dest, u16 itemID, u16 heapID)
+void Item_GetDescriptionIntoString (UnkStruct_02023790 * dest, u16 itemID, u16 heapID)
 {
     UnkStruct_0200B144 * msgData = sub_0200B144(1, 26, 391, heapID);
 
@@ -806,19 +806,19 @@ void GetItemDescriptionIntoString (UnkStruct_02023790 * dest, u16 itemID, u16 he
     sub_0200B190(msgData);
 }
 
-s32 GetItemAttribute (u16 itemID, u16 attributeID, u32 heapID)
+s32 Item_GetAttribute (u16 itemID, u16 attributeID, u32 heapID)
 {
     UnkStruct_0207D3B0 * v0;
     s32 v1;
 
-    v0 = (UnkStruct_0207D3B0 *)LoadItemDataOrGfx(itemID, 0, heapID);
-    v1 = GetItemAttributeFromStruct(v0, attributeID);
-    FreeToHeapExplicit(heapID, v0);
+    v0 = (UnkStruct_0207D3B0 *)Item_LoadDataOrGFX(itemID, 0, heapID);
+    v1 = Item_GetAttributeFromStruct(v0, attributeID);
+    Heap_FreeToHeapExplicit(heapID, v0);
 
     return v1;
 }
 
-s32 GetItemAttributeFromStruct (UnkStruct_0207D3B0 * itemData, u16 attributeID)
+s32 Item_GetAttributeFromStruct (UnkStruct_0207D3B0 * itemData, u16 attributeID)
 {
     switch (attributeID) {
     case 0:
@@ -969,7 +969,7 @@ const u16 GetMoveFromTMOrHMItemID (u16 itemID)
     return sMovesTMHM[itemID];
 }
 
-u8 IsMoveHM (u16 moveID)
+u8 Item_IsMoveHM (u16 moveID)
 {
     u8 v0;
 
@@ -982,7 +982,7 @@ u8 IsMoveHM (u16 moveID)
     return FALSE;
 }
 
-u8 GetTMOrHMNumberFromItemID (u16 itemID)
+u8 Item_GetTMOrHMNumberFromID (u16 itemID)
 {
     if ((itemID < 328) || (itemID > 427)) {
         return 0;
@@ -991,7 +991,7 @@ u8 GetTMOrHMNumberFromItemID (u16 itemID)
     return itemID - 328;
 }
 
-u8 IsItemMail (u16 itemID)
+u8 Item_IsMail (u16 itemID)
 {
     u32 i;
 
@@ -1026,7 +1026,7 @@ u16 sub_0207D310 (u8 param0)
     return sMailItemIDs[param0];
 }
 
-u8 IsItemBerry (u16 itemID)
+u8 Item_IsBerry (u16 itemID)
 {
     u32 i;
 
@@ -1057,7 +1057,7 @@ u16 sub_0207D354 (u8 param0)
     return sBerryItemIDs[param0];
 }
 
-u8 IsItemHerbalMedicine (u16 itemID)
+u8 Item_IsHerbalMedicine (u16 itemID)
 {	
 	if ((itemID == 34) || (itemID == 35) || (itemID == 36) || (itemID == 37)) {
         return TRUE;
@@ -1069,7 +1069,7 @@ u8 IsItemHerbalMedicine (u16 itemID)
 void * sub_0207D388 (int param0)
 {
     int v0 = sub_0207CE78(467, 0);
-    return AllocAndReadFromNarcMemberByIndexPair(15, 0, param0, 0, 36 * v0);
+    return NARC_AllocAndReadFromMemberByIndexPair(15, 0, param0, 0, 36 * v0);
 }
 
 UnkStruct_0207D3B0 * sub_0207D3B0 (UnkStruct_0207D3B0 * param0, u16 param1)

src/main.c

@@ -16,7 +16,7 @@
 #include "unk_02000C88.h"
 #include "unk_02002B7C.h"
 #include "unk_02003B60.h"
-#include "poke_overlay.h"
+#include "game_overlay.h"
 #include "unk_020067E8.h"
 #include "unk_0200A9DC.h"
 #include "unk_0200F174.h"
@@ -180,7 +180,7 @@ static void sub_02000E54 (void)
         }
 
         if (Unk_02101D28.unk_08 != 0xffffffff) {
-            HandleLoadOverlay(Unk_02101D28.unk_08, 0);
+            Overlay_LoadByID(Unk_02101D28.unk_08, 0);
         }
 
         Unk_02101D28.unk_00 = Unk_02101D28.unk_08;
@@ -196,7 +196,7 @@ static void sub_02000E54 (void)
         Unk_02101D28.unk_04 = NULL;
 
         if (Unk_02101D28.unk_00 != 0xffffffff) {
-            UnloadOverlayByID(Unk_02101D28.unk_00);
+            Overlay_UnloadByID(Unk_02101D28.unk_00);
         }
     }
 }

src/map_header.c

@@ -13052,7 +13052,7 @@ static const MapHeader mapHeaders[] = {
 	},
 };
 
-u32 HeaderIdBoundsCheck (u32 headerID)
+u32 MapHeader_IDBoundsCheck (u32 headerID)
 {
     if (headerID >= NELEMS(mapHeaders)) {
         GF_ASSERT(0);
@@ -13064,13 +13064,13 @@ u32 HeaderIdBoundsCheck (u32 headerID)
 
 const u16 sub_0203A038 (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].unk_00;
 }
 
 const u16 sub_0203A04C (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].unk_01;
 }
 
@@ -13078,7 +13078,7 @@ const u16 MapHeader_GetMapMatrixID (u32 headerID)
 {
     u16 mapMatrixID;
 
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     mapMatrixID = mapHeaders[headerID].mapMatrixID;
 
     if (mapMatrixID == 22) {
@@ -13092,103 +13092,103 @@ const u16 MapHeader_GetMapMatrixID (u32 headerID)
 
 u32 MapHeader_GetMsgArchiveID (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].msgArchiveID;
 }
 
 u32 MapHeader_GetScriptsArchiveID (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].scriptsArchiveID;
 }
 
 u32 MapHeader_GetMapScriptArchiveID (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].mapScriptArchiveID;
 }
 
 u16 MapHeader_GetDayMusicID (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].dayMusicID;
 }
 
 u16 MapHeader_GetNightMusicID (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].nightMusicID;
 }
 
 BOOL MapHeader_HasWildEncounters (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].wildEncountersArchiveID != 65535;
 }
 
 u32 MapHeader_GetWildEncountersArchiveID (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].wildEncountersArchiveID;
 }
 
 u32 MapHeader_GetEventsArchiveID (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].eventsArchiveID;
 }
 
 u32 sub_0203A138 (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].unk_12_0;
 }
 
 u8 sub_0203A154 (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].unk_12_8;
 }
 
 u32 MapHeader_GetWeatherType (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].weather;
 }
 
 u32 MapHeader_GetCameraType (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].cameraType;
 }
 
 u32 MapHeader_GetBattleBG (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].battleBG;
 }
 
 BOOL MapHeader_IsEscapeRopeAllowed (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].isEscapeRopeAllowed;
 }
 
 BOOL MapHeader_IsFlyAllowed (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].isFlyAllowed;
 }
 
 BOOL MapHeader_IsBikeAllowed (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].isBikeAllowed;
 }
 
 u32 MapHeader_GetMapType (u32 headerID)
 {
-    headerID = HeaderIdBoundsCheck(headerID);
+    headerID = MapHeader_IDBoundsCheck(headerID);
     return mapHeaders[headerID].mapType;
 }
 

src/move_table.c

@@ -3,24 +3,24 @@
 
 #include "struct_defs/struct_020790C4.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "move_table.h"
 
 static void LoadMoveEntry(int moveID, MoveTable * moveTable);
 
-void LoadMoveTable (void * dest) {
-    ReadFromNarcMemberByIndexPair(dest, 9, 0, 0, sizeof(MoveTable) * (467 + 1));
+void MoveTable_Load (void * dest) {
+    NARC_ReadFromMemberByIndexPair(dest, 9, 0, 0, sizeof(MoveTable) * (467 + 1));
 }
 
-u32 GetMoveAttribute (int moveID, int attrno)
+u32 MoveTable_GetMoveAttribute (int moveID, int attrno)
 {
     MoveTable moveData;
 
     LoadMoveEntry(moveID, &moveData);
-    return GetMoveTableAttribute(&moveData, attrno);
+    return MoveTable_GetAttribute(&moveData, attrno);
 }
 
-u8 GetMoveMaxPP (u16 moveID, u8 ppUps)
+u8 MoveTable_GetMoveMaxPP (u16 moveID, u8 ppUps)
 {
     u8 pp;
 
@@ -28,13 +28,13 @@ u8 GetMoveMaxPP (u16 moveID, u8 ppUps)
         ppUps = 3;
     }
 
-    pp = GetMoveAttribute(moveID, 5);
+    pp = MoveTable_GetMoveAttribute(moveID, 5);
     pp += (pp * 20 * ppUps) / 100;
 
     return pp;
 }
 
-u32 GetMoveTableAttribute (MoveTable * moveTable, int attribute)
+u32 MoveTable_GetAttribute (MoveTable * moveTable, int attribute)
 {
     u32 ret;
 
@@ -82,5 +82,5 @@ u32 GetMoveTableAttribute (MoveTable * moveTable, int attribute)
 
 static void LoadMoveEntry (int moveID, MoveTable * moveTable)
 {
-    ReadWholeNarcMemberByIndexPair(moveTable, 9, moveID);
+    NARC_ReadWholeMemberByIndexPair(moveTable, 9, moveID);
 }

src/narc.c

@@ -1,10 +1,10 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "filesystem.h"
+#include "narc.h"
 #include "heap.h"
 
-static const char *Unk_02100498[] = {
+static const char * Unk_02100498[] = {
 	{ "battle/skill/waza_seq.narc" },
 	{ "battle/skill/sub_seq.narc" },
 	{ "poketool/personal/pl_personal.narc" },
@@ -299,9 +299,9 @@ static void * AllocAndReadFromNarcMemberByPathAndIndex (const char * path, int m
     GF_ASSERT(btafStart != 0);
 
     if (allocAtEnd == 0) {
-        dest = AllocFromHeap(heapID, btafStart);
+        dest = Heap_AllocFromHeap(heapID, btafStart);
     } else {
-        dest = AllocFromHeapAtEnd(heapID, btafStart);
+        dest = Heap_AllocFromHeapAtEnd(heapID, btafStart);
     }
 
     FS_ReadFile(&file, dest, btafStart);
@@ -310,37 +310,37 @@ static void * AllocAndReadFromNarcMemberByPathAndIndex (const char * path, int m
     return dest;
 }
 
-void ReadWholeNarcMemberByIndexPair (void * dest, int narcIndex, int memberIndex)
+void NARC_ReadWholeMemberByIndexPair (void * dest, int narcIndex, int memberIndex)
 {
     ReadFromNarcMemberByPathAndIndex(dest, Unk_02100498[narcIndex], memberIndex, 0, 0);
 }
 
-void * AllocAndReadWholeNarcMemberByIndexPair (int narcIndex, int memberIndex, int heapID)
+void * NARC_AllocAndReadWholeMemberByIndexPair (int narcIndex, int memberIndex, int heapID)
 {
     return AllocAndReadFromNarcMemberByPathAndIndex(Unk_02100498[narcIndex], memberIndex, heapID, 0, 0, FALSE);
 }
 
-void * AllocAtEndAndReadWholeNarcMemberByIndexPair (int narcIndex, int memberIndex, int heapID)
+void * NARC_AllocAtEndAndReadWholeMemberByIndexPair (int narcIndex, int memberIndex, int heapID)
 {
     return AllocAndReadFromNarcMemberByPathAndIndex(Unk_02100498[narcIndex], memberIndex, heapID, 0, 0, TRUE);
 }
 
-void ReadFromNarcMemberByIndexPair (void * dest, int narcIndex, int memberIndex, int offset, int bytesToRead)
+void NARC_ReadFromMemberByIndexPair (void * dest, int narcIndex, int memberIndex, int offset, int bytesToRead)
 {
     ReadFromNarcMemberByPathAndIndex(dest, Unk_02100498[narcIndex], memberIndex, offset, bytesToRead);
 }
 
-void * AllocAndReadFromNarcMemberByIndexPair (int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead)
+void * NARC_AllocAndReadFromMemberByIndexPair (int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead)
 {
     return AllocAndReadFromNarcMemberByPathAndIndex(Unk_02100498[narcIndex], memberIndex, heapID, offset, bytesToRead, FALSE);
 }
 
-void * AllocAtEndAndReadFromNarcMemberByIndexPair (int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead)
+void * NARC_AllocAtEndAndReadFromMemberByIndexPair (int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead)
 {
     return AllocAndReadFromNarcMemberByPathAndIndex(Unk_02100498[narcIndex], memberIndex, heapID, offset, bytesToRead, TRUE);
 }
 
-u32 GetNarcMemberSizeByIndexPair (int narcIndex, int memberIndex)
+u32 NARC_GetMemberSizeByIndexPair (int narcIndex, int memberIndex)
 {
     FSFile file;
     u32 chunkSize = 0;
@@ -386,7 +386,7 @@ u32 GetNarcMemberSizeByIndexPair (int narcIndex, int memberIndex)
 
 NARC * NARC_ctor (u32 narcIndex, u32 heapID)
 {
-    NARC * narc = AllocFromHeap(heapID, sizeof(NARC));
+    NARC * narc = Heap_AllocFromHeap(heapID, sizeof(NARC));
 
     if (narc) {
         u32 btnfStart;
@@ -416,7 +416,7 @@ NARC * NARC_ctor (u32 narcIndex, u32 heapID)
 void NARC_dtor (NARC * param0)
 {
     FS_CloseFile(&(param0->unk_00));
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void * NARC_AllocAndReadWholeMember (NARC * narc, u32 memberIndex, u32 heapID)
@@ -432,7 +432,7 @@ void * NARC_AllocAndReadWholeMember (NARC * narc, u32 memberIndex, u32 heapID)
     FS_ReadFile(&(narc->unk_00), &fileEnd, 4);
     FS_SeekFile(&(narc->unk_00), narc->unk_B0 + 8 + fileStart, FS_SEEK_SET);
 
-    dest = AllocFromHeap(heapID, fileEnd - fileStart);
+    dest = Heap_AllocFromHeap(heapID, fileEnd - fileStart);
 
     if (dest) {
         FS_ReadFile(&(narc->unk_00), dest, fileEnd - fileStart);

src/overlay004/ov4_021D0D80.c

@@ -107,7 +107,7 @@ int ov4_021D0D80 (UnkStruct_021C0794 * param0, int param1, int param2, int param
 
     GF_ASSERT(Unk_ov4_0221A400 == NULL);
 
-    v0 = AllocFromHeap(param1, sizeof(UnkStruct_ov4_0221A400) + 32);
+    v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov4_0221A400) + 32);
     MI_CpuClear8(v0, sizeof(UnkStruct_ov4_0221A400) + 32);
 
     Unk_ov4_0221A400 = (UnkStruct_ov4_0221A400 *)(((u32)v0 + 31) / 32 * 32);
@@ -120,7 +120,7 @@ int ov4_021D0D80 (UnkStruct_021C0794 * param0, int param1, int param2, int param
     Unk_ov4_0221A400->unk_1078 = param1;
     Unk_ov4_0221A400->unk_107C = param1;
     Unk_ov4_0221A400->unk_1080 = param2;
-    Unk_ov4_0221A400->unk_F84 = AllocFromHeap(param1, param2 + ((4 * 1024) * 3) + 32);
+    Unk_ov4_0221A400->unk_F84 = Heap_AllocFromHeap(param1, 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;
@@ -176,14 +176,14 @@ void ov4_021D0F68 ()
 
         if (Unk_ov4_0221A400->unk_F8C != NULL) {
             NNS_FndDestroyExpHeap(Unk_ov4_0221A400->unk_F90);
-            FreeToHeap(Unk_ov4_0221A400->unk_F8C);
+            Heap_FreeToHeap(Unk_ov4_0221A400->unk_F8C);
             Unk_ov4_0221A400->unk_F8C = NULL;
         }
 
         NNS_FndDestroyExpHeap(Unk_ov4_0221A400->unk_F88);
 
-        FreeToHeapExplicit(Unk_ov4_0221A400->unk_1078, Unk_ov4_0221A400->unk_F84);
-        FreeToHeapExplicit(Unk_ov4_0221A400->unk_1078, Unk_ov4_0221A400->unk_F70);
+        Heap_FreeToHeapExplicit(Unk_ov4_0221A400->unk_1078, Unk_ov4_0221A400->unk_F84);
+        Heap_FreeToHeapExplicit(Unk_ov4_0221A400->unk_1078, Unk_ov4_0221A400->unk_F70);
 
         Unk_ov4_0221A400 = NULL;
     }
@@ -1540,7 +1540,7 @@ void ov4_021D2618 (BOOL param0, int param1)
         Unk_ov4_0221A400->unk_107C = 11;
 
         if (Unk_ov4_0221A400->unk_F8C == NULL) {
-            Unk_ov4_0221A400->unk_F8C = AllocFromHeap(param1, 0xf000 + 32);
+            Unk_ov4_0221A400->unk_F8C = Heap_AllocFromHeap(param1, 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);
@@ -1555,7 +1555,7 @@ void ov4_021D2618 (BOOL param0, int param1)
             }
 
             NNS_FndDestroyExpHeap(Unk_ov4_0221A400->unk_F90);
-            FreeToHeap(Unk_ov4_0221A400->unk_F8C);
+            Heap_FreeToHeap(Unk_ov4_0221A400->unk_F8C);
 
             Unk_ov4_0221A400->unk_F8C = NULL;
         }
@@ -1571,7 +1571,7 @@ void ov4_021D2700 (int param0)
 {
     if (Unk_ov4_0221A400->unk_F74[param0] != NULL) {
         if (Unk_ov4_0221A400->unk_10D5[param0] == 1) {
-            FreeToHeap(Unk_ov4_0221A400->unk_F74[param0]);
+            Heap_FreeToHeap(Unk_ov4_0221A400->unk_F74[param0]);
         } else {
             ov4_021D1B04(0, Unk_ov4_0221A400->unk_F74[param0], 0);
         }
@@ -1586,7 +1586,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] = AllocFromHeap(Unk_ov4_0221A400->unk_107C, (4 * 1024) + 32);
+            Unk_ov4_0221A400->unk_F74[param0] = Heap_AllocFromHeap(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);

src/overlay004/ov4_021D2808.c

@@ -384,7 +384,7 @@ BOOL ov4_021D2C70 (int param0, void * param1, int param2)
 
 static void ov4_021D2C98 (void ** param0, void ** param1, int param2, int param3)
 {
-    *param0 = AllocFromHeap(param3, param2 + 32);
+    *param0 = Heap_AllocFromHeap(param3, param2 + 32);
     MI_CpuClear8(*param0, param2 + 32);
     *param1 = (UnkStruct_ov4_0221A408 *)(((u32) * param0 + 31) / 32 * 32);
 }
@@ -522,8 +522,8 @@ void ov4_021D2F08 (void)
 
         VCT_Cleanup();
 
-        FreeToHeapExplicit(Unk_ov4_0221A408->unk_19F4, Unk_ov4_0221A408->unk_888);
-        FreeToHeapExplicit(Unk_ov4_0221A408->unk_19F4, Unk_ov4_0221A408->unk_880);
+        Heap_FreeToHeapExplicit(Unk_ov4_0221A408->unk_19F4, Unk_ov4_0221A408->unk_888);
+        Heap_FreeToHeapExplicit(Unk_ov4_0221A408->unk_19F4, Unk_ov4_0221A408->unk_880);
         Unk_ov4_0221A408 = NULL;
 
         if (v0 != NULL) {

src/overlay005/ov5_021D0D80.c

@@ -30,9 +30,9 @@
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 
-#include "poke_overlay.h"
+#include "game_overlay.h"
 #include "unk_020067E8.h"
-#include "filesystem.h"
+#include "narc.h"
 #include "unk_0200A784.h"
 #include "unk_0200F174.h"
 #include "unk_02017728.h"
@@ -175,25 +175,25 @@ static int ov5_021D0DA4 (UnkStruct_020067E8 * param0, int * param1)
         sub_020531A0(v1);
 
         if (v1->unk_74->unk_00_20) {
-            HandleLoadOverlay(FS_OVERLAY_ID(overlay6), 2);
+            Overlay_LoadByID(FS_OVERLAY_ID(overlay6), 2);
 
             switch (ov5_021D1178(v1)) {
             case 0:
-                HandleLoadOverlay(FS_OVERLAY_ID(overlay8), 2);
+                Overlay_LoadByID(FS_OVERLAY_ID(overlay8), 2);
                 break;
             case 1:
-                HandleLoadOverlay(FS_OVERLAY_ID(overlay7), 2);
+                Overlay_LoadByID(FS_OVERLAY_ID(overlay7), 2);
                 break;
             case 2:
-                HandleLoadOverlay(FS_OVERLAY_ID(overlay9), 2);
+                Overlay_LoadByID(FS_OVERLAY_ID(overlay9), 2);
                 break;
             }
         }
 
-        CreateHeap(3, 4, v1->unk_74->unk_04);
+        Heap_Create(3, 4, v1->unk_74->unk_04);
         GF_ASSERT(v1->unk_04 == NULL);
 
-        v1->unk_04 = AllocFromHeap(4, sizeof(UnkStruct_0203CDB0_sub2));
+        v1->unk_04 = Heap_AllocFromHeap(4, sizeof(UnkStruct_0203CDB0_sub2));
         MI_CpuClear8(v1->unk_04, sizeof(UnkStruct_0203CDB0_sub2));
         v1->unk_04->unk_04 = ov5_021D1A94(v1, 4, 8);
 
@@ -206,7 +206,7 @@ static int ov5_021D0DA4 (UnkStruct_020067E8 * param0, int * param1)
         ov5_021D15B4();
         ov5_021D154C();
 
-        GX_SwapDisplay();
+        GXLayers_SwapDisplay();
         v1->unk_08 = sub_02018340(4);
         ov5_021D1444(v1->unk_08);
         sub_0205D8CC(0, 1);
@@ -351,18 +351,18 @@ static int ov5_021D0FB4 (UnkStruct_020067E8 * param0, int * param1)
             sub_0201CBA0();
             ov5_021D1AE4(v0->unk_04->unk_04);
             sub_02017798(NULL, NULL);
-            FreeToHeap(v0->unk_08);
-            FreeToHeap(v0->unk_04);
+            Heap_FreeToHeap(v0->unk_08);
+            Heap_FreeToHeap(v0->unk_04);
 
             v0->unk_04 = NULL;
 
-            DestroyHeap(4);
+            Heap_Destroy(4);
 
             if (v0->unk_74->unk_00_20) {
-                UnloadOverlayByID(FS_OVERLAY_ID(overlay6));
-                UnloadOverlayByID(FS_OVERLAY_ID(overlay8));
-                UnloadOverlayByID(FS_OVERLAY_ID(overlay7));
-                UnloadOverlayByID(FS_OVERLAY_ID(overlay9));
+                Overlay_UnloadByID(FS_OVERLAY_ID(overlay6));
+                Overlay_UnloadByID(FS_OVERLAY_ID(overlay8));
+                Overlay_UnloadByID(FS_OVERLAY_ID(overlay7));
+                Overlay_UnloadByID(FS_OVERLAY_ID(overlay9));
             }
 
             return 1;
@@ -576,7 +576,7 @@ static void ov5_021D1414 (void)
         GX_VRAM_TEXPLTT_0123_E
     };
 
-    GX_SetBanks(&v0);
+    GXLayers_SetBanks(&v0);
 }
 
 void ov5_021D1434 (UnkStruct_02018340 * param0)
@@ -677,7 +677,7 @@ static void ov5_021D1444 (UnkStruct_02018340 * param0)
 
 static void ov5_021D1524 (UnkStruct_02018340 * param0)
 {
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3, 0);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3, 0);
     sub_02019044(param0, 1);
     sub_02019044(param0, 2);
     sub_02019044(param0, 3);
@@ -815,7 +815,7 @@ void ov5_021D1744 (const u8 param0)
 
 static void ov5_021D1790 (UnkStruct_0203CDB0 * param0)
 {
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG0, 0);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0);
     G3_SwapBuffers(GX_SORTMODE_AUTO, Unk_02100844);
 
     param0->unk_50 = ov5_021D38B8();
@@ -922,8 +922,8 @@ static void ov5_021D1878 (UnkStruct_0203CDB0 * param0)
 
 static void ov5_021D1968 (UnkStruct_0203CDB0 * param0)
 {
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
-    GX_BothDispOn();
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
+    GXLayers_TurnBothDispOn();
     param0->unk_44 = ov5_021D5878();
     ov5_021D1578(param0->unk_44);
     param0->unk_48 = ov5_021D57BC();
@@ -957,8 +957,8 @@ static UnkStruct_ov5_021D1A68 * ov5_021D1A14 (int param0, int param1)
     u16 * v1;
     UnkStruct_ov5_021D1A68 * v2;
 
-    v2 = AllocFromHeap(param0, sizeof(UnkStruct_ov5_021D1A68));
-    v1 = AllocAtEndAndReadWholeNarcMemberByIndexPair(96, param1, param0);
+    v2 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021D1A68));
+    v1 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(96, param1, param0);
 
     for (v0 = 0; v0 < 24; v0++) {
         v2->unk_02[v0] = 0xffff;
@@ -973,7 +973,7 @@ static UnkStruct_ov5_021D1A68 * ov5_021D1A14 (int param0, int param1)
     }
 
     v2->unk_00 = v0;
-    FreeToHeap(v1);
+    Heap_FreeToHeap(v1);
     return v2;
 }
 
@@ -989,7 +989,7 @@ static const int ov5_021D1A6C (const UnkStruct_ov5_021D1A68 * param0)
 
 static void ov5_021D1A70 (UnkStruct_ov5_021D1A68 * param0)
 {
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 static BOOL ov5_021D1A78 (UnkStruct_0203CDB0 * param0)

src/overlay005/ov5_021D1A94.c

@@ -37,18 +37,18 @@ UnkStruct_ov5_021D1A94 * ov5_021D1A94 (UnkStruct_0203CDB0 * param0, int param1,
     UnkStruct_ov5_021D1A94 * v0;
     u32 v1;
 
-    v0 = AllocFromHeap(param1, sizeof(UnkStruct_ov5_021D1A94));
+    v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov5_021D1A94));
 
     v0->unk_00 = param0;
     v0->unk_04 = param1;
     v0->unk_08 = param2;
-    v0->unk_0C = AllocFromHeap(param1, sizeof(UnkStruct_ov5_021D1BEC) * param2);
+    v0->unk_0C = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov5_021D1BEC) * param2);
 
     MI_CpuClear32(v0->unk_0C, sizeof(UnkStruct_ov5_021D1BEC) * param2);
 
     v1 = sub_0201CD80(param2);
 
-    v0->unk_10 = AllocFromHeap(param1, v1);
+    v0->unk_10 = Heap_AllocFromHeap(param1, v1);
     v0->unk_10 = sub_0201CD88(param2, v0->unk_10);
 
     return v0;
@@ -62,9 +62,9 @@ void ov5_021D1AE4 (UnkStruct_ov5_021D1A94 * param0)
         ov5_021D1BEC(&param0->unk_0C[v0]);
     }
 
-    FreeToHeap(param0->unk_0C);
-    FreeToHeap(param0->unk_10);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0->unk_0C);
+    Heap_FreeToHeap(param0->unk_10);
+    Heap_FreeToHeap(param0);
 }
 
 void ov5_021D1B18 (UnkStruct_ov5_021D1A94 * param0)
@@ -110,7 +110,7 @@ UnkStruct_ov5_021D1BEC * ov5_021D1B6C (UnkStruct_ov5_021D1A94 * param0, const Un
             GF_ASSERT(v1->unk_08 != NULL);
 
             if (param1->unk_04 != 0) {
-                v1->unk_10 = AllocFromHeap(param0->unk_04, param1->unk_04);
+                v1->unk_10 = Heap_AllocFromHeap(param0->unk_04, param1->unk_04);
             }
 
             if (param1->unk_08) {
@@ -136,7 +136,7 @@ void ov5_021D1BEC (UnkStruct_ov5_021D1BEC * param0)
     }
 
     if (param0->unk_0C->unk_04 != 0) {
-        FreeToHeap(param0->unk_10);
+        Heap_FreeToHeap(param0->unk_10);
     }
 
     sub_0200DA58(param0->unk_04);

src/overlay005/ov5_021D1C30.c

@@ -181,7 +181,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * pa
 
     {
         if (param0->unk_00_11 == 0) {
-            BOOL v0 = sub_02054AB0(GetPartyFromSavedata(param1->unk_0C));
+            BOOL v0 = sub_02054AB0(Party_GetFromSavedata(param1->unk_0C));
 
             if (sub_0206A984(sub_020507E4(param1->unk_0C)) == 1) {
                 v0 = 1;
@@ -211,7 +211,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, UnkStruct_0203CDB0 * pa
             v1 |= 1 << 0;
         }
 
-        if (sub_020549A0(GetPartyFromSavedata(param1->unk_0C), 127) != 0xff) {
+        if (sub_020549A0(Party_GetFromSavedata(param1->unk_0C), 127) != 0xff) {
             v1 |= 1 << 1;
         }
 
@@ -751,7 +751,7 @@ u16 ov5_021D271C (UnkStruct_0203CDB0 * param0, u8 param1)
         if (ov5_021E0118(param0->unk_3C, v2, param1)
 
             && sub_02025F34(v1, 3)) {
-            if (sub_020549A0(GetPartyFromSavedata(param0->unk_0C), 57) != 0xff) {
+            if (sub_020549A0(Party_GetFromSavedata(param0->unk_0C), 57) != 0xff) {
                 return 10004;
             }
         }
@@ -896,7 +896,7 @@ static BOOL ov5_021D29D8 (UnkStruct_0203CDB0 * param0, const int param1, const i
 
 static BOOL ov5_021D2ABC (UnkStruct_0203CDB0 * param0)
 {
-    Party * v0 = GetPartyFromSavedata(param0->unk_0C);
+    Party * v0 = Party_GetFromSavedata(param0->unk_0C);
     UnkStruct_02026310 * v1 = sub_02026310(param0->unk_0C);
 
     if (ov5_021E7154(v1, v0, param0) == 1) {
@@ -954,7 +954,7 @@ static void ov5_021D2B54 (UnkStruct_0203CDB0 * param0)
 {
     int v0, v1;
     UnkStruct_02073C74 * v2;
-    Party * v3 = GetPartyFromSavedata(param0->unk_0C);
+    Party * v3 = Party_GetFromSavedata(param0->unk_0C);
     u16 v4 = sub_0203A138(param0->unk_1C->unk_00);
 
     v1 = Party_GetCurrentCount(v3);
@@ -967,7 +967,7 @@ static void ov5_021D2B54 (UnkStruct_0203CDB0 * param0)
 
 static BOOL ov5_021D2B94 (UnkStruct_0203CDB0 * param0)
 {
-    Party * v0 = GetPartyFromSavedata(param0->unk_0C);
+    Party * v0 = Party_GetFromSavedata(param0->unk_0C);
     u16 * v1 = sub_0203A78C(sub_0203A790(param0->unk_0C));
 
     (*v1)++;

src/overlay005/ov5_021D2F14.c

@@ -46,14 +46,14 @@ void ov5_021D2F14 (UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F2EC
         param0->unk_1C4 = 6;
     }
 
-    v1 = AllocFromHeap(param3, sub_02009F34() * param0->unk_1C4);
+    v1 = Heap_AllocFromHeap(param3, sub_02009F34() * param0->unk_1C4);
 
     for (v4 = 0; v4 < param0->unk_1C4; v4++) {
         v0 = sub_02009F38(v1, v4);
         v2 = sub_02017A40(param3, param1->val1[v4]);
 
         sub_02009F40(v2, v0, param3);
-        FreeToHeap(v2);
+        Heap_FreeToHeap(v2);
     }
 
     for (v4 = 0; v4 < param0->unk_1C4; v4++) {
@@ -74,14 +74,14 @@ void ov5_021D2F14 (UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F2EC
         sub_02009F8C(v0);
     }
 
-    FreeToHeap(v1);
+    Heap_FreeToHeap(v1);
     sub_0200A41C(param0->unk_1AC[0]);
     sub_0200A684(param0->unk_1AC[1]);
 
     v2 = sub_02017A40(param3, param1->val2.unk_18);
     param0->unk_190 = sub_02009508(v2, param3, param0->unk_194[0], param0->unk_194[1], param0->unk_194[2], param0->unk_194[3], param0->unk_194[4], param0->unk_194[5]);
 
-    FreeToHeap(v2);
+    Heap_FreeToHeap(v2);
 }
 
 void ov5_021D30A8 (UnkStruct_ov5_021D30A8 * param0)
@@ -342,10 +342,10 @@ UnkStruct_0200D0F4 * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const UnkStr
     UnkStruct_ov115_02261520 v3;
     int v4[6];
 
-    v2 = AllocFromHeap(param0->unk_1C6, sizeof(UnkStruct_0200D0F4));
+    v2 = Heap_AllocFromHeap(param0->unk_1C6, sizeof(UnkStruct_0200D0F4));
 
-    v2->unk_08 = AllocFromHeap(param0->unk_1C6, sizeof(UnkStruct_02009508));
-    v2->unk_08->unk_00 = AllocFromHeap(param0->unk_1C6, sizeof(UnkStruct_ov19_021DA864));
+    v2->unk_08 = Heap_AllocFromHeap(param0->unk_1C6, sizeof(UnkStruct_02009508));
+    v2->unk_08->unk_00 = Heap_AllocFromHeap(param0->unk_1C6, sizeof(UnkStruct_ov19_021DA864));
     v2->unk_04 = v2->unk_08->unk_00;
 
     for (v0 = 0; v0 < 6; v0++) {

src/overlay005/ov5_021D37AC.c

@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 
 #include "unk_02005474.h"
-#include "filesystem.h"
+#include "narc.h"
 #include "heap.h"
 #include "overlay005/ov5_021D37AC.h"
 
@@ -145,7 +145,7 @@ UnkStruct_ov5_021D3CAC * ov5_021D38B8 (void)
     int v0;
     UnkStruct_ov5_021D3CAC * v1;
 
-    v1 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021D3CAC));
+    v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D3CAC));
 
     for (v0 = 0; v0 < 16; v0++) {
         v1->unk_10[v0].unk_04 = 0;
@@ -167,7 +167,7 @@ UnkStruct_ov5_021D3CAC * ov5_021D38B8 (void)
         v1->unk_290[v0].unk_0C = 0;
     }
 
-    GF_ExpHeap_FndInitAllocator(&v1->unk_00, 4, 4);
+    Heap_FndInitAllocatorForExpHeap(&v1->unk_00, 4, 4);
 
     v1->unk_2B0 = NARC_ctor(110, 4);
     v1->unk_2B4 = NARC_ctor(111, 4);
@@ -422,7 +422,7 @@ void ov5_021D3CAC (UnkStruct_ov5_021D3CAC * param0)
             if (param0->unk_10[v0].unk_04 == 1) {
                 NNS_G3dFreeAnmObj(&param0->unk_00, param0->unk_10[v0].unk_00);
                 param0->unk_10[v0].unk_00 = NULL;
-                FreeToHeap(param0->unk_10[v0].unk_14);
+                Heap_FreeToHeap(param0->unk_10[v0].unk_14);
             }
 
             param0->unk_10[v0].unk_04 = 0;
@@ -443,7 +443,7 @@ void ov5_021D3CE4 (UnkStruct_ov5_021D3CE4 * param0, UnkStruct_ov5_021D3CAC * par
         if (param0->unk_04 == 1) {
             NNS_G3dFreeAnmObj(&param1->unk_00, param0->unk_00);
             param0->unk_00 = NULL;
-            FreeToHeap(param0->unk_14);
+            Heap_FreeToHeap(param0->unk_14);
         }
 
         param0->unk_04 = 0;
@@ -481,7 +481,7 @@ void ov5_021D3D7C (UnkStruct_ov5_021D3CAC * param0)
 
     NARC_dtor(param0->unk_2B0);
     NARC_dtor(param0->unk_2B4);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 
     param0 = NULL;
 }
@@ -827,7 +827,7 @@ UnkStruct_ov5_021D41B4 * ov5_021D4194 (void)
     UnkStruct_ov5_021D41B4 * v2;
 
     v1 = sizeof(UnkStruct_ov5_021D41B4);
-    v2 = AllocFromHeap(4, v1);
+    v2 = Heap_AllocFromHeap(4, v1);
 
     MI_CpuClearFast(v2, v1);
 
@@ -840,7 +840,7 @@ void ov5_021D41B4 (UnkStruct_ov5_021D41B4 ** param0)
         return;
     }
 
-    FreeToHeap((*param0));
+    Heap_FreeToHeap((*param0));
     (*param0) = NULL;
 }
 

src/overlay005/ov5_021D431C.c

@@ -53,7 +53,7 @@ UnkStruct_ov5_021D432C * ov5_021D431C (void)
 {
     UnkStruct_ov5_021D432C * v0;
 
-    v0 = AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021D432C));
+    v0 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021D432C));
     v0->unk_00 = 0;
 
     return v0;
@@ -61,7 +61,7 @@ UnkStruct_ov5_021D432C * ov5_021D431C (void)
 
 void ov5_021D432C (UnkStruct_ov5_021D432C * param0)
 {
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov5_021D4334 (const int param0, const int param1, UnkStruct_ov5_021D432C * param2)
@@ -717,7 +717,7 @@ static BOOL ov5_021D4BC8 (UnkStruct_020508D4 * param0)
     v0 = ov5_021D42F0(v1->unk_54, *v2);
 
     if (v0) {
-        FreeToHeap(v2);
+        Heap_FreeToHeap(v2);
         return 1;
     }
 
@@ -832,7 +832,7 @@ void ov5_021D4CEC (UnkStruct_0203CDB0 * param0, const u8 param1)
 
 void ov5_021D4D48 (UnkStruct_0203CDB0 * param0, const u8 param1)
 {
-    u8 * v0 = AllocFromHeapAtEnd(4, sizeof(u8));
+    u8 * v0 = Heap_AllocFromHeapAtEnd(4, sizeof(u8));
 
     *v0 = param1;
     sub_02050944(param0->unk_10, ov5_021D4BC8, v0);
@@ -878,7 +878,7 @@ UnkStruct_ov5_021D4E00 * ov5_021D4E00 (void)
 {
     UnkStruct_ov5_021D4E00 * v0;
 
-    v0 = AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021D4E00));
+    v0 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021D4E00));
     v0->unk_00 = 0;
 
     return v0;
@@ -929,7 +929,7 @@ BOOL ov5_021D4E10 (UnkStruct_020508D4 * param0)
         break;
     case 3:
         if (sub_0200F2AC() && (v2->unk_0C == sub_02020A88(v1->unk_24))) {
-            FreeToHeap(v2);
+            Heap_FreeToHeap(v2);
             return 1;
         }
         break;
@@ -968,7 +968,7 @@ BOOL ov5_021D4F14 (UnkStruct_020508D4 * param0)
     break;
     case 1:
         if (sub_0200F2AC()) {
-            FreeToHeap(v1);
+            Heap_FreeToHeap(v1);
             return 1;
         }
         break;
@@ -1001,7 +1001,7 @@ BOOL ov5_021D4FA0 (UnkStruct_020508D4 * param0)
     break;
     case 1:
         if (sub_0200F2AC()) {
-            FreeToHeap(v1);
+            Heap_FreeToHeap(v1);
             return 1;
         }
         break;
@@ -1082,7 +1082,7 @@ BOOL ov5_021D5020 (UnkStruct_020508D4 * param0)
         break;
     case 3:
         if (sub_0200F2AC() && (v2->unk_0C == sub_02020A88(v1->unk_24))) {
-            FreeToHeap(v2);
+            Heap_FreeToHeap(v2);
             return 1;
         }
         break;
@@ -1137,7 +1137,7 @@ BOOL ov5_021D5150 (UnkStruct_020508D4 * param0)
         break;
     case 3:
         if (sub_0200F2AC()) {
-            FreeToHeap(v2);
+            Heap_FreeToHeap(v2);
             return 1;
         }
         break;

src/overlay005/ov5_021D521C.c

@@ -33,7 +33,7 @@ UnkStruct_ov5_021D538C * ov5_021D521C (UnkStruct_ov5_021D5894 * param0, const u8
 
     GF_ASSERT(param1 < 4);
 
-    v1 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021D538C));
+    v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D538C));
 
     v1->unk_0C = param0;
     v1->unk_00 = ov5_021D53D4(param1, &v1->unk_04);
@@ -59,7 +59,7 @@ void ov5_021D5278 (UnkStruct_ov5_021D538C ** param0)
     GF_ASSERT(param0);
 
     ov5_021D555C(&(*param0)->unk_04);
-    FreeToHeapExplicit(4, *param0);
+    Heap_FreeToHeapExplicit(4, *param0);
 
     *param0 = NULL;
 }
@@ -167,7 +167,7 @@ static u32 ov5_021D53D4 (u32 param0, UnkStruct_ov5_021D52F4 ** param1)
         }
     } while (!((v5[0] == 'E') && (v5[1] == 'O') && (v5[2] == 'F')));
 
-    *param1 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021D52F4) * v2);
+    *param1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D52F4) * v2);
     MI_CpuClear8(*param1, sizeof(UnkStruct_ov5_021D52F4) * v2);
     v3 = v4;
 
@@ -195,14 +195,14 @@ static u32 ov5_021D53D4 (u32 param0, UnkStruct_ov5_021D52F4 ** param1)
         v3 = sub_0201E0B8(v3, v5, 0xd);
     }
 
-    FreeToHeapExplicit(4, v4);
+    Heap_FreeToHeapExplicit(4, v4);
 
     return v2;
 }
 
 static void ov5_021D555C (UnkStruct_ov5_021D52F4 ** param0)
 {
-    FreeToHeapExplicit(4, *param0);
+    Heap_FreeToHeapExplicit(4, *param0);
     *param0 = NULL;
 }
 

src/overlay005/ov5_021D56BC.c

@@ -20,7 +20,7 @@ UnkStruct_ov5_021D5778 * ov5_021D56BC (void)
 {
     UnkStruct_ov5_021D5778 * v0;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021D5778));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D5778));
     GF_ASSERT(v0 != NULL);
 
     return v0;
@@ -48,10 +48,10 @@ void ov5_021D56D4 (const char * param0, UnkStruct_ov5_021D5778 * param1)
         v3 = sizeof(UnkStruct_ov5_021D5778_sub1) * v1;
         v4 = sizeof(UnkStruct_ov5_021D57B4) * v2;
 
-        param1->unk_00 = AllocFromHeap(4, v3);
+        param1->unk_00 = Heap_AllocFromHeap(4, v3);
         GF_ASSERT(param1->unk_00 != NULL);
 
-        param1->unk_04 = AllocFromHeap(4, v4);
+        param1->unk_04 = Heap_AllocFromHeap(4, v4);
         GF_ASSERT(param1->unk_04 != NULL);
 
         v5 = FS_ReadFile(&v0, param1->unk_00, v3);
@@ -68,9 +68,9 @@ void ov5_021D56D4 (const char * param0, UnkStruct_ov5_021D5778 * param1)
 
 void ov5_021D5778 (UnkStruct_ov5_021D5778 * param0)
 {
-    FreeToHeap(param0->unk_04);
-    FreeToHeap(param0->unk_00);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0->unk_04);
+    Heap_FreeToHeap(param0->unk_00);
+    Heap_FreeToHeap(param0);
 }
 
 void ov5_021D5790 (const int param0, const UnkStruct_ov5_021D5778 * param1, u16 * param2)

src/overlay005/ov5_021D57BC.c

@@ -18,7 +18,7 @@ UnkStruct_ov5_021D57D8 * ov5_021D57BC (void)
 {
     UnkStruct_ov5_021D57D8 * v0;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021D57D8));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D57D8));
     MI_CpuClear32(v0, sizeof(UnkStruct_ov5_021D57D8));
 
     return v0;
@@ -26,7 +26,7 @@ UnkStruct_ov5_021D57D8 * ov5_021D57BC (void)
 
 void ov5_021D57D8 (UnkStruct_ov5_021D57D8 ** param0)
 {
-    FreeToHeapExplicit(4, *param0);
+    Heap_FreeToHeapExplicit(4, *param0);
     *param0 = NULL;
 }
 

src/overlay005/ov5_021D5878.c

@@ -10,7 +10,7 @@ UnkStruct_ov5_021D5894 * ov5_021D5878 (void)
 {
     UnkStruct_ov5_021D5894 * v0;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021D5894));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D5894));
     MI_CpuClear32(v0, sizeof(UnkStruct_ov5_021D5894));
 
     return v0;
@@ -18,7 +18,7 @@ UnkStruct_ov5_021D5894 * ov5_021D5878 (void)
 
 void ov5_021D5894 (UnkStruct_ov5_021D5894 ** param0)
 {
-    FreeToHeapExplicit(4, *param0);
+    Heap_FreeToHeapExplicit(4, *param0);
     *param0 = NULL;
 }
 

src/overlay005/ov5_021D5BC0.c

@@ -3,7 +3,7 @@
 
 #include "struct_defs/struct_0203CDB0.h"
 
-#include "poke_overlay.h"
+#include "game_overlay.h"
 #include "unk_0205964C.h"
 #include "overlay005/ov5_021D5BC0.h"
 #include "overlay005/ov5_021EA714.h"
@@ -85,7 +85,7 @@ static void ov5_021D5C54 (UnkStruct_0203CDB0 * param0)
 
 static void ov5_021D5C5C (UnkStruct_0203CDB0 * param0)
 {
-    HandleLoadOverlay(FS_OVERLAY_ID(overlay56), 2);
+    Overlay_LoadByID(FS_OVERLAY_ID(overlay56), 2);
     param0->unk_84 = ov56_02256410(param0);
 }
 
@@ -102,7 +102,7 @@ static void ov5_021D5C80 (UnkStruct_0203CDB0 * param0)
 static void ov5_021D5C88 (UnkStruct_0203CDB0 * param0)
 {
     ov56_02256468(param0->unk_84);
-    UnloadOverlayByID(FS_OVERLAY_ID(overlay56));
+    Overlay_UnloadByID(FS_OVERLAY_ID(overlay56));
 }
 
 static BOOL ov5_021D5CA0 (UnkStruct_0203CDB0 * param0)

src/overlay005/ov5_021D5CB0.c

@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "heap.h"
 #include "unk_0201DBEC.h"
 #include "unk_0201DD00.h"
@@ -42,7 +42,7 @@ UnkStruct_ov5_021D5CB0 * ov5_021D5CB0 (void)
     int v0;
     UnkStruct_ov5_021D5CB0 * v1 = NULL;
 
-    v1 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021D5CB0));
+    v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D5CB0));
 
     GF_ASSERT(v1);
 
@@ -154,7 +154,7 @@ void ov5_021D5E5C (UnkStruct_ov5_021D5CB0 * param0, int param1)
     }
 
     if (param0->unk_08[param1].unk_0C) {
-        FreeToHeap(param0->unk_08[param1].unk_0C);
+        Heap_FreeToHeap(param0->unk_08[param1].unk_0C);
     }
 
     if (param0->unk_08[param1].unk_10 != NULL) {
@@ -177,13 +177,13 @@ void ov5_021D5E8C (UnkStruct_ov5_021D5CB0 * param0)
         ov5_021D5E5C(param0, v0);
     }
 
-    FreeToHeap(param0->unk_00);
+    Heap_FreeToHeap(param0->unk_00);
 }
 
 void ov5_021D5EAC (UnkStruct_ov5_021D5CB0 * param0)
 {
     if (param0 != NULL) {
-        FreeToHeap(param0);
+        Heap_FreeToHeap(param0);
         param0 = NULL;
     }
 }

src/overlay005/ov5_021D5EB8.c

@@ -22,7 +22,7 @@
 #include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02005474.h"
-#include "filesystem.h"
+#include "narc.h"
 #include "unk_02006E3C.h"
 #include "unk_020093B4.h"
 #include "unk_02009714.h"
@@ -384,7 +384,7 @@ UnkStruct_ov5_021D5EF8 * ov5_021D5EB8 (UnkStruct_0203CDB0 * param0)
 {
     UnkStruct_ov5_021D5EF8 * v0;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021D5EF8));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D5EF8));
     memset(v0, 0, sizeof(UnkStruct_ov5_021D5EF8));
 
     v0->unk_00 = ov5_021D6364(param0);
@@ -394,7 +394,7 @@ UnkStruct_ov5_021D5EF8 * ov5_021D5EB8 (UnkStruct_0203CDB0 * param0)
     v0->unk_14 = NULL;
     v0->unk_10 = 31;
 
-    GX_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
     return v0;
 }
@@ -407,7 +407,7 @@ void ov5_021D5EF8 (UnkStruct_ov5_021D5EF8 * param0)
 
     ov5_021D63A4(&param0->unk_00);
     memset(param0, 0, sizeof(UnkStruct_ov5_021D5EF8));
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 
     param0 = NULL;
 }
@@ -795,7 +795,7 @@ static void ov5_021D61D0 (UnkStruct_ov5_021D61D0 * param0)
     }
 
     v2 = sub_02009F34();
-    param0->unk_10 = AllocFromHeap(4, v2 * 4);
+    param0->unk_10 = Heap_AllocFromHeap(4, v2 * 4);
 
     ov5_021D6290(param0->unk_10, 0, 63);
     ov5_021D6290(param0->unk_10, 1, 64);
@@ -829,7 +829,7 @@ static void ov5_021D6290 (UnkStruct_02009F38 * param0, int param1, int param2)
     v1 = sub_02006FE8(65, param2, 0, 4, 1);
 
     sub_02009F40(v1, v0, 4);
-    FreeToHeap(v1);
+    Heap_FreeToHeap(v1);
 }
 
 static void ov5_021D62BC (UnkStruct_ov5_021D61D0 * param0)
@@ -844,7 +844,7 @@ static void ov5_021D62BC (UnkStruct_ov5_021D61D0 * param0)
         sub_02009754(param0->unk_00[v0]);
     }
 
-    FreeToHeap(param0->unk_10);
+    Heap_FreeToHeap(param0->unk_10);
     param0->unk_10 = NULL;
 
     sub_02021964(param0->unk_130);
@@ -879,7 +879,7 @@ UnkStruct_ov5_021D6594 * ov5_021D6364 (UnkStruct_0203CDB0 * param0)
 {
     UnkStruct_ov5_021D6594 * v0;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021D6594));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D6594));
     v0->unk_140 = param0;
 
     ov5_021D61D0(&v0->unk_08);
@@ -903,12 +903,12 @@ void ov5_021D63A4 (UnkStruct_ov5_021D6594 ** param0)
         ov5_021D57FC((*param0)->unk_140->unk_48, 1, 0, 0, 0, 0);
 
         G2_SetBG0Priority(1);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
 
         ov5_021D62BC(&(*param0)->unk_08);
 
         NARC_dtor((*param0)->unk_144);
-        FreeToHeapExplicit(4, *param0);
+        Heap_FreeToHeapExplicit(4, *param0);
 
         *param0 = NULL;
     }
@@ -1112,7 +1112,7 @@ static BOOL ov5_021D66D0 (UnkStruct_ov5_021D6594 * param0, int param1)
         v1 = ov5_021D6A48(param0, v0);
 
         if (v1 == 0) {
-            FreeToHeap(v0->unk_08);
+            Heap_FreeToHeap(v0->unk_08);
             v0->unk_08 = NULL;
             return 0;
         }
@@ -1184,14 +1184,14 @@ static BOOL ov5_021D676C (UnkStruct_ov5_021D6594 * param0, int param1, int param
     v0->unk_08->unk_B8C = *(NNS_G3dGlbGetCameraTarget());
 
     if (v0->unk_04 > 0) {
-        v0->unk_08->unk_B98 = AllocFromHeap(4, v0->unk_04);
+        v0->unk_08->unk_B98 = Heap_AllocFromHeap(4, v0->unk_04);
         memset(v0->unk_08->unk_B98, 0, v0->unk_04);
     } else {
         v0->unk_08->unk_B98 = NULL;
     }
 
     if (v0->unk_02 != 0xffff) {
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
 
         G2_SetBG2Priority(1);
         G2_SetBG0Priority(2);
@@ -1225,7 +1225,7 @@ static void ov5_021D68B8 (UnkStruct_ov5_021D6594 * param0, int param1)
     UnkStruct_ov5_021D69B8 * v0 = param0->unk_00 + param1;
 
     if (v0->unk_02 != 0xffff) {
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
 
         G2_SetBG2Priority(3);
         G2_SetBG0Priority(1);
@@ -1234,7 +1234,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);
-        FreeToHeapExplicit(4, v0->unk_0C);
+        Heap_FreeToHeapExplicit(4, v0->unk_0C);
         v0->unk_0C = NULL;
 
         if (v0->unk_14 != NULL) {
@@ -1255,7 +1255,7 @@ static void ov5_021D68B8 (UnkStruct_ov5_021D6594 * param0, int param1)
         }
 
         if (v0->unk_08->unk_B98 != NULL) {
-            FreeToHeapExplicit(4, v0->unk_08->unk_B98);
+            Heap_FreeToHeapExplicit(4, v0->unk_08->unk_B98);
             v0->unk_08->unk_B98 = NULL;
         }
 
@@ -1269,7 +1269,7 @@ static void ov5_021D68B8 (UnkStruct_ov5_021D6594 * param0, int param1)
             }
         }
 
-        FreeToHeapExplicit(4, v0->unk_08);
+        Heap_FreeToHeapExplicit(4, v0->unk_08);
         v0->unk_08 = NULL;
     }
 
@@ -1279,7 +1279,7 @@ static void ov5_021D68B8 (UnkStruct_ov5_021D6594 * param0, int param1)
 static void ov5_021D69B8 (UnkStruct_ov5_021D69B8 * param0)
 {
     if (param0->unk_02 != 0xffff) {
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
 
         G2_SetBG2Priority(3);
         G2_SetBG0Priority(1);
@@ -1389,7 +1389,7 @@ static BOOL ov5_021D6B60 (UnkStruct_ov5_021D6594 * param0, UnkStruct_ov5_021D69B
         return 1;
     }
 
-    param1->unk_08 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021DB4B8));
+    param1->unk_08 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021DB4B8));
 
     if (param1->unk_08 == NULL) {
         return 0;
@@ -1415,7 +1415,7 @@ static BOOL ov5_021D6BC4 (UnkStruct_ov5_021D69B8 * param0)
             return 1;
         }
 
-        param0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021D6690));
+        param0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D6690));
 
         if (param0->unk_0C == NULL) {
             return 0;
@@ -1508,7 +1508,7 @@ static void ov5_021D6D84 (UnkStruct_ov5_021D6594 * param0, int param1)
         NNS_G2dGetUnpackedPaletteData(v0.unk_00, &v0.unk_14);
 
         sub_0201972C(2, v0.unk_14->pRawData, 32, 32 * 6);
-        FreeToHeap(v0.unk_00);
+        Heap_FreeToHeap(v0.unk_00);
 
         v0.unk_00 = NULL;
     }
@@ -1524,7 +1524,7 @@ static void ov5_021D6DCC (UnkStruct_ov5_021D6594 * param0, int param1)
         NNS_G2dGetUnpackedCharacterData(v0.unk_04, &v0.unk_10);
 
         sub_0201958C(param0->unk_140->unk_08, 2, v0.unk_10->pRawData, v0.unk_10->szByte, 0);
-        FreeToHeap(v0.unk_04);
+        Heap_FreeToHeap(v0.unk_04);
 
         v0.unk_04 = NULL;
     }
@@ -1535,7 +1535,7 @@ static void ov5_021D6E20 (UnkStruct_ov5_021D6594 * param0, int param1)
     UnkStruct_ov5_021D6D84 v0;
 
     if (param1 != 0xffff) {
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
 
         v0.unk_08 = NARC_AllocAndReadWholeMember(param0->unk_144, param0->unk_04[param1].unk_08, 4);
         GF_ASSERT(v0.unk_08);
@@ -1546,7 +1546,7 @@ static void ov5_021D6E20 (UnkStruct_ov5_021D6594 * param0, int param1)
         sub_02019574(param0->unk_140->unk_08, 2, (void *)v0.unk_0C->rawData, v0.unk_0C->szByte);
         sub_02019E2C(param0->unk_140->unk_08, 2, 0, 0, 32, 32, 6);
         sub_02019448(param0->unk_140->unk_08, 2);
-        FreeToHeap(v0.unk_08);
+        Heap_FreeToHeap(v0.unk_08);
 
         v0.unk_08 = NULL;
     }
@@ -3021,7 +3021,7 @@ static void ov5_021D879C (UnkStruct_0201CD38 * param0, void * param1)
         ov5_021D64FC(&v1->unk_00, 0, 16, 30);
         ov5_021D64E4(0, 16);
         G2_SetBG2Priority(3);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
         v0->unk_BA2 = 1;
         break;
     case 1:
@@ -3043,7 +3043,7 @@ static void ov5_021D879C (UnkStruct_0201CD38 * param0, void * param1)
 
         ov5_021D64E4(16, 16 - 16);
         G2_SetBG2Priority(3);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
 
         v0->unk_BA2 = 3;
         break;
@@ -3307,7 +3307,7 @@ static void ov5_021D8D08 (UnkStruct_0201CD38 * param0, void * param1)
 
             if ((v7 == 1) && (v6 == 3)) {
                 v0->unk_BA2 = 3;
-                GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+                GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
             }
         }
         break;
@@ -3326,7 +3326,7 @@ static void ov5_021D8D08 (UnkStruct_0201CD38 * param0, void * param1)
 
         ov5_021D7568(v0, ov5_021D8B88, 24, 2, 2, ov5_021D8C90);
         v0->unk_BA2 = 3;
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
         break;
     case 3:
         if (v5->unk_00.unk_06-- <= 0) {
@@ -3352,7 +3352,7 @@ static void ov5_021D8D08 (UnkStruct_0201CD38 * param0, void * param1)
             v5->unk_B4[0] = 31;
             v0->unk_BA2 = 4;
 
-            GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+            GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
         }
         break;
     case 4:
@@ -3429,7 +3429,7 @@ static void ov5_021D8FF8 (UnkStruct_0201CD38 * param0, void * param1)
 
             if ((v7 == 1) && (v6 == 3)) {
                 v0->unk_BA2 = 3;
-                GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+                GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
             }
         }
         break;
@@ -3447,7 +3447,7 @@ static void ov5_021D8FF8 (UnkStruct_0201CD38 * param0, void * param1)
 
         ov5_021D7568(v0, ov5_021D92C4, 20, 2, 2, ov5_021D93DC);
         v0->unk_BA2 = 3;
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
         break;
     case 3:
         if (v5->unk_00.unk_06-- <= 0) {
@@ -3473,7 +3473,7 @@ static void ov5_021D8FF8 (UnkStruct_0201CD38 * param0, void * param1)
             v5->unk_B4[0] = 20;
             v0->unk_BA2 = 4;
 
-            GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+            GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
         }
         break;
     case 4:
@@ -3810,7 +3810,7 @@ static void ov5_021D97E8 (UnkStruct_0201CD38 * param0, void * param1)
 
         ov5_021D64E4(0, 16);
         G2_SetBG2Offset(0, 32);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
 
         v0->unk_BA2 = 1;
         break;
@@ -4034,7 +4034,7 @@ static void ov5_021D9C20 (UnkStruct_0201CD38 * param0, void * param1, u32 param2
             ov5_021D585C(v0->unk_00->unk_140->unk_48, Unk_ov5_021F8E14);
             ov5_021D64E4(param2, 16 - param2);
 
-            GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+            GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
 
             v2->unk_98[0] = param4;
             v2->unk_98[1] = 0;
@@ -4050,7 +4050,7 @@ static void ov5_021D9C20 (UnkStruct_0201CD38 * param0, void * param1, u32 param2
             ov5_021D7384(v0->unk_00->unk_140->unk_48, 5, 28591, (GX_RGB(0, 0, 0)));
             ov5_021D585C(v0->unk_00->unk_140->unk_48, Unk_ov5_021F8E14);
             ov5_021D64E4(param2, 16 - param2);
-            GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+            GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
             v2->unk_98[0] = param4;
             v2->unk_98[1] = 0;
         }
@@ -4086,7 +4086,7 @@ static void ov5_021D9C20 (UnkStruct_0201CD38 * param0, void * param1, u32 param2
         break;
     case 4:
         ov5_021D64E4(0, 16);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
         v0->unk_BA2 = 5;
         break;
     case 5:
@@ -4385,7 +4385,7 @@ static void ov5_021DA244 (UnkStruct_0201CD38 * param0, void * param1)
 
             if ((v9 == 1) && (v8 == 3)) {
                 v0->unk_BA2 = 3;
-                GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+                GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
             }
         }
 
@@ -4406,7 +4406,7 @@ static void ov5_021DA244 (UnkStruct_0201CD38 * param0, void * param1)
 
         ov5_021D7568(v0, ov5_021DA5A0, 20, 2, 16, ov5_021DA6BC);
         v0->unk_BA2 = 3;
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
         break;
     case 3:
         if (v7->unk_00.unk_06-- <= 0) {
@@ -4425,7 +4425,7 @@ static void ov5_021DA244 (UnkStruct_0201CD38 * param0, void * param1)
             v0->unk_BA2 = 4;
             v7->unk_B4[5] = 1;
 
-            GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+            GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
         }
         break;
     case 4:
@@ -4616,7 +4616,7 @@ static void ov5_021DA748 (UnkStruct_0201CD38 * param0, void * param1)
         v1[1] = 0;
 
         ov5_021D64E4(0, 31);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
 
         v0->unk_BA2 = 3;
         break;
@@ -4858,7 +4858,7 @@ static void ov5_021DAB78 (UnkStruct_0201CD38 * param0, void * param1)
 
         G2_SetBG2Priority(3);
 
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
         v0->unk_BA2 = 1;
         break;
     case 1:
@@ -4874,7 +4874,7 @@ static void ov5_021DAB78 (UnkStruct_0201CD38 * param0, void * param1)
     case 2:
         ov5_021D64E4(16, 16 - 16);
         G2_SetBG2Priority(3);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
 
         v0->unk_BA2 = 3;
         break;
@@ -4916,7 +4916,7 @@ static void ov5_021DAC68 (UnkStruct_0201CD38 * param0, void * param1)
     case 0:
         ov5_021D64FC(&v1->unk_00, 0, 4, 8);
         ov5_021D64E4(0, 16);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
         v0->unk_BA2 = 1;
         break;
     case 1:
@@ -4929,7 +4929,7 @@ static void ov5_021DAC68 (UnkStruct_0201CD38 * param0, void * param1)
         break;
     case 2:
         ov5_021D64E4(4, 16 - 4);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
         v0->unk_BA2 = 3;
         break;
     case 3:
@@ -4971,7 +4971,7 @@ static void ov5_021DAD38 (UnkStruct_0201CD38 * param0, void * param1)
         ov5_021D7308(&v1->unk_44, &v1->unk_14, v0->unk_00->unk_140->unk_48, 7, 30287, (GX_RGB(0, 0, 0)), 1, v0->unk_BA4);
         ov5_021D64FC(&v1->unk_00, 0, 9, 30);
         ov5_021D64E4(0, 16);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
         v0->unk_BA2 = 1;
         break;
     case 1:
@@ -4992,7 +4992,7 @@ static void ov5_021DAD38 (UnkStruct_0201CD38 * param0, void * param1)
         }
 
         ov5_021D64E4(9, 16 - 9);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
 
         v0->unk_BA2 = 3;
         break;
@@ -5049,7 +5049,7 @@ static void ov5_021DAEC0 (UnkStruct_0201CD38 * param0, void * param1)
         ov5_021D7308(&v1->unk_44, &v1->unk_14, v0->unk_00->unk_140->unk_48, 6, 30037, (GX_RGB(31, 31, 31)), 1, v0->unk_BA4);
         ov5_021D64FC(&v1->unk_00, 0, 9, 30);
         ov5_021D64E4(0, 16);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
         v0->unk_BA2 = 1;
         break;
     case 1:
@@ -5070,7 +5070,7 @@ static void ov5_021DAEC0 (UnkStruct_0201CD38 * param0, void * param1)
         }
 
         ov5_021D64E4(9, 16 - 9);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
         v0->unk_BA2 = 3;
         break;
     case 3:
@@ -5129,13 +5129,13 @@ static void ov5_021DB04C (UnkStruct_0201CD38 * param0, void * param1)
         break;
     case 1:
         if (ov5_021DB700(&v1->unk_00) == 1) {
-            GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+            GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
             ov5_021DB7A4(&v1->unk_00);
             v0->unk_BA2 = 3;
         }
         break;
     case 2:
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
         v0->unk_BA2 = 3;
         break;
     case 3:
@@ -5146,7 +5146,7 @@ static void ov5_021DB04C (UnkStruct_0201CD38 * param0, void * param1)
         }
         break;
     case 4:
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
 
         if (ov5_021DB700(&v1->unk_00) == 1) {
             v0->unk_BA2 = 5;
@@ -5177,7 +5177,7 @@ static void ov5_021DB144 (UnkStruct_0201CD38 * param0, void * param1)
     case 0:
         ov5_021D64FC(&v1->unk_00, 0, 7, 8);
         ov5_021D64E4(0, 16);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
         ov5_021D7308(&v1->unk_44, &v1->unk_14, v0->unk_00->unk_140->unk_48, 3, 0x6F6F + -1600, (GX_RGB(31, 31, 31)), 1, v0->unk_BA4);
 
         v1->unk_AC = 0;
@@ -5204,7 +5204,7 @@ static void ov5_021DB144 (UnkStruct_0201CD38 * param0, void * param1)
             ov5_021D74D4(&v1->unk_14);
         }
 
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
 
         v1->unk_AC = 0;
         v1->unk_B0 = 0;

src/overlay005/ov5_021DB888.c

@@ -336,7 +336,7 @@ void ov5_021DB888 (UnkStruct_020508D4 * param0, UnkStruct_0200B358 * param1, u16
     UnkStruct_ov5_021DBA58 * v0;
     UnkStruct_0203CDB0 * v1 = sub_02050A60(param0);
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021DBA58));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021DBA58));
 
     if (v0 == NULL) {
         GF_ASSERT(FALSE);
@@ -428,7 +428,7 @@ static BOOL ov5_021DB8D8 (UnkStruct_020508D4 * param0)
         ov5_021DBA54(v3, 9);
         break;
     case 9:
-        FreeToHeap(v3);
+        Heap_FreeToHeap(v3);
         return 1;
     }
 
@@ -594,7 +594,7 @@ static void ov5_021DBC64 (UnkStruct_ov5_021DBA58 * param0, UnkStruct_0201CD38 *
 {
     UnkStruct_ov5_021DBC64 * v0 = NULL;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021DBC64));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021DBC64));
 
     if (v0 == NULL) {
         GF_ASSERT(FALSE);
@@ -621,7 +621,7 @@ static void ov5_021DBC94 (UnkStruct_0201CD38 * param0, void * param1)
 
         sub_02065758(v0->unk_04);
         sub_0200DA58(v0->unk_00);
-        FreeToHeapExplicit(4, param1);
+        Heap_FreeToHeapExplicit(4, param1);
     }
 
     return;

src/overlay005/ov5_021DC018.c

@@ -160,7 +160,7 @@ UnkStruct_ov5_021DC1A4 * ov5_021DC150 (UnkStruct_0203CDB0 * param0, u8 param1, u
     UnkStruct_ov5_021DC1A4 * v0;
     int v1;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021DC1A4));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021DC1A4));
 
     if (v0 == NULL) {
         return NULL;
@@ -326,7 +326,7 @@ void ov5_021DC424 (UnkStruct_ov5_021DC1A4 * param0)
     }
 
     sub_0200DA58(param0->unk_04);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 
     return;
 }
@@ -602,7 +602,7 @@ static void ov5_021DCA28 (UnkStruct_ov5_021DC1A4 * param0)
     }
 
     sub_0200DA58(param0->unk_04);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 
     return;
 }
@@ -697,7 +697,7 @@ static void ov5_021DCC64 (UnkStruct_0201CD38 * param0, void * param1)
         }
 
         sub_0200DA58(v1->unk_04);
-        FreeToHeap(v1);
+        Heap_FreeToHeap(v1);
     }
 
     return;
@@ -1015,7 +1015,7 @@ void ov5_021DD3A8 (UnkStruct_ov5_021DC1A4 * param0)
         sub_0200B190(param0->unk_8C);
     }
 
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
     return;
 }
 

src/overlay005/ov5_021DD6FC.c

@@ -73,7 +73,7 @@ static void ov5_021DD744 (UnkStruct_ov5_021DD9C8 * param0, u8 param1, u16 param2
     v0 = sub_02006F88(160, v3 + 1, &v2, 4);
 
     ov5_021DD6FC(v2->pRawData, 1, param3);
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
 }
 
 static void ov5_021DD7A0 (UnkStruct_ov5_021DD9C8 * param0, const int param1)
@@ -126,7 +126,7 @@ static void ov5_021DD7A0 (UnkStruct_ov5_021DD9C8 * param0, const int param1)
         }
 
         sub_0201A954(&param0->unk_20);
-        FreeToHeap(param0->unk_38);
+        Heap_FreeToHeap(param0->unk_38);
     }
 }
 
@@ -228,7 +228,7 @@ UnkStruct_ov5_021DD9C8 * ov5_021DD98C (UnkStruct_02018340 * param0)
 {
     UnkStruct_ov5_021DD9C8 * v0;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021DD9C8));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021DD9C8));
     v0->unk_40 = sub_02023790(22, 4);
 
     ov5_021DD894(v0, param0);
@@ -243,7 +243,7 @@ void ov5_021DD9C8 (UnkStruct_ov5_021DD9C8 * param0)
     sub_0200B190(param0->unk_3C);
     sub_0201A8FC(&param0->unk_20);
     sub_020237BC(param0->unk_40);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 
     param0 = NULL;
 }

src/overlay005/ov5_021DDAE4.c

@@ -7,7 +7,7 @@
 #include "struct_defs/struct_0203CDB0.h"
 #include "struct_defs/struct_0203CDB0_sub2_t.h"
 
-#include "poke_overlay.h"
+#include "game_overlay.h"
 #include "unk_0200A784.h"
 #include "unk_0200A9DC.h"
 #include "heap.h"
@@ -44,8 +44,8 @@ static BOOL ov5_021DDAE4 (UnkStruct_020508D4 * param0)
         if (ov24_02253DB4(v0->unk_08)) {
             UnkStruct_02056B24 * v2 = sub_02056B24(v0->unk_0C);
 
-            UnloadOverlayByID(FS_OVERLAY_ID(overlay24));
-            HandleLoadOverlay(FS_OVERLAY_ID(overlay25), 2);
+            Overlay_UnloadByID(FS_OVERLAY_ID(overlay24));
+            Overlay_LoadByID(FS_OVERLAY_ID(overlay25), 2);
             sub_020567D0(v2);
             ov25_02253CE8(v0, &v0->unk_04->unk_14, v0->unk_0C, v0->unk_08, sub_0200A914(1));
             v1->unk_00++;
@@ -57,7 +57,7 @@ static BOOL ov5_021DDAE4 (UnkStruct_020508D4 * param0)
         break;
     case 4:
         if (sub_0200AC1C(2)) {
-            FreeToHeap(v1);
+            Heap_FreeToHeap(v1);
             return 1;
         }
         break;
@@ -68,7 +68,7 @@ static BOOL ov5_021DDAE4 (UnkStruct_020508D4 * param0)
 
 void ov5_021DDBC8 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_ov5_021DDBC8 * v0 = AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov5_021DDBC8));
+    UnkStruct_ov5_021DDBC8 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov5_021DDBC8));
 
     v0->unk_00 = 0;
     sub_02050944(param0, ov5_021DDAE4, v0);

src/overlay005/ov5_021DDBE8.c

@@ -38,7 +38,7 @@
 
 #include "unk_02002F38.h"
 #include "unk_0200679C.h"
-#include "filesystem.h"
+#include "narc.h"
 #include "unk_02006E3C.h"
 #include "unk_020093B4.h"
 #include "unk_02009714.h"
@@ -264,7 +264,7 @@ void ov5_021DDBE8 (int param0, UnkStruct_0203CDB0 * param1, BOOL * param2)
 void ov5_021DDC28 (UnkStruct_ov5_021DDC28 * param0, UnkStruct_0201CD38 * param1)
 {
     NARC_dtor(param0->unk_20);
-    FreeToHeapExplicit(4, param0->unk_0C);
+    Heap_FreeToHeapExplicit(4, param0->unk_0C);
     sub_020067D0(param1);
 }
 
@@ -273,7 +273,7 @@ void ov5_021DDC44 (int param0, u32 param1, u32 param2, BOOL * param3, u32 param4
     UnkStruct_0201CD38 * v0;
     UnkStruct_ov5_021DDC44 * v1;
 
-    v1 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021DDC44));
+    v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021DDC44));
     memset(v1, 0, sizeof(UnkStruct_ov5_021DDC44));
     sub_0200D9E8(ov5_021DDC88, v1, 5);
 
@@ -338,7 +338,7 @@ static void ov5_021DDC88 (UnkStruct_0201CD38 * param0, void * param1)
         }
 
         sub_0200DA58(param0);
-        FreeToHeap(v0);
+        Heap_FreeToHeap(v0);
 
         return;
     }
@@ -488,7 +488,7 @@ UnkStruct_ov5_021DDF74 * ov5_021DDF38 (void)
 {
     UnkStruct_ov5_021DDF74 * v0;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021DDF74));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021DDF74));
     memset(v0, 0, sizeof(UnkStruct_ov5_021DDF74));
 
     G2_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 1);
@@ -504,7 +504,7 @@ void ov5_021DDF74 (UnkStruct_ov5_021DDF74 * param0)
     }
 
     GX_SetVisibleWnd(GX_WNDMASK_NONE);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov5_021DDF9C (UnkStruct_ov5_021DDC28 * param0, UnkStruct_ov5_021DDF74 * param1, u8 param2, u32 param3, int param4, int param5, fx32 param6)
@@ -624,7 +624,7 @@ UnkStruct_ov5_021DE374 * ov5_021DE1CC (void)
 {
     UnkStruct_ov5_021DE374 * v0;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021DE374));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021DE374));
     memset(v0, 0, sizeof(UnkStruct_ov5_021DE374));
 
     G2_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 1);
@@ -641,7 +641,7 @@ void ov5_021DE218 (UnkStruct_ov5_021DE374 * param0)
     }
 
     GX_SetVisibleWnd(GX_WNDMASK_NONE);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov5_021DE240 (UnkStruct_ov5_021DDC28 * param0, UnkStruct_ov5_021DE374 * param1, u32 param2, fx32 param3, fx32 param4)
@@ -812,7 +812,7 @@ void ov5_021DE3D0 (NARC * param0, u32 param1, u32 param2, u32 param3, u32 param4
 
     sub_020198C0(param6, param7, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     sub_02019E2C(param6, param7, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8, param4);
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
     sub_0201C3C0(param6, param7);
 }
 
@@ -871,14 +871,14 @@ void ov5_021DE5D0 (UnkStruct_02022550 * param0, u32 param1, u32 param2, u8 param
     u16 * v3;
 
     sub_02076AAC(param2, 2, &v0);
-    v3 = AllocFromHeap(param1, 32);
+    v3 = Heap_AllocFromHeap(param1, 32);
     v2 = sub_02006F88(v0.unk_00, v0.unk_08, &v1, param1);
     sub_0200393C(v1->pRawData, v3, 16, param3, param4);
 
     ov5_021DE67C(param0, v3, 32);
 
-    FreeToHeap(v3);
-    FreeToHeap(v2);
+    Heap_FreeToHeap(v3);
+    Heap_FreeToHeap(v2);
 }
 
 UnkStruct_02022550 * ov5_021DE62C (UnkStruct_ov5_021DE47C * param0, UnkStruct_ov5_021DE5A4 * param1, fx32 param2, fx32 param3, fx32 param4, int param5)
@@ -925,7 +925,7 @@ UnkStruct_ov5_021DE6BC * ov5_021DE6A4 (u32 param0)
 {
     UnkStruct_ov5_021DE6BC * v0;
 
-    v0 = AllocFromHeap(param0, sizeof(UnkStruct_ov5_021DE6BC));
+    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021DE6BC));
     memset(v0, 0, sizeof(UnkStruct_ov5_021DE6BC));
 
     return v0;
@@ -933,7 +933,7 @@ UnkStruct_ov5_021DE6BC * ov5_021DE6A4 (u32 param0)
 
 void ov5_021DE6BC (UnkStruct_ov5_021DE6BC * param0)
 {
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov5_021DE6C4 (UnkStruct_ov5_021DE6BC * param0, int param1, int param2, int param3, int param4, int param5, UnkStruct_0205AA50 * param6, u32 param7, u32 param8, u8 param9)
@@ -976,7 +976,7 @@ UnkStruct_ov5_021DE79C * ov5_021DE784 (u32 param0)
 {
     UnkStruct_ov5_021DE79C * v0;
 
-    v0 = AllocFromHeap(param0, sizeof(UnkStruct_ov5_021DE79C));
+    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021DE79C));
 
     memset(v0, 0, sizeof(UnkStruct_ov5_021DE79C));
     return v0;
@@ -984,7 +984,7 @@ UnkStruct_ov5_021DE79C * ov5_021DE784 (u32 param0)
 
 void ov5_021DE79C (UnkStruct_ov5_021DE79C * param0)
 {
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov5_021DE7A4 (UnkStruct_ov5_021DE79C * param0, int param1, int param2, int param3, int param4, int param5, UnkStruct_0205AA50 * param6, u32 param7, u32 param8, u8 param9)
@@ -1063,7 +1063,7 @@ UnkStruct_ov5_021DE928 * ov5_021DE8F8 (u32 param0)
     UnkStruct_ov5_021DE928 * v0;
     int v1;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021DE928));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021DE928));
     memset(v0, 0, sizeof(UnkStruct_ov5_021DE928));
 
     for (v1 = 0; v1 < 48; v1++) {
@@ -1081,7 +1081,7 @@ void ov5_021DE928 (UnkStruct_ov5_021DE928 * param0)
         ov5_021DE79C(param0->unk_04[v0]);
     }
 
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov5_021DE948 (UnkStruct_ov5_021DE928 * param0, u8 param1, u8 param2, UnkStruct_0205AA50 * param3, u8 param4)
@@ -1142,14 +1142,14 @@ UnkStruct_ov5_021DEA98 * ov5_021DEA80 (u32 param0)
 {
     UnkStruct_ov5_021DEA98 * v0;
 
-    v0 = AllocFromHeap(param0, sizeof(UnkStruct_ov5_021DEA98));
+    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021DEA98));
     memset(v0, 0, sizeof(UnkStruct_ov5_021DEA98));
     return v0;
 }
 
 void ov5_021DEA98 (UnkStruct_ov5_021DEA98 * param0)
 {
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov5_021DEAA0 (UnkStruct_ov5_021DEA98 * param0, u8 param1, u16 param2, u16 param3, UnkStruct_0205AA50 * param4, u8 param5)
@@ -1230,7 +1230,7 @@ UnkStruct_ov5_021DEC18 * ov5_021DEBEC (u32 param0)
     UnkStruct_ov5_021DEC18 * v0;
     int v1;
 
-    v0 = AllocFromHeap(param0, sizeof(UnkStruct_ov5_021DEC18));
+    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021DEC18));
     memset(v0, 0, sizeof(UnkStruct_ov5_021DEC18));
 
     for (v1 = 0; v1 < 8; v1++) {
@@ -1248,7 +1248,7 @@ void ov5_021DEC18 (UnkStruct_ov5_021DEC18 * param0)
         ov5_021DEA98(param0->unk_00[v0]);
     }
 
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov5_021DEC38 (UnkStruct_ov5_021DEC18 * param0, u8 param1, UnkStruct_0205AA50 * param2, u8 param3)
@@ -1288,7 +1288,7 @@ UnkStruct_ov5_021DED04 * ov5_021DECEC (void)
 {
     UnkStruct_ov5_021DED04 * v0;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021DED04));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021DED04));
     memset(v0, 0, sizeof(UnkStruct_ov5_021DED04));
 
     return v0;
@@ -1300,7 +1300,7 @@ void ov5_021DED04 (UnkStruct_ov5_021DED04 * param0)
         ov5_021DEE84(param0);
     }
 
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov5_021DED20 (UnkStruct_ov5_021DDC28 * param0, UnkStruct_ov5_021DED04 * param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6)
@@ -1467,16 +1467,16 @@ void ov5_021DEFA0 (UnkStruct_0203CDB0 * param0)
 {
     GF_ASSERT(Unk_ov5_02202120 == NULL);
 
-    Unk_ov5_02202120 = AllocFromHeap(4, sizeof(UnkStruct_ov5_02202120));
+    Unk_ov5_02202120 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_02202120));
     memset(Unk_ov5_02202120, 0, sizeof(UnkStruct_ov5_02202120));
 
     Unk_ov5_02202120->unk_00 = 0;
     Unk_ov5_02202120->unk_02 = 0;
     Unk_ov5_02202120->unk_04 = param0;
 
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG3, 0);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 0);
 
     GX_ResetBankForBG();
     MI_CpuClearFast((void *)HW_LCDC_VRAM_C, HW_VRAM_C_SIZE);
@@ -1517,7 +1517,7 @@ void ov5_021DF084 (void)
     ov5_021D16F4(Unk_ov5_02202120->unk_04, 1);
     ov5_021D1718(Unk_ov5_02202120->unk_04, 1);
 
-    FreeToHeap(Unk_ov5_02202120);
+    Heap_FreeToHeap(Unk_ov5_02202120);
     Unk_ov5_02202120 = NULL;
 }
 
@@ -1529,7 +1529,7 @@ 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 = AllocFromHeap(4, 0x4800);
+    Unk_ov5_02202120->unk_0C = Heap_AllocFromHeap(4, 0x4800);
     Unk_ov5_02202120->unk_08 = sub_02014014(ov5_021DF3E8, ov5_021DF414, Unk_ov5_02202120->unk_0C, 0x4800, 1, 4);
     GF_ASSERT(Unk_ov5_02202120->unk_08);
 
@@ -1586,7 +1586,7 @@ void ov5_021DF224 (void)
     GF_ASSERT(Unk_ov5_02202120);
 
     sub_0201411C(Unk_ov5_02202120->unk_08);
-    FreeToHeap(Unk_ov5_02202120->unk_0C);
+    Heap_FreeToHeap(Unk_ov5_02202120->unk_0C);
 
     Unk_ov5_02202120->unk_08 = NULL;
     Unk_ov5_02202120->unk_0C = NULL;
@@ -1660,10 +1660,10 @@ static void ov5_021DF30C (UnkStruct_0203CDB0 * param0)
             GX_VRAM_TEXPLTT_0123_E
         };
 
-        GX_SetBanks(&v0);
+        GXLayers_SetBanks(&v0);
     }
 
-    GX_EngineAToggleLayers(
+    GXLayers_EngineAToggleLayers(
         GX_PLANEMASK_BG0, 0);
 
     {
@@ -1684,7 +1684,7 @@ static void ov5_021DF30C (UnkStruct_0203CDB0 * param0)
             G2_SetBG3ControlDCBmp(GX_BG_SCRSIZE_DCBMP_256x256, GX_BG_AREAOVER_XLU, GX_BG_BMPSCRBASE_0x20000);
 
             sub_02019060(3, 3);
-            GX_EngineAToggleLayers(GX_PLANEMASK_BG3, 1);
+            GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1);
 
             {
                 MtxFx22 v2;
@@ -1717,7 +1717,7 @@ static void ov5_021DF30C (UnkStruct_0203CDB0 * param0)
         }
     }
 
-    GX_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 }
 
 static void ov5_021DF3D4 (UnkStruct_0203CDB0 * param0)

src/overlay005/ov5_021DF440.c

@@ -25,7 +25,7 @@
 #include "overlay005/struct_ov5_021FF85C.h"
 #include "overlay101/struct_ov101_021D86B0.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "unk_0200D9E8.h"
 #include "heap.h"
 #include "unk_02020AEC.h"
@@ -115,13 +115,13 @@ UnkStruct_ov5_021DF47C * ov5_021DF440 (UnkStruct_0203CDB0 * param0, u32 param1,
 {
     UnkStruct_ov5_021DF47C * v0;
 
-    v0 = AllocFromHeap(param2, (sizeof(UnkStruct_ov5_021DF47C)));
+    v0 = Heap_AllocFromHeap(param2, (sizeof(UnkStruct_ov5_021DF47C)));
     memset(v0, 0, (sizeof(UnkStruct_ov5_021DF47C)));
 
     v0->unk_00 = param2;
     v0->unk_04 = param1;
     v0->unk_10 = param0;
-    v0->unk_14 = AllocFromHeap(param2, (sizeof(UnkStruct_ov5_021DF6AC)) * param1);
+    v0->unk_14 = Heap_AllocFromHeap(param2, (sizeof(UnkStruct_ov5_021DF6AC)) * param1);
 
     ov5_021DF5E8(v0);
     ov5_021DF588(v0);
@@ -178,8 +178,8 @@ void ov5_021DF500 (UnkStruct_ov5_021DF47C * param0)
     ov5_021DF644(param0);
     ov5_021DF7C4(param0);
     ov5_021DF59C(param0);
-    FreeToHeap(param0->unk_14);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0->unk_14);
+    Heap_FreeToHeap(param0);
 }
 
 void * ov5_021DF528 (const UnkStruct_ov5_021DF47C * param0, u32 param1, int param2)
@@ -187,9 +187,9 @@ void * ov5_021DF528 (const UnkStruct_ov5_021DF47C * param0, u32 param1, int para
     void * v0;
 
     if (param2 == 0) {
-        v0 = AllocFromHeap(param0->unk_00, param1);
+        v0 = Heap_AllocFromHeap(param0->unk_00, param1);
     } else {
-        v0 = AllocFromHeapAtEnd(param0->unk_00, param1);
+        v0 = Heap_AllocFromHeapAtEnd(param0->unk_00, param1);
     }
 
     return v0;
@@ -205,7 +205,7 @@ void * ov5_021DF53C (const UnkStruct_ov5_021DF47C * param0, u32 param1, int para
 
 void ov5_021DF554 (void * param0)
 {
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void * ov5_021DF55C (UnkStruct_ov5_021DF47C * param0, u32 param1)

src/overlay005/ov5_021DFB54.c

@@ -1640,7 +1640,7 @@ static UnkStruct_0201CD38 * ov5_021E0F54 (UnkStruct_0203CDB0 * param0, u32 param
     {
         UnkStruct_0201CD38 * v2;
         UnkStruct_02061AB4 * v3 = sub_0205EB3C(v0);
-        UnkStruct_ov5_021E0FF0 * v4 = AllocFromHeapAtEnd(4, (sizeof(UnkStruct_ov5_021E0FF0)));
+        UnkStruct_ov5_021E0FF0 * v4 = Heap_AllocFromHeapAtEnd(4, (sizeof(UnkStruct_ov5_021E0FF0)));
 
         v4->unk_00 = 0;
         v4->unk_08 = param0;
@@ -1670,7 +1670,7 @@ static void ov5_021E0FC0 (UnkStruct_0201CD38 * param0)
         int v2 = sub_0205ED6C(0x0, sub_0205EB98(v1));
 
         ov5_021DFB90(v1);
-        FreeToHeap(v0);
+        Heap_FreeToHeap(v0);
         sub_0200DA58(param0);
     }
 }
@@ -1767,7 +1767,7 @@ static UnkStruct_02061AB4 * ov5_021E10D4 (UnkStruct_0205E884 * param0, int param
 
 static void * ov5_021E1110 (int param0)
 {
-    void * v0 = AllocFromHeapAtEnd(4, param0);
+    void * v0 = Heap_AllocFromHeapAtEnd(4, param0);
 
     GF_ASSERT(v0 != NULL);
     memset(v0, 0, param0);
@@ -1777,11 +1777,11 @@ static void * ov5_021E1110 (int param0)
 
 static void ov5_021E1134 (void * param0)
 {
-    FreeToHeapExplicit(4, param0);
+    Heap_FreeToHeapExplicit(4, param0);
 }
 
 static UnkStruct_02073C74 * ov5_021E1140 (UnkStruct_0203CDB0 * param0, int param1)
 {
-    UnkStruct_02073C74 * v0 = Party_GetPokemonBySlotIndex(GetPartyFromSavedata(param0->unk_0C), param1);
+    UnkStruct_02073C74 * v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_0C), param1);
     return v0;
 }

src/overlay005/ov5_021E1154.c

@@ -153,7 +153,7 @@ static BOOL ov5_021E120C (UnkStruct_020508D4 * param0)
 
 static void * ov5_021E132C (int param0)
 {
-    void * v0 = AllocFromHeapAtEnd(4, param0);
+    void * v0 = Heap_AllocFromHeapAtEnd(4, 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)
 {
-    FreeToHeapExplicit(4, param0);
+    Heap_FreeToHeapExplicit(4, param0);
 }

src/overlay005/ov5_021E135C.c

@@ -70,7 +70,7 @@ static void ov5_021E139C (UnkStruct_0201CD38 * param0, void * param1)
             sub_0200F174(2, 0, 0, 0x0, 6, 1, 4);
         } else if ((v0->unk_0C > 20) && sub_0200F2AC()) {
             *v0->unk_04 = 1;
-            FreeToHeap(v0);
+            Heap_FreeToHeap(v0);
             sub_0200DA58(param0);
         } else {
             break;
@@ -121,7 +121,7 @@ static void ov5_021E1470 (UnkStruct_0201CD38 * param0, void * param1)
         if (sub_0200F2AC()) {
             sub_0205EA84(v0->unk_00->unk_3C, 1);
             *v0->unk_04 = 1;
-            FreeToHeap(v0);
+            Heap_FreeToHeap(v0);
             sub_0200DA58(param0);
         }
         break;
@@ -130,7 +130,7 @@ static void ov5_021E1470 (UnkStruct_0201CD38 * param0, void * param1)
 
 void ov5_021E15A8 (UnkStruct_0203CDB0 * param0, BOOL param1, BOOL * param2)
 {
-    UnkStruct_ov5_021E135C * v0 = AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021E135C));
+    UnkStruct_ov5_021E135C * v0 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021E135C));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_ov5_021E135C));
 

src/overlay005/ov5_021E15F4.c

@@ -9,7 +9,7 @@
 #include "overlay005/struct_ov5_021D57B4.h"
 #include "overlay005/struct_ov5_021D5894.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "heap.h"
 #include "unk_0201C970.h"
 #include "unk_0201CED8.h"
@@ -51,7 +51,7 @@ UnkStruct_ov5_021E1608 * ov5_021E15F4 (const u8 param0)
 {
     UnkStruct_ov5_021E1608 * v0;
 
-    v0 = AllocFromHeap(param0, sizeof(UnkStruct_ov5_021E1608));
+    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021E1608));
     ov5_021E1610(v0);
 
     return v0;
@@ -59,7 +59,7 @@ UnkStruct_ov5_021E1608 * ov5_021E15F4 (const u8 param0)
 
 void ov5_021E1608 (UnkStruct_ov5_021E1608 * param0)
 {
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
     param0 = NULL;
 }
 
@@ -106,7 +106,7 @@ void ov5_021E16CC (NARC * param0, const int param1, UnkStruct_ov5_021EF76C * con
     int v2;
 
     if (param1 != 0) {
-        v0 = AllocFromHeapAtEnd(4, param1);
+        v0 = Heap_AllocFromHeapAtEnd(4, param1);
         NARC_ReadFile(param0, param1, v0);
         v1 = param1 / sizeof(UnkStruct_ov5_021E16CC);
     } else {
@@ -148,7 +148,7 @@ void ov5_021E16CC (NARC * param0, const int param1, UnkStruct_ov5_021EF76C * con
     }
 
     if (v0 != NULL) {
-        FreeToHeap(v0);
+        Heap_FreeToHeap(v0);
     }
 }
 

src/overlay005/ov5_021E1B08.c

@@ -26,7 +26,7 @@ static BOOL ov5_021E1CB0(UnkStruct_0203CDB0 * param0);
 
 void * ov5_021E1B08 (u32 param0)
 {
-    void * v0 = AllocFromHeap(param0, sizeof(UnkStruct_ov5_021E1B20));
+    void * v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021E1B20));
 
     memset(v0, 0, sizeof(UnkStruct_ov5_021E1B20));
     return v0;
@@ -38,7 +38,7 @@ void ov5_021E1B20 (UnkStruct_ov5_021E1B20 * param0)
         sub_0201A8FC(&param0->unk_00);
     }
 
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov5_021E1B38 (UnkStruct_ov5_021E1B20 * param0, u16 param1, u16 param2)

src/overlay005/ov5_021E1D20.c

@@ -172,7 +172,7 @@ static void ov5_021E1E20 (const UnkStruct_ov5_021E1FF4 * param0)
 
 void ov5_021E1F04 (UnkStruct_ov5_021E1FF4 * param0)
 {
-    param0->unk_10 = AllocFromHeap(param0->unk_04, sizeof(UnkStruct_0205AA50));
+    param0->unk_10 = Heap_AllocFromHeap(param0->unk_04, sizeof(UnkStruct_0205AA50));
 
     sub_0201A7E8(param0->unk_0C, param0->unk_10, param0->unk_08, 1, 1, param0->unk_2C, param0->unk_30, 13, 393);
     sub_0200DAA4(param0->unk_0C, param0->unk_08, 985, 11, 0, param0->unk_04);
@@ -186,14 +186,14 @@ void ov5_021E1F7C (UnkStruct_ov5_021E1FF4 * param0)
 {
     sub_0200DC9C(param0->unk_10, 0);
     sub_0201A8FC(param0->unk_10);
-    FreeToHeap(param0->unk_10);
+    Heap_FreeToHeap(param0->unk_10);
 }
 
 UnkStruct_ov5_021E1FF4 * ov5_021E1F98 (UnkStruct_0203CDB0 * param0, int param1, u8 param2)
 {
     UnkStruct_ov5_021E1FF4 * v0;
 
-    v0 = AllocFromHeap(param1, sizeof(UnkStruct_ov5_021E1FF4));
+    v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov5_021E1FF4));
 
     v0->unk_00 = param0;
     v0->unk_04 = param1;
@@ -215,7 +215,7 @@ void ov5_021E1FF4 (UnkStruct_ov5_021E1FF4 * param0)
 {
     sub_0200B190(param0->unk_18);
     sub_0200B3F0(param0->unk_14);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 BOOL ov5_021E200C (UnkStruct_0203CDB0 * param0)

src/overlay005/ov5_021E22B0.c

@@ -18,13 +18,13 @@ UnkStruct_ov5_021E2310 * ov5_021E22B0 (int param0, int param1)
 {
     UnkStruct_ov5_021E2310 * v0;
 
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG3, 0);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 0);
 
     GX_ResetBankForBG();
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E2310));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E2310));
     MI_CpuClear32(v0, sizeof(UnkStruct_ov5_021E2310));
 
     {
@@ -55,6 +55,6 @@ void ov5_021E2310 (UnkStruct_ov5_021E2310 ** param0)
 {
     ov5_021E20E8(&(*param0)->unk_00, GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D);
     GX_SetBankForBG(GX_VRAM_BG_128_C);
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3, 1);
-    FreeToHeapExplicit(4, *param0);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3, 1);
+    Heap_FreeToHeapExplicit(4, *param0);
 }

src/overlay005/ov5_021E2338.c

@@ -106,7 +106,7 @@ void ov5_021E2338 (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E2338));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E2338));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E2338));
         v1 = v0->unk_0C;
         v1->unk_1C = ov5_021DDF38();
@@ -175,7 +175,7 @@ void ov5_021E24A8 (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E24A8));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E24A8));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E24A8));
         v1 = v0->unk_0C;
         v1->unk_1C = ov5_021DDF38();
@@ -242,7 +242,7 @@ void ov5_021E261C (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E261C));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E261C));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E261C));
         v1 = v0->unk_0C;
         ov5_021E28B0(&v1->unk_00, 4);
@@ -300,7 +300,7 @@ void ov5_021E2748 (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E2748));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E2748));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E2748));
         v1 = v0->unk_0C;
         ov5_021E28B0(&v1->unk_00, 4);
@@ -415,7 +415,7 @@ void ov5_021E2944 (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E2944));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E2944));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E2944));
         v1 = v0->unk_0C;
         v0->unk_00++;
@@ -468,7 +468,7 @@ void ov5_021E2A4C (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E2A4C));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E2A4C));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E2A4C));
         v1 = v0->unk_0C;
         v0->unk_00++;
@@ -607,7 +607,7 @@ void ov5_021E2B54 (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E2B54));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E2B54));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E2B54));
         v1 = v0->unk_0C;
 
@@ -627,7 +627,7 @@ void ov5_021E2B54 (UnkStruct_0201CD38 * param0, void * param1)
             sub_02021F58(v1->unk_21C[v4], v4 * 2);
         }
 
-        GX_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v0->unk_00++;
         break;
@@ -767,7 +767,7 @@ void ov5_021E2EB0 (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E2EB0));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E2EB0));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E2EB0));
         v1 = v0->unk_0C;
 
@@ -790,7 +790,7 @@ void ov5_021E2EB0 (UnkStruct_0201CD38 * param0, void * param1)
                 sub_02021CF8(v1->unk_200[v4], 2);
             }
         }
-        GX_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v0->unk_00++;
         break;
@@ -914,7 +914,7 @@ void ov5_021E31A4 (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E31A4));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E31A4));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E31A4));
         v1 = v0->unk_0C;
 
@@ -935,7 +935,7 @@ void ov5_021E31A4 (UnkStruct_0201CD38 * param0, void * param1)
             sub_02021F58(v1->unk_224[v5], v5);
         }
 
-        GX_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v0->unk_00++;
         break;
@@ -1085,7 +1085,7 @@ void ov5_021E3560 (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E3560));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E3560));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E3560));
         v1 = v0->unk_0C;
 
@@ -1108,7 +1108,7 @@ void ov5_021E3560 (UnkStruct_0201CD38 * param0, void * param1)
             v1->unk_258[v3] = ov5_021DE6A4(4);
         }
 
-        GX_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v1->unk_270 = sub_0201A778(4, 1);
         sub_0201A7E8(v0->unk_10->unk_08, v1->unk_270, 3, 0, 0, 32, 32, 0, 0);
@@ -1297,7 +1297,7 @@ void ov5_021E3AD0 (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E3AD0));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E3AD0));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E3AD0));
         v1 = v0->unk_0C;
 
@@ -1311,7 +1311,7 @@ void ov5_021E3AD0 (UnkStruct_0201CD38 * param0, void * param1)
         v1->unk_230 = ov5_021DE62C(
             &v1->unk_5C, &v1->unk_1FC, (128 * FX32_ONE), (-32 * FX32_ONE), 0, 0);
         sub_02021CAC(v1->unk_230, 0);
-        GX_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v0->unk_00++;
         break;
@@ -1423,7 +1423,7 @@ void ov5_021E3D8C (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E3D8C));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E3D8C));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E3D8C));
         v1 = v0->unk_0C;
 
@@ -1440,7 +1440,7 @@ void ov5_021E3D8C (UnkStruct_0201CD38 * param0, void * param1)
             sub_02021CAC(v1->unk_1D4[v4], 0);
         }
 
-        GX_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v1->unk_264 = sub_0201A778(4, 1);
         sub_0201A7E8(v0->unk_10->unk_08, v1->unk_264, 3, 0, 0, 32, 32, 0, 0);
@@ -1649,7 +1649,7 @@ void ov5_021E4260 (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E4260));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E4260));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E4260));
         v1 = v0->unk_0C;
 
@@ -1662,7 +1662,7 @@ void ov5_021E4260 (UnkStruct_0201CD38 * param0, void * param1)
             &v1->unk_2C, &v1->unk_1CC, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0);
         sub_02021CAC(v1->unk_200, 0);
         sub_02021FE0(v1->unk_200, GX_OAM_MODE_XLU);
-        GX_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v0->unk_00++;
         break;
@@ -1764,7 +1764,7 @@ void ov5_021E44C0 (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E44C0));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E44C0));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E44C0));
         v1 = v0->unk_0C;
 
@@ -1779,7 +1779,7 @@ void ov5_021E44C0 (UnkStruct_0201CD38 * param0, void * param1)
             sub_02021CAC(v1->unk_1D4[v3], 0);
         }
 
-        GX_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v0->unk_00++;
         break;
@@ -1925,7 +1925,7 @@ void ov5_021E4738 (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E4738));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E4738));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E4738));
         v1 = v0->unk_0C;
 
@@ -1940,7 +1940,7 @@ void ov5_021E4738 (UnkStruct_0201CD38 * param0, void * param1)
             sub_02021CAC(v1->unk_1D4[v3], 0);
         }
 
-        GX_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v0->unk_00++;
         break;
@@ -2071,7 +2071,7 @@ void ov5_021E4B3C (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E4B3C));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E4B3C));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E4B3C));
         v1 = v0->unk_0C;
 
@@ -2085,7 +2085,7 @@ void ov5_021E4B3C (UnkStruct_0201CD38 * param0, void * param1)
         sub_02021CAC(v1->unk_1DC, 0);
         sub_02021FE0(v1->unk_1DC, GX_OAM_MODE_XLU);
         sub_02021E80(v1->unk_1DC, 1);
-        GX_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v1->unk_04 = ov5_021DEBEC(4);
 
@@ -2269,12 +2269,12 @@ void ov5_021E4E14 (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E4E14));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E4E14));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E4E14));
 
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG3, 0);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 0);
 
         v0->unk_00++;
         break;
@@ -2355,12 +2355,12 @@ void ov5_021E4F7C (UnkStruct_0201CD38 * param0, void * param1)
 
     switch (v0->unk_00) {
     case 0:
-        v0->unk_0C = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E4F7C));
+        v0->unk_0C = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E4F7C));
         memset(v0->unk_0C, 0, sizeof(UnkStruct_ov5_021E4F7C));
 
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG3, 0);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 0);
 
         v0->unk_00++;
         break;
@@ -2652,13 +2652,13 @@ static BOOL ov5_021E52A8 (UnkStruct_ov5_021DDC28 * param0, u32 param1, const Unk
 
     switch (param0->unk_00) {
     case 0:
-        param0->unk_0C = AllocFromHeap(param1, sizeof(UnkStruct_ov5_021E52A8));
+        param0->unk_0C = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov5_021E52A8));
         memset(param0->unk_0C, 0, sizeof(UnkStruct_ov5_021E52A8));
         v0 = param0->unk_0C;
 
         sub_02007130(param0->unk_20, 11, 0, 2 * 0x20, 0x20, param1);
 
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
         sub_0201A7E8(param0->unk_10->unk_08, &v0->unk_2E0, 2, 0, 10, 16, 2, 2, 1);
         sub_0201ADA4(&v0->unk_2E0, 0);
         v7 = ov5_021E5240(param2->unk_04, param1);
@@ -2706,7 +2706,7 @@ static BOOL ov5_021E52A8 (UnkStruct_ov5_021DDC28 * param0, u32 param1, const Unk
 
         ov5_021DED20(param0, v0->unk_40, 6, 8, 16, (GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ), (GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_OBJ));
 
-        GX_EngineAToggleLayers(GX_PLANEMASK_BG3, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1);
 
         param0->unk_00++;
         break;
@@ -2731,7 +2731,7 @@ static BOOL ov5_021E52A8 (UnkStruct_ov5_021DDC28 * param0, u32 param1, const Unk
             break;
         }
 
-        GX_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v1 = ov5_021E51B4(&v0->unk_250);
 
@@ -2789,7 +2789,7 @@ static BOOL ov5_021E52A8 (UnkStruct_ov5_021DDC28 * param0, u32 param1, const Unk
             sub_0200AB4C(-14, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BD, 1);
 
             sub_0201C63C(param0->unk_10->unk_08, 2, 0, -((v0->unk_00.unk_00 >> FX32_SHIFT) + -92));
-            GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+            GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
             sub_02019060(2, 0);
             param0->unk_00++;
         }
@@ -2988,7 +2988,7 @@ static BOOL ov5_021E5890 (UnkStruct_ov5_021DDC28 * param0, u32 param1, const Unk
 
     switch (param0->unk_00) {
     case 0:
-        param0->unk_0C = AllocFromHeap(param1, sizeof(UnkStruct_ov5_021E5890));
+        param0->unk_0C = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov5_021E5890));
         memset(param0->unk_0C, 0, sizeof(UnkStruct_ov5_021E5890));
         v0 = param0->unk_0C;
 
@@ -3046,7 +3046,7 @@ static BOOL ov5_021E5890 (UnkStruct_ov5_021DDC28 * param0, u32 param1, const Unk
 
         ov5_021DE5D0(v0->unk_2CC[1], param1, param2->unk_04, 14, (GX_RGB(0, 0, 0)));
 
-        GX_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
+        GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         ov5_021E5128(&v0->unk_2F4, &v0->unk_5C, &v0->unk_1FC[3], (FX32_CONST(128)), (FX32_CONST(96)), param1);
 
@@ -3111,7 +3111,7 @@ static BOOL ov5_021E5890 (UnkStruct_ov5_021DDC28 * param0, u32 param1, const Unk
 
             sub_02007130(param0->unk_20, 11, 0, 2 * 0x20, 0x20, param1);
 
-            GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+            GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
             sub_0201A7E8(param0->unk_10->unk_08, &v0->unk_358, 2, 21, 13, 11, 2, 2, 1);
             sub_0201ADA4(&v0->unk_358, 0);
             v9 = ov5_021E5240(param2->unk_06, param1);
@@ -3130,10 +3130,10 @@ static BOOL ov5_021E5890 (UnkStruct_ov5_021DDC28 * param0, u32 param1, const Unk
 
             if (param0->unk_04 == 0) {
                 ov5_021DF17C(3);
-                GX_EngineAToggleLayers(
+                GXLayers_EngineAToggleLayers(
                     GX_PLANEMASK_BG0, 1);
 
-                GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+                GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
             }
         } else {
             ov5_021E51B4(&v0->unk_2F4);
@@ -3279,7 +3279,7 @@ static BOOL ov5_021E5890 (UnkStruct_ov5_021DDC28 * param0, u32 param1, const Unk
         if (v1) {
             param0->unk_00++;
 
-            GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+            GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
 
             ov5_021DDE14(&v0->unk_00, 0, (FX32_CONST(192.0f)), (FX32_CONST(24.0f)), 16);
             ov5_021DDE14(&v0->unk_18, 0, (FX32_CONST(192.0f)), (FX32_CONST(24.0f)), 16);

src/overlay005/ov5_021E622C.c

@@ -2016,7 +2016,7 @@ int ov5_021E6270 (UnkStruct_02026310 * param0)
 static int ov5_021E62B0 (UnkStruct_02073C74_sub1 * param0)
 {
     int v0 = sub_02074570(param0, 6, NULL);
-    return IsItemMail(v0);
+    return Item_IsMail(v0);
 }
 
 static void ov5_021E62C4 (Party * param0, int param1, UnkStruct_02026218 * param2, UnkStruct_021C0794 * param3)
@@ -2124,7 +2124,7 @@ static int ov5_021E6444 (Party * param0, UnkStruct_02026218 * param1, UnkStruct_
     Party_AddPokemon(param0, v0);
     sub_02073C54(v1);
     sub_02026258(param1, 0);
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
 
     return v4;
 }
@@ -2154,7 +2154,7 @@ int ov5_021E6520 (UnkStruct_02073C74_sub1 * param0, u32 param1)
 
     sub_02074C60(v1, 8, (u8 *)&v3);
     v2 = sub_02075B40(v1);
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
 
     return v2;
 }
@@ -2406,7 +2406,7 @@ static u8 ov5_021E68D8 (UnkStruct_02073C74 * param0, u16 * param1)
 static void ov5_021E6948 (UnkStruct_02073C74 * param0, UnkStruct_02073C74_sub1 * param1, UnkStruct_02073C74_sub1 * param2)
 {
     u16 v0, v1, v2, v3, v4, v5, v6;
-    UnkStruct_ov5_021E6948 * v7 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E6948));
+    UnkStruct_ov5_021E6948 * v7 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E6948));
 
     v2 = 0;
 
@@ -2481,7 +2481,7 @@ static void ov5_021E6948 (UnkStruct_02073C74 * param0, UnkStruct_02073C74_sub1 *
         }
     }
 
-    FreeToHeap(v7);
+    Heap_FreeToHeap(v7);
 }
 
 void ov5_021E6B40 (UnkStruct_02026310 * param0)
@@ -2712,7 +2712,7 @@ void ov5_021E6EA8 (UnkStruct_02026310 * param0, Party * param1, UnkStruct_02025E
 
     Party_AddPokemon(param1, v3);
     ov5_021E6B40(param0);
-    FreeToHeap(v3);
+    Heap_FreeToHeap(v3);
 }
 
 static int ov5_021E6F6C (Party * param0)
@@ -3125,7 +3125,7 @@ static void ov5_021E742C (UnkStruct_02073C74 * param0, int param1)
 
     sub_020775EC(v16, param0);
     sub_020237BC(v15);
-    FreeToHeap(v16);
+    Heap_FreeToHeap(v16);
 }
 
 void ov5_021E771C (UnkStruct_02073C74 * param0, int param1)

src/overlay005/ov5_021E779C.c

@@ -14,7 +14,7 @@
 #include "overlay005/struct_ov5_021D5894.h"
 #include "overlay005/funcptr_ov5_021E9630.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "unk_0200D9E8.h"
 #include "unk_02017728.h"
 #include "heap.h"
@@ -354,7 +354,7 @@ static void ov5_021E79A8 (UnkStruct_ov5_021E8F60 * param0)
     for (v0 = 0; v0 < 4; v0++) {
         UnkStruct_ov5_021E79A8 * v1 = NULL;
 
-        v1 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E79A8));
+        v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E79A8));
         param0->unk_84[v0] = v1;
         param0->unk_84[v0]->unk_864 = 0;
 
@@ -379,7 +379,7 @@ void ov5_021E7A54 (UnkStruct_ov5_021E8F60 * param0)
     for (v0 = 0; v0 < 4; v0++) {
         UnkStruct_ov5_021E79A8 * v1 = NULL;
 
-        v1 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E79A8));
+        v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E79A8));
 
         param0->unk_84[v0] = v1;
         param0->unk_84[v0]->unk_864 = 0;
@@ -401,7 +401,7 @@ static void ov5_021E7AC4 (UnkStruct_ov5_021E8F60 * param0)
     for (v0 = 0; v0 < 4; v0++) {
         UnkStruct_ov5_021E79A8 * v1 = NULL;
 
-        v1 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E79A8));
+        v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E79A8));
 
         param0->unk_84[v0] = v1;
         param0->unk_84[v0]->unk_864 = 0;
@@ -441,11 +441,11 @@ static void ov5_021E7BAC (NARC * param0, const int param1, UnkStruct_ov5_021E7BA
     int v2 = sizeof(int) * 4;
 
     if (param0 != NULL) {
-        v0 = AllocFromHeapAtEnd(4, v2);
+        v0 = Heap_AllocFromHeapAtEnd(4, v2);
         NARC_ReadFromMember(param0, param1, 0, v2, v0);
     } else {
         GF_ASSERT(FALSE);
-        v0 = AllocAtEndAndReadFromNarcMemberByIndexPair(67, param1, 4, 0, v2);
+        v0 = NARC_AllocAtEndAndReadFromMemberByIndexPair(67, param1, 4, 0, v2);
     }
 
     v1 = &((int *)(v0))[0];
@@ -461,7 +461,7 @@ static void ov5_021E7BAC (NARC * param0, const int param1, UnkStruct_ov5_021E7BA
 
     param2->unk_08 = *v1;
 
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
 }
 
 static void ov5_021E7C00 (const u8 param0, UnkStruct_ov5_021EF76C * const param1, const UnkStruct_02039E30 * param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 * param5, UnkStruct_ov5_021E7814 * param6)
@@ -1540,7 +1540,7 @@ UnkStruct_ov5_021E8F60 * ov5_021E9084 (UnkStruct_02039E30 * param0, UnkStruct_ov
     UnkStruct_ov5_021E8F60 * v0;
     BOOL v1;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E8F60));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E8F60));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov5_021E8F60));
 
     if (param3 == 0) {
@@ -1637,7 +1637,7 @@ void ov5_021E924C (UnkStruct_ov5_021E8F60 * param0)
             ov5_021E1608(param0->unk_84[v0]->unk_868);
         }
 
-        FreeToHeap(param0->unk_84[v0]);
+        Heap_FreeToHeap(param0->unk_84[v0]);
         param0->unk_84[v0] = NULL;
     }
 
@@ -1650,7 +1650,7 @@ void ov5_021E92E4 (UnkStruct_ov5_021E8F60 * param0)
 {
     NARC_dtor(param0->unk_EC);
     ov5_021EEB48(param0->unk_00);
-    FreeToHeap((void *)param0);
+    Heap_FreeToHeap((void *)param0);
 }
 
 BOOL ov5_021E9300 (const UnkStruct_ov5_021E8F60 * param0)
@@ -1921,7 +1921,7 @@ static void ov5_021E964C (UnkStruct_0201CD38 * param0, void * param1)
         break;
     case 5:
         *v1->unk_20 = 0;
-        FreeToHeap((void *)(param1));
+        Heap_FreeToHeap((void *)(param1));
         sub_0200DA58(param0);
         return;
     }
@@ -1932,7 +1932,7 @@ UnkStruct_0201CD38 * ov5_021E976C (NARC * param0, const int param1, NNSG3dRender
     UnkStruct_0201CD38 * v0;
     UnkStruct_ov5_021E9640 * v1;
 
-    v1 = (UnkStruct_ov5_021E9640 *)AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021E9640));
+    v1 = (UnkStruct_ov5_021E9640 *)Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021E9640));
 
     v1->unk_00 = param0;
     v1->unk_04 = param1;
@@ -1990,7 +1990,7 @@ UnkStruct_ov5_021E8F60 * ov5_021E9830 (UnkStruct_02039E30 * param0, UnkStruct_ov
     UnkStruct_ov5_021E8F60 * v0;
     BOOL v1;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021E8F60));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E8F60));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov5_021E8F60));
 
     v0->unk_00 = ov5_021EEBC0(0);
@@ -2049,7 +2049,7 @@ void ov5_021E9938 (UnkStruct_ov5_021E8F60 * param0)
             ov5_021E1608(param0->unk_84[v0]->unk_868);
         }
 
-        FreeToHeap(param0->unk_84[v0]);
+        Heap_FreeToHeap(param0->unk_84[v0]);
         param0->unk_84[v0] = NULL;
     }
 
@@ -2073,7 +2073,7 @@ void ov5_021E9998 (UnkStruct_ov5_021E8F60 * param0)
 void ov5_021E99C4 (UnkStruct_ov5_021E8F60 * param0)
 {
     ov5_021EEB48(param0->unk_00);
-    FreeToHeap((void *)param0);
+    Heap_FreeToHeap((void *)param0);
 }
 
 void ov5_021E99D8 (UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2)

src/overlay005/ov5_021EA714.c

@@ -7,7 +7,7 @@
 #include "struct_defs/struct_0203CDB0.h"
 #include "struct_defs/struct_0203CDB0_sub2_t.h"
 
-#include "poke_overlay.h"
+#include "game_overlay.h"
 #include "unk_0200A784.h"
 #include "unk_020507CC.h"
 #include "unk_02056720.h"
@@ -34,10 +34,10 @@ void ov5_021EA728 (UnkStruct_0203CDB0 * param0)
 
     if (sub_020567E0(v0)
         && (sub_0206AE2C(v1) == 0)) {
-        HandleLoadOverlay(FS_OVERLAY_ID(overlay25), 2);
+        Overlay_LoadByID(FS_OVERLAY_ID(overlay25), 2);
         ov25_02253CE8(param0, &param0->unk_04->unk_14, param0->unk_0C, param0->unk_08, sub_0200A914(1));
     } else {
-        HandleLoadOverlay(FS_OVERLAY_ID(overlay24), 2);
+        Overlay_LoadByID(FS_OVERLAY_ID(overlay24), 2);
         ov24_02253CE0(param0->unk_08);
     }
 }
@@ -64,12 +64,12 @@ u8 ov5_021EA7CC (UnkStruct_0203CDB0 * param0)
         && (sub_0206AE2C(v1) == 0)) {
         if (ov25_02253D70(param0->unk_04->unk_14)) {
             param0->unk_04->unk_14 = NULL;
-            UnloadOverlayByID(FS_OVERLAY_ID(overlay25));
+            Overlay_UnloadByID(FS_OVERLAY_ID(overlay25));
             return 1;
         }
     } else {
         if (ov24_02253DB4(param0->unk_08)) {
-            UnloadOverlayByID(FS_OVERLAY_ID(overlay24));
+            Overlay_UnloadByID(FS_OVERLAY_ID(overlay24));
             return 1;
         }
     }
@@ -79,7 +79,7 @@ u8 ov5_021EA7CC (UnkStruct_0203CDB0 * param0)
 
 void ov5_021EA830 (UnkStruct_0203CDB0 * param0)
 {
-    HandleLoadOverlay(FS_OVERLAY_ID(overlay24), 2);
+    Overlay_LoadByID(FS_OVERLAY_ID(overlay24), 2);
     ov24_02253CE0(param0->unk_08);
 }
 
@@ -91,7 +91,7 @@ void ov5_021EA848 (UnkStruct_0203CDB0 * param0)
 BOOL ov5_021EA854 (UnkStruct_0203CDB0 * param0)
 {
     if (ov24_02253DB4(param0->unk_08)) {
-        UnloadOverlayByID(FS_OVERLAY_ID(overlay24));
+        Overlay_UnloadByID(FS_OVERLAY_ID(overlay24));
         return 1;
     }
 

src/overlay005/ov5_021EA874.c

@@ -330,7 +330,7 @@ static BOOL ov5_021EAC44 (UnkStruct_ov5_021EAE78 * param0)
 
             sub_02025EC0(v3, sub_0202AEF0(v2, v1));
             sub_0200B498(param0->unk_38, 0, v3);
-            FreeToHeap(v3);
+            Heap_FreeToHeap(v3);
         }
 
         ov5_021EAE78(param0, 60);
@@ -429,7 +429,7 @@ static BOOL ov5_021EADB4 (UnkStruct_020508D4 * param0)
         break;
     case 12:
         ov5_021EAF1C(v0);
-        FreeToHeap(v0);
+        Heap_FreeToHeap(v0);
         sub_0203D140();
         return 1;
     }
@@ -478,7 +478,7 @@ void ov5_021EAF50 (UnkStruct_0203CDB0 * param0)
     UnkStruct_ov5_021EAE78 * v0;
     UnkStruct_020508D4 * v1 = param0->unk_10;
 
-    v0 = AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov5_021EAE78));
+    v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov5_021EAE78));
     ov5_021EAEE0(v0);
 
     v0->unk_30 = param0;

src/overlay005/ov5_021EAFA4.c

@@ -84,7 +84,7 @@ UnkStruct_ov5_021EB0E0 * ov5_021EB0C8 (UnkStruct_020203AC * const param0)
 {
     UnkStruct_ov5_021EB0E0 * v0;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021EB0E0));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021EB0E0));
     ov5_021EB0E0(v0, param0);
 
     return v0;
@@ -130,6 +130,6 @@ void ov5_021EB184 (UnkStruct_ov5_021EB0E0 ** param0)
 
     GF_ASSERT((*param0) != NULL);
 
-    FreeToHeap((*param0));
+    Heap_FreeToHeap((*param0));
     (*param0) = NULL;
 }

src/overlay005/ov5_021ECC20.c

@@ -10,7 +10,7 @@
 #include "overlay005/struct_ov5_021ECD10.h"
 #include "overlay005/struct_ov5_021ED0A4.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "heap.h"
 #include "unk_02061804.h"
 #include "overlay005/ov5_021ECC20.h"
@@ -125,9 +125,9 @@ void * ov5_021ECD68 (const UnkStruct_02061830 * param0, u32 param1, int param2)
     u32 v2 = NARC_GetMemberSize(v1, param1);
 
     if (param2 == 1) {
-        v0 = AllocFromHeap(4, v2);
+        v0 = Heap_AllocFromHeap(4, v2);
     } else {
-        v0 = AllocFromHeapAtEnd(4, v2);
+        v0 = Heap_AllocFromHeapAtEnd(4, v2);
     }
 
     NARC_ReadWholeMember(v1, param1, v0);

src/overlay005/ov5_021ECE40.c

@@ -344,13 +344,13 @@ static void ov5_021ED0A4 (UnkStruct_ov5_021ED0A4 * param0, int param1)
     UnkStruct_ov5_021ED110 * v3;
 
     v0 = sizeof(UnkStruct_ov5_021DF84C) * param1;
-    v2 = AllocFromHeap(4, v0);
+    v2 = Heap_AllocFromHeap(4, v0);
 
     param0->unk_E4 = v2;
     GF_ASSERT(v2 != NULL);
 
     v0 = (sizeof(UnkStruct_ov5_021ED110)) * param1;
-    v3 = AllocFromHeap(4, v0);
+    v3 = Heap_AllocFromHeap(4, v0);
 
     param0->unk_F4 = v3;
     GF_ASSERT(v3 != NULL);
@@ -370,8 +370,8 @@ static void ov5_021ED0F0 (UnkStruct_ov5_021ED0A4 * param0)
 {
     ov5_021ED1A4(param0);
 
-    FreeToHeapExplicit(4, param0->unk_E4);
-    FreeToHeapExplicit(4, param0->unk_F4);
+    Heap_FreeToHeapExplicit(4, param0->unk_E4);
+    Heap_FreeToHeapExplicit(4, param0->unk_F4);
 }
 
 static UnkStruct_ov5_021DF84C * ov5_021ED110 (UnkStruct_ov5_021ED0A4 * param0, u32 param1)
@@ -1884,7 +1884,7 @@ static void ov5_021EE320 (UnkStruct_ov5_021ED0A4 * param0, int param1, int param
     v3 = (sizeof(UnkStruct_ov5_021EDFBC)) * param1;
     v2 = (sizeof(UnkStruct_ov5_021EE134)) * param1;
     v1 = (sizeof(UnkStruct_ov5_021EDF3C)) + v2 + v3 + v4;
-    v5 = AllocFromHeap(4, v1);
+    v5 = Heap_AllocFromHeap(4, v1);
 
     GF_ASSERT(v5 != NULL);
     memset(v5, 0, v1);
@@ -1920,7 +1920,7 @@ static void ov5_021EE3C4 (UnkStruct_ov5_021ED0A4 * param0)
     sub_0200DA58(v0->unk_1C);
     sub_0200DA58(v0->unk_20);
     sub_0200DA58(v0->unk_24);
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
 
     param0->unk_100 = NULL;
 }
@@ -1950,7 +1950,7 @@ static UnkStruct_020216E0 * ov5_021EE454 (UnkStruct_02061AB4 * param0, int param
     UnkStruct_ov5_021ED0A4 * v8 = ov5_021EDEA8(param0);
     UnkStruct_02020C44 * v9 = ov5_021EDC8C(v8);
     UnkStruct_020216E0 * v10 = ov5_021EB1A0(param0);
-    UnkStruct_ov5_021EE698 * v11 = AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021EE698));
+    UnkStruct_ov5_021EE698 * v11 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021EE698));
 
     memset(v11, 0, sizeof(UnkStruct_ov5_021EE698));
 
@@ -2090,10 +2090,10 @@ static void ov5_021EE698 (UnkStruct_0201CD38 * param0, void * param1)
             }
 
             sub_020211FC(v0->unk_24);
-            FreeToHeap(v0->unk_08);
-            FreeToHeap(v0->unk_0C);
-            FreeToHeap(v0->unk_10);
-            FreeToHeap(v0);
+            Heap_FreeToHeap(v0->unk_08);
+            Heap_FreeToHeap(v0->unk_0C);
+            Heap_FreeToHeap(v0->unk_10);
+            Heap_FreeToHeap(v0);
             sub_0200DA58(param0);
             return;
         }
@@ -2114,10 +2114,10 @@ static void ov5_021EE698 (UnkStruct_0201CD38 * param0, void * param1)
             }
 
             sub_020211FC(v0->unk_24);
-            FreeToHeap(v0->unk_08);
-            FreeToHeap(v0->unk_0C);
-            FreeToHeap(v0->unk_10);
-            FreeToHeap(v0);
+            Heap_FreeToHeap(v0->unk_08);
+            Heap_FreeToHeap(v0->unk_0C);
+            Heap_FreeToHeap(v0->unk_10);
+            Heap_FreeToHeap(v0);
             sub_0200DA58(param0);
         }
     }

src/overlay005/ov5_021EE7D4.c

@@ -108,7 +108,7 @@ u8 ov5_021EE920 (UnkStruct_0203CDB0 * param0, u16 param1)
     u32 v4;
     u32 v5;
 
-    v0 = Party_GetPokemonBySlotIndex(GetPartyFromSavedata(param0->unk_0C), param1);
+    v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_0C), param1);
     v3 = sub_02074470(v0, 5, NULL);
     v1 = ov5_021EE7D4(v0);
     v4 = ov5_021EE8A8(v3, v1);
@@ -137,7 +137,7 @@ void ov5_021EE9BC (UnkStruct_0203CDB0 * param0, u16 param1)
     UnkStruct_02073C74 * v0;
     vu16 v1;
 
-    v0 = Party_GetPokemonBySlotIndex(GetPartyFromSavedata(param0->unk_0C), param1);
+    v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_0C), param1);
     v1 = ov5_021EE7D4(v0);
 
     sub_0206B0C4(sub_020507E4(param0->unk_0C), v1);
@@ -173,7 +173,7 @@ void ov5_021EEA84 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 param3
     u16 v1;
     vu16 v2;
 
-    v0 = Party_GetPokemonBySlotIndex(GetPartyFromSavedata(param0->unk_0C), param3);
+    v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_0C), param3);
     v1 = sub_02074470(v0, 5, NULL);
     v2 = ov5_021EE7D4(v0);
 

src/overlay005/ov5_021EEAC8.c

@@ -21,7 +21,7 @@ UnkStruct_ov5_021EEB48 * ov5_021EEAC8 (const BOOL param0)
     int v1;
     UnkStruct_ov5_021EEB48 * v2;
 
-    v2 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021EEB48));
+    v2 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021EEB48));
     memset(v2, 0, sizeof(UnkStruct_ov5_021EEB48));
 
     v2->unk_00 = 1;
@@ -38,7 +38,7 @@ UnkStruct_ov5_021EEB48 * ov5_021EEAC8 (const BOOL param0)
         }
 
         if (param0) {
-            v2->unk_14[v0] = AllocFromHeap(4, 0x9000);
+            v2->unk_14[v0] = Heap_AllocFromHeap(4, 0x9000);
 
             if (v2->unk_14[v0] == NULL) {
                 return NULL;
@@ -62,21 +62,21 @@ void ov5_021EEB48 (UnkStruct_ov5_021EEB48 * param0)
 
     for (v0 = 0; v0 < 4; v0++) {
         if (param0->unk_00 == 2) {
-            FreeToHeap((void *)param0->unk_04[v0]);
+            Heap_FreeToHeap((void *)param0->unk_04[v0]);
         }
 
         param0->unk_04[v0] = NULL;
 
         if (param0->unk_14[v0] != NULL) {
             if (param0->unk_02 == 2) {
-                FreeToHeap((void *)param0->unk_14[v0]);
+                Heap_FreeToHeap((void *)param0->unk_14[v0]);
             }
 
             param0->unk_14[v0] = NULL;
         }
     }
 
-    FreeToHeap((void *)param0);
+    Heap_FreeToHeap((void *)param0);
     param0 = NULL;
 }
 
@@ -101,7 +101,7 @@ UnkStruct_ov5_021EEB48 * ov5_021EEBC0 (const BOOL param0)
     u32 v0;
     UnkStruct_ov5_021EEB48 * v1;
 
-    v1 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021EEB48));
+    v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021EEB48));
     memset(v1, 0, sizeof(UnkStruct_ov5_021EEB48));
     v1->unk_00 = 2;
 
@@ -110,12 +110,12 @@ UnkStruct_ov5_021EEB48 * ov5_021EEBC0 (const BOOL param0)
     }
 
     for (v0 = 0; v0 < 4; v0++) {
-        v1->unk_04[v0] = AllocFromHeap(
+        v1->unk_04[v0] = Heap_AllocFromHeap(
             4, 0xf000);
         MI_CpuClear8(v1->unk_04[v0], 0xf000);
 
         if (param0 == 1) {
-            v1->unk_14[v0] = AllocFromHeap(
+            v1->unk_14[v0] = Heap_AllocFromHeap(
                 4, 0x9000);
             MI_CpuClear8(v1->unk_14[v0], 0x9000);
         }

src/overlay005/ov5_021EEF34.c

@@ -9,7 +9,7 @@
 #include "overlay005/struct_ov5_021EF13C.h"
 #include "overlay005/struct_ov5_021EF13C_sub1.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "unk_0200D9E8.h"
 #include "heap.h"
 #include "unk_0201CCF0.h"
@@ -161,7 +161,7 @@ static void ov5_021EF05C (UnkStruct_0201CD38 * param0, void * param1)
         break;
     case 2:
         *v1->unk_DC = 0;
-        FreeToHeap((void *)param1);
+        Heap_FreeToHeap((void *)param1);
         sub_0200DA58(param0);
         return;
     }
@@ -179,7 +179,7 @@ UnkStruct_ov5_021EF13C * ov5_021EF13C (void)
 {
     UnkStruct_ov5_021EF13C * v0;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021EF13C));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021EF13C));
 
     v0->unk_10 = NULL;
     v0->unk_14 = NULL;
@@ -199,7 +199,7 @@ void ov5_021EF158 (NARC * param0, const int param1, UnkStruct_ov5_021EF13C * par
         char v0[256];
         UnkStruct_ov5_021EEF98 * v1;
 
-        v1 = AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021EEF98));
+        v1 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021EEF98));
 
         ov5_021EEF34(param0, v1);
         param2->unk_1C = v1->unk_10;
@@ -240,7 +240,7 @@ void ov5_021EF158 (NARC * param0, const int param1, UnkStruct_ov5_021EF13C * par
             }
         }
 
-        FreeToHeap(v1);
+        Heap_FreeToHeap(v1);
         param2->unk_18 = 1;
     }
 }
@@ -251,7 +251,7 @@ void ov5_021EF1D0 (UnkStruct_ov5_021EF13C * param0)
         return;
     }
 
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
     param0 = NULL;
 }
 
@@ -274,7 +274,7 @@ UnkStruct_0201CD38 * ov5_021EF1F0 (NARC * param0, const int param1, UnkStruct_ov
     UnkStruct_0201CD38 * v0;
     UnkStruct_ov5_021EF05C * v1;
 
-    v1 = AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021EF05C));
+    v1 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021EF05C));
 
     if (v1 == NULL) {
         (void)0;

src/overlay005/ov5_021EF250.c

@@ -45,9 +45,9 @@ UnkStruct_ov5_021EF300 * ov5_021EF28C (const u8 param0, const u8 param1)
     u8 v0;
     UnkStruct_ov5_021EF300 * v1;
 
-    v1 = AllocFromHeap(param1, sizeof(UnkStruct_ov5_021EF300));
+    v1 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov5_021EF300));
 
-    v1->unk_04 = AllocFromHeap(param1, sizeof(UnkStruct_ov5_021EF250) * param0);
+    v1->unk_04 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov5_021EF250) * param0);
     v1->unk_00 = param0;
 
     for (v0 = 0; v0 < param0; v0++) {
@@ -69,8 +69,8 @@ void ov5_021EF2CC (const u8 param0, const int param1, const int param2, const in
 
 void ov5_021EF300 (UnkStruct_ov5_021EF300 * param0)
 {
-    FreeToHeap(param0->unk_04);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0->unk_04);
+    Heap_FreeToHeap(param0);
 }
 
 BOOL ov5_021EF314 (const int param0, const int param1, const UnkStruct_ov5_021EF300 * param2, u8 * param3)

src/overlay005/ov5_021EF3A8.c

@@ -31,7 +31,7 @@ UnkStruct_ov5_021EF3BC * ov5_021EF3A8 (u32 param0)
 {
     UnkStruct_ov5_021EF3BC * v0;
 
-    v0 = AllocFromHeap(param0, sizeof(UnkStruct_ov5_021EF3BC));
+    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021EF3BC));
     ov5_021EF444(v0);
 
     return v0;
@@ -48,7 +48,7 @@ void ov5_021EF3BC (UnkStruct_ov5_021EF3BC * param0)
     }
 
     ov5_021EF444(param0);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov5_021EF3DC (UnkStruct_ov5_021EF3BC * param0)

src/overlay005/ov5_021EF4BC.c

@@ -42,7 +42,7 @@ UnkStruct_ov5_021EF4F8 * ov5_021EF4BC (u32 param0, UnkStruct_ov5_021EF3BC * para
 {
     UnkStruct_ov5_021EF4F8 * v0;
 
-    v0 = AllocFromHeap(param0, sizeof(UnkStruct_ov5_021EF4F8));
+    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021EF4F8));
     memset(v0, 0, sizeof(UnkStruct_ov5_021EF4F8));
 
     v0->unk_00 = 0;
@@ -59,7 +59,7 @@ void ov5_021EF4F8 (UnkStruct_ov5_021EF4F8 * param0)
     }
 
     sub_02013B40(param0->unk_30C);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov5_021EF518 (UnkStruct_ov5_021EF4F8 * param0)

src/overlay005/ov5_021EF75C.c

@@ -5,7 +5,7 @@
 #include "overlay005/struct_ov5_021D3CAC_decl.h"
 #include "overlay005/struct_ov5_021D5778_decl.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "heap.h"
 #include "unk_0201C970.h"
 #include "overlay005/ov5_021D37AC.h"
@@ -69,16 +69,16 @@ static void ov5_021EF75C (void * param0, NNSG3dResTex * param1)
     v0 = (u8 *)param1 + param1->texInfo.ofsTex;
     v1 = (u32)(v0 - (u8 *)param0);
 
-    ReallocFromHeap(param0, v1);
+    Heap_ReallocFromHeap(param0, v1);
 }
 
 UnkStruct_ov5_021EF76C * ov5_021EF76C (const int param0, UnkStruct_ov5_021D3CAC * param1)
 {
     UnkStruct_ov5_021EF76C * v0;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021EF76C));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021EF76C));
 
-    v0->unk_C20 = AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021EF7A0));
+    v0->unk_C20 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021EF7A0));
     v0->unk_C20->unk_00 = param0;
     v0->unk_C20->unk_04 = param1;
     v0->unk_C20->unk_0C = 0;
@@ -91,16 +91,16 @@ void ov5_021EF7A0 (UnkStruct_ov5_021EF76C * param0)
     NARC * v0;
     UnkStruct_ov5_021EF7A0 * v1 = param0->unk_C20;
 
-    ReadWholeNarcMemberByIndexPair(&param0->unk_C18, 42, v1->unk_00);
+    NARC_ReadWholeMemberByIndexPair(&param0->unk_C18, 42, v1->unk_00);
 
-    param0->unk_C24 = AllocAndReadWholeNarcMemberByIndexPair(43, param0->unk_C18.unk_00, 4);
+    param0->unk_C24 = NARC_AllocAndReadWholeMemberByIndexPair(43, param0->unk_C18.unk_00, 4);
     v1->unk_08 = param0->unk_C24[0];
 
     GF_ASSERT(v1->unk_08 < 768);
 
     param0->unk_C0C = NULL;
-    param0->unk_C04 = AllocAndReadWholeNarcMemberByIndexPair(44, param0->unk_C18.unk_02, 4);
-    param0->unk_C08 = AllocAndReadWholeNarcMemberByIndexPair(71, param0->unk_C18.unk_00, 4);
+    param0->unk_C04 = NARC_AllocAndReadWholeMemberByIndexPair(44, param0->unk_C18.unk_02, 4);
+    param0->unk_C08 = NARC_AllocAndReadWholeMemberByIndexPair(71, param0->unk_C18.unk_00, 4);
     param0->unk_C0C = NNS_G3dGetTex((NNSG3dResFileHeader *)param0->unk_C04);
 
     if (v1->unk_08 != 0) {
@@ -205,7 +205,7 @@ void ov5_021EF7A0 (UnkStruct_ov5_021EF76C * param0)
         ov5_021D56D4(v12, param0->unk_C14);
     }
 
-    FreeToHeap(param0->unk_C20);
+    Heap_FreeToHeap(param0->unk_C20);
     param0->unk_C20 = NULL;
 }
 
@@ -232,18 +232,18 @@ void ov5_021EFA10 (UnkStruct_ov5_021EF76C ** param0)
 
     for (v0 = 0; v0 < 768; v0++) {
         if ((*param0)->unk_04[v0] != NULL) {
-            FreeToHeap((*param0)->unk_04[v0]);
+            Heap_FreeToHeap((*param0)->unk_04[v0]);
         }
     }
 
-    FreeToHeap((*param0)->unk_C24);
-    FreeToHeap((*param0)->unk_C04);
+    Heap_FreeToHeap((*param0)->unk_C24);
+    Heap_FreeToHeap((*param0)->unk_C04);
 
     (*param0)->unk_C04 = NULL;
-    FreeToHeap((*param0)->unk_C08);
+    Heap_FreeToHeap((*param0)->unk_C08);
 
     (*param0)->unk_C08 = NULL;
-    FreeToHeap((*param0));
+    Heap_FreeToHeap((*param0));
 
     (*param0) = NULL;
 }

src/overlay005/ov5_021EFB0C.c

@@ -12,7 +12,7 @@
 #include "struct_defs/struct_0203CDB0.h"
 #include "struct_defs/struct_02055130.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "heap.h"
 #include "unk_02025E08.h"
 #include "unk_02025E68.h"
@@ -86,7 +86,7 @@ UnkStruct_ov5_021EFB30 * ov5_021EFB0C (void)
     u8 v0;
     UnkStruct_ov5_021EFB30 * v1;
 
-    v1 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021EFB30));
+    v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021EFB30));
 
     for (v0 = 0; v0 < 21; v0++) {
         v1->unk_00[v0].unk_00 = 0;
@@ -98,7 +98,7 @@ UnkStruct_ov5_021EFB30 * ov5_021EFB0C (void)
 
 void ov5_021EFB30 (UnkStruct_ov5_021EFB30 ** param0)
 {
-    FreeToHeap(*param0);
+    Heap_FreeToHeap(*param0);
     *param0 = NULL;
 }
 
@@ -477,13 +477,13 @@ int ov5_021EFFE4 (UnkStruct_0203CDB0 * param0)
         v4 = sub_0202D84C(v0, v3);
 
         if ((GAME_VERSION == 10) || (GAME_VERSION == 12)) {
-            v1 = AllocAtEndAndReadWholeNarcMemberByIndexPair(106, Unk_ov5_021FF5A8[v4->unk_05], 4);
+            v1 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(106, Unk_ov5_021FF5A8[v4->unk_05], 4);
         } else {
-            v1 = AllocAtEndAndReadWholeNarcMemberByIndexPair(106, dummy[v4->unk_05], 4);
+            v1 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(106, dummy[v4->unk_05], 4);
         }
 
         v2 = v1[v4->unk_04];
-        FreeToHeap(v1);
+        Heap_FreeToHeap(v1);
 
         return v2;
     }

src/overlay005/ov5_021F007C.c

@@ -68,7 +68,7 @@ static void ov5_021F007C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     ov5_021F02B8(&v0->unk_28, 0, 8, 19);
 
     sub_02019060(2, 0);
-    GX_EngineAToggleLayers((GX_PLANEMASK_BG2), 1);
+    GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG2), 1);
     sub_02005748(1608);
 }
 
@@ -87,7 +87,7 @@ static void ov5_021F00BC (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
 static void ov5_021F00E4 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
 {
     UnkStruct_ov5_021F007C * v0 = param2;
-    FreeToHeap(v0->unk_00);
+    Heap_FreeToHeap(v0->unk_00);
 }
 
 static void ov5_021F00F0 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 * param1, void * param2)
@@ -121,7 +121,7 @@ static void ov5_021F013C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     G2_SetBlendAlpha((GX_PLANEMASK_BG2), GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD, 0, 16 - 0);
 
     sub_02019060(2, 0);
-    GX_EngineAToggleLayers((GX_PLANEMASK_BG2), 1);
+    GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG2), 1);
     sub_02005748(1608);
 }
 
@@ -253,11 +253,11 @@ static void ov5_021F0260 (UnkStruct_02018340 * param0)
 
     sub_0201972C(2, &v0, sizeof(short), (6 * 32) + 2);
 
-    v1 = AllocFromHeap(4, sizeof(u8) * 32);
+    v1 = Heap_AllocFromHeap(4, sizeof(u8) * 32);
     memset(v1, 0x11, sizeof(u8) * 32);
 
     sub_0201958C(param0, 2, v1, sizeof(u8) * 32, 1);
-    FreeToHeap(v1);
+    Heap_FreeToHeap(v1);
     sub_02019EE0(param0, 2, (6 << 12) | 1);
 }
 
@@ -302,14 +302,14 @@ static void ov5_021F0310 (UnkStruct_0203CDB0 * param0)
 {
     u16 v0 = 0x7fff;
 
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
 
     G2_SetBG2Priority(3);
 
     sub_0201972C(2, &v0, 2, ((6 * 32) + 4));
     sub_020196C0(param0->unk_08, 2, 2, 1, 2);
     sub_02019EE0(param0->unk_08, 2, ((6 << 12) | 2));
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
 
     ov5_021F02F4(param0);
 }
@@ -318,14 +318,14 @@ static void ov5_021F0374 (UnkStruct_0203CDB0 * param0)
 {
     u16 v0 = 0x7fff;
 
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG3, 0);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 0);
 
     G2_SetBG3Priority(3);
 
     sub_0201972C(3, &v0, 2, ((6 * 32) + 4));
     sub_020196C0(param0->unk_08, 3, 2, 1, 2);
     sub_02019EE0(param0->unk_08, 3, ((6 << 12) | 2));
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG3, 1);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1);
 
     ov5_021F02F4(param0);
 }
@@ -423,7 +423,7 @@ static void ov5_021F0468 (UnkStruct_ov5_021F0468 * param0)
         param0->unk_00 = NULL;
     }
 
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 u32 ov5_021F0484 (void)
@@ -462,7 +462,7 @@ BOOL ov5_021F0488 (UnkStruct_020508D4 * param0)
         v1->unk_0C = 2;
 
         sub_02019060(2, 0);
-        GX_EngineAToggleLayers((GX_PLANEMASK_BG2), 1);
+        GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG2), 1);
         break;
     case 2:
         if (v1->unk_08 == 0) {
@@ -520,7 +520,7 @@ BOOL ov5_021F0488 (UnkStruct_020508D4 * param0)
 
         if (v2 == 1) {
             if (v1->unk_08 == 0) {
-                GX_EngineAToggleLayers((GX_PLANEMASK_BG2), 0);
+                GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG2), 0);
                 G2_BlendNone();
                 sub_02019060(2, 3);
 

src/overlay005/ov5_021F067C.c

@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "heap.h"
 #include "overlay005/ov5_021F067C.h"
 
@@ -39,13 +39,13 @@ UnkStruct_ov5_021F06D8 * ov5_021F067C (u32 param0, u32 param1, u32 param2, u32 p
     v1 = param2 + v0 + (sizeof(UnkStruct_ov5_021F06D8));
 
     {
-        BOOL v3 = CreateHeap(param0, param1, v1);
+        BOOL v3 = Heap_Create(param0, param1, v1);
 
         GF_ASSERT(v3 == 1);
     }
 
     param2 = v1 - param2;
-    v2 = AllocFromHeap(param1, param2);
+    v2 = Heap_AllocFromHeap(param1, param2);
 
     GF_ASSERT(v2 != NULL);
     memset(v2, 0, param2);
@@ -78,8 +78,8 @@ void ov5_021F06D8 (UnkStruct_ov5_021F06D8 * param0)
     {
         u32 v2 = param0->unk_04;
 
-        FreeToHeap(param0);
-        DestroyHeap(v2);
+        Heap_FreeToHeap(param0);
+        Heap_Destroy(v2);
     }
 }
 
@@ -140,9 +140,9 @@ static void * ov5_021F07B4 (UnkStruct_ov5_021F06D8 * param0, u32 param1, int par
     void * v0;
 
     if (param2 == 0) {
-        v0 = AllocFromHeap(param0->unk_04, param1);
+        v0 = Heap_AllocFromHeap(param0->unk_04, param1);
     } else {
-        v0 = AllocFromHeapAtEnd(param0->unk_04, param1);
+        v0 = Heap_AllocFromHeapAtEnd(param0->unk_04, param1);
     }
 
     GF_ASSERT(v0 != NULL);
@@ -151,7 +151,7 @@ static void * ov5_021F07B4 (UnkStruct_ov5_021F06D8 * param0, u32 param1, int par
 
 static void ov5_021F07D4 (void * param0)
 {
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 static UnkStruct_ov5_021F0814 * ov5_021F07DC (UnkStruct_ov5_021F06D8 * param0, u32 param1)

src/overlay005/ov5_021F08CC.c

@@ -89,7 +89,7 @@ const int Unk_ov5_021FFA00[];
 
 void * ov5_021F08CC (UnkStruct_0203CDB0 * param0, u32 param1, int param2)
 {
-    UnkStruct_ov5_021F08CC * v0 = AllocFromHeapAtEnd(param1, sizeof(UnkStruct_ov5_021F08CC));
+    UnkStruct_ov5_021F08CC * v0 = Heap_AllocFromHeapAtEnd(param1, sizeof(UnkStruct_ov5_021F08CC));
 
     memset(v0, 0, sizeof(UnkStruct_ov5_021F08CC));
 
@@ -130,7 +130,7 @@ BOOL ov5_021F08F8 (UnkStruct_020508D4 * param0)
                 }
 
                 sub_02050E78(v0, param0, v1->unk_10);
-                FreeToHeap(v1);
+                Heap_FreeToHeap(v1);
 
                 return 0;
             }
@@ -140,7 +140,7 @@ BOOL ov5_021F08F8 (UnkStruct_020508D4 * param0)
             }
 
             sub_02062C78(v0->unk_38);
-            FreeToHeap(v1);
+            Heap_FreeToHeap(v1);
 
             return 1;
         }
@@ -180,7 +180,7 @@ void ov5_021F09F0 (UnkStruct_0201CD38 * param0)
 {
     UnkStruct_ov5_021F0D6C * v0 = sub_0201CED0(param0);
 
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
     sub_0200DA58(param0);
 }
 
@@ -479,7 +479,7 @@ static int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, UnkStruct_0205E8
 
 static void * ov5_021F0D1C (u32 param0)
 {
-    void * v0 = AllocFromHeapAtEnd(4, param0);
+    void * v0 = Heap_AllocFromHeapAtEnd(4, param0);
 
     GF_ASSERT(v0 != NULL);
     memset(v0, 0, param0);

src/overlay005/ov5_021F0EB0.c

@@ -39,7 +39,7 @@ static void(*const Unk_ov5_0220020C[4])(UnkStruct_ov5_021F0FB8 *);
 UnkStruct_0201CD38 * ov5_021F0EB0 (UnkStruct_0203CDB0 * param0, u32 param1)
 {
     UnkStruct_0201CD38 * v0;
-    UnkStruct_ov5_021F0FB8 * v1 = AllocFromHeapAtEnd(param1, (sizeof(UnkStruct_ov5_021F0FB8)));
+    UnkStruct_ov5_021F0FB8 * v1 = Heap_AllocFromHeapAtEnd(param1, (sizeof(UnkStruct_ov5_021F0FB8)));
 
     memset(v1, 0, (sizeof(UnkStruct_ov5_021F0FB8)));
 
@@ -64,7 +64,7 @@ void ov5_021F0EFC (UnkStruct_0201CD38 * param0)
 {
     UnkStruct_ov5_021F0FB8 * v0 = sub_0201CED0(param0);
 
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
     sub_0200DA58(param0);
 }
 

src/overlay005/ov5_021F101C.c

@@ -29,14 +29,14 @@ BOOL ov5_021F101C (UnkStruct_020508D4 * param0)
 
     switch (*v2) {
     case 0:
-        v1->unk_04 = AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov5_021F101C));
+        v1->unk_04 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov5_021F101C));
         (*v2)++;
         break;
     case 1:
     {
         int v4 = ov5_021F0484();
 
-        v3->unk_04 = AllocFromHeapAtEnd(11, v4);
+        v3->unk_04 = Heap_AllocFromHeapAtEnd(11, v4);
         memset(v3->unk_04, 0, v4);
     }
         (*v2)++;
@@ -59,8 +59,8 @@ BOOL ov5_021F101C (UnkStruct_020508D4 * param0)
         (*v2)++;
         break;
     case 5:
-        FreeToHeap(v1->unk_04);
-        FreeToHeap(v1);
+        Heap_FreeToHeap(v1->unk_04);
+        Heap_FreeToHeap(v1);
         return 1;
     }
 

src/overlay005/ov5_021F428C.c

@@ -92,11 +92,11 @@ void ov5_021F42A8 (void * param0)
     UnkStruct_ov5_021F431C * v0 = param0;
 
     if (v0->unk_1F8 != NULL) {
-        FreeToHeap(v0->unk_1F8);
+        Heap_FreeToHeap(v0->unk_1F8);
     }
 
     if (v0->unk_1FC != NULL) {
-        FreeToHeap(v0->unk_1FC);
+        Heap_FreeToHeap(v0->unk_1FC);
     }
 
     ov5_021F4370(v0);
@@ -288,7 +288,7 @@ static void ov5_021F45D0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
             sub_02073AA8(&v0->unk_74->unk_04[v1]);
         }
 
-        FreeToHeap(v0->unk_74);
+        Heap_FreeToHeap(v0->unk_74);
     }
 }
 

src/overlay005/ov5_021F47B0.c

@@ -154,7 +154,7 @@ static void ov5_021F48F0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     UnkStruct_021F487C * v0 = param1;
 
     sub_02073A90(v0->unk_88);
-    FreeToHeap(v0->unk_88);
+    Heap_FreeToHeap(v0->unk_88);
 }
 
 static void ov5_021F4908 (UnkStruct_ov101_021D5D90 * param0, void * param1)

src/overlay005/ov5_021F6454.c

@@ -167,11 +167,11 @@ BOOL ov5_021F6454 (UnkStruct_0203E724 * param0)
             }
         }
 
-        FreeToHeap(v3);
+        Heap_FreeToHeap(v3);
     }
 
     if (v1 != NULL) {
-        FreeToHeap(v1);
+        Heap_FreeToHeap(v1);
     }
 
     v7 = sub_0200B144(1, 26, 361, 32);
@@ -261,7 +261,7 @@ UnkStruct_ov5_021F6704 * ov5_021F6704 (UnkStruct_0203CDB0 * param0, u8 param1, u
     UnkStruct_ov5_021F6704 * v0;
     int v1;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021F6704));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021F6704));
 
     if (v0 == NULL) {
         return NULL;
@@ -438,7 +438,7 @@ static void ov5_021F6AD4 (UnkStruct_ov5_021F6704 * param0)
     }
 
     sub_0200DA58(param0->unk_04);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 
     return;
 }
@@ -463,7 +463,7 @@ BOOL ov5_021F6B3C (UnkStruct_0203E724 * param0)
     u16 * v6 = inline_0204FCAC(param0);
     u16 * v7 = inline_0204FCAC(param0);
 
-    v2 = Party_GetPokemonBySlotIndex(GetPartyFromSavedata(v3->unk_0C), v4);
+    v2 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v3->unk_0C), v4);
 
     v1[0] = sub_02074470(v2, 70, NULL);
     v1[1] = sub_02074470(v2, 71, NULL);
@@ -509,7 +509,7 @@ BOOL ov5_021F6C60 (UnkStruct_0203E724 * param0)
     UnkStruct_0203CDB0 * v10 = param0->unk_34;
     u16 * v11 = inline_0204FCAC(param0);
 
-    v1 = GetPartyFromSavedata(v10->unk_0C);
+    v1 = Party_GetFromSavedata(v10->unk_0C);
     v2 = Party_GetCurrentCount(v1);
     *v11 = 0;
 
@@ -576,7 +576,7 @@ BOOL ov5_021F6D80 (UnkStruct_0203E724 * param0)
     u16 v8 = inline_02049538(param0);
     u16 * v9 = inline_0204FCAC(param0);
 
-    v1 = GetPartyFromSavedata(v7->unk_0C);
+    v1 = Party_GetFromSavedata(v7->unk_0C);
     v0 = Party_GetPokemonBySlotIndex(v1, v8);
 
     *v9 = 0;
@@ -627,7 +627,7 @@ BOOL ov5_021F6E50 (UnkStruct_0203E724 * param0)
     u16 v2 = inline_02049538(param0);
     u16 v3 = inline_02049538(param0);
 
-    v0 = Party_GetPokemonBySlotIndex(GetPartyFromSavedata(v1->unk_0C), v2);
+    v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v1->unk_0C), v2);
     sub_02074B30(v0, 112, &v3);
 
     return 0;
@@ -645,7 +645,7 @@ BOOL ov5_021F6E9C (UnkStruct_0203E724 * param0)
 
     v5 = 0;
     *v10 = 0xff;
-    v7 = GetPartyFromSavedata(v8->unk_0C);
+    v7 = Party_GetFromSavedata(v8->unk_0C);
     v3 = Party_GetCurrentCount(v7);
 
     for (v4 = 0; v4 < v3; v4++) {
@@ -679,7 +679,7 @@ BOOL ov5_021F6F44 (UnkStruct_0203E724 * param0)
     u16 v9 = inline_02049538(param0);
     u16 v10 = inline_02049538(param0);
 
-    v5 = GetPartyFromSavedata(v6->unk_0C);
+    v5 = Party_GetFromSavedata(v6->unk_0C);
     v4 = Party_GetPokemonBySlotIndex(v5, v7);
 
     sub_02077C20(v4, v10, v8);
@@ -697,7 +697,7 @@ BOOL ov5_021F6FC0 (UnkStruct_0203E724 * param0)
     u16 v5 = inline_02049538(param0);
     u16 * v6 = inline_0204FCAC(param0);
 
-    v3 = Party_GetPokemonBySlotIndex(GetPartyFromSavedata(v4->unk_0C), v5);
+    v3 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v4->unk_0C), v5);
     v0 = sub_02074470(v3, 5, NULL);
 
     if (sub_02074470(v3, 76, NULL) == 0) {
@@ -766,7 +766,7 @@ BOOL ov5_021F71B8 (UnkStruct_0203E724 * param0)
     UnkStruct_02073C74 * v1;
     UnkStruct_0203CDB0 * v2 = param0->unk_34;
 
-    v1 = Party_GetPokemonBySlotIndex(GetPartyFromSavedata(v2->unk_0C), 0);
+    v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(v2->unk_0C), 0);
     v0 = sub_0202783C(v2->unk_0C);
 
     sub_020278DC(v0, sub_02074470(v1, 5, NULL), sub_02074470(v1, 112, NULL), sub_02074470(v1, 76, NULL));
@@ -801,7 +801,7 @@ BOOL ov5_021F7270 (UnkStruct_0203E724 * param0)
     u16 v3 = inline_02049538(param0);
     u16 * v4 = inline_0204FCAC(param0);
 
-    v1 = GetPartyFromSavedata(v2->unk_0C);
+    v1 = Party_GetFromSavedata(v2->unk_0C);
     v0 = Party_GetPokemonBySlotIndex(v1, v3);
     *v4 = sub_02074470(v0, 112, NULL);
 

src/overlay005/ov5_021F77A8.c

@@ -690,7 +690,7 @@ BOOL ov5_021F77E8 (UnkStruct_0203E724 * param0)
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
 
-    v0 = Party_GetPokemonBySlotIndex(GetPartyFromSavedata(param0->unk_34->unk_0C), v1);
+    v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->unk_0C), v1);
     *v3 = ov5_021F7B60(v0, v2);
 
     return 0;
@@ -702,7 +702,7 @@ BOOL ov5_021F7844 (UnkStruct_0203E724 * param0)
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
 
-    sub_02054988(GetPartyFromSavedata(param0->unk_34->unk_0C), v0, v1, v2);
+    sub_02054988(Party_GetFromSavedata(param0->unk_34->unk_0C), v0, v1, v2);
     return 0;
 }
 
@@ -920,7 +920,7 @@ BOOL ov5_021F7C04 (UnkStruct_0203E724 * param0)
     param0->unk_18[0] = v16;
 
     if (v14 != 0xff) {
-        v6 = Party_GetPokemonBySlotIndex(GetPartyFromSavedata(param0->unk_34->unk_0C), v14);
+        v6 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->unk_0C), v14);
     }
 
     v7 = sub_0200B144(0, 26, 647, 32);
@@ -1040,7 +1040,7 @@ UnkStruct_ov5_021F7ED8 * ov5_021F7ED8 (UnkStruct_0203CDB0 * param0, u8 param1, u
     UnkStruct_ov5_021F7ED8 * v0;
     int v1;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021F7ED8));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021F7ED8));
 
     if (v0 == NULL) {
         return NULL;
@@ -1202,7 +1202,7 @@ static void ov5_021F8250 (UnkStruct_ov5_021F7ED8 * param0)
     }
 
     sub_0200DA58(param0->unk_04);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 
     return;
 }

src/overlay005/ov5_021F8370.c

@@ -68,7 +68,7 @@ void ov5_021F8370 (UnkStruct_0203CDB0 * param0)
 
     v1 = sub_02027860(sub_0203D174(param0));
     v2 = sub_02027F6C(v1, 10);
-    v3 = AllocFromHeap(4, sizeof(UnkStruct_ov5_021F8480));
+    v3 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021F8480));
 
     memset(v3, 0, sizeof(UnkStruct_ov5_021F8480));
 
@@ -92,7 +92,7 @@ void ov5_021F83C0 (UnkStruct_0203CDB0 * param0)
 {
     UnkStruct_ov5_021F8480 * v0 = param0->unk_04->unk_24;
 
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
     param0->unk_04->unk_24 = NULL;
 }
 

src/overlay006/ov6_0223E140.c

@@ -29,7 +29,7 @@
 #include "overlay115/struct_ov115_0226527C.h"
 
 #include "unk_02005474.h"
-#include "filesystem.h"
+#include "narc.h"
 #include "unk_02006E3C.h"
 #include "unk_0200D9E8.h"
 #include "unk_020170BC.h"
@@ -371,7 +371,7 @@ static void ov6_0223E1B0 (void)
         GX_VRAM_TEXPLTT_0123_E
     };
 
-    GX_SetBanks(&v0);
+    GXLayers_SetBanks(&v0);
 }
 
 static void ov6_0223E1D0 (UnkStruct_02018340 * param0)
@@ -387,7 +387,7 @@ static void ov6_0223E1D0 (UnkStruct_02018340 * param0)
         sub_02018368(&v0);
     }
 
-    GX_EngineAToggleLayers(
+    GXLayers_EngineAToggleLayers(
         GX_PLANEMASK_BG0, 1);
 
     {
@@ -438,7 +438,7 @@ static void ov6_0223E280 (UnkStruct_0201CD38 * param0, void * param1)
 {
     UnkStruct_ov6_0223E140 * v0 = param1;
 
-    GX_SetBanks(&v0->unk_04);
+    GXLayers_SetBanks(&v0->unk_04);
     ov6_0223E2A4(v0->unk_00->unk_08);
     ov6_0223E2AC(v0->unk_00->unk_08);
     sub_0200DA58(param0);
@@ -452,7 +452,7 @@ static void ov6_0223E2A4 (UnkStruct_02018340 * param0)
 static void ov6_0223E2AC (UnkStruct_02018340 * param0)
 {
     ov5_021D1434(param0);
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
 }
 
 static UnkStruct_ov5_021E20E8 * ov6_0223E2BC (int param0, int param1)
@@ -524,7 +524,7 @@ static BOOL ov6_0223E33C (UnkStruct_020508D4 * param0)
         break;
     case 1:
         ov6_0223FE08(v1->unk_00);
-        FreeToHeap(v1);
+        Heap_FreeToHeap(v1);
         return 1;
     }
 
@@ -534,7 +534,7 @@ static BOOL ov6_0223E33C (UnkStruct_020508D4 * param0)
 void ov6_0223E384 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
-    UnkStruct_ov6_0223E33C * v1 = AllocFromHeap(4, sizeof(UnkStruct_ov6_0223E33C));
+    UnkStruct_ov6_0223E33C * v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_0223E33C));
 
     memset(v1, 0, sizeof(UnkStruct_ov6_0223E33C));
     v1->unk_00 = ov6_0223FDE4(4);
@@ -611,7 +611,7 @@ static BOOL ov6_0223E408 (UnkStruct_020508D4 * param0)
         break;
     case 7:
         ov6_0223FE08(v1->unk_00);
-        FreeToHeap(v1);
+        Heap_FreeToHeap(v1);
         return 1;
     }
 
@@ -621,7 +621,7 @@ static BOOL ov6_0223E408 (UnkStruct_020508D4 * param0)
 void ov6_0223E4EC (UnkStruct_020508D4 * param0)
 {
     UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
-    UnkStruct_ov6_0223E33C * v1 = AllocFromHeap(4, sizeof(UnkStruct_ov6_0223E33C));
+    UnkStruct_ov6_0223E33C * v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_0223E33C));
 
     memset(v1, 0, sizeof(UnkStruct_ov6_0223E33C));
     v1->unk_00 = ov6_0223FDE4(4);
@@ -1094,7 +1094,7 @@ static void ov6_0223EB4C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     v0->unk_10C = sub_0206251C(v0->unk_104->unk_38, 0);
     v0->unk_110 = sub_0205EB3C(sub_0205EF3C(v0->unk_104));
 
-    GF_ExpHeap_FndInitAllocator(&v0->unk_C0, 4, 32);
+    Heap_FndInitAllocatorForExpHeap(&v0->unk_C0, 4, 32);
     ov6_0223EA98(v0);
     GX_SetMasterBrightness(v0->unk_0C);
 
@@ -1846,7 +1846,7 @@ UnkStruct_ov6_0223FDE4 * ov6_0223FDE4 (u32 param0)
 {
     UnkStruct_ov6_0223FDE4 * v0;
 
-    v0 = AllocFromHeap(param0, sizeof(UnkStruct_ov6_0223FDE4));
+    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_0223FDE4));
     memset(v0, 0, sizeof(UnkStruct_ov6_0223FDE4));
     v0->unk_00 = sub_020203AC(param0);
     v0->unk_40 = 5;
@@ -1857,7 +1857,7 @@ UnkStruct_ov6_0223FDE4 * ov6_0223FDE4 (u32 param0)
 void ov6_0223FE08 (UnkStruct_ov6_0223FDE4 * param0)
 {
     sub_020203B8(param0->unk_00);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov6_0223FE1C (UnkStruct_ov6_0223FDE4 * param0, fx32 param1, fx32 param2, u32 param3, u32 param4, UnkStruct_020203AC * param5)
@@ -2028,12 +2028,12 @@ UnkStruct_ov6_022400A8 * ov6_02240074 (UnkStruct_0203CDB0 * param0)
 {
     UnkStruct_ov6_022400A8 * v0;
 
-    v0 = AllocFromHeap(4, sizeof(UnkStruct_ov6_022400A8));
+    v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_022400A8));
     memset(v0, 0, sizeof(UnkStruct_ov6_022400A8));
     v0->unk_00 = param0;
     v0->unk_12C = 5;
 
-    GF_ExpHeap_FndInitAllocator(&v0->unk_11C, 4, 32);
+    Heap_FndInitAllocatorForExpHeap(&v0->unk_11C, 4, 32);
 
     return v0;
 }
@@ -2041,7 +2041,7 @@ UnkStruct_ov6_022400A8 * ov6_02240074 (UnkStruct_0203CDB0 * param0)
 void ov6_022400A8 (UnkStruct_ov6_022400A8 * param0)
 {
     GF_ASSERT(param0->unk_12C == 5);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov6_022400C4 (UnkStruct_ov6_022400A8 * param0)
@@ -2064,13 +2064,13 @@ UnkStruct_ov6_022401B8 * ov6_02240104 (u32 param0, UnkStruct_0203CDB0 * param1)
 {
     UnkStruct_ov6_022401B8 * v0;
 
-    v0 = AllocFromHeap(param0, sizeof(UnkStruct_ov6_022401B8));
+    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_022401B8));
     memset(v0, 0, sizeof(UnkStruct_ov6_022401B8));
     v0->unk_04 = param1;
     v0->unk_00 = 0;
     v0->unk_11C = param0;
 
-    GF_ExpHeap_FndInitAllocator(&v0->unk_10C, param0, 32);
+    Heap_FndInitAllocatorForExpHeap(&v0->unk_10C, param0, 32);
     ov6_02240260(&v0->unk_34, v0->unk_11C, &v0->unk_10C);
 
     {
@@ -2093,7 +2093,7 @@ UnkStruct_ov6_022401B8 * ov6_02240104 (u32 param0, UnkStruct_0203CDB0 * param1)
 void ov6_022401B8 (UnkStruct_ov6_022401B8 * param0)
 {
     ov6_02240340(&param0->unk_34, &param0->unk_10C);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov6_022401D0 (UnkStruct_ov6_022401B8 * param0, u32 param1)
@@ -2423,7 +2423,7 @@ static UnkStruct_ov6_02240774 * ov6_0224060C (u32 param0, u32 param1)
     UnkStruct_ov6_02240774 * v0;
     int v1;
 
-    v0 = AllocFromHeap(param0, sizeof(UnkStruct_ov6_02240774));
+    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_02240774));
     memset(v0, 0, sizeof(UnkStruct_ov6_02240774));
 
     ov6_0223FD58(&v0->unk_00, 98, param1, param0);
@@ -2446,7 +2446,7 @@ static void ov6_02240654 (UnkStruct_ov6_02240774 * param0)
     }
 
     ov6_0223FD68(&param0->unk_00);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 static void ov6_0224067C (UnkStruct_ov6_02240774 * param0, fx32 param1, fx32 param2, fx32 param3, s32 param4, u16 param5, u16 param6, u16 param7)
@@ -2592,10 +2592,10 @@ static UnkStruct_ov6_02240A00 * ov6_022408C8 (u32 param0, u32 param1)
     int v1;
     NARC * v2;
 
-    v0 = AllocFromHeap(param0, sizeof(UnkStruct_ov6_02240A00));
+    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_02240A00));
     memset(v0, 0, sizeof(UnkStruct_ov6_02240A00));
 
-    GF_ExpHeap_FndInitAllocator(&v0->unk_C4, param0, 32);
+    Heap_FndInitAllocatorForExpHeap(&v0->unk_C4, param0, 32);
     v2 = NARC_ctor(98, param0);
     ov6_0223FD60(&v0->unk_78, v2, param1, param0);
 
@@ -2625,7 +2625,7 @@ static void ov6_02240968 (UnkStruct_ov6_02240A00 * param0)
         ov6_0223FD84(&param0->unk_88[v0], &param0->unk_C4);
     }
 
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 static void ov6_02240994 (UnkStruct_ov6_02240A00 * param0, fx32 param1, fx32 param2, fx32 param3, u16 param4, u16 param5, u16 param6)
@@ -2796,13 +2796,13 @@ UnkStruct_ov6_02240C44 * ov6_02240B9C (u32 param0, UnkStruct_0203CDB0 * param1)
     int v1;
     NARC * v2;
 
-    v0 = AllocFromHeap(param0, sizeof(UnkStruct_ov6_02240C44));
+    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_02240C44));
     memset(v0, 0, sizeof(UnkStruct_ov6_02240C44));
 
     v2 = NARC_ctor(98, param0);
     v0->unk_D8 = param1;
 
-    GF_ExpHeap_FndInitAllocator(&v0->unk_DC, param0, 32);
+    Heap_FndInitAllocatorForExpHeap(&v0->unk_DC, param0, 32);
     ov6_0223FD60(&v0->unk_78, v2, 15, param0);
 
     for (v1 = 0; v1 < 4; v1++) {

src/overlay006/ov6_02240C9C.c

@@ -16,7 +16,7 @@
 #include "overlay006/struct_ov6_02242634.h"
 #include "overlay006/struct_ov6_02242634_sub2.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "unk_0201378C.h"
 #include "heap.h"
 #include "unk_0201D15C.h"
@@ -212,7 +212,7 @@ static void ov6_02240D00 (UnkStruct_0203CDB0 * param0, const BOOL param1, int *
         sub_0202DA10(param0->unk_0C, &v1, &v2);
 
         if (param1) {
-            v0 = AllocAtEndAndReadWholeNarcMemberByIndexPair(106, 8, 4);
+            v0 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(106, 8, 4);
 
             if (v1 != 0xffff) {
                 (*param2) = v0[v1];
@@ -222,7 +222,7 @@ static void ov6_02240D00 (UnkStruct_0203CDB0 * param0, const BOOL param1, int *
                 (*param3) = v0[v2];
             }
 
-            FreeToHeap(v0);
+            Heap_FreeToHeap(v0);
         }
     }
 }
@@ -257,7 +257,7 @@ BOOL ov6_02240D5C (UnkStruct_0203CDB0 * param0)
             return 0;
         }
 
-        v11 = GetPartyFromSavedata(param0->unk_0C);
+        v11 = Party_GetFromSavedata(param0->unk_0C);
         v12 = (UnkStruct_ov6_02242634 *)sub_0203A640(param0);
         v1 = Party_GetPokemonBySlotIndex(v11, 0);
 
@@ -411,7 +411,7 @@ BOOL ov6_0224106C (UnkStruct_0203CDB0 * param0, const int param1, UnkStruct_ov6_
             return 0;
         }
 
-        v1 = GetPartyFromSavedata(param0->unk_0C);
+        v1 = Party_GetFromSavedata(param0->unk_0C);
         v0 = Party_GetPokemonBySlotIndex(v1, 0);
         ov6_02242634(param0, v0, NULL, &v4);
         v5 = ov6_0224226C(1, v5, &v4, sub_0203A74C(sub_0203A790(param0->unk_0C)), v0);
@@ -512,7 +512,7 @@ BOOL ov6_022411C8 (UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * param1)
         }
     }
 
-    v10 = GetPartyFromSavedata(param0->unk_0C);
+    v10 = Party_GetFromSavedata(param0->unk_0C);
     v11 = (UnkStruct_ov6_02242634 *)sub_0203A640(param0);
     v1 = Party_GetPokemonBySlotIndex(v10, 0);
 
@@ -636,7 +636,7 @@ BOOL ov6_022413E4 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C ** param1
             return 0;
         }
 
-        v10 = GetPartyFromSavedata(param0->unk_0C);
+        v10 = Party_GetFromSavedata(param0->unk_0C);
         v11 = (UnkStruct_ov6_02242634 *)sub_0203A640(param0);
         v0 = Party_GetPokemonBySlotIndex(v10, 0);
 
@@ -1192,7 +1192,7 @@ static void ov6_02241BAC (const u16 param0, const u8 param1, const int param2, c
     v0 = ov6_02242514(param2, param4, v5, param6);
 
     GF_ASSERT(v0);
-    FreeToHeap(v5);
+    Heap_FreeToHeap(v5);
 }
 
 static void ov6_02241CC0 (u16 param0, u8 param1, const int param2, const UnkStruct_ov6_022422D0 * param3, UnkStruct_02073C74 * param4, UnkStruct_ov6_02240D5C * param5)
@@ -1238,7 +1238,7 @@ static void ov6_02241CC0 (u16 param0, u8 param1, const int param2, const UnkStru
 
                     v2 = ov6_02242514(param2, param3, v3, param5);
                     GF_ASSERT(v2);
-                    FreeToHeap(v3);
+                    Heap_FreeToHeap(v3);
                     return;
                 }
             }
@@ -1250,7 +1250,7 @@ static void ov6_02241CC0 (u16 param0, u8 param1, const int param2, const UnkStru
     v2 = ov6_02242514(param2, param3, v3, param5);
 
     GF_ASSERT(v2);
-    FreeToHeap(v3);
+    Heap_FreeToHeap(v3);
 }
 
 static BOOL ov6_02241DC4 (UnkStruct_02073C74 * param0, const int param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const u8 param4, const int param5, UnkStruct_ov6_02240D5C * param6)
@@ -1375,7 +1375,7 @@ void ov6_02242034 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C * param1)
     {
         Party * v4;
 
-        v4 = GetPartyFromSavedata(param0->unk_0C);
+        v4 = Party_GetFromSavedata(param0->unk_0C);
         v0 = Party_GetPokemonBySlotIndex(v4, 0);
 
         ov6_02242634(param0, v0, NULL, &v2);
@@ -1412,7 +1412,7 @@ void ov6_022420D4 (UnkStruct_0203CDB0 * param0, u16 param1, u8 param2, UnkStruct
     {
         Party * v2;
 
-        v2 = GetPartyFromSavedata(param0->unk_0C);
+        v2 = Party_GetFromSavedata(param0->unk_0C);
         v0 = Party_GetPokemonBySlotIndex(v2, 0);
 
         ov6_02242634(param0, v0, NULL, &v1);
@@ -1636,7 +1636,7 @@ static void ov6_0224239C (const u32 param0, UnkStruct_0206C638 * param1, UnkStru
     v6 = Party_AddPokemon(param2->unk_04[1], v7);
 
     GF_ASSERT(v6);
-    FreeToHeap(v7);
+    Heap_FreeToHeap(v7);
 }
 
 static BOOL ov6_02242440 (UnkStruct_0203CDB0 * param0, UnkStruct_0206C638 ** param1)

src/overlay006/ov6_022426AC.c

@@ -13,7 +13,7 @@
 #include "overlay019/struct_ov19_021DA864.h"
 #include "overlay115/struct_ov115_02261520.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "unk_020093B4.h"
 #include "unk_02009714.h"
 #include "unk_0200A328.h"
@@ -53,13 +53,13 @@ UnkStruct_ov6_022426B8 * ov6_022426AC (const int param0)
 {
     UnkStruct_ov6_022426B8 * v0;
 
-    v0 = AllocFromHeapAtEnd(param0, sizeof(UnkStruct_ov6_022426B8));
+    v0 = Heap_AllocFromHeapAtEnd(param0, sizeof(UnkStruct_ov6_022426B8));
     return v0;
 }
 
 void ov6_022426B8 (UnkStruct_ov6_022426B8 * param0)
 {
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov6_022426C0 (UnkStruct_ov6_022426B8 * param0, const int param1)
@@ -149,8 +149,8 @@ void ov6_02242828 (UnkStruct_ov6_022426B8 * param0)
     }
 
     sub_02021964(param0->unk_38);
-    FreeToHeap(param0->unk_20);
-    FreeToHeap(param0->unk_24);
+    Heap_FreeToHeap(param0->unk_20);
+    Heap_FreeToHeap(param0->unk_24);
 }
 
 static void ov6_02242860 (UnkStruct_0201CD38 * param0, void * param1)

src/overlay006/ov6_02242984.c

@@ -7,7 +7,7 @@
 #include "struct_defs/struct_02049FA8.h"
 #include "overlay006/struct_ov6_02242634.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "heap.h"
 #include "unk_0202631C.h"
 #include "unk_0202D7A8.h"
@@ -59,14 +59,14 @@ UnkStruct_ov6_02242A8C * ov6_02242A10 (const int param0, UnkStruct_0203CDB0 * pa
     u8 v0;
     UnkStruct_ov6_02242A8C * v1;
 
-    v1 = AllocFromHeapAtEnd(param0, sizeof(UnkStruct_ov6_02242A8C));
+    v1 = Heap_AllocFromHeapAtEnd(param0, sizeof(UnkStruct_ov6_02242A8C));
     v1->unk_2C = param1;
 
     {
         u8 v2;
         UnkStruct_ov6_02242A10 * v3;
 
-        v3 = AllocAtEndAndReadWholeNarcMemberByIndexPair(106, 11, 4);
+        v3 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(106, 11, 4);
 
         for (v0 = 0; v0 < 5; v0++) {
             v2 = inline_020564D0(36);
@@ -80,7 +80,7 @@ UnkStruct_ov6_02242A8C * ov6_02242A10 (const int param0, UnkStruct_0203CDB0 * pa
             v1->unk_30 = param1->unk_1C->unk_00;
         }
 
-        FreeToHeap(v3);
+        Heap_FreeToHeap(v3);
     }
 
     return v1;
@@ -88,7 +88,7 @@ UnkStruct_ov6_02242A8C * ov6_02242A10 (const int param0, UnkStruct_0203CDB0 * pa
 
 void ov6_02242A8C (UnkStruct_ov6_02242A8C * param0)
 {
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 void ov6_02242A94 (const u8 param0, UnkStruct_ov6_02242A8C * param1)

src/overlay006/ov6_02242AF0.c

@@ -116,7 +116,7 @@ void ov6_02242B58 (UnkStruct_0203CDB0 * param0, const u16 param1, const u16 para
 
     v0 = sub_02027860(sub_0203D174(param0));
     v1 = (UnkStruct_ov6_02242AF0 *)sub_02027F6C(v0, 6);
-    v2 = AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02242B58));
+    v2 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02242B58));
 
     memset(v2, 0, sizeof(UnkStruct_ov6_02242B58));
 
@@ -249,7 +249,7 @@ static BOOL ov6_02242C5C (UnkStruct_020508D4 * param0)
         (v1->unk_05)++;
         break;
     case 5:
-        FreeToHeap(v1);
+        Heap_FreeToHeap(v1);
         return 1;
     }
 

src/overlay006/ov6_02242F74.c

@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "filesystem.h"
+#include "narc.h"
 #include "heap.h"
 #include "overlay006/ov6_02242F74.h"
 
@@ -20,14 +20,14 @@ void ov6_02242F74 (const int param0, const BOOL param1, const int param2, int *
         v1 = 10;
     }
 
-    v0 = AllocAtEndAndReadWholeNarcMemberByIndexPair(106, v1, 4);
+    v0 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(106, v1, 4);
     v2 = ((param0 >> (5 * v3)) & 0x1f);
     v2 %= 32;
 
     (*param3) = v0[v2];
     (*param4) = v0[v2];
 
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
 }
 
 static u8 ov6_02242FC0 (const int param0)

src/overlay006/ov6_02243258.c

@@ -21,7 +21,7 @@
 #include "overlay101/struct_ov101_021D86B0.h"
 
 #include "unk_02005474.h"
-#include "filesystem.h"
+#include "narc.h"
 #include "unk_020093B4.h"
 #include "unk_02009714.h"
 #include "unk_0200A328.h"
@@ -408,10 +408,10 @@ static void ov6_0224339C (UnkStruct_ov6_02243258 * param0)
     sub_02009754(param0->unk_19C);
     sub_02009754(param0->unk_1A0);
     sub_02009754(param0->unk_1A4);
-    FreeToHeap(param0->unk_1A8);
-    FreeToHeap(param0->unk_1AC);
-    FreeToHeap(param0->unk_1B0);
-    FreeToHeap(param0->unk_1B4);
+    Heap_FreeToHeap(param0->unk_1A8);
+    Heap_FreeToHeap(param0->unk_1AC);
+    Heap_FreeToHeap(param0->unk_1B0);
+    Heap_FreeToHeap(param0->unk_1B4);
     sub_020219C0(param0->unk_08);
     sub_02021964(param0->unk_08);
 }
@@ -1064,7 +1064,7 @@ void ov6_02243FC8 (UnkStruct_0201CD38 * param0)
 
 static UnkStruct_ov6_02243FFC * ov6_02243FDC (UnkStruct_0203CDB0 * param0)
 {
-    UnkStruct_ov6_02243FFC * v0 = AllocFromHeapAtEnd(4, (sizeof(UnkStruct_ov6_02243FFC)));
+    UnkStruct_ov6_02243FFC * v0 = Heap_AllocFromHeapAtEnd(4, (sizeof(UnkStruct_ov6_02243FFC)));
 
     memset(v0, 0, (sizeof(UnkStruct_ov6_02243FFC)));
     v0->unk_60 = param0;
@@ -1074,7 +1074,7 @@ static UnkStruct_ov6_02243FFC * ov6_02243FDC (UnkStruct_0203CDB0 * param0)
 
 static void ov6_02243FFC (UnkStruct_ov6_02243FFC * param0)
 {
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 static void ov6_02244004 (UnkStruct_0201CD38 * param0, void * param1)
@@ -1645,12 +1645,12 @@ static void ov6_02244734 (UnkStruct_0201CD38 * param0, void * param1)
         }
 
         if (v1->unk_270 != NULL) {
-            FreeToHeap(v1->unk_270);
+            Heap_FreeToHeap(v1->unk_270);
             v1->unk_270 = NULL;
         }
 
         if (v1->unk_274 != NULL) {
-            FreeToHeap(v1->unk_274);
+            Heap_FreeToHeap(v1->unk_274);
             v1->unk_274 = NULL;
         }
 
@@ -1698,7 +1698,7 @@ static void ov6_0224481C (UnkStruct_ov6_02243FFC * param0)
     G2_SetBG1Priority(1);
     G2_SetBG3Priority(0);
 
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG3, 0);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 0);
 
     ov6_02244E54(v0, 2, &param0->unk_6C);
     ov6_02244E7C(param0->unk_60->unk_08, v0, 0, &param0->unk_68);
@@ -1707,12 +1707,12 @@ static void ov6_0224481C (UnkStruct_ov6_02243FFC * param0)
 
     NARC_dtor(v0);
     param0->unk_244 = sub_020711EC(4, 32);
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG3, 1);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1);
 }
 
 static void ov6_022448C8 (UnkStruct_ov6_02243FFC * param0)
 {
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG3, 0);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 0);
     sub_0207121C(param0->unk_244);
 
     ov6_02244F20(param0->unk_60->unk_08);
@@ -1722,7 +1722,7 @@ static void ov6_022448C8 (UnkStruct_ov6_02243FFC * param0)
     G2_SetBG3Priority(param0->unk_26);
 
     sub_0205D8CC(0, 1);
-    GX_EngineAToggleLayers(GX_PLANEMASK_BG3, 1);
+    GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1);
 }
 
 static NARC * ov6_0224491C (void)
@@ -1950,7 +1950,7 @@ static void ov6_02244E54 (NARC * param0, u32 param1, NNSG2dPaletteData ** param2
     NNS_G2dGetUnpackedPaletteData(v0, param2);
 
     sub_0201972C(3, (*param2)->pRawData, (32 * 1), (32 * 12));
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
 }
 
 static void ov6_02244E7C (UnkStruct_02018340 * param0, NARC * param1, u32 param2, NNSG2dCharacterData ** param3)
@@ -1961,7 +1961,7 @@ static void ov6_02244E7C (UnkStruct_02018340 * param0, NARC * param1, u32 param2
     NNS_G2dGetUnpackedCharacterData(v0, param3);
 
     sub_0201958C(param0, 3, (*param3)->pRawData, (*param3)->szByte, 0);
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
 }
 
 static void ov6_02244EB4 (UnkStruct_02018340 * param0, NARC * param1, u32 param2, NNSG2dScreenData ** param3)
@@ -1977,7 +1977,7 @@ static void ov6_02244EB4 (UnkStruct_02018340 * param0, NARC * param1, u32 param2
     sub_02019574(param0, 3, (void *)(*param3)->rawData, (*param3)->szByte);
     sub_02019E2C(param0, 3, 0, 0, 32, 32, 12);
     sub_02019448(param0, 3);
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
 }
 
 static void ov6_02244F20 (UnkStruct_02018340 * param0)
@@ -2064,7 +2064,7 @@ static void ov6_0224508C (UnkStruct_ov6_02243FFC * param0, UnkStruct_02008A90 *
 
 static void * ov6_0224509C (UnkStruct_02073C74 * param0, UnkStruct_02008A90 * param1, u32 param2)
 {
-    void * v0 = AllocFromHeap(4, (32 * 10) * 10);
+    void * v0 = Heap_AllocFromHeap(4, (32 * 10) * 10);
 
     GF_ASSERT(v0 != NULL);
 
@@ -2904,7 +2904,7 @@ void ov6_02245CFC (UnkStruct_0201CD38 * param0)
 {
     UnkStruct_ov6_02249270 * v0 = sub_0201CED0(param0);
 
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
     sub_0200DA58(param0);
 }
 
@@ -3032,7 +3032,7 @@ static int(*const Unk_ov6_02249270[])(UnkStruct_ov6_02249270 *) = {
 
 static void * ov6_02245F44 (u32 param0, int param1)
 {
-    void * v0 = AllocFromHeapAtEnd(param0, param1);
+    void * v0 = Heap_AllocFromHeapAtEnd(param0, param1);
 
     GF_ASSERT(v0 != NULL);
     memset(v0, 0, param1);

src/overlay006/ov6_02246184.c

@@ -67,7 +67,7 @@ UnkStruct_ov6_02246204 * ov6_02246184 (u32 param0, u32 param1)
 
     GF_ASSERT(param1 < 4);
 
-    v0 = AllocFromHeap(param0, sizeof(UnkStruct_ov6_02246204));
+    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_02246204));
     memset(v0, 0, sizeof(UnkStruct_ov6_02246204));
 
     v0->unk_00 = sub_02006FE8(115, param1, 0, param0, 0);
@@ -89,10 +89,10 @@ UnkStruct_ov6_02246204 * ov6_02246184 (u32 param0, u32 param1)
 
 void ov6_02246204 (UnkStruct_ov6_02246204 * param0)
 {
-    FreeToHeap(param0->unk_00);
-    FreeToHeap(param0->unk_04);
-    FreeToHeap(param0->unk_08);
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0->unk_00);
+    Heap_FreeToHeap(param0->unk_04);
+    Heap_FreeToHeap(param0->unk_08);
+    Heap_FreeToHeap(param0);
 }
 
 u32 ov6_02246224 (const UnkStruct_ov6_02246204 * param0)
@@ -107,7 +107,7 @@ u32 ov6_0224622C (const UnkStruct_ov6_02246204 * param0)
 
 void ov6_02246234 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, int param2)
 {
-    Party * v0 = GetPartyFromSavedata(param0->unk_0C);
+    Party * v0 = Party_GetFromSavedata(param0->unk_0C);
 
     sub_0207A128(v0, param2, param1->unk_04);
     sub_0202F180(param0->unk_0C, param1->unk_04);
@@ -115,7 +115,7 @@ void ov6_02246234 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1,
 
 void ov6_02246254 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, int param2, UnkStruct_ov6_02246254 * param3, UnkStruct_02073C74 * param4, UnkStruct_02073C74 * param5)
 {
-    Party * v0 = GetPartyFromSavedata(param0->unk_0C);
+    Party * v0 = Party_GetFromSavedata(param0->unk_0C);
     UnkStruct_02073C74 * v1;
     UnkStruct_02023790 * v2;
     u32 v3;

src/overlay006/ov6_02246444.c

@@ -92,7 +92,7 @@ int ov6_022464A4 (const UnkStruct_ov6_022465F4 * param0)
 
 static UnkStruct_ov6_022465F4 * ov6_022464A8 (UnkStruct_0203CDB0 * param0, UnkStruct_0202E794 * param1)
 {
-    UnkStruct_ov6_022465F4 * v0 = AllocFromHeap(4, sizeof(UnkStruct_ov6_022465F4));
+    UnkStruct_ov6_022465F4 * v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_022465F4));
 
     ov6_02246444(v0);
     ov6_0224645C(v0, sub_0202E4C8(param1));
@@ -106,7 +106,7 @@ static UnkStruct_ov6_022465F4 * ov6_022464A8 (UnkStruct_0203CDB0 * param0, UnkSt
 static UnkStruct_ov6_022465F4 * ov6_022464F8 (UnkStruct_0203CDB0 * param0, UnkStruct_0202E768 * param1)
 {
     UnkStruct_02025E6C * v0 = sub_02025E38(param0->unk_0C);
-    UnkStruct_ov6_022465F4 * v1 = AllocFromHeap(4, sizeof(UnkStruct_ov6_022465F4));
+    UnkStruct_ov6_022465F4 * v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_022465F4));
 
     ov6_02246444(v1);
     ov6_0224645C(v1, sub_02025EF0(v0));
@@ -121,7 +121,7 @@ static UnkStruct_ov6_022465F4 * ov6_022464F8 (UnkStruct_0203CDB0 * param0, UnkSt
 static UnkStruct_ov6_022465F4 * ov6_02246550 (UnkStruct_0203CDB0 * param0, int param1)
 {
     UnkStruct_02025E6C * v0 = sub_02025E38(param0->unk_0C);
-    UnkStruct_ov6_022465F4 * v1 = AllocFromHeap(4, sizeof(UnkStruct_ov6_022465F4));
+    UnkStruct_ov6_022465F4 * v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_022465F4));
 
     ov6_02246444(v1);
     v1->unk_00 = param1;
@@ -153,5 +153,5 @@ UnkStruct_ov6_022465F4 * ov6_022465A0 (UnkStruct_0203CDB0 * param0, int param1,
 
 void ov6_022465F4 (UnkStruct_ov6_022465F4 * param0)
 {
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }

src/overlay006/ov6_022465FC.c

@@ -7,7 +7,7 @@
 
 #include "struct_defs/struct_0203CDB0.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "unk_0201378C.h"
 #include "unk_0201D15C.h"
 #include "unk_0202440C.h"
@@ -79,7 +79,7 @@ static int ov6_0224663C (UnkStruct_0203CDB0 * param0)
     v4 = sub_02055BE8(param0);
     v5 = (((19 + v3) % 24) * 4 + (v4 / 15)) * 7;
 
-    ReadFromNarcMemberByIndexPair(v1, 126, 0, v5, sizeof(u8) * 7);
+    NARC_ReadFromMemberByIndexPair(v1, 126, 0, v5, sizeof(u8) * 7);
     v0 = v1[v2];
 
     GF_ASSERT(0 < v0 && v0 < 10);
@@ -91,7 +91,7 @@ static int ov6_0224669C (int param0)
     u8 v0;
     int v1 = (1 + 11) * (param0 - 1);
 
-    ReadFromNarcMemberByIndexPair(&v0, 126, 1, v1, sizeof(u8));
+    NARC_ReadFromMemberByIndexPair(&v0, 126, 1, v1, sizeof(u8));
 
     GF_ASSERT(v0 < 6);
     return v0;
@@ -102,7 +102,7 @@ static void ov6_022466C8 (int param0, u8 * param1)
     u8 v0;
     int v1 = (1 + 11) * (param0 - 1) + 1;
 
-    ReadFromNarcMemberByIndexPair(param1, 126, 1, v1, sizeof(u8) * 11);
+    NARC_ReadFromMemberByIndexPair(param1, 126, 1, v1, sizeof(u8) * 11);
 }
 
 static BOOL ov6_022466E8 (UnkStruct_0203CDB0 * param0, int param1, int param2)

src/overlay006/ov6_02246C24.c

@@ -46,7 +46,7 @@ void ov6_02246C24 (UnkStruct_0203CDB0 * param0, const u8 param1)
     v0 = sub_020552B4(param0, v3, &v1, &v2);
 
     if (v0) {
-        UnkStruct_ov6_02246C24 * v4 = AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02246C24));
+        UnkStruct_ov6_02246C24 * v4 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02246C24));
 
         v4->unk_0C = param1;
         v4->unk_0D = 0;
@@ -159,7 +159,7 @@ static BOOL ov6_02246C9C (UnkStruct_020508D4 * param0)
         }
         break;
     case 5:
-        FreeToHeap(v1);
+        Heap_FreeToHeap(v1);
         return 1;
     }
 

src/overlay006/ov6_02246F00.c

@@ -31,7 +31,7 @@ void ov6_02246F00 (UnkStruct_0203CDB0 * param0, const u8 param1, const u8 param2
     v0 = sub_020552B4(param0, 498, NULL, NULL);
 
     if (v0) {
-        UnkStruct_ov6_02246F00 * v1 = AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02246F00));
+        UnkStruct_ov6_02246F00 * v1 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02246F00));
 
         v1->unk_00 = param2;
         v1->unk_01 = param1;
@@ -100,7 +100,7 @@ static BOOL ov6_02246F40 (UnkStruct_020508D4 * param0)
         }
         break;
     case 4:
-        FreeToHeap(v1);
+        Heap_FreeToHeap(v1);
         return 1;
     }
 

src/overlay006/ov6_02247100.c

@@ -69,7 +69,7 @@ BOOL ov6_02247120 (UnkStruct_020508D4 * param0)
         v0 = Unk_ov6_022495CC[v2->unk_00](param0, v1, v2);
 
         if (v0 == 2) {
-            FreeToHeap(v2);
+            Heap_FreeToHeap(v2);
         }
     } while (v0 == 1);
 
@@ -190,7 +190,7 @@ BOOL ov6_022472E8 (UnkStruct_020508D4 * param0)
 
         if (v0 == 2) {
             ov6_0224732C(v1, v2);
-            FreeToHeap(v2);
+            Heap_FreeToHeap(v2);
             return 1;
         }
     } while (v0 == 1);
@@ -309,7 +309,7 @@ BOOL ov6_022474AC (UnkStruct_020508D4 * param0)
         v0 = Unk_ov6_022495F0[v2->unk_00](param0, v1, v2);
 
         if (v0 == 2) {
-            FreeToHeap(v2);
+            Heap_FreeToHeap(v2);
         }
     } while (v0 == 1);
 
@@ -368,7 +368,7 @@ BOOL ov6_02247554 (UnkStruct_020508D4 * param0)
         v0 = Unk_ov6_022495F0[v2->unk_00](param0, v1, v2);
 
         if (v0 == 2) {
-            FreeToHeap(v2);
+            Heap_FreeToHeap(v2);
         }
     } while (v0 == 1);
 
@@ -377,7 +377,7 @@ BOOL ov6_02247554 (UnkStruct_020508D4 * param0)
 
 static void * ov6_02247590 (u32 param0, u32 param1)
 {
-    void * v0 = AllocFromHeapAtEnd(param0, param1);
+    void * v0 = Heap_AllocFromHeapAtEnd(param0, param1);
 
     GF_ASSERT(v0 != NULL);
     memset(v0, 0, param1);

src/overlay006/ov6_022475B0.c

@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_021C0794_decl.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "heap.h"
 #include "unk_0202D7A8.h"
 #include "overlay006/ov6_022475B0.h"
@@ -17,7 +17,7 @@ void ov6_022475B0 (UnkStruct_021C0794 * param0)
     int v3[2];
     int * v4;
 
-    v4 = AllocAtEndAndReadWholeNarcMemberByIndexPair(106, 8, 4);
+    v4 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(106, 8, 4);
 
     sub_0202DA10(param0, &v1, &v2);
 
@@ -42,7 +42,7 @@ void ov6_022475B0 (UnkStruct_021C0794 * param0)
         }
     }
 
-    FreeToHeap(v4);
+    Heap_FreeToHeap(v4);
 }
 
 int ov6_02247624 (UnkStruct_021C0794 * param0)
@@ -55,10 +55,10 @@ int ov6_02247624 (UnkStruct_021C0794 * param0)
 
     GF_ASSERT(v2 != 0xffff);
 
-    v1 = AllocAtEndAndReadWholeNarcMemberByIndexPair(106, 8, 4);
+    v1 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(106, 8, 4);
     v0 = v1[v2];
 
-    FreeToHeap(v1);
+    Heap_FreeToHeap(v1);
 
     return v0;
 }

src/overlay006/ov6_02247660.c

@@ -5,7 +5,7 @@
 
 #include "struct_defs/struct_0203CDB0.h"
 
-#include "filesystem.h"
+#include "narc.h"
 #include "heap.h"
 #include "unk_0202B37C.h"
 #include "unk_02039C80.h"
@@ -47,7 +47,7 @@ BOOL ov6_02247660 (UnkStruct_0203CDB0 * param0)
     v8[2] = (v13 >> 8) & 0xff;
     v8[3] = v13 & 0xff;
 
-    v5 = AllocAtEndAndReadWholeNarcMemberByIndexPair(106, 1, 4);
+    v5 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(106, 1, 4);
     v7 = ((int *)v5)[0];
     v1 = 0;
 
@@ -82,7 +82,7 @@ BOOL ov6_02247660 (UnkStruct_0203CDB0 * param0)
         }
     }
 
-    FreeToHeap(v5);
+    Heap_FreeToHeap(v5);
 
     return v12;
 }
@@ -97,8 +97,8 @@ void ov6_022477A0 (int * param0)
 {
     int * v0;
 
-    v0 = AllocAtEndAndReadWholeNarcMemberByIndexPair(106, 0, 4);
+    v0 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(106, 0, 4);
     (*param0) = (*v0);
 
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
 }

src/overlay006/ov6_02247A0C.c

@@ -99,7 +99,7 @@ void ov6_02247A0C (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov6_02247A0C * v0;
 
-    v0 = AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov6_02247A0C));
+    v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov6_02247A0C));
     MI_CpuClear8(v0, sizeof(UnkStruct_ov6_02247A0C));
 
     sub_02050944(param0, ov6_02247A34, v0);
@@ -122,7 +122,7 @@ static BOOL ov6_02247A34 (UnkStruct_020508D4 * param0)
         }
         break;
     case 2:
-        FreeToHeap(v1);
+        Heap_FreeToHeap(v1);
         return 1;
     }
 
@@ -139,7 +139,7 @@ void * ov6_02247A90 (void * param0)
 
     v1 = sub_0203D170(param0);
     v8 = sub_0203D174(param0);
-    v0 = AllocFromHeap(11, sizeof(UnkStruct_ov6_02247A90));
+    v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov6_02247A90));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_ov6_02247A90));
 
@@ -209,7 +209,7 @@ void ov6_02247CC8 (void * param0)
     sub_0201A8FC(&v0->unk_00);
     sub_0200B190(v0->unk_10);
     sub_0200B3F0(v0->unk_14);
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
 }
 
 static int ov6_02247CF4 (const UnkStruct_02023790 * param0, int param1, int param2, int param3)

src/overlay006/ov6_02247D30.c

@@ -45,7 +45,7 @@ void ov6_02247D30 (UnkStruct_0203CDB0 * param0, const u8 param1)
     v0 = sub_020552B4(param0, v3, &v1, &v2);
 
     if (v0) {
-        UnkStruct_ov6_02247D30 * v4 = AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02247D30));
+        UnkStruct_ov6_02247D30 * v4 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02247D30));
 
         v4->unk_0C = param1;
         v4->unk_0D = 0;
@@ -138,7 +138,7 @@ static BOOL ov6_02247DAC (UnkStruct_020508D4 * param0)
         }
         break;
     case 5:
-        FreeToHeap(v1);
+        Heap_FreeToHeap(v1);
         return 1;
     }
 

src/overlay006/ov6_02248050.c

@@ -15,7 +15,7 @@
 #include "overlay006/struct_ov6_0223E6EC.h"
 
 #include "unk_02005474.h"
-#include "filesystem.h"
+#include "narc.h"
 #include "unk_02006E3C.h"
 #include "unk_020170BC.h"
 #include "heap.h"
@@ -208,7 +208,7 @@ static void ov6_0224825C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     NARC * v2;
 
     memset(v0, 0, sizeof(UnkStruct_ov6_0224825C));
-    GF_ExpHeap_FndInitAllocator(&v0->unk_DC, 4, 32);
+    Heap_FndInitAllocatorForExpHeap(&v0->unk_DC, 4, 32);
 
     v2 = NARC_ctor(141, 4);
 
@@ -289,7 +289,7 @@ static void ov6_02248340 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     NARC * v2;
 
     memset(v0, 0, sizeof(UnkStruct_ov6_02248340));
-    GF_ExpHeap_FndInitAllocator(&v0->unk_DC, 4, 32);
+    Heap_FndInitAllocatorForExpHeap(&v0->unk_DC, 4, 32);
 
     v2 = NARC_ctor(141, 4);
 
@@ -309,7 +309,7 @@ static void ov6_022483A0 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     NARC * v2;
 
     memset(v0, 0, sizeof(UnkStruct_ov6_02248340));
-    GF_ExpHeap_FndInitAllocator(&v0->unk_DC, 4, 32);
+    Heap_FndInitAllocatorForExpHeap(&v0->unk_DC, 4, 32);
 
     v2 = NARC_ctor(141, 4);
 
@@ -411,7 +411,7 @@ static void ov6_02248498 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     NARC * v2;
 
     memset(v0, 0, sizeof(UnkStruct_ov6_02248498));
-    GF_ExpHeap_FndInitAllocator(&v0->unk_1B8, 4, 32);
+    Heap_FndInitAllocatorForExpHeap(&v0->unk_1B8, 4, 32);
 
     v2 = NARC_ctor(141, 4);
 
@@ -615,7 +615,7 @@ static void ov6_022487F8 (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     NARC * v2;
 
     memset(v0, 0, sizeof(UnkStruct_ov6_022487F8));
-    GF_ExpHeap_FndInitAllocator(&v0->unk_CFC, 4, 32);
+    Heap_FndInitAllocatorForExpHeap(&v0->unk_CFC, 4, 32);
 
     v2 = NARC_ctor(141, 4);
 
@@ -648,7 +648,7 @@ static void ov6_0224889C (UnkStruct_ov5_021D1BEC * param0, UnkStruct_0203CDB0 *
     sub_02017110(&v0->unk_00);
 
     for (v1 = 0; v1 < 4; v1++) {
-        FreeToHeap(v0->unk_CD0[v1]);
+        Heap_FreeToHeap(v0->unk_CD0[v1]);
     }
 }
 

src/overlay006/ov6_02248948.c

@@ -54,7 +54,7 @@ static void ov6_02248948 (UnkStruct_0201CD38 * param0, void * param1)
     case 1:
         Unk_ov6_02249834[v0->unk_0C](v0->unk_00);
         *v0->unk_04 = 1;
-        FreeToHeap(v0);
+        Heap_FreeToHeap(v0);
         sub_0200DA58(param0);
         break;
     }
@@ -62,7 +62,7 @@ static void ov6_02248948 (UnkStruct_0201CD38 * param0, void * param1)
 
 void ov6_0224899C (UnkStruct_0203CDB0 * param0, u16 * param1, u32 param2, u32 param3)
 {
-    UnkStruct_ov6_02248948 * v0 = AllocFromHeap(param3, sizeof(UnkStruct_ov6_02248948));
+    UnkStruct_ov6_02248948 * v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov6_02248948));
 
     memset(v0, 0, sizeof(UnkStruct_ov6_02248948));
 

src/overlay006/ov6_022489E4.c

@@ -101,7 +101,7 @@ BOOL ov6_02248AF0 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_0207
     int v2;
 
     v1 = sub_02073C70();
-    v0 = AllocFromHeap(20, v1 + 1);
+    v0 = Heap_AllocFromHeap(20, v1 + 1);
     MI_CpuCopy8(param2, v0, v1);
     v0[v1] = param1;
 
@@ -111,7 +111,7 @@ BOOL ov6_02248AF0 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_0207
         v2 = 0;
     }
 
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
     return v2;
 }
 
@@ -180,7 +180,7 @@ BOOL ov6_02248BE8 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_ov6_
     int v2;
 
     v1 = sizeof(UnkStruct_ov6_02248BE8);
-    v0 = AllocFromHeap(20, v1 + 1);
+    v0 = Heap_AllocFromHeap(20, v1 + 1);
     MI_CpuCopy8(param2, v0, v1);
     v0[v1] = param1;
 
@@ -190,7 +190,7 @@ BOOL ov6_02248BE8 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_ov6_
         v2 = 0;
     }
 
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
     return v2;
 }
 
@@ -222,7 +222,7 @@ BOOL ov6_02248C68 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_0209
 
     v4 = param2;
     v1 = sizeof(UnkStruct_020954F0) * (1 + 2) + 1;
-    v0 = AllocFromHeap(20, v1);
+    v0 = Heap_AllocFromHeap(20, v1);
 
     for (v3 = 0; v3 < (1 + 2); v3++) {
         MI_CpuCopy8(v4, &v0[sizeof(UnkStruct_020954F0) * v3], sizeof(UnkStruct_020954F0));
@@ -237,7 +237,7 @@ BOOL ov6_02248C68 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_0209
         v2 = 0;
     }
 
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
     return v2;
 }
 
@@ -272,7 +272,7 @@ BOOL ov6_02248CE8 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_0202
 
     sub_02023DF0(param2, v4, 8);
 
-    v2 = AllocFromHeap(20, v0 + v1);
+    v2 = Heap_AllocFromHeap(20, v0 + v1);
     MI_CpuCopy8(v4, &v2[v1], v0);
     v2[0] = param1;
     v2[1] = v0;
@@ -285,7 +285,7 @@ BOOL ov6_02248CE8 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_0202
         v3 = 0;
     }
 
-    FreeToHeap(v2);
+    Heap_FreeToHeap(v2);
     return v3;
 }
 
@@ -356,7 +356,7 @@ BOOL ov6_02248DD8 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_ov6_
     int v2;
 
     v1 = sizeof(UnkStruct_ov6_02248DD8);
-    v0 = AllocFromHeap(20, v1 + 1);
+    v0 = Heap_AllocFromHeap(20, v1 + 1);
     MI_CpuCopy8(param2, v0, v1);
     v0[v1] = param1;
 
@@ -366,6 +366,6 @@ BOOL ov6_02248DD8 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_ov6_
         v2 = 0;
     }
 
-    FreeToHeap(v0);
+    Heap_FreeToHeap(v0);
     return v2;
 }

src/overlay007/ov7_02249960.c

@@ -191,7 +191,7 @@ static void ov7_02249AB4 (UnkStruct_0203CDB0 * param0)
 
     GF_ASSERT((Unk_ov7_0224F5A0 == NULL));
 
-    Unk_ov7_0224F5A0 = AllocFromHeap(4, sizeof(UnkStruct_ov7_02249C2C));
+    Unk_ov7_0224F5A0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov7_02249C2C));
     MI_CpuFill8(Unk_ov7_0224F5A0, 0, sizeof(UnkStruct_ov7_02249C2C));
 
     Unk_ov7_0224F5A0->unk_88 = 0;
@@ -227,7 +227,7 @@ static void ov7_02249B98 (void)
         sub_020237BC(Unk_ov7_0224F5A0->unk_00[v0]);
     }
 
-    FreeToHeap(Unk_ov7_0224F5A0->unk_7C);
+    Heap_FreeToHeap(Unk_ov7_0224F5A0->unk_7C);
 
     if (Unk_ov7_0224F5A0->unk_50) {
         sub_0200B3F0(Unk_ov7_0224F5A0->unk_50);
@@ -250,7 +250,7 @@ static void ov7_02249B98 (void)
         sub_0201A8FC(&Unk_ov7_0224F5A0->unk_40);
     }
 
-    FreeToHeap(Unk_ov7_0224F5A0);
+    Heap_FreeToHeap(Unk_ov7_0224F5A0);
     Unk_ov7_0224F5A0 = NULL;
 }
 

src/overlay007/ov7_0224B4E8.c

@@ -431,7 +431,7 @@ static void ov7_0224BBA0 (UnkStruct_ov7_0224B4E8 * param0)
 
 static BOOL ov7_0224BBC4 (UnkStruct_ov7_0224B4E8 * param0)
 {
-    Party * v0 = GetPartyFromSavedata(param0->unk_10->unk_0C);
+    Party * v0 = Party_GetFromSavedata(param0->unk_10->unk_0C);
     int v1 = sub_0207A594(param0->unk_10->unk_B0, v0, param0->unk_6C);
     int v2;
 
@@ -548,7 +548,7 @@ static BOOL ov7_0224BC74 (UnkStruct_020508D4 * param0)
         sub_020237BC(v1->unk_1C);
         sub_020237BC(v1->unk_20);
         sub_0207A2C0(v1->unk_6C);
-        FreeToHeap(v1);
+        Heap_FreeToHeap(v1);
         return 1;
     default:
         return 1;
@@ -559,7 +559,7 @@ static BOOL ov7_0224BC74 (UnkStruct_020508D4 * param0)
 
 static UnkStruct_ov7_0224B4E8 * ov7_0224BE10 (UnkStruct_0203CDB0 * param0)
 {
-    UnkStruct_ov7_0224B4E8 * v0 = AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov7_0224B4E8));
+    UnkStruct_ov7_0224B4E8 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov7_0224B4E8));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_ov7_0224B4E8));
 

src/overlay007/ov7_0224BE9C.c

@@ -33,7 +33,7 @@
 #include "unk_02001AF4.h"
 #include "unk_02002B7C.h"
 #include "unk_02005474.h"
-#include "filesystem.h"
+#include "narc.h"
 #include "unk_020093B4.h"
 #include "unk_02009714.h"
 #include "unk_0200A328.h"
@@ -188,7 +188,7 @@ static void ov7_0224CCF4(UnkStruct_02029D04 * param0, UnkStruct_0207D3C0 * param
 
 UnkStruct_ov7_0224BEFC * ov7_0224BE9C (u32 param0, UnkStruct_021C0794 * param1, UnkStruct_02018340 * param2)
 {
-    UnkStruct_ov7_0224BEFC * v0 = AllocFromHeap(param0, sizeof(UnkStruct_ov7_0224BEFC));
+    UnkStruct_ov7_0224BEFC * v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov7_0224BEFC));
 
     memset(v0, 0, sizeof(UnkStruct_ov7_0224BEFC));
 
@@ -214,7 +214,7 @@ void ov7_0224BEFC (UnkStruct_ov7_0224BEFC * param0)
     ov7_0224C3E0(param0);
 
     memset(param0, 0, sizeof(UnkStruct_ov7_0224BEFC));
-    FreeToHeap(param0);
+    Heap_FreeToHeap(param0);
 }
 
 BOOL ov7_0224BF2C (UnkStruct_ov7_0224BEFC * param0)