From b94c1f7084b370cd7be16a75a79e136bda4a35a3 Mon Sep 17 00:00:00 2001 From: surskitty Date: Fri, 2 Feb 2018 10:57:06 -0500 Subject: [PATCH] Labelling the Victory Road rival script --- maps/VictoryRoad.asm | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index e0389faeb..816f268b4 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -21,7 +21,7 @@ VictoryRoad_MapScripts: .DummyScene1: end -UnknownScript_0x74492: +VictoryRoadRival0: moveobject VICTORYROAD_SILVER, 18, 11 spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 @@ -29,69 +29,69 @@ UnknownScript_0x74492: pause 15 appear VICTORYROAD_SILVER applymovement VICTORYROAD_SILVER, MovementData_0x74539 - scall UnknownScript_0x744d4 + scall VictoryRoadRivalNext applymovement VICTORYROAD_SILVER, MovementData_0x7454c disappear VICTORYROAD_SILVER setscene 1 playmapmusic end -UnknownScript_0x744b5: +VictoryRoadRival1: spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic pause 15 appear VICTORYROAD_SILVER applymovement VICTORYROAD_SILVER, MovementData_0x74542 - scall UnknownScript_0x744d4 + scall VictoryRoadRivalNext applymovement VICTORYROAD_SILVER, MovementData_0x74555 disappear VICTORYROAD_SILVER setscene 1 playmapmusic end -UnknownScript_0x744d4: +VictoryRoadRivalNext: spriteface PLAYER, DOWN playmusic MUSIC_RIVAL_ENCOUNTER opentext - writetext UnknownText_0x7455f + writetext VictoryRoadRivalBeforeText waitbutton closetext setevent EVENT_RIVAL_VICTORY_ROAD checkevent EVENT_GOT_TOTODILE_FROM_ELM - iftrue UnknownScript_0x744ff + iftrue .GotTotodile checkevent EVENT_GOT_CHIKORITA_FROM_ELM - iftrue UnknownScript_0x7450f - winlosstext UnknownText_0x7463d, UnknownText_0x747aa + iftrue .GotChikorita + winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText setlasttalked VICTORYROAD_SILVER loadtrainer RIVAL1, RIVAL1_5_TOTODILE startbattle dontrestartmapmusic reloadmapafterbattle - jump UnknownScript_0x7451f + jump .AfterBattle -UnknownScript_0x744ff: - winlosstext UnknownText_0x7463d, UnknownText_0x747aa +.GotTotodile: + winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText setlasttalked VICTORYROAD_SILVER loadtrainer RIVAL1, RIVAL1_5_CHIKORITA startbattle dontrestartmapmusic reloadmapafterbattle - jump UnknownScript_0x7451f + jump .AfterBattle -UnknownScript_0x7450f: - winlosstext UnknownText_0x7463d, UnknownText_0x747aa +.GotChikorita: + winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText setlasttalked VICTORYROAD_SILVER loadtrainer RIVAL1, RIVAL1_5_CYNDAQUIL startbattle dontrestartmapmusic reloadmapafterbattle - jump UnknownScript_0x7451f + jump .AfterBattle -UnknownScript_0x7451f: +.AfterBattle: playmusic MUSIC_RIVAL_AFTER opentext - writetext UnknownText_0x746ce + writetext VictoryRoadRivalAfterText waitbutton closetext end @@ -163,7 +163,7 @@ MovementData_0x74555: step DOWN step_end -UnknownText_0x7455f: +VictoryRoadRivalBeforeText: text "Hold it." para "…Are you going to" @@ -189,7 +189,7 @@ UnknownText_0x7455f: line "I challenge you!" done -UnknownText_0x7463d: +VictoryRoadRivalDefeatText: text "…I couldn't win…" para "I gave it every-" @@ -205,7 +205,7 @@ UnknownText_0x7463d: line "said to me…" done -UnknownText_0x746ce: +VictoryRoadRivalAfterText: text "…I haven't given up" line "on becoming the" cont "greatest trainer…" @@ -227,7 +227,7 @@ UnknownText_0x746ce: line "at it until then." done -UnknownText_0x747aa: +VictoryRoadRivalVictoryText: text "…Humph!" para "When it comes down" @@ -257,8 +257,8 @@ VictoryRoad_MapEvents: .CoordEvents: db 2 - coord_event 12, 8, 0, UnknownScript_0x74492 - coord_event 13, 8, 0, UnknownScript_0x744b5 + coord_event 12, 8, 0, VictoryRoadRival0 + coord_event 13, 8, 0, VictoryRoadRival1 .BGEvents: db 2