Merge pull request #370 from yenatch/graphics

png everywhere
PikalaxALT · Jun 24, 2017 · 080704e · 080704e
2 parents 217b7b8 + 7d5b9bb
commit 080704e
Show file tree

Hide file tree

Showing 1,204 changed files with 432 additions and 424 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,6 +37,7 @@ pokecrystal.txt
 *.dimensions
 *.gbcpal
 *.2bpp
+*.1bpp
 *.lz
 *.pal
 *.animated.tilemap

diff --git a/INSTALL.md b/INSTALL.md
@@ -56,18 +56,18 @@ make
 
 To build on Windows, install [**Cygwin**](http://cygwin.com/install.html) with the default settings.
 
-In the installer, select the following packages: `make` `git` `gettext`
+In the installer, select the following packages: `make` `git` `gettext` `gcc-core`
 
 Then get [**rgbds 0.2.5**](https://github.com/rednex/rgbds/releases/). Versions 0.3.0 and later are not compatible.
-Extract the archive and put `rgbasm.exe`, `rgblink.exe`, `rgbfix.exe` and `rgbgfx.exe` in `C:\cygwin64\usr\local\bin`.
+Extract the archive and put all the `exe` and `dll` files individually in `C:\cygwin64\usr\local\bin`.
 
 In the **Cygwin terminal**:
 
 ```bash
 
 git clone https://github.com/pret/pokecrystal
 cd pokecrystal
-make tools
+make tools CC=gcc
 ```
 
 To build **pokecrystal.gbc**:

diff --git a/Makefile b/Makefile
@@ -58,22 +58,14 @@ pokecrystal.gbc: $(crystal_obj)
 	rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
 
 
-define LOUD
-echo "$1"; $1
-endef
-
 # For files that the compressor can't match, there will be a .lz file suffixed with the hash of the correct uncompressed file.
 # If the hash of the uncompressed file matches, use this .lz instead.
 # This allows pngs to be used for compressed graphics and still match.
 
 %.lz: hash = $(shell md5sum $(*D)/$(*F) | sed "s/\(.\{8\}\).*/\1/")
 %.lz: %
 	$(eval filename := $@.$(hash))
-	@if [ -f $(filename) ]; then \
-		$(call LOUD, cp $(filename) $@); \
-	else \
-		$(call LOUD, tools/lzcomp $< $@); \
-	fi
+	$(if $(wildcard $(filename)),cp $(filename) $@,tools/lzcomp $< $@)
 
 # Terrible hacks to match animations. Delete these rules if you don't care about matching.
 
@@ -118,20 +110,82 @@ gfx/pics/%/front.animated.tilemap: gfx/pics/%/front.2bpp gfx/pics/%/front.dimens
 
 # Misc file-specific graphics rules
 
-gfx/shrink%.2bpp: gfx/shrink%.png
-	rgbgfx -h -o $@ $<
+gfx/shrink1.2bpp: rgbgfx += -h
+gfx/shrink2.2bpp: rgbgfx += -h
 
-gfx/trainers/%.2bpp: gfx/trainers/%.png
-	rgbgfx -h -o $@ $<
+gfx/trainers/%.2bpp: rgbgfx += -h
+gfx/trainers/%.pal: gfx/trainers/%.gbcpal
+	tools/palette -p $< > $@
+
+gfx/mail/0b9b46.1bpp: tools/gfx += --remove-whitespace
+gfx/mail/0b9d46.1bpp: tools/gfx += --remove-whitespace
+gfx/mail/0b9d86.1bpp: tools/gfx += --remove-whitespace
+gfx/mail/0b9dc6.1bpp: tools/gfx += --remove-whitespace
+gfx/mail/0b9cfe.1bpp: tools/gfx += --remove-whitespace
+
+gfx/pokedex/%.2bpp: tools/gfx += --trim-whitespace
+
+gfx/title/crystal.2bpp: tools/gfx += --interleave --width=48
+gfx/title/old_fg.2bpp: tools/gfx += --interleave --width=64
+gfx/title/logo.2bpp: rgbgfx += -x 4
+
+gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace
+
+gfx/slots_2.2bpp: tools/gfx += --interleave --width=16
+gfx/slots_3.2bpp: tools/gfx += --interleave --width=24 --remove-duplicates --keep-whitespace --remove-xflip
+gfx/slots_3a.2bpp: tools/gfx += --interleave --width=16
+gfx/slots_3b.2bpp: tools/gfx += --interleave --width=24 --remove-duplicates --keep-whitespace --remove-xflip
+
+gfx/fx/angels.2bpp: tools/gfx += --trim-whitespace
+gfx/fx/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace
+gfx/fx/bubble.2bpp: tools/gfx += --trim-whitespace
+gfx/fx/charge.2bpp: tools/gfx += --trim-whitespace
+gfx/fx/egg.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/explosion.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/hit.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/horn.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/lightning.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/misc.2bpp: tools/gfx += --remove-duplicates --remove-xflip
+gfx/fx/noise.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/objects.2bpp: tools/gfx += --remove-whitespace --remove-xflip
+gfx/fx/pokeball.2bpp: tools/gfx += --remove-xflip --keep-whitespace
+gfx/fx/reflect.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/rocks.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/skyattack.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/status.2bpp: tools/gfx += --remove-whitespace
+
+gfx/misc/chris.2bpp: rgbgfx += -h
+gfx/misc/chris_card.2bpp: rgbgfx += -h
+gfx/misc/kris.2bpp: rgbgfx += -h
+gfx/misc/kris_card.2bpp: rgbgfx += -h
+gfx/misc/kris_back.2bpp: rgbgfx += -h
+gfx/misc/dude.2bpp: rgbgfx += -h
+gfx/misc/unknown_egg.2bpp: rgbgfx += -h
+gfx/misc/player.2bpp: rgbgfx += -h
+gfx/misc/pokegear.2bpp: rgbgfx += -x2
+gfx/misc/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace
+
+gfx/unknown/0e0ea8.2bpp: tools/gfx += --remove-whitespace
+gfx/unknown/0f8f34.1bpp: tools/gfx += --trim-whitespace
+gfx/unknown/16c173.2bpp: tools/gfx += --remove-duplicates --remove-xflip
+gfx/unknown/170d16.2bpp: tools/gfx += --trim-whitespace
+gfx/unknown/1715a4.2bpp: tools/gfx += --trim-whitespace
+gfx/unknown/1715a4_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip
+gfx/unknown/171db1.2bpp: tools/gfx += --trim-whitespace
+gfx/unknown/172f1f.2bpp: tools/gfx += --trim-whitespace
 
 
 %.bin: ;
 %.blk: ;
 
 %.2bpp: %.png
-	rgbgfx -o $@ $<
+	rgbgfx $(rgbgfx) -o $@ $<
+	$(if $(tools/gfx),tools/gfx $(tools/gfx) -o $@ $@)
+
 %.1bpp: %.png
-	rgbgfx -d1 -o $@ $<
+	rgbgfx $(rgbgfx) -d1 -o $@ $<
+	$(if $(tools/gfx),tools/gfx $(tools/gfx) -d1 -o $@ $@)
+
 %.tilemap: %.png
 	rgbgfx -t $@ $<
 %.gbcpal: %.png

diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm
@@ -367,7 +367,8 @@ GameFreakLogoPalettes: ; e47ac
 ; e47cc
 
 GameFreakLogo: ; e47cc
-INCBIN "gfx/splash/logo.1bpp"
+INCBIN "gfx/splash/logo1.1bpp"
+INCBIN "gfx/splash/logo2.1bpp"
 ; e48ac
 
 CrystalIntro: ; e48ac

diff --git a/engine/pokegear.asm b/engine/pokegear.asm
@@ -2987,7 +2987,7 @@ INCBIN "gfx/misc/kanto.bin"
 PokedexNestIconGFX: ; 922d1
 INCBIN "gfx/pokegear/dexmap_nest_icon.2bpp"
 FlyMapLabelBorderGFX: ; 922e1
-INCBIN "gfx/pokegear/flymap_label_border.2bpp"
+INCBIN "gfx/pokegear/flymap_label_border.1bpp"
 
 ; XXX
 	xor a

diff --git a/engine/timeset.asm b/engine/timeset.asm
@@ -397,11 +397,11 @@ OakText_ResponseToSetTime: ; 0x908b8
 ; 0x908fb
 
 GFX_908fb: ; 908fb
-INCBIN "gfx/unknown/0908fb.2bpp"
+INCBIN "gfx/unknown/0908fb.1bpp"
 GFX_90903: ; 90903
-INCBIN "gfx/unknown/090903.2bpp"
+INCBIN "gfx/unknown/090903.1bpp"
 GFX_9090b: ; 9090b
-INCBIN "gfx/unknown/09090b.2bpp"
+INCBIN "gfx/unknown/09090b.1bpp"
 ; 90913
 
 Special_SetDayOfWeek: ; 90913

diff --git a/engine/title.asm b/engine/title.asm
@@ -387,15 +387,15 @@ AnimateTitleCrystal: ; 10ef32
 ; 10ef46
 
 TitleSuicuneGFX: ; 10ef46
-INCBIN "gfx/title/suicune.w128.2bpp.lz"
+INCBIN "gfx/title/suicune.2bpp.lz"
 ; 10f326
 
 TitleLogoGFX: ; 10f326
-INCBIN "gfx/title/logo.w160.t4.2bpp.lz"
+INCBIN "gfx/title/logo.2bpp.lz"
 ; 10fcee
 
 TitleCrystalGFX: ; 10fcee
-INCBIN "gfx/title/crystal.w48.interleave.2bpp.lz"
+INCBIN "gfx/title/crystal.2bpp.lz"
 ; 10fede
 
 TitleScreenPalettes:

diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm
@@ -608,8 +608,8 @@ TrainerCard_JohtoBadgesOAM: ; 254c9
 
 CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp"
 
-LeaderGFX:  INCBIN "gfx/misc/leaders.w24.2bpp"
-LeaderGFX2: INCBIN "gfx/misc/leaders.w24.2bpp"
+LeaderGFX:  INCBIN "gfx/misc/leaders.2bpp"
+LeaderGFX2: INCBIN "gfx/misc/leaders.2bpp"
 BadgeGFX:   INCBIN "gfx/misc/badges.2bpp"
 BadgeGFX2:  INCBIN "gfx/misc/badges.2bpp"
 

diff --git a/gfx/battle/balls.2bpp b/gfx/battle/balls.2bpp
diff --git a/gfx/battle/balls.png b/gfx/battle/balls.png
diff --git a/gfx/battle/enemy_hp_bar_border.1bpp b/gfx/battle/enemy_hp_bar_border.1bpp
diff --git a/gfx/battle/enemy_hp_bar_border.png b/gfx/battle/enemy_hp_bar_border.png
diff --git a/gfx/battle/expbar.2bpp b/gfx/battle/expbar.2bpp
diff --git a/gfx/battle/expbar.png b/gfx/battle/expbar.png
diff --git a/gfx/battle/expbarend.2bpp b/gfx/battle/expbarend.2bpp
diff --git a/gfx/battle/expbarend.png b/gfx/battle/expbarend.png
diff --git a/gfx/battle/expbarend_sgb.2bpp b/gfx/battle/expbarend_sgb.2bpp
diff --git a/gfx/battle/expbarend_sgb.png b/gfx/battle/expbarend_sgb.png
diff --git a/gfx/battle/hp_exp_bar_border.1bpp b/gfx/battle/hp_exp_bar_border.1bpp
diff --git a/gfx/battle/hp_exp_bar_border.png b/gfx/battle/hp_exp_bar_border.png
diff --git a/gfx/battle/minimize.2bpp b/gfx/battle/minimize.2bpp
diff --git a/gfx/battle/minimize.png b/gfx/battle/minimize.png
diff --git a/gfx/debug/color_test.2bpp b/gfx/debug/color_test.2bpp
diff --git a/gfx/debug/color_test.png b/gfx/debug/color_test.png
diff --git a/gfx/emotes/bolt.2bpp b/gfx/emotes/bolt.2bpp
diff --git a/gfx/emotes/bolt.png b/gfx/emotes/bolt.png
diff --git a/gfx/emotes/fish.2bpp b/gfx/emotes/fish.2bpp
diff --git a/gfx/emotes/fish.png b/gfx/emotes/fish.png
diff --git a/gfx/emotes/happy.2bpp b/gfx/emotes/happy.2bpp
diff --git a/gfx/emotes/happy.png b/gfx/emotes/happy.png
diff --git a/gfx/emotes/heart.2bpp b/gfx/emotes/heart.2bpp
diff --git a/gfx/emotes/heart.png b/gfx/emotes/heart.png
diff --git a/gfx/emotes/question.2bpp b/gfx/emotes/question.2bpp
diff --git a/gfx/emotes/question.png b/gfx/emotes/question.png
diff --git a/gfx/emotes/sad.2bpp b/gfx/emotes/sad.2bpp
diff --git a/gfx/emotes/sad.png b/gfx/emotes/sad.png
diff --git a/gfx/emotes/shock.2bpp b/gfx/emotes/shock.2bpp
diff --git a/gfx/emotes/shock.png b/gfx/emotes/shock.png
diff --git a/gfx/emotes/sleep.2bpp b/gfx/emotes/sleep.2bpp
diff --git a/gfx/emotes/sleep.png b/gfx/emotes/sleep.png
diff --git a/gfx/evo/bubble.2bpp b/gfx/evo/bubble.2bpp
diff --git a/gfx/evo/bubble.png b/gfx/evo/bubble.png
diff --git a/gfx/evo/bubble_large.2bpp b/gfx/evo/bubble_large.2bpp
diff --git a/gfx/evo/bubble_large.png b/gfx/evo/bubble_large.png
diff --git a/gfx/font.asm b/gfx/font.asm
@@ -59,11 +59,11 @@ INCBIN "gfx/mobile/overworld_phone_icon.2bpp"
 ; f8f34
 
 GFX_f8f34: ; unused bold letters + unown chars
-INCBIN "gfx/unknown/0f8f34.w64.1bpp"
+INCBIN "gfx/unknown/0f8f34.1bpp"
 ; f9204
 
 TextBoxSpaceGFX: ; f9204
-INCBIN "gfx/frames/space.2bpp"
+INCBIN "gfx/frames/space.1bpp"
 ; f9214
 
 MobilePhoneTilesGFX: ; f9214

diff --git a/gfx/font/english.1bpp b/gfx/font/english.1bpp
diff --git a/gfx/font/english.png b/gfx/font/english.png
diff --git a/gfx/font/french_german.1bpp b/gfx/font/french_german.1bpp
diff --git a/gfx/font/french_german.png b/gfx/font/french_german.png
diff --git a/gfx/font/spanish_italian.1bpp b/gfx/font/spanish_italian.1bpp
diff --git a/gfx/font/spanish_italian.png b/gfx/font/spanish_italian.png
diff --git a/gfx/frames/1.1bpp b/gfx/frames/1.1bpp
diff --git a/gfx/frames/1.png b/gfx/frames/1.png
diff --git a/gfx/frames/2.1bpp b/gfx/frames/2.1bpp
diff --git a/gfx/frames/2.png b/gfx/frames/2.png
diff --git a/gfx/frames/3.1bpp b/gfx/frames/3.1bpp
diff --git a/gfx/frames/3.png b/gfx/frames/3.png
diff --git a/gfx/frames/4.1bpp b/gfx/frames/4.1bpp
diff --git a/gfx/frames/4.png b/gfx/frames/4.png
diff --git a/gfx/frames/5.1bpp b/gfx/frames/5.1bpp
diff --git a/gfx/frames/5.png b/gfx/frames/5.png
diff --git a/gfx/frames/6.1bpp b/gfx/frames/6.1bpp
diff --git a/gfx/frames/6.png b/gfx/frames/6.png
diff --git a/gfx/frames/7.1bpp b/gfx/frames/7.1bpp
diff --git a/gfx/frames/7.png b/gfx/frames/7.png
diff --git a/gfx/frames/8.1bpp b/gfx/frames/8.1bpp
diff --git a/gfx/frames/8.png b/gfx/frames/8.png
diff --git a/gfx/frames/9.1bpp b/gfx/frames/9.1bpp
diff --git a/gfx/frames/9.png b/gfx/frames/9.png
diff --git a/gfx/frames/map_entry_sign.2bpp b/gfx/frames/map_entry_sign.2bpp
diff --git a/gfx/frames/map_entry_sign.png b/gfx/frames/map_entry_sign.png
diff --git a/gfx/frames/space.2bpp b/gfx/frames/space.2bpp
diff --git a/gfx/frames/space.png b/gfx/frames/space.png
diff --git a/gfx/fx/aeroblast.2bpp.lz → gfx/fx/aeroblast.2bpp.lz.2f07c4ea b/gfx/fx/aeroblast.2bpp.lz → gfx/fx/aeroblast.2bpp.lz.2f07c4ea
diff --git a/gfx/fx/aeroblast.png b/gfx/fx/aeroblast.png
diff --git a/gfx/fx/angels.2bpp.lz → gfx/fx/angels.2bpp.lz.b026d81e b/gfx/fx/angels.2bpp.lz → gfx/fx/angels.2bpp.lz.b026d81e
diff --git a/gfx/fx/angels.png b/gfx/fx/angels.png
diff --git a/gfx/fx/beam.2bpp.lz → gfx/fx/beam.2bpp.lz.80b6d613 b/gfx/fx/beam.2bpp.lz → gfx/fx/beam.2bpp.lz.80b6d613
diff --git a/gfx/fx/beam.png b/gfx/fx/beam.png
diff --git a/gfx/fx/bubble.2bpp.lz → gfx/fx/bubble.2bpp.lz.03b8ac99 b/gfx/fx/bubble.2bpp.lz → gfx/fx/bubble.2bpp.lz.03b8ac99
diff --git a/gfx/fx/bubble.png b/gfx/fx/bubble.png
diff --git a/gfx/fx/charge.2bpp.lz → gfx/fx/charge.2bpp.lz.95d3ea98 b/gfx/fx/charge.2bpp.lz → gfx/fx/charge.2bpp.lz.95d3ea98
diff --git a/gfx/fx/charge.png b/gfx/fx/charge.png
diff --git a/gfx/fx/cut.2bpp.lz → gfx/fx/cut.2bpp.lz.03d343ed b/gfx/fx/cut.2bpp.lz → gfx/fx/cut.2bpp.lz.03d343ed
diff --git a/gfx/fx/cut.png b/gfx/fx/cut.png
diff --git a/gfx/fx/egg.2bpp.lz → gfx/fx/egg.2bpp.lz.41dd1a53 b/gfx/fx/egg.2bpp.lz → gfx/fx/egg.2bpp.lz.41dd1a53
diff --git a/gfx/fx/egg.png b/gfx/fx/egg.png
diff --git a/gfx/fx/explosion.2bpp.lz → gfx/fx/explosion.2bpp.lz.55fc334f b/gfx/fx/explosion.2bpp.lz → gfx/fx/explosion.2bpp.lz.55fc334f
diff --git a/gfx/fx/explosion.png b/gfx/fx/explosion.png
diff --git a/gfx/fx/fire.2bpp.lz → gfx/fx/fire.2bpp.lz.d7701cda b/gfx/fx/fire.2bpp.lz → gfx/fx/fire.2bpp.lz.d7701cda
diff --git a/gfx/fx/fire.png b/gfx/fx/fire.png
diff --git a/gfx/fx/flower.2bpp.lz → gfx/fx/flower.2bpp.lz.1bc2e9d2 b/gfx/fx/flower.2bpp.lz → gfx/fx/flower.2bpp.lz.1bc2e9d2
diff --git a/gfx/fx/flower.png b/gfx/fx/flower.png
diff --git a/gfx/fx/globe.2bpp.lz → gfx/fx/globe.2bpp.lz.710dbb8e b/gfx/fx/globe.2bpp.lz → gfx/fx/globe.2bpp.lz.710dbb8e
diff --git a/gfx/fx/globe.png b/gfx/fx/globe.png
diff --git a/gfx/fx/haze.2bpp.lz → gfx/fx/haze.2bpp.lz.91424607 b/gfx/fx/haze.2bpp.lz → gfx/fx/haze.2bpp.lz.91424607
diff --git a/gfx/fx/haze.png b/gfx/fx/haze.png
diff --git a/gfx/fx/hit.2bpp.lz → gfx/fx/hit.2bpp.lz.2b3c83f2 b/gfx/fx/hit.2bpp.lz → gfx/fx/hit.2bpp.lz.2b3c83f2
diff --git a/gfx/fx/hit.png b/gfx/fx/hit.png
diff --git a/gfx/fx/horn.2bpp.lz → gfx/fx/horn.2bpp.lz.48908aae b/gfx/fx/horn.2bpp.lz → gfx/fx/horn.2bpp.lz.48908aae
diff --git a/gfx/fx/horn.png b/gfx/fx/horn.png
diff --git a/gfx/fx/ice.2bpp.lz → gfx/fx/ice.2bpp.lz.664d900f b/gfx/fx/ice.2bpp.lz → gfx/fx/ice.2bpp.lz.664d900f
diff --git a/gfx/fx/ice.png b/gfx/fx/ice.png
diff --git a/gfx/fx/lightning.2bpp.lz → gfx/fx/lightning.2bpp.lz.a88fc131 b/gfx/fx/lightning.2bpp.lz → gfx/fx/lightning.2bpp.lz.a88fc131
diff --git a/gfx/fx/lightning.png b/gfx/fx/lightning.png
diff --git a/gfx/fx/misc.2bpp.lz → gfx/fx/misc.2bpp.lz.4b20c3d7 b/gfx/fx/misc.2bpp.lz → gfx/fx/misc.2bpp.lz.4b20c3d7
diff --git a/gfx/fx/misc.png b/gfx/fx/misc.png
diff --git a/gfx/fx/noise.2bpp.lz → gfx/fx/noise.2bpp.lz.acb4a76e b/gfx/fx/noise.2bpp.lz → gfx/fx/noise.2bpp.lz.acb4a76e
diff --git a/gfx/fx/noise.png b/gfx/fx/noise.png
diff --git a/gfx/fx/objects.2bpp.lz → gfx/fx/objects.2bpp.lz.83f812de b/gfx/fx/objects.2bpp.lz → gfx/fx/objects.2bpp.lz.83f812de
diff --git a/gfx/fx/objects.png b/gfx/fx/objects.png
diff --git a/gfx/fx/plant.2bpp.lz → gfx/fx/plant.2bpp.lz.4a00c417 b/gfx/fx/plant.2bpp.lz → gfx/fx/plant.2bpp.lz.4a00c417
diff --git a/gfx/fx/plant.png b/gfx/fx/plant.png
diff --git a/gfx/fx/poison.2bpp.lz → gfx/fx/poison.2bpp.lz.fc7dc9c1 b/gfx/fx/poison.2bpp.lz → gfx/fx/poison.2bpp.lz.fc7dc9c1
diff --git a/gfx/fx/poison.png b/gfx/fx/poison.png
diff --git a/gfx/fx/pokeball.2bpp.lz → gfx/fx/pokeball.2bpp.lz.c58f7e01 b/gfx/fx/pokeball.2bpp.lz → gfx/fx/pokeball.2bpp.lz.c58f7e01
diff --git a/gfx/fx/pokeball.png b/gfx/fx/pokeball.png
diff --git a/gfx/fx/powder.2bpp.lz → gfx/fx/powder.2bpp.lz.bfd566bb b/gfx/fx/powder.2bpp.lz → gfx/fx/powder.2bpp.lz.bfd566bb
diff --git a/gfx/fx/powder.png b/gfx/fx/powder.png
diff --git a/gfx/fx/psychic.2bpp.lz → gfx/fx/psychic.2bpp.lz.d80f285c b/gfx/fx/psychic.2bpp.lz → gfx/fx/psychic.2bpp.lz.d80f285c
diff --git a/gfx/fx/psychic.png b/gfx/fx/psychic.png
diff --git a/gfx/fx/reflect.2bpp.lz → gfx/fx/reflect.2bpp.lz.9a9c822d b/gfx/fx/reflect.2bpp.lz → gfx/fx/reflect.2bpp.lz.9a9c822d
diff --git a/gfx/fx/reflect.png b/gfx/fx/reflect.png
diff --git a/gfx/fx/rocks.2bpp.lz → gfx/fx/rocks.2bpp.lz.73d0153e b/gfx/fx/rocks.2bpp.lz → gfx/fx/rocks.2bpp.lz.73d0153e
diff --git a/gfx/fx/rocks.png b/gfx/fx/rocks.png
diff --git a/gfx/fx/rope.2bpp.lz → gfx/fx/rope.2bpp.lz.209d63dd b/gfx/fx/rope.2bpp.lz → gfx/fx/rope.2bpp.lz.209d63dd
diff --git a/gfx/fx/rope.png b/gfx/fx/rope.png
diff --git a/gfx/fx/sand.2bpp.lz → gfx/fx/sand.2bpp.lz.c87c0eaa b/gfx/fx/sand.2bpp.lz → gfx/fx/sand.2bpp.lz.c87c0eaa
diff --git a/gfx/fx/sand.png b/gfx/fx/sand.png
diff --git a/gfx/fx/shapes.2bpp.lz → gfx/fx/shapes.2bpp.lz.262d77f0 b/gfx/fx/shapes.2bpp.lz → gfx/fx/shapes.2bpp.lz.262d77f0
diff --git a/gfx/fx/shapes.png b/gfx/fx/shapes.png
diff --git a/gfx/fx/shine.2bpp.lz → gfx/fx/shine.2bpp.lz.5fb79056 b/gfx/fx/shine.2bpp.lz → gfx/fx/shine.2bpp.lz.5fb79056
diff --git a/gfx/fx/shine.png b/gfx/fx/shine.png
diff --git a/gfx/fx/skyattack.2bpp.lz → gfx/fx/skyattack.2bpp.lz.31738ab8 b/gfx/fx/skyattack.2bpp.lz → gfx/fx/skyattack.2bpp.lz.31738ab8
diff --git a/gfx/fx/skyattack.png b/gfx/fx/skyattack.png
diff --git a/gfx/fx/smoke.2bpp.lz → gfx/fx/smoke.2bpp.lz.aa05905e b/gfx/fx/smoke.2bpp.lz → gfx/fx/smoke.2bpp.lz.aa05905e
diff --git a/gfx/fx/smoke.png b/gfx/fx/smoke.png
diff --git a/gfx/fx/speed.2bpp.lz → gfx/fx/speed.2bpp.lz.1732b364 b/gfx/fx/speed.2bpp.lz → gfx/fx/speed.2bpp.lz.1732b364
diff --git a/gfx/fx/speed.png b/gfx/fx/speed.png
diff --git a/gfx/fx/status.2bpp.lz → gfx/fx/status.2bpp.lz.0c0aa13e b/gfx/fx/status.2bpp.lz → gfx/fx/status.2bpp.lz.0c0aa13e
diff --git a/gfx/fx/status.png b/gfx/fx/status.png
diff --git a/gfx/fx/water.2bpp.lz → gfx/fx/water.2bpp.lz.7b52ed12 b/gfx/fx/water.2bpp.lz → gfx/fx/water.2bpp.lz.7b52ed12
diff --git a/gfx/fx/water.png b/gfx/fx/water.png
diff --git a/gfx/fx/wave.2bpp.lz → gfx/fx/wave.2bpp.lz.bee99402 b/gfx/fx/wave.2bpp.lz → gfx/fx/wave.2bpp.lz.bee99402
diff --git a/gfx/fx/wave.png b/gfx/fx/wave.png
diff --git a/gfx/fx/web.2bpp.lz → gfx/fx/web.2bpp.lz.80e3d480 b/gfx/fx/web.2bpp.lz → gfx/fx/web.2bpp.lz.80e3d480
diff --git a/gfx/fx/web.png b/gfx/fx/web.png
diff --git a/gfx/fx/whip.2bpp.lz → gfx/fx/whip.2bpp.lz.d80d8d6e b/gfx/fx/whip.2bpp.lz → gfx/fx/whip.2bpp.lz.d80d8d6e
diff --git a/gfx/fx/whip.png b/gfx/fx/whip.png
diff --git a/gfx/fx/wind.2bpp.lz → gfx/fx/wind.2bpp.lz.5a785180 b/gfx/fx/wind.2bpp.lz → gfx/fx/wind.2bpp.lz.5a785180
diff --git a/gfx/fx/wind.png b/gfx/fx/wind.png
diff --git a/gfx/icon/bat.2bpp b/gfx/icon/bat.2bpp
diff --git a/gfx/icon/bat.png b/gfx/icon/bat.png
diff --git a/gfx/icon/bigmon.2bpp b/gfx/icon/bigmon.2bpp
diff --git a/gfx/icon/bigmon.png b/gfx/icon/bigmon.png
diff --git a/gfx/icon/bird.2bpp b/gfx/icon/bird.2bpp
diff --git a/gfx/icon/bird.png b/gfx/icon/bird.png
diff --git a/gfx/icon/blob.2bpp b/gfx/icon/blob.2bpp
diff --git a/gfx/icon/blob.png b/gfx/icon/blob.png
diff --git a/gfx/icon/bug.2bpp b/gfx/icon/bug.2bpp
diff --git a/gfx/icon/bug.png b/gfx/icon/bug.png
diff --git a/gfx/icon/bulbasaur.2bpp b/gfx/icon/bulbasaur.2bpp
diff --git a/gfx/icon/bulbasaur.png b/gfx/icon/bulbasaur.png
diff --git a/gfx/icon/caterpillar.2bpp b/gfx/icon/caterpillar.2bpp
diff --git a/gfx/icon/caterpillar.png b/gfx/icon/caterpillar.png
diff --git a/gfx/icon/charmander.2bpp b/gfx/icon/charmander.2bpp
diff --git a/gfx/icon/charmander.png b/gfx/icon/charmander.png
diff --git a/gfx/icon/clefairy.2bpp b/gfx/icon/clefairy.2bpp
diff --git a/gfx/icon/clefairy.png b/gfx/icon/clefairy.png
diff --git a/gfx/icon/diglett.2bpp b/gfx/icon/diglett.2bpp
diff --git a/gfx/icon/diglett.png b/gfx/icon/diglett.png
diff --git a/gfx/icon/egg.2bpp b/gfx/icon/egg.2bpp
diff --git a/gfx/icon/egg.png b/gfx/icon/egg.png
diff --git a/gfx/icon/equine.2bpp b/gfx/icon/equine.2bpp
diff --git a/gfx/icon/equine.png b/gfx/icon/equine.png
diff --git a/gfx/icon/fighter.2bpp b/gfx/icon/fighter.2bpp
diff --git a/gfx/icon/fighter.png b/gfx/icon/fighter.png
diff --git a/gfx/icon/fish.2bpp b/gfx/icon/fish.2bpp
diff --git a/gfx/icon/fish.png b/gfx/icon/fish.png
diff --git a/gfx/icon/fox.2bpp b/gfx/icon/fox.2bpp
diff --git a/gfx/icon/fox.png b/gfx/icon/fox.png
diff --git a/gfx/icon/geodude.2bpp b/gfx/icon/geodude.2bpp
diff --git a/gfx/icon/geodude.png b/gfx/icon/geodude.png
diff --git a/gfx/icon/ghost.2bpp b/gfx/icon/ghost.2bpp
diff --git a/gfx/icon/ghost.png b/gfx/icon/ghost.png
diff --git a/gfx/icon/gyarados.2bpp b/gfx/icon/gyarados.2bpp
diff --git a/gfx/icon/gyarados.png b/gfx/icon/gyarados.png
diff --git a/gfx/icon/ho_oh.2bpp b/gfx/icon/ho_oh.2bpp
diff --git a/gfx/icon/ho_oh.png b/gfx/icon/ho_oh.png
diff --git a/gfx/icon/humanshape.2bpp b/gfx/icon/humanshape.2bpp
diff --git a/gfx/icon/humanshape.png b/gfx/icon/humanshape.png
diff --git a/gfx/icon/item.2bpp b/gfx/icon/item.2bpp
diff --git a/gfx/icon/item.png b/gfx/icon/item.png
diff --git a/gfx/icon/jellyfish.2bpp b/gfx/icon/jellyfish.2bpp
diff --git a/gfx/icon/jellyfish.png b/gfx/icon/jellyfish.png
diff --git a/gfx/icon/jigglypuff.2bpp b/gfx/icon/jigglypuff.2bpp
diff --git a/gfx/icon/jigglypuff.png b/gfx/icon/jigglypuff.png
diff --git a/gfx/icon/lapras.2bpp b/gfx/icon/lapras.2bpp
diff --git a/gfx/icon/lapras.png b/gfx/icon/lapras.png
diff --git a/gfx/icon/lugia.2bpp b/gfx/icon/lugia.2bpp
diff --git a/gfx/icon/lugia.png b/gfx/icon/lugia.png
diff --git a/gfx/icon/mail.2bpp b/gfx/icon/mail.2bpp
diff --git a/gfx/icon/mail.png b/gfx/icon/mail.png
diff --git a/gfx/icon/mail2.2bpp b/gfx/icon/mail2.2bpp
diff --git a/gfx/icon/mail2.png b/gfx/icon/mail2.png
diff --git a/gfx/icon/monster.2bpp b/gfx/icon/monster.2bpp
diff --git a/gfx/icon/monster.png b/gfx/icon/monster.png
diff --git a/gfx/icon/moth.2bpp b/gfx/icon/moth.2bpp
diff --git a/gfx/icon/moth.png b/gfx/icon/moth.png
diff --git a/gfx/icon/oddish.2bpp b/gfx/icon/oddish.2bpp
diff --git a/gfx/icon/oddish.png b/gfx/icon/oddish.png
diff --git a/gfx/icon/pikachu.2bpp b/gfx/icon/pikachu.2bpp
diff --git a/gfx/icon/pikachu.png b/gfx/icon/pikachu.png
diff --git a/gfx/icon/poliwag.2bpp b/gfx/icon/poliwag.2bpp
diff --git a/gfx/icon/poliwag.png b/gfx/icon/poliwag.png
diff --git a/gfx/icon/serpent.2bpp b/gfx/icon/serpent.2bpp
diff --git a/gfx/icon/serpent.png b/gfx/icon/serpent.png
diff --git a/gfx/icon/shell.2bpp b/gfx/icon/shell.2bpp
diff --git a/gfx/icon/shell.png b/gfx/icon/shell.png
diff --git a/gfx/icon/slowpoke.2bpp b/gfx/icon/slowpoke.2bpp
diff --git a/gfx/icon/slowpoke.png b/gfx/icon/slowpoke.png
diff --git a/gfx/icon/snorlax.2bpp b/gfx/icon/snorlax.2bpp
diff --git a/gfx/icon/snorlax.png b/gfx/icon/snorlax.png
diff --git a/gfx/icon/squirtle.2bpp b/gfx/icon/squirtle.2bpp
diff --git a/gfx/icon/squirtle.png b/gfx/icon/squirtle.png
diff --git a/gfx/icon/staryu.2bpp b/gfx/icon/staryu.2bpp
diff --git a/gfx/icon/staryu.png b/gfx/icon/staryu.png
diff --git a/gfx/icon/sudowoodo.2bpp b/gfx/icon/sudowoodo.2bpp
diff --git a/gfx/icon/sudowoodo.png b/gfx/icon/sudowoodo.png
diff --git a/gfx/icon/unown.2bpp b/gfx/icon/unown.2bpp
diff --git a/gfx/icon/unown.png b/gfx/icon/unown.png
diff --git a/gfx/icon/voltorb.2bpp b/gfx/icon/voltorb.2bpp
diff --git a/gfx/icon/voltorb.png b/gfx/icon/voltorb.png
diff --git a/gfx/intro/001.tilemap b/gfx/intro/001.tilemap
diff --git a/gfx/intro/001.tilemap.lz → gfx/intro/001.tilemap.lz.c2341875 b/gfx/intro/001.tilemap.lz → gfx/intro/001.tilemap.lz.c2341875
diff --git a/gfx/intro/002.tilemap b/gfx/intro/002.tilemap
diff --git a/gfx/intro/002.tilemap.lz → gfx/intro/002.tilemap.lz.54d5b74b b/gfx/intro/002.tilemap.lz → gfx/intro/002.tilemap.lz.54d5b74b
diff --git a/gfx/intro/003.tilemap b/gfx/intro/003.tilemap
diff --git a/gfx/intro/003.tilemap.lz → gfx/intro/003.tilemap.lz.9f90366a b/gfx/intro/003.tilemap.lz → gfx/intro/003.tilemap.lz.9f90366a
diff --git a/gfx/intro/004.tilemap b/gfx/intro/004.tilemap
diff --git a/gfx/intro/004.tilemap.lz → gfx/intro/004.tilemap.lz.4c7562ee b/gfx/intro/004.tilemap.lz → gfx/intro/004.tilemap.lz.4c7562ee
diff --git a/gfx/intro/005.tilemap b/gfx/intro/005.tilemap
diff --git a/gfx/intro/005.tilemap.lz → gfx/intro/005.tilemap.lz.bed1ff6d b/gfx/intro/005.tilemap.lz → gfx/intro/005.tilemap.lz.bed1ff6d
diff --git a/gfx/intro/006.tilemap b/gfx/intro/006.tilemap
diff --git a/gfx/intro/006.tilemap.lz → gfx/intro/006.tilemap.lz.c8756972 b/gfx/intro/006.tilemap.lz → gfx/intro/006.tilemap.lz.c8756972
diff --git a/gfx/intro/007.tilemap b/gfx/intro/007.tilemap
diff --git a/gfx/intro/007.tilemap.lz → gfx/intro/007.tilemap.lz.a9cbcbca b/gfx/intro/007.tilemap.lz → gfx/intro/007.tilemap.lz.a9cbcbca
diff --git a/gfx/intro/008.tilemap b/gfx/intro/008.tilemap
diff --git a/gfx/intro/008.tilemap.lz → gfx/intro/008.tilemap.lz.f12ed6d9 b/gfx/intro/008.tilemap.lz → gfx/intro/008.tilemap.lz.f12ed6d9
diff --git a/gfx/intro/009.tilemap b/gfx/intro/009.tilemap
diff --git a/gfx/intro/009.tilemap.lz → gfx/intro/009.tilemap.lz.911a1ace b/gfx/intro/009.tilemap.lz → gfx/intro/009.tilemap.lz.911a1ace
diff --git a/gfx/intro/010.tilemap b/gfx/intro/010.tilemap
diff --git a/gfx/intro/010.tilemap.lz → gfx/intro/010.tilemap.lz.2717d106 b/gfx/intro/010.tilemap.lz → gfx/intro/010.tilemap.lz.2717d106
diff --git a/gfx/intro/011.tilemap b/gfx/intro/011.tilemap
diff --git a/gfx/intro/011.tilemap.lz → gfx/intro/011.tilemap.lz.bb066632 b/gfx/intro/011.tilemap.lz → gfx/intro/011.tilemap.lz.bb066632
diff --git a/gfx/intro/012.tilemap b/gfx/intro/012.tilemap
diff --git a/gfx/intro/012.tilemap.lz → gfx/intro/012.tilemap.lz.bc182264 b/gfx/intro/012.tilemap.lz → gfx/intro/012.tilemap.lz.bc182264
diff --git a/gfx/intro/013.tilemap b/gfx/intro/013.tilemap
diff --git a/gfx/intro/013.tilemap.lz → gfx/intro/013.tilemap.lz.18e3115f b/gfx/intro/013.tilemap.lz → gfx/intro/013.tilemap.lz.18e3115f
diff --git a/gfx/intro/014.tilemap b/gfx/intro/014.tilemap
diff --git a/gfx/intro/014.tilemap.lz → gfx/intro/014.tilemap.lz.7b59259d b/gfx/intro/014.tilemap.lz → gfx/intro/014.tilemap.lz.7b59259d
diff --git a/gfx/intro/015.tilemap b/gfx/intro/015.tilemap
diff --git a/gfx/intro/015.tilemap.lz → gfx/intro/015.tilemap.lz.1bfc5a89 b/gfx/intro/015.tilemap.lz → gfx/intro/015.tilemap.lz.1bfc5a89
diff --git a/gfx/intro/017.tilemap b/gfx/intro/017.tilemap
diff --git a/gfx/intro/017.tilemap.lz → gfx/intro/017.tilemap.lz.e4772015 b/gfx/intro/017.tilemap.lz → gfx/intro/017.tilemap.lz.e4772015
diff --git a/gfx/intro/background.2bpp.lz → gfx/intro/background.2bpp.lz.b58b3984 b/gfx/intro/background.2bpp.lz → gfx/intro/background.2bpp.lz.b58b3984
diff --git a/gfx/intro/background.png b/gfx/intro/background.png
diff --git a/gfx/intro/crystal_unowns.2bpp.lz → gfx/intro/crystal_unowns.2bpp.lz.e7f8ad51 b/gfx/intro/crystal_unowns.2bpp.lz → gfx/intro/crystal_unowns.2bpp.lz.e7f8ad51
diff --git a/gfx/intro/crystal_unowns.png b/gfx/intro/crystal_unowns.png
diff --git a/gfx/intro/gender_screen.2bpp b/gfx/intro/gender_screen.2bpp
diff --git a/gfx/intro/gender_screen.png b/gfx/intro/gender_screen.png
diff --git a/gfx/intro/grass1.2bpp b/gfx/intro/grass1.2bpp
diff --git a/gfx/intro/grass1.png b/gfx/intro/grass1.png
diff --git a/gfx/intro/grass2.2bpp b/gfx/intro/grass2.2bpp
diff --git a/gfx/intro/grass2.png b/gfx/intro/grass2.png
diff --git a/gfx/intro/grass3.2bpp b/gfx/intro/grass3.2bpp
diff --git a/gfx/intro/grass3.png b/gfx/intro/grass3.png
diff --git a/gfx/intro/grass4.2bpp b/gfx/intro/grass4.2bpp
diff --git a/gfx/intro/grass4.png b/gfx/intro/grass4.png
diff --git a/gfx/intro/logo.2bpp.lz → gfx/intro/logo.2bpp.lz.e03ee257 b/gfx/intro/logo.2bpp.lz → gfx/intro/logo.2bpp.lz.e03ee257
diff --git a/gfx/intro/logo.png b/gfx/intro/logo.png
diff --git a/gfx/intro/pichu_wooper.2bpp.lz → gfx/intro/pichu_wooper.2bpp.lz.4bccf7f4 b/gfx/intro/pichu_wooper.2bpp.lz → gfx/intro/pichu_wooper.2bpp.lz.4bccf7f4
diff --git a/gfx/intro/pichu_wooper.png b/gfx/intro/pichu_wooper.png
diff --git a/gfx/intro/pulse.2bpp.lz → gfx/intro/pulse.2bpp.lz.9fb06bb6 b/gfx/intro/pulse.2bpp.lz → gfx/intro/pulse.2bpp.lz.9fb06bb6
diff --git a/gfx/intro/pulse.png b/gfx/intro/pulse.png
diff --git a/gfx/intro/suicune_back.2bpp.lz → gfx/intro/suicune_back.2bpp.lz.c6f529b0 b/gfx/intro/suicune_back.2bpp.lz → gfx/intro/suicune_back.2bpp.lz.c6f529b0
diff --git a/gfx/intro/suicune_back.png b/gfx/intro/suicune_back.png
diff --git a/gfx/intro/suicune_close.2bpp.lz → gfx/intro/suicune_close.2bpp.lz.7e362923 b/gfx/intro/suicune_close.2bpp.lz → gfx/intro/suicune_close.2bpp.lz.7e362923
diff --git a/gfx/intro/suicune_close.png b/gfx/intro/suicune_close.png
diff --git a/gfx/intro/suicune_jump.2bpp.lz → gfx/intro/suicune_jump.2bpp.lz.1b09fb64 b/gfx/intro/suicune_jump.2bpp.lz → gfx/intro/suicune_jump.2bpp.lz.1b09fb64
diff --git a/gfx/intro/suicune_jump.png b/gfx/intro/suicune_jump.png
diff --git a/gfx/intro/suicune_run.2bpp.lz → gfx/intro/suicune_run.2bpp.lz.ef999ad2 b/gfx/intro/suicune_run.2bpp.lz → gfx/intro/suicune_run.2bpp.lz.ef999ad2
diff --git a/gfx/intro/suicune_run.png b/gfx/intro/suicune_run.png
diff --git a/gfx/intro/unown_back.2bpp.lz → gfx/intro/unown_back.2bpp.lz.740c4d28 b/gfx/intro/unown_back.2bpp.lz → gfx/intro/unown_back.2bpp.lz.740c4d28
diff --git a/gfx/intro/unown_back.png b/gfx/intro/unown_back.png
diff --git a/gfx/intro/unowns.2bpp.lz → gfx/intro/unowns.2bpp.lz.3a1f185e b/gfx/intro/unowns.2bpp.lz → gfx/intro/unowns.2bpp.lz.3a1f185e
diff --git a/gfx/intro/unowns.png b/gfx/intro/unowns.png
diff --git a/gfx/mail.asm b/gfx/mail.asm
@@ -226,7 +226,7 @@ LoadEonMailGFX: ; b93d2
 	ld de, EonMailBorder1GFX
 	ld c, 1 * 8
 	call LoadMailGFX_Color2
-	ld de, EonMailBorder3GFX
+	ld de, SurfMailBorderGFX + 6 * 8
 	ld c, 1 * 8
 	call LoadMailGFX_Color2
 	ld de, MailEeveeGFX
@@ -329,13 +329,13 @@ LoadMorphMailGFX: ; b94d6
 	ld hl, VTiles2 tile $31
 	ld bc, 5 * 8
 	call MailGFX_GenerateMonochromeTilesColor2
-	ld de, MorphMailBorderGFX
+	ld de, MorphMailBorderCornerGFX + 3 * 8
 	ld c, 1 * 8
 	call LoadMailGFX_Color2
-	ld de, MorphMailBorderCorner1GFX
+	ld de, MorphMailBorderCornerGFX
 	ld c, 1 * 8
 	call LoadMailGFX_Color2
-	ld de, MorphMailBorderCorner2GFX
+	ld de, MorphMailBorderGFX
 	ld c, 1 * 8
 	call LoadMailGFX_Color2
 	ld de, EonMailBorder1GFX
@@ -418,16 +418,16 @@ LoadBlueSkyMailGFX: ; b9582
 	ld de, MailCloudGFX
 	ld c, 6 * 8
 	call LoadMailGFX_Color1
-	ld de, FlowerMailSenderUnderlineGFX
+	ld de, FlowerMailBorderGFX + 6 * 8
 	ld c, 1 * 8
 	call LoadMailGFX_Color1
 	ld de, MailCloudGFX
 	ld c, 1 * 8
 	call LoadMailGFX_Color1
-	ld de, MailCloud2GFX
+	ld de, MailCloudGFX + 2 * 8
 	ld c, 2 * 8
 	call LoadMailGFX_Color1
-	ld de, MailCloud3GFX
+	ld de, MailCloudGFX + 5 * 8
 	ld c, 1 * 8
 	call LoadMailGFX_Color1
 
@@ -497,10 +497,10 @@ LoadFlowerMailGFX: ; b963e
 	ld de, MailOddishGFX
 	ld c, 4 * 8
 	call LoadMailGFX_Color3
-	ld de, FlowerMailSenderUnderlineGFX
+	ld de, FlowerMailBorderGFX + 6 * 8
 	ld c, 1 * 8
 	call LoadMailGFX_Color2
-	ld de, FlowerMailLargeFlowerGFX
+	ld de, FlowerMailFlowerGFX
 	ld c, 4 * 8
 	call LoadMailGFX_Color1
 	ld c, 4 * 8
@@ -580,7 +580,7 @@ LoadMusicMailGFX: ; b9710
 	ld de, MusicMailBorderGFX
 	ld c, 4 * 8
 	call LoadMailGFX_Color2
-	ld de, MorphMailBorderCorner2GFX
+	ld de, MorphMailBorderGFX
 	ld c, 2 * 8
 	call LoadMailGFX_Color2
 	ld de, MailNatuGFX
@@ -628,10 +628,10 @@ LoadMirageMailGFX: ; b9776
 	ld de, MailMewGFX
 	ld c, 18 * 8
 	call LoadMailGFX_Color2
-	ld de, MirageMailTopDividerGFX
+	ld de, LiteBlueMailBorderGFX + 1 * 8
 	ld c, 1 * 8
 	call LoadMailGFX_Color1
-	ld de, MirageMailBottomDividerGFX
+	ld de, LiteBlueMailBorderGFX + 6 * 8
 	ld c, 1 * 8
 	call LoadMailGFX_Color1
 
@@ -947,7 +947,7 @@ INCBIN "gfx/mail/0b992e.1bpp"
 PortraitMailSmallPokeballGFX: ; b9936
 INCBIN "gfx/mail/0b9936.1bpp"
 
-MorphMailBorderCorner2GFX: ; b993e
+MorphMailBorderGFX: ; b993e
 INCBIN "gfx/mail/0b993e.1bpp"
 
 MusicMailSmallNoteGFX: ; b9946
@@ -1016,20 +1016,14 @@ INCBIN "gfx/mail/0b9c3e.1bpp"
 LovelyMailLargeHeartGFX: ; b9c5e
 INCBIN "gfx/mail/0b9c5e.1bpp"
 
-MorphMailBorderCorner1GFX: ; b9c7e
+MorphMailBorderCornerGFX: ; b9c7e
 INCBIN "gfx/mail/0b9c7e.1bpp"
 
-MorphMailBorderGFX: ; b9c96
-INCBIN "gfx/mail/0b9c96.1bpp"
-
 MailLargeCircleGFX: ; b9c9e
 INCBIN "gfx/mail/0b9c9e.1bpp"
 
-FlowerMailLargeFlowerGFX: ; b9cbe
+FlowerMailFlowerGFX: ; b9cbe
 INCBIN "gfx/mail/0b9cbe.1bpp"
-
-FlowerMailSmallFlowerGFX: ; b9cde
-; indirectly referenced
 INCBIN "gfx/mail/0b9cde.1bpp"
 
 MusicMailLargeNoteGFX: ; b9cfe
@@ -1038,33 +1032,15 @@ INCBIN "gfx/mail/0b9cfe.1bpp"
 MailCloudGFX: ; b9d16
 INCBIN "gfx/mail/0b9d16.1bpp"
 
-MailCloud2GFX: ; b9d26
-INCBIN "gfx/mail/0b9d26.1bpp"
-
-MailCloud3GFX: ; b9d3e
-INCBIN "gfx/mail/0b9d3e.1bpp"
-
 SurfMailBorderGFX: ; b9d46
 INCBIN "gfx/mail/0b9d46.1bpp"
 
-EonMailBorder3GFX: ; b9d76
-INCBIN "gfx/mail/0b9d76.1bpp"
-
 FlowerMailBorderGFX: ; b9d86
 INCBIN "gfx/mail/0b9d86.1bpp"
 
-FlowerMailSenderUnderlineGFX: ; b9db6
-INCBIN "gfx/mail/0b9db6.1bpp"
-
 LiteBlueMailBorderGFX: ; b9dc6
 INCBIN "gfx/mail/0b9dc6.1bpp"
 
-MirageMailTopDividerGFX: ; b9dce
-INCBIN "gfx/mail/0b9dce.1bpp"
-
-MirageMailBottomDividerGFX: ; b9df6
-INCBIN "gfx/mail/0b9df6.1bpp"
-
 MusicMailBorderGFX: ; b9e06
 INCBIN "gfx/mail/0b9e06.1bpp"
 

diff --git a/gfx/mail/0b9926.1bpp b/gfx/mail/0b9926.1bpp
diff --git a/gfx/mail/0b9926.png b/gfx/mail/0b9926.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,7 @@ pokecrystal.txt @@
     *.dimensions
     *.gbcpal
     *.2bpp
+    *.1bpp
     *.lz
     *.pal
     *.animated.tilemap
@@ Expand Down @@