Merge remote-tracking branch 'pret/master' into baserom_extraction

274 files changed, 46 insertions, 336 deletions

diff --git a/data/battle_anims.s b/data/battle_anims.s
index 471394fe8..13e1bdc2f 100644
--- a/data/battle_anims.s
+++ b/data/battle_anims.s
@@ -988,7 +988,7 @@ gUnknown_08525F58:: @ 8525F58
 	.byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00
 
     .align 2
-gUnknown_08525F78:: @ 8525F78
+gCastformFrontSpriteCoords:: @ 8525F78
 	.byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00
 	.byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00
 
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 206519f40..b2dfec5d8 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -45,40 +45,40 @@ gUnknown_082DA7C4:: @ 82DA7C4
 gUnknown_082DA7CD:: @ 82DA7CD
 	.incbin "baserom.gba", 0x2da7cd, 0x160
 
-gUnknown_082DA92D:: @ 82DA92D
+BattleScript_LocalTrainerBattleWon:: @ 82DA92D
 	.incbin "baserom.gba", 0x2da92d, 0x3d
 
-gUnknown_082DA96A:: @ 82DA96A
+BattleScript_PayDayMoneyAndPickUpItems:: @ 82DA96A
 	.incbin "baserom.gba", 0x2da96a, 0x3
 
-gUnknown_082DA96D:: @ 82DA96D
+BattleScript_LocalBattleLost:: @ 82DA96D
 	.incbin "baserom.gba", 0x2da96d, 0x9e
 
 gUnknown_082DAA0B:: @ 82DAA0B
 	.incbin "baserom.gba", 0x2daa0b, 0x2a
 
-gUnknown_082DAA35:: @ 82DAA35
+BattleScript_LinkBattleWonOrLost:: @ 82DAA35
 	.incbin "baserom.gba", 0x2daa35, 0x52
 
-gUnknown_082DAA87:: @ 82DAA87
+BattleScript_FrontierTrainerBattleWon:: @ 82DAA87
 	.incbin "baserom.gba", 0x2daa87, 0x54
 
-gUnknown_082DAADB:: @ 82DAADB
+BattleScript_SmokeBallEscape:: @ 82DAADB
 	.incbin "baserom.gba", 0x2daadb, 0xe
 
-gUnknown_082DAAE9:: @ 82DAAE9
+BattleScript_RanAwayUsingMonAbility:: @ 82DAAE9
 	.incbin "baserom.gba", 0x2daae9, 0x7
 
-gUnknown_082DAAF0:: @ 82DAAF0
+BattleScript_GotAwaySafely:: @ 82DAAF0
 	.incbin "baserom.gba", 0x2daaf0, 0x7
 
-gUnknown_082DAAF7:: @ 82DAAF7
+BattleScript_WildMonFled:: @ 82DAAF7
 	.incbin "baserom.gba", 0x2daaf7, 0x7
 
 gUnknown_082DAAFE:: @ 82DAAFE
 	.incbin "baserom.gba", 0x2daafe, 0x4
 
-gUnknown_082DAB02:: @ 82DAB02
+BattleScript_PrintFailedToRunString:: @ 82DAB02
 	.incbin "baserom.gba", 0x2dab02, 0x9
 
 gUnknown_082DAB0B:: @ 82DAB0B
@@ -87,7 +87,7 @@ gUnknown_082DAB0B:: @ 82DAB0B
 gUnknown_082DAB11:: @ 82DAB11
 	.incbin "baserom.gba", 0x2dab11, 0x4
 
-gUnknown_082DAB15:: @ 82DAB15
+BattleScript_ActionSwitch:: @ 82DAB15
 	.incbin "baserom.gba", 0x2dab15, 0xa4
 
 BattleScript_Pausex20:: @ 82DABB9
@@ -255,7 +255,7 @@ BattleScript_OneHitKOMsg:: @ 82DB1CE
 BattleScript_SAtkDown2:: @ 82DB1D5
 	.incbin "baserom.gba", 0x2db1d5, 0x2a
 
-gUnknown_082DB1FF:: @ 82DB1FF
+BattleScript_FocusPunchSetUp:: @ 82DB1FF
 	.incbin "baserom.gba", 0x2db1ff, 0x14
 
 BattleScript_MoveUsedIsAsleep:: @ 82DB213
@@ -561,7 +561,7 @@ BattleScript_BerryStatRaiseEnd2:: @ 82DB84E
 BattleScript_BerryFocusEnergyEnd2:: @ 82DB869
 	.incbin "baserom.gba", 0x2db869, 0x10
 
-gUnknown_082DB879:: @ 82DB879
+BattleScript_ActionSelectionItemsCantBeUsed:: @ 82DB879
 	.incbin "baserom.gba", 0x2db879, 0x4
 
 gUnknown_082DB87D:: @ 82DB87D
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index adabccb88..4a4dc4665 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -4,7 +4,7 @@
 	.section script_data, "aw", %progbits
 
 	.align 2
-gUnknown_082DBD08:: @ 82DBD08
+gBattlescriptsForBallThrow:: @ 82DBD08
 	.4byte gUnknown_082DBD68
 	.4byte gUnknown_082DBD68
 	.4byte gUnknown_082DBD68
@@ -29,11 +29,11 @@ gUnknown_082DBD3C:: @ 82DBD3C
 	.4byte gUnknown_082DBE91
 
 	.align 2
-gUnknown_082DBD54:: @ 82DBD54
-	.4byte gUnknown_082DBEB3
+gBattlescriptsForRunningByItem:: @ 82DBD54
+	.4byte BattleScript_RunByUsingItem
 
 	.align 2
-gUnknown_082DBD58:: @ 82DBD58
+gBattlescriptsForSafariActions:: @ 82DBD58
 	.4byte gUnknown_082DBEBD
 	.4byte gUnknown_082DBEC4
 	.4byte gUnknown_082DBECD
@@ -72,7 +72,7 @@ gUnknown_082DBE6F:: @ 82DBE6F
 gUnknown_082DBE91:: @ 82DBE91
 	.incbin "baserom.gba", 0x2dbe91, 0x22
 
-gUnknown_082DBEB3:: @ 82DBEB3
+BattleScript_RunByUsingItem:: @ 82DBEB3
 	.incbin "baserom.gba", 0x2dbeb3, 0xA
 
 gUnknown_082DBEBD:: @ 82DBEBD
diff --git a/data/data2b.s b/data/data2b.s
index 471993027..2565f4c04 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -3039,7 +3039,7 @@ gUnknown_08300654:: @ 8300654
 	.4byte gUnknown_08300654
 
 	.align 2
-gUnknown_08300D38:: @ 8300D38
+gMonFrontPicCoords:: @ 8300D38
 	.byte 0x88, 0x00, 0x00, 0x00
 	.byte 0x45, 0x0e, 0x00, 0x00
 	.byte 0x56, 0x0a, 0x00, 0x00
@@ -4828,10 +4828,9 @@ gUnknown_0831AC70:: @ 831AC70
 gUnknown_0831AC88:: @ 831AC88
 	spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8038528
 
-	.align 2
-gUnknown_0831ACA0:: @ 831ACA0
-	.string "ヌケニン$" @ "Nukenin" (Shedinja)
-
+gText_ShedinjaJapaneseName:: @ 831ACA0
+	.string "ヌケニン$" @ Nukenin
+    
 	.align 2
 gUnknown_0831ACA8:: @ 831ACA8
 	.2byte 0x0100
@@ -4881,93 +4880,3 @@ gUnknown_0831ACE0:: @ 831ACE0
 
 @ 831BAD4
 	.include "data/text/ability_description_pointers.inc"
-
-	.align 2
-gUnknown_0831BC0C:: @ 831BC0C
-	.4byte sub_803E0B8
-	.4byte sub_803E90C
-	.4byte bs2_8016374
-	.4byte sub_803EE48
-	.4byte sub_803EFA8
-	.4byte bs5_8016AC0
-	.4byte sub_803F050
-	.4byte sub_803F120
-	.4byte bs8_exit_by_flight
-	.4byte bs9_8016C9C
-	.4byte sub_80458B4
-	.4byte bsB_exit_by_move
-	.4byte bsC_8016D70
-	.4byte bsD_proceed
-
-	.align 2
-gUnknown_0831BC44:: @ 831BC44
-	.4byte bc_8013B1C
-	.4byte sub_803D8C0
-	.4byte sub_803DAC0
-	.4byte sub_803DAC0
-	.4byte sub_803DBA0
-	.4byte sub_803DCD8
-	.4byte bc_80158BC
-	.4byte sub_803DCD8
-	.4byte sub_803DCD8
-	.4byte sub_803DCD8
-	.4byte sub_803DCD8
-
-gStatusConditionString_PoisonJpn:: @ 81FA69C
-	.string "どく$$$$$$"
-
-gStatusConditionString_SleepJpn:: @ 81FA6A4
-	.string "ねむり$$$$$"
-
-gStatusConditionString_ParalysisJpn:: @ 81FA6AC
-	.string "まひ$$$$$$"
-
-gStatusConditionString_BurnJpn:: @ 81FA6B4
-	.string "やけど$$$$$"
-
-gStatusConditionString_IceJpn:: @ 81FA6BC
-	.string "こおり$$$$$"
-
-gStatusConditionString_ConfusionJpn:: @ 81FA6C4
-	.string "こんらん$$$$"
-
-gStatusConditionString_LoveJpn:: @ 81FA6CC
-	.string "メロメロ$$$$"
-
-	.align 2
-gUnknown_0831BCA8:: @ 831BCA8
-	.4byte gStatusConditionString_PoisonJpn, gText_Poison
-	.4byte gStatusConditionString_SleepJpn, gText_Sleep
-	.4byte gStatusConditionString_ParalysisJpn, gText_Paralysis
-	.4byte gStatusConditionString_BurnJpn, gText_Burn
-	.4byte gStatusConditionString_IceJpn, gText_Ice
-	.4byte gStatusConditionString_ConfusionJpn, gText_Confusion
-	.4byte gStatusConditionString_LoveJpn, gText_Love
-
-gUnknown_0831BCE0:: @ 831BCE0
-	.byte 0, 0, 0
-	.byte 3, 5, 0
-	.byte 2, 3, 0
-	.byte 1, 2, 0
-	.byte 1, 1, 0
-
-gUnknown_0831BCEF:: @ 831BCEF
-	.byte 4, 3, 2, 1
-
-gUnknown_0831BCF3:: @ 831BCF3
-	.byte 4, 4, 4, 4
-
-	.align 2
-gSoundMovesTable:: @ 831BCF8
-	.2byte   0x2D
-	.2byte   0x2E
-	.2byte   0x2F
-	.2byte   0x30
-	.2byte   0x67
-	.2byte   0xAD
-	.2byte   0xFD
-	.2byte  0x13F
-	.2byte  0x140
-	.2byte  0x130
-	.2byte 0xFFFF
-
diff --git a/data/data4.s b/data/data4.s
index 202b1ffe7..d99336e87 100644
--- a/data/data4.s
+++ b/data/data4.s
@@ -14,19 +14,16 @@ gUnknown_085B09F4:: @ 85B09F4
 gUnknown_085B09F8:: @ 85B09F8
 	.incbin "baserom.gba", 0x5b09f8, 0x8
 
