14 files changed, 5 insertions, 2256 deletions
diff --git a/data/battle_811DA74.s b/data/battle_811DA74.s
deleted file mode 100644
index 873c76eb9..000000000
--- a/data/battle_811DA74.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gLinkPartnerBufferCommands:: @ 83FE4F4
-	.4byte LinkPartnerHandleGetAttributes
-	.4byte sub_811EC04
-	.4byte LinkPartnerHandleSetAttributes
-	.4byte sub_811F664
-	.4byte sub_811F6D8
-	.4byte sub_811F7F4
-	.4byte sub_811F9D0
-	.4byte sub_811FAE4
-	.4byte sub_811FC30
-	.4byte sub_811FC3C
-	.4byte sub_811FCE8
-	.4byte sub_811FDCC
-	.4byte sub_811FDD8
-	.4byte sub_811FDE4
-	.4byte sub_811FDF0
-	.4byte sub_811FDFC
-	.4byte sub_8120094
-	.4byte sub_81200F8
-	.4byte sub_8120104
-	.4byte sub_8120110
-	.4byte sub_812011C
-	.4byte sub_8120128
-	.4byte sub_8120134
-	.4byte sub_8120140
-	.4byte LinkPartnerHandleHealthBarUpdate
-	.4byte LinkPartnerHandleExpBarUpdate
-	.4byte LinkPartnerHandleStatusIconUpdate
-	.4byte LinkPartnerHandleStatusAnimation
-	.4byte sub_8120324
-	.4byte sub_8120330
-	.4byte sub_812033C
-	.4byte sub_8120348
-	.4byte sub_8120354
-	.4byte sub_8120360
-	.4byte sub_812036C
-	.4byte sub_8120378
-	.4byte sub_8120384
-	.4byte sub_8120390
-	.4byte sub_81203AC
-	.4byte sub_81203E4
-	.4byte sub_81203FC
-	.4byte LinkPartnerHandleHitAnimation
-	.4byte sub_8120494
-	.4byte LinkPartnerHandleEffectivenessSound
-	.4byte sub_81204E4
-	.4byte LinkPartnerHandleFaintingCry
-	.4byte dp01t_2E_3_battle_intro
-	.4byte sub_8120588
-	.4byte dp01t_30_3_80EB11C
-	.4byte sub_8120920
-	.4byte sub_812096C
-	.4byte sub_8120978
-	.4byte sub_81209D8
-	.4byte sub_8120A40
-	.4byte sub_8120A4C
-	.4byte sub_8120A58
-	.4byte nullsub_75
diff --git a/data/battle_anim_81258BC.s b/data/battle_anim_81258BC.s
deleted file mode 100644
index 993adbc2e..000000000
--- a/data/battle_anim_81258BC.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gSafariBufferCommands:: @ 8402080
-	.4byte SafariHandleGetAttributes
-	.4byte sub_812B870
-	.4byte sub_812B87C
-	.4byte sub_812B888
-	.4byte sub_812B894
-	.4byte sub_812B8A0
-	.4byte sub_812B8AC
-	.4byte sub_812B8B8
-	.4byte sub_812B994
-	.4byte sub_812B9A0
-	.4byte sub_812B9AC
-	.4byte sub_812B9B8
-	.4byte sub_812B9C4
-	.4byte sub_812BA14
-	.4byte sub_812BA70
-	.4byte sub_812BA7C
-	.4byte SafariHandlePrintString
-	.4byte SafariHandlePrintStringPlayerOnly
-	.4byte sub_812BB10
-	.4byte sub_812BBFC
-	.4byte sub_812BC08
-	.4byte sub_812BC14
-	.4byte sub_812BC54
-	.4byte sub_812BC60
-	.4byte sub_812BC6C
-	.4byte sub_812BC78
-	.4byte sub_812BC84
-	.4byte sub_812BCC0
-	.4byte sub_812BCCC
-	.4byte sub_812BCD8
-	.4byte sub_812BCE4
-	.4byte sub_812BCF0
-	.4byte sub_812BCFC
-	.4byte sub_812BD08
-	.4byte sub_812BD14
-	.4byte sub_812BD20
-	.4byte sub_812BD2C
-	.4byte sub_812BD38
-	.4byte sub_812BD44
-	.4byte sub_812BD50
-	.4byte sub_812BD5C
-	.4byte sub_812BD68
-	.4byte sub_812BD74
-	.4byte sub_812BD80
-	.4byte sub_812BDC4
-	.4byte sub_812BDF4
-	.4byte dp01t_2E_6_battle_intro
-	.4byte sub_812BE64
-	.4byte sub_812BEB0
-	.4byte sub_812BEBC
-	.4byte sub_812BEC8
-	.4byte sub_812BED4
-	.4byte sub_812BEE0
-	.4byte sub_812BF3C
-	.4byte sub_812BF48
-	.4byte sub_812BF54
-	.4byte nullsub_78
diff --git a/data/battle_anim_8137220.s b/data/battle_anim_8137220.s
deleted file mode 100644
index c1673af9a..000000000
--- a/data/battle_anim_8137220.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gWallyBufferCommands:: @ 84061A4
-	.4byte dp01t_00_5_getattr
-	.4byte sub_8138230
-	.4byte sub_813823C
-	.4byte sub_8138C90
-	.4byte sub_8138C9C
-	.4byte sub_8138CA8
-	.4byte sub_8138CB4
-	.4byte sub_8138D38
-	.4byte sub_8138E04
-	.4byte sub_8138ED0
-	.4byte sub_8138EDC
-	.4byte sub_8138EE8
-	.4byte sub_8138EF4
-	.4byte sub_8138F44
-	.4byte sub_8138FA0
-	.4byte sub_8138FAC
-	.4byte sub_8139208
-	.4byte dp01t_11_5_message_for_player_only
-	.4byte sub_8139298
-	.4byte sub_8139378
-	.4byte sub_8139384
-	.4byte sub_81393EC
-	.4byte sub_813942C
-	.4byte sub_8139438
-	.4byte sub_8139444
-	.4byte sub_8139544
-	.4byte sub_8139550
-	.4byte sub_813955C
-	.4byte sub_8139568
-	.4byte sub_8139574
-	.4byte sub_8139580
-	.4byte sub_813958C
-	.4byte sub_8139598
-	.4byte sub_81395A4
-	.4byte sub_81395B0
-	.4byte sub_81395BC
-	.4byte sub_81395C8
-	.4byte sub_81395D4
-	.4byte sub_81395E0
-	.4byte sub_81395EC
-	.4byte sub_81395F8
-	.4byte sub_8139604
-	.4byte sub_8139674
-	.4byte sub_8139680
-	.4byte sub_81396B0
-	.4byte sub_81396E0
-	.4byte dp01t_2E_5_battle_intro
-	.4byte sub_8139750
-	.4byte sub_8139AA0
-	.4byte sub_8139B20
-	.4byte sub_8139B2C
-	.4byte sub_8139B38
-	.4byte sub_8139B44
-	.4byte sub_8139BA0
-	.4byte sub_8139BAC
-	.4byte sub_8139BB8
-	.4byte nullsub_80
diff --git a/data/battle_moves.inc b/data/battle_moves.s
index ff7e2cb33..ea32446d2 100644
--- a/data/battle_moves.inc
+++ b/data/battle_moves.s
@@ -1,3 +1,8 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
 	.align 2
 gBattleMoves:: @ 81FB12C
 @ NONE
