diff options
Diffstat (limited to 'maps/VictoryRoad.asm')
| -rw-r--r-- | maps/VictoryRoad.asm | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 25f58022e..d4e3840bb 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -1,3 +1,11 @@ +const_value set 2 + const VICTORYROAD_SILVER + const VICTORYROAD_POKE_BALL1 + const VICTORYROAD_POKE_BALL2 + const VICTORYROAD_POKE_BALL3 + const VICTORYROAD_POKE_BALL4 + const VICTORYROAD_POKE_BALL5 + VictoryRoad_MapScriptHeader: .MapTriggers: db 2 @@ -16,16 +24,16 @@ UnknownScript_0x74491: end UnknownScript_0x74492: - moveperson $2, $12, $b + moveperson VICTORYROAD_SILVER, $12, $b spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 special Special_RotatePalettesRightMusic pause 15 - appear $2 - applymovement $2, MovementData_0x74539 + appear VICTORYROAD_SILVER + applymovement VICTORYROAD_SILVER, MovementData_0x74539 scall UnknownScript_0x744d4 - applymovement $2, MovementData_0x7454c - disappear $2 + applymovement VICTORYROAD_SILVER, MovementData_0x7454c + disappear VICTORYROAD_SILVER dotrigger $1 playmapmusic end @@ -35,11 +43,11 @@ UnknownScript_0x744b5: showemote EMOTE_SHOCK, PLAYER, 15 special Special_RotatePalettesRightMusic pause 15 - appear $2 - applymovement $2, MovementData_0x74542 + appear VICTORYROAD_SILVER + applymovement VICTORYROAD_SILVER, MovementData_0x74542 scall UnknownScript_0x744d4 - applymovement $2, MovementData_0x74555 - disappear $2 + applymovement VICTORYROAD_SILVER, MovementData_0x74555 + disappear VICTORYROAD_SILVER dotrigger $1 playmapmusic end @@ -49,8 +57,8 @@ UnknownScript_0x744d4: playmusic MUSIC_RIVAL_ENCOUNTER loadfont writetext UnknownText_0x7455f + waitbutton closetext - loadmovesprites setevent EVENT_RIVAL_VICTORY_ROAD checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x744ff @@ -58,7 +66,7 @@ UnknownScript_0x744d4: iftrue UnknownScript_0x7450f winlosstext UnknownText_0x7463d, UnknownText_0x747aa setlasttalked $2 - loadtrainer RIVAL1, RIVAL1_15 + scriptedtrainerdata RIVAL1, RIVAL1_15 startbattle reloadmapmusic returnafterbattle @@ -67,7 +75,7 @@ UnknownScript_0x744d4: UnknownScript_0x744ff: winlosstext UnknownText_0x7463d, UnknownText_0x747aa setlasttalked $2 - loadtrainer RIVAL1, RIVAL1_13 + scriptedtrainerdata RIVAL1, RIVAL1_13 startbattle reloadmapmusic returnafterbattle @@ -76,7 +84,7 @@ UnknownScript_0x744ff: UnknownScript_0x7450f: winlosstext UnknownText_0x7463d, UnknownText_0x747aa setlasttalked $2 - loadtrainer RIVAL1, RIVAL1_14 + scriptedtrainerdata RIVAL1, RIVAL1_14 startbattle reloadmapmusic returnafterbattle @@ -86,8 +94,8 @@ UnknownScript_0x7451f: playmusic MUSIC_RIVAL_AFTER loadfont writetext UnknownText_0x746ce + waitbutton closetext - loadmovesprites end ItemFragment_0x74529: |