diff options
| author | dannye <33dannye@gmail.com> | 2020-12-15 11:05:12 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-12-15 11:05:12 -0600 |
| commit | 2654da5d157540d482790308f1c2948e1431fa46 (patch) | |
| tree | 265d64b9fb8f6e8bd580cb6a5ec3c59224e9fdeb /engine/movie | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| parent | Update rgbdscheck.asm (diff) | |
| download | pokeyellow-2654da5d157540d482790308f1c2948e1431fa46.tar.gz pokeyellow-2654da5d157540d482790308f1c2948e1431fa46.tar.xz pokeyellow-2654da5d157540d482790308f1c2948e1431fa46.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/movie')
| -rw-r--r-- | engine/movie/evolution.asm | 2 | ||||
| -rw-r--r-- | engine/movie/hall_of_fame.asm | 2 | ||||
| -rw-r--r-- | engine/movie/oak_speech/oak_speech.asm | 2 | ||||
| -rw-r--r-- | engine/movie/title.asm | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engine/movie/evolution.asm b/engine/movie/evolution.asm index 624a7f5f..2cf841c8 100644 --- a/engine/movie/evolution.asm +++ b/engine/movie/evolution.asm @@ -17,7 +17,7 @@ EvolveMon: call Delay3 xor a ldh [hAutoBGTransferEnabled], a - ldh [hTilesetType], a + ldh [hTileAnimations], a ld a, [wEvoOldSpecies] ld [wWholeScreenPaletteMonSpecies], a ld c, 0 diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm index 616a72e3..db3ab617 100644 --- a/engine/movie/hall_of_fame.asm +++ b/engine/movie/hall_of_fame.asm @@ -19,7 +19,7 @@ AnimateHallOfFame: call FillMemory xor a ld [wUpdateSpritesEnabled], a - ldh [hTilesetType], a + ldh [hTileAnimations], a ld [wSpriteFlipped], a ld [wLetterPrintingDelayFlags], a ; no delay ld [wHoFMonOrPlayer], a ; mon diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm index 7acbd693..2ed61fda 100644 --- a/engine/movie/oak_speech/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -60,7 +60,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 diff --git a/engine/movie/title.asm b/engine/movie/title.asm index cf1eecdb..dfe057f3 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -21,7 +21,7 @@ DisplayTitleScreen: ld a, $1 ldh [hAutoBGTransferEnabled], a xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ldh [hSCX], a ld a, $40 ldh [hSCY], a |