diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2020-04-24 20:23:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 20:23:51 +0200 |
| commit | ebd79f9631342cd5969b57eb8215ef1a23becbb9 (patch) | |
| tree | 44a9d03f62e0a462e6efb5ae431daf2520a5186c /src/engine/bank01.asm | |
| parent | e360e0102a7332dc9a026327e2cbcce71c6cdcd4 (diff) | |
| parent | 9aa5cba752d247f94179b0c9fc6a558f26f77a47 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/engine/bank01.asm')
| -rw-r--r-- | src/engine/bank01.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 5131025..b73b47c 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -3055,7 +3055,7 @@ PracticeDuelVerify_Turn2: ; 5438 (1:5438) ld a, [wTempCardID_ccc2] cp SEAKING jp nz, ReturnWrongAction - ld a, [wSelectedMoveIndex] + ld a, [wSelectedAttack] cp 1 jp nz, ReturnWrongAction ld e, PLAY_AREA_ARENA @@ -3090,7 +3090,7 @@ PracticeDuelVerify_Turn4: ; 5467 (1:5467) ld a, [wTempCardID_ccc2] cp SEAKING jr nz, ReturnWrongAction - ld a, [wSelectedMoveIndex] + ld a, [wSelectedAttack] cp 1 jr nz, ReturnWrongAction ret @@ -3127,7 +3127,7 @@ PracticeDuelVerify_Turn7Or8: ; 54b7 (1:54b7) ld a, [wTempCardID_ccc2] cp STARMIE jr nz, ReturnWrongAction - ld a, [wSelectedMoveIndex] + ld a, [wSelectedAttack] cp 1 jr nz, ReturnWrongAction ret @@ -6041,7 +6041,7 @@ DisplayOpponentUsedMoveScreen: ; 6635 (1:6635) ld a, CARDPAGE_POKEMON_OVERVIEW ld [wCardPageNumber], a ld hl, wLoadedCard1Move1Name - ld a, [wSelectedMoveIndex] + ld a, [wSelectedAttack] or a jr z, .first_move ld hl, wLoadedCard1Move2Name @@ -6886,7 +6886,7 @@ OppAction_6b3e: ; 6b3e (1:6b3e) call SwapTurn ldh a, [hTempCardIndex_ff9f] ld [wPlayerAttackingCardIndex], a - ld a, [wSelectedMoveIndex] + ld a, [wSelectedAttack] ld [wPlayerAttackingMoveIndex], a ld a, [wTempCardID_ccc2] ld [wPlayerAttackingCardID], a |