battle_main data decomp

4 files changed, 27 insertions, 72 deletions

diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 0fd65d2e0..8d69b297d 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -549,7 +549,7 @@ BattleScript_BerryStatRaiseEnd2:: @ 81D9679
 BattleScript_BerryFocusEnergyEnd2:: @ 81D9694
 	.incbin "baserom.gba", 0x1D9694, 0x10
 
-gUnknown_81D96A4:: @ 81D96A4
+BattleScript_ActionSelectionItemsCantBeUsed:: @ 81D96A4
 	.incbin "baserom.gba", 0x1D96A4, 0x4
 
 BattleScript_FlushMessageBox:: @ 81D96A8
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index c3747cd8d..3f8ed8f38 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -1,6 +1,6 @@
 	.section script_data, "aw", %progbits
 
-gUnknown_81D99B0:: @ 81D99B0
+gBattlescriptsForBallThrow:: @ 81D99B0
 	.incbin "baserom.gba", 0x1D99B0, 0x34
 
 gUnknown_81D99E4:: @ 81D99E4
@@ -9,7 +9,7 @@ gUnknown_81D99E4:: @ 81D99E4
 gUnknown_81D99FC:: @ 81D99FC
 	.incbin "baserom.gba", 0x1D99FC, 0x8
 
-gUnknown_81D9A04:: @ 81D9A04
+gBattlescriptsForSafariActions:: @ 81D9A04
 	.incbin "baserom.gba", 0x1D9A04, 0x3E
 
 BattleScript_SuccessBallThrow:: @ 81D9A42
diff --git a/data/data.s b/data/data.s
index 1010190f3..2bc219d7b 100644
--- a/data/data.s
+++ b/data/data.s
@@ -316,7 +316,7 @@ gUnknown_8248300:: @ 8248300
 gUnknown_8248318:: @ 8248318
 	.incbin "baserom.gba", 0x248318, 0x8
 
-gUnknown_8248320:: @ 8248320
+gBattleBgTemplates:: @ 8248320
 	.incbin "baserom.gba", 0x248320, 0x10
 
 gUnknown_8248330:: @ 8248330
@@ -327,73 +327,7 @@ gUnknown_824EE34:: @ 824EE34
 
 gUnknown_824EFC4:: @ 824EFC4
 	.incbin "baserom.gba", 0x24EFC4, 0x20
-
-gUnknown_824EFE4:: @ 824EFE4
-	.incbin "baserom.gba", 0x24EFE4, 0xC
-
-gUnknown_824EFF0:: @ 824EFF0
-	.incbin "baserom.gba", 0x24EFF0, 0x18
-
-gUnknown_824F008:: @ 824F008
-	.incbin "baserom.gba", 0x24F008, 0x8
-
-gUnknown_824F010:: @ 824F010
-	.incbin "baserom.gba", 0x24F010, 0x8
-
-gUnknown_824F018:: @ 824F018
-	.incbin "baserom.gba", 0x24F018, 0x8
-
-gUnknown_824F020:: @ 824F020
-	.incbin "baserom.gba", 0x24F020, 0x28
-
-gUnknown_824F048:: @ 824F048
-	.incbin "baserom.gba", 0x24F048, 0x8
-
-gTypeEffectiveness:: @ 824F050
-	.incbin "baserom.gba", 0x24F050, 0x150
-
-gTypeNames:: @ 824F1A0
-	.incbin "baserom.gba", 0x24F1A0, 0x80
-
-gTrainerMoneyTable:: @ 824F220
-	.incbin "baserom.gba", 0x24F220, 0x8E8
-
-gUnknown_824FB08:: @ 824FB08
-	.incbin "baserom.gba", 0x24FB08, 0x138
-
-gUnknown_824FC40:: @ 824FC40
-	.incbin "baserom.gba", 0x24FC40, 0x3F8
-
-gUnknown_8250038:: @ 8250038
-	.incbin "baserom.gba", 0x250038, 0x38
-
-gUnknown_8250070:: @ 8250070
-	.incbin "baserom.gba", 0x250070, 0x24
-
-gStatusConditionString_PoisonJpn:: @ 8250094
-	.incbin "baserom.gba", 0x250094, 0x8
-
-gStatusConditionString_SleepJpn:: @ 825009C
-	.incbin "baserom.gba", 0x25009C, 0x8
-
-gStatusConditionString_ParalysisJpn:: @ 82500A4
-	.incbin "baserom.gba", 0x2500A4, 0x8
-
-gStatusConditionString_BurnJpn:: @ 82500AC
-	.incbin "baserom.gba", 0x2500AC, 0x8
-
-gStatusConditionString_IceJpn:: @ 82500B4
-	.incbin "baserom.gba", 0x2500B4, 0x8
-
-gStatusConditionString_ConfusionJpn:: @ 82500BC
-	.incbin "baserom.gba", 0x2500BC, 0x8
-
-gStatusConditionString_LoveJpn:: @ 82500C4
-	.incbin "baserom.gba", 0x2500C4, 0x8
-
-gUnknown_82500CC:: @ 82500CC
-	.incbin "baserom.gba", 0x2500CC, 0x38
-
+	
 	.section .rodata.8260270
 
 gUnknown_8260270:: @ 8260270
diff --git a/data/data_83F5738.s b/data/data_83F5738.s
index 1dd697956..48ed5d3a9 100644
--- a/data/data_83F5738.s
+++ b/data/data_83F5738.s
@@ -424,7 +424,28 @@ gUnknown_83FE80C:: @ 83FE80C
 	.incbin "baserom.gba", 0x3FE80C, 0x10
 
 gUnknown_83FE81C:: @ 83FE81C
-	.incbin "baserom.gba", 0x3FE81C, 0x3D
+	.incbin "baserom.gba", 0x3FE81C, 0xE
+
+gText_Sleep:: @ 83FE82A
+	.incbin "baserom.gba", 0x3FE82A, 0x6
+
+gText_Poison:: @ 83FE830
+	.incbin "baserom.gba", 0x3FE830, 0x7
+
+gText_Burn:: @ 83FE837
+	.incbin "baserom.gba", 0x3FE837, 0x5
+
+gText_Paralysis:: @ 83FE83C
+	.incbin "baserom.gba", 0x3FE83C, 0xA
+
+gText_Ice:: @ 83FE846
+	.incbin "baserom.gba", 0x3FE846, 0x4
+
+gText_Confusion:: @ 83FE84A
+	.incbin "baserom.gba", 0x3FE84A, 0xA
+	
+gText_Love:: @ 83FE854
+	.incbin "baserom.gba", 0x3FE854, 0x5
 
 gUnknown_83FE859:: @ 83FE859
 	.incbin "baserom.gba", 0x3FE859, 0x3