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/status_screen.asm | |
| parent | 6adbaefde14f5e9039aa42a6c96ce476a4107925 (diff) | |
| parent | ae0e2fd1948dc040e42fcbeeb2cae3033af5ce9f (diff) | |
Merge pull request #304 from SatoMew/master
Rename *TilesetType to *TileAnimations
Diffstat (limited to 'engine/pokemon/status_screen.asm')
| -rw-r--r-- | engine/pokemon/status_screen.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm index d4a4e59a..33fef9e4 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 "SPECIAL@" 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 @@ -429,7 +429,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 |