Post-release bugfixes: Batch 2

This commit fixes the following bugs:

- Viewing the Town Map in Viridian Pre-Gym would show the player as being in Cerulean.

- Psychic, Psywave, Night Shade and Dazzling Gleam wouldn't shake the full screen

- Okay, NOW it's impossible to trap yourself in Cinnabar Volcano.

- Getting the Vermilion Beauty gift would lock you out from getting the Silph Co Lapras gift later.

- Text fixes
This commit is contained in:
Martha Schilling 2024-01-12 12:33:50 +00:00
parent 3e3b89552c
commit 0c650630e0
12 changed files with 36 additions and 49 deletions

View file

@ -3,9 +3,6 @@ _CeruleanHouse2Text_74e77::
line "are owned only by"
cont "skilled trainers."
para "I see you have"
line "at least one."
para "Those BADGEs have"
line "amazing secrets!"
prompt
@ -34,15 +31,9 @@ _CeruleanHouse2Text_74e96::
prompt
_CeruleanHouse2Text_74e9b::
text "#MON up to L30"
line "will obey you."
para "Any higher, they"
line "become unruly!"
para "It also lets you"
line "use CUT outside"
cont "of battle."
text "It lets you use"
line "CUT outside of"
cont "battle."
prompt
_CeruleanHouse2Text_74ea0::
@ -56,15 +47,9 @@ _CeruleanHouse2Text_74ea0::
prompt
_CeruleanHouse2Text_74ea5::
text "#MON up to L50"
line "will obey you."
para "Any higher, they"
line "become unruly!"
para "It also lets you"
line "use STRENGTH out-"
cont "side of battle."
text "It lets you use"
line "STRENGTH outside"
cont "of battle."
prompt
_CeruleanHouse2Text_74eaa::
@ -78,11 +63,14 @@ _CeruleanHouse2Text_74eaa::
prompt
_CeruleanHouse2Text_74eaf::
text "#MON up to L70"
line "will obey you."
text "Hmm... I can't"
line "remember."
para "Any higher, they"
line "become unruly!"
para "Should you beat"
line "SABRINA's tough"
cont "PSYCHIC #MON,"
cont "she may tell"
cont "you."
prompt
_CeruleanHouse2Text_74eb4::
@ -92,6 +80,7 @@ _CeruleanHouse2Text_74eb4::
prompt
_CeruleanHouse2Text_74eb9::
text "All #MON will"
line "obey you!"
text "You'll be able to"
line "challenge the"
cont "#MON LEAGUE!"
prompt

View file

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

View file

@ -4,7 +4,7 @@ _DayCareAllRightThenText::
text_end
_DayCareComeAgainText::
text "come again."
text "Come again."
done
_DayCareNoRoomForMonText::

View file

@ -36,7 +36,7 @@ _BeforeReceivedBottleCapText::
para "I won't give up!"
line "I'll train with"
cont "my POKEMON until"
cont "my #MON until"
cont "we're the best"
cont "there is!"

View file

@ -42,7 +42,7 @@ _DexRatingText_Own50To64::
done
_DexRatingText_Own65To79::
text "Ho! This is geting"
text "This is getting"
line "even better!"
done
@ -53,8 +53,8 @@ _DexRatingText_Own80To99::
done
_DexRatingText_Own100To114::
text "You finally got at"
line "least 100 species!"
text "You've finally got"
line "over 100 species!"
cont "Great job!"
done
@ -90,8 +90,8 @@ _DexRatingText_Own180To199::
done
_DexRatingText_Own200To214::
text "You finally got at"
line "least 200 species!"
text "You finally passed"
line "200 species!"
cont "I can't believe"
cont "how good you are!"
done