added roingus girl and new cinnabar quiz questions

This commit is contained in:
MementoMartha 2022-09-27 15:26:37 +01:00
parent 4eaae2ab9d
commit 89bb05b2dc
5 changed files with 37 additions and 27 deletions

View file

@ -28,5 +28,6 @@ VermilionCity_Object:
object_event 30, 7, SPRITE_GAMBLER, STAY, NONE, 4 ; person
object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person
object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person
object_event 31, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 14 ; person
def_warps_to VERMILION_CITY

View file

@ -320,21 +320,7 @@ _GameOverText::
_CinnabarGymQuizIntroText::
text "#MON Quiz!"
para "Get it right and"
line "the door opens to"
cont "the next room!"
para "Get it wrong and"
line "face a trainer!"
para "If you want to"
line "conserve your"
cont "#MON for the"
cont "GYM LEADER..."
para "Then get it right!"
line "Here we go!"
line "Here we go!" ; Removing the unnecessarily long text that appears every single time
prompt
_CinnabarQuizQuestionsText1::
@ -349,22 +335,23 @@ _CinnabarQuizQuestionsText2::
done
_CinnabarQuizQuestionsText3::
text "POLIWAG evolves 3"
line "times?"
text "A total of 151"
line "#MON species"
cont "have been"
cont "discovered?"
done
_CinnabarQuizQuestionsText4::
text "Are thunder moves"
line "effective against"
cont "ground element-"
cont "type #MON?"
text "Are FIGHTING-"
line "type moves super"
cont "effective on"
cont "STEEL #MON?"
done
_CinnabarQuizQuestionsText5::
text "#MON of the"
line "same kind and"
cont "level are not"
cont "identical?"
text "Is PENDRAKEN a"
line "WATER- and FAIRY-"
cont "type #MON?"
done
_CinnabarQuizQuestionsText6::

View file

@ -17,10 +17,10 @@ CinnabarIslandScript0:
call IsItemInBag
ret nz
ld a, [wYCoord]
cp 4
cp 10
ret nz
ld a, [wXCoord]
cp 18
cp 20
ret nz
ld a, PLAYER_DIR_UP
ld [wPlayerMovingDirection], a

View file

@ -131,6 +131,7 @@ VermilionCity_TextPointers:
dw VermilionCityText11
dw VermilionCityText12
dw VermilionCityText13
dw RoingusText
VermilionCityText1:
text_far _VermilionCityText1
@ -278,3 +279,7 @@ VermilionCityText12:
VermilionCityText13:
text_far _VermilionCityText13
text_end
RoingusText:
text_far _RoingusText
text_end

View file

@ -130,3 +130,20 @@ _VermilionCityText15::
text "The S.S.ANNE"
line "has returned!"
done
_RoingusText::
text "Hey! You've gotta"
line "hear this!"
para "A #MON that"
line "I've never seen"
cont "before appeared"
cont "near the dock!"
para "If I'm the first"
line "to discover it, I"
cont "could name it!"
para "I'm gonna call"
line "it... ROINGUS!"
done