diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-15 19:32:49 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-15 19:32:49 -0400 |
| commit | 81da6acff56cadc5e2b7b5572aba944bf0f1c8ad (patch) | |
| tree | 2c0a7bad392242f715c145cbd74f61dac265a18f /include | |
| parent | c6563b78c0b922aa9674d4e12fc528f0098ba904 (diff) | |
battle_gfx_sfx_util sync emerald names to unnamed syms
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_gfx_sfx_util.h | 2 | ||||
| -rw-r--r-- | include/battle_main.h | 2 | ||||
| -rw-r--r-- | include/pokemon.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/battle_gfx_sfx_util.h b/include/battle_gfx_sfx_util.h index d22a47164..1356df1aa 100644 --- a/include/battle_gfx_sfx_util.h +++ b/include/battle_gfx_sfx_util.h @@ -9,7 +9,7 @@ void InitAndLaunchChosenStatusAnimation(bool8 isStatus2, u32 status); bool8 TryHandleLaunchBattleTableAnimation(u8 activeBattler, u8 atkBattler, u8 defBattler, u8 tableId, u16 argument); void InitAndLaunchSpecialAnimation(u8 activeBattler, u8 atkBattler, u8 defBattler, u8 tableId); bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn); -bool8 mplay_80342A4(u8 battlerId); +bool8 IsBattleSEPlaying(u8 battlerId); void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 battlerId); void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId); void DecompressGhostFrontPic(struct Pokemon *unused, u8 battlerId); 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); diff --git a/include/pokemon.h b/include/pokemon.h index 2f9bdb5af..4fcc473ad 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -446,7 +446,7 @@ bool8 IsMonShiny(struct Pokemon *mon); u8 *GetTrainerPartnerName(void); u8 GetPlayerPartyHighestLevel(void); u16 FacilityClassToPicIndex(u16 facilityClass); -bool8 sub_804455C(u8 caseId, u8 battlerId); +bool8 ShouldIgnoreDeoxysForm(u8 caseId, u8 battlerId); void SetDeoxysStats(void); u16 sub_80447AC(void); u16 sub_80447F0(void); |