summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-06-27 23:03:39 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-06-27 23:03:39 -0400
commit929c7f6f7d62b4b22e1de2003b3df1943268321c (patch)
tree327a7cc54e7e65dbcfe409777e614cc5e3a4ddbc /engine
parent56505958078db1c116aa883e0c7ecf631181475e (diff)
Remove RAM address comments
Diffstat (limited to 'engine')
-rwxr-xr-xengine/battle/core.asm6
-rw-r--r--engine/battle/moveEffects/substitute_effect.asm2
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 96318c78..75841ccf 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -5054,11 +5054,11 @@ BuildingRageText:
; copy last move for Mirror Move
; sets zero flag on failure and unsets zero flag on success
MirrorMoveCopyMove:
-; Mirror Move makes use of ccf1 (wPlayerUsedMove) and ccf2 (wEnemyUsedMove) addresses,
+; Mirror Move makes use of wPlayerUsedMove and wEnemyUsedMove,
; which are mainly used to print the "[Pokemon] used [Move]" text.
; Both are set to 0 whenever a new Pokemon is sent out
-; ccf1 is also set to 0 whenever the player is fast asleep or frozen solid.
-; ccf2 is also set to 0 whenever the enemy is fast asleep or frozen solid.
+; wPlayerUsedMove is also set to 0 whenever the player is fast asleep or frozen solid.
+; wEnemyUsedMove is also set to 0 whenever the enemy is fast asleep or frozen solid.
ld a, [H_WHOSETURN]
and a
diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/moveEffects/substitute_effect.asm
index b5d006fc..1bb6c887 100644
--- a/engine/battle/moveEffects/substitute_effect.asm
+++ b/engine/battle/moveEffects/substitute_effect.asm
@@ -28,7 +28,7 @@ SubstituteEffect_:
add hl, de ; point hl to current HP low byte
pop de
ld a, b
- ld [de], a ; save copy of HP to subtract in ccd7/ccd8 [how much HP substitute has]
+ ld [de], a ; save copy of HP to subtract in wPlayerSubstituteHP/wEnemySubstituteHP
ld a, [hld]
; subtract [max hp / 4] to current HP
sub b