thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing some errors with items

Browse source
This commit is contained in:
MementoMartha 2022-09-30 16:54:56 +01:00
parent 22c4561b35
commit c6a0566063
9 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
data/items/key_items.asm
View file

@ -83,4 +83,22 @@ KeyItemFlags:
dbit FALSE ; MAX_ETHER
dbit FALSE ; ELIXER
dbit FALSE ; MAX_ELIXER
end_bit_array NUM_ITEMS
dbit TRUE ; FLOOR_B2F
dbit TRUE ; FLOOR_B1F
dbit TRUE ; FLOOR_1F
dbit TRUE ; FLOOR_2F
dbit TRUE ; FLOOR_3F
dbit TRUE ; FLOOR_4F
dbit TRUE ; FLOOR_5F
dbit TRUE ; FLOOR_6F
dbit TRUE ; FLOOR_7F
dbit TRUE ; FLOOR_8F
dbit TRUE ; FLOOR_9F
dbit TRUE ; FLOOR_10F
dbit TRUE ; FLOOR_11F
dbit TRUE ; FLOOR_B4F
dbit FALSE ; ICE_STONE
dbit FALSE ; PROTECTOR
dbit FALSE ; POISON_STONE
dbit FALSE ; BLK_AUGURITE
end_bit_array NUM_ITEMS + NUM_FLOORS

2
data/items/names.asm
View file

@ -101,5 +101,5 @@ ItemNames::
li "ICE STONE"
li "PROTECTOR"
li "POISON STONE"
li "BLKAUGERITE"
li "BLK AUGURITE"
assert_list_length NUM_ITEMS + NUM_FLOORS

2
data/items/prices.asm
View file

@ -101,5 +101,5 @@ ItemPrices::
bcd3 2100 ; ICE_STONE
bcd3 3000 ; PROTECTOR
bcd3 2100 ; POISON_STONE
bcd3 2100 ; BLKAUGERITE
bcd3 2100 ; BLK_AUGURITE
assert_table_length NUM_ITEMS + NUM_FLOORS

2
data/items/use_party.asm
View file

@ -40,5 +40,5 @@ UsableItems_PartyMenu:
db ICE_STONE
db PROTECTOR
db POISON_STONE
db BLKAUGERITE
db BLK_AUGURITE
db -1 ; end

19
data/pokemon/evos_moves.asm
View file

@ -222,7 +222,6 @@ EvosMovesPointerTable:
RhydonEvosMoves:
; Evolutions
db EV_TRADE, 1, RHYPERIOR
db EV_ITEM, PROTECTOR, 1, RHYPERIOR
db 0
; Learnset
@ -300,12 +299,8 @@ NidokingEvosMoves:
db 0
; Learnset
db 8, HORN_ATTACK
db 12, DOUBLE_KICK
db 19, POISON_STING
db 26, FOCUS_ENERGY
db 34, FURY_ATTACK
db 41, THRASH
db 46, HORN_DRILL
db 14, POISON_STING
db 23, THRASH
db 0
SlowbroEvosMoves:
@ -406,12 +401,8 @@ NidoqueenEvosMoves:
db 0
; Learnset
db 8, SCRATCH
db 12, DOUBLE_KICK
db 19, POISON_STING
db 25, TAIL_WHIP
db 34, BITE
db 41, BODY_SLAM
db 46, FURY_SWIPES
db 14, POISON_STING
db 23, BODY_SLAM
db 0
CuboneEvosMoves:
@ -520,7 +511,7 @@ GastlyEvosMoves:
ScytherEvosMoves:
; Evolutions
db EV_LEVEL, 41, SCIZOR
db EV_ITEM, BLKAUGERITE, 1, KLEAVOR
db EV_ITEM, BLK_AUGURITE, 1, KLEAVOR
db 0
; Learnset
db 17, LEER