diff --git a/constants/script_constants.asm b/constants/script_constants.asm index d97a484a..5e85bf7b 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -22,15 +22,35 @@ DEF SLOTS_SOMEONESKEYS EQU $ff const_def const TRADE_FOR_TERRY const TRADE_FOR_MARCEL - const TRADE_FOR_CHIKUCHIKU + const TRADE_FOR_CHIKUCHIKU ; the glass const TRADE_FOR_SAILOR const TRADE_FOR_DUX const TRADE_FOR_MARC const TRADE_FOR_LOLA const TRADE_FOR_DORIS const TRADE_FOR_CRINKLES - const TRADE_FOR_SPOT - const TRADE_WITH_SELF + const TRADE_FOR_SPOT ; probably also glass + const TRADE_WITH_SELF ; Celadon University + ;const TRADE_FOR_RATICATE_A ; LGPE Trade references - Viridian + ;const TRADE_FOR_GOLEM_A ; Pewter + ;const TRADE_FOR_NINETALES_A ; Cerulean + ;const TRADE_FOR_PERSIAN_A ; Vermillion + ;const TRADE_FOR_DUGTRIO_A ; Lavender + ;const TRADE_FOR_SANDSLASH_A ; Celadon + ;const TRADE_FOR_RAICHU_A ; Saffron + ;const TRADE_FOR_MAROWAK_A ; Fuschia + ;const TRADE_FOR_MUK_A ; Cinnabar + ;const TRADE_FOR_EXEGGUTOR_A ; Indigo + ;const TRADE_FOR_TAUROS_C ; S.S. Anne Trades begin here + ;const TRADE_FOR_TAUROS_A + ;const TRADE_FOR_TAUROS_B + ;const TRADE_FOR_RAPIDASH_G + ;const TRADE_FOR_SLOWBRO_G + ;const TRADE_FOR_SLOWKING_G + ;const TRADE_FOR_WEEZING_G + const TRADE_FOR_MR_RIME ; In the event of an overflow, break glass + const TRADE_FOR_PERRSERKER ; we could also put them in mt moon crater ig? + const TRADE_FOR_SIRFETCHD DEF NUM_NPC_TRADES EQU const_value ; in game trade dialog sets @@ -40,6 +60,7 @@ DEF NUM_NPC_TRADES EQU const_value const TRADE_DIALOGSET_POLITE const TRADE_DIALOGSET_HAPPY const TRADE_DIALOGSET_SELF + const TRADE_DIALOGSET_REGION ; consistency with LGPE ; badges ; wObtainedBadges and wBeatGymFlags bits diff --git a/data/events/trades.asm b/data/events/trades.asm index da1297fb..469e4257 100644 --- a/data/events/trades.asm +++ b/data/events/trades.asm @@ -12,5 +12,25 @@ TradeMons: db KADABRA, GRAVELER, TRADE_DIALOGSET_POLITE, "JENNY@@@@@@" ; From JP Blue 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@@@@@" + 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 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@" assert_table_length NUM_NPC_TRADES diff --git a/data/text/text_7.asm b/data/text/text_7.asm index 3dfb74a6..bf304d9b 100644 --- a/data/text/text_7.asm +++ b/data/text/text_7.asm @@ -216,3 +216,19 @@ _Thanks4Text:: text "There we go!" para "Hope I helped!" done + +_WannaTrade5Text:: + text "In my region, we" + line "have our own" + para "@" + text_ram wInGameTradeReceiveMonName + text "!" + + para "Want to trade me" + line "yours?" + done + +_NoTrade5Text:: + text "Ok, maybe next" + line "time then." + done \ No newline at end of file diff --git a/engine/events/in_game_trades.asm b/engine/events/in_game_trades.asm index ea6d1755..4c703094 100644 --- a/engine/events/in_game_trades.asm +++ b/engine/events/in_game_trades.asm @@ -305,6 +305,13 @@ TradeTextPointers4: dw Thanks4Text dw AfterTrade1Text +TradeTextPointers5: + dw WannaTrade4Text + dw NoTrade4Text + dw WrongMon3Text ; seems fitting, also optimises + dw Thanks1Text + dw AfterTrade1Text + ConnectCableText: text_far _ConnectCableText text_end @@ -385,4 +392,12 @@ NoTrade4Text: Thanks4Text: text_far _Thanks4Text + text_end + +WannaTrade5Text: + text_far _WannaTrade5Text + text_end + +NoTrade5Text: + text_far _NoTrade5Text text_end \ No newline at end of file