Skip to content

Commit

Permalink
Matched most of REL/m437Dll (1 function missing: fn_1_65E0)
Browse files Browse the repository at this point in the history
  • Loading branch information
mrshigure committed Aug 25, 2024
1 parent 00fdf20 commit 5ed45bd
Show file tree
Hide file tree
Showing 6 changed files with 4,065 additions and 41 deletions.
80 changes: 40 additions & 40 deletions config/GMPE01_00/rels/m437Dll/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ fn_1_108A4 = .text:0x000108A4; // type:function size:0x1EC
_prolog = .text:0x00010A90; // type:function size:0x54 scope:global
_epilog = .text:0x00010AE4; // type:function size:0x4C scope:global
fn_1_10B30 = .text:0x00010B30; // type:function size:0x40C
fn_1_10F3C = .text:0x00010F3C; // type:function size:0x40C
ObjectSetup = .text:0x00010F3C; // type:function size:0x40C
fn_1_11348 = .text:0x00011348; // type:function size:0x28
fn_1_11370 = .text:0x00011370; // type:function size:0x40
fn_1_113B0 = .text:0x000113B0; // type:function size:0xC8
Expand Down Expand Up @@ -235,9 +235,9 @@ lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 data:float
lbl_1_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 data:float
lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 data:float
lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 data:float
lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0xC data:4byte
lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0xC data:4byte
lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0xC data:4byte
lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0xC data:float
lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0xC data:float
lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0xC data:float
lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 data:float
lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 data:float
lbl_1_rodata_94 = .rodata:0x00000094; // type:object size:0x4 data:float
Expand All @@ -253,11 +253,11 @@ lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 data:float
lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 data:float
lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 data:float
lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 data:float
lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 data:4byte
lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 data:float
lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x78
lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x78
lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x78 data:float
lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0xC8
lbl_1_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x78
lbl_1_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x78 data:float
lbl_1_rodata_340 = .rodata:0x00000340; // type:object size:0x4 data:float
lbl_1_rodata_344 = .rodata:0x00000344; // type:object size:0x4 data:float
lbl_1_rodata_348 = .rodata:0x00000348; // type:object size:0x4 data:float
Expand All @@ -269,7 +269,7 @@ lbl_1_rodata_35C = .rodata:0x0000035C; // type:object size:0x14 data:4byte
lbl_1_rodata_370 = .rodata:0x00000370; // type:object size:0x4 data:float
lbl_1_rodata_374 = .rodata:0x00000374; // type:object size:0x4 data:float
lbl_1_rodata_378 = .rodata:0x00000378; // type:object size:0x4 data:float
lbl_1_rodata_37C = .rodata:0x0000037C; // type:object size:0x30 data:4byte
lbl_1_rodata_37C = .rodata:0x0000037C; // type:object size:0x30 data:float
lbl_1_rodata_3AC = .rodata:0x000003AC; // type:object size:0x4 data:float
lbl_1_rodata_3B0 = .rodata:0x000003B0; // type:object size:0x4 data:float
lbl_1_rodata_3B4 = .rodata:0x000003B4; // type:object size:0x4 data:float
Expand All @@ -287,7 +287,7 @@ lbl_1_rodata_3E8 = .rodata:0x000003E8; // type:object size:0x4 data:float
lbl_1_rodata_3EC = .rodata:0x000003EC; // type:object size:0x4 data:float
lbl_1_rodata_3F0 = .rodata:0x000003F0; // type:object size:0x4 data:float
lbl_1_rodata_3F4 = .rodata:0x000003F4; // type:object size:0x4 data:float
lbl_1_rodata_3F8 = .rodata:0x000003F8; // type:object size:0x30 data:4byte
lbl_1_rodata_3F8 = .rodata:0x000003F8; // type:object size:0x30 data:float
lbl_1_rodata_428 = .rodata:0x00000428; // type:object size:0x4 data:float
lbl_1_rodata_42C = .rodata:0x0000042C; // type:object size:0x4 data:float
lbl_1_rodata_430 = .rodata:0x00000430; // type:object size:0x4 data:float
Expand All @@ -314,7 +314,7 @@ lbl_1_rodata_490 = .rodata:0x00000490; // type:object size:0x20 data:4byte
lbl_1_rodata_4B0 = .rodata:0x000004B0; // type:object size:0x8 data:4byte
lbl_1_rodata_4B8 = .rodata:0x000004B8; // type:object size:0x20 data:4byte
lbl_1_rodata_4D8 = .rodata:0x000004D8; // type:object size:0x8 data:4byte
lbl_1_rodata_4E0 = .rodata:0x000004E0; // type:object size:0x30 data:4byte
lbl_1_rodata_4E0 = .rodata:0x000004E0; // type:object size:0x30 data:float
lbl_1_rodata_510 = .rodata:0x00000510; // type:object size:0x4 data:float
lbl_1_rodata_514 = .rodata:0x00000514; // type:object size:0x4 data:float
lbl_1_rodata_518 = .rodata:0x00000518; // type:object size:0x4 data:float
Expand All @@ -330,26 +330,26 @@ lbl_1_rodata_560 = .rodata:0x00000560; // type:object size:0x8 data:4byte
lbl_1_rodata_568 = .rodata:0x00000568; // type:object size:0xC data:4byte
lbl_1_rodata_574 = .rodata:0x00000574; // type:object size:0x8 data:4byte
lbl_1_rodata_57C = .rodata:0x0000057C; // type:object size:0x8 data:4byte
lbl_1_rodata_584 = .rodata:0x00000584; // type:object size:0x30 data:4byte
lbl_1_rodata_5B4 = .rodata:0x000005B4; // type:object size:0x18 data:4byte
lbl_1_rodata_584 = .rodata:0x00000584; // type:object size:0x30 data:float
lbl_1_rodata_5B4 = .rodata:0x000005B4; // type:object size:0x18 data:float
lbl_1_rodata_5CC = .rodata:0x000005CC; // type:object size:0x4 data:float
lbl_1_rodata_5D0 = .rodata:0x000005D0; // type:object size:0x4 data:float
lbl_1_rodata_5D8 = .rodata:0x000005D8; // type:object size:0x8 data:double
lbl_1_rodata_5E0 = .rodata:0x000005E0; // type:object size:0x4 data:float
lbl_1_rodata_5E8 = .rodata:0x000005E8; // type:object size:0x8 data:double
lbl_1_rodata_5F0 = .rodata:0x000005F0; // type:object size:0x4 data:float
lbl_1_rodata_5F8 = .rodata:0x000005F8; // type:object size:0x8 data:double
lbl_1_rodata_600 = .rodata:0x00000600; // type:object size:0x8 data:double
lbl_1_rodata_608 = .rodata:0x00000608; // type:object size:0x4 data:float
lbl_1_rodata_610 = .rodata:0x00000610; // type:object size:0x8 data:double
lbl_1_rodata_618 = .rodata:0x00000618; // type:object size:0x8 data:double
lbl_1_rodata_620 = .rodata:0x00000620; // type:object size:0x8 data:double
lbl_1_rodata_628 = .rodata:0x00000628; // type:object size:0x4 data:float
lbl_1_rodata_62C = .rodata:0x0000062C; // type:object size:0x4 data:float
lbl_1_rodata_630 = .rodata:0x00000630; // type:object size:0x4 data:float
lbl_1_rodata_634 = .rodata:0x00000634; // type:object size:0x4 data:float
lbl_1_rodata_638 = .rodata:0x00000638; // type:object size:0x4 data:float
lbl_1_rodata_63C = .rodata:0x0000063C; // type:object size:0x4 data:float
lbl_1_rodata_5D0 = .rodata:0x000005D0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_5D8 = .rodata:0x000005D8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_5E0 = .rodata:0x000005E0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_5E8 = .rodata:0x000005E8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_5F0 = .rodata:0x000005F0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_5F8 = .rodata:0x000005F8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_600 = .rodata:0x00000600; // type:object size:0x8 scope:local data:double
lbl_1_rodata_608 = .rodata:0x00000608; // type:object size:0x4 scope:local data:float
lbl_1_rodata_610 = .rodata:0x00000610; // type:object size:0x8 scope:local data:double
lbl_1_rodata_618 = .rodata:0x00000618; // type:object size:0x8 scope:local data:double
lbl_1_rodata_620 = .rodata:0x00000620; // type:object size:0x8 scope:local data:double
lbl_1_rodata_628 = .rodata:0x00000628; // type:object size:0x4 scope:local data:float
lbl_1_rodata_62C = .rodata:0x0000062C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_630 = .rodata:0x00000630; // type:object size:0x4 scope:local data:float
lbl_1_rodata_634 = .rodata:0x00000634; // type:object size:0x4 scope:local data:float
lbl_1_rodata_638 = .rodata:0x00000638; // type:object size:0x4 scope:local data:float
lbl_1_rodata_63C = .rodata:0x0000063C; // type:object size:0x4 scope:local data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0xA0
lbl_1_data_A0 = .data:0x000000A0; // type:object size:0x4 data:4byte
lbl_1_data_A4 = .data:0x000000A4; // type:object size:0x4 data:4byte
Expand All @@ -358,30 +358,30 @@ lbl_1_data_AC = .data:0x000000AC; // type:object size:0x1B data:string
lbl_1_data_C7 = .data:0x000000C7; // type:object size:0x22 data:string
lbl_1_data_E9 = .data:0x000000E9; // type:object size:0x1A data:string
lbl_1_data_103 = .data:0x00000103; // type:object size:0x1A data:string
lbl_1_data_11D = .data:0x0000011D; // type:object size:0xF
lbl_1_data_11D = .data:0x0000011D; // type:object size:0xE data:string
lbl_1_data_12C = .data:0x0000012C; // type:object size:0x4 data:4byte
lbl_1_data_130 = .data:0x00000130; // type:object size:0x16 data:string
lbl_1_data_146 = .data:0x00000146; // type:object size:0x13 data:string
lbl_1_data_159 = .data:0x00000159; // type:object size:0xE data:string
lbl_1_data_167 = .data:0x00000167; // type:object size:0xE data:string
lbl_1_data_175 = .data:0x00000175; // type:object size:0x13
lbl_1_data_175 = .data:0x00000175; // type:object size:0x12 data:string
lbl_1_data_188 = .data:0x00000188; // type:object size:0x4 data:float
lbl_1_data_18C = .data:0x0000018C; // type:object size:0x14 data:string
jumptable_1_data_1A0 = .data:0x000001A0; // type:object size:0x20 scope:local
lbl_1_data_1C0 = .data:0x000001C0; // type:object size:0x14
lbl_1_data_1C0 = .data:0x000001C0; // type:object size:0x12 data:string
jumptable_1_data_1D4 = .data:0x000001D4; // type:object size:0x30 scope:local
lbl_1_data_204 = .data:0x00000204; // type:object size:0x78
lbl_1_data_27C = .data:0x0000027C; // type:object size:0x90
lbl_1_data_30C = .data:0x0000030C; // type:object size:0x18
jumptable_1_data_324 = .data:0x00000324; // type:object size:0x2C scope:local
lbl_1_data_350 = .data:0x00000350; // type:object size:0x10 data:string
lbl_1_data_360 = .data:0x00000360; // type:object size:0x10 data:string
lbl_1_data_370 = .data:0x00000370; // type:object size:0x10 data:string
lbl_1_data_380 = .data:0x00000380; // type:object size:0x10 data:string
lbl_1_data_390 = .data:0x00000390; // type:object size:0x10 data:string
lbl_1_data_3A0 = .data:0x000003A0; // type:object size:0x10 data:string
lbl_1_data_3B0 = .data:0x000003B0; // type:object size:0x10 data:string
lbl_1_data_3C0 = .data:0x000003C0; // type:object size:0x10 data:string
lbl_1_data_350 = .data:0x00000350; // type:object size:0x10 scope:local data:string
lbl_1_data_360 = .data:0x00000360; // type:object size:0x10 scope:local data:string
lbl_1_data_370 = .data:0x00000370; // type:object size:0x10 scope:local data:string
lbl_1_data_380 = .data:0x00000380; // type:object size:0x10 scope:local data:string
lbl_1_data_390 = .data:0x00000390; // type:object size:0x10 scope:local data:string
lbl_1_data_3A0 = .data:0x000003A0; // type:object size:0x10 scope:local data:string
lbl_1_data_3B0 = .data:0x000003B0; // type:object size:0x10 scope:local data:string
lbl_1_data_3C0 = .data:0x000003C0; // type:object size:0x10 scope:local data:string
lbl_1_data_3D0 = .data:0x000003D0; // type:object size:0x20
lbl_1_data_3F0 = .data:0x000003F0; // type:object size:0x40
lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte
Expand Down
2 changes: 1 addition & 1 deletion configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -1118,7 +1118,7 @@ def Rel(lib_name, objects):
"m437Dll", # Balloon of Doom
objects={
Object(NonMatching, "REL/m437Dll/main.c"),
Object(NonMatching, "REL/m437Dll/sequence.c"),
Object(Matching, "REL/m437Dll/sequence.c"),
},
),
Rel(
Expand Down
73 changes: 73 additions & 0 deletions include/REL/m437Dll.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
#include "game/object.h"

#include "dolphin.h"

typedef struct {
/* 0x00 */ void (*unk00)(void);
/* 0x04 */ s32 (*unk04)(void);
/* 0x08 */ s32 unk08;
} StructData204; // Size 0xC

typedef struct {
/* 0x00 */ s32 unk00;
/* 0x04 */ StructData204* unk04;
/* 0x08 */ void (*unk08)(void);
/* 0x0C */ s32 (*unk0C)(void);
/* 0x10 */ s32 unk10;
/* 0x14 */ s32 unk14;
} StructBss50; // Size 0x18

typedef struct {
/* 0x00 */ void (*unk00)(void);
/* 0x04 */ void (*unk04)(void);
/* 0x08 */ float unk08;
/* 0x08 */ float unk0C;
/* 0x10 */ float unk10;
/* 0x14 */ float unk14;
/* 0x18 */ float unk18;
/* 0x1C */ float unk1C;
/* 0x20 */ float unk20;
/* 0x24 */ float unk24;
/* 0x28 */ float unk28;
/* 0x2C */ float unk2C;
/* 0x30 */ float unk30;
/* 0x34 */ float unk34;
/* 0x38 */ float unk38;
/* 0x3C */ float unk3C;
/* 0x40 */ s32 unk40;
/* 0x44 */ s32 unk44[7];
/* 0x60 */ float unk60[7];
} StructBss160; // Size 0x7C

typedef struct {
/* 0x00 */ s32 unk00;
/* 0x04 */ char unk04[128];
/* 0x84 */ s32 unk84;
/* 0x88 */ s32 unk88;
/* 0x8C */ s32 unk8C;
/* 0x90 */ s32 unk90;
/* 0x94 */ s32 unk94[20];
/* 0xE4 */ omObjData* unkE4;
} StructFn15CD0; // Size 0xE8

float fn_1_11348(float arg0, float arg1, float arg2, float arg3);
float fn_1_11370(float arg0, float arg1, float arg2);
float fn_1_113B0(float arg0, float arg1, float arg2, float arg3);
float fn_1_11478(float arg0, float arg1, float arg2, float arg3);
float fn_1_11540(float arg0, float arg1, float arg2, float arg3);
void fn_1_11668(StructBss50* arg0, StructData204* arg1);
s32 fn_1_116C4(StructBss50* arg0);
s32 fn_1_117C0(StructBss50* arg0, s32 arg1);
s32 fn_1_11854(StructBss50* arg0, s32 arg1);
s32 fn_1_11890(omObjData* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
void fn_1_119A0(omObjData* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
void fn_1_11B18(omObjData* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
s32 fn_1_11CE0(omObjData* arg0, Vec arg1, float arg2, float arg3, float arg4, float arg5, s32 arg6);
void fn_1_12ABC(StructBss160* arg0);
void fn_1_12E14(StructBss160* arg0, float arg1);
void fn_1_13658(StructBss160* arg0, StructBss160* arg1, float arg2, float arg3, float arg4);
void fn_1_15544(StructBss160* arg0, StructBss160* arg1, float arg2, float arg3, float arg4);
void fn_1_15CD0(StructFn15CD0* arg0, s32 arg1);
void fn_1_15DC8(StructFn15CD0* arg0);
void fn_1_164B0(Process* arg0, StructFn15CD0* arg1, s32 arg2, const char* arg3);
void fn_1_1660C(Process* arg0, StructFn15CD0* arg1, s32 arg2, s32 arg3);
5 changes: 5 additions & 0 deletions include/game/gamework_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,11 @@ static inline s32 GWBoardGet(void)
return GWSystem.board;
}

static inline s32 GWPlayerCurrGet(void)
{
return GWSystem.player_curr;
}

static inline s32 GWPlayerTeamGet(s32 player)
{
return GWPlayer[player].team;
Expand Down
Loading

0 comments on commit 5ed45bd

Please sign in to comment.