Finish the Pewter Museum of Science

This fixes all the bugs with the Scarlet Book and Sada. Thanks to Vortiene for the help!
This commit is contained in:
May Evans 2022-12-06 00:20:10 +00:00
parent c678a329a4
commit 1042a9759b
8 changed files with 32 additions and 45 deletions

View file

@ -242,7 +242,7 @@ ViridianGymHiddenObjects:
Museum1FHiddenObjects:
hidden_object 2, 3, SPRITE_FACING_UP, AerodactylFossil
hidden_object 2, 6, SPRITE_FACING_UP, KabutopsFossil
hidden_object 3, 3, SPRITE_FACING_UP, ScarletBook
hidden_object 7, 1, SPRITE_FACING_UP, ScarletBook
db -1 ; end
PewterGymHiddenObjects:

View file

@ -16,6 +16,6 @@ Museum1F_Object:
object_event 15, 2, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
object_event 17, 4, SPRITE_SCIENTIST, STAY, NONE, 4 ; person
object_event 16, 2, SPRITE_OLD_AMBER, STAY, NONE, 5 ; person
object_event 1, 1, SPRITE_COOLTRAINER_F, STAY, NONE, 6 ; person
object_event 6, 2, SPRITE_COOLTRAINER_F, STAY, NONE, 6 ; person
def_warps_to MUSEUM_1F

View file

@ -589,7 +589,7 @@ _KabutopsFossilText::
cont "rare #MON."
done
_ScarletBook1:: ; please don't overflow please don't overflow
_ScarletBook1::
text "A member of our"
line "survey team"
cont "photographed an"
@ -597,42 +597,25 @@ _ScarletBook1:: ; please don't overflow please don't overflow
cont "JIGGLYPUFF-like"
cont "#MON."
text "It has been"
line "named"
cont "SCREAM TAIL."
para "It has been named"
line "SCREAM TAIL."
done
_ScarletBook2::
text "It is very"
line "aggressive, and"
cont "attacks all in"
cont "sight."
text "We need to be"
line "more careful."
text "Another team"
line "got back. They"
line "returned. They"
cont "were attacked by"
cont "a MAGNETON that"
cont "looked like a"
cont "a tyrannosaur."
done
_ScarletBook3::
text "These #MON are"
line "far too strong."
text "Their power is"
line "beyond mankind's"
cont "comprehension."
text "They must be"
line "contained, for"
cont "all our sakes."
para "We called it"
line "SANDY SHOCKS."
para "These #MON must"
line "be contained."
done
_LinkCableHelpText1::

View file

@ -70,3 +70,5 @@ TextPredefs::
add_tx_pre BookOrSculptureText ; 40
add_tx_pre ElevatorText ; 41
add_tx_pre PokemonStuffText ; 42
add_tx_pre ScarletBook1 ; 43
add_tx_pre ScarletBook2 ; 44