From 99ec579debc63991f16e08ef906111ad556edad5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Mar 2021 16:29:33 -0400 Subject: Name symbols in battle_anim_special.c --- include/battle_main.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/battle_main.h') diff --git a/include/battle_main.h b/include/battle_main.h index fe585f0e6..424fb25b1 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -80,8 +80,8 @@ void sub_8012100(struct Sprite *sprite); void sub_8012110(struct Sprite *sprite); void DoBounceEffect(u8 battler, u8 which, s8 delta, s8 amplitude); void EndBounceEffect(u8 battler, u8 which); -void sub_8012354(struct Sprite *sprite); -void sub_801236C(struct Sprite *sprite); +void SpriteCB_PlayerThrowInit(struct Sprite *sprite); +void UpdatePlayerPosInThrowAnim(struct Sprite *sprite); void nullsub_12(void); void BeginBattleIntro(void); void SwitchInClearSetData(void); -- cgit v1.2.3 From 31f4edbe503134eba4f7fee8ca9ecc85099c51bd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Mar 2021 20:10:19 -0400 Subject: Document more symbols in battle --- include/battle_main.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'include/battle_main.h') 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); -- cgit v1.2.3 From 2f4f63afdb6a7b77a8161f0cd42ae64cc5f1515c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Mar 2021 14:27:50 -0400 Subject: Document old man batttle controller --- include/battle_main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/battle_main.h') diff --git a/include/battle_main.h b/include/battle_main.h index 201000a69..e980bde70 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -77,7 +77,7 @@ 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 SpriteCB_FaintSlideAnim(struct Sprite *sprite); void DoBounceEffect(u8 battler, u8 which, s8 delta, s8 amplitude); void EndBounceEffect(u8 battler, u8 which); void SpriteCB_PlayerThrowInit(struct Sprite *sprite); -- cgit v1.2.3 From c6563b78c0b922aa9674d4e12fc528f0098ba904 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Mar 2021 16:19:15 -0400 Subject: Sync new field name in BattleStruct --- include/battle_main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/battle_main.h') diff --git a/include/battle_main.h b/include/battle_main.h index e980bde70..bc46be6b4 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -9,7 +9,7 @@ struct TrainerMoney u8 value; }; -struct UnknownPokemonStruct4 +struct MultiBattlePokemonTx { /*0x00*/ u16 species; /*0x02*/ u16 heldItem; -- cgit v1.2.3 From 81da6acff56cadc5e2b7b5572aba944bf0f1c8ad Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Mar 2021 19:32:49 -0400 Subject: battle_gfx_sfx_util sync emerald names to unnamed syms --- include/battle_main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/battle_main.h') diff --git a/include/battle_main.h b/include/battle_main.h index bc46be6b4..22984101c 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -76,7 +76,7 @@ void SpriteCB_FaintOpponentMon(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 SpriteCB_SetToDummy3(struct Sprite *sprite); void SpriteCB_FaintSlideAnim(struct Sprite *sprite); void DoBounceEffect(u8 battler, u8 which, s8 delta, s8 amplitude); void EndBounceEffect(u8 battler, u8 which); -- cgit v1.2.3 From a172f0064c1936fbac56a02ccb386ce16a4edfb2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 17 Mar 2021 08:34:03 -0400 Subject: Fix accidental ++ deletion --- include/battle_main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/battle_main.h') diff --git a/include/battle_main.h b/include/battle_main.h index 22984101c..0410e62c2 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -82,7 +82,7 @@ void DoBounceEffect(u8 battler, u8 which, s8 delta, s8 amplitude); void EndBounceEffect(u8 battler, u8 which); void SpriteCB_PlayerThrowInit(struct Sprite *sprite); void UpdatePlayerPosInThrowAnim(struct Sprite *sprite); -void nullsub_12(void); +void BattleDummy(void); void BeginBattleIntro(void); void SwitchInClearSetData(void); void FaintClearSetData(void); -- cgit v1.2.3