src/core1: reorganized header files

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

src/core2/code_BD100.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 spriteRender_drawWithSegment(Gfx**, Vtx**, BKSprite *, s32, s32);

src/core2/code_BEF20.c

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

src/core2/code_C97F0.c

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

src/core2/code_DA3A0.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 *unk0;

src/core2/code_DAAA0.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_80288C7C(VLA**);
 extern void func_80288D84(s32, f32, void (*)(s32,s32), s32, s32);

src/core2/code_DB010.c

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

src/core2/fx/airscore.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 
 
 #define AIRSCORE_COUNT (6)

src/core2/fx/common2score.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 
 f32 time_getDelta(void);
 f32 func_802FB0DC(struct8s *);

src/core2/fx/common3score.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 
 extern f32 vtxList_getGlobalNorm(BKVertexList *);
 extern void func_80253208(Gfx **gdl, s32 x, s32 y, s32 w, s32 h, void *color_buffer);

src/core2/fx/healthscore.c

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

src/core2/fx/honeycarrierscore.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
-#include <core1/viewport.h>
 
 #define _76D90_MAX(s,t) ((s < t)? t : s)
 #define _76D90_MIN(s,t) ((s > t)? t : s)

src/core2/fx/jinjoscore.c

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

src/core2/fx/lifescore.c

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

src/core2/gc/dialog.c

@@ -1,9 +1,9 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 
 #include "zoombox.h"
-#include "core1/pfsmanager.h"
 
 extern void func_803114D0(void );
 extern int func_803114B0(void);

src/core2/gc/pauseMenu.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>
 
 #include "zoombox.h"
 
@@ -31,9 +31,6 @@ f32 func_8024DE1C(f32, f32, f32 *, f32 *);
 void func_80310D2C(void);
 
 s32 level_get(void);
-void func_8024E6E0(s32, void *);
-void func_8024E60C(s32, void *);
-void controller_getJoystick(s32, void *);
 s32 getGameMode(void);
 
 void func_802DC5B8(void);

src/core2/gc/sky.c

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

src/core2/gc/transition.c

@@ -1,8 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-
-#include <core1/viewport.h>
 #include "gc/gctransition.h"
 
 void animctrl_setAnimTimer(AnimCtrl*, f32);

src/core2/gc/zoombox.c

@@ -1,10 +1,10 @@
 #include <ultra64.h>
+#include "core1/core1.h"
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "zoombox.h"
 #include "ml/mtx.h"
-#include <core1/viewport.h>
-#include "core1/pfsmanager.h"
 
 
 void func_80252330(f32, f32, f32);

src/core2/modelRender.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"
 
 #include "animation.h"

src/core2/nc/dynamicCamF.c

@@ -1,6 +1,6 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
-#include <core1/viewport.h>
 
 static f32 __playerStartPosition[3];
 

src/core2/nc/dynamicCamera.c

@@ -1,7 +1,7 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
-#include <core1/viewport.h>
 
 
 extern bool func_80245314(f32[3], f32[3], f32, f32, u32);

src/core2/nc/randomCamera.c

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

src/core2/nc/staticCamera.c

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

src/core2/particle.c

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

src/core2/spawnqueue.c

@@ -1,12 +1,11 @@
 #include <ultra64.h>
+#include "core1/core1.h"
 #include "functions.h"
 #include "variables.h"
 #include "actor.h"
 #include "prop.h"
 #include "functions.h"
 #include "ch/snacker.h"
-#include "core1/eeprom.h"
-#include "core1/ucode.h"
 
 void spawnQueue_unlock(void);
 void spawnQueue_lock(void);