aboutsummaryrefslogtreecommitdiffstats
path: root/engine/load_pokedex_tiles.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-07-12 09:02:49 -0400
committeryenatch <yenatch@gmail.com>2014-07-12 09:02:49 -0400
commitfb11ff7e55be56cef9234c8443614f04f2157a1e (patch)
treea6aa8d0745bd07d0b80090491b5e4b6652de4420 /engine/load_pokedex_tiles.asm
parentPull a lot of engine out of main.asm (diff)
parentUpdate INSTALL.md (diff)
downloadpokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.gz
pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.xz
pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.zip
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'engine/load_pokedex_tiles.asm')
-rwxr-xr-xengine/load_pokedex_tiles.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/load_pokedex_tiles.asm b/engine/load_pokedex_tiles.asm
index 7a49adaa..e8205ef8 100755
--- a/engine/load_pokedex_tiles.asm
+++ b/engine/load_pokedex_tiles.asm
@@ -2,10 +2,10 @@
LoadPokedexTilePatterns: ; 17840 (5:7840)
call LoadHpBarAndStatusTilePatterns
ld de,PokedexTileGraphics ; $6488
- ld hl,$9600
+ ld hl,vChars2 + $600
ld bc,(BANK(PokedexTileGraphics) << 8) + $12
call CopyVideoData
ld de,PokeballTileGraphics ; $697e
- ld hl,$9720
+ ld hl,vChars2 + $720
ld bc,(BANK(PokeballTileGraphics) << 8) + $01
jp CopyVideoData ; load pokeball tile for marking caught mons