diff --git a/data/battle_transition.s b/data/battle_transition.s
deleted file mode 100644
index 0d463ddef..000000000
--- a/data/battle_transition.s
+++ /dev/null
@@ -1,399 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_083FBB88:: @ 83FBB88
-	.incbin "graphics/battle_transitions/big_pokeball.4bpp"
-
-	.align 2
-gUnknown_083FC108:: @ 83FC108
-	.incbin "graphics/battle_transitions/pokeball_trail.4bpp"
-
-	.align 2
-gSpriteImage_83FC148:: @ 83FC148
-	.incbin "graphics/battle_transitions/pokeball.4bpp"
-
-	.align 2
-gUnknown_083FC348:: @ 83FC348
-	.incbin "graphics/battle_transitions/elite_four_bg.4bpp"
-
-	.align 2
-gSpriteImage_83FC528:: @ 83FC528
-	.incbin "graphics/battle_transitions/unused_brendan.4bpp"
-
-	.align 2
-gSpriteImage_83FCD28:: @ 83FCD28
-	.incbin "graphics/battle_transitions/unused_lass.4bpp"
-
-	.align 2
-gUnknown_083FD528:: @ 83FD528
-	.incbin "graphics/battle_transitions/shrinking_box.4bpp"
-
-	.align 2
-gUnknown_083FD708:: @ 83FD708
-	.4byte 0x0200c000
-
-	.align 2
-gUnknown_083FD70C:: @ 83FD70C
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-	.4byte sub_811AC64
-
-	.align 2
-gBattleTransitionFuncs:: @ 83FD750
-	.4byte sub_811ACB4
-	.4byte sub_811ADAC
-	.4byte sub_811AF44
-	.4byte sub_811B0F0
-	.4byte sub_811B578
-	.4byte sub_811B7E8
-	.4byte sub_811BCBC
-	.4byte sub_811BEA0
-	.4byte sub_811CA5C
-	.4byte sub_811CCDC
-	.4byte sub_811D0B8
-	.4byte sub_811D1C8
-	.4byte sub_811C08C
-	.4byte sub_811C0AC
-	.4byte sub_811C0CC
-	.4byte sub_811C0EC
-	.4byte sub_811C10C
-
-	.align 2
-gUnknown_083FD794:: @ 83FD794
-	.4byte sub_811AB88
-	.4byte sub_811ABD8
-	.4byte sub_811AC0C
-	.4byte sub_811AC34
-
-	.align 2
-gUnknown_083FD7A4:: @ 83FD7A4
-	.4byte sub_811ACEC
-	.4byte sub_811AD1C
-	.4byte sub_811AD80
-
-	.align 2
-gUnknown_083FD7B0:: @ 83FD7B0
-	.4byte sub_811ADE4
-	.4byte sub_811AE70
-
-	.align 2
-gUnknown_083FD7B8:: @ 83FD7B8
-	.4byte sub_811AF7C
-	.4byte sub_811B000
-
-	.align 2
-gUnknown_083FD7C0:: @ 83FD7C0
-	.4byte sub_811B128
-	.4byte sub_811B1D8
-	.4byte sub_811B268
-	.4byte sub_811B2F4
-	.4byte sub_811B380
-	.4byte sub_811B3EC
-
-	.align 2
-gUnknown_083FD7D8:: @ 83FD7D8
-	.4byte sub_811B5B0
-	.4byte sub_811B5FC
-	.4byte sub_811B688
-
-	.align 1
-gUnknown_083FD7E4:: @ 83FD7E4
-	.2byte -16
-	.2byte 256
-
-	.align 1
-gUnknown_083FD7E8:: @ 83FD7E8
-	.2byte 0
-	.2byte 32
-	.2byte 64
-	.2byte 18
-	.2byte 48
-
-	.align 1
-gUnknown_083FD7F2:: @ 83FD7F2
-	.2byte 8
-	.2byte -8
-
-	.align 2
-gUnknown_083FD7F8:: @ 83FD7F8
-	.4byte sub_811B820
-	.4byte sub_811B884
-	.4byte sub_811B90C
-	.4byte sub_811B9F0
-	.4byte sub_811BA70
-	.4byte sub_811BB60
-	.4byte sub_811BBEC
-
-	.align 2
-gUnknown_083FD814:: @ 83FD814
-	.4byte sub_811BCF4
-	.4byte sub_811BD60
-
-	.align 2
-gUnknown_083FD81C:: @ 83FD81C
-	.4byte sub_811BED8
-	.4byte sub_811BF2C
-	.4byte sub_811BFC4
-
-	.align 2
-gUnknown_083FD828:: @ 83FD828
-	.4byte sub_811C164
-	.4byte sub_811C1CC
-	.4byte sub_811C2A4
-	.4byte sub_811C38C
-	.4byte sub_811C400
-	.4byte sub_811C43C
-	.4byte sub_811C4F0
-	.4byte sub_811C5B4
-	.4byte sub_811C5E8
-	.4byte sub_811C630
-
-gUnknown_083FD850:: @ 83FD850
-	.byte TRAINER_PIC_SIDNEY
-	.byte TRAINER_PIC_PHOEBE
-	.byte TRAINER_PIC_GLACIA
-	.byte TRAINER_PIC_DRAKE
-	.byte TRAINER_PIC_STEVEN
-
-	.align 1
-gUnknown_083FD856:: @ 83FD856
-	.2byte 0x200, 0x200
-	.2byte 0x200, 0x200
-	.2byte 0x1B0, 0x1B0
-	.2byte 0x1A0, 0x1A0
-	.2byte 0x188, 0x188
-
-	.align 1
-gUnknown_083FD86A:: @ 83FD86A
-	.2byte   0,  0
-	.2byte   0,  0
-	.2byte  -4,  4
-	.2byte   0,  5
-	.2byte   0,  7
-
-	.align 2
-gUnknown_083FD880:: @ 83FD880
-	.4byte sub_811C934
-	.4byte sub_811C938
-	.4byte sub_811C984
-	.4byte sub_811C9B8
-	.4byte sub_811C934
-	.4byte sub_811C9E4
-	.4byte sub_811C934
-
-	.align 1
-gUnknown_083FD89C:: @ 83FD89C
-	.2byte 12, -12
-
-	.align 1
-gUnknown_083FD8A0:: @ 83FD8A0
-	.2byte -1, 1
-
-	.align 2
-gUnknown_083FD8A4:: @ 83FD8A4
-	.4byte sub_811CA94
-	.4byte sub_811CB20
-	.4byte sub_811CBE8
-
-	.align 2
-gUnknown_083FD8B0:: @ 83FD8B0
-	.4byte sub_811CD14
-	.4byte sub_811CDA0
-	.4byte sub_811CE14
-	.4byte sub_811CE4C
-	.4byte sub_811CEB0
-
-	.align 1
-gUnknown_083FD8C4:: @ 83FD8C4
-	.2byte   0
-	.2byte  20
-	.2byte  15
-	.2byte  40
-	.2byte  10
-	.2byte  25
-	.2byte  35
-	.2byte   5
-
-	.align 2
-gUnknown_083FD8D4:: @ 83FD8D4
-	.4byte sub_811D0F0
-	.4byte sub_811D144
-	.4byte sub_811D19C
-
-	.align 2
-gUnknown_083FD8E0:: @ 83FD8E0
-	.4byte sub_811D200
-	.4byte sub_811D260
-	.4byte sub_811D2D8
-	.4byte sub_811D3B0
-	.4byte sub_811D41C
-
-	.align 1
-gUnknown_083FD8F4:: @ 83FD8F4
-	.2byte   56,   0,   0, 160,   0
-	.2byte  104, 160, 240,  88,   1
-	.2byte  240,  72,  56,   0,   1
-	.2byte    0,  32, 144, 160,   0
-	.2byte  144, 160, 184,   0,   1
-	.2byte   56,   0, 168, 160,   0
-	.2byte  168, 160,  48,   0,   1
-
-	.align 1
-gUnknown_083FD93A:: @ 83FD93A
-	.2byte  8
-	.2byte  4
-	.2byte  2
-	.2byte  1
-	.2byte  1
-	.2byte  1
-	.2byte  0
-
-	.align 2
-gUnknown_083FD948:: @ 83FD948
-	.4byte sub_811D584
-	.4byte sub_811D5E0
-
-	.align 2
-gSpriteImageTable_83FD950:: @ 83FD950
-	obj_frame_tiles gSpriteImage_83FC148, 0x200
-
-	.align 2
-gSpriteAnim_83FD958:: @ 83FD958
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83FD960:: @ 83FD960
-	.4byte gSpriteAnim_83FD958
-
-	.align 2
-gSpriteAffineAnim_83FD964:: @ 83FD964
-	obj_rot_scal_anim_frame 0x0, 0x0, -4, 1
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnim_83FD974:: @ 83FD974
-	obj_rot_scal_anim_frame 0x0, 0x0, 4, 1
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83FD984:: @ 83FD984
-	.4byte gSpriteAffineAnim_83FD964
-	.4byte gSpriteAffineAnim_83FD974
-
-	.align 2
-gSpriteTemplate_83FD98C:: @ 83FD98C
-	spr_template 0xFFFF, 4105, gFieldOamData_32x32, gSpriteAnimTable_83FD960, gSpriteImageTable_83FD950, gSpriteAffineAnimTable_83FD984, sub_811B720
-
-	.align 2
-gOamData_83FD9A4:: @ 83FD9A4
-	.2byte 0x0000
-	.2byte 0xC000
-	.2byte 0x0000
-
-	.align 2
-gSpriteImageTable_83FD9AC:: @ 83FD9AC
-	obj_frame_tiles gSpriteImage_83FC528, 0x800
-
-	.align 2
-gSpriteImageTable_83FD9B4:: @ 83FD9B4
-	obj_frame_tiles gSpriteImage_83FCD28, 0x800
-
-	.align 2
-gSpriteAnim_83FD9BC:: @ 83FD9BC
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83FD9C4:: @ 83FD9C4
-	.4byte gSpriteAnim_83FD9BC
-
-	.align 2
-gSpriteTemplate_83FD9C8:: @ 83FD9C8
-	spr_template 0xFFFF, 4106, gOamData_83FD9A4, gSpriteAnimTable_83FD9C4, gSpriteImageTable_83FD9AC, gDummySpriteAffineAnimTable, sub_811C90C
-
-	.align 2
-gSpriteTemplate_83FD9E0:: @ 83FD9E0
-	spr_template 0xFFFF, 4106, gOamData_83FD9A4, gSpriteAnimTable_83FD9C4, gSpriteImageTable_83FD9B4, gDummySpriteAffineAnimTable, sub_811C90C
-
-	.align 2
-gFieldEffectObjectPalette10:: @ 83FD9F8
-	.incbin "graphics/field_effect_objects/palettes/10.gbapal"
-
-	.align 2
-gFieldEffectObjectPaletteInfo10:: @ 83FDA18
-	obj_pal gFieldEffectObjectPalette10, 0x1009
-
-	.align 2
-Unknown_83FDA20:
-	.incbin "graphics/battle_transitions/sidney_bg.gbapal"
-
-	.align 2
-Unknown_83FDA40:
-	.incbin "graphics/battle_transitions/phoebe_bg.gbapal"
-
-	.align 2
-Unknown_83FDA60:
-	.incbin "graphics/battle_transitions/glacia_bg.gbapal"
-
-	.align 2
-Unknown_83FDA80:
-	.incbin "graphics/battle_transitions/drake_bg.gbapal"
-
-	.align 2
-Unknown_83FDAA0:
-	.incbin "graphics/battle_transitions/steven_bg.gbapal"
-
-	.align 2
-Unknown_83FDAC0:
-	.incbin "graphics/battle_transitions/brendan_bg.gbapal"
-
-	.align 2
-Unknown_83FDAE0:
-	.incbin "graphics/battle_transitions/may_bg.gbapal"
-
-	.align 2
-gUnknown_083FDB00:: @ 83FDB00
-	.4byte Unknown_83FDA20
-	.4byte Unknown_83FDA40
-	.4byte Unknown_83FDA60
-	.4byte Unknown_83FDA80
-	.4byte Unknown_83FDAA0
-
-	.align 2
-gUnknown_083FDB14:: @ 83FDB14
-	.4byte Unknown_83FDAC0
-	.4byte Unknown_83FDAE0
-
-	.align 2
-UnusedTrainerPalette:
-	.incbin "graphics/battle_transitions/unused_trainer.gbapal"
-
-	.align 2
-gSpritePalette_UnusedTrainer:: @ 83FDB3C
-	obj_pal UnusedTrainerPalette, 0x100A
-
-	.align 2
-gUnknown_083FDB44:: @ 83FDB44
-	.incbin "graphics/battle_transitions/big_pokeball_map.bin"
-
-	.align 2
-gUnknown_083FDFF4:: @ 83FDFF4
-	.incbin "graphics/battle_transitions/elite_four_bg_map.bin"
diff --git a/data/berry_blender.s b/data/berry_blender.s
deleted file mode 100644
index ff0f06473..000000000
--- a/data/berry_blender.s
+++ /dev/null
@@ -1,456 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_08215C0C:: @ 8215C0C
-	.incbin "graphics/berry_blender/center.gbapal"
-
-	.align 2
-gUnknown_08215C2C:: @ 8215C2C
-	.incbin "graphics/berry_blender/center_map.bin"
-
-	.align 2
-gUnknown_0821602C:: @ 821602C
-	.incbin "graphics/berry_blender/outer.gbapal"
-
-	.incbin "graphics/unused/unknown/821604C.gbapal"
-
-	.space 0x1C0
-
-	.string "▶$"
-	.string " $"
-	.string "カッコイ$" @ "cool" (missing an イ at the end)
-	.string "カワイイ$" @ "cute"
-	.string "ウツクシ$" @ "beautiful" (missing an イ at the end)
-	.string "カシコイ$" @ "smart"
-	.string "タクマシ$" @ "tough" (missing an イ at the end)
-
-gUnknown_08216249:: @ 8216249
-	.string "\p$"
-
-@ unreferenced
-@ These appear to be the first names of four people who worked on the game.
-	.string "てつじ$", 10 @ Tetsuji (Ohta)
-	.string "あきと$", 10 @ Akito (Mori)
-	.string "シゲル$", 10 @ Shigeru (Ohmori)
-	.string "ヨシノリ$", 10 @ Yoshinori (Matsuda)
-
-UnknownText_2Pok:
-	.string "2Pok$"
-UnknownText_3Pok:
-	.string "3Pok$"
-UnknownText_4Pok:
-	.string "4Pok$"
-
-	.align 2
-gUnknown_08216284:: @ 8216284
-	.4byte UnknownText_2Pok
-	.4byte UnknownText_3Pok
-	.4byte UnknownText_4Pok
-
-@ unreferenced
-	.string "1P$", 4
-	.string "2P$", 4
-	.string "3P$", 4
-	.string "4P$", 4
-
-.ifdef ENGLISH
-UnknownText_Mister:
-	.string "MISTER$"
-UnknownText_Laddie:
-	.string "LADDIE$"
-UnknownText_Lassie:
-	.string "LASSIE$"
-.else
-UnknownText_Mister:
-	.string "OPI$"
-UnknownText_Laddie:
-	.string "KUMPEL$"
-UnknownText_Lassie:
-	.string "TUSSI$"
-.endif
-
-	.align 2
-gUnknown_082162B8:: @ 82162B8
-	.4byte UnknownText_Mister
-	.4byte UnknownText_Laddie
-	.4byte UnknownText_Lassie
-
-gUnknown_082162C4:: @ 82162C4
-	.string "{COLOR RED}$"
-
-gUnknown_082162C8:: @ 82162C8
-	.string "\n$"
-
-	.string " $"
-
-gUnknown_082162CC:: @ 82162CC
-	.byte -1, -1
-	.byte  1, -1
-	.byte -1,  1
-	.byte  1,  1
-
-gUnknown_082162D4:: @ 82162D4
-	.byte  2,  6
-	.byte 23,  6
-	.byte  2, 12
-	.byte 23, 12
-	.byte  1,  6
-	.byte 22,  6
-	.byte  1, 12
-	.byte 22, 12
-
-gUnknown_082162E4:: @ 82162E4
-	.byte  72,  32
-	.byte 168,  32
-	.byte  72, 128
-	.byte 168, 128
-
-gUnknown_082162EC:: @ 82162EC
-	.byte -1,  0,  1, -1
-	.byte -1,  0,  1,  2
-	.byte  0,  1,  2,  3
-
-	.align 1
-gUnknown_082162F8:: @ 82162F8
-	.2byte 0x0000, 0xC000, 0x4000, 0x8000
-
-gUnknown_08216300:: @ 8216300
-	.byte 1
-	.byte 1
-	.byte 0
-
-gUnknown_08216303:: @ 8216303
-	.byte 32
-	.byte 224
-	.byte 96
-	.byte 160
-	.byte 0
-
-	.align 2
-gUnknown_08216308:: @ 8216308
-	.4byte sub_804F8C8
-	.4byte sub_804F9F4
-	.4byte sub_804FB1C
-
-	.align 2
-gOamData_8216314:: @ 8216314
-	.2byte 0x0000
-	.2byte 0x8000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_821631C:: @ 821631C
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216324:: @ 8216324
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_821632C:: @ 821632C
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216334:: @ 8216334
-	obj_image_anim_frame 16, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_821633C:: @ 821633C
-	obj_image_anim_frame 48, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 48, 3, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216350:: @ 8216350
-	obj_image_anim_frame 48, 2, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 32, 5, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 48, 3, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216364:: @ 8216364
-	obj_image_anim_frame 48, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 48, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216378:: @ 8216378
-	obj_image_anim_frame 48, 2
-	obj_image_anim_frame 32, 5
-	obj_image_anim_frame 48, 3
-	obj_image_anim_frame 16, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_821638C:: @ 821638C
-	obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216394:: @ 8216394
-	obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_821639C:: @ 821639C
-	obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_82163A4:: @ 82163A4
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_82163AC:: @ 82163AC
-	.4byte gSpriteAnim_821631C
-	.4byte gSpriteAnim_8216324
-	.4byte gSpriteAnim_821632C
-	.4byte gSpriteAnim_8216334
-	.4byte gSpriteAnim_821633C
-	.4byte gSpriteAnim_8216350
-	.4byte gSpriteAnim_8216364
-	.4byte gSpriteAnim_8216378
-	.4byte gSpriteAnim_821638C
-	.4byte gSpriteAnim_8216394
-	.4byte gSpriteAnim_821639C
-	.4byte gSpriteAnim_82163A4
-
-	.align 2
-gUnknown_082163DC:: @ 82163DC
-	obj_tiles gBerryBlenderArrowTiles, 0x800, 46545
-
-	.align 2
-gUnknown_082163E4:: @ 82163E4
-	obj_pal gBerryBlenderMiscPalette, 46546
-
-	.align 2
-gUnknown_082163EC:: @ 82163EC
-	obj_pal gBerryBlenderArrowPalette, 12312
-
-	.align 2
-gSpriteTemplate_82163F4:: @ 82163F4
-	spr_template 46545, 12312, gOamData_8216314, gSpriteAnimTable_82163AC, NULL, gDummySpriteAffineAnimTable, sub_8051C04
-
-	.align 2
-gOamData_821640C:: @ 821640C
-	.2byte 0x0000
-	.2byte 0x4000
-	.2byte 0x0000
-
-	.align 2
-gSpriteAnim_8216414:: @ 8216414
-	obj_image_anim_frame 0, 20
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_821641C:: @ 821641C
-	obj_image_anim_frame 4, 20, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216424:: @ 8216424
-	obj_image_anim_frame 8, 4
-	obj_image_anim_frame 12, 4
-	obj_image_anim_frame 8, 4
-	obj_image_anim_frame 12, 4
-	obj_image_anim_frame 8, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_821643C:: @ 821643C
-	obj_image_anim_frame 8, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8216444:: @ 8216444
-	.4byte gSpriteAnim_8216414
-	.4byte gSpriteAnim_821641C
-	.4byte gSpriteAnim_8216424
-	.4byte gSpriteAnim_821643C
-
-	.align 2
-gUnknown_08216454:: @ 8216454
-	obj_tiles gBerryBlenderMarubatsuTiles, 0x200, 48888
-
-	.align 2
-gSpriteTemplate_821645C:: @ 821645C
-	spr_template 48888, 46546, gOamData_821640C, gSpriteAnimTable_8216444, NULL, gDummySpriteAffineAnimTable, sub_8051650
-
-	.align 2
-gOamData_8216474:: @ 8216474
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_821647C:: @ 821647C
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 3, 5
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 0, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216494:: @ 8216494
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 4, 5
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 0, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_82164AC:: @ 82164AC
-	obj_image_anim_frame 0, 2
-	obj_image_anim_frame 1, 2
-	obj_image_anim_frame 2, 2
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 3, 3
-	obj_image_anim_frame 2, 2
-	obj_image_anim_frame 1, 2
-	obj_image_anim_frame 0, 2
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_82164D0:: @ 82164D0
-	obj_image_anim_frame 5, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_82164D8:: @ 82164D8
-	obj_image_anim_frame 6, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_82164E0:: @ 82164E0
-	.4byte gSpriteAnim_821647C
-	.4byte gSpriteAnim_8216494
-	.4byte gSpriteAnim_82164AC
-	.4byte gSpriteAnim_82164D0
-	.4byte gSpriteAnim_82164D8
-
-	.align 2
-gUnknown_082164F4:: @ 82164F4
-	obj_tiles gBerryBlenderParticlesTiles, 0xE0, 23456
-
-	.align 2
-gSpriteTemplate_82164FC:: @ 82164FC
-	spr_template 23456, 46546, gOamData_8216474, gSpriteAnimTable_82164E0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gOamData_8216514:: @ 8216514
-	.2byte 0x0000
-	.2byte 0x8000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_821651C:: @ 821651C
-	obj_image_anim_frame 32, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216524:: @ 8216524
-	obj_image_anim_frame 16, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_821652C:: @ 821652C
-	obj_image_anim_frame 0, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8216534:: @ 8216534
-	.4byte gSpriteAnim_821651C
-	.4byte gSpriteAnim_8216524
-	.4byte gSpriteAnim_821652C
-
-	.align 2
-gUnknown_08216540:: @ 8216540
-	obj_tiles gBerryBlenderCountdownNumbersTiles, 0x600, 12345
-
-	.align 2
-gSpriteTemplate_8216548:: @ 8216548
-	spr_template 12345, 46546, gOamData_8216514, gSpriteAnimTable_8216534, NULL, gDummySpriteAffineAnimTable, sub_805181C
-
-	.align 2
-gOamData_8216560:: @ 8216560
-	.2byte 0x4000
-	.2byte 0xC000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_8216568:: @ 8216568
-	obj_image_anim_frame 0, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8216570:: @ 8216570
-	.4byte gSpriteAnim_8216568
-
-	.align 2
-gUnknown_08216574:: @ 8216574
-	obj_tiles gBerryBlenderStartTiles, 0x400, 12346
-
-	.align 2
-gSpriteTemplate_821657C:: @ 821657C
-	spr_template 12346, 46546, gOamData_8216560, gSpriteAnimTable_8216570, NULL, gDummySpriteAffineAnimTable, sub_80518CC
-
-	.align 1
-gUnknown_08216594:: @ 8216594
-	.2byte -10,  20,  10,   2,   1
-	.2byte 250,  20,  10,  -2,   1
-	.2byte -10, 140,  10,   2,  -1
-	.2byte 250, 140,  10,  -2,  -1
-
-gUnknown_082165BC:: @ 82165BC
-	.byte 4, 3, 2
-	.byte 0, 4, 3
-	.byte 1, 0, 4
-	.byte 2, 1, 0
-	.byte 3, 2, 1
-	.byte 0, 2, 3
-	.byte 1, 3, 4
-	.byte 2, 4, 0
-	.byte 3, 0, 1
-	.byte 4, 1, 2
-
-gUnknown_082165DA:: @ 82165DA
-	.byte 1, 1, 2, 3, 4
-
-gUnknown_082165DF:: @ 82165DF
-	.byte 0x1C, 0x16, 0x13, 0x1A, 0x19, 0x0E, 0x0D, 0x0B, 0x07, 0x15
-
-gUnknown_082165E9:: @ 82165E9
-	.byte 6, 6, 6, 6, 5
-
-gUnknown_082165EE:: @ 82165EE
-	.byte 3, 3, 3, 2, 2
-
-gUnknown_082165F3:: @ 82165F3
-	.byte 3, 3, 3, 3, 2
-
-gUnknown_082165F8:: @ 82165F8
-	.string " $"
-
-gOtherText_BPMAndDash:: @ 82165FA
-	.string "BPM$"
-	.string "-$"
-
-gUnknown_08216600:: @ 8216600
-	.string "\n$"
-
-	.string "\n$"
diff --git a/data/data2b.s b/data/data2b.s
index 5fb3fa982..329384396 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -3,90 +3,6 @@
 
 	.section .rodata
 
