Merge branch 'master' into field_map_obj

2 files changed, 81 insertions, 81 deletions

diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index da05b9367..ca599631c 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -21,7 +21,7 @@ gUnknown_082D8CD4:: @ 82D8CD4
 gUnknown_082D8D65:: @ 82D8D65
 	.incbin "baserom.gba", 0x2d8d65, 0x6fd
 
-gUnknown_082D9462:: @ 82D9462
+BattleScript_MoveUsedMustRecharge:: @ 82D9462
 	.incbin "baserom.gba", 0x2d9462, 0xa7f
 
 gUnknown_082D9EE1:: @ 82D9EE1
@@ -120,16 +120,16 @@ gUnknown_082DACFA:: @ 82DACFA
 gUnknown_082DAD0B:: @ 82DAD0B
 	.incbin "baserom.gba", 0x2dad0b, 0xa
 
-gUnknown_082DAD15:: @ 82DAD15
+BattleScript_LeechSeedTurnDrain:: @ 82DAD15
 	.incbin "baserom.gba", 0x2dad15, 0x5c
 
-gUnknown_082DAD71:: @ 82DAD71
+BattleScript_BideStoringEnergy:: @ 82DAD71
 	.incbin "baserom.gba", 0x2dad71, 0xb
 
-gUnknown_082DAD7C:: @ 82DAD7C
+BattleScript_BideAttack:: @ 82DAD7C
 	.incbin "baserom.gba", 0x2dad7c, 0x48
 
-gUnknown_082DADC4:: @ 82DADC4
+BattleScript_BideNoEnergyToAttack:: @ 82DADC4
 	.incbin "baserom.gba", 0x2dadc4, 0x14
 
 gUnknown_082DADD8:: @ 82DADD8
@@ -141,19 +141,19 @@ gUnknown_082DAE03:: @ 82DAE03
 gUnknown_082DAE0D:: @ 82DAE0D
 	.incbin "baserom.gba", 0x2dae0d, 0x7
 
-gUnknown_082DAE14:: @ 82DAE14
+BattleScript_MoveUsedIsDisabled:: @ 82DAE14
 	.incbin "baserom.gba", 0x2dae14, 0xb
 
 gUnknown_082DAE1F:: @ 82DAE1F
 	.incbin "baserom.gba", 0x2dae1f, 0x4
 
-gUnknown_082DAE23:: @ 82DAE23
+BattleScript_DisabledNoMore:: @ 82DAE23
 	.incbin "baserom.gba", 0x2dae23, 0x7
 
 gUnknown_082DAE2A:: @ 82DAE2A
 	.incbin "baserom.gba", 0x2dae2a, 0xd
 
-gUnknown_082DAE37:: @ 82DAE37
+BattleScript_EncoredNoMore:: @ 82DAE37
 	.incbin "baserom.gba", 0x2dae37, 0x7
 
 gUnknown_082DAE3E:: @ 82DAE3E
@@ -192,7 +192,7 @@ gUnknown_082DAFDD:: @ 82DAFDD
 gUnknown_082DAFE4:: @ 82DAFE4
 	.incbin "baserom.gba", 0x2dafe4, 0x8e
 
-gUnknown_082DB072:: @ 82DB072
+BattleScript_NoMovesLeft:: @ 82DB072
 	.incbin "baserom.gba", 0x2db072, 0x4
 
 gUnknown_082DB076:: @ 82DB076
@@ -210,16 +210,16 @@ gUnknown_082DB098:: @ 82DB098
 gUnknown_082DB0A0:: @ 82DB0A0
 	.incbin "baserom.gba", 0x2db0a0, 0x4
 
-gUnknown_082DB0A4:: @ 82DB0A4
+BattleScript_MoveUsedIsTaunted:: @ 82DB0A4
 	.incbin "baserom.gba", 0x2db0a4, 0xb
 
 gUnknown_082DB0AF:: @ 82DB0AF
 	.incbin "baserom.gba", 0x2db0af, 0x8
 
-gUnknown_082DB0B7:: @ 82DB0B7
+BattleScript_WishComesTrue:: @ 82DB0B7
 	.incbin "baserom.gba", 0x2db0b7, 0x37
 
-gUnknown_082DB0EE:: @ 82DB0EE
+BattleScript_IngrainTurnHeal:: @ 82DB0EE
 	.incbin "baserom.gba", 0x2db0ee, 0x29
 
 gUnknown_082DB117:: @ 82DB117
