2 files changed, 0 insertions, 483 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/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