diff --git a/include/core1/core1.h b/include/core1/core1.h index ab7b7536..44db60eb 100644 --- a/include/core1/core1.h +++ b/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 +#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]); diff --git a/include/core1/eeprom.h b/include/core1/eeprom.h index b6fb5bc0..bf6da53a 100644 --- a/include/core1/eeprom.h +++ b/include/core1/eeprom.h @@ -1,7 +1,5 @@ -#ifndef BANJO_KAZOOIE_EEPROM_H -#define BANJO_KAZOOIE_EEPROM_H - -#include +#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); diff --git a/include/core1/main.h b/include/core1/main.h new file mode 100644 index 00000000..65fd50ad --- /dev/null +++ b/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 diff --git a/include/core1/mem.h b/include/core1/mem.h index 029d7882..c0ed19b1 100644 --- a/include/core1/mem.h +++ b/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 diff --git a/include/core1/pfsmanager.h b/include/core1/pfsmanager.h index 699a9f75..f5b3c651 100644 --- a/include/core1/pfsmanager.h +++ b/include/core1/pfsmanager.h @@ -1,8 +1,5 @@ -#ifndef BANJO_KAZOOIE_PFSMANAGER_H -#define BANJO_KAZOOIE_PFSMANAGER_H - -#include -#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; diff --git a/include/core1/rarezip.h b/include/core1/rarezip.h index 2c472403..c044a6d7 100644 --- a/include/core1/rarezip.h +++ b/include/core1/rarezip.h @@ -1,7 +1,5 @@ -#ifndef RAREZIP_H -#define RAREZIP_H -#include - +#ifndef BANJO_KAZOOIE_CORE1_RAREZIP_H +#define BANJO_KAZOOIE_CORE1_RAREZIP_H extern u8 D_80275670[]; //border[]= { /* Order of the bit length code lengths */ diff --git a/include/core1/ucode.h b/include/core1/ucode.h index 020131e7..fa8e719c 100644 --- a/include/core1/ucode.h +++ b/include/core1/ucode.h @@ -1,7 +1,5 @@ -#ifndef BANJO_KAZOOIE_UCODE_H -#define BANJO_KAZOOIE_UCODE_H - -#include +#ifndef BANJO_KAZOOIE_CORE1_UCODE_H +#define BANJO_KAZOOIE_CORE1_UCODE_H void ucode_load(void); void ucode_stub1(void); // does nothing diff --git a/include/core1/viewport.h b/include/core1/viewport.h index 70d147a5..9295e3e7 100644 --- a/include/core1/viewport.h +++ b/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 #include // for Cube diff --git a/src/CC/code_13C0.c b/src/CC/code_13C0.c index 3723775d..41c6669f 100644 --- a/src/CC/code_13C0.c +++ b/src/CC/code_13C0.c @@ -1,9 +1,9 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "CC.h" -#include #include "core2/modelRender.h" typedef struct{ diff --git a/src/CC/code_1F70.c b/src/CC/code_1F70.c index 38176809..838be92c 100644 --- a/src/CC/code_1F70.c +++ b/src/CC/code_1F70.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include #include "core2/modelRender.h" extern BKCollisionTri *func_8028EF48(void); diff --git a/src/CCW/code_160.c b/src/CCW/code_160.c index 2842c8d7..1e522ab0 100644 --- a/src/CCW/code_160.c +++ b/src/CCW/code_160.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include typedef struct{ diff --git a/src/FP/ch/xmastreeeggtoll.c b/src/FP/ch/xmastreeeggtoll.c index e1baf1f6..42b6cf9a 100644 --- a/src/FP/ch/xmastreeeggtoll.c +++ b/src/FP/ch/xmastreeeggtoll.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include void func_80390EB0(Actor *this); diff --git a/src/GV/code_3BB0.c b/src/GV/code_3BB0.c index 7e012b3f..1eab7428 100644 --- a/src/GV/code_3BB0.c +++ b/src/GV/code_3BB0.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include void GV_func_8038A084(Actor *this); diff --git a/src/MMM/ch/napper.c b/src/MMM/ch/napper.c index da82b62d..496637db 100644 --- a/src/MMM/ch/napper.c +++ b/src/MMM/ch/napper.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include typedef struct{ ActorMarker *jiggy_marker; diff --git a/src/MMM/code_47D0.c b/src/MMM/code_47D0.c index b2d971d2..8f33379a 100644 --- a/src/MMM/code_47D0.c +++ b/src/MMM/code_47D0.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include /* extern functions */ extern void sfxsource_setSampleRate(u8, s32); diff --git a/src/RBB/code_640.c b/src/RBB/code_640.c index 2f361023..3477c064 100644 --- a/src/RBB/code_640.c +++ b/src/RBB/code_640.c @@ -1,9 +1,9 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "prop.h" #include "actor.h" -#include extern ActorInfo D_80390D20; diff --git a/src/core1/code_0.c b/src/core1/code_0.c index 34949012..8cc66d23 100644 --- a/src/core1/code_0.c +++ b/src/core1/code_0.c @@ -1,10 +1,9 @@ #include +#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; } diff --git a/src/core1/code_11AC0.c b/src/core1/code_11AC0.c index ce2db4e8..1d700a20 100644 --- a/src/core1/code_11AC0.c +++ b/src/core1/code_11AC0.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/code_13680.c b/src/core1/code_13680.c index 020048e4..f2b8c503 100644 --- a/src/core1/code_13680.c +++ b/src/core1/code_13680.c @@ -1,4 +1,6 @@ #include +#include "core1/core1.h" + #include "functions.h" #include "variables.h" diff --git a/src/core1/code_13990.c b/src/core1/code_13990.c index 0c593bf7..12cca18e 100644 --- a/src/core1/code_13990.c +++ b/src/core1/code_13990.c @@ -1,4 +1,6 @@ #include +#include "core1/core1.h" + #include "functions.h" #include "variables.h" diff --git a/src/core1/code_15770.c b/src/core1/code_15770.c index 3201401e..145bec12 100644 --- a/src/core1/code_15770.c +++ b/src/core1/code_15770.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/code_15B30.c b/src/core1/code_15B30.c index ff7f2593..cd5717c0 100644 --- a/src/core1/code_15B30.c +++ b/src/core1/code_15B30.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include typedef struct { s32 unk0; diff --git a/src/core1/code_18310.c b/src/core1/code_18310.c index 152adaf3..0bddff3e 100644 --- a/src/core1/code_18310.c +++ b/src/core1/code_18310.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/code_18350.c b/src/core1/code_18350.c index 3f586876..80953a68 100644 --- a/src/core1/code_18350.c +++ b/src/core1/code_18350.c @@ -1,9 +1,9 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "version.h" -#include /* .data*/ diff --git a/src/core1/code_1BE90.c b/src/core1/code_1BE90.c index db457be2..d98fcba8 100644 --- a/src/core1/code_1BE90.c +++ b/src/core1/code_1BE90.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/code_1D00.c b/src/core1/code_1D00.c index da1f2a26..68452329 100644 --- a/src/core1/code_1D00.c +++ b/src/core1/code_1D00.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "version.h" diff --git a/src/core1/code_1D5D0.c b/src/core1/code_1D5D0.c index a228ac93..ec7d83f0 100644 --- a/src/core1/code_1D5D0.c +++ b/src/core1/code_1D5D0.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "SnS.h" diff --git a/src/core1/code_1E360.c b/src/core1/code_1E360.c index 7a1b029e..884ef948 100644 --- a/src/core1/code_1E360.c +++ b/src/core1/code_1E360.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "SnS.h" diff --git a/src/core1/code_1E6E0.c b/src/core1/code_1E6E0.c index 1dd29784..bad91e7d 100644 --- a/src/core1/code_1E6E0.c +++ b/src/core1/code_1E6E0.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/code_2FA0.c b/src/core1/code_2FA0.c index 17d87b9e..e64bc072 100644 --- a/src/core1/code_2FA0.c +++ b/src/core1/code_2FA0.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include s32 D_80275860 = 0; diff --git a/src/core1/code_3250.c b/src/core1/code_3250.c index 3a914880..a9f89401 100644 --- a/src/core1/code_3250.c +++ b/src/core1/code_3250.c @@ -1,4 +1,6 @@ #include +#include "core1/core1.h" + extern f32 gu_sqrtf(f32); static void __guMtxF2L(float mf[4][4], Mtx *m) diff --git a/src/core1/code_3A70.c b/src/core1/code_3A70.c index be828b00..21814e6f 100644 --- a/src/core1/code_3A70.c +++ b/src/core1/code_3A70.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern f32 ml_cos_deg(f32); extern f32 ml_sin_deg(f32); diff --git a/src/core1/code_5650.c b/src/core1/code_5650.c index b677532c..bb2eea59 100644 --- a/src/core1/code_5650.c +++ b/src/core1/code_5650.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "n_libaudio.h" diff --git a/src/core1/code_660.c b/src/core1/code_660.c index 107227ab..22f28607 100644 --- a/src/core1/code_660.c +++ b/src/core1/code_660.c @@ -1,7 +1,5 @@ #include -#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); diff --git a/src/core1/code_7090.c b/src/core1/code_7090.c index 2997c0d9..d269c87f 100644 --- a/src/core1/code_7090.c +++ b/src/core1/code_7090.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/code_72B0.c b/src/core1/code_72B0.c index 3c026f4b..1e4299c7 100644 --- a/src/core1/code_72B0.c +++ b/src/core1/code_72B0.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/code_7F60.c b/src/core1/code_7F60.c index 57e10ce8..b3efda6c 100644 --- a/src/core1/code_7F60.c +++ b/src/core1/code_7F60.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "version.h" diff --git a/src/core1/code_8C50.c b/src/core1/code_8C50.c index 32850101..49fa5599 100644 --- a/src/core1/code_8C50.c +++ b/src/core1/code_8C50.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "version.h" -#include "core1/ucode.h" typedef struct { s32 unk0; diff --git a/src/core1/code_9D30.c b/src/core1/code_9D30.c index 607f178c..6fd22eed 100644 --- a/src/core1/code_9D30.c +++ b/src/core1/code_9D30.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/code_ABB0.c b/src/core1/code_ABB0.c index 5b53b136..737d5ec4 100644 --- a/src/core1/code_ABB0.c +++ b/src/core1/code_ABB0.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/code_CE60.c b/src/core1/code_CE60.c index 630010d9..dd3e9073 100644 --- a/src/core1/code_CE60.c +++ b/src/core1/code_CE60.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "SnS.h" diff --git a/src/core1/code_E360.c b/src/core1/code_E360.c index b45c4066..558db6a8 100644 --- a/src/core1/code_E360.c +++ b/src/core1/code_E360.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "version.h" diff --git a/src/core1/defragmanager.c b/src/core1/defragmanager.c index 10d62cb0..636b3adc 100644 --- a/src/core1/defragmanager.c +++ b/src/core1/defragmanager.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/eeprom.c b/src/core1/eeprom.c index 5f50173e..b8eed6cc 100644 --- a/src/core1/eeprom.c +++ b/src/core1/eeprom.c @@ -1,6 +1,5 @@ #include -#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)) diff --git a/src/core1/inflate.c b/src/core1/inflate.c index cae594e4..9561cabb 100644 --- a/src/core1/inflate.c +++ b/src/core1/inflate.c @@ -1,8 +1,5 @@ #include -#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) */ diff --git a/src/core1/initthread.c b/src/core1/initthread.c index 3b3c57cb..14bf7474 100644 --- a/src/core1/initthread.c +++ b/src/core1/initthread.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/memory.c b/src/core1/memory.c index 1e19f039..43b6d10e 100644 --- a/src/core1/memory.c +++ b/src/core1/memory.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "SnS.h" diff --git a/src/core1/os/jammesg.c b/src/core1/os/jammesg.c index 43fa40b0..aa777886 100644 --- a/src/core1/os/jammesg.c +++ b/src/core1/os/jammesg.c @@ -1,6 +1,4 @@ #include -#include "functions.h" -#include "variables.h" extern OSThread *__osRunningThread; diff --git a/src/core1/os/stopthread.c b/src/core1/os/stopthread.c index b410a019..a5a2cdef 100644 --- a/src/core1/os/stopthread.c +++ b/src/core1/os/stopthread.c @@ -1,6 +1,4 @@ #include -#include "functions.h" -#include "variables.h" extern OSThread *__osRunningThread; diff --git a/src/core1/overlay.c b/src/core1/overlay.c index 0d6aea64..6b4ddbcf 100644 --- a/src/core1/overlay.c +++ b/src/core1/overlay.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/overlaymanager.c b/src/core1/overlaymanager.c index 21a9f7e2..36614a08 100644 --- a/src/core1/overlaymanager.c +++ b/src/core1/overlaymanager.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/pfsmanager.c b/src/core1/pfsmanager.c index b980e178..8544585c 100644 --- a/src/core1/pfsmanager.c +++ b/src/core1/pfsmanager.c @@ -1,5 +1,5 @@ #include -#include "core1/pfsmanager.h" +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/pimanager.c b/src/core1/pimanager.c index 910e3df3..81b16c66 100644 --- a/src/core1/pimanager.c +++ b/src/core1/pimanager.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "version.h" diff --git a/src/core1/rumblemanager.c b/src/core1/rumblemanager.c index f8f7cf58..dca9c5a7 100644 --- a/src/core1/rumblemanager.c +++ b/src/core1/rumblemanager.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/stub_13640.c b/src/core1/stub_13640.c index 8cf23203..0c9389d5 100644 --- a/src/core1/stub_13640.c +++ b/src/core1/stub_13640.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" s32 stub_13640_get(void); void stub_13640_init(void); diff --git a/src/core1/stub_1D590.c b/src/core1/stub_1D590.c index f8a04a85..7d3e710e 100644 --- a/src/core1/stub_1D590.c +++ b/src/core1/stub_1D590.c @@ -1,4 +1,5 @@ #include +#include "core1/core1.h" void dummy_func_8025AFB0(void) {} void dummy_func_8025AFB8(void) {} diff --git a/src/core1/ucode.c b/src/core1/ucode.c index 04cf0f11..99acb522 100644 --- a/src/core1/ucode.c +++ b/src/core1/ucode.c @@ -1,6 +1,6 @@ #include #include -#include "core1/ucode.h" +#include "core1/core1.h" #include "functions.h" #include "variables.h" diff --git a/src/core1/viewport.c b/src/core1/viewport.c index 18baba1f..35e4ffb7 100644 --- a/src/core1/viewport.c +++ b/src/core1/viewport.c @@ -1,9 +1,8 @@ #include +#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]); diff --git a/src/core2/bs/bFly.c b/src/core2/bs/bFly.c index 566399af..14d9e529 100644 --- a/src/core2/bs/bFly.c +++ b/src/core2/bs/bFly.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include #include "core2/ba/physics.h" #include "core2/ba/flap.h" diff --git a/src/core2/bs/dronexform.c b/src/core2/bs/dronexform.c index 56fa28a8..b2f4af0d 100644 --- a/src/core2/bs/dronexform.c +++ b/src/core2/bs/dronexform.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include #include "core2/ba/physics.h" diff --git a/src/core2/ch/badShad.c b/src/core2/ch/badShad.c index 1a222c26..cbc9483a 100644 --- a/src/core2/ch/badShad.c +++ b/src/core2/ch/badShad.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern void __spawnQueue_add_2(void (*)(s32, s32), s32, s32); diff --git a/src/core2/ch/bottlesbonus.c b/src/core2/ch/bottlesbonus.c index 65333c30..74c77c0c 100644 --- a/src/core2/ch/bottlesbonus.c +++ b/src/core2/ch/bottlesbonus.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern void func_8025982C(f32[3], f32[3], f32[3], f32); extern void func_8025A6CC(enum comusic_e arg0, s32 arg1); diff --git a/src/core2/ch/bottlesbonuscursor.c b/src/core2/ch/bottlesbonuscursor.c index a9ab5bd3..8151e167 100644 --- a/src/core2/ch/bottlesbonuscursor.c +++ b/src/core2/ch/bottlesbonuscursor.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include #ifndef ABS #define ABS(d) ((d) >= 0) ? (d) : -(d) diff --git a/src/core2/ch/code_468E0.c b/src/core2/ch/code_468E0.c index b1cb9007..e141c927 100644 --- a/src/core2/ch/code_468E0.c +++ b/src/core2/ch/code_468E0.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include void func_802CD898(Actor *); void func_802CD8C0(Actor *); diff --git a/src/core2/ch/firefx.c b/src/core2/ch/firefx.c index 2da1186b..8e2327e8 100644 --- a/src/core2/ch/firefx.c +++ b/src/core2/ch/firefx.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include void chfirefx_update(Actor *this); diff --git a/src/core2/ch/gameSelect.c b/src/core2/ch/gameSelect.c index 0d878ab6..382d6d17 100644 --- a/src/core2/ch/gameSelect.c +++ b/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); diff --git a/src/core2/ch/overlaynocontroller.c b/src/core2/ch/overlaynocontroller.c index 3102ee81..15a047c2 100644 --- a/src/core2/ch/overlaynocontroller.c +++ b/src/core2/ch/overlaynocontroller.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern Actor *actor_spawnWithYaw_f32(enum actor_e, f32[3], s32); diff --git a/src/core2/ch/overlaypressstart.c b/src/core2/ch/overlaypressstart.c index d0601760..9a83be17 100644 --- a/src/core2/ch/overlaypressstart.c +++ b/src/core2/ch/overlaypressstart.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern void subaddie_set_state_with_direction(Actor *, s32, f32, s32); diff --git a/src/core2/ch/termite.c b/src/core2/ch/termite.c index db60cdd0..069e8de6 100644 --- a/src/core2/ch/termite.c +++ b/src/core2/ch/termite.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include bool func_8034A6FC(f32, f32); diff --git a/src/core2/code_13FC0.c b/src/core2/code_13FC0.c index df1df256..f5d75b70 100644 --- a/src/core2/code_13FC0.c +++ b/src/core2/code_13FC0.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern void controller_getJoystick(s32, f32*); extern f32 ml_acosf(f32); diff --git a/src/core2/code_14420.c b/src/core2/code_14420.c index dfd1b811..9d2fe7b6 100644 --- a/src/core2/code_14420.c +++ b/src/core2/code_14420.c @@ -1,11 +1,11 @@ #include +#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 extern void controller_getJoystick(s32, f32*); extern f32 ml_acosf(f32); diff --git a/src/core2/code_33C30.c b/src/core2/code_33C30.c index fb0ed47a..519e2266 100644 --- a/src/core2/code_33C30.c +++ b/src/core2/code_33C30.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern void func_802BEA4C(f32[3], f32[3], f32, f32[3]); extern ActorProp *func_80320EB0(ActorMarker *, f32, s32); diff --git a/src/core2/code_34790.c b/src/core2/code_34790.c index 7821d774..4cca7ca6 100644 --- a/src/core2/code_34790.c +++ b/src/core2/code_34790.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "core2/nc/camera.h" -#include #include "core2/coords.h" extern Actor *func_80328230(enum actor_e, f32[3], f32[3]); diff --git a/src/core2/code_37E50.c b/src/core2/code_37E50.c index f44243a9..07ecbb2c 100644 --- a/src/core2/code_37E50.c +++ b/src/core2/code_37E50.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include typedef struct{ u8 map_id; diff --git a/src/core2/code_39D0.c b/src/core2/code_39D0.c index 8c5af87c..b42286f0 100644 --- a/src/core2/code_39D0.c +++ b/src/core2/code_39D0.c @@ -1,11 +1,11 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "prop.h" #include "core2/statetimer.h" #include "core2/ba/physics.h" -#include extern int ml_vec3f_point_within_horizontal_distance(f32 vec[3], f32 x, f32 z, f32 val); diff --git a/src/core2/code_43800.c b/src/core2/code_43800.c index 11933b57..02c8df85 100644 --- a/src/core2/code_43800.c +++ b/src/core2/code_43800.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern f32 func_8028E82C(void); diff --git a/src/core2/code_45310.c b/src/core2/code_45310.c index 006b08d9..b2b85228 100644 --- a/src/core2/code_45310.c +++ b/src/core2/code_45310.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern f32 func_8025715C(f32, f32); extern f32 func_802575BC(f32); diff --git a/src/core2/code_517A0.c b/src/core2/code_517A0.c index 64c2f1c6..5b4d838e 100644 --- a/src/core2/code_517A0.c +++ b/src/core2/code_517A0.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern f32 func_8028EF88(void); void func_802D8730(Actor *this); diff --git a/src/core2/code_55180.c b/src/core2/code_55180.c index 9fbc48df..2f8f859f 100644 --- a/src/core2/code_55180.c +++ b/src/core2/code_55180.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "core2/particle.h" -#include void func_802DC208(Actor *this); diff --git a/src/core2/code_55390.c b/src/core2/code_55390.c index 11b7e116..9f970640 100644 --- a/src/core2/code_55390.c +++ b/src/core2/code_55390.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern void actor_postdrawMethod(ActorMarker *); diff --git a/src/core2/code_55850.c b/src/core2/code_55850.c index 13c6384b..9a329d42 100644 --- a/src/core2/code_55850.c +++ b/src/core2/code_55850.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern void actor_postdrawMethod(ActorMarker *); diff --git a/src/core2/code_59780.c b/src/core2/code_59780.c index aab5e542..1a27e0a5 100644 --- a/src/core2/code_59780.c +++ b/src/core2/code_59780.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern void func_802C71F0(Actor *); extern void actor_postdrawMethod(ActorMarker *); diff --git a/src/core2/code_5C240.c b/src/core2/code_5C240.c index 23327be4..187c73bf 100644 --- a/src/core2/code_5C240.c +++ b/src/core2/code_5C240.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern void func_8023DFF0(s32); extern void comusicPlayer_update(void); diff --git a/src/core2/code_5C870.c b/src/core2/code_5C870.c index 38424f1f..0761540c 100644 --- a/src/core2/code_5C870.c +++ b/src/core2/code_5C870.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include #include "gc/gctransition.h" extern void func_802F5374(void); diff --git a/src/core2/code_654C0.c b/src/core2/code_654C0.c index e210f192..11d97d28 100644 --- a/src/core2/code_654C0.c +++ b/src/core2/code_654C0.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern void func_80252CC4(f32[3], f32 [3], f32, f32[3]); extern f32 func_8034A9D0(f32[4], f32); diff --git a/src/core2/code_6A4B0.c b/src/core2/code_6A4B0.c index 6f8b4c06..f1d2b910 100644 --- a/src/core2/code_6A4B0.c +++ b/src/core2/code_6A4B0.c @@ -1,9 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include - extern s16 D_803A5D00[2][0xF660]; diff --git a/src/core2/code_6B030.c b/src/core2/code_6B030.c index aadb5353..3c1909cf 100644 --- a/src/core2/code_6B030.c +++ b/src/core2/code_6B030.c @@ -1,9 +1,9 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "ml/mtx.h" -#include extern s16 D_803A5D00[2][0xF660]; diff --git a/src/core2/code_6D270.c b/src/core2/code_6D270.c index 251a0712..e3990271 100644 --- a/src/core2/code_6D270.c +++ b/src/core2/code_6D270.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern func_802EFAB0(ParticleEmitter *, s32, f32); diff --git a/src/core2/code_6DA30.c b/src/core2/code_6DA30.c index f082f95b..abad6efb 100644 --- a/src/core2/code_6DA30.c +++ b/src/core2/code_6DA30.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include typedef struct{ diff --git a/src/core2/code_70F20.c b/src/core2/code_70F20.c index 31012587..b6216c47 100644 --- a/src/core2/code_70F20.c +++ b/src/core2/code_70F20.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include /* .code */ void func_802F7EB0(struct3s *this){ diff --git a/src/core2/code_71820.c b/src/core2/code_71820.c index a3562a72..3713b246 100644 --- a/src/core2/code_71820.c +++ b/src/core2/code_71820.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include #define _SQ3(x, y, z) (((x) * (x)) + ((y) * (y)) + ((z) * (z))) diff --git a/src/core2/code_72060.c b/src/core2/code_72060.c index fdefcfa1..02e8f0f5 100644 --- a/src/core2/code_72060.c +++ b/src/core2/code_72060.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "ml/mtx.h" -#include typedef struct { u8 pad0[0xC]; diff --git a/src/core2/code_7AF80.c b/src/core2/code_7AF80.c index 7d2ef178..bb9f6997 100644 --- a/src/core2/code_7AF80.c +++ b/src/core2/code_7AF80.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include #include #include #include "prop.h" diff --git a/src/core2/code_85800.c b/src/core2/code_85800.c index 169dadd7..de55cb86 100644 --- a/src/core2/code_85800.c +++ b/src/core2/code_85800.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "n_libaudio.h" -#include extern f32 func_80256AB4(f32, f32, f32, f32); extern void func_80335394(s32, f32); diff --git a/src/core2/code_9E370.c b/src/core2/code_9E370.c index a54c0553..cee2acbd 100644 --- a/src/core2/code_9E370.c +++ b/src/core2/code_9E370.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include #include "actor.h" #include "prop.h" diff --git a/src/core2/code_A5BC0.c b/src/core2/code_A5BC0.c index 9e9b0cf1..074cb3fe 100644 --- a/src/core2/code_A5BC0.c +++ b/src/core2/code_A5BC0.c @@ -1,9 +1,9 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "enums.h" -#include #include #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: diff --git a/src/core2/code_AD5B0.c b/src/core2/code_AD5B0.c index 9076c868..95b61e24 100644 --- a/src/core2/code_AD5B0.c +++ b/src/core2/code_AD5B0.c @@ -1,12 +1,11 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include #include "core2/anim/sprite.h" #include #include "core2/particle.h" -#include "core1/eeprom.h" /* .data */ extern u8 D_80370250 = 0; diff --git a/src/core2/code_AEDA0.c b/src/core2/code_AEDA0.c index 4e79d895..977c2a46 100644 --- a/src/core2/code_AEDA0.c +++ b/src/core2/code_AEDA0.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "ml/mtx.h" -#include void func_80252330(f32, f32, f32); void func_803382D8(s32 arg0); diff --git a/src/core2/code_B5040.c b/src/core2/code_B5040.c index 9ee58a64..bec8101a 100644 --- a/src/core2/code_B5040.c +++ b/src/core2/code_B5040.c @@ -1,9 +1,9 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "save.h" -#include "core1/eeprom.h" typedef struct { diff --git a/src/core2/code_B8860.c b/src/core2/code_B8860.c index 929730cf..65577b15 100644 --- a/src/core2/code_B8860.c +++ b/src/core2/code_B8860.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "ml/mtx.h" -#include extern void mlMtxRotatePYR(f32, f32, f32); diff --git a/src/core2/code_BD100.c b/src/core2/code_BD100.c index a90a20c3..b7bae5f6 100644 --- a/src/core2/code_BD100.c +++ b/src/core2/code_BD100.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "ml/mtx.h" -#include extern void spriteRender_drawWithSegment(Gfx**, Vtx**, BKSprite *, s32, s32); diff --git a/src/core2/code_BEF20.c b/src/core2/code_BEF20.c index 5dd312bc..0e7654fc 100644 --- a/src/core2/code_BEF20.c +++ b/src/core2/code_BEF20.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include "core1/ucode.h" f32 time_getDelta(void); diff --git a/src/core2/code_C97F0.c b/src/core2/code_C97F0.c index 3766e3a7..4b945a4c 100644 --- a/src/core2/code_C97F0.c +++ b/src/core2/code_C97F0.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern bool func_8028F170(f32, f32); diff --git a/src/core2/code_DA3A0.c b/src/core2/code_DA3A0.c index abbe6b1d..85c4bcc0 100644 --- a/src/core2/code_DA3A0.c +++ b/src/core2/code_DA3A0.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include typedef struct { u8 *unk0; diff --git a/src/core2/code_DAAA0.c b/src/core2/code_DAAA0.c index db7911e0..6d2f0049 100644 --- a/src/core2/code_DAAA0.c +++ b/src/core2/code_DAAA0.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern void func_80288C7C(VLA**); extern void func_80288D84(s32, f32, void (*)(s32,s32), s32, s32); diff --git a/src/core2/code_DB010.c b/src/core2/code_DB010.c index cb7019a1..d01a151e 100644 --- a/src/core2/code_DB010.c +++ b/src/core2/code_DB010.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern void func_802EFF5C(ParticleEmitter *, f32, f32, f32); extern void func_802EFF7C(ParticleEmitter *, f32, f32, f32); diff --git a/src/core2/fx/airscore.c b/src/core2/fx/airscore.c index 7efec759..f736449a 100644 --- a/src/core2/fx/airscore.c +++ b/src/core2/fx/airscore.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include #define AIRSCORE_COUNT (6) diff --git a/src/core2/fx/common2score.c b/src/core2/fx/common2score.c index c5694113..e988c8b7 100644 --- a/src/core2/fx/common2score.c +++ b/src/core2/fx/common2score.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include f32 time_getDelta(void); f32 func_802FB0DC(struct8s *); diff --git a/src/core2/fx/common3score.c b/src/core2/fx/common3score.c index ec06491e..ef1c85d3 100644 --- a/src/core2/fx/common3score.c +++ b/src/core2/fx/common3score.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern f32 vtxList_getGlobalNorm(BKVertexList *); extern void func_80253208(Gfx **gdl, s32 x, s32 y, s32 w, s32 h, void *color_buffer); diff --git a/src/core2/fx/healthscore.c b/src/core2/fx/healthscore.c index 65d16d5b..20d855cd 100644 --- a/src/core2/fx/healthscore.c +++ b/src/core2/fx/healthscore.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern f32 func_802FB0E4(struct8s*); diff --git a/src/core2/fx/honeycarrierscore.c b/src/core2/fx/honeycarrierscore.c index 3eae4891..a128983a 100644 --- a/src/core2/fx/honeycarrierscore.c +++ b/src/core2/fx/honeycarrierscore.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include #define _76D90_MAX(s,t) ((s < t)? t : s) #define _76D90_MIN(s,t) ((s > t)? t : s) diff --git a/src/core2/fx/jinjoscore.c b/src/core2/fx/jinjoscore.c index fca34533..bc7ff2b2 100644 --- a/src/core2/fx/jinjoscore.c +++ b/src/core2/fx/jinjoscore.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern f32 func_802FB0E4(struct8s *); diff --git a/src/core2/fx/lifescore.c b/src/core2/fx/lifescore.c index e479535c..04f522ab 100644 --- a/src/core2/fx/lifescore.c +++ b/src/core2/fx/lifescore.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern f32 func_802FB0E4(struct8s*); diff --git a/src/core2/gc/dialog.c b/src/core2/gc/dialog.c index 78075b01..903f6e2d 100644 --- a/src/core2/gc/dialog.c +++ b/src/core2/gc/dialog.c @@ -1,9 +1,9 @@ #include +#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); diff --git a/src/core2/gc/pauseMenu.c b/src/core2/gc/pauseMenu.c index 0482de03..bc370ce3 100644 --- a/src/core2/gc/pauseMenu.c +++ b/src/core2/gc/pauseMenu.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "ml/mtx.h" -#include #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); diff --git a/src/core2/gc/sky.c b/src/core2/gc/sky.c index 3d8a799a..756ce704 100644 --- a/src/core2/gc/sky.c +++ b/src/core2/gc/sky.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include typedef struct { s16 model_id; diff --git a/src/core2/gc/transition.c b/src/core2/gc/transition.c index af354f28..0565aa0c 100644 --- a/src/core2/gc/transition.c +++ b/src/core2/gc/transition.c @@ -1,8 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" - -#include #include "gc/gctransition.h" void animctrl_setAnimTimer(AnimCtrl*, f32); diff --git a/src/core2/gc/zoombox.c b/src/core2/gc/zoombox.c index 62c849fa..4b507cae 100644 --- a/src/core2/gc/zoombox.c +++ b/src/core2/gc/zoombox.c @@ -1,10 +1,10 @@ #include +#include "core1/core1.h" +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "zoombox.h" #include "ml/mtx.h" -#include -#include "core1/pfsmanager.h" void func_80252330(f32, f32, f32); diff --git a/src/core2/modelRender.c b/src/core2/modelRender.c index e324e848..c30a8504 100644 --- a/src/core2/modelRender.c +++ b/src/core2/modelRender.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include #include "core2/modelRender.h" #include "animation.h" diff --git a/src/core2/nc/dynamicCamF.c b/src/core2/nc/dynamicCamF.c index fd543b87..4656ce03 100644 --- a/src/core2/nc/dynamicCamF.c +++ b/src/core2/nc/dynamicCamF.c @@ -1,6 +1,6 @@ #include +#include "core1/core1.h" #include "functions.h" -#include static f32 __playerStartPosition[3]; diff --git a/src/core2/nc/dynamicCamera.c b/src/core2/nc/dynamicCamera.c index 833e7884..79fb3028 100644 --- a/src/core2/nc/dynamicCamera.c +++ b/src/core2/nc/dynamicCamera.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include extern bool func_80245314(f32[3], f32[3], f32, f32, u32); diff --git a/src/core2/nc/randomCamera.c b/src/core2/nc/randomCamera.c index d1ac5439..36ddf587 100644 --- a/src/core2/nc/randomCamera.c +++ b/src/core2/nc/randomCamera.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include /* .bss */ struct { diff --git a/src/core2/nc/staticCamera.c b/src/core2/nc/staticCamera.c index 8d72502b..e1d7f299 100644 --- a/src/core2/nc/staticCamera.c +++ b/src/core2/nc/staticCamera.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include #include "core2/nc/camera.h" diff --git a/src/core2/particle.c b/src/core2/particle.c index e0d3e72f..cad7446f 100644 --- a/src/core2/particle.c +++ b/src/core2/particle.c @@ -1,7 +1,7 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" -#include #include "core2/particle.h" extern s32 spriteGetFrameCount(BKSprite *); diff --git a/src/core2/spawnqueue.c b/src/core2/spawnqueue.c index 37111d88..3bc17d20 100644 --- a/src/core2/spawnqueue.c +++ b/src/core2/spawnqueue.c @@ -1,12 +1,11 @@ #include +#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); diff --git a/src/done/bk_boot_1050.c b/src/done/bk_boot_1050.c index 206bcfa6..a48701c0 100644 --- a/src/done/bk_boot_1050.c +++ b/src/done/bk_boot_1050.c @@ -1,7 +1,4 @@ #include -#include "functions.h" -#include "variables.h" - #include "rarezip.h" #define ENTRY_STACK_LEN 0x2000 diff --git a/src/done/inflate.c b/src/done/inflate.c index 12594afd..896d96e6 100644 --- a/src/done/inflate.c +++ b/src/done/inflate.c @@ -1,7 +1,4 @@ #include -#include "functions.h" -#include "variables.h" - #include "rarezip.h" u8 border[] = { /* Order of the bit length code lengths */ diff --git a/src/done/rarezip.c b/src/done/rarezip.c index 74516606..a044602f 100644 --- a/src/done/rarezip.c +++ b/src/done/rarezip.c @@ -1,7 +1,4 @@ #include -#include "functions.h" -#include "variables.h" - #include "rarezip.h" struct huft *D_80007270; diff --git a/src/fight/chbossjinjo.c b/src/fight/chbossjinjo.c index 82075fc8..9a1881de 100644 --- a/src/fight/chbossjinjo.c +++ b/src/fight/chbossjinjo.c @@ -1,8 +1,8 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "fight.h" -#include #include "core2/particle.h" extern void func_80324CFC(f32, enum comusic_e, s32);