diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-11-30 16:35:33 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 16:35:33 -0600 |
| commit | bb76c06120bcd1fc0f86bd3cc96cbbde93c0c80c (patch) | |
| tree | 7629f516fd4c09dbfb907c5d4154e0a58666a5a6 /engine/movie/oak_speech | |
| parent | Keep wGrassMons and wWaterMons together with a UNION (diff) | |
| parent | Fix reference to unused_fanfare.asm (diff) | |
| download | pokeyellow-bb76c06120bcd1fc0f86bd3cc96cbbde93c0c80c.tar.gz pokeyellow-bb76c06120bcd1fc0f86bd3cc96cbbde93c0c80c.tar.xz pokeyellow-bb76c06120bcd1fc0f86bd3cc96cbbde93c0c80c.zip | |
Merge pull request #304 from SatoMew/master
Rename *TilesetType to *TileAnimations
Diffstat (limited to 'engine/movie/oak_speech')
| -rw-r--r-- | engine/movie/oak_speech/oak_speech.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm index 4b64f20d..93cdfaab 100644 --- a/engine/movie/oak_speech/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -52,7 +52,7 @@ OakSpeech: ld [wDestinationMap], a call SpecialWarpIn xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ld a, [wd732] bit 1, a ; possibly a debug mode bit jp nz, .skipChoosingNames |