diff options
| -rw-r--r-- | battle/core.asm | 2 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 4 | ||||
| -rwxr-xr-x | engine/link.asm | 2 | ||||
| -rwxr-xr-x | engine/stats_screen.asm | 4 |
4 files changed, 6 insertions, 6 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 diff --git a/engine/link.asm b/engine/link.asm index 619d5bae3..066bbb4a3 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -740,7 +740,7 @@ Link_PrepPartyData_Gen1: ; 28499 ld hl, BaseData + BASE_TYPES ld bc, BASE_DATA_SIZE call AddNTimes - ld bc, 2 + ld bc, BASE_CATCH_RATE - BASE_TYPES ld a, BANK(BaseData) call FarCopyBytes pop bc diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index 14a0c1d47..19f9ed419 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -377,7 +377,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea) call .PlaceHPBar xor a ld [hBGMapMode], a - ld a, [CurBaseData] + ld a, [BaseDexNo] ld [wd265], a ld [CurSpecies], a hlcoord 8, 0 @@ -401,7 +401,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea) hlcoord 9, 4 ld a, "/" ld [hli], a - ld a, [CurBaseData] + ld a, [BaseDexNo] ld [wd265], a call GetPokemonName call PlaceString |