diff options
| author | SatoMew <SatoMew@users.noreply.github.com> | 2020-11-29 20:17:29 +0000 |
|---|---|---|
| committer | SatoMew <SatoMew@users.noreply.github.com> | 2020-11-29 20:17:29 +0000 |
| commit | 242b2e05cf30bc47a53167baf6bd3134d1f47d18 (patch) | |
| tree | 83570d3571ff4eaa71de363f02b3ef16f26b0313 /engine/pokemon/evos_moves.asm | |
| parent | Keep wGrassMons and wWaterMons together with a UNION (diff) | |
| download | pokeyellow-242b2e05cf30bc47a53167baf6bd3134d1f47d18.tar.gz pokeyellow-242b2e05cf30bc47a53167baf6bd3134d1f47d18.tar.xz pokeyellow-242b2e05cf30bc47a53167baf6bd3134d1f47d18.zip | |
Label and document hFFD7 more accurately
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 |