diff options
Diffstat (limited to 'maps/MountMoon.asm')
| -rw-r--r-- | maps/MountMoon.asm | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 7ef6e7022..d3973ab65 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -1,3 +1,6 @@ +const_value set 2 + const MOUNTMOON_SILVER + MountMoon_MapScriptHeader: .MapTriggers: db 2 @@ -21,19 +24,19 @@ UnknownScript_0x7408e: showemote EMOTE_SHOCK, PLAYER, 15 special Special_RotatePalettesRightMusic pause 15 - applymovement $2, MovementData_0x740f9 + applymovement MOUNTMOON_SILVER, MovementData_0x740f9 playmusic MUSIC_RIVAL_ENCOUNTER loadfont writetext UnknownText_0x74105 + waitbutton closetext - loadmovesprites checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x740c3 checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x740d3 winlosstext UnknownText_0x7419d, UnknownText_0x742e0 setlasttalked $2 - loadtrainer RIVAL2, 3 + scriptedtrainerdata RIVAL2, 3 startbattle reloadmapmusic returnafterbattle @@ -42,7 +45,7 @@ UnknownScript_0x7408e: UnknownScript_0x740c3: winlosstext UnknownText_0x7419d, UnknownText_0x742e0 setlasttalked $2 - loadtrainer RIVAL2, 1 + scriptedtrainerdata RIVAL2, 1 startbattle reloadmapmusic returnafterbattle @@ -51,7 +54,7 @@ UnknownScript_0x740c3: UnknownScript_0x740d3: winlosstext UnknownText_0x7419d, UnknownText_0x742e0 setlasttalked $2 - loadtrainer RIVAL2, 2 + scriptedtrainerdata RIVAL2, 2 startbattle reloadmapmusic returnafterbattle @@ -61,10 +64,10 @@ UnknownScript_0x740e3: playmusic MUSIC_RIVAL_AFTER loadfont writetext UnknownText_0x741fa + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x740fd - disappear $2 + applymovement MOUNTMOON_SILVER, MovementData_0x740fd + disappear MOUNTMOON_SILVER dotrigger $1 setevent EVENT_BEAT_RIVAL_IN_MT_MOON playmapmusic |