diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/animations.asm | 4 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 1 | ||||
| -rw-r--r-- | engine/battle/trainer_ai.asm | 6 | ||||
| -rwxr-xr-x | engine/hidden_object_functions17.asm | 1 | ||||
| -rwxr-xr-x | engine/menu/status_screen.asm | 4 |
5 files changed, 6 insertions, 10 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 0d93b295..8df31e1c 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -282,7 +282,7 @@ PlayAnimation: .nextAnimationCommand pop hl jr .animationLoop -.AnimationOver ; 417B +.AnimationOver ret LoadSubanimation: @@ -3202,7 +3202,7 @@ TossBallAnimation: ; sequence of animations that make up the Poké Ball toss db POOF_ANIM, HIDEPIC_ANIM, SHAKE_ANIM, POOF_ANIM, SHOWPIC_ANIM -.BlockBall ; 79ff6 (1e:5ff6) +.BlockBall ld a, TOSS_ANIM ld [wAnimationID], a call PlayAnimation diff --git a/engine/battle/core.asm b/engine/battle/core.asm index fa56e5b2..6805fbfe 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -4834,7 +4834,6 @@ UnusedHighCriticalMoves: db CRABHAMMER db SLASH db $FF -; 3e023 ; determines if attack is a critical hit ; azure heights claims "the fastest pokémon (who are, not coincidentally, diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 3624f5ea..2f2c46a6 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -740,8 +740,7 @@ AICureStatus: res 0,[hl] ret -AIUseXAccuracy: -; unused +AIUseXAccuracy: ; unused call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 0,[hl] @@ -755,8 +754,7 @@ AIUseGuardSpec: ld a,GUARD_SPEC jp AIPrintItemUse -AIUseDireHit: -; unused +AIUseDireHit: ; unused call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 2,[hl] diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index a6044d94..2279225e 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -423,7 +423,6 @@ GymTrashCans: db 2, 9, 13, -1, -1 ; 12 db 3, 10, 12, 14, -1 ; 13 db 2, 11, 13, -1, -1 ; 14 -; 5dec8 VermilionGymTrashSuccessText1: TX_FAR _VermilionGymTrashSuccessText1 diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index 9a007fb1..4adfb543 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -349,11 +349,11 @@ StatusScreen2: ld c, a ld a, "-" call StatusScreen_PrintPP ; Fill the rest with -- -.InitPP ; 1175e +.InitPP ld hl, wLoadedMonMoves coord de, 14, 10 ld b, 0 -.PrintPP ; 11766 +.PrintPP ld a, [hli] and a jr z, .PPDone |