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/pokedex_3.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/pokedex_3.asm')
| -rw-r--r-- | engine/pokedex_3.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/pokedex_3.asm b/engine/pokedex_3.asm index 6ec2ce9fd..482f55799 100644 --- a/engine/pokedex_3.asm +++ b/engine/pokedex_3.asm @@ -1,12 +1,12 @@ LoadSGBPokedexGFX: ; 1ddf1c ld hl, SGBPokedexGFX_LZ - ld de, VTiles2 tile $31 + ld de, vTiles2 tile $31 call Decompress ret LoadSGBPokedexGFX2: ; 1ddf26 (77:5f26) ld hl, SGBPokedexGFX_LZ - ld de, VTiles2 tile $31 + ld de, vTiles2 tile $31 lb bc, BANK(SGBPokedexGFX_LZ), $3a call DecompressRequest2bpp ret |