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 9245533c..a12bd224 100644 Binary files a/gfx/sprites/fake_tree.png and b/gfx/sprites/fake_tree.png differ diff --git a/scripts/BrunswickTrail.asm b/scripts/BrunswickTrail.asm index f11f22ba..7ff55b29 100644 --- a/scripts/BrunswickTrail.asm +++ b/scripts/BrunswickTrail.asm @@ -14,17 +14,90 @@ BrunswickTrail_ScriptPointers: BrunswickTrail_TextPointers: dw FakeTreeEvent - dw ZapdosGuy + dw BrunswickTrainer1 + dw BrunswickTrainer2 + dw BrunswickTrainer3 + dw CaveGuy dw GZapFound + dw Lover1 + dw Lover2 BrunswickTrailTrainerHeaders: def_trainers CactusTrainerHeader: trainer EVENT_BEAT_CACTUS, 0, CactusBattleText, CactusBattleText, CactusBattleText +BrunswickTrainerHeader0: + trainer EVENT_BEAT_BRUNSWICK_TRAINER_0, 4, BrunswickBattleText1, BrunswickEndBattleText1, BrunswickAfterBattleText1 +BrunswickTrainerHeader1: + trainer EVENT_BEAT_BRUNSWICK_TRAINER_1, 4, BrunswickBattleText2, BrunswickEndBattleText2, BrunswickAfterBattleText2 +BrunswickTrainerHeader2: + trainer EVENT_BEAT_BRUNSWICK_TRAINER_2, 1, BrunswickBattleText3, BrunswickEndBattleText3, BrunswickAfterBattleText3 db -1 ; end -ZapdosGuy: - text_far _ZapdosGuy +Lover1: + text_far _Lover1 + text_end + +Lover2: + text_far _Lover2 + text_end + +BrunswickTrainer1: + text_asm + ld hl, BrunswickTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +BrunswickBattleText1: + text_far _BrunswickBattleText1 + text_end + +BrunswickEndBattleText1: + text_far _BrunswickEndBattleText1 + text_end + +BrunswickAfterBattleText1: + text_far _BrunswickAfterBattleText1 + text_end + +BrunswickTrainer2: + text_asm + ld hl, BrunswickTrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +BrunswickBattleText2: + text_far _BrunswickBattleText2 + text_end + +BrunswickEndBattleText2: + text_far _BrunswickEndBattleText2 + text_end + +BrunswickAfterBattleText2: + text_far _BrunswickAfterBattleText2 + text_end + +BrunswickTrainer3: + text_asm + ld hl, BrunswickTrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +BrunswickBattleText3: + text_far _BrunswickBattleText3 + text_end + +BrunswickEndBattleText3: + text_far _BrunswickEndBattleText3 + text_end + +BrunswickAfterBattleText3: + text_far _BrunswickAfterBattleText3 + text_end + +CaveGuy: + text_far _CaveGuy text_end FakeTreeNoCut: diff --git a/text/BrunswickTrail.asm b/text/BrunswickTrail.asm index 8b0b2a8c..d599ff8d 100644 --- a/text/BrunswickTrail.asm +++ b/text/BrunswickTrail.asm @@ -1,9 +1,80 @@ -_ZapdosGuy:: - text "Sometimes, a BIRD" - line "#MON with" - cont "strong legs comes" - cont "to race all the" - cont "#MON here." +_CaveGuy:: ; Used to describe GZap, but the beauty seemed funnier. Needed some lore for Garnet Cavern, if any. + text "I've gone through" + line "many caves in my" + cont "day, but this one" + cont "is taking the" + cont "mickey!" + + para "Those #MON are" + line "way too strong!" + done + +_Lover1:: + text "Comment to be" + line "written." + done + +_Lover2:: + text "Comment to be" + line "written." + done + +_BrunswickBattleText1:: + text "I'm searching" + line "for rare BIRD" + cont "#MON!" + done + +_BrunswickEndBattleText1:: + text "Not" + line "enough..." + prompt + +_BrunswickAfterBattleText1:: + text "AERODACTYL is the" + line "progenitor of" + cont "birds." + + para "It's my prized" + line "#MON!" + prompt + +_BrunswickBattleText2:: + text "My hubby brought" + line "me here!" + done + +_BrunswickEndBattleText2:: + text "Ohh..." + prompt + +_BrunswickAfterBattleText2:: + text "I saw a BIRD" + line "#MON with huge" + cont "feet sprint past" + cont "me!" + + para "It almost blew me" + line "away! How rude!" + done + +_BrunswickBattleText3:: + text "The fish here are" + line "huge!" + done + +_BrunswickEndBattleText3:: + text "Washed" + line "up..." + prompt + +_BrunswickAfterBattleText3:: + text "Catching the fish" + line "on this island" + cont "is really hard!" + + para "The #MON are" + line "so distracting!" done _FakeTreeNoCut::