Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Decompile free play code #380

Merged
merged 1 commit into from
Aug 1, 2024
Merged

Decompile free play code #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions config/GMPE01_00/rels/mgmodedll/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,13 +475,13 @@ lbl_1_data_90 = .data:0x00000090; // type:object size:0xA data:string
lbl_1_data_9A = .data:0x0000009A; // type:object size:0x6
lbl_1_data_A0 = .data:0x000000A0; // type:object size:0x2 data:2byte
lbl_1_data_A2 = .data:0x000000A2; // type:object size:0xE
lbl_1_data_B0 = .data:0x000000B0; // type:object size:0x10
lbl_1_data_B0 = .data:0x000000B0; // type:object size:0x10 data:float
lbl_1_data_C0 = .data:0x000000C0; // type:object size:0x10
lbl_1_data_D0 = .data:0x000000D0; // type:object size:0x6
lbl_1_data_D6 = .data:0x000000D6; // type:object size:0xA
lbl_1_data_E0 = .data:0x000000E0; // type:object size:0x20
messInsertBase$836 = .data:0x000000D0; // type:object size:0x6 scope:local
customMinNum$837 = .data:0x000000D6; // type:object size:0x8 scope:local
lbl_1_data_E0 = .data:0x000000E0; // type:object size:0x20 data:float
lbl_1_data_100 = .data:0x00000100; // type:object size:0x10
lbl_1_data_110 = .data:0x00000110; // type:object size:0x10
lbl_1_data_110 = .data:0x00000110; // type:object size:0xC
lbl_1_data_120 = .data:0x00000120; // type:object size:0x28
lbl_1_data_148 = .data:0x00000148; // type:object size:0x2 data:2byte
lbl_1_data_14A = .data:0x0000014A; // type:object size:0x8
Expand Down Expand Up @@ -548,7 +548,7 @@ lbl_1_bss_318 = .bss:0x00000318; // type:object size:0x28 data:2byte
lbl_1_bss_340 = .bss:0x00000340; // type:object size:0x8
lbl_1_bss_348 = .bss:0x00000348; // type:object size:0x2 data:2byte
lbl_1_bss_34A = .bss:0x0000034A; // type:object size:0x8 data:2byte
lbl_1_bss_352 = .bss:0x00000352; // type:object size:0x1E
lbl_1_bss_352 = .bss:0x00000352; // type:object size:0x1C
lbl_1_bss_370 = .bss:0x00000370; // type:object size:0xC
lbl_1_bss_37C = .bss:0x0000037C; // type:object size:0xC
lbl_1_bss_388 = .bss:0x00000388; // type:object size:0x2 data:2byte
Expand Down
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1332,7 +1332,7 @@ def Rel(lib_name, objects):
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/mgmodedll/mgmode.c"),
Object(NonMatching, "REL/mgmodedll/free_play.c"),
Object(Matching, "REL/mgmodedll/free_play.c"),
Object(NonMatching, "REL/mgmodedll/record.c"),
Object(NonMatching, "REL/mgmodedll/battle.c"),
Object(NonMatching, "REL/mgmodedll/tictactoe.c"),
Expand Down
9 changes: 8 additions & 1 deletion include/REL/mgmodedll.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,15 @@ typedef struct struct_bss8 {
extern s16 lbl_1_bss_2C80[13];
extern s16 lbl_1_bss_2C66[13];
extern s16 lbl_1_bss_2C2C[29];
extern s16 lbl_1_bss_264C[10][70];
extern s16 lbl_1_bss_2638[10];
extern s16 lbl_1_bss_20C0[10][70];
extern s16 lbl_1_bss_20AC[10];
extern s16 lbl_1_bss_2A6;
extern s16 lbl_1_bss_2A4;

extern StructBss8 lbl_1_bss_8;
extern s16 lbl_1_bss_4;

extern s16 lbl_1_data_A2[];
extern DataListModel lbl_1_data_490[];
Expand All @@ -80,12 +86,13 @@ 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_25E74(s16 arg0);
void fn_1_25E74(s32 arg0);

void fn_1_267E8(DataListModel *model_list);
void fn_1_26A78(DataListSprite *sprite_list);
void fn_1_26C28(void);

s32 fn_1_2783C(s16 evtno);
void fn_1_279FC(s32 coinSkipF);

#endif
4 changes: 2 additions & 2 deletions include/game/gamework.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ void GWBoardWinCountSet(s32 character, s32 board, s32 value);
s32 GWMGAvailGet(s32 id);
s32 GWMGAvailSet(s32 id);
s32 GWMGCustomGet(s32 id);
s32 GWMGCustomSet(s32 id);
s32 GWMGCustomReset(s32 id);
void GWMGCustomSet(s32 id);
void GWMGCustomReset(s32 id);
s16 GWCoinsGet(s32 player);
void GWCoinsSet(s32 player, s16 value);
void GWCoinsAdd(s32 player, s16 amount);
Expand Down
Loading
Loading