-	.string "ターン$" @ "turn"
-
-	.align 2
-gPlayerBufferCommands:: @ 81FAD98
-	.4byte PlayerHandleGetAttributes
-	.4byte sub_802ECF0
-	.4byte PlayerHandleSetAttributes
-	.4byte sub_802F7CC
-	.4byte PlayerHandleLoadPokeSprite
-	.4byte PlayerHandleSendOutPoke
-	.4byte PlayerHandleReturnPokeToBall
-	.4byte PlayerHandleTrainerThrow
-	.4byte PlayerHandleTrainerSlide
-	.4byte PlayerHandleTrainerSlideBack
-	.4byte sub_802FE7C
-	.4byte sub_802FF60
-	.4byte sub_802FF80
-	.4byte PlayerHandleBallThrow
-	.4byte PlayerHandlePuase
-	.4byte PlayerHandleMoveAnimation
-	.4byte PlayerHandlePrintString
-	.4byte PlayerHandlePrintStringPlayerOnly
-	.4byte sub_803037C
-	.4byte nullsub_42
-	.4byte sub_8030468
-	.4byte PlayerHandleOpenBag
-	.4byte sub_8030594
-	.4byte sub_8030674
-	.4byte PlayerHandleHealthBarUpdate
-	.4byte PlayerHandleExpBarUpdate
-	.4byte PlayerHandleStatusIconUpdate
-	.4byte PlayerHandleStatusAnimation
-	.4byte PlayerHandleStatusXor
-	.4byte sub_803097C
-	.4byte PlayerHandleDMATransfer
-	.4byte sub_8030A3C
-	.4byte sub_8030A6C
-	.4byte sub_8030A78
-	.4byte sub_8030A8C
-	.4byte sub_8030AA0
-	.4byte sub_8030AB4
-	.4byte sub_8030AC8
-	.4byte sub_8030AE4
-	.4byte sub_8030B1C
-	.4byte sub_8030B34
-	.4byte PlayerHandleHitAnimation
-	.4byte sub_8030BCC
-	.4byte PlayerHandleEffectivenessSound
-	.4byte sub_8030C1C
-	.4byte PlayerHandleFaintingCry
-	.4byte PlayerHandleIntroSlide
-	.4byte PlayerHandleTrainerBallThrow
-	.4byte sub_8030FAC
-	.4byte sub_80310A4
-	.4byte sub_80310F0
-	.4byte PlayerHandleSpriteInvisibility
-	.4byte PlayerHandleBattleAnimation
-	.4byte PlayerHandleLinkStandbyMsg
-	.4byte PlayerHandleResetActionMoveSelection
-	.4byte sub_80312A0
-	.4byte nullsub_43
-
-gUnknown_081FAE7C:: @ 81FAE7C
-	.byte 0, 2, 3, 1
-
-gUnknown_081FAE80:: @ 81FAE80
-	.string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW WHITE LIGHT_BLUE WHITE2}$"
-
-gUnknown_081FAE89:: @ 81FAE89
-	.byte  8, 120
-	.byte 88, 120
-	.byte  8, 136
-	.byte 88, 136
-
-gUnknown_081FAE91:: @ 81FAE91
-	.byte 144, 120
-	.byte 190, 120
-	.byte 144, 136
-	.byte 190, 136
-	.byte  72,  72
-	.byte  32,  90
-	.byte  80,  80
-	.byte  80,  88
-
 	.align 2
 gUnknown_081FAEA4:: @ 81FAEA4
 	obj_tiles gSmokescreenImpactTiles, 0x180, 55019
