From 86516e3fa5371d8bce12c8d41fa511ce63367877 Mon Sep 17 00:00:00 2001 From: Test User Date: Sat, 6 Jun 2026 20:08:27 -0400 Subject: [PATCH] Func_* labeling: 54 functions (SFX engine, damage-HUD anim, ContinueOW, Aaron steps) Co-Authored-By: Claude Opus 4.8 (1M context) --- FUNC_LABELS.md | 10 +++++++ src/audio/sfx1.asm | 12 ++++----- src/audio/sfx2.asm | 12 ++++----- src/engine/bank01.asm | 4 +-- src/engine/bank02.asm | 2 +- src/engine/bank03.asm | 6 ++--- src/engine/bank04.asm | 6 ++--- src/engine/bank06.asm | 2 +- src/engine/bank07.asm | 36 ++++++++++++------------- src/engine/bank0b.asm | 12 ++++----- src/engine/bank0d.asm | 14 +++++----- src/engine/bank0f.asm | 34 ++++++++++++------------ src/engine/bank10.asm | 38 +++++++++++++-------------- src/engine/duel/effect_functions1.asm | 2 +- src/engine/slot_machine.asm | 4 +-- src/home/duel.asm | 2 +- src/home/list.asm | 4 +-- src/home/menus.asm | 2 +- src/home/process_text.asm | 4 +-- src/home/unsorted.asm | 22 ++++++++-------- 20 files changed, 119 insertions(+), 109 deletions(-) diff --git a/FUNC_LABELS.md b/FUNC_LABELS.md index 8b7ccc4..451d88f 100644 --- a/FUNC_LABELS.md +++ b/FUNC_LABELS.md @@ -118,6 +118,16 @@ Renames are **byte-neutral** (`make compare` must stay OK after every batch). the per-map OWMODE_* script-pointer table system (ExecuteOWModeScript walks _MapScripts, a `dbw OWMODE_*, handler` list) — so map-script Func_* are nameable as _. Two whole map tables done (RockClubEntrance, RockClub). Deferred Func_235e (low-conf text LRU). +- 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, + AnimateDamageNumberDigits, LoadDamage{Weakness,Resistance}Symbol), bank07 feature launchers + (RunStartMenuFromOverworld, RunGiveBoosterPacksFromOverworld, screen-shake update/stop), + bank10 ContinueOW after-duel handlers (TcgChallengeHall_ResumeRound, GrCastleBiruritchi scenes, + MasonLab first-visit/escort scripts), Script_AaronStep1-4 tutorial duels, home menu/text helpers + (ReadFarByte, CallDuelAnimationFunction, RunCurrentDuelAnimation, *Preserved BGMap wrappers), + and airport/club ResumeAfterMove step handlers. Several tcg1 byte-faithful remnants named + (Func_5bfd/17ed/8dcf/1a080/6873c=DrawIncompleteTextStub). Deferred Func_12c3dc (pure alias). - 2026-06-06: 27 named. ~119 remaining. Deep tail, 6 subagents. New-game cup/event RNG cluster (RandomizeGRCoinPieceLocation, RandomizeIshiharaLocation, Randomize{TCGIsland,GRIsland}Location, TryStart{TCG,GR}ChallengeCup), GR-island scroll math (InitOWScrollToTarget/StepOWScrollTowardTarget), diff --git a/src/audio/sfx1.asm b/src/audio/sfx1.asm index 3716430..3077ee8 100644 --- a/src/audio/sfx1.asm +++ b/src/audio/sfx1.asm @@ -111,7 +111,7 @@ SFX_Update: ld a, [wdd8c] or a jr nz, .asm_fc063 - call Func_fc26c + call SFX_ClearState ret .asm_fc063 xor a @@ -233,7 +233,7 @@ SFX_frequency: ld [hli], a ld [hl], d pop de -Func_fc105: +SFX_StoreChannelPointer: ld hl, wd0e3 add hl, bc add hl, bc @@ -326,7 +326,7 @@ SFX_wait: ld a, c cp $3 jr nz, .asm_fc17c - call Func_fc1cd + call SFX_UpdateNoiseChannelPitchSlide jr .asm_fc17f .asm_fc17c call SFX_UpdateChannelPitchSlide @@ -340,7 +340,7 @@ SFX_wait: ld [de], a ld e, l ld d, h - jp Func_fc105 + jp SFX_StoreChannelPointer SFX_UpdateChannelPitchSlide: ld hl, wde2f @@ -396,7 +396,7 @@ SFX_UpdateChannelPitchSlide: .asm_fc1cc ret -Func_fc1cd: +SFX_UpdateNoiseChannelPitchSlide: ld hl, wde32 ld a, [hl] or a @@ -525,7 +525,7 @@ SFX_end: pop hl ret -Func_fc26c: +SFX_ClearState: xor a ld [wde53], a ld [wSfxPriority], a diff --git a/src/audio/sfx2.asm b/src/audio/sfx2.asm index 17ad3fd..9ff525e 100644 --- a/src/audio/sfx2.asm +++ b/src/audio/sfx2.asm @@ -111,7 +111,7 @@ SFX2_Update: ld a, [wdd8c] or a jr nz, .asm_fc063 - call Func_fc26c_2 + call SFX_ClearState2 ret .asm_fc063 xor a @@ -233,7 +233,7 @@ SFX2_frequency: ld [hli], a ld [hl], d pop de -Func_fc105_2: +SFX_StoreChannelPointer2: ld hl, wd0e3 add hl, bc add hl, bc @@ -326,7 +326,7 @@ SFX2_wait: ld a, c cp $3 jr nz, .asm_fc17c - call Func_fc1cd_2 + call SFX_UpdateNoiseChannelPitchSlide2 jr .asm_fc17f .asm_fc17c call SFX_UpdateChannelPitchSlide2 @@ -340,7 +340,7 @@ SFX2_wait: ld [de], a ld e, l ld d, h - jp Func_fc105_2 + jp SFX_StoreChannelPointer2 SFX_UpdateChannelPitchSlide2: ld hl, wde2f @@ -396,7 +396,7 @@ SFX_UpdateChannelPitchSlide2: .asm_fc1cc ret -Func_fc1cd_2: +SFX_UpdateNoiseChannelPitchSlide2: ld hl, wde32 ld a, [hl] or a @@ -525,7 +525,7 @@ SFX2_end: pop hl ret -Func_fc26c_2: +SFX_ClearState2: xor a ld [wde53], a ld [wSfxPriority], a diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 2b5ae43..0d3c4ab 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -4370,7 +4370,7 @@ SelectingBenchPokemonMenu: jp SetCursorParametersForTextBox ; remnant from tcg1, unreferenced -Func_5bfd: +SetupAndPrintPlayAreaCardScreen: ldh [hTempPlayAreaLocation_ff9d], a call ZeroObjectPositionsAndToggleOAMCopy call EmptyScreen @@ -4896,7 +4896,7 @@ PrintPlayAreaCardAttachedEnergies: ret ; remnant from tcg1, unreferenced -Func_5efe: +WriteDefaultTextRowToBGMap0: ld hl, wDefaultText ld e, 8 .loop_write diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm index 2f29f75..dc34501 100644 --- a/src/engine/bank02.asm +++ b/src/engine/bank02.asm @@ -2259,7 +2259,7 @@ _DrawPlayAreaToPlacePrizeCards:: db 0, 2 ; remnant from tcg1, unreferenced -Func_8dcf: +DrawPrizeMarkers: push hl ld a, [wCheckMenuPlayAreaWhichDuelist] ld h, a diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 3b42f3f..c99b595 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -1,7 +1,7 @@ ; handles intro, title screen and start menu ; as well as the core gameplay loop _CoreGameLoop:: - call Func_c240 + call ResetMusicAndOverworldState .intro farcall IntroAndTitleScreen ld a, PLAYER_TURN @@ -314,10 +314,10 @@ HandleStartMenu: ret ; called before intro starts -Func_c240: +ResetMusicAndOverworldState: xor a ld [wCurMusic], a - farcall Func_13dfa + farcall ResetOverworldPresentation ret InitEvents: diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index 7226244..34f0e7f 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -2646,7 +2646,7 @@ MoveNPC: ret CheckAnyOWObjectFlag6:: - call Func_113d2 + call CountOWObjectsWithFlag6 ret CheckOWObjectPointerWithID: @@ -3788,7 +3788,7 @@ ENDR ; counts number of OW objects ; that have flag 6 set -Func_113d2: +CountOWObjectsWithFlag6: push bc push de push hl @@ -6500,7 +6500,7 @@ GetPlayerGender: pop hl ret -Func_13dfa: +ResetOverworldPresentation: call DisableLCD call InitOverworldObjectState call InitOverworldGraphics diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm index 07811c5..61a8060 100644 --- a/src/engine/bank06.asm +++ b/src/engine/bank06.asm @@ -4293,7 +4293,7 @@ ResetPrinterCommunicationSettings: ret ; send some bytes through serial -Func_1a080: ; unreferenced +SendPrinterStatusQueryPacket: ; unreferenced ld bc, 0 lb de, PRINTERPKT_NUL, FALSE jp SendPrinterPacket diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm index dd8e683..0a6b50e 100644 --- a/src/engine/bank07.asm +++ b/src/engine/bank07.asm @@ -2281,7 +2281,7 @@ DepositChips: pop af ret -Func_1cd63: +RunStartMenuFromOverworld: farcall SuspendOverworldForSubScreen call ShowStartMenu farcall ResumeOverworldFromSubScreen @@ -4298,12 +4298,12 @@ UpdateScreenAnimations:: ld [wdc5a], a cp DUEL_SPECIAL_ANIMS jr c, .not_special - call Func_3c8e + call RunCurrentDuelAnimation jr .asm_1e122 .not_special cp DUEL_ANIM_DAMAGE_HUD jr nz, .not_damage_hud - call Func_1e279 + call InitDamageHUDAnimation jr .asm_1e122 .not_damage_hud cp DUEL_SCREEN_ANIMS @@ -4518,7 +4518,7 @@ PlayCoinAnimation: farcall GetSpriteAnimBuffer ret -Func_1e279: +InitDamageHUDAnimation: push af push bc push de @@ -4527,23 +4527,23 @@ Func_1e279: ld [wCurAnimation], a xor a ld [wdc58], a - call Func_1e2b1 + call AnimateDamageNumberDigits ld a, [wDuelAnimEffectiveness] bit 0, a jr z, .asm_1e293 - call Func_1e30d + call LoadDamageEffectivenessExtra .asm_1e293 ld a, $12 ld [wdc58], a ld a, [wDuelAnimEffectiveness] bit 1, a jr z, .asm_1e2a2 - call Func_1e324 + call LoadDamageWeaknessSymbol .asm_1e2a2 ld a, [wDuelAnimEffectiveness] bit 2, a jr z, .asm_1e2ac - call Func_1e347 + call LoadDamageResistanceSymbol .asm_1e2ac pop hl pop de @@ -4551,7 +4551,7 @@ Func_1e279: pop af ret -Func_1e2b1: +AnimateDamageNumberDigits: ; check if damage is over 1000 ld a, [wDuelAnimDamage + 1] cp HIGH(1000) @@ -4612,7 +4612,7 @@ Func_1e2b1: ; ones digit, tens digit, hundred digits db -16, -8, 0 -Func_1e30d: +LoadDamageEffectivenessExtra: call LoadAnimationAndPlay ld bc, FRAMESET_014 farcall SetAndInitSpriteAnimFrameset @@ -4623,7 +4623,7 @@ Func_1e30d: farcall SetSpriteAnimPosition ret -Func_1e324: +LoadDamageWeaknessSymbol: call LoadAnimationAndPlay ld bc, FRAMESET_013 farcall SetAndInitSpriteAnimFrameset @@ -4638,7 +4638,7 @@ Func_1e324: ld [wdc58], a ret -Func_1e347: +LoadDamageResistanceSymbol: call LoadAnimationAndPlay ld bc, FRAMESET_012 farcall SetAndInitSpriteAnimFrameset @@ -5449,7 +5449,7 @@ LoadBoosterPackScene: db SCENE_INTRO_FOSSIL db SCENE_INTRO_TEAM_ROCKET -Func_1e889: +RunGiveBoosterPacksFromOverworld: farcall SuspendOverworldForSubScreen call GiveBoosterPacks farcall ResumeOverworldFromSubScreen @@ -6177,7 +6177,7 @@ DrawMailboxTitleAndScene: lb de, 0, 12 lb bc, 20, 6 call DrawRegularTextBoxVRAM0 - call Func_1ed5e + call GetMailboxSceneAndText call LoadMailboxScene ret @@ -6195,7 +6195,7 @@ PrintMailboxStatusScrollableText: farcall PrintScrollableText_NoTextBoxLabelVRAM0 ; fallthrough -Func_1ed5e: +GetMailboxSceneAndText: ld a, [wMailboxStatus] add a ld c, a @@ -7201,7 +7201,7 @@ GetSelectedMailPosition: INCLUDE "data/mail.asm" -Func_1f57b:: +UpdateOverworldScreenShake:: push af push bc push de @@ -7324,7 +7324,7 @@ Set3FromwDD75: ret ; set [wdd75] = [wdd76] = 0, [wdd77] = c -Func_1f61a: +StopOverworldScreenShake: push af ld a, 0 call Set3FromwDD75 @@ -7651,7 +7651,7 @@ HandleIngameCardPop: key_funcs_end ; dupe of RunCardPopFromOverworld -Func_1f81f: +RunCardPopFromOverworld_Alt: farcall SuspendOverworldKeepingSpriteAnims call HandleIngameCardPop farcall ResumeOverworldKeepingSpriteAnims diff --git a/src/engine/bank0b.asm b/src/engine/bank0b.asm index dee4cd6..624433e 100644 --- a/src/engine/bank0b.asm +++ b/src/engine/bank0b.asm @@ -1234,8 +1234,8 @@ PsychicClubEntrance_StepEvents: map_exit 0, 4, MAP_PSYCHIC_CLUB_LOBBY, 14, 7, WEST map_exit 4, 0, MAP_PSYCHIC_CLUB, 6, 12, NORTH map_exit 5, 0, MAP_PSYCHIC_CLUB, 7, 12, NORTH - ow_script 4, 2, Func_2ca3e - ow_script 5, 2, Func_2ca3e + ow_script 4, 2, PsychicClubEntrance_ResumeAfterMoveStephanie + ow_script 5, 2, PsychicClubEntrance_ResumeAfterMoveStephanie db $ff PsychicClubEntrance_NPCs: @@ -1355,7 +1355,7 @@ PsychicClubEntrance_ContinueOW: scf ret -Func_2ca3e: +PsychicClubEntrance_ResumeAfterMoveStephanie: call PsychicClubEntrance_MoveStephanieOutOfPath farcall OverworldResumeAndHandlePlayerMoveInput ret @@ -8309,9 +8309,9 @@ OverheadIslands_WarpFadeInPreload: .got_blimp_data ld a, OWMODE_SCRIPT ld [wOverworldMode], a - ld a, BANK(Func_2fe9a) + ld a, BANK(OverheadIslands_BlimpFlyover) ld [wOverworldScriptBank], a - ld hl, Func_2fe9a + ld hl, OverheadIslands_BlimpFlyover ld a, l ld [wOverworldScriptPointer], a ld a, h @@ -8332,7 +8332,7 @@ OverheadIslands_WarpEndSFX: ccf ret -Func_2fe9a: +OverheadIslands_BlimpFlyover: ld a, [wPrevMap] cp OVERWORLD_MAP_TCG jr z, .from_tcg_to_gr diff --git a/src/engine/bank0d.asm b/src/engine/bank0d.asm index 969de8e..e4ec1ca 100644 --- a/src/engine/bank0d.asm +++ b/src/engine/bank0d.asm @@ -990,10 +990,10 @@ TcgAirport_MapHeader: TcgAirport_StepEvents: map_exit 0, 9, MAP_TCG_AIRPORT_ENTRANCE, 10, 6, WEST map_exit 0, 10, MAP_TCG_AIRPORT_ENTRANCE, 10, 7, WEST - _ow_coordinate_function 11, 8, 0, 0, 0, 3, Func_349cd - ow_script 10, 9, Func_349cd - ow_script 9, 9, Func_349cd - _ow_coordinate_function 8, 8, 0, 0, 0, 1, Func_349cd + _ow_coordinate_function 11, 8, 0, 0, 0, 3, TcgAirport_ResumeAfterMoveGR5 + ow_script 10, 9, TcgAirport_ResumeAfterMoveGR5 + ow_script 9, 9, TcgAirport_ResumeAfterMoveGR5 + _ow_coordinate_function 8, 8, 0, 0, 0, 1, TcgAirport_ResumeAfterMoveGR5 db $ff TcgAirport_NPCs: @@ -1288,7 +1288,7 @@ Script_GR5_TCGAirportLanded: db NORTH, MOVE_0 db $ff -Func_349cd: +TcgAirport_ResumeAfterMoveGR5: call TcgAirport_MoveGR5OutOfPath farcall OverworldResumeAndHandlePlayerMoveInput ret @@ -4733,7 +4733,7 @@ PsychicStronghold_AfterDuelScripts: npc_script NPC_RYOKO, Script_RyokoAfterDuel db $ff -Func_364ac: +PsychicStronghold_MamiIntroPlatformScript: ld a, NPC_MAMI ld [wScriptNPC], a ldtx hl, DialogMamiText @@ -5648,7 +5648,7 @@ PsychicStronghold_PlatformWarpOrBlock: pop de pop bc pop af - call Func_364ac + call PsychicStronghold_MamiIntroPlatformScript ret .asm_36bdc pop hl diff --git a/src/engine/bank0f.asm b/src/engine/bank0f.asm index d12b755..3a7ef72 100644 --- a/src/engine/bank0f.asm +++ b/src/engine/bank0f.asm @@ -1092,7 +1092,7 @@ Script_Aaron: farcall HandlePopupMenu jr c, .asm_3c90a or a - jp z, Func_3c917 + jp z, Script_AaronStep1 jr .asm_3c90a .ows_3c8b3 print_npc_text Text0f3f @@ -1102,9 +1102,9 @@ Script_Aaron: farcall HandlePopupMenu jr c, .asm_3c90a or a - jp z, Func_3c917 + jp z, Script_AaronStep1 dec a - jp z, Func_3c964 + jp z, Script_AaronStep2 jr .asm_3c90a .ows_3c8cb print_npc_text Text0f3f @@ -1114,11 +1114,11 @@ Script_Aaron: farcall HandlePopupMenu jr c, .asm_3c90a or a - jp z, Func_3c917 + jp z, Script_AaronStep1 dec a - jp z, Func_3c964 + jp z, Script_AaronStep2 dec a - jp z, Func_3c9b1 + jp z, Script_AaronStep3 jr .asm_3c90a .ows_3c8e7 check_event EVENT_GOT_MACHAMP_COIN @@ -1130,11 +1130,11 @@ Script_Aaron: farcall HandlePopupMenu jr c, .asm_3c90a cp $01 - jp c, Func_3c917 - jp z, Func_3c964 + jp c, Script_AaronStep1 + jp z, Script_AaronStep2 cp $03 - jp c, Func_3c9b1 - jp z, Func_3ca02 + jp c, Script_AaronStep3 + jp z, Script_AaronStep4 .asm_3c90a ld a, $01 start_script @@ -1144,7 +1144,7 @@ Script_Aaron: end_script ret -Func_3c917: +Script_AaronStep1: ld a, $01 start_script print_npc_text Text0f42 @@ -1187,7 +1187,7 @@ Script_AaronStep1AfterDuel: db NORTH, MOVE_2 db $ff -Func_3c964: +Script_AaronStep2: ld a, $01 start_script print_npc_text Text0f47 @@ -1230,7 +1230,7 @@ Script_AaronStep2AfterDuel: db EAST, MOVE_6 db $ff -Func_3c9b1: +Script_AaronStep3: ld a, $01 start_script print_npc_text Text0f4b @@ -1274,7 +1274,7 @@ Script_AaronStep3AfterDuel: db EAST, MOVE_6 db $ff -Func_3ca02: +Script_AaronStep4: ld a, $01 start_script print_npc_text Text0f51 @@ -7377,9 +7377,9 @@ FightingFortBasement_WarpFadeInPreload: .asm_3f8d8 ld a, OWMODE_SCRIPT ld [wOverworldMode], a - ld a, BANK(Func_3f95e) + ld a, BANK(FightingFortBasement_WalkPlayerIn) ld [wOverworldScriptBank], a - ld hl, Func_3f95e + ld hl, FightingFortBasement_WalkPlayerIn ld a, l ld [wOverworldScriptPointer], a ld a, h @@ -7452,7 +7452,7 @@ FightingFortBasement_ChestOpenedAppearanceCheck: scf ret -Func_3f95e: +FightingFortBasement_WalkPlayerIn: ld a, [wPlayerOWObject] ld b, BANK(.NPCMovement_3f980) ld hl, .NPCMovement_3f980 diff --git a/src/engine/bank10.asm b/src/engine/bank10.asm index e208bff..af47d15 100644 --- a/src/engine/bank10.asm +++ b/src/engine/bank10.asm @@ -1405,9 +1405,9 @@ MasonLaboratoryMain_WarpFadeInPreload: farcall CalcOWScroll ld a, OWMODE_SCRIPT ld [wOverworldMode], a - ld a, BANK(Func_40f46) + ld a, BANK(MasonLaboratoryMain_FirstVisitScript) ld [wOverworldScriptBank], a - ld hl, Func_40f46 + ld hl, MasonLaboratoryMain_FirstVisitScript ld a, l ld [wOverworldScriptPointer], a ld a, h @@ -1471,7 +1471,7 @@ MasonLaboratoryMain_AfterDuelScripts: npc_script NPC_SAM, Script_SamMasonLabAfterDuel db $ff -Func_40f46: +MasonLaboratoryMain_FirstVisitScript: xor a start_script script_callfar Script_34000 @@ -1532,7 +1532,7 @@ Func_40f46: give_deck STARTER_DECK_ID script_ret -Func_40fbc: +MasonLaboratoryMain_DrMasonEscortScript: ld a, NPC_DR_MASON ld [wScriptNPC], a ldtx hl, DialogDrMasonText @@ -1583,7 +1583,7 @@ WarpFromMasonLabIfMapReloadEvent: .asm_41013 ld a, EVENT_SET_UNTIL_MAP_RELOAD_1 farcall ZeroOutEventValue - call Func_40fbc + call MasonLaboratoryMain_DrMasonEscortScript ret Script_TCGChallengeMachine: @@ -2431,12 +2431,12 @@ TcgChallengeHall_ContinueOW: ret .asm_41645 farcall OverworldResumeWithCurSong - call Func_4164f + call TcgChallengeHall_ResumeRound scf ccf ret -Func_4164f: +TcgChallengeHall_ResumeRound: xor a start_script reset_event EVENT_MASONS_LAB_CHALLENGE_MACHINE_STATE_DUMMY @@ -3179,10 +3179,10 @@ GrAirport_MapHeader: GrAirport_StepEvents: map_exit 13, 9, MAP_GR_AIRPORT_ENTRANCE, 1, 6, EAST map_exit 13, 10, MAP_GR_AIRPORT_ENTRANCE, 1, 7, EAST - _ow_coordinate_function 5, 8, 0, 0, 0, 3, Func_41dac - ow_script 4, 9, Func_41dac - ow_script 3, 9, Func_41dac - _ow_coordinate_function 2, 8, 0, 0, 0, 1, Func_41dac + _ow_coordinate_function 5, 8, 0, 0, 0, 3, GrAirport_ResumeAfterMoveGR5 + ow_script 4, 9, GrAirport_ResumeAfterMoveGR5 + ow_script 3, 9, GrAirport_ResumeAfterMoveGR5 + _ow_coordinate_function 2, 8, 0, 0, 0, 1, GrAirport_ResumeAfterMoveGR5 db $ff GrAirport_NPCs: @@ -3399,7 +3399,7 @@ Script_GR5_GRAirportLanded: db NORTH, MOVE_0 db $ff -Func_41dac: +GrAirport_ResumeAfterMoveGR5: call GrAirport_MoveGR5OutOfPath farcall OverworldResumeAndHandlePlayerMoveInput ret @@ -4571,12 +4571,12 @@ GrChallengeHall_ContinueOW: ret .asm_42702 farcall OverworldResumeWithCurSong - call Func_4270c + call GrChallengeHall_ResumeRound scf ccf ret -Func_4270c: +GrChallengeHall_ResumeRound: xor a start_script reset_event EVENT_MASONS_LAB_CHALLENGE_MACHINE_STATE_DUMMY @@ -5590,9 +5590,9 @@ GrCastleBiruritchi_WarpFadeInPreload: jr nz, .asm_42f84 ld a, OWMODE_SCRIPT ld [wOverworldMode], a - ld a, BANK(Func_43050) + ld a, BANK(GrCastleBiruritchi_StairsCutscene) ld [wOverworldScriptBank], a - ld hl, Func_43050 + ld hl, GrCastleBiruritchi_StairsCutscene ld a, l ld [wOverworldScriptPointer], a ld a, h @@ -5671,12 +5671,12 @@ GrCastleBiruritchi_ContinueOW: ret .asm_42fd7 farcall OverworldResumeWithCurSong - call Func_42fe1 + call GrCastleBiruritchi_ResumeBiruritchi scf ccf ret -Func_42fe1: +GrCastleBiruritchi_ResumeBiruritchi: ld a, NPC_BIRURITCHI ld [wScriptNPC], a ldtx hl, DialogBiruritchiText @@ -5731,7 +5731,7 @@ Script_43044: ld [wNextGameEvent], a ret -Func_43050: +GrCastleBiruritchi_StairsCutscene: xor a start_script set_event EVENT_GR_CASTLE_STAIRS_RUI_ROADBLOCK diff --git a/src/engine/duel/effect_functions1.asm b/src/engine/duel/effect_functions1.asm index 7e1e421..599266f 100644 --- a/src/engine/duel/effect_functions1.asm +++ b/src/engine/duel/effect_functions1.asm @@ -1537,7 +1537,7 @@ DrawSymbolOnPlayAreaCursor: ret ; unreferenced -Func_6873c: +DrawIncompleteTextStub: ldtx hl, IncompleteText call DrawWideTextBox_WaitForInput ret diff --git a/src/engine/slot_machine.asm b/src/engine/slot_machine.asm index 3d14013..d4d86bf 100644 --- a/src/engine/slot_machine.asm +++ b/src/engine/slot_machine.asm @@ -966,7 +966,7 @@ HandleSlotMachineBetting: ret ; debug? unreferenced -Func_12a3d: +ToggleSlotMachineDebugMode: ldh a, [hKeysPressed] and PAD_SELECT ret z @@ -1283,7 +1283,7 @@ HandleSlotMachinePayouts: db 3 ; bet 5 ; debug? unreferenced -Func_12c17: +FindMatchingSlotMachinePreset: ld hl, .pointer_table ld c, 0 .loop_presets diff --git a/src/home/duel.asm b/src/home/duel.asm index 0ef042d..9645cec 100644 --- a/src/home/duel.asm +++ b/src/home/duel.asm @@ -1430,7 +1430,7 @@ PlayAttackAnimation_DealAttackDamage:: call PrintKnockedOutIfHLZero jr HandleAfterDamageEffects -Func_17ed: +DrawWideTextBoxThenHandleAfterDamage: call DrawWideTextBox_WaitForInput xor a ld hl, wDamage diff --git a/src/home/list.asm b/src/home/list.asm index 65fd8ef..de4cc8d 100644 --- a/src/home/list.asm +++ b/src/home/list.asm @@ -94,7 +94,7 @@ Func_0b89: push hl push bc ld hl, wListPointer -Func_0b8e: +SetNextWordOfList_Common: ld c, [hl] inc hl ld b, [hl] @@ -110,7 +110,7 @@ SetNextWordOfList2:: push hl push bc ld hl, wListPointer2 - jr Func_0b8e + jr SetNextWordOfList_Common Func_0ba0: push hl diff --git a/src/home/menus.asm b/src/home/menus.asm index 7de283a..8601cc9 100644 --- a/src/home/menus.asm +++ b/src/home/menus.asm @@ -401,7 +401,7 @@ ReloadCardListItems:: ret ; reload a list of cards, except don't print their names -Func_2827:: +ReloadCardListWithoutNames:: ld a, $01 ldh [hffbb], a call ReloadCardListItems diff --git a/src/home/process_text.asm b/src/home/process_text.asm index 407a3e4..f19bc01 100644 --- a/src/home/process_text.asm +++ b/src/home/process_text.asm @@ -217,7 +217,7 @@ GenerateAndPlaceTextTile:: ldh a, [hffbb] and $1 jr nz, .asm_22ed - call Func_2325 + call AllocateOrPromoteTextTileCacheEntry jr c, .tile_already_exists or a jr nz, .done @@ -279,7 +279,7 @@ TerminateHalfWidthText:: pop hl ret -Func_2325:: +AllocateOrPromoteTextTileCacheEntry:: call PromoteTextTileCacheEntry ret c or a diff --git a/src/home/unsorted.asm b/src/home/unsorted.asm index e3d268b..fb3f4bc 100644 --- a/src/home/unsorted.asm +++ b/src/home/unsorted.asm @@ -693,7 +693,7 @@ ExecuteNPCScript:: scf ret -Func_3473:: +ReadFarByte:: push bc ld b, a ldh a, [hBankROM] @@ -956,7 +956,7 @@ DivideBCbyDE:: jr nz, .asm_3568 ret -Func_3588:: +WriteDataBlockToBGMap0Preserved:: push af push bc push de @@ -968,7 +968,7 @@ Func_3588:: pop af ret -Func_3594:: +WriteDataBlocksToBGMap0Preserved:: push af push bc push de @@ -1919,7 +1919,7 @@ FrameFunc_Overworld:: ld e, $10 farcall UpdateAllOWObjectMovementFast .asm_3a56 - farcall Func_1f57b + farcall UpdateOverworldScreenShake farcall UpdateSpriteAnims call UpdateOWTileAnimations call UpdateOverworldPaletteCycle @@ -1935,7 +1935,7 @@ FrameFunc_SpriteAnimationAndFadePals:: push bc push de push hl - call Func_3f78 + call CallFrameFunction farcall UpdateSpriteAnims farcall FadePalettes pop hl @@ -2288,7 +2288,7 @@ CopyCurPaletteToPal2:: StubbedPlayDefaultSong:: ret -Func_3c3d:: +HandleCoinMenuPageInput_Trampoline:: farcall HandleCoinMenuPageInput ret @@ -2344,7 +2344,7 @@ CheckAnyAnimationPlaying:: ccf ret -Func_3c8e:: +RunCurrentDuelAnimation:: ld a, [wCurAnimation] cp DUEL_ANIM_158_UNUSED jr z, .asm_3ca8 @@ -2358,14 +2358,14 @@ Func_3c8e:: ld a, [hli] ld h, [hl] ld l, a - jp Func_3cc3 + jp CallDuelAnimationFunction .asm_3ca8 ld a, [wDuelAnimDamage] ld l, a ld a, [wDuelAnimDamage + 1] ld h, a - jp Func_3cc3 + jp CallDuelAnimationFunction .pointer_table dw SetScreenForDuelAnimation ; DUEL_ANIM_SET_SCREEN @@ -2377,7 +2377,7 @@ Func_3c8e:: dw DuelAnim156 ; DUEL_ANIM_156_UNUSED dw DuelAnim157 ; DUEL_ANIM_157_UNUSED -Func_3cc3:: +CallDuelAnimationFunction:: ld a, $ff ld [wdcf0], a ldh a, [hBankROM] @@ -2854,7 +2854,7 @@ SetFrameFunction:: ret ; jumps to wde69 if not null -Func_3f78:: +CallFrameFunction:: push af ld hl, wde69 ld a, [hli]