src/core1: reorganized header files

src/core1/code_0.c

@@ -1,10 +1,9 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "version.h"
 #include "gc/gctransition.h"
-#include "core1/eeprom.h"
-#include "core1/ucode.h"
 
 #define MAIN_THREAD_STACK_SIZE 0x17F0
 
@@ -19,10 +18,7 @@ void func_8023DFF0(s32);
 s32 D_80275610 = 0;
 s32 D_80275614 = 0;
 u32 gGlobalTimer = 0;
-u32 sDebugVar_8027561C[] = { // never used
-    0x9, 0x4, 0xA, 0x3, 0xB, 0x2, 0xC, 0x5, 0x0, 
-    0x1, 0x6, 0xD,  -1
-};
+u32 sDebugVar_8027561C[] = { 0x9, 0x4, 0xA, 0x3, 0xB, 0x2, 0xC, 0x5, 0x0,  0x1, 0x6, 0xD,  -1 }; // never used
 u32 D_80275650 = VER_SELECT(0xAD019D3C, 0xA371A8F3, 0, 0); //SM_DATA_CRC_1
 u32 D_80275654 = VER_SELECT(0xD381B72F, 0xD0709154, 0, 0); //SM_DATA_CRC_2
 char sDebugVar_80275658[] = VER_SELECT("HjunkDire:218755", "HjunkDire:300875", "HjunkDire:", "HjunkDire:");
@@ -35,8 +31,8 @@ u64 sDebugVar_8027A540; // never used
 u8 sMainThreadStack[MAIN_THREAD_STACK_SIZE]; // The real size of the stack is unclear yet, maybe there are some out-optimized debug variables below the stack
 OSThread sMainThread;
 s32 gBootMap;
-s32 gDisableInput;
-u64 sDebugVar_8027BEF0; // never used
+static bool sDisableInput;
+static u64 sDebugVar_8027BEF0; // never used
 
 extern u8 core2_TEXT_START[];
 
@@ -153,9 +149,9 @@ void mainLoop(void){
     if(D_8027A130 != 3 || getGameMode() != GAME_MODE_4_PAUSED)
         globalTimer_incTimer();
     
-    if(!gDisableInput)
+    if (!sDisableInput)
         pfsManager_update();
-    gDisableInput = 0;
+    sDisableInput = FALSE;
 
     rumbleManager_80250C08();
 
@@ -236,5 +232,5 @@ OSThread *mainThread_get(void) {
 }
 
 void disableInput_set(void){
-    gDisableInput = 1;
+    sDisableInput = TRUE;
 }

src/core1/code_11AC0.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/code_13680.c

@@ -1,4 +1,6 @@
 #include <ultra64.h>
+#include "core1/core1.h"
+
 #include "functions.h"
 #include "variables.h"
 

src/core1/code_13990.c

@@ -1,4 +1,6 @@
 #include <ultra64.h>
+#include "core1/core1.h"
+
 #include "functions.h"
 #include "variables.h"
 

src/core1/code_15770.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/code_15B30.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 
 typedef struct {
     s32 unk0;

src/core1/code_18310.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/code_18350.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "version.h"
 
-#include <core1/viewport.h>
 
 
 /* .data*/

src/core1/code_1BE90.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/code_1D00.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "version.h"

src/core1/code_1D5D0.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "SnS.h"

src/core1/code_1E360.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "SnS.h"

src/core1/code_1E6E0.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/code_2FA0.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 
 
 s32 D_80275860 = 0;

src/core1/code_3250.c

@@ -1,4 +1,6 @@
 #include <ultra64.h>
+#include "core1/core1.h"
+
 extern f32 gu_sqrtf(f32);
 
 static void __guMtxF2L(float mf[4][4], Mtx *m)

src/core1/code_3A70.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 
 extern f32 ml_cos_deg(f32);
 extern f32 ml_sin_deg(f32);

src/core1/code_5650.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "n_libaudio.h"

src/core1/code_660.c

@@ -1,7 +1,5 @@
 #include <ultra64.h>
-#include "functions.h"
-#include "variables.h"
-#include "core1/rarezip.h"
+#include "core1/core1.h"
 
 
 static int _rarezip_uncompress(u8 **arg0, u8 **arg1, struct huft * arg2);

src/core1/code_7090.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/code_72B0.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/code_7F60.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "version.h"

src/core1/code_8C50.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "version.h"
-#include "core1/ucode.h"
 
 typedef struct {
     s32 unk0;

src/core1/code_9D30.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/code_ABB0.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/code_CE60.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "SnS.h"

src/core1/code_E360.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "version.h"

src/core1/defragmanager.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/eeprom.c

@@ -1,6 +1,5 @@
 #include <ultra64.h>
-#include "core1/eeprom.h"
-#include "core1/pfsmanager.h"
+#include "core1/core1.h"
 #include "save.h"
 
 #define ROUND_UP_DIVIDE(a, b) (((a) + (b) - 1) / (b))

src/core1/inflate.c

@@ -1,8 +1,5 @@
 #include <ultra64.h>
-#include "functions.h"
-#include "variables.h"
-
-#include "core1/rarezip.h"
+#include "core1/core1.h"
 
 /* static */ int huft_build(b, n, s, d, e, t, m)
 unsigned *b;            /* code lengths in bits (all assumed <= BMAX) */

src/core1/initthread.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/memory.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "SnS.h"

src/core1/os/jammesg.c

@@ -1,6 +1,4 @@
 #include <ultra64.h>
-#include "functions.h"
-#include "variables.h"
 
 extern OSThread *__osRunningThread;
 

src/core1/os/stopthread.c

@@ -1,6 +1,4 @@
 #include <ultra64.h>
-#include "functions.h"
-#include "variables.h"
 
 extern OSThread *__osRunningThread;
 

src/core1/overlay.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/overlaymanager.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/pfsmanager.c

@@ -1,5 +1,5 @@
 #include <ultra64.h>
-#include "core1/pfsmanager.h"
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/pimanager.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "version.h"

src/core1/rumblemanager.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/stub_13640.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 
 s32 stub_13640_get(void);
 void stub_13640_init(void);

src/core1/stub_1D590.c

@@ -1,4 +1,5 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 
 void dummy_func_8025AFB0(void) {}
 void dummy_func_8025AFB8(void) {}

src/core1/ucode.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include <PR/rcp.h>
-#include "core1/ucode.h"
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 

src/core1/viewport.c

@@ -1,9 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include "core1/viewport.h"
-
 
 extern void guPerspective(Mtx *, u16*, f32, f32, f32, f32, f32);
 extern f32 ml_dotProduct_vec3f(f32[3], f32[3]);