diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/init.asm | 2 | ||||
| -rw-r--r-- | home/overworld.asm | 2 | ||||
| -rw-r--r-- | home/pokemon.asm | 12 | ||||
| -rw-r--r-- | home/vcopy.asm | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/home/init.asm b/home/init.asm index 331a3657..bb70615d 100644 --- a/home/init.asm +++ b/home/init.asm @@ -65,7 +65,7 @@ rLCDC_DEFAULT EQU %11100011 call WriteDMACodeToHRAM xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ldh [rSTAT], a ldh [hSCX], a ldh [hSCY], a diff --git a/home/overworld.asm b/home/overworld.asm index 26451bf1..246a773b 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -802,7 +802,7 @@ LoadPlayerSpriteGraphics:: dec a jr z, .ridingBike - ldh a, [hTilesetType] + ldh a, [hTileAnimations] and a jr nz, .determineGraphics jr .startWalking diff --git a/home/pokemon.asm b/home/pokemon.asm index 8e304fd3..8dec32d9 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -181,10 +181,10 @@ GetCryData:: ret DisplayPartyMenu:: - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a call GBPalWhiteOutWithDelay3 call ClearSprites call PartyMenuInit @@ -192,10 +192,10 @@ DisplayPartyMenu:: jp HandlePartyMenuInput GoBackToPartyMenu:: - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a call PartyMenuInit call RedrawPartyMenu jp HandlePartyMenuInput @@ -268,7 +268,7 @@ HandlePartyMenuInput:: and a jp nz, .swappingPokemon pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a bit 1, b jr nz, .noPokemonChosen ld a, [wPartyCount] @@ -293,7 +293,7 @@ HandlePartyMenuInput:: xor a ld [wMenuItemToSwap], a pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a .noPokemonChosen call BankswitchBack scf diff --git a/home/vcopy.asm b/home/vcopy.asm index 9b6efb3a..2b68eb09 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -349,7 +349,7 @@ UpdateMovingBgTiles:: ; Animate water and flower ; tiles in the overworld. - ldh a, [hTilesetType] + ldh a, [hTileAnimations] and a ret z ; no animations if indoors (or if a menu set this to 0) @@ -391,7 +391,7 @@ UpdateMovingBgTiles:: dec c jr nz, .left .done - ldh a, [hTilesetType] + ldh a, [hTileAnimations] rrca ret nc ; if in a cave, no flower animations |