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

@@ -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)
+* 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 sprite, a few maps (Citrine City, Cinnabar Volcano)
+* 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 (Underwater Tunnel, Silph Co. and Pokemon Tower shortening), Mt. Moon Crater Guard, Showdown Mod assistance.
+* 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

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

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
 

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

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
+; Unused - both now used in Celadon University
-	db 30, PORYGON, 0 ; - used in celadon university
+	db 30, PORYGON, 0 ;
-	db 25, MAGNETITE, ELECTRODE, KABUTO, OMANYTE, 0 ; - used in celadon university
+	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)
+; Silph Gauntlet 4F (Lavender Tower)
-	db 66, GOROTORA, MUK_A, WEEZING, FLAREON, KINGDRA, CHARIZARD, 0
+	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)
+; Silph Gauntlet 5F (Safari Zone)
-	db 65, SLOWBRO, EXEGGUTOR, STARMIE, MR_RIME, ESPEON, ALAKAZAM, 0 
+	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 $FF, 17, MEOWTH, 14, EKANS, 14, KOFFING, 0 ; Mt. Moon
-	db 25, MEOWTH, EKANS, LICKITUNG, KOFFING, 0 ; Rocket Hideout
+	db $FF, 30, MEOWTH, 26, EKANS, 24, LICKITUNG, 26, KOFFING, 0 ; Rocket Hideout
-	db 28, MEOWTH, LICKITUNG, ARBOK, VICTREEBEL, WEEZING, 0 ; Pokemon Tower
+	db $FF, 34, MEOWTH, 29, ARBOK, 27, LICKITUNG, 29, WEEZING, 27, VICTREEBEL, 0 ; Pokemon Tower
-	db 37, MEOWTH, LICKILICKY, ARBOK, VICTREEBEL, WEEZING, GYARADOS, 0 ; Silph Co.
+	db $FF, 42, MEOWTH, 37, ARBOK, 35, LICKILICKY, 37, WEEZING, 35, VICTREEBEL, 34, GYARADOS, 0 ; Silph Co.
-	db $FF, 80, MEOWTH, 73, LICKILICKY, 75, ARBOK, 73, VICTREEBEL, 75, WEEZING, 71, GYARADOS, 0 ; Citrine Rocket House
+	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"

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 48, EEVEE
-	db 49, EEVEE
+	db 48, PIKACHU
-	db 51, CHARMANDER
+	db 50, CHARMANDER
-	db 48, BULBASAUR
+	db 50, BULBASAUR
-	db 49, HITMONLEE
+	db 51, HITMONLEE
-	db 47, HITMONCHAN
+	db 51, HITMONCHAN
-	db 52, HITMONTOP
+	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 44, KABUTO
-	db 49, OMANYTE
+	db 44, OMANYTE
-	db 51, SQUIRTLE
+	db 50, SQUIRTLE
-	db 48, KABUTO
+	db 45, KABUTO
-	db 49, OMANYTE
+	db 45, OMANYTE
-	db 47, WARTORTLE
 	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 52, LAPRAS
-	db 54, 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 56, TOTARTLE
+	db 53, LAPRAS
+	db 55, TOTARTLE
 	end_water_wildmons

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:

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:

text/CitrineCity.asm

@@ -13,8 +13,8 @@ _CitrineCityBillboard2::
 
 _CitrineCitySignText::
 	text "CITRINE CITY"
-	line "A shining city"
+	line "The Land of"
-	cont "of brilliance."
+	cont "Shining Sunlight"
 	done
 
 _CitrineShopSignText::
@@ -29,19 +29,23 @@ _CitrineCityTower::
 	done
 
 _CitrineCityCavern::
-	text "GARNET CAVERN"
+	text "GATE TO"
-	line "WARNING: Strong"
+	line "CELESTE HILL"
-	cont "#MON within."
+
+	para "Stay safe! Look"
+	line "out for strong"
+	cont "#MON!"
 	done
 
 _CitrineCityDirections::
-	para "NORTH: BATTLE"
+	para "NORTH WEST:"
-	line "TOWER"
+	line "BATTLE TOWER"
 	
-	para "EAST: PIER"
+	para "NORTH EAST:"
+	line "CELESTE HILL"
 
-	para "SOUTH: BRUNSWICK"
+	para "SOUTH WEST:"
-	line "TRAIL"
+	line "BRUNSWICK TRAIL"
 	done
 
 _CitrineCityText1::
@@ -73,9 +77,9 @@ _CitrineCityText3::
 
 _CitrineCityText4::
 	text "Some BIRD #MON"
