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 /engine/oak_speech.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 'engine/oak_speech.asm')
| -rwxr-xr-x | engine/oak_speech.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 925ff913..2726c651 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -56,7 +56,7 @@ OakSpeech: ; 5e85 (1:5e85) ld a,1 ld [wItemQuantity],a call AddItemToInventory ; give one potion - ld a,[wAnimationID] + ld a,[wDefaultMap] ld [wDestinationMap],a call SpecialWarpIn xor a @@ -225,8 +225,8 @@ IntroDisplayPicCenteredOrUpperRight: ; 6010 (1:6010) call UncompressSpriteFromDE ld a, $0 call SwitchSRAMBankAndLatchClockData - ld hl,S_SPRITEBUFFER1 - ld de,S_SPRITEBUFFER0 + ld hl,sSpriteBuffer1 + ld de,sSpriteBuffer0 ld bc,$310 call CopyData call PrepareRTCDataAndDisableSRAM |