@@ -160,129 +76,3 @@ gUnknown_081FAF4C:: @ 81FAF4C
 	.4byte 0x0200a000
 	.4byte 0x0200c000
 	.4byte 0x0200e000
-
-	.align 2
-gOpponentBufferCommands:: @ 81FAF5C
-	.4byte OpponentHandleGetAttributes
-	.4byte dp01t_01_2_read_pokmon_data_slice
-	.4byte OpponentHandleSetAttributes
-	.4byte sub_8034744
-	.4byte OpponentHandleLoadPokeSprite
-	.4byte OpponentHandleSendOutPoke
-	.4byte OpponentHandleReturnPokeToBall
-	.4byte OpponentHandleTrainerThrow
-	.4byte OpponentHandleTrainerSlide
-	.4byte OpponentHandleTrainerSlideBack
-	.4byte sub_8035030
-	.4byte sub_80350D4
-	.4byte sub_80350E0
-	.4byte OpponentHandleBallThrow
-	.4byte OpponentHandlePause
-	.4byte OpponentHandleMoveAnimation
-	.4byte OpponentHandlePrintString
-	.4byte OpponentHandlePrintStringPlayerOnly
-	.4byte sub_803540C
-	.4byte sub_803541C
-	.4byte sub_8035428
-	.4byte sub_8035590
-	.4byte sub_80355C0
-	.4byte sub_80356C0
-	.4byte OpponentHandleHealthBarUpdate
-	.4byte OpponentHandleExpBarUpdate
-	.4byte OpponentHandleStatusIconUpdate
-	.4byte OpponentHandleStatusAnimation
-	.4byte OpponentHandleStatusXor
-	.4byte sub_80358B0
-	.4byte OpponentHandleDMATransfer
-	.4byte sub_80358C8
-	.4byte sub_80358D4
-	.4byte sub_80358E0
-	.4byte sub_80358EC
-	.4byte sub_80358F8
-	.4byte sub_8035904
-	.4byte sub_8035910
-	.4byte sub_803592C
-	.4byte sub_8035964
-	.4byte sub_803597C
-	.4byte OpponentHandleHitAnimation
-	.4byte sub_8035A14
-	.4byte OpponentHandleEffectivenessSound
-	.4byte sub_8035A64
-	.4byte OpponentHandleFaintingCry
-	.4byte dp01t_2E_7_battle_intro
-	.4byte sub_8035B04
-	.4byte dp01t_30_7_0803D67C
-	.4byte sub_8035E6C
-	.4byte sub_8035EB8
-	.4byte OpponentHandleSpriteInvisibility
-	.4byte OpponentHandleBattleAnimation
-	.4byte OpponentHandleLinkStandbyMsg
-	.4byte OpponentHandleResetActionMoveSelection
-	.4byte sub_8035FA4
-	.4byte nullsub_46
-
-@ unreferenced unknown values
-	.byte 0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20
-
-	.align 2
-gLinkOpponentBufferCommands:: @ 81FB048
-	.4byte LinkOpponentHandleGetAttributes
-	.4byte sub_803889C
-	.4byte sub_80388A8
-	.4byte sub_8039220
-	.4byte sub_8039294
-	.4byte sub_80393E4
-	.4byte sub_80395B4
-	.4byte sub_80396D0
-	.4byte sub_80398A4
-	.4byte sub_80398B0
-	.4byte sub_803995C
-	.4byte sub_8039A00
-	.4byte sub_8039A0C
-	.4byte sub_8039A18
-	.4byte sub_8039A24
-	.4byte sub_8039A30
-	.4byte sub_8039CC8
-	.4byte sub_8039D2C
-	.4byte sub_8039D38
-	.4byte sub_8039D44
-	.4byte sub_8039D50
-	.4byte sub_8039D5C
-	.4byte sub_8039D68
-	.4byte sub_8039D74
-	.4byte sub_8039D80
-	.4byte sub_8039E70
-	.4byte sub_8039E7C
-	.4byte sub_8039EF0
-	.4byte sub_8039F58
-	.4byte sub_8039F64
-	.4byte sub_8039F70
-	.4byte sub_8039F7C
-	.4byte sub_8039F88
-	.4byte sub_8039F94
-	.4byte sub_8039FA0
-	.4byte sub_8039FAC
-	.4byte sub_8039FB8
-	.4byte sub_8039FC4
-	.4byte sub_8039FE0
-	.4byte sub_803A018
-	.4byte sub_803A030
-	.4byte dp01t_29_4_blink
-	.4byte sub_803A0C8
-	.4byte sub_803A0D4
-	.4byte sub_803A118
-	.4byte sub_803A148
-	.4byte dp01t_2E_4_battle_intro
-	.4byte sub_803A1B8
-	.4byte sub_803A3DC
-	.4byte sub_803A520
-	.4byte sub_803A56C
-	.4byte sub_803A578
-	.4byte bx_exec_buffer_A_ch0_tbl4
-	.4byte sub_803A640
-	.4byte sub_803A64C
-	.4byte sub_803A658
-	.4byte nullsub_48
-
-@ 81FB12C
-	.include "data/battle_moves.inc"
diff --git a/data/egg_hatch.s b/data/egg_hatch.s
deleted file mode 100644
index 1823409dd..000000000
--- a/data/egg_hatch.s
+++ /dev/null
@@ -1,122 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-EggPalette:: @ 8209AD8
-	.incbin "graphics/pokemon/egg/palette.gbapal"
-
-EggHatchTiles:: @ 8209AF8
-	.incbin "graphics/misc/egg_hatch.4bpp"
-
-EggShardTiles:: @ 820A2F8
-	.incbin "graphics/misc/egg_shard.4bpp"
-
-	.align 2
-gOamData_820A378:: @ 820A378
-	.2byte 0x0000
-	.2byte 0x8000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_820A380:: @ 820A380
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820A388:: @ 820A388
-	obj_image_anim_frame 16, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820A390:: @ 820A390
-	obj_image_anim_frame 32, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820A398:: @ 820A398
-	obj_image_anim_frame 48, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_820A3A0:: @ 820A3A0
-	.4byte gSpriteAnim_820A380
-	.4byte gSpriteAnim_820A388
-	.4byte gSpriteAnim_820A390
-	.4byte gSpriteAnim_820A398
-
-	.align 2
-gUnknown_0820A3B0:: @ 820A3B0
-	obj_tiles EggHatchTiles, 2048, 12345
-
-	.align 2
-gUnknown_0820A3B8:: @ 820A3B8
-	obj_tiles EggShardTiles, 128, 23456
-
-	.align 2
-gUnknown_0820A3C0:: @ 820A3C0
-	obj_pal EggPalette, 54321
-
-	.align 2
-gSpriteTemplate_820A3C8:: @ 820A3C8
-	spr_template 12345, 54321, gOamData_820A378, gSpriteAnimTable_820A3A0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gOamData_820A3E0:: @ 820A3E0
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0800
-
-	.align 2
-gSpriteAnim_820A3E8:: @ 820A3E8
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820A3F0:: @ 820A3F0
-	obj_image_anim_frame 1, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820A3F8:: @ 820A3F8
-	obj_image_anim_frame 2, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820A400:: @ 820A400
-	obj_image_anim_frame 3, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_820A408:: @ 820A408
-	.4byte gSpriteAnim_820A3E8
-	.4byte gSpriteAnim_820A3F0
-	.4byte gSpriteAnim_820A3F8
-	.4byte gSpriteAnim_820A400
-
-	.align 2
-gSpriteTemplate_820A418:: @ 820A418
-	spr_template 23456, 54321, gOamData_820A3E0, gSpriteAnimTable_820A408, NULL, gDummySpriteAffineAnimTable, SpriteCB_EggShard
-
-@ The values are Q8.8 fixed-point numbers.
-	.align 1
-gEggShardVelocities:: @ 820A430
-	.2byte 0xFE80, 0xFC40 @ (-1.5, -3.75)
-	.2byte 0xFB00, 0xFD00 @ (-5, -3)
-	.2byte 0x0380, 0xFD00 @ (3.5, -3)
-	.2byte 0xFC00, 0xFC40 @ (-4, -3.75)
-	.2byte 0x0200, 0xFE80 @ (2, -1.5)
-	.2byte 0xFF80, 0xF940 @ (-0.5, -6.75)
-	.2byte 0x0500, 0xFDC0 @ (5, -2.25)
-	.2byte 0xFE80, 0xFC40 @ (-1.5, -3.75)
-	.2byte 0x0480, 0xFE80 @ (4.5, -1.5)
-	.2byte 0xFF00, 0xF940 @ (-1, -6.75)
-	.2byte 0x0400, 0xFDC0 @ (4, -2.25)
-	.2byte 0xFC80, 0xFC40 @ (-3.5, -3.75)
-	.2byte 0x0100, 0xFE80 @ (1, -1.5)
-	.2byte 0xFC7C, 0xF940 @ (-3.515625, -6.75)
-	.2byte 0x0480, 0xFDC0 @ (4.5, -2.25)
-	.2byte 0xFF80, 0xF880 @ (-0.5, -7.5)
-	.2byte 0x0100, 0xFB80 @ (1, -4.5)
-	.2byte 0xFD80, 0xFDC0 @ (-2.5, -2.25)
-	.2byte 0x0280, 0xF880 @ (2.5, -7.5)
diff --git a/data/evolution_graphics.s b/data/evolution_graphics.s
deleted file mode 100644
index e362b4dba..000000000
--- a/data/evolution_graphics.s
+++ /dev/null
@@ -1,70 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gEvoSparklePalette: @ 8416E44
-	.incbin "graphics/misc/evo_sparkle.gbapal"
-
-	.align 2
-gEvoSparkleTiles: @ 8416E64
-	.incbin "graphics/misc/evo_sparkle.4bpp.lz"
-
-gUnknown_08416E84:: @ 8416E84
-	obj_tiles gEvoSparkleTiles, 0x20, 1001
-	.space 8
-
-gUnknown_08416E94:: @ 8416E94
-	obj_pal gEvoSparklePalette, 1001
-	.space 8
-
-	.align 2
-gOamData_8416EA4:: @ 8416EA4
-	.2byte 0x00A0
-	.2byte 0x0000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_8416EAC:: @ 8416EAC
-	obj_image_anim_frame 0, 8
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8416EB4:: @ 8416EB4
-	.4byte gSpriteAnim_8416EAC
-
-	.align 2
-gSpriteTemplate_8416EB8:: @ 8416EB8
-	spr_template 1001, 1001, gOamData_8416EA4, gSpriteAnimTable_8416EB4, NULL, gDummySpriteAffineAnimTable, nullsub_84
-
-	.align 1
-gUnknown_08416ED0:: @ 8416ED0
-	.2byte  0x3C0
-	.2byte  0x380
-	.2byte  0x340
-	.2byte  0x300
-	.2byte  0x2C0
-	.2byte  0x280
-	.2byte  0x240
-	.2byte  0x200
-	.2byte  0x1C0
-	.2byte  0x180
-	.2byte  0x140
-	.2byte  0x100
-	.2byte 0xFFFC
-	.2byte   0x10
-	.2byte 0xFFFD
-	.2byte   0x30
-	.2byte 0xFFFE
-	.2byte   0x50
-	.2byte 0xFFFF
-	.2byte   0x70
-	.2byte    0x1
-	.2byte   0x70
-	.2byte    0x2
-	.2byte   0x50
-	.2byte    0x3
-	.2byte   0x30
-	.2byte    0x4
-	.2byte   0x10
diff --git a/data/hall_of_fame.s b/data/hall_of_fame.s
deleted file mode 100644
index 0795e7389..000000000
--- a/data/hall_of_fame.s
+++ /dev/null
@@ -1,230 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_0840B514:: @ 840B514
-	obj_tiles gContestConfetti_Gfx, 0x220, 1001
-	.space 8
-
-gUnknown_0840B524:: @ 840B524
-	obj_pal gContestConfetti_Pal, 1001
-	.space 8
-
-	.align 2
-gUnknown_0840B534:: @ 840B534
-	.2byte 120,210,120, 40
-	.2byte 326,220, 56, 40
-	.2byte -86,220,184, 40
-	.2byte 120,-62,120, 88
-	.2byte -25,-62,200, 88
-	.2byte 265,-62, 40, 88
-
-	.align 2
-gUnknown_0840B564:: @ 840B564
-	.2byte 120,214,120, 64
-	.2byte 281,214, 56, 64
-	.2byte -41,214,184, 64
-
-	.align 2
-gUnknown_0840B57C:: @ 840B57C
-	.2byte 1002
-	.2byte 1002
-	.space 0x10
-
-@ unused data?
-	.byte 2, 1, 3, 6, 4, 5
-
-	.align 2
-gOamData_840B598:: @ 840B598
-	.2byte 0x0000
-	.2byte 0xC000
-	.2byte 0x0000
-
-	.align 2
-gUnknown_0840B5A0:: @ 840B5A0
-	.4byte 0x02008000
-	.4byte 0x0200A000
-	.4byte 0x0200C000
-	.4byte 0x0200E000
-	.4byte 0x02010000
-	.4byte 0x02014000
-	.4byte 0x02018000
-
-	.align 2
-gSpriteImageTable_840B5BC:: @ 840B5BC
-	obj_frame_tiles 0x02008000, 0x800
-	obj_frame_tiles 0x02008800, 0x800
-	obj_frame_tiles 0x02009000, 0x800
-	obj_frame_tiles 0x02009800, 0x800
-
-	.align 2
-gSpriteImageTable_840B5DC:: @ 840B5DC
-	obj_frame_tiles 0x0200A000, 0x800
-	obj_frame_tiles 0x0200A800, 0x800
-	obj_frame_tiles 0x0200B000, 0x800
-	obj_frame_tiles 0x0200B800, 0x800
-
-	.align 2
-gSpriteImageTable_840B5FC:: @ 840B5FC
-	obj_frame_tiles 0x0200C000, 0x800
-	obj_frame_tiles 0x0200C800, 0x800
-	obj_frame_tiles 0x0200D000, 0x800
-	obj_frame_tiles 0x0200D800, 0x800
-
-	.align 2
-gSpriteImageTable_840B61C:: @ 840B61C
-	obj_frame_tiles 0x0200E000, 0x800
-	obj_frame_tiles 0x0200E800, 0x800
-	obj_frame_tiles 0x0200F000, 0x800
-	obj_frame_tiles 0x0200F800, 0x800
-
-	.align 2
-gSpriteImageTable_840B63C:: @ 840B63C
-	obj_frame_tiles 0x02010000, 0x800
-	obj_frame_tiles 0x02010800, 0x800
-	obj_frame_tiles 0x02011000, 0x800
-	obj_frame_tiles 0x02011800, 0x800
-
-	.align 2
-gSpriteImageTable_840B65C:: @ 840B65C
-	obj_frame_tiles 0x02014000, 0x800
-	obj_frame_tiles 0x02014800, 0x800
-	obj_frame_tiles 0x02015000, 0x800
-	obj_frame_tiles 0x02015800, 0x800
-
-	.align 2
-gSpriteImageTable_840B67C:: @ 840B67C
-	obj_frame_tiles 0x02018000, 0x800
-	obj_frame_tiles 0x02018800, 0x800
-	obj_frame_tiles 0x02019000, 0x800
-	obj_frame_tiles 0x02019800, 0x800
-
-	.align 2
-gUnknown_0840B69C:: @ 840B69C
-	.4byte gSpriteImageTable_840B5BC
-	.4byte gSpriteImageTable_840B5DC
-	.4byte gSpriteImageTable_840B5FC
-	.4byte gSpriteImageTable_840B61C
-	.4byte gSpriteImageTable_840B63C
-	.4byte gSpriteImageTable_840B65C
-	.4byte gSpriteImageTable_840B67C
-
-gUnknown_0840B6B8:: @ 840B6B8
-	spr_template -1, -1, gOamData_840B598, NULL, gSpriteImageTable_840B5BC, gDummySpriteAffineAnimTable, nullsub_81
-
-	.align 2
-gOamData_840B6D0:: @ 840B6D0
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-
-	.align 2
-gSpriteAnim_840B6D8:: @ 840B6D8
-	obj_image_anim_frame 0, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B6E0:: @ 840B6E0
-	obj_image_anim_frame 1, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B6E8:: @ 840B6E8
-	obj_image_anim_frame 2, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B6F0:: @ 840B6F0
-	obj_image_anim_frame 3, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B6F8:: @ 840B6F8
-	obj_image_anim_frame 4, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B700:: @ 840B700
-	obj_image_anim_frame 5, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B708:: @ 840B708
-	obj_image_anim_frame 6, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B710:: @ 840B710
-	obj_image_anim_frame 7, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B718:: @ 840B718
-	obj_image_anim_frame 8, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B720:: @ 840B720
-	obj_image_anim_frame 9, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B728:: @ 840B728
-	obj_image_anim_frame 10, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B730:: @ 840B730
-	obj_image_anim_frame 11, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B738:: @ 840B738
-	obj_image_anim_frame 12, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B740:: @ 840B740
-	obj_image_anim_frame 13, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B748:: @ 840B748
-	obj_image_anim_frame 14, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B750:: @ 840B750
-	obj_image_anim_frame 15, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B758:: @ 840B758
-	obj_image_anim_frame 16, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_840B760:: @ 840B760
-	.4byte gSpriteAnim_840B6D8
-	.4byte gSpriteAnim_840B6E0
-	.4byte gSpriteAnim_840B6E8
-	.4byte gSpriteAnim_840B6F0
-	.4byte gSpriteAnim_840B6F8
-	.4byte gSpriteAnim_840B700
-	.4byte gSpriteAnim_840B708
-	.4byte gSpriteAnim_840B710
-	.4byte gSpriteAnim_840B718
-	.4byte gSpriteAnim_840B720
-	.4byte gSpriteAnim_840B728
-	.4byte gSpriteAnim_840B730
-	.4byte gSpriteAnim_840B738
-	.4byte gSpriteAnim_840B740
-	.4byte gSpriteAnim_840B748
-	.4byte gSpriteAnim_840B750
-	.4byte gSpriteAnim_840B758
-
-	.align 2
-gSpriteTemplate_840B7A4:: @ 840B7A4
-	spr_template 1001, 1001, gOamData_840B6D0, gSpriteAnimTable_840B760, NULL, gDummySpriteAffineAnimTable, sub_814386C
diff --git a/data/learn_move.s b/data/learn_move.s
deleted file mode 100644
index 369fbfdf0..000000000
--- a/data/learn_move.s
+++ /dev/null
@@ -1,150 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gDexArrows_Pal::
-	.incbin "graphics/pokedex/arrows.gbapal"
-
-	.align 2
-gDexArrows_Gfx::
-	.incbin "graphics/pokedex/arrows.4bpp"
-
-gUnknown_08402CF8:: @ 8402CF8
-	.byte 0,  0,  9,  13
-	.byte 10, 0,  29, 7
-	.byte 2,  14, 27, 19
-	.byte 10, 8,  29, 13
-
-gUnknown_08402D08:: @ 8402D08
-	.4byte OtherText_Battle
-	.byte 1, 1, 0, 0
-	.4byte OtherText_Power
-	.byte 1, 4, 1, 0
-	.4byte OtherText_Accuracy
-	.byte 1, 9, 2, 0
-	.space 8
-
-	.4byte OtherText_Contest
-	.byte 1, 1, 0, 0
-	.4byte OtherText_Appeal
-	.byte 1, 4, 1, 0
-	.4byte OtherText_Jam
-	.byte 1, 9, 2, 0
-	.space 8
-
-	.4byte 0xFF00FFEF
-	.4byte gTileBuffer
-
-	.align 2
-gOamData_8402D50:: @ 8402D50
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-
-	.align 2
-gOamData_8402D58:: @ 8402D58
-	.2byte 0x8000
-	.2byte 0x0000
-	.2byte 0x0000
-
-	.align 2
-gOamData_8402D60:: @ 8402D60
-	.2byte 0x4000
-	.2byte 0x0000
-	.2byte 0x0000
-
-	.align 2
-gSpriteAnim_8402D68:: @ 8402D68
-	obj_image_anim_frame 2, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8402D70:: @ 8402D70
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8402D78:: @ 8402D78
-	.4byte gSpriteAnim_8402D68
-	.4byte gSpriteAnim_8402D70
-
-	.align 2
-gUnknown_08402D80:: @ 8402D80
-	obj_tiles gDexArrows_Gfx, 384, 0x1595
-
-	.align 2
-gUnknown_08402D88:: @ 8402D88
-	obj_pal gDexArrows_Pal, 0x1596
-
-	.align 2
-gSpriteTemplate_8402D90:: @ 8402D90
-	spr_template 5525, 5526, gOamData_8402D58, gSpriteAnimTable_8402D78, NULL, gDummySpriteAffineAnimTable, sub_8133300
-
-	.align 2
-gSpriteAnim_8402DA8:: @ 8402DA8
-	obj_image_anim_frame 4, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8402DB0:: @ 8402DB0
-	obj_image_anim_frame 6, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8402DB8:: @ 8402DB8
-	.4byte gSpriteAnim_8402DA8
-	.4byte gSpriteAnim_8402DB0
-
-	.align 2
-gSpriteTemplate_8402DC0:: @ 8402DC0
-	spr_template 5525, 5526, gOamData_8402D60, gSpriteAnimTable_8402DB8, NULL, gDummySpriteAffineAnimTable, sub_8133300
-
-	.align 2
-gSpriteAnim_8402DD8:: @ 8402DD8
-	obj_image_anim_frame 8, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8402DE0:: @ 8402DE0
-	obj_image_anim_frame 9, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8402DE8:: @ 8402DE8
-	obj_image_anim_frame 10, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8402DF0:: @ 8402DF0
-	obj_image_anim_frame 11, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8402DF8:: @ 8402DF8
-	.4byte gSpriteAnim_8402DD8
-	.4byte gSpriteAnim_8402DE0
-	.4byte gSpriteAnim_8402DE8
-	.4byte gSpriteAnim_8402DF0
-
-	.align 2
-gSpriteTemplate_8402E08:: @ 8402E08
-	spr_template 5525, 5526, gOamData_8402D50, gSpriteAnimTable_8402DF8, NULL, gDummySpriteAffineAnimTable, sub_8133300
-
-	.string "あきと$" @ programmer Akito Mori?
-
-gUnknown_08402E24:: @ 8402E24
-	.byte 11,  1,  1
-	.byte  3,  6,  2
-	.byte 24,  1,  3
-	.byte  3, 11,  4
-	.byte  5,  4,  5
-	.byte  3,  6,  6
-	.byte  3, 11,  7
-
-gUnknown_08402E39:: @ 8402E39
-	.byte 0, 1, 2, 3
-
-gUnknown_08402E3D:: @ 8402E3D
-	.byte 4, 5, 6
diff --git a/data/mon_pokeblock_anims.inc b/data/mon_pokeblock_anims.inc
deleted file mode 100644
index d8df29c1d..000000000
--- a/data/mon_pokeblock_anims.inc
+++ /dev/null
@@ -1,133 +0,0 @@
-gNatureToMonPokeblockAnim:: @ 8411A10
-	.byte  0, 0 @ HARDY
-	.byte  3, 0 @ LONELY
-	.byte  4, 1 @ BRAVE
-	.byte  5, 0 @ ADAMANT
-	.byte 10, 0 @ NAUGHTY
-	.byte 13, 0 @ BOLD
-	.byte 15, 0 @ DOCILE
-	.byte 16, 2 @ RELAXED
-	.byte 18, 0 @ IMPISH
-	.byte 19, 0 @ LAX
-	.byte 20, 0 @ TIMID
-	.byte 25, 0 @ HASTY
-	.byte 27, 3 @ SERIOUS
-	.byte 28, 0 @ JOLLY
-	.byte 29, 0 @ NAIVE
-	.byte 33, 4 @ MODEST
-	.byte 36, 0 @ MILD
-	.byte 37, 0 @ QUIET
-	.byte 39, 0 @ BASHFUL
-	.byte 42, 0 @ RASH
-	.byte 45, 0 @ CALM
-	.byte 46, 5 @ GENTLE
-	.byte 47, 6 @ SASSY
-	.byte 48, 0 @ CAREFUL
-	.byte 53, 0 @ QUIRKY
-
-	.align 1
-gMonPokeblockAnims:: @ 8411A42
-	@ HARDY
-	.2byte   0,   4,   0,   8,  24,   0,   0,   0,  12,   0
-	.2byte   0,   4,   0,  16,  24,   0,   0,   0,  12,   0
-	.2byte   0,   4,   0,  32,  32,   0,   0,   0,  16,   1
-
-	@ LONELY
-	.2byte   0,   3,   6,   0,  48,   0,   0,   0,  24,   1
-
-	@ BRAVE
-	.2byte  64,  16, -24,   0,  32,   0,   0,   0,   0,   1
-
-	@ ADAMANT
-	.2byte   0,   4,   8,   0,  16,   0,  -8,   0,   0,   0
-	.2byte   0,   0,   0,   0,  16,   0,   0,   0,   0,   0
-	.2byte   0,   4,   8,   0,  16,   0,  -8,   0,   0,   0
-	.2byte   0,   0,   0,   0,  16,   0,   0,   0,   0,   0
-	.2byte   0,   4, -16,   0,   4,   0,  16,   0,   0,   1
-
-	@ NAUGHTY
-	.2byte   0,   3,   6,   0,  12,   0,   0,   0,   6,   0
-	.2byte   0,   3,  -6,   0,  12,   0,   0,   0,   6,   0
-	.2byte   0,  16,  16,   0,  45,   1,   0,   0,   0,   1
-
-	@ BOLD
-	.2byte   0,  16,   0,  24,  32,   0,   0,   0,  16,   0
-	.2byte   0,  16,   0,  23,  32,   0,   0,   0,  16,   1
-
-	@ DOCILE
-	.2byte   0,   0,   0,   0,  80,   0,   0,   0,   0,   1
-
-	@ RELAXED
-	.2byte   0,   2,   8,   0,  32,   0,   0,   0,   0,   0
-	.2byte   0,   2,  -8,   0,  32,   0,   0,   0,   0,   1
-
-	@ IMPISH
-	.2byte   0,  32,   2,   1,  48,   1,   0,   0,  24,   1
-
-	@ LAX
-	.2byte   0,   2,  16,  16, 128,   0,   0,   0,   0,   1
-
-	@ TIMID
-	.2byte   0,   2,  -8,   0,  48,   0, -24,   0,   0,   0
-	.2byte   0,   0,   0,   0,   8,   0,   0,   0,   0,   0
-	.2byte  64,  32,   2,   0,  36,   0,   0,   0,   0,   0
-	.2byte   0,   0,   0,   0,   8,   0,   0,   0,   0,   0
-	.2byte   0,   2,   8,   0,  48,   0,  24,   0,   0,   1
-
-	@ HASTY
-	.2byte  64,  24,  16,   0,  32,   0,   0,   0,   0,   0
-	.2byte   0,  28,   2,   1,  32,   1,   0,   0,  16,   1
-
-	@ SERIOUS
-	.2byte   0,   0,   0,   0,  32,   0,   0,   0,   0,   1
-
-	@ JOLLY
-	.2byte  64,  16, -16,   2,  48,   0,   0,   0,  32,   1
-
-	@ NAIVE
-	.2byte   0,  12,  -8,   4,  24,   0,   8,   0,  12,   0
-	.2byte   0,  12,   8,   8,  24,   0, -16,   0,  12,   0
-	.2byte   0,  12,  -8,  16,  24,   0,  16,   0,  12,   0
-	.2byte   0,  12,   8,  28,  24,   0,  -8,   0,  12,   1
-
-	@ MODEST
-	.2byte   0,   0,   0,   0,   8,   0,   0,   0,   0,   0
-	.2byte  64,  16,  -4,   0,  32,   0,   0,   0,   0,   0
-	.2byte   0,   0,   0,   0,   8,   0,   0,   0,   0,   1
-
-	@ MILD
-	.2byte 128,   4,   0,   8,  64,   0,   0,   0,   0,   1
-
-	@ QUIET
-	.2byte   0,   2,  16,   0,  48,   0,   0,   0,   0,   0
-	.2byte 128,   2,  16,   0,  48,   0,   0,   0,   0,   1
-
-	@ BASHFUL
-	.2byte   0,   2,  -4,   0,  48,   0, -48,   0,   0,   0
-	.2byte   0,   0,   0,   0,  80,   0,   0,   0,   0,   0
-	.2byte   0,   2,   8,   0,  24,   0,  48,   0,   0,   1
-
-	@ RASH
-	.2byte  64,   4,  64,  58,  52,   0, -88,   0,   0,   0
-	.2byte   0,   0,   0,   0,  80,   0,   0,   0,   0,   0
-	.2byte   0,  24,  80,   0,  32,   0,  88,   0,   0,   1
-
-	@ CALM
-	.2byte   0,   2,  16,   4,  64,   0,   0,   0,   0,   1
-
-	@ GENTLE
-	.2byte   0,   0,   0,   0,  32,   0,   0,   0,   0,   1
-
-	@ SASSY
-	.2byte   0,   0,   0,   0,  42,   0,   0,   0,   0,   1
-
-	@ CAREFUL
-	.2byte   0,   4,   0,   8,  24,   0,   0,   0,  12,   0
-	.2byte   0,   0,   0,   0,  12,   0,   0,   0,   0,   0
-	.2byte   0,   4,   0,  12,  24,   0,   0,   0,  12,   0
-	.2byte   0,   0,   0,   0,  12,   0,   0,   0,   0,   0
-	.2byte   0,   4,   0,   4,  24,   0,   0,   0,  12,   1
-
-	@ QUIRKY
-	.2byte   0,   4,  16,  12,  64,   0,   0,   0,   0,   0
-	.2byte   0,  -4,  16,  12,  64,   0,   0,   0,   0,   1
diff --git a/data/pokeblock_feed.s b/data/pokeblock_feed.s
deleted file mode 100644
index ae5b17d12..000000000
--- a/data/pokeblock_feed.s
+++ /dev/null
@@ -1,225 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-@ 8411A10
-	.include "data/mon_pokeblock_anims.inc"
-
-	.align 2
-gSpriteAffineAnim_8411E90:: @ 8411E90
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411EA0:: @ 8411EA0
-	obj_rot_scal_anim_frame 0x0, 0x0, 12, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 30
-	obj_rot_scal_anim_frame 0x0, 0x0, -12, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411EC0:: @ 8411EC0
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 12, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 28
-	obj_rot_scal_anim_frame 0x0, 0x0, -4, 3
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411EE8:: @ 8411EE8
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 32
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411F08:: @ 8411F08
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 32
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411F30:: @ 8411F30
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411F50:: @ 8411F50
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411F78:: @ 8411F78
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 32
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411F98:: @ 8411F98
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 32
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411FC0:: @ 8411FC0
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 24
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 4
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411FE0:: @ 8411FE0
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 24
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 4
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8412008:: @ 8412008
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 24
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
-	obj_rot_scal_anim_frame 0x0, 0x0, -12, 2
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8412028:: @ 8412028
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 24
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
-	obj_rot_scal_anim_frame 0x0, 0x0, -12, 2
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_8412050:: @ 8412050
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411EA0
-	.4byte gSpriteAffineAnim_8411EE8
-	.4byte gSpriteAffineAnim_8411F30
-	.4byte gSpriteAffineAnim_8411F78
-	.4byte gSpriteAffineAnim_8411FC0
-	.4byte gSpriteAffineAnim_8412008
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411EC0
-	.4byte gSpriteAffineAnim_8411F08
-	.4byte gSpriteAffineAnim_8411F50
-	.4byte gSpriteAffineAnim_8411F98
-	.4byte gSpriteAffineAnim_8411FE0
-	.4byte gSpriteAffineAnim_8412028
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411E90
-
-	.align 2
-gUnknown_084120A4:: @ 84120A4
-	.4byte gPokeblockRed_Pal
-	.4byte gPokeblockBlue_Pal
-	.4byte gPokeblockPink_Pal
-	.4byte gPokeblockGreen_Pal
-	.4byte gPokeblockYellow_Pal
-	.4byte gPokeblockPurple_Pal
-	.4byte gPokeblockIndigo_Pal
-	.4byte gPokeblockBrown_Pal
-	.4byte gPokeblockLiteBlue_Pal
-	.4byte gPokeblockOlive_Pal
-	.4byte gPokeblockGray_Pal
-	.4byte gPokeblockBlack_Pal
-	.4byte gPokeblockWhite_Pal
-	.4byte gPokeblockGold_Pal
-
-	.align 2
-gSpriteAffineAnim_84120DC:: @ 84120DC
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_84120EC:: @ 84120EC
-	.4byte gSpriteAffineAnim_84120DC
-
-	.align 2
-gSpriteAffineAnim_84120F0:: @ 84120F0
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0x0, 0x0, 16, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 16, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 16, 1
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8412148:: @ 8412148
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0x0, 0x0, -16, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, -16, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, -16, 1
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_84121A0:: @ 84121A0
-	.4byte gSpriteAffineAnim_84120DC
-
-	.align 2
-gSpriteAffineAnimTable_84121A4:: @ 84121A4
-	.4byte gSpriteAffineAnim_84120F0
-
-	.align 2
-gSpriteAffineAnimTable_84121A8:: @ 84121A8
-	.4byte gSpriteAffineAnim_8412148
-
-	.align 2
-gOamData_84121AC:: @ 84121AC
-	.2byte 0x0300
-	.2byte 0x0000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_84121B4:: @ 84121B4
-	obj_image_anim_frame 0, 0
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_84121BC:: @ 84121BC
-	.4byte gSpriteAnim_84121B4
-
-	.align 2
-gSpriteAffineAnim_84121C0:: @ 84121C0
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_84121D8:: @ 84121D8
-	.4byte gSpriteAffineAnim_84121C0
-
-	.align 2
-gUnknown_084121DC:: @ 84121DC
-	obj_tiles gPokeblock_Gfx, 0x20, 14818
-
-	.align 2
-gSpriteTemplate_84121E4:: @ 84121E4
-	spr_template 14818, 14818, gOamData_84121AC, gSpriteAnimTable_84121BC, NULL, gSpriteAffineAnimTable_84121D8, sub_81481B0
diff --git a/data/shop.s b/data/shop.s
deleted file mode 100644
index 071874d0e..000000000
--- a/data/shop.s
+++ /dev/null
@@ -1,69 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_083CC6D0:: @ 83CC6D0
-	.4byte MartText_Buy, sub_80B2EFC
-	.4byte MartText_Sell, sub_80B2F30
-	.4byte MartText_Quit2, HandleShopMenuQuit
-
-gUnknown_083CC6E8:: @ 83CC6E8
-	.byte 0, 1, 2
-
-gUnknown_083CC6EB:: @ 83CC6EB
-	.byte 0, 2
-
-@ unknown, unreferenced data
-	.align 1
-	.2byte 0x2
-	.2byte 0x3
-	.2byte 0x4
-	.2byte 0xD
-	.2byte 0x121
-	.2byte 0xE
-	.2byte 0xE
-	.2byte 0xE
-	.2byte 0xE
-	.2byte 0xE
-	.2byte 0xE
-	.2byte 0x0
-	.2byte 0x0
-
-	.align 2
-gUnknown_083CC708:: @ 83CC708
-	.4byte sub_80B3BF4
-	.4byte sub_80B3D7C
-
-	.align 1
-gUnknown_083CC710:: @ 83CC710
-	.2byte 0x41EE,0x7FFF
-
-	.align 1
-gUnknown_083CC714:: @ 83CC714
-	.2byte 0x284,0x282,0x280
-
-	.align 1
-gUnknown_083CC71A:: @ 83CC71A
-	.2byte 0x285,0x283,0x281
-
-	.align 1
-gUnknown_083CC720:: @ 83CC720
-	.2byte 0x28C,0x28A,0x288
-
-	.align 1
-gUnknown_083CC726:: @ 83CC726
-	.2byte 0x28D,0x28B,0x289
-
-	.align 1
-gUnknown_083CC72C:: @ 83CC72C
-	.2byte 0x2A0,0x2A2,0x2A4
-
-	.align 1
-gUnknown_083CC732:: @ 83CC732
-	.2byte 0x2A1,0x2A3,0x2A5
-
-	.align 1
-gUnknown_083CC738:: @ 83CC738
-	.2byte 0x2A8,0x2AA,0x2AC