11 files changed, 492 insertions, 459 deletions
diff --git a/data/battle_7.s b/data/battle_7.s
new file mode 100644
index 000000000..50fad468a
--- /dev/null
+++ b/data/battle_7.s
@@ -0,0 +1,25 @@
+	.include "include/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gUnknown_081FAF24:: @ 81FAF24
+	obj_tiles gEnemyMonShadow_Gfx, 128, 0xD759
+
+	.align 2
+gOamData_81FAF2C:: @ 81FAF2C
+	.2byte 0x4000
+	.2byte 0x4000
+	.2byte 0x0C00
+
+	.align 2
+gSpriteTemplate_81FAF34:: @ 81FAF34
+	spr_template 55129, 55039, gOamData_81FAF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8032978
+
+	.align 2
+gUnknown_081FAF4C:: @ 81FAF4C
+	.4byte gSharedMem + 0x8000
+	.4byte gSharedMem + 0xA000
+	.4byte gSharedMem + 0xC000
+	.4byte gSharedMem + 0xE000
diff --git a/data/btl_attrs.s b/data/btl_attrs.s
new file mode 100644
index 000000000..1bd5ed6e5
--- /dev/null
+++ b/data/btl_attrs.s
@@ -0,0 +1,337 @@
+@ the second big chunk of data
+
+#include "constants/items.h"
+#include "constants/moves.h"
+#include "constants/species.h"
+	.include "include/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+@ 81ECAD8
+	.include "data/graphics/trainers/back_pic_coords.inc"
+
+@ 81ECAE4
+	.include "data/graphics/trainers/back_pic_table.inc"
+
+@ 81ECAFC
+	.include "data/graphics/trainers/back_pic_palette_table.inc"
+
+@ 81ECB14
+	.include "data/enemy_mon_elevation.inc"
+
+@ 81ECCB0
+	.include "data/trainer_parties.inc"
+
+@ 81F0208
+	.include "data/text/trainer_class_names.inc"
+
+@ 81F04FC
+	.include "data/trainers.inc"
+
+@ 81F716C
+	.include "data/text/species_names.inc"
+
+@ 81F8320
+	.include "data/text/move_names.inc"
+
+	.align 2
+@ 81F9528
+	.4byte 0x101 @ unknown data
+
+	.align 2
+gOamData_81F952C:: @ 81F952C
+	.2byte 0x0300
+	.2byte 0xC000
+	.2byte 0x0000
+
+	.align 2
+gOamData_81F9534:: @ 81F9534
+	.2byte 0x0300
+	.2byte 0xC000
+	.2byte 0x0040
+
+	.align 2
+gSpriteAffineAnim_81F953C:: @ 81F953C
+	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnim_81F954C:: @ 81F954C
+	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
+	obj_rot_scal_anim_frame 0x18, 0x18, 0, -128
+	obj_rot_scal_anim_frame 0x18, 0x18, 0, -128
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnimTable_81F956C:: @ 81F956C
+	.4byte gSpriteAffineAnim_81F953C
+	.4byte gSpriteAffineAnim_81F954C
+
+	.align 2
+gSpriteTemplate_81F9574:: @ 81F9574
+	spr_template 10000, 10000, gOamData_81F952C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_81F956C, nullsub_36
+
+	.align 2
+gSpriteTemplate_81F958C:: @ 81F958C
+	spr_template 10000, 10000, gOamData_81F9534, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_81F956C, nullsub_36
+
+	.align 2
+gUnknown_081F95A4:: @ 81F95A4
+	obj_tiles gUnknown_08E5DC2C, 4096, 0x2710
+
+	.align 2
+gBattleTerrainTable:: @ 81F95AC
+	@ tall_grass
+	.4byte gBattleTerrainTiles_TallGrass
+	.4byte gBattleTerrainTilemap_TallGrass
+	.4byte gBattleTerrainAnimTiles_TallGrass
+	.4byte gBattleTerrainAnimTilemap_TallGrass
+	.4byte gBattleTerrainPalette_TallGrass
+
+	@ long_grass
+	.4byte gBattleTerrainTiles_LongGrass
+	.4byte gBattleTerrainTilemap_LongGrass
+	.4byte gBattleTerrainAnimTiles_LongGrass
+	.4byte gBattleTerrainAnimTilemap_LongGrass
+	.4byte gBattleTerrainPalette_LongGrass
+
+	@ sand
+	.4byte gBattleTerrainTiles_Sand
+	.4byte gBattleTerrainTilemap_Sand
+	.4byte gBattleTerrainAnimTiles_Sand
+	.4byte gBattleTerrainAnimTilemap_Sand
+	.4byte gBattleTerrainPalette_Sand
+
+	@ underwater
+	.4byte gBattleTerrainTiles_Underwater
+	.4byte gBattleTerrainTilemap_Underwater
+	.4byte gBattleTerrainAnimTiles_Underwater
+	.4byte gBattleTerrainAnimTilemap_Underwater
+	.4byte gBattleTerrainPalette_Underwater
+
+	@ water
+	.4byte gBattleTerrainTiles_Water
+	.4byte gBattleTerrainTilemap_Water
+	.4byte gBattleTerrainAnimTiles_Water
+	.4byte gBattleTerrainAnimTilemap_Water
+	.4byte gBattleTerrainPalette_Water
+
+	@ pond_water
+	.4byte gBattleTerrainTiles_PondWater
+	.4byte gBattleTerrainTilemap_PondWater
+	.4byte gBattleTerrainAnimTiles_PondWater
+	.4byte gBattleTerrainAnimTilemap_PondWater
+	.4byte gBattleTerrainPalette_PondWater
+
+	@ rock
+	.4byte gBattleTerrainTiles_Rock
+	.4byte gBattleTerrainTilemap_Rock
+	.4byte gBattleTerrainAnimTiles_Rock
+	.4byte gBattleTerrainAnimTilemap_Rock
+	.4byte gBattleTerrainPalette_Rock
+
+	@ cave
+	.4byte gBattleTerrainTiles_Cave
+	.4byte gBattleTerrainTilemap_Cave
+	.4byte gBattleTerrainAnimTiles_Cave
+	.4byte gBattleTerrainAnimTilemap_Cave
+	.4byte gBattleTerrainPalette_Cave
+
+	@ building
+	.4byte gBattleTerrainTiles_Building
+	.4byte gBattleTerrainTilemap_Building
+	.4byte gBattleTerrainAnimTiles_Building
+	.4byte gBattleTerrainAnimTilemap_Building
+	.4byte gBattleTerrainPalette_Building
+
+	@ plain
+	.4byte gBattleTerrainTiles_Building
+	.4byte gBattleTerrainTilemap_Building
+	.4byte gBattleTerrainAnimTiles_Building
+	.4byte gBattleTerrainAnimTilemap_Building
+	.4byte gBattleTerrainPalette_Plain
+
+	.align 2
+gUnknown_081F9674:: @ 81F9674
+	.4byte REG_BG3HOFS
+	.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
+	.4byte 1
+
+	.align 2
+gUnknown_081F9680:: @ 81F9680
+	.4byte gUnknown_030041D0
+	.2byte 0x20
+	.byte 0x13
+	.byte 0x10
+	.4byte BG_VRAM + 0xE104
+
+	.4byte gUnknown_03004250
+	.2byte 0x40
+	.byte 0x13
+	.byte 0x10
+	.4byte BG_VRAM + 0xF104
+
+	.4byte gUnknown_030041D0
+	.2byte 0x60
+	.byte 0x13
+	.byte 0x30
+	.4byte BG_VRAM + 0xE204
+
+	.4byte gUnknown_03004250
+	.2byte 0x80
+	.byte 0x13
+	.byte 0x30
+	.4byte BG_VRAM + 0xF204
+
+	.4byte gUnknown_030041D0
+	.2byte 0x20
+	.byte 0x13
+	.byte 0x18
+	.4byte BG_VRAM + 0xE1C4
+
+	.4byte gUnknown_03004250
+	.2byte 0x40
+	.byte 0x13
+	.byte 0x18
+	.4byte BG_VRAM + 0xF1C4
+
+gUnknown_081F96C8:: @ 81F96C8
+	.string "ヌケニン$" @ "Nukenin" (Shedinja)
+
+	.align 2
+gSpriteTemplate_81F96D0:: @ 81F96D0
+	spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_800F828
+
+	.align 2
+gOamData_81F96E8:: @ 81F96E8
+	.2byte 0x0100
+	.2byte 0xC000
+	.2byte 0x0800
+
+	.align 2
+gOamData_81F96F0:: @ 81F96F0
+	.2byte 0x0100
+	.2byte 0xC000
+	.2byte 0x2800
+
+	.align 2
+gSpriteAnim_81F96F8:: @ 81F96F8
+	obj_image_anim_frame 0, 5
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnimTable_81F9700:: @ 81F9700
+	.4byte gSpriteAnim_81F96F8
+
+	.align 2
+gSpriteAffineAnim_81F9704:: @ 81F9704
+	obj_rot_scal_anim_frame 0xFFF0, 0x0, 0, 4
+	obj_rot_scal_anim_frame 0x0, 0x0, 0, 60
+	obj_rot_scal_anim_jump 1
+
+	.align 2
+gSpriteAffineAnimTable_81F971C:: @ 81F971C
+	.4byte gSpriteAffineAnim_81F9704
+
+@ 81F9720
+	.include "data/type_effectiveness.inc"
+
+@ 81F9870
+	.include "data/text/type_names.inc"
+
+@ 81F98F0
+	.include "data/trainer_money.inc"
+
+@ 81F99CC
+	.include "data/text/ability_descriptions.inc"
+
+@ 81FA248
+	.include "data/text/ability_names.inc"
+
+	.align 2
+gUnknown_081FA640:: @ 81FA640
+	.4byte HandleAction_UseMove
+	.4byte HandleAction_UseItem
+	.4byte HandleAction_Switch
+	.4byte HandleAction_Run
+	.4byte HandleAction_WatchesCarefully
+	.4byte HandleAction_SafariZoneBallThrow
+	.4byte HandleAction_ThrowPokeblock
+	.4byte HandleAction_GoNear
+	.4byte HandleAction_SafriZoneRun
+	.4byte HandleAction_Action9
+	.4byte sub_801B594
+	.4byte HandleAction_Action11
+	.4byte HandleAction_ActionFinished
+	.4byte HandleAction_NothingIsFainted
+
+	.align 2
+gUnknown_081FA678:: @ 81FA678
+	.4byte bc_8013B1C
+	.4byte HandleEndTurn_BattleWon
+	.4byte HandleEndTurn_BattleLost
+	.4byte HandleEndTurn_BattleLost
+	.4byte HandleEndTurn_RanFromBattle
+	.4byte HandleEndTurn_FinishBattle
+	.4byte HandleEndTurn_MonFled
+	.4byte HandleEndTurn_FinishBattle
+	.4byte HandleEndTurn_FinishBattle
+
+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_081FA6D4:: @ 81FA6D4
+	.4byte gStatusConditionString_PoisonJpn, BattleText_PoisonStatus
+	.4byte gStatusConditionString_SleepJpn, BattleText_Sleep
+	.4byte gStatusConditionString_ParalysisJpn, BattleText_Paralysis
+	.4byte gStatusConditionString_BurnJpn, BattleText_Burn
+	.4byte gStatusConditionString_IceJpn, BattleText_IceStatus
+	.4byte gStatusConditionString_ConfusionJpn, BattleText_Confusion
+	.4byte gStatusConditionString_LoveJpn, BattleText_Love
+
+gUnknown_081FA70C:: @ 81FA70C
+	.byte 0, 0, 0
+	.byte 3, 5, 0
+	.byte 2, 3, 0
+	.byte 1, 2, 0
+	.byte 1, 1, 0
+
+gUnknown_081FA71B:: @ 81FA71B
+	.byte 4, 3, 2, 1
+
+gUnknown_081FA71F:: @ 81FA71F
+	.byte 4, 4, 4, 4
+
+	.align 1
+gSoundMovesTable:: @ 81FA724
+	.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/data_8393054.s b/data/data_8393054.s
deleted file mode 100644
index 38ba47b63..000000000
--- a/data/data_8393054.s
+++ /dev/null
@@ -1,110 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gSpriteAnim_8393054:: @ 8393054
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 4, 3
-	obj_image_anim_frame 8, 3
-	obj_image_anim_frame 12, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_8393068:: @ 8393068
-	.4byte gSpriteAnim_8393054
-
-	.align 2
-gSpriteTemplate_839306C:: @ 839306C
-	spr_template 10004, 10004, gOamData_837DF2C, gSpriteAnimTable_8393068, NULL, gDummySpriteAffineAnimTable, sub_807A5C4
-
-	.align 2
-gSpriteTemplate_8393084:: @ 8393084
-	spr_template 10004, 10004, gOamData_837DF2C, gSpriteAnimTable_8393068, NULL, gDummySpriteAffineAnimTable, sub_807A544
-
-	.align 2
-gSpriteAnim_839309C:: @ 839309C
-	obj_image_anim_frame 0, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83930A4:: @ 83930A4
-	.4byte gSpriteAnim_839309C
-
-	.align 2
-gBattleAnimSpriteTemplate_83930A8:: @ 83930A8
-	spr_template 10283, 10283, gOamData_837DF34, gSpriteAnimTable_83930A4, NULL, gDummySpriteAffineAnimTable, sub_807A908
-
-	.align 2
-gBattleAnimSpriteTemplate_83930C0:: @ 83930C0
-	spr_template 10283, 10283, gOamData_837DF34, gSpriteAnimTable_83930A4, NULL, gDummySpriteAffineAnimTable, sub_807A9BC
-
-	.align 2
-gSpriteAnim_83930D8:: @ 83930D8
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 16, 3
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 48, 3
-	obj_image_anim_frame 64, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83930F0:: @ 83930F0
-	.4byte gSpriteAnim_83930D8
-
-	.align 2
-gBattleAnimSpriteTemplate_83930F4:: @ 83930F4
-	spr_template 10071, 10071, gOamData_837DF34, gSpriteAnimTable_83930F0, NULL, gDummySpriteAffineAnimTable, sub_807A63C
-
-	.align 2
-gSpriteTemplate_839310C:: @ 839310C
-	spr_template 10051, 10051, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807A5C4
-
-	.align 2
-gSpriteAnim_8393124:: @ 8393124
-	obj_image_anim_frame 0, 5
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_839312C:: @ 839312C
-	obj_image_anim_frame 0, 5
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_8393134:: @ 8393134
-	obj_image_anim_frame 0, 5
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_839313C:: @ 839313C
-	.4byte gSpriteAnim_8393124
-	.4byte gSpriteAnim_839312C
-	.4byte gSpriteAnim_8393134
-
-	.align 2
-gSpriteTemplate_8393148:: @ 8393148
-	spr_template 10135, 10135, gOamData_837DF34, gSpriteAnimTable_839313C, NULL, gDummySpriteAffineAnimTable, sub_807A5C4
-
-	.align 2
-gSpriteAnim_8393160:: @ 8393160
-	obj_image_anim_frame 0, 15
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_8393168:: @ 8393168
-	.4byte gSpriteAnim_8393160
-
-	.align 2
-gSpriteAffineAnim_839316C:: @ 839316C
-	obj_rot_scal_anim_frame 0x60, 0x60, 0, 0
-	obj_rot_scal_anim_frame 0x2, 0x2, 0, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_8393184:: @ 8393184
-	.4byte gSpriteAffineAnim_839316C
-
-	.align 2
-gSpriteTemplate_8393188:: @ 8393188
-	spr_template 10004, 10004, gOamData_837DFEC, gSpriteAnimTable_8393168, NULL, gSpriteAffineAnimTable_8393184, sub_807A544
diff --git a/data/gray_sun.s b/data/gray_sun.s
new file mode 100644
index 000000000..bee64873a
--- /dev/null
+++ b/data/gray_sun.s
@@ -0,0 +1,21 @@
+	.include "include/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gSpriteAnim_839309C:: @ 839309C
+	obj_image_anim_frame 0, 3
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnimTable_83930A4:: @ 83930A4
+	.4byte gSpriteAnim_839309C
+
+	.align 2
+gBattleAnimSpriteTemplate_83930A8:: @ 83930A8
+	spr_template 10283, 10283, gOamData_837DF34, gSpriteAnimTable_83930A4, NULL, gDummySpriteAffineAnimTable, sub_807A908
+
+	.align 2
+gBattleAnimSpriteTemplate_83930C0:: @ 83930C0
+	spr_template 10283, 10283, gOamData_837DF34, gSpriteAnimTable_83930A4, NULL, gDummySpriteAffineAnimTable, sub_807A9BC
diff --git a/data/data2a.s b/data/mon_attrs.s
index c4d6343d8..ea47c8de6 100644
--- a/data/data2a.s
+++ b/data/mon_attrs.s
@@ -702,331 +702,3 @@ gUnknown_081ECACC:: @ 81ECACC
 	.4byte gSpriteAnimTable_81ECAB4
 	.4byte gSpriteAnimTable_81ECABC
 	.4byte gSpriteAnimTable_81ECAC4
