summaryrefslogtreecommitdiff
path: root/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'gfx')
-rw-r--r--gfx/gfx.asm12
-rw-r--r--gfx/gfx.mk3
-rw-r--r--gfx/intro/forest.binbin0 -> 96 bytes
-rw-r--r--gfx/intro/forest_tilemap.binbin0 -> 288 bytes
-rw-r--r--gfx/intro/water.binbin0 -> 272 bytes
-rw-r--r--gfx/intro/water_tilemap.bin2
6 files changed, 15 insertions, 2 deletions
diff --git a/gfx/gfx.asm b/gfx/gfx.asm
index 44e1c07..9613e8a 100644
--- a/gfx/gfx.asm
+++ b/gfx/gfx.asm
@@ -546,12 +546,20 @@ INCBIN "gfx/splash/game_freak_logo_oam.2bpp"
SECTION "gfx.asm@Intro Underwater GFX", ROMX
IntroUnderwaterGFX::
INCBIN "gfx/intro/underwater.2bpp"
-
-SECTION "gfx.asm@Intro Water Mon and Forest GFX", ROMX
+Intro_WaterTilemap::
+INCBIN "gfx/intro/water_tilemap.bin"
+Intro_WaterMeta::
+INCBIN "gfx/intro/water.bin"
IntroWaterPokemonGFX::
INCBIN "gfx/intro/water_pokemon.2bpp"
+
+SECTION "gfx.asm@Intro Forest GFX", ROMX
IntroForestGFX::
INCBIN "gfx/intro/forest.2bpp"
+Intro_GrassTilemap::
+INCBIN "gfx/intro/forest_tilemap.bin"
+Intro_GrassMeta::
+INCBIN "gfx/intro/forest.bin"
SECTION "gfx.asm@Intro Mon", ROMX
IntroJigglypuffPikachuGFX::
diff --git a/gfx/gfx.mk b/gfx/gfx.mk
index fe01521..ac19398 100644
--- a/gfx/gfx.mk
+++ b/gfx/gfx.mk
@@ -17,5 +17,8 @@ $(BUILD)/gfx/minigames/poker.2bpp: tools/gfx += --trim-whitespace
$(BUILD)/gfx/intro/jigglypuff_pikachu.2bpp: tools/gfx += --trim-whitespace
+$(BUILD)/gfx/intro/%.bin: gfx/intro/%.bin
+ cp $< $@
+
$(BUILD)/gfx/battle_anims/attack_animations_1.2bpp: tools/gfx += --trim-whitespace
$(BUILD)/gfx/battle_anims/attack_animations_2.2bpp: tools/gfx += --trim-whitespace
diff --git a/gfx/intro/forest.bin b/gfx/intro/forest.bin
new file mode 100644
index 0000000..cf13546
--- /dev/null
+++ b/gfx/intro/forest.bin
Binary files differ
diff --git a/gfx/intro/forest_tilemap.bin b/gfx/intro/forest_tilemap.bin
new file mode 100644
index 0000000..fb1179d
--- /dev/null
+++ b/gfx/intro/forest_tilemap.bin
Binary files differ
diff --git a/gfx/intro/water.bin b/gfx/intro/water.bin
new file mode 100644
index 0000000..7f8675f
--- /dev/null
+++ b/gfx/intro/water.bin
Binary files differ
diff --git a/gfx/intro/water_tilemap.bin b/gfx/intro/water_tilemap.bin
new file mode 100644
index 0000000..b91bfd7
--- /dev/null
+++ b/gfx/intro/water_tilemap.bin
@@ -0,0 +1,2 @@
+ !"#0123 !"#0123()*+89:;()*+89:;''$%&ABC''$%&ABC'',-.''''',-.''''''''''''''''''''''''''''''''''' 
+  ////// \ No newline at end of file