-gUnknown_085B0A00:: @ 85B0A00
-	.incbin "baserom.gba", 0x5b0a00, 0x2
+gBirchBagGrassPal:: @ 85B0A00
+	.incbin "baserom.gba", 0x5b0a00, 0x80
 
-gUnknown_085B0A02:: @ 85B0A02
-	.incbin "baserom.gba", 0x5b0a02, 0x7e
-
-gUnknown_085B0A80:: @ 85B0A80
+gBirchBagTilemap:: @ 85B0A80
 	.incbin "baserom.gba", 0x5b0a80, 0x18c
 
-gUnknown_085B0C0C:: @ 85B0C0C
+gBirchGrassTilemap:: @ 85B0C0C
 	.incbin "baserom.gba", 0x5b0c0c, 0x1f8
 
-gUnknown_085B0E04:: @ 85B0E04
+gBirchHelpGfx:: @ 85B0E04
 	.incbin "baserom.gba", 0x5b0e04, 0xfc8
 
 gUnknown_085B1DCC:: @ 85B1DCC
diff --git a/data/diploma.s b/data/diploma.s
deleted file mode 100644
index 43a3d9c70..000000000
--- a/data/diploma.s
+++ /dev/null
@@ -1,22 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_085E7088:: @ 85E7088
-	.incbin "baserom.gba", 0x5e7088, 0x40
-
-gUnknown_085E70C8:: @ 85E70C8
-	.incbin "baserom.gba", 0x5e70c8, 0x73c
-
-gUnknown_085E7804:: @ 85E7804
-	.incbin "baserom.gba", 0x5e7804, 0x9f8
-
-gUnknown_085E81FC:: @ 85E81FC
-	.incbin "baserom.gba", 0x5e81fc, 0x8
-
-gUnknown_085E8204:: @ 85E8204
-	.incbin "baserom.gba", 0x5e8204, 0x10
-
-gUnknown_085E8214:: @ 85E8214
-	.incbin "baserom.gba", 0x5e8214, 0x4
diff --git a/data/event_scripts.s b/data/event_scripts.s
index e4293570d..4dd5761e5 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -84,14 +84,14 @@ gUnknown_0823B68C:: @ 823B68C
 gUnknown_0823C050:: @ 823C050
 	.incbin "baserom.gba", 0x23c050, 0x6431
 
-gUnknown_08242481:: @ 8242481
+gText_BattleRecordCouldntBeSaved:: @ 8242481
 	.incbin "baserom.gba", 0x242481, 0x87b
 
 gUnknown_08242CFC:: @ 8242CFC
 	.incbin "baserom.gba", 0x242cfc, 0x6a91
 
-gUnknown_0824978D:: @ 824978D
-	.incbin "baserom.gba", 0x24978d, 0xe
+gText_LinkStandby3:: @ 824978D
+	.string "Link standby…$"
 
 gUnknown_0824979B:: @ 824979B
 	.incbin "baserom.gba", 0x24979b, 0x944d
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 89ed27301..ceb327084 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -316,7 +316,7 @@ gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC
 	field_eff_end
 
 gFieldEffectScript_Unknown60:: @ 82DBCD2
-	field_eff_callnative sub_81799B8
+	field_eff_callnative FldEff_UsePuzzleEffect
 	field_eff_end
 
 gFieldEffectScript_Unknown61:: @ 82DBCD8
diff --git a/data/graphics.s b/data/graphics.s
index 2c29d6ca5..e1b76565a 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -467,7 +467,19 @@ gUnknown_08D85600:: @ 8D85600
 	.incbin "baserom.gba", 0xd85600, 0x20
 
 gUnknown_08D85620:: @ 8D85620
-	.incbin "baserom.gba", 0xd85620, 0xa8
+	.incbin "baserom.gba", 0xd85620, 0x20
+
+gUnknown_08D85640:: @ 8D85640
+	.incbin "baserom.gba", 0xd85640, 0x20
+
+gUnknown_08D85660:: @ 8D85660
+	.incbin "baserom.gba", 0xd85660, 0x20
+
+gUnknown_08D85680:: @ 8D85680
+	.incbin "baserom.gba", 0xd85680, 0x20
+
+gUnknown_08D856A0:: @ 8D856A0
+	.incbin "baserom.gba", 0xd856a0, 0x28
 
 gUnknown_08D856C8:: @ 8D856C8
 	.incbin "baserom.gba", 0xd856c8, 0xe0
diff --git a/data/palette.s b/data/palette.s
deleted file mode 100644
index 2dbfed8d2..000000000
--- a/data/palette.s
+++ /dev/null
@@ -1,18 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_0852487C:: @ 852487C
-	.incbin "baserom.gba", 0x52487c, 0x10
-
-gDummyPaletteStructTemplate:: @ 852488C
-	.2byte 0xFFFF
-	.space 9
-	.byte 0x20
-	.space 4
-
-	.align 2
-gUnknown_0852489C:: @ 852489C
-	.incbin "baserom.gba", 0x52489c, 0x20
diff --git a/data/save_failed_screen.s b/data/save_failed_screen.s
deleted file mode 100644
index 446eee2d2..000000000
--- a/data/save_failed_screen.s
+++ /dev/null
@@ -1,28 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_085EFD80:: @ 85EFD80
-	.incbin "baserom.gba", 0x5efd80, 0x8
-
-gUnknown_085EFD88:: @ 85EFD88
-	.incbin "baserom.gba", 0x5efd88, 0xc
-
-gUnknown_085EFD94:: @ 85EFD94
-	.incbin "baserom.gba", 0x5efd94, 0x8
-
-gUnknown_085EFD9C:: @ 85EFD9C
-	.incbin "baserom.gba", 0x5efd9c, 0x8
-
-gUnknown_085EFDA4:: @ 85EFDA4
-	.incbin "baserom.gba", 0x5efda4, 0x8
-
-gUnknown_085EFDAC:: @ 85EFDAC
-	.incbin "baserom.gba", 0x5efdac, 0x18
-
-gUnknown_085EFDC4:: @ 85EFDC4
-	.incbin "baserom.gba", 0x5efdc4, 0x20
-
-gUnknown_085EFDE4:: @ 85EFDE4
-	.incbin "baserom.gba", 0x5efde4, 0x90
diff --git a/data/save_location.s b/data/save_location.s
deleted file mode 100644
index eabed7d86..000000000
--- a/data/save_location.s
+++ /dev/null
@@ -1,13 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_086143BC:: @ 86143BC
-	.incbin "baserom.gba", 0x6143bc, 0x4e
-
-gUnknown_0861440A:: @ 861440A
-	.incbin "baserom.gba", 0x61440a, 0x4
-
-gUnknown_0861440E:: @ 861440E
-	.incbin "baserom.gba", 0x61440e, 0x2
diff --git a/data/start_menu.s b/data/start_menu.s
index eaba0b8e1..07e428d0d 100644
--- a/data/start_menu.s
+++ b/data/start_menu.s
@@ -26,4 +26,4 @@ gUnknown_085105AC:: @ 85105AC
 	.incbin "baserom.gba", 0x5105ac, 0x10
 
 gUnknown_085105BC:: @ 85105BC
