Skip to content

gm_1601 part 2 #2185

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

Merged
ribbanya merged 69 commits into from
Feb 26, 2026
Merged

gm_1601 part 2 #2185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
e2cea2c
78% of fn_801652D8
jurrejelle Feb 22, 2026
cf6799e
88% of fn_801652D8
jurrejelle Feb 22, 2026
bb76a0f
97% of gm_801628C4
jurrejelle Feb 22, 2026
f50eec5
Use memory instead of direct strings
jurrejelle Feb 22, 2026
4742982
79% of gm_80162800, and also annotating sizes of a bunch of structs. …
jurrejelle Feb 22, 2026
54c6dfb
I give up on gm_80162800, the memory stumps me. Maybe PlayerMatchData…
jurrejelle Feb 22, 2026
bf38a88
86% of gm_801674C4
jurrejelle Feb 22, 2026
42548c0
improve match on gm_80163298
jurrejelle Feb 22, 2026
345c841
Missing newline
jurrejelle Feb 22, 2026
d999320
fn_8016A09C of gm_1601 minus some register drift
jurrejelle Feb 22, 2026
42b62ef
94% of gm_80168638
jurrejelle Feb 22, 2026
564b2bb
95.11% of fn_801652D8
jurrejelle Feb 22, 2026
64f8e87
Fix offsets in match end struct
jurrejelle Feb 22, 2026
2924e90
Fix gm_80162800 to 95%
jurrejelle Feb 22, 2026
2518b88
98% of gm_801688AC
jurrejelle Feb 22, 2026
89f8f9a
100% of gm_80162800
jurrejelle Feb 22, 2026
ba2ba2e
100% of gm_801688AC
jurrejelle Feb 22, 2026
e8281f3
99.89% of gm_80163374
jurrejelle Feb 22, 2026
2570ab4
clang-format
jurrejelle Feb 22, 2026
d6a2e4c
Change sprintf type to int
jurrejelle Feb 22, 2026
275f8a3
revert gmmain change
jurrejelle Feb 22, 2026
4c13e7e
improvement in gm_80160B40
jurrejelle Feb 23, 2026
cbd332d
93% of gm_801634D4
jurrejelle Feb 23, 2026
74f7694
tiny improvement on gm_801674C4
jurrejelle Feb 23, 2026
3305da1
79% of gm_80163B9C
jurrejelle Feb 23, 2026
e89e552
100% of gm_80164250
jurrejelle Feb 23, 2026
6e17bd4
100% of gm_8016279C
jurrejelle Feb 23, 2026
1fbb2da
99.8% of fn_8016989C
jurrejelle Feb 23, 2026
387ab02
100% of gm_80162C48
jurrejelle Feb 23, 2026
2f815d4
fix build crash
jurrejelle Feb 23, 2026
5867ff8
100% of gm_80162E44
jurrejelle Feb 23, 2026
54fa4ea
100% of gm_80163040
jurrejelle Feb 23, 2026
d9d15cf
early return for tiny improvement on gm_80167470
jurrejelle Feb 23, 2026
371cf82
97.52% of fn_801697FC
jurrejelle Feb 23, 2026
8d7f2db
86.59% of gm_80164A0C
jurrejelle Feb 23, 2026
be1b096
start on gm_80160C90
jurrejelle Feb 23, 2026
ac1dc49
86% of gm_8016247C
jurrejelle Feb 24, 2026
cca0762
build error
jurrejelle Feb 24, 2026
58d04f9
Change struct setup
Feb 24, 2026
d59675c
100% of gm_80163374
jurrejelle Feb 24, 2026
f27d45d
Improve more functions
Feb 24, 2026
0465076
cleanup gm_801634D4
Feb 24, 2026
8a9290f
100% on gm_80168638
jurrejelle Feb 24, 2026
71e016b
94.3% of gm_80162A98
jurrejelle Feb 24, 2026
99b5dd2
95.56% of gm_8016468C
jurrejelle Feb 24, 2026
ec10bfb
99.26% of gm_8016468C
jurrejelle Feb 24, 2026
c6f1805
99.3% of gm_80164F18
jurrejelle Feb 24, 2026
ef38d40
96.41% of gm_80164330
jurrejelle Feb 24, 2026
7f308ef
cleanup of fn_8016989C
jurrejelle Feb 24, 2026
02b075a
100% of fn_80165D60
jurrejelle Feb 24, 2026
52eecd1
fix regression
jurrejelle Feb 24, 2026
008003a
Proper fix for the diff I caused + cleanup on 17AD
jurrejelle Feb 24, 2026
bb7c2c5
Remove references to stuff that doesn't need a reference
jurrejelle Feb 24, 2026
8b06020
Merge branch 'master' into jj/gm_1601_part_2
jurrejelle Feb 24, 2026
0aaeb4e
97.3% of fn_80169900
jurrejelle Feb 25, 2026
0a361cd
80.04% of gm_80166A98
jurrejelle Feb 25, 2026
95d9bef
74% of gm_8016A22C
jurrejelle Feb 25, 2026
5e37f43
Remove extra arguments
jurrejelle Feb 25, 2026
64862da
Revert further unneeded changes
jurrejelle Feb 25, 2026
30478c9
gm_8016247C to 94.8%
jurrejelle Feb 25, 2026
092ce18
rename gm_801628C4
jurrejelle Feb 25, 2026
1b1eb45
cleanup on fn_8016A09C
jurrejelle Feb 25, 2026
7e3039c
remove trailing spaces
jurrejelle Feb 25, 2026
9594b48
Bump for nix issue
jurrejelle Feb 25, 2026
b04851d
Some permuter fixes
Feb 26, 2026
9bed2ae
Merge branch 'master' into jj/gm_1601_part_2
ribbanya Feb 26, 2026
f163f70
Tweak data sections
ribbanya Feb 26, 2026
4e02da1
Run `clang-format`
ribbanya Feb 26, 2026
17b6766
Fix broken function
ribbanya Feb 26, 2026
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
6 changes: 3 additions & 3 deletions config/GALE01/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,10 +1823,10 @@ melee/gm/gmmain.c:

