Skip to content

Match, split, and link gm_1832 #3303

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
MarkMcCaskey merged 16 commits into from
Sep 3, 2026
Merged

Match, split, and link gm_1832 #3303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
51dd3ef
Recover gm_1832 data layout
MarkMcCaskey Sep 3, 2026
1138468
Type gm_1832's classic-mode character table
MarkMcCaskey Sep 3, 2026
b6a121a
Move the 1/60 constant at 0x804DA5F8 into gm_1884
MarkMcCaskey Sep 3, 2026
489def4
Split gm_1832.c into three translation units
MarkMcCaskey Sep 3, 2026
050de53
Link gm_186E
MarkMcCaskey Sep 3, 2026
e573c62
Correct gm_Scene_IntroNormal_OnEnter's stack padding
MarkMcCaskey Sep 3, 2026
a872762
Trim gm_186E's unused includes and pool gm_1879's stage-state address
MarkMcCaskey Sep 3, 2026
8af6df1
Match fn_801851C0 and link gm_1832
MarkMcCaskey Sep 3, 2026
b57bf4b
Expand gm_80187F48_SetupCamera at its only call site
MarkMcCaskey Sep 3, 2026
8a8be79
Type the normal-intro stage table
MarkMcCaskey Sep 3, 2026
a8e6c61
Scope the normal-intro stage index to its archive and audio setup
MarkMcCaskey Sep 3, 2026
eadaf92
Type the normal-intro scene descriptor
MarkMcCaskey Sep 3, 2026
2b07851
Match gm_Scene_IntroNormal_OnEnter
MarkMcCaskey Sep 3, 2026
2678b62
Mark gm_1879 as matching
MarkMcCaskey Sep 3, 2026
62778fd
Drop the intro TUs' unused includes
MarkMcCaskey Sep 3, 2026
76227fd
Merge branch 'master' into match-gm-1832
MarkMcCaskey Sep 3, 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
30 changes: 23 additions & 7 deletions config/GALE01/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2342,13 +2342,29 @@ melee/gm/gmregclear.c:
.sdata2 start:0x804DA428 end:0x804DA538

melee/gm/gm_1832.c:
.text start:0x8018325C end:0x80188454
.text start:0x8018325C end:0x80186EFC
.rodata start:0x803B7C28 end:0x803B7C68
.data start:0x803D9248 end:0x803D9828
.bss start:0x804735A8 end:0x80473700
.sdata start:0x804D4090 end:0x804D4140
.sbss start:0x804D65F0 end:0x804D6628
.sdata2 start:0x804DA538 end:0x804DA600
.data start:0x803D9248 end:0x803D9498
.bss start:0x804735A8 end:0x804736B0
.sdata start:0x804D4090 end:0x804D40C0
.sbss start:0x804D65F0 end:0x804D6610
.sdata2 start:0x804DA538 end:0x804DA5C8

melee/gm/gm_186E.c:
.text start:0x80186EFC end:0x80187910
.data start:0x803D9498 end:0x803D9750
.bss start:0x804736B0 end:0x804736C0
.sdata start:0x804D40C0 end:0x804D40D8
.sbss start:0x804D6610 end:0x804D6620
.sdata2 start:0x804DA5C8 end:0x804DA5E8

melee/gm/gm_1879.c:
.text start:0x80187910 end:0x80188454
.data start:0x803D9750 end:0x803D9828
.bss start:0x804736C0 end:0x80473700
.sdata start:0x804D40D8 end:0x804D4140
.sbss start:0x804D6620 end:0x804D6628
.sdata2 start:0x804DA5E8 end:0x804DA5F8

melee/gm/gm_1884.c:
.text start:0x80188454 end:0x8018A514
Expand All @@ -2357,7 +2373,7 @@ melee/gm/gm_1884.c:
.bss start:0x80473700 end:0x80473AB8
.sdata start:0x804D4140 end:0x804D4158
.sbss start:0x804D6628 end:0x804D6630
.sdata2 start:0x804DA600 end:0x804DA650
.sdata2 start:0x804DA5F8 end:0x804DA650

