delete variables.h

12 files changed, 106 insertions, 27 deletions

diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp
index 59609b45bb..6eb68f0c15 100644
--- a/src/m_Do/m_Do_MemCard.cpp
+++ b/src/m_Do/m_Do_MemCard.cpp
@@ -64,6 +64,7 @@ extern u8 lbl_803A3530;
 extern u8 lbl_803DFC20;
 extern u8 lbl_803E0C20;
 extern u8 lbl_803E0F40;
+extern u8 lbl_803EAF40;
 
 extern "C" {
 // __ct__15mDoMemCd_Ctrl_cFv
diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp
index 9660b6038d..228b07b7be 100644
--- a/src/m_Do/m_Do_MemCardRWmng.cpp
+++ b/src/m_Do/m_Do_MemCardRWmng.cpp
@@ -32,6 +32,7 @@ void mDoMemCdRWm_TestCheckSumGameData(void);
 // autogenerated by split.py v0.4 at 2021-01-31 21:17:23.731257
 extern u8 lbl_80374408;
 extern u8 lbl_803ECF40;
+extern u8 lbl_803EAF40;
 
 extern "C" {
 // mDoMemCdRWm_Store__FP12CARDFileInfoPvUl
diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp
index dcb8d36e39..c3a39b2e61 100644
--- a/src/m_Do/m_Do_Reset.cpp
+++ b/src/m_Do/m_Do_Reset.cpp
@@ -23,6 +23,13 @@ void VISetBlack(s32);
 void VIWaitForRetrace(void);
 }
 
+extern u8 lbl_80450BB8;
+extern char lbl_80374198[16];
+extern u8 lbl_803EAF40[];
+extern u8 lbl_80451501;
+extern void* lbl_804514F0;
+extern void (*lbl_804514EC)(int, void*);  // JUTGamePad::C3ButtonReset::sCallback
+
 void my_OSCancelAlarmAll(void) {
     return;
 }
diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp
index 693a77243e..21e3dbc03b 100644
--- a/src/m_Do/m_Do_audio.cpp
+++ b/src/m_Do/m_Do_audio.cpp
@@ -9,6 +9,9 @@
 #include "m_Do/m_Do_Reset/m_Do_Reset.h"
 #include "m_Do/m_Do_main/m_Do_main.h"
 
+#define _SDA_BASE_(dummy) 0
+#define _SDA2_BASE_(dummy) 0
+
 extern "C" {
 void __dl__FPv(void);
 void __dt__10JSUPtrListFv(void);
@@ -18,6 +21,21 @@ void free__7JKRHeapFPvP7JKRHeap(void);
 void func_80361C24(void);
 }
 
+extern JKRHeap* sRootHeap__7JKRHeap;     // JKRHeap::sRootHeap
+extern JKRHeap* sCurrentHeap__7JKRHeap;  // JKRHeap::sCurrentHeap
+extern u8 lbl_80450BB8;
+extern u8 lbl_80450C80;
+extern u8 lbl_803CBF38;
+extern u8 lbl_80450B40;
+extern u8 lbl_803CBF24;
+extern u8 lbl_803C9D80;
+extern u8 lbl_803CAC48;
+extern u8 lbl_803A2F4C;
+extern u8 lbl_80450B50;
+extern u8 lbl_803C9D70;
+extern u8 lbl_80450B60;
+extern u8 lbl_80450B80;
+
 void mDoAud_zelAudio_c::reset(void) {
     lbl_80450BBA = false;
 }
diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp
index 66d16be5c9..bc7f646626 100644
--- a/src/m_Do/m_Do_controller_pad.cpp
+++ b/src/m_Do/m_Do_controller_pad.cpp
@@ -17,6 +17,15 @@ void mDoRst_resetCallBack__FiPv(void);
 void read__10JUTGamePadFv(void);
 }
 
+extern JUTGamePad* m_gamePad[4];
+extern u8 lbl_80450580;
+extern u8 lbl_804514EC;
+extern u8 lbl_804514F0;
+extern u8 lbl_80451A20;
+extern u8 lbl_80451A30;
+extern u8 lbl_80451A24;
+extern u8 lbl_80451A28;
+
 // TODO: m_cpadInfo uses a bad type in a number of the NONMATCHING functions,
 // and references need to be updated to reflect its correct type.
 
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index 06943a2629..17e5fe0c81 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -17,12 +17,9 @@ void GXGetTexObjWidth(void);
 void cXyz_NS_dtor(void);
 void GXLoadNrmMtxImm(void);
 void GXLoadPosMtxImm(void);
