diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-16 09:46:17 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-16 09:46:17 -0400 |
commit | 6fc2bdf84011a7d68ed76762b50cc84fbf9ff5a7 (patch) | |
tree | 1d2daf1e0059cda7c45a8d65986943af3e6f6fa0 /include | |
parent | 10f0222d280c2b30c34bd326428f1a0e50c6c570 (diff) |
battle_controller_link_partner sync labels from emerald
Diffstat (limited to 'include')
-rw-r--r-- | include/battle_anim.h | 2 | ||||
-rw-r--r-- | include/battle_controllers.h | 2 | ||||
-rw-r--r-- | include/battle_gfx_sfx_util.h | 2 | ||||
-rw-r--r-- | include/battle_interface.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index ddfeb9bcd..456f6db78 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -404,7 +404,7 @@ void StartSpriteLinearTranslationFromCurrentPos(struct Sprite *sprite); void InitSpriteDataForLinearTranslation(struct Sprite *sprite); void InitAnimLinearTranslation(struct Sprite *sprite); void StartAnimLinearTranslation(struct Sprite *sprite); -void sub_80755B8(struct Sprite *sprite); +void PlayerThrowBall_StartAnimLinearTranslation(struct Sprite *sprite); bool8 AnimTranslateLinear(struct Sprite *sprite); void RunLinearTranslation_ThenceSetCBtoStoredInData6(struct Sprite *sprite); void sub_8075678(struct Sprite *sprite); diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 89e8b64da..184356249 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -222,7 +222,7 @@ void BtlController_EmitPlayFanfare(u8 bufferId, u16 songId); void BtlController_EmitFaintingCry(u8 bufferId); void BtlController_EmitIntroSlide(u8 bufferId, u8 terrainId); void BtlController_EmitIntroTrainerBallThrow(u8 bufferId); -void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus *hpAndStatus, u8 arg2); +void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus *hpAndStatus, u8 param); void BtlController_EmitHidePartyStatusSummary(u8 bufferId); void BtlController_EmitEndBounceEffect(u8 bufferId); void BtlController_EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible); diff --git a/include/battle_gfx_sfx_util.h b/include/battle_gfx_sfx_util.h index 1356df1aa..4c5f230d7 100644 --- a/include/battle_gfx_sfx_util.h +++ b/include/battle_gfx_sfx_util.h @@ -15,7 +15,7 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId); void DecompressGhostFrontPic(struct Pokemon *unused, u8 battlerId); void DecompressTrainerFrontPic(u16 frontPicId, u8 battlerId); void DecompressTrainerBackPalette(u16 a1, u8 a2); -void nullsub_16(u8 a1); +void BattleGfxSfxDummy3(u8 a1); void FreeTrainerFrontPicPaletteAndTile(u16 frontPicId); bool8 BattleLoadAllHealthBoxesGfx(u8 state); void LoadBattleBarGfx(u8 arg0); diff --git a/include/battle_interface.h b/include/battle_interface.h index 8878b9fb9..3415836a8 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -73,7 +73,7 @@ void UpdateOamPriorityInAllHealthboxes(u8 priority); void InitBattlerHealthboxCoords(u8 battlerId); void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent); void SwapHpBarsWithHpText(void); -u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, u8 arg2, bool8 isBattleStart); +u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, u8 isSwitchingMons, bool8 isBattleStart); void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elementId); u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale); u8 GetHPBarLevel(s16 hp, s16 maxhp); |