August bug fixes: Part 1

Credit to ViWalls for discovering most of these bugs in his playtest:

- Citrine City's theme has been made slightly louder.

- The book in Mr. Fuji's house had difficulties working properly, so it's been removed for now.

- Fixed issues where Silph Co. and the Fishing Rod house displayed incorrectly on the Town Map.

- Removed the unnecessary sign outside Celadon University.

- Fixed an issue where 2 NPCs in Cinnabar Lab and Pokemon Mansion, respectively, had incorrect text.

- Fixed a text issue in Pokemon Mansion where the final Mewtwo log would display incorrectly.

- Altered a piece of text in the secret area of Pokemon Mansion to avoid a text box error since the idea we had in mind for it was scrapped.

- Fixed a text issue in Viridian Pre-Gym where the text for the right-side poster overflowed past the edge of the textbox.

crysaudio/music/RBY/citrine.asm

@@ -12,9 +12,9 @@ Music_Citrine_Ch1:
 Music_Citrine_branch_a91b:
 	note_type 12, 1, 8
 	octave 4
-	volume_envelope 7, 7
 	vibrato 8, 2, 4
 	duty_cycle 3
+	volume_envelope 10, 7
 	note E_, 1
 	rest 1
 	octave 3
@@ -196,9 +196,9 @@ Music_Citrine_Ch2:
 Music_Citrine_branch_a9d8:
 	note_type 12, 1, 8
 	octave 4
-	volume_envelope 7, 7
 	vibrato 5, 1, 5
 	duty_cycle 3
+	volume_envelope 10, 7
 	note E_, 1
 	rest 1
 	note G#, 1

data/maps/objects/CinnabarLab.asm

@@ -9,10 +9,10 @@ CinnabarLab_Object:
 	warp_event 16,  4, CINNABAR_LAB_FOSSIL_ROOM, 1
 
 	def_bg_events
-	bg_event  3,  2, 2 ; Lab1Text2
+	bg_event  3,  2, 3 ; Lab1Text2
-	bg_event  9,  4, 3 ; Lab1Text3
+	bg_event  9,  4, 4 ; Lab1Text3
-	bg_event 13,  4, 4 ; Lab1Text4
+	bg_event 13,  4, 5 ; Lab1Text4
-	bg_event 17,  4, 5 ; Lab1Text5
+	bg_event 17,  4, 6 ; Lab1Text5
 
 	def_object_events
 	object_event  1,  3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person

data/maps/objects/MrFujisHouse.asm

@@ -13,7 +13,6 @@ MrFujisHouse_Object:
 	object_event  6,  4, SPRITE_SANDSHREW, STAY, UP, 3 ; person
 	object_event  1,  3, SPRITE_BULBASAUR, STAY, NONE, 4 ; person
 	object_event  3,  1, SPRITE_MR_FUJI, STAY, NONE, 5 ; person
-	object_event  3,  3, SPRITE_POKEDEX, STAY, NONE, 6 ; person
+	object_event  0,  4, SPRITE_ODDISH, STAY, NONE, 6 ; person
-	object_event  0,  4, SPRITE_ODDISH, STAY, NONE, 7 ; person
 
 	def_warps_to MR_FUJIS_HOUSE

data/maps/objects/Route24.asm

@@ -14,7 +14,7 @@ Route24_Object:
 	object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 4
 	object_event 10, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, 6, OPP_LASS, 8
 	object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, 7, OPP_BUG_CATCHER, 9
-	object_event 18,  5, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER_WAVE
+	object_event 15, 21, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER_WAVE
 	object_event  9,  5, SPRITE_COOLTRAINER_M, STAY, DOWN, 9 ; Damien
 
 	def_warps_to ROUTE_24

data/maps/town_map_entries.asm

@@ -109,7 +109,7 @@ InternalMapEntries:
 	internal_map MR_PSYCHICS_HOUSE,             10,  5, SaffronCityName
 	internal_map ROUTE_15_GATE_2F,               9, 13, Route15Name
 	internal_map ROUTE_16_FLY_HOUSE,             4,  5, Route16Name
-	internal_map ROUTE_12_SUPER_ROD_HOUSE,      14, 10, Route12Name
+	internal_map ROUTE_12_SUPER_ROD_HOUSE,      10,  1, Route24Name
 	internal_map ROUTE_18_GATE_2F,               7, 13, Route18Name
 	internal_map SEAFOAM_ISLANDS_1F,             5, 15, SeafoamIslandsName
 	internal_map ROUTE_22_GATE,                  0,  7, Route22Name
@@ -121,7 +121,7 @@ InternalMapEntries:
 	internal_map ROCKET_HIDEOUT_ELEVATOR,        7,  5, RocketHQName
 	internal_map CITRINE_MART,                   7, 10, CitrineCityName
 	internal_map GARNET_CAVERN_B1F,              6, 10, GarnetCavernName
-;	internal_map SILPH_CO_8F,                   10,  5, SilphCoName
+	internal_map SILPH_CO_7F,                   10,  5, SilphCoName
 	internal_map POKEMON_MANSION_B1F,            2, 15, PokemonMansionName
 	internal_map SAFARI_ZONE_NORTH_REST_HOUSE,   8, 12, SafariZoneName
 	internal_map CERULEAN_CAVE_1F,               9,  1, CeruleanCaveName

