diff options
| author | JimB16 <f1@jimb.de> | 2015-10-26 03:26:53 +0100 |
|---|---|---|
| committer | JimB16 <f1@jimb.de> | 2015-10-26 03:26:53 +0100 |
| commit | 9a9cb38e39c991e102a1c6da7e8e16b2a1c61e07 (patch) | |
| tree | 46c064628b3d8015da22d6396b3c711e80646745 /gfx | |
| parent | 3b9a3cc3bee8934e45f5e4d3fd9704b3fa619560 (diff) | |
| parent | 0d17d4a75866d053f5e0b48c66deb2508071d98b (diff) | |
merge with newest update
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 |
