diff options
| author | dannye <33dannye@gmail.com> | 2021-05-31 16:43:31 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-05-31 16:51:45 -0500 |
| commit | 7a23e2a635318754b56923824d5949bcff3815bf (patch) | |
| tree | 6e57c5b6762b76ce8e18e8b08dace841f640a01d /scripts/CinnabarGym3.asm | |
| parent | Merge remote-tracking branch 'remotes/pokered/master' (diff) | |
| parent | Merge pull request #325 from CelestialAmber/master (diff) | |
| download | pokeyellow-7a23e2a635318754b56923824d5949bcff3815bf.tar.gz pokeyellow-7a23e2a635318754b56923824d5949bcff3815bf.tar.xz pokeyellow-7a23e2a635318754b56923824d5949bcff3815bf.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/CinnabarGym3.asm')
| -rw-r--r-- | scripts/CinnabarGym3.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/CinnabarGym3.asm b/scripts/CinnabarGym3.asm index af3db510..dae792df 100644 --- a/scripts/CinnabarGym3.asm +++ b/scripts/CinnabarGym3.asm @@ -1,20 +1,20 @@ Func_f2133:: CheckEvent EVENT_BEAT_BLAINE - jr nz, .asm_627d9 - ld hl, CinnabarGymText_75ac2 - jr .asm_0b11d -.asm_627d9 - ld hl, CinnabarGymText_75ac7 -.asm_0b11d + jr nz, .afterBeat + ld hl, CinnabarGymGuidePreBattleText + jr .done +.afterBeat + ld hl, CinnabarGymGuidePostBattleText +.done call PrintText ret -CinnabarGymText_75ac2: - text_far _CinnabarGymText_75ac2 +CinnabarGymGuidePreBattleText: + text_far _CinnabarGymGuidePreBattleText text_end -CinnabarGymText_75ac7: - text_far _CinnabarGymText_75ac7 +CinnabarGymGuidePostBattleText: + text_far _CinnabarGymGuidePostBattleText text_end Func_f2150:: |