Rename sa2__gUnknown_03002710 -> gOamMallocCopiedOrder

include/core.h

@@ -237,8 +237,8 @@ extern union MultiSioData gMultiSioRecv[4];
 extern u32 gMultiSioStatusFlags;
 extern bool8 gMultiSioEnabled;
 
-extern HBlankFunc gHBlankIntrs[4];
-extern HBlankFunc gHBlankCallbacks[4];
+extern HBlankIntrFunc gHBlankIntrs[4];
+extern HBlankIntrFunc gHBlankCallbacks[4];
 extern u8 gNumHBlankCallbacks;
 extern u8 gNumHBlankIntrs;
 
@@ -367,7 +367,7 @@ extern u16 sa2__gUnknown_03005394;
 extern u16 sa2__gUnknown_03005398;
 extern IntrFunc gVBlankIntrs[4];
 extern s32 gPseudoRandom;
-extern u8 sa2__gUnknown_03002710[128];
+extern u8 gOamMallocCopiedOrder[128];
 extern struct MultiBootParam gMultiBootParam;
 
 extern const struct SpriteTables *gRefSpriteTables;

include/global.h

@@ -345,7 +345,7 @@ typedef struct {
 } BgAffineReg;
 
 // TODO: Find better place for this
-typedef void (*HBlankFunc)(int_vcount vcount);
+typedef void (*HBlankIntrFunc)(int_vcount vcount);
 typedef void (*IntrFunc)(void);
 typedef bool32 (*VBlankFunc)(void);
 

src/core.c

@@ -78,13 +78,13 @@ OamData gOamMallocBuffer[OAM_ENTRY_COUNT] ALIGNED(16) = {};
 s16 gMosaicReg = 0;
 #endif
 
-HBlankFunc gHBlankCallbacks[4] ALIGNED(16) = {};
+HBlankIntrFunc gHBlankCallbacks[4] ALIGNED(16) = {};
 struct Task *gCurTask = NULL;
 u8 sLastCalledVblankFuncId = 0;
 u8 gKeysFirstRepeatIntervals[10] ALIGNED(16) = {};
 
 u16 gReleasedKeys ALIGNED(4) = 0;
-u8 sa2__gUnknown_03002710[] ALIGNED(16) = {};
+u8 gOamMallocCopiedOrder[] ALIGNED(16) = {};
 u32 gFlagsPreVBlank = 0;
 /* 0x03002794 */ const struct SpriteTables *gRefSpriteTables = NULL;
 
@@ -118,7 +118,7 @@ struct MultiBootParam gMultiBootParam ALIGNED(8) = {};
 u16 gPressedKeys ALIGNED(4) = 0;
 u8 gOamFirstPausedIndex ALIGNED(4) = 0;
 u8 gBackgroundsCopyQueueCursor ALIGNED(4) = 0;
-HBlankFunc gHBlankIntrs[4] ALIGNED(16) = {};
+HBlankIntrFunc gHBlankIntrs[4] ALIGNED(16) = {};
 
 u8 gIwramHeap[TASK_HEAP_SIZE] = {};
 
@@ -466,7 +466,7 @@ void UpdateScreenDma(void)
         REG_IE |= INTR_FLAG_HBLANK;
         DmaFill32(3, 0, gHBlankIntrs, sizeof(gHBlankIntrs));
         if (gNumHBlankCallbacks != 0) {
-            DmaCopy32(3, gHBlankCallbacks, gHBlankIntrs, gNumHBlankCallbacks * sizeof(HBlankFunc));
+            DmaCopy32(3, gHBlankCallbacks, gHBlankIntrs, gNumHBlankCallbacks * sizeof(HBlankIntrFunc));
         }
         gNumHBlankIntrs = gNumHBlankCallbacks;
     } else {

src/sprite.c

@@ -987,7 +987,7 @@ void CopyOamBufferToOam(void)
 
         while (index != -1) {
             u8 newI;
-            u8 *byteArray = SA2_LABEL(gUnknown_03002710);
+            u8 *byteArray = gOamMallocCopiedOrder;
             DmaCopy16(3, &gOamMallocBuffer[index], dstOam, sizeof(OamDataShort));
             dstOam++;