diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index ca652afc..9342ecd2 100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -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 diff --git a/data/text/text_2.asm b/data/text/text_2.asm index c2299c65..a2dd3ef4 100644 --- a/data/text/text_2.asm +++ b/data/text/text_2.asm @@ -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:: diff --git a/scripts/CinnabarIsland.asm b/scripts/CinnabarIsland.asm index a1b20cd3..9a3e0e43 100644 --- a/scripts/CinnabarIsland.asm +++ b/scripts/CinnabarIsland.asm @@ -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 diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm index fdb1c7a8..863b3698 100644 --- a/scripts/VermilionCity.asm +++ b/scripts/VermilionCity.asm @@ -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 diff --git a/text/VermilionCity.asm b/text/VermilionCity.asm index d038fc5c..bede4178 100644 --- a/text/VermilionCity.asm +++ b/text/VermilionCity.asm @@ -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