Merge branch 'Rainchus:main' into main

config/GMPE01_00/rels/m444dll/symbols.txt

@@ -235,19 +235,19 @@ lbl_1_data_140 = .data:0x00000140; // type:object size:0xC data:float
 lbl_1_data_14C = .data:0x0000014C; // type:object size:0x3C data:float
 lbl_1_data_188 = .data:0x00000188; // type:object size:0xC
 lbl_1_data_194 = .data:0x00000194; // type:object size:0x20
-lbl_1_data_1B4 = .data:0x000001B4; // type:object size:0x24 data:string
-lbl_1_data_1D8 = .data:0x000001D8; // type:object size:0xA data:string
-lbl_1_data_1E2 = .data:0x000001E2; // type:object size:0xA data:string
-lbl_1_data_1EC = .data:0x000001EC; // type:object size:0xA data:string
-lbl_1_data_1F6 = .data:0x000001F6; // type:object size:0xD data:string
-lbl_1_data_203 = .data:0x00000203; // type:object size:0xD data:string
-lbl_1_data_210 = .data:0x00000210; // type:object size:0xD data:string
-lbl_1_data_21D = .data:0x0000021D; // type:object size:0xD data:string
-lbl_1_data_22A = .data:0x0000022A; // type:object size:0xB data:string
-lbl_1_data_235 = .data:0x00000235; // type:object size:0xB data:string
+lbl_1_data_1B4 = .data:0x000001B4; // type:object size:0x24 scope:local data:string
+lbl_1_data_1D8 = .data:0x000001D8; // type:object size:0xA scope:local data:string
+lbl_1_data_1E2 = .data:0x000001E2; // type:object size:0xA scope:local data:string
+lbl_1_data_1EC = .data:0x000001EC; // type:object size:0xA scope:local data:string
+lbl_1_data_1F6 = .data:0x000001F6; // type:object size:0xD scope:local data:string
+lbl_1_data_203 = .data:0x00000203; // type:object size:0xD scope:local data:string
+lbl_1_data_210 = .data:0x00000210; // type:object size:0xD scope:local data:string
+lbl_1_data_21D = .data:0x0000021D; // type:object size:0xD scope:local data:string
+lbl_1_data_22A = .data:0x0000022A; // type:object size:0xB scope:local data:string
+lbl_1_data_235 = .data:0x00000235; // type:object size:0xB scope:local data:string
 lbl_1_data_240 = .data:0x00000240; // type:object size:0x4
-lbl_1_data_244 = .data:0x00000244; // type:object size:0xA data:string
-lbl_1_data_24E = .data:0x0000024E; // type:object size:0x4 data:string
+lbl_1_data_244 = .data:0x00000244; // type:object size:0xA scope:local data:string
+lbl_1_data_24E = .data:0x0000024E; // type:object size:0x4 scope:local data:string
 lbl_1_data_258 = .data:0x00000258; // type:object size:0xC
 lbl_1_data_264 = .data:0x00000264; // type:object size:0x3C
 lbl_1_data_2A0 = .data:0x000002A0; // type:object size:0x28

config/GMPE01_00/rels/m456Dll/symbols.txt

@@ -272,7 +272,8 @@ lbl_1_bss_80 = .bss:0x00000080; // type:object size:0x4 data:4byte
 lbl_1_bss_84 = .bss:0x00000084; // type:object size:0x4 data:4byte
 lbl_1_bss_88 = .bss:0x00000088; // type:object size:0x4 data:4byte
 lbl_1_bss_8C = .bss:0x0000008C; // type:object size:0x4 data:4byte
-lbl_1_bss_90 = .bss:0x00000090; // type:object size:0x10 data:4byte
+lbl_1_bss_90 = .bss:0x00000090; // type:object size:0x4 data:4byte
+lbl_1_bss_94 = .bss:0x00000094; // type:object size:0xC data:4byte
 lbl_1_bss_A0 = .bss:0x000000A0; // type:object size:0x4 data:4byte
 lbl_1_bss_A4 = .bss:0x000000A4; // type:object size:0x4 data:4byte
 lbl_1_bss_A8 = .bss:0x000000A8; // type:object size:0x4 data:4byte

config/GMPE01_00/rels/mentDll/splits.txt

@@ -9,9 +9,11 @@ Sections:
 REL/mentDll/common.c:
 	.text       start:0x00000000 end:0x0000658C
 	.rodata     start:0x00000000 end:0x000000E8
