pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source
This commit is contained in:
Remy Oukaour 2017-12-24 17:30:29 -05:00
commit b805d343f3
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
battle/core.asm
View File

@ -3454,7 +3454,7 @@ IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618
ld bc, BASE_DATA_SIZE ld bc, BASE_DATA_SIZE
call AddNTimes call AddNTimes
ld de, EnemyMonType ld de, EnemyMonType
ld bc, 2 ld bc, BASE_CATCH_RATE - BASE_TYPES
ld a, BANK(BaseData) ld a, BANK(BaseData)
call FarCopyBytes call FarCopyBytes
ld a, [BattleMonType1] ld a, [BattleMonType1]

2
battle/effect_command_pointers.asm
View File

@ -78,7 +78,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand_Spite ; 35c0f dw BattleCommand_Spite ; 35c0f
dw BattleCommand_FalseSwipe ; 35c94 dw BattleCommand_FalseSwipe ; 35c94
dw BattleCommand_HealBell ; 35cc9 dw BattleCommand_HealBell ; 35cc9
dw BattleCommand_KingsRock ; 36ac9 dw BattleCommand_HeldFlinch ; 36ac9
dw BattleCommand_TripleKick ; 346b2 dw BattleCommand_TripleKick ; 346b2
dw BattleCommand_KickCounter ; 346cd dw BattleCommand_KickCounter ; 346cd
dw BattleCommand_Thief ; 37492 dw BattleCommand_Thief ; 37492

8
battle/effect_commands.asm
View File

@ -3881,11 +3881,11 @@ BattleCommand_Counter: ; 35813
ld de, StringBuffer1 ld de, StringBuffer1
call GetMoveData call GetMoveData
ld a, [StringBuffer1 + 2] ld a, [StringBuffer1 + MOVE_POWER]
and a and a
ret z ret z
ld a, [StringBuffer1 + 3] ld a, [StringBuffer1 + MOVE_TYPE]
cp SPECIAL cp SPECIAL
ret nc ret nc
@ -7184,7 +7184,7 @@ CheckOpponentWentFirst: ; 36abf
; 36ac9 ; 36ac9
BattleCommand_KingsRock: ; 36ac9 BattleCommand_HeldFlinch: ; 36ac9
; kingsrock ; kingsrock
ld a, [AttackMissed] ld a, [AttackMissed]
@ -7193,7 +7193,7 @@ BattleCommand_KingsRock: ; 36ac9
call GetUserItem call GetUserItem
ld a, b ld a, b
cp HELD_TRADE_EVOLVE ; Only King's Rock has this effect cp HELD_FLINCH
ret nz ret nz
call CheckSubstituteOpp call CheckSubstituteOpp

2
constants/item_constants.asm
View File

@ -366,7 +366,7 @@ const_value SET 70
const HELD_ESCAPE const HELD_ESCAPE
const HELD_CRITICAL_UP const HELD_CRITICAL_UP
const HELD_QUICK_CLAW const HELD_QUICK_CLAW
const HELD_TRADE_EVOLVE const HELD_FLINCH
const HELD_AMULET_COIN const HELD_AMULET_COIN
const HELD_BRIGHTPOWDER const HELD_BRIGHTPOWDER
const HELD_78 const HELD_78

2
data/items/item_attributes.asm
View File

@ -170,7 +170,7 @@ ItemAttributes: ; 67c1
; POISON BARB ; POISON BARB
item_attribute 100, HELD_POISON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 100, HELD_POISON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; KING'S ROCK ; 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 ; BITTER BERRY
item_attribute 10, HELD_HEAL_CONFUSION, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_PARTY item_attribute 10, HELD_HEAL_CONFUSION, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_PARTY
; MINT BERRY ; MINT BERRY

2
engine/link.asm
View File

@ -740,7 +740,7 @@ Link_PrepPartyData_Gen1: ; 28499
ld hl, BaseData + BASE_TYPES ld hl, BaseData + BASE_TYPES
ld bc, BASE_DATA_SIZE ld bc, BASE_DATA_SIZE
call AddNTimes call AddNTimes
ld bc, 2 ld bc, BASE_CATCH_RATE - BASE_TYPES
ld a, BANK(BaseData) ld a, BANK(BaseData)
call FarCopyBytes call FarCopyBytes
pop bc pop bc

4
engine/stats_screen.asm
View File

@ -377,7 +377,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
call .PlaceHPBar call .PlaceHPBar
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ld a, [CurBaseData] ld a, [BaseDexNo]
ld [wd265], a ld [wd265], a
ld [CurSpecies], a ld [CurSpecies], a
hlcoord 8, 0 hlcoord 8, 0
@ -401,7 +401,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
hlcoord 9, 4 hlcoord 9, 4
ld a, "/" ld a, "/"
ld [hli], a ld [hli], a
ld a, [CurBaseData] ld a, [BaseDexNo]
ld [wd265], a ld [wd265], a
call GetPokemonName call GetPokemonName
call PlaceString call PlaceString