diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /engine/stats_screen.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'engine/stats_screen.asm')
| -rwxr-xr-x | engine/stats_screen.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index da02808b1..fa124e1b3 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -865,7 +865,7 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226) call IsAPokemon ret c call StatsScreen_LoadTextBoxSpaceGFX - ld de, VTiles2 tile $00 + ld de, vTiles2 tile $00 predef GetAnimatedFrontpicPredef hlcoord 0, 0 ld d, $0 @@ -954,7 +954,7 @@ StatsScreen_LoadTextBoxSpaceGFX: ; 4e307 (13:6307) ld [rVBK], a ld de, TextBoxSpaceGFX lb bc, BANK(TextBoxSpaceGFX), 1 - ld hl, VTiles2 tile $7f + ld hl, vTiles2 tile $7f call Get2bpp pop af ld [rVBK], a @@ -1071,7 +1071,7 @@ StatsScreen_AnimateEgg: ; 4e497 (13:6497) ld a, $1 ld [wBoxAlignment], a call StatsScreen_LoadTextBoxSpaceGFX - ld de, VTiles2 tile $00 + ld de, vTiles2 tile $00 predef GetAnimatedFrontpicPredef pop de hlcoord 0, 0 |