diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
| commit | 286c160c27e58caad32f776cec684eb8cb2cb22a (patch) | |
| tree | d89563a88a9674837896d6e88b9c9431b708bf97 /engine/load_pokedex_tiles.asm | |
| parent | Fix IsDungeonMap comments (diff) | |
| parent | Remove redundant dimensions in image filenames. (diff) | |
| download | pokeyellow-286c160c27e58caad32f776cec684eb8cb2cb22a.tar.gz pokeyellow-286c160c27e58caad32f776cec684eb8cb2cb22a.tar.xz pokeyellow-286c160c27e58caad32f776cec684eb8cb2cb22a.zip | |
Merge branch 'master' of https://github.com/yenatch/pokered
Conflicts:
engine/battle/1c.asm
Diffstat (limited to 'engine/load_pokedex_tiles.asm')
| -rwxr-xr-x | engine/load_pokedex_tiles.asm | 4 |
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 |