diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-24 17:43:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-24 17:43:48 -0400 |
| commit | d0d61cb3ab847ff0c72a840363b89d4acf05b5f5 (patch) | |
| tree | 8c5fd287e727f253f84c89ce32f01a76f948e4fb /battle/core.asm | |
| parent | 080704e49f49777baac124d1bba8c1066acd1bb1 (diff) | |
| parent | 0e76127da878efbe86997eb5a58e6bcd4bf66ff5 (diff) | |
Merge pull request #354 from FredrIQ/comments
Fix a reversed label mistake and reference a major bug
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/battle/core.asm b/battle/core.asm index be6e24eca..cb709e08d 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -3366,8 +3366,8 @@ CheckWhetherSwitchmonIsPredetermined: ; 3d533 ResetEnemyBattleVars: ; 3d557 ; and draw empty TextBox xor a - ld [LastEnemyCounterMove], a ld [LastPlayerCounterMove], a + ld [LastEnemyCounterMove], a ld [LastEnemyMove], a ld [CurEnemyMove], a dec a @@ -3766,8 +3766,8 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7 NewEnemyMonStatus: ; 3d834 xor a - ld [LastEnemyCounterMove], a ld [LastPlayerCounterMove], a + ld [LastEnemyCounterMove], a ld [LastEnemyMove], a ld hl, EnemySubStatus1 rept 4 @@ -4217,8 +4217,8 @@ SendOutPlayerMon: ; 3db5f ld [CurMoveNum], a ld [TypeModifier], a ld [wPlayerMoveStruct + MOVE_ANIM], a - ld [LastEnemyCounterMove], a ld [LastPlayerCounterMove], a + ld [LastEnemyCounterMove], a ld [LastPlayerMove], a call CheckAmuletCoin call FinishBattleAnim @@ -4258,8 +4258,8 @@ SendOutPlayerMon: ; 3db5f NewBattleMonStatus: ; 3dbde xor a - ld [LastEnemyCounterMove], a ld [LastPlayerCounterMove], a + ld [LastEnemyCounterMove], a ld [LastPlayerMove], a ld hl, PlayerSubStatus1 rept 4 |