diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
| commit | 5da4ad3d5c62292f062d4f7b4382e6c09b7faaea (patch) | |
| tree | 97319f45578efa0901fb1986678c16bbdeda6bcc /engine/oak_speech.asm | |
| parent | e181c27c5e396aea254b471b182df3237eeb03ce (diff) | |
| parent | 2bb64d11e6015e39e934e7359697c08636645994 (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'engine/oak_speech.asm')
| -rwxr-xr-x | engine/oak_speech.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 346df99b..925ff913 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -39,7 +39,7 @@ SetDefaultNames: ; 5e27 (1:5e27) ld bc, NAME_LENGTH call CopyData ; rip optimizations ret - + OakSpeech: ; 5e85 (1:5e85) call StopAllMusic ; stop music ld a, BANK(Music_Routes2) @@ -157,7 +157,7 @@ OakSpeech: ; 5e85 (1:5e85) call GBFadeOutToWhite call ClearScreen ; rip more tail-end optimizations ret - + OakSpeechText1: ; 5fb9 (1:5fb9) TX_FAR _OakSpeechText1 db "@" |