diff options
| -rw-r--r-- | constants/misc_constants.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 4 |
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 |