diff options
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/animations.asm | 6 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 5 | ||||
| -rw-r--r-- | engine/battle/draw_hud_pokeball_gfx.asm | 2 | ||||
| -rw-r--r-- | engine/battle/trainer_ai.asm | 6 |
4 files changed, 9 insertions, 10 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index d6392522..2578ee28 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -253,7 +253,7 @@ PlayAnimation: .nextAnimationCommand pop hl jr .animationLoop -.AnimationOver ; 417B +.AnimationOver ret LoadSubanimation: @@ -926,7 +926,7 @@ BallMoveDistances1: db $ff ; terminator ; function to make the pokeball jump up -TradeJumpPokeball: ; 507C +TradeJumpPokeball: ld de,BallMoveDistances2 .loop ld hl,wOAMBuffer ; OAM buffer @@ -2996,7 +2996,7 @@ TossBallAnimation: ; sequence of animations that make up the Poké Ball toss db POOF_ANIM,HIDEPIC_ANIM,SHAKE_ANIM,POOF_ANIM,SHOWPIC_ANIM -.BlockBall ; 5E55 +.BlockBall ld a,TOSS_ANIM ld [wAnimationID],a call PlayAnimation diff --git a/engine/battle/core.asm b/engine/battle/core.asm index f8053a9e..3b474584 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -819,7 +819,7 @@ HandleEnemyMonFainted: ld [wActionResultOrTookBattleTurn], a jp MainInBattleLoop -FaintEnemyPokemon: ; 0x3c567 +FaintEnemyPokemon: call ReadPlayerMonCurHPAndStatus ld a, [wIsInBattle] dec a @@ -945,7 +945,7 @@ FaintEnemyPokemon: ; 0x3c567 ld [wPartyGainExpFlags], a jpab GainExperience -EnemyMonFaintedText: ; 0x3c63e +EnemyMonFaintedText: TX_FAR _EnemyMonFaintedText db "@" @@ -4672,7 +4672,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/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index d477ffdf..f44d64f5 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -44,7 +44,7 @@ SetupEnemyPartyPokeballs: ld hl, wOAMBuffer + PARTY_LENGTH * 4 jp WritePokeballOAMData -SetupPokeballs: ; 0x3a8a6 +SetupPokeballs: ld a, [de] push af ld de, wBuffer diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 385cdd1b..7999a7a0 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -145,7 +145,7 @@ AIMoveChoiceModification1: ld [hl], a jr .nextMove -StatusAilmentMoveEffects: ; 57e2 +StatusAilmentMoveEffects: db $01 ; unused sleep effect db SLEEP_EFFECT db POISON_EFFECT @@ -731,7 +731,7 @@ AICureStatus: res 0,[hl] ret -AIUseXAccuracy: ; 0x3a7a8 unused +AIUseXAccuracy: ; unused call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 0,[hl] @@ -745,7 +745,7 @@ AIUseGuardSpec: ld a,GUARD_SPEC jp AIPrintItemUse -AIUseDireHit: ; 0x3a7c2 unused +AIUseDireHit: ; unused call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 2,[hl] |