+	.data       start:0x00000000 end:0x000000D8
+	.bss        start:0x00000000 end:0x00000008
 
 REL/mentDll/main.c:
 	.text       start:0x0000658C end:0x00023A38
 	.rodata     start:0x000000E8 end:0x00000528
-	.data       start:0x00000000 end:0x000006D0
-	.bss        start:0x00000000 end:0x000036C4
+	.data       start:0x000000D8 end:0x000006D0
+	.bss        start:0x00000008 end:0x000036C4

config/GMPE01_00/rels/mpexDll/splits.txt

@@ -6,8 +6,11 @@ Sections:
 	.data       type:data align:8
 	.bss        type:bss align:8
 
+REL/executor.c:
+	.text       start:0x00000000 end:0x000000A0
+
 REL/mpexDll/main.c:
-	.text       start:0x00000000 end:0x00003044
+	.text       start:0x000000A0 end:0x00003044
 	.rodata     start:0x00000000 end:0x000000A0
 	.data       start:0x00000000 end:0x00000240
 	.bss        start:0x00000000 end:0x000000A8

configure.py

@@ -955,7 +955,7 @@ def Rel(lib_name, objects):
             Object(NonMatching, "REL/m420dll/main.c"),
             Object(NonMatching, "REL/m420dll/player.c"),
             Object(NonMatching, "REL/m420dll/map.c"),