maps/CinnabarLabTradeRoom.blk

@@ -1,2 +1,2 @@
-	

+	


 


scripts/CinnabarLab.asm

@@ -4,11 +4,11 @@ CinnabarLab_Script:
 
 CinnabarLab_TextPointers:
 	dw Lab1Text1
+	dw Lab1RowanText
 	dw Lab1Text2
 	dw Lab1Text3
 	dw Lab1Text4
 	dw Lab1Text5
-	dw Lab1Text6 ; rowan
 
 Lab1Text1:
 	text_far _Lab1Text1
@@ -30,6 +30,6 @@ Lab1Text5:
 	text_far _Lab1Text5
 	text_end
 
-Lab1Text6:
+Lab1RowanText:
 	text_far _Lab1Text6
 	text_end

scripts/MrFujisHouse.asm

@@ -8,7 +8,6 @@ MrFujisHouse_TextPointers:
 	dw LavenderHouse1Text3
 	dw LavenderHouse1Text4
 	dw LavenderHouse1Text5
-	dw LavenderHouse1Text6
 	dw LavenderHouse1Text7
 
 LavenderHouse1Text1:
@@ -108,10 +107,6 @@ MrFujiAfterFluteText:
 	text_far _MrFujiAfterFluteText
 	text_end
 
-LavenderHouse1Text6:
-	text_far _LavenderHouse1Text6
-	text_end
-
 LavenderHouse1Text7:
 	text_far _OddishText
 	text_asm

scripts/PokemonMansionB1F.asm

@@ -49,7 +49,7 @@ Mansion4Script_Switches::
 	ret nz
 	xor a
 	ldh [hJoyHeld], a
-	ld a, $9
+	ld a, $a
 	ldh [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
@@ -67,8 +67,8 @@ PokemonMansionB1F_TextPointers:
 	dw PickUpItemText
 	dw Mansion4Text7
 	dw PickUpItemText
-	dw Mansion3Text6
 	dw MansionGuardText
+	dw Mansion3Text6
 
 Mansion4TrainerHeaders:
 	def_trainers

scripts/PokemonMansionB2F.asm

@@ -51,7 +51,7 @@ B2FComputer2:
 	
 B2FMissingNo:
 	text_far _B2FMissingNo
-	text_end ; i'll figure this out another time
+	text_end
 
 B2FTrioPods:
 	text_far _TrioPods

text/CitrineCity.asm

@@ -38,7 +38,7 @@ _CitrineCityCavern::
 	done
 
 _CitrineCityDirections::
-	para "NORTH WEST:"
+	text "NORTH WEST:"
 	line "BATTLE TOWER"
 	
 	para "NORTH EAST:"

text/PokemonMansionB1F.asm

@@ -33,9 +33,9 @@ _Mansion4Text7::
 	line "MEWTWO is far too"
 	cont "powerful."
 
-	text "It's no use..."
+	para "It's no use..."
 	
-	text "I cannot control"
+	para "I cannot control"
 	line "it!"
 	
 	done

text/PokemonMansionB2F.asm

@@ -64,7 +64,12 @@ _B2FComputer2::
 	done
 
 _B2FMissingNo::
-	text "" ; no "done" will cause a (hopefully) inconsequential error to appear.
+	text "A multicolored,"
+	line "glitched block"
+	cont "is visible on"
+	cont "this screen."
+
+	done
 
 _TrioPods::
 	text "Stagnant fluid"

text/ViridianPreGym.asm

@@ -3,7 +3,7 @@ _YujirouIntro::
 	line "VIRIDIAN's LEADER-"
 	cont "to-be!"
 	
-	para "Me and LICKITUNG"
+	para "Me and my #MON"   ; originally Lickitung, but didn't work when taking rematches into account
 	line "will beat anyone"
 	cont "who comes our"
 	cont "way!"
@@ -28,9 +28,9 @@ _YujirouAfterBattleText::
 	para "..."
 	
 	para "I won't give up!"
-	line "Me and LICKITUNG"
+	line "I'll train with"
-	cont "will train until"
+	cont "my POKEMON until"
-	cont "become the best"
+	cont "we're the best"
 	cont "there is!"
 	
 	para "One day, we will"
@@ -39,7 +39,7 @@ _YujirouAfterBattleText::
 	done
 
 _YujirouIntro2::
-	text "Hey! You're back!"
+	text "Hey! It's you!"
 	
 	para "After GIOVANNI got"
 	line "exposed for who"
@@ -145,13 +145,13 @@ _ViridianPreGymSign3::
 	cont "sometimes hurt"
 	cont "itself!"
 	
-	para "It does not remain"
+	para "It will be cured"
-	line "after battles."
+	line "after a battle."
 	
-	para "It can also be"
+	para "Switching out a"
-	line "cured by swapping"
+	line "confused #MON"
-	cont "your #MON during"
+	cont "will also cure"
-	cont "the battle!"
+	cont "it!"
 	done
 
 _ViridianPreGymSign4::