Skip to content

Commit

Permalink
Matched REL/mgmodedll/main.c
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrshigure
mrshigure committed Aug 18, 2024
1 parent 8b6360d commit 00765fd
Show file tree
Hide file tree
Showing 5 changed files with 2,701 additions and 60 deletions.
34 changes: 17 additions & 17 deletions config/GMPE01_00/rels/mgmodedll/symbols.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ lbl_1_rodata_5B0 = .rodata:0x000005B0; // type:object size:0x4 scope:local data:
lbl_1_rodata_5B4 = .rodata:0x000005B4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_5B8 = .rodata:0x000005B8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_5BC = .rodata:0x000005BC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_5C0 = .rodata:0x000005C0; // type:object size:0xC scope:local data:4byte
lbl_1_rodata_5C0 = .rodata:0x000005C0; // type:object size:0xC scope:local data:float
lbl_1_rodata_5CC = .rodata:0x000005CC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_5D0 = .rodata:0x000005D0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_5D4 = .rodata:0x000005D4; // type:object size:0x4 scope:local data:float
Expand Down Expand Up @@ -431,9 +431,9 @@ lbl_1_rodata_6A0 = .rodata:0x000006A0; // type:object size:0x8 scope:local data:
lbl_1_rodata_6A8 = .rodata:0x000006A8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_6AC = .rodata:0x000006AC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_6B0 = .rodata:0x000006B0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_6B4 = .rodata:0x000006B4; // type:object size:0xC scope:local data:4byte
lbl_1_rodata_6C0 = .rodata:0x000006C0; // type:object size:0xC scope:local data:4byte
lbl_1_rodata_6CC = .rodata:0x000006CC; // type:object size:0xC scope:local data:4byte
lbl_1_rodata_6B4 = .rodata:0x000006B4; // type:object size:0xC scope:local data:float
lbl_1_rodata_6C0 = .rodata:0x000006C0; // type:object size:0xC scope:local data:float
lbl_1_rodata_6CC = .rodata:0x000006CC; // type:object size:0xC scope:local data:float
lbl_1_rodata_6D8 = .rodata:0x000006D8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_6DC = .rodata:0x000006DC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_6E0 = .rodata:0x000006E0; // type:object size:0x4 scope:local data:float
Expand All @@ -446,7 +446,7 @@ lbl_1_rodata_6F8 = .rodata:0x000006F8; // type:object size:0x4 scope:local data:
lbl_1_rodata_6FC = .rodata:0x000006FC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_700 = .rodata:0x00000700; // type:object size:0x4 scope:local data:float
lbl_1_rodata_708 = .rodata:0x00000708; // type:object size:0x8 scope:local data:double
lbl_1_rodata_710 = .rodata:0x00000710; // type:object size:0x8 scope:local data:float
lbl_1_rodata_710 = .rodata:0x00000710; // type:object size:0x4 scope:local data:float
lbl_1_rodata_718 = .rodata:0x00000718; // type:object size:0x4 scope:local data:float
lbl_1_rodata_720 = .rodata:0x00000720; // type:object size:0x8 scope:local data:double
lbl_1_rodata_728 = .rodata:0x00000728; // type:object size:0x4 scope:local data:float
Expand Down Expand Up @@ -493,21 +493,21 @@ lbl_1_data_1AC = .data:0x000001AC; // type:object size:0x10
lbl_1_data_1BC = .data:0x000001BC; // type:object size:0xA data:string
lbl_1_data_1C6 = .data:0x000001C6; // type:object size:0xE data:string
lbl_1_data_1D4 = .data:0x000001D4; // type:object size:0xB data:string
lbl_1_data_1E4 = .data:0x000001E4; // type:object size:0x24 data:string
lbl_1_data_208 = .data:0x00000208; // type:object size:0x26 data:string
lbl_1_data_22E = .data:0x0000022E; // type:object size:0x27 data:string
lbl_1_data_255 = .data:0x00000255; // type:object size:0x1C data:string
lbl_1_data_271 = .data:0x00000271; // type:object size:0x1B data:string
lbl_1_data_28C = .data:0x0000028C; // type:object size:0x1C data:string
lbl_1_data_2A8 = .data:0x000002A8; // type:object size:0x1D data:string
lbl_1_data_2C5 = .data:0x000002C5; // type:object size:0xC data:string
lbl_1_data_2D1 = .data:0x000002D1; // type:object size:0x1A data:string
lbl_1_data_2EB = .data:0x000002EB; // type:object size:0x1A data:string
lbl_1_data_305 = .data:0x00000305; // type:object size:0x27
lbl_1_data_1E4 = .data:0x000001E4; // type:object size:0x24 scope:local data:string
lbl_1_data_208 = .data:0x00000208; // type:object size:0x26 scope:local data:string
lbl_1_data_22E = .data:0x0000022E; // type:object size:0x27 scope:local data:string
lbl_1_data_255 = .data:0x00000255; // type:object size:0x1C scope:local data:string
lbl_1_data_271 = .data:0x00000271; // type:object size:0x1B scope:local data:string
lbl_1_data_28C = .data:0x0000028C; // type:object size:0x1C scope:local data:string
lbl_1_data_2A8 = .data:0x000002A8; // type:object size:0x1D scope:local data:string
lbl_1_data_2C5 = .data:0x000002C5; // type:object size:0xC scope:local data:string
lbl_1_data_2D1 = .data:0x000002D1; // type:object size:0x1A scope:local data:string
lbl_1_data_2EB = .data:0x000002EB; // type:object size:0x1A scope:local data:string
lbl_1_data_305 = .data:0x00000305; // type:object size:0x26 scope:local data:string
lbl_1_data_32C = .data:0x0000032C; // type:object size:0x40 data:4byte
lbl_1_data_36C = .data:0x0000036C; // type:object size:0x60
lbl_1_data_3CC = .data:0x000003CC; // type:object size:0x18 data:4byte
lbl_1_data_3E4 = .data:0x000003E4; // type:object size:0x64
lbl_1_data_3E4 = .data:0x000003E4; // type:object size:0x64 data:float
lbl_1_data_448 = .data:0x00000448; // type:object size:0x40
lbl_1_data_488 = .data:0x00000488; // type:object size:0x4 data:4byte
lbl_1_data_490 = .data:0x00000490; // type:object size:0x2D8
Expand Down
2 changes: 1 addition & 1 deletion configure.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1336,7 +1336,7 @@ def Rel(lib_name, objects):
Object(Matching, "REL/mgmodedll/record.c"),
Object(Matching, "REL/mgmodedll/battle.c"),
Object(NonMatching, "REL/mgmodedll/tictactoe.c"),
Object(NonMatching, "REL/mgmodedll/main.c"),
Object(Matching, "REL/mgmodedll/main.c"),
Object(Matching, "REL/mgmodedll/datalist.c"),
Object(Matching, "REL/mgmodedll/minigame.c"),
},
Expand Down
82 changes: 43 additions & 39 deletions include/REL/mgmodedll.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,47 +12,51 @@
#include "game/pad.h"

