src/core1: reorganized header files

include/core1/core1.h

@@ -1,7 +1,16 @@
-#ifndef __CORE_1_H__
-#define __CORE_1_H__
+#ifndef BANJO_KAZOOIE_CORE1_CORE1_H
+#define BANJO_KAZOOIE_CORE1_CORE1_H
 
+#include <ultra64.h>
+#include "bool.h"
+
+#include "core1/eeprom.h"
+#include "core1/main.h"
 #include "core1/mem.h"
+#include "core1/pfsmanager.h"
+#include "core1/rarezip.h"
+#include "core1/ucode.h"
+#include "core1/viewport.h"
 
 void mlMtx_apply_vec3f(f32[3], f32[3]);
 void func_80252C08(f32 arg0[3], f32 arg1[3], f32 scale, f32 arg3[3]);

include/core1/eeprom.h

@@ -1,7 +1,5 @@
-#ifndef BANJO_KAZOOIE_EEPROM_H
-#define BANJO_KAZOOIE_EEPROM_H
-
-#include <ultra64.h>
+#ifndef BANJO_KAZOOIE_CORE1_EEPROM_H
+#define BANJO_KAZOOIE_CORE1_EEPROM_H
 
 s32 eeprom_writeBlocks(s32 file, s32 offset, void *buffer, s32 count);
 s32 eeprom_readBlocks(s32 file, s32 offset, void *buffer, s32 count);

include/core1/main.h

@@ -0,0 +1,26 @@
+#ifndef BANJO_KAZOOIE_CORE1_MAIN_H
+#define BANJO_KAZOOIE_CORE1_MAIN_H
+
+void func_8023DA20(s32 arg0);
+void func_8023DA74(void);
+void func_8023DA9C(s32 arg0);
+u32 globalTimer_getTimeMasked(u32 mask);
+//s32 globalTimer_getTime(void);
+void globalTimer_reset(void);
+enum map_e getSpecialBootMap(void);
+enum map_e getDefaultBootMap(void);
+void func_8023DBAC(void);
+void func_8023DBDC(void);
+void core1_init(void);
+void globalTimer_incTimer(void);
+void globalTimer_decTimer(void);
+void mainLoop(void);
+void mainThread_entry(void *arg);
+void func_8023DFF0(s32 arg0);
+s32 func_8023E000(void);
+void setBootMap(enum map_e map_id);
+void mainThread_create(void);
+OSThread *mainThread_get(void);
+void disableInput_set(void);
+
+#endif

include/core1/mem.h

@@ -1,5 +1,5 @@
-#ifndef __MEM_H__
-#define __MEM_H__
+#ifndef BANJO_KAZOOIE_CORE1_MEMORY_H
+#define BANJO_KAZOOIE_CORE1_MEMORY_H
 
 /**
 * copy memory area

include/core1/pfsmanager.h

@@ -1,8 +1,5 @@
-#ifndef BANJO_KAZOOIE_PFSMANAGER_H
-#define BANJO_KAZOOIE_PFSMANAGER_H
-
-#include <ultra64.h>
-#include "bool.h"
+#ifndef BANJO_KAZOOIE_CORE1_PFSMANAGER_H
+#define BANJO_KAZOOIE_CORE1_PFSMANAGER_H
 
 typedef struct pfs_manager_face_buttons_s {
     bool button_a;
@@ -17,11 +14,11 @@ typedef struct pfs_manager_side_buttons_s {
     bool button_z;
     bool button_l;
     bool button_r;
-};
+} PfsManagerSideButtons;
 
 typedef struct pfs_manager_controller_data {
     union { s32 face_button[6]; PfsManagerFaceButtons face_button2; };
-    s32 side_button[3];
+    union { s32 side_button[3]; PfsManagerSideButtons side_button2; };
     s32 unk24[4];
     s32 start_button;
 } PfsManagerControllerData;

include/core1/rarezip.h

@@ -1,7 +1,5 @@
-#ifndef RAREZIP_H
-#define RAREZIP_H
-#include <ultra64.h>
-
+#ifndef BANJO_KAZOOIE_CORE1_RAREZIP_H
+#define BANJO_KAZOOIE_CORE1_RAREZIP_H
 
 extern u8  D_80275670[]; 
 //border[]= {    /* Order of the bit length code lengths */

include/core1/ucode.h

