diff options
Diffstat (limited to 'engine/pokemon')
| -rw-r--r--[-rwxr-xr-x] | engine/pokemon/evos_moves.asm | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/pokemon/experience.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/pokemon/learn_move.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/pokemon/set_types.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/pokemon/status_ailments.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | engine/pokemon/status_screen.asm | 12 |
6 files changed, 8 insertions, 8 deletions
diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm index ed44f9a6..21b1c9f4 100755..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 diff --git a/engine/pokemon/experience.asm b/engine/pokemon/experience.asm index 427d2a7f..427d2a7f 100755..100644 --- a/engine/pokemon/experience.asm +++ b/engine/pokemon/experience.asm diff --git a/engine/pokemon/learn_move.asm b/engine/pokemon/learn_move.asm index 8e852fd4..8e852fd4 100755..100644 --- a/engine/pokemon/learn_move.asm +++ b/engine/pokemon/learn_move.asm diff --git a/engine/pokemon/set_types.asm b/engine/pokemon/set_types.asm index e9235f13..e9235f13 100755..100644 --- a/engine/pokemon/set_types.asm +++ b/engine/pokemon/set_types.asm diff --git a/engine/pokemon/status_ailments.asm b/engine/pokemon/status_ailments.asm index 1047cea1..1047cea1 100755..100644 --- a/engine/pokemon/status_ailments.asm +++ b/engine/pokemon/status_ailments.asm diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm index 9d53c003..61653a11 100755..100644 --- a/engine/pokemon/status_screen.asm +++ b/engine/pokemon/status_screen.asm @@ -101,10 +101,10 @@ StatusScreen: ld hl, vChars2 tile $72 lb bc, BANK(PTile), 1 call CopyVideoDataDouble ; bold P (for PP) - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a hlcoord 19, 1 lb bc, 6, 10 call DrawLineBox ; Draws the box around name, HP and status @@ -174,7 +174,7 @@ StatusScreen: call PlayCry ; play Pokémon cry call WaitForTextScrollButtonPress ; wait for button pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a ret .GetStringPointer @@ -296,10 +296,10 @@ StatsText: next "ESPECIAL@" StatusScreen2: - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ldh [hAutoBGTransferEnabled], a ld bc, NUM_MOVES + 1 ld hl, wMoves @@ -428,7 +428,7 @@ StatusScreen2: call Delay3 call WaitForTextScrollButtonPress ; wait for button pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a ld hl, wd72c res 1, [hl] ld a, $77 |