Merge branch 'Rainchus:main' into main

include/common_structs.h

@@ -14,8 +14,8 @@ typedef struct player_config {
 
 typedef struct system_state {
 /* 0x00 */ struct {
-        u16 story : 1;
-        u16 team : 1;
+        u8 story : 1;
+        u8 team : 1;
         u8 : 7;
     };
 /* 0x02 */ struct {
@@ -46,8 +46,9 @@ typedef struct system_state {
 /* 0x32 */ char unk_32[0x2];
 /* 0x34 */ u16 mg_next;
 /* 0x36 */ s16 mg_next_extra;
-/* 0x38 */ u8 flag[3][16];
-/* 0x68 */ u8 unk_68[0x74];
+/* 0x38 */ s16 unk_38;
+/* 0x3A */ u8 flag[3][16];
+/* 0x6A */ u8 unk_6A[0x72];
 } SystemState; //8018fcf8, sizeof 0xDC
 
 typedef struct player_state {

include/functions.h

@@ -43,21 +43,19 @@ void MGSeqKillAll(void);
 void MGSeqPracticeStart(void);
 void fn_8004D6F4(s16 arg);
 
-s32 _CheckFlag(u32 flag);
-
 void BoardWinCreate(s16, s32, s32);
 void BoardWinKill(void);
 void BoardWinWait(void);
 
 s32 rand8(void);
 
-void fn_8005D8E8(void); 
-void fn_8005DB6C(s16, Vec*, s32, f32, f32, s32); 
+void BoardCameraTargetSetModel(s16 model); 
+void BoardCameraStartMotion2(s16, Vec*, s32, f32, f32, s32); 
 void fn_8005E0C0(void);
 void fn_80074210(s32, s32, Vec*);
 void fn_8007A360(s32);
 void fn_8007F894(void);
-void fn_80083F84(void);
+s16 fn_80083F84(void);
 void fn_800884F4(s32);
 void fn_800A4C88(void);
 void fn_800A6B10(void);
@@ -71,7 +69,7 @@ f32 fn_8006F128(s32);
 void fn_8006F61C(s16, s32);
 void fn_800B42BC(s16);
 s32 fn_8006DBD4(s16);
-void fn_8005B150(void*, void*);
+void BoardInit(void*, void*);
 void fn_8006F2E8(s32, Vec*);
 void fn_8005D10C(void*, void*);
 s16 fn_8006D9A4(s32, void*, s32);
@@ -95,7 +93,7 @@ void fn_80083EDC(s16);
 void fn_800A4F6C(s16);
 void fn_800B3FD8(void*);
 void fn_800B4274(s32, s32);
-void fn_8005D5C0(Vec*);
+void BoardCameraRotGet(Vec*);
 void fn_8006F338(s16, f32, f32, f32);
 s32 fn_8005B6A8(void);
 void fn_8006EFBC(s16, Mtx);

include/game/card.h

@@ -0,0 +1,23 @@
+#ifndef _GAME_CARD_H
+#define _GAME_CARD_H
+
+#include "dolphin.h"
+
+extern u8 UnMountCnt;
+
+void HuCardInit(void);
+s32 HuCardCheck(void);
+s32 HuCardSlotCheck(s16 slot);
+s32 HuCardMount(s16 slot);
+void HuCardUnMount(s16 slot);
+s32 HuCardFormat(s16 slot);
+s32 HuCardOpen(s16 slot, const char *fileName, CARDFileInfo *fileInfo);
+s32 HuCardRead(CARDFileInfo *fileInfo, void *addr, s32 length, s32 offset);
+s32 HuCardCreate(s16 slot, const char *fileName, s32 size, CARDFileInfo *fileInfo);
+s32 HuCardClose(CARDFileInfo *fileInfo);
+s32 HuCardWrite(CARDFileInfo *fileInfo, const void *addr, s32 length, s32 offset);
+s32 HuCardDelete(s16 slot, const char *fileName);
+s32 HuCardSectorSizeGet(s16 slot);
+s32 HuCardFreeSpaceGet(s16 slot, u32 *byteNotUsed, u32 *filesNotUsed);
+
+#endif

include/game/flag.h

@@ -0,0 +1,11 @@
+#ifndef _GAME_FLAG_H
+#define _GAME_FLAG_H
+
+#define FLAG_ID_MAKE(group, index) (((group) << 16)|(index))
+
+s32 _CheckFlag(u32 flag);
+void _SetFlag(u32 flag);
+void _ClearFlag(u32 flag);
+void _InitFlag(void);
+
+#endif

include/game/hsfman.h

@@ -206,7 +206,7 @@ void Hu3DCameraPerspectiveSet(s32, f32, f32, f32, f32);
 void Hu3DCameraViewportSet(s32, f32, f32, f32, f32, f32, f32);
 void Hu3DCameraScissorSet(s32, s32, s32, s32, s32);
 void Hu3DCameraPosSet(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
-void Hu3DCameraPosSetV(s32, Vec, Vec, Vec);
+void Hu3DCameraPosSetV(s32 cam, Vec *pos, Vec *up, Vec *target);
 void Hu3DCameraKill(s32);
 void Hu3DCameraAllKill(void);
 void Hu3DCameraSet(s32, Mtx);

include/game/saveload.h

@@ -0,0 +1,35 @@
+#ifndef _GAME_SAVELOAD_H
+#define _GAME_SAVELOAD_H
+
+#include "common.h"
+
+s32 SLFileOpen(char *arg0);
+s32 SLFileCreate(char *arg0, u32 arg1, void *arg2);
+s32 SLFileWrite(s32 arg0, void *arg1);
+s32 SLFileRead(s32 arg0, void *arg1);
+s32 SLFileClose(void);
+void SLCurSlotNoSet(s16 arg0);
+void SLCurBoxNoSet(s8 arg0);
+void SLSaveFlagSet(s32 arg0);
+s32 SLSaveFlagGet(void);
+void SLSaveDataMake(s32 arg0, OSTime *arg1);
+void SLSaveDataInfoSet(OSTime *arg0);
+void SLCommonSet(void);
+void SLSaveBoard(void);
+void SLSaveBoardBackup(void);
+s32 SLSave(void);
+s32 SLLoad(void);
+void SLLoadGameStat(void);
+void SLLoadBoard(void);
+void SLLoadBoardBackup(void);
+void SLSerialNoGet(void);
+BOOL SLSerialNoCheck(void);
+BOOL SLCheckSumCheck(void);
+u16 SLCheckSumGet(void);
+void SLCheckSumSet(void);
+s32 SLStatSet(s32 arg0);
+s32 SLCardMount(s16 arg0);
+s32 SLFormat(s16 arg0);
+s16 SLMessOut(s16 arg0);
+
+#endif

include/game/window.h

@@ -75,6 +75,8 @@ typedef struct {
     /* 0x160 */ u8 ATTRIBUTE_ALIGN(32) mess_pal[10][3];
 } WindowData; // Size 0x180
 
+extern WindowData winData[32];
+
 void HuWindowInit(void);
 void HuWinInit(s32 mess_data_no);
 s16 HuWinCreate(float x, float y, s16 w, s16 h, s16 frame);