@@ -1,7 +1,5 @@
-#ifndef BANJO_KAZOOIE_UCODE_H
-#define BANJO_KAZOOIE_UCODE_H
-
-#include <ultra64.h>
+#ifndef BANJO_KAZOOIE_CORE1_UCODE_H
+#define BANJO_KAZOOIE_CORE1_UCODE_H
 
 void ucode_load(void);
 void ucode_stub1(void); // does nothing

include/core1/viewport.h

@@ -1,5 +1,5 @@
-#ifndef BANJO_KAZOOIE_VIEWPORT_H
-#define BANJO_KAZOOIE_VIEWPORT_H
+#ifndef BANJO_KAZOOIE_CORE1_VIEWPORT_H
+#define BANJO_KAZOOIE_CORE1_VIEWPORT_H
 
 #include <ultra64.h>
 #include <prop.h> // for Cube

src/CC/code_13C0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "CC.h"
 
-#include <core1/viewport.h>
 #include "core2/modelRender.h"
 
 typedef struct{

src/CC/code_1F70.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 #include "core2/modelRender.h"
 
 extern BKCollisionTri *func_8028EF48(void);

src/CCW/code_160.c

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

src/FP/ch/xmastreeeggtoll.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 void func_80390EB0(Actor *this);
 

src/GV/code_3BB0.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 void GV_func_8038A084(Actor *this);
 

src/MMM/ch/napper.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 typedef struct{
     ActorMarker *jiggy_marker;

src/MMM/code_47D0.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 /* extern functions */
 extern void sfxsource_setSampleRate(u8, s32);

src/RBB/code_640.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "prop.h"
 #include "actor.h"
-#include <core1/viewport.h>
 
 
 extern ActorInfo D_80390D20;

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]);

src/core2/bs/bFly.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 #include "core2/ba/physics.h"
 #include "core2/ba/flap.h"
 

src/core2/bs/dronexform.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 #include "core2/ba/physics.h"
 
 

src/core2/ch/badShad.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 
 extern void __spawnQueue_add_2(void (*)(s32, s32), s32, s32);

src/core2/ch/bottlesbonus.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 extern void func_8025982C(f32[3], f32[3], f32[3], f32);
 extern void func_8025A6CC(enum comusic_e arg0, s32 arg1);

src/core2/ch/bottlesbonuscursor.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 
 #ifndef ABS
 #define	ABS(d)		((d) >= 0) ? (d) : -(d)

src/core2/ch/code_468E0.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 
 void func_802CD898(Actor *);
 void func_802CD8C0(Actor *);

src/core2/ch/firefx.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 
 void chfirefx_update(Actor *this);
 

src/core2/ch/gameSelect.c

@@ -24,8 +24,6 @@ extern void func_802C74F4(Actor *, s32, f32 );
 extern void warp_lairEnterLairFromSMLevel(s32, s32);
 extern void warp_smExitBanjosHouse(s32, s32);
 extern void func_80335110(s32);
-
-extern void func_8024E60C(s32, s32[3]);
 extern void controller_getJoystick(s32, f32*);
 
 extern char *gcpausemenu_TimeToA(int);

src/core2/ch/overlaynocontroller.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 
 
 extern Actor *actor_spawnWithYaw_f32(enum actor_e, f32[3], s32);

src/core2/ch/overlaypressstart.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 
 
 extern void subaddie_set_state_with_direction(Actor *, s32, f32, s32);

src/core2/ch/termite.c

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

src/core2/code_13FC0.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 extern void controller_getJoystick(s32, f32*);
 extern f32 ml_acosf(f32);

src/core2/code_14420.c

@@ -1,11 +1,11 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "core2/yaw.h"
 #include "core2/statetimer.h"
 #include "core2/ba/anim.h"
 #include "core2/ba/physics.h"
-#include <core1/viewport.h>
 
 extern void controller_getJoystick(s32, f32*);
 extern f32 ml_acosf(f32);

src/core2/code_33C30.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 extern void func_802BEA4C(f32[3], f32[3], f32, f32[3]);
 extern ActorProp *func_80320EB0(ActorMarker *, f32, s32);

src/core2/code_34790.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "core2/nc/camera.h"
-#include <core1/viewport.h>
 #include "core2/coords.h"
 
 extern Actor *func_80328230(enum actor_e, f32[3], f32[3]);

