1474 files changed, 1003 insertions, 804 deletions

diff --git a/.gitignore b/.gitignore
index 9af0a0bd4..a4639d0ca 100644
--- 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
index c68896bb6..cfdd04da2 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -17,7 +17,6 @@ cd ..
 
 git clone https://github.com/pret/pokecrystal
 cd pokecrystal
-make tools
 ```
 
 To build **pokecrystal.gbc**:
@@ -42,7 +41,6 @@ cd ..
 
 git clone https://github.com/pret/pokecrystal
 cd pokecrystal
-make tools
 ```
 
 To build **pokecrystal.gbc**:
@@ -56,10 +54,10 @@ 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**:
 
@@ -67,7 +65,6 @@ In the **Cygwin terminal**:
 
 git clone https://github.com/pret/pokecrystal
 cd pokecrystal
-make tools
 ```
 
 To build **pokecrystal.gbc**:
diff --git a/Makefile b/Makefile
index e0bd1fb97..005d53474 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,8 @@
-MD5 := md5sum -c
+ifeq (,$(shell which sha1sum))
+SHA1 := shasum
+else
+SHA1 := sha1sum
+endif
 
 .SUFFIXES:
 .PHONY: all clean tools compare crystal crystal11
@@ -32,14 +36,22 @@ all: crystal
 crystal: pokecrystal.gbc
 crystal11: pokecrystal11.gbc
 
+# Ensure that the tools are built when making the ROM
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(MAKECMDGOALS),tools)
+Makefile: tools
+endif
+endif
+
 clean:
 	rm -f $(roms) $(crystal_obj) $(crystal11_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)
+	$(MAKE) clean -C tools/
 
 compare: $(roms)
-	@$(MD5) roms.md5
+	@$(SHA1) -c roms.sha1
 
 tools:
-	make -C tools/
+	$(MAKE) -C tools/
 
 %11.o: dep = $(shell tools/scan_includes $(@D)/$*.asm)
 %11.o: %.asm $$(dep)
@@ -60,22 +72,14 @@ pokecrystal.gbc: $(crystal_obj)
 	sort pokecrystal.sym -o pokecrystal.sym
 
 
-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.
+# For files that the compressor can't match, there will be a .lz file suffixed with the md5 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: hash = $(shell tools/md5 $(*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.
 
@@ -120,20 +124,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/trade/game_boy_n64.2bpp: tools/gfx += --trim-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
 
 
 %.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/README.md b/README.md
index 51e1b4302..5ec1bbf73 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,31 @@
-# Pokémon Crystal
+# Pokémon Crystal [![Build Status][travis-badge]][travis]
 
 This is a disassembly of Pokémon Crystal.
 
 It builds the following roms:
 
-* Pokemon - Crystal Version (UE) (V1.0) [C][!].gbc `md5: 9f2922b235a5eeb78d65594e82ef5dde`
-* Pokemon - Crystal Version (UE) (V1.1) [C][!].gbc `md5: 301899b8087289a6436b0a241fbbb474`
-
-To set up the repository, see [**INSTALL.md**](INSTALL.md).
+* Pokemon - Crystal Version (UE) (V1.0) [C][!].gbc `sha1: f4cd194bdee0d04ca4eac29e09b8e4e9d818c133`
+* Pokemon - Crystal Version (UE) (V1.1) [C][!].gbc `sha1: f2f52230b536214ef7c9924f483392993e226cfb`
 
+To set up the repository, see [INSTALL.md](INSTALL.md).
 
 ## See also
-
 * Disassembly of [**Pokémon Red/Blue**][pokered]
-* irc: [**freenode#pret**][irc]
-
-[pokered]: https://github.com/iimarckus/pokered
+* Disassembly of [**Pokémon Yellow**][pokeyellow]
+* Disassembly of [**Pokémon Pinball**][pokepinball]
+* Disassembly of [**Pokémon TCG**][poketcg]
+* Disassembly of [**Pokémon Ruby**][pokeruby]
+* Disassembly of [**Pokémon Emerald**][pokeemerald]
+* Discord: [**pret**][Discord]
+* irc: [freenode#pret][irc]
+
+[pokered]: https://github.com/pret/pokered
+[pokeyellow]: https://github.com/pret/pokeyellow
+[pokepinball]: https://github.com/pret/pokepinball
+[poketcg]: https://github.com/pret/poketcg
+[pokeruby]: https://github.com/pret/pokeruby
+[pokeemerald]: https://github.com/pret/pokeemerald
+[Discord]: https://discord.gg/cJxDDVP
 [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
+[travis]: https://travis-ci.org/pret/pokecrystal
+[travis-badge]: https://travis-ci.org/pret/pokecrystal.svg?branch=master
diff --git a/battle/ai/items.asm b/battle/ai/items.asm
index f8c97578a..325c7b555 100644
--- a/battle/ai/items.asm
+++ b/battle/ai/items.asm
@@ -238,7 +238,7 @@ AI_TryItem: ; 38105
 	res SUBSTATUS_RAGE, [hl]
 
 	xor a
-	ld [LastPlayerCounterMove], a
+	ld [LastEnemyCounterMove], a
 
 	scf
 	ret
diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm
index 3091697e5..733322f82 100644
--- a/battle/ai/scoring.asm
+++ b/battle/ai/scoring.asm
@@ -756,7 +756,7 @@ AI_Smart_AlwaysHit: ; 38947
 AI_Smart_MirrorMove: ; 3895b
 
 ; If the player did not use any move last turn...
-	ld a, [LastEnemyCounterMove]
+	ld a, [LastPlayerCounterMove]
 	and a
 	jr nz, .asm_38968
 
@@ -1353,7 +1353,7 @@ AI_Smart_Rage: ; 38b7f
 
 
 AI_Smart_Mimic: ; 38ba8
-	ld a, [LastEnemyCounterMove]
+	ld a, [LastPlayerCounterMove]
 	and a
 	jr z, .asm_38be9
 
@@ -1361,7 +1361,7 @@ AI_Smart_Mimic: ; 38ba8
 	jr nc, .asm_38bef
 
 	push hl
-	ld a, [LastEnemyCounterMove]
+	ld a, [LastPlayerCounterMove]
 	call AIGetEnemyMove
 
 	ld a, $1
@@ -1380,7 +1380,7 @@ AI_Smart_Mimic: ; 38ba8
 	dec [hl]
 
 .asm_38bd4
-	ld a, [LastEnemyCounterMove]
+	ld a, [LastPlayerCounterMove]
 	push hl
 	ld hl, UsefulMoves
 	ld de, 1
@@ -1438,7 +1438,7 @@ AI_Smart_Counter: ; 38bf1
 	cp $3
 	jr nc, .asm_38c30
 
-	ld a, [LastEnemyCounterMove]
+	ld a, [LastPlayerCounterMove]
 	and a
 	jr z, .asm_38c38
 
@@ -1499,7 +1499,7 @@ AI_Smart_Encore: ; 38c3b
 
 .asm_38c68
 	push hl
-	ld a, [LastEnemyCounterMove]
+	ld a, [LastPlayerCounterMove]
 	ld hl, .EncoreMoves
 	ld de, 1
 	call IsInArray
@@ -1615,7 +1615,7 @@ AI_Smart_DefrostOpponent: ; 38ccb
 
 
 AI_Smart_Spite: ; 38cd5
-	ld a, [LastEnemyCounterMove]
+	ld a, [LastPlayerCounterMove]
 	and a
 	jr nz, .asm_38ce7
 
@@ -1837,7 +1837,7 @@ AI_Smart_Disable: ; 38dd1
 	jr nc, .asm_38df3
 
 	push hl
-	ld a, [LastEnemyCounterMove]
+	ld a, [LastPlayerCounterMove]
 	ld hl, UsefulMoves
 	ld de, 1
 	call IsInArray
@@ -2367,7 +2367,7 @@ AI_Smart_Magnitude:
 AI_Smart_Earthquake: ; 39044
 
 ; Greatly encourage this move if the player is underground and the enemy is faster.
-	ld a, [LastEnemyCounterMove]
+	ld a, [LastPlayerCounterMove]
 	cp DIG
 	ret nz
 
@@ -2741,7 +2741,7 @@ AI_Smart_MirrorCoat: ; 3918b
 	cp $3
 	jr nc, .asm_391ca
 
-	ld a, [LastEnemyCounterMove]
+	ld a, [LastPlayerCounterMove]
 	and a
 	jr z, .asm_391d2
 
@@ -2775,7 +2775,7 @@ AI_Smart_Twister:
 AI_Smart_Gust: ; 391d5
 
 ; Greatly encourage this move if the player is flying and the enemy is faster.
-	ld a, [LastEnemyCounterMove]
+	ld a, [LastPlayerCounterMove]
 	cp FLY
 	ret nz
 
diff --git a/battle/ai/switch.asm b/battle/ai/switch.asm
index cb1fe3660..c2f83fa1f 100755
--- a/battle/ai/switch.asm
+++ b/battle/ai/switch.asm
@@ -229,7 +229,7 @@ CheckAbleToSwitch: ; 34941
 	cp 11
 	ret nc
 
-	ld a, [LastEnemyCounterMove]
+	ld a, [LastPlayerCounterMove]
 	and a
 	jr z, .no_last_counter_move
 
@@ -378,8 +378,8 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
 	ld [CurSpecies], a
 	call GetBaseData
 
-	; the enemy's last move is damaging...
-	ld a, [LastEnemyCounterMove]
+	; the player's last move is damaging...
+	ld a, [LastPlayerCounterMove]
 	dec a
 	ld hl, Moves + MOVE_POWER
 	call GetMoveAttr
@@ -568,7 +568,7 @@ FindEnemyMonsThatResistPlayer: ; 34b20
 	push hl
 	ld [CurSpecies], a
 	call GetBaseData
-	ld a, [LastEnemyCounterMove]
+	ld a, [LastPlayerCounterMove]
 	and a
 	jr z, .skip_move
 
diff --git a/battle/core.asm b/battle/core.asm
index be6e24eca..cb709e08d 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -3366,8 +3366,8 @@ CheckWhetherSwitchmonIsPredetermined: ; 3d533
 ResetEnemyBattleVars: ; 3d557
 ; and draw empty TextBox
 	xor a
-	ld [LastEnemyCounterMove], a
 	ld [LastPlayerCounterMove], a
+	ld [LastEnemyCounterMove], a
 	ld [LastEnemyMove], a
 	ld [CurEnemyMove], a
 	dec a
@@ -3766,8 +3766,8 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
 
 NewEnemyMonStatus: ; 3d834
 	xor a
-	ld [LastEnemyCounterMove], a
 	ld [LastPlayerCounterMove], a
+	ld [LastEnemyCounterMove], a
 	ld [LastEnemyMove], a
 	ld hl, EnemySubStatus1
 rept 4
@@ -4217,8 +4217,8 @@ SendOutPlayerMon: ; 3db5f
 	ld [CurMoveNum], a
 	ld [TypeModifier], a
 	ld [wPlayerMoveStruct + MOVE_ANIM], a
-	ld [LastEnemyCounterMove], a
 	ld [LastPlayerCounterMove], a
+	ld [LastEnemyCounterMove], a
 	ld [LastPlayerMove], a
 	call CheckAmuletCoin
 	call FinishBattleAnim
@@ -4258,8 +4258,8 @@ SendOutPlayerMon: ; 3db5f
 
 NewBattleMonStatus: ; 3dbde
 	xor a
-	ld [LastEnemyCounterMove], a
 	ld [LastPlayerCounterMove], a
+	ld [LastEnemyCounterMove], a
 	ld [LastPlayerMove], a
 	ld hl, PlayerSubStatus1
 rept 4
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
index 54af56a10..221570d76 100644
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -971,7 +971,7 @@ BattleCommand_CheckObedience: ; 343db
 .EndDisobedience:
 	xor a
 	ld [LastPlayerMove], a
-	ld [LastEnemyCounterMove], a
+	ld [LastPlayerCounterMove], a
 
 	; Break Encore too.
 	ld hl, PlayerSubStatus5
@@ -1542,6 +1542,12 @@ BattleCheckTypeMatchup: ; 347c8
 	jr z, CheckTypeMatchup
 	ld hl, BattleMonType1
 CheckTypeMatchup: ; 347d3
+; There is an incorrect assumption about this function made in the AI related code: when
+; the AI calls CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing the
+; offensive type in a will make this function do the right thing. Since a is overwritten,
+; this assumption is incorrect. A simple fix would be to load the move type for the
+; current move into a in BattleCheckTypeMatchup, before falling through, which is
+; consistent with how the rest of the code assumes this code works like.
 	push hl
 	push de
 	push bc
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
index 804f223cb..793650913 100644
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -91,12 +91,12 @@ const_value SET 1
 	const BATTLE_VARS_LAST_MOVE_OPP
 
 ; status
+SLP EQU 7 ; 0-7 turns
 const_value SET 3
 	const PSN
 	const BRN
 	const FRZ
 	const PAR
-	const SLP ; 7 turns
 
 ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP
 
diff --git a/data/base_stats/abra.asm b/data/base_stats/abra.asm
index 1856a2fd6..f3a39edbb 100644
--- a/data/base_stats/abra.asm
+++ b/data/base_stats/abra.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/abra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/base_stats/aerodactyl.asm b/data/base_stats/aerodactyl.asm
index c3c3b4c76..56530206c 100644
--- a/data/base_stats/aerodactyl.asm
+++ b/data/base_stats/aerodactyl.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 35 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/aerodactyl/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/aipom.asm b/data/base_stats/aipom.asm
index 6226a4526..aa9ca45a1 100644
--- a/data/base_stats/aipom.asm
+++ b/data/base_stats/aipom.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/aipom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/alakazam.asm b/data/base_stats/alakazam.asm
index 086a1bb43..79e2e99ee 100644
--- a/data/base_stats/alakazam.asm
+++ b/data/base_stats/alakazam.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/alakazam/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/base_stats/ampharos.asm b/data/base_stats/ampharos.asm
index 3c5626d81..a0a2c48f7 100644
--- a/data/base_stats/ampharos.asm
+++ b/data/base_stats/ampharos.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/ampharos/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/base_stats/arbok.asm b/data/base_stats/arbok.asm
index 3b82c1801..48129fc36 100644
--- a/data/base_stats/arbok.asm
+++ b/data/base_stats/arbok.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/arbok/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, REPTILE ; egg groups
diff --git a/data/base_stats/arcanine.asm b/data/base_stats/arcanine.asm
index ce2554998..81452dd19 100644
--- a/data/base_stats/arcanine.asm
+++ b/data/base_stats/arcanine.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/arcanine/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/ariados.asm b/data/base_stats/ariados.asm
index f0572464b..244c70d86 100644
--- a/data/base_stats/ariados.asm
+++ b/data/base_stats/ariados.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/ariados/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/articuno.asm b/data/base_stats/articuno.asm
index 5e8167ba8..320e210c6 100644
--- a/data/base_stats/articuno.asm
+++ b/data/base_stats/articuno.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 80 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/articuno/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/azumarill.asm b/data/base_stats/azumarill.asm
index c5a47615e..c18e517c4 100644
--- a/data/base_stats/azumarill.asm
+++ b/data/base_stats/azumarill.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/azumarill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn AMPHIBIAN, FAIRY ; egg groups
diff --git a/data/base_stats/bayleef.asm b/data/base_stats/bayleef.asm
index e94ecaa34..bb439ccd3 100644
--- a/data/base_stats/bayleef.asm
+++ b/data/base_stats/bayleef.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/bayleef/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, PLANT ; egg groups
diff --git a/data/base_stats/beedrill.asm b/data/base_stats/beedrill.asm
index 254ee749e..465b076de 100644
--- a/data/base_stats/beedrill.asm
+++ b/data/base_stats/beedrill.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/beedrill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/bellossom.asm b/data/base_stats/bellossom.asm
index 0dde920c8..6489fe50c 100644
--- a/data/base_stats/bellossom.asm
+++ b/data/base_stats/bellossom.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/bellossom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/base_stats/bellsprout.asm b/data/base_stats/bellsprout.asm
index d8f6c6c13..d8e3160e6 100644
--- a/data/base_stats/bellsprout.asm
+++ b/data/base_stats/bellsprout.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/bellsprout/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/base_stats/blastoise.asm b/data/base_stats/blastoise.asm
index 122e4c65b..1a2df93b3 100644
--- a/data/base_stats/blastoise.asm
+++ b/data/base_stats/blastoise.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/blastoise/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/base_stats/blissey.asm b/data/base_stats/blissey.asm
index 1a437a248..d9c870da4 100644
--- a/data/base_stats/blissey.asm
+++ b/data/base_stats/blissey.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/blissey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FAIRY, FAIRY ; egg groups
diff --git a/data/base_stats/bulbasaur.asm b/data/base_stats/bulbasaur.asm
index 70a264a60..eb4bec3f6 100644
--- a/data/base_stats/bulbasaur.asm
+++ b/data/base_stats/bulbasaur.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/bulbasaur/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, PLANT ; egg groups
diff --git a/data/base_stats/butterfree.asm b/data/base_stats/butterfree.asm
index 80f288967..ca1609d1e 100644
--- a/data/base_stats/butterfree.asm
+++ b/data/base_stats/butterfree.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/butterfree/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/caterpie.asm b/data/base_stats/caterpie.asm
index ebaee52f1..47e0b5210 100644
--- a/data/base_stats/caterpie.asm
+++ b/data/base_stats/caterpie.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/caterpie/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/celebi.asm b/data/base_stats/celebi.asm
index 29f61843f..2a09691bd 100644
--- a/data/base_stats/celebi.asm
+++ b/data/base_stats/celebi.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 120 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5 , 5 ; frontpic dimensions
+	INCBIN "gfx/pics/celebi/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/chansey.asm b/data/base_stats/chansey.asm
index 2d0e84f47..2ba6091f9 100644
--- a/data/base_stats/chansey.asm
+++ b/data/base_stats/chansey.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/chansey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FAIRY, FAIRY ; egg groups
diff --git a/data/base_stats/charizard.asm b/data/base_stats/charizard.asm
index 522d213e4..d8b1ee769 100644
--- a/data/base_stats/charizard.asm
+++ b/data/base_stats/charizard.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/charizard/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, REPTILE ; egg groups
diff --git a/data/base_stats/charmander.asm b/data/base_stats/charmander.asm
index 34c14cb81..ba6822529 100644
--- a/data/base_stats/charmander.asm
+++ b/data/base_stats/charmander.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/charmander/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, REPTILE ; egg groups
diff --git a/data/base_stats/charmeleon.asm b/data/base_stats/charmeleon.asm
index 5c7794cdd..0be9be06f 100644
--- a/data/base_stats/charmeleon.asm
+++ b/data/base_stats/charmeleon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/charmeleon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, REPTILE ; egg groups
diff --git a/data/base_stats/chikorita.asm b/data/base_stats/chikorita.asm
index c572e8667..74f77ae8f 100644
--- a/data/base_stats/chikorita.asm
+++ b/data/base_stats/chikorita.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/chikorita/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, PLANT ; egg groups
diff --git a/data/base_stats/chinchou.asm b/data/base_stats/chinchou.asm
index 93ca3cae6..13fb43872 100644
--- a/data/base_stats/chinchou.asm
+++ b/data/base_stats/chinchou.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/chinchou/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FISH, FISH ; egg groups
diff --git a/data/base_stats/clefable.asm b/data/base_stats/clefable.asm
index 95262df0a..ffa07d9dc 100644
--- a/data/base_stats/clefable.asm
+++ b/data/base_stats/clefable.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/clefable/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FAIRY, FAIRY ; egg groups
diff --git a/data/base_stats/clefairy.asm b/data/base_stats/clefairy.asm
index 8e1677236..ee1f38d04 100644
--- a/data/base_stats/clefairy.asm
+++ b/data/base_stats/clefairy.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/clefairy/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FAIRY, FAIRY ; egg groups
diff --git a/data/base_stats/cleffa.asm b/data/base_stats/cleffa.asm
index 322a3695c..3afb4c6c6 100644
--- a/data/base_stats/cleffa.asm
+++ b/data/base_stats/cleffa.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/cleffa/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/cloyster.asm b/data/base_stats/cloyster.asm
index f8da41cc7..f7de0467d 100644
--- a/data/base_stats/cloyster.asm
+++ b/data/base_stats/cloyster.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/cloyster/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/base_stats/corsola.asm b/data/base_stats/corsola.asm
index b6eaa47ca..5a3adde57 100644
--- a/data/base_stats/corsola.asm
+++ b/data/base_stats/corsola.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/corsola/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn AMPHIBIAN, INVERTEBRATE ; egg groups
diff --git a/data/base_stats/crobat.asm b/data/base_stats/crobat.asm
index c2e9b310d..923ca38a9 100644
--- a/data/base_stats/crobat.asm
+++ b/data/base_stats/crobat.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/crobat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/croconaw.asm b/data/base_stats/croconaw.asm
index ce22048e1..66fb9f10c 100644
--- a/data/base_stats/croconaw.asm
+++ b/data/base_stats/croconaw.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/croconaw/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/base_stats/cubone.asm b/data/base_stats/cubone.asm
index 9a87a8a65..7c8d32d82 100644
--- a/data/base_stats/cubone.asm
+++ b/data/base_stats/cubone.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/cubone/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/base_stats/cyndaquil.asm b/data/base_stats/cyndaquil.asm
index d6a9f865b..b1f294907 100644
--- a/data/base_stats/cyndaquil.asm
+++ b/data/base_stats/cyndaquil.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/cyndaquil/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/delibird.asm b/data/base_stats/delibird.asm
index 9f4db9f97..139bfb66b 100644
--- a/data/base_stats/delibird.asm
+++ b/data/base_stats/delibird.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/delibird/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn AMPHIBIAN, FIELD ; egg groups
diff --git a/data/base_stats/dewgong.asm b/data/base_stats/dewgong.asm
index 19135700d..e73de86b3 100644
--- a/data/base_stats/dewgong.asm
+++ b/data/base_stats/dewgong.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/dewgong/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FIELD ; egg groups
diff --git a/data/base_stats/diglett.asm b/data/base_stats/diglett.asm
index 3bcc864e0..9e9005114 100644
--- a/data/base_stats/diglett.asm
+++ b/data/base_stats/diglett.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/diglett/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/ditto.asm b/data/base_stats/ditto.asm
index fda952a08..6cbbe60ca 100644
--- a/data/base_stats/ditto.asm
+++ b/data/base_stats/ditto.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/ditto/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn LADIES_MAN, LADIES_MAN ; egg groups
diff --git a/data/base_stats/dodrio.asm b/data/base_stats/dodrio.asm
index 5530f780e..dd96b10aa 100644
--- a/data/base_stats/dodrio.asm
+++ b/data/base_stats/dodrio.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/dodrio/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/doduo.asm b/data/base_stats/doduo.asm
index 554bb5dba..02c1e792a 100644
--- a/data/base_stats/doduo.asm
+++ b/data/base_stats/doduo.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/doduo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/donphan.asm b/data/base_stats/donphan.asm
index 28517d41d..6e66787e1 100644
--- a/data/base_stats/donphan.asm
+++ b/data/base_stats/donphan.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/donphan/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/dragonair.asm b/data/base_stats/dragonair.asm
index a437457e0..621b50d51 100644
--- a/data/base_stats/dragonair.asm
+++ b/data/base_stats/dragonair.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/dragonair/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn AMPHIBIAN, REPTILE ; egg groups
diff --git a/data/base_stats/dragonite.asm b/data/base_stats/dragonite.asm
index e99d05e67..83bbbb3eb 100644
--- a/data/base_stats/dragonite.asm
+++ b/data/base_stats/dragonite.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/dragonite/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn AMPHIBIAN, REPTILE ; egg groups
diff --git a/data/base_stats/dratini.asm b/data/base_stats/dratini.asm
index 9b5516fa6..f9cf27faf 100644
--- a/data/base_stats/dratini.asm
+++ b/data/base_stats/dratini.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/dratini/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn AMPHIBIAN, REPTILE ; egg groups
diff --git a/data/base_stats/drowzee.asm b/data/base_stats/drowzee.asm
index 31b6da7e8..04d7780bb 100644
--- a/data/base_stats/drowzee.asm
+++ b/data/base_stats/drowzee.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/drowzee/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/base_stats/dugtrio.asm b/data/base_stats/dugtrio.asm
index 4a6073655..402cc6c03 100644
--- a/data/base_stats/dugtrio.asm
+++ b/data/base_stats/dugtrio.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/dugtrio/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/dunsparce.asm b/data/base_stats/dunsparce.asm
index 6ba6fc527..e3ed6a9df 100644
--- a/data/base_stats/dunsparce.asm
+++ b/data/base_stats/dunsparce.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/dunsparce/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/eevee.asm b/data/base_stats/eevee.asm
index b13c544b0..44584c15d 100644
--- a/data/base_stats/eevee.asm
+++ b/data/base_stats/eevee.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 35 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/eevee/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/ekans.asm b/data/base_stats/ekans.asm
index 81ee35558..0876d169a 100644
--- a/data/base_stats/ekans.asm
+++ b/data/base_stats/ekans.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/ekans/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, REPTILE ; egg groups
diff --git a/data/base_stats/electabuzz.asm b/data/base_stats/electabuzz.asm
index e584527e8..7b690eae2 100644
--- a/data/base_stats/electabuzz.asm
+++ b/data/base_stats/electabuzz.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/electabuzz/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/base_stats/electrode.asm b/data/base_stats/electrode.asm
index 771780a7f..3c2895384 100644
--- a/data/base_stats/electrode.asm
+++ b/data/base_stats/electrode.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/electrode/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/base_stats/elekid.asm b/data/base_stats/elekid.asm
index c0d30fcdf..9fae865c6 100644
--- a/data/base_stats/elekid.asm
+++ b/data/base_stats/elekid.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/elekid/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/entei.asm b/data/base_stats/entei.asm
index 6db3cc3ec..c05954720 100644
--- a/data/base_stats/entei.asm
+++ b/data/base_stats/entei.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 80 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/entei/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/espeon.asm b/data/base_stats/espeon.asm
index 33f50bfb6..deebb0902 100644
--- a/data/base_stats/espeon.asm
+++ b/data/base_stats/espeon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 35 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/espeon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/exeggcute.asm b/data/base_stats/exeggcute.asm
index b657f71c7..95daf462b 100644
--- a/data/base_stats/exeggcute.asm
+++ b/data/base_stats/exeggcute.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/exeggcute/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/base_stats/exeggutor.asm b/data/base_stats/exeggutor.asm
index 34d7db139..d7561e6eb 100644
--- a/data/base_stats/exeggutor.asm
+++ b/data/base_stats/exeggutor.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/exeggutor/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/base_stats/farfetch_d.asm b/data/base_stats/farfetch_d.asm
index 55c12ffcc..2ab5fb9e8 100644
--- a/data/base_stats/farfetch_d.asm
+++ b/data/base_stats/farfetch_d.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/farfetch_d/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, FIELD ; egg groups
diff --git a/data/base_stats/fearow.asm b/data/base_stats/fearow.asm
index 2d6af3436..6cb670332 100644
--- a/data/base_stats/fearow.asm
+++ b/data/base_stats/fearow.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/fearow/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/feraligatr.asm b/data/base_stats/feraligatr.asm
index 78263e349..758fdb1da 100644
--- a/data/base_stats/feraligatr.asm
+++ b/data/base_stats/feraligatr.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/feraligatr/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/base_stats/flaaffy.asm b/data/base_stats/flaaffy.asm
index 9ac1d8e00..936ee3b1d 100644
--- a/data/base_stats/flaaffy.asm
+++ b/data/base_stats/flaaffy.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/flaaffy/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/base_stats/flareon.asm b/data/base_stats/flareon.asm
index 3c0312d19..345b9a385 100644
--- a/data/base_stats/flareon.asm
+++ b/data/base_stats/flareon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 35 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/flareon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/forretress.asm b/data/base_stats/forretress.asm
index 9a8e56e84..ab36e1827 100644
--- a/data/base_stats/forretress.asm
+++ b/data/base_stats/forretress.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/forretress/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/furret.asm b/data/base_stats/furret.asm
index 2344f62d6..75180036c 100644
--- a/data/base_stats/furret.asm
+++ b/data/base_stats/furret.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/furret/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/gastly.asm b/data/base_stats/gastly.asm
index 69cf1bad5..dcec2fdca 100644
--- a/data/base_stats/gastly.asm
+++ b/data/base_stats/gastly.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/gastly/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/base_stats/gengar.asm b/data/base_stats/gengar.asm
index 6659adfc3..5fe8894ef 100644
--- a/data/base_stats/gengar.asm
+++ b/data/base_stats/gengar.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/gengar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/base_stats/geodude.asm b/data/base_stats/geodude.asm
index 030e56477..2b472bafc 100644
--- a/data/base_stats/geodude.asm
+++ b/data/base_stats/geodude.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/geodude/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/base_stats/girafarig.asm b/data/base_stats/girafarig.asm
index 0b114eff5..3180513f7 100644
--- a/data/base_stats/girafarig.asm
+++ b/data/base_stats/girafarig.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/girafarig/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/gligar.asm b/data/base_stats/gligar.asm
index 527f022a1..3197e0203 100644
--- a/data/base_stats/gligar.asm
+++ b/data/base_stats/gligar.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/gligar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/gloom.asm b/data/base_stats/gloom.asm
index f0238e12f..d67f73d54 100644
--- a/data/base_stats/gloom.asm
+++ b/data/base_stats/gloom.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/gloom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/base_stats/golbat.asm b/data/base_stats/golbat.asm
index 7f0552c23..be69af4cf 100644
--- a/data/base_stats/golbat.asm
+++ b/data/base_stats/golbat.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/golbat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/goldeen.asm b/data/base_stats/goldeen.asm
index 81dfed80e..3769ce1b6 100644
--- a/data/base_stats/goldeen.asm
+++ b/data/base_stats/goldeen.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/goldeen/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FISH, FISH ; egg groups
diff --git a/data/base_stats/golduck.asm b/data/base_stats/golduck.asm
index bced4b43d..b32d538b5 100644
--- a/data/base_stats/golduck.asm
+++ b/data/base_stats/golduck.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/golduck/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FIELD ; egg groups
diff --git a/data/base_stats/golem.asm b/data/base_stats/golem.asm
index d27186c20..b8fb85054 100644
--- a/data/base_stats/golem.asm
+++ b/data/base_stats/golem.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/golem/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/base_stats/granbull.asm b/data/base_stats/granbull.asm
index 17570b165..c2dcda517 100644
--- a/data/base_stats/granbull.asm
+++ b/data/base_stats/granbull.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/granbull/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FIELD, FAIRY ; egg groups
diff --git a/data/base_stats/graveler.asm b/data/base_stats/graveler.asm
index 834a1c97b..17e4e8905 100644
--- a/data/base_stats/graveler.asm
+++ b/data/base_stats/graveler.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/graveler/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/base_stats/grimer.asm b/data/base_stats/grimer.asm
index 2b289ede9..7fb64eb07 100644
--- a/data/base_stats/grimer.asm
+++ b/data/base_stats/grimer.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/grimer/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/base_stats/growlithe.asm b/data/base_stats/growlithe.asm
index 1929f5674..a5e8676f6 100644
--- a/data/base_stats/growlithe.asm
+++ b/data/base_stats/growlithe.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/growlithe/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/gyarados.asm b/data/base_stats/gyarados.asm
index b7b0abbd5..9b57391c5 100644
--- a/data/base_stats/gyarados.asm
+++ b/data/base_stats/gyarados.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 5 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/gyarados/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FISH, REPTILE ; egg groups
diff --git a/data/base_stats/haunter.asm b/data/base_stats/haunter.asm
index a75cf79db..76f18a739 100644
--- a/data/base_stats/haunter.asm
+++ b/data/base_stats/haunter.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/haunter/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/base_stats/heracross.asm b/data/base_stats/heracross.asm
index c8260e7d6..5d625bf58 100644
--- a/data/base_stats/heracross.asm
+++ b/data/base_stats/heracross.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/heracross/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/hitmonchan.asm b/data/base_stats/hitmonchan.asm
index 7753c3bd1..dbad48c61 100644
--- a/data/base_stats/hitmonchan.asm
+++ b/data/base_stats/hitmonchan.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/hitmonchan/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/base_stats/hitmonlee.asm b/data/base_stats/hitmonlee.asm
index a2c53ca32..2a7c5a553 100644
--- a/data/base_stats/hitmonlee.asm
+++ b/data/base_stats/hitmonlee.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/hitmonlee/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/base_stats/hitmontop.asm b/data/base_stats/hitmontop.asm
index af3eb7c88..b4e33a3ee 100644
--- a/data/base_stats/hitmontop.asm
+++ b/data/base_stats/hitmontop.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/hitmontop/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/base_stats/ho_oh.asm b/data/base_stats/ho_oh.asm
index c9c1f639f..5e58d46ae 100644
--- a/data/base_stats/ho_oh.asm
+++ b/data/base_stats/ho_oh.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 120 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7 , 7 ; frontpic dimensions
+	INCBIN "gfx/pics/ho_oh/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/hoothoot.asm b/data/base_stats/hoothoot.asm
index a9574bce8..1af3a01db 100644
--- a/data/base_stats/hoothoot.asm
+++ b/data/base_stats/hoothoot.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/hoothoot/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/hoppip.asm b/data/base_stats/hoppip.asm
index 2c284096c..ad2bb7a02 100644
--- a/data/base_stats/hoppip.asm
+++ b/data/base_stats/hoppip.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/hoppip/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn FAIRY, PLANT ; egg groups
diff --git a/data/base_stats/horsea.asm b/data/base_stats/horsea.asm
index 3339872fe..5a4e06b84 100644
--- a/data/base_stats/horsea.asm
+++ b/data/base_stats/horsea.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/horsea/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, REPTILE ; egg groups
diff --git a/data/base_stats/houndoom.asm b/data/base_stats/houndoom.asm
index d0b82cb62..82271238c 100644
--- a/data/base_stats/houndoom.asm
+++ b/data/base_stats/houndoom.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/houndoom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/houndour.asm b/data/base_stats/houndour.asm
index d661fa949..6f97bd086 100644
--- a/data/base_stats/houndour.asm
+++ b/data/base_stats/houndour.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/houndour/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/hypno.asm b/data/base_stats/hypno.asm
index 85dcc73e6..1bf322d95 100644
--- a/data/base_stats/hypno.asm
+++ b/data/base_stats/hypno.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/hypno/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/base_stats/igglybuff.asm b/data/base_stats/igglybuff.asm
index 79e0ed733..1951f5aa0 100644
--- a/data/base_stats/igglybuff.asm
+++ b/data/base_stats/igglybuff.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/igglybuff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/ivysaur.asm b/data/base_stats/ivysaur.asm
index aebfce677..032c2408c 100644
--- a/data/base_stats/ivysaur.asm
+++ b/data/base_stats/ivysaur.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/ivysaur/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, PLANT ; egg groups
diff --git a/data/base_stats/jigglypuff.asm b/data/base_stats/jigglypuff.asm
index 38d5e57d3..66ab23227 100644
--- a/data/base_stats/jigglypuff.asm
+++ b/data/base_stats/jigglypuff.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/jigglypuff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FAIRY, FAIRY ; egg groups
diff --git a/data/base_stats/jolteon.asm b/data/base_stats/jolteon.asm
index 060c13a6f..3f956946a 100644
--- a/data/base_stats/jolteon.asm
+++ b/data/base_stats/jolteon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 35 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/jolteon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/jumpluff.asm b/data/base_stats/jumpluff.asm
index 948d89ae9..7a857dec4 100644
--- a/data/base_stats/jumpluff.asm
+++ b/data/base_stats/jumpluff.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/jumpluff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn FAIRY, PLANT ; egg groups
diff --git a/data/base_stats/jynx.asm b/data/base_stats/jynx.asm
index 23f37107a..054dca9ae 100644
--- a/data/base_stats/jynx.asm
+++ b/data/base_stats/jynx.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/jynx/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/base_stats/kabuto.asm b/data/base_stats/kabuto.asm
index 036821999..024f2791d 100644
--- a/data/base_stats/kabuto.asm
+++ b/data/base_stats/kabuto.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 30 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/kabuto/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, INVERTEBRATE ; egg groups
diff --git a/data/base_stats/kabutops.asm b/data/base_stats/kabutops.asm
index b0cdf9a76..3c5076954 100644
--- a/data/base_stats/kabutops.asm
+++ b/data/base_stats/kabutops.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 30 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/kabutops/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, INVERTEBRATE ; egg groups
diff --git a/data/base_stats/kadabra.asm b/data/base_stats/kadabra.asm
index 0cdf2b74f..bf5f33638 100644
--- a/data/base_stats/kadabra.asm
+++ b/data/base_stats/kadabra.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/kadabra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/base_stats/kakuna.asm b/data/base_stats/kakuna.asm
index c48ad4c6c..827e17262 100644
--- a/data/base_stats/kakuna.asm
+++ b/data/base_stats/kakuna.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/kakuna/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/kangaskhan.asm b/data/base_stats/kangaskhan.asm
index 1958b1ce3..ca6094ad7 100644
--- a/data/base_stats/kangaskhan.asm
+++ b/data/base_stats/kangaskhan.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/kangaskhan/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/base_stats/kingdra.asm b/data/base_stats/kingdra.asm
index ac049ac4a..ac4dfd659 100644
--- a/data/base_stats/kingdra.asm
+++ b/data/base_stats/kingdra.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/kingdra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, REPTILE ; egg groups
diff --git a/data/base_stats/kingler.asm b/data/base_stats/kingler.asm
index bb0e19904..65c3344ac 100644
--- a/data/base_stats/kingler.asm
+++ b/data/base_stats/kingler.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/kingler/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/base_stats/koffing.asm b/data/base_stats/koffing.asm
index 9851a985e..b46e8241e 100644
--- a/data/base_stats/koffing.asm
+++ b/data/base_stats/koffing.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/koffing/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/base_stats/krabby.asm b/data/base_stats/krabby.asm
index 54ec9eab4..517d3bd07 100644
--- a/data/base_stats/krabby.asm
+++ b/data/base_stats/krabby.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/krabby/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/base_stats/lanturn.asm b/data/base_stats/lanturn.asm
index 046ebc0bb..f4dd4cd3a 100644
--- a/data/base_stats/lanturn.asm
+++ b/data/base_stats/lanturn.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/lanturn/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FISH, FISH ; egg groups
diff --git a/data/base_stats/lapras.asm b/data/base_stats/lapras.asm
index df595b8c5..e57154bc6 100644
--- a/data/base_stats/lapras.asm
+++ b/data/base_stats/lapras.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/lapras/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/base_stats/larvitar.asm b/data/base_stats/larvitar.asm
index 4115fd7ae..03a9be50f 100644
--- a/data/base_stats/larvitar.asm
+++ b/data/base_stats/larvitar.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/larvitar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/base_stats/ledian.asm b/data/base_stats/ledian.asm
index 37f7c1478..a1ca61629 100644
--- a/data/base_stats/ledian.asm
+++ b/data/base_stats/ledian.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/ledian/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/ledyba.asm b/data/base_stats/ledyba.asm
index 2beb81883..a01e329b1 100644
--- a/data/base_stats/ledyba.asm
+++ b/data/base_stats/ledyba.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/ledyba/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/lickitung.asm b/data/base_stats/lickitung.asm
index 14bb7160b..8b915bc59 100644
--- a/data/base_stats/lickitung.asm
+++ b/data/base_stats/lickitung.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/lickitung/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/base_stats/lugia.asm b/data/base_stats/lugia.asm
index aa7b6297c..26f337e2a 100644
--- a/data/base_stats/lugia.asm
+++ b/data/base_stats/lugia.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 120 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/lugia/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/machamp.asm b/data/base_stats/machamp.asm
index 091fe7391..056ce3945 100644
--- a/data/base_stats/machamp.asm
+++ b/data/base_stats/machamp.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/machamp/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/base_stats/machoke.asm b/data/base_stats/machoke.asm
index 355aee6d8..3fdec0eb2 100644
--- a/data/base_stats/machoke.asm
+++ b/data/base_stats/machoke.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/machoke/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/base_stats/machop.asm b/data/base_stats/machop.asm
index 60f0ae04a..bdde42528 100644
--- a/data/base_stats/machop.asm
+++ b/data/base_stats/machop.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/machop/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/base_stats/magby.asm b/data/base_stats/magby.asm
index 84c9c30a0..876bceb3f 100644
--- a/data/base_stats/magby.asm
+++ b/data/base_stats/magby.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/magby/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/magcargo.asm b/data/base_stats/magcargo.asm
index 6a245c784..bdbd0ca97 100644
--- a/data/base_stats/magcargo.asm
+++ b/data/base_stats/magcargo.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/magcargo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/base_stats/magikarp.asm b/data/base_stats/magikarp.asm
index d8620a4eb..5d489fbff 100644
--- a/data/base_stats/magikarp.asm
+++ b/data/base_stats/magikarp.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 5 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/magikarp/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FISH, REPTILE ; egg groups
diff --git a/data/base_stats/magmar.asm b/data/base_stats/magmar.asm
index 9b1e15ac1..3c27ad670 100644
--- a/data/base_stats/magmar.asm
+++ b/data/base_stats/magmar.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/magmar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/base_stats/magnemite.asm b/data/base_stats/magnemite.asm
index e7ba32b37..78a3ddea6 100644
--- a/data/base_stats/magnemite.asm
+++ b/data/base_stats/magnemite.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/magnemite/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/base_stats/magneton.asm b/data/base_stats/magneton.asm
index dbe564757..8b9158bba 100644
--- a/data/base_stats/magneton.asm
+++ b/data/base_stats/magneton.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/magneton/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/base_stats/mankey.asm b/data/base_stats/mankey.asm
index 50c0e6c69..7ee15d3f7 100644
--- a/data/base_stats/mankey.asm
+++ b/data/base_stats/mankey.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/mankey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/mantine.asm b/data/base_stats/mantine.asm
index 5253d178b..e8730d787 100644
--- a/data/base_stats/mantine.asm
+++ b/data/base_stats/mantine.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/mantine/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn AMPHIBIAN, AMPHIBIAN ; egg groups
diff --git a/data/base_stats/mareep.asm b/data/base_stats/mareep.asm
index 46b26f018..366863245 100644
--- a/data/base_stats/mareep.asm
+++ b/data/base_stats/mareep.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/mareep/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/base_stats/marill.asm b/data/base_stats/marill.asm
index 6c187a9d3..7d9f4ce8a 100644
--- a/data/base_stats/marill.asm
+++ b/data/base_stats/marill.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/marill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn AMPHIBIAN, FAIRY ; egg groups
diff --git a/data/base_stats/marowak.asm b/data/base_stats/marowak.asm
index d8f45a05d..76b7e4870 100644
--- a/data/base_stats/marowak.asm
+++ b/data/base_stats/marowak.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/marowak/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/base_stats/meganium.asm b/data/base_stats/meganium.asm
index 952f53a07..57f228c28 100644
--- a/data/base_stats/meganium.asm
+++ b/data/base_stats/meganium.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/meganium/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, PLANT ; egg groups
diff --git a/data/base_stats/meowth.asm b/data/base_stats/meowth.asm
index 159c7525c..f795aa4c2 100644
--- a/data/base_stats/meowth.asm
+++ b/data/base_stats/meowth.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/meowth/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/metapod.asm b/data/base_stats/metapod.asm
index 100c33f41..deb7bc8e7 100644
--- a/data/base_stats/metapod.asm
+++ b/data/base_stats/metapod.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/metapod/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/mew.asm b/data/base_stats/mew.asm
index 26405aa5d..7544467c7 100644
--- a/data/base_stats/mew.asm
+++ b/data/base_stats/mew.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 120 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/mew/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/mewtwo.asm b/data/base_stats/mewtwo.asm
index 575b0cd7e..61e01c32c 100644
--- a/data/base_stats/mewtwo.asm
+++ b/data/base_stats/mewtwo.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 120 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/mewtwo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/miltank.asm b/data/base_stats/miltank.asm
index c356605c7..7083c15c7 100644
--- a/data/base_stats/miltank.asm
+++ b/data/base_stats/miltank.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/miltank/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/misdreavus.asm b/data/base_stats/misdreavus.asm
index bc360bc86..5811aa665 100644
--- a/data/base_stats/misdreavus.asm
+++ b/data/base_stats/misdreavus.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/misdreavus/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/base_stats/moltres.asm b/data/base_stats/moltres.asm
index e57559c9a..13eb7e7af 100644
--- a/data/base_stats/moltres.asm
+++ b/data/base_stats/moltres.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 80 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/moltres/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/mr__mime.asm b/data/base_stats/mr__mime.asm
index 4c692f739..3a271baf4 100644
--- a/data/base_stats/mr__mime.asm
+++ b/data/base_stats/mr__mime.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/mr__mime/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn HUMANSHAPE, HUMANSHAPE ; egg groups
diff --git a/data/base_stats/muk.asm b/data/base_stats/muk.asm
index d041042e4..7669e59b0 100644
--- a/data/base_stats/muk.asm
+++ b/data/base_stats/muk.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/muk/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/base_stats/murkrow.asm b/data/base_stats/murkrow.asm
index d13e9607c..08a1d7143 100644
--- a/data/base_stats/murkrow.asm
+++ b/data/base_stats/murkrow.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/murkrow/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/natu.asm b/data/base_stats/natu.asm
index 8739ce260..2f65b73ba 100644
--- a/data/base_stats/natu.asm
+++ b/data/base_stats/natu.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/natu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/nidoking.asm b/data/base_stats/nidoking.asm
index 0c004b1f4..a5d6abef0 100644
--- a/data/base_stats/nidoking.asm
+++ b/data/base_stats/nidoking.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/nidoking/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/base_stats/nidoqueen.asm b/data/base_stats/nidoqueen.asm
index a946e8837..cf888b7eb 100644
--- a/data/base_stats/nidoqueen.asm
+++ b/data/base_stats/nidoqueen.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/nidoqueen/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/nidoran_f.asm b/data/base_stats/nidoran_f.asm
index c336a6330..e80b622c9 100644
--- a/data/base_stats/nidoran_f.asm
+++ b/data/base_stats/nidoran_f.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/nidoran_f/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/base_stats/nidoran_m.asm b/data/base_stats/nidoran_m.asm
index be3c87d0a..1029a2511 100644
--- a/data/base_stats/nidoran_m.asm
+++ b/data/base_stats/nidoran_m.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/nidoran_m/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/base_stats/nidorina.asm b/data/base_stats/nidorina.asm
index 238144bc8..3ca843e85 100644
--- a/data/base_stats/nidorina.asm
+++ b/data/base_stats/nidorina.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/nidorina/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/nidorino.asm b/data/base_stats/nidorino.asm
index 307382c45..c853ef943 100644
--- a/data/base_stats/nidorino.asm
+++ b/data/base_stats/nidorino.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/nidorino/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/base_stats/ninetales.asm b/data/base_stats/ninetales.asm
index 34befe1d6..c651f8c57 100644
--- a/data/base_stats/ninetales.asm
+++ b/data/base_stats/ninetales.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/ninetales/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/noctowl.asm b/data/base_stats/noctowl.asm
index fedbc1228..7c97fd769 100644
--- a/data/base_stats/noctowl.asm
+++ b/data/base_stats/noctowl.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/noctowl/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/octillery.asm b/data/base_stats/octillery.asm
index 24910f46b..1d64afa82 100644
--- a/data/base_stats/octillery.asm
+++ b/data/base_stats/octillery.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/octillery/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FISH ; egg groups
diff --git a/data/base_stats/oddish.asm b/data/base_stats/oddish.asm
index d0db4bd32..dc91485b6 100644
--- a/data/base_stats/oddish.asm
+++ b/data/base_stats/oddish.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/oddish/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/base_stats/omanyte.asm b/data/base_stats/omanyte.asm
index b1a81d7e5..0e511f244 100644
--- a/data/base_stats/omanyte.asm
+++ b/data/base_stats/omanyte.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 30 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/omanyte/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, INVERTEBRATE ; egg groups
diff --git a/data/base_stats/omastar.asm b/data/base_stats/omastar.asm
index 69e4317a3..7e35a8987 100644
--- a/data/base_stats/omastar.asm
+++ b/data/base_stats/omastar.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 30 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/omastar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, INVERTEBRATE ; egg groups
diff --git a/data/base_stats/onix.asm b/data/base_stats/onix.asm
index dc937f1ad..f67c1eb86 100644
--- a/data/base_stats/onix.asm
+++ b/data/base_stats/onix.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/onix/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/base_stats/paras.asm b/data/base_stats/paras.asm
index 1051395ab..4994aa8dd 100644
--- a/data/base_stats/paras.asm
+++ b/data/base_stats/paras.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/paras/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, PLANT ; egg groups
diff --git a/data/base_stats/parasect.asm b/data/base_stats/parasect.asm
index 7ec7f8837..310eba07f 100644
--- a/data/base_stats/parasect.asm
+++ b/data/base_stats/parasect.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/parasect/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, PLANT ; egg groups
diff --git a/data/base_stats/persian.asm b/data/base_stats/persian.asm
index d945188d0..f76ecaaae 100644
--- a/data/base_stats/persian.asm
+++ b/data/base_stats/persian.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/persian/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/phanpy.asm b/data/base_stats/phanpy.asm
index 40a9a5fb6..08ff39595 100644
--- a/data/base_stats/phanpy.asm
+++ b/data/base_stats/phanpy.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/phanpy/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/pichu.asm b/data/base_stats/pichu.asm
index be3607b36..dbadc22d3 100644
--- a/data/base_stats/pichu.asm
+++ b/data/base_stats/pichu.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/pichu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/pidgeot.asm b/data/base_stats/pidgeot.asm
index 9689c83b9..1024b6624 100644
--- a/data/base_stats/pidgeot.asm
+++ b/data/base_stats/pidgeot.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/pidgeot/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/pidgeotto.asm b/data/base_stats/pidgeotto.asm
index 5dfc5494a..8e9d434a3 100644
--- a/data/base_stats/pidgeotto.asm
+++ b/data/base_stats/pidgeotto.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/pidgeotto/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/pidgey.asm b/data/base_stats/pidgey.asm
index e5a110c14..d5f8fa630 100644
--- a/data/base_stats/pidgey.asm
+++ b/data/base_stats/pidgey.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/pidgey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/pikachu.asm b/data/base_stats/pikachu.asm
index 0c1306eee..5875b1ea7 100644
--- a/data/base_stats/pikachu.asm
+++ b/data/base_stats/pikachu.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/pikachu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FAIRY ; egg groups
diff --git a/data/base_stats/piloswine.asm b/data/base_stats/piloswine.asm
index bf3ca9296..3da32746b 100644
--- a/data/base_stats/piloswine.asm
+++ b/data/base_stats/piloswine.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/piloswine/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/pineco.asm b/data/base_stats/pineco.asm
index 2711aa89a..43289701c 100644
--- a/data/base_stats/pineco.asm
+++ b/data/base_stats/pineco.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/pineco/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/pinsir.asm b/data/base_stats/pinsir.asm
index 4c06d8612..cd07cde27 100644
--- a/data/base_stats/pinsir.asm
+++ b/data/base_stats/pinsir.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/pinsir/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/politoed.asm b/data/base_stats/politoed.asm
index 889b4a56c..8b510fc8f 100644
--- a/data/base_stats/politoed.asm
+++ b/data/base_stats/politoed.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/politoed/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AMPHIBIAN, AMPHIBIAN ; egg groups
diff --git a/data/base_stats/poliwag.asm b/data/base_stats/poliwag.asm
index 818e7ff56..abcab97e2 100644
--- a/data/base_stats/poliwag.asm
+++ b/data/base_stats/poliwag.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/poliwag/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AMPHIBIAN, AMPHIBIAN ; egg groups
diff --git a/data/base_stats/poliwhirl.asm b/data/base_stats/poliwhirl.asm
index e26cfc4af..c2aac43f7 100644
--- a/data/base_stats/poliwhirl.asm
+++ b/data/base_stats/poliwhirl.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/poliwhirl/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AMPHIBIAN, AMPHIBIAN ; egg groups
diff --git a/data/base_stats/poliwrath.asm b/data/base_stats/poliwrath.asm
index 6b90592d1..1e3130078 100644
--- a/data/base_stats/poliwrath.asm
+++ b/data/base_stats/poliwrath.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/poliwrath/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn AMPHIBIAN, AMPHIBIAN ; egg groups
diff --git a/data/base_stats/ponyta.asm b/data/base_stats/ponyta.asm
index f8df9a0f2..2366b1b12 100644
--- a/data/base_stats/ponyta.asm
+++ b/data/base_stats/ponyta.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/ponyta/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/porygon.asm b/data/base_stats/porygon.asm
index 828e813aa..340c79af1 100644
--- a/data/base_stats/porygon.asm
+++ b/data/base_stats/porygon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/porygon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/base_stats/porygon2.asm b/data/base_stats/porygon2.asm
index d180b44ac..6c5a518a7 100644
--- a/data/base_stats/porygon2.asm
+++ b/data/base_stats/porygon2.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/porygon2/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/base_stats/primeape.asm b/data/base_stats/primeape.asm
index 7a7e753f0..4abd0b68f 100644
--- a/data/base_stats/primeape.asm
+++ b/data/base_stats/primeape.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/primeape/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/psyduck.asm b/data/base_stats/psyduck.asm
index d95ff0e92..bbd0e64e3 100644
--- a/data/base_stats/psyduck.asm
+++ b/data/base_stats/psyduck.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/psyduck/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FIELD ; egg groups
diff --git a/data/base_stats/pupitar.asm b/data/base_stats/pupitar.asm
index 98f0782fc..643b88e34 100644
--- a/data/base_stats/pupitar.asm
+++ b/data/base_stats/pupitar.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/pupitar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/base_stats/quagsire.asm b/data/base_stats/quagsire.asm
index 5ffaf7dab..3e65ce4a1 100644
--- a/data/base_stats/quagsire.asm
+++ b/data/base_stats/quagsire.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/quagsire/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FIELD ; egg groups
diff --git a/data/base_stats/quilava.asm b/data/base_stats/quilava.asm
index 58662b46a..f1d9a8b3c 100644
--- a/data/base_stats/quilava.asm
+++ b/data/base_stats/quilava.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/quilava/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/qwilfish.asm b/data/base_stats/qwilfish.asm
index 5bd9e1c5e..5308e60ef 100644
--- a/data/base_stats/qwilfish.asm
+++ b/data/base_stats/qwilfish.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/qwilfish/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FISH, FISH ; egg groups
diff --git a/data/base_stats/raichu.asm b/data/base_stats/raichu.asm
index c63552517..aefc56713 100644
--- a/data/base_stats/raichu.asm
+++ b/data/base_stats/raichu.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/raichu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FAIRY ; egg groups
diff --git a/data/base_stats/raikou.asm b/data/base_stats/raikou.asm
index 8d5bf96bf..26966258d 100644
--- a/data/base_stats/raikou.asm
+++ b/data/base_stats/raikou.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 80 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/raikou/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/rapidash.asm b/data/base_stats/rapidash.asm
index e3684e5e9..a55f7cd36 100644
--- a/data/base_stats/rapidash.asm
+++ b/data/base_stats/rapidash.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/rapidash/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/raticate.asm b/data/base_stats/raticate.asm
index 361e003aa..6248cf4ca 100644
--- a/data/base_stats/raticate.asm
+++ b/data/base_stats/raticate.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/raticate/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/rattata.asm b/data/base_stats/rattata.asm
index ac5ac1acb..0fb688d58 100644
--- a/data/base_stats/rattata.asm
+++ b/data/base_stats/rattata.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/rattata/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/remoraid.asm b/data/base_stats/remoraid.asm
index 9218ba8c1..4af024564 100644
--- a/data/base_stats/remoraid.asm
+++ b/data/base_stats/remoraid.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/remoraid/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FISH ; egg groups
diff --git a/data/base_stats/rhydon.asm b/data/base_stats/rhydon.asm
index 0190aa5cb..8890718a5 100644
--- a/data/base_stats/rhydon.asm
+++ b/data/base_stats/rhydon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/rhydon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/base_stats/rhyhorn.asm b/data/base_stats/rhyhorn.asm
index 717a872c0..33cff8b54 100644
--- a/data/base_stats/rhyhorn.asm
+++ b/data/base_stats/rhyhorn.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/rhyhorn/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn MONSTER, FIELD ; egg groups
diff --git a/data/base_stats/sandshrew.asm b/data/base_stats/sandshrew.asm
index 53288890e..f2148f9fa 100644
--- a/data/base_stats/sandshrew.asm
+++ b/data/base_stats/sandshrew.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/sandshrew/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/sandslash.asm b/data/base_stats/sandslash.asm
index 1067ccb3e..ae4c38df0 100644
--- a/data/base_stats/sandslash.asm
+++ b/data/base_stats/sandslash.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/sandslash/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/scizor.asm b/data/base_stats/scizor.asm
index af9bfc938..c05fa7aca 100644
--- a/data/base_stats/scizor.asm
+++ b/data/base_stats/scizor.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/scizor/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/scyther.asm b/data/base_stats/scyther.asm
index 7de348478..e01386c6e 100644
--- a/data/base_stats/scyther.asm
+++ b/data/base_stats/scyther.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/scyther/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/seadra.asm b/data/base_stats/seadra.asm
index f43abfaa0..b242641c3 100644
--- a/data/base_stats/seadra.asm
+++ b/data/base_stats/seadra.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/seadra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, REPTILE ; egg groups
diff --git a/data/base_stats/seaking.asm b/data/base_stats/seaking.asm
index 9543366bf..381c61298 100644
--- a/data/base_stats/seaking.asm
+++ b/data/base_stats/seaking.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/seaking/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FISH, FISH ; egg groups
diff --git a/data/base_stats/seel.asm b/data/base_stats/seel.asm
index 873d410aa..2589fc272 100644
--- a/data/base_stats/seel.asm
+++ b/data/base_stats/seel.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/seel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FIELD ; egg groups
diff --git a/data/base_stats/sentret.asm b/data/base_stats/sentret.asm
index 1b66348e2..25c7b779c 100644
--- a/data/base_stats/sentret.asm
+++ b/data/base_stats/sentret.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/sentret/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/shellder.asm b/data/base_stats/shellder.asm
index 86b69a62f..7d7f801d7 100644
--- a/data/base_stats/shellder.asm
+++ b/data/base_stats/shellder.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/shellder/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/base_stats/shuckle.asm b/data/base_stats/shuckle.asm
index ef76037fd..9f2cee33b 100644
--- a/data/base_stats/shuckle.asm
+++ b/data/base_stats/shuckle.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/shuckle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/skarmory.asm b/data/base_stats/skarmory.asm
index 334803e0a..106cee7f3 100644
--- a/data/base_stats/skarmory.asm
+++ b/data/base_stats/skarmory.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/skarmory/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/skiploom.asm b/data/base_stats/skiploom.asm
index dab6b1acd..2920f19f0 100644
--- a/data/base_stats/skiploom.asm
+++ b/data/base_stats/skiploom.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/skiploom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn FAIRY, PLANT ; egg groups
diff --git a/data/base_stats/slowbro.asm b/data/base_stats/slowbro.asm
index 1a1743ceb..7c6520d8a 100644
--- a/data/base_stats/slowbro.asm
+++ b/data/base_stats/slowbro.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/slowbro/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/base_stats/slowking.asm b/data/base_stats/slowking.asm
index 699bf8467..4974b23c5 100644
--- a/data/base_stats/slowking.asm
+++ b/data/base_stats/slowking.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/slowking/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/base_stats/slowpoke.asm b/data/base_stats/slowpoke.asm
index 250d37fd7..4ad676ab0 100644
--- a/data/base_stats/slowpoke.asm
+++ b/data/base_stats/slowpoke.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/slowpoke/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/base_stats/slugma.asm b/data/base_stats/slugma.asm
index 2694300dd..52da7221f 100644
--- a/data/base_stats/slugma.asm
+++ b/data/base_stats/slugma.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/slugma/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/base_stats/smeargle.asm b/data/base_stats/smeargle.asm
index f7363ca25..e3011c8d2 100644
--- a/data/base_stats/smeargle.asm
+++ b/data/base_stats/smeargle.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/smeargle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/smoochum.asm b/data/base_stats/smoochum.asm
index 20b79b263..985a52a19 100644
--- a/data/base_stats/smoochum.asm
+++ b/data/base_stats/smoochum.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/smoochum/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/sneasel.asm b/data/base_stats/sneasel.asm
index 939c11b5a..eb62897eb 100644
--- a/data/base_stats/sneasel.asm
+++ b/data/base_stats/sneasel.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/sneasel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/snorlax.asm b/data/base_stats/snorlax.asm
index 9bd0bcb66..e04cd1442 100644
--- a/data/base_stats/snorlax.asm
+++ b/data/base_stats/snorlax.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/snorlax/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/base_stats/snubbull.asm b/data/base_stats/snubbull.asm
index fc537900e..3ac629f26 100644
--- a/data/base_stats/snubbull.asm
+++ b/data/base_stats/snubbull.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/snubbull/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FIELD, FAIRY ; egg groups
diff --git a/data/base_stats/spearow.asm b/data/base_stats/spearow.asm
index e422d750f..4321aa799 100644
--- a/data/base_stats/spearow.asm
+++ b/data/base_stats/spearow.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/spearow/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/spinarak.asm b/data/base_stats/spinarak.asm
index bc1d997f9..7f00a4677 100644
--- a/data/base_stats/spinarak.asm
+++ b/data/base_stats/spinarak.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/spinarak/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/squirtle.asm b/data/base_stats/squirtle.asm
index 0ba0d4b81..06484e52c 100644
--- a/data/base_stats/squirtle.asm
+++ b/data/base_stats/squirtle.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/squirtle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/base_stats/stantler.asm b/data/base_stats/stantler.asm
index 9ab141b94..911e1904f 100644
--- a/data/base_stats/stantler.asm
+++ b/data/base_stats/stantler.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/stantler/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/starmie.asm b/data/base_stats/starmie.asm
index 69410ba86..dbc2122bb 100644
--- a/data/base_stats/starmie.asm
+++ b/data/base_stats/starmie.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/starmie/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/base_stats/staryu.asm b/data/base_stats/staryu.asm
index 18e958528..6d0d90eb3 100644
--- a/data/base_stats/staryu.asm
+++ b/data/base_stats/staryu.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/staryu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/base_stats/steelix.asm b/data/base_stats/steelix.asm
index 11c3d031c..f740d0c02 100644
--- a/data/base_stats/steelix.asm
+++ b/data/base_stats/steelix.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/steelix/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/base_stats/sudowoodo.asm b/data/base_stats/sudowoodo.asm
index 9d13d5628..6ddc4cd57 100644
--- a/data/base_stats/sudowoodo.asm
+++ b/data/base_stats/sudowoodo.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/sudowoodo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/base_stats/suicune.asm b/data/base_stats/suicune.asm
index 2abe525c8..6262bd513 100644
--- a/data/base_stats/suicune.asm
+++ b/data/base_stats/suicune.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 80 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/suicune/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/sunflora.asm b/data/base_stats/sunflora.asm
index 8ec14fb96..d8f01ebad 100644
--- a/data/base_stats/sunflora.asm
+++ b/data/base_stats/sunflora.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/sunflora/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/base_stats/sunkern.asm b/data/base_stats/sunkern.asm
index c75e83a36..2cab9d9a1 100644
--- a/data/base_stats/sunkern.asm
+++ b/data/base_stats/sunkern.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/sunkern/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/base_stats/swinub.asm b/data/base_stats/swinub.asm
index f9a6be4fa..70b389b30 100644
--- a/data/base_stats/swinub.asm
+++ b/data/base_stats/swinub.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/swinub/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/tangela.asm b/data/base_stats/tangela.asm
index bf539b28a..d379fdb92 100644
--- a/data/base_stats/tangela.asm
+++ b/data/base_stats/tangela.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/tangela/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/base_stats/tauros.asm b/data/base_stats/tauros.asm
index d67ba30cb..365de3f8d 100644
--- a/data/base_stats/tauros.asm
+++ b/data/base_stats/tauros.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/tauros/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/teddiursa.asm b/data/base_stats/teddiursa.asm
index 81eebe7ba..0269d4c68 100644
--- a/data/base_stats/teddiursa.asm
+++ b/data/base_stats/teddiursa.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/teddiursa/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/tentacool.asm b/data/base_stats/tentacool.asm
index ebbfd26e0..e225309e5 100644
--- a/data/base_stats/tentacool.asm
+++ b/data/base_stats/tentacool.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/tentacool/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/base_stats/tentacruel.asm b/data/base_stats/tentacruel.asm
index fd23df31a..22b2a3808 100644
--- a/data/base_stats/tentacruel.asm
+++ b/data/base_stats/tentacruel.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/tentacruel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
diff --git a/data/base_stats/togepi.asm b/data/base_stats/togepi.asm
index 8d156f518..1bf6cc339 100644
--- a/data/base_stats/togepi.asm
+++ b/data/base_stats/togepi.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/togepi/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/togetic.asm b/data/base_stats/togetic.asm
index de55594b7..f8330c50f 100644
--- a/data/base_stats/togetic.asm
+++ b/data/base_stats/togetic.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/togetic/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn AVIAN, FAIRY ; egg groups
diff --git a/data/base_stats/totodile.asm b/data/base_stats/totodile.asm
index 46521a06c..3d57dbc89 100644
--- a/data/base_stats/totodile.asm
+++ b/data/base_stats/totodile.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/totodile/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/base_stats/typhlosion.asm b/data/base_stats/typhlosion.asm
index 31adbd154..a73529cef 100644
--- a/data/base_stats/typhlosion.asm
+++ b/data/base_stats/typhlosion.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/typhlosion/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/tyranitar.asm b/data/base_stats/tyranitar.asm
index 78f09ec1e..c116bdde3 100644
--- a/data/base_stats/tyranitar.asm
+++ b/data/base_stats/tyranitar.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/tyranitar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn MONSTER, MONSTER ; egg groups
diff --git a/data/base_stats/tyrogue.asm b/data/base_stats/tyrogue.asm
index c128a7b9c..87d44a3c5 100644
--- a/data/base_stats/tyrogue.asm
+++ b/data/base_stats/tyrogue.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 25 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/tyrogue/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/umbreon.asm b/data/base_stats/umbreon.asm
index fadc9d9f8..1274f6afa 100644
--- a/data/base_stats/umbreon.asm
+++ b/data/base_stats/umbreon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 35 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/umbreon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/unown.asm b/data/base_stats/unown.asm
index 0b5308aa9..d447757eb 100644
--- a/data/base_stats/unown.asm
+++ b/data/base_stats/unown.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 40 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/unown_a/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/ursaring.asm b/data/base_stats/ursaring.asm
index 5e9171366..ba87a54ff 100644
--- a/data/base_stats/ursaring.asm
+++ b/data/base_stats/ursaring.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/ursaring/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/vaporeon.asm b/data/base_stats/vaporeon.asm
index 981fdc314..7d024d5fd 100644
--- a/data/base_stats/vaporeon.asm
+++ b/data/base_stats/vaporeon.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 35 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/vaporeon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/venomoth.asm b/data/base_stats/venomoth.asm
index c31068c8f..c2ac64222 100644
--- a/data/base_stats/venomoth.asm
+++ b/data/base_stats/venomoth.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/venomoth/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/venonat.asm b/data/base_stats/venonat.asm
index 92e7de208..ef662fb91 100644
--- a/data/base_stats/venonat.asm
+++ b/data/base_stats/venonat.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/venonat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/venusaur.asm b/data/base_stats/venusaur.asm
index 88b839a08..728508bee 100644
--- a/data/base_stats/venusaur.asm
+++ b/data/base_stats/venusaur.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/venusaur/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, PLANT ; egg groups
diff --git a/data/base_stats/victreebel.asm b/data/base_stats/victreebel.asm
index 85701718f..fd33d5c1c 100644
--- a/data/base_stats/victreebel.asm
+++ b/data/base_stats/victreebel.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/victreebel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/base_stats/vileplume.asm b/data/base_stats/vileplume.asm
index 5160c052c..f6f4b370e 100644
--- a/data/base_stats/vileplume.asm
+++ b/data/base_stats/vileplume.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/vileplume/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/base_stats/voltorb.asm b/data/base_stats/voltorb.asm
index b4d9b1538..5daf64af9 100644
--- a/data/base_stats/voltorb.asm
+++ b/data/base_stats/voltorb.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/voltorb/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INANIMATE, INANIMATE ; egg groups
diff --git a/data/base_stats/vulpix.asm b/data/base_stats/vulpix.asm
index f0bd24047..0212212ff 100644
--- a/data/base_stats/vulpix.asm
+++ b/data/base_stats/vulpix.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/vulpix/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn FIELD, FIELD ; egg groups
diff --git a/data/base_stats/wartortle.asm b/data/base_stats/wartortle.asm
index 28b0d42c2..751d881ef 100644
--- a/data/base_stats/wartortle.asm
+++ b/data/base_stats/wartortle.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/wartortle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn MONSTER, AMPHIBIAN ; egg groups
diff --git a/data/base_stats/weedle.asm b/data/base_stats/weedle.asm
index f11ee09e3..acc241e74 100644
--- a/data/base_stats/weedle.asm
+++ b/data/base_stats/weedle.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/weedle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/weepinbell.asm b/data/base_stats/weepinbell.asm
index c85075e92..b87ba6326 100644
--- a/data/base_stats/weepinbell.asm
+++ b/data/base_stats/weepinbell.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/weepinbell/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_SLOW ; growth rate
 	dn PLANT, PLANT ; egg groups
diff --git a/data/base_stats/weezing.asm b/data/base_stats/weezing.asm
index 8a0d25bcb..96a645828 100644
--- a/data/base_stats/weezing.asm
+++ b/data/base_stats/weezing.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/weezing/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/base_stats/wigglytuff.asm b/data/base_stats/wigglytuff.asm
index 0edc4dea4..82321d595 100644
--- a/data/base_stats/wigglytuff.asm
+++ b/data/base_stats/wigglytuff.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 10 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/wigglytuff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db FAST ; growth rate
 	dn FAIRY, FAIRY ; egg groups
diff --git a/data/base_stats/wobbuffet.asm b/data/base_stats/wobbuffet.asm
index 526139934..4b865b33c 100644
--- a/data/base_stats/wobbuffet.asm
+++ b/data/base_stats/wobbuffet.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/wobbuffet/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMORPHOUS, AMORPHOUS ; egg groups
diff --git a/data/base_stats/wooper.asm b/data/base_stats/wooper.asm
index 8449cda10..0f0d53630 100644
--- a/data/base_stats/wooper.asm
+++ b/data/base_stats/wooper.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/wooper/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AMPHIBIAN, FIELD ; egg groups
diff --git a/data/base_stats/xatu.asm b/data/base_stats/xatu.asm
index b5ef96969..ba0e964af 100644
--- a/data/base_stats/xatu.asm
+++ b/data/base_stats/xatu.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/xatu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/data/base_stats/yanma.asm b/data/base_stats/yanma.asm
index 6fe69d8c5..96cf497be 100644
--- a/data/base_stats/yanma.asm
+++ b/data/base_stats/yanma.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 20 ; step cycles to hatch
 	db 5 ; unknown
-	dn 6, 6 ; frontpic dimensions
+	INCBIN "gfx/pics/yanma/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn INSECT, INSECT ; egg groups
diff --git a/data/base_stats/zapdos.asm b/data/base_stats/zapdos.asm
index 4999c463a..eece9b897 100644
--- a/data/base_stats/zapdos.asm
+++ b/data/base_stats/zapdos.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 80 ; step cycles to hatch
 	db 5 ; unknown
-	dn 7, 7 ; frontpic dimensions
+	INCBIN "gfx/pics/zapdos/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db SLOW ; growth rate
 	dn NO_EGGS, NO_EGGS ; egg groups
diff --git a/data/base_stats/zubat.asm b/data/base_stats/zubat.asm
index 882d8d436..ac5f450d1 100644
--- a/data/base_stats/zubat.asm
+++ b/data/base_stats/zubat.asm
@@ -12,7 +12,7 @@
 	db 100 ; unknown
 	db 15 ; step cycles to hatch
 	db 5 ; unknown
-	dn 5, 5 ; frontpic dimensions
+	INCBIN "gfx/pics/zubat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
 	db MEDIUM_FAST ; growth rate
 	dn AVIAN, AVIAN ; egg groups
diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm
index e324ed476..1c0d7cd3e 100755
--- 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/evolve.asm b/engine/evolve.asm
index 2f7739191..3dc5d20b7 100755
--- a/engine/evolve.asm
+++ b/engine/evolve.asm
@@ -119,7 +119,7 @@ EvolveAfterBattle_MasterLoop
 
 .happiness
 	ld a, [TempMonHappiness]
-	cp 220
+	cp HAPPINESS_TO_EVOLVE
 	jp c, .dont_evolve_2
 
 	call IsMonHoldingEverstone
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index c6ea8ed4f..8e5697f75 100755
--- 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
index f828b0ff8..d560ae817 100755
--- 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
index 787872939..36e2851d3 100644
--- 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
index a993ce4ba..23defe919 100755
--- 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/event/field_moves.asm b/event/field_moves.asm
index 82660da2f..82bc6d3f8 100755
--- a/event/field_moves.asm
+++ b/event/field_moves.asm
@@ -75,7 +75,7 @@ ShakeHeadbuttTree: ; 8c80a
 ; 8c893
 
 HeadbuttTreeGFX: ; 8c893
-INCBIN "gfx/unknown/08c893.2bpp"
+INCBIN "gfx/overworld/headbutt_tree.2bpp"
 ; 8c913
 
 HideHeadbuttTree: ; 8c913
diff --git a/gfx/battle/balls.2bpp b/gfx/battle/balls.2bpp
deleted file mode 100644
index 626c4e3e3..000000000
--- a/gfx/battle/balls.2bpp
+++ /dev/null
diff --git a/gfx/battle/balls.png b/gfx/battle/balls.png
new file mode 100644
index 000000000..21bb5e372
--- /dev/null
+++ b/gfx/battle/balls.png
diff --git a/gfx/battle/enemy_hp_bar_border.1bpp b/gfx/battle/enemy_hp_bar_border.1bpp
deleted file mode 100644
index 629b4770a..000000000
--- a/gfx/battle/enemy_hp_bar_border.1bpp
+++ /dev/null
diff --git a/gfx/battle/enemy_hp_bar_border.png b/gfx/battle/enemy_hp_bar_border.png
new file mode 100644
index 000000000..895949688
--- /dev/null
+++ b/gfx/battle/enemy_hp_bar_border.png
diff --git a/gfx/battle/expbar.2bpp b/gfx/battle/expbar.2bpp
deleted file mode 100644
index cf869d98b..000000000
--- a/gfx/battle/expbar.2bpp
+++ /dev/null
diff --git a/gfx/battle/expbar.png b/gfx/battle/expbar.png
new file mode 100644
index 000000000..9fa3a2128
--- /dev/null
+++ b/gfx/battle/expbar.png
diff --git a/gfx/battle/expbarend.2bpp b/gfx/battle/expbarend.2bpp
deleted file mode 100644
index 24f32e155..000000000
--- a/gfx/battle/expbarend.2bpp
+++ /dev/null
diff --git a/gfx/battle/expbarend.png b/gfx/battle/expbarend.png
new file mode 100644
index 000000000..51c0e7201
--- /dev/null
+++ b/gfx/battle/expbarend.png
diff --git a/gfx/battle/expbarend_sgb.2bpp b/gfx/battle/expbarend_sgb.2bpp
deleted file mode 100644
index dbeb3fdee..000000000
--- a/gfx/battle/expbarend_sgb.2bpp
+++ /dev/null
diff --git a/gfx/battle/expbarend_sgb.png b/gfx/battle/expbarend_sgb.png
new file mode 100644
index 000000000..25eed4a62
--- /dev/null
+++ b/gfx/battle/expbarend_sgb.png
diff --git a/gfx/battle/hp_exp_bar_border.1bpp b/gfx/battle/hp_exp_bar_border.1bpp
deleted file mode 100644
index 1e5dd7af6..000000000
--- a/gfx/battle/hp_exp_bar_border.1bpp
+++ /dev/null
diff --git a/gfx/battle/hp_exp_bar_border.png b/gfx/battle/hp_exp_bar_border.png
new file mode 100644
index 000000000..f0f5d31a6
--- /dev/null
+++ b/gfx/battle/hp_exp_bar_border.png
diff --git a/gfx/battle/minimize.2bpp b/gfx/battle/minimize.2bpp
deleted file mode 100644
index 66b554de4..000000000
--- a/gfx/battle/minimize.2bpp
+++ /dev/null
diff --git a/gfx/battle/minimize.png b/gfx/battle/minimize.png
new file mode 100644
index 000000000..95502f194
--- /dev/null
+++ b/gfx/battle/minimize.png
diff --git a/gfx/debug/color_test.2bpp b/gfx/debug/color_test.2bpp
deleted file mode 100644
index 113aa1256..000000000
--- a/gfx/debug/color_test.2bpp
+++ /dev/null
diff --git a/gfx/debug/color_test.png b/gfx/debug/color_test.png
new file mode 100644
index 000000000..1c3ee326b
--- /dev/null
+++ b/gfx/debug/color_test.png
diff --git a/gfx/emotes/bolt.2bpp b/gfx/emotes/bolt.2bpp
deleted file mode 100644
index 019f4733c..000000000
--- a/gfx/emotes/bolt.2bpp
+++ /dev/null
diff --git a/gfx/emotes/bolt.png b/gfx/emotes/bolt.png
new file mode 100644
index 000000000..0eef6ad3f
--- /dev/null
+++ b/gfx/emotes/bolt.png
diff --git a/gfx/emotes/fish.2bpp b/gfx/emotes/fish.2bpp
deleted file mode 100644
index 310ec1752..000000000
--- a/gfx/emotes/fish.2bpp
+++ /dev/null
diff --git a/gfx/emotes/fish.png b/gfx/emotes/fish.png
new file mode 100644
index 000000000..216c9c43a
--- /dev/null
+++ b/gfx/emotes/fish.png
diff --git a/gfx/emotes/happy.2bpp b/gfx/emotes/happy.2bpp
deleted file mode 100644
index babc52ec6..000000000
--- a/gfx/emotes/happy.2bpp
+++ /dev/null
diff --git a/gfx/emotes/happy.png b/gfx/emotes/happy.png
new file mode 100644
index 000000000..dd65f4d1a
--- /dev/null
+++ b/gfx/emotes/happy.png
diff --git a/gfx/emotes/heart.2bpp b/gfx/emotes/heart.2bpp
deleted file mode 100644
index 15cdc88b7..000000000
--- a/gfx/emotes/heart.2bpp
+++ /dev/null
diff --git a/gfx/emotes/heart.png b/gfx/emotes/heart.png
new file mode 100644
index 000000000..166fff515
--- /dev/null
+++ b/gfx/emotes/heart.png
diff --git a/gfx/emotes/question.2bpp b/gfx/emotes/question.2bpp
deleted file mode 100644
index 2408bbf44..000000000
--- a/gfx/emotes/question.2bpp
+++ /dev/null
diff --git a/gfx/emotes/question.png b/gfx/emotes/question.png
new file mode 100644
index 000000000..091ddbbad
--- /dev/null
+++ b/gfx/emotes/question.png
diff --git a/gfx/emotes/sad.2bpp b/gfx/emotes/sad.2bpp
deleted file mode 100644
index cccdcf97a..000000000
--- a/gfx/emotes/sad.2bpp
+++ /dev/null
diff --git a/gfx/emotes/sad.png b/gfx/emotes/sad.png
new file mode 100644
index 000000000..e241a5b1b
--- /dev/null
+++ b/gfx/emotes/sad.png
diff --git a/gfx/emotes/shock.2bpp b/gfx/emotes/shock.2bpp
deleted file mode 100644
index 351921654..000000000
--- a/gfx/emotes/shock.2bpp
+++ /dev/null
diff --git a/gfx/emotes/shock.png b/gfx/emotes/shock.png
new file mode 100644
index 000000000..f15cf50fa
--- /dev/null
+++ b/gfx/emotes/shock.png
diff --git a/gfx/emotes/sleep.2bpp b/gfx/emotes/sleep.2bpp
deleted file mode 100644
index 1c9e26ec7..000000000
--- a/gfx/emotes/sleep.2bpp
+++ /dev/null
diff --git a/gfx/emotes/sleep.png b/gfx/emotes/sleep.png
new file mode 100644
index 000000000..41c958f74
--- /dev/null
+++ b/gfx/emotes/sleep.png
diff --git a/gfx/evo/bubble.2bpp b/gfx/evo/bubble.2bpp
deleted file mode 100644
index 741ee9026..000000000
--- a/gfx/evo/bubble.2bpp
+++ /dev/null
diff --git a/gfx/evo/bubble.png b/gfx/evo/bubble.png
new file mode 100644
index 000000000..28fba397d
--- /dev/null
+++ b/gfx/evo/bubble.png
diff --git a/gfx/evo/bubble_large.2bpp b/gfx/evo/bubble_large.2bpp
deleted file mode 100644
index a69044414..000000000
--- a/gfx/evo/bubble_large.2bpp
+++ /dev/null
diff --git a/gfx/evo/bubble_large.png b/gfx/evo/bubble_large.png
new file mode 100644
index 000000000..34f630041
--- /dev/null
+++ b/gfx/evo/bubble_large.png
diff --git a/gfx/font.asm b/gfx/font.asm
index 92bc25f25..76c87545b 100755
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -50,8 +50,8 @@ TownMapGFX: ; f8ba0
 INCBIN "gfx/misc/town_map.2bpp.lz"
 ; f8ea4
 
-GFX_f8ea4: ; unused kanji
-INCBIN "gfx/unknown/0f8ea4.2bpp"
+WeekdayKanjiGFX: ; unused kanji
+INCBIN "gfx/font/weekday_kanji.2bpp"
 ; f8f24
 
 OverworldPhoneIconGFX: ; f8f24
@@ -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
deleted file mode 100644
index ff8d2d4fe..000000000
--- a/gfx/font/english.1bpp
+++ /dev/null
diff --git a/gfx/font/english.png b/gfx/font/english.png
new file mode 100644
index 000000000..7119c0691
--- /dev/null
+++ b/gfx/font/english.png
diff --git a/gfx/font/french_german.1bpp b/gfx/font/french_german.1bpp
deleted file mode 100644
index 84d542986..000000000
--- a/gfx/font/french_german.1bpp
+++ /dev/null
diff --git a/gfx/font/french_german.png b/gfx/font/french_german.png
new file mode 100644
index 000000000..4e4545662
--- /dev/null
+++ b/gfx/font/french_german.png
diff --git a/gfx/font/spanish_italian.1bpp b/gfx/font/spanish_italian.1bpp
deleted file mode 100644
index 8f316db4e..000000000
--- a/gfx/font/spanish_italian.1bpp
+++ /dev/null
diff --git a/gfx/font/spanish_italian.png b/gfx/font/spanish_italian.png
new file mode 100644
index 000000000..5663800f1
--- /dev/null
+++ b/gfx/font/spanish_italian.png
diff --git a/gfx/font/weekday_kanji.png b/gfx/font/weekday_kanji.png
new file mode 100644
index 000000000..6eeb69b11
--- /dev/null
+++ b/gfx/font/weekday_kanji.png
diff --git a/gfx/frames/1.1bpp b/gfx/frames/1.1bpp
deleted file mode 100644
index 63005ab72..000000000
--- a/gfx/frames/1.1bpp
+++ /dev/null
diff --git a/gfx/frames/1.png b/gfx/frames/1.png
new file mode 100644
index 000000000..fee7de870
--- /dev/null
+++ b/gfx/frames/1.png
diff --git a/gfx/frames/2.1bpp b/gfx/frames/2.1bpp
deleted file mode 100644
index 4dfe9a949..000000000
--- a/gfx/frames/2.1bpp
+++ /dev/null
diff --git a/gfx/frames/2.png b/gfx/frames/2.png
new file mode 100644
index 000000000..0ed5ebbed
--- /dev/null
+++ b/gfx/frames/2.png
diff --git a/gfx/frames/3.1bpp b/gfx/frames/3.1bpp
deleted file mode 100644
index 9c488c555..000000000
--- a/gfx/frames/3.1bpp
+++ /dev/null
diff --git a/gfx/frames/3.png b/gfx/frames/3.png
new file mode 100644
index 000000000..c3489ca0d
--- /dev/null
+++ b/gfx/frames/3.png
diff --git a/gfx/frames/4.1bpp b/gfx/frames/4.1bpp
deleted file mode 100644
index 01449a04c..000000000
--- a/gfx/frames/4.1bpp
+++ /dev/null
diff --git a/gfx/frames/4.png b/gfx/frames/4.png
new file mode 100644
index 000000000..c2908c75b
--- /dev/null
+++ b/gfx/frames/4.png
diff --git a/gfx/frames/5.1bpp b/gfx/frames/5.1bpp
deleted file mode 100644
index 83651da00..000000000
--- a/gfx/frames/5.1bpp
+++ /dev/null
diff --git a/gfx/frames/5.png b/gfx/frames/5.png
new file mode 100644
index 000000000..f44542aaf
--- /dev/null
+++ b/gfx/frames/5.png
diff --git a/gfx/frames/6.1bpp b/gfx/frames/6.1bpp
deleted file mode 100644
index 032154047..000000000
--- a/gfx/frames/6.1bpp
+++ /dev/null
diff --git a/gfx/frames/6.png b/gfx/frames/6.png
new file mode 100644
index 000000000..3ae386746
--- /dev/null
+++ b/gfx/frames/6.png
diff --git a/gfx/frames/7.1bpp b/gfx/frames/7.1bpp
deleted file mode 100644
index 21793f20a..000000000
--- a/gfx/frames/7.1bpp
+++ /dev/null
diff --git a/gfx/frames/7.png b/gfx/frames/7.png
new file mode 100644
index 000000000..54bdbbecc
--- /dev/null
+++ b/gfx/frames/7.png
diff --git a/gfx/frames/8.1bpp b/gfx/frames/8.1bpp
deleted file mode 100644
index 509bf898a..000000000
--- a/gfx/frames/8.1bpp
+++ /dev/null
diff --git a/gfx/frames/8.png b/gfx/frames/8.png
new file mode 100644
index 000000000..2eab82999
--- /dev/null
+++ b/gfx/frames/8.png
diff --git a/gfx/frames/9.1bpp b/gfx/frames/9.1bpp
deleted file mode 100644
index 9be4865b3..000000000
--- a/gfx/frames/9.1bpp
+++ /dev/null
diff --git a/gfx/frames/9.png b/gfx/frames/9.png
new file mode 100644
index 000000000..a23257365
--- /dev/null
+++ b/gfx/frames/9.png
diff --git a/gfx/frames/map_entry_sign.2bpp b/gfx/frames/map_entry_sign.2bpp
deleted file mode 100644
index a0143875a..000000000
--- a/gfx/frames/map_entry_sign.2bpp
+++ /dev/null
diff --git a/gfx/frames/map_entry_sign.png b/gfx/frames/map_entry_sign.png
new file mode 100644
index 000000000..921013720
--- /dev/null
+++ b/gfx/frames/map_entry_sign.png
diff --git a/gfx/frames/space.2bpp b/gfx/frames/space.2bpp
deleted file mode 100644
index 01d633b27..000000000
--- a/gfx/frames/space.2bpp
+++ /dev/null
diff --git a/gfx/frames/space.png b/gfx/frames/space.png
new file mode 100755
index 000000000..7590b85dd
--- /dev/null
+++ b/gfx/frames/space.png
diff --git a/gfx/fx/aeroblast.2bpp.lz b/gfx/fx/aeroblast.2bpp.lz.2f07c4ea
index 5e203cb63..5e203cb63 100644
--- a/gfx/fx/aeroblast.2bpp.lz
+++ b/gfx/fx/aeroblast.2bpp.lz.2f07c4ea
diff --git a/gfx/fx/aeroblast.png b/gfx/fx/aeroblast.png
new file mode 100644
index 000000000..1fdc07c2f
--- /dev/null
+++ b/gfx/fx/aeroblast.png
diff --git a/gfx/fx/angels.2bpp.lz b/gfx/fx/angels.2bpp.lz.b026d81e
index 61d89d224..61d89d224 100644
--- a/gfx/fx/angels.2bpp.lz
+++ b/gfx/fx/angels.2bpp.lz.b026d81e
diff --git a/gfx/fx/angels.png b/gfx/fx/angels.png
new file mode 100644
index 000000000..ef38c61d2
--- /dev/null
+++ b/gfx/fx/angels.png
diff --git a/gfx/fx/beam.2bpp.lz b/gfx/fx/beam.2bpp.lz.80b6d613
index 1ce9ab82c..1ce9ab82c 100644
--- a/gfx/fx/beam.2bpp.lz
+++ b/gfx/fx/beam.2bpp.lz.80b6d613
diff --git a/gfx/fx/beam.png b/gfx/fx/beam.png
new file mode 100755
index 000000000..32a3b1967
--- /dev/null
+++ b/gfx/fx/beam.png
diff --git a/gfx/fx/bubble.2bpp.lz b/gfx/fx/bubble.2bpp.lz.03b8ac99
index 3d546191a..3d546191a 100644
--- a/gfx/fx/bubble.2bpp.lz
+++ b/gfx/fx/bubble.2bpp.lz.03b8ac99
diff --git a/gfx/fx/bubble.png b/gfx/fx/bubble.png
new file mode 100644
index 000000000..b6febb0a8
--- /dev/null
+++ b/gfx/fx/bubble.png
diff --git a/gfx/fx/charge.2bpp.lz b/gfx/fx/charge.2bpp.lz.95d3ea98
index 32c82243c..32c82243c 100644
--- a/gfx/fx/charge.2bpp.lz
+++ b/gfx/fx/charge.2bpp.lz.95d3ea98
diff --git a/gfx/fx/charge.png b/gfx/fx/charge.png
new file mode 100644
index 000000000..90cb72f9f
--- /dev/null
+++ b/gfx/fx/charge.png
diff --git a/gfx/fx/cut.2bpp.lz b/gfx/fx/cut.2bpp.lz.03d343ed
index 740a48799..740a48799 100644
--- a/gfx/fx/cut.2bpp.lz
+++ b/gfx/fx/cut.2bpp.lz.03d343ed
diff --git a/gfx/fx/cut.png b/gfx/fx/cut.png
new file mode 100644
index 000000000..e227ad413
--- /dev/null
+++ b/gfx/fx/cut.png
diff --git a/gfx/fx/egg.2bpp.lz b/gfx/fx/egg.2bpp.lz.41dd1a53
index fb55f2edc..fb55f2edc 100644
--- a/gfx/fx/egg.2bpp.lz
+++ b/gfx/fx/egg.2bpp.lz.41dd1a53
diff --git a/gfx/fx/egg.png b/gfx/fx/egg.png
new file mode 100644
index 000000000..38aab505d
--- /dev/null
+++ b/gfx/fx/egg.png
diff --git a/gfx/fx/explosion.2bpp.lz b/gfx/fx/explosion.2bpp.lz.55fc334f
index 4303302a1..4303302a1 100644
--- a/gfx/fx/explosion.2bpp.lz
+++ b/gfx/fx/explosion.2bpp.lz.55fc334f
diff --git a/gfx/fx/explosion.png b/gfx/fx/explosion.png
new file mode 100644
index 000000000..0af9f1a0d
--- /dev/null
+++ b/gfx/fx/explosion.png
diff --git a/gfx/fx/fire.2bpp.lz b/gfx/fx/fire.2bpp.lz.d7701cda
index e15e9f9bb..e15e9f9bb 100644
--- a/gfx/fx/fire.2bpp.lz
+++ b/gfx/fx/fire.2bpp.lz.d7701cda
diff --git a/gfx/fx/fire.png b/gfx/fx/fire.png
new file mode 100644
index 000000000..19f01141b
--- /dev/null
+++ b/gfx/fx/fire.png
diff --git a/gfx/fx/flower.2bpp.lz b/gfx/fx/flower.2bpp.lz.1bc2e9d2
index ef628afb4..ef628afb4 100644
--- a/gfx/fx/flower.2bpp.lz
+++ b/gfx/fx/flower.2bpp.lz.1bc2e9d2
diff --git a/gfx/fx/flower.png b/gfx/fx/flower.png
new file mode 100644
index 000000000..61b4f58ce
--- /dev/null
+++ b/gfx/fx/flower.png
diff --git a/gfx/fx/globe.2bpp.lz b/gfx/fx/globe.2bpp.lz.710dbb8e
index 99fa15c6f..99fa15c6f 100644
--- a/gfx/fx/globe.2bpp.lz
+++ b/gfx/fx/globe.2bpp.lz.710dbb8e
diff --git a/gfx/fx/globe.png b/gfx/fx/globe.png
new file mode 100644
index 000000000..8d3a35683
--- /dev/null
+++ b/gfx/fx/globe.png
diff --git a/gfx/fx/haze.2bpp.lz b/gfx/fx/haze.2bpp.lz.91424607
index e0cdc644c..e0cdc644c 100644
--- a/gfx/fx/haze.2bpp.lz
+++ b/gfx/fx/haze.2bpp.lz.91424607
diff --git a/gfx/fx/haze.png b/gfx/fx/haze.png
new file mode 100644
index 000000000..8a870ba98
--- /dev/null
+++ b/gfx/fx/haze.png
diff --git a/gfx/fx/hit.2bpp.lz b/gfx/fx/hit.2bpp.lz.2b3c83f2
index 5d9ffbe5d..5d9ffbe5d 100644
--- a/gfx/fx/hit.2bpp.lz
+++ b/gfx/fx/hit.2bpp.lz.2b3c83f2
diff --git a/gfx/fx/hit.png b/gfx/fx/hit.png
new file mode 100644
index 000000000..228066331
--- /dev/null
+++ b/gfx/fx/hit.png
diff --git a/gfx/fx/horn.2bpp.lz b/gfx/fx/horn.2bpp.lz.48908aae
index a92f74796..a92f74796 100644
--- a/gfx/fx/horn.2bpp.lz
+++ b/gfx/fx/horn.2bpp.lz.48908aae
diff --git a/gfx/fx/horn.png b/gfx/fx/horn.png
new file mode 100644
index 000000000..56e8ca241
--- /dev/null
+++ b/gfx/fx/horn.png
diff --git a/gfx/fx/ice.2bpp.lz b/gfx/fx/ice.2bpp.lz.664d900f
index 3d059700b..3d059700b 100644
--- a/gfx/fx/ice.2bpp.lz
+++ b/gfx/fx/ice.2bpp.lz.664d900f
diff --git a/gfx/fx/ice.png b/gfx/fx/ice.png
new file mode 100644
index 000000000..62a67641e
--- /dev/null
+++ b/gfx/fx/ice.png
diff --git a/gfx/fx/lightning.2bpp.lz b/gfx/fx/lightning.2bpp.lz.a88fc131
index 81de5850f..81de5850f 100644
--- a/gfx/fx/lightning.2bpp.lz
+++ b/gfx/fx/lightning.2bpp.lz.a88fc131
diff --git a/gfx/fx/lightning.png b/gfx/fx/lightning.png
new file mode 100755
index 000000000..6606fad12
--- /dev/null
+++ b/gfx/fx/lightning.png
diff --git a/gfx/fx/misc.2bpp.lz b/gfx/fx/misc.2bpp.lz.4b20c3d7
index d0c5f0dfc..d0c5f0dfc 100644
--- a/gfx/fx/misc.2bpp.lz
+++ b/gfx/fx/misc.2bpp.lz.4b20c3d7
diff --git a/gfx/fx/misc.png b/gfx/fx/misc.png
new file mode 100755
index 000000000..d7e67508e
--- /dev/null
+++ b/gfx/fx/misc.png
diff --git a/gfx/fx/noise.2bpp.lz b/gfx/fx/noise.2bpp.lz.acb4a76e
index e195da453..e195da453 100644
--- a/gfx/fx/noise.2bpp.lz
+++ b/gfx/fx/noise.2bpp.lz.acb4a76e
diff --git a/gfx/fx/noise.png b/gfx/fx/noise.png
new file mode 100755
index 000000000..17540a5e8
--- /dev/null
+++ b/gfx/fx/noise.png
diff --git a/gfx/fx/objects.2bpp.lz b/gfx/fx/objects.2bpp.lz.83f812de
index 1a52d6350..1a52d6350 100644
--- a/gfx/fx/objects.2bpp.lz
+++ b/gfx/fx/objects.2bpp.lz.83f812de
diff --git a/gfx/fx/objects.png b/gfx/fx/objects.png
new file mode 100755
index 000000000..91ea435b8
--- /dev/null
+++ b/gfx/fx/objects.png
diff --git a/gfx/fx/plant.2bpp.lz b/gfx/fx/plant.2bpp.lz.4a00c417
index 589fc48b6..589fc48b6 100644
--- a/gfx/fx/plant.2bpp.lz
+++ b/gfx/fx/plant.2bpp.lz.4a00c417
diff --git a/gfx/fx/plant.png b/gfx/fx/plant.png
new file mode 100644
index 000000000..ec1125054
--- /dev/null
+++ b/gfx/fx/plant.png
diff --git a/gfx/fx/poison.2bpp.lz b/gfx/fx/poison.2bpp.lz.fc7dc9c1
index df2cbe604..df2cbe604 100644
--- a/gfx/fx/poison.2bpp.lz
+++ b/gfx/fx/poison.2bpp.lz.fc7dc9c1
diff --git a/gfx/fx/poison.png b/gfx/fx/poison.png
new file mode 100755
index 000000000..ebbbc52be
--- /dev/null
+++ b/gfx/fx/poison.png
diff --git a/gfx/fx/pokeball.2bpp.lz b/gfx/fx/pokeball.2bpp.lz.c58f7e01
index e09b082db..e09b082db 100644
--- a/gfx/fx/pokeball.2bpp.lz
+++ b/gfx/fx/pokeball.2bpp.lz.c58f7e01
diff --git a/gfx/fx/pokeball.png b/gfx/fx/pokeball.png
new file mode 100755
index 000000000..47edf2190
--- /dev/null
+++ b/gfx/fx/pokeball.png
diff --git a/gfx/fx/powder.2bpp.lz b/gfx/fx/powder.2bpp.lz.bfd566bb
index 375d0bf9c..375d0bf9c 100644
--- a/gfx/fx/powder.2bpp.lz
+++ b/gfx/fx/powder.2bpp.lz.bfd566bb
diff --git a/gfx/fx/powder.png b/gfx/fx/powder.png
new file mode 100644
index 000000000..b2cb4d459
--- /dev/null
+++ b/gfx/fx/powder.png
diff --git a/gfx/fx/psychic.2bpp.lz b/gfx/fx/psychic.2bpp.lz.d80f285c
index d6402dd3d..d6402dd3d 100644
--- a/gfx/fx/psychic.2bpp.lz
+++ b/gfx/fx/psychic.2bpp.lz.d80f285c
diff --git a/gfx/fx/psychic.png b/gfx/fx/psychic.png
new file mode 100644
index 000000000..a6d22db2f
--- /dev/null
+++ b/gfx/fx/psychic.png
diff --git a/gfx/fx/reflect.2bpp.lz b/gfx/fx/reflect.2bpp.lz.9a9c822d
index a563de1a8..a563de1a8 100644
--- a/gfx/fx/reflect.2bpp.lz
+++ b/gfx/fx/reflect.2bpp.lz.9a9c822d
diff --git a/gfx/fx/reflect.png b/gfx/fx/reflect.png
new file mode 100644
index 000000000..48fbd7d0d
--- /dev/null
+++ b/gfx/fx/reflect.png
diff --git a/gfx/fx/rocks.2bpp.lz b/gfx/fx/rocks.2bpp.lz.73d0153e
index d5481ea6e..d5481ea6e 100644
--- a/gfx/fx/rocks.2bpp.lz
+++ b/gfx/fx/rocks.2bpp.lz.73d0153e
diff --git a/gfx/fx/rocks.png b/gfx/fx/rocks.png
new file mode 100755
index 000000000..d7fe76b2f
--- /dev/null
+++ b/gfx/fx/rocks.png
diff --git a/gfx/fx/rope.2bpp.lz b/gfx/fx/rope.2bpp.lz.209d63dd
index f7d6a480f..f7d6a480f 100644
--- a/gfx/fx/rope.2bpp.lz
+++ b/gfx/fx/rope.2bpp.lz.209d63dd
diff --git a/gfx/fx/rope.png b/gfx/fx/rope.png
new file mode 100644
index 000000000..a12553c7a
--- /dev/null
+++ b/gfx/fx/rope.png
diff --git a/gfx/fx/sand.2bpp.lz b/gfx/fx/sand.2bpp.lz.c87c0eaa
index 3508a1f58..3508a1f58 100644
--- a/gfx/fx/sand.2bpp.lz
+++ b/gfx/fx/sand.2bpp.lz.c87c0eaa
diff --git a/gfx/fx/sand.png b/gfx/fx/sand.png
new file mode 100755
index 000000000..a54db235d
--- /dev/null
+++ b/gfx/fx/sand.png
diff --git a/gfx/fx/shapes.2bpp.lz b/gfx/fx/shapes.2bpp.lz.262d77f0
index d7d48020f..d7d48020f 100644
--- a/gfx/fx/shapes.2bpp.lz
+++ b/gfx/fx/shapes.2bpp.lz.262d77f0
diff --git a/gfx/fx/shapes.png b/gfx/fx/shapes.png
new file mode 100644
index 000000000..b99fc601a
--- /dev/null
+++ b/gfx/fx/shapes.png
diff --git a/gfx/fx/shine.2bpp.lz b/gfx/fx/shine.2bpp.lz.5fb79056
index 3e47170b1..3e47170b1 100644
--- a/gfx/fx/shine.2bpp.lz
+++ b/gfx/fx/shine.2bpp.lz.5fb79056
diff --git a/gfx/fx/shine.png b/gfx/fx/shine.png
new file mode 100644
index 000000000..1b7e9834b
--- /dev/null
+++ b/gfx/fx/shine.png
diff --git a/gfx/fx/skyattack.2bpp.lz b/gfx/fx/skyattack.2bpp.lz.31738ab8
index e0412dd81..e0412dd81 100644
--- a/gfx/fx/skyattack.2bpp.lz
+++ b/gfx/fx/skyattack.2bpp.lz.31738ab8
diff --git a/gfx/fx/skyattack.png b/gfx/fx/skyattack.png
new file mode 100644
index 000000000..e731c691c
--- /dev/null
+++ b/gfx/fx/skyattack.png
diff --git a/gfx/fx/smoke.2bpp.lz b/gfx/fx/smoke.2bpp.lz.aa05905e
index bf26fed2b..bf26fed2b 100644
--- a/gfx/fx/smoke.2bpp.lz
+++ b/gfx/fx/smoke.2bpp.lz.aa05905e
diff --git a/gfx/fx/smoke.png b/gfx/fx/smoke.png
new file mode 100644
index 000000000..1b09874ba
--- /dev/null
+++ b/gfx/fx/smoke.png
diff --git a/gfx/fx/speed.2bpp.lz b/gfx/fx/speed.2bpp.lz.1732b364
index 5d09f9a6a..5d09f9a6a 100644
--- a/gfx/fx/speed.2bpp.lz
+++ b/gfx/fx/speed.2bpp.lz.1732b364
diff --git a/gfx/fx/speed.png b/gfx/fx/speed.png
new file mode 100644
index 000000000..e219b38c9
--- /dev/null
+++ b/gfx/fx/speed.png
diff --git a/gfx/fx/status.2bpp.lz b/gfx/fx/status.2bpp.lz.0c0aa13e
index e5ce7df8a..e5ce7df8a 100644
--- a/gfx/fx/status.2bpp.lz
+++ b/gfx/fx/status.2bpp.lz.0c0aa13e
diff --git a/gfx/fx/status.png b/gfx/fx/status.png
new file mode 100644
index 000000000..cb8527963
--- /dev/null
+++ b/gfx/fx/status.png
diff --git a/gfx/fx/water.2bpp.lz b/gfx/fx/water.2bpp.lz.7b52ed12
index 6a81bbb65..6a81bbb65 100644
--- a/gfx/fx/water.2bpp.lz
+++ b/gfx/fx/water.2bpp.lz.7b52ed12
diff --git a/gfx/fx/water.png b/gfx/fx/water.png
new file mode 100644
index 000000000..4e3c3b719
--- /dev/null
+++ b/gfx/fx/water.png
diff --git a/gfx/fx/wave.2bpp.lz b/gfx/fx/wave.2bpp.lz.bee99402
index d94a5cb35..d94a5cb35 100644
--- a/gfx/fx/wave.2bpp.lz
+++ b/gfx/fx/wave.2bpp.lz.bee99402
diff --git a/gfx/fx/wave.png b/gfx/fx/wave.png
new file mode 100644
index 000000000..55d4faa5f
--- /dev/null
+++ b/gfx/fx/wave.png
diff --git a/gfx/fx/web.2bpp.lz b/gfx/fx/web.2bpp.lz.80e3d480
index 84b4018e5..84b4018e5 100644
--- a/gfx/fx/web.2bpp.lz
+++ b/gfx/fx/web.2bpp.lz.80e3d480
diff --git a/gfx/fx/web.png b/gfx/fx/web.png
new file mode 100644
index 000000000..2aeffef0e
--- /dev/null
+++ b/gfx/fx/web.png
diff --git a/gfx/fx/whip.2bpp.lz b/gfx/fx/whip.2bpp.lz.d80d8d6e
index da62ba918..da62ba918 100644
--- a/gfx/fx/whip.2bpp.lz
+++ b/gfx/fx/whip.2bpp.lz.d80d8d6e
diff --git a/gfx/fx/whip.png b/gfx/fx/whip.png
new file mode 100644
index 000000000..92d7ded6f
--- /dev/null
+++ b/gfx/fx/whip.png
diff --git a/gfx/fx/wind.2bpp.lz b/gfx/fx/wind.2bpp.lz.5a785180
index 9c2769b83..9c2769b83 100644
--- a/gfx/fx/wind.2bpp.lz
+++ b/gfx/fx/wind.2bpp.lz.5a785180
diff --git a/gfx/fx/wind.png b/gfx/fx/wind.png
new file mode 100644
index 000000000..b02031392
--- /dev/null
+++ b/gfx/fx/wind.png
diff --git a/gfx/icon/bat.2bpp b/gfx/icon/bat.2bpp
deleted file mode 100644
index 0e5cd7d43..000000000
--- a/gfx/icon/bat.2bpp
+++ /dev/null
diff --git a/gfx/icon/bat.png b/gfx/icon/bat.png
new file mode 100644
index 000000000..3ea2ea832
--- /dev/null
+++ b/gfx/icon/bat.png
diff --git a/gfx/icon/bigmon.2bpp b/gfx/icon/bigmon.2bpp
deleted file mode 100644
index 6883bd80f..000000000
--- a/gfx/icon/bigmon.2bpp
+++ /dev/null
diff --git a/gfx/icon/bigmon.png b/gfx/icon/bigmon.png
new file mode 100644
index 000000000..4a77f1ece
--- /dev/null
+++ b/gfx/icon/bigmon.png
diff --git a/gfx/icon/bird.2bpp b/gfx/icon/bird.2bpp
deleted file mode 100644
index fb1793da5..000000000
--- a/gfx/icon/bird.2bpp
+++ /dev/null
diff --git a/gfx/icon/bird.png b/gfx/icon/bird.png
new file mode 100644
index 000000000..e13bc6cba
--- /dev/null
+++ b/gfx/icon/bird.png
diff --git a/gfx/icon/blob.2bpp b/gfx/icon/blob.2bpp
deleted file mode 100644
index a855f008e..000000000
--- a/gfx/icon/blob.2bpp
+++ /dev/null
diff --git a/gfx/icon/blob.png b/gfx/icon/blob.png
new file mode 100644
index 000000000..aef74ae64
--- /dev/null
+++ b/gfx/icon/blob.png
diff --git a/gfx/icon/bug.2bpp b/gfx/icon/bug.2bpp
deleted file mode 100644
index e57e4c80c..000000000
--- a/gfx/icon/bug.2bpp
+++ /dev/null
diff --git a/gfx/icon/bug.png b/gfx/icon/bug.png
new file mode 100644
index 000000000..97504f721
--- /dev/null
+++ b/gfx/icon/bug.png
diff --git a/gfx/icon/bulbasaur.2bpp b/gfx/icon/bulbasaur.2bpp
deleted file mode 100644
index 56dd284c1..000000000
--- a/gfx/icon/bulbasaur.2bpp
+++ /dev/null
diff --git a/gfx/icon/bulbasaur.png b/gfx/icon/bulbasaur.png
new file mode 100644
index 000000000..1de6636f8
--- /dev/null
+++ b/gfx/icon/bulbasaur.png
diff --git a/gfx/icon/caterpillar.2bpp b/gfx/icon/caterpillar.2bpp
deleted file mode 100644
index 964b6a6ad..000000000
--- a/gfx/icon/caterpillar.2bpp
+++ /dev/null
diff --git a/gfx/icon/caterpillar.png b/gfx/icon/caterpillar.png
new file mode 100644
index 000000000..85558104b
--- /dev/null
+++ b/gfx/icon/caterpillar.png
diff --git a/gfx/icon/charmander.2bpp b/gfx/icon/charmander.2bpp
deleted file mode 100644
index 4e2182636..000000000
--- a/gfx/icon/charmander.2bpp
+++ /dev/null
diff --git a/gfx/icon/charmander.png b/gfx/icon/charmander.png
new file mode 100644
index 000000000..3d85f1316
--- /dev/null
+++ b/gfx/icon/charmander.png
diff --git a/gfx/icon/clefairy.2bpp b/gfx/icon/clefairy.2bpp
deleted file mode 100644
index 6a5aed325..000000000
--- a/gfx/icon/clefairy.2bpp
+++ /dev/null
diff --git a/gfx/icon/clefairy.png b/gfx/icon/clefairy.png
new file mode 100644
index 000000000..0017d9ddb
--- /dev/null
+++ b/gfx/icon/clefairy.png
diff --git a/gfx/icon/diglett.2bpp b/gfx/icon/diglett.2bpp
deleted file mode 100644
index 6a997c1cb..000000000
--- a/gfx/icon/diglett.2bpp
+++ /dev/null
diff --git a/gfx/icon/diglett.png b/gfx/icon/diglett.png
new file mode 100644
index 000000000..307181f71
--- /dev/null
+++ b/gfx/icon/diglett.png
diff --git a/gfx/icon/egg.2bpp b/gfx/icon/egg.2bpp
deleted file mode 100644
index 03a623777..000000000
--- a/gfx/icon/egg.2bpp
+++ /dev/null
diff --git a/gfx/icon/egg.png b/gfx/icon/egg.png
new file mode 100644
index 000000000..129346fd9
--- /dev/null
+++ b/gfx/icon/egg.png
diff --git a/gfx/icon/equine.2bpp b/gfx/icon/equine.2bpp
deleted file mode 100644
index 8853b5bdd..000000000
--- a/gfx/icon/equine.2bpp
+++ /dev/null
diff --git a/gfx/icon/equine.png b/gfx/icon/equine.png
new file mode 100644
index 000000000..b3da7181b
--- /dev/null
+++ b/gfx/icon/equine.png
diff --git a/gfx/icon/fighter.2bpp b/gfx/icon/fighter.2bpp
deleted file mode 100644
index 671b7e8af..000000000
--- a/gfx/icon/fighter.2bpp
+++ /dev/null
diff --git a/gfx/icon/fighter.png b/gfx/icon/fighter.png
new file mode 100644
index 000000000..9deab976f
--- /dev/null
+++ b/gfx/icon/fighter.png
diff --git a/gfx/icon/fish.2bpp b/gfx/icon/fish.2bpp
deleted file mode 100644
index e99315b52..000000000
--- a/gfx/icon/fish.2bpp
+++ /dev/null
diff --git a/gfx/icon/fish.png b/gfx/icon/fish.png
new file mode 100644
index 000000000..35dbb1d2f
--- /dev/null
+++ b/gfx/icon/fish.png
diff --git a/gfx/icon/fox.2bpp b/gfx/icon/fox.2bpp
deleted file mode 100644
index bbe04c03d..000000000
--- a/gfx/icon/fox.2bpp
+++ /dev/null
diff --git a/gfx/icon/fox.png b/gfx/icon/fox.png
new file mode 100644
index 000000000..0419c87c7
--- /dev/null
+++ b/gfx/icon/fox.png
diff --git a/gfx/icon/geodude.2bpp b/gfx/icon/geodude.2bpp
deleted file mode 100644
index ff8bdfdeb..000000000
--- a/gfx/icon/geodude.2bpp
+++ /dev/null
diff --git a/gfx/icon/geodude.png b/gfx/icon/geodude.png
new file mode 100644
index 000000000..02db8771d
--- /dev/null
+++ b/gfx/icon/geodude.png
diff --git a/gfx/icon/ghost.2bpp b/gfx/icon/ghost.2bpp
deleted file mode 100644
index d47e8b62c..000000000
--- a/gfx/icon/ghost.2bpp
+++ /dev/null
diff --git a/gfx/icon/ghost.png b/gfx/icon/ghost.png
new file mode 100644
index 000000000..7ecf8ed0f
--- /dev/null
+++ b/gfx/icon/ghost.png
diff --git a/gfx/icon/gyarados.2bpp b/gfx/icon/gyarados.2bpp
deleted file mode 100644
index ffe536ad0..000000000
--- a/gfx/icon/gyarados.2bpp
+++ /dev/null
diff --git a/gfx/icon/gyarados.png b/gfx/icon/gyarados.png
new file mode 100644
index 000000000..fad5d8ae3
--- /dev/null
+++ b/gfx/icon/gyarados.png
diff --git a/gfx/icon/ho_oh.2bpp b/gfx/icon/ho_oh.2bpp
deleted file mode 100644
index db4277a31..000000000
--- a/gfx/icon/ho_oh.2bpp
+++ /dev/null
diff --git a/gfx/icon/ho_oh.png b/gfx/icon/ho_oh.png
new file mode 100644
index 000000000..6ee91781e
--- /dev/null
+++ b/gfx/icon/ho_oh.png
diff --git a/gfx/icon/humanshape.2bpp b/gfx/icon/humanshape.2bpp
deleted file mode 100644
index 4dbbac0c8..000000000
--- a/gfx/icon/humanshape.2bpp
+++ /dev/null
diff --git a/gfx/icon/humanshape.png b/gfx/icon/humanshape.png
new file mode 100644
index 000000000..f5d0b9290
--- /dev/null
+++ b/gfx/icon/humanshape.png
diff --git a/gfx/icon/item.2bpp b/gfx/icon/item.2bpp
deleted file mode 100644
index 5d47aba7a..000000000
--- a/gfx/icon/item.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-���������������
\ No newline at end of file
diff --git a/gfx/icon/item.png b/gfx/icon/item.png
new file mode 100644
index 000000000..a47d55009
--- /dev/null
+++ b/gfx/icon/item.png
diff --git a/gfx/icon/jellyfish.2bpp b/gfx/icon/jellyfish.2bpp
deleted file mode 100644
index cfda6ecca..000000000
--- a/gfx/icon/jellyfish.2bpp
+++ /dev/null
diff --git a/gfx/icon/jellyfish.png b/gfx/icon/jellyfish.png
new file mode 100644
index 000000000..8583d5cdc
--- /dev/null
+++ b/gfx/icon/jellyfish.png
diff --git a/gfx/icon/jigglypuff.2bpp b/gfx/icon/jigglypuff.2bpp
deleted file mode 100644
index bc00c535d..000000000
--- a/gfx/icon/jigglypuff.2bpp
+++ /dev/null
diff --git a/gfx/icon/jigglypuff.png b/gfx/icon/jigglypuff.png
new file mode 100644
index 000000000..70f87b0df
--- /dev/null
+++ b/gfx/icon/jigglypuff.png
diff --git a/gfx/icon/lapras.2bpp b/gfx/icon/lapras.2bpp
deleted file mode 100644
index 47684bae3..000000000
--- a/gfx/icon/lapras.2bpp
+++ /dev/null
diff --git a/gfx/icon/lapras.png b/gfx/icon/lapras.png
new file mode 100644
index 000000000..89ad063d0
--- /dev/null
+++ b/gfx/icon/lapras.png
diff --git a/gfx/icon/lugia.2bpp b/gfx/icon/lugia.2bpp
deleted file mode 100644
index fc1467546..000000000
--- a/gfx/icon/lugia.2bpp
+++ /dev/null
diff --git a/gfx/icon/lugia.png b/gfx/icon/lugia.png
new file mode 100644
index 000000000..56dbf283b
--- /dev/null
+++ b/gfx/icon/lugia.png
diff --git a/gfx/icon/mail.2bpp b/gfx/icon/mail.2bpp
deleted file mode 100644
index a04f4eff8..000000000
--- a/gfx/icon/mail.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-����������������
\ No newline at end of file
diff --git a/gfx/icon/mail.png b/gfx/icon/mail.png
new file mode 100644
index 000000000..53db461e5
--- /dev/null
+++ b/gfx/icon/mail.png
diff --git a/gfx/icon/mail2.2bpp b/gfx/icon/mail2.2bpp
deleted file mode 100644
index 188926899..000000000
--- a/gfx/icon/mail2.2bpp
+++ /dev/null
diff --git a/gfx/icon/mail2.png b/gfx/icon/mail2.png
new file mode 100644
index 000000000..7ad25edbf
--- /dev/null
+++ b/gfx/icon/mail2.png
diff --git a/gfx/icon/monster.2bpp b/gfx/icon/monster.2bpp
deleted file mode 100644
index ce8863cd4..000000000
--- a/gfx/icon/monster.2bpp
+++ /dev/null
diff --git a/gfx/icon/monster.png b/gfx/icon/monster.png
new file mode 100644
index 000000000..f97c67b64
--- /dev/null
+++ b/gfx/icon/monster.png
diff --git a/gfx/icon/moth.2bpp b/gfx/icon/moth.2bpp
deleted file mode 100644
index 96d5d42f1..000000000
--- a/gfx/icon/moth.2bpp
+++ /dev/null
diff --git a/gfx/icon/moth.png b/gfx/icon/moth.png
new file mode 100644
index 000000000..f44440f5c
--- /dev/null
+++ b/gfx/icon/moth.png
diff --git a/gfx/icon/oddish.2bpp b/gfx/icon/oddish.2bpp
deleted file mode 100644
index c9c7665ed..000000000
--- a/gfx/icon/oddish.2bpp
+++ /dev/null
diff --git a/gfx/icon/oddish.png b/gfx/icon/oddish.png
new file mode 100644
index 000000000..c069bd444
--- /dev/null
+++ b/gfx/icon/oddish.png
diff --git a/gfx/icon/pikachu.2bpp b/gfx/icon/pikachu.2bpp
deleted file mode 100644
index ec73af114..000000000
--- a/gfx/icon/pikachu.2bpp
+++ /dev/null
diff --git a/gfx/icon/pikachu.png b/gfx/icon/pikachu.png
new file mode 100644
index 000000000..7b7d23dbd
--- /dev/null
+++ b/gfx/icon/pikachu.png
diff --git a/gfx/icon/poliwag.2bpp b/gfx/icon/poliwag.2bpp
deleted file mode 100644
index 3d3da6748..000000000
--- a/gfx/icon/poliwag.2bpp
+++ /dev/null
diff --git a/gfx/icon/poliwag.png b/gfx/icon/poliwag.png
new file mode 100644
index 000000000..b6b63a81e
--- /dev/null
+++ b/gfx/icon/poliwag.png
diff --git a/gfx/icon/serpent.2bpp b/gfx/icon/serpent.2bpp
deleted file mode 100644
index 4be1a62aa..000000000
--- a/gfx/icon/serpent.2bpp
+++ /dev/null
diff --git a/gfx/icon/serpent.png b/gfx/icon/serpent.png
new file mode 100644
index 000000000..de575f088
--- /dev/null
+++ b/gfx/icon/serpent.png
diff --git a/gfx/icon/shell.2bpp b/gfx/icon/shell.2bpp
deleted file mode 100644
index 9e9dd787c..000000000
--- a/gfx/icon/shell.2bpp
+++ /dev/null
diff --git a/gfx/icon/shell.png b/gfx/icon/shell.png
new file mode 100644
index 000000000..4daf27634
--- /dev/null
+++ b/gfx/icon/shell.png
diff --git a/gfx/icon/slowpoke.2bpp b/gfx/icon/slowpoke.2bpp
deleted file mode 100644
index 045980e57..000000000
--- a/gfx/icon/slowpoke.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-88GP|c<+<#@O88���|�x�x����?  ? ?���������pp#?(?>1? ?'��
-�>�<�<���� ? ?���������pp
\ No newline at end of file
diff --git a/gfx/icon/slowpoke.png b/gfx/icon/slowpoke.png
new file mode 100644
index 000000000..221f3f7a5
--- /dev/null
+++ b/gfx/icon/slowpoke.png
diff --git a/gfx/icon/snorlax.2bpp b/gfx/icon/snorlax.2bpp
deleted file mode 100644
index 1adb5c848..000000000
--- a/gfx/icon/snorlax.2bpp
+++ /dev/null
diff --git a/gfx/icon/snorlax.png b/gfx/icon/snorlax.png
new file mode 100644
index 000000000..f2c1b0b74
--- /dev/null
+++ b/gfx/icon/snorlax.png
diff --git a/gfx/icon/squirtle.2bpp b/gfx/icon/squirtle.2bpp
deleted file mode 100644
index b6558faa5..000000000
--- a/gfx/icon/squirtle.2bpp
+++ /dev/null
diff --git a/gfx/icon/squirtle.png b/gfx/icon/squirtle.png
new file mode 100644
index 000000000..614aa21b2
--- /dev/null
+++ b/gfx/icon/squirtle.png
diff --git a/gfx/icon/staryu.2bpp b/gfx/icon/staryu.2bpp
deleted file mode 100644
index 890cfe20b..000000000
--- a/gfx/icon/staryu.2bpp
+++ /dev/null
diff --git a/gfx/icon/staryu.png b/gfx/icon/staryu.png
new file mode 100644
index 000000000..52361c780
--- /dev/null
+++ b/gfx/icon/staryu.png
diff --git a/gfx/icon/sudowoodo.2bpp b/gfx/icon/sudowoodo.2bpp
deleted file mode 100644
index 1c9390935..000000000
--- a/gfx/icon/sudowoodo.2bpp
+++ /dev/null
diff --git a/gfx/icon/sudowoodo.png b/gfx/icon/sudowoodo.png
new file mode 100644
index 000000000..d115356bb
--- /dev/null
+++ b/gfx/icon/sudowoodo.png
diff --git a/gfx/icon/unown.2bpp b/gfx/icon/unown.2bpp
deleted file mode 100644
index b1cddd8be..000000000
--- a/gfx/icon/unown.2bpp
+++ /dev/null
diff --git a/gfx/icon/unown.png b/gfx/icon/unown.png
new file mode 100644
index 000000000..0a4d0e426
--- /dev/null
+++ b/gfx/icon/unown.png
diff --git a/gfx/icon/voltorb.2bpp b/gfx/icon/voltorb.2bpp
deleted file mode 100644
index b75cafe3d..000000000
--- a/gfx/icon/voltorb.2bpp
+++ /dev/null
diff --git a/gfx/icon/voltorb.png b/gfx/icon/voltorb.png
new file mode 100644
index 000000000..ef289541a
--- /dev/null
+++ b/gfx/icon/voltorb.png
diff --git a/gfx/intro/001.tilemap b/gfx/intro/001.tilemap
new file mode 100644
index 000000000..8b1b66033
--- /dev/null
+++ b/gfx/intro/001.tilemap
diff --git a/gfx/intro/001.tilemap.lz b/gfx/intro/001.tilemap.lz.c2341875
index 926fb6e8e..926fb6e8e 100644
--- a/gfx/intro/001.tilemap.lz
+++ b/gfx/intro/001.tilemap.lz.c2341875
diff --git a/gfx/intro/002.tilemap b/gfx/intro/002.tilemap
new file mode 100644
index 000000000..6a035d14a
--- /dev/null
+++ b/gfx/intro/002.tilemap
diff --git a/gfx/intro/002.tilemap.lz b/gfx/intro/002.tilemap.lz.54d5b74b
index c63f215f2..c63f215f2 100644
--- a/gfx/intro/002.tilemap.lz
+++ b/gfx/intro/002.tilemap.lz.54d5b74b
diff --git a/gfx/intro/003.tilemap b/gfx/intro/003.tilemap
new file mode 100644
index 000000000..98512513c
--- /dev/null
+++ b/gfx/intro/003.tilemap
diff --git a/gfx/intro/003.tilemap.lz b/gfx/intro/003.tilemap.lz.9f90366a
index 182ffb130..182ffb130 100644
--- a/gfx/intro/003.tilemap.lz
+++ b/gfx/intro/003.tilemap.lz.9f90366a
diff --git a/gfx/intro/004.tilemap b/gfx/intro/004.tilemap
new file mode 100644
index 000000000..2dd6b6ea7
--- /dev/null
+++ b/gfx/intro/004.tilemap
diff --git a/gfx/intro/004.tilemap.lz b/gfx/intro/004.tilemap.lz.4c7562ee
index 5897d176b..5897d176b 100644
--- a/gfx/intro/004.tilemap.lz
+++ b/gfx/intro/004.tilemap.lz.4c7562ee
diff --git a/gfx/intro/005.tilemap b/gfx/intro/005.tilemap
new file mode 100644
index 000000000..3f7d23b64
--- /dev/null
+++ b/gfx/intro/005.tilemap
diff --git a/gfx/intro/005.tilemap.lz b/gfx/intro/005.tilemap.lz.bed1ff6d
index 0ae96b7f7..0ae96b7f7 100644
--- a/gfx/intro/005.tilemap.lz
+++ b/gfx/intro/005.tilemap.lz.bed1ff6d
diff --git a/gfx/intro/006.tilemap b/gfx/intro/006.tilemap
new file mode 100644
index 000000000..4af27a158
--- /dev/null
+++ b/gfx/intro/006.tilemap
diff --git a/gfx/intro/006.tilemap.lz b/gfx/intro/006.tilemap.lz.c8756972
index 46436b607..46436b607 100644
--- a/gfx/intro/006.tilemap.lz
+++ b/gfx/intro/006.tilemap.lz.c8756972
diff --git a/gfx/intro/007.tilemap b/gfx/intro/007.tilemap
new file mode 100644
index 000000000..2e3fdb41a
--- /dev/null
+++ b/gfx/intro/007.tilemap
diff --git a/gfx/intro/007.tilemap.lz b/gfx/intro/007.tilemap.lz.a9cbcbca
index d1694ed3e..d1694ed3e 100644
--- a/gfx/intro/007.tilemap.lz
+++ b/gfx/intro/007.tilemap.lz.a9cbcbca
diff --git a/gfx/intro/008.tilemap b/gfx/intro/008.tilemap
new file mode 100644
index 000000000..903f59ae5
--- /dev/null
+++ b/gfx/intro/008.tilemap
diff --git a/gfx/intro/008.tilemap.lz b/gfx/intro/008.tilemap.lz.f12ed6d9
index 356c6d5e8..356c6d5e8 100644
--- a/gfx/intro/008.tilemap.lz
+++ b/gfx/intro/008.tilemap.lz.f12ed6d9
diff --git a/gfx/intro/009.tilemap b/gfx/intro/009.tilemap
new file mode 100644
index 000000000..554e919a8
--- /dev/null
+++ b/gfx/intro/009.tilemap
diff --git a/gfx/intro/009.tilemap.lz b/gfx/intro/009.tilemap.lz.911a1ace
index 238d6a60e..238d6a60e 100644
--- a/gfx/intro/009.tilemap.lz
+++ b/gfx/intro/009.tilemap.lz.911a1ace
diff --git a/gfx/intro/010.tilemap b/gfx/intro/010.tilemap
new file mode 100644
index 000000000..4ddef19c7
--- /dev/null
+++ b/gfx/intro/010.tilemap
diff --git a/gfx/intro/010.tilemap.lz b/gfx/intro/010.tilemap.lz.2717d106
index 6e45c45f7..6e45c45f7 100644
--- a/gfx/intro/010.tilemap.lz
+++ b/gfx/intro/010.tilemap.lz.2717d106
diff --git a/gfx/intro/011.tilemap b/gfx/intro/011.tilemap
new file mode 100644
index 000000000..59f365a34
--- /dev/null
+++ b/gfx/intro/011.tilemap
diff --git a/gfx/intro/011.tilemap.lz b/gfx/intro/011.tilemap.lz.bb066632
index 68ceb19f8..68ceb19f8 100644
--- a/gfx/intro/011.tilemap.lz
+++ b/gfx/intro/011.tilemap.lz.bb066632
diff --git a/gfx/intro/012.tilemap b/gfx/intro/012.tilemap
new file mode 100644
index 000000000..3577fc467
--- /dev/null
+++ b/gfx/intro/012.tilemap
diff --git a/gfx/intro/012.tilemap.lz b/gfx/intro/012.tilemap.lz.bc182264
index 0d6af294c..0d6af294c 100644
--- a/gfx/intro/012.tilemap.lz
+++ b/gfx/intro/012.tilemap.lz.bc182264
diff --git a/gfx/intro/013.tilemap b/gfx/intro/013.tilemap
new file mode 100644
index 000000000..28e27ad62
--- /dev/null
+++ b/gfx/intro/013.tilemap
diff --git a/gfx/intro/013.tilemap.lz b/gfx/intro/013.tilemap.lz.18e3115f
index 91635527c..91635527c 100644
--- a/gfx/intro/013.tilemap.lz
+++ b/gfx/intro/013.tilemap.lz.18e3115f
diff --git a/gfx/intro/014.tilemap b/gfx/intro/014.tilemap
new file mode 100644
index 000000000..52829cc74
--- /dev/null
+++ b/gfx/intro/014.tilemap
diff --git a/gfx/intro/014.tilemap.lz b/gfx/intro/014.tilemap.lz.7b59259d
index a892ab1b4..a892ab1b4 100644
--- a/gfx/intro/014.tilemap.lz
+++ b/gfx/intro/014.tilemap.lz.7b59259d
diff --git a/gfx/intro/015.tilemap b/gfx/intro/015.tilemap
new file mode 100644
index 000000000..f97c9cb93
--- /dev/null
+++ b/gfx/intro/015.tilemap
diff --git a/gfx/intro/015.tilemap.lz b/gfx/intro/015.tilemap.lz.1bfc5a89
index 22a4cc926..22a4cc926 100644
--- a/gfx/intro/015.tilemap.lz
+++ b/gfx/intro/015.tilemap.lz.1bfc5a89
diff --git a/gfx/intro/017.tilemap b/gfx/intro/017.tilemap
new file mode 100644
index 000000000..05c37dbf2
--- /dev/null
+++ b/gfx/intro/017.tilemap
diff --git a/gfx/intro/017.tilemap.lz b/gfx/intro/017.tilemap.lz.e4772015
index 90ce59e58..90ce59e58 100644
--- a/gfx/intro/017.tilemap.lz
+++ b/gfx/intro/017.tilemap.lz.e4772015
diff --git a/gfx/intro/background.2bpp.lz b/gfx/intro/background.2bpp.lz.b58b3984
index 1ef2f1203..1ef2f1203 100644
--- a/gfx/intro/background.2bpp.lz
+++ b/gfx/intro/background.2bpp.lz.b58b3984
diff --git a/gfx/intro/background.png b/gfx/intro/background.png
new file mode 100644
index 000000000..ede95e46b
--- /dev/null
+++ b/gfx/intro/background.png
diff --git a/gfx/intro/crystal_unowns.2bpp.lz b/gfx/intro/crystal_unowns.2bpp.lz.e7f8ad51
index 2585d9c52..2585d9c52 100644
--- a/gfx/intro/crystal_unowns.2bpp.lz
+++ b/gfx/intro/crystal_unowns.2bpp.lz.e7f8ad51
diff --git a/gfx/intro/crystal_unowns.png b/gfx/intro/crystal_unowns.png
new file mode 100644
index 000000000..130606b85
--- /dev/null
+++ b/gfx/intro/crystal_unowns.png
diff --git a/gfx/intro/gender_screen.2bpp b/gfx/intro/gender_screen.2bpp
deleted file mode 100644
index 5cc990f1d..000000000
--- a/gfx/intro/gender_screen.2bpp
+++ /dev/null
diff --git a/gfx/intro/gender_screen.png b/gfx/intro/gender_screen.png
new file mode 100644
index 000000000..726178132
--- /dev/null
+++ b/gfx/intro/gender_screen.png
diff --git a/gfx/intro/grass1.2bpp b/gfx/intro/grass1.2bpp
deleted file mode 100644
index 7e371f23e..000000000
--- a/gfx/intro/grass1.2bpp
+++ /dev/null
diff --git a/gfx/intro/grass1.png b/gfx/intro/grass1.png
new file mode 100644
index 000000000..59c5f5f62
--- /dev/null
+++ b/gfx/intro/grass1.png
diff --git a/gfx/intro/grass2.2bpp b/gfx/intro/grass2.2bpp
deleted file mode 100644
index 3068eb080..000000000
--- a/gfx/intro/grass2.2bpp
+++ /dev/null
diff --git a/gfx/intro/grass2.png b/gfx/intro/grass2.png
new file mode 100644
index 000000000..49f5eabf6
--- /dev/null
+++ b/gfx/intro/grass2.png
diff --git a/gfx/intro/grass3.2bpp b/gfx/intro/grass3.2bpp
deleted file mode 100644
index 47f3330d8..000000000
--- a/gfx/intro/grass3.2bpp
+++ /dev/null
diff --git a/gfx/intro/grass3.png b/gfx/intro/grass3.png
new file mode 100644
index 000000000..2bfd2b673
--- /dev/null
+++ b/gfx/intro/grass3.png
diff --git a/gfx/intro/grass4.2bpp b/gfx/intro/grass4.2bpp
deleted file mode 100644
index 4f2b4cdfd..000000000
--- a/gfx/intro/grass4.2bpp
+++ /dev/null
diff --git a/gfx/intro/grass4.png b/gfx/intro/grass4.png
new file mode 100644
index 000000000..115d61f38
--- /dev/null
+++ b/gfx/intro/grass4.png
diff --git a/gfx/intro/logo.2bpp.lz b/gfx/intro/logo.2bpp.lz.e03ee257
index 5beb0e6ef..5beb0e6ef 100644
--- a/gfx/intro/logo.2bpp.lz
+++ b/gfx/intro/logo.2bpp.lz.e03ee257
diff --git a/gfx/intro/logo.png b/gfx/intro/logo.png
new file mode 100644
index 000000000..0ed4094cf
--- /dev/null
+++ b/gfx/intro/logo.png
diff --git a/gfx/intro/pichu_wooper.2bpp.lz b/gfx/intro/pichu_wooper.2bpp.lz.4bccf7f4
index 90174a098..90174a098 100644
--- a/gfx/intro/pichu_wooper.2bpp.lz
+++ b/gfx/intro/pichu_wooper.2bpp.lz.4bccf7f4
diff --git a/gfx/intro/pichu_wooper.png b/gfx/intro/pichu_wooper.png
new file mode 100644
index 000000000..923e70b83
--- /dev/null
+++ b/gfx/intro/pichu_wooper.png
diff --git a/gfx/intro/pulse.2bpp.lz b/gfx/intro/pulse.2bpp.lz.9fb06bb6
index 5a7fec1a9..5a7fec1a9 100644
--- a/gfx/intro/pulse.2bpp.lz
+++ b/gfx/intro/pulse.2bpp.lz.9fb06bb6
diff --git a/gfx/intro/pulse.png b/gfx/intro/pulse.png
new file mode 100644
index 000000000..85bad3415
--- /dev/null
+++ b/gfx/intro/pulse.png
diff --git a/gfx/intro/suicune_back.2bpp.lz b/gfx/intro/suicune_back.2bpp.lz.c6f529b0
index 470d78b5b..470d78b5b 100644
--- a/gfx/intro/suicune_back.2bpp.lz
+++ b/gfx/intro/suicune_back.2bpp.lz.c6f529b0
diff --git a/gfx/intro/suicune_back.png b/gfx/intro/suicune_back.png
new file mode 100644
index 000000000..0e791e2a7
--- /dev/null
+++ b/gfx/intro/suicune_back.png
diff --git a/gfx/intro/suicune_close.2bpp.lz b/gfx/intro/suicune_close.2bpp.lz.7e362923
index 19b806269..19b806269 100644
--- a/gfx/intro/suicune_close.2bpp.lz
+++ b/gfx/intro/suicune_close.2bpp.lz.7e362923
diff --git a/gfx/intro/suicune_close.png b/gfx/intro/suicune_close.png
new file mode 100644
index 000000000..ef365de96
--- /dev/null
+++ b/gfx/intro/suicune_close.png
diff --git a/gfx/intro/suicune_jump.2bpp.lz b/gfx/intro/suicune_jump.2bpp.lz.1b09fb64
index b34a0c765..b34a0c765 100644
--- a/gfx/intro/suicune_jump.2bpp.lz
+++ b/gfx/intro/suicune_jump.2bpp.lz.1b09fb64
diff --git a/gfx/intro/suicune_jump.png b/gfx/intro/suicune_jump.png
new file mode 100644
index 000000000..67cd7502a
--- /dev/null
+++ b/gfx/intro/suicune_jump.png
diff --git a/gfx/intro/suicune_run.2bpp.lz b/gfx/intro/suicune_run.2bpp.lz.ef999ad2
index f48162258..f48162258 100644
--- a/gfx/intro/suicune_run.2bpp.lz
+++ b/gfx/intro/suicune_run.2bpp.lz.ef999ad2
diff --git a/gfx/intro/suicune_run.png b/gfx/intro/suicune_run.png
new file mode 100644
index 000000000..470ff0c0b
--- /dev/null
+++ b/gfx/intro/suicune_run.png
diff --git a/gfx/intro/unown_back.2bpp.lz b/gfx/intro/unown_back.2bpp.lz.740c4d28
index 21cae2927..21cae2927 100644
--- a/gfx/intro/unown_back.2bpp.lz
+++ b/gfx/intro/unown_back.2bpp.lz.740c4d28
diff --git a/gfx/intro/unown_back.png b/gfx/intro/unown_back.png
new file mode 100644
index 000000000..4d355a607
--- /dev/null
+++ b/gfx/intro/unown_back.png
diff --git a/gfx/intro/unowns.2bpp.lz b/gfx/intro/unowns.2bpp.lz.3a1f185e
index 67e90b0b6..67e90b0b6 100644
--- a/gfx/intro/unowns.2bpp.lz
+++ b/gfx/intro/unowns.2bpp.lz.3a1f185e
diff --git a/gfx/intro/unowns.png b/gfx/intro/unowns.png
new file mode 100644
index 000000000..d4c7998b4
--- /dev/null
+++ b/gfx/intro/unowns.png
diff --git a/gfx/mail.asm b/gfx/mail.asm
index 575fe9ef5..d4fde366e 100755
--- 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
deleted file mode 100644
index 07411676c..000000000
--- a/gfx/mail/0b9926.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9926.png b/gfx/mail/0b9926.png
new file mode 100644
index 000000000..8a280b399
--- /dev/null
+++ b/gfx/mail/0b9926.png
diff --git a/gfx/mail/0b992e.1bpp b/gfx/mail/0b992e.1bpp
deleted file mode 100644
index 4efb35675..000000000
--- a/gfx/mail/0b992e.1bpp
+++ /dev/null
@@ -1 +0,0 @@
-�HLm}��
\ No newline at end of file
diff --git a/gfx/mail/0b992e.png b/gfx/mail/0b992e.png
new file mode 100644
index 000000000..7e1f17619
--- /dev/null
+++ b/gfx/mail/0b992e.png
diff --git a/gfx/mail/0b9936.1bpp b/gfx/mail/0b9936.1bpp
deleted file mode 100644
index 3db4de269..000000000
--- a/gfx/mail/0b9936.1bpp
+++ /dev/null
@@ -1 +0,0 @@
-<~���~<
\ No newline at end of file
diff --git a/gfx/mail/0b9936.png b/gfx/mail/0b9936.png
new file mode 100644
index 000000000..666c59813
--- /dev/null
+++ b/gfx/mail/0b9936.png
diff --git a/gfx/mail/0b993e.1bpp b/gfx/mail/0b993e.1bpp
deleted file mode 100644
index 28cda20bf..000000000
--- a/gfx/mail/0b993e.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b993e.png b/gfx/mail/0b993e.png
new file mode 100644
index 000000000..0fc395ef8
--- /dev/null
+++ b/gfx/mail/0b993e.png
diff --git a/gfx/mail/0b9946.1bpp b/gfx/mail/0b9946.1bpp
deleted file mode 100644
index 4352e1061..000000000
--- a/gfx/mail/0b9946.1bpp
+++ /dev/null
@@ -1 +0,0 @@
-p�`
\ No newline at end of file
diff --git a/gfx/mail/0b9946.png b/gfx/mail/0b9946.png
new file mode 100644
index 000000000..cc95134f6
--- /dev/null
+++ b/gfx/mail/0b9946.png
diff --git a/gfx/mail/0b994e.1bpp b/gfx/mail/0b994e.1bpp
deleted file mode 100644
index 88ddd73f9..000000000
--- a/gfx/mail/0b994e.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b994e.png b/gfx/mail/0b994e.png
new file mode 100644
index 000000000..2f8d140c4
--- /dev/null
+++ b/gfx/mail/0b994e.png
diff --git a/gfx/mail/0b995e.1bpp b/gfx/mail/0b995e.1bpp
deleted file mode 100644
index af75f645a..000000000
--- a/gfx/mail/0b995e.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b995e.png b/gfx/mail/0b995e.png
new file mode 100644
index 000000000..6c32516ed
--- /dev/null
+++ b/gfx/mail/0b995e.png
diff --git a/gfx/mail/0b9966.1bpp b/gfx/mail/0b9966.1bpp
deleted file mode 100644
index bbf05317b..000000000
--- a/gfx/mail/0b9966.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9966.png b/gfx/mail/0b9966.png
new file mode 100644
index 000000000..211848bff
--- /dev/null
+++ b/gfx/mail/0b9966.png
diff --git a/gfx/mail/0b996e.1bpp b/gfx/mail/0b996e.1bpp
deleted file mode 100644
index 266c91964..000000000
--- a/gfx/mail/0b996e.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b996e.png b/gfx/mail/0b996e.png
new file mode 100644
index 000000000..51a61a19d
--- /dev/null
+++ b/gfx/mail/0b996e.png
diff --git a/gfx/mail/0b9976.1bpp b/gfx/mail/0b9976.1bpp
deleted file mode 100644
index 1c2e21946..000000000
--- a/gfx/mail/0b9976.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9976.png b/gfx/mail/0b9976.png
new file mode 100644
index 000000000..f5d98bf9d
--- /dev/null
+++ b/gfx/mail/0b9976.png
diff --git a/gfx/mail/0b997e.1bpp b/gfx/mail/0b997e.1bpp
deleted file mode 100644
index 4957ff4c2..000000000
--- a/gfx/mail/0b997e.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b997e.png b/gfx/mail/0b997e.png
new file mode 100644
index 000000000..83c029e90
--- /dev/null
+++ b/gfx/mail/0b997e.png
diff --git a/gfx/mail/0b998e.1bpp b/gfx/mail/0b998e.1bpp
deleted file mode 100644
index 8d6a0e319..000000000
--- a/gfx/mail/0b998e.1bpp
+++ /dev/null
@@ -1 +0,0 @@
-<~����~<
\ No newline at end of file
diff --git a/gfx/mail/0b998e.png b/gfx/mail/0b998e.png
new file mode 100644
index 000000000..b34ffce17
--- /dev/null
+++ b/gfx/mail/0b998e.png
diff --git a/gfx/mail/0b9996.1bpp b/gfx/mail/0b9996.1bpp
deleted file mode 100644
index 62814ccbb..000000000
--- a/gfx/mail/0b9996.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9996.png b/gfx/mail/0b9996.png
new file mode 100644
index 000000000..ef4c1ebeb
--- /dev/null
+++ b/gfx/mail/0b9996.png
diff --git a/gfx/mail/0b99c6.1bpp b/gfx/mail/0b99c6.1bpp
deleted file mode 100644
index 77d1e45ba..000000000
--- a/gfx/mail/0b99c6.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b99c6.png b/gfx/mail/0b99c6.png
new file mode 100644
index 000000000..51c0d4a93
--- /dev/null
+++ b/gfx/mail/0b99c6.png
diff --git a/gfx/mail/0b99f6.1bpp b/gfx/mail/0b99f6.1bpp
deleted file mode 100644
index 3d9dcac5b..000000000
--- a/gfx/mail/0b99f6.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b99f6.png b/gfx/mail/0b99f6.png
new file mode 100644
index 000000000..a1b092e60
--- /dev/null
+++ b/gfx/mail/0b99f6.png
diff --git a/gfx/mail/0b9a26.1bpp b/gfx/mail/0b9a26.1bpp
deleted file mode 100644
index 295dec49d..000000000
--- a/gfx/mail/0b9a26.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9a26.png b/gfx/mail/0b9a26.png
new file mode 100644
index 000000000..5ea40f472
--- /dev/null
+++ b/gfx/mail/0b9a26.png
diff --git a/gfx/mail/0b9a56.1bpp b/gfx/mail/0b9a56.1bpp
deleted file mode 100644
index 7ade46c6c..000000000
--- a/gfx/mail/0b9a56.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9a56.png b/gfx/mail/0b9a56.png
new file mode 100644
index 000000000..6c020746f
--- /dev/null
+++ b/gfx/mail/0b9a56.png
diff --git a/gfx/mail/0b9a86.1bpp b/gfx/mail/0b9a86.1bpp
deleted file mode 100644
index 34fa18d29..000000000
--- a/gfx/mail/0b9a86.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9a86.png b/gfx/mail/0b9a86.png
new file mode 100644
index 000000000..d0775fc32
--- /dev/null
+++ b/gfx/mail/0b9a86.png
diff --git a/gfx/mail/0b9ab6.1bpp b/gfx/mail/0b9ab6.1bpp
deleted file mode 100644
index f37262f7e..000000000
--- a/gfx/mail/0b9ab6.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9ab6.png b/gfx/mail/0b9ab6.png
new file mode 100644
index 000000000..8a8ea55e0
--- /dev/null
+++ b/gfx/mail/0b9ab6.png
diff --git a/gfx/mail/0b9b46.1bpp b/gfx/mail/0b9b46.1bpp
deleted file mode 100644
index 6a3ae927d..000000000
--- a/gfx/mail/0b9b46.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9b46.png b/gfx/mail/0b9b46.png
new file mode 100755
index 000000000..9f792d31c
--- /dev/null
+++ b/gfx/mail/0b9b46.png
diff --git a/gfx/mail/0b9bce.1bpp b/gfx/mail/0b9bce.1bpp
deleted file mode 100644
index 208e14fcb..000000000
--- a/gfx/mail/0b9bce.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9bce.png b/gfx/mail/0b9bce.png
new file mode 100644
index 000000000..b277a2c9c
--- /dev/null
+++ b/gfx/mail/0b9bce.png
diff --git a/gfx/mail/0b9bee.1bpp b/gfx/mail/0b9bee.1bpp
deleted file mode 100644
index 33c93f017..000000000
--- a/gfx/mail/0b9bee.1bpp
+++ /dev/null
@@ -1 +0,0 @@
-�KKm}����������
\ No newline at end of file
diff --git a/gfx/mail/0b9bee.png b/gfx/mail/0b9bee.png
new file mode 100644
index 000000000..bdc18dbaa
--- /dev/null
+++ b/gfx/mail/0b9bee.png
diff --git a/gfx/mail/0b9bfe.1bpp b/gfx/mail/0b9bfe.1bpp
deleted file mode 100644
index ac8385990..000000000
--- a/gfx/mail/0b9bfe.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9bfe.png b/gfx/mail/0b9bfe.png
new file mode 100644
index 000000000..5c2dcb10b
--- /dev/null
+++ b/gfx/mail/0b9bfe.png
diff --git a/gfx/mail/0b9c1e.1bpp b/gfx/mail/0b9c1e.1bpp
deleted file mode 100644
index 205a60248..000000000
--- a/gfx/mail/0b9c1e.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9c1e.png b/gfx/mail/0b9c1e.png
new file mode 100644
index 000000000..761432369
--- /dev/null
+++ b/gfx/mail/0b9c1e.png
diff --git a/gfx/mail/0b9c3e.1bpp b/gfx/mail/0b9c3e.1bpp
deleted file mode 100644
index faa0439c8..000000000
--- a/gfx/mail/0b9c3e.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9c3e.png b/gfx/mail/0b9c3e.png
new file mode 100644
index 000000000..1a518f774
--- /dev/null
+++ b/gfx/mail/0b9c3e.png
diff --git a/gfx/mail/0b9c5e.1bpp b/gfx/mail/0b9c5e.1bpp
deleted file mode 100644
index 6587f4505..000000000
--- a/gfx/mail/0b9c5e.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9c5e.png b/gfx/mail/0b9c5e.png
new file mode 100644
index 000000000..075328574
--- /dev/null
+++ b/gfx/mail/0b9c5e.png
diff --git a/gfx/mail/0b9c7e.1bpp b/gfx/mail/0b9c7e.1bpp
deleted file mode 100644
index 0057e120d..000000000
--- a/gfx/mail/0b9c7e.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9c7e.png b/gfx/mail/0b9c7e.png
new file mode 100755
index 000000000..f9e7a3cae
--- /dev/null
+++ b/gfx/mail/0b9c7e.png
diff --git a/gfx/mail/0b9c96.1bpp b/gfx/mail/0b9c96.1bpp
deleted file mode 100644
index 8798f0fec..000000000
--- a/gfx/mail/0b9c96.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9c9e.1bpp b/gfx/mail/0b9c9e.1bpp
deleted file mode 100644
index d1f0f6b7e..000000000
--- a/gfx/mail/0b9c9e.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9c9e.png b/gfx/mail/0b9c9e.png
new file mode 100644
index 000000000..d91eae23f
--- /dev/null
+++ b/gfx/mail/0b9c9e.png
diff --git a/gfx/mail/0b9cbe.1bpp b/gfx/mail/0b9cbe.1bpp
deleted file mode 100644
index 503b8da3c..000000000
--- a/gfx/mail/0b9cbe.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9cbe.png b/gfx/mail/0b9cbe.png
new file mode 100644
index 000000000..2147bef31
--- /dev/null
+++ b/gfx/mail/0b9cbe.png
diff --git a/gfx/mail/0b9cde.1bpp b/gfx/mail/0b9cde.1bpp
deleted file mode 100644
index d6d1b99c2..000000000
--- a/gfx/mail/0b9cde.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9cde.png b/gfx/mail/0b9cde.png
new file mode 100644
index 000000000..3f0d34edc
--- /dev/null
+++ b/gfx/mail/0b9cde.png
diff --git a/gfx/mail/0b9cfe.1bpp b/gfx/mail/0b9cfe.1bpp
deleted file mode 100644
index 09e552df6..000000000
--- a/gfx/mail/0b9cfe.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9cfe.png b/gfx/mail/0b9cfe.png
new file mode 100755
index 000000000..4b7a26faa
--- /dev/null
+++ b/gfx/mail/0b9cfe.png
diff --git a/gfx/mail/0b9d16.1bpp b/gfx/mail/0b9d16.1bpp
deleted file mode 100644
index 61e9e3034..000000000
--- a/gfx/mail/0b9d16.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9d16.png b/gfx/mail/0b9d16.png
new file mode 100755
index 000000000..bc0786238
--- /dev/null
+++ b/gfx/mail/0b9d16.png
diff --git a/gfx/mail/0b9d26.1bpp b/gfx/mail/0b9d26.1bpp
deleted file mode 100644
index 2f7129dab..000000000
--- a/gfx/mail/0b9d26.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9d3e.1bpp b/gfx/mail/0b9d3e.1bpp
deleted file mode 100644
index e8417d211..000000000
--- a/gfx/mail/0b9d3e.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9d46.1bpp b/gfx/mail/0b9d46.1bpp
deleted file mode 100644
index e3e1dc2e7..000000000
--- a/gfx/mail/0b9d46.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9d46.png b/gfx/mail/0b9d46.png
new file mode 100755
index 000000000..466d26c39
--- /dev/null
+++ b/gfx/mail/0b9d46.png
diff --git a/gfx/mail/0b9d76.1bpp b/gfx/mail/0b9d76.1bpp
deleted file mode 100644
index cd7cd4e76..000000000
--- a/gfx/mail/0b9d76.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9d86.1bpp b/gfx/mail/0b9d86.1bpp
deleted file mode 100644
index b048e2bfd..000000000
--- a/gfx/mail/0b9d86.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9d86.png b/gfx/mail/0b9d86.png
new file mode 100755
index 000000000..d0ac239f3
--- /dev/null
+++ b/gfx/mail/0b9d86.png
diff --git a/gfx/mail/0b9db6.1bpp b/gfx/mail/0b9db6.1bpp
deleted file mode 100644
index e894196d7..000000000
--- a/gfx/mail/0b9db6.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9dc6.1bpp b/gfx/mail/0b9dc6.1bpp
deleted file mode 100644
index 9c56c6746..000000000
--- a/gfx/mail/0b9dc6.1bpp
+++ /dev/null
@@ -1 +0,0 @@
-��������
\ No newline at end of file
diff --git a/gfx/mail/0b9dc6.png b/gfx/mail/0b9dc6.png
new file mode 100755
index 000000000..878021bf8
--- /dev/null
+++ b/gfx/mail/0b9dc6.png
diff --git a/gfx/mail/0b9dce.1bpp b/gfx/mail/0b9dce.1bpp
deleted file mode 100644
index 3afe8b303..000000000
--- a/gfx/mail/0b9dce.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9df6.1bpp b/gfx/mail/0b9df6.1bpp
deleted file mode 100644
index d74a3ff4a..000000000
--- a/gfx/mail/0b9df6.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9e06.1bpp b/gfx/mail/0b9e06.1bpp
deleted file mode 100644
index 8f082c642..000000000
--- a/gfx/mail/0b9e06.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9e06.png b/gfx/mail/0b9e06.png
new file mode 100644
index 000000000..035757ee4
--- /dev/null
+++ b/gfx/mail/0b9e06.png
diff --git a/gfx/mail/0b9e26.1bpp b/gfx/mail/0b9e26.1bpp
deleted file mode 100644
index efe2887cf..000000000
--- a/gfx/mail/0b9e26.1bpp
+++ /dev/null
@@ -1 +0,0 @@
-�Ù������������<��������<�������χ��
\ No newline at end of file
diff --git a/gfx/mail/0b9e26.png b/gfx/mail/0b9e26.png
new file mode 100644
index 000000000..48b8e7b7b
--- /dev/null
+++ b/gfx/mail/0b9e26.png
diff --git a/gfx/mail/0b9e4e.1bpp b/gfx/mail/0b9e4e.1bpp
deleted file mode 100644
index 9207cfc8b..000000000
--- a/gfx/mail/0b9e4e.1bpp
+++ /dev/null
diff --git a/gfx/mail/0b9e4e.png b/gfx/mail/0b9e4e.png
new file mode 100644
index 000000000..9efb3401f
--- /dev/null
+++ b/gfx/mail/0b9e4e.png
diff --git a/gfx/misc/boulderdust.2bpp b/gfx/misc/boulderdust.2bpp
deleted file mode 100644
index f8b9f0180..000000000
--- a/gfx/misc/boulderdust.2bpp
+++ /dev/null
diff --git a/gfx/misc/boulderdust.png b/gfx/misc/boulderdust.png
new file mode 100644
index 000000000..9acb11c1b
--- /dev/null
+++ b/gfx/misc/boulderdust.png
diff --git a/gfx/misc/card_right_corner.2bpp b/gfx/misc/card_right_corner.2bpp
deleted file mode 100644
index 8445737b6..000000000
--- a/gfx/misc/card_right_corner.2bpp
+++ /dev/null
diff --git a/gfx/misc/card_right_corner.png b/gfx/misc/card_right_corner.png
new file mode 100644
index 000000000..fa9aea024
--- /dev/null
+++ b/gfx/misc/card_right_corner.png
diff --git a/gfx/misc/card_status.2bpp b/gfx/misc/card_status.2bpp
deleted file mode 100644
index 3234368a9..000000000
--- a/gfx/misc/card_status.2bpp
+++ /dev/null
diff --git a/gfx/misc/card_status.png b/gfx/misc/card_status.png
new file mode 100644
index 000000000..b33bb2029
--- /dev/null
+++ b/gfx/misc/card_status.png
diff --git a/gfx/misc/chris.7x7.2bpp b/gfx/misc/chris.7x7.2bpp
deleted file mode 100644
index e11cc53a8..000000000
--- a/gfx/misc/chris.7x7.2bpp
+++ /dev/null
diff --git a/gfx/misc/chris.png b/gfx/misc/chris.png
new file mode 100644
index 000000000..19869944e
--- /dev/null
+++ b/gfx/misc/chris.png
diff --git a/gfx/misc/chris_card.5x7.2bpp b/gfx/misc/chris_card.5x7.2bpp
deleted file mode 100644
index 747bd0da5..000000000
--- a/gfx/misc/chris_card.5x7.2bpp
+++ /dev/null
diff --git a/gfx/misc/chris_card.png b/gfx/misc/chris_card.png
new file mode 100644
index 000000000..977981d41
--- /dev/null
+++ b/gfx/misc/chris_card.png
diff --git a/gfx/misc/copyright.2bpp b/gfx/misc/copyright.2bpp
deleted file mode 100644
index ba11614b1..000000000
--- a/gfx/misc/copyright.2bpp
+++ /dev/null
diff --git a/gfx/misc/copyright.png b/gfx/misc/copyright.png
new file mode 100644
index 000000000..023bb93dd
--- /dev/null
+++ b/gfx/misc/copyright.png
diff --git a/gfx/misc/cut_grass.2bpp b/gfx/misc/cut_grass.2bpp
deleted file mode 100644
index 1c8a3f9a8..000000000
--- a/gfx/misc/cut_grass.2bpp
+++ /dev/null
diff --git a/gfx/misc/cut_grass.png b/gfx/misc/cut_grass.png
new file mode 100644
index 000000000..b10e0cf8c
--- /dev/null
+++ b/gfx/misc/cut_grass.png
diff --git a/gfx/misc/cut_tree.2bpp b/gfx/misc/cut_tree.2bpp
deleted file mode 100644
index aa8078f31..000000000
--- a/gfx/misc/cut_tree.2bpp
+++ /dev/null
diff --git a/gfx/misc/cut_tree.png b/gfx/misc/cut_tree.png
new file mode 100644
index 000000000..c1f1bc97d
--- /dev/null
+++ b/gfx/misc/cut_tree.png
diff --git a/gfx/misc/dude.6x6.2bpp.lz b/gfx/misc/dude.2bpp.lz.d13fb490
index b8e96a09f..b8e96a09f 100644
--- a/gfx/misc/dude.6x6.2bpp.lz
+++ b/gfx/misc/dude.2bpp.lz.d13fb490
diff --git a/gfx/misc/dude.png b/gfx/misc/dude.png
new file mode 100644
index 000000000..9a74a90d6
--- /dev/null
+++ b/gfx/misc/dude.png
diff --git a/gfx/misc/fast_ship.2bpp b/gfx/misc/fast_ship.2bpp
deleted file mode 100644
index e4a5525b6..000000000
--- a/gfx/misc/fast_ship.2bpp
+++ /dev/null
diff --git a/gfx/misc/fast_ship.png b/gfx/misc/fast_ship.png
new file mode 100644
index 000000000..e92f00f55
--- /dev/null
+++ b/gfx/misc/fast_ship.png
diff --git a/gfx/misc/fishing2.2bpp b/gfx/misc/fishing2.2bpp
deleted file mode 100644
index bb3ed2bbf..000000000
--- a/gfx/misc/fishing2.2bpp
+++ /dev/null
diff --git a/gfx/misc/fishing2.png b/gfx/misc/fishing2.png
new file mode 100644
index 000000000..32d277269
--- /dev/null
+++ b/gfx/misc/fishing2.png
diff --git a/gfx/misc/fishing4.2bpp b/gfx/misc/fishing4.2bpp
deleted file mode 100644
index 987a4ad34..000000000
--- a/gfx/misc/fishing4.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-@ 2�d	6	
\ No newline at end of file
diff --git a/gfx/misc/fishing4.png b/gfx/misc/fishing4.png
new file mode 100644
index 000000000..0b2d73e2c
--- /dev/null
+++ b/gfx/misc/fishing4.png
diff --git a/gfx/misc/gbc_only.w112.2bpp.lz b/gfx/misc/gbc_only.2bpp.lz.4a5bba0e
index 9533fbe6d..9533fbe6d 100644
--- a/gfx/misc/gbc_only.w112.2bpp.lz
+++ b/gfx/misc/gbc_only.2bpp.lz.4a5bba0e
diff --git a/gfx/misc/gbc_only.png b/gfx/misc/gbc_only.png
new file mode 100644
index 000000000..72bcf0131
--- /dev/null
+++ b/gfx/misc/gbc_only.png
diff --git a/gfx/misc/kris.7x7.2bpp b/gfx/misc/kris.7x7.2bpp
deleted file mode 100644
index ac7a64689..000000000
--- a/gfx/misc/kris.7x7.2bpp
+++ /dev/null
diff --git a/gfx/misc/kris.png b/gfx/misc/kris.png
new file mode 100644
index 000000000..7a855e676
--- /dev/null
+++ b/gfx/misc/kris.png
diff --git a/gfx/misc/kris_back.6x6.2bpp b/gfx/misc/kris_back.6x6.2bpp
deleted file mode 100644
index e1c25d12c..000000000
--- a/gfx/misc/kris_back.6x6.2bpp
+++ /dev/null
diff --git a/gfx/misc/kris_back.png b/gfx/misc/kris_back.png
new file mode 100644
index 000000000..eb0c1e941
--- /dev/null
+++ b/gfx/misc/kris_back.png
diff --git a/gfx/misc/kris_card.5x7.2bpp b/gfx/misc/kris_card.5x7.2bpp
deleted file mode 100644
index 0cb916e9f..000000000
--- a/gfx/misc/kris_card.5x7.2bpp
+++ /dev/null
diff --git a/gfx/misc/kris_card.png b/gfx/misc/kris_card.png
new file mode 100644
index 000000000..2ffa11159
--- /dev/null
+++ b/gfx/misc/kris_card.png
diff --git a/gfx/misc/leaders.png b/gfx/misc/leaders.png
new file mode 100644
index 000000000..6e7eb0f8d
--- /dev/null
+++ b/gfx/misc/leaders.png
diff --git a/gfx/misc/leaders.w24.2bpp b/gfx/misc/leaders.w24.2bpp
deleted file mode 100644
index fecae45db..000000000
--- a/gfx/misc/leaders.w24.2bpp
+++ /dev/null
diff --git a/gfx/misc/mobile_adapter.2bpp b/gfx/misc/mobile_adapter.2bpp
deleted file mode 100644
index 7c496ac42..000000000
--- a/gfx/misc/mobile_adapter.2bpp
+++ /dev/null
diff --git a/gfx/misc/mobile_adapter.png b/gfx/misc/mobile_adapter.png
new file mode 100644
index 000000000..fa5965e92
--- /dev/null
+++ b/gfx/misc/mobile_adapter.png
diff --git a/gfx/misc/mystery_gift.2bpp b/gfx/misc/mystery_gift.2bpp
deleted file mode 100644
index 04aff2048..000000000
--- a/gfx/misc/mystery_gift.2bpp
+++ /dev/null
diff --git a/gfx/misc/mystery_gift.png b/gfx/misc/mystery_gift.png
new file mode 100644
index 000000000..0fd458dec
--- /dev/null
+++ b/gfx/misc/mystery_gift.png
diff --git a/gfx/misc/mystery_gift_jp.2bpp b/gfx/misc/mystery_gift_jp.2bpp
deleted file mode 100644
index 2439f25e1..000000000
--- a/gfx/misc/mystery_gift_jp.2bpp
+++ /dev/null
diff --git a/gfx/misc/mystery_gift_jp.png b/gfx/misc/mystery_gift_jp.png
new file mode 100644
index 000000000..692cf8732
--- /dev/null
+++ b/gfx/misc/mystery_gift_jp.png
diff --git a/gfx/misc/pack.png b/gfx/misc/pack.png
index 738a9dd94..b85fc0990 100644
--- a/gfx/misc/pack.png
+++ b/gfx/misc/pack.png
diff --git a/gfx/misc/pack_menu.2bpp b/gfx/misc/pack_menu.2bpp
deleted file mode 100644
index 484bc94cb..000000000
--- a/gfx/misc/pack_menu.2bpp
+++ /dev/null
diff --git a/gfx/misc/pack_menu.png b/gfx/misc/pack_menu.png
new file mode 100644
index 000000000..52e2bcdd5
--- /dev/null
+++ b/gfx/misc/pack_menu.png
diff --git a/gfx/misc/player.6x6.2bpp.lz b/gfx/misc/player.2bpp.lz.0312ddce
index aec84bbab..aec84bbab 100644
--- a/gfx/misc/player.6x6.2bpp.lz
+++ b/gfx/misc/player.2bpp.lz.0312ddce
diff --git a/gfx/misc/player.png b/gfx/misc/player.png
new file mode 100644
index 000000000..7bf3c50db
--- /dev/null
+++ b/gfx/misc/player.png
diff --git a/gfx/misc/pokegear.2bpp.lz b/gfx/misc/pokegear.2bpp.lz.42315ab4
index df312a51b..df312a51b 100644
--- a/gfx/misc/pokegear.2bpp.lz
+++ b/gfx/misc/pokegear.2bpp.lz.42315ab4
diff --git a/gfx/misc/pokegear.png b/gfx/misc/pokegear.png
new file mode 100644
index 000000000..78774a260
--- /dev/null
+++ b/gfx/misc/pokegear.png
diff --git a/gfx/misc/pokegear_sprites.2bpp.lz b/gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f
index b5af62d28..b5af62d28 100644
--- a/gfx/misc/pokegear_sprites.2bpp.lz
+++ b/gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f
diff --git a/gfx/misc/pokegear_sprites.png b/gfx/misc/pokegear_sprites.png
new file mode 100644
index 000000000..746d4b486
--- /dev/null
+++ b/gfx/misc/pokegear_sprites.png
diff --git a/gfx/misc/sgb_border.2bpp b/gfx/misc/sgb_border.2bpp
deleted file mode 100644
index 7f5f7f6fa..000000000
--- a/gfx/misc/sgb_border.2bpp
+++ /dev/null
diff --git a/gfx/misc/sgb_border.png b/gfx/misc/sgb_border.png
new file mode 100644
index 000000000..867c36b10
--- /dev/null
+++ b/gfx/misc/sgb_border.png
diff --git a/gfx/misc/shadow.2bpp b/gfx/misc/shadow.2bpp
deleted file mode 100644
index b62b99ffc..000000000
--- a/gfx/misc/shadow.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????
\ No newline at end of file
diff --git a/gfx/misc/shadow.png b/gfx/misc/shadow.png
new file mode 100644
index 000000000..ba3dab5be
--- /dev/null
+++ b/gfx/misc/shadow.png
diff --git a/gfx/misc/town_map.2bpp.lz b/gfx/misc/town_map.2bpp.lz.c0587c86
index c807a372f..c807a372f 100644
--- a/gfx/misc/town_map.2bpp.lz
+++ b/gfx/misc/town_map.2bpp.lz.c0587c86
diff --git a/gfx/misc/town_map.png b/gfx/misc/town_map.png
new file mode 100644
index 000000000..6e7af59d0
--- /dev/null
+++ b/gfx/misc/town_map.png
diff --git a/gfx/misc/trainer_card.2bpp b/gfx/misc/trainer_card.2bpp
deleted file mode 100644
index 09de7a2df..000000000
--- a/gfx/misc/trainer_card.2bpp
+++ /dev/null
diff --git a/gfx/misc/trainer_card.png b/gfx/misc/trainer_card.png
new file mode 100644
index 000000000..88ce35bca
--- /dev/null
+++ b/gfx/misc/trainer_card.png
diff --git a/gfx/misc/unknown_egg.5x5.2bpp.lz b/gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa
index d8de54c79..d8de54c79 100644
--- a/gfx/misc/unknown_egg.5x5.2bpp.lz
+++ b/gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa
diff --git a/gfx/misc/unknown_egg.png b/gfx/misc/unknown_egg.png
new file mode 100644
index 000000000..0642c28cf
--- /dev/null
+++ b/gfx/misc/unknown_egg.png
diff --git a/gfx/misc/unown_font.2bpp b/gfx/misc/unown_font.2bpp
deleted file mode 100644
index 4ec0bbea6..000000000
--- a/gfx/misc/unown_font.2bpp
+++ /dev/null
diff --git a/gfx/misc/unown_font.png b/gfx/misc/unown_font.png
new file mode 100644
index 000000000..5ac70b807
--- /dev/null
+++ b/gfx/misc/unown_font.png
diff --git a/gfx/mobile/havewant.2bpp b/gfx/mobile/havewant.2bpp
deleted file mode 100644
index 02cb8bb2c..000000000
--- a/gfx/mobile/havewant.2bpp
+++ /dev/null
diff --git a/gfx/mobile/havewant.png b/gfx/mobile/havewant.png
new file mode 100644
index 000000000..7aa0a0544
--- /dev/null
+++ b/gfx/mobile/havewant.png
diff --git a/gfx/mobile/hp.1bpp b/gfx/mobile/hp.1bpp
deleted file mode 100644
index 6ba57017b..000000000
--- a/gfx/mobile/hp.1bpp
+++ /dev/null
diff --git a/gfx/mobile/hp.png b/gfx/mobile/hp.png
new file mode 100644
index 000000000..908141634
--- /dev/null
+++ b/gfx/mobile/hp.png
diff --git a/gfx/mobile/lv.1bpp b/gfx/mobile/lv.1bpp
deleted file mode 100644
index 467a12dea..000000000
--- a/gfx/mobile/lv.1bpp
+++ /dev/null
diff --git a/gfx/mobile/lv.png b/gfx/mobile/lv.png
new file mode 100644
index 000000000..5176fc585
--- /dev/null
+++ b/gfx/mobile/lv.png
diff --git a/gfx/mobile/overworld_phone_icon.2bpp b/gfx/mobile/overworld_phone_icon.2bpp
deleted file mode 100644
index d19ae7f12..000000000
--- a/gfx/mobile/overworld_phone_icon.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-����������������
\ No newline at end of file
diff --git a/gfx/mobile/overworld_phone_icon.png b/gfx/mobile/overworld_phone_icon.png
new file mode 100644
index 000000000..9e13a121b
--- /dev/null
+++ b/gfx/mobile/overworld_phone_icon.png
diff --git a/gfx/mobile/phone_tiles.2bpp b/gfx/mobile/phone_tiles.2bpp
deleted file mode 100644
index 93b085ee4..000000000
--- a/gfx/mobile/phone_tiles.2bpp
+++ /dev/null
diff --git a/gfx/mobile/phone_tiles.png b/gfx/mobile/phone_tiles.png
new file mode 100644
index 000000000..5450c15f8
--- /dev/null
+++ b/gfx/mobile/phone_tiles.png
diff --git a/gfx/mobile/pokemon_news.2bpp b/gfx/mobile/pokemon_news.2bpp
deleted file mode 100644
index cb67b634e..000000000
--- a/gfx/mobile/pokemon_news.2bpp
+++ /dev/null
diff --git a/gfx/mobile/pokemon_news.png b/gfx/mobile/pokemon_news.png
new file mode 100644
index 000000000..f473f8d5c
--- /dev/null
+++ b/gfx/mobile/pokemon_news.png
diff --git a/gfx/mobile/select.2bpp b/gfx/mobile/select.2bpp
deleted file mode 100644
index 53144abf9..000000000
--- a/gfx/mobile/select.2bpp
+++ /dev/null
diff --git a/gfx/mobile/select.png b/gfx/mobile/select.png
new file mode 100644
index 000000000..040205150
--- /dev/null
+++ b/gfx/mobile/select.png
diff --git a/gfx/overworld/000.2bpp b/gfx/overworld/000.2bpp
deleted file mode 100644
index e05a2c3f1..000000000
--- a/gfx/overworld/000.2bpp
+++ /dev/null
diff --git a/gfx/overworld/000.png b/gfx/overworld/000.png
new file mode 100644
index 000000000..1050bb02c
--- /dev/null
+++ b/gfx/overworld/000.png
diff --git a/gfx/overworld/001.2bpp b/gfx/overworld/001.2bpp
deleted file mode 100644
index af04601ad..000000000
--- a/gfx/overworld/001.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-3?<?PB��������<��
-�B?2>9OO3>

�L|������|H��p��0?;<_O�������<����??;7\t?<

�����:.��<���p��8???�����>Œ�����?<?3S����|D88��h����_���>"?(?!�����������!?9?<OO?>

�&>������|�x@���?/?'�����������5;?.>?

���������X谰 ? ?p?)?)�� ��8�|�����0? ?<?3S����uM88� ��������?���
\ No newline at end of file
diff --git a/gfx/overworld/001.png b/gfx/overworld/001.png
new file mode 100644
index 000000000..0d18d11a6
--- /dev/null
+++ b/gfx/overworld/001.png
diff --git a/gfx/overworld/002.2bpp b/gfx/overworld/002.2bpp
deleted file mode 100644
index ec1facf43..000000000
--- a/gfx/overworld/002.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?7S@oR��������������J?3

��p����(�0����pp????_Oo_����������������;7</?+��<����������pp???9��������������|�

��p����(�0����pp
\ No newline at end of file
diff --git a/gfx/overworld/002.png b/gfx/overworld/002.png
new file mode 100644
index 000000000..0ca4acef9
--- /dev/null
+++ b/gfx/overworld/002.png
diff --git a/gfx/overworld/003.2bpp b/gfx/overworld/003.2bpp
deleted file mode 100644
index 1db1ee7e2..000000000
--- a/gfx/overworld/003.2bpp
+++ /dev/null
diff --git a/gfx/overworld/003.png b/gfx/overworld/003.png
new file mode 100644
index 000000000..7d82d400c
--- /dev/null
+++ b/gfx/overworld/003.png
diff --git a/gfx/overworld/004.2bpp b/gfx/overworld/004.2bpp
deleted file mode 100644
index c4f817c13..000000000
--- a/gfx/overworld/004.2bpp
+++ /dev/null
diff --git a/gfx/overworld/004.png b/gfx/overworld/004.png
new file mode 100644
index 000000000..7a76574d0
--- /dev/null
+++ b/gfx/overworld/004.png
diff --git a/gfx/overworld/005.2bpp b/gfx/overworld/005.2bpp
deleted file mode 100644
index e550d7ad6..000000000
--- a/gfx/overworld/005.2bpp
+++ /dev/null
diff --git a/gfx/overworld/005.png b/gfx/overworld/005.png
new file mode 100644
index 000000000..018b676f5
--- /dev/null
+++ b/gfx/overworld/005.png
diff --git a/gfx/overworld/006.2bpp b/gfx/overworld/006.2bpp
deleted file mode 100644
index f5499ff9e..000000000
--- a/gfx/overworld/006.2bpp
+++ /dev/null
diff --git a/gfx/overworld/006.png b/gfx/overworld/006.png
new file mode 100644
index 000000000..17fc2fdc6
--- /dev/null
+++ b/gfx/overworld/006.png
diff --git a/gfx/overworld/007.2bpp b/gfx/overworld/007.2bpp
deleted file mode 100644
index 2f14207b0..000000000
--- a/gfx/overworld/007.2bpp
+++ /dev/null
diff --git a/gfx/overworld/007.png b/gfx/overworld/007.png
new file mode 100644
index 000000000..d72bb7ba1
--- /dev/null
+++ b/gfx/overworld/007.png
diff --git a/gfx/overworld/008.2bpp b/gfx/overworld/008.2bpp
deleted file mode 100644
index 94df75fc7..000000000
--- a/gfx/overworld/008.2bpp
+++ /dev/null
@@ -1,7 +0,0 @@
-

(7P@oR���`0����
-��J?0/9M~^??9???����~z��������

/0PP@���`0����
-�
-�?0_xW~Os?39?>>���~����8���||>!? ? ?(��� p�����d�? �x���������

(7P@oR���`0����
-��J?0Oy_~??���~����8�0���

/0P@oP���`0����
-��
-?0_x_~Os?3���~����8�0���	#<}B@@P���@� ������(@>1=#�(��p� �p��p���
\ No newline at end of file
diff --git a/gfx/overworld/008.png b/gfx/overworld/008.png
new file mode 100644
index 000000000..90b499f16
--- /dev/null
+++ b/gfx/overworld/008.png
diff --git a/gfx/overworld/009.2bpp b/gfx/overworld/009.2bpp
deleted file mode 100644
index 65cbdb1a2..000000000
--- a/gfx/overworld/009.2bpp
+++ /dev/null
diff --git a/gfx/overworld/009.png b/gfx/overworld/009.png
new file mode 100644
index 000000000..b49f8e573
--- /dev/null
+++ b/gfx/overworld/009.png
diff --git a/gfx/overworld/010.2bpp b/gfx/overworld/010.2bpp
deleted file mode 100644
index 1f21db12d..000000000
--- a/gfx/overworld/010.2bpp
+++ /dev/null
diff --git a/gfx/overworld/010.png b/gfx/overworld/010.png
new file mode 100644
index 000000000..bd7fc20ea
--- /dev/null
+++ b/gfx/overworld/010.png
diff --git a/gfx/overworld/011.2bpp b/gfx/overworld/011.2bpp
deleted file mode 100644
index 36f409c46..000000000
--- a/gfx/overworld/011.2bpp
+++ /dev/null
diff --git a/gfx/overworld/011.png b/gfx/overworld/011.png
new file mode 100644
index 000000000..36010c92d
--- /dev/null
+++ b/gfx/overworld/011.png
diff --git a/gfx/overworld/012.2bpp b/gfx/overworld/012.2bpp
deleted file mode 100644
index fc40c0f15..000000000
--- a/gfx/overworld/012.2bpp
+++ /dev/null
diff --git a/gfx/overworld/012.png b/gfx/overworld/012.png
new file mode 100644
index 000000000..6ce1f3092
--- /dev/null
+++ b/gfx/overworld/012.png
diff --git a/gfx/overworld/013.2bpp b/gfx/overworld/013.2bpp
deleted file mode 100644
index df6b3a16c..000000000
--- a/gfx/overworld/013.2bpp
+++ /dev/null
diff --git a/gfx/overworld/013.png b/gfx/overworld/013.png
new file mode 100644
index 000000000..5644764c0
--- /dev/null
+++ b/gfx/overworld/013.png
diff --git a/gfx/overworld/014.2bpp b/gfx/overworld/014.2bpp
deleted file mode 100644
index 58ce75371..000000000
--- a/gfx/overworld/014.2bpp
+++ /dev/null
diff --git a/gfx/overworld/014.png b/gfx/overworld/014.png
new file mode 100644
index 000000000..84f330f1d
--- /dev/null
+++ b/gfx/overworld/014.png
diff --git a/gfx/overworld/015.2bpp b/gfx/overworld/015.2bpp
deleted file mode 100644
index 5de055557..000000000
--- a/gfx/overworld/015.2bpp
+++ /dev/null
diff --git a/gfx/overworld/015.png b/gfx/overworld/015.png
new file mode 100644
index 000000000..ed1439b69
--- /dev/null
+++ b/gfx/overworld/015.png
diff --git a/gfx/overworld/016.2bpp b/gfx/overworld/016.2bpp
deleted file mode 100644
index bdce93ada..000000000
--- a/gfx/overworld/016.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-"?"?*?O_y��0���$�4�r���/??'>'	�����|���p��`` ? ? ?@D��0������"�$??/?/	$�X�������p��`` ?DI.?��0�������
�������`�`��@���
\ No newline at end of file
diff --git a/gfx/overworld/016.png b/gfx/overworld/016.png
new file mode 100644
index 000000000..5229bb404
--- /dev/null
+++ b/gfx/overworld/016.png
diff --git a/gfx/overworld/017.2bpp b/gfx/overworld/017.2bpp
deleted file mode 100644
index f51ec2470..000000000
--- a/gfx/overworld/017.2bpp
+++ /dev/null
diff --git a/gfx/overworld/017.png b/gfx/overworld/017.png
new file mode 100644
index 000000000..a9bc75dbd
--- /dev/null
+++ b/gfx/overworld/017.png
diff --git a/gfx/overworld/018.2bpp b/gfx/overworld/018.2bpp
deleted file mode 100644
index 354fcfdca..000000000
--- a/gfx/overworld/018.2bpp
+++ /dev/null
diff --git a/gfx/overworld/018.png b/gfx/overworld/018.png
new file mode 100644
index 000000000..ff8b28b98
--- /dev/null
+++ b/gfx/overworld/018.png
diff --git a/gfx/overworld/019.2bpp b/gfx/overworld/019.2bpp
deleted file mode 100644
index 298a38351..000000000
--- a/gfx/overworld/019.2bpp
+++ /dev/null
diff --git a/gfx/overworld/019.png b/gfx/overworld/019.png
new file mode 100644
index 000000000..b528045b5
--- /dev/null
+++ b/gfx/overworld/019.png
diff --git a/gfx/overworld/020.2bpp b/gfx/overworld/020.2bpp
deleted file mode 100644
index 2c1da80cc..000000000
--- a/gfx/overworld/020.2bpp
+++ /dev/null
diff --git a/gfx/overworld/020.png b/gfx/overworld/020.png
new file mode 100644
index 000000000..dcee550e0
--- /dev/null
+++ b/gfx/overworld/020.png
diff --git a/gfx/overworld/021.2bpp b/gfx/overworld/021.2bpp
deleted file mode 100644
index 82240e622..000000000
--- a/gfx/overworld/021.2bpp
+++ /dev/null
diff --git a/gfx/overworld/021.png b/gfx/overworld/021.png
new file mode 100644
index 000000000..54300be2d
--- /dev/null
+++ b/gfx/overworld/021.png
diff --git a/gfx/overworld/022.2bpp b/gfx/overworld/022.2bpp
deleted file mode 100644
index 2fd8ce8b6..000000000
--- a/gfx/overworld/022.2bpp
+++ /dev/null
diff --git a/gfx/overworld/022.png b/gfx/overworld/022.png
new file mode 100644
index 000000000..0d8be19ec
--- /dev/null
+++ b/gfx/overworld/022.png
diff --git a/gfx/overworld/023.2bpp b/gfx/overworld/023.2bpp
deleted file mode 100644
index 745b1afca..000000000
--- a/gfx/overworld/023.2bpp
+++ /dev/null
diff --git a/gfx/overworld/023.png b/gfx/overworld/023.png
new file mode 100644
index 000000000..69f152a3c
--- /dev/null
+++ b/gfx/overworld/023.png
diff --git a/gfx/overworld/024.2bpp b/gfx/overworld/024.2bpp
deleted file mode 100644
index 32bef007e..000000000
--- a/gfx/overworld/024.2bpp
+++ /dev/null
diff --git a/gfx/overworld/024.png b/gfx/overworld/024.png
new file mode 100644
index 000000000..c4e721b75
--- /dev/null
+++ b/gfx/overworld/024.png
diff --git a/gfx/overworld/025.2bpp b/gfx/overworld/025.2bpp
deleted file mode 100644
index 4ed34a450..000000000
--- a/gfx/overworld/025.2bpp
+++ /dev/null
diff --git a/gfx/overworld/025.png b/gfx/overworld/025.png
new file mode 100644
index 000000000..f9f8ec431
--- /dev/null
+++ b/gfx/overworld/025.png
diff --git a/gfx/overworld/026.2bpp b/gfx/overworld/026.2bpp
deleted file mode 100644
index 7be42b2df..000000000
--- a/gfx/overworld/026.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-?"='?(HJ���0��D�����R?*?$C?%	�T�$�������А�``? ? ? @@���0������? ?!C?'	����������А�``���0��������
-������,��@���
\ No newline at end of file
diff --git a/gfx/overworld/026.png b/gfx/overworld/026.png
new file mode 100644
index 000000000..8b95fb3fc
--- /dev/null
+++ b/gfx/overworld/026.png
diff --git a/gfx/overworld/027.2bpp b/gfx/overworld/027.2bpp
deleted file mode 100644
index 9381d7555..000000000
--- a/gfx/overworld/027.2bpp
+++ /dev/null
diff --git a/gfx/overworld/027.png b/gfx/overworld/027.png
new file mode 100644
index 000000000..5f77217ef
--- /dev/null
+++ b/gfx/overworld/027.png
diff --git a/gfx/overworld/028.2bpp b/gfx/overworld/028.2bpp
deleted file mode 100644
index f5450a0f1..000000000
--- a/gfx/overworld/028.2bpp
+++ /dev/null
diff --git a/gfx/overworld/028.png b/gfx/overworld/028.png
new file mode 100644
index 000000000..8b9857a85
--- /dev/null
+++ b/gfx/overworld/028.png
diff --git a/gfx/overworld/029.2bpp b/gfx/overworld/029.2bpp
deleted file mode 100644
index 12fc0c187..000000000
--- a/gfx/overworld/029.2bpp
+++ /dev/null
diff --git a/gfx/overworld/029.png b/gfx/overworld/029.png
new file mode 100644
index 000000000..5a2372dfa
--- /dev/null
+++ b/gfx/overworld/029.png
diff --git a/gfx/overworld/030.2bpp b/gfx/overworld/030.2bpp
deleted file mode 100644
index cdb942ab9..000000000
--- a/gfx/overworld/030.2bpp
+++ /dev/null
diff --git a/gfx/overworld/030.png b/gfx/overworld/030.png
new file mode 100644
index 000000000..ae165c7ab
--- /dev/null
+++ b/gfx/overworld/030.png
diff --git a/gfx/overworld/031.2bpp b/gfx/overworld/031.2bpp
deleted file mode 100644
index 16691d982..000000000
--- a/gfx/overworld/031.2bpp
+++ /dev/null
diff --git a/gfx/overworld/031.png b/gfx/overworld/031.png
new file mode 100644
index 000000000..22c157d82
--- /dev/null
+++ b/gfx/overworld/031.png
diff --git a/gfx/overworld/032.2bpp b/gfx/overworld/032.2bpp
deleted file mode 100644
index db7652bbd..000000000
--- a/gfx/overworld/032.2bpp
+++ /dev/null
diff --git a/gfx/overworld/032.png b/gfx/overworld/032.png
new file mode 100644
index 000000000..8afd066bd
--- /dev/null
+++ b/gfx/overworld/032.png
diff --git a/gfx/overworld/033.2bpp b/gfx/overworld/033.2bpp
deleted file mode 100644
index d2aff635f..000000000
--- a/gfx/overworld/033.2bpp
+++ /dev/null
diff --git a/gfx/overworld/033.png b/gfx/overworld/033.png
new file mode 100644
index 000000000..ef29e27d5
--- /dev/null
+++ b/gfx/overworld/033.png
diff --git a/gfx/overworld/034.2bpp b/gfx/overworld/034.2bpp
deleted file mode 100644
index ae075c338..000000000
--- a/gfx/overworld/034.2bpp
+++ /dev/null
diff --git a/gfx/overworld/034.png b/gfx/overworld/034.png
new file mode 100644
index 000000000..ffd94f410
--- /dev/null
+++ b/gfx/overworld/034.png
diff --git a/gfx/overworld/035.2bpp b/gfx/overworld/035.2bpp
deleted file mode 100644
index 17c6687a5..000000000
--- a/gfx/overworld/035.2bpp
+++ /dev/null
diff --git a/gfx/overworld/035.png b/gfx/overworld/035.png
new file mode 100644
index 000000000..53bf81b13
--- /dev/null
+++ b/gfx/overworld/035.png
diff --git a/gfx/overworld/036.2bpp b/gfx/overworld/036.2bpp
deleted file mode 100644
index 6edb8a305..000000000
--- a/gfx/overworld/036.2bpp
+++ /dev/null
diff --git a/gfx/overworld/036.png b/gfx/overworld/036.png
new file mode 100644
index 000000000..e1306b6a0
--- /dev/null
+++ b/gfx/overworld/036.png
diff --git a/gfx/overworld/037.2bpp b/gfx/overworld/037.2bpp
deleted file mode 100644
index 597f0e4ba..000000000
--- a/gfx/overworld/037.2bpp
+++ /dev/null
diff --git a/gfx/overworld/037.png b/gfx/overworld/037.png
new file mode 100644
index 000000000..caa9f43af
--- /dev/null
+++ b/gfx/overworld/037.png
diff --git a/gfx/overworld/038.2bpp b/gfx/overworld/038.2bpp
deleted file mode 100644
index f0f329b63..000000000
--- a/gfx/overworld/038.2bpp
+++ /dev/null
diff --git a/gfx/overworld/038.png b/gfx/overworld/038.png
new file mode 100644
index 000000000..5c0d33939
--- /dev/null
+++ b/gfx/overworld/038.png
diff --git a/gfx/overworld/039.2bpp b/gfx/overworld/039.2bpp
deleted file mode 100644
index 4e8485fc2..000000000
--- a/gfx/overworld/039.2bpp
+++ /dev/null
diff --git a/gfx/overworld/039.png b/gfx/overworld/039.png
new file mode 100644
index 000000000..762108ad5
--- /dev/null
+++ b/gfx/overworld/039.png
diff --git a/gfx/overworld/040.2bpp b/gfx/overworld/040.2bpp
deleted file mode 100644
index 0901ed9b0..000000000
--- a/gfx/overworld/040.2bpp
+++ /dev/null
diff --git a/gfx/overworld/040.png b/gfx/overworld/040.png
new file mode 100644
index 000000000..2107159e9
--- /dev/null
+++ b/gfx/overworld/040.png
diff --git a/gfx/overworld/041.2bpp b/gfx/overworld/041.2bpp
deleted file mode 100644
index 00886ad62..000000000
--- a/gfx/overworld/041.2bpp
+++ /dev/null
diff --git a/gfx/overworld/041.png b/gfx/overworld/041.png
new file mode 100644
index 000000000..af5a7e7e7
--- /dev/null
+++ b/gfx/overworld/041.png
diff --git a/gfx/overworld/042.2bpp b/gfx/overworld/042.2bpp
deleted file mode 100644
index c3a136249..000000000
--- a/gfx/overworld/042.2bpp
+++ /dev/null
diff --git a/gfx/overworld/042.png b/gfx/overworld/042.png
new file mode 100644
index 000000000..6866c7b30
--- /dev/null
+++ b/gfx/overworld/042.png
diff --git a/gfx/overworld/043.2bpp b/gfx/overworld/043.2bpp
deleted file mode 100644
index 2542203c2..000000000
--- a/gfx/overworld/043.2bpp
+++ /dev/null
diff --git a/gfx/overworld/043.png b/gfx/overworld/043.png
new file mode 100644
index 000000000..50ac2089e
--- /dev/null
+++ b/gfx/overworld/043.png
diff --git a/gfx/overworld/044.2bpp b/gfx/overworld/044.2bpp
deleted file mode 100644
index 2e167caf4..000000000
--- a/gfx/overworld/044.2bpp
+++ /dev/null
diff --git a/gfx/overworld/044.png b/gfx/overworld/044.png
new file mode 100644
index 000000000..fea7979d3
--- /dev/null
+++ b/gfx/overworld/044.png
diff --git a/gfx/overworld/045.2bpp b/gfx/overworld/045.2bpp
deleted file mode 100644
index 1f6239516..000000000
--- a/gfx/overworld/045.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-;>?8���������|��H�H	?/?(?<p���������<�8��;?=?��p��������x���?/_X~���������~����>?=3�����������������x�p�����������;>?8���������|��H�H	?/?(?<p���������<�8��;?=?��p��������x���?/_X~���������x���>?=3����������������	
�x�p�������|�|��
\ No newline at end of file
diff --git a/gfx/overworld/045.png b/gfx/overworld/045.png
new file mode 100644
index 000000000..aa1fbc06f
--- /dev/null
+++ b/gfx/overworld/045.png
diff --git a/gfx/overworld/046.2bpp b/gfx/overworld/046.2bpp
deleted file mode 100644
index 8a5d7ec67..000000000
--- a/gfx/overworld/046.2bpp
+++ /dev/null
diff --git a/gfx/overworld/046.png b/gfx/overworld/046.png
new file mode 100644
index 000000000..abe61a31d
--- /dev/null
+++ b/gfx/overworld/046.png
diff --git a/gfx/overworld/047.2bpp b/gfx/overworld/047.2bpp
deleted file mode 100644
index 7b563b1c7..000000000
--- a/gfx/overworld/047.2bpp
+++ /dev/null
diff --git a/gfx/overworld/047.png b/gfx/overworld/047.png
new file mode 100644
index 000000000..763b2a2b1
--- /dev/null
+++ b/gfx/overworld/047.png
diff --git a/gfx/overworld/048.2bpp b/gfx/overworld/048.2bpp
deleted file mode 100644
index 882f016cf..000000000
--- a/gfx/overworld/048.2bpp
+++ /dev/null
diff --git a/gfx/overworld/048.png b/gfx/overworld/048.png
new file mode 100644
index 000000000..4c1818b2b
--- /dev/null
+++ b/gfx/overworld/048.png
diff --git a/gfx/overworld/049.2bpp b/gfx/overworld/049.2bpp
deleted file mode 100644
index b1e79ffb0..000000000
--- a/gfx/overworld/049.2bpp
+++ /dev/null
diff --git a/gfx/overworld/049.png b/gfx/overworld/049.png
new file mode 100644
index 000000000..eed753ab2
--- /dev/null
+++ b/gfx/overworld/049.png
diff --git a/gfx/overworld/050.2bpp b/gfx/overworld/050.2bpp
deleted file mode 100644
index 9b45a1c2b..000000000
--- a/gfx/overworld/050.2bpp
+++ /dev/null
diff --git a/gfx/overworld/050.png b/gfx/overworld/050.png
new file mode 100644
index 000000000..f53f71105
--- /dev/null
+++ b/gfx/overworld/050.png
diff --git a/gfx/overworld/051.2bpp b/gfx/overworld/051.2bpp
deleted file mode 100644
index 1e4f970a2..000000000
--- a/gfx/overworld/051.2bpp
+++ /dev/null
diff --git a/gfx/overworld/051.png b/gfx/overworld/051.png
new file mode 100644
index 000000000..e6a3d7d03
--- /dev/null
+++ b/gfx/overworld/051.png
diff --git a/gfx/overworld/052.2bpp b/gfx/overworld/052.2bpp
deleted file mode 100644
index 2bc8793ab..000000000
--- a/gfx/overworld/052.2bpp
+++ /dev/null
diff --git a/gfx/overworld/052.png b/gfx/overworld/052.png
new file mode 100644
index 000000000..43a71bd6e
--- /dev/null
+++ b/gfx/overworld/052.png
diff --git a/gfx/overworld/053.2bpp b/gfx/overworld/053.2bpp
deleted file mode 100644
index 97a5e6ab6..000000000
--- a/gfx/overworld/053.2bpp
+++ /dev/null
diff --git a/gfx/overworld/053.png b/gfx/overworld/053.png
new file mode 100644
index 000000000..b8714ba6f
--- /dev/null
+++ b/gfx/overworld/053.png
diff --git a/gfx/overworld/054.2bpp b/gfx/overworld/054.2bpp
deleted file mode 100644
index fec70f27c..000000000
--- a/gfx/overworld/054.2bpp
+++ /dev/null
diff --git a/gfx/overworld/054.png b/gfx/overworld/054.png
new file mode 100644
index 000000000..4cd71fcfc
--- /dev/null
+++ b/gfx/overworld/054.png
diff --git a/gfx/overworld/055.2bpp b/gfx/overworld/055.2bpp
deleted file mode 100644
index df716add1..000000000
--- a/gfx/overworld/055.2bpp
+++ /dev/null
diff --git a/gfx/overworld/055.png b/gfx/overworld/055.png
new file mode 100644
index 000000000..b6c98bbef
--- /dev/null
+++ b/gfx/overworld/055.png
diff --git a/gfx/overworld/056.2bpp b/gfx/overworld/056.2bpp
deleted file mode 100644
index 6d69aee66..000000000
--- a/gfx/overworld/056.2bpp
+++ /dev/null
diff --git a/gfx/overworld/056.png b/gfx/overworld/056.png
new file mode 100644
index 000000000..77a5fb914
--- /dev/null
+++ b/gfx/overworld/056.png
diff --git a/gfx/overworld/057.2bpp b/gfx/overworld/057.2bpp
deleted file mode 100644
index 0c62b196b..000000000
--- a/gfx/overworld/057.2bpp
+++ /dev/null
diff --git a/gfx/overworld/057.png b/gfx/overworld/057.png
new file mode 100644
index 000000000..a84a2e371
--- /dev/null
+++ b/gfx/overworld/057.png
diff --git a/gfx/overworld/058.2bpp b/gfx/overworld/058.2bpp
deleted file mode 100644
index 702f325a1..000000000
--- a/gfx/overworld/058.2bpp
+++ /dev/null
diff --git a/gfx/overworld/058.png b/gfx/overworld/058.png
new file mode 100644
index 000000000..748444f8e
--- /dev/null
+++ b/gfx/overworld/058.png
diff --git a/gfx/overworld/059.2bpp b/gfx/overworld/059.2bpp
deleted file mode 100644
index a4e8d6899..000000000
--- a/gfx/overworld/059.2bpp
+++ /dev/null
diff --git a/gfx/overworld/059.png b/gfx/overworld/059.png
new file mode 100644
index 000000000..39c44291e
--- /dev/null
+++ b/gfx/overworld/059.png
diff --git a/gfx/overworld/060.2bpp b/gfx/overworld/060.2bpp
deleted file mode 100644
index 32daceb69..000000000
--- a/gfx/overworld/060.2bpp
+++ /dev/null
diff --git a/gfx/overworld/060.png b/gfx/overworld/060.png
new file mode 100644
index 000000000..0ea041f5b
--- /dev/null
+++ b/gfx/overworld/060.png
diff --git a/gfx/overworld/061.2bpp b/gfx/overworld/061.2bpp
deleted file mode 100644
index 69b2e4e70..000000000
--- a/gfx/overworld/061.2bpp
+++ /dev/null
diff --git a/gfx/overworld/061.png b/gfx/overworld/061.png
new file mode 100644
index 000000000..802230467
--- /dev/null
+++ b/gfx/overworld/061.png
diff --git a/gfx/overworld/062.2bpp b/gfx/overworld/062.2bpp
deleted file mode 100644
index b1f5b464b..000000000
--- a/gfx/overworld/062.2bpp
+++ /dev/null
diff --git a/gfx/overworld/062.png b/gfx/overworld/062.png
new file mode 100644
index 000000000..d979b9a6e
--- /dev/null
+++ b/gfx/overworld/062.png
diff --git a/gfx/overworld/063.2bpp b/gfx/overworld/063.2bpp
deleted file mode 100644
index e7fd2bc18..000000000
--- a/gfx/overworld/063.2bpp
+++ /dev/null
diff --git a/gfx/overworld/063.png b/gfx/overworld/063.png
new file mode 100644
index 000000000..38a6125d2
--- /dev/null
+++ b/gfx/overworld/063.png
diff --git a/gfx/overworld/064.2bpp b/gfx/overworld/064.2bpp
deleted file mode 100644
index 28c141dfa..000000000
--- a/gfx/overworld/064.2bpp
+++ /dev/null
diff --git a/gfx/overworld/064.png b/gfx/overworld/064.png
new file mode 100644
index 000000000..9aec228c5
--- /dev/null
+++ b/gfx/overworld/064.png
diff --git a/gfx/overworld/065.2bpp b/gfx/overworld/065.2bpp
deleted file mode 100644
index 826e6460e..000000000
--- a/gfx/overworld/065.2bpp
+++ /dev/null
diff --git a/gfx/overworld/065.png b/gfx/overworld/065.png
new file mode 100644
index 000000000..0d102b04a
--- /dev/null
+++ b/gfx/overworld/065.png
diff --git a/gfx/overworld/066.2bpp b/gfx/overworld/066.2bpp
deleted file mode 100644
index da551977f..000000000
--- a/gfx/overworld/066.2bpp
+++ /dev/null
diff --git a/gfx/overworld/066.png b/gfx/overworld/066.png
new file mode 100644
index 000000000..f62252038
--- /dev/null
+++ b/gfx/overworld/066.png
diff --git a/gfx/overworld/067.2bpp b/gfx/overworld/067.2bpp
deleted file mode 100644
index b35296544..000000000
--- a/gfx/overworld/067.2bpp
+++ /dev/null
diff --git a/gfx/overworld/067.png b/gfx/overworld/067.png
new file mode 100644
index 000000000..9dfe77ff4
--- /dev/null
+++ b/gfx/overworld/067.png
diff --git a/gfx/overworld/068.2bpp b/gfx/overworld/068.2bpp
deleted file mode 100644
index 3cac02f74..000000000
--- a/gfx/overworld/068.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-88GP|c<+<#@O88���|�x�x����?  ? ?���������pp
\ No newline at end of file
diff --git a/gfx/overworld/068.png b/gfx/overworld/068.png
new file mode 100644
index 000000000..d651ad3e6
--- /dev/null
+++ b/gfx/overworld/068.png
diff --git a/gfx/overworld/069.2bpp b/gfx/overworld/069.2bpp
deleted file mode 100644
index 8b5d0dc34..000000000
--- a/gfx/overworld/069.2bpp
+++ /dev/null
diff --git a/gfx/overworld/069.png b/gfx/overworld/069.png
new file mode 100644
index 000000000..7408cbbbc
--- /dev/null
+++ b/gfx/overworld/069.png
diff --git a/gfx/overworld/070.2bpp b/gfx/overworld/070.2bpp
deleted file mode 100644
index f13f3a80c..000000000
--- a/gfx/overworld/070.2bpp
+++ /dev/null
diff --git a/gfx/overworld/070.png b/gfx/overworld/070.png
new file mode 100644
index 000000000..45f27649e
--- /dev/null
+++ b/gfx/overworld/070.png
diff --git a/gfx/overworld/071.2bpp b/gfx/overworld/071.2bpp
deleted file mode 100644
index de6d4772a..000000000
--- a/gfx/overworld/071.2bpp
+++ /dev/null
diff --git a/gfx/overworld/071.png b/gfx/overworld/071.png
new file mode 100644
index 000000000..a1f74da03
--- /dev/null
+++ b/gfx/overworld/071.png
diff --git a/gfx/overworld/072.2bpp b/gfx/overworld/072.2bpp
deleted file mode 100644
index bbd9e6f30..000000000
--- a/gfx/overworld/072.2bpp
+++ /dev/null
diff --git a/gfx/overworld/072.png b/gfx/overworld/072.png
new file mode 100644
index 000000000..b4d3b5f2a
--- /dev/null
+++ b/gfx/overworld/072.png
diff --git a/gfx/overworld/073.2bpp b/gfx/overworld/073.2bpp
deleted file mode 100644
index e650a0fa6..000000000
--- a/gfx/overworld/073.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-???:?0ToR���������\��*�J?0?'<'

�x���<��x������??????_o_����������������?0?/</

����<���������	
-�����������~�<�$?9gc??��0������c���??t`��ߤ������������T�`<3OxO?<��0��xȰ����``??��߿����������������`?0_x_7???��0��x������``???7?4�������������x�H+</3s����~99��`��������|���
\ No newline at end of file
diff --git a/gfx/overworld/073.png b/gfx/overworld/073.png
new file mode 100644
index 000000000..5d056cf42
--- /dev/null
+++ b/gfx/overworld/073.png
diff --git a/gfx/overworld/074.2bpp b/gfx/overworld/074.2bpp
deleted file mode 100644
index 2407b11df..000000000
--- a/gfx/overworld/074.2bpp
+++ /dev/null
diff --git a/gfx/overworld/074.png b/gfx/overworld/074.png
new file mode 100644
index 000000000..ed0fa1d28
--- /dev/null
+++ b/gfx/overworld/074.png
diff --git a/gfx/overworld/075.2bpp b/gfx/overworld/075.2bpp
deleted file mode 100644
index 542d6ef24..000000000
--- a/gfx/overworld/075.2bpp
+++ /dev/null
diff --git a/gfx/overworld/075.png b/gfx/overworld/075.png
new file mode 100644
index 000000000..80d615b2e
--- /dev/null
+++ b/gfx/overworld/075.png
diff --git a/gfx/overworld/076.2bpp b/gfx/overworld/076.2bpp
deleted file mode 100644
index 32e75d48b..000000000
--- a/gfx/overworld/076.2bpp
+++ /dev/null
diff --git a/gfx/overworld/076.png b/gfx/overworld/076.png
new file mode 100644
index 000000000..06fe00768
--- /dev/null
+++ b/gfx/overworld/076.png
diff --git a/gfx/overworld/077.2bpp b/gfx/overworld/077.2bpp
deleted file mode 100644
index d74e9980d..000000000
--- a/gfx/overworld/077.2bpp
+++ /dev/null
diff --git a/gfx/overworld/077.png b/gfx/overworld/077.png
new file mode 100644
index 000000000..9e2009940
--- /dev/null
+++ b/gfx/overworld/077.png
diff --git a/gfx/overworld/078.2bpp b/gfx/overworld/078.2bpp
deleted file mode 100644
index bd2dcea81..000000000
--- a/gfx/overworld/078.2bpp
+++ /dev/null
diff --git a/gfx/overworld/078.png b/gfx/overworld/078.png
new file mode 100644
index 000000000..3b6c621b8
--- /dev/null
+++ b/gfx/overworld/078.png
diff --git a/gfx/overworld/079.2bpp b/gfx/overworld/079.2bpp
deleted file mode 100644
index 91659bdc6..000000000
--- a/gfx/overworld/079.2bpp
+++ /dev/null
diff --git a/gfx/overworld/079.png b/gfx/overworld/079.png
new file mode 100644
index 000000000..7996be17e
--- /dev/null
+++ b/gfx/overworld/079.png
diff --git a/gfx/overworld/080.2bpp b/gfx/overworld/080.2bpp
deleted file mode 100644
index c03f2a4d6..000000000
--- a/gfx/overworld/080.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-78??4???xS���0�8��X���<���tk?/?1?"

\�����w��5ͷ��22
\ No newline at end of file
diff --git a/gfx/overworld/080.png b/gfx/overworld/080.png
new file mode 100644
index 000000000..6d2bdc8d7
--- /dev/null
+++ b/gfx/overworld/080.png
diff --git a/gfx/overworld/081.2bpp b/gfx/overworld/081.2bpp
deleted file mode 100644
index d9efd679e..000000000
--- a/gfx/overworld/081.2bpp
+++ /dev/null
diff --git a/gfx/overworld/081.png b/gfx/overworld/081.png
new file mode 100644
index 000000000..9354f928b
--- /dev/null
+++ b/gfx/overworld/081.png
diff --git a/gfx/overworld/082.2bpp b/gfx/overworld/082.2bpp
deleted file mode 100644
index f6395da92..000000000
--- a/gfx/overworld/082.2bpp
+++ /dev/null
diff --git a/gfx/overworld/082.png b/gfx/overworld/082.png
new file mode 100644
index 000000000..d124616b0
--- /dev/null
+++ b/gfx/overworld/082.png
diff --git a/gfx/overworld/083.2bpp b/gfx/overworld/083.2bpp
deleted file mode 100644
index feb6d7d19..000000000
--- a/gfx/overworld/083.2bpp
+++ /dev/null
diff --git a/gfx/overworld/083.png b/gfx/overworld/083.png
new file mode 100644
index 000000000..b12bf897c
--- /dev/null
+++ b/gfx/overworld/083.png
diff --git a/gfx/overworld/084.2bpp b/gfx/overworld/084.2bpp
deleted file mode 100644
index 40ee737a7..000000000
--- a/gfx/overworld/084.2bpp
+++ /dev/null
diff --git a/gfx/overworld/084.png b/gfx/overworld/084.png
new file mode 100644
index 000000000..63846bfad
--- /dev/null
+++ b/gfx/overworld/084.png
diff --git a/gfx/overworld/085.2bpp b/gfx/overworld/085.2bpp
deleted file mode 100644
index 3d7694f43..000000000
--- a/gfx/overworld/085.2bpp
+++ /dev/null
diff --git a/gfx/overworld/085.png b/gfx/overworld/085.png
new file mode 100644
index 000000000..da171b3b2
--- /dev/null
+++ b/gfx/overworld/085.png
diff --git a/gfx/overworld/086.2bpp b/gfx/overworld/086.2bpp
deleted file mode 100644
index bbe5b9fa8..000000000
--- a/gfx/overworld/086.2bpp
+++ /dev/null
diff --git a/gfx/overworld/086.png b/gfx/overworld/086.png
new file mode 100644
index 000000000..dba7dc130
--- /dev/null
+++ b/gfx/overworld/086.png
diff --git a/gfx/overworld/087.2bpp b/gfx/overworld/087.2bpp
deleted file mode 100644
index 7d28ef270..000000000
--- a/gfx/overworld/087.2bpp
+++ /dev/null
@@ -1 +0,0 @@
- ?"?'=Ox����0���D����G��ny	�Ov����������``
\ No newline at end of file
diff --git a/gfx/overworld/087.png b/gfx/overworld/087.png
new file mode 100644
index 000000000..fad0eedd8
--- /dev/null
+++ b/gfx/overworld/087.png
diff --git a/gfx/overworld/088.2bpp b/gfx/overworld/088.2bpp
deleted file mode 100644
index da35730d0..000000000
--- a/gfx/overworld/088.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-7\޵����t���p����|z����q~�����Go??���>��������px
\ No newline at end of file
diff --git a/gfx/overworld/088.png b/gfx/overworld/088.png
new file mode 100644
index 000000000..5a614d7bb
--- /dev/null
+++ b/gfx/overworld/088.png
diff --git a/gfx/overworld/089.2bpp b/gfx/overworld/089.2bpp
deleted file mode 100644
index f3386f2a5..000000000
--- a/gfx/overworld/089.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-? @��ժ�Ѯ�����R��^C��+��ҭ��������u??���+�W���~�����
\ No newline at end of file
diff --git a/gfx/overworld/089.png b/gfx/overworld/089.png
new file mode 100644
index 000000000..9b408e021
--- /dev/null
+++ b/gfx/overworld/089.png
diff --git a/gfx/overworld/090.2bpp b/gfx/overworld/090.2bpp
deleted file mode 100644
index ec7867d54..000000000
--- a/gfx/overworld/090.2bpp
+++ /dev/null
diff --git a/gfx/overworld/090.png b/gfx/overworld/090.png
new file mode 100644
index 000000000..4eaae4591
--- /dev/null
+++ b/gfx/overworld/090.png
diff --git a/gfx/overworld/091.2bpp b/gfx/overworld/091.2bpp
deleted file mode 100644
index 182a360fe..000000000
--- a/gfx/overworld/091.2bpp
+++ /dev/null
diff --git a/gfx/overworld/091.png b/gfx/overworld/091.png
new file mode 100644
index 000000000..15ff22d0a
--- /dev/null
+++ b/gfx/overworld/091.png
diff --git a/gfx/overworld/092.2bpp b/gfx/overworld/092.2bpp
deleted file mode 100644
index 3c38a9b3a..000000000
--- a/gfx/overworld/092.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-;2nO]i6)]`�й���lLv�ږl���3M���Gx0?
>������������
\ No newline at end of file
diff --git a/gfx/overworld/092.png b/gfx/overworld/092.png
new file mode 100644
index 000000000..b27633907
--- /dev/null
+++ b/gfx/overworld/092.png
diff --git a/gfx/overworld/093.2bpp b/gfx/overworld/093.2bpp
deleted file mode 100644
index 594985e43..000000000
--- a/gfx/overworld/093.2bpp
+++ /dev/null
diff --git a/gfx/overworld/093.png b/gfx/overworld/093.png
new file mode 100644
index 000000000..cc12f9f34
--- /dev/null
+++ b/gfx/overworld/093.png
diff --git a/gfx/overworld/094.2bpp b/gfx/overworld/094.2bpp
deleted file mode 100644
index 73964d04e..000000000
--- a/gfx/overworld/094.2bpp
+++ /dev/null
diff --git a/gfx/overworld/094.png b/gfx/overworld/094.png
new file mode 100644
index 000000000..458cda431
--- /dev/null
+++ b/gfx/overworld/094.png
diff --git a/gfx/overworld/095.2bpp b/gfx/overworld/095.2bpp
deleted file mode 100644
index a4d55c72d..000000000
--- a/gfx/overworld/095.2bpp
+++ /dev/null
diff --git a/gfx/overworld/095.png b/gfx/overworld/095.png
new file mode 100644
index 000000000..d4339470e
--- /dev/null
+++ b/gfx/overworld/095.png
diff --git a/gfx/overworld/096.2bpp b/gfx/overworld/096.2bpp
deleted file mode 100644
index 11e6a4fd5..000000000
--- a/gfx/overworld/096.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-%?/:����0��8xȤ��\��G��xOO3>

�O������|H��p��(7/8�������8�������c\t?<

a����:.��<���p��	'>-;���8��8�Ȅ�����
?3S����|D88�������_���>"		q����<����.��"Oy?<OO?>

�'������|�x@���	t�����
-�����C1?

1��������X谰,3O|[w?%?)?)��� p��p�����0>#?3S����uM88��������?���
\ No newline at end of file
diff --git a/gfx/overworld/096.png b/gfx/overworld/096.png
new file mode 100644
index 000000000..161ce5722
--- /dev/null
+++ b/gfx/overworld/096.png
diff --git a/gfx/overworld/097.2bpp b/gfx/overworld/097.2bpp
deleted file mode 100644
index 7da1f4b4a..000000000
--- a/gfx/overworld/097.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-/0P@oV����������
-��jp?3{LK?<8/����2���<�����??___����������������??/<[X0?���<����������? ? ? ?,����x��x�<�<�|�? �x���x��������
\ No newline at end of file
diff --git a/gfx/overworld/097.png b/gfx/overworld/097.png
new file mode 100644
index 000000000..69e46b84c
--- /dev/null
+++ b/gfx/overworld/097.png
diff --git a/gfx/overworld/098.2bpp b/gfx/overworld/098.2bpp
deleted file mode 100644
index 45ee3056d..000000000
--- a/gfx/overworld/098.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-

>}}56=w^���| �������,�n�����y_y_�R^�O�W�����WuJz08
\ No newline at end of file
diff --git a/gfx/overworld/098.png b/gfx/overworld/098.png
new file mode 100644
index 000000000..c3aef5c6c
--- /dev/null
+++ b/gfx/overworld/098.png
diff --git a/gfx/overworld/099.2bpp b/gfx/overworld/099.2bpp
deleted file mode 100644
index e95759482..000000000
--- a/gfx/overworld/099.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-

?8O~5?C7=���X�h��~�����7<?-?'?;??~F~R<<�<��������~b~J<<
\ No newline at end of file
diff --git a/gfx/overworld/099.png b/gfx/overworld/099.png
new file mode 100644
index 000000000..1ff4fd63c
--- /dev/null
+++ b/gfx/overworld/099.png
diff --git a/gfx/overworld/100.2bpp b/gfx/overworld/100.2bpp
deleted file mode 100644
index 3aa0fd5c0..000000000
--- a/gfx/overworld/100.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?/{O]S���������������?(?=w}s#?:>~V||��������^~~j>>
\ No newline at end of file
diff --git a/gfx/overworld/100.png b/gfx/overworld/100.png
new file mode 100644
index 000000000..4a5f1f186
--- /dev/null
+++ b/gfx/overworld/100.png
diff --git a/gfx/overworld/101.2bpp b/gfx/overworld/101.2bpp
deleted file mode 100644
index 579b552f1..000000000
--- a/gfx/overworld/101.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-????_~ToR�����������~�*�J?2?'=&�Lx���d�����xx????__o_����������������;7?/8/���8����x���pp??7?+7�������������.�.��8���0�0������
\ No newline at end of file
diff --git a/gfx/overworld/101.png b/gfx/overworld/101.png
new file mode 100644
index 000000000..61a8b79c6
--- /dev/null
+++ b/gfx/overworld/101.png
diff --git a/gfx/overworld/chris_fish.2bpp b/gfx/overworld/chris_fish.2bpp
deleted file mode 100644
index c3609ab54..000000000
--- a/gfx/overworld/chris_fish.2bpp
+++ /dev/null
diff --git a/gfx/overworld/chris_fish.png b/gfx/overworld/chris_fish.png
new file mode 100644
index 000000000..ea0730151
--- /dev/null
+++ b/gfx/overworld/chris_fish.png
diff --git a/gfx/overworld/headbutt_tree.png b/gfx/overworld/headbutt_tree.png
new file mode 100644
index 000000000..4cbb595f7
--- /dev/null
+++ b/gfx/overworld/headbutt_tree.png
diff --git a/gfx/overworld/kris_fish.2bpp b/gfx/overworld/kris_fish.2bpp
deleted file mode 100644
index 9d47dc140..000000000
--- a/gfx/overworld/kris_fish.2bpp
+++ /dev/null
diff --git a/gfx/overworld/kris_fish.png b/gfx/overworld/kris_fish.png
new file mode 100644
index 000000000..a47b89042
--- /dev/null
+++ b/gfx/overworld/kris_fish.png
diff --git a/gfx/overworld/trainer_battle_pokeball_tiles.2bpp b/gfx/overworld/trainer_battle_pokeball_tiles.2bpp
deleted file mode 100644
index 09e51fd67..000000000
--- a/gfx/overworld/trainer_battle_pokeball_tiles.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-����Á��ý��������������������
\ No newline at end of file
diff --git a/gfx/overworld/trainer_battle_pokeball_tiles.png b/gfx/overworld/trainer_battle_pokeball_tiles.png
new file mode 100644
index 000000000..a4655d26e
--- /dev/null
+++ b/gfx/overworld/trainer_battle_pokeball_tiles.png
diff --git a/gfx/pc.2bpp.lz b/gfx/pc.2bpp.lz.2201c1aa
index 996cfadc9..996cfadc9 100644
--- a/gfx/pc.2bpp.lz
+++ b/gfx/pc.2bpp.lz.2201c1aa
diff --git a/gfx/pc.png b/gfx/pc.png
new file mode 100644
index 000000000..ce8fed73b
--- /dev/null
+++ b/gfx/pc.png
diff --git a/gfx/pc_mail.2bpp b/gfx/pc_mail.2bpp
deleted file mode 100644
index 9a6d66ab9..000000000
--- a/gfx/pc_mail.2bpp
+++ /dev/null
diff --git a/gfx/pc_mail.png b/gfx/pc_mail.png
new file mode 100644
index 000000000..fd4b2892f
--- /dev/null
+++ b/gfx/pc_mail.png
diff --git a/gfx/pokedex/pokedex.2bpp.lz b/gfx/pokedex/pokedex.2bpp.lz.3726dd3f
index 8f7e3aafb..8f7e3aafb 100644
--- a/gfx/pokedex/pokedex.2bpp.lz
+++ b/gfx/pokedex/pokedex.2bpp.lz.3726dd3f
diff --git a/gfx/pokedex/pokedex.png b/gfx/pokedex/pokedex.png
new file mode 100644
index 000000000..48af514c7
--- /dev/null
+++ b/gfx/pokedex/pokedex.png
diff --git a/gfx/pokedex/select_start.2bpp b/gfx/pokedex/select_start.2bpp
deleted file mode 100644
index c223eb635..000000000
--- a/gfx/pokedex/select_start.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�����ˉ�����������,,mm,,mmmm$$�����������������������������ۛ�������UUUUUUUU����������������
\ No newline at end of file
diff --git a/gfx/pokedex/select_start.png b/gfx/pokedex/select_start.png
new file mode 100644
index 000000000..efa8d4a46
--- /dev/null
+++ b/gfx/pokedex/select_start.png
diff --git a/gfx/pokedex/sgb.2bpp.lz b/gfx/pokedex/sgb.2bpp.lz.82bc0a7b
index 6ec9c46b2..6ec9c46b2 100644
--- a/gfx/pokedex/sgb.2bpp.lz
+++ b/gfx/pokedex/sgb.2bpp.lz.82bc0a7b
diff --git a/gfx/pokedex/sgb.png b/gfx/pokedex/sgb.png
new file mode 100644
index 000000000..bbacb114d
--- /dev/null
+++ b/gfx/pokedex/sgb.png
diff --git a/gfx/pokedex/slowpoke.2bpp.lz b/gfx/pokedex/slowpoke.2bpp.lz.49a91b42
index b8d0e4902..b8d0e4902 100644
--- a/gfx/pokedex/slowpoke.2bpp.lz
+++ b/gfx/pokedex/slowpoke.2bpp.lz.49a91b42
diff --git a/gfx/pokedex/slowpoke.png b/gfx/pokedex/slowpoke.png
new file mode 100644
index 000000000..5c1909a33
--- /dev/null
+++ b/gfx/pokedex/slowpoke.png
diff --git a/gfx/pokegear/dexmap_nest_icon.2bpp b/gfx/pokegear/dexmap_nest_icon.2bpp
deleted file mode 100644
index 48a4938e6..000000000
--- a/gfx/pokegear/dexmap_nest_icon.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-BBff��������ZZ$$
\ No newline at end of file
diff --git a/gfx/pokegear/dexmap_nest_icon.png b/gfx/pokegear/dexmap_nest_icon.png
new file mode 100644
index 000000000..f8ffdc82d
--- /dev/null
+++ b/gfx/pokegear/dexmap_nest_icon.png
diff --git a/gfx/pokegear/flymap_label_border.2bpp b/gfx/pokegear/flymap_label_border.2bpp
deleted file mode 100644
index 671aab1d7..000000000
--- a/gfx/pokegear/flymap_label_border.2bpp
+++ /dev/null
diff --git a/gfx/pokegear/flymap_label_border.png b/gfx/pokegear/flymap_label_border.png
new file mode 100644
index 000000000..69818d0e5
--- /dev/null
+++ b/gfx/pokegear/flymap_label_border.png
diff --git a/gfx/shrink1.2bpp.lz b/gfx/shrink1.2bpp.lz.d4443930
index 284bee8c2..284bee8c2 100644
--- a/gfx/shrink1.2bpp.lz
+++ b/gfx/shrink1.2bpp.lz.d4443930
diff --git a/gfx/shrink1.png b/gfx/shrink1.png
new file mode 100644
index 000000000..6cf5b8077
--- /dev/null
+++ b/gfx/shrink1.png
diff --git a/gfx/shrink2.2bpp.lz b/gfx/shrink2.2bpp.lz.3f58480a
index df14d5ed4..df14d5ed4 100644
--- a/gfx/shrink2.2bpp.lz
+++ b/gfx/shrink2.2bpp.lz.3f58480a
diff --git a/gfx/shrink2.png b/gfx/shrink2.png
new file mode 100644
index 000000000..276b4e7c7
--- /dev/null
+++ b/gfx/shrink2.png
diff --git a/gfx/slots_1.2bpp.lz b/gfx/slots_1.2bpp.lz.b22ddc13
index 90d3ce139..90d3ce139 100644
--- a/gfx/slots_1.2bpp.lz
+++ b/gfx/slots_1.2bpp.lz.b22ddc13
diff --git a/gfx/slots_1.png b/gfx/slots_1.png
new file mode 100644
index 000000000..a10340844
--- /dev/null
+++ b/gfx/slots_1.png
diff --git a/gfx/slots_2.2bpp.lz b/gfx/slots_2.2bpp.lz.b28f76e3
index 638c68055..638c68055 100644
--- a/gfx/slots_2.2bpp.lz
+++ b/gfx/slots_2.2bpp.lz.b28f76e3
diff --git a/gfx/slots_2.png b/gfx/slots_2.png
new file mode 100644
index 000000000..aa1292ccb
--- /dev/null
+++ b/gfx/slots_2.png
diff --git a/gfx/slots_3.2bpp.lz b/gfx/slots_3.2bpp.lz.70c2984c
index 858b6e464..858b6e464 100644
--- a/gfx/slots_3.2bpp.lz
+++ b/gfx/slots_3.2bpp.lz.70c2984c
diff --git a/gfx/slots_3.png b/gfx/slots_3.png
new file mode 100755
index 000000000..456e9b6bf
--- /dev/null
+++ b/gfx/slots_3.png
diff --git a/gfx/special/celebi/1.2bpp b/gfx/special/celebi/1.2bpp
deleted file mode 100644
index 6379fc92f..000000000
--- a/gfx/special/celebi/1.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-00.>	��d$6�����&�����_g?83<}__{jn�����@� ظ��00
\ No newline at end of file
diff --git a/gfx/special/celebi/1.png b/gfx/special/celebi/1.png
new file mode 100644
index 000000000..bd07ec8c4
--- /dev/null
+++ b/gfx/special/celebi/1.png
diff --git a/gfx/special/celebi/2.2bpp b/gfx/special/celebi/2.2bpp
deleted file mode 100644
index f7c3294d3..000000000
--- a/gfx/special/celebi/2.2bpp
+++ /dev/null
diff --git a/gfx/special/celebi/2.png b/gfx/special/celebi/2.png
new file mode 100644
index 000000000..c83a8788a
--- /dev/null
+++ b/gfx/special/celebi/2.png
diff --git a/gfx/special/celebi/3.2bpp b/gfx/special/celebi/3.2bpp
deleted file mode 100644
index 00cac65a7..000000000
--- a/gfx/special/celebi/3.2bpp
+++ /dev/null
diff --git a/gfx/special/celebi/3.png b/gfx/special/celebi/3.png
new file mode 100644
index 000000000..6233fc56d
--- /dev/null
+++ b/gfx/special/celebi/3.png
diff --git a/gfx/special/celebi/4.2bpp b/gfx/special/celebi/4.2bpp
deleted file mode 100644
index 00cac65a7..000000000
--- a/gfx/special/celebi/4.2bpp
+++ /dev/null
diff --git a/gfx/special/celebi/4.png b/gfx/special/celebi/4.png
new file mode 100644
index 000000000..6233fc56d
--- /dev/null
+++ b/gfx/special/celebi/4.png
diff --git a/gfx/special/celebi/leaf.2bpp b/gfx/special/celebi/leaf.2bpp
deleted file mode 100644
index 1c8a3f9a8..000000000
--- a/gfx/special/celebi/leaf.2bpp
+++ /dev/null
diff --git a/gfx/special/celebi/leaf.png b/gfx/special/celebi/leaf.png
new file mode 100644
index 000000000..b10e0cf8c
--- /dev/null
+++ b/gfx/special/celebi/leaf.png
diff --git a/gfx/splash/logo.1bpp b/gfx/splash/logo.1bpp
deleted file mode 100644
index c59bf6197..000000000
--- a/gfx/splash/logo.1bpp
+++ /dev/null
diff --git a/gfx/splash/logo1.png b/gfx/splash/logo1.png
new file mode 100755
index 000000000..1d2d6f479
--- /dev/null
+++ b/gfx/splash/logo1.png
diff --git a/gfx/splash/logo2.png b/gfx/splash/logo2.png
new file mode 100755
index 000000000..7038efb54
--- /dev/null
+++ b/gfx/splash/logo2.png
diff --git a/gfx/stats/shiny.2bpp b/gfx/stats/shiny.2bpp
deleted file mode 100644
index cfe4e8f9e..000000000
--- a/gfx/stats/shiny.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-@@��BB88
\ No newline at end of file
diff --git a/gfx/stats/shiny.png b/gfx/stats/shiny.png
new file mode 100644
index 000000000..010aeafbf
--- /dev/null
+++ b/gfx/stats/shiny.png
diff --git a/gfx/tilesets/00.2bpp.lz b/gfx/tilesets/00.2bpp.lz.0c7e555a
index 9821e1433..9821e1433 100644
--- a/gfx/tilesets/00.2bpp.lz
+++ b/gfx/tilesets/00.2bpp.lz.0c7e555a
diff --git a/gfx/tilesets/00.png b/gfx/tilesets/00.png
new file mode 100644
index 000000000..0fc2db12f
--- /dev/null
+++ b/gfx/tilesets/00.png
diff --git a/gfx/tilesets/01.2bpp.lz b/gfx/tilesets/01.2bpp.lz.0c7e555a
index 9821e1433..9821e1433 100644
--- a/gfx/tilesets/01.2bpp.lz
+++ b/gfx/tilesets/01.2bpp.lz.0c7e555a
diff --git a/gfx/tilesets/01.png b/gfx/tilesets/01.png
new file mode 100644
index 000000000..0fc2db12f
--- /dev/null
+++ b/gfx/tilesets/01.png
diff --git a/gfx/tilesets/02.2bpp.lz b/gfx/tilesets/02.2bpp.lz.391603fb
index 64f23e23b..64f23e23b 100644
--- a/gfx/tilesets/02.2bpp.lz
+++ b/gfx/tilesets/02.2bpp.lz.391603fb
diff --git a/gfx/tilesets/02.png b/gfx/tilesets/02.png
new file mode 100644
index 000000000..126573b7b
--- /dev/null
+++ b/gfx/tilesets/02.png
diff --git a/gfx/tilesets/03.2bpp.lz b/gfx/tilesets/03.2bpp.lz.a29f5d51
index d925ee111..d925ee111 100644
--- a/gfx/tilesets/03.2bpp.lz
+++ b/gfx/tilesets/03.2bpp.lz.a29f5d51
diff --git a/gfx/tilesets/03.png b/gfx/tilesets/03.png
new file mode 100644
index 000000000..08b2cbeea
--- /dev/null
+++ b/gfx/tilesets/03.png
diff --git a/gfx/tilesets/04.2bpp.lz b/gfx/tilesets/04.2bpp.lz.391603fb
index 64f23e23b..64f23e23b 100644
--- a/gfx/tilesets/04.2bpp.lz
+++ b/gfx/tilesets/04.2bpp.lz.391603fb
diff --git a/gfx/tilesets/04.png b/gfx/tilesets/04.png
new file mode 100644
index 000000000..126573b7b
--- /dev/null
+++ b/gfx/tilesets/04.png
diff --git a/gfx/tilesets/05.2bpp.lz b/gfx/tilesets/05.2bpp.lz.c848ef13
index f9afaf70d..f9afaf70d 100644
--- a/gfx/tilesets/05.2bpp.lz
+++ b/gfx/tilesets/05.2bpp.lz.c848ef13
diff --git a/gfx/tilesets/05.png b/gfx/tilesets/05.png
new file mode 100644
index 000000000..3ab7b5ce8
--- /dev/null
+++ b/gfx/tilesets/05.png
diff --git a/gfx/tilesets/06.2bpp.lz b/gfx/tilesets/06.2bpp.lz.252cbd8f
index 17c64de65..17c64de65 100644
--- a/gfx/tilesets/06.2bpp.lz
+++ b/gfx/tilesets/06.2bpp.lz.252cbd8f
diff --git a/gfx/tilesets/06.png b/gfx/tilesets/06.png
new file mode 100644
index 000000000..b49f799d8
--- /dev/null
+++ b/gfx/tilesets/06.png
diff --git a/gfx/tilesets/07.2bpp.lz b/gfx/tilesets/07.2bpp.lz.e1c4014c
index 71783d9f2..71783d9f2 100644
--- a/gfx/tilesets/07.2bpp.lz
+++ b/gfx/tilesets/07.2bpp.lz.e1c4014c
diff --git a/gfx/tilesets/07.png b/gfx/tilesets/07.png
new file mode 100644
index 000000000..d4084ebd4
--- /dev/null
+++ b/gfx/tilesets/07.png
diff --git a/gfx/tilesets/08.2bpp.lz b/gfx/tilesets/08.2bpp.lz.f5a55006
index 724b6b8b7..724b6b8b7 100644
--- a/gfx/tilesets/08.2bpp.lz
+++ b/gfx/tilesets/08.2bpp.lz.f5a55006
diff --git a/gfx/tilesets/08.png b/gfx/tilesets/08.png
new file mode 100644
index 000000000..b8f2db2d2
--- /dev/null
+++ b/gfx/tilesets/08.png
diff --git a/gfx/tilesets/09.2bpp.lz b/gfx/tilesets/09.2bpp.lz.56b1a405
index 96dd2e594..96dd2e594 100644
--- a/gfx/tilesets/09.2bpp.lz
+++ b/gfx/tilesets/09.2bpp.lz.56b1a405
diff --git a/gfx/tilesets/09.png b/gfx/tilesets/09.png
new file mode 100644
index 000000000..6990a7d7b
--- /dev/null
+++ b/gfx/tilesets/09.png
diff --git a/gfx/tilesets/10.2bpp.lz b/gfx/tilesets/10.2bpp.lz.b8d0f547
index cd0f43861..cd0f43861 100644
--- a/gfx/tilesets/10.2bpp.lz
+++ b/gfx/tilesets/10.2bpp.lz.b8d0f547
diff --git a/gfx/tilesets/10.png b/gfx/tilesets/10.png
new file mode 100644
index 000000000..418a068fa
--- /dev/null
+++ b/gfx/tilesets/10.png
diff --git a/gfx/tilesets/11.2bpp.lz b/gfx/tilesets/11.2bpp.lz.454cfd8b
index 584e54dd2..584e54dd2 100644
--- a/gfx/tilesets/11.2bpp.lz
+++ b/gfx/tilesets/11.2bpp.lz.454cfd8b
diff --git a/gfx/tilesets/11.png b/gfx/tilesets/11.png
new file mode 100644
index 000000000..b72e3f401
--- /dev/null
+++ b/gfx/tilesets/11.png
diff --git a/gfx/tilesets/12.2bpp.lz b/gfx/tilesets/12.2bpp.lz.e2e94f92
index e8091a899..e8091a899 100644
--- a/gfx/tilesets/12.2bpp.lz
+++ b/gfx/tilesets/12.2bpp.lz.e2e94f92
diff --git a/gfx/tilesets/12.png b/gfx/tilesets/12.png
new file mode 100644
index 000000000..4053283bc
--- /dev/null
+++ b/gfx/tilesets/12.png
diff --git a/gfx/tilesets/13.2bpp.lz b/gfx/tilesets/13.2bpp.lz.63b414d4
index b68f147d0..b68f147d0 100644
--- a/gfx/tilesets/13.2bpp.lz
+++ b/gfx/tilesets/13.2bpp.lz.63b414d4
diff --git a/gfx/tilesets/13.png b/gfx/tilesets/13.png
new file mode 100644
index 000000000..7dde8574e
--- /dev/null
+++ b/gfx/tilesets/13.png
diff --git a/gfx/tilesets/14.2bpp.lz b/gfx/tilesets/14.2bpp.lz.71d29a2f
index f7e185b4e..f7e185b4e 100644
--- a/gfx/tilesets/14.2bpp.lz
+++ b/gfx/tilesets/14.2bpp.lz.71d29a2f
diff --git a/gfx/tilesets/14.png b/gfx/tilesets/14.png
new file mode 100644
index 000000000..776900638
--- /dev/null
+++ b/gfx/tilesets/14.png
diff --git a/gfx/tilesets/15.2bpp.lz b/gfx/tilesets/15.2bpp.lz.c1f2ed8f
index 6b45c769d..6b45c769d 100644
--- a/gfx/tilesets/15.2bpp.lz
+++ b/gfx/tilesets/15.2bpp.lz.c1f2ed8f
diff --git a/gfx/tilesets/15.png b/gfx/tilesets/15.png
new file mode 100644
index 000000000..582b9365d
--- /dev/null
+++ b/gfx/tilesets/15.png
diff --git a/gfx/tilesets/16.2bpp.lz b/gfx/tilesets/16.2bpp.lz.dd51d079
index 28f025413..28f025413 100644
--- a/gfx/tilesets/16.2bpp.lz
+++ b/gfx/tilesets/16.2bpp.lz.dd51d079
diff --git a/gfx/tilesets/16.png b/gfx/tilesets/16.png
new file mode 100644
index 000000000..3d6f1b511
--- /dev/null
+++ b/gfx/tilesets/16.png
diff --git a/gfx/tilesets/17.2bpp.lz b/gfx/tilesets/17.2bpp.lz.1600ca86
index 56e509f5e..56e509f5e 100644
--- a/gfx/tilesets/17.2bpp.lz
+++ b/gfx/tilesets/17.2bpp.lz.1600ca86
diff --git a/gfx/tilesets/17.png b/gfx/tilesets/17.png
new file mode 100644
index 000000000..0c148f95d
--- /dev/null
+++ b/gfx/tilesets/17.png
diff --git a/gfx/tilesets/18.2bpp.lz b/gfx/tilesets/18.2bpp.lz.93800351
index e19994f37..e19994f37 100644
--- a/gfx/tilesets/18.2bpp.lz
+++ b/gfx/tilesets/18.2bpp.lz.93800351
diff --git a/gfx/tilesets/18.png b/gfx/tilesets/18.png
new file mode 100644
index 000000000..350c04932
--- /dev/null
+++ b/gfx/tilesets/18.png
diff --git a/gfx/tilesets/19.2bpp.lz b/gfx/tilesets/19.2bpp.lz.0c1544c1
index d208e65c3..d208e65c3 100644
--- a/gfx/tilesets/19.2bpp.lz
+++ b/gfx/tilesets/19.2bpp.lz.0c1544c1
diff --git a/gfx/tilesets/19.png b/gfx/tilesets/19.png
new file mode 100644
index 000000000..920ee30ec
--- /dev/null
+++ b/gfx/tilesets/19.png
diff --git a/gfx/tilesets/20.2bpp.lz b/gfx/tilesets/20.2bpp.lz.35e51007
index b458a501d..b458a501d 100644
--- a/gfx/tilesets/20.2bpp.lz
+++ b/gfx/tilesets/20.2bpp.lz.35e51007
diff --git a/gfx/tilesets/20.png b/gfx/tilesets/20.png
new file mode 100644
index 000000000..e46a847b9
--- /dev/null
+++ b/gfx/tilesets/20.png
diff --git a/gfx/tilesets/21.2bpp.lz b/gfx/tilesets/21.2bpp.lz.febbc4ec
index 5b787c854..5b787c854 100644
--- a/gfx/tilesets/21.2bpp.lz
+++ b/gfx/tilesets/21.2bpp.lz.febbc4ec
diff --git a/gfx/tilesets/21.png b/gfx/tilesets/21.png
new file mode 100644
index 000000000..889b02727
--- /dev/null
+++ b/gfx/tilesets/21.png
diff --git a/gfx/tilesets/22.2bpp.lz b/gfx/tilesets/22.2bpp.lz.467b6a2d
index fa5d0a9f0..fa5d0a9f0 100644
--- a/gfx/tilesets/22.2bpp.lz
+++ b/gfx/tilesets/22.2bpp.lz.467b6a2d
diff --git a/gfx/tilesets/22.png b/gfx/tilesets/22.png
new file mode 100644
index 000000000..1cd57402d
--- /dev/null
+++ b/gfx/tilesets/22.png
diff --git a/gfx/tilesets/23.2bpp.lz b/gfx/tilesets/23.2bpp.lz.bc56789c
index 2033306e3..2033306e3 100644
--- a/gfx/tilesets/23.2bpp.lz
+++ b/gfx/tilesets/23.2bpp.lz.bc56789c
diff --git a/gfx/tilesets/23.png b/gfx/tilesets/23.png
new file mode 100644
index 000000000..268fc998f
--- /dev/null
+++ b/gfx/tilesets/23.png
diff --git a/gfx/tilesets/24.2bpp.lz b/gfx/tilesets/24.2bpp.lz.3437812a
index 69069fb75..69069fb75 100644
--- a/gfx/tilesets/24.2bpp.lz
+++ b/gfx/tilesets/24.2bpp.lz.3437812a
diff --git a/gfx/tilesets/24.png b/gfx/tilesets/24.png
new file mode 100644
index 000000000..0e5bdee7e
--- /dev/null
+++ b/gfx/tilesets/24.png
diff --git a/gfx/tilesets/25.2bpp.lz b/gfx/tilesets/25.2bpp.lz.7fcb81d6
index 01a0e56bd..01a0e56bd 100644
--- a/gfx/tilesets/25.2bpp.lz
+++ b/gfx/tilesets/25.2bpp.lz.7fcb81d6
diff --git a/gfx/tilesets/25.png b/gfx/tilesets/25.png
new file mode 100644
index 000000000..7a4a5f8eb
--- /dev/null
+++ b/gfx/tilesets/25.png
diff --git a/gfx/tilesets/26.2bpp.lz b/gfx/tilesets/26.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/26.2bpp.lz
+++ b/gfx/tilesets/26.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/26.png b/gfx/tilesets/26.png
new file mode 100644
index 000000000..f41866c58
--- /dev/null
+++ b/gfx/tilesets/26.png
diff --git a/gfx/tilesets/27.2bpp.lz b/gfx/tilesets/27.2bpp.lz.27cdd9ad
index 34be33856..34be33856 100644
--- a/gfx/tilesets/27.2bpp.lz
+++ b/gfx/tilesets/27.2bpp.lz.27cdd9ad
diff --git a/gfx/tilesets/27.png b/gfx/tilesets/27.png
new file mode 100644
index 000000000..8d2d32e1f
--- /dev/null
+++ b/gfx/tilesets/27.png
diff --git a/gfx/tilesets/28.2bpp.lz b/gfx/tilesets/28.2bpp.lz.cace291c
index c204dca26..c204dca26 100644
--- a/gfx/tilesets/28.2bpp.lz
+++ b/gfx/tilesets/28.2bpp.lz.cace291c
diff --git a/gfx/tilesets/28.png b/gfx/tilesets/28.png
new file mode 100644
index 000000000..0a83d2043
--- /dev/null
+++ b/gfx/tilesets/28.png
diff --git a/gfx/tilesets/29.2bpp.lz b/gfx/tilesets/29.2bpp.lz.e23bc89f
index 25cc45c85..25cc45c85 100644
--- a/gfx/tilesets/29.2bpp.lz
+++ b/gfx/tilesets/29.2bpp.lz.e23bc89f
diff --git a/gfx/tilesets/29.png b/gfx/tilesets/29.png
new file mode 100644
index 000000000..d70eb53be
--- /dev/null
+++ b/gfx/tilesets/29.png
diff --git a/gfx/tilesets/30.2bpp.lz b/gfx/tilesets/30.2bpp.lz.25b9c4b6
index 50a5ab9ac..50a5ab9ac 100644
--- a/gfx/tilesets/30.2bpp.lz
+++ b/gfx/tilesets/30.2bpp.lz.25b9c4b6
diff --git a/gfx/tilesets/30.png b/gfx/tilesets/30.png
new file mode 100644
index 000000000..9dc74c45b
--- /dev/null
+++ b/gfx/tilesets/30.png
diff --git a/gfx/tilesets/31.2bpp.lz b/gfx/tilesets/31.2bpp.lz.6b0ac896
index 7b5355705..7b5355705 100644
--- a/gfx/tilesets/31.2bpp.lz
+++ b/gfx/tilesets/31.2bpp.lz.6b0ac896
diff --git a/gfx/tilesets/31.png b/gfx/tilesets/31.png
new file mode 100644
index 000000000..a85cc0394
--- /dev/null
+++ b/gfx/tilesets/31.png
diff --git a/gfx/tilesets/32.2bpp.lz b/gfx/tilesets/32.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/32.2bpp.lz
+++ b/gfx/tilesets/32.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/32.png b/gfx/tilesets/32.png
new file mode 100644
index 000000000..f41866c58
--- /dev/null
+++ b/gfx/tilesets/32.png
diff --git a/gfx/tilesets/33.2bpp.lz b/gfx/tilesets/33.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/33.2bpp.lz
+++ b/gfx/tilesets/33.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/33.png b/gfx/tilesets/33.png
new file mode 100644
index 000000000..f41866c58
--- /dev/null
+++ b/gfx/tilesets/33.png
diff --git a/gfx/tilesets/34.2bpp.lz b/gfx/tilesets/34.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/34.2bpp.lz
+++ b/gfx/tilesets/34.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/34.png b/gfx/tilesets/34.png
new file mode 100644
index 000000000..f41866c58
--- /dev/null
+++ b/gfx/tilesets/34.png
diff --git a/gfx/tilesets/35.2bpp.lz b/gfx/tilesets/35.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/35.2bpp.lz
+++ b/gfx/tilesets/35.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/35.png b/gfx/tilesets/35.png
new file mode 100644
index 000000000..f41866c58
--- /dev/null
+++ b/gfx/tilesets/35.png
diff --git a/gfx/tilesets/36.2bpp.lz b/gfx/tilesets/36.2bpp.lz.8b42470b
index 68a4fdad0..68a4fdad0 100644
--- a/gfx/tilesets/36.2bpp.lz
+++ b/gfx/tilesets/36.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/36.png b/gfx/tilesets/36.png
new file mode 100644
index 000000000..f41866c58
--- /dev/null
+++ b/gfx/tilesets/36.png
diff --git a/gfx/tilesets/flower/cgb_1.2bpp b/gfx/tilesets/flower/cgb_1.2bpp
deleted file mode 100644
index ffe58b93e..000000000
--- a/gfx/tilesets/flower/cgb_1.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�M�-mL�A��HE0
\ No newline at end of file
diff --git a/gfx/tilesets/flower/cgb_1.png b/gfx/tilesets/flower/cgb_1.png
new file mode 100644
index 000000000..e3fd2867b
--- /dev/null
+++ b/gfx/tilesets/flower/cgb_1.png
diff --git a/gfx/tilesets/flower/cgb_2.2bpp b/gfx/tilesets/flower/cgb_2.2bpp
deleted file mode 100644
index 5cf6b583f..000000000
--- a/gfx/tilesets/flower/cgb_2.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�Y$�Z%Z�f%Z�$E
\ No newline at end of file
diff --git a/gfx/tilesets/flower/cgb_2.png b/gfx/tilesets/flower/cgb_2.png
new file mode 100644
index 000000000..901e34a1f
--- /dev/null
+++ b/gfx/tilesets/flower/cgb_2.png
diff --git a/gfx/tilesets/flower/dmg_1.2bpp b/gfx/tilesets/flower/dmg_1.2bpp
deleted file mode 100644
index ec9e9c6d4..000000000
--- a/gfx/tilesets/flower/dmg_1.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�A�!a �1��HE0
\ No newline at end of file
diff --git a/gfx/tilesets/flower/dmg_1.png b/gfx/tilesets/flower/dmg_1.png
new file mode 100644
index 000000000..428514af4
--- /dev/null
+++ b/gfx/tilesets/flower/dmg_1.png
diff --git a/gfx/tilesets/flower/dmg_2.2bpp b/gfx/tilesets/flower/dmg_2.2bpp
deleted file mode 100644
index 7bf87eab2..000000000
--- a/gfx/tilesets/flower/dmg_2.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�A$�BB�f
Z�$E
\ No newline at end of file
diff --git a/gfx/tilesets/flower/dmg_2.png b/gfx/tilesets/flower/dmg_2.png
new file mode 100644
index 000000000..9a5125017
--- /dev/null
+++ b/gfx/tilesets/flower/dmg_2.png
diff --git a/gfx/tilesets/forest-tree/1.2bpp b/gfx/tilesets/forest-tree/1.2bpp
deleted file mode 100644
index 73414b5b6..000000000
--- a/gfx/tilesets/forest-tree/1.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�W$�2�0[LG`��
\ No newline at end of file
diff --git a/gfx/tilesets/forest-tree/1.png b/gfx/tilesets/forest-tree/1.png
new file mode 100644
index 000000000..231d9f20e
--- /dev/null
+++ b/gfx/tilesets/forest-tree/1.png
diff --git a/gfx/tilesets/forest-tree/2.2bpp b/gfx/tilesets/forest-tree/2.2bpp
deleted file mode 100644
index 05a566248..000000000
--- a/gfx/tilesets/forest-tree/2.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-�U&�
-:�(3$nq߰
\ No newline at end of file
diff --git a/gfx/tilesets/forest-tree/2.png b/gfx/tilesets/forest-tree/2.png
new file mode 100644
index 000000000..e3048f53b
--- /dev/null
+++ b/gfx/tilesets/forest-tree/2.png
diff --git a/gfx/tilesets/forest-tree/3.2bpp b/gfx/tilesets/forest-tree/3.2bpp
deleted file mode 100644
index f74e64652..000000000
--- a/gfx/tilesets/forest-tree/3.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/forest-tree/3.png b/gfx/tilesets/forest-tree/3.png
new file mode 100644
index 000000000..0b17d12d3
--- /dev/null
+++ b/gfx/tilesets/forest-tree/3.png
diff --git a/gfx/tilesets/forest-tree/4.2bpp b/gfx/tilesets/forest-tree/4.2bpp
deleted file mode 100644
index 3a7284a13..000000000
--- a/gfx/tilesets/forest-tree/4.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/forest-tree/4.png b/gfx/tilesets/forest-tree/4.png
new file mode 100644
index 000000000..04ef9f319
--- /dev/null
+++ b/gfx/tilesets/forest-tree/4.png
diff --git a/gfx/tilesets/fountain/1.2bpp b/gfx/tilesets/fountain/1.2bpp
deleted file mode 100644
index ce84b04f0..000000000
--- a/gfx/tilesets/fountain/1.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/fountain/1.png b/gfx/tilesets/fountain/1.png
new file mode 100644
index 000000000..657a5c455
--- /dev/null
+++ b/gfx/tilesets/fountain/1.png
diff --git a/gfx/tilesets/fountain/2.2bpp b/gfx/tilesets/fountain/2.2bpp
deleted file mode 100644
index 402b6c828..000000000
--- a/gfx/tilesets/fountain/2.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/fountain/2.png b/gfx/tilesets/fountain/2.png
new file mode 100644
index 000000000..af4652b64
--- /dev/null
+++ b/gfx/tilesets/fountain/2.png
diff --git a/gfx/tilesets/fountain/3.2bpp b/gfx/tilesets/fountain/3.2bpp
deleted file mode 100644
index bc15f8b1f..000000000
--- a/gfx/tilesets/fountain/3.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/fountain/3.png b/gfx/tilesets/fountain/3.png
new file mode 100644
index 000000000..ed9c492e8
--- /dev/null
+++ b/gfx/tilesets/fountain/3.png
diff --git a/gfx/tilesets/fountain/4.2bpp b/gfx/tilesets/fountain/4.2bpp
deleted file mode 100644
index 8a53f417b..000000000
--- a/gfx/tilesets/fountain/4.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/fountain/4.png b/gfx/tilesets/fountain/4.png
new file mode 100644
index 000000000..cfc95eea7
--- /dev/null
+++ b/gfx/tilesets/fountain/4.png
diff --git a/gfx/tilesets/fountain/5.2bpp b/gfx/tilesets/fountain/5.2bpp
deleted file mode 100644
index 484691f5f..000000000
--- a/gfx/tilesets/fountain/5.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/fountain/5.png b/gfx/tilesets/fountain/5.png
new file mode 100644
index 000000000..a8c9475f9
--- /dev/null
+++ b/gfx/tilesets/fountain/5.png
diff --git a/gfx/tilesets/roofs/0.2bpp b/gfx/tilesets/roofs/0.2bpp
deleted file mode 100644
index 51650e2e1..000000000
--- a/gfx/tilesets/roofs/0.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/roofs/0.png b/gfx/tilesets/roofs/0.png
new file mode 100644
index 000000000..1aa48fb87
--- /dev/null
+++ b/gfx/tilesets/roofs/0.png
diff --git a/gfx/tilesets/roofs/1.2bpp b/gfx/tilesets/roofs/1.2bpp
deleted file mode 100644
index eea01d2f2..000000000
--- a/gfx/tilesets/roofs/1.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/roofs/1.png b/gfx/tilesets/roofs/1.png
new file mode 100644
index 000000000..1d68754f9
--- /dev/null
+++ b/gfx/tilesets/roofs/1.png
diff --git a/gfx/tilesets/roofs/2.2bpp b/gfx/tilesets/roofs/2.2bpp
deleted file mode 100644
index 67db7f991..000000000
--- a/gfx/tilesets/roofs/2.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/roofs/2.png b/gfx/tilesets/roofs/2.png
new file mode 100644
index 000000000..b97b8787e
--- /dev/null
+++ b/gfx/tilesets/roofs/2.png
diff --git a/gfx/tilesets/roofs/3.2bpp b/gfx/tilesets/roofs/3.2bpp
deleted file mode 100644
index 1d88fac5b..000000000
--- a/gfx/tilesets/roofs/3.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/roofs/3.png b/gfx/tilesets/roofs/3.png
new file mode 100644
index 000000000..14bc411aa
--- /dev/null
+++ b/gfx/tilesets/roofs/3.png
diff --git a/gfx/tilesets/roofs/4.2bpp b/gfx/tilesets/roofs/4.2bpp
deleted file mode 100644
index 87590db99..000000000
--- a/gfx/tilesets/roofs/4.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/roofs/4.png b/gfx/tilesets/roofs/4.png
new file mode 100644
index 000000000..25bf71048
--- /dev/null
+++ b/gfx/tilesets/roofs/4.png
diff --git a/gfx/tilesets/safari/1.2bpp b/gfx/tilesets/safari/1.2bpp
deleted file mode 100644
index d25f1badc..000000000
--- a/gfx/tilesets/safari/1.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/safari/1.png b/gfx/tilesets/safari/1.png
new file mode 100644
index 000000000..c5b500ccc
--- /dev/null
+++ b/gfx/tilesets/safari/1.png
diff --git a/gfx/tilesets/safari/2.2bpp b/gfx/tilesets/safari/2.2bpp
deleted file mode 100644
index bdb3c8cf5..000000000
--- a/gfx/tilesets/safari/2.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/safari/2.png b/gfx/tilesets/safari/2.png
new file mode 100644
index 000000000..1512e35ad
--- /dev/null
+++ b/gfx/tilesets/safari/2.png
diff --git a/gfx/tilesets/safari/3.2bpp b/gfx/tilesets/safari/3.2bpp
deleted file mode 100644
index 2016d2bd6..000000000
--- a/gfx/tilesets/safari/3.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/safari/3.png b/gfx/tilesets/safari/3.png
new file mode 100644
index 000000000..449c2a317
--- /dev/null
+++ b/gfx/tilesets/safari/3.png
diff --git a/gfx/tilesets/safari/4.2bpp b/gfx/tilesets/safari/4.2bpp
deleted file mode 100644
index e0142c688..000000000
--- a/gfx/tilesets/safari/4.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/safari/4.png b/gfx/tilesets/safari/4.png
new file mode 100644
index 000000000..8e4c8e0e5
--- /dev/null
+++ b/gfx/tilesets/safari/4.png
diff --git a/gfx/tilesets/sprout-pillar/1.2bpp b/gfx/tilesets/sprout-pillar/1.2bpp
deleted file mode 100644
index 3bb46c953..000000000
--- a/gfx/tilesets/sprout-pillar/1.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�����������������_�_������?/�/?�?��?��?����_�������O��o�
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/1.png b/gfx/tilesets/sprout-pillar/1.png
new file mode 100644
index 000000000..c22fb2a13
--- /dev/null
+++ b/gfx/tilesets/sprout-pillar/1.png
diff --git a/gfx/tilesets/sprout-pillar/10.2bpp b/gfx/tilesets/sprout-pillar/10.2bpp
deleted file mode 100644
index a1af10a55..000000000
--- a/gfx/tilesets/sprout-pillar/10.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?�_���_������������_���_��������W���������������W���W��������U���u���������
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/10.png b/gfx/tilesets/sprout-pillar/10.png
new file mode 100644
index 000000000..01dbe1afc
--- /dev/null
+++ b/gfx/tilesets/sprout-pillar/10.png
diff --git a/gfx/tilesets/sprout-pillar/2.2bpp b/gfx/tilesets/sprout-pillar/2.2bpp
deleted file mode 100644
index 08d8cfd74..000000000
--- a/gfx/tilesets/sprout-pillar/2.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-������������������������������������������������������������
���������������
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/2.png b/gfx/tilesets/sprout-pillar/2.png
new file mode 100644
index 000000000..76fae403b
--- /dev/null
+++ b/gfx/tilesets/sprout-pillar/2.png
diff --git a/gfx/tilesets/sprout-pillar/3.2bpp b/gfx/tilesets/sprout-pillar/3.2bpp
deleted file mode 100644
index e4bb79a49..000000000
--- a/gfx/tilesets/sprout-pillar/3.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�����������������_�_������?/�/?�?��?��?����_�������O��o�
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/3.png b/gfx/tilesets/sprout-pillar/3.png
new file mode 100644
index 000000000..80ce4657c
--- /dev/null
+++ b/gfx/tilesets/sprout-pillar/3.png
diff --git a/gfx/tilesets/sprout-pillar/4.2bpp b/gfx/tilesets/sprout-pillar/4.2bpp
deleted file mode 100644
index 08897f1da..000000000
--- a/gfx/tilesets/sprout-pillar/4.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-��������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/4.png b/gfx/tilesets/sprout-pillar/4.png
new file mode 100644
index 000000000..9d523c4bc
--- /dev/null
+++ b/gfx/tilesets/sprout-pillar/4.png
diff --git a/gfx/tilesets/sprout-pillar/5.2bpp b/gfx/tilesets/sprout-pillar/5.2bpp
deleted file mode 100644
index f66926bab..000000000
--- a/gfx/tilesets/sprout-pillar/5.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�����������������_�_������������?/�o�������������W�������������[�����������
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/5.png b/gfx/tilesets/sprout-pillar/5.png
new file mode 100644
index 000000000..b7796c8d6
--- /dev/null
+++ b/gfx/tilesets/sprout-pillar/5.png
diff --git a/gfx/tilesets/sprout-pillar/6.2bpp b/gfx/tilesets/sprout-pillar/6.2bpp
deleted file mode 100644
index 5021b1c1f..000000000
--- a/gfx/tilesets/sprout-pillar/6.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-��������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/6.png b/gfx/tilesets/sprout-pillar/6.png
new file mode 100644
index 000000000..0ca0e5936
--- /dev/null
+++ b/gfx/tilesets/sprout-pillar/6.png
diff --git a/gfx/tilesets/sprout-pillar/7.2bpp b/gfx/tilesets/sprout-pillar/7.2bpp
deleted file mode 100644
index 59d6876aa..000000000
--- a/gfx/tilesets/sprout-pillar/7.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�����ݠ߀�����������������������������������������������������������������������
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/7.png b/gfx/tilesets/sprout-pillar/7.png
new file mode 100644
index 000000000..3aa4b4e94
--- /dev/null
+++ b/gfx/tilesets/sprout-pillar/7.png
diff --git a/gfx/tilesets/sprout-pillar/8.2bpp b/gfx/tilesets/sprout-pillar/8.2bpp
deleted file mode 100644
index bb22068b8..000000000
--- a/gfx/tilesets/sprout-pillar/8.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�?�?���_�_�������/�/������������������
���
�
���
�
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/8.png b/gfx/tilesets/sprout-pillar/8.png
new file mode 100644
index 000000000..e81475618
--- /dev/null
+++ b/gfx/tilesets/sprout-pillar/8.png
diff --git a/gfx/tilesets/sprout-pillar/9.2bpp b/gfx/tilesets/sprout-pillar/9.2bpp
deleted file mode 100644
index 1c206fb79..000000000
--- a/gfx/tilesets/sprout-pillar/9.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-��������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/9.png b/gfx/tilesets/sprout-pillar/9.png
new file mode 100644
index 000000000..da74607be
--- /dev/null
+++ b/gfx/tilesets/sprout-pillar/9.png
diff --git a/gfx/tilesets/water.2bpp b/gfx/tilesets/water.2bpp
deleted file mode 100644
index a6e9f6ac9..000000000
--- a/gfx/tilesets/water.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/water.png b/gfx/tilesets/water.png
new file mode 100644
index 000000000..0aa2640c9
--- /dev/null
+++ b/gfx/tilesets/water.png
diff --git a/gfx/tilesets/whirlpool/1.2bpp b/gfx/tilesets/whirlpool/1.2bpp
deleted file mode 100644
index 0a58c6b23..000000000
--- a/gfx/tilesets/whirlpool/1.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/whirlpool/1.png b/gfx/tilesets/whirlpool/1.png
new file mode 100644
index 000000000..4641dbc0d
--- /dev/null
+++ b/gfx/tilesets/whirlpool/1.png
diff --git a/gfx/tilesets/whirlpool/2.2bpp b/gfx/tilesets/whirlpool/2.2bpp
deleted file mode 100644
index e1f841cf9..000000000
--- a/gfx/tilesets/whirlpool/2.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/whirlpool/2.png b/gfx/tilesets/whirlpool/2.png
new file mode 100644
index 000000000..ce5424053
--- /dev/null
+++ b/gfx/tilesets/whirlpool/2.png
diff --git a/gfx/tilesets/whirlpool/3.2bpp b/gfx/tilesets/whirlpool/3.2bpp
deleted file mode 100644
index 9cdec8335..000000000
--- a/gfx/tilesets/whirlpool/3.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/whirlpool/3.png b/gfx/tilesets/whirlpool/3.png
new file mode 100644
index 000000000..55b629440
--- /dev/null
+++ b/gfx/tilesets/whirlpool/3.png
diff --git a/gfx/tilesets/whirlpool/4.2bpp b/gfx/tilesets/whirlpool/4.2bpp
deleted file mode 100644
index 414acce03..000000000
--- a/gfx/tilesets/whirlpool/4.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/whirlpool/4.png b/gfx/tilesets/whirlpool/4.png
new file mode 100644
index 000000000..2175c5957
--- /dev/null
+++ b/gfx/tilesets/whirlpool/4.png
diff --git a/gfx/title/crystal.w48.interleave.2bpp.lz b/gfx/title/crystal.2bpp.lz.cd5aabdd
index 9dcbafc86..9dcbafc86 100644
--- a/gfx/title/crystal.w48.interleave.2bpp.lz
+++ b/gfx/title/crystal.2bpp.lz.cd5aabdd
diff --git a/gfx/title/crystal.png b/gfx/title/crystal.png
new file mode 100644
index 000000000..6f430cf1f
--- /dev/null
+++ b/gfx/title/crystal.png
diff --git a/gfx/title/logo.w160.t4.2bpp.lz b/gfx/title/logo.2bpp.lz.f22013e3
index 0fa7d7744..0fa7d7744 100644
--- a/gfx/title/logo.w160.t4.2bpp.lz
+++ b/gfx/title/logo.2bpp.lz.f22013e3
diff --git a/gfx/title/logo.png b/gfx/title/logo.png
new file mode 100644
index 000000000..2bfff59c9
--- /dev/null
+++ b/gfx/title/logo.png
diff --git a/gfx/title/old_bg.2bpp b/gfx/title/old_bg.2bpp
deleted file mode 100644
index 0f2375ec2..000000000
--- a/gfx/title/old_bg.2bpp
+++ /dev/null
diff --git a/gfx/title/old_bg.png b/gfx/title/old_bg.png
new file mode 100644
index 000000000..2b6d5db20
--- /dev/null
+++ b/gfx/title/old_bg.png
diff --git a/gfx/title/old_fg.2bpp b/gfx/title/old_fg.2bpp
deleted file mode 100644
index 5e291ac33..000000000
--- a/gfx/title/old_fg.2bpp
+++ /dev/null
diff --git a/gfx/title/old_fg.png b/gfx/title/old_fg.png
new file mode 100644
index 000000000..1a7351d58
--- /dev/null
+++ b/gfx/title/old_fg.png
diff --git a/gfx/title/suicune.w128.2bpp.lz b/gfx/title/suicune.2bpp.lz.30e490d0
index 359fd93ca..359fd93ca 100644
--- a/gfx/title/suicune.w128.2bpp.lz
+++ b/gfx/title/suicune.2bpp.lz.30e490d0
diff --git a/gfx/title/suicune.png b/gfx/title/suicune.png
new file mode 100644
index 000000000..074a8ebf7
--- /dev/null
+++ b/gfx/title/suicune.png
diff --git a/gfx/trade/arrow.2bpp b/gfx/trade/arrow.2bpp
deleted file mode 100644
index 637ea13c9..000000000
--- a/gfx/trade/arrow.2bpp
+++ /dev/null
diff --git a/gfx/trade/arrow.png b/gfx/trade/arrow.png
new file mode 100644
index 000000000..b740048ec
--- /dev/null
+++ b/gfx/trade/arrow.png
diff --git a/gfx/trade/ball.2bpp b/gfx/trade/ball.2bpp
deleted file mode 100644
index b90cac274..000000000
--- a/gfx/trade/ball.2bpp
+++ /dev/null
diff --git a/gfx/trade/ball.png b/gfx/trade/ball.png
new file mode 100755
index 000000000..4d3477bb6
--- /dev/null
+++ b/gfx/trade/ball.png
diff --git a/gfx/trade/bubble.2bpp b/gfx/trade/bubble.2bpp
deleted file mode 100644
index c4a7abf4f..000000000
--- a/gfx/trade/bubble.2bpp
+++ /dev/null
diff --git a/gfx/trade/bubble.png b/gfx/trade/bubble.png
new file mode 100644
index 000000000..a6b17ebe7
--- /dev/null
+++ b/gfx/trade/bubble.png
diff --git a/gfx/trade/cable.2bpp b/gfx/trade/cable.2bpp
deleted file mode 100644
index 1f9974e99..000000000
--- a/gfx/trade/cable.2bpp
+++ /dev/null
diff --git a/gfx/trade/cable.png b/gfx/trade/cable.png
new file mode 100644
index 000000000..d06d8a877
--- /dev/null
+++ b/gfx/trade/cable.png
diff --git a/gfx/trade/game_boy.2bpp.lz b/gfx/trade/game_boy.2bpp.lz.71a5f644
index 832164306..832164306 100644
--- a/gfx/trade/game_boy.2bpp.lz
+++ b/gfx/trade/game_boy.2bpp.lz.71a5f644
diff --git a/gfx/trade/game_boy.png b/gfx/trade/game_boy.png
new file mode 100644
index 000000000..64c92260c
--- /dev/null
+++ b/gfx/trade/game_boy.png
diff --git a/gfx/trade/game_boy_n64.png b/gfx/trade/game_boy_n64.png
new file mode 100644
index 000000000..0e324906d
--- /dev/null
+++ b/gfx/trade/game_boy_n64.png
diff --git a/gfx/trade/poof.2bpp b/gfx/trade/poof.2bpp
deleted file mode 100644
index c50e69e68..000000000
--- a/gfx/trade/poof.2bpp
+++ /dev/null
diff --git a/gfx/trade/poof.png b/gfx/trade/poof.png
new file mode 100644
index 000000000..1b09874ba
--- /dev/null
+++ b/gfx/trade/poof.png
diff --git a/gfx/trainers/beauty.2bpp.lz b/gfx/trainers/beauty.2bpp.lz.c1c13787
index 8c5d30ee6..8c5d30ee6 100644
--- a/gfx/trainers/beauty.2bpp.lz
+++ b/gfx/trainers/beauty.2bpp.lz.c1c13787
diff --git a/gfx/trainers/beauty.pal b/gfx/trainers/beauty.pal
deleted file mode 100644
index 7183a0502..000000000
--- a/gfx/trainers/beauty.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 17, 11
-	RGB 08, 09, 17
-
diff --git a/gfx/trainers/beauty.png b/gfx/trainers/beauty.png
new file mode 100644
index 000000000..bb4831290
--- /dev/null
+++ b/gfx/trainers/beauty.png
diff --git a/gfx/trainers/biker.2bpp.lz b/gfx/trainers/biker.2bpp.lz.cb40f7cd
index 07ad8621b..07ad8621b 100644
--- a/gfx/trainers/biker.2bpp.lz
+++ b/gfx/trainers/biker.2bpp.lz.cb40f7cd
diff --git a/gfx/trainers/biker.pal b/gfx/trainers/biker.pal
deleted file mode 100644
index bfffe557d..000000000
--- a/gfx/trainers/biker.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 17, 09
-	RGB 04, 03, 10
-
diff --git a/gfx/trainers/biker.png b/gfx/trainers/biker.png
new file mode 100644
index 000000000..7bd4c84a6
--- /dev/null
+++ b/gfx/trainers/biker.png
diff --git a/gfx/trainers/bird_keeper.2bpp.lz b/gfx/trainers/bird_keeper.2bpp.lz.1e56954c
index 48b505847..48b505847 100644
--- a/gfx/trainers/bird_keeper.2bpp.lz
+++ b/gfx/trainers/bird_keeper.2bpp.lz.1e56954c
diff --git a/gfx/trainers/bird_keeper.pal b/gfx/trainers/bird_keeper.pal
deleted file mode 100644
index ca0407a3b..000000000
--- a/gfx/trainers/bird_keeper.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 22, 17
-	RGB 06, 12, 26
-
diff --git a/gfx/trainers/bird_keeper.png b/gfx/trainers/bird_keeper.png
new file mode 100644
index 000000000..de938ad2b
--- /dev/null
+++ b/gfx/trainers/bird_keeper.png
diff --git a/gfx/trainers/blackbelt_t.2bpp.lz b/gfx/trainers/blackbelt_t.2bpp.lz.4ef2481c
index 086b8fc02..086b8fc02 100644
--- a/gfx/trainers/blackbelt_t.2bpp.lz
+++ b/gfx/trainers/blackbelt_t.2bpp.lz.4ef2481c
diff --git a/gfx/trainers/blackbelt_t.pal b/gfx/trainers/blackbelt_t.pal
deleted file mode 100644
index 59ea02844..000000000
--- a/gfx/trainers/blackbelt_t.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 15, 08
-	RGB 13, 10, 12
-
diff --git a/gfx/trainers/blackbelt_t.png b/gfx/trainers/blackbelt_t.png
new file mode 100644
index 000000000..5d84fa8de
--- /dev/null
+++ b/gfx/trainers/blackbelt_t.png
diff --git a/gfx/trainers/blaine.2bpp.lz b/gfx/trainers/blaine.2bpp.lz.00a3b6f5
index d967bb3ba..d967bb3ba 100644
--- a/gfx/trainers/blaine.2bpp.lz
+++ b/gfx/trainers/blaine.2bpp.lz.00a3b6f5
diff --git a/gfx/trainers/blaine.pal b/gfx/trainers/blaine.pal
deleted file mode 100644
index 90f3a381f..000000000
--- a/gfx/trainers/blaine.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 20, 16
-	RGB 07, 11, 12
-
diff --git a/gfx/trainers/blaine.png b/gfx/trainers/blaine.png
new file mode 100644
index 000000000..1afc558fd
--- /dev/null
+++ b/gfx/trainers/blaine.png
diff --git a/gfx/trainers/blue.2bpp.lz b/gfx/trainers/blue.2bpp.lz.9fdbab8f
index 9d4cb50c6..9d4cb50c6 100644
--- a/gfx/trainers/blue.2bpp.lz
+++ b/gfx/trainers/blue.2bpp.lz.9fdbab8f
diff --git a/gfx/trainers/blue.pal b/gfx/trainers/blue.pal
deleted file mode 100644
index ce6b3f1d7..000000000
--- a/gfx/trainers/blue.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 24, 08
-	RGB 12, 09, 19
-
diff --git a/gfx/trainers/blue.png b/gfx/trainers/blue.png
new file mode 100644
index 000000000..76a1e81af
--- /dev/null
+++ b/gfx/trainers/blue.png
diff --git a/gfx/trainers/boarder.2bpp.lz b/gfx/trainers/boarder.2bpp.lz.5d6881a8
index a6dc315d8..a6dc315d8 100644
--- a/gfx/trainers/boarder.2bpp.lz
+++ b/gfx/trainers/boarder.2bpp.lz.5d6881a8
diff --git a/gfx/trainers/boarder.pal b/gfx/trainers/boarder.pal
deleted file mode 100644
index 4fb9af5e1..000000000
--- a/gfx/trainers/boarder.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 19, 07
-	RGB 13, 10, 19
-
diff --git a/gfx/trainers/boarder.png b/gfx/trainers/boarder.png
new file mode 100644
index 000000000..a8174e9a5
--- /dev/null
+++ b/gfx/trainers/boarder.png
diff --git a/gfx/trainers/brock.2bpp.lz b/gfx/trainers/brock.2bpp.lz.5bdeb7bf
index d7a4e29bf..d7a4e29bf 100644
--- a/gfx/trainers/brock.2bpp.lz
+++ b/gfx/trainers/brock.2bpp.lz.5bdeb7bf
diff --git a/gfx/trainers/brock.pal b/gfx/trainers/brock.pal
deleted file mode 100644
index f5a1b0c06..000000000
--- a/gfx/trainers/brock.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 18, 14
-	RGB 14, 07, 10
-
diff --git a/gfx/trainers/brock.png b/gfx/trainers/brock.png
new file mode 100644
index 000000000..0aea8a946
--- /dev/null
+++ b/gfx/trainers/brock.png
diff --git a/gfx/trainers/bruno.2bpp.lz b/gfx/trainers/bruno.2bpp.lz.22f3c222
index 69406d11d..69406d11d 100644
--- a/gfx/trainers/bruno.2bpp.lz
+++ b/gfx/trainers/bruno.2bpp.lz.22f3c222
diff --git a/gfx/trainers/bruno.pal b/gfx/trainers/bruno.pal
deleted file mode 100644
index 41408a91d..000000000
--- a/gfx/trainers/bruno.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 17, 12
-	RGB 08, 10, 12
-
diff --git a/gfx/trainers/bruno.png b/gfx/trainers/bruno.png
new file mode 100644
index 000000000..c8a003eea
--- /dev/null
+++ b/gfx/trainers/bruno.png
diff --git a/gfx/trainers/bug_catcher.2bpp.lz b/gfx/trainers/bug_catcher.2bpp.lz.43144f97
index cea17dbac..cea17dbac 100644
--- a/gfx/trainers/bug_catcher.2bpp.lz
+++ b/gfx/trainers/bug_catcher.2bpp.lz.43144f97
diff --git a/gfx/trainers/bug_catcher.pal b/gfx/trainers/bug_catcher.pal
deleted file mode 100644
index 8e4df4219..000000000
--- a/gfx/trainers/bug_catcher.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 17, 10
-	RGB 06, 10, 18
-
diff --git a/gfx/trainers/bug_catcher.png b/gfx/trainers/bug_catcher.png
new file mode 100644
index 000000000..a1c065d20
--- /dev/null
+++ b/gfx/trainers/bug_catcher.png
diff --git a/gfx/trainers/bugsy.2bpp.lz b/gfx/trainers/bugsy.2bpp.lz.c070450d
index 7910628aa..7910628aa 100644
--- a/gfx/trainers/bugsy.2bpp.lz
+++ b/gfx/trainers/bugsy.2bpp.lz.c070450d
diff --git a/gfx/trainers/bugsy.pal b/gfx/trainers/bugsy.pal
deleted file mode 100644
index 1743f663b..000000000
--- a/gfx/trainers/bugsy.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 18, 15
-	RGB 13, 21, 06
-
diff --git a/gfx/trainers/bugsy.png b/gfx/trainers/bugsy.png
new file mode 100644
index 000000000..8b1f89537
--- /dev/null
+++ b/gfx/trainers/bugsy.png
diff --git a/gfx/trainers/burglar.2bpp.lz b/gfx/trainers/burglar.2bpp.lz.e063f42e
index 45da954d9..45da954d9 100644
--- a/gfx/trainers/burglar.2bpp.lz
+++ b/gfx/trainers/burglar.2bpp.lz.e063f42e
diff --git a/gfx/trainers/burglar.pal b/gfx/trainers/burglar.pal
deleted file mode 100644
index cfcdd144f..000000000
--- a/gfx/trainers/burglar.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 16, 09
-	RGB 12, 04, 23
-
diff --git a/gfx/trainers/burglar.png b/gfx/trainers/burglar.png
new file mode 100644
index 000000000..241eaa2dc
--- /dev/null
+++ b/gfx/trainers/burglar.png
diff --git a/gfx/trainers/cal.2bpp.lz b/gfx/trainers/cal.2bpp.lz.aac54a14
index f7d3570ae..f7d3570ae 100644
--- a/gfx/trainers/cal.2bpp.lz
+++ b/gfx/trainers/cal.2bpp.lz.aac54a14
diff --git a/gfx/trainers/cal.pal b/gfx/trainers/cal.pal
deleted file mode 100644
index 92101c5e3..000000000
--- a/gfx/trainers/cal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 18, 12
-	RGB 22, 09, 05
-
diff --git a/gfx/trainers/cal.png b/gfx/trainers/cal.png
new file mode 100644
index 000000000..31a38cc54
--- /dev/null
+++ b/gfx/trainers/cal.png
diff --git a/gfx/trainers/camper.2bpp.lz b/gfx/trainers/camper.2bpp.lz.cc2357ea
index a8963bae7..a8963bae7 100644
--- a/gfx/trainers/camper.2bpp.lz
+++ b/gfx/trainers/camper.2bpp.lz.cc2357ea
diff --git a/gfx/trainers/camper.pal b/gfx/trainers/camper.pal
deleted file mode 100644
index 13a083c68..000000000
--- a/gfx/trainers/camper.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 19, 08
-	RGB 15, 25, 02
-
diff --git a/gfx/trainers/camper.png b/gfx/trainers/camper.png
new file mode 100644
index 000000000..72e043eea
--- /dev/null
+++ b/gfx/trainers/camper.png
diff --git a/gfx/trainers/champion.2bpp.lz b/gfx/trainers/champion.2bpp.lz.0175f5ea
index c5840a676..c5840a676 100644
--- a/gfx/trainers/champion.2bpp.lz
+++ b/gfx/trainers/champion.2bpp.lz.0175f5ea
diff --git a/gfx/trainers/champion.pal b/gfx/trainers/champion.pal
deleted file mode 100644
index 3dee1efef..000000000
--- a/gfx/trainers/champion.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 19, 15
-	RGB 21, 09, 05
-
diff --git a/gfx/trainers/champion.png b/gfx/trainers/champion.png
new file mode 100644
index 000000000..02494e748
--- /dev/null
+++ b/gfx/trainers/champion.png
diff --git a/gfx/trainers/chuck.2bpp.lz b/gfx/trainers/chuck.2bpp.lz.cab13edd
index 0a92c7074..0a92c7074 100644
--- a/gfx/trainers/chuck.2bpp.lz
+++ b/gfx/trainers/chuck.2bpp.lz.cab13edd
diff --git a/gfx/trainers/chuck.pal b/gfx/trainers/chuck.pal
deleted file mode 100644
index 9616829dc..000000000
--- a/gfx/trainers/chuck.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 16, 12
-	RGB 12, 08, 08
-
diff --git a/gfx/trainers/chuck.png b/gfx/trainers/chuck.png
new file mode 100644
index 000000000..a7504f87a
--- /dev/null
+++ b/gfx/trainers/chuck.png
diff --git a/gfx/trainers/clair.2bpp.lz b/gfx/trainers/clair.2bpp.lz.a1771075
index bbc463594..bbc463594 100644
--- a/gfx/trainers/clair.2bpp.lz
+++ b/gfx/trainers/clair.2bpp.lz.a1771075
diff --git a/gfx/trainers/clair.pal b/gfx/trainers/clair.pal
deleted file mode 100644
index 616598fee..000000000
--- a/gfx/trainers/clair.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 18, 12
-	RGB 08, 11, 16
-
diff --git a/gfx/trainers/clair.png b/gfx/trainers/clair.png
new file mode 100644
index 000000000..0a8ca2a58
--- /dev/null
+++ b/gfx/trainers/clair.png
diff --git a/gfx/trainers/cooltrainer_f.2bpp.lz b/gfx/trainers/cooltrainer_f.2bpp.lz.6fb1e652
index cb41d74ee..cb41d74ee 100644
--- a/gfx/trainers/cooltrainer_f.2bpp.lz
+++ b/gfx/trainers/cooltrainer_f.2bpp.lz.6fb1e652
diff --git a/gfx/trainers/cooltrainer_f.pal b/gfx/trainers/cooltrainer_f.pal
deleted file mode 100644
index bdeefabf8..000000000
--- a/gfx/trainers/cooltrainer_f.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 18, 15
-	RGB 22, 09, 03
-
diff --git a/gfx/trainers/cooltrainer_f.png b/gfx/trainers/cooltrainer_f.png
new file mode 100644
index 000000000..9547ba377
--- /dev/null
+++ b/gfx/trainers/cooltrainer_f.png
diff --git a/gfx/trainers/cooltrainer_m.2bpp.lz b/gfx/trainers/cooltrainer_m.2bpp.lz.0aa81882
index 93dad0319..93dad0319 100644
--- a/gfx/trainers/cooltrainer_m.2bpp.lz
+++ b/gfx/trainers/cooltrainer_m.2bpp.lz.0aa81882
diff --git a/gfx/trainers/cooltrainer_m.pal b/gfx/trainers/cooltrainer_m.pal
deleted file mode 100644
index bdeefabf8..000000000
--- a/gfx/trainers/cooltrainer_m.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 18, 15
-	RGB 22, 09, 03
-
diff --git a/gfx/trainers/cooltrainer_m.png b/gfx/trainers/cooltrainer_m.png
new file mode 100644
index 000000000..9a6620b45
--- /dev/null
+++ b/gfx/trainers/cooltrainer_m.png
diff --git a/gfx/trainers/erika.2bpp.lz b/gfx/trainers/erika.2bpp.lz.58985f01
index 963363d26..963363d26 100644
--- a/gfx/trainers/erika.2bpp.lz
+++ b/gfx/trainers/erika.2bpp.lz.58985f01
diff --git a/gfx/trainers/erika.pal b/gfx/trainers/erika.pal
deleted file mode 100644
index e8de9b43d..000000000
--- a/gfx/trainers/erika.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 18, 13
-	RGB 07, 15, 08
-
diff --git a/gfx/trainers/erika.png b/gfx/trainers/erika.png
new file mode 100644
index 000000000..9b1c282dd
--- /dev/null
+++ b/gfx/trainers/erika.png
diff --git a/gfx/trainers/executive_f.2bpp.lz b/gfx/trainers/executive_f.2bpp.lz.c8b5dc9c
index b823ddaab..b823ddaab 100644
--- a/gfx/trainers/executive_f.2bpp.lz
+++ b/gfx/trainers/executive_f.2bpp.lz.c8b5dc9c
diff --git a/gfx/trainers/executive_f.pal b/gfx/trainers/executive_f.pal
deleted file mode 100644
index 36ec86f8e..000000000
--- a/gfx/trainers/executive_f.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 22, 17
-	RGB 19, 05, 12
-
diff --git a/gfx/trainers/executive_f.png b/gfx/trainers/executive_f.png
new file mode 100644
index 000000000..ec1419758
--- /dev/null
+++ b/gfx/trainers/executive_f.png
diff --git a/gfx/trainers/executive_m.2bpp.lz b/gfx/trainers/executive_m.2bpp.lz.211746a6
index e10b588cc..e10b588cc 100644
--- a/gfx/trainers/executive_m.2bpp.lz
+++ b/gfx/trainers/executive_m.2bpp.lz.211746a6
diff --git a/gfx/trainers/executive_m.pal b/gfx/trainers/executive_m.pal
deleted file mode 100644
index 66e0a46c9..000000000
--- a/gfx/trainers/executive_m.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 17, 05
-	RGB 14, 05, 14
-
diff --git a/gfx/trainers/executive_m.png b/gfx/trainers/executive_m.png
new file mode 100644
index 000000000..e88db5a78
--- /dev/null
+++ b/gfx/trainers/executive_m.png
diff --git a/gfx/trainers/falkner.2bpp.lz b/gfx/trainers/falkner.2bpp.lz.6ec6bbaf
index 323587e3a..323587e3a 100644
--- a/gfx/trainers/falkner.2bpp.lz
+++ b/gfx/trainers/falkner.2bpp.lz.6ec6bbaf
diff --git a/gfx/trainers/falkner.pal b/gfx/trainers/falkner.pal
deleted file mode 100644
index ddc5262ba..000000000
--- a/gfx/trainers/falkner.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 17, 14
-	RGB 07, 05, 31
-
diff --git a/gfx/trainers/falkner.png b/gfx/trainers/falkner.png
new file mode 100644
index 000000000..244352fd7
--- /dev/null
+++ b/gfx/trainers/falkner.png
diff --git a/gfx/trainers/firebreather.2bpp.lz b/gfx/trainers/firebreather.2bpp.lz.a790feb1
index a0f853a9d..a0f853a9d 100644
--- a/gfx/trainers/firebreather.2bpp.lz
+++ b/gfx/trainers/firebreather.2bpp.lz.a790feb1
diff --git a/gfx/trainers/firebreather.pal b/gfx/trainers/firebreather.pal
deleted file mode 100644
index b051224dd..000000000
--- a/gfx/trainers/firebreather.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 17, 11
-	RGB 25, 05, 12
-
diff --git a/gfx/trainers/firebreather.png b/gfx/trainers/firebreather.png
new file mode 100644
index 000000000..d838c3a58
--- /dev/null
+++ b/gfx/trainers/firebreather.png
diff --git a/gfx/trainers/fisher.2bpp.lz b/gfx/trainers/fisher.2bpp.lz.95bfbfd6
index b210aeda1..b210aeda1 100644
--- a/gfx/trainers/fisher.2bpp.lz
+++ b/gfx/trainers/fisher.2bpp.lz.95bfbfd6
diff --git a/gfx/trainers/fisher.pal b/gfx/trainers/fisher.pal
deleted file mode 100644
index 9d0657111..000000000
--- a/gfx/trainers/fisher.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 17, 13
-	RGB 07, 12, 15
-
diff --git a/gfx/trainers/fisher.png b/gfx/trainers/fisher.png
new file mode 100644
index 000000000..a39f10d57
--- /dev/null
+++ b/gfx/trainers/fisher.png
diff --git a/gfx/trainers/gentleman.2bpp.lz b/gfx/trainers/gentleman.2bpp.lz.d3d78e00
index 153720e71..153720e71 100644
--- a/gfx/trainers/gentleman.2bpp.lz
+++ b/gfx/trainers/gentleman.2bpp.lz.d3d78e00
diff --git a/gfx/trainers/gentleman.pal b/gfx/trainers/gentleman.pal
deleted file mode 100644
index c6faa0d33..000000000
--- a/gfx/trainers/gentleman.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 16, 12
-	RGB 09, 09, 15
-
diff --git a/gfx/trainers/gentleman.png b/gfx/trainers/gentleman.png
new file mode 100644
index 000000000..2ae2eaf1c
--- /dev/null
+++ b/gfx/trainers/gentleman.png
diff --git a/gfx/trainers/grunt_f.2bpp.lz b/gfx/trainers/grunt_f.2bpp.lz.522aecd7
index beee0721b..beee0721b 100644
--- a/gfx/trainers/grunt_f.2bpp.lz
+++ b/gfx/trainers/grunt_f.2bpp.lz.522aecd7
diff --git a/gfx/trainers/grunt_f.pal b/gfx/trainers/grunt_f.pal
deleted file mode 100644
index 746132411..000000000
--- a/gfx/trainers/grunt_f.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 19, 13
-	RGB 19, 06, 08
-
diff --git a/gfx/trainers/grunt_f.png b/gfx/trainers/grunt_f.png
new file mode 100644
index 000000000..8c69953f7
--- /dev/null
+++ b/gfx/trainers/grunt_f.png
diff --git a/gfx/trainers/grunt_m.2bpp.lz b/gfx/trainers/grunt_m.2bpp.lz.916e09d2
index 5ac5597b0..5ac5597b0 100644
--- a/gfx/trainers/grunt_m.2bpp.lz
+++ b/gfx/trainers/grunt_m.2bpp.lz.916e09d2
diff --git a/gfx/trainers/grunt_m.pal b/gfx/trainers/grunt_m.pal
deleted file mode 100644
index f7dc95d8f..000000000
--- a/gfx/trainers/grunt_m.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 17, 15
-	RGB 20, 08, 05
-
diff --git a/gfx/trainers/grunt_m.png b/gfx/trainers/grunt_m.png
new file mode 100644
index 000000000..909b25225
--- /dev/null
+++ b/gfx/trainers/grunt_m.png
diff --git a/gfx/trainers/guitarist.2bpp.lz b/gfx/trainers/guitarist.2bpp.lz.be5a9b71
index d67e6ea98..d67e6ea98 100644
--- a/gfx/trainers/guitarist.2bpp.lz
+++ b/gfx/trainers/guitarist.2bpp.lz.be5a9b71
diff --git a/gfx/trainers/guitarist.pal b/gfx/trainers/guitarist.pal
deleted file mode 100644
index d5c88a3bd..000000000
--- a/gfx/trainers/guitarist.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 22, 19
-	RGB 31, 08, 05
-
diff --git a/gfx/trainers/guitarist.png b/gfx/trainers/guitarist.png
new file mode 100644
index 000000000..2fac74bd5
--- /dev/null
+++ b/gfx/trainers/guitarist.png
diff --git a/gfx/trainers/hiker.2bpp.lz b/gfx/trainers/hiker.2bpp.lz.07a4e386
index c7cecda28..c7cecda28 100644
--- a/gfx/trainers/hiker.2bpp.lz
+++ b/gfx/trainers/hiker.2bpp.lz.07a4e386
diff --git a/gfx/trainers/hiker.pal b/gfx/trainers/hiker.pal
deleted file mode 100644
index 8d0cb5c4c..000000000
--- a/gfx/trainers/hiker.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 15, 09
-	RGB 13, 08, 23
-
diff --git a/gfx/trainers/hiker.png b/gfx/trainers/hiker.png
new file mode 100644
index 000000000..ff1712cbc
--- /dev/null
+++ b/gfx/trainers/hiker.png
diff --git a/gfx/trainers/janine.2bpp.lz b/gfx/trainers/janine.2bpp.lz.5350f3ce
index d6249eba3..d6249eba3 100644
--- a/gfx/trainers/janine.2bpp.lz
+++ b/gfx/trainers/janine.2bpp.lz.5350f3ce
diff --git a/gfx/trainers/janine.pal b/gfx/trainers/janine.pal
deleted file mode 100644
index e958004cb..000000000
--- a/gfx/trainers/janine.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 18, 15
-	RGB 15, 08, 23
-
diff --git a/gfx/trainers/janine.png b/gfx/trainers/janine.png
new file mode 100644
index 000000000..4e041f1aa
--- /dev/null
+++ b/gfx/trainers/janine.png
diff --git a/gfx/trainers/jasmine.2bpp.lz b/gfx/trainers/jasmine.2bpp.lz.dcd58308
index 7c08ded94..7c08ded94 100644
--- a/gfx/trainers/jasmine.2bpp.lz
+++ b/gfx/trainers/jasmine.2bpp.lz.dcd58308
diff --git a/gfx/trainers/jasmine.pal b/gfx/trainers/jasmine.pal
deleted file mode 100644
index 352d95673..000000000
--- a/gfx/trainers/jasmine.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 18, 10
-	RGB 16, 09, 11
-
diff --git a/gfx/trainers/jasmine.png b/gfx/trainers/jasmine.png
new file mode 100644
index 000000000..25a7a9b5e
--- /dev/null
+++ b/gfx/trainers/jasmine.png
diff --git a/gfx/trainers/juggler.2bpp.lz b/gfx/trainers/juggler.2bpp.lz.2d7625ba
index d64ed1f0b..d64ed1f0b 100644
--- a/gfx/trainers/juggler.2bpp.lz
+++ b/gfx/trainers/juggler.2bpp.lz.2d7625ba
diff --git a/gfx/trainers/juggler.pal b/gfx/trainers/juggler.pal
deleted file mode 100644
index ffee98b09..000000000
--- a/gfx/trainers/juggler.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 15, 10
-	RGB 09, 06, 31
-
diff --git a/gfx/trainers/juggler.png b/gfx/trainers/juggler.png
new file mode 100644
index 000000000..90001c3ce
--- /dev/null
+++ b/gfx/trainers/juggler.png
diff --git a/gfx/trainers/karen.2bpp.lz b/gfx/trainers/karen.2bpp.lz.7fc3d941
index a0bd871f7..a0bd871f7 100644
--- a/gfx/trainers/karen.2bpp.lz
+++ b/gfx/trainers/karen.2bpp.lz.7fc3d941
diff --git a/gfx/trainers/karen.pal b/gfx/trainers/karen.pal
deleted file mode 100644
index 0eeb5fa2d..000000000
--- a/gfx/trainers/karen.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 18, 14
-	RGB 21, 08, 07
-
diff --git a/gfx/trainers/karen.png b/gfx/trainers/karen.png
new file mode 100644
index 000000000..46081bdae
--- /dev/null
+++ b/gfx/trainers/karen.png
diff --git a/gfx/trainers/kimono_girl.2bpp.lz b/gfx/trainers/kimono_girl.2bpp.lz.e8833d48
index 465ccb111..465ccb111 100644
--- a/gfx/trainers/kimono_girl.2bpp.lz
+++ b/gfx/trainers/kimono_girl.2bpp.lz.e8833d48
diff --git a/gfx/trainers/kimono_girl.pal b/gfx/trainers/kimono_girl.pal
deleted file mode 100644
index 334b11d21..000000000
--- a/gfx/trainers/kimono_girl.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 19, 15
-	RGB 26, 09, 06
-
diff --git a/gfx/trainers/kimono_girl.png b/gfx/trainers/kimono_girl.png
new file mode 100644
index 000000000..8f55ab1b2
--- /dev/null
+++ b/gfx/trainers/kimono_girl.png
diff --git a/gfx/trainers/koga.2bpp.lz b/gfx/trainers/koga.2bpp.lz.7a066020
index bc4501f08..bc4501f08 100644
--- a/gfx/trainers/koga.2bpp.lz
+++ b/gfx/trainers/koga.2bpp.lz.7a066020
diff --git a/gfx/trainers/koga.pal b/gfx/trainers/koga.pal
deleted file mode 100644
index 096b1e131..000000000
--- a/gfx/trainers/koga.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 18, 14
-	RGB 12, 07, 13
-
diff --git a/gfx/trainers/koga.png b/gfx/trainers/koga.png
new file mode 100644
index 000000000..ed77f264c
--- /dev/null
+++ b/gfx/trainers/koga.png
diff --git a/gfx/trainers/lass.2bpp.lz b/gfx/trainers/lass.2bpp.lz.e3726508
index 0c7cffa79..0c7cffa79 100644
--- a/gfx/trainers/lass.2bpp.lz
+++ b/gfx/trainers/lass.2bpp.lz.e3726508
diff --git a/gfx/trainers/lass.pal b/gfx/trainers/lass.pal
deleted file mode 100644
index 1ca3149dc..000000000
--- a/gfx/trainers/lass.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 17, 06
-	RGB 13, 08, 25
-
diff --git a/gfx/trainers/lass.png b/gfx/trainers/lass.png
new file mode 100644
index 000000000..18e375a21
--- /dev/null
+++ b/gfx/trainers/lass.png
diff --git a/gfx/trainers/lt_surge.2bpp.lz b/gfx/trainers/lt_surge.2bpp.lz.4ac586d0
index 9a3df5d3f..9a3df5d3f 100644
--- a/gfx/trainers/lt_surge.2bpp.lz
+++ b/gfx/trainers/lt_surge.2bpp.lz.4ac586d0
diff --git a/gfx/trainers/lt_surge.pal b/gfx/trainers/lt_surge.pal
deleted file mode 100644
index 6243fae58..000000000
--- a/gfx/trainers/lt_surge.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 17, 14
-	RGB 09, 14, 10
-
diff --git a/gfx/trainers/lt_surge.png b/gfx/trainers/lt_surge.png
new file mode 100644
index 000000000..44e7db6dc
--- /dev/null
+++ b/gfx/trainers/lt_surge.png
diff --git a/gfx/trainers/medium.2bpp.lz b/gfx/trainers/medium.2bpp.lz.db642b9e
index 4aaa71326..4aaa71326 100644
--- a/gfx/trainers/medium.2bpp.lz
+++ b/gfx/trainers/medium.2bpp.lz.db642b9e
diff --git a/gfx/trainers/medium.pal b/gfx/trainers/medium.pal
deleted file mode 100644
index e06b66f39..000000000
--- a/gfx/trainers/medium.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 17, 12
-	RGB 09, 09, 14
-
diff --git a/gfx/trainers/medium.png b/gfx/trainers/medium.png
new file mode 100644
index 000000000..4828a771d
--- /dev/null
+++ b/gfx/trainers/medium.png
diff --git a/gfx/trainers/misty.2bpp.lz b/gfx/trainers/misty.2bpp.lz.2ded1a10
index 1a96cdddd..1a96cdddd 100644
--- a/gfx/trainers/misty.2bpp.lz
+++ b/gfx/trainers/misty.2bpp.lz.2ded1a10
diff --git a/gfx/trainers/misty.pal b/gfx/trainers/misty.pal
deleted file mode 100644
index aab4b0849..000000000
--- a/gfx/trainers/misty.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 19, 16
-	RGB 20, 10, 05
-
diff --git a/gfx/trainers/misty.png b/gfx/trainers/misty.png
new file mode 100644
index 000000000..64768409a
--- /dev/null
+++ b/gfx/trainers/misty.png
diff --git a/gfx/trainers/morty.2bpp.lz b/gfx/trainers/morty.2bpp.lz.aec5773b
index 67999aeb8..67999aeb8 100644
--- a/gfx/trainers/morty.2bpp.lz
+++ b/gfx/trainers/morty.2bpp.lz.aec5773b
diff --git a/gfx/trainers/morty.pal b/gfx/trainers/morty.pal
deleted file mode 100644
index 736d93ba7..000000000
--- a/gfx/trainers/morty.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 17, 12
-	RGB 12, 07, 22
-
diff --git a/gfx/trainers/morty.png b/gfx/trainers/morty.png
new file mode 100644
index 000000000..7f817e1a2
--- /dev/null
+++ b/gfx/trainers/morty.png
diff --git a/gfx/trainers/mysticalman.2bpp.lz b/gfx/trainers/mysticalman.2bpp.lz.35d01215
index 38296bc91..38296bc91 100644
--- a/gfx/trainers/mysticalman.2bpp.lz
+++ b/gfx/trainers/mysticalman.2bpp.lz.35d01215
diff --git a/gfx/trainers/mysticalman.pal b/gfx/trainers/mysticalman.pal
deleted file mode 100644
index 7e95414ae..000000000
--- a/gfx/trainers/mysticalman.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 20, 12
-	RGB 16, 07, 16
-
diff --git a/gfx/trainers/mysticalman.png b/gfx/trainers/mysticalman.png
new file mode 100644
index 000000000..aac6bf026
--- /dev/null
+++ b/gfx/trainers/mysticalman.png
diff --git a/gfx/trainers/oak.2bpp.lz b/gfx/trainers/oak.2bpp.lz.91a27df3
index 276f7c533..276f7c533 100644
--- a/gfx/trainers/oak.2bpp.lz
+++ b/gfx/trainers/oak.2bpp.lz.91a27df3
diff --git a/gfx/trainers/oak.pal b/gfx/trainers/oak.pal
deleted file mode 100644
index a4be7ff97..000000000
--- a/gfx/trainers/oak.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 19, 11
-	RGB 13, 16, 00
-
diff --git a/gfx/trainers/oak.png b/gfx/trainers/oak.png
new file mode 100644
index 000000000..4b4fab1a3
--- /dev/null
+++ b/gfx/trainers/oak.png
diff --git a/gfx/trainers/officer.2bpp.lz b/gfx/trainers/officer.2bpp.lz.630b057a
index e3e22f870..e3e22f870 100644
--- a/gfx/trainers/officer.2bpp.lz
+++ b/gfx/trainers/officer.2bpp.lz.630b057a
diff --git a/gfx/trainers/officer.pal b/gfx/trainers/officer.pal
deleted file mode 100644
index a14a47917..000000000
--- a/gfx/trainers/officer.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 24, 08
-	RGB 12, 09, 19
-
diff --git a/gfx/trainers/officer.png b/gfx/trainers/officer.png
new file mode 100644
index 000000000..a5afe293a
--- /dev/null
+++ b/gfx/trainers/officer.png
diff --git a/gfx/trainers/picnicker.2bpp.lz b/gfx/trainers/picnicker.2bpp.lz.6842b86a
index 81ee09ab7..81ee09ab7 100644
--- a/gfx/trainers/picnicker.2bpp.lz
+++ b/gfx/trainers/picnicker.2bpp.lz.6842b86a
diff --git a/gfx/trainers/picnicker.pal b/gfx/trainers/picnicker.pal
deleted file mode 100644
index d0eec39f9..000000000
--- a/gfx/trainers/picnicker.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 19, 08
-	RGB 10, 20, 02
-
diff --git a/gfx/trainers/picnicker.png b/gfx/trainers/picnicker.png
new file mode 100644
index 000000000..0721244f0
--- /dev/null
+++ b/gfx/trainers/picnicker.png
diff --git a/gfx/trainers/pokefan_f.2bpp.lz b/gfx/trainers/pokefan_f.2bpp.lz.9cbd3f20
index 2ab555a85..2ab555a85 100644
--- a/gfx/trainers/pokefan_f.2bpp.lz
+++ b/gfx/trainers/pokefan_f.2bpp.lz.9cbd3f20
diff --git a/gfx/trainers/pokefan_f.pal b/gfx/trainers/pokefan_f.pal
deleted file mode 100644
index 57d1b94cf..000000000
--- a/gfx/trainers/pokefan_f.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 17, 14
-	RGB 15, 04, 15
-
diff --git a/gfx/trainers/pokefan_f.png b/gfx/trainers/pokefan_f.png
new file mode 100644
index 000000000..0bf45ace6
--- /dev/null
+++ b/gfx/trainers/pokefan_f.png
diff --git a/gfx/trainers/pokefan_m.2bpp.lz b/gfx/trainers/pokefan_m.2bpp.lz.5bc5a3e1
index 25b4a9ff7..25b4a9ff7 100644
--- a/gfx/trainers/pokefan_m.2bpp.lz
+++ b/gfx/trainers/pokefan_m.2bpp.lz.5bc5a3e1
diff --git a/gfx/trainers/pokefan_m.pal b/gfx/trainers/pokefan_m.pal
deleted file mode 100644
index 601ed4ae9..000000000
--- a/gfx/trainers/pokefan_m.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 19, 13
-	RGB 21, 08, 08
-
diff --git a/gfx/trainers/pokefan_m.png b/gfx/trainers/pokefan_m.png
new file mode 100644
index 000000000..d8cc8fc8e
--- /dev/null
+++ b/gfx/trainers/pokefan_m.png
diff --git a/gfx/trainers/pokemaniac.2bpp.lz b/gfx/trainers/pokemaniac.2bpp.lz.786c5fce
index 78fb417f4..78fb417f4 100644
--- a/gfx/trainers/pokemaniac.2bpp.lz
+++ b/gfx/trainers/pokemaniac.2bpp.lz.786c5fce
diff --git a/gfx/trainers/pokemaniac.pal b/gfx/trainers/pokemaniac.pal
deleted file mode 100644
index f8e224ab8..000000000
--- a/gfx/trainers/pokemaniac.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 20, 13
-	RGB 13, 05, 18
-
diff --git a/gfx/trainers/pokemaniac.png b/gfx/trainers/pokemaniac.png
new file mode 100644
index 000000000..8ab470877
--- /dev/null
+++ b/gfx/trainers/pokemaniac.png
diff --git a/gfx/trainers/pryce.2bpp.lz b/gfx/trainers/pryce.2bpp.lz.1a98cae8
index ca69273e0..ca69273e0 100644
--- a/gfx/trainers/pryce.2bpp.lz
+++ b/gfx/trainers/pryce.2bpp.lz.1a98cae8
diff --git a/gfx/trainers/pryce.pal b/gfx/trainers/pryce.pal
deleted file mode 100644
index ca319f05a..000000000
--- a/gfx/trainers/pryce.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 18, 16
-	RGB 12, 09, 08
-
diff --git a/gfx/trainers/pryce.png b/gfx/trainers/pryce.png
new file mode 100644
index 000000000..2953fe32d
--- /dev/null
+++ b/gfx/trainers/pryce.png
diff --git a/gfx/trainers/psychic_t.2bpp.lz b/gfx/trainers/psychic_t.2bpp.lz.ecd603f4
index c1123a84e..c1123a84e 100644
--- a/gfx/trainers/psychic_t.2bpp.lz
+++ b/gfx/trainers/psychic_t.2bpp.lz.ecd603f4
diff --git a/gfx/trainers/psychic_t.pal b/gfx/trainers/psychic_t.pal
deleted file mode 100644
index e19c4d817..000000000
--- a/gfx/trainers/psychic_t.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 22, 17
-	RGB 10, 12, 19
-
diff --git a/gfx/trainers/psychic_t.png b/gfx/trainers/psychic_t.png
new file mode 100644
index 000000000..897c8385e
--- /dev/null
+++ b/gfx/trainers/psychic_t.png
diff --git a/gfx/trainers/red.2bpp.lz b/gfx/trainers/red.2bpp.lz.51104ac6
index 15a8dcf88..15a8dcf88 100644
--- a/gfx/trainers/red.2bpp.lz
+++ b/gfx/trainers/red.2bpp.lz.51104ac6
diff --git a/gfx/trainers/red.pal b/gfx/trainers/red.pal
deleted file mode 100644
index 3ebf35fb7..000000000
--- a/gfx/trainers/red.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 18, 17
-	RGB 22, 07, 08
-
diff --git a/gfx/trainers/red.png b/gfx/trainers/red.png
new file mode 100644
index 000000000..bd6d4a37d
--- /dev/null
+++ b/gfx/trainers/red.png
diff --git a/gfx/trainers/rival1.2bpp.lz b/gfx/trainers/rival1.2bpp.lz.e43b32ef
index 9a5b99abc..9a5b99abc 100644
--- a/gfx/trainers/rival1.2bpp.lz
+++ b/gfx/trainers/rival1.2bpp.lz.e43b32ef
diff --git a/gfx/trainers/rival1.pal b/gfx/trainers/rival1.pal
deleted file mode 100644
index 190dc92e0..000000000
--- a/gfx/trainers/rival1.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 18, 07
-	RGB 26, 04, 09
-
diff --git a/gfx/trainers/rival1.png b/gfx/trainers/rival1.png
new file mode 100644
index 000000000..60e29553d
--- /dev/null
+++ b/gfx/trainers/rival1.png
diff --git a/gfx/trainers/rival2.2bpp.lz b/gfx/trainers/rival2.2bpp.lz.562de263
index 683ec66bb..683ec66bb 100644
--- a/gfx/trainers/rival2.2bpp.lz
+++ b/gfx/trainers/rival2.2bpp.lz.562de263
diff --git a/gfx/trainers/rival2.pal b/gfx/trainers/rival2.pal
deleted file mode 100644
index 190dc92e0..000000000
--- a/gfx/trainers/rival2.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 18, 07
-	RGB 26, 04, 09
-
diff --git a/gfx/trainers/rival2.png b/gfx/trainers/rival2.png
new file mode 100644
index 000000000..b3f0ec48e
--- /dev/null
+++ b/gfx/trainers/rival2.png
diff --git a/gfx/trainers/sabrina.2bpp.lz b/gfx/trainers/sabrina.2bpp.lz.d09a2b46
index bee6dd0e9..bee6dd0e9 100644
--- a/gfx/trainers/sabrina.2bpp.lz
+++ b/gfx/trainers/sabrina.2bpp.lz.d09a2b46
diff --git a/gfx/trainers/sabrina.pal b/gfx/trainers/sabrina.pal
deleted file mode 100644
index 950be6902..000000000
--- a/gfx/trainers/sabrina.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 22, 17
-	RGB 24, 07, 09
-
diff --git a/gfx/trainers/sabrina.png b/gfx/trainers/sabrina.png
new file mode 100644
index 000000000..815768c83
--- /dev/null
+++ b/gfx/trainers/sabrina.png
diff --git a/gfx/trainers/sage.2bpp.lz b/gfx/trainers/sage.2bpp.lz.2038324b
index aff9d4589..aff9d4589 100644
--- a/gfx/trainers/sage.2bpp.lz
+++ b/gfx/trainers/sage.2bpp.lz.2038324b
diff --git a/gfx/trainers/sage.pal b/gfx/trainers/sage.pal
deleted file mode 100644
index d61b39ec3..000000000
--- a/gfx/trainers/sage.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 22, 17
-	RGB 08, 08, 20
-
diff --git a/gfx/trainers/sage.png b/gfx/trainers/sage.png
new file mode 100644
index 000000000..df7e3e4f4
--- /dev/null
+++ b/gfx/trainers/sage.png
diff --git a/gfx/trainers/sailor.2bpp.lz b/gfx/trainers/sailor.2bpp.lz.0f7f3386
index 425667a73..425667a73 100644
--- a/gfx/trainers/sailor.2bpp.lz
+++ b/gfx/trainers/sailor.2bpp.lz.0f7f3386
diff --git a/gfx/trainers/sailor.pal b/gfx/trainers/sailor.pal
deleted file mode 100644
index 33b3c02b1..000000000
--- a/gfx/trainers/sailor.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 14, 07
-	RGB 03, 07, 13
-
diff --git a/gfx/trainers/sailor.png b/gfx/trainers/sailor.png
new file mode 100644
index 000000000..09dee6b73
--- /dev/null
+++ b/gfx/trainers/sailor.png
diff --git a/gfx/trainers/schoolboy.2bpp.lz b/gfx/trainers/schoolboy.2bpp.lz.6d26b31b
index 7d9bd00a3..7d9bd00a3 100644
--- a/gfx/trainers/schoolboy.2bpp.lz
+++ b/gfx/trainers/schoolboy.2bpp.lz.6d26b31b
diff --git a/gfx/trainers/schoolboy.pal b/gfx/trainers/schoolboy.pal
deleted file mode 100644
index 5ba665e79..000000000
--- a/gfx/trainers/schoolboy.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 16, 11
-	RGB 13, 10, 24
-
diff --git a/gfx/trainers/schoolboy.png b/gfx/trainers/schoolboy.png
new file mode 100644
index 000000000..3c154e6d5
--- /dev/null
+++ b/gfx/trainers/schoolboy.png
diff --git a/gfx/trainers/scientist.2bpp.lz b/gfx/trainers/scientist.2bpp.lz.2ef10474
index 033f421b5..033f421b5 100644
--- a/gfx/trainers/scientist.2bpp.lz
+++ b/gfx/trainers/scientist.2bpp.lz.2ef10474
diff --git a/gfx/trainers/scientist.pal b/gfx/trainers/scientist.pal
deleted file mode 100644
index 0661e50e8..000000000
--- a/gfx/trainers/scientist.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 19, 11
-	RGB 10, 13, 17
-
diff --git a/gfx/trainers/scientist.png b/gfx/trainers/scientist.png
new file mode 100644
index 000000000..3ba33aef4
--- /dev/null
+++ b/gfx/trainers/scientist.png
diff --git a/gfx/trainers/skier.2bpp.lz b/gfx/trainers/skier.2bpp.lz.399d4240
index 42be70abe..42be70abe 100644
--- a/gfx/trainers/skier.2bpp.lz
+++ b/gfx/trainers/skier.2bpp.lz.399d4240
diff --git a/gfx/trainers/skier.pal b/gfx/trainers/skier.pal
deleted file mode 100644
index 9201ca909..000000000
--- a/gfx/trainers/skier.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 19, 15
-	RGB 24, 06, 14
-
diff --git a/gfx/trainers/skier.png b/gfx/trainers/skier.png
new file mode 100644
index 000000000..7f9466f1a
--- /dev/null
+++ b/gfx/trainers/skier.png
diff --git a/gfx/trainers/super_nerd.2bpp.lz b/gfx/trainers/super_nerd.2bpp.lz.c5362664
index dbdb4ca46..dbdb4ca46 100644
--- a/gfx/trainers/super_nerd.2bpp.lz
+++ b/gfx/trainers/super_nerd.2bpp.lz.c5362664
diff --git a/gfx/trainers/super_nerd.pal b/gfx/trainers/super_nerd.pal
deleted file mode 100644
index 862d4e21e..000000000
--- a/gfx/trainers/super_nerd.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 22, 17
-	RGB 11, 09, 10
-
diff --git a/gfx/trainers/super_nerd.png b/gfx/trainers/super_nerd.png
new file mode 100644
index 000000000..8636f2262
--- /dev/null
+++ b/gfx/trainers/super_nerd.png
diff --git a/gfx/trainers/swimmer_f.2bpp.lz b/gfx/trainers/swimmer_f.2bpp.lz.c60d0ad6
index 3f27a6d42..3f27a6d42 100644
--- a/gfx/trainers/swimmer_f.2bpp.lz
+++ b/gfx/trainers/swimmer_f.2bpp.lz.c60d0ad6
diff --git a/gfx/trainers/swimmer_f.pal b/gfx/trainers/swimmer_f.pal
deleted file mode 100644
index 6bddcbcc3..000000000
--- a/gfx/trainers/swimmer_f.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 16, 05
-	RGB 06, 14, 04
-
diff --git a/gfx/trainers/swimmer_f.png b/gfx/trainers/swimmer_f.png
new file mode 100644
index 000000000..affef5f5e
--- /dev/null
+++ b/gfx/trainers/swimmer_f.png
diff --git a/gfx/trainers/swimmer_m.2bpp.lz b/gfx/trainers/swimmer_m.2bpp.lz.2c1a716e
index b162cadca..b162cadca 100644
--- a/gfx/trainers/swimmer_m.2bpp.lz
+++ b/gfx/trainers/swimmer_m.2bpp.lz.2c1a716e
diff --git a/gfx/trainers/swimmer_m.pal b/gfx/trainers/swimmer_m.pal
deleted file mode 100644
index 164d2166b..000000000
--- a/gfx/trainers/swimmer_m.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 03, 04, 09
-	RGB 21, 13, 01
-
diff --git a/gfx/trainers/swimmer_m.png b/gfx/trainers/swimmer_m.png
new file mode 100644
index 000000000..2c0442385
--- /dev/null
+++ b/gfx/trainers/swimmer_m.png
diff --git a/gfx/trainers/teacher.2bpp.lz b/gfx/trainers/teacher.2bpp.lz.1d131210
index 92151f891..92151f891 100644
--- a/gfx/trainers/teacher.2bpp.lz
+++ b/gfx/trainers/teacher.2bpp.lz.1d131210
diff --git a/gfx/trainers/teacher.pal b/gfx/trainers/teacher.pal
deleted file mode 100644
index a614be34c..000000000
--- a/gfx/trainers/teacher.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 20, 16
-	RGB 08, 11, 07
-
diff --git a/gfx/trainers/teacher.png b/gfx/trainers/teacher.png
new file mode 100644
index 000000000..d9e1b25cd
--- /dev/null
+++ b/gfx/trainers/teacher.png
diff --git a/gfx/trainers/twins.2bpp.lz b/gfx/trainers/twins.2bpp.lz.462fd733
index 1bdf29c7d..1bdf29c7d 100644
--- a/gfx/trainers/twins.2bpp.lz
+++ b/gfx/trainers/twins.2bpp.lz.462fd733
diff --git a/gfx/trainers/twins.pal b/gfx/trainers/twins.pal
deleted file mode 100644
index 47792418b..000000000
--- a/gfx/trainers/twins.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 22, 08
-	RGB 28, 03, 21
-
diff --git a/gfx/trainers/twins.png b/gfx/trainers/twins.png
new file mode 100644
index 000000000..4726f9599
--- /dev/null
+++ b/gfx/trainers/twins.png
diff --git a/gfx/trainers/whitney.2bpp.lz b/gfx/trainers/whitney.2bpp.lz.dcb46ea6
index 9564767a8..9564767a8 100644
--- a/gfx/trainers/whitney.2bpp.lz
+++ b/gfx/trainers/whitney.2bpp.lz.dcb46ea6
diff --git a/gfx/trainers/whitney.pal b/gfx/trainers/whitney.pal
deleted file mode 100644
index a51af5fda..000000000
--- a/gfx/trainers/whitney.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 18, 09
-	RGB 21, 07, 02
-
diff --git a/gfx/trainers/whitney.png b/gfx/trainers/whitney.png
new file mode 100644
index 000000000..b9b4aa497
--- /dev/null
+++ b/gfx/trainers/whitney.png
diff --git a/gfx/trainers/will.2bpp.lz b/gfx/trainers/will.2bpp.lz.842af358
index 3de211cd4..3de211cd4 100644
--- a/gfx/trainers/will.2bpp.lz
+++ b/gfx/trainers/will.2bpp.lz.842af358
diff --git a/gfx/trainers/will.pal b/gfx/trainers/will.pal
deleted file mode 100644
index d27fd8069..000000000
--- a/gfx/trainers/will.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 15, 09
-	RGB 26, 04, 02
-
diff --git a/gfx/trainers/will.png b/gfx/trainers/will.png
new file mode 100644
index 000000000..599f7cce8
--- /dev/null
+++ b/gfx/trainers/will.png
diff --git a/gfx/trainers/youngster.2bpp.lz b/gfx/trainers/youngster.2bpp.lz.4bef139d
index ec742f9f3..ec742f9f3 100644
--- a/gfx/trainers/youngster.2bpp.lz
+++ b/gfx/trainers/youngster.2bpp.lz.4bef139d
diff --git a/gfx/trainers/youngster.pal b/gfx/trainers/youngster.pal
deleted file mode 100644
index a330d692f..000000000
--- a/gfx/trainers/youngster.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 20, 09
-	RGB 09, 12, 23
-
diff --git a/gfx/trainers/youngster.png b/gfx/trainers/youngster.png
new file mode 100644
index 000000000..9b6d96eea
--- /dev/null
+++ b/gfx/trainers/youngster.png
diff --git a/gfx/unknown/011cb7.2bpp b/gfx/unknown/011cb7.2bpp
deleted file mode 100644
index 5046cc61a..000000000
--- a/gfx/unknown/011cb7.2bpp
+++ /dev/null
diff --git a/gfx/unknown/011cb7.png b/gfx/unknown/011cb7.png
new file mode 100644
index 000000000..36935ab82
--- /dev/null
+++ b/gfx/unknown/011cb7.png
diff --git a/gfx/unknown/011cc7.2bpp b/gfx/unknown/011cc7.2bpp
deleted file mode 100644
index 852606f98..000000000
--- a/gfx/unknown/011cc7.2bpp
+++ /dev/null
diff --git a/gfx/unknown/011cc7.png b/gfx/unknown/011cc7.png
new file mode 100644
index 000000000..a0429a3ad
--- /dev/null
+++ b/gfx/unknown/011cc7.png
diff --git a/gfx/unknown/011e5d.1bpp b/gfx/unknown/011e5d.1bpp
deleted file mode 100644
index 7bbee183b..000000000
--- a/gfx/unknown/011e5d.1bpp
+++ /dev/null
@@ -1 +0,0 @@
-�����


\ No newline at end of file
diff --git a/gfx/unknown/011e5d.png b/gfx/unknown/011e5d.png
new file mode 100644
index 000000000..c8e132b92
--- /dev/null
+++ b/gfx/unknown/011e5d.png
diff --git a/gfx/unknown/011e65.1bpp b/gfx/unknown/011e65.1bpp
deleted file mode 100644
index 9713c883a..000000000
--- a/gfx/unknown/011e65.1bpp
+++ /dev/null
diff --git a/gfx/unknown/011e65.png b/gfx/unknown/011e65.png
new file mode 100644
index 000000000..a34e82bf1
--- /dev/null
+++ b/gfx/unknown/011e65.png
diff --git a/gfx/unknown/011e6d.1bpp b/gfx/unknown/011e6d.1bpp
deleted file mode 100644
index 3da14ecbe..000000000
--- a/gfx/unknown/011e6d.1bpp
+++ /dev/null
diff --git a/gfx/unknown/011e6d.png b/gfx/unknown/011e6d.png
new file mode 100644
index 000000000..e92cd4d6a
--- /dev/null
+++ b/gfx/unknown/011e6d.png
diff --git a/gfx/unknown/0123fc.2bpp b/gfx/unknown/0123fc.2bpp
deleted file mode 100644
index 1314e8c42..000000000
--- a/gfx/unknown/0123fc.2bpp
+++ /dev/null
diff --git a/gfx/unknown/0123fc.png b/gfx/unknown/0123fc.png
new file mode 100644
index 000000000..dbf513487
--- /dev/null
+++ b/gfx/unknown/0123fc.png
diff --git a/gfx/unknown/016d9c.1bpp b/gfx/unknown/016d9c.1bpp
deleted file mode 100644
index e24d140c4..000000000
--- a/gfx/unknown/016d9c.1bpp
+++ /dev/null
diff --git a/gfx/unknown/016d9c.png b/gfx/unknown/016d9c.png
new file mode 100644
index 000000000..56252c423
--- /dev/null
+++ b/gfx/unknown/016d9c.png
diff --git a/gfx/unknown/016da4.1bpp b/gfx/unknown/016da4.1bpp
deleted file mode 100644
index fc6de6973..000000000
--- a/gfx/unknown/016da4.1bpp
+++ /dev/null
diff --git a/gfx/unknown/016da4.png b/gfx/unknown/016da4.png
new file mode 100644
index 000000000..8ce07a03c
--- /dev/null
+++ b/gfx/unknown/016da4.png
diff --git a/gfx/unknown/017393.2bpp b/gfx/unknown/017393.2bpp
deleted file mode 100644
index 4fc77ac3e..000000000
--- a/gfx/unknown/017393.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-    @@?1A������~~<<
\ No newline at end of file
diff --git a/gfx/unknown/017393.png b/gfx/unknown/017393.png
new file mode 100644
index 000000000..e45921e1f
--- /dev/null
+++ b/gfx/unknown/017393.png
diff --git a/gfx/unknown/029f54.2bpp b/gfx/unknown/029f54.2bpp
deleted file mode 100644
index 4baf48889..000000000
--- a/gfx/unknown/029f54.2bpp
+++ /dev/null
diff --git a/gfx/unknown/029f54.png b/gfx/unknown/029f54.png
new file mode 100644
index 000000000..d3ac169fc
--- /dev/null
+++ b/gfx/unknown/029f54.png
diff --git a/gfx/unknown/0488c3.2bpp b/gfx/unknown/0488c3.2bpp
deleted file mode 100644
index 6b869ba80..000000000
--- a/gfx/unknown/0488c3.2bpp
+++ /dev/null
diff --git a/gfx/unknown/0488c3.png b/gfx/unknown/0488c3.png
new file mode 100644
index 000000000..e8b43de99
--- /dev/null
+++ b/gfx/unknown/0488c3.png
diff --git a/gfx/unknown/0488cb.2bpp b/gfx/unknown/0488cb.2bpp
deleted file mode 100644
index c48668de6..000000000
--- a/gfx/unknown/0488cb.2bpp
+++ /dev/null
diff --git a/gfx/unknown/0488cb.png b/gfx/unknown/0488cb.png
new file mode 100644
index 000000000..9eaaadd2d
--- /dev/null
+++ b/gfx/unknown/0488cb.png
diff --git a/gfx/unknown/049c0c.2bpp b/gfx/unknown/049c0c.2bpp
deleted file mode 100644
index 6aa4815e3..000000000
--- a/gfx/unknown/049c0c.2bpp
+++ /dev/null
diff --git a/gfx/unknown/049c0c.png b/gfx/unknown/049c0c.png
new file mode 100644
index 000000000..ae6cba38d
--- /dev/null
+++ b/gfx/unknown/049c0c.png
diff --git a/gfx/unknown/08940b.2bpp b/gfx/unknown/08940b.2bpp
deleted file mode 100644
index 215a5536e..000000000
--- a/gfx/unknown/08940b.2bpp
+++ /dev/null
diff --git a/gfx/unknown/08940b.png b/gfx/unknown/08940b.png
new file mode 100644
index 000000000..108be31b9
--- /dev/null
+++ b/gfx/unknown/08940b.png
diff --git a/gfx/unknown/08c893.2bpp b/gfx/unknown/08c893.2bpp
deleted file mode 100644
index 9aeb905ce..000000000
--- a/gfx/unknown/08c893.2bpp
+++ /dev/null
diff --git a/gfx/unknown/0908fb.2bpp b/gfx/unknown/0908fb.2bpp
deleted file mode 100644
index 8663f7de5..000000000
--- a/gfx/unknown/0908fb.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-��������
\ No newline at end of file
diff --git a/gfx/unknown/0908fb.png b/gfx/unknown/0908fb.png
new file mode 100644
index 000000000..e2bd6299c
--- /dev/null
+++ b/gfx/unknown/0908fb.png
diff --git a/gfx/unknown/090903.2bpp b/gfx/unknown/090903.2bpp
deleted file mode 100644
index 6b869ba80..000000000
--- a/gfx/unknown/090903.2bpp
+++ /dev/null
diff --git a/gfx/unknown/090903.png b/gfx/unknown/090903.png
new file mode 100644
index 000000000..d8cfc7f3f
--- /dev/null
+++ b/gfx/unknown/090903.png
diff --git a/gfx/unknown/09090b.2bpp b/gfx/unknown/09090b.2bpp
deleted file mode 100644
index c48668de6..000000000
--- a/gfx/unknown/09090b.2bpp
+++ /dev/null
diff --git a/gfx/unknown/09090b.png b/gfx/unknown/09090b.png
new file mode 100644
index 000000000..33803e197
--- /dev/null
+++ b/gfx/unknown/09090b.png
diff --git a/gfx/unknown/0e0cdb.2bpp.lz b/gfx/unknown/0e0cdb.2bpp.lz.53679db7
index 12baf9a8f..12baf9a8f 100644
--- a/gfx/unknown/0e0cdb.2bpp.lz
+++ b/gfx/unknown/0e0cdb.2bpp.lz.53679db7
diff --git a/gfx/unknown/0e0cdb.png b/gfx/unknown/0e0cdb.png
new file mode 100644
index 000000000..227450963
--- /dev/null
+++ b/gfx/unknown/0e0cdb.png
diff --git a/gfx/unknown/0e0cf6.2bpp b/gfx/unknown/0e0cf6.2bpp
deleted file mode 100644
index 0e7c66a32..000000000
--- a/gfx/unknown/0e0cf6.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-����������������
\ No newline at end of file
diff --git a/gfx/unknown/0e0cf6.png b/gfx/unknown/0e0cf6.png
new file mode 100644
index 000000000..ac5885644
--- /dev/null
+++ b/gfx/unknown/0e0cf6.png
diff --git a/gfx/unknown/0e0d06.2bpp b/gfx/unknown/0e0d06.2bpp
deleted file mode 100644
index 18497c4fe..000000000
--- a/gfx/unknown/0e0d06.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-����ÁÁÁÁ����
\ No newline at end of file
diff --git a/gfx/unknown/0e0d06.png b/gfx/unknown/0e0d06.png
new file mode 100644
index 000000000..cea1577ef
--- /dev/null
+++ b/gfx/unknown/0e0d06.png
diff --git a/gfx/unknown/0e0d16.2bpp.lz b/gfx/unknown/0e0d16.2bpp.lz.86f267e8
index 8a60b966b..8a60b966b 100644
--- a/gfx/unknown/0e0d16.2bpp.lz
+++ b/gfx/unknown/0e0d16.2bpp.lz.86f267e8
diff --git a/gfx/unknown/0e0d16.png b/gfx/unknown/0e0d16.png
new file mode 100644
index 000000000..ab3c6594f
--- /dev/null
+++ b/gfx/unknown/0e0d16.png
diff --git a/gfx/unknown/0e0ea8.2bpp.lz b/gfx/unknown/0e0ea8.2bpp.lz.6a6c671d
index f238c797c..f238c797c 100644
--- a/gfx/unknown/0e0ea8.2bpp.lz
+++ b/gfx/unknown/0e0ea8.2bpp.lz.6a6c671d
diff --git a/gfx/unknown/0e0ea8.png b/gfx/unknown/0e0ea8.png
new file mode 100755
index 000000000..531417385
--- /dev/null
+++ b/gfx/unknown/0e0ea8.png
diff --git a/gfx/unknown/0e2221.2bpp.lz b/gfx/unknown/0e2221.2bpp.lz.821ba441
index b01fe34df..b01fe34df 100644
--- a/gfx/unknown/0e2221.2bpp.lz
+++ b/gfx/unknown/0e2221.2bpp.lz.821ba441
diff --git a/gfx/unknown/0e2221.png b/gfx/unknown/0e2221.png
new file mode 100644
index 000000000..e0f1d3256
--- /dev/null
+++ b/gfx/unknown/0e2221.png
diff --git a/gfx/unknown/0f89b0.2bpp b/gfx/unknown/0f89b0.2bpp
deleted file mode 100644
index b53cb7234..000000000
--- a/gfx/unknown/0f89b0.2bpp
+++ /dev/null
diff --git a/gfx/unknown/0f89b0.png b/gfx/unknown/0f89b0.png
new file mode 100644
index 000000000..151704af5
--- /dev/null
+++ b/gfx/unknown/0f89b0.png
diff --git a/gfx/unknown/0f8aa0.2bpp b/gfx/unknown/0f8aa0.2bpp
deleted file mode 100644
index 1260c40be..000000000
--- a/gfx/unknown/0f8aa0.2bpp
+++ /dev/null
diff --git a/gfx/unknown/0f8aa0.png b/gfx/unknown/0f8aa0.png
new file mode 100644
index 000000000..252bdd990
--- /dev/null
+++ b/gfx/unknown/0f8aa0.png
diff --git a/gfx/unknown/0f8ea4.2bpp b/gfx/unknown/0f8ea4.2bpp
deleted file mode 100644
index 93e0572a7..000000000
--- a/gfx/unknown/0f8ea4.2bpp
+++ /dev/null
diff --git a/gfx/unknown/0f8f34.png b/gfx/unknown/0f8f34.png
new file mode 100644
index 000000000..e02b91ce2
--- /dev/null
+++ b/gfx/unknown/0f8f34.png
diff --git a/gfx/unknown/0f8f34.w64.1bpp b/gfx/unknown/0f8f34.w64.1bpp
deleted file mode 100644
index 7209b2608..000000000
--- a/gfx/unknown/0f8f34.w64.1bpp
+++ /dev/null
diff --git a/gfx/unknown/0f9424.2bpp b/gfx/unknown/0f9424.2bpp
deleted file mode 100644
index de5e58609..000000000
--- a/gfx/unknown/0f9424.2bpp
+++ /dev/null
diff --git a/gfx/unknown/0f9424.png b/gfx/unknown/0f9424.png
new file mode 100644
index 000000000..6f2b957f0
--- /dev/null
+++ b/gfx/unknown/0f9424.png
diff --git a/gfx/unknown/0fbbbb.2bpp b/gfx/unknown/0fbbbb.2bpp
deleted file mode 100644
index fba5d65c7..000000000
--- a/gfx/unknown/0fbbbb.2bpp
+++ /dev/null
diff --git a/gfx/unknown/0fbbbb.png b/gfx/unknown/0fbbbb.png
new file mode 100644
index 000000000..60f319eb3
--- /dev/null
+++ b/gfx/unknown/0fbbbb.png
diff --git a/gfx/unknown/1032a2.2bpp b/gfx/unknown/1032a2.2bpp
deleted file mode 100644
index 36d29b975..000000000
--- a/gfx/unknown/1032a2.2bpp
+++ /dev/null
diff --git a/gfx/unknown/1032a2.png b/gfx/unknown/1032a2.png
new file mode 100644
index 000000000..cdf1bd118
--- /dev/null
+++ b/gfx/unknown/1032a2.png
diff --git a/gfx/unknown/106514.2bpp b/gfx/unknown/106514.2bpp
deleted file mode 100644
index ee0c829d2..000000000
--- a/gfx/unknown/106514.2bpp
+++ /dev/null
diff --git a/gfx/unknown/106514.png b/gfx/unknown/106514.png
new file mode 100644
index 000000000..faadc6f9c
--- /dev/null
+++ b/gfx/unknown/106514.png
diff --git a/gfx/unknown/1065ad.2bpp b/gfx/unknown/1065ad.2bpp
deleted file mode 100644
index b2bc8cc56..000000000
--- a/gfx/unknown/1065ad.2bpp
+++ /dev/null
diff --git a/gfx/unknown/1065ad.png b/gfx/unknown/1065ad.png
new file mode 100644
index 000000000..106c712dd
--- /dev/null
+++ b/gfx/unknown/1065ad.png
diff --git a/gfx/unknown/106dad.png b/gfx/unknown/106dad.png
new file mode 100644
index 000000000..726178132
--- /dev/null
+++ b/gfx/unknown/106dad.png
diff --git a/gfx/unknown/108d27.2bpp.lz b/gfx/unknown/108d27.2bpp.lz.eef1e11d
index b499f4abf..b499f4abf 100644
--- a/gfx/unknown/108d27.2bpp.lz
+++ b/gfx/unknown/108d27.2bpp.lz.eef1e11d
diff --git a/gfx/unknown/108d27.png b/gfx/unknown/108d27.png
new file mode 100644
index 000000000..db774bf28
--- /dev/null
+++ b/gfx/unknown/108d27.png
diff --git a/gfx/unknown/108da7.2bpp.lz b/gfx/unknown/108da7.2bpp.lz.aad8592b
index 4d860f055..4d860f055 100644
--- a/gfx/unknown/108da7.2bpp.lz
+++ b/gfx/unknown/108da7.2bpp.lz.aad8592b
diff --git a/gfx/unknown/108da7.png b/gfx/unknown/108da7.png
new file mode 100644
index 000000000..da41217d8
--- /dev/null
+++ b/gfx/unknown/108da7.png
diff --git a/gfx/unknown/108fe7.tilemap b/gfx/unknown/108fe7.tilemap
new file mode 100644
index 000000000..bb67a49f4
--- /dev/null
+++ b/gfx/unknown/108fe7.tilemap
diff --git a/gfx/unknown/108fe7.tilemap.lz b/gfx/unknown/108fe7.tilemap.lz.12882d37
index 94069f2fa..94069f2fa 100644
--- a/gfx/unknown/108fe7.tilemap.lz
+++ b/gfx/unknown/108fe7.tilemap.lz.12882d37
diff --git a/gfx/unknown/1090a7.tilemap b/gfx/unknown/1090a7.tilemap
new file mode 100644
index 000000000..6f4843dde
--- /dev/null
+++ b/gfx/unknown/1090a7.tilemap
diff --git a/gfx/unknown/1090a7.tilemap.lz b/gfx/unknown/1090a7.tilemap.lz.ea4f2cbe
index 933762c80..933762c80 100644
--- a/gfx/unknown/1090a7.tilemap.lz
+++ b/gfx/unknown/1090a7.tilemap.lz.ea4f2cbe
diff --git a/gfx/unknown/1091c7.2bpp b/gfx/unknown/1091c7.2bpp
deleted file mode 100644
index bc36edc73..000000000
--- a/gfx/unknown/1091c7.2bpp
+++ /dev/null
diff --git a/gfx/unknown/1091c7.png b/gfx/unknown/1091c7.png
new file mode 100644
index 000000000..8def47f76
--- /dev/null
+++ b/gfx/unknown/1091c7.png
diff --git a/gfx/unknown/1092c7.2bpp b/gfx/unknown/1092c7.2bpp
deleted file mode 100644
index 05db6cf13..000000000
--- a/gfx/unknown/1092c7.2bpp
+++ /dev/null
diff --git a/gfx/unknown/1092c7.png b/gfx/unknown/1092c7.png
new file mode 100644
index 000000000..d48a5ee51
--- /dev/null
+++ b/gfx/unknown/1092c7.png
diff --git a/gfx/unknown/11601a.2bpp b/gfx/unknown/11601a.2bpp
deleted file mode 100644
index 02dafd2f7..000000000
--- a/gfx/unknown/11601a.2bpp
+++ /dev/null
diff --git a/gfx/unknown/11601a.png b/gfx/unknown/11601a.png
new file mode 100644
index 000000000..a6a7598f8
--- /dev/null
+++ b/gfx/unknown/11601a.png
diff --git a/gfx/unknown/16c173.2bpp b/gfx/unknown/16c173.2bpp
deleted file mode 100644
index eba6e28f3..000000000
--- a/gfx/unknown/16c173.2bpp
+++ /dev/null
diff --git a/gfx/unknown/16c173.png b/gfx/unknown/16c173.png
new file mode 100755
index 000000000..d54b68cdf
--- /dev/null
+++ b/gfx/unknown/16c173.png
diff --git a/gfx/unknown/16cca3.2bpp b/gfx/unknown/16cca3.2bpp
deleted file mode 100644
index 487a2556d..000000000
--- a/gfx/unknown/16cca3.2bpp
+++ /dev/null
diff --git a/gfx/unknown/16cca3.png b/gfx/unknown/16cca3.png
new file mode 100644
index 000000000..d5ad353d8
--- /dev/null
+++ b/gfx/unknown/16cca3.png
diff --git a/gfx/unknown/16cfc1.2bpp b/gfx/unknown/16cfc1.2bpp
deleted file mode 100644
index cc9b9a87e..000000000
--- a/gfx/unknown/16cfc1.2bpp
+++ /dev/null
diff --git a/gfx/unknown/16cfc1.png b/gfx/unknown/16cfc1.png
new file mode 100644
index 000000000..390b107fd
--- /dev/null
+++ b/gfx/unknown/16cfc1.png
diff --git a/gfx/unknown/170d16.2bpp.lz b/gfx/unknown/170d16.2bpp.lz.5d6d2ad4
index 4d50c6bcf..4d50c6bcf 100644
--- a/gfx/unknown/170d16.2bpp.lz
+++ b/gfx/unknown/170d16.2bpp.lz.5d6d2ad4
diff --git a/gfx/unknown/170d16.png b/gfx/unknown/170d16.png
new file mode 100644
index 000000000..2832fdb6a
--- /dev/null
+++ b/gfx/unknown/170d16.png
diff --git a/gfx/unknown/1715a4.2bpp.lz b/gfx/unknown/1715a4.2bpp.lz.3eaf004f
index b4fabff15..b4fabff15 100644
--- a/gfx/unknown/1715a4.2bpp.lz
+++ b/gfx/unknown/1715a4.2bpp.lz.3eaf004f
diff --git a/gfx/unknown/1715a4.png b/gfx/unknown/1715a4.png
new file mode 100644
index 000000000..3e1c0bb46
--- /dev/null
+++ b/gfx/unknown/1715a4.png
diff --git a/gfx/unknown/1715a4_nonmatching.png b/gfx/unknown/1715a4_nonmatching.png
new file mode 100755
index 000000000..44ea166ef
--- /dev/null
+++ b/gfx/unknown/1715a4_nonmatching.png
diff --git a/gfx/unknown/171848.2bpp b/gfx/unknown/171848.2bpp
deleted file mode 100644
index fee9b216e..000000000
--- a/gfx/unknown/171848.2bpp
+++ /dev/null
diff --git a/gfx/unknown/171848.png b/gfx/unknown/171848.png
new file mode 100644
index 000000000..f0c0f64e9
--- /dev/null
+++ b/gfx/unknown/171848.png
diff --git a/gfx/unknown/171db1.2bpp b/gfx/unknown/171db1.2bpp
deleted file mode 100644
index 78d4e0a31..000000000
--- a/gfx/unknown/171db1.2bpp
+++ /dev/null
diff --git a/gfx/unknown/171db1.png b/gfx/unknown/171db1.png
new file mode 100644
index 000000000..1c32d2bda
--- /dev/null
+++ b/gfx/unknown/171db1.png
diff --git a/gfx/unknown/172f1f.2bpp b/gfx/unknown/172f1f.2bpp
deleted file mode 100644
index 55a3c7521..000000000
--- a/gfx/unknown/172f1f.2bpp
+++ /dev/null
diff --git a/gfx/unknown/17afa5.2bpp b/gfx/unknown/17afa5.2bpp
deleted file mode 100644
index 3c0795de0..000000000
--- a/gfx/unknown/17afa5.2bpp
+++ /dev/null
diff --git a/gfx/unknown/17afa5.png b/gfx/unknown/17afa5.png
new file mode 100644
index 000000000..fc6459040
--- /dev/null
+++ b/gfx/unknown/17afa5.png
diff --git a/gfx/unknown/17eb7e.2bpp b/gfx/unknown/17eb7e.2bpp
deleted file mode 100644
index 15320a0c1..000000000
--- a/gfx/unknown/17eb7e.2bpp
+++ /dev/null
diff --git a/gfx/unknown/17eb7e.png b/gfx/unknown/17eb7e.png
new file mode 100644
index 000000000..3a4a6bd4b
--- /dev/null
+++ b/gfx/unknown/17eb7e.png
diff --git a/gfx/unknown/1dd805.2bpp.lz b/gfx/unknown/1dd805.2bpp.lz.7b56f7e5
index 5c35bb6e1..5c35bb6e1 100644
--- a/gfx/unknown/1dd805.2bpp.lz
+++ b/gfx/unknown/1dd805.2bpp.lz.7b56f7e5
diff --git a/gfx/unknown/1dd805.png b/gfx/unknown/1dd805.png
new file mode 100644
index 000000000..768bbf913
--- /dev/null
+++ b/gfx/unknown/1dd805.png
diff --git a/gfx/unown_puzzle/aerodactyl.2bpp.lz b/gfx/unown_puzzle/aerodactyl.2bpp.lz.f546fb5e
index cc73411f9..cc73411f9 100644
--- a/gfx/unown_puzzle/aerodactyl.2bpp.lz
+++ b/gfx/unown_puzzle/aerodactyl.2bpp.lz.f546fb5e
diff --git a/gfx/unown_puzzle/aerodactyl.png b/gfx/unown_puzzle/aerodactyl.png
new file mode 100644
index 000000000..c7b37bbbb
--- /dev/null
+++ b/gfx/unown_puzzle/aerodactyl.png
diff --git a/gfx/unown_puzzle/cursor.2bpp b/gfx/unown_puzzle/cursor.2bpp
deleted file mode 100644
index dc42cfc79..000000000
--- a/gfx/unown_puzzle/cursor.2bpp
+++ /dev/null
diff --git a/gfx/unown_puzzle/cursor.png b/gfx/unown_puzzle/cursor.png
new file mode 100644
index 000000000..c10b810fe
--- /dev/null
+++ b/gfx/unown_puzzle/cursor.png
diff --git a/gfx/unown_puzzle/hooh.2bpp.lz b/gfx/unown_puzzle/hooh.2bpp.lz.e440a572
index d8c899e86..d8c899e86 100644
--- a/gfx/unown_puzzle/hooh.2bpp.lz
+++ b/gfx/unown_puzzle/hooh.2bpp.lz.e440a572
diff --git a/gfx/unown_puzzle/hooh.png b/gfx/unown_puzzle/hooh.png
new file mode 100644
index 000000000..bb8be6cfa
--- /dev/null
+++ b/gfx/unown_puzzle/hooh.png
diff --git a/gfx/unown_puzzle/kabuto.2bpp.lz b/gfx/unown_puzzle/kabuto.2bpp.lz.0ed9882d
index a94050316..a94050316 100644
--- a/gfx/unown_puzzle/kabuto.2bpp.lz
+++ b/gfx/unown_puzzle/kabuto.2bpp.lz.0ed9882d
diff --git a/gfx/unown_puzzle/kabuto.png b/gfx/unown_puzzle/kabuto.png
new file mode 100644
index 000000000..823401cc5
--- /dev/null
+++ b/gfx/unown_puzzle/kabuto.png
diff --git a/gfx/unown_puzzle/omanyte.2bpp.lz b/gfx/unown_puzzle/omanyte.2bpp.lz.27bfcbde
index 5bdd993dc..5bdd993dc 100644
--- a/gfx/unown_puzzle/omanyte.2bpp.lz
+++ b/gfx/unown_puzzle/omanyte.2bpp.lz.27bfcbde
diff --git a/gfx/unown_puzzle/omanyte.png b/gfx/unown_puzzle/omanyte.png
new file mode 100644
index 000000000..83ba6774f
--- /dev/null
+++ b/gfx/unown_puzzle/omanyte.png
diff --git a/gfx/unown_puzzle/start_cancel.2bpp.lz b/gfx/unown_puzzle/start_cancel.2bpp.lz.e07fe7bd
index 96fbb1fbb..96fbb1fbb 100644
--- a/gfx/unown_puzzle/start_cancel.2bpp.lz
+++ b/gfx/unown_puzzle/start_cancel.2bpp.lz.e07fe7bd
diff --git a/gfx/unown_puzzle/start_cancel.png b/gfx/unown_puzzle/start_cancel.png
new file mode 100644
index 000000000..66455dccb
--- /dev/null
+++ b/gfx/unown_puzzle/start_cancel.png
diff --git a/gfx/unown_puzzle/tile_borders.2bpp b/gfx/unown_puzzle/tile_borders.2bpp
deleted file mode 100644
index 570244c82..000000000
--- a/gfx/unown_puzzle/tile_borders.2bpp
+++ /dev/null
diff --git a/gfx/unown_puzzle/tile_borders.png b/gfx/unown_puzzle/tile_borders.png
new file mode 100644
index 000000000..8706905f7
--- /dev/null
+++ b/gfx/unown_puzzle/tile_borders.png
diff --git a/home/battle.asm b/home/battle.asm
index e8aa0747c..3c2e4de43 100644
--- a/home/battle.asm
+++ b/home/battle.asm
@@ -227,7 +227,7 @@ GetBattleVarAddr:: ; 39e7
 	dw wPlayerMoveStructPower,       wEnemyMoveStructPower
 	dw wPlayerMoveStructType,        wEnemyMoveStructType
 	dw CurPlayerMove,                CurEnemyMove
-	dw LastEnemyCounterMove,         LastPlayerCounterMove
+	dw LastPlayerCounterMove,        LastEnemyCounterMove
 	dw LastPlayerMove,               LastEnemyMove
 ; 3a90
 
diff --git a/items/marts.asm b/items/marts.asm
index 295a4bafd..cd17ca36b 100644
--- a/items/marts.asm
+++ b/items/marts.asm
@@ -1,43 +1,43 @@
 Marts: ; 160a9
-	dw Mart0
-	dw Mart1
-	dw Mart2
-	dw Mart3
-	dw Mart4
-	dw Mart5
-	dw Mart6
-	dw Mart7
-	dw Mart8
-	dw Mart9
-	dw Mart10
-	dw Mart11
-	dw Mart12
-	dw Mart13
-	dw Mart14
-	dw Mart15
-	dw Mart16
-	dw Mart17
-	dw Mart18
-	dw Mart19
-	dw Mart20
-	dw Mart21
-	dw Mart22
-	dw Mart23
-	dw Mart24
-	dw Mart25
-	dw Mart26
-	dw Mart27
-	dw Mart28
-	dw Mart29
-	dw Mart30
-	dw Mart31
-	dw Mart32
-	dw Mart33
+	dw MartCherrygrove
+	dw MartCherrygroveDex
+	dw MartViolet
+	dw MartAzalea
+	dw MartCianwood
+	dw MartGoldenrod2F1
+	dw MartGoldenrod2F2
+	dw MartGoldenrod3F
+	dw MartGoldenrod4F
+	dw MartGoldenrod5F1
+	dw MartGoldenrod5F2
+	dw MartGoldenrod5F3
+	dw MartGoldenrod5F4
+	dw MartOlivine
+	dw MartEcruteak
+	dw MartMahogany1
+	dw MartMahogany2
+	dw MartBlackthorn
+	dw MartViridian
+	dw MartPewter
+	dw MartCerulean
+	dw MartLavender
+	dw MartVermilion
+	dw MartCeladon2F1
+	dw MartCeladon2F2
+	dw MartCeladon3F
+	dw MartCeladon4F
+	dw MartCeladon5F1
+	dw MartCeladon5F2
+	dw MartFuchsia
+	dw MartSaffron
+	dw MartMtMoon
+	dw MartIndigoPlateau
+	dw MartUnderground
 MartsEnd
 ; 160ed
 
 
-Mart0: ; 160ed
+MartCherrygrove: ; 160ed
 	db 4 ; # items
 	db POTION
 	db ANTIDOTE
@@ -46,7 +46,7 @@ Mart0: ; 160ed
 	db $ff
 ; 160f3
 
-Mart1: ; 160f3
+MartCherrygroveDex: ; 160f3
 	db 5 ; # items
 	db POKE_BALL
 	db POTION
@@ -56,7 +56,7 @@ Mart1: ; 160f3
 	db $ff
 ; 160fa
 
-Mart2: ; 160fa
+MartViolet: ; 160fa
 	db 10 ; # items
 	db POKE_BALL
 	db POTION
@@ -71,7 +71,7 @@ Mart2: ; 160fa
 	db $ff
 ; 16106
 
-Mart3: ; 16106
+MartAzalea: ; 16106
 	db 9 ; # items
 	db CHARCOAL
 	db POKE_BALL
@@ -85,7 +85,7 @@ Mart3: ; 16106
 	db $ff
 ; 16111
 
-Mart4: ; 16111
+MartCianwood: ; 16111
 	db 5 ; # items
 	db POTION
 	db SUPER_POTION
@@ -95,7 +95,7 @@ Mart4: ; 16111
 	db $ff
 ; 16118
 
-Mart5: ; 16118
+MartGoldenrod2F1: ; 16118
 	db 7 ; # items
 	db POTION
 	db SUPER_POTION
@@ -107,7 +107,7 @@ Mart5: ; 16118
 	db $ff
 ; 16121
 
-Mart6: ; 16121
+MartGoldenrod2F2: ; 16121
 	db 8 ; # items
 	db POKE_BALL
 	db GREAT_BALL
@@ -120,7 +120,7 @@ Mart6: ; 16121
 	db $ff
 ; 1612b
 
-Mart7: ; 1612b
+MartGoldenrod3F: ; 1612b
 	db 7 ; # items
 	db X_SPEED
 	db X_SPECIAL
@@ -132,7 +132,7 @@ Mart7: ; 1612b
 	db $ff
 ; 16134
 
-Mart8: ; 16134
+MartGoldenrod4F: ; 16134
 	db 5 ; # items
 	db PROTEIN
 	db IRON
@@ -142,7 +142,7 @@ Mart8: ; 16134
 	db $ff
 ; 1613b
 
-Mart9: ; 1613b
+MartGoldenrod5F1: ; 1613b
 	db 3 ; # items
 	db TM_THUNDERPUNCH
 	db TM_FIRE_PUNCH
@@ -150,7 +150,7 @@ Mart9: ; 1613b
 	db $ff
 ; 16140
 
-Mart10: ; 16140
+MartGoldenrod5F2: ; 16140
 	db 4 ; # items
 	db TM_THUNDERPUNCH
 	db TM_FIRE_PUNCH
@@ -159,7 +159,7 @@ Mart10: ; 16140
 	db $ff
 ; 16146
 
-Mart11: ; 16146
+MartGoldenrod5F3: ; 16146
 	db 4 ; # items
 	db TM_THUNDERPUNCH
 	db TM_FIRE_PUNCH
@@ -168,7 +168,7 @@ Mart11: ; 16146
 	db $ff
 ; 1614c
 
-Mart12: ; 1614c
+MartGoldenrod5F4: ; 1614c
 	db 5 ; # items
 	db TM_THUNDERPUNCH
 	db TM_FIRE_PUNCH
@@ -178,7 +178,7 @@ Mart12: ; 1614c
 	db $ff
 ; 16153
 
-Mart13: ; 16153
+MartOlivine: ; 16153
 	db 9 ; # items
 	db GREAT_BALL
 	db SUPER_POTION
@@ -192,7 +192,7 @@ Mart13: ; 16153
 	db $ff
 ; 1615e
 
-Mart14: ; 1615e
+MartEcruteak: ; 1615e
 	db 10 ; # items
 	db POKE_BALL
 	db GREAT_BALL
@@ -207,7 +207,7 @@ Mart14: ; 1615e
 	db $ff
 ; 1616a
 
-Mart15: ; 1616a
+MartMahogany1: ; 1616a
 	db 4 ; # items
 	db TINYMUSHROOM
 	db SLOWPOKETAIL
@@ -216,7 +216,7 @@ Mart15: ; 1616a
 	db $ff
 ; 16170
 
-Mart16: ; 16170
+MartMahogany2: ; 16170
 	db 9 ; # items
 	db RAGECANDYBAR
 	db GREAT_BALL
@@ -230,7 +230,7 @@ Mart16: ; 16170
 	db $ff
 ; 1617b
 
-Mart17: ; 1617b
+MartBlackthorn: ; 1617b
 	db 9 ; # items
 	db GREAT_BALL
 	db ULTRA_BALL
@@ -244,7 +244,7 @@ Mart17: ; 1617b
 	db $ff
 ; 16186
 
-Mart18: ; 16186
+MartViridian: ; 16186
 	db 9 ; # items
 	db ULTRA_BALL
 	db HYPER_POTION
@@ -258,7 +258,7 @@ Mart18: ; 16186
 	db $ff
 ; 16191
 
-Mart19: ; 16191
+MartPewter: ; 16191
 	db 7 ; # items
 	db GREAT_BALL
 	db SUPER_POTION
@@ -270,7 +270,7 @@ Mart19: ; 16191
 	db $ff
 ; 1619a
 
-Mart20: ; 1619a
+MartCerulean: ; 1619a
 	db 9 ; # items
 	db GREAT_BALL
 	db ULTRA_BALL
@@ -284,7 +284,7 @@ Mart20: ; 1619a
 	db $ff
 ; 161a5
 
-Mart21: ; 161a5
+MartLavender: ; 161a5
 	db 8 ; # items
 	db GREAT_BALL
 	db POTION
@@ -297,7 +297,7 @@ Mart21: ; 161a5
 	db $ff
 ; 161af
 
-Mart22: ; 161af
+MartVermilion: ; 161af
 	db 8 ; # items
 	db ULTRA_BALL
 	db SUPER_POTION
@@ -310,7 +310,7 @@ Mart22: ; 161af
 	db $ff
 ; 161b9
 
-Mart23: ; 161b9
+MartCeladon2F1: ; 161b9
 	db 7 ; # items
 	db POTION
 	db SUPER_POTION
@@ -322,7 +322,7 @@ Mart23: ; 161b9
 	db $ff
 ; 161c2
 
-Mart24: ; 161c2
+MartCeladon2F2: ; 161c2
 	db 10 ; # items
 	db POKE_BALL
 	db GREAT_BALL
@@ -337,7 +337,7 @@ Mart24: ; 161c2
 	db $ff
 ; 161ce
 
-Mart25: ; 161ce
+MartCeladon3F: ; 161ce
 	db 5 ; # items
 	db TM_HIDDEN_POWER
 	db TM_SUNNY_DAY
@@ -347,7 +347,7 @@ Mart25: ; 161ce
 	db $ff
 ; 161d5
 
-Mart26: ; 161d5
+MartCeladon4F: ; 161d5
 	db 3 ; # items
 	db POKE_DOLL
 	db LOVELY_MAIL
@@ -355,7 +355,7 @@ Mart26: ; 161d5
 	db $ff
 ; 161da
 
-Mart27: ; 161da
+MartCeladon5F1: ; 161da
 	db 5 ; # items
 	db HP_UP
 	db PROTEIN
@@ -365,7 +365,7 @@ Mart27: ; 161da
 	db $ff
 ; 161e1
 
-Mart28: ; 161e1
+MartCeladon5F2: ; 161e1
 	db 7 ; # items
 	db X_ACCURACY
 	db GUARD_SPEC
@@ -377,7 +377,7 @@ Mart28: ; 161e1
 	db $ff
 ; 161ea
 
-Mart29: ; 161ea
+MartFuchsia: ; 161ea
 	db 7 ; # items
 	db GREAT_BALL
 	db ULTRA_BALL
@@ -389,7 +389,7 @@ Mart29: ; 161ea
 	db $ff
 ; 161f3
 
-Mart30: ; 161f3
+MartSaffron: ; 161f3
 	db 8 ; # items
 	db GREAT_BALL
 	db ULTRA_BALL
@@ -402,7 +402,7 @@ Mart30: ; 161f3
 	db $ff
 ; 161fd
 
-Mart31: ; 161fd
+MartMtMoon: ; 161fd
 	db 6 ; # items
 	db POKE_DOLL
 	db FRESH_WATER
@@ -413,7 +413,7 @@ Mart31: ; 161fd
 	db $ff
 ; 16205
 
-Mart32: ; 16205
+MartIndigoPlateau: ; 16205
 	db 7 ; # items
 	db ULTRA_BALL
 	db MAX_REPEL
@@ -425,7 +425,7 @@ Mart32: ; 16205
 	db $ff
 ; 1620e
 
-Mart33: ; 1620e
+MartUnderground: ; 1620e
 	db 4 ; # items
 	db ENERGYPOWDER
 	db ENERGY_ROOT
diff --git a/main.asm b/main.asm
index 680da1d25..0fc2e61e4 100644
--- a/main.asm
+++ b/main.asm
@@ -1178,10 +1178,10 @@ INCLUDE "engine/wildmons.asm"
 INCLUDE "battle/link_result.asm"
 
 ChrisBackpic: ; 2ba1a
-INCBIN "gfx/misc/player.6x6.2bpp.lz"
+INCBIN "gfx/misc/player.2bpp.lz"
 
 DudeBackpic: ; 2bbaa
-INCBIN "gfx/misc/dude.6x6.2bpp.lz"
+INCBIN "gfx/misc/dude.2bpp.lz"
 
 SECTION "bankB", ROMX
 
@@ -4664,7 +4664,7 @@ Unknown_53d84: ; unreferenced
 
 UnknownEggPic:: ; 53d9c
 ; Another egg pic. This is shifted up a few pixels.
-INCBIN "gfx/misc/unknown_egg.5x5.2bpp.lz"
+INCBIN "gfx/misc/unknown_egg.2bpp.lz"
 
 SECTION "bank19", ROMX
 
@@ -4857,10 +4857,10 @@ GetCardPic: ; 8833e
 	ret
 
 ChrisCardPic: ; 88365
-INCBIN "gfx/misc/chris_card.5x7.2bpp"
+INCBIN "gfx/misc/chris_card.2bpp"
 
 KrisCardPic: ; 88595
-INCBIN "gfx/misc/kris_card.5x7.2bpp"
+INCBIN "gfx/misc/kris_card.2bpp"
 
 CardGFX: ; 887c5
 INCBIN "gfx/misc/trainer_card.2bpp"
@@ -4943,10 +4943,10 @@ DrawIntroPlayerPic: ; 88874
 	ret
 
 ChrisPic: ; 888a9
-INCBIN "gfx/misc/chris.7x7.2bpp"
+INCBIN "gfx/misc/chris.2bpp"
 
 KrisPic: ; 88bb9
-INCBIN "gfx/misc/kris.7x7.2bpp"
+INCBIN "gfx/misc/kris.2bpp"
 
 GetKrisBackpic: ; 88ec9
 ; Kris's backpic is uncompressed.
@@ -4957,7 +4957,7 @@ GetKrisBackpic: ; 88ec9
 	ret
 
 KrisBackpic: ; 88ed6
-INCBIN "gfx/misc/kris_back.6x6.2bpp"
+INCBIN "gfx/misc/kris_back.2bpp"
 
 String_89116:
 	db "-----@"
diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm
index cae976a1c..f4b3eba8b 100644
--- a/misc/gbc_only.asm
+++ b/misc/gbc_only.asm
@@ -145,5 +145,5 @@ GBCOnlyString: ; 4eb38
 
 
 GBCOnlyGFX: ; 4eb76
-INCBIN "gfx/misc/gbc_only.w112.2bpp.lz"
+INCBIN "gfx/misc/gbc_only.2bpp.lz"
 ; 4f0bc
diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm
index 6a38e67c2..169107978 100755
--- a/misc/mobile_41.asm
+++ b/misc/mobile_41.asm
@@ -1116,16 +1116,18 @@ INCBIN "gfx/unknown/106514.2bpp"
 
 
 LoadOverworldFont:: ; 106594
-	ld de, .bgfont
+	ld de, .font
 	ld hl, VTiles1
-	lb bc, BANK(.bgfont), $80
+	lb bc, BANK(.font), $80
 	call Get2bpp
-	ld de, .bgfont + $80 tiles
+	ld de, .space
 	ld hl, VTiles2 tile $7f
-	lb bc, BANK(.bgfont), 1
+	lb bc, BANK(.space), 1
 	call Get2bpp
 	ret
 ; 1065ad
 
-.bgfont
+.font
 INCBIN "gfx/unknown/1065ad.2bpp"
+.space
+INCBIN "gfx/unknown/106dad.2bpp"
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index ef9db89a8..d181de745 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -206,7 +206,7 @@ Function170c06: ; 170c06
 ; 170c8b
 
 Function170c8b: ; 170c8b
-	ld hl, LastPlayerCounterMove
+	ld hl, LastEnemyCounterMove
 	ld b, $5
 .asm_170c90
 	ld a, [hl]
@@ -858,7 +858,7 @@ Function172e78: ; 172e78 (5c:6e78)
 	ld bc, $168
 	call ByteFill
 	call DisableLCD
-	ld hl, GFX_172f1f
+	ld hl, GameBoyN64GFX
 	ld de, VTiles2 tile $00
 	ld bc, $610
 	call CopyBytes
@@ -929,8 +929,8 @@ Palette_172edf:
 	RGB  0,  0,  0
 	RGB  0,  0,  0
 
-GFX_172f1f:
-INCBIN "gfx/unknown/172f1f.2bpp"
+GameBoyN64GFX:
+INCBIN "gfx/trade/game_boy_n64.2bpp"
 
 Tilemap_1733af:
 IF DEF(CRYSTAL11)
diff --git a/roms.md5 b/roms.md5
deleted file mode 100644
index 79ca0bc51..000000000
--- a/roms.md5
+++ /dev/null
@@ -1,2 +0,0 @@
-9f2922b235a5eeb78d65594e82ef5dde  pokecrystal.gbc
-301899b8087289a6436b0a241fbbb474  pokecrystal11.gbc
diff --git a/roms.sha1 b/roms.sha1
new file mode 100644
index 000000000..3cdf981f6
--- /dev/null
+++ b/roms.sha1
@@ -0,0 +1,2 @@
+f4cd194bdee0d04ca4eac29e09b8e4e9d818c133 *pokecrystal.gbc
+f2f52230b536214ef7c9924f483392993e226cfb *pokecrystal11.gbc
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 000000000..6fc2134d5
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1,8 @@
+gfx
+lzcomp
+md5
+palette
+png_dimensions
+pokemon_animation
+pokemon_animation_graphics
+scan_includes
diff --git a/tools/Makefile b/tools/Makefile
index 4a04027fc..3dd4fb62a 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,13 +1,22 @@
-.PHONY: all
+.PHONY: all clean
 
-all: \
+CC := gcc
+CFLAGS := -std=c99
+
+tools := \
 	lzcomp \
 	png_dimensions \
 	scan_includes \
 	palette \
 	pokemon_animation \
-	pokemon_animation_graphics
+	pokemon_animation_graphics \
+	gfx \
+	md5
+all: $(tools)
 	@:
 
+clean:
+	rm -f $(tools)
+
 %: %.c
-	$(CC) -o $@ $<
+	$(CC) $(CFLAGS) -o $@ $<
diff --git a/tools/common.h b/tools/common.h
new file mode 100644
index 000000000..bc877ccb9
--- /dev/null
+++ b/tools/common.h
@@ -0,0 +1,37 @@
+#ifndef GUARD_COMMON_H
+#define GUARD_COMMON_H
+
+int __getopt_long_i__;
+#define getopt_long(c, v, s, l) getopt_long(c, v, s, l, &__getopt_long_i__)
+
+FILE *fopen_verbose(char *filename, char *mode) {
+	FILE *f = fopen(filename, mode);
+	if (!f) {
+		fprintf(stderr, "Could not open file: \"%s\"\n", filename);
+	}
+	return f;
+}
+
+uint8_t *read_u8(char *filename, int *size) {
+	FILE *f = fopen_verbose(filename, "rb");
+	if (!f) {
+		exit(1);
+	}
+	fseek(f, 0, SEEK_END);
+	*size = ftell(f);
+	rewind(f);
+	uint8_t *data = malloc(*size);
+	fread(data, 1, *size, f);
+	fclose(f);
+	return data;
+}
+
+void write_u8(char *filename, uint8_t *data, int size) {
+	FILE *f = fopen_verbose(filename, "wb");
+	if (f) {
+		fwrite(data, 1, size, f);
+		fclose(f);
+	}
+}
+
+#endif // GUARD_COMMON_H
diff --git a/tools/gfx.c b/tools/gfx.c
new file mode 100644
index 000000000..207dcb6c2
--- /dev/null
+++ b/tools/gfx.c
@@ -0,0 +1,271 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <getopt.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "common.h"
+
+static void usage(void) {
+	fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [--interleave] [--remove-duplicates [--keep-whitespace]] [--remove-xflip] [--remove-yflip] [-w width] [-d depth] [-h] [-o outfile] infile\n");
+}
+
+static void error(char *message) {
+	fputs(message, stderr);
+	fputs("\n", stderr);
+}
+
+struct Options {
+	int trim_whitespace;
+	int remove_whitespace;
+	int help;
+	char *outfile;
+	int depth;
+	int interleave;
+	int width;
+	int remove_duplicates;
+	int keep_whitespace;
+	int remove_xflip;
+	int remove_yflip;
+};
+
+struct Options Options = {
+	.depth = 2,
+};
+
+void get_args(int argc, char *argv[]) {
+	struct option long_options[] = {
+		{"remove-whitespace", no_argument, &Options.remove_whitespace, 1},
+		{"trim-whitespace", no_argument, &Options.trim_whitespace, 1},
+		{"interleave", no_argument, &Options.interleave, 1},
+		{"remove-duplicates", no_argument, &Options.remove_duplicates, 1},
+		{"keep-whitespace", no_argument, &Options.keep_whitespace, 1},
+		{"remove-xflip", no_argument, &Options.remove_xflip, 1},
+		{"remove-yflip", no_argument, &Options.remove_yflip, 1},
+		{"width", required_argument, 0, 'w'},
+		{"depth", required_argument, 0, 'd'},
+		{"help", no_argument, 0, 'h'},
+		{0}
+	};
+	for (int opt = 0; opt != -1;) {
+		switch (opt = getopt_long(argc, argv, "ho:d:", long_options)) {
+		case 'h':
+			Options.help = true;
+			break;
+		case 'o':
+			Options.outfile = optarg;
+			break;
+		case 'd':
+			Options.depth = strtoul(optarg, NULL, 0);
+			break;
+		case 'w':
+			Options.width = strtoul(optarg, NULL, 0);
+			break;
+		case 0:
+		case -1:
+			break;
+		default:
+			usage();
+			exit(1);
+			break;
+		}
+	}
+}
+
+struct Graphic {
+	int size;
+	uint8_t *data;
+};
+
+bool is_whitespace(uint8_t *tile, int tile_size) {
+	uint8_t WHITESPACE = 0;
+	for (int i = 0; i < tile_size; i++) {
+		if (tile[i] != WHITESPACE) {
+			return false;
+		}
+	}
+	return true;
+}
+
+void trim_whitespace(struct Graphic *graphic) {
+	int tile_size = Options.depth * 8;
+	for (int i = graphic->size - tile_size; i > 0; i -= tile_size) {
+		if (is_whitespace(&graphic->data[i], tile_size)) {
+			graphic->size = i;
+		} else {
+			break;
+		}
+	}
+}
+
+void remove_whitespace(struct Graphic *graphic) {
+	int tile_size = Options.depth * 8;
+	if (Options.interleave) tile_size *= 2;
+	int i = 0;
+	for (int j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {
+		while (is_whitespace(&graphic->data[j], tile_size)) {
+			j += tile_size;
+		}
+		if (j >= graphic->size) {
+			break;
+		}
+		if (j > i) {
+			memcpy(&graphic->data[i], &graphic->data[j], tile_size);
+		}
+	}
+	graphic->size = i;
+}
+
+bool tile_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles) {
+	for (int i = 0; i < num_tiles; i++) {
+		bool match = true;
+		for (int j = 0; j < tile_size; j++) {
+			if (tile[j] != tiles[i * tile_size + j]) {
+				match = false;
+			}
+		}
+		if (match) {
+			return true;
+		}
+	}
+	return false;
+}
+
+void remove_duplicates(struct Graphic *graphic) {
+	int tile_size = Options.depth * 8;
+	if (Options.interleave) tile_size *= 2;
+	int num_tiles = 0;
+	for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {
+		while (tile_exists(&graphic->data[j], graphic->data, tile_size, num_tiles)) {
+			if (Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) {
+				break;
+			}
+			j += tile_size;
+		}
+		if (j >= graphic->size) {
+			break;
+		}
+		if (j > i) {
+			memcpy(&graphic->data[i], &graphic->data[j], tile_size);
+		}
+		num_tiles++;
+	}
+	graphic->size = num_tiles * tile_size;
+}
+
+bool flip_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles, bool xflip, bool yflip) {
+	uint8_t *flip = calloc(tile_size, 1);
+	int half_size = tile_size / 2;
+	for (int i = 0; i < tile_size; i++) {
+		int byte = i;
+		if (yflip) {
+			byte = tile_size - 1 - (i ^ 1);
+			if (Options.interleave && i < half_size) {
+				byte = half_size - 1 - (i ^ 1);
+			}
+		}
+		if (xflip) {
+			for (int bit = 0; bit < 8; bit++) {
+				flip[byte] |= ((tile[i] >> bit) & 1) << (7 - bit);
+			}
+		} else {
+			flip[byte] = tile[i];
+		}
+	}
+	if (tile_exists(flip, tiles, tile_size, num_tiles)) {
+		return true;
+	}
+	return false;
+}
+
+void remove_flip(struct Graphic *graphic, bool xflip, bool yflip) {
+	int tile_size = Options.depth * 8;
+	if (Options.interleave) tile_size *= 2;
+	int num_tiles = 0;
+	for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {
+		while (flip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles, xflip, yflip)) {
+			if (Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) {
+				break;
+			}
+			j += tile_size;
+		}
+		if (j >= graphic->size) {
+			break;
+		}
+		if (j > i) {
+			memcpy(&graphic->data[i], &graphic->data[j], tile_size);
+		}
+		num_tiles++;
+	}
+	graphic->size = num_tiles * tile_size;
+}
+
+void interleave(struct Graphic *graphic, int width) {
+	int tile_size = Options.depth * 8;
+	int width_tiles = width / 8;
+	int num_tiles = graphic->size / tile_size;
+	uint8_t *interleaved = malloc(graphic->size);
+	for (int i = 0; i < num_tiles; i++) {
+		int tile = i * 2;
+		int row = i / width_tiles;
+		tile -= width_tiles * row;
+		if (row % 2) {
+			tile -= width_tiles;
+			tile += 1;
+		}
+		memcpy(&interleaved[tile * tile_size], &graphic->data[i * tile_size], tile_size);
+	}
+	graphic->size = num_tiles * tile_size;
+	memcpy(graphic->data, interleaved, graphic->size);
+	free(interleaved);
+}
+
+
+int main(int argc, char *argv[]) {
+	get_args(argc, argv);
+	argc -= optind;
+	argv += optind;
+	if (Options.help) {
+		usage();
+		return 0;
+	}
+	if (argc < 1) {
+		usage();
+		exit(1);
+	}
+	char *infile = argv[0];
+	struct Graphic graphic;
+	graphic.data = read_u8(infile, &graphic.size);
+	if (Options.trim_whitespace) {
+		trim_whitespace(&graphic);
+	}
+	if (Options.interleave) {
+		if (!Options.width) {
+			error("interleave: must set --width to a nonzero value");
+			usage();
+			exit(1);
+		}
+		interleave(&graphic, Options.width);
+	}
+	if (Options.remove_duplicates) {
+		remove_duplicates(&graphic);
+	}
+	if (Options.remove_xflip) {
+		remove_flip(&graphic, true, false);
+	}
+	if (Options.remove_yflip) {
+		remove_flip(&graphic, false, true);
+	}
+	if (Options.remove_xflip && Options.remove_yflip) {
+		remove_flip(&graphic, true, true);
+	}
+	if (Options.remove_whitespace) {
+		remove_whitespace(&graphic);
+	}
+	if (Options.outfile) {
+		write_u8(Options.outfile, graphic.data, graphic.size);
+	}
+	free(graphic.data);
+	return 0;
+}
diff --git a/tools/lzcomp.c b/tools/lzcomp.c
index 1b7b32a5d..c3fae1001 100644
--- a/tools/lzcomp.c
+++ b/tools/lzcomp.c
@@ -177,11 +177,11 @@ struct command find_best_copy (const unsigned char * data, unsigned short positi
   struct command simple = {.command = 7};
   struct command flipped = simple, backwards = simple;
   short count, offset;
-  if (count = scan_forwards(data + position, length - position, data, position, &offset))
+  if ((count = scan_forwards(data + position, length - position, data, position, &offset)))
     simple = (struct command) {.command = 4, .count = count, .value = offset};
-  if (count = scan_forwards(data + position, length - position, bitflipped, position, &offset))
+  if ((count = scan_forwards(data + position, length - position, bitflipped, position, &offset)))
     flipped = (struct command) {.command = 5, .count = count, .value = offset};
-  if (count = scan_backwards(data, length - position, position, &offset))
+  if ((count = scan_backwards(data, length - position, position, &offset)))
     backwards = (struct command) {.command = 6, .count = count, .value = offset};
   struct command command;
   switch (flags / 24) {
diff --git a/tools/md5.c b/tools/md5.c
new file mode 100644
index 000000000..e043e8537
--- /dev/null
+++ b/tools/md5.c
@@ -0,0 +1,128 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "common.h"
+
+static const int s[64] = {
+	7, 12, 17, 22,  7, 12, 17, 22,  7, 12, 17, 22,  7, 12, 17, 22,
+	5,  9, 14, 20,  5,  9, 14, 20,  5,  9, 14, 20,  5,  9, 14, 20,
+	4, 11, 16, 23,  4, 11, 16, 23,  4, 11, 16, 23,  4, 11, 16, 23,
+	6, 10, 15, 21,  6, 10, 15, 21,  6, 10, 15, 21,  6, 10, 15, 21,
+};
+
+static const uint32_t K[64] = {
+	0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
+	0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
+	0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
+	0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
+	0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
+	0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8,
+	0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
+	0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
+	0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
+	0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
+	0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05,
+	0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
+	0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
+	0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
+	0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
+	0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391,
+};
+
+#define rotate_left_32(value, by) \
+	((((value) << (by)) & 0xffffffff) | ((value) >> 32 - (by)))
+
+void md5_wikipedia(uint8_t *data, int length, uint8_t *result) {
+
+	uint8_t *message = calloc(length + 64, sizeof(uint8_t));
+	memcpy(message, data, length);
+
+	long orig_bitlength = length * 8;
+
+	message[length++] |= 1 << 7;
+
+	while (length % 64 != (64 - 8)) {
+		length++;
+	}
+	for (int i = 0; i < 8; i++) {
+		message[length++] = (orig_bitlength >> (i * 8)) & 0xff;
+	}
+
+	int a0 = 0x67452301;
+	int b0 = 0xefcdab89;
+	int c0 = 0x98badcfe;
+	int d0 = 0x10325476;
+
+	for (int start = 0; start < length; start += 64) {
+		uint32_t M[16];
+		for (int j = 0; j < 16; j++) {
+			uint8_t *word = &message[start + j * 4];
+			M[j] = *word++;
+			M[j] |= *word++ << 8;
+			M[j] |= *word++ << 16;
+			M[j] |= *word++ << 24;
+		}
+
+		int A = a0;
+		int B = b0;
+		int C = c0;
+		int D = d0;
+		for (int i = 0; i < 64; i++) {
+			int F, g;
+			switch (i / 16) {
+			case 0:
+				F = (B & C) | (~B & D);
+				g = i;
+				break;
+			case 1:
+				F = (D & B) | (~D & C);
+				g = (5 * i + 1) % 16;
+				break;
+			case 2:
+				F = B ^ C ^ D;
+				g = (3 * i + 5) % 16;
+				break;
+			case 3:
+				F = C ^ (B | ~D);
+				g = (7 * i) % 16;
+				break;
+			}
+			int e = D;
+			D = C;
+			C = B;
+			B = B + rotate_left_32(A + F + K[i] + M[g], s[i]);
+			A = e;
+		}
+		a0 += A;
+		b0 += B;
+		c0 += C;
+		d0 += D;
+	}
+
+	int values[] = {a0, b0, c0, d0};
+	for (int i = 0; i < 16; i++) {
+		int value = values[i >> 2];
+		int shift = (i % 4) * 8;
+		result[i] = (value >> shift) & 0xff;
+	}
+
+	free(message);
+}
+
+int main(int argc, char *argv[]) {
+	if (argc < 2) {
+		exit(1);
+	}
+	char *infile = argv[1];
+	int size;
+	uint8_t *data = read_u8(infile, &size);
+
+	uint8_t result[16];
+	md5_wikipedia(data, size, result);
+	for (int i = 0; i < 16; i++) {
+		printf("%02x", result[i]);
+	}
+	printf("\n");
+}
diff --git a/tools/palette.c b/tools/palette.c
index c1beb40e4..397c62651 100644
--- a/tools/palette.c
+++ b/tools/palette.c
@@ -3,6 +3,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
+#include <getopt.h>
 
 void usage(void) {
 	printf("Usage: palette palfile\n");
@@ -49,9 +50,17 @@ void print_palette(char* palette_filename) {
 
 	fseek(f, 0, SEEK_END);
 	size = ftell(f);
+	if (!size) {
+		fprintf(stderr, "empty file %s\n", palette_filename);
+		exit(1);
+	}
 	rewind(f);
 
 	bytes = malloc(size);
+	if (!bytes) {
+		fprintf(stderr, "malloc failure\n");
+		exit(1);
+	}
 
 	fseek(f, 0, SEEK_SET);
 	fread(bytes, 1, size, f);
@@ -64,7 +73,7 @@ void print_palette(char* palette_filename) {
 
 int main(int argc, char* argv[]) {
 	int ch;
-	bool pokemon;
+	bool pokemon = false;
 
 	while ((ch = getopt(argc, argv, "p")) != -1) {
 		switch (ch) {
diff --git a/tools/pokemon_animation.c b/tools/pokemon_animation.c
index 835160c24..315a1729f 100644
--- a/tools/pokemon_animation.c
+++ b/tools/pokemon_animation.c
@@ -4,6 +4,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <getopt.h>
 
 struct Frame {
 	uint8_t* data;
@@ -53,9 +54,17 @@ void make_frames(struct Frames* frames, struct Bitmasks* bitmasks, char* tilemap
 
 	fseek(f, 0, SEEK_END);
 	size = ftell(f);
+	if (!size) {
+		fprintf(stderr, "empty file %s\n", tilemap_filename);
+		exit(1);
+	}
 	rewind(f);
 
 	tilemap = malloc(size);
+	if (!tilemap) {
+		fprintf(stderr, "malloc failure\n");
+		exit(1);
+	}
 	fread(tilemap, 1, size, f);
 	fclose(f);
 
@@ -228,7 +237,7 @@ int main(int argc, char* argv[]) {
 	struct Frames frames = {0};
 	struct Bitmasks bitmasks = {0};
 	int ch;
-	bool use_bitmasks, use_frames;
+	bool use_bitmasks = false, use_frames = false;
 	char* tilemap_filename;
 	char* dimensions_filename;
 
diff --git a/tools/pokemon_animation_graphics.c b/tools/pokemon_animation_graphics.c
index f38850fb0..ae96d7f17 100644
--- a/tools/pokemon_animation_graphics.c
+++ b/tools/pokemon_animation_graphics.c
@@ -90,8 +90,16 @@ void create_tilemap(struct Tilemap* tilemap, struct Graphic* graphic, char* grap
 	}
 	fseek(f, 0, SEEK_END);
 	graphics_size = ftell(f);
+	if (!graphics_size) {
+		fprintf(stderr, "empty file %s\n", graphics_filename);
+		exit(1);
+	}
 	rewind(f);
 	graphics = malloc(graphics_size);
+	if (!graphics) {
+		fprintf(stderr, "malloc failure\n");
+		exit(1);
+	}
 	fread(graphics, 1, graphics_size, f);
 	fclose(f);
 
diff --git a/wram.asm b/wram.asm
index 614650cb9..d80578e79 100644
--- a/wram.asm
+++ b/wram.asm
@@ -390,9 +390,7 @@ wEnemyTrainerItem1:: ds 1 ; c650
 wEnemyTrainerItem2:: ds 1 ; c651
 wEnemyTrainerBaseReward:: ds 1 ; c652
 wEnemyTrainerAIFlags:: ds 3 ; c653
-OTClassName:: ds NAME_LENGTH ; c656
-
-	ds 2
+OTClassName:: ds TRAINER_CLASS_NAME_LENGTH ; c656
 
 CurOTMon:: ; c663
 	ds 1
@@ -647,9 +645,9 @@ EnemyDisabledMove:: ; c6f6
 wWhichMonFaintedFirst:: ds 1
 
 ; exists so you can't counter on switch
-LastEnemyCounterMove:: ; c6f8
+LastPlayerCounterMove:: ; c6f8
 	ds 1
-LastPlayerCounterMove:: ; c6f9
+LastEnemyCounterMove:: ; c6f9
 	ds 1
 
 wEnemyMinimized:: ds 1 ; c6fa