Merge pull request #419 from gamemasterplc/main

Finish m455/stage.c

config/GMPE01_00/rels/m455Dll/symbols.txt

@@ -244,27 +244,28 @@ lbl_1_data_179 = .data:0x00000179; // type:object size:0xB scope:local data:stri
 lbl_1_data_184 = .data:0x00000184; // type:object size:0x8 data:float
 lbl_1_data_18C = .data:0x0000018C; // type:object size:0x10
 lbl_1_data_19C = .data:0x0000019C; // type:object size:0x3C data:float
-lbl_1_data_1D8 = .data:0x000001D8; // type:object size:0x30
-lbl_1_data_208 = .data:0x00000208; // type:object size:0x1 data:byte
+lbl_1_data_1D8 = .data:0x000001D8; // type:object size:0x30 data:float
+lbl_1_data_208 = .data:0x00000208; // type:object size:0x4 data:byte
 lbl_1_data_20C = .data:0x0000020C; // type:object size:0x50
 lbl_1_data_25C = .data:0x0000025C; // type:object size:0x7 data:string
 lbl_1_data_263 = .data:0x00000263; // type:object size:0x7 data:string
-lbl_1_data_26A = .data:0x0000026A; // type:object size:0x1 data:byte
-lbl_1_data_26E = .data:0x0000026E; // type:object size:0x1 data:byte
-lbl_1_data_272 = .data:0x00000272; // type:object size:0x6 data:byte
-lbl_1_data_278 = .data:0x00000278; // type:object size:0x30
-lbl_1_data_2A8 = .data:0x000002A8; // type:object size:0x138
+lbl_1_data_26A = .data:0x0000026A; // type:object size:0x4 data:byte
+lbl_1_data_26E = .data:0x0000026E; // type:object size:0x4 data:byte
+lbl_1_data_272 = .data:0x00000272; // type:object size:0x4 data:byte
+lbl_1_data_278 = .data:0x00000278; // type:object size:0x30 data:float
+lbl_1_data_2A8 = .data:0x000002A8; // type:object size:0x138 data:float
 lbl_1_data_3E0 = .data:0x000003E0; // type:object size:0x68
-lbl_1_data_448 = .data:0x00000448; // type:object size:0xD0
-lbl_1_data_518 = .data:0x00000518; // type:object size:0xD0
-lbl_1_data_5E8 = .data:0x000005E8; // type:object size:0x18
-lbl_1_data_600 = .data:0x00000600; // type:object size:0x1 data:byte
-lbl_1_data_604 = .data:0x00000604; // type:object size:0x6C
+lbl_1_data_448 = .data:0x00000448; // type:object size:0xD0 data:float
+lbl_1_data_518 = .data:0x00000518; // type:object size:0xD0 data:float
+lbl_1_data_5E8 = .data:0x000005E8; // type:object size:0x18 data:float
+lbl_1_data_600 = .data:0x00000600; // type:object size:0x4 data:byte
+lbl_1_data_604 = .data:0x00000604; // type:object size:0x6C data:float
 lbl_1_data_670 = .data:0x00000670; // type:object size:0x24
-lbl_1_data_694 = .data:0x00000694; // type:object size:0x8 data:byte
-lbl_1_data_69C = .data:0x0000069C; // type:object size:0x1 data:byte
-lbl_1_data_6A0 = .data:0x000006A0; // type:object size:0x10
-lbl_1_data_6B0 = .data:0x000006B0; // type:object size:0x10
+lbl_1_data_694 = .data:0x00000694; // type:object size:0x4 data:byte
+lbl_1_data_698 = .data:0x00000698; // type:object size:0x4 data:byte
+lbl_1_data_69C = .data:0x0000069C; // type:object size:0x4 data:byte
+lbl_1_data_6A0 = .data:0x000006A0; // type:object size:0x10 data:float
+lbl_1_data_6B0 = .data:0x000006B0; // type:object size:0x10 data:float
 lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte
 lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x2 data:2byte
 lbl_1_bss_8 = .bss:0x00000008; // type:object size:0xC data:float
@@ -282,7 +283,8 @@ lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x4 data:4byte
 lbl_1_bss_38 = .bss:0x00000038; // type:object size:0x4 data:4byte
 lbl_1_bss_3C = .bss:0x0000003C; // type:object size:0x4 data:4byte
 lbl_1_bss_40 = .bss:0x00000040; // type:object size:0x4 data:4byte
-lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x10 data:4byte
+lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x4 data:4byte
+lbl_1_bss_4C = .bss:0x0000004C; // type:object size:0xC data:4byte
 lbl_1_bss_58 = .bss:0x00000058; // type:object size:0x4 data:4byte
 lbl_1_bss_5C = .bss:0x0000005C; // type:object size:0x4 data:4byte
 lbl_1_bss_60 = .bss:0x00000060; // type:object size:0x4 data:4byte

configure.py

@@ -1198,7 +1198,7 @@ config.libs = [
         "m455Dll",  # Rumble Fishing
         objects={
             Object(Matching, "REL/m455Dll/main.c"),
-            Object(NonMatching, "REL/m455Dll/stage.c"),
+            Object(Matching, "REL/m455Dll/stage.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/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, 

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;