diff options
| -rw-r--r-- | battle/core.asm | 2 | ||||
| -rw-r--r-- | battle/effect_command_pointers.asm | 2 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 8 | ||||
| -rw-r--r-- | constants/item_constants.asm | 2 | ||||
| -rw-r--r-- | data/items/item_attributes.asm | 2 | ||||
| -rwxr-xr-x | engine/link.asm | 2 | ||||
| -rwxr-xr-x | engine/stats_screen.asm | 4 |
7 files changed, 11 insertions, 11 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_command_pointers.asm b/battle/effect_command_pointers.asm index bcd666c91..5dd6be786 100644 --- a/battle/effect_command_pointers.asm +++ b/battle/effect_command_pointers.asm @@ -78,7 +78,7 @@ BattleCommandPointers: ; 3fd28 dw BattleCommand_Spite ; 35c0f dw BattleCommand_FalseSwipe ; 35c94 dw BattleCommand_HealBell ; 35cc9 - dw BattleCommand_KingsRock ; 36ac9 + dw BattleCommand_HeldFlinch ; 36ac9 dw BattleCommand_TripleKick ; 346b2 dw BattleCommand_KickCounter ; 346cd dw BattleCommand_Thief ; 37492 diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 57e4c574f..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 @@ -7184,7 +7184,7 @@ CheckOpponentWentFirst: ; 36abf ; 36ac9 -BattleCommand_KingsRock: ; 36ac9 +BattleCommand_HeldFlinch: ; 36ac9 ; kingsrock ld a, [AttackMissed] @@ -7193,7 +7193,7 @@ BattleCommand_KingsRock: ; 36ac9 call GetUserItem ld a, b - cp HELD_TRADE_EVOLVE ; Only King's Rock has this effect + cp HELD_FLINCH ret nz call CheckSubstituteOpp diff --git a/constants/item_constants.asm b/constants/item_constants.asm index f03cf2735..0285292f1 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -366,7 +366,7 @@ const_value SET 70 const HELD_ESCAPE const HELD_CRITICAL_UP const HELD_QUICK_CLAW - const HELD_TRADE_EVOLVE + const HELD_FLINCH const HELD_AMULET_COIN const HELD_BRIGHTPOWDER const HELD_78 diff --git a/data/items/item_attributes.asm b/data/items/item_attributes.asm index d6d272107..dc2842760 100644 --- a/data/items/item_attributes.asm +++ b/data/items/item_attributes.asm @@ -170,7 +170,7 @@ ItemAttributes: ; 67c1 ; POISON BARB item_attribute 100, HELD_POISON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; KING'S ROCK - item_attribute 100, HELD_TRADE_EVOLVE, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 100, HELD_FLINCH, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BITTER BERRY item_attribute 10, HELD_HEAL_CONFUSION, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_PARTY ; MINT BERRY 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 |