From f53559e4e4c757ef73d8813b5a42428551c16aab Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sun, 7 Jul 2024 22:40:15 +0100 Subject: [PATCH] regional trade dialogset Could be tweaked but is overall solid. Now ready to be used whenever. --- constants/npc_trade_constants.asm | 1 + data/text/common_1.asm | 38 +++++++++++++++++++++++++++++-- engine/events/npc_trade.asm | 25 ++++++++++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/constants/npc_trade_constants.asm b/constants/npc_trade_constants.asm index 56f630b..5a65638 100644 --- a/constants/npc_trade_constants.asm +++ b/constants/npc_trade_constants.asm @@ -45,3 +45,4 @@ DEF NUM_NPC_TRADES EQU const_value const TRADE_DIALOGSET_HAPPY const TRADE_DIALOGSET_NEWBIE const TRADE_DIALOGSET_GIRL + const TRADE_DIALOGSET_REGIONAL diff --git a/data/text/common_1.asm b/data/text/common_1.asm index 34c463c..e0a2957 100644 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm @@ -1380,8 +1380,6 @@ _NPCTradeFanfareText:: text_pause text_end - text_end ; unreferenced - _NPCTradeIntroText1:: text "I collect #MON." line "Do you have" @@ -1534,6 +1532,42 @@ _NPCTradeAfterText4:: line "to learn about it." done +; Regional variant trades +_NPCTradeIntroText5:: + text "In my region," + line "we have our own" + cont "@" + text_ram wStringBuffer1 + text "!" + + para "Wanna trade me" + line "yours?" + done + +_NPCTradeCancelText5:: + text "Well, I'll be" + line "around…" + done + +_NPCTradeWrongText5:: + text "Huh? That's not" + line "@" + text_ram wStringBuffer1 + text ". " + cont "Try again!" + done + +_NPCTradeCompleteText5:: + text "Wow! It's so" + line "different! Thanks" + cont "a bunch!" + done + +_NPCTradeAfterText5:: ; Should not happen. + text "AfterTrade event" + line "set incorrectly." + done + _MomLeavingText1:: text "Wow, that's a cute" line "#MON." diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index 9559aca..e75d687 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -436,26 +436,31 @@ TradeTexts: dw NPCTradeIntroText2 dw NPCTradeIntroText2 dw NPCTradeIntroText3 + dw NPCTradeIntroText5 ; TRADE_DIALOG_CANCEL dw NPCTradeCancelText1 dw NPCTradeCancelText2 dw NPCTradeCancelText2 dw NPCTradeCancelText3 + dw NPCTradeCancelText5 ; TRADE_DIALOG_WRONG dw NPCTradeWrongText1 dw NPCTradeWrongText2 dw NPCTradeWrongText2 dw NPCTradeWrongText3 + dw NPCTradeWrongText5 ; TRADE_DIALOG_COMPLETE dw NPCTradeCompleteText1 dw NPCTradeCompleteText2 dw NPCTradeCompleteText4 dw NPCTradeCompleteText3 + dw NPCTradeCompleteText5 ; TRADE_DIALOG_AFTER dw NPCTradeAfterText1 dw NPCTradeAfterText2 dw NPCTradeAfterText4 dw NPCTradeAfterText3 + dw NPCTradeAfterText5 NPCTradeCableText: text_far _NPCTradeCableText @@ -542,3 +547,23 @@ NPCTradeCompleteText4: NPCTradeAfterText4: text_far _NPCTradeAfterText4 text_end + +NPCTradeIntroText5: + text_far _NPCTradeIntroText5 + text_end + +NPCTradeCancelText5: + text_far _NPCTradeCancelText5 + text_end + +NPCTradeWrongText5: + text_far _NPCTradeWrongText5 + text_end + +NPCTradeCompleteText5: + text_far _NPCTradeCompleteText5 + text_end + +NPCTradeAfterText5: + text_far _NPCTradeAfterText5 + text_end