typedef struct datalist_model {
s32 datanum;
u32 attr;
s16 type;
s16 link;
s16 mot_link;
Vec pos;
Vec rot;
Vec scale;
} DataListModel;
s32 datanum;
u32 attr;
s16 type;
s16 link;
s16 mot_link;
Vec pos;
Vec rot;
Vec scale;
} DataListModel; // Size 0x34

typedef struct datalist_sprite {
u32 datanum;
s16 attr;
s16 prio;
float x;
float y;
GXColor color;
} DataListSprite;
u32 datanum;
s16 attr;
s16 prio;
float x;
float y;
GXColor color;
} DataListSprite; // Size 0x14

typedef struct struct_bss8_24 {
u8 unk0[0x5C];
s32 unk5C;
s32 unk60;
s32 unk64;
s32 unk68;
s32 unk6C;
u8 unk70[0x20];
} StructBss8_24;
omObjData *unk0;
void (*unk4)(omObjData*, ...);
u8 unk8[0x50];
s32 unk58;
s32 unk5C;
s32 unk60;
s32 unk64;
s32 unk68;
s32 unk6C;
s32 unk70[4];
s32 unk80[4];
} StructBss8_24; // Size 0x90

typedef struct struct_bss8 {
s32 unk0;
s32 unk4;
s32 unk8;
s32 unkC;
s32 unk10;
s32 unk14;
s32 unk18;
s32 unk1C;
s32 unk20;
StructBss8_24 unk24[4];
} StructBss8;
s32 unk0;
s32 unk4;
s32 unk8;
s32 unkC;
s32 unk10;
s32 unk14;
s32 unk18;
s32 unk1C;
s32 unk20;
StructBss8_24 unk24[4];
} StructBss8; // Size 0x264

extern s16 lbl_1_bss_2C80[13];
extern s16 lbl_1_bss_2C66[13];
Expand Down Expand Up @@ -93,11 +97,11 @@ void fn_1_18DF8(Process *arg0, StructBss8 *arg1);
void fn_1_19018(void);
s32 fn_1_194C8(s32 arg0);

void fn_1_25584(s16 arg0);
s32 fn_1_2530C(s32 arg0, s32 arg1, s32 arg2);
void fn_1_25838(s16 arg0, u32 arg1, s32 arg2, s32 arg3);
s32 fn_1_2592C(u32 arg0, s32 arg1, s32 arg2);
s32 fn_1_25CA8(u32 arg0);
void fn_1_25584(s32 arg0);
void fn_1_25838(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
s32 fn_1_2592C(s32 arg0, s32 arg1, s32 arg2);
s32 fn_1_25CA8(s32 arg0);
void fn_1_25E74(s32 arg0);

void fn_1_267E8(DataListModel *model_list);
Expand Down
4 changes: 1 addition & 3 deletions src/REL/m409Dll/player.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -777,8 +777,7 @@ void fn_1_962C(omObjData* arg0) {
lbl_1_bss_108++;
break;
case 3:
var_r26 = arg0->model[lbl_1_bss_106 + 1];
Hu3DModelAttrReset(var_r26, 1);
Hu3DModelAttrReset(var_r26 = arg0->model[lbl_1_bss_106 + 1], 1);
Hu3DModelHookSet(arg0->model[0], "g001mk-itemhook_r", var_r26);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 8.0f, 0);
HuAudFXPlay(0x558);
Expand Down Expand Up @@ -928,7 +927,6 @@ void fn_1_962C(omObjData* arg0) {
if (lbl_1_bss_108 == 2 && var_r27 >= arg0->work[0]) {
lbl_1_bss_108++;
}
(void)var_r27;
}

s32 fn_1_A584(unkStruct10* arg0) {
Expand Down
Loading

0 comments on commit 00765fd

Please sign in to comment.