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

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

Browse source 
This reverts commit 9bf8886d4b, reversing
changes made to 8cf1ba9fc9.
This commit is contained in:
Llinos Evans 2023-04-09 14:02:08 +01:00
parent 377e23038b
commit e772de43d5
18 changed files with 110 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/events/trades.asm
View file

@ -15,9 +15,9 @@ TradeMons:
db NO_MON, NO_MON, TRADE_DIALOGSET_SELF, "Unseen@@@@@" ; Celadon Uni Trader
db RATICATE, RATICATE_A, TRADE_DIALOGSET_REGION, "RATICATE@@@" ; Viridian - LGPE trades begin here
db GOLEM, GOLEM_A, TRADE_DIALOGSET_REGION, "GOLEM@@@@@@" ; Pewter
db NINETALES, NINETALES_A, TRADE_DIALOGSET_REGION, "NINETALES@@" ; Cerulean
;db NINETALES, NINETALES_A, TRADE_DIALOGSET_REGION, "NINETALES@@" ; Cerulean
db PERSIAN, PERSIAN_A, TRADE_DIALOGSET_REGION, "PERSIAN@@@@" ; Vermillion
db DUGTRIO, DUGTRIO_A, TRADE_DIALOGSET_REGION, "DUGTRIO@@@@" ; Lavender
;db DUGTRIO, DUGTRIO_A, TRADE_DIALOGSET_REGION, "DUGTRIO@@@@" ; Lavender
db SANDSLASH, SANDSLASH_A, TRADE_DIALOGSET_REGION, "SANDSLASH@@" ; Celadon
db RAICHU, RAICHU_A, TRADE_DIALOGSET_REGION, "RAICHU@@@@@" ; Saffron
db MAROWAK, MAROWAK_A, TRADE_DIALOGSET_REGION, "MAROWAK@@@@" ; Fuschia

16
data/items/key_items.asm
View file

@ -83,14 +83,6 @@ 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
@ -105,4 +97,12 @@ 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,14 +83,6 @@ 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"
@ -106,4 +98,12 @@ 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,14 +83,6 @@ 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
@ -106,4 +98,12 @@ 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

1
data/maps/objects/CeruleanPokecenter.asm
View file

@ -12,6 +12,5 @@ CeruleanPokecenter_Object:
object_event 10, 5, SPRITE_SUPER_NERD, WALK, ANY_DIR, 2 ; person
object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Ninetales Trader
def_warps_to CERULEAN_POKECENTER

1
data/maps/objects/LavenderPokecenter.asm
View file

@ -12,6 +12,5 @@ LavenderPokecenter_Object:
object_event 5, 3, SPRITE_GENTLEMAN, STAY, NONE, 2 ; person
object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Dugtrio Trader
def_warps_to LAVENDER_POKECENTER

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, OLD_SEA_MAP
object_event 22, 0, SPRITE_POKE_BALL, STAY, NONE, 2, OLDSEACHART
def_warps_to VERMILION_DOCK

2
data/text/item_descriptions.asm
View file

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