-            Object(NonMatching, "REL/m420dll/rand.c"),
+            Object(Matching, "REL/m420dll/rand.c"),
         },
     ),
     Rel(
@@ -1198,14 +1198,14 @@ def Rel(lib_name, objects):
         "m455Dll",  # Rumble Fishing
         objects={
             Object(Matching, "REL/m455Dll/main.c"),
-            Object(NonMatching, "REL/m455Dll/stage.c"),
+            Object(Matching, "REL/m455Dll/stage.c"),
         },
     ),
     Rel(
         "m456Dll",  # Take a Breather
         objects={
             Object(NonMatching, "REL/m456Dll/main.c"),
-            Object(NonMatching, "REL/m456Dll/stage.c"),
+            Object(Matching, "REL/m456Dll/stage.c"),
         },
     ),
     Rel(
@@ -1256,8 +1256,8 @@ def Rel(lib_name, objects):
     Rel(
         "mentDll",
         objects={
-            Object(NonMatching, "REL/mentDll/common.c"),
-            Object(NonMatching, "REL/mentDll/main.c"),
+            Object(Matching, "REL/mentDll/common.c"),
+            Object(Matching, "REL/mentDll/main.c"),
         },
     ),
     Rel(
@@ -1299,10 +1299,10 @@ def Rel(lib_name, objects):
     Rel(
         "mpexDll",
         objects={
-            Object(NonMatching, "REL/mpexDll/main.c"),
+            Object(Matching, "REL/mpexDll/main.c"),
             Object(NonMatching, "REL/mpexDll/mpex.c"),
-            Object(NonMatching, "REL/mpexDll/charsel.c"),
-            Object(NonMatching, "REL/mpexDll/mgname.c"),
+            Object(Matching, "REL/mpexDll/charsel.c"),
+            Object(Matching, "REL/mpexDll/mgname.c"),
         },
     ),
     Rel(

include/REL/m455Dll.h

@@ -0,0 +1,12 @@
+#ifndef M455DLL_H
+#define M455DLL_H
+
+#include "game/object.h"
+
+void fn_1_32C4(Process *objman);
+void fn_1_340C(void);
+s32 fn_1_6698(Vec *arg0, float arg1, float arg2, s32 arg3);
+float fn_1_687C(void);
+s32 fn_1_6CB0(Vec *arg0, float arg1);
+
+#endif

include/REL/m456Dll.h

@@ -0,0 +1,12 @@
+#ifndef M456DLL_H
+#define M456DLL_H
+
+#include "game/object.h"
+
+void fn_1_2DF4(Process *objman);
+void fn_1_2F3C(void);
+s32 fn_1_61C8(Vec *arg0, float arg1, float arg2, s32 arg3);
+float fn_1_63AC(void);
+s32 fn_1_67E0(Vec *arg0, float arg1);
+
+#endif

include/REL/mentDll.h

@@ -2,27 +2,21 @@
 #define MENTDLL_H
 
 #include "game/object.h"
+extern s32 lbl_1_data_0[][4];
 
+//the prev and current struct member might be vice versa
 typedef struct MentDllUnkBss64Struct {
-    /* 0x00 */ s16 unk00;
-    /* 0x02 */ s16 unk02;
-    /* 0x04 */ s32 unk04;
-    /* 0x08 */ float unk_08;
-    /* 0x0C */ float unk_0C;
-    /* 0x10 */ float unk_10;
-    /* 0x14 */ s32 unk14;
-    /* 0x18 */ s32 unk18;
-    /* 0x1C */ s32 unk1C;
-    /* 0x20 */ float unk_20;
-    /* 0x24 */ float unk_24;
-    /* 0x28 */ float unk_28;
-    /* 0x2C */ s32 unk2C;
-    /* 0x30 */ s32 unk30;
-    /* 0x34 */ s32 unk34;
-    /* 0x38 */ float unk_38;
-    /* 0x3C */ s32 unk3C;
+    /* 0x00 */ void (*func)(void);
+    /* 0x04 */ void (*func2)(f32 arg9);
+    /* 0x08 */ Vec center;
+    /* 0x14 */ Vec prevCenter;
+    /* 0x20 */ Vec rot;
+    /* 0x2C */ Vec prevRot;
+    /* 0x38 */ float zoom;
+    /* 0x3C */ f32 prevZoom;
     /* 0x40 */ s32 unk_40;
 } MentDllUnkBss64Struct; /* size = 0x44 */
+extern MentDllUnkBss64Struct lbl_1_bss_64;
 
 float fn_1_20C(float arg8, float arg9, float argA, float argB);
 float fn_1_234(float arg8, float arg9, float argA);
@@ -36,22 +30,22 @@ void fn_1_5E8(s32 arg0);
 void fn_1_6D0(void);
 s32 fn_1_1434(s32 arg0, s32 arg1, s32 arg2);
 void fn_1_16AC(s32 arg0);
-void fn_1_1968(s32 arg0, u32 arg1, s32 arg2, s32 arg3);
-s32 fn_1_1A5C(u32 arg0, s32 arg1, s32 arg2);
-s32 fn_1_1DD8(u32 arg0, s32 arg1, s32 arg2);
-s32 fn_1_2154(u32 arg0);
+void fn_1_1968(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
+s32 fn_1_1A5C(s32 arg0, s32 arg1, s32 arg2);
+s32 fn_1_1DD8(s32 arg0, s32 arg1, s32 arg2);
+s32 fn_1_2154(s32 arg0);
 void fn_1_2318(s32 arg0);
-void fn_1_2808(void *arg0);
-void fn_1_2844(Process *arg0, void *arg1);
-void fn_1_4138(MentDllUnkBss64Struct *arg0, float *arg1, float arg8, float arg9, float argA);
-void fn_1_5150(void *arg0, void *arg1, float arg8, float arg9, float argA);
+void fn_1_2808(void (*arg0)(void));
+void fn_1_2844(Process* arg0, void (*arg1)(void));
+void fn_1_29A0(MentDllUnkBss64Struct* arg0);
+void fn_1_4138(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg8, f32 arg9, f32 argA);
+void fn_1_5150(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg8, f32 arg9, f32 argA);
 void fn_1_5818(omObjData *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
 void fn_1_59A0(omObjData *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
 void fn_1_5C08(omObjData *arg0);
 void fn_1_5CDC(omObjData *arg0, s32 arg1, s32 arg2);
 void fn_1_5D38(omObjData *arg0, s32 arg1, Vec arg2, float arg8, float arg9, float argA, s32 arg3, s32 arg4);
 void fn_1_6534(s32, s32, float, float);
-
 void fn_1_658C(Process *arg0);
 
 #endif

include/REL/mpexDll.h

@@ -0,0 +1,42 @@
+#ifndef MPEXDLL_H
+#define MPEXDLL_H
+
+#include "game/object.h"
+
+typedef void (*MpexDllUnkFunc)(void);
+
+typedef struct MpexDllUnkStruct {
+    /* 0x00 */ MpexDllUnkFunc unk_00;
+    /* 0x04 */ void *unk_04; // func, unknown args
+    /* 0x08 */ Vec unk_08;
+    /* 0x14 */ Vec unk_14;
+    /* 0x20 */ Vec unk_20;
+    /* 0x2C */ Vec unk_2C;
+    /* 0x38 */ float unk_38;
+    /* 0x3C */ float unk_3C;
+    /* 0x40 */ s32 unk_40;
+} MpexDllUnkStruct; /* size = 0x44 */
+
+typedef struct MpexDllUnkStruct2 {
+    /* 0x00 */ char unk00[0x40];
+    /* 0x40 */ s16 *unk_40;
+    /* 0x44 */ char unk44;
+    /* 0x48 */ s16 *unk_48;
+    /* 0x4C */ char unk_4C[0xC];
+    /* 0x58 */ u32 unk_58;
+} MpexDllUnkStruct2; /* size = unknown */
+
+void fn_1_374(void);
+void fn_1_298(void);
+void fn_1_910(MpexDllUnkFunc arg0);
+void fn_1_25C4(MpexDllUnkStruct2 *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
+void fn_1_28E0(MpexDllUnkStruct2 *arg0, s32 arg1, Vec *arg2, float arg8, float arg9, float argA, s32 arg3, s32 arg4);
+s32 fn_1_3044(Process *arg0);
+
+void fn_1_1B7D0(s32 arg0);
+
+s32 fn_1_1D02C(s32 arg0);
+
+extern u8 lbl_1_bss_6AC;
+
+#endif

include/dolphin/gx/GXBump.h

@@ -19,8 +19,9 @@ void GXSetTevIndirect(GXTevStageID tev_stage, GXIndTexStageID ind_stage, GXIndTe
                       GXIndTexBiasSel bias_sel, GXIndTexMtxID matrix_sel, GXIndTexWrap wrap_s,
                       GXIndTexWrap wrap_t, GXBool add_prev, GXBool ind_lod,
                       GXIndTexAlphaSel alpha_sel);
-void GXSetTevIndWarp(GXTevStageID tev_stage, GXIndTexStageID ind_stage, GXBool signed_offsets,
-                     GXBool replace_mode, GXIndTexMtxID matrix_sel);
+//Must be implicit to match m455dll
+//void GXSetTevIndWarp(GXTevStageID tev_stage, GXIndTexStageID ind_stage, GXBool signed_offsets,
+//                     GXBool replace_mode, GXIndTexMtxID matrix_sel);
 
 void GXSetTevIndTile (GXTevStageID tev_stage, GXIndTexStageID ind_stage,
 			     u16 tilesize_s, u16 tilesize_t, 

include/game/window.h

@@ -109,9 +109,7 @@ s16 HuWinChoiceGet(s16 window, s16 start_choice);
 s16 HuWinChoiceNumGet(s16 window);
 void HuWinChoiceDisable(s16 window, s16 choice);
 s16 HuWinChoiceNowGet(s16 window);
-#ifndef HUWIN_USE_OLD_DEFS
 void HuWinMesWait(s16 window);
-#endif
 s16 HuWinAnimSet(s16 window, AnimData *anim, s16 bank, float x, float y);
 s16 HuWinSprSet(s16 window, s16 sprite, float x, float y);
 void HuWinSprPosSet(s16 window, s16 index, float x, float y);

src/REL/m420dll/rand.c

@@ -0,0 +1,11 @@
+#include "dolphin/types.h"
+
+u32 lbl_1_bss_A48;
+
+void fn_1_8934 (u32 seed) {
+    lbl_1_bss_A48 = seed;
+}
+
+s32 fn_1_8944(void) {
+    return (lbl_1_bss_A48 = (lbl_1_bss_A48 * 0x41C64E6D) + 0x3039) / 65536 & 0x7FFF;
+}

src/REL/m455Dll/main.c

@@ -12,17 +12,13 @@
 #include "game/minigame_seq.h"
 #include "game/gamework_data.h"
 #include "game/chrman.h"
+#include "REL/m455Dll.h"
 
 #include "ext_math.h"
 #include "math.h"
 
 #include "rel_sqrt_consts.h"
 
-void fn_1_32C4(Process *objman);
-void fn_1_340C(void);
-void fn_1_6698(Vec *arg0, float arg1, float arg2, s32 arg3);
-float fn_1_687C(void);
-void fn_1_6CB0(Vec *arg0, float arg1);
 
 typedef struct camera_view_params {
     float zoom;