melee/gm/gm_1601.c:
.text start:0x801601C4 end:0x8016AE38
.rodata start:0x803B75F8 end:0x803B7A60
.rodata start:0x803B75F8 end:0x803B7A44
.data start:0x803D4C38 end:0x803D5620
.bss start:0x8046B378 end:0x8046B6A0
.sdata start:0x804D3EF8 end:0x804D3F68
.sdata start:0x804D3EF8 end:0x804D3F67
.sbss start:0x804D6598 end:0x804D65A0
.sdata2 start:0x804DA230 end:0x804DA298

Expand All @@ -1838,7 +1838,7 @@ melee/gm/gm_16AE.c:

melee/gm/gm_16F1.c:
.text start:0x8016F180 end:0x80174274
.rodata start:0x803B7A60 end:0x803B7B18
.rodata start:0x803B7A44 end:0x803B7B18
.data start:0x803D5648 end:0x803D6488
.bss start:0x8046DBC8 end:0x8046DBE8
.sbss start:0x804D65A0 end:0x804D65B8
Expand Down
118 changes: 59 additions & 59 deletions config/GALE01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21986,46 +21986,46 @@ gmMainLib_803D4ABC = .data:0x803D4ABC; // type:object size:0x9 scope:global data
@253 = .data:0x803D4BE4; // type:object size:0x27 scope:local data:string
@254 = .data:0x803D4C0C; // type:object size:0x26 scope:local data:string
lbl_803D4C38 = .data:0x803D4C38; // type:object size:0xF data:sjis
lbl_803D4C48 = .data:0x803D4C48; // type:object size:0x10 data:sjis
lbl_803D4C58 = .data:0x803D4C58; // type:object size:0xC data:sjis
lbl_803D4C64 = .data:0x803D4C64; // type:object size:0x18 data:sjis
lbl_803D4C7C = .data:0x803D4C7C; // type:object size:0xC data:sjis
lbl_803D4C88 = .data:0x803D4C88; // type:object size:0xC data:sjis
lbl_803D4C94 = .data:0x803D4C94; // type:object size:0xC data:sjis
lbl_803D4CA0 = .data:0x803D4CA0; // type:object size:0xC data:sjis
lbl_803D4CAC = .data:0x803D4CAC; // type:object size:0x14 data:sjis
lbl_803D4CC0 = .data:0x803D4CC0; // type:object size:0xC data:sjis
lbl_803D4CCC = .data:0x803D4CCC; // type:object size:0xC data:sjis
lbl_803D4CD8 = .data:0x803D4CD8; // type:object size:0x10 data:sjis
lbl_803D4CE8 = .data:0x803D4CE8; // type:object size:0x10 data:sjis
lbl_803D4CF8 = .data:0x803D4CF8; // type:object size:0xC data:sjis
lbl_803D4D04 = .data:0x803D4D04; // type:object size:0x10 data:sjis
lbl_803D4D14 = .data:0x803D4D14; // type:object size:0x10 data:sjis
lbl_803D4D24 = .data:0x803D4D24; // type:object size:0x10 data:sjis
lbl_803D4D34 = .data:0x803D4D34; // type:object size:0x10 data:sjis
lbl_803D4D44 = .data:0x803D4D44; // type:object size:0xC data:sjis
lbl_803D4D50 = .data:0x803D4D50; // type:object size:0x14 data:sjis
lbl_803D4D64 = .data:0x803D4D64; // type:object size:0x10 data:sjis
lbl_803D4C48 = .data:0x803D4C48; // type:object size:0xF data:sjis
lbl_803D4C58 = .data:0x803D4C58; // type:object size:0xB data:sjis
lbl_803D4C64 = .data:0x803D4C64; // type:object size:0x17 data:sjis
lbl_803D4C7C = .data:0x803D4C7C; // type:object size:0x9 data:sjis
lbl_803D4C88 = .data:0x803D4C88; // type:object size:0x9 data:sjis
lbl_803D4C94 = .data:0x803D4C94; // type:object size:0xB data:sjis
lbl_803D4CA0 = .data:0x803D4CA0; // type:object size:0xB data:sjis
lbl_803D4CAC = .data:0x803D4CAC; // type:object size:0x11 data:sjis
lbl_803D4CC0 = .data:0x803D4CC0; // type:object size:0x9 data:sjis
lbl_803D4CCC = .data:0x803D4CCC; // type:object size:0x9 data:sjis
lbl_803D4CD8 = .data:0x803D4CD8; // type:object size:0xD data:sjis
lbl_803D4CE8 = .data:0x803D4CE8; // type:object size:0xF data:sjis
lbl_803D4CF8 = .data:0x803D4CF8; // type:object size:0x9 data:sjis
lbl_803D4D04 = .data:0x803D4D04; // type:object size:0xD data:sjis
lbl_803D4D14 = .data:0x803D4D14; // type:object size:0xF data:sjis
lbl_803D4D24 = .data:0x803D4D24; // type:object size:0xF data:sjis
lbl_803D4D34 = .data:0x803D4D34; // type:object size:0xF data:sjis
lbl_803D4D44 = .data:0x803D4D44; // type:object size:0xB data:sjis
lbl_803D4D50 = .data:0x803D4D50; // type:object size:0x11 data:sjis
lbl_803D4D64 = .data:0x803D4D64; // type:object size:0xF data:sjis
lbl_803D4D74 = .data:0x803D4D74; // type:object size:0x84
lbl_803D4DF8 = .data:0x803D4DF8; // type:object size:0x14 data:sjis
lbl_803D4E0C = .data:0x803D4E0C; // type:object size:0x20 data:sjis
lbl_803D4E2C = .data:0x803D4E2C; // type:object size:0xC data:sjis
lbl_803D4E38 = .data:0x803D4E38; // type:object size:0x10 data:sjis
lbl_803D4E48 = .data:0x803D4E48; // type:object size:0xC data:sjis
lbl_803D4E54 = .data:0x803D4E54; // type:object size:0xC data:sjis
lbl_803D4E60 = .data:0x803D4E60; // type:object size:0xC data:sjis
lbl_803D4E6C = .data:0x803D4E6C; // type:object size:0xC data:sjis
lbl_803D4E78 = .data:0x803D4E78; // type:object size:0x10 data:sjis
lbl_803D4E88 = .data:0x803D4E88; // type:object size:0xC data:sjis
lbl_803D4E94 = .data:0x803D4E94; // type:object size:0xC data:sjis
lbl_803D4EA0 = .data:0x803D4EA0; // type:object size:0x10 data:sjis
lbl_803D4DF8 = .data:0x803D4DF8; // type:object size:0x12 data:sjis
lbl_803D4E0C = .data:0x803D4E0C; // type:object size:0x1E data:sjis
lbl_803D4E2C = .data:0x803D4E2C; // type:object size:0xB data:sjis
lbl_803D4E38 = .data:0x803D4E38; // type:object size:0xD data:sjis
lbl_803D4E48 = .data:0x803D4E48; // type:object size:0x9 data:sjis
lbl_803D4E54 = .data:0x803D4E54; // type:object size:0xB data:sjis
lbl_803D4E60 = .data:0x803D4E60; // type:object size:0xB data:sjis
lbl_803D4E6C = .data:0x803D4E6C; // type:object size:0xB data:sjis
lbl_803D4E78 = .data:0x803D4E78; // type:object size:0xD data:sjis
lbl_803D4E88 = .data:0x803D4E88; // type:object size:0x9 data:sjis
lbl_803D4E94 = .data:0x803D4E94; // type:object size:0xB data:sjis
lbl_803D4EA0 = .data:0x803D4EA0; // type:object size:0xF data:sjis
lbl_803D4EB0 = .data:0x803D4EB0; // type:object size:0x18 data:sjis
lbl_803D4EC8 = .data:0x803D4EC8; // type:object size:0x18 data:sjis
lbl_803D4EE0 = .data:0x803D4EE0; // type:object size:0xC data:sjis
lbl_803D4EEC = .data:0x803D4EEC; // type:object size:0xC data:sjis
lbl_803D4EF8 = .data:0x803D4EF8; // type:object size:0xC data:sjis
lbl_803D4F04 = .data:0x803D4F04; // type:object size:0xC data:sjis
lbl_803D4F10 = .data:0x803D4F10; // type:object size:0xC data:sjis
lbl_803D4EC8 = .data:0x803D4EC8; // type:object size:0x15 data:sjis
lbl_803D4EE0 = .data:0x803D4EE0; // type:object size:0xB data:sjis
lbl_803D4EEC = .data:0x803D4EEC; // type:object size:0xB data:sjis
lbl_803D4EF8 = .data:0x803D4EF8; // type:object size:0xB data:sjis
lbl_803D4F04 = .data:0x803D4F04; // type:object size:0xB data:sjis
lbl_803D4F10 = .data:0x803D4F10; // type:object size:0xB data:sjis
lbl_803D4F1C = .data:0x803D4F1C; // type:object size:0x14 data:sjis
lbl_803D4F30 = .data:0x803D4F30; // type:object size:0x14 data:sjis
lbl_803D4F44 = .data:0x803D4F44; // type:object size:0xC data:sjis
Expand Down Expand Up @@ -26211,26 +26211,26 @@ gmMainLib_804D3EE4 = .sdata:0x804D3EE4; // type:object size:0x1 scope:global dat
@251 = .sdata:0x804D3EE8; // type:object size:0x3 scope:local data:string
@252 = .sdata:0x804D3EEC; // type:object size:0x6 scope:local data:string
@255 = .sdata:0x804D3EF4; // type:object size:0x4 scope:local data:string
lbl_804D3EF8 = .sdata:0x804D3EF8; // type:object size:0x8 data:sjis
lbl_804D3F00 = .sdata:0x804D3F00; // type:object size:0x8 data:sjis
lbl_804D3F08 = .sdata:0x804D3F08; // type:object size:0x8 data:sjis
lbl_804D3F10 = .sdata:0x804D3F10; // type:object size:0x8 data:sjis
lbl_804D3F18 = .sdata:0x804D3F18; // type:object size:0x8 data:sjis
lbl_804D3F20 = .sdata:0x804D3F20; // type:object size:0x8 data:sjis
lbl_804D3F28 = .sdata:0x804D3F28; // type:object size:0x8 data:sjis
lbl_804D3F30 = .sdata:0x804D3F30; // type:object size:0x8 data:sjis
lbl_804D3F38 = .sdata:0x804D3F38; // type:object size:0x8 data:sjis
lbl_804D3F40 = .sdata:0x804D3F40; // type:object size:0x8 data:sjis
lbl_804D3F48 = .sdata:0x804D3F48; // type:object size:0x8 data:sjis
lbl_804D3F50 = .sdata:0x804D3F50; // type:object size:0x8 data:sjis
lbl_804D3F58 = .sdata:0x804D3F58; // type:object size:0x8 data:sjis
lbl_804D3F60 = .sdata:0x804D3F60; // type:object size:0x8 data:sjis
lbl_804D3F68 = .sdata:0x804D3F68; // type:object size:0x2 data:string
lbl_804D3F6C = .sdata:0x804D3F6C; // type:object size:0x2 data:string
lbl_804D3F70 = .sdata:0x804D3F70; // type:object size:0x6 data:string
lbl_804D3F78 = .sdata:0x804D3F78; // type:object size:0x7 data:string
lbl_804D3F80 = .sdata:0x804D3F80; // type:object size:0x7 data:string
lbl_804D3F88 = .sdata:0x804D3F88; // type:object size:0x3 data:string
lbl_804D3EF8 = .sdata:0x804D3EF8; // type:object size:0x7 scope:local data:sjis
lbl_804D3F00 = .sdata:0x804D3F00; // type:object size:0x7 scope:local data:sjis
lbl_804D3F08 = .sdata:0x804D3F08; // type:object size:0x7 scope:local data:sjis
lbl_804D3F10 = .sdata:0x804D3F10; // type:object size:0x7 scope:local data:sjis
lbl_804D3F18 = .sdata:0x804D3F18; // type:object size:0x7 scope:local data:sjis
lbl_804D3F20 = .sdata:0x804D3F20; // type:object size:0x7 scope:local data:sjis
lbl_804D3F28 = .sdata:0x804D3F28; // type:object size:0x7 scope:local data:sjis
lbl_804D3F30 = .sdata:0x804D3F30; // type:object size:0x7 scope:local data:sjis
lbl_804D3F38 = .sdata:0x804D3F38; // type:object size:0x7 scope:local data:sjis
lbl_804D3F40 = .sdata:0x804D3F40; // type:object size:0x7 scope:local data:sjis
lbl_804D3F48 = .sdata:0x804D3F48; // type:object size:0x7 scope:local data:sjis
lbl_804D3F50 = .sdata:0x804D3F50; // type:object size:0x7 scope:local data:sjis
lbl_804D3F58 = .sdata:0x804D3F58; // type:object size:0x7 scope:local data:sjis
lbl_804D3F60 = .sdata:0x804D3F60; // type:object size:0x7 scope:local data:sjis
lbl_804D3F68 = .sdata:0x804D3F68; // type:object size:0x2 scope:local data:string
lbl_804D3F6C = .sdata:0x804D3F6C; // type:object size:0x2 scope:local data:string
lbl_804D3F70 = .sdata:0x804D3F70; // type:object size:0x6 scope:local data:string
lbl_804D3F78 = .sdata:0x804D3F78; // type:object size:0x7 scope:local data:string
lbl_804D3F80 = .sdata:0x804D3F80; // type:object size:0x7 scope:local data:string
lbl_804D3F88 = .sdata:0x804D3F88; // type:object size:0x3 scope:local data:string
lbl_804D3F8C = .sdata:0x804D3F8C; // type:object size:0x8
lbl_804D3F94 = .sdata:0x804D3F94; // type:object size:0x3 data:string
lbl_804D3F98 = .sdata:0x804D3F98; // type:object size:0x5 data:string
Expand Down Expand Up @@ -27731,7 +27731,7 @@ ft_804D6588 = .sbss:0x804D6588; // type:object size:0x8 scope:global data:4byte
arena_size = .sbss:0x804D6590; // type:object size:0x4 scope:local data:4byte
gmMain_804D6594 = .sbss:0x804D6594; // type:object size:0x4 scope:local data:4byte
lbl_804D6598 = .sbss:0x804D6598; // type:object size:0x1 data:byte
lbl_804D659A = .sbss:0x804D659A; // type:object size:0x6 data:2byte
lbl_804D659A = .sbss:0x804D659A; // type:object size:0x2 data:2byte
lbl_804D65A0 = .sbss:0x804D65A0; // type:object size:0x8 data:byte
lbl_804D65A8 = .sbss:0x804D65A8; // type:object size:0x8 data:byte
lbl_804D65B0 = .sbss:0x804D65B0; // type:object size:0x8 data:4byte
Expand Down
2 changes: 0 additions & 2 deletions src/melee/gm/forward.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#ifndef MELEE_GM_FORWARD_H
#define MELEE_GM_FORWARD_H

#define NUM_LBL_8046B668 27

typedef enum MajorSceneKind {
/* 00 */ MJ_TITLE,
/* 01 */ MJ_MENU,
Expand Down
Loading
Loading