diff --git a/include/macros.h b/include/macros.h
index e0d6bc8765..92bb3f9191 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -1,7 +1,7 @@
 #ifndef _MACROS_H_
 #define _MACROS_H_
 
-#include "common.h"
+#include "types.h"
 #include "include_asm.h"
 
 #ifndef M2CTX
diff --git a/src/26840_len_20d0.c b/src/26840_len_20d0.c
index b273f3f46c..5ef89b522f 100644
--- a/src/26840_len_20d0.c
+++ b/src/26840_len_20d0.c
@@ -139,7 +139,7 @@ s32 func_8004B9E4(SoundManager* manager, s32 arg1) {
                 manager->unk_8C = a1;
                 manager->soundData->unk_40[1].unk_00 = 6;
                 manager->soundData->unk_40[1].unk_01 = 1;
-                D_8007F1F8 = manager->unk_64[a1];
+                D_8007F1F8[0] = manager->unk_64[a1];
             }
             manager->unk_8D = manager->unk_84[a1];
         } else {
diff --git a/src/341d0.c b/src/341d0.c
index ee4062ba12..d61aea5ca2 100644
--- a/src/341d0.c
+++ b/src/341d0.c
@@ -37,21 +37,13 @@ s32 D_8007F1D0[] = {
     0x00000000
 };
 
-s32 D_8007F1F8[] = {
-    D_8007F1D0
-};
+s32* D_8007F1F8 = D_8007F1D0;
 
-s32 D_8007F1FC[] = {
-    D_8007F1D0
-};
+s32* D_8007F1FC = D_8007F1D0;
 
-s32 D_8007F200[] = {
-    D_8007F1D0
-};
+s32* D_8007F200 = D_8007F1D0;
 
-s32 D_8007F204[] = {
-    D_8007F1D0, 0x00000000, 0x00000000
-};
+s32* D_8007F204 = D_8007F1D0;
 
 INCLUDE_ASM(s32, "341d0", func_80058DD0);
 
diff --git a/src/audio.h b/src/audio.h
index 17ed263605..401671d4be 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -554,7 +554,7 @@ extern UnkAl0* D_80078E54;
 extern s8 D_80078E58;
 extern s16 D_80078E5A;
 extern s8 D_80078E5C;
-extern s32* D_8007F1F8; // points to 80078290
+extern s32 D_8007F1F8[1]; // points to 80078290
 
 extern UnkAl19E0* D_8009A5C0;
 extern BGMPlayer* D_8009A5CC;
diff --git a/src/battle/battle.c b/src/battle/battle.c
index eada42fc4a..7e7e280050 100644
--- a/src/battle/battle.c
+++ b/src/battle/battle.c
@@ -511,3 +511,5 @@ void load_demo_battle(u32 index) {
     gOverrideFlags &= ~0x8;
     load_battle(battleID);
 }
+
+static const f32 padding[] = { 0.0f, 0.0f };
diff --git a/src/bss.c b/src/bss.c
new file mode 100644
index 0000000000..de3820b00d
--- /dev/null
+++ b/src/bss.c
@@ -0,0 +1,386 @@
+#include "types.h"
+
+// This file exists to enforce the order of BSS symbols, since they were reordered in the original rom.
+
+#ifndef M2CTX
+#define BSS __attribute__ ((section (".bss")))
+#else
+#define BSS static
+#endif
+
+BSS u8 nuScPreNMIFlag;
+BSS char D_8009A5B4[0x4];
+BSS s32 D_8009A5B8;
+BSS char D_8009A5BC[0x4];
+BSS s32 D_8009A5C0;
+BSS char D_8009A5C4[0x4];
+BSS s32 D_8009A5C8;
+BSS s32 D_8009A5CC;
+BSS s32 D_8009A5D0;
+BSS s32 D_8009A5D4;
+BSS s32 timeFreezeMode;
+BSS s32 nuGfxZBuffer;
+BSS u32 nuContDataLockKey;
+BSS s32 D_8009A5E4;
+BSS s32 D_8009A5E8;
+BSS float D_8009A5EC;
+BSS u32 nuGfxCfbCounter;
+BSS s32 mdl_currentModelTreeNodeInfo;
+BSS u32 nuGfxDisplay;
+BSS s32 D_8009A5FC;
+BSS s32 gGameState;
+BSS s16 gNpcCount;
+BSS s16 D_8009A606;
+BSS s32 D_8009A608;
+BSS s32 D_8009A60C;
+BSS s32 nuGfxUcode;
+BSS u32 nuContNum;
+BSS u32 nuGfxTaskSpool;
+BSS u8 D_8009A61C;
+BSS s32 D_8009A620;
+BSS char D_8009A624[0x4];
+BSS s32 D_8009A628;
+BSS s32 D_8009A62C;
+BSS s32 D_8009A630;
+BSS s16 gCurrentCamID;
+BSS s32 nuPiCartHandle;
+BSS s32 D_8009A63C;
+BSS s32 D_8009A640;
+BSS char D_8009A644[0x8];
+BSS s32 nuGfxCfb_ptr;
+BSS s32 gOverrideFlags;
+BSS s8 D_8009A654;
+BSS s32* nuGfxCfb;
+BSS char D_8009A65C[0x4];
+BSS s32 D_8009A660;
+BSS s32 D_8009A664;
+BSS s16 D_8009A668;
+BSS s32 gMasterGfxPos;
+BSS s32 D_8009A670;
+BSS s32 gDisplayContext;
+BSS s32 D_8009A678;
+BSS char D_8009A67C[0x4];
+BSS s32 D_8009A680;
+BSS char D_8009A684[0xC];
+BSS s16 D_8009A690;
+BSS char D_8009A694[0xC];
+BSS u16 D_8009A6A0;
+BSS u16 D_8009A6A2;
+BSS u16 D_8009A6A4;
+BSS u16 D_8009A6A6;
+BSS char D_8009A6A8[0x8];
+BSS s8 D_8009A6B0[0x1380];
+BSS s32 logicalSaveInfo[4][2];
+BSS s32 physicalSaveInfo[6][2];
+BSS s32 nextAvailableSavePage;
+BSS char D_8009BA84[0xC];
+BSS float gCurtainScale;
+BSS float gCurtainScaleGoal;
+BSS float gCurtainFade;
+BSS float gCurtainFadeGoal;
+BSS UNK_FUN_PTR(gCurtainDrawCallback);
+BSS char D_8009BAA4[0x4];
+BSS s8 D_8009BAA8[0x40 * 2];
+BSS char D_8009BA28[0x8];
+BSS s8 gCrashScreen[0x9E0];
+BSS s32 nuGfxTask_ptr;
+BSS s16 taskDoneMsg;
+BSS s16 swapBufMsg;
+BSS s8 GfxTaskMgrThread[0x21B0];
+BSS char D_8009E6C8[0x8];
+BSS s32 D_8009E6D0[8];
+BSS s32 nuSiMesgBuf[8];
+BSS s8 siMgrThread[0x21B0];
+BSS s8 blendedCamSettings[0x1C];
+BSS float D_800A08DC;
+BSS float D_800A08E0;
+BSS s32 D_800A08E4;
+BSS s32 D_800A08E8;
+BSS s32 D_800A08EC;
+BSS s16 gameMode;
+BSS char D_800A08F4[0xC];
+BSS s8 D_800A0900;
+BSS s32 D_800A0904;
+BSS s32 D_800A0908;
+BSS char D_800A090C[0x4];
+BSS s32 D_800A0910;
+BSS s32 D_800A0914;
+BSS s32 D_800A0918;
+BSS s32 D_800A091C;
+BSS s8 D_800A0920;
+BSS s8 D_800A0921;
+BSS s16 D_800A0922;
+BSS s32 D_800A0924;
+BSS char D_800A0928[0x8];
+BSS s8 D_800A0930;
+BSS s8 D_800A0931;
+BSS s16 D_800A0932;
+BSS char D_800A0934[0xC];
+BSS s16 gMapTransitionAlpha;
+BSS s16 D_800A0942;
+BSS s16 D_800A0944;
+BSS s16 D_800A0946;
+BSS s16 D_800A0948;
+BSS char D_800A094C[0x4];
+BSS s32 D_800A0950;
+BSS s16 D_800A0954;
+BSS s16 D_800A0956;
+BSS s16 D_800A0958;
+BSS s8 D_800A095A;
+BSS u8 D_800A095B;
+BSS s8 D_800A095C;
+BSS u8 D_800A095D;
+BSS s8 D_800A095E;
+BSS u8 D_800A095F;
+BSS s8 D_800A0960[3];
+BSS u8 D_800A0963;
+BSS s32 D_800A0964;
+BSS char D_800A0968[0x8];
+BSS s32 D_800A0970;
+BSS s32 D_800A0974;
+BSS s32 D_800A0978;
+BSS s32 D_800A097C;
+BSS s32 D_800A0980;
+BSS char D_800A0984[0x4];
+BSS s32 D_800A0988;
+BSS char D_800A098C[0x4];
+BSS s8 gWorldNpcList[0x100];
+BSS s8 gBattleNpcList[0x100];
+BSS s32 gCurrentNpcListPtr;
+BSS s8 D_800A0B94;
+BSS char D_800A0B98[0x8];
+BSS s32 D_800A0BA0;
+BSS float D_800A0BA4;
+BSS s32 D_800A0BA8;
+BSS s32 D_800A0BAC;
+BSS s32 D_800A0BB0;
+BSS s32 D_800A0BB4;
+BSS s16 D_800A0BB8;
+BSS char D_800A0BBC[0x4];
+BSS s8 D_800A0BC0[32 * 0x1C];
+BSS s32 D_800A0F40;
+BSS s32 D_800A0F44;
+BSS char D_800A0F48[0x8];
+BSS u16 D_800A0F50;
+BSS char D_800A0F54[0x4];
+BSS s8 D_800A0F58[0x25B8];
+BSS s32 D_800A3510;
+BSS char D_800A3514[0xC];
+BSS s32 D_800A3520;
+BSS char D_800A3524[0x104];
+BSS s8 D_800A3628[0xC];
+BSS s16 nuAuFrameSampleSize;
+BSS s32 D_800A3638;
+BSS char D_800A363C[0x4];
+BSS s32 D_800A3640;
+BSS char D_800A3644[0x14];
+BSS s8 D_800A3658[0xC8];
+BSS s8 D_800A3720[0x4B0];
+BSS s32 nuAuDmaState;
+BSS s32 D_800A3BD4;
+BSS char D_800A3BD8[0x8];
+BSS s32 nuAuDmaBuf;
+BSS char D_800A3BE4[0xC];
+BSS s8 D_800A3BF0[0x3E0];
+BSS s32 D_800A3FD0;
+BSS char D_800A3FD4[0xC];
+BSS s32 D_800A3FE0;
+BSS s32 D_800A3FE4;
+BSS s32 D_800A3FE8;
+BSS s8 D_800A3FEC;
+BSS s16 D_800A3FEE;
+BSS s32 D_800A3FF0;
+BSS char D_800A3FF4[0xC];
+BSS s8 gEffectGraphicsData[15 * 0x1D];
+BSS char D_800A41B4[0xC];
+BSS s32 D_800A41C0;
+BSS char D_800A41C4[0x1C];
+BSS s32 gMap;
+BSS char D_800A41E4[0x4];
+BSS s32 gMapConfig;
+BSS char D_800A41EC[0x44];
+BSS float D_800A4230;
+BSS float D_800A4234;
+BSS float D_800A4238;
+BSS float D_800A423C;
+BSS s32 D_800A4240;
+BSS float D_800A4244;
+BSS s32 D_800A4248;
+BSS s32 D_800A424C;
+BSS s32 D_800A4250;
+BSS float D_800A4254;
+BSS s32 D_800A4258;
+BSS s32 D_800A425C;
+BSS s32 D_800A4260;
+BSS s32 D_800A4264;
+BSS s32 D_800A4268;
+BSS char D_800A426C[0x4];
+BSS s8 D_800A4270[0x1B0];
+BSS s8 D_800A4420[0x21B0];
+BSS s8 nuScStack[0x2000];
+BSS s8 nuScAudioStack[0x2000];
+BSS s8 nuScGraphicsStack[0x2000];
+BSS s32 D_800AC5D0;
+BSS char D_800AC5D4[0x14];
+BSS s8 D_800AC5E8[0xC8];
+BSS s8 nuGfxMesgBuf[0x2020];
+BSS s32 nuContWaitMesgBuf;
+BSS s32 nuContDataMutexBuf;
+BSS char D_800AC6D8[0x8];
+BSS s8 piMgrThread[0x11B0];
+BSS s32 __osPiMesgQueue;
+BSS char D_800AF890[0x14];
+BSS s32 piMgrMesgBuff;
+BSS char D_800AF8AC[0x4];
+BSS s32 D_800AF8B0;
+BSS char D_800AF8B4[0xC];
+BSS s32 D_800AF8C0;
+BSS s32 D_800AF8C4;
+BSS char D_800AF8C8[0x8];
+BSS s32 D_800AF8D0;
+BSS char D_800AF8D4[0x4];
+BSS s32 D_800AF8D8;
+BSS s32 D_800AF8DC;
+BSS s32 D_800AF8E0;
+BSS char D_800AF8E4[0x4];
+BSS s32 D_800AF8E8;
+BSS s32 D_800AF8EC;
+BSS s32 D_800AF8F0;
+BSS char D_800AF8F4[0x4];
+BSS s32 D_800AF8F8;
+BSS s32 D_800AF8FC;
+BSS s32 D_800AF900;
+BSS char D_800AF904[0xC];
+BSS s32 D_800AF910;
+BSS char D_800AF914[0x4];
+BSS s32 D_800AF918;
+BSS char D_800AF91C[0x11B4];
+BSS s32 D_800B0AD0;
+BSS char D_800B0AD4[0x14];
+BSS s32 D_800B0AE8;
+BSS char D_800B0AEC[0x14];
+BSS s16 D_800B0B00;
+BSS s16 D_800B0B02;
+BSS s32 D_800B0B04;
+BSS char D_800B0B08[0x10];
+BSS s16 D_800B0B18;
+BSS s16 D_800B0B1A;
+BSS s32 D_800B0B1C;
+BSS char D_800B0B20[0x10];
+BSS s32 D_800B0B30;
+BSS char D_800B0B34[0x38];
+BSS s32 D_800B0B6C;
+BSS char D_800B0B70[0xC0];
+BSS s32 __osFlashID;
+BSS char D_800B0C34[0xC];
+BSS s32 __osFlashMsg;
+BSS char D_800B0C44[0x14];
+BSS s32 __osFlashMessageQ;
+BSS char D_800B0C5C[0x14];
+BSS s32 __osFlashHandler;
+BSS char D_800B0C74[0x70];
+BSS s32 __osFlashMsgBuf;
+BSS s32 __osFlashVersion;
+BSS char D_800B0CEC[0x4];
+BSS s32 wMapTexName;
+BSS char D_800B0CF4[0x14];
+BSS s32 D_800B0D08;
+BSS char D_800B0D0C[0x1AC];
+BSS s32 nuContWaitMesgQ;
+BSS char D_800B0EBC[0x14];
+BSS s32 D_800B0ED0;
+BSS char D_800B0ED4[0x34];
+BSS s32 D_800B0F08;
+BSS s32 D_800B0F0C;
+BSS s8 gCurrentEncounter[0xBF8];
+BSS s32 LeoDiskHandle;
+BSS s8 D_800B1B0C;
+BSS s8 D_800B1B0D;
+BSS s8 D_800B1B0E;
+BSS s8 D_800B1B0F;
+BSS s32 D_800B1B10;
+BSS char D_800B1B14[0x68];
+BSS s32 nuContStatus[5];
+BSS s8 D_800B1B90[0x1B0];
+BSS s8 nuContRmbCtl[0x28];
+BSS s8 nuContData[0x18];
+BSS s8 gCameras[4 * 0x958];
+BSS s32 gCollisionData;
+BSS char D_800B42E4[0xC];
+BSS s32 nuGfxMesgQ;
+BSS char D_800B42F4[0x14];
+BSS s32 D_800B4308;
+BSS s8 D_800B430C;
+BSS s8 D_800B430D;
+BSS s8 D_800B430E;
+BSS s8 D_800B430F;
+BSS s8 D_800B4310;
+BSS s8 D_800B4311;
+BSS s32 D_800B4314;
+BSS s32 D_800B4318;
+BSS char D_800B431C[0x64];
+BSS s32 gOsPiMessageQueue;
+BSS char D_800B4384[0x14];
+BSS s32 gEffectInstances[96];
+BSS s32 CartRomHandle;
+BSS s8 D_800B451C;
+BSS s8 D_800B451D;
+BSS s8 D_800B451E;
+BSS s8 D_800B451F;
+BSS s8 D_800B4520[0x2070];
+BSS s8 D_800B6590[0x2000];
+BSS u8 nuYieldBuf[0xC10];
+BSS s8 D_800B91A0[0x30];
+BSS s8 D_800B91D0[0x20000];
+BSS s32 D_800D91D0;
+BSS s32 D_800D91D4;
+BSS char D_800D91D8[0x4];
+BSS s16 D_800D91DC;
+BSS s8 wMapHitName[0x18];
+BSS s8 nuSiMgrMesgQ[0x38];
+BSS s8 wMapShapeName[0x18];
+BSS s8 D_800D9248[0x30];
+BSS s8 nuGfxTask[10 * 0x58];
+BSS s8 D_800D95E8[0x38];
+BSS s8 D_800D9620[0x48];
+BSS s8 D_800D9668[0x18];
+BSS s8 D_800D9680[0x100];
+BSS s8 D_800D9780[0x800];
+BSS s8 D_800D9F80[0x80];
+BSS s8 D_800DA000[0x3C];
+BSS s32 D_800DA03C;
+BSS s8 D_800DA040[0x400];
+BSS s32 nusched;
+BSS s8 D_800DA444[0x38];
+BSS s8 D_800DA47C[0x38];
+BSS s8 D_800DA4B4[0xA8];
+BSS s8 D_800DA55C[0x54C];
+BSS s8 D_800DAAA8[0x10];
+BSS s8 D_800DAAB8[0x5];
+BSS s8 D_800DAABD;
+BSS s8 D_800DAAC0[0x18];
+BSS s8 nuContPfs[0x1A0];
+BSS s8 nuSiMesgQ[0x18];
+BSS s8 D_800DAC90[0x18];
+BSS s8 D_800DACA8[0x18];
+BSS s8 gCurrentSaveFile[0x1380];
+BSS s8 nuContDataMutexQ[0x20];
+BSS s32 D_800DC060;
+BSS s32 D_800DC064;
+BSS s32 gBattleState;
+BSS char D_800DC06C[0x4];
+BSS s8 gBattleStatus[0x460];
+BSS s32 D_800DC4D0;
+BSS s32 D_800DC4D4;
+BSS s32 D_800DC4D8;
+BSS s32 gBattleState2;
+BSS s32 D_800DC4E0;
+BSS s32 D_800DC4E4;
+BSS s16 D_800DC4E8;
+BSS u8 gCurrentBattleSection;
+BSS u8 D_800DC4EB;
+BSS s32 D_800DC4EC;
+BSS s32 D_800DC4F0;
+BSS s32 D_800DC4F4;
+BSS s32 D_800DC4F8;
+BSS s32 D_800DC4FC;
diff --git a/src/crash_screen.c b/src/crash_screen.c
index 1e7552a272..a2dc69fcf4 100644
--- a/src/crash_screen.c
+++ b/src/crash_screen.c
@@ -199,7 +199,7 @@ void crash_screen_print_fpcsr(u32 value) {
         if (value & flag) {
             crash_screen_printf(132, 155, "(%s)", gFPCSRFaultCauses[i]);
             break;
-            
+
             do {} while (0);
         }
 
diff --git a/src/os/nusys/nuContMgr.c b/src/os/nusys/nuContMgr.c
index 292aa90f63..a5db49ee4f 100644
--- a/src/os/nusys/nuContMgr.c
+++ b/src/os/nusys/nuContMgr.c
@@ -24,6 +24,7 @@ NUCallBackList nuContCallBack = {
     0,
 };
 
+// BSS
 extern OSMesg nuContWaitMesgBuf;
 extern OSMesg nuContDataMutexBuf;
 extern OSMesgQueue nuContDataMutexQ;
diff --git a/src/os/nusys/nuGfxThread.c b/src/os/nusys/nuGfxThread.c
index d5b6eaa39e..231759cf72 100644
--- a/src/os/nusys/nuGfxThread.c
+++ b/src/os/nusys/nuGfxThread.c
@@ -3,7 +3,7 @@
 
 void gfxThread(void);
 
-extern s32 nuContWaitMesgBuf;
+extern OSMesg nuContWaitMesgBuf;
 extern OSThread D_800B1B90;
 extern OSMesg nuGfxMesgBuf[NU_GFX_MESGS];
 
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index d5ff9ed3c6..781a8f4372 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -41,6 +41,7 @@ segments:
     start: 0x1000
     vram: 0x80025C00
     subsegments:
+    - [0x1000, c, bss]
     - [0x1000, hasm, entry_point]
     - [0x1060, c, is_debug]
     - [0x1370, c, main]
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index ea047f419b..5257037c3d 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -18589,7 +18589,6 @@ D_800B4314 = 0x800B4314; // type:data
 D_800B4318 = 0x800B4318; // type:data
 gOsPiMessageQueue = 0x800B4380; // type:data
 gEffectInstances = 0x800B4398; // type:data
-D_800B4514 = 0x800B4514; // type:data
 CartRomHandle = 0x800B4518; // type:data
 D_800B451C = 0x800B451C; // type:data
 D_800B451D = 0x800B451D; // type:data
diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt
index 65c6252b5b..bce55c200e 100644
--- a/ver/us/undefined_syms.txt
+++ b/ver/us/undefined_syms.txt
@@ -1298,320 +1298,8 @@ D_09001358 = 0x09001358;
 D_09001430 = 0x09001430;
 D_09001508 = 0x09001508;
 
-// BSS syms found in main overlay
+// BSS syms
 #ifndef NON_MATCHING
-nuScPreNMIFlag = 0x8009A5B0;
-D_8009A5B8 = 0x8009A5B8;
-D_8009A5C0 = 0x8009A5C0;
-D_8009A5C8 = 0x8009A5C8;
-D_8009A5CC = 0x8009A5CC;
-D_8009A5D0 = 0x8009A5D0;
-D_8009A5D4 = 0x8009A5D4;
-timeFreezeMode = 0x8009A5D8;
-nuGfxZBuffer = 0x8009A5DC;
-nuContDataLockKey = 0x8009A5E0;
-D_8009A5E4 = 0x8009A5E4;
-D_8009A5E8 = 0x8009A5E8;
-D_8009A5EC = 0x8009A5EC;
-nuGfxCfbCounter = 0x8009A5F0;
-mdl_currentModelTreeNodeInfo = 0x8009A5F4;
-nuGfxDisplay = 0x8009A5F8;
-D_8009A5FC = 0x8009A5FC;
-gGameState = 0x8009A600;
-gNpcCount = 0x8009A604;
-D_8009A606 = 0x8009A606;
-D_8009A608 = 0x8009A608;
-D_8009A60C = 0x8009A60C;
-nuGfxUcode = 0x8009A610;
-nuContNum = 0x8009A614;
-nuGfxTaskSpool = 0x8009A618;
-D_8009A61C = 0x8009A61C;
-D_8009A620 = 0x8009A620;
-D_8009A628 = 0x8009A628;
-D_8009A62C = 0x8009A62C;
-D_8009A630 = 0x8009A630;
-gCurrentCamID = 0x8009A634;
-nuPiCartHandle = 0x8009A638;
-D_8009A63C = 0x8009A63C;
-D_8009A640 = 0x8009A640;
-nuGfxCfb_ptr = 0x8009A64C;
-gOverrideFlags = 0x8009A650;
-D_8009A654 = 0x8009A654;
-nuGfxCfb = 0x8009A658;
-D_8009A660 = 0x8009A660;
-D_8009A664 = 0x8009A664;
-D_8009A668 = 0x8009A668;
-gMasterGfxPos = 0x8009A66C;
-D_8009A670 = 0x8009A670;
-gDisplayContext = 0x8009A674;
-D_8009A678 = 0x8009A678;
-D_8009A680 = 0x8009A680;
-D_8009A690 = 0x8009A690;
-D_8009A6A0 = 0x8009A6A0;
-D_8009A6A2 = 0x8009A6A2;
-D_8009A6A4 = 0x8009A6A4;
-D_8009A6A6 = 0x8009A6A6;
-D_8009A6B0 = 0x8009A6B0;
-logicalSaveInfo = 0x8009BA30;
-physicalSaveInfo = 0x8009BA50;
-nextAvailableSavePage = 0x8009BA80;
-gCurtainScale = 0x8009BA90;
-gCurtainScaleGoal = 0x8009BA94;
-gCurtainFade = 0x8009BA98;
-gCurtainFadeGoal = 0x8009BA9C;
-gCurtainDrawCallback = 0x8009BAA0;
-D_8009BAA8 = 0x8009BAA8;
-gCrashScreen = 0x8009BB30;
-nuGfxTask_ptr = 0x8009C510;
-taskDoneMsg = 0x8009C514;
-swapBufMsg = 0x8009C516;
-GfxTaskMgrThread = 0x8009C518;
-D_8009E6D0 = 0x8009E6D0;
-nuSiMesgBuf = 0x8009E6F0;
-siMgrThread = 0x8009E710;
-blendedCamSettings = 0x800A08C0;
-D_800A08DC = 0x800A08DC;
-D_800A08E0 = 0x800A08E0;
-D_800A08E4 = 0x800A08E4;
-D_800A08E8 = 0x800A08E8;
-D_800A08EC = 0x800A08EC;
-gameMode = 0x800A08F0;
-D_800A0900 = 0x800A0900;
-D_800A0904 = 0x800A0904;
-D_800A0908 = 0x800A0908;
-D_800A0910 = 0x800A0910;
-D_800A0914 = 0x800A0914;
-D_800A0918 = 0x800A0918;
-D_800A091C = 0x800A091C;
-D_800A0920 = 0x800A0920;
-D_800A0921 = 0x800A0921;
-D_800A0922 = 0x800A0922;
-D_800A0924 = 0x800A0924;
-D_800A0930 = 0x800A0930;
-D_800A0931 = 0x800A0931;
-D_800A0932 = 0x800A0932;
-gMapTransitionAlpha = 0x800A0940;
-D_800A0942 = 0x800A0942;
-D_800A0944 = 0x800A0944;
-D_800A0946 = 0x800A0946;
-D_800A0948 = 0x800A0948;
-D_800A0950 = 0x800A0950;
-D_800A0954 = 0x800A0954;
-D_800A0956 = 0x800A0956;
-D_800A0958 = 0x800A0958;
-D_800A095A = 0x800A095A;
-D_800A095B = 0x800A095B;
-D_800A095C = 0x800A095C;
-D_800A095D = 0x800A095D;
-D_800A095E = 0x800A095E;
-D_800A095F = 0x800A095F;
-D_800A0960 = 0x800A0960;
-D_800A0963 = 0x800A0963;
-D_800A0964 = 0x800A0964;
-D_800A0970 = 0x800A0970;
-D_800A0974 = 0x800A0974;
-D_800A0978 = 0x800A0978;
-D_800A097C = 0x800A097C;
-D_800A0980 = 0x800A0980;
-D_800A0988 = 0x800A0988;
-gWorldNpcList = 0x800A0990;
-gBattleNpcList = 0x800A0A90;
-gCurrentNpcListPtr = 0x800A0B90;
-D_800A0B94 = 0x800A0B94;
-D_800A0BA0 = 0x800A0BA0;
-D_800A0BA4 = 0x800A0BA4;
-D_800A0BA8 = 0x800A0BA8;
-D_800A0BAC = 0x800A0BAC;
-D_800A0BB0 = 0x800A0BB0;
-D_800A0BB4 = 0x800A0BB4;
-D_800A0BB8 = 0x800A0BB8;
-D_800A0BC0 = 0x800A0BC0;
-D_800A0F40 = 0x800A0F40;
-D_800A0F44 = 0x800A0F44;
-D_800A0F50 = 0x800A0F50;
-D_800A0F58 = 0x800A0F58;
-D_800A1530 = 0x800A1530;
-D_800A15A4 = 0x800A15A4;
-D_800A15C4 = 0x800A15C4;
-D_800A15CC = 0x800A15CC;
-D_800A3510 = 0x800A3510;
-D_800A3520 = 0x800A3520;
-D_800A3628 = 0x800A3628;
-nuAuFrameSampleSize = 0x800A3634;
-D_800A3638 = 0x800A3638;
-D_800A3640 = 0x800A3640;
-D_800A3658 = 0x800A3658;
-D_800A3720 = 0x800A3720;
-nuAuDmaState = 0x800A3BD0;
-D_800A3BD4 = 0x800A3BD4;
-nuAuDmaBuf = 0x800A3BE0;
-D_800A3BF0 = 0x800A3BF0;
-D_800A3FD0 = 0x800A3FD0;
-D_800A3FE0 = 0x800A3FE0;
-D_800A3FE4 = 0x800A3FE4;
-D_800A3FE8 = 0x800A3FE8;
-D_800A3FEC = 0x800A3FEC;
-D_800A3FEE = 0x800A3FEE;
-D_800A3FF0 = 0x800A3FF0;
-gEffectGraphicsData = 0x800A4000;
-D_800A41C0 = 0x800A41C0;
-gMap = 0x800A41E0;
-gMapConfig = 0x800A41E8;
-D_800A4230 = 0x800A4230;
-D_800A4234 = 0x800A4234;
-D_800A4238 = 0x800A4238;
-D_800A423C = 0x800A423C;
-D_800A4240 = 0x800A4240;
-D_800A4244 = 0x800A4244;
-D_800A4248 = 0x800A4248;
-D_800A424C = 0x800A424C;
-D_800A4250 = 0x800A4250;
-D_800A4254 = 0x800A4254;
-D_800A4258 = 0x800A4258;
-D_800A425C = 0x800A425C;
-D_800A4260 = 0x800A4260;
-D_800A4264 = 0x800A4264;
-D_800A4268 = 0x800A4268;
-D_800A4270 = 0x800A4270;
-D_800A4420 = 0x800A4420;
-nuScStack = 0x800A65D0;
-nuScAudioStack = 0x800A85D0;
-nuScGraphicsStack = 0x800AA5D0;
-D_800AC5D0 = 0x800AC5D0;
-D_800AC5E8 = 0x800AC5E8;
-nuGfxMesgBuf = 0x800AC6B0;
-nuContWaitMesgBuf = 0x800AE6D0;
-nuContDataMutexBuf = 0x800AE6D4;
-piMgrThread = 0x800AE6E0;
-__osPiMesgQueue = 0x800AF890;
-piMgrMesgBuff = 0x800AF8A8;
-D_800AF8B0 = 0x800AF8B0;
-D_800AF8C0 = 0x800AF8C0;
-D_800AF8C4 = 0x800AF8C4;
-D_800AF8D0 = 0x800AF8D0;
-D_800AF8D8 = 0x800AF8D8;
-D_800AF8DC = 0x800AF8DC;
-D_800AF8E0 = 0x800AF8E0;
-D_800AF8E8 = 0x800AF8E8;
-D_800AF8EC = 0x800AF8EC;
-D_800AF8F0 = 0x800AF8F0;
-D_800AF8F8 = 0x800AF8F8;
-D_800AF8FC = 0x800AF8FC;
-D_800AF900 = 0x800AF900;
-D_800AF910 = 0x800AF910;
-D_800AF918 = 0x800AF918;
-D_800B0AD0 = 0x800B0AD0;
-D_800B0AE8 = 0x800B0AE8;
-D_800B0B00 = 0x800B0B00;
-D_800B0B02 = 0x800B0B02;
-D_800B0B04 = 0x800B0B04;
-D_800B0B18 = 0x800B0B18;
-D_800B0B1A = 0x800B0B1A;
-D_800B0B1C = 0x800B0B1C;
-D_800B0B30 = 0x800B0B30;
-D_800B0B6C = 0x800B0B6C;
-__osFlashID = 0x800B0C30;
-__osFlashMsg = 0x800B0C40;
-__osFlashMessageQ = 0x800B0C58;
-__osFlashHandler = 0x800B0C70;
-__osFlashMsgBuf = 0x800B0CE4;
-__osFlashVersion = 0x800B0CE8;
-wMapTexName = 0x800B0CF0;
-D_800B0D08 = 0x800B0D08;
-nuContWaitMesgQ = 0x800B0EB8;
-D_800B0ED0 = 0x800B0ED0;
-D_800B0F08 = 0x800B0F08;
-D_800B0F0C = 0x800B0F0C;
-gCurrentEncounter = 0x800B0F10;
-LeoDiskHandle = 0x800B1B08;
-D_800B1B0C = 0x800B1B0C;
-D_800B1B0D = 0x800B1B0D;
-D_800B1B0E = 0x800B1B0E;
-D_800B1B0F = 0x800B1B0F;
-D_800B1B10 = 0x800B1B10;
-nuContStatus = 0x800B1B7C;
-D_800B1B90 = 0x800B1B90;
-nuContRmbCtl = 0x800B1D40;
-nuContData = 0x800B1D68;
-gCameras = 0x800B1D80;
-gCollisionData = 0x800B42E0;
-nuGfxMesgQ = 0x800B42F0;
-D_800B4308 = 0x800B4308;
-D_800B430C = 0x800B430C;
-D_800B430D = 0x800B430D;
-D_800B430E = 0x800B430E;
-D_800B430F = 0x800B430F;
-D_800B4310 = 0x800B4310;
-D_800B4311 = 0x800B4311;
-D_800B4314 = 0x800B4314;
-D_800B4318 = 0x800B4318;
-gOsPiMessageQueue = 0x800B4380;
-gEffectInstances = 0x800B4398;
-D_800B4514 = 0x800B4514;
-CartRomHandle = 0x800B4518;
-D_800B451C = 0x800B451C;
-D_800B451D = 0x800B451D;
-D_800B451E = 0x800B451E;
-D_800B451F = 0x800B451F;
-D_800B4520 = 0x800B4520;
-D_800B6590 = 0x800B6590;
-D_800B7EF0 = 0x800B7EF0;
-nuYieldBuf = 0x800B8590;
-D_800B8DEC = 0x800B8DEC;
-D_800B91A0 = 0x800B91A0;
-D_800B91D0 = 0x800B91D0;
-D_800D91D0 = 0x800D91D0;
-D_800D91D4 = 0x800D91D4;
-D_800D91DC = 0x800D91DC;
-wMapHitName = 0x800D91E0;
-nuSiMgrMesgQ = 0x800D91F8;
-wMapShapeName = 0x800D9230;
-D_800D9248 = 0x800D9248;
-nuGfxTask = 0x800D9278;
-D_800D95E8 = 0x800D95E8;
-D_800D9620 = 0x800D9620;
-D_800D9668 = 0x800D9668;
-D_800D9680 = 0x800D9680;
-D_800D9780 = 0x800D9780;
-D_800D9F80 = 0x800D9F80;
-D_800DA000 = 0x800DA000;
-D_800DA03C = 0x800DA03C;
-D_800DA040 = 0x800DA040;
-nusched = 0x800DA440;
-D_800DA444 = 0x800DA444;
-D_800DA47C = 0x800DA47C;
-D_800DA4B4 = 0x800DA4B4;
-D_800DA55C = 0x800DA55C;
-D_800DAAA8 = 0x800DAAA8;
-D_800DAAB8 = 0x800DAAB8;
-D_800DAABD = 0x800DAABD;
-D_800DAAC0 = 0x800DAAC0;
-nuContPfs = 0x800DAAD8;
-nuSiMesgQ = 0x800DAC78;
-D_800DAC90 = 0x800DAC90;
-D_800DACA8 = 0x800DACA8;
-gCurrentSaveFile = 0x800DACC0;
-nuContDataMutexQ = 0x800DC040;
-D_800DC060 = 0x800DC060;
-D_800DC064 = 0x800DC064;
-gBattleState = 0x800DC068;
-gBattleStatus = 0x800DC070;
-D_800DC4D0 = 0x800DC4D0;
-D_800DC4D4 = 0x800DC4D4;
-D_800DC4D8 = 0x800DC4D8;
-gBattleState2 = 0x800DC4DC;
-D_800DC4E0 = 0x800DC4E0;
-D_800DC4E4 = 0x800DC4E4;
-D_800DC4E8 = 0x800DC4E8;
-gCurrentBattleSection = 0x800DC4EA;
-D_800DC4EB = 0x800DC4EB;
-D_800DC4EC = 0x800DC4EC;
-D_800DC4F0 = 0x800DC4F0;
-D_800DC4F4 = 0x800DC4F4;
-D_800DC4F8 = 0x800DC4F8;
-D_800DC4FC = 0x800DC4FC;
-// end of first segment's BSS
-
 D_8010C920 = 0x8010C920;
 D_8010C924 = 0x8010C924;
 D_8010C928 = 0x8010C928;
@@ -1847,3 +1535,9 @@ dead_gPartnerActionStatus2 = 0x80117160;
 dead_gPlayerData = 0x80117840;
 dead_gCollisionStatus = 0x80169B12;
 dead_gOverrideFlags = 0x800A15A8;
+D_800A1530 = 0x800A1530;
+D_800A15A4 = 0x800A15A4;
+D_800A15C4 = 0x800A15C4;
+D_800A15CC = 0x800A15CC;
+D_800B7EF0 = 0x800B7EF0;
+D_800B8DEC = 0x800B8DEC;