-	.incbin "baserom.gba", 0x5105bc, 0x1a8
+	.incbin "baserom.gba", 0x5105bc, 0x8
diff --git a/data/tileset.s b/data/tileset.s
deleted file mode 100644
index 1221d8967..000000000
--- a/data/tileset.s
+++ /dev/null
@@ -1,116 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_08510764:: @ 8510764
-	.incbin "baserom.gba", 0x510764, 0xb60
-
-gUnknown_085112C4:: @ 85112C4
-	.incbin "baserom.gba", 0x5112c4, 0x908
-
-gUnknown_08511BCC:: @ 8511BCC
-	.incbin "baserom.gba", 0x511bcc, 0x9a8
-
-gUnknown_08512574:: @ 8512574
-	.incbin "baserom.gba", 0x512574, 0x8e0
-
-gUnknown_08512E54:: @ 8512E54
-	.incbin "baserom.gba", 0x512e54, 0x320
-
-gUnknown_08513174:: @ 8513174
-	.incbin "baserom.gba", 0x513174, 0x510
-
-gUnknown_08513684:: @ 8513684
-	.incbin "baserom.gba", 0x513684, 0x210
-
-gUnknown_08513894:: @ 8513894
-	.incbin "baserom.gba", 0x513894, 0xb50
-
-gUnknown_085143E4:: @ 85143E4
-	.incbin "baserom.gba", 0x5143e4, 0x210
-
-gUnknown_085145F4:: @ 85145F4
-	.incbin "baserom.gba", 0x5145f4, 0x810
-
-gUnknown_08514E04:: @ 8514E04
-	.incbin "baserom.gba", 0x514e04, 0x540
-
-gUnknown_08515344:: @ 8515344
-	.incbin "baserom.gba", 0x515344, 0x20
-
-gUnknown_08515364:: @ 8515364
-	.incbin "baserom.gba", 0x515364, 0x20
-
-gUnknown_08515384:: @ 8515384
-	.incbin "baserom.gba", 0x515384, 0x30
-
-gUnknown_085153B4:: @ 85153B4
-	.incbin "baserom.gba", 0x5153b4, 0x30
-
-gUnknown_085153E4:: @ 85153E4
-	.incbin "baserom.gba", 0x5153e4, 0x10
-
-gUnknown_085153F4:: @ 85153F4
-	.incbin "baserom.gba", 0x5153f4, 0x410
-
-gUnknown_08515804:: @ 8515804
-	.incbin "baserom.gba", 0x515804, 0x20
-
-gUnknown_08515824:: @ 8515824
-	.incbin "baserom.gba", 0x515824, 0x140
-
-gUnknown_08515964:: @ 8515964
-	.incbin "baserom.gba", 0x515964, 0x428
-
-gUnknown_08515D8C:: @ 8515D8C
-	.incbin "baserom.gba", 0x515d8c, 0x430
-
-gUnknown_085161BC:: @ 85161BC
-	.incbin "baserom.gba", 0x5161bc, 0x20
-
-gUnknown_085161DC:: @ 85161DC
-	.incbin "baserom.gba", 0x5161dc, 0x320
-
-gUnknown_085164FC:: @ 85164FC
-	.incbin "baserom.gba", 0x5164fc, 0x310
-
-gUnknown_0851680C:: @ 851680C
-	.incbin "baserom.gba", 0x51680c, 0x310
-
-gUnknown_08516B1C:: @ 8516B1C
-	.incbin "baserom.gba", 0x516b1c, 0x210
-
-gUnknown_08516D2C:: @ 8516D2C
-	.incbin "baserom.gba", 0x516d2c, 0x110
-
-gUnknown_08516E3C:: @ 8516E3C
-	.incbin "baserom.gba", 0x516e3c, 0xc08
-
-gUnknown_08517A44:: @ 8517A44
-	.incbin "baserom.gba", 0x517a44, 0xc
-
-gUnknown_08517A50:: @ 8517A50
-	.incbin "baserom.gba", 0x517a50, 0x1ac
-
-gUnknown_08517BFC:: @ 8517BFC
-	.incbin "baserom.gba", 0x517bfc, 0x10
-
-gUnknown_08517C0C:: @ 8517C0C
-	.incbin "baserom.gba", 0x517c0c, 0x428
-
-gUnknown_08518034:: @ 8518034
-	.incbin "baserom.gba", 0x518034, 0x268
-
-gUnknown_0851829C:: @ 851829C
-	.incbin "baserom.gba", 0x51829c, 0x8028
-
-gUnknown_085202C4:: @ 85202C4
-	.incbin "baserom.gba", 0x5202c4, 0x45a0
-
-gUnknown_08524864:: @ 8524864
-	.incbin "baserom.gba", 0x524864, 0xc
-
-gUnknown_08524870:: @ 8524870
-	.incbin "baserom.gba", 0x524870, 0xc
diff --git a/data/tilesets/primary/building/anim/0.png b/data/tilesets/primary/building/anim/0.png
new file mode 100644
index 000000000..004eccc67
--- /dev/null
+++ b/data/tilesets/primary/building/anim/0.png
diff --git a/data/tilesets/primary/building/anim/1.png b/data/tilesets/primary/building/anim/1.png
new file mode 100644
index 000000000..e28281dea
--- /dev/null
+++ b/data/tilesets/primary/building/anim/1.png
diff --git a/data/tilesets/primary/general/anim/0/0.png b/data/tilesets/primary/general/anim/0/0.png
new file mode 100644
index 000000000..d535d920e
--- /dev/null
+++ b/data/tilesets/primary/general/anim/0/0.png
diff --git a/data/tilesets/primary/general/anim/0/1.png b/data/tilesets/primary/general/anim/0/1.png
new file mode 100644
index 000000000..74f93ecce
--- /dev/null
+++ b/data/tilesets/primary/general/anim/0/1.png
diff --git a/data/tilesets/primary/general/anim/0/2.png b/data/tilesets/primary/general/anim/0/2.png
new file mode 100644
index 000000000..fb0bfe89f
--- /dev/null
+++ b/data/tilesets/primary/general/anim/0/2.png
diff --git a/data/tilesets/primary/general/anim/1/0.png b/data/tilesets/primary/general/anim/1/0.png
new file mode 100644
index 000000000..a7bb2e631
--- /dev/null
+++ b/data/tilesets/primary/general/anim/1/0.png
diff --git a/data/tilesets/primary/general/anim/1/1.png b/data/tilesets/primary/general/anim/1/1.png
new file mode 100644
index 000000000..c215f1683
--- /dev/null
+++ b/data/tilesets/primary/general/anim/1/1.png
diff --git a/data/tilesets/primary/general/anim/1/2.png b/data/tilesets/primary/general/anim/1/2.png
new file mode 100644
index 000000000..f8e0ee273
--- /dev/null
+++ b/data/tilesets/primary/general/anim/1/2.png
diff --git a/data/tilesets/primary/general/anim/1/3.png b/data/tilesets/primary/general/anim/1/3.png
new file mode 100644
index 000000000..6c6ce3611
--- /dev/null
+++ b/data/tilesets/primary/general/anim/1/3.png
diff --git a/data/tilesets/primary/general/anim/1/4.png b/data/tilesets/primary/general/anim/1/4.png
new file mode 100644
index 000000000..cc1f9576c
--- /dev/null
+++ b/data/tilesets/primary/general/anim/1/4.png
diff --git a/data/tilesets/primary/general/anim/1/5.png b/data/tilesets/primary/general/anim/1/5.png
new file mode 100644
index 000000000..3c0c57a86
--- /dev/null
+++ b/data/tilesets/primary/general/anim/1/5.png
diff --git a/data/tilesets/primary/general/anim/1/6.png b/data/tilesets/primary/general/anim/1/6.png
new file mode 100644
index 000000000..be5ecacaa
--- /dev/null
+++ b/data/tilesets/primary/general/anim/1/6.png
diff --git a/data/tilesets/primary/general/anim/1/7.png b/data/tilesets/primary/general/anim/1/7.png
new file mode 100644
index 000000000..85bc7561a
--- /dev/null
+++ b/data/tilesets/primary/general/anim/1/7.png
diff --git a/data/tilesets/primary/general/anim/2/0.png b/data/tilesets/primary/general/anim/2/0.png
new file mode 100644
index 000000000..6f9f0c309
--- /dev/null
+++ b/data/tilesets/primary/general/anim/2/0.png
diff --git a/data/tilesets/primary/general/anim/2/1.png b/data/tilesets/primary/general/anim/2/1.png
new file mode 100644
index 000000000..bef1f3023
--- /dev/null
+++ b/data/tilesets/primary/general/anim/2/1.png
diff --git a/data/tilesets/primary/general/anim/2/2.png b/data/tilesets/primary/general/anim/2/2.png
new file mode 100644
index 000000000..b5d7a9ee9
--- /dev/null
+++ b/data/tilesets/primary/general/anim/2/2.png
diff --git a/data/tilesets/primary/general/anim/2/3.png b/data/tilesets/primary/general/anim/2/3.png
new file mode 100644
index 000000000..42a953a83
--- /dev/null
+++ b/data/tilesets/primary/general/anim/2/3.png
diff --git a/data/tilesets/primary/general/anim/2/4.png b/data/tilesets/primary/general/anim/2/4.png
new file mode 100644
index 000000000..112b20077
--- /dev/null
+++ b/data/tilesets/primary/general/anim/2/4.png
diff --git a/data/tilesets/primary/general/anim/2/5.png b/data/tilesets/primary/general/anim/2/5.png
new file mode 100644
index 000000000..7f58c0b94
--- /dev/null
+++ b/data/tilesets/primary/general/anim/2/5.png
diff --git a/data/tilesets/primary/general/anim/2/6.png b/data/tilesets/primary/general/anim/2/6.png
new file mode 100644
index 000000000..784a543b4
--- /dev/null
+++ b/data/tilesets/primary/general/anim/2/6.png
diff --git a/data/tilesets/primary/general/anim/3/0.png b/data/tilesets/primary/general/anim/3/0.png
new file mode 100644
index 000000000..2f8bb49b6
--- /dev/null
+++ b/data/tilesets/primary/general/anim/3/0.png
diff --git a/data/tilesets/primary/general/anim/3/1.png b/data/tilesets/primary/general/anim/3/1.png
new file mode 100644
index 000000000..5a2744a66
--- /dev/null
+++ b/data/tilesets/primary/general/anim/3/1.png
diff --git a/data/tilesets/primary/general/anim/3/2.png b/data/tilesets/primary/general/anim/3/2.png
new file mode 100644
index 000000000..0ddf1cda7
--- /dev/null
+++ b/data/tilesets/primary/general/anim/3/2.png
diff --git a/data/tilesets/primary/general/anim/3/3.png b/data/tilesets/primary/general/anim/3/3.png
new file mode 100644
index 000000000..f3fee8470
--- /dev/null
+++ b/data/tilesets/primary/general/anim/3/3.png
diff --git a/data/tilesets/primary/general/anim/4/0.png b/data/tilesets/primary/general/anim/4/0.png
new file mode 100644
index 000000000..90dc0bc02
--- /dev/null
+++ b/data/tilesets/primary/general/anim/4/0.png
diff --git a/data/tilesets/primary/general/anim/4/1.png b/data/tilesets/primary/general/anim/4/1.png
new file mode 100644
index 000000000..4459a94e5
--- /dev/null
+++ b/data/tilesets/primary/general/anim/4/1.png
diff --git a/data/tilesets/primary/general/anim/4/2.png b/data/tilesets/primary/general/anim/4/2.png
new file mode 100644
index 000000000..389875c31
--- /dev/null
+++ b/data/tilesets/primary/general/anim/4/2.png
diff --git a/data/tilesets/primary/general/anim/4/3.png b/data/tilesets/primary/general/anim/4/3.png
new file mode 100644
index 000000000..ac8936cce
--- /dev/null
+++ b/data/tilesets/primary/general/anim/4/3.png
diff --git a/data/tilesets/primary/general/tiles.png b/data/tilesets/primary/general/tiles.png
index 3d1e90510..121e835a2 100644
--- a/data/tilesets/primary/general/tiles.png
+++ b/data/tilesets/primary/general/tiles.png
diff --git a/data/tilesets/primary/inside_building/tiles.png b/data/tilesets/primary/inside_building/tiles.png
index 7d267dfb7..506bb7400 100644
--- a/data/tilesets/primary/inside_building/tiles.png
+++ b/data/tilesets/primary/inside_building/tiles.png
diff --git a/data/tilesets/primary/secret_base/tiles.png b/data/tilesets/primary/secret_base/tiles.png
index 9adc0e13f..9dee014ea 100644
--- a/data/tilesets/primary/secret_base/tiles.png
+++ b/data/tilesets/primary/secret_base/tiles.png
diff --git a/data/tilesets/primary/secret_base/unknown_tiles.png b/data/tilesets/primary/secret_base/unknown_tiles.png
index dd5c4e16a..3ca4d9e87 100644
--- a/data/tilesets/primary/secret_base/unknown_tiles.png
+++ b/data/tilesets/primary/secret_base/unknown_tiles.png
diff --git a/data/tilesets/secondary/battle_arena/tiles.png b/data/tilesets/secondary/battle_arena/tiles.png
index 43297aa7b..7414666df 100644
--- a/data/tilesets/secondary/battle_arena/tiles.png
+++ b/data/tilesets/secondary/battle_arena/tiles.png
diff --git a/data/tilesets/secondary/battle_dome/tiles.png b/data/tilesets/secondary/battle_dome/tiles.png
index e0fce3196..be3708bfd 100644
--- a/data/tilesets/secondary/battle_dome/tiles.png
+++ b/data/tilesets/secondary/battle_dome/tiles.png
diff --git a/data/tilesets/secondary/battle_factory/tiles.png b/data/tilesets/secondary/battle_factory/tiles.png
index 7857f0813..4d9463b20 100644
--- a/data/tilesets/secondary/battle_factory/tiles.png
+++ b/data/tilesets/secondary/battle_factory/tiles.png
diff --git a/data/tilesets/secondary/battle_frontier/tiles.png b/data/tilesets/secondary/battle_frontier/tiles.png
index 70ec420e9..1b14ce555 100644
--- a/data/tilesets/secondary/battle_frontier/tiles.png
+++ b/data/tilesets/secondary/battle_frontier/tiles.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png
new file mode 100644
index 000000000..8a9905198
--- /dev/null
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png
new file mode 100644
index 000000000..836986b12
--- /dev/null
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png
new file mode 100644
index 000000000..660d3080f
--- /dev/null
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png
new file mode 100644
index 000000000..7fe571b4a
--- /dev/null
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_east/tiles.png b/data/tilesets/secondary/battle_frontier_outside_east/tiles.png
index 20cb7d67e..da34656d1 100644
--- a/data/tilesets/secondary/battle_frontier_outside_east/tiles.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/tiles.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png
new file mode 100644
index 000000000..8a9905198
--- /dev/null
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png
new file mode 100644
index 000000000..836986b12
--- /dev/null
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png
new file mode 100644
index 000000000..660d3080f
--- /dev/null
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png
new file mode 100644
index 000000000..7fe571b4a
--- /dev/null
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_west/tiles.png b/data/tilesets/secondary/battle_frontier_outside_west/tiles.png
index 3d5ea94f9..03704bfd0 100644
--- a/data/tilesets/secondary/battle_frontier_outside_west/tiles.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/tiles.png
diff --git a/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png b/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png
index cf54e1d77..1c1f700c0 100644
--- a/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png
+++ b/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png
diff --git a/data/tilesets/secondary/battle_palace/tiles.png b/data/tilesets/secondary/battle_palace/tiles.png
index a848a9eef..4e11e3596 100644
--- a/data/tilesets/secondary/battle_palace/tiles.png
+++ b/data/tilesets/secondary/battle_palace/tiles.png
diff --git a/data/tilesets/secondary/battle_pike/tiles.png b/data/tilesets/secondary/battle_pike/tiles.png
index cba2f5794..fc11f1d1a 100644
--- a/data/tilesets/secondary/battle_pike/tiles.png
+++ b/data/tilesets/secondary/battle_pike/tiles.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/0.png b/data/tilesets/secondary/battle_pyramid/anim/0/0.png
new file mode 100644
index 000000000..c0fb59c0e
--- /dev/null
+++ b/data/tilesets/secondary/battle_pyramid/anim/0/0.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/1.png b/data/tilesets/secondary/battle_pyramid/anim/0/1.png
new file mode 100644
index 000000000..29c019209
--- /dev/null
+++ b/data/tilesets/secondary/battle_pyramid/anim/0/1.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/2.png b/data/tilesets/secondary/battle_pyramid/anim/0/2.png
new file mode 100644
index 000000000..7c463d9c3
--- /dev/null
+++ b/data/tilesets/secondary/battle_pyramid/anim/0/2.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/0.png b/data/tilesets/secondary/battle_pyramid/anim/1/0.png
new file mode 100644
index 000000000..2a0921dea
--- /dev/null
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/0.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/1.png b/data/tilesets/secondary/battle_pyramid/anim/1/1.png
new file mode 100644
index 000000000..3474d081f
--- /dev/null
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/1.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/2.png b/data/tilesets/secondary/battle_pyramid/anim/1/2.png
new file mode 100644
index 000000000..b9f1c4423
--- /dev/null
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/2.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/3.png b/data/tilesets/secondary/battle_pyramid/anim/1/3.png
new file mode 100644
index 000000000..8ad81b1e1
--- /dev/null
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/3.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/4.png b/data/tilesets/secondary/battle_pyramid/anim/1/4.png
new file mode 100644
index 000000000..bea921d90
--- /dev/null
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/4.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/5.png b/data/tilesets/secondary/battle_pyramid/anim/1/5.png
new file mode 100644
index 000000000..bea921d90
--- /dev/null
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/5.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/6.png b/data/tilesets/secondary/battle_pyramid/anim/1/6.png
new file mode 100644
index 000000000..16652df19
--- /dev/null
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/6.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/7.png b/data/tilesets/secondary/battle_pyramid/anim/1/7.png
new file mode 100644
index 000000000..8ea7a49e6
--- /dev/null
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/7.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/8.png b/data/tilesets/secondary/battle_pyramid/anim/1/8.png
new file mode 100644
index 000000000..2895d3319
--- /dev/null
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/8.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/9.png b/data/tilesets/secondary/battle_pyramid/anim/1/9.png
new file mode 100644
index 000000000..63c22acf2
--- /dev/null
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/9.png
diff --git a/data/tilesets/secondary/battle_pyramid/tiles.png b/data/tilesets/secondary/battle_pyramid/tiles.png
index cd45ea045..d9609f3dd 100644
--- a/data/tilesets/secondary/battle_pyramid/tiles.png
+++ b/data/tilesets/secondary/battle_pyramid/tiles.png
diff --git a/data/tilesets/secondary/battle_tent/tiles.png b/data/tilesets/secondary/battle_tent/tiles.png
index 919e3878f..35e5c4b65 100644
--- a/data/tilesets/secondary/battle_tent/tiles.png
+++ b/data/tilesets/secondary/battle_tent/tiles.png
diff --git a/data/tilesets/secondary/bike_shop/anim/0.png b/data/tilesets/secondary/bike_shop/anim/0.png
new file mode 100644
index 000000000..069509b27
--- /dev/null
+++ b/data/tilesets/secondary/bike_shop/anim/0.png
diff --git a/data/tilesets/secondary/bike_shop/anim/1.png b/data/tilesets/secondary/bike_shop/anim/1.png
new file mode 100644
index 000000000..4123bb0bf
--- /dev/null
+++ b/data/tilesets/secondary/bike_shop/anim/1.png
diff --git a/data/tilesets/secondary/bike_shop/anim/2.png b/data/tilesets/secondary/bike_shop/anim/2.png
new file mode 100644
index 000000000..7c463d9c3
--- /dev/null
+++ b/data/tilesets/secondary/bike_shop/anim/2.png
diff --git a/data/tilesets/secondary/bike_shop/tiles.png b/data/tilesets/secondary/bike_shop/tiles.png
index ec109c3be..e068538f5 100644
--- a/data/tilesets/secondary/bike_shop/tiles.png
+++ b/data/tilesets/secondary/bike_shop/tiles.png
diff --git a/data/tilesets/secondary/brendans_mays_house/tiles.png b/data/tilesets/secondary/brendans_mays_house/tiles.png
index 10163e9f1..6d6a5f047 100644
--- a/data/tilesets/secondary/brendans_mays_house/tiles.png
+++ b/data/tilesets/secondary/brendans_mays_house/tiles.png
diff --git a/data/tilesets/secondary/cable_club/tiles.png b/data/tilesets/secondary/cable_club/tiles.png
index 2b153c1f4..c5ad4cfac 100644
--- a/data/tilesets/secondary/cable_club/tiles.png
+++ b/data/tilesets/secondary/cable_club/tiles.png
diff --git a/data/tilesets/secondary/cable_club/unknown_tiles.png b/data/tilesets/secondary/cable_club/unknown_tiles.png
index da68cdff2..84e79f720 100644
--- a/data/tilesets/secondary/cable_club/unknown_tiles.png
+++ b/data/tilesets/secondary/cable_club/unknown_tiles.png
diff --git a/data/tilesets/secondary/cave/anim/0.png b/data/tilesets/secondary/cave/anim/0.png
new file mode 100644
index 000000000..67f294ffe
--- /dev/null
+++ b/data/tilesets/secondary/cave/anim/0.png
diff --git a/data/tilesets/secondary/cave/anim/1.png b/data/tilesets/secondary/cave/anim/1.png
new file mode 100644
index 000000000..9c92be807
--- /dev/null
+++ b/data/tilesets/secondary/cave/anim/1.png
diff --git a/data/tilesets/secondary/cave/anim/2.png b/data/tilesets/secondary/cave/anim/2.png
new file mode 100644
index 000000000..78ea00e04
--- /dev/null
+++ b/data/tilesets/secondary/cave/anim/2.png
diff --git a/data/tilesets/secondary/cave/anim/3.png b/data/tilesets/secondary/cave/anim/3.png
new file mode 100644
index 000000000..7edd52eaa
--- /dev/null
+++ b/data/tilesets/secondary/cave/anim/3.png
diff --git a/data/tilesets/secondary/cave/anim/unused/0.png b/data/tilesets/secondary/cave/anim/unused/0.png
new file mode 100644
index 000000000..44564e67a
--- /dev/null
+++ b/data/tilesets/secondary/cave/anim/unused/0.png
diff --git a/data/tilesets/secondary/cave/anim/unused/1.png b/data/tilesets/secondary/cave/anim/unused/1.png
new file mode 100644
index 000000000..47e7e17ee
--- /dev/null
+++ b/data/tilesets/secondary/cave/anim/unused/1.png
diff --git a/data/tilesets/secondary/cave/anim/unused/2.png b/data/tilesets/secondary/cave/anim/unused/2.png
new file mode 100644
index 000000000..d1447cde2
--- /dev/null
+++ b/data/tilesets/secondary/cave/anim/unused/2.png
diff --git a/data/tilesets/secondary/cave/anim/unused/3.png b/data/tilesets/secondary/cave/anim/unused/3.png
new file mode 100644
index 000000000..8ad81b1e1
--- /dev/null
+++ b/data/tilesets/secondary/cave/anim/unused/3.png
diff --git a/data/tilesets/secondary/cave/tiles.png b/data/tilesets/secondary/cave/tiles.png
index f905c6b21..e8c98dd71 100644
--- a/data/tilesets/secondary/cave/tiles.png
+++ b/data/tilesets/secondary/cave/tiles.png
diff --git a/data/tilesets/secondary/contest/tiles.png b/data/tilesets/secondary/contest/tiles.png
index 09ddee472..710654f5f 100644
--- a/data/tilesets/secondary/contest/tiles.png
+++ b/data/tilesets/secondary/contest/tiles.png
diff --git a/data/tilesets/secondary/dewford/anim/0.png b/data/tilesets/secondary/dewford/anim/0.png
new file mode 100644
index 000000000..adf42975f
--- /dev/null
+++ b/data/tilesets/secondary/dewford/anim/0.png
diff --git a/data/tilesets/secondary/dewford/anim/1.png b/data/tilesets/secondary/dewford/anim/1.png
new file mode 100644
index 000000000..6e7c23a18
--- /dev/null
+++ b/data/tilesets/secondary/dewford/anim/1.png
diff --git a/data/tilesets/secondary/dewford/anim/2.png b/data/tilesets/secondary/dewford/anim/2.png
new file mode 100644
index 000000000..86075ffb0
--- /dev/null
+++ b/data/tilesets/secondary/dewford/anim/2.png
diff --git a/data/tilesets/secondary/dewford/anim/3.png b/data/tilesets/secondary/dewford/anim/3.png
new file mode 100644
index 000000000..6e3c57621
--- /dev/null
+++ b/data/tilesets/secondary/dewford/anim/3.png
diff --git a/data/tilesets/secondary/dewford/tiles.png b/data/tilesets/secondary/dewford/tiles.png
index f79972197..1cf4c165c 100644
--- a/data/tilesets/secondary/dewford/tiles.png
+++ b/data/tilesets/secondary/dewford/tiles.png
diff --git a/data/tilesets/secondary/dewford_gym/tiles.png b/data/tilesets/secondary/dewford_gym/tiles.png
index 1dad6f205..7d923b505 100644
--- a/data/tilesets/secondary/dewford_gym/tiles.png
+++ b/data/tilesets/secondary/dewford_gym/tiles.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/0.png b/data/tilesets/secondary/elite_four/anim/0/0.png
new file mode 100644
index 000000000..806d26e57
--- /dev/null
+++ b/data/tilesets/secondary/elite_four/anim/0/0.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/1.png b/data/tilesets/secondary/elite_four/anim/0/1.png
new file mode 100644
index 000000000..2a8e6a31c
--- /dev/null
+++ b/data/tilesets/secondary/elite_four/anim/0/1.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/2.png b/data/tilesets/secondary/elite_four/anim/0/2.png
new file mode 100644
index 000000000..c4e6161a6
--- /dev/null
+++ b/data/tilesets/secondary/elite_four/anim/0/2.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/3.png b/data/tilesets/secondary/elite_four/anim/0/3.png
new file mode 100644
index 000000000..2a8e6a31c
--- /dev/null
+++ b/data/tilesets/secondary/elite_four/anim/0/3.png
diff --git a/data/tilesets/secondary/elite_four/anim/1/0.png b/data/tilesets/secondary/elite_four/anim/1/0.png
new file mode 100644
index 000000000..7822d1896
--- /dev/null
+++ b/data/tilesets/secondary/elite_four/anim/1/0.png
diff --git a/data/tilesets/secondary/elite_four/anim/1/1.png b/data/tilesets/secondary/elite_four/anim/1/1.png
new file mode 100644
index 000000000..66d60e90b
--- /dev/null
+++ b/data/tilesets/secondary/elite_four/anim/1/1.png
diff --git a/data/tilesets/secondary/elite_four/anim/1/2.png b/data/tilesets/secondary/elite_four/anim/1/2.png
new file mode 100644
index 000000000..09fb59fbf
--- /dev/null
+++ b/data/tilesets/secondary/elite_four/anim/1/2.png
diff --git a/data/tilesets/secondary/elite_four/anim/1/3.png b/data/tilesets/secondary/elite_four/anim/1/3.png
new file mode 100644
index 000000000..0c7c05034
--- /dev/null
+++ b/data/tilesets/secondary/elite_four/anim/1/3.png
diff --git a/data/tilesets/secondary/elite_four/anim/1/4.png b/data/tilesets/secondary/elite_four/anim/1/4.png
new file mode 100644
index 000000000..317db1714
--- /dev/null
+++ b/data/tilesets/secondary/elite_four/anim/1/4.png
diff --git a/data/tilesets/secondary/elite_four/anim/1/5.png b/data/tilesets/secondary/elite_four/anim/1/5.png
new file mode 100644
index 000000000..d0cbfeb57
--- /dev/null
+++ b/data/tilesets/secondary/elite_four/anim/1/5.png
diff --git a/data/tilesets/secondary/elite_four/anim/1/6.png b/data/tilesets/secondary/elite_four/anim/1/6.png
new file mode 100644
index 000000000..4b35ededd
--- /dev/null
+++ b/data/tilesets/secondary/elite_four/anim/1/6.png
diff --git a/data/tilesets/secondary/elite_four/anim/1/7.png b/data/tilesets/secondary/elite_four/anim/1/7.png
new file mode 100644
index 000000000..dfe698edb
--- /dev/null
+++ b/data/tilesets/secondary/elite_four/anim/1/7.png
diff --git a/data/tilesets/secondary/elite_four/tiles.png b/data/tilesets/secondary/elite_four/tiles.png
index 834be3701..d16b2db03 100644
--- a/data/tilesets/secondary/elite_four/tiles.png
+++ b/data/tilesets/secondary/elite_four/tiles.png
diff --git a/data/tilesets/secondary/ever_grande/anim/0.png b/data/tilesets/secondary/ever_grande/anim/0.png
new file mode 100644
index 000000000..7536d08ad
--- /dev/null
+++ b/data/tilesets/secondary/ever_grande/anim/0.png
diff --git a/data/tilesets/secondary/ever_grande/anim/1.png b/data/tilesets/secondary/ever_grande/anim/1.png
new file mode 100644
index 000000000..7536d08ad
--- /dev/null
+++ b/data/tilesets/secondary/ever_grande/anim/1.png
diff --git a/data/tilesets/secondary/ever_grande/anim/2.png b/data/tilesets/secondary/ever_grande/anim/2.png
new file mode 100644
index 000000000..f0835aa3b
--- /dev/null
+++ b/data/tilesets/secondary/ever_grande/anim/2.png
diff --git a/data/tilesets/secondary/ever_grande/anim/3.png b/data/tilesets/secondary/ever_grande/anim/3.png
new file mode 100644
index 000000000..c07cbbd17
--- /dev/null
+++ b/data/tilesets/secondary/ever_grande/anim/3.png
diff --git a/data/tilesets/secondary/ever_grande/anim/4.png b/data/tilesets/secondary/ever_grande/anim/4.png
new file mode 100644
index 000000000..7536d08ad
--- /dev/null
+++ b/data/tilesets/secondary/ever_grande/anim/4.png
diff --git a/data/tilesets/secondary/ever_grande/anim/5.png b/data/tilesets/secondary/ever_grande/anim/5.png
new file mode 100644
index 000000000..7536d08ad
--- /dev/null
+++ b/data/tilesets/secondary/ever_grande/anim/5.png
diff --git a/data/tilesets/secondary/ever_grande/anim/6.png b/data/tilesets/secondary/ever_grande/anim/6.png
new file mode 100644
index 000000000..9b5030306
--- /dev/null
+++ b/data/tilesets/secondary/ever_grande/anim/6.png
diff --git a/data/tilesets/secondary/ever_grande/anim/7.png b/data/tilesets/secondary/ever_grande/anim/7.png
new file mode 100644
index 000000000..9b5030306
--- /dev/null
+++ b/data/tilesets/secondary/ever_grande/anim/7.png
diff --git a/data/tilesets/secondary/ever_grande/tiles.png b/data/tilesets/secondary/ever_grande/tiles.png
index 0f3689c24..943a3f8f4 100644
--- a/data/tilesets/secondary/ever_grande/tiles.png
+++ b/data/tilesets/secondary/ever_grande/tiles.png
diff --git a/data/tilesets/secondary/facility/tiles.png b/data/tilesets/secondary/facility/tiles.png
index 5585dee3b..f99c24150 100644
--- a/data/tilesets/secondary/facility/tiles.png
+++ b/data/tilesets/secondary/facility/tiles.png
diff --git a/data/tilesets/secondary/fallarbor/tiles.png b/data/tilesets/secondary/fallarbor/tiles.png
index 4c5d72277..21ab321ef 100644
--- a/data/tilesets/secondary/fallarbor/tiles.png
+++ b/data/tilesets/secondary/fallarbor/tiles.png
diff --git a/data/tilesets/secondary/fortree/tiles.png b/data/tilesets/secondary/fortree/tiles.png
index 0875d1d47..78cb1c1ae 100644
--- a/data/tilesets/secondary/fortree/tiles.png
+++ b/data/tilesets/secondary/fortree/tiles.png
diff --git a/data/tilesets/secondary/fortree_gym/tiles.png b/data/tilesets/secondary/fortree_gym/tiles.png
index bb16dd0ca..932b5c06a 100644
--- a/data/tilesets/secondary/fortree_gym/tiles.png
+++ b/data/tilesets/secondary/fortree_gym/tiles.png
diff --git a/data/tilesets/secondary/generic_building/tiles.png b/data/tilesets/secondary/generic_building/tiles.png
index d94085b06..6f681f837 100644
--- a/data/tilesets/secondary/generic_building/tiles.png
+++ b/data/tilesets/secondary/generic_building/tiles.png
diff --git a/data/tilesets/secondary/inside_of_truck/tiles.png b/data/tilesets/secondary/inside_of_truck/tiles.png
index 44f923a5a..65a82e888 100644
--- a/data/tilesets/secondary/inside_of_truck/tiles.png
+++ b/data/tilesets/secondary/inside_of_truck/tiles.png
diff --git a/data/tilesets/secondary/inside_ship/tiles.png b/data/tilesets/secondary/inside_ship/tiles.png
index d4b0471b2..77142a755 100644
--- a/data/tilesets/secondary/inside_ship/tiles.png
+++ b/data/tilesets/secondary/inside_ship/tiles.png
diff --git a/data/tilesets/secondary/island_harbor/tiles.png b/data/tilesets/secondary/island_harbor/tiles.png
index e70a72977..82e419e72 100644
--- a/data/tilesets/secondary/island_harbor/tiles.png
+++ b/data/tilesets/secondary/island_harbor/tiles.png
diff --git a/data/tilesets/secondary/lab/tiles.png b/data/tilesets/secondary/lab/tiles.png
index c2a86a73d..6a213d960 100644
--- a/data/tilesets/secondary/lab/tiles.png
+++ b/data/tilesets/secondary/lab/tiles.png
diff --git a/data/tilesets/secondary/lavaridge/anim/0.png b/data/tilesets/secondary/lavaridge/anim/0.png
new file mode 100644
index 000000000..303855f71
--- /dev/null
+++ b/data/tilesets/secondary/lavaridge/anim/0.png
diff --git a/data/tilesets/secondary/lavaridge/anim/1.png b/data/tilesets/secondary/lavaridge/anim/1.png
new file mode 100644
index 000000000..7cdee79e2
--- /dev/null
+++ b/data/tilesets/secondary/lavaridge/anim/1.png
diff --git a/data/tilesets/secondary/lavaridge/anim/2.png b/data/tilesets/secondary/lavaridge/anim/2.png
new file mode 100644
index 000000000..b5810b806
--- /dev/null
+++ b/data/tilesets/secondary/lavaridge/anim/2.png
diff --git a/data/tilesets/secondary/lavaridge/anim/3.png b/data/tilesets/secondary/lavaridge/anim/3.png
new file mode 100644
index 000000000..caf7b5698
--- /dev/null
+++ b/data/tilesets/secondary/lavaridge/anim/3.png
diff --git a/data/tilesets/secondary/lavaridge/tiles.png b/data/tilesets/secondary/lavaridge/tiles.png
index 4886aa28e..896c43194 100644
--- a/data/tilesets/secondary/lavaridge/tiles.png
+++ b/data/tilesets/secondary/lavaridge/tiles.png
diff --git a/data/tilesets/secondary/lavaridge_gym/tiles.png b/data/tilesets/secondary/lavaridge_gym/tiles.png
index 0865ea207..8734cc3bf 100644
--- a/data/tilesets/secondary/lavaridge_gym/tiles.png
+++ b/data/tilesets/secondary/lavaridge_gym/tiles.png
diff --git a/data/tilesets/secondary/lilycove/tiles.png b/data/tilesets/secondary/lilycove/tiles.png
index 88c5c7a28..b77f3d379 100644
--- a/data/tilesets/secondary/lilycove/tiles.png
+++ b/data/tilesets/secondary/lilycove/tiles.png
diff --git a/data/tilesets/secondary/lilycove_museum/tiles.png b/data/tilesets/secondary/lilycove_museum/tiles.png
index 495187301..5bcc0ecfe 100644
--- a/data/tilesets/secondary/lilycove_museum/tiles.png
+++ b/data/tilesets/secondary/lilycove_museum/tiles.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/0.png b/data/tilesets/secondary/mauville/anim/0/a/0.png
new file mode 100644
index 000000000..88b028b52
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/a/0.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/1.png b/data/tilesets/secondary/mauville/anim/0/a/1.png
new file mode 100644
index 000000000..ce4010db2
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/a/1.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/2.png b/data/tilesets/secondary/mauville/anim/0/a/2.png
new file mode 100644
index 000000000..5ea20f6db
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/a/2.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/3.png b/data/tilesets/secondary/mauville/anim/0/a/3.png
new file mode 100644
index 000000000..fdf4d30bf
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/a/3.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/4.png b/data/tilesets/secondary/mauville/anim/0/a/4.png
new file mode 100644
index 000000000..c8097808c
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/a/4.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/5.png b/data/tilesets/secondary/mauville/anim/0/a/5.png
new file mode 100644
index 000000000..88b028b52
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/a/5.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/6.png b/data/tilesets/secondary/mauville/anim/0/a/6.png
new file mode 100644
index 000000000..ce4010db2
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/a/6.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/7.png b/data/tilesets/secondary/mauville/anim/0/a/7.png
new file mode 100644
index 000000000..5ea20f6db
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/a/7.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/8.png b/data/tilesets/secondary/mauville/anim/0/a/8.png
new file mode 100644
index 000000000..fdf4d30bf
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/a/8.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/9.png b/data/tilesets/secondary/mauville/anim/0/a/9.png
new file mode 100644
index 000000000..c8097808c
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/a/9.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/0.png b/data/tilesets/secondary/mauville/anim/0/b/0.png
new file mode 100644
index 000000000..88b028b52
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/b/0.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/1.png b/data/tilesets/secondary/mauville/anim/0/b/1.png
new file mode 100644
index 000000000..ce4010db2
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/b/1.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/2.png b/data/tilesets/secondary/mauville/anim/0/b/2.png
new file mode 100644
index 000000000..5ea20f6db
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/b/2.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/3.png b/data/tilesets/secondary/mauville/anim/0/b/3.png
new file mode 100644
index 000000000..fdf4d30bf
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/b/3.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/4.png b/data/tilesets/secondary/mauville/anim/0/b/4.png
new file mode 100644
index 000000000..91f368cf8
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/b/4.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/5.png b/data/tilesets/secondary/mauville/anim/0/b/5.png
new file mode 100644
index 000000000..91f368cf8
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/b/5.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/6.png b/data/tilesets/secondary/mauville/anim/0/b/6.png
new file mode 100644
index 000000000..91f368cf8
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/b/6.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/7.png b/data/tilesets/secondary/mauville/anim/0/b/7.png
new file mode 100644
index 000000000..91f368cf8
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/0/b/7.png
diff --git a/data/tilesets/secondary/mauville/anim/1/a/0.png b/data/tilesets/secondary/mauville/anim/1/a/0.png
new file mode 100644
index 000000000..88b028b52
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/1/a/0.png
diff --git a/data/tilesets/secondary/mauville/anim/1/a/1.png b/data/tilesets/secondary/mauville/anim/1/a/1.png
new file mode 100644
index 000000000..c8097808c
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/1/a/1.png
diff --git a/data/tilesets/secondary/mauville/anim/1/a/2.png b/data/tilesets/secondary/mauville/anim/1/a/2.png
new file mode 100644
index 000000000..5ea20f6db
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/1/a/2.png
diff --git a/data/tilesets/secondary/mauville/anim/1/a/3.png b/data/tilesets/secondary/mauville/anim/1/a/3.png
new file mode 100644
index 000000000..fdf4d30bf
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/1/a/3.png
diff --git a/data/tilesets/secondary/mauville/anim/1/b/0.png b/data/tilesets/secondary/mauville/anim/1/b/0.png
new file mode 100644
index 000000000..88b028b52
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/1/b/0.png
diff --git a/data/tilesets/secondary/mauville/anim/1/b/1.png b/data/tilesets/secondary/mauville/anim/1/b/1.png
new file mode 100644
index 000000000..c8097808c
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/1/b/1.png
diff --git a/data/tilesets/secondary/mauville/anim/1/b/2.png b/data/tilesets/secondary/mauville/anim/1/b/2.png
new file mode 100644
index 000000000..5ea20f6db
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/1/b/2.png
diff --git a/data/tilesets/secondary/mauville/anim/1/b/3.png b/data/tilesets/secondary/mauville/anim/1/b/3.png
new file mode 100644
index 000000000..fdf4d30bf
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/1/b/3.png
diff --git a/data/tilesets/secondary/mauville/anim/1/b/4.png b/data/tilesets/secondary/mauville/anim/1/b/4.png
new file mode 100644
index 000000000..44564e67a
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/1/b/4.png
diff --git a/data/tilesets/secondary/mauville/anim/1/b/5.png b/data/tilesets/secondary/mauville/anim/1/b/5.png
new file mode 100644
index 000000000..47e7e17ee
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/1/b/5.png
diff --git a/data/tilesets/secondary/mauville/anim/1/b/6.png b/data/tilesets/secondary/mauville/anim/1/b/6.png
new file mode 100644
index 000000000..d1447cde2
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/1/b/6.png
diff --git a/data/tilesets/secondary/mauville/anim/1/b/7.png b/data/tilesets/secondary/mauville/anim/1/b/7.png
new file mode 100644
index 000000000..8ad81b1e1
--- /dev/null
+++ b/data/tilesets/secondary/mauville/anim/1/b/7.png
diff --git a/data/tilesets/secondary/mauville/tiles.png b/data/tilesets/secondary/mauville/tiles.png
index a015fe5b4..e4ce0d4f8 100644
--- a/data/tilesets/secondary/mauville/tiles.png
+++ b/data/tilesets/secondary/mauville/tiles.png
diff --git a/data/tilesets/secondary/mauville_game_corner/tiles.png b/data/tilesets/secondary/mauville_game_corner/tiles.png
index c8f0dd1ee..3f7f565c9 100644
--- a/data/tilesets/secondary/mauville_game_corner/tiles.png
+++ b/data/tilesets/secondary/mauville_game_corner/tiles.png
diff --git a/data/tilesets/secondary/mauville_gym/anim/0.png b/data/tilesets/secondary/mauville_gym/anim/0.png
new file mode 100644
index 000000000..090fe6a1a
--- /dev/null
+++ b/data/tilesets/secondary/mauville_gym/anim/0.png
diff --git a/data/tilesets/secondary/mauville_gym/anim/1.png b/data/tilesets/secondary/mauville_gym/anim/1.png
new file mode 100644
index 000000000..48f325890
--- /dev/null
+++ b/data/tilesets/secondary/mauville_gym/anim/1.png
diff --git a/data/tilesets/secondary/mauville_gym/anim/2.png b/data/tilesets/secondary/mauville_gym/anim/2.png
new file mode 100644
index 000000000..16652df19
--- /dev/null
+++ b/data/tilesets/secondary/mauville_gym/anim/2.png
diff --git a/data/tilesets/secondary/mauville_gym/anim/3.png b/data/tilesets/secondary/mauville_gym/anim/3.png
new file mode 100644
index 000000000..8ea7a49e6
--- /dev/null
+++ b/data/tilesets/secondary/mauville_gym/anim/3.png
diff --git a/data/tilesets/secondary/mauville_gym/tiles.png b/data/tilesets/secondary/mauville_gym/tiles.png
index d710d2e40..5606bb101 100644
--- a/data/tilesets/secondary/mauville_gym/tiles.png
+++ b/data/tilesets/secondary/mauville_gym/tiles.png
diff --git a/data/tilesets/secondary/meteor_falls/tiles.png b/data/tilesets/secondary/meteor_falls/tiles.png
index 5b0342f9b..9c7532805 100644
--- a/data/tilesets/secondary/meteor_falls/tiles.png
+++ b/data/tilesets/secondary/meteor_falls/tiles.png
diff --git a/data/tilesets/secondary/mirage_tower/tiles.png b/data/tilesets/secondary/mirage_tower/tiles.png
index 8eab57f93..fd2904ca1 100644
--- a/data/tilesets/secondary/mirage_tower/tiles.png
+++ b/data/tilesets/secondary/mirage_tower/tiles.png
diff --git a/data/tilesets/secondary/mossdeep/tiles.png b/data/tilesets/secondary/mossdeep/tiles.png
index 1933b8983..818406b23 100644
--- a/data/tilesets/secondary/mossdeep/tiles.png
+++ b/data/tilesets/secondary/mossdeep/tiles.png
diff --git a/data/tilesets/secondary/mossdeep_game_corner/tiles.png b/data/tilesets/secondary/mossdeep_game_corner/tiles.png
index 379c4f42f..f09edf436 100644
--- a/data/tilesets/secondary/mossdeep_game_corner/tiles.png
+++ b/data/tilesets/secondary/mossdeep_game_corner/tiles.png
diff --git a/data/tilesets/secondary/mossdeep_gym/tiles.png b/data/tilesets/secondary/mossdeep_gym/tiles.png
index 919d0334e..36a0873a4 100644
--- a/data/tilesets/secondary/mossdeep_gym/tiles.png
+++ b/data/tilesets/secondary/mossdeep_gym/tiles.png
diff --git a/data/tilesets/secondary/mystery_events_house/tiles.png b/data/tilesets/secondary/mystery_events_house/tiles.png
index 1f5f8639b..5afa07fcf 100644
--- a/data/tilesets/secondary/mystery_events_house/tiles.png
+++ b/data/tilesets/secondary/mystery_events_house/tiles.png
diff --git a/data/tilesets/secondary/navel_rock/tiles.png b/data/tilesets/secondary/navel_rock/tiles.png
index 06d8065f1..ffbc04584 100644
--- a/data/tilesets/secondary/navel_rock/tiles.png
+++ b/data/tilesets/secondary/navel_rock/tiles.png
diff --git a/data/tilesets/secondary/oceanic_museum/tiles.png b/data/tilesets/secondary/oceanic_museum/tiles.png
index 25a20d586..a074d4a05 100644
--- a/data/tilesets/secondary/oceanic_museum/tiles.png
+++ b/data/tilesets/secondary/oceanic_museum/tiles.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/0/0.png b/data/tilesets/secondary/pacifidlog/anim/0/0.png
new file mode 100644
index 000000000..e7bcfd743
--- /dev/null
+++ b/data/tilesets/secondary/pacifidlog/anim/0/0.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/0/1.png b/data/tilesets/secondary/pacifidlog/anim/0/1.png
new file mode 100644
index 000000000..dde024f6e
--- /dev/null
+++ b/data/tilesets/secondary/pacifidlog/anim/0/1.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/0/2.png b/data/tilesets/secondary/pacifidlog/anim/0/2.png
new file mode 100644
index 000000000..1a4cea24d
--- /dev/null
+++ b/data/tilesets/secondary/pacifidlog/anim/0/2.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/0.png b/data/tilesets/secondary/pacifidlog/anim/1/0.png
new file mode 100644
index 000000000..beb8ee82d
--- /dev/null
+++ b/data/tilesets/secondary/pacifidlog/anim/1/0.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/1.png b/data/tilesets/secondary/pacifidlog/anim/1/1.png
new file mode 100644
index 000000000..594655120
--- /dev/null
+++ b/data/tilesets/secondary/pacifidlog/anim/1/1.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/2.png b/data/tilesets/secondary/pacifidlog/anim/1/2.png
new file mode 100644
index 000000000..747306d5c
--- /dev/null
+++ b/data/tilesets/secondary/pacifidlog/anim/1/2.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/3.png b/data/tilesets/secondary/pacifidlog/anim/1/3.png
new file mode 100644
index 000000000..20e0a7cdd
--- /dev/null
+++ b/data/tilesets/secondary/pacifidlog/anim/1/3.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/4.png b/data/tilesets/secondary/pacifidlog/anim/1/4.png
new file mode 100644
index 000000000..7b74ee349
--- /dev/null
+++ b/data/tilesets/secondary/pacifidlog/anim/1/4.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/5.png b/data/tilesets/secondary/pacifidlog/anim/1/5.png
new file mode 100644
index 000000000..b135bdfbe
--- /dev/null
+++ b/data/tilesets/secondary/pacifidlog/anim/1/5.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/6.png b/data/tilesets/secondary/pacifidlog/anim/1/6.png
new file mode 100644
index 000000000..4eae151e6
--- /dev/null
+++ b/data/tilesets/secondary/pacifidlog/anim/1/6.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/7.png b/data/tilesets/secondary/pacifidlog/anim/1/7.png
new file mode 100644
index 000000000..f1863fdd5
--- /dev/null
+++ b/data/tilesets/secondary/pacifidlog/anim/1/7.png
diff --git a/data/tilesets/secondary/pacifidlog/tiles.png b/data/tilesets/secondary/pacifidlog/tiles.png
index 496232735..94fe6d96b 100644
--- a/data/tilesets/secondary/pacifidlog/tiles.png
+++ b/data/tilesets/secondary/pacifidlog/tiles.png
diff --git a/data/tilesets/secondary/petalburg/tiles.png b/data/tilesets/secondary/petalburg/tiles.png
index 97e8bf187..dd0e23ca4 100644
--- a/data/tilesets/secondary/petalburg/tiles.png
+++ b/data/tilesets/secondary/petalburg/tiles.png
diff --git a/data/tilesets/secondary/petalburg_gym/tiles.png b/data/tilesets/secondary/petalburg_gym/tiles.png
index 8c996f701..cb7c40e5a 100644
--- a/data/tilesets/secondary/petalburg_gym/tiles.png
+++ b/data/tilesets/secondary/petalburg_gym/tiles.png
diff --git a/data/tilesets/secondary/pokemon_center/tiles.png b/data/tilesets/secondary/pokemon_center/tiles.png
index 826da07bf..673746c5a 100644
--- a/data/tilesets/secondary/pokemon_center/tiles.png
+++ b/data/tilesets/secondary/pokemon_center/tiles.png
diff --git a/data/tilesets/secondary/pokemon_day_care/tiles.png b/data/tilesets/secondary/pokemon_day_care/tiles.png
index eab49af32..76cd9ab96 100644
--- a/data/tilesets/secondary/pokemon_day_care/tiles.png
+++ b/data/tilesets/secondary/pokemon_day_care/tiles.png
diff --git a/data/tilesets/secondary/pokemon_fan_club/tiles.png b/data/tilesets/secondary/pokemon_fan_club/tiles.png
index 2714292f0..62dd0f03f 100644
--- a/data/tilesets/secondary/pokemon_fan_club/tiles.png
+++ b/data/tilesets/secondary/pokemon_fan_club/tiles.png
diff --git a/data/tilesets/secondary/pokemon_school/tiles.png b/data/tilesets/secondary/pokemon_school/tiles.png
index 3c8c4dffe..20e3f32c8 100644
--- a/data/tilesets/secondary/pokemon_school/tiles.png
+++ b/data/tilesets/secondary/pokemon_school/tiles.png
diff --git a/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png b/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png
index 7a9e44935..f10306e7a 100644
--- a/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png
+++ b/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/0.png b/data/tilesets/secondary/rustboro/anim/0/0.png
new file mode 100644
index 000000000..358745e4b
--- /dev/null
+++ b/data/tilesets/secondary/rustboro/anim/0/0.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/1.png b/data/tilesets/secondary/rustboro/anim/0/1.png
new file mode 100644
index 000000000..f5a095b15
--- /dev/null
+++ b/data/tilesets/secondary/rustboro/anim/0/1.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/2.png b/data/tilesets/secondary/rustboro/anim/0/2.png
new file mode 100644
index 000000000..91f368cf8
--- /dev/null
+++ b/data/tilesets/secondary/rustboro/anim/0/2.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/3.png b/data/tilesets/secondary/rustboro/anim/0/3.png
new file mode 100644
index 000000000..91f368cf8
--- /dev/null
+++ b/data/tilesets/secondary/rustboro/anim/0/3.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/4.png b/data/tilesets/secondary/rustboro/anim/0/4.png
new file mode 100644
index 000000000..91f368cf8
--- /dev/null
+++ b/data/tilesets/secondary/rustboro/anim/0/4.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/5.png b/data/tilesets/secondary/rustboro/anim/0/5.png
new file mode 100644
index 000000000..91f368cf8
--- /dev/null
+++ b/data/tilesets/secondary/rustboro/anim/0/5.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/6.png b/data/tilesets/secondary/rustboro/anim/0/6.png
new file mode 100644
index 000000000..91f368cf8
--- /dev/null
+++ b/data/tilesets/secondary/rustboro/anim/0/6.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/7.png b/data/tilesets/secondary/rustboro/anim/0/7.png
new file mode 100644
index 000000000..91f368cf8
--- /dev/null
+++ b/data/tilesets/secondary/rustboro/anim/0/7.png
diff --git a/data/tilesets/secondary/rustboro/anim/1/0.png b/data/tilesets/secondary/rustboro/anim/1/0.png
new file mode 100644
index 000000000..75bd2f8a4
--- /dev/null
+++ b/data/tilesets/secondary/rustboro/anim/1/0.png
diff --git a/data/tilesets/secondary/rustboro/anim/1/1.png b/data/tilesets/secondary/rustboro/anim/1/1.png
new file mode 100644
index 000000000..9f8b3a02f
--- /dev/null
+++ b/data/tilesets/secondary/rustboro/anim/1/1.png
diff --git a/data/tilesets/secondary/rustboro/anim/1/2.png b/data/tilesets/secondary/rustboro/anim/1/2.png
new file mode 100644
index 000000000..86075ffb0
--- /dev/null
+++ b/data/tilesets/secondary/rustboro/anim/1/2.png
diff --git a/data/tilesets/secondary/rustboro/anim/1/3.png b/data/tilesets/secondary/rustboro/anim/1/3.png
new file mode 100644
index 000000000..6e3c57621
--- /dev/null
+++ b/data/tilesets/secondary/rustboro/anim/1/3.png
diff --git a/data/tilesets/secondary/rustboro/tiles.png b/data/tilesets/secondary/rustboro/tiles.png
index 8cea2a4d9..fbfc72d46 100644
--- a/data/tilesets/secondary/rustboro/tiles.png
+++ b/data/tilesets/secondary/rustboro/tiles.png
diff --git a/data/tilesets/secondary/rustboro_gym/tiles.png b/data/tilesets/secondary/rustboro_gym/tiles.png
index bfdc07c07..d4ebc14a1 100644
--- a/data/tilesets/secondary/rustboro_gym/tiles.png
+++ b/data/tilesets/secondary/rustboro_gym/tiles.png
diff --git a/data/tilesets/secondary/rusturf_tunnel/tiles.png b/data/tilesets/secondary/rusturf_tunnel/tiles.png
index dc947bcc5..913935f77 100644
--- a/data/tilesets/secondary/rusturf_tunnel/tiles.png
+++ b/data/tilesets/secondary/rusturf_tunnel/tiles.png
diff --git a/data/tilesets/secondary/seashore_house/tiles.png b/data/tilesets/secondary/seashore_house/tiles.png
index 695f83037..ea48f5006 100644
--- a/data/tilesets/secondary/seashore_house/tiles.png
+++ b/data/tilesets/secondary/seashore_house/tiles.png
diff --git a/data/tilesets/secondary/secret_base/blue_cave/tiles.png b/data/tilesets/secondary/secret_base/blue_cave/tiles.png
index 207e8d845..9d820463b 100644
--- a/data/tilesets/secondary/secret_base/blue_cave/tiles.png
+++ b/data/tilesets/secondary/secret_base/blue_cave/tiles.png
diff --git a/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png
new file mode 100644
index 000000000..1e42fed54
--- /dev/null
+++ b/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png
diff --git a/data/tilesets/secondary/secret_base/brown_cave/tiles.png b/data/tilesets/secondary/secret_base/brown_cave/tiles.png
index 7888f8cc2..a1c8bfe72 100644
--- a/data/tilesets/secondary/secret_base/brown_cave/tiles.png
+++ b/data/tilesets/secondary/secret_base/brown_cave/tiles.png
diff --git a/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png
new file mode 100644
index 000000000..dfd187d51
--- /dev/null
+++ b/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png
diff --git a/data/tilesets/secondary/secret_base/red_cave/tiles.png b/data/tilesets/secondary/secret_base/red_cave/tiles.png
index 5c21865e2..2652f6bbf 100644
--- a/data/tilesets/secondary/secret_base/red_cave/tiles.png
+++ b/data/tilesets/secondary/secret_base/red_cave/tiles.png
diff --git a/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png
new file mode 100644
index 000000000..5cfebd309
--- /dev/null
+++ b/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png
diff --git a/data/tilesets/secondary/secret_base/shrub/tiles.png b/data/tilesets/secondary/secret_base/shrub/tiles.png
index 2e0a6d028..692141b04 100644
--- a/data/tilesets/secondary/secret_base/shrub/tiles.png
+++ b/data/tilesets/secondary/secret_base/shrub/tiles.png
diff --git a/data/tilesets/secondary/secret_base/shrub/unused_tiles.png b/data/tilesets/secondary/secret_base/shrub/unused_tiles.png
new file mode 100644
index 000000000..461d620ae
--- /dev/null
+++ b/data/tilesets/secondary/secret_base/shrub/unused_tiles.png
diff --git a/data/tilesets/secondary/secret_base/tree/tiles.png b/data/tilesets/secondary/secret_base/tree/tiles.png
index 83ddd6144..94887cc1f 100644
--- a/data/tilesets/secondary/secret_base/tree/tiles.png
+++ b/data/tilesets/secondary/secret_base/tree/tiles.png
diff --git a/data/tilesets/secondary/secret_base/tree/unused_tiles.png b/data/tilesets/secondary/secret_base/tree/unused_tiles.png
new file mode 100644
index 000000000..567cf7800
--- /dev/null
+++ b/data/tilesets/secondary/secret_base/tree/unused_tiles.png
diff --git a/data/tilesets/secondary/secret_base/yellow_cave/tiles.png b/data/tilesets/secondary/secret_base/yellow_cave/tiles.png
index e8386a804..b171b5ec6 100644
--- a/data/tilesets/secondary/secret_base/yellow_cave/tiles.png
+++ b/data/tilesets/secondary/secret_base/yellow_cave/tiles.png
diff --git a/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png
new file mode 100644
index 000000000..f825201cc
--- /dev/null
+++ b/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png
diff --git a/data/tilesets/secondary/shop/tiles.png b/data/tilesets/secondary/shop/tiles.png
index 31e3c5319..f253a2e53 100644
--- a/data/tilesets/secondary/shop/tiles.png
+++ b/data/tilesets/secondary/shop/tiles.png
diff --git a/data/tilesets/secondary/slateport/anim/0.png b/data/tilesets/secondary/slateport/anim/0.png
new file mode 100644
index 000000000..ef62c4143
--- /dev/null
+++ b/data/tilesets/secondary/slateport/anim/0.png
diff --git a/data/tilesets/secondary/slateport/anim/1.png b/data/tilesets/secondary/slateport/anim/1.png
new file mode 100644
index 000000000..9b926bdfc
--- /dev/null
+++ b/data/tilesets/secondary/slateport/anim/1.png
diff --git a/data/tilesets/secondary/slateport/anim/2.png b/data/tilesets/secondary/slateport/anim/2.png
new file mode 100644
index 000000000..c5974f105
--- /dev/null
+++ b/data/tilesets/secondary/slateport/anim/2.png
diff --git a/data/tilesets/secondary/slateport/anim/3.png b/data/tilesets/secondary/slateport/anim/3.png
new file mode 100644
index 000000000..9b926bdfc
--- /dev/null
+++ b/data/tilesets/secondary/slateport/anim/3.png
diff --git a/data/tilesets/secondary/slateport/tiles.png b/data/tilesets/secondary/slateport/tiles.png
index f89ca2b0c..d8661b99a 100644
--- a/data/tilesets/secondary/slateport/tiles.png
+++ b/data/tilesets/secondary/slateport/tiles.png
diff --git a/data/tilesets/secondary/sootopolis/anim/0.png b/data/tilesets/secondary/sootopolis/anim/0.png
new file mode 100644
index 000000000..63f97ad47
--- /dev/null
+++ b/data/tilesets/secondary/sootopolis/anim/0.png
diff --git a/data/tilesets/secondary/sootopolis/anim/1.png b/data/tilesets/secondary/sootopolis/anim/1.png
new file mode 100644
index 000000000..aa14ec04a
--- /dev/null
+++ b/data/tilesets/secondary/sootopolis/anim/1.png
diff --git a/data/tilesets/secondary/sootopolis/anim/2.png b/data/tilesets/secondary/sootopolis/anim/2.png
new file mode 100644
index 000000000..09fb59fbf
--- /dev/null
+++ b/data/tilesets/secondary/sootopolis/anim/2.png
diff --git a/data/tilesets/secondary/sootopolis/anim/3.png b/data/tilesets/secondary/sootopolis/anim/3.png
new file mode 100644
index 000000000..0c7c05034
--- /dev/null
+++ b/data/tilesets/secondary/sootopolis/anim/3.png
diff --git a/data/tilesets/secondary/sootopolis/anim/4.png b/data/tilesets/secondary/sootopolis/anim/4.png
new file mode 100644
index 000000000..317db1714
--- /dev/null
+++ b/data/tilesets/secondary/sootopolis/anim/4.png
diff --git a/data/tilesets/secondary/sootopolis/anim/5.png b/data/tilesets/secondary/sootopolis/anim/5.png
new file mode 100644
index 000000000..d0cbfeb57
--- /dev/null
+++ b/data/tilesets/secondary/sootopolis/anim/5.png
diff --git a/data/tilesets/secondary/sootopolis/anim/6.png b/data/tilesets/secondary/sootopolis/anim/6.png
new file mode 100644
index 000000000..4b35ededd
--- /dev/null
+++ b/data/tilesets/secondary/sootopolis/anim/6.png
diff --git a/data/tilesets/secondary/sootopolis/anim/7.png b/data/tilesets/secondary/sootopolis/anim/7.png
new file mode 100644
index 000000000..dfe698edb
--- /dev/null
+++ b/data/tilesets/secondary/sootopolis/anim/7.png
diff --git a/data/tilesets/secondary/sootopolis/tiles.png b/data/tilesets/secondary/sootopolis/tiles.png
index 5e9866821..92df774ae 100644
--- a/data/tilesets/secondary/sootopolis/tiles.png
+++ b/data/tilesets/secondary/sootopolis/tiles.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png b/data/tilesets/secondary/sootopolis_gym/anim/0/0.png
new file mode 100644
index 000000000..f0ec1ac00
--- /dev/null
+++ b/data/tilesets/secondary/sootopolis_gym/anim/0/0.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png b/data/tilesets/secondary/sootopolis_gym/anim/0/1.png
new file mode 100644
index 000000000..4fefe4598
--- /dev/null
+++ b/data/tilesets/secondary/sootopolis_gym/anim/0/1.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png b/data/tilesets/secondary/sootopolis_gym/anim/0/2.png
new file mode 100644
index 000000000..f603b3046
--- /dev/null
+++ b/data/tilesets/secondary/sootopolis_gym/anim/0/2.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/3.png b/data/tilesets/secondary/sootopolis_gym/anim/0/3.png
new file mode 100644
index 000000000..2a8e6a31c
--- /dev/null
+++ b/data/tilesets/secondary/sootopolis_gym/anim/0/3.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png b/data/tilesets/secondary/sootopolis_gym/anim/1/0.png
new file mode 100644
index 000000000..e0f807ef4
--- /dev/null
+++ b/data/tilesets/secondary/sootopolis_gym/anim/1/0.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png b/data/tilesets/secondary/sootopolis_gym/anim/1/1.png
new file mode 100644
index 000000000..08413b63c
--- /dev/null
+++ b/data/tilesets/secondary/sootopolis_gym/anim/1/1.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png b/data/tilesets/secondary/sootopolis_gym/anim/1/2.png
new file mode 100644
index 000000000..6681b5e96
--- /dev/null
+++ b/data/tilesets/secondary/sootopolis_gym/anim/1/2.png
diff --git a/data/tilesets/secondary/sootopolis_gym/tiles.png b/data/tilesets/secondary/sootopolis_gym/tiles.png
index b2533b243..4f6b25769 100644
--- a/data/tilesets/secondary/sootopolis_gym/tiles.png
+++ b/data/tilesets/secondary/sootopolis_gym/tiles.png
diff --git a/data/tilesets/secondary/trainer_hill/tiles.png b/data/tilesets/secondary/trainer_hill/tiles.png
index f5330af84..78d292513 100644
--- a/data/tilesets/secondary/trainer_hill/tiles.png
+++ b/data/tilesets/secondary/trainer_hill/tiles.png
diff --git a/data/tilesets/secondary/trick_house_puzzle/tiles.png b/data/tilesets/secondary/trick_house_puzzle/tiles.png
index eb81554cc..5ef1bf9ca 100644
--- a/data/tilesets/secondary/trick_house_puzzle/tiles.png
+++ b/data/tilesets/secondary/trick_house_puzzle/tiles.png
diff --git a/data/tilesets/secondary/underwater/anim/0.png b/data/tilesets/secondary/underwater/anim/0.png
new file mode 100644
index 000000000..7609cc82a
--- /dev/null
+++ b/data/tilesets/secondary/underwater/anim/0.png
diff --git a/data/tilesets/secondary/underwater/anim/1.png b/data/tilesets/secondary/underwater/anim/1.png
new file mode 100644
index 000000000..64cddd371
--- /dev/null
+++ b/data/tilesets/secondary/underwater/anim/1.png
diff --git a/data/tilesets/secondary/underwater/anim/2.png b/data/tilesets/secondary/underwater/anim/2.png
new file mode 100644
index 000000000..ff6ff8437
--- /dev/null
+++ b/data/tilesets/secondary/underwater/anim/2.png
diff --git a/data/tilesets/secondary/underwater/anim/3.png b/data/tilesets/secondary/underwater/anim/3.png
new file mode 100644
index 000000000..2863c2261
--- /dev/null
+++ b/data/tilesets/secondary/underwater/anim/3.png
diff --git a/data/tilesets/secondary/underwater/tiles.png b/data/tilesets/secondary/underwater/tiles.png
index e0569d970..5af21f353 100644
--- a/data/tilesets/secondary/underwater/tiles.png
+++ b/data/tilesets/secondary/underwater/tiles.png
diff --git a/data/tilesets/secondary/union_room/tiles.png b/data/tilesets/secondary/union_room/tiles.png
index 50d44bf93..b38ffe9e5 100644
--- a/data/tilesets/secondary/union_room/tiles.png
+++ b/data/tilesets/secondary/union_room/tiles.png
diff --git a/data/tilesets/secondary/unused_1/0.png b/data/tilesets/secondary/unused_1/0.png
new file mode 100644
index 000000000..bea921d90
--- /dev/null
+++ b/data/tilesets/secondary/unused_1/0.png
diff --git a/data/tilesets/secondary/unused_1/1.png b/data/tilesets/secondary/unused_1/1.png
new file mode 100644
index 000000000..bea921d90
--- /dev/null
+++ b/data/tilesets/secondary/unused_1/1.png
diff --git a/data/tilesets/secondary/unused_1/2.png b/data/tilesets/secondary/unused_1/2.png
new file mode 100644
index 000000000..16652df19
--- /dev/null
+++ b/data/tilesets/secondary/unused_1/2.png
diff --git a/data/tilesets/secondary/unused_1/3.png b/data/tilesets/secondary/unused_1/3.png
new file mode 100644
index 000000000..8ea7a49e6
--- /dev/null
+++ b/data/tilesets/secondary/unused_1/3.png
diff --git a/data/tilesets/secondary/unused_1/tiles.png b/data/tilesets/secondary/unused_1/tiles.png
index 0a35187c8..3ae8bce42 100644
--- a/data/tilesets/secondary/unused_1/tiles.png
+++ b/data/tilesets/secondary/unused_1/tiles.png
diff --git a/data/tilesets/secondary/unused_2/0.png b/data/tilesets/secondary/unused_2/0.png
new file mode 100644
index 000000000..2895d3319
--- /dev/null
+++ b/data/tilesets/secondary/unused_2/0.png
diff --git a/data/tilesets/secondary/unused_2/1.png b/data/tilesets/secondary/unused_2/1.png
new file mode 100644
index 000000000..63c22acf2
--- /dev/null
+++ b/data/tilesets/secondary/unused_2/1.png
diff --git a/data/tilesets/secondary/unused_2/2.png b/data/tilesets/secondary/unused_2/2.png
new file mode 100644
index 000000000..d1447cde2
--- /dev/null
+++ b/data/tilesets/secondary/unused_2/2.png
diff --git a/data/tilesets/secondary/unused_2/3.png b/data/tilesets/secondary/unused_2/3.png
new file mode 100644
index 000000000..8ad81b1e1
--- /dev/null
+++ b/data/tilesets/secondary/unused_2/3.png
diff --git a/data/tilesets/secondary/unused_2/tiles.png b/data/tilesets/secondary/unused_2/tiles.png
index b9c594303..2ab3b63d6 100644
--- a/data/tilesets/secondary/unused_2/tiles.png
+++ b/data/tilesets/secondary/unused_2/tiles.png
diff --git a/data/unk_text_util_2.s b/data/unk_text_util_2.s
deleted file mode 100644
index 69f227ea2..000000000
--- a/data/unk_text_util_2.s
+++ /dev/null
@@ -1,11 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_08616124:: @ 8616124
-	.incbin "baserom.gba", 0x616124, 0x4
-
-	.align 2
-gFont6BrailleGlyphs:: @ 8616128
-	.incbin "data/graphics/fonts/font6.fwjpnfont"