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/battle/e.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/battle/e.asm')
| -rwxr-xr-x | engine/battle/e.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/e.asm b/engine/battle/e.asm index 77fae4df..fbede5dd 100755 --- a/engine/battle/e.asm +++ b/engine/battle/e.asm @@ -1382,7 +1382,7 @@ DrawEnemyPokeballs: ; 0x3a857 LoadPartyPokeballGfx: ; 3a85d (e:685d) ld de, PokeballTileGraphics ; $697e - ld hl, $8310 + ld hl, vSprites + $310 ld bc, (BANK(PokeballTileGraphics) << 8) + $04 jp CopyVideoData |