thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

More regional trades

Browse source 
None of them work properly due to a bug but it's no fault of the events themselves.
This commit is contained in:
Llinos Evans 2023-04-08 02:00:25 +01:00
parent dc4fe39707
commit 8b95d592ec
12 changed files with 51 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
constants/script_constants.asm
View file

@ -32,19 +32,19 @@ DEF SLOTS_SOMEONESKEYS EQU $ff
const TRADE_FOR_SPOT ; probably also glass const TRADE_FOR_SPOT ; probably also glass
const TRADE_WITH_SELF ; Celadon University const TRADE_WITH_SELF ; Celadon University
const TRADE_FOR_RATICATE_A ; LGPE Trade references - Viridian const TRADE_FOR_RATICATE_A ; LGPE Trade references - Viridian
;const TRADE_FOR_GOLEM_A ; Pewter const TRADE_FOR_GOLEM_A ; Pewter
;const TRADE_FOR_NINETALES_A ; Cerulean ;const TRADE_FOR_NINETALES_A ; Cerulean
const TRADE_FOR_PERSIAN_A ; Vermillion const TRADE_FOR_PERSIAN_A ; Vermillion
;const TRADE_FOR_DUGTRIO_A ; Lavender ;const TRADE_FOR_DUGTRIO_A ; Lavender
const TRADE_FOR_SANDSLASH_A ; Celadon const TRADE_FOR_SANDSLASH_A ; Celadon
const TRADE_FOR_RAICHU_A ; Saffron const TRADE_FOR_RAICHU_A ; Saffron
;const TRADE_FOR_MAROWAK_A ; Fuschia const TRADE_FOR_MAROWAK_A ; Fuschia
;const TRADE_FOR_MUK_A ; Cinnabar ;const TRADE_FOR_MUK_A ; Cinnabar
;const TRADE_FOR_EXEGGUTOR_A ; Indigo const TRADE_FOR_EXEGGUTOR_A ; Indigo
;const TRADE_FOR_TAUROS_C ; S.S. Anne Trades begin here ;const TRADE_FOR_TAUROS_C ; S.S. Anne Trades begin here
;const TRADE_FOR_TAUROS_A ;const TRADE_FOR_TAUROS_A
;const TRADE_FOR_TAUROS_B ;const TRADE_FOR_TAUROS_B
;const TRADE_FOR_RAPIDASH_G const TRADE_FOR_RAPIDASH_G
;const TRADE_FOR_SLOWBRO_G ;const TRADE_FOR_SLOWBRO_G
;const TRADE_FOR_SLOWKING_G ;const TRADE_FOR_SLOWKING_G
;const TRADE_FOR_WEEZING_G ;const TRADE_FOR_WEEZING_G

8
data/events/trades.asm
View file

