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

Up-Grade NPC

Browse source 
Seems to interact oddly with Saffron but I believe this is because of the way Team Rocket works. The event itself works fine.

Also added the Up-Grade, as before, Porygon was evolving via Trade.

Uses text referencing LGPE, and has a similar location.

Because of the sprite limit in Saffron, the Pidgeot NPC has been removed.
This commit is contained in:
May Evans 2023-03-29 23:47:26 +01:00
parent abb9ab6aac
commit 57d79f43ed
15 changed files with 93 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/items/key_items.asm
View file

@ -104,4 +104,5 @@ KeyItemFlags:
dbit FALSE ; DUBIOUS_DISC
dbit TRUE ; CITRINE_PASS
dbit TRUE ; OLDSEACHART
dbit FALSE ; UP_GRADE
end_bit_array NUM_ITEMS + NUM_FLOORS

1
data/items/names.asm
View file

@ -105,4 +105,5 @@ ItemNames::
li "DUBIOUS DISC"
li "CITRINE PASS"
li "OLDSEACHART"
li "UP-GRADE"
assert_list_length NUM_ITEMS + NUM_FLOORS

1
data/items/prices.asm
View file

@ -105,4 +105,5 @@ ItemPrices::
bcd3 3000 ; DUBIOUS_DISC
bcd3 0 ; CITRINE_PASS
bcd3 0 ; OLDSEACHART
bcd3 3000 ; UP_GRADE
assert_table_length NUM_ITEMS + NUM_FLOORS

3
data/maps/hide_show_data.asm
View file

@ -292,8 +292,9 @@ SaffronCityHS:
db SAFFRON_CITY, $0D, HIDE
db SAFFRON_CITY, $0E, SHOW
db SAFFRON_CITY, $0F, HIDE
db SAFFRON_CITY, $1A, HIDE
Route2HS:
db ROUTE_2, $01, SHOW
;db ROUTE_2, $01, SHOW - removed for the former
db ROUTE_2, $02, SHOW
Route4HS:
db ROUTE_4, $03, SHOW

3
data/maps/objects/SaffronCity.asm
View file

@ -35,9 +35,10 @@ SaffronCity_Object:
object_event 23, 23, SPRITE_SILPH_WORKER, STAY, NONE, 9 ; person
object_event 17, 30, SPRITE_ERIKA, WALK, LEFT_RIGHT, 10 ; person
object_event 30, 12, SPRITE_GENTLEMAN, STAY, DOWN, 11 ; person
object_event 31, 12, SPRITE_BIRD, STAY, DOWN, 12 ; person
;object_event 31, 12, SPRITE_BIRD, STAY, DOWN, 12 ; person - removed due to sprite limit
object_event 18, 8, SPRITE_ROCKER, STAY, UP, 13 ; person
object_event 18, 22, SPRITE_ROCKET, STAY, DOWN, 14 ; person
object_event 19, 22, SPRITE_ROCKET, STAY, DOWN, 15 ; person
object_event 5, 30, SPRITE_SILPH_WORKER, STAY, DOWN, 26 ; Up-Grade NPC, hidden until Giovanni is beaten
def_warps_to SAFFRON_CITY

2
data/pokemon/evos_moves.asm
View file

@ -2506,7 +2506,7 @@ GeodudeEvosMoves:
PorygonEvosMoves:
; Evolutions
db EV_TRADE, 1, PORYGON2
db EV_ITEM, UP_GRADE, 1, PORYGON2
db 0
; Learnset
db 23, PSYBEAM

1
data/text/item_descriptions.asm
View file

@ -42,6 +42,7 @@ _HeartStoneDescription::
_ProtectorDescription::
_BlkAuguriteDescription::
_DubiousDiscDescription::
_UpGradeDescription::
text "Evolves certain"
next "kinds of #MON."
prompt