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/battle/trainer_huds.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/battle/trainer_huds.asm')
| -rwxr-xr-x | engine/battle/trainer_huds.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm index 9efe08414..b236fc56b 100755 --- a/engine/battle/trainer_huds.asm +++ b/engine/battle/trainer_huds.asm @@ -232,7 +232,7 @@ LoadTrainerHudOAM: ; 2c143 LoadBallIconGFX: ; 2c165 ld de, .gfx - ld hl, VTiles0 tile $31 + ld hl, vTiles0 tile $31 lb bc, BANK(LoadBallIconGFX), 4 call Get2bpp_2 ret |