Merge pull request #421 from dbalatoni13/main

Finished mpexDll/charsel.c
mariopartyrd · Sep 17, 2024 · ed199a0 · ed199a0
2 parents 15aa834 + 2500fda
commit ed199a0
Show file tree

Hide file tree

Showing 7 changed files with 3,229 additions and 119 deletions.
diff --git a/config/GMPE01_00/rels/m455Dll/symbols.txt b/config/GMPE01_00/rels/m455Dll/symbols.txt
diff --git a/config/GMPE01_00/rels/mpexDll/symbols.txt b/config/GMPE01_00/rels/mpexDll/symbols.txt
@@ -423,10 +423,10 @@ lbl_1_data_491 = .data:0x00000491; // type:object size:0x16 data:string
 lbl_1_data_4A7 = .data:0x000004A7; // type:object size:0x19 data:string
 lbl_1_data_4C0 = .data:0x000004C0; // type:object size:0x16 data:string
 lbl_1_data_4D6 = .data:0x000004D6; // type:object size:0x42
-lbl_1_data_518 = .data:0x00000518; // type:object size:0x3C data:string
-lbl_1_data_554 = .data:0x00000554; // type:object size:0x19 data:string
-lbl_1_data_56D = .data:0x0000056D; // type:object size:0x1A data:string
-lbl_1_data_587 = .data:0x00000587; // type:object size:0x3D
+lbl_1_data_518 = .data:0x00000518; // type:object size:0x3C scope:local data:string
+lbl_1_data_554 = .data:0x00000554; // type:object size:0x19 scope:local data:string
+lbl_1_data_56D = .data:0x0000056D; // type:object size:0x1A scope:local data:string
+lbl_1_data_587 = .data:0x00000587; // type:object size:0x3D scope:local data:string
 lbl_1_data_5C4 = .data:0x000005C4; // type:object size:0x20 data:4byte
 lbl_1_data_5E4 = .data:0x000005E4; // type:object size:0x40 data:4byte
 lbl_1_data_624 = .data:0x00000624; // type:object size:0x70

diff --git a/configure.py b/configure.py
@@ -1301,7 +1301,7 @@ def Rel(lib_name, objects):
  objects={
  Object(Matching, "REL/mpexDll/main.c"),
  Object(NonMatching, "REL/mpexDll/mpex.c"),
- Object(NonMatching, "REL/mpexDll/charsel.c"),
+ Object(Matching, "REL/mpexDll/charsel.c"),
  Object(Matching, "REL/mpexDll/mgname.c"),
  },
  ),

diff --git a/include/REL/mpexDll.h b/include/REL/mpexDll.h
@@ -26,13 +26,16 @@ typedef struct MpexDllUnkStruct2 {
  /* 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);
 
-// s32 fn_1_1B52C(float, float, float, float); seems implicit in main.c
-s32 fn_1_1B554(float, float, float);
-s32 fn_1_1B574(float, float, float, float);
-s32 fn_1_1B64C(float, float, float, float);
-s32 fn_1_1B7D0(s32 arg0);
+void fn_1_1B7D0(s32 arg0);
+
+s32 fn_1_1D02C(s32 arg0);
 
 extern u8 lbl_1_bss_6AC;