diff options
| author | yenatch <yenatch@gmail.com> | 2015-10-25 20:48:44 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-10-25 20:48:44 -0400 |
| commit | 0d17d4a75866d053f5e0b48c66deb2508071d98b (patch) | |
| tree | 75bb638d39ab6b4d0bcd3167c22d275eb52ffdbd /gfx | |
| parent | 6fcba7a28a0d3d7826603b54b187dc5fca853669 (diff) | |
| parent | 79ceca591b022673cb7fb2cc59e5175716743eb5 (diff) | |
Merge pull request #322 from PikalaxALT/master
Split out and comment phone and animation code.
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/credits/border.png | bin | 139 -> 153 bytes | |||
| -rw-r--r-- | gfx/credits/pichu.png | bin | 348 -> 388 bytes | |||
| -rw-r--r-- | gfx/credits/theend.png | bin | 180 -> 195 bytes | |||
| -rw-r--r-- | gfx/misc/pack.png | bin | 282 -> 373 bytes | |||
| -rw-r--r-- | gfx/overworld/trainer_battle_pokeball_tiles.2bpp (renamed from gfx/unknown/08c2f4.2bpp) | 0 | ||||
| -rw-r--r-- | gfx/pics/animation.asm | 2 |
6 files changed, 1 insertions, 1 deletions
diff --git a/gfx/credits/border.png b/gfx/credits/border.png Binary files differindex d93bddc8a..c396d533d 100644 --- a/gfx/credits/border.png +++ b/gfx/credits/border.png diff --git a/gfx/credits/pichu.png b/gfx/credits/pichu.png Binary files differindex f98642ec8..529973d29 100644 --- a/gfx/credits/pichu.png +++ b/gfx/credits/pichu.png diff --git a/gfx/credits/theend.png b/gfx/credits/theend.png Binary files differindex 165f8ba8e..1f10e16df 100644 --- a/gfx/credits/theend.png +++ b/gfx/credits/theend.png diff --git a/gfx/misc/pack.png b/gfx/misc/pack.png Binary files differindex b85fc0990..738a9dd94 100644 --- a/gfx/misc/pack.png +++ b/gfx/misc/pack.png diff --git a/gfx/unknown/08c2f4.2bpp b/gfx/overworld/trainer_battle_pokeball_tiles.2bpp index 09e51fd67..09e51fd67 100644 --- a/gfx/unknown/08c2f4.2bpp +++ b/gfx/overworld/trainer_battle_pokeball_tiles.2bpp diff --git a/gfx/pics/animation.asm b/gfx/pics/animation.asm index d736ef37e..165cf642d 100644 --- a/gfx/pics/animation.asm +++ b/gfx/pics/animation.asm @@ -3,7 +3,7 @@ Functiond0000: ; d0000 hlcoord 12, 0 - ld a, [IsInBattle] + ld a, [wBattleMode] cp $1 jr z, .asm_d0012 ld e, $0 |