-
 void GXSetArray(void);
 void GXSetNumIndStages(void);
-
 void GXSetTexCoordScaleManually(void);
-
 void J3DAnmColor_NS_searchUpdateMaterialID(void);
 void J3DAnmTevRegKey_NS_searchUpdateMaterialID(void);
 void J3DAnmTexPattern_NS_searchUpdateMaterialID(void);
@@ -298,13 +295,10 @@ void mDoExt_createZeldaHeap(void);
 void mDoExt_destroyExpHeap(void);
 void mDoExt_getArchiveHeapPtr(void);
 void mDoExt_getAssertHeap(void);
-
 void mDoExt_getDbPrintHeap(void);
-
 void mDoExt_getMesgFont(void);
 void mDoExt_getRubyFont(void);
 void mDoExt_getSubFont(void);
-
 void mDoExt_initFont0(void);
 void mDoExt_initFont1(void);
 void mDoExt_initFont2(void);
@@ -332,6 +326,11 @@ void setErrorFlag__7JKRHeapFb(void);
 void strcmp(void);
 }
 
+class j3dsys {
+public:
+    Mtx mtx;
+};
+
 // additional symbols needed for m_Do_ext.cpp
 // autogenerated by split.py v0.4 at 2021-01-31 20:51:05.468192
 extern u8 lbl_803740C0;
@@ -409,6 +408,10 @@ extern u8 lbl_804563DC;
 extern u8 lbl_804563E4;
 extern u8 lbl_804563F0;
 extern u8 lbl_804563F8;
