Merge branch 'master' into decompile_evolution_scene

5 files changed, 5 insertions, 318 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/data2b.s b/data/data2b.s
index 0387b6699..329384396 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -76,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"