@ -14,19 +14,19 @@ TradeMons:
db CUBONE, MACHOKE, TRADE_DIALOGSET_HAPPY, "RICKY@@@@@@" ; From Yellow db CUBONE, MACHOKE, TRADE_DIALOGSET_HAPPY, "RICKY@@@@@@" ; From Yellow
db NO_MON, NO_MON, TRADE_DIALOGSET_SELF, "Unseen@@@@@" ; Celadon Uni Trader 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 RATICATE, RATICATE_A, TRADE_DIALOGSET_REGION, "RATICATE@@@" ; Viridian - LGPE trades begin here
;db GOLEM, GOLEM_A, TRADE_DIALOGSET_REGION, "GOLEM@@@@@@" ; Pewter 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 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 SANDSLASH, SANDSLASH_A, TRADE_DIALOGSET_REGION, "SANDSLASH@@" ; Celadon
db RAICHU, RAICHU_A, TRADE_DIALOGSET_REGION, "RAICHU@@@@@" ; Saffron db RAICHU, RAICHU_A, TRADE_DIALOGSET_REGION, "RAICHU@@@@@" ; Saffron
;db MAROWAK, MAROWAK_A, TRADE_DIALOGSET_REGION, "MAROWAK@@@@" ; Fuschia db MAROWAK, MAROWAK_A, TRADE_DIALOGSET_REGION, "MAROWAK@@@@" ; Fuschia
;db MUK, MUK_A, TRADE_DIALOGSET_REGION, "MUK-A@@@@@@" ; Cinnabar ;db MUK, MUK_A, TRADE_DIALOGSET_REGION, "MUK-A@@@@@@" ; Cinnabar
;db EXEGGUTOR, EXEGGUTOR_A, TRADE_DIALOGSET_REGION, "EXEGGUTOR@@" ; Indigo 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_C, TRADE_DIALOGSET_REGION, "TAUROS@@@@@" ; S.S. Anne begins here
;db TAUROS, TAUROS_A, TRADE_DIALOGSET_REGION, "TAUROS@@@@@" ;db TAUROS, TAUROS_A, TRADE_DIALOGSET_REGION, "TAUROS@@@@@"
;db TAUROS, TAUROS_B, TRADE_DIALOGSET_REGION, "TAUROS@@@@@" ;db TAUROS, TAUROS_B, TRADE_DIALOGSET_REGION, "TAUROS@@@@@"
;db RAPIDASH, RAPIDASH_G, TRADE_DIALOGSET_REGION, "RAPIDASH@@@" db RAPIDASH, RAPIDASH_G, TRADE_DIALOGSET_REGION, "RAPIDASH@@@"
;db SLOWBRO, SLOWBRO_G, TRADE_DIALOGSET_REGION, "SLOWBRO@@@@" ;db SLOWBRO, SLOWBRO_G, TRADE_DIALOGSET_REGION, "SLOWBRO@@@@"
;db SLOWKING, SLOWKING_G, TRADE_DIALOGSET_REGION, "SLOWKING@@@" ;db SLOWKING, SLOWKING_G, TRADE_DIALOGSET_REGION, "SLOWKING@@@"
;db WEEZING, WEEZING_G, TRADE_DIALOGSET_REGION, "WEEZING@@@@" ;db WEEZING, WEEZING_G, TRADE_DIALOGSET_REGION, "WEEZING@@@@"

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

@ -12,5 +12,6 @@ FuchsiaPokecenter_Object:
object_event 2, 3, SPRITE_ROCKER, STAY, NONE, 2 ; person object_event 2, 3, SPRITE_ROCKER, STAY, NONE, 2 ; person
object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Marowak Trader
def_warps_to FUCHSIA_POKECENTER def_warps_to FUCHSIA_POKECENTER

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

@ -14,5 +14,6 @@ IndigoPlateauLobby_Object:
object_event 5, 1, SPRITE_COOLTRAINER_F, STAY, DOWN, 3 ; person object_event 5, 1, SPRITE_COOLTRAINER_F, STAY, DOWN, 3 ; person
object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 4 ; person object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 4 ; person
object_event 13, 6, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 5 ; person object_event 13, 6, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 5 ; person
object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 6 ; Exeggutor Trader
def_warps_to INDIGO_PLATEAU_LOBBY def_warps_to INDIGO_PLATEAU_LOBBY

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

@ -12,5 +12,6 @@ PewterPokecenter_Object:
object_event 11, 7, SPRITE_GENTLEMAN, STAY, LEFT, 2 ; person object_event 11, 7, SPRITE_GENTLEMAN, STAY, LEFT, 2 ; person
object_event 1, 3, SPRITE_FAIRY, STAY, DOWN, 3 ; person object_event 1, 3, SPRITE_FAIRY, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Golem Trader
def_warps_to PEWTER_POKECENTER def_warps_to PEWTER_POKECENTER

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

@ -13,5 +13,6 @@ SSAnneBow_Object:
object_event 7, 11, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person object_event 7, 11, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
object_event 4, 4, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 1 object_event 4, 4, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 1
object_event 10, 8, SPRITE_SAILOR, STAY, UP, 5, OPP_SAILOR, 2 object_event 10, 8, SPRITE_SAILOR, STAY, UP, 5, OPP_SAILOR, 2
object_event 10, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 6 ; Rapidash Trader
def_warps_to SS_ANNE_BOW def_warps_to SS_ANNE_BOW

8
engine/debug/debug_party.asm
View file

@ -23,11 +23,11 @@ SetIshiharaTeam:
IshiharaTeam: IshiharaTeam:
db EXEGGUTOR, 90 db EXEGGUTOR, 90
db RAICHU, 90 db RAICHU, 90
db RATICATE, 90 db EXEGGUTOR, 90
db PERSIAN, 50 db RAPIDASH, 50
IF DEF(_DEBUG) IF DEF(_DEBUG)
db MR_MIME, 50 db GOLEM, 50
db MADAAMU, 50 db MAROWAK, 50
ENDC ENDC
db -1 ; end db -1 ; end

