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

Regional Trades!

Browse source 
- Regional trades now dummy out the "-A" thing etc so they look nice
- Added Celadon, Saffron, Viridian, and Vermillion regional trades
- Added Galarian Sidegrade trades to the S. S. Anne, but Perrserker and Sirfetch'd specifically don't work. I have zero clue why, as they work the same as the rest.
- Corrected grammar in the "Happy" text when you finish a trade
This commit is contained in:
Llinos Evans 2023-04-08 01:05:15 +01:00
parent 24602dc972
commit ed1ced807b
20 changed files with 98 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

38
data/events/trades.asm
View file

@ -13,24 +13,24 @@ TradeMons:
db VENONAT, TANGELA, TRADE_DIALOGSET_HAPPY, "CRINKLES@@@"
db CUBONE, MACHOKE, TRADE_DIALOGSET_HAPPY, "RICKY@@@@@@" ; From Yellow
db NO_MON, NO_MON, TRADE_DIALOGSET_SELF, "Unseen@@@@@" ; Celadon Uni Trader
;db RATICATE, RATICATE_A, TRADE_DIALOGSET_REGION, "RATICATE-A@" ; Viridian - LGPE trades begin here
;db GOLEM, GOLEM_A, TRADE_DIALOGSET_REGION, "GOLEM-A@@@@" ; Pewter
;db NINETALES, NINETALES_A, TRADE_DIALOGSET_REGION, "NINETALES-A" ; Cerulean
;db PERSIAN, PERSIAN_A, TRADE_DIALOGSET_REGION, "PERSIAN-A@@" ; Vermillion
;db DUGTRIO, DUGTRIO_A, TRADE_DIALOGSET_REGION, "DUGTRIO-A@@" ; Lavender
;db SANDSLASH, SANDSLASH_A, TRADE_DIALOGSET_REGION, "SANDSLASH-A" ; Celadon
;db RAICHU, RAICHU_A, TRADE_DIALOGSET_REGION, "RAICHU-A@@@" ; Saffron
;db MAROWAK, MAROWAK_A, TRADE_DIALOGSET_REGION, "MAROWAK-A@@" ; Fuschia
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 PERSIAN, PERSIAN_A, TRADE_DIALOGSET_REGION, "PERSIAN@@@@" ; Vermillion
;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
;db MUK, MUK_A, TRADE_DIALOGSET_REGION, "MUK-A@@@@@@" ; Cinnabar
;db EXEGGUTOR, EXEGGUTOR_A, TRADE_DIALOGSET_REGION, "EXEGGUTOR-A" ; Indigo
;db TAUROS, TAUROS_C, TRADE_DIALOGSET_REGION, "TAUROS_C@@@" ; S.S. Anne begins here
;db TAUROS, TAUROS_A, TRADE_DIALOGSET_REGION, "TAUROS_A@@@"
;db TAUROS, TAUROS_B, TRADE_DIALOGSET_REGION, "TAUROS_B@@@"
;db RAPIDASH, RAPIDASH_G, TRADE_DIALOGSET_REGION, "RAPIDASH-G@"
;db SLOWBRO, SLOWBRO_G, TRADE_DIALOGSET_REGION, "SLOWBRO-G@@"
;db SLOWKING, SLOWKING_G, TRADE_DIALOGSET_REGION, "SLOWKING-G@"
;db WEEZING, WEEZING_G, TRADE_DIALOGSET_REGION, "WEEZING-G@@"
db MR_MIME, MR_RIME, TRADE_DIALOGSET_CASUAL, "MR. RIME@@@"
db PERSIAN, PERRSERKER, TRADE_DIALOGSET_CASUAL, "PERRSERKER@"
db MADAAMU, SIRFETCHD, TRADE_DIALOGSET_CASUAL, "SIRFETCH'D@"
;db EXEGGUTOR, EXEGGUTOR_A, TRADE_DIALOGSET_REGION, "EXEGGUTOR@@" ; Indigo
;db TAUROS, TAUROS_C, TRADE_DIALOGSET_REGION, "TAUROS@@@@@" ; S.S. Anne begins here
;db TAUROS, TAUROS_A, TRADE_DIALOGSET_REGION, "TAUROS@@@@@"
;db TAUROS, TAUROS_B, TRADE_DIALOGSET_REGION, "TAUROS@@@@@"
;db RAPIDASH, RAPIDASH_G, TRADE_DIALOGSET_REGION, "RAPIDASH@@@"
;db SLOWBRO, SLOWBRO_G, TRADE_DIALOGSET_REGION, "SLOWBRO@@@@"
;db SLOWKING, SLOWKING_G, TRADE_DIALOGSET_REGION, "SLOWKING@@@"
;db WEEZING, WEEZING_G, TRADE_DIALOGSET_REGION, "WEEZING@@@@"
db MR_MIME, MR_RIME, TRADE_DIALOGSET_CASUAL, "MR.RIME@@@@"
db PERSIAN, PERRSERKER, TRADE_DIALOGSET_HAPPY, "PERRSERKER@"
db MADAAMU, SIRFETCHD, TRADE_DIALOGSET_HAPPY, "SIRFETCH'D@"
assert_table_length NUM_NPC_TRADES

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

