From 38b2b2c6c957b9d5b75d7bd9210c92307ecdd67b Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 28 Jul 2023 11:03:11 +0100 Subject: [PATCH] Updated Citrine theme, plus some text changes Pushing a commit for the less important stuff while I finish the Silph Gauntlet's missing floors. - Swaps the Biker and Psychic in Silph Gauntlet around - Increased J&J's Meowth's level to make it less unbalanced in the later fights - Text improvements for Citrine City, Saffron Gym, and Viridian PokeMart --- README.md | 6 +-- crysaudio/music/RBY/citrine.asm | 7 ++- data/maps/objects/SilphGauntlet4F.asm | 2 +- data/maps/objects/SilphGauntlet5F.asm | 2 +- data/trainers/parties.asm | 26 +++++------ data/wild/maps/BillsGarden.asm | 32 ++++++------- scripts/SilphGauntlet4F.asm | 2 +- scripts/SilphGauntlet5F.asm | 2 +- text/CitrineCity.asm | 36 +++++++------- text/SaffronGym.asm | 11 ++--- text/SilphGauntlet4F.asm | 67 ++++++++++++++------------- text/SilphGauntlet5F.asm | 20 ++++---- text/ViridianMart.asm | 5 +- 13 files changed, 113 insertions(+), 105 deletions(-) diff --git a/README.md b/README.md index e6467711..97562d92 100644 --- a/README.md +++ b/README.md @@ -373,9 +373,9 @@ KEP spriters hold the policy of requiring sprites to be used with direct credit If you use our implementations of anything at all, it is encouraged to submit Pull Requests for bug fixes if you find any issues! We very much appreciate them! -* Plague von Karma - Creator of the Showdown Mod, Director, Developer, Scenarios, Balancing, Dialogue, Pokedex entries, Maps (Mt. Moon Crater, Galarian Bird dungeons, Rock Tunnel, Cinnabar Volcano floors, enhanced Diglett's Cave, Shinjuku Jacky's room, and more), Event scripting, Hyper Training, FRLG Tea, post-game rematches, Meltan implementation, Yellow backports, and occasional spriter (assisting with Tsubomitto, Carapthor) -* Martha's Against Humanity - Developer, Pokémon implementation, Pokedex entries, Event scripting, tweaks of Albatross's sprites, Sylveon sprite, a few maps (Citrine City, Cinnabar Volcano) -* Ema Skye - Developer, Maps (Underwater Tunnel, Silph Co. and Pokemon Tower shortening), Mt. Moon Crater Guard, Showdown Mod assistance. +* Plague von Karma - Creator of the Showdown Mod, Director, Developer, Scenarios, Balancing, Dialogue, Pokedex entries, Maps (Mt. Moon Crater, Galarian Bird dungeons, Rock Tunnel, Cinnabar Volcano floors, enhanced Diglett's Cave, Shinjuku Jacky's room, and more), Event scripting, Hyper Training, FRLG Tea, post-game rematches, male/female character selection, Meltan implementation, Yellow backports, and occasional spriter (assisting with Tsubomitto, Carapthor) +* Martha's Against Humanity - Developer, Pokémon implementation, Pokedex entries, Event scripting, tweaks of Albatross's sprites, Sylveon, Tsubomitto and Animon sprites, Maps (Citrine City, Cinnabar Volcano, Underwater Tunnel, Silph Gauntlet,), SGB border, new palettes for postgame areas and Game Corner, etc. +* Ema Skye - Developer, Maps (Silph Co. and Pokemon Tower shortening), Mt. Moon Crater Guard, Showdown Mod assistance. * BlueZangoose / Vimescarrot - Pokemon box expansion, Instatext option, general assistance. * Albatross - Many of the new sprites used in the hack (A significant number of post-Gen 1 evolutions, all regional variants, Meltan and Carapthor lines, etc.) * LuciShrimp - Mewtwo & FireRed/LeafGreen Legendary custom battle music diff --git a/crysaudio/music/RBY/citrine.asm b/crysaudio/music/RBY/citrine.asm index f9ef6eeb..ead68d95 100644 --- a/crysaudio/music/RBY/citrine.asm +++ b/crysaudio/music/RBY/citrine.asm @@ -13,7 +13,8 @@ Music_Citrine_branch_a91b: note_type 12, 1, 8 octave 4 volume_envelope 7, 7 - vibrato 3, 1, 6 + vibrato 8, 2, 4 + duty_cycle 3 note E_, 1 rest 1 octave 3 @@ -196,7 +197,8 @@ Music_Citrine_branch_a9d8: note_type 12, 1, 8 octave 4 volume_envelope 7, 7 - vibrato 4, 1, 5 + vibrato 5, 1, 5 + duty_cycle 3 note E_, 1 rest 1 note G#, 1 @@ -345,6 +347,7 @@ Music_Citrine_branch_a9d8: Music_Citrine_Ch3: note_type 4, 1, 0 octave 4 + volume_envelope 1, 1 note E_, 6 rest 6 octave 3 diff --git a/data/maps/objects/SilphGauntlet4F.asm b/data/maps/objects/SilphGauntlet4F.asm index 14c873dd..cfa943ba 100644 --- a/data/maps/objects/SilphGauntlet4F.asm +++ b/data/maps/objects/SilphGauntlet4F.asm @@ -11,7 +11,7 @@ SilphGauntlet4F_Object: object_event 4, 3, SPRITE_SCIENTIST, STAY, LEFT, 1, OPP_SCIENTIST, 1 object_event 14, 2, SPRITE_GAMBLER, STAY, RIGHT, 2, OPP_GAMBLER, 6 object_event 18, 11, SPRITE_ROCKET, STAY, LEFT, 3, OPP_ROCKET, 22 - object_event 12, 10, SPRITE_YOUNGSTER, STAY, RIGHT, 4, OPP_PSYCHIC_TR, 5 + object_event 12, 10, SPRITE_BIKER, STAY, RIGHT, 4, OPP_BIKER, 16 object_event 7, 5, SPRITE_SUPER_NERD, STAY, UP, 5, OPP_BURGLAR, 1 object_event 4, 14, SPRITE_CHANNELER, STAY, DOWN, 6, OPP_CHANNELER, 7 diff --git a/data/maps/objects/SilphGauntlet5F.asm b/data/maps/objects/SilphGauntlet5F.asm index 86695c51..3aec8e28 100644 --- a/data/maps/objects/SilphGauntlet5F.asm +++ b/data/maps/objects/SilphGauntlet5F.asm @@ -9,7 +9,7 @@ SilphGauntlet5F_Object: def_object_events object_event 11, 6, SPRITE_ROCKER, STAY, LEFT, 1, OPP_JUGGLER, 6 - object_event 4, 12, SPRITE_BIKER, STAY, LEFT, 2, OPP_BIKER, 16 + object_event 4, 12, SPRITE_YOUNGSTER, STAY, RIGHT, 2, OPP_PSYCHIC_TR, 5 object_event 16, 14, SPRITE_GAMBLER, STAY, RIGHT, 3, OPP_CUE_BALL, 10 object_event 9, 14, SPRITE_SWIMMER, STAY, DOWN, 4, OPP_SWIMMER, 16 object_event 3, 14, SPRITE_ROCKER, STAY, DOWN, 5, OPP_TAMER, 6 diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 125bd256..78acca92 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -247,9 +247,9 @@ SuperNerdData: db 20, GRIMER, KOFFING, KOFFING, MAGNEMITE, 0 db 22, VOLTORB, KOFFING, MAGNETITE, 0 db 26, ELECTRODE, 0 -; Unused - db 30, PORYGON, 0 ; - used in celadon university - db 25, MAGNETITE, ELECTRODE, KABUTO, OMANYTE, 0 ; - used in celadon university +; Unused - both now used in Celadon University + db 30, PORYGON, 0 ; + db 25, MAGNETITE, ELECTRODE, KABUTO, OMANYTE, 0 ; ; Silph Gauntlet 2F (Mt. Moon) db 63, ELECTRODE, MUK, KABUTOPS, OMASTAR, MAGNEZONE, PORYGONZ, 0 ; Cinnabar Gym @@ -317,8 +317,8 @@ BikerData: db 26, KOFFING, KOFFING, GRIMER, KOFFING, 0 db 28, GRIMER, GRIMER, SEADRA, 0 db 29, MAGMAR, 0 -; Silph Gauntlet 5F (Safari Zone) - db 66, GOROTORA, MUK_A, WEEZING, FLAREON, KINGDRA, CHARIZARD, 0 +; Silph Gauntlet 4F (Lavender Tower) + db 65, GOROTORA, MUK_A, WEEZING, FLAREON, KINGDRA, CHARIZARD, 0 ; Fire specialist BurglarData: @@ -463,8 +463,8 @@ PsychicData: db 34, MR_MIME, KADABRA, 0 db 33, SLOWKING, SLOWBRO, 0 ; not as strong as it looks, has no good attacks db 38, JYNX, 0 -; Silph Gauntlet 4F (Lavender Tower) - db 65, SLOWBRO, EXEGGUTOR, STARMIE, MR_RIME, ESPEON, ALAKAZAM, 0 +; Silph Gauntlet 5F (Safari Zone) + db 66, SLOWBRO, EXEGGUTOR, STARMIE, MR_RIME, ESPEON, ALAKAZAM, 0 ; Electric specialist with depressingly little representation. RockerData: @@ -541,7 +541,7 @@ BirdKeeperData: ; Uses Silph products and Steel-types ChiefData: ; Silph Gauntlet 7F - db $FF, 71, MAGNEZONE, 70, LAPRAS, 71, PURAKKUSU, 71, GENGAR, 73, PORYGONZ, 75, OMEGA, 0 + db $FF, 71, MAGNEZONE, 70, LAPRAS, 71, PURAKKUSU, 70, GENGAR, 73, PORYGONZ, 75, OMEGA, 0 ; Lapras and Gengar are used here since Lapras is given by a Silph worker, and Gengar represents the Silph Scope. ; Poison- and Electric-type Pokemon @@ -750,11 +750,11 @@ JackData: ; db 70, ANIMON, ANNIHILAPE, HITMONLEE, PORYGON2, HITMONCHAN, SCIZOR, 0 ; not 100% sure what to do with this guy... JessieJamesData: - db 15, MEOWTH, EKANS, KOFFING, 0 ; Mt. Moon - db 25, MEOWTH, EKANS, LICKITUNG, KOFFING, 0 ; Rocket Hideout - db 28, MEOWTH, LICKITUNG, ARBOK, VICTREEBEL, WEEZING, 0 ; Pokemon Tower - db 37, MEOWTH, LICKILICKY, ARBOK, VICTREEBEL, WEEZING, GYARADOS, 0 ; Silph Co. - db $FF, 80, MEOWTH, 73, LICKILICKY, 75, ARBOK, 73, VICTREEBEL, 75, WEEZING, 71, GYARADOS, 0 ; Citrine Rocket House + db $FF, 17, MEOWTH, 14, EKANS, 14, KOFFING, 0 ; Mt. Moon + db $FF, 30, MEOWTH, 26, EKANS, 24, LICKITUNG, 26, KOFFING, 0 ; Rocket Hideout + db $FF, 34, MEOWTH, 29, ARBOK, 27, LICKITUNG, 29, WEEZING, 27, VICTREEBEL, 0 ; Pokemon Tower + db $FF, 42, MEOWTH, 37, ARBOK, 35, LICKILICKY, 37, WEEZING, 35, VICTREEBEL, 34, GYARADOS, 0 ; Silph Co. + db $FF, 80, MEOWTH, 75, ARBOK, 73, LICKILICKY, 75, WEEZING, 73, VICTREEBEL, 71, GYARADOS, 0 ; Citrine Rocket House INCLUDE "data/trainers/scaled_parties.asm" INCLUDE "data/trainers/rival_parties.asm" diff --git a/data/wild/maps/BillsGarden.asm b/data/wild/maps/BillsGarden.asm index e634d94f..0004e130 100644 --- a/data/wild/maps/BillsGarden.asm +++ b/data/wild/maps/BillsGarden.asm @@ -5,27 +5,27 @@ ; Legendary Birds were also in the mythos but there's no space and it sounds terrible. BillsGardenWildMons: def_grass_wildmons 10 ; encounter rate - db 47, EEVEE ; People are here for Eevee so just give them the ~40% chance... - db 49, EEVEE - db 51, CHARMANDER - db 48, BULBASAUR - db 49, HITMONLEE - db 47, HITMONCHAN - db 52, HITMONTOP + db 48, EEVEE + db 48, PIKACHU + db 50, CHARMANDER + db 50, BULBASAUR + db 51, HITMONLEE + db 51, HITMONCHAN + db 51, HITMONTOP db 52, ELECTRODE_H db 52, ARCANINE_H db 53, DECILLA end_grass_wildmons def_water_wildmons 10 ; encounter rate - db 47, KABUTO - db 49, OMANYTE - db 51, SQUIRTLE - db 48, KABUTO - db 49, OMANYTE - db 47, WARTORTLE + db 44, KABUTO + db 44, OMANYTE + db 50, SQUIRTLE + db 45, KABUTO + db 45, OMANYTE db 52, WARTORTLE - db 54, AERODACTYL ; In games like DPP, you can encounter fliers on Water. Most notably, Zubat. No space on land so this is the best we got. - db 54, LAPRAS - db 56, TOTARTLE + db 52, LAPRAS + db 53, AERODACTYL ; In games like DPP, you can encounter fliers on Water. Most notably, Zubat. No space on land so this is the best we got. + db 53, LAPRAS + db 55, TOTARTLE end_water_wildmons \ No newline at end of file diff --git a/scripts/SilphGauntlet4F.asm b/scripts/SilphGauntlet4F.asm index 4bb5196b..6305ed3d 100644 --- a/scripts/SilphGauntlet4F.asm +++ b/scripts/SilphGauntlet4F.asm @@ -66,7 +66,7 @@ SilphGauntlet4FTrainerHeader1: SilphGauntlet4FTrainerHeader2: trainer EVENT_BEAT_GAUNTLET_ROCKET, 2, SilphGauntlet4FBattleText3, SilphGauntlet4FEndBattleText3, SilphGauntlet4FAfterBattleText3 SilphGauntlet4FTrainerHeader3: - trainer EVENT_BEAT_GAUNTLET_PSYCHIC, 2, SilphGauntlet4FBattleText4, SilphGauntlet4FEndBattleText4, SilphGauntlet4FAfterBattleText4 + trainer EVENT_BEAT_GAUNTLET_BIKER, 2, SilphGauntlet4FBattleText4, SilphGauntlet4FEndBattleText4, SilphGauntlet4FAfterBattleText4 SilphGauntlet4FTrainerHeader4: trainer EVENT_BEAT_GAUNTLET_BURGLAR, 2, SilphGauntlet4FBattleText5, SilphGauntlet4FEndBattleText5, SilphGauntlet4FAfterBattleText5 SilphGauntlet4FTrainerHeader5: diff --git a/scripts/SilphGauntlet5F.asm b/scripts/SilphGauntlet5F.asm index a0102ac6..0da6f35e 100644 --- a/scripts/SilphGauntlet5F.asm +++ b/scripts/SilphGauntlet5F.asm @@ -26,7 +26,7 @@ SilphGauntlet5FTrainerHeaders: SilphGauntlet5FTrainerHeader0: trainer EVENT_BEAT_GAUNTLET_JUGGLER, 3, SilphGauntlet5FBattleText1, SilphGauntlet5FEndBattleText1, SilphGauntlet5FAfterBattleText1 SilphGauntlet5FTrainerHeader1: - trainer EVENT_BEAT_GAUNTLET_BIKER, 1, SilphGauntlet5FBattleText2, SilphGauntlet5FEndBattleText2, SilphGauntlet5FAfterBattleText2 + trainer EVENT_BEAT_GAUNTLET_PSYCHIC, 1, SilphGauntlet5FBattleText2, SilphGauntlet5FEndBattleText2, SilphGauntlet5FAfterBattleText2 SilphGauntlet5FTrainerHeader2: trainer EVENT_BEAT_GAUNTLET_CUE_BALL, 2, SilphGauntlet5FBattleText3, SilphGauntlet5FEndBattleText3, SilphGauntlet5FAfterBattleText3 SilphGauntlet5FTrainerHeader3: diff --git a/text/CitrineCity.asm b/text/CitrineCity.asm index 1289cbd4..7c89dd2a 100644 --- a/text/CitrineCity.asm +++ b/text/CitrineCity.asm @@ -13,8 +13,8 @@ _CitrineCityBillboard2:: _CitrineCitySignText:: text "CITRINE CITY" - line "A shining city" - cont "of brilliance." + line "The Land of" + cont "Shining Sunlight" done _CitrineShopSignText:: @@ -29,19 +29,23 @@ _CitrineCityTower:: done _CitrineCityCavern:: - text "GARNET CAVERN" - line "WARNING: Strong" - cont "#MON within." + text "GATE TO" + line "CELESTE HILL" + + para "Stay safe! Look" + line "out for strong" + cont "#MON!" done _CitrineCityDirections:: - para "NORTH: BATTLE" - line "TOWER" + para "NORTH WEST:" + line "BATTLE TOWER" - para "EAST: PIER" + para "NORTH EAST:" + line "CELESTE HILL" - para "SOUTH: BRUNSWICK" - line "TRAIL" + para "SOUTH WEST:" + line "BRUNSWICK TRAIL" done _CitrineCityText1:: @@ -73,9 +77,9 @@ _CitrineCityText3:: _CitrineCityText4:: text "Some BIRD #MON" - line "roost on a hill" - cont "close by once" - cont "a year." + line "roost on the" + cont "hill north of" + cont "here every year." para "The locals call" line "them ARTICUNO," @@ -84,7 +88,7 @@ _CitrineCityText4:: para "But they look" line "nothing like" - cont "them! They're" - cont "like different" - cont "#MON!" + cont "them! It's like" + cont "they're totally" + cont "new #MON!" done diff --git a/text/SaffronGym.asm b/text/SaffronGym.asm index 0838a410..65a5da90 100644 --- a/text/SaffronGym.asm +++ b/text/SaffronGym.asm @@ -55,13 +55,13 @@ _TM46ExplanationText:: text_start para "TM46 is PSYWAVE!" - line "It uses powerful" - cont "psychic waves to" - cont "inflict damage!" + line "It uses psychic" + cont "power to inflict" + cont "varying damage!" ; text altered to make Psywave's effect more clear para "Also..." - para "I sense a ship has" ; This is the use for the badge now, no? + para "I sense a ship has" ; This is the use for the badge now that disobedience is removed line "returned for you." done @@ -130,8 +130,7 @@ _SaffronGymEndBattleText2:: _SaffronGymAfterBattleText2:: text "Psychic #MON" - line "fear only ghosts" - cont "and bugs!" + line "fear only bugs!" ; changed to the Yellow version because this guy LIES in RGB done _SaffronGymBattleText3:: diff --git a/text/SilphGauntlet4F.asm b/text/SilphGauntlet4F.asm index 605e7afc..9052c79e 100644 --- a/text/SilphGauntlet4F.asm +++ b/text/SilphGauntlet4F.asm @@ -2,18 +2,18 @@ _SilphGauntlet4FBattleText1:: text "I'm one of SILPH's" line "top SCIENTISTs!" - para "I want to see just" - line "how strong the" - cont "kid who took down" - cont "TEAM ROCKET" - cont "really is." + para "I want to see how" + line "tough the kid who" + cont "took down TEAM" + cont "ROCKET really is." para "Care to show me?" done _SilphGauntlet4FEndBattleText1:: - text "That's" - line "incredible...!" + text "No" + line "wonder our CHIEF" + cont "chose you!" prompt _SilphGauntlet4FAfterBattleText1:: @@ -27,9 +27,9 @@ _SilphGauntlet4FAfterBattleText1:: done _SilphGauntlet4FBattleText2:: - text "#MON battles" - line "are the perfect" - cont "game of chance!" + text "Once I win, I'm" + line "going to CELADON" + cont "to hit it big!" done _SilphGauntlet4FEndBattleText2:: @@ -38,9 +38,12 @@ _SilphGauntlet4FEndBattleText2:: prompt _SilphGauntlet4FAfterBattleText2:: - text "At any moment, one" - line "move can change" - cont "everything!" + text "SILPH'S PORYGON" + line "is a brilliant" + cont "product!" + + para "Now, if only I" + line "could win one..." done _SilphGauntlet4FBattleText3:: @@ -62,24 +65,21 @@ _SilphGauntlet4FAfterBattleText3:: done _SilphGauntlet4FBattleText4:: - text "I can already see" - line "the outcome of" - cont "this battle." + text "How does he expect" + line "me to ride out" + cont "here?!" done _SilphGauntlet4FEndBattleText4:: - text "Just" - line "as expected..." + text "Ugh!" + line "Awful! Awful!" prompt -_SilphGauntlet4FAfterBattleText4:: ; may revise, but hint towards Chief's team slightly - text "I can see it..." - - para "The strongest" - line "trainer here has" - cont "a PORYGON2. Or" - cont "was it a" - cont "PORYGON-Z...?" +_SilphGauntle45FAfterBattleText4:: + text "This floor is a" + line "graveyard! That" + cont "CHIEF has a sick" + cont "sense of humor!" done _SilphGauntlet4FBattleText5:: @@ -114,19 +114,20 @@ _SilphGauntlet4FBattleText6:: ; hehehe buryman joke para "Won't you join me?" done -_SilphGauntlet4FEndBattleText6:: ; not sure what to put here, first line extends too long so I have to change it anyway +_SilphGauntlet4FEndBattleText6:: text "Ahh," line "fresh meat!" prompt _SilphGauntlet4FAfterBattleText6:: - text "What? You think" - line "I'm possessed?" + text "LAVENDER TOWN has" + line "many tales and" + cont "horror stories." - para "Not at all! I just" - line "like to quote my" - cont "favorite horror" - cont "stories!" + para "They often freak" + line "people out when I" + cont "talk about them," + cont "though..." done _PurifiedZoneText:: diff --git a/text/SilphGauntlet5F.asm b/text/SilphGauntlet5F.asm index 0a09e05a..5b563fe1 100644 --- a/text/SilphGauntlet5F.asm +++ b/text/SilphGauntlet5F.asm @@ -20,21 +20,21 @@ _SilphGauntlet5FAfterBattleText1:: done _SilphGauntlet5FBattleText2:: - text "How does he expect" - line "me to ride out" - cont "here?!" + text "I can tell that" + line "you're no match" + cont "for PSI power!" done _SilphGauntlet5FEndBattleText2:: - text "Ugh!" - line "Awful! Awful!" + text "I was" + line "wrong..." prompt _SilphGauntlet5FAfterBattleText2:: - text "This floor is a" - line "graveyard! That" - cont "CHIEF has a sick" - cont "sense of humor!" + text "Be careful while" + line "you're here. That" + cont "CHIEF gives me" + cont "the creeps..." done _SilphGauntlet5FBattleText3:: @@ -51,7 +51,7 @@ _SilphGauntlet5FAfterBattleText3:: text "Unlike that wimp" line "over there, I" cont "ain't scared of" - cont "cemetaries!" + cont "that CHIEF guy!" done _SilphGauntlet5FBattleText4:: diff --git a/text/ViridianMart.asm b/text/ViridianMart.asm index 640d7fd1..3cffb307 100644 --- a/text/ViridianMart.asm +++ b/text/ViridianMart.asm @@ -26,6 +26,7 @@ _ViridianMartText2:: done _ViridianMartText3:: - text "No! POTIONs are" - line "all sold out." + text "The shop finally" + line "has some POTIONs" + cont "in stock." done