-
-@ 81ECAD8
-	.include "data/graphics/trainers/back_pic_coords.inc"
-
-@ 81ECAE4
-	.include "data/graphics/trainers/back_pic_table.inc"
-
-@ 81ECAFC
-	.include "data/graphics/trainers/back_pic_palette_table.inc"
-
-@ 81ECB14
-	.include "data/enemy_mon_elevation.inc"
-
-@ 81ECCB0
-	.include "data/trainer_parties.inc"
-
-@ 81F0208
-	.include "data/text/trainer_class_names.inc"
-
-@ 81F04FC
-	.include "data/trainers.inc"
-
-@ 81F716C
-	.include "data/text/species_names.inc"
-
-@ 81F8320
-	.include "data/text/move_names.inc"
-
-	.align 2
-@ 81F9528
-	.4byte 0x101 @ unknown data
-
-	.align 2
-gOamData_81F952C:: @ 81F952C
-	.2byte 0x0300
-	.2byte 0xC000
-	.2byte 0x0000
-
-	.align 2
-gOamData_81F9534:: @ 81F9534
-	.2byte 0x0300
-	.2byte 0xC000
-	.2byte 0x0040
-
-	.align 2
-gSpriteAffineAnim_81F953C:: @ 81F953C
-	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_81F954C:: @ 81F954C
-	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
-	obj_rot_scal_anim_frame 0x18, 0x18, 0, -128
-	obj_rot_scal_anim_frame 0x18, 0x18, 0, -128
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_81F956C:: @ 81F956C
-	.4byte gSpriteAffineAnim_81F953C
-	.4byte gSpriteAffineAnim_81F954C
-
-	.align 2
-gSpriteTemplate_81F9574:: @ 81F9574
-	spr_template 10000, 10000, gOamData_81F952C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_81F956C, nullsub_36
-
-	.align 2
-gSpriteTemplate_81F958C:: @ 81F958C
-	spr_template 10000, 10000, gOamData_81F9534, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_81F956C, nullsub_36
-
-	.align 2
-gUnknown_081F95A4:: @ 81F95A4
-	obj_tiles gUnknown_08E5DC2C, 4096, 0x2710
-
-	.align 2
-gBattleTerrainTable:: @ 81F95AC
-	@ tall_grass
-	.4byte gBattleTerrainTiles_TallGrass
-	.4byte gBattleTerrainTilemap_TallGrass
-	.4byte gBattleTerrainAnimTiles_TallGrass
-	.4byte gBattleTerrainAnimTilemap_TallGrass
-	.4byte gBattleTerrainPalette_TallGrass
-
-	@ long_grass
-	.4byte gBattleTerrainTiles_LongGrass
-	.4byte gBattleTerrainTilemap_LongGrass
-	.4byte gBattleTerrainAnimTiles_LongGrass
-	.4byte gBattleTerrainAnimTilemap_LongGrass
-	.4byte gBattleTerrainPalette_LongGrass
-
-	@ sand
-	.4byte gBattleTerrainTiles_Sand
-	.4byte gBattleTerrainTilemap_Sand
-	.4byte gBattleTerrainAnimTiles_Sand
-	.4byte gBattleTerrainAnimTilemap_Sand
-	.4byte gBattleTerrainPalette_Sand
-
-	@ underwater
-	.4byte gBattleTerrainTiles_Underwater
-	.4byte gBattleTerrainTilemap_Underwater
-	.4byte gBattleTerrainAnimTiles_Underwater
-	.4byte gBattleTerrainAnimTilemap_Underwater
-	.4byte gBattleTerrainPalette_Underwater
-
-	@ water
-	.4byte gBattleTerrainTiles_Water
-	.4byte gBattleTerrainTilemap_Water
-	.4byte gBattleTerrainAnimTiles_Water
-	.4byte gBattleTerrainAnimTilemap_Water
-	.4byte gBattleTerrainPalette_Water
-
-	@ pond_water
-	.4byte gBattleTerrainTiles_PondWater
-	.4byte gBattleTerrainTilemap_PondWater
-	.4byte gBattleTerrainAnimTiles_PondWater
-	.4byte gBattleTerrainAnimTilemap_PondWater
-	.4byte gBattleTerrainPalette_PondWater
-
-	@ rock
-	.4byte gBattleTerrainTiles_Rock
-	.4byte gBattleTerrainTilemap_Rock
-	.4byte gBattleTerrainAnimTiles_Rock
-	.4byte gBattleTerrainAnimTilemap_Rock
-	.4byte gBattleTerrainPalette_Rock
-
-	@ cave
-	.4byte gBattleTerrainTiles_Cave
-	.4byte gBattleTerrainTilemap_Cave
-	.4byte gBattleTerrainAnimTiles_Cave
-	.4byte gBattleTerrainAnimTilemap_Cave
-	.4byte gBattleTerrainPalette_Cave
-
-	@ building
-	.4byte gBattleTerrainTiles_Building
-	.4byte gBattleTerrainTilemap_Building
-	.4byte gBattleTerrainAnimTiles_Building
-	.4byte gBattleTerrainAnimTilemap_Building
-	.4byte gBattleTerrainPalette_Building
-
-	@ plain
-	.4byte gBattleTerrainTiles_Building
-	.4byte gBattleTerrainTilemap_Building
-	.4byte gBattleTerrainAnimTiles_Building
-	.4byte gBattleTerrainAnimTilemap_Building
-	.4byte gBattleTerrainPalette_Plain
-
-	.align 2
-gUnknown_081F9674:: @ 81F9674
-	.4byte REG_BG3HOFS
-	.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
-	.4byte 1
-
-	.align 2
-gUnknown_081F9680:: @ 81F9680
-	.4byte gUnknown_030041D0
-	.2byte 0x20
-	.byte 0x13
-	.byte 0x10
-	.4byte BG_VRAM + 0xE104
-
-	.4byte gUnknown_03004250
-	.2byte 0x40
-	.byte 0x13
-	.byte 0x10
-	.4byte BG_VRAM + 0xF104
-
-	.4byte gUnknown_030041D0
-	.2byte 0x60
-	.byte 0x13
-	.byte 0x30
-	.4byte BG_VRAM + 0xE204
-
-	.4byte gUnknown_03004250
-	.2byte 0x80
-	.byte 0x13
-	.byte 0x30
-	.4byte BG_VRAM + 0xF204
-
-	.4byte gUnknown_030041D0
-	.2byte 0x20
-	.byte 0x13
-	.byte 0x18
-	.4byte BG_VRAM + 0xE1C4
-
-	.4byte gUnknown_03004250
-	.2byte 0x40
-	.byte 0x13
-	.byte 0x18
-	.4byte BG_VRAM + 0xF1C4
-
-gUnknown_081F96C8:: @ 81F96C8
-	.string "ヌケニン$" @ "Nukenin" (Shedinja)
-
-	.align 2
-gSpriteTemplate_81F96D0:: @ 81F96D0
-	spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_800F828
-
-	.align 2
-gOamData_81F96E8:: @ 81F96E8
-	.2byte 0x0100
-	.2byte 0xC000
-	.2byte 0x0800
-
-	.align 2
-gOamData_81F96F0:: @ 81F96F0
-	.2byte 0x0100
-	.2byte 0xC000
-	.2byte 0x2800
-
-	.align 2
-gSpriteAnim_81F96F8:: @ 81F96F8
-	obj_image_anim_frame 0, 5
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_81F9700:: @ 81F9700
-	.4byte gSpriteAnim_81F96F8
-
-	.align 2
-gSpriteAffineAnim_81F9704:: @ 81F9704
-	obj_rot_scal_anim_frame 0xFFF0, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 60
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_81F971C:: @ 81F971C
-	.4byte gSpriteAffineAnim_81F9704
-
-@ 81F9720
-	.include "data/type_effectiveness.inc"
-
-@ 81F9870
-	.include "data/text/type_names.inc"
-
-@ 81F98F0
-	.include "data/trainer_money.inc"
-
-@ 81F99CC
-	.include "data/text/ability_descriptions.inc"
-
-@ 81FA248
-	.include "data/text/ability_names.inc"
-
-	.align 2
-gUnknown_081FA640:: @ 81FA640
-	.4byte HandleAction_UseMove
-	.4byte HandleAction_UseItem
-	.4byte HandleAction_Switch
-	.4byte HandleAction_Run
-	.4byte HandleAction_WatchesCarefully
-	.4byte HandleAction_SafariZoneBallThrow
-	.4byte HandleAction_ThrowPokeblock
-	.4byte HandleAction_GoNear
-	.4byte HandleAction_SafriZoneRun
-	.4byte HandleAction_Action9
-	.4byte sub_801B594
-	.4byte HandleAction_Action11
-	.4byte HandleAction_ActionFinished
-	.4byte HandleAction_NothingIsFainted
-
-	.align 2
-gUnknown_081FA678:: @ 81FA678
-	.4byte bc_8013B1C
-	.4byte HandleEndTurn_BattleWon
-	.4byte HandleEndTurn_BattleLost
-	.4byte HandleEndTurn_BattleLost
-	.4byte HandleEndTurn_RanFromBattle
-	.4byte HandleEndTurn_FinishBattle
-	.4byte HandleEndTurn_MonFled
-	.4byte HandleEndTurn_FinishBattle
-	.4byte HandleEndTurn_FinishBattle
-
-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_081FA6D4:: @ 81FA6D4
-	.4byte gStatusConditionString_PoisonJpn, BattleText_PoisonStatus
-	.4byte gStatusConditionString_SleepJpn, BattleText_Sleep
-	.4byte gStatusConditionString_ParalysisJpn, BattleText_Paralysis
-	.4byte gStatusConditionString_BurnJpn, BattleText_Burn
-	.4byte gStatusConditionString_IceJpn, BattleText_IceStatus
-	.4byte gStatusConditionString_ConfusionJpn, BattleText_Confusion
-	.4byte gStatusConditionString_LoveJpn, BattleText_Love
-
-gUnknown_081FA70C:: @ 81FA70C
-	.byte 0, 0, 0
-	.byte 3, 5, 0
-	.byte 2, 3, 0
-	.byte 1, 2, 0
-	.byte 1, 1, 0
-
-gUnknown_081FA71B:: @ 81FA71B
-	.byte 4, 3, 2, 1
-
-gUnknown_081FA71F:: @ 81FA71F
-	.byte 4, 4, 4, 4
-
-	.align 1
-gSoundMovesTable:: @ 81FA724
-	.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/data2b.s b/data/smokescreen.s
index c7cd4dfcf..21cca5917 100644
--- a/data/data2b.s
+++ b/data/smokescreen.s
@@ -55,24 +55,3 @@ gSpriteAnimTable_81FAEFC:: @ 81FAEFC
 	.align 2
 gSpriteTemplate_81FAF0C:: @ 81FAF0C
 	spr_template 55019, 55019, gOamData_81FAEB4, gSpriteAnimTable_81FAEFC, NULL, gDummySpriteAffineAnimTable, sub_80463CC