@ -12,5 +12,6 @@ CeladonPokecenter_Object:
object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person
object_event 10, 5, SPRITE_BEAUTY, WALK, ANY_DIR, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Sandslash Trader
def_warps_to CELADON_POKECENTER

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

@ -23,5 +23,6 @@ SSAnne1FRooms_Object:
object_event 10, 13, SPRITE_GIRL, STAY, RIGHT, 9 ; person
object_event 12, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_BODY_SLAM
object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 11 ; person
object_event 0, 4, SPRITE_GAMEBOY_KID, STAY, DOWN, 12 ; Perrserker Trader
def_warps_to SS_ANNE_1F_ROOMS

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

@ -31,5 +31,6 @@ SSAnne2FRooms_Object:
object_event 11, 14, SPRITE_LITTLE_BOY, STAY, NONE, 11 ; person
object_event 22, 12, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 12 ; person
object_event 20, 12, SPRITE_BEAUTY, STAY, RIGHT, 13 ; person
object_event 0, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 14 ; Sirfetch'd Trader
def_warps_to SS_ANNE_2F_ROOMS

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

@ -16,7 +16,7 @@ SSAnneB1FRooms_Object:
def_bg_events
def_object_events
object_event 0, 13, SPRITE_SAILOR, STAY, DOWN, 1, OPP_SAILOR, 3
object_event 1, 12, SPRITE_SAILOR, STAY, DOWN, 1, OPP_SAILOR, 3
object_event 2, 11, SPRITE_SAILOR, STAY, DOWN, 2, OPP_SAILOR, 4
object_event 12, 3, SPRITE_SAILOR, STAY, LEFT, 3, OPP_SAILOR, 5
object_event 22, 2, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 6
@ -27,5 +27,6 @@ SSAnneB1FRooms_Object:
object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER
object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST
object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_POTION
object_event 0, 13, SPRITE_GAMEBOY_KID, STAY, DOWN, 12 ; Mr. Rime Trader
def_warps_to SS_ANNE_B1F_ROOMS

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

@ -12,5 +12,6 @@ SaffronPokecenter_Object:
object_event 5, 5, SPRITE_BEAUTY, STAY, NONE, 2 ; person
object_event 8, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Raichu Trader
def_warps_to SAFFRON_POKECENTER

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

@ -12,5 +12,6 @@ VermilionPokecenter_Object:
object_event 10, 5, SPRITE_FISHING_GURU, STAY, NONE, 2 ; person
object_event 5, 4, SPRITE_SAILOR, STAY, NONE, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Persian Trader
def_warps_to VERMILION_POKECENTER

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

@ -12,5 +12,6 @@ ViridianPokecenter_Object:
object_event 10, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 2 ; person
object_event 4, 3, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Raticate Trader
def_warps_to VIRIDIAN_POKECENTER

6
data/text/text_7.asm
View file

@ -96,7 +96,7 @@ _WrongMon1Text::
done
_Thanks1Text::
text "Hey thanks!"
text "Hey, thanks!"
done
_AfterTrade1Text::
@ -220,8 +220,8 @@ _Thanks4Text::
_WannaTrade5Text::
text "In my region, we"
line "have our own"
para "@"
text_ram wInGameTradeReceiveMonName
cont "@"
text_ram wInGameTradeGiveMonName
text "!"
para "Want to trade me"