Document more symbols in battle

7 files changed, 24 insertions, 26 deletions

diff --git a/include/battle.h b/include/battle.h
index 636889f46..d8d96c859 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -516,14 +516,12 @@ struct BattleScripting
 
 enum
 {
-    BACK_PIC_BRENDAN,
-    BACK_PIC_MAY,
     BACK_PIC_RED,
     BACK_PIC_LEAF,
     BACK_PIC_RS_BRENDAN,
     BACK_PIC_RS_MAY,
-    BACK_PIC_WALLY,
-    BACK_PIC_STEVEN
+    BACK_PIC_POKEDUDE,
+    BACK_PIC_OLDMAN
 };
 
 struct BattleSpriteInfo
@@ -719,7 +717,7 @@ extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
 extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT];
 extern u8 gBattleTerrain;
 extern struct UnknownPokemonStruct4 gMultiPartnerParty[3];
-extern u16 *gUnknown_2022BC0;
+extern u16 *sUnknownDebugSpriteDataBuffer;
 extern u16 gRandomTurnNumber;
 
 #endif // GUARD_BATTLE_H
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index 412856353..89164b009 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -184,7 +184,7 @@ extern struct UnusedControllerStruct gUnknown_2022870;
 // general functions
 void HandleLinkBattleSetup(void);
 void SetUpBattleVars(void);
-void sub_800D30C(void);
+void InitBtlControllers(void);
 void sub_800DD28(void);
 void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data);
 
diff --git a/include/battle_gfx_sfx_util.h b/include/battle_gfx_sfx_util.h
index 667686af8..6c2ffa11b 100644
--- a/include/battle_gfx_sfx_util.h
+++ b/include/battle_gfx_sfx_util.h
@@ -36,7 +36,7 @@ void LoadAndCreateEnemyShadowSprites(void);
 void SpriteCB_SetInvisible(struct Sprite *sprite);
 void SetBattlerShadowSpriteCallback(u8 battlerId, u16 species);
 void HideBattlerShadowSprite(u8 battlerId);
-void sub_80357C8(void);
+void BattleInterfaceSetWindowPals(void);
 void ClearTemporarySpeciesSpriteData(u8 battlerId, bool8 dontClearSubstitute);
 void AllocateMonSpritesGfx(void);
 void FreeMonSpritesGfx(void);
diff --git a/include/battle_main.h b/include/battle_main.h
index 424fb25b1..201000a69 100644
--- a/include/battle_main.h
+++ b/include/battle_main.h
@@ -45,9 +45,9 @@ struct UnknownPokemonStruct4
 #define BOUNCE_MON          0x0
 #define BOUNCE_HEALTHBOX    0x1
 
-extern const struct SpriteTemplate gUnknown_824EFF0;
-extern const struct OamData gOamData_824F010;
-extern const struct OamData gOamData_824F018;
+extern const struct SpriteTemplate gUnknownDebugSprite;
+extern const struct OamData gOamData_BattlerOpponent;
+extern const struct OamData gOamData_BattlerPlayer;
 extern const u8 gTypeNames[][TYPE_NAME_LENGTH + 1];
 extern const u8 gStatusConditionString_PoisonJpn[8];
 extern const u8 gStatusConditionString_SleepJpn[8];
@@ -66,16 +66,16 @@ void CB2_InitBattle(void);
 void BattleMainCB2(void);
 void FreeRestoreBattleData(void);
 void VBlankCB_Battle(void);
-void nullsub_9(struct Sprite *sprite);
-void sub_801182C(struct Sprite *sprite);
-void sub_8011A1C(void);
+void SpriteCB_VsLetterDummy(struct Sprite *sprite);
+void SpriteCB_VsLetterInit(struct Sprite *sprite);
+void CB2_InitEndLinkBattle(void);
 u32 GetBattleBgAttribute(u8 arrayId, u8 caseId);
-void SpriteCB_WildMon(struct Sprite *sprite);
+void SpriteCB_EnemyMon(struct Sprite *sprite);
 void SpriteCallbackDummy2(struct Sprite *sprite);
 void SpriteCB_FaintOpponentMon(struct Sprite *sprite);
