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/pokemon/evos_moves.asm | |
| parent | 6adbaefde14f5e9039aa42a6c96ce476a4107925 (diff) | |
| parent | ae0e2fd1948dc040e42fcbeeb2cae3033af5ce9f (diff) | |
Merge pull request #304 from SatoMew/master
Rename *TilesetType to *TileAnimations
Diffstat (limited to 'engine/pokemon/evos_moves.asm')
| -rw-r--r-- | engine/pokemon/evos_moves.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm index ed44f9a6..21b1c9f4 100644 --- a/engine/pokemon/evos_moves.asm +++ b/engine/pokemon/evos_moves.asm @@ -11,7 +11,7 @@ TryEvolvingMon: ; this is only called after battle ; it is supposed to do level up evolutions, though there is a bug that allows item evolutions to occur EvolutionAfterBattle: - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a ld [wEvolutionOccurred], a @@ -245,7 +245,7 @@ Evolution_PartyMonLoop: ; loop over party mons pop bc pop hl pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a ld a, [wLinkState] cp LINK_STATE_TRADING ret z |