summaryrefslogtreecommitdiff
path: root/engine/battle
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2019-01-12 15:17:20 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2019-01-12 15:17:20 -0500
commit1853e3d127556103fe5828b8589305192106d27e (patch)
treee9b05ceef8526d5abf8e42f0e51f859ddaee0111 /engine/battle
parent07374f02cc4c61b7b6ea326715a1cb674c9faeb1 (diff)
Say "BANK(Foo) ; aka BANK(Bar)" to clarify that Foo and Bar share a bank
Diffstat (limited to 'engine/battle')
-rw-r--r--engine/battle/battle_transition.asm2
-rw-r--r--engine/battle/core.asm4
-rw-r--r--engine/battle/move_effects/present.asm2
3 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm
index 499c21adb..654bc6da8 100644
--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -138,7 +138,7 @@ ConvertTrainerBattlePokeballTilesTo2bpp:
pop hl
ld de, wDecompressScratch
- ld b, BANK(ConvertTrainerBattlePokeballTilesTo2bpp) ; BANK(@)
+ ld b, BANK(@)
ld c, $28
call Request2bpp
pop af
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index f3e300445..3241e5022 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -4157,7 +4157,7 @@ PursuitSwitch:
ld a, [wLastPlayerMon]
ld [wCurBattleMon], a
.do_turn
- ld a, BANK(DoPlayerTurn) ; and BANK(DoEnemyTurn)
+ ld a, BANK(DoPlayerTurn) ; aka BANK(DoEnemyTurn)
rst FarCall
ld a, BATTLE_VARS_MOVE
@@ -4407,7 +4407,7 @@ UseHeldStatusHealingItem:
.got_pointer
call SwitchTurnCore
- ld a, BANK(CalcPlayerStats) ; and BANK(CalcEnemyStats)
+ ld a, BANK(CalcPlayerStats) ; aka 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 058bbad90..bfc334cc7 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) ; and BANK(AICheckEnemyMaxHP)
+ ld a, BANK(AICheckPlayerMaxHP) ; aka BANK(AICheckEnemyMaxHP)
rst FarCall
jr c, .already_fully_healed