thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/item_constants.asm
View file

@ -112,7 +112,7 @@ DEF NUM_ITEMS EQU const_value - 1
const ICE_STONE ; $62 const ICE_STONE ; $62
const PROTECTOR ; $63 const PROTECTOR ; $63
const POISON_STONE ; $64 const POISON_STONE ; $64
const BLKAUGERITE ; $65 const BLK_AUGURITE ; $65
DEF NUM_FLOORS EQU const_value - 1 - NUM_ITEMS DEF NUM_FLOORS EQU const_value - 1 - NUM_ITEMS
const_next $C4 const_next $C4

20
data/items/key_items.asm
View file

@ -83,4 +83,22 @@ KeyItemFlags:
dbit FALSE ; MAX_ETHER dbit FALSE ; MAX_ETHER
dbit FALSE ; ELIXER dbit FALSE ; ELIXER
dbit FALSE ; MAX_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 "ICE STONE"
li "PROTECTOR" li "PROTECTOR"
li "POISON STONE" li "POISON STONE"
li "BLKAUGERITE" li "BLK AUGURITE"
assert_list_length NUM_ITEMS + NUM_FLOORS assert_list_length NUM_ITEMS + NUM_FLOORS

2
data/items/prices.asm
View file

@ -101,5 +101,5 @@ ItemPrices::
bcd3 2100 ; ICE_STONE bcd3 2100 ; ICE_STONE
bcd3 3000 ; PROTECTOR bcd3 3000 ; PROTECTOR
bcd3 2100 ; POISON_STONE bcd3 2100 ; POISON_STONE
bcd3 2100 ; BLKAUGERITE bcd3 2100 ; BLK_AUGURITE
assert_table_length NUM_ITEMS + NUM_FLOORS 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 ICE_STONE
db PROTECTOR db PROTECTOR
db POISON_STONE db POISON_STONE
db BLKAUGERITE db BLK_AUGURITE
db -1 ; end db -1 ; end

19
data/pokemon/evos_moves.asm
View file

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

3
engine/debug/debug_party.asm
View file

@ -143,8 +143,9 @@ DebugItemsList:
db FULL_RESTORE, 99 db FULL_RESTORE, 99
db MAX_REPEL, 99 db MAX_REPEL, 99
db ESCAPE_ROPE, 99 db ESCAPE_ROPE, 99
db BLKAUGERITE, 99 db RARE_CANDY, 99
db MASTER_BALL, 99 db MASTER_BALL, 99
db BLK_AUGURITE, 99
db SECRET_KEY, 1 db SECRET_KEY, 1
db CARD_KEY, 1 db CARD_KEY, 1
db S_S_TICKET, 1 db S_S_TICKET, 1

2
engine/items/item_effects.asm
View file

@ -117,7 +117,7 @@ ItemUsePtrTable:
dw ItemUseEvoStone ; ICE_STONE dw ItemUseEvoStone ; ICE_STONE
dw ItemUseEvoStone ; PROTECTOR dw ItemUseEvoStone ; PROTECTOR
dw ItemUseEvoStone ; POISON_STONE dw ItemUseEvoStone ; POISON_STONE
dw ItemUseEvoStone ; BLKAUGERITE dw ItemUseEvoStone ; BLK_AUGURITE
ItemUseBall: ItemUseBall:

2
scripts/CeladonMart4F.asm
View file

@ -20,4 +20,4 @@ CeladonMart4Text4:
text_end text_end
CeladonMart4ClerkText:: CeladonMart4ClerkText::
script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE, POISON_STONE, HEART_STONE script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE, ICE_STONE, POISON_STONE, HEART_STONE