Merge branch 'master' into decompile_pokeblock_feed

4 files changed, 0 insertions, 1089 deletions

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..0387b6699 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
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