3
engine/events/in_game_trades.asm
View file

@ -277,6 +277,7 @@ InGameTradeTextPointers:
dw TradeTextPointers3 dw TradeTextPointers3
dw TradeTextPointers4 dw TradeTextPointers4
dw TradeTextPointers5 dw TradeTextPointers5
dw TradeTextPointers6
TradeTextPointers1: TradeTextPointers1:
dw WannaTrade1Text dw WannaTrade1Text
@ -309,7 +310,7 @@ TradeTextPointers4:
TradeTextPointers5: TradeTextPointers5:
dw WannaTrade5Text dw WannaTrade5Text
dw NoTrade5Text dw NoTrade5Text
dw WrongMon3Text ; seems fitting, also optimises dw WrongMon3Text
dw Thanks1Text dw Thanks1Text
dw AfterTrade1Text dw AfterTrade1Text

8
scripts/FuchsiaPokecenter.asm
View file

@ -7,6 +7,7 @@ FuchsiaPokecenter_TextPointers:
dw FuchsiaPokecenterText2 dw FuchsiaPokecenterText2
dw FuchsiaPokecenterText3 dw FuchsiaPokecenterText3
dw FuchsiaTradeNurseText dw FuchsiaTradeNurseText
dw MarowakTrade
FuchsiaHealNurseText: FuchsiaHealNurseText:
script_pokecenter_nurse script_pokecenter_nurse
@ -21,3 +22,10 @@ FuchsiaPokecenterText3:
FuchsiaTradeNurseText: FuchsiaTradeNurseText:
script_cable_club_receptionist script_cable_club_receptionist
MarowakTrade:
text_asm
ld a, TRADE_FOR_MAROWAK_A
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

8
scripts/IndigoPlateauLobby.asm
View file

@ -20,6 +20,7 @@ IndigoPlateauLobby_TextPointers:
dw IndigoPlateauLobbyText3 dw IndigoPlateauLobbyText3
dw IndigoCashierText dw IndigoCashierText
dw IndigoTradeNurseText dw IndigoTradeNurseText
dw ExeggutorTrade
IndigoHealNurseText: IndigoHealNurseText:
script_pokecenter_nurse script_pokecenter_nurse
@ -37,3 +38,10 @@ IndigoTradeNurseText:
IndigoCashierText:: IndigoCashierText::
script_mart ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL script_mart ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL
ExeggutorTrade:
text_asm
ld a, TRADE_FOR_EXEGGUTOR_A
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

8
scripts/PewterPokecenter.asm
View file

@ -7,6 +7,7 @@ PewterPokecenter_TextPointers:
dw PewterPokecenterText2 dw PewterPokecenterText2
dw PewterJigglypuffText dw PewterJigglypuffText
dw PewterTradeNurseText dw PewterTradeNurseText
dw GolemTrade
PewterHealNurseText: PewterHealNurseText:
script_pokecenter_nurse script_pokecenter_nurse
@ -84,3 +85,10 @@ JigglypuffFacingDirectionsEnd:
PewterTradeNurseText: PewterTradeNurseText:
script_cable_club_receptionist script_cable_club_receptionist
GolemTrade:
text_asm
ld a, TRADE_FOR_GOLEM_A
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd

8
scripts/SSAnneBow.asm
View file

@ -18,6 +18,7 @@ SSAnneBow_TextPointers:
dw SSAnne5Text3 dw SSAnne5Text3
dw SSAnne5Text4 dw SSAnne5Text4
dw SSAnne5Text5 dw SSAnne5Text5
dw RapidashTrade
SSAnne5TrainerHeaders: SSAnne5TrainerHeaders:
def_trainers 4 def_trainers 4
@ -74,3 +75,10 @@ SSAnne5EndBattleText2:
SSAnne5AfterBattleText2: SSAnne5AfterBattleText2:
text_far _SSAnne5AfterBattleText2 text_far _SSAnne5AfterBattleText2
text_end text_end
RapidashTrade:
text_asm
ld a, TRADE_FOR_RAPIDASH_G
ld [wWhichTrade], a
predef DoInGameTradeDialogue
jp TextScriptEnd