+extern u8 lbl_80450AE0;
+extern j3dsys lbl_80434AC8;
+extern u8 lbl_80451180;
+extern JKRHeap* sCurrentHeap__7JKRHeap;  // JKRHeap::sCurrentHeap
 
 extern "C" {
 // mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp
index 9bd855af7c..6774ea6366 100644
--- a/src/m_Do/m_Do_graphic.cpp
+++ b/src/m_Do/m_Do_graphic.cpp
@@ -15,6 +15,17 @@
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 #include "m_Do/m_Do_main/m_Do_main.h"
 
+class j3dsys {
+public:
+    Mtx mtx;
+};
+extern j3dsys lbl_80434AC8;
+extern u8 sCurrentHeap__7JKRHeap;
+extern u8 lbl_80451550;
+extern u8 lbl_80450580;
+extern u8 lbl_80450AE0;
+extern u8 lbl_803DD470;
+
 #ifdef NONMATCHING  // mr and addi swapped
 ResTIMG* createTimg(u16 width, u16 height, u32 format) {
     u32 data_offset = 32;
diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp
index 2fc30d1698..79c3ca666c 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -123,6 +123,12 @@ extern u8 lbl_80451570;
 extern u8 lbl_80451B00;
 extern u8 lbl_80451B04;
 extern JKRExpHeap* sSystemHeap__7JKRHeap;
+extern JKRHeap* sRootHeap__7JKRHeap;
+extern u8 lbl_80450580;
+extern u8 lbl_80451501;
+extern u8 lbl_804508B0;
+extern u8 sSZSBufferSize__7JKRAram;
+extern u8 lbl_803EAF40;
 
 extern "C" {
 // myGetHeapTypeByString__FP7JKRHeap
diff --git a/src/m_Do/m_Do_machine_exception.cpp b/src/m_Do/m_Do_machine_exception.cpp
index 5e9601e262..d4a8a863f8 100644
--- a/src/m_Do/m_Do_machine_exception.cpp
+++ b/src/m_Do/m_Do_machine_exception.cpp
@@ -39,6 +39,7 @@ extern u8 lbl_80450C2C;
 extern u8 lbl_80450C34;
 extern u8 lbl_80450C90;
 extern JUTConsole* lbl_804511B8;
+extern u8 lbl_803A2EE0;
 
 extern "C" {
 // print_f__FPCce
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 2b4bddadea..4e07f7fbf9 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -19,25 +19,6 @@
 #include "m_Do/m_Do_reset/m_Do_reset.h"
 #include "msl_c/string.h"
 
-extern float lbl_80451A00;
-extern float lbl_80451A04;
-extern float lbl_80451A08;
-extern u8 lbl_80451A0C;
-extern u8 lbl_80451A10;
-extern u8 lbl_80451A18;
-extern u8 lbl_803D0000;
-extern float lbl_80450B2C;
-extern float lbl_80450B1C;
-extern JKRExpHeap* sSystemHeap__7JKRHeap;
-extern JKRExpHeap* lbl_80450C2C;
-extern JKRExpHeap* lbl_80450C28;
-extern JKRExpHeap* lbl_80450C34;
-extern s8 lbl_80450B20;
-extern s8 lbl_80450B28;
-extern float lbl_80450B24;
-extern s8 lbl_80450B30;
-
-extern char lbl_803739A0[0x310];
 extern "C" {
 void cDyl_InitAsync(void);
 void CheckHeap1__9HeapCheckFv(void);
@@ -48,8 +29,6 @@ void debug__Fv(void);
 void dRes_control_c_NS_dump(void);
 void dump__11JKRAramHeapFv(void);
 void DynamicModuleControlBase_NS_dump(void);
-void fapGm_Create(void);
-void fapGm_Execute(void);
 void fopAcM_initManager(void);
 void getFreeSize__11JKRAramHeapFv(void);
 void getFreeSize__7JKRHeapCFv(void);
@@ -74,8 +53,42 @@ void clear__10JUTConsoleFv(void);
 void setMessageCount__12JUTAssertionFi(void);
 }
 
+extern float lbl_80451A00;
+extern float lbl_80451A04;
+extern float lbl_80451A08;
+extern u8 lbl_80451A0C;
+extern u8 lbl_80451A10;
+extern u8 lbl_80451A18;
+extern u8 lbl_803D0000;
+extern float lbl_80450B2C;
+extern float lbl_80450B1C;
+extern JKRExpHeap* sSystemHeap__7JKRHeap;
+extern JKRExpHeap* lbl_80450C2C;
+extern JKRExpHeap* lbl_80450C28;
+extern JKRExpHeap* lbl_80450C34;
+extern s8 lbl_80450B20;
+extern s8 lbl_80450B28;
+extern float lbl_80450B24;
+extern s8 lbl_80450B30;
+extern char lbl_803739A0[0x310];
 extern char* lbl_803A2F14[5];
 extern char* lbl_803A2F28[5];
+extern u8 lbl_803A2EF4;
+extern char lbl_803A2EE0[16];
+extern u8 lbl_80450B19;
+extern s8 lbl_80450580;
+extern u8 LOAD_COPYDATE__FPv;
+extern JUTGamePad* m_gamePad[4];
+extern JKRHeap* sRootHeap__7JKRHeap;     // JKRHeap::sRootHeap
+extern JKRHeap* sCurrentHeap__7JKRHeap;  // JKRHeap::sCurrentHeap
+extern u8 lbl_803EAF40[];
+extern u8 lbl_80450B34;
+extern u8 lbl_80450B00;
+extern u8 lbl_80450C80;
+extern u32 lbl_803D3420[8192];
+extern u32 lbl_80450B0C;
+extern u32 lbl_80450B08;
+extern OSThread lbl_803DB420;
 
 void version_check(void) {
     if ((!strcmp("20Apr2004", "20Apr2004")) && (!strcmp("Patch2", "Patch2"))) {
diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp
index 46cdf9204f..42261dc6dd 100644
--- a/src/m_Do/m_Do_mtx.cpp
+++ b/src/m_Do/m_Do_mtx.cpp
@@ -2,6 +2,7 @@
 
 #include "JSystem/JMath/JMath.h"
 #include "global.h"
+#include "mtx_vec.h"
 
 // additional symbols needed for m_Do_mtx.cpp
 // autogenerated by split.py v0.4 at 2021-01-31 21:20:08.836541
@@ -57,6 +58,9 @@ extern u8 lbl_804505AC;
 extern u8 lbl_80451B08;
 extern u8 lbl_80451B0C;
 extern u8 lbl_80451B10;
+extern u8 lbl_80451180;
+extern u8 lbl_80450AEC;
+extern u8 lbl_803DD470;
 
 extern "C" {
 // mDoMtx_XYZrotS__FPA4_fsss
diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp
index bf8aaac84e..5d16c6950d 100644
--- a/src/m_Do/m_Do_printf.cpp
+++ b/src/m_Do/m_Do_printf.cpp
@@ -3,6 +3,11 @@
 #include "m_Do/m_Do_ext/m_Do_ext.h"
 #include "os/OS.h"
 
+#define _SDA_BASE_(dummy) 0
+#define _SDA2_BASE_(dummy) 0
+
+extern u8 lbl_80450BA8;
+
 asm void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32) {
     nofralloc
 #include "m_Do/m_Do_printf/asm/func_80006798.s"