-void sub_8012044(struct Sprite *sprite);
-void sub_8012098(struct Sprite *sprite);
-void sub_80120C4(struct Sprite *sprite);
+void SpriteCb_ShowAsMoveTarget(struct Sprite *sprite);
+void SpriteCb_HideAsMoveTarget(struct Sprite *sprite);
+void SpriteCB_AllyMon(struct Sprite *sprite);
 void sub_8012100(struct Sprite *sprite);
 void sub_8012110(struct Sprite *sprite);
 void DoBounceEffect(u8 battler, u8 which, s8 delta, s8 amplitude);
@@ -88,7 +88,7 @@ void SwitchInClearSetData(void);
 void FaintClearSetData(void);
 void BattleTurnPassed(void);
 u8 IsRunningFromBattleImpossible(void);
-void sub_8013F6C(u8 battler);
+void UpdatePartyOwnerOnSwitch_NonMulti(u8 battler);
 void SwapTurnOrder(u8 id1, u8 id2);
 u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves);
 void RunBattleScriptCommands_PopCallbacksStack(void);
diff --git a/include/data.h b/include/data.h
index 19da0034f..55eda56a4 100644
--- a/include/data.h
+++ b/include/data.h
@@ -48,12 +48,12 @@ extern const u8 *const gBattleAnims_Special[];
 extern const struct OamData gUnknown_824F010;
 extern const struct OamData gUnknown_824F018;
 extern const union AnimCmd *const gSpriteAnimTable_82349BC[];
-extern const union AffineAnimCmd *const gSpriteAffineAnimTable_82348C8[];
-extern const union AffineAnimCmd *const gSpriteAffineAnimTable_8234944[];
-extern const struct SpriteFrameImage gUnknown_8234698[];
-extern const struct SpriteFrameImage gUnknown_82346B8[];
-extern const struct SpriteFrameImage gUnknown_82346D8[];
-extern const struct SpriteFrameImage gUnknown_82346F8[];
+extern const union AffineAnimCmd *const gSpriteAffineAnimTable_BattlerPlayer[];
+extern const union AffineAnimCmd *const gSpriteAffineAnimTable_BattlerOpponent[];
+extern const struct SpriteFrameImage gSpriteImages_BattlerPlayerLeft[];
+extern const struct SpriteFrameImage gSpriteImages_BattlerOpponentLeft[];
+extern const struct SpriteFrameImage gSpriteImages_BattlerPlayerRight[];
+extern const struct SpriteFrameImage gSpriteImages_BattlerOpponentRight[];
 extern const struct SpriteFrameImage gTrainerBackPicTable_Red[];
 extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[];
 extern const struct SpriteFrameImage gTrainerBackPicTable_Pokedude[];
diff --git a/include/pokeball.h b/include/pokeball.h
index 1c2241246..9ba5656af 100644
--- a/include/pokeball.h
+++ b/include/pokeball.h
@@ -33,7 +33,7 @@ void sub_8076918(u8 bank);
 void DoHitAnimHealthboxEffect(u8 bank);
 void LoadBallGfx(u8 ballId);
 void FreeBallGfx(u8 ballId);
-void sub_804BD94(u8 battler);
+void StartHealthboxSlideIn(u8 battler);
 void DestroySpriteAndFreeResources2(struct Sprite *sprite);
 
 #endif // GUARD_POKEBALL_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 6a9b657ea..2f9bdb5af 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -327,7 +327,7 @@ extern const u32 gExperienceTables[][MAX_LEVEL + 1];
 extern const u16 *const gLevelUpLearnsets[];
 extern const u8 gFacilityClassToPicIndex[];
 extern const u8 gFacilityClassToTrainerClass[];
-extern const struct SpriteTemplate gUnknown_825DEF0[];
+extern const struct SpriteTemplate gSpriteTemplates_Battlers[];
 extern const u8 gPPUpGetMask[];
 
 void ZeroBoxMonData(struct BoxPokemon *boxMon);