From 9c4077f798a3af4b65fb968297637e849bf36754 Mon Sep 17 00:00:00 2001 From: SoupPotato Date: Thu, 5 Sep 2024 23:49:34 +0100 Subject: [PATCH] Reworked Cerulean Gym's Trainers --- constants/event_flags.asm | 4 +-- constants/trainer_constants.asm | 4 +-- data/trainers/parties.asm | 57 ++++++++++++++++----------------- maps/CeruleanGym.asm | 49 +++++++++++++--------------- 4 files changed, 55 insertions(+), 59 deletions(-) diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 4cdb51943..1f8ce1fa8 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -331,7 +331,7 @@ const EVENT_BEAT_BLACKBELT_ANDER const EVENT_BEAT_HIKER_EDWIN const EVENT_BEAT_SWIMMERF_JOY - const EVENT_BEAT_SAILOR_EDDY + const EVENT_BEAT_PICNICKER_EAMER const EVENT_BEAT_PICNICKER_SELINA const EVENT_BEAT_TWINS_MOEANDLULU const EVENT_BEAT_GENTLEMAN_MILTON @@ -1253,7 +1253,7 @@ const EVENT_BEAT_SWIMMERM_SETH const EVENT_BEAT_SWIMMERM_JAMES const EVENT_BEAT_SWIMMERM_LEWIS - const EVENT_BEAT_SAILOR_PARKER ; changed to a SAILOR in Sour Crystal + const EVENT_BEAT_SWIMMERM_PARKER ; Youngster const EVENT_BEAT_YOUNGSTER_JOEY const EVENT_BEAT_YOUNGSTER_MIKEY diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 026c280f8..1648ac853 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -429,6 +429,7 @@ DEF KRIS EQU __trainer_class__ const ELMO const ESTEBAN const DUANE + const PARKER trainerclass SWIMMERF ; 27 const ELAINE @@ -464,8 +465,6 @@ DEF KRIS EQU __trainer_class__ const HUEY2 const HUEY3 const HUEY4 - const PARKER - const EDDY trainerclass SUPER_NERD ; 29 const ERIC @@ -633,6 +632,7 @@ DEF KRIS EQU __trainer_class__ const GINGER const CHEL const ADRIAN + const EAMER trainerclass CAMPER ; 36 const ROLAND diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 19c468685..6073db17a 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -5069,6 +5069,21 @@ SwimmerMGroup: db 52, KABUTOPS db -1 ; end + ; SWIMMERM (17) + db "PARKER@", TRAINERTYPE_VARIABLE + + ;Normal Mode + db TRAINERTYPE_NORMAL + db 43, HORSEA + db 43, SEADRA + db $fe ; delimiter + + ;Challenge Mode + db TRAINERTYPE_NORMAL + db 55, HORSEA + db 55, SEADRA + db -1 ; end + SwimmerFGroup: ; SWIMMERF (1) @@ -5534,35 +5549,6 @@ SailorGroup: db 60, POLIWRATH, SURF, STRENGTH, ICE_PUNCH, SUBMISSION db -1 ; end - ; SAILOR (14) - db "PARKER@", TRAINERTYPE_VARIABLE - - ;Normal Mode - db TRAINERTYPE_NORMAL - db 43, HORSEA - db 43, SEADRA - db $fe ; delimiter - - ;Challenge Mode - db TRAINERTYPE_NORMAL - db 55, HORSEA - db 55, SEADRA - db -1 ; end - - ; SAILOR (15) - db "EDDY@", TRAINERTYPE_VARIABLE - - ;Normal Mode - db TRAINERTYPE_NORMAL - db 48, AZUMARILL - db $fe ; delimiter - - ;Challenge Mode - db TRAINERTYPE_NORMAL - db 60, AZUMARILL - db -1 ; end - - SuperNerdGroup: ; SUPER_NERD (1) db "ERIC@", TRAINERTYPE_VARIABLE @@ -7797,6 +7783,19 @@ PicnickerGroup: db 57, PARASECT db -1 ; end + ; PICNICKER (32) + db "EAMER@", TRAINERTYPE_VARIABLE + + ;Normal Mode + db TRAINERTYPE_NORMAL + db 48, AZUMARILL + db $fe ; delimiter + + ;Challenge Mode + db TRAINERTYPE_NORMAL + db 60, AZUMARILL + db -1 ; end + CamperGroup: ; CAMPER (1) db "ROLAND@", TRAINERTYPE_VARIABLE diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 01f00fa22..ff673a3ff 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -71,9 +71,9 @@ CeruleanGymMistyScript: setevent EVENT_BEAT_MISTY setevent EVENT_BEAT_SWIMMERF_DIANA setevent EVENT_BEAT_SWIMMERF_BRIANA - setevent EVENT_BEAT_SAILOR_PARKER + setevent EVENT_BEAT_SWIMMERM_PARKER setevent EVENT_BEAT_SWIMMERF_JOY - setevent EVENT_BEAT_SAILOR_EDDY + setevent EVENT_BEAT_PICNICKER_EAMER opentext writetext ReceivedCascadeBadgeText playsound SFX_GET_BADGE @@ -118,24 +118,24 @@ TrainerSwimmerfBriana: closetext end -TrainerSailorParker: - trainer SAILOR, PARKER, EVENT_BEAT_SAILOR_PARKER, SailorParkerSeenText, SailorParkerBeatenText, 0, .Script +TrainerSwimmermParker: + trainer SWIMMERM, PARKER, EVENT_BEAT_SWIMMERM_PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script .Script: endifjustbattled opentext - writetext SailorParkerAfterBattleText + writetext SwimmermParkerAfterBattleText waitbutton closetext end -TrainerSailorEddy: - trainer SAILOR, EDDY, EVENT_BEAT_SAILOR_EDDY, SailorEddySeenText, SailorEddyBeatenText, 0, .Script +TrainerPicnickerEamer: + trainer PICNICKER, EAMER, EVENT_BEAT_PICNICKER_EAMER, PicnickerEamerSeenText, PicnickerEamerBeatenText, 0, .Script .Script: endifjustbattled opentext - writetext SailorEddyAfterBattleText + writetext PicnickerEamerAfterBattleText waitbutton closetext end @@ -368,18 +368,18 @@ SwimmerfJoyAfterBattleText: line "idea…" done -SailorParkerSeenText: +SwimmermParkerSeenText: text "Glub…" para "I'm first! Come" line "and get me!" done -SailorParkerBeatenText: +SwimmermParkerBeatenText: text "This can't be…" done -SailorParkerAfterBattleText: +SwimmermParkerAfterBattleText: text "MISTY has gotten" line "much better in the" cont "past few years." @@ -389,25 +389,22 @@ SailorParkerAfterBattleText: cont "you'll be crushed!" done -SailorEddySeenText: - text "I've been relaxing" - line "poolside," +PicnickerEamerSeenText: + text "I've been training" + line "by the poolside," - para "so I've got" - line "enough strength!" + para "so I've got lots" + line "of energy!" done -SailorEddyBeatenText: +PicnickerEamerBeatenText: text "You can't win with" - line "strength alone." + line "energy alone." done -SailorEddyAfterBattleText: - text "Hey, let's go" - line "for a swim!" - - para "Sailors have to" - line "be able to swim!" +PicnickerEamerAfterBattleText: + text "I should go for" + line "a swim soon!" done CeruleanGymGuideText: @@ -450,6 +447,6 @@ CeruleanGym_MapEvents: object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM object_event 1, 9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM object_event 8, 9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfJoy, EVENT_TRAINERS_IN_CERULEAN_GYM - object_event 3, 12, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorParker, EVENT_TRAINERS_IN_CERULEAN_GYM - object_event 2, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorEddy, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 4, 9, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 2, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerEamer, EVENT_TRAINERS_IN_CERULEAN_GYM object_event 7, 13, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuideScript, EVENT_TRAINERS_IN_CERULEAN_GYM