@@ -228,7 +228,7 @@ gUnknown_082DB117:: @ 82DB117
 gUnknown_082DB168:: @ 82DB168
 	.incbin "baserom.gba", 0x2db168, 0xe
 
-gUnknown_082DB176:: @ 82DB176
+BattleScript_MoveUsedIsImprisoned:: @ 82DB176
 	.incbin "baserom.gba", 0x2db176, 0xb
 
 gUnknown_082DB181:: @ 82DB181
@@ -258,97 +258,97 @@ gUnknown_082DB1D5:: @ 82DB1D5
 gUnknown_082DB1FF:: @ 82DB1FF
 	.incbin "baserom.gba", 0x2db1ff, 0x14
 
-gUnknown_082DB213:: @ 82DB213
+BattleScript_MoveUsedIsAsleep:: @ 82DB213
 	.incbin "baserom.gba", 0x2db213, 0xd
 
-gUnknown_082DB220:: @ 82DB220
+BattleScript_MoveUsedWokeUp:: @ 82DB220
 	.incbin "baserom.gba", 0x2db220, 0x14
 
 gUnknown_082DB234:: @ 82DB234
 	.incbin "baserom.gba", 0x2db234, 0x9
 
-gUnknown_082DB23D:: @ 82DB23D
+BattleScript_PoisonTurnDmg:: @ 82DB23D
 	.incbin "baserom.gba", 0x2db23d, 0x22
 
-gUnknown_082DB25F:: @ 82DB25F
+BattleScript_BurnTurnDmg:: @ 82DB25F
 	.incbin "baserom.gba", 0x2db25f, 0xb
 
-gUnknown_082DB26A:: @ 82DB26A
+BattleScript_MoveUsedIsFrozen:: @ 82DB26A
 	.incbin "baserom.gba", 0x2db26a, 0xd
 
-gUnknown_082DB277:: @ 82DB277
+BattleScript_MoveUsedUnfroze:: @ 82DB277
 	.incbin "baserom.gba", 0x2db277, 0xb
 
 gUnknown_082DB282:: @ 82DB282
 	.incbin "baserom.gba", 0x2db282, 0x9
 
-gUnknown_082DB28B:: @ 82DB28B
+BattleScript_MoveUsedIsParalyzed:: @ 82DB28B
 	.incbin "baserom.gba", 0x2db28b, 0x10
 
-gUnknown_082DB29B:: @ 82DB29B
+BattleScript_MoveUsedFlinched:: @ 82DB29B
 	.incbin "baserom.gba", 0x2db29b, 0xb
 
 gUnknown_082DB2A6:: @ 82DB2A6
 	.incbin "baserom.gba", 0x2db2a6, 0x9
 
-gUnknown_082DB2AF:: @ 82DB2AF
+BattleScript_ThrashConfuses:: @ 82DB2AF
 	.incbin "baserom.gba", 0x2db2af, 0xe
 
-gUnknown_082DB2BD:: @ 82DB2BD
+BattleScript_MoveUsedIsConfused:: @ 82DB2BD
 	.incbin "baserom.gba", 0x2db2bd, 0x43
 
-gUnknown_082DB300:: @ 82DB300
+BattleScript_MoveUsedIsConfusedNoMore:: @ 82DB300
 	.incbin "baserom.gba", 0x2db300, 0x7
 
 gUnknown_082DB307:: @ 82DB307
 	.incbin "baserom.gba", 0x2db307, 0x7
 
-gUnknown_082DB30E:: @ 82DB30E
+BattleScript_WrapTurnDmg:: @ 82DB30E
 	.incbin "baserom.gba", 0x2db30e, 0x12
 
-gUnknown_082DB320:: @ 82DB320
+BattleScript_WrapEnds:: @ 82DB320
 	.incbin "baserom.gba", 0x2db320, 0x7
 
-gUnknown_082DB327:: @ 82DB327
+BattleScript_MoveUsedIsInLove:: @ 82DB327
 	.incbin "baserom.gba", 0x2db327, 0xd
 
-gUnknown_082DB334:: @ 82DB334
+BattleScript_MoveUsedIsParalyzedCantAttack:: @ 82DB334
 	.incbin "baserom.gba", 0x2db334, 0xb
 
-gUnknown_082DB33F:: @ 82DB33F
+BattleScript_NightmareTurnDmg:: @ 82DB33F
 	.incbin "baserom.gba", 0x2db33f, 0x11
 
