From ffd03c1b06778593160f8dd1577b691601392313 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sat, 15 Jul 2023 16:30:26 +0100 Subject: [PATCH] Populating Brunswick Trail This adds three trainers to Brunswick Trail, as well as the lover NPCs Martha wanted to write dialogue for (with placeholders for now). Most trainers are merely commenting on the strong and energetic Pokemon, which I think matches the racing theme it has going on. This can be changed if need-be. I have also removed all the noise on the Fake Tree sprite that got added when I imported the tile. Now, it's far more convincing. --- constants/event_constants.asm | 5 +- data/maps/hide_show_data.asm | 2 +- data/maps/objects/BrunswickTrail.asm | 9 ++- data/maps/sprite_sets.asm | 2 +- data/trainers/parties.asm | 18 +++--- gfx/sprites/fake_tree.png | Bin 283 -> 292 bytes scripts/BrunswickTrail.asm | 79 ++++++++++++++++++++++++- text/BrunswickTrail.asm | 83 +++++++++++++++++++++++++-- 8 files changed, 177 insertions(+), 21 deletions(-) diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 9d0d9359..76f062f8 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -652,7 +652,10 @@ const EVENT_BEAT_MOLTRES const_skip 7 const EVENT_BEAT_CACTUS - const_skip 7 + const EVENT_BEAT_BRUNSWICK_TRAINER_0 + const EVENT_BEAT_BRUNSWICK_TRAINER_1 + const EVENT_BEAT_BRUNSWICK_TRAINER_2 + const_skip 4 const EVENT_BEAT_ZAPDOSG const_skip 7 const EVENT_BEAT_DRAGONITE diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 0227d388..6b97d93c 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -332,7 +332,7 @@ Route25HS: db ROUTE_25, $0A, SHOW ; HS_ROUTE_25_ITEM BrunswickTrailHS: db BRUNSWICK_TRAIL, $01, SHOW ; HS_CACTUS - db BRUNSWICK_TRAIL, $03, SHOW ; HS_BRUNSWICK_ZAPDOS_G_1 + db BRUNSWICK_TRAIL, $06, SHOW ; HS_BRUNSWICK_ZAPDOS_G_1 BluesHouseHS: db BLUES_HOUSE, $01, SHOW ; HS_DAISY_SITTING db BLUES_HOUSE, $02, HIDE ; HS_DAISY_WALKING diff --git a/data/maps/objects/BrunswickTrail.asm b/data/maps/objects/BrunswickTrail.asm index 073b75a9..6f608cec 100644 --- a/data/maps/objects/BrunswickTrail.asm +++ b/data/maps/objects/BrunswickTrail.asm @@ -9,7 +9,12 @@ BrunswickTrail_Object: def_object_events object_event 23, 11, SPRITE_FAKE_TREE, STAY, NONE, 1, CACTUS, 60 | OW_POKEMON ; person - object_event 37, 23, SPRITE_BRUNETTE_GIRL, STAY, DOWN, 2 ; person - object_event 54, 9, SPRITE_BIRD, STAY, DOWN, 3 ; person + object_event 40, 21, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_BIRD_KEEPER, 12 ; person + object_event 29, 14, SPRITE_BEAUTY, STAY, DOWN, 3, OPP_BEAUTY, 16 ; person + object_event 25, 21, SPRITE_FISHER, STAY, DOWN, 4, OPP_FISHER, 13 ; person + object_event 10, 10, SPRITE_HIKER, STAY, RIGHT, 5 ; person, Cave guy + object_event 54, 9, SPRITE_BIRD, STAY, UP, 6 ; person, GZap + object_event 6, 16, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 7 ; person, Lover1 + object_event 6, 15, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 8 ; person, Lover2 def_warps_to BRUNSWICK_TRAIL diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm index 1a2b7ac7..0d0ec101 100644 --- a/data/maps/sprite_sets.asm +++ b/data/maps/sprite_sets.asm @@ -209,7 +209,7 @@ SpriteSets: db SPRITE_HIKER db SPRITE_COOLTRAINER_F ; free slot, add as needed. db SPRITE_COOLTRAINER_M ; free slot, add as needed. - db SPRITE_GUARD ; free slot, add as needed. + db SPRITE_FISHER ; free slot, add as needed. db SPRITE_POKE_BALL ; probably not free db SPRITE_FAKE_TREE diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 71eae74c..413c305c 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -147,14 +147,14 @@ LassData: ; Pretty much a Fisher with Machops and the random Vermilion Gym featuring. SailorData: ; SS Anne Stern - db 18, MACHOP, SHELLDER, 0 + db 18, MACHOP, BLOTTLE, 0 db 17, MACHOP, TENTACOOL, 0 ; SS Anne B1F Rooms db 21, SHELLDER, 0 db 17, HORSEA, SHELLDER, TENTACOOL, 0 db 18, TENTACOOL, STARYU, 0 db 17, POLIWAG, RIBBITO, PIKACHU, 0 ; I like the idea of Sailors using Pikachu to "light the way". - db 20, MACHOP, 0 + db 20, MACHOP, CHEEP, 0 ; Vermilion Gym db 21, KOTORA, GAOTORA, 0 ; Silph Gauntlet 3F (S.S Anne) @@ -367,6 +367,8 @@ FisherData: db 24, SKIMPER, WIGLETT, 0 ; Silph Gauntlet 3F (S.S Anne) db 64, GYARADOS, SEAKING, TAABAN, WUGTRIO, BLASTOISE, PENDRAKEN, 0 +; Brunswick Trail + db 65, POLIWRATH, MACHAMP, GOROTORA, PENDRAKEN, TAUROS_PA, 0 ; God this took forever to remove repeats from ; Surf encounter extravaganza @@ -450,6 +452,8 @@ BeautyData: db 29, STARYU, WEIRDUCK, SEAKING, 0 ; Route 20 db 30, KINGDRA, 0 ; Close to the Trader +; Brunswick Trail + db 66, PERSIAN, VENUSAUR, KINGDRA, SYLVEON, CLOYSTER, 0 ; yep psychic yep psychic yep psychic PsychicData: @@ -512,19 +516,19 @@ BirdKeeperData: db 25, FARFETCHD, PIDGEY, SPEAROW, 0 db 26, PIDGEY, PIDGEOTTO, SPEAROW, FEAROW, 0 ; Route 14 - db 33, FARFETCHD, 0 + db 33, FEAROW, 0 db 29, SPEAROW, FEAROW, 0 ; Route 15 - db 26, PIDGEOTTO, FARFETCHD, DODUO, PIDGEY, 0 - db 28, DODRIO, DODUO, DODUO, 0 + db 26, PIDGEY, DODUO, PIDGEOTTO, 0 + db 28, FARFETCHD, DODRIO, 0 ; Route 18 db 29, SPEAROW, FEAROW, 0 db 34, DODRIO, 0 db 26, SPEAROW, SPEAROW, FEAROW, SPEAROW, 0 ; Route 20 db 30, FEAROW, MADAAMU, PIDGEOTTO, 0 -; Unused - db 39, PIDGEOTTO, PIDGEOTTO, PIDGEY, PIDGEOTTO, 0 +; Brunswick Trail + db 65, PIDGEOT, SIRFETCHD, DODRIO, AERODACTYL, 0 ; Silph Gauntlet 1F (Viridian Forest) db 62, FEAROW, GOLDUCK, DODRIO, SIRFETCHD, MADAAMU, AERODACTYL, 0 ; Route 14 diff --git a/gfx/sprites/fake_tree.png b/gfx/sprites/fake_tree.png index 9245533ce5b0e5a58c8ecf7954283b823a50337b..a12bd224a9b9ce9feb1e8764bc9bd867a26efcfc 100644 GIT binary patch delta 214 zcmV;{04e{Q0;B?vR)4ukL_t(IPmPlS4ul{K1mXUukJLwc-G;#x#W)Er&~9lI>k*U> z)LM&DQTR1|MW$t0F4|ECf~jpKT8HV_wk=gidwxDzlB>hMP$5BHjPnHWA}#4#2Nc1? zzQ^4xVt!BdAro_t!=(d)zUEXfIvv%XVk5T#B)VCH!efzX2PBW{k;mV8UDs5;L>N<}lhl(^{+LzPW$Y{= QA^-pY07*qoM6N<$f^`yL(EtDd delta 205 zcmV;;05boi0-FMmR)4TbL_t(IPmPlS4udcZ1N%un*-tXA!sS|8u}Hy*V~1!OrPg{9 zUsy^Ru=8$?;}{Sg0|{sBa~>vxSrSup#Gr4FTVy1>JZ3l|{FToe5?*qP{<|PcVhZoM z&Gc9O7CUcIOV6o^;erg^=dE5uO*AeIgCL2?nYqnGW78lEdPd344EF!QJhX{=o_C!a z