-
-	.align 2
-gUnknown_081FAF24:: @ 81FAF24
-	obj_tiles gEnemyMonShadow_Gfx, 128, 0xD759
-
-	.align 2
-gOamData_81FAF2C:: @ 81FAF2C
-	.2byte 0x4000
-	.2byte 0x4000
-	.2byte 0x0C00
-
-	.align 2
-gSpriteTemplate_81FAF34:: @ 81FAF34
-	spr_template 55129, 55039, gOamData_81FAF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8032978
-
-	.align 2
-gUnknown_081FAF4C:: @ 81FAF4C
-	.4byte gSharedMem + 0x8000
-	.4byte gSharedMem + 0xA000
-	.4byte gSharedMem + 0xC000
-	.4byte gSharedMem + 0xE000
diff --git a/data/sparkle.s b/data/sparkle.s
new file mode 100644
index 000000000..0c2593fbd
--- /dev/null
+++ b/data/sparkle.s
@@ -0,0 +1,21 @@
+	.include "include/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gSpriteAnim_83930D8:: @ 83930D8
+	obj_image_anim_frame 0, 3
+	obj_image_anim_frame 16, 3
+	obj_image_anim_frame 32, 3
+	obj_image_anim_frame 48, 3
+	obj_image_anim_frame 64, 3
+	obj_image_anim_end
+
+	.align 2
+gSpriteAnimTable_83930F0:: @ 83930F0
+	.4byte gSpriteAnim_83930D8
+
+	.align 2
+gBattleAnimSpriteTemplate_83930F4:: @ 83930F4
+	spr_template 10071, 10071, gOamData_837DF34, gSpriteAnimTable_83930F0, NULL, gDummySpriteAffineAnimTable, sub_807A63C
diff --git a/data/unused_hit.s b/data/unused_hit.s
new file mode 100644
index 000000000..d7bdef912
--- /dev/null
+++ b/data/unused_hit.s
@@ -0,0 +1,29 @@
+	.include "include/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gSpriteAnim_8393124:: @ 8393124
+	obj_image_anim_frame 0, 5
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnim_839312C:: @ 839312C
+	obj_image_anim_frame 0, 5
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnim_8393134:: @ 8393134
+	obj_image_anim_frame 0, 5
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnimTable_839313C:: @ 839313C
+	.4byte gSpriteAnim_8393124
+	.4byte gSpriteAnim_839312C
+	.4byte gSpriteAnim_8393134
+
+	.align 2
+gSpriteTemplate_8393148:: @ 8393148
+	spr_template 10135, 10135, gOamData_837DF34, gSpriteAnimTable_839313C, NULL, gDummySpriteAffineAnimTable, sub_807A5C4
diff --git a/data/unused_orb.s b/data/unused_orb.s
new file mode 100644
index 000000000..d49ddd908
--- /dev/null
+++ b/data/unused_orb.s
@@ -0,0 +1,24 @@
+	.include "include/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gSpriteAnim_8393054:: @ 8393054
+	obj_image_anim_frame 0, 3
+	obj_image_anim_frame 4, 3
+	obj_image_anim_frame 8, 3
+	obj_image_anim_frame 12, 3
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnimTable_8393068:: @ 8393068
+	.4byte gSpriteAnim_8393054
+
+	.align 2
+gSpriteTemplate_839306C:: @ 839306C
+	spr_template 10004, 10004, gOamData_837DF2C, gSpriteAnimTable_8393068, NULL, gDummySpriteAffineAnimTable, sub_807A5C4
+
+	.align 2
+gSpriteTemplate_8393084:: @ 8393084
+	spr_template 10004, 10004, gOamData_837DF2C, gSpriteAnimTable_8393068, NULL, gDummySpriteAffineAnimTable, sub_807A544
diff --git a/data/unused_orb2.s b/data/unused_orb2.s
new file mode 100644
index 000000000..899f41372
--- /dev/null
+++ b/data/unused_orb2.s
@@ -0,0 +1,27 @@
+	.include "include/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gSpriteAnim_8393160:: @ 8393160
+	obj_image_anim_frame 0, 15
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnimTable_8393168:: @ 8393168
+	.4byte gSpriteAnim_8393160
+
+	.align 2
+gSpriteAffineAnim_839316C:: @ 839316C
+	obj_rot_scal_anim_frame 0x60, 0x60, 0, 0
+	obj_rot_scal_anim_frame 0x2, 0x2, 0, 1
+	obj_rot_scal_anim_jump 1
+
+	.align 2
+gSpriteAffineAnimTable_8393184:: @ 8393184
+	.4byte gSpriteAffineAnim_839316C
+
+	.align 2
+gSpriteTemplate_8393188:: @ 8393188
+	spr_template 10004, 10004, gOamData_837DFEC, gSpriteAnimTable_8393168, NULL, gSpriteAffineAnimTable_8393184, sub_807A544
diff --git a/data/unused_paw.s b/data/unused_paw.s
new file mode 100644
index 000000000..cb29168d7
--- /dev/null
+++ b/data/unused_paw.s
@@ -0,0 +1,8 @@
+	.include "include/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gSpriteTemplate_839310C:: @ 839310C
+	spr_template 10051, 10051, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807A5C4