diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm index 87c4852..d057d23 100644 --- a/src/engine/bank07.asm +++ b/src/engine/bank07.asm @@ -3555,21 +3555,21 @@ _PlayLinkDuelAndGetResult: pop bc ret -Func_1d9be: +HandleGiftCenter: push af push bc push de push hl farcall HideNPCAnimsUnderDialogBox - call Func_1d9ff + call GiftCenter_PrintWelcome call Func_1da45 - jr c, .asm_1d9ed + jr c, .exit ld a, [wdc06] cp $04 - jr z, .asm_1d9ed - call Func_1da1f - call Func_1da2a - jr c, .asm_1d9ed + jr z, .exit + call GiftCenter_PrintSelectedService + call GiftCenter_SaveRequest + jr c, .exit call PauseSong_SaveState push af ld a, MUSIC_CARD_POP @@ -3577,8 +3577,8 @@ Func_1d9be: pop af call Func_1dac1 call ResumeSong_ClearTemp -.asm_1d9ed - call Func_1da14 +.exit + call GiftCenter_PrintComeAgain farcall ShowNPCAnimsUnderDialogBox pop hl pop de @@ -3591,7 +3591,7 @@ Func_1d9f9: ld [wdc06], a ret -Func_1d9ff: +GiftCenter_PrintWelcome: ldtx hl, GiftCenterWelcomeText ldtx de, ReceptionistText farcall PrintScrollableText_WithTextBoxLabelVRAM0 @@ -3600,19 +3600,19 @@ Func_1d9ff: farcall PrintScrollableText_WithTextBoxLabelVRAM0 ret -Func_1da14: +GiftCenter_PrintComeAgain: ldtx hl, GiftCenterComeAgainText ldtx de, ReceptionistText farcall PrintScrollableText_WithTextBoxLabelVRAM0 ret -Func_1da1f: +GiftCenter_PrintSelectedService: ldtx hl, GiftCenterServiceAcknowledgementText ldtx de, ReceptionistText farcall PrintScrollableText_WithTextBoxLabelVRAM0 ret -Func_1da2a: +GiftCenter_SaveRequest: ldtx hl, GiftCenterServiceSaveRequestText ldtx de, ReceptionistText farcall PrintScrollableText_WithTextBoxLabelVRAM0 diff --git a/src/engine/bank0b.asm b/src/engine/bank0b.asm index fadf173..c9976a6 100644 --- a/src/engine/bank0b.asm +++ b/src/engine/bank0b.asm @@ -1499,8 +1499,8 @@ PsychicClubLobby_NPCInteractions: PsychicClubLobby_OWInteractions: ow_script 8, 2, PCMenu ow_script 9, 2, PCMenu - ow_script 2, 4, Func_3c1b9 - ow_script 4, 4, Func_3c2d9 + ow_script 2, 4, Script_TCGBattleCenterClerk + ow_script 4, 4, GiftCenter ow_script 12, 2, Script_PsychicPokemonBook ow_script 13, 2, Script_PsychicPokemonPokemonPowerBook ow_script 14, 2, Script_UsefulButtonsBook @@ -2653,8 +2653,8 @@ RockClubLobby_NPCInteractions: RockClubLobby_OWInteractions: ow_script 8, 2, PCMenu ow_script 9, 2, PCMenu - ow_script 2, 4, Func_3c1b9 - ow_script 4, 4, Func_3c2d9 + ow_script 2, 4, Script_TCGBattleCenterClerk + ow_script 4, 4, GiftCenter ow_script 12, 2, Script_RockGroundPokemonBook ow_script 13, 2, Script_FightingPokemonSurefireMethodBook ow_script 14, 2, Script_FightingPokemonFormidableOpponentsBook @@ -3479,8 +3479,8 @@ FightingClubLobby_NPCInteractions: FightingClubLobby_OWInteractions: ow_script 8, 2, PCMenu ow_script 9, 2, PCMenu - ow_script 2, 4, Func_3c1b9 - ow_script 4, 4, Func_3c2d9 + ow_script 2, 4, Script_TCGBattleCenterClerk + ow_script 4, 4, GiftCenter ow_script 12, 2, Script_FightingPokemonBook ow_script 13, 2, Script_FightingPokemonCombosBook ow_script 14, 2, Script_FightingPokemonDeckBuildingBook @@ -5138,8 +5138,8 @@ ScienceClubLobby_NPCInteractions: ScienceClubLobby_OWInteractions: ow_script 8, 2, PCMenu ow_script 9, 2, PCMenu - ow_script 2, 4, Func_3c1b9 - ow_script 4, 4, Func_3c2d9 + ow_script 2, 4, Script_TCGBattleCenterClerk + ow_script 4, 4, GiftCenter ow_script 12, 2, Script_SciencePokemonBook ow_script 13, 2, Script_SciencePokemonSurefireMethodBook ow_script 14, 2, Script_SciencePokemonDeckBuildingBook @@ -6140,8 +6140,8 @@ WaterClubLobby_NPCInteractions: WaterClubLobby_OWInteractions: ow_script 8, 2, PCMenu ow_script 9, 2, PCMenu - ow_script 2, 4, Func_3c1b9 - ow_script 4, 4, Func_3c2d9 + ow_script 2, 4, Script_TCGBattleCenterClerk + ow_script 4, 4, GiftCenter ow_script 12, 2, Script_WaterPokemonBook ow_script 13, 2, Script_WaterPokemonAttacksBook ow_script 14, 2, Script_PsyduckGolduckBook @@ -7242,8 +7242,8 @@ FireClubLobby_NPCInteractions: FireClubLobby_OWInteractions: ow_script 8, 2, PCMenu ow_script 9, 2, PCMenu - ow_script 2, 4, Func_3c1b9 - ow_script 4, 4, Func_3c2d9 + ow_script 2, 4, Script_TCGBattleCenterClerk + ow_script 4, 4, GiftCenter ow_script 12, 2, Script_FirePokemonBook ow_script 13, 2, Script_FirePokemonAttacksBook ow_script 14, 2, Script_FirePokemonDeckBuildingBook diff --git a/src/engine/bank0c.asm b/src/engine/bank0c.asm index 8617c6a..e8cbfdc 100644 --- a/src/engine/bank0c.asm +++ b/src/engine/bank0c.asm @@ -1505,8 +1505,8 @@ GrassFortLobby_NPCInteractions: GrassFortLobby_OWInteractions: ow_script 1, 2, PCMenu ow_script 2, 2, PCMenu - ow_script 5, 4, Func_3c1d0 - ow_script 8, 4, Func_3c2d9 + ow_script 5, 4, Script_GRBattleCenterClerk + ow_script 8, 4, GiftCenter db $ff GrassFortLobby_MapScripts: @@ -2547,8 +2547,8 @@ LightningFortLobby_NPCInteractions: LightningFortLobby_OWInteractions: ow_script 1, 2, PCMenu ow_script 2, 2, PCMenu - ow_script 5, 4, Func_3c1d0 - ow_script 8, 4, Func_3c2d9 + ow_script 5, 4, Script_GRBattleCenterClerk + ow_script 8, 4, GiftCenter db $ff LightningFortLobby_MapScripts: @@ -3685,8 +3685,8 @@ FireFortLobby_NPCInteractions: FireFortLobby_OWInteractions: ow_script 1, 2, PCMenu ow_script 2, 2, PCMenu - ow_script 5, 4, Func_3c1d0 - ow_script 8, 4, Func_3c2d9 + ow_script 5, 4, Script_GRBattleCenterClerk + ow_script 8, 4, GiftCenter db $ff FireFortLobby_MapScripts: diff --git a/src/engine/bank0d.asm b/src/engine/bank0d.asm index dfbbd42..c9e7631 100644 --- a/src/engine/bank0d.asm +++ b/src/engine/bank0d.asm @@ -2416,8 +2416,8 @@ GrChallengeHallLobby_NPCInteractions: GrChallengeHallLobby_OWInteractions: ow_script 1, 2, PCMenu ow_script 2, 2, PCMenu - ow_script 5, 4, Func_3c1d0 - ow_script 8, 4, Func_3c2d9 + ow_script 5, 4, Script_GRBattleCenterClerk + ow_script 8, 4, GiftCenter db $ff GrChallengeHallLobby_MapScripts: @@ -4372,8 +4372,8 @@ PsychicStrongholdLobby_NPCInteractions: PsychicStrongholdLobby_OWInteractions: ow_script 1, 2, PCMenu ow_script 2, 2, PCMenu - ow_script 5, 4, Func_3c1d0 - ow_script 8, 4, Func_3c2d9 + ow_script 5, 4, Script_GRBattleCenterClerk + ow_script 8, 4, GiftCenter db $ff PsychicStrongholdLobby_MapScripts: diff --git a/src/engine/bank0f.asm b/src/engine/bank0f.asm index 2477f3c..86d25c6 100644 --- a/src/engine/bank0f.asm +++ b/src/engine/bank0f.asm @@ -200,7 +200,7 @@ Prologue:: jr c, .loop_wait_2 ret -Func_3c1b9: +Script_TCGBattleCenterClerk: ld a, NPC_CLERK_BATTLE_CENTER ld [wScriptNPC], a ldtx hl, DialogReceptionistText @@ -210,9 +210,9 @@ Func_3c1b9: ld [wScriptNPCName + 1], a ld a, MUSIC_DUEL_THEME_CLUB_MEMBER ld [wDuelTheme], a - jr Func_3c1d0.asm_3c1e5 + jr Script_BattleCenter -Func_3c1d0: +Script_GRBattleCenterClerk: ld a, NPC_GR_CLERK_BATTLE_CENTER ld [wScriptNPC], a ldtx hl, DialogReceptionistText @@ -222,7 +222,9 @@ Func_3c1d0: ld [wScriptNPCName + 1], a ld a, MUSIC_DUEL_THEME_GR_MEMBER ld [wDuelTheme], a -.asm_3c1e5 +; fallthrough + +Script_BattleCenter: xor a start_script start_dialog @@ -338,15 +340,15 @@ Func_3c1d0: .ows_3c2d8 script_ret -Func_3c2d9: +GiftCenter: ld a, EVENT_F2 farcall ZeroOutEventValue - farcall Func_1d9be + farcall HandleGiftCenter ld a, EVENT_F2 farcall GetEventValue - jr z, .asm_3c2ef + jr z, .done farcall PlayCurrentSong -.asm_3c2ef +.done ret Script_3c2f0: @@ -1641,8 +1643,8 @@ LightningClubLobby_NPCInteractions: LightningClubLobby_OWInteractions: ow_script 8, 2, PCMenu ow_script 9, 2, PCMenu - ow_script 2, 4, Func_3c1b9 - ow_script 4, 4, Func_3c2d9 + ow_script 2, 4, Script_TCGBattleCenterClerk + ow_script 4, 4, GiftCenter ow_script 12, 2, Script_LightningPokemonBook ow_script 13, 2, Script_LightningPokemonDeckBuildingBook ow_script 14, 2, Script_BirdPokemonBook @@ -1948,8 +1950,8 @@ GrassClubLobby_NPCInteractions: GrassClubLobby_OWInteractions: ow_script 8, 2, PCMenu ow_script 9, 2, PCMenu - ow_script 2, 4, Func_3c1b9 - ow_script 4, 4, Func_3c2d9 + ow_script 2, 4, Script_TCGBattleCenterClerk + ow_script 4, 4, GiftCenter ow_script 12, 2, Script_PlantlikePokemonBook ow_script 13, 2, Script_GrassPokemonBreederBook ow_script 14, 2, Script_GrassPokemonDeckBuildingBook @@ -2449,8 +2451,8 @@ TcgChallengeHallLobby_NPCInteractions: TcgChallengeHallLobby_OWInteractions: ow_script 8, 2, PCMenu ow_script 9, 2, PCMenu - ow_script 2, 4, Func_3c1b9 - ow_script 4, 4, Func_3c2d9 + ow_script 2, 4, Script_TCGBattleCenterClerk + ow_script 4, 4, GiftCenter ow_script 12, 2, Script_ColorlessPokemonBook ow_script 13, 2, Script_CardPopBook ow_script 14, 2, Script_EnergyCardColorsBook @@ -6067,8 +6069,8 @@ GameCenterLobby_NPCInteractions: GameCenterLobby_OWInteractions: ow_script 1, 2, PCMenu ow_script 2, 2, PCMenu - ow_script 5, 4, Func_3c1d0 - ow_script 8, 4, Func_3c2d9 + ow_script 5, 4, Script_GRBattleCenterClerk + ow_script 8, 4, GiftCenter db $ff GameCenterLobby_MapScripts: @@ -6948,8 +6950,8 @@ WaterFortLobby_NPCInteractions: WaterFortLobby_OWInteractions: ow_script 1, 2, PCMenu ow_script 2, 2, PCMenu - ow_script 5, 4, Func_3c1d0 - ow_script 8, 4, Func_3c2d9 + ow_script 5, 4, Script_GRBattleCenterClerk + ow_script 8, 4, GiftCenter db $ff WaterFortLobby_MapScripts: