Revert "Revert "Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack""

This reverts commit e772de43d5.
This commit is contained in:
Llinos Evans 2023-04-09 14:03:02 +01:00
parent e772de43d5
commit 4389e86fd1
18 changed files with 107 additions and 110 deletions

View file

@ -83,6 +83,14 @@ KeyItemFlags:
dbit FALSE ; MAX_ETHER
dbit FALSE ; ELIXER
dbit FALSE ; MAX_ELIXER
dbit FALSE ; ICE_STONE
dbit FALSE ; PROTECTOR
dbit FALSE ; POISON_STONE
dbit FALSE ; BLK_AUGURITE
dbit FALSE ; DUBIOUS_DISC
dbit TRUE ; CITRINE_PASS
dbit TRUE ; OLD_SEA_MAP
dbit FALSE ; UP_GRADE
dbit TRUE ; FLOOR_B2F
dbit TRUE ; FLOOR_B1F
dbit TRUE ; FLOOR_1F
@ -97,12 +105,4 @@ KeyItemFlags:
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
dbit FALSE ; DUBIOUS_DISC
dbit TRUE ; CITRINE_PASS
dbit TRUE ; OLDSEACHART
dbit FALSE ; UP_GRADE
end_bit_array NUM_ITEMS + NUM_FLOORS

View file

@ -83,6 +83,14 @@ ItemNames::
li "MAX ETHER"
li "ELIXER"
li "MAX ELIXER"
li "ICE STONE"
li "PROTECTOR"
li "POISON STONE"
li "BLK AUGURITE"
li "DUBIOUS DISC"
li "CITRINE PASS"
li "OLD SEA MAP"
li "UP-GRADE"
assert_list_length NUM_ITEMS
li "B2F"
li "B1F"
@ -98,12 +106,4 @@ ItemNames::
li "10F"
li "11F"
li "B4F"
li "ICE STONE"
li "PROTECTOR"
li "POISON STONE"
li "BLK AUGURITE"
li "DUBIOUS DISC"
li "CITRINE PASS"
li "OLDSEACHART"
li "UP-GRADE"
assert_list_length NUM_ITEMS + NUM_FLOORS

View file

@ -83,6 +83,14 @@ ItemPrices::
bcd3 0 ; MAX_ETHER
bcd3 0 ; ELIXER
bcd3 0 ; MAX_ELIXER
bcd3 2100 ; ICE_STONE
bcd3 3000 ; PROTECTOR
bcd3 2100 ; POISON_STONE
bcd3 2100 ; BLK_AUGURITE
bcd3 3000 ; DUBIOUS_DISC
bcd3 0 ; CITRINE_PASS
bcd3 0 ; OLD_SEA_MAP
bcd3 3000 ; UP_GRADE
assert_table_length NUM_ITEMS
bcd3 0 ; FLOOR_B2F
bcd3 0 ; FLOOR_B1F
@ -98,12 +106,4 @@ ItemPrices::
bcd3 0 ; FLOOR_10F
bcd3 0 ; FLOOR_11F
bcd3 0 ; FLOOR_B4F
bcd3 2100 ; ICE_STONE
bcd3 3000 ; PROTECTOR
bcd3 2100 ; POISON_STONE
bcd3 2100 ; BLK_AUGURITE
bcd3 3000 ; DUBIOUS_DISC
bcd3 0 ; CITRINE_PASS
bcd3 0 ; OLDSEACHART
bcd3 3000 ; UP_GRADE
assert_table_length NUM_ITEMS + NUM_FLOORS