melee/gm/gmtoulib.c:
.text start:0x8018A514 end:0x80190ABC
Expand Down
145 changes: 77 additions & 68 deletions config/GALE01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22199,19 +22199,26 @@ lbl_803D8D08 = .data:0x803D8D08; // type:object size:0x480
@1966 = .data:0x803D91EC; // type:object size:0x19 scope:local data:string
@1967 = .data:0x803D9208; // type:object size:0x1B scope:local data:string
@1968 = .data:0x803D9224; // type:object size:0x1F scope:local data:string
lbl_803D9248 = .data:0x803D9248; // type:object size:0x1CC
gm_1832_CharScale = .data:0x803D9248; // type:object size:0x70 scope:local
...data.0 = .data:0x803D9248; // type:label scope:local
gm_1832_CharOffset = .data:0x803D92B8; // type:object size:0x150 scope:local
gm_1832_SamusOffset = .data:0x803D9408; // type:object size:0xC scope:local
lbl_803D9414 = .data:0x803D9414; // type:object size:0xC data:byte
lbl_803D9420 = .data:0x803D9420; // type:object size:0x9 data:string
lbl_803D942C = .data:0x803D942C; // type:object size:0x9 data:string
lbl_803D9438 = .data:0x803D9438; // type:object size:0xC data:string
@755 = .data:0x803D9420; // type:object size:0x9 scope:local data:string
@756 = .data:0x803D942C; // type:object size:0x9 scope:local data:string
@757 = .data:0x803D9438; // type:object size:0x9 scope:local data:string
lbl_803D9444 = .data:0x803D9444; // type:object size:0x18 data:string
lbl_803D945C = .data:0x803D945C; // type:object size:0xC data:string
lbl_803D9468 = .data:0x803D9468; // type:object size:0xE data:string
lbl_803D9478 = .data:0x803D9478; // type:object size:0xC data:string
lbl_803D9484 = .data:0x803D9484; // type:object size:0x11 data:string
@1074 = .data:0x803D945C; // type:object size:0xC scope:local data:string
@1075 = .data:0x803D9468; // type:object size:0xE scope:local data:string
@1198 = .data:0x803D9478; // type:object size:0xC scope:local data:string
@1199 = .data:0x803D9484; // type:object size:0x11 scope:local data:string
lbl_803D9498 = .data:0x803D9498; // type:object size:0x2A0
lbl_803D9738 = .data:0x803D9738; // type:object size:0x18 data:string
lbl_803D9750 = .data:0x803D9750; // type:object size:0xD8
@369 = .data:0x803D9738; // type:object size:0x18 scope:local data:string
gm_1832_NormalArchiveNames = .data:0x803D9750; // type:object size:0x30 scope:local
...data.0 = .data:0x803D9750; // type:label scope:local
gm_1832_NormalBgmIds = .data:0x803D9780; // type:object size:0x30 scope:local
gm_1832_NormalAudioMasks = .data:0x803D97B0; // type:object size:0x60 scope:local
gm_1832_NormalSceneDataName = .data:0x803D9810; // type:object size:0x17 scope:local data:string
lbl_803D9828 = .data:0x803D9828; // type:object size:0x7C scope:local data:short
jumptable_803D98A4 = .data:0x803D98A4; // type:object size:0x24 scope:local
lbl_803D98C8 = .data:0x803D98C8; // type:object size:0x1B data:string
Expand Down Expand Up @@ -26160,10 +26167,12 @@ lbl_80472EC8 = .bss:0x80472EC8; // type:object size:0x10 data:4byte
lbl_80472ED8 = .bss:0x80472ED8; // type:object size:0x6BC data:4byte
lbl_80473594 = .bss:0x80473594; // type:object size:0x14 data:byte
lbl_804735A8 = .bss:0x804735A8; // type:object size:0x40 data:4byte
...bss.0 = .bss:0x804735A8; // type:label scope:local
lbl_804735E8 = .bss:0x804735E8; // type:object size:0xA4 data:4byte
lbl_8047368C = .bss:0x8047368C; // type:object size:0x24 data:4byte
lbl_804736B0 = .bss:0x804736B0; // type:object size:0x10 data:4byte
lbl_804736C0 = .bss:0x804736C0; // type:object size:0x40 data:4byte
...bss.0 = .bss:0x804736C0; // type:label scope:local
lbl_80473700 = .bss:0x80473700; // type:object size:0x114 data:4byte
gm_80473814 = .bss:0x80473814; // type:object size:0x204 scope:global data:byte
gm_80473A18 = .bss:0x80473A18; // type:object size:0xA0 scope:global data:byte
Expand Down Expand Up @@ -26992,28 +27001,28 @@ lbl_804D4078 = .sdata:0x804D4078; // type:object size:0x5 data:string
lbl_804D4080 = .sdata:0x804D4080; // type:object size:0x6 data:string
lbl_804D4088 = .sdata:0x804D4088; // type:object size:0x3 data:sjis
lbl_804D408C = .sdata:0x804D408C; // type:object size:0x1 data:string
lbl_804D4090 = .sdata:0x804D4090; // type:object size:0x7 data:string
lbl_804D4098 = .sdata:0x804D4098; // type:object size:0x5 data:string
@558 = .sdata:0x804D4090; // type:object size:0x7 scope:local data:string
@559 = .sdata:0x804D4098; // type:object size:0x5 scope:local data:string
lbl_804D40A0 = .sdata:0x804D40A0; // type:object size:0x5 data:string
lbl_804D40A8 = .sdata:0x804D40A8; // type:object size:0x6 data:string
@754 = .sdata:0x804D40A8; // type:object size:0x6 scope:local data:string
lbl_804D40B0 = .sdata:0x804D40B0; // type:object size:0x8 data:string
lbl_804D40B8 = .sdata:0x804D40B8; // type:object size:0x2 data:string
lbl_804D40C0 = .sdata:0x804D40C0; // type:object size:0x7 data:string
lbl_804D40C8 = .sdata:0x804D40C8; // type:object size:0x5 data:string
lbl_804D40D0 = .sdata:0x804D40D0; // type:object size:0x6 data:string
lbl_804D40D8 = .sdata:0x804D40D8; // type:object size:0x5 data:string
lbl_804D40E0 = .sdata:0x804D40E0; // type:object size:0x5 data:string
lbl_804D40E8 = .sdata:0x804D40E8; // type:object size:0x5 data:string
lbl_804D40F0 = .sdata:0x804D40F0; // type:object size:0x5 data:string
lbl_804D40F8 = .sdata:0x804D40F8; // type:object size:0x5 data:string
lbl_804D4100 = .sdata:0x804D4100; // type:object size:0x5 data:string
lbl_804D4108 = .sdata:0x804D4108; // type:object size:0x5 data:string
lbl_804D4110 = .sdata:0x804D4110; // type:object size:0x5 data:string
lbl_804D4118 = .sdata:0x804D4118; // type:object size:0x5 data:string
lbl_804D4120 = .sdata:0x804D4120; // type:object size:0x5 data:string
lbl_804D4128 = .sdata:0x804D4128; // type:object size:0x5 data:string
lbl_804D4130 = .sdata:0x804D4130; // type:object size:0x5 data:string
lbl_804D4138 = .sdata:0x804D4138; // type:object size:0x6 data:string
@1109 = .sdata:0x804D40B8; // type:object size:0x2 scope:local data:string
@318 = .sdata:0x804D40C0; // type:object size:0x7 scope:local data:string
@319 = .sdata:0x804D40C8; // type:object size:0x5 scope:local data:string
@368 = .sdata:0x804D40D0; // type:object size:0x6 scope:local data:string
@319 = .sdata:0x804D40D8; // type:object size:0x5 scope:local data:string
@320 = .sdata:0x804D40E0; // type:object size:0x5 scope:local data:string
@321 = .sdata:0x804D40E8; // type:object size:0x5 scope:local data:string
@322 = .sdata:0x804D40F0; // type:object size:0x5 scope:local data:string
@323 = .sdata:0x804D40F8; // type:object size:0x5 scope:local data:string
@324 = .sdata:0x804D4100; // type:object size:0x5 scope:local data:string
@325 = .sdata:0x804D4108; // type:object size:0x5 scope:local data:string
@326 = .sdata:0x804D4110; // type:object size:0x5 scope:local data:string
@327 = .sdata:0x804D4118; // type:object size:0x5 scope:local data:string
@328 = .sdata:0x804D4120; // type:object size:0x5 scope:local data:string
@329 = .sdata:0x804D4128; // type:object size:0x5 scope:local data:string
@330 = .sdata:0x804D4130; // type:object size:0x5 scope:local data:string
@380 = .sdata:0x804D4138; // type:object size:0x6 scope:local data:string
lbl_804D4140 = .sdata:0x804D4140; // type:object size:0x7 data:string
lbl_804D4148 = .sdata:0x804D4148; // type:object size:0x5 data:string
lbl_804D4150 = .sdata:0x804D4150; // type:object size:0x8 data:string
Expand Down Expand Up @@ -31610,44 +31619,44 @@ lbl_804DA520 = .sdata2:0x804DA520; // type:object size:0x4 align:4 data:float
lbl_804DA524 = .sdata2:0x804DA524; // type:object size:0x4 align:4 data:float
lbl_804DA528 = .sdata2:0x804DA528; // type:object size:0x4 align:4 data:float
lbl_804DA530 = .sdata2:0x804DA530; // type:object size:0x8 align:8 data:double
lbl_804DA538 = .sdata2:0x804DA538; // type:object size:0x4 align:4 data:float
lbl_804DA53C = .sdata2:0x804DA53C; // type:object size:0x4 align:4 data:float
lbl_804DA540 = .sdata2:0x804DA540; // type:object size:0x4 align:4 data:float
lbl_804DA544 = .sdata2:0x804DA544; // type:object size:0x4 align:4 data:float
lbl_804DA548 = .sdata2:0x804DA548; // type:object size:0x4 align:4 data:float
lbl_804DA54C = .sdata2:0x804DA54C; // type:object size:0x4 align:4 data:float
lbl_804DA550 = .sdata2:0x804DA550; // type:object size:0x4 align:4 data:float
lbl_804DA554 = .sdata2:0x804DA554; // type:object size:0x4 align:4 data:float
lbl_804DA558 = .sdata2:0x804DA558; // type:object size:0x4 align:4 data:float
lbl_804DA55C = .sdata2:0x804DA55C; // type:object size:0x4 align:4 data:float
lbl_804DA560 = .sdata2:0x804DA560; // type:object size:0x8 align:8 data:double
lbl_804DA568 = .sdata2:0x804DA568; // type:object size:0x4 align:4 data:float
lbl_804DA56C = .sdata2:0x804DA56C; // type:object size:0x4 align:4 data:float
lbl_804DA570 = .sdata2:0x804DA570; // type:object size:0x4 align:4 data:float
lbl_804DA574 = .sdata2:0x804DA574; // type:object size:0x4 align:4 data:float
lbl_804DA578 = .sdata2:0x804DA578; // type:object size:0x4 align:4 data:float
lbl_804DA57C = .sdata2:0x804DA57C; // type:object size:0x4 align:4 data:float
lbl_804DA580 = .sdata2:0x804DA580; // type:object size:0x4 align:4 data:float
lbl_804DA584 = .sdata2:0x804DA584; // type:object size:0x4 align:4 data:float
lbl_804DA588 = .sdata2:0x804DA588; // type:object size:0x4 align:4 data:float
lbl_804DA58C = .sdata2:0x804DA58C; // type:object size:0x4 align:4 data:float
lbl_804DA590 = .sdata2:0x804DA590; // type:object size:0x4 align:4 data:float
lbl_804DA598 = .sdata2:0x804DA598; // type:object size:0x8 align:8 data:double
lbl_804DA5A0 = .sdata2:0x804DA5A0; // type:object size:0x8 align:8 data:double
lbl_804DA5A8 = .sdata2:0x804DA5A8; // type:object size:0x8 align:8 data:double
lbl_804DA5B0 = .sdata2:0x804DA5B0; // type:object size:0x8 align:8 data:double
lbl_804DA5B8 = .sdata2:0x804DA5B8; // type:object size:0x4 align:4 data:float
lbl_804DA5BC = .sdata2:0x804DA5BC; // type:object size:0x4 align:4 data:float
lbl_804DA5C0 = .sdata2:0x804DA5C0; // type:object size:0x4 align:4 data:float
lbl_804DA5C8 = .sdata2:0x804DA5C8; // type:object size:0x4 align:4 data:float
lbl_804DA5CC = .sdata2:0x804DA5CC; // type:object size:0x4 align:4 data:float
lbl_804DA5D0 = .sdata2:0x804DA5D0; // type:object size:0x4 align:4 data:float
lbl_804DA5D4 = .sdata2:0x804DA5D4; // type:object size:0x4 align:4 data:float
lbl_804DA5D8 = .sdata2:0x804DA5D8; // type:object size:0x4 align:4 data:float
lbl_804DA5DC = .sdata2:0x804DA5DC; // type:object size:0x4 align:4 data:float
lbl_804DA5E0 = .sdata2:0x804DA5E0; // type:object size:0x4 align:4 data:float
lbl_804DA5E8 = .sdata2:0x804DA5E8; // type:object size:0x4 align:4 data:float
lbl_804DA5F0 = .sdata2:0x804DA5F0; // type:object size:0x8 align:8 data:double
@560 = .sdata2:0x804DA538; // type:object size:0x4 scope:local align:4 data:float
@561 = .sdata2:0x804DA53C; // type:object size:0x4 scope:local align:4 data:float
@562 = .sdata2:0x804DA540; // type:object size:0x4 scope:local align:4 data:float
@563 = .sdata2:0x804DA544; // type:object size:0x4 scope:local align:4 data:float
@564 = .sdata2:0x804DA548; // type:object size:0x4 scope:local align:4 data:float
@565 = .sdata2:0x804DA54C; // type:object size:0x4 scope:local align:4 data:float
@566 = .sdata2:0x804DA550; // type:object size:0x4 scope:local align:4 data:float
@567 = .sdata2:0x804DA554; // type:object size:0x4 scope:local align:4 data:float
@568 = .sdata2:0x804DA558; // type:object size:0x4 scope:local align:4 data:float
@745 = .sdata2:0x804DA55C; // type:object size:0x4 scope:local align:4 data:float
@747 = .sdata2:0x804DA560; // type:object size:0x8 scope:local align:8 data:double
@844 = .sdata2:0x804DA568; // type:object size:0x4 scope:local align:4 data:float
@845 = .sdata2:0x804DA56C; // type:object size:0x4 scope:local align:4 data:float
@909 = .sdata2:0x804DA570; // type:object size:0x4 scope:local align:4 data:float
@910 = .sdata2:0x804DA574; // type:object size:0x4 scope:local align:4 data:float
@911 = .sdata2:0x804DA578; // type:object size:0x4 scope:local align:4 data:float
@912 = .sdata2:0x804DA57C; // type:object size:0x4 scope:local align:4 data:float
@913 = .sdata2:0x804DA580; // type:object size:0x4 scope:local align:4 data:float
@914 = .sdata2:0x804DA584; // type:object size:0x4 scope:local align:4 data:float
@915 = .sdata2:0x804DA588; // type:object size:0x4 scope:local align:4 data:float
@916 = .sdata2:0x804DA58C; // type:object size:0x4 scope:local align:4 data:float
@917 = .sdata2:0x804DA590; // type:object size:0x4 scope:local align:4 data:float
@918 = .sdata2:0x804DA598; // type:object size:0x8 scope:local align:8 data:double
@919 = .sdata2:0x804DA5A0; // type:object size:0x8 scope:local align:8 data:double
@920 = .sdata2:0x804DA5A8; // type:object size:0x8 scope:local align:8 data:double
@921 = .sdata2:0x804DA5B0; // type:object size:0x8 scope:local align:8 data:double
@922 = .sdata2:0x804DA5B8; // type:object size:0x4 scope:local align:4 data:float
@923 = .sdata2:0x804DA5BC; // type:object size:0x4 scope:local align:4 data:float
@924 = .sdata2:0x804DA5C0; // type:object size:0x4 scope:local align:4 data:float
@234 = .sdata2:0x804DA5C8; // type:object size:0x4 scope:local align:4 data:float
@320 = .sdata2:0x804DA5CC; // type:object size:0x4 scope:local align:4 data:float
@321 = .sdata2:0x804DA5D0; // type:object size:0x4 scope:local align:4 data:float
@322 = .sdata2:0x804DA5D4; // type:object size:0x4 scope:local align:4 data:float
@323 = .sdata2:0x804DA5D8; // type:object size:0x4 scope:local align:4 data:float
@325 = .sdata2:0x804DA5DC; // type:object size:0x4 scope:local align:4 data:float
@358 = .sdata2:0x804DA5E0; // type:object size:0x4 scope:local align:4 data:float
@240 = .sdata2:0x804DA5E8; // type:object size:0x4 scope:local align:4 data:float
@242 = .sdata2:0x804DA5F0; // type:object size:0x8 scope:local align:8 data:double
lbl_804DA5F8 = .sdata2:0x804DA5F8; // type:object size:0x4 align:4 data:float
lbl_804DA600 = .sdata2:0x804DA600; // type:object size:0x8 align:8 data:double
lbl_804DA608 = .sdata2:0x804DA608; // type:object size:0x4 align:4 data:float
Expand Down
4 changes: 3 additions & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,9 @@ def MatchingFor(*versions):
Object(Matching, "melee/gm/gm_17BA.c"),
Object(Matching, "melee/gm/gmregcommon.c"),
Object(Linkable, "melee/gm/gmregclear.c"),
Object(Linkable, "melee/gm/gm_1832.c"),
Object(Matching, "melee/gm/gm_1832.c"),
Object(Matching, "melee/gm/gm_186E.c"),
Object(Matching, "melee/gm/gm_1879.c"),
Object(Linkable, "melee/gm/gm_1884.c"),
Object(Linkable, "melee/gm/gmtoulib.c"),
Object(Matching, "melee/gm/gmtou_0.c"),
Expand Down
Loading
Loading