Finish disassembling bank $2e, miscellaneous pics cleanup.

author: entrpntr <entrpntr@gmail.com> 2020-04-01 20:58:12 -0400
committer: entrpntr <entrpntr@gmail.com> 2020-04-02 01:36:09 -0400
commit: 48e0d17b6a51344a07c679e17eb92a25fdb1882b (patch)
tree: 290a1e71a454c76d5a3baeb9cd4de32ac86989ca
parent: 90cdd19ae81c1f3446d64094018b3f1d705ce1cf (diff)
83 files changed, 1870 insertions, 2989 deletions
diff --git a/Makefile b/Makefile
index 87cf05e3..767f91ce 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,15 @@ home.o \
 main.o \
 wram.o \
 data/text/common.o \
-data/pokemon/dex_entries.o \
-gfx/pics.o
+data/pokemon/dex_entries.o
 
-gold_obj := $(rom_obj:.o=_gold.o)
-silver_obj := $(rom_obj:.o=_silver.o)
+# Distinguish asm files which are game-exclusive for building (*_[gold|silver].asm)
+gs_excl_asm := gfx/pics
+gold_excl_obj := $(addsuffix _gold.o,$(gs_excl_asm))
+silver_excl_obj := $(addsuffix _silver.o,$(gs_excl_asm))
+
+gold_obj := $(rom_obj:.o=_gold.o) $(gold_excl_obj)
+silver_obj := $(rom_obj:.o=_silver.o) $(silver_excl_obj)
 
 
 ### Build tools
@@ -45,7 +49,8 @@ silver: pokesilver.gbc
 
 clean:
 	rm -f $(roms) $(gold_obj) $(silver_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)
-	find gfx/pokemon gfx/trainers \( -name "*.png" -o -name "*.2bpp" \) -delete
+	find gfx -name "*.png" -delete
+	find gfx/pokemon gfx/trainers -name "*.2bpp" -delete
 	$(MAKE) clean -C tools/
 
 compare: $(roms)
@@ -72,8 +77,14 @@ ifeq (,$(filter clean tools,$(MAKECMDGOALS)))
 
 $(info $(shell $(MAKE) -C tools))
 
-$(foreach obj, $(gold_obj), $(eval $(call DEP,$(obj),$(obj:_gold.o=.asm))))
-$(foreach obj, $(silver_obj), $(eval $(call DEP,$(obj),$(obj:_silver.o=.asm))))
+# Dependencies for shared objects (drop _gold and _silver from asm file basenames)
+$(foreach obj, $(filter-out $(gold_excl_obj), $(gold_obj)), \
+	$(eval $(call DEP,$(obj),$(obj:_gold.o=.asm))))
+$(foreach obj, $(filter-out $(silver_excl_obj), $(silver_obj)), \
+	$(eval $(call DEP,$(obj),$(obj:_silver.o=.asm))))
+
+# Dependencies for game-exclusive objects (keep _gold and _silver in asm file basenames)
+$(foreach obj, $(gold_excl_obj) $(silver_excl_obj), $(eval $(call DEP,$(obj),$(obj:.o=.asm))))
 
 endif
 
@@ -93,14 +104,3 @@ pngs:
 	find . -iname "*.[12]bpp" -exec $(gfx) png  {} +
 	find . -iname "*.[12]bpp" -exec touch {} +
 	find . -iname "*.lz"      -exec touch {} +
-
-%.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 ;
-%.bin: ;
-%.blk: ;
-%.tilemap: ;
diff --git a/data/items/mail_items.asm b/data/items/mail_items.asm
new file mode 100644
index 00000000..388613d9
--- /dev/null
+++ b/data/items/mail_items.asm
@@ -0,0 +1,12 @@
+MailItems:
+	db FLOWER_MAIL
+	db SURF_MAIL
+	db LITEBLUEMAIL
+	db PORTRAITMAIL
+	db LOVELY_MAIL
+	db EON_MAIL
+	db MORPH_MAIL
+	db BLUESKY_MAIL
+	db MUSIC_MAIL
+	db MIRAGE_MAIL
+	db -1
diff --git a/data/wild/treemons.asm b/data/wild/treemons.asm
index 639b4607..f2687339 100644
--- a/data/wild/treemons.asm
+++ b/data/wild/treemons.asm
@@ -5,7 +5,7 @@ TreeMons:
 	dw TreeMonSet_Canyon
 	dw TreeMonSet_Rock
 	dw TreeMonSet_Unused
-	dw TreeMonSet_None
+	dw TreeMonSet_City
 
 ; Two tables each (common, rare).
 ; Structure:
@@ -13,6 +13,7 @@ TreeMons:
 
 TreeMonSet_None:
 TreeMonSet_Unused:
+TreeMonSet_City:
 ; common
 	db 50, VENONAT,    15
 	db 30, VENONAT,    15
diff --git a/engine/events/treemons.asm b/engine/events/treemons.asm
index 94782643..c96df83a 100644
--- a/engine/events/treemons.asm
+++ b/engine/events/treemons.asm
@@ -51,7 +51,7 @@ RockMonEncounter:
 	xor a
 	ret
 
-db $05 ; ????
+	db $05 ; ????
 
 GetTreeMonSet:
 ; Return carry and treemon set in a
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 42e93894..e270734d 100755
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -551,7 +551,7 @@ UltraBall: ; e926
 	ld b, $0
 	farcall NamingScreen
 	call RotateThreePalettesRight
-	call Functiond9e
+	call LoadStandardFont
 	pop hl
 	ld de, wStringBuffer1
 	call InitName
@@ -610,7 +610,7 @@ UltraBall: ; e926
 	ld hl, Text_SentToBillsPC ; $6e3f
 	call PrintText
 	call RotateThreePalettesRight
-	call Functiond9e
+	call LoadStandardFont
 	jr .end_ball_function
 
 .catch_bug_contest_mon
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index e7534472..40feb4ad 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -232,7 +232,7 @@ Function5bf7: ; 5bf7 (1:5bf7)
 	ldh [hMapAnims], a
 	call ClearTilemap
 	call LoadFontsExtra
-	call Functiond9e
+	call LoadStandardFont
 	call ClearWindowData
 	ret
 
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index ca0eb213..cd88ec28 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -818,7 +818,7 @@ Function11fde: ; 11fde (4:5fde)
 Function1201e: ; 1201e (4:601e)
 	call ClearSprites
 	callfar ClearAnimatedObjectBuffer
-	call Functiond9e
+	call LoadStandardFont
 	call LoadFontsExtra
 	ld de, NamingScreenGFX_MiddleLine ; $6232
 	ld hl, $8eb0
@@ -855,8 +855,8 @@ Function1201e: ; 1201e (4:601e)
 	ldh [hWX], a
 	ret
 
-NamingScreenGFX_Border: INCBIN "gfx/namingscreen/border.2bpp"
-NamingScreenGFX_Cursor: INCBIN "gfx/namingscreen/cursor.2bpp"
+NamingScreenGFX_Border: INCBIN "gfx/naming_screen/border.2bpp"
+NamingScreenGFX_Cursor: INCBIN "gfx/naming_screen/cursor.2bpp"
 
 NameInputLower:
 	db "a b c d e f g h i"
@@ -888,9 +888,9 @@ BoxNameInputUpper:
 	db "- ? ! ♂ ♀ / . , &"
 	db "lower  DEL   END "
 
-NamingScreenGFX_ED: INCBIN "gfx/namingscreen/ed.1bpp" ; leftover from gen 1
-NamingScreenGFX_MiddleLine: INCBIN "gfx/namingscreen/middleline.1bpp"
-NamingScreenGFX_UnderLine: INCBIN "gfx/namingscreen/underline.1bpp"
+NamingScreenGFX_ED: INCBIN "gfx/naming_screen/ed.1bpp" ; leftover from gen 1
+NamingScreenGFX_MiddleLine: INCBIN "gfx/naming_screen/middleline.1bpp"
+NamingScreenGFX_UnderLine: INCBIN "gfx/naming_screen/underline.1bpp"
 
 _ComposeMailMessage:
 	ld hl, wNamingScreenDestinationPointer
@@ -957,7 +957,7 @@ Function12267: ; 12267 (4:6267)
 	ld [hl], $4e
 	ret
 
-MailIcon: INCBIN "gfx/namingscreen/mail_icon.2bpp"
+MailIcon: INCBIN "gfx/naming_screen/mail_icon.2bpp"
 
 Function12341: ; 12341 (4:6341)
 	ld a, $21
diff --git a/engine/movie/gamefreak_presents.asm b/engine/movie/gamefreak_presents.asm
index 7e9519f4..51c7d2ac 100644
--- a/engine/movie/gamefreak_presents.asm
+++ b/engine/movie/gamefreak_presents.asm
@@ -41,9 +41,9 @@ Copyright_GFPresents: ; e49a8 (39:49a8)
 	call GFPresents_PlayFrame
 	jr nc, .loop
 
-	; high bits of wJumpTableIndex are recycled for some flags
+	; high bits of wJumptableIndex are recycled for some flags
 	; this was set if user canceled by pressing a button
-	ld a, [wJumpTableIndex]
+	ld a, [wJumptableIndex]
 	bit 6, a
 	jr nz, .canceled
 
@@ -77,7 +77,7 @@ GFPresents_Init: ; e49f3 (39:49f3)
 	ld [hl], a
 
 	xor a
-	ld [wJumpTableIndex], a
+	ld [wJumptableIndex], a
 	ld [$ce64], a
 	ld [wIntroSceneTimer], a
 	ldh [hSCX], a
@@ -102,9 +102,9 @@ GFPresents_PlayFrame: ; e4a37 (39:4a37)
 	and BUTTONS
 	jr nz, .pressed_button
 
-	; high bits of wJumpTableIndex are recycled for some flags
+	; high bits of wJumptableIndex are recycled for some flags
 	; this is set when the sequence finished
-	ld a, [wJumpTableIndex]
+	ld a, [wJumptableIndex]
 	bit 7, a
 	jr nz, .finish
 
@@ -118,8 +118,8 @@ GFPresents_PlayFrame: ; e4a37 (39:4a37)
 	ret
 
 .pressed_button
-	; high bits of wJumpTableIndex are recycled for some flags
-	ld hl, wJumpTableIndex
+	; high bits of wJumptableIndex are recycled for some flags
+	ld hl, wJumptableIndex
 	set 6, [hl]
 
 .finish
@@ -136,7 +136,7 @@ GFPresents_PlayFrame: ; e4a37 (39:4a37)
 GFPresents_HandleFrame: ; e4a6d (39:4a6d)
 ; Dispatch to the current scene handler
 
-	ld a, [wJumpTableIndex]
+	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
 	ld hl, .scenes
@@ -156,7 +156,7 @@ GFPresents_HandleFrame: ; e4a6d (39:4a6d)
 	dw GFPresents_SetDoneFlag
 
 GFPresents_NextScene: ; e4a88 (39:4a88)
-	ld hl, wJumpTableIndex
+	ld hl, wJumptableIndex
 	inc [hl]
 	ret
 
@@ -257,7 +257,7 @@ GFPresents_PlacePresents: ; e4af4 (39:4af4)
 GFPresents_SetDoneFlag: ; e4b0d (39:4b0d)
 ; Tell GFPresents_PlayFrame and TitleScreenFrame (01:63da) that we're finished.
 
-	ld hl, wJumpTableIndex
+	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
 
diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm
index f066ae4a..39873677 100644
--- a/engine/overworld/init_map.asm
+++ b/engine/overworld/init_map.asm
@@ -87,5 +87,5 @@ LoadFonts_NoOAMUpdate:: ; 65cb (1:65cb)
 	ld a, $90
 	ldh [hWY], a
 	call SafeUpdateSprites
-	call Functiond9e
+	call LoadStandardFont
 	ret
diff --git a/engine/pokemon/mail_2.asm b/engine/pokemon/mail_2.asm
new file mode 100644
index 00000000..8e808948
--- /dev/null
+++ b/engine/pokemon/mail_2.asm
@@ -0,0 +1,901 @@
+ReadPartyMonMail:
+	ld a, [wCurPartyMon]
+	ld hl, sPartyMail
+	ld bc, MAIL_STRUCT_LENGTH
+	call AddNTimes
+	ld d, h
+	ld e, l
+ReadAnyMail:
+	push de
+	call ClearBGPalettes
+	call ClearSprites
+	call ClearTilemap
+	call DisableLCD
+	call LoadFontsExtra
+	pop de
+	call .LoadGFX
+	call EnableLCD
+	call WaitBGMap
+	ld a, [wBuffer3]
+	ld e, a
+	farcall LoadMailPalettes
+	call SetPalettes
+	xor a
+	ldh [hJoyPressed], a
+	call .loop
+	call ClearBGPalettes
+	call DisableLCD
+	call LoadStandardFont
+	jp EnableLCD
+
+.loop
+	call GetJoypad
+	ldh a, [hJoyPressed]
+	and A_BUTTON | B_BUTTON | START
+	jr z, .loop
+	and START
+	jr nz, .pressed_start
+	ret
+
+.pressed_start
+	ld a, [wJumptableIndex]
+	push af
+	callfar PrintMailAndExit ; printer
+	pop af
+	ld [wJumptableIndex], a
+	jr .loop
+
+.LoadGFX:
+	ld h, d
+	ld l, e
+	push hl
+	ld a, BANK(sPartyMail)
+	call OpenSRAM
+	ld de, sPartyMon1MailAuthorID - sPartyMon1Mail
+	add hl, de
+	ld a, [hli]
+	ld [wBuffer1], a
+	ld a, [hli]
+	ld [wBuffer2], a
+	ld a, [hli]
+	ld [wCurPartySpecies], a
+	ld b, [hl]
+	call CloseSRAM
+	ld hl, MailGFXPointers
+	ld c, 0
+.loop2
+	ld a, [hli]
+	cp b
+	jr z, .got_pointer
+	cp -1
+	jr z, .invalid
+	inc c
+	inc hl
+	inc hl
+	jr .loop2
+
+.invalid
+	ld hl, MailGFXPointers
+	inc hl
+
+.got_pointer
+	ld a, c
+	ld [wBuffer3], a
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	ld de, .done
+	pop bc
+	push de
+	jp hl
+.done
+	ret
+
+MailGFXPointers:
+	dbw FLOWER_MAIL,  LoadFlowerMailGFX
+	dbw SURF_MAIL,    LoadSurfMailGFX
+	dbw LITEBLUEMAIL, LoadLiteBlueMailGFX
+	dbw PORTRAITMAIL, LoadPortraitMailGFX
+	dbw LOVELY_MAIL,  LoadLovelyMailGFX
+	dbw EON_MAIL,     LoadEonMailGFX
+	dbw MORPH_MAIL,   LoadMorphMailGFX
+	dbw BLUESKY_MAIL, LoadBlueSkyMailGFX
+	dbw MUSIC_MAIL,   LoadMusicMailGFX
+	dbw MIRAGE_MAIL,  LoadMirageMailGFX
+	db -1
+
+LoadSurfMailGFX:
+	push bc
+	ld hl, vTiles2 tile $31
+	ld de, SurfMailBorderGFX
+	ld c, 8 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, MailLaprasGFX
+	ld c, 6 * LEN_1BPP_TILE
+	call LoadMailGFX_Color3
+	ld de, SurfMailWaveGFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	jr FinishLoadingSurfLiteBlueMailGFX
+
+LoadLiteBlueMailGFX:
+	push bc
+	ld hl, vTiles2 tile $31
+	ld de, LiteBlueMailBorderGFX
+	ld c, 8 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, MailDratiniGFX
+	ld c, 6 * LEN_1BPP_TILE
+	call LoadMailGFX_Color3
+	ld de, PortraitMailUnderlineGFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+
+FinishLoadingSurfLiteBlueMailGFX:
+	ld de, SurfLiteBlueMailSmallShapesGFX
+	ld c, 2 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld c, 2 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+	ld de, SurfLiteBlueMailLargeShapesGFX
+	ld c, 8 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+	ld c, 8 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+
+	call DrawMailBorder
+	hlcoord 2, 15
+	ld a, $3f
+	call Mail_Draw16TileRow
+	ld a, $39
+	hlcoord 15, 14
+	call Mail_Draw3x2Graphic
+	ld a, $44
+	hlcoord 2, 2
+	call Mail_Draw2x2Graphic
+	hlcoord 15, 11
+	call Mail_Draw2x2Graphic
+	ld a, $4c
+	hlcoord 3, 12
+	call Mail_Draw2x2Graphic
+	hlcoord 15, 2
+	call Mail_Draw2x2Graphic
+	ld a, $50
+	hlcoord 6, 3
+	call Mail_Draw2x2Graphic
+	ld a, $40
+	hlcoord 13, 2
+	ld [hli], a
+	hlcoord 6, 14
+	ld [hl], a
+	ld a, $41
+	hlcoord 4, 5
+	ld [hli], a
+	hlcoord 17, 5
+	ld [hli], a
+	hlcoord 13, 12
+	ld [hl], a
+	ld a, $42
+	hlcoord 9, 2
+	ld [hli], a
+	hlcoord 14, 5
+	ld [hli], a
+	hlcoord 3, 10
+	ld [hl], a
+	ld a, $43
+	hlcoord 6, 11
+	ld [hli], a
+	pop hl
+	jp MailGFX_PlaceMessage
+
+LoadEonMailGFX:
+	push bc
+	ld hl, vTiles2 tile $31
+	ld de, EonMailBorder1GFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, EonMailBorder2GFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+	ld de, EonMailBorder2GFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+	ld de, EonMailBorder1GFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, SurfMailBorderGFX + 6 * LEN_1BPP_TILE
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, MailEeveeGFX
+	ld c, 6 * LEN_1BPP_TILE
+	call LoadMailGFX_Color3
+	ld hl, vTiles2 tile $3d
+	ld de, MailLargeCircleGFX
+	ld c, 4 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+	ld de, EonMailBorder2GFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+
+	ld a, $31
+	hlcoord 0, 0
+	call Mail_Place18TileAlternatingRow
+	hlcoord 1, 17
+	call Mail_Place18TileAlternatingRow
+	ld a, $33
+	hlcoord 0, 1
+	call Mail_Place16TileAlternatingColumn
+	hlcoord 19, 0
+	call Mail_Place16TileAlternatingColumn
+	hlcoord 2, 15
+	ld a, $35
+	call Mail_Draw16TileRow
+	inc a
+	hlcoord 15, 14
+	call Mail_Draw3x2Graphic
+	call LovelyEonMail_PlaceIcons
+	pop hl
+	jp MailGFX_PlaceMessage
+
+LoadLovelyMailGFX:
+	push bc
+	ld hl, vTiles2 tile $31
+	ld de, LovelyMailBorderGFX
+	ld c, 5 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, MailPoliwagGFX
+	ld c, 6 * LEN_1BPP_TILE
+	call LoadMailGFX_Color3
+	ld de, LovelyMailUnderlineGFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, LovelyMailLargeHeartGFX
+	ld c, 4 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, LovelyMailSmallHeartGFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+
+	call DrawMailBorder2
+	hlcoord 2, 15
+	ld a, $3c
+	call Mail_Draw16TileRow
+	ld a, $36
+	hlcoord 15, 14
+	call Mail_Draw3x2Graphic
+	call LovelyEonMail_PlaceIcons
+	pop hl
+	jp MailGFX_PlaceMessage
+
+LovelyEonMail_PlaceIcons:
+	ld a, $3d
+	hlcoord 2, 2
+	call Mail_Draw2x2Graphic
+	hlcoord 16, 2
+	call Mail_Draw2x2Graphic
+	hlcoord 9, 4
+	call Mail_Draw2x2Graphic
+	hlcoord 2, 11
+	call Mail_Draw2x2Graphic
+	hlcoord 6, 12
+	call Mail_Draw2x2Graphic
+	hlcoord 12, 11
+	call Mail_Draw2x2Graphic
+	ld a, $41
+	hlcoord 5, 4
+	ld [hl], a
+	hlcoord 6, 2
+	ld [hl], a
+	hlcoord 12, 4
+	ld [hl], a
+	hlcoord 14, 2
+	ld [hl], a
+	hlcoord 3, 13
+	ld [hl], a
+	hlcoord 9, 11
+	ld [hl], a
+	hlcoord 16, 12
+	ld [hl], a
+	ret
+
+LoadMorphMailGFX:
+	push bc
+	ld hl, vTiles2 tile $31
+	ld bc, 5 * LEN_1BPP_TILE
+	call MailGFX_GenerateMonochromeTilesColor2
+	ld de, MorphMailBorderCornerGFX + 3 * LEN_1BPP_TILE
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, MorphMailBorderCornerGFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, MorphMailBorderGFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, EonMailBorder1GFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+	ld de, MorphMailDividerGFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, MailDittoGFX
+	ld c, 6 * LEN_1BPP_TILE
+	call LoadMailGFX_Color3
+	call DrawMailBorder2
+	ld a, $31
+	hlcoord 1, 1
+	call Mail_Draw2x2Graphic
+	hlcoord 17, 15
+	call Mail_Draw2x2Graphic
+	hlcoord 1, 3
+	ld [hl], a
+	hlcoord 3, 1
+	ld [hl], a
+	hlcoord 16, 16
+	ld [hl], a
+	hlcoord 18, 14
+	ld [hl], a
+	ld a, $36
+	hlcoord 1, 4
+	ld [hl], a
+	hlcoord 2, 3
+	ld [hl], a
+	hlcoord 3, 2
+	ld [hl], a
+	hlcoord 4, 1
+	ld [hl], a
+	inc a
+	hlcoord 15, 16
+	ld [hl], a
+	hlcoord 16, 15
+	ld [hl], a
+	hlcoord 17, 14
+	ld [hl], a
+	hlcoord 18, 13
+	ld [hl], a
+	inc a
+	hlcoord 2, 15
+	ld b, $e
+	call Mail_DrawRowLoop
+	inc a
+	hlcoord 2, 11
+	call Mail_Draw16TileRow
+	hlcoord 2, 5
+	call Mail_Draw16TileRow
+	inc a
+	hlcoord 6, 1
+	call Mail_Draw13TileRow
+	hlcoord 1, 16
+	call Mail_Draw13TileRow
+	inc a
+	hlcoord 3, 13
+	call Mail_Draw3x2Graphic
+	pop hl
+	jp MailGFX_PlaceMessage
+
+LoadBlueSkyMailGFX:
+	push bc
+	ld hl, vTiles2 tile $31
+	ld de, EonMailBorder1GFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld a, $ff
+	ld bc, 1 tiles
+	call ByteFill
+	ld de, BlueSkyMailGrassGFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color3
+	ld de, MailDragoniteGFX
+	ld c, 23 * LEN_1BPP_TILE
+	call LoadMailGFX_Color3
+	ld de, MailCloudGFX
+	ld c, 6 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+	ld de, FlowerMailBorderGFX + 6 * LEN_1BPP_TILE
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+	ld de, MailCloudGFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+	ld de, MailCloudGFX + 2 * LEN_1BPP_TILE
+	ld c, 2 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+	ld de, MailCloudGFX + 5 * LEN_1BPP_TILE
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+
+	ld a, $31
+	hlcoord 0, 0
+	call Mail_DrawFullWidthBorder
+	hlcoord 0, 1
+	call Mail_DrawLeftRightBorder
+	hlcoord 19, 1
+	call Mail_DrawLeftRightBorder
+	inc a
+	hlcoord 0, 17
+	call Mail_DrawFullWidthBorder
+	inc a
+	hlcoord 0, 16
+	call Mail_DrawFullWidthBorder
+	inc a
+	hlcoord 2, 2
+	call Mail_Place6TileRow
+	hlcoord 3, 3
+	call Mail_Place6TileRow
+	hlcoord 4, 4
+	call Mail_Place6TileRow
+	dec hl
+	ld [hl], $7f
+	dec a
+	hlcoord 15, 14
+	call Mail_Draw2x2Graphic
+	add $4
+	hlcoord 15, 16
+	ld [hli], a
+	inc a
+	ld [hl], a
+	inc a
+	push af
+	hlcoord 12, 1
+	call Mail_Draw3x2Graphic
+	pop af
+	hlcoord 15, 4
+	call Mail_Draw3x2Graphic
+	inc a
+	hlcoord 2, 11
+	call Mail_Draw16TileRow
+	inc a
+	hlcoord 10, 3
+	call Mail_Draw2x2Graphic
+	pop hl
+	jp MailGFX_PlaceMessage
+
+Mail_Place6TileRow:
+	ld b, $6
+.loop
+	ld [hli], a
+	inc a
+	dec b
+	jr nz, .loop
+	ret
+
+LoadFlowerMailGFX:
+	push bc
+	ld hl, vTiles2 tile $31
+	ld de, FlowerMailBorderGFX
+	ld c, 8 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+	ld de, MailOddishGFX
+	ld c, 4 * LEN_1BPP_TILE
+	call LoadMailGFX_Color3
+	ld de, FlowerMailBorderGFX + 6 * LEN_1BPP_TILE
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, FlowerMailFlowerGFX
+	ld c, 4 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+	ld c, 4 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+
+	call DrawMailBorder
+	hlcoord 2, 15
+	ld a, $3d ; underline
+	call Mail_Draw16TileRow
+	ld a, $39 ; oddish
+	hlcoord 16, 13
+	call Mail_Draw2x2Graphic
+	hlcoord 2, 13
+	call Mail_Draw2x2Graphic
+	ld a, $3e
+	hlcoord 2, 2
+	call Mail_Draw2x2Graphic
+	hlcoord 5, 3
+	call Mail_Draw2x2Graphic
+	hlcoord 10, 2
+	call Mail_Draw2x2Graphic
+	hlcoord 16, 3
+	call Mail_Draw2x2Graphic
+	hlcoord 5, 11
+	call Mail_Draw2x2Graphic
+	hlcoord 16, 10
+	call Mail_Draw2x2Graphic
+	ld a, $42
+	hlcoord 3, 4
+	call Mail_Draw2x2Graphic
+	hlcoord 12, 3
+	call Mail_Draw2x2Graphic
+	hlcoord 14, 2
+	call Mail_Draw2x2Graphic
+	hlcoord 2, 10
+	call Mail_Draw2x2Graphic
+	hlcoord 14, 11
+	call Mail_Draw2x2Graphic
+	pop hl
+	jp MailGFX_PlaceMessage
+
+LoadPortraitMailGFX:
+	push bc
+	ld hl, vTiles2 tile $31
+	ld de, PortraitMailBorderGFX
+	ld c, 5 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, PortraitMailUnderlineGFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld hl, vTiles2 tile $3d
+	ld de, PortraitMailLargePokeballGFX
+	ld c, 4 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+	ld de, PortraitMailSmallPokeballGFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+
+	call DrawMailBorder2
+	hlcoord 8, 15
+	ld a, $36
+	ld b, $a
+	call Mail_DrawRowLoop
+	call LovelyEonMail_PlaceIcons
+	ld a, $1
+	ld [wUnownLetter], a
+	hlcoord 1, 10
+	call PrepMonFrontpic
+	pop hl
+	jp MailGFX_PlaceMessage
+
+LoadMusicMailGFX:
+	push bc
+	ld hl, vTiles2 tile $31
+	ld de, MusicMailBorderGFX
+	ld c, 4 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, MorphMailBorderGFX
+	ld c, 2 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, MailNatuGFX
+	ld c, 6 * LEN_1BPP_TILE
+	call LoadMailGFX_Color3
+	xor a
+	ld bc, 1 tiles
+	call ByteFill
+	ld de, MusicMailLargeNoteGFX
+	ld c, 3 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+	ld de, MusicMailSmallNoteGFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+
+	ld a, $31
+	hlcoord 0, 0
+	call Mail_Place18TileAlternatingRow
+	hlcoord 1, 17
+	call Mail_Place18TileAlternatingRow
+	ld a, $33
+	hlcoord 0, 1
+	call Mail_Place16TileAlternatingColumn
+	hlcoord 19, 0
+	call Mail_Place16TileAlternatingColumn
+	ld a, $35
+	hlcoord 2, 15
+	call Mail_Place14TileAlternatingRow
+	ld a, $37
+	hlcoord 15, 14
+	call Mail_Draw3x2Graphic
+	call LovelyEonMail_PlaceIcons
+	pop hl
+	jp MailGFX_PlaceMessage
+
+LoadMirageMailGFX:
+	push bc
+	ld hl, vTiles2 tile $31
+	ld bc, 5 * LEN_1BPP_TILE
+	call MailGFX_GenerateMonochromeTilesColor2
+	ld de, BlueSkyMailGrassGFX
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, MailMewGFX
+	ld c, 18 * LEN_1BPP_TILE
+	call LoadMailGFX_Color2
+	ld de, LiteBlueMailBorderGFX + 1 * LEN_1BPP_TILE
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+	ld de, LiteBlueMailBorderGFX + 6 * LEN_1BPP_TILE
+	ld c, 1 * LEN_1BPP_TILE
+	call LoadMailGFX_Color1
+
+	call DrawMailBorder2
+	ld a, $36
+	hlcoord 1, 16
+	call Mail_DrawTopBottomBorder
+	inc a
+	hlcoord 15, 14
+	call Mail_Draw3x2Graphic
+	inc a
+	hlcoord 15, 16
+	ld [hli], a
+	inc a
+	ld [hl], a
+	ld a, $3f
+	hlcoord 1, 1
+	call Mail_Place18TileAlternatingRow
+	ld a, $41
+	hlcoord 0, 2
+	call Mail_Place14TileAlternatingColumn
+	ld a, $43
+	hlcoord 19, 2
+	call Mail_Place14TileAlternatingColumn
+	ld a, $45
+	hlcoord 0, 1
+	ld [hl], a
+	inc a
+	hlcoord 19, 1
+	ld [hl], a
+	inc a
+	hlcoord 0, 16
+	ld [hl], a
+	inc a
+	hlcoord 19, 16
+	ld [hl], a
+	inc a
+	hlcoord 2, 5
+	call Mail_Draw16TileRow
+	inc a
+	hlcoord 2, 11
+	call Mail_Draw16TileRow
+	pop hl
+	jp MailGFX_PlaceMessage
+
+MailGFX_GenerateMonochromeTilesColor2:
+.loop
+	xor a
+	ld [hli], a
+	ld a, $ff
+	ld [hli], a
+	dec bc
+	ld a, b
+	or c
+	jr nz, .loop
+	ret
+
+MailGFX_PlaceMessage:
+	ld bc, MAIL_STRUCT_LENGTH
+	ld de, wTempMail
+	ld a, BANK(sPartyMail)
+	call OpenSRAM
+	call CopyBytes
+	call CloseSRAM
+	ld hl, wTempMailAuthor
+	ld de, wMonOrItemNameBuffer
+	ld bc, NAME_LENGTH - 1
+	call CopyBytes
+	ld a, "@"
+	ld [wTempMailAuthor], a
+	ld [wMonOrItemNameBuffer + NAME_LENGTH - 1], a
+	ld de, wTempMailMessage
+	hlcoord 2, 7
+	call PlaceString
+	ld de, wMonOrItemNameBuffer
+	ld a, [de]
+	and a
+	ret z
+	ld a, [wBuffer3]
+	hlcoord 8, 14
+	cp $3 ; PORTRAITMAIL
+	jr z, .place_author
+	hlcoord 6, 14
+	cp $6 ; MORPH_MAIL
+	jr z, .place_author
+	hlcoord 5, 14
+
+.place_author
+	jp PlaceString
+
+Unreferenced_Functionb984e:
+.loop
+	ld a, [hl]
+	xor $ff
+	ld [hli], a
+	dec bc
+	ld a, b
+	or c
+	jr nz, .loop
+	ret
+
+DrawMailBorder:
+	hlcoord 0, 0
+	ld a, $31
+	ld [hli], a
+	inc a
+	call Mail_DrawTopBottomBorder
+	inc a
+	ld [hli], a
+	inc a
+	call Mail_DrawLeftRightBorder
+	ld a, $36
+	ld [hli], a
+	inc a
+	call Mail_DrawTopBottomBorder
+	hlcoord 19, 1
+	ld a, $35
+	call Mail_DrawLeftRightBorder
+	ld a, $38
+	ld [hl], a
+	ret
+
+DrawMailBorder2:
+	hlcoord 0, 0
+	ld a, $31
+	ld [hli], a
+	inc a
+	call Mail_DrawTopBottomBorder
+	ld [hl], $31
+	inc hl
+	inc a
+	call Mail_DrawLeftRightBorder
+	ld [hl], $31
+	inc hl
+	inc a
+	call Mail_DrawTopBottomBorder
+	hlcoord 19, 1
+	ld a, $35
+	call Mail_DrawLeftRightBorder
+	ld [hl], $31
+	ret
+
+Mail_Place14TileAlternatingRow:
+	push af
+	ld b, 14 / 2
+	jr Mail_PlaceAlternatingRow
+
+Mail_Place16TileAlternatingRow:
+	push af
+	ld b, 16 / 2
+	jr Mail_PlaceAlternatingRow
+
+Mail_Place18TileAlternatingRow:
+	push af
+	ld b, 18 / 2
+
+Mail_PlaceAlternatingRow:
+.loop
+	ld [hli], a
+	inc a
+	ld [hli], a
+	dec a
+	dec b
+	jr nz, .loop
+	ld [hl], a
+	pop af
+	ret
+
+Mail_Place14TileAlternatingColumn:
+	push af
+	ld b, 14 / 2
+	jr Mail_PlaceAlternatingColumn
+
+Mail_Place16TileAlternatingColumn:
+	push af
+	ld b, 16 / 2
+
+Mail_PlaceAlternatingColumn:
+.loop
+	ld [hl], a
+	ld de, SCREEN_WIDTH
+	add hl, de
+	inc a
+	ld [hl], a
+	add hl, de
+	dec a
+	dec b
+	jr nz, .loop
+	ld [hl], a
+	pop af
+	ret
+
+Mail_Draw7TileRow:
+	ld b, $7
+	jr Mail_DrawRowLoop
+
+Mail_Draw13TileRow:
+	ld b, $d
+	jr Mail_DrawRowLoop
+
+Mail_Draw16TileRow:
+	ld b, $10
+	jr Mail_DrawRowLoop
+
+Mail_DrawTopBottomBorder:
+	ld b, SCREEN_WIDTH - 2
+	jr Mail_DrawRowLoop
+
+Mail_DrawFullWidthBorder:
+	ld b, SCREEN_WIDTH
+
+Mail_DrawRowLoop:
+.loop
+	ld [hli], a
+	dec b
+	jr nz, .loop
+	ret
+
+Mail_DrawLeftRightBorder:
+	ld b, SCREEN_HEIGHT - 2
+	ld de, SCREEN_WIDTH
+.loop
+	ld [hl], a
+	add hl, de
+	dec b
+	jr nz, .loop
+	ret
+
+Mail_Draw2x2Graphic:
+	push af
+	ld [hli], a
+	inc a
+	ld [hl], a
+	ld bc, SCREEN_WIDTH - 1
+	add hl, bc
+	inc a
+	ld [hli], a
+	inc a
+	ld [hl], a
+	pop af
+	ret
+
+Mail_Draw3x2Graphic:
+	ld [hli], a
+	inc a
+	ld [hli], a
+	inc a
+	ld [hl], a
+	ld bc, SCREEN_WIDTH - 2
+	add hl, bc
+	inc a
+	ld [hli], a
+	inc a
+	ld [hli], a
+	inc a
+	ld [hl], a
+	ret
+
+LoadMailGFX_Color1:
+.loop
+	ld a, [de]
+	inc de
+	ld [hli], a
+	xor a
+	ld [hli], a
+	dec c
+	jr nz, .loop
+	ret
+
+LoadMailGFX_Color2:
+.loop
+	xor a
+	ld [hli], a
+	ld a, [de]
+	inc de
+	ld [hli], a
+	dec c
+	jr nz, .loop
+	ret
+
+LoadMailGFX_Color3:
+.loop
+	ld a, [de]
+	inc de
+	ld [hli], a
+	ld [hli], a
+	dec c
+	jr nz, .loop
+	ret
+
+INCLUDE "gfx/mail.asm"
+
+ItemIsMail:
+	ld a, d
+	ld hl, MailItems
+	ld de, 1
+	jp IsInArray
+
+INCLUDE "data/items/mail_items.asm"
diff --git a/gfx/mail.asm b/gfx/mail.asm
new file mode 100644
index 00000000..f8b3f289
--- /dev/null
+++ b/gfx/mail.asm
@@ -0,0 +1,111 @@
+MorphMailDividerGFX:
+INCBIN "gfx/mail/morph_mail_divider.1bpp"
+
+BlueSkyMailGrassGFX:
+INCBIN "gfx/mail/grass.1bpp"
+
+PortraitMailSmallPokeballGFX:
+INCBIN "gfx/mail/small_pokeball.1bpp"
+
+MorphMailBorderGFX:
+INCBIN "gfx/mail/morph_mail_border.1bpp"
+
+MusicMailSmallNoteGFX:
+INCBIN "gfx/mail/small_note.1bpp"
+
+SurfMailWaveGFX:
+INCBIN "gfx/mail/wave.1bpp"
+
+PortraitMailUnderlineGFX:
+INCBIN "gfx/mail/portraitmail_underline.1bpp"
+
+LovelyMailUnderlineGFX:
+INCBIN "gfx/mail/lovely_mail_underline.1bpp"
+
+LovelyMailSmallHeartGFX:
+INCBIN "gfx/mail/small_heart.1bpp"
+
+SurfLiteBlueMailSmallShapesGFX:
+INCBIN "gfx/mail/small_triangle.1bpp"
+
+EonMailBorder1GFX:
+INCBIN "gfx/mail/eon_mail_border_1.1bpp"
+
+EonMailBorder2GFX:
+INCBIN "gfx/mail/eon_mail_border_2.1bpp"
+
+MailNatuGFX:
+INCBIN "gfx/mail/natu.1bpp"
+
+MailDratiniGFX:
+INCBIN "gfx/mail/dratini.1bpp"
+
+MailPoliwagGFX:
+INCBIN "gfx/mail/poliwag.1bpp"
+
+MailLaprasGFX:
+INCBIN "gfx/mail/lapras.1bpp"
+
+MailEeveeGFX:
+INCBIN "gfx/mail/eevee.1bpp"
+
+MailDittoGFX:
+INCBIN "gfx/mail/ditto.1bpp"
+
+MailMewGFX:
+INCBIN "gfx/mail/mew.1bpp"
+
+MailDragoniteGFX:
+INCBIN "gfx/mail/dragonite.1bpp"
+
+MailSentretGFX:
+INCBIN "gfx/mail/sentret.1bpp"
+
+MailUnusedGrassGFX:
+INCBIN "gfx/mail/unused_grass.1bpp"
+
+PortraitMailLargePokeballGFX:
+INCBIN "gfx/mail/large_pokeball.1bpp"
+
+MailOddishGFX:
+INCBIN "gfx/mail/oddish.1bpp"
+
+SurfLiteBlueMailLargeShapesGFX:
+INCBIN "gfx/mail/large_triangle.1bpp"
+
+LovelyMailLargeHeartGFX:
+INCBIN "gfx/mail/large_heart.1bpp"
+
+MorphMailBorderCornerGFX:
+INCBIN "gfx/mail/morph_mail_corner.1bpp"
+
+MailLargeCircleGFX:
+INCBIN "gfx/mail/large_circle.1bpp"
+
+FlowerMailFlowerGFX:
+INCBIN "gfx/mail/flower_1.1bpp"
+INCBIN "gfx/mail/flower_2.1bpp"
+
+MusicMailLargeNoteGFX:
+INCBIN "gfx/mail/large_note.1bpp"
+
+MailCloudGFX:
+INCBIN "gfx/mail/cloud.1bpp"
+
+SurfMailBorderGFX:
+INCBIN "gfx/mail/surf_mail_border.1bpp"
+
+FlowerMailBorderGFX:
+INCBIN "gfx/mail/flower_mail_border.1bpp"
+
+LiteBlueMailBorderGFX:
+INCBIN "gfx/mail/litebluemail_border.1bpp"
+
+MusicMailBorderGFX:
+INCBIN "gfx/mail/music_mail_border.1bpp"
+
+LovelyMailBorderGFX:
+INCBIN "gfx/mail/lovely_mail_border.1bpp"
+
+PortraitMailBorderGFX:
+INCBIN "gfx/mail/portraitmail_border.1bpp"
diff --git a/gfx/mail/cloud.1bpp b/gfx/mail/cloud.1bpp
new file mode 100644
index 00000000..867b0a9b
--- /dev/null
+++ b/gfx/mail/cloud.1bpp
diff --git a/gfx/mail/ditto.1bpp b/gfx/mail/ditto.1bpp
new file mode 100644
index 00000000..34fa18d2
--- /dev/null
+++ b/gfx/mail/ditto.1bpp
diff --git a/gfx/mail/dragonite.1bpp b/gfx/mail/dragonite.1bpp
new file mode 100644
index 00000000..6a3ae927
--- /dev/null
+++ b/gfx/mail/dragonite.1bpp
diff --git a/gfx/mail/dratini.1bpp b/gfx/mail/dratini.1bpp
new file mode 100644
index 00000000..77d1e45b
--- /dev/null
+++ b/gfx/mail/dratini.1bpp
diff --git a/gfx/mail/eevee.1bpp b/gfx/mail/eevee.1bpp
new file mode 100644
index 00000000..7ade46c6
--- /dev/null
+++ b/gfx/mail/eevee.1bpp
diff --git a/gfx/mail/eon_mail_border_1.1bpp b/gfx/mail/eon_mail_border_1.1bpp
new file mode 100644
index 00000000..4957ff4c
--- /dev/null
+++ b/gfx/mail/eon_mail_border_1.1bpp
diff --git a/gfx/mail/eon_mail_border_2.1bpp b/gfx/mail/eon_mail_border_2.1bpp
new file mode 100644
index 00000000..8d6a0e31
--- /dev/null
+++ b/gfx/mail/eon_mail_border_2.1bpp
@@ -0,0 +1 @@
+<~����~<
+\ No newline at end of file
diff --git a/gfx/mail/flower_1.1bpp b/gfx/mail/flower_1.1bpp
new file mode 100644
index 00000000..503b8da3
--- /dev/null
+++ b/gfx/mail/flower_1.1bpp
diff --git a/gfx/mail/flower_2.1bpp b/gfx/mail/flower_2.1bpp
new file mode 100644
index 00000000..d6d1b99c
--- /dev/null
+++ b/gfx/mail/flower_2.1bpp
diff --git a/gfx/mail/flower_mail_border.1bpp b/gfx/mail/flower_mail_border.1bpp
new file mode 100644
index 00000000..1d851909
--- /dev/null
+++ b/gfx/mail/flower_mail_border.1bpp
diff --git a/gfx/mail/grass.1bpp b/gfx/mail/grass.1bpp
new file mode 100644
index 00000000..4efb3567
--- /dev/null
+++ b/gfx/mail/grass.1bpp
@@ -0,0 +1 @@
+�HLm}��
+\ No newline at end of file
diff --git a/gfx/mail/lapras.1bpp b/gfx/mail/lapras.1bpp
new file mode 100644
index 00000000..295dec49
--- /dev/null
+++ b/gfx/mail/lapras.1bpp
diff --git a/gfx/mail/large_circle.1bpp b/gfx/mail/large_circle.1bpp
new file mode 100644
index 00000000..d1f0f6b7
--- /dev/null
+++ b/gfx/mail/large_circle.1bpp
diff --git a/gfx/mail/large_heart.1bpp b/gfx/mail/large_heart.1bpp
new file mode 100644
index 00000000..6587f450
--- /dev/null
+++ b/gfx/mail/large_heart.1bpp
diff --git a/gfx/mail/large_note.1bpp b/gfx/mail/large_note.1bpp
new file mode 100644
index 00000000..09e552df
--- /dev/null
+++ b/gfx/mail/large_note.1bpp
diff --git a/gfx/mail/large_pokeball.1bpp b/gfx/mail/large_pokeball.1bpp
new file mode 100644
index 00000000..ac838599
--- /dev/null
+++ b/gfx/mail/large_pokeball.1bpp
diff --git a/gfx/mail/large_triangle.1bpp b/gfx/mail/large_triangle.1bpp
new file mode 100644
index 00000000..faa0439c
--- /dev/null
+++ b/gfx/mail/large_triangle.1bpp
diff --git a/gfx/mail/litebluemail_border.1bpp b/gfx/mail/litebluemail_border.1bpp
new file mode 100644
index 00000000..da8a32b9
--- /dev/null
+++ b/gfx/mail/litebluemail_border.1bpp
diff --git a/gfx/mail/lovely_mail_border.1bpp b/gfx/mail/lovely_mail_border.1bpp
new file mode 100644
index 00000000..efe2887c
--- /dev/null
+++ b/gfx/mail/lovely_mail_border.1bpp
@@ -0,0 +1 @@
+�Ù������������<��������<�������χ��
+\ No newline at end of file
diff --git a/gfx/mail/lovely_mail_underline.1bpp b/gfx/mail/lovely_mail_underline.1bpp
new file mode 100644
index 00000000..bbf05317
--- /dev/null
+++ b/gfx/mail/lovely_mail_underline.1bpp
diff --git a/gfx/mail/mail.pal b/gfx/mail/mail.pal
new file mode 100644
index 00000000..4096ffae
--- /dev/null
+++ b/gfx/mail/mail.pal
@@ -0,0 +1,49 @@
+	RGB 20, 31, 11
+	RGB 31, 19, 00
+	RGB 31, 10, 09
+	RGB 00, 00, 00
+
+	RGB 15, 20, 31
+	RGB 30, 26, 00
+	RGB 31, 12, 00
+	RGB 00, 00, 00
+
+	RGB 24, 17, 31
+	RGB 30, 26, 00
+	RGB 08, 11, 31
+	RGB 00, 00, 00
+
+	RGB 31, 25, 17
+	RGB 31, 18, 04
+	RGB 28, 12, 05
+	RGB 00, 00, 00
+
+	RGB 19, 26, 31
+	RGB 31, 05, 08
+	RGB 31, 09, 31
+	RGB 00, 00, 00
+
+	RGB 31, 19, 28
+	RGB 31, 21, 00
+	RGB 12, 22, 00
+	RGB 00, 00, 00
+
+	RGB 19, 17, 23
+	RGB 30, 26, 00
+	RGB 31, 12, 00
+	RGB 00, 00, 00
+
+	RGB 07, 26, 31
+	RGB 26, 26, 27
+	RGB 31, 11, 11
+	RGB 00, 00, 00
+
+	RGB 21, 31, 21
+	RGB 30, 26, 00
+	RGB 31, 12, 00
+	RGB 00, 00, 00
+
+	RGB 07, 26, 31
+	RGB 31, 31, 00
+	RGB 00, 21, 00
+	RGB 00, 00, 00
diff --git a/gfx/mail/mew.1bpp b/gfx/mail/mew.1bpp
new file mode 100644
index 00000000..f37262f7
--- /dev/null
+++ b/gfx/mail/mew.1bpp
diff --git a/gfx/mail/morph_mail_border.1bpp b/gfx/mail/morph_mail_border.1bpp
new file mode 100644
index 00000000..28cda20b
--- /dev/null
+++ b/gfx/mail/morph_mail_border.1bpp
diff --git a/gfx/mail/morph_mail_corner.1bpp b/gfx/mail/morph_mail_corner.1bpp
new file mode 100644
index 00000000..a2ca4120
--- /dev/null
+++ b/gfx/mail/morph_mail_corner.1bpp
diff --git a/gfx/mail/morph_mail_divider.1bpp b/gfx/mail/morph_mail_divider.1bpp
new file mode 100644
index 00000000..07411676
--- /dev/null
+++ b/gfx/mail/morph_mail_divider.1bpp
diff --git a/gfx/mail/music_mail_border.1bpp b/gfx/mail/music_mail_border.1bpp
new file mode 100644
index 00000000..8f082c64
--- /dev/null
+++ b/gfx/mail/music_mail_border.1bpp
diff --git a/gfx/mail/natu.1bpp b/gfx/mail/natu.1bpp
new file mode 100644
index 00000000..62814ccb
--- /dev/null
+++ b/gfx/mail/natu.1bpp
diff --git a/gfx/mail/oddish.1bpp b/gfx/mail/oddish.1bpp
new file mode 100644
index 00000000..205a6024
--- /dev/null
+++ b/gfx/mail/oddish.1bpp
diff --git a/gfx/mail/poliwag.1bpp b/gfx/mail/poliwag.1bpp
new file mode 100644
index 00000000..3d9dcac5
--- /dev/null
+++ b/gfx/mail/poliwag.1bpp
diff --git a/gfx/mail/portraitmail_border.1bpp b/gfx/mail/portraitmail_border.1bpp
new file mode 100644
index 00000000..9207cfc8
--- /dev/null
+++ b/gfx/mail/portraitmail_border.1bpp
diff --git a/gfx/mail/portraitmail_underline.1bpp b/gfx/mail/portraitmail_underline.1bpp
new file mode 100644
index 00000000..af75f645
--- /dev/null
+++ b/gfx/mail/portraitmail_underline.1bpp
diff --git a/gfx/mail/sentret.1bpp b/gfx/mail/sentret.1bpp
new file mode 100644
index 00000000..208e14fc
--- /dev/null
+++ b/gfx/mail/sentret.1bpp
diff --git a/gfx/mail/small_heart.1bpp b/gfx/mail/small_heart.1bpp
new file mode 100644
index 00000000..266c9196
--- /dev/null
+++ b/gfx/mail/small_heart.1bpp
diff --git a/gfx/mail/small_note.1bpp b/gfx/mail/small_note.1bpp
new file mode 100644
index 00000000..4352e106
--- /dev/null
+++ b/gfx/mail/small_note.1bpp
@@ -0,0 +1 @@
+p�`
+\ No newline at end of file
diff --git a/gfx/mail/small_pokeball.1bpp b/gfx/mail/small_pokeball.1bpp
new file mode 100644
index 00000000..3db4de26
--- /dev/null
+++ b/gfx/mail/small_pokeball.1bpp
@@ -0,0 +1 @@
+<~���~<
+\ No newline at end of file
diff --git a/gfx/mail/small_triangle.1bpp b/gfx/mail/small_triangle.1bpp
new file mode 100644
index 00000000..1c2e2194
--- /dev/null
+++ b/gfx/mail/small_triangle.1bpp
diff --git a/gfx/mail/surf_mail_border.1bpp b/gfx/mail/surf_mail_border.1bpp
new file mode 100644
index 00000000..a5ea237a
--- /dev/null
+++ b/gfx/mail/surf_mail_border.1bpp
diff --git a/gfx/mail/unused_grass.1bpp b/gfx/mail/unused_grass.1bpp
new file mode 100644
index 00000000..33c93f01
--- /dev/null
+++ b/gfx/mail/unused_grass.1bpp
@@ -0,0 +1 @@
+�KKm}����������
+\ No newline at end of file
diff --git a/gfx/mail/wave.1bpp b/gfx/mail/wave.1bpp
new file mode 100644
index 00000000..88ddd73f
--- /dev/null
+++ b/gfx/mail/wave.1bpp
diff --git a/gfx/namingscreen/border.2bpp b/gfx/naming_screen/border.2bpp
index 5046cc61..5046cc61 100644
--- a/gfx/namingscreen/border.2bpp
+++ b/gfx/naming_screen/border.2bpp
diff --git a/gfx/namingscreen/cursor.2bpp b/gfx/naming_screen/cursor.2bpp
index 852606f9..852606f9 100644
--- a/gfx/namingscreen/cursor.2bpp
+++ b/gfx/naming_screen/cursor.2bpp
diff --git a/gfx/namingscreen/ed.1bpp b/gfx/naming_screen/ed.1bpp
index 7bbee183..7bbee183 100644
--- a/gfx/namingscreen/ed.1bpp
+++ b/gfx/naming_screen/ed.1bpp
diff --git a/gfx/namingscreen/mail_icon.2bpp b/gfx/naming_screen/mail_icon.2bpp
index 18892689..18892689 100644
--- a/gfx/namingscreen/mail_icon.2bpp
+++ b/gfx/naming_screen/mail_icon.2bpp
diff --git a/gfx/namingscreen/middleline.1bpp b/gfx/naming_screen/middleline.1bpp
index 9713c883..9713c883 100644
--- a/gfx/namingscreen/middleline.1bpp
+++ b/gfx/naming_screen/middleline.1bpp
diff --git a/gfx/namingscreen/underline.1bpp b/gfx/naming_screen/underline.1bpp
index 3da14ecb..3da14ecb 100644
--- a/gfx/namingscreen/underline.1bpp
+++ b/gfx/naming_screen/underline.1bpp
diff --git a/gfx/pics_gold.asm b/gfx/pics_gold.asm
new file mode 100644
index 00000000..2a4b93c2
--- /dev/null
+++ b/gfx/pics_gold.asm
@@ -0,0 +1,694 @@
+INCLUDE "constants.asm"
+
+
+; PokemonPicPointers and UnownPicPointers are assumed to start at the same
+; address, but in different banks. This is enforced in pokecrystal.link.
+
+
+SECTION "Pic Pointers", ROMX
+
+INCLUDE "data/pokemon/pic_pointers.asm"
+
+
+SECTION "Pics 1", ROMX
+
+NidokingFrontpic:    INCBIN "gfx/pokemon/nidoking/front_gold.2bpp.lz"
+HoOhFrontpic:        INCBIN "gfx/pokemon/ho_oh/front_gold.2bpp.lz"
+GyaradosFrontpic:    INCBIN "gfx/pokemon/gyarados/front_gold.2bpp.lz"
+MeganiumFrontpic:    INCBIN "gfx/pokemon/meganium/front_gold.2bpp.lz"
+MachampFrontpic:     INCBIN "gfx/pokemon/machamp/front_gold.2bpp.lz"
+FeraligatrFrontpic:  INCBIN "gfx/pokemon/feraligatr/front_gold.2bpp.lz"
+SteelixFrontpic:     INCBIN "gfx/pokemon/steelix/front_gold.2bpp.lz"
+NinetalesFrontpic:   INCBIN "gfx/pokemon/ninetales/front_gold.2bpp.lz"
+RhydonFrontpic:      INCBIN "gfx/pokemon/rhydon/front_gold.2bpp.lz"
+RaikouFrontpic:      INCBIN "gfx/pokemon/raikou/front.2bpp.lz"
+TaurosFrontpic:      INCBIN "gfx/pokemon/tauros/front_gold.2bpp.lz"
+NidoqueenFrontpic:   INCBIN "gfx/pokemon/nidoqueen/front_gold.2bpp.lz"
+RapidashFrontpic:    INCBIN "gfx/pokemon/rapidash/front_gold.2bpp.lz"
+EnteiFrontpic:       INCBIN "gfx/pokemon/entei/front.2bpp.lz"
+KangaskhanFrontpic:  INCBIN "gfx/pokemon/kangaskhan/front_gold.2bpp.lz"
+BlastoiseFrontpic:   INCBIN "gfx/pokemon/blastoise/front_gold.2bpp.lz"
+ArbokFrontpic:       INCBIN "gfx/pokemon/arbok/front_gold.2bpp.lz"
+CharizardFrontpic:   INCBIN "gfx/pokemon/charizard/front_gold.2bpp.lz"
+SkarmoryFrontpic:    INCBIN "gfx/pokemon/skarmory/front_gold.2bpp.lz"
+WeezingFrontpic:     INCBIN "gfx/pokemon/weezing/front_gold.2bpp.lz"
+VenusaurFrontpic:    INCBIN "gfx/pokemon/venusaur/front_gold.2bpp.lz"
+BeedrillFrontpic:    INCBIN "gfx/pokemon/beedrill/front_gold.2bpp.lz"
+LugiaFrontpic:       INCBIN "gfx/pokemon/lugia/front_gold.2bpp.lz"
+NidorinoFrontpic:    INCBIN "gfx/pokemon/nidorino/front_gold.2bpp.lz"
+
+
+SECTION "Pics 2", ROMX
+
+KingdraFrontpic:     INCBIN "gfx/pokemon/kingdra/front_gold.2bpp.lz"
+SandslashFrontpic:   INCBIN "gfx/pokemon/sandslash/front_gold.2bpp.lz"
+JumpluffFrontpic:    INCBIN "gfx/pokemon/jumpluff/front_gold.2bpp.lz"
+SmeargleFrontpic:    INCBIN "gfx/pokemon/smeargle/front_gold.2bpp.lz"
+ExeggutorBackpic:    INCBIN "gfx/pokemon/exeggutor/back.2bpp.lz"
+MagcargoFrontpic:    INCBIN "gfx/pokemon/magcargo/front_gold.2bpp.lz"
+LaprasFrontpic:      INCBIN "gfx/pokemon/lapras/front_gold.2bpp.lz"
+LickitungFrontpic:   INCBIN "gfx/pokemon/lickitung/front_gold.2bpp.lz"
+ChuckPic:            INCBIN "gfx/trainers/chuck.2bpp.lz"
+ParasectFrontpic:    INCBIN "gfx/pokemon/parasect/front_gold.2bpp.lz"
+ButterfreeBackpic:   INCBIN "gfx/pokemon/butterfree/back.2bpp.lz"
+KimonoGirlPic:       INCBIN "gfx/trainers/kimono_girl.2bpp.lz"
+FearowFrontpic:      INCBIN "gfx/pokemon/fearow/front_gold.2bpp.lz"
+AlakazamBackpic:     INCBIN "gfx/pokemon/alakazam/back_gold.2bpp.lz"
+GirafarigFrontpic:   INCBIN "gfx/pokemon/girafarig/front_gold.2bpp.lz"
+GolbatFrontpic:      INCBIN "gfx/pokemon/golbat/front_gold.2bpp.lz"
+KoffingFrontpic:     INCBIN "gfx/pokemon/koffing/front_gold.2bpp.lz"
+CloysterBackpic:     INCBIN "gfx/pokemon/cloyster/back.2bpp.lz"
+HitmontopBackpic:    INCBIN "gfx/pokemon/hitmontop/back_gold.2bpp.lz"
+DrowzeeFrontpic:     INCBIN "gfx/pokemon/drowzee/front_gold.2bpp.lz"
+StarmieFrontpic:     INCBIN "gfx/pokemon/starmie/front_gold.2bpp.lz"
+KabutopsFrontpic:    INCBIN "gfx/pokemon/kabutops/front_gold.2bpp.lz"
+DodrioBackpic:       INCBIN "gfx/pokemon/dodrio/back.2bpp.lz"
+HitmonleeFrontpic:   INCBIN "gfx/pokemon/hitmonlee/front_gold.2bpp.lz"
+VenomothFrontpic:    INCBIN "gfx/pokemon/venomoth/front_gold.2bpp.lz"
+BayleefFrontpic:     INCBIN "gfx/pokemon/bayleef/front.2bpp.lz"
+JugglerPic:          INCBIN "gfx/trainers/juggler.2bpp.lz"
+GuitaristPic:        INCBIN "gfx/trainers/guitarist.2bpp.lz"
+PokefanfPic:         INCBIN "gfx/trainers/pokefan_f.2bpp.lz"
+VenomothBackpic:     INCBIN "gfx/pokemon/venomoth/back.2bpp.lz"
+NoctowlFrontpic:     INCBIN "gfx/pokemon/noctowl/front_gold.2bpp.lz"
+ClairPic:            INCBIN "gfx/trainers/clair.2bpp.lz"
+PokemaniacPic:       INCBIN "gfx/trainers/pokemaniac.2bpp.lz"
+OmastarFrontpic:     INCBIN "gfx/pokemon/omastar/front_gold.2bpp.lz"
+SkierPic:            INCBIN "gfx/trainers/skier.2bpp.lz"
+LugiaBackpic:        INCBIN "gfx/pokemon/lugia/back.2bpp.lz"
+
+
+SECTION "Pics 3", ROMX
+
+GravelerFrontpic:    INCBIN "gfx/pokemon/graveler/front_gold.2bpp.lz"
+MrMimeFrontpic:      INCBIN "gfx/pokemon/mr__mime/front_gold.2bpp.lz"
+KangaskhanBackpic:   INCBIN "gfx/pokemon/kangaskhan/back.2bpp.lz"
+GligarFrontpic:      INCBIN "gfx/pokemon/gligar/front_gold.2bpp.lz"
+FarfetchDFrontpic:   INCBIN "gfx/pokemon/farfetch_d/front_gold.2bpp.lz"
+MagnetonFrontpic:    INCBIN "gfx/pokemon/magneton/front_gold.2bpp.lz"
+AmpharosFrontpic:    INCBIN "gfx/pokemon/ampharos/front_gold.2bpp.lz"
+ScytherFrontpic:     INCBIN "gfx/pokemon/scyther/front_gold.2bpp.lz"
+HoundoomFrontpic:    INCBIN "gfx/pokemon/houndoom/front_gold.2bpp.lz"
+JolteonFrontpic:     INCBIN "gfx/pokemon/jolteon/front_gold.2bpp.lz"
+NidorinaFrontpic:    INCBIN "gfx/pokemon/nidorina/front_gold.2bpp.lz"
+GyaradosBackpic:     INCBIN "gfx/pokemon/gyarados/back.2bpp.lz"
+RaticateFrontpic:    INCBIN "gfx/pokemon/raticate/front_gold.2bpp.lz"
+YanmaBackpic:        INCBIN "gfx/pokemon/yanma/back.2bpp.lz"
+HeracrossFrontpic:   INCBIN "gfx/pokemon/heracross/front_gold.2bpp.lz"
+SneaselFrontpic:     INCBIN "gfx/pokemon/sneasel/front.2bpp.lz"
+GolemFrontpic:       INCBIN "gfx/pokemon/golem/front_gold.2bpp.lz"
+ElekidFrontpic:      INCBIN "gfx/pokemon/elekid/front_gold.2bpp.lz"
+OmastarBackpic:      INCBIN "gfx/pokemon/omastar/back.2bpp.lz"
+ClefableBackpic:     INCBIN "gfx/pokemon/clefable/back.2bpp.lz"
+LassPic:             INCBIN "gfx/trainers/lass.2bpp.lz"
+MiltankFrontpic:     INCBIN "gfx/pokemon/miltank/front_gold.2bpp.lz"
+FeraligatrBackpic:   INCBIN "gfx/pokemon/feraligatr/back.2bpp.lz"
+MagnetonBackpic:     INCBIN "gfx/pokemon/magneton/back.2bpp.lz"
+GastlyFrontpic:      INCBIN "gfx/pokemon/gastly/front_gold.2bpp.lz"
+FlareonFrontpic:     INCBIN "gfx/pokemon/flareon/front_gold.2bpp.lz"
+GranbullFrontpic:    INCBIN "gfx/pokemon/granbull/front_gold.2bpp.lz"
+SuicuneBackpic:      INCBIN "gfx/pokemon/suicune/back.2bpp.lz"
+SlowkingBackpic:     INCBIN "gfx/pokemon/slowking/back.2bpp.lz"
+CharmeleonFrontpic:  INCBIN "gfx/pokemon/charmeleon/front_gold.2bpp.lz"
+WartortleFrontpic:   INCBIN "gfx/pokemon/wartortle/front_gold.2bpp.lz"
+SeelFrontpic:        INCBIN "gfx/pokemon/seel/front_gold.2bpp.lz"
+AriadosFrontpic:     INCBIN "gfx/pokemon/ariados/front.2bpp.lz"
+ElekidBackpic:       INCBIN "gfx/pokemon/elekid/back.2bpp.lz"
+QuilavaFrontpic:     INCBIN "gfx/pokemon/quilava/front_gold.2bpp.lz"
+CelebiBackpic:       INCBIN "gfx/pokemon/celebi/back.2bpp.lz"
+KrabbyBackpic:       INCBIN "gfx/pokemon/krabby/back.2bpp.lz"
+BugCatcherPic:       INCBIN "gfx/trainers/bug_catcher.2bpp.lz"
+
+
+SECTION "Pics 4", ROMX
+
+VenusaurBackpic:     INCBIN "gfx/pokemon/venusaur/back.2bpp.lz"
+MoltresBackpic:      INCBIN "gfx/pokemon/moltres/back.2bpp.lz"
+PonytaFrontpic:      INCBIN "gfx/pokemon/ponyta/front_gold.2bpp.lz"
+SunfloraBackpic:     INCBIN "gfx/pokemon/sunflora/back.2bpp.lz"
+DragonairFrontpic:   INCBIN "gfx/pokemon/dragonair/front_gold.2bpp.lz"
+TyranitarBackpic:    INCBIN "gfx/pokemon/tyranitar/back.2bpp.lz"
+RhydonBackpic:       INCBIN "gfx/pokemon/rhydon/back.2bpp.lz"
+SeadraBackpic:       INCBIN "gfx/pokemon/seadra/back.2bpp.lz"
+TwinsPic:            INCBIN "gfx/trainers/twins.2bpp.lz"
+PoliwhirlFrontpic:   INCBIN "gfx/pokemon/poliwhirl/front_gold.2bpp.lz"
+CroconawFrontpic:    INCBIN "gfx/pokemon/croconaw/front_gold.2bpp.lz"
+SandslashBackpic:    INCBIN "gfx/pokemon/sandslash/back.2bpp.lz"
+NidoranMBackpic:     INCBIN "gfx/pokemon/nidoran_m/back.2bpp.lz"
+TangelaFrontpic:     INCBIN "gfx/pokemon/tangela/front_gold.2bpp.lz"
+LedybaBackpic:       INCBIN "gfx/pokemon/ledyba/back.2bpp.lz"
+FarfetchDBackpic:    INCBIN "gfx/pokemon/farfetch_d/back.2bpp.lz"
+CyndaquilBackpic:    INCBIN "gfx/pokemon/cyndaquil/back.2bpp.lz"
+ChanseyFrontpic:     INCBIN "gfx/pokemon/chansey/front_gold.2bpp.lz"
+MagmarBackpic:       INCBIN "gfx/pokemon/magmar/back.2bpp.lz"
+VulpixFrontpic:      INCBIN "gfx/pokemon/vulpix/front_gold.2bpp.lz"
+NinetalesBackpic:    INCBIN "gfx/pokemon/ninetales/back.2bpp.lz"
+BayleefBackpic:      INCBIN "gfx/pokemon/bayleef/back.2bpp.lz"
+CroconawBackpic:     INCBIN "gfx/pokemon/croconaw/back.2bpp.lz"
+RapidashBackpic:     INCBIN "gfx/pokemon/rapidash/back.2bpp.lz"
+DoduoBackpic:        INCBIN "gfx/pokemon/doduo/back.2bpp.lz"
+DelibirdFrontpic:    INCBIN "gfx/pokemon/delibird/front_gold.2bpp.lz"
+TogeticFrontpic:     INCBIN "gfx/pokemon/togetic/front_gold.2bpp.lz"
+EspeonFrontpic:      INCBIN "gfx/pokemon/espeon/front_gold.2bpp.lz"
+CrobatFrontpic:      INCBIN "gfx/pokemon/crobat/front_gold.2bpp.lz"
+MankeyBackpic:       INCBIN "gfx/pokemon/mankey/back.2bpp.lz"
+GloomFrontpic:       INCBIN "gfx/pokemon/gloom/front_gold.2bpp.lz"
+HypnoBackpic:        INCBIN "gfx/pokemon/hypno/back.2bpp.lz"
+TyphlosionBackpic:   INCBIN "gfx/pokemon/typhlosion/back.2bpp.lz"
+YanmaFrontpic:       INCBIN "gfx/pokemon/yanma/front_gold.2bpp.lz"
+QuilavaBackpic:      INCBIN "gfx/pokemon/quilava/back.2bpp.lz"
+FurretFrontpic:      INCBIN "gfx/pokemon/furret/front_gold.2bpp.lz"
+SandshrewBackpic:    INCBIN "gfx/pokemon/sandshrew/back.2bpp.lz"
+BeautyPic:           INCBIN "gfx/trainers/beauty.2bpp.lz"
+SailorPic:           INCBIN "gfx/trainers/sailor.2bpp.lz"
+ZubatBackpic:        INCBIN "gfx/pokemon/zubat/back.2bpp.lz"
+UnownUFrontpic:      INCBIN "gfx/pokemon/unown_u/front.2bpp.lz"
+
+
+SECTION "Pics 5", ROMX
+
+ShellderBackpic:     INCBIN "gfx/pokemon/shellder/back.2bpp.lz"
+SunfloraFrontpic:    INCBIN "gfx/pokemon/sunflora/front_gold.2bpp.lz"
+BeedrillBackpic:     INCBIN "gfx/pokemon/beedrill/back.2bpp.lz"
+GruntmPic:           INCBIN "gfx/trainers/grunt_m.2bpp.lz"
+GloomBackpic:        INCBIN "gfx/pokemon/gloom/back.2bpp.lz"
+CuboneBackpic:       INCBIN "gfx/pokemon/cubone/back.2bpp.lz"
+KabutopsBackpic:     INCBIN "gfx/pokemon/kabutops/back.2bpp.lz"
+BellossomFrontpic:   INCBIN "gfx/pokemon/bellossom/front_gold.2bpp.lz"
+GoldeenBackpic:      INCBIN "gfx/pokemon/goldeen/back.2bpp.lz"
+FlaaffyFrontpic:     INCBIN "gfx/pokemon/flaaffy/front_gold.2bpp.lz"
+ArcanineBackpic:     INCBIN "gfx/pokemon/arcanine/back.2bpp.lz"
+FlareonBackpic:      INCBIN "gfx/pokemon/flareon/back.2bpp.lz"
+VileplumeFrontpic:   INCBIN "gfx/pokemon/vileplume/front_gold.2bpp.lz"
+OmanyteBackpic:      INCBIN "gfx/pokemon/omanyte/back.2bpp.lz"
+SudowoodoFrontpic:   INCBIN "gfx/pokemon/sudowoodo/front_gold.2bpp.lz"
+ScientistPic:        INCBIN "gfx/trainers/scientist.2bpp.lz"
+PidgeyBackpic:       INCBIN "gfx/pokemon/pidgey/back.2bpp.lz"
+MisdreavusFrontpic:  INCBIN "gfx/pokemon/misdreavus/front_gold.2bpp.lz"
+PidgeottoFrontpic:   INCBIN "gfx/pokemon/pidgeotto/front_gold.2bpp.lz"
+QwilfishBackpic:     INCBIN "gfx/pokemon/qwilfish/back.2bpp.lz"
+ClefableFrontpic:    INCBIN "gfx/pokemon/clefable/front_gold.2bpp.lz"
+GligarBackpic:       INCBIN "gfx/pokemon/gligar/back.2bpp.lz"
+HaunterFrontpic:     INCBIN "gfx/pokemon/haunter/front_gold.2bpp.lz"
+CharmeleonBackpic:   INCBIN "gfx/pokemon/charmeleon/back.2bpp.lz"
+MagcargoBackpic:     INCBIN "gfx/pokemon/magcargo/back.2bpp.lz"
+NidoqueenBackpic:    INCBIN "gfx/pokemon/nidoqueen/back.2bpp.lz"
+GrimerBackpic:       INCBIN "gfx/pokemon/grimer/back.2bpp.lz"
+ElectabuzzBackpic:   INCBIN "gfx/pokemon/electabuzz/back.2bpp.lz"
+VaporeonFrontpic:    INCBIN "gfx/pokemon/vaporeon/front_gold.2bpp.lz"
+PiloswineFrontpic:   INCBIN "gfx/pokemon/piloswine/front_gold.2bpp.lz"
+LedianBackpic:       INCBIN "gfx/pokemon/ledian/back.2bpp.lz"
+HeracrossBackpic:    INCBIN "gfx/pokemon/heracross/back.2bpp.lz"
+SteelixBackpic:      INCBIN "gfx/pokemon/steelix/back.2bpp.lz"
+PersianBackpic:      INCBIN "gfx/pokemon/persian/back.2bpp.lz"
+MarowakFrontpic:     INCBIN "gfx/pokemon/marowak/front_gold.2bpp.lz"
+LtSurgePic:          INCBIN "gfx/trainers/lt_surge.2bpp.lz"
+TeacherPic:          INCBIN "gfx/trainers/teacher.2bpp.lz"
+EeveeBackpic:        INCBIN "gfx/pokemon/eevee/back.2bpp.lz"
+GengarFrontpic:      INCBIN "gfx/pokemon/gengar/front_gold.2bpp.lz"
+PonytaBackpic:       INCBIN "gfx/pokemon/ponyta/back.2bpp.lz"
+PupitarBackpic:      INCBIN "gfx/pokemon/pupitar/back.2bpp.lz"
+KoffingBackpic:      INCBIN "gfx/pokemon/koffing/back.2bpp.lz"
+
+
+SECTION "Pics 6", ROMX
+
+GirafarigBackpic:    INCBIN "gfx/pokemon/girafarig/back.2bpp.lz"
+BirdKeeperPic:       INCBIN "gfx/trainers/bird_keeper.2bpp.lz"
+OnixBackpic:         INCBIN "gfx/pokemon/onix/back.2bpp.lz"
+FalknerPic:          INCBIN "gfx/trainers/falkner.2bpp.lz"
+OctilleryFrontpic:   INCBIN "gfx/pokemon/octillery/front_gold.2bpp.lz"
+TogeticBackpic:      INCBIN "gfx/pokemon/togetic/back.2bpp.lz"
+MiltankBackpic:      INCBIN "gfx/pokemon/miltank/back_gold.2bpp.lz"
+KarenPic:            INCBIN "gfx/trainers/karen.2bpp.lz"
+GrowlitheBackpic:    INCBIN "gfx/pokemon/growlithe/back.2bpp.lz"
+MachokeBackpic:      INCBIN "gfx/pokemon/machoke/back.2bpp.lz"
+KogaPic:             INCBIN "gfx/trainers/koga.2bpp.lz"
+RaichuBackpic:       INCBIN "gfx/pokemon/raichu/back.2bpp.lz"
+TentacruelBackpic:   INCBIN "gfx/pokemon/tentacruel/back.2bpp.lz"
+NidorinaBackpic:     INCBIN "gfx/pokemon/nidorina/back.2bpp.lz"
+MagikarpFrontpic:    INCBIN "gfx/pokemon/magikarp/front_gold.2bpp.lz"
+PoliwrathBackpic:    INCBIN "gfx/pokemon/poliwrath/back.2bpp.lz"
+SeadraFrontpic:      INCBIN "gfx/pokemon/seadra/front_gold.2bpp.lz"
+WigglytuffFrontpic:  INCBIN "gfx/pokemon/wigglytuff/front_gold.2bpp.lz"
+SwimmermPic:         INCBIN "gfx/trainers/swimmer_m.2bpp.lz"
+JumpluffBackpic:     INCBIN "gfx/pokemon/jumpluff/back.2bpp.lz"
+FlaaffyBackpic:      INCBIN "gfx/pokemon/flaaffy/back.2bpp.lz"
+PinsirBackpic:       INCBIN "gfx/pokemon/pinsir/back.2bpp.lz"
+NidorinoBackpic:     INCBIN "gfx/pokemon/nidorino/back.2bpp.lz"
+CooltrainerfPic:     INCBIN "gfx/trainers/cooltrainer_f.2bpp.lz"
+UmbreonBackpic:      INCBIN "gfx/pokemon/umbreon/back.2bpp.lz"
+JynxFrontpic:        INCBIN "gfx/pokemon/jynx/front_gold.2bpp.lz"
+LedybaFrontpic:      INCBIN "gfx/pokemon/ledyba/front_gold.2bpp.lz"
+SudowoodoBackpic:    INCBIN "gfx/pokemon/sudowoodo/back.2bpp.lz"
+BugsyPic:            INCBIN "gfx/trainers/bugsy.2bpp.lz"
+MarowakBackpic:      INCBIN "gfx/pokemon/marowak/back.2bpp.lz"
+CorsolaFrontpic:     INCBIN "gfx/pokemon/corsola/front_gold.2bpp.lz"
+GeodudeBackpic:      INCBIN "gfx/pokemon/geodude/back.2bpp.lz"
+LedianFrontpic:      INCBIN "gfx/pokemon/ledian/front_gold.2bpp.lz"
+HoundoomBackpic:     INCBIN "gfx/pokemon/houndoom/back.2bpp.lz"
+ScytherBackpic:      INCBIN "gfx/pokemon/scyther/back.2bpp.lz"
+VileplumeBackpic:    INCBIN "gfx/pokemon/vileplume/back.2bpp.lz"
+DugtrioFrontpic:     INCBIN "gfx/pokemon/dugtrio/front_gold.2bpp.lz"
+ChinchouFrontpic:    INCBIN "gfx/pokemon/chinchou/front_gold.2bpp.lz"
+HitmonchanBackpic:   INCBIN "gfx/pokemon/hitmonchan/back.2bpp.lz"
+BlastoiseBackpic:    INCBIN "gfx/pokemon/blastoise/back.2bpp.lz"
+CooltrainermPic:     INCBIN "gfx/trainers/cooltrainer_m.2bpp.lz"
+MisdreavusBackpic:   INCBIN "gfx/pokemon/misdreavus/back.2bpp.lz"
+ScizorBackpic:       INCBIN "gfx/pokemon/scizor/back.2bpp.lz"
+SmeargleBackpic:     INCBIN "gfx/pokemon/smeargle/back.2bpp.lz"
+
+
+SECTION "Pics 7", ROMX
+
+StantlerBackpic:     INCBIN "gfx/pokemon/stantler/back.2bpp.lz"
+CharizardBackpic:    INCBIN "gfx/pokemon/charizard/back.2bpp.lz"
+KadabraBackpic:      INCBIN "gfx/pokemon/kadabra/back.2bpp.lz"
+PrimeapeBackpic:     INCBIN "gfx/pokemon/primeape/back.2bpp.lz"
+PupitarFrontpic:     INCBIN "gfx/pokemon/pupitar/front_gold.2bpp.lz"
+WartortleBackpic:    INCBIN "gfx/pokemon/wartortle/back.2bpp.lz"
+FurretBackpic:       INCBIN "gfx/pokemon/furret/back.2bpp.lz"
+ExeggcuteBackpic:    INCBIN "gfx/pokemon/exeggcute/back.2bpp.lz"
+VulpixBackpic:       INCBIN "gfx/pokemon/vulpix/back.2bpp.lz"
+RaticateBackpic:     INCBIN "gfx/pokemon/raticate/back.2bpp.lz"
+EkansBackpic:        INCBIN "gfx/pokemon/ekans/back.2bpp.lz"
+MeowthFrontpic:      INCBIN "gfx/pokemon/meowth/front_gold.2bpp.lz"
+BurglarPic:          INCBIN "gfx/trainers/burglar.2bpp.lz"
+SeakingBackpic:      INCBIN "gfx/pokemon/seaking/back.2bpp.lz"
+PsyduckBackpic:      INCBIN "gfx/pokemon/psyduck/back.2bpp.lz"
+PikachuBackpic:      INCBIN "gfx/pokemon/pikachu/back.2bpp.lz"
+WeepinbellFrontpic:  INCBIN "gfx/pokemon/weepinbell/front_gold.2bpp.lz"
+RemoraidBackpic:     INCBIN "gfx/pokemon/remoraid/back.2bpp.lz"
+MareepBackpic:       INCBIN "gfx/pokemon/mareep/back.2bpp.lz"
+KingdraBackpic:      INCBIN "gfx/pokemon/kingdra/back.2bpp.lz"
+CamperPic:           INCBIN "gfx/trainers/camper.2bpp.lz"
+ClefairyBackpic:     INCBIN "gfx/pokemon/clefairy/back.2bpp.lz"
+VenonatBackpic:      INCBIN "gfx/pokemon/venonat/back.2bpp.lz"
+SnubbullFrontpic:    INCBIN "gfx/pokemon/snubbull/front_gold.2bpp.lz"
+PokemonProfPic:      INCBIN "gfx/trainers/oak.2bpp.lz"
+MewtwoBackpic:       INCBIN "gfx/pokemon/mewtwo/back.2bpp.lz"
+Rival1Pic:           INCBIN "gfx/trainers/rival1.2bpp.lz"
+BellossomBackpic:    INCBIN "gfx/pokemon/bellossom/back.2bpp.lz"
+SwimmerfPic:         INCBIN "gfx/trainers/swimmer_f.2bpp.lz"
+CalPic:              INCBIN "gfx/trainers/cal.2bpp.lz"
+OfficerPic:          INCBIN "gfx/trainers/officer.2bpp.lz"
+KrabbyFrontpic:      INCBIN "gfx/pokemon/krabby/front_gold.2bpp.lz"
+IvysaurFrontpic:     INCBIN "gfx/pokemon/ivysaur/front_gold.2bpp.lz"
+MukBackpic:          INCBIN "gfx/pokemon/muk/back.2bpp.lz"
+DelibirdBackpic:     INCBIN "gfx/pokemon/delibird/back.2bpp.lz"
+LanturnFrontpic:     INCBIN "gfx/pokemon/lanturn/front_gold.2bpp.lz"
+SabrinaPic:          INCBIN "gfx/trainers/sabrina.2bpp.lz"
+MagikarpBackpic:     INCBIN "gfx/pokemon/magikarp/back.2bpp.lz"
+AriadosBackpic:      INCBIN "gfx/pokemon/ariados/back.2bpp.lz"
+TyrogueBackpic:      INCBIN "gfx/pokemon/tyrogue/back.2bpp.lz"
+WobbuffetFrontpic:   INCBIN "gfx/pokemon/wobbuffet/front_gold.2bpp.lz"
+HitmonchanFrontpic:  INCBIN "gfx/pokemon/hitmonchan/front_gold.2bpp.lz"
+MurkrowBackpic:      INCBIN "gfx/pokemon/murkrow/back.2bpp.lz"
+IvysaurBackpic:      INCBIN "gfx/pokemon/ivysaur/back.2bpp.lz"
+XatuFrontpic:        INCBIN "gfx/pokemon/xatu/front_gold.2bpp.lz"
+SlowbroBackpic:      INCBIN "gfx/pokemon/slowbro/back.2bpp.lz"
+NidoranFFrontpic:    INCBIN "gfx/pokemon/nidoran_f/front_gold.2bpp.lz"
+
+
+SECTION "Pics 8", ROMX
+
+PsyduckFrontpic:     INCBIN "gfx/pokemon/psyduck/front_gold.2bpp.lz"
+GrowlitheFrontpic:   INCBIN "gfx/pokemon/growlithe/front_gold.2bpp.lz"
+PsychicTPic:         INCBIN "gfx/trainers/psychic_t.2bpp.lz"
+GolduckBackpic:      INCBIN "gfx/pokemon/golduck/back.2bpp.lz"
+WeezingBackpic:      INCBIN "gfx/pokemon/weezing/back.2bpp.lz"
+SneaselBackpic:      INCBIN "gfx/pokemon/sneasel/back.2bpp.lz"
+GrimerFrontpic:      INCBIN "gfx/pokemon/grimer/front_gold.2bpp.lz"
+DunsparceFrontpic:   INCBIN "gfx/pokemon/dunsparce/front_gold.2bpp.lz"
+PidgeotBackpic:      INCBIN "gfx/pokemon/pidgeot/back.2bpp.lz"
+GruntfPic:           INCBIN "gfx/trainers/grunt_f.2bpp.lz"
+PorygonFrontpic:     INCBIN "gfx/pokemon/porygon/front_gold.2bpp.lz"
+HoOhBackpic:         INCBIN "gfx/pokemon/ho_oh/back.2bpp.lz"
+RhyhornBackpic:      INCBIN "gfx/pokemon/rhyhorn/back.2bpp.lz"
+PoliwhirlBackpic:    INCBIN "gfx/pokemon/poliwhirl/back.2bpp.lz"
+MewBackpic:          INCBIN "gfx/pokemon/mew/back.2bpp.lz"
+AbraBackpic:         INCBIN "gfx/pokemon/abra/back.2bpp.lz"
+MachopBackpic:       INCBIN "gfx/pokemon/machop/back.2bpp.lz"
+DugtrioBackpic:      INCBIN "gfx/pokemon/dugtrio/back.2bpp.lz"
+AerodactylBackpic:   INCBIN "gfx/pokemon/aerodactyl/back.2bpp.lz"
+NidoranFBackpic:     INCBIN "gfx/pokemon/nidoran_f/back.2bpp.lz"
+WeepinbellBackpic:   INCBIN "gfx/pokemon/weepinbell/back.2bpp.lz"
+AipomBackpic:        INCBIN "gfx/pokemon/aipom/back.2bpp.lz"
+GravelerBackpic:     INCBIN "gfx/pokemon/graveler/back.2bpp.lz"
+EspeonBackpic:       INCBIN "gfx/pokemon/espeon/back.2bpp.lz"
+CyndaquilFrontpic:   INCBIN "gfx/pokemon/cyndaquil/front_gold.2bpp.lz"
+TotodileBackpic:     INCBIN "gfx/pokemon/totodile/back.2bpp.lz"
+MurkrowFrontpic:     INCBIN "gfx/pokemon/murkrow/front_gold.2bpp.lz"
+MankeyFrontpic:      INCBIN "gfx/pokemon/mankey/front_gold.2bpp.lz"
+SnubbullBackpic:     INCBIN "gfx/pokemon/snubbull/back.2bpp.lz"
+KinglerBackpic:      INCBIN "gfx/pokemon/kingler/back.2bpp.lz"
+GengarBackpic:       INCBIN "gfx/pokemon/gengar/back.2bpp.lz"
+RattataBackpic:      INCBIN "gfx/pokemon/rattata/back.2bpp.lz"
+CuboneFrontpic:      INCBIN "gfx/pokemon/cubone/front_gold.2bpp.lz"
+AbraFrontpic:        INCBIN "gfx/pokemon/abra/front_gold.2bpp.lz"
+YoungsterPic:        INCBIN "gfx/trainers/youngster.2bpp.lz"
+WillPic:             INCBIN "gfx/trainers/will.2bpp.lz"
+SchoolboyPic:        INCBIN "gfx/trainers/schoolboy.2bpp.lz"
+ErikaPic:            INCBIN "gfx/trainers/erika.2bpp.lz"
+HoothootBackpic:     INCBIN "gfx/pokemon/hoothoot/back.2bpp.lz"
+UmbreonFrontpic:     INCBIN "gfx/pokemon/umbreon/front_gold.2bpp.lz"
+JaninePic:           INCBIN "gfx/trainers/janine.2bpp.lz"
+StaryuFrontpic:      INCBIN "gfx/pokemon/staryu/front_gold.2bpp.lz"
+GoldeenFrontpic:     INCBIN "gfx/pokemon/goldeen/front_gold.2bpp.lz"
+NoctowlBackpic:      INCBIN "gfx/pokemon/noctowl/back.2bpp.lz"
+MortyPic:            INCBIN "gfx/trainers/morty.2bpp.lz"
+KabutoBackpic:       INCBIN "gfx/pokemon/kabuto/back.2bpp.lz"
+VenonatFrontpic:     INCBIN "gfx/pokemon/venonat/front_gold.2bpp.lz"
+MeganiumBackpic:     INCBIN "gfx/pokemon/meganium/back.2bpp.lz"
+MeowthBackpic:       INCBIN "gfx/pokemon/meowth/back.2bpp.lz"
+UnownZBackpic:       INCBIN "gfx/pokemon/unown_z/back.2bpp.lz"
+
+
+SECTION "Pics 9", ROMX
+
+PicnickerPic:        INCBIN "gfx/trainers/picnicker.2bpp.lz"
+VictreebelBackpic:   INCBIN "gfx/pokemon/victreebel/back.2bpp.lz"
+SuperNerdPic:        INCBIN "gfx/trainers/super_nerd.2bpp.lz"
+LickitungBackpic:    INCBIN "gfx/pokemon/lickitung/back.2bpp.lz"
+Porygon2Backpic:     INCBIN "gfx/pokemon/porygon2/back.2bpp.lz"
+HaunterBackpic:      INCBIN "gfx/pokemon/haunter/back.2bpp.lz"
+XatuBackpic:         INCBIN "gfx/pokemon/xatu/back.2bpp.lz"
+RedPic:              INCBIN "gfx/trainers/red.2bpp.lz"
+JasminePic:          INCBIN "gfx/trainers/jasmine.2bpp.lz"
+PinecoBackpic:       INCBIN "gfx/pokemon/pineco/back.2bpp.lz"
+SlugmaBackpic:       INCBIN "gfx/pokemon/slugma/back.2bpp.lz"
+SeelBackpic:         INCBIN "gfx/pokemon/seel/back.2bpp.lz"
+QuagsireBackpic:     INCBIN "gfx/pokemon/quagsire/back.2bpp.lz"
+WhitneyPic:          INCBIN "gfx/trainers/whitney.2bpp.lz"
+ShellderFrontpic:    INCBIN "gfx/pokemon/shellder/front_gold.2bpp.lz"
+JolteonBackpic:      INCBIN "gfx/pokemon/jolteon/back.2bpp.lz"
+EkansFrontpic:       INCBIN "gfx/pokemon/ekans/front_gold.2bpp.lz"
+ParasectBackpic:     INCBIN "gfx/pokemon/parasect/back.2bpp.lz"
+AipomFrontpic:       INCBIN "gfx/pokemon/aipom/front_gold.2bpp.lz"
+MagbyFrontpic:       INCBIN "gfx/pokemon/magby/front_gold.2bpp.lz"
+QuagsireFrontpic:    INCBIN "gfx/pokemon/quagsire/front_gold.2bpp.lz"
+GranbullBackpic:     INCBIN "gfx/pokemon/granbull/back.2bpp.lz"
+HoppipBackpic:       INCBIN "gfx/pokemon/hoppip/back.2bpp.lz"
+BluePic:             INCBIN "gfx/trainers/blue.2bpp.lz"
+GentlemanPic:        INCBIN "gfx/trainers/gentleman.2bpp.lz"
+ExecutivemPic:       INCBIN "gfx/trainers/executive_m.2bpp.lz"
+PinecoFrontpic:      INCBIN "gfx/pokemon/pineco/front_gold.2bpp.lz"
+MagbyBackpic:        INCBIN "gfx/pokemon/magby/back.2bpp.lz"
+LaprasBackpic:       INCBIN "gfx/pokemon/lapras/back.2bpp.lz"
+ChikoritaBackpic:    INCBIN "gfx/pokemon/chikorita/back.2bpp.lz"
+DragonairBackpic:    INCBIN "gfx/pokemon/dragonair/back.2bpp.lz"
+ZapdosBackpic:       INCBIN "gfx/pokemon/zapdos/back.2bpp.lz"
+CharmanderFrontpic:  INCBIN "gfx/pokemon/charmander/front_gold.2bpp.lz"
+ChinchouBackpic:     INCBIN "gfx/pokemon/chinchou/back.2bpp.lz"
+HoothootFrontpic:    INCBIN "gfx/pokemon/hoothoot/front_gold.2bpp.lz"
+SpearowBackpic:      INCBIN "gfx/pokemon/spearow/back.2bpp.lz"
+ChanseyBackpic:      INCBIN "gfx/pokemon/chansey/back.2bpp.lz"
+MachopFrontpic:      INCBIN "gfx/pokemon/machop/front_gold.2bpp.lz"
+SkiploomBackpic:     INCBIN "gfx/pokemon/skiploom/back.2bpp.lz"
+TotodileFrontpic:    INCBIN "gfx/pokemon/totodile/front_gold.2bpp.lz"
+Rival2Pic:           INCBIN "gfx/trainers/rival2.2bpp.lz"
+CharmanderBackpic:   INCBIN "gfx/pokemon/charmander/back.2bpp.lz"
+MistyPic:            INCBIN "gfx/trainers/misty.2bpp.lz"
+BellsproutFrontpic:  INCBIN "gfx/pokemon/bellsprout/front_gold.2bpp.lz"
+SandshrewFrontpic:   INCBIN "gfx/pokemon/sandshrew/front_gold.2bpp.lz"
+BlainePic:           INCBIN "gfx/trainers/blaine.2bpp.lz"
+SlugmaFrontpic:      INCBIN "gfx/pokemon/slugma/front_gold.2bpp.lz"
+TyrogueFrontpic:     INCBIN "gfx/pokemon/tyrogue/front_gold.2bpp.lz"
+LarvitarBackpic:     INCBIN "gfx/pokemon/larvitar/back.2bpp.lz"
+SunkernBackpic:      INCBIN "gfx/pokemon/sunkern/back.2bpp.lz"
+PorygonBackpic:      INCBIN "gfx/pokemon/porygon/back.2bpp.lz"
+ClefairyFrontpic:    INCBIN "gfx/pokemon/clefairy/front_gold.2bpp.lz"
+BulbasaurBackpic:    INCBIN "gfx/pokemon/bulbasaur/back.2bpp.lz"
+
+
+SECTION "Pics 10", ROMX
+
+Porygon2Frontpic:    INCBIN "gfx/pokemon/porygon2/front_gold.2bpp.lz"
+PolitoedBackpic:     INCBIN "gfx/pokemon/politoed/back.2bpp.lz"
+ParasBackpic:        INCBIN "gfx/pokemon/paras/back.2bpp.lz"
+HoundourFrontpic:    INCBIN "gfx/pokemon/houndour/front_gold.2bpp.lz"
+MareepFrontpic:      INCBIN "gfx/pokemon/mareep/front_gold.2bpp.lz"
+TentacoolBackpic:    INCBIN "gfx/pokemon/tentacool/back.2bpp.lz"
+DoduoFrontpic:       INCBIN "gfx/pokemon/doduo/front_gold.2bpp.lz"
+OmanyteFrontpic:     INCBIN "gfx/pokemon/omanyte/front_gold.2bpp.lz"
+EeveeFrontpic:       INCBIN "gfx/pokemon/eevee/front_gold.2bpp.lz"
+VaporeonBackpic:     INCBIN "gfx/pokemon/vaporeon/back.2bpp.lz"
+ExecutivefPic:       INCBIN "gfx/trainers/executive_f.2bpp.lz"
+PichuBackpic:        INCBIN "gfx/pokemon/pichu/back.2bpp.lz"
+CorsolaBackpic:      INCBIN "gfx/pokemon/corsola/back.2bpp.lz"
+JigglypuffFrontpic:  INCBIN "gfx/pokemon/jigglypuff/front_gold.2bpp.lz"
+TogepiBackpic:       INCBIN "gfx/pokemon/togepi/back.2bpp.lz"
+SmoochumBackpic:     INCBIN "gfx/pokemon/smoochum/back.2bpp.lz"
+DunsparceBackpic:    INCBIN "gfx/pokemon/dunsparce/back.2bpp.lz"
+BellsproutBackpic:   INCBIN "gfx/pokemon/bellsprout/back.2bpp.lz"
+MarillFrontpic:      INCBIN "gfx/pokemon/marill/front_gold.2bpp.lz"
+SmoochumFrontpic:    INCBIN "gfx/pokemon/smoochum/front_gold.2bpp.lz"
+ChikoritaFrontpic:   INCBIN "gfx/pokemon/chikorita/front_gold.2bpp.lz"
+PikachuFrontpic:     INCBIN "gfx/pokemon/pikachu/front_gold.2bpp.lz"
+PidgeottoBackpic:    INCBIN "gfx/pokemon/pidgeotto/back.2bpp.lz"
+StaryuBackpic:       INCBIN "gfx/pokemon/staryu/back.2bpp.lz"
+MrMimeBackpic:       INCBIN "gfx/pokemon/mr__mime/back.2bpp.lz"
+CaterpieBackpic:     INCBIN "gfx/pokemon/caterpie/back.2bpp.lz"
+NidoranMFrontpic:    INCBIN "gfx/pokemon/nidoran_m/front_gold.2bpp.lz"
+PrycePic:            INCBIN "gfx/trainers/pryce.2bpp.lz"
+LanturnBackpic:      INCBIN "gfx/pokemon/lanturn/back.2bpp.lz"
+BrockPic:            INCBIN "gfx/trainers/brock.2bpp.lz"
+AmpharosBackpic:     INCBIN "gfx/pokemon/ampharos/back.2bpp.lz"
+RemoraidFrontpic:    INCBIN "gfx/pokemon/remoraid/front_gold.2bpp.lz"
+DragoniteBackpic:    INCBIN "gfx/pokemon/dragonite/back.2bpp.lz"
+PidgeyFrontpic:      INCBIN "gfx/pokemon/pidgey/front_gold.2bpp.lz"
+ZubatFrontpic:       INCBIN "gfx/pokemon/zubat/front_gold.2bpp.lz"
+ArbokBackpic:        INCBIN "gfx/pokemon/arbok/back.2bpp.lz"
+EnteiBackpic:        INCBIN "gfx/pokemon/entei/back.2bpp.lz"
+HitmonleeBackpic:    INCBIN "gfx/pokemon/hitmonlee/back.2bpp.lz"
+ParasFrontpic:       INCBIN "gfx/pokemon/paras/front_gold.2bpp.lz"
+UrsaringBackpic:     INCBIN "gfx/pokemon/ursaring/back.2bpp.lz"
+TeddiursaBackpic:    INCBIN "gfx/pokemon/teddiursa/back.2bpp.lz"
+SagePic:             INCBIN "gfx/trainers/sage.2bpp.lz"
+KakunaBackpic:       INCBIN "gfx/pokemon/kakuna/back.2bpp.lz"
+PhanpyBackpic:       INCBIN "gfx/pokemon/phanpy/back.2bpp.lz"
+SkiploomFrontpic:    INCBIN "gfx/pokemon/skiploom/front_gold.2bpp.lz"
+CelebiFrontpic:      INCBIN "gfx/pokemon/celebi/front_gold.2bpp.lz"
+DratiniFrontpic:     INCBIN "gfx/pokemon/dratini/front_gold.2bpp.lz"
+WobbuffetBackpic:    INCBIN "gfx/pokemon/wobbuffet/back.2bpp.lz"
+TentacoolFrontpic:   INCBIN "gfx/pokemon/tentacool/front_gold.2bpp.lz"
+CrobatBackpic:       INCBIN "gfx/pokemon/crobat/back.2bpp.lz"
+BlisseyBackpic:      INCBIN "gfx/pokemon/blissey/back.2bpp.lz"
+LarvitarFrontpic:    INCBIN "gfx/pokemon/larvitar/front_gold.2bpp.lz"
+StarmieBackpic:      INCBIN "gfx/pokemon/starmie/back.2bpp.lz"
+IgglybuffBackpic:    INCBIN "gfx/pokemon/igglybuff/back.2bpp.lz"
+SlowpokeFrontpic:    INCBIN "gfx/pokemon/slowpoke/front_gold.2bpp.lz"
+ElectrodeFrontpic:   INCBIN "gfx/pokemon/electrode/front_gold.2bpp.lz"
+AzumarillBackpic:    INCBIN "gfx/pokemon/azumarill/back.2bpp.lz"
+SpearowFrontpic:     INCBIN "gfx/pokemon/spearow/front_gold.2bpp.lz"
+
+
+SECTION "Pics 11", ROMX
+
+OctilleryBackpic:    INCBIN "gfx/pokemon/octillery/back.2bpp.lz"
+RaikouBackpic:       INCBIN "gfx/pokemon/raikou/back.2bpp.lz"
+ArticunoBackpic:     INCBIN "gfx/pokemon/articuno/back.2bpp.lz"
+HoppipFrontpic:      INCBIN "gfx/pokemon/hoppip/front_gold.2bpp.lz"
+MewFrontpic:         INCBIN "gfx/pokemon/mew/front_gold.2bpp.lz"
+RattataFrontpic:     INCBIN "gfx/pokemon/rattata/front_gold.2bpp.lz"
+HorseaBackpic:       INCBIN "gfx/pokemon/horsea/back.2bpp.lz"
+SentretBackpic:      INCBIN "gfx/pokemon/sentret/back.2bpp.lz"
+SquirtleFrontpic:    INCBIN "gfx/pokemon/squirtle/front_gold.2bpp.lz"
+WigglytuffBackpic:   INCBIN "gfx/pokemon/wigglytuff/back.2bpp.lz"
+QwilfishFrontpic:    INCBIN "gfx/pokemon/qwilfish/front_gold.2bpp.lz"
+TeddiursaFrontpic:   INCBIN "gfx/pokemon/teddiursa/front_gold.2bpp.lz"
+DittoBackpic:        INCBIN "gfx/pokemon/ditto/back.2bpp.lz"
+WeedleBackpic:       INCBIN "gfx/pokemon/weedle/back.2bpp.lz"
+ShuckleFrontpic:     INCBIN "gfx/pokemon/shuckle/front_gold.2bpp.lz"
+PhanpyFrontpic:      INCBIN "gfx/pokemon/phanpy/front_gold.2bpp.lz"
+SentretFrontpic:     INCBIN "gfx/pokemon/sentret/front_gold.2bpp.lz"
+PoliwagFrontpic:     INCBIN "gfx/pokemon/poliwag/front_gold.2bpp.lz"
+CleffaBackpic:       INCBIN "gfx/pokemon/cleffa/back.2bpp.lz"
+DrowzeeBackpic:      INCBIN "gfx/pokemon/drowzee/back.2bpp.lz"
+GastlyBackpic:       INCBIN "gfx/pokemon/gastly/back.2bpp.lz"
+DratiniBackpic:      INCBIN "gfx/pokemon/dratini/back.2bpp.lz"
+FearowBackpic:       INCBIN "gfx/pokemon/fearow/back.2bpp.lz"
+MarillBackpic:       INCBIN "gfx/pokemon/marill/back.2bpp.lz"
+WooperFrontpic:      INCBIN "gfx/pokemon/wooper/front_gold.2bpp.lz"
+HoundourBackpic:     INCBIN "gfx/pokemon/houndour/back.2bpp.lz"
+KabutoFrontpic:      INCBIN "gfx/pokemon/kabuto/front_gold.2bpp.lz"
+ElectrodeBackpic:    INCBIN "gfx/pokemon/electrode/back.2bpp.lz"
+MetapodBackpic:      INCBIN "gfx/pokemon/metapod/back.2bpp.lz"
+JigglypuffBackpic:   INCBIN "gfx/pokemon/jigglypuff/back.2bpp.lz"
+OddishBackpic:       INCBIN "gfx/pokemon/oddish/back.2bpp.lz"
+SunkernFrontpic:     INCBIN "gfx/pokemon/sunkern/front_gold.2bpp.lz"
+SpinarakBackpic:     INCBIN "gfx/pokemon/spinarak/back.2bpp.lz"
+SkarmoryBackpic:     INCBIN "gfx/pokemon/skarmory/back.2bpp.lz"
+PoliwagBackpic:      INCBIN "gfx/pokemon/poliwag/back.2bpp.lz"
+SquirtleBackpic:     INCBIN "gfx/pokemon/squirtle/back.2bpp.lz"
+DewgongBackpic:      INCBIN "gfx/pokemon/dewgong/back.2bpp.lz"
+ShuckleBackpic:      INCBIN "gfx/pokemon/shuckle/back.2bpp.lz"
+SlowpokeBackpic:     INCBIN "gfx/pokemon/slowpoke/back.2bpp.lz"
+GeodudeFrontpic:     INCBIN "gfx/pokemon/geodude/front_gold.2bpp.lz"
+DonphanBackpic:      INCBIN "gfx/pokemon/donphan/back.2bpp.lz"
+WooperBackpic:       INCBIN "gfx/pokemon/wooper/back.2bpp.lz"
+TaurosBackpic:       INCBIN "gfx/pokemon/tauros/back.2bpp.lz"
+WeedleFrontpic:      INCBIN "gfx/pokemon/weedle/front_gold.2bpp.lz"
+CleffaFrontpic:      INCBIN "gfx/pokemon/cleffa/front_gold.2bpp.lz"
+VoltorbBackpic:      INCBIN "gfx/pokemon/voltorb/back.2bpp.lz"
+PichuFrontpic:       INCBIN "gfx/pokemon/pichu/front_gold.2bpp.lz"
+BulbasaurFrontpic:   INCBIN "gfx/pokemon/bulbasaur/front_gold.2bpp.lz"
+SwinubBackpic:       INCBIN "gfx/pokemon/swinub/back.2bpp.lz"
+TangelaBackpic:      INCBIN "gfx/pokemon/tangela/back.2bpp.lz"
+IgglybuffFrontpic:   INCBIN "gfx/pokemon/igglybuff/front_gold.2bpp.lz"
+SpinarakFrontpic:    INCBIN "gfx/pokemon/spinarak/front.2bpp.lz"
+GolemBackpic:        INCBIN "gfx/pokemon/golem/back.2bpp.lz"
+MantineBackpic:      INCBIN "gfx/pokemon/mantine/back.2bpp.lz"
+HorseaFrontpic:      INCBIN "gfx/pokemon/horsea/front_gold.2bpp.lz"
+PiloswineBackpic:    INCBIN "gfx/pokemon/piloswine/back.2bpp.lz"
+KakunaFrontpic:      INCBIN "gfx/pokemon/kakuna/front_gold.2bpp.lz"
+SwinubFrontpic:      INCBIN "gfx/pokemon/swinub/front.2bpp.lz"
+NatuBackpic:         INCBIN "gfx/pokemon/natu/back.2bpp.lz"
+OddishFrontpic:      INCBIN "gfx/pokemon/oddish/front_gold.2bpp.lz"
+DiglettFrontpic:     INCBIN "gfx/pokemon/diglett/front_gold.2bpp.lz"
+DiglettBackpic:      INCBIN "gfx/pokemon/diglett/back.2bpp.lz"
+UnownCFrontpic:      INCBIN "gfx/pokemon/unown_c/front.2bpp.lz"
+TogepiFrontpic:      INCBIN "gfx/pokemon/togepi/front_gold.2bpp.lz"
+MetapodFrontpic:     INCBIN "gfx/pokemon/metapod/front_gold.2bpp.lz"
+JynxBackpic:         INCBIN "gfx/pokemon/jynx/back.2bpp.lz"
+CaterpieFrontpic:    INCBIN "gfx/pokemon/caterpie/front_gold.2bpp.lz"
+UnownHBackpic:       INCBIN "gfx/pokemon/unown_h/back.2bpp.lz"
+GolbatBackpic:       INCBIN "gfx/pokemon/golbat/back.2bpp.lz"
+UnownGFrontpic:      INCBIN "gfx/pokemon/unown_g/front.2bpp.lz"
+UnownVBackpic:       INCBIN "gfx/pokemon/unown_v/back.2bpp.lz"
+
+
+SECTION "Unown Pic Pointers", ROMX
+
+INCLUDE "data/pokemon/unown_pic_pointers.asm"
+
+
+SECTION "Pics 12", ROMX
+
+SuicuneFrontpic:     INCBIN "gfx/pokemon/suicune/front.2bpp.lz"
+RhyhornFrontpic:     INCBIN "gfx/pokemon/rhyhorn/front_gold.2bpp.lz"
+TyranitarFrontpic:   INCBIN "gfx/pokemon/tyranitar/front_gold.2bpp.lz"
+MoltresFrontpic:     INCBIN "gfx/pokemon/moltres/front_gold.2bpp.lz"
+ZapdosFrontpic:      INCBIN "gfx/pokemon/zapdos/front_gold.2bpp.lz"
+SeakingFrontpic:     INCBIN "gfx/pokemon/seaking/front_gold.2bpp.lz"
+MukFrontpic:         INCBIN "gfx/pokemon/muk/front_gold.2bpp.lz"
+DragoniteFrontpic:   INCBIN "gfx/pokemon/dragonite/front_gold.2bpp.lz"
+AlakazamFrontpic:    INCBIN "gfx/pokemon/alakazam/front_gold.2bpp.lz"
+AerodactylFrontpic:  INCBIN "gfx/pokemon/aerodactyl/front_gold.2bpp.lz"
+TyphlosionFrontpic:  INCBIN "gfx/pokemon/typhlosion/front_gold.2bpp.lz"
+MachokeFrontpic:     INCBIN "gfx/pokemon/machoke/front_gold.2bpp.lz"
+ExeggcuteFrontpic:   INCBIN "gfx/pokemon/exeggcute/front_gold.2bpp.lz"
+FirebreatherPic:     INCBIN "gfx/trainers/firebreather.2bpp.lz"
+ScizorFrontpic:      INCBIN "gfx/pokemon/scizor/front_gold.2bpp.lz"
+ArticunoFrontpic:    INCBIN "gfx/pokemon/articuno/front_gold.2bpp.lz"
+DodrioFrontpic:      INCBIN "gfx/pokemon/dodrio/front_gold.2bpp.lz"
+ButterfreeFrontpic:  INCBIN "gfx/pokemon/butterfree/front_gold.2bpp.lz"
+PidgeotFrontpic:     INCBIN "gfx/pokemon/pidgeot/front_gold.2bpp.lz"
+PersianFrontpic:     INCBIN "gfx/pokemon/persian/front_gold.2bpp.lz"
+DewgongFrontpic:     INCBIN "gfx/pokemon/dewgong/front_gold.2bpp.lz"
+CloysterFrontpic:    INCBIN "gfx/pokemon/cloyster/front_gold.2bpp.lz"
+GolduckFrontpic:     INCBIN "gfx/pokemon/golduck/front_gold.2bpp.lz"
+ArcanineFrontpic:    INCBIN "gfx/pokemon/arcanine/front_gold.2bpp.lz"
+OnixFrontpic:        INCBIN "gfx/pokemon/onix/front_gold.2bpp.lz"
+ChampionPic:         INCBIN "gfx/trainers/champion.2bpp.lz"
+SlowkingFrontpic:    INCBIN "gfx/pokemon/slowking/front_gold.2bpp.lz"
+VictreebelFrontpic:  INCBIN "gfx/pokemon/victreebel/front_gold.2bpp.lz"
+BlackbeltTPic:       INCBIN "gfx/trainers/blackbelt_t.2bpp.lz"
+UnownCBackpic:       INCBIN "gfx/pokemon/unown_c/back.2bpp.lz"
+
+
+SECTION "Trainer Pic Pointers", ROMX
+
+INCLUDE "data/trainers/pic_pointers.asm"
+
+
+SECTION "Pics 13", ROMX
+
+HypnoFrontpic:       INCBIN "gfx/pokemon/hypno/front_gold.2bpp.lz"
+BlisseyFrontpic:     INCBIN "gfx/pokemon/blissey/front_gold.2bpp.lz"
+BikerPic:            INCBIN "gfx/trainers/biker.2bpp.lz"
+PrimeapeFrontpic:    INCBIN "gfx/pokemon/primeape/front_gold.2bpp.lz"
+RaichuFrontpic:      INCBIN "gfx/pokemon/raichu/front_gold.2bpp.lz"
+StantlerFrontpic:    INCBIN "gfx/pokemon/stantler/front_gold.2bpp.lz"
+ExeggutorFrontpic:   INCBIN "gfx/pokemon/exeggutor/front_gold.2bpp.lz"
+BrunoPic:            INCBIN "gfx/trainers/bruno.2bpp.lz"
+ForretressFrontpic:  INCBIN "gfx/pokemon/forretress/front_gold.2bpp.lz"
+MagmarFrontpic:      INCBIN "gfx/pokemon/magmar/front_gold.2bpp.lz"
+HikerPic:            INCBIN "gfx/trainers/hiker.2bpp.lz"
+AzumarillFrontpic:   INCBIN "gfx/pokemon/azumarill/front_gold.2bpp.lz"
+KinglerFrontpic:     INCBIN "gfx/pokemon/kingler/front_gold.2bpp.lz"
+PoliwrathFrontpic:   INCBIN "gfx/pokemon/poliwrath/front_gold.2bpp.lz"
+PinsirFrontpic:      INCBIN "gfx/pokemon/pinsir/front_gold.2bpp.lz"
+MewtwoFrontpic:      INCBIN "gfx/pokemon/mewtwo/front_gold.2bpp.lz"
+SlowbroFrontpic:     INCBIN "gfx/pokemon/slowbro/front_gold.2bpp.lz"
+KadabraFrontpic:     INCBIN "gfx/pokemon/kadabra/front_gold.2bpp.lz"
+SnorlaxFrontpic:     INCBIN "gfx/pokemon/snorlax/front_gold.2bpp.lz"
+MediumPic:           INCBIN "gfx/trainers/medium.2bpp.lz"
+DonphanFrontpic:     INCBIN "gfx/pokemon/donphan/front_gold.2bpp.lz"
+MantineFrontpic:     INCBIN "gfx/pokemon/mantine/front_gold.2bpp.lz"
+HitmontopFrontpic:   INCBIN "gfx/pokemon/hitmontop/front_gold.2bpp.lz"
+FisherPic:           INCBIN "gfx/trainers/fisher.2bpp.lz"
+PolitoedFrontpic:    INCBIN "gfx/pokemon/politoed/front_gold.2bpp.lz"
+ElectabuzzFrontpic:  INCBIN "gfx/pokemon/electabuzz/front_gold.2bpp.lz"
+TentacruelFrontpic:  INCBIN "gfx/pokemon/tentacruel/front_gold.2bpp.lz"
+NidokingBackpic:     INCBIN "gfx/pokemon/nidoking/back.2bpp.lz"
+PokefanmPic:         INCBIN "gfx/trainers/pokefan_m.2bpp.lz"
+BoarderPic:          INCBIN "gfx/trainers/boarder.2bpp.lz"
+UrsaringFrontpic:    INCBIN "gfx/pokemon/ursaring/front_gold.2bpp.lz"
+MachampBackpic:      INCBIN "gfx/pokemon/machamp/back.2bpp.lz"
+
+
+SECTION "Pics 14", ROMX
+
+UnownHFrontpic:      INCBIN "gfx/pokemon/unown_h/front.2bpp.lz"
+DittoFrontpic:       INCBIN "gfx/pokemon/ditto/front_gold.2bpp.lz"
+SnorlaxBackpic:      INCBIN "gfx/pokemon/snorlax/back.2bpp.lz"
+MagnemiteBackpic:    INCBIN "gfx/pokemon/magnemite/back.2bpp.lz"
+UnownGBackpic:       INCBIN "gfx/pokemon/unown_g/back.2bpp.lz"
+ForretressBackpic:   INCBIN "gfx/pokemon/forretress/back.2bpp.lz"
+NatuFrontpic:        INCBIN "gfx/pokemon/natu/front_gold.2bpp.lz"
+UnownSFrontpic:      INCBIN "gfx/pokemon/unown_s/front.2bpp.lz"
+UnownVFrontpic:      INCBIN "gfx/pokemon/unown_v/front.2bpp.lz"
+UnownFBackpic:       INCBIN "gfx/pokemon/unown_f/back.2bpp.lz"
+UnownDBackpic:       INCBIN "gfx/pokemon/unown_d/back.2bpp.lz"
+UnownDFrontpic:      INCBIN "gfx/pokemon/unown_d/front.2bpp.lz"
+UnownSBackpic:       INCBIN "gfx/pokemon/unown_s/back.2bpp.lz"
+UnownEFrontpic:      INCBIN "gfx/pokemon/unown_e/front.2bpp.lz"
+UnownEBackpic:       INCBIN "gfx/pokemon/unown_e/back.2bpp.lz"
+VoltorbFrontpic:     INCBIN "gfx/pokemon/voltorb/front_gold.2bpp.lz"
+MagnemiteFrontpic:   INCBIN "gfx/pokemon/magnemite/front_gold.2bpp.lz"
+UnownZFrontpic:      INCBIN "gfx/pokemon/unown_z/front.2bpp.lz"
+UnownBFrontpic:      INCBIN "gfx/pokemon/unown_b/front.2bpp.lz"
+UnownFFrontpic:      INCBIN "gfx/pokemon/unown_f/front.2bpp.lz"
+UnownJBackpic:       INCBIN "gfx/pokemon/unown_j/back.2bpp.lz"
+UnownBBackpic:       INCBIN "gfx/pokemon/unown_b/back.2bpp.lz"
+UnownWFrontpic:      INCBIN "gfx/pokemon/unown_w/front.2bpp.lz"
+UnownOBackpic:       INCBIN "gfx/pokemon/unown_o/back.2bpp.lz"
+UnownJFrontpic:      INCBIN "gfx/pokemon/unown_j/front.2bpp.lz"
+UnownWBackpic:       INCBIN "gfx/pokemon/unown_w/back.2bpp.lz"
+UnownNFrontpic:      INCBIN "gfx/pokemon/unown_n/front.2bpp.lz"
+UnownKFrontpic:      INCBIN "gfx/pokemon/unown_k/front.2bpp.lz"
+UnownNBackpic:       INCBIN "gfx/pokemon/unown_n/back.2bpp.lz"
+UnownABackpic:       INCBIN "gfx/pokemon/unown_a/back.2bpp.lz"
+UnownAFrontpic:      INCBIN "gfx/pokemon/unown_a/front.2bpp.lz"
+UnownMBackpic:       INCBIN "gfx/pokemon/unown_m/back.2bpp.lz"
+UnownTFrontpic:      INCBIN "gfx/pokemon/unown_t/front.2bpp.lz"
+UnownOFrontpic:      INCBIN "gfx/pokemon/unown_o/front.2bpp.lz"
+UnownKBackpic:       INCBIN "gfx/pokemon/unown_k/back.2bpp.lz"
+UnownTBackpic:       INCBIN "gfx/pokemon/unown_t/back.2bpp.lz"
+UnownXBackpic:       INCBIN "gfx/pokemon/unown_x/back.2bpp.lz"
+UnownMFrontpic:      INCBIN "gfx/pokemon/unown_m/front.2bpp.lz"
+UnownLBackpic:       INCBIN "gfx/pokemon/unown_l/back.2bpp.lz"
+UnownUBackpic:       INCBIN "gfx/pokemon/unown_u/back.2bpp.lz"
+UnownLFrontpic:      INCBIN "gfx/pokemon/unown_l/front.2bpp.lz"
+UnownYFrontpic:      INCBIN "gfx/pokemon/unown_y/front.2bpp.lz"
+UnownXFrontpic:      INCBIN "gfx/pokemon/unown_x/front.2bpp.lz"
+UnownQBackpic:       INCBIN "gfx/pokemon/unown_q/back.2bpp.lz"
+UnownQFrontpic:      INCBIN "gfx/pokemon/unown_q/front.2bpp.lz"
+UnownPFrontpic:      INCBIN "gfx/pokemon/unown_p/front.2bpp.lz"
+UnownYBackpic:       INCBIN "gfx/pokemon/unown_y/back.2bpp.lz"
+UnownIBackpic:       INCBIN "gfx/pokemon/unown_i/back.2bpp.lz"
+UnownPBackpic:       INCBIN "gfx/pokemon/unown_p/back.2bpp.lz"
+UnownIFrontpic:      INCBIN "gfx/pokemon/unown_i/front.2bpp.lz"
+UnownRBackpic:       INCBIN "gfx/pokemon/unown_r/back.2bpp.lz"
+UnownRFrontpic:      INCBIN "gfx/pokemon/unown_r/front.2bpp.lz"
diff --git a/gfx/pics.asm b/gfx/pics_silver.asm
index fd6bde78..c6d29f6c 100644
--- a/gfx/pics.asm
+++ b/gfx/pics_silver.asm
@@ -1,686 +1,15 @@
 INCLUDE "constants.asm"
 
 
-IF DEF(_GOLD)
+; PokemonPicPointers and UnownPicPointers are assumed to start at the same
+; address, but in different banks. This is enforced in pokecrystal.link.
 
-SECTION "Pic Pointers", ROMX
-
-INCLUDE "data/pokemon/pic_pointers.asm"
-
-SECTION "Pics 1", ROMX
-
-NidokingFrontpic:    INCBIN "gfx/pokemon/nidoking/front_gold.2bpp.lz"
-HoOhFrontpic:        INCBIN "gfx/pokemon/ho_oh/front_gold.2bpp.lz"
-GyaradosFrontpic:    INCBIN "gfx/pokemon/gyarados/front_gold.2bpp.lz"
-MeganiumFrontpic:    INCBIN "gfx/pokemon/meganium/front_gold.2bpp.lz"
-MachampFrontpic:     INCBIN "gfx/pokemon/machamp/front_gold.2bpp.lz"
-FeraligatrFrontpic:  INCBIN "gfx/pokemon/feraligatr/front_gold.2bpp.lz"
-SteelixFrontpic:     INCBIN "gfx/pokemon/steelix/front_gold.2bpp.lz"
-NinetalesFrontpic:   INCBIN "gfx/pokemon/ninetales/front_gold.2bpp.lz"
-RhydonFrontpic:      INCBIN "gfx/pokemon/rhydon/front_gold.2bpp.lz"
-RaikouFrontpic:      INCBIN "gfx/pokemon/raikou/front.2bpp.lz"
-TaurosFrontpic:      INCBIN "gfx/pokemon/tauros/front_gold.2bpp.lz"
-NidoqueenFrontpic:   INCBIN "gfx/pokemon/nidoqueen/front_gold.2bpp.lz"
-RapidashFrontpic:    INCBIN "gfx/pokemon/rapidash/front_gold.2bpp.lz"
-EnteiFrontpic:       INCBIN "gfx/pokemon/entei/front.2bpp.lz"
-KangaskhanFrontpic:  INCBIN "gfx/pokemon/kangaskhan/front_gold.2bpp.lz"
-BlastoiseFrontpic:   INCBIN "gfx/pokemon/blastoise/front_gold.2bpp.lz"
-ArbokFrontpic:       INCBIN "gfx/pokemon/arbok/front_gold.2bpp.lz"
-CharizardFrontpic:   INCBIN "gfx/pokemon/charizard/front_gold.2bpp.lz"
-SkarmoryFrontpic:    INCBIN "gfx/pokemon/skarmory/front_gold.2bpp.lz"
-WeezingFrontpic:     INCBIN "gfx/pokemon/weezing/front_gold.2bpp.lz"
-VenusaurFrontpic:    INCBIN "gfx/pokemon/venusaur/front_gold.2bpp.lz"
-BeedrillFrontpic:    INCBIN "gfx/pokemon/beedrill/front_gold.2bpp.lz"
-LugiaFrontpic:       INCBIN "gfx/pokemon/lugia/front_gold.2bpp.lz"
-NidorinoFrontpic:    INCBIN "gfx/pokemon/nidorino/front_gold.2bpp.lz"
-
-SECTION "Pics 2", ROMX
-
-KingdraFrontpic:     INCBIN "gfx/pokemon/kingdra/front_gold.2bpp.lz"
-SandslashFrontpic:   INCBIN "gfx/pokemon/sandslash/front_gold.2bpp.lz"
-JumpluffFrontpic:    INCBIN "gfx/pokemon/jumpluff/front_gold.2bpp.lz"
-SmeargleFrontpic:    INCBIN "gfx/pokemon/smeargle/front_gold.2bpp.lz"
-ExeggutorBackpic:    INCBIN "gfx/pokemon/exeggutor/back.2bpp.lz"
-MagcargoFrontpic:    INCBIN "gfx/pokemon/magcargo/front_gold.2bpp.lz"
-LaprasFrontpic:      INCBIN "gfx/pokemon/lapras/front_gold.2bpp.lz"
-LickitungFrontpic:   INCBIN "gfx/pokemon/lickitung/front_gold.2bpp.lz"
-ChuckPic:            INCBIN "gfx/trainers/chuck.2bpp.lz"
-ParasectFrontpic:    INCBIN "gfx/pokemon/parasect/front_gold.2bpp.lz"
-ButterfreeBackpic:   INCBIN "gfx/pokemon/butterfree/back.2bpp.lz"
-KimonoGirlPic:       INCBIN "gfx/trainers/kimono_girl.2bpp.lz"
-FearowFrontpic:      INCBIN "gfx/pokemon/fearow/front_gold.2bpp.lz"
-AlakazamBackpic:     INCBIN "gfx/pokemon/alakazam/back_gold.2bpp.lz"
-GirafarigFrontpic:   INCBIN "gfx/pokemon/girafarig/front_gold.2bpp.lz"
-GolbatFrontpic:      INCBIN "gfx/pokemon/golbat/front_gold.2bpp.lz"
-KoffingFrontpic:     INCBIN "gfx/pokemon/koffing/front_gold.2bpp.lz"
-CloysterBackpic:     INCBIN "gfx/pokemon/cloyster/back.2bpp.lz"
-HitmontopBackpic:    INCBIN "gfx/pokemon/hitmontop/back_gold.2bpp.lz"
-DrowzeeFrontpic:     INCBIN "gfx/pokemon/drowzee/front_gold.2bpp.lz"
-StarmieFrontpic:     INCBIN "gfx/pokemon/starmie/front_gold.2bpp.lz"
-KabutopsFrontpic:    INCBIN "gfx/pokemon/kabutops/front_gold.2bpp.lz"
-DodrioBackpic:       INCBIN "gfx/pokemon/dodrio/back.2bpp.lz"
-HitmonleeFrontpic:   INCBIN "gfx/pokemon/hitmonlee/front_gold.2bpp.lz"
-VenomothFrontpic:    INCBIN "gfx/pokemon/venomoth/front_gold.2bpp.lz"
-BayleefFrontpic:     INCBIN "gfx/pokemon/bayleef/front.2bpp.lz"
-JugglerPic:          INCBIN "gfx/trainers/juggler.2bpp.lz"
-GuitaristPic:        INCBIN "gfx/trainers/guitarist.2bpp.lz"
-PokefanfPic:         INCBIN "gfx/trainers/pokefan_f.2bpp.lz"
-VenomothBackpic:     INCBIN "gfx/pokemon/venomoth/back.2bpp.lz"
-NoctowlFrontpic:     INCBIN "gfx/pokemon/noctowl/front_gold.2bpp.lz"
-ClairPic:            INCBIN "gfx/trainers/clair.2bpp.lz"
-PokemaniacPic:       INCBIN "gfx/trainers/pokemaniac.2bpp.lz"
-OmastarFrontpic:     INCBIN "gfx/pokemon/omastar/front_gold.2bpp.lz"
-SkierPic:            INCBIN "gfx/trainers/skier.2bpp.lz"
-LugiaBackpic:        INCBIN "gfx/pokemon/lugia/back.2bpp.lz"
-
-SECTION "Pics 3", ROMX
-
-GravelerFrontpic:    INCBIN "gfx/pokemon/graveler/front_gold.2bpp.lz"
-MrMimeFrontpic:      INCBIN "gfx/pokemon/mr__mime/front_gold.2bpp.lz"
-KangaskhanBackpic:   INCBIN "gfx/pokemon/kangaskhan/back.2bpp.lz"
-GligarFrontpic:      INCBIN "gfx/pokemon/gligar/front_gold.2bpp.lz"
-FarfetchDFrontpic:   INCBIN "gfx/pokemon/farfetch_d/front_gold.2bpp.lz"
-MagnetonFrontpic:    INCBIN "gfx/pokemon/magneton/front_gold.2bpp.lz"
-AmpharosFrontpic:    INCBIN "gfx/pokemon/ampharos/front_gold.2bpp.lz"
-ScytherFrontpic:     INCBIN "gfx/pokemon/scyther/front_gold.2bpp.lz"
-HoundoomFrontpic:    INCBIN "gfx/pokemon/houndoom/front_gold.2bpp.lz"
-JolteonFrontpic:     INCBIN "gfx/pokemon/jolteon/front_gold.2bpp.lz"
-NidorinaFrontpic:    INCBIN "gfx/pokemon/nidorina/front_gold.2bpp.lz"
-GyaradosBackpic:     INCBIN "gfx/pokemon/gyarados/back.2bpp.lz"
-RaticateFrontpic:    INCBIN "gfx/pokemon/raticate/front_gold.2bpp.lz"
-YanmaBackpic:        INCBIN "gfx/pokemon/yanma/back.2bpp.lz"
-HeracrossFrontpic:   INCBIN "gfx/pokemon/heracross/front_gold.2bpp.lz"
-SneaselFrontpic:     INCBIN "gfx/pokemon/sneasel/front.2bpp.lz"
-GolemFrontpic:       INCBIN "gfx/pokemon/golem/front_gold.2bpp.lz"
-ElekidFrontpic:      INCBIN "gfx/pokemon/elekid/front_gold.2bpp.lz"
-OmastarBackpic:      INCBIN "gfx/pokemon/omastar/back.2bpp.lz"
-ClefableBackpic:     INCBIN "gfx/pokemon/clefable/back.2bpp.lz"
-LassPic:             INCBIN "gfx/trainers/lass.2bpp.lz"
-MiltankFrontpic:     INCBIN "gfx/pokemon/miltank/front_gold.2bpp.lz"
-FeraligatrBackpic:   INCBIN "gfx/pokemon/feraligatr/back.2bpp.lz"
-MagnetonBackpic:     INCBIN "gfx/pokemon/magneton/back.2bpp.lz"
-GastlyFrontpic:      INCBIN "gfx/pokemon/gastly/front_gold.2bpp.lz"
-FlareonFrontpic:     INCBIN "gfx/pokemon/flareon/front_gold.2bpp.lz"
-GranbullFrontpic:    INCBIN "gfx/pokemon/granbull/front_gold.2bpp.lz"
-SuicuneBackpic:      INCBIN "gfx/pokemon/suicune/back.2bpp.lz"
-SlowkingBackpic:     INCBIN "gfx/pokemon/slowking/back.2bpp.lz"
-CharmeleonFrontpic:  INCBIN "gfx/pokemon/charmeleon/front_gold.2bpp.lz"
-WartortleFrontpic:   INCBIN "gfx/pokemon/wartortle/front_gold.2bpp.lz"
-SeelFrontpic:        INCBIN "gfx/pokemon/seel/front_gold.2bpp.lz"
-AriadosFrontpic:     INCBIN "gfx/pokemon/ariados/front.2bpp.lz"
-ElekidBackpic:       INCBIN "gfx/pokemon/elekid/back.2bpp.lz"
-QuilavaFrontpic:     INCBIN "gfx/pokemon/quilava/front_gold.2bpp.lz"
-CelebiBackpic:       INCBIN "gfx/pokemon/celebi/back.2bpp.lz"
-KrabbyBackpic:       INCBIN "gfx/pokemon/krabby/back.2bpp.lz"
-BugCatcherPic:       INCBIN "gfx/trainers/bug_catcher.2bpp.lz"
-
-SECTION "Pics 4", ROMX
-
-VenusaurBackpic:     INCBIN "gfx/pokemon/venusaur/back.2bpp.lz"
-MoltresBackpic:      INCBIN "gfx/pokemon/moltres/back.2bpp.lz"
-PonytaFrontpic:      INCBIN "gfx/pokemon/ponyta/front_gold.2bpp.lz"
-SunfloraBackpic:     INCBIN "gfx/pokemon/sunflora/back.2bpp.lz"
-DragonairFrontpic:   INCBIN "gfx/pokemon/dragonair/front_gold.2bpp.lz"
-TyranitarBackpic:    INCBIN "gfx/pokemon/tyranitar/back.2bpp.lz"
-RhydonBackpic:       INCBIN "gfx/pokemon/rhydon/back.2bpp.lz"
-SeadraBackpic:       INCBIN "gfx/pokemon/seadra/back.2bpp.lz"
-TwinsPic:            INCBIN "gfx/trainers/twins.2bpp.lz"
-PoliwhirlFrontpic:   INCBIN "gfx/pokemon/poliwhirl/front_gold.2bpp.lz"
-CroconawFrontpic:    INCBIN "gfx/pokemon/croconaw/front_gold.2bpp.lz"
-SandslashBackpic:    INCBIN "gfx/pokemon/sandslash/back.2bpp.lz"
-NidoranMBackpic:     INCBIN "gfx/pokemon/nidoran_m/back.2bpp.lz"
-TangelaFrontpic:     INCBIN "gfx/pokemon/tangela/front_gold.2bpp.lz"
-LedybaBackpic:       INCBIN "gfx/pokemon/ledyba/back.2bpp.lz"
-FarfetchDBackpic:    INCBIN "gfx/pokemon/farfetch_d/back.2bpp.lz"
-CyndaquilBackpic:    INCBIN "gfx/pokemon/cyndaquil/back.2bpp.lz"
-ChanseyFrontpic:     INCBIN "gfx/pokemon/chansey/front_gold.2bpp.lz"
-MagmarBackpic:       INCBIN "gfx/pokemon/magmar/back.2bpp.lz"
-VulpixFrontpic:      INCBIN "gfx/pokemon/vulpix/front_gold.2bpp.lz"
-NinetalesBackpic:    INCBIN "gfx/pokemon/ninetales/back.2bpp.lz"
-BayleefBackpic:      INCBIN "gfx/pokemon/bayleef/back.2bpp.lz"
-CroconawBackpic:     INCBIN "gfx/pokemon/croconaw/back.2bpp.lz"
-RapidashBackpic:     INCBIN "gfx/pokemon/rapidash/back.2bpp.lz"
-DoduoBackpic:        INCBIN "gfx/pokemon/doduo/back.2bpp.lz"
-DelibirdFrontpic:    INCBIN "gfx/pokemon/delibird/front_gold.2bpp.lz"
-TogeticFrontpic:     INCBIN "gfx/pokemon/togetic/front_gold.2bpp.lz"
-EspeonFrontpic:      INCBIN "gfx/pokemon/espeon/front_gold.2bpp.lz"
-CrobatFrontpic:      INCBIN "gfx/pokemon/crobat/front_gold.2bpp.lz"
-MankeyBackpic:       INCBIN "gfx/pokemon/mankey/back.2bpp.lz"
-GloomFrontpic:       INCBIN "gfx/pokemon/gloom/front_gold.2bpp.lz"
-HypnoBackpic:        INCBIN "gfx/pokemon/hypno/back.2bpp.lz"
-TyphlosionBackpic:   INCBIN "gfx/pokemon/typhlosion/back.2bpp.lz"
-YanmaFrontpic:       INCBIN "gfx/pokemon/yanma/front_gold.2bpp.lz"
-QuilavaBackpic:      INCBIN "gfx/pokemon/quilava/back.2bpp.lz"
-FurretFrontpic:      INCBIN "gfx/pokemon/furret/front_gold.2bpp.lz"
-SandshrewBackpic:    INCBIN "gfx/pokemon/sandshrew/back.2bpp.lz"
-BeautyPic:           INCBIN "gfx/trainers/beauty.2bpp.lz"
-SailorPic:           INCBIN "gfx/trainers/sailor.2bpp.lz"
-ZubatBackpic:        INCBIN "gfx/pokemon/zubat/back.2bpp.lz"
-UnownUFrontpic:      INCBIN "gfx/pokemon/unown_u/front.2bpp.lz"
-
-SECTION "Pics 5", ROMX
-
-ShellderBackpic:     INCBIN "gfx/pokemon/shellder/back.2bpp.lz"
-SunfloraFrontpic:    INCBIN "gfx/pokemon/sunflora/front_gold.2bpp.lz"
-BeedrillBackpic:     INCBIN "gfx/pokemon/beedrill/back.2bpp.lz"
-GruntmPic:           INCBIN "gfx/trainers/grunt_m.2bpp.lz"
-GloomBackpic:        INCBIN "gfx/pokemon/gloom/back.2bpp.lz"
-CuboneBackpic:       INCBIN "gfx/pokemon/cubone/back.2bpp.lz"
-KabutopsBackpic:     INCBIN "gfx/pokemon/kabutops/back.2bpp.lz"
-BellossomFrontpic:   INCBIN "gfx/pokemon/bellossom/front_gold.2bpp.lz"
-GoldeenBackpic:      INCBIN "gfx/pokemon/goldeen/back.2bpp.lz"
-FlaaffyFrontpic:     INCBIN "gfx/pokemon/flaaffy/front_gold.2bpp.lz"
-ArcanineBackpic:     INCBIN "gfx/pokemon/arcanine/back.2bpp.lz"
-FlareonBackpic:      INCBIN "gfx/pokemon/flareon/back.2bpp.lz"
-VileplumeFrontpic:   INCBIN "gfx/pokemon/vileplume/front_gold.2bpp.lz"
-OmanyteBackpic:      INCBIN "gfx/pokemon/omanyte/back.2bpp.lz"
-SudowoodoFrontpic:   INCBIN "gfx/pokemon/sudowoodo/front_gold.2bpp.lz"
-ScientistPic:        INCBIN "gfx/trainers/scientist.2bpp.lz"
-PidgeyBackpic:       INCBIN "gfx/pokemon/pidgey/back.2bpp.lz"
-MisdreavusFrontpic:  INCBIN "gfx/pokemon/misdreavus/front_gold.2bpp.lz"
-PidgeottoFrontpic:   INCBIN "gfx/pokemon/pidgeotto/front_gold.2bpp.lz"
-QwilfishBackpic:     INCBIN "gfx/pokemon/qwilfish/back.2bpp.lz"
-ClefableFrontpic:    INCBIN "gfx/pokemon/clefable/front_gold.2bpp.lz"
-GligarBackpic:       INCBIN "gfx/pokemon/gligar/back.2bpp.lz"
-HaunterFrontpic:     INCBIN "gfx/pokemon/haunter/front_gold.2bpp.lz"
-CharmeleonBackpic:   INCBIN "gfx/pokemon/charmeleon/back.2bpp.lz"
-MagcargoBackpic:     INCBIN "gfx/pokemon/magcargo/back.2bpp.lz"
-NidoqueenBackpic:    INCBIN "gfx/pokemon/nidoqueen/back.2bpp.lz"
-GrimerBackpic:       INCBIN "gfx/pokemon/grimer/back.2bpp.lz"
-ElectabuzzBackpic:   INCBIN "gfx/pokemon/electabuzz/back.2bpp.lz"
-VaporeonFrontpic:    INCBIN "gfx/pokemon/vaporeon/front_gold.2bpp.lz"
-PiloswineFrontpic:   INCBIN "gfx/pokemon/piloswine/front_gold.2bpp.lz"
-LedianBackpic:       INCBIN "gfx/pokemon/ledian/back.2bpp.lz"
-HeracrossBackpic:    INCBIN "gfx/pokemon/heracross/back.2bpp.lz"
-SteelixBackpic:      INCBIN "gfx/pokemon/steelix/back.2bpp.lz"
-PersianBackpic:      INCBIN "gfx/pokemon/persian/back.2bpp.lz"
-MarowakFrontpic:     INCBIN "gfx/pokemon/marowak/front_gold.2bpp.lz"
-LtSurgePic:          INCBIN "gfx/trainers/lt_surge.2bpp.lz"
-TeacherPic:          INCBIN "gfx/trainers/teacher.2bpp.lz"
-EeveeBackpic:        INCBIN "gfx/pokemon/eevee/back.2bpp.lz"
-GengarFrontpic:      INCBIN "gfx/pokemon/gengar/front_gold.2bpp.lz"
-PonytaBackpic:       INCBIN "gfx/pokemon/ponyta/back.2bpp.lz"
-PupitarBackpic:      INCBIN "gfx/pokemon/pupitar/back.2bpp.lz"
-KoffingBackpic:      INCBIN "gfx/pokemon/koffing/back.2bpp.lz"
-
-SECTION "Pics 6", ROMX
-
-GirafarigBackpic:    INCBIN "gfx/pokemon/girafarig/back.2bpp.lz"
-BirdKeeperPic:       INCBIN "gfx/trainers/bird_keeper.2bpp.lz"
-OnixBackpic:         INCBIN "gfx/pokemon/onix/back.2bpp.lz"
-FalknerPic:          INCBIN "gfx/trainers/falkner.2bpp.lz"
-OctilleryFrontpic:   INCBIN "gfx/pokemon/octillery/front_gold.2bpp.lz"
-TogeticBackpic:      INCBIN "gfx/pokemon/togetic/back.2bpp.lz"
-MiltankBackpic:      INCBIN "gfx/pokemon/miltank/back_gold.2bpp.lz"
-KarenPic:            INCBIN "gfx/trainers/karen.2bpp.lz"
-GrowlitheBackpic:    INCBIN "gfx/pokemon/growlithe/back.2bpp.lz"
-MachokeBackpic:      INCBIN "gfx/pokemon/machoke/back.2bpp.lz"
-KogaPic:             INCBIN "gfx/trainers/koga.2bpp.lz"
-RaichuBackpic:       INCBIN "gfx/pokemon/raichu/back.2bpp.lz"
-TentacruelBackpic:   INCBIN "gfx/pokemon/tentacruel/back.2bpp.lz"
-NidorinaBackpic:     INCBIN "gfx/pokemon/nidorina/back.2bpp.lz"
-MagikarpFrontpic:    INCBIN "gfx/pokemon/magikarp/front_gold.2bpp.lz"
-PoliwrathBackpic:    INCBIN "gfx/pokemon/poliwrath/back.2bpp.lz"
-SeadraFrontpic:      INCBIN "gfx/pokemon/seadra/front_gold.2bpp.lz"
-WigglytuffFrontpic:  INCBIN "gfx/pokemon/wigglytuff/front_gold.2bpp.lz"
-SwimmermPic:         INCBIN "gfx/trainers/swimmer_m.2bpp.lz"
-JumpluffBackpic:     INCBIN "gfx/pokemon/jumpluff/back.2bpp.lz"
-FlaaffyBackpic:      INCBIN "gfx/pokemon/flaaffy/back.2bpp.lz"
-PinsirBackpic:       INCBIN "gfx/pokemon/pinsir/back.2bpp.lz"
-NidorinoBackpic:     INCBIN "gfx/pokemon/nidorino/back.2bpp.lz"
-CooltrainerfPic:     INCBIN "gfx/trainers/cooltrainer_f.2bpp.lz"
-UmbreonBackpic:      INCBIN "gfx/pokemon/umbreon/back.2bpp.lz"
-JynxFrontpic:        INCBIN "gfx/pokemon/jynx/front_gold.2bpp.lz"
-LedybaFrontpic:      INCBIN "gfx/pokemon/ledyba/front_gold.2bpp.lz"
-SudowoodoBackpic:    INCBIN "gfx/pokemon/sudowoodo/back.2bpp.lz"
-BugsyPic:            INCBIN "gfx/trainers/bugsy.2bpp.lz"
-MarowakBackpic:      INCBIN "gfx/pokemon/marowak/back.2bpp.lz"
-CorsolaFrontpic:     INCBIN "gfx/pokemon/corsola/front_gold.2bpp.lz"
-GeodudeBackpic:      INCBIN "gfx/pokemon/geodude/back.2bpp.lz"
-LedianFrontpic:      INCBIN "gfx/pokemon/ledian/front_gold.2bpp.lz"
-HoundoomBackpic:     INCBIN "gfx/pokemon/houndoom/back.2bpp.lz"
-ScytherBackpic:      INCBIN "gfx/pokemon/scyther/back.2bpp.lz"
-VileplumeBackpic:    INCBIN "gfx/pokemon/vileplume/back.2bpp.lz"
-DugtrioFrontpic:     INCBIN "gfx/pokemon/dugtrio/front_gold.2bpp.lz"
-ChinchouFrontpic:    INCBIN "gfx/pokemon/chinchou/front_gold.2bpp.lz"
-HitmonchanBackpic:   INCBIN "gfx/pokemon/hitmonchan/back.2bpp.lz"
-BlastoiseBackpic:    INCBIN "gfx/pokemon/blastoise/back.2bpp.lz"
-CooltrainermPic:     INCBIN "gfx/trainers/cooltrainer_m.2bpp.lz"
-MisdreavusBackpic:   INCBIN "gfx/pokemon/misdreavus/back.2bpp.lz"
-ScizorBackpic:       INCBIN "gfx/pokemon/scizor/back.2bpp.lz"
-SmeargleBackpic:     INCBIN "gfx/pokemon/smeargle/back.2bpp.lz"
-
-SECTION "Pics 7", ROMX
-
-StantlerBackpic:     INCBIN "gfx/pokemon/stantler/back.2bpp.lz"
-CharizardBackpic:    INCBIN "gfx/pokemon/charizard/back.2bpp.lz"
-KadabraBackpic:      INCBIN "gfx/pokemon/kadabra/back.2bpp.lz"
-PrimeapeBackpic:     INCBIN "gfx/pokemon/primeape/back.2bpp.lz"
-PupitarFrontpic:     INCBIN "gfx/pokemon/pupitar/front_gold.2bpp.lz"
-WartortleBackpic:    INCBIN "gfx/pokemon/wartortle/back.2bpp.lz"
-FurretBackpic:       INCBIN "gfx/pokemon/furret/back.2bpp.lz"
-ExeggcuteBackpic:    INCBIN "gfx/pokemon/exeggcute/back.2bpp.lz"
-VulpixBackpic:       INCBIN "gfx/pokemon/vulpix/back.2bpp.lz"
-RaticateBackpic:     INCBIN "gfx/pokemon/raticate/back.2bpp.lz"
-EkansBackpic:        INCBIN "gfx/pokemon/ekans/back.2bpp.lz"
-MeowthFrontpic:      INCBIN "gfx/pokemon/meowth/front_gold.2bpp.lz"
-BurglarPic:          INCBIN "gfx/trainers/burglar.2bpp.lz"
-SeakingBackpic:      INCBIN "gfx/pokemon/seaking/back.2bpp.lz"
-PsyduckBackpic:      INCBIN "gfx/pokemon/psyduck/back.2bpp.lz"
-PikachuBackpic:      INCBIN "gfx/pokemon/pikachu/back.2bpp.lz"
-WeepinbellFrontpic:  INCBIN "gfx/pokemon/weepinbell/front_gold.2bpp.lz"
-RemoraidBackpic:     INCBIN "gfx/pokemon/remoraid/back.2bpp.lz"
-MareepBackpic:       INCBIN "gfx/pokemon/mareep/back.2bpp.lz"
-KingdraBackpic:      INCBIN "gfx/pokemon/kingdra/back.2bpp.lz"
-CamperPic:           INCBIN "gfx/trainers/camper.2bpp.lz"
-ClefairyBackpic:     INCBIN "gfx/pokemon/clefairy/back.2bpp.lz"
-VenonatBackpic:      INCBIN "gfx/pokemon/venonat/back.2bpp.lz"
-SnubbullFrontpic:    INCBIN "gfx/pokemon/snubbull/front_gold.2bpp.lz"
-PokemonProfPic:      INCBIN "gfx/trainers/oak.2bpp.lz"
-MewtwoBackpic:       INCBIN "gfx/pokemon/mewtwo/back.2bpp.lz"
-Rival1Pic:           INCBIN "gfx/trainers/rival1.2bpp.lz"
-BellossomBackpic:    INCBIN "gfx/pokemon/bellossom/back.2bpp.lz"
-SwimmerfPic:         INCBIN "gfx/trainers/swimmer_f.2bpp.lz"
-CalPic:              INCBIN "gfx/trainers/cal.2bpp.lz"
-OfficerPic:          INCBIN "gfx/trainers/officer.2bpp.lz"
-KrabbyFrontpic:      INCBIN "gfx/pokemon/krabby/front_gold.2bpp.lz"
-IvysaurFrontpic:     INCBIN "gfx/pokemon/ivysaur/front_gold.2bpp.lz"
-MukBackpic:          INCBIN "gfx/pokemon/muk/back.2bpp.lz"
-DelibirdBackpic:     INCBIN "gfx/pokemon/delibird/back.2bpp.lz"
-LanturnFrontpic:     INCBIN "gfx/pokemon/lanturn/front_gold.2bpp.lz"
-SabrinaPic:          INCBIN "gfx/trainers/sabrina.2bpp.lz"
-MagikarpBackpic:     INCBIN "gfx/pokemon/magikarp/back.2bpp.lz"
-AriadosBackpic:      INCBIN "gfx/pokemon/ariados/back.2bpp.lz"
-TyrogueBackpic:      INCBIN "gfx/pokemon/tyrogue/back.2bpp.lz"
-WobbuffetFrontpic:   INCBIN "gfx/pokemon/wobbuffet/front_gold.2bpp.lz"
-HitmonchanFrontpic:  INCBIN "gfx/pokemon/hitmonchan/front_gold.2bpp.lz"
-MurkrowBackpic:      INCBIN "gfx/pokemon/murkrow/back.2bpp.lz"
-IvysaurBackpic:      INCBIN "gfx/pokemon/ivysaur/back.2bpp.lz"
-XatuFrontpic:        INCBIN "gfx/pokemon/xatu/front_gold.2bpp.lz"
-SlowbroBackpic:      INCBIN "gfx/pokemon/slowbro/back.2bpp.lz"
-NidoranFFrontpic:    INCBIN "gfx/pokemon/nidoran_f/front_gold.2bpp.lz"
-
-SECTION "Pics 8", ROMX
-
-PsyduckFrontpic:     INCBIN "gfx/pokemon/psyduck/front_gold.2bpp.lz"
-GrowlitheFrontpic:   INCBIN "gfx/pokemon/growlithe/front_gold.2bpp.lz"
-PsychicTPic:         INCBIN "gfx/trainers/psychic_t.2bpp.lz"
-GolduckBackpic:      INCBIN "gfx/pokemon/golduck/back.2bpp.lz"
-WeezingBackpic:      INCBIN "gfx/pokemon/weezing/back.2bpp.lz"
-SneaselBackpic:      INCBIN "gfx/pokemon/sneasel/back.2bpp.lz"
-GrimerFrontpic:      INCBIN "gfx/pokemon/grimer/front_gold.2bpp.lz"
-DunsparceFrontpic:   INCBIN "gfx/pokemon/dunsparce/front_gold.2bpp.lz"
-PidgeotBackpic:      INCBIN "gfx/pokemon/pidgeot/back.2bpp.lz"
-GruntfPic:           INCBIN "gfx/trainers/grunt_f.2bpp.lz"
-PorygonFrontpic:     INCBIN "gfx/pokemon/porygon/front_gold.2bpp.lz"
-HoOhBackpic:         INCBIN "gfx/pokemon/ho_oh/back.2bpp.lz"
-RhyhornBackpic:      INCBIN "gfx/pokemon/rhyhorn/back.2bpp.lz"
-PoliwhirlBackpic:    INCBIN "gfx/pokemon/poliwhirl/back.2bpp.lz"
-MewBackpic:          INCBIN "gfx/pokemon/mew/back.2bpp.lz"
-AbraBackpic:         INCBIN "gfx/pokemon/abra/back.2bpp.lz"
-MachopBackpic:       INCBIN "gfx/pokemon/machop/back.2bpp.lz"
-DugtrioBackpic:      INCBIN "gfx/pokemon/dugtrio/back.2bpp.lz"
-AerodactylBackpic:   INCBIN "gfx/pokemon/aerodactyl/back.2bpp.lz"
-NidoranFBackpic:     INCBIN "gfx/pokemon/nidoran_f/back.2bpp.lz"
-WeepinbellBackpic:   INCBIN "gfx/pokemon/weepinbell/back.2bpp.lz"
-AipomBackpic:        INCBIN "gfx/pokemon/aipom/back.2bpp.lz"
-GravelerBackpic:     INCBIN "gfx/pokemon/graveler/back.2bpp.lz"
-EspeonBackpic:       INCBIN "gfx/pokemon/espeon/back.2bpp.lz"
-CyndaquilFrontpic:   INCBIN "gfx/pokemon/cyndaquil/front_gold.2bpp.lz"
-TotodileBackpic:     INCBIN "gfx/pokemon/totodile/back.2bpp.lz"
-MurkrowFrontpic:     INCBIN "gfx/pokemon/murkrow/front_gold.2bpp.lz"
-MankeyFrontpic:      INCBIN "gfx/pokemon/mankey/front_gold.2bpp.lz"
-SnubbullBackpic:     INCBIN "gfx/pokemon/snubbull/back.2bpp.lz"
-KinglerBackpic:      INCBIN "gfx/pokemon/kingler/back.2bpp.lz"
-GengarBackpic:       INCBIN "gfx/pokemon/gengar/back.2bpp.lz"
-RattataBackpic:      INCBIN "gfx/pokemon/rattata/back.2bpp.lz"
-CuboneFrontpic:      INCBIN "gfx/pokemon/cubone/front_gold.2bpp.lz"
-AbraFrontpic:        INCBIN "gfx/pokemon/abra/front_gold.2bpp.lz"
-YoungsterPic:        INCBIN "gfx/trainers/youngster.2bpp.lz"
-WillPic:             INCBIN "gfx/trainers/will.2bpp.lz"
-SchoolboyPic:        INCBIN "gfx/trainers/schoolboy.2bpp.lz"
-ErikaPic:            INCBIN "gfx/trainers/erika.2bpp.lz"
-HoothootBackpic:     INCBIN "gfx/pokemon/hoothoot/back.2bpp.lz"
-UmbreonFrontpic:     INCBIN "gfx/pokemon/umbreon/front_gold.2bpp.lz"
-JaninePic:           INCBIN "gfx/trainers/janine.2bpp.lz"
-StaryuFrontpic:      INCBIN "gfx/pokemon/staryu/front_gold.2bpp.lz"
-GoldeenFrontpic:     INCBIN "gfx/pokemon/goldeen/front_gold.2bpp.lz"
-NoctowlBackpic:      INCBIN "gfx/pokemon/noctowl/back.2bpp.lz"
-MortyPic:            INCBIN "gfx/trainers/morty.2bpp.lz"
-KabutoBackpic:       INCBIN "gfx/pokemon/kabuto/back.2bpp.lz"
-VenonatFrontpic:     INCBIN "gfx/pokemon/venonat/front_gold.2bpp.lz"
-MeganiumBackpic:     INCBIN "gfx/pokemon/meganium/back.2bpp.lz"
-MeowthBackpic:       INCBIN "gfx/pokemon/meowth/back.2bpp.lz"
-UnownZBackpic:       INCBIN "gfx/pokemon/unown_z/back.2bpp.lz"
-
-SECTION "Pics 9", ROMX
-
-PicnickerPic:        INCBIN "gfx/trainers/picnicker.2bpp.lz"
-VictreebelBackpic:   INCBIN "gfx/pokemon/victreebel/back.2bpp.lz"
-SuperNerdPic:        INCBIN "gfx/trainers/super_nerd.2bpp.lz"
-LickitungBackpic:    INCBIN "gfx/pokemon/lickitung/back.2bpp.lz"
-Porygon2Backpic:     INCBIN "gfx/pokemon/porygon2/back.2bpp.lz"
-HaunterBackpic:      INCBIN "gfx/pokemon/haunter/back.2bpp.lz"
-XatuBackpic:         INCBIN "gfx/pokemon/xatu/back.2bpp.lz"
-RedPic:              INCBIN "gfx/trainers/red.2bpp.lz"
-JasminePic:          INCBIN "gfx/trainers/jasmine.2bpp.lz"
-PinecoBackpic:       INCBIN "gfx/pokemon/pineco/back.2bpp.lz"
-SlugmaBackpic:       INCBIN "gfx/pokemon/slugma/back.2bpp.lz"
-SeelBackpic:         INCBIN "gfx/pokemon/seel/back.2bpp.lz"
-QuagsireBackpic:     INCBIN "gfx/pokemon/quagsire/back.2bpp.lz"
-WhitneyPic:          INCBIN "gfx/trainers/whitney.2bpp.lz"
-ShellderFrontpic:    INCBIN "gfx/pokemon/shellder/front_gold.2bpp.lz"
-JolteonBackpic:      INCBIN "gfx/pokemon/jolteon/back.2bpp.lz"
-EkansFrontpic:       INCBIN "gfx/pokemon/ekans/front_gold.2bpp.lz"
-ParasectBackpic:     INCBIN "gfx/pokemon/parasect/back.2bpp.lz"
-AipomFrontpic:       INCBIN "gfx/pokemon/aipom/front_gold.2bpp.lz"
-MagbyFrontpic:       INCBIN "gfx/pokemon/magby/front_gold.2bpp.lz"
-QuagsireFrontpic:    INCBIN "gfx/pokemon/quagsire/front_gold.2bpp.lz"
-GranbullBackpic:     INCBIN "gfx/pokemon/granbull/back.2bpp.lz"
-HoppipBackpic:       INCBIN "gfx/pokemon/hoppip/back.2bpp.lz"
-BluePic:             INCBIN "gfx/trainers/blue.2bpp.lz"
-GentlemanPic:        INCBIN "gfx/trainers/gentleman.2bpp.lz"
-ExecutivemPic:       INCBIN "gfx/trainers/executive_m.2bpp.lz"
-PinecoFrontpic:      INCBIN "gfx/pokemon/pineco/front_gold.2bpp.lz"
-MagbyBackpic:        INCBIN "gfx/pokemon/magby/back.2bpp.lz"
-LaprasBackpic:       INCBIN "gfx/pokemon/lapras/back.2bpp.lz"
-ChikoritaBackpic:    INCBIN "gfx/pokemon/chikorita/back.2bpp.lz"
-DragonairBackpic:    INCBIN "gfx/pokemon/dragonair/back.2bpp.lz"
-ZapdosBackpic:       INCBIN "gfx/pokemon/zapdos/back.2bpp.lz"
-CharmanderFrontpic:  INCBIN "gfx/pokemon/charmander/front_gold.2bpp.lz"
-ChinchouBackpic:     INCBIN "gfx/pokemon/chinchou/back.2bpp.lz"
-HoothootFrontpic:    INCBIN "gfx/pokemon/hoothoot/front_gold.2bpp.lz"
-SpearowBackpic:      INCBIN "gfx/pokemon/spearow/back.2bpp.lz"
-ChanseyBackpic:      INCBIN "gfx/pokemon/chansey/back.2bpp.lz"
-MachopFrontpic:      INCBIN "gfx/pokemon/machop/front_gold.2bpp.lz"
-SkiploomBackpic:     INCBIN "gfx/pokemon/skiploom/back.2bpp.lz"
-TotodileFrontpic:    INCBIN "gfx/pokemon/totodile/front_gold.2bpp.lz"
-Rival2Pic:           INCBIN "gfx/trainers/rival2.2bpp.lz"
-CharmanderBackpic:   INCBIN "gfx/pokemon/charmander/back.2bpp.lz"
-MistyPic:            INCBIN "gfx/trainers/misty.2bpp.lz"
-BellsproutFrontpic:  INCBIN "gfx/pokemon/bellsprout/front_gold.2bpp.lz"
-SandshrewFrontpic:   INCBIN "gfx/pokemon/sandshrew/front_gold.2bpp.lz"
-BlainePic:           INCBIN "gfx/trainers/blaine.2bpp.lz"
-SlugmaFrontpic:      INCBIN "gfx/pokemon/slugma/front_gold.2bpp.lz"
-TyrogueFrontpic:     INCBIN "gfx/pokemon/tyrogue/front_gold.2bpp.lz"
-LarvitarBackpic:     INCBIN "gfx/pokemon/larvitar/back.2bpp.lz"
-SunkernBackpic:      INCBIN "gfx/pokemon/sunkern/back.2bpp.lz"
-PorygonBackpic:      INCBIN "gfx/pokemon/porygon/back.2bpp.lz"
-ClefairyFrontpic:    INCBIN "gfx/pokemon/clefairy/front_gold.2bpp.lz"
-BulbasaurBackpic:    INCBIN "gfx/pokemon/bulbasaur/back.2bpp.lz"
-
-SECTION "Pics 10", ROMX
-
-Porygon2Frontpic:    INCBIN "gfx/pokemon/porygon2/front_gold.2bpp.lz"
-PolitoedBackpic:     INCBIN "gfx/pokemon/politoed/back.2bpp.lz"
-ParasBackpic:        INCBIN "gfx/pokemon/paras/back.2bpp.lz"
-HoundourFrontpic:    INCBIN "gfx/pokemon/houndour/front_gold.2bpp.lz"
-MareepFrontpic:      INCBIN "gfx/pokemon/mareep/front_gold.2bpp.lz"
-TentacoolBackpic:    INCBIN "gfx/pokemon/tentacool/back.2bpp.lz"
-DoduoFrontpic:       INCBIN "gfx/pokemon/doduo/front_gold.2bpp.lz"
-OmanyteFrontpic:     INCBIN "gfx/pokemon/omanyte/front_gold.2bpp.lz"
-EeveeFrontpic:       INCBIN "gfx/pokemon/eevee/front_gold.2bpp.lz"
-VaporeonBackpic:     INCBIN "gfx/pokemon/vaporeon/back.2bpp.lz"
-ExecutivefPic:       INCBIN "gfx/trainers/executive_f.2bpp.lz"
-PichuBackpic:        INCBIN "gfx/pokemon/pichu/back.2bpp.lz"
-CorsolaBackpic:      INCBIN "gfx/pokemon/corsola/back.2bpp.lz"
-JigglypuffFrontpic:  INCBIN "gfx/pokemon/jigglypuff/front_gold.2bpp.lz"
-TogepiBackpic:       INCBIN "gfx/pokemon/togepi/back.2bpp.lz"
-SmoochumBackpic:     INCBIN "gfx/pokemon/smoochum/back.2bpp.lz"
-DunsparceBackpic:    INCBIN "gfx/pokemon/dunsparce/back.2bpp.lz"
-BellsproutBackpic:   INCBIN "gfx/pokemon/bellsprout/back.2bpp.lz"
-MarillFrontpic:      INCBIN "gfx/pokemon/marill/front_gold.2bpp.lz"
-SmoochumFrontpic:    INCBIN "gfx/pokemon/smoochum/front_gold.2bpp.lz"
-ChikoritaFrontpic:   INCBIN "gfx/pokemon/chikorita/front_gold.2bpp.lz"
-PikachuFrontpic:     INCBIN "gfx/pokemon/pikachu/front_gold.2bpp.lz"
-PidgeottoBackpic:    INCBIN "gfx/pokemon/pidgeotto/back.2bpp.lz"
-StaryuBackpic:       INCBIN "gfx/pokemon/staryu/back.2bpp.lz"
-MrMimeBackpic:       INCBIN "gfx/pokemon/mr__mime/back.2bpp.lz"
-CaterpieBackpic:     INCBIN "gfx/pokemon/caterpie/back.2bpp.lz"
-NidoranMFrontpic:    INCBIN "gfx/pokemon/nidoran_m/front_gold.2bpp.lz"
-PrycePic:            INCBIN "gfx/trainers/pryce.2bpp.lz"
-LanturnBackpic:      INCBIN "gfx/pokemon/lanturn/back.2bpp.lz"
-BrockPic:            INCBIN "gfx/trainers/brock.2bpp.lz"
-AmpharosBackpic:     INCBIN "gfx/pokemon/ampharos/back.2bpp.lz"
-RemoraidFrontpic:    INCBIN "gfx/pokemon/remoraid/front_gold.2bpp.lz"
-DragoniteBackpic:    INCBIN "gfx/pokemon/dragonite/back.2bpp.lz"
-PidgeyFrontpic:      INCBIN "gfx/pokemon/pidgey/front_gold.2bpp.lz"
-ZubatFrontpic:       INCBIN "gfx/pokemon/zubat/front_gold.2bpp.lz"
-ArbokBackpic:        INCBIN "gfx/pokemon/arbok/back.2bpp.lz"
-EnteiBackpic:        INCBIN "gfx/pokemon/entei/back.2bpp.lz"
-HitmonleeBackpic:    INCBIN "gfx/pokemon/hitmonlee/back.2bpp.lz"
-ParasFrontpic:       INCBIN "gfx/pokemon/paras/front_gold.2bpp.lz"
-UrsaringBackpic:     INCBIN "gfx/pokemon/ursaring/back.2bpp.lz"
-TeddiursaBackpic:    INCBIN "gfx/pokemon/teddiursa/back.2bpp.lz"
-SagePic:             INCBIN "gfx/trainers/sage.2bpp.lz"
-KakunaBackpic:       INCBIN "gfx/pokemon/kakuna/back.2bpp.lz"
-PhanpyBackpic:       INCBIN "gfx/pokemon/phanpy/back.2bpp.lz"
-SkiploomFrontpic:    INCBIN "gfx/pokemon/skiploom/front_gold.2bpp.lz"
-CelebiFrontpic:      INCBIN "gfx/pokemon/celebi/front_gold.2bpp.lz"
-DratiniFrontpic:     INCBIN "gfx/pokemon/dratini/front_gold.2bpp.lz"
-WobbuffetBackpic:    INCBIN "gfx/pokemon/wobbuffet/back.2bpp.lz"
-TentacoolFrontpic:   INCBIN "gfx/pokemon/tentacool/front_gold.2bpp.lz"
-CrobatBackpic:       INCBIN "gfx/pokemon/crobat/back.2bpp.lz"
-BlisseyBackpic:      INCBIN "gfx/pokemon/blissey/back.2bpp.lz"
-LarvitarFrontpic:    INCBIN "gfx/pokemon/larvitar/front_gold.2bpp.lz"
-StarmieBackpic:      INCBIN "gfx/pokemon/starmie/back.2bpp.lz"
-IgglybuffBackpic:    INCBIN "gfx/pokemon/igglybuff/back.2bpp.lz"
-SlowpokeFrontpic:    INCBIN "gfx/pokemon/slowpoke/front_gold.2bpp.lz"
-ElectrodeFrontpic:   INCBIN "gfx/pokemon/electrode/front_gold.2bpp.lz"
-AzumarillBackpic:    INCBIN "gfx/pokemon/azumarill/back.2bpp.lz"
-SpearowFrontpic:     INCBIN "gfx/pokemon/spearow/front_gold.2bpp.lz"
-
-SECTION "Pics 11", ROMX
-
-OctilleryBackpic:    INCBIN "gfx/pokemon/octillery/back.2bpp.lz"
-RaikouBackpic:       INCBIN "gfx/pokemon/raikou/back.2bpp.lz"
-ArticunoBackpic:     INCBIN "gfx/pokemon/articuno/back.2bpp.lz"
-HoppipFrontpic:      INCBIN "gfx/pokemon/hoppip/front_gold.2bpp.lz"
-MewFrontpic:         INCBIN "gfx/pokemon/mew/front_gold.2bpp.lz"
-RattataFrontpic:     INCBIN "gfx/pokemon/rattata/front_gold.2bpp.lz"
-HorseaBackpic:       INCBIN "gfx/pokemon/horsea/back.2bpp.lz"
-SentretBackpic:      INCBIN "gfx/pokemon/sentret/back.2bpp.lz"
-SquirtleFrontpic:    INCBIN "gfx/pokemon/squirtle/front_gold.2bpp.lz"
-WigglytuffBackpic:   INCBIN "gfx/pokemon/wigglytuff/back.2bpp.lz"
-QwilfishFrontpic:    INCBIN "gfx/pokemon/qwilfish/front_gold.2bpp.lz"
-TeddiursaFrontpic:   INCBIN "gfx/pokemon/teddiursa/front_gold.2bpp.lz"
-DittoBackpic:        INCBIN "gfx/pokemon/ditto/back.2bpp.lz"
-WeedleBackpic:       INCBIN "gfx/pokemon/weedle/back.2bpp.lz"
-ShuckleFrontpic:     INCBIN "gfx/pokemon/shuckle/front_gold.2bpp.lz"
-PhanpyFrontpic:      INCBIN "gfx/pokemon/phanpy/front_gold.2bpp.lz"
-SentretFrontpic:     INCBIN "gfx/pokemon/sentret/front_gold.2bpp.lz"
-PoliwagFrontpic:     INCBIN "gfx/pokemon/poliwag/front_gold.2bpp.lz"
-CleffaBackpic:       INCBIN "gfx/pokemon/cleffa/back.2bpp.lz"
-DrowzeeBackpic:      INCBIN "gfx/pokemon/drowzee/back.2bpp.lz"
-GastlyBackpic:       INCBIN "gfx/pokemon/gastly/back.2bpp.lz"
-DratiniBackpic:      INCBIN "gfx/pokemon/dratini/back.2bpp.lz"
-FearowBackpic:       INCBIN "gfx/pokemon/fearow/back.2bpp.lz"
-MarillBackpic:       INCBIN "gfx/pokemon/marill/back.2bpp.lz"
-WooperFrontpic:      INCBIN "gfx/pokemon/wooper/front_gold.2bpp.lz"
-HoundourBackpic:     INCBIN "gfx/pokemon/houndour/back.2bpp.lz"
-KabutoFrontpic:      INCBIN "gfx/pokemon/kabuto/front_gold.2bpp.lz"
-ElectrodeBackpic:    INCBIN "gfx/pokemon/electrode/back.2bpp.lz"
-MetapodBackpic:      INCBIN "gfx/pokemon/metapod/back.2bpp.lz"
-JigglypuffBackpic:   INCBIN "gfx/pokemon/jigglypuff/back.2bpp.lz"
-OddishBackpic:       INCBIN "gfx/pokemon/oddish/back.2bpp.lz"
-SunkernFrontpic:     INCBIN "gfx/pokemon/sunkern/front_gold.2bpp.lz"
-SpinarakBackpic:     INCBIN "gfx/pokemon/spinarak/back.2bpp.lz"
-SkarmoryBackpic:     INCBIN "gfx/pokemon/skarmory/back.2bpp.lz"
-PoliwagBackpic:      INCBIN "gfx/pokemon/poliwag/back.2bpp.lz"
-SquirtleBackpic:     INCBIN "gfx/pokemon/squirtle/back.2bpp.lz"
-DewgongBackpic:      INCBIN "gfx/pokemon/dewgong/back.2bpp.lz"
-ShuckleBackpic:      INCBIN "gfx/pokemon/shuckle/back.2bpp.lz"
-SlowpokeBackpic:     INCBIN "gfx/pokemon/slowpoke/back.2bpp.lz"
-GeodudeFrontpic:     INCBIN "gfx/pokemon/geodude/front_gold.2bpp.lz"
-DonphanBackpic:      INCBIN "gfx/pokemon/donphan/back.2bpp.lz"
-WooperBackpic:       INCBIN "gfx/pokemon/wooper/back.2bpp.lz"
-TaurosBackpic:       INCBIN "gfx/pokemon/tauros/back.2bpp.lz"
-WeedleFrontpic:      INCBIN "gfx/pokemon/weedle/front_gold.2bpp.lz"
-CleffaFrontpic:      INCBIN "gfx/pokemon/cleffa/front_gold.2bpp.lz"
-VoltorbBackpic:      INCBIN "gfx/pokemon/voltorb/back.2bpp.lz"
-PichuFrontpic:       INCBIN "gfx/pokemon/pichu/front_gold.2bpp.lz"
-BulbasaurFrontpic:   INCBIN "gfx/pokemon/bulbasaur/front_gold.2bpp.lz"
-SwinubBackpic:       INCBIN "gfx/pokemon/swinub/back.2bpp.lz"
-TangelaBackpic:      INCBIN "gfx/pokemon/tangela/back.2bpp.lz"
-IgglybuffFrontpic:   INCBIN "gfx/pokemon/igglybuff/front_gold.2bpp.lz"
-SpinarakFrontpic:    INCBIN "gfx/pokemon/spinarak/front.2bpp.lz"
-GolemBackpic:        INCBIN "gfx/pokemon/golem/back.2bpp.lz"
-MantineBackpic:      INCBIN "gfx/pokemon/mantine/back.2bpp.lz"
-HorseaFrontpic:      INCBIN "gfx/pokemon/horsea/front_gold.2bpp.lz"
-PiloswineBackpic:    INCBIN "gfx/pokemon/piloswine/back.2bpp.lz"
-KakunaFrontpic:      INCBIN "gfx/pokemon/kakuna/front_gold.2bpp.lz"
-SwinubFrontpic:      INCBIN "gfx/pokemon/swinub/front.2bpp.lz"
-NatuBackpic:         INCBIN "gfx/pokemon/natu/back.2bpp.lz"
-OddishFrontpic:      INCBIN "gfx/pokemon/oddish/front_gold.2bpp.lz"
-DiglettFrontpic:     INCBIN "gfx/pokemon/diglett/front_gold.2bpp.lz"
-DiglettBackpic:      INCBIN "gfx/pokemon/diglett/back.2bpp.lz"
-UnownCFrontpic:      INCBIN "gfx/pokemon/unown_c/front.2bpp.lz"
-TogepiFrontpic:      INCBIN "gfx/pokemon/togepi/front_gold.2bpp.lz"
-MetapodFrontpic:     INCBIN "gfx/pokemon/metapod/front_gold.2bpp.lz"
-JynxBackpic:         INCBIN "gfx/pokemon/jynx/back.2bpp.lz"
-CaterpieFrontpic:    INCBIN "gfx/pokemon/caterpie/front_gold.2bpp.lz"
-UnownHBackpic:       INCBIN "gfx/pokemon/unown_h/back.2bpp.lz"
-GolbatBackpic:       INCBIN "gfx/pokemon/golbat/back.2bpp.lz"
-UnownGFrontpic:      INCBIN "gfx/pokemon/unown_g/front.2bpp.lz"
-UnownVBackpic:       INCBIN "gfx/pokemon/unown_v/back.2bpp.lz"
-
-SECTION "Unown Pic Pointers", ROMX
-
-INCLUDE "data/pokemon/unown_pic_pointers.asm"
-
-SECTION "Pics 12", ROMX
-
-SuicuneFrontpic:     INCBIN "gfx/pokemon/suicune/front.2bpp.lz"
-RhyhornFrontpic:     INCBIN "gfx/pokemon/rhyhorn/front_gold.2bpp.lz"
-TyranitarFrontpic:   INCBIN "gfx/pokemon/tyranitar/front_gold.2bpp.lz"
-MoltresFrontpic:     INCBIN "gfx/pokemon/moltres/front_gold.2bpp.lz"
-ZapdosFrontpic:      INCBIN "gfx/pokemon/zapdos/front_gold.2bpp.lz"
-SeakingFrontpic:     INCBIN "gfx/pokemon/seaking/front_gold.2bpp.lz"
-MukFrontpic:         INCBIN "gfx/pokemon/muk/front_gold.2bpp.lz"
-DragoniteFrontpic:   INCBIN "gfx/pokemon/dragonite/front_gold.2bpp.lz"
-AlakazamFrontpic:    INCBIN "gfx/pokemon/alakazam/front_gold.2bpp.lz"
-AerodactylFrontpic:  INCBIN "gfx/pokemon/aerodactyl/front_gold.2bpp.lz"
-TyphlosionFrontpic:  INCBIN "gfx/pokemon/typhlosion/front_gold.2bpp.lz"
-MachokeFrontpic:     INCBIN "gfx/pokemon/machoke/front_gold.2bpp.lz"
-ExeggcuteFrontpic:   INCBIN "gfx/pokemon/exeggcute/front_gold.2bpp.lz"
-FirebreatherPic:     INCBIN "gfx/trainers/firebreather.2bpp.lz"
-ScizorFrontpic:      INCBIN "gfx/pokemon/scizor/front_gold.2bpp.lz"
-ArticunoFrontpic:    INCBIN "gfx/pokemon/articuno/front_gold.2bpp.lz"
-DodrioFrontpic:      INCBIN "gfx/pokemon/dodrio/front_gold.2bpp.lz"
-ButterfreeFrontpic:  INCBIN "gfx/pokemon/butterfree/front_gold.2bpp.lz"
-PidgeotFrontpic:     INCBIN "gfx/pokemon/pidgeot/front_gold.2bpp.lz"
-PersianFrontpic:     INCBIN "gfx/pokemon/persian/front_gold.2bpp.lz"
-DewgongFrontpic:     INCBIN "gfx/pokemon/dewgong/front_gold.2bpp.lz"
-CloysterFrontpic:    INCBIN "gfx/pokemon/cloyster/front_gold.2bpp.lz"
-GolduckFrontpic:     INCBIN "gfx/pokemon/golduck/front_gold.2bpp.lz"
-ArcanineFrontpic:    INCBIN "gfx/pokemon/arcanine/front_gold.2bpp.lz"
-OnixFrontpic:        INCBIN "gfx/pokemon/onix/front_gold.2bpp.lz"
-ChampionPic:         INCBIN "gfx/trainers/champion.2bpp.lz"
-SlowkingFrontpic:    INCBIN "gfx/pokemon/slowking/front_gold.2bpp.lz"
-VictreebelFrontpic:  INCBIN "gfx/pokemon/victreebel/front_gold.2bpp.lz"
-BlackbeltTPic:       INCBIN "gfx/trainers/blackbelt_t.2bpp.lz"
-UnownCBackpic:       INCBIN "gfx/pokemon/unown_c/back.2bpp.lz"
-
-SECTION "Trainer Pic Pointers", ROMX
-
-INCLUDE "data/trainers/pic_pointers.asm"
-
-SECTION "Pics 13", ROMX
-
-HypnoFrontpic:       INCBIN "gfx/pokemon/hypno/front_gold.2bpp.lz"
-BlisseyFrontpic:     INCBIN "gfx/pokemon/blissey/front_gold.2bpp.lz"
-BikerPic:            INCBIN "gfx/trainers/biker.2bpp.lz"
-PrimeapeFrontpic:    INCBIN "gfx/pokemon/primeape/front_gold.2bpp.lz"
-RaichuFrontpic:      INCBIN "gfx/pokemon/raichu/front_gold.2bpp.lz"
-StantlerFrontpic:    INCBIN "gfx/pokemon/stantler/front_gold.2bpp.lz"
-ExeggutorFrontpic:   INCBIN "gfx/pokemon/exeggutor/front_gold.2bpp.lz"
-BrunoPic:            INCBIN "gfx/trainers/bruno.2bpp.lz"
-ForretressFrontpic:  INCBIN "gfx/pokemon/forretress/front_gold.2bpp.lz"
-MagmarFrontpic:      INCBIN "gfx/pokemon/magmar/front_gold.2bpp.lz"
-HikerPic:            INCBIN "gfx/trainers/hiker.2bpp.lz"
-AzumarillFrontpic:   INCBIN "gfx/pokemon/azumarill/front_gold.2bpp.lz"
-KinglerFrontpic:     INCBIN "gfx/pokemon/kingler/front_gold.2bpp.lz"
-PoliwrathFrontpic:   INCBIN "gfx/pokemon/poliwrath/front_gold.2bpp.lz"
-PinsirFrontpic:      INCBIN "gfx/pokemon/pinsir/front_gold.2bpp.lz"
-MewtwoFrontpic:      INCBIN "gfx/pokemon/mewtwo/front_gold.2bpp.lz"
-SlowbroFrontpic:     INCBIN "gfx/pokemon/slowbro/front_gold.2bpp.lz"
-KadabraFrontpic:     INCBIN "gfx/pokemon/kadabra/front_gold.2bpp.lz"
-SnorlaxFrontpic:     INCBIN "gfx/pokemon/snorlax/front_gold.2bpp.lz"
-MediumPic:           INCBIN "gfx/trainers/medium.2bpp.lz"
-DonphanFrontpic:     INCBIN "gfx/pokemon/donphan/front_gold.2bpp.lz"
-MantineFrontpic:     INCBIN "gfx/pokemon/mantine/front_gold.2bpp.lz"
-HitmontopFrontpic:   INCBIN "gfx/pokemon/hitmontop/front_gold.2bpp.lz"
-FisherPic:           INCBIN "gfx/trainers/fisher.2bpp.lz"
-PolitoedFrontpic:    INCBIN "gfx/pokemon/politoed/front_gold.2bpp.lz"
-ElectabuzzFrontpic:  INCBIN "gfx/pokemon/electabuzz/front_gold.2bpp.lz"
-TentacruelFrontpic:  INCBIN "gfx/pokemon/tentacruel/front_gold.2bpp.lz"
-NidokingBackpic:     INCBIN "gfx/pokemon/nidoking/back.2bpp.lz"
-PokefanmPic:         INCBIN "gfx/trainers/pokefan_m.2bpp.lz"
-BoarderPic:          INCBIN "gfx/trainers/boarder.2bpp.lz"
-UrsaringFrontpic:    INCBIN "gfx/pokemon/ursaring/front_gold.2bpp.lz"
-MachampBackpic:      INCBIN "gfx/pokemon/machamp/back.2bpp.lz"
-
-SECTION "Pics 14", ROMX
-
-UnownHFrontpic:      INCBIN "gfx/pokemon/unown_h/front.2bpp.lz"
-DittoFrontpic:       INCBIN "gfx/pokemon/ditto/front_gold.2bpp.lz"
-SnorlaxBackpic:      INCBIN "gfx/pokemon/snorlax/back.2bpp.lz"
-MagnemiteBackpic:    INCBIN "gfx/pokemon/magnemite/back.2bpp.lz"
-UnownGBackpic:       INCBIN "gfx/pokemon/unown_g/back.2bpp.lz"
-ForretressBackpic:   INCBIN "gfx/pokemon/forretress/back.2bpp.lz"
-NatuFrontpic:        INCBIN "gfx/pokemon/natu/front_gold.2bpp.lz"
-UnownSFrontpic:      INCBIN "gfx/pokemon/unown_s/front.2bpp.lz"
-UnownVFrontpic:      INCBIN "gfx/pokemon/unown_v/front.2bpp.lz"
-UnownFBackpic:       INCBIN "gfx/pokemon/unown_f/back.2bpp.lz"
-UnownDBackpic:       INCBIN "gfx/pokemon/unown_d/back.2bpp.lz"
-UnownDFrontpic:      INCBIN "gfx/pokemon/unown_d/front.2bpp.lz"
-UnownSBackpic:       INCBIN "gfx/pokemon/unown_s/back.2bpp.lz"
-UnownEFrontpic:      INCBIN "gfx/pokemon/unown_e/front.2bpp.lz"
-UnownEBackpic:       INCBIN "gfx/pokemon/unown_e/back.2bpp.lz"
-VoltorbFrontpic:     INCBIN "gfx/pokemon/voltorb/front_gold.2bpp.lz"
-MagnemiteFrontpic:   INCBIN "gfx/pokemon/magnemite/front_gold.2bpp.lz"
-UnownZFrontpic:      INCBIN "gfx/pokemon/unown_z/front.2bpp.lz"
-UnownBFrontpic:      INCBIN "gfx/pokemon/unown_b/front.2bpp.lz"
-UnownFFrontpic:      INCBIN "gfx/pokemon/unown_f/front.2bpp.lz"
-UnownJBackpic:       INCBIN "gfx/pokemon/unown_j/back.2bpp.lz"
-UnownBBackpic:       INCBIN "gfx/pokemon/unown_b/back.2bpp.lz"
-UnownWFrontpic:      INCBIN "gfx/pokemon/unown_w/front.2bpp.lz"
-UnownOBackpic:       INCBIN "gfx/pokemon/unown_o/back.2bpp.lz"
-UnownJFrontpic:      INCBIN "gfx/pokemon/unown_j/front.2bpp.lz"
-UnownWBackpic:       INCBIN "gfx/pokemon/unown_w/back.2bpp.lz"
-UnownNFrontpic:      INCBIN "gfx/pokemon/unown_n/front.2bpp.lz"
-UnownKFrontpic:      INCBIN "gfx/pokemon/unown_k/front.2bpp.lz"
-UnownNBackpic:       INCBIN "gfx/pokemon/unown_n/back.2bpp.lz"
-UnownABackpic:       INCBIN "gfx/pokemon/unown_a/back.2bpp.lz"
-UnownAFrontpic:      INCBIN "gfx/pokemon/unown_a/front.2bpp.lz"
-UnownMBackpic:       INCBIN "gfx/pokemon/unown_m/back.2bpp.lz"
-UnownTFrontpic:      INCBIN "gfx/pokemon/unown_t/front.2bpp.lz"
-UnownOFrontpic:      INCBIN "gfx/pokemon/unown_o/front.2bpp.lz"
-UnownKBackpic:       INCBIN "gfx/pokemon/unown_k/back.2bpp.lz"
-UnownTBackpic:       INCBIN "gfx/pokemon/unown_t/back.2bpp.lz"
-UnownXBackpic:       INCBIN "gfx/pokemon/unown_x/back.2bpp.lz"
-UnownMFrontpic:      INCBIN "gfx/pokemon/unown_m/front.2bpp.lz"
-UnownLBackpic:       INCBIN "gfx/pokemon/unown_l/back.2bpp.lz"
-UnownUBackpic:       INCBIN "gfx/pokemon/unown_u/back.2bpp.lz"
-UnownLFrontpic:      INCBIN "gfx/pokemon/unown_l/front.2bpp.lz"
-UnownYFrontpic:      INCBIN "gfx/pokemon/unown_y/front.2bpp.lz"
-UnownXFrontpic:      INCBIN "gfx/pokemon/unown_x/front.2bpp.lz"
-UnownQBackpic:       INCBIN "gfx/pokemon/unown_q/back.2bpp.lz"
-UnownQFrontpic:      INCBIN "gfx/pokemon/unown_q/front.2bpp.lz"
-UnownPFrontpic:      INCBIN "gfx/pokemon/unown_p/front.2bpp.lz"
-UnownYBackpic:       INCBIN "gfx/pokemon/unown_y/back.2bpp.lz"
-UnownIBackpic:       INCBIN "gfx/pokemon/unown_i/back.2bpp.lz"
-UnownPBackpic:       INCBIN "gfx/pokemon/unown_p/back.2bpp.lz"
-UnownIFrontpic:      INCBIN "gfx/pokemon/unown_i/front.2bpp.lz"
-UnownRBackpic:       INCBIN "gfx/pokemon/unown_r/back.2bpp.lz"
-UnownRFrontpic:      INCBIN "gfx/pokemon/unown_r/front.2bpp.lz"
-
-ELIF DEF(_SILVER)
 
 SECTION "Pic Pointers", ROMX
 
 INCLUDE "data/pokemon/pic_pointers.asm"
 
+
 SECTION "Pics 1", ROMX
 
 MachampFrontpic:     INCBIN "gfx/pokemon/machamp/front_silver.2bpp.lz"
@@ -708,6 +37,7 @@ SeakingFrontpic:     INCBIN "gfx/pokemon/seaking/front_silver.2bpp.lz"
 MeganiumFrontpic:    INCBIN "gfx/pokemon/meganium/front_silver.2bpp.lz"
 LassPic:             INCBIN "gfx/trainers/lass.2bpp.lz"
 
+
 SECTION "Pics 2", ROMX
 
 GirafarigFrontpic:   INCBIN "gfx/pokemon/girafarig/front_silver.2bpp.lz"
@@ -747,6 +77,7 @@ GuitaristPic:        INCBIN "gfx/trainers/guitarist.2bpp.lz"
 VenomothBackpic:     INCBIN "gfx/pokemon/venomoth/back.2bpp.lz"
 DiglettBackpic:      INCBIN "gfx/pokemon/diglett/back.2bpp.lz"
 
+
 SECTION "Pics 3", ROMX
 
 PokefanfPic:         INCBIN "gfx/trainers/pokefan_f.2bpp.lz"
@@ -788,6 +119,7 @@ FarfetchDFrontpic:   INCBIN "gfx/pokemon/farfetch_d/front_silver.2bpp.lz"
 AriadosFrontpic:     INCBIN "gfx/pokemon/ariados/front.2bpp.lz"
 MurkrowBackpic:      INCBIN "gfx/pokemon/murkrow/back.2bpp.lz"
 
+
 SECTION "Pics 4", ROMX
 
 DrowzeeFrontpic:     INCBIN "gfx/pokemon/drowzee/front_silver.2bpp.lz"
@@ -831,6 +163,7 @@ SandshrewBackpic:    INCBIN "gfx/pokemon/sandshrew/back.2bpp.lz"
 BeautyPic:           INCBIN "gfx/trainers/beauty.2bpp.lz"
 SailorPic:           INCBIN "gfx/trainers/sailor.2bpp.lz"
 
+
 SECTION "Pics 5", ROMX
 
 ChanseyFrontpic:     INCBIN "gfx/pokemon/chansey/front_silver.2bpp.lz"
@@ -876,6 +209,7 @@ WigglytuffFrontpic:  INCBIN "gfx/pokemon/wigglytuff/front_silver.2bpp.lz"
 EeveeBackpic:        INCBIN "gfx/pokemon/eevee/back.2bpp.lz"
 PonytaBackpic:       INCBIN "gfx/pokemon/ponyta/back.2bpp.lz"
 
+
 SECTION "Pics 6", ROMX
 
 MarowakFrontpic:     INCBIN "gfx/pokemon/marowak/front_silver.2bpp.lz"
@@ -923,6 +257,7 @@ BlastoiseBackpic:    INCBIN "gfx/pokemon/blastoise/back.2bpp.lz"
 MisdreavusBackpic:   INCBIN "gfx/pokemon/misdreavus/back.2bpp.lz"
 SnubbullFrontpic:    INCBIN "gfx/pokemon/snubbull/front_silver.2bpp.lz"
 
+
 SECTION "Pics 7", ROMX
 
 ScizorBackpic:       INCBIN "gfx/pokemon/scizor/back.2bpp.lz"
@@ -973,6 +308,7 @@ SlowbroBackpic:      INCBIN "gfx/pokemon/slowbro/back.2bpp.lz"
 GolduckBackpic:      INCBIN "gfx/pokemon/golduck/back.2bpp.lz"
 JynxBackpic:         INCBIN "gfx/pokemon/jynx/back.2bpp.lz"
 
+
 SECTION "Pics 8", ROMX
 
 WeezingBackpic:      INCBIN "gfx/pokemon/weezing/back.2bpp.lz"
@@ -1026,6 +362,7 @@ MeowthBackpic:       INCBIN "gfx/pokemon/meowth/back.2bpp.lz"
 LickitungBackpic:    INCBIN "gfx/pokemon/lickitung/back.2bpp.lz"
 UnownCFrontpic:      INCBIN "gfx/pokemon/unown_c/front.2bpp.lz"
 
+
 SECTION "Pics 9", ROMX
 
 SuperNerdPic:        INCBIN "gfx/trainers/super_nerd.2bpp.lz"
@@ -1082,6 +419,7 @@ TyrogueFrontpic:     INCBIN "gfx/pokemon/tyrogue/front_silver.2bpp.lz"
 RattataFrontpic:     INCBIN "gfx/pokemon/rattata/front_silver.2bpp.lz"
 ParasFrontpic:       INCBIN "gfx/pokemon/paras/front_silver.2bpp.lz"
 
+
 SECTION "Pics 10", ROMX
 
 LarvitarBackpic:     INCBIN "gfx/pokemon/larvitar/back.2bpp.lz"
@@ -1143,6 +481,7 @@ ZubatFrontpic:       INCBIN "gfx/pokemon/zubat/front_silver.2bpp.lz"
 StarmieBackpic:      INCBIN "gfx/pokemon/starmie/back.2bpp.lz"
 OddishFrontpic:      INCBIN "gfx/pokemon/oddish/front_silver.2bpp.lz"
 
+
 SECTION "Pics 11", ROMX
 
 IgglybuffFrontpic:   INCBIN "gfx/pokemon/igglybuff/front_silver.2bpp.lz"
@@ -1216,10 +555,12 @@ GolbatBackpic:       INCBIN "gfx/pokemon/golbat/back.2bpp.lz"
 UnownHBackpic:       INCBIN "gfx/pokemon/unown_h/back.2bpp.lz"
 SnorlaxBackpic:      INCBIN "gfx/pokemon/snorlax/back.2bpp.lz"
 
+
 SECTION "Unown Pic Pointers", ROMX
 
 INCLUDE "data/pokemon/unown_pic_pointers.asm"
 
+
 SECTION "Pics 12", ROMX
 
 SuicuneFrontpic:     INCBIN "gfx/pokemon/suicune/front.2bpp.lz"
@@ -1253,10 +594,12 @@ PrimeapeFrontpic:    INCBIN "gfx/pokemon/primeape/front_silver.2bpp.lz"
 ScytherFrontpic:     INCBIN "gfx/pokemon/scyther/front_silver.2bpp.lz"
 DragonairFrontpic:   INCBIN "gfx/pokemon/dragonair/front_silver.2bpp.lz"
 
+
 SECTION "Trainer Pic Pointers", ROMX
 
 INCLUDE "data/trainers/pic_pointers.asm"
 
+
 SECTION "Pics 13", ROMX
 
 HoundoomFrontpic:    INCBIN "gfx/pokemon/houndoom/front_silver.2bpp.lz"
@@ -1293,6 +636,7 @@ MachampBackpic:      INCBIN "gfx/pokemon/machamp/back.2bpp.lz"
 FlareonFrontpic:     INCBIN "gfx/pokemon/flareon/front_silver.2bpp.lz"
 SpinarakFrontpic:    INCBIN "gfx/pokemon/spinarak/front.2bpp.lz"
 
+
 SECTION "Pics 14", ROMX
 
 UnownGFrontpic:      INCBIN "gfx/pokemon/unown_g/front.2bpp.lz"
@@ -1347,6 +691,4 @@ UnownPBackpic:       INCBIN "gfx/pokemon/unown_p/back.2bpp.lz"
 UnownIBackpic:       INCBIN "gfx/pokemon/unown_i/back.2bpp.lz"
 UnownIFrontpic:      INCBIN "gfx/pokemon/unown_i/front.2bpp.lz"
 UnownRBackpic:       INCBIN "gfx/pokemon/unown_r/back.2bpp.lz"
-UnownRFrontpic:      INCBIN "gfx/pokemon/unown_r/front.2bpp.lz"
-
-ENDC
+UnownRFrontpic:      INCBIN "gfx/pokemon/unown_r/front.2bpp.lz"
+\ No newline at end of file
diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm
deleted file mode 100644
index c14cf56e..00000000
--- a/gfx/pokemon/anim_pointers.asm
+++ /dev/null
@@ -1,252 +0,0 @@
-AnimationPointers:
-	dw BulbasaurAnimation
-	dw IvysaurAnimation
-	dw VenusaurAnimation
-	dw CharmanderAnimation
-	dw CharmeleonAnimation
-	dw CharizardAnimation
-	dw SquirtleAnimation
-	dw WartortleAnimation
-	dw BlastoiseAnimation
-	dw CaterpieAnimation
-	dw MetapodAnimation
-	dw ButterfreeAnimation
-	dw WeedleAnimation
-	dw KakunaAnimation
-	dw BeedrillAnimation
-	dw PidgeyAnimation
-	dw PidgeottoAnimation
-	dw PidgeotAnimation
-	dw RattataAnimation
-	dw RaticateAnimation
-	dw SpearowAnimation
-	dw FearowAnimation
-	dw EkansAnimation
-	dw ArbokAnimation
-	dw PikachuAnimation
-	dw RaichuAnimation
-	dw SandshrewAnimation
-	dw SandslashAnimation
-	dw NidoranFAnimation
-	dw NidorinaAnimation
-	dw NidoqueenAnimation
-	dw NidoranMAnimation
-	dw NidorinoAnimation
-	dw NidokingAnimation
-	dw ClefairyAnimation
-	dw ClefableAnimation
-	dw VulpixAnimation
-	dw NinetalesAnimation
-	dw JigglypuffAnimation
-	dw WigglytuffAnimation
-	dw ZubatAnimation
-	dw GolbatAnimation
-	dw OddishAnimation
-	dw GloomAnimation
-	dw VileplumeAnimation
-	dw ParasAnimation
-	dw ParasectAnimation
-	dw VenonatAnimation
-	dw VenomothAnimation
-	dw DiglettAnimation
-	dw DugtrioAnimation
-	dw MeowthAnimation
-	dw PersianAnimation
-	dw PsyduckAnimation
-	dw GolduckAnimation
-	dw MankeyAnimation
-	dw PrimeapeAnimation
-	dw GrowlitheAnimation
-	dw ArcanineAnimation
-	dw PoliwagAnimation
-	dw PoliwhirlAnimation
-	dw PoliwrathAnimation
-	dw AbraAnimation
-	dw KadabraAnimation
-	dw AlakazamAnimation
-	dw MachopAnimation
-	dw MachokeAnimation
-	dw MachampAnimation
-	dw BellsproutAnimation
-	dw WeepinbellAnimation
-	dw VictreebelAnimation
-	dw TentacoolAnimation
-	dw TentacruelAnimation
-	dw GeodudeAnimation
-	dw GravelerAnimation
-	dw GolemAnimation
-	dw PonytaAnimation
-	dw RapidashAnimation
-	dw SlowpokeAnimation
-	dw SlowbroAnimation
-	dw MagnemiteAnimation
-	dw MagnetonAnimation
-	dw FarfetchDAnimation
-	dw DoduoAnimation
-	dw DodrioAnimation
-	dw SeelAnimation
-	dw DewgongAnimation
-	dw GrimerAnimation
-	dw MukAnimation
-	dw ShellderAnimation
-	dw CloysterAnimation
-	dw GastlyAnimation
-	dw HaunterAnimation
-	dw GengarAnimation
-	dw OnixAnimation
-	dw DrowzeeAnimation
-	dw HypnoAnimation
-	dw KrabbyAnimation
-	dw KinglerAnimation
-	dw VoltorbAnimation
-	dw ElectrodeAnimation
-	dw ExeggcuteAnimation
-	dw ExeggutorAnimation
-	dw CuboneAnimation
-	dw MarowakAnimation
-	dw HitmonleeAnimation
-	dw HitmonchanAnimation
-	dw LickitungAnimation
-	dw KoffingAnimation
-	dw WeezingAnimation
-	dw RhyhornAnimation
-	dw RhydonAnimation
-	dw ChanseyAnimation
-	dw TangelaAnimation
-	dw KangaskhanAnimation
-	dw HorseaAnimation
-	dw SeadraAnimation
-	dw GoldeenAnimation
-	dw SeakingAnimation
-	dw StaryuAnimation
-	dw StarmieAnimation
-	dw MrMimeAnimation
-	dw ScytherAnimation
-	dw JynxAnimation
-	dw ElectabuzzAnimation
-	dw MagmarAnimation
-	dw PinsirAnimation
-	dw TaurosAnimation
-	dw MagikarpAnimation
-	dw GyaradosAnimation
-	dw LaprasAnimation
-	dw DittoAnimation
-	dw EeveeAnimation
-	dw VaporeonAnimation
-	dw JolteonAnimation
-	dw FlareonAnimation
-	dw PorygonAnimation
-	dw OmanyteAnimation
-	dw OmastarAnimation
-	dw KabutoAnimation
-	dw KabutopsAnimation
-	dw AerodactylAnimation
-	dw SnorlaxAnimation
-	dw ArticunoAnimation
-	dw ZapdosAnimation
-	dw MoltresAnimation
-	dw DratiniAnimation
-	dw DragonairAnimation
-	dw DragoniteAnimation
-	dw MewtwoAnimation
-	dw MewAnimation
-	dw ChikoritaAnimation
-	dw BayleefAnimation
-	dw MeganiumAnimation
-	dw CyndaquilAnimation
-	dw QuilavaAnimation
-	dw TyphlosionAnimation
-	dw TotodileAnimation
-	dw CroconawAnimation
-	dw FeraligatrAnimation
-	dw SentretAnimation
-	dw FurretAnimation
-	dw HoothootAnimation
-	dw NoctowlAnimation
-	dw LedybaAnimation
-	dw LedianAnimation
-	dw SpinarakAnimation
-	dw AriadosAnimation
-	dw CrobatAnimation
-	dw ChinchouAnimation
-	dw LanturnAnimation
-	dw PichuAnimation
-	dw CleffaAnimation
-	dw IgglybuffAnimation
-	dw TogepiAnimation
-	dw TogeticAnimation
-	dw NatuAnimation
-	dw XatuAnimation
-	dw MareepAnimation
-	dw FlaaffyAnimation
-	dw AmpharosAnimation
-	dw BellossomAnimation
-	dw MarillAnimation
-	dw AzumarillAnimation
-	dw SudowoodoAnimation
-	dw PolitoedAnimation
-	dw HoppipAnimation
-	dw SkiploomAnimation
-	dw JumpluffAnimation
-	dw AipomAnimation
-	dw SunkernAnimation
-	dw SunfloraAnimation
-	dw YanmaAnimation
-	dw WooperAnimation
-	dw QuagsireAnimation
-	dw EspeonAnimation
-	dw UmbreonAnimation
-	dw MurkrowAnimation
-	dw SlowkingAnimation
-	dw MisdreavusAnimation
-	dw UnownAnimation
-	dw WobbuffetAnimation
-	dw GirafarigAnimation
-	dw PinecoAnimation
-	dw ForretressAnimation
-	dw DunsparceAnimation
-	dw GligarAnimation
-	dw SteelixAnimation
-	dw SnubbullAnimation
-	dw GranbullAnimation
-	dw QwilfishAnimation
-	dw ScizorAnimation
-	dw ShuckleAnimation
-	dw HeracrossAnimation
-	dw SneaselAnimation
-	dw TeddiursaAnimation
-	dw UrsaringAnimation
-	dw SlugmaAnimation
-	dw MagcargoAnimation
-	dw SwinubAnimation
-	dw PiloswineAnimation
-	dw CorsolaAnimation
-	dw RemoraidAnimation
-	dw OctilleryAnimation
-	dw DelibirdAnimation
-	dw MantineAnimation
-	dw SkarmoryAnimation
-	dw HoundourAnimation
-	dw HoundoomAnimation
-	dw KingdraAnimation
-	dw PhanpyAnimation
-	dw DonphanAnimation
-	dw Porygon2Animation
-	dw StantlerAnimation
-	dw SmeargleAnimation
-	dw TyrogueAnimation
-	dw HitmontopAnimation
-	dw SmoochumAnimation
-	dw ElekidAnimation
-	dw MagbyAnimation
-	dw MiltankAnimation
-	dw BlisseyAnimation
-	dw RaikouAnimation
-	dw EnteiAnimation
-	dw SuicuneAnimation
-	dw LarvitarAnimation
-	dw PupitarAnimation
-	dw TyranitarAnimation
-	dw LugiaAnimation
-	dw HoOhAnimation
-	dw CelebiAnimation
diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm
deleted file mode 100644
index 37d81777..00000000
--- a/gfx/pokemon/anims.asm
+++ /dev/null
@@ -1,253 +0,0 @@
-PicAnimations:
-BulbasaurAnimation:  INCLUDE "gfx/pics/bulbasaur/anim0.asm"
-IvysaurAnimation:    INCLUDE "gfx/pics/ivysaur/anim0.asm"
-VenusaurAnimation:   INCLUDE "gfx/pics/venusaur/anim0.asm"
-CharmanderAnimation: INCLUDE "gfx/pics/charmander/anim0.asm"
-CharmeleonAnimation: INCLUDE "gfx/pics/charmeleon/anim0.asm"
-CharizardAnimation:  INCLUDE "gfx/pics/charizard/anim0.asm"
-SquirtleAnimation:   INCLUDE "gfx/pics/squirtle/anim0.asm"
-WartortleAnimation:  INCLUDE "gfx/pics/wartortle/anim0.asm"
-BlastoiseAnimation:  INCLUDE "gfx/pics/blastoise/anim0.asm"
-CaterpieAnimation:   INCLUDE "gfx/pics/caterpie/anim0.asm"
-MetapodAnimation:    INCLUDE "gfx/pics/metapod/anim0.asm"
-ButterfreeAnimation: INCLUDE "gfx/pics/butterfree/anim0.asm"
-WeedleAnimation:     INCLUDE "gfx/pics/weedle/anim0.asm"
-KakunaAnimation:     INCLUDE "gfx/pics/kakuna/anim0.asm"
-BeedrillAnimation:   INCLUDE "gfx/pics/beedrill/anim0.asm"
-PidgeyAnimation:     INCLUDE "gfx/pics/pidgey/anim0.asm"
-PidgeottoAnimation:  INCLUDE "gfx/pics/pidgeotto/anim0.asm"
-PidgeotAnimation:    INCLUDE "gfx/pics/pidgeot/anim0.asm"
-RattataAnimation:    INCLUDE "gfx/pics/rattata/anim0.asm"
-RaticateAnimation:   INCLUDE "gfx/pics/raticate/anim0.asm"
-SpearowAnimation:    INCLUDE "gfx/pics/spearow/anim0.asm"
-FearowAnimation:     INCLUDE "gfx/pics/fearow/anim0.asm"
-EkansAnimation:      INCLUDE "gfx/pics/ekans/anim0.asm"
-ArbokAnimation:      INCLUDE "gfx/pics/arbok/anim0.asm"
-PikachuAnimation:    INCLUDE "gfx/pics/pikachu/anim0.asm"
-RaichuAnimation:     INCLUDE "gfx/pics/raichu/anim0.asm"
-SandshrewAnimation:  INCLUDE "gfx/pics/sandshrew/anim0.asm"
-SandslashAnimation:  INCLUDE "gfx/pics/sandslash/anim0.asm"
-NidoranFAnimation:   INCLUDE "gfx/pics/nidoran_f/anim0.asm"
-NidorinaAnimation:   INCLUDE "gfx/pics/nidorina/anim0.asm"
-NidoqueenAnimation:  INCLUDE "gfx/pics/nidoqueen/anim0.asm"
-NidoranMAnimation:   INCLUDE "gfx/pics/nidoran_m/anim0.asm"
-NidorinoAnimation:   INCLUDE "gfx/pics/nidorino/anim0.asm"
-NidokingAnimation:   INCLUDE "gfx/pics/nidoking/anim0.asm"
-ClefairyAnimation:   INCLUDE "gfx/pics/clefairy/anim0.asm"
-ClefableAnimation:   INCLUDE "gfx/pics/clefable/anim0.asm"
-VulpixAnimation:     INCLUDE "gfx/pics/vulpix/anim0.asm"
-NinetalesAnimation:  INCLUDE "gfx/pics/ninetales/anim0.asm"
-JigglypuffAnimation: INCLUDE "gfx/pics/jigglypuff/anim0.asm"
-WigglytuffAnimation: INCLUDE "gfx/pics/wigglytuff/anim0.asm"
-ZubatAnimation:      INCLUDE "gfx/pics/zubat/anim0.asm"
-GolbatAnimation:     INCLUDE "gfx/pics/golbat/anim0.asm"
-OddishAnimation:     INCLUDE "gfx/pics/oddish/anim0.asm"
-GloomAnimation:      INCLUDE "gfx/pics/gloom/anim0.asm"
-VileplumeAnimation:  INCLUDE "gfx/pics/vileplume/anim0.asm"
-ParasAnimation:      INCLUDE "gfx/pics/paras/anim0.asm"
-ParasectAnimation:   INCLUDE "gfx/pics/parasect/anim0.asm"
-VenonatAnimation:    INCLUDE "gfx/pics/venonat/anim0.asm"
-VenomothAnimation:   INCLUDE "gfx/pics/venomoth/anim0.asm"
-DiglettAnimation:    INCLUDE "gfx/pics/diglett/anim0.asm"
-DugtrioAnimation:    INCLUDE "gfx/pics/dugtrio/anim0.asm"
-MeowthAnimation:     INCLUDE "gfx/pics/meowth/anim0.asm"
-PersianAnimation:    INCLUDE "gfx/pics/persian/anim0.asm"
-PsyduckAnimation:    INCLUDE "gfx/pics/psyduck/anim0.asm"
-GolduckAnimation:    INCLUDE "gfx/pics/golduck/anim0.asm"
-MankeyAnimation:     INCLUDE "gfx/pics/mankey/anim0.asm"
-PrimeapeAnimation:   INCLUDE "gfx/pics/primeape/anim0.asm"
-GrowlitheAnimation:  INCLUDE "gfx/pics/growlithe/anim0.asm"
-ArcanineAnimation:   INCLUDE "gfx/pics/arcanine/anim0.asm"
-PoliwagAnimation:    INCLUDE "gfx/pics/poliwag/anim0.asm"
-PoliwhirlAnimation:  INCLUDE "gfx/pics/poliwhirl/anim0.asm"
-PoliwrathAnimation:  INCLUDE "gfx/pics/poliwrath/anim0.asm"
-AbraAnimation:       INCLUDE "gfx/pics/abra/anim0.asm"
-KadabraAnimation:    INCLUDE "gfx/pics/kadabra/anim0.asm"
-AlakazamAnimation:   INCLUDE "gfx/pics/alakazam/anim0.asm"
-MachopAnimation:     INCLUDE "gfx/pics/machop/anim0.asm"
-MachokeAnimation:    INCLUDE "gfx/pics/machoke/anim0.asm"
-MachampAnimation:    INCLUDE "gfx/pics/machamp/anim0.asm"
-BellsproutAnimation: INCLUDE "gfx/pics/bellsprout/anim0.asm"
-WeepinbellAnimation: INCLUDE "gfx/pics/weepinbell/anim0.asm"
-VictreebelAnimation: INCLUDE "gfx/pics/victreebel/anim0.asm"
-TentacoolAnimation:  INCLUDE "gfx/pics/tentacool/anim0.asm"
-TentacruelAnimation: INCLUDE "gfx/pics/tentacruel/anim0.asm"
-GeodudeAnimation:    INCLUDE "gfx/pics/geodude/anim0.asm"
-GravelerAnimation:   INCLUDE "gfx/pics/graveler/anim0.asm"
-GolemAnimation:      INCLUDE "gfx/pics/golem/anim0.asm"
-PonytaAnimation:     INCLUDE "gfx/pics/ponyta/anim0.asm"
-RapidashAnimation:   INCLUDE "gfx/pics/rapidash/anim0.asm"
-SlowpokeAnimation:   INCLUDE "gfx/pics/slowpoke/anim0.asm"
-SlowbroAnimation:    INCLUDE "gfx/pics/slowbro/anim0.asm"
-MagnemiteAnimation:  INCLUDE "gfx/pics/magnemite/anim0.asm"
-MagnetonAnimation:   INCLUDE "gfx/pics/magneton/anim0.asm"
-FarfetchDAnimation:  INCLUDE "gfx/pics/farfetch_d/anim0.asm"
-DoduoAnimation:      INCLUDE "gfx/pics/doduo/anim0.asm"
-DodrioAnimation:     INCLUDE "gfx/pics/dodrio/anim0.asm"
-SeelAnimation:       INCLUDE "gfx/pics/seel/anim0.asm"
-DewgongAnimation:    INCLUDE "gfx/pics/dewgong/anim0.asm"
-GrimerAnimation:     INCLUDE "gfx/pics/grimer/anim0.asm"
-MukAnimation:        INCLUDE "gfx/pics/muk/anim0.asm"
-ShellderAnimation:   INCLUDE "gfx/pics/shellder/anim0.asm"
-CloysterAnimation:   INCLUDE "gfx/pics/cloyster/anim0.asm"
-GastlyAnimation:     INCLUDE "gfx/pics/gastly/anim0.asm"
-HaunterAnimation:    INCLUDE "gfx/pics/haunter/anim0.asm"
-GengarAnimation:     INCLUDE "gfx/pics/gengar/anim0.asm"
-OnixAnimation:       INCLUDE "gfx/pics/onix/anim0.asm"
-DrowzeeAnimation:    INCLUDE "gfx/pics/drowzee/anim0.asm"
-HypnoAnimation:      INCLUDE "gfx/pics/hypno/anim0.asm"
-KrabbyAnimation:     INCLUDE "gfx/pics/krabby/anim0.asm"
-KinglerAnimation:    INCLUDE "gfx/pics/kingler/anim0.asm"
-VoltorbAnimation:    INCLUDE "gfx/pics/voltorb/anim0.asm"
-ElectrodeAnimation:  INCLUDE "gfx/pics/electrode/anim0.asm"
-ExeggcuteAnimation:  INCLUDE "gfx/pics/exeggcute/anim0.asm"
-ExeggutorAnimation:  INCLUDE "gfx/pics/exeggutor/anim0.asm"
-CuboneAnimation:     INCLUDE "gfx/pics/cubone/anim0.asm"
-MarowakAnimation:    INCLUDE "gfx/pics/marowak/anim0.asm"
-HitmonleeAnimation:  INCLUDE "gfx/pics/hitmonlee/anim0.asm"
-HitmonchanAnimation: INCLUDE "gfx/pics/hitmonchan/anim0.asm"
-LickitungAnimation:  INCLUDE "gfx/pics/lickitung/anim0.asm"
-KoffingAnimation:    INCLUDE "gfx/pics/koffing/anim0.asm"
-WeezingAnimation:    INCLUDE "gfx/pics/weezing/anim0.asm"
-RhyhornAnimation:    INCLUDE "gfx/pics/rhyhorn/anim0.asm"
-RhydonAnimation:     INCLUDE "gfx/pics/rhydon/anim0.asm"
-ChanseyAnimation:    INCLUDE "gfx/pics/chansey/anim0.asm"
-TangelaAnimation:    INCLUDE "gfx/pics/tangela/anim0.asm"
-KangaskhanAnimation: INCLUDE "gfx/pics/kangaskhan/anim0.asm"
-HorseaAnimation:     INCLUDE "gfx/pics/horsea/anim0.asm"
-SeadraAnimation:     INCLUDE "gfx/pics/seadra/anim0.asm"
-GoldeenAnimation:    INCLUDE "gfx/pics/goldeen/anim0.asm"
-SeakingAnimation:    INCLUDE "gfx/pics/seaking/anim0.asm"
-StaryuAnimation:     INCLUDE "gfx/pics/staryu/anim0.asm"
-StarmieAnimation:    INCLUDE "gfx/pics/starmie/anim0.asm"
-MrMimeAnimation:     INCLUDE "gfx/pics/mr__mime/anim0.asm"
-ScytherAnimation:    INCLUDE "gfx/pics/scyther/anim0.asm"
-JynxAnimation:       INCLUDE "gfx/pics/jynx/anim0.asm"
-ElectabuzzAnimation: INCLUDE "gfx/pics/electabuzz/anim0.asm"
-MagmarAnimation:     INCLUDE "gfx/pics/magmar/anim0.asm"
-PinsirAnimation:     INCLUDE "gfx/pics/pinsir/anim0.asm"
-TaurosAnimation:     INCLUDE "gfx/pics/tauros/anim0.asm"
-MagikarpAnimation:   INCLUDE "gfx/pics/magikarp/anim0.asm"
-GyaradosAnimation:   INCLUDE "gfx/pics/gyarados/anim0.asm"
-LaprasAnimation:     INCLUDE "gfx/pics/lapras/anim0.asm"
-DittoAnimation:      INCLUDE "gfx/pics/ditto/anim0.asm"
-EeveeAnimation:      INCLUDE "gfx/pics/eevee/anim0.asm"
-VaporeonAnimation:   INCLUDE "gfx/pics/vaporeon/anim0.asm"
-JolteonAnimation:    INCLUDE "gfx/pics/jolteon/anim0.asm"
-FlareonAnimation:    INCLUDE "gfx/pics/flareon/anim0.asm"
-PorygonAnimation:    INCLUDE "gfx/pics/porygon/anim0.asm"
-OmanyteAnimation:    INCLUDE "gfx/pics/omanyte/anim0.asm"
-OmastarAnimation:    INCLUDE "gfx/pics/omastar/anim0.asm"
-KabutoAnimation:     INCLUDE "gfx/pics/kabuto/anim0.asm"
-KabutopsAnimation:   INCLUDE "gfx/pics/kabutops/anim0.asm"
-AerodactylAnimation: INCLUDE "gfx/pics/aerodactyl/anim0.asm"
-SnorlaxAnimation:    INCLUDE "gfx/pics/snorlax/anim0.asm"
-ArticunoAnimation:   INCLUDE "gfx/pics/articuno/anim0.asm"
-ZapdosAnimation:     INCLUDE "gfx/pics/zapdos/anim0.asm"
-MoltresAnimation:    INCLUDE "gfx/pics/moltres/anim0.asm"
-DratiniAnimation:    INCLUDE "gfx/pics/dratini/anim0.asm"
-DragonairAnimation:  INCLUDE "gfx/pics/dragonair/anim0.asm"
-DragoniteAnimation:  INCLUDE "gfx/pics/dragonite/anim0.asm"
-MewtwoAnimation:     INCLUDE "gfx/pics/mewtwo/anim0.asm"
-MewAnimation:        INCLUDE "gfx/pics/mew/anim0.asm"
-ChikoritaAnimation:  INCLUDE "gfx/pics/chikorita/anim0.asm"
-BayleefAnimation:    INCLUDE "gfx/pics/bayleef/anim0.asm"
-MeganiumAnimation:   INCLUDE "gfx/pics/meganium/anim0.asm"
-CyndaquilAnimation:  INCLUDE "gfx/pics/cyndaquil/anim0.asm"
-QuilavaAnimation:    INCLUDE "gfx/pics/quilava/anim0.asm"
-TyphlosionAnimation: INCLUDE "gfx/pics/typhlosion/anim0.asm"
-TotodileAnimation:   INCLUDE "gfx/pics/totodile/anim0.asm"
-CroconawAnimation:   INCLUDE "gfx/pics/croconaw/anim0.asm"
-FeraligatrAnimation: INCLUDE "gfx/pics/feraligatr/anim0.asm"
-SentretAnimation:    INCLUDE "gfx/pics/sentret/anim0.asm"
-FurretAnimation:     INCLUDE "gfx/pics/furret/anim0.asm"
-HoothootAnimation:   INCLUDE "gfx/pics/hoothoot/anim0.asm"
-NoctowlAnimation:    INCLUDE "gfx/pics/noctowl/anim0.asm"
-LedybaAnimation:     INCLUDE "gfx/pics/ledyba/anim0.asm"
-LedianAnimation:     INCLUDE "gfx/pics/ledian/anim0.asm"
-SpinarakAnimation:   INCLUDE "gfx/pics/spinarak/anim0.asm"
-AriadosAnimation:    INCLUDE "gfx/pics/ariados/anim0.asm"
-CrobatAnimation:     INCLUDE "gfx/pics/crobat/anim0.asm"
-ChinchouAnimation:   INCLUDE "gfx/pics/chinchou/anim0.asm"
-LanturnAnimation:    INCLUDE "gfx/pics/lanturn/anim0.asm"
-PichuAnimation:      INCLUDE "gfx/pics/pichu/anim0.asm"
-CleffaAnimation:     INCLUDE "gfx/pics/cleffa/anim0.asm"
-IgglybuffAnimation:  INCLUDE "gfx/pics/igglybuff/anim0.asm"
-TogepiAnimation:     INCLUDE "gfx/pics/togepi/anim0.asm"
-TogeticAnimation:    INCLUDE "gfx/pics/togetic/anim0.asm"
-NatuAnimation:       INCLUDE "gfx/pics/natu/anim0.asm"
-XatuAnimation:       INCLUDE "gfx/pics/xatu/anim0.asm"
-MareepAnimation:     INCLUDE "gfx/pics/mareep/anim0.asm"
-FlaaffyAnimation:    INCLUDE "gfx/pics/flaaffy/anim0.asm"
-AmpharosAnimation:   INCLUDE "gfx/pics/ampharos/anim0.asm"
-BellossomAnimation:  INCLUDE "gfx/pics/bellossom/anim0.asm"
-MarillAnimation:     INCLUDE "gfx/pics/marill/anim0.asm"
-AzumarillAnimation:  INCLUDE "gfx/pics/azumarill/anim0.asm"
-SudowoodoAnimation:  INCLUDE "gfx/pics/sudowoodo/anim0.asm"
-PolitoedAnimation:   INCLUDE "gfx/pics/politoed/anim0.asm"
-HoppipAnimation:     INCLUDE "gfx/pics/hoppip/anim0.asm"
-SkiploomAnimation:   INCLUDE "gfx/pics/skiploom/anim0.asm"
-JumpluffAnimation:   INCLUDE "gfx/pics/jumpluff/anim0.asm"
-AipomAnimation:      INCLUDE "gfx/pics/aipom/anim0.asm"
-SunkernAnimation:    INCLUDE "gfx/pics/sunkern/anim0.asm"
-SunfloraAnimation:   INCLUDE "gfx/pics/sunflora/anim0.asm"
-YanmaAnimation:      INCLUDE "gfx/pics/yanma/anim0.asm"
-WooperAnimation:     INCLUDE "gfx/pics/wooper/anim0.asm"
-QuagsireAnimation:   INCLUDE "gfx/pics/quagsire/anim0.asm"
-EspeonAnimation:     INCLUDE "gfx/pics/espeon/anim0.asm"
-UmbreonAnimation:    INCLUDE "gfx/pics/umbreon/anim0.asm"
-MurkrowAnimation:    INCLUDE "gfx/pics/murkrow/anim0.asm"
-SlowkingAnimation:   INCLUDE "gfx/pics/slowking/anim0.asm"
-MisdreavusAnimation: INCLUDE "gfx/pics/misdreavus/anim0.asm"
-UnownAnimation:      INCLUDE "gfx/pics/unown/anim0.asm"
-WobbuffetAnimation:  INCLUDE "gfx/pics/wobbuffet/anim0.asm"
-GirafarigAnimation:  INCLUDE "gfx/pics/girafarig/anim0.asm"
-PinecoAnimation:     INCLUDE "gfx/pics/pineco/anim0.asm"
-ForretressAnimation: INCLUDE "gfx/pics/forretress/anim0.asm"
-DunsparceAnimation:  INCLUDE "gfx/pics/dunsparce/anim0.asm"
-GligarAnimation:     INCLUDE "gfx/pics/gligar/anim0.asm"
-SteelixAnimation:    INCLUDE "gfx/pics/steelix/anim0.asm"
-SnubbullAnimation:   INCLUDE "gfx/pics/snubbull/anim0.asm"
-GranbullAnimation:   INCLUDE "gfx/pics/granbull/anim0.asm"
-QwilfishAnimation:   INCLUDE "gfx/pics/qwilfish/anim0.asm"
-ScizorAnimation:     INCLUDE "gfx/pics/scizor/anim0.asm"
-ShuckleAnimation:    INCLUDE "gfx/pics/shuckle/anim0.asm"
-HeracrossAnimation:  INCLUDE "gfx/pics/heracross/anim0.asm"
-SneaselAnimation:    INCLUDE "gfx/pics/sneasel/anim0.asm"
-TeddiursaAnimation:  INCLUDE "gfx/pics/teddiursa/anim0.asm"
-UrsaringAnimation:   INCLUDE "gfx/pics/ursaring/anim0.asm"
-SlugmaAnimation:     INCLUDE "gfx/pics/slugma/anim0.asm"
-MagcargoAnimation:   INCLUDE "gfx/pics/magcargo/anim0.asm"
-SwinubAnimation:     INCLUDE "gfx/pics/swinub/anim0.asm"
-PiloswineAnimation:  INCLUDE "gfx/pics/piloswine/anim0.asm"
-CorsolaAnimation:    INCLUDE "gfx/pics/corsola/anim0.asm"
-RemoraidAnimation:   INCLUDE "gfx/pics/remoraid/anim0.asm"
-OctilleryAnimation:  INCLUDE "gfx/pics/octillery/anim0.asm"
-DelibirdAnimation:   INCLUDE "gfx/pics/delibird/anim0.asm"
-MantineAnimation:    INCLUDE "gfx/pics/mantine/anim0.asm"
-SkarmoryAnimation:   INCLUDE "gfx/pics/skarmory/anim0.asm"
-HoundourAnimation:   INCLUDE "gfx/pics/houndour/anim0.asm"
-HoundoomAnimation:   INCLUDE "gfx/pics/houndoom/anim0.asm"
-KingdraAnimation:    INCLUDE "gfx/pics/kingdra/anim0.asm"
-PhanpyAnimation:     INCLUDE "gfx/pics/phanpy/anim0.asm"
-DonphanAnimation:    INCLUDE "gfx/pics/donphan/anim0.asm"
-Porygon2Animation:   INCLUDE "gfx/pics/porygon2/anim0.asm"
-StantlerAnimation:   INCLUDE "gfx/pics/stantler/anim0.asm"
-SmeargleAnimation:   INCLUDE "gfx/pics/smeargle/anim0.asm"
-TyrogueAnimation:    INCLUDE "gfx/pics/tyrogue/anim0.asm"
-HitmontopAnimation:  INCLUDE "gfx/pics/hitmontop/anim0.asm"
-SmoochumAnimation:   INCLUDE "gfx/pics/smoochum/anim0.asm"
-ElekidAnimation:     INCLUDE "gfx/pics/elekid/anim0.asm"
-MagbyAnimation:      INCLUDE "gfx/pics/magby/anim0.asm"
-MiltankAnimation:    INCLUDE "gfx/pics/miltank/anim0.asm"
-BlisseyAnimation:    INCLUDE "gfx/pics/blissey/anim0.asm"
-RaikouAnimation:     INCLUDE "gfx/pics/raikou/anim0.asm"
-EnteiAnimation:      INCLUDE "gfx/pics/entei/anim0.asm"
-SuicuneAnimation:    INCLUDE "gfx/pics/suicune/anim0.asm"
-LarvitarAnimation:   INCLUDE "gfx/pics/larvitar/anim0.asm"
-PupitarAnimation:    INCLUDE "gfx/pics/pupitar/anim0.asm"
-TyranitarAnimation:  INCLUDE "gfx/pics/tyranitar/anim0.asm"
-LugiaAnimation:      INCLUDE "gfx/pics/lugia/anim0.asm"
-HoOhAnimation:       INCLUDE "gfx/pics/ho_oh/anim0.asm"
-CelebiAnimation:     INCLUDE "gfx/pics/celebi/anim0.asm"
-EggAnimation:        INCLUDE "gfx/pics/egg/anim0.asm"
diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm
deleted file mode 100644
index 7d87ad8d..00000000
--- a/gfx/pokemon/bitmask_pointers.asm
+++ /dev/null
@@ -1,252 +0,0 @@
-BitmasksPointers:
-	dw BulbasaurBitmasks
-	dw IvysaurBitmasks
-	dw VenusaurBitmasks
-	dw CharmanderBitmasks
-	dw CharmeleonBitmasks
-	dw CharizardBitmasks
-	dw SquirtleBitmasks
-	dw WartortleBitmasks
-	dw BlastoiseBitmasks
-	dw CaterpieBitmasks
-	dw MetapodBitmasks
-	dw ButterfreeBitmasks
-	dw WeedleBitmasks
-	dw KakunaBitmasks
-	dw BeedrillBitmasks
-	dw PidgeyBitmasks
-	dw PidgeottoBitmasks
-	dw PidgeotBitmasks
-	dw RattataBitmasks
-	dw RaticateBitmasks
-	dw SpearowBitmasks
-	dw FearowBitmasks
-	dw EkansBitmasks
-	dw ArbokBitmasks
-	dw PikachuBitmasks
-	dw RaichuBitmasks
-	dw SandshrewBitmasks
-	dw SandslashBitmasks
-	dw NidoranFBitmasks
-	dw NidorinaBitmasks
-	dw NidoqueenBitmasks
-	dw NidoranMBitmasks
-	dw NidorinoBitmasks
-	dw NidokingBitmasks
-	dw ClefairyBitmasks
-	dw ClefableBitmasks
-	dw VulpixBitmasks
-	dw NinetalesBitmasks
-	dw JigglypuffBitmasks
-	dw WigglytuffBitmasks
-	dw ZubatBitmasks
-	dw GolbatBitmasks
-	dw OddishBitmasks
-	dw GloomBitmasks
-	dw VileplumeBitmasks
-	dw ParasBitmasks
-	dw ParasectBitmasks
-	dw VenonatBitmasks
-	dw VenomothBitmasks
-	dw DiglettBitmasks
-	dw DugtrioBitmasks
-	dw MeowthBitmasks
-	dw PersianBitmasks
-	dw PsyduckBitmasks
-	dw GolduckBitmasks
-	dw MankeyBitmasks
-	dw PrimeapeBitmasks
-	dw GrowlitheBitmasks
-	dw ArcanineBitmasks
-	dw PoliwagBitmasks
-	dw PoliwhirlBitmasks
-	dw PoliwrathBitmasks
-	dw AbraBitmasks
-	dw KadabraBitmasks
-	dw AlakazamBitmasks
-	dw MachopBitmasks
-	dw MachokeBitmasks
-	dw MachampBitmasks
-	dw BellsproutBitmasks
-	dw WeepinbellBitmasks
-	dw VictreebelBitmasks
-	dw TentacoolBitmasks
-	dw TentacruelBitmasks
-	dw GeodudeBitmasks
-	dw GravelerBitmasks
-	dw GolemBitmasks
-	dw PonytaBitmasks
-	dw RapidashBitmasks
-	dw SlowpokeBitmasks
-	dw SlowbroBitmasks
-	dw MagnemiteBitmasks
-	dw MagnetonBitmasks
-	dw FarfetchDBitmasks
-	dw DoduoBitmasks
-	dw DodrioBitmasks
-	dw SeelBitmasks
-	dw DewgongBitmasks
-	dw GrimerBitmasks
-	dw MukBitmasks
-	dw ShellderBitmasks
-	dw CloysterBitmasks
-	dw GastlyBitmasks
-	dw HaunterBitmasks
-	dw GengarBitmasks
-	dw OnixBitmasks
-	dw DrowzeeBitmasks
-	dw HypnoBitmasks
-	dw KrabbyBitmasks
-	dw KinglerBitmasks
-	dw VoltorbBitmasks
-	dw ElectrodeBitmasks
-	dw ExeggcuteBitmasks
-	dw ExeggutorBitmasks
-	dw CuboneBitmasks
-	dw MarowakBitmasks
-	dw HitmonleeBitmasks
-	dw HitmonchanBitmasks
-	dw LickitungBitmasks
-	dw KoffingBitmasks
-	dw WeezingBitmasks
-	dw RhyhornBitmasks
-	dw RhydonBitmasks
-	dw ChanseyBitmasks
-	dw TangelaBitmasks
-	dw KangaskhanBitmasks
-	dw HorseaBitmasks
-	dw SeadraBitmasks
-	dw GoldeenBitmasks
-	dw SeakingBitmasks
-	dw StaryuBitmasks
-	dw StarmieBitmasks
-	dw MrMimeBitmasks
-	dw ScytherBitmasks
-	dw JynxBitmasks
-	dw ElectabuzzBitmasks
-	dw MagmarBitmasks
-	dw PinsirBitmasks
-	dw TaurosBitmasks
-	dw MagikarpBitmasks
-	dw GyaradosBitmasks
-	dw LaprasBitmasks
-	dw DittoBitmasks
-	dw EeveeBitmasks
-	dw VaporeonBitmasks
-	dw JolteonBitmasks
-	dw FlareonBitmasks
-	dw PorygonBitmasks
-	dw OmanyteBitmasks
-	dw OmastarBitmasks
-	dw KabutoBitmasks
-	dw KabutopsBitmasks
-	dw AerodactylBitmasks
-	dw SnorlaxBitmasks
-	dw ArticunoBitmasks
-	dw ZapdosBitmasks
-	dw MoltresBitmasks
-	dw DratiniBitmasks
-	dw DragonairBitmasks
-	dw DragoniteBitmasks
-	dw MewtwoBitmasks
-	dw MewBitmasks
-	dw ChikoritaBitmasks
-	dw BayleefBitmasks
-	dw MeganiumBitmasks
-	dw CyndaquilBitmasks
-	dw QuilavaBitmasks
-	dw TyphlosionBitmasks
-	dw TotodileBitmasks
-	dw CroconawBitmasks
-	dw FeraligatrBitmasks
-	dw SentretBitmasks
-	dw FurretBitmasks
-	dw HoothootBitmasks
-	dw NoctowlBitmasks
-	dw LedybaBitmasks
-	dw LedianBitmasks
-	dw SpinarakBitmasks
-	dw AriadosBitmasks
-	dw CrobatBitmasks
-	dw ChinchouBitmasks
-	dw LanturnBitmasks
-	dw PichuBitmasks
-	dw CleffaBitmasks
-	dw IgglybuffBitmasks
-	dw TogepiBitmasks
-	dw TogeticBitmasks
-	dw NatuBitmasks
-	dw XatuBitmasks
-	dw MareepBitmasks
-	dw FlaaffyBitmasks
-	dw AmpharosBitmasks
-	dw BellossomBitmasks
-	dw MarillBitmasks
-	dw AzumarillBitmasks
-	dw SudowoodoBitmasks
-	dw PolitoedBitmasks
-	dw HoppipBitmasks
-	dw SkiploomBitmasks
-	dw JumpluffBitmasks
-	dw AipomBitmasks
-	dw SunkernBitmasks
-	dw SunfloraBitmasks
-	dw YanmaBitmasks
-	dw WooperBitmasks
-	dw QuagsireBitmasks
-	dw EspeonBitmasks
-	dw UmbreonBitmasks
-	dw MurkrowBitmasks
-	dw SlowkingBitmasks
-	dw MisdreavusBitmasks
-	dw UnownBitmasks
-	dw WobbuffetBitmasks
-	dw GirafarigBitmasks
-	dw PinecoBitmasks
-	dw ForretressBitmasks
-	dw DunsparceBitmasks
-	dw GligarBitmasks
-	dw SteelixBitmasks
-	dw SnubbullBitmasks
-	dw GranbullBitmasks
-	dw QwilfishBitmasks
-	dw ScizorBitmasks
-	dw ShuckleBitmasks
-	dw HeracrossBitmasks
-	dw SneaselBitmasks
-	dw TeddiursaBitmasks
-	dw UrsaringBitmasks
-	dw SlugmaBitmasks
-	dw MagcargoBitmasks
-	dw SwinubBitmasks
-	dw PiloswineBitmasks
-	dw CorsolaBitmasks
-	dw RemoraidBitmasks
-	dw OctilleryBitmasks
-	dw DelibirdBitmasks
-	dw MantineBitmasks
-	dw SkarmoryBitmasks
-	dw HoundourBitmasks
-	dw HoundoomBitmasks
-	dw KingdraBitmasks
-	dw PhanpyBitmasks
-	dw DonphanBitmasks
-	dw Porygon2Bitmasks
-	dw StantlerBitmasks
-	dw SmeargleBitmasks
-	dw TyrogueBitmasks
-	dw HitmontopBitmasks
-	dw SmoochumBitmasks
-	dw ElekidBitmasks
-	dw MagbyBitmasks
-	dw MiltankBitmasks
-	dw BlisseyBitmasks
-	dw RaikouBitmasks
-	dw EnteiBitmasks
-	dw SuicuneBitmasks
-	dw LarvitarBitmasks
-	dw PupitarBitmasks
-	dw TyranitarBitmasks
-	dw LugiaBitmasks
-	dw HoOhBitmasks
-	dw CelebiBitmasks
diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm
deleted file mode 100644
index 4f142431..00000000
--- a/gfx/pokemon/bitmasks.asm
+++ /dev/null
@@ -1,252 +0,0 @@
-BulbasaurBitmasks:  INCLUDE "gfx/pics/bulbasaur/bitmask.asm"
-IvysaurBitmasks:    INCLUDE "gfx/pics/ivysaur/bitmask.asm"
-VenusaurBitmasks:   INCLUDE "gfx/pics/venusaur/bitmask.asm"
-CharmanderBitmasks: INCLUDE "gfx/pics/charmander/bitmask.asm"
-CharmeleonBitmasks: INCLUDE "gfx/pics/charmeleon/bitmask.asm"
-CharizardBitmasks:  INCLUDE "gfx/pics/charizard/bitmask.asm"
-SquirtleBitmasks:   INCLUDE "gfx/pics/squirtle/bitmask.asm"
-WartortleBitmasks:  INCLUDE "gfx/pics/wartortle/bitmask.asm"
-BlastoiseBitmasks:  INCLUDE "gfx/pics/blastoise/bitmask.asm"
-CaterpieBitmasks:   INCLUDE "gfx/pics/caterpie/bitmask.asm"
-MetapodBitmasks:    INCLUDE "gfx/pics/metapod/bitmask.asm"
-ButterfreeBitmasks: INCLUDE "gfx/pics/butterfree/bitmask.asm"
-WeedleBitmasks:     INCLUDE "gfx/pics/weedle/bitmask.asm"
-KakunaBitmasks:     INCLUDE "gfx/pics/kakuna/bitmask.asm"
-BeedrillBitmasks:   INCLUDE "gfx/pics/beedrill/bitmask.asm"
-PidgeyBitmasks:     INCLUDE "gfx/pics/pidgey/bitmask.asm"
-PidgeottoBitmasks:  INCLUDE "gfx/pics/pidgeotto/bitmask.asm"
-PidgeotBitmasks:    INCLUDE "gfx/pics/pidgeot/bitmask.asm"
-RattataBitmasks:    INCLUDE "gfx/pics/rattata/bitmask.asm"
-RaticateBitmasks:   INCLUDE "gfx/pics/raticate/bitmask.asm"
-SpearowBitmasks:    INCLUDE "gfx/pics/spearow/bitmask.asm"
-FearowBitmasks:     INCLUDE "gfx/pics/fearow/bitmask.asm"
-EkansBitmasks:      INCLUDE "gfx/pics/ekans/bitmask.asm"
-ArbokBitmasks:      INCLUDE "gfx/pics/arbok/bitmask.asm"
-PikachuBitmasks:    INCLUDE "gfx/pics/pikachu/bitmask.asm"
-RaichuBitmasks:     INCLUDE "gfx/pics/raichu/bitmask.asm"
-SandshrewBitmasks:  INCLUDE "gfx/pics/sandshrew/bitmask.asm"
-SandslashBitmasks:  INCLUDE "gfx/pics/sandslash/bitmask.asm"
-NidoranFBitmasks:   INCLUDE "gfx/pics/nidoran_f/bitmask.asm"
-NidorinaBitmasks:   INCLUDE "gfx/pics/nidorina/bitmask.asm"
-NidoqueenBitmasks:  INCLUDE "gfx/pics/nidoqueen/bitmask.asm"
-NidoranMBitmasks:   INCLUDE "gfx/pics/nidoran_m/bitmask.asm"
-NidorinoBitmasks:   INCLUDE "gfx/pics/nidorino/bitmask.asm"
-NidokingBitmasks:   INCLUDE "gfx/pics/nidoking/bitmask.asm"
-ClefairyBitmasks:   INCLUDE "gfx/pics/clefairy/bitmask.asm"
-ClefableBitmasks:   INCLUDE "gfx/pics/clefable/bitmask.asm"
-VulpixBitmasks:     INCLUDE "gfx/pics/vulpix/bitmask.asm"
-NinetalesBitmasks:  INCLUDE "gfx/pics/ninetales/bitmask.asm"
-JigglypuffBitmasks: INCLUDE "gfx/pics/jigglypuff/bitmask.asm"
-WigglytuffBitmasks: INCLUDE "gfx/pics/wigglytuff/bitmask.asm"
-ZubatBitmasks:      INCLUDE "gfx/pics/zubat/bitmask.asm"
-GolbatBitmasks:     INCLUDE "gfx/pics/golbat/bitmask.asm"
-OddishBitmasks:     INCLUDE "gfx/pics/oddish/bitmask.asm"
-GloomBitmasks:      INCLUDE "gfx/pics/gloom/bitmask.asm"
-VileplumeBitmasks:  INCLUDE "gfx/pics/vileplume/bitmask.asm"
-ParasBitmasks:      INCLUDE "gfx/pics/paras/bitmask.asm"
-ParasectBitmasks:   INCLUDE "gfx/pics/parasect/bitmask.asm"
-VenonatBitmasks:    INCLUDE "gfx/pics/venonat/bitmask.asm"
-VenomothBitmasks:   INCLUDE "gfx/pics/venomoth/bitmask.asm"
-DiglettBitmasks:    INCLUDE "gfx/pics/diglett/bitmask.asm"
-DugtrioBitmasks:    INCLUDE "gfx/pics/dugtrio/bitmask.asm"
-MeowthBitmasks:     INCLUDE "gfx/pics/meowth/bitmask.asm"
-PersianBitmasks:    INCLUDE "gfx/pics/persian/bitmask.asm"
-PsyduckBitmasks:    INCLUDE "gfx/pics/psyduck/bitmask.asm"
-GolduckBitmasks:    INCLUDE "gfx/pics/golduck/bitmask.asm"
-MankeyBitmasks:     INCLUDE "gfx/pics/mankey/bitmask.asm"
-PrimeapeBitmasks:   INCLUDE "gfx/pics/primeape/bitmask.asm"
-GrowlitheBitmasks:  INCLUDE "gfx/pics/growlithe/bitmask.asm"
-ArcanineBitmasks:   INCLUDE "gfx/pics/arcanine/bitmask.asm"
-PoliwagBitmasks:    INCLUDE "gfx/pics/poliwag/bitmask.asm"
-PoliwhirlBitmasks:  INCLUDE "gfx/pics/poliwhirl/bitmask.asm"
-PoliwrathBitmasks:  INCLUDE "gfx/pics/poliwrath/bitmask.asm"
-AbraBitmasks:       INCLUDE "gfx/pics/abra/bitmask.asm"
-KadabraBitmasks:    INCLUDE "gfx/pics/kadabra/bitmask.asm"
-AlakazamBitmasks:   INCLUDE "gfx/pics/alakazam/bitmask.asm"
-MachopBitmasks:     INCLUDE "gfx/pics/machop/bitmask.asm"
-MachokeBitmasks:    INCLUDE "gfx/pics/machoke/bitmask.asm"
-MachampBitmasks:    INCLUDE "gfx/pics/machamp/bitmask.asm"
-BellsproutBitmasks: INCLUDE "gfx/pics/bellsprout/bitmask.asm"
-WeepinbellBitmasks: INCLUDE "gfx/pics/weepinbell/bitmask.asm"
-VictreebelBitmasks: INCLUDE "gfx/pics/victreebel/bitmask.asm"
-TentacoolBitmasks:  INCLUDE "gfx/pics/tentacool/bitmask.asm"
-TentacruelBitmasks: INCLUDE "gfx/pics/tentacruel/bitmask.asm"
-GeodudeBitmasks:    INCLUDE "gfx/pics/geodude/bitmask.asm"
-GravelerBitmasks:   INCLUDE "gfx/pics/graveler/bitmask.asm"
-GolemBitmasks:      INCLUDE "gfx/pics/golem/bitmask.asm"
-PonytaBitmasks:     INCLUDE "gfx/pics/ponyta/bitmask.asm"
-RapidashBitmasks:   INCLUDE "gfx/pics/rapidash/bitmask.asm"
-SlowpokeBitmasks:   INCLUDE "gfx/pics/slowpoke/bitmask.asm"
-SlowbroBitmasks:    INCLUDE "gfx/pics/slowbro/bitmask.asm"
-MagnemiteBitmasks:  INCLUDE "gfx/pics/magnemite/bitmask.asm"
-MagnetonBitmasks:   INCLUDE "gfx/pics/magneton/bitmask.asm"
-FarfetchDBitmasks:  INCLUDE "gfx/pics/farfetch_d/bitmask.asm"
-DoduoBitmasks:      INCLUDE "gfx/pics/doduo/bitmask.asm"
-DodrioBitmasks:     INCLUDE "gfx/pics/dodrio/bitmask.asm"
-SeelBitmasks:       INCLUDE "gfx/pics/seel/bitmask.asm"
-DewgongBitmasks:    INCLUDE "gfx/pics/dewgong/bitmask.asm"
-GrimerBitmasks:     INCLUDE "gfx/pics/grimer/bitmask.asm"
-MukBitmasks:        INCLUDE "gfx/pics/muk/bitmask.asm"
-ShellderBitmasks:   INCLUDE "gfx/pics/shellder/bitmask.asm"
-CloysterBitmasks:   INCLUDE "gfx/pics/cloyster/bitmask.asm"
-GastlyBitmasks:     INCLUDE "gfx/pics/gastly/bitmask.asm"
-HaunterBitmasks:    INCLUDE "gfx/pics/haunter/bitmask.asm"
-GengarBitmasks:     INCLUDE "gfx/pics/gengar/bitmask.asm"
-OnixBitmasks:       INCLUDE "gfx/pics/onix/bitmask.asm"
-DrowzeeBitmasks:    INCLUDE "gfx/pics/drowzee/bitmask.asm"
-HypnoBitmasks:      INCLUDE "gfx/pics/hypno/bitmask.asm"
-KrabbyBitmasks:     INCLUDE "gfx/pics/krabby/bitmask.asm"
-KinglerBitmasks:    INCLUDE "gfx/pics/kingler/bitmask.asm"
-VoltorbBitmasks:    INCLUDE "gfx/pics/voltorb/bitmask.asm"
-ElectrodeBitmasks:  INCLUDE "gfx/pics/electrode/bitmask.asm"
-ExeggcuteBitmasks:  INCLUDE "gfx/pics/exeggcute/bitmask.asm"
-ExeggutorBitmasks:  INCLUDE "gfx/pics/exeggutor/bitmask.asm"
-CuboneBitmasks:     INCLUDE "gfx/pics/cubone/bitmask.asm"
-MarowakBitmasks:    INCLUDE "gfx/pics/marowak/bitmask.asm"
-HitmonleeBitmasks:  INCLUDE "gfx/pics/hitmonlee/bitmask.asm"
-HitmonchanBitmasks: INCLUDE "gfx/pics/hitmonchan/bitmask.asm"
-LickitungBitmasks:  INCLUDE "gfx/pics/lickitung/bitmask.asm"
-KoffingBitmasks:    INCLUDE "gfx/pics/koffing/bitmask.asm"
-WeezingBitmasks:    INCLUDE "gfx/pics/weezing/bitmask.asm"
-RhyhornBitmasks:    INCLUDE "gfx/pics/rhyhorn/bitmask.asm"
-RhydonBitmasks:     INCLUDE "gfx/pics/rhydon/bitmask.asm"
-ChanseyBitmasks:    INCLUDE "gfx/pics/chansey/bitmask.asm"
-TangelaBitmasks:    INCLUDE "gfx/pics/tangela/bitmask.asm"
-KangaskhanBitmasks: INCLUDE "gfx/pics/kangaskhan/bitmask.asm"
-HorseaBitmasks:     INCLUDE "gfx/pics/horsea/bitmask.asm"
-SeadraBitmasks:     INCLUDE "gfx/pics/seadra/bitmask.asm"
-GoldeenBitmasks:    INCLUDE "gfx/pics/goldeen/bitmask.asm"
-SeakingBitmasks:    INCLUDE "gfx/pics/seaking/bitmask.asm"
-StaryuBitmasks:     INCLUDE "gfx/pics/staryu/bitmask.asm"
-StarmieBitmasks:    INCLUDE "gfx/pics/starmie/bitmask.asm"
-MrMimeBitmasks:     INCLUDE "gfx/pics/mr__mime/bitmask.asm"
-ScytherBitmasks:    INCLUDE "gfx/pics/scyther/bitmask.asm"
-JynxBitmasks:       INCLUDE "gfx/pics/jynx/bitmask.asm"
-ElectabuzzBitmasks: INCLUDE "gfx/pics/electabuzz/bitmask.asm"
-MagmarBitmasks:     INCLUDE "gfx/pics/magmar/bitmask.asm"
-PinsirBitmasks:     INCLUDE "gfx/pics/pinsir/bitmask.asm"
-TaurosBitmasks:     INCLUDE "gfx/pics/tauros/bitmask.asm"
-MagikarpBitmasks:   INCLUDE "gfx/pics/magikarp/bitmask.asm"
-GyaradosBitmasks:   INCLUDE "gfx/pics/gyarados/bitmask.asm"
-LaprasBitmasks:     INCLUDE "gfx/pics/lapras/bitmask.asm"
-DittoBitmasks:      INCLUDE "gfx/pics/ditto/bitmask.asm"
-EeveeBitmasks:      INCLUDE "gfx/pics/eevee/bitmask.asm"
-VaporeonBitmasks:   INCLUDE "gfx/pics/vaporeon/bitmask.asm"
-JolteonBitmasks:    INCLUDE "gfx/pics/jolteon/bitmask.asm"
-FlareonBitmasks:    INCLUDE "gfx/pics/flareon/bitmask.asm"
-PorygonBitmasks:    INCLUDE "gfx/pics/porygon/bitmask.asm"
-OmanyteBitmasks:    INCLUDE "gfx/pics/omanyte/bitmask.asm"
-OmastarBitmasks:    INCLUDE "gfx/pics/omastar/bitmask.asm"
-KabutoBitmasks:     INCLUDE "gfx/pics/kabuto/bitmask.asm"
-KabutopsBitmasks:   INCLUDE "gfx/pics/kabutops/bitmask.asm"
-AerodactylBitmasks: INCLUDE "gfx/pics/aerodactyl/bitmask.asm"
-SnorlaxBitmasks:    INCLUDE "gfx/pics/snorlax/bitmask.asm"
-ArticunoBitmasks:   INCLUDE "gfx/pics/articuno/bitmask.asm"
-ZapdosBitmasks:     INCLUDE "gfx/pics/zapdos/bitmask.asm"
-MoltresBitmasks:    INCLUDE "gfx/pics/moltres/bitmask.asm"
-DratiniBitmasks:    INCLUDE "gfx/pics/dratini/bitmask.asm"
-DragonairBitmasks:  INCLUDE "gfx/pics/dragonair/bitmask.asm"
-DragoniteBitmasks:  INCLUDE "gfx/pics/dragonite/bitmask.asm"
-MewtwoBitmasks:     INCLUDE "gfx/pics/mewtwo/bitmask.asm"
-MewBitmasks:        INCLUDE "gfx/pics/mew/bitmask.asm"
-ChikoritaBitmasks:  INCLUDE "gfx/pics/chikorita/bitmask.asm"
-BayleefBitmasks:    INCLUDE "gfx/pics/bayleef/bitmask.asm"
-MeganiumBitmasks:   INCLUDE "gfx/pics/meganium/bitmask.asm"
-CyndaquilBitmasks:  INCLUDE "gfx/pics/cyndaquil/bitmask.asm"
-QuilavaBitmasks:    INCLUDE "gfx/pics/quilava/bitmask.asm"
-TyphlosionBitmasks: INCLUDE "gfx/pics/typhlosion/bitmask.asm"
-TotodileBitmasks:   INCLUDE "gfx/pics/totodile/bitmask.asm"
-CroconawBitmasks:   INCLUDE "gfx/pics/croconaw/bitmask.asm"
-FeraligatrBitmasks: INCLUDE "gfx/pics/feraligatr/bitmask.asm"
-SentretBitmasks:    INCLUDE "gfx/pics/sentret/bitmask.asm"
-FurretBitmasks:     INCLUDE "gfx/pics/furret/bitmask.asm"
-HoothootBitmasks:   INCLUDE "gfx/pics/hoothoot/bitmask.asm"
-NoctowlBitmasks:    INCLUDE "gfx/pics/noctowl/bitmask.asm"
-LedybaBitmasks:     INCLUDE "gfx/pics/ledyba/bitmask.asm"
-LedianBitmasks:     INCLUDE "gfx/pics/ledian/bitmask.asm"
-SpinarakBitmasks:   INCLUDE "gfx/pics/spinarak/bitmask.asm"
-AriadosBitmasks:    INCLUDE "gfx/pics/ariados/bitmask.asm"
-CrobatBitmasks:     INCLUDE "gfx/pics/crobat/bitmask.asm"
-ChinchouBitmasks:   INCLUDE "gfx/pics/chinchou/bitmask.asm"
-LanturnBitmasks:    INCLUDE "gfx/pics/lanturn/bitmask.asm"
-PichuBitmasks:      INCLUDE "gfx/pics/pichu/bitmask.asm"
-CleffaBitmasks:     INCLUDE "gfx/pics/cleffa/bitmask.asm"
-IgglybuffBitmasks:  INCLUDE "gfx/pics/igglybuff/bitmask.asm"
-TogepiBitmasks:     INCLUDE "gfx/pics/togepi/bitmask.asm"
-TogeticBitmasks:    INCLUDE "gfx/pics/togetic/bitmask.asm"
-NatuBitmasks:       INCLUDE "gfx/pics/natu/bitmask.asm"
-XatuBitmasks:       INCLUDE "gfx/pics/xatu/bitmask.asm"
-MareepBitmasks:     INCLUDE "gfx/pics/mareep/bitmask.asm"
-FlaaffyBitmasks:    INCLUDE "gfx/pics/flaaffy/bitmask.asm"
-AmpharosBitmasks:   INCLUDE "gfx/pics/ampharos/bitmask.asm"
-BellossomBitmasks:  INCLUDE "gfx/pics/bellossom/bitmask.asm"
-MarillBitmasks:     INCLUDE "gfx/pics/marill/bitmask.asm"
-AzumarillBitmasks:  INCLUDE "gfx/pics/azumarill/bitmask.asm"
-SudowoodoBitmasks:  INCLUDE "gfx/pics/sudowoodo/bitmask.asm"
-PolitoedBitmasks:   INCLUDE "gfx/pics/politoed/bitmask.asm"
-HoppipBitmasks:     INCLUDE "gfx/pics/hoppip/bitmask.asm"
-SkiploomBitmasks:   INCLUDE "gfx/pics/skiploom/bitmask.asm"
-JumpluffBitmasks:   INCLUDE "gfx/pics/jumpluff/bitmask.asm"
-AipomBitmasks:      INCLUDE "gfx/pics/aipom/bitmask.asm"
-SunkernBitmasks:    INCLUDE "gfx/pics/sunkern/bitmask.asm"
-SunfloraBitmasks:   INCLUDE "gfx/pics/sunflora/bitmask.asm"
-YanmaBitmasks:      INCLUDE "gfx/pics/yanma/bitmask.asm"
-WooperBitmasks:     INCLUDE "gfx/pics/wooper/bitmask.asm"
-QuagsireBitmasks:   INCLUDE "gfx/pics/quagsire/bitmask.asm"
-EspeonBitmasks:     INCLUDE "gfx/pics/espeon/bitmask.asm"
-UmbreonBitmasks:    INCLUDE "gfx/pics/umbreon/bitmask.asm"
-MurkrowBitmasks:    INCLUDE "gfx/pics/murkrow/bitmask.asm"
-SlowkingBitmasks:   INCLUDE "gfx/pics/slowking/bitmask.asm"
-MisdreavusBitmasks: INCLUDE "gfx/pics/misdreavus/bitmask.asm"
-UnownBitmasks:      INCLUDE "gfx/pics/unown/bitmask.asm"
-WobbuffetBitmasks:  INCLUDE "gfx/pics/wobbuffet/bitmask.asm"
-GirafarigBitmasks:  INCLUDE "gfx/pics/girafarig/bitmask.asm"
-PinecoBitmasks:     INCLUDE "gfx/pics/pineco/bitmask.asm"
-ForretressBitmasks: INCLUDE "gfx/pics/forretress/bitmask.asm"
-DunsparceBitmasks:  INCLUDE "gfx/pics/dunsparce/bitmask.asm"
-GligarBitmasks:     INCLUDE "gfx/pics/gligar/bitmask.asm"
-SteelixBitmasks:    INCLUDE "gfx/pics/steelix/bitmask.asm"
-SnubbullBitmasks:   INCLUDE "gfx/pics/snubbull/bitmask.asm"
-GranbullBitmasks:   INCLUDE "gfx/pics/granbull/bitmask.asm"
-QwilfishBitmasks:   INCLUDE "gfx/pics/qwilfish/bitmask.asm"
-ScizorBitmasks:     INCLUDE "gfx/pics/scizor/bitmask.asm"
-ShuckleBitmasks:    INCLUDE "gfx/pics/shuckle/bitmask.asm"
-HeracrossBitmasks:  INCLUDE "gfx/pics/heracross/bitmask.asm"
-SneaselBitmasks:    INCLUDE "gfx/pics/sneasel/bitmask.asm"
-TeddiursaBitmasks:  INCLUDE "gfx/pics/teddiursa/bitmask.asm"
-UrsaringBitmasks:   INCLUDE "gfx/pics/ursaring/bitmask.asm"
-SlugmaBitmasks:     INCLUDE "gfx/pics/slugma/bitmask.asm"
-MagcargoBitmasks:   INCLUDE "gfx/pics/magcargo/bitmask.asm"
-SwinubBitmasks:     INCLUDE "gfx/pics/swinub/bitmask.asm"
-PiloswineBitmasks:  INCLUDE "gfx/pics/piloswine/bitmask.asm"
-CorsolaBitmasks:    INCLUDE "gfx/pics/corsola/bitmask.asm"
-RemoraidBitmasks:   INCLUDE "gfx/pics/remoraid/bitmask.asm"
-OctilleryBitmasks:  INCLUDE "gfx/pics/octillery/bitmask.asm"
-DelibirdBitmasks:   INCLUDE "gfx/pics/delibird/bitmask.asm"
-MantineBitmasks:    INCLUDE "gfx/pics/mantine/bitmask.asm"
-SkarmoryBitmasks:   INCLUDE "gfx/pics/skarmory/bitmask.asm"
-HoundourBitmasks:   INCLUDE "gfx/pics/houndour/bitmask.asm"
-HoundoomBitmasks:   INCLUDE "gfx/pics/houndoom/bitmask.asm"
-KingdraBitmasks:    INCLUDE "gfx/pics/kingdra/bitmask.asm"
-PhanpyBitmasks:     INCLUDE "gfx/pics/phanpy/bitmask.asm"
-DonphanBitmasks:    INCLUDE "gfx/pics/donphan/bitmask.asm"
-Porygon2Bitmasks:   INCLUDE "gfx/pics/porygon2/bitmask.asm"
-StantlerBitmasks:   INCLUDE "gfx/pics/stantler/bitmask.asm"
-SmeargleBitmasks:   INCLUDE "gfx/pics/smeargle/bitmask.asm"
-TyrogueBitmasks:    INCLUDE "gfx/pics/tyrogue/bitmask.asm"
-HitmontopBitmasks:  INCLUDE "gfx/pics/hitmontop/bitmask.asm"
-SmoochumBitmasks:   INCLUDE "gfx/pics/smoochum/bitmask.asm"
-ElekidBitmasks:     INCLUDE "gfx/pics/elekid/bitmask.asm"
-MagbyBitmasks:      INCLUDE "gfx/pics/magby/bitmask.asm"
-MiltankBitmasks:    INCLUDE "gfx/pics/miltank/bitmask.asm"
-BlisseyBitmasks:    INCLUDE "gfx/pics/blissey/bitmask.asm"
-RaikouBitmasks:     INCLUDE "gfx/pics/raikou/bitmask.asm"
-EnteiBitmasks:      INCLUDE "gfx/pics/entei/bitmask.asm"
-SuicuneBitmasks:    INCLUDE "gfx/pics/suicune/bitmask.asm"
-LarvitarBitmasks:   INCLUDE "gfx/pics/larvitar/bitmask.asm"
-PupitarBitmasks:    INCLUDE "gfx/pics/pupitar/bitmask.asm"
-TyranitarBitmasks:  INCLUDE "gfx/pics/tyranitar/bitmask.asm"
-LugiaBitmasks:      INCLUDE "gfx/pics/lugia/bitmask.asm"
-HoOhBitmasks:       INCLUDE "gfx/pics/ho_oh/bitmask.asm"
-CelebiBitmasks:     INCLUDE "gfx/pics/celebi/bitmask.asm"
-EggBitmasks:        INCLUDE "gfx/pics/egg/bitmask.asm"
diff --git a/gfx/pokemon/egg/front.2bpp.lz b/gfx/pokemon/egg/front.2bpp.lz
new file mode 100644
index 00000000..d8de54c7
--- /dev/null
+++ b/gfx/pokemon/egg/front.2bpp.lz
diff --git a/gfx/pokemon/extra_pointers.asm b/gfx/pokemon/extra_pointers.asm
deleted file mode 100644
index 7afd9514..00000000
--- a/gfx/pokemon/extra_pointers.asm
+++ /dev/null
@@ -1,252 +0,0 @@
-AnimationExtraPointers:
-	dw BulbasaurAnimationExtra
-	dw IvysaurAnimationExtra
-	dw VenusaurAnimationExtra
-	dw CharmanderAnimationExtra
-	dw CharmeleonAnimationExtra
-	dw CharizardAnimationExtra
-	dw SquirtleAnimationExtra
-	dw WartortleAnimationExtra
-	dw BlastoiseAnimationExtra
-	dw CaterpieAnimationExtra
-	dw MetapodAnimationExtra
-	dw ButterfreeAnimationExtra
-	dw WeedleAnimationExtra
-	dw KakunaAnimationExtra
-	dw BeedrillAnimationExtra
-	dw PidgeyAnimationExtra
-	dw PidgeottoAnimationExtra
-	dw PidgeotAnimationExtra
-	dw RattataAnimationExtra
-	dw RaticateAnimationExtra
-	dw SpearowAnimationExtra
-	dw FearowAnimationExtra
-	dw EkansAnimationExtra
-	dw ArbokAnimationExtra
-	dw PikachuAnimationExtra
-	dw RaichuAnimationExtra
-	dw SandshrewAnimationExtra
-	dw SandslashAnimationExtra
-	dw NidoranFAnimationExtra
-	dw NidorinaAnimationExtra
-	dw NidoqueenAnimationExtra
-	dw NidoranMAnimationExtra
-	dw NidorinoAnimationExtra
-	dw NidokingAnimationExtra
-	dw ClefairyAnimationExtra
-	dw ClefableAnimationExtra
-	dw VulpixAnimationExtra
-	dw NinetalesAnimationExtra
-	dw JigglypuffAnimationExtra
-	dw WigglytuffAnimationExtra
-	dw ZubatAnimationExtra
-	dw GolbatAnimationExtra
-	dw OddishAnimationExtra
-	dw GloomAnimationExtra
-	dw VileplumeAnimationExtra
-	dw ParasAnimationExtra
-	dw ParasectAnimationExtra
-	dw VenonatAnimationExtra
-	dw VenomothAnimationExtra
-	dw DiglettAnimationExtra
-	dw DugtrioAnimationExtra
-	dw MeowthAnimationExtra
-	dw PersianAnimationExtra
-	dw PsyduckAnimationExtra
-	dw GolduckAnimationExtra
-	dw MankeyAnimationExtra
-	dw PrimeapeAnimationExtra
-	dw GrowlitheAnimationExtra
-	dw ArcanineAnimationExtra
-	dw PoliwagAnimationExtra
-	dw PoliwhirlAnimationExtra
-	dw PoliwrathAnimationExtra
-	dw AbraAnimationExtra
-	dw KadabraAnimationExtra
-	dw AlakazamAnimationExtra
-	dw MachopAnimationExtra
-	dw MachokeAnimationExtra
-	dw MachampAnimationExtra
-	dw BellsproutAnimationExtra
-	dw WeepinbellAnimationExtra
-	dw VictreebelAnimationExtra
-	dw TentacoolAnimationExtra
-	dw TentacruelAnimationExtra
-	dw GeodudeAnimationExtra
-	dw GravelerAnimationExtra
-	dw GolemAnimationExtra
-	dw PonytaAnimationExtra
-	dw RapidashAnimationExtra
-	dw SlowpokeAnimationExtra
-	dw SlowbroAnimationExtra
-	dw MagnemiteAnimationExtra
-	dw MagnetonAnimationExtra
-	dw FarfetchDAnimationExtra
-	dw DoduoAnimationExtra
-	dw DodrioAnimationExtra
-	dw SeelAnimationExtra
-	dw DewgongAnimationExtra
-	dw GrimerAnimationExtra
-	dw MukAnimationExtra
-	dw ShellderAnimationExtra
-	dw CloysterAnimationExtra
-	dw GastlyAnimationExtra
-	dw HaunterAnimationExtra
-	dw GengarAnimationExtra
-	dw OnixAnimationExtra
-	dw DrowzeeAnimationExtra
-	dw HypnoAnimationExtra
-	dw KrabbyAnimationExtra
-	dw KinglerAnimationExtra
-	dw VoltorbAnimationExtra
-	dw ElectrodeAnimationExtra
-	dw ExeggcuteAnimationExtra
-	dw ExeggutorAnimationExtra
-	dw CuboneAnimationExtra
-	dw MarowakAnimationExtra
-	dw HitmonleeAnimationExtra
-	dw HitmonchanAnimationExtra
-	dw LickitungAnimationExtra
-	dw KoffingAnimationExtra
-	dw WeezingAnimationExtra
-	dw RhyhornAnimationExtra
-	dw RhydonAnimationExtra
-	dw ChanseyAnimationExtra
-	dw TangelaAnimationExtra
-	dw KangaskhanAnimationExtra
-	dw HorseaAnimationExtra
-	dw SeadraAnimationExtra
-	dw GoldeenAnimationExtra
-	dw SeakingAnimationExtra
-	dw StaryuAnimationExtra
-	dw StarmieAnimationExtra
-	dw MrMimeAnimationExtra
-	dw ScytherAnimationExtra
-	dw JynxAnimationExtra
-	dw ElectabuzzAnimationExtra
-	dw MagmarAnimationExtra
-	dw PinsirAnimationExtra
-	dw TaurosAnimationExtra
-	dw MagikarpAnimationExtra
-	dw GyaradosAnimationExtra
-	dw LaprasAnimationExtra
-	dw DittoAnimationExtra
-	dw EeveeAnimationExtra
-	dw VaporeonAnimationExtra
-	dw JolteonAnimationExtra
-	dw FlareonAnimationExtra
-	dw PorygonAnimationExtra
-	dw OmanyteAnimationExtra
-	dw OmastarAnimationExtra
-	dw KabutoAnimationExtra
-	dw KabutopsAnimationExtra
-	dw AerodactylAnimationExtra
-	dw SnorlaxAnimationExtra
-	dw ArticunoAnimationExtra
-	dw ZapdosAnimationExtra
-	dw MoltresAnimationExtra
-	dw DratiniAnimationExtra
-	dw DragonairAnimationExtra
-	dw DragoniteAnimationExtra
-	dw MewtwoAnimationExtra
-	dw MewAnimationExtra
-	dw ChikoritaAnimationExtra
-	dw BayleefAnimationExtra
-	dw MeganiumAnimationExtra
-	dw CyndaquilAnimationExtra
-	dw QuilavaAnimationExtra
-	dw TyphlosionAnimationExtra
-	dw TotodileAnimationExtra
-	dw CroconawAnimationExtra
-	dw FeraligatrAnimationExtra
-	dw SentretAnimationExtra
-	dw FurretAnimationExtra
-	dw HoothootAnimationExtra
-	dw NoctowlAnimationExtra
-	dw LedybaAnimationExtra
-	dw LedianAnimationExtra
-	dw SpinarakAnimationExtra
-	dw AriadosAnimationExtra
-	dw CrobatAnimationExtra
-	dw ChinchouAnimationExtra
-	dw LanturnAnimationExtra
-	dw PichuAnimationExtra
-	dw CleffaAnimationExtra
-	dw IgglybuffAnimationExtra
-	dw TogepiAnimationExtra
-	dw TogeticAnimationExtra
-	dw NatuAnimationExtra
-	dw XatuAnimationExtra
-	dw MareepAnimationExtra
-	dw FlaaffyAnimationExtra
-	dw AmpharosAnimationExtra
-	dw BellossomAnimationExtra
-	dw MarillAnimationExtra
-	dw AzumarillAnimationExtra
-	dw SudowoodoAnimationExtra
-	dw PolitoedAnimationExtra
-	dw HoppipAnimationExtra
-	dw SkiploomAnimationExtra
-	dw JumpluffAnimationExtra
-	dw AipomAnimationExtra
-	dw SunkernAnimationExtra
-	dw SunfloraAnimationExtra
-	dw YanmaAnimationExtra
-	dw WooperAnimationExtra
-	dw QuagsireAnimationExtra
-	dw EspeonAnimationExtra
-	dw UmbreonAnimationExtra
-	dw MurkrowAnimationExtra
-	dw SlowkingAnimationExtra
-	dw MisdreavusAnimationExtra
-	dw UnownAnimationExtra
-	dw WobbuffetAnimationExtra
-	dw GirafarigAnimationExtra
-	dw PinecoAnimationExtra
-	dw ForretressAnimationExtra
-	dw DunsparceAnimationExtra
-	dw GligarAnimationExtra
-	dw SteelixAnimationExtra
-	dw SnubbullAnimationExtra
-	dw GranbullAnimationExtra
-	dw QwilfishAnimationExtra
-	dw ScizorAnimationExtra
-	dw ShuckleAnimationExtra
-	dw HeracrossAnimationExtra
-	dw SneaselAnimationExtra
-	dw TeddiursaAnimationExtra
-	dw UrsaringAnimationExtra
-	dw SlugmaAnimationExtra
-	dw MagcargoAnimationExtra
-	dw SwinubAnimationExtra
-	dw PiloswineAnimationExtra
-	dw CorsolaAnimationExtra
-	dw RemoraidAnimationExtra
-	dw OctilleryAnimationExtra
-	dw DelibirdAnimationExtra
-	dw MantineAnimationExtra
-	dw SkarmoryAnimationExtra
-	dw HoundourAnimationExtra
-	dw HoundoomAnimationExtra
-	dw KingdraAnimationExtra
-	dw PhanpyAnimationExtra
-	dw DonphanAnimationExtra
-	dw Porygon2AnimationExtra
-	dw StantlerAnimationExtra
-	dw SmeargleAnimationExtra
-	dw TyrogueAnimationExtra
-	dw HitmontopAnimationExtra
-	dw SmoochumAnimationExtra
-	dw ElekidAnimationExtra
-	dw MagbyAnimationExtra
-	dw MiltankAnimationExtra
-	dw BlisseyAnimationExtra
-	dw RaikouAnimationExtra
-	dw EnteiAnimationExtra
-	dw SuicuneAnimationExtra
-	dw LarvitarAnimationExtra
-	dw PupitarAnimationExtra
-	dw TyranitarAnimationExtra
-	dw LugiaAnimationExtra
-	dw HoOhAnimationExtra
-	dw CelebiAnimationExtra
diff --git a/gfx/pokemon/extras.asm b/gfx/pokemon/extras.asm
deleted file mode 100644
index 682cbb63..00000000
--- a/gfx/pokemon/extras.asm
+++ /dev/null
@@ -1,252 +0,0 @@
-BulbasaurAnimationExtra:  INCLUDE "gfx/pics/bulbasaur/anim1.asm"
-IvysaurAnimationExtra:    INCLUDE "gfx/pics/ivysaur/anim1.asm"
-VenusaurAnimationExtra:   INCLUDE "gfx/pics/venusaur/anim1.asm"
-CharmanderAnimationExtra: INCLUDE "gfx/pics/charmander/anim1.asm"
-CharmeleonAnimationExtra: INCLUDE "gfx/pics/charmeleon/anim1.asm"
-CharizardAnimationExtra:  INCLUDE "gfx/pics/charizard/anim1.asm"
-SquirtleAnimationExtra:   INCLUDE "gfx/pics/squirtle/anim1.asm"
-WartortleAnimationExtra:  INCLUDE "gfx/pics/wartortle/anim1.asm"
-BlastoiseAnimationExtra:  INCLUDE "gfx/pics/blastoise/anim1.asm"
-CaterpieAnimationExtra:   INCLUDE "gfx/pics/caterpie/anim1.asm"
-MetapodAnimationExtra:    INCLUDE "gfx/pics/metapod/anim1.asm"
-ButterfreeAnimationExtra: INCLUDE "gfx/pics/butterfree/anim1.asm"
-WeedleAnimationExtra:     INCLUDE "gfx/pics/weedle/anim1.asm"
-KakunaAnimationExtra:     INCLUDE "gfx/pics/kakuna/anim1.asm"
-BeedrillAnimationExtra:   INCLUDE "gfx/pics/beedrill/anim1.asm"
-PidgeyAnimationExtra:     INCLUDE "gfx/pics/pidgey/anim1.asm"
-PidgeottoAnimationExtra:  INCLUDE "gfx/pics/pidgeotto/anim1.asm"
-PidgeotAnimationExtra:    INCLUDE "gfx/pics/pidgeot/anim1.asm"
-RattataAnimationExtra:    INCLUDE "gfx/pics/rattata/anim1.asm"
-RaticateAnimationExtra:   INCLUDE "gfx/pics/raticate/anim1.asm"
-SpearowAnimationExtra:    INCLUDE "gfx/pics/spearow/anim1.asm"
-FearowAnimationExtra:     INCLUDE "gfx/pics/fearow/anim1.asm"
-EkansAnimationExtra:      INCLUDE "gfx/pics/ekans/anim1.asm"
-ArbokAnimationExtra:      INCLUDE "gfx/pics/arbok/anim1.asm"
-PikachuAnimationExtra:    INCLUDE "gfx/pics/pikachu/anim1.asm"
-RaichuAnimationExtra:     INCLUDE "gfx/pics/raichu/anim1.asm"
-SandshrewAnimationExtra:  INCLUDE "gfx/pics/sandshrew/anim1.asm"
-SandslashAnimationExtra:  INCLUDE "gfx/pics/sandslash/anim1.asm"
-NidoranFAnimationExtra:   INCLUDE "gfx/pics/nidoran_f/anim1.asm"
-NidorinaAnimationExtra:   INCLUDE "gfx/pics/nidorina/anim1.asm"
-NidoqueenAnimationExtra:  INCLUDE "gfx/pics/nidoqueen/anim1.asm"
-NidoranMAnimationExtra:   INCLUDE "gfx/pics/nidoran_m/anim1.asm"
-NidorinoAnimationExtra:   INCLUDE "gfx/pics/nidorino/anim1.asm"
-NidokingAnimationExtra:   INCLUDE "gfx/pics/nidoking/anim1.asm"
-ClefairyAnimationExtra:   INCLUDE "gfx/pics/clefairy/anim1.asm"
-ClefableAnimationExtra:   INCLUDE "gfx/pics/clefable/anim1.asm"
-VulpixAnimationExtra:     INCLUDE "gfx/pics/vulpix/anim1.asm"
-NinetalesAnimationExtra:  INCLUDE "gfx/pics/ninetales/anim1.asm"
-JigglypuffAnimationExtra: INCLUDE "gfx/pics/jigglypuff/anim1.asm"
-WigglytuffAnimationExtra: INCLUDE "gfx/pics/wigglytuff/anim1.asm"
-ZubatAnimationExtra:      INCLUDE "gfx/pics/zubat/anim1.asm"
-GolbatAnimationExtra:     INCLUDE "gfx/pics/golbat/anim1.asm"
-OddishAnimationExtra:     INCLUDE "gfx/pics/oddish/anim1.asm"
-GloomAnimationExtra:      INCLUDE "gfx/pics/gloom/anim1.asm"
-VileplumeAnimationExtra:  INCLUDE "gfx/pics/vileplume/anim1.asm"
-ParasAnimationExtra:      INCLUDE "gfx/pics/paras/anim1.asm"
-ParasectAnimationExtra:   INCLUDE "gfx/pics/parasect/anim1.asm"
-VenonatAnimationExtra:    INCLUDE "gfx/pics/venonat/anim1.asm"
-VenomothAnimationExtra:   INCLUDE "gfx/pics/venomoth/anim1.asm"
-DiglettAnimationExtra:    INCLUDE "gfx/pics/diglett/anim1.asm"
-DugtrioAnimationExtra:    INCLUDE "gfx/pics/dugtrio/anim1.asm"
-MeowthAnimationExtra:     INCLUDE "gfx/pics/meowth/anim1.asm"
-PersianAnimationExtra:    INCLUDE "gfx/pics/persian/anim1.asm"
-PsyduckAnimationExtra:    INCLUDE "gfx/pics/psyduck/anim1.asm"
-GolduckAnimationExtra:    INCLUDE "gfx/pics/golduck/anim1.asm"
-MankeyAnimationExtra:     INCLUDE "gfx/pics/mankey/anim1.asm"
-PrimeapeAnimationExtra:   INCLUDE "gfx/pics/primeape/anim1.asm"
-GrowlitheAnimationExtra:  INCLUDE "gfx/pics/growlithe/anim1.asm"
-ArcanineAnimationExtra:   INCLUDE "gfx/pics/arcanine/anim1.asm"
-PoliwagAnimationExtra:    INCLUDE "gfx/pics/poliwag/anim1.asm"
-PoliwhirlAnimationExtra:  INCLUDE "gfx/pics/poliwhirl/anim1.asm"
-PoliwrathAnimationExtra:  INCLUDE "gfx/pics/poliwrath/anim1.asm"
-AbraAnimationExtra:       INCLUDE "gfx/pics/abra/anim1.asm"
-KadabraAnimationExtra:    INCLUDE "gfx/pics/kadabra/anim1.asm"
-AlakazamAnimationExtra:   INCLUDE "gfx/pics/alakazam/anim1.asm"
-MachopAnimationExtra:     INCLUDE "gfx/pics/machop/anim1.asm"
-MachokeAnimationExtra:    INCLUDE "gfx/pics/machoke/anim1.asm"
-MachampAnimationExtra:    INCLUDE "gfx/pics/machamp/anim1.asm"
-BellsproutAnimationExtra: INCLUDE "gfx/pics/bellsprout/anim1.asm"
-WeepinbellAnimationExtra: INCLUDE "gfx/pics/weepinbell/anim1.asm"
-VictreebelAnimationExtra: INCLUDE "gfx/pics/victreebel/anim1.asm"
-TentacoolAnimationExtra:  INCLUDE "gfx/pics/tentacool/anim1.asm"
-TentacruelAnimationExtra: INCLUDE "gfx/pics/tentacruel/anim1.asm"
-GeodudeAnimationExtra:    INCLUDE "gfx/pics/geodude/anim1.asm"
-GravelerAnimationExtra:   INCLUDE "gfx/pics/graveler/anim1.asm"
-GolemAnimationExtra:      INCLUDE "gfx/pics/golem/anim1.asm"
-PonytaAnimationExtra:     INCLUDE "gfx/pics/ponyta/anim1.asm"
-RapidashAnimationExtra:   INCLUDE "gfx/pics/rapidash/anim1.asm"
-SlowpokeAnimationExtra:   INCLUDE "gfx/pics/slowpoke/anim1.asm"
-SlowbroAnimationExtra:    INCLUDE "gfx/pics/slowbro/anim1.asm"
-MagnemiteAnimationExtra:  INCLUDE "gfx/pics/magnemite/anim1.asm"
-MagnetonAnimationExtra:   INCLUDE "gfx/pics/magneton/anim1.asm"
-FarfetchDAnimationExtra:  INCLUDE "gfx/pics/farfetch_d/anim1.asm"
-DoduoAnimationExtra:      INCLUDE "gfx/pics/doduo/anim1.asm"
-DodrioAnimationExtra:     INCLUDE "gfx/pics/dodrio/anim1.asm"
-SeelAnimationExtra:       INCLUDE "gfx/pics/seel/anim1.asm"
-DewgongAnimationExtra:    INCLUDE "gfx/pics/dewgong/anim1.asm"
-GrimerAnimationExtra:     INCLUDE "gfx/pics/grimer/anim1.asm"
-MukAnimationExtra:        INCLUDE "gfx/pics/muk/anim1.asm"
-ShellderAnimationExtra:   INCLUDE "gfx/pics/shellder/anim1.asm"
-CloysterAnimationExtra:   INCLUDE "gfx/pics/cloyster/anim1.asm"
-GastlyAnimationExtra:     INCLUDE "gfx/pics/gastly/anim1.asm"
-HaunterAnimationExtra:    INCLUDE "gfx/pics/haunter/anim1.asm"
-GengarAnimationExtra:     INCLUDE "gfx/pics/gengar/anim1.asm"
-OnixAnimationExtra:       INCLUDE "gfx/pics/onix/anim1.asm"
-DrowzeeAnimationExtra:    INCLUDE "gfx/pics/drowzee/anim1.asm"
-HypnoAnimationExtra:      INCLUDE "gfx/pics/hypno/anim1.asm"
-KrabbyAnimationExtra:     INCLUDE "gfx/pics/krabby/anim1.asm"
-KinglerAnimationExtra:    INCLUDE "gfx/pics/kingler/anim1.asm"
-VoltorbAnimationExtra:    INCLUDE "gfx/pics/voltorb/anim1.asm"
-ElectrodeAnimationExtra:  INCLUDE "gfx/pics/electrode/anim1.asm"
-ExeggcuteAnimationExtra:  INCLUDE "gfx/pics/exeggcute/anim1.asm"
-ExeggutorAnimationExtra:  INCLUDE "gfx/pics/exeggutor/anim1.asm"
-CuboneAnimationExtra:     INCLUDE "gfx/pics/cubone/anim1.asm"
-MarowakAnimationExtra:    INCLUDE "gfx/pics/marowak/anim1.asm"
-HitmonleeAnimationExtra:  INCLUDE "gfx/pics/hitmonlee/anim1.asm"
-HitmonchanAnimationExtra: INCLUDE "gfx/pics/hitmonchan/anim1.asm"
-LickitungAnimationExtra:  INCLUDE "gfx/pics/lickitung/anim1.asm"
-KoffingAnimationExtra:    INCLUDE "gfx/pics/koffing/anim1.asm"
-WeezingAnimationExtra:    INCLUDE "gfx/pics/weezing/anim1.asm"
-RhyhornAnimationExtra:    INCLUDE "gfx/pics/rhyhorn/anim1.asm"
-RhydonAnimationExtra:     INCLUDE "gfx/pics/rhydon/anim1.asm"
-ChanseyAnimationExtra:    INCLUDE "gfx/pics/chansey/anim1.asm"
-TangelaAnimationExtra:    INCLUDE "gfx/pics/tangela/anim1.asm"
-KangaskhanAnimationExtra: INCLUDE "gfx/pics/kangaskhan/anim1.asm"
-HorseaAnimationExtra:     INCLUDE "gfx/pics/horsea/anim1.asm"
-SeadraAnimationExtra:     INCLUDE "gfx/pics/seadra/anim1.asm"
-GoldeenAnimationExtra:    INCLUDE "gfx/pics/goldeen/anim1.asm"
-SeakingAnimationExtra:    INCLUDE "gfx/pics/seaking/anim1.asm"
-StaryuAnimationExtra:     INCLUDE "gfx/pics/staryu/anim1.asm"
-StarmieAnimationExtra:    INCLUDE "gfx/pics/starmie/anim1.asm"
-MrMimeAnimationExtra:     INCLUDE "gfx/pics/mr__mime/anim1.asm"
-ScytherAnimationExtra:    INCLUDE "gfx/pics/scyther/anim1.asm"
-JynxAnimationExtra:       INCLUDE "gfx/pics/jynx/anim1.asm"
-ElectabuzzAnimationExtra: INCLUDE "gfx/pics/electabuzz/anim1.asm"
-MagmarAnimationExtra:     INCLUDE "gfx/pics/magmar/anim1.asm"
-PinsirAnimationExtra:     INCLUDE "gfx/pics/pinsir/anim1.asm"
-TaurosAnimationExtra:     INCLUDE "gfx/pics/tauros/anim1.asm"
-MagikarpAnimationExtra:   INCLUDE "gfx/pics/magikarp/anim1.asm"
-GyaradosAnimationExtra:   INCLUDE "gfx/pics/gyarados/anim1.asm"
-LaprasAnimationExtra:     INCLUDE "gfx/pics/lapras/anim1.asm"
-DittoAnimationExtra:      INCLUDE "gfx/pics/ditto/anim1.asm"
-EeveeAnimationExtra:      INCLUDE "gfx/pics/eevee/anim1.asm"
-VaporeonAnimationExtra:   INCLUDE "gfx/pics/vaporeon/anim1.asm"
-JolteonAnimationExtra:    INCLUDE "gfx/pics/jolteon/anim1.asm"
-FlareonAnimationExtra:    INCLUDE "gfx/pics/flareon/anim1.asm"
-PorygonAnimationExtra:    INCLUDE "gfx/pics/porygon/anim1.asm"
-OmanyteAnimationExtra:    INCLUDE "gfx/pics/omanyte/anim1.asm"
-OmastarAnimationExtra:    INCLUDE "gfx/pics/omastar/anim1.asm"
-KabutoAnimationExtra:     INCLUDE "gfx/pics/kabuto/anim1.asm"
-KabutopsAnimationExtra:   INCLUDE "gfx/pics/kabutops/anim1.asm"
-AerodactylAnimationExtra: INCLUDE "gfx/pics/aerodactyl/anim1.asm"
-SnorlaxAnimationExtra:    INCLUDE "gfx/pics/snorlax/anim1.asm"
-ArticunoAnimationExtra:   INCLUDE "gfx/pics/articuno/anim1.asm"
-ZapdosAnimationExtra:     INCLUDE "gfx/pics/zapdos/anim1.asm"
-MoltresAnimationExtra:    INCLUDE "gfx/pics/moltres/anim1.asm"
-DratiniAnimationExtra:    INCLUDE "gfx/pics/dratini/anim1.asm"
-DragonairAnimationExtra:  INCLUDE "gfx/pics/dragonair/anim1.asm"
-DragoniteAnimationExtra:  INCLUDE "gfx/pics/dragonite/anim1.asm"
-MewtwoAnimationExtra:     INCLUDE "gfx/pics/mewtwo/anim1.asm"
-MewAnimationExtra:        INCLUDE "gfx/pics/mew/anim1.asm"
-ChikoritaAnimationExtra:  INCLUDE "gfx/pics/chikorita/anim1.asm"
-BayleefAnimationExtra:    INCLUDE "gfx/pics/bayleef/anim1.asm"
-MeganiumAnimationExtra:   INCLUDE "gfx/pics/meganium/anim1.asm"
-CyndaquilAnimationExtra:  INCLUDE "gfx/pics/cyndaquil/anim1.asm"
-QuilavaAnimationExtra:    INCLUDE "gfx/pics/quilava/anim1.asm"
-TyphlosionAnimationExtra: INCLUDE "gfx/pics/typhlosion/anim1.asm"
-TotodileAnimationExtra:   INCLUDE "gfx/pics/totodile/anim1.asm"
-CroconawAnimationExtra:   INCLUDE "gfx/pics/croconaw/anim1.asm"
-FeraligatrAnimationExtra: INCLUDE "gfx/pics/feraligatr/anim1.asm"
-SentretAnimationExtra:    INCLUDE "gfx/pics/sentret/anim1.asm"
-FurretAnimationExtra:     INCLUDE "gfx/pics/furret/anim1.asm"
-HoothootAnimationExtra:   INCLUDE "gfx/pics/hoothoot/anim1.asm"
-NoctowlAnimationExtra:    INCLUDE "gfx/pics/noctowl/anim1.asm"
-LedybaAnimationExtra:     INCLUDE "gfx/pics/ledyba/anim1.asm"
-LedianAnimationExtra:     INCLUDE "gfx/pics/ledian/anim1.asm"
-SpinarakAnimationExtra:   INCLUDE "gfx/pics/spinarak/anim1.asm"
-AriadosAnimationExtra:    INCLUDE "gfx/pics/ariados/anim1.asm"
-CrobatAnimationExtra:     INCLUDE "gfx/pics/crobat/anim1.asm"
-ChinchouAnimationExtra:   INCLUDE "gfx/pics/chinchou/anim1.asm"
-LanturnAnimationExtra:    INCLUDE "gfx/pics/lanturn/anim1.asm"
-PichuAnimationExtra:      INCLUDE "gfx/pics/pichu/anim1.asm"
-CleffaAnimationExtra:     INCLUDE "gfx/pics/cleffa/anim1.asm"
-IgglybuffAnimationExtra:  INCLUDE "gfx/pics/igglybuff/anim1.asm"
-TogepiAnimationExtra:     INCLUDE "gfx/pics/togepi/anim1.asm"
-TogeticAnimationExtra:    INCLUDE "gfx/pics/togetic/anim1.asm"
-NatuAnimationExtra:       INCLUDE "gfx/pics/natu/anim1.asm"
-XatuAnimationExtra:       INCLUDE "gfx/pics/xatu/anim1.asm"
-MareepAnimationExtra:     INCLUDE "gfx/pics/mareep/anim1.asm"
-FlaaffyAnimationExtra:    INCLUDE "gfx/pics/flaaffy/anim1.asm"
-AmpharosAnimationExtra:   INCLUDE "gfx/pics/ampharos/anim1.asm"
-BellossomAnimationExtra:  INCLUDE "gfx/pics/bellossom/anim1.asm"
-MarillAnimationExtra:     INCLUDE "gfx/pics/marill/anim1.asm"
-AzumarillAnimationExtra:  INCLUDE "gfx/pics/azumarill/anim1.asm"
-SudowoodoAnimationExtra:  INCLUDE "gfx/pics/sudowoodo/anim1.asm"
-PolitoedAnimationExtra:   INCLUDE "gfx/pics/politoed/anim1.asm"
-HoppipAnimationExtra:     INCLUDE "gfx/pics/hoppip/anim1.asm"
-SkiploomAnimationExtra:   INCLUDE "gfx/pics/skiploom/anim1.asm"
-JumpluffAnimationExtra:   INCLUDE "gfx/pics/jumpluff/anim1.asm"
-AipomAnimationExtra:      INCLUDE "gfx/pics/aipom/anim1.asm"
-SunkernAnimationExtra:    INCLUDE "gfx/pics/sunkern/anim1.asm"
-SunfloraAnimationExtra:   INCLUDE "gfx/pics/sunflora/anim1.asm"
-YanmaAnimationExtra:      INCLUDE "gfx/pics/yanma/anim1.asm"
-WooperAnimationExtra:     INCLUDE "gfx/pics/wooper/anim1.asm"
-QuagsireAnimationExtra:   INCLUDE "gfx/pics/quagsire/anim1.asm"
-EspeonAnimationExtra:     INCLUDE "gfx/pics/espeon/anim1.asm"
-UmbreonAnimationExtra:    INCLUDE "gfx/pics/umbreon/anim1.asm"
-MurkrowAnimationExtra:    INCLUDE "gfx/pics/murkrow/anim1.asm"
-SlowkingAnimationExtra:   INCLUDE "gfx/pics/slowking/anim1.asm"
-MisdreavusAnimationExtra: INCLUDE "gfx/pics/misdreavus/anim1.asm"
-UnownAnimationExtra:      INCLUDE "gfx/pics/unown/anim1.asm"
-WobbuffetAnimationExtra:  INCLUDE "gfx/pics/wobbuffet/anim1.asm"
-GirafarigAnimationExtra:  INCLUDE "gfx/pics/girafarig/anim1.asm"
-PinecoAnimationExtra:     INCLUDE "gfx/pics/pineco/anim1.asm"
-ForretressAnimationExtra: INCLUDE "gfx/pics/forretress/anim1.asm"
-DunsparceAnimationExtra:  INCLUDE "gfx/pics/dunsparce/anim1.asm"
-GligarAnimationExtra:     INCLUDE "gfx/pics/gligar/anim1.asm"
-SteelixAnimationExtra:    INCLUDE "gfx/pics/steelix/anim1.asm"
-SnubbullAnimationExtra:   INCLUDE "gfx/pics/snubbull/anim1.asm"
-GranbullAnimationExtra:   INCLUDE "gfx/pics/granbull/anim1.asm"
-QwilfishAnimationExtra:   INCLUDE "gfx/pics/qwilfish/anim1.asm"
-ScizorAnimationExtra:     INCLUDE "gfx/pics/scizor/anim1.asm"
-ShuckleAnimationExtra:    INCLUDE "gfx/pics/shuckle/anim1.asm"
-HeracrossAnimationExtra:  INCLUDE "gfx/pics/heracross/anim1.asm"
-SneaselAnimationExtra:    INCLUDE "gfx/pics/sneasel/anim1.asm"
-TeddiursaAnimationExtra:  INCLUDE "gfx/pics/teddiursa/anim1.asm"
-UrsaringAnimationExtra:   INCLUDE "gfx/pics/ursaring/anim1.asm"
-SlugmaAnimationExtra:     INCLUDE "gfx/pics/slugma/anim1.asm"
-MagcargoAnimationExtra:   INCLUDE "gfx/pics/magcargo/anim1.asm"
-SwinubAnimationExtra:     INCLUDE "gfx/pics/swinub/anim1.asm"
-PiloswineAnimationExtra:  INCLUDE "gfx/pics/piloswine/anim1.asm"
-CorsolaAnimationExtra:    INCLUDE "gfx/pics/corsola/anim1.asm"
-RemoraidAnimationExtra:   INCLUDE "gfx/pics/remoraid/anim1.asm"
-OctilleryAnimationExtra:  INCLUDE "gfx/pics/octillery/anim1.asm"
-DelibirdAnimationExtra:   INCLUDE "gfx/pics/delibird/anim1.asm"
-MantineAnimationExtra:    INCLUDE "gfx/pics/mantine/anim1.asm"
-SkarmoryAnimationExtra:   INCLUDE "gfx/pics/skarmory/anim1.asm"
-HoundourAnimationExtra:   INCLUDE "gfx/pics/houndour/anim1.asm"
-HoundoomAnimationExtra:   INCLUDE "gfx/pics/houndoom/anim1.asm"
-KingdraAnimationExtra:    INCLUDE "gfx/pics/kingdra/anim1.asm"
-PhanpyAnimationExtra:     INCLUDE "gfx/pics/phanpy/anim1.asm"
-DonphanAnimationExtra:    INCLUDE "gfx/pics/donphan/anim1.asm"
-Porygon2AnimationExtra:   INCLUDE "gfx/pics/porygon2/anim1.asm"
-StantlerAnimationExtra:   INCLUDE "gfx/pics/stantler/anim1.asm"
-SmeargleAnimationExtra:   INCLUDE "gfx/pics/smeargle/anim1.asm"
-TyrogueAnimationExtra:    INCLUDE "gfx/pics/tyrogue/anim1.asm"
-HitmontopAnimationExtra:  INCLUDE "gfx/pics/hitmontop/anim1.asm"
-SmoochumAnimationExtra:   INCLUDE "gfx/pics/smoochum/anim1.asm"
-ElekidAnimationExtra:     INCLUDE "gfx/pics/elekid/anim1.asm"
-MagbyAnimationExtra:      INCLUDE "gfx/pics/magby/anim1.asm"
-MiltankAnimationExtra:    INCLUDE "gfx/pics/miltank/anim1.asm"
-BlisseyAnimationExtra:    INCLUDE "gfx/pics/blissey/anim1.asm"
-RaikouAnimationExtra:     INCLUDE "gfx/pics/raikou/anim1.asm"
-EnteiAnimationExtra:      INCLUDE "gfx/pics/entei/anim1.asm"
-SuicuneAnimationExtra:    INCLUDE "gfx/pics/suicune/anim1.asm"
-LarvitarAnimationExtra:   INCLUDE "gfx/pics/larvitar/anim1.asm"
-PupitarAnimationExtra:    INCLUDE "gfx/pics/pupitar/anim1.asm"
-TyranitarAnimationExtra:  INCLUDE "gfx/pics/tyranitar/anim1.asm"
-LugiaAnimationExtra:      INCLUDE "gfx/pics/lugia/anim1.asm"
-HoOhAnimationExtra:       INCLUDE "gfx/pics/ho_oh/anim1.asm"
-CelebiAnimationExtra:     INCLUDE "gfx/pics/celebi/anim1.asm"
-EggAnimationExtra:        INCLUDE "gfx/pics/egg/anim1.asm"
diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm
deleted file mode 100644
index cff10ef3..00000000
--- a/gfx/pokemon/frame_pointers.asm
+++ /dev/null
@@ -1,252 +0,0 @@
-FramesPointers:
-	dw BulbasaurFrames
-	dw IvysaurFrames
-	dw VenusaurFrames
-	dw CharmanderFrames
-	dw CharmeleonFrames
-	dw CharizardFrames
-	dw SquirtleFrames
-	dw WartortleFrames
-	dw BlastoiseFrames
-	dw CaterpieFrames
-	dw MetapodFrames
-	dw ButterfreeFrames
-	dw WeedleFrames
-	dw KakunaFrames
-	dw BeedrillFrames
-	dw PidgeyFrames
-	dw PidgeottoFrames
-	dw PidgeotFrames
-	dw RattataFrames
-	dw RaticateFrames
-	dw SpearowFrames
-	dw FearowFrames
-	dw EkansFrames
-	dw ArbokFrames
-	dw PikachuFrames
-	dw RaichuFrames
-	dw SandshrewFrames
-	dw SandslashFrames
-	dw NidoranFFrames
-	dw NidorinaFrames
-	dw NidoqueenFrames
-	dw NidoranMFrames
-	dw NidorinoFrames
-	dw NidokingFrames
-	dw ClefairyFrames
-	dw ClefableFrames
-	dw VulpixFrames
-	dw NinetalesFrames
-	dw JigglypuffFrames
-	dw WigglytuffFrames
-	dw ZubatFrames
-	dw GolbatFrames
-	dw OddishFrames
-	dw GloomFrames
-	dw VileplumeFrames
-	dw ParasFrames
-	dw ParasectFrames
-	dw VenonatFrames
-	dw VenomothFrames
-	dw DiglettFrames
-	dw DugtrioFrames
-	dw MeowthFrames
-	dw PersianFrames
-	dw PsyduckFrames
-	dw GolduckFrames
-	dw MankeyFrames
-	dw PrimeapeFrames
-	dw GrowlitheFrames
-	dw ArcanineFrames
-	dw PoliwagFrames
-	dw PoliwhirlFrames
-	dw PoliwrathFrames
-	dw AbraFrames
-	dw KadabraFrames
-	dw AlakazamFrames
-	dw MachopFrames
-	dw MachokeFrames
-	dw MachampFrames
-	dw BellsproutFrames
-	dw WeepinbellFrames
-	dw VictreebelFrames
-	dw TentacoolFrames
-	dw TentacruelFrames
-	dw GeodudeFrames
-	dw GravelerFrames
-	dw GolemFrames
-	dw PonytaFrames
-	dw RapidashFrames
-	dw SlowpokeFrames
-	dw SlowbroFrames
-	dw MagnemiteFrames
-	dw MagnetonFrames
-	dw FarfetchDFrames
-	dw DoduoFrames
-	dw DodrioFrames
-	dw SeelFrames
-	dw DewgongFrames
-	dw GrimerFrames
-	dw MukFrames
-	dw ShellderFrames
-	dw CloysterFrames
-	dw GastlyFrames
-	dw HaunterFrames
-	dw GengarFrames
-	dw OnixFrames
-	dw DrowzeeFrames
-	dw HypnoFrames
-	dw KrabbyFrames
-	dw KinglerFrames
-	dw VoltorbFrames
-	dw ElectrodeFrames
-	dw ExeggcuteFrames
-	dw ExeggutorFrames
-	dw CuboneFrames
-	dw MarowakFrames
-	dw HitmonleeFrames
-	dw HitmonchanFrames
-	dw LickitungFrames
-	dw KoffingFrames
-	dw WeezingFrames
-	dw RhyhornFrames
-	dw RhydonFrames
-	dw ChanseyFrames
-	dw TangelaFrames
-	dw KangaskhanFrames
-	dw HorseaFrames
-	dw SeadraFrames
-	dw GoldeenFrames
-	dw SeakingFrames
-	dw StaryuFrames
-	dw StarmieFrames
-	dw MrMimeFrames
-	dw ScytherFrames
-	dw JynxFrames
-	dw ElectabuzzFrames
-	dw MagmarFrames
-	dw PinsirFrames
-	dw TaurosFrames
-	dw MagikarpFrames
-	dw GyaradosFrames
-	dw LaprasFrames
-	dw DittoFrames
-	dw EeveeFrames
-	dw VaporeonFrames
-	dw JolteonFrames
-	dw FlareonFrames
-	dw PorygonFrames
-	dw OmanyteFrames
-	dw OmastarFrames
-	dw KabutoFrames
-	dw KabutopsFrames
-	dw AerodactylFrames
-	dw SnorlaxFrames
-	dw ArticunoFrames
-	dw ZapdosFrames
-	dw MoltresFrames
-	dw DratiniFrames
-	dw DragonairFrames
-	dw DragoniteFrames
-	dw MewtwoFrames
-	dw MewFrames
-	dw ChikoritaFrames
-	dw BayleefFrames
-	dw MeganiumFrames
-	dw CyndaquilFrames
-	dw QuilavaFrames
-	dw TyphlosionFrames
-	dw TotodileFrames
-	dw CroconawFrames
-	dw FeraligatrFrames
-	dw SentretFrames
-	dw FurretFrames
-	dw HoothootFrames
-	dw NoctowlFrames
-	dw LedybaFrames
-	dw LedianFrames
-	dw SpinarakFrames
-	dw AriadosFrames
-	dw CrobatFrames
-	dw ChinchouFrames
-	dw LanturnFrames
-	dw PichuFrames
-	dw CleffaFrames
-	dw IgglybuffFrames
-	dw TogepiFrames
-	dw TogeticFrames
-	dw NatuFrames
-	dw XatuFrames
-	dw MareepFrames
-	dw FlaaffyFrames
-	dw AmpharosFrames
-	dw BellossomFrames
-	dw MarillFrames
-	dw AzumarillFrames
-	dw SudowoodoFrames
-	dw PolitoedFrames
-	dw HoppipFrames
-	dw SkiploomFrames
-	dw JumpluffFrames
-	dw AipomFrames
-	dw SunkernFrames
-	dw SunfloraFrames
-	dw YanmaFrames
-	dw WooperFrames
-	dw QuagsireFrames
-	dw EspeonFrames
-	dw UmbreonFrames
-	dw MurkrowFrames
-	dw SlowkingFrames
-	dw MisdreavusFrames
-	dw UnownFrames
-	dw WobbuffetFrames
-	dw GirafarigFrames
-	dw PinecoFrames
-	dw ForretressFrames
-	dw DunsparceFrames
-	dw GligarFrames
-	dw SteelixFrames
-	dw SnubbullFrames
-	dw GranbullFrames
-	dw QwilfishFrames
-	dw ScizorFrames
-	dw ShuckleFrames
-	dw HeracrossFrames
-	dw SneaselFrames
-	dw TeddiursaFrames
-	dw UrsaringFrames
-	dw SlugmaFrames
-	dw MagcargoFrames
-	dw SwinubFrames
-	dw PiloswineFrames
-	dw CorsolaFrames
-	dw RemoraidFrames
-	dw OctilleryFrames
-	dw DelibirdFrames
-	dw MantineFrames
-	dw SkarmoryFrames
-	dw HoundourFrames
-	dw HoundoomFrames
-	dw KingdraFrames
-	dw PhanpyFrames
-	dw DonphanFrames
-	dw Porygon2Frames
-	dw StantlerFrames
-	dw SmeargleFrames
-	dw TyrogueFrames
-	dw HitmontopFrames
-	dw SmoochumFrames
-	dw ElekidFrames
-	dw MagbyFrames
-	dw MiltankFrames
-	dw BlisseyFrames
-	dw RaikouFrames
-	dw EnteiFrames
-	dw SuicuneFrames
-	dw LarvitarFrames
-	dw PupitarFrames
-	dw TyranitarFrames
-	dw LugiaFrames
-	dw HoOhFrames
-	dw CelebiFrames
diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm
deleted file mode 100644
index 5bac4fde..00000000
--- a/gfx/pokemon/johto_frames.asm
+++ /dev/null
@@ -1,102 +0,0 @@
-JohtoFrames:
-ChikoritaFrames:  INCLUDE "gfx/pics/chikorita/frames.asm"
-BayleefFrames:    INCLUDE "gfx/pics/bayleef/frames.asm"
-MeganiumFrames:   INCLUDE "gfx/pics/meganium/frames.asm"
-CyndaquilFrames:  INCLUDE "gfx/pics/cyndaquil/frames.asm"
-QuilavaFrames:    INCLUDE "gfx/pics/quilava/frames.asm"
-TyphlosionFrames: INCLUDE "gfx/pics/typhlosion/frames.asm"
-TotodileFrames:   INCLUDE "gfx/pics/totodile/frames.asm"
-CroconawFrames:   INCLUDE "gfx/pics/croconaw/frames.asm"
-FeraligatrFrames: INCLUDE "gfx/pics/feraligatr/frames.asm"
-SentretFrames:    INCLUDE "gfx/pics/sentret/frames.asm"
-FurretFrames:     INCLUDE "gfx/pics/furret/frames.asm"
-HoothootFrames:   INCLUDE "gfx/pics/hoothoot/frames.asm"
-NoctowlFrames:    INCLUDE "gfx/pics/noctowl/frames.asm"
-LedybaFrames:     INCLUDE "gfx/pics/ledyba/frames.asm"
-LedianFrames:     INCLUDE "gfx/pics/ledian/frames.asm"
-SpinarakFrames:   INCLUDE "gfx/pics/spinarak/frames.asm"
-AriadosFrames:    INCLUDE "gfx/pics/ariados/frames.asm"
-CrobatFrames:     INCLUDE "gfx/pics/crobat/frames.asm"
-ChinchouFrames:   INCLUDE "gfx/pics/chinchou/frames.asm"
-LanturnFrames:    INCLUDE "gfx/pics/lanturn/frames.asm"
-PichuFrames:      INCLUDE "gfx/pics/pichu/frames.asm"
-CleffaFrames:     INCLUDE "gfx/pics/cleffa/frames.asm"
-IgglybuffFrames:  INCLUDE "gfx/pics/igglybuff/frames.asm"
-TogepiFrames:     INCLUDE "gfx/pics/togepi/frames.asm"
-TogeticFrames:    INCLUDE "gfx/pics/togetic/frames.asm"
-NatuFrames:       INCLUDE "gfx/pics/natu/frames.asm"
-XatuFrames:       INCLUDE "gfx/pics/xatu/frames.asm"
-MareepFrames:     INCLUDE "gfx/pics/mareep/frames.asm"
-FlaaffyFrames:    INCLUDE "gfx/pics/flaaffy/frames.asm"
-AmpharosFrames:   INCLUDE "gfx/pics/ampharos/frames.asm"
-BellossomFrames:  INCLUDE "gfx/pics/bellossom/frames.asm"
-MarillFrames:     INCLUDE "gfx/pics/marill/frames.asm"
-AzumarillFrames:  INCLUDE "gfx/pics/azumarill/frames.asm"
-SudowoodoFrames:  INCLUDE "gfx/pics/sudowoodo/frames.asm"
-PolitoedFrames:   INCLUDE "gfx/pics/politoed/frames.asm"
-HoppipFrames:     INCLUDE "gfx/pics/hoppip/frames.asm"
-SkiploomFrames:   INCLUDE "gfx/pics/skiploom/frames.asm"
-JumpluffFrames:   INCLUDE "gfx/pics/jumpluff/frames.asm"
-AipomFrames:      INCLUDE "gfx/pics/aipom/frames.asm"
-SunkernFrames:    INCLUDE "gfx/pics/sunkern/frames.asm"
-SunfloraFrames:   INCLUDE "gfx/pics/sunflora/frames.asm"
-YanmaFrames:      INCLUDE "gfx/pics/yanma/frames.asm"
-WooperFrames:     INCLUDE "gfx/pics/wooper/frames.asm"
-QuagsireFrames:   INCLUDE "gfx/pics/quagsire/frames.asm"
-EspeonFrames:     INCLUDE "gfx/pics/espeon/frames.asm"
-UmbreonFrames:    INCLUDE "gfx/pics/umbreon/frames.asm"
-MurkrowFrames:    INCLUDE "gfx/pics/murkrow/frames.asm"
-SlowkingFrames:   INCLUDE "gfx/pics/slowking/frames.asm"
-MisdreavusFrames: INCLUDE "gfx/pics/misdreavus/frames.asm"
-UnownFrames:      INCLUDE "gfx/pics/unown/frames.asm"
-WobbuffetFrames:  INCLUDE "gfx/pics/wobbuffet/frames.asm"
-GirafarigFrames:  INCLUDE "gfx/pics/girafarig/frames.asm"
-PinecoFrames:     INCLUDE "gfx/pics/pineco/frames.asm"
-ForretressFrames: INCLUDE "gfx/pics/forretress/frames.asm"
-DunsparceFrames:  INCLUDE "gfx/pics/dunsparce/frames.asm"
-GligarFrames:     INCLUDE "gfx/pics/gligar/frames.asm"
-SteelixFrames:    INCLUDE "gfx/pics/steelix/frames.asm"
-SnubbullFrames:   INCLUDE "gfx/pics/snubbull/frames.asm"
-GranbullFrames:   INCLUDE "gfx/pics/granbull/frames.asm"
-QwilfishFrames:   INCLUDE "gfx/pics/qwilfish/frames.asm"
-ScizorFrames:     INCLUDE "gfx/pics/scizor/frames.asm"
-ShuckleFrames:    INCLUDE "gfx/pics/shuckle/frames.asm"
-HeracrossFrames:  INCLUDE "gfx/pics/heracross/frames.asm"
-SneaselFrames:    INCLUDE "gfx/pics/sneasel/frames.asm"
-TeddiursaFrames:  INCLUDE "gfx/pics/teddiursa/frames.asm"
-UrsaringFrames:   INCLUDE "gfx/pics/ursaring/frames.asm"
-SlugmaFrames:     INCLUDE "gfx/pics/slugma/frames.asm"
-MagcargoFrames:   INCLUDE "gfx/pics/magcargo/frames.asm"
-SwinubFrames:     INCLUDE "gfx/pics/swinub/frames.asm"
-PiloswineFrames:  INCLUDE "gfx/pics/piloswine/frames.asm"
-CorsolaFrames:    INCLUDE "gfx/pics/corsola/frames.asm"
-RemoraidFrames:   INCLUDE "gfx/pics/remoraid/frames.asm"
-OctilleryFrames:  INCLUDE "gfx/pics/octillery/frames.asm"
-DelibirdFrames:   INCLUDE "gfx/pics/delibird/frames.asm"
-MantineFrames:    INCLUDE "gfx/pics/mantine/frames.asm"
-SkarmoryFrames:   INCLUDE "gfx/pics/skarmory/frames.asm"
-HoundourFrames:   INCLUDE "gfx/pics/houndour/frames.asm"
-HoundoomFrames:   INCLUDE "gfx/pics/houndoom/frames.asm"
-KingdraFrames:    INCLUDE "gfx/pics/kingdra/frames.asm"
-PhanpyFrames:     INCLUDE "gfx/pics/phanpy/frames.asm"
-DonphanFrames:    INCLUDE "gfx/pics/donphan/frames.asm"
-Porygon2Frames:   INCLUDE "gfx/pics/porygon2/frames.asm"
-StantlerFrames:   INCLUDE "gfx/pics/stantler/frames.asm"
-SmeargleFrames:   INCLUDE "gfx/pics/smeargle/frames.asm"
-TyrogueFrames:    INCLUDE "gfx/pics/tyrogue/frames.asm"
-HitmontopFrames:  INCLUDE "gfx/pics/hitmontop/frames.asm"
-SmoochumFrames:   INCLUDE "gfx/pics/smoochum/frames.asm"
-ElekidFrames:     INCLUDE "gfx/pics/elekid/frames.asm"
-MagbyFrames:      INCLUDE "gfx/pics/magby/frames.asm"
-MiltankFrames:    INCLUDE "gfx/pics/miltank/frames.asm"
-BlisseyFrames:    INCLUDE "gfx/pics/blissey/frames.asm"
-RaikouFrames:     INCLUDE "gfx/pics/raikou/frames.asm"
-EnteiFrames:      INCLUDE "gfx/pics/entei/frames.asm"
-SuicuneFrames:    INCLUDE "gfx/pics/suicune/frames.asm"
-LarvitarFrames:   INCLUDE "gfx/pics/larvitar/frames.asm"
-PupitarFrames:    INCLUDE "gfx/pics/pupitar/frames.asm"
-TyranitarFrames:  INCLUDE "gfx/pics/tyranitar/frames.asm"
-LugiaFrames:      INCLUDE "gfx/pics/lugia/frames.asm"
-HoOhFrames:       INCLUDE "gfx/pics/ho_oh/frames.asm"
-CelebiFrames:     INCLUDE "gfx/pics/celebi/frames.asm"
-EggFrames:        INCLUDE "gfx/pics/egg/frames.asm"
diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm
deleted file mode 100644
index 2cb87b2b..00000000
--- a/gfx/pokemon/kanto_frames.asm
+++ /dev/null
@@ -1,152 +0,0 @@
-KantoFrames:
-BulbasaurFrames:  INCLUDE "gfx/pics/bulbasaur/frames.asm"
-IvysaurFrames:    INCLUDE "gfx/pics/ivysaur/frames.asm"
-VenusaurFrames:   INCLUDE "gfx/pics/venusaur/frames.asm"
-CharmanderFrames: INCLUDE "gfx/pics/charmander/frames.asm"
-CharmeleonFrames: INCLUDE "gfx/pics/charmeleon/frames.asm"
-CharizardFrames:  INCLUDE "gfx/pics/charizard/frames.asm"
-SquirtleFrames:   INCLUDE "gfx/pics/squirtle/frames.asm"
-WartortleFrames:  INCLUDE "gfx/pics/wartortle/frames.asm"
-BlastoiseFrames:  INCLUDE "gfx/pics/blastoise/frames.asm"
-CaterpieFrames:   INCLUDE "gfx/pics/caterpie/frames.asm"
-MetapodFrames:    INCLUDE "gfx/pics/metapod/frames.asm"
-ButterfreeFrames: INCLUDE "gfx/pics/butterfree/frames.asm"
-WeedleFrames:     INCLUDE "gfx/pics/weedle/frames.asm"
-KakunaFrames:     INCLUDE "gfx/pics/kakuna/frames.asm"
-BeedrillFrames:   INCLUDE "gfx/pics/beedrill/frames.asm"
-PidgeyFrames:     INCLUDE "gfx/pics/pidgey/frames.asm"
-PidgeottoFrames:  INCLUDE "gfx/pics/pidgeotto/frames.asm"
-PidgeotFrames:    INCLUDE "gfx/pics/pidgeot/frames.asm"
-RattataFrames:    INCLUDE "gfx/pics/rattata/frames.asm"
-RaticateFrames:   INCLUDE "gfx/pics/raticate/frames.asm"
-SpearowFrames:    INCLUDE "gfx/pics/spearow/frames.asm"
-FearowFrames:     INCLUDE "gfx/pics/fearow/frames.asm"
-EkansFrames:      INCLUDE "gfx/pics/ekans/frames.asm"
-ArbokFrames:      INCLUDE "gfx/pics/arbok/frames.asm"
-PikachuFrames:    INCLUDE "gfx/pics/pikachu/frames.asm"
-RaichuFrames:     INCLUDE "gfx/pics/raichu/frames.asm"
-SandshrewFrames:  INCLUDE "gfx/pics/sandshrew/frames.asm"
-SandslashFrames:  INCLUDE "gfx/pics/sandslash/frames.asm"
-NidoranFFrames:   INCLUDE "gfx/pics/nidoran_f/frames.asm"
-NidorinaFrames:   INCLUDE "gfx/pics/nidorina/frames.asm"
-NidoqueenFrames:  INCLUDE "gfx/pics/nidoqueen/frames.asm"
-NidoranMFrames:   INCLUDE "gfx/pics/nidoran_m/frames.asm"
-NidorinoFrames:   INCLUDE "gfx/pics/nidorino/frames.asm"
-NidokingFrames:   INCLUDE "gfx/pics/nidoking/frames.asm"
-ClefairyFrames:   INCLUDE "gfx/pics/clefairy/frames.asm"
-ClefableFrames:   INCLUDE "gfx/pics/clefable/frames.asm"
-VulpixFrames:     INCLUDE "gfx/pics/vulpix/frames.asm"
-NinetalesFrames:  INCLUDE "gfx/pics/ninetales/frames.asm"
-JigglypuffFrames: INCLUDE "gfx/pics/jigglypuff/frames.asm"
-WigglytuffFrames: INCLUDE "gfx/pics/wigglytuff/frames.asm"
-ZubatFrames:      INCLUDE "gfx/pics/zubat/frames.asm"
-GolbatFrames:     INCLUDE "gfx/pics/golbat/frames.asm"
-OddishFrames:     INCLUDE "gfx/pics/oddish/frames.asm"
-GloomFrames:      INCLUDE "gfx/pics/gloom/frames.asm"
-VileplumeFrames:  INCLUDE "gfx/pics/vileplume/frames.asm"
-ParasFrames:      INCLUDE "gfx/pics/paras/frames.asm"
-ParasectFrames:   INCLUDE "gfx/pics/parasect/frames.asm"
-VenonatFrames:    INCLUDE "gfx/pics/venonat/frames.asm"
-VenomothFrames:   INCLUDE "gfx/pics/venomoth/frames.asm"
-DiglettFrames:    INCLUDE "gfx/pics/diglett/frames.asm"
-DugtrioFrames:    INCLUDE "gfx/pics/dugtrio/frames.asm"
-MeowthFrames:     INCLUDE "gfx/pics/meowth/frames.asm"
-PersianFrames:    INCLUDE "gfx/pics/persian/frames.asm"
-PsyduckFrames:    INCLUDE "gfx/pics/psyduck/frames.asm"
-GolduckFrames:    INCLUDE "gfx/pics/golduck/frames.asm"
-MankeyFrames:     INCLUDE "gfx/pics/mankey/frames.asm"
-PrimeapeFrames:   INCLUDE "gfx/pics/primeape/frames.asm"
-GrowlitheFrames:  INCLUDE "gfx/pics/growlithe/frames.asm"
-ArcanineFrames:   INCLUDE "gfx/pics/arcanine/frames.asm"
-PoliwagFrames:    INCLUDE "gfx/pics/poliwag/frames.asm"
-PoliwhirlFrames:  INCLUDE "gfx/pics/poliwhirl/frames.asm"
-PoliwrathFrames:  INCLUDE "gfx/pics/poliwrath/frames.asm"
-AbraFrames:       INCLUDE "gfx/pics/abra/frames.asm"
-KadabraFrames:    INCLUDE "gfx/pics/kadabra/frames.asm"
-AlakazamFrames:   INCLUDE "gfx/pics/alakazam/frames.asm"
-MachopFrames:     INCLUDE "gfx/pics/machop/frames.asm"
-MachokeFrames:    INCLUDE "gfx/pics/machoke/frames.asm"
-MachampFrames:    INCLUDE "gfx/pics/machamp/frames.asm"
-BellsproutFrames: INCLUDE "gfx/pics/bellsprout/frames.asm"
-WeepinbellFrames: INCLUDE "gfx/pics/weepinbell/frames.asm"
-VictreebelFrames: INCLUDE "gfx/pics/victreebel/frames.asm"
-TentacoolFrames:  INCLUDE "gfx/pics/tentacool/frames.asm"
-TentacruelFrames: INCLUDE "gfx/pics/tentacruel/frames.asm"
-GeodudeFrames:    INCLUDE "gfx/pics/geodude/frames.asm"
-GravelerFrames:   INCLUDE "gfx/pics/graveler/frames.asm"
-GolemFrames:      INCLUDE "gfx/pics/golem/frames.asm"
-PonytaFrames:     INCLUDE "gfx/pics/ponyta/frames.asm"
-RapidashFrames:   INCLUDE "gfx/pics/rapidash/frames.asm"
-SlowpokeFrames:   INCLUDE "gfx/pics/slowpoke/frames.asm"
-SlowbroFrames:    INCLUDE "gfx/pics/slowbro/frames.asm"
-MagnemiteFrames:  INCLUDE "gfx/pics/magnemite/frames.asm"
-MagnetonFrames:   INCLUDE "gfx/pics/magneton/frames.asm"
-FarfetchDFrames:  INCLUDE "gfx/pics/farfetch_d/frames.asm"
-DoduoFrames:      INCLUDE "gfx/pics/doduo/frames.asm"
-DodrioFrames:     INCLUDE "gfx/pics/dodrio/frames.asm"
-SeelFrames:       INCLUDE "gfx/pics/seel/frames.asm"
-DewgongFrames:    INCLUDE "gfx/pics/dewgong/frames.asm"
-GrimerFrames:     INCLUDE "gfx/pics/grimer/frames.asm"
-MukFrames:        INCLUDE "gfx/pics/muk/frames.asm"
-ShellderFrames:   INCLUDE "gfx/pics/shellder/frames.asm"
-CloysterFrames:   INCLUDE "gfx/pics/cloyster/frames.asm"
-GastlyFrames:     INCLUDE "gfx/pics/gastly/frames.asm"
-HaunterFrames:    INCLUDE "gfx/pics/haunter/frames.asm"
-GengarFrames:     INCLUDE "gfx/pics/gengar/frames.asm"
-OnixFrames:       INCLUDE "gfx/pics/onix/frames.asm"
-DrowzeeFrames:    INCLUDE "gfx/pics/drowzee/frames.asm"
-HypnoFrames:      INCLUDE "gfx/pics/hypno/frames.asm"
-KrabbyFrames:     INCLUDE "gfx/pics/krabby/frames.asm"
-KinglerFrames:    INCLUDE "gfx/pics/kingler/frames.asm"
-VoltorbFrames:    INCLUDE "gfx/pics/voltorb/frames.asm"
-ElectrodeFrames:  INCLUDE "gfx/pics/electrode/frames.asm"
-ExeggcuteFrames:  INCLUDE "gfx/pics/exeggcute/frames.asm"
-ExeggutorFrames:  INCLUDE "gfx/pics/exeggutor/frames.asm"
-CuboneFrames:     INCLUDE "gfx/pics/cubone/frames.asm"
-MarowakFrames:    INCLUDE "gfx/pics/marowak/frames.asm"
-HitmonleeFrames:  INCLUDE "gfx/pics/hitmonlee/frames.asm"
-HitmonchanFrames: INCLUDE "gfx/pics/hitmonchan/frames.asm"
-LickitungFrames:  INCLUDE "gfx/pics/lickitung/frames.asm"
-KoffingFrames:    INCLUDE "gfx/pics/koffing/frames.asm"
-WeezingFrames:    INCLUDE "gfx/pics/weezing/frames.asm"
-RhyhornFrames:    INCLUDE "gfx/pics/rhyhorn/frames.asm"
-RhydonFrames:     INCLUDE "gfx/pics/rhydon/frames.asm"
-ChanseyFrames:    INCLUDE "gfx/pics/chansey/frames.asm"
-TangelaFrames:    INCLUDE "gfx/pics/tangela/frames.asm"
-KangaskhanFrames: INCLUDE "gfx/pics/kangaskhan/frames.asm"
-HorseaFrames:     INCLUDE "gfx/pics/horsea/frames.asm"
-SeadraFrames:     INCLUDE "gfx/pics/seadra/frames.asm"
-GoldeenFrames:    INCLUDE "gfx/pics/goldeen/frames.asm"
-SeakingFrames:    INCLUDE "gfx/pics/seaking/frames.asm"
-StaryuFrames:     INCLUDE "gfx/pics/staryu/frames.asm"
-StarmieFrames:    INCLUDE "gfx/pics/starmie/frames.asm"
-MrMimeFrames:     INCLUDE "gfx/pics/mr__mime/frames.asm"
-ScytherFrames:    INCLUDE "gfx/pics/scyther/frames.asm"
-JynxFrames:       INCLUDE "gfx/pics/jynx/frames.asm"
-ElectabuzzFrames: INCLUDE "gfx/pics/electabuzz/frames.asm"
-MagmarFrames:     INCLUDE "gfx/pics/magmar/frames.asm"
-PinsirFrames:     INCLUDE "gfx/pics/pinsir/frames.asm"
-TaurosFrames:     INCLUDE "gfx/pics/tauros/frames.asm"
-MagikarpFrames:   INCLUDE "gfx/pics/magikarp/frames.asm"
-GyaradosFrames:   INCLUDE "gfx/pics/gyarados/frames.asm"
-LaprasFrames:     INCLUDE "gfx/pics/lapras/frames.asm"
-DittoFrames:      INCLUDE "gfx/pics/ditto/frames.asm"
-EeveeFrames:      INCLUDE "gfx/pics/eevee/frames.asm"
-VaporeonFrames:   INCLUDE "gfx/pics/vaporeon/frames.asm"
-JolteonFrames:    INCLUDE "gfx/pics/jolteon/frames.asm"
-FlareonFrames:    INCLUDE "gfx/pics/flareon/frames.asm"
-PorygonFrames:    INCLUDE "gfx/pics/porygon/frames.asm"
-OmanyteFrames:    INCLUDE "gfx/pics/omanyte/frames.asm"
-OmastarFrames:    INCLUDE "gfx/pics/omastar/frames.asm"
-KabutoFrames:     INCLUDE "gfx/pics/kabuto/frames.asm"
-KabutopsFrames:   INCLUDE "gfx/pics/kabutops/frames.asm"
-AerodactylFrames: INCLUDE "gfx/pics/aerodactyl/frames.asm"
-SnorlaxFrames:    INCLUDE "gfx/pics/snorlax/frames.asm"
-ArticunoFrames:   INCLUDE "gfx/pics/articuno/frames.asm"
-ZapdosFrames:     INCLUDE "gfx/pics/zapdos/frames.asm"
-MoltresFrames:    INCLUDE "gfx/pics/moltres/frames.asm"
-DratiniFrames:    INCLUDE "gfx/pics/dratini/frames.asm"
-DragonairFrames:  INCLUDE "gfx/pics/dragonair/frames.asm"
-DragoniteFrames:  INCLUDE "gfx/pics/dragonite/frames.asm"
-MewtwoFrames:     INCLUDE "gfx/pics/mewtwo/frames.asm"
-MewFrames:        INCLUDE "gfx/pics/mew/frames.asm"
diff --git a/gfx/pokemon/unown_anim_pointers.asm b/gfx/pokemon/unown_anim_pointers.asm
deleted file mode 100644
index 46aa757e..00000000
--- a/gfx/pokemon/unown_anim_pointers.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-UnownAnimationPointers:
-	dw UnownAAnimation
-	dw UnownBAnimation
-	dw UnownCAnimation
-	dw UnownDAnimation
-	dw UnownEAnimation
-	dw UnownFAnimation
-	dw UnownGAnimation
-	dw UnownHAnimation
-	dw UnownIAnimation
-	dw UnownJAnimation
-	dw UnownKAnimation
-	dw UnownLAnimation
-	dw UnownMAnimation
-	dw UnownNAnimation
-	dw UnownOAnimation
-	dw UnownPAnimation
-	dw UnownQAnimation
-	dw UnownRAnimation
-	dw UnownSAnimation
-	dw UnownTAnimation
-	dw UnownUAnimation
-	dw UnownVAnimation
-	dw UnownWAnimation
-	dw UnownXAnimation
-	dw UnownYAnimation
-	dw UnownZAnimation
diff --git a/gfx/pokemon/unown_anims.asm b/gfx/pokemon/unown_anims.asm
deleted file mode 100644
index 3f988c2f..00000000
--- a/gfx/pokemon/unown_anims.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-UnownAnimations:
-UnownAAnimation: INCLUDE "gfx/pics/unown_a/anim0.asm"
-UnownBAnimation: INCLUDE "gfx/pics/unown_b/anim0.asm"
-UnownCAnimation: INCLUDE "gfx/pics/unown_c/anim0.asm"
-UnownDAnimation: INCLUDE "gfx/pics/unown_d/anim0.asm"
-UnownEAnimation: INCLUDE "gfx/pics/unown_e/anim0.asm"
-UnownFAnimation: INCLUDE "gfx/pics/unown_f/anim0.asm"
-UnownGAnimation: INCLUDE "gfx/pics/unown_g/anim0.asm"
-UnownHAnimation: INCLUDE "gfx/pics/unown_h/anim0.asm"
-UnownIAnimation: INCLUDE "gfx/pics/unown_i/anim0.asm"
-UnownJAnimation: INCLUDE "gfx/pics/unown_j/anim0.asm"
-UnownKAnimation: INCLUDE "gfx/pics/unown_k/anim0.asm"
-UnownLAnimation: INCLUDE "gfx/pics/unown_l/anim0.asm"
-UnownMAnimation: INCLUDE "gfx/pics/unown_m/anim0.asm"
-UnownNAnimation: INCLUDE "gfx/pics/unown_n/anim0.asm"
-UnownOAnimation: INCLUDE "gfx/pics/unown_o/anim0.asm"
-UnownPAnimation: INCLUDE "gfx/pics/unown_p/anim0.asm"
-UnownQAnimation: INCLUDE "gfx/pics/unown_q/anim0.asm"
-UnownRAnimation: INCLUDE "gfx/pics/unown_r/anim0.asm"
-UnownSAnimation: INCLUDE "gfx/pics/unown_s/anim0.asm"
-UnownTAnimation: INCLUDE "gfx/pics/unown_t/anim0.asm"
-UnownUAnimation: INCLUDE "gfx/pics/unown_u/anim0.asm"
-UnownVAnimation: INCLUDE "gfx/pics/unown_v/anim0.asm"
-UnownWAnimation: INCLUDE "gfx/pics/unown_w/anim0.asm"
-UnownXAnimation: INCLUDE "gfx/pics/unown_x/anim0.asm"
-UnownYAnimation: INCLUDE "gfx/pics/unown_y/anim0.asm"
-UnownZAnimation: INCLUDE "gfx/pics/unown_z/anim0.asm"
diff --git a/gfx/pokemon/unown_bitmask_pointers.asm b/gfx/pokemon/unown_bitmask_pointers.asm
deleted file mode 100644
index a20db970..00000000
--- a/gfx/pokemon/unown_bitmask_pointers.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-UnownBitmasksPointers:
-	dw UnownABitmasks
-	dw UnownBBitmasks
-	dw UnownCBitmasks
-	dw UnownDBitmasks
-	dw UnownEBitmasks
-	dw UnownFBitmasks
-	dw UnownGBitmasks
-	dw UnownHBitmasks
-	dw UnownIBitmasks
-	dw UnownJBitmasks
-	dw UnownKBitmasks
-	dw UnownLBitmasks
-	dw UnownMBitmasks
-	dw UnownNBitmasks
-	dw UnownOBitmasks
-	dw UnownPBitmasks
-	dw UnownQBitmasks
-	dw UnownRBitmasks
-	dw UnownSBitmasks
-	dw UnownTBitmasks
-	dw UnownUBitmasks
-	dw UnownVBitmasks
-	dw UnownWBitmasks
-	dw UnownXBitmasks
-	dw UnownYBitmasks
-	dw UnownZBitmasks
diff --git a/gfx/pokemon/unown_bitmasks.asm b/gfx/pokemon/unown_bitmasks.asm
deleted file mode 100644
index 5df6b746..00000000
--- a/gfx/pokemon/unown_bitmasks.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-UnownABitmasks: INCLUDE "gfx/pics/unown_a/bitmask.asm"
-UnownBBitmasks: INCLUDE "gfx/pics/unown_b/bitmask.asm"
-UnownCBitmasks: INCLUDE "gfx/pics/unown_c/bitmask.asm"
-UnownDBitmasks: INCLUDE "gfx/pics/unown_d/bitmask.asm"
-UnownEBitmasks: INCLUDE "gfx/pics/unown_e/bitmask.asm"
-UnownFBitmasks: INCLUDE "gfx/pics/unown_f/bitmask.asm"
-UnownGBitmasks: INCLUDE "gfx/pics/unown_g/bitmask.asm"
-UnownHBitmasks: INCLUDE "gfx/pics/unown_h/bitmask.asm"
-UnownIBitmasks: INCLUDE "gfx/pics/unown_i/bitmask.asm"
-UnownJBitmasks: INCLUDE "gfx/pics/unown_j/bitmask.asm"
-UnownKBitmasks: INCLUDE "gfx/pics/unown_k/bitmask.asm"
-UnownLBitmasks: INCLUDE "gfx/pics/unown_l/bitmask.asm"
-UnownMBitmasks: INCLUDE "gfx/pics/unown_m/bitmask.asm"
-UnownNBitmasks: INCLUDE "gfx/pics/unown_n/bitmask.asm"
-UnownOBitmasks: INCLUDE "gfx/pics/unown_o/bitmask.asm"
-UnownPBitmasks: INCLUDE "gfx/pics/unown_p/bitmask.asm"
-UnownQBitmasks: INCLUDE "gfx/pics/unown_q/bitmask.asm"
-UnownRBitmasks: INCLUDE "gfx/pics/unown_r/bitmask.asm"
-UnownSBitmasks: INCLUDE "gfx/pics/unown_s/bitmask.asm"
-UnownTBitmasks: INCLUDE "gfx/pics/unown_t/bitmask.asm"
-UnownUBitmasks: INCLUDE "gfx/pics/unown_u/bitmask.asm"
-UnownVBitmasks: INCLUDE "gfx/pics/unown_v/bitmask.asm"
-UnownWBitmasks: INCLUDE "gfx/pics/unown_w/bitmask.asm"
-UnownXBitmasks: INCLUDE "gfx/pics/unown_x/bitmask.asm"
-UnownYBitmasks: INCLUDE "gfx/pics/unown_y/bitmask.asm"
-UnownZBitmasks: INCLUDE "gfx/pics/unown_z/bitmask.asm"
diff --git a/gfx/pokemon/unown_extra_pointers.asm b/gfx/pokemon/unown_extra_pointers.asm
deleted file mode 100644
index 5b466064..00000000
--- a/gfx/pokemon/unown_extra_pointers.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-UnownAnimationExtraPointers:
-	dw UnownAAnimationExtra
-	dw UnownBAnimationExtra
-	dw UnownCAnimationExtra
-	dw UnownDAnimationExtra
-	dw UnownEAnimationExtra
-	dw UnownFAnimationExtra
-	dw UnownGAnimationExtra
-	dw UnownHAnimationExtra
-	dw UnownIAnimationExtra
-	dw UnownJAnimationExtra
-	dw UnownKAnimationExtra
-	dw UnownLAnimationExtra
-	dw UnownMAnimationExtra
-	dw UnownNAnimationExtra
-	dw UnownOAnimationExtra
-	dw UnownPAnimationExtra
-	dw UnownQAnimationExtra
-	dw UnownRAnimationExtra
-	dw UnownSAnimationExtra
-	dw UnownTAnimationExtra
-	dw UnownUAnimationExtra
-	dw UnownVAnimationExtra
-	dw UnownWAnimationExtra
-	dw UnownXAnimationExtra
-	dw UnownYAnimationExtra
-	dw UnownZAnimationExtra
diff --git a/gfx/pokemon/unown_extras.asm b/gfx/pokemon/unown_extras.asm
deleted file mode 100644
index 2609afe4..00000000
--- a/gfx/pokemon/unown_extras.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-UnownAAnimationExtra: INCLUDE "gfx/pics/unown_a/anim1.asm"
-UnownBAnimationExtra: INCLUDE "gfx/pics/unown_b/anim1.asm"
-UnownCAnimationExtra: INCLUDE "gfx/pics/unown_c/anim1.asm"
-UnownDAnimationExtra: INCLUDE "gfx/pics/unown_d/anim1.asm"
-UnownEAnimationExtra: INCLUDE "gfx/pics/unown_e/anim1.asm"
-UnownFAnimationExtra: INCLUDE "gfx/pics/unown_f/anim1.asm"
-UnownGAnimationExtra: INCLUDE "gfx/pics/unown_g/anim1.asm"
-UnownHAnimationExtra: INCLUDE "gfx/pics/unown_h/anim1.asm"
-UnownIAnimationExtra: INCLUDE "gfx/pics/unown_i/anim1.asm"
-UnownJAnimationExtra: INCLUDE "gfx/pics/unown_j/anim1.asm"
-UnownKAnimationExtra: INCLUDE "gfx/pics/unown_k/anim1.asm"
-UnownLAnimationExtra: INCLUDE "gfx/pics/unown_l/anim1.asm"
-UnownMAnimationExtra: INCLUDE "gfx/pics/unown_m/anim1.asm"
-UnownNAnimationExtra: INCLUDE "gfx/pics/unown_n/anim1.asm"
-UnownOAnimationExtra: INCLUDE "gfx/pics/unown_o/anim1.asm"
-UnownPAnimationExtra: INCLUDE "gfx/pics/unown_p/anim1.asm"
-UnownQAnimationExtra: INCLUDE "gfx/pics/unown_q/anim1.asm"
-UnownRAnimationExtra: INCLUDE "gfx/pics/unown_r/anim1.asm"
-UnownSAnimationExtra: INCLUDE "gfx/pics/unown_s/anim1.asm"
-UnownTAnimationExtra: INCLUDE "gfx/pics/unown_t/anim1.asm"
-UnownUAnimationExtra: INCLUDE "gfx/pics/unown_u/anim1.asm"
-UnownVAnimationExtra: INCLUDE "gfx/pics/unown_v/anim1.asm"
-UnownWAnimationExtra: INCLUDE "gfx/pics/unown_w/anim1.asm"
-UnownXAnimationExtra: INCLUDE "gfx/pics/unown_x/anim1.asm"
-UnownYAnimationExtra: INCLUDE "gfx/pics/unown_y/anim1.asm"
-UnownZAnimationExtra: INCLUDE "gfx/pics/unown_z/anim1.asm"
diff --git a/gfx/pokemon/unown_frame_pointers.asm b/gfx/pokemon/unown_frame_pointers.asm
deleted file mode 100644
index 8907f530..00000000
--- a/gfx/pokemon/unown_frame_pointers.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-UnownFramesPointers:
-	dw UnownAFrames
-	dw UnownBFrames
-	dw UnownCFrames
-	dw UnownDFrames
-	dw UnownEFrames
-	dw UnownFFrames
-	dw UnownGFrames
-	dw UnownHFrames
-	dw UnownIFrames
-	dw UnownJFrames
-	dw UnownKFrames
-	dw UnownLFrames
-	dw UnownMFrames
-	dw UnownNFrames
-	dw UnownOFrames
-	dw UnownPFrames
-	dw UnownQFrames
-	dw UnownRFrames
-	dw UnownSFrames
-	dw UnownTFrames
-	dw UnownUFrames
-	dw UnownVFrames
-	dw UnownWFrames
-	dw UnownXFrames
-	dw UnownYFrames
-	dw UnownZFrames
diff --git a/gfx/pokemon/unown_frames.asm b/gfx/pokemon/unown_frames.asm
deleted file mode 100644
index 402f22ef..00000000
--- a/gfx/pokemon/unown_frames.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-UnownsFrames:
-UnownAFrames: INCLUDE "gfx/pics/unown_a/frames.asm"
-UnownBFrames: INCLUDE "gfx/pics/unown_b/frames.asm"
-UnownCFrames: INCLUDE "gfx/pics/unown_c/frames.asm"
-UnownDFrames: INCLUDE "gfx/pics/unown_d/frames.asm"
-UnownEFrames: INCLUDE "gfx/pics/unown_e/frames.asm"
-UnownFFrames: INCLUDE "gfx/pics/unown_f/frames.asm"
-UnownGFrames: INCLUDE "gfx/pics/unown_g/frames.asm"
-UnownHFrames: INCLUDE "gfx/pics/unown_h/frames.asm"
-UnownIFrames: INCLUDE "gfx/pics/unown_i/frames.asm"
-UnownJFrames: INCLUDE "gfx/pics/unown_j/frames.asm"
-UnownKFrames: INCLUDE "gfx/pics/unown_k/frames.asm"
-UnownLFrames: INCLUDE "gfx/pics/unown_l/frames.asm"
-UnownMFrames: INCLUDE "gfx/pics/unown_m/frames.asm"
-UnownNFrames: INCLUDE "gfx/pics/unown_n/frames.asm"
-UnownOFrames: INCLUDE "gfx/pics/unown_o/frames.asm"
-UnownPFrames: INCLUDE "gfx/pics/unown_p/frames.asm"
-UnownQFrames: INCLUDE "gfx/pics/unown_q/frames.asm"
-UnownRFrames: INCLUDE "gfx/pics/unown_r/frames.asm"
-UnownSFrames: INCLUDE "gfx/pics/unown_s/frames.asm"
-UnownTFrames: INCLUDE "gfx/pics/unown_t/frames.asm"
-UnownUFrames: INCLUDE "gfx/pics/unown_u/frames.asm"
-UnownVFrames: INCLUDE "gfx/pics/unown_v/frames.asm"
-UnownWFrames: INCLUDE "gfx/pics/unown_w/frames.asm"
-UnownXFrames: INCLUDE "gfx/pics/unown_x/frames.asm"
-UnownYFrames: INCLUDE "gfx/pics/unown_y/frames.asm"
-UnownZFrames: INCLUDE "gfx/pics/unown_z/frames.asm"
diff --git a/home/gfx.asm b/home/gfx.asm
index 409b0778..6e73f57d 100644
--- a/home/gfx.asm
+++ b/home/gfx.asm
@@ -28,7 +28,7 @@ ReplacePlayerSprite::
 	farcall Function1413c
 	ret
 
-Functiond9e::
+LoadStandardFont::
 	farcall Functionf8000
 	ret
 
diff --git a/home/map.asm b/home/map.asm
index 53fe7641..225f1bb6 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -2152,7 +2152,7 @@ ReloadTilesetAndPalettes:: ; 2c87 (0:2c87)
 	call DisableLCD
 	call ClearSprites
 	farcall RefreshSprites
-	call Functiond9e
+	call LoadStandardFont
 	call LoadFontsExtra
 	ldh a, [hROMBank]
 	push af
diff --git a/main.asm b/main.asm
index 0b4c2429..58e294ad 100644
--- a/main.asm
+++ b/main.asm
@@ -521,13 +521,16 @@ Unknown53a6b:
 	dr $53a6b, $53a83
 
 EggPic::
-	dr $53a83, $54000
+INCBIN "gfx/pokemon/egg/front.2bpp.lz"
 
 SECTION "bank21", ROMX, BANK[$21]
 	dr $84000, $842db
 
-_PrinterReceive:: ; 842db
-	dr $842db, $84684
+_PrinterReceive::
+	dr $842db, $845d4
+
+PrintMailAndExit:
+	dr $845d4, $84684
 
 Function84684:
 	dr $84684, $88000
@@ -733,11 +736,7 @@ SECTION "bank2e_2", ROMX
 INCLUDE "engine/events/checkforhiddenitems.asm"
 INCLUDE "engine/events/treemons.asm"
 INCLUDE "engine/pokegear/radio.asm"
-
-ReadPartyMonMail:
-	dr $baeca, $bbaed
-ItemIsMail:
-	dr $bbaed, $bc000
+INCLUDE "engine/pokemon/mail_2.asm"
 
 SECTION "bank2f", ROMX, BANK[$2f]
 	dr $bc000, $c0000
diff --git a/tools/gfx.py b/tools/gfx.py
index 1327907d..d1f2b208 100644
--- a/tools/gfx.py
+++ b/tools/gfx.py
@@ -63,7 +63,7 @@ def filepath_rules(filepath):
 
     pokemon_name = ''
 
-    if 'gfx/pics/' in filedir:
+    if 'gfx/pokemon/' in filedir:
         pokemon_name = filedir.split('/')[-1]
         if pokemon_name.startswith('unown_'):
             index = filedir.find(pokemon_name)
diff --git a/tools/pokemontools/gfx.py b/tools/pokemontools/gfx.py
index 30ef0702..c8d8da92 100644
--- a/tools/pokemontools/gfx.py
+++ b/tools/pokemontools/gfx.py
@@ -2,6 +2,7 @@
 
 import os
 import sys
+import io
 from . import png
 from math import sqrt, floor, ceil
 import argparse
@@ -170,16 +171,16 @@ def test_condense_tiles_to_map():
 
 def to_file(filename, data):
     """
-    Apparently open(filename, 'wb').write(bytearray(data)) won't work.
+    Apparently io.open(filename, 'wb').write(bytearray(data)) won't work.
     """
-    file = open(filename, 'wb')
+    file = io.open(filename, 'wb')
     for byte in data:
         file.write('%c' % byte)
     file.close()
 
 
 def decompress_file(filein, fileout=None):
-    image = bytearray(open(filein).read())
+    image = bytearray(io.open(filein).read())
     de = Decompressed(image)
 
     if fileout == None:
@@ -188,7 +189,7 @@ def decompress_file(filein, fileout=None):
 
 
 def compress_file(filein, fileout=None):
-    image = bytearray(open(filein).read())
+    image = bytearray(io.open(filein).read())
     lz = Compressed(image)
 
     if fileout == None:
@@ -205,7 +206,7 @@ def bin_to_rgb(word):
     return (red, green, blue)
 
 def convert_binary_pal_to_text_by_filename(filename):
-    pal = bytearray(open(filename).read())
+    pal = bytearray(io.open(filename).read())
     return convert_binary_pal_to_text(pal)
 
 def convert_binary_pal_to_text(pal):
@@ -231,7 +232,7 @@ def read_rgb_macros(lines):
 def rewrite_binary_pals_to_text(filenames):
     for filename in filenames:
         pal_text = convert_binary_pal_to_text_by_filename(filename)
-        with open(filename, 'w') as out:
+        with io.open(filename, 'w') as out:
             out.write(pal_text)
 
 
@@ -240,9 +241,7 @@ def flatten(planar):
     Flatten planar 2bpp image data into a quaternary pixel map.
     """
     strips = []
-    for bottom_top in split(planar, 2):
-        bottom = bottom_top[0]
-        top = bottom_top[1]
+    for bottom, top in split(planar, 2):
         strip = []
         for i in range(7,-1,-1):
             color = (
@@ -306,7 +305,7 @@ def pal_to_png(filename):
     """
     Interpret a .pal file as a png palette.
     """
-    with open(filename) as rgbs:
+    with io.open(filename) as rgbs:
         colors = read_rgb_macros(rgbs.readlines())
     a = 255
     palette = []
@@ -380,7 +379,7 @@ def export_2bpp_to_png(filein, fileout=None, pal_file=None, height=0, width=0, t
     if fileout == None:
         fileout = os.path.splitext(filein)[0] + '.png'
 
-    image = open(filein, 'rb').read()
+    image = io.open(filein, 'rb').read()
 
     arguments = {
         'width': width,
@@ -406,7 +405,7 @@ def export_2bpp_to_png(filein, fileout=None, pal_file=None, height=0, width=0, t
         greyscale=greyscale,
         bitdepth=bitdepth
     )
-    with open(fileout, 'wb') as f:
+    with io.open(fileout, 'wb') as f:
         w.write(f, px_map)
 
 
@@ -486,7 +485,7 @@ def convert_2bpp_to_png(image, **kwargs):
         if len(matches):
             width, height = sorted(matches, key= lambda w_h: (w_h[1] % 8 != 0, w_h[1] + w_h[0]))[0] # favor height
         else:
-            raise Exception('Image can\'t be divided into tiles (%d px)!' % (px_length(image)))
+            raise Exception('Image can\'t be divided into tiles ({} px)!'.format(px_length(image)))
 
     # convert tiles to lines
     lines = to_lines(flatten(image), width)
@@ -569,7 +568,7 @@ def export_png_to_2bpp(filein, fileout=None, palout=None, **kwargs):
         frame_text, bitmask_text = get_pic_animation(tmap, *arguments['pic_dimensions'])
 
         frames_path = os.path.join(os.path.split(fileout)[0], 'frames.asm')
-        with open(frames_path, 'w') as out:
+        with io.open(frames_path, 'w') as out:
             out.write(frame_text)
 
         bitmask_path = os.path.join(os.path.split(fileout)[0], 'bitmask.asm')
@@ -581,7 +580,7 @@ def export_png_to_2bpp(filein, fileout=None, palout=None, **kwargs):
                 bitmasks[-1] = bitmasks[-1].replace('1', '0')
                 bitmask_text = ';'.join(bitmasks)
 
-        with open(bitmask_path, 'w') as out:
+        with io.open(bitmask_path, 'w') as out:
             out.write(bitmask_text)
 
     elif tmap != None and arguments.get('tilemap', False):
@@ -631,9 +630,9 @@ def png_to_2bpp(filein, **kwargs):
     arguments.update(kwargs)
 
     if type(filein) is str:
-        filein = open(filein)
+        filein = io.open(filein)
 
-    assert type(filein) is file
+    assert hasattr(filein, 'read')
 
     width, height, rgba, info = png.Reader(filein).asRGBA8()
 
@@ -770,7 +769,7 @@ def export_palette(palette, filename):
     if os.path.exists(filename):
 
         # Pic palettes are 2 colors (black/white are added later).
-        with open(filename) as rgbs:
+        with io.open(filename) as rgbs:
             colors = read_rgb_macros(rgbs.readlines())
 
         if len(colors) == 2:
@@ -786,7 +785,7 @@ def png_to_lz(filein):
     name = os.path.splitext(filein)[0]
 
     export_png_to_2bpp(filein)
-    image = open(name+'.2bpp', 'rb').read()
+    image = io.open(name+'.2bpp', 'rb').read()
     to_file(name+'.2bpp'+'.lz', Compressed(image).output)
 
 
@@ -808,13 +807,13 @@ def convert_1bpp_to_2bpp(data):
 
 def export_2bpp_to_1bpp(filename):
     name, extension = os.path.splitext(filename)
-    image = open(filename, 'rb').read()
+    image = io.open(filename, 'rb').read()
     image = convert_2bpp_to_1bpp(image)
     to_file(name + '.1bpp', image)
 
 def export_1bpp_to_2bpp(filename):
     name, extension = os.path.splitext(filename)
-    image = open(filename, 'rb').read()
+    image = io.open(filename, 'rb').read()
     image = convert_1bpp_to_2bpp(image)
     to_file(name + '.2bpp', image)
 
@@ -826,14 +825,14 @@ def export_1bpp_to_png(filename, fileout=None):
 
     arguments = read_filename_arguments(filename)
 
-    image = open(filename, 'rb').read()
+    image = io.open(filename, 'rb').read()
     image = convert_1bpp_to_2bpp(image)
 
     result = convert_2bpp_to_png(image, **arguments)
     width, height, palette, greyscale, bitdepth, px_map = result
 
     w = png.Writer(width, height, palette=palette, compression=9, greyscale=greyscale, bitdepth=bitdepth)
-    with open(fileout, 'wb') as f:
+    with io.open(fileout, 'wb') as f:
         w.write(f, px_map)
 
 
@@ -890,14 +889,14 @@ def convert_to_png(filenames=[]):
 
 def compress(filenames=[]):
     for filename in filenames:
-        data = open(filename, 'rb').read()
+        data = io.open(filename, 'rb').read()
         lz_data = Compressed(data).output
         to_file(filename + '.lz', lz_data)
 
 def decompress(filenames=[]):
     for filename in filenames:
         name, extension = os.path.splitext(filename)
-        lz_data = open(filename, 'rb').read()
+        lz_data = io.open(filename, 'rb').read()
         data = Decompressed(lz_data).output
         to_file(name, data)
 
diff --git a/tools/scan_includes.c b/tools/scan_includes.c
index 734c147f..63af3bcf 100644
--- a/tools/scan_includes.c
+++ b/tools/scan_includes.c
@@ -69,7 +69,7 @@ void scan_file(char* filename) {
 				} else if ((strncmp(buffer, "INCLUDE", 7) == 0) || (strncmp(buffer, "include", 7) == 0)) {
 					is_include = true;
 				}
-				if (is_include) {
+				if (is_incbin || is_include) {
 					buffer = strchr(buffer, '"');
 					if (!buffer) {
 						break;
diff --git a/wram.asm b/wram.asm
index 20480327..bf367898 100644
--- a/wram.asm
+++ b/wram.asm
@@ -2100,7 +2100,7 @@ wCurSpecies:: ds 1 ; ce60
 wNamedObjectTypeBuffer:: ds 1 ; ce61
 wce62:: ds 1 ; ce62
 wce63::
-wJumpTableIndex::
+wJumptableIndex::
 	db ; ce63
 wce64:: ds 1 ; ce64
 wce65::
author	entrpntr <entrpntr@gmail.com>	2020-04-01 20:58:12 -0400
committer	entrpntr <entrpntr@gmail.com>	2020-04-02 01:36:09 -0400
commit	48e0d17b6a51344a07c679e17eb92a25fdb1882b (patch)
tree	290a1e71a454c76d5a3baeb9cd4de32ac86989ca
parent	90cdd19ae81c1f3446d64094018b3f1d705ce1cf (diff)