Merge branch 'main' into main

include/REL/board_executor.h

@@ -12,9 +12,9 @@ typedef void (*VoidFunc)(void);
 extern const VoidFunc _ctors[];
 extern const VoidFunc _dtors[];
 
-extern void BoardCommonInit(VoidFunc init, VoidFunc destroy);
+extern void BoardCommonInit(VoidFunc create, VoidFunc destroy);
 
-extern void BoardInit(void);
+extern void BoardCreate(void);
 extern void BoardDestroy(void);
 
 #ifdef __cplusplus

include/common_structs.h

@@ -14,10 +14,10 @@ typedef struct player_config {
 
 typedef struct system_state {
 /* 0x00 */ struct {
-        u8 story : 1;
+        u8 party : 1;
         u8 team : 1;
     };
-/* 0x01 */ s8 diff_story;
+/* 0x01 */ u8 diff_story;
 /* 0x02 */ struct {
         u16 bonus_star : 1;
         u16 explain_mg : 1;
@@ -26,8 +26,8 @@ typedef struct system_state {
         u16 mess_speed : 2;
         u16 save_mode : 2;
     };
-/* 0x04 */ s8 turn;
-/* 0x05 */ s8 max_turn;
+/* 0x04 */ u8 turn;
+/* 0x05 */ u8 max_turn;
 /* 0x06 */ u8 star_flag;
 /* 0x07 */ u8 star_total;
 /* 0x08 */ struct {
@@ -37,13 +37,14 @@ typedef struct system_state {
 /* 0x09 */ s8 last5_effect;
 /* 0x0A */ s8 player_curr;
 /* 0x0B */ char unk0B[3];
-/* 0x0E */ s16 hidden_block_pos;
+/* 0x0E */ s16 block_pos;
 /* 0x10 */ u8 ATTRIBUTE_ALIGN(4) board_data[32];
 /* 0x30 */ u8 mess_delay;
 /* 0x31 */ struct {
         u8 field31_bit0 : 4;
+		u8 field31_bit4 : 4;
     };
-/* 0x32 */ char unk_32[0x2];
+/* 0x32 */ s8 unk_32;
 /* 0x34 */ u16 mg_next;
 /* 0x36 */ s16 mg_next_extra;
 /* 0x38 */ s16 unk_38;
@@ -53,10 +54,11 @@ typedef struct system_state {
 
 typedef struct player_state {
 /* 0x00 */ struct {
-        u8 diff : 2;
-        u8 com : 1;
-        u8 character : 4;
-        u8 auto_size : 2;
+        u16 diff : 2;
+        u16 com : 1;
+        u16 character : 4;
+        u16 auto_size : 2;
+		u16 field00_bit9 : 1;
     };
 /* 0x02 */ struct {
         u8 team : 1;
@@ -67,14 +69,14 @@ typedef struct player_state {
 /* 0x04 */ s8 port;
 /* 0x05 */ s8 items[3];
 /* 0x08 */ struct {
-        u8 color : 2;
-        u8 moving : 1;
-        u8 field08_bit3 : 1;
-        u8 show_next : 1;
-        u8 size : 2;
-        u8 field08_bit7 : 2;
-        u8 rank : 2;
-        u8 bowser_suit : 1;
+        u16 color : 2;
+        u16 moving : 1;
+        u16 field08_bit3 : 1;
+        u16 show_next : 1;
+        u16 size : 2;
+        u16 field08_bit7 : 2;
+        u16 rank : 2;
+        u16 bowser_suit : 1;
     };
 /* 0x0A */ s8 roll;
 /* 0x0C */ s16 space_curr;

include/dolphin/mtx.h

@@ -203,7 +203,7 @@ f32 PSVECDistance(const Vec* a, const Vec* b);
 #endif
 
 // TODO
-#if defined( MTX_USE_PS) && 0
+#if defined( MTX_USE_PS)
 #define VECAdd PSVECAdd
 #define VECSubtract PSVECSubtract
 #define VECScale PSVECScale

include/functions.h

@@ -45,7 +45,7 @@ void fn_8004D6F4(s16 arg);
 
 s32 rand8(void);
 
-void BoardCameraTargetSetModel(s16 model); 
+void BoardCameraTargetModelSet(s16 model); 
 void BoardCameraStartMotion2(s16, Vec*, s32, f32, f32, s32); 
 void BoardCameraMotionWait(void);
 void BoardSpacePosGet(s32, s32, Vec*);

include/game/board/window.h

@@ -6,30 +6,32 @@
 #include "game/process.h"
 #include "game/gamework.h"
 
+typedef void (*BoardWinComKeyFunc)();
+
 void BoardWinInit(void);
 void BoardWinUnusedArraySet(f32*);
 void BoardWinKillAll(void);
 void BoardWinDestroy(void);
 void BoardWinProc(void);
 int BoardWinChoiceGet(void);
-void BoardWinCreateChoice(s32, s32, s32, s32);
-void BoardWinCreate(s32, s32, s32);
-void BoardWinInsertMesSet(s32, s32);
+void BoardWinCreateChoice(s32 pos, u32 mess, s32 portrait, s32 choice);
+void BoardWinCreate(s32 pos, u32 mess, s32 portrait);
+void BoardWinInsertMesSet(u32 value, s32 index);
 void BoardWinWait(void);
 void BoardWinKill(void);
-void BoardWinSetAttr(s32);
-void BoardWinResetAttr(s32);
-void BoardWinChoiceDisable(s32);
+void BoardWinSetAttr(s32 attr);
+void BoardWinResetAttr(s32 attr);
+void BoardWinChoiceDisable(s32 choice);
 void BoardWinKeyWait(void);
 int BoardWinSpeedGet(void);
-void BoardWinSpeedSet(s32);
+void BoardWinSpeedSet(s32 value);
 s16 BoardWinChoiceNowGet(void);
-void BoardWinPriSet(s16);
+void BoardWinPriSet(s16 prio);
 s16 BoardWinChoiceNowGet2(void);
 s32 BoardWinPortraitGet(void);
 s32 BoardWinPortraitGetStar(void);
-void BoardWinPlayerSet(s32);
+void BoardWinPlayerSet(s32 player);
 void BoardWinStartComKeySet(void);
-void BoardWinComKeyFuncSet(void (*));
+void BoardWinComKeyFuncSet(BoardWinComKeyFunc func);
 
 #endif

include/game/gamework.h

@@ -5,7 +5,7 @@
 
 void GWInit(void);
 void GWGameStatReset(void);
-s16 GWMessSpeedGet(void);
+s32 GWMessSpeedGet(void);
 void GWMGRecordSet(int index, s32 value);
 s32 GWMGRecordGet(int index);
 void GWCharColorGet(int character, GXColor *color);

include/game/object.h

@@ -85,6 +85,8 @@ void omDLLNumEnd(s16 ovl, s16 arg2);
 
 void omSysPauseEnable(BOOL flag);
 
+void omSystemKeyCheckSetup(Process *objman_process);
+
 extern omObjData *omDBGSysKeyObj;
 extern Process *omwatchproc;
 extern OverlayID omnextovl;