src/core2/code_37E50.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 typedef struct{
     u8 map_id;

src/core2/code_39D0.c

@@ -1,11 +1,11 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
 #include "prop.h"
 #include "core2/statetimer.h"
 #include "core2/ba/physics.h"
-#include <core1/viewport.h>
 
 
 extern int ml_vec3f_point_within_horizontal_distance(f32 vec[3], f32 x, f32 z, f32 val);

src/core2/code_43800.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 
 extern f32 func_8028E82C(void);

src/core2/code_45310.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 extern f32 func_8025715C(f32, f32);
 extern f32 func_802575BC(f32);

src/core2/code_517A0.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 extern f32 func_8028EF88(void);
 void func_802D8730(Actor *this);

src/core2/code_55180.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "core2/particle.h"
-#include <core1/viewport.h>
 
 void func_802DC208(Actor *this);
 

src/core2/code_55390.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 
 extern void actor_postdrawMethod(ActorMarker *);

src/core2/code_55850.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 extern void actor_postdrawMethod(ActorMarker *);
 

src/core2/code_59780.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 extern void func_802C71F0(Actor *);
 extern void actor_postdrawMethod(ActorMarker *);

src/core2/code_5C240.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 extern void func_8023DFF0(s32);
 extern void comusicPlayer_update(void);

src/core2/code_5C870.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 #include "gc/gctransition.h"
 
 extern void func_802F5374(void);

src/core2/code_654C0.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 extern void func_80252CC4(f32[3], f32 [3], f32, f32[3]);
 extern f32 func_8034A9D0(f32[4], f32);

src/core2/code_6A4B0.c

@@ -1,9 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
-
 
 extern s16 D_803A5D00[2][0xF660];
 

src/core2/code_6B030.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
 #include "ml/mtx.h"
-#include <core1/viewport.h>
 
 
 extern s16 D_803A5D00[2][0xF660];

src/core2/code_6D270.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 extern func_802EFAB0(ParticleEmitter *, s32, f32);
 

src/core2/code_6DA30.c

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

src/core2/code_70F20.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 /* .code */
 void func_802F7EB0(struct3s *this){

src/core2/code_71820.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 #define _SQ3(x, y, z)  (((x) * (x)) + ((y) * (y)) + ((z) * (z)))
 

src/core2/code_72060.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "ml/mtx.h"
-#include <core1/viewport.h>
 
 typedef struct {
     u8 pad0[0xC];

src/core2/code_7AF80.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 #include <core2/file.h>
 #include <math.h>
 #include "prop.h"

src/core2/code_85800.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "n_libaudio.h"
-#include <core1/viewport.h>
 
 extern f32 func_80256AB4(f32, f32, f32, f32);
 extern void func_80335394(s32, f32);

src/core2/code_9E370.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 #include "actor.h"
 
 #include "prop.h"

src/core2/code_A5BC0.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "enums.h"
 
-#include <core1/viewport.h>
 #include <core2/file.h>
 
 #define AssetCacheSize 0x3D5
@@ -191,7 +191,7 @@ void func_8032CD60(Prop *prop) {
         sp30 = (sp44 == 3) ? sp38 : (sp38 - sp34)*2;
 
         sp2C = (s32)((((u32)(((u16*)prop)[5]) << 0x15) >> 0x1B) * sp30) / 32;
-        var_v1 = (((globalTimer_getTime(sp34, sp30, prop, sp40) % (sp30 * sp48)) / sp48) + sp2C) % sp30;
+        var_v1 = (((globalTimer_getTime(sp34, sp30, prop, sp40) % (sp30 * sp48)) / sp48) + sp2C) % sp30; // TODO: globalTimer_getTime has no parameters, but if we remove them here (to forward declare them in include/core1/main.h, it doesn't match anymore)
         var_t5 = 0;
         switch (sp40) {                          /* irregular */
             default:

src/core2/code_AD5B0.c

@@ -1,12 +1,11 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 #include "core2/anim/sprite.h"
 #include <core2/file.h>
 #include "core2/particle.h"
-#include "core1/eeprom.h"
 
 /* .data */
 extern u8 D_80370250 = 0;

src/core2/code_AEDA0.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "ml/mtx.h"
-#include <core1/viewport.h>
 
 void func_80252330(f32, f32, f32);
 void func_803382D8(s32 arg0);

src/core2/code_B5040.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
 #include "save.h"
-#include "core1/eeprom.h"
 
 
 typedef struct {

src/core2/code_B8860.c

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