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

Refactor Item Constants

Browse source 
Alright, never put items after the floors. This is very, very bad, as it actually causes a myriad of problems whenever the game tries to assert the item list on its lonesome. Effectively, this has been adding floors. This caused the item descriptions to be offset by 21 spaces once you get to the TMs. The fact it worked before was a miracle.

Anyway, all considerations have been made when doing this, so it should all be just fine.

If you need to test if the items are ok, check the Up-Grade on Porygon, as it's the last in the list. Checks showed it was ok for me.

Also, Old Sea Chart now uses the localised name - Old Sea Map. This actually fits in-game, which is good.
This commit is contained in:
Llinos Evans 2023-04-09 12:25:10 +01:00
parent 374756eec6
commit 3f6005f3f1
10 changed files with 73 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

16
data/items/key_items.asm
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

16
data/items/names.asm
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

16
data/items/prices.asm
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

2
data/maps/objects/VermilionDock.asm
View file

@ -8,6 +8,6 @@ VermilionDock_Object:
def_bg_events
def_object_events
object_event 22, 0, SPRITE_POKE_BALL, STAY, NONE, 2, OLDSEACHART
object_event 22, 0, SPRITE_POKE_BALL, STAY, NONE, 2, OLD_SEA_MAP
def_warps_to VERMILION_DOCK

2
data/text/item_descriptions.asm
View file

@ -342,7 +342,7 @@ _CitrinePassDescription::
next "CITRINE CITY."
prompt
_OldSeaChartDescription::
_OldSeaMapDescription::
text "A sea chart for"
next "certain island."
prompt