battle_main data decomp

5 files changed, 16 insertions, 6 deletions

diff --git a/include/battle.h b/include/battle.h
index 754e92997..3ec32e17f 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -79,7 +79,7 @@
 #define B_ACTION_SAFARI_POKEBLOCK          6
 #define B_ACTION_SAFARI_GO_NEAR            7
 #define B_ACTION_SAFARI_RUN                8
-#define B_ACTION_9                         9
+#define B_ACTION_OLDMAN_THROW              9
 #define B_ACTION_EXEC_SCRIPT               10
 #define B_ACTION_TRY_FINISH                11
 #define B_ACTION_FINISHED                  12
diff --git a/include/battle_main.h b/include/battle_main.h
index 757ee3468..06d658483 100644
--- a/include/battle_main.h
+++ b/include/battle_main.h
@@ -45,7 +45,7 @@ struct UnknownPokemonStruct4
 
 void CB2_InitBattle(void);
 void BattleMainCB2(void);
-void CB2_QuitRecordedBattle(void);
+void CB2_QuitPokeDudeBattle(void);
 void sub_8038528(struct Sprite* sprite);
 void sub_8038A04(void); // unused
 void VBlankCB_Battle(void);
@@ -53,7 +53,7 @@ void sub_801182C(struct Sprite *sprite);
 void sub_8011A1C(void);
 u32 sub_80391E0(u8 arrayId, u8 caseId);
 u32 sub_80397C4(u32 setId, u32 tableId);
-void oac_poke_opponent(struct Sprite *sprite);
+void SpriteCB_WildMon(struct Sprite *sprite);
 void SpriteCallbackDummy_2(struct Sprite *sprite);
 void sub_8039934(struct Sprite *sprite);
 void sub_8012098(struct Sprite *sprite);
@@ -81,7 +81,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves);
 void RunBattleScriptCommands_PopCallbacksStack(void);
 void RunBattleScriptCommands(void);
 bool8 TryRunFromBattle(u8 bank);
-void sub_800FD9C(void);
+void CB2_InitBattle(void);
 void sub_80120C4(struct Sprite *);
 void sub_8012100(struct Sprite *);
 void nullsub_12(void);
diff --git a/include/battle_message.h b/include/battle_message.h
index ffc9d5bb7..130dc7ce9 100644
--- a/include/battle_message.h
+++ b/include/battle_message.h
@@ -238,4 +238,12 @@ extern const u8* const gStatNamesTable2[];
 extern const u16 gMissStringIds[];
 extern const u16 gTrappingMoves[];
 
+extern const u8 gText_Sleep[];
+extern const u8 gText_Poison[];
+extern const u8 gText_Burn[];
+extern const u8 gText_Paralysis[];
+extern const u8 gText_Ice[];
+extern const u8 gText_Confusion[];
+extern const u8 gText_Love[];
+
 #endif // GUARD_BATTLE_MESSAGE_H
diff --git a/include/constants/abilities.h b/include/constants/abilities.h
index 4e2c4056c..4ad54c86f 100644
--- a/include/constants/abilities.h
+++ b/include/constants/abilities.h
@@ -80,4 +80,6 @@
 #define ABILITY_CACOPHONY 76
 #define ABILITY_AIR_LOCK 77
 
+#define ABILITIES_COUNT 78
+
 #endif  // GUARD_CONSTANTS_ABILITIES_H
diff --git a/include/data.h b/include/data.h
index 9dd386482..005c798b3 100644
--- a/include/data.h
+++ b/include/data.h
@@ -45,8 +45,8 @@ extern const u8 *const gBattleAnims_Special[];
 extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[];
 extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
 
-extern const struct OamData gUnknown_824F010;
-extern const struct OamData gUnknown_824F018;
+extern const struct OamData gOamData_824F010;
+extern const struct OamData gOamData_824F018;
 extern const union AnimCmd *const gSpriteAnimTable_82349BC[];
 extern const union AffineAnimCmd *const gSpriteAffineAnimTable_82348C8[];
 extern const union AffineAnimCmd *const gSpriteAffineAnimTable_8234944[];