3208 files changed, 2941 insertions, 14692 deletions

diff --git a/.gitignore b/.gitignore
index bb88bb0c6..a4639d0ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,12 @@ pokecrystal.txt
 # swap files for gedit
 *~
 
+*.dimensions
+*.gbcpal
+*.2bpp
+*.1bpp
+*.lz
+*.pal
+*.animated.tilemap
+gfx/pics/*/bitmask.asm
+gfx/pics/*/frames.asm
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..e00471b59
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,26 @@
+language: c
+install:
+  - |-
+    path="$(pwd)"; cd;
+    wget https://github.com/rednex/rgbds/archive/v0.2.5.tar.gz -O rgbds.tar.gz && 
+    tar xf rgbds.tar.gz && 
+    cd rgbds-0.2.5 && 
+    sudo make install && 
+    cd - && 
+    rm -rf rgbds && 
+    cd "$path"
+before_script:
+  - |-
+    function check_status() {
+      if ! git diff-index --quiet --ignore-submodules=all HEAD --; then
+        echo 'Uncommitted changes detected:';
+        git diff-index HEAD --;
+        return 1;
+      fi;
+    }
+script:
+  - make tools
+  - make crystal crystal11
+  - make compare
+#  - check_status
+
diff --git a/INSTALL.md b/INSTALL.md
index 7be761fb5..e126c20ea 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,4 +1,4 @@
-The source files are assembled into a rom using [**rgbds**](https://github.com/bentley/rgbds).
+The source files are assembled into a rom using [**rgbds**](https://github.com/rednex/rgbds).
 These instructions explain how to set up the tools required to build.
 
 If you run into trouble, ask on irc ([**freenode#pret**](https://kiwiirc.com/client/irc.freenode.net/?#pret)).
@@ -6,18 +6,18 @@ If you run into trouble, ask on irc ([**freenode#pret**](https://kiwiirc.com/cli
 
 # Linux
 
-Python 2.7 is required.
-
 ```bash
-sudo apt-get install make gcc bison git python
+sudo apt-get install make gcc bison git libpng-dev
 
-git clone https://github.com/bentley/rgbds
+git clone https://github.com/rednex/rgbds
 cd rgbds
+git checkout v0.2.5
 sudo make install
 cd ..
 
-git clone --recursive https://github.com/pret/pokecrystal
+git clone https://github.com/pret/pokecrystal
 cd pokecrystal
+make tools
 ```
 
 To build **pokecrystal.gbc**:
@@ -34,13 +34,15 @@ In **Terminal**, run:
 ```bash
 xcode-select --install
 
-git clone https://github.com/bentley/rgbds
+git clone https://github.com/rednex/rgbds
 cd rgbds
+git checkout v0.2.5
 sudo make install
 cd ..
 
-git clone --recursive https://github.com/pret/pokecrystal
+git clone https://github.com/pret/pokecrystal
 cd pokecrystal
+make tools
 ```
 
 To build **pokecrystal.gbc**:
@@ -54,17 +56,18 @@ make
 
 To build on Windows, install [**Cygwin**](http://cygwin.com/install.html) with the default settings.
 
-In the installer, select the following packages: `make` `git` `python` `gettext`
+In the installer, select the following packages: `make` `git` `gettext` `gcc-core`
 
-Then get the most recent version of [**rgbds**](https://github.com/bentley/rgbds/releases/).
-Extract the archive and put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin64\usr\local\bin`.
+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 all the `exe` and `dll` files individually in `C:\cygwin64\usr\local\bin`.
 
 In the **Cygwin terminal**:
 
 ```bash
 
-git clone --recursive https://github.com/pret/pokecrystal
+git clone https://github.com/pret/pokecrystal
 cd pokecrystal
+make tools CC=gcc
 ```
 
 To build **pokecrystal.gbc**:
diff --git a/Makefile b/Makefile
index 27e345d2f..61f1b6c8a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,10 @@
-PYTHON := python
-MD5 := md5sum -c --quiet
+MD5 := md5sum -c
 
 .SUFFIXES:
-.PHONY: all clean crystal crystal11
+.PHONY: all clean tools compare crystal crystal11
 .SECONDEXPANSION:
-.PRECIOUS: %.2bpp %.1bpp
-
-gfx       := $(PYTHON) gfx.py
-includes  := $(PYTHON) scan_includes.py
+.PRECIOUS:
+.SECONDARY:
 
 
 crystal_obj := \
@@ -29,25 +26,26 @@ gfx/pics.o
 crystal11_obj := $(crystal_obj:.o=11.o)
 
 
-roms := pokecrystal.gbc
+roms := pokecrystal.gbc pokecrystal11.gbc
 
-all: $(roms)
+all: crystal
 crystal: pokecrystal.gbc
 crystal11: pokecrystal11.gbc
 
 clean:
 	rm -f $(roms) $(crystal_obj) $(crystal11_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)
 
-compare: pokecrystal.gbc pokecrystal11.gbc
+compare: $(roms)
 	@$(MD5) roms.md5
 
-%.asm: ;
+tools:
+	make -C tools/
 
-%11.o: dep = $(shell $(includes) $(@D)/$*.asm)
+%11.o: dep = $(shell tools/scan_includes $(@D)/$*.asm)
 %11.o: %.asm $$(dep)
 	rgbasm -D CRYSTAL11 -o $@ $<
 
-%.o: dep = $(shell $(includes) $(@D)/$*.asm)
+%.o: dep = $(shell tools/scan_includes $(@D)/$*.asm)
 %.o: %.asm $$(dep)
 	rgbasm -o $@ $<
 
@@ -59,13 +57,140 @@ pokecrystal.gbc: $(crystal_obj)
 	rgblink -n pokecrystal.sym -m pokecrystal.map -o $@ $^
 	rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
 
-%.png: ;
-%.2bpp: %.png ; $(gfx) 2bpp $<
-%.1bpp: %.png ; $(gfx) 1bpp $<
-%.lz: % ; $(gfx) lz $<
 
-%.pal: %.2bpp ;
-gfx/pics/%/normal.pal gfx/pics/%/bitmask.asm gfx/pics/%/frames.asm: gfx/pics/%/front.2bpp ;
+# For files that the compressor can't match, there will be a .lz file suffixed with the hash of the correct uncompressed file.
+# If the hash of the uncompressed file matches, use this .lz instead.
+# This allows pngs to be used for compressed graphics and still match.
+
+%.lz: hash = $(shell md5sum $(*D)/$(*F) | sed "s/\(.\{8\}\).*/\1/")
+%.lz: %
+	$(eval filename := $@.$(hash))
+	$(if $(wildcard $(filename)),cp $(filename) $@,tools/lzcomp $< $@)
+
+# Terrible hacks to match animations. Delete these rules if you don't care about matching.
+
+# Dewgong has an unused tile id in its last frame. The tile itself is missing.
+gfx/pics/dewgong/frames.asm: gfx/pics/dewgong/front.animated.tilemap gfx/pics/dewgong/front.dimensions
+	tools/pokemon_animation -f $^ > $@
+	echo "	db \$$4d" >> $@
+
+# Lugia has two unused tile ids in its last frame. The tiles themselves are missing.
+gfx/pics/lugia/frames.asm: gfx/pics/lugia/front.animated.tilemap gfx/pics/lugia/front.dimensions
+	tools/pokemon_animation -f $^ > $@
+	echo "	db \$$5e, \$$59" >> $@
+
+# Girafarig has a redundant tile after the end. It is used in two frames, so it must be injected into the generated graphics.
+# This is more involved, so it's hacked into pokemon_animation_graphics.
+gfx/pics/girafarig/front.animated.2bpp: gfx/pics/girafarig/front.2bpp gfx/pics/girafarig/front.dimensions
+	tools/pokemon_animation_graphics --girafarig -o $@ $^
+gfx/pics/girafarig/front.animated.tilemap: gfx/pics/girafarig/front.2bpp gfx/pics/girafarig/front.dimensions
+	tools/pokemon_animation_graphics --girafarig -t $@ $^
+
+
+# Pokemon pic graphics rules
+
+gfx/pics/%/normal.gbcpal: gfx/pics/%/front.png
+	rgbgfx -p $@ $<
+gfx/pics/%/normal.pal: gfx/pics/%/normal.gbcpal
+	tools/palette -p $< > $@
+gfx/pics/%/back.2bpp: gfx/pics/%/back.png
+	rgbgfx -h -o $@ $<
+gfx/pics/%/bitmask.asm: gfx/pics/%/front.animated.tilemap gfx/pics/%/front.dimensions
+	tools/pokemon_animation -b $^ > $@
+gfx/pics/%/frames.asm: gfx/pics/%/front.animated.tilemap gfx/pics/%/front.dimensions
+	tools/pokemon_animation -f $^ > $@
+gfx/pics/%/front.animated.2bpp: gfx/pics/%/front.2bpp gfx/pics/%/front.dimensions
+	tools/pokemon_animation_graphics -o $@ $^
+gfx/pics/%/front.animated.tilemap: gfx/pics/%/front.2bpp gfx/pics/%/front.dimensions
+	tools/pokemon_animation_graphics -t $@ $^
+# Don't use -h, pokemon_animation_graphics takes care of it
+#gfx/pics/%/front.2bpp: gfx/pics/%/front.png
+#	rgbgfx -o $@ $<
+
+
+# Misc file-specific graphics rules
+
+gfx/shrink1.2bpp: rgbgfx += -h
+gfx/shrink2.2bpp: rgbgfx += -h
+
+gfx/trainers/%.2bpp: rgbgfx += -h
+gfx/trainers/%.pal: gfx/trainers/%.gbcpal
+	tools/palette -p $< > $@
+
+gfx/mail/0b9b46.1bpp: tools/gfx += --remove-whitespace
+gfx/mail/0b9d46.1bpp: tools/gfx += --remove-whitespace
+gfx/mail/0b9d86.1bpp: tools/gfx += --remove-whitespace
+gfx/mail/0b9dc6.1bpp: tools/gfx += --remove-whitespace
+gfx/mail/0b9cfe.1bpp: tools/gfx += --remove-whitespace
+
+gfx/pokedex/%.2bpp: tools/gfx += --trim-whitespace
+
+gfx/title/crystal.2bpp: tools/gfx += --interleave --width=48
+gfx/title/old_fg.2bpp: tools/gfx += --interleave --width=64
+gfx/title/logo.2bpp: rgbgfx += -x 4
+
+gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace
+
+gfx/slots_2.2bpp: tools/gfx += --interleave --width=16
+gfx/slots_3.2bpp: tools/gfx += --interleave --width=24 --remove-duplicates --keep-whitespace --remove-xflip
+gfx/slots_3a.2bpp: tools/gfx += --interleave --width=16
+gfx/slots_3b.2bpp: tools/gfx += --interleave --width=24 --remove-duplicates --keep-whitespace --remove-xflip
+
+gfx/fx/angels.2bpp: tools/gfx += --trim-whitespace
+gfx/fx/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace
+gfx/fx/bubble.2bpp: tools/gfx += --trim-whitespace
+gfx/fx/charge.2bpp: tools/gfx += --trim-whitespace
+gfx/fx/egg.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/explosion.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/hit.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/horn.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/lightning.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/misc.2bpp: tools/gfx += --remove-duplicates --remove-xflip
+gfx/fx/noise.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/objects.2bpp: tools/gfx += --remove-whitespace --remove-xflip
+gfx/fx/pokeball.2bpp: tools/gfx += --remove-xflip --keep-whitespace
+gfx/fx/reflect.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/rocks.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/skyattack.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/status.2bpp: tools/gfx += --remove-whitespace
+
+gfx/misc/chris.2bpp: rgbgfx += -h
+gfx/misc/chris_card.2bpp: rgbgfx += -h
+gfx/misc/kris.2bpp: rgbgfx += -h
+gfx/misc/kris_card.2bpp: rgbgfx += -h
+gfx/misc/kris_back.2bpp: rgbgfx += -h
+gfx/misc/dude.2bpp: rgbgfx += -h
+gfx/misc/unknown_egg.2bpp: rgbgfx += -h
+gfx/misc/player.2bpp: rgbgfx += -h
+gfx/misc/pokegear.2bpp: rgbgfx += -x2
+gfx/misc/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace
+
+gfx/unknown/0e0ea8.2bpp: tools/gfx += --remove-whitespace
+gfx/unknown/0f8f34.1bpp: tools/gfx += --trim-whitespace
+gfx/unknown/16c173.2bpp: tools/gfx += --remove-duplicates --remove-xflip
+gfx/unknown/170d16.2bpp: tools/gfx += --trim-whitespace
+gfx/unknown/1715a4.2bpp: tools/gfx += --trim-whitespace
+gfx/unknown/1715a4_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip
+gfx/unknown/171db1.2bpp: tools/gfx += --trim-whitespace
+gfx/unknown/172f1f.2bpp: tools/gfx += --trim-whitespace
+
+
 %.bin: ;
 %.blk: ;
-%.tilemap: ;
+
+%.2bpp: %.png
+	rgbgfx $(rgbgfx) -o $@ $<
+	$(if $(tools/gfx),tools/gfx $(tools/gfx) -o $@ $@)
+
+%.1bpp: %.png
+	rgbgfx $(rgbgfx) -d1 -o $@ $<
+	$(if $(tools/gfx),tools/gfx $(tools/gfx) -d1 -o $@ $@)
+
+%.tilemap: %.png
+	rgbgfx -t $@ $<
+%.gbcpal: %.png
+	rgbgfx -p $@ $<
+%.pal: %.gbcpal
+	tools/palette $< > $@
+%.dimensions: %.png
+	tools/png_dimensions $< $@
diff --git a/audio/engine.asm b/audio/engine.asm
index 48571fdf4..57418246b 100644
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -229,7 +229,7 @@ UpdateChannels: ; e8125
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .ChannelFnPtrs:
 	dw .Channel1
@@ -258,21 +258,21 @@ UpdateChannels: ; e8125
 .asm_e8159
 	bit NOTE_REST, [hl] ; rest
 	jr nz, .ch1rest
-	bit NOTE_UNKN_4, [hl]
+	bit NOTE_NOISE_SAMPLING, [hl]
 	jr nz, .asm_e81a2
-	bit NOTE_UNKN_1, [hl]
-	jr nz, .asm_e816b
-	bit NOTE_UNKN_6, [hl]
+	bit NOTE_FREQ_OVERRIDE, [hl]
+	jr nz, .frequency_override
+	bit NOTE_VIBRATO_OVERRIDE, [hl]
 	jr nz, .asm_e8184
-	jr .asm_e8175
+	jr .check_duty_override
 
-.asm_e816b
+.frequency_override
 	ld a, [wCurTrackFrequency]
 	ld [rNR13], a
 	ld a, [wCurTrackFrequency + 1]
 	ld [rNR14], a
-.asm_e8175
-	bit NOTE_UNKN_0, [hl]
+.check_duty_override
+	bit NOTE_DUTY_OVERRIDE, [hl]
 	ret z
 	ld a, [wCurTrackDuty]
 	ld d, a
@@ -321,11 +321,11 @@ UpdateChannels: ; e8125
 	add hl, bc
 	bit NOTE_REST, [hl] ; rest
 	jr nz, .ch2rest
-	bit NOTE_UNKN_4, [hl]
+	bit NOTE_NOISE_SAMPLING, [hl]
 	jr nz, .asm_e8204
-	bit NOTE_UNKN_6, [hl]
+	bit NOTE_VIBRATO_OVERRIDE, [hl]
 	jr nz, .asm_e81e6
-	bit NOTE_UNKN_0, [hl]
+	bit NOTE_DUTY_OVERRIDE, [hl]
 	ret z
 	ld a, [wCurTrackDuty]
 	ld d, a
@@ -381,9 +381,9 @@ UpdateChannels: ; e8125
 	add hl, bc
 	bit NOTE_REST, [hl] ; rest
 	jr nz, .ch3rest
-	bit NOTE_UNKN_4, [hl]
+	bit NOTE_NOISE_SAMPLING, [hl]
 	jr nz, .asm_e824d
-	bit NOTE_UNKN_6, [hl]
+	bit NOTE_VIBRATO_OVERRIDE, [hl]
 	jr nz, .asm_e823a
 	ret
 
@@ -482,7 +482,7 @@ endr
 	add hl, bc
 	bit NOTE_REST, [hl] ; rest
 	jr nz, .ch4rest
-	bit NOTE_UNKN_4, [hl]
+	bit NOTE_NOISE_SAMPLING, [hl]
 	jr nz, .asm_e82d4
 	ret
 
@@ -853,7 +853,7 @@ HandleTrackVibrato: ; e8466
 	ld [wCurTrackDuty], a
 	ld hl, Channel1NoteFlags - Channel1
 	add hl, bc
-	set NOTE_UNKN_0, [hl]
+	set NOTE_DUTY_OVERRIDE, [hl]
 .next
 	ld hl, Channel1Flags2 - Channel1
 	add hl, bc
@@ -930,9 +930,9 @@ HandleTrackVibrato: ; e8466
 	ld d, a
 	ld a, e
 	sub d
-	jr nc, .asm_e84ef
+	jr nc, .no_carry
 	ld a, 0
-	jr .asm_e84ef
+	jr .no_carry
 
 .down
 	; vibrato up
@@ -943,14 +943,14 @@ HandleTrackVibrato: ; e8466
 	swap a ; move it to lo
 	;
 	add e
-	jr nc, .asm_e84ef
+	jr nc, .no_carry
 	ld a, $ff
-.asm_e84ef
+.no_carry
 	ld [wCurTrackFrequency], a
 	;
 	ld hl, Channel1NoteFlags - Channel1
 	add hl, bc
-	set NOTE_UNKN_6, [hl]
+	set NOTE_VIBRATO_OVERRIDE, [hl]
 .quit
 	ret
 
@@ -1067,8 +1067,8 @@ ApplyPitchWheel: ; e84f9
 	ld [hl], d
 	ld hl, Channel1NoteFlags - Channel1
 	add hl, bc
-	set NOTE_UNKN_1, [hl]
-	set NOTE_UNKN_0, [hl]
+	set NOTE_FREQ_OVERRIDE, [hl]
+	set NOTE_DUTY_OVERRIDE, [hl]
 	ret
 
 ; e858c
@@ -1145,7 +1145,7 @@ ReadNoiseSample: ; e85af
 
 	ld hl, Channel1NoteFlags - Channel1
 	add hl, bc
-	set NOTE_UNKN_4, [hl]
+	set NOTE_NOISE_SAMPLING, [hl]
 	ret
 
 .quit
@@ -1206,7 +1206,7 @@ ParseMusic: ; e85e1
 	; ????
 	ld hl, Channel1NoteFlags - Channel1
 	add hl, bc
-	set NOTE_UNKN_4, [hl]
+	set NOTE_NOISE_SAMPLING, [hl]
 	jp LoadNote
 
 .rest
@@ -1288,7 +1288,7 @@ ParseSFXOrRest: ; e8698
 	; turn noise sampling on
 	ld hl, Channel1NoteFlags - Channel1
 	add hl, bc
-	set NOTE_UNKN_4, [hl] ; noise sample
+	set NOTE_NOISE_SAMPLING, [hl] ; noise sample
 	; update note duration
 	ld a, [CurMusicByte]
 	call SetNoteDuration ; top nybble doesnt matter?
@@ -1389,7 +1389,7 @@ ParseMusicCommand: ; e870f
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 ; e8720
 
diff --git a/battle/ai/items.asm b/battle/ai/items.asm
index 155e0bd3b..325c7b555 100644
--- a/battle/ai/items.asm
+++ b/battle/ai/items.asm
@@ -211,7 +211,7 @@ AI_TryItem: ; 38105
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 .callback
 	pop de
 	pop hl
diff --git a/battle/ai/redundant.asm b/battle/ai/redundant.asm
index da71d0ece..e3dda8c4b 100755
--- a/battle/ai/redundant.asm
+++ b/battle/ai/redundant.asm
@@ -11,7 +11,7 @@ AI_Redundant: ; 2c41a
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Moves: ; 2c42c
 	dbw EFFECT_DREAM_EATER,  .DreamEater
diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm
index 957b2a066..958dcfe40 100644
--- a/battle/anim_commands.asm
+++ b/battle/anim_commands.asm
@@ -347,7 +347,7 @@ RunBattleAnimCommand: ; cc25f
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; cc2a4
 
 
diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm
index b7f415770..22807f77d 100644
--- a/battle/bg_effects.asm
+++ b/battle/bg_effects.asm
@@ -75,7 +75,7 @@ DoBattleBGEffectFunction: ; c804a (32:404a)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 BattleBGEffects: ; c805a (32:405a)
 	dw BattleBGEffect_End
@@ -161,7 +161,7 @@ BattleBGEffects_AnonJumptable: ; c80d7 (32:40d7)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 BattleBGEffects_IncrementJumptable: ; c80e5 (32:40e5)
 	ld hl, BG_EFFECT_STRUCT_JT_INDEX
@@ -2059,7 +2059,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
 .cgb
 	ld de, .Jumptable
 	call BatttleBGEffects_GetNamedJumptablePointer
-	jp [hl]
+	jp hl
 
 .Jumptable:
 	dw .cgb_zero
@@ -2421,7 +2421,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
 	ld de, .Jumptable_DMG
 	call BatttleBGEffects_GetNamedJumptablePointer
 	pop de
-	jp [hl]
+	jp hl
 
 .Jumptable_DMG:
 	dw .zero_dmg
@@ -2484,7 +2484,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
 	ld de, .Jumptable_CGB
 	call BatttleBGEffects_GetNamedJumptablePointer
 	pop de
-	jp [hl]
+	jp hl
 
 .Jumptable_CGB: ; c8ddd (32:4ddd)
 	dw .zero_cgb
diff --git a/battle/core.asm b/battle/core.asm
index 89a8c4c10..cb709e08d 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -2623,7 +2623,7 @@ AddBattleMoneyToAccount: ; 3d0be
 	push bc
 	ld b, h
 	ld c, l
-	callba MobileFn_106008
+	callba TrainerRankings_AddToBattlePayouts
 	pop bc
 	pop hl
 .loop
@@ -4331,7 +4331,7 @@ SpikesDamage: ; 3dc23
 	jp WaitBGMap
 
 .hl
-	jp [hl]
+	jp hl
 ; 3dc5b
 
 PursuitSwitch: ; 3dc5b
@@ -8401,7 +8401,7 @@ _DoBattle: ; 3f4d9
 ; 3f4dd
 
 BattleIntro: ; 3f4dd
-	callba MobileFn_106050 ; mobile
+	callba TrainerRankings_Battles ; mobile
 	call LoadTrainerOrWildMonPic
 	xor a
 	ld [TempBattleMonSpecies], a
@@ -8486,7 +8486,7 @@ BackUpVBGMap2: ; 3f568
 
 InitEnemyTrainer: ; 3f594
 	ld [TrainerClass], a
-	callba MobileFn_10606a
+	callba TrainerRankings_TrainerBattles
 	xor a
 	ld [TempEnemyMonSpecies], a
 	callab GetTrainerAttributes
@@ -8542,7 +8542,7 @@ InitEnemyTrainer: ; 3f594
 InitEnemyWildmon: ; 3f607
 	ld a, WILD_BATTLE
 	ld [wBattleMode], a
-	callba MobileFn_10605d
+	callba TrainerRankings_WildBattles
 	call LoadEnemyMon
 	ld hl, EnemyMonMoves
 	ld de, wWildMonMoves
@@ -8725,7 +8725,7 @@ CheckPayDay: ; 3f71d
 ; 3f759
 
 ShowLinkBattleParticipantsAfterEnd: ; 3f759
-	callba MobileFn_1060df
+	callba TrainerRankings_LinkBattles
 	callba BackupMobileEventIndex
 	ld a, [CurOTMon]
 	ld hl, OTPartyMon1Status
@@ -8755,17 +8755,17 @@ DetermineMobileBattleResult: ; 3f77c
 	cp $1
 	jr c, .victory
 	jr z, .loss
-	callba MobileFn_SaveBattleResult_Draw
+	callba TrainerRankings_ColosseumDraws
 	ld de, .Draw
 	jr .store_result
 
 .victory
-	callba MobileFn_SaveBattleResult_Win
+	callba TrainerRankings_ColosseumWins
 	ld de, .Win
 	jr .store_result
 
 .loss
-	callba MobileFn_SaveBattleResult_Lose
+	callba TrainerRankings_ColosseumLosses
 	ld de, .Lose
 	jr .store_result
 
@@ -9513,7 +9513,7 @@ BattleStartMessage: ; 3fc8b
 	cp BATTLETYPE_FISH
 	jr nz, .NotFishing
 
-	callba MobileFn_106086 ; update fishing records?
+	callba TrainerRankings_HookedEncounters
 
 	ld hl, HookedPokemonAttackedText
 	jr .PlaceBattleStartText
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
index 9ebf26209..221570d76 100644
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -113,7 +113,7 @@ DoMove: ; 3402c
 	jr .ReadMoveEffectCommand
 
 .DoMoveEffectCommand:
-	jp [hl]
+	jp hl
 
 ; 34084
 
@@ -8079,7 +8079,7 @@ BattleCommand_LeechSeed: ; 36f9d
 
 BattleCommand_Splash: ; 36fe1
 	call AnimateCurrentMove
-	callba MobileFn_1060e5
+	callba TrainerRankings_Splash
 	jp PrintNothingHappened
 
 ; 36fed
@@ -8606,7 +8606,7 @@ CheckSubstituteOpp: ; 37378
 
 
 BattleCommand_SelfDestruct: ; 37380
-	callba MobileFn_10610d
+	callba TrainerRankings_SelfDestruct
 	ld a, BATTLEANIM_PLAYER_DAMAGE
 	ld [wNumHits], a
 	ld c, 3
diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm
index 4ed9b67b7..debfcf04d 100755
--- a/battle/objects/functions.asm
+++ b/battle/objects/functions.asm
@@ -9,7 +9,7 @@ DoBattleAnimFrame: ; ccfbe
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; ccfce
 
 .Jumptable:
@@ -4085,7 +4085,7 @@ BattleAnim_AnonJumptable: ; ce71e (33:671e)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 BattleAnim_IncAnonJumptableIndex: ; ce72c (33:672c)
 	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm
index b34ffe67d..bc50e3db2 100755
--- a/constants/audio_constants.asm
+++ b/constants/audio_constants.asm
@@ -55,9 +55,9 @@ SOUND_VIBRATO_DIR EQU 0
 SOUND_PITCH_WHEEL_DIR EQU 1
 
 ; NoteFlags
-NOTE_UNKN_0 EQU 0
-NOTE_UNKN_1 EQU 1
+NOTE_DUTY_OVERRIDE EQU 0
+NOTE_FREQ_OVERRIDE EQU 1
 NOTE_UNKN_3 EQU 3
-NOTE_UNKN_4 EQU 4
+NOTE_NOISE_SAMPLING EQU 4
 NOTE_REST EQU 5
-NOTE_UNKN_6 EQU 6
+NOTE_VIBRATO_OVERRIDE EQU 6
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index 541934b83..7ac9d10ee 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -230,8 +230,7 @@ NUM_SPRITEHEADER_FIELDS EQU const_value
 	const SPRITEMOVEDATA_BOULDERDUST          ; 22
 	const SPRITEMOVEDATA_GRASS                ; 23
 	const SPRITEMOVEDATA_LAPRAS               ; 24
-	const SPRITEMOVEDATA_25                   ; 25
-NUM_SPRITEMOVEDATA EQU const_value +- 1
+NUM_SPRITEMOVEDATA EQU const_value
 SPRITEMOVEDATA_FIELDS EQU 6
 
 ; sprite movement functions
@@ -303,50 +302,50 @@ MAX_OUTDOOR_SPRITES EQU 23
 	const PERSON_ACTION_SPIN
 	const PERSON_ACTION_SPIN_FLICKER
 	const PERSON_ACTION_FISHING
-	const PERSON_ACTION_07
+	const PERSON_ACTION_SHADOW
 	const PERSON_ACTION_EMOTE
-	const PERSON_ACTION_09
-	const PERSON_ACTION_0A
-	const PERSON_ACTION_0B
-	const PERSON_ACTION_0C
-	const PERSON_ACTION_0D
-	const PERSON_ACTION_0E
-	const PERSON_ACTION_0F
-	const PERSON_ACTION_10
+	const PERSON_ACTION_BIG_SNORLAX
+	const PERSON_ACTION_BOUNCE
+	const PERSON_ACTION_WEIRD_TREE
+	const PERSON_ACTION_BIG_LAPRAS
+	const PERSON_ACTION_BIG_DOLL
+	const PERSON_ACTION_BOULDER_DUST
+	const PERSON_ACTION_GRASS_SHAKE
+	const PERSON_ACTION_SKYFALL
 
 	const_def
-	const FACING_00
-	const FACING_01
-	const FACING_02
-	const FACING_03
-	const FACING_04
-	const FACING_05
-	const FACING_06
-	const FACING_07
-	const FACING_08
-	const FACING_09
-	const FACING_0A
-	const FACING_0B
-	const FACING_0C
-	const FACING_0D
-	const FACING_0E
-	const FACING_0F
-	const FACING_10
-	const FACING_11
-	const FACING_12
-	const FACING_13
+	const FACING_STEP_DOWN_0
+	const FACING_STEP_DOWN_1
+	const FACING_STEP_DOWN_2
+	const FACING_STEP_DOWN_3
+	const FACING_STEP_UP_0
+	const FACING_STEP_UP_1
+	const FACING_STEP_UP_2
+	const FACING_STEP_UP_3
+	const FACING_STEP_LEFT_0
+	const FACING_STEP_LEFT_1
+	const FACING_STEP_LEFT_2
+	const FACING_STEP_LEFT_3
+	const FACING_STEP_RIGHT_0
+	const FACING_STEP_RIGHT_1
+	const FACING_STEP_RIGHT_2
+	const FACING_STEP_RIGHT_3
+	const FACING_FISH_DOWN
+	const FACING_FISH_UP
+	const FACING_FISH_LEFT
+	const FACING_FISH_RIGHT
 	const FACING_EMOTE
-	const FACING_15
-	const FACING_16
-	const FACING_17
-	const FACING_18
-	const FACING_19
-	const FACING_1A
-	const FACING_1B
-	const FACING_1C
-	const FACING_1D
-	const FACING_1E
-	const FACING_1F
+	const FACING_SHADOW
+	const FACING_BIG_DOLL_ASYM
+	const FACING_BIG_DOLL_SYM
+	const FACING_WEIRD_TREE_0
+	const FACING_WEIRD_TREE_1
+	const FACING_WEIRD_TREE_2
+	const FACING_WEIRD_TREE_3
+	const FACING_BOULDER_DUST_1
+	const FACING_BOULDER_DUST_2
+	const FACING_GRASS_1
+	const FACING_GRASS_2
 
 	const_def
 	const SPRITEANIMSTRUCT_INDEX           ; 0
diff --git a/constants/sram_constants.asm b/constants/sram_constants.asm
index caac8347b..c2d112b7d 100755
--- a/constants/sram_constants.asm
+++ b/constants/sram_constants.asm
@@ -1,3 +1,53 @@
 ; Mobile bank 5
+
+; sMobileEventIndex                 EQU $a000 ; moved to 1:BE3C in English
+sTrainerRankings                  EQU $a001
+sTrainerRankingGameTimeHOF        EQU $a001
+sTrainerRankingStepCountHOF       EQU $a005
+sTrainerRankingHealingsHOF        EQU $a009
+sTrainerRankingBattlesHOF         EQU $a00d
+sTrainerRankingStepCount          EQU $a010
+sTrainerRankingBattleTowerWins    EQU $a014
+sTrainerRankingTMsHMsTaught       EQU $a018
+sTrainerRankingBattles            EQU $a01b
+sTrainerRankingWildBattles        EQU $a01e
+sTrainerRankingTrainerBattles     EQU $a021
+sTrainerRankingUnused1            EQU $a024
+sTrainerRankingHOFEntries         EQU $a027
+sTrainerRankingWildMonsCaught     EQU $a02a
+sTrainerRankingHookedEncounters   EQU $a02d
+sTrainerRankingEggsHatched        EQU $a030
+sTrainerRankingMonsEvolved        EQU $a033
+sTrainerRankingFruitPicked        EQU $a036
+sTrainerRankingHealings           EQU $a039
+sTrainerRankingMysteryGift        EQU $a03c
+sTrainerRankingTrades             EQU $a03f
+sTrainerRankingFly                EQU $a042
+sTrainerRankingSurf               EQU $a045
+sTrainerRankingWaterfall          EQU $a048
+sTrainerRankingWhiteOuts          EQU $a04b
+sTrainerRankingLuckyNumberShow    EQU $a04e
+sTrainerRankingPhoneCalls         EQU $a051
+sTrainerRankingUnused2            EQU $a054
+sTrainerRankingLinkBattles        EQU $a057
+sTrainerRankingSplash             EQU $a05a
+sTrainerRankingTreeEncounters     EQU $a05d
+sTrainerRankingUnused3            EQU $a060
+sTrainerRankingColosseumWins      EQU $a063
+sTrainerRankingColosseumLosses    EQU $a066
+sTrainerRankingColosseumDraws     EQU $a069
+sTrainerRankingSelfDestruct       EQU $a06c
+sTrainerRankingCurrentSlotsStreak EQU $a06f
+sTrainerRankingLongestSlotsStreak EQU $a071
+sTrainerRankingTotalSlotsPayouts  EQU $a073
+sTrainerRankingTotalBattlePayouts EQU $a077
+sTrainerRankingLongestMagikarp    EQU $a07b
+sTrainerRankingShortestMagikarp   EQU $a07d
+sTrainerRankingBugContestScore    EQU $a07f
+sTrainerRankingsChecksum          EQU $a081
+sTrainerRankingsEnd               EQU $a083
+; sMobileEventIndexBackup           EQU $a083 ; moved to 1:BE44 in English
+sTrainerRankingsBackup            EQU $a084
+
 sMobileLoginPassword EQU $aa4b
 LOGIN_PASSWORD_LENGTH EQU 17
diff --git a/data/map_objects.asm b/data/map_objects.asm
index e940d8118..ec4a859b3 100755
--- a/data/map_objects.asm
+++ b/data/map_objects.asm
@@ -3,42 +3,42 @@ sprite_movement_data: macro
 	dn \6, 0
 endm
 
-	; function,                                              facing, action,              flags1, flags2, palette flags
-	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   PERSON_ACTION_STAND,    $02,    $00,    %0000 ; 00
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   PERSON_ACTION_STAND,    $0c,    $00,    %0000 ; 01
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 02
-	sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN,      DOWN,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 03
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y,         DOWN,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 04
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X,         DOWN,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 05
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 06
-	sprite_movement_data SPRITEMOVEFN_STANDING,              UP,     PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 07
-	sprite_movement_data SPRITEMOVEFN_STANDING,              LEFT,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 08
-	sprite_movement_data SPRITEMOVEFN_STANDING,              RIGHT,  PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 09
-	sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN,      DOWN,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 0a
-	sprite_movement_data SPRITEMOVEFN_OBEY_DPAD,             DOWN,   PERSON_ACTION_STAND,    $02,    $00,    %0000 ; 0b
-	sprite_movement_data SPRITEMOVEFN_08,                    DOWN,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 0c
-	sprite_movement_data SPRITEMOVEFN_09,                    DOWN,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 0d
-	sprite_movement_data SPRITEMOVEFN_0A,                    DOWN,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 0e
-	sprite_movement_data SPRITEMOVEFN_0B,                    DOWN,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 0f
-	sprite_movement_data SPRITEMOVEFN_0C,                    DOWN,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 10
-	sprite_movement_data SPRITEMOVEFN_0D,                    DOWN,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 11
-	sprite_movement_data SPRITEMOVEFN_0E,                    DOWN,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 12
-	sprite_movement_data SPRITEMOVEFN_FOLLOW,                DOWN,   PERSON_ACTION_STAND,    $02,    $00,    %0000 ; 13
-	sprite_movement_data SPRITEMOVEFN_SCRIPTED,              DOWN,   PERSON_ACTION_STAND,    $02,    $00,    %0000 ; 14
-	sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX,           DOWN,   PERSON_ACTION_09,       $2e,    $01,    %1100 ; 15
-	sprite_movement_data SPRITEMOVEFN_BOUNCE,                DOWN,   PERSON_ACTION_0A,       $2e,    $00,    %0000 ; 16
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   PERSON_ACTION_STAND,    $0c,    $00,    %0000 ; 17
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   PERSON_ACTION_STAND,    $2e,    $10,    %0000 ; 18
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   PERSON_ACTION_STAND,    $2e,    $00,    %0100 ; 19
-	sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT,        DOWN,   PERSON_ACTION_STAND,    $02,    $00,    %0000 ; 1a
-	sprite_movement_data SPRITEMOVEFN_SHADOW,                DOWN,   PERSON_ACTION_00,       $8e,    $01,    %0000 ; 1b
-	sprite_movement_data SPRITEMOVEFN_EMOTE,                 DOWN,   PERSON_ACTION_EMOTE,    $8e,    $02,    %0000 ; 1c
-	sprite_movement_data SPRITEMOVEFN_SCREENSHAKE,           DOWN,   PERSON_ACTION_00,       $82,    $00,    %0000 ; 1d
-	sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 1e
-	sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE,        RIGHT,  PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 1f
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   PERSON_ACTION_0C,       $2e,    $01,    %1100 ; 20
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   PERSON_ACTION_0D,       $2e,    $01,    %1100 ; 21
-	sprite_movement_data SPRITEMOVEFN_BOULDERDUST,           DOWN,   PERSON_ACTION_0E,       $8e,    $01,    %0000 ; 22
-	sprite_movement_data SPRITEMOVEFN_GRASS,                 DOWN,   PERSON_ACTION_0F,       $8e,    $02,    %0000 ; 23
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   PERSON_ACTION_STAND,    $00,    $00,    %0010 ; 24
-	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   PERSON_ACTION_STAND,    $00,    $00,    %0000 ; 25
\ No newline at end of file
+	; function,                                              facing, action,                  flags1, flags2, palette flags
+	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   PERSON_ACTION_STAND,        $02,    $00,    %0000 ; 00
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   PERSON_ACTION_STAND,        $0c,    $00,    %0000 ; 01
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 02
+	sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN,      DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 03
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y,         DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 04
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X,         DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 05
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 06
+	sprite_movement_data SPRITEMOVEFN_STANDING,              UP,     PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 07
+	sprite_movement_data SPRITEMOVEFN_STANDING,              LEFT,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 08
+	sprite_movement_data SPRITEMOVEFN_STANDING,              RIGHT,  PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 09
+	sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN,      DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 0a
+	sprite_movement_data SPRITEMOVEFN_OBEY_DPAD,             DOWN,   PERSON_ACTION_STAND,        $02,    $00,    %0000 ; 0b
+	sprite_movement_data SPRITEMOVEFN_08,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 0c
+	sprite_movement_data SPRITEMOVEFN_09,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 0d
+	sprite_movement_data SPRITEMOVEFN_0A,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 0e
+	sprite_movement_data SPRITEMOVEFN_0B,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 0f
+	sprite_movement_data SPRITEMOVEFN_0C,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 10
+	sprite_movement_data SPRITEMOVEFN_0D,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 11
+	sprite_movement_data SPRITEMOVEFN_0E,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 12
+	sprite_movement_data SPRITEMOVEFN_FOLLOW,                DOWN,   PERSON_ACTION_STAND,        $02,    $00,    %0000 ; 13
+	sprite_movement_data SPRITEMOVEFN_SCRIPTED,              DOWN,   PERSON_ACTION_STAND,        $02,    $00,    %0000 ; 14
+	sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX,           DOWN,   PERSON_ACTION_BIG_SNORLAX,  $2e,    $01,    %1100 ; 15
+	sprite_movement_data SPRITEMOVEFN_BOUNCE,                DOWN,   PERSON_ACTION_BOUNCE,       $2e,    $00,    %0000 ; 16
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   PERSON_ACTION_STAND,        $0c,    $00,    %0000 ; 17
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   PERSON_ACTION_STAND,        $2e,    $10,    %0000 ; 18
+	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   PERSON_ACTION_STAND,        $2e,    $00,    %0100 ; 19
+	sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT,        DOWN,   PERSON_ACTION_STAND,        $02,    $00,    %0000 ; 1a
+	sprite_movement_data SPRITEMOVEFN_SHADOW,                DOWN,   PERSON_ACTION_00,           $8e,    $01,    %0000 ; 1b
+	sprite_movement_data SPRITEMOVEFN_EMOTE,                 DOWN,   PERSON_ACTION_EMOTE,        $8e,    $02,    %0000 ; 1c
+	sprite_movement_data SPRITEMOVEFN_SCREENSHAKE,           DOWN,   PERSON_ACTION_00,           $82,    $00,    %0000 ; 1d
+	sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 1e
+	sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE,        RIGHT,  PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 1f
+	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   PERSON_ACTION_BIG_LAPRAS,   $2e,    $01,    %1100 ; 20
+	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   PERSON_ACTION_BIG_DOLL,     $2e,    $01,    %1100 ; 21
+	sprite_movement_data SPRITEMOVEFN_BOULDERDUST,           DOWN,   PERSON_ACTION_BOULDER_DUST, $8e,    $01,    %0000 ; 22
+	sprite_movement_data SPRITEMOVEFN_GRASS,                 DOWN,   PERSON_ACTION_GRASS_SHAKE,  $8e,    $02,    %0000 ; 23
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0010 ; 24
+	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 25
diff --git a/engine/billspc.asm b/engine/billspc.asm
index b9b51f850..4d8bf1c48 100755
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -39,7 +39,7 @@ _DepositPKMN: ; e2391 (38:6391)
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call BillsPC_Jumptable
-	jp [hl]
+	jp hl
 
 .Jumptable: ; e23df (38:63df)
 
@@ -147,7 +147,7 @@ _DepositPKMN: ; e2391 (38:6391)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 BillsPCDepositJumptable: ; e24a1 (38:64a1)
 
@@ -306,7 +306,7 @@ _WithdrawPKMN: ; e2583 (38:6583)
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call BillsPC_Jumptable
-	jp [hl]
+	jp hl
 
 .Jumptable: ; e25d2 (38:65d2)
 
@@ -415,7 +415,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .dw ; e2699 (38:6699) #mark
 	dw .withdraw ; Withdraw
@@ -556,7 +556,7 @@ _MovePKMNWithoutMail: ; e2759
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call BillsPC_Jumptable
-	jp [hl]
+	jp hl
 ; e27ac
 
 .Jumptable: ; e27ac
@@ -678,7 +678,7 @@ _MovePKMNWithoutMail: ; e2759
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; e2881
 
 .Jumptable2: ; e2881
@@ -2014,7 +2014,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 	ld l, a
 	ld de, .dw_return
 	push de
-	jp [hl]
+	jp hl
 ; e322a
 
 .dw_return ; e322a
diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm
index fa499c071..326faaa6c 100755
--- a/engine/breeding/egg.asm
+++ b/engine/breeding/egg.asm
@@ -232,7 +232,7 @@ HatchEggs: ; 16f70 (5:6f70)
 	push de
 
 	callba SetEggMonCaughtData
-	callba MobileFn_10608d
+	callba TrainerRankings_EggsHatched
 	ld a, [CurPartyMon]
 	ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
 	ld bc, PARTYMON_STRUCT_LENGTH
diff --git a/engine/card_flip.asm b/engine/card_flip.asm
index 0479e8248..cdf2be010 100755
--- a/engine/card_flip.asm
+++ b/engine/card_flip.asm
@@ -76,7 +76,7 @@ _CardFlip: ; e00ee (38:40ee)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; e01a0 (38:41a0)
 
 .Jumptable: ; e01a0
@@ -652,7 +652,7 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; e0553
 
 .Jumptable: ; e0553
@@ -829,7 +829,7 @@ CardFlip_CheckWinCondition: ; e0637
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; e0643
 
 .Jumptable: ; e0643
diff --git a/engine/credits.asm b/engine/credits.asm
index fad8a615e..b2a1c1e93 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -263,7 +263,7 @@ Credits_Jumptable: ; 109926
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 109937
 
 
diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm
index 29bb0934f..1c0d7cd3e 100755
--- a/engine/crystal_intro.asm
+++ b/engine/crystal_intro.asm
@@ -125,7 +125,7 @@ PlaceGameFreakPresents: ; e4670
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; e467f
 
 .dw ; e467f
@@ -222,7 +222,7 @@ GameFreakLogoJumper: ; e46ed (39:46ed)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 GameFreakLogoScenes: ; e46fd (39:46fd)
 	dw GameFreakLogoScene1
@@ -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
@@ -438,7 +439,7 @@ IntroSceneJumper: ; e490f
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; e491e
 
 IntroScenes: ; e491e (39:491e)
diff --git a/engine/debug.asm b/engine/debug.asm
index 78fc52489..9c2bb35c2 100755
--- a/engine/debug.asm
+++ b/engine/debug.asm
@@ -305,7 +305,7 @@ Function81a74: ; 81a74
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .asm_81a9a
 	call Function81eca
@@ -611,7 +611,7 @@ Function81cc2: ; 81cc2
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .asm_81cdf
 	ld a, $4
@@ -1353,7 +1353,7 @@ Function822f0: ; 822f0
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 82301
 
 .dw ; 82301
diff --git a/engine/events.asm b/engine/events.asm
index e7598b595..2eb92d1a1 100644
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -609,7 +609,7 @@ TryObjectEvent: ; 969b5
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .nope_bugged
 	; pop bc
diff --git a/engine/events_3.asm b/engine/events_3.asm
index 01b8d7046..b6aaea3b7 100755
--- a/engine/events_3.asm
+++ b/engine/events_3.asm
@@ -360,7 +360,7 @@ CheckForHiddenItems: ; b8172
 
 
 TreeMonEncounter: ; b81ea
-	callba MobileFn_1060ef
+	callba TrainerRankings_TreeEncounters
 
 	xor a
 	ld [TempWildMonSpecies], a
diff --git a/engine/evolve.asm b/engine/evolve.asm
index 202ad10ff..2f7739191 100755
--- a/engine/evolve.asm
+++ b/engine/evolve.asm
@@ -247,7 +247,7 @@ EvolveAfterBattle_MasterLoop
 	push hl
 	ld hl, Text_EvolvedIntoPKMN
 	call PrintTextBoxText
-	callba MobileFn_106094
+	callba TrainerRankings_MonsEvolved
 
 	ld de, MUSIC_NONE
 	call PlayMusic
diff --git a/engine/facings.asm b/engine/facings.asm
index f807e77f8..ee9efec3f 100644
--- a/engine/facings.asm
+++ b/engine/facings.asm
@@ -1,36 +1,36 @@
 Facings: ; 4049
-	dw Facing00
-	dw Facing01
-	dw Facing02
-	dw Facing03
-	dw Facing04
-	dw Facing05
-	dw Facing06
-	dw Facing07
-	dw Facing08
-	dw Facing09
-	dw Facing10
-	dw Facing11
-	dw Facing12
-	dw Facing13
-	dw Facing14
-	dw Facing15
-	dw Facing16
-	dw Facing17
-	dw Facing18
-	dw Facing19
-	dw Facing20
-	dw Facing21
-	dw Facing22
-	dw Facing23
-	dw Facing24
-	dw Facing25
-	dw Facing26
-	dw Facing27
-	dw Facing28
-	dw Facing29
-	dw Facing30
-	dw Facing31
+	dw FacingStepDown0
+	dw FacingStepDown1
+	dw FacingStepDown2
+	dw FacingStepDown3
+	dw FacingStepUp0
+	dw FacingStepUp1
+	dw FacingStepUp2
+	dw FacingStepUp3
+	dw FacingStepLeft0
+	dw FacingStepLeft1
+	dw FacingStepLeft2
+	dw FacingStepLeft3
+	dw FacingStepRight0
+	dw FacingStepRight1
+	dw FacingStepRight2
+	dw FacingStepRight3
+	dw FacingFishDown
+	dw FacingFishUp
+	dw FacingFishLeft
+	dw FacingFishRight
+	dw FacingEmote
+	dw FacingShadow
+	dw FacingBigDollAsymmetric
+	dw FacingBigDollSymmetric
+	dw FacingWeirdTree0
+	dw FacingWeirdTree1
+	dw FacingWeirdTree2
+	dw FacingWeirdTree3
+	dw FacingBoulderDust1
+	dw FacingBoulderDust2
+	dw FacingGrass1
+	dw FacingGrass2
 FacingsEnd: dw 0
 
 NUM_FACINGS EQU (FacingsEnd - Facings) / 2
@@ -47,10 +47,10 @@ Y_FLIP    EQU 1 << OAM_Y_FLIP
 BEHIND_BG EQU 1 << OAM_PRIORITY
 
 
-Facing00:
-Facing02:
-Facing24:
-Facing26: ; standing down
+FacingStepDown0:
+FacingStepDown2:
+FacingWeirdTree0:
+FacingWeirdTree2: ; standing down
 	db 4 ; #
 	db  0,  0, 0, $00
 	db  0,  8, 0, $01
@@ -58,7 +58,7 @@ Facing26: ; standing down
 	db  8,  8, 2, $03
 ; 409c
 
-Facing01: ; walking down 1
+FacingStepDown1: ; walking down 1
 	db 4 ; #
 	db  0,  0, 0, $80
 	db  0,  8, 0, $81
@@ -66,7 +66,7 @@ Facing01: ; walking down 1
 	db  8,  8, 2, $83
 ; 40ad
 
-Facing03: ; walking down 2
+FacingStepDown3: ; walking down 2
 	db 4 ; #
 	db  0,  8, X_FLIP, $80
 	db  0,  0, X_FLIP, $81
@@ -74,8 +74,8 @@ Facing03: ; walking down 2
 	db  8,  0, 2 | X_FLIP, $83
 ; 40be
 
-Facing04:
-Facing06: ; standing up
+FacingStepUp0:
+FacingStepUp2: ; standing up
 	db 4 ; #
 	db  0,  0, 0, $04
 	db  0,  8, 0, $05
@@ -83,7 +83,7 @@ Facing06: ; standing up
 	db  8,  8, 2, $07
 ; 40cf
 
-Facing05: ; walking up 1
+FacingStepUp1: ; walking up 1
 	db 4 ; #
 	db  0,  0, 0, $84
 	db  0,  8, 0, $85
@@ -91,7 +91,7 @@ Facing05: ; walking up 1
 	db  8,  8, 2, $87
 ; 40e0
 
-Facing07: ; walking up 2
+FacingStepUp3: ; walking up 2
 	db 4 ; #
 	db  0,  8, X_FLIP, $84
 	db  0,  0, X_FLIP, $85
@@ -99,8 +99,8 @@ Facing07: ; walking up 2
 	db  8,  0, 2 | X_FLIP, $87
 ; 40f1
 
-Facing08:
-Facing10: ; standing left
+FacingStepLeft0:
+FacingStepLeft2: ; standing left
 	db 4 ; #
 	db  0,  0, 0, $08
 	db  0,  8, 0, $09
@@ -108,8 +108,8 @@ Facing10: ; standing left
 	db  8,  8, 2, $0b
 ; 4102
 
-Facing12:
-Facing14: ; standing right
+FacingStepRight0:
+FacingStepRight2: ; standing right
 	db 4 ; #
 	db  0,  8, X_FLIP, $08
 	db  0,  0, X_FLIP, $09
@@ -117,8 +117,8 @@ Facing14: ; standing right
 	db  8,  0, 2 | X_FLIP, $0b
 ; 4113
 
-Facing09:
-Facing11: ; walking left
+FacingStepLeft1:
+FacingStepLeft3: ; walking left
 	db 4 ; #
 	db  0,  0, 0, $88
 	db  0,  8, 0, $89
@@ -126,8 +126,8 @@ Facing11: ; walking left
 	db  8,  8, 2, $8b
 ; 4124
 
-Facing13:
-Facing15: ; walking right
+FacingStepRight1:
+FacingStepRight3: ; walking right
 	db 4 ; #
 	db  0,  8, X_FLIP, $88
 	db  0,  0, X_FLIP, $89
@@ -135,7 +135,7 @@ Facing15: ; walking right
 	db  8,  0, 2 | X_FLIP, $8b
 ; 4135
 
-Facing16: ; fishing down
+FacingFishDown: ; fishing down
 	db 5 ; #
 	db  0,  0, 0, $00
 	db  0,  8, 0, $01
@@ -144,7 +144,7 @@ Facing16: ; fishing down
 	db 16,  0, 4, $fc
 ; 414a
 
-Facing17: ; fishing up
+FacingFishUp: ; fishing up
 	db 5 ; #
 	db  0,  0, 0, $04
 	db  0,  8, 0, $05
@@ -153,7 +153,7 @@ Facing17: ; fishing up
 	db -8,  0, 4, $fc
 ; 415f
 
-Facing18: ; fishing left
+FacingFishLeft: ; fishing left
 	db 5 ; #
 	db  0,  0, 0, $08
 	db  0,  8, 0, $09
@@ -162,7 +162,7 @@ Facing18: ; fishing left
 	db  5, -8, 4 | X_FLIP, $fd
 ; 4174
 
-Facing19: ; fishing right
+FacingFishRight: ; fishing right
 	db 5 ; #
 	db  0,  8, X_FLIP, $08
 	db  0,  0, X_FLIP, $09
@@ -171,7 +171,7 @@ Facing19: ; fishing right
 	db  5, 16, 4, $fd
 ; 4189
 
-Facing20: ; emote
+FacingEmote: ; emote
 	db 4 ; #
 	db  0,  0, 4, $f8
 	db  0,  8, 4, $f9
@@ -179,13 +179,13 @@ Facing20: ; emote
 	db  8,  8, 4, $fb
 ; 419a
 
-Facing21: ; shadow
+FacingShadow: ; shadow
 	db 2 ; #
 	db  0,  0, 4, $fc
 	db  0,  8, 4 | X_FLIP, $fc
 ; 41a3
 
-Facing23: ; big snorlax or lapras doll
+FacingBigDollSymmetric: ; big snorlax or lapras doll
 	db 16 ; #
 	db  0,  0, 0, $00
 	db  0,  8, 0, $01
@@ -205,7 +205,7 @@ Facing23: ; big snorlax or lapras doll
 	db 24, 16, X_FLIP, $07
 ; 41e4
 
-Facing25: ; 41e4
+FacingWeirdTree1: ; 41e4
 	db 4 ; #
 	db  0,  0, 0, $04
 	db  0,  8, 0, $05
@@ -213,7 +213,7 @@ Facing25: ; 41e4
 	db  8,  8, 0, $07
 ; 41f5
 
-Facing27: ; 41f5
+FacingWeirdTree3: ; 41f5
 	db 4 ; #
 	db  0,  8, X_FLIP, $04
 	db  0,  0, X_FLIP, $05
@@ -221,7 +221,7 @@ Facing27: ; 41f5
 	db  8,  0, X_FLIP, $07
 ; 4206
 
-Facing22: ; big doll other than snorlax or lapras
+FacingBigDollAsymmetric: ; big doll other than snorlax or lapras
 	db 14 ; #
 	db  0,  0, 0, $00
 	db  0,  8, 0, $01
@@ -239,7 +239,7 @@ Facing22: ; big doll other than snorlax or lapras
 	db 24, 16, 0, $0b
 ; 423f
 
-Facing28: ; boulder dust 1
+FacingBoulderDust1: ; boulder dust 1
 	db 4 ; #
 	db  0,  0, 4, $fe
 	db  0,  8, 4, $fe
@@ -247,7 +247,7 @@ Facing28: ; boulder dust 1
 	db  8,  8, 4, $fe
 ; 4250
 
-Facing29: ; boulder dust 2
+FacingBoulderDust2: ; boulder dust 2
 	db 4 ; #
 	db  0,  0, 4, $ff
 	db  0,  8, 4, $ff
@@ -255,13 +255,13 @@ Facing29: ; boulder dust 2
 	db  8,  8, 4, $ff
 ; 4261
 
-Facing30: ; 4261
+FacingGrass1: ; 4261
 	db 2 ; #
 	db  8,  0, 4, $fe
 	db  8,  8, 4 | X_FLIP, $fe
 ; 426a
 
-Facing31: ; 426a
+FacingGrass2: ; 426a
 	db 2 ; #
 	db  9, -1, 4, $fe
 	db  9,  9, 4 | X_FLIP, $fe
diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm
index 09619cfa5..6a40fb05c 100644
--- a/engine/fruit_trees.asm
+++ b/engine/fruit_trees.asm
@@ -58,7 +58,7 @@ CheckFruitTree: ; 44055
 ; 4405f
 
 PickedFruitTree: ; 4405f
-	callba MobileFn_10609b ; empty function
+	callba TrainerRankings_FruitPicked
 	ld b, 1
 	jp GetFruitTreeFlag
 ; 4406a
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm
index 3e4257ab7..8e3c90204 100755
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -1064,7 +1064,7 @@ StartTitleScreen: ; 6219
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 626a
 
 .dw
@@ -1117,7 +1117,7 @@ TitleScreenScene: ; 62a3
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 62af
 
 .scenes
diff --git a/engine/link.asm b/engine/link.asm
index 951eb1444..f5bc24da9 100755
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -1973,7 +1973,7 @@ LinkTrade: ; 28b87
 
 .save
 	callba SaveAfterLinkTrade
-	callba MobileFn_1060af
+	callba TrainerRankings_Trades
 	callba BackupMobileEventIndex
 	ld c, 40
 	call DelayFrames
diff --git a/engine/map_object_action.asm b/engine/map_object_action.asm
index 59e0ef7de..a7ab87200 100755
--- a/engine/map_object_action.asm
+++ b/engine/map_object_action.asm
@@ -14,23 +14,23 @@
 ; 445f
 
 Pointers445f: ; 445f
-	dw SetFacingStanding, SetFacingStanding ; 00
-	dw Function44b5,      SetFacingCurrent ; 01 standing?
-	dw Function44c1,      SetFacingCurrent ; 02 walking?
-	dw Function4508,      SetFacingCurrent ; 03 bumping?
-	dw Function4529,      SetFacingCurrent ; 04
-	dw Function4539,      SetFacingStanding ; 05
-	dw Function456e,      Function456e ; 06
-	dw Function457b,      SetFacingStanding ; 07
-	dw Function4582,      Function4582 ; 08
-	dw Function4589,      Function4589 ; 09
-	dw Function4590,      Function45a4 ; 0a
-	dw Function45ab,      SetFacingCurrent ; 0c
-	dw Function45be,      Function45be ; 0b
-	dw Function45c5,      Function45c5 ; 0d
-	dw Function45da,      SetFacingStanding ; 0e
-	dw Function45ed,      SetFacingStanding ; 0f
-	dw Function44e4,      SetFacingCurrent ; 10
+	dw SetFacingStanding,              SetFacingStanding ; 00
+	dw SetFacingStandAction,           SetFacingCurrent ; 01 standing?
+	dw SetFacingStepAction,            SetFacingCurrent ; 02 walking?
+	dw SetFacingBumpAction,            SetFacingCurrent ; 03 bumping?
+	dw SetFacingCounterclockwiseSpin,  SetFacingCurrent ; 04
+	dw SetFacingCounterclockwiseSpin2, SetFacingStanding ; 05
+	dw SetFacingFish,                  SetFacingFish ; 06
+	dw SetFacingShadow,                SetFacingStanding ; 07
+	dw SetFacingEmote,                 SetFacingEmote ; 08
+	dw SetFacingBigDollSym,            SetFacingBigDollSym ; 09
+	dw SetFacingBounce,                SetFacingFreezeBounce ; 0a
+	dw SetFacingWeirdTree,             SetFacingCurrent ; 0b
+	dw SetFacingBigDollAsym,           SetFacingBigDollAsym ; 0c
+	dw SetFacingBigDoll,               SetFacingBigDoll ; 0d
+	dw SetFacingBoulderDust,           SetFacingStanding ; 0e
+	dw SetFacingGrassShake,            SetFacingStanding ; 0f
+	dw SetFacingSkyfall,               SetFacingCurrent ; 10
 ; 44a3
 
 SetFacingStanding: ; 44a3
@@ -42,23 +42,23 @@ SetFacingStanding: ; 44a3
 
 SetFacingCurrent: ; 44aa
 	call GetSpriteDirection
-	or 0 ; useless
+	or FACING_STEP_DOWN_0 ; useless
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld [hl], a
 	ret
 ; 44b5
 
-Function44b5: ; 44b5
+SetFacingStandAction: ; 44b5
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld a, [hl]
 	and 1
-	jr nz, Function44c1
+	jr nz, SetFacingStepAction
 	jp SetFacingCurrent
 ; 44c1
 
-Function44c1: ; 44c1
+SetFacingStepAction: ; 44c1
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
 	bit SLIDING, [hl]
@@ -77,7 +77,7 @@ Function44c1: ; 44c1
 	ld d, a
 
 	call GetSpriteDirection
-	or 0 ; useless
+	or FACING_STEP_DOWN_0 ; useless
 	or d
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
@@ -85,7 +85,7 @@ Function44c1: ; 44c1
 	ret
 ; 44e4
 
-Function44e4: ; 44e4
+SetFacingSkyfall: ; 44e4
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
 	bit SLIDING, [hl]
@@ -104,7 +104,7 @@ Function44e4: ; 44e4
 	ld d, a
 
 	call GetSpriteDirection
-	or 0 ; useless
+	or FACING_STEP_DOWN_0 ; useless
 	or d
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
@@ -112,7 +112,7 @@ Function44e4: ; 44e4
 	ret
 ; 4508
 
-Function4508: ; 4508
+SetFacingBumpAction: ; 4508
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
 	bit SLIDING, [hl]
@@ -130,7 +130,7 @@ Function4508: ; 4508
 	ld d, a
 
 	call GetSpriteDirection
-	or 0 ; useless
+	or FACING_STEP_DOWN_0 ; useless
 	or d
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
@@ -138,24 +138,28 @@ Function4508: ; 4508
 	ret
 ; 4529
 
-Function4529: ; 4529
-	call Function453f
+SetFacingCounterclockwiseSpin: ; 4529
+	call CounterclockwiseSpinAction
 	ld hl, OBJECT_FACING
 	add hl, bc
 	ld a, [hl]
-	or 0 ; useless
+	or FACING_STEP_DOWN_0 ; useless
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld [hl], a
 	ret
 ; 4539
 
-Function4539: ; 4539
-	call Function453f
+SetFacingCounterclockwiseSpin2: ; 4539
+	call CounterclockwiseSpinAction
 	jp SetFacingStanding
 ; 453f
 
-Function453f: ; 453f
+CounterclockwiseSpinAction: ; 453f
+; Here, OBJECT_STEP_FRAME consists of two 2-bit components,
+; using only bits 0,1 and 4,5.
+; bits 0,1 is a timer (4 overworld frames)
+; bits 4,5 determines the facing - the direction is counterclockwise.
 	ld hl, OBJECT_STEP_FRAME
 	add hl, bc
 	ld a, [hl]
@@ -195,39 +199,39 @@ Function453f: ; 453f
 	db OW_DOWN, OW_RIGHT, OW_UP, OW_LEFT
 ; 456e
 
-Function456e: ; 456e
+SetFacingFish: ; 456e
 	call GetSpriteDirection
 	rrca
 	rrca
-	add $10
+	add FACING_FISH_DOWN
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld [hl], a
 	ret
 ; 457b
 
-Function457b: ; 457b
+SetFacingShadow: ; 457b
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
-	ld [hl], FACING_15
+	ld [hl], FACING_SHADOW
 	ret
 ; 4582
 
-Function4582: ; 4582 emote
+SetFacingEmote: ; 4582 emote
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld [hl], FACING_EMOTE
 	ret
 ; 4589
 
-Function4589: ; 4589
+SetFacingBigDollSym: ; 4589
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
-	ld [hl], FACING_17
+	ld [hl], FACING_BIG_DOLL_SYM
 	ret
 ; 4590
 
-Function4590: ; 4590
+SetFacingBounce: ; 4590
 	ld hl, OBJECT_STEP_FRAME
 	add hl, bc
 	ld a, [hl]
@@ -235,21 +239,21 @@ Function4590: ; 4590
 	and %00001111
 	ld [hl], a
 	and %00001000
-	jr z, Function45a4
+	jr z, SetFacingFreezeBounce
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
-	ld [hl], FACING_04
+	ld [hl], FACING_STEP_UP_0
 	ret
 ; 45a4
 
-Function45a4: ; 45a4
+SetFacingFreezeBounce: ; 45a4
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
-	ld [hl], 0
+	ld [hl], FACING_STEP_DOWN_0
 	ret
 ; 45ab
 
-Function45ab: ; 45ab
+SetFacingWeirdTree: ; 45ab
 	ld hl, OBJECT_STEP_FRAME
 	add hl, bc
 	ld a, [hl]
@@ -258,28 +262,28 @@ Function45ab: ; 45ab
 	and %00001100
 	rrca
 	rrca
-	add $18
+	add FACING_WEIRD_TREE_0
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld [hl], a
 	ret
 ; 45be
 
-Function45be: ; 45be
+SetFacingBigDollAsym: ; 45be
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
-	ld [hl], FACING_16
+	ld [hl], FACING_BIG_DOLL_ASYM
 	ret
 ; 45c5
 
-Function45c5: ; 45c5
+SetFacingBigDoll: ; 45c5
 	ld a, [VariableSprites + SPRITE_BIG_DOLL - SPRITE_VARS]
-	ld d, FACING_17 ; symmetric
+	ld d, FACING_BIG_DOLL_SYM ; symmetric
 	cp SPRITE_BIG_SNORLAX
 	jr z, .ok
 	cp SPRITE_BIG_LAPRAS
 	jr z, .ok
-	ld d, FACING_16 ; asymmetric
+	ld d, FACING_BIG_DOLL_ASYM ; asymmetric
 
 .ok
 	ld hl, OBJECT_FACING_STEP
@@ -288,7 +292,7 @@ Function45c5: ; 45c5
 	ret
 ; 45da
 
-Function45da: ; 45da
+SetFacingBoulderDust: ; 45da
 	ld hl, OBJECT_STEP_FRAME
 	add hl, bc
 	inc [hl]
@@ -297,15 +301,15 @@ Function45da: ; 45da
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	and 2
-	ld a, FACING_1C
+	ld a, FACING_BOULDER_DUST_1
 	jr z, .ok
-	inc a ; FACING_1D
+	inc a ; FACING_BOULDER_DUST_2
 .ok
 	ld [hl], a
 	ret
 ; 45ed
 
-Function45ed: ; 45ed
+SetFacingGrassShake: ; 45ed
 	ld hl, OBJECT_STEP_FRAME
 	add hl, bc
 	inc [hl]
@@ -313,9 +317,9 @@ Function45ed: ; 45ed
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	and 4
-	ld a, FACING_1E
+	ld a, FACING_GRASS_1
 	jr z, .ok
-	inc a ; FACING_1F
+	inc a ; FACING_GRASS_2
 
 .ok
 	ld [hl], a
diff --git a/engine/map_objects.asm b/engine/map_objects.asm
index 58c30c8fb..d5fa84642 100644
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -776,7 +776,7 @@ MapObjectMovementPattern: ; 47dd
 	ld [hl], STANDING
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_09
+	ld [hl], PERSON_ACTION_BIG_SNORLAX
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
 	ld [hl], STEP_TYPE_04
@@ -789,7 +789,7 @@ MapObjectMovementPattern: ; 47dd
 	ld [hl], STANDING
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_0A
+	ld [hl], PERSON_ACTION_BOUNCE
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
 	ld [hl], STEP_TYPE_04
@@ -864,7 +864,7 @@ MapObjectMovementPattern: ; 47dd
 	call ._MovementShadow_Grass_Emote_BoulderDust
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_07
+	ld [hl], PERSON_ACTION_SHADOW
 	ld hl, OBJECT_STEP_DURATION
 	add hl, de
 	ld a, [hl]
@@ -921,7 +921,7 @@ MapObjectMovementPattern: ; 47dd
 	call ._MovementShadow_Grass_Emote_BoulderDust
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_0E
+	ld [hl], PERSON_ACTION_BOULDER_DUST
 	ld hl, OBJECT_STEP_DURATION
 	add hl, de
 	ld a, [hl]
@@ -965,7 +965,7 @@ MapObjectMovementPattern: ; 47dd
 	call ._MovementShadow_Grass_Emote_BoulderDust
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_0F
+	ld [hl], PERSON_ACTION_GRASS_SHAKE
 	ld hl, OBJECT_STEP_DURATION
 	add hl, de
 	ld a, [hl]
@@ -1804,7 +1804,7 @@ SkyfallTop: ; 4f83
 .Init:
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_10
+	ld [hl], PERSON_ACTION_SKYFALL
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	ld [hl], 16
@@ -1955,7 +1955,7 @@ JumpMovementPointer: ; 505e
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 5065
 
 ContinueReadingMovement: ; 5065
diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm
index 7e8136235..d66ea6fac 100755
--- a/engine/mon_icons.asm
+++ b/engine/mon_icons.asm
@@ -33,7 +33,7 @@ LoadMenuMonIcon: ; 8e83f
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 8e854
 
 
diff --git a/engine/movement.asm b/engine/movement.asm
index 3cc2796db..7b58e4023 100644
--- a/engine/movement.asm
+++ b/engine/movement.asm
@@ -365,7 +365,7 @@ Movement_tree_shake: ; 5279
 
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_0B
+	ld [hl], PERSON_ACTION_WEIRD_TREE
 
 	ld hl, OBJECT_DIRECTION_WALKING
 	add hl, bc
diff --git a/engine/mysterygift.asm b/engine/mysterygift.asm
index 9f5302506..f2d29b08a 100755
--- a/engine/mysterygift.asm
+++ b/engine/mysterygift.asm
@@ -63,7 +63,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
 	jr z, .skip_append_save
 	call .SaveMysteryGiftTrainerName
 	callba RestoreMobileEventIndex
-	callba MobileFn_1060a9
+	callba TrainerRankings_MysteryGift
 	callba BackupMobileEventIndex
 .skip_append_save
 	ld a, [wMysteryGiftPartnerSentDeco]
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm
index d80b4717b..4a7ca301a 100755
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -70,7 +70,7 @@ NamingScreen: ; 116c1
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 ; 1172e
 
@@ -405,7 +405,7 @@ NamingScreenJoypadLoop: ; 11915
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 ; 11977
 
@@ -1166,7 +1166,7 @@ INCBIN "gfx/icon/mail2.2bpp"
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Jumptable: ; 12017 (4:6017)
 	dw .init_blinking_cursor
diff --git a/engine/options_menu.asm b/engine/options_menu.asm
index 68c1883ee..ec41288ff 100755
--- a/engine/options_menu.asm
+++ b/engine/options_menu.asm
@@ -90,7 +90,7 @@ GetOptionPointer: ; e42d6
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl] ; jump to the code of the current highlighted item
+	jp hl ; jump to the code of the current highlighted item
 ; e42e5
 
 .Pointers:
diff --git a/engine/pack.asm b/engine/pack.asm
index 19b7fccbf..8a63d22e5 100644
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -23,7 +23,7 @@ Pack: ; 10000
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call Pack_GetJumptablePointer
-	jp [hl]
+	jp hl
 
 ; 10030
 
@@ -144,7 +144,7 @@ Pack: ; 10000
 	ld a, [wMenuCursorY]
 	dec a
 	call Pack_GetJumptablePointer
-	jp [hl]
+	jp hl
 
 ; 10124 (4:4124)
 .MenuDataHeader1: ; 0x10124
@@ -306,7 +306,7 @@ Pack: ; 10000
 	ld a, [wMenuCursorY]
 	dec a
 	call Pack_GetJumptablePointer
-	jp [hl]
+	jp hl
 
 ; 10249 (4:4249)
 MenuDataHeader_UsableKeyItem: ; 0x10249
@@ -689,7 +689,7 @@ BattlePack: ; 10493
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call Pack_GetJumptablePointer
-	jp [hl]
+	jp hl
 
 ; 104c3
 
@@ -846,7 +846,7 @@ TMHMSubmenu: ; 105dc (4:45dc)
 	ld a, [wMenuCursorY]
 	dec a
 	call Pack_GetJumptablePointer
-	jp [hl]
+	jp hl
 
 ; 10601 (4:4601)
 .UsableMenuDataHeader: ; 0x10601
@@ -997,7 +997,7 @@ DepositSellPack: ; 106be
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call Pack_GetJumptablePointer
-	jp [hl]
+	jp hl
 
 ; 106d1
 
@@ -1144,7 +1144,7 @@ TutorialPack: ; 107bb
 	ld a, [wJumptableIndex]
 	ld hl, .dw
 	call Pack_GetJumptablePointer
-	jp [hl]
+	jp hl
 
 ; 107e1
 
diff --git a/engine/phone.asm b/engine/phone.asm
index 9d1376a62..f5f39218d 100644
--- a/engine/phone.asm
+++ b/engine/phone.asm
@@ -471,7 +471,7 @@ UnknownScript_0x90261: ; 0x90261
 RingTwice_StartCall: ; 9026f
 	call .Ring
 	call .Ring
-	callba MobileFn_1060d3
+	callba TrainerRankings_PhoneCalls
 	ret
 ; 9027c
 
@@ -500,7 +500,7 @@ PhoneCall:: ; 9029a
 	ld [PhoneCallerHi], a
 	call Phone_FirstOfTwoRings
 	call Phone_FirstOfTwoRings
-	callba MobileFn_1060d3
+	callba TrainerRankings_PhoneCalls
 	ret
 ; 902b3
 
diff --git a/engine/player_step.asm b/engine/player_step.asm
index 24e4fb873..83158c1b7 100755
--- a/engine/player_step.asm
+++ b/engine/player_step.asm
@@ -77,7 +77,7 @@ HandlePlayerStep: ; d4e5 (3:54e5)
 	ret
 
 .mobile ; d509 (3:5509)
-	callba MobileFn_10602e
+	callba TrainerRankings_StepCount
 	ret
 
 .fail2 ; d510 (3:5510)
diff --git a/engine/pokedex.asm b/engine/pokedex.asm
index e61a24964..569bdbb0b 100644
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -182,7 +182,7 @@ Pokedex_RunJumptable: ; 4010b
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call Pokedex_LoadPointer
-	jp [hl]
+	jp hl
 
 
 .Jumptable: ; 40115 (10:4115)
@@ -366,7 +366,7 @@ Pokedex_UpdateDexEntryScreen: ; 40258 (10:4258)
 	ld a, [wDexArrowCursorPosIndex]
 	ld hl, DexEntryScreen_MenuActionJumptable
 	call Pokedex_LoadPointer
-	jp [hl]
+	jp hl
 
 .return_to_prev_screen
 	ld a, [LastVolume]
@@ -545,7 +545,7 @@ Pokedex_UpdateOptionScreen: ; 403be (10:43be)
 	ld a, [wDexArrowCursorPosIndex]
 	ld hl, .MenuActionJumptable
 	call Pokedex_LoadPointer
-	jp [hl]
+	jp hl
 
 .return_to_main_screen
 	call Pokedex_BlackOutBG
@@ -647,7 +647,7 @@ Pokedex_UpdateSearchScreen: ; 40471 (10:4471)
 	ld a, [wDexArrowCursorPosIndex]
 	ld hl, .MenuActionJumptable
 	call Pokedex_LoadPointer
-	jp [hl]
+	jp hl
 
 .cancel
 	call Pokedex_BlackOutBG
@@ -1621,7 +1621,7 @@ Pokedex_OrderMonsByMode: ; 40bdc
 	ld a, [wCurrentDexMode]
 	ld hl, .Jumptable
 	call Pokedex_LoadPointer
-	jp [hl]
+	jp hl
 
 
 .Jumptable: ; 40bf0 (10:4bf0)
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index d180ee875..8e5697f75 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -235,7 +235,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
 	ld l, a
 	ld de, .return_from_jumptable
 	push de
-	jp [hl]
+	jp hl
 
 .return_from_jumptable
 	call Pokegear_FinishTilemap
@@ -431,7 +431,7 @@ PokegearJumptable: ; 90f04 (24:4f04)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Jumptable: ; 90f13 (24:4f13)
 	dw PokegearClock_Init
@@ -1217,7 +1217,7 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Cancel: ; 913f1
 	ld hl, PokegearText_WhomToCall
@@ -1484,7 +1484,7 @@ UpdateRadioStation: ; 9166f (24:566f)
 	ld l, a
 	ld de, .returnafterstation
 	push de
-	jp [hl]
+	jp hl
 
 .returnafterstation
 	ld a, [wPokegearRadioChannelBank]
@@ -2043,7 +2043,7 @@ PlayRadio: ; 91a53
 	ld l, a
 	ld de, .jump_return
 	push de
-	jp [hl]
+	jp hl
 
 .jump_return
 	push de
@@ -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/printer/serial.asm b/engine/printer/serial.asm
index da1c334ed..37ed2990b 100755
--- a/engine/printer/serial.asm
+++ b/engine/printer/serial.asm
@@ -26,7 +26,7 @@ PrinterJumptableIteration: ; 84022
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 84031
 
 
@@ -468,7 +468,7 @@ _PrinterReceive:: ; 842db
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 842ea
 
 
diff --git a/engine/radio.asm b/engine/radio.asm
index ce3bc7942..99408af48 100644
--- a/engine/radio.asm
+++ b/engine/radio.asm
@@ -25,7 +25,7 @@ PlayRadioShow:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 RadioJumptable:
 	dw OaksPkmnTalk1  ; $00
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 745948a6f..e9899ef0f 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -1,15 +1,14 @@
 ; Event scripting commands.
 
 
-EnableScriptMode:: ; 96c56
+EnableScriptMode::
 	push af
 	ld a, SCRIPT_READ
 	ld [ScriptMode], a
 	pop af
 	ret
-; 96c5e
 
-ScriptEvents:: ; 96c5e
+ScriptEvents::
 	call StartScript
 .loop
 	ld a, [ScriptMode]
@@ -18,20 +17,18 @@ ScriptEvents:: ; 96c5e
 	call CheckScript
 	jr nz, .loop
 	ret
-; 96c6e
 
-.modes ; 96c6e
+.modes
 	dw EndScript
 	dw RunScriptCommand
 	dw WaitScriptMovement
 	dw WaitScript
 
-EndScript: ; 96c76
+EndScript:
 	call StopScript
 	ret
-; 96c7a
 
-WaitScript: ; 96c7a
+WaitScript:
 	call StopScript
 
 	ld hl, ScriptDelay
@@ -44,9 +41,8 @@ WaitScript: ; 96c7a
 	ld [ScriptMode], a
 	call StartScript
 	ret
-; 96c91
 
-WaitScriptMovement: ; 96c91
+WaitScriptMovement:
 	call StopScript
 
 	ld hl, VramState
@@ -59,17 +55,15 @@ WaitScriptMovement: ; 96c91
 	ld [ScriptMode], a
 	call StartScript
 	ret
-; 96ca9
 
-RunScriptCommand: ; 96ca9
+RunScriptCommand:
 	call GetScriptByte
 	ld hl, ScriptCommandTable
 	rst JumpTable
 	ret
-; 96cb1
 
 
-ScriptCommandTable: ; 96cb1
+ScriptCommandTable:
 	dw Script_scall                      ; 00
 	dw Script_farscall                   ; 01
 	dw Script_ptcall                     ; 02
@@ -242,27 +236,23 @@ ENDC
 	dw Script_name                       ; a7
 	dw Script_wait                       ; a8
 	dw Script_check_save                 ; a9
-; 96e05
 
-StartScript: ; 96e05
+StartScript:
 	ld hl, ScriptFlags
 	set SCRIPT_RUNNING, [hl]
 	ret
-; 96e0b
 
-CheckScript: ; 96e0b
+CheckScript:
 	ld hl, ScriptFlags
 	bit SCRIPT_RUNNING, [hl]
 	ret
-; 96e11
 
-StopScript: ; 96e11
+StopScript:
 	ld hl, ScriptFlags
 	res SCRIPT_RUNNING, [hl]
 	ret
-; 96e17
 
-Script_callasm: ; 96e17
+Script_callasm:
 ; script command 0xe
 ; parameters:
 ;     asm (AsmPointerParam)
@@ -276,9 +266,8 @@ Script_callasm: ; 96e17
 	ld a, b
 	rst FarCall
 	ret
-; 96e26
 
-Script_special: ; 96e26
+Script_special:
 ; script command 0xf
 ; parameters:
 ;     predefined_script (MultiByteParam)
@@ -289,9 +278,8 @@ Script_special: ; 96e26
 	ld d, a
 	callba Special
 	ret
-; 96e35
 
-Script_ptcallasm: ; 96e35
+Script_ptcallasm:
 ; script command 0x10
 ; parameters:
 ;     asm (PointerToAsmPointerParam)
@@ -308,9 +296,8 @@ Script_ptcallasm: ; 96e35
 	ld a, b
 	rst FarCall
 	ret
-; 96e45
 
-Script_jumptextfaceplayer: ; 96e45
+Script_jumptextfaceplayer:
 ; script command 0x51
 ; parameters:
 ;     text_pointer (RawTextPointerLabelParam)
@@ -324,9 +311,8 @@ Script_jumptextfaceplayer: ; 96e45
 	ld b, BANK(JumpTextFacePlayerScript)
 	ld hl, JumpTextFacePlayerScript
 	jp ScriptJump
-; 96e5f
 
-Script_jumptext: ; 96e5f
+Script_jumptext:
 ; script command 0x53
 ; parameters:
 ;     text_pointer (RawTextPointerLabelParam)
@@ -340,22 +326,20 @@ Script_jumptext: ; 96e5f
 	ld b, BANK(JumpTextScript)
 	ld hl, JumpTextScript
 	jp ScriptJump
-; 96e79
 
-JumpTextFacePlayerScript: ; 96e79
+JumpTextFacePlayerScript:
 	faceplayer
-JumpTextScript: ; 96e7a
+JumpTextScript:
 	opentext
 	repeattext -1, -1
 	waitbutton
 	closetext
 	end
-; 96e81
 
 
 IF _CRYSTAL
 
-Script_farjumptext: ; 96e81
+Script_farjumptext:
 ; script command 0x52
 ; parameters:
 ;     text_pointer (PointerLabelBeforeBank)
@@ -369,12 +353,11 @@ Script_farjumptext: ; 96e81
 	ld b, BANK(JumpTextScript)
 	ld hl, JumpTextScript
 	jp ScriptJump
-; 96e9b
 
 ENDC
 
 
-Script_writetext: ; 96e9b
+Script_writetext:
 ; script command 0x4c
 ; parameters:
 ;     text_pointer (RawTextPointerLabelParam)
@@ -387,9 +370,8 @@ Script_writetext: ; 96e9b
 	ld b, a
 	call MapTextbox
 	ret
-; 96eab
 
-Script_farwritetext: ; 96eab
+Script_farwritetext:
 ; script command 0x4b
 ; parameters:
 ;     text_pointer (PointerLabelBeforeBank)
@@ -402,9 +384,8 @@ Script_farwritetext: ; 96eab
 	ld h, a
 	call MapTextbox
 	ret
-; 96ebb
 
-Script_repeattext: ; 96ebb
+Script_repeattext:
 ; script command 0x4d
 ; parameters:
 ;     byte (SingleByteParam)
@@ -430,15 +411,13 @@ Script_repeattext: ; 96ebb
 
 .done
 	ret
-; 96ed9
 
-Script_waitbutton: ; 96ed9
+Script_waitbutton:
 ; script command 0x54
 
 	jp WaitButton
-; 96edc
 
-Script_buttonsound: ; 96edc
+Script_buttonsound:
 ; script command 0x55
 
 	ld a, [hOAMUpdate]
@@ -450,9 +429,8 @@ Script_buttonsound: ; 96edc
 	pop af
 	ld [hOAMUpdate], a
 	ret
-; 96eed
 
-Script_yesorno: ; 96eed
+Script_yesorno:
 ; script command 0x4e
 
 	call YesNoBox
@@ -462,9 +440,8 @@ Script_yesorno: ; 96eed
 .no
 	ld [ScriptVar], a
 	ret
-; 96efa
 
-Script_loadmenudata: ; 96efa
+Script_loadmenudata:
 ; script command 0x4f
 ; parameters:
 ;     data (MenuDataPointerParam)
@@ -478,17 +455,15 @@ Script_loadmenudata: ; 96efa
 	call Call_a_de
 	call UpdateSprites
 	ret
-; 96f0f
 
-Script_closewindow: ; 96f0f
+Script_closewindow:
 ; script command 0x50
 
 	call CloseWindow
 	call UpdateSprites
 	ret
-; 96f16
 
-Script_pokepic: ; 96f16
+Script_pokepic:
 ; script command 0x56
 ; parameters:
 ;     pokemon (PokemonParam)
@@ -501,16 +476,14 @@ Script_pokepic: ; 96f16
 	ld [CurPartySpecies], a
 	callba Pokepic
 	ret
-; 96f29
 
-Script_closepokepic: ; 96f29
+Script_closepokepic:
 ; script command 0x57
 
 	callba ClosePokepic
 	ret
-; 96f30
 
-Script_verticalmenu: ; 96f30
+Script_verticalmenu:
 ; script command 0x59
 
 	ld a, [ScriptBank]
@@ -522,9 +495,8 @@ Script_verticalmenu: ; 96f30
 .ok
 	ld [ScriptVar], a
 	ret
-; 96f41
 
-Script__2dmenu: ; 96f41
+Script__2dmenu:
 ; script command 0x58
 
 	ld a, [ScriptBank]
@@ -536,9 +508,8 @@ Script__2dmenu: ; 96f41
 .ok
 	ld [ScriptVar], a
 	ret
-; 96f52
 
-Script_battletowertext: ; 96f52
+Script_battletowertext:
 ; script command 0xa4
 ; parameters:
 ;     pointer (PointerLabelBeforeBank)
@@ -549,9 +520,8 @@ Script_battletowertext: ; 96f52
 	ld c, a
 	callba BattleTowerText
 	ret
-; 96f60
 
-Script_verbosegiveitem: ; 96f60
+Script_verbosegiveitem:
 ; script command 0x9e
 ; parameters:
 ;     item (ItemLabelByte)
@@ -565,14 +535,12 @@ Script_verbosegiveitem: ; 96f60
 	ld b, BANK(GiveItemScript)
 	ld de, GiveItemScript
 	jp ScriptCall
-; 96f76
 
 
-ret_96f76: ; 96f76
+ret_96f76:
 	ret
-; 96f77
 
-GiveItemScript: ; 96f77
+GiveItemScript:
 	callasm ret_96f76
 	writetext ReceivedItemText
 	iffalse .Full
@@ -586,15 +554,13 @@ GiveItemScript: ; 96f77
 	buttonsound
 	pocketisfull
 	end
-; 96f89
 
-ReceivedItemText: ; 96f89
+ReceivedItemText:
 	text_jump UnknownText_0x1c4719
 	db "@"
-; 96f8e
 
 
-Script_verbosegiveitem2: ; 96f8e
+Script_verbosegiveitem2:
 ; script command 0x9f
 ; parameters:
 ;     item (ItemLabelByte)
@@ -624,9 +590,8 @@ Script_verbosegiveitem2: ; 96f8e
 	ld b, BANK(GiveItemScript)
 	ld de, GiveItemScript
 	jp ScriptCall
-; 96fc6
 
-Script_itemnotify: ; 96fc6
+Script_itemnotify:
 ; script command 0x45
 
 	call GetPocketName
@@ -635,9 +600,8 @@ Script_itemnotify: ; 96fc6
 	ld hl, PutItemInPocketText
 	call MapTextbox
 	ret
-; 96fd5
 
-Script_pocketisfull: ; 96fd5
+Script_pocketisfull:
 ; script command 0x46
 
 	call GetPocketName
@@ -646,9 +610,8 @@ Script_pocketisfull: ; 96fd5
 	ld hl, PocketIsFullText
 	call MapTextbox
 	ret
-; 96fe4
 
-Script_specialsound: ; 96fe4
+Script_specialsound:
 ; script command 0x88
 
 	callba CheckItemPocket
@@ -661,10 +624,9 @@ Script_specialsound: ; 96fe4
 	call PlaySFX
 	call WaitSFX
 	ret
-; 96ffe
 
 
-GetPocketName: ; 96ffe
+GetPocketName:
 	callba CheckItemPocket
 	ld a, [wItemAttributeParamBuffer]
 	dec a
@@ -695,28 +657,24 @@ GetPocketName: ; 96ffe
 	db "BALL POCKET@"
 .TM:
 	db "TM POCKET@"
-; 97051
 
-CurItemName: ; 97051
+CurItemName:
 	ld a, [CurItem]
 	ld [wd265], a
 	call GetItemName
 	ret
-; 9705b
 
 
-PutItemInPocketText: ; 9705b
+PutItemInPocketText:
 	text_jump UnknownText_0x1c472c
 	db "@"
-; 97060
 
-PocketIsFullText: ; 97060
+PocketIsFullText:
 	text_jump UnknownText_0x1c474b
 	db "@"
-; 97065
 
 
-Script_pokemart: ; 97065
+Script_pokemart:
 ; script command 0x94
 ; parameters:
 ;     dialog_id (SingleByteParam)
@@ -732,9 +690,8 @@ Script_pokemart: ; 97065
 	ld b, a
 	callba OpenMartDialog
 	ret
-; 9707c
 
-Script_elevator: ; 9707c
+Script_elevator:
 ; script command 0x95
 ; parameters:
 ;     floor_list_pointer (PointerLabelParam)
@@ -752,9 +709,8 @@ Script_elevator: ; 9707c
 	ld a, TRUE
 	ld [ScriptVar], a
 	ret
-; 97099
 
-Script_trade: ; 97099
+Script_trade:
 ; script command 0x96
 ; parameters:
 ;     trade_id (SingleByteParam)
@@ -763,9 +719,8 @@ Script_trade: ; 97099
 	ld e, a
 	callba NPCTrade
 	ret
-; 970a4
 
-Script_phonecall: ; 970a4
+Script_phonecall:
 ; script command 0x98
 ; parameters:
 ;     caller_name (RawTextPointerLabelParam)
@@ -778,16 +733,14 @@ Script_phonecall: ; 970a4
 	ld b, a
 	callba PhoneCall
 	ret
-; 970b7
 
-Script_hangup: ; 970b7
+Script_hangup:
 ; script command 0x99
 
 	callba HangUp
 	ret
-; 970be
 
-Script_askforphonenumber: ; 970be
+Script_askforphonenumber:
 ; script command 0x97
 ; parameters:
 ;     number (SingleByteParam)
@@ -809,9 +762,8 @@ Script_askforphonenumber: ; 970be
 .done
 	ld [ScriptVar], a
 	ret
-; 970df
 
-Script_describedecoration: ; 970df
+Script_describedecoration:
 ; script command 0x9a
 ; parameters:
 ;     byte (SingleByteParam)
@@ -822,9 +774,8 @@ Script_describedecoration: ; 970df
 	ld h, d
 	ld l, e
 	jp ScriptJump
-; 970ee
 
-Script_fruittree: ; 970ee
+Script_fruittree:
 ; script command 0x9b
 ; parameters:
 ;     tree_id (SingleByteParam)
@@ -834,9 +785,8 @@ Script_fruittree: ; 970ee
 	ld b, BANK(FruitTreeScript)
 	ld hl, FruitTreeScript
 	jp ScriptJump
-; 970fc
 
-Script_swarm: ; 970fc
+Script_swarm:
 ; script command 0xa0
 ; parameters:
 ;     flag (SingleByteParam)
@@ -851,9 +801,8 @@ Script_swarm: ; 970fc
 	ld e, a
 	callba StoreSwarmMapIndices
 	ret
-; 9710f
 
-Script_trainertext: ; 9710f
+Script_trainertext:
 ; script command 0x62
 ; parameters:
 ;     which_text (SingleByteParam)
@@ -871,9 +820,8 @@ Script_trainertext: ; 9710f
 	ld b, a
 	call MapTextbox
 	ret
-; 97125
 
-Script_scripttalkafter: ; 97125
+Script_scripttalkafter:
 ; script command 0x65
 
 	ld hl, wScriptAfterPointer
@@ -883,9 +831,8 @@ Script_scripttalkafter: ; 97125
 	ld a, [EngineBuffer1]
 	ld b, a
 	jp ScriptJump
-; 97132
 
-Script_trainerflagaction: ; 97132
+Script_trainerflagaction:
 ; script command 0x63
 ; parameters:
 ;     action (SingleByteParam)
@@ -905,37 +852,34 @@ Script_trainerflagaction: ; 97132
 	ld a, TRUE
 	ld [ScriptVar], a
 	ret
-; 9714c
 
-Script_winlosstext: ; 9714c
+Script_winlosstext:
 ; script command 0x64
 ; parameters:
 ;     win_text_pointer (TextPointerLabelParam)
 ;     loss_text_pointer (TextPointerLabelParam)
 
-	ld hl, wWinTextPointer ; d047
+	ld hl, wWinTextPointer
 	call GetScriptByte
 	ld [hli], a
 	call GetScriptByte
 	ld [hli], a
-	ld hl, wLossTextPointer ; d049; this is unnecessary
+	ld hl, wLossTextPointer
 	call GetScriptByte
 	ld [hli], a
 	call GetScriptByte
 	ld [hli], a
 	ret
-; 97163
 
-Script_end_if_just_battled: ; 97163
+Script_end_if_just_battled:
 ; script command 0x66
 
 	ld a, [wRunningTrainerBattleScript]
 	and a
 	ret z
 	jp Script_end
-; 9716b
 
-Script_check_just_battled: ; 9716b
+Script_check_just_battled:
 ; script command 0x67
 
 	ld a, TRUE
@@ -946,25 +890,22 @@ Script_check_just_battled: ; 9716b
 	xor a
 	ld [ScriptVar], a
 	ret
-; 9717a
 
-Script_encountermusic: ; 9717a
+Script_encountermusic:
 ; script command 0x80
 
 	ld a, [OtherTrainerClass]
 	ld e, a
 	callba PlayTrainerEncounterMusic
 	ret
-; 97185
 
-Script_playmapmusic: ; 97185
+Script_playmapmusic:
 ; script command 0x82
 
 	call PlayMapMusic
 	ret
-; 97189
 
-Script_playmusic: ; 97189
+Script_playmusic:
 ; script command 0x7f
 ; parameters:
 ;     music_pointer (MultiByteParam)
@@ -980,9 +921,8 @@ Script_playmusic: ; 97189
 	ld d, a
 	call PlayMusic
 	ret
-; 971a2
 
-Script_musicfadeout: ; 971a2
+Script_musicfadeout:
 ; script command 0x81
 ; parameters:
 ;     music (MultiByteParam)
@@ -996,9 +936,8 @@ Script_musicfadeout: ; 971a2
 	and $7f
 	ld [MusicFade], a
 	ret
-; 971b7
 
-Script_playsound: ; 971b7
+Script_playsound:
 ; script command 0x85
 ; parameters:
 ;     sound_pointer (MultiByteParam)
@@ -1009,24 +948,21 @@ Script_playsound: ; 971b7
 	ld d, a
 	call PlaySFX
 	ret
-; 971c3
 
-Script_waitsfx: ; 971c3
+Script_waitsfx:
 ; script command 0x86
 
 	call WaitSFX
 	ret
-; 971c7
 
-Script_warpsound: ; 971c7
+Script_warpsound:
 ; script command 0x87
 
 	callba Function14a07
 	call PlaySFX
 	ret
-; 971d1
 
-Script_cry: ; 971d1
+Script_cry:
 ; script command 0x84
 ; parameters:
 ;     cry_id (MultiByteParam)
@@ -1041,18 +977,16 @@ Script_cry: ; 971d1
 .ok
 	call PlayCry
 	ret
-; 971e3
 
-GetScriptPerson: ; 971e3
+GetScriptPerson:
 	and a
 	ret z
 	cp LAST_TALKED
 	ret z
 	dec a
 	ret
-; 971ea
 
-Script_setlasttalked: ; 971ea
+Script_setlasttalked:
 ; script command 0x68
 ; parameters:
 ;     person (SingleByteParam)
@@ -1061,9 +995,8 @@ Script_setlasttalked: ; 971ea
 	call GetScriptPerson
 	ld [hLastTalked], a
 	ret
-; 971f3
 
-Script_applymovement: ; 971f3
+Script_applymovement:
 ; script command 0x69
 ; parameters:
 ;     person (SingleByteParam)
@@ -1072,9 +1005,8 @@ Script_applymovement: ; 971f3
 	call GetScriptByte
 	call GetScriptPerson
 	ld c, a
-; 971fa
 
-ApplyMovement: ; 971fa
+ApplyMovement:
 	push bc
 	ld a, c
 	callba SetFlagsForMovement_1
@@ -1097,14 +1029,12 @@ ApplyMovement: ; 971fa
 	ld [ScriptMode], a
 	call StopScript
 	ret
-; 97221
 
-SetFlagsForMovement_2: ; 97221
+SetFlagsForMovement_2:
 	callba _SetFlagsForMovement_2
 	ret
-; 97228
 
-Script_applymovement2: ; 97228
+Script_applymovement2:
 ; apply movement to last talked
 ; script command 0x6a
 ; parameters:
@@ -1113,9 +1043,8 @@ Script_applymovement2: ; 97228
 	ld a, [hLastTalked]
 	ld c, a
 	jp ApplyMovement
-; 9722e
 
-Script_faceplayer: ; 9722e
+Script_faceplayer:
 ; script command 0x6b
 
 	ld a, [hLastTalked]
@@ -1133,9 +1062,8 @@ Script_faceplayer: ; 9722e
 	ld d, a
 	call ApplyPersonFacing
 	ret
-; 97248
 
-Script_faceperson: ; 97248
+Script_faceperson:
 ; script command 0x6c
 ; parameters:
 ;     person1 (SingleByteParam)
@@ -1166,9 +1094,8 @@ Script_faceperson: ; 97248
 	ld d, c
 	call ApplyPersonFacing
 	ret
-; 97274
 
-Script_spriteface: ; 97274
+Script_spriteface:
 ; script command 0x76
 ; parameters:
 ;     person (SingleByteParam)
@@ -1187,9 +1114,8 @@ Script_spriteface: ; 97274
 	ld e, a
 	call ApplyPersonFacing
 	ret
-; 9728b
 
-ApplyPersonFacing: ; 9728b
+ApplyPersonFacing:
 	ld a, d
 	push de
 	call CheckObjectVisibility
@@ -1220,9 +1146,8 @@ ApplyPersonFacing: ; 9728b
 	pop de
 	scf
 	ret
-; 972bc
 
-.DisableTextTiles: ; 972bc
+.DisableTextTiles:
 	call LoadMapPart
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
@@ -1234,9 +1159,8 @@ ApplyPersonFacing: ; 9728b
 	or c
 	jr nz, .loop
 	ret
-; 972ce
 
-Script_variablesprite: ; 972ce
+Script_variablesprite:
 ; script command 0x6d
 ; parameters:
 ;     byte (SingleByteParam)
@@ -1250,9 +1174,8 @@ Script_variablesprite: ; 972ce
 	call GetScriptByte
 	ld [hl], a
 	ret
-; 972dd
 
-Script_appear: ; 972dd
+Script_appear:
 ; script command 0x6f
 ; parameters:
 ;     person (SingleByteParam)
@@ -1264,9 +1187,8 @@ Script_appear: ; 972dd
 	ld b, 0 ; clear
 	call ApplyEventActionAppearDisappear
 	ret
-; 972ee
 
-Script_disappear: ; 972ee
+Script_disappear:
 ; script command 0x6e
 ; parameters:
 ;     person (SingleByteParam)
@@ -1283,9 +1205,8 @@ Script_disappear: ; 972ee
 	call ApplyEventActionAppearDisappear
 	callba _UpdateSprites
 	ret
-; 9730b
 
-ApplyEventActionAppearDisappear: ; 9730b
+ApplyEventActionAppearDisappear:
 	push bc
 	call GetMapObject
 	ld hl, MAPOBJECT_EVENT_FLAG
@@ -1304,9 +1225,8 @@ ApplyEventActionAppearDisappear: ; 9730b
 .okay
 	call EventFlagAction
 	ret
-; 97325
 
-Script_follow: ; 97325
+Script_follow:
 ; script command 0x70
 ; parameters:
 ;     person2 (SingleByteParam)
@@ -1320,16 +1240,14 @@ Script_follow: ; 97325
 	ld c, a
 	callba StartFollow
 	ret
-; 9733a
 
-Script_stopfollow: ; 9733a
+Script_stopfollow:
 ; script command 0x71
 
 	callba StopFollow
 	ret
-; 97341
 
-Script_moveperson: ; 97341
+Script_moveperson:
 ; script command 0x72
 ; parameters:
 ;     person (SingleByteParam)
@@ -1347,9 +1265,8 @@ Script_moveperson: ; 97341
 	ld e, a
 	callba CopyDECoordsToMapObject
 	ret
-; 9735b
 
-Script_writepersonxy: ; 9735b
+Script_writepersonxy:
 ; script command 0x73
 ; parameters:
 ;     person (SingleByteParam)
@@ -1363,9 +1280,8 @@ Script_writepersonxy: ; 9735b
 	ld b, a
 	callba WritePersonXY
 	ret
-; 9736f
 
-Script_follownotexact: ; 9736f
+Script_follownotexact:
 ; script command 0x77
 ; parameters:
 ;     person2 (SingleByteParam)
@@ -1379,9 +1295,8 @@ Script_follownotexact: ; 9736f
 	ld c, a
 	callba FollowNotExact
 	ret
-; 97384
 
-Script_loademote: ; 97384
+Script_loademote:
 ; script command 0x74
 ; parameters:
 ;     bubble (SingleByteParam)
@@ -1394,9 +1309,8 @@ Script_loademote: ; 97384
 	ld c, a
 	callba LoadEmote
 	ret
-; 97396
 
-Script_showemote: ; 97396
+Script_showemote:
 ; script command 0x75
 ; parameters:
 ;     bubble (SingleByteParam)
@@ -1416,9 +1330,8 @@ Script_showemote: ; 97396
 	ld b, BANK(ShowEmoteScript)
 	ld de, ShowEmoteScript
 	jp ScriptCall
-; 973b6
 
-ShowEmoteScript: ; 973b6
+ShowEmoteScript:
 	loademote EMOTE_MEM
 	applymovement2 .Show
 	pause 0
@@ -1434,10 +1347,9 @@ ShowEmoteScript: ; 973b6
 	hide_emote
 	step_sleep 1
 	step_end
-; 973c7
 
 
-Script_earthquake: ; 973c7
+Script_earthquake:
 ; script command 0x78
 ; parameters:
 ;     param (DecimalParam)
@@ -1453,22 +1365,19 @@ Script_earthquake: ; 973c7
 	ld b, BANK(.script)
 	ld de, .script
 	jp ScriptCall
-; 973e6
 
-.script ; 973e6
+.script
 	applymovement PLAYER, wd002
 	end
-; 973eb
 
-EarthquakeMovement: ; 973eb
+EarthquakeMovement:
 	step_shake 16 ; the 16 gets overwritten with the script byte
 	step_sleep 16 ; the 16 gets overwritten with the lower 6 bits of the script byte
 	step_end
 EarthquakeMovementEnd
-; 973f0
 
 
-Script_loadpikachudata: ; 973f0
+Script_loadpikachudata:
 ; script command 0x5a
 
 	ld a, PIKACHU
@@ -1476,17 +1385,15 @@ Script_loadpikachudata: ; 973f0
 	ld a, 5
 	ld [CurPartyLevel], a
 	ret
-; 973fb
 
-Script_randomwildmon: ; 973fb
+Script_randomwildmon:
 ; script command 0x5b
 
 	xor a
 	ld [wBattleScriptFlags], a
 	ret
-; 97400
 
-Script_loadmemtrainer: ; 97400
+Script_loadmemtrainer:
 ; script command 0x5c
 
 	ld a, (1 << 7) | 1
@@ -1496,9 +1403,8 @@ Script_loadmemtrainer: ; 97400
 	ld a, [wTempTrainerID]
 	ld [OtherTrainerID], a
 	ret
-; 97412
 
-Script_loadwildmon: ; 97412
+Script_loadwildmon:
 ; script command 0x5d
 ; parameters:
 ;     pokemon (PokemonParam)
@@ -1511,9 +1417,8 @@ Script_loadwildmon: ; 97412
 	call GetScriptByte
 	ld [CurPartyLevel], a
 	ret
-; 97424
 
-Script_loadtrainer: ; 97424
+Script_loadtrainer:
 ; script command 0x5e
 ; parameters:
 ;     trainer_group (TrainerGroupParam)
@@ -1526,9 +1431,8 @@ Script_loadtrainer: ; 97424
 	call GetScriptByte
 	ld [OtherTrainerID], a
 	ret
-; 97436
 
-Script_startbattle: ; 97436
+Script_startbattle:
 ; script command 0x5f
 
 	call BufferScreen
@@ -1537,9 +1441,8 @@ Script_startbattle: ; 97436
 	and $3f
 	ld [ScriptVar], a
 	ret
-; 97447
 
-Script_catchtutorial: ; 97447
+Script_catchtutorial:
 ; script command 0x61
 ; parameters:
 ;     byte (SingleByteParam)
@@ -1549,9 +1452,8 @@ Script_catchtutorial: ; 97447
 	call BufferScreen
 	callba CatchTutorial
 	jp Script_reloadmap
-; 97459
 
-Script_reloadmapafterbattle: ; 97459
+Script_reloadmapafterbattle:
 ; script command 0x60
 
 	ld hl, wBattleScriptFlags
@@ -1580,9 +1482,8 @@ Script_reloadmapafterbattle: ; 97459
 	callba LoadScriptBDE
 .done
 	jp Script_reloadmap
-; 97491
 
-Script_reloadmap: ; 97491
+Script_reloadmap:
 ; script command 0x7b
 
 	xor a
@@ -1593,9 +1494,8 @@ Script_reloadmap: ; 97491
 	call LoadMapStatus
 	call StopScript
 	ret
-; 974a2
 
-Script_scall: ; 974a2
+Script_scall:
 ; script command 0x0
 ; parameters:
 ;     pointer (ScriptPointerLabelParam)
@@ -1607,9 +1507,8 @@ Script_scall: ; 974a2
 	call GetScriptByte
 	ld d, a
 	jr ScriptCall
-; 974b0
 
-Script_farscall: ; 974b0
+Script_farscall:
 ; script command 0x1
 ; parameters:
 ;     pointer (ScriptPointerLabelBeforeBank)
@@ -1621,9 +1520,8 @@ Script_farscall: ; 974b0
 	call GetScriptByte
 	ld d, a
 	jr ScriptCall
-; 974be
 
-Script_ptcall: ; 974be
+Script_ptcall:
 ; script command 0x2
 ; parameters:
 ;     pointer (PointerLabelToScriptPointer)
@@ -1639,7 +1537,7 @@ Script_ptcall: ; 974be
 	ld d, [hl]
 	; fallthrough
 
-ScriptCall: ; 974cb
+ScriptCall:
 ; Bug: The script stack has a capacity of 5 scripts, yet there is
 ; nothing to stop you from pushing a sixth script.  The high part
 ; of the script address can then be overwritten by modifications
@@ -1669,16 +1567,14 @@ ScriptCall: ; 974cb
 	ld a, d
 	ld [ScriptPos + 1], a
 	ret
-; 974f3
 
-CallCallback:: ; 974f3
+CallCallback::
 	ld a, [ScriptBank]
 	or $80
 	ld [ScriptBank], a
 	jp ScriptCall
-; 974fe
 
-Script_jump: ; 974fe
+Script_jump:
 ; script command 0x3
 ; parameters:
 ;     pointer (ScriptPointerLabelParam)
@@ -1690,9 +1586,8 @@ Script_jump: ; 974fe
 	ld a, [ScriptBank]
 	ld b, a
 	jp ScriptJump
-; 9750d
 
-Script_farjump: ; 9750d
+Script_farjump:
 ; script command 0x4
 ; parameters:
 ;     pointer (ScriptPointerLabelBeforeBank)
@@ -1704,9 +1599,8 @@ Script_farjump: ; 9750d
 	call GetScriptByte
 	ld h, a
 	jp ScriptJump
-; 9751c
 
-Script_ptjump: ; 9751c
+Script_ptjump:
 ; script command 0x5
 ; parameters:
 ;     pointer (PointerLabelToScriptPointer)
@@ -1721,9 +1615,8 @@ Script_ptjump: ; 9751c
 	ld h, [hl]
 	ld l, a
 	jp ScriptJump
-; 9752c
 
-Script_iffalse: ; 9752c
+Script_iffalse:
 ; script command 0x8
 ; parameters:
 ;     pointer (ScriptPointerLabelParam)
@@ -1732,9 +1625,8 @@ Script_iffalse: ; 9752c
 	and a
 	jp nz, SkipTwoScriptBytes
 	jp Script_jump
-; 97536
 
-Script_iftrue: ; 97536
+Script_iftrue:
 ; script command 0x9
 ; parameters:
 ;     pointer (ScriptPointerLabelParam)
@@ -1743,9 +1635,8 @@ Script_iftrue: ; 97536
 	and a
 	jp nz, Script_jump
 	jp SkipTwoScriptBytes
-; 97540
 
-Script_if_equal: ; 97540
+Script_if_equal:
 ; script command 0x6
 ; parameters:
 ;     byte (SingleByteParam)
@@ -1756,9 +1647,8 @@ Script_if_equal: ; 97540
 	cp [hl]
 	jr z, Script_jump
 	jr SkipTwoScriptBytes
-; 9754b
 
-Script_if_not_equal: ; 9754b
+Script_if_not_equal:
 ; script command 0x7
 ; parameters:
 ;     byte (SingleByteParam)
@@ -1769,9 +1659,8 @@ Script_if_not_equal: ; 9754b
 	cp [hl]
 	jr nz, Script_jump
 	jr SkipTwoScriptBytes
-; 97556
 
-Script_if_greater_than: ; 97556
+Script_if_greater_than:
 ; script command 0xa
 ; parameters:
 ;     byte (SingleByteParam)
@@ -1783,9 +1672,8 @@ Script_if_greater_than: ; 97556
 	cp b
 	jr c, Script_jump
 	jr SkipTwoScriptBytes
-; 97562
 
-Script_if_less_than: ; 97562
+Script_if_less_than:
 ; script command 0xb
 ; parameters:
 ;     byte (SingleByteParam)
@@ -1797,18 +1685,16 @@ Script_if_less_than: ; 97562
 	cp b
 	jr c, Script_jump
 	jr SkipTwoScriptBytes
-; 9756e
 
-Script_jumpstd: ; 9756e
+Script_jumpstd:
 ; script command 0xc
 ; parameters:
 ;     predefined_script (MultiByteParam)
 
 	call StdScript
 	jr ScriptJump
-; 97573
 
-Script_callstd: ; 97573
+Script_callstd:
 ; script command 0xd
 ; parameters:
 ;     predefined_script (MultiByteParam)
@@ -1817,9 +1703,8 @@ Script_callstd: ; 97573
 	ld d, h
 	ld e, l
 	jp ScriptCall
-; 9757b
 
-StdScript: ; 9757b
+StdScript:
 	call GetScriptByte
 	ld e, a
 	call GetScriptByte
@@ -1835,15 +1720,13 @@ StdScript: ; 9757b
 	ld a, BANK(StdScripts)
 	call GetFarHalfword
 	ret
-; 97596
 
-SkipTwoScriptBytes: ; 97596
+SkipTwoScriptBytes:
 	call GetScriptByte
 	call GetScriptByte
 	ret
-; 9759d
 
-ScriptJump: ; 9759d
+ScriptJump:
 	ld a, b
 	ld [ScriptBank], a
 	ld a, l
@@ -1851,9 +1734,8 @@ ScriptJump: ; 9759d
 	ld a, h
 	ld [ScriptPos + 1], a
 	ret
-; 975aa
 
-Script_priorityjump: ; 975aa
+Script_priorityjump:
 ; script command 0x8d
 ; parameters:
 ;     pointer (ScriptPointerLabelParam)
@@ -1867,9 +1749,8 @@ Script_priorityjump: ; 975aa
 	ld hl, ScriptFlags
 	set 3, [hl]
 	ret
-; 975c2
 
-Script_checktriggers: ; 975c2
+Script_checktriggers:
 ; script command 0x13
 
 	call CheckTriggers
@@ -1881,9 +1762,8 @@ Script_checktriggers: ; 975c2
 	ld a, $ff
 	ld [ScriptVar], a
 	ret
-; 975d1
 
-Script_checkmaptriggers: ; 975d1
+Script_checkmaptriggers:
 ; script command 0x11
 ; parameters:
 ;     map_group (SingleByteParam)
@@ -1905,9 +1785,8 @@ Script_checkmaptriggers: ; 975d1
 	ld a, $ff
 	ld [ScriptVar], a
 	ret
-; 975eb
 
-Script_dotrigger: ; 975eb
+Script_dotrigger:
 ; script command 0x14
 ; parameters:
 ;     trigger_id (SingleByteParam)
@@ -1917,9 +1796,8 @@ Script_dotrigger: ; 975eb
 	ld a, [MapNumber]
 	ld c, a
 	jr DoTrigger
-; 975f5
 
-Script_domaptrigger: ; 975f5
+Script_domaptrigger:
 ; script command 0x12
 ; parameters:
 ;     map_group (MapGroupParam)
@@ -1930,7 +1808,7 @@ Script_domaptrigger: ; 975f5
 	ld b, a
 	call GetScriptByte
 	ld c, a
-DoTrigger: ; 975fd
+DoTrigger:
 	call GetMapTrigger
 	ld a, d
 	or e
@@ -1939,9 +1817,8 @@ DoTrigger: ; 975fd
 	ld [de], a
 .no_trigger
 	ret
-; 97609
 
-Script_copybytetovar: ; 97609
+Script_copybytetovar:
 ; script command 0x19
 ; parameters:
 ;     address (RAMAddressParam)
@@ -1953,9 +1830,8 @@ Script_copybytetovar: ; 97609
 	ld a, [hl]
 	ld [ScriptVar], a
 	ret
-; 97616
 
-Script_copyvartobyte: ; 97616
+Script_copyvartobyte:
 ; script command 0x1a
 ; parameters:
 ;     address (RAMAddressParam)
@@ -1967,9 +1843,8 @@ Script_copyvartobyte: ; 97616
 	ld a, [ScriptVar]
 	ld [hl], a
 	ret
-; 97623
 
-Script_loadvar: ; 97623
+Script_loadvar:
 ; script command 0x1b
 ; parameters:
 ;     address (RAMAddressParam)
@@ -1982,9 +1857,8 @@ Script_loadvar: ; 97623
 	call GetScriptByte
 	ld [hl], a
 	ret
-; 97630
 
-Script_writebyte: ; 97630
+Script_writebyte:
 ; script command 0x15
 ; parameters:
 ;     value (SingleByteParam)
@@ -1992,9 +1866,8 @@ Script_writebyte: ; 97630
 	call GetScriptByte
 	ld [ScriptVar], a
 	ret
-; 97637
 
-Script_addvar: ; 97637
+Script_addvar:
 ; script command 0x16
 ; parameters:
 ;     value (SingleByteParam)
@@ -2004,9 +1877,8 @@ Script_addvar: ; 97637
 	add [hl]
 	ld [hl], a
 	ret
-; 97640
 
-Script_random: ; 97640
+Script_random:
 ; script command 0x17
 ; parameters:
 ;     input (SingleByteParam)
@@ -2047,9 +1919,8 @@ Script_random: ; 97640
 	call SimpleDivide
 	ld [ScriptVar], a
 	ret
-; 97673
 
-.Divide256byC: ; 97673
+.Divide256byC:
 	xor a
 	ld b, a
 	sub c
@@ -2060,9 +1931,8 @@ Script_random: ; 97640
 	dec b
 	add c
 	ret
-; 9767d
 
-Script_checkcode: ; 9767d
+Script_checkcode:
 ; script command 0x1c
 ; parameters:
 ;     variable_id (SingleByteParam)
@@ -2072,9 +1942,8 @@ Script_checkcode: ; 9767d
 	ld a, [de]
 	ld [ScriptVar], a
 	ret
-; 97688
 
-Script_writevarcode: ; 97688
+Script_writevarcode:
 ; script command 0x1d
 ; parameters:
 ;     variable_id (SingleByteParam)
@@ -2084,9 +1953,8 @@ Script_writevarcode: ; 97688
 	ld a, [ScriptVar]
 	ld [de], a
 	ret
-; 97693
 
-Script_writecode: ; 97693
+Script_writecode:
 ; script command 0x1e
 ; parameters:
 ;     variable_id (SingleByteParam)
@@ -2097,27 +1965,23 @@ Script_writecode: ; 97693
 	call GetScriptByte
 	ld [de], a
 	ret
-; 9769e
 
-GetVarAction: ; 9769e
+GetVarAction:
 	ld c, a
 	callba _GetVarAction
 	ret
-; 976a6
 
-Script_checkver: ; 976a6
+Script_checkver:
 ; script command 0x18
 
 	ld a, [Version]
 	ld [ScriptVar], a
 	ret
-; 976ad
 
-Version: ; 976ad
+Version:
 	db VERSION
-; 976ae
 
-Script_pokenamemem: ; 976ae
+Script_pokenamemem:
 ; script command 0x40
 ; parameters:
 ;     pokemon (PokemonParam); leave $0 to draw from script var
@@ -2132,22 +1996,21 @@ Script_pokenamemem: ; 976ae
 	call GetPokemonName
 	ld de, StringBuffer1
 
-ConvertMemToText: ; 976c0
+ConvertMemToText:
 	call GetScriptByte
 	cp 3
 	jr c, .ok
 	xor a
 .ok
 
-CopyConvertedText: ; 976c8
+CopyConvertedText:
 	ld hl, StringBuffer3
 	ld bc, StringBuffer4 - StringBuffer3
 	call AddNTimes
 	call CopyName2
 	ret
-; 976d5
 
-Script_itemtotext: ; 976d5
+Script_itemtotext:
 ; script command 0x41
 ; parameters:
 ;     item (ItemLabelByte); use 0 to draw from ScriptVar
@@ -2162,9 +2025,8 @@ Script_itemtotext: ; 976d5
 	call GetItemName
 	ld de, StringBuffer1
 	jr ConvertMemToText
-; 976e9
 
-Script_mapnametotext: ; 976e9
+Script_mapnametotext:
 ; script command 0x42
 ; parameters:
 ;     memory (SingleByteParam)
@@ -2175,14 +2037,13 @@ Script_mapnametotext: ; 976e9
 	ld c, a
 	call GetWorldMapLocation
 
-ConvertLandmarkToText: ; 976f4
+ConvertLandmarkToText:
 	ld e, a
 	callba GetLandmarkName
 	ld de, StringBuffer1
 	jp ConvertMemToText
-; 97701
 
-Script_landmarktotext: ; 97701
+Script_landmarktotext:
 ; script command 0xa5
 ; parameters:
 ;     id (SingleByteParam)
@@ -2190,9 +2051,8 @@ Script_landmarktotext: ; 97701
 
 	call GetScriptByte
 	jr ConvertLandmarkToText
-; 97706
 
-Script_trainertotext: ; 97706
+Script_trainertotext:
 ; script command 0x43
 ; parameters:
 ;     trainer_id (TrainerGroupParam)
@@ -2205,9 +2065,8 @@ Script_trainertotext: ; 97706
 	ld b, a
 	callba GetTrainerName
 	jr ConvertMemToText
-; 97716
 
-Script_name: ; 97716
+Script_name:
 ; script command 0xa7
 ; parameters:
 ;     type (SingleByteParam)
@@ -2217,15 +2076,14 @@ Script_name: ; 97716
 	call GetScriptByte
 	ld [wNamedObjectTypeBuffer], a
 
-ContinueToGetName: ; 9771c
+ContinueToGetName:
 	call GetScriptByte
 	ld [CurSpecies], a
 	call GetName
 	ld de, StringBuffer1
 	jp ConvertMemToText
-; 9772b
 
-Script_trainerclassname: ; 9772b
+Script_trainerclassname:
 ; script command 0xa6
 ; parameters:
 ;     id (SingleByteParam)
@@ -2234,9 +2092,8 @@ Script_trainerclassname: ; 9772b
 	ld a, TRAINER_NAME
 	ld [wNamedObjectTypeBuffer], a
 	jr ContinueToGetName
-; 97732
 
-Script_readmoney: ; 97732
+Script_readmoney:
 ; script command 0x3d
 ; parameters:
 ;     account (SingleByteParam)
@@ -2249,9 +2106,8 @@ Script_readmoney: ; 97732
 	call PrintNum
 	ld de, StringBuffer1
 	jp ConvertMemToText
-; 97747
 
-Script_readcoins: ; 97747
+Script_readcoins:
 ; script command 0x3e
 ; parameters:
 ;     memory (SingleByteParam)
@@ -2263,9 +2119,8 @@ Script_readcoins: ; 97747
 	call PrintNum
 	ld de, StringBuffer1
 	jp ConvertMemToText
-; 9775c
 
-Script_RAM2MEM: ; 9775c
+Script_RAM2MEM:
 ; script command 0x3f
 ; parameters:
 ;     memory (SingleByteParam)
@@ -2277,17 +2132,15 @@ Script_RAM2MEM: ; 9775c
 	call PrintNum
 	ld de, StringBuffer1
 	jp ConvertMemToText
-; 97771
 
-ResetStringBuffer1: ; 97771
+ResetStringBuffer1:
 	ld hl, StringBuffer1
 	ld bc, NAME_LENGTH
 	ld a, "@"
 	call ByteFill
 	ret
-; 9777d
 
-Script_stringtotext: ; 9777d
+Script_stringtotext:
 ; script command 0x44
 ; parameters:
 ;     text_pointer (EncodedTextLabelParam)
@@ -2302,9 +2155,8 @@ Script_stringtotext: ; 9777d
 	rst FarCall
 	ld de, StringBuffer2
 	jp ConvertMemToText
-; 97792
 
-Script_givepokeitem: ; 97792
+Script_givepokeitem:
 ; script command 0x2f
 ; parameters:
 ;     pointer (PointerParamToItemAndLetter)
@@ -2325,9 +2177,8 @@ Script_givepokeitem: ; 97792
 	pop bc
 	callba GivePokeItem
 	ret
-; 977b7
 
-Script_checkpokeitem: ; 977b7
+Script_checkpokeitem:
 ; script command 0x30
 ; parameters:
 ;     pointer (PointerParamToItemAndLetter)
@@ -2340,9 +2191,8 @@ Script_checkpokeitem: ; 977b7
 	ld b, a
 	callba CheckPokeItem
 	ret
-; 977ca
 
-Script_giveitem: ; 977ca
+Script_giveitem:
 ; script command 0x1f
 ; parameters:
 ;     item (ItemLabelByte)
@@ -2366,9 +2216,8 @@ Script_giveitem: ; 977ca
 	xor a
 	ld [ScriptVar], a
 	ret
-; 977f0
 
-Script_takeitem: ; 977f0
+Script_takeitem:
 ; script command 0x20
 ; parameters:
 ;     item (ItemLabelByte)
@@ -2388,9 +2237,8 @@ Script_takeitem: ; 977f0
 	ld a, TRUE
 	ld [ScriptVar], a
 	ret
-; 97812
 
-Script_checkitem: ; 97812
+Script_checkitem:
 ; script command 0x21
 ; parameters:
 ;     item (ItemLabelByte)
@@ -2405,9 +2253,8 @@ Script_checkitem: ; 97812
 	ld a, TRUE
 	ld [ScriptVar], a
 	ret
-; 97829
 
-Script_givemoney: ; 97829
+Script_givemoney:
 ; script command 0x22
 ; parameters:
 ;     account (SingleByteParam)
@@ -2417,9 +2264,8 @@ Script_givemoney: ; 97829
 	call LoadMoneyAmountToMem
 	callba GiveMoney
 	ret
-; 97836
 
-Script_takemoney: ; 97836
+Script_takemoney:
 ; script command 0x23
 ; parameters:
 ;     account (SingleByteParam)
@@ -2429,9 +2275,8 @@ Script_takemoney: ; 97836
 	call LoadMoneyAmountToMem
 	callba TakeMoney
 	ret
-; 97843
 
-Script_checkmoney: ; 97843
+Script_checkmoney:
 ; script command 0x24
 ; parameters:
 ;     account (SingleByteParam)
@@ -2440,9 +2285,8 @@ Script_checkmoney: ; 97843
 	call GetMoneyAccount
 	call LoadMoneyAmountToMem
 	callba CompareMoney
-; 9784f
 
-CompareMoneyAction: ; 9784f
+CompareMoneyAction:
 	jr c, .two
 	jr z, .one
 	ld a, 0
@@ -2455,18 +2299,16 @@ CompareMoneyAction: ; 9784f
 .done
 	ld [ScriptVar], a
 	ret
-; 97861
 
-GetMoneyAccount: ; 97861
+GetMoneyAccount:
 	call GetScriptByte
 	and a
 	ld de, Money
 	ret z
 	ld de, wMomsMoney
 	ret
-; 9786d
 
-LoadMoneyAmountToMem: ; 9786d
+LoadMoneyAmountToMem:
 	ld bc, hMoneyTemp
 	push bc
 	call GetScriptByte
@@ -2479,9 +2321,8 @@ LoadMoneyAmountToMem: ; 9786d
 	ld [bc], a
 	pop bc
 	ret
-; 97881
 
-Script_givecoins: ; 97881
+Script_givecoins:
 ; script command 0x25
 ; parameters:
 ;     coins (CoinByteParam)
@@ -2489,9 +2330,8 @@ Script_givecoins: ; 97881
 	call LoadCoinAmountToMem
 	callba GiveCoins
 	ret
-; 9788b
 
-Script_takecoins: ; 9788b
+Script_takecoins:
 ; script command 0x26
 ; parameters:
 ;     coins (CoinByteParam)
@@ -2499,9 +2339,8 @@ Script_takecoins: ; 9788b
 	call LoadCoinAmountToMem
 	callba TakeCoins
 	ret
-; 97895
 
-Script_checkcoins: ; 97895
+Script_checkcoins:
 ; script command 0x27
 ; parameters:
 ;     coins (CoinByteParam)
@@ -2509,18 +2348,16 @@ Script_checkcoins: ; 97895
 	call LoadCoinAmountToMem
 	callba CheckCoins
 	jr CompareMoneyAction
-; 978a0
 
-LoadCoinAmountToMem: ; 978a0
+LoadCoinAmountToMem:
 	call GetScriptByte
 	ld [hMoneyTemp + 1], a
 	call GetScriptByte
 	ld [hMoneyTemp], a
 	ld bc, hMoneyTemp
 	ret
-; 978ae
 
-Script_checktime: ; 978ae
+Script_checktime:
 ; script command 0x2b
 ; parameters:
 ;     time (SingleByteParam)
@@ -2534,9 +2371,8 @@ Script_checktime: ; 978ae
 	ld a, TRUE
 	ld [ScriptVar], a
 	ret
-; 978c3
 
-Script_checkpoke: ; 978c3
+Script_checkpoke:
 ; script command 0x2c
 ; parameters:
 ;     pkmn (PokemonParam)
@@ -2551,9 +2387,8 @@ Script_checkpoke: ; 978c3
 	ld a, TRUE
 	ld [ScriptVar], a
 	ret
-; 978da
 
-Script_addcellnum: ; 978da
+Script_addcellnum:
 ; script command 0x28
 ; parameters:
 ;     person (SingleByteParam)
@@ -2567,9 +2402,8 @@ Script_addcellnum: ; 978da
 	ld a, TRUE
 	ld [ScriptVar], a
 	ret
-; 978ef
 
-Script_delcellnum: ; 978ef
+Script_delcellnum:
 ; script command 0x29
 ; parameters:
 ;     person (SingleByteParam)
@@ -2583,9 +2417,8 @@ Script_delcellnum: ; 978ef
 	ld a, TRUE
 	ld [ScriptVar], a
 	ret
-; 97904
 
-Script_checkcellnum: ; 97904
+Script_checkcellnum:
 ; script command 0x2a
 ; parameters:
 ;     person (SingleByteParam)
@@ -2600,9 +2433,8 @@ Script_checkcellnum: ; 97904
 	ld a, TRUE
 	ld [ScriptVar], a
 	ret
-; 97919
 
-Script_specialphonecall: ; 97919
+Script_specialphonecall:
 ; script command 0x9c
 ; parameters:
 ;     call_id (MultiByteParam)
@@ -2612,9 +2444,8 @@ Script_specialphonecall: ; 97919
 	call GetScriptByte
 	ld [wSpecialPhoneCallID + 1], a
 	ret
-; 97926
 
-Script_checkphonecall: ; 97926
+Script_checkphonecall:
 ; script command 0x9d
 ; returns false if no special phone call is stored
 
@@ -2625,9 +2456,8 @@ Script_checkphonecall: ; 97926
 .ok
 	ld [ScriptVar], a
 	ret
-; 97932
 
-Script_givepoke: ; 97932
+Script_givepoke:
 ; script command 0x2d
 ; parameters:
 ;     pokemon (PokemonParam)
@@ -2660,9 +2490,8 @@ Script_givepoke: ; 97932
 	ld a, b
 	ld [ScriptVar], a
 	ret
-; 97968
 
-Script_giveegg: ; 97968
+Script_giveegg:
 ; script command 0x2e
 ; parameters:
 ;     pkmn (PokemonParam)
@@ -2681,9 +2510,8 @@ Script_giveegg: ; 97968
 	ld a, 2
 	ld [ScriptVar], a
 	ret
-; 97988
 
-Script_setevent: ; 97988
+Script_setevent:
 ; script command 0x33
 ; parameters:
 ;     bit_number (MultiByteParam)
@@ -2695,9 +2523,8 @@ Script_setevent: ; 97988
 	ld b, SET_FLAG
 	call EventFlagAction
 	ret
-; 97996
 
-Script_clearevent: ; 97996
+Script_clearevent:
 ; script command 0x32
 ; parameters:
 ;     bit_number (MultiByteParam)
@@ -2709,9 +2536,8 @@ Script_clearevent: ; 97996
 	ld b, RESET_FLAG
 	call EventFlagAction
 	ret
-; 979a4
 
-Script_checkevent: ; 979a4
+Script_checkevent:
 ; script command 0x31
 ; parameters:
 ;     bit_number (MultiByteParam)
@@ -2729,9 +2555,8 @@ Script_checkevent: ; 979a4
 .false
 	ld [ScriptVar], a
 	ret
-; 979bb
 
-Script_setflag: ; 979bb
+Script_setflag:
 ; script command 0x36
 ; parameters:
 ;     bit_number (MultiByteParam)
@@ -2743,9 +2568,8 @@ Script_setflag: ; 979bb
 	ld b, SET_FLAG
 	call _EngineFlagAction
 	ret
-; 979c9
 
-Script_clearflag: ; 979c9
+Script_clearflag:
 ; script command 0x35
 ; parameters:
 ;     bit_number (MultiByteParam)
@@ -2757,9 +2581,8 @@ Script_clearflag: ; 979c9
 	ld b, RESET_FLAG
 	call _EngineFlagAction
 	ret
-; 979d7
 
-Script_checkflag: ; 979d7
+Script_checkflag:
 ; script command 0x34
 ; parameters:
 ;     bit_number (MultiByteParam)
@@ -2777,30 +2600,26 @@ Script_checkflag: ; 979d7
 .false
 	ld [ScriptVar], a
 	ret
-; 979ee
 
-_EngineFlagAction: ; 979ee
+_EngineFlagAction:
 	callba EngineFlagAction
 	ret
-; 979f5
 
-Script_wildoff: ; 979f5
+Script_wildoff:
 ; script command 0x38
 
 	ld hl, StatusFlags
 	set 5, [hl]
 	ret
-; 979fb
 
-Script_wildon: ; 979fb
+Script_wildon:
 ; script command 0x37
 
 	ld hl, StatusFlags
 	res 5, [hl]
 	ret
-; 97a01
 
-Script_xycompare: ; 97a01
+Script_xycompare:
 ; script command 0x39
 ; parameters:
 ;     pointer (MultiByteParam)
@@ -2810,9 +2629,8 @@ Script_xycompare: ; 97a01
 	call GetScriptByte
 	ld [wXYComparePointer + 1], a
 	ret
-; 97a0e
 
-Script_warpfacing: ; 97a0e
+Script_warpfacing:
 ; script command 0xa3
 ; parameters:
 ;     facing (SingleByteParam)
@@ -2830,7 +2648,7 @@ Script_warpfacing: ; 97a0e
 	ld [wPlayerSpriteSetupFlags], a
 ; fall through
 
-Script_warp: ; 97a1d
+Script_warp:
 ; script command 0x3c
 ; parameters:
 ;     map_group (MapGroupParam)
@@ -2870,9 +2688,8 @@ Script_warp: ; 97a1d
 	call LoadMapStatus
 	call StopScript
 	ret
-; 97a65
 
-Script_warpmod: ; 97a65
+Script_warpmod:
 ; script command 0x3a
 ; parameters:
 ;     warp_id (SingleByteParam)
@@ -2886,9 +2703,8 @@ Script_warpmod: ; 97a65
 	call GetScriptByte
 	ld [BackupMapNumber], a
 	ret
-; 97a78
 
-Script_blackoutmod: ; 97a78
+Script_blackoutmod:
 ; script command 0x3b
 ; parameters:
 ;     map_group (MapGroupParam)
@@ -2899,17 +2715,15 @@ Script_blackoutmod: ; 97a78
 	call GetScriptByte
 	ld [wLastSpawnMapNumber], a
 	ret
-; 97a85
 
-Script_dontrestartmapmusic: ; 97a85
+Script_dontrestartmapmusic:
 ; script command 0x83
 
 	ld a, 1
 	ld [wDontPlayMapMusicOnReload], a
 	ret
-; 97a8b
 
-Script_writecmdqueue: ; 97a8b
+Script_writecmdqueue:
 ; script command 0x7d
 ; parameters:
 ;     queue_pointer (MultiByteParam)
@@ -2922,9 +2736,8 @@ Script_writecmdqueue: ; 97a8b
 	ld b, a
 	callba WriteCmdQueue ; no need to farcall
 	ret
-; 97a9e
 
-Script_delcmdqueue: ; 97a9e
+Script_delcmdqueue:
 ; script command 0x7e
 ; parameters:
 ;     byte (SingleByteParam)
@@ -2938,9 +2751,8 @@ Script_delcmdqueue: ; 97a9e
 	ld a, 1
 	ld [ScriptVar], a
 	ret
-; 97ab3
 
-Script_changemap: ; 97ab3
+Script_changemap:
 ; script command 0x79
 ; parameters:
 ;     map_data_pointer (MapDataPointerParam)
@@ -2954,9 +2766,8 @@ Script_changemap: ; 97ab3
 	call ChangeMap
 	call BufferScreen
 	ret
-; 97acc
 
-Script_changeblock: ; 97acc
+Script_changeblock:
 ; script command 0x7a
 ; parameters:
 ;     x (SingleByteParam)
@@ -2974,9 +2785,8 @@ Script_changeblock: ; 97acc
 	ld [hl], a
 	call BufferScreen
 	ret
-; 97ae3
 
-Script_reloadmappart:: ; 97ae3
+Script_reloadmappart::
 ; script command 0x7c
 
 	xor a
@@ -2986,23 +2796,20 @@ Script_reloadmappart:: ; 97ae3
 	callba ReloadMapPart
 	call UpdateSprites
 	ret
-; 97af6
 
-Script_warpcheck: ; 97af6
+Script_warpcheck:
 ; script command 0x8e
 
 	call WarpCheck
 	ret nc
 	callba EnableEvents
 	ret
-; 97b01
 
 Script_enableevents: ; unreferenced
 	callba EnableEvents
 	ret
-; 97b08
 
-Script_newloadmap: ; 97b08
+Script_newloadmap:
 ; script command 0x8a
 ; parameters:
 ;     which_method (SingleByteParam)
@@ -3013,23 +2820,20 @@ Script_newloadmap: ; 97b08
 	call LoadMapStatus
 	call StopScript
 	ret
-; 97b16
 
-Script_reloadandreturn: ; 97b16
+Script_reloadandreturn:
 ; script command 0x92
 
 	call Script_newloadmap
 	jp Script_end
-; 97b1c
 
-Script_textbox: ; 97b1c
+Script_textbox:
 ; script command 0x47
 
 	call OpenText
 	ret
-; 97b20
 
-Script_refreshscreen: ; 97b20
+Script_refreshscreen:
 ; script command 0x48
 ; parameters:
 ;     dummy (SingleByteParam)
@@ -3037,9 +2841,8 @@ Script_refreshscreen: ; 97b20
 	call RefreshScreen
 	call GetScriptByte
 	ret
-; 97b27
 
-Script_loadbytec2cf: ; 97b27
+Script_loadbytec2cf:
 ; script command 0x4a
 ; parameters:
 ;     byte (SingleByteParam)
@@ -3047,20 +2850,18 @@ Script_loadbytec2cf: ; 97b27
 	call GetScriptByte
 	ld [wc2cf], a
 	ret
-; 97b2e
 
 	ld c, c ; XXX
 
-Script_closetext: ; 97b2f
+Script_closetext:
 ; script command 0x49
 
 	call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
 	call CloseText
 	ret
-; 97b36
 
 
-Script_passtoengine: ; 97b36
+Script_passtoengine:
 ; script command 0x89
 ; parameters:
 ;     data_pointer (PointerLabelBeforeBank)
@@ -3074,9 +2875,8 @@ Script_passtoengine: ; 97b36
 	pop af
 	call StartAutoInput
 	ret
-; 97b47
 
-Script_pause: ; 97b47
+Script_pause:
 ; script command 0x8b
 ; parameters:
 ;     length (DecimalParam)
@@ -3092,9 +2892,8 @@ Script_pause: ; 97b47
 	dec [hl]
 	jr nz, .loop
 	ret
-; 97b5c
 
-Script_deactivatefacing: ; 97b5c
+Script_deactivatefacing:
 ; script command 0x8c
 ; parameters:
 ;     time (SingleByteParam)
@@ -3108,18 +2907,16 @@ Script_deactivatefacing: ; 97b5c
 	ld [ScriptMode], a
 	call StopScript
 	ret
-; 97b6e
 
-Script_ptpriorityjump: ; 97b6e
+Script_ptpriorityjump:
 ; script command 0x8f
 ; parameters:
 ;     pointer (ScriptPointerLabelParam)
 
 	call StopScript
 	jp Script_jump
-; 97b74
 
-Script_end: ; 97b74
+Script_end:
 ; script command 0x91
 
 	call ExitScriptSubroutine
@@ -3135,9 +2932,8 @@ Script_end: ; 97b74
 	res 0, [hl]
 	call StopScript
 	ret
-; 97b8c
 
-Script_return: ; 97b8c
+Script_return:
 ; script command 0x90
 
 	call ExitScriptSubroutine
@@ -3147,9 +2943,8 @@ Script_return: ; 97b8c
 	res 0, [hl]
 	call StopScript
 	ret
-; 97b9a
 
-ExitScriptSubroutine: ; 97b9a
+ExitScriptSubroutine:
 ; Return carry if there's no parent to return to.
 
 	ld hl, wScriptStackSize
@@ -3178,9 +2973,8 @@ ExitScriptSubroutine: ; 97b9a
 .done
 	scf
 	ret
-; 97bc0
 
-Script_end_all: ; 97bc0
+Script_end_all:
 ; script command 0x93
 
 	xor a
@@ -3192,22 +2986,20 @@ Script_end_all: ; 97bc0
 	res 0, [hl]
 	call StopScript
 	ret
-; 97bd5
 
-Script_halloffame: ; 97bd5
+Script_halloffame:
 ; script command 0xa1
 
 	ld hl, GameTimerPause
 	res 0, [hl]
-	callba Mobile_HallOfFame
-	callba Mobile_HallOfFame2
+	callba TrainerRankings_HallOfFame
+	callba TrainerRankings_HallOfFame2
 	callba HallOfFame
 	ld hl, GameTimerPause
 	set 0, [hl]
 	jr ReturnFromCredits
-; 97bf3
 
-Script_credits: ; 97bf3
+Script_credits:
 ; script command 0xa2
 
 	callba RedCredits
@@ -3217,9 +3009,8 @@ ReturnFromCredits:
 	call LoadMapStatus
 	call StopScript
 	ret
-; 97c051
 
-Script_wait: ; 97c05
+Script_wait:
 ; script command 0xa8
 ; parameters:
 ;     unknown (SingleByteParam)
@@ -3235,23 +3026,20 @@ Script_wait: ; 97c05
 	jr nz, .loop
 	pop bc
 	ret
-; 97c15
 
-Script_check_save: ; 97c15
+Script_check_save:
 ; script command 0xa9
 
 	callba CheckSave
 	ld a, c
 	ld [ScriptVar], a
 	ret
-; 97c20
 
 
-; 97c20 unreferenced
+; unreferenced
 	ld a, [.byte]
 	ld [ScriptVar], a
 	ret
 
 .byte
 	db 0
-; 97c28
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index 00ab1d828..93be28d9a 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -20,7 +20,7 @@ _SlotMachine:
 	call PlaySFX
 	call WaitSFX
 	call ClearBGPalettes
-	callba MobileFn_105fd0
+	callba TrainerRankings_EndSlotsWinStreak
 	ld hl, Options
 	res NO_TEXT_SCROLL, [hl]
 	ld hl, rLCDC ; $ff40
@@ -796,7 +796,7 @@ Function92bd4: ; 92bd4 (24:6bd4)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 ; 92be4 (24:6be4)
 
@@ -1311,7 +1311,7 @@ Slots_CheckMatchedFirstTwoReels: ; 92e94
 	ld l, a
 	ld de, .return
 	push de
-	jp [hl]
+	jp hl
 
 .return
 	ld a, [wFirstTwoReelsMatching]
@@ -1422,7 +1422,7 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d
 	ld l, a
 	ld de, .return
 	push de
-	jp [hl]
+	jp hl
 
 .return
 	ld a, [wSlotMatched]
@@ -1812,7 +1812,7 @@ SlotGetPayout: ; 93124 (24:7124)
 	ld a, [hl]
 	ld [wPayout], a
 	ld d, a
-	callba MobileFn_105fe3
+	callba TrainerRankings_AddToSlotsPayouts
 	ret
 
 .PayoutTable:
@@ -1836,7 +1836,7 @@ SlotPayoutText: ; 93158 (24:7158)
 	jr nz, .MatchedSomething
 	ld hl, .Text_Darn
 	call PrintText
-	callba MobileFn_105fd0
+	callba TrainerRankings_EndSlotsWinStreak
 	ret
 
 .MatchedSomething:
@@ -1855,12 +1855,12 @@ SlotPayoutText: ; 93158 (24:7158)
 	ld l, a
 	ld de, .return
 	push de
-	jp [hl]
+	jp hl
 
 .return
 	ld hl, .Text_PrintPayout
 	call PrintText
-	callba MobileFn_105f9f
+	callba TrainerRankings_AddToSlotsWinStreak
 	ret
 
 ; 93195 (24:7195)
@@ -1958,7 +1958,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Jumptable: ; 9322d (24:722d)
 
@@ -2059,7 +2059,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Jumptable: ; 932bc (24:72bc)
 
diff --git a/engine/specials.asm b/engine/specials.asm
index 841a59cd3..2d9b6f998 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -179,7 +179,7 @@ SpecialsPointers:: ; c029
 	add_special Mobile_SelectThreeMons
 	add_special Function1037eb
 	add_special Function10383c
-	add_special Mobile_HealParty
+	add_special TrainerRankings_Healings
 	add_special RefreshSprites
 	add_special Function1037c2
 	add_special Mobile_DummyReturnFalse
diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm
index 0e25cafdf..a8755b832 100755
--- a/engine/sprite_anims.asm
+++ b/engine/sprite_anims.asm
@@ -9,7 +9,7 @@ DoAnimFrame: ; 8d24b
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 8d25b
 
 .Jumptable: ; 8d25b (23:525b)
@@ -134,7 +134,7 @@ DoAnimFrame: ; 8d24b
 
 .four ; 8d302 (23:5302)
 	call .AnonymousJumptable
-	jp [hl]
+	jp hl
 ; 8d306 (23:5306)
 
 ; Anonymous dw (see .AnonymousJumptable)
@@ -418,7 +418,7 @@ DoAnimFrame: ; 8d24b
 
 .sixteen ; 8d483 (23:5483)
 	call .AnonymousJumptable
-	jp [hl]
+	jp hl
 ; 8d487 (23:5487)
 
 ; Anonymous dw (see .AnonymousJumptable)
diff --git a/engine/startmenu.asm b/engine/startmenu.asm
index bf71a0b8d..a935b8a07 100755
--- a/engine/startmenu.asm
+++ b/engine/startmenu.asm
@@ -55,7 +55,7 @@ StartMenu:: ; 125cd
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .MenuReturns:
 	dw .Reopen
@@ -227,7 +227,7 @@ StartMenu:: ; 125cd
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 127ef
 
 .MenuString: ; 127ef
@@ -701,7 +701,7 @@ PokemonActionSubmenu: ; 12a88
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .nothing
 	ld a, 0
@@ -1255,7 +1255,7 @@ MonMenu_Fly: ; 12e30
 	jr z, .Fail
 	cp $0
 	jr z, .Error
-	callba MobileFn_1060b5
+	callba TrainerRankings_Fly
 	ld b, $4
 	ld a, $2
 	ret
diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm
index 0f144f79c..4b69a4de1 100644
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -107,7 +107,7 @@ PokeCenterNurseScript:
 
 	farwritetext NurseTakePokemonText
 	pause 20
-	special Mobile_HealParty
+	special TrainerRankings_Healings
 	spriteface LAST_TALKED, LEFT
 	pause 10
 	special HealParty
diff --git a/engine/time.asm b/engine/time.asm
index 2112ec35c..296cc335d 100755
--- a/engine/time.asm
+++ b/engine/time.asm
@@ -462,4 +462,4 @@ CopyDayHourMinToHL: ; 1162e
 	ld a, [hMinutes]
 	ld [hli], a
 	ret
-; 11639
\ No newline at end of file
+; 11639
diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm
index e9b19c6f7..263a83fc1 100644
--- a/engine/timeofdaypals.asm
+++ b/engine/timeofdaypals.asm
@@ -250,7 +250,7 @@ GetTimePalette: ; 8c117
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 8c126
 
 .TimePalettes:
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/tmhm2.asm b/engine/tmhm2.asm
index 6efd07294..6e32fdae8 100755
--- a/engine/tmhm2.asm
+++ b/engine/tmhm2.asm
@@ -146,7 +146,7 @@ TeachTMHM: ; 2c867
 	and a
 	jr z, .nope
 
-	callba MobileFn_106049
+	callba TrainerRankings_TMsHMsTaught
 	ld a, [CurItem]
 	call IsHM
 	ret c
diff --git a/engine/trade/animation.asm b/engine/trade/animation.asm
index d90f45a82..fa351ba3d 100755
--- a/engine/trade/animation.asm
+++ b/engine/trade/animation.asm
@@ -232,7 +232,7 @@ DoTradeAnimation: ; 29082
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 290af
 
 .JumpTable: ; 290af
@@ -549,7 +549,7 @@ TradeAnim_TubeAnimJumptable: ; 29281
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 2928f
 
 .Jumptable: ; 2928f
@@ -1173,7 +1173,7 @@ TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 29686
 
 .Jumptable: ; 29686 (a:5686)
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/engine/unown_puzzle.asm b/engine/unown_puzzle.asm
index 8d46a02a6..a1fed2520 100755
--- a/engine/unown_puzzle.asm
+++ b/engine/unown_puzzle.asm
@@ -183,7 +183,7 @@ UnownPuzzleJumptable: ; e12ca
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; e12d9
 
 .Jumptable: ; e12d9
diff --git a/event/bug_contest_judging.asm b/event/bug_contest_judging.asm
index 1ece896d6..0d400bb39 100755
--- a/event/bug_contest_judging.asm
+++ b/event/bug_contest_judging.asm
@@ -1,6 +1,6 @@
 _BugContestJudging: ; 1369d
 	call ContestScore
-	callba MobileFn_105f79
+	callba TrainerRankings_BugContestScore
 	call BugContest_JudgeContestants
 	ld a, [wBugContestThirdPlacePersonID]
 	call LoadContestantName
diff --git a/event/field_moves.asm b/event/field_moves.asm
index c1b3bc236..82660da2f 100755
--- a/event/field_moves.asm
+++ b/event/field_moves.asm
@@ -169,7 +169,7 @@ OWCutJumptable: ; 8ca0c
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 8ca1b
 
 
diff --git a/event/magikarp.asm b/event/magikarp.asm
index 4b024692f..f926196cd 100644
--- a/event/magikarp.asm
+++ b/event/magikarp.asm
@@ -28,7 +28,7 @@ Special_CheckMagikarpLength: ; fbb32
 	ld c, l
 	call CalcMagikarpLength
 	call PrintMagikarpLength
-	callba MagikarpLength_Mobile
+	callba TrainerRankings_MagikarpLength
 	ld hl, .MeasureItText
 	call PrintText
 
diff --git a/event/magnet_train.asm b/event/magnet_train.asm
index ccc41a59d..75bd12cd7 100755
--- a/event/magnet_train.asm
+++ b/event/magnet_train.asm
@@ -299,7 +299,7 @@ MagnetTrain_Jumptable: ; 8cdf7
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 8ce06
 
 .Jumptable: ; 8ce06
diff --git a/event/mom.asm b/event/mom.asm
index 4002f69d2..80513e5fb 100644
--- a/event/mom.asm
+++ b/event/mom.asm
@@ -28,7 +28,7 @@ Special_BankOfMom: ; 16218
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 16242
 
 .dw ; 16242
diff --git a/event/overworld.asm b/event/overworld.asm
index 3906c7d6e..b27093a00 100755
--- a/event/overworld.asm
+++ b/event/overworld.asm
@@ -472,7 +472,7 @@ UsedSurfScript: ; c986
 	end
 
 .empty_fn ; c9a2
-	callba MobileFn_1060bb ; empty
+	callba TrainerRankings_Surf
 	ret
 
 UsedSurfText: ; c9a9
@@ -745,7 +745,7 @@ Script_UsedWaterfall: ; 0xcb20
 	ld a, [PlayerStandingTile]
 	call CheckWaterfallTile
 	ret z
-	callba MobileFn_1060c1
+	callba TrainerRankings_Waterfall
 	ld a, $1
 	ld [ScriptVar], a
 	ret
diff --git a/event/whiteout.asm b/event/whiteout.asm
index a076bdcb6..38049b3b5 100755
--- a/event/whiteout.asm
+++ b/event/whiteout.asm
@@ -49,9 +49,7 @@ BattleBGMap: ; 1250a
 ; 12513
 
 HalveMoney: ; 12513
-
-; Empty function...
-	callba MobileFn_1060c7
+	callba TrainerRankings_WhiteOuts
 
 ; Halve the player's money.
 	ld hl, Money
diff --git a/gfx.py b/gfx.py
index 04aecb5f6..7e4329ec1 100644
--- a/gfx.py
+++ b/gfx.py
@@ -74,7 +74,7 @@ def filepath_rules(filepath):
             args['pic'] = True
             args['animate'] = True
         elif name == 'back':
-            args['pal_file'] = os.path.join(filedir, 'shiny.pal')
+            args['pal_file'] = os.path.join(filedir, 'normal.pal')
             args['pic'] = True
 
     elif 'gfx/trainers' in filedir:
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..30549b26f 100755
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -59,11 +59,11 @@ INCBIN "gfx/mobile/overworld_phone_icon.2bpp"
 ; f8f34
 
 GFX_f8f34: ; unused bold letters + unown chars
-INCBIN "gfx/unknown/0f8f34.w64.1bpp"
+INCBIN "gfx/unknown/0f8f34.1bpp"
 ; f9204
 
 TextBoxSpaceGFX: ; f9204
-INCBIN "gfx/frames/space.2bpp"
+INCBIN "gfx/frames/space.1bpp"
 ; f9214
 
 MobilePhoneTilesGFX: ; f9214
diff --git a/gfx/font/english.1bpp b/gfx/font/english.1bpp
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/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 fa0736ca6..d4fde366e 100755
--- a/gfx/mail.asm
+++ b/gfx/mail.asm
@@ -107,7 +107,7 @@ ReadAnyMail: ; b9237
 	ld de, .done
 	pop bc
 	push de
-	jp [hl]
+	jp hl
 .done
 	ret
 ; b92f8
@@ -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/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/pics.asm b/gfx/pics.asm
index eaf65b7e3..8439e164d 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -17,279 +17,279 @@ TrainerPicPointers:: INCLUDE "gfx/pics/trainer_pic_pointers.asm"
 
 SECTION "Pics 1", ROMX, BANK[PICS_1]
 
-HoOhFrontpic:        INCBIN "gfx/pics/ho_oh/front.2bpp.lz"
-MachampFrontpic:     INCBIN "gfx/pics/machamp/front.2bpp.lz"
-NinetalesFrontpic:   INCBIN "gfx/pics/ninetales/front.2bpp.lz"
-FeraligatrFrontpic:  INCBIN "gfx/pics/feraligatr/front.2bpp.lz"
-NidokingFrontpic:    INCBIN "gfx/pics/nidoking/front.2bpp.lz"
-RaikouFrontpic:      INCBIN "gfx/pics/raikou/front.2bpp.lz"
-LugiaFrontpic:       INCBIN "gfx/pics/lugia/front.2bpp.lz"
-ArticunoFrontpic:    INCBIN "gfx/pics/articuno/front.2bpp.lz"
-TaurosFrontpic:      INCBIN "gfx/pics/tauros/front.2bpp.lz"
-VenusaurFrontpic:    INCBIN "gfx/pics/venusaur/front.2bpp.lz"
-EnteiFrontpic:       INCBIN "gfx/pics/entei/front.2bpp.lz"
-SuicuneFrontpic:     INCBIN "gfx/pics/suicune/front.2bpp.lz"
-TyphlosionFrontpic:  INCBIN "gfx/pics/typhlosion/front.2bpp.lz"
+HoOhFrontpic:        INCBIN "gfx/pics/ho_oh/front.animated.2bpp.lz"
+MachampFrontpic:     INCBIN "gfx/pics/machamp/front.animated.2bpp.lz"
+NinetalesFrontpic:   INCBIN "gfx/pics/ninetales/front.animated.2bpp.lz"
+FeraligatrFrontpic:  INCBIN "gfx/pics/feraligatr/front.animated.2bpp.lz"
+NidokingFrontpic:    INCBIN "gfx/pics/nidoking/front.animated.2bpp.lz"
+RaikouFrontpic:      INCBIN "gfx/pics/raikou/front.animated.2bpp.lz"
+LugiaFrontpic:       INCBIN "gfx/pics/lugia/front.animated.2bpp.lz"
+ArticunoFrontpic:    INCBIN "gfx/pics/articuno/front.animated.2bpp.lz"
+TaurosFrontpic:      INCBIN "gfx/pics/tauros/front.animated.2bpp.lz"
+VenusaurFrontpic:    INCBIN "gfx/pics/venusaur/front.animated.2bpp.lz"
+EnteiFrontpic:       INCBIN "gfx/pics/entei/front.animated.2bpp.lz"
+SuicuneFrontpic:     INCBIN "gfx/pics/suicune/front.animated.2bpp.lz"
+TyphlosionFrontpic:  INCBIN "gfx/pics/typhlosion/front.animated.2bpp.lz"
 ; 123ffa
 
 
 SECTION "Pics 2", ROMX, BANK[PICS_2]
 
-BlastoiseFrontpic:   INCBIN "gfx/pics/blastoise/front.2bpp.lz"
-RapidashFrontpic:    INCBIN "gfx/pics/rapidash/front.2bpp.lz"
-MeganiumFrontpic:    INCBIN "gfx/pics/meganium/front.2bpp.lz"
-NidoqueenFrontpic:   INCBIN "gfx/pics/nidoqueen/front.2bpp.lz"
-HitmonleeFrontpic:   INCBIN "gfx/pics/hitmonlee/front.2bpp.lz"
-ScizorFrontpic:      INCBIN "gfx/pics/scizor/front.2bpp.lz"
-BeedrillFrontpic:    INCBIN "gfx/pics/beedrill/front.2bpp.lz"
-ArcanineFrontpic:    INCBIN "gfx/pics/arcanine/front.2bpp.lz"
-TyranitarFrontpic:   INCBIN "gfx/pics/tyranitar/front.2bpp.lz"
-MoltresFrontpic:     INCBIN "gfx/pics/moltres/front.2bpp.lz"
-ZapdosFrontpic:      INCBIN "gfx/pics/zapdos/front.2bpp.lz"
-ArbokFrontpic:       INCBIN "gfx/pics/arbok/front.2bpp.lz"
-MewtwoFrontpic:      INCBIN "gfx/pics/mewtwo/front.2bpp.lz"
-FearowFrontpic:      INCBIN "gfx/pics/fearow/front.2bpp.lz"
-CharizardFrontpic:   INCBIN "gfx/pics/charizard/front.2bpp.lz"
-QuilavaFrontpic:     INCBIN "gfx/pics/quilava/front.2bpp.lz"
+BlastoiseFrontpic:   INCBIN "gfx/pics/blastoise/front.animated.2bpp.lz"
+RapidashFrontpic:    INCBIN "gfx/pics/rapidash/front.animated.2bpp.lz"
+MeganiumFrontpic:    INCBIN "gfx/pics/meganium/front.animated.2bpp.lz"
+NidoqueenFrontpic:   INCBIN "gfx/pics/nidoqueen/front.animated.2bpp.lz"
+HitmonleeFrontpic:   INCBIN "gfx/pics/hitmonlee/front.animated.2bpp.lz"
+ScizorFrontpic:      INCBIN "gfx/pics/scizor/front.animated.2bpp.lz"
+BeedrillFrontpic:    INCBIN "gfx/pics/beedrill/front.animated.2bpp.lz"
+ArcanineFrontpic:    INCBIN "gfx/pics/arcanine/front.animated.2bpp.lz"
+TyranitarFrontpic:   INCBIN "gfx/pics/tyranitar/front.animated.2bpp.lz"
+MoltresFrontpic:     INCBIN "gfx/pics/moltres/front.animated.2bpp.lz"
+ZapdosFrontpic:      INCBIN "gfx/pics/zapdos/front.animated.2bpp.lz"
+ArbokFrontpic:       INCBIN "gfx/pics/arbok/front.animated.2bpp.lz"
+MewtwoFrontpic:      INCBIN "gfx/pics/mewtwo/front.animated.2bpp.lz"
+FearowFrontpic:      INCBIN "gfx/pics/fearow/front.animated.2bpp.lz"
+CharizardFrontpic:   INCBIN "gfx/pics/charizard/front.animated.2bpp.lz"
+QuilavaFrontpic:     INCBIN "gfx/pics/quilava/front.animated.2bpp.lz"
 ; 127ffe
 
 
 SECTION "Pics 3", ROMX, BANK[PICS_3]
 
-SteelixFrontpic:     INCBIN "gfx/pics/steelix/front.2bpp.lz"
-AlakazamFrontpic:    INCBIN "gfx/pics/alakazam/front.2bpp.lz"
-GyaradosFrontpic:    INCBIN "gfx/pics/gyarados/front.2bpp.lz"
-KangaskhanFrontpic:  INCBIN "gfx/pics/kangaskhan/front.2bpp.lz"
-RhydonFrontpic:      INCBIN "gfx/pics/rhydon/front.2bpp.lz"
-GolduckFrontpic:     INCBIN "gfx/pics/golduck/front.2bpp.lz"
-RhyhornFrontpic:     INCBIN "gfx/pics/rhyhorn/front.2bpp.lz"
-PidgeotFrontpic:     INCBIN "gfx/pics/pidgeot/front.2bpp.lz"
-SlowbroFrontpic:     INCBIN "gfx/pics/slowbro/front.2bpp.lz"
-ButterfreeFrontpic:  INCBIN "gfx/pics/butterfree/front.2bpp.lz"
-WeezingFrontpic:     INCBIN "gfx/pics/weezing/front.2bpp.lz"
-CloysterFrontpic:    INCBIN "gfx/pics/cloyster/front.2bpp.lz"
-SkarmoryFrontpic:    INCBIN "gfx/pics/skarmory/front.2bpp.lz"
-DewgongFrontpic:     INCBIN "gfx/pics/dewgong/front.2bpp.lz"
-VictreebelFrontpic:  INCBIN "gfx/pics/victreebel/front.2bpp.lz"
-RaichuFrontpic:      INCBIN "gfx/pics/raichu/front.2bpp.lz"
-PrimeapeFrontpic:    INCBIN "gfx/pics/primeape/front.2bpp.lz"
+SteelixFrontpic:     INCBIN "gfx/pics/steelix/front.animated.2bpp.lz"
+AlakazamFrontpic:    INCBIN "gfx/pics/alakazam/front.animated.2bpp.lz"
+GyaradosFrontpic:    INCBIN "gfx/pics/gyarados/front.animated.2bpp.lz"
+KangaskhanFrontpic:  INCBIN "gfx/pics/kangaskhan/front.animated.2bpp.lz"
+RhydonFrontpic:      INCBIN "gfx/pics/rhydon/front.animated.2bpp.lz"
+GolduckFrontpic:     INCBIN "gfx/pics/golduck/front.animated.2bpp.lz"
+RhyhornFrontpic:     INCBIN "gfx/pics/rhyhorn/front.animated.2bpp.lz"
+PidgeotFrontpic:     INCBIN "gfx/pics/pidgeot/front.animated.2bpp.lz"
+SlowbroFrontpic:     INCBIN "gfx/pics/slowbro/front.animated.2bpp.lz"
+ButterfreeFrontpic:  INCBIN "gfx/pics/butterfree/front.animated.2bpp.lz"
+WeezingFrontpic:     INCBIN "gfx/pics/weezing/front.animated.2bpp.lz"
+CloysterFrontpic:    INCBIN "gfx/pics/cloyster/front.animated.2bpp.lz"
+SkarmoryFrontpic:    INCBIN "gfx/pics/skarmory/front.animated.2bpp.lz"
+DewgongFrontpic:     INCBIN "gfx/pics/dewgong/front.animated.2bpp.lz"
+VictreebelFrontpic:  INCBIN "gfx/pics/victreebel/front.animated.2bpp.lz"
+RaichuFrontpic:      INCBIN "gfx/pics/raichu/front.animated.2bpp.lz"
+PrimeapeFrontpic:    INCBIN "gfx/pics/primeape/front.animated.2bpp.lz"
 OmastarBackpic:      INCBIN "gfx/pics/omastar/back.2bpp.lz"
 ; 12bffe
 
 
 SECTION "Pics 4", ROMX, BANK[PICS_4]
 
-DodrioFrontpic:      INCBIN "gfx/pics/dodrio/front.2bpp.lz"
-SlowkingFrontpic:    INCBIN "gfx/pics/slowking/front.2bpp.lz"
-HitmontopFrontpic:   INCBIN "gfx/pics/hitmontop/front.2bpp.lz"
-OnixFrontpic:        INCBIN "gfx/pics/onix/front.2bpp.lz"
-BlisseyFrontpic:     INCBIN "gfx/pics/blissey/front.2bpp.lz"
-MachokeFrontpic:     INCBIN "gfx/pics/machoke/front.2bpp.lz"
-DragoniteFrontpic:   INCBIN "gfx/pics/dragonite/front.2bpp.lz"
-PoliwrathFrontpic:   INCBIN "gfx/pics/poliwrath/front.2bpp.lz"
-ScytherFrontpic:     INCBIN "gfx/pics/scyther/front.2bpp.lz"
-AerodactylFrontpic:  INCBIN "gfx/pics/aerodactyl/front.2bpp.lz"
-SeakingFrontpic:     INCBIN "gfx/pics/seaking/front.2bpp.lz"
-MukFrontpic:         INCBIN "gfx/pics/muk/front.2bpp.lz"
-CroconawFrontpic:    INCBIN "gfx/pics/croconaw/front.2bpp.lz"
-HypnoFrontpic:       INCBIN "gfx/pics/hypno/front.2bpp.lz"
-NidorinoFrontpic:    INCBIN "gfx/pics/nidorino/front.2bpp.lz"
-SandslashFrontpic:   INCBIN "gfx/pics/sandslash/front.2bpp.lz"
-JolteonFrontpic:     INCBIN "gfx/pics/jolteon/front.2bpp.lz"
-DonphanFrontpic:     INCBIN "gfx/pics/donphan/front.2bpp.lz"
-PinsirFrontpic:      INCBIN "gfx/pics/pinsir/front.2bpp.lz"
-UnownEFrontpic:      INCBIN "gfx/pics/unown_e/front.2bpp.lz"
+DodrioFrontpic:      INCBIN "gfx/pics/dodrio/front.animated.2bpp.lz"
+SlowkingFrontpic:    INCBIN "gfx/pics/slowking/front.animated.2bpp.lz"
+HitmontopFrontpic:   INCBIN "gfx/pics/hitmontop/front.animated.2bpp.lz"
+OnixFrontpic:        INCBIN "gfx/pics/onix/front.animated.2bpp.lz"
+BlisseyFrontpic:     INCBIN "gfx/pics/blissey/front.animated.2bpp.lz"
+MachokeFrontpic:     INCBIN "gfx/pics/machoke/front.animated.2bpp.lz"
+DragoniteFrontpic:   INCBIN "gfx/pics/dragonite/front.animated.2bpp.lz"
+PoliwrathFrontpic:   INCBIN "gfx/pics/poliwrath/front.animated.2bpp.lz"
+ScytherFrontpic:     INCBIN "gfx/pics/scyther/front.animated.2bpp.lz"
+AerodactylFrontpic:  INCBIN "gfx/pics/aerodactyl/front.animated.2bpp.lz"
+SeakingFrontpic:     INCBIN "gfx/pics/seaking/front.animated.2bpp.lz"
+MukFrontpic:         INCBIN "gfx/pics/muk/front.animated.2bpp.lz"
+CroconawFrontpic:    INCBIN "gfx/pics/croconaw/front.animated.2bpp.lz"
+HypnoFrontpic:       INCBIN "gfx/pics/hypno/front.animated.2bpp.lz"
+NidorinoFrontpic:    INCBIN "gfx/pics/nidorino/front.animated.2bpp.lz"
+SandslashFrontpic:   INCBIN "gfx/pics/sandslash/front.animated.2bpp.lz"
+JolteonFrontpic:     INCBIN "gfx/pics/jolteon/front.animated.2bpp.lz"
+DonphanFrontpic:     INCBIN "gfx/pics/donphan/front.animated.2bpp.lz"
+PinsirFrontpic:      INCBIN "gfx/pics/pinsir/front.animated.2bpp.lz"
+UnownEFrontpic:      INCBIN "gfx/pics/unown_e/front.animated.2bpp.lz"
 ; 130000
 
 
 SECTION "Pics 5", ROMX, BANK[PICS_5]
 
-GolbatFrontpic:      INCBIN "gfx/pics/golbat/front.2bpp.lz"
-KinglerFrontpic:     INCBIN "gfx/pics/kingler/front.2bpp.lz"
-ExeggcuteFrontpic:   INCBIN "gfx/pics/exeggcute/front.2bpp.lz"
-MagcargoFrontpic:    INCBIN "gfx/pics/magcargo/front.2bpp.lz"
-PersianFrontpic:     INCBIN "gfx/pics/persian/front.2bpp.lz"
-StantlerFrontpic:    INCBIN "gfx/pics/stantler/front.2bpp.lz"
-RaticateFrontpic:    INCBIN "gfx/pics/raticate/front.2bpp.lz"
-VenomothFrontpic:    INCBIN "gfx/pics/venomoth/front.2bpp.lz"
-PolitoedFrontpic:    INCBIN "gfx/pics/politoed/front.2bpp.lz"
-ElectabuzzFrontpic:  INCBIN "gfx/pics/electabuzz/front.2bpp.lz"
-MantineFrontpic:     INCBIN "gfx/pics/mantine/front.2bpp.lz"
-LickitungFrontpic:   INCBIN "gfx/pics/lickitung/front.2bpp.lz"
-KingdraFrontpic:     INCBIN "gfx/pics/kingdra/front.2bpp.lz"
-CharmeleonFrontpic:  INCBIN "gfx/pics/charmeleon/front.2bpp.lz"
-KadabraFrontpic:     INCBIN "gfx/pics/kadabra/front.2bpp.lz"
-ExeggutorFrontpic:   INCBIN "gfx/pics/exeggutor/front.2bpp.lz"
-GastlyFrontpic:      INCBIN "gfx/pics/gastly/front.2bpp.lz"
-AzumarillFrontpic:   INCBIN "gfx/pics/azumarill/front.2bpp.lz"
-ParasectFrontpic:    INCBIN "gfx/pics/parasect/front.2bpp.lz"
-MrMimeFrontpic:      INCBIN "gfx/pics/mr__mime/front.2bpp.lz"
-HeracrossFrontpic:   INCBIN "gfx/pics/heracross/front.2bpp.lz"
+GolbatFrontpic:      INCBIN "gfx/pics/golbat/front.animated.2bpp.lz"
+KinglerFrontpic:     INCBIN "gfx/pics/kingler/front.animated.2bpp.lz"
+ExeggcuteFrontpic:   INCBIN "gfx/pics/exeggcute/front.animated.2bpp.lz"
+MagcargoFrontpic:    INCBIN "gfx/pics/magcargo/front.animated.2bpp.lz"
+PersianFrontpic:     INCBIN "gfx/pics/persian/front.animated.2bpp.lz"
+StantlerFrontpic:    INCBIN "gfx/pics/stantler/front.animated.2bpp.lz"
+RaticateFrontpic:    INCBIN "gfx/pics/raticate/front.animated.2bpp.lz"
+VenomothFrontpic:    INCBIN "gfx/pics/venomoth/front.animated.2bpp.lz"
+PolitoedFrontpic:    INCBIN "gfx/pics/politoed/front.animated.2bpp.lz"
+ElectabuzzFrontpic:  INCBIN "gfx/pics/electabuzz/front.animated.2bpp.lz"
+MantineFrontpic:     INCBIN "gfx/pics/mantine/front.animated.2bpp.lz"
+LickitungFrontpic:   INCBIN "gfx/pics/lickitung/front.animated.2bpp.lz"
+KingdraFrontpic:     INCBIN "gfx/pics/kingdra/front.animated.2bpp.lz"
+CharmeleonFrontpic:  INCBIN "gfx/pics/charmeleon/front.animated.2bpp.lz"
+KadabraFrontpic:     INCBIN "gfx/pics/kadabra/front.animated.2bpp.lz"
+ExeggutorFrontpic:   INCBIN "gfx/pics/exeggutor/front.animated.2bpp.lz"
+GastlyFrontpic:      INCBIN "gfx/pics/gastly/front.animated.2bpp.lz"
+AzumarillFrontpic:   INCBIN "gfx/pics/azumarill/front.animated.2bpp.lz"
+ParasectFrontpic:    INCBIN "gfx/pics/parasect/front.animated.2bpp.lz"
+MrMimeFrontpic:      INCBIN "gfx/pics/mr__mime/front.animated.2bpp.lz"
+HeracrossFrontpic:   INCBIN "gfx/pics/heracross/front.animated.2bpp.lz"
 ; 133fff
 
 
 SECTION "Pics 6", ROMX, BANK[PICS_6]
 
-AriadosFrontpic:     INCBIN "gfx/pics/ariados/front.2bpp.lz"
-NoctowlFrontpic:     INCBIN "gfx/pics/noctowl/front.2bpp.lz"
-WartortleFrontpic:   INCBIN "gfx/pics/wartortle/front.2bpp.lz"
-LaprasFrontpic:      INCBIN "gfx/pics/lapras/front.2bpp.lz"
-GolemFrontpic:       INCBIN "gfx/pics/golem/front.2bpp.lz"
-PoliwhirlFrontpic:   INCBIN "gfx/pics/poliwhirl/front.2bpp.lz"
-UrsaringFrontpic:    INCBIN "gfx/pics/ursaring/front.2bpp.lz"
-HoundoomFrontpic:    INCBIN "gfx/pics/houndoom/front.2bpp.lz"
-KabutopsFrontpic:    INCBIN "gfx/pics/kabutops/front.2bpp.lz"
-AmpharosFrontpic:    INCBIN "gfx/pics/ampharos/front.2bpp.lz"
-NidorinaFrontpic:    INCBIN "gfx/pics/nidorina/front.2bpp.lz"
-FlareonFrontpic:     INCBIN "gfx/pics/flareon/front.2bpp.lz"
-FarfetchDFrontpic:   INCBIN "gfx/pics/farfetch_d/front.2bpp.lz"
-VileplumeFrontpic:   INCBIN "gfx/pics/vileplume/front.2bpp.lz"
-BayleefFrontpic:     INCBIN "gfx/pics/bayleef/front.2bpp.lz"
-MagmarFrontpic:      INCBIN "gfx/pics/magmar/front.2bpp.lz"
-TentacruelFrontpic:  INCBIN "gfx/pics/tentacruel/front.2bpp.lz"
-ElekidFrontpic:      INCBIN "gfx/pics/elekid/front.2bpp.lz"
-JumpluffFrontpic:    INCBIN "gfx/pics/jumpluff/front.2bpp.lz"
-MarowakFrontpic:     INCBIN "gfx/pics/marowak/front.2bpp.lz"
-VulpixFrontpic:      INCBIN "gfx/pics/vulpix/front.2bpp.lz"
-GligarFrontpic:      INCBIN "gfx/pics/gligar/front.2bpp.lz"
-DunsparceFrontpic:   INCBIN "gfx/pics/dunsparce/front.2bpp.lz"
+AriadosFrontpic:     INCBIN "gfx/pics/ariados/front.animated.2bpp.lz"
+NoctowlFrontpic:     INCBIN "gfx/pics/noctowl/front.animated.2bpp.lz"
+WartortleFrontpic:   INCBIN "gfx/pics/wartortle/front.animated.2bpp.lz"
+LaprasFrontpic:      INCBIN "gfx/pics/lapras/front.animated.2bpp.lz"
+GolemFrontpic:       INCBIN "gfx/pics/golem/front.animated.2bpp.lz"
+PoliwhirlFrontpic:   INCBIN "gfx/pics/poliwhirl/front.animated.2bpp.lz"
+UrsaringFrontpic:    INCBIN "gfx/pics/ursaring/front.animated.2bpp.lz"
+HoundoomFrontpic:    INCBIN "gfx/pics/houndoom/front.animated.2bpp.lz"
+KabutopsFrontpic:    INCBIN "gfx/pics/kabutops/front.animated.2bpp.lz"
+AmpharosFrontpic:    INCBIN "gfx/pics/ampharos/front.animated.2bpp.lz"
+NidorinaFrontpic:    INCBIN "gfx/pics/nidorina/front.animated.2bpp.lz"
+FlareonFrontpic:     INCBIN "gfx/pics/flareon/front.animated.2bpp.lz"
+FarfetchDFrontpic:   INCBIN "gfx/pics/farfetch_d/front.animated.2bpp.lz"
+VileplumeFrontpic:   INCBIN "gfx/pics/vileplume/front.animated.2bpp.lz"
+BayleefFrontpic:     INCBIN "gfx/pics/bayleef/front.animated.2bpp.lz"
+MagmarFrontpic:      INCBIN "gfx/pics/magmar/front.animated.2bpp.lz"
+TentacruelFrontpic:  INCBIN "gfx/pics/tentacruel/front.animated.2bpp.lz"
+ElekidFrontpic:      INCBIN "gfx/pics/elekid/front.animated.2bpp.lz"
+JumpluffFrontpic:    INCBIN "gfx/pics/jumpluff/front.animated.2bpp.lz"
+MarowakFrontpic:     INCBIN "gfx/pics/marowak/front.animated.2bpp.lz"
+VulpixFrontpic:      INCBIN "gfx/pics/vulpix/front.animated.2bpp.lz"
+GligarFrontpic:      INCBIN "gfx/pics/gligar/front.animated.2bpp.lz"
+DunsparceFrontpic:   INCBIN "gfx/pics/dunsparce/front.animated.2bpp.lz"
 ; 137fff
 
 
 SECTION "Pics 7", ROMX, BANK[PICS_7]
 
-VaporeonFrontpic:    INCBIN "gfx/pics/vaporeon/front.2bpp.lz"
-GirafarigFrontpic:   INCBIN "gfx/pics/girafarig/front.2bpp.lz"
-DrowzeeFrontpic:     INCBIN "gfx/pics/drowzee/front.2bpp.lz"
-SneaselFrontpic:     INCBIN "gfx/pics/sneasel/front.2bpp.lz"
-BellossomFrontpic:   INCBIN "gfx/pics/bellossom/front.2bpp.lz"
-SnorlaxFrontpic:     INCBIN "gfx/pics/snorlax/front.2bpp.lz"
-WigglytuffFrontpic:  INCBIN "gfx/pics/wigglytuff/front.2bpp.lz"
-YanmaFrontpic:       INCBIN "gfx/pics/yanma/front.2bpp.lz"
-SmeargleFrontpic:    INCBIN "gfx/pics/smeargle/front.2bpp.lz"
-ClefableFrontpic:    INCBIN "gfx/pics/clefable/front.2bpp.lz"
-PonytaFrontpic:      INCBIN "gfx/pics/ponyta/front.2bpp.lz"
-MurkrowFrontpic:     INCBIN "gfx/pics/murkrow/front.2bpp.lz"
-GravelerFrontpic:    INCBIN "gfx/pics/graveler/front.2bpp.lz"
-StarmieFrontpic:     INCBIN "gfx/pics/starmie/front.2bpp.lz"
-PidgeottoFrontpic:   INCBIN "gfx/pics/pidgeotto/front.2bpp.lz"
-LedybaFrontpic:      INCBIN "gfx/pics/ledyba/front.2bpp.lz"
-GengarFrontpic:      INCBIN "gfx/pics/gengar/front.2bpp.lz"
-OmastarFrontpic:     INCBIN "gfx/pics/omastar/front.2bpp.lz"
-PiloswineFrontpic:   INCBIN "gfx/pics/piloswine/front.2bpp.lz"
-DugtrioFrontpic:     INCBIN "gfx/pics/dugtrio/front.2bpp.lz"
-MagnetonFrontpic:    INCBIN "gfx/pics/magneton/front.2bpp.lz"
-DragonairFrontpic:   INCBIN "gfx/pics/dragonair/front.2bpp.lz"
-ForretressFrontpic:  INCBIN "gfx/pics/forretress/front.2bpp.lz"
-TogeticFrontpic:     INCBIN "gfx/pics/togetic/front.2bpp.lz"
+VaporeonFrontpic:    INCBIN "gfx/pics/vaporeon/front.animated.2bpp.lz"
+GirafarigFrontpic:   INCBIN "gfx/pics/girafarig/front.animated.2bpp.lz"
+DrowzeeFrontpic:     INCBIN "gfx/pics/drowzee/front.animated.2bpp.lz"
+SneaselFrontpic:     INCBIN "gfx/pics/sneasel/front.animated.2bpp.lz"
+BellossomFrontpic:   INCBIN "gfx/pics/bellossom/front.animated.2bpp.lz"
+SnorlaxFrontpic:     INCBIN "gfx/pics/snorlax/front.animated.2bpp.lz"
+WigglytuffFrontpic:  INCBIN "gfx/pics/wigglytuff/front.animated.2bpp.lz"
+YanmaFrontpic:       INCBIN "gfx/pics/yanma/front.animated.2bpp.lz"
+SmeargleFrontpic:    INCBIN "gfx/pics/smeargle/front.animated.2bpp.lz"
+ClefableFrontpic:    INCBIN "gfx/pics/clefable/front.animated.2bpp.lz"
+PonytaFrontpic:      INCBIN "gfx/pics/ponyta/front.animated.2bpp.lz"
+MurkrowFrontpic:     INCBIN "gfx/pics/murkrow/front.animated.2bpp.lz"
+GravelerFrontpic:    INCBIN "gfx/pics/graveler/front.animated.2bpp.lz"
+StarmieFrontpic:     INCBIN "gfx/pics/starmie/front.animated.2bpp.lz"
+PidgeottoFrontpic:   INCBIN "gfx/pics/pidgeotto/front.animated.2bpp.lz"
+LedybaFrontpic:      INCBIN "gfx/pics/ledyba/front.animated.2bpp.lz"
+GengarFrontpic:      INCBIN "gfx/pics/gengar/front.animated.2bpp.lz"
+OmastarFrontpic:     INCBIN "gfx/pics/omastar/front.animated.2bpp.lz"
+PiloswineFrontpic:   INCBIN "gfx/pics/piloswine/front.animated.2bpp.lz"
+DugtrioFrontpic:     INCBIN "gfx/pics/dugtrio/front.animated.2bpp.lz"
+MagnetonFrontpic:    INCBIN "gfx/pics/magneton/front.animated.2bpp.lz"
+DragonairFrontpic:   INCBIN "gfx/pics/dragonair/front.animated.2bpp.lz"
+ForretressFrontpic:  INCBIN "gfx/pics/forretress/front.animated.2bpp.lz"
+TogeticFrontpic:     INCBIN "gfx/pics/togetic/front.animated.2bpp.lz"
 KangaskhanBackpic:   INCBIN "gfx/pics/kangaskhan/back.2bpp.lz"
 ; 13c000
 
 
 SECTION "Pics 8", ROMX, BANK[PICS_8]
 
-SeelFrontpic:        INCBIN "gfx/pics/seel/front.2bpp.lz"
-CrobatFrontpic:      INCBIN "gfx/pics/crobat/front.2bpp.lz"
-ChanseyFrontpic:     INCBIN "gfx/pics/chansey/front.2bpp.lz"
-TangelaFrontpic:     INCBIN "gfx/pics/tangela/front.2bpp.lz"
-SnubbullFrontpic:    INCBIN "gfx/pics/snubbull/front.2bpp.lz"
-GranbullFrontpic:    INCBIN "gfx/pics/granbull/front.2bpp.lz"
-MiltankFrontpic:     INCBIN "gfx/pics/miltank/front.2bpp.lz"
-HaunterFrontpic:     INCBIN "gfx/pics/haunter/front.2bpp.lz"
-SunfloraFrontpic:    INCBIN "gfx/pics/sunflora/front.2bpp.lz"
-UmbreonFrontpic:     INCBIN "gfx/pics/umbreon/front.2bpp.lz"
-ChikoritaFrontpic:   INCBIN "gfx/pics/chikorita/front.2bpp.lz"
-GoldeenFrontpic:     INCBIN "gfx/pics/goldeen/front.2bpp.lz"
-EspeonFrontpic:      INCBIN "gfx/pics/espeon/front.2bpp.lz"
-XatuFrontpic:        INCBIN "gfx/pics/xatu/front.2bpp.lz"
-MewFrontpic:         INCBIN "gfx/pics/mew/front.2bpp.lz"
-OctilleryFrontpic:   INCBIN "gfx/pics/octillery/front.2bpp.lz"
-JynxFrontpic:        INCBIN "gfx/pics/jynx/front.2bpp.lz"
-WobbuffetFrontpic:   INCBIN "gfx/pics/wobbuffet/front.2bpp.lz"
-DelibirdFrontpic:    INCBIN "gfx/pics/delibird/front.2bpp.lz"
-LedianFrontpic:      INCBIN "gfx/pics/ledian/front.2bpp.lz"
-GloomFrontpic:       INCBIN "gfx/pics/gloom/front.2bpp.lz"
-FlaaffyFrontpic:     INCBIN "gfx/pics/flaaffy/front.2bpp.lz"
-IvysaurFrontpic:     INCBIN "gfx/pics/ivysaur/front.2bpp.lz"
-FurretFrontpic:      INCBIN "gfx/pics/furret/front.2bpp.lz"
-CyndaquilFrontpic:   INCBIN "gfx/pics/cyndaquil/front.2bpp.lz"
-HitmonchanFrontpic:  INCBIN "gfx/pics/hitmonchan/front.2bpp.lz"
-QuagsireFrontpic:    INCBIN "gfx/pics/quagsire/front.2bpp.lz"
+SeelFrontpic:        INCBIN "gfx/pics/seel/front.animated.2bpp.lz"
+CrobatFrontpic:      INCBIN "gfx/pics/crobat/front.animated.2bpp.lz"
+ChanseyFrontpic:     INCBIN "gfx/pics/chansey/front.animated.2bpp.lz"
+TangelaFrontpic:     INCBIN "gfx/pics/tangela/front.animated.2bpp.lz"
+SnubbullFrontpic:    INCBIN "gfx/pics/snubbull/front.animated.2bpp.lz"
+GranbullFrontpic:    INCBIN "gfx/pics/granbull/front.animated.2bpp.lz"
+MiltankFrontpic:     INCBIN "gfx/pics/miltank/front.animated.2bpp.lz"
+HaunterFrontpic:     INCBIN "gfx/pics/haunter/front.animated.2bpp.lz"
+SunfloraFrontpic:    INCBIN "gfx/pics/sunflora/front.animated.2bpp.lz"
+UmbreonFrontpic:     INCBIN "gfx/pics/umbreon/front.animated.2bpp.lz"
+ChikoritaFrontpic:   INCBIN "gfx/pics/chikorita/front.animated.2bpp.lz"
+GoldeenFrontpic:     INCBIN "gfx/pics/goldeen/front.animated.2bpp.lz"
+EspeonFrontpic:      INCBIN "gfx/pics/espeon/front.animated.2bpp.lz"
+XatuFrontpic:        INCBIN "gfx/pics/xatu/front.animated.2bpp.lz"
+MewFrontpic:         INCBIN "gfx/pics/mew/front.animated.2bpp.lz"
+OctilleryFrontpic:   INCBIN "gfx/pics/octillery/front.animated.2bpp.lz"
+JynxFrontpic:        INCBIN "gfx/pics/jynx/front.animated.2bpp.lz"
+WobbuffetFrontpic:   INCBIN "gfx/pics/wobbuffet/front.animated.2bpp.lz"
+DelibirdFrontpic:    INCBIN "gfx/pics/delibird/front.animated.2bpp.lz"
+LedianFrontpic:      INCBIN "gfx/pics/ledian/front.animated.2bpp.lz"
+GloomFrontpic:       INCBIN "gfx/pics/gloom/front.animated.2bpp.lz"
+FlaaffyFrontpic:     INCBIN "gfx/pics/flaaffy/front.animated.2bpp.lz"
+IvysaurFrontpic:     INCBIN "gfx/pics/ivysaur/front.animated.2bpp.lz"
+FurretFrontpic:      INCBIN "gfx/pics/furret/front.animated.2bpp.lz"
+CyndaquilFrontpic:   INCBIN "gfx/pics/cyndaquil/front.animated.2bpp.lz"
+HitmonchanFrontpic:  INCBIN "gfx/pics/hitmonchan/front.animated.2bpp.lz"
+QuagsireFrontpic:    INCBIN "gfx/pics/quagsire/front.animated.2bpp.lz"
 ; 13fff7
 
 
 SECTION "Pics 9", ROMX, BANK[PICS_9]
 
-EkansFrontpic:       INCBIN "gfx/pics/ekans/front.2bpp.lz"
-SudowoodoFrontpic:   INCBIN "gfx/pics/sudowoodo/front.2bpp.lz"
-PikachuFrontpic:     INCBIN "gfx/pics/pikachu/front.2bpp.lz"
-SeadraFrontpic:      INCBIN "gfx/pics/seadra/front.2bpp.lz"
-MagbyFrontpic:       INCBIN "gfx/pics/magby/front.2bpp.lz"
-WeepinbellFrontpic:  INCBIN "gfx/pics/weepinbell/front.2bpp.lz"
-TotodileFrontpic:    INCBIN "gfx/pics/totodile/front.2bpp.lz"
-CorsolaFrontpic:     INCBIN "gfx/pics/corsola/front.2bpp.lz"
+EkansFrontpic:       INCBIN "gfx/pics/ekans/front.animated.2bpp.lz"
+SudowoodoFrontpic:   INCBIN "gfx/pics/sudowoodo/front.animated.2bpp.lz"
+PikachuFrontpic:     INCBIN "gfx/pics/pikachu/front.animated.2bpp.lz"
+SeadraFrontpic:      INCBIN "gfx/pics/seadra/front.animated.2bpp.lz"
+MagbyFrontpic:       INCBIN "gfx/pics/magby/front.animated.2bpp.lz"
+WeepinbellFrontpic:  INCBIN "gfx/pics/weepinbell/front.animated.2bpp.lz"
+TotodileFrontpic:    INCBIN "gfx/pics/totodile/front.animated.2bpp.lz"
+CorsolaFrontpic:     INCBIN "gfx/pics/corsola/front.animated.2bpp.lz"
 FirebreatherPic:     INCBIN "gfx/trainers/firebreather.2bpp.lz"
-MachopFrontpic:      INCBIN "gfx/pics/machop/front.2bpp.lz"
-ChinchouFrontpic:    INCBIN "gfx/pics/chinchou/front.2bpp.lz"
-RattataFrontpic:     INCBIN "gfx/pics/rattata/front.2bpp.lz"
+MachopFrontpic:      INCBIN "gfx/pics/machop/front.animated.2bpp.lz"
+ChinchouFrontpic:    INCBIN "gfx/pics/chinchou/front.animated.2bpp.lz"
+RattataFrontpic:     INCBIN "gfx/pics/rattata/front.animated.2bpp.lz"
 ChampionPic:         INCBIN "gfx/trainers/champion.2bpp.lz"
-SpearowFrontpic:     INCBIN "gfx/pics/spearow/front.2bpp.lz"
-MagikarpFrontpic:    INCBIN "gfx/pics/magikarp/front.2bpp.lz"
-CharmanderFrontpic:  INCBIN "gfx/pics/charmander/front.2bpp.lz"
-CuboneFrontpic:      INCBIN "gfx/pics/cubone/front.2bpp.lz"
+SpearowFrontpic:     INCBIN "gfx/pics/spearow/front.animated.2bpp.lz"
+MagikarpFrontpic:    INCBIN "gfx/pics/magikarp/front.animated.2bpp.lz"
+CharmanderFrontpic:  INCBIN "gfx/pics/charmander/front.animated.2bpp.lz"
+CuboneFrontpic:      INCBIN "gfx/pics/cubone/front.animated.2bpp.lz"
 BlackbeltTPic:       INCBIN "gfx/trainers/blackbelt_t.2bpp.lz"
 BikerPic:            INCBIN "gfx/trainers/biker.2bpp.lz"
-NidoranMFrontpic:    INCBIN "gfx/pics/nidoran_m/front.2bpp.lz"
-PorygonFrontpic:     INCBIN "gfx/pics/porygon/front.2bpp.lz"
+NidoranMFrontpic:    INCBIN "gfx/pics/nidoran_m/front.animated.2bpp.lz"
+PorygonFrontpic:     INCBIN "gfx/pics/porygon/front.animated.2bpp.lz"
 BrunoPic:            INCBIN "gfx/trainers/bruno.2bpp.lz"
-GrimerFrontpic:      INCBIN "gfx/pics/grimer/front.2bpp.lz"
-StaryuFrontpic:      INCBIN "gfx/pics/staryu/front.2bpp.lz"
+GrimerFrontpic:      INCBIN "gfx/pics/grimer/front.animated.2bpp.lz"
+StaryuFrontpic:      INCBIN "gfx/pics/staryu/front.animated.2bpp.lz"
 HikerPic:            INCBIN "gfx/trainers/hiker.2bpp.lz"
-MeowthFrontpic:      INCBIN "gfx/pics/meowth/front.2bpp.lz"
-Porygon2Frontpic:    INCBIN "gfx/pics/porygon2/front.2bpp.lz"
-SandshrewFrontpic:   INCBIN "gfx/pics/sandshrew/front.2bpp.lz"
-NidoranFFrontpic:    INCBIN "gfx/pics/nidoran_f/front.2bpp.lz"
-PidgeyFrontpic:      INCBIN "gfx/pics/pidgey/front.2bpp.lz"
+MeowthFrontpic:      INCBIN "gfx/pics/meowth/front.animated.2bpp.lz"
+Porygon2Frontpic:    INCBIN "gfx/pics/porygon2/front.animated.2bpp.lz"
+SandshrewFrontpic:   INCBIN "gfx/pics/sandshrew/front.animated.2bpp.lz"
+NidoranFFrontpic:    INCBIN "gfx/pics/nidoran_f/front.animated.2bpp.lz"
+PidgeyFrontpic:      INCBIN "gfx/pics/pidgey/front.animated.2bpp.lz"
 ParasectBackpic:     INCBIN "gfx/pics/parasect/back.2bpp.lz"
 ; 144000
 
 
 SECTION "Pics 10", ROMX, BANK[PICS_10]
 
-MisdreavusFrontpic:  INCBIN "gfx/pics/misdreavus/front.2bpp.lz"
-HoundourFrontpic:    INCBIN "gfx/pics/houndour/front.2bpp.lz"
-MankeyFrontpic:      INCBIN "gfx/pics/mankey/front.2bpp.lz"
-CelebiFrontpic:      INCBIN "gfx/pics/celebi/front.2bpp.lz"
+MisdreavusFrontpic:  INCBIN "gfx/pics/misdreavus/front.animated.2bpp.lz"
+HoundourFrontpic:    INCBIN "gfx/pics/houndour/front.animated.2bpp.lz"
+MankeyFrontpic:      INCBIN "gfx/pics/mankey/front.animated.2bpp.lz"
+CelebiFrontpic:      INCBIN "gfx/pics/celebi/front.animated.2bpp.lz"
 MediumPic:           INCBIN "gfx/trainers/medium.2bpp.lz"
-PinecoFrontpic:      INCBIN "gfx/pics/pineco/front.2bpp.lz"
-KrabbyFrontpic:      INCBIN "gfx/pics/krabby/front.2bpp.lz"
+PinecoFrontpic:      INCBIN "gfx/pics/pineco/front.animated.2bpp.lz"
+KrabbyFrontpic:      INCBIN "gfx/pics/krabby/front.animated.2bpp.lz"
 FisherPic:           INCBIN "gfx/trainers/fisher.2bpp.lz"
-JigglypuffFrontpic:  INCBIN "gfx/pics/jigglypuff/front.2bpp.lz"
-ParasFrontpic:       INCBIN "gfx/pics/paras/front.2bpp.lz"
+JigglypuffFrontpic:  INCBIN "gfx/pics/jigglypuff/front.animated.2bpp.lz"
+ParasFrontpic:       INCBIN "gfx/pics/paras/front.animated.2bpp.lz"
 NidokingBackpic:     INCBIN "gfx/pics/nidoking/back.2bpp.lz"
 PokefanmPic:         INCBIN "gfx/trainers/pokefan_m.2bpp.lz"
 BoarderPic:          INCBIN "gfx/trainers/boarder.2bpp.lz"
-PsyduckFrontpic:     INCBIN "gfx/pics/psyduck/front.2bpp.lz"
-SquirtleFrontpic:    INCBIN "gfx/pics/squirtle/front.2bpp.lz"
+PsyduckFrontpic:     INCBIN "gfx/pics/psyduck/front.animated.2bpp.lz"
+SquirtleFrontpic:    INCBIN "gfx/pics/squirtle/front.animated.2bpp.lz"
 MachampBackpic:      INCBIN "gfx/pics/machamp/back.2bpp.lz"
-KoffingFrontpic:     INCBIN "gfx/pics/koffing/front.2bpp.lz"
-VenonatFrontpic:     INCBIN "gfx/pics/venonat/front.2bpp.lz"
+KoffingFrontpic:     INCBIN "gfx/pics/koffing/front.animated.2bpp.lz"
+VenonatFrontpic:     INCBIN "gfx/pics/venonat/front.animated.2bpp.lz"
 ExeggutorBackpic:    INCBIN "gfx/pics/exeggutor/back.2bpp.lz"
-LanturnFrontpic:     INCBIN "gfx/pics/lanturn/front.2bpp.lz"
-TyrogueFrontpic:     INCBIN "gfx/pics/tyrogue/front.2bpp.lz"
-SkiploomFrontpic:    INCBIN "gfx/pics/skiploom/front.2bpp.lz"
-MareepFrontpic:      INCBIN "gfx/pics/mareep/front.2bpp.lz"
+LanturnFrontpic:     INCBIN "gfx/pics/lanturn/front.animated.2bpp.lz"
+TyrogueFrontpic:     INCBIN "gfx/pics/tyrogue/front.animated.2bpp.lz"
+SkiploomFrontpic:    INCBIN "gfx/pics/skiploom/front.animated.2bpp.lz"
+MareepFrontpic:      INCBIN "gfx/pics/mareep/front.animated.2bpp.lz"
 ChuckPic:            INCBIN "gfx/trainers/chuck.2bpp.lz"
-EeveeFrontpic:       INCBIN "gfx/pics/eevee/front.2bpp.lz"
+EeveeFrontpic:       INCBIN "gfx/pics/eevee/front.animated.2bpp.lz"
 ButterfreeBackpic:   INCBIN "gfx/pics/butterfree/back.2bpp.lz"
-ZubatFrontpic:       INCBIN "gfx/pics/zubat/front.2bpp.lz"
+ZubatFrontpic:       INCBIN "gfx/pics/zubat/front.animated.2bpp.lz"
 KimonoGirlPic:       INCBIN "gfx/trainers/kimono_girl.2bpp.lz"
 AlakazamBackpic:     INCBIN "gfx/pics/alakazam/back.2bpp.lz"
-AipomFrontpic:       INCBIN "gfx/pics/aipom/front.2bpp.lz"
-AbraFrontpic:        INCBIN "gfx/pics/abra/front.2bpp.lz"
+AipomFrontpic:       INCBIN "gfx/pics/aipom/front.animated.2bpp.lz"
+AbraFrontpic:        INCBIN "gfx/pics/abra/front.animated.2bpp.lz"
 HitmontopBackpic:    INCBIN "gfx/pics/hitmontop/back.2bpp.lz"
 CloysterBackpic:     INCBIN "gfx/pics/cloyster/back.2bpp.lz"
-HoothootFrontpic:    INCBIN "gfx/pics/hoothoot/front.2bpp.lz"
+HoothootFrontpic:    INCBIN "gfx/pics/hoothoot/front.animated.2bpp.lz"
 UnownFBackpic:       INCBIN "gfx/pics/unown_f/back.2bpp.lz"
 ; 148000
 
@@ -297,36 +297,36 @@ UnownFBackpic:       INCBIN "gfx/pics/unown_f/back.2bpp.lz"
 SECTION "Pics 11", ROMX, BANK[PICS_11]
 
 DodrioBackpic:       INCBIN "gfx/pics/dodrio/back.2bpp.lz"
-ClefairyFrontpic:    INCBIN "gfx/pics/clefairy/front.2bpp.lz"
-SlugmaFrontpic:      INCBIN "gfx/pics/slugma/front.2bpp.lz"
-GrowlitheFrontpic:   INCBIN "gfx/pics/growlithe/front.2bpp.lz"
-SlowpokeFrontpic:    INCBIN "gfx/pics/slowpoke/front.2bpp.lz"
-SmoochumFrontpic:    INCBIN "gfx/pics/smoochum/front.2bpp.lz"
+ClefairyFrontpic:    INCBIN "gfx/pics/clefairy/front.animated.2bpp.lz"
+SlugmaFrontpic:      INCBIN "gfx/pics/slugma/front.animated.2bpp.lz"
+GrowlitheFrontpic:   INCBIN "gfx/pics/growlithe/front.animated.2bpp.lz"
+SlowpokeFrontpic:    INCBIN "gfx/pics/slowpoke/front.animated.2bpp.lz"
+SmoochumFrontpic:    INCBIN "gfx/pics/smoochum/front.animated.2bpp.lz"
 JugglerPic:          INCBIN "gfx/trainers/juggler.2bpp.lz"
-MarillFrontpic:      INCBIN "gfx/pics/marill/front.2bpp.lz"
+MarillFrontpic:      INCBIN "gfx/pics/marill/front.animated.2bpp.lz"
 GuitaristPic:        INCBIN "gfx/trainers/guitarist.2bpp.lz"
 PokefanfPic:         INCBIN "gfx/trainers/pokefan_f.2bpp.lz"
 VenomothBackpic:     INCBIN "gfx/pics/venomoth/back.2bpp.lz"
 ClairPic:            INCBIN "gfx/trainers/clair.2bpp.lz"
 PokemaniacPic:       INCBIN "gfx/trainers/pokemaniac.2bpp.lz"
-OmanyteFrontpic:     INCBIN "gfx/pics/omanyte/front.2bpp.lz"
+OmanyteFrontpic:     INCBIN "gfx/pics/omanyte/front.animated.2bpp.lz"
 SkierPic:            INCBIN "gfx/trainers/skier.2bpp.lz"
-PupitarFrontpic:     INCBIN "gfx/pics/pupitar/front.2bpp.lz"
-BellsproutFrontpic:  INCBIN "gfx/pics/bellsprout/front.2bpp.lz"
-ShellderFrontpic:    INCBIN "gfx/pics/shellder/front.2bpp.lz"
-TentacoolFrontpic:   INCBIN "gfx/pics/tentacool/front.2bpp.lz"
-CleffaFrontpic:      INCBIN "gfx/pics/cleffa/front.2bpp.lz"
+PupitarFrontpic:     INCBIN "gfx/pics/pupitar/front.animated.2bpp.lz"
+BellsproutFrontpic:  INCBIN "gfx/pics/bellsprout/front.animated.2bpp.lz"
+ShellderFrontpic:    INCBIN "gfx/pics/shellder/front.animated.2bpp.lz"
+TentacoolFrontpic:   INCBIN "gfx/pics/tentacool/front.animated.2bpp.lz"
+CleffaFrontpic:      INCBIN "gfx/pics/cleffa/front.animated.2bpp.lz"
 GyaradosBackpic:     INCBIN "gfx/pics/gyarados/back.2bpp.lz"
 NinetalesBackpic:    INCBIN "gfx/pics/ninetales/back.2bpp.lz"
 YanmaBackpic:        INCBIN "gfx/pics/yanma/back.2bpp.lz"
 PinsirBackpic:       INCBIN "gfx/pics/pinsir/back.2bpp.lz"
 LassPic:             INCBIN "gfx/trainers/lass.2bpp.lz"
 ClefableBackpic:     INCBIN "gfx/pics/clefable/back.2bpp.lz"
-DoduoFrontpic:       INCBIN "gfx/pics/doduo/front.2bpp.lz"
+DoduoFrontpic:       INCBIN "gfx/pics/doduo/front.animated.2bpp.lz"
 FeraligatrBackpic:   INCBIN "gfx/pics/feraligatr/back.2bpp.lz"
-DratiniFrontpic:     INCBIN "gfx/pics/dratini/front.2bpp.lz"
+DratiniFrontpic:     INCBIN "gfx/pics/dratini/front.animated.2bpp.lz"
 MagnetonBackpic:     INCBIN "gfx/pics/magneton/back.2bpp.lz"
-QwilfishFrontpic:    INCBIN "gfx/pics/qwilfish/front.2bpp.lz"
+QwilfishFrontpic:    INCBIN "gfx/pics/qwilfish/front.animated.2bpp.lz"
 SuicuneBackpic:      INCBIN "gfx/pics/suicune/back.2bpp.lz"
 SlowkingBackpic:     INCBIN "gfx/pics/slowking/back.2bpp.lz"
 ElekidBackpic:       INCBIN "gfx/pics/elekid/back.2bpp.lz"
@@ -342,9 +342,9 @@ SECTION "Pics 12", ROMX, BANK[PICS_12]
 VenusaurBackpic:     INCBIN "gfx/pics/venusaur/back.2bpp.lz"
 MoltresBackpic:      INCBIN "gfx/pics/moltres/back.2bpp.lz"
 SunfloraBackpic:     INCBIN "gfx/pics/sunflora/back.2bpp.lz"
-PhanpyFrontpic:      INCBIN "gfx/pics/phanpy/front.2bpp.lz"
+PhanpyFrontpic:      INCBIN "gfx/pics/phanpy/front.animated.2bpp.lz"
 RhydonBackpic:       INCBIN "gfx/pics/rhydon/back.2bpp.lz"
-LarvitarFrontpic:    INCBIN "gfx/pics/larvitar/front.2bpp.lz"
+LarvitarFrontpic:    INCBIN "gfx/pics/larvitar/front.animated.2bpp.lz"
 TyranitarBackpic:    INCBIN "gfx/pics/tyranitar/back.2bpp.lz"
 SandslashBackpic:    INCBIN "gfx/pics/sandslash/back.2bpp.lz"
 SeadraBackpic:       INCBIN "gfx/pics/seadra/back.2bpp.lz"
@@ -354,10 +354,10 @@ NidoranMBackpic:     INCBIN "gfx/pics/nidoran_m/back.2bpp.lz"
 LedybaBackpic:       INCBIN "gfx/pics/ledyba/back.2bpp.lz"
 CyndaquilBackpic:    INCBIN "gfx/pics/cyndaquil/back.2bpp.lz"
 BayleefBackpic:      INCBIN "gfx/pics/bayleef/back.2bpp.lz"
-OddishFrontpic:      INCBIN "gfx/pics/oddish/front.2bpp.lz"
+OddishFrontpic:      INCBIN "gfx/pics/oddish/front.animated.2bpp.lz"
 RapidashBackpic:     INCBIN "gfx/pics/rapidash/back.2bpp.lz"
 DoduoBackpic:        INCBIN "gfx/pics/doduo/back.2bpp.lz"
-HoppipFrontpic:      INCBIN "gfx/pics/hoppip/front.2bpp.lz"
+HoppipFrontpic:      INCBIN "gfx/pics/hoppip/front.animated.2bpp.lz"
 MankeyBackpic:       INCBIN "gfx/pics/mankey/back.2bpp.lz"
 MagmarBackpic:       INCBIN "gfx/pics/magmar/back.2bpp.lz"
 HypnoBackpic:        INCBIN "gfx/pics/hypno/back.2bpp.lz"
@@ -368,7 +368,7 @@ SailorPic:           INCBIN "gfx/trainers/sailor.2bpp.lz"
 BeautyPic:           INCBIN "gfx/trainers/beauty.2bpp.lz"
 ShellderBackpic:     INCBIN "gfx/pics/shellder/back.2bpp.lz"
 ZubatBackpic:        INCBIN "gfx/pics/zubat/back.2bpp.lz"
-TeddiursaFrontpic:   INCBIN "gfx/pics/teddiursa/front.2bpp.lz"
+TeddiursaFrontpic:   INCBIN "gfx/pics/teddiursa/front.animated.2bpp.lz"
 CuboneBackpic:       INCBIN "gfx/pics/cubone/back.2bpp.lz"
 GruntmPic:           INCBIN "gfx/trainers/grunt_m.2bpp.lz"
 GloomBackpic:        INCBIN "gfx/pics/gloom/back.2bpp.lz"
@@ -378,7 +378,7 @@ BeedrillBackpic:     INCBIN "gfx/pics/beedrill/back.2bpp.lz"
 ArcanineBackpic:     INCBIN "gfx/pics/arcanine/back.2bpp.lz"
 FlareonBackpic:      INCBIN "gfx/pics/flareon/back.2bpp.lz"
 GoldeenBackpic:      INCBIN "gfx/pics/goldeen/back.2bpp.lz"
-BulbasaurFrontpic:   INCBIN "gfx/pics/bulbasaur/front.2bpp.lz"
+BulbasaurFrontpic:   INCBIN "gfx/pics/bulbasaur/front.animated.2bpp.lz"
 StarmieBackpic:      INCBIN "gfx/pics/starmie/back.2bpp.lz"
 ; 150000
 
@@ -393,23 +393,23 @@ GligarBackpic:       INCBIN "gfx/pics/gligar/back.2bpp.lz"
 TyphlosionBackpic:   INCBIN "gfx/pics/typhlosion/back.2bpp.lz"
 CharmeleonBackpic:   INCBIN "gfx/pics/charmeleon/back.2bpp.lz"
 NidoqueenBackpic:    INCBIN "gfx/pics/nidoqueen/back.2bpp.lz"
-PichuFrontpic:       INCBIN "gfx/pics/pichu/front.2bpp.lz"
+PichuFrontpic:       INCBIN "gfx/pics/pichu/front.animated.2bpp.lz"
 ElectabuzzBackpic:   INCBIN "gfx/pics/electabuzz/back.2bpp.lz"
 LedianBackpic:       INCBIN "gfx/pics/ledian/back.2bpp.lz"
 PupitarBackpic:      INCBIN "gfx/pics/pupitar/back.2bpp.lz"
 HeracrossBackpic:    INCBIN "gfx/pics/heracross/back.2bpp.lz"
-UnownDFrontpic:      INCBIN "gfx/pics/unown_d/front.2bpp.lz"
+UnownDFrontpic:      INCBIN "gfx/pics/unown_d/front.animated.2bpp.lz"
 MiltankBackpic:      INCBIN "gfx/pics/miltank/back.2bpp.lz"
 SteelixBackpic:      INCBIN "gfx/pics/steelix/back.2bpp.lz"
 PersianBackpic:      INCBIN "gfx/pics/persian/back.2bpp.lz"
 LtSurgePic:          INCBIN "gfx/trainers/lt_surge.2bpp.lz"
 TeacherPic:          INCBIN "gfx/trainers/teacher.2bpp.lz"
-EggPic:              INCBIN "gfx/pics/egg/front.2bpp.lz"
+EggPic:              INCBIN "gfx/pics/egg/front.animated.2bpp.lz"
 EeveeBackpic:        INCBIN "gfx/pics/eevee/back.2bpp.lz"
-ShuckleFrontpic:     INCBIN "gfx/pics/shuckle/front.2bpp.lz"
+ShuckleFrontpic:     INCBIN "gfx/pics/shuckle/front.animated.2bpp.lz"
 PonytaBackpic:       INCBIN "gfx/pics/ponyta/back.2bpp.lz"
-RemoraidFrontpic:    INCBIN "gfx/pics/remoraid/front.2bpp.lz"
-PoliwagFrontpic:     INCBIN "gfx/pics/poliwag/front.2bpp.lz"
+RemoraidFrontpic:    INCBIN "gfx/pics/remoraid/front.animated.2bpp.lz"
+PoliwagFrontpic:     INCBIN "gfx/pics/poliwag/front.animated.2bpp.lz"
 OnixBackpic:         INCBIN "gfx/pics/onix/back.2bpp.lz"
 KoffingBackpic:      INCBIN "gfx/pics/koffing/back.2bpp.lz"
 BirdKeeperPic:       INCBIN "gfx/trainers/bird_keeper.2bpp.lz"
@@ -423,11 +423,11 @@ MachokeBackpic:      INCBIN "gfx/pics/machoke/back.2bpp.lz"
 RaichuBackpic:       INCBIN "gfx/pics/raichu/back.2bpp.lz"
 PoliwrathBackpic:    INCBIN "gfx/pics/poliwrath/back.2bpp.lz"
 SwimmermPic:         INCBIN "gfx/trainers/swimmer_m.2bpp.lz"
-SunkernFrontpic:     INCBIN "gfx/pics/sunkern/front.2bpp.lz"
+SunkernFrontpic:     INCBIN "gfx/pics/sunkern/front.animated.2bpp.lz"
 NidorinoBackpic:     INCBIN "gfx/pics/nidorino/back.2bpp.lz"
 MysticalmanPic:      INCBIN "gfx/trainers/mysticalman.2bpp.lz"
 CooltrainerfPic:     INCBIN "gfx/trainers/cooltrainer_f.2bpp.lz"
-ElectrodeFrontpic:   INCBIN "gfx/pics/electrode/front.2bpp.lz"
+ElectrodeFrontpic:   INCBIN "gfx/pics/electrode/front.animated.2bpp.lz"
 ; 153fe3
 
 
@@ -435,7 +435,7 @@ SECTION "Pics 14", ROMX, BANK[PICS_14]
 
 SudowoodoBackpic:    INCBIN "gfx/pics/sudowoodo/back.2bpp.lz"
 FlaaffyBackpic:      INCBIN "gfx/pics/flaaffy/back.2bpp.lz"
-SentretFrontpic:     INCBIN "gfx/pics/sentret/front.2bpp.lz"
+SentretFrontpic:     INCBIN "gfx/pics/sentret/front.animated.2bpp.lz"
 TogeticBackpic:      INCBIN "gfx/pics/togetic/back.2bpp.lz"
 BugsyPic:            INCBIN "gfx/trainers/bugsy.2bpp.lz"
 MarowakBackpic:      INCBIN "gfx/pics/marowak/back.2bpp.lz"
@@ -448,7 +448,7 @@ CooltrainermPic:     INCBIN "gfx/trainers/cooltrainer_m.2bpp.lz"
 BlastoiseBackpic:    INCBIN "gfx/pics/blastoise/back.2bpp.lz"
 MisdreavusBackpic:   INCBIN "gfx/pics/misdreavus/back.2bpp.lz"
 TyrogueBackpic:      INCBIN "gfx/pics/tyrogue/back.2bpp.lz"
-GeodudeFrontpic:     INCBIN "gfx/pics/geodude/front.2bpp.lz"
+GeodudeFrontpic:     INCBIN "gfx/pics/geodude/front.animated.2bpp.lz"
 ScizorBackpic:       INCBIN "gfx/pics/scizor/back.2bpp.lz"
 GirafarigBackpic:    INCBIN "gfx/pics/girafarig/back.2bpp.lz"
 StantlerBackpic:     INCBIN "gfx/pics/stantler/back.2bpp.lz"
@@ -459,7 +459,7 @@ PrimeapeBackpic:     INCBIN "gfx/pics/primeape/back.2bpp.lz"
 FurretBackpic:       INCBIN "gfx/pics/furret/back.2bpp.lz"
 WartortleBackpic:    INCBIN "gfx/pics/wartortle/back.2bpp.lz"
 ExeggcuteBackpic:    INCBIN "gfx/pics/exeggcute/back.2bpp.lz"
-IgglybuffFrontpic:   INCBIN "gfx/pics/igglybuff/front.2bpp.lz"
+IgglybuffFrontpic:   INCBIN "gfx/pics/igglybuff/front.animated.2bpp.lz"
 RaticateBackpic:     INCBIN "gfx/pics/raticate/back.2bpp.lz"
 VulpixBackpic:       INCBIN "gfx/pics/vulpix/back.2bpp.lz"
 EkansBackpic:        INCBIN "gfx/pics/ekans/back.2bpp.lz"
@@ -467,13 +467,13 @@ SeakingBackpic:      INCBIN "gfx/pics/seaking/back.2bpp.lz"
 BurglarPic:          INCBIN "gfx/trainers/burglar.2bpp.lz"
 PsyduckBackpic:      INCBIN "gfx/pics/psyduck/back.2bpp.lz"
 PikachuBackpic:      INCBIN "gfx/pics/pikachu/back.2bpp.lz"
-KabutoFrontpic:      INCBIN "gfx/pics/kabuto/front.2bpp.lz"
+KabutoFrontpic:      INCBIN "gfx/pics/kabuto/front.animated.2bpp.lz"
 MareepBackpic:       INCBIN "gfx/pics/mareep/back.2bpp.lz"
 RemoraidBackpic:     INCBIN "gfx/pics/remoraid/back.2bpp.lz"
-DittoFrontpic:       INCBIN "gfx/pics/ditto/front.2bpp.lz"
+DittoFrontpic:       INCBIN "gfx/pics/ditto/front.animated.2bpp.lz"
 KingdraBackpic:      INCBIN "gfx/pics/kingdra/back.2bpp.lz"
 CamperPic:           INCBIN "gfx/trainers/camper.2bpp.lz"
-WooperFrontpic:      INCBIN "gfx/pics/wooper/front.2bpp.lz"
+WooperFrontpic:      INCBIN "gfx/pics/wooper/front.animated.2bpp.lz"
 ClefairyBackpic:     INCBIN "gfx/pics/clefairy/back.2bpp.lz"
 VenonatBackpic:      INCBIN "gfx/pics/venonat/back.2bpp.lz"
 BellossomBackpic:    INCBIN "gfx/pics/bellossom/back.2bpp.lz"
@@ -488,7 +488,7 @@ MewtwoBackpic:       INCBIN "gfx/pics/mewtwo/back.2bpp.lz"
 PokemonProfPic:      INCBIN "gfx/trainers/oak.2bpp.lz"
 CalPic:              INCBIN "gfx/trainers/cal.2bpp.lz"
 SwimmerfPic:         INCBIN "gfx/trainers/swimmer_f.2bpp.lz"
-DiglettFrontpic:     INCBIN "gfx/pics/diglett/front.2bpp.lz"
+DiglettFrontpic:     INCBIN "gfx/pics/diglett/front.animated.2bpp.lz"
 OfficerPic:          INCBIN "gfx/trainers/officer.2bpp.lz"
 MukBackpic:          INCBIN "gfx/pics/muk/back.2bpp.lz"
 DelibirdBackpic:     INCBIN "gfx/pics/delibird/back.2bpp.lz"
@@ -505,7 +505,7 @@ GolduckBackpic:      INCBIN "gfx/pics/golduck/back.2bpp.lz"
 WeezingBackpic:      INCBIN "gfx/pics/weezing/back.2bpp.lz"
 EnteiBackpic:        INCBIN "gfx/pics/entei/back.2bpp.lz"
 GruntfPic:           INCBIN "gfx/trainers/grunt_f.2bpp.lz"
-HorseaFrontpic:      INCBIN "gfx/pics/horsea/front.2bpp.lz"
+HorseaFrontpic:      INCBIN "gfx/pics/horsea/front.animated.2bpp.lz"
 PidgeotBackpic:      INCBIN "gfx/pics/pidgeot/back.2bpp.lz"
 HoOhBackpic:         INCBIN "gfx/pics/ho_oh/back.2bpp.lz"
 PoliwhirlBackpic:    INCBIN "gfx/pics/poliwhirl/back.2bpp.lz"
@@ -513,14 +513,14 @@ MewBackpic:          INCBIN "gfx/pics/mew/back.2bpp.lz"
 MachopBackpic:       INCBIN "gfx/pics/machop/back.2bpp.lz"
 AbraBackpic:         INCBIN "gfx/pics/abra/back.2bpp.lz"
 AerodactylBackpic:   INCBIN "gfx/pics/aerodactyl/back.2bpp.lz"
-KakunaFrontpic:      INCBIN "gfx/pics/kakuna/front.2bpp.lz"
+KakunaFrontpic:      INCBIN "gfx/pics/kakuna/front.animated.2bpp.lz"
 DugtrioBackpic:      INCBIN "gfx/pics/dugtrio/back.2bpp.lz"
 WeepinbellBackpic:   INCBIN "gfx/pics/weepinbell/back.2bpp.lz"
 NidoranFBackpic:     INCBIN "gfx/pics/nidoran_f/back.2bpp.lz"
 GravelerBackpic:     INCBIN "gfx/pics/graveler/back.2bpp.lz"
 AipomBackpic:        INCBIN "gfx/pics/aipom/back.2bpp.lz"
 EspeonBackpic:       INCBIN "gfx/pics/espeon/back.2bpp.lz"
-WeedleFrontpic:      INCBIN "gfx/pics/weedle/front.2bpp.lz"
+WeedleFrontpic:      INCBIN "gfx/pics/weedle/front.animated.2bpp.lz"
 TotodileBackpic:     INCBIN "gfx/pics/totodile/back.2bpp.lz"
 SnubbullBackpic:     INCBIN "gfx/pics/snubbull/back.2bpp.lz"
 KinglerBackpic:      INCBIN "gfx/pics/kingler/back.2bpp.lz"
@@ -529,7 +529,7 @@ RattataBackpic:      INCBIN "gfx/pics/rattata/back.2bpp.lz"
 YoungsterPic:        INCBIN "gfx/trainers/youngster.2bpp.lz"
 WillPic:             INCBIN "gfx/trainers/will.2bpp.lz"
 SchoolboyPic:        INCBIN "gfx/trainers/schoolboy.2bpp.lz"
-MagnemiteFrontpic:   INCBIN "gfx/pics/magnemite/front.2bpp.lz"
+MagnemiteFrontpic:   INCBIN "gfx/pics/magnemite/front.animated.2bpp.lz"
 ErikaPic:            INCBIN "gfx/trainers/erika.2bpp.lz"
 JaninePic:           INCBIN "gfx/trainers/janine.2bpp.lz"
 MagnemiteBackpic:    INCBIN "gfx/pics/magnemite/back.2bpp.lz"
@@ -548,7 +548,7 @@ MeowthBackpic:       INCBIN "gfx/pics/meowth/back.2bpp.lz"
 MeganiumBackpic:     INCBIN "gfx/pics/meganium/back.2bpp.lz"
 PicnickerPic:        INCBIN "gfx/trainers/picnicker.2bpp.lz"
 LickitungBackpic:    INCBIN "gfx/pics/lickitung/back.2bpp.lz"
-TogepiFrontpic:      INCBIN "gfx/pics/togepi/front.2bpp.lz"
+TogepiFrontpic:      INCBIN "gfx/pics/togepi/front.animated.2bpp.lz"
 SuperNerdPic:        INCBIN "gfx/trainers/super_nerd.2bpp.lz"
 HaunterBackpic:      INCBIN "gfx/pics/haunter/back.2bpp.lz"
 XatuBackpic:         INCBIN "gfx/pics/xatu/back.2bpp.lz"
@@ -556,12 +556,12 @@ RedPic:              INCBIN "gfx/trainers/red.2bpp.lz"
 Porygon2Backpic:     INCBIN "gfx/pics/porygon2/back.2bpp.lz"
 JasminePic:          INCBIN "gfx/trainers/jasmine.2bpp.lz"
 PinecoBackpic:       INCBIN "gfx/pics/pineco/back.2bpp.lz"
-MetapodFrontpic:     INCBIN "gfx/pics/metapod/front.2bpp.lz"
+MetapodFrontpic:     INCBIN "gfx/pics/metapod/front.animated.2bpp.lz"
 SeelBackpic:         INCBIN "gfx/pics/seel/back.2bpp.lz"
 QuagsireBackpic:     INCBIN "gfx/pics/quagsire/back.2bpp.lz"
 WhitneyPic:          INCBIN "gfx/trainers/whitney.2bpp.lz"
 JolteonBackpic:      INCBIN "gfx/pics/jolteon/back.2bpp.lz"
-CaterpieFrontpic:    INCBIN "gfx/pics/caterpie/front.2bpp.lz"
+CaterpieFrontpic:    INCBIN "gfx/pics/caterpie/front.animated.2bpp.lz"
 HoppipBackpic:       INCBIN "gfx/pics/hoppip/back.2bpp.lz"
 BluePic:             INCBIN "gfx/trainers/blue.2bpp.lz"
 GranbullBackpic:     INCBIN "gfx/pics/granbull/back.2bpp.lz"
@@ -578,16 +578,16 @@ CorsolaBackpic:      INCBIN "gfx/pics/corsola/back.2bpp.lz"
 ChinchouBackpic:     INCBIN "gfx/pics/chinchou/back.2bpp.lz"
 ChanseyBackpic:      INCBIN "gfx/pics/chansey/back.2bpp.lz"
 SkiploomBackpic:     INCBIN "gfx/pics/skiploom/back.2bpp.lz"
-SpinarakFrontpic:    INCBIN "gfx/pics/spinarak/front.2bpp.lz"
+SpinarakFrontpic:    INCBIN "gfx/pics/spinarak/front.animated.2bpp.lz"
 Rival2Pic:           INCBIN "gfx/trainers/rival2.2bpp.lz"
-UnownWFrontpic:      INCBIN "gfx/pics/unown_w/front.2bpp.lz"
+UnownWFrontpic:      INCBIN "gfx/pics/unown_w/front.animated.2bpp.lz"
 CharmanderBackpic:   INCBIN "gfx/pics/charmander/back.2bpp.lz"
 RhyhornBackpic:      INCBIN "gfx/pics/rhyhorn/back.2bpp.lz"
-UnownCFrontpic:      INCBIN "gfx/pics/unown_c/front.2bpp.lz"
+UnownCFrontpic:      INCBIN "gfx/pics/unown_c/front.animated.2bpp.lz"
 MistyPic:            INCBIN "gfx/trainers/misty.2bpp.lz"
 BlainePic:           INCBIN "gfx/trainers/blaine.2bpp.lz"
-UnownZFrontpic:      INCBIN "gfx/pics/unown_z/front.2bpp.lz"
-SwinubFrontpic:      INCBIN "gfx/pics/swinub/front.2bpp.lz"
+UnownZFrontpic:      INCBIN "gfx/pics/unown_z/front.animated.2bpp.lz"
+SwinubFrontpic:      INCBIN "gfx/pics/swinub/front.animated.2bpp.lz"
 LarvitarBackpic:     INCBIN "gfx/pics/larvitar/back.2bpp.lz"
 PorygonBackpic:      INCBIN "gfx/pics/porygon/back.2bpp.lz"
 UnownHBackpic:       INCBIN "gfx/pics/unown_h/back.2bpp.lz"
@@ -611,21 +611,21 @@ PidgeottoBackpic:    INCBIN "gfx/pics/pidgeotto/back.2bpp.lz"
 StaryuBackpic:       INCBIN "gfx/pics/staryu/back.2bpp.lz"
 MrMimeBackpic:       INCBIN "gfx/pics/mr__mime/back.2bpp.lz"
 CaterpieBackpic:     INCBIN "gfx/pics/caterpie/back.2bpp.lz"
-VoltorbFrontpic:     INCBIN "gfx/pics/voltorb/front.2bpp.lz"
+VoltorbFrontpic:     INCBIN "gfx/pics/voltorb/front.animated.2bpp.lz"
 LugiaBackpic:        INCBIN "gfx/pics/lugia/back.2bpp.lz"
 PrycePic:            INCBIN "gfx/trainers/pryce.2bpp.lz"
 BrockPic:            INCBIN "gfx/trainers/brock.2bpp.lz"
-UnownGFrontpic:      INCBIN "gfx/pics/unown_g/front.2bpp.lz"
+UnownGFrontpic:      INCBIN "gfx/pics/unown_g/front.animated.2bpp.lz"
 ArbokBackpic:        INCBIN "gfx/pics/arbok/back.2bpp.lz"
 PolitoedBackpic:     INCBIN "gfx/pics/politoed/back.2bpp.lz"
 DragoniteBackpic:    INCBIN "gfx/pics/dragonite/back.2bpp.lz"
 HitmonleeBackpic:    INCBIN "gfx/pics/hitmonlee/back.2bpp.lz"
-NatuFrontpic:        INCBIN "gfx/pics/natu/front.2bpp.lz"
+NatuFrontpic:        INCBIN "gfx/pics/natu/front.animated.2bpp.lz"
 UrsaringBackpic:     INCBIN "gfx/pics/ursaring/back.2bpp.lz"
 SagePic:             INCBIN "gfx/trainers/sage.2bpp.lz"
 TeddiursaBackpic:    INCBIN "gfx/pics/teddiursa/back.2bpp.lz"
 PhanpyBackpic:       INCBIN "gfx/pics/phanpy/back.2bpp.lz"
-UnownVFrontpic:      INCBIN "gfx/pics/unown_v/front.2bpp.lz"
+UnownVFrontpic:      INCBIN "gfx/pics/unown_v/front.animated.2bpp.lz"
 KakunaBackpic:       INCBIN "gfx/pics/kakuna/back.2bpp.lz"
 WobbuffetBackpic:    INCBIN "gfx/pics/wobbuffet/back.2bpp.lz"
 TogepiBackpic:       INCBIN "gfx/pics/togepi/back.2bpp.lz"
@@ -635,16 +635,16 @@ AmpharosBackpic:     INCBIN "gfx/pics/ampharos/back.2bpp.lz"
 IgglybuffBackpic:    INCBIN "gfx/pics/igglybuff/back.2bpp.lz"
 AzumarillBackpic:    INCBIN "gfx/pics/azumarill/back.2bpp.lz"
 OctilleryBackpic:    INCBIN "gfx/pics/octillery/back.2bpp.lz"
-UnownSFrontpic:      INCBIN "gfx/pics/unown_s/front.2bpp.lz"
+UnownSFrontpic:      INCBIN "gfx/pics/unown_s/front.animated.2bpp.lz"
 HorseaBackpic:       INCBIN "gfx/pics/horsea/back.2bpp.lz"
 SentretBackpic:      INCBIN "gfx/pics/sentret/back.2bpp.lz"
-UnownOFrontpic:      INCBIN "gfx/pics/unown_o/front.2bpp.lz"
-UnownTFrontpic:      INCBIN "gfx/pics/unown_t/front.2bpp.lz"
+UnownOFrontpic:      INCBIN "gfx/pics/unown_o/front.animated.2bpp.lz"
+UnownTFrontpic:      INCBIN "gfx/pics/unown_t/front.animated.2bpp.lz"
 WigglytuffBackpic:   INCBIN "gfx/pics/wigglytuff/back.2bpp.lz"
 ArticunoBackpic:     INCBIN "gfx/pics/articuno/back.2bpp.lz"
 DittoBackpic:        INCBIN "gfx/pics/ditto/back.2bpp.lz"
 WeedleBackpic:       INCBIN "gfx/pics/weedle/back.2bpp.lz"
-UnownHFrontpic:      INCBIN "gfx/pics/unown_h/front.2bpp.lz"
+UnownHFrontpic:      INCBIN "gfx/pics/unown_h/front.animated.2bpp.lz"
 CleffaBackpic:       INCBIN "gfx/pics/cleffa/back.2bpp.lz"
 DrowzeeBackpic:      INCBIN "gfx/pics/drowzee/back.2bpp.lz"
 GastlyBackpic:       INCBIN "gfx/pics/gastly/back.2bpp.lz"
@@ -664,45 +664,45 @@ SECTION "Pics 18", ROMX, BANK[PICS_18]
 
 SpinarakBackpic:     INCBIN "gfx/pics/spinarak/back.2bpp.lz"
 RaikouBackpic:       INCBIN "gfx/pics/raikou/back.2bpp.lz"
-UnownKFrontpic:      INCBIN "gfx/pics/unown_k/front.2bpp.lz"
+UnownKFrontpic:      INCBIN "gfx/pics/unown_k/front.animated.2bpp.lz"
 HoundourBackpic:     INCBIN "gfx/pics/houndour/back.2bpp.lz"
 PoliwagBackpic:      INCBIN "gfx/pics/poliwag/back.2bpp.lz"
 SquirtleBackpic:     INCBIN "gfx/pics/squirtle/back.2bpp.lz"
 ShuckleBackpic:      INCBIN "gfx/pics/shuckle/back.2bpp.lz"
 DewgongBackpic:      INCBIN "gfx/pics/dewgong/back.2bpp.lz"
-UnownBFrontpic:      INCBIN "gfx/pics/unown_b/front.2bpp.lz"
+UnownBFrontpic:      INCBIN "gfx/pics/unown_b/front.animated.2bpp.lz"
 SlowpokeBackpic:     INCBIN "gfx/pics/slowpoke/back.2bpp.lz"
 DunsparceBackpic:    INCBIN "gfx/pics/dunsparce/back.2bpp.lz"
 DonphanBackpic:      INCBIN "gfx/pics/donphan/back.2bpp.lz"
 WooperBackpic:       INCBIN "gfx/pics/wooper/back.2bpp.lz"
 TaurosBackpic:       INCBIN "gfx/pics/tauros/back.2bpp.lz"
-UnownXFrontpic:      INCBIN "gfx/pics/unown_x/front.2bpp.lz"
-UnownNFrontpic:      INCBIN "gfx/pics/unown_n/front.2bpp.lz"
+UnownXFrontpic:      INCBIN "gfx/pics/unown_x/front.animated.2bpp.lz"
+UnownNFrontpic:      INCBIN "gfx/pics/unown_n/front.animated.2bpp.lz"
 TangelaBackpic:      INCBIN "gfx/pics/tangela/back.2bpp.lz"
 VoltorbBackpic:      INCBIN "gfx/pics/voltorb/back.2bpp.lz"
-UnownJFrontpic:      INCBIN "gfx/pics/unown_j/front.2bpp.lz"
+UnownJFrontpic:      INCBIN "gfx/pics/unown_j/front.animated.2bpp.lz"
 MantineBackpic:      INCBIN "gfx/pics/mantine/back.2bpp.lz"
-UnownLFrontpic:      INCBIN "gfx/pics/unown_l/front.2bpp.lz"
+UnownLFrontpic:      INCBIN "gfx/pics/unown_l/front.animated.2bpp.lz"
 PiloswineBackpic:    INCBIN "gfx/pics/piloswine/back.2bpp.lz"
-UnownMFrontpic:      INCBIN "gfx/pics/unown_m/front.2bpp.lz"
-UnownFFrontpic:      INCBIN "gfx/pics/unown_f/front.2bpp.lz"
+UnownMFrontpic:      INCBIN "gfx/pics/unown_m/front.animated.2bpp.lz"
+UnownFFrontpic:      INCBIN "gfx/pics/unown_f/front.animated.2bpp.lz"
 NatuBackpic:         INCBIN "gfx/pics/natu/back.2bpp.lz"
-UnownAFrontpic:      INCBIN "gfx/pics/unown_a/front.2bpp.lz"
+UnownAFrontpic:      INCBIN "gfx/pics/unown_a/front.animated.2bpp.lz"
 GolemBackpic:        INCBIN "gfx/pics/golem/back.2bpp.lz"
-UnownUFrontpic:      INCBIN "gfx/pics/unown_u/front.2bpp.lz"
+UnownUFrontpic:      INCBIN "gfx/pics/unown_u/front.animated.2bpp.lz"
 DiglettBackpic:      INCBIN "gfx/pics/diglett/back.2bpp.lz"
-UnownQFrontpic:      INCBIN "gfx/pics/unown_q/front.2bpp.lz"
-UnownPFrontpic:      INCBIN "gfx/pics/unown_p/front.2bpp.lz"
+UnownQFrontpic:      INCBIN "gfx/pics/unown_q/front.animated.2bpp.lz"
+UnownPFrontpic:      INCBIN "gfx/pics/unown_p/front.animated.2bpp.lz"
 UnownCBackpic:       INCBIN "gfx/pics/unown_c/back.2bpp.lz"
 JynxBackpic:         INCBIN "gfx/pics/jynx/back.2bpp.lz"
 GolbatBackpic:       INCBIN "gfx/pics/golbat/back.2bpp.lz"
-UnownYFrontpic:      INCBIN "gfx/pics/unown_y/front.2bpp.lz"
+UnownYFrontpic:      INCBIN "gfx/pics/unown_y/front.animated.2bpp.lz"
 UnownGBackpic:       INCBIN "gfx/pics/unown_g/back.2bpp.lz"
-UnownIFrontpic:      INCBIN "gfx/pics/unown_i/front.2bpp.lz"
+UnownIFrontpic:      INCBIN "gfx/pics/unown_i/front.animated.2bpp.lz"
 UnownVBackpic:       INCBIN "gfx/pics/unown_v/back.2bpp.lz"
 ForretressBackpic:   INCBIN "gfx/pics/forretress/back.2bpp.lz"
 UnownSBackpic:       INCBIN "gfx/pics/unown_s/back.2bpp.lz"
-UnownRFrontpic:      INCBIN "gfx/pics/unown_r/front.2bpp.lz"
+UnownRFrontpic:      INCBIN "gfx/pics/unown_r/front.animated.2bpp.lz"
 UnownEBackpic:       INCBIN "gfx/pics/unown_e/back.2bpp.lz"
 UnownJBackpic:       INCBIN "gfx/pics/unown_j/back.2bpp.lz"
 UnownBBackpic:       INCBIN "gfx/pics/unown_b/back.2bpp.lz"
@@ -731,45 +731,45 @@ SECTION "Pics 19", ROMX, BANK[PICS_19]
 
 INCBIN "gfx/pics/spinarak/back.2bpp.lz"
 INCBIN "gfx/pics/raikou/back.2bpp.lz"
-INCBIN "gfx/pics/unown_k/front.2bpp.lz"
+INCBIN "gfx/pics/unown_k/front.animated.2bpp.lz"
 INCBIN "gfx/pics/houndour/back.2bpp.lz"
 INCBIN "gfx/pics/poliwag/back.2bpp.lz"
 INCBIN "gfx/pics/squirtle/back.2bpp.lz"
 INCBIN "gfx/pics/shuckle/back.2bpp.lz"
 INCBIN "gfx/pics/dewgong/back.2bpp.lz"
-INCBIN "gfx/pics/unown_b/front.2bpp.lz"
+INCBIN "gfx/pics/unown_b/front.animated.2bpp.lz"
 INCBIN "gfx/pics/slowpoke/back.2bpp.lz"
 INCBIN "gfx/pics/dunsparce/back.2bpp.lz"
 INCBIN "gfx/pics/donphan/back.2bpp.lz"
 INCBIN "gfx/pics/wooper/back.2bpp.lz"
 INCBIN "gfx/pics/tauros/back.2bpp.lz"
-INCBIN "gfx/pics/unown_x/front.2bpp.lz"
-INCBIN "gfx/pics/unown_n/front.2bpp.lz"
+INCBIN "gfx/pics/unown_x/front.animated.2bpp.lz"
+INCBIN "gfx/pics/unown_n/front.animated.2bpp.lz"
 INCBIN "gfx/pics/tangela/back.2bpp.lz"
 INCBIN "gfx/pics/voltorb/back.2bpp.lz"
-INCBIN "gfx/pics/unown_j/front.2bpp.lz"
+INCBIN "gfx/pics/unown_j/front.animated.2bpp.lz"
 INCBIN "gfx/pics/mantine/back.2bpp.lz"
-INCBIN "gfx/pics/unown_l/front.2bpp.lz"
+INCBIN "gfx/pics/unown_l/front.animated.2bpp.lz"
 INCBIN "gfx/pics/piloswine/back.2bpp.lz"
-INCBIN "gfx/pics/unown_m/front.2bpp.lz"
-INCBIN "gfx/pics/unown_f/front.2bpp.lz"
+INCBIN "gfx/pics/unown_m/front.animated.2bpp.lz"
+INCBIN "gfx/pics/unown_f/front.animated.2bpp.lz"
 INCBIN "gfx/pics/natu/back.2bpp.lz"
-INCBIN "gfx/pics/unown_a/front.2bpp.lz"
+INCBIN "gfx/pics/unown_a/front.animated.2bpp.lz"
 INCBIN "gfx/pics/golem/back.2bpp.lz"
-INCBIN "gfx/pics/unown_u/front.2bpp.lz"
+INCBIN "gfx/pics/unown_u/front.animated.2bpp.lz"
 INCBIN "gfx/pics/diglett/back.2bpp.lz"
-INCBIN "gfx/pics/unown_q/front.2bpp.lz"
-INCBIN "gfx/pics/unown_p/front.2bpp.lz"
+INCBIN "gfx/pics/unown_q/front.animated.2bpp.lz"
+INCBIN "gfx/pics/unown_p/front.animated.2bpp.lz"
 INCBIN "gfx/pics/unown_c/back.2bpp.lz"
 INCBIN "gfx/pics/jynx/back.2bpp.lz"
 INCBIN "gfx/pics/golbat/back.2bpp.lz"
-INCBIN "gfx/pics/unown_y/front.2bpp.lz"
+INCBIN "gfx/pics/unown_y/front.animated.2bpp.lz"
 INCBIN "gfx/pics/unown_g/back.2bpp.lz"
-INCBIN "gfx/pics/unown_i/front.2bpp.lz"
+INCBIN "gfx/pics/unown_i/front.animated.2bpp.lz"
 INCBIN "gfx/pics/unown_v/back.2bpp.lz"
 INCBIN "gfx/pics/forretress/back.2bpp.lz"
 INCBIN "gfx/pics/unown_s/back.2bpp.lz"
-INCBIN "gfx/pics/unown_r/front.2bpp.lz"
+INCBIN "gfx/pics/unown_r/front.animated.2bpp.lz"
 INCBIN "gfx/pics/unown_e/back.2bpp.lz"
 INCBIN "gfx/pics/unown_j/back.2bpp.lz"
 INCBIN "gfx/pics/unown_b/back.2bpp.lz"
diff --git a/gfx/pics/abra/back.2bpp.lz b/gfx/pics/abra/back.2bpp.lz.9ac09a32
index 2df351881..2df351881 100644
--- a/gfx/pics/abra/back.2bpp.lz
+++ b/gfx/pics/abra/back.2bpp.lz.9ac09a32
diff --git a/gfx/pics/abra/back.png b/gfx/pics/abra/back.png
new file mode 100644
index 000000000..f3a681f04
--- /dev/null
+++ b/gfx/pics/abra/back.png
diff --git a/gfx/pics/abra/bitmask.asm b/gfx/pics/abra/bitmask.asm
deleted file mode 100644
index 1c164d9e1..000000000
--- a/gfx/pics/abra/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %10011100
-	db %01100011
-	db %00000100
-	db %00000000
-; 1
-	db %10011100
-	db %01100011
-	db %00001100
-	db %00000001
-; 2
-	db %00000000
-	db %00000000
-	db %00001000
-	db %00000001
-; 0xd2b78
diff --git a/gfx/pics/abra/frames.asm b/gfx/pics/abra/frames.asm
deleted file mode 100644
index 894102a77..000000000
--- a/gfx/pics/abra/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21
-.frame2
-	db $01 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $23
-.frame3
-	db $02 ; bitmask
-	db $22, $23
-; 0xd4ef3
diff --git a/gfx/pics/abra/front.2bpp.lz b/gfx/pics/abra/front.animated.2bpp.lz.12e14d9a
index 2b41c4263..2b41c4263 100644
--- a/gfx/pics/abra/front.2bpp.lz
+++ b/gfx/pics/abra/front.animated.2bpp.lz.12e14d9a
diff --git a/gfx/pics/abra/front.png b/gfx/pics/abra/front.png
new file mode 100644
index 000000000..cd3cbd704
--- /dev/null
+++ b/gfx/pics/abra/front.png
diff --git a/gfx/pics/abra/normal.pal b/gfx/pics/abra/normal.pal
deleted file mode 100644
index 23f50e983..000000000
--- a/gfx/pics/abra/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 19, 03
-	RGB 12, 08, 10
-
diff --git a/gfx/pics/aerodactyl/back.2bpp.lz b/gfx/pics/aerodactyl/back.2bpp.lz.e2da1f61
index 05536351b..05536351b 100644
--- a/gfx/pics/aerodactyl/back.2bpp.lz
+++ b/gfx/pics/aerodactyl/back.2bpp.lz.e2da1f61
diff --git a/gfx/pics/aerodactyl/back.png b/gfx/pics/aerodactyl/back.png
new file mode 100644
index 000000000..a88138069
--- /dev/null
+++ b/gfx/pics/aerodactyl/back.png
diff --git a/gfx/pics/aerodactyl/bitmask.asm b/gfx/pics/aerodactyl/bitmask.asm
deleted file mode 100644
index 76095eb39..000000000
--- a/gfx/pics/aerodactyl/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %10011111
-	db %00000111
-	db %10000000
-	db %11110111
-	db %11111001
-	db %00111100
-	db %00000000
-; 1
-	db %00001000
-	db %00001110
-	db %00000111
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %10000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd321a
diff --git a/gfx/pics/aerodactyl/frames.asm b/gfx/pics/aerodactyl/frames.asm
deleted file mode 100644
index 669d78e38..000000000
--- a/gfx/pics/aerodactyl/frames.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $30, $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b
-	db $3c, $30, $30, $3d, $3e, $3f, $30, $30, $20, $40, $41, $30
-	db $30, $30, $30
-.frame2
-	db $01 ; bitmask
-	db $30, $42, $43, $44, $45, $46, $47
-.frame3
-	db $02 ; bitmask
-	db $48
-; 0xd5fa7
diff --git a/gfx/pics/aerodactyl/front.2bpp.lz b/gfx/pics/aerodactyl/front.animated.2bpp.lz.3bceb33e
index ae8d9f8ab..ae8d9f8ab 100644
--- a/gfx/pics/aerodactyl/front.2bpp.lz
+++ b/gfx/pics/aerodactyl/front.animated.2bpp.lz.3bceb33e
diff --git a/gfx/pics/aerodactyl/front.png b/gfx/pics/aerodactyl/front.png
new file mode 100644
index 000000000..3fdf99f61
--- /dev/null
+++ b/gfx/pics/aerodactyl/front.png
diff --git a/gfx/pics/aerodactyl/normal.pal b/gfx/pics/aerodactyl/normal.pal
deleted file mode 100644
index a816937e3..000000000
--- a/gfx/pics/aerodactyl/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 19, 19, 15
-	RGB 12, 11, 11
-
diff --git a/gfx/pics/aipom/back.2bpp.lz b/gfx/pics/aipom/back.2bpp.lz.597d4dda
index d6d9fdbc1..d6d9fdbc1 100644
--- a/gfx/pics/aipom/back.2bpp.lz
+++ b/gfx/pics/aipom/back.2bpp.lz.597d4dda
diff --git a/gfx/pics/aipom/back.png b/gfx/pics/aipom/back.png
new file mode 100644
index 000000000..0be9d9ed0
--- /dev/null
+++ b/gfx/pics/aipom/back.png
diff --git a/gfx/pics/aipom/bitmask.asm b/gfx/pics/aipom/bitmask.asm
deleted file mode 100644
index ca853fce0..000000000
--- a/gfx/pics/aipom/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %10000000
-	db %00010001
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %11001110
-	db %00000001
-; 2
-	db %10000100
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd35ea
diff --git a/gfx/pics/aipom/frames.asm b/gfx/pics/aipom/frames.asm
deleted file mode 100644
index d19527468..000000000
--- a/gfx/pics/aipom/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b
-.frame2
-	db $01 ; bitmask
-	db $1c, $1d, $1e, $1f, $20, $21
-.frame3
-	db $02 ; bitmask
-	db $22, $23, $24
-; 0xd8c6e
diff --git a/gfx/pics/aipom/front.2bpp.lz b/gfx/pics/aipom/front.animated.2bpp.lz.fba7c862
index 58800e5e4..58800e5e4 100644
--- a/gfx/pics/aipom/front.2bpp.lz
+++ b/gfx/pics/aipom/front.animated.2bpp.lz.fba7c862
diff --git a/gfx/pics/aipom/front.png b/gfx/pics/aipom/front.png
new file mode 100644
index 000000000..72cc3b718
--- /dev/null
+++ b/gfx/pics/aipom/front.png
diff --git a/gfx/pics/aipom/normal.pal b/gfx/pics/aipom/normal.pal
deleted file mode 100644
index 7af3a8f3b..000000000
--- a/gfx/pics/aipom/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 23, 12
-	RGB 12, 04, 14
-
diff --git a/gfx/pics/alakazam/back.2bpp.lz b/gfx/pics/alakazam/back.2bpp.lz.75e7e1c6
index 65f1a2729..65f1a2729 100644
--- a/gfx/pics/alakazam/back.2bpp.lz
+++ b/gfx/pics/alakazam/back.2bpp.lz.75e7e1c6
diff --git a/gfx/pics/alakazam/back.png b/gfx/pics/alakazam/back.png
new file mode 100644
index 000000000..977c2974f
--- /dev/null
+++ b/gfx/pics/alakazam/back.png
diff --git a/gfx/pics/alakazam/bitmask.asm b/gfx/pics/alakazam/bitmask.asm
deleted file mode 100644
index 3e0cd2baf..000000000
--- a/gfx/pics/alakazam/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00111100
-	db %00011110
-	db %11100001
-	db %01110000
-	db %00111000
-	db %00011100
-	db %00000000
-; 1
-	db %00111100
-	db %00011110
-	db %11100001
-	db %00110000
-	db %00111000
-	db %00011100
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %10000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00111100
-	db %00011110
-	db %01100000
-	db %01110000
-	db %00111000
-	db %00011100
-	db %00000000
-; 0xd2ba3
diff --git a/gfx/pics/alakazam/frames.asm b/gfx/pics/alakazam/frames.asm
deleted file mode 100644
index 80f391217..000000000
--- a/gfx/pics/alakazam/frames.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $00, $34, $35, $36, $37, $38, $39, $3a, $3b
-	db $3c, $3d, $3e, $3f, $40, $41, $00, $42, $43
-.frame2
-	db $01 ; bitmask
-	db $44, $45, $46, $00, $47, $48, $49, $37, $38, $4a, $4b, $3b
-	db $4c, $4d, $4e, $4f, $50, $00, $51, $52
-.frame3
-	db $02 ; bitmask
-	db $38, $3b
-.frame4
-	db $03 ; bitmask
-	db $44, $45, $46, $00, $47, $48, $49, $37, $39, $3a, $3c, $3d
-	db $3e, $3f, $40, $41, $00, $42, $43
-.frame5
-	db $00 ; bitmask
-	db $44, $45, $46, $00, $47, $48, $49, $37, $38, $39, $3a, $3b
-	db $3c, $3d, $3e, $3f, $40, $41, $00, $42, $43
-; 0xd4f89
diff --git a/gfx/pics/alakazam/front.2bpp.lz b/gfx/pics/alakazam/front.animated.2bpp.lz.b246e050
index 6272553a7..6272553a7 100644
--- a/gfx/pics/alakazam/front.2bpp.lz
+++ b/gfx/pics/alakazam/front.animated.2bpp.lz.b246e050
diff --git a/gfx/pics/alakazam/front.png b/gfx/pics/alakazam/front.png
new file mode 100644
index 000000000..958aa11ad
--- /dev/null
+++ b/gfx/pics/alakazam/front.png
diff --git a/gfx/pics/alakazam/normal.pal b/gfx/pics/alakazam/normal.pal
deleted file mode 100644
index 23f50e983..000000000
--- a/gfx/pics/alakazam/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 19, 03
-	RGB 12, 08, 10
-
diff --git a/gfx/pics/ampharos/back.2bpp.lz b/gfx/pics/ampharos/back.2bpp.lz.06af98c8
index 8d3b42d9b..8d3b42d9b 100644
--- a/gfx/pics/ampharos/back.2bpp.lz
+++ b/gfx/pics/ampharos/back.2bpp.lz.06af98c8
diff --git a/gfx/pics/ampharos/back.png b/gfx/pics/ampharos/back.png
new file mode 100644
index 000000000..0e1075491
--- /dev/null
+++ b/gfx/pics/ampharos/back.png
diff --git a/gfx/pics/ampharos/bitmask.asm b/gfx/pics/ampharos/bitmask.asm
deleted file mode 100644
index 748ca9a41..000000000
--- a/gfx/pics/ampharos/bitmask.asm
+++ /dev/null
@@ -1,49 +0,0 @@
-; 0
-	db %00111000
-	db %00111100
-	db %10011111
-	db %00001111
-	db %11000110
-	db %01100000
-	db %00000000
-; 1
-	db %00111000
-	db %00111100
-	db %11111111
-	db %01111111
-	db %11111110
-	db %01101100
-	db %00000000
-; 2
-	db %00111000
-	db %00111100
-	db %11011111
-	db %00111111
-	db %11000110
-	db %01100000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %01000000
-	db %00100000
-	db %00000000
-	db %00000000
-	db %00000000
-; 4
-	db %00000000
-	db %00000000
-	db %10000011
-	db %00000001
-	db %11000000
-	db %01100000
-	db %00000000
-; 5
-	db %00000000
-	db %00000000
-	db %11000011
-	db %00100001
-	db %11000000
-	db %01100000
-	db %00000000
-; 0xd3531
diff --git a/gfx/pics/ampharos/frames.asm b/gfx/pics/ampharos/frames.asm
deleted file mode 100644
index 028ddbc8c..000000000
--- a/gfx/pics/ampharos/frames.asm
+++ /dev/null
@@ -1,30 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $00, $31, $00, $32, $33, $34, $35, $36, $37, $38, $39, $3a
-	db $3b, $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44, $00
-.frame2
-	db $01 ; bitmask
-	db $00, $00, $00, $00, $45, $46, $35, $36, $37, $38, $39, $3a
-	db $47, $48, $49, $3c, $3d, $3e, $3f, $4a, $4b, $4c, $40, $41
-	db $4d, $4e, $4f, $42, $43, $50, $51, $44, $00
-.frame3
-	db $02 ; bitmask
-	db $00, $00, $00, $00, $52, $46, $35, $36, $37, $38, $39, $3a
-	db $53, $3b, $3c, $3d, $3e, $3f, $54, $55, $40, $41, $42, $43
-	db $44, $00
-.frame4
-	db $03 ; bitmask
-	db $53, $55
-.frame5
-	db $04 ; bitmask
-	db $36, $37, $3b, $3c, $42, $43, $44, $00
-.frame6
-	db $05 ; bitmask
-	db $36, $37, $53, $3b, $3c, $55, $42, $43, $44, $00
-; 0xd8ab8
diff --git a/gfx/pics/ampharos/front.2bpp.lz b/gfx/pics/ampharos/front.animated.2bpp.lz.4b908a28
index 84f43c105..84f43c105 100644
--- a/gfx/pics/ampharos/front.2bpp.lz
+++ b/gfx/pics/ampharos/front.animated.2bpp.lz.4b908a28
diff --git a/gfx/pics/ampharos/front.png b/gfx/pics/ampharos/front.png
new file mode 100644
index 000000000..0cf155177
--- /dev/null
+++ b/gfx/pics/ampharos/front.png
diff --git a/gfx/pics/ampharos/normal.pal b/gfx/pics/ampharos/normal.pal
deleted file mode 100644
index 8620983c9..000000000
--- a/gfx/pics/ampharos/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 31, 02
-	RGB 21, 10, 01
-
diff --git a/gfx/pics/arbok/back.2bpp.lz b/gfx/pics/arbok/back.2bpp.lz.7b18cb93
index 175abb499..175abb499 100644
--- a/gfx/pics/arbok/back.2bpp.lz
+++ b/gfx/pics/arbok/back.2bpp.lz.7b18cb93
diff --git a/gfx/pics/arbok/back.png b/gfx/pics/arbok/back.png
new file mode 100644
index 000000000..5d9809918
--- /dev/null
+++ b/gfx/pics/arbok/back.png
diff --git a/gfx/pics/arbok/bitmask.asm b/gfx/pics/arbok/bitmask.asm
deleted file mode 100644
index 4a51646d0..000000000
--- a/gfx/pics/arbok/bitmask.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %11010001
-	db %11111011
-	db %00000001
-; 1
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %11110000
-	db %11111001
-	db %00000001
-; 2
-	db %00000000
-	db %10000010
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00000100
-	db %00000011
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 4
-	db %00000000
-	db %00000000
-	db %00000011
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd288f
diff --git a/gfx/pics/arbok/frames.asm b/gfx/pics/arbok/frames.asm
deleted file mode 100644
index 011333a05..000000000
--- a/gfx/pics/arbok/frames.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $31, $00, $32, $33, $34, $35, $36, $37, $38, $00, $39, $3a
-.frame2
-	db $01 ; bitmask
-	db $00, $3b, $3c, $00, $3d, $00, $00, $3e, $3f, $40, $41
-.frame3
-	db $01 ; bitmask
-	db $42, $43, $44, $45, $46, $00, $47, $48, $49, $4a, $4b
-.frame4
-	db $02 ; bitmask
-	db $4c, $4d, $4e
-.frame5
-	db $03 ; bitmask
-	db $4f, $50, $51
-.frame6
-	db $04 ; bitmask
-	db $52, $53
-; 0xd4698
diff --git a/gfx/pics/arbok/front.2bpp.lz b/gfx/pics/arbok/front.animated.2bpp.lz.1589a977
index 8b5918dbd..8b5918dbd 100644
--- a/gfx/pics/arbok/front.2bpp.lz
+++ b/gfx/pics/arbok/front.animated.2bpp.lz.1589a977
diff --git a/gfx/pics/arbok/front.png b/gfx/pics/arbok/front.png
new file mode 100644
index 000000000..340c07d1a
--- /dev/null
+++ b/gfx/pics/arbok/front.png
diff --git a/gfx/pics/arbok/normal.pal b/gfx/pics/arbok/normal.pal
deleted file mode 100644
index adae838d4..000000000
--- a/gfx/pics/arbok/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 18, 08, 19
-	RGB 22, 04, 09
-
diff --git a/gfx/pics/arcanine/back.2bpp.lz b/gfx/pics/arcanine/back.2bpp.lz.f5b35ebf
index a76d64986..a76d64986 100644
--- a/gfx/pics/arcanine/back.2bpp.lz
+++ b/gfx/pics/arcanine/back.2bpp.lz.f5b35ebf
diff --git a/gfx/pics/arcanine/back.png b/gfx/pics/arcanine/back.png
new file mode 100644
index 000000000..0358d9344
--- /dev/null
+++ b/gfx/pics/arcanine/back.png
diff --git a/gfx/pics/arcanine/bitmask.asm b/gfx/pics/arcanine/bitmask.asm
deleted file mode 100644
index 6489a14e8..000000000
--- a/gfx/pics/arcanine/bitmask.asm
+++ /dev/null
@@ -1,49 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %00011100
-	db %00001110
-	db %00000011
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %10011100
-	db %11001111
-	db %00000011
-	db %00000000
-	db %00000000
-; 2
-	db %10000111
-	db %00000111
-	db %10011101
-	db %11001111
-	db %00000011
-	db %00000000
-	db %00000000
-; 3
-	db %10000111
-	db %11000011
-	db %10011100
-	db %11001111
-	db %00000011
-	db %00000000
-	db %00000000
-; 4
-	db %00000000
-	db %00000000
-	db %00100000
-	db %00110000
-	db %00000000
-	db %00000000
-	db %00000000
-; 5
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00100000
-	db %00000000
-	db %00001000
-	db %00000000
-; 0xd2b2e
diff --git a/gfx/pics/arcanine/frames.asm b/gfx/pics/arcanine/frames.asm
deleted file mode 100644
index f802d943d..000000000
--- a/gfx/pics/arcanine/frames.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $39, $3a, $3b, $34, $35, $3c, $3d, $3e, $37, $38
-.frame3
-	db $02 ; bitmask
-	db $3f, $40, $14, $41, $42, $43, $44, $45, $31, $32, $39, $3a
-	db $3b, $34, $35, $3c, $3d, $3e, $37, $38
-.frame4
-	db $03 ; bitmask
-	db $46, $47, $48, $49, $4a, $4b, $4c, $4d, $31, $32, $39, $3a
-	db $3b, $34, $35, $3c, $3d, $3e, $37, $38
-.frame5
-	db $04 ; bitmask
-	db $4e, $4f, $50
-.frame6
-	db $05 ; bitmask
-	db $50, $51
-.frame7
-	db $00 ; bitmask
-	db $31, $32, $39, $34, $35, $3c, $37, $38
-; 0xd4e47
diff --git a/gfx/pics/arcanine/front.2bpp.lz b/gfx/pics/arcanine/front.animated.2bpp.lz.5ae8eff3
index da1784800..da1784800 100644
--- a/gfx/pics/arcanine/front.2bpp.lz
+++ b/gfx/pics/arcanine/front.animated.2bpp.lz.5ae8eff3
diff --git a/gfx/pics/arcanine/front.png b/gfx/pics/arcanine/front.png
new file mode 100644
index 000000000..5a65299ed
--- /dev/null
+++ b/gfx/pics/arcanine/front.png
diff --git a/gfx/pics/arcanine/normal.pal b/gfx/pics/arcanine/normal.pal
deleted file mode 100644
index c7a4f497a..000000000
--- a/gfx/pics/arcanine/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 23, 07
-	RGB 24, 06, 03
-
diff --git a/gfx/pics/ariados/back.2bpp.lz b/gfx/pics/ariados/back.2bpp.lz.9fb1c3fc
index ff3aec7fb..ff3aec7fb 100644
--- a/gfx/pics/ariados/back.2bpp.lz
+++ b/gfx/pics/ariados/back.2bpp.lz.9fb1c3fc
diff --git a/gfx/pics/ariados/back.png b/gfx/pics/ariados/back.png
new file mode 100644
index 000000000..6d0bc737d
--- /dev/null
+++ b/gfx/pics/ariados/back.png
diff --git a/gfx/pics/ariados/bitmask.asm b/gfx/pics/ariados/bitmask.asm
deleted file mode 100644
index 7109aa0bb..000000000
--- a/gfx/pics/ariados/bitmask.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-; 0
-	db %00000000
-	db %10111100
-	db %11011101
-	db %11101111
-	db %01100000
-	db %00011000
-	db %00000000
-; 0xd3446
diff --git a/gfx/pics/ariados/frames.asm b/gfx/pics/ariados/frames.asm
deleted file mode 100644
index ec7f6f191..000000000
--- a/gfx/pics/ariados/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $00, $34, $35, $36, $37, $00, $00, $38, $39
-	db $3a, $3b, $00, $3c, $3d, $3e, $00, $3f, $00, $00
-.frame2
-	db $00 ; bitmask
-	db $31, $32, $40, $00, $34, $35, $36, $41, $00, $00, $38, $39
-	db $3a, $42, $00, $3c, $3d, $3e, $00, $3f, $00, $00
-.frame3
-	db $00 ; bitmask
-	db $31, $32, $40, $00, $43, $44, $36, $41, $00, $00, $38, $39
-	db $3a, $42, $00, $45, $46, $3e, $00, $3f, $00, $00
-.frame4
-	db $00 ; bitmask
-	db $31, $47, $33, $00, $34, $35, $48, $37, $00, $00, $38, $39
-	db $49, $3b, $00, $3c, $3d, $3e, $00, $3f, $00, $00
-; 0xd8810
diff --git a/gfx/pics/ariados/front.2bpp.lz b/gfx/pics/ariados/front.animated.2bpp.lz.5ac5c83c
index 51039aeb5..51039aeb5 100644
--- a/gfx/pics/ariados/front.2bpp.lz
+++ b/gfx/pics/ariados/front.animated.2bpp.lz.5ac5c83c
diff --git a/gfx/pics/ariados/front.png b/gfx/pics/ariados/front.png
new file mode 100644
index 000000000..ba40159e6
--- /dev/null
+++ b/gfx/pics/ariados/front.png
diff --git a/gfx/pics/ariados/normal.pal b/gfx/pics/ariados/normal.pal
deleted file mode 100644
index 211e75004..000000000
--- a/gfx/pics/ariados/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 10, 08
-	RGB 14, 06, 20
-
diff --git a/gfx/pics/articuno/back.2bpp.lz b/gfx/pics/articuno/back.2bpp.lz.c263c2aa
index 87b61ac9d..87b61ac9d 100644
--- a/gfx/pics/articuno/back.2bpp.lz
+++ b/gfx/pics/articuno/back.2bpp.lz.c263c2aa
diff --git a/gfx/pics/articuno/back.png b/gfx/pics/articuno/back.png
new file mode 100644
index 000000000..9734a3095
--- /dev/null
+++ b/gfx/pics/articuno/back.png
diff --git a/gfx/pics/articuno/bitmask.asm b/gfx/pics/articuno/bitmask.asm
deleted file mode 100644
index 8f81e3092..000000000
--- a/gfx/pics/articuno/bitmask.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-; 0
-	db %00000110
-	db %00010011
-	db %00000001
-	db %11100000
-	db %01111000
-	db %00011100
-	db %00000000
-; 1
-	db %00000110
-	db %11010011
-	db %11100001
-	db %11110000
-	db %11111000
-	db %01111100
-	db %00000000
-; 2
-	db %00000110
-	db %11010011
-	db %11100001
-	db %11110000
-	db %01111000
-	db %00111100
-	db %00000000
-; 3
-	db %00000110
-	db %00010011
-	db %00001101
-	db %11100000
-	db %01111000
-	db %00011100
-	db %00000000
-; 4
-	db %00000110
-	db %00000011
-	db %00000001
-	db %11100000
-	db %01111000
-	db %00011100
-	db %00000000
-; 0xd3252
diff --git a/gfx/pics/articuno/frames.asm b/gfx/pics/articuno/frames.asm
deleted file mode 100644
index c30536bd3..000000000
--- a/gfx/pics/articuno/frames.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f, $40
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $33, $34, $35, $41, $00, $42, $43, $44, $45, $46
-	db $47, $38, $39, $48, $3b, $3c, $49, $2e, $3e, $3f, $4a, $00
-	db $00
-.frame3
-	db $02 ; bitmask
-	db $31, $32, $33, $34, $35, $00, $4b, $4c, $4d, $27, $4e, $4f
-	db $50, $38, $39, $3a, $3b, $3c, $51, $3e, $3f, $4a, $52
-.frame4
-	db $03 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $53, $54, $37, $38, $39, $3a
-	db $3b, $3c, $3d, $3e, $3f, $40
-.frame5
-	db $04 ; bitmask
-	db $31, $32, $33, $34, $36, $37, $38, $39, $3a, $3b, $3c, $3d
-	db $3e, $3f, $40
-; 0xd6042
diff --git a/gfx/pics/articuno/front.2bpp.lz b/gfx/pics/articuno/front.animated.2bpp.lz.650aef29
index a60367098..a60367098 100644
--- a/gfx/pics/articuno/front.2bpp.lz
+++ b/gfx/pics/articuno/front.animated.2bpp.lz.650aef29
diff --git a/gfx/pics/articuno/front.png b/gfx/pics/articuno/front.png
new file mode 100644
index 000000000..bd0090d7b
--- /dev/null
+++ b/gfx/pics/articuno/front.png
diff --git a/gfx/pics/articuno/normal.pal b/gfx/pics/articuno/normal.pal
deleted file mode 100644
index 121620e3c..000000000
--- a/gfx/pics/articuno/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 11, 21, 31
-	RGB 08, 11, 16
-
diff --git a/gfx/pics/azumarill/back.2bpp.lz b/gfx/pics/azumarill/back.2bpp.lz.f7fa0db9
index b66df2a71..b66df2a71 100644
--- a/gfx/pics/azumarill/back.2bpp.lz
+++ b/gfx/pics/azumarill/back.2bpp.lz.f7fa0db9
diff --git a/gfx/pics/azumarill/back.png b/gfx/pics/azumarill/back.png
new file mode 100644
index 000000000..581c0e926
--- /dev/null
+++ b/gfx/pics/azumarill/back.png
diff --git a/gfx/pics/azumarill/bitmask.asm b/gfx/pics/azumarill/bitmask.asm
deleted file mode 100644
index 5e11e0966..000000000
--- a/gfx/pics/azumarill/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %10000001
-	db %11000001
-	db %01100000
-	db %00110000
-	db %00011000
-	db %00000000
-	db %00000000
-; 1
-	db %00001100
-	db %00001110
-	db %00000110
-	db %11000011
-	db %11100001
-	db %00110000
-	db %00000000
-; 2
-	db %10001101
-	db %11001111
-	db %01100110
-	db %11110011
-	db %11111001
-	db %00110000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %10000001
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3587
diff --git a/gfx/pics/azumarill/frames.asm b/gfx/pics/azumarill/frames.asm
deleted file mode 100644
index 9019cecf7..000000000
--- a/gfx/pics/azumarill/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $01, $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a
-.frame2
-	db $01 ; bitmask
-	db $01, $01, $3b, $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44
-	db $45, $46, $47, $01, $01
-.frame3
-	db $02 ; bitmask
-	db $01, $01, $01, $31, $32, $3b, $3c, $3d, $33, $34, $3e, $3f
-	db $35, $36, $40, $41, $37, $38, $42, $43, $44, $39, $3a, $45
-	db $46, $47, $01, $01
-.frame4
-	db $03 ; bitmask
-	db $48, $49, $4a
-; 0xd8b6c
diff --git a/gfx/pics/azumarill/front.2bpp.lz b/gfx/pics/azumarill/front.animated.2bpp.lz.cc9fd2ed
index d6f031164..d6f031164 100644
--- a/gfx/pics/azumarill/front.2bpp.lz
+++ b/gfx/pics/azumarill/front.animated.2bpp.lz.cc9fd2ed
diff --git a/gfx/pics/azumarill/front.png b/gfx/pics/azumarill/front.png
new file mode 100644
index 000000000..9a51d6739
--- /dev/null
+++ b/gfx/pics/azumarill/front.png
diff --git a/gfx/pics/azumarill/normal.pal b/gfx/pics/azumarill/normal.pal
deleted file mode 100644
index 794d19341..000000000
--- a/gfx/pics/azumarill/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 10, 15, 24
-	RGB 22, 07, 04
-
diff --git a/gfx/pics/bayleef/back.2bpp.lz b/gfx/pics/bayleef/back.2bpp.lz.c4783e65
index 809e5d199..809e5d199 100644
--- a/gfx/pics/bayleef/back.2bpp.lz
+++ b/gfx/pics/bayleef/back.2bpp.lz.c4783e65
diff --git a/gfx/pics/bayleef/back.png b/gfx/pics/bayleef/back.png
new file mode 100644
index 000000000..1e95d7b08
--- /dev/null
+++ b/gfx/pics/bayleef/back.png
diff --git a/gfx/pics/bayleef/bitmask.asm b/gfx/pics/bayleef/bitmask.asm
deleted file mode 100644
index ad73fdd6a..000000000
--- a/gfx/pics/bayleef/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %11001111
-	db %11000011
-	db %00100000
-	db %00000000
-; 1
-	db %00000000
-	db %11000111
-	db %01000001
-	db %10111000
-	db %00001110
-; 2
-	db %00000000
-	db %11000011
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000110
-; 0xd3341
diff --git a/gfx/pics/bayleef/frames.asm b/gfx/pics/bayleef/frames.asm
deleted file mode 100644
index 2331a584a..000000000
--- a/gfx/pics/bayleef/frames.asm
+++ /dev/null
@@ -1,18 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e
-.frame2
-	db $01 ; bitmask
-	db $24, $25, $2f, $28, $29, $30, $31, $32, $33, $34, $35, $36
-	db $37, $38
-.frame3
-	db $02 ; bitmask
-	db $24, $39, $28, $3a
-.frame4
-	db $03 ; bitmask
-	db $3b, $3c
-; 0xd8463
diff --git a/gfx/pics/bayleef/front.2bpp.lz b/gfx/pics/bayleef/front.animated.2bpp.lz.147649f2
index 3134f6e16..3134f6e16 100644
--- a/gfx/pics/bayleef/front.2bpp.lz
+++ b/gfx/pics/bayleef/front.animated.2bpp.lz.147649f2
diff --git a/gfx/pics/bayleef/front.png b/gfx/pics/bayleef/front.png
new file mode 100644
index 000000000..9fd993152
--- /dev/null
+++ b/gfx/pics/bayleef/front.png
diff --git a/gfx/pics/bayleef/normal.pal b/gfx/pics/bayleef/normal.pal
deleted file mode 100644
index 03123d2d2..000000000
--- a/gfx/pics/bayleef/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 25, 06
-	RGB 11, 16, 02
-
diff --git a/gfx/pics/beedrill/back.2bpp.lz b/gfx/pics/beedrill/back.2bpp.lz.dfd6a87b
index 492eb64e2..492eb64e2 100644
--- a/gfx/pics/beedrill/back.2bpp.lz
+++ b/gfx/pics/beedrill/back.2bpp.lz.dfd6a87b
diff --git a/gfx/pics/beedrill/back.png b/gfx/pics/beedrill/back.png
new file mode 100644
index 000000000..c41eccf5f
--- /dev/null
+++ b/gfx/pics/beedrill/back.png
diff --git a/gfx/pics/beedrill/bitmask.asm b/gfx/pics/beedrill/bitmask.asm
deleted file mode 100644
index c5ec47a67..000000000
--- a/gfx/pics/beedrill/bitmask.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-; 0
-	db %10000000
-	db %11000111
-	db %11100011
-	db %11110001
-	db %01111000
-	db %00111000
-	db %00000000
-; 1
-	db %10000000
-	db %11000011
-	db %11100011
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd27e5
diff --git a/gfx/pics/beedrill/frames.asm b/gfx/pics/beedrill/frames.asm
deleted file mode 100644
index 5110adab0..000000000
--- a/gfx/pics/beedrill/frames.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f, $40, $41, $42, $43, $44, $04, $04, $04
-.frame2
-	db $00 ; bitmask
-	db $45, $32, $46, $34, $47, $48, $37, $38, $39, $3a, $3b, $3c
-	db $49, $4a, $4b, $4c, $4d, $4e, $4f, $44, $04, $04, $04
-.frame3
-	db $01 ; bitmask
-	db $50, $51, $52, $53, $54, $37, $38, $39, $3a, $55, $3c
-; 0xd44b0
diff --git a/gfx/pics/beedrill/front.2bpp.lz b/gfx/pics/beedrill/front.animated.2bpp.lz.1b5d3117
index 55f560521..55f560521 100644
--- a/gfx/pics/beedrill/front.2bpp.lz
+++ b/gfx/pics/beedrill/front.animated.2bpp.lz.1b5d3117
diff --git a/gfx/pics/beedrill/front.png b/gfx/pics/beedrill/front.png
new file mode 100644
index 000000000..271eaa3b4
--- /dev/null
+++ b/gfx/pics/beedrill/front.png
diff --git a/gfx/pics/beedrill/normal.pal b/gfx/pics/beedrill/normal.pal
deleted file mode 100644
index fefb75c12..000000000
--- a/gfx/pics/beedrill/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 19, 04
-	RGB 30, 04, 01
-
diff --git a/gfx/pics/bellossom/back.2bpp.lz b/gfx/pics/bellossom/back.2bpp.lz.10d31691
index d1a59b617..d1a59b617 100644
--- a/gfx/pics/bellossom/back.2bpp.lz
+++ b/gfx/pics/bellossom/back.2bpp.lz.10d31691
diff --git a/gfx/pics/bellossom/back.png b/gfx/pics/bellossom/back.png
new file mode 100644
index 000000000..53b24c2b4
--- /dev/null
+++ b/gfx/pics/bellossom/back.png
diff --git a/gfx/pics/bellossom/bitmask.asm b/gfx/pics/bellossom/bitmask.asm
deleted file mode 100644
index 9a7c93ed3..000000000
--- a/gfx/pics/bellossom/bitmask.asm
+++ /dev/null
@@ -1,49 +0,0 @@
-; 0
-	db %00000000
-	db %00110000
-	db %00011000
-	db %00001101
-	db %00000110
-	db %00000011
-	db %00000000
-; 1
-	db %00000000
-	db %00101000
-	db %00010100
-	db %00001011
-	db %00000101
-	db %00000011
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00110000
-	db %00011000
-	db %00001100
-	db %00000110
-	db %00000011
-	db %00000000
-; 4
-	db %00000000
-	db %00101000
-	db %00010100
-	db %00001010
-	db %00000101
-	db %00000011
-	db %00000000
-; 5
-	db %00000000
-	db %00000000
-	db %10000011
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd355b
diff --git a/gfx/pics/bellossom/frames.asm b/gfx/pics/bellossom/frames.asm
deleted file mode 100644
index 0f0379c01..000000000
--- a/gfx/pics/bellossom/frames.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b
-.frame2
-	db $01 ; bitmask
-	db $3c, $3d, $3e, $3f, $35, $40, $41, $42, $43, $44, $45
-.frame3
-	db $02 ; bitmask
-	db $35
-.frame4
-	db $03 ; bitmask
-	db $31, $32, $33, $34, $36, $37, $38, $39, $3a, $3b
-.frame5
-	db $04 ; bitmask
-	db $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44, $45
-.frame6
-	db $05 ; bitmask
-	db $46, $47, $48, $49
-; 0xd8af9
diff --git a/gfx/pics/bellossom/front.2bpp.lz b/gfx/pics/bellossom/front.animated.2bpp.lz.289eaecf
index 9cba9a1c3..9cba9a1c3 100644
--- a/gfx/pics/bellossom/front.2bpp.lz
+++ b/gfx/pics/bellossom/front.animated.2bpp.lz.289eaecf
diff --git a/gfx/pics/bellossom/front.png b/gfx/pics/bellossom/front.png
new file mode 100644
index 000000000..f77907c45
--- /dev/null
+++ b/gfx/pics/bellossom/front.png
diff --git a/gfx/pics/bellossom/normal.pal b/gfx/pics/bellossom/normal.pal
deleted file mode 100644
index ac7b655f6..000000000
--- a/gfx/pics/bellossom/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 08, 06
-	RGB 06, 17, 08
-
diff --git a/gfx/pics/bellsprout/back.2bpp.lz b/gfx/pics/bellsprout/back.2bpp.lz.9dacbda8
index ab600f064..ab600f064 100644
--- a/gfx/pics/bellsprout/back.2bpp.lz
+++ b/gfx/pics/bellsprout/back.2bpp.lz.9dacbda8
diff --git a/gfx/pics/bellsprout/back.png b/gfx/pics/bellsprout/back.png
new file mode 100644
index 000000000..ef5c271ef
--- /dev/null
+++ b/gfx/pics/bellsprout/back.png
diff --git a/gfx/pics/bellsprout/bitmask.asm b/gfx/pics/bellsprout/bitmask.asm
deleted file mode 100644
index c5ba4c4a2..000000000
--- a/gfx/pics/bellsprout/bitmask.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-; 0
-	db %01000010
-	db %00001000
-	db %00000000
-	db %00000000
-; 1
-	db %10001110
-	db %10000001
-	db %00110001
-	db %00000000
-; 2
-	db %10001110
-	db %00000001
-	db %00000000
-	db %00000000
-; 3
-	db %10000110
-	db %10000000
-	db %00110001
-	db %00000000
-; 4
-	db %01000010
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2c10
diff --git a/gfx/pics/bellsprout/frames.asm b/gfx/pics/bellsprout/frames.asm
deleted file mode 100644
index 2bc744afa..000000000
--- a/gfx/pics/bellsprout/frames.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b
-.frame2
-	db $00 ; bitmask
-	db $19, $1a, $1c
-.frame3
-	db $01 ; bitmask
-	db $1d, $1e, $0f, $1f, $20, $21, $22, $0f, $23
-.frame4
-	db $02 ; bitmask
-	db $1d, $1e, $0f, $1f, $20
-.frame5
-	db $03 ; bitmask
-	db $1d, $1e, $24, $21, $22, $0f, $23
-.frame6
-	db $04 ; bitmask
-	db $19, $1a
-; 0xd5098
diff --git a/gfx/pics/bellsprout/front.2bpp.lz b/gfx/pics/bellsprout/front.animated.2bpp.lz.44df413d
index 2593fb112..2593fb112 100644
--- a/gfx/pics/bellsprout/front.2bpp.lz
+++ b/gfx/pics/bellsprout/front.animated.2bpp.lz.44df413d
diff --git a/gfx/pics/bellsprout/front.png b/gfx/pics/bellsprout/front.png
new file mode 100644
index 000000000..0a243dd94
--- /dev/null
+++ b/gfx/pics/bellsprout/front.png
diff --git a/gfx/pics/bellsprout/normal.pal b/gfx/pics/bellsprout/normal.pal
deleted file mode 100644
index 92f55f832..000000000
--- a/gfx/pics/bellsprout/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 31, 07
-	RGB 27, 10, 09
-
diff --git a/gfx/pics/blastoise/back.2bpp.lz b/gfx/pics/blastoise/back.2bpp.lz.b90e8d5a
index 5e27c9989..5e27c9989 100644
--- a/gfx/pics/blastoise/back.2bpp.lz
+++ b/gfx/pics/blastoise/back.2bpp.lz.b90e8d5a
diff --git a/gfx/pics/blastoise/back.png b/gfx/pics/blastoise/back.png
new file mode 100644
index 000000000..9f236fb94
--- /dev/null
+++ b/gfx/pics/blastoise/back.png
diff --git a/gfx/pics/blastoise/bitmask.asm b/gfx/pics/blastoise/bitmask.asm
deleted file mode 100644
index 211912d5c..000000000
--- a/gfx/pics/blastoise/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00001100
-	db %10001111
-	db %11000111
-	db %10100111
-	db %11000111
-	db %00000011
-	db %00000000
-; 1
-	db %10011111
-	db %11001111
-	db %11000111
-	db %10100111
-	db %11110111
-	db %00011011
-	db %00000000
-; 2
-	db %00011100
-	db %10001111
-	db %11000111
-	db %10100111
-	db %11000111
-	db %10000011
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %10000000
-	db %00000000
-; 0xd27a5
diff --git a/gfx/pics/blastoise/frames.asm b/gfx/pics/blastoise/frames.asm
deleted file mode 100644
index cbef1366e..000000000
--- a/gfx/pics/blastoise/frames.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f, $40, $41, $42, $43, $44, $45, $46, $47, $48
-.frame2
-	db $01 ; bitmask
-	db $49, $4a, $31, $4b, $4c, $4d, $4e, $4f, $50, $51, $52, $53
-	db $54, $55, $56, $3b, $3c, $57, $58, $3f, $40, $41, $42, $43
-	db $44, $59, $5a, $45, $46, $47, $48, $5b, $5c
-.frame3
-	db $02 ; bitmask
-	db $31, $32, $4c, $33, $4f, $50, $51, $5d, $54, $55, $56, $3b
-	db $3c, $57, $58, $3f, $40, $41, $42, $43, $44, $45, $46, $47
-	db $48, $5e
-.frame4
-	db $03 ; bitmask
-	db $5e
-; 0xd43dd
diff --git a/gfx/pics/blastoise/front.2bpp.lz b/gfx/pics/blastoise/front.animated.2bpp.lz.3899aed0
index 33148b076..33148b076 100644
--- a/gfx/pics/blastoise/front.2bpp.lz
+++ b/gfx/pics/blastoise/front.animated.2bpp.lz.3899aed0
diff --git a/gfx/pics/blastoise/front.png b/gfx/pics/blastoise/front.png
new file mode 100644
index 000000000..f6623fe78
--- /dev/null
+++ b/gfx/pics/blastoise/front.png
diff --git a/gfx/pics/blastoise/normal.pal b/gfx/pics/blastoise/normal.pal
deleted file mode 100644
index 2198d5946..000000000
--- a/gfx/pics/blastoise/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 20, 03
-	RGB 08, 11, 31
-
diff --git a/gfx/pics/blissey/back.2bpp.lz b/gfx/pics/blissey/back.2bpp.lz.d2763673
index 00749ddee..00749ddee 100644
--- a/gfx/pics/blissey/back.2bpp.lz
+++ b/gfx/pics/blissey/back.2bpp.lz.d2763673
diff --git a/gfx/pics/blissey/back.png b/gfx/pics/blissey/back.png
new file mode 100644
index 000000000..858ad5d40
--- /dev/null
+++ b/gfx/pics/blissey/back.png
diff --git a/gfx/pics/blissey/bitmask.asm b/gfx/pics/blissey/bitmask.asm
deleted file mode 100644
index 2f60296f3..000000000
--- a/gfx/pics/blissey/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %10000000
-	db %11000001
-	db %11100001
-	db %00000000
-	db %00000000
-; 1
-	db %00001100
-	db %00000110
-	db %10000000
-	db %11000001
-	db %11100001
-	db %00110000
-	db %00000000
-; 2
-	db %00110000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000010
-	db %11000001
-	db %00000000
-; 3
-	db %00000000
-	db %10000000
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd39cb
diff --git a/gfx/pics/blissey/frames.asm b/gfx/pics/blissey/frames.asm
deleted file mode 100644
index d7df7070c..000000000
--- a/gfx/pics/blissey/frames.asm
+++ /dev/null
@@ -1,18 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38
-.frame2
-	db $01 ; bitmask
-	db $39, $3a, $3b, $3c, $31, $32, $3d, $3e, $3f, $40, $41, $42
-	db $43, $44
-.frame3
-	db $02 ; bitmask
-	db $45, $46, $47, $48, $49, $4a
-.frame4
-	db $03 ; bitmask
-	db $4b, $4c
-; 0xd9631
diff --git a/gfx/pics/blissey/front.2bpp.lz b/gfx/pics/blissey/front.animated.2bpp.lz.04f2353a
index 76f492c43..76f492c43 100644
--- a/gfx/pics/blissey/front.2bpp.lz
+++ b/gfx/pics/blissey/front.animated.2bpp.lz.04f2353a
diff --git a/gfx/pics/blissey/front.png b/gfx/pics/blissey/front.png
new file mode 100644
index 000000000..3d44eb5d6
--- /dev/null
+++ b/gfx/pics/blissey/front.png
diff --git a/gfx/pics/blissey/normal.pal b/gfx/pics/blissey/normal.pal
deleted file mode 100644
index af97ddab4..000000000
--- a/gfx/pics/blissey/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 12, 14
-	RGB 18, 05, 08
-
diff --git a/gfx/pics/bulbasaur/back.2bpp.lz b/gfx/pics/bulbasaur/back.2bpp.lz.84f8d1c4
index 44f8fa450..44f8fa450 100644
--- a/gfx/pics/bulbasaur/back.2bpp.lz
+++ b/gfx/pics/bulbasaur/back.2bpp.lz.84f8d1c4
diff --git a/gfx/pics/bulbasaur/back.png b/gfx/pics/bulbasaur/back.png
new file mode 100644
index 000000000..c37b4b2c2
--- /dev/null
+++ b/gfx/pics/bulbasaur/back.png
diff --git a/gfx/pics/bulbasaur/bitmask.asm b/gfx/pics/bulbasaur/bitmask.asm
deleted file mode 100644
index c811235df..000000000
--- a/gfx/pics/bulbasaur/bitmask.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-; 0
-	db %01100000
-	db %10101101
-	db %00000001
-	db %00000000
-; 1
-	db %00100000
-	db %10101101
-	db %00000001
-	db %00000000
-; 2
-	db %01000010
-	db %00101001
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00100001
-	db %00000000
-	db %00000000
-; 4
-	db %10000100
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd26f9
diff --git a/gfx/pics/bulbasaur/frames.asm b/gfx/pics/bulbasaur/frames.asm
deleted file mode 100644
index 99729f703..000000000
--- a/gfx/pics/bulbasaur/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20
-.frame2
-	db $01 ; bitmask
-	db $21, $1b, $22, $1d, $1e, $23, $24
-.frame3
-	db $02 ; bitmask
-	db $25, $26, $1b, $27, $1e
-.frame4
-	db $03 ; bitmask
-	db $1b, $1e
-.frame5
-	db $04 ; bitmask
-	db $28, $29, $2a
-; 0xd421e
diff --git a/gfx/pics/bulbasaur/front.2bpp.lz b/gfx/pics/bulbasaur/front.animated.2bpp.lz.04627405
index fc4550001..fc4550001 100644
--- a/gfx/pics/bulbasaur/front.2bpp.lz
+++ b/gfx/pics/bulbasaur/front.animated.2bpp.lz.04627405
diff --git a/gfx/pics/bulbasaur/front.png b/gfx/pics/bulbasaur/front.png
new file mode 100644
index 000000000..0bd513962
--- /dev/null
+++ b/gfx/pics/bulbasaur/front.png
diff --git a/gfx/pics/bulbasaur/normal.pal b/gfx/pics/bulbasaur/normal.pal
deleted file mode 100644
index 75bb2a401..000000000
--- a/gfx/pics/bulbasaur/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 12, 31, 11
-	RGB 31, 10, 06
-
diff --git a/gfx/pics/butterfree/back.2bpp.lz b/gfx/pics/butterfree/back.2bpp.lz.a8543d86
index 6d741f493..6d741f493 100644
--- a/gfx/pics/butterfree/back.2bpp.lz
+++ b/gfx/pics/butterfree/back.2bpp.lz.a8543d86
diff --git a/gfx/pics/butterfree/back.png b/gfx/pics/butterfree/back.png
new file mode 100644
index 000000000..18757bb3e
--- /dev/null
+++ b/gfx/pics/butterfree/back.png
diff --git a/gfx/pics/butterfree/bitmask.asm b/gfx/pics/butterfree/bitmask.asm
deleted file mode 100644
index fdc1f37ab..000000000
--- a/gfx/pics/butterfree/bitmask.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-; 0
-	db %10000000
-	db %11110111
-	db %01011000
-	db %11111100
-	db %11111111
-	db %01111111
-	db %00000000
-; 1
-	db %00000000
-	db %00000100
-	db %00000010
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd27c7
diff --git a/gfx/pics/butterfree/frames.asm b/gfx/pics/butterfree/frames.asm
deleted file mode 100644
index aee159cd9..000000000
--- a/gfx/pics/butterfree/frames.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $03, $36, $37, $38, $39, $3a, $3b
-	db $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44, $45, $46, $47
-	db $48, $03, $03, $03, $49, $4a, $03, $03
-.frame2
-	db $01 ; bitmask
-	db $4b, $4c
-; 0xd4447
diff --git a/gfx/pics/butterfree/front.2bpp.lz b/gfx/pics/butterfree/front.animated.2bpp.lz.33ba7e24
index bf8b7a690..bf8b7a690 100644
--- a/gfx/pics/butterfree/front.2bpp.lz
+++ b/gfx/pics/butterfree/front.animated.2bpp.lz.33ba7e24
diff --git a/gfx/pics/butterfree/front.png b/gfx/pics/butterfree/front.png
new file mode 100644
index 000000000..5b60425bf
--- /dev/null
+++ b/gfx/pics/butterfree/front.png
diff --git a/gfx/pics/butterfree/normal.pal b/gfx/pics/butterfree/normal.pal
deleted file mode 100644
index bd2d494a2..000000000
--- a/gfx/pics/butterfree/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 18, 25, 31
-	RGB 26, 05, 13
-
diff --git a/gfx/pics/caterpie/back.2bpp.lz b/gfx/pics/caterpie/back.2bpp.lz.57e32015
index a3788d1e4..a3788d1e4 100644
--- a/gfx/pics/caterpie/back.2bpp.lz
+++ b/gfx/pics/caterpie/back.2bpp.lz.57e32015
diff --git a/gfx/pics/caterpie/back.png b/gfx/pics/caterpie/back.png
new file mode 100644
index 000000000..66add2336
--- /dev/null
+++ b/gfx/pics/caterpie/back.png
diff --git a/gfx/pics/caterpie/bitmask.asm b/gfx/pics/caterpie/bitmask.asm
deleted file mode 100644
index e1674dda2..000000000
--- a/gfx/pics/caterpie/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %11000110
-	db %00111001
-	db %00000011
-	db %00000000
-; 1
-	db %00000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd27ad
diff --git a/gfx/pics/caterpie/frames.asm b/gfx/pics/caterpie/frames.asm
deleted file mode 100644
index 4bfa33c38..000000000
--- a/gfx/pics/caterpie/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $00, $00, $19, $1a, $1b, $1c, $1d, $1e, $1f, $20
-.frame2
-	db $00 ; bitmask
-	db $21, $00, $22, $1a, $1b, $23, $24, $1e, $1f, $20
-.frame3
-	db $01 ; bitmask
-	db $25
-; 0xd43fb
diff --git a/gfx/pics/caterpie/front.2bpp.lz b/gfx/pics/caterpie/front.animated.2bpp.lz.ec4f7cb8
index d3036d9ff..d3036d9ff 100644
--- a/gfx/pics/caterpie/front.2bpp.lz
+++ b/gfx/pics/caterpie/front.animated.2bpp.lz.ec4f7cb8
diff --git a/gfx/pics/caterpie/front.png b/gfx/pics/caterpie/front.png
new file mode 100644
index 000000000..78130b1aa
--- /dev/null
+++ b/gfx/pics/caterpie/front.png
diff --git a/gfx/pics/caterpie/normal.pal b/gfx/pics/caterpie/normal.pal
deleted file mode 100644
index 51093dd01..000000000
--- a/gfx/pics/caterpie/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 12, 22, 06
-	RGB 31, 09, 15
-
diff --git a/gfx/pics/celebi/back.2bpp.lz b/gfx/pics/celebi/back.2bpp.lz.17ea5fe6
index e8153224c..e8153224c 100644
--- a/gfx/pics/celebi/back.2bpp.lz
+++ b/gfx/pics/celebi/back.2bpp.lz.17ea5fe6
diff --git a/gfx/pics/celebi/back.png b/gfx/pics/celebi/back.png
new file mode 100644
index 000000000..ebb79c020
--- /dev/null
+++ b/gfx/pics/celebi/back.png
diff --git a/gfx/pics/celebi/bitmask.asm b/gfx/pics/celebi/bitmask.asm
deleted file mode 100644
index 0a57151d0..000000000
--- a/gfx/pics/celebi/bitmask.asm
+++ /dev/null
@@ -1,36 +0,0 @@
-; 0
-	db %00100000
-	db %10101100
-	db %01100111
-	db %00000000
-; 1
-	db %10100000
-	db %10111100
-	db %01100111
-	db %00000000
-; 2
-	db %10000000
-	db %00110000
-	db %00000100
-	db %00000000
-; 3
-	db %10100000
-	db %10111100
-	db %00100101
-	db %00000000
-; 4
-	db %00100000
-	db %10101100
-	db %00100101
-	db %00000000
-; 5
-	db %00000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 6
-	db %00000000
-	db %00100000
-	db %00000100
-	db %00000000
-; 0xd3acf
diff --git a/gfx/pics/celebi/frames.asm b/gfx/pics/celebi/frames.asm
deleted file mode 100644
index ef4507647..000000000
--- a/gfx/pics/celebi/frames.asm
+++ /dev/null
@@ -1,53 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-	dw .frame8
-	dw .frame9
-	dw .frame10
-	dw .frame11
-	dw .frame12
-	dw .frame13
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $00, $1d, $1e, $1f, $00, $20
-.frame2
-	db $00 ; bitmask
-	db $19, $1a, $1b, $21, $00, $1d, $1e, $22, $00, $20
-.frame3
-	db $01 ; bitmask
-	db $23, $24, $25, $26, $27, $1c, $00, $28, $29, $1f, $2a, $2b
-.frame4
-	db $01 ; bitmask
-	db $23, $24, $25, $26, $27, $21, $00, $28, $29, $22, $2a, $2b
-.frame5
-	db $02 ; bitmask
-	db $24, $27, $1c, $1f
-.frame6
-	db $02 ; bitmask
-	db $24, $27, $21, $22
-.frame7
-	db $03 ; bitmask
-	db $19, $24, $1a, $1b, $27, $1c, $00, $2c, $1f, $2d
-.frame8
-	db $03 ; bitmask
-	db $19, $24, $1a, $1b, $27, $21, $00, $2c, $22, $2d
-.frame9
-	db $04 ; bitmask
-	db $23, $25, $2e, $1c, $00, $2f, $1f, $2d
-.frame10
-	db $04 ; bitmask
-	db $23, $25, $2e, $21, $00, $2f, $22, $2d
-.frame11
-	db $05 ; bitmask
-	db $27
-.frame12
-	db $06 ; bitmask
-	db $1c, $1f
-.frame13
-	db $06 ; bitmask
-	db $21, $22
-; 0xd998b
diff --git a/gfx/pics/celebi/front.2bpp.lz b/gfx/pics/celebi/front.animated.2bpp.lz.16f259a5
index afc41bee7..afc41bee7 100644
--- a/gfx/pics/celebi/front.2bpp.lz
+++ b/gfx/pics/celebi/front.animated.2bpp.lz.16f259a5
diff --git a/gfx/pics/celebi/front.png b/gfx/pics/celebi/front.png
new file mode 100644
index 000000000..66bcd2e70
--- /dev/null
+++ b/gfx/pics/celebi/front.png
diff --git a/gfx/pics/celebi/normal.pal b/gfx/pics/celebi/normal.pal
deleted file mode 100644
index df26077cd..000000000
--- a/gfx/pics/celebi/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 10, 31, 00
-	RGB 03, 13, 28
-
diff --git a/gfx/pics/chansey/back.2bpp.lz b/gfx/pics/chansey/back.2bpp.lz.14d90ba1
index 239df2d63..239df2d63 100644
--- a/gfx/pics/chansey/back.2bpp.lz
+++ b/gfx/pics/chansey/back.2bpp.lz.14d90ba1
diff --git a/gfx/pics/chansey/back.png b/gfx/pics/chansey/back.png
new file mode 100644
index 000000000..ea2296b37
--- /dev/null
+++ b/gfx/pics/chansey/back.png
diff --git a/gfx/pics/chansey/bitmask.asm b/gfx/pics/chansey/bitmask.asm
deleted file mode 100644
index 28dc212ed..000000000
--- a/gfx/pics/chansey/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %11000111
-	db %01110001
-	db %00011100
-	db %11000111
-	db %00000111
-; 1
-	db %10000110
-	db %00000000
-	db %00000000
-	db %10000000
-	db %00000001
-; 2
-	db %00000000
-	db %00110000
-	db %00001100
-	db %00000000
-	db %00000000
-; 3
-	db %11000111
-	db %01110001
-	db %00011100
-	db %11000111
-	db %00000001
-; 0xd2ff0
diff --git a/gfx/pics/chansey/frames.asm b/gfx/pics/chansey/frames.asm
deleted file mode 100644
index ad22cb7eb..000000000
--- a/gfx/pics/chansey/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $30, $31, $32, $33, $34, $35, $36, $37
-.frame2
-	db $01 ; bitmask
-	db $38, $39, $3a, $3b, $3c
-.frame3
-	db $02 ; bitmask
-	db $3d, $3e, $3f, $40
-.frame4
-	db $03 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $30, $31, $32, $33, $34, $35
-; 0xd59cc
diff --git a/gfx/pics/chansey/front.2bpp.lz b/gfx/pics/chansey/front.animated.2bpp.lz.158fc381
index 1fc457f19..1fc457f19 100644
--- a/gfx/pics/chansey/front.2bpp.lz
+++ b/gfx/pics/chansey/front.animated.2bpp.lz.158fc381
diff --git a/gfx/pics/chansey/front.png b/gfx/pics/chansey/front.png
new file mode 100644
index 000000000..0213b874d
--- /dev/null
+++ b/gfx/pics/chansey/front.png
diff --git a/gfx/pics/chansey/normal.pal b/gfx/pics/chansey/normal.pal
deleted file mode 100644
index f7fafd1f7..000000000
--- a/gfx/pics/chansey/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 16, 21
-	RGB 31, 09, 19
-
diff --git a/gfx/pics/charizard/back.2bpp.lz b/gfx/pics/charizard/back.2bpp.lz.f04ac62c
index db1d9c9ea..db1d9c9ea 100644
--- a/gfx/pics/charizard/back.2bpp.lz
+++ b/gfx/pics/charizard/back.2bpp.lz.f04ac62c
diff --git a/gfx/pics/charizard/back.png b/gfx/pics/charizard/back.png
new file mode 100644
index 000000000..2ad954963
--- /dev/null
+++ b/gfx/pics/charizard/back.png
diff --git a/gfx/pics/charizard/bitmask.asm b/gfx/pics/charizard/bitmask.asm
deleted file mode 100644
index 21a615a42..000000000
--- a/gfx/pics/charizard/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %10011011
-	db %11000111
-	db %00100101
-	db %00000011
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %10011111
-	db %11000111
-	db %11100101
-	db %11110011
-	db %00111000
-	db %00111100
-	db %00000000
-; 2
-	db %10000000
-	db %11000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2766
diff --git a/gfx/pics/charizard/frames.asm b/gfx/pics/charizard/frames.asm
deleted file mode 100644
index 8502da5af..000000000
--- a/gfx/pics/charizard/frames.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f
-.frame2
-	db $01 ; bitmask
-	db $31, $40, $41, $42, $34, $43, $36, $37, $44, $45, $3a, $3b
-	db $3c, $46, $05, $47, $3e, $3f, $48, $49, $4a, $4b, $05, $4c
-	db $4d, $05, $2a, $4e, $4f
-.frame3
-	db $02 ; bitmask
-	db $50, $51, $52, $53
-; 0xd432b
diff --git a/gfx/pics/charizard/front.2bpp.lz b/gfx/pics/charizard/front.animated.2bpp.lz.0068f820
index aab0fda99..aab0fda99 100644
--- a/gfx/pics/charizard/front.2bpp.lz
+++ b/gfx/pics/charizard/front.animated.2bpp.lz.0068f820
diff --git a/gfx/pics/charizard/front.png b/gfx/pics/charizard/front.png
new file mode 100644
index 000000000..1cb0df943
--- /dev/null
+++ b/gfx/pics/charizard/front.png
diff --git a/gfx/pics/charizard/normal.pal b/gfx/pics/charizard/normal.pal
deleted file mode 100644
index e0658358b..000000000
--- a/gfx/pics/charizard/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 11, 00
-	RGB 06, 09, 15
-
diff --git a/gfx/pics/charmander/back.2bpp.lz b/gfx/pics/charmander/back.2bpp.lz.bcb371c6
index e8eb5eb4e..e8eb5eb4e 100644
--- a/gfx/pics/charmander/back.2bpp.lz
+++ b/gfx/pics/charmander/back.2bpp.lz.bcb371c6
diff --git a/gfx/pics/charmander/back.png b/gfx/pics/charmander/back.png
new file mode 100644
index 000000000..b5e6cc5a7
--- /dev/null
+++ b/gfx/pics/charmander/back.png
diff --git a/gfx/pics/charmander/bitmask.asm b/gfx/pics/charmander/bitmask.asm
deleted file mode 100644
index fc93cb7e3..000000000
--- a/gfx/pics/charmander/bitmask.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-; 0
-	db %00001100
-	db %00110001
-	db %00000000
-	db %00000000
-; 1
-	db %11101111
-	db %00111101
-	db %00000000
-	db %00000000
-; 2
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %10000000
-	db %01100011
-	db %00000000
-; 0xd2742
diff --git a/gfx/pics/charmander/frames.asm b/gfx/pics/charmander/frames.asm
deleted file mode 100644
index 30e1c3fb1..000000000
--- a/gfx/pics/charmander/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d
-.frame2
-	db $01 ; bitmask
-	db $14, $1e, $1f, $1a, $20, $21, $22, $1b, $23, $24, $1c, $1d
-.frame3
-	db $02 ; bitmask
-	db $25
-.frame4
-	db $03 ; bitmask
-	db $14, $26, $27, $28, $29
-; 0xd42ac
diff --git a/gfx/pics/charmander/front.2bpp.lz b/gfx/pics/charmander/front.animated.2bpp.lz.704bfc17
index 7cc31694b..7cc31694b 100644
--- a/gfx/pics/charmander/front.2bpp.lz
+++ b/gfx/pics/charmander/front.animated.2bpp.lz.704bfc17
diff --git a/gfx/pics/charmander/front.png b/gfx/pics/charmander/front.png
new file mode 100644
index 000000000..ba365e42a
--- /dev/null
+++ b/gfx/pics/charmander/front.png
diff --git a/gfx/pics/charmander/normal.pal b/gfx/pics/charmander/normal.pal
deleted file mode 100644
index 9edccc40a..000000000
--- a/gfx/pics/charmander/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 13, 04
-	RGB 22, 05, 05
-
diff --git a/gfx/pics/charmeleon/back.2bpp.lz b/gfx/pics/charmeleon/back.2bpp.lz.cf73268f
index aec0cd7b2..aec0cd7b2 100644
--- a/gfx/pics/charmeleon/back.2bpp.lz
+++ b/gfx/pics/charmeleon/back.2bpp.lz.cf73268f
diff --git a/gfx/pics/charmeleon/back.png b/gfx/pics/charmeleon/back.png
new file mode 100644
index 000000000..60eb4666f
--- /dev/null
+++ b/gfx/pics/charmeleon/back.png
diff --git a/gfx/pics/charmeleon/bitmask.asm b/gfx/pics/charmeleon/bitmask.asm
deleted file mode 100644
index e9a1b8e47..000000000
--- a/gfx/pics/charmeleon/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00000000
-	db %00001100
-	db %00000010
-	db %00000000
-	db %00000000
-; 1
-	db %11011110
-	db %11110111
-	db %01011001
-	db %00000000
-	db %00000000
-; 2
-	db %11011110
-	db %11110111
-	db %00111001
-	db %00001100
-	db %00000000
-; 0xd2751
diff --git a/gfx/pics/charmeleon/frames.asm b/gfx/pics/charmeleon/frames.asm
deleted file mode 100644
index 0b8add687..000000000
--- a/gfx/pics/charmeleon/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26
-.frame2
-	db $01 ; bitmask
-	db $00, $27, $28, $00, $00, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $30, $31, $00, $32, $33
-.frame3
-	db $02 ; bitmask
-	db $00, $27, $34, $35, $00, $29, $2a, $36, $37, $2d, $2e, $2f
-	db $38, $39, $00, $3a, $3b, $3c, $3d
-.frame4
-	db $02 ; bitmask
-	db $00, $27, $34, $35, $00, $29, $2a, $36, $37, $2d, $2e, $2f
-	db $3e, $39, $00, $3f, $40, $3c, $3d
-; 0xd42f2
diff --git a/gfx/pics/charmeleon/front.2bpp.lz b/gfx/pics/charmeleon/front.animated.2bpp.lz.0e629968
index efe789dad..efe789dad 100644
--- a/gfx/pics/charmeleon/front.2bpp.lz
+++ b/gfx/pics/charmeleon/front.animated.2bpp.lz.0e629968
diff --git a/gfx/pics/charmeleon/front.png b/gfx/pics/charmeleon/front.png
new file mode 100644
index 000000000..44558255f
--- /dev/null
+++ b/gfx/pics/charmeleon/front.png
diff --git a/gfx/pics/charmeleon/normal.pal b/gfx/pics/charmeleon/normal.pal
deleted file mode 100644
index 5de328616..000000000
--- a/gfx/pics/charmeleon/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 08, 06
-	RGB 18, 03, 07
-
diff --git a/gfx/pics/chikorita/back.2bpp.lz b/gfx/pics/chikorita/back.2bpp.lz.27a21938
index e98365a2b..e98365a2b 100644
--- a/gfx/pics/chikorita/back.2bpp.lz
+++ b/gfx/pics/chikorita/back.2bpp.lz.27a21938
diff --git a/gfx/pics/chikorita/back.png b/gfx/pics/chikorita/back.png
new file mode 100644
index 000000000..5ce5ae068
--- /dev/null
+++ b/gfx/pics/chikorita/back.png
diff --git a/gfx/pics/chikorita/bitmask.asm b/gfx/pics/chikorita/bitmask.asm
deleted file mode 100644
index 60922b7c0..000000000
--- a/gfx/pics/chikorita/bitmask.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-; 0
-	db %11000100
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %11100111
-	db %10001100
-	db %01110001
-	db %00000000
-; 2
-	db %11101110
-	db %10001101
-	db %01110001
-	db %00000000
-; 3
-	db %01000000
-	db %10001100
-	db %01110011
-	db %00000000
-; 4
-	db %11000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd332d
diff --git a/gfx/pics/chikorita/frames.asm b/gfx/pics/chikorita/frames.asm
deleted file mode 100644
index 64c07b539..000000000
--- a/gfx/pics/chikorita/frames.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b
-.frame2
-	db $01 ; bitmask
-	db $1c, $1d, $1e, $1f, $20, $21, $22, $23, $24, $00, $00, $00
-	db $00
-.frame3
-	db $02 ; bitmask
-	db $25, $26, $27, $00, $28, $29, $2a, $00, $23, $00, $00, $00
-	db $00, $00
-.frame4
-	db $03 ; bitmask
-	db $1a, $2b, $2c, $00, $2d, $2e, $00, $00, $00
-.frame5
-	db $04 ; bitmask
-	db $2f, $30
-; 0xd8438
diff --git a/gfx/pics/chikorita/front.2bpp.lz b/gfx/pics/chikorita/front.animated.2bpp.lz.18de5fe9
index 008c4ec2d..008c4ec2d 100644
--- a/gfx/pics/chikorita/front.2bpp.lz
+++ b/gfx/pics/chikorita/front.animated.2bpp.lz.18de5fe9
diff --git a/gfx/pics/chikorita/front.png b/gfx/pics/chikorita/front.png
new file mode 100644
index 000000000..584f05cbc
--- /dev/null
+++ b/gfx/pics/chikorita/front.png
diff --git a/gfx/pics/chikorita/normal.pal b/gfx/pics/chikorita/normal.pal
deleted file mode 100644
index 06fdb2171..000000000
--- a/gfx/pics/chikorita/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 21, 23, 12
-	RGB 03, 20, 00
-
diff --git a/gfx/pics/chinchou/back.2bpp.lz b/gfx/pics/chinchou/back.2bpp.lz.ea061e91
index 744af1ad4..744af1ad4 100644
--- a/gfx/pics/chinchou/back.2bpp.lz
+++ b/gfx/pics/chinchou/back.2bpp.lz.ea061e91
diff --git a/gfx/pics/chinchou/back.png b/gfx/pics/chinchou/back.png
new file mode 100644
index 000000000..5de7df3ba
--- /dev/null
+++ b/gfx/pics/chinchou/back.png
diff --git a/gfx/pics/chinchou/bitmask.asm b/gfx/pics/chinchou/bitmask.asm
deleted file mode 100644
index b2045d8b5..000000000
--- a/gfx/pics/chinchou/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00110000
-	db %00001000
-	db %00000001
-	db %00110000
-	db %00001100
-; 1
-	db %00000000
-	db %00000000
-	db %00000001
-	db %00000000
-	db %00000000
-; 2
-	db %00001100
-	db %00000001
-	db %00000000
-	db %00001100
-	db %00000111
-; 3
-	db %00000000
-	db %00000100
-	db %01000000
-	db %00000000
-	db %00000000
-; 0xd347d
diff --git a/gfx/pics/chinchou/frames.asm b/gfx/pics/chinchou/frames.asm
deleted file mode 100644
index 748a3d619..000000000
--- a/gfx/pics/chinchou/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b
-.frame2
-	db $01 ; bitmask
-	db $27
-.frame3
-	db $02 ; bitmask
-	db $2c, $2d, $2e, $2f, $30, $31, $32, $33
-.frame4
-	db $03 ; bitmask
-	db $34, $35
-; 0xd8898
diff --git a/gfx/pics/chinchou/front.2bpp.lz b/gfx/pics/chinchou/front.animated.2bpp.lz.901aa690
index b5db65701..b5db65701 100644
--- a/gfx/pics/chinchou/front.2bpp.lz
+++ b/gfx/pics/chinchou/front.animated.2bpp.lz.901aa690
diff --git a/gfx/pics/chinchou/front.png b/gfx/pics/chinchou/front.png
new file mode 100644
index 000000000..4af95c53e
--- /dev/null
+++ b/gfx/pics/chinchou/front.png
diff --git a/gfx/pics/chinchou/normal.pal b/gfx/pics/chinchou/normal.pal
deleted file mode 100644
index 1749e7238..000000000
--- a/gfx/pics/chinchou/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 22, 07
-	RGB 13, 10, 28
-
diff --git a/gfx/pics/clefable/back.2bpp.lz b/gfx/pics/clefable/back.2bpp.lz.d57ec142
index 1bcb8cbcd..1bcb8cbcd 100644
--- a/gfx/pics/clefable/back.2bpp.lz
+++ b/gfx/pics/clefable/back.2bpp.lz.d57ec142
diff --git a/gfx/pics/clefable/back.png b/gfx/pics/clefable/back.png
new file mode 100644
index 000000000..b049faa13
--- /dev/null
+++ b/gfx/pics/clefable/back.png
diff --git a/gfx/pics/clefable/bitmask.asm b/gfx/pics/clefable/bitmask.asm
deleted file mode 100644
index b1c1ae623..000000000
--- a/gfx/pics/clefable/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00011100
-	db %11000000
-	db %11000011
-	db %00110000
-	db %00000000
-; 1
-	db %00110000
-	db %11001100
-	db %00100011
-	db %00011100
-	db %00000111
-; 2
-	db %00000000
-	db %01000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2972
diff --git a/gfx/pics/clefable/frames.asm b/gfx/pics/clefable/frames.asm
deleted file mode 100644
index e1346985d..000000000
--- a/gfx/pics/clefable/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e
-.frame2
-	db $01 ; bitmask
-	db $2f, $30, $31, $32, $27, $28, $0f, $33, $0f, $34, $35, $36
-	db $37, $38, $39
-.frame3
-	db $02 ; bitmask
-	db $3a, $3b
-; 0xd495b
diff --git a/gfx/pics/clefable/front.2bpp.lz b/gfx/pics/clefable/front.animated.2bpp.lz.59d160ad
index 4fb424305..4fb424305 100644
--- a/gfx/pics/clefable/front.2bpp.lz
+++ b/gfx/pics/clefable/front.animated.2bpp.lz.59d160ad
diff --git a/gfx/pics/clefable/front.png b/gfx/pics/clefable/front.png
new file mode 100644
index 000000000..0b85d5f7d
--- /dev/null
+++ b/gfx/pics/clefable/front.png
diff --git a/gfx/pics/clefable/normal.pal b/gfx/pics/clefable/normal.pal
deleted file mode 100644
index 295fe98ff..000000000
--- a/gfx/pics/clefable/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 14, 18
-	RGB 13, 07, 00
-
diff --git a/gfx/pics/clefairy/back.2bpp.lz b/gfx/pics/clefairy/back.2bpp.lz.f8aff3dd
index a6a5ecb82..a6a5ecb82 100644
--- a/gfx/pics/clefairy/back.2bpp.lz
+++ b/gfx/pics/clefairy/back.2bpp.lz.f8aff3dd
diff --git a/gfx/pics/clefairy/back.png b/gfx/pics/clefairy/back.png
new file mode 100644
index 000000000..76f475ea0
--- /dev/null
+++ b/gfx/pics/clefairy/back.png
diff --git a/gfx/pics/clefairy/bitmask.asm b/gfx/pics/clefairy/bitmask.asm
deleted file mode 100644
index 1c599e334..000000000
--- a/gfx/pics/clefairy/bitmask.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-; 0
-	db %10001100
-	db %00110001
-	db %00001110
-	db %00000000
-; 1
-	db %10001110
-	db %10110001
-	db %00111110
-	db %00000000
-; 2
-	db %10000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 3
-	db %10001100
-	db %00010001
-	db %00000000
-	db %00000000
-; 4
-	db %00000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd2963
diff --git a/gfx/pics/clefairy/frames.asm b/gfx/pics/clefairy/frames.asm
deleted file mode 100644
index 88978f35b..000000000
--- a/gfx/pics/clefairy/frames.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21
-.frame2
-	db $01 ; bitmask
-	db $22, $19, $1a, $23, $1c, $24, $1e, $25, $1f, $20, $21, $00
-	db $00
-.frame3
-	db $02 ; bitmask
-	db $26, $27
-.frame4
-	db $03 ; bitmask
-	db $19, $1a, $1b, $1c, $27
-.frame5
-	db $04 ; bitmask
-	db $27
-; 0xd4936
diff --git a/gfx/pics/clefairy/front.2bpp.lz b/gfx/pics/clefairy/front.animated.2bpp.lz.0918b60d
index d8adc2e2e..d8adc2e2e 100644
--- a/gfx/pics/clefairy/front.2bpp.lz
+++ b/gfx/pics/clefairy/front.animated.2bpp.lz.0918b60d
diff --git a/gfx/pics/clefairy/front.png b/gfx/pics/clefairy/front.png
new file mode 100644
index 000000000..70e63d454
--- /dev/null
+++ b/gfx/pics/clefairy/front.png
diff --git a/gfx/pics/clefairy/normal.pal b/gfx/pics/clefairy/normal.pal
deleted file mode 100644
index 295fe98ff..000000000
--- a/gfx/pics/clefairy/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 14, 18
-	RGB 13, 07, 00
-
diff --git a/gfx/pics/cleffa/back.2bpp.lz b/gfx/pics/cleffa/back.2bpp.lz.ea9b3d08
index 35ec3369b..35ec3369b 100644
--- a/gfx/pics/cleffa/back.2bpp.lz
+++ b/gfx/pics/cleffa/back.2bpp.lz.ea9b3d08
diff --git a/gfx/pics/cleffa/back.png b/gfx/pics/cleffa/back.png
new file mode 100644
index 000000000..c888fef10
--- /dev/null
+++ b/gfx/pics/cleffa/back.png
diff --git a/gfx/pics/cleffa/bitmask.asm b/gfx/pics/cleffa/bitmask.asm
deleted file mode 100644
index 175ab4893..000000000
--- a/gfx/pics/cleffa/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00001000
-	db %00000000
-	db %00000100
-	db %00000000
-; 1
-	db %11001110
-	db %00111001
-	db %01100100
-	db %00000000
-; 2
-	db %01000000
-	db %00111101
-	db %00000000
-	db %00000000
-; 0xd34a9
diff --git a/gfx/pics/cleffa/frames.asm b/gfx/pics/cleffa/frames.asm
deleted file mode 100644
index 53ad1f718..000000000
--- a/gfx/pics/cleffa/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a
-.frame2
-	db $01 ; bitmask
-	db $1b, $1c, $19, $1d, $1e, $1f, $20, $21, $22, $1a, $23, $24
-.frame3
-	db $02 ; bitmask
-	db $25, $26, $27, $28, $29, $2a
-; 0xd8912
diff --git a/gfx/pics/cleffa/front.2bpp.lz b/gfx/pics/cleffa/front.animated.2bpp.lz.49630c80
index e8c624069..e8c624069 100644
--- a/gfx/pics/cleffa/front.2bpp.lz
+++ b/gfx/pics/cleffa/front.animated.2bpp.lz.49630c80
diff --git a/gfx/pics/cleffa/front.png b/gfx/pics/cleffa/front.png
new file mode 100644
index 000000000..6c411c3ad
--- /dev/null
+++ b/gfx/pics/cleffa/front.png
diff --git a/gfx/pics/cleffa/normal.pal b/gfx/pics/cleffa/normal.pal
deleted file mode 100644
index 7c1e3c7f2..000000000
--- a/gfx/pics/cleffa/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 13, 25
-	RGB 13, 07, 00
-
diff --git a/gfx/pics/cloyster/back.2bpp.lz b/gfx/pics/cloyster/back.2bpp.lz.5ad194b3
index 655890df8..655890df8 100644
--- a/gfx/pics/cloyster/back.2bpp.lz
+++ b/gfx/pics/cloyster/back.2bpp.lz.5ad194b3
diff --git a/gfx/pics/cloyster/back.png b/gfx/pics/cloyster/back.png
new file mode 100644
index 000000000..4b4f9294a
--- /dev/null
+++ b/gfx/pics/cloyster/back.png
diff --git a/gfx/pics/cloyster/bitmask.asm b/gfx/pics/cloyster/bitmask.asm
deleted file mode 100644
index 3e7e506f8..000000000
--- a/gfx/pics/cloyster/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00111100
-	db %11111111
-	db %11011000
-	db %11111110
-	db %00011111
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000110
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00111100
-	db %11111111
-	db %11011000
-	db %11111010
-	db %00011111
-	db %00000000
-	db %00000000
-; 0xd2df4
diff --git a/gfx/pics/cloyster/frames.asm b/gfx/pics/cloyster/frames.asm
deleted file mode 100644
index 77b278e8b..000000000
--- a/gfx/pics/cloyster/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $00, $32, $33, $34, $35, $36, $37, $38, $00, $39, $3a
-	db $3b, $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44, $45, $46
-	db $47, $48, $49, $4a
-.frame2
-	db $01 ; bitmask
-	db $3f, $40
-.frame3
-	db $02 ; bitmask
-	db $31, $00, $32, $33, $34, $35, $36, $37, $38, $00, $39, $3a
-	db $3b, $3c, $3d, $3e, $4b, $41, $42, $43, $44, $45, $46, $47
-	db $48, $49, $4a
-.frame4
-	db $01 ; bitmask
-	db $4c, $40
-; 0xd54f2
diff --git a/gfx/pics/cloyster/front.2bpp.lz b/gfx/pics/cloyster/front.animated.2bpp.lz.fe85709f
index 83991eed6..83991eed6 100644
--- a/gfx/pics/cloyster/front.2bpp.lz
+++ b/gfx/pics/cloyster/front.animated.2bpp.lz.fe85709f
diff --git a/gfx/pics/cloyster/front.png b/gfx/pics/cloyster/front.png
new file mode 100644
index 000000000..fc725f85c
--- /dev/null
+++ b/gfx/pics/cloyster/front.png
diff --git a/gfx/pics/cloyster/normal.pal b/gfx/pics/cloyster/normal.pal
deleted file mode 100644
index a0061617c..000000000
--- a/gfx/pics/cloyster/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 21, 10, 22
-	RGB 12, 04, 13
-
diff --git a/gfx/pics/corsola/back.2bpp.lz b/gfx/pics/corsola/back.2bpp.lz.2b6c7860
index 6707a3538..6707a3538 100644
--- a/gfx/pics/corsola/back.2bpp.lz
+++ b/gfx/pics/corsola/back.2bpp.lz.2b6c7860
diff --git a/gfx/pics/corsola/back.png b/gfx/pics/corsola/back.png
new file mode 100644
index 000000000..8550813ab
--- /dev/null
+++ b/gfx/pics/corsola/back.png
diff --git a/gfx/pics/corsola/bitmask.asm b/gfx/pics/corsola/bitmask.asm
deleted file mode 100644
index fd9e40e5d..000000000
--- a/gfx/pics/corsola/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00010000
-	db %00000100
-	db %11000001
-	db %00000000
-	db %00000000
-; 1
-	db %00001100
-	db %00000000
-	db %00000000
-	db %00011100
-	db %00000111
-; 2
-	db %00000000
-	db %10000010
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3817
diff --git a/gfx/pics/corsola/frames.asm b/gfx/pics/corsola/frames.asm
deleted file mode 100644
index d1bf55d3d..000000000
--- a/gfx/pics/corsola/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28
-.frame2
-	db $00 ; bitmask
-	db $29, $25, $2a, $2b, $28
-.frame3
-	db $01 ; bitmask
-	db $2c, $2d, $2e, $2f, $30, $31, $32, $05
-.frame4
-	db $02 ; bitmask
-	db $33, $34
-; 0xd923f
diff --git a/gfx/pics/corsola/front.2bpp.lz b/gfx/pics/corsola/front.animated.2bpp.lz.2e7905aa
index afa208922..afa208922 100644
--- a/gfx/pics/corsola/front.2bpp.lz
+++ b/gfx/pics/corsola/front.animated.2bpp.lz.2e7905aa
diff --git a/gfx/pics/corsola/front.png b/gfx/pics/corsola/front.png
new file mode 100644
index 000000000..210b508e7
--- /dev/null
+++ b/gfx/pics/corsola/front.png
diff --git a/gfx/pics/corsola/normal.pal b/gfx/pics/corsola/normal.pal
deleted file mode 100644
index 8dd10edc5..000000000
--- a/gfx/pics/corsola/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 11, 31
-	RGB 28, 07, 13
-
diff --git a/gfx/pics/crobat/back.2bpp.lz b/gfx/pics/crobat/back.2bpp.lz.30850b2e
index a572d93c5..a572d93c5 100644
--- a/gfx/pics/crobat/back.2bpp.lz
+++ b/gfx/pics/crobat/back.2bpp.lz.30850b2e
diff --git a/gfx/pics/crobat/back.png b/gfx/pics/crobat/back.png
new file mode 100644
index 000000000..944c3a872
--- /dev/null
+++ b/gfx/pics/crobat/back.png
diff --git a/gfx/pics/crobat/bitmask.asm b/gfx/pics/crobat/bitmask.asm
deleted file mode 100644
index 6db5a3bcc..000000000
--- a/gfx/pics/crobat/bitmask.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-; 0
-	db %10001111
-	db %00000111
-	db %00000000
-	db %11000000
-	db %01111000
-	db %00111100
-	db %00000000
-; 1
-	db %00110000
-	db %00011000
-	db %00000000
-	db %00000000
-	db %00000110
-	db %00000011
-	db %00000000
-; 2
-	db %10111111
-	db %00011111
-	db %00000000
-	db %11000000
-	db %01111110
-	db %00111111
-	db %00000000
-; 3
-	db %00110000
-	db %00011000
-	db %00000000
-	db %00000000
-	db %10000111
-	db %00000011
-	db %00000000
-; 4
-	db %10111111
-	db %00011111
-	db %00000000
-	db %11000000
-	db %11111111
-	db %00111111
-	db %00000000
-; 0xd3469
diff --git a/gfx/pics/crobat/frames.asm b/gfx/pics/crobat/frames.asm
deleted file mode 100644
index c0c95c30e..000000000
--- a/gfx/pics/crobat/frames.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $03, $03, $31, $32, $03, $03, $33, $34, $35, $36, $03, $03
-	db $37, $38, $03, $03, $03, $39
-.frame2
-	db $01 ; bitmask
-	db $3a, $3b, $3c, $3d, $3e, $3f, $40, $41
-.frame3
-	db $02 ; bitmask
-	db $03, $03, $31, $32, $3a, $3b, $03, $03, $33, $34, $3c, $3d
-	db $35, $36, $3e, $3f, $03, $03, $37, $38, $40, $41, $03, $03
-	db $03, $39
-.frame4
-	db $03 ; bitmask
-	db $42, $43, $44, $45, $46, $47, $03, $48, $49, $03
-.frame5
-	db $04 ; bitmask
-	db $03, $03, $31, $32, $42, $43, $03, $03, $33, $34, $44, $45
-	db $35, $36, $46, $47, $03, $03, $03, $37, $38, $48, $49, $03
-	db $03, $03, $03, $39
-; 0xd8879
diff --git a/gfx/pics/crobat/front.2bpp.lz b/gfx/pics/crobat/front.animated.2bpp.lz.dc386ff0
index 1e12aeed2..1e12aeed2 100644
--- a/gfx/pics/crobat/front.2bpp.lz
+++ b/gfx/pics/crobat/front.animated.2bpp.lz.dc386ff0
diff --git a/gfx/pics/crobat/front.png b/gfx/pics/crobat/front.png
new file mode 100644
index 000000000..b1e989fac
--- /dev/null
+++ b/gfx/pics/crobat/front.png
diff --git a/gfx/pics/crobat/normal.pal b/gfx/pics/crobat/normal.pal
deleted file mode 100644
index 667255211..000000000
--- a/gfx/pics/crobat/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 18, 08, 21
-	RGB 04, 09, 15
-
diff --git a/gfx/pics/croconaw/back.2bpp.lz b/gfx/pics/croconaw/back.2bpp.lz.a605c82f
index 7e573e6a0..7e573e6a0 100644
--- a/gfx/pics/croconaw/back.2bpp.lz
+++ b/gfx/pics/croconaw/back.2bpp.lz.a605c82f
diff --git a/gfx/pics/croconaw/back.png b/gfx/pics/croconaw/back.png
new file mode 100644
index 000000000..1c745387a
--- /dev/null
+++ b/gfx/pics/croconaw/back.png
diff --git a/gfx/pics/croconaw/bitmask.asm b/gfx/pics/croconaw/bitmask.asm
deleted file mode 100644
index 22f1cf494..000000000
--- a/gfx/pics/croconaw/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %11011111
-	db %11110011
-	db %00111101
-	db %10000110
-	db %00000001
-; 1
-	db %11011111
-	db %11110011
-	db %00111101
-	db %10001110
-	db %00000011
-; 2
-	db %11011111
-	db %11110011
-	db %00111101
-	db %00000010
-	db %00000000
-; 3
-	db %11011111
-	db %11111111
-	db %00111111
-	db %00000010
-	db %00000000
-; 0xd33a9
diff --git a/gfx/pics/croconaw/frames.asm b/gfx/pics/croconaw/frames.asm
deleted file mode 100644
index cda1ed191..000000000
--- a/gfx/pics/croconaw/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $00, $28, $29, $2a, $2b, $2c, $2d, $2e
-	db $2f, $30, $31, $32, $33, $34, $35, $36, $37, $38
-.frame2
-	db $01 ; bitmask
-	db $24, $25, $26, $27, $00, $28, $29, $2a, $2b, $2c, $2d, $2e
-	db $2f, $30, $31, $32, $33, $34, $39, $3a, $3b, $00, $3c, $3d
-.frame3
-	db $02 ; bitmask
-	db $24, $25, $26, $27, $00, $28, $29, $2a, $2b, $2c, $2d, $2e
-	db $2f, $30, $31, $32, $33, $34, $3e
-.frame4
-	db $03 ; bitmask
-	db $24, $25, $26, $27, $00, $28, $29, $2a, $2b, $3f, $40, $2c
-	db $2d, $2e, $2f, $30, $41, $31, $32, $33, $34, $3e
-; 0xd8636
diff --git a/gfx/pics/croconaw/front.2bpp.lz b/gfx/pics/croconaw/front.animated.2bpp.lz.a797986d
index 9c7f511ba..9c7f511ba 100644
--- a/gfx/pics/croconaw/front.2bpp.lz
+++ b/gfx/pics/croconaw/front.animated.2bpp.lz.a797986d
diff --git a/gfx/pics/croconaw/front.png b/gfx/pics/croconaw/front.png
new file mode 100644
index 000000000..8fabda95c
--- /dev/null
+++ b/gfx/pics/croconaw/front.png
diff --git a/gfx/pics/croconaw/normal.pal b/gfx/pics/croconaw/normal.pal
deleted file mode 100644
index 933593e9f..000000000
--- a/gfx/pics/croconaw/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 12, 17, 29
-	RGB 26, 08, 07
-
diff --git a/gfx/pics/cubone/back.2bpp.lz b/gfx/pics/cubone/back.2bpp.lz.bd849dfb
index fc9931417..fc9931417 100644
--- a/gfx/pics/cubone/back.2bpp.lz
+++ b/gfx/pics/cubone/back.2bpp.lz.bd849dfb
diff --git a/gfx/pics/cubone/back.png b/gfx/pics/cubone/back.png
new file mode 100644
index 000000000..d4069071b
--- /dev/null
+++ b/gfx/pics/cubone/back.png
diff --git a/gfx/pics/cubone/bitmask.asm b/gfx/pics/cubone/bitmask.asm
deleted file mode 100644
index 81549a704..000000000
--- a/gfx/pics/cubone/bitmask.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-; 0
-	db %10001110
-	db %00010001
-	db %00000000
-	db %00000000
-; 1
-	db %10011110
-	db %00010011
-	db %00000000
-	db %00000000
-; 2
-	db %10101111
-	db %00000001
-	db %00000000
-	db %00000000
-; 3
-	db %10001110
-	db %00000001
-	db %00000000
-	db %00000000
-; 4
-	db %00000000
-	db %00000000
-	db %00000001
-	db %00000000
-; 5
-	db %10001111
-	db %00000001
-	db %00000000
-	db %00000000
-; 0xd2f18
diff --git a/gfx/pics/cubone/frames.asm b/gfx/pics/cubone/frames.asm
deleted file mode 100644
index e5ef22631..000000000
--- a/gfx/pics/cubone/frames.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e
-.frame2
-	db $01 ; bitmask
-	db $19, $04, $00, $1f, $1c, $20, $21, $1e
-.frame3
-	db $02 ; bitmask
-	db $22, $19, $23, $04, $24, $25, $26
-.frame4
-	db $03 ; bitmask
-	db $19, $23, $04, $25, $26
-.frame5
-	db $04 ; bitmask
-	db $27
-.frame6
-	db $05 ; bitmask
-	db $28, $19, $23, $04, $25, $26
-; 0xd577d
diff --git a/gfx/pics/cubone/front.2bpp.lz b/gfx/pics/cubone/front.animated.2bpp.lz.0d63a3a4
index 9de9f7732..9de9f7732 100644
--- a/gfx/pics/cubone/front.2bpp.lz
+++ b/gfx/pics/cubone/front.animated.2bpp.lz.0d63a3a4
diff --git a/gfx/pics/cubone/front.png b/gfx/pics/cubone/front.png
new file mode 100644
index 000000000..de641c36d
--- /dev/null
+++ b/gfx/pics/cubone/front.png
diff --git a/gfx/pics/cubone/normal.pal b/gfx/pics/cubone/normal.pal
deleted file mode 100644
index eb2ec4b7b..000000000
--- a/gfx/pics/cubone/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 19, 12
-	RGB 16, 10, 04
-
diff --git a/gfx/pics/cyndaquil/back.2bpp.lz b/gfx/pics/cyndaquil/back.2bpp.lz.68baeeeb
index 226c41e49..226c41e49 100644
--- a/gfx/pics/cyndaquil/back.2bpp.lz
+++ b/gfx/pics/cyndaquil/back.2bpp.lz.68baeeeb
diff --git a/gfx/pics/cyndaquil/back.png b/gfx/pics/cyndaquil/back.png
new file mode 100644
index 000000000..4e0664be0
--- /dev/null
+++ b/gfx/pics/cyndaquil/back.png
diff --git a/gfx/pics/cyndaquil/bitmask.asm b/gfx/pics/cyndaquil/bitmask.asm
deleted file mode 100644
index 56d89d40a..000000000
--- a/gfx/pics/cyndaquil/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %11111000
-	db %11111111
-	db %11110111
-	db %00000000
-; 1
-	db %10011000
-	db %01000011
-	db %00000000
-	db %00000000
-; 0xd3365
diff --git a/gfx/pics/cyndaquil/frames.asm b/gfx/pics/cyndaquil/frames.asm
deleted file mode 100644
index 581669813..000000000
--- a/gfx/pics/cyndaquil/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $00, $1b, $1c, $1d, $1e, $00, $1f, $20, $21, $22
-	db $00, $23, $24, $25, $00, $26, $27, $28
-.frame2
-	db $00 ; bitmask
-	db $19, $1a, $00, $00, $29, $1d, $1e, $00, $00, $2a, $21, $22
-	db $00, $00, $2b, $25, $00, $00, $00, $2c
-.frame3
-	db $00 ; bitmask
-	db $19, $1a, $00, $00, $29, $1d, $1e, $00, $00, $2d, $21, $22
-	db $00, $00, $2e, $2f, $00, $00, $00, $2c
-.frame4
-	db $01 ; bitmask
-	db $19, $1a, $30, $1d, $1e, $22
-; 0xd84f5
diff --git a/gfx/pics/cyndaquil/front.2bpp.lz b/gfx/pics/cyndaquil/front.animated.2bpp.lz.0d5dce8d
index 3e2886783..3e2886783 100644
--- a/gfx/pics/cyndaquil/front.2bpp.lz
+++ b/gfx/pics/cyndaquil/front.animated.2bpp.lz.0d5dce8d
diff --git a/gfx/pics/cyndaquil/front.png b/gfx/pics/cyndaquil/front.png
new file mode 100644
index 000000000..4edae6bc6
--- /dev/null
+++ b/gfx/pics/cyndaquil/front.png
diff --git a/gfx/pics/cyndaquil/normal.pal b/gfx/pics/cyndaquil/normal.pal
deleted file mode 100644
index 38028335c..000000000
--- a/gfx/pics/cyndaquil/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 27, 00
-	RGB 31, 07, 05
-
diff --git a/gfx/pics/delibird/back.2bpp.lz b/gfx/pics/delibird/back.2bpp.lz.11463d76
index 22f41237c..22f41237c 100644
--- a/gfx/pics/delibird/back.2bpp.lz
+++ b/gfx/pics/delibird/back.2bpp.lz.11463d76
diff --git a/gfx/pics/delibird/back.png b/gfx/pics/delibird/back.png
new file mode 100644
index 000000000..367d6055a
--- /dev/null
+++ b/gfx/pics/delibird/back.png
diff --git a/gfx/pics/delibird/bitmask.asm b/gfx/pics/delibird/bitmask.asm
deleted file mode 100644
index f682bc2fb..000000000
--- a/gfx/pics/delibird/bitmask.asm
+++ /dev/null
@@ -1,37 +0,0 @@
-; 0
-	db %00000000
-	db %01000011
-	db %00000000
-	db %00000000
-	db %00000010
-; 1
-	db %00111000
-	db %01100011
-	db %00000000
-	db %10001110
-	db %00000011
-; 2
-	db %00111100
-	db %01100011
-	db %00000000
-	db %10001110
-	db %00000011
-; 3
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000010
-; 4
-	db %00111000
-	db %00000010
-	db %00000000
-	db %10001110
-	db %00000011
-; 5
-	db %00000000
-	db %00100000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3850
diff --git a/gfx/pics/delibird/frames.asm b/gfx/pics/delibird/frames.asm
deleted file mode 100644
index 625f5ae8a..000000000
--- a/gfx/pics/delibird/frames.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27
-.frame2
-	db $01 ; bitmask
-	db $28, $29, $2a, $24, $2b, $2c, $26, $2d, $2e, $2f, $30, $31
-	db $32
-.frame3
-	db $02 ; bitmask
-	db $33, $34, $29, $2a, $35, $36, $2c, $26, $2d, $2e, $2f, $30
-	db $31, $32
-.frame4
-	db $03 ; bitmask
-	db $27
-.frame5
-	db $04 ; bitmask
-	db $28, $29, $2a, $25, $2d, $2e, $2f, $30, $31, $32
-.frame6
-	db $05 ; bitmask
-	db $2c
-; 0xd92bb
diff --git a/gfx/pics/delibird/front.2bpp.lz b/gfx/pics/delibird/front.animated.2bpp.lz.a3126c48
index 819e46af0..819e46af0 100644
--- a/gfx/pics/delibird/front.2bpp.lz
+++ b/gfx/pics/delibird/front.animated.2bpp.lz.a3126c48
diff --git a/gfx/pics/delibird/front.png b/gfx/pics/delibird/front.png
new file mode 100644
index 000000000..591271b3a
--- /dev/null
+++ b/gfx/pics/delibird/front.png
diff --git a/gfx/pics/delibird/normal.pal b/gfx/pics/delibird/normal.pal
deleted file mode 100644
index fb24bd4e1..000000000
--- a/gfx/pics/delibird/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 21, 16, 31
-	RGB 30, 08, 02
-
diff --git a/gfx/pics/dewgong/back.2bpp.lz b/gfx/pics/dewgong/back.2bpp.lz.4e1fef76
index bc6842e86..bc6842e86 100644
--- a/gfx/pics/dewgong/back.2bpp.lz
+++ b/gfx/pics/dewgong/back.2bpp.lz.4e1fef76
diff --git a/gfx/pics/dewgong/back.png b/gfx/pics/dewgong/back.png
new file mode 100644
index 000000000..9544f9c25
--- /dev/null
+++ b/gfx/pics/dewgong/back.png
diff --git a/gfx/pics/dewgong/bitmask.asm b/gfx/pics/dewgong/bitmask.asm
deleted file mode 100644
index 0d29808ea..000000000
--- a/gfx/pics/dewgong/bitmask.asm
+++ /dev/null
@@ -1,73 +0,0 @@
-; 0
-	db %00000100
-	db %00000000
-	db %00000000
-	db %00000110
-	db %00000011
-	db %00000000
-	db %00000000
-; 1
-	db %00000010
-	db %00000011
-	db %11001100
-	db %01110111
-	db %01111011
-	db %00000000
-	db %00000000
-; 2
-	db %10000000
-	db %11000000
-	db %11000001
-	db %01110001
-	db %01111000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %11100000
-	db %01110001
-	db %01111000
-	db %00000000
-	db %00000000
-; 4
-	db %00000000
-	db %00000000
-	db %11000000
-	db %01110001
-	db %01111000
-	db %00000000
-	db %00000000
-; 5
-	db %00000100
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 6
-	db %00000010
-	db %00000011
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 7
-	db %10000000
-	db %11000000
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 8
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2db2
diff --git a/gfx/pics/dewgong/frames.asm b/gfx/pics/dewgong/frames.asm
deleted file mode 100644
index d492373a4..000000000
--- a/gfx/pics/dewgong/frames.asm
+++ /dev/null
@@ -1,39 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-	dw .frame8
-	dw .frame9
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35
-.frame2
-	db $01 ; bitmask
-	db $36, $37, $38, $39, $3a, $3b, $3c, $3d, $3e, $3f, $40, $41
-	db $42, $43, $44, $45, $46, $47, $48
-.frame3
-	db $02 ; bitmask
-	db $49, $4a, $4b, $4c, $3b, $3c, $3d, $40, $41, $42, $45, $46
-	db $47, $48
-.frame4
-	db $03 ; bitmask
-	db $4d, $3b, $3c, $3d, $40, $41, $42, $45, $46, $47, $48
-.frame5
-	db $04 ; bitmask
-	db $3b, $3c, $3d, $40, $41, $42, $45, $46, $47, $48
-.frame6
-	db $05 ; bitmask
-	db $31
-.frame7
-	db $06 ; bitmask
-	db $36, $37, $38
-.frame8
-	db $07 ; bitmask
-	db $49, $4a, $4b, $4c
-.frame9
-	db $08 ; bitmask
-	db $4d
-; 0xd5422
diff --git a/gfx/pics/dewgong/front.2bpp.lz b/gfx/pics/dewgong/front.animated.2bpp.lz.cc53359c
index cbb0ace94..cbb0ace94 100644
--- a/gfx/pics/dewgong/front.2bpp.lz
+++ b/gfx/pics/dewgong/front.animated.2bpp.lz.cc53359c
diff --git a/gfx/pics/dewgong/front.png b/gfx/pics/dewgong/front.png
new file mode 100644
index 000000000..b73d51c07
--- /dev/null
+++ b/gfx/pics/dewgong/front.png
diff --git a/gfx/pics/dewgong/normal.pal b/gfx/pics/dewgong/normal.pal
deleted file mode 100644
index 80bca6734..000000000
--- a/gfx/pics/dewgong/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 19, 21, 31
-	RGB 08, 11, 18
-
diff --git a/gfx/pics/diglett/back.2bpp.lz b/gfx/pics/diglett/back.2bpp.lz.31d8cacc
index 05625954c..05625954c 100644
--- a/gfx/pics/diglett/back.2bpp.lz
+++ b/gfx/pics/diglett/back.2bpp.lz.31d8cacc
diff --git a/gfx/pics/diglett/back.png b/gfx/pics/diglett/back.png
new file mode 100644
index 000000000..cde3b07f9
--- /dev/null
+++ b/gfx/pics/diglett/back.png
diff --git a/gfx/pics/diglett/bitmask.asm b/gfx/pics/diglett/bitmask.asm
deleted file mode 100644
index 54ca8fc52..000000000
--- a/gfx/pics/diglett/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %11000000
-	db %00111001
-	db %00000111
-	db %00000000
-; 1
-	db %00001000
-	db %00000000
-	db %10000000
-	db %00000000
-; 2
-	db %00000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd2a61
diff --git a/gfx/pics/diglett/frames.asm b/gfx/pics/diglett/frames.asm
deleted file mode 100644
index ec2d64653..000000000
--- a/gfx/pics/diglett/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21
-.frame2
-	db $00 ; bitmask
-	db $19, $22, $1b, $1c, $23, $1e, $1f, $20, $21
-.frame3
-	db $01 ; bitmask
-	db $24, $25
-.frame4
-	db $02 ; bitmask
-	db $26
-; 0xd4c06
diff --git a/gfx/pics/diglett/front.2bpp.lz b/gfx/pics/diglett/front.animated.2bpp.lz.52b0361e
index 5ed5e87ff..5ed5e87ff 100644
--- a/gfx/pics/diglett/front.2bpp.lz
+++ b/gfx/pics/diglett/front.animated.2bpp.lz.52b0361e
diff --git a/gfx/pics/diglett/front.png b/gfx/pics/diglett/front.png
new file mode 100644
index 000000000..49adc371a
--- /dev/null
+++ b/gfx/pics/diglett/front.png
diff --git a/gfx/pics/diglett/normal.pal b/gfx/pics/diglett/normal.pal
deleted file mode 100644
index 9eaf1baf0..000000000
--- a/gfx/pics/diglett/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 19, 11, 04
-	RGB 24, 06, 04
-
diff --git a/gfx/pics/ditto/back.2bpp.lz b/gfx/pics/ditto/back.2bpp.lz.b01a9d91
index ee2a621bf..ee2a621bf 100644
--- a/gfx/pics/ditto/back.2bpp.lz
+++ b/gfx/pics/ditto/back.2bpp.lz.b01a9d91
diff --git a/gfx/pics/ditto/back.png b/gfx/pics/ditto/back.png
new file mode 100644
index 000000000..bf1f4cb1a
--- /dev/null
+++ b/gfx/pics/ditto/back.png
diff --git a/gfx/pics/ditto/bitmask.asm b/gfx/pics/ditto/bitmask.asm
deleted file mode 100644
index 94d8ee8fc..000000000
--- a/gfx/pics/ditto/bitmask.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-; 0
-	db %11111000
-	db %10011100
-	db %10000000
-	db %00000000
-; 1
-	db %11111000
-	db %11111110
-	db %11101000
-	db %00000001
-; 2
-	db %11100000
-	db %01111010
-	db %11001000
-	db %00000001
-; 3
-	db %10000000
-	db %00011000
-	db %00000000
-	db %00000000
-; 4
-	db %10000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 5
-	db %01111000
-	db %00000000
-	db %10000000
-	db %00000000
-; 6
-	db %00011000
-	db %11101110
-	db %11101000
-	db %00000001
-; 7
-	db %01100000
-	db %01101010
-	db %11001000
-	db %00000001
-; 0xd3183
diff --git a/gfx/pics/ditto/frames.asm b/gfx/pics/ditto/frames.asm
deleted file mode 100644
index eabf9f840..000000000
--- a/gfx/pics/ditto/frames.asm
+++ /dev/null
@@ -1,35 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-	dw .frame8
-.frame1
-	db $00 ; bitmask
-	db $19, $00, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21
-.frame2
-	db $01 ; bitmask
-	db $19, $00, $1a, $1b, $1c, $00, $1d, $1e, $1f, $08, $09, $20
-	db $0e, $22, $23, $24, $13
-.frame3
-	db $02 ; bitmask
-	db $1a, $1b, $1c, $00, $1e, $1f, $08, $09, $0e, $23, $24, $13
-.frame4
-	db $03 ; bitmask
-	db $25, $26, $27
-.frame5
-	db $04 ; bitmask
-	db $1c, $1f
-.frame6
-	db $05 ; bitmask
-	db $19, $00, $1a, $1b, $21
-.frame7
-	db $06 ; bitmask
-	db $19, $00, $00, $1d, $1e, $08, $09, $20, $0e, $22, $23, $24
-	db $13
-.frame8
-	db $07 ; bitmask
-	db $1a, $1b, $00, $1e, $08, $09, $0e, $23, $24, $13
-; 0xd5df0
diff --git a/gfx/pics/ditto/front.2bpp.lz b/gfx/pics/ditto/front.animated.2bpp.lz.344c90fd
index ef64bd777..ef64bd777 100644
--- a/gfx/pics/ditto/front.2bpp.lz
+++ b/gfx/pics/ditto/front.animated.2bpp.lz.344c90fd
diff --git a/gfx/pics/ditto/front.png b/gfx/pics/ditto/front.png
new file mode 100644
index 000000000..9979863f6
--- /dev/null
+++ b/gfx/pics/ditto/front.png
diff --git a/gfx/pics/ditto/normal.pal b/gfx/pics/ditto/normal.pal
deleted file mode 100644
index 00cb0d5e6..000000000
--- a/gfx/pics/ditto/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 12, 28
-	RGB 13, 07, 16
-
diff --git a/gfx/pics/dodrio/back.2bpp.lz b/gfx/pics/dodrio/back.2bpp.lz.a5480e88
index 3b1d80db5..3b1d80db5 100644
--- a/gfx/pics/dodrio/back.2bpp.lz
+++ b/gfx/pics/dodrio/back.2bpp.lz.a5480e88
diff --git a/gfx/pics/dodrio/back.png b/gfx/pics/dodrio/back.png
new file mode 100644
index 000000000..abc232883
--- /dev/null
+++ b/gfx/pics/dodrio/back.png
diff --git a/gfx/pics/dodrio/bitmask.asm b/gfx/pics/dodrio/bitmask.asm
deleted file mode 100644
index 6af2e59e8..000000000
--- a/gfx/pics/dodrio/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00000110
-	db %10000011
-	db %11100000
-	db %11110000
-	db %00111000
-	db %00001000
-	db %00000000
-; 1
-	db %00011110
-	db %10011111
-	db %11100111
-	db %11110011
-	db %00111000
-	db %00001000
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00001100
-	db %00000010
-	db %00000000
-	db %00000000
-; 3
-	db %00011000
-	db %10011110
-	db %11100111
-	db %11110011
-	db %00111000
-	db %00001000
-	db %00000000
-; 0xd2d64
diff --git a/gfx/pics/dodrio/frames.asm b/gfx/pics/dodrio/frames.asm
deleted file mode 100644
index e51718307..000000000
--- a/gfx/pics/dodrio/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f, $40
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $41, $02, $33, $42, $43, $02, $02, $44, $45, $46
-	db $47, $36, $48, $49, $4a, $4b, $39, $3a, $3b, $3c, $3d, $3e
-	db $3f, $40
-.frame3
-	db $02 ; bitmask
-	db $4c, $4d, $4e
-.frame4
-	db $03 ; bitmask
-	db $41, $02, $4f, $43, $02, $02, $44, $45, $46, $47, $36, $48
-	db $49, $4a, $4b, $39, $3a, $3b, $3c, $3d, $3e, $3f, $40
-; 0xd53a5
diff --git a/gfx/pics/dodrio/front.2bpp.lz b/gfx/pics/dodrio/front.animated.2bpp.lz.2aaff569
index 8de65b2de..8de65b2de 100644
--- a/gfx/pics/dodrio/front.2bpp.lz
+++ b/gfx/pics/dodrio/front.animated.2bpp.lz.2aaff569
diff --git a/gfx/pics/dodrio/front.png b/gfx/pics/dodrio/front.png
new file mode 100644
index 000000000..ddd441ba1
--- /dev/null
+++ b/gfx/pics/dodrio/front.png
diff --git a/gfx/pics/dodrio/normal.pal b/gfx/pics/dodrio/normal.pal
deleted file mode 100644
index a38c0466c..000000000
--- a/gfx/pics/dodrio/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 16, 08
-	RGB 18, 08, 06
-
diff --git a/gfx/pics/doduo/back.2bpp.lz b/gfx/pics/doduo/back.2bpp.lz.05a57563
index 8f204150b..8f204150b 100644
--- a/gfx/pics/doduo/back.2bpp.lz
+++ b/gfx/pics/doduo/back.2bpp.lz.05a57563
diff --git a/gfx/pics/doduo/back.png b/gfx/pics/doduo/back.png
new file mode 100644
index 000000000..8440b7af7
--- /dev/null
+++ b/gfx/pics/doduo/back.png
diff --git a/gfx/pics/doduo/bitmask.asm b/gfx/pics/doduo/bitmask.asm
deleted file mode 100644
index 0e4fc7906..000000000
--- a/gfx/pics/doduo/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00000000
-	db %10001000
-	db %11110001
-	db %00000000
-; 1
-	db %01000010
-	db %10001000
-	db %11110001
-	db %00000000
-; 2
-	db %00100000
-	db %10001000
-	db %11110001
-	db %00000000
-; 0xd2d48
diff --git a/gfx/pics/doduo/frames.asm b/gfx/pics/doduo/frames.asm
deleted file mode 100644
index 1888d2512..000000000
--- a/gfx/pics/doduo/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $02, $1e
-.frame2
-	db $01 ; bitmask
-	db $1f, $20, $21, $1a, $22, $1c, $1d, $02, $1e
-.frame3
-	db $02 ; bitmask
-	db $23, $19, $1a, $24, $25, $26, $02, $1e
-; 0xd5355
diff --git a/gfx/pics/doduo/front.2bpp.lz b/gfx/pics/doduo/front.animated.2bpp.lz.89c4acbd
index 11d525427..11d525427 100644
--- a/gfx/pics/doduo/front.2bpp.lz
+++ b/gfx/pics/doduo/front.animated.2bpp.lz.89c4acbd
diff --git a/gfx/pics/doduo/front.png b/gfx/pics/doduo/front.png
new file mode 100644
index 000000000..8c90b36f7
--- /dev/null
+++ b/gfx/pics/doduo/front.png
diff --git a/gfx/pics/doduo/normal.pal b/gfx/pics/doduo/normal.pal
deleted file mode 100644
index e32cb088f..000000000
--- a/gfx/pics/doduo/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 21, 13, 09
-	RGB 12, 08, 06
-
diff --git a/gfx/pics/donphan/back.2bpp.lz b/gfx/pics/donphan/back.2bpp.lz.5067b370
index 4914f03aa..4914f03aa 100644
--- a/gfx/pics/donphan/back.2bpp.lz
+++ b/gfx/pics/donphan/back.2bpp.lz.5067b370
diff --git a/gfx/pics/donphan/back.png b/gfx/pics/donphan/back.png
new file mode 100644
index 000000000..a156f85bf
--- /dev/null
+++ b/gfx/pics/donphan/back.png
diff --git a/gfx/pics/donphan/bitmask.asm b/gfx/pics/donphan/bitmask.asm
deleted file mode 100644
index 6891e612a..000000000
--- a/gfx/pics/donphan/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00111110
-	db %00111111
-	db %00011110
-	db %00001100
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00111110
-	db %00111111
-	db %00011110
-	db %00001000
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00110000
-	db %00011000
-	db %00001100
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000010
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd390a
diff --git a/gfx/pics/donphan/frames.asm b/gfx/pics/donphan/frames.asm
deleted file mode 100644
index b78166e26..000000000
--- a/gfx/pics/donphan/frames.asm
+++ /dev/null
@@ -1,24 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $00, $35, $36, $37, $38, $39, $3a, $3b
-	db $3c, $3d, $3e, $3f, $00
-.frame2
-	db $00 ; bitmask
-	db $40, $41, $33, $34, $00, $42, $43, $37, $38, $39, $3a, $3b
-	db $3c, $3d, $3e, $3f, $00
-.frame3
-	db $01 ; bitmask
-	db $40, $41, $33, $34, $00, $42, $43, $37, $38, $39, $3a, $3b
-	db $3c, $44, $3e, $00
-.frame4
-	db $02 ; bitmask
-	db $45, $46, $47, $48, $49, $00
-.frame5
-	db $03 ; bitmask
-	db $4a
-; 0xd943a
diff --git a/gfx/pics/donphan/front.2bpp.lz b/gfx/pics/donphan/front.animated.2bpp.lz.9e1b7048
index b46d083fc..b46d083fc 100644
--- a/gfx/pics/donphan/front.2bpp.lz
+++ b/gfx/pics/donphan/front.animated.2bpp.lz.9e1b7048
diff --git a/gfx/pics/donphan/front.png b/gfx/pics/donphan/front.png
new file mode 100644
index 000000000..9dc93c065
--- /dev/null
+++ b/gfx/pics/donphan/front.png
diff --git a/gfx/pics/donphan/normal.pal b/gfx/pics/donphan/normal.pal
deleted file mode 100644
index 12e7844dd..000000000
--- a/gfx/pics/donphan/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 18, 20, 19
-	RGB 05, 11, 08
-
diff --git a/gfx/pics/dragonair/back.2bpp.lz b/gfx/pics/dragonair/back.2bpp.lz.9b6fda5b
index 52094c394..52094c394 100644
--- a/gfx/pics/dragonair/back.2bpp.lz
+++ b/gfx/pics/dragonair/back.2bpp.lz.9b6fda5b
diff --git a/gfx/pics/dragonair/back.png b/gfx/pics/dragonair/back.png
new file mode 100644
index 000000000..99c03894a
--- /dev/null
+++ b/gfx/pics/dragonair/back.png
diff --git a/gfx/pics/dragonair/bitmask.asm b/gfx/pics/dragonair/bitmask.asm
deleted file mode 100644
index fe0895ff1..000000000
--- a/gfx/pics/dragonair/bitmask.asm
+++ /dev/null
@@ -1,37 +0,0 @@
-; 0
-	db %00000000
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %11011111
-	db %01000111
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %10111111
-	db %01001111
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00100000
-	db %00001000
-	db %00000000
-	db %00000000
-; 4
-	db %11011111
-	db %00000111
-	db %00000000
-	db %00000000
-	db %00000000
-; 5
-	db %10111111
-	db %00001111
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd32bf
diff --git a/gfx/pics/dragonair/frames.asm b/gfx/pics/dragonair/frames.asm
deleted file mode 100644
index 3eded4725..000000000
--- a/gfx/pics/dragonair/frames.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $24
-.frame2
-	db $01 ; bitmask
-	db $05, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $24
-.frame3
-	db $02 ; bitmask
-	db $05, $2e, $2f, $30, $31, $32, $33, $2b, $05, $34, $35, $24
-.frame4
-	db $03 ; bitmask
-	db $36, $37
-.frame5
-	db $04 ; bitmask
-	db $05, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d
-.frame6
-	db $05 ; bitmask
-	db $05, $2e, $2f, $30, $31, $32, $33, $2b, $05, $34, $35
-; 0xd616d
diff --git a/gfx/pics/dragonair/front.2bpp.lz b/gfx/pics/dragonair/front.animated.2bpp.lz.bb9ee373
index aad34536f..aad34536f 100644
--- a/gfx/pics/dragonair/front.2bpp.lz
+++ b/gfx/pics/dragonair/front.animated.2bpp.lz.bb9ee373
diff --git a/gfx/pics/dragonair/front.png b/gfx/pics/dragonair/front.png
new file mode 100644
index 000000000..19feeeec1
--- /dev/null
+++ b/gfx/pics/dragonair/front.png
diff --git a/gfx/pics/dragonair/normal.pal b/gfx/pics/dragonair/normal.pal
deleted file mode 100644
index ee0234a5e..000000000
--- a/gfx/pics/dragonair/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 17, 19, 31
-	RGB 05, 14, 23
-
diff --git a/gfx/pics/dragonite/back.2bpp.lz b/gfx/pics/dragonite/back.2bpp.lz.c408806f
index 09a828dd0..09a828dd0 100644
--- a/gfx/pics/dragonite/back.2bpp.lz
+++ b/gfx/pics/dragonite/back.2bpp.lz.c408806f
diff --git a/gfx/pics/dragonite/back.png b/gfx/pics/dragonite/back.png
new file mode 100644
index 000000000..29ef7abea
--- /dev/null
+++ b/gfx/pics/dragonite/back.png
diff --git a/gfx/pics/dragonite/bitmask.asm b/gfx/pics/dragonite/bitmask.asm
deleted file mode 100644
index 2c426bc4f..000000000
--- a/gfx/pics/dragonite/bitmask.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-; 0
-	db %00000110
-	db %10000011
-	db %00000001
-	db %00000000
-	db %00111000
-	db %00011100
-	db %00000000
-; 1
-	db %01000000
-	db %10110000
-	db %10010001
-	db %00001001
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000110
-	db %10000011
-	db %11000001
-	db %00000011
-	db %10111001
-	db %00011101
-	db %00000000
-; 3
-	db %01000000
-	db %10110000
-	db %11010001
-	db %00001011
-	db %10000001
-	db %00000001
-	db %00000000
-; 4
-	db %00000000
-	db %00000000
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd32e2
diff --git a/gfx/pics/dragonite/frames.asm b/gfx/pics/dragonite/frames.asm
deleted file mode 100644
index e07767c56..000000000
--- a/gfx/pics/dragonite/frames.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31, $00, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b
-.frame2
-	db $01 ; bitmask
-	db $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44
-.frame3
-	db $02 ; bitmask
-	db $31, $00, $32, $33, $45, $40, $46, $42, $43, $47, $48, $36
-	db $37, $38, $49, $00, $39, $3a, $3b
-.frame4
-	db $03 ; bitmask
-	db $3c, $3d, $3e, $3f, $4a, $41, $46, $42, $43, $47, $44, $48
-	db $49, $00
-.frame5
-	db $04 ; bitmask
-	db $46
-; 0xd61b3
diff --git a/gfx/pics/dragonite/front.2bpp.lz b/gfx/pics/dragonite/front.animated.2bpp.lz.b914dfd9
index 730c16739..730c16739 100644
--- a/gfx/pics/dragonite/front.2bpp.lz
+++ b/gfx/pics/dragonite/front.animated.2bpp.lz.b914dfd9
diff --git a/gfx/pics/dragonite/front.png b/gfx/pics/dragonite/front.png
new file mode 100644
index 000000000..5675a1441
--- /dev/null
+++ b/gfx/pics/dragonite/front.png
diff --git a/gfx/pics/dragonite/normal.pal b/gfx/pics/dragonite/normal.pal
deleted file mode 100644
index 40f8cf8c8..000000000
--- a/gfx/pics/dragonite/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 17, 04
-	RGB 11, 10, 17
-
diff --git a/gfx/pics/dratini/back.2bpp.lz b/gfx/pics/dratini/back.2bpp.lz.be4d6a2a
index b40ffcaaf..b40ffcaaf 100644
--- a/gfx/pics/dratini/back.2bpp.lz
+++ b/gfx/pics/dratini/back.2bpp.lz.be4d6a2a
diff --git a/gfx/pics/dratini/back.png b/gfx/pics/dratini/back.png
new file mode 100644
index 000000000..352e436de
--- /dev/null
+++ b/gfx/pics/dratini/back.png
diff --git a/gfx/pics/dratini/bitmask.asm b/gfx/pics/dratini/bitmask.asm
deleted file mode 100644
index 7a73cf8c5..000000000
--- a/gfx/pics/dratini/bitmask.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-; 0
-	db %01000000
-	db %00011000
-	db %00000000
-	db %00000000
-; 1
-	db %11100111
-	db %00000000
-	db %00000001
-	db %00000000
-; 2
-	db %11100111
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %00000001
-	db %00000000
-; 0xd32a1
diff --git a/gfx/pics/dratini/frames.asm b/gfx/pics/dratini/frames.asm
deleted file mode 100644
index fcddd94c3..000000000
--- a/gfx/pics/dratini/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b
-.frame2
-	db $01 ; bitmask
-	db $1c, $1d, $1e, $1f, $20, $21, $22
-.frame3
-	db $02 ; bitmask
-	db $23, $24, $25, $26, $27, $28
-.frame4
-	db $03 ; bitmask
-	db $22
-; 0xd612c
diff --git a/gfx/pics/dratini/front.2bpp.lz b/gfx/pics/dratini/front.animated.2bpp.lz.838e4248
index b933491b7..b933491b7 100644
--- a/gfx/pics/dratini/front.2bpp.lz
+++ b/gfx/pics/dratini/front.animated.2bpp.lz.838e4248
diff --git a/gfx/pics/dratini/front.png b/gfx/pics/dratini/front.png
new file mode 100644
index 000000000..9f49eb8f0
--- /dev/null
+++ b/gfx/pics/dratini/front.png
diff --git a/gfx/pics/dratini/normal.pal b/gfx/pics/dratini/normal.pal
deleted file mode 100644
index d4e9f5109..000000000
--- a/gfx/pics/dratini/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 26, 07
-	RGB 08, 14, 24
-
diff --git a/gfx/pics/drowzee/back.2bpp.lz b/gfx/pics/drowzee/back.2bpp.lz.55367f5a
index a4218ade7..a4218ade7 100644
--- a/gfx/pics/drowzee/back.2bpp.lz
+++ b/gfx/pics/drowzee/back.2bpp.lz.55367f5a
diff --git a/gfx/pics/drowzee/back.png b/gfx/pics/drowzee/back.png
new file mode 100644
index 000000000..8186a9529
--- /dev/null
+++ b/gfx/pics/drowzee/back.png
diff --git a/gfx/pics/drowzee/bitmask.asm b/gfx/pics/drowzee/bitmask.asm
deleted file mode 100644
index bd9fa59e6..000000000
--- a/gfx/pics/drowzee/bitmask.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %00010000
-	db %10000110
-	db %00000001
-; 1
-	db %00011000
-	db %10000110
-	db %00010000
-	db %10000110
-	db %00000001
-; 2
-	db %00011000
-	db %10000110
-	db %00000000
-	db %10001110
-	db %00000011
-; 3
-	db %00000000
-	db %00000000
-	db %00000000
-	db %10001110
-	db %00000011
-; 4
-	db %10000000
-	db %00000001
-	db %00011000
-	db %00000000
-	db %00000000
-; 0xd2e80
diff --git a/gfx/pics/drowzee/frames.asm b/gfx/pics/drowzee/frames.asm
deleted file mode 100644
index 637706e1b..000000000
--- a/gfx/pics/drowzee/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28
-.frame2
-	db $01 ; bitmask
-	db $29, $2a, $2b, $2c, $2d, $24, $25, $26, $27, $28
-.frame3
-	db $02 ; bitmask
-	db $29, $2a, $2b, $2c, $2d, $2e, $2f, $30, $27, $31, $32
-.frame4
-	db $03 ; bitmask
-	db $2e, $2f, $30, $27, $31, $32
-.frame5
-	db $04 ; bitmask
-	db $33, $34, $35, $36
-; 0xd561c
diff --git a/gfx/pics/drowzee/front.2bpp.lz b/gfx/pics/drowzee/front.animated.2bpp.lz.1f23711a
index cf3f87571..cf3f87571 100644
--- a/gfx/pics/drowzee/front.2bpp.lz
+++ b/gfx/pics/drowzee/front.animated.2bpp.lz.1f23711a
diff --git a/gfx/pics/drowzee/front.png b/gfx/pics/drowzee/front.png
new file mode 100644
index 000000000..2b3a43d26
--- /dev/null
+++ b/gfx/pics/drowzee/front.png
diff --git a/gfx/pics/drowzee/normal.pal b/gfx/pics/drowzee/normal.pal
deleted file mode 100644
index e1e6b8d0c..000000000
--- a/gfx/pics/drowzee/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 23, 04
-	RGB 18, 10, 12
-
diff --git a/gfx/pics/dugtrio/back.2bpp.lz b/gfx/pics/dugtrio/back.2bpp.lz.e821a89c
index 05ad7b1ad..05ad7b1ad 100644
--- a/gfx/pics/dugtrio/back.2bpp.lz
+++ b/gfx/pics/dugtrio/back.2bpp.lz.e821a89c
diff --git a/gfx/pics/dugtrio/back.png b/gfx/pics/dugtrio/back.png
new file mode 100644
index 000000000..c1bca81bd
--- /dev/null
+++ b/gfx/pics/dugtrio/back.png
diff --git a/gfx/pics/dugtrio/bitmask.asm b/gfx/pics/dugtrio/bitmask.asm
deleted file mode 100644
index 0a2dc6df2..000000000
--- a/gfx/pics/dugtrio/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %11000000
-	db %11100001
-	db %00110000
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00001110
-	db %11000111
-	db %11100011
-	db %00110000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00001110
-	db %11000111
-	db %11100011
-	db %11110011
-	db %01100000
-	db %00000000
-; 0xd2a76
diff --git a/gfx/pics/dugtrio/frames.asm b/gfx/pics/dugtrio/frames.asm
deleted file mode 100644
index 72cf2e6be..000000000
--- a/gfx/pics/dugtrio/frames.asm
+++ /dev/null
@@ -1,35 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38
-.frame2
-	db $01 ; bitmask
-	db $39, $3a, $3b, $3c, $3d, $3e, $31, $32, $3f, $40, $34, $35
-	db $36, $37, $38
-.frame3
-	db $02 ; bitmask
-	db $39, $3a, $3b, $3c, $3d, $3e, $31, $32, $3f, $40, $34, $35
-	db $41, $42, $43, $37, $38, $44, $45, $46, $47
-.frame4
-	db $02 ; bitmask
-	db $39, $3a, $3b, $3c, $3d, $3e, $31, $32, $3f, $40, $34, $35
-	db $48, $42, $43, $37, $38, $49, $45, $46, $47
-.frame5
-	db $02 ; bitmask
-	db $39, $4a, $3b, $3c, $4b, $3e, $31, $32, $3f, $40, $34, $35
-	db $41, $42, $43, $37, $38, $44, $45, $46, $47
-.frame6
-	db $02 ; bitmask
-	db $39, $3a, $3b, $3c, $3d, $3e, $31, $4c, $3f, $40, $34, $4d
-	db $41, $42, $43, $37, $38, $44, $45, $46, $47
-.frame7
-	db $02 ; bitmask
-	db $39, $4a, $3b, $3c, $4b, $3e, $31, $4c, $3f, $40, $34, $4d
-	db $48, $42, $43, $37, $38, $49, $45, $46, $47
-; 0xd4c9b
diff --git a/gfx/pics/dugtrio/front.2bpp.lz b/gfx/pics/dugtrio/front.animated.2bpp.lz.5c9e668c
index 7ef2606cd..7ef2606cd 100644
--- a/gfx/pics/dugtrio/front.2bpp.lz
+++ b/gfx/pics/dugtrio/front.animated.2bpp.lz.5c9e668c
diff --git a/gfx/pics/dugtrio/front.png b/gfx/pics/dugtrio/front.png
new file mode 100644
index 000000000..9fe5e14a7
--- /dev/null
+++ b/gfx/pics/dugtrio/front.png
diff --git a/gfx/pics/dugtrio/normal.pal b/gfx/pics/dugtrio/normal.pal
deleted file mode 100644
index 9eaf1baf0..000000000
--- a/gfx/pics/dugtrio/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 19, 11, 04
-	RGB 24, 06, 04
-
diff --git a/gfx/pics/dunsparce/back.2bpp.lz b/gfx/pics/dunsparce/back.2bpp.lz.aee69114
index 1042b07f8..1042b07f8 100644
--- a/gfx/pics/dunsparce/back.2bpp.lz
+++ b/gfx/pics/dunsparce/back.2bpp.lz.aee69114
diff --git a/gfx/pics/dunsparce/back.png b/gfx/pics/dunsparce/back.png
new file mode 100644
index 000000000..d3fc9cc85
--- /dev/null
+++ b/gfx/pics/dunsparce/back.png
diff --git a/gfx/pics/dunsparce/bitmask.asm b/gfx/pics/dunsparce/bitmask.asm
deleted file mode 100644
index e3c9c1a36..000000000
--- a/gfx/pics/dunsparce/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00111000
-	db %10001110
-	db %11000011
-	db %00000000
-	db %00000000
-; 1
-	db %00111000
-	db %10001110
-	db %11001111
-	db %00000011
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %00001100
-	db %00000011
-	db %00000000
-; 3
-	db %00010000
-	db %00000000
-	db %00000001
-	db %00000000
-	db %00000000
-; 0xd3701
diff --git a/gfx/pics/dunsparce/frames.asm b/gfx/pics/dunsparce/frames.asm
deleted file mode 100644
index 65dfd39cc..000000000
--- a/gfx/pics/dunsparce/frames.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $00
-.frame2
-	db $01 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2e, $2f, $2d
-	db $00, $30, $31
-.frame3
-	db $01 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $32, $33, $2d
-	db $00, $34, $35
-.frame4
-	db $02 ; bitmask
-	db $2e, $2f, $30, $31
-.frame5
-	db $03 ; bitmask
-	db $36, $37
-; 0xd8f6c
diff --git a/gfx/pics/dunsparce/front.2bpp.lz b/gfx/pics/dunsparce/front.animated.2bpp.lz.04ea863c
index 31e9aa319..31e9aa319 100644
--- a/gfx/pics/dunsparce/front.2bpp.lz
+++ b/gfx/pics/dunsparce/front.animated.2bpp.lz.04ea863c
diff --git a/gfx/pics/dunsparce/front.png b/gfx/pics/dunsparce/front.png
new file mode 100644
index 000000000..a2fbc6f18
--- /dev/null
+++ b/gfx/pics/dunsparce/front.png
diff --git a/gfx/pics/dunsparce/normal.pal b/gfx/pics/dunsparce/normal.pal
deleted file mode 100644
index c0c5b25d7..000000000
--- a/gfx/pics/dunsparce/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 24, 06
-	RGB 08, 15, 23
-
diff --git a/gfx/pics/eevee/back.2bpp.lz b/gfx/pics/eevee/back.2bpp.lz.bc34ce62
index ddd051f3a..ddd051f3a 100644
--- a/gfx/pics/eevee/back.2bpp.lz
+++ b/gfx/pics/eevee/back.2bpp.lz.bc34ce62
diff --git a/gfx/pics/eevee/back.png b/gfx/pics/eevee/back.png
new file mode 100644
index 000000000..7dbca2487
--- /dev/null
+++ b/gfx/pics/eevee/back.png
diff --git a/gfx/pics/eevee/bitmask.asm b/gfx/pics/eevee/bitmask.asm
deleted file mode 100644
index 654492f61..000000000
--- a/gfx/pics/eevee/bitmask.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-; 0
-	db %00000000
-	db %01100010
-	db %00000000
-	db %00000000
-; 1
-	db %11000110
-	db %11100010
-	db %00110101
-	db %00000000
-; 2
-	db %00000000
-	db %01100010
-	db %00000100
-	db %00000000
-; 3
-	db %11000110
-	db %10000000
-	db %00110001
-	db %00000000
-; 0xd3193
diff --git a/gfx/pics/eevee/frames.asm b/gfx/pics/eevee/frames.asm
deleted file mode 100644
index 61da3fb18..000000000
--- a/gfx/pics/eevee/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b
-.frame2
-	db $00 ; bitmask
-	db $1c, $1a, $1d
-.frame3
-	db $01 ; bitmask
-	db $1e, $1f, $20, $21, $1c, $1a, $1d, $22, $23, $24, $25, $26
-.frame4
-	db $02 ; bitmask
-	db $1c, $1a, $1d, $24
-.frame5
-	db $03 ; bitmask
-	db $1e, $1f, $20, $21, $22, $23, $25, $26
-; 0xd5e1d
diff --git a/gfx/pics/eevee/front.2bpp.lz b/gfx/pics/eevee/front.animated.2bpp.lz.04e72b48
index aea8d545e..aea8d545e 100644
--- a/gfx/pics/eevee/front.2bpp.lz
+++ b/gfx/pics/eevee/front.animated.2bpp.lz.04e72b48
diff --git a/gfx/pics/eevee/front.png b/gfx/pics/eevee/front.png
new file mode 100644
index 000000000..b35e901c8
--- /dev/null
+++ b/gfx/pics/eevee/front.png
diff --git a/gfx/pics/eevee/normal.pal b/gfx/pics/eevee/normal.pal
deleted file mode 100644
index d09dba19e..000000000
--- a/gfx/pics/eevee/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 16, 06
-	RGB 17, 08, 02
-
diff --git a/gfx/pics/egg/bitmask.asm b/gfx/pics/egg/bitmask.asm
deleted file mode 100644
index 8ff9592c4..000000000
--- a/gfx/pics/egg/bitmask.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-; 0
-	db %11001110
-	db %00111001
-	db %00000111
-	db %00000000
-; 0xd3ad3
diff --git a/gfx/pics/egg/frames.asm b/gfx/pics/egg/frames.asm
deleted file mode 100644
index 19839df43..000000000
--- a/gfx/pics/egg/frames.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $00, $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $23
-.frame2
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $00, $2d, $2e
-; 0xd99a9
diff --git a/gfx/pics/egg/front.2bpp.lz b/gfx/pics/egg/front.animated.2bpp.lz.7b468eff
index 47d8b997e..47d8b997e 100644
--- a/gfx/pics/egg/front.2bpp.lz
+++ b/gfx/pics/egg/front.animated.2bpp.lz.7b468eff
diff --git a/gfx/pics/egg/front.png b/gfx/pics/egg/front.png
new file mode 100644
index 000000000..be8e9d4a4
--- /dev/null
+++ b/gfx/pics/egg/front.png
diff --git a/gfx/pics/ekans/back.2bpp.lz b/gfx/pics/ekans/back.2bpp.lz.671d14d9
index 07785737f..07785737f 100644
--- a/gfx/pics/ekans/back.2bpp.lz
+++ b/gfx/pics/ekans/back.2bpp.lz.671d14d9
diff --git a/gfx/pics/ekans/back.png b/gfx/pics/ekans/back.png
new file mode 100644
index 000000000..d61670da7
--- /dev/null
+++ b/gfx/pics/ekans/back.png
diff --git a/gfx/pics/ekans/bitmask.asm b/gfx/pics/ekans/bitmask.asm
deleted file mode 100644
index a3c61a4d3..000000000
--- a/gfx/pics/ekans/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %11100111
-	db %00011100
-	db %00000000
-	db %00000000
-; 1
-	db %11101111
-	db %00011101
-	db %00000011
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %01100000
-	db %00000000
-; 0xd286c
diff --git a/gfx/pics/ekans/frames.asm b/gfx/pics/ekans/frames.asm
deleted file mode 100644
index 6bd3fc1d6..000000000
--- a/gfx/pics/ekans/frames.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $0f, $1b, $1c, $1d, $1e, $1f, $20
-.frame2
-	db $01 ; bitmask
-	db $0f, $21, $22, $23, $0f, $24, $25, $26, $0f, $27, $28, $29
-	db $2a
-.frame3
-	db $01 ; bitmask
-	db $0f, $21, $22, $23, $0f, $24, $25, $2b, $0f, $27, $28, $29
-	db $2a
-.frame4
-	db $02 ; bitmask
-	db $2c, $2d
-.frame5
-	db $02 ; bitmask
-	db $2e, $2d
-; 0xd465c
diff --git a/gfx/pics/ekans/front.2bpp.lz b/gfx/pics/ekans/front.animated.2bpp.lz.018a1c72
index efa075fab..efa075fab 100644
--- a/gfx/pics/ekans/front.2bpp.lz
+++ b/gfx/pics/ekans/front.animated.2bpp.lz.018a1c72
diff --git a/gfx/pics/ekans/front.png b/gfx/pics/ekans/front.png
new file mode 100644
index 000000000..21f476943
--- /dev/null
+++ b/gfx/pics/ekans/front.png
diff --git a/gfx/pics/ekans/normal.pal b/gfx/pics/ekans/normal.pal
deleted file mode 100644
index a98f678b9..000000000
--- a/gfx/pics/ekans/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 08, 21
-	RGB 21, 00, 07
-
diff --git a/gfx/pics/electabuzz/back.2bpp.lz b/gfx/pics/electabuzz/back.2bpp.lz.e97330fe
index b64bc1ca1..b64bc1ca1 100644
--- a/gfx/pics/electabuzz/back.2bpp.lz
+++ b/gfx/pics/electabuzz/back.2bpp.lz.e97330fe
diff --git a/gfx/pics/electabuzz/back.png b/gfx/pics/electabuzz/back.png
new file mode 100644
index 000000000..73496522e
--- /dev/null
+++ b/gfx/pics/electabuzz/back.png
diff --git a/gfx/pics/electabuzz/bitmask.asm b/gfx/pics/electabuzz/bitmask.asm
deleted file mode 100644
index 240c2dd37..000000000
--- a/gfx/pics/electabuzz/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %01100000
-	db %00011000
-	db %00000000
-	db %00000000
-; 1
-	db %01000000
-	db %01100000
-	db %00011000
-	db %00000001
-	db %00000000
-; 2
-	db %11001111
-	db %01100011
-	db %00011000
-	db %11001111
-	db %00000011
-; 3
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000001
-	db %00000000
-; 0xd30ec
diff --git a/gfx/pics/electabuzz/frames.asm b/gfx/pics/electabuzz/frames.asm
deleted file mode 100644
index 1f3e52ada..000000000
--- a/gfx/pics/electabuzz/frames.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27
-.frame2
-	db $01 ; bitmask
-	db $28, $24, $25, $26, $27, $29
-.frame3
-	db $02 ; bitmask
-	db $04, $2a, $2b, $2c, $2d, $2e, $2f, $30, $24, $25, $26, $27
-	db $31, $32, $33, $34, $35, $36, $37, $38
-.frame4
-	db $02 ; bitmask
-	db $04, $2a, $2b, $2c, $39, $2e, $2f, $30, $24, $25, $26, $27
-	db $3a, $32, $33, $34, $35, $36, $37, $38
-.frame5
-	db $03 ; bitmask
-	db $28, $29
-; 0xd5c37
diff --git a/gfx/pics/electabuzz/front.2bpp.lz b/gfx/pics/electabuzz/front.animated.2bpp.lz.381e1c6e
index 645db8d4d..645db8d4d 100644
--- a/gfx/pics/electabuzz/front.2bpp.lz
+++ b/gfx/pics/electabuzz/front.animated.2bpp.lz.381e1c6e
diff --git a/gfx/pics/electabuzz/front.png b/gfx/pics/electabuzz/front.png
new file mode 100644
index 000000000..3d44a603a
--- /dev/null
+++ b/gfx/pics/electabuzz/front.png
diff --git a/gfx/pics/electabuzz/normal.pal b/gfx/pics/electabuzz/normal.pal
deleted file mode 100644
index 71fecfa13..000000000
--- a/gfx/pics/electabuzz/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 31, 05
-	RGB 24, 16, 05
-
diff --git a/gfx/pics/electrode/back.2bpp.lz b/gfx/pics/electrode/back.2bpp.lz.874e1f1c
index 9161c8884..9161c8884 100644
--- a/gfx/pics/electrode/back.2bpp.lz
+++ b/gfx/pics/electrode/back.2bpp.lz.874e1f1c
diff --git a/gfx/pics/electrode/back.png b/gfx/pics/electrode/back.png
new file mode 100644
index 000000000..ea243bf3c
--- /dev/null
+++ b/gfx/pics/electrode/back.png
diff --git a/gfx/pics/electrode/bitmask.asm b/gfx/pics/electrode/bitmask.asm
deleted file mode 100644
index 00990061d..000000000
--- a/gfx/pics/electrode/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00000000
-	db %01110011
-	db %00000110
-	db %00000000
-; 1
-	db %11000000
-	db %01110011
-	db %00000110
-	db %00000000
-; 2
-	db %00000000
-	db %01100011
-	db %00000100
-	db %00000000
-; 0xd2edd
diff --git a/gfx/pics/electrode/frames.asm b/gfx/pics/electrode/frames.asm
deleted file mode 100644
index cdb569481..000000000
--- a/gfx/pics/electrode/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f
-.frame2
-	db $01 ; bitmask
-	db $20, $21, $19, $1a, $22, $1c, $1d, $23, $1f
-.frame3
-	db $02 ; bitmask
-	db $19, $1a, $1c, $1d, $1f
-; 0xd56e1
diff --git a/gfx/pics/electrode/front.2bpp.lz b/gfx/pics/electrode/front.animated.2bpp.lz.d7943ad8
index 2d86aa4ac..2d86aa4ac 100644
--- a/gfx/pics/electrode/front.2bpp.lz
+++ b/gfx/pics/electrode/front.animated.2bpp.lz.d7943ad8
diff --git a/gfx/pics/electrode/front.png b/gfx/pics/electrode/front.png
new file mode 100644
index 000000000..25c181357
--- /dev/null
+++ b/gfx/pics/electrode/front.png
diff --git a/gfx/pics/electrode/normal.pal b/gfx/pics/electrode/normal.pal
deleted file mode 100644
index 07658abee..000000000
--- a/gfx/pics/electrode/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 20, 17
-	RGB 24, 05, 05
-
diff --git a/gfx/pics/elekid/back.2bpp.lz b/gfx/pics/elekid/back.2bpp.lz.227a1b23
index fd8dd04df..fd8dd04df 100644
--- a/gfx/pics/elekid/back.2bpp.lz
+++ b/gfx/pics/elekid/back.2bpp.lz.227a1b23
diff --git a/gfx/pics/elekid/back.png b/gfx/pics/elekid/back.png
new file mode 100644
index 000000000..8049ca5ad
--- /dev/null
+++ b/gfx/pics/elekid/back.png
diff --git a/gfx/pics/elekid/bitmask.asm b/gfx/pics/elekid/bitmask.asm
deleted file mode 100644
index f0f1fc48a..000000000
--- a/gfx/pics/elekid/bitmask.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-; 0
-	db %11001111
-	db %10000011
-	db %00000000
-	db %00100000
-	db %00001000
-; 1
-	db %11001111
-	db %10110011
-	db %00001100
-	db %00100111
-	db %00001000
-; 2
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00100000
-	db %00001000
-; 3
-	db %10000000
-	db %00110000
-	db %00001100
-	db %00100111
-	db %00001000
-; 4
-	db %00000000
-	db %00001100
-	db %00000000
-	db %00100000
-	db %00001000
-; 0xd398c
diff --git a/gfx/pics/elekid/frames.asm b/gfx/pics/elekid/frames.asm
deleted file mode 100644
index 22fe6b955..000000000
--- a/gfx/pics/elekid/frames.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $04, $27, $28, $29, $2a, $2b, $2c, $2d
-.frame2
-	db $01 ; bitmask
-	db $24, $25, $26, $04, $27, $2e, $29, $2a, $2f, $30, $2b, $31
-	db $32, $33, $34, $35, $2c, $2d
-.frame3
-	db $02 ; bitmask
-	db $2c, $2d
-.frame4
-	db $03 ; bitmask
-	db $36, $2f, $30, $31, $32, $33, $34, $35, $2c, $2d
-.frame5
-	db $04 ; bitmask
-	db $37, $38, $2c, $2d
-; 0xd9578
diff --git a/gfx/pics/elekid/front.2bpp.lz b/gfx/pics/elekid/front.animated.2bpp.lz.3bbb6b61
index dde6b0e0b..dde6b0e0b 100644
--- a/gfx/pics/elekid/front.2bpp.lz
+++ b/gfx/pics/elekid/front.animated.2bpp.lz.3bbb6b61
diff --git a/gfx/pics/elekid/front.png b/gfx/pics/elekid/front.png
new file mode 100644
index 000000000..eaefbdc6c
--- /dev/null
+++ b/gfx/pics/elekid/front.png
diff --git a/gfx/pics/elekid/normal.pal b/gfx/pics/elekid/normal.pal
deleted file mode 100644
index f670fee1c..000000000
--- a/gfx/pics/elekid/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 31, 05
-	RGB 15, 10, 03
-
diff --git a/gfx/pics/entei/back.2bpp.lz b/gfx/pics/entei/back.2bpp.lz.d1e1986a
index 7f2440f51..7f2440f51 100644
--- a/gfx/pics/entei/back.2bpp.lz
+++ b/gfx/pics/entei/back.2bpp.lz.d1e1986a
diff --git a/gfx/pics/entei/back.png b/gfx/pics/entei/back.png
new file mode 100644
index 000000000..fa966a3c9
--- /dev/null
+++ b/gfx/pics/entei/back.png
diff --git a/gfx/pics/entei/bitmask.asm b/gfx/pics/entei/bitmask.asm
deleted file mode 100644
index 87f417106..000000000
--- a/gfx/pics/entei/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %10001111
-	db %11001111
-	db %11100111
-	db %11110011
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %10011111
-	db %11001111
-	db %11100111
-	db %11110011
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000100
-	db %00000011
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %10000000
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd39f5
diff --git a/gfx/pics/entei/frames.asm b/gfx/pics/entei/frames.asm
deleted file mode 100644
index 3034f66a3..000000000
--- a/gfx/pics/entei/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $04, $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b
-	db $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44, $45, $46
-.frame2
-	db $01 ; bitmask
-	db $04, $04, $05, $47, $48, $34, $49, $4a, $4b, $38, $39, $3a
-	db $4c, $4d, $4e, $3e, $3f, $40, $41, $42, $43, $44, $45, $46
-.frame3
-	db $02 ; bitmask
-	db $4f, $50, $51
-.frame4
-	db $03 ; bitmask
-	db $52, $53
-; 0xd96ff
diff --git a/gfx/pics/entei/front.2bpp.lz b/gfx/pics/entei/front.animated.2bpp.lz.ebaf8024
index bc969fe65..bc969fe65 100644
--- a/gfx/pics/entei/front.2bpp.lz
+++ b/gfx/pics/entei/front.animated.2bpp.lz.ebaf8024
diff --git a/gfx/pics/entei/front.png b/gfx/pics/entei/front.png
new file mode 100644
index 000000000..220bcf9a6
--- /dev/null
+++ b/gfx/pics/entei/front.png
diff --git a/gfx/pics/entei/normal.pal b/gfx/pics/entei/normal.pal
deleted file mode 100644
index 509503c68..000000000
--- a/gfx/pics/entei/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 14, 00
-	RGB 21, 00, 00
-
diff --git a/gfx/pics/espeon/back.2bpp.lz b/gfx/pics/espeon/back.2bpp.lz.0e77f26e
index 59a69eae1..59a69eae1 100644
--- a/gfx/pics/espeon/back.2bpp.lz
+++ b/gfx/pics/espeon/back.2bpp.lz.0e77f26e
diff --git a/gfx/pics/espeon/back.png b/gfx/pics/espeon/back.png
new file mode 100644
index 000000000..26d2d2973
--- /dev/null
+++ b/gfx/pics/espeon/back.png
diff --git a/gfx/pics/espeon/bitmask.asm b/gfx/pics/espeon/bitmask.asm
deleted file mode 100644
index 48d53b916..000000000
--- a/gfx/pics/espeon/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000100
-	db %01000011
-	db %00110000
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %00000000
-	db %10001110
-	db %00000011
-; 2
-	db %00000000
-	db %00000000
-	db %00000000
-	db %10001100
-	db %00000011
-; 3
-	db %00000000
-	db %01100001
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3651
diff --git a/gfx/pics/espeon/frames.asm b/gfx/pics/espeon/frames.asm
deleted file mode 100644
index 4fdf41370..000000000
--- a/gfx/pics/espeon/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29
-.frame2
-	db $01 ; bitmask
-	db $2a, $2b, $2c, $2d, $2e, $2f
-.frame3
-	db $02 ; bitmask
-	db $30, $31, $03, $32, $33
-.frame4
-	db $03 ; bitmask
-	db $34, $35, $36
-; 0xd8d3c
diff --git a/gfx/pics/espeon/front.2bpp.lz b/gfx/pics/espeon/front.animated.2bpp.lz.069f57ec
index b7d983e9f..b7d983e9f 100644
--- a/gfx/pics/espeon/front.2bpp.lz
+++ b/gfx/pics/espeon/front.animated.2bpp.lz.069f57ec
diff --git a/gfx/pics/espeon/front.png b/gfx/pics/espeon/front.png
new file mode 100644
index 000000000..dd68a6c18
--- /dev/null
+++ b/gfx/pics/espeon/front.png
diff --git a/gfx/pics/espeon/normal.pal b/gfx/pics/espeon/normal.pal
deleted file mode 100644
index d730e22ce..000000000
--- a/gfx/pics/espeon/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 15, 26
-	RGB 15, 05, 18
-
diff --git a/gfx/pics/exeggcute/back.2bpp.lz b/gfx/pics/exeggcute/back.2bpp.lz.060c38b0
index 1877fcea1..1877fcea1 100644
--- a/gfx/pics/exeggcute/back.2bpp.lz
+++ b/gfx/pics/exeggcute/back.2bpp.lz.060c38b0
diff --git a/gfx/pics/exeggcute/back.png b/gfx/pics/exeggcute/back.png
new file mode 100644
index 000000000..97f04b02f
--- /dev/null
+++ b/gfx/pics/exeggcute/back.png
diff --git a/gfx/pics/exeggcute/bitmask.asm b/gfx/pics/exeggcute/bitmask.asm
deleted file mode 100644
index 88506f525..000000000
--- a/gfx/pics/exeggcute/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00110000
-	db %00011010
-	db %11011111
-	db %01100001
-	db %11010011
-	db %11110001
-	db %00000000
-; 1
-	db %01111000
-	db %00011011
-	db %11011111
-	db %01100001
-	db %11010011
-	db %11110001
-	db %00000000
-; 2
-	db %00010000
-	db %00011000
-	db %11001011
-	db %00100000
-	db %11000000
-	db %11010001
-	db %00000000
-; 0xd2ef2
diff --git a/gfx/pics/exeggcute/frames.asm b/gfx/pics/exeggcute/frames.asm
deleted file mode 100644
index c0ef904a0..000000000
--- a/gfx/pics/exeggcute/frames.asm
+++ /dev/null
@@ -1,18 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $35, $35, $38, $39, $35
-	db $3a, $35, $3b, $3c, $3d, $3e, $3f, $40, $35, $41, $42, $43
-	db $44
-.frame2
-	db $01 ; bitmask
-	db $15, $31, $32, $02, $45, $33, $34, $35, $36, $37, $35, $35
-	db $38, $39, $34, $3a, $34, $3b, $3c, $32, $3e, $3f, $34, $3a
-	db $41, $42, $43, $44
-.frame3
-	db $02 ; bitmask
-	db $46, $34, $47, $36, $48, $49, $39, $35, $4a, $4b, $40, $4c
-	db $41, $4d, $4e
-; 0xd572e
diff --git a/gfx/pics/exeggcute/front.2bpp.lz b/gfx/pics/exeggcute/front.animated.2bpp.lz.578a4722
index 9d018e7c4..9d018e7c4 100644
--- a/gfx/pics/exeggcute/front.2bpp.lz
+++ b/gfx/pics/exeggcute/front.animated.2bpp.lz.578a4722
diff --git a/gfx/pics/exeggcute/front.png b/gfx/pics/exeggcute/front.png
new file mode 100644
index 000000000..a492d0cf5
--- /dev/null
+++ b/gfx/pics/exeggcute/front.png
diff --git a/gfx/pics/exeggcute/normal.pal b/gfx/pics/exeggcute/normal.pal
deleted file mode 100644
index 539432719..000000000
--- a/gfx/pics/exeggcute/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 15, 17
-	RGB 19, 05, 09
-
diff --git a/gfx/pics/exeggutor/back.2bpp.lz b/gfx/pics/exeggutor/back.2bpp.lz.e012643e
index abf6c97dd..abf6c97dd 100644
--- a/gfx/pics/exeggutor/back.2bpp.lz
+++ b/gfx/pics/exeggutor/back.2bpp.lz.e012643e
diff --git a/gfx/pics/exeggutor/back.png b/gfx/pics/exeggutor/back.png
new file mode 100644
index 000000000..7812499b1
--- /dev/null
+++ b/gfx/pics/exeggutor/back.png
diff --git a/gfx/pics/exeggutor/bitmask.asm b/gfx/pics/exeggutor/bitmask.asm
deleted file mode 100644
index 117b07532..000000000
--- a/gfx/pics/exeggutor/bitmask.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-; 0
-	db %00000000
-	db %00001110
-	db %10000111
-	db %11000011
-	db %11100001
-	db %00000000
-	db %00000000
-; 1
-	db %10000111
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00001000
-	db %00011000
-	db %00000000
-; 0xd2f00
diff --git a/gfx/pics/exeggutor/frames.asm b/gfx/pics/exeggutor/frames.asm
deleted file mode 100644
index 6b815a8aa..000000000
--- a/gfx/pics/exeggutor/frames.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f
-.frame2
-	db $01 ; bitmask
-	db $40, $41, $42, $43, $44, $45, $46
-; 0xd574a
diff --git a/gfx/pics/exeggutor/front.2bpp.lz b/gfx/pics/exeggutor/front.animated.2bpp.lz.3915d572
index b4056b175..b4056b175 100644
--- a/gfx/pics/exeggutor/front.2bpp.lz
+++ b/gfx/pics/exeggutor/front.animated.2bpp.lz.3915d572
diff --git a/gfx/pics/exeggutor/front.png b/gfx/pics/exeggutor/front.png
new file mode 100644
index 000000000..b9d75b166
--- /dev/null
+++ b/gfx/pics/exeggutor/front.png
diff --git a/gfx/pics/exeggutor/normal.pal b/gfx/pics/exeggutor/normal.pal
deleted file mode 100644
index 0318f71a5..000000000
--- a/gfx/pics/exeggutor/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 13, 06
-	RGB 05, 16, 07
-
diff --git a/gfx/pics/farfetch_d/back.2bpp.lz b/gfx/pics/farfetch_d/back.2bpp.lz.6f28ebc4
index 77dd25ae9..77dd25ae9 100644
--- a/gfx/pics/farfetch_d/back.2bpp.lz
+++ b/gfx/pics/farfetch_d/back.2bpp.lz.6f28ebc4
diff --git a/gfx/pics/farfetch_d/back.png b/gfx/pics/farfetch_d/back.png
new file mode 100644
index 000000000..b7f1ce41f
--- /dev/null
+++ b/gfx/pics/farfetch_d/back.png
diff --git a/gfx/pics/farfetch_d/bitmask.asm b/gfx/pics/farfetch_d/bitmask.asm
deleted file mode 100644
index 82429610d..000000000
--- a/gfx/pics/farfetch_d/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %00111000
-	db %00001110
-	db %00000010
-; 1
-	db %00000000
-	db %01000000
-	db %00111100
-	db %11011111
-	db %00000111
-; 2
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00001000
-	db %00000010
-; 3
-	db %00000000
-	db %01000000
-	db %00010000
-	db %00001000
-	db %00000010
-; 0xd2d3c
diff --git a/gfx/pics/farfetch_d/frames.asm b/gfx/pics/farfetch_d/frames.asm
deleted file mode 100644
index 698ff1f15..000000000
--- a/gfx/pics/farfetch_d/frames.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a
-.frame2
-	db $01 ; bitmask
-	db $2b, $2c, $2d, $2e, $26, $22, $2f, $30, $29, $31, $22, $32
-	db $33, $34, $35
-.frame3
-	db $01 ; bitmask
-	db $2b, $2c, $2d, $2e, $26, $22, $36, $28, $37, $38, $22, $32
-	db $39, $3a, $3b
-.frame4
-	db $02 ; bitmask
-	db $29, $2a
-.frame5
-	db $03 ; bitmask
-	db $2b, $2e, $29, $2a
-; 0xd5334
diff --git a/gfx/pics/farfetch_d/front.2bpp.lz b/gfx/pics/farfetch_d/front.animated.2bpp.lz.a4ae9393
index d9eeb7489..d9eeb7489 100644
--- a/gfx/pics/farfetch_d/front.2bpp.lz
+++ b/gfx/pics/farfetch_d/front.animated.2bpp.lz.a4ae9393
diff --git a/gfx/pics/farfetch_d/front.png b/gfx/pics/farfetch_d/front.png
new file mode 100644
index 000000000..1ad86679f
--- /dev/null
+++ b/gfx/pics/farfetch_d/front.png
diff --git a/gfx/pics/farfetch_d/normal.pal b/gfx/pics/farfetch_d/normal.pal
deleted file mode 100644
index 17e60c4ce..000000000
--- a/gfx/pics/farfetch_d/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 12, 08
-	RGB 06, 26, 01
-
diff --git a/gfx/pics/fearow/back.2bpp.lz b/gfx/pics/fearow/back.2bpp.lz.a7a39118
index 641086eaa..641086eaa 100644
--- a/gfx/pics/fearow/back.2bpp.lz
+++ b/gfx/pics/fearow/back.2bpp.lz.a7a39118
diff --git a/gfx/pics/fearow/back.png b/gfx/pics/fearow/back.png
new file mode 100644
index 000000000..f6fc2a63a
--- /dev/null
+++ b/gfx/pics/fearow/back.png
diff --git a/gfx/pics/fearow/bitmask.asm b/gfx/pics/fearow/bitmask.asm
deleted file mode 100644
index a04c00427..000000000
--- a/gfx/pics/fearow/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %10001100
-	db %11011110
-	db %01000111
-	db %11110000
-	db %11111011
-	db %11111111
-	db %00000000
-; 1
-	db %00000000
-	db %00000110
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00001100
-	db %10011110
-	db %10000111
-	db %11100001
-	db %11100011
-	db %11110011
-	db %00000000
-; 3
-	db %00000000
-	db %00000011
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2860
diff --git a/gfx/pics/fearow/frames.asm b/gfx/pics/fearow/frames.asm
deleted file mode 100644
index 5d7b5a6a6..000000000
--- a/gfx/pics/fearow/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $05, $05, $36, $37, $38, $05, $39
-	db $3a, $3b, $3c, $3d, $3e, $3f, $05, $40, $41, $42, $43, $44
-	db $05, $05, $45, $46, $47, $05, $05, $05
-.frame2
-	db $01 ; bitmask
-	db $34, $48
-.frame3
-	db $02 ; bitmask
-	db $49, $4a, $4b, $4c, $05, $05, $4d, $4e, $05, $39, $4f, $50
-	db $51, $52, $53, $54, $05, $55, $56, $44, $05, $05, $57, $58
-	db $05, $05
-.frame4
-	db $03 ; bitmask
-	db $59, $5a
-; 0xd4626
diff --git a/gfx/pics/fearow/front.2bpp.lz b/gfx/pics/fearow/front.animated.2bpp.lz.393b11d6
index 4fbf2d47f..4fbf2d47f 100644
--- a/gfx/pics/fearow/front.2bpp.lz
+++ b/gfx/pics/fearow/front.animated.2bpp.lz.393b11d6
diff --git a/gfx/pics/fearow/front.png b/gfx/pics/fearow/front.png
new file mode 100644
index 000000000..f003ce0f7
--- /dev/null
+++ b/gfx/pics/fearow/front.png
diff --git a/gfx/pics/fearow/normal.pal b/gfx/pics/fearow/normal.pal
deleted file mode 100644
index 1d4c56a45..000000000
--- a/gfx/pics/fearow/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 22, 11, 04
-	RGB 31, 06, 16
-
diff --git a/gfx/pics/feraligatr/back.2bpp.lz b/gfx/pics/feraligatr/back.2bpp.lz.f95abe99
index 4e180d0f5..4e180d0f5 100644
--- a/gfx/pics/feraligatr/back.2bpp.lz
+++ b/gfx/pics/feraligatr/back.2bpp.lz.f95abe99
diff --git a/gfx/pics/feraligatr/back.png b/gfx/pics/feraligatr/back.png
new file mode 100644
index 000000000..8f1e63203
--- /dev/null
+++ b/gfx/pics/feraligatr/back.png
diff --git a/gfx/pics/feraligatr/bitmask.asm b/gfx/pics/feraligatr/bitmask.asm
deleted file mode 100644
index cf22f4db5..000000000
--- a/gfx/pics/feraligatr/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00111000
-	db %00011100
-	db %00000110
-	db %11000011
-	db %01100001
-	db %00110000
-	db %00000000
-; 1
-	db %00111100
-	db %00011110
-	db %00000011
-	db %10000011
-	db %10000001
-	db %00000000
-	db %00000000
-; 2
-	db %00111100
-	db %00011110
-	db %00000111
-	db %10000011
-	db %10000001
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %10000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd33c5
diff --git a/gfx/pics/feraligatr/frames.asm b/gfx/pics/feraligatr/frames.asm
deleted file mode 100644
index 4ce24fb2c..000000000
--- a/gfx/pics/feraligatr/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $06, $33, $34, $35, $36, $37, $38, $39, $3a, $3b
-	db $3c, $3d, $3e, $06, $06
-.frame2
-	db $01 ; bitmask
-	db $3f, $40, $41, $42, $43, $44, $45, $46, $47, $48, $49, $4a
-	db $4b, $4c, $4d
-.frame3
-	db $02 ; bitmask
-	db $3f, $4e, $4f, $42, $50, $51, $52, $46, $53, $54, $55, $56
-	db $4a, $4b, $4c, $4d
-.frame4
-	db $03 ; bitmask
-	db $57, $58
-; 0xd8674
diff --git a/gfx/pics/feraligatr/front.2bpp.lz b/gfx/pics/feraligatr/front.animated.2bpp.lz.fade72cc
index cc055e629..cc055e629 100644
--- a/gfx/pics/feraligatr/front.2bpp.lz
+++ b/gfx/pics/feraligatr/front.animated.2bpp.lz.fade72cc
diff --git a/gfx/pics/feraligatr/front.png b/gfx/pics/feraligatr/front.png
new file mode 100644
index 000000000..c3057a8cb
--- /dev/null
+++ b/gfx/pics/feraligatr/front.png
diff --git a/gfx/pics/feraligatr/normal.pal b/gfx/pics/feraligatr/normal.pal
deleted file mode 100644
index 2cbc9b1f5..000000000
--- a/gfx/pics/feraligatr/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 11, 14, 29
-	RGB 21, 06, 01
-
diff --git a/gfx/pics/flaaffy/back.2bpp.lz b/gfx/pics/flaaffy/back.2bpp.lz.461855e4
index 5eec3df7a..5eec3df7a 100644
--- a/gfx/pics/flaaffy/back.2bpp.lz
+++ b/gfx/pics/flaaffy/back.2bpp.lz.461855e4
diff --git a/gfx/pics/flaaffy/back.png b/gfx/pics/flaaffy/back.png
new file mode 100644
index 000000000..36259453c
--- /dev/null
+++ b/gfx/pics/flaaffy/back.png
diff --git a/gfx/pics/flaaffy/bitmask.asm b/gfx/pics/flaaffy/bitmask.asm
deleted file mode 100644
index 85dc68882..000000000
--- a/gfx/pics/flaaffy/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00000000
-	db %00000100
-	db %01000001
-	db %10011110
-	db %00000111
-; 1
-	db %00000000
-	db %01000101
-	db %01000001
-	db %10011110
-	db %00000111
-; 2
-	db %00000000
-	db %01000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3507
diff --git a/gfx/pics/flaaffy/frames.asm b/gfx/pics/flaaffy/frames.asm
deleted file mode 100644
index facb6f888..000000000
--- a/gfx/pics/flaaffy/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $00, $27, $28, $29, $00, $2a, $2b, $2c
-.frame2
-	db $01 ; bitmask
-	db $2d, $2e, $2f, $30, $26, $00, $27, $28, $29, $00, $2a, $2b
-	db $2c
-.frame3
-	db $01 ; bitmask
-	db $2d, $2e, $2f, $30, $26, $00, $31, $28, $29, $00, $32, $2b
-	db $2c
-.frame4
-	db $02 ; bitmask
-	db $2d, $2f
-; 0xd8a40
diff --git a/gfx/pics/flaaffy/front.2bpp.lz b/gfx/pics/flaaffy/front.animated.2bpp.lz.6a27aac3
index 673155a7e..673155a7e 100644
--- a/gfx/pics/flaaffy/front.2bpp.lz
+++ b/gfx/pics/flaaffy/front.animated.2bpp.lz.6a27aac3
diff --git a/gfx/pics/flaaffy/front.png b/gfx/pics/flaaffy/front.png
new file mode 100644
index 000000000..f42a3b749
--- /dev/null
+++ b/gfx/pics/flaaffy/front.png
diff --git a/gfx/pics/flaaffy/normal.pal b/gfx/pics/flaaffy/normal.pal
deleted file mode 100644
index 68cae7d28..000000000
--- a/gfx/pics/flaaffy/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 13, 19
-	RGB 10, 03, 14
-
diff --git a/gfx/pics/flareon/back.2bpp.lz b/gfx/pics/flareon/back.2bpp.lz.d58af0e5
index bafc64cd2..bafc64cd2 100644
--- a/gfx/pics/flareon/back.2bpp.lz
+++ b/gfx/pics/flareon/back.2bpp.lz.d58af0e5
diff --git a/gfx/pics/flareon/back.png b/gfx/pics/flareon/back.png
new file mode 100644
index 000000000..4b68451c1
--- /dev/null
+++ b/gfx/pics/flareon/back.png
diff --git a/gfx/pics/flareon/bitmask.asm b/gfx/pics/flareon/bitmask.asm
deleted file mode 100644
index ffe910631..000000000
--- a/gfx/pics/flareon/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %11011110
-	db %11110111
-	db %00011001
-	db %00000110
-	db %00000000
-; 1
-	db %00000000
-	db %00000110
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00000110
-	db %00001100
-	db %11010001
-	db %00000111
-; 3
-	db %00001000
-	db %10000010
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd31c5
diff --git a/gfx/pics/flareon/frames.asm b/gfx/pics/flareon/frames.asm
deleted file mode 100644
index ed85e6737..000000000
--- a/gfx/pics/flareon/frames.asm
+++ /dev/null
@@ -1,18 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $00, $28, $29, $2a, $2b, $00, $2c, $2d
-	db $2e, $2f, $30, $1a, $31, $00
-.frame2
-	db $01 ; bitmask
-	db $32, $33
-.frame3
-	db $02 ; bitmask
-	db $32, $33, $34, $35, $36, $37, $00, $20, $21, $1f, $00
-.frame4
-	db $03 ; bitmask
-	db $38, $39, $3a
-; 0xd5eae
diff --git a/gfx/pics/flareon/front.2bpp.lz b/gfx/pics/flareon/front.animated.2bpp.lz.7b68c716
index d3210b7e3..d3210b7e3 100644
--- a/gfx/pics/flareon/front.2bpp.lz
+++ b/gfx/pics/flareon/front.animated.2bpp.lz.7b68c716
diff --git a/gfx/pics/flareon/front.png b/gfx/pics/flareon/front.png
new file mode 100644
index 000000000..13a9af29a
--- /dev/null
+++ b/gfx/pics/flareon/front.png
diff --git a/gfx/pics/flareon/normal.pal b/gfx/pics/flareon/normal.pal
deleted file mode 100644
index 2156fb420..000000000
--- a/gfx/pics/flareon/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 10, 01
-	RGB 21, 05, 02
-
diff --git a/gfx/pics/forretress/back.2bpp.lz b/gfx/pics/forretress/back.2bpp.lz.2b8e5f48
index 1c4b5d69a..1c4b5d69a 100644
--- a/gfx/pics/forretress/back.2bpp.lz
+++ b/gfx/pics/forretress/back.2bpp.lz.2b8e5f48
diff --git a/gfx/pics/forretress/back.png b/gfx/pics/forretress/back.png
new file mode 100644
index 000000000..a64fb1480
--- /dev/null
+++ b/gfx/pics/forretress/back.png
diff --git a/gfx/pics/forretress/bitmask.asm b/gfx/pics/forretress/bitmask.asm
deleted file mode 100644
index f02dcc3a1..000000000
--- a/gfx/pics/forretress/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00011000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %01100000
-	db %00000000
-; 1
-	db %00011000
-	db %00000000
-	db %00000010
-	db %10000000
-	db %00000000
-	db %01100000
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %00000010
-	db %10000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd36ed
diff --git a/gfx/pics/forretress/frames.asm b/gfx/pics/forretress/frames.asm
deleted file mode 100644
index 4c7364a44..000000000
--- a/gfx/pics/forretress/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34
-.frame2
-	db $00 ; bitmask
-	db $35, $36, $37, $38
-.frame3
-	db $01 ; bitmask
-	db $35, $36, $39, $3a, $37, $38
-.frame4
-	db $01 ; bitmask
-	db $35, $36, $3b, $3c, $37, $38
-.frame5
-	db $02 ; bitmask
-	db $39, $3a
-; 0xd8f2e
diff --git a/gfx/pics/forretress/front.2bpp.lz b/gfx/pics/forretress/front.animated.2bpp.lz.761b9f80
index 239e20532..239e20532 100644
--- a/gfx/pics/forretress/front.2bpp.lz
+++ b/gfx/pics/forretress/front.animated.2bpp.lz.761b9f80
diff --git a/gfx/pics/forretress/front.png b/gfx/pics/forretress/front.png
new file mode 100644
index 000000000..065237310
--- /dev/null
+++ b/gfx/pics/forretress/front.png
diff --git a/gfx/pics/forretress/normal.pal b/gfx/pics/forretress/normal.pal
deleted file mode 100644
index 79761d2c0..000000000
--- a/gfx/pics/forretress/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 11, 26
-	RGB 19, 02, 09
-
diff --git a/gfx/pics/furret/back.2bpp.lz b/gfx/pics/furret/back.2bpp.lz.24792550
index 0cbe66f49..0cbe66f49 100644
--- a/gfx/pics/furret/back.2bpp.lz
+++ b/gfx/pics/furret/back.2bpp.lz.24792550
diff --git a/gfx/pics/furret/back.png b/gfx/pics/furret/back.png
new file mode 100644
index 000000000..906e6e7f1
--- /dev/null
+++ b/gfx/pics/furret/back.png
diff --git a/gfx/pics/furret/bitmask.asm b/gfx/pics/furret/bitmask.asm
deleted file mode 100644
index f50245994..000000000
--- a/gfx/pics/furret/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %10011110
-	db %10001111
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %10011110
-	db %00001111
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00100000
-	db %00001000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00100000
-	db %00001100
-	db %00000000
-	db %00000000
-; 0xd33e3
diff --git a/gfx/pics/furret/frames.asm b/gfx/pics/furret/frames.asm
deleted file mode 100644
index 80060afee..000000000
--- a/gfx/pics/furret/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $00, $24, $25, $26, $00, $27, $28, $29, $2a, $2b
-.frame2
-	db $01 ; bitmask
-	db $00, $2c, $2d, $2e, $00, $2f, $30, $31, $2a
-.frame3
-	db $02 ; bitmask
-	db $32, $33
-.frame4
-	db $03 ; bitmask
-	db $34, $35, $36
-; 0xd86ae
diff --git a/gfx/pics/furret/front.2bpp.lz b/gfx/pics/furret/front.animated.2bpp.lz.f72a2758
index afba64f59..afba64f59 100644
--- a/gfx/pics/furret/front.2bpp.lz
+++ b/gfx/pics/furret/front.animated.2bpp.lz.f72a2758
diff --git a/gfx/pics/furret/front.png b/gfx/pics/furret/front.png
new file mode 100644
index 000000000..3ae88bf70
--- /dev/null
+++ b/gfx/pics/furret/front.png
diff --git a/gfx/pics/furret/normal.pal b/gfx/pics/furret/normal.pal
deleted file mode 100644
index d0bf474c9..000000000
--- a/gfx/pics/furret/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 21, 04
-	RGB 14, 09, 02
-
diff --git a/gfx/pics/gastly/back.2bpp.lz b/gfx/pics/gastly/back.2bpp.lz.4078fa56
index ecb4af90d..ecb4af90d 100644
--- a/gfx/pics/gastly/back.2bpp.lz
+++ b/gfx/pics/gastly/back.2bpp.lz.4078fa56
diff --git a/gfx/pics/gastly/back.png b/gfx/pics/gastly/back.png
new file mode 100644
index 000000000..78f96fe93
--- /dev/null
+++ b/gfx/pics/gastly/back.png
diff --git a/gfx/pics/gastly/bitmask.asm b/gfx/pics/gastly/bitmask.asm
deleted file mode 100644
index 3f6be31ae..000000000
--- a/gfx/pics/gastly/bitmask.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-; 0
-	db %00000000
-	db %00000110
-	db %10001111
-	db %10000111
-	db %00000001
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00001100
-	db %00000110
-	db %10000011
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2e02
diff --git a/gfx/pics/gastly/frames.asm b/gfx/pics/gastly/frames.asm
deleted file mode 100644
index 52ec4e101..000000000
--- a/gfx/pics/gastly/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-.frame2
-	db $00 ; bitmask
-	db $31, $3d, $3e, $34, $3f, $40, $37, $41, $42, $43, $44, $3c
-.frame3
-	db $01 ; bitmask
-	db $45, $46, $47, $48, $49, $4a, $44
-; 0xd551a
diff --git a/gfx/pics/gastly/front.2bpp.lz b/gfx/pics/gastly/front.animated.2bpp.lz.84148c1e
index f3d99339b..f3d99339b 100644
--- a/gfx/pics/gastly/front.2bpp.lz
+++ b/gfx/pics/gastly/front.animated.2bpp.lz.84148c1e
diff --git a/gfx/pics/gastly/front.png b/gfx/pics/gastly/front.png
new file mode 100644
index 000000000..5a28030d4
--- /dev/null
+++ b/gfx/pics/gastly/front.png
diff --git a/gfx/pics/gastly/normal.pal b/gfx/pics/gastly/normal.pal
deleted file mode 100644
index d91233a51..000000000
--- a/gfx/pics/gastly/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 08, 30
-	RGB 17, 00, 23
-
diff --git a/gfx/pics/gengar/back.2bpp.lz b/gfx/pics/gengar/back.2bpp.lz.5237ee63
index d1ecca65e..d1ecca65e 100644
--- a/gfx/pics/gengar/back.2bpp.lz
+++ b/gfx/pics/gengar/back.2bpp.lz.5237ee63
diff --git a/gfx/pics/gengar/back.png b/gfx/pics/gengar/back.png
new file mode 100644
index 000000000..1cb67715d
--- /dev/null
+++ b/gfx/pics/gengar/back.png
diff --git a/gfx/pics/gengar/bitmask.asm b/gfx/pics/gengar/bitmask.asm
deleted file mode 100644
index 3f1e0dc3a..000000000
--- a/gfx/pics/gengar/bitmask.asm
+++ /dev/null
@@ -1,37 +0,0 @@
-; 0
-	db %00011000
-	db %10000000
-	db %00100000
-	db %00000100
-	db %00000111
-; 1
-	db %01111011
-	db %11001101
-	db %10100010
-	db %01010111
-	db %00001111
-; 2
-	db %00100000
-	db %00001100
-	db %10000010
-	db %00010000
-	db %00001000
-; 3
-	db %01100011
-	db %11001101
-	db %10100010
-	db %01010111
-	db %00001000
-; 4
-	db %00000000
-	db %00001000
-	db %00000000
-	db %00100000
-	db %00000000
-; 5
-	db %00000000
-	db %00001000
-	db %10000010
-	db %00100000
-	db %00000000
-; 0xd2e2f
diff --git a/gfx/pics/gengar/frames.asm b/gfx/pics/gengar/frames.asm
deleted file mode 100644
index 8e3d48246..000000000
--- a/gfx/pics/gengar/frames.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b
-.frame2
-	db $01 ; bitmask
-	db $2c, $2d, $24, $25, $2e, $2f, $30, $31, $32, $33, $26, $34
-	db $27, $35, $36, $37, $28, $38, $39, $29, $2a, $2b, $3a
-.frame3
-	db $02 ; bitmask
-	db $2e, $31, $32, $34, $35, $38, $3a
-.frame4
-	db $03 ; bitmask
-	db $2c, $2d, $2e, $2f, $30, $31, $32, $33, $26, $34, $27, $35
-	db $36, $37, $28, $38, $39, $3a
-.frame5
-	db $04 ; bitmask
-	db $3b, $3c
-.frame6
-	db $05 ; bitmask
-	db $3d, $3e, $3f, $40
-; 0xd5592
diff --git a/gfx/pics/gengar/front.2bpp.lz b/gfx/pics/gengar/front.animated.2bpp.lz.65ddc6f5
index a11754646..a11754646 100644
--- a/gfx/pics/gengar/front.2bpp.lz
+++ b/gfx/pics/gengar/front.animated.2bpp.lz.65ddc6f5
diff --git a/gfx/pics/gengar/front.png b/gfx/pics/gengar/front.png
new file mode 100644
index 000000000..5fa68e3a0
--- /dev/null
+++ b/gfx/pics/gengar/front.png
diff --git a/gfx/pics/gengar/normal.pal b/gfx/pics/gengar/normal.pal
deleted file mode 100644
index 16a51fce3..000000000
--- a/gfx/pics/gengar/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 05, 02
-	RGB 09, 00, 16
-
diff --git a/gfx/pics/geodude/back.2bpp.lz b/gfx/pics/geodude/back.2bpp.lz.d5aa5e9f
index 443fd327d..443fd327d 100644
--- a/gfx/pics/geodude/back.2bpp.lz
+++ b/gfx/pics/geodude/back.2bpp.lz.d5aa5e9f
diff --git a/gfx/pics/geodude/back.png b/gfx/pics/geodude/back.png
new file mode 100644
index 000000000..0b3acd0c1
--- /dev/null
+++ b/gfx/pics/geodude/back.png
diff --git a/gfx/pics/geodude/bitmask.asm b/gfx/pics/geodude/bitmask.asm
deleted file mode 100644
index fd6285f77..000000000
--- a/gfx/pics/geodude/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00000000
-	db %01100001
-	db %00001100
-	db %00000000
-; 1
-	db %01100111
-	db %01100001
-	db %00001100
-	db %00000000
-; 2
-	db %10000000
-	db %00110001
-	db %00000000
-	db %00000000
-; 0xd2c71
diff --git a/gfx/pics/geodude/frames.asm b/gfx/pics/geodude/frames.asm
deleted file mode 100644
index 9ba2ed2ba..000000000
--- a/gfx/pics/geodude/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d
-.frame2
-	db $01 ; bitmask
-	db $1e, $1f, $20, $21, $22, $19, $1a, $1b, $1c, $1d
-.frame3
-	db $02 ; bitmask
-	db $23, $24, $25, $26
-; 0xd5164
diff --git a/gfx/pics/geodude/front.2bpp.lz b/gfx/pics/geodude/front.animated.2bpp.lz.d743f2c9
index 96bd9f794..96bd9f794 100644
--- a/gfx/pics/geodude/front.2bpp.lz
+++ b/gfx/pics/geodude/front.animated.2bpp.lz.d743f2c9
diff --git a/gfx/pics/geodude/front.png b/gfx/pics/geodude/front.png
new file mode 100644
index 000000000..22fb6c4a7
--- /dev/null
+++ b/gfx/pics/geodude/front.png
diff --git a/gfx/pics/geodude/normal.pal b/gfx/pics/geodude/normal.pal
deleted file mode 100644
index 8df6a1104..000000000
--- a/gfx/pics/geodude/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 18, 17, 15
-	RGB 08, 11, 07
-
diff --git a/gfx/pics/girafarig/back.2bpp.lz b/gfx/pics/girafarig/back.2bpp.lz.5dd68457
index aca23f976..aca23f976 100644
--- a/gfx/pics/girafarig/back.2bpp.lz
+++ b/gfx/pics/girafarig/back.2bpp.lz.5dd68457
diff --git a/gfx/pics/girafarig/back.png b/gfx/pics/girafarig/back.png
new file mode 100644
index 000000000..6ca3e0dea
--- /dev/null
+++ b/gfx/pics/girafarig/back.png
diff --git a/gfx/pics/girafarig/bitmask.asm b/gfx/pics/girafarig/bitmask.asm
deleted file mode 100644
index d3629e8dc..000000000
--- a/gfx/pics/girafarig/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %10000111
-	db %11000011
-	db %11100011
-	db %01110000
-	db %00000000
-	db %00001000
-	db %00000000
-; 1
-	db %10000111
-	db %11000011
-	db %11100011
-	db %01110000
-	db %00111000
-	db %00011100
-	db %00000000
-; 2
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00111000
-	db %00011100
-	db %00000000
-; 3
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00001000
-	db %00000000
-; 0xd36cc
diff --git a/gfx/pics/girafarig/frames.asm b/gfx/pics/girafarig/frames.asm
deleted file mode 100644
index a89de6374..000000000
--- a/gfx/pics/girafarig/frames.asm
+++ /dev/null
@@ -1,24 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $03, $03, $03, $31, $32, $33, $34, $35, $36, $37, $38, $39
-	db $3a, $3b, $3c, $3d, $3e
-.frame2
-	db $01 ; bitmask
-	db $03, $03, $03, $31, $32, $33, $34, $3f, $36, $37, $38, $40
-	db $3a, $3b, $41, $3d, $42, $43, $44, $45, $46, $47
-.frame3
-	db $02 ; bitmask
-	db $48, $42, $43, $44, $45, $46, $47
-.frame4
-	db $01 ; bitmask
-	db $03, $03, $03, $31, $32, $33, $34, $35, $36, $37, $38, $39
-	db $3a, $3b, $3c, $3d, $42, $43, $44, $45, $46, $47
-.frame5
-	db $03 ; bitmask
-	db $48, $3e
-; 0xd8ee7
diff --git a/gfx/pics/girafarig/front.2bpp.lz b/gfx/pics/girafarig/front.animated.2bpp.lz.76d809c4
index 48c9fc94a..48c9fc94a 100644
--- a/gfx/pics/girafarig/front.2bpp.lz
+++ b/gfx/pics/girafarig/front.animated.2bpp.lz.76d809c4
diff --git a/gfx/pics/girafarig/front.png b/gfx/pics/girafarig/front.png
new file mode 100644
index 000000000..18071ac82
--- /dev/null
+++ b/gfx/pics/girafarig/front.png
diff --git a/gfx/pics/girafarig/normal.pal b/gfx/pics/girafarig/normal.pal
deleted file mode 100644
index d882c3aeb..000000000
--- a/gfx/pics/girafarig/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 22, 04
-	RGB 28, 10, 16
-
diff --git a/gfx/pics/gligar/back.2bpp.lz b/gfx/pics/gligar/back.2bpp.lz.ee922122
index 45b7d9b76..45b7d9b76 100644
--- a/gfx/pics/gligar/back.2bpp.lz
+++ b/gfx/pics/gligar/back.2bpp.lz.ee922122
diff --git a/gfx/pics/gligar/back.png b/gfx/pics/gligar/back.png
new file mode 100644
index 000000000..64bcc503f
--- /dev/null
+++ b/gfx/pics/gligar/back.png
diff --git a/gfx/pics/gligar/bitmask.asm b/gfx/pics/gligar/bitmask.asm
deleted file mode 100644
index 8a7f6aaa4..000000000
--- a/gfx/pics/gligar/bitmask.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-; 0
-	db %11000111
-	db %11110001
-	db %00111100
-	db %11000111
-	db %00000001
-; 0xd3706
diff --git a/gfx/pics/gligar/frames.asm b/gfx/pics/gligar/frames.asm
deleted file mode 100644
index 4957bf8c2..000000000
--- a/gfx/pics/gligar/frames.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-	dw .frame1
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $30, $31, $32, $33, $34, $35, $36, $37
-; 0xd8f83
diff --git a/gfx/pics/gligar/front.2bpp.lz b/gfx/pics/gligar/front.animated.2bpp.lz.4dcc41b3
index 4ef9e5398..4ef9e5398 100644
--- a/gfx/pics/gligar/front.2bpp.lz
+++ b/gfx/pics/gligar/front.animated.2bpp.lz.4dcc41b3
diff --git a/gfx/pics/gligar/front.png b/gfx/pics/gligar/front.png
new file mode 100644
index 000000000..729bc9d7f
--- /dev/null
+++ b/gfx/pics/gligar/front.png
diff --git a/gfx/pics/gligar/normal.pal b/gfx/pics/gligar/normal.pal
deleted file mode 100644
index c6d87495d..000000000
--- a/gfx/pics/gligar/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 06, 18
-	RGB 08, 07, 20
-
diff --git a/gfx/pics/gloom/back.2bpp.lz b/gfx/pics/gloom/back.2bpp.lz.9a321f63
index 7d35e2d82..7d35e2d82 100644
--- a/gfx/pics/gloom/back.2bpp.lz
+++ b/gfx/pics/gloom/back.2bpp.lz.9a321f63
diff --git a/gfx/pics/gloom/back.png b/gfx/pics/gloom/back.png
new file mode 100644
index 000000000..9308b29ae
--- /dev/null
+++ b/gfx/pics/gloom/back.png
diff --git a/gfx/pics/gloom/bitmask.asm b/gfx/pics/gloom/bitmask.asm
deleted file mode 100644
index c75940997..000000000
--- a/gfx/pics/gloom/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00000000
-	db %10000000
-	db %01100001
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00000011
-	db %01000001
-	db %00001000
-	db %00000010
-; 2
-	db %00000000
-	db %00000100
-	db %00000000
-	db %00010000
-	db %00000100
-; 0xd29fb
diff --git a/gfx/pics/gloom/frames.asm b/gfx/pics/gloom/frames.asm
deleted file mode 100644
index 97018ccf4..000000000
--- a/gfx/pics/gloom/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27
-.frame2
-	db $00 ; bitmask
-	db $24, $28, $26, $29
-.frame3
-	db $00 ; bitmask
-	db $24, $2a, $26, $2b
-.frame4
-	db $01 ; bitmask
-	db $2c, $2d, $2e, $2f, $30, $31
-.frame5
-	db $02 ; bitmask
-	db $32, $33, $34
-; 0xd4b0a
diff --git a/gfx/pics/gloom/front.2bpp.lz b/gfx/pics/gloom/front.animated.2bpp.lz.c6ef04a5
index a69e4b76c..a69e4b76c 100644
--- a/gfx/pics/gloom/front.2bpp.lz
+++ b/gfx/pics/gloom/front.animated.2bpp.lz.c6ef04a5
diff --git a/gfx/pics/gloom/front.png b/gfx/pics/gloom/front.png
new file mode 100644
index 000000000..34625df13
--- /dev/null
+++ b/gfx/pics/gloom/front.png
diff --git a/gfx/pics/gloom/normal.pal b/gfx/pics/gloom/normal.pal
deleted file mode 100644
index 28d801aaa..000000000
--- a/gfx/pics/gloom/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 12, 00
-	RGB 08, 09, 13
-
diff --git a/gfx/pics/golbat/back.2bpp.lz b/gfx/pics/golbat/back.2bpp.lz.e277e260
index e2bd0c367..e2bd0c367 100644
--- a/gfx/pics/golbat/back.2bpp.lz
+++ b/gfx/pics/golbat/back.2bpp.lz.e277e260
diff --git a/gfx/pics/golbat/back.png b/gfx/pics/golbat/back.png
new file mode 100644
index 000000000..5bc2b1336
--- /dev/null
+++ b/gfx/pics/golbat/back.png
diff --git a/gfx/pics/golbat/bitmask.asm b/gfx/pics/golbat/bitmask.asm
deleted file mode 100644
index b74546ba4..000000000
--- a/gfx/pics/golbat/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %10111111
-	db %00111111
-	db %00001101
-	db %11001110
-	db %11111111
-	db %01111101
-	db %00000000
-; 1
-	db %00110000
-	db %00111000
-	db %00001100
-	db %00001110
-	db %00000110
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %10000001
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd29e0
diff --git a/gfx/pics/golbat/frames.asm b/gfx/pics/golbat/frames.asm
deleted file mode 100644
index 78aeab341..000000000
--- a/gfx/pics/golbat/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $06, $06, $31, $32, $33, $34, $06, $06, $35, $36, $37, $38
-	db $06, $39, $3a, $3b, $3c, $3d, $06, $3e, $3f, $40, $41, $42
-	db $06, $06, $43, $44, $45, $46, $06, $06, $06, $47, $48
-.frame2
-	db $01 ; bitmask
-	db $49, $06, $37, $38, $06, $4a, $3b, $4b, $3d, $06, $41, $42
-.frame3
-	db $01 ; bitmask
-	db $49, $06, $37, $38, $06, $3a, $3b, $3c, $3d, $06, $41, $42
-.frame4
-	db $02 ; bitmask
-	db $4c, $4d, $4e
-; 0xd4abd
diff --git a/gfx/pics/golbat/front.2bpp.lz b/gfx/pics/golbat/front.animated.2bpp.lz.c35ffe9b
index 94f7d8216..94f7d8216 100644
--- a/gfx/pics/golbat/front.2bpp.lz
+++ b/gfx/pics/golbat/front.animated.2bpp.lz.c35ffe9b
diff --git a/gfx/pics/golbat/front.png b/gfx/pics/golbat/front.png
new file mode 100644
index 000000000..5a7d1745a
--- /dev/null
+++ b/gfx/pics/golbat/front.png
diff --git a/gfx/pics/golbat/normal.pal b/gfx/pics/golbat/normal.pal
deleted file mode 100644
index d36d0449c..000000000
--- a/gfx/pics/golbat/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 12, 15, 19
-	RGB 05, 08, 17
-
diff --git a/gfx/pics/goldeen/back.2bpp.lz b/gfx/pics/goldeen/back.2bpp.lz.d0e5751e
index 5d00534ec..5d00534ec 100644
--- a/gfx/pics/goldeen/back.2bpp.lz
+++ b/gfx/pics/goldeen/back.2bpp.lz.d0e5751e
diff --git a/gfx/pics/goldeen/back.png b/gfx/pics/goldeen/back.png
new file mode 100644
index 000000000..7644dc343
--- /dev/null
+++ b/gfx/pics/goldeen/back.png
diff --git a/gfx/pics/goldeen/bitmask.asm b/gfx/pics/goldeen/bitmask.asm
deleted file mode 100644
index 99a84898f..000000000
--- a/gfx/pics/goldeen/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %10000110
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00001000
-	db %10001100
-	db %10000010
-	db %00110011
-	db %00000111
-; 2
-	db %10000000
-	db %00100000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd304b
diff --git a/gfx/pics/goldeen/frames.asm b/gfx/pics/goldeen/frames.asm
deleted file mode 100644
index e38561a7a..000000000
--- a/gfx/pics/goldeen/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27
-.frame2
-	db $01 ; bitmask
-	db $28, $29, $04, $2a, $2b, $2c, $2d, $2e, $2f, $30, $31, $32
-	db $33
-.frame3
-	db $02 ; bitmask
-	db $34, $35
-; 0xd5a88
diff --git a/gfx/pics/goldeen/front.2bpp.lz b/gfx/pics/goldeen/front.animated.2bpp.lz.c451a8c4
index f0090e94e..f0090e94e 100644
--- a/gfx/pics/goldeen/front.2bpp.lz
+++ b/gfx/pics/goldeen/front.animated.2bpp.lz.c451a8c4
diff --git a/gfx/pics/goldeen/front.png b/gfx/pics/goldeen/front.png
new file mode 100644
index 000000000..c3a874b35
--- /dev/null
+++ b/gfx/pics/goldeen/front.png
diff --git a/gfx/pics/goldeen/normal.pal b/gfx/pics/goldeen/normal.pal
deleted file mode 100644
index 4ada439c0..000000000
--- a/gfx/pics/goldeen/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 12, 19
-	RGB 31, 10, 02
-
diff --git a/gfx/pics/golduck/back.2bpp.lz b/gfx/pics/golduck/back.2bpp.lz.2d022642
index 13807b9e9..13807b9e9 100644
--- a/gfx/pics/golduck/back.2bpp.lz
+++ b/gfx/pics/golduck/back.2bpp.lz.2d022642
diff --git a/gfx/pics/golduck/back.png b/gfx/pics/golduck/back.png
new file mode 100644
index 000000000..4791a6b8e
--- /dev/null
+++ b/gfx/pics/golduck/back.png
diff --git a/gfx/pics/golduck/bitmask.asm b/gfx/pics/golduck/bitmask.asm
deleted file mode 100644
index d25464658..000000000
--- a/gfx/pics/golduck/bitmask.asm
+++ /dev/null
@@ -1,57 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %00000011
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00000110
-	db %00000011
-	db %00000011
-	db %11100000
-	db %01110111
-	db %00111010
-	db %00000001
-; 2
-	db %00000110
-	db %00000011
-	db %00001111
-	db %11100110
-	db %01110111
-	db %00111010
-	db %00000001
-; 3
-	db %00000110
-	db %00000011
-	db %00000011
-	db %10000000
-	db %01000111
-	db %00100010
-	db %00000001
-; 4
-	db %00000110
-	db %00000011
-	db %00000000
-	db %11100000
-	db %01110111
-	db %00111010
-	db %00000001
-; 5
-	db %00000110
-	db %00000011
-	db %00000000
-	db %11100000
-	db %01110001
-	db %00111000
-	db %00000000
-; 6
-	db %00000000
-	db %00000000
-	db %00000000
-	db %11100000
-	db %01110000
-	db %00111000
-	db %00000000
-; 0xd2ad0
diff --git a/gfx/pics/golduck/frames.asm b/gfx/pics/golduck/frames.asm
deleted file mode 100644
index 07e5c6f3c..000000000
--- a/gfx/pics/golduck/frames.asm
+++ /dev/null
@@ -1,34 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-.frame1
-	db $00 ; bitmask
-	db $31, $32
-.frame2
-	db $01 ; bitmask
-	db $33, $34, $35, $36, $31, $32, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f, $40, $41, $42, $43, $44
-.frame3
-	db $02 ; bitmask
-	db $33, $34, $35, $36, $31, $32, $45, $46, $47, $48, $49, $4a
-	db $4b, $4c, $3b, $3c, $00, $00, $00, $40, $00, $00, $00, $44
-.frame4
-	db $03 ; bitmask
-	db $33, $34, $35, $36, $31, $32, $4d, $3a, $3b, $3c, $4e, $40
-	db $4f, $44
-.frame5
-	db $04 ; bitmask
-	db $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c, $3d, $3e
-	db $3f, $40, $41, $42, $43, $44
-.frame6
-	db $05 ; bitmask
-	db $33, $34, $35, $36, $37, $38, $39, $3a, $3d, $3e, $3f, $41
-	db $42, $43
-.frame7
-	db $06 ; bitmask
-	db $37, $38, $39, $3d, $3e, $3f, $41, $42, $43
-; 0xd4d82
diff --git a/gfx/pics/golduck/front.2bpp.lz b/gfx/pics/golduck/front.animated.2bpp.lz.09e97414
index ff3fa6792..ff3fa6792 100644
--- a/gfx/pics/golduck/front.2bpp.lz
+++ b/gfx/pics/golduck/front.animated.2bpp.lz.09e97414
diff --git a/gfx/pics/golduck/front.png b/gfx/pics/golduck/front.png
new file mode 100644
index 000000000..172653ab2
--- /dev/null
+++ b/gfx/pics/golduck/front.png
diff --git a/gfx/pics/golduck/normal.pal b/gfx/pics/golduck/normal.pal
deleted file mode 100644
index 22099e9bf..000000000
--- a/gfx/pics/golduck/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 22, 21, 26
-	RGB 08, 11, 24
-
diff --git a/gfx/pics/golem/back.2bpp.lz b/gfx/pics/golem/back.2bpp.lz.ae903dee
index fd1ee3dcb..fd1ee3dcb 100644
--- a/gfx/pics/golem/back.2bpp.lz
+++ b/gfx/pics/golem/back.2bpp.lz.ae903dee
diff --git a/gfx/pics/golem/back.png b/gfx/pics/golem/back.png
new file mode 100644
index 000000000..4b39da3cd
--- /dev/null
+++ b/gfx/pics/golem/back.png
diff --git a/gfx/pics/golem/bitmask.asm b/gfx/pics/golem/bitmask.asm
deleted file mode 100644
index 1d3fbfa5e..000000000
--- a/gfx/pics/golem/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00011100
-	db %10000110
-	db %01110000
-	db %00011100
-	db %00000011
-; 1
-	db %00011100
-	db %10000110
-	db %01110001
-	db %00011100
-	db %00000011
-; 2
-	db %00011100
-	db %00000110
-	db %01110000
-	db %00011100
-	db %00000011
-; 3
-	db %00000000
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2c9e
diff --git a/gfx/pics/golem/frames.asm b/gfx/pics/golem/frames.asm
deleted file mode 100644
index 03f6e6a5f..000000000
--- a/gfx/pics/golem/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $30, $31
-.frame2
-	db $01 ; bitmask
-	db $24, $25, $26, $32, $28, $33, $34, $2a, $2b, $2c, $2d, $2e
-	db $2f, $30, $31
-.frame3
-	db $02 ; bitmask
-	db $24, $25, $26, $35, $28, $2a, $2b, $2c, $2d, $2e, $2f, $30
-	db $31
-.frame4
-	db $03 ; bitmask
-	db $36
-; 0xd51d1
diff --git a/gfx/pics/golem/front.2bpp.lz b/gfx/pics/golem/front.animated.2bpp.lz.a16f21c8
index 0a7bf3369..0a7bf3369 100644
--- a/gfx/pics/golem/front.2bpp.lz
+++ b/gfx/pics/golem/front.animated.2bpp.lz.a16f21c8
diff --git a/gfx/pics/golem/front.png b/gfx/pics/golem/front.png
new file mode 100644
index 000000000..8a8450b28
--- /dev/null
+++ b/gfx/pics/golem/front.png
diff --git a/gfx/pics/golem/normal.pal b/gfx/pics/golem/normal.pal
deleted file mode 100644
index be50f4de6..000000000
--- a/gfx/pics/golem/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 18, 16, 08
-	RGB 08, 11, 07
-
diff --git a/gfx/pics/granbull/back.2bpp.lz b/gfx/pics/granbull/back.2bpp.lz.7f1208ed
index f09d4e7dc..f09d4e7dc 100644
--- a/gfx/pics/granbull/back.2bpp.lz
+++ b/gfx/pics/granbull/back.2bpp.lz.7f1208ed
diff --git a/gfx/pics/granbull/back.png b/gfx/pics/granbull/back.png
new file mode 100644
index 000000000..9ffdc7c99
--- /dev/null
+++ b/gfx/pics/granbull/back.png
diff --git a/gfx/pics/granbull/bitmask.asm b/gfx/pics/granbull/bitmask.asm
deleted file mode 100644
index f0134ac3d..000000000
--- a/gfx/pics/granbull/bitmask.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-; 0
-	db %11000000
-	db %11110011
-	db %00111000
-	db %00001111
-	db %00000000
-; 1
-	db %00000000
-	db %00110000
-	db %00001100
-	db %00000000
-	db %00000000
-; 0xd373e
diff --git a/gfx/pics/granbull/frames.asm b/gfx/pics/granbull/frames.asm
deleted file mode 100644
index b52d7bc47..000000000
--- a/gfx/pics/granbull/frames.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $30, $31, $32
-.frame2
-	db $01 ; bitmask
-	db $33, $34, $35, $36
-; 0xd900e
diff --git a/gfx/pics/granbull/front.2bpp.lz b/gfx/pics/granbull/front.animated.2bpp.lz.4504768b
index 94062ce3f..94062ce3f 100644
--- a/gfx/pics/granbull/front.2bpp.lz
+++ b/gfx/pics/granbull/front.animated.2bpp.lz.4504768b
diff --git a/gfx/pics/granbull/front.png b/gfx/pics/granbull/front.png
new file mode 100644
index 000000000..911bc59ae
--- /dev/null
+++ b/gfx/pics/granbull/front.png
diff --git a/gfx/pics/granbull/normal.pal b/gfx/pics/granbull/normal.pal
deleted file mode 100644
index 4073c9c79..000000000
--- a/gfx/pics/granbull/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 12, 22
-	RGB 15, 04, 17
-
diff --git a/gfx/pics/graveler/back.2bpp.lz b/gfx/pics/graveler/back.2bpp.lz.c7867de7
index ba2fba8e6..ba2fba8e6 100644
--- a/gfx/pics/graveler/back.2bpp.lz
+++ b/gfx/pics/graveler/back.2bpp.lz.c7867de7
diff --git a/gfx/pics/graveler/back.png b/gfx/pics/graveler/back.png
new file mode 100644
index 000000000..17eb486b6
--- /dev/null
+++ b/gfx/pics/graveler/back.png
diff --git a/gfx/pics/graveler/bitmask.asm b/gfx/pics/graveler/bitmask.asm
deleted file mode 100644
index 8f8129f11..000000000
--- a/gfx/pics/graveler/bitmask.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-; 0
-	db %00000000
-	db %00001100
-	db %01000011
-	db %00110000
-	db %00000000
-; 1
-	db %00000000
-	db %10000000
-	db %01100000
-	db %00000000
-	db %00000000
-; 2
-	db %11000111
-	db %10001100
-	db %01100011
-	db %11110011
-	db %00000000
-; 3
-	db %11000111
-	db %00000000
-	db %00000000
-	db %11000011
-	db %00000000
-; 4
-	db %00000000
-	db %10000000
-	db %00100000
-	db %00000000
-	db %00000000
-; 0xd2c8a
diff --git a/gfx/pics/graveler/frames.asm b/gfx/pics/graveler/frames.asm
deleted file mode 100644
index 951c9c79e..000000000
--- a/gfx/pics/graveler/frames.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $24, $03, $25, $26, $27, $28, $29
-.frame2
-	db $01 ; bitmask
-	db $2a, $2b, $2c
-.frame3
-	db $02 ; bitmask
-	db $2d, $2e, $2f, $30, $31, $24, $03, $2a, $25, $26, $2b, $32
-	db $33, $34, $28, $29, $35, $36
-.frame4
-	db $03 ; bitmask
-	db $2d, $2e, $2f, $30, $31, $33, $34, $35, $36
-.frame5
-	db $04 ; bitmask
-	db $2a, $2b
-; 0xd519a
diff --git a/gfx/pics/graveler/front.2bpp.lz b/gfx/pics/graveler/front.animated.2bpp.lz.68d07c61
index 5dcee6436..5dcee6436 100644
--- a/gfx/pics/graveler/front.2bpp.lz
+++ b/gfx/pics/graveler/front.animated.2bpp.lz.68d07c61
diff --git a/gfx/pics/graveler/front.png b/gfx/pics/graveler/front.png
new file mode 100644
index 000000000..30cca1550
--- /dev/null
+++ b/gfx/pics/graveler/front.png
diff --git a/gfx/pics/graveler/normal.pal b/gfx/pics/graveler/normal.pal
deleted file mode 100644
index fb55478b1..000000000
--- a/gfx/pics/graveler/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 17, 17, 18
-	RGB 08, 11, 07
-
diff --git a/gfx/pics/grimer/back.2bpp.lz b/gfx/pics/grimer/back.2bpp.lz.833bd626
index d4494a003..d4494a003 100644
--- a/gfx/pics/grimer/back.2bpp.lz
+++ b/gfx/pics/grimer/back.2bpp.lz.833bd626
diff --git a/gfx/pics/grimer/back.png b/gfx/pics/grimer/back.png
new file mode 100644
index 000000000..e5c70286b
--- /dev/null
+++ b/gfx/pics/grimer/back.png
diff --git a/gfx/pics/grimer/bitmask.asm b/gfx/pics/grimer/bitmask.asm
deleted file mode 100644
index 850747202..000000000
--- a/gfx/pics/grimer/bitmask.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-; 0
-	db %10000000
-	db %00110001
-	db %00000000
-	db %00000000
-; 1
-	db %10000000
-	db %00111001
-	db %00000000
-	db %00000000
-; 2
-	db %01100000
-	db %10001100
-	db %00000001
-	db %00000000
-; 3
-	db %11100000
-	db %10111101
-	db %00000001
-	db %00000000
-; 0xd2dc2
diff --git a/gfx/pics/grimer/frames.asm b/gfx/pics/grimer/frames.asm
deleted file mode 100644
index e20152574..000000000
--- a/gfx/pics/grimer/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c
-.frame2
-	db $01 ; bitmask
-	db $1d, $1e, $1f, $20, $1c
-.frame3
-	db $02 ; bitmask
-	db $21, $22, $23, $24, $25, $26
-.frame4
-	db $03 ; bitmask
-	db $21, $22, $19, $1a, $23, $24, $1b, $1c, $25, $26
-; 0xd5448
diff --git a/gfx/pics/grimer/front.2bpp.lz b/gfx/pics/grimer/front.animated.2bpp.lz.dfe40e91
index 176f2da1c..176f2da1c 100644
--- a/gfx/pics/grimer/front.2bpp.lz
+++ b/gfx/pics/grimer/front.animated.2bpp.lz.dfe40e91
diff --git a/gfx/pics/grimer/front.png b/gfx/pics/grimer/front.png
new file mode 100644
index 000000000..f71dca145
--- /dev/null
+++ b/gfx/pics/grimer/front.png
diff --git a/gfx/pics/grimer/normal.pal b/gfx/pics/grimer/normal.pal
deleted file mode 100644
index 32df6345f..000000000
--- a/gfx/pics/grimer/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 02, 20
-	RGB 12, 01, 12
-
diff --git a/gfx/pics/growlithe/back.2bpp.lz b/gfx/pics/growlithe/back.2bpp.lz.7f5831f6
index 222250f79..222250f79 100644
--- a/gfx/pics/growlithe/back.2bpp.lz
+++ b/gfx/pics/growlithe/back.2bpp.lz.7f5831f6
diff --git a/gfx/pics/growlithe/back.png b/gfx/pics/growlithe/back.png
new file mode 100644
index 000000000..e5e23b822
--- /dev/null
+++ b/gfx/pics/growlithe/back.png
diff --git a/gfx/pics/growlithe/bitmask.asm b/gfx/pics/growlithe/bitmask.asm
deleted file mode 100644
index 625b790d7..000000000
--- a/gfx/pics/growlithe/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %10000110
-	db %00011000
-	db %01100011
-	db %00000000
-; 1
-	db %10000110
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %11000110
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2b04
diff --git a/gfx/pics/growlithe/frames.asm b/gfx/pics/growlithe/frames.asm
deleted file mode 100644
index 510227bc5..000000000
--- a/gfx/pics/growlithe/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21
-.frame2
-	db $01 ; bitmask
-	db $19, $1a, $1b
-.frame3
-	db $02 ; bitmask
-	db $19, $1a, $22, $1b
-; 0xd4de9
diff --git a/gfx/pics/growlithe/front.2bpp.lz b/gfx/pics/growlithe/front.animated.2bpp.lz.f7b376fa
index a01b4f1fc..a01b4f1fc 100644
--- a/gfx/pics/growlithe/front.2bpp.lz
+++ b/gfx/pics/growlithe/front.animated.2bpp.lz.f7b376fa
diff --git a/gfx/pics/growlithe/front.png b/gfx/pics/growlithe/front.png
new file mode 100644
index 000000000..333568169
--- /dev/null
+++ b/gfx/pics/growlithe/front.png
diff --git a/gfx/pics/growlithe/normal.pal b/gfx/pics/growlithe/normal.pal
deleted file mode 100644
index 07a6b3878..000000000
--- a/gfx/pics/growlithe/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 19, 07
-	RGB 24, 08, 00
-
diff --git a/gfx/pics/gyarados/back.2bpp.lz b/gfx/pics/gyarados/back.2bpp.lz.fc577f9e
index d061ec9b2..d061ec9b2 100644
--- a/gfx/pics/gyarados/back.2bpp.lz
+++ b/gfx/pics/gyarados/back.2bpp.lz.fc577f9e
diff --git a/gfx/pics/gyarados/back.png b/gfx/pics/gyarados/back.png
new file mode 100644
index 000000000..12e942927
--- /dev/null
+++ b/gfx/pics/gyarados/back.png
diff --git a/gfx/pics/gyarados/bitmask.asm b/gfx/pics/gyarados/bitmask.asm
deleted file mode 100644
index 2e55e37e0..000000000
--- a/gfx/pics/gyarados/bitmask.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %00100000
-	db %11110000
-	db %11110111
-	db %11110011
-	db %00000001
-; 1
-	db %00000000
-	db %00000100
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3155
diff --git a/gfx/pics/gyarados/frames.asm b/gfx/pics/gyarados/frames.asm
deleted file mode 100644
index 7624220e1..000000000
--- a/gfx/pics/gyarados/frames.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $00, $3f, $40, $41, $42
-.frame2
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $43
-	db $44, $3e, $00, $45, $46, $47, $42
-.frame3
-	db $01 ; bitmask
-	db $48, $49
-; 0xd5d58
diff --git a/gfx/pics/gyarados/front.2bpp.lz b/gfx/pics/gyarados/front.animated.2bpp.lz.1b498e2b
index 4d66d5814..4d66d5814 100644
--- a/gfx/pics/gyarados/front.2bpp.lz
+++ b/gfx/pics/gyarados/front.animated.2bpp.lz.1b498e2b
diff --git a/gfx/pics/gyarados/front.png b/gfx/pics/gyarados/front.png
new file mode 100644
index 000000000..0b6c883e9
--- /dev/null
+++ b/gfx/pics/gyarados/front.png
diff --git a/gfx/pics/gyarados/normal.pal b/gfx/pics/gyarados/normal.pal
deleted file mode 100644
index 51cc26df9..000000000
--- a/gfx/pics/gyarados/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 25, 07
-	RGB 09, 14, 26
-
diff --git a/gfx/pics/haunter/back.2bpp.lz b/gfx/pics/haunter/back.2bpp.lz.8a5dc2c1
index 660c0408b..660c0408b 100644
--- a/gfx/pics/haunter/back.2bpp.lz
+++ b/gfx/pics/haunter/back.2bpp.lz.8a5dc2c1
diff --git a/gfx/pics/haunter/back.png b/gfx/pics/haunter/back.png
new file mode 100644
index 000000000..204e1987f
--- /dev/null
+++ b/gfx/pics/haunter/back.png
diff --git a/gfx/pics/haunter/bitmask.asm b/gfx/pics/haunter/bitmask.asm
deleted file mode 100644
index 99e55965f..000000000
--- a/gfx/pics/haunter/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00111000
-	db %00000110
-	db %00000001
-	db %00000000
-	db %00000000
-; 1
-	db %00111000
-	db %11001110
-	db %00100001
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %01000000
-	db %00100000
-	db %00000000
-	db %00000000
-; 0xd2e11
diff --git a/gfx/pics/haunter/frames.asm b/gfx/pics/haunter/frames.asm
deleted file mode 100644
index 15c6ab978..000000000
--- a/gfx/pics/haunter/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29
-.frame2
-	db $01 ; bitmask
-	db $2a, $2b, $00, $2c, $2d, $00, $2e, $2f, $30, $31
-.frame3
-	db $01 ; bitmask
-	db $32, $33, $00, $34, $35, $00, $2e, $36, $37, $31
-.frame4
-	db $02 ; bitmask
-	db $2e, $31
-; 0xd5542
diff --git a/gfx/pics/haunter/front.2bpp.lz b/gfx/pics/haunter/front.animated.2bpp.lz.aeed5f7e
index 6bb6ab582..6bb6ab582 100644
--- a/gfx/pics/haunter/front.2bpp.lz
+++ b/gfx/pics/haunter/front.animated.2bpp.lz.aeed5f7e
diff --git a/gfx/pics/haunter/front.png b/gfx/pics/haunter/front.png
new file mode 100644
index 000000000..5f6c2d1b3
--- /dev/null
+++ b/gfx/pics/haunter/front.png
diff --git a/gfx/pics/haunter/normal.pal b/gfx/pics/haunter/normal.pal
deleted file mode 100644
index 7ef36a1c6..000000000
--- a/gfx/pics/haunter/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 07, 06
-	RGB 14, 00, 19
-
diff --git a/gfx/pics/heracross/back.2bpp.lz b/gfx/pics/heracross/back.2bpp.lz.ba09608b
index da4d40981..da4d40981 100644
--- a/gfx/pics/heracross/back.2bpp.lz
+++ b/gfx/pics/heracross/back.2bpp.lz.ba09608b
diff --git a/gfx/pics/heracross/back.png b/gfx/pics/heracross/back.png
new file mode 100644
index 000000000..f3ee9d73d
--- /dev/null
+++ b/gfx/pics/heracross/back.png
diff --git a/gfx/pics/heracross/bitmask.asm b/gfx/pics/heracross/bitmask.asm
deleted file mode 100644
index 024c0880b..000000000
--- a/gfx/pics/heracross/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00011110
-	db %00000111
-	db %00000000
-	db %11001111
-	db %00000011
-; 1
-	db %00000100
-	db %00000001
-	db %00010000
-	db %10000110
-	db %00000000
-; 2
-	db %00000000
-	db %00000001
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd3793
diff --git a/gfx/pics/heracross/frames.asm b/gfx/pics/heracross/frames.asm
deleted file mode 100644
index 684c7e82e..000000000
--- a/gfx/pics/heracross/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $00, $27, $28, $29, $2a, $2b, $2c, $2d, $2e
-	db $2f, $30, $31
-.frame2
-	db $01 ; bitmask
-	db $32, $33, $34, $35, $36, $37
-.frame3
-	db $02 ; bitmask
-	db $33, $34
-; 0xd90d7
diff --git a/gfx/pics/heracross/front.2bpp.lz b/gfx/pics/heracross/front.animated.2bpp.lz.0742fe2b
index ad23e01d1..ad23e01d1 100644
--- a/gfx/pics/heracross/front.2bpp.lz
+++ b/gfx/pics/heracross/front.animated.2bpp.lz.0742fe2b
diff --git a/gfx/pics/heracross/front.png b/gfx/pics/heracross/front.png
new file mode 100644
index 000000000..a8908ab86
--- /dev/null
+++ b/gfx/pics/heracross/front.png
diff --git a/gfx/pics/heracross/normal.pal b/gfx/pics/heracross/normal.pal
deleted file mode 100644
index cfc263f77..000000000
--- a/gfx/pics/heracross/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 10, 09, 19
-	RGB 04, 03, 16
-
diff --git a/gfx/pics/hitmonchan/back.2bpp.lz b/gfx/pics/hitmonchan/back.2bpp.lz.68e28b98
index f785248c1..f785248c1 100644
--- a/gfx/pics/hitmonchan/back.2bpp.lz
+++ b/gfx/pics/hitmonchan/back.2bpp.lz.68e28b98
diff --git a/gfx/pics/hitmonchan/back.png b/gfx/pics/hitmonchan/back.png
new file mode 100644
index 000000000..6a2e663e3
--- /dev/null
+++ b/gfx/pics/hitmonchan/back.png
diff --git a/gfx/pics/hitmonchan/bitmask.asm b/gfx/pics/hitmonchan/bitmask.asm
deleted file mode 100644
index 522452e67..000000000
--- a/gfx/pics/hitmonchan/bitmask.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-; 0
-	db %10001110
-	db %11100011
-	db %00010000
-	db %00001000
-	db %00000010
-; 1
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00001000
-	db %00000010
-; 2
-	db %10001110
-	db %11100011
-	db %01110000
-	db %00011100
-	db %00000011
-; 3
-	db %10001110
-	db %11100011
-	db %00011000
-	db %00000010
-	db %00000000
-; 4
-	db %10001110
-	db %11100011
-	db %11011011
-	db %00001010
-	db %00000010
-; 0xd2f66
diff --git a/gfx/pics/hitmonchan/frames.asm b/gfx/pics/hitmonchan/frames.asm
deleted file mode 100644
index 90269c7bd..000000000
--- a/gfx/pics/hitmonchan/frames.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $00, $00, $00, $00, $24, $00, $25, $26, $27, $28, $29, $2a
-.frame2
-	db $01 ; bitmask
-	db $29, $2a
-.frame3
-	db $02 ; bitmask
-	db $00, $00, $00, $00, $24, $00, $25, $26, $27, $2b, $2c, $2d
-	db $2e, $2f, $30, $31, $00
-.frame4
-	db $03 ; bitmask
-	db $00, $00, $00, $00, $24, $00, $25, $26, $27, $32, $28, $33
-.frame5
-	db $04 ; bitmask
-	db $00, $00, $00, $00, $24, $00, $25, $26, $27, $34, $35, $32
-	db $28, $36, $37, $33, $29, $2a
-; 0xd5865
diff --git a/gfx/pics/hitmonchan/front.2bpp.lz b/gfx/pics/hitmonchan/front.animated.2bpp.lz.61836c4c
index e9a77e987..e9a77e987 100644
--- a/gfx/pics/hitmonchan/front.2bpp.lz
+++ b/gfx/pics/hitmonchan/front.animated.2bpp.lz.61836c4c
diff --git a/gfx/pics/hitmonchan/front.png b/gfx/pics/hitmonchan/front.png
new file mode 100644
index 000000000..6575dad5a
--- /dev/null
+++ b/gfx/pics/hitmonchan/front.png
diff --git a/gfx/pics/hitmonchan/normal.pal b/gfx/pics/hitmonchan/normal.pal
deleted file mode 100644
index b735101e8..000000000
--- a/gfx/pics/hitmonchan/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 21, 15, 12
-	RGB 27, 03, 18
-
diff --git a/gfx/pics/hitmonlee/back.2bpp.lz b/gfx/pics/hitmonlee/back.2bpp.lz.374e3caa
index 4847a1496..4847a1496 100644
--- a/gfx/pics/hitmonlee/back.2bpp.lz
+++ b/gfx/pics/hitmonlee/back.2bpp.lz.374e3caa
diff --git a/gfx/pics/hitmonlee/back.png b/gfx/pics/hitmonlee/back.png
new file mode 100644
index 000000000..9bc03d5e7
--- /dev/null
+++ b/gfx/pics/hitmonlee/back.png
diff --git a/gfx/pics/hitmonlee/bitmask.asm b/gfx/pics/hitmonlee/bitmask.asm
deleted file mode 100644
index 752385f96..000000000
--- a/gfx/pics/hitmonlee/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %11000011
-	db %11100001
-	db %11100001
-	db %11100000
-	db %00000000
-; 1
-	db %00000000
-	db %10000000
-	db %11100011
-	db %11000001
-	db %11100001
-	db %11100000
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %11000000
-	db %11001111
-	db %11100111
-	db %11100000
-	db %00000000
-; 3
-	db %00000000
-	db %10000000
-	db %01000000
-	db %00100000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2f4d
diff --git a/gfx/pics/hitmonlee/frames.asm b/gfx/pics/hitmonlee/frames.asm
deleted file mode 100644
index 6b68838d9..000000000
--- a/gfx/pics/hitmonlee/frames.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $00
-.frame2
-	db $00 ; bitmask
-	db $3f, $40, $41, $42, $35, $43, $44, $45, $00, $46, $00, $00
-	db $00, $00, $00
-.frame3
-	db $01 ; bitmask
-	db $47, $48, $49, $4a, $4b, $4c, $4d, $4e, $00, $00, $46, $00
-	db $00, $00, $00, $00
-.frame4
-	db $02 ; bitmask
-	db $4f, $50, $51, $52, $53, $54, $4e, $19, $55, $56, $57, $46
-	db $00, $00, $00, $00, $00
-.frame5
-	db $03 ; bitmask
-	db $58, $59, $5a
-; 0xd5819
diff --git a/gfx/pics/hitmonlee/front.2bpp.lz b/gfx/pics/hitmonlee/front.animated.2bpp.lz.d174eba1
index c85ec5817..c85ec5817 100644
--- a/gfx/pics/hitmonlee/front.2bpp.lz
+++ b/gfx/pics/hitmonlee/front.animated.2bpp.lz.d174eba1
diff --git a/gfx/pics/hitmonlee/front.png b/gfx/pics/hitmonlee/front.png
new file mode 100644
index 000000000..96b6430ce
--- /dev/null
+++ b/gfx/pics/hitmonlee/front.png
diff --git a/gfx/pics/hitmonlee/normal.pal b/gfx/pics/hitmonlee/normal.pal
deleted file mode 100644
index f9973fcfd..000000000
--- a/gfx/pics/hitmonlee/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 22, 14, 05
-	RGB 15, 16, 15
-
diff --git a/gfx/pics/hitmontop/back.2bpp.lz b/gfx/pics/hitmontop/back.2bpp.lz.ea3f1576
index 185f08aff..185f08aff 100644
--- a/gfx/pics/hitmontop/back.2bpp.lz
+++ b/gfx/pics/hitmontop/back.2bpp.lz.ea3f1576
diff --git a/gfx/pics/hitmontop/back.png b/gfx/pics/hitmontop/back.png
new file mode 100644
index 000000000..95a1faa4c
--- /dev/null
+++ b/gfx/pics/hitmontop/back.png
diff --git a/gfx/pics/hitmontop/bitmask.asm b/gfx/pics/hitmontop/bitmask.asm
deleted file mode 100644
index 36c8a6a26..000000000
--- a/gfx/pics/hitmontop/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %00001010
-	db %10000101
-	db %01000000
-	db %00000000
-	db %00000000
-; 1
-	db %00111110
-	db %10011111
-	db %11001111
-	db %11100111
-	db %11111011
-	db %11011001
-	db %00000000
-; 2
-	db %00000000
-	db %11000100
-	db %01101010
-	db %10000101
-	db %01000000
-	db %00001000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %00001000
-	db %00000100
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd396b
diff --git a/gfx/pics/hitmontop/frames.asm b/gfx/pics/hitmontop/frames.asm
deleted file mode 100644
index 74db7ebe7..000000000
--- a/gfx/pics/hitmontop/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $00
-.frame2
-	db $01 ; bitmask
-	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $36, $37
-	db $38, $39, $3a, $3b, $3c, $3d, $3e, $3f, $40, $41, $42, $43
-	db $44, $00, $00, $00, $45, $46, $00, $00, $00, $00, $00
-.frame3
-	db $02 ; bitmask
-	db $47, $48, $49, $4a, $32, $4b, $4c, $4d, $34, $4e, $00, $4f
-.frame4
-	db $03 ; bitmask
-	db $32, $34
-; 0xd9526
diff --git a/gfx/pics/hitmontop/front.2bpp.lz b/gfx/pics/hitmontop/front.animated.2bpp.lz.1b3e96fc
index d28913fcf..d28913fcf 100644
--- a/gfx/pics/hitmontop/front.2bpp.lz
+++ b/gfx/pics/hitmontop/front.animated.2bpp.lz.1b3e96fc
diff --git a/gfx/pics/hitmontop/front.png b/gfx/pics/hitmontop/front.png
new file mode 100644
index 000000000..3c580896d
--- /dev/null
+++ b/gfx/pics/hitmontop/front.png
diff --git a/gfx/pics/hitmontop/normal.pal b/gfx/pics/hitmontop/normal.pal
deleted file mode 100644
index a6621cff6..000000000
--- a/gfx/pics/hitmontop/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 19, 04
-	RGB 10, 10, 21
-
diff --git a/gfx/pics/ho_oh/back.2bpp.lz b/gfx/pics/ho_oh/back.2bpp.lz.1412f260
index 1d58cf8ac..1d58cf8ac 100644
--- a/gfx/pics/ho_oh/back.2bpp.lz
+++ b/gfx/pics/ho_oh/back.2bpp.lz.1412f260
diff --git a/gfx/pics/ho_oh/back.png b/gfx/pics/ho_oh/back.png
new file mode 100644
index 000000000..c28d038d9
--- /dev/null
+++ b/gfx/pics/ho_oh/back.png
diff --git a/gfx/pics/ho_oh/bitmask.asm b/gfx/pics/ho_oh/bitmask.asm
deleted file mode 100644
index 4db146ccd..000000000
--- a/gfx/pics/ho_oh/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %01111000
-	db %00111100
-	db %00011110
-	db %00000111
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %01111000
-	db %00111100
-	db %00011110
-	db %10001111
-	db %10000111
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %11000000
-	db %01110000
-	db %00111100
-	db %00000110
-	db %11000011
-	db %00000000
-; 3
-	db %00000000
-	db %00011000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3ab3
diff --git a/gfx/pics/ho_oh/frames.asm b/gfx/pics/ho_oh/frames.asm
deleted file mode 100644
index 7b244c4f8..000000000
--- a/gfx/pics/ho_oh/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $30, $34, $35, $36, $37, $38, $39, $3a, $3b
-	db $3c, $3d, $3e
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $33, $30, $3f, $40, $41, $42, $43, $44, $45, $46
-	db $47, $48, $49, $4a, $4b, $4c, $4d, $4e, $4f
-.frame3
-	db $02 ; bitmask
-	db $50, $51, $52, $53, $54, $55, $56, $57, $58, $59, $5a, $5b
-	db $5c, $5d, $5e
-.frame4
-	db $03 ; bitmask
-	db $5f, $60
-; 0xd9907
diff --git a/gfx/pics/ho_oh/front.2bpp.lz b/gfx/pics/ho_oh/front.animated.2bpp.lz.db80b5eb
index 40c91739e..40c91739e 100644
--- a/gfx/pics/ho_oh/front.2bpp.lz
+++ b/gfx/pics/ho_oh/front.animated.2bpp.lz.db80b5eb
diff --git a/gfx/pics/ho_oh/front.png b/gfx/pics/ho_oh/front.png
new file mode 100644
index 000000000..52598814d
--- /dev/null
+++ b/gfx/pics/ho_oh/front.png
diff --git a/gfx/pics/ho_oh/normal.pal b/gfx/pics/ho_oh/normal.pal
deleted file mode 100644
index be2b43d0d..000000000
--- a/gfx/pics/ho_oh/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 07, 03
-	RGB 07, 15, 03
-
diff --git a/gfx/pics/hoothoot/back.2bpp.lz b/gfx/pics/hoothoot/back.2bpp.lz.7ebb0b29
index e4ca2f37f..e4ca2f37f 100644
--- a/gfx/pics/hoothoot/back.2bpp.lz
+++ b/gfx/pics/hoothoot/back.2bpp.lz.7ebb0b29
diff --git a/gfx/pics/hoothoot/back.png b/gfx/pics/hoothoot/back.png
new file mode 100644
index 000000000..73247ff34
--- /dev/null
+++ b/gfx/pics/hoothoot/back.png
diff --git a/gfx/pics/hoothoot/bitmask.asm b/gfx/pics/hoothoot/bitmask.asm
deleted file mode 100644
index e473e1e04..000000000
--- a/gfx/pics/hoothoot/bitmask.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-; 0
-	db %11000000
-	db %00111001
-	db %00000111
-	db %00000000
-; 1
-	db %00000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 2
-	db %01100011
-	db %10011000
-	db %00110001
-	db %00000000
-; 3
-	db %01000000
-	db %00011000
-	db %00000001
-	db %00000000
-; 4
-	db %01000000
-	db %00001000
-	db %00000001
-	db %00000000
-; 0xd33f7
diff --git a/gfx/pics/hoothoot/frames.asm b/gfx/pics/hoothoot/frames.asm
deleted file mode 100644
index 028590ffc..000000000
--- a/gfx/pics/hoothoot/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21
-.frame2
-	db $01 ; bitmask
-	db $22
-.frame3
-	db $02 ; bitmask
-	db $23, $24, $25, $19, $1c, $22, $26, $1f, $27, $28
-.frame4
-	db $03 ; bitmask
-	db $19, $1c, $22, $1f
-.frame5
-	db $04 ; bitmask
-	db $19, $1c, $1f
-; 0xd86d8
diff --git a/gfx/pics/hoothoot/front.2bpp.lz b/gfx/pics/hoothoot/front.animated.2bpp.lz.752ab202
index 6abcd37fc..6abcd37fc 100644
--- a/gfx/pics/hoothoot/front.2bpp.lz
+++ b/gfx/pics/hoothoot/front.animated.2bpp.lz.752ab202
diff --git a/gfx/pics/hoothoot/front.png b/gfx/pics/hoothoot/front.png
new file mode 100644
index 000000000..97500e77c
--- /dev/null
+++ b/gfx/pics/hoothoot/front.png
diff --git a/gfx/pics/hoothoot/normal.pal b/gfx/pics/hoothoot/normal.pal
deleted file mode 100644
index af1d96c2d..000000000
--- a/gfx/pics/hoothoot/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 13, 06
-	RGB 04, 06, 16
-
diff --git a/gfx/pics/hoppip/back.2bpp.lz b/gfx/pics/hoppip/back.2bpp.lz.5684c023
index c5439118e..c5439118e 100644
--- a/gfx/pics/hoppip/back.2bpp.lz
+++ b/gfx/pics/hoppip/back.2bpp.lz.5684c023
diff --git a/gfx/pics/hoppip/back.png b/gfx/pics/hoppip/back.png
new file mode 100644
index 000000000..325c08993
--- /dev/null
+++ b/gfx/pics/hoppip/back.png
diff --git a/gfx/pics/hoppip/bitmask.asm b/gfx/pics/hoppip/bitmask.asm
deleted file mode 100644
index 54cedfdd8..000000000
--- a/gfx/pics/hoppip/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %01100011
-	db %10101001
-	db %00110011
-	db %00000000
-; 1
-	db %00000000
-	db %00100001
-	db %00000000
-	db %00000000
-; 0xd35b3
diff --git a/gfx/pics/hoppip/frames.asm b/gfx/pics/hoppip/frames.asm
deleted file mode 100644
index 6a0afff92..000000000
--- a/gfx/pics/hoppip/frames.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $23, $24
-.frame2
-	db $01 ; bitmask
-	db $1d, $1f
-; 0xd8bec
diff --git a/gfx/pics/hoppip/front.2bpp.lz b/gfx/pics/hoppip/front.animated.2bpp.lz.a03efe74
index 4387e2886..4387e2886 100644
--- a/gfx/pics/hoppip/front.2bpp.lz
+++ b/gfx/pics/hoppip/front.animated.2bpp.lz.a03efe74
diff --git a/gfx/pics/hoppip/front.png b/gfx/pics/hoppip/front.png
new file mode 100644
index 000000000..19cd0d473
--- /dev/null
+++ b/gfx/pics/hoppip/front.png
diff --git a/gfx/pics/hoppip/normal.pal b/gfx/pics/hoppip/normal.pal
deleted file mode 100644
index 6f44a59ec..000000000
--- a/gfx/pics/hoppip/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 11, 23, 06
-	RGB 21, 06, 07
-
diff --git a/gfx/pics/horsea/back.2bpp.lz b/gfx/pics/horsea/back.2bpp.lz.50b6afb9
index ae6a2ecab..ae6a2ecab 100644
--- a/gfx/pics/horsea/back.2bpp.lz
+++ b/gfx/pics/horsea/back.2bpp.lz.50b6afb9
diff --git a/gfx/pics/horsea/back.png b/gfx/pics/horsea/back.png
new file mode 100644
index 000000000..70c34e674
--- /dev/null
+++ b/gfx/pics/horsea/back.png
diff --git a/gfx/pics/horsea/bitmask.asm b/gfx/pics/horsea/bitmask.asm
deleted file mode 100644
index 8c5e6f8ba..000000000
--- a/gfx/pics/horsea/bitmask.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-; 0
-	db %10000100
-	db %00000001
-	db %00000000
-	db %00000000
-; 1
-	db %10001100
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %01000011
-	db %00000000
-; 3
-	db %11000000
-	db %00011000
-	db %00000000
-	db %00000000
-; 0xd302d
diff --git a/gfx/pics/horsea/frames.asm b/gfx/pics/horsea/frames.asm
deleted file mode 100644
index 3dc3d270e..000000000
--- a/gfx/pics/horsea/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b
-.frame2
-	db $01 ; bitmask
-	db $1c, $1d, $1e
-.frame3
-	db $02 ; bitmask
-	db $1f, $20, $00
-.frame4
-	db $03 ; bitmask
-	db $21, $22, $23, $24
-; 0xd5a4b
diff --git a/gfx/pics/horsea/front.2bpp.lz b/gfx/pics/horsea/front.animated.2bpp.lz.8b84f98e
index 7db08094b..7db08094b 100644
--- a/gfx/pics/horsea/front.2bpp.lz
+++ b/gfx/pics/horsea/front.animated.2bpp.lz.8b84f98e
diff --git a/gfx/pics/horsea/front.png b/gfx/pics/horsea/front.png
new file mode 100644
index 000000000..285617685
--- /dev/null
+++ b/gfx/pics/horsea/front.png
diff --git a/gfx/pics/horsea/normal.pal b/gfx/pics/horsea/normal.pal
deleted file mode 100644
index 7a8344a06..000000000
--- a/gfx/pics/horsea/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 27, 12
-	RGB 11, 17, 31
-
diff --git a/gfx/pics/houndoom/back.2bpp.lz b/gfx/pics/houndoom/back.2bpp.lz.5fa55a47
index 5b7b72ffc..5b7b72ffc 100644
--- a/gfx/pics/houndoom/back.2bpp.lz
+++ b/gfx/pics/houndoom/back.2bpp.lz.5fa55a47
diff --git a/gfx/pics/houndoom/back.png b/gfx/pics/houndoom/back.png
new file mode 100644
index 000000000..e9137ba77
--- /dev/null
+++ b/gfx/pics/houndoom/back.png
diff --git a/gfx/pics/houndoom/bitmask.asm b/gfx/pics/houndoom/bitmask.asm
deleted file mode 100644
index 8280ba2ce..000000000
--- a/gfx/pics/houndoom/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %10000111
-	db %11111011
-	db %01111101
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %10000111
-	db %11000011
-	db %01100001
-	db %00100000
-	db %00010000
-	db %00000000
-	db %00000000
-; 2
-	db %10000111
-	db %11000011
-	db %01100001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00100000
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd38b8
diff --git a/gfx/pics/houndoom/frames.asm b/gfx/pics/houndoom/frames.asm
deleted file mode 100644
index 0241edf36..000000000
--- a/gfx/pics/houndoom/frames.asm
+++ /dev/null
@@ -1,24 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $03, $31, $32, $33, $34, $35, $36, $37, $03, $38, $39, $3a
-	db $3b, $3c, $03, $3d, $3e
-.frame2
-	db $01 ; bitmask
-	db $03, $3f, $40, $33, $41, $35, $38, $39, $3a, $3d, $3e, $42
-	db $43
-.frame3
-	db $01 ; bitmask
-	db $44, $45, $46, $47, $48, $49, $4a, $4b, $4c, $4d, $4e, $42
-	db $43
-.frame4
-	db $02 ; bitmask
-	db $03, $3f, $40, $33, $41, $35, $38, $39, $3a, $3d, $3e
-.frame5
-	db $03 ; bitmask
-	db $42, $43
-; 0xd939d
diff --git a/gfx/pics/houndoom/front.2bpp.lz b/gfx/pics/houndoom/front.animated.2bpp.lz.2d450e90
index c2ce34ee3..c2ce34ee3 100644
--- a/gfx/pics/houndoom/front.2bpp.lz
+++ b/gfx/pics/houndoom/front.animated.2bpp.lz.2d450e90
diff --git a/gfx/pics/houndoom/front.png b/gfx/pics/houndoom/front.png
new file mode 100644
index 000000000..0a8315734
--- /dev/null
+++ b/gfx/pics/houndoom/front.png
diff --git a/gfx/pics/houndoom/normal.pal b/gfx/pics/houndoom/normal.pal
deleted file mode 100644
index 6fbf714ba..000000000
--- a/gfx/pics/houndoom/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 12, 00
-	RGB 09, 04, 17
-
diff --git a/gfx/pics/houndour/back.2bpp.lz b/gfx/pics/houndour/back.2bpp.lz.ae5f2dc9
index fe3584bd1..fe3584bd1 100644
--- a/gfx/pics/houndour/back.2bpp.lz
+++ b/gfx/pics/houndour/back.2bpp.lz.ae5f2dc9
diff --git a/gfx/pics/houndour/back.png b/gfx/pics/houndour/back.png
new file mode 100644
index 000000000..bcaf2c7ca
--- /dev/null
+++ b/gfx/pics/houndour/back.png
diff --git a/gfx/pics/houndour/bitmask.asm b/gfx/pics/houndour/bitmask.asm
deleted file mode 100644
index 1542871bd..000000000
--- a/gfx/pics/houndour/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %11001110
-	db %11100011
-	db %00011000
-	db %00001100
-	db %00000011
-; 1
-	db %11001110
-	db %11100011
-	db %00001000
-	db %00000000
-	db %00000000
-; 2
-	db %00001000
-	db %00000010
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00001000
-	db %00000011
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd389c
diff --git a/gfx/pics/houndour/frames.asm b/gfx/pics/houndour/frames.asm
deleted file mode 100644
index 6087e14b7..000000000
--- a/gfx/pics/houndour/frames.asm
+++ /dev/null
@@ -1,18 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $00, $24, $25, $00, $26, $27, $28, $29, $2a, $2b, $2c, $2d
-	db $2e, $2f, $30, $00
-.frame2
-	db $01 ; bitmask
-	db $00, $24, $25, $00, $26, $27, $28, $29, $2a, $2b, $2c
-.frame3
-	db $02 ; bitmask
-	db $31, $32
-.frame4
-	db $03 ; bitmask
-	db $31, $33, $32
-; 0xd9356
diff --git a/gfx/pics/houndour/front.2bpp.lz b/gfx/pics/houndour/front.animated.2bpp.lz.f847f4f6
index 786c0f9a4..786c0f9a4 100644
--- a/gfx/pics/houndour/front.2bpp.lz
+++ b/gfx/pics/houndour/front.animated.2bpp.lz.f847f4f6
diff --git a/gfx/pics/houndour/front.png b/gfx/pics/houndour/front.png
new file mode 100644
index 000000000..b002b0f15
--- /dev/null
+++ b/gfx/pics/houndour/front.png
diff --git a/gfx/pics/houndour/normal.pal b/gfx/pics/houndour/normal.pal
deleted file mode 100644
index 7ea34334c..000000000
--- a/gfx/pics/houndour/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 12, 00
-	RGB 06, 08, 10
-
diff --git a/gfx/pics/hypno/back.2bpp.lz b/gfx/pics/hypno/back.2bpp.lz.c091ce88
index b69fcadf7..b69fcadf7 100644
--- a/gfx/pics/hypno/back.2bpp.lz
+++ b/gfx/pics/hypno/back.2bpp.lz.c091ce88
diff --git a/gfx/pics/hypno/back.png b/gfx/pics/hypno/back.png
new file mode 100644
index 000000000..b68f235d3
--- /dev/null
+++ b/gfx/pics/hypno/back.png
diff --git a/gfx/pics/hypno/bitmask.asm b/gfx/pics/hypno/bitmask.asm
deleted file mode 100644
index 4b510102e..000000000
--- a/gfx/pics/hypno/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00011110
-	db %00000110
-	db %10000001
-	db %01100000
-	db %01110000
-	db %00011000
-	db %00000000
-; 1
-	db %00011110
-	db %00000110
-	db %10000001
-	db %10000000
-	db %11100000
-	db %00100000
-	db %00000000
-; 2
-	db %00011110
-	db %00000110
-	db %10000001
-	db %10000000
-	db %11100001
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %00000010
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2e9c
diff --git a/gfx/pics/hypno/frames.asm b/gfx/pics/hypno/frames.asm
deleted file mode 100644
index dd8e204ec..000000000
--- a/gfx/pics/hypno/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $00, $34, $35, $36, $37, $38, $39, $3a, $3b
-	db $3c, $3d, $3e
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $33, $00, $34, $35, $36, $37, $3f, $40, $41, $42
-	db $43
-.frame3
-	db $02 ; bitmask
-	db $31, $32, $33, $00, $34, $35, $36, $37, $44, $45, $46, $47
-	db $48
-.frame4
-	db $03 ; bitmask
-	db $49, $4a
-; 0xd5653
diff --git a/gfx/pics/hypno/front.2bpp.lz b/gfx/pics/hypno/front.animated.2bpp.lz.638333a3
index ca6ec0608..ca6ec0608 100644
--- a/gfx/pics/hypno/front.2bpp.lz
+++ b/gfx/pics/hypno/front.animated.2bpp.lz.638333a3
diff --git a/gfx/pics/hypno/front.png b/gfx/pics/hypno/front.png
new file mode 100644
index 000000000..64c844425
--- /dev/null
+++ b/gfx/pics/hypno/front.png
diff --git a/gfx/pics/hypno/normal.pal b/gfx/pics/hypno/normal.pal
deleted file mode 100644
index ddcd2b573..000000000
--- a/gfx/pics/hypno/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 25, 00
-	RGB 21, 12, 00
-
diff --git a/gfx/pics/igglybuff/back.2bpp.lz b/gfx/pics/igglybuff/back.2bpp.lz.c0c17dcb
index b416af3f0..b416af3f0 100644
--- a/gfx/pics/igglybuff/back.2bpp.lz
+++ b/gfx/pics/igglybuff/back.2bpp.lz.c0c17dcb
diff --git a/gfx/pics/igglybuff/back.png b/gfx/pics/igglybuff/back.png
new file mode 100644
index 000000000..7b34a17ff
--- /dev/null
+++ b/gfx/pics/igglybuff/back.png
diff --git a/gfx/pics/igglybuff/bitmask.asm b/gfx/pics/igglybuff/bitmask.asm
deleted file mode 100644
index c5d067fc8..000000000
--- a/gfx/pics/igglybuff/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00000000
-	db %00100000
-	db %00000000
-	db %00000000
-; 1
-	db %00101000
-	db %10100110
-	db %10001101
-	db %00000001
-; 2
-	db %10000000
-	db %00010000
-	db %00000010
-	db %00000000
-; 0xd34b5
diff --git a/gfx/pics/igglybuff/frames.asm b/gfx/pics/igglybuff/frames.asm
deleted file mode 100644
index 3e279f4e8..000000000
--- a/gfx/pics/igglybuff/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19
-.frame2
-	db $01 ; bitmask
-	db $1a, $1b, $1c, $1d, $19, $1e, $1f, $20, $21, $22, $00
-.frame3
-	db $02 ; bitmask
-	db $23, $24, $25
-; 0xd892a
diff --git a/gfx/pics/igglybuff/front.2bpp.lz b/gfx/pics/igglybuff/front.animated.2bpp.lz.1e00afc3
index 1c4bbefa0..1c4bbefa0 100644
--- a/gfx/pics/igglybuff/front.2bpp.lz
+++ b/gfx/pics/igglybuff/front.animated.2bpp.lz.1e00afc3
diff --git a/gfx/pics/igglybuff/front.png b/gfx/pics/igglybuff/front.png
new file mode 100644
index 000000000..2fb7dbb78
--- /dev/null
+++ b/gfx/pics/igglybuff/front.png
diff --git a/gfx/pics/igglybuff/normal.pal b/gfx/pics/igglybuff/normal.pal
deleted file mode 100644
index e9935054a..000000000
--- a/gfx/pics/igglybuff/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 16, 24
-	RGB 22, 05, 05
-
diff --git a/gfx/pics/ivysaur/back.2bpp.lz b/gfx/pics/ivysaur/back.2bpp.lz.bed1ff58
index 34557d9dd..34557d9dd 100644
--- a/gfx/pics/ivysaur/back.2bpp.lz
+++ b/gfx/pics/ivysaur/back.2bpp.lz.bed1ff58
diff --git a/gfx/pics/ivysaur/back.png b/gfx/pics/ivysaur/back.png
new file mode 100644
index 000000000..325b5cdf5
--- /dev/null
+++ b/gfx/pics/ivysaur/back.png
diff --git a/gfx/pics/ivysaur/bitmask.asm b/gfx/pics/ivysaur/bitmask.asm
deleted file mode 100644
index fa0421574..000000000
--- a/gfx/pics/ivysaur/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %11000010
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %11000111
-	db %01110001
-	db %00011100
-	db %00000000
-; 2
-	db %00000000
-	db %10000000
-	db %01100001
-	db %00011000
-	db %00000000
-; 0xd2708
diff --git a/gfx/pics/ivysaur/frames.asm b/gfx/pics/ivysaur/frames.asm
deleted file mode 100644
index 074875072..000000000
--- a/gfx/pics/ivysaur/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26
-.frame2
-	db $01 ; bitmask
-	db $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f, $30, $31, $32
-.frame3
-	db $02 ; bitmask
-	db $33, $34, $35, $36, $37, $38
-; 0xd423c
diff --git a/gfx/pics/ivysaur/front.2bpp.lz b/gfx/pics/ivysaur/front.animated.2bpp.lz.3abed0fa
index 7b9c8f9d9..7b9c8f9d9 100644
--- a/gfx/pics/ivysaur/front.2bpp.lz
+++ b/gfx/pics/ivysaur/front.animated.2bpp.lz.3abed0fa
diff --git a/gfx/pics/ivysaur/front.png b/gfx/pics/ivysaur/front.png
new file mode 100644
index 000000000..799c79667
--- /dev/null
+++ b/gfx/pics/ivysaur/front.png
diff --git a/gfx/pics/ivysaur/normal.pal b/gfx/pics/ivysaur/normal.pal
deleted file mode 100644
index 31f0796cb..000000000
--- a/gfx/pics/ivysaur/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 12, 31, 11
-	RGB 31, 10, 16
-
diff --git a/gfx/pics/jigglypuff/back.2bpp.lz b/gfx/pics/jigglypuff/back.2bpp.lz.87d5730b
index e551afaf6..e551afaf6 100644
--- a/gfx/pics/jigglypuff/back.2bpp.lz
+++ b/gfx/pics/jigglypuff/back.2bpp.lz.87d5730b
diff --git a/gfx/pics/jigglypuff/back.png b/gfx/pics/jigglypuff/back.png
new file mode 100644
index 000000000..4e1849c51
--- /dev/null
+++ b/gfx/pics/jigglypuff/back.png
diff --git a/gfx/pics/jigglypuff/bitmask.asm b/gfx/pics/jigglypuff/bitmask.asm
deleted file mode 100644
index ae2e23c9f..000000000
--- a/gfx/pics/jigglypuff/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00001000
-	db %00100001
-	db %11000000
-	db %00000000
-; 1
-	db %10000000
-	db %01110001
-	db %10001111
-	db %00000000
-; 2
-	db %10000000
-	db %00110001
-	db %00000011
-	db %00000000
-; 0xd29b0
diff --git a/gfx/pics/jigglypuff/frames.asm b/gfx/pics/jigglypuff/frames.asm
deleted file mode 100644
index eb10d6d58..000000000
--- a/gfx/pics/jigglypuff/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d
-.frame2
-	db $01 ; bitmask
-	db $1e, $1f, $20, $21, $22, $23, $24, $25, $26, $27
-.frame3
-	db $02 ; bitmask
-	db $28, $29, $2a, $2b, $23, $2c
-.frame4
-	db $02 ; bitmask
-	db $1e, $2d, $20, $2b, $23, $24
-; 0xd4a23
diff --git a/gfx/pics/jigglypuff/front.2bpp.lz b/gfx/pics/jigglypuff/front.animated.2bpp.lz.9fd159f4
index 4367e41d8..4367e41d8 100644
--- a/gfx/pics/jigglypuff/front.2bpp.lz
+++ b/gfx/pics/jigglypuff/front.animated.2bpp.lz.9fd159f4
diff --git a/gfx/pics/jigglypuff/front.png b/gfx/pics/jigglypuff/front.png
new file mode 100644
index 000000000..867134d13
--- /dev/null
+++ b/gfx/pics/jigglypuff/front.png
diff --git a/gfx/pics/jigglypuff/normal.pal b/gfx/pics/jigglypuff/normal.pal
deleted file mode 100644
index 47aab43ae..000000000
--- a/gfx/pics/jigglypuff/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 14, 21
-	RGB 06, 16, 31
-
diff --git a/gfx/pics/jolteon/back.2bpp.lz b/gfx/pics/jolteon/back.2bpp.lz.f248aac4
index e95f893ce..e95f893ce 100644
--- a/gfx/pics/jolteon/back.2bpp.lz
+++ b/gfx/pics/jolteon/back.2bpp.lz.f248aac4
diff --git a/gfx/pics/jolteon/back.png b/gfx/pics/jolteon/back.png
new file mode 100644
index 000000000..0bf798ebf
--- /dev/null
+++ b/gfx/pics/jolteon/back.png
diff --git a/gfx/pics/jolteon/bitmask.asm b/gfx/pics/jolteon/bitmask.asm
deleted file mode 100644
index 7d7c181cd..000000000
--- a/gfx/pics/jolteon/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %11101010
-	db %11111011
-	db %11111111
-	db %00001011
-	db %00000000
-; 1
-	db %11101010
-	db %11111011
-	db %11111111
-	db %11001011
-	db %00000000
-; 2
-	db %00000000
-	db %10000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd31b1
diff --git a/gfx/pics/jolteon/frames.asm b/gfx/pics/jolteon/frames.asm
deleted file mode 100644
index 95447944a..000000000
--- a/gfx/pics/jolteon/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $30, $00, $31, $32, $33, $34, $35, $36, $37, $38, $39
-.frame2
-	db $01 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $3a
-	db $30, $00, $31, $32, $33, $34, $35, $36, $3b, $3c, $39, $3d
-	db $3e
-.frame3
-	db $02 ; bitmask
-	db $3f
-.frame4
-	db $03 ; bitmask
-	db $40
-; 0xd5e80
diff --git a/gfx/pics/jolteon/front.2bpp.lz b/gfx/pics/jolteon/front.animated.2bpp.lz.b2b07d79
index 32d271390..32d271390 100644
--- a/gfx/pics/jolteon/front.2bpp.lz
+++ b/gfx/pics/jolteon/front.animated.2bpp.lz.b2b07d79
diff --git a/gfx/pics/jolteon/front.png b/gfx/pics/jolteon/front.png
new file mode 100644
index 000000000..4f052d559
--- /dev/null
+++ b/gfx/pics/jolteon/front.png
diff --git a/gfx/pics/jolteon/normal.pal b/gfx/pics/jolteon/normal.pal
deleted file mode 100644
index 81c384474..000000000
--- a/gfx/pics/jolteon/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 31, 03
-	RGB 28, 11, 01
-
diff --git a/gfx/pics/jumpluff/back.2bpp.lz b/gfx/pics/jumpluff/back.2bpp.lz.b258a699
index 57ae8b890..57ae8b890 100644
--- a/gfx/pics/jumpluff/back.2bpp.lz
+++ b/gfx/pics/jumpluff/back.2bpp.lz.b258a699
diff --git a/gfx/pics/jumpluff/back.png b/gfx/pics/jumpluff/back.png
new file mode 100644
index 000000000..1b72ecf2f
--- /dev/null
+++ b/gfx/pics/jumpluff/back.png
diff --git a/gfx/pics/jumpluff/bitmask.asm b/gfx/pics/jumpluff/bitmask.asm
deleted file mode 100644
index 9d54f0fa4..000000000
--- a/gfx/pics/jumpluff/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00011100
-	db %11011110
-	db %01101000
-	db %00011110
-	db %11011011
-	db %11100001
-	db %00000000
-; 1
-	db %00001100
-	db %00000110
-	db %00000000
-	db %00000010
-	db %01000000
-	db %01100000
-	db %00000000
-; 2
-	db %00000100
-	db %00010010
-	db %00001000
-	db %00001110
-	db %01000010
-	db %00100000
-	db %00000000
-; 3
-	db %00000000
-	db %00010000
-	db %00001000
-	db %00001100
-	db %00000010
-	db %00000000
-	db %00000000
-; 0xd35de
diff --git a/gfx/pics/jumpluff/frames.asm b/gfx/pics/jumpluff/frames.asm
deleted file mode 100644
index 0a46d384c..000000000
--- a/gfx/pics/jumpluff/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $00, $38, $39, $3a, $3b
-	db $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44, $45, $00, $46
-	db $47, $00
-.frame2
-	db $01 ; bitmask
-	db $48, $49, $4a, $4b, $3c, $4c, $4d, $4e
-.frame3
-	db $02 ; bitmask
-	db $4f, $50, $37, $39, $3c, $3d, $3e, $41, $51, $52
-.frame4
-	db $03 ; bitmask
-	db $37, $39, $3d, $3e, $41
-; 0xd8c59
diff --git a/gfx/pics/jumpluff/front.2bpp.lz b/gfx/pics/jumpluff/front.animated.2bpp.lz.6d1d8175
index c3570ed09..c3570ed09 100644
--- a/gfx/pics/jumpluff/front.2bpp.lz
+++ b/gfx/pics/jumpluff/front.animated.2bpp.lz.6d1d8175
diff --git a/gfx/pics/jumpluff/front.png b/gfx/pics/jumpluff/front.png
new file mode 100644
index 000000000..1048e3937
--- /dev/null
+++ b/gfx/pics/jumpluff/front.png
diff --git a/gfx/pics/jumpluff/normal.pal b/gfx/pics/jumpluff/normal.pal
deleted file mode 100644
index 582553eb9..000000000
--- a/gfx/pics/jumpluff/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 23, 13
-	RGB 09, 08, 24
-
diff --git a/gfx/pics/jynx/back.2bpp.lz b/gfx/pics/jynx/back.2bpp.lz.1eef1c1b
index 4642ecda7..4642ecda7 100644
--- a/gfx/pics/jynx/back.2bpp.lz
+++ b/gfx/pics/jynx/back.2bpp.lz.1eef1c1b
diff --git a/gfx/pics/jynx/back.png b/gfx/pics/jynx/back.png
new file mode 100644
index 000000000..6478f6099
--- /dev/null
+++ b/gfx/pics/jynx/back.png
diff --git a/gfx/pics/jynx/bitmask.asm b/gfx/pics/jynx/bitmask.asm
deleted file mode 100644
index 1843c8556..000000000
--- a/gfx/pics/jynx/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00000000
-	db %11000100
-	db %01010011
-	db %00100000
-	db %00001100
-; 1
-	db %00000000
-	db %01000000
-	db %00010000
-	db %00010000
-	db %00001100
-; 2
-	db %00000000
-	db %01100000
-	db %00011000
-	db %00000000
-	db %00000000
-; 0xd30d8
diff --git a/gfx/pics/jynx/frames.asm b/gfx/pics/jynx/frames.asm
deleted file mode 100644
index 7aa0496d0..000000000
--- a/gfx/pics/jynx/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d
-.frame2
-	db $01 ; bitmask
-	db $2e, $2f, $30, $31, $32
-.frame3
-	db $02 ; bitmask
-	db $33, $34, $35, $36
-; 0xd5bf4
diff --git a/gfx/pics/jynx/front.2bpp.lz b/gfx/pics/jynx/front.animated.2bpp.lz.6aaf67b0
index 78a436494..78a436494 100644
--- a/gfx/pics/jynx/front.2bpp.lz
+++ b/gfx/pics/jynx/front.animated.2bpp.lz.6aaf67b0
diff --git a/gfx/pics/jynx/front.png b/gfx/pics/jynx/front.png
new file mode 100644
index 000000000..297a90630
--- /dev/null
+++ b/gfx/pics/jynx/front.png
diff --git a/gfx/pics/jynx/normal.pal b/gfx/pics/jynx/normal.pal
deleted file mode 100644
index 6ae162f94..000000000
--- a/gfx/pics/jynx/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 14, 02, 15
-	RGB 29, 06, 19
-
diff --git a/gfx/pics/kabuto/back.2bpp.lz b/gfx/pics/kabuto/back.2bpp.lz.0717a29b
index 61390a32e..61390a32e 100644
--- a/gfx/pics/kabuto/back.2bpp.lz
+++ b/gfx/pics/kabuto/back.2bpp.lz.0717a29b
diff --git a/gfx/pics/kabuto/back.png b/gfx/pics/kabuto/back.png
new file mode 100644
index 000000000..acd9444b6
--- /dev/null
+++ b/gfx/pics/kabuto/back.png
diff --git a/gfx/pics/kabuto/bitmask.asm b/gfx/pics/kabuto/bitmask.asm
deleted file mode 100644
index 7cdb4204f..000000000
--- a/gfx/pics/kabuto/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00011000
-	db %00000011
-	db %00001100
-	db %00000001
-; 1
-	db %00011000
-	db %00000011
-	db %00001000
-	db %00000001
-; 2
-	db %10000100
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd31fb
diff --git a/gfx/pics/kabuto/frames.asm b/gfx/pics/kabuto/frames.asm
deleted file mode 100644
index 482d0069c..000000000
--- a/gfx/pics/kabuto/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $00, $1a, $1b, $1c, $1d, $1e
-.frame2
-	db $01 ; bitmask
-	db $1f, $20, $21, $1b, $22, $1e
-.frame3
-	db $02 ; bitmask
-	db $23, $24, $25
-; 0xd5f35
diff --git a/gfx/pics/kabuto/front.2bpp.lz b/gfx/pics/kabuto/front.animated.2bpp.lz.afe4e2dc
index 24a9376c8..24a9376c8 100644
--- a/gfx/pics/kabuto/front.2bpp.lz
+++ b/gfx/pics/kabuto/front.animated.2bpp.lz.afe4e2dc
diff --git a/gfx/pics/kabuto/front.png b/gfx/pics/kabuto/front.png
new file mode 100644
index 000000000..c354983ed
--- /dev/null
+++ b/gfx/pics/kabuto/front.png
diff --git a/gfx/pics/kabuto/normal.pal b/gfx/pics/kabuto/normal.pal
deleted file mode 100644
index a8935ce9c..000000000
--- a/gfx/pics/kabuto/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 14, 00
-	RGB 12, 09, 06
-
diff --git a/gfx/pics/kabutops/back.2bpp.lz b/gfx/pics/kabutops/back.2bpp.lz.98a1dfc4
index 507c10e2f..507c10e2f 100644
--- a/gfx/pics/kabutops/back.2bpp.lz
+++ b/gfx/pics/kabutops/back.2bpp.lz.98a1dfc4
diff --git a/gfx/pics/kabutops/back.png b/gfx/pics/kabutops/back.png
new file mode 100644
index 000000000..2a1fde94d
--- /dev/null
+++ b/gfx/pics/kabutops/back.png
diff --git a/gfx/pics/kabutops/bitmask.asm b/gfx/pics/kabutops/bitmask.asm
deleted file mode 100644
index 34b29ddb0..000000000
--- a/gfx/pics/kabutops/bitmask.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-; 0
-	db %11011111
-	db %11110111
-	db %00111101
-	db %10001111
-	db %00000111
-; 1
-	db %00000000
-	db %00000000
-	db %00000000
-	db %10001110
-	db %00000111
-; 0xd3205
diff --git a/gfx/pics/kabutops/frames.asm b/gfx/pics/kabutops/frames.asm
deleted file mode 100644
index 2881f9fe1..000000000
--- a/gfx/pics/kabutops/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $1e, $24, $25, $1e, $1e, $26, $27, $28, $29, $2a, $2b, $2c
-	db $2d, $2e, $2f, $30, $31, $32, $33, $34, $35, $36, $37, $1e
-	db $1e, $1e, $1e
-.frame2
-	db $00 ; bitmask
-	db $1e, $24, $25, $1e, $1e, $26, $27, $28, $29, $2a, $2b, $38
-	db $39, $2e, $2f, $30, $31, $32, $33, $34, $35, $36, $37, $1e
-	db $1e, $1e, $1e
-.frame3
-	db $01 ; bitmask
-	db $3a, $3b, $3c, $1e, $1e, $1e, $1e
-; 0xd5f7b
diff --git a/gfx/pics/kabutops/front.2bpp.lz b/gfx/pics/kabutops/front.animated.2bpp.lz.d5e4bfeb
index 38d21fa16..38d21fa16 100644
--- a/gfx/pics/kabutops/front.2bpp.lz
+++ b/gfx/pics/kabutops/front.animated.2bpp.lz.d5e4bfeb
diff --git a/gfx/pics/kabutops/front.png b/gfx/pics/kabutops/front.png
new file mode 100644
index 000000000..776073b50
--- /dev/null
+++ b/gfx/pics/kabutops/front.png
diff --git a/gfx/pics/kabutops/normal.pal b/gfx/pics/kabutops/normal.pal
deleted file mode 100644
index a8935ce9c..000000000
--- a/gfx/pics/kabutops/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 14, 00
-	RGB 12, 09, 06
-
diff --git a/gfx/pics/kadabra/back.2bpp.lz b/gfx/pics/kadabra/back.2bpp.lz.6b26c1a0
index 0092147d7..0092147d7 100644
--- a/gfx/pics/kadabra/back.2bpp.lz
+++ b/gfx/pics/kadabra/back.2bpp.lz.6b26c1a0
diff --git a/gfx/pics/kadabra/back.png b/gfx/pics/kadabra/back.png
new file mode 100644
index 000000000..20f615a84
--- /dev/null
+++ b/gfx/pics/kadabra/back.png
diff --git a/gfx/pics/kadabra/bitmask.asm b/gfx/pics/kadabra/bitmask.asm
deleted file mode 100644
index aa938440f..000000000
--- a/gfx/pics/kadabra/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %10011110
-	db %00001111
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %10011110
-	db %10001111
-	db %01000001
-	db %00011000
-	db %00000000
-; 2
-	db %00000000
-	db %01000000
-	db %00010000
-	db %00000100
-	db %00000000
-; 0xd2b87
diff --git a/gfx/pics/kadabra/frames.asm b/gfx/pics/kadabra/frames.asm
deleted file mode 100644
index 9cdcc0526..000000000
--- a/gfx/pics/kadabra/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c
-.frame2
-	db $01 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $30, $31
-.frame3
-	db $01 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $32, $33
-	db $30, $34
-.frame4
-	db $02 ; bitmask
-	db $35, $36, $37
-; 0xd4f27
diff --git a/gfx/pics/kadabra/front.2bpp.lz b/gfx/pics/kadabra/front.animated.2bpp.lz.bc78f9cf
index 54f47795d..54f47795d 100644
--- a/gfx/pics/kadabra/front.2bpp.lz
+++ b/gfx/pics/kadabra/front.animated.2bpp.lz.bc78f9cf
diff --git a/gfx/pics/kadabra/front.png b/gfx/pics/kadabra/front.png
new file mode 100644
index 000000000..50341a6b3
--- /dev/null
+++ b/gfx/pics/kadabra/front.png
diff --git a/gfx/pics/kadabra/normal.pal b/gfx/pics/kadabra/normal.pal
deleted file mode 100644
index 23f50e983..000000000
--- a/gfx/pics/kadabra/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 19, 03
-	RGB 12, 08, 10
-
diff --git a/gfx/pics/kakuna/back.2bpp.lz b/gfx/pics/kakuna/back.2bpp.lz.3bffa4c3
index b369857d5..b369857d5 100644
--- a/gfx/pics/kakuna/back.2bpp.lz
+++ b/gfx/pics/kakuna/back.2bpp.lz.3bffa4c3
diff --git a/gfx/pics/kakuna/back.png b/gfx/pics/kakuna/back.png
new file mode 100644
index 000000000..b7f2b2e52
--- /dev/null
+++ b/gfx/pics/kakuna/back.png
diff --git a/gfx/pics/kakuna/bitmask.asm b/gfx/pics/kakuna/bitmask.asm
deleted file mode 100644
index c44358546..000000000
--- a/gfx/pics/kakuna/bitmask.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-; 0
-	db %11100000
-	db %10011100
-	db %00000011
-	db %00000000
-; 0xd27d7
diff --git a/gfx/pics/kakuna/frames.asm b/gfx/pics/kakuna/frames.asm
deleted file mode 100644
index afe506784..000000000
--- a/gfx/pics/kakuna/frames.asm
+++ /dev/null
@@ -1,5 +0,0 @@
-	dw .frame1
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21
-; 0xd446e
diff --git a/gfx/pics/kakuna/front.2bpp.lz b/gfx/pics/kakuna/front.animated.2bpp.lz.c7425e72
index 2f2431edf..2f2431edf 100644
--- a/gfx/pics/kakuna/front.2bpp.lz
+++ b/gfx/pics/kakuna/front.animated.2bpp.lz.c7425e72
diff --git a/gfx/pics/kakuna/front.png b/gfx/pics/kakuna/front.png
new file mode 100644
index 000000000..b34a398f9
--- /dev/null
+++ b/gfx/pics/kakuna/front.png
diff --git a/gfx/pics/kakuna/normal.pal b/gfx/pics/kakuna/normal.pal
deleted file mode 100644
index 6760123ec..000000000
--- a/gfx/pics/kakuna/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 25, 03
-	RGB 20, 14, 08
-
diff --git a/gfx/pics/kangaskhan/back.2bpp.lz b/gfx/pics/kangaskhan/back.2bpp.lz.0d7cc337
index c7ff00272..c7ff00272 100644
--- a/gfx/pics/kangaskhan/back.2bpp.lz
+++ b/gfx/pics/kangaskhan/back.2bpp.lz.0d7cc337
diff --git a/gfx/pics/kangaskhan/back.png b/gfx/pics/kangaskhan/back.png
new file mode 100644
index 000000000..d69e041ca
--- /dev/null
+++ b/gfx/pics/kangaskhan/back.png
diff --git a/gfx/pics/kangaskhan/bitmask.asm b/gfx/pics/kangaskhan/bitmask.asm
deleted file mode 100644
index 3ab57899a..000000000
--- a/gfx/pics/kangaskhan/bitmask.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-; 0
-	db %00011100
-	db %00001110
-	db %11000111
-	db %11000011
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00011100
-	db %00001110
-	db %00001110
-	db %00000111
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00001000
-	db %00001110
-	db %00000111
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00011100
-	db %00001110
-	db %11000111
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 4
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000010
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd301d
diff --git a/gfx/pics/kangaskhan/frames.asm b/gfx/pics/kangaskhan/frames.asm
deleted file mode 100644
index 155ac059e..000000000
--- a/gfx/pics/kangaskhan/frames.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $33, $34, $35, $40, $41, $42, $43, $44, $45, $46
-.frame3
-	db $02 ; bitmask
-	db $47, $48, $49, $4a, $44, $45, $4b
-.frame4
-	db $02 ; bitmask
-	db $4c, $48, $49, $43, $4d, $45, $46
-.frame5
-	db $03 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $4e
-.frame6
-	db $04 ; bitmask
-	db $3d
-; 0xd5a32
diff --git a/gfx/pics/kangaskhan/front.2bpp.lz b/gfx/pics/kangaskhan/front.animated.2bpp.lz.09c81009
index 1ec58169d..1ec58169d 100644
--- a/gfx/pics/kangaskhan/front.2bpp.lz
+++ b/gfx/pics/kangaskhan/front.animated.2bpp.lz.09c81009
diff --git a/gfx/pics/kangaskhan/front.png b/gfx/pics/kangaskhan/front.png
new file mode 100644
index 000000000..abe680c64
--- /dev/null
+++ b/gfx/pics/kangaskhan/front.png
diff --git a/gfx/pics/kangaskhan/normal.pal b/gfx/pics/kangaskhan/normal.pal
deleted file mode 100644
index 06a80fc6d..000000000
--- a/gfx/pics/kangaskhan/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 19, 14, 04
-	RGB 08, 08, 02
-
diff --git a/gfx/pics/kingdra/back.2bpp.lz b/gfx/pics/kingdra/back.2bpp.lz.e48ecb3f
index 9f2c38b6c..9f2c38b6c 100644
--- a/gfx/pics/kingdra/back.2bpp.lz
+++ b/gfx/pics/kingdra/back.2bpp.lz.e48ecb3f
diff --git a/gfx/pics/kingdra/back.png b/gfx/pics/kingdra/back.png
new file mode 100644
index 000000000..9f0784999
--- /dev/null
+++ b/gfx/pics/kingdra/back.png
diff --git a/gfx/pics/kingdra/bitmask.asm b/gfx/pics/kingdra/bitmask.asm
deleted file mode 100644
index 0c9026f1e..000000000
--- a/gfx/pics/kingdra/bitmask.asm
+++ /dev/null
@@ -1,49 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %00001100
-	db %10000111
-	db %00000110
-	db %00000000
-	db %00000000
-; 1
-	db %00110000
-	db %00111100
-	db %00011100
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00110000
-	db %10111111
-	db %01011101
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %11000000
-	db %01100000
-	db %00000000
-; 4
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00100000
-	db %00000000
-	db %00000000
-; 5
-	db %00000000
-	db %00000000
-	db %01000000
-	db %00100000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd38e2
diff --git a/gfx/pics/kingdra/frames.asm b/gfx/pics/kingdra/frames.asm
deleted file mode 100644
index f4e3d8d77..000000000
--- a/gfx/pics/kingdra/frames.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38
-.frame2
-	db $01 ; bitmask
-	db $00, $00, $00, $39, $3a, $3b, $3c, $3d, $3e
-.frame3
-	db $02 ; bitmask
-	db $00, $00, $3f, $40, $00, $39, $3a, $3b, $41, $42, $3c, $3d
-	db $3e, $43
-.frame4
-	db $03 ; bitmask
-	db $44, $45, $46, $47
-.frame5
-	db $04 ; bitmask
-	db $48
-.frame6
-	db $05 ; bitmask
-	db $49, $4a
-; 0xd93d5
diff --git a/gfx/pics/kingdra/front.2bpp.lz b/gfx/pics/kingdra/front.animated.2bpp.lz.668c0516
index d28a4dc78..d28a4dc78 100644
--- a/gfx/pics/kingdra/front.2bpp.lz
+++ b/gfx/pics/kingdra/front.animated.2bpp.lz.668c0516
diff --git a/gfx/pics/kingdra/front.png b/gfx/pics/kingdra/front.png
new file mode 100644
index 000000000..978f8e91c
--- /dev/null
+++ b/gfx/pics/kingdra/front.png
diff --git a/gfx/pics/kingdra/normal.pal b/gfx/pics/kingdra/normal.pal
deleted file mode 100644
index 3e7449818..000000000
--- a/gfx/pics/kingdra/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 23, 07
-	RGB 12, 17, 30
-
diff --git a/gfx/pics/kingler/back.2bpp.lz b/gfx/pics/kingler/back.2bpp.lz.88e96d65
index aceed0679..aceed0679 100644
--- a/gfx/pics/kingler/back.2bpp.lz
+++ b/gfx/pics/kingler/back.2bpp.lz.88e96d65
diff --git a/gfx/pics/kingler/back.png b/gfx/pics/kingler/back.png
new file mode 100644
index 000000000..02e058053
--- /dev/null
+++ b/gfx/pics/kingler/back.png
diff --git a/gfx/pics/kingler/bitmask.asm b/gfx/pics/kingler/bitmask.asm
deleted file mode 100644
index b8672c447..000000000
--- a/gfx/pics/kingler/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %00000000
-	db %11110000
-	db %11111101
-	db %11111011
-	db %00000001
-; 1
-	db %00000000
-	db %00011100
-	db %00011100
-	db %10001111
-	db %00000111
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00001000
-	db %00000110
-	db %00000011
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2ec9
diff --git a/gfx/pics/kingler/frames.asm b/gfx/pics/kingler/frames.asm
deleted file mode 100644
index 160c92a57..000000000
--- a/gfx/pics/kingler/frames.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $00, $00, $31, $32, $33, $34, $00, $35, $36, $37, $38, $39
-	db $3a, $00, $3b, $3c, $3d, $3e, $3f
-.frame2
-	db $01 ; bitmask
-	db $40, $41, $42, $43, $44, $45, $46, $47, $48, $00, $49, $4a
-	db $4b, $00
-.frame3
-	db $02 ; bitmask
-	db $4c, $4d, $4e, $4f, $50
-; 0xd56af
diff --git a/gfx/pics/kingler/front.2bpp.lz b/gfx/pics/kingler/front.animated.2bpp.lz.35305199
index 590bd05ee..590bd05ee 100644
--- a/gfx/pics/kingler/front.2bpp.lz
+++ b/gfx/pics/kingler/front.animated.2bpp.lz.35305199
diff --git a/gfx/pics/kingler/front.png b/gfx/pics/kingler/front.png
new file mode 100644
index 000000000..5631d87e7
--- /dev/null
+++ b/gfx/pics/kingler/front.png
diff --git a/gfx/pics/kingler/normal.pal b/gfx/pics/kingler/normal.pal
deleted file mode 100644
index a347ecf9c..000000000
--- a/gfx/pics/kingler/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 17, 09
-	RGB 29, 05, 04
-
diff --git a/gfx/pics/koffing/back.2bpp.lz b/gfx/pics/koffing/back.2bpp.lz.8c0a2526
index 2e8762565..2e8762565 100644
--- a/gfx/pics/koffing/back.2bpp.lz
+++ b/gfx/pics/koffing/back.2bpp.lz.8c0a2526
diff --git a/gfx/pics/koffing/back.png b/gfx/pics/koffing/back.png
new file mode 100644
index 000000000..fd156a89b
--- /dev/null
+++ b/gfx/pics/koffing/back.png
diff --git a/gfx/pics/koffing/bitmask.asm b/gfx/pics/koffing/bitmask.asm
deleted file mode 100644
index d6d2f747d..000000000
--- a/gfx/pics/koffing/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %10000000
-	db %01100000
-	db %00011001
-	db %00001000
-	db %00000000
-; 1
-	db %11000000
-	db %01111000
-	db %00011011
-	db %00001000
-	db %00000110
-; 2
-	db %01000000
-	db %01011000
-	db %00011010
-	db %00000000
-	db %00000110
-; 3
-	db %00000000
-	db %01000000
-	db %00011000
-	db %00000000
-	db %00000000
-; 0xd2f96
diff --git a/gfx/pics/koffing/frames.asm b/gfx/pics/koffing/frames.asm
deleted file mode 100644
index ef58ddc50..000000000
--- a/gfx/pics/koffing/frames.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a
-.frame2
-	db $01 ; bitmask
-	db $2b, $24, $2c, $2d, $25, $26, $27, $2e, $28, $29, $2a, $2f
-	db $30
-.frame3
-	db $02 ; bitmask
-	db $2b, $2c, $2d, $26, $2e, $28, $29, $2f, $30
-.frame4
-	db $02 ; bitmask
-	db $31, $32, $33, $26, $34, $28, $35, $36, $37
-.frame5
-	db $03 ; bitmask
-	db $26, $28, $35
-; 0xd58c7
diff --git a/gfx/pics/koffing/front.2bpp.lz b/gfx/pics/koffing/front.animated.2bpp.lz.00044b3f
index 78de37eeb..78de37eeb 100644
--- a/gfx/pics/koffing/front.2bpp.lz
+++ b/gfx/pics/koffing/front.animated.2bpp.lz.00044b3f
diff --git a/gfx/pics/koffing/front.png b/gfx/pics/koffing/front.png
new file mode 100644
index 000000000..1468a07f1
--- /dev/null
+++ b/gfx/pics/koffing/front.png
diff --git a/gfx/pics/koffing/normal.pal b/gfx/pics/koffing/normal.pal
deleted file mode 100644
index a4df75fdc..000000000
--- a/gfx/pics/koffing/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 10, 25
-	RGB 18, 06, 18
-
diff --git a/gfx/pics/krabby/back.2bpp.lz b/gfx/pics/krabby/back.2bpp.lz.2bc2487b
index 5954b413d..5954b413d 100644
--- a/gfx/pics/krabby/back.2bpp.lz
+++ b/gfx/pics/krabby/back.2bpp.lz.2bc2487b
diff --git a/gfx/pics/krabby/back.png b/gfx/pics/krabby/back.png
new file mode 100644
index 000000000..baf5a048e
--- /dev/null
+++ b/gfx/pics/krabby/back.png
diff --git a/gfx/pics/krabby/bitmask.asm b/gfx/pics/krabby/bitmask.asm
deleted file mode 100644
index 377109d09..000000000
--- a/gfx/pics/krabby/bitmask.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-; 0
-	db %00000110
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00011000
-	db %00000011
-	db %00000000
-; 2
-	db %00000000
-	db %00001000
-	db %00000011
-	db %00000000
-; 3
-	db %00000110
-	db %00011000
-	db %00000011
-	db %00000000
-; 4
-	db %00000110
-	db %00001000
-	db %00000011
-	db %00000000
-; 5
-	db %00000000
-	db %00100001
-	db %00000000
-	db %00000000
-; 0xd2eb4
diff --git a/gfx/pics/krabby/frames.asm b/gfx/pics/krabby/frames.asm
deleted file mode 100644
index 07bd6171a..000000000
--- a/gfx/pics/krabby/frames.asm
+++ /dev/null
@@ -1,29 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-.frame1
-	db $00 ; bitmask
-	db $19, $1a
-.frame2
-	db $00 ; bitmask
-	db $1b, $1c
-.frame3
-	db $01 ; bitmask
-	db $1d, $1e, $1f, $20
-.frame4
-	db $02 ; bitmask
-	db $21, $22, $23
-.frame5
-	db $03 ; bitmask
-	db $19, $1a, $1d, $1e, $1f, $20
-.frame6
-	db $04 ; bitmask
-	db $1b, $1c, $21, $22, $23
-.frame7
-	db $05 ; bitmask
-	db $24, $25
-; 0xd5680
diff --git a/gfx/pics/krabby/front.2bpp.lz b/gfx/pics/krabby/front.animated.2bpp.lz.39592514
index c0f968fa5..c0f968fa5 100644
--- a/gfx/pics/krabby/front.2bpp.lz
+++ b/gfx/pics/krabby/front.animated.2bpp.lz.39592514
diff --git a/gfx/pics/krabby/front.png b/gfx/pics/krabby/front.png
new file mode 100644
index 000000000..f790059e8
--- /dev/null
+++ b/gfx/pics/krabby/front.png
diff --git a/gfx/pics/krabby/normal.pal b/gfx/pics/krabby/normal.pal
deleted file mode 100644
index a347ecf9c..000000000
--- a/gfx/pics/krabby/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 17, 09
-	RGB 29, 05, 04
-
diff --git a/gfx/pics/lanturn/back.2bpp.lz b/gfx/pics/lanturn/back.2bpp.lz.8e9c7c1a
index ea916b7ea..ea916b7ea 100644
--- a/gfx/pics/lanturn/back.2bpp.lz
+++ b/gfx/pics/lanturn/back.2bpp.lz.8e9c7c1a
diff --git a/gfx/pics/lanturn/back.png b/gfx/pics/lanturn/back.png
new file mode 100644
index 000000000..f80ffc742
--- /dev/null
+++ b/gfx/pics/lanturn/back.png
diff --git a/gfx/pics/lanturn/bitmask.asm b/gfx/pics/lanturn/bitmask.asm
deleted file mode 100644
index 5294c2ebc..000000000
--- a/gfx/pics/lanturn/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %11000110
-	db %00000000
-	db %10001110
-	db %00000111
-; 1
-	db %00000011
-	db %11000110
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000011
-	db %00000110
-	db %00000000
-	db %10001110
-	db %00000111
-; 3
-	db %00000011
-	db %11000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3491
diff --git a/gfx/pics/lanturn/frames.asm b/gfx/pics/lanturn/frames.asm
deleted file mode 100644
index efce13663..000000000
--- a/gfx/pics/lanturn/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e
-.frame2
-	db $01 ; bitmask
-	db $2f, $30, $24, $25, $26, $27
-.frame3
-	db $02 ; bitmask
-	db $31, $32, $24, $25, $28, $29, $2a, $2b, $2c, $2d, $2e
-.frame4
-	db $03 ; bitmask
-	db $2f, $30, $26, $27
-; 0xd88c4
diff --git a/gfx/pics/lanturn/front.2bpp.lz b/gfx/pics/lanturn/front.animated.2bpp.lz.1bfac161
index ba57a1569..ba57a1569 100644
--- a/gfx/pics/lanturn/front.2bpp.lz
+++ b/gfx/pics/lanturn/front.animated.2bpp.lz.1bfac161
diff --git a/gfx/pics/lanturn/front.png b/gfx/pics/lanturn/front.png
new file mode 100644
index 000000000..5b2eaeb5b
--- /dev/null
+++ b/gfx/pics/lanturn/front.png
diff --git a/gfx/pics/lanturn/normal.pal b/gfx/pics/lanturn/normal.pal
deleted file mode 100644
index a61eb7237..000000000
--- a/gfx/pics/lanturn/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 24, 14
-	RGB 13, 10, 28
-
diff --git a/gfx/pics/lapras/back.2bpp.lz b/gfx/pics/lapras/back.2bpp.lz.d09351a1
index 00f6b4329..00f6b4329 100644
--- a/gfx/pics/lapras/back.2bpp.lz
+++ b/gfx/pics/lapras/back.2bpp.lz.d09351a1
diff --git a/gfx/pics/lapras/back.png b/gfx/pics/lapras/back.png
new file mode 100644
index 000000000..9c17ce376
--- /dev/null
+++ b/gfx/pics/lapras/back.png
diff --git a/gfx/pics/lapras/bitmask.asm b/gfx/pics/lapras/bitmask.asm
deleted file mode 100644
index 82d831e3c..000000000
--- a/gfx/pics/lapras/bitmask.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-; 0
-	db %10000111
-	db %11000011
-	db %11100001
-	db %00010000
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %10000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3163
diff --git a/gfx/pics/lapras/frames.asm b/gfx/pics/lapras/frames.asm
deleted file mode 100644
index 6f399dbc1..000000000
--- a/gfx/pics/lapras/frames.asm
+++ /dev/null
@@ -1,24 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $03
-.frame2
-	db $00 ; bitmask
-	db $31, $32, $3d, $34, $3e, $3f, $37, $40, $41, $3a, $3b, $3c
-	db $03
-.frame3
-	db $00 ; bitmask
-	db $31, $32, $42, $34, $43, $44, $37, $45, $46, $3a, $3b, $3c
-	db $03
-.frame4
-	db $01 ; bitmask
-	db $47
-.frame5
-	db $01 ; bitmask
-	db $48
-; 0xd5d90
diff --git a/gfx/pics/lapras/front.2bpp.lz b/gfx/pics/lapras/front.animated.2bpp.lz.8290ef8e
index 0c20fc0be..0c20fc0be 100644
--- a/gfx/pics/lapras/front.2bpp.lz
+++ b/gfx/pics/lapras/front.animated.2bpp.lz.8290ef8e
diff --git a/gfx/pics/lapras/front.png b/gfx/pics/lapras/front.png
new file mode 100644
index 000000000..f6c2c483b
--- /dev/null
+++ b/gfx/pics/lapras/front.png
diff --git a/gfx/pics/lapras/normal.pal b/gfx/pics/lapras/normal.pal
deleted file mode 100644
index 9e617a3ef..000000000
--- a/gfx/pics/lapras/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 21, 13
-	RGB 08, 16, 28
-
diff --git a/gfx/pics/larvitar/back.2bpp.lz b/gfx/pics/larvitar/back.2bpp.lz.4b2ac395
index b4122419b..b4122419b 100644
--- a/gfx/pics/larvitar/back.2bpp.lz
+++ b/gfx/pics/larvitar/back.2bpp.lz.4b2ac395
diff --git a/gfx/pics/larvitar/back.png b/gfx/pics/larvitar/back.png
new file mode 100644
index 000000000..84e51b20b
--- /dev/null
+++ b/gfx/pics/larvitar/back.png
diff --git a/gfx/pics/larvitar/bitmask.asm b/gfx/pics/larvitar/bitmask.asm
deleted file mode 100644
index 9ff8d5535..000000000
--- a/gfx/pics/larvitar/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %01000000
-	db %00000000
-; 1
-	db %00100000
-	db %10011100
-	db %01100011
-	db %00000000
-; 2
-	db %00000000
-	db %00011000
-	db %00000011
-	db %00000000
-; 0xd3a32
diff --git a/gfx/pics/larvitar/frames.asm b/gfx/pics/larvitar/frames.asm
deleted file mode 100644
index 17da6e97b..000000000
--- a/gfx/pics/larvitar/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19
-.frame2
-	db $01 ; bitmask
-	db $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22
-.frame3
-	db $02 ; bitmask
-	db $23, $24, $25, $26
-; 0xd97c0
diff --git a/gfx/pics/larvitar/front.2bpp.lz b/gfx/pics/larvitar/front.animated.2bpp.lz.83859c57
index deba5d5a2..deba5d5a2 100644
--- a/gfx/pics/larvitar/front.2bpp.lz
+++ b/gfx/pics/larvitar/front.animated.2bpp.lz.83859c57
diff --git a/gfx/pics/larvitar/front.png b/gfx/pics/larvitar/front.png
new file mode 100644
index 000000000..3f58d0be6
--- /dev/null
+++ b/gfx/pics/larvitar/front.png
diff --git a/gfx/pics/larvitar/normal.pal b/gfx/pics/larvitar/normal.pal
deleted file mode 100644
index 04a460b3e..000000000
--- a/gfx/pics/larvitar/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 12, 24, 01
-	RGB 25, 07, 16
-
diff --git a/gfx/pics/ledian/back.2bpp.lz b/gfx/pics/ledian/back.2bpp.lz.48657bbb
index eb996b4e3..eb996b4e3 100644
--- a/gfx/pics/ledian/back.2bpp.lz
+++ b/gfx/pics/ledian/back.2bpp.lz.48657bbb
diff --git a/gfx/pics/ledian/back.png b/gfx/pics/ledian/back.png
new file mode 100644
index 000000000..6dcd7eb53
--- /dev/null
+++ b/gfx/pics/ledian/back.png
diff --git a/gfx/pics/ledian/bitmask.asm b/gfx/pics/ledian/bitmask.asm
deleted file mode 100644
index 658c703c0..000000000
--- a/gfx/pics/ledian/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %11000011
-	db %01110001
-	db %00011100
-	db %00000001
-	db %00000000
-; 1
-	db %11000011
-	db %01110111
-	db %01011100
-	db %00010001
-	db %00000000
-; 2
-	db %00000000
-	db %01100001
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd342f
diff --git a/gfx/pics/ledian/frames.asm b/gfx/pics/ledian/frames.asm
deleted file mode 100644
index 9dd6ff763..000000000
--- a/gfx/pics/ledian/frames.asm
+++ /dev/null
@@ -1,18 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $05, $05, $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d
-.frame2
-	db $00 ; bitmask
-	db $05, $05, $24, $25, $26, $27, $28, $2e, $2a, $2b, $2c, $2d
-.frame3
-	db $01 ; bitmask
-	db $05, $05, $24, $25, $26, $2f, $30, $27, $28, $29, $2a, $2b
-	db $2c, $31, $2d, $32
-.frame4
-	db $02 ; bitmask
-	db $33, $34, $35
-; 0xd878e
diff --git a/gfx/pics/ledian/front.2bpp.lz b/gfx/pics/ledian/front.animated.2bpp.lz.83e819c3
index 117d19c14..117d19c14 100644
--- a/gfx/pics/ledian/front.2bpp.lz
+++ b/gfx/pics/ledian/front.animated.2bpp.lz.83e819c3
diff --git a/gfx/pics/ledian/front.png b/gfx/pics/ledian/front.png
new file mode 100644
index 000000000..d5773cbba
--- /dev/null
+++ b/gfx/pics/ledian/front.png
diff --git a/gfx/pics/ledian/normal.pal b/gfx/pics/ledian/normal.pal
deleted file mode 100644
index 09164a55c..000000000
--- a/gfx/pics/ledian/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 22, 04
-	RGB 27, 06, 05
-
diff --git a/gfx/pics/ledyba/back.2bpp.lz b/gfx/pics/ledyba/back.2bpp.lz.d50e8860
index 728f4dedb..728f4dedb 100644
--- a/gfx/pics/ledyba/back.2bpp.lz
+++ b/gfx/pics/ledyba/back.2bpp.lz.d50e8860
diff --git a/gfx/pics/ledyba/back.png b/gfx/pics/ledyba/back.png
new file mode 100644
index 000000000..e9f080747
--- /dev/null
+++ b/gfx/pics/ledyba/back.png
diff --git a/gfx/pics/ledyba/bitmask.asm b/gfx/pics/ledyba/bitmask.asm
deleted file mode 100644
index 8a59736ef..000000000
--- a/gfx/pics/ledyba/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00001100
-	db %01000011
-	db %00110000
-	db %00001100
-	db %00000000
-; 1
-	db %10001110
-	db %10000010
-	db %00111000
-	db %10011110
-	db %00000011
-; 2
-	db %00001100
-	db %10000010
-	db %00110000
-	db %00001100
-	db %00000000
-; 3
-	db %00001100
-	db %11000011
-	db %00110000
-	db %00001100
-	db %00000000
-; 0xd3420
diff --git a/gfx/pics/ledyba/frames.asm b/gfx/pics/ledyba/frames.asm
deleted file mode 100644
index afa489121..000000000
--- a/gfx/pics/ledyba/frames.asm
+++ /dev/null
@@ -1,18 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c
-.frame2
-	db $01 ; bitmask
-	db $2d, $2e, $25, $2f, $30, $31, $32, $33, $2a, $34, $35, $36
-	db $37, $38, $39, $3a
-.frame3
-	db $02 ; bitmask
-	db $24, $25, $30, $31, $3b, $2a, $2b, $2c
-.frame4
-	db $03 ; bitmask
-	db $24, $25, $26, $30, $28, $31, $29, $2a, $2b, $2c
-; 0xd8757
diff --git a/gfx/pics/ledyba/front.2bpp.lz b/gfx/pics/ledyba/front.animated.2bpp.lz.1700dc27
index fc15ab1ba..fc15ab1ba 100644
--- a/gfx/pics/ledyba/front.2bpp.lz
+++ b/gfx/pics/ledyba/front.animated.2bpp.lz.1700dc27
diff --git a/gfx/pics/ledyba/front.png b/gfx/pics/ledyba/front.png
new file mode 100644
index 000000000..317670632
--- /dev/null
+++ b/gfx/pics/ledyba/front.png
diff --git a/gfx/pics/ledyba/normal.pal b/gfx/pics/ledyba/normal.pal
deleted file mode 100644
index e761d076a..000000000
--- a/gfx/pics/ledyba/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 19, 08
-	RGB 27, 06, 05
-
diff --git a/gfx/pics/lickitung/back.2bpp.lz b/gfx/pics/lickitung/back.2bpp.lz.a127e40b
index 85764655a..85764655a 100644
--- a/gfx/pics/lickitung/back.2bpp.lz
+++ b/gfx/pics/lickitung/back.2bpp.lz.a127e40b
diff --git a/gfx/pics/lickitung/back.png b/gfx/pics/lickitung/back.png
new file mode 100644
index 000000000..dd6276d7c
--- /dev/null
+++ b/gfx/pics/lickitung/back.png
diff --git a/gfx/pics/lickitung/bitmask.asm b/gfx/pics/lickitung/bitmask.asm
deleted file mode 100644
index 856fb977e..000000000
--- a/gfx/pics/lickitung/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00011000
-	db %00001100
-	db %00000110
-	db %10000011
-	db %00000001
-	db %00000000
-	db %00000000
-; 1
-	db %10011111
-	db %00001111
-	db %00000100
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00111000
-	db %00011100
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %10000000
-	db %00000001
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2f82
diff --git a/gfx/pics/lickitung/frames.asm b/gfx/pics/lickitung/frames.asm
deleted file mode 100644
index feb42d080..000000000
--- a/gfx/pics/lickitung/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $00, $00, $31, $04, $32, $33, $34, $35, $36, $37
-.frame2
-	db $01 ; bitmask
-	db $38, $39, $3a, $3b, $3c, $3d, $3e, $3f, $40, $41, $42
-.frame3
-	db $02 ; bitmask
-	db $00, $43, $44, $45, $46, $47
-.frame4
-	db $03 ; bitmask
-	db $48, $49, $4a
-; 0xd588f
diff --git a/gfx/pics/lickitung/front.2bpp.lz b/gfx/pics/lickitung/front.animated.2bpp.lz.328a7c53
index f7e2f4f43..f7e2f4f43 100644
--- a/gfx/pics/lickitung/front.2bpp.lz
+++ b/gfx/pics/lickitung/front.animated.2bpp.lz.328a7c53
diff --git a/gfx/pics/lickitung/front.png b/gfx/pics/lickitung/front.png
new file mode 100644
index 000000000..9918326e4
--- /dev/null
+++ b/gfx/pics/lickitung/front.png
diff --git a/gfx/pics/lickitung/normal.pal b/gfx/pics/lickitung/normal.pal
deleted file mode 100644
index 75782a5b8..000000000
--- a/gfx/pics/lickitung/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 10, 18
-	RGB 26, 06, 05
-
diff --git a/gfx/pics/lugia/back.2bpp.lz b/gfx/pics/lugia/back.2bpp.lz.ad953eb5
index 8f7134e13..8f7134e13 100644
--- a/gfx/pics/lugia/back.2bpp.lz
+++ b/gfx/pics/lugia/back.2bpp.lz.ad953eb5
diff --git a/gfx/pics/lugia/back.png b/gfx/pics/lugia/back.png
new file mode 100644
index 000000000..07e502f41
--- /dev/null
+++ b/gfx/pics/lugia/back.png
diff --git a/gfx/pics/lugia/bitmask.asm b/gfx/pics/lugia/bitmask.asm
deleted file mode 100644
index 3270ceba6..000000000
--- a/gfx/pics/lugia/bitmask.asm
+++ /dev/null
@@ -1,73 +0,0 @@
-; 0
-	db %11110111
-	db %11111111
-	db %01011101
-	db %00000000
-	db %10000111
-	db %11000011
-	db %00000001
-; 1
-	db %01110111
-	db %00111111
-	db %00011100
-	db %00000000
-	db %10011011
-	db %11001111
-	db %00000001
-; 2
-	db %00000000
-	db %00100000
-	db %00000000
-	db %00010000
-	db %00011000
-	db %00001100
-	db %00000000
-; 3
-	db %10000111
-	db %11110011
-	db %01000001
-	db %00000000
-	db %10000111
-	db %11000011
-	db %00000001
-; 4
-	db %00000111
-	db %00110011
-	db %00000000
-	db %00000000
-	db %10011011
-	db %11001111
-	db %00000001
-; 5
-	db %00000000
-	db %00110000
-	db %00000000
-	db %00010000
-	db %00011000
-	db %00001100
-	db %00000000
-; 6
-	db %01110000
-	db %00111100
-	db %00011100
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 7
-	db %00000000
-	db %00110000
-	db %00000000
-	db %00000000
-	db %00011000
-	db %00001100
-	db %00000000
-; 8
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3a97
diff --git a/gfx/pics/lugia/frames.asm b/gfx/pics/lugia/frames.asm
deleted file mode 100644
index b108f313d..000000000
--- a/gfx/pics/lugia/frames.asm
+++ /dev/null
@@ -1,43 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-	dw .frame8
-	dw .frame9
-.frame1
-	db $00 ; bitmask
-	db $03, $31, $32, $03, $33, $34, $03, $35, $36, $03, $37, $38
-	db $39, $03, $3a, $3b, $3c, $3d, $3e, $3f, $40, $41, $42, $43
-	db $44, $45, $46, $47, $48
-.frame2
-	db $01 ; bitmask
-	db $49, $4a, $4b, $03, $33, $34, $4c, $4d, $03, $37, $38, $39
-	db $3c, $3d, $3e, $40, $4e, $4f, $50, $51, $52, $53, $54, $55
-	db $56, $57, $58
-.frame3
-	db $02 ; bitmask
-	db $59, $5a, $5b, $5c, $03, $5d
-.frame4
-	db $03 ; bitmask
-	db $03, $31, $32, $03, $35, $36, $5e, $5f, $03, $3a, $3b, $3f
-	db $40, $41, $42, $43, $44, $45, $46, $47, $48
-.frame5
-	db $04 ; bitmask
-	db $49, $4a, $4b, $4c, $4d, $5e, $5f, $40, $4e, $4f, $50, $51
-	db $52, $53, $54, $55, $56, $57, $58
-.frame6
-	db $05 ; bitmask
-	db $5e, $59, $5a, $5b, $5c, $03, $5d
-.frame7
-	db $06 ; bitmask
-	db $03, $33, $34, $03, $37, $38, $39, $3c, $3d, $3e
-.frame8
-	db $07 ; bitmask
-	db $5e, $59, $4f, $50, $54, $55
-.frame9
-	db $08 ; bitmask
-	db $5e, $59
-; 0xd98c4
diff --git a/gfx/pics/lugia/front.2bpp.lz b/gfx/pics/lugia/front.animated.2bpp.lz.7293eddc
index b1b300304..b1b300304 100644
--- a/gfx/pics/lugia/front.2bpp.lz
+++ b/gfx/pics/lugia/front.animated.2bpp.lz.7293eddc
diff --git a/gfx/pics/lugia/front.png b/gfx/pics/lugia/front.png
new file mode 100644
index 000000000..29c21ee3c
--- /dev/null
+++ b/gfx/pics/lugia/front.png
diff --git a/gfx/pics/lugia/normal.pal b/gfx/pics/lugia/normal.pal
deleted file mode 100644
index 74bf84625..000000000
--- a/gfx/pics/lugia/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 17, 28
-	RGB 10, 00, 31
-
diff --git a/gfx/pics/machamp/back.2bpp.lz b/gfx/pics/machamp/back.2bpp.lz.757f4c29
index b82d09cce..b82d09cce 100644
--- a/gfx/pics/machamp/back.2bpp.lz
+++ b/gfx/pics/machamp/back.2bpp.lz.757f4c29
diff --git a/gfx/pics/machamp/back.png b/gfx/pics/machamp/back.png
new file mode 100644
index 000000000..9fd20fd70
--- /dev/null
+++ b/gfx/pics/machamp/back.png
diff --git a/gfx/pics/machamp/bitmask.asm b/gfx/pics/machamp/bitmask.asm
deleted file mode 100644
index a8960834d..000000000
--- a/gfx/pics/machamp/bitmask.asm
+++ /dev/null
@@ -1,57 +0,0 @@
-; 0
-	db %10000000
-	db %11000001
-	db %10000011
-	db %00000001
-	db %00011000
-	db %00001100
-	db %00000000
-; 1
-	db %10111000
-	db %11011111
-	db %00001100
-	db %00000000
-	db %00011000
-	db %00001100
-	db %00000000
-; 2
-	db %10000000
-	db %11000001
-	db %00011100
-	db %00001110
-	db %11111011
-	db %01101101
-	db %00000000
-; 3
-	db %10011000
-	db %11011111
-	db %00001110
-	db %10000110
-	db %11111011
-	db %01101101
-	db %00000000
-; 4
-	db %00000000
-	db %00000000
-	db %11000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 5
-	db %10011000
-	db %11011101
-	db %00001110
-	db %10000110
-	db %11111011
-	db %01101101
-	db %00000000
-; 6
-	db %10000000
-	db %11000001
-	db %00000000
-	db %00000000
-	db %00011000
-	db %00001100
-	db %00000000
-; 0xd2bfc
diff --git a/gfx/pics/machamp/frames.asm b/gfx/pics/machamp/frames.asm
deleted file mode 100644
index 53963eb10..000000000
--- a/gfx/pics/machamp/frames.asm
+++ /dev/null
@@ -1,35 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-.frame2
-	db $01 ; bitmask
-	db $3d, $05, $3e, $31, $32, $3f, $40, $41, $42, $33, $34, $43
-	db $44, $39, $3a, $3b, $3c
-.frame3
-	db $02 ; bitmask
-	db $31, $32, $33, $34, $45, $46, $47, $48, $49, $4a, $05, $4b
-	db $39, $3a, $4c, $4d, $4e, $4f, $3b, $3c, $50, $05
-.frame4
-	db $03 ; bitmask
-	db $3d, $05, $31, $32, $3f, $51, $52, $53, $33, $34, $54, $55
-	db $56, $57, $58, $59, $5a, $5b, $39, $3a, $4c, $4d, $4e, $4f
-	db $3b, $3c, $50, $05
-.frame5
-	db $04 ; bitmask
-	db $5c, $5d, $5e
-.frame6
-	db $05 ; bitmask
-	db $3d, $05, $31, $32, $51, $52, $53, $33, $34, $54, $5f, $56
-	db $60, $05, $59, $61, $5b, $39, $3a, $4c, $4d, $4e, $4f, $3b
-	db $3c, $50, $05
-.frame7
-	db $06 ; bitmask
-	db $31, $32, $33, $34, $39, $3a, $3b, $3c
-; 0xd5069
diff --git a/gfx/pics/machamp/front.2bpp.lz b/gfx/pics/machamp/front.animated.2bpp.lz.2d408542
index aa1b12edb..aa1b12edb 100644
--- a/gfx/pics/machamp/front.2bpp.lz
+++ b/gfx/pics/machamp/front.animated.2bpp.lz.2d408542
diff --git a/gfx/pics/machamp/front.png b/gfx/pics/machamp/front.png
new file mode 100644
index 000000000..b06c66af6
--- /dev/null
+++ b/gfx/pics/machamp/front.png
diff --git a/gfx/pics/machamp/normal.pal b/gfx/pics/machamp/normal.pal
deleted file mode 100644
index d9ba2de40..000000000
--- a/gfx/pics/machamp/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 21, 18, 11
-	RGB 09, 11, 04
-
diff --git a/gfx/pics/machoke/back.2bpp.lz b/gfx/pics/machoke/back.2bpp.lz.2634245e
index e6a0015ed..e6a0015ed 100644
--- a/gfx/pics/machoke/back.2bpp.lz
+++ b/gfx/pics/machoke/back.2bpp.lz.2634245e
diff --git a/gfx/pics/machoke/back.png b/gfx/pics/machoke/back.png
new file mode 100644
index 000000000..a6f9c2c4c
--- /dev/null
+++ b/gfx/pics/machoke/back.png
diff --git a/gfx/pics/machoke/bitmask.asm b/gfx/pics/machoke/bitmask.asm
deleted file mode 100644
index 59bdaaea8..000000000
--- a/gfx/pics/machoke/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %10011111
-	db %00001111
-	db %11000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00000110
-	db %11000011
-	db %10000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %11000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2bcb
diff --git a/gfx/pics/machoke/frames.asm b/gfx/pics/machoke/frames.asm
deleted file mode 100644
index 72af5035f..000000000
--- a/gfx/pics/machoke/frames.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $00, $00, $34, $35, $36, $37, $38, $39, $3a
-	db $3b
-.frame2
-	db $00 ; bitmask
-	db $3c, $3d, $33, $00, $00, $3e, $3f, $36, $37, $38, $40, $3a
-	db $41
-.frame3
-	db $01 ; bitmask
-	db $42, $43, $44, $45, $3a, $46, $47, $48
-.frame4
-	db $02 ; bitmask
-	db $39, $3a, $3b
-.frame5
-	db $02 ; bitmask
-	db $40, $3a, $41
-.frame6
-	db $03 ; bitmask
-	db $3a
-; 0xd4fdf
diff --git a/gfx/pics/machoke/front.2bpp.lz b/gfx/pics/machoke/front.animated.2bpp.lz.f38b95a7
index 984f1601f..984f1601f 100644
--- a/gfx/pics/machoke/front.2bpp.lz
+++ b/gfx/pics/machoke/front.animated.2bpp.lz.f38b95a7
diff --git a/gfx/pics/machoke/front.png b/gfx/pics/machoke/front.png
new file mode 100644
index 000000000..8c496b08b
--- /dev/null
+++ b/gfx/pics/machoke/front.png
diff --git a/gfx/pics/machoke/normal.pal b/gfx/pics/machoke/normal.pal
deleted file mode 100644
index 85f98ff06..000000000
--- a/gfx/pics/machoke/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 16, 17, 11
-	RGB 22, 04, 04
-
diff --git a/gfx/pics/machop/back.2bpp.lz b/gfx/pics/machop/back.2bpp.lz.bc17b50a
index 96e6d00c6..96e6d00c6 100644
--- a/gfx/pics/machop/back.2bpp.lz
+++ b/gfx/pics/machop/back.2bpp.lz.bc17b50a
diff --git a/gfx/pics/machop/back.png b/gfx/pics/machop/back.png
new file mode 100644
index 000000000..e463bd456
--- /dev/null
+++ b/gfx/pics/machop/back.png
diff --git a/gfx/pics/machop/bitmask.asm b/gfx/pics/machop/bitmask.asm
deleted file mode 100644
index f82751c8f..000000000
--- a/gfx/pics/machop/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %11011110
-	db %00000001
-	db %11100111
-	db %00000000
-; 1
-	db %00000000
-	db %00010000
-	db %00000010
-	db %00000000
-; 2
-	db %01000000
-	db %00001000
-	db %00000001
-	db %00000000
-; 0xd2baf
diff --git a/gfx/pics/machop/frames.asm b/gfx/pics/machop/frames.asm
deleted file mode 100644
index 6b834110a..000000000
--- a/gfx/pics/machop/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $00, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $23
-	db $00
-.frame2
-	db $01 ; bitmask
-	db $24, $25
-.frame3
-	db $02 ; bitmask
-	db $26, $27, $28
-; 0xd4fa4
diff --git a/gfx/pics/machop/front.2bpp.lz b/gfx/pics/machop/front.animated.2bpp.lz.0fd8735f
index 3b5404276..3b5404276 100644
--- a/gfx/pics/machop/front.2bpp.lz
+++ b/gfx/pics/machop/front.animated.2bpp.lz.0fd8735f
diff --git a/gfx/pics/machop/front.png b/gfx/pics/machop/front.png
new file mode 100644
index 000000000..4ec28bf2f
--- /dev/null
+++ b/gfx/pics/machop/front.png
diff --git a/gfx/pics/machop/normal.pal b/gfx/pics/machop/normal.pal
deleted file mode 100644
index 75548c0a3..000000000
--- a/gfx/pics/machop/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 17, 11
-	RGB 09, 11, 04
-
diff --git a/gfx/pics/magby/back.2bpp.lz b/gfx/pics/magby/back.2bpp.lz.e50ccadb
index 8746c640e..8746c640e 100644
--- a/gfx/pics/magby/back.2bpp.lz
+++ b/gfx/pics/magby/back.2bpp.lz.e50ccadb
diff --git a/gfx/pics/magby/back.png b/gfx/pics/magby/back.png
new file mode 100644
index 000000000..8d38c2ccb
--- /dev/null
+++ b/gfx/pics/magby/back.png
diff --git a/gfx/pics/magby/bitmask.asm b/gfx/pics/magby/bitmask.asm
deleted file mode 100644
index f65cfcd03..000000000
--- a/gfx/pics/magby/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %11100000
-	db %01011001
-	db %00000000
-	db %00000000
-; 1
-	db %11000100
-	db %11110111
-	db %01111101
-	db %10011111
-	db %00000111
-; 2
-	db %11000000
-	db %11110111
-	db %01111101
-	db %10011111
-	db %00000111
-; 3
-	db %00000000
-	db %00100000
-	db %00001000
-	db %00000000
-	db %00000000
-; 0xd39a0
diff --git a/gfx/pics/magby/frames.asm b/gfx/pics/magby/frames.asm
deleted file mode 100644
index 48e013637..000000000
--- a/gfx/pics/magby/frames.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a
-.frame2
-	db $01 ; bitmask
-	db $2b, $0c, $0d, $2c, $2d, $2e, $12, $13, $14, $2f, $30, $18
-	db $19, $31, $32, $33, $00, $1f, $00, $34, $35, $00, $00, $00
-	db $00
-.frame3
-	db $01 ; bitmask
-	db $36, $0c, $0d, $37, $2d, $2e, $12, $13, $14, $2f, $30, $18
-	db $19, $31, $32, $33, $00, $1f, $00, $34, $35, $00, $00, $00
-	db $00
-.frame4
-	db $02 ; bitmask
-	db $0c, $0d, $37, $2d, $2e, $12, $13, $14, $2f, $30, $18, $19
-	db $31, $32, $33, $00, $1f, $00, $34, $35, $00, $00, $00, $00
-.frame5
-	db $03 ; bitmask
-	db $38, $39
-; 0xd95da
diff --git a/gfx/pics/magby/front.2bpp.lz b/gfx/pics/magby/front.animated.2bpp.lz.172d0807
index b4eac5040..b4eac5040 100644
--- a/gfx/pics/magby/front.2bpp.lz
+++ b/gfx/pics/magby/front.animated.2bpp.lz.172d0807
diff --git a/gfx/pics/magby/front.png b/gfx/pics/magby/front.png
new file mode 100644
index 000000000..a966313d7
--- /dev/null
+++ b/gfx/pics/magby/front.png
diff --git a/gfx/pics/magby/normal.pal b/gfx/pics/magby/normal.pal
deleted file mode 100644
index 3a37ffe0d..000000000
--- a/gfx/pics/magby/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 18, 09
-	RGB 23, 02, 11
-
diff --git a/gfx/pics/magcargo/back.2bpp.lz b/gfx/pics/magcargo/back.2bpp.lz.56b096bc
index 5cafe687a..5cafe687a 100644
--- a/gfx/pics/magcargo/back.2bpp.lz
+++ b/gfx/pics/magcargo/back.2bpp.lz.56b096bc
diff --git a/gfx/pics/magcargo/back.png b/gfx/pics/magcargo/back.png
new file mode 100644
index 000000000..a1db71ec2
--- /dev/null
+++ b/gfx/pics/magcargo/back.png
diff --git a/gfx/pics/magcargo/bitmask.asm b/gfx/pics/magcargo/bitmask.asm
deleted file mode 100644
index 3c212b320..000000000
--- a/gfx/pics/magcargo/bitmask.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-; 0
-	db %10011110
-	db %11100111
-	db %00000001
-	db %00000000
-	db %00000000
-; 1
-	db %10011110
-	db %11100111
-	db %00000001
-	db %11000111
-	db %00000001
-; 0xd37f1
diff --git a/gfx/pics/magcargo/frames.asm b/gfx/pics/magcargo/frames.asm
deleted file mode 100644
index d23c44950..000000000
--- a/gfx/pics/magcargo/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-.frame2
-	db $01 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $30, $31, $2c, $2d, $32, $33
-	db $34, $35, $36, $37, $38, $39
-.frame3
-	db $01 ; bitmask
-	db $24, $25, $3a, $3b, $28, $29, $3c, $2b, $2c, $2d, $2e, $2f
-	db $00, $3d, $36, $3e, $38, $39
-.frame4
-	db $01 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $00, $3d, $36, $00, $38, $39
-; 0xd91ec
diff --git a/gfx/pics/magcargo/front.2bpp.lz b/gfx/pics/magcargo/front.animated.2bpp.lz.53a425f4
index 8b2cda00e..8b2cda00e 100644
--- a/gfx/pics/magcargo/front.2bpp.lz
+++ b/gfx/pics/magcargo/front.animated.2bpp.lz.53a425f4
diff --git a/gfx/pics/magcargo/front.png b/gfx/pics/magcargo/front.png
new file mode 100644
index 000000000..f5be029bf
--- /dev/null
+++ b/gfx/pics/magcargo/front.png
diff --git a/gfx/pics/magcargo/normal.pal b/gfx/pics/magcargo/normal.pal
deleted file mode 100644
index 572d0464a..000000000
--- a/gfx/pics/magcargo/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 07, 09
-	RGB 10, 08, 15
-
diff --git a/gfx/pics/magikarp/back.2bpp.lz b/gfx/pics/magikarp/back.2bpp.lz.7f25810a
index 17100a9c5..17100a9c5 100644
--- a/gfx/pics/magikarp/back.2bpp.lz
+++ b/gfx/pics/magikarp/back.2bpp.lz.7f25810a
diff --git a/gfx/pics/magikarp/back.png b/gfx/pics/magikarp/back.png
new file mode 100644
index 000000000..94efb9b92
--- /dev/null
+++ b/gfx/pics/magikarp/back.png
diff --git a/gfx/pics/magikarp/bitmask.asm b/gfx/pics/magikarp/bitmask.asm
deleted file mode 100644
index 9cd807e7b..000000000
--- a/gfx/pics/magikarp/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00000000
-	db %00000001
-	db %01110001
-	db %00011000
-	db %00000000
-; 1
-	db %00000000
-	db %00000001
-	db %11100001
-	db %00111000
-	db %00001100
-; 2
-	db %00000000
-	db %00000000
-	db %01100001
-	db %00011000
-	db %00000000
-; 0xd3147
diff --git a/gfx/pics/magikarp/frames.asm b/gfx/pics/magikarp/frames.asm
deleted file mode 100644
index cfc25cf10..000000000
--- a/gfx/pics/magikarp/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a
-.frame2
-	db $01 ; bitmask
-	db $24, $2b, $27, $2c, $2d, $2e, $2f, $00, $00, $00
-.frame3
-	db $02 ; bitmask
-	db $25, $27, $28, $29, $2a
-; 0xd5d27
diff --git a/gfx/pics/magikarp/front.2bpp.lz b/gfx/pics/magikarp/front.animated.2bpp.lz.031ee449
index 3ec963c7f..3ec963c7f 100644
--- a/gfx/pics/magikarp/front.2bpp.lz
+++ b/gfx/pics/magikarp/front.animated.2bpp.lz.031ee449
diff --git a/gfx/pics/magikarp/front.png b/gfx/pics/magikarp/front.png
new file mode 100644
index 000000000..6358fcbfc
--- /dev/null
+++ b/gfx/pics/magikarp/front.png
diff --git a/gfx/pics/magikarp/normal.pal b/gfx/pics/magikarp/normal.pal
deleted file mode 100644
index 225333e20..000000000
--- a/gfx/pics/magikarp/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 10, 06
-	RGB 18, 03, 09
-
diff --git a/gfx/pics/magmar/back.2bpp.lz b/gfx/pics/magmar/back.2bpp.lz.6916c87b
index 9b44bab34..9b44bab34 100644
--- a/gfx/pics/magmar/back.2bpp.lz
+++ b/gfx/pics/magmar/back.2bpp.lz.6916c87b
diff --git a/gfx/pics/magmar/back.png b/gfx/pics/magmar/back.png
new file mode 100644
index 000000000..a1ab94d0b
--- /dev/null
+++ b/gfx/pics/magmar/back.png
diff --git a/gfx/pics/magmar/bitmask.asm b/gfx/pics/magmar/bitmask.asm
deleted file mode 100644
index 83d8877b0..000000000
--- a/gfx/pics/magmar/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %11001111
-	db %00110011
-	db %00001100
-	db %00000000
-	db %00000000
-; 1
-	db %00001100
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00001100
-	db %00000010
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000100
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3100
diff --git a/gfx/pics/magmar/frames.asm b/gfx/pics/magmar/frames.asm
deleted file mode 100644
index cfe2d76e5..000000000
--- a/gfx/pics/magmar/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $04, $27, $28, $29, $2a, $2b, $2c, $2d, $2e
-.frame2
-	db $01 ; bitmask
-	db $2f, $30
-.frame3
-	db $02 ; bitmask
-	db $31, $32, $33
-.frame4
-	db $03 ; bitmask
-	db $34, $35
-; 0xd5c56
diff --git a/gfx/pics/magmar/front.2bpp.lz b/gfx/pics/magmar/front.animated.2bpp.lz.0048e21c
index 178afc45f..178afc45f 100644
--- a/gfx/pics/magmar/front.2bpp.lz
+++ b/gfx/pics/magmar/front.animated.2bpp.lz.0048e21c
diff --git a/gfx/pics/magmar/front.png b/gfx/pics/magmar/front.png
new file mode 100644
index 000000000..386cef0a5
--- /dev/null
+++ b/gfx/pics/magmar/front.png
diff --git a/gfx/pics/magmar/normal.pal b/gfx/pics/magmar/normal.pal
deleted file mode 100644
index 71372fd59..000000000
--- a/gfx/pics/magmar/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 20, 00
-	RGB 23, 07, 06
-
diff --git a/gfx/pics/magnemite/back.2bpp.lz b/gfx/pics/magnemite/back.2bpp.lz.e00bd515
index f5cb4f801..f5cb4f801 100644
--- a/gfx/pics/magnemite/back.2bpp.lz
+++ b/gfx/pics/magnemite/back.2bpp.lz.e00bd515
diff --git a/gfx/pics/magnemite/back.png b/gfx/pics/magnemite/back.png
new file mode 100644
index 000000000..a41bbc584
--- /dev/null
+++ b/gfx/pics/magnemite/back.png
diff --git a/gfx/pics/magnemite/bitmask.asm b/gfx/pics/magnemite/bitmask.asm
deleted file mode 100644
index e1a59970a..000000000
--- a/gfx/pics/magnemite/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %10001100
-	db %00010001
-	db %01100011
-	db %00000000
-; 1
-	db %11001100
-	db %00111001
-	db %01100111
-	db %00000000
-; 2
-	db %00000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd2d00
diff --git a/gfx/pics/magnemite/frames.asm b/gfx/pics/magnemite/frames.asm
deleted file mode 100644
index 8bad75545..000000000
--- a/gfx/pics/magnemite/frames.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21
-.frame2
-	db $01 ; bitmask
-	db $19, $1a, $22, $1b, $1c, $23, $24, $25, $1e, $26, $27, $20
-	db $21
-.frame3
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $28, $1e, $1f, $20, $21
-.frame4
-	db $02 ; bitmask
-	db $1d
-.frame5
-	db $02 ; bitmask
-	db $24
-.frame6
-	db $02 ; bitmask
-	db $28
-; 0xd52d0
diff --git a/gfx/pics/magnemite/front.2bpp.lz b/gfx/pics/magnemite/front.animated.2bpp.lz.e4b07135
index fb221be89..fb221be89 100644
--- a/gfx/pics/magnemite/front.2bpp.lz
+++ b/gfx/pics/magnemite/front.animated.2bpp.lz.e4b07135
diff --git a/gfx/pics/magnemite/front.png b/gfx/pics/magnemite/front.png
new file mode 100644
index 000000000..e42c951de
--- /dev/null
+++ b/gfx/pics/magnemite/front.png
diff --git a/gfx/pics/magnemite/normal.pal b/gfx/pics/magnemite/normal.pal
deleted file mode 100644
index 0ac1c9c8e..000000000
--- a/gfx/pics/magnemite/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 15, 17, 24
-	RGB 31, 06, 02
-
diff --git a/gfx/pics/magneton/back.2bpp.lz b/gfx/pics/magneton/back.2bpp.lz.f7a7089b
index c029f8cef..c029f8cef 100644
--- a/gfx/pics/magneton/back.2bpp.lz
+++ b/gfx/pics/magneton/back.2bpp.lz.f7a7089b
diff --git a/gfx/pics/magneton/back.png b/gfx/pics/magneton/back.png
new file mode 100644
index 000000000..1203c90d0
--- /dev/null
+++ b/gfx/pics/magneton/back.png
diff --git a/gfx/pics/magneton/bitmask.asm b/gfx/pics/magneton/bitmask.asm
deleted file mode 100644
index 907401be7..000000000
--- a/gfx/pics/magneton/bitmask.asm
+++ /dev/null
@@ -1,49 +0,0 @@
-; 0
-	db %01000000
-	db %00010000
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %00000100
-	db %00000001
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %10000010
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 4
-	db %00000000
-	db %00000000
-	db %00010000
-	db %00000100
-	db %00000000
-; 5
-	db %00000000
-	db %10000010
-	db %00000000
-	db %00000000
-	db %00000000
-; 6
-	db %00000000
-	db %00000000
-	db %00100000
-	db %00000000
-	db %00000000
-; 7
-	db %10000000
-	db %00000001
-	db %01000001
-	db %00000110
-	db %00000000
-; 0xd2d28
diff --git a/gfx/pics/magneton/frames.asm b/gfx/pics/magneton/frames.asm
deleted file mode 100644
index 845c96593..000000000
--- a/gfx/pics/magneton/frames.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-	dw .frame8
-.frame1
-	db $00 ; bitmask
-	db $24, $25
-.frame2
-	db $01 ; bitmask
-	db $26, $27
-.frame3
-	db $02 ; bitmask
-	db $28, $29
-.frame4
-	db $03 ; bitmask
-	db $2a
-.frame5
-	db $04 ; bitmask
-	db $2b, $2c
-.frame6
-	db $05 ; bitmask
-	db $2d, $2e
-.frame7
-	db $06 ; bitmask
-	db $2f
-.frame8
-	db $07 ; bitmask
-	db $30, $31, $32, $33, $34, $35
-; 0xd52fa
diff --git a/gfx/pics/magneton/front.2bpp.lz b/gfx/pics/magneton/front.animated.2bpp.lz.cd3b65a6
index f7b7a0be0..f7b7a0be0 100644
--- a/gfx/pics/magneton/front.2bpp.lz
+++ b/gfx/pics/magneton/front.animated.2bpp.lz.cd3b65a6
diff --git a/gfx/pics/magneton/front.png b/gfx/pics/magneton/front.png
new file mode 100644
index 000000000..fa77862fd
--- /dev/null
+++ b/gfx/pics/magneton/front.png
diff --git a/gfx/pics/magneton/normal.pal b/gfx/pics/magneton/normal.pal
deleted file mode 100644
index 0ac1c9c8e..000000000
--- a/gfx/pics/magneton/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 15, 17, 24
-	RGB 31, 06, 02
-
diff --git a/gfx/pics/mankey/back.2bpp.lz b/gfx/pics/mankey/back.2bpp.lz.42cb1b61
index 62989a377..62989a377 100644
--- a/gfx/pics/mankey/back.2bpp.lz
+++ b/gfx/pics/mankey/back.2bpp.lz.42cb1b61
diff --git a/gfx/pics/mankey/back.png b/gfx/pics/mankey/back.png
new file mode 100644
index 000000000..ba4901eaa
--- /dev/null
+++ b/gfx/pics/mankey/back.png
diff --git a/gfx/pics/mankey/bitmask.asm b/gfx/pics/mankey/bitmask.asm
deleted file mode 100644
index 51c0e405c..000000000
--- a/gfx/pics/mankey/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %10000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 1
-	db %10011100
-	db %01000011
-	db %10001100
-	db %00000001
-; 2
-	db %01000000
-	db %00001000
-	db %00000000
-	db %00000000
-; 0xd2adc
diff --git a/gfx/pics/mankey/frames.asm b/gfx/pics/mankey/frames.asm
deleted file mode 100644
index 9c18dcf86..000000000
--- a/gfx/pics/mankey/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a
-.frame2
-	db $01 ; bitmask
-	db $1b, $1c, $1d, $1e, $1f, $20, $04, $21, $22, $23, $04
-.frame3
-	db $02 ; bitmask
-	db $24, $25
-; 0xd4d9a
diff --git a/gfx/pics/mankey/front.2bpp.lz b/gfx/pics/mankey/front.animated.2bpp.lz.48eac19a
index 03d014d87..03d014d87 100644
--- a/gfx/pics/mankey/front.2bpp.lz
+++ b/gfx/pics/mankey/front.animated.2bpp.lz.48eac19a
diff --git a/gfx/pics/mankey/front.png b/gfx/pics/mankey/front.png
new file mode 100644
index 000000000..1c0c21485
--- /dev/null
+++ b/gfx/pics/mankey/front.png
diff --git a/gfx/pics/mankey/normal.pal b/gfx/pics/mankey/normal.pal
deleted file mode 100644
index 3e432d117..000000000
--- a/gfx/pics/mankey/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 20, 11
-	RGB 19, 09, 07
-
diff --git a/gfx/pics/mantine/back.2bpp.lz b/gfx/pics/mantine/back.2bpp.lz.1320b7f3
index 3378e2df5..3378e2df5 100644
--- a/gfx/pics/mantine/back.2bpp.lz
+++ b/gfx/pics/mantine/back.2bpp.lz.1320b7f3
diff --git a/gfx/pics/mantine/back.png b/gfx/pics/mantine/back.png
new file mode 100644
index 000000000..dfb363f40
--- /dev/null
+++ b/gfx/pics/mantine/back.png
diff --git a/gfx/pics/mantine/bitmask.asm b/gfx/pics/mantine/bitmask.asm
deleted file mode 100644
index 30756d325..000000000
--- a/gfx/pics/mantine/bitmask.asm
+++ /dev/null
@@ -1,49 +0,0 @@
-; 0
-	db %01110000
-	db %00110000
-	db %00011010
-	db %00110000
-	db %00011000
-	db %00011100
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %00000010
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %01100000
-	db %00110000
-	db %00000010
-	db %00110000
-	db %00011000
-	db %00001100
-	db %00000000
-; 3
-	db %01110000
-	db %00110000
-	db %00011000
-	db %00110000
-	db %00011000
-	db %00011100
-	db %00000000
-; 4
-	db %01100000
-	db %00110000
-	db %00000000
-	db %00110000
-	db %00011000
-	db %00001100
-	db %00000000
-; 5
-	db %00000000
-	db %00000100
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd387a
diff --git a/gfx/pics/mantine/frames.asm b/gfx/pics/mantine/frames.asm
deleted file mode 100644
index 37768e7e5..000000000
--- a/gfx/pics/mantine/frames.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f
-.frame2
-	db $01 ; bitmask
-	db $36
-.frame3
-	db $02 ; bitmask
-	db $40, $41, $42, $43, $36, $04, $44, $45, $46, $47, $48
-.frame4
-	db $03 ; bitmask
-	db $31, $32, $33, $34, $35, $37, $38, $39, $3a, $3b, $3c, $3d
-	db $3e, $3f
-.frame5
-	db $04 ; bitmask
-	db $40, $41, $42, $43, $04, $44, $45, $46, $47, $48
-.frame6
-	db $05 ; bitmask
-	db $49, $4a
-; 0xd9302
diff --git a/gfx/pics/mantine/front.2bpp.lz b/gfx/pics/mantine/front.animated.2bpp.lz.9eb40d04
index 6ebc14050..6ebc14050 100644
--- a/gfx/pics/mantine/front.2bpp.lz
+++ b/gfx/pics/mantine/front.animated.2bpp.lz.9eb40d04
diff --git a/gfx/pics/mantine/front.png b/gfx/pics/mantine/front.png
new file mode 100644
index 000000000..1102eb41b
--- /dev/null
+++ b/gfx/pics/mantine/front.png
diff --git a/gfx/pics/mantine/normal.pal b/gfx/pics/mantine/normal.pal
deleted file mode 100644
index ff9214da9..000000000
--- a/gfx/pics/mantine/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 16, 31
-	RGB 10, 03, 21
-
diff --git a/gfx/pics/mareep/back.2bpp.lz b/gfx/pics/mareep/back.2bpp.lz.b9bdc89c
index e703d450f..e703d450f 100644
--- a/gfx/pics/mareep/back.2bpp.lz
+++ b/gfx/pics/mareep/back.2bpp.lz.b9bdc89c
diff --git a/gfx/pics/mareep/back.png b/gfx/pics/mareep/back.png
new file mode 100644
index 000000000..f0a89696c
--- /dev/null
+++ b/gfx/pics/mareep/back.png
diff --git a/gfx/pics/mareep/bitmask.asm b/gfx/pics/mareep/bitmask.asm
deleted file mode 100644
index 7dcdb9300..000000000
--- a/gfx/pics/mareep/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %01111000
-	db %01001100
-	db %11101001
-	db %00000000
-; 1
-	db %00001000
-	db %00000001
-	db %00000000
-	db %00000000
-; 0xd34f8
diff --git a/gfx/pics/mareep/frames.asm b/gfx/pics/mareep/frames.asm
deleted file mode 100644
index 180c3e45f..000000000
--- a/gfx/pics/mareep/frames.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $23, $24
-.frame2
-	db $01 ; bitmask
-	db $25, $26
-; 0xd8a0d
diff --git a/gfx/pics/mareep/front.2bpp.lz b/gfx/pics/mareep/front.animated.2bpp.lz.f660483d
index 0245a96cd..0245a96cd 100644
--- a/gfx/pics/mareep/front.2bpp.lz
+++ b/gfx/pics/mareep/front.animated.2bpp.lz.f660483d
diff --git a/gfx/pics/mareep/front.png b/gfx/pics/mareep/front.png
new file mode 100644
index 000000000..3ab91d605
--- /dev/null
+++ b/gfx/pics/mareep/front.png
diff --git a/gfx/pics/mareep/normal.pal b/gfx/pics/mareep/normal.pal
deleted file mode 100644
index 9b9174f67..000000000
--- a/gfx/pics/mareep/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 20, 07
-	RGB 10, 05, 19
-
diff --git a/gfx/pics/marill/back.2bpp.lz b/gfx/pics/marill/back.2bpp.lz.87e2be16
index 699fdaf6c..699fdaf6c 100644
--- a/gfx/pics/marill/back.2bpp.lz
+++ b/gfx/pics/marill/back.2bpp.lz.87e2be16
diff --git a/gfx/pics/marill/back.png b/gfx/pics/marill/back.png
new file mode 100644
index 000000000..59af13b35
--- /dev/null
+++ b/gfx/pics/marill/back.png
diff --git a/gfx/pics/marill/bitmask.asm b/gfx/pics/marill/bitmask.asm
deleted file mode 100644
index 8c8fc0802..000000000
--- a/gfx/pics/marill/bitmask.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-; 0
-	db %01000000
-	db %00001000
-	db %11100110
-	db %00000001
-; 1
-	db %01000110
-	db %00001000
-	db %11100111
-	db %00000001
-; 2
-	db %00000000
-	db %00000000
-	db %11100110
-	db %00000001
-; 3
-	db %01000000
-	db %00001000
-	db %00000000
-	db %00000000
-; 0xd356b
diff --git a/gfx/pics/marill/frames.asm b/gfx/pics/marill/frames.asm
deleted file mode 100644
index 04ab38489..000000000
--- a/gfx/pics/marill/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20
-.frame2
-	db $01 ; bitmask
-	db $21, $22, $23, $24, $25, $26, $27, $28, $29, $2a, $2b
-.frame3
-	db $02 ; bitmask
-	db $1b, $1c, $1d, $1e, $1f, $20
-.frame4
-	db $03 ; bitmask
-	db $23, $24
-.frame5
-	db $03 ; bitmask
-	db $19, $1a
-; 0xd8b25
diff --git a/gfx/pics/marill/front.2bpp.lz b/gfx/pics/marill/front.animated.2bpp.lz.7f742686
index abe4c982a..abe4c982a 100644
--- a/gfx/pics/marill/front.2bpp.lz
+++ b/gfx/pics/marill/front.animated.2bpp.lz.7f742686
diff --git a/gfx/pics/marill/front.png b/gfx/pics/marill/front.png
new file mode 100644
index 000000000..5b07959aa
--- /dev/null
+++ b/gfx/pics/marill/front.png
diff --git a/gfx/pics/marill/normal.pal b/gfx/pics/marill/normal.pal
deleted file mode 100644
index 048adb0fd..000000000
--- a/gfx/pics/marill/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 09, 13, 29
-	RGB 25, 08, 05
-
diff --git a/gfx/pics/marowak/back.2bpp.lz b/gfx/pics/marowak/back.2bpp.lz.055ba40e
index 90a297b3d..90a297b3d 100644
--- a/gfx/pics/marowak/back.2bpp.lz
+++ b/gfx/pics/marowak/back.2bpp.lz.055ba40e
diff --git a/gfx/pics/marowak/back.png b/gfx/pics/marowak/back.png
new file mode 100644
index 000000000..e10e17dc2
--- /dev/null
+++ b/gfx/pics/marowak/back.png
diff --git a/gfx/pics/marowak/bitmask.asm b/gfx/pics/marowak/bitmask.asm
deleted file mode 100644
index 2d53ac4d7..000000000
--- a/gfx/pics/marowak/bitmask.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-; 0
-	db %11000111
-	db %10010000
-	db %11000111
-	db %10110110
-	db %00001001
-; 1
-	db %11000111
-	db %10010000
-	db %11000011
-	db %10111110
-	db %00001111
-; 2
-	db %11000111
-	db %00010000
-	db %00000100
-	db %00000000
-	db %00000000
-; 3
-	db %11000111
-	db %00010000
-	db %00000000
-	db %00000000
-	db %00000000
-; 4
-	db %00000000
-	db %00000000
-	db %11000011
-	db %00110000
-	db %00001000
-; 0xd2f31
diff --git a/gfx/pics/marowak/frames.asm b/gfx/pics/marowak/frames.asm
deleted file mode 100644
index 7f0a506f1..000000000
--- a/gfx/pics/marowak/frames.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $30, $31, $32, $33, $34, $35, $36
-.frame2
-	db $01 ; bitmask
-	db $37, $38, $03, $39, $3a, $3b, $2a, $2b, $2c, $2e, $2f, $30
-	db $31, $3c, $32, $33, $34, $35, $3d, $3e, $36
-.frame3
-	db $02 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2d
-.frame4
-	db $03 ; bitmask
-	db $37, $38, $03, $39, $3a, $3b
-.frame5
-	db $04 ; bitmask
-	db $2b, $2c, $2e, $2f, $32, $33, $36
-; 0xd57c8
diff --git a/gfx/pics/marowak/front.2bpp.lz b/gfx/pics/marowak/front.animated.2bpp.lz.ef1553a0
index 59f984bcd..59f984bcd 100644
--- a/gfx/pics/marowak/front.2bpp.lz
+++ b/gfx/pics/marowak/front.animated.2bpp.lz.ef1553a0
diff --git a/gfx/pics/marowak/front.png b/gfx/pics/marowak/front.png
new file mode 100644
index 000000000..4007d0486
--- /dev/null
+++ b/gfx/pics/marowak/front.png
diff --git a/gfx/pics/marowak/normal.pal b/gfx/pics/marowak/normal.pal
deleted file mode 100644
index eb2ec4b7b..000000000
--- a/gfx/pics/marowak/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 19, 12
-	RGB 16, 10, 04
-
diff --git a/gfx/pics/meganium/back.2bpp.lz b/gfx/pics/meganium/back.2bpp.lz.d25a5edb
index 718f66f87..718f66f87 100644
--- a/gfx/pics/meganium/back.2bpp.lz
+++ b/gfx/pics/meganium/back.2bpp.lz.d25a5edb
diff --git a/gfx/pics/meganium/back.png b/gfx/pics/meganium/back.png
new file mode 100644
index 000000000..5f51bdbff
--- /dev/null
+++ b/gfx/pics/meganium/back.png
diff --git a/gfx/pics/meganium/bitmask.asm b/gfx/pics/meganium/bitmask.asm
deleted file mode 100644
index 166f67518..000000000
--- a/gfx/pics/meganium/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %10000000
-	db %11000111
-	db %11100011
-	db %11110001
-	db %01111000
-	db %00011100
-	db %00000000
-; 1
-	db %10000111
-	db %11000111
-	db %11100011
-	db %11110001
-	db %01111000
-	db %00011100
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %10000000
-	db %11000000
-	db %01100000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00100000
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd335d
diff --git a/gfx/pics/meganium/frames.asm b/gfx/pics/meganium/frames.asm
deleted file mode 100644
index f167fec7c..000000000
--- a/gfx/pics/meganium/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f, $40, $00, $00, $00, $00, $00, $00, $00
-.frame2
-	db $01 ; bitmask
-	db $31, $41, $42, $35, $36, $43, $34, $44, $45, $46, $47, $3d
-	db $48, $49, $4a, $00, $00, $4b, $40, $00, $00, $00, $00, $00
-	db $00, $00
-.frame3
-	db $02 ; bitmask
-	db $4c, $4d, $4e, $4f, $50
-.frame4
-	db $03 ; bitmask
-	db $51, $52
-; 0xd84a7
diff --git a/gfx/pics/meganium/front.2bpp.lz b/gfx/pics/meganium/front.animated.2bpp.lz.fe0b9df4
index 84f600d60..84f600d60 100644
--- a/gfx/pics/meganium/front.2bpp.lz
+++ b/gfx/pics/meganium/front.animated.2bpp.lz.fe0b9df4
diff --git a/gfx/pics/meganium/front.png b/gfx/pics/meganium/front.png
new file mode 100644
index 000000000..f520626a9
--- /dev/null
+++ b/gfx/pics/meganium/front.png
diff --git a/gfx/pics/meganium/normal.pal b/gfx/pics/meganium/normal.pal
deleted file mode 100644
index 2186bdc28..000000000
--- a/gfx/pics/meganium/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 13, 24, 03
-	RGB 21, 01, 10
-
diff --git a/gfx/pics/meowth/back.2bpp.lz b/gfx/pics/meowth/back.2bpp.lz.4196bd91
index 205b106e9..205b106e9 100644
--- a/gfx/pics/meowth/back.2bpp.lz
+++ b/gfx/pics/meowth/back.2bpp.lz.4196bd91
diff --git a/gfx/pics/meowth/back.png b/gfx/pics/meowth/back.png
new file mode 100644
index 000000000..3883a636b
--- /dev/null
+++ b/gfx/pics/meowth/back.png
diff --git a/gfx/pics/meowth/bitmask.asm b/gfx/pics/meowth/bitmask.asm
deleted file mode 100644
index cde515e01..000000000
--- a/gfx/pics/meowth/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %10000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %10011000
-	db %01110111
-	db %00000000
-; 2
-	db %11000000
-	db %00011000
-	db %00000000
-	db %00000000
-; 0xd2a82
diff --git a/gfx/pics/meowth/frames.asm b/gfx/pics/meowth/frames.asm
deleted file mode 100644
index 26c2aaea9..000000000
--- a/gfx/pics/meowth/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a
-.frame2
-	db $01 ; bitmask
-	db $1b, $1c, $1d, $1e, $1f, $20, $04, $04, $21
-.frame3
-	db $01 ; bitmask
-	db $1b, $1c, $1d, $1e, $22, $23, $04, $04, $21
-.frame4
-	db $02 ; bitmask
-	db $24, $25, $1b, $1c
-; 0xd4cbf
diff --git a/gfx/pics/meowth/front.2bpp.lz b/gfx/pics/meowth/front.animated.2bpp.lz.144f12f0
index 87ff35366..87ff35366 100644
--- a/gfx/pics/meowth/front.2bpp.lz
+++ b/gfx/pics/meowth/front.animated.2bpp.lz.144f12f0
diff --git a/gfx/pics/meowth/front.png b/gfx/pics/meowth/front.png
new file mode 100644
index 000000000..55c5bf38a
--- /dev/null
+++ b/gfx/pics/meowth/front.png
diff --git a/gfx/pics/meowth/normal.pal b/gfx/pics/meowth/normal.pal
deleted file mode 100644
index ed418e46d..000000000
--- a/gfx/pics/meowth/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 27, 13
-	RGB 20, 08, 03
-
diff --git a/gfx/pics/metapod/back.2bpp.lz b/gfx/pics/metapod/back.2bpp.lz.b580afc8
index a2a446960..a2a446960 100644
--- a/gfx/pics/metapod/back.2bpp.lz
+++ b/gfx/pics/metapod/back.2bpp.lz.b580afc8
diff --git a/gfx/pics/metapod/back.png b/gfx/pics/metapod/back.png
new file mode 100644
index 000000000..7906fb6b7
--- /dev/null
+++ b/gfx/pics/metapod/back.png
diff --git a/gfx/pics/metapod/bitmask.asm b/gfx/pics/metapod/bitmask.asm
deleted file mode 100644
index 1041f7ee5..000000000
--- a/gfx/pics/metapod/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %10001000
-	db %00111001
-	db %00000111
-	db %00000000
-; 1
-	db %10011000
-	db %00111011
-	db %00000111
-	db %00000000
-; 2
-	db %00000000
-	db %00001000
-	db %00000001
-	db %00000000
-; 0xd27b9
diff --git a/gfx/pics/metapod/frames.asm b/gfx/pics/metapod/frames.asm
deleted file mode 100644
index acde5cf10..000000000
--- a/gfx/pics/metapod/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21
-.frame2
-	db $01 ; bitmask
-	db $00, $22, $23, $24, $25, $26, $27, $28, $29, $2a, $21
-.frame3
-	db $02 ; bitmask
-	db $1c, $1f
-.frame4
-	db $02 ; bitmask
-	db $26, $29
-; 0xd441f
diff --git a/gfx/pics/metapod/front.2bpp.lz b/gfx/pics/metapod/front.animated.2bpp.lz.5025baa2
index 1dcd7a501..1dcd7a501 100644
--- a/gfx/pics/metapod/front.2bpp.lz
+++ b/gfx/pics/metapod/front.animated.2bpp.lz.5025baa2
diff --git a/gfx/pics/metapod/front.png b/gfx/pics/metapod/front.png
new file mode 100644
index 000000000..d67b1c516
--- /dev/null
+++ b/gfx/pics/metapod/front.png
diff --git a/gfx/pics/metapod/normal.pal b/gfx/pics/metapod/normal.pal
deleted file mode 100644
index c171dafcc..000000000
--- a/gfx/pics/metapod/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 15, 31, 00
-	RGB 09, 14, 01
-
diff --git a/gfx/pics/mew/back.2bpp.lz b/gfx/pics/mew/back.2bpp.lz.9947d6eb
index 388a8de9e..388a8de9e 100644
--- a/gfx/pics/mew/back.2bpp.lz
+++ b/gfx/pics/mew/back.2bpp.lz.9947d6eb
diff --git a/gfx/pics/mew/back.png b/gfx/pics/mew/back.png
new file mode 100644
index 000000000..310328a39
--- /dev/null
+++ b/gfx/pics/mew/back.png
diff --git a/gfx/pics/mew/bitmask.asm b/gfx/pics/mew/bitmask.asm
deleted file mode 100644
index 2d76b105a..000000000
--- a/gfx/pics/mew/bitmask.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-; 0
-	db %10000000
-	db %00010001
-	db %00000000
-	db %00000000
-; 1
-	db %10000000
-	db %00011001
-	db %00000000
-	db %00000000
-; 2
-	db %11101010
-	db %01111111
-	db %11110111
-	db %00000000
-; 3
-	db %10000000
-	db %00001000
-	db %00000000
-	db %00000000
-; 4
-	db %00000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd3319
diff --git a/gfx/pics/mew/frames.asm b/gfx/pics/mew/frames.asm
deleted file mode 100644
index 6df894813..000000000
--- a/gfx/pics/mew/frames.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b
-.frame2
-	db $01 ; bitmask
-	db $1c, $1a, $1d, $1b
-.frame3
-	db $02 ; bitmask
-	db $1e, $1f, $20, $21, $22, $23, $24, $25, $26, $27, $28, $29
-	db $2a, $2b, $2c, $2d, $2e, $2f, $30
-.frame4
-	db $03 ; bitmask
-	db $31, $1d
-.frame5
-	db $04 ; bitmask
-	db $1b
-; 0xd6240
diff --git a/gfx/pics/mew/front.2bpp.lz b/gfx/pics/mew/front.animated.2bpp.lz.b6da9713
index 240965783..240965783 100644
--- a/gfx/pics/mew/front.2bpp.lz
+++ b/gfx/pics/mew/front.animated.2bpp.lz.b6da9713
diff --git a/gfx/pics/mew/front.png b/gfx/pics/mew/front.png
new file mode 100644
index 000000000..2a93d8303
--- /dev/null
+++ b/gfx/pics/mew/front.png
diff --git a/gfx/pics/mew/normal.pal b/gfx/pics/mew/normal.pal
deleted file mode 100644
index c01d4ab54..000000000
--- a/gfx/pics/mew/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 15, 31
-	RGB 07, 11, 26
-
diff --git a/gfx/pics/mewtwo/back.2bpp.lz b/gfx/pics/mewtwo/back.2bpp.lz.a7d2c077
index 3be56c470..3be56c470 100644
--- a/gfx/pics/mewtwo/back.2bpp.lz
+++ b/gfx/pics/mewtwo/back.2bpp.lz.a7d2c077
diff --git a/gfx/pics/mewtwo/back.png b/gfx/pics/mewtwo/back.png
new file mode 100644
index 000000000..e9675aaad
--- /dev/null
+++ b/gfx/pics/mewtwo/back.png
diff --git a/gfx/pics/mewtwo/bitmask.asm b/gfx/pics/mewtwo/bitmask.asm
deleted file mode 100644
index 738bcddf3..000000000
--- a/gfx/pics/mewtwo/bitmask.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00110000
-	db %11011100
-	db %00001110
-	db %00000111
-	db %00000011
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %11000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00011100
-	db %00111110
-	db %11011110
-	db %10001111
-	db %11000111
-	db %01100011
-	db %00000000
-; 4
-	db %00011100
-	db %11111110
-	db %11111111
-	db %11111111
-	db %11100111
-	db %01100011
-	db %00000000
-; 0xd3305
diff --git a/gfx/pics/mewtwo/frames.asm b/gfx/pics/mewtwo/frames.asm
deleted file mode 100644
index e948bc6ab..000000000
--- a/gfx/pics/mewtwo/frames.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31
-.frame2
-	db $01 ; bitmask
-	db $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c, $3d
-	db $3e, $3f, $40
-.frame3
-	db $02 ; bitmask
-	db $37, $38
-.frame4
-	db $03 ; bitmask
-	db $00, $41, $00, $42, $43, $44, $32, $33, $45, $34, $35, $36
-	db $37, $38, $46, $39, $3a, $3b, $47, $3c, $3d, $3e, $48, $49
-	db $3f, $40, $4a, $4b
-.frame5
-	db $04 ; bitmask
-	db $00, $41, $00, $42, $43, $44, $32, $33, $4c, $4d, $4e, $45
-	db $34, $35, $36, $4f, $50, $51, $46, $39, $3a, $3b, $52, $53
-	db $54, $47, $3c, $3d, $3e, $00, $48, $49, $3f, $40, $4a, $4b
-; 0xd6214
diff --git a/gfx/pics/mewtwo/front.2bpp.lz b/gfx/pics/mewtwo/front.animated.2bpp.lz.45e8b40d
index 35cc2c378..35cc2c378 100644
--- a/gfx/pics/mewtwo/front.2bpp.lz
+++ b/gfx/pics/mewtwo/front.animated.2bpp.lz.45e8b40d
diff --git a/gfx/pics/mewtwo/front.png b/gfx/pics/mewtwo/front.png
new file mode 100644
index 000000000..07ab0771b
--- /dev/null
+++ b/gfx/pics/mewtwo/front.png
diff --git a/gfx/pics/mewtwo/normal.pal b/gfx/pics/mewtwo/normal.pal
deleted file mode 100644
index b32f017f5..000000000
--- a/gfx/pics/mewtwo/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 22, 20, 25
-	RGB 16, 05, 20
-
diff --git a/gfx/pics/miltank/back.2bpp.lz b/gfx/pics/miltank/back.2bpp.lz.b7787e72
index 150f65c54..150f65c54 100644
--- a/gfx/pics/miltank/back.2bpp.lz
+++ b/gfx/pics/miltank/back.2bpp.lz.b7787e72
diff --git a/gfx/pics/miltank/back.png b/gfx/pics/miltank/back.png
new file mode 100644
index 000000000..28c4a906f
--- /dev/null
+++ b/gfx/pics/miltank/back.png
diff --git a/gfx/pics/miltank/bitmask.asm b/gfx/pics/miltank/bitmask.asm
deleted file mode 100644
index ad082638a..000000000
--- a/gfx/pics/miltank/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %10001100
-	db %01100011
-	db %00011000
-	db %10001110
-	db %00000001
-; 1
-	db %10111100
-	db %01101011
-	db %11011000
-	db %10111110
-	db %00000001
-; 2
-	db %00000000
-	db %00100000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd39af
diff --git a/gfx/pics/miltank/frames.asm b/gfx/pics/miltank/frames.asm
deleted file mode 100644
index 04b5427d0..000000000
--- a/gfx/pics/miltank/frames.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $00, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e
-	db $00, $2f
-.frame2
-	db $01 ; bitmask
-	db $24, $00, $30, $31, $25, $26, $27, $32, $28, $29, $2a, $2b
-	db $33, $34, $2c, $2d, $2e, $35, $36, $00, $2f
-.frame3
-	db $02 ; bitmask
-	db $28
-; 0xd9607
diff --git a/gfx/pics/miltank/front.2bpp.lz b/gfx/pics/miltank/front.animated.2bpp.lz.91da7c3b
index 969d04fcd..969d04fcd 100644
--- a/gfx/pics/miltank/front.2bpp.lz
+++ b/gfx/pics/miltank/front.animated.2bpp.lz.91da7c3b
diff --git a/gfx/pics/miltank/front.png b/gfx/pics/miltank/front.png
new file mode 100644
index 000000000..b0965c8f6
--- /dev/null
+++ b/gfx/pics/miltank/front.png
diff --git a/gfx/pics/miltank/normal.pal b/gfx/pics/miltank/normal.pal
deleted file mode 100644
index a3669a307..000000000
--- a/gfx/pics/miltank/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 15, 18
-	RGB 06, 06, 13
-
diff --git a/gfx/pics/misdreavus/back.2bpp.lz b/gfx/pics/misdreavus/back.2bpp.lz.8bdebfce
index 5cf96e821..5cf96e821 100644
--- a/gfx/pics/misdreavus/back.2bpp.lz
+++ b/gfx/pics/misdreavus/back.2bpp.lz.8bdebfce
diff --git a/gfx/pics/misdreavus/back.png b/gfx/pics/misdreavus/back.png
new file mode 100644
index 000000000..890f1da22
--- /dev/null
+++ b/gfx/pics/misdreavus/back.png
diff --git a/gfx/pics/misdreavus/bitmask.asm b/gfx/pics/misdreavus/bitmask.asm
deleted file mode 100644
index 4f05efbf4..000000000
--- a/gfx/pics/misdreavus/bitmask.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %01100000
-	db %00011000
-	db %00000110
-; 1
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00010000
-	db %00000000
-; 0xd3693
diff --git a/gfx/pics/misdreavus/frames.asm b/gfx/pics/misdreavus/frames.asm
deleted file mode 100644
index f5507980b..000000000
--- a/gfx/pics/misdreavus/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29
-.frame2
-	db $00 ; bitmask
-	db $2a, $2b, $2c, $2d, $2e, $2f
-.frame3
-	db $01 ; bitmask
-	db $2d
-.frame4
-	db $00 ; bitmask
-	db $30, $31, $32, $33, $34, $35
-; 0xd8de4
diff --git a/gfx/pics/misdreavus/front.2bpp.lz b/gfx/pics/misdreavus/front.animated.2bpp.lz.5f73baa2
index 76f5c6919..76f5c6919 100644
--- a/gfx/pics/misdreavus/front.2bpp.lz
+++ b/gfx/pics/misdreavus/front.animated.2bpp.lz.5f73baa2
diff --git a/gfx/pics/misdreavus/front.png b/gfx/pics/misdreavus/front.png
new file mode 100644
index 000000000..05c2dd338
--- /dev/null
+++ b/gfx/pics/misdreavus/front.png
diff --git a/gfx/pics/misdreavus/normal.pal b/gfx/pics/misdreavus/normal.pal
deleted file mode 100644
index dc04cfdbf..000000000
--- a/gfx/pics/misdreavus/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 06, 19
-	RGB 09, 09, 17
-
diff --git a/gfx/pics/moltres/back.2bpp.lz b/gfx/pics/moltres/back.2bpp.lz.356242c8
index 542a73138..542a73138 100644
--- a/gfx/pics/moltres/back.2bpp.lz
+++ b/gfx/pics/moltres/back.2bpp.lz.356242c8
diff --git a/gfx/pics/moltres/back.png b/gfx/pics/moltres/back.png
new file mode 100644
index 000000000..b8df5c699
--- /dev/null
+++ b/gfx/pics/moltres/back.png
diff --git a/gfx/pics/moltres/bitmask.asm b/gfx/pics/moltres/bitmask.asm
deleted file mode 100644
index b5cf7908e..000000000
--- a/gfx/pics/moltres/bitmask.asm
+++ /dev/null
@@ -1,57 +0,0 @@
-; 0
-	db %10000001
-	db %01000001
-	db %00000000
-	db %00010000
-	db %11001100
-	db %11111111
-	db %00000001
-; 1
-	db %00011110
-	db %10001111
-	db %00000011
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %10011111
-	db %11001111
-	db %00000011
-	db %00010000
-	db %11001100
-	db %11111111
-	db %00000001
-; 3
-	db %10011111
-	db %11001111
-	db %00000011
-	db %00000000
-	db %10000100
-	db %11000011
-	db %00000001
-; 4
-	db %00010000
-	db %00001000
-	db %00000000
-	db %00000000
-	db %10000100
-	db %11000011
-	db %00000001
-; 5
-	db %00000000
-	db %00000100
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 6
-	db %10000001
-	db %01000101
-	db %00000000
-	db %00010000
-	db %01001000
-	db %00111100
-	db %00000000
-; 0xd3291
diff --git a/gfx/pics/moltres/frames.asm b/gfx/pics/moltres/frames.asm
deleted file mode 100644
index 2db9205cb..000000000
--- a/gfx/pics/moltres/frames.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $05, $34, $35, $36, $37, $38, $39, $3a, $3b
-	db $3c, $3d, $3e, $3f, $40, $05
-.frame2
-	db $01 ; bitmask
-	db $41, $42, $43, $44, $45, $46, $47, $48, $49, $4a, $4b
-.frame3
-	db $02 ; bitmask
-	db $31, $41, $42, $43, $44, $32, $45, $46, $47, $48, $05, $49
-	db $4a, $4b, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c, $3d
-	db $3e, $3f, $40, $05
-.frame4
-	db $03 ; bitmask
-	db $31, $41, $42, $43, $44, $32, $45, $46, $47, $48, $05, $49
-	db $4a, $4b, $35, $4c, $4d, $4e, $05, $3d, $4e
-.frame5
-	db $04 ; bitmask
-	db $4f, $50, $35, $4c, $4d, $4e, $05, $3d, $4e
-.frame6
-	db $05 ; bitmask
-	db $51
-.frame7
-	db $06 ; bitmask
-	db $31, $32, $33, $51, $05, $34, $36, $37, $3b, $3c, $3d, $3e
-; 0xd610f
diff --git a/gfx/pics/moltres/front.2bpp.lz b/gfx/pics/moltres/front.animated.2bpp.lz.281bc0ec
index ec03e4653..ec03e4653 100644
--- a/gfx/pics/moltres/front.2bpp.lz
+++ b/gfx/pics/moltres/front.animated.2bpp.lz.281bc0ec
diff --git a/gfx/pics/moltres/front.png b/gfx/pics/moltres/front.png
new file mode 100644
index 000000000..fa41824b6
--- /dev/null
+++ b/gfx/pics/moltres/front.png
diff --git a/gfx/pics/moltres/normal.pal b/gfx/pics/moltres/normal.pal
deleted file mode 100644
index 74fbaa204..000000000
--- a/gfx/pics/moltres/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 22, 00
-	RGB 31, 12, 03
-
diff --git a/gfx/pics/mr__mime/back.2bpp.lz b/gfx/pics/mr__mime/back.2bpp.lz.0fb88006
index eb1647580..eb1647580 100644
--- a/gfx/pics/mr__mime/back.2bpp.lz
+++ b/gfx/pics/mr__mime/back.2bpp.lz.0fb88006
diff --git a/gfx/pics/mr__mime/back.png b/gfx/pics/mr__mime/back.png
new file mode 100644
index 000000000..6deab1929
--- /dev/null
+++ b/gfx/pics/mr__mime/back.png
diff --git a/gfx/pics/mr__mime/bitmask.asm b/gfx/pics/mr__mime/bitmask.asm
deleted file mode 100644
index b401ed87b..000000000
--- a/gfx/pics/mr__mime/bitmask.asm
+++ /dev/null
@@ -1,49 +0,0 @@
-; 0
-	db %10001110
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %10011110
-	db %00000111
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %10011110
-	db %01000111
-	db %01111000
-	db %00011110
-	db %00000110
-; 3
-	db %10001110
-	db %01000001
-	db %01111000
-	db %00011110
-	db %00000110
-; 4
-	db %00000000
-	db %01000000
-	db %01111000
-	db %00011110
-	db %00000110
-; 5
-	db %00000000
-	db %00100000
-	db %00000000
-	db %00000000
-	db %00000000
-; 6
-	db %00000000
-	db %00000000
-	db %01000000
-	db %00011100
-	db %00000111
-; 7
-	db %10011110
-	db %00000111
-	db %01000000
-	db %00011100
-	db %00000111
-; 0xd30ad
diff --git a/gfx/pics/mr__mime/frames.asm b/gfx/pics/mr__mime/frames.asm
deleted file mode 100644
index d4bbe4b31..000000000
--- a/gfx/pics/mr__mime/frames.asm
+++ /dev/null
@@ -1,36 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-	dw .frame8
-.frame1
-	db $00 ; bitmask
-	db $00, $24, $25, $26, $27
-.frame2
-	db $01 ; bitmask
-	db $00, $00, $28, $29, $26, $2a, $2b, $2c
-.frame3
-	db $02 ; bitmask
-	db $00, $00, $28, $29, $26, $2a, $2b, $2c, $2d, $2e, $2f, $30
-	db $31, $32, $33, $34, $35, $36, $00
-.frame4
-	db $03 ; bitmask
-	db $00, $24, $25, $26, $27, $2d, $2e, $2f, $30, $31, $32, $33
-	db $34, $35, $36, $00
-.frame5
-	db $04 ; bitmask
-	db $2d, $2e, $2f, $30, $31, $32, $33, $34, $35, $36, $00
-.frame6
-	db $05 ; bitmask
-	db $37
-.frame7
-	db $06 ; bitmask
-	db $31, $38, $39, $35, $3a, $3b, $00
-.frame8
-	db $07 ; bitmask
-	db $00, $00, $28, $29, $26, $2a, $2b, $2c, $31, $38, $39, $35
-	db $3a, $3b, $00
-; 0xd5b60
diff --git a/gfx/pics/mr__mime/front.2bpp.lz b/gfx/pics/mr__mime/front.animated.2bpp.lz.f948d1b8
index 48555cbe0..48555cbe0 100644
--- a/gfx/pics/mr__mime/front.2bpp.lz
+++ b/gfx/pics/mr__mime/front.animated.2bpp.lz.f948d1b8
diff --git a/gfx/pics/mr__mime/front.png b/gfx/pics/mr__mime/front.png
new file mode 100644
index 000000000..578a0286b
--- /dev/null
+++ b/gfx/pics/mr__mime/front.png
diff --git a/gfx/pics/mr__mime/normal.pal b/gfx/pics/mr__mime/normal.pal
deleted file mode 100644
index 8dd10edc5..000000000
--- a/gfx/pics/mr__mime/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 11, 31
-	RGB 28, 07, 13
-
diff --git a/gfx/pics/muk/back.2bpp.lz b/gfx/pics/muk/back.2bpp.lz.a1f2f370
index 63a6aa8de..63a6aa8de 100644
--- a/gfx/pics/muk/back.2bpp.lz
+++ b/gfx/pics/muk/back.2bpp.lz.a1f2f370
diff --git a/gfx/pics/muk/back.png b/gfx/pics/muk/back.png
new file mode 100644
index 000000000..e610da01c
--- /dev/null
+++ b/gfx/pics/muk/back.png
diff --git a/gfx/pics/muk/bitmask.asm b/gfx/pics/muk/bitmask.asm
deleted file mode 100644
index 7530a8adf..000000000
--- a/gfx/pics/muk/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %01100000
-	db %00111110
-	db %10011111
-	db %10000011
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %01100000
-	db %00111110
-	db %10011111
-	db %11000011
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %01100000
-	db %00110000
-	db %00011000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2dd7
diff --git a/gfx/pics/muk/frames.asm b/gfx/pics/muk/frames.asm
deleted file mode 100644
index 1cab5f1f9..000000000
--- a/gfx/pics/muk/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f, $40
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $33, $34, $35, $41, $37, $38, $42, $43, $3b, $3c
-	db $3d, $44, $45, $46, $40
-.frame3
-	db $01 ; bitmask
-	db $31, $32, $33, $47, $35, $41, $37, $38, $48, $49, $3b, $3c
-	db $3d, $4a, $4b, $46, $40
-.frame4
-	db $02 ; bitmask
-	db $31, $32, $36, $37, $3b, $3c
-; 0xd548c
diff --git a/gfx/pics/muk/front.2bpp.lz b/gfx/pics/muk/front.animated.2bpp.lz.530363b2
index 3a4280270..3a4280270 100644
--- a/gfx/pics/muk/front.2bpp.lz
+++ b/gfx/pics/muk/front.animated.2bpp.lz.530363b2
diff --git a/gfx/pics/muk/front.png b/gfx/pics/muk/front.png
new file mode 100644
index 000000000..c4369d8a6
--- /dev/null
+++ b/gfx/pics/muk/front.png
diff --git a/gfx/pics/muk/normal.pal b/gfx/pics/muk/normal.pal
deleted file mode 100644
index 32df6345f..000000000
--- a/gfx/pics/muk/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 02, 20
-	RGB 12, 01, 12
-
diff --git a/gfx/pics/murkrow/back.2bpp.lz b/gfx/pics/murkrow/back.2bpp.lz.0c347b5b
index b99287081..b99287081 100644
--- a/gfx/pics/murkrow/back.2bpp.lz
+++ b/gfx/pics/murkrow/back.2bpp.lz.0c347b5b
diff --git a/gfx/pics/murkrow/back.png b/gfx/pics/murkrow/back.png
new file mode 100644
index 000000000..255471a39
--- /dev/null
+++ b/gfx/pics/murkrow/back.png
diff --git a/gfx/pics/murkrow/bitmask.asm b/gfx/pics/murkrow/bitmask.asm
deleted file mode 100644
index 064e41955..000000000
--- a/gfx/pics/murkrow/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00011110
-	db %00000111
-	db %00110000
-	db %11011111
-	db %00000011
-; 1
-	db %00000000
-	db %01000011
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %10000000
-	db %00100000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3674
diff --git a/gfx/pics/murkrow/frames.asm b/gfx/pics/murkrow/frames.asm
deleted file mode 100644
index e7efcf1d5..000000000
--- a/gfx/pics/murkrow/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $04, $04, $2d
-	db $2e, $2f, $04, $04, $04, $30
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $33
-.frame3
-	db $02 ; bitmask
-	db $34, $35
-; 0xd8d9c
diff --git a/gfx/pics/murkrow/front.2bpp.lz b/gfx/pics/murkrow/front.animated.2bpp.lz.5d2805e8
index e7ae99387..e7ae99387 100644
--- a/gfx/pics/murkrow/front.2bpp.lz
+++ b/gfx/pics/murkrow/front.animated.2bpp.lz.5d2805e8
diff --git a/gfx/pics/murkrow/front.png b/gfx/pics/murkrow/front.png
new file mode 100644
index 000000000..b17cf2d6c
--- /dev/null
+++ b/gfx/pics/murkrow/front.png
diff --git a/gfx/pics/murkrow/normal.pal b/gfx/pics/murkrow/normal.pal
deleted file mode 100644
index c32f0fa7b..000000000
--- a/gfx/pics/murkrow/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 26, 03
-	RGB 07, 07, 17
-
diff --git a/gfx/pics/natu/back.2bpp.lz b/gfx/pics/natu/back.2bpp.lz.c8339fb4
index b4ba45c14..b4ba45c14 100644
--- a/gfx/pics/natu/back.2bpp.lz
+++ b/gfx/pics/natu/back.2bpp.lz.c8339fb4
diff --git a/gfx/pics/natu/back.png b/gfx/pics/natu/back.png
new file mode 100644
index 000000000..923e34230
--- /dev/null
+++ b/gfx/pics/natu/back.png
diff --git a/gfx/pics/natu/bitmask.asm b/gfx/pics/natu/bitmask.asm
deleted file mode 100644
index 258acf82b..000000000
--- a/gfx/pics/natu/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %10001100
-	db %00110001
-	db %01100011
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %00000010
-	db %00000000
-; 0xd34e1
diff --git a/gfx/pics/natu/frames.asm b/gfx/pics/natu/frames.asm
deleted file mode 100644
index 4cd8f77b2..000000000
--- a/gfx/pics/natu/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $00, $1f, $00, $20
-.frame2
-	db $00 ; bitmask
-	db $19, $1a, $21, $1c, $22, $1e, $00, $1f, $00, $20
-.frame3
-	db $00 ; bitmask
-	db $19, $1a, $21, $1c, $23, $1e, $00, $1f, $00, $20
-.frame4
-	db $01 ; bitmask
-	db $24
-; 0xd89c7
diff --git a/gfx/pics/natu/front.2bpp.lz b/gfx/pics/natu/front.animated.2bpp.lz.997efaf6
index adebc8879..adebc8879 100644
--- a/gfx/pics/natu/front.2bpp.lz
+++ b/gfx/pics/natu/front.animated.2bpp.lz.997efaf6
diff --git a/gfx/pics/natu/front.png b/gfx/pics/natu/front.png
new file mode 100644
index 000000000..4360e5b60
--- /dev/null
+++ b/gfx/pics/natu/front.png
diff --git a/gfx/pics/natu/normal.pal b/gfx/pics/natu/normal.pal
deleted file mode 100644
index 9f85159c1..000000000
--- a/gfx/pics/natu/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 10, 23, 13
-	RGB 20, 05, 06
-
diff --git a/gfx/pics/nidoking/back.2bpp.lz b/gfx/pics/nidoking/back.2bpp.lz.93211604
index b3f35b5a1..b3f35b5a1 100644
--- a/gfx/pics/nidoking/back.2bpp.lz
+++ b/gfx/pics/nidoking/back.2bpp.lz.93211604
diff --git a/gfx/pics/nidoking/back.png b/gfx/pics/nidoking/back.png
new file mode 100644
index 000000000..d5af2af2e
--- /dev/null
+++ b/gfx/pics/nidoking/back.png
diff --git a/gfx/pics/nidoking/bitmask.asm b/gfx/pics/nidoking/bitmask.asm
deleted file mode 100644
index fbd26cedc..000000000
--- a/gfx/pics/nidoking/bitmask.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-; 0
-	db %00011111
-	db %00011111
-	db %10000111
-	db %11100001
-	db %11110001
-	db %11111001
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %11000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd294f
diff --git a/gfx/pics/nidoking/frames.asm b/gfx/pics/nidoking/frames.asm
deleted file mode 100644
index 812c4aaee..000000000
--- a/gfx/pics/nidoking/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $2a, $2a, $2a, $31, $32, $33, $34, $35, $36, $37, $38, $39
-	db $3a, $3b, $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44, $45
-	db $2a, $2a, $46, $47, $48
-.frame2
-	db $00 ; bitmask
-	db $2a, $2a, $2a, $49, $32, $33, $4a, $4b, $4c, $37, $38, $4d
-	db $3a, $3b, $4e, $3d, $3e, $4f, $50, $41, $42, $51, $44, $45
-	db $2a, $2a, $46, $47, $48
-.frame3
-	db $01 ; bitmask
-	db $52, $53
-; 0xd4909
diff --git a/gfx/pics/nidoking/front.2bpp.lz b/gfx/pics/nidoking/front.animated.2bpp.lz.bd38fa1e
index aad75774c..aad75774c 100644
--- a/gfx/pics/nidoking/front.2bpp.lz
+++ b/gfx/pics/nidoking/front.animated.2bpp.lz.bd38fa1e
diff --git a/gfx/pics/nidoking/front.png b/gfx/pics/nidoking/front.png
new file mode 100644
index 000000000..1ed2d18bd
--- /dev/null
+++ b/gfx/pics/nidoking/front.png
diff --git a/gfx/pics/nidoking/normal.pal b/gfx/pics/nidoking/normal.pal
deleted file mode 100644
index b9ab02b8c..000000000
--- a/gfx/pics/nidoking/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 18, 06, 20
-	RGB 11, 04, 11
-
diff --git a/gfx/pics/nidoqueen/back.2bpp.lz b/gfx/pics/nidoqueen/back.2bpp.lz.f1eb0f0c
index b363f089e..b363f089e 100644
--- a/gfx/pics/nidoqueen/back.2bpp.lz
+++ b/gfx/pics/nidoqueen/back.2bpp.lz.f1eb0f0c
diff --git a/gfx/pics/nidoqueen/back.png b/gfx/pics/nidoqueen/back.png
new file mode 100644
index 000000000..9d250b32c
--- /dev/null
+++ b/gfx/pics/nidoqueen/back.png
diff --git a/gfx/pics/nidoqueen/bitmask.asm b/gfx/pics/nidoqueen/bitmask.asm
deleted file mode 100644
index ba1c8fffb..000000000
--- a/gfx/pics/nidoqueen/bitmask.asm
+++ /dev/null
@@ -1,49 +0,0 @@
-; 0
-	db %00110000
-	db %00011000
-	db %00000000
-	db %00000000
-	db %10011111
-	db %10001111
-	db %00000000
-; 1
-	db %00111000
-	db %00011100
-	db %10000111
-	db %11000011
-	db %11111111
-	db %10011111
-	db %00000000
-; 2
-	db %00111000
-	db %00011100
-	db %10000111
-	db %11000011
-	db %01111001
-	db %00011100
-	db %00000000
-; 3
-	db %00111000
-	db %00111100
-	db %10011111
-	db %11001011
-	db %01111101
-	db %00011100
-	db %00000000
-; 4
-	db %00000000
-	db %00110000
-	db %00011000
-	db %00001000
-	db %00000100
-	db %00000000
-	db %00000000
-; 5
-	db %00110000
-	db %00011000
-	db %00000000
-	db %00000000
-	db %00011000
-	db %00001100
-	db %00000000
-; 0xd2921
diff --git a/gfx/pics/nidoqueen/frames.asm b/gfx/pics/nidoqueen/frames.asm
deleted file mode 100644
index 6414018cc..000000000
--- a/gfx/pics/nidoqueen/frames.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $00, $3d, $3e
-.frame2
-	db $01 ; bitmask
-	db $00, $00, $00, $3f, $40, $41, $42, $43, $44, $45, $46, $47
-	db $48, $49, $4a, $36, $37, $00, $00, $4b, $4c, $3a, $3b, $3c
-	db $00, $00, $00, $3e
-.frame3
-	db $02 ; bitmask
-	db $00, $00, $00, $3f, $40, $41, $42, $43, $44, $45, $46, $47
-	db $48, $49, $4d, $00, $00, $4b, $4c, $00, $00, $00
-.frame4
-	db $03 ; bitmask
-	db $00, $00, $00, $3f, $40, $4e, $4f, $42, $43, $44, $50, $51
-	db $45, $46, $47, $52, $48, $49, $4d, $53, $00, $00, $4b, $4c
-	db $00, $00, $00
-.frame5
-	db $04 ; bitmask
-	db $54, $4f, $50, $51, $52, $53
-.frame6
-	db $05 ; bitmask
-	db $31, $32, $33, $34, $38, $39, $00, $3d
-; 0xd4857
diff --git a/gfx/pics/nidoqueen/front.2bpp.lz b/gfx/pics/nidoqueen/front.animated.2bpp.lz.0bf11b0a
index d02a553d5..d02a553d5 100644
--- a/gfx/pics/nidoqueen/front.2bpp.lz
+++ b/gfx/pics/nidoqueen/front.animated.2bpp.lz.0bf11b0a
diff --git a/gfx/pics/nidoqueen/front.png b/gfx/pics/nidoqueen/front.png
new file mode 100644
index 000000000..5aaee10c2
--- /dev/null
+++ b/gfx/pics/nidoqueen/front.png
diff --git a/gfx/pics/nidoqueen/normal.pal b/gfx/pics/nidoqueen/normal.pal
deleted file mode 100644
index 3e1053bfb..000000000
--- a/gfx/pics/nidoqueen/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 19, 07
-	RGB 09, 16, 27
-
diff --git a/gfx/pics/nidoran_f/back.2bpp.lz b/gfx/pics/nidoran_f/back.2bpp.lz.9b6990f1
index df43f06a1..df43f06a1 100644
--- a/gfx/pics/nidoran_f/back.2bpp.lz
+++ b/gfx/pics/nidoran_f/back.2bpp.lz.9b6990f1
diff --git a/gfx/pics/nidoran_f/back.png b/gfx/pics/nidoran_f/back.png
new file mode 100644
index 000000000..9fcaf581c
--- /dev/null
+++ b/gfx/pics/nidoran_f/back.png
diff --git a/gfx/pics/nidoran_f/bitmask.asm b/gfx/pics/nidoran_f/bitmask.asm
deleted file mode 100644
index db5ecae05..000000000
--- a/gfx/pics/nidoran_f/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %11101111
-	db %10011101
-	db %00000011
-	db %00000000
-; 1
-	db %00001100
-	db %00010000
-	db %00000010
-	db %00000000
-; 2
-	db %10000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd28e3
diff --git a/gfx/pics/nidoran_f/frames.asm b/gfx/pics/nidoran_f/frames.asm
deleted file mode 100644
index dd6a6ae74..000000000
--- a/gfx/pics/nidoran_f/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $04, $19, $1a, $04, $1b, $1c, $1d, $1e, $1f, $20, $21, $22
-	db $23, $24
-.frame2
-	db $00 ; bitmask
-	db $04, $19, $1a, $04, $1b, $1c, $25, $1e, $1f, $20, $21, $22
-	db $23, $24
-.frame3
-	db $01 ; bitmask
-	db $26, $04, $27, $28
-.frame4
-	db $02 ; bitmask
-	db $29
-; 0xd47b9
diff --git a/gfx/pics/nidoran_f/front.2bpp.lz b/gfx/pics/nidoran_f/front.animated.2bpp.lz.0a4602e7
index 477857691..477857691 100644
--- a/gfx/pics/nidoran_f/front.2bpp.lz
+++ b/gfx/pics/nidoran_f/front.animated.2bpp.lz.0a4602e7
diff --git a/gfx/pics/nidoran_f/front.png b/gfx/pics/nidoran_f/front.png
new file mode 100644
index 000000000..fa14f1dfc
--- /dev/null
+++ b/gfx/pics/nidoran_f/front.png
diff --git a/gfx/pics/nidoran_f/normal.pal b/gfx/pics/nidoran_f/normal.pal
deleted file mode 100644
index d70e16ccb..000000000
--- a/gfx/pics/nidoran_f/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 18, 21, 30
-	RGB 12, 06, 14
-
diff --git a/gfx/pics/nidoran_m/back.2bpp.lz b/gfx/pics/nidoran_m/back.2bpp.lz.c9e54720
index 4b3be9a60..4b3be9a60 100644
--- a/gfx/pics/nidoran_m/back.2bpp.lz
+++ b/gfx/pics/nidoran_m/back.2bpp.lz.c9e54720
diff --git a/gfx/pics/nidoran_m/back.png b/gfx/pics/nidoran_m/back.png
new file mode 100644
index 000000000..f7ee2491b
--- /dev/null
+++ b/gfx/pics/nidoran_m/back.png
diff --git a/gfx/pics/nidoran_m/bitmask.asm b/gfx/pics/nidoran_m/bitmask.asm
deleted file mode 100644
index 738e90471..000000000
--- a/gfx/pics/nidoran_m/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %11101010
-	db %10001011
-	db %00000011
-	db %00000000
-; 1
-	db %10011100
-	db %00000011
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00000001
-	db %00000000
-	db %00000000
-; 0xd292d
diff --git a/gfx/pics/nidoran_m/frames.asm b/gfx/pics/nidoran_m/frames.asm
deleted file mode 100644
index 87b496efc..000000000
--- a/gfx/pics/nidoran_m/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $23
-.frame2
-	db $01 ; bitmask
-	db $24, $25, $26, $27, $28, $29
-.frame3
-	db $02 ; bitmask
-	db $2a
-; 0xd4872
diff --git a/gfx/pics/nidoran_m/front.2bpp.lz b/gfx/pics/nidoran_m/front.animated.2bpp.lz.b121beaa
index 661dadada..661dadada 100644
--- a/gfx/pics/nidoran_m/front.2bpp.lz
+++ b/gfx/pics/nidoran_m/front.animated.2bpp.lz.b121beaa
diff --git a/gfx/pics/nidoran_m/front.png b/gfx/pics/nidoran_m/front.png
new file mode 100644
index 000000000..86f5904a4
--- /dev/null
+++ b/gfx/pics/nidoran_m/front.png
diff --git a/gfx/pics/nidoran_m/normal.pal b/gfx/pics/nidoran_m/normal.pal
deleted file mode 100644
index 6b057e894..000000000
--- a/gfx/pics/nidoran_m/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 08, 21
-	RGB 17, 02, 16
-
diff --git a/gfx/pics/nidorina/back.2bpp.lz b/gfx/pics/nidorina/back.2bpp.lz.a00ecf4a
index 141d61f81..141d61f81 100644
--- a/gfx/pics/nidorina/back.2bpp.lz
+++ b/gfx/pics/nidorina/back.2bpp.lz.a00ecf4a
diff --git a/gfx/pics/nidorina/back.png b/gfx/pics/nidorina/back.png
new file mode 100644
index 000000000..d334bfaab
--- /dev/null
+++ b/gfx/pics/nidorina/back.png
diff --git a/gfx/pics/nidorina/bitmask.asm b/gfx/pics/nidorina/bitmask.asm
deleted file mode 100644
index e365847fa..000000000
--- a/gfx/pics/nidorina/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %10000100
-	db %11100011
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %10000000
-	db %11100011
-	db %00110000
-	db %00000000
-; 2
-	db %00001000
-	db %11000011
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %01000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd28f7
diff --git a/gfx/pics/nidorina/frames.asm b/gfx/pics/nidorina/frames.asm
deleted file mode 100644
index 26ffbea56..000000000
--- a/gfx/pics/nidorina/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a
-.frame2
-	db $01 ; bitmask
-	db $2b, $2c, $2d, $2e, $2f, $30, $31, $32
-.frame3
-	db $02 ; bitmask
-	db $33, $34, $35, $36, $37
-.frame4
-	db $03 ; bitmask
-	db $38, $39
-; 0xd47db
diff --git a/gfx/pics/nidorina/front.2bpp.lz b/gfx/pics/nidorina/front.animated.2bpp.lz.51532540
index 04523a52b..04523a52b 100644
--- a/gfx/pics/nidorina/front.2bpp.lz
+++ b/gfx/pics/nidorina/front.animated.2bpp.lz.51532540
diff --git a/gfx/pics/nidorina/front.png b/gfx/pics/nidorina/front.png
new file mode 100644
index 000000000..c3e49f8e1
--- /dev/null
+++ b/gfx/pics/nidorina/front.png
diff --git a/gfx/pics/nidorina/normal.pal b/gfx/pics/nidorina/normal.pal
deleted file mode 100644
index 917840667..000000000
--- a/gfx/pics/nidorina/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 13, 20, 31
-	RGB 07, 12, 14
-
diff --git a/gfx/pics/nidorino/back.2bpp.lz b/gfx/pics/nidorino/back.2bpp.lz.8504fdd1
index 6e6a841e9..6e6a841e9 100644
--- a/gfx/pics/nidorino/back.2bpp.lz
+++ b/gfx/pics/nidorino/back.2bpp.lz.8504fdd1
diff --git a/gfx/pics/nidorino/back.png b/gfx/pics/nidorino/back.png
new file mode 100644
index 000000000..b40dd9aaf
--- /dev/null
+++ b/gfx/pics/nidorino/back.png
diff --git a/gfx/pics/nidorino/bitmask.asm b/gfx/pics/nidorino/bitmask.asm
deleted file mode 100644
index fac9808aa..000000000
--- a/gfx/pics/nidorino/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %10000000
-	db %11111111
-	db %01111111
-	db %11001111
-	db %00000001
-; 1
-	db %00000000
-	db %00001000
-	db %00001010
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %01000000
-	db %00011000
-	db %00000000
-	db %00000000
-; 3
-	db %10000000
-	db %01110000
-	db %00011000
-	db %10000100
-	db %00000001
-; 0xd2941
diff --git a/gfx/pics/nidorino/frames.asm b/gfx/pics/nidorino/frames.asm
deleted file mode 100644
index 3f5dca2ae..000000000
--- a/gfx/pics/nidorino/frames.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $30, $31, $32, $33, $00, $34, $35, $36, $00, $37, $38
-.frame2
-	db $01 ; bitmask
-	db $39, $3a, $3b
-.frame3
-	db $01 ; bitmask
-	db $3c, $3d, $3b
-.frame4
-	db $02 ; bitmask
-	db $3e, $3b, $3f
-.frame5
-	db $03 ; bitmask
-	db $40, $41, $42, $3e, $3b, $3f, $43, $44, $45
-.frame6
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $3c, $29, $2a, $2b, $2c, $2d, $3d, $2f
-	db $30, $31, $32, $33, $00, $34, $35, $36, $00, $37, $38
-; 0xd48c4
diff --git a/gfx/pics/nidorino/front.2bpp.lz b/gfx/pics/nidorino/front.animated.2bpp.lz.ba11ef23
index 228c93b52..228c93b52 100644
--- a/gfx/pics/nidorino/front.2bpp.lz
+++ b/gfx/pics/nidorino/front.animated.2bpp.lz.ba11ef23
diff --git a/gfx/pics/nidorino/front.png b/gfx/pics/nidorino/front.png
new file mode 100644
index 000000000..86d37de47
--- /dev/null
+++ b/gfx/pics/nidorino/front.png
diff --git a/gfx/pics/nidorino/normal.pal b/gfx/pics/nidorino/normal.pal
deleted file mode 100644
index 039e46d34..000000000
--- a/gfx/pics/nidorino/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 22, 08, 22
-	RGB 10, 05, 16
-
diff --git a/gfx/pics/ninetales/back.2bpp.lz b/gfx/pics/ninetales/back.2bpp.lz.999b3894
index e6b264033..e6b264033 100644
--- a/gfx/pics/ninetales/back.2bpp.lz
+++ b/gfx/pics/ninetales/back.2bpp.lz.999b3894
diff --git a/gfx/pics/ninetales/back.png b/gfx/pics/ninetales/back.png
new file mode 100644
index 000000000..98af16d8a
--- /dev/null
+++ b/gfx/pics/ninetales/back.png
diff --git a/gfx/pics/ninetales/bitmask.asm b/gfx/pics/ninetales/bitmask.asm
deleted file mode 100644
index 434f61e97..000000000
--- a/gfx/pics/ninetales/bitmask.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-; 0
-	db %00000100
-	db %00000000
-	db %10000000
-	db %11100001
-	db %11110000
-	db %11110010
-	db %00000001
-; 1
-	db %00000100
-	db %00000000
-	db %10000000
-	db %11101001
-	db %11110111
-	db %11110011
-	db %00000001
-; 2
-	db %00001100
-	db %00110010
-	db %10011000
-	db %11101101
-	db %11110111
-	db %11110011
-	db %00000001
-; 3
-	db %01001100
-	db %00110010
-	db %10011000
-	db %11101101
-	db %11110111
-	db %11110011
-	db %00000001
-; 4
-	db %00000000
-	db %00000011
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd29a4
diff --git a/gfx/pics/ninetales/frames.asm b/gfx/pics/ninetales/frames.asm
deleted file mode 100644
index 90c846aa2..000000000
--- a/gfx/pics/ninetales/frames.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f, $40
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $33, $41, $42, $43, $36, $44, $45, $46, $47, $48
-	db $49, $4a, $4b, $4c, $3c, $4d, $4e, $4f, $50
-.frame3
-	db $02 ; bitmask
-	db $51, $52, $53, $54, $55, $56, $57, $32, $33, $58, $41, $42
-	db $43, $36, $44, $45, $46, $47, $48, $49, $4a, $4b, $4c, $3c
-	db $4d, $4e, $4f, $50
-.frame4
-	db $03 ; bitmask
-	db $51, $52, $03, $53, $59, $5a, $5b, $5c, $32, $33, $5d, $5e
-	db $42, $43, $36, $44, $45, $46, $47, $48, $49, $4a, $4b, $4c
-	db $3c, $4d, $4e, $4f, $50
-.frame5
-	db $04 ; bitmask
-	db $5f, $60
-; 0xd49fc
diff --git a/gfx/pics/ninetales/front.2bpp.lz b/gfx/pics/ninetales/front.animated.2bpp.lz.eef934ff
index 4865c6d82..4865c6d82 100644
--- a/gfx/pics/ninetales/front.2bpp.lz
+++ b/gfx/pics/ninetales/front.animated.2bpp.lz.eef934ff
diff --git a/gfx/pics/ninetales/front.png b/gfx/pics/ninetales/front.png
new file mode 100644
index 000000000..0bfeed4eb
--- /dev/null
+++ b/gfx/pics/ninetales/front.png
diff --git a/gfx/pics/ninetales/normal.pal b/gfx/pics/ninetales/normal.pal
deleted file mode 100644
index 54de8db00..000000000
--- a/gfx/pics/ninetales/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 31, 06
-	RGB 18, 15, 00
-
diff --git a/gfx/pics/noctowl/back.2bpp.lz b/gfx/pics/noctowl/back.2bpp.lz.9c8ac57f
index 9ef83c86e..9ef83c86e 100644
--- a/gfx/pics/noctowl/back.2bpp.lz
+++ b/gfx/pics/noctowl/back.2bpp.lz.9c8ac57f
diff --git a/gfx/pics/noctowl/back.png b/gfx/pics/noctowl/back.png
new file mode 100644
index 000000000..6f7237943
--- /dev/null
+++ b/gfx/pics/noctowl/back.png
diff --git a/gfx/pics/noctowl/bitmask.asm b/gfx/pics/noctowl/bitmask.asm
deleted file mode 100644
index 231f4dbd5..000000000
--- a/gfx/pics/noctowl/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %10000000
-	db %11000011
-	db %11100011
-	db %11110001
-	db %00111000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %10000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd340c
diff --git a/gfx/pics/noctowl/frames.asm b/gfx/pics/noctowl/frames.asm
deleted file mode 100644
index 86b15a845..000000000
--- a/gfx/pics/noctowl/frames.asm
+++ /dev/null
@@ -1,24 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31
-.frame2
-	db $01 ; bitmask
-	db $00, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f, $00, $40, $41
-.frame3
-	db $01 ; bitmask
-	db $00, $32, $33, $34, $35, $42, $43, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f, $00, $40, $41
-.frame4
-	db $01 ; bitmask
-	db $00, $32, $33, $34, $44, $45, $37, $38, $39, $46, $47, $3c
-	db $3d, $3e, $3f, $00, $40, $41
-.frame5
-	db $02 ; bitmask
-	db $48, $49
-; 0xd8720
diff --git a/gfx/pics/noctowl/front.2bpp.lz b/gfx/pics/noctowl/front.animated.2bpp.lz.7d6594fe
index cd0d1313b..cd0d1313b 100644
--- a/gfx/pics/noctowl/front.2bpp.lz
+++ b/gfx/pics/noctowl/front.animated.2bpp.lz.7d6594fe
diff --git a/gfx/pics/noctowl/front.png b/gfx/pics/noctowl/front.png
new file mode 100644
index 000000000..bbc8b1623
--- /dev/null
+++ b/gfx/pics/noctowl/front.png
diff --git a/gfx/pics/noctowl/normal.pal b/gfx/pics/noctowl/normal.pal
deleted file mode 100644
index 93785d70f..000000000
--- a/gfx/pics/noctowl/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 18, 12, 04
-	RGB 11, 05, 06
-
diff --git a/gfx/pics/octillery/back.2bpp.lz b/gfx/pics/octillery/back.2bpp.lz.48b6e47d
index 2d12597ca..2d12597ca 100644
--- a/gfx/pics/octillery/back.2bpp.lz
+++ b/gfx/pics/octillery/back.2bpp.lz.48b6e47d
diff --git a/gfx/pics/octillery/back.png b/gfx/pics/octillery/back.png
new file mode 100644
index 000000000..8717ea071
--- /dev/null
+++ b/gfx/pics/octillery/back.png
diff --git a/gfx/pics/octillery/bitmask.asm b/gfx/pics/octillery/bitmask.asm
deleted file mode 100644
index 904bdcd1f..000000000
--- a/gfx/pics/octillery/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00011000
-	db %11101111
-	db %01100011
-	db %00001000
-	db %00000000
-; 1
-	db %00000000
-	db %11000011
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd3832
diff --git a/gfx/pics/octillery/frames.asm b/gfx/pics/octillery/frames.asm
deleted file mode 100644
index ebfdd43ae..000000000
--- a/gfx/pics/octillery/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $30, $31
-.frame2
-	db $01 ; bitmask
-	db $32, $33, $34, $35
-.frame3
-	db $02 ; bitmask
-	db $36
-; 0xd927e
diff --git a/gfx/pics/octillery/front.2bpp.lz b/gfx/pics/octillery/front.animated.2bpp.lz.de99954b
index 9ffec9b38..9ffec9b38 100644
--- a/gfx/pics/octillery/front.2bpp.lz
+++ b/gfx/pics/octillery/front.animated.2bpp.lz.de99954b
diff --git a/gfx/pics/octillery/front.png b/gfx/pics/octillery/front.png
new file mode 100644
index 000000000..a2359dc98
--- /dev/null
+++ b/gfx/pics/octillery/front.png
diff --git a/gfx/pics/octillery/normal.pal b/gfx/pics/octillery/normal.pal
deleted file mode 100644
index 8073454d1..000000000
--- a/gfx/pics/octillery/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 22, 04
-	RGB 31, 06, 03
-
diff --git a/gfx/pics/oddish/back.2bpp.lz b/gfx/pics/oddish/back.2bpp.lz.4f9ec682
index 81ba4e5f3..81ba4e5f3 100644
--- a/gfx/pics/oddish/back.2bpp.lz
+++ b/gfx/pics/oddish/back.2bpp.lz.4f9ec682
diff --git a/gfx/pics/oddish/back.png b/gfx/pics/oddish/back.png
new file mode 100644
index 000000000..11f40353d
--- /dev/null
+++ b/gfx/pics/oddish/back.png
diff --git a/gfx/pics/oddish/bitmask.asm b/gfx/pics/oddish/bitmask.asm
deleted file mode 100644
index d9d298ed4..000000000
--- a/gfx/pics/oddish/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %11100010
-	db %10111100
-	db %01100011
-	db %00000000
-; 1
-	db %00000000
-	db %00000001
-	db %00000100
-	db %00000000
-; 2
-	db %00000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd29ec
diff --git a/gfx/pics/oddish/frames.asm b/gfx/pics/oddish/frames.asm
deleted file mode 100644
index 96561fe6d..000000000
--- a/gfx/pics/oddish/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $00, $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $23
-	db $24
-.frame2
-	db $00 ; bitmask
-	db $00, $25, $26, $1b, $27, $1d, $1e, $1f, $20, $21, $28, $23
-	db $29
-.frame3
-	db $01 ; bitmask
-	db $2a, $2b
-.frame4
-	db $02 ; bitmask
-	db $2c
-; 0xd4ae6
diff --git a/gfx/pics/oddish/front.2bpp.lz b/gfx/pics/oddish/front.animated.2bpp.lz.ea2e0dcd
index 3864c0b7a..3864c0b7a 100644
--- a/gfx/pics/oddish/front.2bpp.lz
+++ b/gfx/pics/oddish/front.animated.2bpp.lz.ea2e0dcd
diff --git a/gfx/pics/oddish/front.png b/gfx/pics/oddish/front.png
new file mode 100644
index 000000000..c49334613
--- /dev/null
+++ b/gfx/pics/oddish/front.png
diff --git a/gfx/pics/oddish/normal.pal b/gfx/pics/oddish/normal.pal
deleted file mode 100644
index 9371027e6..000000000
--- a/gfx/pics/oddish/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 11, 23, 03
-	RGB 06, 09, 09
-
diff --git a/gfx/pics/omanyte/back.2bpp.lz b/gfx/pics/omanyte/back.2bpp.lz.f442a670
index 0ee462eaf..0ee462eaf 100644
--- a/gfx/pics/omanyte/back.2bpp.lz
+++ b/gfx/pics/omanyte/back.2bpp.lz.f442a670
diff --git a/gfx/pics/omanyte/back.png b/gfx/pics/omanyte/back.png
new file mode 100644
index 000000000..0c3fb8eb7
--- /dev/null
+++ b/gfx/pics/omanyte/back.png
diff --git a/gfx/pics/omanyte/bitmask.asm b/gfx/pics/omanyte/bitmask.asm
deleted file mode 100644
index c0f074898..000000000
--- a/gfx/pics/omanyte/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00011100
-	db %00000010
-	db %10001100
-	db %00000000
-; 1
-	db %00011100
-	db %00000011
-	db %10001100
-	db %00000000
-; 2
-	db %00000000
-	db %00100001
-	db %00000100
-	db %00000000
-; 0xd31e0
diff --git a/gfx/pics/omanyte/frames.asm b/gfx/pics/omanyte/frames.asm
deleted file mode 100644
index 525d1d93c..000000000
--- a/gfx/pics/omanyte/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f
-.frame2
-	db $01 ; bitmask
-	db $20, $21, $1b, $22, $1c, $23, $1e, $1f
-.frame3
-	db $02 ; bitmask
-	db $24, $25, $26
-; 0xd5ef6
diff --git a/gfx/pics/omanyte/front.2bpp.lz b/gfx/pics/omanyte/front.animated.2bpp.lz.15b343dc
index 7673b2390..7673b2390 100644
--- a/gfx/pics/omanyte/front.2bpp.lz
+++ b/gfx/pics/omanyte/front.animated.2bpp.lz.15b343dc
diff --git a/gfx/pics/omanyte/front.png b/gfx/pics/omanyte/front.png
new file mode 100644
index 000000000..1e47c7800
--- /dev/null
+++ b/gfx/pics/omanyte/front.png
diff --git a/gfx/pics/omanyte/normal.pal b/gfx/pics/omanyte/normal.pal
deleted file mode 100644
index b0df7149b..000000000
--- a/gfx/pics/omanyte/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 17, 11
-	RGB 07, 14, 21
-
diff --git a/gfx/pics/omastar/back.2bpp.lz b/gfx/pics/omastar/back.2bpp.lz.c75932db
index b41a828c5..b41a828c5 100644
--- a/gfx/pics/omastar/back.2bpp.lz
+++ b/gfx/pics/omastar/back.2bpp.lz.c75932db
diff --git a/gfx/pics/omastar/back.png b/gfx/pics/omastar/back.png
new file mode 100644
index 000000000..c6ff219e7
--- /dev/null
+++ b/gfx/pics/omastar/back.png
diff --git a/gfx/pics/omastar/bitmask.asm b/gfx/pics/omastar/bitmask.asm
deleted file mode 100644
index abc37f8f8..000000000
--- a/gfx/pics/omastar/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00011000
-	db %10000110
-	db %00110000
-	db %00001000
-	db %00000011
-; 1
-	db %00111100
-	db %10001110
-	db %01110001
-	db %00001000
-	db %00001111
-; 2
-	db %00000000
-	db %00000000
-	db %01000001
-	db %00000000
-	db %00000000
-; 0xd31ef
diff --git a/gfx/pics/omastar/frames.asm b/gfx/pics/omastar/frames.asm
deleted file mode 100644
index 92ef4b589..000000000
--- a/gfx/pics/omastar/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d
-.frame2
-	db $01 ; bitmask
-	db $2e, $24, $2f, $30, $26, $27, $31, $32, $33, $29, $2a, $34
-	db $2b, $35, $36, $37, $38
-.frame3
-	db $02 ; bitmask
-	db $33, $34
-; 0xd5f1c
diff --git a/gfx/pics/omastar/front.2bpp.lz b/gfx/pics/omastar/front.animated.2bpp.lz.b3f6c3dc
index 544e2d87b..544e2d87b 100644
--- a/gfx/pics/omastar/front.2bpp.lz
+++ b/gfx/pics/omastar/front.animated.2bpp.lz.b3f6c3dc
diff --git a/gfx/pics/omastar/front.png b/gfx/pics/omastar/front.png
new file mode 100644
index 000000000..382bb5417
--- /dev/null
+++ b/gfx/pics/omastar/front.png
diff --git a/gfx/pics/omastar/normal.pal b/gfx/pics/omastar/normal.pal
deleted file mode 100644
index b0df7149b..000000000
--- a/gfx/pics/omastar/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 17, 11
-	RGB 07, 14, 21
-
diff --git a/gfx/pics/onix/back.2bpp.lz b/gfx/pics/onix/back.2bpp.lz.cb580eb9
index 05df1a96b..05df1a96b 100644
--- a/gfx/pics/onix/back.2bpp.lz
+++ b/gfx/pics/onix/back.2bpp.lz.cb580eb9
diff --git a/gfx/pics/onix/back.png b/gfx/pics/onix/back.png
new file mode 100644
index 000000000..6aa7be5bc
--- /dev/null
+++ b/gfx/pics/onix/back.png
diff --git a/gfx/pics/onix/bitmask.asm b/gfx/pics/onix/bitmask.asm
deleted file mode 100644
index 20de1aacf..000000000
--- a/gfx/pics/onix/bitmask.asm
+++ /dev/null
@@ -1,65 +0,0 @@
-; 0
-	db %00000000
-	db %00001010
-	db %11100110
-	db %01110000
-	db %11000000
-	db %01100000
-	db %00000000
-; 1
-	db %00000000
-	db %00001010
-	db %11100110
-	db %01110000
-	db %11000001
-	db %01100001
-	db %00000000
-; 2
-	db %00000000
-	db %00001010
-	db %00000110
-	db %00000000
-	db %00000100
-	db %00000010
-	db %00000001
-; 3
-	db %00000000
-	db %00000000
-	db %11100000
-	db %01110000
-	db %11000000
-	db %01100000
-	db %00000000
-; 4
-	db %00000000
-	db %00000000
-	db %11100000
-	db %01110000
-	db %11000001
-	db %01100001
-	db %00000000
-; 5
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000100
-	db %00000000
-	db %00000000
-; 6
-	db %00000000
-	db %00000010
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 7
-	db %00000000
-	db %00000110
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2e67
diff --git a/gfx/pics/onix/frames.asm b/gfx/pics/onix/frames.asm
deleted file mode 100644
index 4ed313016..000000000
--- a/gfx/pics/onix/frames.asm
+++ /dev/null
@@ -1,35 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-	dw .frame8
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $33, $34, $3f, $40, $41, $42, $43, $44, $45, $3b
-	db $3c, $46, $3d, $3e
-.frame3
-	db $02 ; bitmask
-	db $31, $32, $33, $34, $47, $48, $49
-.frame4
-	db $03 ; bitmask
-	db $35, $36, $37, $38, $39, $3a, $3b, $3c, $3d, $3e
-.frame5
-	db $04 ; bitmask
-	db $3f, $40, $41, $42, $43, $44, $45, $3b, $3c, $46, $3d, $3e
-.frame6
-	db $05 ; bitmask
-	db $47
-.frame7
-	db $06 ; bitmask
-	db $4a
-.frame8
-	db $07 ; bitmask
-	db $4b, $4c
-; 0xd55e9
diff --git a/gfx/pics/onix/front.2bpp.lz b/gfx/pics/onix/front.animated.2bpp.lz.84b7e9ef
index dc3bfca6e..dc3bfca6e 100644
--- a/gfx/pics/onix/front.2bpp.lz
+++ b/gfx/pics/onix/front.animated.2bpp.lz.84b7e9ef
diff --git a/gfx/pics/onix/front.png b/gfx/pics/onix/front.png
new file mode 100644
index 000000000..188378160
--- /dev/null
+++ b/gfx/pics/onix/front.png
diff --git a/gfx/pics/onix/normal.pal b/gfx/pics/onix/normal.pal
deleted file mode 100644
index 2b8c1b6b9..000000000
--- a/gfx/pics/onix/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 17, 15, 20
-	RGB 09, 06, 11
-
diff --git a/gfx/pics/paras/back.2bpp.lz b/gfx/pics/paras/back.2bpp.lz.b5a4d1e2
index d6c3d4a62..d6c3d4a62 100644
--- a/gfx/pics/paras/back.2bpp.lz
+++ b/gfx/pics/paras/back.2bpp.lz.b5a4d1e2
diff --git a/gfx/pics/paras/back.png b/gfx/pics/paras/back.png
new file mode 100644
index 000000000..4962bde38
--- /dev/null
+++ b/gfx/pics/paras/back.png
diff --git a/gfx/pics/paras/bitmask.asm b/gfx/pics/paras/bitmask.asm
deleted file mode 100644
index 49d9d811e..000000000
--- a/gfx/pics/paras/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %11011110
-	db %00000001
-	db %00000000
-	db %00000000
-; 1
-	db %11011110
-	db %00100001
-	db %11001110
-	db %00000001
-; 2
-	db %10000000
-	db %00010000
-	db %00000010
-	db %00000000
-; 0xd2a1c
diff --git a/gfx/pics/paras/frames.asm b/gfx/pics/paras/frames.asm
deleted file mode 100644
index 345ef88b5..000000000
--- a/gfx/pics/paras/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $00, $1c, $1d, $1e
-.frame2
-	db $01 ; bitmask
-	db $19, $1a, $1b, $00, $1c, $1d, $1e, $1f, $20, $21, $00, $22
-	db $23, $24
-.frame3
-	db $02 ; bitmask
-	db $25, $26, $27
-; 0xd4b5c
diff --git a/gfx/pics/paras/front.2bpp.lz b/gfx/pics/paras/front.animated.2bpp.lz.37a2c2f8
index 927c831d0..927c831d0 100644
--- a/gfx/pics/paras/front.2bpp.lz
+++ b/gfx/pics/paras/front.animated.2bpp.lz.37a2c2f8
diff --git a/gfx/pics/paras/front.png b/gfx/pics/paras/front.png
new file mode 100644
index 000000000..9e67fdc9e
--- /dev/null
+++ b/gfx/pics/paras/front.png
diff --git a/gfx/pics/paras/normal.pal b/gfx/pics/paras/normal.pal
deleted file mode 100644
index dcfb3fd8e..000000000
--- a/gfx/pics/paras/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 12, 03
-	RGB 23, 03, 00
-
diff --git a/gfx/pics/parasect/back.2bpp.lz b/gfx/pics/parasect/back.2bpp.lz.ed08ef08
index a63677ff7..a63677ff7 100644
--- a/gfx/pics/parasect/back.2bpp.lz
+++ b/gfx/pics/parasect/back.2bpp.lz.ed08ef08
diff --git a/gfx/pics/parasect/back.png b/gfx/pics/parasect/back.png
new file mode 100644
index 000000000..c0707e7b5
--- /dev/null
+++ b/gfx/pics/parasect/back.png
diff --git a/gfx/pics/parasect/bitmask.asm b/gfx/pics/parasect/bitmask.asm
deleted file mode 100644
index 84c7ad6f4..000000000
--- a/gfx/pics/parasect/bitmask.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-; 0
-	db %00011100
-	db %00111110
-	db %00011111
-	db %00001111
-	db %00000011
-	db %10000000
-	db %00000000
-; 1
-	db %00011100
-	db %00110110
-	db %00011111
-	db %10001111
-	db %00000011
-	db %10000011
-	db %00000000
-; 2
-	db %00000000
-	db %00110000
-	db %00011110
-	db %00001111
-	db %00000001
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %00000010
-	db %00000011
-	db %00000000
-	db %00000000
-	db %00000000
-; 4
-	db %00011100
-	db %00000110
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2a3f
diff --git a/gfx/pics/parasect/frames.asm b/gfx/pics/parasect/frames.asm
deleted file mode 100644
index 08d9da8e7..000000000
--- a/gfx/pics/parasect/frames.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $00, $38, $39, $3a, $3b
-	db $00, $3c, $3d, $3e, $00, $3f, $00, $40
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $33, $34, $35, $00, $00, $38, $41, $42, $43, $00
-	db $44, $45, $46, $00, $47, $48, $00, $49, $00, $40
-.frame3
-	db $02 ; bitmask
-	db $37, $00, $4a, $3a, $3b, $00, $3c, $3d, $3e, $00, $3f
-.frame4
-	db $03 ; bitmask
-	db $4b, $4c, $4d
-.frame5
-	db $04 ; bitmask
-	db $31, $32, $33, $34, $35, $38
-; 0xd4ba9
diff --git a/gfx/pics/parasect/front.2bpp.lz b/gfx/pics/parasect/front.animated.2bpp.lz.f78f9f36
index f1743d07e..f1743d07e 100644
--- a/gfx/pics/parasect/front.2bpp.lz
+++ b/gfx/pics/parasect/front.animated.2bpp.lz.f78f9f36
diff --git a/gfx/pics/parasect/front.png b/gfx/pics/parasect/front.png
new file mode 100644
index 000000000..165d0a012
--- /dev/null
+++ b/gfx/pics/parasect/front.png
diff --git a/gfx/pics/parasect/normal.pal b/gfx/pics/parasect/normal.pal
deleted file mode 100644
index 91c779584..000000000
--- a/gfx/pics/parasect/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 09, 04
-	RGB 14, 05, 01
-
diff --git a/gfx/pics/persian/back.2bpp.lz b/gfx/pics/persian/back.2bpp.lz.0e1c1c9a
index e615d47fb..e615d47fb 100644
--- a/gfx/pics/persian/back.2bpp.lz
+++ b/gfx/pics/persian/back.2bpp.lz.0e1c1c9a
diff --git a/gfx/pics/persian/back.png b/gfx/pics/persian/back.png
new file mode 100644
index 000000000..476964b80
--- /dev/null
+++ b/gfx/pics/persian/back.png
diff --git a/gfx/pics/persian/bitmask.asm b/gfx/pics/persian/bitmask.asm
deleted file mode 100644
index 94554310e..000000000
--- a/gfx/pics/persian/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %10000000
-	db %11001110
-	db %11100111
-	db %11110011
-	db %11111001
-	db %00000000
-; 1
-	db %00001110
-	db %00000111
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %10000000
-	db %11000001
-	db %01100000
-	db %00000000
-	db %00000000
-; 0xd2a97
diff --git a/gfx/pics/persian/frames.asm b/gfx/pics/persian/frames.asm
deleted file mode 100644
index 43f353608..000000000
--- a/gfx/pics/persian/frames.asm
+++ /dev/null
@@ -1,18 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $17, $18, $37, $38, $39, $1e
-	db $1f, $3a, $00, $3b, $25, $26, $3c, $00, $2b, $3d, $3e, $2e
-.frame2
-	db $01 ; bitmask
-	db $00, $00, $3f, $40, $41, $42
-.frame3
-	db $01 ; bitmask
-	db $00, $00, $43, $40, $44, $45
-.frame4
-	db $02 ; bitmask
-	db $46, $47, $48, $49, $4a, $4b
-; 0xd4cf5
diff --git a/gfx/pics/persian/front.2bpp.lz b/gfx/pics/persian/front.animated.2bpp.lz.0e6a2521
index 1f13a0cca..1f13a0cca 100644
--- a/gfx/pics/persian/front.2bpp.lz
+++ b/gfx/pics/persian/front.animated.2bpp.lz.0e6a2521
diff --git a/gfx/pics/persian/front.png b/gfx/pics/persian/front.png
new file mode 100644
index 000000000..e9a2be761
--- /dev/null
+++ b/gfx/pics/persian/front.png
diff --git a/gfx/pics/persian/normal.pal b/gfx/pics/persian/normal.pal
deleted file mode 100644
index 3c3a068a9..000000000
--- a/gfx/pics/persian/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 28, 10
-	RGB 12, 09, 04
-
diff --git a/gfx/pics/phanpy/back.2bpp.lz b/gfx/pics/phanpy/back.2bpp.lz.a5c509b8
index cef1bf442..cef1bf442 100644
--- a/gfx/pics/phanpy/back.2bpp.lz
+++ b/gfx/pics/phanpy/back.2bpp.lz.a5c509b8
diff --git a/gfx/pics/phanpy/back.png b/gfx/pics/phanpy/back.png
new file mode 100644
index 000000000..5efafc74b
--- /dev/null
+++ b/gfx/pics/phanpy/back.png
diff --git a/gfx/pics/phanpy/bitmask.asm b/gfx/pics/phanpy/bitmask.asm
deleted file mode 100644
index d0f5c0721..000000000
--- a/gfx/pics/phanpy/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %11000111
-	db %00111000
-	db %01100110
-	db %00000000
-; 1
-	db %11000111
-	db %00110000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00001000
-	db %00000000
-	db %00000000
-; 0xd38ee
diff --git a/gfx/pics/phanpy/frames.asm b/gfx/pics/phanpy/frames.asm
deleted file mode 100644
index f41904d8b..000000000
--- a/gfx/pics/phanpy/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $23, $24
-.frame2
-	db $01 ; bitmask
-	db $19, $1a, $25, $1c, $26, $1f, $20
-.frame3
-	db $02 ; bitmask
-	db $1e
-; 0xd93f2
diff --git a/gfx/pics/phanpy/front.2bpp.lz b/gfx/pics/phanpy/front.animated.2bpp.lz.53b49445
index d919487b8..d919487b8 100644
--- a/gfx/pics/phanpy/front.2bpp.lz
+++ b/gfx/pics/phanpy/front.animated.2bpp.lz.53b49445
diff --git a/gfx/pics/phanpy/front.png b/gfx/pics/phanpy/front.png
new file mode 100644
index 000000000..e2e0eeb14
--- /dev/null
+++ b/gfx/pics/phanpy/front.png
diff --git a/gfx/pics/phanpy/normal.pal b/gfx/pics/phanpy/normal.pal
deleted file mode 100644
index 1952a6537..000000000
--- a/gfx/pics/phanpy/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 17, 20, 26
-	RGB 23, 09, 06
-
diff --git a/gfx/pics/pichu/back.2bpp.lz b/gfx/pics/pichu/back.2bpp.lz.c5580983
index 61ab083b3..61ab083b3 100644
--- a/gfx/pics/pichu/back.2bpp.lz
+++ b/gfx/pics/pichu/back.2bpp.lz.c5580983
diff --git a/gfx/pics/pichu/back.png b/gfx/pics/pichu/back.png
new file mode 100644
index 000000000..830cf34f4
--- /dev/null
+++ b/gfx/pics/pichu/back.png
diff --git a/gfx/pics/pichu/bitmask.asm b/gfx/pics/pichu/bitmask.asm
deleted file mode 100644
index 8396728bf..000000000
--- a/gfx/pics/pichu/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %11100011
-	db %00111001
-	db %10101111
-	db %00000001
-; 1
-	db %10000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %10001000
-	db %00000001
-; 0xd349d
diff --git a/gfx/pics/pichu/frames.asm b/gfx/pics/pichu/frames.asm
deleted file mode 100644
index 8d82f908c..000000000
--- a/gfx/pics/pichu/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $02, $19, $02, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22
-	db $23, $24, $25, $02
-.frame2
-	db $00 ; bitmask
-	db $02, $19, $02, $1a, $1b, $1c, $1d, $1e, $26, $20, $21, $22
-	db $23, $24, $25, $02
-.frame3
-	db $01 ; bitmask
-	db $27, $28
-.frame4
-	db $02 ; bitmask
-	db $23, $25, $02
-; 0xd88f5
diff --git a/gfx/pics/pichu/front.2bpp.lz b/gfx/pics/pichu/front.animated.2bpp.lz.9c1c3bef
index 06712d244..06712d244 100644
--- a/gfx/pics/pichu/front.2bpp.lz
+++ b/gfx/pics/pichu/front.animated.2bpp.lz.9c1c3bef
diff --git a/gfx/pics/pichu/front.png b/gfx/pics/pichu/front.png
new file mode 100644
index 000000000..1557f73fb
--- /dev/null
+++ b/gfx/pics/pichu/front.png
diff --git a/gfx/pics/pichu/normal.pal b/gfx/pics/pichu/normal.pal
deleted file mode 100644
index 0ec212f83..000000000
--- a/gfx/pics/pichu/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 26, 05
-	RGB 26, 06, 00
-
diff --git a/gfx/pics/pidgeot/back.2bpp.lz b/gfx/pics/pidgeot/back.2bpp.lz.7d9e44a5
index a464dd7d1..a464dd7d1 100644
--- a/gfx/pics/pidgeot/back.2bpp.lz
+++ b/gfx/pics/pidgeot/back.2bpp.lz.7d9e44a5
diff --git a/gfx/pics/pidgeot/back.png b/gfx/pics/pidgeot/back.png
new file mode 100644
index 000000000..a452584e4
--- /dev/null
+++ b/gfx/pics/pidgeot/back.png
diff --git a/gfx/pics/pidgeot/bitmask.asm b/gfx/pics/pidgeot/bitmask.asm
deleted file mode 100644
index 521f3ad93..000000000
--- a/gfx/pics/pidgeot/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %10000000
-	db %11000111
-	db %11100011
-	db %01110001
-	db %00111000
-	db %00000000
-	db %00000000
-; 1
-	db %00111000
-	db %00011100
-	db %00000000
-	db %10000010
-	db %10000011
-	db %10000011
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2815
diff --git a/gfx/pics/pidgeot/frames.asm b/gfx/pics/pidgeot/frames.asm
deleted file mode 100644
index 2d0ef5719..000000000
--- a/gfx/pics/pidgeot/frames.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $00, $31, $32, $33, $34, $35, $36, $00, $37, $38, $39, $3a
-	db $00, $3b, $3c, $00, $00, $3d
-.frame2
-	db $01 ; bitmask
-	db $3e, $3f, $40, $41, $42, $43, $44, $45, $46, $47, $48, $49
-	db $4a, $4b
-.frame3
-	db $02 ; bitmask
-	db $4c
-; 0xd4541
diff --git a/gfx/pics/pidgeot/front.2bpp.lz b/gfx/pics/pidgeot/front.animated.2bpp.lz.c161ad71
index f5cbb3f56..f5cbb3f56 100644
--- a/gfx/pics/pidgeot/front.2bpp.lz
+++ b/gfx/pics/pidgeot/front.animated.2bpp.lz.c161ad71
diff --git a/gfx/pics/pidgeot/front.png b/gfx/pics/pidgeot/front.png
new file mode 100644
index 000000000..a3e598a28
--- /dev/null
+++ b/gfx/pics/pidgeot/front.png
diff --git a/gfx/pics/pidgeot/normal.pal b/gfx/pics/pidgeot/normal.pal
deleted file mode 100644
index 70fd6b8ce..000000000
--- a/gfx/pics/pidgeot/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 10, 12
-	RGB 19, 08, 02
-
diff --git a/gfx/pics/pidgeotto/back.2bpp.lz b/gfx/pics/pidgeotto/back.2bpp.lz.8a0dd470
index d766747ef..d766747ef 100644
--- a/gfx/pics/pidgeotto/back.2bpp.lz
+++ b/gfx/pics/pidgeotto/back.2bpp.lz.8a0dd470
diff --git a/gfx/pics/pidgeotto/back.png b/gfx/pics/pidgeotto/back.png
new file mode 100644
index 000000000..46c5970a4
--- /dev/null
+++ b/gfx/pics/pidgeotto/back.png
diff --git a/gfx/pics/pidgeotto/bitmask.asm b/gfx/pics/pidgeotto/bitmask.asm
deleted file mode 100644
index 76d3df735..000000000
--- a/gfx/pics/pidgeotto/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %11011111
-	db %11111111
-	db %00001011
-	db %00000000
-	db %00000000
-; 1
-	db %11011111
-	db %11111111
-	db %00011011
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2800
diff --git a/gfx/pics/pidgeotto/frames.asm b/gfx/pics/pidgeotto/frames.asm
deleted file mode 100644
index 83c0ef529..000000000
--- a/gfx/pics/pidgeotto/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $04, $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e
-	db $2f, $30, $31, $32, $33, $00
-.frame2
-	db $01 ; bitmask
-	db $04, $24, $25, $26, $27, $04, $34, $2a, $2b, $2c, $2d, $04
-	db $35, $36, $31, $32, $33, $00, $37
-.frame3
-	db $01 ; bitmask
-	db $04, $24, $25, $38, $27, $04, $34, $2a, $39, $2c, $2d, $04
-	db $35, $36, $31, $32, $33, $00, $37
-.frame4
-	db $02 ; bitmask
-	db $3a
-; 0xd4517
diff --git a/gfx/pics/pidgeotto/front.2bpp.lz b/gfx/pics/pidgeotto/front.animated.2bpp.lz.8ce78b51
index 0fc3a94fd..0fc3a94fd 100644
--- a/gfx/pics/pidgeotto/front.2bpp.lz
+++ b/gfx/pics/pidgeotto/front.animated.2bpp.lz.8ce78b51
diff --git a/gfx/pics/pidgeotto/front.png b/gfx/pics/pidgeotto/front.png
new file mode 100644
index 000000000..cdf3f1a28
--- /dev/null
+++ b/gfx/pics/pidgeotto/front.png
diff --git a/gfx/pics/pidgeotto/normal.pal b/gfx/pics/pidgeotto/normal.pal
deleted file mode 100644
index 70fd6b8ce..000000000
--- a/gfx/pics/pidgeotto/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 10, 12
-	RGB 19, 08, 02
-
diff --git a/gfx/pics/pidgey/back.2bpp.lz b/gfx/pics/pidgey/back.2bpp.lz.027129e8
index 48669456e..48669456e 100644
--- a/gfx/pics/pidgey/back.2bpp.lz
+++ b/gfx/pics/pidgey/back.2bpp.lz.027129e8
diff --git a/gfx/pics/pidgey/back.png b/gfx/pics/pidgey/back.png
new file mode 100644
index 000000000..7ab2fe5fc
--- /dev/null
+++ b/gfx/pics/pidgey/back.png
diff --git a/gfx/pics/pidgey/bitmask.asm b/gfx/pics/pidgey/bitmask.asm
deleted file mode 100644
index c1b5e0610..000000000
--- a/gfx/pics/pidgey/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %01000111
-	db %10000000
-	db %00110011
-	db %00000000
-; 1
-	db %11001111
-	db %10110000
-	db %01110111
-	db %00000000
-; 2
-	db %10000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd27f1
diff --git a/gfx/pics/pidgey/frames.asm b/gfx/pics/pidgey/frames.asm
deleted file mode 100644
index 58fdd0d12..000000000
--- a/gfx/pics/pidgey/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $03, $19, $1a, $1b, $03, $1c, $1d, $1e, $1f
-.frame2
-	db $01 ; bitmask
-	db $03, $20, $21, $22, $1b, $23, $24, $25, $03, $26, $27, $28
-	db $03, $03, $29
-.frame3
-	db $02 ; bitmask
-	db $2a
-; 0xd44d2
diff --git a/gfx/pics/pidgey/front.2bpp.lz b/gfx/pics/pidgey/front.animated.2bpp.lz.9acd46ca
index 03c579dbf..03c579dbf 100644
--- a/gfx/pics/pidgey/front.2bpp.lz
+++ b/gfx/pics/pidgey/front.animated.2bpp.lz.9acd46ca
diff --git a/gfx/pics/pidgey/front.png b/gfx/pics/pidgey/front.png
new file mode 100644
index 000000000..c65e7494d
--- /dev/null
+++ b/gfx/pics/pidgey/front.png
diff --git a/gfx/pics/pidgey/normal.pal b/gfx/pics/pidgey/normal.pal
deleted file mode 100644
index affaa4265..000000000
--- a/gfx/pics/pidgey/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 27, 13
-	RGB 19, 08, 02
-
diff --git a/gfx/pics/pikachu/back.2bpp.lz b/gfx/pics/pikachu/back.2bpp.lz.98998807
index 3f74382ae..3f74382ae 100644
--- a/gfx/pics/pikachu/back.2bpp.lz
+++ b/gfx/pics/pikachu/back.2bpp.lz.98998807
diff --git a/gfx/pics/pikachu/back.png b/gfx/pics/pikachu/back.png
new file mode 100644
index 000000000..5438e0e5a
--- /dev/null
+++ b/gfx/pics/pikachu/back.png
diff --git a/gfx/pics/pikachu/bitmask.asm b/gfx/pics/pikachu/bitmask.asm
deleted file mode 100644
index 24ea202e9..000000000
--- a/gfx/pics/pikachu/bitmask.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-; 0
-	db %11101011
-	db %10111100
-	db %01100011
-	db %00000000
-; 1
-	db %11101011
-	db %11111100
-	db %01101111
-	db %00000000
-; 2
-	db %11101111
-	db %11111100
-	db %01101111
-	db %00000000
-; 3
-	db %01000010
-	db %00001000
-	db %00000000
-	db %00000000
-; 4
-	db %00100011
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd28a3
diff --git a/gfx/pics/pikachu/frames.asm b/gfx/pics/pikachu/frames.asm
deleted file mode 100644
index f46e5181c..000000000
--- a/gfx/pics/pikachu/frames.asm
+++ /dev/null
@@ -1,24 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $08, $22, $23
-	db $24, $25, $26
-.frame2
-	db $01 ; bitmask
-	db $19, $1a, $1b, $1c, $27, $1e, $1f, $28, $21, $29, $2a, $22
-	db $23, $24, $2b, $2c, $25, $26
-.frame3
-	db $02 ; bitmask
-	db $19, $1a, $2d, $2e, $1c, $27, $1e, $1f, $28, $21, $29, $2a
-	db $22, $23, $24, $2b, $2c, $25, $26
-.frame4
-	db $03 ; bitmask
-	db $2f, $30, $31
-.frame5
-	db $04 ; bitmask
-	db $19, $1a, $1c
-; 0xd46e1
diff --git a/gfx/pics/pikachu/front.2bpp.lz b/gfx/pics/pikachu/front.animated.2bpp.lz.9c100565
index 1dbea0496..1dbea0496 100644
--- a/gfx/pics/pikachu/front.2bpp.lz
+++ b/gfx/pics/pikachu/front.animated.2bpp.lz.9c100565
diff --git a/gfx/pics/pikachu/front.png b/gfx/pics/pikachu/front.png
new file mode 100644
index 000000000..07dcb4da6
--- /dev/null
+++ b/gfx/pics/pikachu/front.png
diff --git a/gfx/pics/pikachu/normal.pal b/gfx/pics/pikachu/normal.pal
deleted file mode 100644
index 0ec212f83..000000000
--- a/gfx/pics/pikachu/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 26, 05
-	RGB 26, 06, 00
-
diff --git a/gfx/pics/piloswine/back.2bpp.lz b/gfx/pics/piloswine/back.2bpp.lz.6fe7da21
index 2bdbd05b7..2bdbd05b7 100644
--- a/gfx/pics/piloswine/back.2bpp.lz
+++ b/gfx/pics/piloswine/back.2bpp.lz.6fe7da21
diff --git a/gfx/pics/piloswine/back.png b/gfx/pics/piloswine/back.png
new file mode 100644
index 000000000..b2963e86f
--- /dev/null
+++ b/gfx/pics/piloswine/back.png
diff --git a/gfx/pics/piloswine/bitmask.asm b/gfx/pics/piloswine/bitmask.asm
deleted file mode 100644
index ffad2c6c2..000000000
--- a/gfx/pics/piloswine/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00111000
-	db %10001110
-	db %11100011
-	db %00000000
-	db %00000000
-; 1
-	db %00011000
-	db %10000110
-	db %01000001
-	db %00010000
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %01000000
-	db %00010000
-	db %00000100
-; 0xd3808
diff --git a/gfx/pics/piloswine/frames.asm b/gfx/pics/piloswine/frames.asm
deleted file mode 100644
index 4600445b9..000000000
--- a/gfx/pics/piloswine/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-.frame2
-	db $01 ; bitmask
-	db $30, $31, $32, $33, $34, $35, $36, $37
-.frame3
-	db $02 ; bitmask
-	db $38, $39, $3a
-; 0xd921f
diff --git a/gfx/pics/piloswine/front.2bpp.lz b/gfx/pics/piloswine/front.animated.2bpp.lz.f6f37ed2
index 45b87144e..45b87144e 100644
--- a/gfx/pics/piloswine/front.2bpp.lz
+++ b/gfx/pics/piloswine/front.animated.2bpp.lz.f6f37ed2
diff --git a/gfx/pics/piloswine/front.png b/gfx/pics/piloswine/front.png
new file mode 100644
index 000000000..822759c1c
--- /dev/null
+++ b/gfx/pics/piloswine/front.png
diff --git a/gfx/pics/piloswine/normal.pal b/gfx/pics/piloswine/normal.pal
deleted file mode 100644
index 6df5615c0..000000000
--- a/gfx/pics/piloswine/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 17, 10
-	RGB 14, 10, 10
-
diff --git a/gfx/pics/pineco/back.2bpp.lz b/gfx/pics/pineco/back.2bpp.lz.70df8ca3
index f4baaadb9..f4baaadb9 100644
--- a/gfx/pics/pineco/back.2bpp.lz
+++ b/gfx/pics/pineco/back.2bpp.lz.70df8ca3
diff --git a/gfx/pics/pineco/back.png b/gfx/pics/pineco/back.png
new file mode 100644
index 000000000..ae6299015
--- /dev/null
+++ b/gfx/pics/pineco/back.png
diff --git a/gfx/pics/pineco/bitmask.asm b/gfx/pics/pineco/bitmask.asm
deleted file mode 100644
index 30b51cece..000000000
--- a/gfx/pics/pineco/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00100101
-	db %10011000
-	db %01010000
-	db %00000000
-; 1
-	db %11100111
-	db %10011000
-	db %01110011
-	db %00000000
-; 2
-	db %01000000
-	db %00001000
-	db %00000001
-	db %00000000
-; 0xd36d8
diff --git a/gfx/pics/pineco/frames.asm b/gfx/pics/pineco/frames.asm
deleted file mode 100644
index 97093c2c4..000000000
--- a/gfx/pics/pineco/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20
-.frame2
-	db $01 ; bitmask
-	db $19, $21, $1a, $1b, $22, $23, $1c, $1d, $1e, $24, $25, $1f
-	db $26, $20
-.frame3
-	db $02 ; bitmask
-	db $27, $1c, $28
-; 0xd8f09
diff --git a/gfx/pics/pineco/front.2bpp.lz b/gfx/pics/pineco/front.animated.2bpp.lz.82d91497
index c36a27807..c36a27807 100644
--- a/gfx/pics/pineco/front.2bpp.lz
+++ b/gfx/pics/pineco/front.animated.2bpp.lz.82d91497
diff --git a/gfx/pics/pineco/front.png b/gfx/pics/pineco/front.png
new file mode 100644
index 000000000..2d91d5932
--- /dev/null
+++ b/gfx/pics/pineco/front.png
diff --git a/gfx/pics/pineco/normal.pal b/gfx/pics/pineco/normal.pal
deleted file mode 100644
index 159e2d51f..000000000
--- a/gfx/pics/pineco/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 22, 22
-	RGB 10, 17, 20
-
diff --git a/gfx/pics/pinsir/back.2bpp.lz b/gfx/pics/pinsir/back.2bpp.lz.09ac7dd4
index 8803c8a0a..8803c8a0a 100644
--- a/gfx/pics/pinsir/back.2bpp.lz
+++ b/gfx/pics/pinsir/back.2bpp.lz.09ac7dd4
diff --git a/gfx/pics/pinsir/back.png b/gfx/pics/pinsir/back.png
new file mode 100644
index 000000000..978ba561b
--- /dev/null
+++ b/gfx/pics/pinsir/back.png
diff --git a/gfx/pics/pinsir/bitmask.asm b/gfx/pics/pinsir/bitmask.asm
deleted file mode 100644
index 4f51b7d09..000000000
--- a/gfx/pics/pinsir/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00001110
-	db %11000111
-	db %11100000
-	db %11110000
-	db %00110000
-	db %00000000
-	db %00000000
-; 1
-	db %01101110
-	db %11110111
-	db %11101100
-	db %11110010
-	db %00110000
-	db %10000011
-	db %00000001
-; 2
-	db %01101110
-	db %11110111
-	db %11101110
-	db %11110011
-	db %00110000
-	db %10000011
-	db %00000001
-; 3
-	db %00001110
-	db %11000111
-	db %11100110
-	db %11110011
-	db %00110000
-	db %10000011
-	db %00000001
-; 0xd311c
diff --git a/gfx/pics/pinsir/frames.asm b/gfx/pics/pinsir/frames.asm
deleted file mode 100644
index ee3927896..000000000
--- a/gfx/pics/pinsir/frames.asm
+++ /dev/null
@@ -1,24 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $00
-	db $3c, $3d, $3e, $00, $00
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $33, $3f, $40, $34, $35, $36, $41, $42, $37, $38
-	db $43, $44, $39, $3a, $3b, $45, $00, $3c, $3d, $3e, $00, $00
-	db $46, $47, $48, $00
-.frame3
-	db $02 ; bitmask
-	db $31, $32, $33, $3f, $40, $34, $35, $36, $41, $42, $37, $38
-	db $49, $43, $44, $39, $3a, $3b, $4a, $45, $00, $3c, $3d, $3e
-	db $00, $00, $46, $47, $48, $00
-.frame4
-	db $03 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $49, $43, $39, $3a
-	db $3b, $4a, $45, $00, $3c, $3d, $3e, $00, $00, $46, $47, $48
-	db $00
-; 0xd5cc6
diff --git a/gfx/pics/pinsir/front.2bpp.lz b/gfx/pics/pinsir/front.animated.2bpp.lz.1e3839f2
index d2ec9ecd9..d2ec9ecd9 100644
--- a/gfx/pics/pinsir/front.2bpp.lz
+++ b/gfx/pics/pinsir/front.animated.2bpp.lz.1e3839f2
diff --git a/gfx/pics/pinsir/front.png b/gfx/pics/pinsir/front.png
new file mode 100644
index 000000000..5bd4c4cee
--- /dev/null
+++ b/gfx/pics/pinsir/front.png
diff --git a/gfx/pics/pinsir/normal.pal b/gfx/pics/pinsir/normal.pal
deleted file mode 100644
index 09bf39ff4..000000000
--- a/gfx/pics/pinsir/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 20, 14
-	RGB 17, 10, 07
-
diff --git a/gfx/pics/politoed/back.2bpp.lz b/gfx/pics/politoed/back.2bpp.lz.7873e52f
index 2c492fcaf..2c492fcaf 100644
--- a/gfx/pics/politoed/back.2bpp.lz
+++ b/gfx/pics/politoed/back.2bpp.lz.7873e52f
diff --git a/gfx/pics/politoed/back.png b/gfx/pics/politoed/back.png
new file mode 100644
index 000000000..4376ca6ae
--- /dev/null
+++ b/gfx/pics/politoed/back.png
diff --git a/gfx/pics/politoed/bitmask.asm b/gfx/pics/politoed/bitmask.asm
deleted file mode 100644
index 94e4243c1..000000000
--- a/gfx/pics/politoed/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000100
-	db %00001110
-	db %10000111
-	db %10000011
-	db %11100001
-	db %00111000
-	db %00000000
-; 1
-	db %00001100
-	db %00001110
-	db %10000111
-	db %10000011
-	db %11100001
-	db %00111000
-	db %00000000
-; 2
-	db %00000000
-	db %10000000
-	db %11000000
-	db %01100000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd35ab
diff --git a/gfx/pics/politoed/frames.asm b/gfx/pics/politoed/frames.asm
deleted file mode 100644
index 0d4b546a7..000000000
--- a/gfx/pics/politoed/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $00, $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b
-	db $3c, $3d, $3e, $00, $00, $00
-.frame2
-	db $01 ; bitmask
-	db $3f, $40, $31, $41, $33, $34, $42, $43, $37, $44, $45, $3a
-	db $3b, $3c, $3d, $3e, $00, $00, $00
-.frame3
-	db $01 ; bitmask
-	db $46, $47, $31, $41, $33, $34, $42, $43, $37, $44, $45, $3a
-	db $3b, $3c, $3d, $3e, $00, $00, $00
-.frame4
-	db $02 ; bitmask
-	db $48, $49, $4a, $4b, $4c
-; 0xd8bd8
diff --git a/gfx/pics/politoed/front.2bpp.lz b/gfx/pics/politoed/front.animated.2bpp.lz.408a9c1a
index 8890a7ed4..8890a7ed4 100644
--- a/gfx/pics/politoed/front.2bpp.lz
+++ b/gfx/pics/politoed/front.animated.2bpp.lz.408a9c1a
diff --git a/gfx/pics/politoed/front.png b/gfx/pics/politoed/front.png
new file mode 100644
index 000000000..03aa089e3
--- /dev/null
+++ b/gfx/pics/politoed/front.png
diff --git a/gfx/pics/politoed/normal.pal b/gfx/pics/politoed/normal.pal
deleted file mode 100644
index 31ed84e91..000000000
--- a/gfx/pics/politoed/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 31, 04
-	RGB 07, 20, 06
-
diff --git a/gfx/pics/poliwag/back.2bpp.lz b/gfx/pics/poliwag/back.2bpp.lz.35b9ee20
index 58d039d16..58d039d16 100644
--- a/gfx/pics/poliwag/back.2bpp.lz
+++ b/gfx/pics/poliwag/back.2bpp.lz.35b9ee20
diff --git a/gfx/pics/poliwag/back.png b/gfx/pics/poliwag/back.png
new file mode 100644
index 000000000..44348236e
--- /dev/null
+++ b/gfx/pics/poliwag/back.png
diff --git a/gfx/pics/poliwag/bitmask.asm b/gfx/pics/poliwag/bitmask.asm
deleted file mode 100644
index 5f28e8a8f..000000000
--- a/gfx/pics/poliwag/bitmask.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-; 0
-	db %00000000
-	db %10000000
-	db %01110011
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %10001100
-	db %00000001
-; 2
-	db %10000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %10000100
-	db %00001000
-	db %00000000
-	db %00000000
-; 0xd2b3e
diff --git a/gfx/pics/poliwag/frames.asm b/gfx/pics/poliwag/frames.asm
deleted file mode 100644
index a45bf4b23..000000000
--- a/gfx/pics/poliwag/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e
-.frame2
-	db $01 ; bitmask
-	db $1f, $20, $21, $00
-.frame3
-	db $02 ; bitmask
-	db $22
-.frame4
-	db $03 ; bitmask
-	db $23, $24, $25
-; 0xd4e61
diff --git a/gfx/pics/poliwag/front.2bpp.lz b/gfx/pics/poliwag/front.animated.2bpp.lz.c7d26488
index df9741516..df9741516 100644
--- a/gfx/pics/poliwag/front.2bpp.lz
+++ b/gfx/pics/poliwag/front.animated.2bpp.lz.c7d26488
diff --git a/gfx/pics/poliwag/front.png b/gfx/pics/poliwag/front.png
new file mode 100644
index 000000000..c61c98fff
--- /dev/null
+++ b/gfx/pics/poliwag/front.png
diff --git a/gfx/pics/poliwag/normal.pal b/gfx/pics/poliwag/normal.pal
deleted file mode 100644
index 20896080e..000000000
--- a/gfx/pics/poliwag/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 08, 05
-	RGB 07, 08, 10
-
diff --git a/gfx/pics/poliwhirl/back.2bpp.lz b/gfx/pics/poliwhirl/back.2bpp.lz.76564593
index a78a2cfff..a78a2cfff 100644
--- a/gfx/pics/poliwhirl/back.2bpp.lz
+++ b/gfx/pics/poliwhirl/back.2bpp.lz.76564593
diff --git a/gfx/pics/poliwhirl/back.png b/gfx/pics/poliwhirl/back.png
new file mode 100644
index 000000000..51e374cb7
--- /dev/null
+++ b/gfx/pics/poliwhirl/back.png
diff --git a/gfx/pics/poliwhirl/bitmask.asm b/gfx/pics/poliwhirl/bitmask.asm
deleted file mode 100644
index 93480693c..000000000
--- a/gfx/pics/poliwhirl/bitmask.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-; 0
-	db %11001111
-	db %00110011
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %11001111
-	db %00110011
-	db %00001000
-	db %10000010
-	db %00000000
-; 2
-	db %11001111
-	db %00110011
-	db %00001000
-	db %10000010
-	db %00000010
-; 3
-	db %11001111
-	db %11110011
-	db %01101001
-	db %10011110
-	db %00000010
-; 4
-	db %00000000
-	db %00100000
-	db %00001000
-	db %10000110
-	db %00000001
-; 0xd2b57
diff --git a/gfx/pics/poliwhirl/frames.asm b/gfx/pics/poliwhirl/frames.asm
deleted file mode 100644
index 5dbc0d7d4..000000000
--- a/gfx/pics/poliwhirl/frames.asm
+++ /dev/null
@@ -1,24 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $03, $03, $24, $25, $03, $26, $27, $28, $29, $2a
-.frame2
-	db $01 ; bitmask
-	db $03, $03, $24, $25, $03, $26, $27, $28, $29, $2a, $2b, $2c
-	db $2d
-.frame3
-	db $02 ; bitmask
-	db $03, $03, $24, $25, $03, $2e, $27, $28, $29, $2a, $2b, $2c
-	db $2d, $2f
-.frame4
-	db $03 ; bitmask
-	db $03, $03, $24, $25, $03, $2e, $27, $28, $29, $2a, $30, $31
-	db $32, $2b, $33, $34, $2c, $35, $36, $37, $2d, $2f
-.frame5
-	db $04 ; bitmask
-	db $38, $39, $3a, $3b, $3c, $3d
-; 0xd4eb1
diff --git a/gfx/pics/poliwhirl/front.2bpp.lz b/gfx/pics/poliwhirl/front.animated.2bpp.lz.9a36033f
index b06f41441..b06f41441 100644
--- a/gfx/pics/poliwhirl/front.2bpp.lz
+++ b/gfx/pics/poliwhirl/front.animated.2bpp.lz.9a36033f
diff --git a/gfx/pics/poliwhirl/front.png b/gfx/pics/poliwhirl/front.png
new file mode 100644
index 000000000..0419f4f9e
--- /dev/null
+++ b/gfx/pics/poliwhirl/front.png
diff --git a/gfx/pics/poliwhirl/normal.pal b/gfx/pics/poliwhirl/normal.pal
deleted file mode 100644
index 37c6af44e..000000000
--- a/gfx/pics/poliwhirl/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 09, 14, 16
-	RGB 06, 07, 10
-
diff --git a/gfx/pics/poliwrath/back.2bpp.lz b/gfx/pics/poliwrath/back.2bpp.lz.240e911e
index eab9164aa..eab9164aa 100644
--- a/gfx/pics/poliwrath/back.2bpp.lz
+++ b/gfx/pics/poliwrath/back.2bpp.lz.240e911e
diff --git a/gfx/pics/poliwrath/back.png b/gfx/pics/poliwrath/back.png
new file mode 100644
index 000000000..fe6216970
--- /dev/null
+++ b/gfx/pics/poliwrath/back.png
diff --git a/gfx/pics/poliwrath/bitmask.asm b/gfx/pics/poliwrath/bitmask.asm
deleted file mode 100644
index 3053f8119..000000000
--- a/gfx/pics/poliwrath/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00011100
-	db %00011110
-	db %00001110
-	db %00000110
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %10000000
-	db %11000011
-	db %11100001
-	db %01110000
-	db %00000000
-; 2
-	db %00000000
-	db %10000000
-	db %00000000
-	db %00100000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2b6c
diff --git a/gfx/pics/poliwrath/frames.asm b/gfx/pics/poliwrath/frames.asm
deleted file mode 100644
index e48981a22..000000000
--- a/gfx/pics/poliwrath/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-.frame2
-	db $01 ; bitmask
-	db $3d, $3e, $3f, $40, $41, $42, $43, $44, $45, $46, $47, $1a
-.frame3
-	db $02 ; bitmask
-	db $48, $49
-; 0xd4ed4
diff --git a/gfx/pics/poliwrath/front.2bpp.lz b/gfx/pics/poliwrath/front.animated.2bpp.lz.fb1157ec
index 601937221..601937221 100644
--- a/gfx/pics/poliwrath/front.2bpp.lz
+++ b/gfx/pics/poliwrath/front.animated.2bpp.lz.fb1157ec
diff --git a/gfx/pics/poliwrath/front.png b/gfx/pics/poliwrath/front.png
new file mode 100644
index 000000000..a1271b9e2
--- /dev/null
+++ b/gfx/pics/poliwrath/front.png
diff --git a/gfx/pics/poliwrath/normal.pal b/gfx/pics/poliwrath/normal.pal
deleted file mode 100644
index 9968e69e6..000000000
--- a/gfx/pics/poliwrath/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 16, 16, 26
-	RGB 06, 06, 15
-
diff --git a/gfx/pics/ponyta/back.2bpp.lz b/gfx/pics/ponyta/back.2bpp.lz.10ddc7ea
index 5d7ecaa93..5d7ecaa93 100644
--- a/gfx/pics/ponyta/back.2bpp.lz
+++ b/gfx/pics/ponyta/back.2bpp.lz.10ddc7ea
diff --git a/gfx/pics/ponyta/back.png b/gfx/pics/ponyta/back.png
new file mode 100644
index 000000000..42b1190c6
--- /dev/null
+++ b/gfx/pics/ponyta/back.png
diff --git a/gfx/pics/ponyta/bitmask.asm b/gfx/pics/ponyta/bitmask.asm
deleted file mode 100644
index cc2749572..000000000
--- a/gfx/pics/ponyta/bitmask.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-; 0
-	db %11001111
-	db %01100011
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %10001110
-	db %01100011
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000010
-	db %00100000
-	db %00000000
-	db %00000000
-	db %00000000
-; 4
-	db %00000010
-	db %00100001
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2cb7
diff --git a/gfx/pics/ponyta/frames.asm b/gfx/pics/ponyta/frames.asm
deleted file mode 100644
index d56e0dc21..000000000
--- a/gfx/pics/ponyta/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $04, $27, $28, $29, $2a, $2b, $2c
-.frame2
-	db $01 ; bitmask
-	db $2d, $2e, $2f, $30, $31, $32, $33, $34
-.frame3
-	db $02 ; bitmask
-	db $35
-.frame4
-	db $03 ; bitmask
-	db $36, $37
-.frame5
-	db $04 ; bitmask
-	db $36, $35, $37
-; 0xd51f8
diff --git a/gfx/pics/ponyta/front.2bpp.lz b/gfx/pics/ponyta/front.animated.2bpp.lz.2c8708d6
index 5d3aa48db..5d3aa48db 100644
--- a/gfx/pics/ponyta/front.2bpp.lz
+++ b/gfx/pics/ponyta/front.animated.2bpp.lz.2c8708d6
diff --git a/gfx/pics/ponyta/front.png b/gfx/pics/ponyta/front.png
new file mode 100644
index 000000000..a83fbfb15
--- /dev/null
+++ b/gfx/pics/ponyta/front.png
diff --git a/gfx/pics/ponyta/normal.pal b/gfx/pics/ponyta/normal.pal
deleted file mode 100644
index da67a88f7..000000000
--- a/gfx/pics/ponyta/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 27, 04
-	RGB 31, 05, 03
-
diff --git a/gfx/pics/porygon/back.2bpp.lz b/gfx/pics/porygon/back.2bpp.lz.b3d71350
index 5f0a47032..5f0a47032 100644
--- a/gfx/pics/porygon/back.2bpp.lz
+++ b/gfx/pics/porygon/back.2bpp.lz.b3d71350
diff --git a/gfx/pics/porygon/back.png b/gfx/pics/porygon/back.png
new file mode 100644
index 000000000..6833d9206
--- /dev/null
+++ b/gfx/pics/porygon/back.png
diff --git a/gfx/pics/porygon/bitmask.asm b/gfx/pics/porygon/bitmask.asm
deleted file mode 100644
index 3cbd5be4e..000000000
--- a/gfx/pics/porygon/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00110000
-	db %11001110
-	db %11100011
-	db %00111000
-	db %00001100
-; 1
-	db %00110000
-	db %11101110
-	db %11100011
-	db %00111000
-	db %00001100
-; 2
-	db %00000000
-	db %00100000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd31d4
diff --git a/gfx/pics/porygon/frames.asm b/gfx/pics/porygon/frames.asm
deleted file mode 100644
index 885a011f2..000000000
--- a/gfx/pics/porygon/frames.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $30, $31, $32, $33, $34
-.frame2
-	db $01 ; bitmask
-	db $24, $25, $26, $27, $28, $35, $29, $2a, $2b, $2c, $2d, $2e
-	db $2f, $30, $31, $32, $33, $34
-.frame3
-	db $02 ; bitmask
-	db $35
-; 0xd5edb
diff --git a/gfx/pics/porygon/front.2bpp.lz b/gfx/pics/porygon/front.animated.2bpp.lz.70fc1333
index 734305a14..734305a14 100644
--- a/gfx/pics/porygon/front.2bpp.lz
+++ b/gfx/pics/porygon/front.animated.2bpp.lz.70fc1333
diff --git a/gfx/pics/porygon/front.png b/gfx/pics/porygon/front.png
new file mode 100644
index 000000000..ef4a1d782
--- /dev/null
+++ b/gfx/pics/porygon/front.png
diff --git a/gfx/pics/porygon/normal.pal b/gfx/pics/porygon/normal.pal
deleted file mode 100644
index 61ca2eef9..000000000
--- a/gfx/pics/porygon/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 09, 04
-	RGB 08, 15, 20
-
diff --git a/gfx/pics/porygon2/back.2bpp.lz b/gfx/pics/porygon2/back.2bpp.lz.5bba6e40
index 5be528963..5be528963 100644
--- a/gfx/pics/porygon2/back.2bpp.lz
+++ b/gfx/pics/porygon2/back.2bpp.lz.5bba6e40
diff --git a/gfx/pics/porygon2/back.png b/gfx/pics/porygon2/back.png
new file mode 100644
index 000000000..a8d7ed4e6
--- /dev/null
+++ b/gfx/pics/porygon2/back.png
diff --git a/gfx/pics/porygon2/bitmask.asm b/gfx/pics/porygon2/bitmask.asm
deleted file mode 100644
index c20f48420..000000000
--- a/gfx/pics/porygon2/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00000000
-	db %10000110
-	db %11100011
-	db %00011000
-	db %00000000
-; 1
-	db %11000011
-	db %11110111
-	db %11111111
-	db %00011010
-	db %00000000
-; 2
-	db %11000011
-	db %01110001
-	db %00011100
-	db %00000010
-	db %00000000
-; 0xd3919
diff --git a/gfx/pics/porygon2/frames.asm b/gfx/pics/porygon2/frames.asm
deleted file mode 100644
index 52d425937..000000000
--- a/gfx/pics/porygon2/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d
-.frame2
-	db $01 ; bitmask
-	db $2e, $02, $2f, $30, $02, $24, $25, $31, $32, $33, $26, $27
-	db $28, $34, $35, $36, $29, $2a, $2b, $37, $2c, $2d
-.frame3
-	db $02 ; bitmask
-	db $2e, $02, $2f, $30, $02, $31, $32, $33, $34, $35, $36, $37
-; 0xd946f
diff --git a/gfx/pics/porygon2/front.2bpp.lz b/gfx/pics/porygon2/front.animated.2bpp.lz.a6410e75
index 5e66bb54d..5e66bb54d 100644
--- a/gfx/pics/porygon2/front.2bpp.lz
+++ b/gfx/pics/porygon2/front.animated.2bpp.lz.a6410e75
diff --git a/gfx/pics/porygon2/front.png b/gfx/pics/porygon2/front.png
new file mode 100644
index 000000000..16e8d44e6
--- /dev/null
+++ b/gfx/pics/porygon2/front.png
diff --git a/gfx/pics/porygon2/normal.pal b/gfx/pics/porygon2/normal.pal
deleted file mode 100644
index 8dafc26b4..000000000
--- a/gfx/pics/porygon2/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 10, 12, 24
-	RGB 25, 09, 10
-
diff --git a/gfx/pics/primeape/back.2bpp.lz b/gfx/pics/primeape/back.2bpp.lz.690e407d
index c0937a9ae..c0937a9ae 100644
--- a/gfx/pics/primeape/back.2bpp.lz
+++ b/gfx/pics/primeape/back.2bpp.lz.690e407d
diff --git a/gfx/pics/primeape/back.png b/gfx/pics/primeape/back.png
new file mode 100644
index 000000000..172c67b57
--- /dev/null
+++ b/gfx/pics/primeape/back.png
diff --git a/gfx/pics/primeape/bitmask.asm b/gfx/pics/primeape/bitmask.asm
deleted file mode 100644
index 50865ad0f..000000000
--- a/gfx/pics/primeape/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %10000110
-	db %11000011
-	db %11100011
-	db %10110001
-	db %11111011
-	db %01111100
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %10000001
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %10000011
-	db %10000001
-	db %01000001
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %10000001
-	db %00010001
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2af8
diff --git a/gfx/pics/primeape/frames.asm b/gfx/pics/primeape/frames.asm
deleted file mode 100644
index 70fefd629..000000000
--- a/gfx/pics/primeape/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $00, $00, $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a
-	db $3b, $3c, $3d, $3e, $3f, $40, $00, $41, $42, $43, $44, $00
-	db $00, $00, $45, $46
-.frame2
-	db $01 ; bitmask
-	db $47, $48, $49
-.frame3
-	db $02 ; bitmask
-	db $36, $37, $3a, $3b, $4a, $4b, $4c
-.frame4
-	db $03 ; bitmask
-	db $47, $48, $49, $4d
-; 0xd4dd0
diff --git a/gfx/pics/primeape/front.2bpp.lz b/gfx/pics/primeape/front.animated.2bpp.lz.218352ec
index 8f513878f..8f513878f 100644
--- a/gfx/pics/primeape/front.2bpp.lz
+++ b/gfx/pics/primeape/front.animated.2bpp.lz.218352ec
diff --git a/gfx/pics/primeape/front.png b/gfx/pics/primeape/front.png
new file mode 100644
index 000000000..94c2cedba
--- /dev/null
+++ b/gfx/pics/primeape/front.png
diff --git a/gfx/pics/primeape/normal.pal b/gfx/pics/primeape/normal.pal
deleted file mode 100644
index 9888864e2..000000000
--- a/gfx/pics/primeape/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 18, 12
-	RGB 16, 08, 05
-
diff --git a/gfx/pics/psyduck/back.2bpp.lz b/gfx/pics/psyduck/back.2bpp.lz.d68cddb2
index d627a146c..d627a146c 100644
--- a/gfx/pics/psyduck/back.2bpp.lz
+++ b/gfx/pics/psyduck/back.2bpp.lz.d68cddb2
diff --git a/gfx/pics/psyduck/back.png b/gfx/pics/psyduck/back.png
new file mode 100644
index 000000000..e2aab20b1
--- /dev/null
+++ b/gfx/pics/psyduck/back.png
diff --git a/gfx/pics/psyduck/bitmask.asm b/gfx/pics/psyduck/bitmask.asm
deleted file mode 100644
index 87fe02311..000000000
--- a/gfx/pics/psyduck/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %01100000
-	db %00001000
-	db %00000001
-	db %00000000
-; 1
-	db %01100111
-	db %10000000
-	db %00110001
-	db %00000000
-; 0xd2a9f
diff --git a/gfx/pics/psyduck/frames.asm b/gfx/pics/psyduck/frames.asm
deleted file mode 100644
index 12409bdb8..000000000
--- a/gfx/pics/psyduck/frames.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c
-.frame2
-	db $01 ; bitmask
-	db $1d, $1e, $1f, $20, $21, $22, $23, $24, $25
-; 0xd4d08
diff --git a/gfx/pics/psyduck/front.2bpp.lz b/gfx/pics/psyduck/front.animated.2bpp.lz.e4efd065
index 7988f1b0c..7988f1b0c 100644
--- a/gfx/pics/psyduck/front.2bpp.lz
+++ b/gfx/pics/psyduck/front.animated.2bpp.lz.e4efd065
diff --git a/gfx/pics/psyduck/front.png b/gfx/pics/psyduck/front.png
new file mode 100644
index 000000000..a207b04d8
--- /dev/null
+++ b/gfx/pics/psyduck/front.png
diff --git a/gfx/pics/psyduck/normal.pal b/gfx/pics/psyduck/normal.pal
deleted file mode 100644
index 794efb73e..000000000
--- a/gfx/pics/psyduck/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 31, 00
-	RGB 19, 15, 07
-
diff --git a/gfx/pics/pupitar/back.2bpp.lz b/gfx/pics/pupitar/back.2bpp.lz.100020c1
index 46cf0e240..46cf0e240 100644
--- a/gfx/pics/pupitar/back.2bpp.lz
+++ b/gfx/pics/pupitar/back.2bpp.lz.100020c1
diff --git a/gfx/pics/pupitar/back.png b/gfx/pics/pupitar/back.png
new file mode 100644
index 000000000..ae19688ab
--- /dev/null
+++ b/gfx/pics/pupitar/back.png
diff --git a/gfx/pics/pupitar/bitmask.asm b/gfx/pics/pupitar/bitmask.asm
deleted file mode 100644
index 8d0fa45ba..000000000
--- a/gfx/pics/pupitar/bitmask.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-; 0
-	db %00000100
-	db %01000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 1
-	db %00001100
-	db %11000000
-	db %00110000
-	db %00000000
-	db %00000000
-; 0xd3a3c
diff --git a/gfx/pics/pupitar/frames.asm b/gfx/pics/pupitar/frames.asm
deleted file mode 100644
index 20234c804..000000000
--- a/gfx/pics/pupitar/frames.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26
-.frame2
-	db $01 ; bitmask
-	db $27, $28, $29, $2a, $2b, $2c
-; 0xd97cf
diff --git a/gfx/pics/pupitar/front.2bpp.lz b/gfx/pics/pupitar/front.animated.2bpp.lz.418c0962
index c39582db6..c39582db6 100644
--- a/gfx/pics/pupitar/front.2bpp.lz
+++ b/gfx/pics/pupitar/front.animated.2bpp.lz.418c0962
diff --git a/gfx/pics/pupitar/front.png b/gfx/pics/pupitar/front.png
new file mode 100644
index 000000000..afc1897d1
--- /dev/null
+++ b/gfx/pics/pupitar/front.png
diff --git a/gfx/pics/pupitar/normal.pal b/gfx/pics/pupitar/normal.pal
deleted file mode 100644
index 2b92d0804..000000000
--- a/gfx/pics/pupitar/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 15, 20, 28
-	RGB 15, 06, 06
-
diff --git a/gfx/pics/quagsire/back.2bpp.lz b/gfx/pics/quagsire/back.2bpp.lz.64b2ec05
index 543ce394f..543ce394f 100644
--- a/gfx/pics/quagsire/back.2bpp.lz
+++ b/gfx/pics/quagsire/back.2bpp.lz.64b2ec05
diff --git a/gfx/pics/quagsire/back.png b/gfx/pics/quagsire/back.png
new file mode 100644
index 000000000..d83a1b810
--- /dev/null
+++ b/gfx/pics/quagsire/back.png
diff --git a/gfx/pics/quagsire/bitmask.asm b/gfx/pics/quagsire/bitmask.asm
deleted file mode 100644
index afd00bc28..000000000
--- a/gfx/pics/quagsire/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %01100001
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %11000011
-	db %01110001
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %11001111
-	db %11110011
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00001100
-	db %11100011
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd363d
diff --git a/gfx/pics/quagsire/frames.asm b/gfx/pics/quagsire/frames.asm
deleted file mode 100644
index aa0fada5a..000000000
--- a/gfx/pics/quagsire/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26
-.frame2
-	db $01 ; bitmask
-	db $27, $28, $29, $2a, $24, $2b, $2c, $26
-.frame3
-	db $02 ; bitmask
-	db $27, $28, $2d, $2e, $29, $2a, $2f, $30, $2b, $2c, $31, $32
-.frame4
-	db $03 ; bitmask
-	db $33, $34, $35, $36, $25, $37, $38
-; 0xd8d1c
diff --git a/gfx/pics/quagsire/front.2bpp.lz b/gfx/pics/quagsire/front.animated.2bpp.lz.bd292a94
index d1f42f064..d1f42f064 100644
--- a/gfx/pics/quagsire/front.2bpp.lz
+++ b/gfx/pics/quagsire/front.animated.2bpp.lz.bd292a94
diff --git a/gfx/pics/quagsire/front.png b/gfx/pics/quagsire/front.png
new file mode 100644
index 000000000..d64fe3709
--- /dev/null
+++ b/gfx/pics/quagsire/front.png
diff --git a/gfx/pics/quagsire/normal.pal b/gfx/pics/quagsire/normal.pal
deleted file mode 100644
index 22f75da58..000000000
--- a/gfx/pics/quagsire/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 14, 21, 28
-	RGB 14, 03, 20
-
diff --git a/gfx/pics/questionmark/front.2bpp.lz b/gfx/pics/questionmark/front.2bpp.lz.14c284f5
index cd2f7f22e..cd2f7f22e 100644
--- a/gfx/pics/questionmark/front.2bpp.lz
+++ b/gfx/pics/questionmark/front.2bpp.lz.14c284f5
diff --git a/gfx/pics/questionmark/front.png b/gfx/pics/questionmark/front.png
new file mode 100644
index 000000000..e2b681c73
--- /dev/null
+++ b/gfx/pics/questionmark/front.png
diff --git a/gfx/pics/quilava/back.2bpp.lz b/gfx/pics/quilava/back.2bpp.lz.500906e1
index 8514a77c7..8514a77c7 100644
--- a/gfx/pics/quilava/back.2bpp.lz
+++ b/gfx/pics/quilava/back.2bpp.lz.500906e1
diff --git a/gfx/pics/quilava/back.png b/gfx/pics/quilava/back.png
new file mode 100644
index 000000000..79b50b9b0
--- /dev/null
+++ b/gfx/pics/quilava/back.png
diff --git a/gfx/pics/quilava/bitmask.asm b/gfx/pics/quilava/bitmask.asm
deleted file mode 100644
index 816878203..000000000
--- a/gfx/pics/quilava/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00111100
-	db %11110011
-	db %01111100
-	db %11000111
-	db %00000011
-; 1
-	db %00000000
-	db %00000000
-	db %00001000
-	db %00000010
-	db %00000000
-; 2
-	db %00111100
-	db %10111111
-	db %00000100
-	db %00000000
-	db %00000000
-; 0xd3374
diff --git a/gfx/pics/quilava/frames.asm b/gfx/pics/quilava/frames.asm
deleted file mode 100644
index 624a20abc..000000000
--- a/gfx/pics/quilava/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $00, $24, $25, $26, $00, $27, $28, $29, $00, $2a, $2b, $2c
-	db $2d, $2e, $2f, $30, $31, $32, $00, $33, $34, $35
-.frame2
-	db $00 ; bitmask
-	db $00, $24, $25, $26, $00, $27, $28, $29, $00, $2a, $2b, $36
-	db $2d, $2e, $2f, $30, $31, $32, $00, $33, $34, $35
-.frame3
-	db $01 ; bitmask
-	db $37, $38
-.frame4
-	db $02 ; bitmask
-	db $00, $00, $00, $00, $00, $00, $39, $3a, $3b, $3c, $3d, $3e
-; 0xd853b
diff --git a/gfx/pics/quilava/front.2bpp.lz b/gfx/pics/quilava/front.animated.2bpp.lz.f42f4c67
index 33aebb81c..33aebb81c 100644
--- a/gfx/pics/quilava/front.2bpp.lz
+++ b/gfx/pics/quilava/front.animated.2bpp.lz.f42f4c67
diff --git a/gfx/pics/quilava/front.png b/gfx/pics/quilava/front.png
new file mode 100644
index 000000000..96ccbb551
--- /dev/null
+++ b/gfx/pics/quilava/front.png
diff --git a/gfx/pics/quilava/normal.pal b/gfx/pics/quilava/normal.pal
deleted file mode 100644
index bee6c6eba..000000000
--- a/gfx/pics/quilava/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 28, 04
-	RGB 31, 09, 03
-
diff --git a/gfx/pics/qwilfish/back.2bpp.lz b/gfx/pics/qwilfish/back.2bpp.lz.b2bb83c6
index 09f793f47..09f793f47 100644
--- a/gfx/pics/qwilfish/back.2bpp.lz
+++ b/gfx/pics/qwilfish/back.2bpp.lz.b2bb83c6
diff --git a/gfx/pics/qwilfish/back.png b/gfx/pics/qwilfish/back.png
new file mode 100644
index 000000000..107af1018
--- /dev/null
+++ b/gfx/pics/qwilfish/back.png
diff --git a/gfx/pics/qwilfish/bitmask.asm b/gfx/pics/qwilfish/bitmask.asm
deleted file mode 100644
index 64d0473cf..000000000
--- a/gfx/pics/qwilfish/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00000000
-	db %00001000
-	db %00000000
-	db %00000000
-; 1
-	db %10001111
-	db %00101001
-	db %11110110
-	db %00000000
-; 2
-	db %10001111
-	db %00100001
-	db %11110110
-	db %00000000
-; 0xd374a
diff --git a/gfx/pics/qwilfish/frames.asm b/gfx/pics/qwilfish/frames.asm
deleted file mode 100644
index ea01f63bb..000000000
--- a/gfx/pics/qwilfish/frames.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19
-.frame2
-	db $01 ; bitmask
-	db $1a, $1b, $1c, $1d, $1e, $1f, $19, $20, $21, $22, $23, $24
-	db $25, $26
-.frame3
-	db $02 ; bitmask
-	db $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $23, $24, $25
-	db $26
-; 0xd9033
diff --git a/gfx/pics/qwilfish/front.2bpp.lz b/gfx/pics/qwilfish/front.animated.2bpp.lz.9e79c033
index 02370c7ba..02370c7ba 100644
--- a/gfx/pics/qwilfish/front.2bpp.lz
+++ b/gfx/pics/qwilfish/front.animated.2bpp.lz.9e79c033
diff --git a/gfx/pics/qwilfish/front.png b/gfx/pics/qwilfish/front.png
new file mode 100644
index 000000000..15a0415cb
--- /dev/null
+++ b/gfx/pics/qwilfish/front.png
diff --git a/gfx/pics/qwilfish/normal.pal b/gfx/pics/qwilfish/normal.pal
deleted file mode 100644
index e6ba82ca6..000000000
--- a/gfx/pics/qwilfish/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 29, 11
-	RGB 04, 06, 16
-
diff --git a/gfx/pics/raichu/back.2bpp.lz b/gfx/pics/raichu/back.2bpp.lz.fa4c7423
index 912c378e8..912c378e8 100644
--- a/gfx/pics/raichu/back.2bpp.lz
+++ b/gfx/pics/raichu/back.2bpp.lz.fa4c7423
diff --git a/gfx/pics/raichu/back.png b/gfx/pics/raichu/back.png
new file mode 100644
index 000000000..36a0df5f3
--- /dev/null
+++ b/gfx/pics/raichu/back.png
diff --git a/gfx/pics/raichu/bitmask.asm b/gfx/pics/raichu/bitmask.asm
deleted file mode 100644
index 544cfb180..000000000
--- a/gfx/pics/raichu/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %10011000
-	db %11001111
-	db %11000111
-	db %11110011
-	db %00000001
-	db %00000000
-	db %00000000
-; 1
-	db %10011000
-	db %11001111
-	db %11000111
-	db %11110111
-	db %00000001
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00000010
-	db %10000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd28b8
diff --git a/gfx/pics/raichu/frames.asm b/gfx/pics/raichu/frames.asm
deleted file mode 100644
index 7045cf9f5..000000000
--- a/gfx/pics/raichu/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $00, $33, $34, $35, $36, $37, $38, $39, $3a, $3b
-	db $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $00, $33, $34, $45, $36, $37, $38, $39, $3a, $3b
-	db $3c, $3d, $3e, $3f, $46, $40, $41, $42, $47, $44
-.frame3
-	db $01 ; bitmask
-	db $31, $32, $00, $33, $34, $48, $36, $37, $38, $39, $49, $3b
-	db $3c, $3d, $3e, $3f, $46, $40, $41, $4a, $4b, $44
-.frame4
-	db $02 ; bitmask
-	db $4c, $4d, $4e
-; 0xd4731
diff --git a/gfx/pics/raichu/front.2bpp.lz b/gfx/pics/raichu/front.animated.2bpp.lz.25f943cb
index 84115fb00..84115fb00 100644
--- a/gfx/pics/raichu/front.2bpp.lz
+++ b/gfx/pics/raichu/front.animated.2bpp.lz.25f943cb
diff --git a/gfx/pics/raichu/front.png b/gfx/pics/raichu/front.png
new file mode 100644
index 000000000..06bbf12bb
--- /dev/null
+++ b/gfx/pics/raichu/front.png
diff --git a/gfx/pics/raichu/normal.pal b/gfx/pics/raichu/normal.pal
deleted file mode 100644
index f03f62b08..000000000
--- a/gfx/pics/raichu/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 26, 07
-	RGB 31, 12, 00
-
diff --git a/gfx/pics/raikou/back.2bpp.lz b/gfx/pics/raikou/back.2bpp.lz.657ddfaf
index 23fd5c471..23fd5c471 100644
--- a/gfx/pics/raikou/back.2bpp.lz
+++ b/gfx/pics/raikou/back.2bpp.lz.657ddfaf
diff --git a/gfx/pics/raikou/back.png b/gfx/pics/raikou/back.png
new file mode 100644
index 000000000..0214e673c
--- /dev/null
+++ b/gfx/pics/raikou/back.png
diff --git a/gfx/pics/raikou/bitmask.asm b/gfx/pics/raikou/bitmask.asm
deleted file mode 100644
index 7daef5b70..000000000
--- a/gfx/pics/raikou/bitmask.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-; 0
-	db %10011100
-	db %11001111
-	db %10000111
-	db %01000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %11111100
-	db %11111111
-	db %11011111
-	db %11001111
-	db %00000111
-	db %00000000
-	db %00000000
-; 0xd39d9
diff --git a/gfx/pics/raikou/frames.asm b/gfx/pics/raikou/frames.asm
deleted file mode 100644
index d23459811..000000000
--- a/gfx/pics/raikou/frames.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $00, $34, $35, $36, $37, $00, $38, $39, $3a
-	db $3b, $3c, $3d, $3e
-.frame2
-	db $01 ; bitmask
-	db $3f, $40, $41, $42, $43, $00, $44, $45, $46, $47, $48, $49
-	db $00, $4a, $4b, $4c, $4d, $4e, $00, $4f, $50, $51, $52, $53
-	db $54, $55, $56, $57, $58, $59
-.frame3
-	db $01 ; bitmask
-	db $3f, $40, $41, $42, $43, $00, $44, $45, $46, $5a, $48, $49
-	db $00, $4a, $4b, $4c, $4d, $4e, $00, $4f, $50, $51, $52, $53
-	db $54, $55, $56, $57, $58, $59
-.frame4
-	db $00 ; bitmask
-	db $31, $32, $33, $00, $34, $35, $36, $37, $00, $38, $39, $3a
-	db $3b, $3c, $3d, $3e
-.frame5
-	db $00 ; bitmask
-	db $31, $32, $33, $00, $34, $5b, $36, $37, $00, $38, $39, $3a
-	db $3b, $3c, $3d, $3e
-.frame6
-	db $00 ; bitmask
-	db $31, $32, $33, $00, $34, $5c, $36, $37, $00, $38, $39, $3a
-	db $3b, $3c, $3d, $3e
-; 0xd96bf
diff --git a/gfx/pics/raikou/front.2bpp.lz b/gfx/pics/raikou/front.animated.2bpp.lz.464b6fd7
index dba4517aa..dba4517aa 100644
--- a/gfx/pics/raikou/front.2bpp.lz
+++ b/gfx/pics/raikou/front.animated.2bpp.lz.464b6fd7
diff --git a/gfx/pics/raikou/front.png b/gfx/pics/raikou/front.png
new file mode 100644
index 000000000..4854f2571
--- /dev/null
+++ b/gfx/pics/raikou/front.png
diff --git a/gfx/pics/raikou/normal.pal b/gfx/pics/raikou/normal.pal
deleted file mode 100644
index d357a2df0..000000000
--- a/gfx/pics/raikou/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 31, 00
-	RGB 19, 06, 18
-
diff --git a/gfx/pics/rapidash/back.2bpp.lz b/gfx/pics/rapidash/back.2bpp.lz.fdd1946c
index 3854c29e5..3854c29e5 100644
--- a/gfx/pics/rapidash/back.2bpp.lz
+++ b/gfx/pics/rapidash/back.2bpp.lz.fdd1946c
diff --git a/gfx/pics/rapidash/back.png b/gfx/pics/rapidash/back.png
new file mode 100644
index 000000000..70de0e5ec
--- /dev/null
+++ b/gfx/pics/rapidash/back.png
diff --git a/gfx/pics/rapidash/bitmask.asm b/gfx/pics/rapidash/bitmask.asm
deleted file mode 100644
index 7463fcdbe..000000000
--- a/gfx/pics/rapidash/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00000000
-	db %00111000
-	db %00011100
-	db %00000110
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %10011111
-	db %10111111
-	db %01011111
-	db %00010000
-	db %00001000
-	db %00000000
-	db %00000000
-; 2
-	db %00011110
-	db %10111111
-	db %00011111
-	db %00000000
-	db %00010000
-	db %00111000
-	db %00000000
-; 3
-	db %00000000
-	db %00000110
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2cd3
diff --git a/gfx/pics/rapidash/frames.asm b/gfx/pics/rapidash/frames.asm
deleted file mode 100644
index 5072bbd78..000000000
--- a/gfx/pics/rapidash/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $05, $05, $32, $33, $05, $34, $35
-.frame2
-	db $01 ; bitmask
-	db $36, $37, $38, $39, $3a, $3b, $3c, $3d, $3e, $3f, $40, $05
-	db $41, $42, $43, $44, $45, $05, $46, $47, $48
-.frame3
-	db $02 ; bitmask
-	db $49, $38, $39, $4a, $4b, $3d, $3e, $3f, $40, $05, $4c, $42
-	db $43, $44, $45, $05, $4d, $4e, $4f, $50
-.frame4
-	db $03 ; bitmask
-	db $51, $52
-; 0xd5237
diff --git a/gfx/pics/rapidash/front.2bpp.lz b/gfx/pics/rapidash/front.animated.2bpp.lz.d5ac5a96
index 231e312fb..231e312fb 100644
--- a/gfx/pics/rapidash/front.2bpp.lz
+++ b/gfx/pics/rapidash/front.animated.2bpp.lz.d5ac5a96
diff --git a/gfx/pics/rapidash/front.png b/gfx/pics/rapidash/front.png
new file mode 100644
index 000000000..7930fd606
--- /dev/null
+++ b/gfx/pics/rapidash/front.png
diff --git a/gfx/pics/rapidash/normal.pal b/gfx/pics/rapidash/normal.pal
deleted file mode 100644
index da67a88f7..000000000
--- a/gfx/pics/rapidash/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 27, 04
-	RGB 31, 05, 03
-
diff --git a/gfx/pics/raticate/back.2bpp.lz b/gfx/pics/raticate/back.2bpp.lz.b2a77d02
index 4e69587dd..4e69587dd 100644
--- a/gfx/pics/raticate/back.2bpp.lz
+++ b/gfx/pics/raticate/back.2bpp.lz.b2a77d02
diff --git a/gfx/pics/raticate/back.png b/gfx/pics/raticate/back.png
new file mode 100644
index 000000000..fbeef9a41
--- /dev/null
+++ b/gfx/pics/raticate/back.png
diff --git a/gfx/pics/raticate/bitmask.asm b/gfx/pics/raticate/bitmask.asm
deleted file mode 100644
index e4a839f64..000000000
--- a/gfx/pics/raticate/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00001100
-	db %11100011
-	db %00011000
-	db %00000010
-	db %00000000
-; 1
-	db %11011110
-	db %11110011
-	db %00111100
-	db %00000110
-	db %00000000
-; 2
-	db %10000000
-	db %00100000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd282c
diff --git a/gfx/pics/raticate/frames.asm b/gfx/pics/raticate/frames.asm
deleted file mode 100644
index e2da8a1e1..000000000
--- a/gfx/pics/raticate/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d
-.frame2
-	db $01 ; bitmask
-	db $2e, $2f, $30, $31, $32, $33, $34, $35, $36, $37, $38, $39
-	db $3a, $3b, $3c, $3d, $3e, $3f
-.frame3
-	db $02 ; bitmask
-	db $40, $41
-; 0xd45a7
diff --git a/gfx/pics/raticate/front.2bpp.lz b/gfx/pics/raticate/front.animated.2bpp.lz.ef1a4689
index 5b426cbdd..5b426cbdd 100644
--- a/gfx/pics/raticate/front.2bpp.lz
+++ b/gfx/pics/raticate/front.animated.2bpp.lz.ef1a4689
diff --git a/gfx/pics/raticate/front.png b/gfx/pics/raticate/front.png
new file mode 100644
index 000000000..37695c19d
--- /dev/null
+++ b/gfx/pics/raticate/front.png
diff --git a/gfx/pics/raticate/normal.pal b/gfx/pics/raticate/normal.pal
deleted file mode 100644
index 769c93f9e..000000000
--- a/gfx/pics/raticate/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 23, 10
-	RGB 17, 10, 00
-
diff --git a/gfx/pics/rattata/back.2bpp.lz b/gfx/pics/rattata/back.2bpp.lz.86979cd5
index a06c5f1f8..a06c5f1f8 100644
--- a/gfx/pics/rattata/back.2bpp.lz
+++ b/gfx/pics/rattata/back.2bpp.lz.86979cd5
diff --git a/gfx/pics/rattata/back.png b/gfx/pics/rattata/back.png
new file mode 100644
index 000000000..355f16b4b
--- /dev/null
+++ b/gfx/pics/rattata/back.png
diff --git a/gfx/pics/rattata/bitmask.asm b/gfx/pics/rattata/bitmask.asm
deleted file mode 100644
index b15445e5c..000000000
--- a/gfx/pics/rattata/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %11011110
-	db %01111011
-	db %00001111
-	db %00000000
-; 1
-	db %00000000
-	db %00001000
-	db %00100001
-	db %00000000
-; 0xd281d
diff --git a/gfx/pics/rattata/frames.asm b/gfx/pics/rattata/frames.asm
deleted file mode 100644
index 621d4fb5d..000000000
--- a/gfx/pics/rattata/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $00, $19, $1a, $1b, $00, $1c, $1d, $1e, $1f, $20, $21, $22
-	db $23, $24, $25, $26
-.frame2
-	db $00 ; bitmask
-	db $00, $19, $1a, $1b, $00, $1c, $1d, $1e, $1f, $20, $21, $22
-	db $23, $24, $25, $26
-.frame3
-	db $00 ; bitmask
-	db $00, $27, $1a, $1b, $28, $29, $1d, $1e, $1f, $2a, $21, $22
-	db $23, $2b, $25, $26
-.frame4
-	db $01 ; bitmask
-	db $2c, $2d, $00
-; 0xd4580
diff --git a/gfx/pics/rattata/front.2bpp.lz b/gfx/pics/rattata/front.animated.2bpp.lz.5bdaea2b
index 7bb18d542..7bb18d542 100644
--- a/gfx/pics/rattata/front.2bpp.lz
+++ b/gfx/pics/rattata/front.animated.2bpp.lz.5bdaea2b
diff --git a/gfx/pics/rattata/front.png b/gfx/pics/rattata/front.png
new file mode 100644
index 000000000..cb556cbdb
--- /dev/null
+++ b/gfx/pics/rattata/front.png
diff --git a/gfx/pics/rattata/normal.pal b/gfx/pics/rattata/normal.pal
deleted file mode 100644
index 8b71d7ccc..000000000
--- a/gfx/pics/rattata/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 22, 08, 30
-	RGB 16, 03, 17
-
diff --git a/gfx/pics/remoraid/back.2bpp.lz b/gfx/pics/remoraid/back.2bpp.lz.8a6e4f29
index 414d65a14..414d65a14 100644
--- a/gfx/pics/remoraid/back.2bpp.lz
+++ b/gfx/pics/remoraid/back.2bpp.lz.8a6e4f29
diff --git a/gfx/pics/remoraid/back.png b/gfx/pics/remoraid/back.png
new file mode 100644
index 000000000..2abcc55e0
--- /dev/null
+++ b/gfx/pics/remoraid/back.png
diff --git a/gfx/pics/remoraid/bitmask.asm b/gfx/pics/remoraid/bitmask.asm
deleted file mode 100644
index d9beafdb2..000000000
--- a/gfx/pics/remoraid/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00000111
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00000111
-	db %00001000
-	db %10001100
-	db %00000001
-; 2
-	db %00000111
-	db %00001000
-	db %00000000
-	db %00000000
-; 0xd3823
diff --git a/gfx/pics/remoraid/frames.asm b/gfx/pics/remoraid/frames.asm
deleted file mode 100644
index 97dc49c3b..000000000
--- a/gfx/pics/remoraid/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b
-.frame2
-	db $01 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $03, $03
-.frame3
-	db $01 ; bitmask
-	db $19, $1a, $1b, $1c, $1f, $03, $20, $21
-.frame4
-	db $02 ; bitmask
-	db $19, $1a, $1b, $1c
-; 0xd9262
diff --git a/gfx/pics/remoraid/front.2bpp.lz b/gfx/pics/remoraid/front.animated.2bpp.lz.4eaf1230
index 6d702b4a1..6d702b4a1 100644
--- a/gfx/pics/remoraid/front.2bpp.lz
+++ b/gfx/pics/remoraid/front.animated.2bpp.lz.4eaf1230
diff --git a/gfx/pics/remoraid/front.png b/gfx/pics/remoraid/front.png
new file mode 100644
index 000000000..d92ff5838
--- /dev/null
+++ b/gfx/pics/remoraid/front.png
diff --git a/gfx/pics/remoraid/normal.pal b/gfx/pics/remoraid/normal.pal
deleted file mode 100644
index 5373535b1..000000000
--- a/gfx/pics/remoraid/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 18, 17, 30
-	RGB 07, 10, 15
-
diff --git a/gfx/pics/rhydon/back.2bpp.lz b/gfx/pics/rhydon/back.2bpp.lz.4a3ea4af
index b626f4ce6..b626f4ce6 100644
--- a/gfx/pics/rhydon/back.2bpp.lz
+++ b/gfx/pics/rhydon/back.2bpp.lz.4a3ea4af
diff --git a/gfx/pics/rhydon/back.png b/gfx/pics/rhydon/back.png
new file mode 100644
index 000000000..4b6f89869
--- /dev/null
+++ b/gfx/pics/rhydon/back.png
diff --git a/gfx/pics/rhydon/bitmask.asm b/gfx/pics/rhydon/bitmask.asm
deleted file mode 100644
index 1a5064c1d..000000000
--- a/gfx/pics/rhydon/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %00000100
-	db %00000110
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %10001111
-	db %11000111
-	db %11100011
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %10000000
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2fdc
diff --git a/gfx/pics/rhydon/frames.asm b/gfx/pics/rhydon/frames.asm
deleted file mode 100644
index a87f8370a..000000000
--- a/gfx/pics/rhydon/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33
-.frame2
-	db $01 ; bitmask
-	db $34, $35, $36, $37, $38, $39, $3a, $3b, $3c, $3d, $3e, $3f
-	db $40, $41, $42, $43
-.frame3
-	db $01 ; bitmask
-	db $34, $44, $45, $37, $38, $39, $46, $3b, $3c, $3d, $3e, $3f
-	db $40, $41, $42, $43
-.frame4
-	db $02 ; bitmask
-	db $47, $48
-; 0xd5991
diff --git a/gfx/pics/rhydon/front.2bpp.lz b/gfx/pics/rhydon/front.animated.2bpp.lz.7257fc4f
index 0ad1c221b..0ad1c221b 100644
--- a/gfx/pics/rhydon/front.2bpp.lz
+++ b/gfx/pics/rhydon/front.animated.2bpp.lz.7257fc4f
diff --git a/gfx/pics/rhydon/front.png b/gfx/pics/rhydon/front.png
new file mode 100644
index 000000000..18a5f0aed
--- /dev/null
+++ b/gfx/pics/rhydon/front.png
diff --git a/gfx/pics/rhydon/normal.pal b/gfx/pics/rhydon/normal.pal
deleted file mode 100644
index 5dbf17032..000000000
--- a/gfx/pics/rhydon/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 15, 11, 17
-	RGB 07, 09, 04
-
diff --git a/gfx/pics/rhyhorn/back.2bpp.lz b/gfx/pics/rhyhorn/back.2bpp.lz.b9a8e755
index bfcafdcb4..bfcafdcb4 100644
--- a/gfx/pics/rhyhorn/back.2bpp.lz
+++ b/gfx/pics/rhyhorn/back.2bpp.lz.b9a8e755
diff --git a/gfx/pics/rhyhorn/back.png b/gfx/pics/rhyhorn/back.png
new file mode 100644
index 000000000..d2f6aa62f
--- /dev/null
+++ b/gfx/pics/rhyhorn/back.png
diff --git a/gfx/pics/rhyhorn/bitmask.asm b/gfx/pics/rhyhorn/bitmask.asm
deleted file mode 100644
index b5c02fc90..000000000
--- a/gfx/pics/rhyhorn/bitmask.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-; 0
-	db %00111100
-	db %10011111
-	db %10001111
-	db %00000111
-	db %00000011
-	db %00000000
-	db %00000000
-; 1
-	db %00111100
-	db %10011111
-	db %11001111
-	db %00110111
-	db %00010011
-	db %00011000
-	db %00000000
-; 0xd2fc7
diff --git a/gfx/pics/rhyhorn/frames.asm b/gfx/pics/rhyhorn/frames.asm
deleted file mode 100644
index 93875b4dd..000000000
--- a/gfx/pics/rhyhorn/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f, $40, $41, $42, $43, $44
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $45, $46, $3c
-	db $3d, $3e, $47, $3f, $40, $41, $42, $48, $49, $43, $44, $4a
-	db $4b, $4c
-.frame3
-	db $00 ; bitmask
-	db $31, $32, $33, $4d, $35, $36, $37, $4e, $4f, $3a, $3b, $3c
-	db $50, $51, $3f, $40, $41, $42, $43, $44
-; 0xd5960
diff --git a/gfx/pics/rhyhorn/front.2bpp.lz b/gfx/pics/rhyhorn/front.animated.2bpp.lz.bdfdf7dc
index 62a2e8919..62a2e8919 100644
--- a/gfx/pics/rhyhorn/front.2bpp.lz
+++ b/gfx/pics/rhyhorn/front.animated.2bpp.lz.bdfdf7dc
diff --git a/gfx/pics/rhyhorn/front.png b/gfx/pics/rhyhorn/front.png
new file mode 100644
index 000000000..e053a9703
--- /dev/null
+++ b/gfx/pics/rhyhorn/front.png
diff --git a/gfx/pics/rhyhorn/normal.pal b/gfx/pics/rhyhorn/normal.pal
deleted file mode 100644
index 5dbf17032..000000000
--- a/gfx/pics/rhyhorn/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 15, 11, 17
-	RGB 07, 09, 04
-
diff --git a/gfx/pics/sandshrew/back.2bpp.lz b/gfx/pics/sandshrew/back.2bpp.lz.7655193f
index 63ddb82a1..63ddb82a1 100644
--- a/gfx/pics/sandshrew/back.2bpp.lz
+++ b/gfx/pics/sandshrew/back.2bpp.lz.7655193f
diff --git a/gfx/pics/sandshrew/back.png b/gfx/pics/sandshrew/back.png
new file mode 100644
index 000000000..c23af0677
--- /dev/null
+++ b/gfx/pics/sandshrew/back.png
diff --git a/gfx/pics/sandshrew/bitmask.asm b/gfx/pics/sandshrew/bitmask.asm
deleted file mode 100644
index 42e84c4ab..000000000
--- a/gfx/pics/sandshrew/bitmask.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-; 0
-	db %11100011
-	db %00111101
-	db %00000001
-	db %00000000
-; 1
-	db %00000010
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %01000000
-	db %00000000
-; 0xd28c8
diff --git a/gfx/pics/sandshrew/frames.asm b/gfx/pics/sandshrew/frames.asm
deleted file mode 100644
index a4d496760..000000000
--- a/gfx/pics/sandshrew/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $0f
-.frame2
-	db $00 ; bitmask
-	db $19, $1a, $1b, $23, $24, $1e, $1f, $25, $26, $22, $0f
-.frame3
-	db $01 ; bitmask
-	db $27
-.frame4
-	db $02 ; bitmask
-	db $28
-.frame5
-	db $03 ; bitmask
-	db $29
-; 0xd4759
diff --git a/gfx/pics/sandshrew/front.2bpp.lz b/gfx/pics/sandshrew/front.animated.2bpp.lz.758def3d
index 3d1da3087..3d1da3087 100644
--- a/gfx/pics/sandshrew/front.2bpp.lz
+++ b/gfx/pics/sandshrew/front.animated.2bpp.lz.758def3d
diff --git a/gfx/pics/sandshrew/front.png b/gfx/pics/sandshrew/front.png
new file mode 100644
index 000000000..44b69f12b
--- /dev/null
+++ b/gfx/pics/sandshrew/front.png
diff --git a/gfx/pics/sandshrew/normal.pal b/gfx/pics/sandshrew/normal.pal
deleted file mode 100644
index 8039e0086..000000000
--- a/gfx/pics/sandshrew/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 22, 18, 06
-	RGB 12, 07, 01
-
diff --git a/gfx/pics/sandslash/back.2bpp.lz b/gfx/pics/sandslash/back.2bpp.lz.2999f4c6
index 52bb7ce7d..52bb7ce7d 100644
--- a/gfx/pics/sandslash/back.2bpp.lz
+++ b/gfx/pics/sandslash/back.2bpp.lz.2999f4c6
diff --git a/gfx/pics/sandslash/back.png b/gfx/pics/sandslash/back.png
new file mode 100644
index 000000000..43704ad08
--- /dev/null
+++ b/gfx/pics/sandslash/back.png
diff --git a/gfx/pics/sandslash/bitmask.asm b/gfx/pics/sandslash/bitmask.asm
deleted file mode 100644
index f09f721bb..000000000
--- a/gfx/pics/sandslash/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00000000
-	db %11100000
-	db %00111000
-	db %00000100
-	db %00000000
-; 1
-	db %00001100
-	db %10000111
-	db %01100011
-	db %00011000
-	db %00001110
-; 2
-	db %00000000
-	db %01000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd28d7
diff --git a/gfx/pics/sandslash/frames.asm b/gfx/pics/sandslash/frames.asm
deleted file mode 100644
index ba6a1d8f8..000000000
--- a/gfx/pics/sandslash/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a
-.frame2
-	db $01 ; bitmask
-	db $00, $00, $2b, $2c, $2d, $2e, $2f, $30, $31, $32, $33, $34
-	db $35, $00, $00
-.frame3
-	db $02 ; bitmask
-	db $36, $37
-.frame4
-	db $01 ; bitmask
-	db $00, $00, $2b, $38, $39, $2e, $3a, $30, $3b, $3c, $3d, $3e
-	db $35, $00, $00
-; 0xd478c
diff --git a/gfx/pics/sandslash/front.2bpp.lz b/gfx/pics/sandslash/front.animated.2bpp.lz.d6498722
index cdffe9baf..cdffe9baf 100644
--- a/gfx/pics/sandslash/front.2bpp.lz
+++ b/gfx/pics/sandslash/front.animated.2bpp.lz.d6498722
diff --git a/gfx/pics/sandslash/front.png b/gfx/pics/sandslash/front.png
new file mode 100644
index 000000000..adda651e1
--- /dev/null
+++ b/gfx/pics/sandslash/front.png
diff --git a/gfx/pics/sandslash/normal.pal b/gfx/pics/sandslash/normal.pal
deleted file mode 100644
index 0c2b451d9..000000000
--- a/gfx/pics/sandslash/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 18, 00
-	RGB 13, 07, 00
-
diff --git a/gfx/pics/scizor/back.2bpp.lz b/gfx/pics/scizor/back.2bpp.lz.85149f27
index 5a02e7000..5a02e7000 100644
--- a/gfx/pics/scizor/back.2bpp.lz
+++ b/gfx/pics/scizor/back.2bpp.lz.85149f27
diff --git a/gfx/pics/scizor/back.png b/gfx/pics/scizor/back.png
new file mode 100644
index 000000000..53cef907e
--- /dev/null
+++ b/gfx/pics/scizor/back.png
diff --git a/gfx/pics/scizor/bitmask.asm b/gfx/pics/scizor/bitmask.asm
deleted file mode 100644
index 628329295..000000000
--- a/gfx/pics/scizor/bitmask.asm
+++ /dev/null
@@ -1,49 +0,0 @@
-; 0
-	db %00111100
-	db %00011110
-	db %10000111
-	db %11000011
-	db %11000001
-	db %11100001
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %11100000
-	db %11110001
-	db %00000000
-; 2
-	db %00111100
-	db %00011110
-	db %00000111
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %10000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 4
-	db %00111100
-	db %00011110
-	db %10000111
-	db %00000000
-	db %11100000
-	db %11110001
-	db %00000000
-; 5
-	db %00111000
-	db %00011110
-	db %00000111
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3774
diff --git a/gfx/pics/scizor/frames.asm b/gfx/pics/scizor/frames.asm
deleted file mode 100644
index aeae2522f..000000000
--- a/gfx/pics/scizor/frames.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $00, $34, $35, $36, $37, $38, $39, $3a, $3b
-	db $3c, $3d, $3e, $3f, $40, $41, $42, $43, $00, $00, $00
-.frame2
-	db $01 ; bitmask
-	db $44, $45, $46, $43, $47, $2e, $2f, $00
-.frame3
-	db $02 ; bitmask
-	db $48, $00, $00, $00, $49, $4a, $4b, $37, $4c, $4d, $4e
-.frame4
-	db $03 ; bitmask
-	db $4f
-.frame5
-	db $04 ; bitmask
-	db $31, $32, $33, $00, $34, $35, $36, $37, $38, $50, $51, $4f
-	db $44, $45, $46, $43, $47, $2e, $2f, $00
-.frame6
-	db $05 ; bitmask
-	db $52, $00, $00, $53, $54, $4b, $37, $55, $4d, $4e
-; 0xd908e
diff --git a/gfx/pics/scizor/front.2bpp.lz b/gfx/pics/scizor/front.animated.2bpp.lz.afd0131a
index e7d506f48..e7d506f48 100644
--- a/gfx/pics/scizor/front.2bpp.lz
+++ b/gfx/pics/scizor/front.animated.2bpp.lz.afd0131a
diff --git a/gfx/pics/scizor/front.png b/gfx/pics/scizor/front.png
new file mode 100644
index 000000000..2adfb879f
--- /dev/null
+++ b/gfx/pics/scizor/front.png
diff --git a/gfx/pics/scizor/normal.pal b/gfx/pics/scizor/normal.pal
deleted file mode 100644
index 6dd98afbb..000000000
--- a/gfx/pics/scizor/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 08, 08
-	RGB 07, 08, 13
-
diff --git a/gfx/pics/scyther/back.2bpp.lz b/gfx/pics/scyther/back.2bpp.lz.1d7f8a87
index 421fc4ed0..421fc4ed0 100644
--- a/gfx/pics/scyther/back.2bpp.lz
+++ b/gfx/pics/scyther/back.2bpp.lz.1d7f8a87
diff --git a/gfx/pics/scyther/back.png b/gfx/pics/scyther/back.png
new file mode 100644
index 000000000..6af485895
--- /dev/null
+++ b/gfx/pics/scyther/back.png
diff --git a/gfx/pics/scyther/bitmask.asm b/gfx/pics/scyther/bitmask.asm
deleted file mode 100644
index 7463aafd1..000000000
--- a/gfx/pics/scyther/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %01111110
-	db %10001111
-	db %11000011
-	db %11100011
-	db %11110001
-	db %11100000
-	db %00000000
-; 1
-	db %00000110
-	db %10000011
-	db %11000001
-	db %11100001
-	db %01110000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %10000000
-	db %11000000
-	db %11100001
-	db %01110000
-	db %00000000
-	db %00000000
-; 3
-	db %00000110
-	db %10000011
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd30c9
diff --git a/gfx/pics/scyther/frames.asm b/gfx/pics/scyther/frames.asm
deleted file mode 100644
index 4668c0ff1..000000000
--- a/gfx/pics/scyther/frames.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $1c, $1c, $1c, $1c, $33, $34, $35, $36, $37, $38
-	db $39, $3a, $3b, $3c, $3d, $3e, $3f, $40, $41, $1c, $42, $43
-	db $44, $1c, $1c, $1c
-.frame2
-	db $00 ; bitmask
-	db $45, $1c, $1c, $1c, $1c, $1c, $46, $47, $48, $36, $49, $38
-	db $4a, $3a, $3b, $4b, $3d, $3e, $3f, $40, $4c, $1c, $42, $43
-	db $44, $1c, $1c, $1c
-.frame3
-	db $01 ; bitmask
-	db $45, $1c, $46, $47, $49, $38, $3a, $3b, $4d, $3e, $3f, $4e
-	db $1c, $42, $4f
-.frame4
-	db $01 ; bitmask
-	db $45, $1c, $46, $47, $49, $38, $3a, $3b, $4d, $3e, $3f, $4e
-	db $1c, $42, $4f
-.frame5
-	db $02 ; bitmask
-	db $50, $3a, $3b, $4d, $3e, $3f, $4e, $1c, $42, $4f
-.frame6
-	db $03 ; bitmask
-	db $45, $1c, $46, $47, $51, $38
-; 0xd5bd8
diff --git a/gfx/pics/scyther/front.2bpp.lz b/gfx/pics/scyther/front.animated.2bpp.lz.86d1a281
index 02773fc11..02773fc11 100644
--- a/gfx/pics/scyther/front.2bpp.lz
+++ b/gfx/pics/scyther/front.animated.2bpp.lz.86d1a281
diff --git a/gfx/pics/scyther/front.png b/gfx/pics/scyther/front.png
new file mode 100644
index 000000000..088adc5a4
--- /dev/null
+++ b/gfx/pics/scyther/front.png
diff --git a/gfx/pics/scyther/normal.pal b/gfx/pics/scyther/normal.pal
deleted file mode 100644
index ce30374e5..000000000
--- a/gfx/pics/scyther/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 15, 26, 00
-	RGB 23, 25, 00
-
diff --git a/gfx/pics/seadra/back.2bpp.lz b/gfx/pics/seadra/back.2bpp.lz.354a02e4
index ba9025832..ba9025832 100644
--- a/gfx/pics/seadra/back.2bpp.lz
+++ b/gfx/pics/seadra/back.2bpp.lz.354a02e4
diff --git a/gfx/pics/seadra/back.png b/gfx/pics/seadra/back.png
new file mode 100644
index 000000000..45ea0bd90
--- /dev/null
+++ b/gfx/pics/seadra/back.png
diff --git a/gfx/pics/seadra/bitmask.asm b/gfx/pics/seadra/bitmask.asm
deleted file mode 100644
index 35c11d467..000000000
--- a/gfx/pics/seadra/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00001000
-	db %00000110
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %10011111
-	db %00000111
-	db %00100000
-	db %10001110
-	db %00000111
-; 2
-	db %00011000
-	db %00000110
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd303c
diff --git a/gfx/pics/seadra/frames.asm b/gfx/pics/seadra/frames.asm
deleted file mode 100644
index 13b4878c4..000000000
--- a/gfx/pics/seadra/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26
-.frame2
-	db $01 ; bitmask
-	db $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f, $30, $31, $32
-	db $33, $34, $35, $36, $05
-.frame3
-	db $02 ; bitmask
-	db $2a, $2b, $2e, $2f
-; 0xd5a6c
diff --git a/gfx/pics/seadra/front.2bpp.lz b/gfx/pics/seadra/front.animated.2bpp.lz.efa9c88c
index 6d63f3645..6d63f3645 100644
--- a/gfx/pics/seadra/front.2bpp.lz
+++ b/gfx/pics/seadra/front.animated.2bpp.lz.efa9c88c
diff --git a/gfx/pics/seadra/front.png b/gfx/pics/seadra/front.png
new file mode 100644
index 000000000..00a2a827d
--- /dev/null
+++ b/gfx/pics/seadra/front.png
diff --git a/gfx/pics/seadra/normal.pal b/gfx/pics/seadra/normal.pal
deleted file mode 100644
index 93b323071..000000000
--- a/gfx/pics/seadra/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 22, 16
-	RGB 09, 16, 31
-
diff --git a/gfx/pics/seaking/back.2bpp.lz b/gfx/pics/seaking/back.2bpp.lz.3e699249
index 328a1fb55..328a1fb55 100644
--- a/gfx/pics/seaking/back.2bpp.lz
+++ b/gfx/pics/seaking/back.2bpp.lz.3e699249
diff --git a/gfx/pics/seaking/back.png b/gfx/pics/seaking/back.png
new file mode 100644
index 000000000..121608b9f
--- /dev/null
+++ b/gfx/pics/seaking/back.png
diff --git a/gfx/pics/seaking/bitmask.asm b/gfx/pics/seaking/bitmask.asm
deleted file mode 100644
index 6a4a854e3..000000000
--- a/gfx/pics/seaking/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %01100000
-	db %00100000
-	db %00010000
-	db %00110000
-	db %00100100
-	db %01110111
-	db %00000000
-; 1
-	db %01100000
-	db %00100000
-	db %00110000
-	db %00100000
-	db %00000100
-	db %01111110
-	db %00000000
-; 2
-	db %00000000
-	db %00100000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00100000
-	db %00010000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3067
diff --git a/gfx/pics/seaking/frames.asm b/gfx/pics/seaking/frames.asm
deleted file mode 100644
index 0bef27ed1..000000000
--- a/gfx/pics/seaking/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e
-.frame2
-	db $01 ; bitmask
-	db $3f, $40, $41, $42, $43, $44, $45, $46, $47, $48, $49, $4a
-	db $3e
-.frame3
-	db $02 ; bitmask
-	db $33
-.frame4
-	db $03 ; bitmask
-	db $41, $42
-; 0xd5ab2
diff --git a/gfx/pics/seaking/front.2bpp.lz b/gfx/pics/seaking/front.animated.2bpp.lz.fb4eb288
index e204f1025..e204f1025 100644
--- a/gfx/pics/seaking/front.2bpp.lz
+++ b/gfx/pics/seaking/front.animated.2bpp.lz.fb4eb288
diff --git a/gfx/pics/seaking/front.png b/gfx/pics/seaking/front.png
new file mode 100644
index 000000000..7b06f5a27
--- /dev/null
+++ b/gfx/pics/seaking/front.png
diff --git a/gfx/pics/seaking/normal.pal b/gfx/pics/seaking/normal.pal
deleted file mode 100644
index 2adfee5c9..000000000
--- a/gfx/pics/seaking/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 19, 22, 30
-	RGB 31, 10, 02
-
diff --git a/gfx/pics/seel/back.2bpp.lz b/gfx/pics/seel/back.2bpp.lz.518a4d40
index 0d5b89dae..0d5b89dae 100644
--- a/gfx/pics/seel/back.2bpp.lz
+++ b/gfx/pics/seel/back.2bpp.lz.518a4d40
diff --git a/gfx/pics/seel/back.png b/gfx/pics/seel/back.png
new file mode 100644
index 000000000..45c050d44
--- /dev/null
+++ b/gfx/pics/seel/back.png
diff --git a/gfx/pics/seel/bitmask.asm b/gfx/pics/seel/bitmask.asm
deleted file mode 100644
index 057a06a50..000000000
--- a/gfx/pics/seel/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %11001111
-	db %01110001
-	db %00001100
-	db %00000011
-	db %00000000
-; 1
-	db %00000000
-	db %11000010
-	db %01100001
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %01000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd2d73
diff --git a/gfx/pics/seel/frames.asm b/gfx/pics/seel/frames.asm
deleted file mode 100644
index 48af98244..000000000
--- a/gfx/pics/seel/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $1e, $2e
-	db $1e, $1e
-.frame2
-	db $01 ; bitmask
-	db $2f, $30, $31, $32, $33, $34
-.frame3
-	db $02 ; bitmask
-	db $35, $36
-; 0xd53c4
diff --git a/gfx/pics/seel/front.2bpp.lz b/gfx/pics/seel/front.animated.2bpp.lz.2dc48023
index c8f1343d6..c8f1343d6 100644
--- a/gfx/pics/seel/front.2bpp.lz
+++ b/gfx/pics/seel/front.animated.2bpp.lz.2dc48023
diff --git a/gfx/pics/seel/front.png b/gfx/pics/seel/front.png
new file mode 100644
index 000000000..a25d50d2f
--- /dev/null
+++ b/gfx/pics/seel/front.png
diff --git a/gfx/pics/seel/normal.pal b/gfx/pics/seel/normal.pal
deleted file mode 100644
index 9c09450cb..000000000
--- a/gfx/pics/seel/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 19, 21, 31
-	RGB 29, 09, 13
-
diff --git a/gfx/pics/sentret/back.2bpp.lz b/gfx/pics/sentret/back.2bpp.lz.c19b7f3b
index 511ba5465..511ba5465 100644
--- a/gfx/pics/sentret/back.2bpp.lz
+++ b/gfx/pics/sentret/back.2bpp.lz.c19b7f3b
diff --git a/gfx/pics/sentret/back.png b/gfx/pics/sentret/back.png
new file mode 100644
index 000000000..ce452af47
--- /dev/null
+++ b/gfx/pics/sentret/back.png
diff --git a/gfx/pics/sentret/bitmask.asm b/gfx/pics/sentret/bitmask.asm
deleted file mode 100644
index d50ae28c1..000000000
--- a/gfx/pics/sentret/bitmask.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-; 0
-	db %10000000
-	db %11110001
-	db %11111101
-	db %00000110
-	db %00000000
-; 1
-	db %00000000
-	db %00100000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd33cf
diff --git a/gfx/pics/sentret/frames.asm b/gfx/pics/sentret/frames.asm
deleted file mode 100644
index ef9ce4b84..000000000
--- a/gfx/pics/sentret/frames.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $30, $31, $32
-.frame2
-	db $01 ; bitmask
-	db $33
-; 0xd868a
diff --git a/gfx/pics/sentret/front.2bpp.lz b/gfx/pics/sentret/front.animated.2bpp.lz.07c594c0
index 229aa430c..229aa430c 100644
--- a/gfx/pics/sentret/front.2bpp.lz
+++ b/gfx/pics/sentret/front.animated.2bpp.lz.07c594c0
diff --git a/gfx/pics/sentret/front.png b/gfx/pics/sentret/front.png
new file mode 100644
index 000000000..6e080188a
--- /dev/null
+++ b/gfx/pics/sentret/front.png
diff --git a/gfx/pics/sentret/normal.pal b/gfx/pics/sentret/normal.pal
deleted file mode 100644
index 2d0891fb6..000000000
--- a/gfx/pics/sentret/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 22, 15, 10
-	RGB 15, 07, 04
-
diff --git a/gfx/pics/shellder/back.2bpp.lz b/gfx/pics/shellder/back.2bpp.lz.61e27953
index f0d93b8a8..f0d93b8a8 100644
--- a/gfx/pics/shellder/back.2bpp.lz
+++ b/gfx/pics/shellder/back.2bpp.lz.61e27953
diff --git a/gfx/pics/shellder/back.png b/gfx/pics/shellder/back.png
new file mode 100644
index 000000000..be61dc743
--- /dev/null
+++ b/gfx/pics/shellder/back.png
diff --git a/gfx/pics/shellder/bitmask.asm b/gfx/pics/shellder/bitmask.asm
deleted file mode 100644
index a925781f8..000000000
--- a/gfx/pics/shellder/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %00011000
-	db %01100011
-	db %00000000
-	db %00000000
-; 1
-	db %10011000
-	db %01110011
-	db %00000110
-	db %00000000
-; 0xd2ddf
diff --git a/gfx/pics/shellder/frames.asm b/gfx/pics/shellder/frames.asm
deleted file mode 100644
index 7896b134e..000000000
--- a/gfx/pics/shellder/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $00, $1a, $1b, $1c, $1d
-.frame2
-	db $00 ; bitmask
-	db $1e, $00, $1f, $1b, $20, $1d
-.frame3
-	db $01 ; bitmask
-	db $1e, $00, $21, $1f, $1b, $22, $23, $1d, $24, $25
-; 0xd54ab
diff --git a/gfx/pics/shellder/front.2bpp.lz b/gfx/pics/shellder/front.animated.2bpp.lz.df57d475
index 5a444cfa6..5a444cfa6 100644
--- a/gfx/pics/shellder/front.2bpp.lz
+++ b/gfx/pics/shellder/front.animated.2bpp.lz.df57d475
diff --git a/gfx/pics/shellder/front.png b/gfx/pics/shellder/front.png
new file mode 100644
index 000000000..ff863bb56
--- /dev/null
+++ b/gfx/pics/shellder/front.png
diff --git a/gfx/pics/shellder/normal.pal b/gfx/pics/shellder/normal.pal
deleted file mode 100644
index c36e0c685..000000000
--- a/gfx/pics/shellder/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 16, 08, 13
-	RGB 21, 07, 01
-
diff --git a/gfx/pics/shuckle/back.2bpp.lz b/gfx/pics/shuckle/back.2bpp.lz.8d66899b
index 1cc4efcea..1cc4efcea 100644
--- a/gfx/pics/shuckle/back.2bpp.lz
+++ b/gfx/pics/shuckle/back.2bpp.lz.8d66899b
diff --git a/gfx/pics/shuckle/back.png b/gfx/pics/shuckle/back.png
new file mode 100644
index 000000000..9e38480d7
--- /dev/null
+++ b/gfx/pics/shuckle/back.png
diff --git a/gfx/pics/shuckle/bitmask.asm b/gfx/pics/shuckle/bitmask.asm
deleted file mode 100644
index 70510aaf6..000000000
--- a/gfx/pics/shuckle/bitmask.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-; 0
-	db %01100000
-	db %10011100
-	db %00000001
-	db %00000000
-; 1
-	db %01100000
-	db %10011100
-	db %00000011
-	db %00000000
-; 2
-	db %01111000
-	db %10011110
-	db %10000011
-	db %00000001
-; 3
-	db %00000000
-	db %00000100
-	db %00000000
-	db %00000000
-; 0xd3784
diff --git a/gfx/pics/shuckle/frames.asm b/gfx/pics/shuckle/frames.asm
deleted file mode 100644
index 803bd56a6..000000000
--- a/gfx/pics/shuckle/frames.asm
+++ /dev/null
@@ -1,18 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $00, $00, $00, $19, $1a, $00, $1b
-.frame2
-	db $01 ; bitmask
-	db $00, $00, $00, $00, $1c, $00, $00, $1d
-.frame3
-	db $02 ; bitmask
-	db $1e, $1f, $00, $00, $20, $00, $00, $1c, $00, $00, $1d, $21
-	db $22
-.frame4
-	db $03 ; bitmask
-	db $23
-; 0xd90b7
diff --git a/gfx/pics/shuckle/front.2bpp.lz b/gfx/pics/shuckle/front.animated.2bpp.lz.dee153d4
index 95e78302a..95e78302a 100644
--- a/gfx/pics/shuckle/front.2bpp.lz
+++ b/gfx/pics/shuckle/front.animated.2bpp.lz.dee153d4
diff --git a/gfx/pics/shuckle/front.png b/gfx/pics/shuckle/front.png
new file mode 100644
index 000000000..5220fe21d
--- /dev/null
+++ b/gfx/pics/shuckle/front.png
diff --git a/gfx/pics/shuckle/normal.pal b/gfx/pics/shuckle/normal.pal
deleted file mode 100644
index b52e7ed89..000000000
--- a/gfx/pics/shuckle/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 22, 05
-	RGB 21, 04, 03
-
diff --git a/gfx/pics/skarmory/back.2bpp.lz b/gfx/pics/skarmory/back.2bpp.lz.f5e2e2e4
index fca13d16a..fca13d16a 100644
--- a/gfx/pics/skarmory/back.2bpp.lz
+++ b/gfx/pics/skarmory/back.2bpp.lz.f5e2e2e4
diff --git a/gfx/pics/skarmory/back.png b/gfx/pics/skarmory/back.png
new file mode 100644
index 000000000..7005cb336
--- /dev/null
+++ b/gfx/pics/skarmory/back.png
diff --git a/gfx/pics/skarmory/bitmask.asm b/gfx/pics/skarmory/bitmask.asm
deleted file mode 100644
index e31550d83..000000000
--- a/gfx/pics/skarmory/bitmask.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-; 0
-	db %10000110
-	db %11000011
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %10001111
-	db %11000111
-	db %11000001
-	db %11110001
-	db %01111000
-	db %00111100
-	db %00000000
-; 0xd3888
diff --git a/gfx/pics/skarmory/frames.asm b/gfx/pics/skarmory/frames.asm
deleted file mode 100644
index f0eb2f4c6..000000000
--- a/gfx/pics/skarmory/frames.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38
-.frame2
-	db $01 ; bitmask
-	db $39, $3a, $3b, $04, $33, $34, $3c, $3d, $36, $37, $38, $3e
-	db $3f, $40, $41, $42, $43, $44, $45, $46, $47, $48, $49, $4a
-	db $4b, $04
-; 0xd932a
diff --git a/gfx/pics/skarmory/front.2bpp.lz b/gfx/pics/skarmory/front.animated.2bpp.lz.7de4675e
index e53f5a9ef..e53f5a9ef 100644
--- a/gfx/pics/skarmory/front.2bpp.lz
+++ b/gfx/pics/skarmory/front.animated.2bpp.lz.7de4675e
diff --git a/gfx/pics/skarmory/front.png b/gfx/pics/skarmory/front.png
new file mode 100644
index 000000000..68e39d93d
--- /dev/null
+++ b/gfx/pics/skarmory/front.png
diff --git a/gfx/pics/skarmory/normal.pal b/gfx/pics/skarmory/normal.pal
deleted file mode 100644
index 92f01660d..000000000
--- a/gfx/pics/skarmory/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 19, 13, 31
-	RGB 17, 07, 04
-
diff --git a/gfx/pics/skiploom/back.2bpp.lz b/gfx/pics/skiploom/back.2bpp.lz.54e87a0c
index 8b197406c..8b197406c 100644
--- a/gfx/pics/skiploom/back.2bpp.lz
+++ b/gfx/pics/skiploom/back.2bpp.lz.54e87a0c
diff --git a/gfx/pics/skiploom/back.png b/gfx/pics/skiploom/back.png
new file mode 100644
index 000000000..ffe1de918
--- /dev/null
+++ b/gfx/pics/skiploom/back.png
diff --git a/gfx/pics/skiploom/bitmask.asm b/gfx/pics/skiploom/bitmask.asm
deleted file mode 100644
index 9569dffdd..000000000
--- a/gfx/pics/skiploom/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %10000000
-	db %01110001
-	db %00011100
-	db %00000110
-	db %00000000
-; 1
-	db %10000000
-	db %11110001
-	db %00111100
-	db %00000110
-	db %00000000
-; 2
-	db %00000000
-	db %01000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd35c2
diff --git a/gfx/pics/skiploom/frames.asm b/gfx/pics/skiploom/frames.asm
deleted file mode 100644
index c552a3f81..000000000
--- a/gfx/pics/skiploom/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $00, $24, $25, $26, $27, $28, $29, $2a, $00, $2b
-.frame2
-	db $01 ; bitmask
-	db $00, $24, $25, $26, $27, $2c, $28, $29, $2a, $2d, $00, $2b
-.frame3
-	db $01 ; bitmask
-	db $2e, $24, $2f, $30, $31, $2c, $32, $33, $34, $2d, $00, $2b
-.frame4
-	db $02 ; bitmask
-	db $35, $36
-; 0xd8c1c
diff --git a/gfx/pics/skiploom/front.2bpp.lz b/gfx/pics/skiploom/front.animated.2bpp.lz.6436d556
index f48561c76..f48561c76 100644
--- a/gfx/pics/skiploom/front.2bpp.lz
+++ b/gfx/pics/skiploom/front.animated.2bpp.lz.6436d556
diff --git a/gfx/pics/skiploom/front.png b/gfx/pics/skiploom/front.png
new file mode 100644
index 000000000..313b5c9f3
--- /dev/null
+++ b/gfx/pics/skiploom/front.png
diff --git a/gfx/pics/skiploom/normal.pal b/gfx/pics/skiploom/normal.pal
deleted file mode 100644
index d03c99e28..000000000
--- a/gfx/pics/skiploom/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 22, 05
-	RGB 08, 18, 07
-
diff --git a/gfx/pics/slowbro/back.2bpp.lz b/gfx/pics/slowbro/back.2bpp.lz.3676b1f1
index af1d60999..af1d60999 100644
--- a/gfx/pics/slowbro/back.2bpp.lz
+++ b/gfx/pics/slowbro/back.2bpp.lz.3676b1f1
diff --git a/gfx/pics/slowbro/back.png b/gfx/pics/slowbro/back.png
new file mode 100644
index 000000000..10c4b20e3
--- /dev/null
+++ b/gfx/pics/slowbro/back.png
diff --git a/gfx/pics/slowbro/bitmask.asm b/gfx/pics/slowbro/bitmask.asm
deleted file mode 100644
index 78605e6c9..000000000
--- a/gfx/pics/slowbro/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %00000100
-	db %00000010
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00111110
-	db %11000111
-	db %11000111
-	db %11100011
-	db %01000001
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00000001
-	db %11000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2cf4
diff --git a/gfx/pics/slowbro/frames.asm b/gfx/pics/slowbro/frames.asm
deleted file mode 100644
index fca2a0a8c..000000000
--- a/gfx/pics/slowbro/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32
-.frame2
-	db $01 ; bitmask
-	db $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c, $3d, $3e
-	db $3f, $40, $41, $42, $43, $44, $45, $46, $47, $48
-.frame3
-	db $01 ; bitmask
-	db $33, $34, $35, $36, $37, $49, $4a, $3a, $3b, $4b, $3d, $3e
-	db $3f, $4c, $41, $42, $43, $44, $45, $46, $47, $4d
-.frame4
-	db $02 ; bitmask
-	db $4e, $4f, $50, $51
-; 0xd529c
diff --git a/gfx/pics/slowbro/front.2bpp.lz b/gfx/pics/slowbro/front.animated.2bpp.lz.257e2e84
index 0a6d1ac2c..0a6d1ac2c 100644
--- a/gfx/pics/slowbro/front.2bpp.lz
+++ b/gfx/pics/slowbro/front.animated.2bpp.lz.257e2e84
diff --git a/gfx/pics/slowbro/front.png b/gfx/pics/slowbro/front.png
new file mode 100644
index 000000000..de0280bbf
--- /dev/null
+++ b/gfx/pics/slowbro/front.png
diff --git a/gfx/pics/slowbro/normal.pal b/gfx/pics/slowbro/normal.pal
deleted file mode 100644
index 5f6dd1da4..000000000
--- a/gfx/pics/slowbro/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 10, 17
-	RGB 12, 17, 11
-
diff --git a/gfx/pics/slowking/back.2bpp.lz b/gfx/pics/slowking/back.2bpp.lz.a90de69e
index e6342e434..e6342e434 100644
--- a/gfx/pics/slowking/back.2bpp.lz
+++ b/gfx/pics/slowking/back.2bpp.lz.a90de69e
diff --git a/gfx/pics/slowking/back.png b/gfx/pics/slowking/back.png
new file mode 100644
index 000000000..a2308a98a
--- /dev/null
+++ b/gfx/pics/slowking/back.png
diff --git a/gfx/pics/slowking/bitmask.asm b/gfx/pics/slowking/bitmask.asm
deleted file mode 100644
index cdf11aeb2..000000000
--- a/gfx/pics/slowking/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %10000001
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %10000001
-	db %11000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %10000000
-	db %11000111
-	db %11100111
-	db %11110011
-	db %01111001
-	db %00011000
-	db %00000000
-; 0xd3689
diff --git a/gfx/pics/slowking/frames.asm b/gfx/pics/slowking/frames.asm
deleted file mode 100644
index ea0548561..000000000
--- a/gfx/pics/slowking/frames.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33
-.frame2
-	db $01 ; bitmask
-	db $34, $35, $36, $37
-.frame3
-	db $02 ; bitmask
-	db $38, $39, $3a, $3b, $3c, $3d, $3e, $3f, $40, $41, $42, $43
-	db $44, $45, $46, $47, $48, $49, $4a, $00, $4b, $4c, $4d, $00
-	db $00
-; 0xd8dc5
diff --git a/gfx/pics/slowking/front.2bpp.lz b/gfx/pics/slowking/front.animated.2bpp.lz.4c2f7140
index 2f9bd1654..2f9bd1654 100644
--- a/gfx/pics/slowking/front.2bpp.lz
+++ b/gfx/pics/slowking/front.animated.2bpp.lz.4c2f7140
diff --git a/gfx/pics/slowking/front.png b/gfx/pics/slowking/front.png
new file mode 100644
index 000000000..d648e8f0c
--- /dev/null
+++ b/gfx/pics/slowking/front.png
diff --git a/gfx/pics/slowking/normal.pal b/gfx/pics/slowking/normal.pal
deleted file mode 100644
index 1b1aa9fbe..000000000
--- a/gfx/pics/slowking/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 14, 18
-	RGB 23, 05, 02
-
diff --git a/gfx/pics/slowpoke/back.2bpp.lz b/gfx/pics/slowpoke/back.2bpp.lz.f2d1bb5c
index cdaa2178d..cdaa2178d 100644
--- a/gfx/pics/slowpoke/back.2bpp.lz
+++ b/gfx/pics/slowpoke/back.2bpp.lz.f2d1bb5c
diff --git a/gfx/pics/slowpoke/back.png b/gfx/pics/slowpoke/back.png
new file mode 100644
index 000000000..8672dde51
--- /dev/null
+++ b/gfx/pics/slowpoke/back.png
diff --git a/gfx/pics/slowpoke/bitmask.asm b/gfx/pics/slowpoke/bitmask.asm
deleted file mode 100644
index 6fab14881..000000000
--- a/gfx/pics/slowpoke/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %10011100
-	db %01110011
-	db %00001110
-	db %00000000
-; 1
-	db %11111100
-	db %01111111
-	db %00001110
-	db %00000000
-; 2
-	db %00010000
-	db %00000010
-	db %00000000
-	db %00000000
-; 0xd2cdf
diff --git a/gfx/pics/slowpoke/frames.asm b/gfx/pics/slowpoke/frames.asm
deleted file mode 100644
index 53a0bda39..000000000
--- a/gfx/pics/slowpoke/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $23, $24
-.frame2
-	db $01 ; bitmask
-	db $19, $1a, $1b, $00, $25, $1c, $1d, $1e, $00, $26, $1f, $20
-	db $21, $22, $23, $24
-.frame3
-	db $02 ; bitmask
-	db $1b, $27
-; 0xd525e
diff --git a/gfx/pics/slowpoke/front.2bpp.lz b/gfx/pics/slowpoke/front.animated.2bpp.lz.42347014
index 23d8e22f2..23d8e22f2 100644
--- a/gfx/pics/slowpoke/front.2bpp.lz
+++ b/gfx/pics/slowpoke/front.animated.2bpp.lz.42347014
diff --git a/gfx/pics/slowpoke/front.png b/gfx/pics/slowpoke/front.png
new file mode 100644
index 000000000..009619adf
--- /dev/null
+++ b/gfx/pics/slowpoke/front.png
diff --git a/gfx/pics/slowpoke/normal.pal b/gfx/pics/slowpoke/normal.pal
deleted file mode 100644
index e11055a37..000000000
--- a/gfx/pics/slowpoke/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 10, 17
-	RGB 21, 05, 08
-
diff --git a/gfx/pics/slugma/back.2bpp.lz b/gfx/pics/slugma/back.2bpp.lz.dc25c77a
index 949fbc218..949fbc218 100644
--- a/gfx/pics/slugma/back.2bpp.lz
+++ b/gfx/pics/slugma/back.2bpp.lz.dc25c77a
diff --git a/gfx/pics/slugma/back.png b/gfx/pics/slugma/back.png
new file mode 100644
index 000000000..f0fedc230
--- /dev/null
+++ b/gfx/pics/slugma/back.png
diff --git a/gfx/pics/slugma/bitmask.asm b/gfx/pics/slugma/bitmask.asm
deleted file mode 100644
index ef60f1d3f..000000000
--- a/gfx/pics/slugma/bitmask.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-; 0
-	db %00000000
-	db %00100001
-	db %10000100
-	db %00000000
-; 1
-	db %00000000
-	db %00100001
-	db %10001100
-	db %00000000
-; 2
-	db %00000000
-	db %00100001
-	db %00000000
-	db %00000000
-; 3
-	db %01000010
-	db %00011000
-	db %00000000
-	db %00000000
-; 4
-	db %00000000
-	db %00000000
-	db %10000100
-	db %00000000
-; 5
-	db %00000000
-	db %00000000
-	db %10001100
-	db %00000000
-; 0xd37e7
diff --git a/gfx/pics/slugma/frames.asm b/gfx/pics/slugma/frames.asm
deleted file mode 100644
index 37242d2c4..000000000
--- a/gfx/pics/slugma/frames.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-	dw .frame8
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c
-.frame2
-	db $01 ; bitmask
-	db $19, $1a, $1d, $1e, $1f
-.frame3
-	db $01 ; bitmask
-	db $19, $1a, $20, $21, $22
-.frame4
-	db $02 ; bitmask
-	db $19, $1a
-.frame5
-	db $03 ; bitmask
-	db $23, $24, $25, $26
-.frame6
-	db $04 ; bitmask
-	db $1b, $1c
-.frame7
-	db $05 ; bitmask
-	db $1d, $1e, $1f
-.frame8
-	db $05 ; bitmask
-	db $20, $21, $22
-; 0xd919e
diff --git a/gfx/pics/slugma/front.2bpp.lz b/gfx/pics/slugma/front.animated.2bpp.lz.c1a44906
index 4c9a0078e..4c9a0078e 100644
--- a/gfx/pics/slugma/front.2bpp.lz
+++ b/gfx/pics/slugma/front.animated.2bpp.lz.c1a44906
diff --git a/gfx/pics/slugma/front.png b/gfx/pics/slugma/front.png
new file mode 100644
index 000000000..ce63adac6
--- /dev/null
+++ b/gfx/pics/slugma/front.png
diff --git a/gfx/pics/slugma/normal.pal b/gfx/pics/slugma/normal.pal
deleted file mode 100644
index e20c176a3..000000000
--- a/gfx/pics/slugma/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 28, 15
-	RGB 24, 06, 04
-
diff --git a/gfx/pics/smeargle/back.2bpp.lz b/gfx/pics/smeargle/back.2bpp.lz.2de2de8c
index eb96bfd07..eb96bfd07 100644
--- a/gfx/pics/smeargle/back.2bpp.lz
+++ b/gfx/pics/smeargle/back.2bpp.lz.2de2de8c
diff --git a/gfx/pics/smeargle/back.png b/gfx/pics/smeargle/back.png
new file mode 100644
index 000000000..22ba83c3c
--- /dev/null
+++ b/gfx/pics/smeargle/back.png
diff --git a/gfx/pics/smeargle/bitmask.asm b/gfx/pics/smeargle/bitmask.asm
deleted file mode 100644
index 3832cd2d6..000000000
--- a/gfx/pics/smeargle/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00001100
-	db %10001110
-	db %11010111
-	db %00001001
-	db %00000000
-	db %10000000
-	db %00000001
-; 1
-	db %00011100
-	db %00001110
-	db %00000111
-	db %00000000
-	db %00000000
-	db %10000000
-	db %00000001
-; 2
-	db %00000000
-	db %00000000
-	db %00010000
-	db %00001000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3943
diff --git a/gfx/pics/smeargle/frames.asm b/gfx/pics/smeargle/frames.asm
deleted file mode 100644
index 902177d75..000000000
--- a/gfx/pics/smeargle/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $00, $31, $00, $00, $32, $33, $34, $35, $36, $37, $38, $39
-	db $3a, $3b, $3c, $3d
-.frame2
-	db $01 ; bitmask
-	db $00, $3e, $3f, $00, $40, $41, $42, $43, $44, $3c, $3d
-.frame3
-	db $02 ; bitmask
-	db $37, $3b
-; 0xd94bc
diff --git a/gfx/pics/smeargle/front.2bpp.lz b/gfx/pics/smeargle/front.animated.2bpp.lz.82ec0f51
index 81be921d5..81be921d5 100644
--- a/gfx/pics/smeargle/front.2bpp.lz
+++ b/gfx/pics/smeargle/front.animated.2bpp.lz.82ec0f51
diff --git a/gfx/pics/smeargle/front.png b/gfx/pics/smeargle/front.png
new file mode 100644
index 000000000..2c4a90508
--- /dev/null
+++ b/gfx/pics/smeargle/front.png
diff --git a/gfx/pics/smeargle/normal.pal b/gfx/pics/smeargle/normal.pal
deleted file mode 100644
index 76ba4c95c..000000000
--- a/gfx/pics/smeargle/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 21, 08
-	RGB 14, 05, 06
-
diff --git a/gfx/pics/smoochum/back.2bpp.lz b/gfx/pics/smoochum/back.2bpp.lz.af01f906
index 52c256c16..52c256c16 100644
--- a/gfx/pics/smoochum/back.2bpp.lz
+++ b/gfx/pics/smoochum/back.2bpp.lz.af01f906
diff --git a/gfx/pics/smoochum/back.png b/gfx/pics/smoochum/back.png
new file mode 100644
index 000000000..e5167842e
--- /dev/null
+++ b/gfx/pics/smoochum/back.png
diff --git a/gfx/pics/smoochum/bitmask.asm b/gfx/pics/smoochum/bitmask.asm
deleted file mode 100644
index 5d4f3f9bd..000000000
--- a/gfx/pics/smoochum/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %10000000
-	db %00010000
-	db %00000010
-	db %00000000
-; 1
-	db %10000000
-	db %00110001
-	db %00000010
-	db %00000000
-; 0xd3973
diff --git a/gfx/pics/smoochum/frames.asm b/gfx/pics/smoochum/frames.asm
deleted file mode 100644
index 53f48d1b8..000000000
--- a/gfx/pics/smoochum/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b
-.frame2
-	db $01 ; bitmask
-	db $1c, $1d, $1e, $1f, $20
-.frame3
-	db $01 ; bitmask
-	db $21, $22, $23, $24, $25
-; 0xd953c
diff --git a/gfx/pics/smoochum/front.2bpp.lz b/gfx/pics/smoochum/front.animated.2bpp.lz.5977720b
index cd4b75761..cd4b75761 100644
--- a/gfx/pics/smoochum/front.2bpp.lz
+++ b/gfx/pics/smoochum/front.animated.2bpp.lz.5977720b
diff --git a/gfx/pics/smoochum/front.png b/gfx/pics/smoochum/front.png
new file mode 100644
index 000000000..49ba75639
--- /dev/null
+++ b/gfx/pics/smoochum/front.png
diff --git a/gfx/pics/smoochum/normal.pal b/gfx/pics/smoochum/normal.pal
deleted file mode 100644
index 21867063d..000000000
--- a/gfx/pics/smoochum/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 24, 04
-	RGB 20, 01, 19
-
diff --git a/gfx/pics/sneasel/back.2bpp.lz b/gfx/pics/sneasel/back.2bpp.lz.5298828d
index be5ad2304..be5ad2304 100644
--- a/gfx/pics/sneasel/back.2bpp.lz
+++ b/gfx/pics/sneasel/back.2bpp.lz.5298828d
diff --git a/gfx/pics/sneasel/back.png b/gfx/pics/sneasel/back.png
new file mode 100644
index 000000000..4b1921c2a
--- /dev/null
+++ b/gfx/pics/sneasel/back.png
diff --git a/gfx/pics/sneasel/bitmask.asm b/gfx/pics/sneasel/bitmask.asm
deleted file mode 100644
index 49dcabe1d..000000000
--- a/gfx/pics/sneasel/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %11000011
-	db %00111000
-	db %01100011
-	db %10001110
-	db %00000001
-; 1
-	db %11000011
-	db %11111011
-	db %00100011
-	db %10001110
-	db %00000001
-; 2
-	db %00000000
-	db %11000011
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd37a7
diff --git a/gfx/pics/sneasel/frames.asm b/gfx/pics/sneasel/frames.asm
deleted file mode 100644
index 88dbe408c..000000000
--- a/gfx/pics/sneasel/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e
-	db $2f, $30, $31, $24
-.frame2
-	db $01 ; bitmask
-	db $24, $24, $25, $26, $32, $33, $34, $28, $29, $35, $36, $2a
-	db $37, $38, $2e, $24, $39, $24, $24
-.frame3
-	db $02 ; bitmask
-	db $32, $33, $35, $36
-.frame4
-	db $03 ; bitmask
-	db $35
-; 0xd910b
diff --git a/gfx/pics/sneasel/front.2bpp.lz b/gfx/pics/sneasel/front.animated.2bpp.lz.8f7db3e9
index 4add5f2e0..4add5f2e0 100644
--- a/gfx/pics/sneasel/front.2bpp.lz
+++ b/gfx/pics/sneasel/front.animated.2bpp.lz.8f7db3e9
diff --git a/gfx/pics/sneasel/front.png b/gfx/pics/sneasel/front.png
new file mode 100644
index 000000000..958d314d9
--- /dev/null
+++ b/gfx/pics/sneasel/front.png
diff --git a/gfx/pics/sneasel/normal.pal b/gfx/pics/sneasel/normal.pal
deleted file mode 100644
index 1d1728090..000000000
--- a/gfx/pics/sneasel/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 06, 18
-	RGB 07, 07, 11
-
diff --git a/gfx/pics/snorlax/back.2bpp.lz b/gfx/pics/snorlax/back.2bpp.lz.90570272
index dfbfcbb50..dfbfcbb50 100644
--- a/gfx/pics/snorlax/back.2bpp.lz
+++ b/gfx/pics/snorlax/back.2bpp.lz.90570272
diff --git a/gfx/pics/snorlax/back.png b/gfx/pics/snorlax/back.png
new file mode 100644
index 000000000..8493ee5ef
--- /dev/null
+++ b/gfx/pics/snorlax/back.png
diff --git a/gfx/pics/snorlax/bitmask.asm b/gfx/pics/snorlax/bitmask.asm
deleted file mode 100644
index 1f456ab16..000000000
--- a/gfx/pics/snorlax/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %10000011
-	db %01000001
-	db %11100000
-	db %01110000
-	db %00010000
-	db %00000000
-; 1
-	db %00000000
-	db %10000000
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd322f
diff --git a/gfx/pics/snorlax/frames.asm b/gfx/pics/snorlax/frames.asm
deleted file mode 100644
index 1b0ee150f..000000000
--- a/gfx/pics/snorlax/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-.frame2
-	db $00 ; bitmask
-	db $3d, $3e, $3f, $40, $41, $42, $43, $44, $45, $46, $47, $48
-.frame3
-	db $01 ; bitmask
-	db $49, $4a
-.frame4
-	db $02 ; bitmask
-	db $4b
-.frame5
-	db $02 ; bitmask
-	db $4b
-; 0xd5fd2
diff --git a/gfx/pics/snorlax/front.2bpp.lz b/gfx/pics/snorlax/front.animated.2bpp.lz.8253357b
index 7c610f46c..7c610f46c 100644
--- a/gfx/pics/snorlax/front.2bpp.lz
+++ b/gfx/pics/snorlax/front.animated.2bpp.lz.8253357b
diff --git a/gfx/pics/snorlax/front.png b/gfx/pics/snorlax/front.png
new file mode 100644
index 000000000..e328c4ca6
--- /dev/null
+++ b/gfx/pics/snorlax/front.png
diff --git a/gfx/pics/snorlax/normal.pal b/gfx/pics/snorlax/normal.pal
deleted file mode 100644
index af1845a65..000000000
--- a/gfx/pics/snorlax/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 18, 14
-	RGB 13, 09, 09
-
diff --git a/gfx/pics/snubbull/back.2bpp.lz b/gfx/pics/snubbull/back.2bpp.lz.26eaaa5d
index 5b020db5e..5b020db5e 100644
--- a/gfx/pics/snubbull/back.2bpp.lz
+++ b/gfx/pics/snubbull/back.2bpp.lz.26eaaa5d
diff --git a/gfx/pics/snubbull/back.png b/gfx/pics/snubbull/back.png
new file mode 100644
index 000000000..2c9635344
--- /dev/null
+++ b/gfx/pics/snubbull/back.png
diff --git a/gfx/pics/snubbull/bitmask.asm b/gfx/pics/snubbull/bitmask.asm
deleted file mode 100644
index 69b0ad890..000000000
--- a/gfx/pics/snubbull/bitmask.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-; 0
-	db %00000000
-	db %11000011
-	db %01000001
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %11001111
-	db %10000010
-	db %00110000
-	db %00000000
-; 2
-	db %11000110
-	db %11001111
-	db %00000000
-	db %10011100
-	db %00000011
-; 3
-	db %00000000
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 4
-	db %00000000
-	db %01000000
-	db %01000001
-	db %00000000
-	db %00000000
-; 0xd3734
diff --git a/gfx/pics/snubbull/frames.asm b/gfx/pics/snubbull/frames.asm
deleted file mode 100644
index 0444a0a39..000000000
--- a/gfx/pics/snubbull/frames.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29
-.frame2
-	db $01 ; bitmask
-	db $24, $25, $2a, $2b, $26, $27, $2c, $2d, $2e, $2f
-.frame3
-	db $02 ; bitmask
-	db $30, $31, $32, $33, $24, $25, $34, $35, $26, $27, $36, $37
-	db $38, $39, $3a, $3b
-.frame4
-	db $03 ; bitmask
-	db $3c
-.frame5
-	db $04 ; bitmask
-	db $3c, $28, $29
-; 0xd8ff5
diff --git a/gfx/pics/snubbull/front.2bpp.lz b/gfx/pics/snubbull/front.animated.2bpp.lz.a1b4eb88
index 69a534e2c..69a534e2c 100644
--- a/gfx/pics/snubbull/front.2bpp.lz
+++ b/gfx/pics/snubbull/front.animated.2bpp.lz.a1b4eb88
diff --git a/gfx/pics/snubbull/front.png b/gfx/pics/snubbull/front.png
new file mode 100644
index 000000000..ee352f0e3
--- /dev/null
+++ b/gfx/pics/snubbull/front.png
diff --git a/gfx/pics/snubbull/normal.pal b/gfx/pics/snubbull/normal.pal
deleted file mode 100644
index 52aee4079..000000000
--- a/gfx/pics/snubbull/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 14, 13
-	RGB 07, 10, 13
-
diff --git a/gfx/pics/spearow/back.2bpp.lz b/gfx/pics/spearow/back.2bpp.lz.b8e760aa
index 9411f32bd..9411f32bd 100644
--- a/gfx/pics/spearow/back.2bpp.lz
+++ b/gfx/pics/spearow/back.2bpp.lz.b8e760aa
diff --git a/gfx/pics/spearow/back.png b/gfx/pics/spearow/back.png
new file mode 100644
index 000000000..e25a137a2
--- /dev/null
+++ b/gfx/pics/spearow/back.png
diff --git a/gfx/pics/spearow/bitmask.asm b/gfx/pics/spearow/bitmask.asm
deleted file mode 100644
index 108ace244..000000000
--- a/gfx/pics/spearow/bitmask.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-; 0
-	db %10000110
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %11100110
-	db %00001100
-	db %00000000
-	db %00000000
-; 2
-	db %01000000
-	db %00000000
-	db %11100111
-	db %00000000
-; 3
-	db %01000000
-	db %00110000
-	db %11101111
-	db %00000000
-; 4
-	db %10000110
-	db %00000000
-	db %01100011
-	db %00000000
-; 5
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2844
diff --git a/gfx/pics/spearow/frames.asm b/gfx/pics/spearow/frames.asm
deleted file mode 100644
index 0aa724bc5..000000000
--- a/gfx/pics/spearow/frames.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b
-.frame2
-	db $01 ; bitmask
-	db $1c, $1d, $1e, $1f, $20, $21, $22
-.frame3
-	db $02 ; bitmask
-	db $23, $24, $25, $26, $27, $28, $29
-.frame4
-	db $03 ; bitmask
-	db $23, $2a, $2b, $24, $2c, $2d, $2e, $27, $28, $29
-.frame5
-	db $04 ; bitmask
-	db $19, $1a, $1b, $24, $25, $27, $28
-.frame6
-	db $05 ; bitmask
-	db $23
-; 0xd45dc
diff --git a/gfx/pics/spearow/front.2bpp.lz b/gfx/pics/spearow/front.animated.2bpp.lz.59d61986
index 8def69a01..8def69a01 100644
--- a/gfx/pics/spearow/front.2bpp.lz
+++ b/gfx/pics/spearow/front.animated.2bpp.lz.59d61986
diff --git a/gfx/pics/spearow/front.png b/gfx/pics/spearow/front.png
new file mode 100644
index 000000000..85c2e7e23
--- /dev/null
+++ b/gfx/pics/spearow/front.png
diff --git a/gfx/pics/spearow/normal.pal b/gfx/pics/spearow/normal.pal
deleted file mode 100644
index 4f4bcc66b..000000000
--- a/gfx/pics/spearow/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 19, 10, 01
-	RGB 30, 10, 12
-
diff --git a/gfx/pics/spinarak/back.2bpp.lz b/gfx/pics/spinarak/back.2bpp.lz.14002836
index 3fa2e3b12..3fa2e3b12 100644
--- a/gfx/pics/spinarak/back.2bpp.lz
+++ b/gfx/pics/spinarak/back.2bpp.lz.14002836
diff --git a/gfx/pics/spinarak/back.png b/gfx/pics/spinarak/back.png
new file mode 100644
index 000000000..52f9eb053
--- /dev/null
+++ b/gfx/pics/spinarak/back.png
diff --git a/gfx/pics/spinarak/bitmask.asm b/gfx/pics/spinarak/bitmask.asm
deleted file mode 100644
index 57cae087c..000000000
--- a/gfx/pics/spinarak/bitmask.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-; 0
-	db %11000000
-	db %00011000
-	db %00000011
-	db %00000000
-; 1
-	db %11000000
-	db %01011010
-	db %00000011
-	db %00000000
-; 2
-	db %00000000
-	db %00100001
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %01000010
-	db %00000000
-	db %00000000
-; 0xd343f
diff --git a/gfx/pics/spinarak/frames.asm b/gfx/pics/spinarak/frames.asm
deleted file mode 100644
index da8ad1961..000000000
--- a/gfx/pics/spinarak/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e
-.frame2
-	db $01 ; bitmask
-	db $19, $1a, $1f, $1b, $1c, $20, $1d, $1e
-.frame3
-	db $02 ; bitmask
-	db $21, $22
-.frame4
-	db $03 ; bitmask
-	db $1f, $20
-; 0xd87ac
diff --git a/gfx/pics/spinarak/front.2bpp.lz b/gfx/pics/spinarak/front.animated.2bpp.lz.31ab6868
index edbe6e1ce..edbe6e1ce 100644
--- a/gfx/pics/spinarak/front.2bpp.lz
+++ b/gfx/pics/spinarak/front.animated.2bpp.lz.31ab6868
diff --git a/gfx/pics/spinarak/front.png b/gfx/pics/spinarak/front.png
new file mode 100644
index 000000000..e35c28646
--- /dev/null
+++ b/gfx/pics/spinarak/front.png
diff --git a/gfx/pics/spinarak/normal.pal b/gfx/pics/spinarak/normal.pal
deleted file mode 100644
index 92041eaac..000000000
--- a/gfx/pics/spinarak/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 21, 12
-	RGB 09, 20, 05
-
diff --git a/gfx/pics/squirtle/back.2bpp.lz b/gfx/pics/squirtle/back.2bpp.lz.76295ae8
index a8fa8d3fd..a8fa8d3fd 100644
--- a/gfx/pics/squirtle/back.2bpp.lz
+++ b/gfx/pics/squirtle/back.2bpp.lz.76295ae8
diff --git a/gfx/pics/squirtle/back.png b/gfx/pics/squirtle/back.png
new file mode 100644
index 000000000..231dfa1bb
--- /dev/null
+++ b/gfx/pics/squirtle/back.png
diff --git a/gfx/pics/squirtle/bitmask.asm b/gfx/pics/squirtle/bitmask.asm
deleted file mode 100644
index a33cd7afb..000000000
--- a/gfx/pics/squirtle/bitmask.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-; 0
-	db %11100111
-	db %00011100
-	db %00000010
-	db %00000000
-; 1
-	db %11100111
-	db %00011100
-	db %10001110
-	db %00000001
-; 2
-	db %11000010
-	db %00001000
-	db %00000000
-	db %00000000
-; 3
-	db %10000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 4
-	db %01000010
-	db %00001000
-	db %00000000
-	db %00000000
-; 0xd277a
diff --git a/gfx/pics/squirtle/frames.asm b/gfx/pics/squirtle/frames.asm
deleted file mode 100644
index e30af6db2..000000000
--- a/gfx/pics/squirtle/frames.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $03, $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21
-.frame2
-	db $01 ; bitmask
-	db $03, $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $23
-	db $24, $25
-.frame3
-	db $02 ; bitmask
-	db $26, $27, $28, $29
-.frame4
-	db $03 ; bitmask
-	db $28
-.frame5
-	db $04 ; bitmask
-	db $26, $27, $29
-; 0xd435a
diff --git a/gfx/pics/squirtle/front.2bpp.lz b/gfx/pics/squirtle/front.animated.2bpp.lz.9b6f9ec9
index 175cc5e0d..175cc5e0d 100644
--- a/gfx/pics/squirtle/front.2bpp.lz
+++ b/gfx/pics/squirtle/front.animated.2bpp.lz.9b6f9ec9
diff --git a/gfx/pics/squirtle/front.png b/gfx/pics/squirtle/front.png
new file mode 100644
index 000000000..fd8f05fa9
--- /dev/null
+++ b/gfx/pics/squirtle/front.png
diff --git a/gfx/pics/squirtle/normal.pal b/gfx/pics/squirtle/normal.pal
deleted file mode 100644
index 04b589372..000000000
--- a/gfx/pics/squirtle/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 22, 18, 08
-	RGB 10, 15, 31
-
diff --git a/gfx/pics/stantler/back.2bpp.lz b/gfx/pics/stantler/back.2bpp.lz.16502aac
index a0ab53039..a0ab53039 100644
--- a/gfx/pics/stantler/back.2bpp.lz
+++ b/gfx/pics/stantler/back.2bpp.lz.16502aac
diff --git a/gfx/pics/stantler/back.png b/gfx/pics/stantler/back.png
new file mode 100644
index 000000000..90e7b4a65
--- /dev/null
+++ b/gfx/pics/stantler/back.png
diff --git a/gfx/pics/stantler/bitmask.asm b/gfx/pics/stantler/bitmask.asm
deleted file mode 100644
index 3387fe45d..000000000
--- a/gfx/pics/stantler/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %00010000
-	db %00001000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00011110
-	db %10011111
-	db %11001111
-	db %11100111
-	db %11100001
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00001000
-	db %00000100
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd392e
diff --git a/gfx/pics/stantler/frames.asm b/gfx/pics/stantler/frames.asm
deleted file mode 100644
index 4a82b45b2..000000000
--- a/gfx/pics/stantler/frames.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $31, $32
-.frame2
-	db $01 ; bitmask
-	db $00, $33, $34, $35, $00, $00, $36, $37, $00, $38, $39, $3a
-	db $3b, $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44, $45, $46
-	db $47, $48
-.frame3
-	db $02 ; bitmask
-	db $49, $4a
-; 0xd9496
diff --git a/gfx/pics/stantler/front.2bpp.lz b/gfx/pics/stantler/front.animated.2bpp.lz.46b7dd06
index 87a56e667..87a56e667 100644
--- a/gfx/pics/stantler/front.2bpp.lz
+++ b/gfx/pics/stantler/front.animated.2bpp.lz.46b7dd06
diff --git a/gfx/pics/stantler/front.png b/gfx/pics/stantler/front.png
new file mode 100644
index 000000000..ac8628445
--- /dev/null
+++ b/gfx/pics/stantler/front.png
diff --git a/gfx/pics/stantler/normal.pal b/gfx/pics/stantler/normal.pal
deleted file mode 100644
index 3d036062d..000000000
--- a/gfx/pics/stantler/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 15, 07
-	RGB 04, 05, 16
-
diff --git a/gfx/pics/starmie/back.2bpp.lz b/gfx/pics/starmie/back.2bpp.lz.a8923741
index 8085f0f44..8085f0f44 100644
--- a/gfx/pics/starmie/back.2bpp.lz
+++ b/gfx/pics/starmie/back.2bpp.lz.a8923741
diff --git a/gfx/pics/starmie/back.png b/gfx/pics/starmie/back.png
new file mode 100644
index 000000000..f4e67e4fa
--- /dev/null
+++ b/gfx/pics/starmie/back.png
diff --git a/gfx/pics/starmie/bitmask.asm b/gfx/pics/starmie/bitmask.asm
deleted file mode 100644
index 24c51b53d..000000000
--- a/gfx/pics/starmie/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %11111010
-	db %00110100
-	db %10001110
-	db %11101011
-	db %00000111
-; 1
-	db %00000000
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %10000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3085
diff --git a/gfx/pics/starmie/frames.asm b/gfx/pics/starmie/frames.asm
deleted file mode 100644
index 9e0dc596d..000000000
--- a/gfx/pics/starmie/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $00, $28, $29, $2a, $2b, $2c, $2d, $2e
-	db $2f, $00, $30, $31, $32, $00, $33, $34, $35, $33
-.frame2
-	db $01 ; bitmask
-	db $36
-.frame3
-	db $02 ; bitmask
-	db $37
-.frame4
-	db $03 ; bitmask
-.frame5
-	db $03 ; bitmask
-; 0xd5af6
diff --git a/gfx/pics/starmie/front.2bpp.lz b/gfx/pics/starmie/front.animated.2bpp.lz.522b6699
index b9019f6c6..b9019f6c6 100644
--- a/gfx/pics/starmie/front.2bpp.lz
+++ b/gfx/pics/starmie/front.animated.2bpp.lz.522b6699
diff --git a/gfx/pics/starmie/front.png b/gfx/pics/starmie/front.png
new file mode 100644
index 000000000..2378c948b
--- /dev/null
+++ b/gfx/pics/starmie/front.png
diff --git a/gfx/pics/starmie/normal.pal b/gfx/pics/starmie/normal.pal
deleted file mode 100644
index caaf43505..000000000
--- a/gfx/pics/starmie/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 22, 00
-	RGB 19, 07, 18
-
diff --git a/gfx/pics/staryu/back.2bpp.lz b/gfx/pics/staryu/back.2bpp.lz.79ea9d00
index 65366eb7c..65366eb7c 100644
--- a/gfx/pics/staryu/back.2bpp.lz
+++ b/gfx/pics/staryu/back.2bpp.lz.79ea9d00
diff --git a/gfx/pics/staryu/back.png b/gfx/pics/staryu/back.png
new file mode 100644
index 000000000..9cab96362
--- /dev/null
+++ b/gfx/pics/staryu/back.png
diff --git a/gfx/pics/staryu/bitmask.asm b/gfx/pics/staryu/bitmask.asm
deleted file mode 100644
index fe0e0f218..000000000
--- a/gfx/pics/staryu/bitmask.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-; 0
-	db %00001100
-	db %00111001
-	db %11000000
-	db %10111110
-	db %00001001
-; 1
-	db %00000000
-	db %11000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3071
diff --git a/gfx/pics/staryu/frames.asm b/gfx/pics/staryu/frames.asm
deleted file mode 100644
index d86e5eb62..000000000
--- a/gfx/pics/staryu/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $00, $2b, $2c, $2d, $2e
-	db $2f, $30, $31, $00
-.frame2
-	db $01 ; bitmask
-	db $32, $33
-.frame3
-	db $01 ; bitmask
-	db $34, $35
-; 0xd5acf
diff --git a/gfx/pics/staryu/front.2bpp.lz b/gfx/pics/staryu/front.animated.2bpp.lz.22f1d06b
index 8d0bdacb9..8d0bdacb9 100644
--- a/gfx/pics/staryu/front.2bpp.lz
+++ b/gfx/pics/staryu/front.animated.2bpp.lz.22f1d06b
diff --git a/gfx/pics/staryu/front.png b/gfx/pics/staryu/front.png
new file mode 100644
index 000000000..74949a9b1
--- /dev/null
+++ b/gfx/pics/staryu/front.png
diff --git a/gfx/pics/staryu/normal.pal b/gfx/pics/staryu/normal.pal
deleted file mode 100644
index 59f7cc477..000000000
--- a/gfx/pics/staryu/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 17, 11
-	RGB 31, 05, 03
-
diff --git a/gfx/pics/steelix/back.2bpp.lz b/gfx/pics/steelix/back.2bpp.lz.f3c03e61
index e4cb2d6dc..e4cb2d6dc 100644
--- a/gfx/pics/steelix/back.2bpp.lz
+++ b/gfx/pics/steelix/back.2bpp.lz.f3c03e61
diff --git a/gfx/pics/steelix/back.png b/gfx/pics/steelix/back.png
new file mode 100644
index 000000000..6788dacd9
--- /dev/null
+++ b/gfx/pics/steelix/back.png
diff --git a/gfx/pics/steelix/bitmask.asm b/gfx/pics/steelix/bitmask.asm
deleted file mode 100644
index e66a1f07e..000000000
--- a/gfx/pics/steelix/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %00010000
-	db %00001000
-	db %01110100
-	db %10111000
-	db %01111100
-	db %00000000
-; 1
-	db %00000000
-	db %11010010
-	db %00101001
-	db %01110100
-	db %10111000
-	db %01111100
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %00000100
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd371b
diff --git a/gfx/pics/steelix/frames.asm b/gfx/pics/steelix/frames.asm
deleted file mode 100644
index 8f352b5fa..000000000
--- a/gfx/pics/steelix/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f
-.frame2
-	db $00 ; bitmask
-	db $31, $32, $33, $40, $41, $42, $43, $44, $39, $3a, $45, $46
-	db $3d, $3e, $3f
-.frame3
-	db $01 ; bitmask
-	db $47, $31, $48, $49, $4a, $32, $4b, $33, $40, $41, $42, $43
-	db $44, $39, $3a, $45, $46, $3d, $3e, $3f
-.frame4
-	db $02 ; bitmask
-	db $4c
-; 0xd8fc2
diff --git a/gfx/pics/steelix/front.2bpp.lz b/gfx/pics/steelix/front.animated.2bpp.lz.42f3f8d1
index 2da642f04..2da642f04 100644
--- a/gfx/pics/steelix/front.2bpp.lz
+++ b/gfx/pics/steelix/front.animated.2bpp.lz.42f3f8d1
diff --git a/gfx/pics/steelix/front.png b/gfx/pics/steelix/front.png
new file mode 100644
index 000000000..30df74f27
--- /dev/null
+++ b/gfx/pics/steelix/front.png
diff --git a/gfx/pics/steelix/normal.pal b/gfx/pics/steelix/normal.pal
deleted file mode 100644
index ee5eb6d6f..000000000
--- a/gfx/pics/steelix/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 17, 15, 26
-	RGB 12, 08, 12
-
diff --git a/gfx/pics/sudowoodo/back.2bpp.lz b/gfx/pics/sudowoodo/back.2bpp.lz.728036c6
index c10731ea9..c10731ea9 100644
--- a/gfx/pics/sudowoodo/back.2bpp.lz
+++ b/gfx/pics/sudowoodo/back.2bpp.lz.728036c6
diff --git a/gfx/pics/sudowoodo/back.png b/gfx/pics/sudowoodo/back.png
new file mode 100644
index 000000000..cd7466ac3
--- /dev/null
+++ b/gfx/pics/sudowoodo/back.png
diff --git a/gfx/pics/sudowoodo/bitmask.asm b/gfx/pics/sudowoodo/bitmask.asm
deleted file mode 100644
index 9508b9cef..000000000
--- a/gfx/pics/sudowoodo/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00110000
-	db %11001110
-	db %11110011
-	db %00000000
-	db %00000000
-; 1
-	db %00110000
-	db %10001110
-	db %11100011
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %01000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd3596
diff --git a/gfx/pics/sudowoodo/frames.asm b/gfx/pics/sudowoodo/frames.asm
deleted file mode 100644
index aeafdfd38..000000000
--- a/gfx/pics/sudowoodo/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $03, $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e
-	db $2f
-.frame2
-	db $01 ; bitmask
-	db $03, $24, $30, $31, $32, $33, $34, $35, $36, $37, $38
-.frame3
-	db $02 ; bitmask
-	db $28, $2c
-; 0xd8b8f
diff --git a/gfx/pics/sudowoodo/front.2bpp.lz b/gfx/pics/sudowoodo/front.animated.2bpp.lz.b0f04991
index 160f800cf..160f800cf 100644
--- a/gfx/pics/sudowoodo/front.2bpp.lz
+++ b/gfx/pics/sudowoodo/front.animated.2bpp.lz.b0f04991
diff --git a/gfx/pics/sudowoodo/front.png b/gfx/pics/sudowoodo/front.png
new file mode 100644
index 000000000..cc794899a
--- /dev/null
+++ b/gfx/pics/sudowoodo/front.png
diff --git a/gfx/pics/sudowoodo/normal.pal b/gfx/pics/sudowoodo/normal.pal
deleted file mode 100644
index 009408311..000000000
--- a/gfx/pics/sudowoodo/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 18, 11, 08
-	RGB 06, 14, 07
-
diff --git a/gfx/pics/suicune/back.2bpp.lz b/gfx/pics/suicune/back.2bpp.lz.5c49d112
index a8106fbb4..a8106fbb4 100644
--- a/gfx/pics/suicune/back.2bpp.lz
+++ b/gfx/pics/suicune/back.2bpp.lz.5c49d112
diff --git a/gfx/pics/suicune/back.png b/gfx/pics/suicune/back.png
new file mode 100644
index 000000000..b02456055
--- /dev/null
+++ b/gfx/pics/suicune/back.png
diff --git a/gfx/pics/suicune/bitmask.asm b/gfx/pics/suicune/bitmask.asm
deleted file mode 100644
index 1b3c4f555..000000000
--- a/gfx/pics/suicune/bitmask.asm
+++ /dev/null
@@ -1,57 +0,0 @@
-; 0
-	db %11111000
-	db %11111111
-	db %11101111
-	db %01100110
-	db %00100011
-	db %00000000
-	db %00000000
-; 1
-	db %11111000
-	db %11111111
-	db %11101111
-	db %01110110
-	db %00011011
-	db %00011100
-	db %00000000
-; 2
-	db %11111000
-	db %10111111
-	db %00001111
-	db %00000110
-	db %00000011
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %10000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 4
-	db %00000000
-	db %00000010
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 5
-	db %00000000
-	db %00000100
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 6
-	db %00000000
-	db %00001000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3a26
diff --git a/gfx/pics/suicune/frames.asm b/gfx/pics/suicune/frames.asm
deleted file mode 100644
index 7532ed312..000000000
--- a/gfx/pics/suicune/frames.asm
+++ /dev/null
@@ -1,46 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-	dw .frame8
-	dw .frame9
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $00, $35, $36, $37, $38, $39, $3a, $3b
-	db $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44, $45, $46, $47
-	db $48, $49, $4a
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $33, $34, $00, $35, $36, $37, $4b, $4c, $3a, $3b
-	db $3c, $3d, $3e, $3f, $40, $4d, $4e, $4f, $44, $45, $50, $51
-	db $52, $48, $49, $53, $54, $00, $55, $56
-.frame3
-	db $02 ; bitmask
-	db $31, $32, $33, $34, $00, $35, $36, $37, $4b, $4c, $3a, $57
-	db $3d, $3e, $3f, $40, $44, $45, $48, $49
-.frame4
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $00, $35, $36, $37, $4b, $4c, $3a, $3b
-	db $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44, $45, $46, $47
-	db $48, $49, $4a
-.frame5
-	db $01 ; bitmask
-	db $31, $32, $33, $34, $00, $35, $36, $37, $4b, $58, $3a, $3b
-	db $3c, $3d, $3e, $3f, $59, $4d, $4e, $4f, $44, $45, $50, $51
-	db $52, $48, $49, $53, $54, $00, $55, $56
-.frame6
-	db $03 ; bitmask
-	db $5a
-.frame7
-	db $04 ; bitmask
-	db $5b, $5c
-.frame8
-	db $05 ; bitmask
-	db $5d
-.frame9
-	db $06 ; bitmask
-	db $5e
-; 0xd97a9
diff --git a/gfx/pics/suicune/front.2bpp.lz b/gfx/pics/suicune/front.animated.2bpp.lz.64698c0a
index cbc9dfdbf..cbc9dfdbf 100644
--- a/gfx/pics/suicune/front.2bpp.lz
+++ b/gfx/pics/suicune/front.animated.2bpp.lz.64698c0a
diff --git a/gfx/pics/suicune/front.png b/gfx/pics/suicune/front.png
new file mode 100644
index 000000000..f369cff81
--- /dev/null
+++ b/gfx/pics/suicune/front.png
diff --git a/gfx/pics/suicune/normal.pal b/gfx/pics/suicune/normal.pal
deleted file mode 100644
index aaa246989..000000000
--- a/gfx/pics/suicune/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 11, 23, 31
-	RGB 14, 02, 20
-
diff --git a/gfx/pics/sunflora/back.2bpp.lz b/gfx/pics/sunflora/back.2bpp.lz.9d0684f0
index 3fb3432ba..3fb3432ba 100644
--- a/gfx/pics/sunflora/back.2bpp.lz
+++ b/gfx/pics/sunflora/back.2bpp.lz.9d0684f0
diff --git a/gfx/pics/sunflora/back.png b/gfx/pics/sunflora/back.png
new file mode 100644
index 000000000..e30eca3b0
--- /dev/null
+++ b/gfx/pics/sunflora/back.png
diff --git a/gfx/pics/sunflora/bitmask.asm b/gfx/pics/sunflora/bitmask.asm
deleted file mode 100644
index f0b71e34a..000000000
--- a/gfx/pics/sunflora/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %11000110
-	db %10010011
-	db %00100100
-	db %10001111
-	db %00000001
-; 1
-	db %11000000
-	db %11010011
-	db %00110100
-	db %00001111
-	db %00000000
-; 2
-	db %00000000
-	db %01000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00100000
-	db %00001000
-	db %00000000
-	db %00000000
-; 0xd360a
diff --git a/gfx/pics/sunflora/frames.asm b/gfx/pics/sunflora/frames.asm
deleted file mode 100644
index 3cb42d83e..000000000
--- a/gfx/pics/sunflora/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $00, $00, $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d
-	db $2e, $2f, $00, $00
-.frame2
-	db $01 ; bitmask
-	db $24, $30, $31, $27, $28, $32, $29, $2a, $33, $2b, $2c, $34
-	db $35, $2f
-.frame3
-	db $02 ; bitmask
-	db $32, $33
-.frame4
-	db $03 ; bitmask
-	db $36, $37
-; 0xd8cb2
diff --git a/gfx/pics/sunflora/front.2bpp.lz b/gfx/pics/sunflora/front.animated.2bpp.lz.258c3e67
index 1026c3719..1026c3719 100644
--- a/gfx/pics/sunflora/front.2bpp.lz
+++ b/gfx/pics/sunflora/front.animated.2bpp.lz.258c3e67
diff --git a/gfx/pics/sunflora/front.png b/gfx/pics/sunflora/front.png
new file mode 100644
index 000000000..377124363
--- /dev/null
+++ b/gfx/pics/sunflora/front.png
diff --git a/gfx/pics/sunflora/normal.pal b/gfx/pics/sunflora/normal.pal
deleted file mode 100644
index 24b040e73..000000000
--- a/gfx/pics/sunflora/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 22, 03
-	RGB 10, 21, 00
-
diff --git a/gfx/pics/sunkern/back.2bpp.lz b/gfx/pics/sunkern/back.2bpp.lz.d28f6303
index a9ba0f738..a9ba0f738 100644
--- a/gfx/pics/sunkern/back.2bpp.lz
+++ b/gfx/pics/sunkern/back.2bpp.lz.d28f6303
diff --git a/gfx/pics/sunkern/back.png b/gfx/pics/sunkern/back.png
new file mode 100644
index 000000000..f6a12a830
--- /dev/null
+++ b/gfx/pics/sunkern/back.png
diff --git a/gfx/pics/sunkern/bitmask.asm b/gfx/pics/sunkern/bitmask.asm
deleted file mode 100644
index 058b53861..000000000
--- a/gfx/pics/sunkern/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00000000
-	db %00000001
-	db %00000000
-	db %00000000
-; 1
-	db %01100000
-	db %10001100
-	db %01110001
-	db %00000000
-; 2
-	db %10000000
-	db %00110000
-	db %00000000
-	db %00000000
-; 0xd35f6
diff --git a/gfx/pics/sunkern/frames.asm b/gfx/pics/sunkern/frames.asm
deleted file mode 100644
index ddbd59bf3..000000000
--- a/gfx/pics/sunkern/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19
-.frame2
-	db $01 ; bitmask
-	db $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $00
-.frame3
-	db $02 ; bitmask
-	db $22, $23, $24
-; 0xd8c84
diff --git a/gfx/pics/sunkern/front.2bpp.lz b/gfx/pics/sunkern/front.animated.2bpp.lz.316c5261
index 77a21af73..77a21af73 100644
--- a/gfx/pics/sunkern/front.2bpp.lz
+++ b/gfx/pics/sunkern/front.animated.2bpp.lz.316c5261
diff --git a/gfx/pics/sunkern/front.png b/gfx/pics/sunkern/front.png
new file mode 100644
index 000000000..5bc994e6d
--- /dev/null
+++ b/gfx/pics/sunkern/front.png
diff --git a/gfx/pics/sunkern/normal.pal b/gfx/pics/sunkern/normal.pal
deleted file mode 100644
index 51e641e15..000000000
--- a/gfx/pics/sunkern/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 28, 01
-	RGB 13, 18, 08
-
diff --git a/gfx/pics/swinub/back.2bpp.lz b/gfx/pics/swinub/back.2bpp.lz.1ebbfabf
index 51b90aae2..51b90aae2 100644
--- a/gfx/pics/swinub/back.2bpp.lz
+++ b/gfx/pics/swinub/back.2bpp.lz.1ebbfabf
diff --git a/gfx/pics/swinub/back.png b/gfx/pics/swinub/back.png
new file mode 100644
index 000000000..254b08e27
--- /dev/null
+++ b/gfx/pics/swinub/back.png
diff --git a/gfx/pics/swinub/bitmask.asm b/gfx/pics/swinub/bitmask.asm
deleted file mode 100644
index e0a852068..000000000
--- a/gfx/pics/swinub/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %00011000
-	db %00000011
-	db %00000000
-	db %00000000
-; 1
-	db %00001000
-	db %00000001
-	db %00000000
-	db %00000000
-; 0xd37f9
diff --git a/gfx/pics/swinub/frames.asm b/gfx/pics/swinub/frames.asm
deleted file mode 100644
index 9e55f046d..000000000
--- a/gfx/pics/swinub/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c
-.frame2
-	db $00 ; bitmask
-	db $1d, $1e, $1f, $20
-.frame3
-	db $01 ; bitmask
-	db $21, $22
-; 0xd91ff
diff --git a/gfx/pics/swinub/front.2bpp.lz b/gfx/pics/swinub/front.animated.2bpp.lz.228147a5
index 00171e0f3..00171e0f3 100644
--- a/gfx/pics/swinub/front.2bpp.lz
+++ b/gfx/pics/swinub/front.animated.2bpp.lz.228147a5
diff --git a/gfx/pics/swinub/front.png b/gfx/pics/swinub/front.png
new file mode 100644
index 000000000..52fcadade
--- /dev/null
+++ b/gfx/pics/swinub/front.png
diff --git a/gfx/pics/swinub/normal.pal b/gfx/pics/swinub/normal.pal
deleted file mode 100644
index c560793f1..000000000
--- a/gfx/pics/swinub/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 16, 03
-	RGB 19, 06, 04
-
diff --git a/gfx/pics/tangela/back.2bpp.lz b/gfx/pics/tangela/back.2bpp.lz.435194a6
index 9ad73a0b6..9ad73a0b6 100644
--- a/gfx/pics/tangela/back.2bpp.lz
+++ b/gfx/pics/tangela/back.2bpp.lz.435194a6
diff --git a/gfx/pics/tangela/back.png b/gfx/pics/tangela/back.png
new file mode 100644
index 000000000..edbe07de1
--- /dev/null
+++ b/gfx/pics/tangela/back.png
diff --git a/gfx/pics/tangela/bitmask.asm b/gfx/pics/tangela/bitmask.asm
deleted file mode 100644
index 36344a16b..000000000
--- a/gfx/pics/tangela/bitmask.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-; 0
-	db %11011000
-	db %11000001
-	db %11111011
-	db %11010111
-	db %00000001
-; 1
-	db %00000000
-	db %01000001
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd2ffa
diff --git a/gfx/pics/tangela/frames.asm b/gfx/pics/tangela/frames.asm
deleted file mode 100644
index 96a52cafe..000000000
--- a/gfx/pics/tangela/frames.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $24, $00, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e
-	db $2f, $00, $30, $31, $32, $33, $00, $34, $35
-.frame2
-	db $01 ; bitmask
-	db $36, $37, $38
-; 0xd59ea
diff --git a/gfx/pics/tangela/front.2bpp.lz b/gfx/pics/tangela/front.animated.2bpp.lz.7cb3fed8
index 345732b84..345732b84 100644
--- a/gfx/pics/tangela/front.2bpp.lz
+++ b/gfx/pics/tangela/front.animated.2bpp.lz.7cb3fed8
diff --git a/gfx/pics/tangela/front.png b/gfx/pics/tangela/front.png
new file mode 100644
index 000000000..23c506929
--- /dev/null
+++ b/gfx/pics/tangela/front.png
diff --git a/gfx/pics/tangela/normal.pal b/gfx/pics/tangela/normal.pal
deleted file mode 100644
index c742f093f..000000000
--- a/gfx/pics/tangela/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 09, 13, 23
-	RGB 17, 06, 06
-
diff --git a/gfx/pics/tauros/back.2bpp.lz b/gfx/pics/tauros/back.2bpp.lz.f487c586
index 219aee479..219aee479 100644
--- a/gfx/pics/tauros/back.2bpp.lz
+++ b/gfx/pics/tauros/back.2bpp.lz.f487c586
diff --git a/gfx/pics/tauros/back.png b/gfx/pics/tauros/back.png
new file mode 100644
index 000000000..9345301d3
--- /dev/null
+++ b/gfx/pics/tauros/back.png
diff --git a/gfx/pics/tauros/bitmask.asm b/gfx/pics/tauros/bitmask.asm
deleted file mode 100644
index 2e5fc87ff..000000000
--- a/gfx/pics/tauros/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %11000000
-	db %11100001
-	db %01110001
-	db %00011000
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %11011100
-	db %11101111
-	db %11110011
-	db %01111001
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %11000000
-	db %11100011
-	db %11110011
-	db %01111001
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00100000
-	db %00000000
-	db %00000000
-; 0xd3138
diff --git a/gfx/pics/tauros/frames.asm b/gfx/pics/tauros/frames.asm
deleted file mode 100644
index 26f8df20a..000000000
--- a/gfx/pics/tauros/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-.frame2
-	db $01 ; bitmask
-	db $3d, $3e, $3f, $40, $41, $42, $43, $44, $05, $45, $46, $47
-	db $48, $49, $4a, $4b, $4c, $4d, $4e, $4f, $50, $51, $52
-.frame3
-	db $02 ; bitmask
-	db $40, $41, $42, $43, $45, $46, $47, $48, $49, $4a, $4b, $4c
-	db $4d, $4e, $4f, $50, $51, $52
-.frame4
-	db $03 ; bitmask
-	db $53
-; 0xd5d08
diff --git a/gfx/pics/tauros/front.2bpp.lz b/gfx/pics/tauros/front.animated.2bpp.lz.982dd0db
index d395b145b..d395b145b 100644
--- a/gfx/pics/tauros/front.2bpp.lz
+++ b/gfx/pics/tauros/front.animated.2bpp.lz.982dd0db
diff --git a/gfx/pics/tauros/front.png b/gfx/pics/tauros/front.png
new file mode 100644
index 000000000..535526411
--- /dev/null
+++ b/gfx/pics/tauros/front.png
diff --git a/gfx/pics/tauros/normal.pal b/gfx/pics/tauros/normal.pal
deleted file mode 100644
index 396e765e2..000000000
--- a/gfx/pics/tauros/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 15, 05
-	RGB 10, 07, 04
-
diff --git a/gfx/pics/teddiursa/back.2bpp.lz b/gfx/pics/teddiursa/back.2bpp.lz.53f6e34e
index a6d267ef8..a6d267ef8 100644
--- a/gfx/pics/teddiursa/back.2bpp.lz
+++ b/gfx/pics/teddiursa/back.2bpp.lz.53f6e34e
diff --git a/gfx/pics/teddiursa/back.png b/gfx/pics/teddiursa/back.png
new file mode 100644
index 000000000..0d4640318
--- /dev/null
+++ b/gfx/pics/teddiursa/back.png
diff --git a/gfx/pics/teddiursa/bitmask.asm b/gfx/pics/teddiursa/bitmask.asm
deleted file mode 100644
index e5f542110..000000000
--- a/gfx/pics/teddiursa/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %10001100
-	db %00000001
-	db %00001100
-	db %00000000
-; 1
-	db %11000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 2
-	db %01000000
-	db %00001000
-	db %00000000
-	db %00000000
-; 0xd37b3
diff --git a/gfx/pics/teddiursa/frames.asm b/gfx/pics/teddiursa/frames.asm
deleted file mode 100644
index 542906c4c..000000000
--- a/gfx/pics/teddiursa/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e
-.frame2
-	db $00 ; bitmask
-	db $19, $1a, $1f, $1c, $1d, $1e
-.frame3
-	db $01 ; bitmask
-	db $20, $21, $22
-.frame4
-	db $02 ; bitmask
-	db $23, $24
-; 0xd9128
diff --git a/gfx/pics/teddiursa/front.2bpp.lz b/gfx/pics/teddiursa/front.animated.2bpp.lz.5f9648c7
index 40c22315e..40c22315e 100644
--- a/gfx/pics/teddiursa/front.2bpp.lz
+++ b/gfx/pics/teddiursa/front.animated.2bpp.lz.5f9648c7
diff --git a/gfx/pics/teddiursa/front.png b/gfx/pics/teddiursa/front.png
new file mode 100644
index 000000000..83dd4896d
--- /dev/null
+++ b/gfx/pics/teddiursa/front.png
diff --git a/gfx/pics/teddiursa/normal.pal b/gfx/pics/teddiursa/normal.pal
deleted file mode 100644
index 07a1d3622..000000000
--- a/gfx/pics/teddiursa/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 22, 14, 06
-	RGB 14, 07, 04
-
diff --git a/gfx/pics/tentacool/back.2bpp.lz b/gfx/pics/tentacool/back.2bpp.lz.ae7b2102
index c0b615905..c0b615905 100644
--- a/gfx/pics/tentacool/back.2bpp.lz
+++ b/gfx/pics/tentacool/back.2bpp.lz.ae7b2102
diff --git a/gfx/pics/tentacool/back.png b/gfx/pics/tentacool/back.png
new file mode 100644
index 000000000..7a7724189
--- /dev/null
+++ b/gfx/pics/tentacool/back.png
diff --git a/gfx/pics/tentacool/bitmask.asm b/gfx/pics/tentacool/bitmask.asm
deleted file mode 100644
index 36a68c87e..000000000
--- a/gfx/pics/tentacool/bitmask.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-; 0
-	db %00011000
-	db %01000011
-	db %10001100
-	db %00000001
-; 1
-	db %00000000
-	db %00000000
-	db %10001000
-	db %00000001
-; 2
-	db %10000000
-	db %00010000
-	db %00000010
-	db %00000000
-; 3
-	db %10011000
-	db %01010011
-	db %10001110
-	db %00000001
-; 4
-	db %10000000
-	db %00010000
-	db %10001010
-	db %00000001
-; 0xd2c56
diff --git a/gfx/pics/tentacool/frames.asm b/gfx/pics/tentacool/frames.asm
deleted file mode 100644
index bb7e38266..000000000
--- a/gfx/pics/tentacool/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $14, $1d, $1e, $1f, $20
-.frame2
-	db $01 ; bitmask
-	db $21, $22, $23
-.frame3
-	db $02 ; bitmask
-	db $24, $25, $26
-.frame4
-	db $03 ; bitmask
-	db $19, $1a, $24, $1b, $1c, $25, $14, $26, $1d, $1e, $1f, $20
-.frame5
-	db $04 ; bitmask
-	db $24, $25, $26, $21, $22, $23
-; 0xd5127
diff --git a/gfx/pics/tentacool/front.2bpp.lz b/gfx/pics/tentacool/front.animated.2bpp.lz.7a86457c
index 57916e4e9..57916e4e9 100644
--- a/gfx/pics/tentacool/front.2bpp.lz
+++ b/gfx/pics/tentacool/front.animated.2bpp.lz.7a86457c
diff --git a/gfx/pics/tentacool/front.png b/gfx/pics/tentacool/front.png
new file mode 100644
index 000000000..1e4684719
--- /dev/null
+++ b/gfx/pics/tentacool/front.png
diff --git a/gfx/pics/tentacool/normal.pal b/gfx/pics/tentacool/normal.pal
deleted file mode 100644
index 91a11c6b7..000000000
--- a/gfx/pics/tentacool/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 11, 20, 31
-	RGB 30, 06, 10
-
diff --git a/gfx/pics/tentacruel/back.2bpp.lz b/gfx/pics/tentacruel/back.2bpp.lz.0e344f19
index 89d7a492d..89d7a492d 100644
--- a/gfx/pics/tentacruel/back.2bpp.lz
+++ b/gfx/pics/tentacruel/back.2bpp.lz.0e344f19
diff --git a/gfx/pics/tentacruel/back.png b/gfx/pics/tentacruel/back.png
new file mode 100644
index 000000000..4430f740f
--- /dev/null
+++ b/gfx/pics/tentacruel/back.png
diff --git a/gfx/pics/tentacruel/bitmask.asm b/gfx/pics/tentacruel/bitmask.asm
deleted file mode 100644
index 54d28d36d..000000000
--- a/gfx/pics/tentacruel/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00100000
-	db %10001100
-	db %11100011
-	db %00111100
-	db %00001111
-; 1
-	db %00000000
-	db %10000000
-	db %00100000
-	db %00000100
-	db %00000000
-; 2
-	db %00000000
-	db %10000000
-	db %00110000
-	db %00000100
-	db %00000000
-; 0xd2c65
diff --git a/gfx/pics/tentacruel/frames.asm b/gfx/pics/tentacruel/frames.asm
deleted file mode 100644
index 124520e2f..000000000
--- a/gfx/pics/tentacruel/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $30, $31, $32, $33, $34
-.frame2
-	db $01 ; bitmask
-	db $27, $2a, $35
-.frame3
-	db $02 ; bitmask
-	db $27, $36, $2a, $35
-; 0xd5148
diff --git a/gfx/pics/tentacruel/front.2bpp.lz b/gfx/pics/tentacruel/front.animated.2bpp.lz.f13e5904
index ec6f4c2c8..ec6f4c2c8 100644
--- a/gfx/pics/tentacruel/front.2bpp.lz
+++ b/gfx/pics/tentacruel/front.animated.2bpp.lz.f13e5904
diff --git a/gfx/pics/tentacruel/front.png b/gfx/pics/tentacruel/front.png
new file mode 100644
index 000000000..fad5553fe
--- /dev/null
+++ b/gfx/pics/tentacruel/front.png
diff --git a/gfx/pics/tentacruel/normal.pal b/gfx/pics/tentacruel/normal.pal
deleted file mode 100644
index 98f28bd61..000000000
--- a/gfx/pics/tentacruel/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 11, 20, 31
-	RGB 26, 02, 02
-
diff --git a/gfx/pics/togepi/back.2bpp.lz b/gfx/pics/togepi/back.2bpp.lz.0e22cc02
index ed6fab2ec..ed6fab2ec 100644
--- a/gfx/pics/togepi/back.2bpp.lz
+++ b/gfx/pics/togepi/back.2bpp.lz.0e22cc02
diff --git a/gfx/pics/togepi/back.png b/gfx/pics/togepi/back.png
new file mode 100644
index 000000000..de6bc8a40
--- /dev/null
+++ b/gfx/pics/togepi/back.png
diff --git a/gfx/pics/togepi/bitmask.asm b/gfx/pics/togepi/bitmask.asm
deleted file mode 100644
index dfe406529..000000000
--- a/gfx/pics/togepi/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %11000000
-	db %01111011
-	db %11001111
-	db %00000000
-; 1
-	db %00000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 0xd34bd
diff --git a/gfx/pics/togepi/frames.asm b/gfx/pics/togepi/frames.asm
deleted file mode 100644
index e75a9860b..000000000
--- a/gfx/pics/togepi/frames.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $23, $24
-	db $25, $26
-.frame2
-	db $01 ; bitmask
-	db $27
-; 0xd893f
diff --git a/gfx/pics/togepi/front.2bpp.lz b/gfx/pics/togepi/front.animated.2bpp.lz.0cf7ba07
index 8ceaf38bf..8ceaf38bf 100644
--- a/gfx/pics/togepi/front.2bpp.lz
+++ b/gfx/pics/togepi/front.animated.2bpp.lz.0cf7ba07
diff --git a/gfx/pics/togepi/front.png b/gfx/pics/togepi/front.png
new file mode 100644
index 000000000..3fc23b9d7
--- /dev/null
+++ b/gfx/pics/togepi/front.png
diff --git a/gfx/pics/togepi/normal.pal b/gfx/pics/togepi/normal.pal
deleted file mode 100644
index 670ccdfaa..000000000
--- a/gfx/pics/togepi/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 26, 11
-	RGB 31, 06, 17
-
diff --git a/gfx/pics/togetic/back.2bpp.lz b/gfx/pics/togetic/back.2bpp.lz.62cbb330
index 134d5718a..134d5718a 100644
--- a/gfx/pics/togetic/back.2bpp.lz
+++ b/gfx/pics/togetic/back.2bpp.lz.62cbb330
diff --git a/gfx/pics/togetic/back.png b/gfx/pics/togetic/back.png
new file mode 100644
index 000000000..9a92e0970
--- /dev/null
+++ b/gfx/pics/togetic/back.png
diff --git a/gfx/pics/togetic/bitmask.asm b/gfx/pics/togetic/bitmask.asm
deleted file mode 100644
index bf7c7ce1a..000000000
--- a/gfx/pics/togetic/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00000000
-	db %00111100
-	db %00011011
-	db %10001110
-	db %00000111
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00111100
-	db %10011011
-	db %11001111
-	db %01110111
-	db %00111000
-	db %00000000
-; 2
-	db %00000000
-	db %10000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %00000000
-	db %00111100
-	db %00011010
-	db %10001110
-	db %00000111
-	db %00000000
-	db %00000000
-; 0xd34d9
diff --git a/gfx/pics/togetic/frames.asm b/gfx/pics/togetic/frames.asm
deleted file mode 100644
index b5513420a..000000000
--- a/gfx/pics/togetic/frames.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $33, $34, $40, $41, $37, $38, $42, $43, $39, $3a
-	db $3b, $44, $3c, $3d, $3e, $3f, $00, $45, $46, $00, $47, $48
-.frame3
-	db $02 ; bitmask
-	db $49
-.frame4
-	db $03 ; bitmask
-	db $31, $32, $33, $34, $36, $37, $38, $39, $3a, $3b, $3c, $3d
-	db $3e, $3f
-.frame5
-	db $01 ; bitmask
-	db $31, $32, $33, $34, $4a, $41, $37, $38, $42, $43, $39, $3a
-	db $3b, $44, $3c, $3d, $3e, $3f, $00, $45, $46, $00, $47, $48
-; 0xd899c
diff --git a/gfx/pics/togetic/front.2bpp.lz b/gfx/pics/togetic/front.animated.2bpp.lz.5797583e
index 13e98ae1d..13e98ae1d 100644
--- a/gfx/pics/togetic/front.2bpp.lz
+++ b/gfx/pics/togetic/front.animated.2bpp.lz.5797583e
diff --git a/gfx/pics/togetic/front.png b/gfx/pics/togetic/front.png
new file mode 100644
index 000000000..9851c9011
--- /dev/null
+++ b/gfx/pics/togetic/front.png
diff --git a/gfx/pics/togetic/normal.pal b/gfx/pics/togetic/normal.pal
deleted file mode 100644
index c968300f4..000000000
--- a/gfx/pics/togetic/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 20, 30
-	RGB 28, 07, 06
-
diff --git a/gfx/pics/totodile/back.2bpp.lz b/gfx/pics/totodile/back.2bpp.lz.ab6bc2a1
index 6d73c934f..6d73c934f 100644
--- a/gfx/pics/totodile/back.2bpp.lz
+++ b/gfx/pics/totodile/back.2bpp.lz.ab6bc2a1
diff --git a/gfx/pics/totodile/back.png b/gfx/pics/totodile/back.png
new file mode 100644
index 000000000..5cf6adf42
--- /dev/null
+++ b/gfx/pics/totodile/back.png
diff --git a/gfx/pics/totodile/bitmask.asm b/gfx/pics/totodile/bitmask.asm
deleted file mode 100644
index 1d81390e3..000000000
--- a/gfx/pics/totodile/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %11001110
-	db %00011001
-	db %01100011
-	db %00000000
-; 1
-	db %00000000
-	db %01100011
-	db %10001100
-	db %00000001
-; 2
-	db %00000000
-	db %00000100
-	db %10000000
-	db %00000001
-; 0xd3395
diff --git a/gfx/pics/totodile/frames.asm b/gfx/pics/totodile/frames.asm
deleted file mode 100644
index fbce8e2c8..000000000
--- a/gfx/pics/totodile/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $04, $23
-.frame2
-	db $01 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b
-.frame3
-	db $02 ; bitmask
-	db $2c, $2a, $2b
-; 0xd85d3
diff --git a/gfx/pics/totodile/front.2bpp.lz b/gfx/pics/totodile/front.animated.2bpp.lz.afce8cd0
index 8e1ebd2f5..8e1ebd2f5 100644
--- a/gfx/pics/totodile/front.2bpp.lz
+++ b/gfx/pics/totodile/front.animated.2bpp.lz.afce8cd0
diff --git a/gfx/pics/totodile/front.png b/gfx/pics/totodile/front.png
new file mode 100644
index 000000000..634d04189
--- /dev/null
+++ b/gfx/pics/totodile/front.png
diff --git a/gfx/pics/totodile/normal.pal b/gfx/pics/totodile/normal.pal
deleted file mode 100644
index a07351f43..000000000
--- a/gfx/pics/totodile/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 12, 17, 26
-	RGB 28, 09, 04
-
diff --git a/gfx/pics/typhlosion/back.2bpp.lz b/gfx/pics/typhlosion/back.2bpp.lz.83be0292
index 592306fa6..592306fa6 100644
--- a/gfx/pics/typhlosion/back.2bpp.lz
+++ b/gfx/pics/typhlosion/back.2bpp.lz.83be0292
diff --git a/gfx/pics/typhlosion/back.png b/gfx/pics/typhlosion/back.png
new file mode 100644
index 000000000..1808f3089
--- /dev/null
+++ b/gfx/pics/typhlosion/back.png
diff --git a/gfx/pics/typhlosion/bitmask.asm b/gfx/pics/typhlosion/bitmask.asm
deleted file mode 100644
index bcbfa43cf..000000000
--- a/gfx/pics/typhlosion/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %10000110
-	db %11000111
-	db %11100111
-	db %11110001
-	db %11111000
-	db %01111100
-	db %00000000
-; 1
-	db %00000110
-	db %11000111
-	db %11100111
-	db %11110001
-	db %11100000
-	db %01100000
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %10000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3389
diff --git a/gfx/pics/typhlosion/frames.asm b/gfx/pics/typhlosion/frames.asm
deleted file mode 100644
index 152772e7d..000000000
--- a/gfx/pics/typhlosion/frames.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $00, $00, $00, $31, $32, $33, $34, $35, $36, $37, $38, $39
-	db $3a, $3b, $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44, $45
-	db $00, $00, $00, $00, $00
-.frame2
-	db $01 ; bitmask
-	db $00, $00, $31, $32, $46, $47, $48, $36, $49, $4a, $4b, $3a
-	db $3b, $4c, $4d, $4e, $4f, $50, $51, $52, $45, $00, $00
-.frame3
-	db $00 ; bitmask
-	db $00, $00, $00, $31, $32, $46, $34, $35, $36, $49, $4a, $39
-	db $3a, $3b, $4c, $3d, $3e, $3f, $40, $41, $42, $43, $44, $45
-	db $00, $00, $00, $00, $00
-.frame4
-	db $02 ; bitmask
-	db $53
-.frame5
-	db $01 ; bitmask
-	db $00, $00, $31, $32, $33, $47, $48, $36, $37, $38, $4b, $3a
-	db $3b, $3c, $4d, $4e, $4f, $50, $51, $52, $45, $00, $00
-; 0xd85b3
diff --git a/gfx/pics/typhlosion/front.2bpp.lz b/gfx/pics/typhlosion/front.animated.2bpp.lz.65adc1e1
index 9dba415ad..9dba415ad 100644
--- a/gfx/pics/typhlosion/front.2bpp.lz
+++ b/gfx/pics/typhlosion/front.animated.2bpp.lz.65adc1e1
diff --git a/gfx/pics/typhlosion/front.png b/gfx/pics/typhlosion/front.png
new file mode 100644
index 000000000..aef81a01b
--- /dev/null
+++ b/gfx/pics/typhlosion/front.png
diff --git a/gfx/pics/typhlosion/normal.pal b/gfx/pics/typhlosion/normal.pal
deleted file mode 100644
index 6b3f9efe7..000000000
--- a/gfx/pics/typhlosion/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 27, 09
-	RGB 27, 06, 03
-
diff --git a/gfx/pics/tyranitar/back.2bpp.lz b/gfx/pics/tyranitar/back.2bpp.lz.05b022c9
index 572e56d69..572e56d69 100644
--- a/gfx/pics/tyranitar/back.2bpp.lz
+++ b/gfx/pics/tyranitar/back.2bpp.lz.05b022c9
diff --git a/gfx/pics/tyranitar/back.png b/gfx/pics/tyranitar/back.png
new file mode 100644
index 000000000..07f6d1b57
--- /dev/null
+++ b/gfx/pics/tyranitar/back.png
diff --git a/gfx/pics/tyranitar/bitmask.asm b/gfx/pics/tyranitar/bitmask.asm
deleted file mode 100644
index 446e83c42..000000000
--- a/gfx/pics/tyranitar/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %10011111
-	db %11001111
-	db %01101111
-	db %00110011
-	db %00000001
-	db %00000000
-	db %00000000
-; 1
-	db %10011111
-	db %11001111
-	db %01101111
-	db %00110011
-	db %01100001
-	db %00110000
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %01100000
-	db %00110000
-	db %00000000
-; 3
-	db %00000000
-	db %00000000
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3a58
diff --git a/gfx/pics/tyranitar/frames.asm b/gfx/pics/tyranitar/frames.asm
deleted file mode 100644
index b9d6d7da5..000000000
--- a/gfx/pics/tyranitar/frames.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $05, $05, $05, $31, $32, $33, $34, $35, $36, $37, $38, $39
-	db $3a, $3b, $3c, $3d, $3e, $3f, $40, $41, $05, $42, $43
-.frame2
-	db $01 ; bitmask
-	db $05, $05, $44, $45, $05, $33, $34, $46, $47, $48, $38, $39
-	db $49, $4a, $4b, $3d, $3e, $3f, $4c, $4d, $05, $42, $43, $4e
-	db $4f, $50, $51
-.frame3
-	db $00 ; bitmask
-	db $05, $05, $44, $45, $05, $33, $34, $46, $47, $48, $38, $39
-	db $49, $4a, $4b, $3d, $3e, $3f, $4c, $4d, $05, $42, $43
-.frame4
-	db $02 ; bitmask
-	db $4e, $4f, $50, $51
-.frame5
-	db $03 ; bitmask
-	db $52
-; 0xd982c
diff --git a/gfx/pics/tyranitar/front.2bpp.lz b/gfx/pics/tyranitar/front.animated.2bpp.lz.e0e9187e
index 07d48a5fe..07d48a5fe 100644
--- a/gfx/pics/tyranitar/front.2bpp.lz
+++ b/gfx/pics/tyranitar/front.animated.2bpp.lz.e0e9187e
diff --git a/gfx/pics/tyranitar/front.png b/gfx/pics/tyranitar/front.png
new file mode 100644
index 000000000..4b1ba3416
--- /dev/null
+++ b/gfx/pics/tyranitar/front.png
diff --git a/gfx/pics/tyranitar/normal.pal b/gfx/pics/tyranitar/normal.pal
deleted file mode 100644
index 5c02e7683..000000000
--- a/gfx/pics/tyranitar/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 16, 28, 00
-	RGB 15, 10, 27
-
diff --git a/gfx/pics/tyrogue/back.2bpp.lz b/gfx/pics/tyrogue/back.2bpp.lz.5d84cef1
index 9c9a0babc..9c9a0babc 100644
--- a/gfx/pics/tyrogue/back.2bpp.lz
+++ b/gfx/pics/tyrogue/back.2bpp.lz.5d84cef1
diff --git a/gfx/pics/tyrogue/back.png b/gfx/pics/tyrogue/back.png
new file mode 100644
index 000000000..22c1d61c4
--- /dev/null
+++ b/gfx/pics/tyrogue/back.png
diff --git a/gfx/pics/tyrogue/bitmask.asm b/gfx/pics/tyrogue/bitmask.asm
deleted file mode 100644
index df8e0658d..000000000
--- a/gfx/pics/tyrogue/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %10011100
-	db %00110001
-	db %01100000
-	db %00000000
-; 1
-	db %10011100
-	db %00010001
-	db %01100000
-	db %00000000
-; 2
-	db %01000000
-	db %00001000
-	db %00000000
-	db %00000000
-; 0xd394f
diff --git a/gfx/pics/tyrogue/frames.asm b/gfx/pics/tyrogue/frames.asm
deleted file mode 100644
index 9ed82ce41..000000000
--- a/gfx/pics/tyrogue/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $00, $00, $00, $19, $1a, $1b, $1c, $1d, $1e
-.frame2
-	db $01 ; bitmask
-	db $1f, $20, $00, $21, $22, $23, $1d, $1e
-.frame3
-	db $01 ; bitmask
-	db $24, $20, $00, $25, $22, $23, $1d, $1e
-.frame4
-	db $02 ; bitmask
-	db $26, $27
-; 0xd94e3
diff --git a/gfx/pics/tyrogue/front.2bpp.lz b/gfx/pics/tyrogue/front.animated.2bpp.lz.a3790421
index 8245825fb..8245825fb 100644
--- a/gfx/pics/tyrogue/front.2bpp.lz
+++ b/gfx/pics/tyrogue/front.animated.2bpp.lz.a3790421
diff --git a/gfx/pics/tyrogue/front.png b/gfx/pics/tyrogue/front.png
new file mode 100644
index 000000000..af8af4a4e
--- /dev/null
+++ b/gfx/pics/tyrogue/front.png
diff --git a/gfx/pics/tyrogue/normal.pal b/gfx/pics/tyrogue/normal.pal
deleted file mode 100644
index 686526e1b..000000000
--- a/gfx/pics/tyrogue/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 15, 18
-	RGB 17, 07, 03
-
diff --git a/gfx/pics/umbreon/back.2bpp.lz b/gfx/pics/umbreon/back.2bpp.lz.55e50b8c
index cf39af2c6..cf39af2c6 100644
--- a/gfx/pics/umbreon/back.2bpp.lz
+++ b/gfx/pics/umbreon/back.2bpp.lz.55e50b8c
diff --git a/gfx/pics/umbreon/back.png b/gfx/pics/umbreon/back.png
new file mode 100644
index 000000000..f1cce4fc8
--- /dev/null
+++ b/gfx/pics/umbreon/back.png
diff --git a/gfx/pics/umbreon/bitmask.asm b/gfx/pics/umbreon/bitmask.asm
deleted file mode 100644
index 91184a50e..000000000
--- a/gfx/pics/umbreon/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %11011111
-	db %11001111
-	db %00000011
-; 1
-	db %00000000
-	db %01000000
-	db %10011110
-	db %11001111
-	db %00000011
-; 2
-	db %10000111
-	db %00000001
-	db %10011110
-	db %11001111
-	db %00000011
-; 3
-	db %10000111
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3665
diff --git a/gfx/pics/umbreon/frames.asm b/gfx/pics/umbreon/frames.asm
deleted file mode 100644
index 0696ed38a..000000000
--- a/gfx/pics/umbreon/frames.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $24, $06, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e
-	db $2f, $30, $31
-.frame2
-	db $01 ; bitmask
-	db $32, $33, $25, $26, $34, $35, $2a, $2b, $36, $37, $2e, $2f
-	db $38, $39
-.frame3
-	db $02 ; bitmask
-	db $3a, $3b, $3c, $06, $3d, $33, $25, $26, $27, $35, $2a, $2b
-	db $36, $37, $2e, $2f, $38, $39
-.frame4
-	db $03 ; bitmask
-	db $3a, $3b, $3c, $06, $3d
-; 0xd8d7c
diff --git a/gfx/pics/umbreon/front.2bpp.lz b/gfx/pics/umbreon/front.animated.2bpp.lz.b484be57
index 64a338138..64a338138 100644
--- a/gfx/pics/umbreon/front.2bpp.lz
+++ b/gfx/pics/umbreon/front.animated.2bpp.lz.b484be57
diff --git a/gfx/pics/umbreon/front.png b/gfx/pics/umbreon/front.png
new file mode 100644
index 000000000..c1bf9c2f8
--- /dev/null
+++ b/gfx/pics/umbreon/front.png
diff --git a/gfx/pics/umbreon/normal.pal b/gfx/pics/umbreon/normal.pal
deleted file mode 100644
index b3d692a12..000000000
--- a/gfx/pics/umbreon/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 17, 00
-	RGB 06, 07, 05
-
diff --git a/gfx/pics/unown_a/back.2bpp.lz b/gfx/pics/unown_a/back.2bpp.lz.b8389572
index 08833e3e2..08833e3e2 100644
--- a/gfx/pics/unown_a/back.2bpp.lz
+++ b/gfx/pics/unown_a/back.2bpp.lz.b8389572
diff --git a/gfx/pics/unown_a/back.png b/gfx/pics/unown_a/back.png
new file mode 100644
index 000000000..48f7c0200
--- /dev/null
+++ b/gfx/pics/unown_a/back.png
diff --git a/gfx/pics/unown_a/bitmask.asm b/gfx/pics/unown_a/bitmask.asm
deleted file mode 100644
index 892ca25d3..000000000
--- a/gfx/pics/unown_a/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00001100
-	db %00000000
-	db %00000000
-; 2
-	db %10000000
-	db %00110000
-	db %00000010
-	db %00000000
-; 0xd3b13
diff --git a/gfx/pics/unown_a/frames.asm b/gfx/pics/unown_a/frames.asm
deleted file mode 100644
index a603a605b..000000000
--- a/gfx/pics/unown_a/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $19
-.frame2
-	db $00 ; bitmask
-	db $1a
-.frame3
-	db $01 ; bitmask
-	db $1b, $1c
-.frame4
-	db $01 ; bitmask
-	db $1d, $1e
-.frame5
-	db $02 ; bitmask
-	db $1f, $20, $21, $22
-; 0xd99f6
diff --git a/gfx/pics/unown_a/front.2bpp.lz b/gfx/pics/unown_a/front.animated.2bpp.lz.47e16756
index 6f0639575..6f0639575 100644
--- a/gfx/pics/unown_a/front.2bpp.lz
+++ b/gfx/pics/unown_a/front.animated.2bpp.lz.47e16756
diff --git a/gfx/pics/unown_a/front.png b/gfx/pics/unown_a/front.png
new file mode 100644
index 000000000..1949bdc9a
--- /dev/null
+++ b/gfx/pics/unown_a/front.png
diff --git a/gfx/pics/unown_b/back.2bpp.lz b/gfx/pics/unown_b/back.2bpp.lz.72a0840f
index 46375f630..46375f630 100644
--- a/gfx/pics/unown_b/back.2bpp.lz
+++ b/gfx/pics/unown_b/back.2bpp.lz.72a0840f
diff --git a/gfx/pics/unown_b/back.png b/gfx/pics/unown_b/back.png
new file mode 100644
index 000000000..3ceaba03c
--- /dev/null
+++ b/gfx/pics/unown_b/back.png
diff --git a/gfx/pics/unown_b/bitmask.asm b/gfx/pics/unown_b/bitmask.asm
deleted file mode 100644
index 71d442b6a..000000000
--- a/gfx/pics/unown_b/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00000000
-	db %00011000
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %00000011
-	db %00000000
-; 2
-	db %10000000
-	db %00011000
-	db %00000010
-	db %00000000
-; 0xd3b1f
diff --git a/gfx/pics/unown_b/frames.asm b/gfx/pics/unown_b/frames.asm
deleted file mode 100644
index b9235dd59..000000000
--- a/gfx/pics/unown_b/frames.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-.frame1
-	db $00 ; bitmask
-	db $19, $1a
-.frame2
-	db $00 ; bitmask
-	db $1b, $1c
-.frame3
-	db $00 ; bitmask
-	db $1d, $1e
-.frame4
-	db $01 ; bitmask
-	db $1f, $20
-.frame5
-	db $01 ; bitmask
-	db $21, $22
-.frame6
-	db $02 ; bitmask
-	db $23, $24, $25, $26
-; 0xd9a16
diff --git a/gfx/pics/unown_b/front.2bpp.lz b/gfx/pics/unown_b/front.animated.2bpp.lz.5742d494
index 661c64a9e..661c64a9e 100644
--- a/gfx/pics/unown_b/front.2bpp.lz
+++ b/gfx/pics/unown_b/front.animated.2bpp.lz.5742d494
diff --git a/gfx/pics/unown_b/front.png b/gfx/pics/unown_b/front.png
new file mode 100644
index 000000000..9858a26ba
--- /dev/null
+++ b/gfx/pics/unown_b/front.png
diff --git a/gfx/pics/unown_c/back.2bpp.lz b/gfx/pics/unown_c/back.2bpp.lz.f92b665a
index 796ba6d6a..796ba6d6a 100644
--- a/gfx/pics/unown_c/back.2bpp.lz
+++ b/gfx/pics/unown_c/back.2bpp.lz.f92b665a
diff --git a/gfx/pics/unown_c/back.png b/gfx/pics/unown_c/back.png
new file mode 100644
index 000000000..7f7655dd7
--- /dev/null
+++ b/gfx/pics/unown_c/back.png
diff --git a/gfx/pics/unown_c/bitmask.asm b/gfx/pics/unown_c/bitmask.asm
deleted file mode 100644
index 864b1f9ae..000000000
--- a/gfx/pics/unown_c/bitmask.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-; 0
-	db %00001000
-	db %01100011
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00110000
-	db %00000000
-	db %00000000
-; 3
-	db %10000000
-	db %00110001
-	db %00000000
-	db %00000000
-; 0xd3b2f
diff --git a/gfx/pics/unown_c/frames.asm b/gfx/pics/unown_c/frames.asm
deleted file mode 100644
index ea3cce54a..000000000
--- a/gfx/pics/unown_c/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d
-.frame2
-	db $01 ; bitmask
-	db $1e
-.frame3
-	db $02 ; bitmask
-	db $1f, $20
-.frame4
-	db $03 ; bitmask
-	db $21, $22, $23, $24
-; 0xd9a2e
diff --git a/gfx/pics/unown_c/front.2bpp.lz b/gfx/pics/unown_c/front.animated.2bpp.lz.5fef639b
index 18fb3b48b..18fb3b48b 100644
--- a/gfx/pics/unown_c/front.2bpp.lz
+++ b/gfx/pics/unown_c/front.animated.2bpp.lz.5fef639b
diff --git a/gfx/pics/unown_c/front.png b/gfx/pics/unown_c/front.png
new file mode 100644
index 000000000..057fffdc7
--- /dev/null
+++ b/gfx/pics/unown_c/front.png
diff --git a/gfx/pics/unown_d/back.2bpp.lz b/gfx/pics/unown_d/back.2bpp.lz.c8213d32
index 8a967332f..8a967332f 100644
--- a/gfx/pics/unown_d/back.2bpp.lz
+++ b/gfx/pics/unown_d/back.2bpp.lz.c8213d32
diff --git a/gfx/pics/unown_d/back.png b/gfx/pics/unown_d/back.png
new file mode 100644
index 000000000..443c7c589
--- /dev/null
+++ b/gfx/pics/unown_d/back.png
diff --git a/gfx/pics/unown_d/bitmask.asm b/gfx/pics/unown_d/bitmask.asm
deleted file mode 100644
index 7aa8f58ef..000000000
--- a/gfx/pics/unown_d/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %11001100
-	db %00111001
-	db %00000010
-	db %00000000
-; 1
-	db %11000000
-	db %00111001
-	db %00000110
-	db %00000000
-; 2
-	db %10000000
-	db %00110001
-	db %00000000
-	db %00000000
-; 0xd3b3b
diff --git a/gfx/pics/unown_d/frames.asm b/gfx/pics/unown_d/frames.asm
deleted file mode 100644
index 6c110241e..000000000
--- a/gfx/pics/unown_d/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21
-.frame2
-	db $01 ; bitmask
-	db $22, $23, $24, $25, $26, $27, $28, $29
-.frame3
-	db $02 ; bitmask
-	db $2a, $2b, $2c, $2d
-; 0xd9a4c
diff --git a/gfx/pics/unown_d/front.2bpp.lz b/gfx/pics/unown_d/front.animated.2bpp.lz.7810a57f
index d8004662d..d8004662d 100644
--- a/gfx/pics/unown_d/front.2bpp.lz
+++ b/gfx/pics/unown_d/front.animated.2bpp.lz.7810a57f
diff --git a/gfx/pics/unown_d/front.png b/gfx/pics/unown_d/front.png
new file mode 100644
index 000000000..df2114a35
--- /dev/null
+++ b/gfx/pics/unown_d/front.png
diff --git a/gfx/pics/unown_e/back.2bpp.lz b/gfx/pics/unown_e/back.2bpp.lz.777a8ecd
index dfc768a1e..dfc768a1e 100644
--- a/gfx/pics/unown_e/back.2bpp.lz
+++ b/gfx/pics/unown_e/back.2bpp.lz.777a8ecd
diff --git a/gfx/pics/unown_e/back.png b/gfx/pics/unown_e/back.png
new file mode 100644
index 000000000..567ebcfb2
--- /dev/null
+++ b/gfx/pics/unown_e/back.png
diff --git a/gfx/pics/unown_e/bitmask.asm b/gfx/pics/unown_e/bitmask.asm
deleted file mode 100644
index b54fa3f0c..000000000
--- a/gfx/pics/unown_e/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %00001101
-	db %00000000
-; 1
-	db %00000000
-	db %10000000
-	db %00001001
-	db %00000000
-; 2
-	db %10000000
-	db %00110001
-	db %00000000
-	db %00000000
-; 0xd3b47
diff --git a/gfx/pics/unown_e/frames.asm b/gfx/pics/unown_e/frames.asm
deleted file mode 100644
index 8374cad6e..000000000
--- a/gfx/pics/unown_e/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b
-.frame2
-	db $01 ; bitmask
-	db $1c, $1d, $1e
-.frame3
-	db $02 ; bitmask
-	db $1f, $20, $21, $22
-; 0xd9a5f
diff --git a/gfx/pics/unown_e/front.2bpp.lz b/gfx/pics/unown_e/front.animated.2bpp.lz.83f43ff7
index 5358f5ff9..5358f5ff9 100644
--- a/gfx/pics/unown_e/front.2bpp.lz
+++ b/gfx/pics/unown_e/front.animated.2bpp.lz.83f43ff7
diff --git a/gfx/pics/unown_e/front.png b/gfx/pics/unown_e/front.png
new file mode 100644
index 000000000..36d98fe38
--- /dev/null
+++ b/gfx/pics/unown_e/front.png
diff --git a/gfx/pics/unown_f/back.2bpp.lz b/gfx/pics/unown_f/back.2bpp.lz.3fe1c85a
index 47e54ab66..47e54ab66 100644
--- a/gfx/pics/unown_f/back.2bpp.lz
+++ b/gfx/pics/unown_f/back.2bpp.lz.3fe1c85a
diff --git a/gfx/pics/unown_f/back.png b/gfx/pics/unown_f/back.png
new file mode 100644
index 000000000..de60198da
--- /dev/null
+++ b/gfx/pics/unown_f/back.png
diff --git a/gfx/pics/unown_f/bitmask.asm b/gfx/pics/unown_f/bitmask.asm
deleted file mode 100644
index f8f337564..000000000
--- a/gfx/pics/unown_f/bitmask.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-; 0
-	db %00000000
-	db %00000010
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %01000000
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00100000
-	db %00000000
-	db %00000000
-; 3
-	db %11000000
-	db %00011000
-	db %00000000
-	db %00000000
-; 0xd3b57
diff --git a/gfx/pics/unown_f/frames.asm b/gfx/pics/unown_f/frames.asm
deleted file mode 100644
index 7247d1f2d..000000000
--- a/gfx/pics/unown_f/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19
-.frame2
-	db $01 ; bitmask
-	db $1a
-.frame3
-	db $02 ; bitmask
-	db $1b
-.frame4
-	db $03 ; bitmask
-	db $1c, $1d, $1e, $1f
-; 0xd9a72
diff --git a/gfx/pics/unown_f/front.2bpp.lz b/gfx/pics/unown_f/front.animated.2bpp.lz.ec888954
index 4e0339419..4e0339419 100644
--- a/gfx/pics/unown_f/front.2bpp.lz
+++ b/gfx/pics/unown_f/front.animated.2bpp.lz.ec888954
diff --git a/gfx/pics/unown_f/front.png b/gfx/pics/unown_f/front.png
new file mode 100644
index 000000000..f47dcb53b
--- /dev/null
+++ b/gfx/pics/unown_f/front.png
diff --git a/gfx/pics/unown_g/back.2bpp.lz b/gfx/pics/unown_g/back.2bpp.lz.91650439
index 1f380f3ba..1f380f3ba 100644
--- a/gfx/pics/unown_g/back.2bpp.lz
+++ b/gfx/pics/unown_g/back.2bpp.lz.91650439
diff --git a/gfx/pics/unown_g/back.png b/gfx/pics/unown_g/back.png
new file mode 100644
index 000000000..b31728f31
--- /dev/null
+++ b/gfx/pics/unown_g/back.png
diff --git a/gfx/pics/unown_g/bitmask.asm b/gfx/pics/unown_g/bitmask.asm
deleted file mode 100644
index 476a9c0a1..000000000
--- a/gfx/pics/unown_g/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %01100000
-	db %10001100
-	db %00000001
-	db %00000000
-; 1
-	db %01100000
-	db %10011100
-	db %00000001
-	db %00000000
-; 2
-	db %00000000
-	db %00111000
-	db %00000010
-	db %00000000
-; 0xd3b63
diff --git a/gfx/pics/unown_g/frames.asm b/gfx/pics/unown_g/frames.asm
deleted file mode 100644
index 993e7eb5c..000000000
--- a/gfx/pics/unown_g/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e
-.frame2
-	db $01 ; bitmask
-	db $19, $1a, $1b, $1c, $1f, $1d, $1e
-.frame3
-	db $02 ; bitmask
-	db $20, $21, $22, $23
-; 0xd9a8c
diff --git a/gfx/pics/unown_g/front.2bpp.lz b/gfx/pics/unown_g/front.animated.2bpp.lz.c0b74162
index 0e6e343f9..0e6e343f9 100644
--- a/gfx/pics/unown_g/front.2bpp.lz
+++ b/gfx/pics/unown_g/front.animated.2bpp.lz.c0b74162
diff --git a/gfx/pics/unown_g/front.png b/gfx/pics/unown_g/front.png
new file mode 100644
index 000000000..1439f4d7e
--- /dev/null
+++ b/gfx/pics/unown_g/front.png
diff --git a/gfx/pics/unown_h/back.2bpp.lz b/gfx/pics/unown_h/back.2bpp.lz.78421e5b
index 926bf5757..926bf5757 100644
--- a/gfx/pics/unown_h/back.2bpp.lz
+++ b/gfx/pics/unown_h/back.2bpp.lz.78421e5b
diff --git a/gfx/pics/unown_h/back.png b/gfx/pics/unown_h/back.png
new file mode 100644
index 000000000..abf0b39e5
--- /dev/null
+++ b/gfx/pics/unown_h/back.png
diff --git a/gfx/pics/unown_h/bitmask.asm b/gfx/pics/unown_h/bitmask.asm
deleted file mode 100644
index 6559dc960..000000000
--- a/gfx/pics/unown_h/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %00000000
-	db %00110000
-	db %00000000
-	db %00000000
-; 1
-	db %10000000
-	db %00110001
-	db %00000110
-	db %00000000
-; 0xd3b6b
diff --git a/gfx/pics/unown_h/frames.asm b/gfx/pics/unown_h/frames.asm
deleted file mode 100644
index 405dd7733..000000000
--- a/gfx/pics/unown_h/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $19, $1a
-.frame2
-	db $00 ; bitmask
-	db $1b, $1c
-.frame3
-	db $00 ; bitmask
-	db $1d, $1e
-.frame4
-	db $00 ; bitmask
-	db $1f, $20
-.frame5
-	db $01 ; bitmask
-	db $21, $22, $23, $24, $25, $26
-; 0xd9aa9
diff --git a/gfx/pics/unown_h/front.2bpp.lz b/gfx/pics/unown_h/front.animated.2bpp.lz.9a6afeb9
index be2d0293c..be2d0293c 100644
--- a/gfx/pics/unown_h/front.2bpp.lz
+++ b/gfx/pics/unown_h/front.animated.2bpp.lz.9a6afeb9
diff --git a/gfx/pics/unown_h/front.png b/gfx/pics/unown_h/front.png
new file mode 100644
index 000000000..3c644c7da
--- /dev/null
+++ b/gfx/pics/unown_h/front.png
diff --git a/gfx/pics/unown_i/back.2bpp.lz b/gfx/pics/unown_i/back.2bpp.lz.7feb4b30
index 7dcea181f..7dcea181f 100644
--- a/gfx/pics/unown_i/back.2bpp.lz
+++ b/gfx/pics/unown_i/back.2bpp.lz.7feb4b30
diff --git a/gfx/pics/unown_i/back.png b/gfx/pics/unown_i/back.png
new file mode 100644
index 000000000..0d861d9f8
--- /dev/null
+++ b/gfx/pics/unown_i/back.png
diff --git a/gfx/pics/unown_i/bitmask.asm b/gfx/pics/unown_i/bitmask.asm
deleted file mode 100644
index f9537943b..000000000
--- a/gfx/pics/unown_i/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00000000
-	db %00001000
-	db %00000001
-	db %00000000
-; 1
-	db %01000000
-	db %00001000
-	db %00000000
-	db %00000000
-; 2
-	db %10000000
-	db %00110001
-	db %00000110
-	db %00000000
-; 0xd3b77
diff --git a/gfx/pics/unown_i/frames.asm b/gfx/pics/unown_i/frames.asm
deleted file mode 100644
index 6df0064a0..000000000
--- a/gfx/pics/unown_i/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a
-.frame2
-	db $01 ; bitmask
-	db $1b, $1c
-.frame3
-	db $02 ; bitmask
-	db $1d, $1e, $1f, $20, $21, $22
-; 0xd9abc
diff --git a/gfx/pics/unown_i/front.2bpp.lz b/gfx/pics/unown_i/front.animated.2bpp.lz.f5e7f816
index dfd89c266..dfd89c266 100644
--- a/gfx/pics/unown_i/front.2bpp.lz
+++ b/gfx/pics/unown_i/front.animated.2bpp.lz.f5e7f816
diff --git a/gfx/pics/unown_i/front.png b/gfx/pics/unown_i/front.png
new file mode 100644
index 000000000..971439d5a
--- /dev/null
+++ b/gfx/pics/unown_i/front.png
diff --git a/gfx/pics/unown_j/back.2bpp.lz b/gfx/pics/unown_j/back.2bpp.lz.b0f3bec2
index c0eabf3ba..c0eabf3ba 100644
--- a/gfx/pics/unown_j/back.2bpp.lz
+++ b/gfx/pics/unown_j/back.2bpp.lz.b0f3bec2
diff --git a/gfx/pics/unown_j/back.png b/gfx/pics/unown_j/back.png
new file mode 100644
index 000000000..93df2154c
--- /dev/null
+++ b/gfx/pics/unown_j/back.png
diff --git a/gfx/pics/unown_j/bitmask.asm b/gfx/pics/unown_j/bitmask.asm
deleted file mode 100644
index bc3d59792..000000000
--- a/gfx/pics/unown_j/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00000000
-	db %01100011
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %01100010
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %00110000
-	db %00000110
-	db %00000000
-; 0xd3b83
diff --git a/gfx/pics/unown_j/frames.asm b/gfx/pics/unown_j/frames.asm
deleted file mode 100644
index 6f196f838..000000000
--- a/gfx/pics/unown_j/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c
-.frame2
-	db $01 ; bitmask
-	db $1d, $1e, $1f
-.frame3
-	db $02 ; bitmask
-	db $20, $21, $22, $23
-; 0xd9ad0
diff --git a/gfx/pics/unown_j/front.2bpp.lz b/gfx/pics/unown_j/front.animated.2bpp.lz.d8bf9223
index ec8e536d3..ec8e536d3 100644
--- a/gfx/pics/unown_j/front.2bpp.lz
+++ b/gfx/pics/unown_j/front.animated.2bpp.lz.d8bf9223
diff --git a/gfx/pics/unown_j/front.png b/gfx/pics/unown_j/front.png
new file mode 100644
index 000000000..03316dc6e
--- /dev/null
+++ b/gfx/pics/unown_j/front.png
diff --git a/gfx/pics/unown_k/back.2bpp.lz b/gfx/pics/unown_k/back.2bpp.lz.745fda48
index 0f4e8fda7..0f4e8fda7 100644
--- a/gfx/pics/unown_k/back.2bpp.lz
+++ b/gfx/pics/unown_k/back.2bpp.lz.745fda48
diff --git a/gfx/pics/unown_k/back.png b/gfx/pics/unown_k/back.png
new file mode 100644
index 000000000..1fbb8b041
--- /dev/null
+++ b/gfx/pics/unown_k/back.png
diff --git a/gfx/pics/unown_k/bitmask.asm b/gfx/pics/unown_k/bitmask.asm
deleted file mode 100644
index 4970cdf72..000000000
--- a/gfx/pics/unown_k/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %11001110
-	db %00000000
-; 1
-	db %10000000
-	db %00110001
-	db %00000000
-	db %00000000
-; 0xd3b8b
diff --git a/gfx/pics/unown_k/frames.asm b/gfx/pics/unown_k/frames.asm
deleted file mode 100644
index b322962db..000000000
--- a/gfx/pics/unown_k/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d
-.frame2
-	db $00 ; bitmask
-	db $1e, $1f, $00, $20, $21
-.frame3
-	db $01 ; bitmask
-	db $22, $23, $24, $25
-; 0xd9ae7
diff --git a/gfx/pics/unown_k/front.2bpp.lz b/gfx/pics/unown_k/front.animated.2bpp.lz.fb25b385
index b617e898c..b617e898c 100644
--- a/gfx/pics/unown_k/front.2bpp.lz
+++ b/gfx/pics/unown_k/front.animated.2bpp.lz.fb25b385
diff --git a/gfx/pics/unown_k/front.png b/gfx/pics/unown_k/front.png
new file mode 100644
index 000000000..ce6b81e9f
--- /dev/null
+++ b/gfx/pics/unown_k/front.png
diff --git a/gfx/pics/unown_l/back.2bpp.lz b/gfx/pics/unown_l/back.2bpp.lz.e38e0d57
index 4f48955df..4f48955df 100644
--- a/gfx/pics/unown_l/back.2bpp.lz
+++ b/gfx/pics/unown_l/back.2bpp.lz.e38e0d57
diff --git a/gfx/pics/unown_l/back.png b/gfx/pics/unown_l/back.png
new file mode 100644
index 000000000..470d46c05
--- /dev/null
+++ b/gfx/pics/unown_l/back.png
diff --git a/gfx/pics/unown_l/bitmask.asm b/gfx/pics/unown_l/bitmask.asm
deleted file mode 100644
index 769936bb8..000000000
--- a/gfx/pics/unown_l/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00000000
-	db %01000000
-	db %00001000
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %00001000
-	db %00000000
-; 2
-	db %10000000
-	db %00110000
-	db %00000010
-	db %00000000
-; 0xd3b97
diff --git a/gfx/pics/unown_l/frames.asm b/gfx/pics/unown_l/frames.asm
deleted file mode 100644
index 8f8edb031..000000000
--- a/gfx/pics/unown_l/frames.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $19, $1a
-.frame2
-	db $00 ; bitmask
-	db $1b, $1c
-.frame3
-	db $00 ; bitmask
-	db $1d, $1e
-.frame4
-	db $01 ; bitmask
-	db $1f
-.frame5
-	db $02 ; bitmask
-	db $20, $21, $22, $23
-; 0xd9b01
diff --git a/gfx/pics/unown_l/front.2bpp.lz b/gfx/pics/unown_l/front.animated.2bpp.lz.26195a59
index d0eee7516..d0eee7516 100644
--- a/gfx/pics/unown_l/front.2bpp.lz
+++ b/gfx/pics/unown_l/front.animated.2bpp.lz.26195a59
diff --git a/gfx/pics/unown_l/front.png b/gfx/pics/unown_l/front.png
new file mode 100644
index 000000000..ff86501db
--- /dev/null
+++ b/gfx/pics/unown_l/front.png
diff --git a/gfx/pics/unown_m/back.2bpp.lz b/gfx/pics/unown_m/back.2bpp.lz.38d93bc8
index 3ab40cb03..3ab40cb03 100644
--- a/gfx/pics/unown_m/back.2bpp.lz
+++ b/gfx/pics/unown_m/back.2bpp.lz.38d93bc8
diff --git a/gfx/pics/unown_m/back.png b/gfx/pics/unown_m/back.png
new file mode 100644
index 000000000..a7f90e72b
--- /dev/null
+++ b/gfx/pics/unown_m/back.png
diff --git a/gfx/pics/unown_m/bitmask.asm b/gfx/pics/unown_m/bitmask.asm
deleted file mode 100644
index 5638e6bd8..000000000
--- a/gfx/pics/unown_m/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %00000000
-	db %01110000
-	db %00001110
-	db %00000000
-; 1
-	db %00000000
-	db %01100000
-	db %00001100
-	db %00000000
-; 0xd3b9f
diff --git a/gfx/pics/unown_m/frames.asm b/gfx/pics/unown_m/frames.asm
deleted file mode 100644
index 341e6840b..000000000
--- a/gfx/pics/unown_m/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e
-.frame2
-	db $00 ; bitmask
-	db $1f, $20, $21, $22, $23, $24
-.frame3
-	db $01 ; bitmask
-	db $25, $26, $27, $28
-; 0xd9b1a
diff --git a/gfx/pics/unown_m/front.2bpp.lz b/gfx/pics/unown_m/front.animated.2bpp.lz.2659315e
index 04e1592ce..04e1592ce 100644
--- a/gfx/pics/unown_m/front.2bpp.lz
+++ b/gfx/pics/unown_m/front.animated.2bpp.lz.2659315e
diff --git a/gfx/pics/unown_m/front.png b/gfx/pics/unown_m/front.png
new file mode 100644
index 000000000..b55a03682
--- /dev/null
+++ b/gfx/pics/unown_m/front.png
diff --git a/gfx/pics/unown_n/back.2bpp.lz b/gfx/pics/unown_n/back.2bpp.lz.c8b7d3a4
index c39417aa8..c39417aa8 100644
--- a/gfx/pics/unown_n/back.2bpp.lz
+++ b/gfx/pics/unown_n/back.2bpp.lz.c8b7d3a4
diff --git a/gfx/pics/unown_n/back.png b/gfx/pics/unown_n/back.png
new file mode 100644
index 000000000..801959468
--- /dev/null
+++ b/gfx/pics/unown_n/back.png
diff --git a/gfx/pics/unown_n/bitmask.asm b/gfx/pics/unown_n/bitmask.asm
deleted file mode 100644
index f2dc23c34..000000000
--- a/gfx/pics/unown_n/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %00000000
-	db %00000011
-	db %11000000
-	db %00000000
-; 1
-	db %00000000
-	db %01110011
-	db %11001110
-	db %00000000
-; 2
-	db %00000000
-	db %01110000
-	db %00001110
-	db %00000000
-; 0xd3bab
diff --git a/gfx/pics/unown_n/frames.asm b/gfx/pics/unown_n/frames.asm
deleted file mode 100644
index b656f81c0..000000000
--- a/gfx/pics/unown_n/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c
-.frame2
-	db $01 ; bitmask
-	db $1d, $1e, $1f, $20, $21, $22, $23, $24, $25, $26
-.frame3
-	db $02 ; bitmask
-	db $1f, $20, $21, $22, $23, $24
-; 0xd9b37
diff --git a/gfx/pics/unown_n/front.2bpp.lz b/gfx/pics/unown_n/front.animated.2bpp.lz.96ce7c62
index ec17bff9f..ec17bff9f 100644
--- a/gfx/pics/unown_n/front.2bpp.lz
+++ b/gfx/pics/unown_n/front.animated.2bpp.lz.96ce7c62
diff --git a/gfx/pics/unown_n/front.png b/gfx/pics/unown_n/front.png
new file mode 100644
index 000000000..2ba3f9a17
--- /dev/null
+++ b/gfx/pics/unown_n/front.png
diff --git a/gfx/pics/unown_o/back.2bpp.lz b/gfx/pics/unown_o/back.2bpp.lz.89ba693c
index 4d4b4fd4f..4d4b4fd4f 100644
--- a/gfx/pics/unown_o/back.2bpp.lz
+++ b/gfx/pics/unown_o/back.2bpp.lz.89ba693c
diff --git a/gfx/pics/unown_o/back.png b/gfx/pics/unown_o/back.png
new file mode 100644
index 000000000..68c4e2743
--- /dev/null
+++ b/gfx/pics/unown_o/back.png
diff --git a/gfx/pics/unown_o/bitmask.asm b/gfx/pics/unown_o/bitmask.asm
deleted file mode 100644
index 5a36a12a1..000000000
--- a/gfx/pics/unown_o/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %00000000
-	db %00110000
-	db %00000110
-	db %00000000
-; 1
-	db %00000000
-	db %01110000
-	db %00000110
-	db %00000000
-; 0xd3bb3
diff --git a/gfx/pics/unown_o/frames.asm b/gfx/pics/unown_o/frames.asm
deleted file mode 100644
index 1258d1a06..000000000
--- a/gfx/pics/unown_o/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c
-.frame2
-	db $01 ; bitmask
-	db $1d, $1e, $1f, $20, $21
-.frame3
-	db $00 ; bitmask
-	db $22, $23, $24, $25
-; 0xd9b4d
diff --git a/gfx/pics/unown_o/front.2bpp.lz b/gfx/pics/unown_o/front.animated.2bpp.lz.a9151b66
index 66b6b8141..66b6b8141 100644
--- a/gfx/pics/unown_o/front.2bpp.lz
+++ b/gfx/pics/unown_o/front.animated.2bpp.lz.a9151b66
diff --git a/gfx/pics/unown_o/front.png b/gfx/pics/unown_o/front.png
new file mode 100644
index 000000000..7fd75de36
--- /dev/null
+++ b/gfx/pics/unown_o/front.png
diff --git a/gfx/pics/unown_p/back.2bpp.lz b/gfx/pics/unown_p/back.2bpp.lz.09c618c4
index 19fd45591..19fd45591 100644
--- a/gfx/pics/unown_p/back.2bpp.lz
+++ b/gfx/pics/unown_p/back.2bpp.lz.09c618c4
diff --git a/gfx/pics/unown_p/back.png b/gfx/pics/unown_p/back.png
new file mode 100644
index 000000000..5098b51ce
--- /dev/null
+++ b/gfx/pics/unown_p/back.png
diff --git a/gfx/pics/unown_p/bitmask.asm b/gfx/pics/unown_p/bitmask.asm
deleted file mode 100644
index e4606936b..000000000
--- a/gfx/pics/unown_p/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %10000000
-	db %00010000
-	db %00000010
-	db %00000000
-; 1
-	db %11000000
-	db %00110000
-	db %00000010
-	db %00000000
-; 2
-	db %10000000
-	db %00110000
-	db %00000010
-	db %00000000
-; 0xd3bbf
diff --git a/gfx/pics/unown_p/frames.asm b/gfx/pics/unown_p/frames.asm
deleted file mode 100644
index c9e27bfbd..000000000
--- a/gfx/pics/unown_p/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b
-.frame2
-	db $01 ; bitmask
-	db $1c, $1d, $1e, $1f, $1b
-.frame3
-	db $02 ; bitmask
-	db $20, $21, $22, $23
-; 0xd9b62
diff --git a/gfx/pics/unown_p/front.2bpp.lz b/gfx/pics/unown_p/front.animated.2bpp.lz.83a096fc
index 53d4bfbcd..53d4bfbcd 100644
--- a/gfx/pics/unown_p/front.2bpp.lz
+++ b/gfx/pics/unown_p/front.animated.2bpp.lz.83a096fc
diff --git a/gfx/pics/unown_p/front.png b/gfx/pics/unown_p/front.png
new file mode 100644
index 000000000..eca40f041
--- /dev/null
+++ b/gfx/pics/unown_p/front.png
diff --git a/gfx/pics/unown_q/back.2bpp.lz b/gfx/pics/unown_q/back.2bpp.lz.e32430b4
index 5199cdc6c..5199cdc6c 100644
--- a/gfx/pics/unown_q/back.2bpp.lz
+++ b/gfx/pics/unown_q/back.2bpp.lz.e32430b4
diff --git a/gfx/pics/unown_q/back.png b/gfx/pics/unown_q/back.png
new file mode 100644
index 000000000..9b2b34c51
--- /dev/null
+++ b/gfx/pics/unown_q/back.png
diff --git a/gfx/pics/unown_q/bitmask.asm b/gfx/pics/unown_q/bitmask.asm
deleted file mode 100644
index a8f4d5c61..000000000
--- a/gfx/pics/unown_q/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %00000000
-	db %00000000
-	db %10001100
-	db %00000001
-; 1
-	db %10000000
-	db %00110001
-	db %00000110
-	db %00000000
-; 0xd3bc7
diff --git a/gfx/pics/unown_q/frames.asm b/gfx/pics/unown_q/frames.asm
deleted file mode 100644
index 065ef139e..000000000
--- a/gfx/pics/unown_q/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c
-.frame2
-	db $00 ; bitmask
-	db $1d, $1e, $1f, $00
-.frame3
-	db $01 ; bitmask
-	db $20, $21, $22, $23, $24, $25
-; 0xd9b79
diff --git a/gfx/pics/unown_q/front.2bpp.lz b/gfx/pics/unown_q/front.animated.2bpp.lz.44dad60c
index 65536e23f..65536e23f 100644
--- a/gfx/pics/unown_q/front.2bpp.lz
+++ b/gfx/pics/unown_q/front.animated.2bpp.lz.44dad60c
diff --git a/gfx/pics/unown_q/front.png b/gfx/pics/unown_q/front.png
new file mode 100644
index 000000000..98f19fdc1
--- /dev/null
+++ b/gfx/pics/unown_q/front.png
diff --git a/gfx/pics/unown_r/back.2bpp.lz b/gfx/pics/unown_r/back.2bpp.lz.5df8287c
index a8a243e0b..a8a243e0b 100644
--- a/gfx/pics/unown_r/back.2bpp.lz
+++ b/gfx/pics/unown_r/back.2bpp.lz.5df8287c
diff --git a/gfx/pics/unown_r/back.png b/gfx/pics/unown_r/back.png
new file mode 100644
index 000000000..a3d7de37e
--- /dev/null
+++ b/gfx/pics/unown_r/back.png
diff --git a/gfx/pics/unown_r/bitmask.asm b/gfx/pics/unown_r/bitmask.asm
deleted file mode 100644
index 2a1130ae3..000000000
--- a/gfx/pics/unown_r/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %00000000
-	db %00000010
-	db %00001100
-	db %00000000
-; 1
-	db %10000000
-	db %00110000
-	db %00000010
-	db %00000000
-; 0xd3bcf
diff --git a/gfx/pics/unown_r/frames.asm b/gfx/pics/unown_r/frames.asm
deleted file mode 100644
index 99113f145..000000000
--- a/gfx/pics/unown_r/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b
-.frame2
-	db $00 ; bitmask
-	db $1c, $1a, $1d
-.frame3
-	db $01 ; bitmask
-	db $1e, $1f, $20, $21
-; 0xd9b8c
diff --git a/gfx/pics/unown_r/front.2bpp.lz b/gfx/pics/unown_r/front.animated.2bpp.lz.8e67e3fc
index 9e76761d1..9e76761d1 100644
--- a/gfx/pics/unown_r/front.2bpp.lz
+++ b/gfx/pics/unown_r/front.animated.2bpp.lz.8e67e3fc
diff --git a/gfx/pics/unown_r/front.png b/gfx/pics/unown_r/front.png
new file mode 100644
index 000000000..a7038ec16
--- /dev/null
+++ b/gfx/pics/unown_r/front.png
diff --git a/gfx/pics/unown_s/back.2bpp.lz b/gfx/pics/unown_s/back.2bpp.lz.abd4ad58
index 8441f2519..8441f2519 100644
--- a/gfx/pics/unown_s/back.2bpp.lz
+++ b/gfx/pics/unown_s/back.2bpp.lz.abd4ad58
diff --git a/gfx/pics/unown_s/back.png b/gfx/pics/unown_s/back.png
new file mode 100644
index 000000000..75de76a29
--- /dev/null
+++ b/gfx/pics/unown_s/back.png
diff --git a/gfx/pics/unown_s/bitmask.asm b/gfx/pics/unown_s/bitmask.asm
deleted file mode 100644
index 0d4a9a75b..000000000
--- a/gfx/pics/unown_s/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %01000000
-	db %00001100
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %01100000
-	db %00001100
-	db %00000000
-; 2
-	db %00000000
-	db %00110000
-	db %00000110
-	db %00000000
-; 0xd3bdb
diff --git a/gfx/pics/unown_s/frames.asm b/gfx/pics/unown_s/frames.asm
deleted file mode 100644
index 0331a18ea..000000000
--- a/gfx/pics/unown_s/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b
-.frame2
-	db $01 ; bitmask
-	db $1c, $1d, $1e, $1f
-.frame3
-	db $02 ; bitmask
-	db $20, $21, $22, $23
-; 0xd9ba0
diff --git a/gfx/pics/unown_s/front.2bpp.lz b/gfx/pics/unown_s/front.animated.2bpp.lz.f3db4e89
index d16dea5e9..d16dea5e9 100644
--- a/gfx/pics/unown_s/front.2bpp.lz
+++ b/gfx/pics/unown_s/front.animated.2bpp.lz.f3db4e89
diff --git a/gfx/pics/unown_s/front.png b/gfx/pics/unown_s/front.png
new file mode 100644
index 000000000..b854e648b
--- /dev/null
+++ b/gfx/pics/unown_s/front.png
diff --git a/gfx/pics/unown_t/back.2bpp.lz b/gfx/pics/unown_t/back.2bpp.lz.87d48ca0
index 8d415b53d..8d415b53d 100644
--- a/gfx/pics/unown_t/back.2bpp.lz
+++ b/gfx/pics/unown_t/back.2bpp.lz.87d48ca0
diff --git a/gfx/pics/unown_t/back.png b/gfx/pics/unown_t/back.png
new file mode 100644
index 000000000..edbe2a1de
--- /dev/null
+++ b/gfx/pics/unown_t/back.png
diff --git a/gfx/pics/unown_t/bitmask.asm b/gfx/pics/unown_t/bitmask.asm
deleted file mode 100644
index d889d2035..000000000
--- a/gfx/pics/unown_t/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %11000000
-	db %00111000
-	db %00000101
-	db %00000000
-; 1
-	db %01000000
-	db %00101000
-	db %00000011
-	db %00000000
-; 2
-	db %00000000
-	db %01100000
-	db %00001100
-	db %00000000
-; 0xd3be7
diff --git a/gfx/pics/unown_t/frames.asm b/gfx/pics/unown_t/frames.asm
deleted file mode 100644
index a2e406f8c..000000000
--- a/gfx/pics/unown_t/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f
-.frame2
-	db $01 ; bitmask
-	db $20, $21, $22, $23, $24
-.frame3
-	db $02 ; bitmask
-	db $25, $26, $27, $28
-; 0xd9bb9
diff --git a/gfx/pics/unown_t/front.2bpp.lz b/gfx/pics/unown_t/front.animated.2bpp.lz.8bdc40ae
index 83100fbdb..83100fbdb 100644
--- a/gfx/pics/unown_t/front.2bpp.lz
+++ b/gfx/pics/unown_t/front.animated.2bpp.lz.8bdc40ae
diff --git a/gfx/pics/unown_t/front.png b/gfx/pics/unown_t/front.png
new file mode 100644
index 000000000..807b4af12
--- /dev/null
+++ b/gfx/pics/unown_t/front.png
diff --git a/gfx/pics/unown_u/back.2bpp.lz b/gfx/pics/unown_u/back.2bpp.lz.40b63dfb
index ad395b7ec..ad395b7ec 100644
--- a/gfx/pics/unown_u/back.2bpp.lz
+++ b/gfx/pics/unown_u/back.2bpp.lz.40b63dfb
diff --git a/gfx/pics/unown_u/back.png b/gfx/pics/unown_u/back.png
new file mode 100644
index 000000000..4efb1dd2a
--- /dev/null
+++ b/gfx/pics/unown_u/back.png
diff --git a/gfx/pics/unown_u/bitmask.asm b/gfx/pics/unown_u/bitmask.asm
deleted file mode 100644
index 82874fdca..000000000
--- a/gfx/pics/unown_u/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %00000000
-	db %01111000
-	db %00001111
-	db %00000000
-; 1
-	db %00000000
-	db %00110000
-	db %00000110
-	db %00000000
-; 0xd3bef
diff --git a/gfx/pics/unown_u/frames.asm b/gfx/pics/unown_u/frames.asm
deleted file mode 100644
index 5653b37c1..000000000
--- a/gfx/pics/unown_u/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $00, $19, $1a, $1b, $00, $1c, $1d, $1e
-.frame2
-	db $00 ; bitmask
-	db $00, $1f, $20, $21, $00, $22, $23, $24
-.frame3
-	db $01 ; bitmask
-	db $25, $26, $27, $28
-; 0xd9bd6
diff --git a/gfx/pics/unown_u/front.2bpp.lz b/gfx/pics/unown_u/front.animated.2bpp.lz.2690db54
index 622825cbe..622825cbe 100644
--- a/gfx/pics/unown_u/front.2bpp.lz
+++ b/gfx/pics/unown_u/front.animated.2bpp.lz.2690db54
diff --git a/gfx/pics/unown_u/front.png b/gfx/pics/unown_u/front.png
new file mode 100644
index 000000000..2d7950f18
--- /dev/null
+++ b/gfx/pics/unown_u/front.png
diff --git a/gfx/pics/unown_v/back.2bpp.lz b/gfx/pics/unown_v/back.2bpp.lz.5b1a6acc
index 21c3191f2..21c3191f2 100644
--- a/gfx/pics/unown_v/back.2bpp.lz
+++ b/gfx/pics/unown_v/back.2bpp.lz.5b1a6acc
diff --git a/gfx/pics/unown_v/back.png b/gfx/pics/unown_v/back.png
new file mode 100644
index 000000000..0097a050f
--- /dev/null
+++ b/gfx/pics/unown_v/back.png
diff --git a/gfx/pics/unown_v/bitmask.asm b/gfx/pics/unown_v/bitmask.asm
deleted file mode 100644
index 4cae8c07c..000000000
--- a/gfx/pics/unown_v/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %01000000
-	db %00001000
-	db %00100001
-	db %00000000
-; 1
-	db %01000000
-	db %00011000
-	db %00100001
-	db %00000000
-; 2
-	db %00000000
-	db %01100000
-	db %00001100
-	db %00000000
-; 0xd3bfb
diff --git a/gfx/pics/unown_v/frames.asm b/gfx/pics/unown_v/frames.asm
deleted file mode 100644
index 06e06247f..000000000
--- a/gfx/pics/unown_v/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c
-.frame2
-	db $01 ; bitmask
-	db $1d, $1e, $1f, $20, $00
-.frame3
-	db $02 ; bitmask
-	db $21, $22, $23, $24
-; 0xd9bec
diff --git a/gfx/pics/unown_v/front.2bpp.lz b/gfx/pics/unown_v/front.animated.2bpp.lz.d196c60e
index aee5ce362..aee5ce362 100644
--- a/gfx/pics/unown_v/front.2bpp.lz
+++ b/gfx/pics/unown_v/front.animated.2bpp.lz.d196c60e
diff --git a/gfx/pics/unown_v/front.png b/gfx/pics/unown_v/front.png
new file mode 100644
index 000000000..a687e5d7c
--- /dev/null
+++ b/gfx/pics/unown_v/front.png
diff --git a/gfx/pics/unown_w/back.2bpp.lz b/gfx/pics/unown_w/back.2bpp.lz.a55282bf
index 882648c4d..882648c4d 100644
--- a/gfx/pics/unown_w/back.2bpp.lz
+++ b/gfx/pics/unown_w/back.2bpp.lz.a55282bf
diff --git a/gfx/pics/unown_w/back.png b/gfx/pics/unown_w/back.png
new file mode 100644
index 000000000..629d7ccb2
--- /dev/null
+++ b/gfx/pics/unown_w/back.png
diff --git a/gfx/pics/unown_w/bitmask.asm b/gfx/pics/unown_w/bitmask.asm
deleted file mode 100644
index fdb9854eb..000000000
--- a/gfx/pics/unown_w/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %10000000
-	db %00110001
-	db %11000110
-	db %00000000
-; 1
-	db %10000100
-	db %00000001
-	db %11000000
-	db %00000000
-; 2
-	db %00000000
-	db %01100000
-	db %00001100
-	db %00000000
-; 0xd3c07
diff --git a/gfx/pics/unown_w/frames.asm b/gfx/pics/unown_w/frames.asm
deleted file mode 100644
index f19bd1620..000000000
--- a/gfx/pics/unown_w/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20
-.frame2
-	db $01 ; bitmask
-	db $21, $22, $23, $24, $25
-.frame3
-	db $02 ; bitmask
-	db $26, $27, $28, $29
-; 0xd9c06
diff --git a/gfx/pics/unown_w/front.2bpp.lz b/gfx/pics/unown_w/front.animated.2bpp.lz.5b45fa3d
index 78a7fefac..78a7fefac 100644
--- a/gfx/pics/unown_w/front.2bpp.lz
+++ b/gfx/pics/unown_w/front.animated.2bpp.lz.5b45fa3d
diff --git a/gfx/pics/unown_w/front.png b/gfx/pics/unown_w/front.png
new file mode 100644
index 000000000..b65b96735
--- /dev/null
+++ b/gfx/pics/unown_w/front.png
diff --git a/gfx/pics/unown_x/back.2bpp.lz b/gfx/pics/unown_x/back.2bpp.lz.0001a198
index 591af9668..591af9668 100644
--- a/gfx/pics/unown_x/back.2bpp.lz
+++ b/gfx/pics/unown_x/back.2bpp.lz.0001a198
diff --git a/gfx/pics/unown_x/back.png b/gfx/pics/unown_x/back.png
new file mode 100644
index 000000000..f2213d93f
--- /dev/null
+++ b/gfx/pics/unown_x/back.png
diff --git a/gfx/pics/unown_x/bitmask.asm b/gfx/pics/unown_x/bitmask.asm
deleted file mode 100644
index 501e3c22c..000000000
--- a/gfx/pics/unown_x/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %01000000
-	db %00000010
-	db %00100000
-	db %00000001
-; 1
-	db %11000000
-	db %01111011
-	db %11101011
-	db %00000001
-; 2
-	db %00000000
-	db %00110000
-	db %00000110
-	db %00000000
-; 0xd3c13
diff --git a/gfx/pics/unown_x/frames.asm b/gfx/pics/unown_x/frames.asm
deleted file mode 100644
index a6b94c147..000000000
--- a/gfx/pics/unown_x/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c
-.frame2
-	db $01 ; bitmask
-	db $00, $1d, $1e, $00, $1f, $20, $21, $22, $23, $24, $25, $00
-	db $26, $27, $00
-.frame3
-	db $02 ; bitmask
-	db $28, $29, $2a, $2b
-; 0xd9c26
diff --git a/gfx/pics/unown_x/front.2bpp.lz b/gfx/pics/unown_x/front.animated.2bpp.lz.3362c680
index 11adc7c6f..11adc7c6f 100644
--- a/gfx/pics/unown_x/front.2bpp.lz
+++ b/gfx/pics/unown_x/front.animated.2bpp.lz.3362c680
diff --git a/gfx/pics/unown_x/front.png b/gfx/pics/unown_x/front.png
new file mode 100644
index 000000000..d0cef6024
--- /dev/null
+++ b/gfx/pics/unown_x/front.png
diff --git a/gfx/pics/unown_y/back.2bpp.lz b/gfx/pics/unown_y/back.2bpp.lz.292d9ff2
index ab7563e0d..ab7563e0d 100644
--- a/gfx/pics/unown_y/back.2bpp.lz
+++ b/gfx/pics/unown_y/back.2bpp.lz.292d9ff2
diff --git a/gfx/pics/unown_y/back.png b/gfx/pics/unown_y/back.png
new file mode 100644
index 000000000..141f16157
--- /dev/null
+++ b/gfx/pics/unown_y/back.png
diff --git a/gfx/pics/unown_y/bitmask.asm b/gfx/pics/unown_y/bitmask.asm
deleted file mode 100644
index 01f68f558..000000000
--- a/gfx/pics/unown_y/bitmask.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-; 0
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00000000
-	db %00000001
-	db %00000000
-; 2
-	db %11000000
-	db %00111001
-	db %00000111
-	db %00000000
-; 3
-	db %10000000
-	db %00111000
-	db %00000010
-	db %00000000
-; 0xd3c23
diff --git a/gfx/pics/unown_y/frames.asm b/gfx/pics/unown_y/frames.asm
deleted file mode 100644
index a6608e4fe..000000000
--- a/gfx/pics/unown_y/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19
-.frame2
-	db $01 ; bitmask
-	db $1a
-.frame3
-	db $02 ; bitmask
-	db $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $23
-.frame4
-	db $03 ; bitmask
-	db $24, $25, $26, $27, $28
-; 0xd9c42
diff --git a/gfx/pics/unown_y/front.2bpp.lz b/gfx/pics/unown_y/front.animated.2bpp.lz.8cd89db4
index 1604f7e7b..1604f7e7b 100644
--- a/gfx/pics/unown_y/front.2bpp.lz
+++ b/gfx/pics/unown_y/front.animated.2bpp.lz.8cd89db4
diff --git a/gfx/pics/unown_y/front.png b/gfx/pics/unown_y/front.png
new file mode 100644
index 000000000..1b2fbdfcd
--- /dev/null
+++ b/gfx/pics/unown_y/front.png
diff --git a/gfx/pics/unown_z/back.2bpp.lz b/gfx/pics/unown_z/back.2bpp.lz.a41240a1
index 31bcb7baa..31bcb7baa 100644
--- a/gfx/pics/unown_z/back.2bpp.lz
+++ b/gfx/pics/unown_z/back.2bpp.lz.a41240a1
diff --git a/gfx/pics/unown_z/back.png b/gfx/pics/unown_z/back.png
new file mode 100644
index 000000000..987d4d9df
--- /dev/null
+++ b/gfx/pics/unown_z/back.png
diff --git a/gfx/pics/unown_z/bitmask.asm b/gfx/pics/unown_z/bitmask.asm
deleted file mode 100644
index 46231fc95..000000000
--- a/gfx/pics/unown_z/bitmask.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-; 0
-	db %01100000
-	db %01001100
-	db %00001000
-	db %00000000
-; 1
-	db %01100000
-	db %01101100
-	db %10001100
-	db %00000001
-; 2
-	db %01100000
-	db %00001000
-	db %00001000
-	db %00000000
-; 3
-	db %00000000
-	db %00110000
-	db %00000110
-	db %00000000
-; 0xd3c33
diff --git a/gfx/pics/unown_z/frames.asm b/gfx/pics/unown_z/frames.asm
deleted file mode 100644
index 215e4ca8b..000000000
--- a/gfx/pics/unown_z/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $00, $19, $00, $1a, $1b, $1c
-.frame2
-	db $01 ; bitmask
-	db $00, $1d, $00, $1e, $1f, $20, $21, $22, $23, $24
-.frame3
-	db $02 ; bitmask
-	db $00, $25, $26, $27
-.frame4
-	db $03 ; bitmask
-	db $28, $29, $2a, $2b
-; 0xd9c66
diff --git a/gfx/pics/unown_z/front.2bpp.lz b/gfx/pics/unown_z/front.animated.2bpp.lz.2d4170a0
index 0d9b8b4f8..0d9b8b4f8 100644
--- a/gfx/pics/unown_z/front.2bpp.lz
+++ b/gfx/pics/unown_z/front.animated.2bpp.lz.2d4170a0
diff --git a/gfx/pics/unown_z/front.png b/gfx/pics/unown_z/front.png
new file mode 100644
index 000000000..60fc433bc
--- /dev/null
+++ b/gfx/pics/unown_z/front.png
diff --git a/gfx/pics/ursaring/back.2bpp.lz b/gfx/pics/ursaring/back.2bpp.lz.0966cee1
index 263eac805..263eac805 100644
--- a/gfx/pics/ursaring/back.2bpp.lz
+++ b/gfx/pics/ursaring/back.2bpp.lz.0966cee1
diff --git a/gfx/pics/ursaring/back.png b/gfx/pics/ursaring/back.png
new file mode 100644
index 000000000..266218522
--- /dev/null
+++ b/gfx/pics/ursaring/back.png
diff --git a/gfx/pics/ursaring/bitmask.asm b/gfx/pics/ursaring/bitmask.asm
deleted file mode 100644
index 397b66f94..000000000
--- a/gfx/pics/ursaring/bitmask.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-; 0
-	db %00000000
-	db %11000000
-	db %11100001
-	db %00110000
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %10000000
-	db %11000001
-	db %11100000
-	db %10110000
-	db %11100001
-	db %01110000
-	db %00000000
-; 2
-	db %00000000
-	db %11000000
-	db %11100000
-	db %00110000
-	db %00000000
-	db %00000000
-	db %00000000
-; 3
-	db %10000000
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd37cf
diff --git a/gfx/pics/ursaring/frames.asm b/gfx/pics/ursaring/frames.asm
deleted file mode 100644
index 537e485ed..000000000
--- a/gfx/pics/ursaring/frames.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38
-.frame2
-	db $01 ; bitmask
-	db $39, $3a, $3b, $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44
-	db $45, $46, $47, $48, $49
-.frame3
-	db $01 ; bitmask
-	db $39, $3a, $3b, $3c, $3d, $3e, $3f, $40, $41, $4a, $4b, $44
-	db $45, $46, $47, $48, $49
-.frame4
-	db $02 ; bitmask
-	db $3b, $3c, $3d, $3e, $3f, $40, $41
-.frame5
-	db $03 ; bitmask
-	db $39, $3a
-; 0xd916a
diff --git a/gfx/pics/ursaring/front.2bpp.lz b/gfx/pics/ursaring/front.animated.2bpp.lz.5bcb8114
index f98dd0cb0..f98dd0cb0 100644
--- a/gfx/pics/ursaring/front.2bpp.lz
+++ b/gfx/pics/ursaring/front.animated.2bpp.lz.5bcb8114
diff --git a/gfx/pics/ursaring/front.png b/gfx/pics/ursaring/front.png
new file mode 100644
index 000000000..31c28d585
--- /dev/null
+++ b/gfx/pics/ursaring/front.png
diff --git a/gfx/pics/ursaring/normal.pal b/gfx/pics/ursaring/normal.pal
deleted file mode 100644
index ce64ebf28..000000000
--- a/gfx/pics/ursaring/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 31, 06
-	RGB 20, 11, 00
-
diff --git a/gfx/pics/vaporeon/back.2bpp.lz b/gfx/pics/vaporeon/back.2bpp.lz.aafe2ea4
index 9ea248261..9ea248261 100644
--- a/gfx/pics/vaporeon/back.2bpp.lz
+++ b/gfx/pics/vaporeon/back.2bpp.lz.aafe2ea4
diff --git a/gfx/pics/vaporeon/back.png b/gfx/pics/vaporeon/back.png
new file mode 100644
index 000000000..61ed8e4ba
--- /dev/null
+++ b/gfx/pics/vaporeon/back.png
diff --git a/gfx/pics/vaporeon/bitmask.asm b/gfx/pics/vaporeon/bitmask.asm
deleted file mode 100644
index 05dbd7e0f..000000000
--- a/gfx/pics/vaporeon/bitmask.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-; 0
-	db %11000111
-	db %00110001
-	db %00001101
-	db %00000010
-	db %00000000
-; 1
-	db %00000000
-	db %10000000
-	db %01100001
-	db %00000000
-	db %00000000
-; 0xd319d
diff --git a/gfx/pics/vaporeon/frames.asm b/gfx/pics/vaporeon/frames.asm
deleted file mode 100644
index 0cc0568e7..000000000
--- a/gfx/pics/vaporeon/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $03, $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e
-.frame2
-	db $00 ; bitmask
-	db $2f, $30, $31, $1f, $32, $28, $29, $2a, $2b, $2c, $2d, $2e
-.frame3
-	db $01 ; bitmask
-	db $33, $34, $35, $36
-; 0xd5e42
diff --git a/gfx/pics/vaporeon/front.2bpp.lz b/gfx/pics/vaporeon/front.animated.2bpp.lz.6e1ee993
index 67793c7ec..67793c7ec 100644
--- a/gfx/pics/vaporeon/front.2bpp.lz
+++ b/gfx/pics/vaporeon/front.animated.2bpp.lz.6e1ee993
diff --git a/gfx/pics/vaporeon/front.png b/gfx/pics/vaporeon/front.png
new file mode 100644
index 000000000..f8ed11756
--- /dev/null
+++ b/gfx/pics/vaporeon/front.png
diff --git a/gfx/pics/vaporeon/normal.pal b/gfx/pics/vaporeon/normal.pal
deleted file mode 100644
index b910e1146..000000000
--- a/gfx/pics/vaporeon/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 16, 22, 31
-	RGB 09, 11, 31
-
diff --git a/gfx/pics/venomoth/back.2bpp.lz b/gfx/pics/venomoth/back.2bpp.lz.ba3cccb7
index 721527c2a..721527c2a 100644
--- a/gfx/pics/venomoth/back.2bpp.lz
+++ b/gfx/pics/venomoth/back.2bpp.lz.ba3cccb7
diff --git a/gfx/pics/venomoth/back.png b/gfx/pics/venomoth/back.png
new file mode 100644
index 000000000..5fbf6bba9
--- /dev/null
+++ b/gfx/pics/venomoth/back.png
diff --git a/gfx/pics/venomoth/bitmask.asm b/gfx/pics/venomoth/bitmask.asm
deleted file mode 100644
index 5621f6eb7..000000000
--- a/gfx/pics/venomoth/bitmask.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-; 0
-	db %10111111
-	db %11011111
-	db %11000001
-	db %11101111
-	db %11110111
-	db %00110000
-	db %00000000
-; 1
-	db %00000000
-	db %00000010
-	db %00000010
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2a55
diff --git a/gfx/pics/venomoth/frames.asm b/gfx/pics/venomoth/frames.asm
deleted file mode 100644
index e077653ca..000000000
--- a/gfx/pics/venomoth/frames.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $06, $06, $06, $06, $31, $32, $33, $34, $35, $36, $37, $38
-	db $39, $3a, $3b, $3c, $3d, $3e, $3f, $40, $41, $42, $43, $44
-	db $45, $06, $06, $46, $47, $06, $06, $06, $06
-.frame2
-	db $01 ; bitmask
-	db $48, $49
-; 0xd4be5
diff --git a/gfx/pics/venomoth/front.2bpp.lz b/gfx/pics/venomoth/front.animated.2bpp.lz.6c0096ec
index 5f32ad682..5f32ad682 100644
--- a/gfx/pics/venomoth/front.2bpp.lz
+++ b/gfx/pics/venomoth/front.animated.2bpp.lz.6c0096ec
diff --git a/gfx/pics/venomoth/front.png b/gfx/pics/venomoth/front.png
new file mode 100644
index 000000000..eb3c291b8
--- /dev/null
+++ b/gfx/pics/venomoth/front.png
diff --git a/gfx/pics/venomoth/normal.pal b/gfx/pics/venomoth/normal.pal
deleted file mode 100644
index 8b1e77e73..000000000
--- a/gfx/pics/venomoth/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 10, 24
-	RGB 12, 05, 14
-
diff --git a/gfx/pics/venonat/back.2bpp.lz b/gfx/pics/venonat/back.2bpp.lz.63b1017a
index b28c7523d..b28c7523d 100644
--- a/gfx/pics/venonat/back.2bpp.lz
+++ b/gfx/pics/venonat/back.2bpp.lz.63b1017a
diff --git a/gfx/pics/venonat/back.png b/gfx/pics/venonat/back.png
new file mode 100644
index 000000000..09b946146
--- /dev/null
+++ b/gfx/pics/venonat/back.png
diff --git a/gfx/pics/venonat/bitmask.asm b/gfx/pics/venonat/bitmask.asm
deleted file mode 100644
index 2ee6c413a..000000000
--- a/gfx/pics/venonat/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %10000000
-	db %00010001
-	db %00000110
-	db %00000000
-; 1
-	db %01100001
-	db %10101101
-	db %00000000
-	db %00000000
-; 0xd2a47
diff --git a/gfx/pics/venonat/frames.asm b/gfx/pics/venonat/frames.asm
deleted file mode 100644
index 46272e84f..000000000
--- a/gfx/pics/venonat/frames.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d
-.frame2
-	db $01 ; bitmask
-	db $1e, $1f, $20, $21, $22, $23, $24, $25
-; 0xd4bbc
diff --git a/gfx/pics/venonat/front.2bpp.lz b/gfx/pics/venonat/front.animated.2bpp.lz.02a36f08
index f6b057e8f..f6b057e8f 100644
--- a/gfx/pics/venonat/front.2bpp.lz
+++ b/gfx/pics/venonat/front.animated.2bpp.lz.02a36f08
diff --git a/gfx/pics/venonat/front.png b/gfx/pics/venonat/front.png
new file mode 100644
index 000000000..466b6b4c3
--- /dev/null
+++ b/gfx/pics/venonat/front.png
diff --git a/gfx/pics/venonat/normal.pal b/gfx/pics/venonat/normal.pal
deleted file mode 100644
index 90e24bc9d..000000000
--- a/gfx/pics/venonat/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 05, 02
-	RGB 11, 00, 14
-
diff --git a/gfx/pics/venusaur/back.2bpp.lz b/gfx/pics/venusaur/back.2bpp.lz.1d5b9ebe
index 27ca82e8a..27ca82e8a 100644
--- a/gfx/pics/venusaur/back.2bpp.lz
+++ b/gfx/pics/venusaur/back.2bpp.lz.1d5b9ebe
diff --git a/gfx/pics/venusaur/back.png b/gfx/pics/venusaur/back.png
new file mode 100644
index 000000000..b611551f6
--- /dev/null
+++ b/gfx/pics/venusaur/back.png
diff --git a/gfx/pics/venusaur/bitmask.asm b/gfx/pics/venusaur/bitmask.asm
deleted file mode 100644
index bfdf4f1b5..000000000
--- a/gfx/pics/venusaur/bitmask.asm
+++ /dev/null
@@ -1,49 +0,0 @@
-; 0
-	db %00000000
-	db %00100000
-	db %00010000
-	db %00001000
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %01110000
-	db %00111000
-	db %00011100
-	db %00001110
-	db %10000111
-	db %00000011
-	db %00000000
-; 2
-	db %10001000
-	db %00001011
-	db %00100101
-	db %01000000
-	db %00111000
-	db %01111000
-	db %00000000
-; 3
-	db %00001000
-	db %00001011
-	db %00000101
-	db %01000000
-	db %00110000
-	db %01111000
-	db %00000000
-; 4
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %11000000
-	db %00000000
-; 5
-	db %00100000
-	db %00000000
-	db %00000000
-	db %00000100
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2732
diff --git a/gfx/pics/venusaur/frames.asm b/gfx/pics/venusaur/frames.asm
deleted file mode 100644
index 504f80202..000000000
--- a/gfx/pics/venusaur/frames.asm
+++ /dev/null
@@ -1,32 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-	dw .frame6
-	dw .frame7
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33
-.frame2
-	db $01 ; bitmask
-	db $34, $35, $36, $37, $38, $39, $3a, $3b, $3c, $3d, $3e, $3f
-	db $40, $41, $42, $43, $44, $45
-.frame3
-	db $02 ; bitmask
-	db $46, $47, $48, $49, $4a, $4b, $4c, $4d, $4e, $4f, $50, $51
-	db $52, $53, $54, $55
-.frame4
-	db $03 ; bitmask
-	db $46, $56, $57, $58, $4b, $4c, $4e, $59, $51, $5a, $5b, $54
-	db $55
-.frame5
-	db $04 ; bitmask
-	db $5c, $5d
-.frame6
-	db $05 ; bitmask
-	db $5e, $5f
-.frame7
-	db $05 ; bitmask
-	db $60, $61
-; 0xd4289
diff --git a/gfx/pics/venusaur/front.2bpp.lz b/gfx/pics/venusaur/front.animated.2bpp.lz.48d131f4
index d436da0bd..d436da0bd 100644
--- a/gfx/pics/venusaur/front.2bpp.lz
+++ b/gfx/pics/venusaur/front.animated.2bpp.lz.48d131f4
diff --git a/gfx/pics/venusaur/front.png b/gfx/pics/venusaur/front.png
new file mode 100644
index 000000000..2cd0293cc
--- /dev/null
+++ b/gfx/pics/venusaur/front.png
diff --git a/gfx/pics/venusaur/normal.pal b/gfx/pics/venusaur/normal.pal
deleted file mode 100644
index 3d53b905f..000000000
--- a/gfx/pics/venusaur/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 08, 25, 11
-	RGB 29, 07, 14
-
diff --git a/gfx/pics/victreebel/back.2bpp.lz b/gfx/pics/victreebel/back.2bpp.lz.a80b1dc4
index d4b014f67..d4b014f67 100644
--- a/gfx/pics/victreebel/back.2bpp.lz
+++ b/gfx/pics/victreebel/back.2bpp.lz.a80b1dc4
diff --git a/gfx/pics/victreebel/back.png b/gfx/pics/victreebel/back.png
new file mode 100644
index 000000000..6f3ec484e
--- /dev/null
+++ b/gfx/pics/victreebel/back.png
diff --git a/gfx/pics/victreebel/bitmask.asm b/gfx/pics/victreebel/bitmask.asm
deleted file mode 100644
index 418d3c056..000000000
--- a/gfx/pics/victreebel/bitmask.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-; 0
-	db %00000000
-	db %10000010
-	db %10001111
-	db %01100001
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %10000000
-	db %11000011
-	db %11001111
-	db %01100101
-	db %00000010
-	db %00000000
-	db %00000000
-; 2
-	db %10000000
-	db %11000001
-	db %01011101
-	db %00101100
-	db %00000010
-	db %00000000
-	db %00000000
-; 3
-	db %00100000
-	db %00110000
-	db %00011000
-	db %00001000
-	db %00000000
-	db %00000000
-	db %00000000
-; 4
-	db %00100000
-	db %00010000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2c42
diff --git a/gfx/pics/victreebel/frames.asm b/gfx/pics/victreebel/frames.asm
deleted file mode 100644
index 302053cba..000000000
--- a/gfx/pics/victreebel/frames.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a
-.frame2
-	db $01 ; bitmask
-	db $3b, $3c, $31, $3d, $3e, $33, $34, $3f, $40, $41, $37, $38
-	db $42, $43, $3a, $44
-.frame3
-	db $02 ; bitmask
-	db $3b, $45, $3d, $46, $47, $3f, $40, $48, $41, $42, $49, $43
-	db $44
-.frame4
-	db $03 ; bitmask
-	db $00, $4a, $4b, $4c, $4d, $4e
-.frame5
-	db $04 ; bitmask
-	db $4f, $50
-; 0xd50f7
diff --git a/gfx/pics/victreebel/front.2bpp.lz b/gfx/pics/victreebel/front.animated.2bpp.lz.d5d535c1
index c53114990..c53114990 100644
--- a/gfx/pics/victreebel/front.2bpp.lz
+++ b/gfx/pics/victreebel/front.animated.2bpp.lz.d5d535c1
diff --git a/gfx/pics/victreebel/front.png b/gfx/pics/victreebel/front.png
new file mode 100644
index 000000000..7fc688ef3
--- /dev/null
+++ b/gfx/pics/victreebel/front.png
diff --git a/gfx/pics/victreebel/normal.pal b/gfx/pics/victreebel/normal.pal
deleted file mode 100644
index 6e9844ba3..000000000
--- a/gfx/pics/victreebel/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 15, 26, 03
-	RGB 31, 10, 13
-
diff --git a/gfx/pics/vileplume/back.2bpp.lz b/gfx/pics/vileplume/back.2bpp.lz.9f944092
index 823f0e112..823f0e112 100644
--- a/gfx/pics/vileplume/back.2bpp.lz
+++ b/gfx/pics/vileplume/back.2bpp.lz.9f944092
diff --git a/gfx/pics/vileplume/back.png b/gfx/pics/vileplume/back.png
new file mode 100644
index 000000000..4e0e9fbe3
--- /dev/null
+++ b/gfx/pics/vileplume/back.png
diff --git a/gfx/pics/vileplume/bitmask.asm b/gfx/pics/vileplume/bitmask.asm
deleted file mode 100644
index 71a97597a..000000000
--- a/gfx/pics/vileplume/bitmask.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-; 0
-	db %00000110
-	db %00000011
-	db %00000110
-	db %10000011
-	db %11000001
-	db %01100000
-	db %00000000
-; 1
-	db %00000110
-	db %10001111
-	db %01000110
-	db %10100011
-	db %11110011
-	db %01110001
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %00000100
-	db %00000010
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2a10
diff --git a/gfx/pics/vileplume/frames.asm b/gfx/pics/vileplume/frames.asm
deleted file mode 100644
index 35a7708aa..000000000
--- a/gfx/pics/vileplume/frames.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e
-.frame2
-	db $01 ; bitmask
-	db $31, $3f, $40, $41, $42, $43, $44, $45, $46, $47, $48, $49
-	db $4a, $4b, $4c, $4d, $4e, $4f, $50, $51, $52, $53, $54, $55
-.frame3
-	db $02 ; bitmask
-	db $56, $57
-; 0xd4b3b
diff --git a/gfx/pics/vileplume/front.2bpp.lz b/gfx/pics/vileplume/front.animated.2bpp.lz.db2287e6
index 05ca10ba5..05ca10ba5 100644
--- a/gfx/pics/vileplume/front.2bpp.lz
+++ b/gfx/pics/vileplume/front.animated.2bpp.lz.db2287e6
diff --git a/gfx/pics/vileplume/front.png b/gfx/pics/vileplume/front.png
new file mode 100644
index 000000000..6a8a4c0fd
--- /dev/null
+++ b/gfx/pics/vileplume/front.png
diff --git a/gfx/pics/vileplume/normal.pal b/gfx/pics/vileplume/normal.pal
deleted file mode 100644
index 4af23de91..000000000
--- a/gfx/pics/vileplume/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 06, 03
-	RGB 08, 09, 13
-
diff --git a/gfx/pics/voltorb/back.2bpp.lz b/gfx/pics/voltorb/back.2bpp.lz.f19cefe9
index fe102da9a..fe102da9a 100644
--- a/gfx/pics/voltorb/back.2bpp.lz
+++ b/gfx/pics/voltorb/back.2bpp.lz.f19cefe9
diff --git a/gfx/pics/voltorb/back.png b/gfx/pics/voltorb/back.png
new file mode 100644
index 000000000..e2e46de54
--- /dev/null
+++ b/gfx/pics/voltorb/back.png
diff --git a/gfx/pics/voltorb/bitmask.asm b/gfx/pics/voltorb/bitmask.asm
deleted file mode 100644
index 509d7b623..000000000
--- a/gfx/pics/voltorb/bitmask.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-; 0
-	db %11000000
-	db %01111001
-	db %01000111
-	db %00000000
-; 1
-	db %01000000
-	db %00001000
-	db %00000001
-	db %00000000
-; 0xd2ed1
diff --git a/gfx/pics/voltorb/frames.asm b/gfx/pics/voltorb/frames.asm
deleted file mode 100644
index 79cad4ecd..000000000
--- a/gfx/pics/voltorb/frames.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c, $1d, $1e, $00, $1f, $20, $21, $00
-.frame2
-	db $01 ; bitmask
-	db $22, $23, $24
-; 0xd56c3
diff --git a/gfx/pics/voltorb/front.2bpp.lz b/gfx/pics/voltorb/front.animated.2bpp.lz.64051f97
index 94f35f9aa..94f35f9aa 100644
--- a/gfx/pics/voltorb/front.2bpp.lz
+++ b/gfx/pics/voltorb/front.animated.2bpp.lz.64051f97
diff --git a/gfx/pics/voltorb/front.png b/gfx/pics/voltorb/front.png
new file mode 100644
index 000000000..90dcedaf9
--- /dev/null
+++ b/gfx/pics/voltorb/front.png
diff --git a/gfx/pics/voltorb/normal.pal b/gfx/pics/voltorb/normal.pal
deleted file mode 100644
index 07658abee..000000000
--- a/gfx/pics/voltorb/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 20, 17
-	RGB 24, 05, 05
-
diff --git a/gfx/pics/vulpix/back.2bpp.lz b/gfx/pics/vulpix/back.2bpp.lz.0c7852c8
index ce2535141..ce2535141 100644
--- a/gfx/pics/vulpix/back.2bpp.lz
+++ b/gfx/pics/vulpix/back.2bpp.lz.0c7852c8
diff --git a/gfx/pics/vulpix/back.png b/gfx/pics/vulpix/back.png
new file mode 100644
index 000000000..cd37be416
--- /dev/null
+++ b/gfx/pics/vulpix/back.png
diff --git a/gfx/pics/vulpix/bitmask.asm b/gfx/pics/vulpix/bitmask.asm
deleted file mode 100644
index 170eac783..000000000
--- a/gfx/pics/vulpix/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %11000000
-	db %01110000
-	db %00011100
-	db %10001111
-	db %00000011
-; 1
-	db %00011000
-	db %00000100
-	db %00000000
-	db %00000000
-	db %00000000
-; 2
-	db %00111000
-	db %00001100
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd2981
diff --git a/gfx/pics/vulpix/frames.asm b/gfx/pics/vulpix/frames.asm
deleted file mode 100644
index b0cf1935a..000000000
--- a/gfx/pics/vulpix/frames.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $00, $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e
-	db $2f, $30, $31
-.frame2
-	db $00 ; bitmask
-	db $00, $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $32, $33
-	db $2f, $34, $35
-.frame3
-	db $01 ; bitmask
-	db $36, $37, $38
-.frame4
-	db $02 ; bitmask
-	db $36, $39, $3a, $3b, $3c
-; 0xd498d
diff --git a/gfx/pics/vulpix/front.2bpp.lz b/gfx/pics/vulpix/front.animated.2bpp.lz.df94d884
index 9248ce808..9248ce808 100644
--- a/gfx/pics/vulpix/front.2bpp.lz
+++ b/gfx/pics/vulpix/front.animated.2bpp.lz.df94d884
diff --git a/gfx/pics/vulpix/front.png b/gfx/pics/vulpix/front.png
new file mode 100644
index 000000000..43c19a3f8
--- /dev/null
+++ b/gfx/pics/vulpix/front.png
diff --git a/gfx/pics/vulpix/normal.pal b/gfx/pics/vulpix/normal.pal
deleted file mode 100644
index bd887146d..000000000
--- a/gfx/pics/vulpix/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 12, 07
-	RGB 21, 05, 08
-
diff --git a/gfx/pics/wartortle/back.2bpp.lz b/gfx/pics/wartortle/back.2bpp.lz.f2338cb4
index 5734c20cb..5734c20cb 100644
--- a/gfx/pics/wartortle/back.2bpp.lz
+++ b/gfx/pics/wartortle/back.2bpp.lz.f2338cb4
diff --git a/gfx/pics/wartortle/back.png b/gfx/pics/wartortle/back.png
new file mode 100644
index 000000000..bb53292eb
--- /dev/null
+++ b/gfx/pics/wartortle/back.png
diff --git a/gfx/pics/wartortle/bitmask.asm b/gfx/pics/wartortle/bitmask.asm
deleted file mode 100644
index ed46271e8..000000000
--- a/gfx/pics/wartortle/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00000000
-	db %10001110
-	db %11100011
-	db %00111100
-	db %00001111
-; 1
-	db %00000000
-	db %11000000
-	db %00110000
-	db %00000000
-	db %00000000
-; 2
-	db %10000000
-	db %01000001
-	db %00011000
-	db %00000000
-	db %00000000
-; 0xd2789
diff --git a/gfx/pics/wartortle/frames.asm b/gfx/pics/wartortle/frames.asm
deleted file mode 100644
index 9ebf74b9b..000000000
--- a/gfx/pics/wartortle/frames.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e, $2f
-	db $30, $31, $32, $33, $34
-.frame2
-	db $01 ; bitmask
-	db $35, $36, $37, $38
-.frame3
-	db $02 ; bitmask
-	db $39, $3a, $3b, $3c, $3d
-; 0xd437d
diff --git a/gfx/pics/wartortle/front.2bpp.lz b/gfx/pics/wartortle/front.animated.2bpp.lz.f50d25f5
index 29642807d..29642807d 100644
--- a/gfx/pics/wartortle/front.2bpp.lz
+++ b/gfx/pics/wartortle/front.animated.2bpp.lz.f50d25f5
diff --git a/gfx/pics/wartortle/front.png b/gfx/pics/wartortle/front.png
new file mode 100644
index 000000000..f4a4ad33f
--- /dev/null
+++ b/gfx/pics/wartortle/front.png
diff --git a/gfx/pics/wartortle/normal.pal b/gfx/pics/wartortle/normal.pal
deleted file mode 100644
index 0615b9ec0..000000000
--- a/gfx/pics/wartortle/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 22, 18, 08
-	RGB 10, 14, 31
-
diff --git a/gfx/pics/weedle/back.2bpp.lz b/gfx/pics/weedle/back.2bpp.lz.f26ac339
index 64decb914..64decb914 100644
--- a/gfx/pics/weedle/back.2bpp.lz
+++ b/gfx/pics/weedle/back.2bpp.lz.f26ac339
diff --git a/gfx/pics/weedle/back.png b/gfx/pics/weedle/back.png
new file mode 100644
index 000000000..b20e4a53d
--- /dev/null
+++ b/gfx/pics/weedle/back.png
diff --git a/gfx/pics/weedle/bitmask.asm b/gfx/pics/weedle/bitmask.asm
deleted file mode 100644
index defd3d5cd..000000000
--- a/gfx/pics/weedle/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %11000000
-	db %00011000
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00001100
-	db %00000001
-	db %00000000
-; 2
-	db %00000000
-	db %00000000
-	db %11000110
-	db %00000000
-; 0xd27d3
diff --git a/gfx/pics/weedle/frames.asm b/gfx/pics/weedle/frames.asm
deleted file mode 100644
index c7a2a34a2..000000000
--- a/gfx/pics/weedle/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $1c
-.frame2
-	db $01 ; bitmask
-	db $1d, $1e, $1f
-.frame3
-	db $02 ; bitmask
-	db $20, $21, $22, $23
-.frame4
-	db $02 ; bitmask
-	db $20, $21, $00, $24
-; 0xd4462
diff --git a/gfx/pics/weedle/front.2bpp.lz b/gfx/pics/weedle/front.animated.2bpp.lz.9e1dedbd
index 091df588a..091df588a 100644
--- a/gfx/pics/weedle/front.2bpp.lz
+++ b/gfx/pics/weedle/front.animated.2bpp.lz.9e1dedbd
diff --git a/gfx/pics/weedle/front.png b/gfx/pics/weedle/front.png
new file mode 100644
index 000000000..3dfa35241
--- /dev/null
+++ b/gfx/pics/weedle/front.png
diff --git a/gfx/pics/weedle/normal.pal b/gfx/pics/weedle/normal.pal
deleted file mode 100644
index 9adb83b51..000000000
--- a/gfx/pics/weedle/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 17, 05
-	RGB 25, 05, 03
-
diff --git a/gfx/pics/weepinbell/back.2bpp.lz b/gfx/pics/weepinbell/back.2bpp.lz.f84a5fe6
index 26e44257c..26e44257c 100644
--- a/gfx/pics/weepinbell/back.2bpp.lz
+++ b/gfx/pics/weepinbell/back.2bpp.lz.f84a5fe6
diff --git a/gfx/pics/weepinbell/back.png b/gfx/pics/weepinbell/back.png
new file mode 100644
index 000000000..cb20b0da8
--- /dev/null
+++ b/gfx/pics/weepinbell/back.png
diff --git a/gfx/pics/weepinbell/bitmask.asm b/gfx/pics/weepinbell/bitmask.asm
deleted file mode 100644
index 4af94c390..000000000
--- a/gfx/pics/weepinbell/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00000000
-	db %10000000
-	db %11100011
-	db %00111000
-	db %00001100
-; 1
-	db %00000000
-	db %10000000
-	db %11110001
-	db %00111000
-	db %00001100
-; 2
-	db %00000000
-	db %01000000
-	db %00100000
-	db %00000000
-	db %00000000
-; 0xd2c1f
diff --git a/gfx/pics/weepinbell/frames.asm b/gfx/pics/weepinbell/frames.asm
deleted file mode 100644
index 9d67bd4eb..000000000
--- a/gfx/pics/weepinbell/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $00, $00, $00
-.frame2
-	db $01 ; bitmask
-	db $2c, $2d, $2e, $2f, $30, $00, $31, $32, $00, $00, $00
-.frame3
-	db $02 ; bitmask
-	db $33, $34
-; 0xd50b9
diff --git a/gfx/pics/weepinbell/front.2bpp.lz b/gfx/pics/weepinbell/front.animated.2bpp.lz.7b06c092
index a7e7d60b5..a7e7d60b5 100644
--- a/gfx/pics/weepinbell/front.2bpp.lz
+++ b/gfx/pics/weepinbell/front.animated.2bpp.lz.7b06c092
diff --git a/gfx/pics/weepinbell/front.png b/gfx/pics/weepinbell/front.png
new file mode 100644
index 000000000..eb6d4658c
--- /dev/null
+++ b/gfx/pics/weepinbell/front.png
diff --git a/gfx/pics/weepinbell/normal.pal b/gfx/pics/weepinbell/normal.pal
deleted file mode 100644
index 803367e69..000000000
--- a/gfx/pics/weepinbell/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 13, 31, 07
-	RGB 29, 09, 09
-
diff --git a/gfx/pics/weezing/back.2bpp.lz b/gfx/pics/weezing/back.2bpp.lz.5ac5b672
index a85124f3a..a85124f3a 100644
--- a/gfx/pics/weezing/back.2bpp.lz
+++ b/gfx/pics/weezing/back.2bpp.lz.5ac5b672
diff --git a/gfx/pics/weezing/back.png b/gfx/pics/weezing/back.png
new file mode 100644
index 000000000..8f4b076a0
--- /dev/null
+++ b/gfx/pics/weezing/back.png
diff --git a/gfx/pics/weezing/bitmask.asm b/gfx/pics/weezing/bitmask.asm
deleted file mode 100644
index 0877082a9..000000000
--- a/gfx/pics/weezing/bitmask.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-; 0
-	db %00001100
-	db %00000110
-	db %10000011
-	db %00000001
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %00000000
-	db %00011000
-	db %10100011
-	db %00000001
-	db %00010011
-	db %10010001
-	db %00000000
-; 2
-	db %00000000
-	db %00111000
-	db %10110000
-	db %11010001
-	db %00011011
-	db %10011001
-	db %00000000
-; 3
-	db %00000000
-	db %00100000
-	db %00010000
-	db %00010000
-	db %00001011
-	db %11001101
-	db %00000000
-; 4
-	db %00001100
-	db %10000111
-	db %11000011
-	db %00000001
-	db %10000000
-	db %01000000
-	db %00000000
-; 0xd2fb9
diff --git a/gfx/pics/weezing/frames.asm b/gfx/pics/weezing/frames.asm
deleted file mode 100644
index 1bb1b5710..000000000
--- a/gfx/pics/weezing/frames.asm
+++ /dev/null
@@ -1,24 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-	dw .frame5
-.frame1
-	db $00 ; bitmask
-	db $31, $00, $32, $33, $34, $35, $36, $35
-.frame2
-	db $01 ; bitmask
-	db $37, $38, $39, $3a, $3b, $3c, $3d, $3e, $3f, $40, $41, $42
-	db $43
-.frame3
-	db $02 ; bitmask
-	db $37, $38, $44, $45, $3b, $46, $47, $48, $49, $4a, $3e, $3f
-	db $4b, $40, $4c, $4d, $42, $4e
-.frame4
-	db $03 ; bitmask
-	db $44, $45, $48, $3e, $3f, $4b, $4c, $4f, $4d, $50, $4e
-.frame5
-	db $04 ; bitmask
-	db $31, $00, $51, $32, $33, $52, $34, $35, $53, $36, $35, $54
-	db $55
-; 0xd5915
diff --git a/gfx/pics/weezing/front.2bpp.lz b/gfx/pics/weezing/front.animated.2bpp.lz.75928bd0
index 3c6f24a41..3c6f24a41 100644
--- a/gfx/pics/weezing/front.2bpp.lz
+++ b/gfx/pics/weezing/front.animated.2bpp.lz.75928bd0
diff --git a/gfx/pics/weezing/front.png b/gfx/pics/weezing/front.png
new file mode 100644
index 000000000..7fd7b9312
--- /dev/null
+++ b/gfx/pics/weezing/front.png
diff --git a/gfx/pics/weezing/normal.pal b/gfx/pics/weezing/normal.pal
deleted file mode 100644
index 38c816da2..000000000
--- a/gfx/pics/weezing/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 10, 25
-	RGB 11, 05, 14
-
diff --git a/gfx/pics/wigglytuff/back.2bpp.lz b/gfx/pics/wigglytuff/back.2bpp.lz.fee674ac
index 3b3732986..3b3732986 100644
--- a/gfx/pics/wigglytuff/back.2bpp.lz
+++ b/gfx/pics/wigglytuff/back.2bpp.lz.fee674ac
diff --git a/gfx/pics/wigglytuff/back.png b/gfx/pics/wigglytuff/back.png
new file mode 100644
index 000000000..5e264305b
--- /dev/null
+++ b/gfx/pics/wigglytuff/back.png
diff --git a/gfx/pics/wigglytuff/bitmask.asm b/gfx/pics/wigglytuff/bitmask.asm
deleted file mode 100644
index 5cde27270..000000000
--- a/gfx/pics/wigglytuff/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %00011000
-	db %10000111
-	db %01100001
-	db %00011000
-	db %00000000
-; 1
-	db %00011000
-	db %00001111
-	db %00000000
-	db %00111100
-	db %00001100
-; 2
-	db %00000000
-	db %01000001
-	db %00110000
-	db %00001100
-	db %00000000
-; 0xd29bf
diff --git a/gfx/pics/wigglytuff/frames.asm b/gfx/pics/wigglytuff/frames.asm
deleted file mode 100644
index 131fc589c..000000000
--- a/gfx/pics/wigglytuff/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e
-.frame2
-	db $01 ; bitmask
-	db $2f, $30, $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a
-.frame3
-	db $02 ; bitmask
-	db $3b, $3c, $3d, $3e, $3f, $40
-; 0xd4a49
diff --git a/gfx/pics/wigglytuff/front.2bpp.lz b/gfx/pics/wigglytuff/front.animated.2bpp.lz.49311d0b
index c633d2a0a..c633d2a0a 100644
--- a/gfx/pics/wigglytuff/front.2bpp.lz
+++ b/gfx/pics/wigglytuff/front.animated.2bpp.lz.49311d0b
diff --git a/gfx/pics/wigglytuff/front.png b/gfx/pics/wigglytuff/front.png
new file mode 100644
index 000000000..229f6647a
--- /dev/null
+++ b/gfx/pics/wigglytuff/front.png
diff --git a/gfx/pics/wigglytuff/normal.pal b/gfx/pics/wigglytuff/normal.pal
deleted file mode 100644
index 47aab43ae..000000000
--- a/gfx/pics/wigglytuff/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 14, 21
-	RGB 06, 16, 31
-
diff --git a/gfx/pics/wobbuffet/back.2bpp.lz b/gfx/pics/wobbuffet/back.2bpp.lz.a862192a
index 87dba2049..87dba2049 100644
--- a/gfx/pics/wobbuffet/back.2bpp.lz
+++ b/gfx/pics/wobbuffet/back.2bpp.lz.a862192a
diff --git a/gfx/pics/wobbuffet/back.png b/gfx/pics/wobbuffet/back.png
new file mode 100644
index 000000000..103f69106
--- /dev/null
+++ b/gfx/pics/wobbuffet/back.png
diff --git a/gfx/pics/wobbuffet/bitmask.asm b/gfx/pics/wobbuffet/bitmask.asm
deleted file mode 100644
index d1fa8121f..000000000
--- a/gfx/pics/wobbuffet/bitmask.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-; 0
-	db %11011111
-	db %11110111
-	db %00111101
-	db %00001111
-	db %00000000
-; 0xd36b0
diff --git a/gfx/pics/wobbuffet/frames.asm b/gfx/pics/wobbuffet/frames.asm
deleted file mode 100644
index efe0d1e6d..000000000
--- a/gfx/pics/wobbuffet/frames.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-	dw .frame1
-	dw .frame2
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $00, $28, $29, $2a, $2b, $2c, $2d, $2e
-	db $2f, $30, $31, $32, $33, $34, $35, $00, $36, $00, $00
-.frame2
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $00, $28, $29, $37, $2b, $2c, $2d, $2e
-	db $38, $30, $31, $32, $33, $34, $35, $00, $36, $00, $00
-; 0xd8e92
diff --git a/gfx/pics/wobbuffet/front.2bpp.lz b/gfx/pics/wobbuffet/front.animated.2bpp.lz.f1f4687d
index ce7aa46c8..ce7aa46c8 100644
--- a/gfx/pics/wobbuffet/front.2bpp.lz
+++ b/gfx/pics/wobbuffet/front.animated.2bpp.lz.f1f4687d
diff --git a/gfx/pics/wobbuffet/front.png b/gfx/pics/wobbuffet/front.png
new file mode 100644
index 000000000..e1b7935aa
--- /dev/null
+++ b/gfx/pics/wobbuffet/front.png
diff --git a/gfx/pics/wobbuffet/normal.pal b/gfx/pics/wobbuffet/normal.pal
deleted file mode 100644
index 71304f147..000000000
--- a/gfx/pics/wobbuffet/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 12, 21, 31
-	RGB 07, 14, 16
-
diff --git a/gfx/pics/wooper/back.2bpp.lz b/gfx/pics/wooper/back.2bpp.lz.4f4b7917
index 973037f02..973037f02 100644
--- a/gfx/pics/wooper/back.2bpp.lz
+++ b/gfx/pics/wooper/back.2bpp.lz.4f4b7917
diff --git a/gfx/pics/wooper/back.png b/gfx/pics/wooper/back.png
new file mode 100644
index 000000000..83fca2bf5
--- /dev/null
+++ b/gfx/pics/wooper/back.png
diff --git a/gfx/pics/wooper/bitmask.asm b/gfx/pics/wooper/bitmask.asm
deleted file mode 100644
index 15731d45a..000000000
--- a/gfx/pics/wooper/bitmask.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-; 0
-	db %10000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 1
-	db %10000110
-	db %00010000
-	db %01110001
-	db %00000000
-; 2
-	db %01000000
-	db %00001000
-	db %00000000
-	db %00000000
-; 3
-	db %00000110
-	db %00000000
-	db %01110001
-	db %00000000
-; 0xd3629
diff --git a/gfx/pics/wooper/frames.asm b/gfx/pics/wooper/frames.asm
deleted file mode 100644
index fd7dcc8bf..000000000
--- a/gfx/pics/wooper/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $19, $1a
-.frame2
-	db $01 ; bitmask
-	db $1b, $1c, $19, $1a, $1d, $1e, $1f, $00
-.frame3
-	db $02 ; bitmask
-	db $20, $21
-.frame4
-	db $03 ; bitmask
-	db $1b, $1c, $1d, $1e, $1f, $00
-; 0xd8cf2
diff --git a/gfx/pics/wooper/front.2bpp.lz b/gfx/pics/wooper/front.animated.2bpp.lz.4e440469
index 3d5d53c1b..3d5d53c1b 100644
--- a/gfx/pics/wooper/front.2bpp.lz
+++ b/gfx/pics/wooper/front.animated.2bpp.lz.4e440469
diff --git a/gfx/pics/wooper/front.png b/gfx/pics/wooper/front.png
new file mode 100644
index 000000000..9a232b113
--- /dev/null
+++ b/gfx/pics/wooper/front.png
diff --git a/gfx/pics/wooper/normal.pal b/gfx/pics/wooper/normal.pal
deleted file mode 100644
index ec098b1cf..000000000
--- a/gfx/pics/wooper/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 16, 20, 25
-	RGB 17, 08, 14
-
diff --git a/gfx/pics/xatu/back.2bpp.lz b/gfx/pics/xatu/back.2bpp.lz.4de765ff
index 8b6889ffb..8b6889ffb 100644
--- a/gfx/pics/xatu/back.2bpp.lz
+++ b/gfx/pics/xatu/back.2bpp.lz.4de765ff
diff --git a/gfx/pics/xatu/back.png b/gfx/pics/xatu/back.png
new file mode 100644
index 000000000..94f56f87d
--- /dev/null
+++ b/gfx/pics/xatu/back.png
diff --git a/gfx/pics/xatu/bitmask.asm b/gfx/pics/xatu/bitmask.asm
deleted file mode 100644
index 3b59b58c6..000000000
--- a/gfx/pics/xatu/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %11000001
-	db %00110000
-	db %00001100
-	db %10001110
-	db %00000001
-; 1
-	db %00000000
-	db %00010000
-	db %00000100
-	db %00000000
-	db %00000000
-; 2
-	db %00000000
-	db %11000111
-	db %01110011
-	db %00001100
-	db %00000000
-; 0xd34f0
diff --git a/gfx/pics/xatu/frames.asm b/gfx/pics/xatu/frames.asm
deleted file mode 100644
index fffa25793..000000000
--- a/gfx/pics/xatu/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-	dw .frame4
-.frame1
-	db $00 ; bitmask
-	db $01, $24, $01, $25, $26, $27, $28, $01, $29, $2a, $01, $01
-.frame2
-	db $00 ; bitmask
-	db $01, $24, $01, $2b, $26, $2c, $28, $01, $29, $2a, $01, $01
-.frame3
-	db $01 ; bitmask
-	db $2d, $2e
-.frame4
-	db $02 ; bitmask
-	db $2f, $30, $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a
-; 0xd89f9
diff --git a/gfx/pics/xatu/front.2bpp.lz b/gfx/pics/xatu/front.animated.2bpp.lz.4f452e43
index 4b5918b3a..4b5918b3a 100644
--- a/gfx/pics/xatu/front.2bpp.lz
+++ b/gfx/pics/xatu/front.animated.2bpp.lz.4f452e43
diff --git a/gfx/pics/xatu/front.png b/gfx/pics/xatu/front.png
new file mode 100644
index 000000000..f6335d27d
--- /dev/null
+++ b/gfx/pics/xatu/front.png
diff --git a/gfx/pics/xatu/normal.pal b/gfx/pics/xatu/normal.pal
deleted file mode 100644
index 9f85159c1..000000000
--- a/gfx/pics/xatu/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 10, 23, 13
-	RGB 20, 05, 06
-
diff --git a/gfx/pics/yanma/back.2bpp.lz b/gfx/pics/yanma/back.2bpp.lz.2ca27ab3
index 47105f12f..47105f12f 100644
--- a/gfx/pics/yanma/back.2bpp.lz
+++ b/gfx/pics/yanma/back.2bpp.lz.2ca27ab3
diff --git a/gfx/pics/yanma/back.png b/gfx/pics/yanma/back.png
new file mode 100644
index 000000000..cc21b1a28
--- /dev/null
+++ b/gfx/pics/yanma/back.png
diff --git a/gfx/pics/yanma/bitmask.asm b/gfx/pics/yanma/bitmask.asm
deleted file mode 100644
index a2bfcf8ce..000000000
--- a/gfx/pics/yanma/bitmask.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-; 0
-	db %11001111
-	db %11100011
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %11000001
-	db %00000000
-	db %00001100
-	db %11001111
-	db %00000001
-; 2
-	db %00000100
-	db %01000000
-	db %00000000
-	db %00000000
-	db %00000000
-; 0xd3619
diff --git a/gfx/pics/yanma/frames.asm b/gfx/pics/yanma/frames.asm
deleted file mode 100644
index 7512a5e8f..000000000
--- a/gfx/pics/yanma/frames.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $24, $25, $26, $27, $28, $29, $2a, $2b, $2c, $2d, $2e
-.frame2
-	db $01 ; bitmask
-	db $2f, $30, $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a
-.frame3
-	db $02 ; bitmask
-	db $3b, $3c
-; 0xd8cd4
diff --git a/gfx/pics/yanma/front.2bpp.lz b/gfx/pics/yanma/front.animated.2bpp.lz.25f91adf
index 1987afdc9..1987afdc9 100644
--- a/gfx/pics/yanma/front.2bpp.lz
+++ b/gfx/pics/yanma/front.animated.2bpp.lz.25f91adf
diff --git a/gfx/pics/yanma/front.png b/gfx/pics/yanma/front.png
new file mode 100644
index 000000000..1812eea58
--- /dev/null
+++ b/gfx/pics/yanma/front.png
diff --git a/gfx/pics/yanma/normal.pal b/gfx/pics/yanma/normal.pal
deleted file mode 100644
index dc054a54f..000000000
--- a/gfx/pics/yanma/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 09, 26, 10
-	RGB 20, 07, 07
-
diff --git a/gfx/pics/zapdos/back.2bpp.lz b/gfx/pics/zapdos/back.2bpp.lz.a44c7524
index 2f2167941..2f2167941 100644
--- a/gfx/pics/zapdos/back.2bpp.lz
+++ b/gfx/pics/zapdos/back.2bpp.lz.a44c7524
diff --git a/gfx/pics/zapdos/back.png b/gfx/pics/zapdos/back.png
new file mode 100644
index 000000000..8b1b740ea
--- /dev/null
+++ b/gfx/pics/zapdos/back.png
diff --git a/gfx/pics/zapdos/bitmask.asm b/gfx/pics/zapdos/bitmask.asm
deleted file mode 100644
index e1362fa79..000000000
--- a/gfx/pics/zapdos/bitmask.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-; 0
-	db %10110111
-	db %11001111
-	db %11100011
-	db %11110001
-	db %00000000
-	db %00000000
-	db %00000000
-; 1
-	db %10111111
-	db %11001111
-	db %11100111
-	db %11110001
-	db %01011000
-	db %01111000
-	db %00000000
-; 0xd3260
diff --git a/gfx/pics/zapdos/frames.asm b/gfx/pics/zapdos/frames.asm
deleted file mode 100644
index f22a9680c..000000000
--- a/gfx/pics/zapdos/frames.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c
-	db $3d, $3e, $3f, $40, $41, $42, $43, $44, $45, $46
-.frame2
-	db $01 ; bitmask
-	db $31, $32, $33, $47, $34, $35, $48, $49, $4a, $4b, $4c, $4d
-	db $4e, $4f, $3e, $50, $3f, $40, $41, $42, $51, $52, $45, $46
-	db $53, $54, $55, $56, $57, $58, $59
-.frame3
-	db $00 ; bitmask
-	db $31, $32, $33, $34, $35, $36, $49, $4a, $39, $3a, $3b, $4e
-	db $4f, $3e, $3f, $40, $41, $42, $43, $44, $45, $46
-; 0xd6096
diff --git a/gfx/pics/zapdos/front.2bpp.lz b/gfx/pics/zapdos/front.animated.2bpp.lz.05cb214a
index 0f048171c..0f048171c 100644
--- a/gfx/pics/zapdos/front.2bpp.lz
+++ b/gfx/pics/zapdos/front.animated.2bpp.lz.05cb214a
diff --git a/gfx/pics/zapdos/front.png b/gfx/pics/zapdos/front.png
new file mode 100644
index 000000000..ae1b68cd0
--- /dev/null
+++ b/gfx/pics/zapdos/front.png
diff --git a/gfx/pics/zapdos/normal.pal b/gfx/pics/zapdos/normal.pal
deleted file mode 100644
index fdfcd0418..000000000
--- a/gfx/pics/zapdos/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 28, 00
-	RGB 23, 16, 00
-
diff --git a/gfx/pics/zubat/back.2bpp.lz b/gfx/pics/zubat/back.2bpp.lz.aa77eb62
index d50e00e90..d50e00e90 100644
--- a/gfx/pics/zubat/back.2bpp.lz
+++ b/gfx/pics/zubat/back.2bpp.lz.aa77eb62
diff --git a/gfx/pics/zubat/back.png b/gfx/pics/zubat/back.png
new file mode 100644
index 000000000..2e1eb35cf
--- /dev/null
+++ b/gfx/pics/zubat/back.png
diff --git a/gfx/pics/zubat/bitmask.asm b/gfx/pics/zubat/bitmask.asm
deleted file mode 100644
index bf6109784..000000000
--- a/gfx/pics/zubat/bitmask.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; 0
-	db %11011110
-	db %00010011
-	db %11100111
-	db %00000001
-; 1
-	db %10000000
-	db %00010000
-	db %00000000
-	db %00000000
-; 2
-	db %11011110
-	db %00000011
-	db %11100111
-	db %00000001
-; 0xd29cb
diff --git a/gfx/pics/zubat/frames.asm b/gfx/pics/zubat/frames.asm
deleted file mode 100644
index 8fa207006..000000000
--- a/gfx/pics/zubat/frames.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-	dw .frame1
-	dw .frame2
-	dw .frame3
-.frame1
-	db $00 ; bitmask
-	db $19, $1a, $1b, $0e, $1c, $1d, $0e, $0e, $1e, $1f, $20, $21
-	db $22, $23, $0e, $0e
-.frame2
-	db $01 ; bitmask
-	db $24, $1e
-.frame3
-	db $02 ; bitmask
-	db $19, $1a, $1b, $0e, $1c, $25, $0e, $0e, $1f, $26, $21, $22
-	db $23, $0e, $0e
-; 0xd4a73
diff --git a/gfx/pics/zubat/front.2bpp.lz b/gfx/pics/zubat/front.animated.2bpp.lz.f12e6581
index b22e1d971..b22e1d971 100644
--- a/gfx/pics/zubat/front.2bpp.lz
+++ b/gfx/pics/zubat/front.animated.2bpp.lz.f12e6581
diff --git a/gfx/pics/zubat/front.png b/gfx/pics/zubat/front.png
new file mode 100644
index 000000000..1dbccda8e
--- /dev/null
+++ b/gfx/pics/zubat/front.png
diff --git a/gfx/pics/zubat/normal.pal b/gfx/pics/zubat/normal.pal
deleted file mode 100644
index d36d0449c..000000000
--- a/gfx/pics/zubat/normal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 12, 15, 19
-	RGB 05, 08, 17
-
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/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/08c893.png b/gfx/unknown/08c893.png
new file mode 100644
index 000000000..4cbb595f7
--- /dev/null
+++ b/gfx/unknown/08c893.png
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/0f8ea4.png b/gfx/unknown/0f8ea4.png
new file mode 100644
index 000000000..6eeb69b11
--- /dev/null
+++ b/gfx/unknown/0f8ea4.png
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/172f1f.png b/gfx/unknown/172f1f.png
new file mode 100644
index 000000000..0e324906d
--- /dev/null
+++ b/gfx/unknown/172f1f.png
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.asm b/home.asm
index 89b1b3d42..cf9a456db 100644
--- a/home.asm
+++ b/home.asm
@@ -152,7 +152,7 @@ INCLUDE "home/sram.asm"
 ; Register aliases
 
 _hl_:: ; 2fec
-	jp [hl]
+	jp hl
 ; 2fed
 
 _de_:: ; 2fed
diff --git a/home/farcall.asm b/home/farcall.asm
index 944087465..27649f30e 100644
--- a/home/farcall.asm
+++ b/home/farcall.asm
@@ -50,5 +50,5 @@ ReturnFarCall:: ; 2d6e
 ; 2d82
 
 FarJump_hl:: ; 2d82
-	jp [hl]
+	jp hl
 ; 2d83
diff --git a/home/menu.asm b/home/menu.asm
index 563ee9f99..53e4457e3 100644
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -337,7 +337,7 @@ RunMenuItemPrintingFunction:: ; 1eda
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 1eff
 
 InitMenuCursorAndButtonPermissions:: ; 1eff
@@ -470,7 +470,7 @@ MenuJumptable:: ; 1fa7
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 1fb1
 
 GetMenuDataPointerTableEntry:: ; 1fb1
diff --git a/home/text.asm b/home/text.asm
index a5ddf43c9..f7730319a 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -943,7 +943,7 @@ Text_START_ASM:: ; 14c9
 
 	bit 7, h
 	jr nz, .not_rom
-	jp [hl]
+	jp hl
 
 .not_rom
 	ld a, "@"
diff --git a/items/item_effects.asm b/items/item_effects.asm
index 3c2dc2457..c13568a5d 100644
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -263,7 +263,7 @@ ParkBall: ; e8a2
 	ld l, a
 	ld de, .skip_or_return_from_ball_fn
 	push de
-	jp [hl]
+	jp hl
 
 .skip_or_return_from_ball_fn
 	ld a, [CurItem]
@@ -512,7 +512,7 @@ ParkBall: ; e8a2
 	cp BATTLETYPE_TUTORIAL
 	jp z, .FinishTutorial
 
-	callba MobileFn_10607f
+	callba TrainerRankings_WildMonsCaught
 
 	ld hl, Text_GotchaMonWasCaught
 	call PrintText
diff --git a/macros.asm b/macros.asm
index c4fd73b3e..13aff261d 100644
--- a/macros.asm
+++ b/macros.asm
@@ -281,7 +281,7 @@ jumptable: MACRO
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 endm
 
 maskbits: macro
diff --git a/main.asm b/main.asm
index 735ba7154..3d7199a46 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, BANK[$B]
 
@@ -2830,7 +2830,7 @@ Special_CheckForLuckyNumberWinners: ; 4d87a
 	ld a, [ScriptVar]
 	and a
 	ret z ; found nothing
-	callba MobileFn_1060cd
+	callba TrainerRankings_LuckyNumberShow
 	ld a, [wFoundMatchingIDInParty]
 	and a
 	push af
@@ -3214,7 +3214,7 @@ CatchTutorial:: ; 4e554
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .dw ; 4e564 (13:6564)
 	dw .DudeTutorial
@@ -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, BANK[$19]
 
@@ -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/maps/BillsHouse.asm b/maps/BillsHouse.asm
index 0eefa4fdd..9a0aae54b 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -8,7 +8,7 @@ BillsHouse_MapScriptHeader:
 .MapCallbacks:
 	db 0
 
-GrampsScript_0x189538:
+BillsGrandpa:
 	faceplayer
 	opentext
 	checkevent EVENT_GAVE_KURT_APRICORNS
@@ -74,7 +74,7 @@ GrampsScript_0x189538:
 
 .GotWaterStone:
 	checkver
-	iftrue .Crystal11
+	iftrue .AskVulpix
 	writetext BillsGrandpaGrowlitheText
 	buttonsound
 	writetext BillsGrandpaAskToSeeMonText
@@ -88,7 +88,7 @@ GrampsScript_0x189538:
 	setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
 	jump .ShowedGrowlitheVulpix
 
-.Crystal11:
+.AskVulpix:
 	writetext BillsGrandpaVulpixText
 	buttonsound
 	writetext BillsGrandpaAskToSeeMonText
@@ -370,4 +370,4 @@ BillsHouse_MapEventHeader:
 
 .PersonEvents:
 	db 1
-	person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x189538, -1
+	person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BillsGrandpa, -1
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 593269cb8..c49c522fc 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -313,7 +313,7 @@ ElmsLabHealingMachine:
 	end
 
 ElmsLabHealingMachine_HealParty:
-	special Mobile_HealParty
+	special TrainerRankings_Healings
 	special HealParty
 	playmusic MUSIC_NONE
 	writebyte 1 ; Machine is in Elm's Lab
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index 536515dd7..76933c600 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -71,7 +71,7 @@ FastShipBed:
 	closetext
 	special Special_FadeBlackQuickly
 	special Special_ReloadSpritesNoPalettes
-	special Mobile_HealParty
+	special TrainerRankings_Healings
 	special HealParty
 	playmusic MUSIC_HEAL
 	pause 60
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 109322ad6..7c5628955 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -43,7 +43,7 @@ MapMobileBattleRoomSignpost0Script:
 	special RestartMapMusic
 	refreshscreen $0
 .two_
-	special Mobile_HealParty
+	special TrainerRankings_Healings
 	special HealParty
 	special Function10383c
 	iftrue .false
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index 3ac76807c..6449ad404 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -115,7 +115,7 @@ MrPokemonsHouse_OakScript:
 	special Special_FadeBlackQuickly
 	special Special_ReloadSpritesNoPalettes
 	playmusic MUSIC_HEAL
-	special Mobile_HealParty
+	special TrainerRankings_Healings
 	special HealParty
 	pause 60
 	special Special_FadeInQuickly
diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm
index 7dd01776a..050493637 100644
--- a/maps/Route26HealSpeechHouse.asm
+++ b/maps/Route26HealSpeechHouse.asm
@@ -16,7 +16,7 @@ TeacherScript_0x7b125:
 	closetext
 	special Special_FadeBlackQuickly
 	special Special_ReloadSpritesNoPalettes
-	special Mobile_HealParty
+	special TrainerRankings_Healings
 	playmusic MUSIC_HEAL
 	special HealParty
 	pause 60
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 3091a0233..25994fc92 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -172,7 +172,7 @@ LanceHealsCommon:
 	waitbutton
 	closetext
 	special FadeOutPalettes
-	special Mobile_HealParty
+	special TrainerRankings_Healings
 	playsound SFX_FULL_HEAL
 	special HealParty
 	special FadeInPalettes
diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm
index da14a5ac8..4d996167f 100755
--- a/misc/battle_tower_5c.asm
+++ b/misc/battle_tower_5c.asm
@@ -222,7 +222,7 @@ _BattleTowerBattle: ; 17022c
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 170249
 
 .dw ; 170249
@@ -243,7 +243,7 @@ RunBattleTowerTrainer: ; 17024d
 
 	xor a
 	ld [wLinkMode], a
-	callba Mobile_HealParty
+	callba TrainerRankings_Healings
 	callba HealParty
 	call ReadBTTrainerParty
 	call Clears5_a89a
@@ -692,7 +692,7 @@ Function1704e1: ; 1704e1
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 17051f
 
 .dw ; 17051f
@@ -947,7 +947,7 @@ BattleTowerAction: ; 170687
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 170696
 
 
@@ -1443,7 +1443,7 @@ Function1709bb: ; 1709bb (5c:49bb) BattleTowerAction $10
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .invalid
 	ld a, $5
diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm
index 14ef91e9d..b471ff013 100755
--- a/misc/fixed_words.asm
+++ b/misc/fixed_words.asm
@@ -2516,7 +2516,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Jumptable:
 	dw .zero
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/gfx_41.asm b/misc/gfx_41.asm
index e3a1a0375..952742ec1 100755
--- a/misc/gfx_41.asm
+++ b/misc/gfx_41.asm
@@ -240,7 +240,7 @@ CallInSafeGFXMode: ; 104177
 ; 10419c
 
 ._hl_ ; 10419c
-	jp [hl]
+	jp hl
 ; 10419d
 
 
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index 54160ca08..3c7a34710 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -5452,7 +5452,7 @@ Function102423: ; 102423
 	call Function102921
 	ret nc
 	callba SaveAfterLinkTrade
-	callba MobileFn_1060af
+	callba TrainerRankings_Trades
 	callba BackupMobileEventIndex
 	ld hl, wcd4b
 	set 1, [hl]
diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm
index b68336a28..ff661b1bc 100755
--- a/misc/mobile_41.asm
+++ b/misc/mobile_41.asm
@@ -1,50 +1,63 @@
 SECTION "bank41_2", ROMX, BANK[$41]
 
-Mobile_HallOfFame2:: mobile ; 0x105ef6
+; These functions deal with miscellaneous statistics
+; which were used for Trainer Rankings in Pokémon News.
+
+; Copies certain values at the time the player enters the Hall of Fame.
+TrainerRankings_HallOfFame2:: mobile ; 0x105ef6
 	ld a, $5
 	call GetSRAMBank
+
 	ld hl, GameTimeHours
-	ld de, $a001
+	ld de, sTrainerRankingGameTimeHOF
 	ld bc, 4
 	call CopyBytes
-	ld hl, $a010
-	ld de, $a005
+
+	ld hl, sTrainerRankingStepCount
+	ld de, sTrainerRankingStepCountHOF
 	ld bc, 4
 	call CopyBytes
-	ld hl, $a039
-	ld de, $a009
+
+	; sTrainerRankingHealings is only a 3-byte value.
+	; One extraneous byte is copied from sTrainerRankingMysteryGift.
+	ld hl, sTrainerRankingHealings
+	ld de, sTrainerRankingHealingsHOF
 	ld bc, 4
 	call CopyBytes
-	ld hl, $a01b
-	ld de, $a00d
+
+	ld hl, sTrainerRankingBattles
+	ld de, sTrainerRankingBattlesHOF
 	ld bc, 3
 	call CopyBytes
-	call Function106162
+
+	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
 ; 105f33
 
-MagikarpLength_Mobile: mobile ; 105f33
+TrainerRankings_MagikarpLength: mobile ; 105f33
 	ld a, $5
 	call GetSRAMBank
 	ld de, Buffer1
-	ld hl, $a07b
+	ld hl, sTrainerRankingLongestMagikarp
+
+	; Is this Magikarp the longest measured?
 	ld a, [de]
 	cp [hl]
-	jr z, .asm_105f47
-	jr nc, .asm_105f4f
-	jr .asm_105f55
+	jr z, .isLowByteHigher
+	jr nc, .newRecordLongest
+	jr .checkShortest
 
-.asm_105f47
+.isLowByteHigher
 	inc hl
 	inc de
 	ld a, [de]
 	cp [hl]
 	dec hl
 	dec de
-	jr c, .asm_105f55
+	jr c, .checkShortest
 
-.asm_105f4f
+.newRecordLongest
 	ld a, [de]
 	inc de
 	ld [hli], a
@@ -52,150 +65,157 @@ MagikarpLength_Mobile: mobile ; 105f33
 	dec de
 	ld [hl], a
 
-.asm_105f55
-	ld hl, $a07d
+.checkShortest
+	; First, check if the record for shortest Magikarp is 0.
+	; This seems unnecessary, because the value is initialized to 100.0 cm.
+	ld hl, sTrainerRankingShortestMagikarp
 	ld a, [hli]
 	or [hl]
 	dec hl
-	jr z, .asm_105f6d
+	jr z, .newRecordShortest
+
+	; Now check if this Magikarp is the shortest
 	ld a, [de]
 	cp [hl]
-	jr z, .asm_105f65
-	jr c, .asm_105f6d
-	jr .asm_105f72
+	jr z, .isLowByteLower
+	jr c, .newRecordShortest
+	jr .done
 
-.asm_105f65
+.isLowByteLower
 	inc hl
 	inc de
 	ld a, [de]
 	cp [hl]
-	jr nc, .asm_105f72
+	jr nc, .done
 	dec hl
 	dec de
 
-.asm_105f6d
+.newRecordShortest
 	ld a, [de]
 	inc de
 	ld [hli], a
 	ld a, [de]
 	ld [hl], a
 
-.asm_105f72
-	call Function106162
+.done
+	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
 ; 105f79
 
-MobileFn_105f79: mobile ; 105f79
+TrainerRankings_BugContestScore: mobile ; 105f79
 	ld a, $5
 	call GetSRAMBank
 	ld a, [hProduct]
-	ld hl, $a07f
+	ld hl, sTrainerRankingBugContestScore
 	cp [hl]
-	jr z, .asm_105f8b
-	jr nc, .asm_105f92
-	jr .asm_105f98
+	jr z, .isLowByteHigher
+	jr nc, .newHighScore
+	jr .done
 
-.asm_105f8b
+.isLowByteHigher
 	inc hl
 	ld a, [hMultiplicand]
 	cp [hl]
-	jr c, .asm_105f98
+	jr c, .done
 	dec hl
 
-.asm_105f92
+.newHighScore
 	ld a, [hProduct]
 	ld [hli], a
 	ld a, [hMultiplicand]
 	ld [hl], a
 
-.asm_105f98
-	call Function106162
+.done
+	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
 ; 105f9f
 
-MobileFn_105f9f: mobile ; 105f9f
+TrainerRankings_AddToSlotsWinStreak: mobile ; 105f9f
 	ld a, $5
 	call GetSRAMBank
-	ld hl, $a070
+
+	; Increment the current streak
+	ld hl, sTrainerRankingCurrentSlotsStreak + 1
 	inc [hl]
-	jr nz, .asm_105fae
+	jr nz, .noCarry
 	dec hl
 	inc [hl]
 	inc hl
 
-.asm_105fae
+.noCarry
 	dec hl
-	ld a, [$a071]
+	; Now check if this is a new record for longest streak
+	ld a, [sTrainerRankingLongestSlotsStreak]
 	cp [hl]
-	jr z, .asm_105fb9
-	jr c, .asm_105fc1
-	jr .asm_105fc9
+	jr z, .isLowByteHigher
+	jr c, .newRecordStreak
+	jr .done
 
-.asm_105fb9
+.isLowByteHigher
 	inc hl
-	ld a, [$a072]
+	ld a, [sTrainerRankingLongestSlotsStreak + 1]
 	cp [hl]
-	jr nc, .asm_105fc9
+	jr nc, .done
 	dec hl
 
-.asm_105fc1
+.newRecordStreak
 	ld a, [hli]
-	ld [$a071], a
+	ld [sTrainerRankingLongestSlotsStreak], a
 	ld a, [hl]
-	ld [$a072], a
+	ld [sTrainerRankingLongestSlotsStreak + 1], a
 
-.asm_105fc9
-	call Function106162
+.done
+	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
 ; 105fd0
 
-MobileFn_105fd0: mobile ; 105fd0
+TrainerRankings_EndSlotsWinStreak: mobile ; 105fd0
 	ld a, $5
 	call GetSRAMBank
-	ld hl, $a06f
+	ld hl, sTrainerRankingCurrentSlotsStreak
 	xor a
 	ld [hli], a
 	ld [hl], a
-	call Function106162
+	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
 ; 105fe3
 
-MobileFn_105fe3: mobile ; 105fe3
+TrainerRankings_AddToSlotsPayouts: mobile ; 105fe3
 	ld a, $5
 	call GetSRAMBank
-	ld hl, $a076
+	ld hl, sTrainerRankingTotalSlotsPayouts + 3
 	ld a, e
 	add [hl]
 	ld [hld], a
 	ld a, d
 	adc [hl]
 	ld [hld], a
-	jr nc, .asm_106001
+	jr nc, .done
 	inc [hl]
-	jr nz, .asm_106001
+	jr nz, .done
 	dec hl
 	inc [hl]
-	jr nz, .asm_106001
+	jr nz, .done
 	ld a, $ff
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
 
-.asm_106001
-	call Function106162
+.done
+	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
 ; 106008
 
-MobileFn_106008: mobile ; 106008
+TrainerRankings_AddToBattlePayouts: mobile ; 106008
 	ld a, $5
 	call GetSRAMBank
-	ld hl, $a07a
+	ld hl, sTrainerRankingTotalBattlePayouts + 3
 	ld a, [bc]
 	dec bc
 	add [hl]
@@ -207,189 +227,195 @@ MobileFn_106008: mobile ; 106008
 	ld a, [bc]
 	adc [hl]
 	ld [hld], a
-	jr nc, .asm_106027
+	jr nc, .done
 	inc [hl]
-	jr nz, .asm_106027
+	jr nz, .done
 	ld a, $ff
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
 
-.asm_106027
-	call Function106162
+.done
+	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
 ; 10602e
 
-MobileFn_10602e: mobile ; 10602e (41:602e)
-	ld hl, $a010
-	jp MobileFn_106117
+TrainerRankings_StepCount: mobile ; 10602e (41:602e)
+	ld hl, sTrainerRankingStepCount
+	jp TrainerRankings_Increment4Byte
 
-MobileFn_106035: mobile ; 106035
+; Unreferenced in English version.
+TrainerRankings_BattleTowerWins: mobile ; 106035
 	ld a, $5
 	call GetSRAMBank
 	ld a, [$aa8d]
 	and a
 	call CloseSRAM
 	ret nz
-	ld hl, $a014
-	jp Function106123
+	ld hl, sTrainerRankingBattleTowerWins
+	jp TrainerRankings_Increment2Byte
 
-MobileFn_106049: mobile ; 106049
-	ld hl, $a018
-	jp Function10611d
+TrainerRankings_TMsHMsTaught: mobile ; 106049
+	ld hl, sTrainerRankingTMsHMsTaught
+	jp TrainerRankings_Increment3Byte
 
-MobileFn_106050: mobile ; 106050
+TrainerRankings_Battles: mobile ; 106050
 	ld a, [BattleType]
-	cp BATTLETYPE_TUTORIAL
+	cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle
 	ret z
-	ld hl, $a01b
-	jp Function10611d
+	ld hl, sTrainerRankingBattles
+	jp TrainerRankings_Increment3Byte
 
-MobileFn_10605d: mobile ; 10605d
+TrainerRankings_WildBattles: mobile ; 10605d
 	ld a, [BattleType]
-	cp BATTLETYPE_TUTORIAL
+	cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle
 	ret z
-	ld hl, $a01e
-	jp Function10611d
+	ld hl, sTrainerRankingWildBattles
+	jp TrainerRankings_Increment3Byte
 
-MobileFn_10606a: mobile ; 10606a
-	ld hl, $a021
-	jp Function10611d
+TrainerRankings_TrainerBattles: mobile ; 10606a
+	ld hl, sTrainerRankingTrainerBattles
+	jp TrainerRankings_Increment3Byte
 
-MobileFn_106071: mobile ; 106071
-	ld hl, $a024
-	jp Function10611d
+TrainerRankings_Unused1: mobile ; 106071
+	ld hl, sTrainerRankingUnused1
+	jp TrainerRankings_Increment3Byte
 
-Mobile_HallOfFame:: mobile ; 0x106078
-	ld hl, $a027
-	jp Function10611d
+TrainerRankings_HallOfFame:: mobile ; 0x106078
+	ld hl, sTrainerRankingHOFEntries
+	jp TrainerRankings_Increment3Byte
 
-MobileFn_10607f: mobile ; 10607f (41:607f)
-	ld hl, $a02a
-	jp Function10611d
+TrainerRankings_WildMonsCaught: mobile ; 10607f (41:607f)
+	ld hl, sTrainerRankingWildMonsCaught
+	jp TrainerRankings_Increment3Byte
 
-MobileFn_106086: mobile ; 106086
-	ld hl, $a02d
-	jp Function10611d
+TrainerRankings_HookedEncounters: mobile ; 106086
+	ld hl, sTrainerRankingHookedEncounters
+	jp TrainerRankings_Increment3Byte
 
-MobileFn_10608d: mobile ; 10608d (41:608d)
-	ld hl, $a030
-	jp Function10611d
+TrainerRankings_EggsHatched: mobile ; 10608d (41:608d)
+	ld hl, sTrainerRankingEggsHatched
+	jp TrainerRankings_Increment3Byte
 
-MobileFn_106094: mobile ; 106094
-	ld hl, $a033
-	jp Function10611d
+TrainerRankings_MonsEvolved: mobile ; 106094
+	ld hl, sTrainerRankingMonsEvolved
+	jp TrainerRankings_Increment3Byte
 
-MobileFn_10609b: mobile ; 10609b
-	ld hl, $a036
-	jp Function10611d
+TrainerRankings_FruitPicked: mobile ; 10609b
+	ld hl, sTrainerRankingFruitPicked
+	jp TrainerRankings_Increment3Byte
 
-Mobile_HealParty: mobile ; 1060a2
-	ld hl, $a039
-	jp Function10611d
+TrainerRankings_Healings: mobile ; 1060a2
+	ld hl, sTrainerRankingHealings
+	jp TrainerRankings_Increment3Byte
 
-MobileFn_1060a9: mobile ; 1060a9 (41:60a9)
-	ld hl, $a03c
-	jr Function10611d
+TrainerRankings_MysteryGift: mobile ; 1060a9 (41:60a9)
+	ld hl, sTrainerRankingMysteryGift
+	jr TrainerRankings_Increment3Byte
 
-MobileFn_1060af: mobile ; 1060af
-	ld hl, $a03f
-	jr Function10611d
+TrainerRankings_Trades: mobile ; 1060af
+	ld hl, sTrainerRankingTrades
+	jr TrainerRankings_Increment3Byte
 
-MobileFn_1060b5: mobile ; 1060b5
-	ld hl, $a042
-	jr Function10611d
+TrainerRankings_Fly: mobile ; 1060b5
+	ld hl, sTrainerRankingFly
+	jr TrainerRankings_Increment3Byte
 
-MobileFn_1060bb: mobile ; 1060bb
-	ld hl, $a045
-	jr Function10611d
+TrainerRankings_Surf: mobile ; 1060bb
+	ld hl, sTrainerRankingSurf
+	jr TrainerRankings_Increment3Byte
 
-MobileFn_1060c1: mobile ; 1060c1
-	ld hl, $a048
-	jr Function10611d
+TrainerRankings_Waterfall: mobile ; 1060c1
+	ld hl, sTrainerRankingWaterfall
+	jr TrainerRankings_Increment3Byte
 
-MobileFn_1060c7: mobile ; 1060c7
-	ld hl, $a04b
-	jr Function10611d
+TrainerRankings_WhiteOuts: mobile ; 1060c7
+	ld hl, sTrainerRankingWhiteOuts
+	jr TrainerRankings_Increment3Byte
 
-MobileFn_1060cd: mobile ; 1060cd
-	ld hl, $a04e
-	jr Function106123
+TrainerRankings_LuckyNumberShow: mobile ; 1060cd
+	ld hl, sTrainerRankingLuckyNumberShow
+	jr TrainerRankings_Increment2Byte
 
-MobileFn_1060d3: mobile ; 1060d3
-	ld hl, $a051
-	jr Function10611d
+TrainerRankings_PhoneCalls: mobile ; 1060d3
+	ld hl, sTrainerRankingPhoneCalls
+	jr TrainerRankings_Increment3Byte
 
-MobileFn_1060d9: mobile ; 1060df
-	ld hl, $a054
-	jr Function10611d
+TrainerRankings_Unused2: mobile ; 1060df
+	ld hl, sTrainerRankingUnused2
+	jr TrainerRankings_Increment3Byte
 
-MobileFn_1060df: mobile ; 1060df
-	ld hl, $a057
-	jr Function10611d
+TrainerRankings_LinkBattles: mobile ; 1060df
+	ld hl, sTrainerRankingLinkBattles
+	jr TrainerRankings_Increment3Byte
 
-MobileFn_1060e5: mobile ; 1060e5
+TrainerRankings_Splash: mobile ; 1060e5
+	; Only counts if it’s the player’s turn
 	ld a, [hBattleTurn]
 	and a
 	ret nz
-	ld hl, $a05a
-	jr Function10611d
+	ld hl, sTrainerRankingSplash
+	jr TrainerRankings_Increment3Byte
 
-MobileFn_1060ef: mobile ; 1060ef
-	ld hl, $a05d
-	jr Function10611d
+TrainerRankings_TreeEncounters: mobile ; 1060ef
+	ld hl, sTrainerRankingTreeEncounters
+	jr TrainerRankings_Increment3Byte
 
-MobileFn_1060f5: mobile ; 1060f5
-	ld hl, $a060
-	jr Function10611d
+TrainerRankings_Unused3: mobile ; 1060f5
+	ld hl, sTrainerRankingUnused3
+	jr TrainerRankings_Increment3Byte
 
-MobileFn_SaveBattleResult_Win: mobile ; win
-	ld hl, $a063
-	jr Function10611d
+TrainerRankings_ColosseumWins: mobile ; win
+	ld hl, sTrainerRankingColosseumWins
+	jr TrainerRankings_Increment3Byte
 
-MobileFn_SaveBattleResult_Lose: mobile ; lose
-	ld hl, $a066
-	jr Function10611d
+TrainerRankings_ColosseumLosses: mobile ; lose
+	ld hl, sTrainerRankingColosseumLosses
+	jr TrainerRankings_Increment3Byte
 ; 106107
 
-MobileFn_SaveBattleResult_Draw: mobile ; draw
-	ld hl, $a069
-	jr Function10611d
+TrainerRankings_ColosseumDraws: mobile ; draw
+	ld hl, sTrainerRankingColosseumDraws
+	jr TrainerRankings_Increment3Byte
 ; 10610d
 
-MobileFn_10610d: mobile ; 10610d
+; Counts uses of both SelfDestruct and Explosion.
+TrainerRankings_SelfDestruct: mobile ; 10610d
+	; Only counts if it’s the player’s turn
 	ld a, [hBattleTurn]
 	and a
 	ret nz
-	ld hl, $a06c
-	jr Function10611d
+	ld hl, sTrainerRankingSelfDestruct
+	jr TrainerRankings_Increment3Byte
 ; 106117
 
-MobileFn_106117: ; 106117
+TrainerRankings_Increment4Byte: ; 106117
 	push bc
 	ld bc, 3
-	jr Function10612d
+	jr TrainerRankings_Increment
 ; 10611d
 
-Function10611d: ; 10611d
+TrainerRankings_Increment3Byte: ; 10611d
 	push bc
 	ld bc, 2
-	jr Function10612d
+	jr TrainerRankings_Increment
 ; 106123
 
-Function106123: ; 106123
+TrainerRankings_Increment2Byte: ; 106123
 	push bc
 	ld bc, 1
-	jr Function10612d
+	jr TrainerRankings_Increment
 ; 106129
 
-Function106129: ; 106129
+; unused
+TrainerRankings_Increment1Byte: ; 106129
 	push bc
 	ld bc, 0
 
-Function10612d: ; 10612d
+; Increments a big-endian value of bc + 1 bytes at hl
+TrainerRankings_Increment: ; 10612d
 	ld a, $5
 	call GetSRAMBank
 	push hl
@@ -419,24 +445,25 @@ Function10612d: ; 10612d
 	jr .asm_106142
 
 .asm_10614d
-	call Function106162
+	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	pop bc
 	ret
 ; 106155
 
-MobileFn_106155: mobile ; 106155
+; Used when SRAM bank 5 isn’t already loaded — what’s the point of this?
+UpdateTrainerRankingsChecksum2: mobile ; 106155
 	ld a, $5
 	call GetSRAMBank
-	call Function106162
+	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
 ; 106162
 
-Function106162: ; 106162
+UpdateTrainerRankingsChecksum: ; 106162
 	push de
-	call Function10616e
-	ld hl, $a081 ; s5_a081
+	call CalculateTrainerRankingsChecksum
+	ld hl, sTrainerRankingsChecksum
 	ld [hl], d
 	inc hl
 	ld [hl], e
@@ -444,10 +471,10 @@ Function106162: ; 106162
 	ret
 ; 10616e
 
-Function10616e: ; 10616e
+CalculateTrainerRankingsChecksum: ; 10616e
 	push bc
-	ld hl, $a001 ; s5_a001
-	ld bc, $80
+	ld hl, sTrainerRankings
+	ld bc, sTrainerRankingsChecksum - sTrainerRankings
 	xor a
 	ld de, 0
 .asm_106179
@@ -495,9 +522,10 @@ RestoreMobileEventIndex: ; 10619d (41:619d)
 	ret
 ; 1061b3 (41:61b3)
 
-Function1061b3: ; 1061b3
-	call Function10616e
-	ld hl, $a081 ; s5_a081
+; Unreferenced in English version.
+VerifyTrainerRankingsChecksum: ; 1061b3
+	call CalculateTrainerRankingsChecksum
+	ld hl, sTrainerRankingsChecksum
 	ld a, d
 	cp [hl]
 	ret nz
@@ -516,19 +544,24 @@ DeleteMobileEventIndex: ; 1061c0 (41:61c0)
 	ret
 ; 1061cd (41:61cd)
 
-Function1061cd: ; unreferenced
-	ld hl, $a001
-	ld bc, $82
+; Used in the Japanese version to initialize Trainer Rankings data
+; for a new save file. Unreferenced in the English version.
+InitializeTrainerRankings:
+	ld hl, sTrainerRankings
+	ld bc, sTrainerRankingsEnd - sTrainerRankings
 	xor a
 	call ByteFill
-	ld hl, $a07d
+
+	; Initialize the shortest Magikarp to 100.0 cm
+	ld hl, sTrainerRankingShortestMagikarp
 	ld a, $3
 	ld [hli], a
 	ld [hl], $e8
-	call Function106162
-	ld hl, $a001
-	ld de, $a084
-	ld bc, $82
+
+	call UpdateTrainerRankingsChecksum
+	ld hl, sTrainerRankings
+	ld de, sTrainerRankingsBackup
+	ld bc, sTrainerRankingsEnd - sTrainerRankings
 	call CopyBytes
 	ret
 ; 1061ef
@@ -1083,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_42.asm b/misc/mobile_42.asm
index 60f9e6d66..d08bc8882 100644
--- a/misc/mobile_42.asm
+++ b/misc/mobile_42.asm
@@ -377,7 +377,7 @@ MobileTradeAnim_JumptableLoop: ; 10824b
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 10828a
 
 .Jumptable: ; 10828a
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index 10242b77e..41f106211 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -146,7 +146,7 @@ Function114243:: ; 114243
 	ld h, [hl]
 	ld l, a
 	pop de
-	jp [hl]
+	jp hl
 
 ; 11425c
 
@@ -5397,7 +5397,7 @@ Function11659d: ; 11659d
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 ; 1165af
 
@@ -6931,7 +6931,7 @@ Function117719: ; 117719 (45:7719)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 Jumptable_117728: ; 117728 (45:7728)
 	dw Function117738
@@ -7419,7 +7419,7 @@ Function117ae9: ; 0x117ae9
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .Jumptable: ; 0x117af8
 	dw Function117b06
diff --git a/misc/mobile_45_sprite_engine.asm b/misc/mobile_45_sprite_engine.asm
index d0183b2ca..57c45e43c 100755
--- a/misc/mobile_45_sprite_engine.asm
+++ b/misc/mobile_45_sprite_engine.asm
@@ -380,7 +380,7 @@ Function1161b8: ; 1161b8
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 ; 1161c7
 
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index 644989872..7d0003b13 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -5874,7 +5874,7 @@ Function11ad6e: ; 11ad6e
 	ld a, [wJumptableIndex]
 	ld hl, Jumptable_11ad78
 	call Function11b239
-	jp [hl]
+	jp hl
 ; 11ad78
 
 Jumptable_11ad78: ; 11ad78
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index b057e8c66..34bdb15ad 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -373,7 +373,7 @@ Function171a36: ; 171a36 (5c:5a36)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 Jumptable_171a45: ; 171a45 (5c:5a45)
 	dw Function171a95
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index dd4dbb6dc..47b85dcd8 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -1146,7 +1146,7 @@ Function17d711:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 asm_17d721
 	call Function17e5af
@@ -3098,7 +3098,7 @@ Function17e3c3: ; 17e3c3
 	push af
 	ld a, $1
 	ld [rSVBK], a
-	callba MobileFn_106155
+	callba UpdateTrainerRankingsChecksum2
 	callba BackupMobileEventIndex
 	pop af
 	ld [rSVBK], a
@@ -3746,7 +3746,7 @@ Function17f047: ; 17f047
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 .finished
 	scf
diff --git a/predef/cgb.asm b/predef/cgb.asm
index b0c3fdb46..5ac243963 100644
--- a/predef/cgb.asm
+++ b/predef/cgb.asm
@@ -25,7 +25,7 @@ Predef_LoadSGBLayoutCGB: ; 8d59
 	ld l, a
 	ld de, .ReturnFromJumpTable
 	push de
-	jp [hl]
+	jp hl
 ; 8d79
 
 .ReturnFromJumpTable: ; 8d79
@@ -491,7 +491,7 @@ _CGB07: ; 9122
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 ; 912d
 
 Jumptable_912d: ; 912d
diff --git a/predef/crystal.asm b/predef/crystal.asm
index 8f542e5dd..9aa0fbdf2 100755
--- a/predef/crystal.asm
+++ b/predef/crystal.asm
@@ -17,7 +17,7 @@ GetMysteryGift_MobileAdapterLayout: ; 4930f (mobile)
 	ld l, a
 	ld de, .done
 	push de
-	jp [hl]
+	jp hl
 .done
 	ret
 ; 49330 (12:5330)
diff --git a/predef/sgb.asm b/predef/sgb.asm
index 65a09756d..1d8184cc2 100644
--- a/predef/sgb.asm
+++ b/predef/sgb.asm
@@ -20,7 +20,7 @@ Predef_LoadSGBLayout: ; 864c
 	ld l, a
 	ld de, .Finish
 	push de
-	jp [hl]
+	jp hl
 ; 866f
 
 .Jumptable: ; 866f
diff --git a/rst.asm b/rst.asm
index c54dc83e2..24c00a03a 100644
--- a/rst.asm
+++ b/rst.asm
@@ -28,7 +28,7 @@ SECTION "rst28",ROM0[JumpTable]
 	ld h, [hl]
 	ld l, a
 	pop de
-	jp [hl]
+	jp hl
 
 ; SECTION "rst30",ROM0[$30]
 ; rst30 is midst rst28
diff --git a/scan_includes.py b/scan_includes.py
deleted file mode 100644
index 60929d3fe..000000000
--- a/scan_includes.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/python
-# coding: utf-8
-
-"""
-Recursively scan an asm file for dependencies.
-"""
-
-import sys
-import argparse
-
-includes = set()
-
-def scan_file(filename):
-	for line in open(filename):
-		if 'INC' not in line:
-			continue
-		line = line.split(';')[0]
-		if 'INCLUDE' in line:
-			include = line.split('"')[1]
-			includes.add(include)
-			scan_file(include)
-		elif 'INCBIN' in line:
-			include = line.split('"')[1]
-			includes.add(include)
-
-def main():
-	ap = argparse.ArgumentParser()
-	ap.add_argument('filenames', nargs='*')
-	args = ap.parse_args()
-	for filename in set(args.filenames):
-		scan_file(filename)
-	sys.stdout.write(' '.join(includes))
-
-if __name__ == '__main__':
-	main()
diff --git a/tilesets/animations.asm b/tilesets/animations.asm
index a3b0c4f06..51f95129c 100644
--- a/tilesets/animations.asm
+++ b/tilesets/animations.asm
@@ -32,7 +32,7 @@ _AnimateTileset:: ; fc000
 	ld h, [hl]
 	ld l, a
 
-	jp [hl]
+	jp hl
 ; fc01b
 
 Tileset00Anim: ; 0xfc01b
diff --git a/tools/Makefile b/tools/Makefile
new file mode 100644
index 000000000..57a4d84ce
--- /dev/null
+++ b/tools/Makefile
@@ -0,0 +1,16 @@
+.PHONY: all
+
+CFLAGS := -std=c99
+
+all: \
+	lzcomp \
+	png_dimensions \
+	scan_includes \
+	palette \
+	pokemon_animation \
+	pokemon_animation_graphics \
+	gfx
+	@:
+
+%: %.c
+	$(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..0e6864e91
--- /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) {
+	fprintf(stderr, message);
+	fprintf(stderr, "\n");
+}
+
+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
new file mode 100644
index 000000000..1b7b32a5d
--- /dev/null
+++ b/tools/lzcomp.c
@@ -0,0 +1,404 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+
+#define COMPRESSION_METHODS 72
+
+struct command {
+  unsigned command: 3;
+  unsigned count:  12;
+  signed value:    17;
+};
+
+int main(int, char **);
+void error_exit(int, const char *, ...);
+void bit_flip(const unsigned char *, unsigned short, unsigned char *);
+unsigned char * read_file_into_buffer(const char *, unsigned short *);
+void write_commands_to_file(const char *, const struct command *, unsigned, const unsigned char *);
+void write_command_to_file(FILE *, struct command, const unsigned char *);
+struct command * compress(const unsigned char *, unsigned short *);
+struct command * try_compress(const unsigned char *, const unsigned char *, unsigned short *, unsigned);
+struct command find_best_copy(const unsigned char *, unsigned short, unsigned short, const unsigned char *, unsigned);
+unsigned short scan_forwards(const unsigned char *, unsigned short, const unsigned char *, unsigned short, short *);
+unsigned short scan_backwards(const unsigned char *, unsigned short, unsigned short, short *);
+struct command find_best_repetition(const unsigned char *, unsigned short, unsigned short);
+struct command pick_best_command(unsigned, struct command, ...);
+int is_better(struct command, struct command);
+short command_size(struct command);
+void optimize(struct command *, unsigned short);
+void repack(struct command **, unsigned short *);
+struct command * select_command_sequence(struct command **, const unsigned short *, unsigned, unsigned short *);
+struct command * merge_command_sequences(const struct command *, unsigned short, const struct command *, unsigned short, unsigned short *);
+unsigned short compressed_length(const struct command *, unsigned short);
+
+int main (int argc, char ** argv) {
+  if (argc < 3) {
+    fprintf(stderr, "usage: %s <source file> <compressed output>\n", *argv);
+    return 3;
+  }
+  unsigned short size;
+  unsigned char * file_buffer = read_file_into_buffer(argv[1], &size);
+  struct command * compressed = compress(file_buffer, &size);
+  write_commands_to_file(argv[2], compressed, size, file_buffer);
+  free(file_buffer);
+  free(compressed);
+  return 0;
+}
+
+void error_exit (int error_code, const char * error, ...) {
+  va_list ap;
+  va_start(ap, error);
+  fputs("error: ", stderr);
+  vfprintf(stderr, error, ap);
+  fputc('\n', stderr);
+  exit(error_code);
+}
+
+void bit_flip (const unsigned char * data, unsigned short length, unsigned char * result) {
+  unsigned char new_value, pos;
+  while (length --) {
+    new_value = 0;
+    for (pos = 0; pos < 8; pos ++) new_value |= ((*data >> pos) & 1) << (7 - pos);
+    *(result ++) = new_value;
+    data ++;
+  }
+}
+
+unsigned char * read_file_into_buffer (const char * file, unsigned short * size) {
+  FILE * fp = fopen(file, "rb");
+  if (!fp) error_exit(1, "could not open file %s for reading", file);
+  unsigned char * buf = malloc(32769);
+  int rv = fread(buf, 1, 32769, fp);
+  fclose(fp);
+  if (rv < 0) error_exit(1, "could not read from file %s", file);
+  if (rv > 32768) error_exit(1, "file %s is too big", file);
+  *size = rv;
+  return buf;
+}
+
+void write_commands_to_file (const char * file, const struct command * commands, unsigned count, const unsigned char * input_stream) {
+  FILE * fp = fopen(file, "wb");
+  if (!fp) error_exit(1, "could not open file %s for writing", file);
+  while (count --) write_command_to_file(fp, *(commands ++), input_stream);
+  unsigned char terminator = -1;
+  if (fwrite(&terminator, 1, 1, fp) != 1) error_exit(1, "could not write terminator to compressed output");
+  fclose(fp);
+}
+
+void write_command_to_file (FILE * fp, struct command command, const unsigned char * input_stream) {
+  if ((!command.count) || (command.count > 1024)) error_exit(2, "invalid command in output stream");
+  unsigned char buf[4];
+  unsigned char * pos = buf;
+  int n;
+  command.count --;
+  if (command.count < 32)
+    *(pos ++) = (command.command << 5) + command.count;
+  else {
+    *(pos ++) = 224 + (command.command << 2) + (command.count >> 8);
+    *(pos ++) = command.count;
+  }
+  switch (command.command) {
+    case 1: case 2:
+      if ((command.value < 0) || (command.value >= (1 << (command.command << 3)))) error_exit(2, "invalid command in output stream");
+      for (n = 0; n < command.command; n ++) *(pos ++) = command.value >> (n << 3);
+    case 0: case 3:
+      break;
+    default:
+      if ((command.value < -128) || (command.value > 32767)) error_exit(2, "invalid command in output stream");
+      if (command.value < 0)
+        *(pos ++) = command.value ^ 127;
+      else {
+        *(pos ++) = command.value >> 8;
+        *(pos ++) = command.value;
+      }
+  }
+  if (fwrite(buf, 1, pos - buf, fp) != (pos - buf)) error_exit(1, "could not write command to compressed output");
+  if (command.command) return;
+  command.count ++;
+  if (fwrite(input_stream + command.value, 1, command.count, fp) != command.count) error_exit(1, "could not write data to compressed output");
+}
+
+struct command * compress (const unsigned char * data, unsigned short * size) {
+  unsigned char * bitflipped = malloc(*size);
+  bit_flip(data, *size, bitflipped);
+  struct command * compressed_sequences[COMPRESSION_METHODS];
+  unsigned short lengths[COMPRESSION_METHODS];
+  unsigned current;
+  for (current = 0; current < COMPRESSION_METHODS; current ++) {
+    lengths[current] = *size;
+    compressed_sequences[current] = try_compress(data, bitflipped, lengths + current, current);
+  }
+  free(bitflipped);
+  struct command * result = select_command_sequence(compressed_sequences, lengths, COMPRESSION_METHODS, size);
+  for (current = 0; current < COMPRESSION_METHODS; current ++) free(compressed_sequences[current]);
+  return result;
+}
+
+struct command * try_compress (const unsigned char * data, const unsigned char * bitflipped, unsigned short * length, unsigned flags) {
+  struct command * commands = malloc(sizeof(struct command) * *length);
+  memset(commands, -1, sizeof(struct command) * *length);
+  struct command * current_command = commands;
+  unsigned short position = 0, previous_data = 0;
+  unsigned char lookahead = 0, lookahead_flag = (flags >> 3) % 3;
+  struct command copy, repetition;
+  while (position < *length) {
+    copy = find_best_copy(data, position, *length, bitflipped, flags);
+    repetition = find_best_repetition(data, position, *length);
+    if (flags & 1)
+      *current_command = pick_best_command(2, repetition, copy);
+    else
+      *current_command = pick_best_command(2, copy, repetition);
+    *current_command = pick_best_command(2, (struct command) {.command = 0, .count = 1, .value = position}, *current_command);
+    if (flags & 2) {
+      if (previous_data && (previous_data != 32) && (previous_data != 1024) && (command_size(*current_command) == current_command -> count))
+        *current_command = (struct command) {.command = 0, .count = 1, .value = position};
+    }
+    if (lookahead_flag) {
+      if (lookahead >= lookahead_flag)
+        lookahead = 0;
+      else if (current_command -> command) {
+        lookahead ++;
+        *current_command = (struct command) {.command = 0, .count = 1, .value = position};
+      }
+    }
+    if (current_command -> command)
+      previous_data = 0;
+    else
+      previous_data += current_command -> count;
+    position += (current_command ++) -> count;
+  }
+  optimize(commands, current_command - commands);
+  repack(&commands, length);
+  return commands;
+}
+
+struct command find_best_copy (const unsigned char * data, unsigned short position, unsigned short length, const unsigned char * bitflipped, unsigned flags) {
+  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))
+    simple = (struct command) {.command = 4, .count = count, .value = 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))
+    backwards = (struct command) {.command = 6, .count = count, .value = offset};
+  struct command command;
+  switch (flags / 24) {
+    case 0: command = pick_best_command(3, simple, backwards, flipped); break;
+    case 1: command = pick_best_command(3, backwards, flipped, simple); break;
+    case 2: command = pick_best_command(3, flipped, backwards, simple);
+  }
+  if ((flags & 4) && (command.count > 32)) command.count = 32;
+  return command;
+}
+
+unsigned short scan_forwards (const unsigned char * target, unsigned short limit, const unsigned char * source, unsigned short real_position, short * offset) {
+  unsigned short best_match, best_length = 0;
+  unsigned short current_length;
+  unsigned short position;
+  for (position = 0; position < real_position; position ++) {
+    if (source[position] != *target) continue;
+    for (current_length = 0; (current_length < limit) && (source[position + current_length] == target[current_length]); current_length ++);
+    if (current_length > 1024) current_length = 1024;
+    if (current_length < best_length) continue;
+    best_match = position;
+    best_length = current_length;
+  }
+  if (!best_length) return 0;
+  if ((best_match + 128) >= real_position)
+    *offset = best_match - real_position;
+  else
+    *offset = best_match;
+  return best_length;
+}
+
+unsigned short scan_backwards (const unsigned char * data, unsigned short limit, unsigned short real_position, short * offset) {
+  if (real_position < limit) limit = real_position;
+  unsigned short best_match, best_length = 0;
+  unsigned short current_length;
+  unsigned short position;
+  for (position = 0; position < real_position; position ++) {
+    if (data[position] != data[real_position]) continue;
+    for (current_length = 0; (current_length < limit) && (data[position - current_length] == data[real_position + current_length]); current_length ++);
+    if (current_length > 1024) current_length = 1024;
+    if (current_length < best_length) continue;
+    best_match = position;
+    best_length = current_length;
+  }
+  if (!best_length) return 0;
+  if ((best_match + 128) >= real_position)
+    *offset = best_match - real_position;
+  else
+    *offset = best_match;
+  return best_length;
+}
+
+struct command find_best_repetition (const unsigned char * data, unsigned short position, unsigned short length) {
+  if ((position + 1) >= length) return data[position] ? ((struct command) {.command = 7}) : ((struct command) {.command = 3, .count = 1});
+  unsigned char value[2] = {data[position], data[position + 1]};
+  unsigned repcount, limit = length - position;
+  if (limit > 1024) limit = 1024;
+  for (repcount = 2; (repcount < limit) && (data[position + repcount] == value[repcount & 1]); repcount ++);
+  struct command result;
+  result.count = repcount;
+  if (*value != value[1]) {
+    if (!*value && (repcount < 3)) return (struct command) {.command = 3, .count = 1};
+    result.command = 2;
+    result.value = ((unsigned) (*value)) | (((unsigned) (value[1])) << 8);
+  } else if (*value) {
+    result.command = 1;
+    result.value = *value;
+  } else
+    result.command = 3;
+  return result;
+}
+
+struct command pick_best_command (unsigned count, struct command command, ...) {
+  struct command result = command;
+  va_list ap;
+  va_start(ap, command);
+  while (-- count) {
+    command = va_arg(ap, struct command);
+    if (is_better(command, result)) result = command;
+  }
+  va_end(ap);
+  return result;
+}
+
+int is_better (struct command new, struct command old) {
+  if (new.command == 7) return 0;
+  if (old.command == 7) return 1;
+  short new_savings = new.count - command_size(new), old_savings = old.count - command_size(old);
+  return new_savings > old_savings;
+}
+
+short command_size (struct command command) {
+  short header_size = 1 + (command.count > 32);
+  if (command.command & 4) return header_size + 1 + (command.value >= 0);
+  return header_size + command.command[(short []) {command.count, 1, 2, 0}];
+}
+
+void optimize (struct command * commands, unsigned short count) {
+  while (count && (commands -> command == 7)) commands ++, count --;
+  if (count < 2) return;
+  struct command * end = commands + count;
+  struct command * next = commands + 1;
+  while (next < end) {
+    if (next -> command == 7) goto skip;
+    if (
+        !(commands -> command) &&
+        (command_size(*next) == next -> count) &&
+        ((commands -> count + next -> count) <= 1024) &&
+        ((commands -> count > 32) || ((commands -> count + next -> count) <= 32))
+       ) {
+      commands -> count += next -> count;
+      next -> command = 7;
+      goto skip;
+    }
+    if (next -> command != commands -> command) goto accept;
+    switch (commands -> command) {
+      case 0:
+        if ((commands -> value + commands -> count) != next -> value) break;
+        commands -> count += next -> count;
+        next -> command = 7;
+        if (commands -> count <= 1024) goto skip;
+        next -> command = 0;
+        next -> value = commands -> value + 1024;
+        next -> count = commands -> count - 1024;
+        commands -> count = 1024;
+        break;
+      case 1:
+        if (commands -> value != next -> value) break;
+      case 3:
+        if ((commands -> count + next -> count) <= 1024) {
+          commands -> count += next -> count;
+          next -> command = 7;
+          goto skip;
+        }
+        next -> count = (commands -> count + next -> count) - 1024;
+        commands -> count = 1024;
+        break;
+    }
+    accept:
+    commands = next;
+    skip:
+    next ++;
+  }
+}
+
+void repack (struct command ** commands, unsigned short * length) {
+  struct command * new_commands = malloc(sizeof(struct command) * *length);
+  struct command * current = new_commands;
+  unsigned short p;
+  for (p = 0; p < *length; p ++) if (p[*commands].command != 7) *(current ++) = p[*commands];
+  free(*commands);
+  *commands = new_commands;
+  *length = current - new_commands;
+}
+
+struct command * select_command_sequence (struct command ** sequences, const unsigned short * lengths, unsigned count, unsigned short * final_length) {
+  unsigned short min_sequence = 0, min_length = compressed_length(*sequences, *lengths);
+  unsigned short seq, len;
+  for (seq = 1; seq < count; seq ++) {
+    len = compressed_length(sequences[seq], lengths[seq]);
+    if (len < min_length) {
+      min_sequence = seq;
+      min_length = len;
+    }
+  }
+  *final_length = lengths[min_sequence];
+  struct command * current = malloc(*final_length * sizeof(struct command));
+  memcpy(current, sequences[min_sequence], *final_length * sizeof(struct command));
+  struct command * new;
+  for (seq = 1; seq < count; seq ++) {
+    new = merge_command_sequences(current, *final_length, sequences[(seq + min_sequence) % count], lengths[(seq + min_sequence) % count], final_length);
+    free(current);
+    current = new;
+  }
+  return current;
+}
+
+struct command * merge_command_sequences (const struct command * current, unsigned short current_length, const struct command * new, unsigned short new_length,
+                                          unsigned short * result_length) {
+  struct command * result = malloc(sizeof(struct command) * (current_length + new_length));
+  struct command * current_command = result;
+  const struct command * saved_current;
+  const struct command * saved_new;
+  unsigned short current_pos, new_pos;
+  while (current_length) {
+    if (current -> count == new -> count) {
+      *(current_command ++) = pick_best_command(2, *(current ++), *(new ++));
+      current_length --;
+      continue;
+    }
+    saved_current = current;
+    saved_new = new;
+    current_pos = (current ++) -> count;
+    new_pos = (new ++) -> count;
+    current_length --;
+    while (current_pos != new_pos)
+      if (current_pos < new_pos) {
+        current_pos += (current ++) -> count;
+        current_length --;
+      } else
+        new_pos += (new ++) -> count;
+    current_pos = compressed_length(saved_current, current - saved_current);
+    new_pos = compressed_length(saved_new, new - saved_new);
+    if (new_pos < current_pos) {
+      memcpy(current_command, saved_new, sizeof(struct command) * (new - saved_new));
+      current_command += new - saved_new;
+    } else {
+      memcpy(current_command, saved_current, sizeof(struct command) * (current - saved_current));
+      current_command += current - saved_current;
+    }
+  }
+  *result_length = current_command - result;
+  return result;
+}
+
+unsigned short compressed_length (const struct command * commands, unsigned short count) {
+  unsigned short current, total = 0;
+  for (current = 0; current < count; current ++) if (commands[current].command != 7) total += command_size(commands[current]);
+  return total;
+}
diff --git a/tools/palette.c b/tools/palette.c
new file mode 100644
index 000000000..39837a096
--- /dev/null
+++ b/tools/palette.c
@@ -0,0 +1,90 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <getopt.h>
+
+void usage(void) {
+	printf("Usage: palette palfile\n");
+	exit(1);
+}
+
+void print_rgb(uint16_t word) {
+	int r, g, b;
+	r = word & 0x1f;
+	g = (word >> 5) & 0x1f;
+	b = (word >> 10) & 0x1f;
+	printf("\tRGB %2d, %2d, %2d\n", r, g, b);
+}
+
+void print_pokemon_palette(char* palette_filename) {
+	FILE* f;
+	uint8_t bytes[4];
+
+	f = fopen(palette_filename, "rb");
+	if (f == NULL) {
+		fprintf(stderr, "failed to open file %s\n", palette_filename);
+		exit(1);
+	}
+
+	fseek(f, 2, SEEK_SET);
+	fread(bytes, 1, 4, f);
+	fclose(f);
+
+	print_rgb((bytes[1] << 8) | bytes[0]);
+	print_rgb((bytes[3] << 8) | bytes[2]);
+}
+
+void print_palette(char* palette_filename) {
+	FILE* f;
+	uint8_t* bytes;
+	long size;
+	int i;
+
+	f = fopen(palette_filename, "rb");
+	if (f == NULL) {
+		fprintf(stderr, "failed to open file %s\n", palette_filename);
+		exit(1);
+	}
+
+	fseek(f, 0, SEEK_END);
+	size = ftell(f);
+	rewind(f);
+
+	bytes = malloc(size);
+
+	fseek(f, 0, SEEK_SET);
+	fread(bytes, 1, size, f);
+	fclose(f);
+
+	for (i = 0; i + 1 < size; i += 2) {
+		print_rgb((bytes[i + 1] << 8) | bytes[i]);
+	}
+}
+
+int main(int argc, char* argv[]) {
+	int ch;
+	bool pokemon;
+
+	while ((ch = getopt(argc, argv, "p")) != -1) {
+		switch (ch) {
+			case 'p':
+				pokemon = true;
+				break;
+			default:
+				usage();
+		}
+	}
+	argc -= optind;
+	argv += optind;
+	if (argc < 1) {
+		usage();
+	}
+	if (pokemon) {
+		print_pokemon_palette(argv[0]);
+	} else {
+		print_palette(argv[0]);
+	}
+	return 0;
+}
diff --git a/tools/png_dimensions.c b/tools/png_dimensions.c
new file mode 100644
index 000000000..5bdc12e4c
--- /dev/null
+++ b/tools/png_dimensions.c
@@ -0,0 +1,53 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+void usage(void) {
+	fprintf(stderr, "Usage: png_dimensions infile, outfile\n");
+	exit(1);
+}
+
+void output_dimensions(char* png_filename, char* out_filename) {
+	FILE* f;
+	int width, height;
+	int i;
+	uint8_t bytes[4];
+	uint8_t output;
+
+	f = fopen(png_filename, "rb");
+	if (f == NULL) {
+		fprintf(stderr, "failed to open file %s\n", png_filename);
+		exit(1);
+	}
+
+	// width
+	fseek(f, 16, SEEK_SET);
+	fread(bytes, 1, 4, f);
+	fclose(f);
+
+	width = 0;
+	for (i = 0; i < 4; i++) {
+		width |= bytes[i] << (8 * (3 - i));
+	}
+	width >>= 3;
+	height = width;
+
+	output = width & 0xf;
+	output |= (height & 0xf) << 4;
+
+	f = fopen(out_filename, "wb");
+	if (f == NULL) {
+		fprintf(stderr, "failed to open file %s\n", out_filename);
+		exit(1);
+	}
+	fwrite(&output, 1, 1, f);
+	fclose(f);
+}
+
+int main(int argc, char* argv[]) {
+	if (argc < 3) {
+		usage();
+	}
+	output_dimensions(argv[1], argv[2]);
+	return 0;
+}
diff --git a/tools/pokemon_animation.c b/tools/pokemon_animation.c
new file mode 100644
index 000000000..0728788ec
--- /dev/null
+++ b/tools/pokemon_animation.c
@@ -0,0 +1,269 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <getopt.h>
+
+struct Frame {
+	uint8_t* data;
+	int size;
+	int bitmask;
+};
+
+struct Frames {
+	struct Frame* frames;
+	int num_frames;
+	int frame_size;
+};
+
+struct Bitmask {
+	uint8_t* data;
+	int bitlength;
+};
+
+struct Bitmasks {
+	struct Bitmask* bitmasks;
+	int num_bitmasks;
+};
+
+
+void make_frames(struct Frames* frames, struct Bitmasks* bitmasks, char* tilemap_filename, char* dimensions_filename);
+int bitmask_exists(struct Bitmask *bitmask, struct Bitmasks *bitmasks);
+void print_frames(struct Frames* frames);
+
+
+void make_frames(struct Frames* frames, struct Bitmasks* bitmasks, char* tilemap_filename, char* dimensions_filename) {
+	uint8_t* tilemap;
+	uint8_t* this_frame;
+	FILE* f;
+	long size;
+	int width;
+	int height;
+	uint8_t byte;
+	int frame_size;
+	int num_frames;
+	int i, j;
+
+	f = fopen(tilemap_filename, "rb");
+	if (f == NULL) {
+		fprintf(stderr, "could not open file %s", tilemap_filename);
+		exit(1);
+	}
+
+	fseek(f, 0, SEEK_END);
+	size = ftell(f);
+	rewind(f);
+
+	tilemap = malloc(size);
+	fread(tilemap, 1, size, f);
+	fclose(f);
+
+	f = fopen(dimensions_filename, "rb");
+	if (f == NULL) {
+		fprintf(stderr, "could not open file %s", dimensions_filename);
+		exit(1);
+	}
+	fread(&byte, 1, 1, f);
+	fclose(f);
+
+	width = byte & 0xf;
+	height = byte >> 4;
+
+	frame_size = width * height;
+
+	num_frames = size / frame_size - 1;
+	//fprintf(stderr, "num_frames: %d\n", num_frames);
+
+	bitmasks->bitmasks = malloc((sizeof (struct Bitmask)) * num_frames);
+	bitmasks->num_bitmasks = 0;
+
+	frames->frames = malloc((sizeof (struct Frame)) * num_frames);
+	frames->frame_size = frame_size;
+	frames->num_frames = 0;
+
+	uint8_t *first_frame = tilemap;
+	this_frame = tilemap + frame_size;
+	for (i = 0; i < num_frames; i++) {
+		struct Frame *frame = (struct Frame*)malloc(sizeof(struct Frame));
+		frame->data = malloc(frame_size);
+		frame->size = 0;
+		struct Bitmask *bitmask = (struct Bitmask*)malloc(sizeof(struct Bitmask));
+		bitmask->data = calloc((frame_size + 7) / 8, 1);
+		bitmask->bitlength = 0;
+		for (j = 0; j < frame_size; j++) {
+			if (bitmask->bitlength % 8 == 0) {
+				bitmask->data[bitmask->bitlength / 8] = 0;
+			}
+			bitmask->data[bitmask->bitlength / 8] >>= 1;
+			if (this_frame[j] != first_frame[j]) {
+				frame->data[frame->size] = this_frame[j];
+				frame->size++;
+				bitmask->data[bitmask->bitlength / 8] |= (1 << 7);
+			}
+			bitmask->bitlength++;
+		}
+		// I don't remember exactly why this works.
+		// I think it was that the bits are read backwards, but not indexed backwards.
+		int last = bitmask->bitlength - 1;
+		bitmask->data[last / 8] >>= (7 - (last % 8));
+
+		frame->bitmask = bitmask_exists(bitmask, bitmasks);
+		if (frame->bitmask == -1) {
+			frame->bitmask = bitmasks->num_bitmasks;
+			bitmasks->bitmasks[bitmasks->num_bitmasks] = *bitmask;
+			bitmasks->num_bitmasks++;
+		} else {
+			free(bitmask->data);
+			free(bitmask);
+		}
+		frames->frames[i] = *frame;
+		frames->num_frames++;
+		this_frame += frame_size;
+	}
+
+	//for (i = 0; i < frames->num_frames; i++) {
+		//free(frames->frames[i].data);
+		//free(frames->frames[i]);
+	//}
+	//free(frames->frames);
+
+	//fprintf(stderr, "num bitmasks: %d", bitmasks->num_bitmasks);
+	//for (i = 0; i < bitmasks->num_bitmasks; i++) {
+	//	free(bitmasks->bitmasks[i].data);
+	//	fprintf(stderr, "freed bitmask %d\n", i);
+		//free(bitmasks->bitmasks[i]);
+	//}
+	//free(bitmasks->bitmasks);
+	//fprintf(stderr, "freed bitmasks\n");
+
+	free(tilemap);
+}
+
+int bitmask_exists(struct Bitmask *bitmask, struct Bitmasks *bitmasks) {
+	int i, j;
+	struct Bitmask existing;
+	for (i = 0; i < bitmasks->num_bitmasks; i++) {
+		existing = bitmasks->bitmasks[i];
+		if (bitmask->bitlength != existing.bitlength) {
+			continue;
+		}
+		bool match = true;
+		for (j = 0; j < (bitmask->bitlength + 7) / 8; j++) {
+			if (bitmask->data[j] != existing.data[j]) {
+				match = false;
+				break;
+			}
+		}
+		if (match) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+void print_frames(struct Frames* frames) {
+	int i;
+	int j;
+	for (i = 0; i < frames->num_frames; i++) {
+		printf("\tdw .frame%d\n", i + 1);
+	}
+	for (i = 0; i < frames->num_frames; i++) {
+		struct Frame *frame = &frames->frames[i];
+		printf(".frame%d\n", i + 1);
+		printf("\tdb $%02x ; bitmask\n", frame->bitmask);
+		if (frame->size > 0) {
+			for (j = 0; j < frame->size; j++) {
+				if (j % 12 == 0) {
+					if (j) {
+						printf("\n");
+					}
+					printf("\tdb $%02x", frame->data[j]);
+				} else {
+					printf(", $%02x", frame->data[j]);
+				}
+			}
+			printf("\n");
+		}
+	}
+}
+
+void print_bitmasks(struct Bitmasks* bitmasks) {
+	int i, j, k;
+	int length;
+	struct Bitmask bitmask;
+	for (i = 0; i < bitmasks->num_bitmasks; i++) {
+		printf("; %d\n", i);
+		bitmask = bitmasks->bitmasks[i];
+		length = (bitmask.bitlength + 7) / 8;
+		for (j = 0; j < length; j++) {
+			printf("\tdb %%");
+			for (k = 0; k < 8; k++) {
+				if ((bitmask.data[j] >> (7 - k)) & 1) {
+					printf("1");
+				} else {
+					printf("0");
+				};
+			}
+			printf("\n");
+		}
+	}
+}
+
+// HOW ARE YOU GENTLEMEN.
+char* cats (char* head, char* tail) {
+	char* string;
+	string = malloc(strlen(head) + strlen(tail) + 1);
+	strcpy(string, head);
+	strcat(string, tail);
+	return string;
+}
+
+static void usage(void) {
+	printf("Usage: pokemon_animation [-b] [-f] tilemap_file dimensions_file\n");
+	exit(1);
+}
+
+int main(int argc, char* argv[]) {
+	struct Frames frames = {0};
+	struct Bitmasks bitmasks = {0};
+	int ch;
+	bool use_bitmasks, use_frames;
+	char* tilemap_filename;
+	char* dimensions_filename;
+
+	while ((ch = getopt(argc, argv, "bf")) != -1) {
+		switch (ch) {
+			case 'b':
+				use_bitmasks = true;
+				break;
+			case 'f':
+				use_frames = true;
+				break;
+			default:
+				usage();
+		}
+	}
+	argc -= optind;
+	argv += optind;
+	if (argc < 2) {
+		usage();
+	}
+	tilemap_filename = argv[0];
+	dimensions_filename = argv[1];
+
+	//ext = strrchr(argv[3], '.');
+	//if (!ext || ext == argv[3]) {
+	//	fprintf(stderr, "need a file extension to determine what to write to %s", argv[3]);
+	//}
+
+	make_frames(&frames, &bitmasks, tilemap_filename, dimensions_filename);
+	if (use_frames) {
+		print_frames(&frames);
+	}
+	if (use_bitmasks) {
+		print_bitmasks(&bitmasks);
+	}
+	return 0;
+}
diff --git a/tools/pokemon_animation_graphics.c b/tools/pokemon_animation_graphics.c
new file mode 100644
index 000000000..f38850fb0
--- /dev/null
+++ b/tools/pokemon_animation_graphics.c
@@ -0,0 +1,237 @@
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdbool.h>
+#include <getopt.h>
+#include <stdint.h>
+
+static void usage(void) {
+	printf("Usage: pokemon_animation_graphics [-o outfile] [-t mapfile] 2bpp_file dimensions_file\n");
+	exit(1);
+}
+
+struct Options {
+	int girafarig;
+};
+
+struct Options Options = {0};
+
+
+struct Tilemap {
+	uint8_t* data;
+	int size;
+};
+
+struct Graphic {
+	uint8_t* data;
+	int size;
+};
+
+void transpose_tiles(uint8_t* tiles, int width, int size, int tile_size) {
+	int i;
+	int j;
+	uint8_t* new_tiles;
+	new_tiles = malloc(size);
+	for (i = 0; i < size; i++) {
+		j = i / tile_size * width * tile_size;
+		j = j % size + tile_size * (j / size) + i % tile_size;
+		new_tiles[j] = tiles[i];
+	}
+	memcpy(tiles, new_tiles, size);
+	free(new_tiles);
+}
+
+bool compare_tile(uint8_t *tile, uint8_t *other) {
+	int j;
+	for (j = 0; j < 16; j++) {
+		if (tile[j] != other[j]) {
+			return false;
+		}
+	}
+	return true;
+}
+
+int get_tile_index(uint8_t* tile, uint8_t* tiles, int num_tiles, int preferred_tile_id) {
+	if (preferred_tile_id >= 0 && preferred_tile_id < num_tiles) {
+		uint8_t *other = &tiles[preferred_tile_id * 16];
+		if (compare_tile(tile, other)) {
+			return preferred_tile_id;
+		}
+	}
+	int i;
+	for (i = 0; i < num_tiles; i++) {
+		uint8_t *other = &tiles[i * 16];
+		if (compare_tile(tile, other)) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+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;
+}
+
+void create_tilemap(struct Tilemap* tilemap, struct Graphic* graphic, char* graphics_filename, int width, int height) {
+	long graphics_size;
+	uint8_t* graphics;
+	FILE* f;
+	int i;
+	int tile;
+
+	f = fopen_verbose(graphics_filename, "rb");
+	if (!f) {
+		exit(1);
+	}
+	fseek(f, 0, SEEK_END);
+	graphics_size = ftell(f);
+	rewind(f);
+	graphics = malloc(graphics_size);
+	fread(graphics, 1, graphics_size, f);
+	fclose(f);
+
+	int num_tiles_per_frame = width * height;
+	int tile_size = 16;
+	int num_frames = graphics_size / (tile_size * num_tiles_per_frame);
+	int frame_size = num_tiles_per_frame * tile_size;
+
+	// transpose each frame
+	for (i = 0; i < num_frames; i++) {
+		transpose_tiles(graphics + i * frame_size, width, frame_size, tile_size);
+	}
+
+	// first frame is naively populated with redundant tiles,
+	// so fill it unconditionally and start from the second frame
+	int num_tiles = width * height;
+	int tilemap_size = graphics_size / tile_size;
+	tilemap->data = malloc(tilemap_size * 2);
+	for (i = 0; i < num_tiles; i++) {
+		tilemap->data[tilemap->size] = i;
+		tilemap->size++;
+	}
+	for (i = num_tiles; i < tilemap_size; i++) {
+		int preferred = i % num_tiles_per_frame;
+		int index = get_tile_index(graphics + i * tile_size, graphics, i, preferred);
+		if (Options.girafarig && index == 0) {
+			tile = num_tiles;
+		} else if (index == -1) {
+			tile = num_tiles++;
+		} else {
+			tile = tilemap->data[index];
+		}
+		tilemap->data[tilemap->size] = tile;
+		tilemap->size++;
+	}
+
+	int graphic_size = tilemap->size * 16;
+	if (Options.girafarig) {
+		// This is probably not needed, but just in case...
+		graphic_size += 16;
+	}
+
+	graphic->data = malloc(graphic_size);
+	graphic->size = 16 * width * height;
+	memcpy(graphic->data, graphics, graphic->size);
+	for (i = width * height; i < tilemap->size; i++) {
+		tile = get_tile_index(graphics + 16 * i, graphic->data, graphic->size / 16, i % num_tiles_per_frame);
+		if (tile == -1) {
+			memcpy(graphic->data + graphic->size, graphics + 16 * i, 16);
+			graphic->size += 16;
+		}
+	}
+	if (Options.girafarig) {
+		// Add a duplicate of tile 0 to the end.
+		memcpy(graphic->data + graphic->size, graphics, 16);
+		graphic->size += 16;
+	}
+
+	free(graphics);
+}
+
+int main(int argc, char* argv[]) {
+	int opt;
+	char* dimensions_filename;
+	char* graphics_filename;
+	char* outfile = NULL;
+	char* mapfile = NULL;
+	FILE* f;
+	long size;
+	uint8_t bytes[1];
+	int width;
+	int height;
+	struct Graphic graphic = {0};
+	struct Tilemap tilemap = {0};
+
+	while (1) {
+		struct option long_options[] = {
+			{"girafarig", no_argument, &Options.girafarig, 1},
+			{"tilemap", required_argument, 0, 't'},
+			{"output", required_argument, 0, 'o'},
+			{0}
+		};
+		int long_option_index = 0;
+		int opt = getopt_long(argc, argv, "o:t:", long_options, &long_option_index);
+		if (opt == -1) {
+			break;
+		}
+		switch (opt) {
+		case 0:
+			break;
+		case 'o':
+			outfile = optarg;
+			break;
+		case 't':
+			mapfile = optarg;
+			break;
+		default:
+			usage();
+			break;
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (argc < 2) {
+		usage();
+	}
+
+	graphics_filename = argv[0];
+	dimensions_filename = argv[1];
+
+	f = fopen_verbose(dimensions_filename, "rb");
+	if (!f) {
+		exit(1);
+	}
+	fread(bytes, 1, 1, f);
+	fclose(f);
+	width = bytes[0] & 0xf;
+	height = bytes[0] >> 4;
+
+	create_tilemap(&tilemap, &graphic, graphics_filename, width, height);
+
+	if (outfile) {
+		f = fopen_verbose(outfile, "wb");
+		if (f) {
+			fwrite(graphic.data, 1, graphic.size, f);
+			fclose(f);
+		}
+	}
+
+	if (mapfile) {
+		f = fopen_verbose(mapfile, "wb");
+		if (f) {
+			fwrite(tilemap.data, 1, tilemap.size, f);
+			fclose(f);
+		}
+	}
+
+	free(graphic.data);
+	free(tilemap.data);
+
+	return 0;
+}
diff --git a/tools/scan_includes.c b/tools/scan_includes.c
new file mode 100644
index 000000000..b6fcca03a
--- /dev/null
+++ b/tools/scan_includes.c
@@ -0,0 +1,130 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+#include <getopt.h>
+
+void usage(void) {
+	printf("Usage: scan_includes [-h] [-s] filename\n"
+	       "-h, --help\n"
+	       "    Print usage and exit\n"
+	       "-s, --strict\n"
+	       "    Fail if a file cannot be read\n");
+}
+
+struct Options {
+	bool help;
+	bool strict;
+};
+
+struct Options Options = {0};
+
+
+void scan_file(char* filename) {
+	FILE* f;
+	long size;
+	char* orig;
+	char* buffer;
+	char* include;
+	int length;
+
+	f = fopen(filename, "r");
+	if (!f) {
+		if (Options.strict) {
+			fprintf(stderr, "Could not open file: '%s'\n", filename);
+			exit(1);
+		} else {
+			return;
+		}
+	}
+
+	fseek(f, 0, SEEK_END);
+	size = ftell(f);
+	rewind(f);
+
+	buffer = malloc(size + 1);
+	orig = buffer;
+	fread(buffer, 1, size, f);
+	buffer[size] = '\0';
+	fclose(f);
+
+	for (; buffer && (buffer - orig < size); buffer++) {
+		if (buffer[0] == ';') {
+			buffer = strchr(buffer, '\n');
+			if (!buffer) {
+				fprintf(stderr, "%s: no newline at end of file\n", filename);
+				break;
+			}
+			continue;
+		}
+		bool is_include = false;
+		bool is_incbin = false;
+		if ((strncmp(buffer, "INCBIN", 6) == 0) || (strncmp(buffer, "incbin", 6) == 0)) {
+			is_incbin = true;
+		} else if ((strncmp(buffer, "INCLUDE", 7) == 0) || (strncmp(buffer, "include", 7) == 0)) {
+			is_include = true;
+		}
+		if (is_incbin || is_include) {
+			buffer = strchr(buffer, '"') + 1;
+			if (!buffer) {
+				break;
+			}
+			length = strcspn(buffer, "\"");
+			include = malloc(length + 1);
+			strncpy(include, buffer, length);
+			include[length] = '\0';
+			printf("%s ", include);
+			if (is_include) {
+				scan_file(include);
+			}
+			free(include);
+		}
+	}
+
+	free(orig);
+}
+
+void get_args(int argc, char *argv[]) {
+	while (1) {
+		struct option long_options[] = {
+			{"strict", no_argument, 0, 's'},
+			{"help", no_argument, 0, 'h'},
+			{0}
+		};
+		int i = 0;
+		int opt = getopt_long(argc, argv, "sh", long_options, &i);
+
+		if (opt == -1) {
+			break;
+		}
+
+		switch (opt) {
+		case 's':
+			Options.strict = true;
+			break;
+		case 'h':
+			Options.help = true;
+			break;
+		default:
+			usage();
+			exit(1);
+			break;
+		}
+	}
+}
+
+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);
+	}
+	scan_file(argv[0]);
+	return 0;
+}
diff --git a/trainers/read_party.asm b/trainers/read_party.asm
index c74d4c6dc..9b7727a84 100755
--- a/trainers/read_party.asm
+++ b/trainers/read_party.asm
@@ -68,7 +68,7 @@ ReadTrainerParty: ; 39771
 	ld l, a
 	ld bc, .done
 	push bc
-	jp [hl]
+	jp hl
 
 .done
 	jp ComputeTrainerReward