-	line "roost on a hill"
+	line "roost on the"
-	cont "close by once"
+	cont "hill north of"
-	cont "a year."
+	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 "them! It's like"
-	cont "like different"
+	cont "they're totally"
-	cont "#MON!"
+	cont "new #MON!"
 	done

text/SaffronGym.asm

@@ -55,13 +55,13 @@ _TM46ExplanationText::
 	text_start
 
 	para "TM46 is PSYWAVE!"
-	line "It uses powerful"
+	line "It uses psychic"
-	cont "psychic waves to"
+	cont "power to inflict"
-	cont "inflict damage!"
+	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"
+	line "fear only bugs!" ; changed to the Yellow version because this guy LIES in RGB
-	cont "and bugs!"
 	done
 
 _SaffronGymBattleText3::

text/SilphGauntlet4F.asm

@@ -2,18 +2,18 @@ _SilphGauntlet4FBattleText1::
 	text "I'm one of SILPH's"
 	line "top SCIENTISTs!"
 	
-	para "I want to see just"
+	para "I want to see how"
-	line "how strong the"
+	line "tough the kid who"
-	cont "kid who took down"
+	cont "took down TEAM"
-	cont "TEAM ROCKET"
+	cont "ROCKET really is."
-	cont "really is."
 	
 	para "Care to show me?"
 	done
 
 _SilphGauntlet4FEndBattleText1::
-	text "That's"
+	text "No"
-	line "incredible...!"
+	line "wonder our CHIEF"
+	cont "chose you!"
 	prompt
 
 _SilphGauntlet4FAfterBattleText1::
@@ -27,9 +27,9 @@ _SilphGauntlet4FAfterBattleText1::
 	done
 
 _SilphGauntlet4FBattleText2::
-	text "#MON battles"
+	text "Once I win, I'm"
-	line "are the perfect"
+	line "going to CELADON"
-	cont "game of chance!"
+	cont "to hit it big!"
 	done
 
 _SilphGauntlet4FEndBattleText2::
@@ -38,9 +38,12 @@ _SilphGauntlet4FEndBattleText2::
 	prompt
 
 _SilphGauntlet4FAfterBattleText2::
-	text "At any moment, one"
+	text "SILPH'S PORYGON"
-	line "move can change"
+	line "is a brilliant"
-	cont "everything!"
+	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"
+	text "How does he expect"
-	line "the outcome of"
+	line "me to ride out"
-	cont "this battle."
+	cont "here?!"
 	done
 
 _SilphGauntlet4FEndBattleText4::
-	text "Just"
+	text "Ugh!"
-	line "as expected..."
+	line "Awful! Awful!"
 	prompt
 
-_SilphGauntlet4FAfterBattleText4::	; may revise, but hint towards Chief's team slightly
+_SilphGauntle45FAfterBattleText4::
-	text "I can see it..."
+	text "This floor is a"
-	
+	line "graveyard! That"
-	para "The strongest"
+	cont "CHIEF has a sick"
-	line "trainer here has"
+	cont "sense of humor!"
-	cont "a PORYGON2. Or"
-	cont "was it a"
-	cont "PORYGON-Z...?"
 	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"
+	text "LAVENDER TOWN has"
-	line "I'm possessed?"
+	line "many tales and"
+	cont "horror stories."
 	
-	para "Not at all! I just"
+	para "They often freak"
-	line "like to quote my"
+	line "people out when I"
-	cont "favorite horror"
+	cont "talk about them,"
-	cont "stories!"
+	cont "though..."
 	done
 
 _PurifiedZoneText::

text/SilphGauntlet5F.asm

@@ -20,21 +20,21 @@ _SilphGauntlet5FAfterBattleText1::
 	done
 
 _SilphGauntlet5FBattleText2::
-	text "How does he expect"
+	text "I can tell that"
-	line "me to ride out"
+	line "you're no match"
-	cont "here?!"
+	cont "for PSI power!"
 	done
 
 _SilphGauntlet5FEndBattleText2::
-	text "Ugh!"
+	text "I was"
-	line "Awful! Awful!"
+	line "wrong..."
 	prompt
 
 _SilphGauntlet5FAfterBattleText2::
-	text "This floor is a"
+	text "Be careful while"
-	line "graveyard! That"
+	line "you're here. That"
-	cont "CHIEF has a sick"
+	cont "CHIEF gives me"
-	cont "sense of humor!"
+	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::

text/ViridianMart.asm

@@ -26,6 +26,7 @@ _ViridianMartText2::
 	done
 
 _ViridianMartText3::
-	text "No! POTIONs are"
+	text "The shop finally"
-	line "all sold out."
+	line "has some POTIONs"
+	cont "in stock."
 	done