Skip to content

Match 16 USA functions and repair reload/padding accounting #423

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
llesieur99 merged 2 commits into from
Nov 5, 2026
Merged

Match 16 USA functions and repair reload/padding accounting #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e9774a
feat(src): match ten USA functions and fix reload and padding accounting
llesieur99 Nov 5, 2026
3b8cf1d
feat(src): match six more USA functions and retain verified blockers
llesieur99 Nov 5, 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
3 changes: 2 additions & 1 deletion config/boot/functions.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ func_00115C90 00115C90 92
func_00115CF0 00115CF0 68
func_00115D48 00115D48 96
func_00115DA8 00115DA8 128
func_00115E28 00115E28 64
func_00115E28 00115E28 16
func_00115E38 00115E38 48
func_00115E68 00115E68 40
func_00115E90 00115E90 152
func_00115F28 00115F28 80
Expand Down
10 changes: 10 additions & 0 deletions config/cflags.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3204,3 +3204,13 @@ src/levels/shared/L00_004224D0-main-g8.c -O2 -G8 -ffunction-sections -frac2-qcop
src/levels/shared/L00_003C6298-seeker.c -O2 -G0 -ffunction-sections -ffast-math -frac2-zero-ti-por -frac2-hazard-labels
src/levels/shared/L02_00410F68-g8.c -O2 -G8 -ffunction-sections -frac2-zero-ti-por -g
src/levels/shared/L03_002AB5C8-region.c -O2 -G0 -ffunction-sections -g
src/game/002E7338-g8.c -O2 -G8 -ffunction-sections
src/game/00337210.c -O2 -G0 -ffunction-sections
src/game/00316E08.c -O2 -G0 -ffunction-sections
src/levels/shared/L00_00418230.c -O2 -G0 -ffunction-sections
src/levels/shared/L03_002ECF08.c -O2 -G0 -ffunction-sections
src/levels/shared/L05_00419CC8-g8.c -O2 -G8 -ffunction-sections -frac2-zero-ti-por -g
src/levels/shared/L00_00424F98-g8.c -O2 -G8 -ffunction-sections -g
src/game/002EEBC8.c -O2 -G0 -ffunction-sections
src/game/002F0FA0-g8.c -O2 -G8 -ffunction-sections
src/core/001185E8.c -O2 -G2 -ffunction-sections -mastra-quad-saves
4 changes: 3 additions & 1 deletion config/levels/functions.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3160,7 +3160,9 @@ func_L00_00429CE0 shared 8 bc6e15da5a72ab85 27 00:00429CE0,01:0042CEE8,02:004553
func_L00_00429CE8 shared 636 8a7eb6252237ae92 27 00:00429CE8,01:0042CEF0,02:00455400,03:0043B058,04:0046C530,05:00441528,06:0047B9D0,07:00425B78,08:00445EB8,09:00438F50,10:00443358,11:0048AED8,12:004408A8,13:0043E0C0,14:00448158,15:0044DEC0,16:004354B0,17:00436938,18:00457A30,19:0043AE70,20:00461138,22:0042A468,23:0043FAA0,24:00409170,25:004326D0,26:0041BD60,30:0042DE40
func_L00_00429F68 shared 1272 8276583bd92246ff 27 00:00429F68,01:0042D170,02:00455680,03:0043B2D8,04:0046C7B0,05:004417A8,06:0047BC50,07:00425DF8,08:00446138,09:004391D0,10:004435D8,11:0048B158,12:00440B28,13:0043E340,14:004483D8,15:0044E140,16:00435730,17:00436BB8,18:00457CB0,19:0043B0F0,20:004613B8,22:0042A6E8,23:0043FD20,24:004093F0,25:00432950,26:0041BFE0,30:0042E0C0
func_L00_0042A460 shared 132 691dd08589a495e2 27 00:0042A460,01:0042D668,02:00455B78,03:0043B7D0,04:0046CCA8,05:00441CA0,06:0047C148,07:004262F0,08:00446630,09:004396C8,10:00443AD0,11:0048B650,12:00441020,13:0043E838,14:004488D0,15:0044E638,16:00435C28,17:004370B0,18:004581A8,19:0043B5E8,20:004618B0,22:0042ABE0,23:00440218,24:004098E8,25:00432E48,26:0041C4D8,30:0042E5B8
func_L00_0042A4E8 shared 24 d456d82bfa98afa7 27 00:0042A4E8,01:0042D6F0,02:00455C00,03:0043B858,04:0046CD30,05:00441D28,06:0047AD68,07:00426378,08:004466B8,09:00439750,10:00443B58,11:0048B6D8,12:0043FC60,13:00406E18,14:00448958,15:0044E6C0,16:00435CB0,17:00437138,18:00458230,19:0043B670,20:00461938,22:0042AC68,23:004402A0,24:00409970,25:00432ED0,26:0041C560,30:0042E640
func_L00_0042A4E8 shared 8 bc6e15da5a72ab85 27 00:0042A4E8,01:0042D6F0,02:00455C00,03:0043B858,04:0046CD30,05:00441D28,06:0047AD68,07:00426378,08:004466B8,09:00439750,10:00443B58,11:0048B6D8,12:0043FC60,13:00406E18,14:00448958,15:0044E6C0,16:00435CB0,17:00437138,18:00458230,19:0043B670,20:00461938,22:0042AC68,23:004402A0,24:00409970,25:00432ED0,26:0041C560,30:0042E640
func_L00_0042A4F0 shared 8 bc6e15da5a72ab85 27 00:0042A4F0,01:0042D6F8,02:00455C08,03:0043B860,04:0046CD38,05:00441D30,06:0047AD70,07:00426380,08:004466C0,09:00439758,10:00443B60,11:0048B6E0,12:0043FC68,13:00406E20,14:00448960,15:0044E6C8,16:00435CB8,17:00437140,18:00458238,19:0043B678,20:00461940,22:0042AC70,23:004402A8,24:00409978,25:00432ED8,26:0041C568,30:0042E648
func_L00_0042A4F8 shared 8 bc6e15da5a72ab85 27 00:0042A4F8,01:0042D700,02:00455C10,03:0043B868,04:0046CD40,05:00441D38,06:0047AD78,07:00426388,08:004466C8,09:00439760,10:00443B68,11:0048B6E8,12:0043FC70,13:00406E28,14:00448968,15:0044E6D0,16:00435CC0,17:00437148,18:00458240,19:0043B680,20:00461948,22:0042AC78,23:004402B0,24:00409980,25:00432EE0,26:0041C570,30:0042E650
func_L00_0042A500 shared 32 7896f964e34211fa 22 00:0042A500,01:0042D708,02:00455C18,03:0043B870,04:0046CD48,06:0047C1E8,07:00426390,08:004466D0,09:00439768,11:0048B6F0,12:004410C0,13:0043E8D8,14:00448970,16:00435CC8,17:00437150,18:00458248,19:0043B688,20:00461950,22:0042AC80,23:004402B8,26:0041C578,30:0042E658
func_L00_0042A520 shared 376 85e17af9882044bd 27 00:0042A520,01:0042D728,02:00455C38,03:0043B890,04:0046D7B0,05:00446038,06:0047C208,07:004263B0,08:004466F0,09:00439788,10:00447D58,11:0048C158,12:004410E0,13:0043E8F8,14:00448990,15:004528F0,16:004364E8,17:00437170,18:00458268,19:0043B6A8,20:00461970,22:0042B4A0,23:00440AD8,24:00409988,25:00437120,26:0041CD98,30:0042E678
func_L00_0042A698 shared 620 89a50068332abf32 27 00:0042A698,01:0042D8A0,02:00455DB0,03:0043BA08,04:0046D928,05:004461B0,06:0047C380,07:00426528,08:00446868,09:00439900,10:00447ED0,11:0048C2D0,12:00441258,13:0043EA70,14:00448B08,15:00452A68,16:00436660,17:004372E8,18:004583E0,19:0043B820,20:00461AE8,22:0042B618,23:00440C50,24:00409B00,25:00437298,26:0041CF10,30:0042E7F0
Expand Down
3 changes: 2 additions & 1 deletion config/pal/boot/functions.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ func_00115C90 00115C90 92
func_00115CF0 00115CF0 68
func_00115D48 00115D48 96
func_00115DA8 00115DA8 128
func_00115E28 00115E28 64
func_00115E28 00115E28 16
func_00115E38 00115E38 48
func_00115E68 00115E68 40
func_00115E90 00115E90 152
func_00115F28 00115F28 80
Expand Down
4 changes: 3 additions & 1 deletion config/pal/levels/functions.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3180,7 +3180,9 @@ func_L00_00429CE0 shared 8 bc6e15da5a72ab85 27 00:0042F230,01:00432A48,02:0045B5
func_PAL_L00_0042F238 shared 636 f16db07d2a68ee1f 27 00:0042F238,01:00432A50,02:0045B520,03:00440C28,04:004727B8,05:00447710,06:00481428,07:0042B090,08:0044BD98,09:0043EDA8,10:00449718,11:00491968,12:00446508,13:004438B0,14:0044E1C8,15:004541E0,16:0043AEF0,17:0043C838,18:0045D518,19:00440D08,20:00467418,22:0042FA10,23:004455C8,24:0040E318,25:00437D38,26:004213A0,30:004338F8
func_PAL_L00_0042F4B8 shared 1272 8942b10f4874e318 27 00:0042F4B8,01:00432CD0,02:0045B7A0,03:00440EA8,04:00472A38,05:00447990,06:004816A8,07:0042B310,08:0044C018,09:0043F028,10:00449998,11:00491BE8,12:00446788,13:00443B30,14:0044E448,15:00454460,16:0043B170,17:0043CAB8,18:0045D798,19:00440F88,20:00467698,22:0042FC90,23:00445848,24:0040E598,25:00437FB8,26:00421620,30:00433B78
func_PAL_L00_0042F9B0 shared 132 691dd08589a495e2 27 00:0042F9B0,01:004331C8,02:0045BC98,03:004413A0,04:00472F30,05:00447E88,06:00481BA0,07:0042B808,08:0044C510,09:0043F520,10:00449E90,11:004920E0,12:00446C80,13:00444028,14:0044E940,15:00454958,16:0043B668,17:0043CFB0,18:0045DC90,19:00441480,20:00467B90,22:00430188,23:00445D40,24:0040EA90,25:004384B0,26:00421B18,30:00434070
func_L00_0042A4E8 shared 24 d456d82bfa98afa7 27 00:0042FA38,01:00433250,02:0045BD20,03:00441428,04:00472FB8,05:00447F10,06:00480760,07:0042B890,08:0044C598,09:0043F5A8,10:00449F18,11:00492168,12:00445860,13:0040B6B0,14:0044E9C8,15:004549E0,16:0043B6F0,17:0043D038,18:0045DD18,19:00441508,20:00467C18,22:00430210,23:00445DC8,24:0040EB18,25:00438538,26:00421BA0,30:004340F8
func_L00_0042A4E8 shared 8 bc6e15da5a72ab85 27 00:0042FA38,01:00433250,02:0045BD20,03:00441428,04:00472FB8,05:00447F10,06:00480760,07:0042B890,08:0044C598,09:0043F5A8,10:00449F18,11:00492168,12:00445860,13:0040B6B0,14:0044E9C8,15:004549E0,16:0043B6F0,17:0043D038,18:0045DD18,19:00441508,20:00467C18,22:00430210,23:00445DC8,24:0040EB18,25:00438538,26:00421BA0,30:004340F8
func_L00_0042A4F0 shared 8 bc6e15da5a72ab85 27 00:0042FA40,01:00433258,02:0045BD28,03:00441430,04:00472FC0,05:00447F18,06:00480768,07:0042B898,08:0044C5A0,09:0043F5B0,10:00449F20,11:00492170,12:00445868,13:0040B6B8,14:0044E9D0,15:004549E8,16:0043B6F8,17:0043D040,18:0045DD20,19:00441510,20:00467C20,22:00430218,23:00445DD0,24:0040EB20,25:00438540,26:00421BA8,30:00434100
func_L00_0042A4F8 shared 8 bc6e15da5a72ab85 27 00:0042FA48,01:00433260,02:0045BD30,03:00441438,04:00472FC8,05:00447F20,06:00480770,07:0042B8A0,08:0044C5A8,09:0043F5B8,10:00449F28,11:00492178,12:00445870,13:0040B6C0,14:0044E9D8,15:004549F0,16:0043B700,17:0043D048,18:0045DD28,19:00441518,20:00467C28,22:00430220,23:00445DD8,24:0040EB28,25:00438548,26:00421BB0,30:00434108
func_L00_0042A500 shared 32 7896f964e34211fa 22 00:0042FA50,01:00433268,02:0045BD38,03:00441440,04:00472FD0,06:00481C40,07:0042B8A8,08:0044C5B0,09:0043F5C0,11:00492180,12:00446D20,13:004440C8,14:0044E9E0,16:0043B708,17:0043D050,18:0045DD30,19:00441520,20:00467C30,22:00430228,23:00445DE0,26:00421BB8,30:00434110
func_PAL_L00_0042FA70 shared 408 9fd8a4374ff5ed25 27 00:0042FA70,01:00433288,02:0045BD58,03:00441460,04:00473A38,05:0044C458,06:00481C60,07:0042B8C8,08:0044C5D0,09:0043F5E0,10:0044E330,11:00492BE8,12:00446D40,13:004440E8,14:0044EA00,15:00458E48,16:0043BF28,17:0043D070,18:0045DD50,19:00441540,20:00467C50,22:00430A48,23:00446600,24:0040EB30,25:0043C9C0,26:004223D8,30:00434130
func_L00_0042A698 shared 620 89a50068332abf32 27 00:0042FC08,01:00433420,02:0045BEF0,03:004415F8,04:00473BD0,05:0044C5F0,06:00481DF8,07:0042BA60,08:0044C768,09:0043F778,10:0044E4C8,11:00492D80,12:00446ED8,13:00444280,14:0044EB98,15:00458FE0,16:0043C0C0,17:0043D208,18:0045DEE8,19:004416D8,20:00467DE8,22:00430BE0,23:00446798,24:0040ECC8,25:0043CB58,26:00422570,30:004342C8
Expand Down
3 changes: 2 additions & 1 deletion config/us2/boot/functions.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ func_00115C90 00115C90 92
func_00115CF0 00115CF0 68
func_00115D48 00115D48 96
func_00115DA8 00115DA8 128
func_00115E28 00115E28 64
func_00115E28 00115E28 16
func_00115E38 00115E38 48
func_00115E68 00115E68 40
func_00115E90 00115E90 152
func_00115F28 00115F28 80
Expand Down
4 changes: 3 additions & 1 deletion config/us2/levels/functions.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3179,7 +3179,9 @@ func_L00_00429CE0 shared 8 bc6e15da5a72ab85 27 00:0042B1A0,01:0042E428,02:00456C
func_L00_00429CE8 shared 636 8a7eb6252237ae92 27 00:0042B1A8,01:0042E430,02:00456C08,03:0043C6F0,04:0046DCA0,05:00443270,06:0047CFA8,07:00426EE8,08:004474F0,09:0043A410,10:00445058,11:0048C950,12:00441CD0,13:0043F558,14:004496F8,15:0044FC40,16:004368A8,17:00437F88,18:00458EE0,19:0043C2D8,20:00462640,22:0042B928,23:00440F60,24:0040A628,25:00433C30,26:0041D2C0,30:0042E480
func_US2_L00_0042B428 shared 1316 794812ba73882dff 27 00:0042B428,01:0042E6B0,02:00456E88,03:0043C970,04:0046DF20,05:004434F0,06:0047D228,07:00427168,08:00447770,09:0043A690,10:004452D8,11:0048CBD0,12:00441F50,13:0043F7D8,14:00449978,15:0044FEC0,16:00436B28,17:00438208,18:00459160,19:0043C558,20:004628C0,22:0042BBA8,23:004411E0,24:0040A8A8,25:00433EB0,26:0041D540,30:0042E700
func_L00_0042A460 shared 132 691dd08589a495e2 27 00:0042B950,01:0042EBD8,02:004573B0,03:0043CE98,04:0046E448,05:00443A18,06:0047D750,07:00427690,08:00447C98,09:0043ABB8,10:00445800,11:0048D0F8,12:00442478,13:0043FD00,14:00449EA0,15:004503E8,16:00437050,17:00438730,18:00459688,19:0043CA80,20:00462DE8,22:0042C0D0,23:00441708,24:0040ADD0,25:004343D8,26:0041DA68,30:0042EC28
func_L00_0042A4E8 shared 24 d456d82bfa98afa7 27 00:0042B9D8,01:0042EC60,02:00457438,03:0043CF20,04:0046E4D0,05:00443AA0,06:0047C340,07:00427718,08:00447D20,09:0043AC40,10:00445888,11:0048D180,12:00441088,13:00408380,14:00449F28,15:00450470,16:004370D8,17:004387B8,18:00459710,19:0043CB08,20:00462E70,22:0042C158,23:00441790,24:0040AE58,25:00434460,26:0041DAF0,30:0042ECB0
func_L00_0042A4E8 shared 8 bc6e15da5a72ab85 27 00:0042B9D8,01:0042EC60,02:00457438,03:0043CF20,04:0046E4D0,05:00443AA0,06:0047C340,07:00427718,08:00447D20,09:0043AC40,10:00445888,11:0048D180,12:00441088,13:00408380,14:00449F28,15:00450470,16:004370D8,17:004387B8,18:00459710,19:0043CB08,20:00462E70,22:0042C158,23:00441790,24:0040AE58,25:00434460,26:0041DAF0,30:0042ECB0
func_L00_0042A4F0 shared 8 bc6e15da5a72ab85 27 00:0042B9E0,01:0042EC68,02:00457440,03:0043CF28,04:0046E4D8,05:00443AA8,06:0047C348,07:00427720,08:00447D28,09:0043AC48,10:00445890,11:0048D188,12:00441090,13:00408388,14:00449F30,15:00450478,16:004370E0,17:004387C0,18:00459718,19:0043CB10,20:00462E78,22:0042C160,23:00441798,24:0040AE60,25:00434468,26:0041DAF8,30:0042ECB8
func_L00_0042A4F8 shared 8 bc6e15da5a72ab85 27 00:0042B9E8,01:0042EC70,02:00457448,03:0043CF30,04:0046E4E0,05:00443AB0,06:0047C350,07:00427728,08:00447D30,09:0043AC50,10:00445898,11:0048D190,12:00441098,13:00408390,14:00449F38,15:00450480,16:004370E8,17:004387C8,18:00459720,19:0043CB18,20:00462E80,22:0042C168,23:004417A0,24:0040AE68,25:00434470,26:0041DB00,30:0042ECC0
func_L00_0042A500 shared 32 7896f964e34211fa 22 00:0042B9F0,01:0042EC78,02:00457450,03:0043CF38,04:0046E4E8,06:0047D7F0,07:00427730,08:00447D38,09:0043AC58,11:0048D198,12:00442518,13:0043FDA0,14:00449F40,16:004370F0,17:004387D0,18:00459728,19:0043CB20,20:00462E88,22:0042C170,23:004417A8,26:0041DB08,30:0042ECC8
func_L00_0042A520 shared 376 85e17af9882044bd 27 00:0042BA10,01:0042EC98,02:00457470,03:0043CF58,04:0046EF50,05:00447DB0,06:0047D810,07:00427750,08:00447D58,09:0043AC78,10:00449A88,11:0048DC00,12:00442538,13:0043FDC0,14:00449F60,15:004546A0,16:00437910,17:004387F0,18:00459748,19:0043CB40,20:00462EA8,22:0042C990,23:00441FC8,24:0040AE70,25:004386B0,26:0041E328,30:0042ECE8
func_L00_0042A698 shared 620 89a50068332abf32 27 00:0042BB88,01:0042EE10,02:004575E8,03:0043D0D0,04:0046F0C8,05:00447F28,06:0047D988,07:004278C8,08:00447ED0,09:0043ADF0,10:00449C00,11:0048DD78,12:004426B0,13:0043FF38,14:0044A0D8,15:00454818,16:00437A88,17:00438968,18:004598C0,19:0043CCB8,20:00463020,22:0042CB08,23:00442140,24:0040AFE8,25:00438828,26:0041E4A0,30:0042EE60
Expand Down
Loading
Loading