diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm index ef7b2a80..33c7578a 100644 --- a/data/events/hidden_objects.asm +++ b/data/events/hidden_objects.asm @@ -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: diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm index f76c27b5..e79c1173 100644 --- a/data/maps/objects/Museum1F.asm +++ b/data/maps/objects/Museum1F.asm @@ -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 diff --git a/data/text/text_2.asm b/data/text/text_2.asm index 5dab31e3..72fd4a44 100644 --- a/data/text/text_2.asm +++ b/data/text/text_2.asm @@ -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:: diff --git a/data/text_predef_pointers.asm b/data/text_predef_pointers.asm index c78df372..a9b2cc2c 100644 --- a/data/text_predef_pointers.asm +++ b/data/text_predef_pointers.asm @@ -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 diff --git a/engine/events/hidden_objects/museum_fossils.asm b/engine/events/hidden_objects/museum_fossils.asm index e09a84d0..5784d92f 100644 --- a/engine/events/hidden_objects/museum_fossils.asm +++ b/engine/events/hidden_objects/museum_fossils.asm @@ -23,29 +23,27 @@ KabutopsFossilText:: text_end ScarletBook:: - text_far ScarletBook1 ld a, SCREAM_TAIL ld [wcf91], a call PlayCry - jp DisplayMonFrontSpriteInBox - text_far ScarletBook2 + call DisplayMonFrontSpriteInBox + call EnableAutoTextBoxDrawing + tx_pre ScarletBook1 ld a, SANDY_SHOCKS ld [wcf91], a call PlayCry - jp DisplayMonFrontSpriteInBox - text_far ScarletBook3 + call DisplayMonFrontSpriteInBox + call EnableAutoTextBoxDrawing + tx_pre ScarletBook2 + ret ScarletBook1:: text_far _ScarletBook1 text_end - + ScarletBook2:: text_far _ScarletBook2 text_end - -ScarletBook3:: - text_far _ScarletBook3 - text_end DisplayMonFrontSpriteInBox: ; Displays a pokemon's front sprite in a pop-up window. diff --git a/maps/Museum1F.blk b/maps/Museum1F.blk index a96771ba..e9d2ca0d 100644 Binary files a/maps/Museum1F.blk and b/maps/Museum1F.blk differ diff --git a/scripts/Museum1F.asm b/scripts/Museum1F.asm index b3ca141b..054db8a3 100644 --- a/scripts/Museum1F.asm +++ b/scripts/Museum1F.asm @@ -247,6 +247,12 @@ Museum1FText_5c2bc: text_far _Museum1FText_5c2bc text_end -SadaText: +SadaTextUhh: text_far _SadaText - text_end \ No newline at end of file + text_end + +SadaText: + text_asm + ld hl, SadaTextUhh; wrong label + call PrintText + jp TextScriptEnd \ No newline at end of file diff --git a/text/Museum1F.asm b/text/Museum1F.asm index 146e9d09..c2b1d9a3 100644 --- a/text/Museum1F.asm +++ b/text/Museum1F.asm @@ -109,11 +109,9 @@ _Museum1FText_5c2bc:: _SadaText:: text "This book is so" - line "interesting! It" - cont "contains such" - cont "unusual #MON!" + line "interesting!" - text "I want to research" + para "I want to research" line "ancient #MON" cont "when I grow up!"