summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-10-29 02:04:48 -0700
committerYamaArashi <shadow962@live.com>2016-10-29 02:04:48 -0700
commit4d61c351726b38b22e0606df23bd2fdfb13640cc (patch)
tree8bd7d585e598595703b86b2c651c4de6fa9a5f4c
parentbb1bf5e6a7536378dffc2b995384d6dc8692bea8 (diff)
correct mistaken comments
-rw-r--r--constants/misc_constants.asm2
-rwxr-xr-xengine/battle/core.asm4
2 files changed, 3 insertions, 3 deletions
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index e9e4b7bf..57b19a37 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -203,4 +203,4 @@ LINK_STATE_TRADING EQU $32 ; in a link trade
LINKBATTLE_RUN EQU $F
LINKBATTLE_STRUGGLE EQU $E
-LINKBATTLE_NO_ACTION EQU $D ; never sent
+LINKBATTLE_NO_ACTION EQU $D
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index cc5a6de7..d921fd15 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -3097,8 +3097,8 @@ LinkBattleExchangeData:
cp STRUGGLE
ld b, LINKBATTLE_STRUGGLE
jr z, .next
- dec b
- inc a
+ dec b ; LINKBATTLE_NO_ACTION
+ inc a ; does move equal -1 (i.e. no action)?
jr z, .next
ld a, [wPlayerMoveListIndex]
jr .doExchange