label and document battle windows

6 files changed, 25 insertions, 16 deletions

diff --git a/include/battle.h b/include/battle.h
index ae8a1c98a..bf875ad9d 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -606,7 +606,7 @@ struct BattleScripting
     u8 reshowMainState;
     u8 reshowHelperState;
     u8 field_23;
-    u8 field_24;
+    u8 windowsType; // 0 - normal, 1 - battle arena
     u8 multiplayerId;
 };
 
diff --git a/include/battle_ai_script_commands.h b/include/battle_ai_script_commands.h
index 316f76de6..d23ad048a 100644
--- a/include/battle_ai_script_commands.h
+++ b/include/battle_ai_script_commands.h
@@ -1,13 +1,18 @@
 #ifndef GUARD_BATTLE_AI_SCRIPT_COMMANDS_H
 #define GUARD_BATTLE_AI_SCRIPT_COMMANDS_H
 
+// return values for BattleAI_ChooseMoveOrAction
+// 0 - 3 are move idx
+#define AI_CHOICE_FLEE 4
+#define AI_CHOICE_WATCH 5
+
 void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves);
 void BattleAI_SetupAIData(u8 defaultScoreMoves);
 u8 BattleAI_ChooseMoveOrAction(void);
-void ClearBattlerMoveHistory(u8 bank);
-void RecordAbilityBattle(u8 bank, u8 abilityId);
-void ClearBattlerAbilityHistory(u8 bank);
-void RecordItemEffectBattle(u8 bank, u8 itemEffect);
-void ClearBankItemEffectHistory(u8 bank);
+void ClearBattlerMoveHistory(u8 battlerId);
+void RecordAbilityBattle(u8 battlerId, u8 abilityId);
+void ClearBattlerAbilityHistory(u8 battlerId);
+void RecordItemEffectBattle(u8 battlerId, u8 itemEffect);
+void ClearBattlerItemEffectHistory(u8 battlerId);
 
 #endif // GUARD_BATTLE_AI_SCRIPT_COMMANDS_H
diff --git a/include/battle_bg.h b/include/battle_bg.h
index 7fc09fbf7..dac41c992 100644
--- a/include/battle_bg.h
+++ b/include/battle_bg.h
@@ -1,13 +1,13 @@
 #ifndef GUARD_BATTLE_BG_H
 #define GUARD_BATTLE_BG_H
 
-void sub_8035658(void);
+void BattleInitBgsAndWindows(void);
 void sub_80356D0(void);
-void ApplyPlayerChosenFrameToBattleMenu(void);
+void LoadBattleMenuWindowGfx(void);
 void DrawMainBattleBackground(void);
 void LoadBattleTextboxAndBackground(void);
 void sub_8035D74(u8 taskId);
-void LoadBattleEntryBackground(void);
+void DrawBattleEntryBackground(void);
 bool8 LoadChosenBattleElement(u8 caseId);
 
 #endif // GUARD_BATTLE_BG_H
diff --git a/include/battle_message.h b/include/battle_message.h
index bf9b590af..f792ff7b0 100644
--- a/include/battle_message.h
+++ b/include/battle_message.h
@@ -212,7 +212,7 @@ struct StringInfoBattle
 void BufferStringBattle(u16 stringID);
 u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src);
 u32 BattleStringExpandPlaceholders(const u8* src, u8* dst);
-void BattleHandleAddTextPrinter(const u8* text, u8 arg1);
+void BattlePutTextOnWindow(const u8* text, u8 arg1);
 void SetPpNumbersPaletteInMoveSelection(void);
 u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp);
 
diff --git a/include/battle_util.h b/include/battle_util.h
index e5c1aaf18..0b5590011 100644
--- a/include/battle_util.h
+++ b/include/battle_util.h
@@ -30,10 +30,14 @@
 #define ABILITYEFFECT_CHECK_ON_FIELD            0x13
 #define ABILITYEFFECT_SWITCH_IN_WEATHER         0xFF
 
+#define ABILITY_ON_OPPOSING_FIELD(battlerId, abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, battlerId, abilityId, 0, 0))
+#define ABILITY_ON_FIELD(abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, abilityId, 0, 0))
+#define ABILITY_ON_FIELD2(abilityId)(AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, abilityId, 0, 0))
+
 #define ITEMEFFECT_ON_SWITCH_IN                 0x0
 
-#define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0)))
-#define WEATHER_HAS_EFFECT2 ((!AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_AIR_LOCK, 0, 0)))
+#define WEATHER_HAS_EFFECT ((!ABILITY_ON_FIELD(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD(ABILITY_AIR_LOCK)))
+#define WEATHER_HAS_EFFECT2 ((!ABILITY_ON_FIELD2(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD2(ABILITY_AIR_LOCK)))
 
 #define BS_GET_TARGET                   0
 #define BS_GET_ATTACKER                 1
diff --git a/include/text_window.h b/include/text_window.h
index 2ac13fab7..3d2b8692f 100644
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -13,10 +13,10 @@ extern const u8 gTextWindowFrame1_Gfx[];
 extern const u16 gTextWindowFrame1_Pal[];
 
 const struct TilesPal* GetWindowFrameTilesPal(u8 id);
-void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset);
-void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset);
-void sub_80987D4(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset);
-void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset);
+void LoadMessageBoxGfx(u8 windowId, u16 destOffset, u8 palOffset);
+void LoadSav2WindowGfx(u8 windowId, u16 destOffset, u8 palOffset);
+void LoadWindowGfx(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset);
+void LoadSav2WindowGfx_(u8 windowId, u16 destOffset, u8 palOffset);
 void sub_8098858(u8 windowId, u16 tileNum, u8 palNum);
 void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum);
 void rbox_fill_rectangle(u8 windowId);