diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-03 02:16:25 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-03 02:16:25 -0500 |
| commit | 0b6857b1a9c3e170e78f65695e437150ab1e500f (patch) | |
| tree | a3be49af3347879d128ced0c708b18ae8ec7953f | |
| parent | bc83768d8115810d581a5195a829d04e07af5c4a (diff) | |
lava in gym_1 > fountain in unused safari zone
| -rw-r--r-- | gfx/tilesets/lava/1.png (renamed from gfx/tilesets/safari/1.png) | bin | 89 -> 89 bytes | |||
| -rw-r--r-- | gfx/tilesets/lava/2.png (renamed from gfx/tilesets/safari/2.png) | bin | 89 -> 89 bytes | |||
| -rw-r--r-- | gfx/tilesets/lava/3.png (renamed from gfx/tilesets/safari/3.png) | bin | 87 -> 87 bytes | |||
| -rw-r--r-- | gfx/tilesets/lava/4.png (renamed from gfx/tilesets/safari/4.png) | bin | 79 -> 79 bytes | |||
| -rw-r--r-- | tilesets/animations.asm | 22 |
5 files changed, 11 insertions, 11 deletions
diff --git a/gfx/tilesets/safari/1.png b/gfx/tilesets/lava/1.png Binary files differindex c5b500ccc..c5b500ccc 100644 --- a/gfx/tilesets/safari/1.png +++ b/gfx/tilesets/lava/1.png diff --git a/gfx/tilesets/safari/2.png b/gfx/tilesets/lava/2.png Binary files differindex 1512e35ad..1512e35ad 100644 --- a/gfx/tilesets/safari/2.png +++ b/gfx/tilesets/lava/2.png diff --git a/gfx/tilesets/safari/3.png b/gfx/tilesets/lava/3.png Binary files differindex 449c2a317..449c2a317 100644 --- a/gfx/tilesets/safari/3.png +++ b/gfx/tilesets/lava/3.png diff --git a/gfx/tilesets/safari/4.png b/gfx/tilesets/lava/4.png Binary files differindex 8e4c8e0e5..8e4c8e0e5 100644 --- a/gfx/tilesets/safari/4.png +++ b/gfx/tilesets/lava/4.png diff --git a/tilesets/animations.asm b/tilesets/animations.asm index d95e26e47..3ab8097e1 100644 --- a/tilesets/animations.asm +++ b/tilesets/animations.asm @@ -139,11 +139,11 @@ TilesetPortAnim: ; 0xfc12f ; 0xfc15f TilesetGym1Anim: ; 0xfc15f - dw NULL, SafariFountainAnim2 + dw NULL, LavaBubbleAnim2 dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation - dw NULL, SafariFountainAnim1 + dw NULL, LavaBubbleAnim1 dw NULL, WaitTileAnimation dw NULL, StandingTileFrame8 dw NULL, DoneTileAnimation @@ -704,7 +704,7 @@ FlowerTileFrames: ; fc58c ; fc5cc -SafariFountainAnim1: ; fc5cc +LavaBubbleAnim1: ; fc5cc ; Splash in the bottom-right corner of the fountain. ld hl, sp+0 ld b, h @@ -718,7 +718,7 @@ SafariFountainAnim1: ; fc5cc swap a ld e, a ld d, 0 - ld hl, SafariFountainFrames + ld hl, LavaBubbleFrames add hl, de ld sp, hl ld hl, vTiles2 tile $5b @@ -726,7 +726,7 @@ SafariFountainAnim1: ; fc5cc ; fc5eb -SafariFountainAnim2: ; fc5eb +LavaBubbleAnim2: ; fc5eb ; Splash in the top-left corner of the fountain. ld hl, sp+0 ld b, h @@ -738,7 +738,7 @@ SafariFountainAnim2: ; fc5eb add a ld e, a ld d, 0 - ld hl, SafariFountainFrames + ld hl, LavaBubbleFrames add hl, de ld sp, hl ld hl, vTiles2 tile $38 @@ -746,11 +746,11 @@ SafariFountainAnim2: ; fc5eb ; fc605 -SafariFountainFrames: ; fc605 - INCBIN "gfx/tilesets/safari/1.2bpp" - INCBIN "gfx/tilesets/safari/2.2bpp" - INCBIN "gfx/tilesets/safari/3.2bpp" - INCBIN "gfx/tilesets/safari/4.2bpp" +LavaBubbleFrames: ; fc605 + INCBIN "gfx/tilesets/lava/1.2bpp" + INCBIN "gfx/tilesets/lava/2.2bpp" + INCBIN "gfx/tilesets/lava/3.2bpp" + INCBIN "gfx/tilesets/lava/4.2bpp" ; fc645 |
