diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/core.asm | 2 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/battle/core.asm b/battle/core.asm index 438c08f08..7b22a6f27 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -3454,7 +3454,7 @@ IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618 ld bc, BASE_DATA_SIZE call AddNTimes ld de, EnemyMonType - ld bc, 2 + ld bc, BASE_CATCH_RATE - BASE_TYPES ld a, BANK(BaseData) call FarCopyBytes ld a, [BattleMonType1] diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 2ed9a73c4..b40055f04 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -3881,11 +3881,11 @@ BattleCommand_Counter: ; 35813 ld de, StringBuffer1 call GetMoveData - ld a, [StringBuffer1 + 2] + ld a, [StringBuffer1 + MOVE_POWER] and a ret z - ld a, [StringBuffer1 + 3] + ld a, [StringBuffer1 + MOVE_TYPE] cp SPECIAL ret nc |