diff options
Diffstat (limited to 'maps/VermilionCity.asm')
| -rw-r--r-- | maps/VermilionCity.asm | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 426cc8249..9fe5e31d3 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -1,3 +1,11 @@ +const_value set 2 + const VERMILIONCITY_TEACHER + const VERMILIONCITY_GRAMPS + const VERMILIONCITY_MACHOP + const VERMILIONCITY_SUPER_NERD + const VERMILIONCITY_BIG_SNORLAX + const VERMILIONCITY_POKEFAN_M + VermilionCity_MapScriptHeader: .MapTriggers: db 0 @@ -22,13 +30,13 @@ VermilionMachop: loadfont writetext UnknownText_0x1aaaca cry MACHOP + waitbutton closetext - loadmovesprites earthquake 30 loadfont writetext UnknownText_0x1aaae2 + waitbutton closetext - loadmovesprites end SuperNerdScript_0x1aa99b: @@ -39,19 +47,19 @@ VermilionSnorlax: special SpecialSnorlaxAwake iftrue UnknownScript_0x1aa9ab writetext UnknownText_0x1aab64 + waitbutton closetext - loadmovesprites end UnknownScript_0x1aa9ab: writetext UnknownText_0x1aab84 pause 15 cry SNORLAX - loadmovesprites + closetext writecode VAR_BATTLETYPE, BATTLETYPE_FORCEITEM - loadpokedata SNORLAX, 50 + scriptedpokedata SNORLAX, 50 startbattle - disappear $6 + disappear VERMILIONCITY_BIG_SNORLAX setevent EVENT_FOUGHT_SNORLAX returnafterbattle end @@ -66,20 +74,20 @@ VermilionGymBadgeGuy: if_greater_than 13, .MostBadges if_greater_than 9, .SomeBadges writetext UnknownText_0x1aabc8 + waitbutton closetext - loadmovesprites end .SomeBadges writetext UnknownText_0x1aac2b + waitbutton closetext - loadmovesprites end .MostBadges writetext UnknownText_0x1aac88 + waitbutton closetext - loadmovesprites end .AllBadges @@ -90,9 +98,9 @@ VermilionGymBadgeGuy: setevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY .AlreadyGotItem writetext UnknownText_0x1aad4a - closetext + waitbutton .Done - loadmovesprites + closetext end VermilionCitySign: |