-gUnknown_082DB350:: @ 82DB350
+BattleScript_CurseTurnDmg:: @ 82DB350
 	.incbin "baserom.gba", 0x2db350, 0x11
 
 gUnknown_082DB361:: @ 82DB361
 	.incbin "baserom.gba", 0x2db361, 0x17
 
-gUnknown_082DB378:: @ 82DB378
+BattleScript_YawnMakesAsleep:: @ 82DB378
 	.incbin "baserom.gba", 0x2db378, 0xaa
 
 gUnknown_082DB422:: @ 82DB422
 	.incbin "baserom.gba", 0x2db422, 0xe
 
-gUnknown_082DB430:: @ 82DB430
+BattleScript_DrizzleActivates:: @ 82DB430
 	.incbin "baserom.gba", 0x2db430, 0x14
 
-gUnknown_082DB444:: @ 82DB444
+BattleScript_SpeedBoostActivates:: @ 82DB444
 	.incbin "baserom.gba", 0x2db444, 0xe
 
-gUnknown_082DB452:: @ 82DB452
+BattleScript_TraceActivates:: @ 82DB452
 	.incbin "baserom.gba", 0x2db452, 0xa
 
-gUnknown_082DB45C:: @ 82DB45C
+BattleScript_RainDishActivates:: @ 82DB45C
 	.incbin "baserom.gba", 0x2db45c, 0x14
 
-gUnknown_082DB470:: @ 82DB470
+BattleScript_SandstreamActivates:: @ 82DB470
 	.incbin "baserom.gba", 0x2db470, 0x14
 
-gUnknown_082DB484:: @ 82DB484
+BattleScript_ShedSkinActivates:: @ 82DB484
 	.incbin "baserom.gba", 0x2db484, 0x25
 
-gUnknown_082DB4A9:: @ 82DB4A9
+BattleScript_CastformChange:: @ 82DB4A9
 	.incbin "baserom.gba", 0x2db4a9, 0xf
 
 gUnknown_082DB4B8:: @ 82DB4B8
@@ -357,7 +357,7 @@ gUnknown_082DB4B8:: @ 82DB4B8
 gUnknown_082DB4C1:: @ 82DB4C1
 	.incbin "baserom.gba", 0x2db4c1, 0x69
 
-gUnknown_082DB52A:: @ 82DB52A
+BattleScript_DroughtActivates:: @ 82DB52A
 	.incbin "baserom.gba", 0x2db52a, 0x14
 
 gUnknown_082DB53E:: @ 82DB53E
@@ -369,10 +369,10 @@ gUnknown_082DB552:: @ 82DB552
 gUnknown_082DB560:: @ 82DB560
 	.incbin "baserom.gba", 0x2db560, 0xe
 
-gUnknown_082DB56E:: @ 82DB56E
+BattleScript_MoveHPDrain_PPLoss:: @ 82DB56E
 	.incbin "baserom.gba", 0x2db56e, 0x1
 
-gUnknown_082DB56F:: @ 82DB56F
+BattleScript_MoveHPDrain:: @ 82DB56F
 	.incbin "baserom.gba", 0x2db56f, 0x22
 
 gUnknown_082DB591:: @ 82DB591
@@ -381,10 +381,10 @@ gUnknown_082DB591:: @ 82DB591
 gUnknown_082DB592:: @ 82DB592
 	.incbin "baserom.gba", 0x2db592, 0x15
 
-gUnknown_082DB5A7:: @ 82DB5A7
+BattleScript_FlashFireBoost_PPLoss:: @ 82DB5A7
 	.incbin "baserom.gba", 0x2db5a7, 0x1
 
-gUnknown_082DB5A8:: @ 82DB5A8
+BattleScript_FlashFireBoost:: @ 82DB5A8
 	.incbin "baserom.gba", 0x2db5a8, 0x1f
 
 gUnknown_082DB5C7:: @ 82DB5C7
@@ -405,7 +405,7 @@ gUnknown_082DB5F5:: @ 82DB5F5
 gUnknown_082DB603:: @ 82DB603
 	.incbin "baserom.gba", 0x2db603, 0x1c
 
-gUnknown_082DB61F:: @ 82DB61F
+BattleScript_SoundproofProtected:: @ 82DB61F
 	.incbin "baserom.gba", 0x2db61f, 0x10
 
 gUnknown_082DB62F:: @ 82DB62F
@@ -414,19 +414,19 @@ gUnknown_082DB62F:: @ 82DB62F
 gUnknown_082DB63F:: @ 82DB63F
 	.incbin "baserom.gba", 0x2db63f, 0xe
 
-gUnknown_082DB64D:: @ 82DB64D
+BattleScript_ColorChangeActivates:: @ 82DB64D
 	.incbin "baserom.gba", 0x2db64d, 0x7
 
-gUnknown_082DB654:: @ 82DB654
+BattleScript_RoughSkinActivates:: @ 82DB654
 	.incbin "baserom.gba", 0x2db654, 0x1b
 
-gUnknown_082DB66F:: @ 82DB66F
+BattleScript_CuteCharmActivates:: @ 82DB66F
 	.incbin "baserom.gba", 0x2db66f, 0xd
 
-gUnknown_082DB67C:: @ 82DB67C
+BattleScript_ApplySecondaryEffect:: @ 82DB67C
 	.incbin "baserom.gba", 0x2db67c, 0x3
 
-gUnknown_082DB67F:: @ 82DB67F
+BattleScript_SynchronizeActivates:: @ 82DB67F
 	.incbin "baserom.gba", 0x2db67f, 0x3
 
 gUnknown_082DB682:: @ 82DB682
@@ -441,7 +441,7 @@ gUnknown_082DB695:: @ 82DB695
 gUnknown_082DB6A5:: @ 82DB6A5
 	.incbin "baserom.gba", 0x2db6a5, 0x8
 
-gUnknown_082DB6AD:: @ 82DB6AD
+BattleScript_MoveUsedLoafingAround:: @ 82DB6AD
 	.incbin "baserom.gba", 0x2db6ad, 0x2c
 
 gUnknown_082DB6D9:: @ 82DB6D9
@@ -453,64 +453,64 @@ gUnknown_082DB6F0:: @ 82DB6F0
 gUnknown_082DB6FB:: @ 82DB6FB
 	.incbin "baserom.gba", 0x2db6fb, 0xb
 
-gUnknown_082DB706:: @ 82DB706
+BattleScript_BerryCurePrlzEnd2:: @ 82DB706
 	.incbin "baserom.gba", 0x2db706, 0x6
 
-gUnknown_082DB70C:: @ 82DB70C
+BattleScript_BerryCureParRet:: @ 82DB70C
 	.incbin "baserom.gba", 0x2db70c, 0x12
 
-gUnknown_082DB71E:: @ 82DB71E
+BattleScript_BerryCurePsnEnd2:: @ 82DB71E
 	.incbin "baserom.gba", 0x2db71e, 0x6
 
-gUnknown_082DB724:: @ 82DB724
+BattleScript_BerryCurePsnRet:: @ 82DB724
 	.incbin "baserom.gba", 0x2db724, 0x12
 
-gUnknown_082DB736:: @ 82DB736
+BattleScript_BerryCureBrnEnd2:: @ 82DB736
 	.incbin "baserom.gba", 0x2db736, 0x6
 
-gUnknown_082DB73C:: @ 82DB73C
+BattleScript_BerryCureBrnRet:: @ 82DB73C
 	.incbin "baserom.gba", 0x2db73c, 0x12
 
-gUnknown_082DB74E:: @ 82DB74E
+BattleScript_BerryCureFrzEnd2:: @ 82DB74E
 	.incbin "baserom.gba", 0x2db74e, 0x6
 
-gUnknown_082DB754:: @ 82DB754
+BattleScript_BerryCureFrzRet:: @ 82DB754
 	.incbin "baserom.gba", 0x2db754, 0x12
 
-gUnknown_082DB766:: @ 82DB766
+BattleScript_BerryCureSlpEnd2:: @ 82DB766
 	.incbin "baserom.gba", 0x2db766, 0x6
 
-gUnknown_082DB76C:: @ 82DB76C
+BattleScript_BerryCureSlpRet:: @ 82DB76C
 	.incbin "baserom.gba", 0x2db76c, 0x12
 
-gUnknown_082DB77E:: @ 82DB77E
+BattleScript_BerryCureConfusionEnd2:: @ 82DB77E
 	.incbin "baserom.gba", 0x2db77e, 0x6
 
-gUnknown_082DB784:: @ 82DB784
+BattleScript_BerryCureConfusionRet:: @ 82DB784
 	.incbin "baserom.gba", 0x2db784, 0x10
 
-gUnknown_082DB794:: @ 82DB794
+BattleScript_BerryCureChosenStatusEnd2:: @ 82DB794
 	.incbin "baserom.gba", 0x2db794, 0x6
 
-gUnknown_082DB79A:: @ 82DB79A
+BattleScript_BerryCureChosenStatusRet:: @ 82DB79A
 	.incbin "baserom.gba", 0x2db79a, 0x14
 
-gUnknown_082DB7AE:: @ 82DB7AE
+BattleScript_WhiteHerbEnd2:: @ 82DB7AE
 	.incbin "baserom.gba", 0x2db7ae, 0x6
 
-gUnknown_082DB7B4:: @ 82DB7B4
+BattleScript_WhiteHerbRet:: @ 82DB7B4
 	.incbin "baserom.gba", 0x2db7b4, 0x10
 
-gUnknown_082DB7C4:: @ 82DB7C4
+BattleScript_ItemHealHP_RemoveItem:: @ 82DB7C4
 	.incbin "baserom.gba", 0x2db7c4, 0x1d
 
-gUnknown_082DB7E1:: @ 82DB7E1
+BattleScript_BerryPPHealEnd2:: @ 82DB7E1
 	.incbin "baserom.gba", 0x2db7e1, 0x10
 
-gUnknown_082DB7F1:: @ 82DB7F1
+BattleScript_ItemHealHP_End2:: @ 82DB7F1
 	.incbin "baserom.gba", 0x2db7f1, 0x6
 
-gUnknown_082DB7F7:: @ 82DB7F7
+BattleScript_ItemHealHP_Ret:: @ 82DB7F7
 	.incbin "baserom.gba", 0x2db7f7, 0x1b
 
 gUnknown_082DB812:: @ 82DB812
@@ -519,13 +519,13 @@ gUnknown_082DB812:: @ 82DB812
 gUnknown_082DB816:: @ 82DB816
 	.incbin "baserom.gba", 0x2db816, 0xe
 
-gUnknown_082DB824:: @ 82DB824
+BattleScript_BerryConfuseHealEnd2:: @ 82DB824
 	.incbin "baserom.gba", 0x2db824, 0x2a
 
-gUnknown_082DB84E:: @ 82DB84E
+BattleScript_BerryStatRaiseEnd2:: @ 82DB84E
 	.incbin "baserom.gba", 0x2db84e, 0x1b
 
-gUnknown_082DB869:: @ 82DB869
+BattleScript_BerryFocusEnergyEnd2:: @ 82DB869
 	.incbin "baserom.gba", 0x2db869, 0x10
 
 gUnknown_082DB879:: @ 82DB879
diff --git a/data/data2b.s b/data/data2b.s
index 28d34f79b..1499c51fe 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -227,25 +227,25 @@ gUnknown_0831BC0C:: @ 831BC0C
 gUnknown_0831BC44:: @ 831BC44
 	.incbin "baserom.gba", 0x31bc44, 0x2c
 
-gUnknown_0831BC70:: @ 831BC70
+gStatusConditionString_PoisonJpn:: @ 831BC70
 	.incbin "baserom.gba", 0x31bc70, 0x8
 
-gUnknown_0831BC78:: @ 831BC78
+gStatusConditionString_SleepJpn:: @ 831BC78
 	.incbin "baserom.gba", 0x31bc78, 0x8
 
-gUnknown_0831BC80:: @ 831BC80
+gStatusConditionString_ParalysisJpn:: @ 831BC80
 	.incbin "baserom.gba", 0x31bc80, 0x8
 
-gUnknown_0831BC88:: @ 831BC88
+gStatusConditionString_BurnJpn:: @ 831BC88
 	.incbin "baserom.gba", 0x31bc88, 0x8
 
-gUnknown_0831BC90:: @ 831BC90
+gStatusConditionString_IceJpn:: @ 831BC90
 	.incbin "baserom.gba", 0x31bc90, 0x8
 
-gUnknown_0831BC98:: @ 831BC98
+gStatusConditionString_ConfusionJpn:: @ 831BC98
 	.incbin "baserom.gba", 0x31bc98, 0x8
 
-gUnknown_0831BCA0:: @ 831BCA0
+gStatusConditionString_LoveJpn:: @ 831BCA0
 	.incbin "baserom.gba", 0x31bca0, 0x8
 
 gUnknown_0831BCA8:: @ 831BCA8
@@ -260,6 +260,6 @@ gUnknown_0831BCEF:: @ 831BCEF
 gUnknown_0831BCF3:: @ 831BCF3
 	.incbin "baserom.gba", 0x31bcf3, 0x5
 
-gUnknown_0831BCF8:: @ 831BCF8
+gSoundMovesTable:: @ 831BCF8
 	.incbin "baserom.gba", 0x31bcf8, 0x18