From d4f83849320aebce52a4cc6c6b5adc989efda9ef Mon Sep 17 00:00:00 2001 From: vulcandth Date: Tue, 24 Dec 2024 00:16:47 -0600 Subject: [PATCH 01/10] Init Rocket Hideout --- constants/event_flags.asm | 26 ++ constants/item_constants.asm | 2 + constants/trainer_constants.asm | 23 +- data/items/attributes.asm | 2 + data/items/descriptions.asm | 6 + data/items/icon_pointers.asm | 1 + data/items/key_names.asm | 1 + data/items/name_order.asm | 1 + data/maps/scenes.asm | 1 + data/tilesets/underground_attributes.bin | Bin 1680 -> 1696 bytes data/tilesets/underground_collision.asm | 1 + data/tilesets/underground_metatiles.bin | Bin 1680 -> 1696 bytes data/trainers/parties.asm | 92 ++++ engine/items/item_effects.asm | 1 + gfx/items.asm | 3 + gfx/items/key_items.pal | 3 + gfx/items/lift_key.png | Bin 0 -> 9388 bytes maps/LakeOfRage.asm | 2 +- maps/OlivineLighthouse3F.asm | 2 +- maps/RocketHideoutB1F.asm | 172 ++++++++ maps/RocketHideoutB2F.asm | 31 ++ maps/RocketHideoutB3F.asm | 57 +++ maps/RocketHideoutB4F.asm | 512 +++++++++++++++++++++++ maps/RocketHideoutElevator.asm | 14 + maps/Route13East.asm | 2 +- maps/Route21.asm | 2 +- maps/SafariZoneHub.asm | 2 +- maps/UnionCaveB1FSouth.asm | 2 +- ram/wramx.asm | 4 +- 29 files changed, 950 insertions(+), 15 deletions(-) create mode 100644 gfx/items/lift_key.png diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 98df9c5cdd..90d1234d93 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -2406,6 +2406,32 @@ const EVENT_UNION_CAVE_B2F_LINKING_CORD const EVENT_GOT_LOADED_DICE_FROM_GOLDENROD const EVENT_LISTENED_TO_BATON_PASS_INTRO + const EVENT_BEAT_BLACK_BELT_KAI + const EVENT_BEAT_SCIENTIST_LYSANDER + const EVENT_BEAT_PICNICKER_ZANE + const EVENT_BEAT_BATTLE_GIRL_SASHA + const EVENT_BEAT_LASS_PIPER + const EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B1F + const EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B1F + const EVENT_ROCKET_HIDEOUT_B1F_HIDDEN_RARE_CANDY + const EVENT_BEAT_HEX_MANIAC_CORINNE + const EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B2F + const EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B2F + const EVENT_PICKED_UP_RARE_CANDY_3_FROM_ROCKET_HIDEOUT_B2F + const EVENT_PICKED_UP_RARE_CANDY_4_FROM_ROCKET_HIDEOUT_B2F + const EVENT_BEAT_COSPLAYER_AARON + const EVENT_BEAT_COOL_DUDE_GIDEON + const EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B3F + const EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B3F + const EVENT_ROCKET_HIDEOUT_B3F_HIDDEN_RARE_CANDY + const EVENT_BEAT_YOUNGSTER_RORY + const EVENT_PICKED_UP_LIFT_KEY_FROM_ROCKET_HIDEOUT_B4F + const EVENT_BEAT_TEACHER_SERENA + const EVENT_BEAT_SUPER_NERD_THEO + const EVENT_ROCKET_HIDEOUT_B4F_HIDDEN_RARE_CANDY + const EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B4F + const EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B4F + const EVENT_PICKED_UP_RARE_CANDY_3_FROM_ROCKET_HIDEOUT_B4F const_next $8ff DEF NUM_EVENTS EQU const_value ; 2303 diff --git a/constants/item_constants.asm b/constants/item_constants.asm index c1f9c4e19e..08e275ec06 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -660,6 +660,7 @@ DEF NUM_WINGS EQU const_value const HARSH_LURE ; 1f const POTENT_LURE ; 20 const MALIGN_LURE ; 21 + const LIFT_KEY ; 22 DEF CHARMS_START EQU const_value ; Only charms below this point! const SHINY_CHARM ; 22 @@ -683,6 +684,7 @@ DEF NUM_KEY_ITEMS EQU const_value - 1 const NAM_GS_BALL const NAM_HARSH_LURE const NAM_ITEMFINDER + const NAM_LIFT_KEY const NAM_LOST_ITEM const NAM_MACHINE_PART const NAM_MALIGN_LURE diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 0a51deddbe..7e94be076b 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -137,6 +137,7 @@ DEF CRYS EQU __trainer_class__ const OLIVER const CHAZ const TYLER + const RORY2 trainerclass BUG_CATCHER ; 21 const WADE1 @@ -209,10 +210,11 @@ DEF CRYS EQU __trainer_class__ const EDNA const TANYA const LILY - const PIPER + const PIPER1 const GINGER const CHEYENNE const ADRIAN + const ZANE trainerclass TWINS ; 24 const AMYANDMAY1 @@ -263,7 +265,7 @@ DEF CRYS EQU __trainer_class__ const KYLER const MURPHY const LIAM - const GIDEON + const GIDEON1 const HALL const DALLAS @@ -276,7 +278,7 @@ DEF CRYS EQU __trainer_class__ const JOSE3 const ROD const ABE - const THEO + const THEO1 const TOBY const DENIS const HANK @@ -406,6 +408,7 @@ DEF CRYS EQU __trainer_class__ const CHLOE const BROOKE const KUROKO + const AARON2 trainerclass SUPER_NERD ; 31 const STAN @@ -423,11 +426,12 @@ DEF CRYS EQU __trainer_class__ const LUIS const JOVAN const MIGUEL - const RORY + const RORY1 const GREGG const FOOTE const DAVE const KOUTA + const THEO2 trainerclass LASS ; 32 const DANA1 @@ -453,6 +457,7 @@ DEF CRYS EQU __trainer_class__ const GINA const ALICE const DUPLICA + const PIPER2 trainerclass BEAUTY ; 33 const VICTORIA @@ -484,7 +489,7 @@ DEF CRYS EQU __trainer_class__ const ROBBY const PIERRE const DYLAN - const KAI + const KAI1 trainerclass RUIN_MANIAC ; 35 const JONES @@ -579,6 +584,7 @@ DEF CRYS EQU __trainer_class__ const ESTHER const MATILDA const BETHANY + const CORINNE trainerclass SAGE ; 3c const CHOW @@ -793,6 +799,7 @@ DEF CRYS EQU __trainer_class__ const JOSEPH const NIGEL const PIOTR + const LYSANDER trainerclass ROCKET_SCIENTIST ; 55 const ROSS @@ -830,6 +837,7 @@ DEF CRYS EQU __trainer_class__ const MANFORD const ANDER const TAKEO + const KAI2 trainerclass BATTLE_GIRL ; 59 const SUBARU @@ -839,6 +847,7 @@ DEF CRYS EQU __trainer_class__ const RONDA const PADMA const EMY + const SASHA trainerclass DRAGON_TAMER ; 5a const PAUL @@ -865,6 +874,7 @@ DEF CRYS EQU __trainer_class__ const SHIRLEY const KATHRYN const CLARICE + const SERENA trainerclass GUITARISTM ; 5d const CLYDE @@ -952,7 +962,7 @@ DEF CRYS EQU __trainer_class__ const GAVEN2 const GAVEN3 const NICK - const AARON + const AARON1 const CODY const MIKE const RYAN @@ -970,6 +980,7 @@ DEF CRYS EQU __trainer_class__ const COOLTRAINERM_COREY const COOLTRAINERM_RAYMOND const FERGUS + const GIDEON2 trainerclass COOLTRAINERF ; 6b const BETH1 diff --git a/data/items/attributes.asm b/data/items/attributes.asm index 4d867ca30e..1f9d13455c 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -591,6 +591,8 @@ KeyItemAttributes: key_item_attribute 0, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; MALIGN LURE key_item_attribute 0, ITEMMENU_NOUSE, ITEMMENU_NOUSE +; LIFT KEY + key_item_attribute 0, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SHINY CHARM key_item_attribute 0, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; OVAL CHARM diff --git a/data/items/descriptions.asm b/data/items/descriptions.asm index f588a71639..3a61ee2123 100644 --- a/data/items/descriptions.asm +++ b/data/items/descriptions.asm @@ -291,6 +291,7 @@ KeyItemDescriptions: dw HarshLureDesc dw PotentLureDesc dw MalignLureDesc + dw LiftKeyDesc dw ShinyCharmDesc dw OvalCharmDesc dw CatchCharmDesc @@ -1655,6 +1656,11 @@ MalignLureDesc: next "malevolent odor." done +LiftKeyDesc: + text "Operates the lift" + next "in a building." + done + ShinyCharmDesc: text "A charm for find-" next "ing shiny #mon." diff --git a/data/items/icon_pointers.asm b/data/items/icon_pointers.asm index 31683df533..de12647648 100644 --- a/data/items/icon_pointers.asm +++ b/data/items/icon_pointers.asm @@ -293,6 +293,7 @@ KeyItemIconPointers: dba HarshLureIcon dba PotentLureIcon dba MalignLureIcon + dba LiftKeyIcon dba ShinyCharmIcon dba OvalCharmIcon dba CatchCharmIcon diff --git a/data/items/key_names.asm b/data/items/key_names.asm index 1693f434a1..8c6546796a 100644 --- a/data/items/key_names.asm +++ b/data/items/key_names.asm @@ -34,6 +34,7 @@ KeyItemNames:: li "Harsh Lure" li "Potent Lure" li "Malign Lure" + li "Lift Key" li "Shiny Charm" li "Oval Charm" li "Catch Charm" diff --git a/data/items/name_order.asm b/data/items/name_order.asm index e8b0aedd31..b5d372641c 100644 --- a/data/items/name_order.asm +++ b/data/items/name_order.asm @@ -345,6 +345,7 @@ KeyItemNameOrder: db NAM_HARSH_LURE db NAM_POTENT_LURE db NAM_MALIGN_LURE + db NAM_LIFT_KEY db NAM_SHINY_CHARM db NAM_OVAL_CHARM db NAM_CATCH_CHARM diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index 1608f3fdca..d9283fd916 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -110,4 +110,5 @@ MapScenes:: scene_var WILLS_ROOM, wWillsRoomSceneID scene_var WISE_TRIOS_ROOM, wWiseTriosRoomSceneID scene_var YELLOW_FOREST, wYellowForestSceneID + scene_var ROCKET_HIDEOUT_B4F, wRocketHideoutB4FSceneID db -1 diff --git a/data/tilesets/underground_attributes.bin b/data/tilesets/underground_attributes.bin index a3e0589a8921972afe17965b6c76dabb01ad042f..c86b6e13adbc06c9468cc186e822eed452ac4244 100644 GIT binary patch delta 10 RcmbQhyMTAY1h$Fn0ss_K133Ty delta 7 OcmZ3$JArq@1U3K)?*fqk diff --git a/data/tilesets/underground_collision.asm b/data/tilesets/underground_collision.asm index 93b5694a11..ae313b83de 100644 --- a/data/tilesets/underground_collision.asm +++ b/data/tilesets/underground_collision.asm @@ -103,3 +103,4 @@ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 66 tilecoll WALL, ELEVATOR_BUTTON, FLOOR, FLOOR ; 67 tilecoll DOOR, WALL, FLOOR, FLOOR ; 68 + tilecoll FLOOR, FLOOR, WALL, WALL ; 69 diff --git a/data/tilesets/underground_metatiles.bin b/data/tilesets/underground_metatiles.bin index 0c9c9287d4f309d3ae681755087b8dd999b0805a..5be9747aeca7761f9a206bf5f6c8735d1a7b75e2 100644 GIT binary patch delta 24 XcmbQhyMTAY1U3N%C`bi@G#~%~MZN{i delta 7 OcmZ3$JArq@1U3K)?*fqk diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 0ba9ebb533..7622abd00a 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -2365,6 +2365,14 @@ YoungsterGroup: dbp LEVEL_FROM_BADGES + 8, SANDSLASH db -1 ; end + ; YOUNGSTER + db "Rory@" + db TRAINERTYPE_NORMAL + ; party + dbp 55, FLAREON + dbp 53, TAUROS + dbp 55, RAPIDASH + db -1 ; end SECTION "BugCatcherGroup", ROMX BugCatcherGroup: @@ -2977,6 +2985,14 @@ endc dbp 62, PARASECT db -1 ; end + ; PICNICKER + db "Zane@" + db TRAINERTYPE_NORMAL + ; party + dbp 54, JOLTEON + dbp 53, RAICHU + dbp 55, ELECTIVIRE + db -1 ; end SECTION "TwinsGroup", ROMX TwinsGroup: @@ -4835,6 +4851,14 @@ CosplayerGroup: db CHARCOAL db -1 ; end + ; COSPLAYER + db "Aaron@" + db TRAINERTYPE_NORMAL + ; party + dbp 54, LANTURN + dbp 53, MAGNEZONE + dbp 55, ELECTRODE + db -1 ; end SECTION "SuperNerdGroup", ROMX SuperNerdGroup: @@ -5004,6 +5028,14 @@ SuperNerdGroup: dbp 56, CHARIZARD db -1 ; end + ; SUPER_NERD + db "Theo@" + db TRAINERTYPE_NORMAL + ; party + dbp 54, ELECTRODE + dbp 55, MAGNEZONE + dbp 56, ELECTIVIRE + db -1 ; end SECTION "LassGroup", ROMX LassGroup: @@ -5236,6 +5268,15 @@ endc db FOCUS_SASH db -1 ; end + ; LASS + db "Piper@" + db TRAINERTYPE_NORMAL + ; party + dbp 55, TOGEKISS + dbp 53, JOLTEON + dbp 52, AMPHAROS + db -1 ; end + SECTION "BeautyGroup", ROMX BeautyGroup: @@ -6239,6 +6280,14 @@ HexManiacGroup: dbp 54, MISDREAVUS db -1 ; end + ; HEX_MANIAC + db "Corinne@" + db TRAINERTYPE_NORMAL + ; party + dbp 53, MISMAGIUS + dbp 52, ESPEON + dbp 55, GENGAR + db -1 ; end SECTION "SageGroup", ROMX SageGroup: @@ -7774,6 +7823,14 @@ ScientistGroup: dbp 55, ALAKAZAM db -1 ; end + ; SCIENTIST + db "Lysander@" + db TRAINERTYPE_NORMAL + ; party + dbp 52, ALAKAZAM + dbp 54, LAPRAS + dbp 53, NOCTOWL + db -1 ; end SECTION "RocketScientistGroup", ROMX RocketScientistGroup: @@ -8068,6 +8125,15 @@ BlackbeltGroup: dbp 56, POLIWRATH db -1 ; end + ; BLACKBELT_T + db "Kai@" + db TRAINERTYPE_NORMAL + ; party + dbp 54, MAGMORTAR + dbp 52, ARCANINE + dbp 53, HOUNDOOM + db -1 ; end + SECTION "BattleGirlGroup", ROMX BattleGirlGroup: @@ -8137,6 +8203,15 @@ BattleGirlGroup: db PLAY_ROUGH, SLASH, BELLY_DRUM, NIGHT_SLASH db -1 ; end + ; BATTLE_GIRL + db "Sasha@" + db TRAINERTYPE_NORMAL + ; party + dbp 52, PRIMEAPE + dbp 55, TYPHLOSION, HISUIAN_FORM + dbp 54, RAPIDASH + db -1 ; end + SECTION "DragonTamerGroup", ROMX DragonTamerGroup: @@ -8350,6 +8425,14 @@ TeacherGroup: dbp 56, SUNFLORA db -1 ; end + ; TEACHER + db "Serena@" + db TRAINERTYPE_NORMAL + ; party + dbp 55, UMBREON + dbp 52, VAPOREON + dbp 54, ESPEON + db -1 ; end SECTION "GuitaristMGroup", ROMX GuitaristMGroup: @@ -9164,6 +9247,15 @@ CooltrainerMGroup: ev_spread 192 Atk, 192 Spe db -1 ; end + ; COOLTRAINERM + db "Gideon@" + db TRAINERTYPE_NORMAL + ; party + dbp 54, PORYGON_Z + dbp 53, SLOWKING + dbp 55, GLACEON + db -1 ; end + SECTION "CooltrainerFGroup", ROMX CooltrainerFGroup: diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index ceff9e655d..7334199721 100755 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -315,6 +315,7 @@ KeyItemEffects: dw IsntTheTimeMessage ; HARSH_LURE dw IsntTheTimeMessage ; POTENT_LURE dw IsntTheTimeMessage ; MALIGN_LURE + dw IsntTheTimeMessage ; LIFT_KEY dw IsntTheTimeMessage ; SHINY_CHARM dw IsntTheTimeMessage ; OVAL_CHARM dw IsntTheTimeMessage ; CATCH_CHARM diff --git a/gfx/items.asm b/gfx/items.asm index 0f0de85287..a0f4c59f4f 100644 --- a/gfx/items.asm +++ b/gfx/items.asm @@ -804,3 +804,6 @@ SECTION "LureIcon", ROMX HarshLureIcon:: PotentLureIcon:: MalignLureIcon:: INCBIN "gfx/items/lure.2bpp.lz" + +SECTION "LiftKeyIcon", ROMX +LiftKeyIcon:: INCBIN "gfx/items/lift_key.2bpp.lz" diff --git a/gfx/items/key_items.pal b/gfx/items/key_items.pal index 27674a76a3..e9bd0508ba 100644 --- a/gfx/items/key_items.pal +++ b/gfx/items/key_items.pal @@ -117,6 +117,9 @@ endc ; MALIGN LURE RGB 12, 12, 12 RGB 29, 01, 09 +; LIFT KEY + RGB 13, 13, 13 + RGB 25, 11, 07 ; SHINY CHARM RGB 07, 26, 31 RGB 10, 15, 29 diff --git a/gfx/items/lift_key.png b/gfx/items/lift_key.png new file mode 100644 index 0000000000000000000000000000000000000000..9e2e19c18b27e3ed491f6e81d34bd45a15dfcc83 GIT binary patch literal 9388 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 G`2PVT3;=Eb literal 0 HcmV?d00001 diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 1e558053ec..1dfd0b5099 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -326,7 +326,7 @@ WesleyScript: done GenericTrainerCooltrainermAaron: - generictrainer COOLTRAINERM, AARON, EVENT_BEAT_COOLTRAINERM_AARON, .SeenText, .BeatenText + generictrainer COOLTRAINERM, AARON1, EVENT_BEAT_COOLTRAINERM_AARON, .SeenText, .BeatenText text "#mon and their" line "trainer become" diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index d824cdaed1..2e40d41d6a 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -144,7 +144,7 @@ OlivineLighthouse3FBattleGirlEmy: done TrainerBird_keeperTheo: - trainer BIRD_KEEPER, THEO, EVENT_BEAT_BIRD_KEEPER_THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, Bird_keeperTheoScript + trainer BIRD_KEEPER, THEO1, EVENT_BEAT_BIRD_KEEPER_THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, Bird_keeperTheoScript Bird_keeperTheoScript: endifjustbattled diff --git a/maps/RocketHideoutB1F.asm b/maps/RocketHideoutB1F.asm index d19d1ccfdc..5c12444c84 100644 --- a/maps/RocketHideoutB1F.asm +++ b/maps/RocketHideoutB1F.asm @@ -2,6 +2,7 @@ RocketHideoutB1F_MapScriptHeader: def_scene_scripts def_callbacks + callback MAPCALLBACK_TILES, RocketHideoutB1FDoorScript def_warp_events warp_event 15, 2, ROCKET_HIDEOUT_B2F, 1 @@ -13,5 +14,176 @@ RocketHideoutB1F_MapScriptHeader: def_coord_events def_bg_events + bg_event 13, 15, BGEVENT_ITEM + RARE_CANDY, EVENT_ROCKET_HIDEOUT_B1F_HIDDEN_RARE_CANDY ; TODO: pick a better item def_object_events + object_event 20, 18, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, RocketHideoutB1FBlackBeltKai, -1 + object_event 4, 6, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 4, RocketHideoutB1FScientistLysander, -1 + object_event 18, 8, SPRITE_PICNICKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 1, RocketHideoutB1FPicnickerZane, -1 + object_event 10, 17, SPRITE_BATTLE_GIRL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 4, RocketHideoutB1FBattleGirlSasha, -1 + object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 3, RocketHideoutB1FLassPiper, -1 + itemball_event 1, 17, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B1F ; TODO: pick a better item + itemball_event 3, 14, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B1F ; TODO: pick a better item + +RocketHideoutB1FDoorScript: + checkevent EVENT_BEAT_BLACK_BELT_KAI + iftruefwd .DoorOpen + changeblock 16, 16, $13 +.DoorOpen + endcallback + +RocketHideoutB1FBlackBeltKai: + trainer BLACKBELT_T, KAI2, EVENT_BEAT_BLACK_BELT_KAI, .SeenText, .AfterText, 0, .Script + +.Script: + checkevent EVENT_BEAT_BLACK_BELT_KAI + iftruefwd .AfterScript + jumpthistextfaceplayer + +.SeenText: + text "Strength in all" + line "that matters." + + para "In Valor, we push" + line "limits." + + para "No holding back-" + line "show me your fire!" + done + +.AfterScript + changeblock 16, 16, $0d + endifjustbattled + jumptextfaceplayer .AfterText + end + +.AfterText: + text "You've got guts-I" + line "can respect that." + + para "Maybe you belong" + line "in Valor after all." + done + +RocketHideoutB1FScientistLysander: + generictrainer SCIENTIST, LYSANDER, EVENT_BEAT_SCIENTIST_LYSANDER, .SeenText, .BeatenText + + text "Candela found" + line "some old files" + cont "on this place." + + para "She thinks if we" + line "we stand in these" + + para "exact spots, we" + line "are optimally" + cont "defensible." + + para "Blanche has calc-" + line "ulated otherwise." + done + +.SeenText: + text "Mystic believes in" + line "strategy." + + para "Only a calculated" + line "mind can win here." + done + +.BeatenText: + text "Your tactics were" + line "flawless. Mystic" + cont "would approve." + + para "Don't squander it." + done + +RocketHideoutB1FPicnickerZane: + generictrainer PICNICKER, ZANE, EVENT_BEAT_PICNICKER_ZANE, .SeenText, .BeatenText + + text "Spark would say" + line "you've got good" + cont "instincts." + + para "Let's see if you" + line "can keep it up!" + done + +.SeenText: + text "Instinct teaches" + line "us to trust out" + cont "gut." + + para "No time for plan-" + line "ning, just act!" + done + +.BeatenText: + text "You've got" + line "instincts, i'll" + cont "give you that." + + para "Keep that spark" + line "alive!" + done + +RocketHideoutB1FBattleGirlSasha: + generictrainer BATTLE_GIRL, SASHA, EVENT_BEAT_BATTLE_GIRL_SASHA, .SeenText, .BeatenText + + text "You've got the" + line "fire of Valor." + + para "But can you keep" + line "it burning?" + + para "Candela's training" + line "is even tougher." + done + +.SeenText: + text "Valor is about" + line "heat, passion, and" + cont "taking risks." + + para "We do this to" + line "grow." + + para "Think you can" + line "match my" + cont "intensity?" + done + +.BeatenText: + text "Alright, I'll" + line "admit your fire" + cont "burns bright." + + para "Don't let it" + line "go to your head." + done + +RocketHideoutB1FLassPiper: + generictrainer LASS, PIPER2, EVENT_BEAT_LASS_PIPER, .SeenText, .BeatenText + + text "Spark's battles" + line "are unpredictable." + + para "Thats why I mix" + line "things up!" + done + +.SeenText: + text "Instinct is about" + line "following the" + cont "flow." + + para "No overthinking-" + line "react and win!" + done + +.BeatenText: + text "Guess your" + line "instincts were" + cont "better than mine." + done \ No newline at end of file diff --git a/maps/RocketHideoutB2F.asm b/maps/RocketHideoutB2F.asm index 967c1c6b69..e726935728 100644 --- a/maps/RocketHideoutB2F.asm +++ b/maps/RocketHideoutB2F.asm @@ -15,3 +15,34 @@ RocketHideoutB2F_MapScriptHeader: def_bg_events def_object_events + object_event 20, 6, SPRITE_HEX_MANIAC, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 2, RocketHideoutB2FHexManiacCorinne, -1 + itemball_event 16, 2, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B2F ; TODO: pick a better item + itemball_event 1, 5, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B2F ; TODO: pick a better item + itemball_event 6, 6, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_3_FROM_ROCKET_HIDEOUT_B2F ; TODO: pick a better item + itemball_event 3, 15, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_4_FROM_ROCKET_HIDEOUT_B2F ; TODO: pick a better item + +RocketHideoutB2FHexManiacCorinne: + generictrainer HEX_MANIAC, CORINNE, EVENT_BEAT_HEX_MANIAC_CORINNE, .SeenText, .BeatenText + + text "Blanche might see" + line "potential in you." + + para "But they'll test" + line "your limits for" + cont "sure." + done + +.SeenText: + text "Mystic sees beyond" + line "the obvious-logic" + cont "wins every time." + + para "Can you outsmart" + line "me? Prove it." + done + +.BeatenText: + text "Impressive. You've" + line "got a mind Mystic" + cont "values." + done diff --git a/maps/RocketHideoutB3F.asm b/maps/RocketHideoutB3F.asm index e8e1ea7869..07393bcb91 100644 --- a/maps/RocketHideoutB3F.asm +++ b/maps/RocketHideoutB3F.asm @@ -10,5 +10,62 @@ RocketHideoutB3F_MapScriptHeader: def_coord_events def_bg_events + bg_event 19, 13, BGEVENT_ITEM + RARE_CANDY, EVENT_ROCKET_HIDEOUT_B3F_HIDDEN_RARE_CANDY ; TODO: pick a better item def_object_events + object_event 18, 8, SPRITE_COSPLAYER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 3, RocketHideoutB3FCosplayerAaron, -1 + object_event 2, 18, SPRITE_COOL_DUDE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 3, RocketHideoutB3FCoolDudeGideon, -1 + itemball_event 12, 10, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B3F ; TODO: pick a better item + itemball_event 18, 13, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B3F ; TODO: pick a better item + +RocketHideoutB3FCosplayerAaron: + generictrainer COSPLAYER, AARON2, EVENT_BEAT_COSPLAYER_AARON, .SeenText, .BeatenText + + text "Spark's energy" + line "is on point!" + + para "Hope you're ready" + line "for a jolt!" + done + +.SeenText: + text "Instinct doesn't" + line "need calculations." + + para "We just strike" + line "fast and hard." + done + +.BeatenText: + text "Fast moves, sharp" + line "instincts. You've" + cont "got it all!" + done + +RocketHideoutB3FCoolDudeGideon: + generictrainer COOLTRAINERM, GIDEON2, EVENT_BEAT_COOL_DUDE_GIDEON, .SeenText, .BeatenText + + text "Blanche expects" + line "the best from" + cont "trainers." + + para "Stay sharp if you" + line "plan to face them." + done + +.SeenText: + text "Mystic thrives on" + line "data and logic." + + para "Emotions cloud" + line "judgement. Let's" + cont "see your focus." + done + +.BeatenText: + text "You've shown you" + line "can think clearly." + + para "Keep using that" + line "sharp mind." + done \ No newline at end of file diff --git a/maps/RocketHideoutB4F.asm b/maps/RocketHideoutB4F.asm index 8d331e9a1d..655468aba3 100644 --- a/maps/RocketHideoutB4F.asm +++ b/maps/RocketHideoutB4F.asm @@ -1,7 +1,11 @@ RocketHideoutB4F_MapScriptHeader: def_scene_scripts + scene_script RocketHideoutB4FMeetLeadersScene + scene_script RocketHideoutB4FMetLeadersScene def_callbacks + callback MAPCALLBACK_OBJECTS, RocketHideoutB4FLiftKeyScript + callback MAPCALLBACK_TILES, RocketHideoutB4FDoorScript def_warp_events warp_event 11, 10, ROCKET_HIDEOUT_B3F, 2 @@ -9,7 +13,515 @@ RocketHideoutB4F_MapScriptHeader: warp_event 17, 15, ROCKET_HIDEOUT_ELEVATOR, 1 def_coord_events + coord_event 16, 11, 0, RocketHideoutB4FMeetLeadersLeftScript + coord_event 17, 11, 0, RocketHideoutB4FMeetLeadersRightScript def_bg_events + bg_event 17, 1, BGEVENT_ITEM + RARE_CANDY, EVENT_ROCKET_HIDEOUT_B4F_HIDDEN_RARE_CANDY def_object_events + object_event 17, 3, SPRITE_CANDELA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, (1 << EVE) | (1 << NITE), 0, OBJECTTYPE_SCRIPT, 0, RocketHideoutB4FCandelaScript, -1 + object_event 16, 6, SPRITE_SPARK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, (1 << EVE) | (1 << NITE), 0, OBJECTTYPE_SCRIPT, 0, RocketHideoutB4FSparkScript, -1 + object_event 19, 6, SPRITE_BLANCHE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, (1 << EVE) | (1 << NITE), 0, OBJECTTYPE_SCRIPT, 0, RocketHideoutB4FBlancheScript, -1 + object_event 3, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketHideoutB4FYoungsterRoryScript, -1 + object_event 15, 12, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, RocketHideoutB4FTeacherSerena, -1 + object_event 18, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, RocketHideoutB4FSuperNerdTheo, -1 + keyitemball_event 2, 2, LIFT_KEY, EVENT_PICKED_UP_LIFT_KEY_FROM_ROCKET_HIDEOUT_B4F + itemball_event 1, 4, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B4F + itemball_event 2, 12, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B4F + itemball_event 4, 20, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_3_FROM_ROCKET_HIDEOUT_B4F + + object_const_def + const ROCKETHIDEOUTB4F_CANDELA + const ROCKETHIDEOUTB4F_SPARK + const ROCKETHIDEOUTB4F_BLANCHE + const ROCKETHIDEOUTB4F_YOUNGSTER_RORY + const ROCKETHIDEOUTB4F_TEACHER_SERENA + const ROCKETHIDEOUTB4F_SUPER_NERD_THEO + const ROCKETHIDEOUTB4F_LIFT_KEY + +RocketHideoutB4FDoorScript: + checkevent EVENT_BEAT_TEACHER_SERENA + iftruefwd .beat_serena + changeblock 16, 10, $69 + endcallback +.beat_serena + checkevent EVENT_BEAT_SUPER_NERD_THEO + iftruefwd .beat_theo + changeblock 16, 10, $69 + endcallback +.beat_theo + changeblock 16, 10, $13 + endcallback + +RocketHideoutB4FLiftKeyScript: + checkevent EVENT_BEAT_YOUNGSTER_RORY + iftruefwd .beat_rory + disappear ROCKETHIDEOUTB4F_LIFT_KEY + endcallback +.beat_rory + appear ROCKETHIDEOUTB4F_LIFT_KEY + endcallback + +RocketHideoutB4FMeetLeadersLeftScript: + checktime (1 << EVE) | (1 << NITE) + iffalse TooEarly + applymovement PLAYER, .MovePlayerUp + sjumpfwd RocketHideoutB4FMeetLeadersScript + +.MovePlayerUp: + step_up + step_up + step_up + step_up + step_right + turn_head_up + step_end + +RocketHideoutB4FMeetLeadersRightScript: + checktime (1 << EVE) | (1 << NITE) + iffalse TooEarly + applymovement PLAYER, .MovePlayerUp + sjumpfwd RocketHideoutB4FMeetLeadersScript + +.MovePlayerUp: + step_up + step_up + step_up + step_up + step_end + +RocketHideoutB4FMeetLeadersScript: + showtext .CandelaIntro1Text + turnobject ROCKETHIDEOUTB4F_SPARK, RIGHT + showtext .BlancheIntro1Text + turnobject ROCKETHIDEOUTB4F_BLANCHE, LEFT + turnobject ROCKETHIDEOUTB4F_SPARK, UP + pause 20 + turnobject ROCKETHIDEOUTB4F_SPARK, RIGHT + showtext .SparkIntro1Text + turnobject ROCKETHIDEOUTB4F_SPARK, UP + turnobject ROCKETHIDEOUTB4F_BLANCHE, UP + showtext .CandelaIntro2Text + turnobject ROCKETHIDEOUTB4F_SPARK, RIGHT + showtext .BlancheIntro2Text + turnobject ROCKETHIDEOUTB4F_BLANCHE, LEFT + turnobject ROCKETHIDEOUTB4F_SPARK, UP + showtext .SparkIntro2Text + turnobject ROCKETHIDEOUTB4F_SPARK, DOWN + showtext .SparkIntro3Text + turnobject ROCKETHIDEOUTB4F_BLANCHE, DOWN + showtext .CandelaIntro3Text + setscene $1 + end + + +.CandelaIntro1Text: + text "Candela: I am" + line "telling you, pure" + cont "power wins!" + + para "Training should be" + line "tough, like a" + cont "battle!" + done + +.BlancheIntro1Text: + text "Blanche: Reckless" + line "power is pointless" + cont "without strategy." + + para "Smart planning" + line "wins, every time." + done + +.SparkIntro1Text: + text "Spark: Both of you" + line "are missing the" + cont "point!" + + para "Instinct is key-" + line "trust your gut!" + done + +.CandelaIntro2Text: + text "Candela: Instinct?" + line "That's just" + cont "guesswork!" + + para "Real trainers rely" + line "on strength!" + done + +.BlancheIntro2Text: + text "Blanche: Candela," + line "Spark, this isn't" + cont "the time!" + + para "What about the" + line "big tree project?" + done + +.SparkIntro2Text: + text "Spark: Right! The" + line "big cherry tree-" + done + +.SparkIntro3Text: + text "Wait, who's that?" + done + +.CandelaIntro3Text: + text "Candela: Looks" + line "like this one has" + cont "has power!" + + para "Since you made it" + line "this far, let's" + cont "battle!" + + para "If you win, we'll" + line "let you in on our" + cont "big project!" + done + +RocketHideoutB4FMeetLeadersScene: +RocketHideoutB4FMetLeadersScene: +TooEarly: + end + + +RocketHideoutB4FSparkScript: + faceplayer + opentext + writetext .GreetingText + yesorno + iffalsefwd .Refused + writetext .SeenText + waitbutton + closetext + winlosstext .BeatenText, 0 + loadtrainer SPARK_T, 1 + startbattle + reloadmapafterbattle + setevent EVENT_BEAT_SPARK + showtext .AfterText1 + verbosegiveitem MALIGN_LURE + showtext .AfterText2 + end + +.Refused: + jumpopenedtext .RefusedText + +.GreetingText: + text "Spark: Hey! Ready" + line "to trust your gut?" + cont "In a battle?" + done + +.SeenText: + text "Sweet! Let's see" + line "how far your inst-" + cont "inct takes you!" + done + +.BeatenText: + text "Whoa, you totally" + line "nailed it!" + + para "Guess your gut" + line "was right!" + done + +.AfterText1: + text "Spark: Here's the" + line "Malign Lure." + done + +.AfterText2: + text "It draws bold" + line "energy." + + para "It's my way of" + line "sparking some" + cont "creativity!" + + para "Use it boldly!" + done + +.RefusedText: + text "Aw, bummer!" + line "Don't let fear" + cont "hold you back!" + + para "Come back when" + line "you're feeling it." + done + +RocketHideoutB4FCandelaScript: + faceplayer + opentext + writetext .GreetingText + yesorno + iffalsefwd .Refused + writetext .SeenText + waitbutton + closetext + winlosstext .BeatenText, 0 + loadtrainer CANDELA, 1 + startbattle + reloadmapafterbattle + setevent EVENT_BEAT_CANDELA + showtext .AfterText1 + verbosegiveitem HARSH_LURE + showtext .AfterText2 + end + +.Refused: + jumpopenedtext .RefusedText + +.GreetingText: + text "Candela: Ready to" + line "text your strength?" + done + +.SeenText: + text "That's the spirit!" + line "Show me your" + cont "power!" + done + +.BeatenText: + text "Alright, you've" + line "proven your" + cont "strength today." + + para "I'll admit defeat." + done + +.AfterText1: + text "Candela: Here's the" + line "Harsh Lure." + done + +.AfterText2: + text "Candela: it draws" + line "fierce power." + + para "This is my contri-" + line "bution to our" + cont "project." + + para "Use it wisely." + done + +.RefusedText: + text "No? Guess your" + line "not ready yet." + + para "Come back when you" + line "have more fire!" + done + +RocketHideoutB4FBlancheScript: + faceplayer + opentext + writetext .GreetingText + yesorno + iffalsefwd .Refused + writetext .SeenText + waitbutton + closetext + winlosstext .BeatenText, 0 + loadtrainer BLANCHE, 1 + startbattle + reloadmapafterbattle + setevent EVENT_BEAT_BLANCHE + showtext .AfterText1 + verbosegiveitem POTENT_LURE + showtext .AfterText2 + end + +.Refused: + jumpopenedtext .RefusedText + +.GreetingText: + text "Blanche: Do you" + line "value strategy?" + + para "Shall we test" + line "your tactics?" + done + +.SeenText: + text "Very well, let's" + line "see your" + cont "technique!" + done + +.BeatenText: + text "A well-executed" + line "plan, indeed." + + para "You've bested me." + done + +.AfterText1: + text "Blanche: This is" + line "the Potent Lure." + done + +.AfterText2: + text "It amplifies" + line "precision." + + para "It's my contri-" + line "bution to ensuring" + cont "our success." + + para "Use it carefully." + done + +.RefusedText: + text "Hmm, not" + line "feeling confident?" + + para "Return when you're" + line "ready to think" + cont "ahead." + done + +RocketHideoutB4FYoungsterRoryScript: + faceplayer + checkevent EVENT_BEAT_YOUNGSTER_RORY + iftruefwd .AfterBattle + opentext + writetext .GreetingText + closetext + winlosstext .BeatenText, 0 + loadtrainer YOUNGSTER, RORY2 + startbattle + reloadmapafterbattle + setevent EVENT_BEAT_YOUNGSTER_RORY + readvar VAR_FACING + ifnotequal RIGHT, .NotLeftOfRory + moveobject ROCKETHIDEOUTB4F_LIFT_KEY, 4, 2 +.NotLeftOfRory + appear ROCKETHIDEOUTB4F_LIFT_KEY +.AfterBattle + opentext + writetext .AfterText + closetext + end + +.GreetingText + text "Firepower is key" + line "for Valor." + + para "No strategy, no" + line "guesswork-just" + cont "force!" + done + +.BeatenText: + text "Looks like your" + line "fire burned" + cont "brighter today." + done + +.AfterText: + text "Aww, I dropped" + line "the lift key!" + + para "Candela is going" + line "to be so mad!" + done + +RocketHideoutB4FTeacherSerena: + trainer TEACHER, SERENA, EVENT_BEAT_TEACHER_SERENA, .SeenText, .AfterText, 0, .Script + +.Script + checkevent EVENT_BEAT_TEACHER_SERENA + iftruefwd .AfterScript + jumpthistextfaceplayer + +.AfterScript + checkevent EVENT_BEAT_SUPER_NERD_THEO + iftruefwd .OpenDoorScript + endifjustbattled + jumptextfaceplayer .AfterText + end + +.OpenDoorScript + changeblock 16, 10, $0d + endifjustbattled + jumptextfaceplayer .AfterText + end + +.AfterText + text "The leaders are" + line "only here at" + cont "night." + + para "They work at" + line "the university" + cont "during the day." + done + +.SeenText: + text "A calm mind and" + line "thoughtful action-" + + para "That's the Mystic" + line "way. Let me teach" + cont "you." + done + +.BeatenText: + text "Blanche my" + line "lessons failed me!" + done + +RocketHideoutB4FSuperNerdTheo: + trainer SUPER_NERD, THEO2, EVENT_BEAT_SUPER_NERD_THEO, .SeenText, .AfterText, 0, .Script + +.Script + checkevent EVENT_BEAT_SUPER_NERD_THEO + iftruefwd .AfterScript + jumpthistextfaceplayer + +.AfterScript + checkevent EVENT_BEAT_TEACHER_SERENA + iftruefwd .OpenDoorScript + endifjustbattled + jumptextfaceplayer .AfterText + end + +.OpenDoorScript + changeblock 16, 10, $0d + endifjustbattled + jumptextfaceplayer .AfterText + end + +.AfterText + text "The leaders argue" + line "a lot, but they" + cont "are good friends." + + para "We all here to" + line "have fun and" + cont "hang out." + done + +.SeenText: + text "Instinct is about" + line "making fast moves." + + para "React or lose-" + line "simple." + done + +.BeatenText: + text "You reacted too" + line "fast for me!" + done diff --git a/maps/RocketHideoutElevator.asm b/maps/RocketHideoutElevator.asm index 54c077827a..8a2ca8aa4a 100644 --- a/maps/RocketHideoutElevator.asm +++ b/maps/RocketHideoutElevator.asm @@ -15,6 +15,14 @@ RocketHideoutElevator_MapScriptHeader: RocketHideoutElevatorButton: opentext + checkkeyitem LIFT_KEY + iftruefwd .UseElevator + writetext .AppearsToNeedKeyText + waitbutton + closetext + end + +.UseElevator elevator .Floors closetext iffalse DoNothingScript @@ -30,3 +38,9 @@ RocketHideoutElevatorButton: elevfloor FLOOR_B2F, 5, ROCKET_HIDEOUT_B2F elevfloor FLOOR_B4F, 3, ROCKET_HIDEOUT_B4F db -1 ; end + +.AppearsToNeedKeyText + text "It appears to" + line "need a key to" + cont "operate." + done diff --git a/maps/Route13East.asm b/maps/Route13East.asm index 5671e9855a..ff6e399bed 100644 --- a/maps/Route13East.asm +++ b/maps/Route13East.asm @@ -83,7 +83,7 @@ GenericTrainerCamperTanner: done GenericTrainerPicnickerPiper: - generictrainer PICNICKER, PIPER, EVENT_BEAT_PICNICKER_PIPER, .SeenText, .BeatenText + generictrainer PICNICKER, PIPER1, EVENT_BEAT_PICNICKER_PIPER, .SeenText, .BeatenText text "The way you were" line "walking made me" diff --git a/maps/Route21.asm b/maps/Route21.asm index 2903ebd15c..9c9ad1e03d 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -210,7 +210,7 @@ GenericTrainerFisherLiam: done GenericTrainerFisherGideon: - generictrainer FISHER, GIDEON, EVENT_BEAT_FISHER_GIDEON, .SeenText, .BeatenText + generictrainer FISHER, GIDEON1, EVENT_BEAT_FISHER_GIDEON, .SeenText, .BeatenText text "What's the reason" line "you became a" diff --git a/maps/SafariZoneHub.asm b/maps/SafariZoneHub.asm index 17f0bd1397..8ce5d51977 100644 --- a/maps/SafariZoneHub.asm +++ b/maps/SafariZoneHub.asm @@ -26,7 +26,7 @@ SafariZoneHub_MapScriptHeader: itemball_event 8, 21, ULTRA_BALL, 1, EVENT_SAFARI_ZONE_HUB_ULTRA_BALL GenericTrainerBug_maniacKai: - generictrainer BUG_MANIAC, KAI, EVENT_BEAT_BUG_MANIAC_KAI, Bug_maniacKaiSeenText, Bug_maniacKaiBeatenText + generictrainer BUG_MANIAC, KAI1, EVENT_BEAT_BUG_MANIAC_KAI, Bug_maniacKaiSeenText, Bug_maniacKaiBeatenText text "Venonat is so" line "similar to" diff --git a/maps/UnionCaveB1FSouth.asm b/maps/UnionCaveB1FSouth.asm index 364e6ce2e7..56251592f6 100644 --- a/maps/UnionCaveB1FSouth.asm +++ b/maps/UnionCaveB1FSouth.asm @@ -150,7 +150,7 @@ GenericTrainerFirebreatherJay: done GenericTrainerSuper_nerdRory: - generictrainer SUPER_NERD, RORY, EVENT_BEAT_SUPER_NERD_RORY, .SeenText, .BeatenText + generictrainer SUPER_NERD, RORY1, EVENT_BEAT_SUPER_NERD_RORY, .SeenText, .BeatenText text "A jiffy is the" line "scientific name" diff --git a/ram/wramx.asm b/ram/wramx.asm index 7d506927ff..6b2c68ae46 100644 --- a/ram/wramx.asm +++ b/ram/wramx.asm @@ -1036,8 +1036,6 @@ wPlayerState:: db wHallOfFameCount:: dw wTradeFlags:: flag_array PARTY_LENGTH - ds 1 ; unused - wMooMooBerries:: db wUndergroundSwitchPositions:: db wFarfetchdPosition:: db @@ -1067,7 +1065,7 @@ wDragonsDenB1FSceneID:: db wDragonShrineSceneID:: db wEcruteakGymSceneID:: db wEcruteakHouseSceneID:: db - ds 1 ; unused +wRocketHideoutB4FSceneID:: db wElmsLabSceneID:: db wFarawayIslandSceneID:: db wFastShip1FSceneID:: db From a44b96d2b919f0510578f509922d89021f1f06fe Mon Sep 17 00:00:00 2001 From: SoupPotato Date: Fri, 27 Dec 2024 10:10:24 +0000 Subject: [PATCH 02/10] Updated items and text for Celadon Rocket Hideout --- constants/event_flags.asm | 28 ++++----- maps/RocketHideoutB1F.asm | 128 ++++++++++++++++---------------------- maps/RocketHideoutB2F.asm | 30 ++++----- maps/RocketHideoutB3F.asm | 40 +++++------- maps/RocketHideoutB4F.asm | 68 +++++++++----------- 5 files changed, 124 insertions(+), 170 deletions(-) diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 90d1234d93..7781d154e9 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -2411,27 +2411,27 @@ const EVENT_BEAT_PICNICKER_ZANE const EVENT_BEAT_BATTLE_GIRL_SASHA const EVENT_BEAT_LASS_PIPER - const EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B1F - const EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B1F - const EVENT_ROCKET_HIDEOUT_B1F_HIDDEN_RARE_CANDY + const EVENT_PICKED_UP_MOON_STONE_FROM_ROCKET_HIDEOUT_B1F + const EVENT_PICKED_UP_ZINC_FROM_ROCKET_HIDEOUT_B1F + const EVENT_ROCKET_HIDEOUT_B1F_HIDDEN_MAX_REVIVE const EVENT_BEAT_HEX_MANIAC_CORINNE - const EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B2F - const EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B2F - const EVENT_PICKED_UP_RARE_CANDY_3_FROM_ROCKET_HIDEOUT_B2F - const EVENT_PICKED_UP_RARE_CANDY_4_FROM_ROCKET_HIDEOUT_B2F + const EVENT_PICKED_UP_ULTRA_BALL_FROM_ROCKET_HIDEOUT_B2F + const EVENT_PICKED_UP_SUPER_REPEL_FROM_ROCKET_HIDEOUT_B2F + const EVENT_PICKED_UP_NUGGET_FROM_ROCKET_HIDEOUT_B2F + const EVENT_PICKED_UP_RARE_CANDY_FROM_ROCKET_HIDEOUT_B2F const EVENT_BEAT_COSPLAYER_AARON const EVENT_BEAT_COOL_DUDE_GIDEON - const EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B3F - const EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B3F - const EVENT_ROCKET_HIDEOUT_B3F_HIDDEN_RARE_CANDY + const EVENT_PICKED_UP_CARBOS_FROM_ROCKET_HIDEOUT_B3F + const EVENT_PICKED_UP_ELIXIR_FROM_ROCKET_HIDEOUT_B3F + const EVENT_ROCKET_HIDEOUT_B3F_HIDDEN_FULL_HEAL const EVENT_BEAT_YOUNGSTER_RORY const EVENT_PICKED_UP_LIFT_KEY_FROM_ROCKET_HIDEOUT_B4F const EVENT_BEAT_TEACHER_SERENA const EVENT_BEAT_SUPER_NERD_THEO - const EVENT_ROCKET_HIDEOUT_B4F_HIDDEN_RARE_CANDY - const EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B4F - const EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B4F - const EVENT_PICKED_UP_RARE_CANDY_3_FROM_ROCKET_HIDEOUT_B4F + const EVENT_ROCKET_HIDEOUT_B4F_HIDDEN_MAX_POTION + const EVENT_PICKED_UP_X_SP_ATK_FROM_ROCKET_HIDEOUT_B4F + const EVENT_PICKED_UP_PP_UP_FROM_ROCKET_HIDEOUT_B4F + const EVENT_PICKED_UP_DUBIOUS_DISC_FROM_ROCKET_HIDEOUT_B4F const_next $8ff DEF NUM_EVENTS EQU const_value ; 2303 diff --git a/maps/RocketHideoutB1F.asm b/maps/RocketHideoutB1F.asm index 5c12444c84..3551b009f0 100644 --- a/maps/RocketHideoutB1F.asm +++ b/maps/RocketHideoutB1F.asm @@ -14,7 +14,7 @@ RocketHideoutB1F_MapScriptHeader: def_coord_events def_bg_events - bg_event 13, 15, BGEVENT_ITEM + RARE_CANDY, EVENT_ROCKET_HIDEOUT_B1F_HIDDEN_RARE_CANDY ; TODO: pick a better item + bg_event 13, 15, BGEVENT_ITEM + MAX_REVIVE, EVENT_ROCKET_HIDEOUT_B1F_HIDDEN_MAX_REVIVE def_object_events object_event 20, 18, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, RocketHideoutB1FBlackBeltKai, -1 @@ -22,8 +22,8 @@ RocketHideoutB1F_MapScriptHeader: object_event 18, 8, SPRITE_PICNICKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 1, RocketHideoutB1FPicnickerZane, -1 object_event 10, 17, SPRITE_BATTLE_GIRL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 4, RocketHideoutB1FBattleGirlSasha, -1 object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 3, RocketHideoutB1FLassPiper, -1 - itemball_event 1, 17, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B1F ; TODO: pick a better item - itemball_event 3, 14, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B1F ; TODO: pick a better item + itemball_event 1, 17, MOON_STONE, 1, EVENT_PICKED_UP_MOON_STONE_FROM_ROCKET_HIDEOUT_B1F + itemball_event 3, 14, ZINC, 1, EVENT_PICKED_UP_ZINC_FROM_ROCKET_HIDEOUT_B1F RocketHideoutB1FDoorScript: checkevent EVENT_BEAT_BLACK_BELT_KAI @@ -33,7 +33,7 @@ RocketHideoutB1FDoorScript: endcallback RocketHideoutB1FBlackBeltKai: - trainer BLACKBELT_T, KAI2, EVENT_BEAT_BLACK_BELT_KAI, .SeenText, .AfterText, 0, .Script + trainer BLACKBELT_T, KAI2, EVENT_BEAT_BLACK_BELT_KAI, .SeenText, .AfterText, 0, .BeatenText .Script: checkevent EVENT_BEAT_BLACK_BELT_KAI @@ -41,14 +41,11 @@ RocketHideoutB1FBlackBeltKai: jumpthistextfaceplayer .SeenText: - text "Strength in all" - line "that matters." - - para "In Valor, we push" + text "In Valor, we push" line "limits." - para "No holding back-" - line "show me your fire!" + para "Strength in all" + line "that matters!" done .AfterScript @@ -58,109 +55,90 @@ RocketHideoutB1FBlackBeltKai: end .AfterText: - text "You've got guts-I" - line "can respect that." + text "You've got guts…" - para "Maybe you belong" - line "in Valor after all." + para "Perhaps you should" + line "join Team Valor." + done + +.BeatenText: + text "You're strength is" + line "superior…" done RocketHideoutB1FScientistLysander: generictrainer SCIENTIST, LYSANDER, EVENT_BEAT_SCIENTIST_LYSANDER, .SeenText, .BeatenText - text "Candela found" - line "some old files" - cont "on this place." - - para "She thinks if we" - line "we stand in these" + text "Leader Blanche ex-" + line "cels in strategy." - para "exact spots, we" - line "are optimally" - cont "defensible." - - para "Blanche has calc-" - line "ulated otherwise." + para "He decides where" + line "we are stationed." done .SeenText: - text "Mystic believes in" + text "Mystic values" line "strategy." - para "Only a calculated" - line "mind can win here." + para "Only a strong mind" + line "could win here." done .BeatenText: - text "Your tactics were" - line "flawless. Mystic" - cont "would approve." - - para "Don't squander it." + text "You're tactics are" + line "flawless!" done RocketHideoutB1FPicnickerZane: generictrainer PICNICKER, ZANE, EVENT_BEAT_PICNICKER_ZANE, .SeenText, .BeatenText - text "Spark would say" - line "you've got good" - cont "instincts." + text "Spark would be" + line "impressed." para "Let's see if you" - line "can keep it up!" + line "can keep going!" done .SeenText: - text "Instinct teaches" - line "us to trust out" - cont "gut." + text "Team Instinct is" + line "all about trusting" + cont "your gut." - para "No time for plan-" - line "ning, just act!" + para "No time to think," + line "just act!" done .BeatenText: - text "You've got" - line "instincts, i'll" - cont "give you that." + text "You've got that" + line "'spark', alright." - para "Keep that spark" - line "alive!" + para "Keep it alive!" done RocketHideoutB1FBattleGirlSasha: generictrainer BATTLE_GIRL, SASHA, EVENT_BEAT_BATTLE_GIRL_SASHA, .SeenText, .BeatenText - text "You've got the" - line "fire of Valor." - - para "But can you keep" - line "it burning?" + text "The flame of Valor" + line "burns within you." - para "Candela's training" - line "is even tougher." + para "Candela's trial" + line "will test your" + cont "limits." done .SeenText: - text "Valor is about" - line "heat, passion, and" + text "Team Valor's all" + line "about passion and" cont "taking risks." - para "We do this to" - line "grow." - para "Think you can" - line "match my" - cont "intensity?" + line "match my in-" + cont "tensity?" done .BeatenText: - text "Alright, I'll" - line "admit your fire" - cont "burns bright." - - para "Don't let it" - line "go to your head." + text "You're flame…" + line "Too bright!" done RocketHideoutB1FLassPiper: @@ -174,16 +152,14 @@ RocketHideoutB1FLassPiper: done .SeenText: - text "Instinct is about" - line "following the" - cont "flow." + text "My strategy?" - para "No overthinking-" - line "react and win!" + para "Pure instinct and" + line "nothing more!" done .BeatenText: - text "Guess your" - line "instincts were" - cont "better than mine." + text "I guess your in-" + line "stinct is better" + cont "than mine." done \ No newline at end of file diff --git a/maps/RocketHideoutB2F.asm b/maps/RocketHideoutB2F.asm index e726935728..9b7a093e44 100644 --- a/maps/RocketHideoutB2F.asm +++ b/maps/RocketHideoutB2F.asm @@ -16,33 +16,27 @@ RocketHideoutB2F_MapScriptHeader: def_object_events object_event 20, 6, SPRITE_HEX_MANIAC, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 2, RocketHideoutB2FHexManiacCorinne, -1 - itemball_event 16, 2, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B2F ; TODO: pick a better item - itemball_event 1, 5, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B2F ; TODO: pick a better item - itemball_event 6, 6, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_3_FROM_ROCKET_HIDEOUT_B2F ; TODO: pick a better item - itemball_event 3, 15, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_4_FROM_ROCKET_HIDEOUT_B2F ; TODO: pick a better item + itemball_event 16, 2, ULTRA_BALL, 1, EVENT_PICKED_UP_ULTRA_BALL_FROM_ROCKET_HIDEOUT_B2F + itemball_event 1, 5, SUPER_REPEL, 1, EVENT_PICKED_UP_SUPER_REPEL_FROM_ROCKET_HIDEOUT_B2F + itemball_event 6, 6, NUGGET, 1, EVENT_PICKED_UP_NUGGET_FROM_ROCKET_HIDEOUT_B2F + itemball_event 3, 15, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_FROM_ROCKET_HIDEOUT_B2F RocketHideoutB2FHexManiacCorinne: generictrainer HEX_MANIAC, CORINNE, EVENT_BEAT_HEX_MANIAC_CORINNE, .SeenText, .BeatenText - text "Blanche might see" - line "potential in you." - - para "But they'll test" - line "your limits for" - cont "sure." + text "Team Mystic could" + line "use more talents" + cont "like yours." done .SeenText: - text "Mystic sees beyond" - line "the obvious-logic" - cont "wins every time." + text "You might have" + line "potential" - para "Can you outsmart" - line "me? Prove it." + para "Let me test your" + line "limits." done .BeatenText: - text "Impressive. You've" - line "got a mind Mystic" - cont "values." + text "Squared away…" done diff --git a/maps/RocketHideoutB3F.asm b/maps/RocketHideoutB3F.asm index 07393bcb91..2c838f5981 100644 --- a/maps/RocketHideoutB3F.asm +++ b/maps/RocketHideoutB3F.asm @@ -10,19 +10,19 @@ RocketHideoutB3F_MapScriptHeader: def_coord_events def_bg_events - bg_event 19, 13, BGEVENT_ITEM + RARE_CANDY, EVENT_ROCKET_HIDEOUT_B3F_HIDDEN_RARE_CANDY ; TODO: pick a better item + bg_event 19, 13, BGEVENT_ITEM + FULL_HEAL, EVENT_ROCKET_HIDEOUT_B3F_HIDDEN_FULL_HEAL def_object_events object_event 18, 8, SPRITE_COSPLAYER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 3, RocketHideoutB3FCosplayerAaron, -1 object_event 2, 18, SPRITE_COOL_DUDE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 3, RocketHideoutB3FCoolDudeGideon, -1 - itemball_event 12, 10, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B3F ; TODO: pick a better item - itemball_event 18, 13, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B3F ; TODO: pick a better item + itemball_event 12, 10, CARBOS, 1, EVENT_PICKED_UP_CARBOS_FROM_ROCKET_HIDEOUT_B3F + itemball_event 18, 13, ELIXIR, 1, EVENT_PICKED_UP_ELIXIR_FROM_ROCKET_HIDEOUT_B3F RocketHideoutB3FCosplayerAaron: generictrainer COSPLAYER, AARON2, EVENT_BEAT_COSPLAYER_AARON, .SeenText, .BeatenText - text "Spark's energy" - line "is on point!" + text "Leader Spark's" + line "energy is high!" para "Hope you're ready" line "for a jolt!" @@ -37,35 +37,27 @@ RocketHideoutB3FCosplayerAaron: done .BeatenText: - text "Fast moves, sharp" - line "instincts. You've" - cont "got it all!" + text "Can't keep up!" done RocketHideoutB3FCoolDudeGideon: generictrainer COOLTRAINERM, GIDEON2, EVENT_BEAT_COOL_DUDE_GIDEON, .SeenText, .BeatenText - text "Blanche expects" - line "the best from" - cont "trainers." - - para "Stay sharp if you" - line "plan to face them." + text "Leader Blanche ex-" + line "pects no less than" + cont "maximum effort!" done .SeenText: - text "Mystic thrives on" - line "data and logic." + text "Emotion clouds" + line "judgement." - para "Emotions cloud" - line "judgement. Let's" - cont "see your focus." + para "Let's see if your" + cont "focus is good." + done .BeatenText: - text "You've shown you" - line "can think clearly." - - para "Keep using that" - line "sharp mind." + text "My judgement was" + line "flawed…" done \ No newline at end of file diff --git a/maps/RocketHideoutB4F.asm b/maps/RocketHideoutB4F.asm index 655468aba3..ad73376753 100644 --- a/maps/RocketHideoutB4F.asm +++ b/maps/RocketHideoutB4F.asm @@ -17,7 +17,7 @@ RocketHideoutB4F_MapScriptHeader: coord_event 17, 11, 0, RocketHideoutB4FMeetLeadersRightScript def_bg_events - bg_event 17, 1, BGEVENT_ITEM + RARE_CANDY, EVENT_ROCKET_HIDEOUT_B4F_HIDDEN_RARE_CANDY + bg_event 17, 1, BGEVENT_ITEM + MAX_POTION, EVENT_ROCKET_HIDEOUT_B4F_HIDDEN_MAX_POTION def_object_events object_event 17, 3, SPRITE_CANDELA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, (1 << EVE) | (1 << NITE), 0, OBJECTTYPE_SCRIPT, 0, RocketHideoutB4FCandelaScript, -1 @@ -27,9 +27,9 @@ RocketHideoutB4F_MapScriptHeader: object_event 15, 12, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, RocketHideoutB4FTeacherSerena, -1 object_event 18, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, RocketHideoutB4FSuperNerdTheo, -1 keyitemball_event 2, 2, LIFT_KEY, EVENT_PICKED_UP_LIFT_KEY_FROM_ROCKET_HIDEOUT_B4F - itemball_event 1, 4, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_1_FROM_ROCKET_HIDEOUT_B4F - itemball_event 2, 12, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_2_FROM_ROCKET_HIDEOUT_B4F - itemball_event 4, 20, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_3_FROM_ROCKET_HIDEOUT_B4F + itemball_event 1, 4, X_SP_ATK, 1, EVENT_PICKED_UP_X_SP_ATK_FROM_ROCKET_HIDEOUT_B4F + itemball_event 2, 12, PP_UP, 1, EVENT_PICKED_UP_PP_UP_FROM_ROCKET_HIDEOUT_B4F + itemball_event 4, 20, DUBIOUS_DISC, 1, EVENT_PICKED_UP_DUBIOUS_DISC_FROM_ROCKET_HIDEOUT_B4F object_const_def const ROCKETHIDEOUTB4F_CANDELA @@ -117,9 +117,9 @@ RocketHideoutB4FMeetLeadersScript: .CandelaIntro1Text: - text "Candela: I am" - line "telling you, pure" - cont "power wins!" + text "Candela: I'm tell-" + line "ing you, raw power" + cont "wins every time!" para "Training should be" line "tough, like a" @@ -127,9 +127,9 @@ RocketHideoutB4FMeetLeadersScript: done .BlancheIntro1Text: - text "Blanche: Reckless" - line "power is pointless" - cont "without strategy." + text "Blanche: Strength" + line "is pointless with-" + cont "out strategy." para "Smart planning" line "wins, every time." @@ -146,8 +146,8 @@ RocketHideoutB4FMeetLeadersScript: .CandelaIntro2Text: text "Candela: Instinct?" - line "That's just" - cont "guesswork!" + line "That's just guess-" + cont "work!" para "Real trainers rely" line "on strength!" @@ -415,18 +415,17 @@ RocketHideoutB4FYoungsterRoryScript: end .GreetingText - text "Firepower is key" - line "for Valor." + text "Team Valor is…" - para "No strategy, no" - line "guesswork-just" - cont "force!" + para "Wait--no!" + + para "I mean, I think" + line "I'm lost!" done .BeatenText: - text "Looks like your" - line "fire burned" - cont "brighter today." + text "Which way was" + line "the elevator?" done .AfterText: @@ -469,17 +468,15 @@ RocketHideoutB4FTeacherSerena: done .SeenText: - text "A calm mind and" - line "thoughtful action-" - - para "That's the Mystic" - line "way. Let me teach" - cont "you." + text "Let me see if you" + line "are smart enough" + + para "to take on the" + line "leaders!" done .BeatenText: - text "Blanche my" - line "lessons failed me!" + text "Class dismissed!" done RocketHideoutB4FSuperNerdTheo: @@ -507,21 +504,16 @@ RocketHideoutB4FSuperNerdTheo: text "The leaders argue" line "a lot, but they" cont "are good friends." - - para "We all here to" - line "have fun and" - cont "hang out." done .SeenText: - text "Instinct is about" - line "making fast moves." + text "You here to chal-" + line "lenge the leaders?" - para "React or lose-" - line "simple." + para "You need to beat" + line "me first!" done .BeatenText: - text "You reacted too" - line "fast for me!" + text "I choked!" done From 7722c5900b5acbd1dbf58b3976ccd27a44b4c7a1 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Sat, 28 Dec 2024 16:59:08 -0600 Subject: [PATCH 03/10] Some Rockethideout name changes & Dialogue adjustments --- constants/event_flags.asm | 4 ++-- constants/trainer_constants.asm | 4 ++-- data/trainers/parties.asm | 6 +++--- maps/RocketHideoutB1F.asm | 26 +++++++++++++------------- maps/RocketHideoutB2F.asm | 9 +++++---- maps/RocketHideoutB3F.asm | 2 +- maps/RocketHideoutB4F.asm | 2 +- 7 files changed, 27 insertions(+), 26 deletions(-) diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 7781d154e9..79ff32459e 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -2407,14 +2407,14 @@ const EVENT_GOT_LOADED_DICE_FROM_GOLDENROD const EVENT_LISTENED_TO_BATON_PASS_INTRO const EVENT_BEAT_BLACK_BELT_KAI - const EVENT_BEAT_SCIENTIST_LYSANDER + const EVENT_BEAT_SCIENTIST_SANDERS const EVENT_BEAT_PICNICKER_ZANE const EVENT_BEAT_BATTLE_GIRL_SASHA const EVENT_BEAT_LASS_PIPER const EVENT_PICKED_UP_MOON_STONE_FROM_ROCKET_HIDEOUT_B1F const EVENT_PICKED_UP_ZINC_FROM_ROCKET_HIDEOUT_B1F const EVENT_ROCKET_HIDEOUT_B1F_HIDDEN_MAX_REVIVE - const EVENT_BEAT_HEX_MANIAC_CORINNE + const EVENT_BEAT_HEX_MANIAC_CORYN const EVENT_PICKED_UP_ULTRA_BALL_FROM_ROCKET_HIDEOUT_B2F const EVENT_PICKED_UP_SUPER_REPEL_FROM_ROCKET_HIDEOUT_B2F const EVENT_PICKED_UP_NUGGET_FROM_ROCKET_HIDEOUT_B2F diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 7e94be076b..4da8a5a584 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -584,7 +584,7 @@ DEF CRYS EQU __trainer_class__ const ESTHER const MATILDA const BETHANY - const CORINNE + const CORYN trainerclass SAGE ; 3c const CHOW @@ -799,7 +799,7 @@ DEF CRYS EQU __trainer_class__ const JOSEPH const NIGEL const PIOTR - const LYSANDER + const SANDERS trainerclass ROCKET_SCIENTIST ; 55 const ROSS diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 7622abd00a..83f9558145 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -6281,7 +6281,7 @@ HexManiacGroup: db -1 ; end ; HEX_MANIAC - db "Corinne@" + db "Coryn@" db TRAINERTYPE_NORMAL ; party dbp 53, MISMAGIUS @@ -7824,7 +7824,7 @@ ScientistGroup: db -1 ; end ; SCIENTIST - db "Lysander@" + db "Sanders@" db TRAINERTYPE_NORMAL ; party dbp 52, ALAKAZAM @@ -8208,7 +8208,7 @@ BattleGirlGroup: db TRAINERTYPE_NORMAL ; party dbp 52, PRIMEAPE - dbp 55, TYPHLOSION, HISUIAN_FORM + dbp 55, TYPHLOSION dbp 54, RAPIDASH db -1 ; end diff --git a/maps/RocketHideoutB1F.asm b/maps/RocketHideoutB1F.asm index 3551b009f0..7b5ed9bbd6 100644 --- a/maps/RocketHideoutB1F.asm +++ b/maps/RocketHideoutB1F.asm @@ -18,7 +18,7 @@ RocketHideoutB1F_MapScriptHeader: def_object_events object_event 20, 18, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, RocketHideoutB1FBlackBeltKai, -1 - object_event 4, 6, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 4, RocketHideoutB1FScientistLysander, -1 + object_event 4, 6, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 4, RocketHideoutB1FScientistSanders, -1 object_event 18, 8, SPRITE_PICNICKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 1, RocketHideoutB1FPicnickerZane, -1 object_event 10, 17, SPRITE_BATTLE_GIRL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 4, RocketHideoutB1FBattleGirlSasha, -1 object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 3, RocketHideoutB1FLassPiper, -1 @@ -41,10 +41,10 @@ RocketHideoutB1FBlackBeltKai: jumpthistextfaceplayer .SeenText: - text "In Valor, we push" - line "limits." + text "In Team Valor, we" + line "push our limits." - para "Strength in all" + para "Strength is all" line "that matters!" done @@ -62,12 +62,12 @@ RocketHideoutB1FBlackBeltKai: done .BeatenText: - text "You're strength is" + text "Your strength is" line "superior…" done -RocketHideoutB1FScientistLysander: - generictrainer SCIENTIST, LYSANDER, EVENT_BEAT_SCIENTIST_LYSANDER, .SeenText, .BeatenText +RocketHideoutB1FScientistSanders: + generictrainer SCIENTIST, SANDERS, EVENT_BEAT_SCIENTIST_SANDERS, .SeenText, .BeatenText text "Leader Blanche ex-" line "cels in strategy." @@ -77,15 +77,15 @@ RocketHideoutB1FScientistLysander: done .SeenText: - text "Mystic values" - line "strategy." + text "Team Mystic" + line "values strategy." para "Only a strong mind" line "could win here." done .BeatenText: - text "You're tactics are" + text "Your tactics are" line "flawless!" done @@ -110,7 +110,7 @@ RocketHideoutB1FPicnickerZane: .BeatenText: text "You've got that" - line "'spark', alright." + line "“spark”, alright." para "Keep it alive!" done @@ -137,7 +137,7 @@ RocketHideoutB1FBattleGirlSasha: done .BeatenText: - text "You're flame…" + text "Your flame…" line "Too bright!" done @@ -162,4 +162,4 @@ RocketHideoutB1FLassPiper: text "I guess your in-" line "stinct is better" cont "than mine." - done \ No newline at end of file + done diff --git a/maps/RocketHideoutB2F.asm b/maps/RocketHideoutB2F.asm index 9b7a093e44..f67f7b67db 100644 --- a/maps/RocketHideoutB2F.asm +++ b/maps/RocketHideoutB2F.asm @@ -15,14 +15,14 @@ RocketHideoutB2F_MapScriptHeader: def_bg_events def_object_events - object_event 20, 6, SPRITE_HEX_MANIAC, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 2, RocketHideoutB2FHexManiacCorinne, -1 + object_event 20, 6, SPRITE_HEX_MANIAC, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 2, RocketHideoutB2FHexManiacCoryn, -1 itemball_event 16, 2, ULTRA_BALL, 1, EVENT_PICKED_UP_ULTRA_BALL_FROM_ROCKET_HIDEOUT_B2F itemball_event 1, 5, SUPER_REPEL, 1, EVENT_PICKED_UP_SUPER_REPEL_FROM_ROCKET_HIDEOUT_B2F itemball_event 6, 6, NUGGET, 1, EVENT_PICKED_UP_NUGGET_FROM_ROCKET_HIDEOUT_B2F itemball_event 3, 15, RARE_CANDY, 1, EVENT_PICKED_UP_RARE_CANDY_FROM_ROCKET_HIDEOUT_B2F -RocketHideoutB2FHexManiacCorinne: - generictrainer HEX_MANIAC, CORINNE, EVENT_BEAT_HEX_MANIAC_CORINNE, .SeenText, .BeatenText +RocketHideoutB2FHexManiacCoryn: + generictrainer HEX_MANIAC, CORYN, EVENT_BEAT_HEX_MANIAC_CORYN, .SeenText, .BeatenText text "Team Mystic could" line "use more talents" @@ -31,7 +31,8 @@ RocketHideoutB2FHexManiacCorinne: .SeenText: text "You might have" - line "potential" + line "potential for" + cont "Team Mystic." para "Let me test your" line "limits." diff --git a/maps/RocketHideoutB3F.asm b/maps/RocketHideoutB3F.asm index 2c838f5981..e5aac57710 100644 --- a/maps/RocketHideoutB3F.asm +++ b/maps/RocketHideoutB3F.asm @@ -60,4 +60,4 @@ RocketHideoutB3FCoolDudeGideon: .BeatenText: text "My judgement was" line "flawed…" - done \ No newline at end of file + done diff --git a/maps/RocketHideoutB4F.asm b/maps/RocketHideoutB4F.asm index ad73376753..71e4ce868e 100644 --- a/maps/RocketHideoutB4F.asm +++ b/maps/RocketHideoutB4F.asm @@ -282,7 +282,7 @@ RocketHideoutB4FCandelaScript: .GreetingText: text "Candela: Ready to" - line "text your strength?" + line "test your strength?" done .SeenText: From c99f6cd3b4a611e84c85d79d3ddfb847d8418901 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Sat, 28 Dec 2024 17:42:12 -0600 Subject: [PATCH 04/10] Don't duplicated pGO hideout names; replace with placeholders --- constants/event_flags.asm | 10 +++++----- constants/trainer_constants.asm | 20 ++++++++++---------- data/trainers/parties.asm | 10 +++++----- maps/LakeOfRage.asm | 2 +- maps/RocketHideoutB1F.asm | 16 ++++++++-------- maps/RocketHideoutB3F.asm | 12 ++++++------ maps/RocketHideoutB4F.asm | 18 +++++++++--------- maps/Route13East.asm | 2 +- maps/Route21.asm | 2 +- maps/SafariZoneHub.asm | 2 +- maps/UnionCaveB1FSouth.asm | 2 +- 11 files changed, 48 insertions(+), 48 deletions(-) diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 79ff32459e..04d4fc77c0 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -2406,11 +2406,11 @@ const EVENT_UNION_CAVE_B2F_LINKING_CORD const EVENT_GOT_LOADED_DICE_FROM_GOLDENROD const EVENT_LISTENED_TO_BATON_PASS_INTRO - const EVENT_BEAT_BLACK_BELT_KAI + const EVENT_BEAT_BLACK_BELT_VALOR_GRUNT_1 const EVENT_BEAT_SCIENTIST_SANDERS const EVENT_BEAT_PICNICKER_ZANE const EVENT_BEAT_BATTLE_GIRL_SASHA - const EVENT_BEAT_LASS_PIPER + const EVENT_BEAT_LASS_INSTINCT_GRUNT_1 const EVENT_PICKED_UP_MOON_STONE_FROM_ROCKET_HIDEOUT_B1F const EVENT_PICKED_UP_ZINC_FROM_ROCKET_HIDEOUT_B1F const EVENT_ROCKET_HIDEOUT_B1F_HIDDEN_MAX_REVIVE @@ -2419,12 +2419,12 @@ const EVENT_PICKED_UP_SUPER_REPEL_FROM_ROCKET_HIDEOUT_B2F const EVENT_PICKED_UP_NUGGET_FROM_ROCKET_HIDEOUT_B2F const EVENT_PICKED_UP_RARE_CANDY_FROM_ROCKET_HIDEOUT_B2F - const EVENT_BEAT_COSPLAYER_AARON - const EVENT_BEAT_COOL_DUDE_GIDEON + const EVENT_BEAT_COSPLAYER_INSTINCT_GRUNT_2 + const EVENT_BEAT_COOL_DUDE_MYSTIC_GRUNT_1 const EVENT_PICKED_UP_CARBOS_FROM_ROCKET_HIDEOUT_B3F const EVENT_PICKED_UP_ELIXIR_FROM_ROCKET_HIDEOUT_B3F const EVENT_ROCKET_HIDEOUT_B3F_HIDDEN_FULL_HEAL - const EVENT_BEAT_YOUNGSTER_RORY + const EVENT_BEAT_YOUNGSTER_VALOR_GRUNT_2 const EVENT_PICKED_UP_LIFT_KEY_FROM_ROCKET_HIDEOUT_B4F const EVENT_BEAT_TEACHER_SERENA const EVENT_BEAT_SUPER_NERD_THEO diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 4da8a5a584..ea97bbfe75 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -137,7 +137,7 @@ DEF CRYS EQU __trainer_class__ const OLIVER const CHAZ const TYLER - const RORY2 + const VALOR_GRUNT_2 trainerclass BUG_CATCHER ; 21 const WADE1 @@ -210,7 +210,7 @@ DEF CRYS EQU __trainer_class__ const EDNA const TANYA const LILY - const PIPER1 + const PIPER const GINGER const CHEYENNE const ADRIAN @@ -265,7 +265,7 @@ DEF CRYS EQU __trainer_class__ const KYLER const MURPHY const LIAM - const GIDEON1 + const GIDEON const HALL const DALLAS @@ -408,7 +408,7 @@ DEF CRYS EQU __trainer_class__ const CHLOE const BROOKE const KUROKO - const AARON2 + const INSTINCT_GRUNT_2 trainerclass SUPER_NERD ; 31 const STAN @@ -426,7 +426,7 @@ DEF CRYS EQU __trainer_class__ const LUIS const JOVAN const MIGUEL - const RORY1 + const RORY const GREGG const FOOTE const DAVE @@ -457,7 +457,7 @@ DEF CRYS EQU __trainer_class__ const GINA const ALICE const DUPLICA - const PIPER2 + const INSTINCT_GRUNT_1 trainerclass BEAUTY ; 33 const VICTORIA @@ -489,7 +489,7 @@ DEF CRYS EQU __trainer_class__ const ROBBY const PIERRE const DYLAN - const KAI1 + const KAI trainerclass RUIN_MANIAC ; 35 const JONES @@ -837,7 +837,7 @@ DEF CRYS EQU __trainer_class__ const MANFORD const ANDER const TAKEO - const KAI2 + const VALOR_GRUNT_1 trainerclass BATTLE_GIRL ; 59 const SUBARU @@ -962,7 +962,7 @@ DEF CRYS EQU __trainer_class__ const GAVEN2 const GAVEN3 const NICK - const AARON1 + const AARON const CODY const MIKE const RYAN @@ -980,7 +980,7 @@ DEF CRYS EQU __trainer_class__ const COOLTRAINERM_COREY const COOLTRAINERM_RAYMOND const FERGUS - const GIDEON2 + const MYSTIC_GRUNT_1 trainerclass COOLTRAINERF ; 6b const BETH1 diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 83f9558145..a6dcbaafb9 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -2366,7 +2366,7 @@ YoungsterGroup: db -1 ; end ; YOUNGSTER - db "Rory@" + db "VGrunt2@" ; TODO: replace placeholder name db TRAINERTYPE_NORMAL ; party dbp 55, FLAREON @@ -4852,7 +4852,7 @@ CosplayerGroup: db -1 ; end ; COSPLAYER - db "Aaron@" + db "IGrunt2@" ; TODO: replace placeholder name db TRAINERTYPE_NORMAL ; party dbp 54, LANTURN @@ -5269,7 +5269,7 @@ endc db -1 ; end ; LASS - db "Piper@" + db "IGrunt1@" ; TODO: replace placeholder name db TRAINERTYPE_NORMAL ; party dbp 55, TOGEKISS @@ -8126,7 +8126,7 @@ BlackbeltGroup: db -1 ; end ; BLACKBELT_T - db "Kai@" + db "VGrunt1@" ; TODO: replace placeholder name db TRAINERTYPE_NORMAL ; party dbp 54, MAGMORTAR @@ -9248,7 +9248,7 @@ CooltrainerMGroup: db -1 ; end ; COOLTRAINERM - db "Gideon@" + db "MGrunt1@" ; TODO: replace placeholder name db TRAINERTYPE_NORMAL ; party dbp 54, PORYGON_Z diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 1dfd0b5099..1e558053ec 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -326,7 +326,7 @@ WesleyScript: done GenericTrainerCooltrainermAaron: - generictrainer COOLTRAINERM, AARON1, EVENT_BEAT_COOLTRAINERM_AARON, .SeenText, .BeatenText + generictrainer COOLTRAINERM, AARON, EVENT_BEAT_COOLTRAINERM_AARON, .SeenText, .BeatenText text "#mon and their" line "trainer become" diff --git a/maps/RocketHideoutB1F.asm b/maps/RocketHideoutB1F.asm index 7b5ed9bbd6..2a1ddeedb4 100644 --- a/maps/RocketHideoutB1F.asm +++ b/maps/RocketHideoutB1F.asm @@ -17,26 +17,26 @@ RocketHideoutB1F_MapScriptHeader: bg_event 13, 15, BGEVENT_ITEM + MAX_REVIVE, EVENT_ROCKET_HIDEOUT_B1F_HIDDEN_MAX_REVIVE def_object_events - object_event 20, 18, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, RocketHideoutB1FBlackBeltKai, -1 + object_event 20, 18, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, RocketHideoutB1FBlackBeltValorGrunt1, -1 object_event 4, 6, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 4, RocketHideoutB1FScientistSanders, -1 object_event 18, 8, SPRITE_PICNICKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 1, RocketHideoutB1FPicnickerZane, -1 object_event 10, 17, SPRITE_BATTLE_GIRL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 4, RocketHideoutB1FBattleGirlSasha, -1 - object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 3, RocketHideoutB1FLassPiper, -1 + object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 3, RocketHideoutB1FLassInstinctGrunt1, -1 itemball_event 1, 17, MOON_STONE, 1, EVENT_PICKED_UP_MOON_STONE_FROM_ROCKET_HIDEOUT_B1F itemball_event 3, 14, ZINC, 1, EVENT_PICKED_UP_ZINC_FROM_ROCKET_HIDEOUT_B1F RocketHideoutB1FDoorScript: - checkevent EVENT_BEAT_BLACK_BELT_KAI + checkevent EVENT_BEAT_BLACK_BELT_VALOR_GRUNT_1 iftruefwd .DoorOpen changeblock 16, 16, $13 .DoorOpen endcallback -RocketHideoutB1FBlackBeltKai: - trainer BLACKBELT_T, KAI2, EVENT_BEAT_BLACK_BELT_KAI, .SeenText, .AfterText, 0, .BeatenText +RocketHideoutB1FBlackBeltValorGrunt1: + trainer BLACKBELT_T, VALOR_GRUNT_1, EVENT_BEAT_BLACK_BELT_VALOR_GRUNT_1, .SeenText, .AfterText, 0, .BeatenText .Script: - checkevent EVENT_BEAT_BLACK_BELT_KAI + checkevent EVENT_BEAT_BLACK_BELT_VALOR_GRUNT_1 iftruefwd .AfterScript jumpthistextfaceplayer @@ -141,8 +141,8 @@ RocketHideoutB1FBattleGirlSasha: line "Too bright!" done -RocketHideoutB1FLassPiper: - generictrainer LASS, PIPER2, EVENT_BEAT_LASS_PIPER, .SeenText, .BeatenText +RocketHideoutB1FLassInstinctGrunt1: + generictrainer LASS, INSTINCT_GRUNT_1, EVENT_BEAT_LASS_INSTINCT_GRUNT_1, .SeenText, .BeatenText text "Spark's battles" line "are unpredictable." diff --git a/maps/RocketHideoutB3F.asm b/maps/RocketHideoutB3F.asm index e5aac57710..0cadf75679 100644 --- a/maps/RocketHideoutB3F.asm +++ b/maps/RocketHideoutB3F.asm @@ -13,13 +13,13 @@ RocketHideoutB3F_MapScriptHeader: bg_event 19, 13, BGEVENT_ITEM + FULL_HEAL, EVENT_ROCKET_HIDEOUT_B3F_HIDDEN_FULL_HEAL def_object_events - object_event 18, 8, SPRITE_COSPLAYER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 3, RocketHideoutB3FCosplayerAaron, -1 - object_event 2, 18, SPRITE_COOL_DUDE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 3, RocketHideoutB3FCoolDudeGideon, -1 + object_event 18, 8, SPRITE_COSPLAYER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 3, RocketHideoutB3FCosplayerInstinctGrunt2, -1 + object_event 2, 18, SPRITE_COOL_DUDE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 3, RocketHideoutB3FCoolDudeMysticGrunt1, -1 itemball_event 12, 10, CARBOS, 1, EVENT_PICKED_UP_CARBOS_FROM_ROCKET_HIDEOUT_B3F itemball_event 18, 13, ELIXIR, 1, EVENT_PICKED_UP_ELIXIR_FROM_ROCKET_HIDEOUT_B3F -RocketHideoutB3FCosplayerAaron: - generictrainer COSPLAYER, AARON2, EVENT_BEAT_COSPLAYER_AARON, .SeenText, .BeatenText +RocketHideoutB3FCosplayerInstinctGrunt2: + generictrainer COSPLAYER, INSTINCT_GRUNT_2, EVENT_BEAT_COSPLAYER_INSTINCT_GRUNT_2, .SeenText, .BeatenText text "Leader Spark's" line "energy is high!" @@ -40,8 +40,8 @@ RocketHideoutB3FCosplayerAaron: text "Can't keep up!" done -RocketHideoutB3FCoolDudeGideon: - generictrainer COOLTRAINERM, GIDEON2, EVENT_BEAT_COOL_DUDE_GIDEON, .SeenText, .BeatenText +RocketHideoutB3FCoolDudeMysticGrunt1: + generictrainer COOLTRAINERM, MYSTIC_GRUNT_1, EVENT_BEAT_COOL_DUDE_MYSTIC_GRUNT_1, .SeenText, .BeatenText text "Leader Blanche ex-" line "pects no less than" diff --git a/maps/RocketHideoutB4F.asm b/maps/RocketHideoutB4F.asm index 71e4ce868e..997eaf87aa 100644 --- a/maps/RocketHideoutB4F.asm +++ b/maps/RocketHideoutB4F.asm @@ -23,7 +23,7 @@ RocketHideoutB4F_MapScriptHeader: object_event 17, 3, SPRITE_CANDELA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, (1 << EVE) | (1 << NITE), 0, OBJECTTYPE_SCRIPT, 0, RocketHideoutB4FCandelaScript, -1 object_event 16, 6, SPRITE_SPARK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, (1 << EVE) | (1 << NITE), 0, OBJECTTYPE_SCRIPT, 0, RocketHideoutB4FSparkScript, -1 object_event 19, 6, SPRITE_BLANCHE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, (1 << EVE) | (1 << NITE), 0, OBJECTTYPE_SCRIPT, 0, RocketHideoutB4FBlancheScript, -1 - object_event 3, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketHideoutB4FYoungsterRoryScript, -1 + object_event 3, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketHideoutB4FYoungsterValorGrunt2Script, -1 object_event 15, 12, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, RocketHideoutB4FTeacherSerena, -1 object_event 18, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, RocketHideoutB4FSuperNerdTheo, -1 keyitemball_event 2, 2, LIFT_KEY, EVENT_PICKED_UP_LIFT_KEY_FROM_ROCKET_HIDEOUT_B4F @@ -35,7 +35,7 @@ RocketHideoutB4F_MapScriptHeader: const ROCKETHIDEOUTB4F_CANDELA const ROCKETHIDEOUTB4F_SPARK const ROCKETHIDEOUTB4F_BLANCHE - const ROCKETHIDEOUTB4F_YOUNGSTER_RORY + const ROCKETHIDEOUTB4F_YOUNGSTER_VALOR_GRUNT_2 const ROCKETHIDEOUTB4F_TEACHER_SERENA const ROCKETHIDEOUTB4F_SUPER_NERD_THEO const ROCKETHIDEOUTB4F_LIFT_KEY @@ -55,7 +55,7 @@ RocketHideoutB4FDoorScript: endcallback RocketHideoutB4FLiftKeyScript: - checkevent EVENT_BEAT_YOUNGSTER_RORY + checkevent EVENT_BEAT_YOUNGSTER_VALOR_GRUNT_2 iftruefwd .beat_rory disappear ROCKETHIDEOUTB4F_LIFT_KEY endcallback @@ -391,22 +391,22 @@ RocketHideoutB4FBlancheScript: cont "ahead." done -RocketHideoutB4FYoungsterRoryScript: +RocketHideoutB4FYoungsterValorGrunt2Script: faceplayer - checkevent EVENT_BEAT_YOUNGSTER_RORY + checkevent EVENT_BEAT_YOUNGSTER_VALOR_GRUNT_2 iftruefwd .AfterBattle opentext writetext .GreetingText closetext winlosstext .BeatenText, 0 - loadtrainer YOUNGSTER, RORY2 + loadtrainer YOUNGSTER, VALOR_GRUNT_2 startbattle reloadmapafterbattle - setevent EVENT_BEAT_YOUNGSTER_RORY + setevent EVENT_BEAT_YOUNGSTER_VALOR_GRUNT_2 readvar VAR_FACING - ifnotequal RIGHT, .NotLeftOfRory + ifnotequal RIGHT, .NotLeftOfValorGrunt2 moveobject ROCKETHIDEOUTB4F_LIFT_KEY, 4, 2 -.NotLeftOfRory +.NotLeftOfValorGrunt2 appear ROCKETHIDEOUTB4F_LIFT_KEY .AfterBattle opentext diff --git a/maps/Route13East.asm b/maps/Route13East.asm index ff6e399bed..5671e9855a 100644 --- a/maps/Route13East.asm +++ b/maps/Route13East.asm @@ -83,7 +83,7 @@ GenericTrainerCamperTanner: done GenericTrainerPicnickerPiper: - generictrainer PICNICKER, PIPER1, EVENT_BEAT_PICNICKER_PIPER, .SeenText, .BeatenText + generictrainer PICNICKER, PIPER, EVENT_BEAT_PICNICKER_PIPER, .SeenText, .BeatenText text "The way you were" line "walking made me" diff --git a/maps/Route21.asm b/maps/Route21.asm index 9c9ad1e03d..2903ebd15c 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -210,7 +210,7 @@ GenericTrainerFisherLiam: done GenericTrainerFisherGideon: - generictrainer FISHER, GIDEON1, EVENT_BEAT_FISHER_GIDEON, .SeenText, .BeatenText + generictrainer FISHER, GIDEON, EVENT_BEAT_FISHER_GIDEON, .SeenText, .BeatenText text "What's the reason" line "you became a" diff --git a/maps/SafariZoneHub.asm b/maps/SafariZoneHub.asm index 8ce5d51977..17f0bd1397 100644 --- a/maps/SafariZoneHub.asm +++ b/maps/SafariZoneHub.asm @@ -26,7 +26,7 @@ SafariZoneHub_MapScriptHeader: itemball_event 8, 21, ULTRA_BALL, 1, EVENT_SAFARI_ZONE_HUB_ULTRA_BALL GenericTrainerBug_maniacKai: - generictrainer BUG_MANIAC, KAI1, EVENT_BEAT_BUG_MANIAC_KAI, Bug_maniacKaiSeenText, Bug_maniacKaiBeatenText + generictrainer BUG_MANIAC, KAI, EVENT_BEAT_BUG_MANIAC_KAI, Bug_maniacKaiSeenText, Bug_maniacKaiBeatenText text "Venonat is so" line "similar to" diff --git a/maps/UnionCaveB1FSouth.asm b/maps/UnionCaveB1FSouth.asm index 56251592f6..364e6ce2e7 100644 --- a/maps/UnionCaveB1FSouth.asm +++ b/maps/UnionCaveB1FSouth.asm @@ -150,7 +150,7 @@ GenericTrainerFirebreatherJay: done GenericTrainerSuper_nerdRory: - generictrainer SUPER_NERD, RORY1, EVENT_BEAT_SUPER_NERD_RORY, .SeenText, .BeatenText + generictrainer SUPER_NERD, RORY, EVENT_BEAT_SUPER_NERD_RORY, .SeenText, .BeatenText text "A jiffy is the" line "scientific name" From 6ec86912b59ff8364ea22465f6a423cdbed31069 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Sat, 28 Dec 2024 17:49:17 -0600 Subject: [PATCH 05/10] Missed a placeholder name --- constants/event_flags.asm | 2 +- constants/trainer_constants.asm | 4 ++-- data/trainers/parties.asm | 2 +- maps/OlivineLighthouse3F.asm | 2 +- maps/RocketHideoutB4F.asm | 14 +++++++------- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 04d4fc77c0..7b613690b7 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -2427,7 +2427,7 @@ const EVENT_BEAT_YOUNGSTER_VALOR_GRUNT_2 const EVENT_PICKED_UP_LIFT_KEY_FROM_ROCKET_HIDEOUT_B4F const EVENT_BEAT_TEACHER_SERENA - const EVENT_BEAT_SUPER_NERD_THEO + const EVENT_BEAT_SUPER_NERD_INSTINCT_GRUNT_3 const EVENT_ROCKET_HIDEOUT_B4F_HIDDEN_MAX_POTION const EVENT_PICKED_UP_X_SP_ATK_FROM_ROCKET_HIDEOUT_B4F const EVENT_PICKED_UP_PP_UP_FROM_ROCKET_HIDEOUT_B4F diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index ea97bbfe75..f3f2dcd926 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -278,7 +278,7 @@ DEF CRYS EQU __trainer_class__ const JOSE3 const ROD const ABE - const THEO1 + const THEO const TOBY const DENIS const HANK @@ -431,7 +431,7 @@ DEF CRYS EQU __trainer_class__ const FOOTE const DAVE const KOUTA - const THEO2 + const INSTINCT_GRUNT_3 trainerclass LASS ; 32 const DANA1 diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index a6dcbaafb9..304afa053e 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -5029,7 +5029,7 @@ SuperNerdGroup: db -1 ; end ; SUPER_NERD - db "Theo@" + db "IGrunt3@" ; TODO: replace placeholder name db TRAINERTYPE_NORMAL ; party dbp 54, ELECTRODE diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 2e40d41d6a..d824cdaed1 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -144,7 +144,7 @@ OlivineLighthouse3FBattleGirlEmy: done TrainerBird_keeperTheo: - trainer BIRD_KEEPER, THEO1, EVENT_BEAT_BIRD_KEEPER_THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, Bird_keeperTheoScript + trainer BIRD_KEEPER, THEO, EVENT_BEAT_BIRD_KEEPER_THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, Bird_keeperTheoScript Bird_keeperTheoScript: endifjustbattled diff --git a/maps/RocketHideoutB4F.asm b/maps/RocketHideoutB4F.asm index 997eaf87aa..8ab6b6e997 100644 --- a/maps/RocketHideoutB4F.asm +++ b/maps/RocketHideoutB4F.asm @@ -25,7 +25,7 @@ RocketHideoutB4F_MapScriptHeader: object_event 19, 6, SPRITE_BLANCHE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, (1 << EVE) | (1 << NITE), 0, OBJECTTYPE_SCRIPT, 0, RocketHideoutB4FBlancheScript, -1 object_event 3, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketHideoutB4FYoungsterValorGrunt2Script, -1 object_event 15, 12, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, RocketHideoutB4FTeacherSerena, -1 - object_event 18, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, RocketHideoutB4FSuperNerdTheo, -1 + object_event 18, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, RocketHideoutB4FSuperNerdInstinctGrunt3, -1 keyitemball_event 2, 2, LIFT_KEY, EVENT_PICKED_UP_LIFT_KEY_FROM_ROCKET_HIDEOUT_B4F itemball_event 1, 4, X_SP_ATK, 1, EVENT_PICKED_UP_X_SP_ATK_FROM_ROCKET_HIDEOUT_B4F itemball_event 2, 12, PP_UP, 1, EVENT_PICKED_UP_PP_UP_FROM_ROCKET_HIDEOUT_B4F @@ -37,7 +37,7 @@ RocketHideoutB4F_MapScriptHeader: const ROCKETHIDEOUTB4F_BLANCHE const ROCKETHIDEOUTB4F_YOUNGSTER_VALOR_GRUNT_2 const ROCKETHIDEOUTB4F_TEACHER_SERENA - const ROCKETHIDEOUTB4F_SUPER_NERD_THEO + const ROCKETHIDEOUTB4F_SUPER_NERD_INSTINCT_GRUNT_3 const ROCKETHIDEOUTB4F_LIFT_KEY RocketHideoutB4FDoorScript: @@ -46,7 +46,7 @@ RocketHideoutB4FDoorScript: changeblock 16, 10, $69 endcallback .beat_serena - checkevent EVENT_BEAT_SUPER_NERD_THEO + checkevent EVENT_BEAT_SUPER_NERD_INSTINCT_GRUNT_3 iftruefwd .beat_theo changeblock 16, 10, $69 endcallback @@ -445,7 +445,7 @@ RocketHideoutB4FTeacherSerena: jumpthistextfaceplayer .AfterScript - checkevent EVENT_BEAT_SUPER_NERD_THEO + checkevent EVENT_BEAT_SUPER_NERD_INSTINCT_GRUNT_3 iftruefwd .OpenDoorScript endifjustbattled jumptextfaceplayer .AfterText @@ -479,11 +479,11 @@ RocketHideoutB4FTeacherSerena: text "Class dismissed!" done -RocketHideoutB4FSuperNerdTheo: - trainer SUPER_NERD, THEO2, EVENT_BEAT_SUPER_NERD_THEO, .SeenText, .AfterText, 0, .Script +RocketHideoutB4FSuperNerdInstinctGrunt3: + trainer SUPER_NERD, INSTINCT_GRUNT_3, EVENT_BEAT_SUPER_NERD_INSTINCT_GRUNT_3, .SeenText, .AfterText, 0, .Script .Script - checkevent EVENT_BEAT_SUPER_NERD_THEO + checkevent EVENT_BEAT_SUPER_NERD_INSTINCT_GRUNT_3 iftruefwd .AfterScript jumpthistextfaceplayer From a66ffd6068b6fa9851b8c59fdbb8e55b968883e8 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Sun, 29 Dec 2024 09:58:28 -0600 Subject: [PATCH 06/10] Add Lure Menu And setup basic Cherrygrove bay event --- constants/menu_constants.asm | 6 +++ engine/menus/lure_menu.asm | 99 ++++++++++++++++++++++++++++++++++++ main.asm | 5 ++ maps/CherrygroveBay.asm | 73 ++++++++++++++++++++++++++ maps/RocketHideoutB4F.asm | 6 +-- 5 files changed, 186 insertions(+), 3 deletions(-) create mode 100644 engine/menus/lure_menu.asm diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index 360de391a3..1fa7955640 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -109,3 +109,9 @@ DEF NUM_PARTYMENUACTIONS EQU const_value const NAME_TRENDY const NAME_BOX DEF NUM_NAME_TYPES EQU const_value + +; Lure Menu Options (see engine/menus/lure_menu.asm) + const_def 1 + const HARSH_LURE_MENU_OPT ; 1 + const POTENT_LURE_MENU_OPT ; 2 + const MALIGN_LURE_MENU_OPT ; 3 diff --git a/engine/menus/lure_menu.asm b/engine/menus/lure_menu.asm new file mode 100644 index 0000000000..319fccb8a2 --- /dev/null +++ b/engine/menus/lure_menu.asm @@ -0,0 +1,99 @@ + const_def + const HARSH_LURE_F ; 0 + const POTENT_LURE_F ; 1 + const MALIGN_LURE_F ; 2 + +CheckForLures: + xor a + ldh [hScriptVar], a + ld a, HARSH_LURE + ld [wCurKeyItem], a + call CheckKeyItem + jr nc, .no_harsh_lure + ld a, (1 << HARSH_LURE_F) + ldh [hScriptVar], a +.no_harsh_lure + ld a, POTENT_LURE + ld [wCurKeyItem], a + call CheckKeyItem + jr nc, .no_potent_lure + ld hl, hScriptVar + set POTENT_LURE_F, [hl] +.no_potent_lure + ld a, MALIGN_LURE + ld [wCurKeyItem], a + call CheckKeyItem + ret nc + ld hl, hScriptVar + set MALIGN_LURE_F, [hl] + ret + +SetUpLureMenu: + ldh a, [hScriptVar] + and a + ret z + ld [wWhichIndexSet], a + ld hl, .LureMenu + call LoadMenuHeader + call DoNthMenu + jr nc, .continue + xor a + ldh [hScriptVar], a + jmp ExitMenu +.continue + ld a, [wMenuSelection] + ldh [hScriptVar], a + jmp ExitMenu + +.LureMenu + db MENU_BACKUP_TILES | MENU_NO_CLICK_SFX + menu_coords 0, 0, 15, 12 + dw .MenuData + db 1 ; default option + +.MenuData + db $a0 ; flags + db 0 ; items + dw .WhichLures + dw PlaceMenuStrings + dw .MenuStrings + +.WhichLures + ; dummy for no lures + db 0 + db 0 + db -1 + + db 1 + db HARSH_LURE_MENU_OPT + db -1 + + db 1 + db POTENT_LURE_MENU_OPT + db -1 + + db 2 + db HARSH_LURE_MENU_OPT, POTENT_LURE_MENU_OPT + db -1 + + db 1 + db MALIGN_LURE_MENU_OPT + db -1 + + db 2 + db HARSH_LURE_MENU_OPT, MALIGN_LURE_MENU_OPT + db -1 + + db 2 + db POTENT_LURE_MENU_OPT, MALIGN_LURE_MENU_OPT + db -1 + + db 3 + db HARSH_LURE_MENU_OPT, POTENT_LURE_MENU_OPT, MALIGN_LURE_MENU_OPT + db -1 + +.MenuStrings + db "@" ; dummy string so we don't return 0 + db "Harsh Lure@" + db "Potent Lure@" + db "Malign Lure@" diff --git a/main.asm b/main.asm index a3cec0242e..7e830a9249 100644 --- a/main.asm +++ b/main.asm @@ -727,3 +727,8 @@ SECTION "Weather System", ROMX INCLUDE "engine/overworld/weather.asm" INCLUDE "engine/events/weather.asm" + + +SECTION "LureMenu", ROMX + +INCLUDE "engine/menus/lure_menu.asm" diff --git a/maps/CherrygroveBay.asm b/maps/CherrygroveBay.asm index 4cb1246cbf..3c5fac0fbc 100644 --- a/maps/CherrygroveBay.asm +++ b/maps/CherrygroveBay.asm @@ -11,6 +11,7 @@ CherrygroveBay_MapScriptHeader: def_bg_events bg_event 21, 21, BGEVENT_JUMPSTD, treegrotto, HIDDENGROTTO_CHERRYGROVE_BAY bg_event 22, 21, BGEVENT_JUMPSTD, treegrotto, HIDDENGROTTO_CHERRYGROVE_BAY + bg_event 11, 12, BGEVENT_READ, CherrygroveBayGalarianBirdsScript def_object_events object_event 9, 32, SPRITE_HIKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveBayHikerScript, -1 @@ -28,6 +29,78 @@ CherrygroveBay_MapScriptHeader: fruittree_event 15, 11, FRUITTREE_CHERRYGROVE_BAY_5, GREPA_BERRY, PAL_NPC_YELLOW fruittree_event 14, 13, FRUITTREE_CHERRYGROVE_BAY_6, TAMATO_BERRY, PAL_NPC_RED +CherrygroveBayGalarianBirdsScript: + callasm CheckForLures + iffalse_endtext ; User has no lures, do nothing + opentext + writetext .LikeToUseItemText + yesorno + iffalse_endtext + callasm CheckForLures + callasm SetUpLureMenu + iffalse_endtext ; User canceled the menu + ifequalfwd POTENT_LURE_MENU_OPT, .Galarian_Articuno + ifequalfwd MALIGN_LURE_MENU_OPT, .Galarian_Zapdos +; HARSH_LURE_MENU_OPT, .Galarian_Moltres + opentext + farwritetext MoltresText + cry MOLTRES + pause 15 + closetext + loadwildmon MOLTRES, GALARIAN_FORM, 65 + loadvar VAR_BATTLETYPE, BATTLETYPE_LEGENDARY + startbattle + ; disappear CHERRYGROVEBAY_GALARIAN_MOLTRES + ; setevent EVENT_CHERRYGROVE_BAY_MOLTRES + reloadmapafterbattle + special CheckBattleCaughtResult + iffalsefwd .NoCatchGalarianMoltres + ; setflag ENGINE_PLAYER_CAUGHT_GALARIAN_MOLTRES +.NoCatchGalarianMoltres + end + +.Galarian_Articuno + opentext + farwritetext ArticunoText + cry ARTICUNO + pause 15 + closetext + loadwildmon ARTICUNO, GALARIAN_FORM, 65 + loadvar VAR_BATTLETYPE, BATTLETYPE_LEGENDARY + startbattle + ; disappear CHERRYGROVEBAY_GALARIAN_ARTICUNO + ; setevent EVENT_CHERRYGROVE_BAY_ARTICUNO + reloadmapafterbattle + special CheckBattleCaughtResult + iffalsefwd .NoCatchGalarianArticuno + ; setflag ENGINE_PLAYER_CAUGHT_GALARIAN_ARTICUNO +.NoCatchGalarianArticuno + end + +.Galarian_Zapdos + opentext + farwritetext ZapdosText + cry ZAPDOS + pause 15 + closetext + loadwildmon ZAPDOS, GALARIAN_FORM, 65 + loadvar VAR_BATTLETYPE, BATTLETYPE_LEGENDARY + startbattle + ; disappear CHERRYGROVEBAY_GALARIAN_ZAPDOS + ; setevent EVENT_CHERRYGROVE_BAY_ZAPDOS + reloadmapafterbattle + special CheckBattleCaughtResult + iffalsefwd .NoCatchGalarianZapdos + ; setflag ENGINE_PLAYER_CAUGHT_GALARIAN_ZAPDOS +.NoCatchGalarianZapdos + end + +.LikeToUseItemText + text "Would you like to" + line "use a Lure on" + cont "the Cherry tree?" + done + CherrygroveBayHikerScript: faceplayer opentext diff --git a/maps/RocketHideoutB4F.asm b/maps/RocketHideoutB4F.asm index 8ab6b6e997..4ebc05a164 100644 --- a/maps/RocketHideoutB4F.asm +++ b/maps/RocketHideoutB4F.asm @@ -206,7 +206,7 @@ RocketHideoutB4FSparkScript: reloadmapafterbattle setevent EVENT_BEAT_SPARK showtext .AfterText1 - verbosegiveitem MALIGN_LURE + verbosegivekeyitem MALIGN_LURE showtext .AfterText2 end @@ -273,7 +273,7 @@ RocketHideoutB4FCandelaScript: reloadmapafterbattle setevent EVENT_BEAT_CANDELA showtext .AfterText1 - verbosegiveitem HARSH_LURE + verbosegivekeyitem HARSH_LURE showtext .AfterText2 end @@ -338,7 +338,7 @@ RocketHideoutB4FBlancheScript: reloadmapafterbattle setevent EVENT_BEAT_BLANCHE showtext .AfterText1 - verbosegiveitem POTENT_LURE + verbosegivekeyitem POTENT_LURE showtext .AfterText2 end From f76b03b6f28d7d64b3a867558669315a77cdbe06 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Sun, 29 Dec 2024 11:28:59 -0600 Subject: [PATCH 07/10] Add galar bird engine caught flags and event flags --- constants/engine_flags.asm | 3 +++ constants/event_flags.asm | 3 +++ constants/ram_constants.asm | 11 ++++++---- data/events/engine_flags.asm | 3 +++ engine/events/specials.asm | 20 +++++++++++++++++- maps/CherrygroveBay.asm | 39 ++++++++++++++++++++++++++++++------ 6 files changed, 68 insertions(+), 11 deletions(-) diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index d89dd57206..0de1395ca3 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -270,4 +270,7 @@ const ENGINE_PLAYER_CAUGHT_MEWTWO const ENGINE_PLAYER_CAUGHT_CELEBI const ENGINE_PLAYER_CAUGHT_SUDOWOODO + const ENGINE_PLAYER_CAUGHT_GALARIAN_ARTICUNO + const ENGINE_PLAYER_CAUGHT_GALARIAN_ZAPDOS + const ENGINE_PLAYER_CAUGHT_GALARIAN_MOLTRES DEF NUM_ENGINE_FLAGS EQU const_value diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 7b613690b7..69566f50f9 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -2432,6 +2432,9 @@ const EVENT_PICKED_UP_X_SP_ATK_FROM_ROCKET_HIDEOUT_B4F const EVENT_PICKED_UP_PP_UP_FROM_ROCKET_HIDEOUT_B4F const EVENT_PICKED_UP_DUBIOUS_DISC_FROM_ROCKET_HIDEOUT_B4F + const EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_ARTICUNO + const EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_ZAPDOS + const EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_MOLTRES const_next $8ff DEF NUM_EVENTS EQU const_value ; 2303 diff --git a/constants/ram_constants.asm b/constants/ram_constants.asm index 2350788c2d..05cda01f9b 100644 --- a/constants/ram_constants.asm +++ b/constants/ram_constants.asm @@ -491,10 +491,13 @@ DEF CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2 ; wPlayerCaught2:: const_def - const PLAYER_CAUGHT_MEW_F ; 0 - const PLAYER_CAUGHT_MEWTWO_F ; 1 - const PLAYER_CAUGHT_CELEBI_F ; 2 - const PLAYER_CAUGHT_SUDOWOODO_F ; 3 + const PLAYER_CAUGHT_MEW_F ; 0 + const PLAYER_CAUGHT_MEWTWO_F ; 1 + const PLAYER_CAUGHT_CELEBI_F ; 2 + const PLAYER_CAUGHT_SUDOWOODO_F ; 3 + const PLAYER_CAUGHT_GALARIAN_ARTICUNO_F ; 4 + const PLAYER_CAUGHT_GALARIAN_ZAPDOS_F ; 5 + const PLAYER_CAUGHT_GALARIAN_MOLTRES_F ; 6 DEF CAUGHT_DUO_MASK EQU (1 << PLAYER_CAUGHT_HO_OH_F) | (1 << PLAYER_CAUGHT_LUGIA_F) DEF CAUGHT_BEASTS_MASK EQU (1 << PLAYER_CAUGHT_RAIKOU_F) | (1 << PLAYER_CAUGHT_ENTEI_F) | (1 << PLAYER_CAUGHT_SUICUNE_F) diff --git a/data/events/engine_flags.asm b/data/events/engine_flags.asm index e322a37008..62982bcf10 100644 --- a/data/events/engine_flags.asm +++ b/data/events/engine_flags.asm @@ -287,5 +287,8 @@ EngineFlags: engine_flag wPlayerCaught2, PLAYER_CAUGHT_MEWTWO_F engine_flag wPlayerCaught2, PLAYER_CAUGHT_CELEBI_F engine_flag wPlayerCaught2, PLAYER_CAUGHT_SUDOWOODO_F + engine_flag wPlayerCaught2, PLAYER_CAUGHT_GALARIAN_ARTICUNO_F + engine_flag wPlayerCaught2, PLAYER_CAUGHT_GALARIAN_ZAPDOS_F + engine_flag wPlayerCaught2, PLAYER_CAUGHT_GALARIAN_MOLTRES_F assert_table_length NUM_ENGINE_FLAGS diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 90c3b1bd6d..e4b1160664 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -439,10 +439,28 @@ RespawnOneOffs: ld de, ENGINE_PLAYER_CAUGHT_HO_OH farcall EngineFlagAction - ret nz + jr nz, .CaughtHoOh eventflagreset EVENT_TIN_TOWER_ROOF_HO_OH eventflagreset EVENT_FOUGHT_HO_OH eventflagreset EVENT_EUSINES_HOUSE_EUSINE +.CaughtHoOh + + ld de, ENGINE_PLAYER_CAUGHT_GALARIAN_ARTICUNO + farcall EngineFlagAction + jr nz, .CaughtGalarianArticuno + eventflagreset EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_ARTICUNO +.CaughtGalarianArticuno + + ld de, ENGINE_PLAYER_CAUGHT_GALARIAN_ZAPDOS + farcall EngineFlagAction + jr nz, .CaughtGalarianZapdos + eventflagreset EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_ZAPDOS +.CaughtGalarianZapdos + + ld de, ENGINE_PLAYER_CAUGHT_GALARIAN_MOLTRES + farcall EngineFlagAction + ret nz + eventflagreset EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_MOLTRES ret RespawnRoamingRaikou: diff --git a/maps/CherrygroveBay.asm b/maps/CherrygroveBay.asm index 3c5fac0fbc..30d4b3dbaa 100644 --- a/maps/CherrygroveBay.asm +++ b/maps/CherrygroveBay.asm @@ -36,13 +36,17 @@ CherrygroveBayGalarianBirdsScript: writetext .LikeToUseItemText yesorno iffalse_endtext + writetext .WhichLureText callasm CheckForLures callasm SetUpLureMenu iffalse_endtext ; User canceled the menu + writetext .YouSprayedTheLureText ifequalfwd POTENT_LURE_MENU_OPT, .Galarian_Articuno ifequalfwd MALIGN_LURE_MENU_OPT, .Galarian_Zapdos ; HARSH_LURE_MENU_OPT, .Galarian_Moltres opentext + checkevent EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_MOLTRES + iftruefwd .NothingHappens farwritetext MoltresText cry MOLTRES pause 15 @@ -51,16 +55,18 @@ CherrygroveBayGalarianBirdsScript: loadvar VAR_BATTLETYPE, BATTLETYPE_LEGENDARY startbattle ; disappear CHERRYGROVEBAY_GALARIAN_MOLTRES - ; setevent EVENT_CHERRYGROVE_BAY_MOLTRES + setevent EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_MOLTRES reloadmapafterbattle special CheckBattleCaughtResult iffalsefwd .NoCatchGalarianMoltres - ; setflag ENGINE_PLAYER_CAUGHT_GALARIAN_MOLTRES + setflag ENGINE_PLAYER_CAUGHT_GALARIAN_MOLTRES .NoCatchGalarianMoltres end .Galarian_Articuno opentext + checkevent EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_ARTICUNO + iftruefwd .NothingHappens farwritetext ArticunoText cry ARTICUNO pause 15 @@ -69,16 +75,18 @@ CherrygroveBayGalarianBirdsScript: loadvar VAR_BATTLETYPE, BATTLETYPE_LEGENDARY startbattle ; disappear CHERRYGROVEBAY_GALARIAN_ARTICUNO - ; setevent EVENT_CHERRYGROVE_BAY_ARTICUNO + setevent EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_ARTICUNO reloadmapafterbattle special CheckBattleCaughtResult iffalsefwd .NoCatchGalarianArticuno - ; setflag ENGINE_PLAYER_CAUGHT_GALARIAN_ARTICUNO + setflag ENGINE_PLAYER_CAUGHT_GALARIAN_ARTICUNO .NoCatchGalarianArticuno end .Galarian_Zapdos opentext + checkevent EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_ZAPDOS + iftruefwd .NothingHappens farwritetext ZapdosText cry ZAPDOS pause 15 @@ -87,20 +95,39 @@ CherrygroveBayGalarianBirdsScript: loadvar VAR_BATTLETYPE, BATTLETYPE_LEGENDARY startbattle ; disappear CHERRYGROVEBAY_GALARIAN_ZAPDOS - ; setevent EVENT_CHERRYGROVE_BAY_ZAPDOS + setevent EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_ZAPDOS reloadmapafterbattle special CheckBattleCaughtResult iffalsefwd .NoCatchGalarianZapdos - ; setflag ENGINE_PLAYER_CAUGHT_GALARIAN_ZAPDOS + setflag ENGINE_PLAYER_CAUGHT_GALARIAN_ZAPDOS .NoCatchGalarianZapdos end +.NothingHappens + writetext .NothingHappensText + endtext + .LikeToUseItemText text "Would you like to" line "use a Lure on" cont "the Cherry tree?" done +.WhichLureText + text "Which Lure would" + line "you like to use?" + done + +.YouSprayedTheLureText + text "You sprayed the" + line "Lure on the Cherry" + cont "tree." + done + +.NothingHappensText + text "Nothing happened…" + done + CherrygroveBayHikerScript: faceplayer opentext From 02293a4489cd951f5bc621977ba43c6af26fe480 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Sun, 29 Dec 2024 12:02:36 -0600 Subject: [PATCH 08/10] Finish CherrygroveBay events --- engine/events/celebi.asm | 68 ++++++++++++++++++++++++++++++++++++++++ maps/CherrygroveBay.asm | 17 ++++++---- 2 files changed, 79 insertions(+), 6 deletions(-) diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm index f058375e28..c07ae7331f 100755 --- a/engine/events/celebi.asm +++ b/engine/events/celebi.asm @@ -1,3 +1,69 @@ +GalarianArticunoEvent: + call DelayFrame + ld a, [wStateFlags] + push af + xor a + ld [wStateFlags], a + + ld a, PAL_OW_PURPLE + farcall CopySpritePalToOBPal7 + + call ClearSpriteAnims + ld hl, ArticunoGalarianIcon + ld de, vTiles0 tile $84 + lb bc, BANK(ArticunoGalarianIcon), 4 * 2 + call DecompressRequest2bpp + + ld hl, ArticunoGalarianIcon + ld de, vTiles0 tile $8c + lb bc, BANK(ArticunoGalarianIcon), 4 * 2 + call DecompressRequest2bpp + jr DoCelebiEvent + +GalarianMoltresEvent: + call DelayFrame + ld a, [wStateFlags] + push af + xor a + ld [wStateFlags], a + + ld a, PAL_OW_RED + farcall CopySpritePalToOBPal7 + + call ClearSpriteAnims + ld hl, MoltresGalarianIcon + ld de, vTiles0 tile $84 + lb bc, BANK(MoltresGalarianIcon), 4 * 2 + call DecompressRequest2bpp + + ld hl, MoltresGalarianIcon + ld de, vTiles0 tile $8c + lb bc, BANK(MoltresGalarianIcon), 4 * 2 + call DecompressRequest2bpp + jr DoCelebiEvent + +GalarianZapdosEvent: + call DelayFrame + ld a, [wStateFlags] + push af + xor a + ld [wStateFlags], a + + ld a, PAL_OW_RED + farcall CopySpritePalToOBPal7 + + call ClearSpriteAnims + ld hl, ZapdosGalarianIcon + ld de, vTiles0 tile $84 + lb bc, BANK(ZapdosGalarianIcon), 4 * 2 + call DecompressRequest2bpp + + ld hl, ZapdosGalarianIcon + ld de, vTiles0 tile $8c + lb bc, BANK(ZapdosGalarianIcon), 4 * 2 + call DecompressRequest2bpp + jr DoCelebiEvent + Special_CelebiShrineEvent: call DelayFrame ld a, [wStateFlags] @@ -13,6 +79,8 @@ Special_CelebiShrineEvent: ld de, vTiles0 tile $84 lb bc, BANK(SpecialCelebiGFX), 4 * 4 call DecompressRequest2bpp +; fallthrough +DoCelebiEvent: xor a ld [wJumptableIndex], a diff --git a/maps/CherrygroveBay.asm b/maps/CherrygroveBay.asm index 30d4b3dbaa..016ae11481 100644 --- a/maps/CherrygroveBay.asm +++ b/maps/CherrygroveBay.asm @@ -41,12 +41,15 @@ CherrygroveBayGalarianBirdsScript: callasm SetUpLureMenu iffalse_endtext ; User canceled the menu writetext .YouSprayedTheLureText + waitbutton ifequalfwd POTENT_LURE_MENU_OPT, .Galarian_Articuno ifequalfwd MALIGN_LURE_MENU_OPT, .Galarian_Zapdos ; HARSH_LURE_MENU_OPT, .Galarian_Moltres - opentext checkevent EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_MOLTRES iftruefwd .NothingHappens + closetext + callasm GalarianMoltresEvent + opentext farwritetext MoltresText cry MOLTRES pause 15 @@ -54,7 +57,6 @@ CherrygroveBayGalarianBirdsScript: loadwildmon MOLTRES, GALARIAN_FORM, 65 loadvar VAR_BATTLETYPE, BATTLETYPE_LEGENDARY startbattle - ; disappear CHERRYGROVEBAY_GALARIAN_MOLTRES setevent EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_MOLTRES reloadmapafterbattle special CheckBattleCaughtResult @@ -64,9 +66,11 @@ CherrygroveBayGalarianBirdsScript: end .Galarian_Articuno - opentext checkevent EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_ARTICUNO iftruefwd .NothingHappens + closetext + callasm GalarianArticunoEvent + opentext farwritetext ArticunoText cry ARTICUNO pause 15 @@ -74,7 +78,6 @@ CherrygroveBayGalarianBirdsScript: loadwildmon ARTICUNO, GALARIAN_FORM, 65 loadvar VAR_BATTLETYPE, BATTLETYPE_LEGENDARY startbattle - ; disappear CHERRYGROVEBAY_GALARIAN_ARTICUNO setevent EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_ARTICUNO reloadmapafterbattle special CheckBattleCaughtResult @@ -84,9 +87,11 @@ CherrygroveBayGalarianBirdsScript: end .Galarian_Zapdos - opentext checkevent EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_ZAPDOS iftruefwd .NothingHappens + closetext + callasm GalarianZapdosEvent + opentext farwritetext ZapdosText cry ZAPDOS pause 15 @@ -94,7 +99,6 @@ CherrygroveBayGalarianBirdsScript: loadwildmon ZAPDOS, GALARIAN_FORM, 65 loadvar VAR_BATTLETYPE, BATTLETYPE_LEGENDARY startbattle - ; disappear CHERRYGROVEBAY_GALARIAN_ZAPDOS setevent EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_ZAPDOS reloadmapafterbattle special CheckBattleCaughtResult @@ -105,6 +109,7 @@ CherrygroveBayGalarianBirdsScript: .NothingHappens writetext .NothingHappensText + waitbutton endtext .LikeToUseItemText From f57ae2abbefaee9616c1b268153e6d1ac59fa0e1 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Mon, 30 Dec 2024 22:48:14 -0600 Subject: [PATCH 09/10] Fix hideout doors --- maps/RocketHideoutB1F.asm | 13 +++++++++---- maps/RocketHideoutB4F.asm | 22 +++++++++++++++------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/maps/RocketHideoutB1F.asm b/maps/RocketHideoutB1F.asm index 2a1ddeedb4..b701f6b5c4 100644 --- a/maps/RocketHideoutB1F.asm +++ b/maps/RocketHideoutB1F.asm @@ -33,7 +33,7 @@ RocketHideoutB1FDoorScript: endcallback RocketHideoutB1FBlackBeltValorGrunt1: - trainer BLACKBELT_T, VALOR_GRUNT_1, EVENT_BEAT_BLACK_BELT_VALOR_GRUNT_1, .SeenText, .AfterText, 0, .BeatenText + trainer BLACKBELT_T, VALOR_GRUNT_1, EVENT_BEAT_BLACK_BELT_VALOR_GRUNT_1, .SeenText, .BeatenText, 0, .AfterScript .Script: checkevent EVENT_BEAT_BLACK_BELT_VALOR_GRUNT_1 @@ -49,12 +49,17 @@ RocketHideoutB1FBlackBeltValorGrunt1: done .AfterScript + checkjustbattled + iffalsefwd .AfterText changeblock 16, 16, $0d - endifjustbattled - jumptextfaceplayer .AfterText + reloadmap end -.AfterText: +.AfterText + jumptextfaceplayer .Text + end + +.Text text "You've got guts…" para "Perhaps you should" diff --git a/maps/RocketHideoutB4F.asm b/maps/RocketHideoutB4F.asm index 4ebc05a164..0d11201fab 100644 --- a/maps/RocketHideoutB4F.asm +++ b/maps/RocketHideoutB4F.asm @@ -51,7 +51,7 @@ RocketHideoutB4FDoorScript: changeblock 16, 10, $69 endcallback .beat_theo - changeblock 16, 10, $13 + changeblock 16, 10, $0d endcallback RocketHideoutB4FLiftKeyScript: @@ -446,14 +446,18 @@ RocketHideoutB4FTeacherSerena: .AfterScript checkevent EVENT_BEAT_SUPER_NERD_INSTINCT_GRUNT_3 - iftruefwd .OpenDoorScript + iftruefwd .DoorScript endifjustbattled jumptextfaceplayer .AfterText end -.OpenDoorScript +.DoorScript + checkjustbattled + iffalsefwd .skip_open changeblock 16, 10, $0d - endifjustbattled + reloadmap + end +.skip_open jumptextfaceplayer .AfterText end @@ -489,14 +493,18 @@ RocketHideoutB4FSuperNerdInstinctGrunt3: .AfterScript checkevent EVENT_BEAT_TEACHER_SERENA - iftruefwd .OpenDoorScript + iftruefwd .DoorScript endifjustbattled jumptextfaceplayer .AfterText end -.OpenDoorScript +.DoorScript + checkjustbattled + iffalsefwd .skip_open changeblock 16, 10, $0d - endifjustbattled + reloadmap + end +.skip_open jumptextfaceplayer .AfterText end From 48bac8d7110108d02ec28779579aeb43f4aa04b2 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Tue, 31 Dec 2024 10:27:25 -0600 Subject: [PATCH 10/10] Fix Sparks Pikachu Resolves #861 --- gfx/pokemon/anims.asm | 2 +- gfx/pokemon/bitmasks.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 5757332a84..1f02be0834 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -276,12 +276,12 @@ UnownQuestionAnimation: INCLUDE "gfx/pokemon/unown_question/anim.asm" PichuPlainAnimation: INCLUDE "gfx/pokemon/pichu_plain/anim.asm" PichuSpikyAnimation: INCLUDE "gfx/pokemon/pichu_spiky/anim.asm" -PikachuSparkAnimation: PikachuPlainAnimation: INCLUDE "gfx/pokemon/pikachu_plain/anim.asm" PikachuFlyAnimation: INCLUDE "gfx/pokemon/pikachu_fly/anim.asm" PikachuSurfAnimation: INCLUDE "gfx/pokemon/pikachu_surf/anim.asm" PikachuPikaAnimation: INCLUDE "gfx/pokemon/pikachu_pika/anim.asm" PikachuChuchuAnimation: INCLUDE "gfx/pokemon/pikachu_chuchu/anim.asm" +PikachuSparkAnimation: INCLUDE "gfx/pokemon/pikachu_spark/anim.asm" ArbokJohtoAnimation: INCLUDE "gfx/pokemon/arbok_johto/anim.asm" ArbokKantoAnimation: INCLUDE "gfx/pokemon/arbok_kanto/anim.asm" diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index 2168e908a0..8cb8c3f748 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -275,12 +275,12 @@ UnownQuestionBitmasks: INCLUDE "gfx/pokemon/unown_question/bitmask.asm" PichuPlainBitmasks: INCLUDE "gfx/pokemon/pichu_plain/bitmask.asm" PichuSpikyBitmasks: INCLUDE "gfx/pokemon/pichu_spiky/bitmask.asm" -PikachuSparkBitmasks: PikachuPlainBitmasks: INCLUDE "gfx/pokemon/pikachu_plain/bitmask.asm" PikachuFlyBitmasks: INCLUDE "gfx/pokemon/pikachu_fly/bitmask.asm" PikachuSurfBitmasks: INCLUDE "gfx/pokemon/pikachu_surf/bitmask.asm" PikachuPikaBitmasks: INCLUDE "gfx/pokemon/pikachu_pika/bitmask.asm" PikachuChuchuBitmasks: INCLUDE "gfx/pokemon/pikachu_chuchu/bitmask.asm" +PikachuSparkBitmasks: INCLUDE "gfx/pokemon/pikachu_spark/bitmask.asm" ArbokJohtoBitmasks: INCLUDE "gfx/pokemon/arbok_johto/bitmask.asm" ArbokKantoBitmasks: INCLUDE "gfx/pokemon/arbok_kanto/bitmask.asm"