From b0d17719dbd9144df16c46769b2abc45653d5ba6 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sat, 8 Apr 2023 23:37:36 +0100 Subject: [PATCH] Regional trades for new forms Sandslash and Raichu stopped working - hypothesis is correct. --- constants/script_constants.asm | 4 ++-- data/events/trades.asm | 4 ++-- data/maps/objects/CeruleanPokecenter.asm | 1 + data/maps/objects/LavenderPokecenter.asm | 1 + engine/debug/debug_party.asm | 4 ++-- engine/events/in_game_trades.asm | 1 - scripts/CeruleanPokecenter.asm | 9 +++++++++ scripts/LavenderPokecenter.asm | 9 +++++++++ 8 files changed, 26 insertions(+), 7 deletions(-) diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 9f36b865..e0603581 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -33,9 +33,9 @@ DEF SLOTS_SOMEONESKEYS EQU $ff 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_NINETALES_A ; Cerulean 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_RAICHU_A ; Saffron const TRADE_FOR_MAROWAK_A ; Fuschia diff --git a/data/events/trades.asm b/data/events/trades.asm index 804893ee..988139d1 100644 --- a/data/events/trades.asm +++ b/data/events/trades.asm @@ -15,9 +15,9 @@ TradeMons: 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 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 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 RAICHU, RAICHU_A, TRADE_DIALOGSET_REGION, "RAICHU@@@@@" ; Saffron db MAROWAK, MAROWAK_A, TRADE_DIALOGSET_REGION, "MAROWAK@@@@" ; Fuschia diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm index eee0a0c6..4e6a5495 100644 --- a/data/maps/objects/CeruleanPokecenter.asm +++ b/data/maps/objects/CeruleanPokecenter.asm @@ -12,5 +12,6 @@ CeruleanPokecenter_Object: object_event 10, 5, SPRITE_SUPER_NERD, WALK, ANY_DIR, 2 ; person object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Ninetales Trader def_warps_to CERULEAN_POKECENTER diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm index 99c29528..6a9b2dc7 100644 --- a/data/maps/objects/LavenderPokecenter.asm +++ b/data/maps/objects/LavenderPokecenter.asm @@ -12,5 +12,6 @@ LavenderPokecenter_Object: object_event 5, 3, SPRITE_GENTLEMAN, STAY, NONE, 2 ; person object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 3 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Dugtrio Trader def_warps_to LAVENDER_POKECENTER diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 6480884a..dff0f7cb 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -26,8 +26,8 @@ IshiharaTeam: db EXEGGUTOR, 90 db RAPIDASH, 50 IF DEF(_DEBUG) - db GOLEM, 50 - db MAROWAK, 50 + db NINETALES, 50 + db DUGTRIO, 50 ENDC db -1 ; end diff --git a/engine/events/in_game_trades.asm b/engine/events/in_game_trades.asm index cfff4bd8..35e1cf45 100644 --- a/engine/events/in_game_trades.asm +++ b/engine/events/in_game_trades.asm @@ -277,7 +277,6 @@ InGameTradeTextPointers: dw TradeTextPointers3 dw TradeTextPointers4 dw TradeTextPointers5 - dw TradeTextPointers6 TradeTextPointers1: dw WannaTrade1Text diff --git a/scripts/CeruleanPokecenter.asm b/scripts/CeruleanPokecenter.asm index 680640f4..d601f019 100644 --- a/scripts/CeruleanPokecenter.asm +++ b/scripts/CeruleanPokecenter.asm @@ -7,6 +7,7 @@ CeruleanPokecenter_TextPointers: dw CeruleanPokecenterText2 dw CeruleanPokecenterText3 dw CeruleanTradeNurseText + dw NinetalesTrade CeruleanTradeNurseText: script_cable_club_receptionist @@ -21,3 +22,11 @@ CeruleanPokecenterText2: CeruleanPokecenterText3: text_far _CeruleanPokecenterText3 text_end + +NinetalesTrade: + text_asm + ld a, TRADE_FOR_NINETALES_A + ld [wWhichTrade], a + predef DoInGameTradeDialogue + jp TextScriptEnd + diff --git a/scripts/LavenderPokecenter.asm b/scripts/LavenderPokecenter.asm index b8a1d2a5..36a88aba 100644 --- a/scripts/LavenderPokecenter.asm +++ b/scripts/LavenderPokecenter.asm @@ -7,6 +7,7 @@ LavenderPokecenter_TextPointers: dw LavenderPokecenterText2 dw LavenderPokecenterText3 dw LavenderTradeNurseText + dw DugtrioTrade LavenderTradeNurseText: script_cable_club_receptionist @@ -21,3 +22,11 @@ LavenderPokecenterText2: LavenderPokecenterText3: text_far _LavenderPokecenterText3 text_end + +DugtrioTrade: + text_asm + ld a, TRADE_FOR_DUGTRIO_A + ld [wWhichTrade], a + predef DoInGameTradeDialogue + jp TextScriptEnd +