summaryrefslogtreecommitdiff
path: root/engine/battle
diff options
context:
space:
mode:
Diffstat (limited to 'engine/battle')
-rwxr-xr-xengine/battle/animations.asm2
-rw-r--r--engine/battle/bank3d_battle.asm8
-rwxr-xr-xengine/battle/core.asm3
3 files changed, 6 insertions, 7 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index bfbaa180..8c095daf 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:
diff --git a/engine/battle/bank3d_battle.asm b/engine/battle/bank3d_battle.asm
index 3719841f..740fc71a 100644
--- a/engine/battle/bank3d_battle.asm
+++ b/engine/battle/bank3d_battle.asm
@@ -28,7 +28,7 @@ asm_f601d:
ld a, [hl]
push af
res 1, [hl]
- call InitBattleVariables ; 3d:6236
+ call InitBattleVariables
ld a, [wEnemyMonSpecies2]
sub $c8
jp c, InitWildBattle
@@ -36,7 +36,7 @@ asm_f601d:
call GetTrainerInformation
callab ReadTrainer
callab DoBattleTransitionAndInitBattleVariables
- call _LoadTrainerPic ; 3d:615a
+ call _LoadTrainerPic
xor a
ld [wEnemyMonSpecies2], a
ld [$ffe1], a
@@ -151,9 +151,9 @@ InitBattle_Common:
_LoadTrainerPic:
; wd033-wd034 contain pointer to pic
- ld a, [wTrainerPicPointer] ; wd033
+ ld a, [wTrainerPicPointer]
ld e, a
- ld a, [wTrainerPicPointer + 1] ; wd034
+ ld a, [wTrainerPicPointer + 1]
ld d, a ; de contains pointer to trainer pic
ld a, [wLinkState]
and a
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index c061b291..fbbe144b 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,
@@ -7362,7 +7361,7 @@ FreezeBurnParalyzeEffect:
call PlayBattleAnimation
ld hl, FrozenText
jp PrintText
-.opponentAttacker ; 3f382 (f:7382)
+.opponentAttacker
ld a, [wBattleMonStatus] ; mostly same as above with addresses swapped for opponent
and a
jp nz, CheckDefrost