kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Rainchus:main' into main

Browse source
This commit is contained in:
CreateSource 2024-06-17 13:38:57 -04:00 • committed by GitHub
commit cb98cf86d5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 2901 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/GMPE01_00/rels/m429Dll/symbols.txt
View file

@ -65,7 +65,7 @@ fn_1_B01C = .text:0x0000B01C; // type:function size:0x738
fn_1_B754 = .text:0x0000B754; // type:function size:0x18C
fn_1_B8E0 = .text:0x0000B8E0; // type:function size:0x1D08
fn_1_D5E8 = .text:0x0000D5E8; // type:function size:0x6B4
fn_1_DC9C = .text:0x0000DC9C; // type:function size:0xCD0
ModuleProlog = .text:0x0000DC9C; // type:function size:0xCD0
fn_1_E96C = .text:0x0000E96C; // type:function size:0x104
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte
@ -290,7 +290,8 @@ lbl_1_bss_124 = .bss:0x00000124; // type:object size:0x4 data:float
lbl_1_bss_128 = .bss:0x00000128; // type:object size:0x4 data:float
lbl_1_bss_12C = .bss:0x0000012C; // type:object size:0x4 data:float
lbl_1_bss_130 = .bss:0x00000130; // type:object size:0x60
lbl_1_bss_190 = .bss:0x00000190; // type:object size:0x8 data:4byte
lbl_1_bss_190 = .bss:0x00000190; // type:object size:0x4 data:4byte
lbl_1_bss_194 = .bss:0x00000194; // type:object size:0x4 data:4byte
lbl_1_bss_198 = .bss:0x00000198; // type:object size:0x4 data:4byte
lbl_1_bss_19C = .bss:0x0000019C; // type:object size:0x4 data:4byte
lbl_1_bss_1A0 = .bss:0x000001A0; // type:object size:0x4 data:4byte

2
configure.py
View file

@ -1055,7 +1055,7 @@ config.libs = [
Rel(
"m429Dll",
objects={
Object(NonMatching, "REL/m429Dll/main.c"),
Object(Matching, "REL/m429Dll/main.c"),
},
),
Rel(

9
include/game/mapspace.h
View file

@ -14,4 +14,13 @@ BOOL Hitcheck_Quadrangle_with_Sphere(Vec *arg0, Vec *arg1, float arg2, Vec *arg3
void AppendAddXZ(float arg0, float arg1, float arg2);
void CharRotInv(Mtx arg0, Mtx arg1, Vec *arg2, omObjData *arg3);
extern Mtx MapMT;
extern Mtx MapMTR;
extern float AddX;
extern float AddZ;
extern s32 nMap;
extern s32 nChar;
extern s32 HitFaceCount;
extern omObjData *MapObject[16];
#endif

2888
src/REL/m429Dll/main.c Normal file
View file

File diff suppressed because it is too large Load diff