diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
| commit | f5983c0f813d3d908b6016db3ed866e4ca9437dc (patch) | |
| tree | d6888723f443557ce45c9a00d873caa5e7a8930e /scripts/pewterpokecenter2.asm | |
| parent | Character dict; surfing minigame; printer debug (diff) | |
| parent | More syncing with pokered (diff) | |
| download | pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.gz pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.xz pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.zip | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'scripts/pewterpokecenter2.asm')
| -rwxr-xr-x | scripts/pewterpokecenter2.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/pewterpokecenter2.asm b/scripts/pewterpokecenter2.asm index e424071a..9f035fa9 100755 --- a/scripts/pewterpokecenter2.asm +++ b/scripts/pewterpokecenter2.asm @@ -4,13 +4,13 @@ Func_f1d98: ret PewterPokecenterText_f1d9f: - TX_FAR _PewterPokecenterText2 + TX_FAR _PewterPokecenterText3 db "@" -Func_f1da4: +PewterJigglypuff: ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, PewterPokecenterText_f1e19 + ld hl, .Text call PrintText call StopAllMusic ld c, 32 @@ -60,8 +60,8 @@ Func_f1da4: call DisablePikachuFollowingPlayer ret -PewterPokecenterText_f1e19: - TX_FAR _PewterPokecenterText5 +.Text + TX_FAR _PewterJigglypuffText db "@" JigglypuffSpinData: |