Merge pull request #552 from dbalatoni13/main

Match m427Dll/player.c

config/GMPE01_00/rels/m427Dll/symbols.txt

@@ -370,13 +370,14 @@ lbl_1_data_203 = .data:0x00000203; // type:object size:0x10 data:string
 lbl_1_data_213 = .data:0x00000213; // type:object size:0x26 data:string
 lbl_1_data_239 = .data:0x00000239; // type:object size:0x25
 lbl_1_data_260 = .data:0x00000260; // type:object size:0x15C
-lbl_1_data_3BC = .data:0x000003BC; // type:object size:0x178
+lbl_1_data_3BC = .data:0x000003BC; // type:object size:0x15C
+lbl_1_data_518 = .data:0x00000518; // type:object size:0x1C
 lbl_1_data_534 = .data:0x00000534; // type:object size:0x18
 lbl_1_data_54C = .data:0x0000054C; // type:object size:0x18 data:float
 lbl_1_data_564 = .data:0x00000564; // type:object size:0xC data:float
 lbl_1_data_570 = .data:0x00000570; // type:object size:0xC data:float
 lbl_1_data_57C = .data:0x0000057C; // type:object size:0x4
-lbl_1_data_580 = .data:0x00000580; // type:object size:0xE data:string
+lbl_1_data_580 = .data:0x00000580; // type:object size:0xE scope:local data:string
 lbl_1_data_590 = .data:0x00000590; // type:object size:0x1C
 lbl_1_data_5AC = .data:0x000005AC; // type:object size:0x1C
 lbl_1_data_5C8 = .data:0x000005C8; // type:object size:0x8

configure.py

@@ -1081,7 +1081,7 @@ config.libs = [
         objects={
             Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m427Dll/main.c"),
             Object(NonMatching, "REL/m427Dll/map.c"),
-            Object(NonMatching, "REL/m427Dll/player.c"),
+            Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m427Dll/player.c"),
         },
     ),
     Rel(

include/REL/m427Dll.h

@@ -1,8 +1,16 @@
 #include "dolphin.h"
 #include "game/object.h"
 
-void fn_1_32F4(Process*);
+s32 fn_1_1788(void);                                  
+void fn_1_1798(s32 arg0, float arg8);                             
+s32 fn_1_1884(void);                                   
+s32 fn_1_32EC(void);    
+
+void fn_1_32F4(Process* arg0);
+void fn_1_3B20(s8 arg0, s16 arg1);                              
 void fn_1_3A88(void);
+void fn_1_91E0(s16 arg0, float arg8, float arg9, float argA, float argB);       
+float fn_1_AE78(s16 arg0, float arg8, float arg9);                      
 void fn_1_E98C(Process*);
 void fn_1_EC54(void);
 void fn_1_110E8(s32, s32*);

src/REL/m412Dll/main.c

@@ -1425,7 +1425,6 @@ static inline void PadInline(void)
     (void)var_f27;
 }
 
-// fn_1_6814: https://decomp.me/scratch/WQPjD
 void fn_1_6814(unkStruct3 *arg0)
 {
     Vec sp104;