Func_* labeling: 23 functions (list primitives, credits scroll, OW meet-cutscenes)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Test User
2026-06-06 20:14:07 -04:00
parent 86516e3fa5
commit eb284575b3
10 changed files with 58 additions and 49 deletions

View File

@@ -118,6 +118,15 @@ Renames are **byte-neutral** (`make compare` must stay OK after every batch).
the per-map OWMODE_* script-pointer table system (ExecuteOWModeScript walks <Map>_MapScripts,
a `dbw OWMODE_*, handler` list) — so map-script Func_* are nameable as <Map>_<OWMODEAction>.
Two whole map tables done (RockClubEntrance, RockClub). Deferred Func_235e (low-conf text LRU).
- 2026-06-06: 23 named, 5 DEFER. ~46 token-matches remain (mostly AI + stubs). 5 subagents on
the zero-fingerprint deep tail. home/list.asm word/pointer primitives (GetNextWordOfList[_Common/2],
SetNextWordOfList, AddToListPointer[_Common/2] — subagents confirmed jr-target structure, no demotes),
credits scroll frame-func pair (CreditsScrollFrameFunction/UpdateCreditsScroll), ResetMusicState,
and a batch of overworld first-meeting cutscenes loaded via wOverworldScriptPointer
(LightningClub/PsychicClub/RockClub _MeetGR*Script, FireFortYuki/FightingFort/PsychicStrongholdMami
_MeetScript, CardDungeon{Pawn,Knight,Rook,Bishop} door-shut entry scripts). DEFERRED 5 genuinely
opaque/unreferenced stubs (Func_3f87 lone ret, 10cd9/1126b trivial mem helpers, 198f7/1a14b
unreferenced printer stubs — tcg1 also leaves 1a14b unnamed). A name there would be a guess.
- 2026-06-06: 54 named. ~69 remaining. 8 subagents over the fingerprinted tail. SFX engine
channel funcs (SFX_StoreChannelPointer / SFX_UpdateNoiseChannelPitchSlide / SFX_ClearState +_2,
tcg1-confirmed), the duel damage-HUD animation system (InitDamageHUDAnimation,

View File

@@ -6508,7 +6508,7 @@ ResetOverworldPresentation:
ld a, BANK("WRAM1")
ld [wWRAMBank], a
call ResetFrameFunctionStack
call Func_3cdd
call ResetMusicState
farcall SetAllPaletteFadeConfigsToEnabled
ld a, $ff
farcall InitFadePalettes

View File

@@ -652,9 +652,9 @@ LightningClub_WarpFadeInPreload:
.asm_2c524
ld a, OWMODE_SCRIPT
ld [wOverworldMode], a
ld a, BANK(Func_2c584)
ld a, BANK(LightningClub_MeetGR4Script)
ld [wOverworldScriptBank], a
ld hl, Func_2c584
ld hl, LightningClub_MeetGR4Script
ld a, l
ld [wOverworldScriptPointer], a
ld a, h
@@ -696,7 +696,7 @@ LightningClub_AfterDuelScripts:
npc_script NPC_BRANDON, Script_BrandonAfterDuel
db $ff
Func_2c584:
LightningClub_MeetGR4Script:
xor a
start_script
wait_for_fade
@@ -1807,9 +1807,9 @@ PsychicClub_WarpFadeInPreload:
.asm_2cdc6
ld a, OWMODE_SCRIPT
ld [wOverworldMode], a
ld a, BANK(Func_2ce39)
ld a, BANK(PsychicClub_MeetGR4Script)
ld [wOverworldScriptBank], a
ld hl, Func_2ce39
ld hl, PsychicClub_MeetGR4Script
ld a, l
ld [wOverworldScriptPointer], a
ld a, h
@@ -1855,7 +1855,7 @@ PsychicClub_AfterDuelScripts:
npc_script NPC_GR_4, Script_PsychicClubGR4AfterDuel
db $ff
Func_2ce39:
PsychicClub_MeetGR4Script:
xor a
start_script
wait_for_fade
@@ -2950,9 +2950,9 @@ RockClub_WarpFadeInPreload:
jr nz, .asm_2d6a4
ld a, OWMODE_SCRIPT
ld [wOverworldMode], a
ld a, BANK(Func_2d6ca)
ld a, BANK(RockClub_MeetGR1Script)
ld [wOverworldScriptBank], a
ld hl, Func_2d6ca
ld hl, RockClub_MeetGR1Script
ld a, l
ld [wOverworldScriptPointer], a
ld a, h
@@ -2987,7 +2987,7 @@ RockClub_AfterDuelScripts:
npc_script NPC_ANDREW, Script_AndrewAfterDuel
db $ff
Func_2d6ca:
RockClub_MeetGR1Script:
xor a
start_script
wait_for_fade

View File

@@ -4089,9 +4089,9 @@ FireFortYuki_WarpFadeInPreload:
farcall MaxOutEventValue
ld a, OWMODE_SCRIPT
ld [wOverworldMode], a
ld a, BANK(Func_32a38)
ld a, BANK(FireFortYuki_MeetScript)
ld [wOverworldScriptBank], a
ld hl, Func_32a38
ld hl, FireFortYuki_MeetScript
ld a, l
ld [wOverworldScriptPointer], a
ld a, h
@@ -4124,7 +4124,7 @@ FireFortYuki_AfterDuelScripts:
npc_script NPC_YUKI, Script_YukiAfterDuel
db $ff
Func_32a38:
FireFortYuki_MeetScript:
ld a, NPC_YUKI
ld [wScriptNPC], a
ldtx hl, DialogYukiText

View File

@@ -2195,9 +2195,9 @@ CardDungeonBishop_WarpFadeInPreload:
farcall LoadAndQueueOWMapTilemap
ld a, OWMODE_SCRIPT
ld [wOverworldMode], a
ld a, BANK(Func_3525b)
ld a, BANK(CardDungeonBishop_ShutDoorsOnEntryScript)
ld [wOverworldScriptBank], a
ld hl, Func_3525b
ld hl, CardDungeonBishop_ShutDoorsOnEntryScript
ld a, l
ld [wOverworldScriptPointer], a
ld a, h
@@ -2363,7 +2363,7 @@ CardDungeonBishop_SetWarp:
farcall SetWarpData
ret
Func_3525b:
CardDungeonBishop_ShutDoorsOnEntryScript:
xor a
start_script
animate_player_movement $00, $01
@@ -3411,9 +3411,9 @@ FightingFort_WarpFadeInPreload:
farcall MaxOutEventValue
ld a, OWMODE_SCRIPT
ld [wOverworldMode], a
ld a, BANK(Func_35a9c)
ld a, BANK(FightingFort_MeetMembersScript)
ld [wOverworldScriptBank], a
ld hl, Func_35a9c
ld hl, FightingFort_MeetMembersScript
ld a, l
ld [wOverworldScriptPointer], a
ld a, h
@@ -3451,7 +3451,7 @@ FightingFort_AfterDuelScripts:
npc_script NPC_KAMIYA, Script_KamiyaAfterDuel
db $ff
Func_35a9c:
FightingFort_MeetMembersScript:
xor a
start_script
set_event EVENT_MET_FIGHTING_FORT_MEMBERS
@@ -6040,7 +6040,7 @@ Script_MamiAfterDuel:
end_script
ret
Func_36ed7:
PsychicStrongholdMami_MeetMamiAndRodScript:
xor a
start_script
set_event EVENT_MET_MAMI_AND_ROD
@@ -6112,9 +6112,9 @@ PsychicStrongholdMami_WarpInPlatformScript:
.asm_36f69
ld a, OWMODE_SCRIPT
ld [wOverworldMode], a
ld a, BANK(Func_36ed7)
ld a, BANK(PsychicStrongholdMami_MeetMamiAndRodScript)
ld [wOverworldScriptBank], a
ld hl, Func_36ed7
ld hl, PsychicStrongholdMami_MeetMamiAndRodScript
ld a, l
ld [wOverworldScriptPointer], a
ld a, h

View File

@@ -6073,7 +6073,7 @@ Script_GameCenterChipSecurity_HaltForDeposit:
ret
; unreferenced resumption
Func_3eef4:
GameCenterChip_ResumeIdle:
ld a, OWMODE_IDLE
ld [wOverworldMode], a
ret
@@ -6306,9 +6306,9 @@ CardDungeonPawn_WarpFadeInPreload:
farcall LoadAndQueueOWMapTilemap
ld a, OWMODE_SCRIPT
ld [wOverworldMode], a
ld a, BANK(Func_3f1c6)
ld a, BANK(CardDungeonPawn_WarpFadeInScript)
ld [wOverworldScriptBank], a
ld hl, Func_3f1c6
ld hl, CardDungeonPawn_WarpFadeInScript
ld a, l
ld [wOverworldScriptPointer], a
ld a, h
@@ -6440,7 +6440,7 @@ CardDungeonPawn_SetWarp:
farcall SetWarpData
ret
Func_3f1c6:
CardDungeonPawn_WarpFadeInScript:
xor a
start_script
animate_player_movement $00, $01
@@ -6525,9 +6525,9 @@ CardDungeonKnight_WarpFadeInPreload:
farcall LoadAndQueueOWMapTilemap
ld a, OWMODE_SCRIPT
ld [wOverworldMode], a
ld a, BANK(Func_3f395)
ld a, BANK(CardDungeonKnight_WarpFadeInScript)
ld [wOverworldScriptBank], a
ld hl, Func_3f395
ld hl, CardDungeonKnight_WarpFadeInScript
ld a, l
ld [wOverworldScriptPointer], a
ld a, h
@@ -6681,7 +6681,7 @@ CardDungeonKnight_SetWarp:
farcall SetWarpData
ret
Func_3f395:
CardDungeonKnight_WarpFadeInScript:
xor a
start_script
animate_player_movement $00, $01
@@ -6766,9 +6766,9 @@ CardDungeonRook_WarpFadeInPreload:
farcall LoadAndQueueOWMapTilemap
ld a, OWMODE_SCRIPT
ld [wOverworldMode], a
ld a, BANK(Func_3f57e)
ld a, BANK(CardDungeonRook_WarpFadeInScript)
ld [wOverworldScriptBank], a
ld hl, Func_3f57e
ld hl, CardDungeonRook_WarpFadeInScript
ld a, l
ld [wOverworldScriptPointer], a
ld a, h
@@ -6931,7 +6931,7 @@ SetGameCenterWarpData:
farcall SetWarpData
ret
Func_3f57e:
CardDungeonRook_WarpFadeInScript:
xor a
start_script
animate_player_movement $00, $01

View File

@@ -302,11 +302,11 @@ CreditsCmd_Scroll:
ld [wde50], a
; this won't work since the frame function
; doesn't actually call wde69
ld hl, Func_3e7a
ld hl, CreditsScrollFrameFunction
call SetFrameFunction
ret
Func_13ac1::
UpdateCreditsScroll::
; current scroll position
ld a, [wde4f]
ld b, a

View File

@@ -982,7 +982,7 @@ ToggleSlotMachineDebugMode:
ret
; debug? unreferenced
Func_12a57:
TickSlotMachineDebugDelay:
scf
ccf
ld a, [wSlotMachineDebugFlag]

View File

@@ -62,11 +62,11 @@ SetNextElementOfList2::
ld hl, wListPointer2
jr SetNextElementOfList_Common
Func_0b6e:
GetNextWordOfList:
push hl
push bc
ld hl, wListPointer
Func_0b73:
GetNextWordOfList_Common:
ld c, [hl]
inc hl
ld b, [hl]
@@ -76,7 +76,7 @@ Func_0b73:
ld a, [bc]
ld d, a
inc bc
Func_0b7c:
SetListToNextWordPosition:
ld [hl], b
dec hl
ld [hl], c
@@ -84,13 +84,13 @@ Func_0b7c:
pop hl
ret
Func_0b82:
GetNextWordOfList2:
push hl
push bc
ld hl, wListPointer2
jr Func_0b73
jr GetNextWordOfList_Common
Func_0b89:
SetNextWordOfList:
push hl
push bc
ld hl, wListPointer
@@ -104,7 +104,7 @@ SetNextWordOfList_Common:
ld a, d
ld [bc], a
inc bc
jr Func_0b7c
jr SetListToNextWordPosition
SetNextWordOfList2::
push hl
@@ -112,10 +112,10 @@ SetNextWordOfList2::
ld hl, wListPointer2
jr SetNextWordOfList_Common
Func_0ba0:
AddToListPointer:
push hl
ld hl, wListPointer
Func_0ba4:
AddToListPointer_Common:
add [hl]
ld [hli], a
ld a, [hl]
@@ -124,7 +124,7 @@ Func_0ba4:
pop hl
ret
Func_0bac:
AddToListPointer2:
push hl
ld hl, wListPointer2
jr Func_0ba4
jr AddToListPointer_Common

View File

@@ -2391,7 +2391,7 @@ CallDuelAnimationFunction::
ld [wdcf0], a
ret
Func_3cdd::
ResetMusicState::
xor a
ld [wTempActiveMusic], a
ld [wTempActiveMusicState], a
@@ -2702,12 +2702,12 @@ UpdateMailboxPage::
farcall _UpdateMailboxPage
ret
Func_3e7a::
CreditsScrollFrameFunction::
push af
push bc
push de
push hl
farcall Func_13ac1
farcall UpdateCreditsScroll
pop hl
pop de
pop bc