diff options
Diffstat (limited to 'maps/MountMoon.asm')
| -rw-r--r-- | maps/MountMoon.asm | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 649b5686f..1f7301ebb 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -2,21 +2,19 @@ const_value set 2 const MOUNTMOON_SILVER MountMoon_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .RivalEncounter + scene_script .DummyScene .MapCallbacks: db 0 -.Trigger0: +.RivalEncounter: priorityjump .RivalBattle end -.Trigger1: +.DummyScene: end .RivalBattle: @@ -36,7 +34,7 @@ MountMoon_MapScriptHeader: iftrue .Chikorita winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss setlasttalked MOUNTMOON_SILVER - loadtrainer RIVAL2, 3 + loadtrainer RIVAL2, RIVAL2_1_TOTODILE startbattle dontrestartmapmusic reloadmapafterbattle @@ -45,7 +43,7 @@ MountMoon_MapScriptHeader: .Totodile: winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss setlasttalked MOUNTMOON_SILVER - loadtrainer RIVAL2, 1 + loadtrainer RIVAL2, RIVAL2_1_CHIKORITA startbattle dontrestartmapmusic reloadmapafterbattle @@ -54,7 +52,7 @@ MountMoon_MapScriptHeader: .Chikorita: winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss setlasttalked MOUNTMOON_SILVER - loadtrainer RIVAL2, 2 + loadtrainer RIVAL2, RIVAL2_1_CYNDAQUIL startbattle dontrestartmapmusic reloadmapafterbattle @@ -68,7 +66,7 @@ MountMoon_MapScriptHeader: closetext applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter disappear MOUNTMOON_SILVER - dotrigger $1 + setscene $1 setevent EVENT_BEAT_RIVAL_IN_MT_MOON playmapmusic end @@ -177,12 +175,12 @@ MountMoon_MapEventHeader: warp_def $3, $19, 3, MOUNT_MOON warp_def $d, $19, 4, MOUNT_MOON -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_SILVER, 3, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL + object_event SPRITE_SILVER, 3, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL |