From 6434c918f03367459dd0043d5b2a3f91781713d0 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sun, 7 Jan 2024 01:50:02 +0000 Subject: [PATCH] Moved some trades That's my last commit for tonight, I swear! --- data/events/trades.asm | 12 ++++++------ data/maps/objects/CinnabarLabFossilRoom.asm | 1 - data/maps/objects/ViridianForestNorthGate.asm | 1 + gfx/blocksets/fossillab.bst | Bin 944 -> 944 bytes scripts/CinnabarLabFossilRoom.asm | 8 -------- scripts/Route11Gate2F.asm | 2 +- scripts/ViridianForestNorthGate.asm | 8 ++++++++ 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/data/events/trades.asm b/data/events/trades.asm index 4c3c8c56..05c67699 100644 --- a/data/events/trades.asm +++ b/data/events/trades.asm @@ -8,8 +8,8 @@ TradeMons: db RAICHU, KADABRA, TRADE_DIALOGSET_EVOLUTION, "HARRY@@@@@@" ; Citrine City, new trade to complete the 4 main trade evos db SPEAROW, FARFETCHD, TRADE_DIALOGSET_HAPPY, "DUX@@@@@@@@" ; Vermilion City db PERSIAN, TAUROS, TRADE_DIALOGSET_CASUAL, "JIMBO@@@@@@" ; Route 17-18 gate, from JP Blue - db MACHOKE, HAUNTER, TRADE_DIALOGSET_EVOLUTION, "MICHELLE@@@" ; Cinnabar Lab, from JP Blue - db KADABRA, GRAVELER, TRADE_DIALOGSET_EVOLUTION, "JENNY@@@@@@" ; Cinnabar Lab, from JP Blue (probably going to move these since you get the Trader here anyway...) + db MACHOKE, HAUNTER, TRADE_DIALOGSET_EVOLUTION, "MICHELLE@@@" ; Route 11 Gate, from JP Blue + db KADABRA, GRAVELER, TRADE_DIALOGSET_EVOLUTION, "JENNY@@@@@@" ; Route 10 Gate db CUBONE, MACHOKE, TRADE_DIALOGSET_HAPPY, "RICKY@@@@@@" ; Route 5-6 Underground Path, from Yellow db NO_MON, NO_MON, TRADE_DIALOGSET_SELF, "Unseen@@@@@" ; The Trader db RATICATE, RATICATE_A, TRADE_DIALOGSET_REGION, "RATICATE@@@" ; Viridian - LGPE trades begin here @@ -29,9 +29,9 @@ TradeMons: 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, "CHURCHILL@@" ; Winston Churchill, notable "city gent" - db PERSIAN, PERRSERKER, TRADE_DIALOGSET_HAPPY, "ERIK@@@@@@@" ; One of the most famous vikings - db LUXWAN, SIRFETCHD, TRADE_DIALOGSET_HAPPY, "LANCELOT@@@" ; Influential knight of the round table - db ARCANINE, ARCANINE_H, TRADE_DIALOGSET_BILL, "ARCANINE@@@" + db MR_MIME, MR_RIME, TRADE_DIALOGSET_CASUAL, "MR.RIME@@@@" + db PERSIAN, PERRSERKER, TRADE_DIALOGSET_HAPPY, "PERRSERKER@" + db LUXWAN, SIRFETCHD, TRADE_DIALOGSET_HAPPY, "SIRFETCH'D@" + db ARCANINE, ARCANINE_H, TRADE_DIALOGSET_BILL, "ARCANINE@@@" db ELECTRODE, ELECTRODE_H, TRADE_DIALOGSET_GRAMPS, "ELECTRODE@@" assert_table_length NUM_NPC_TRADES diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm index 29a805f7..cefd9193 100644 --- a/data/maps/objects/CinnabarLabFossilRoom.asm +++ b/data/maps/objects/CinnabarLabFossilRoom.asm @@ -9,6 +9,5 @@ CinnabarLabFossilRoom_Object: def_object_events object_event 5, 2, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person - object_event 7, 6, SPRITE_SCIENTIST, STAY, UP, 2 ; person def_warps_to CINNABAR_LAB_FOSSIL_ROOM diff --git a/data/maps/objects/ViridianForestNorthGate.asm b/data/maps/objects/ViridianForestNorthGate.asm index fcb0fc2b..3f709c4a 100644 --- a/data/maps/objects/ViridianForestNorthGate.asm +++ b/data/maps/objects/ViridianForestNorthGate.asm @@ -12,5 +12,6 @@ ViridianForestNorthGate_Object: def_object_events object_event 3, 2, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person object_event 2, 5, SPRITE_GRAMPS, STAY, NONE, 2 ; person + object_event 7, 4, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 3 ; person def_warps_to VIRIDIAN_FOREST_NORTH_GATE diff --git a/gfx/blocksets/fossillab.bst b/gfx/blocksets/fossillab.bst index 6b5d55b39b21f9ebf97f899a6004f1da839bada0..88cda793782c6f8cd830a1f95ca2409481a3d20e 100644 GIT binary patch delta 15 VcmdnMzJYzh2^N1K*m&j%696$G25JBR delta 15 VcmdnMzJYzh2^MuA*m&j%696p{1