summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/battle/core.asm4
-rw-r--r--engine/battle/move_effects/present.asm2
-rw-r--r--engine/battle_anims/anim_commands.asm2
-rw-r--r--engine/events/print_unown.asm2
4 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 5c34ddd20..56d42974f 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -4154,7 +4154,7 @@ PursuitSwitch:
ld a, [wLastPlayerMon]
ld [wCurBattleMon], a
.do_turn
- ld a, BANK(DoPlayerTurn)
+ ld a, BANK(DoPlayerTurn) ; and BANK(DoEnemyTurn)
rst FarCall
ld a, BATTLE_VARS_MOVE
@@ -4404,7 +4404,7 @@ UseHeldStatusHealingItem:
.got_pointer
call SwitchTurnCore
- ld a, BANK(CalcEnemyStats)
+ ld a, BANK(CalcPlayerStats) ; and BANK(CalcEnemyStats)
rst FarCall
call SwitchTurnCore
call ItemRecoveryAnim
diff --git a/engine/battle/move_effects/present.asm b/engine/battle/move_effects/present.asm
index 35713927b..058bbad90 100644
--- a/engine/battle/move_effects/present.asm
+++ b/engine/battle/move_effects/present.asm
@@ -59,7 +59,7 @@ BattleCommand_Present:
jr z, .got_hp_fn_pointer
ld hl, AICheckEnemyMaxHP
.got_hp_fn_pointer
- ld a, BANK(AICheckPlayerMaxHP)
+ ld a, BANK(AICheckPlayerMaxHP) ; and BANK(AICheckEnemyMaxHP)
rst FarCall
jr c, .already_fully_healed
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
index 6cc2d6620..48ba967f2 100644
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -1340,7 +1340,7 @@ BattleAnimAssignPals:
call DmgToCgbObjPals
ret
-ClearBattleAnims:
+ClearBattleAnims::
; Clear animation block
ld hl, wLYOverrides
ld bc, wBattleAnimEnd - wLYOverrides
diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm
index fb0abd52b..ffb098745 100644
--- a/engine/events/print_unown.asm
+++ b/engine/events/print_unown.asm
@@ -19,7 +19,7 @@ _UnownPrinter:
ld de, UnownDexATile
ld hl, vTiles0 tile UNOWNSTAMP_BOLD_A
- lb bc, BANK(UnownDexBTile), 1
+ lb bc, BANK(UnownDexATile), 1
call Request1bpp
ld de, UnownDexBTile