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