diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-01-28 23:31:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-28 23:31:15 -0500 |
| commit | afb899016938d03911eaafb85c7caa1c67680210 (patch) | |
| tree | 26e5d73301ab16e060c4a16171e0a5aa3c47d732 /engine/battle | |
| parent | Comment on size of union (diff) | |
| download | pokeyellow-afb899016938d03911eaafb85c7caa1c67680210.tar.gz pokeyellow-afb899016938d03911eaafb85c7caa1c67680210.tar.xz pokeyellow-afb899016938d03911eaafb85c7caa1c67680210.zip | |
Miscellaneous cleanup (#488)
Co-authored-by: SatoMew <SatoMew@users.noreply.github.com>
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/animations.asm | 4 | ||||
| -rw-r--r-- | engine/battle/core.asm | 1 | ||||
| -rw-r--r-- | engine/battle/trainer_ai.asm | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 83f30ee2..a6d12012 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -2187,8 +2187,8 @@ AnimCopyRowRight: jr nz, AnimCopyRowRight ret -; get the sound of the move id in b -GetMoveSoundB: +; only used by the unreferenced PlayIntroMoveSound +GetIntroMoveSound: ld a, b call GetMoveSound ld b, a diff --git a/engine/battle/core.asm b/engine/battle/core.asm index a951a072..4e68b5c5 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2015,6 +2015,7 @@ DisplayBattleMenu:: call DisplayTextBoxID ; handle menu input if it's not the old man tutorial ld a, [wBattleType] + ASSERT BATTLE_TYPE_OLD_MAN == 1 dec a jp nz, .handleBattleMenuInput ; the following happens for the old man tutorial diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index ccd4e804..6092fc8e 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -635,7 +635,7 @@ AICureStatus: res BADLY_POISONED, [hl] ret -AIUseXAccuracy: ; unused +AIUseXAccuracy: ; unreferenced call AIPlayRestoringSFX ld hl, wEnemyBattleStatus2 set USING_X_ACCURACY, [hl] @@ -649,7 +649,7 @@ AIUseGuardSpec: ld a, GUARD_SPEC jp AIPrintItemUse -AIUseDireHit: ; unused +AIUseDireHit: ; unreferenced call AIPlayRestoringSFX ld hl, wEnemyBattleStatus2 set GETTING_PUMPED, [hl] |