diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 14:42:46 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 20:46:09 -0500 |
| commit | c0be66fc2e0ace7a9004fcbebe3a7595c30cda87 (patch) | |
| tree | 947ee58af189e0ff488e1eb556d951d1393dcd5f /data/maps/Route22 | |
| parent | 85e5c57e8c86cca00e8bfc7d54e21d08c9e62e69 (diff) | |
Document Viridian City scripts and adjacent routes
Diffstat (limited to 'data/maps/Route22')
| -rw-r--r-- | data/maps/Route22/map.json | 14 | ||||
| -rw-r--r-- | data/maps/Route22/scripts.inc | 150 | ||||
| -rw-r--r-- | data/maps/Route22/text.inc | 265 |
3 files changed, 141 insertions, 288 deletions
diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index c6f903acc..e8695121f 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -62,7 +62,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 1, - "script": "Route22_EventScript_16828C" + "script": "Route22_EventScript_EarlyRivalTriggerTop" }, { "type": "trigger", @@ -71,7 +71,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 1, - "script": "Route22_EventScript_168298" + "script": "Route22_EventScript_EarlyRivalTriggerMid" }, { "type": "trigger", @@ -80,7 +80,7 @@ "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 1, - "script": "Route22_EventScript_1682AB" + "script": "Route22_EventScript_EarlyRivalTriggerBottom" }, { "type": "trigger", @@ -89,7 +89,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 3, - "script": "Route22_EventScript_1683ED" + "script": "Route22_EventScript_LateRivalTriggerTop" }, { "type": "trigger", @@ -98,7 +98,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 3, - "script": "Route22_EventScript_1683F9" + "script": "Route22_EventScript_LateRivalTriggerMid" }, { "type": "trigger", @@ -107,7 +107,7 @@ "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 3, - "script": "Route22_EventScript_16840C" + "script": "Route22_EventScript_LateRivalTriggerBottom" } ], "bg_events": [ @@ -116,7 +116,7 @@ "x": 7, "y": 12, "elevation": 0, - "script": "Route22_EventScript_1684E2" + "script": "Route22_EventScript_LeagueGateSign" } ] } diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 8036883f3..dbc10e129 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -1,100 +1,94 @@ Route22_MapScripts:: @ 816828B .byte 0 -Route22_EventScript_16828C:: @ 816828C +Route22_EventScript_EarlyRivalTriggerTop:: @ 816828C lockall setvar VAR_TEMP_1, 0 - goto EventScript_1682BE - -EventScript_168297:: @ 8168297 + goto Route22_EventScript_EarlyRival end -Route22_EventScript_168298:: @ 8168298 +Route22_EventScript_EarlyRivalTriggerMid:: @ 8168298 lockall setvar VAR_TEMP_1, 1 setobjectxyperm 1, 25, 5 - goto EventScript_1682BE - -EventScript_1682AA:: @ 81682AA + goto Route22_EventScript_EarlyRival end -Route22_EventScript_1682AB:: @ 81682AB +Route22_EventScript_EarlyRivalTriggerBottom:: @ 81682AB lockall setvar VAR_TEMP_1, 2 setobjectxyperm 1, 25, 5 - goto EventScript_1682BE - -EventScript_1682BD:: @ 81682BD + goto Route22_EventScript_EarlyRival end -EventScript_1682BE:: @ 81682BE +Route22_EventScript_EarlyRival:: @ 81682BE textcolor 0 playbgm MUS_RIVAL1, 0 addobject 1 compare VAR_TEMP_1, 0 - call_if_eq EventScript_168350 + call_if_eq Route22_EventScript_EarlyRivalApproach compare VAR_TEMP_1, 1 - call_if_eq EventScript_168350 + call_if_eq Route22_EventScript_EarlyRivalApproach compare VAR_TEMP_1, 2 - call_if_eq EventScript_16835B + call_if_eq Route22_EventScript_EarlyRivalApproachBottom delay 6 - msgbox gUnknown_8188890 + msgbox Route22_Text_EarlyRivalIntro compare VAR_STARTER_MON, 2 - call_if_eq EventScript_16836D + call_if_eq Route22_EventScript_EarlyRivalSquirtle compare VAR_STARTER_MON, 1 - call_if_eq EventScript_16837C + call_if_eq Route22_EventScript_EarlyRivalBulbasaur compare VAR_STARTER_MON, 0 - call_if_eq EventScript_16838B - msgbox gUnknown_8188974 + call_if_eq Route22_EventScript_EarlyRivalCharmander + msgbox Route22_Text_EarlyRivalPostBattle closemessage delay 10 playbgm MUS_RIVAL2, 0 compare VAR_TEMP_1, 0 - call_if_eq EventScript_16839A + call_if_eq Route22_EventScript_EarlyRivalExit compare VAR_TEMP_1, 1 - call_if_eq EventScript_16839A + call_if_eq Route22_EventScript_EarlyRivalExit compare VAR_TEMP_1, 2 - call_if_eq EventScript_1683A5 + call_if_eq Route22_EventScript_EarlyRivalExitBottom fadedefaultbgm removeobject 1 setvar VAR_MAP_SCENE_ROUTE22, 2 releaseall end -EventScript_168350:: @ 8168350 - applymovement 1, Movement_1683D1 +Route22_EventScript_EarlyRivalApproach:: @ 8168350 + applymovement 1, Route22_Movement_RivalApproach waitmovement 0 return -EventScript_16835B:: @ 816835B - applymovement 1, Movement_1683D9 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3 +Route22_EventScript_EarlyRivalApproachBottom:: @ 816835B + applymovement 1, Route22_Movement_RivalApproachBottom + applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival waitmovement 0 return -EventScript_16836D:: @ 816836D - trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A +Route22_EventScript_EarlyRivalSquirtle:: @ 816836D + trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory return -EventScript_16837C:: @ 816837C - trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A +Route22_EventScript_EarlyRivalBulbasaur:: @ 816837C + trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory return -EventScript_16838B:: @ 816838B - trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A +Route22_EventScript_EarlyRivalCharmander:: @ 816838B + trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory return -EventScript_16839A:: @ 816839A - applymovement 1, Movement_1683B8 +Route22_EventScript_EarlyRivalExit:: @ 816839A + applymovement 1, Route22_Movement_EarlyRivalExit waitmovement 0 return -EventScript_1683A5:: @ 81683A5 - applymovement 1, Movement_1683C5 +Route22_EventScript_EarlyRivalExitBottom:: @ 81683A5 + applymovement 1, Route22_Movement_EarlyRivalExitBottom waitmovement 0 return -Movement_1683B0:: @ 8 +Route22_Movement_UnusedRivalExit:: @ 8 walk_right walk_right walk_right @@ -104,7 +98,7 @@ Movement_1683B0:: @ 8 walk_right step_end -Movement_1683B8:: @ 81683B8 +Route22_Movement_EarlyRivalExit:: @ 81683B8 walk_down walk_right walk_right @@ -119,7 +113,7 @@ Movement_1683B8:: @ 81683B8 walk_down step_end -Movement_1683C5:: @ 81683C5 +Route22_Movement_EarlyRivalExitBottom:: @ 81683C5 walk_right walk_right walk_right @@ -133,7 +127,7 @@ Movement_1683C5:: @ 81683C5 walk_down step_end -Movement_1683D1:: @ 81683D1 +Route22_Movement_RivalApproach:: @ 81683D1 walk_right walk_right walk_right @@ -143,7 +137,7 @@ Movement_1683D1:: @ 81683D1 walk_right step_end -Movement_1683D9:: @ 81683D9 +Route22_Movement_RivalApproachBottom:: @ 81683D9 walk_right walk_right walk_right @@ -155,7 +149,7 @@ Movement_1683D9:: @ 81683D9 walk_in_place_fastest_down step_end -Movement_1683E3:: @ 81683E3 +Route22_Movement_PlayerFaceRival:: @ 81683E3 delay_16 delay_16 delay_16 @@ -167,55 +161,49 @@ Movement_1683E3:: @ 81683E3 walk_in_place_fastest_up step_end -Route22_EventScript_1683ED:: @ 81683ED +Route22_EventScript_LateRivalTriggerTop:: @ 81683ED lockall setvar VAR_TEMP_1, 0 - goto EventScript_16841F - -EventScript_1683F8:: @ 81683F8 + goto Route22_EventScript_LateRival end -Route22_EventScript_1683F9:: @ 81683F9 +Route22_EventScript_LateRivalTriggerMid:: @ 81683F9 lockall setvar VAR_TEMP_1, 1 setobjectxyperm 1, 25, 5 - goto EventScript_16841F - -EventScript_16840B:: @ 816840B + goto Route22_EventScript_LateRival end -Route22_EventScript_16840C:: @ 816840C +Route22_EventScript_LateRivalTriggerBottom:: @ 816840C lockall setvar VAR_TEMP_1, 2 setobjectxyperm 1, 25, 5 - goto EventScript_16841F - -EventScript_16841E:: @ 816841E + goto Route22_EventScript_LateRival end -EventScript_16841F:: @ 816841F +Route22_EventScript_LateRival:: @ 816841F textcolor 0 playbgm MUS_RIVAL1, 0 addobject 1 compare VAR_TEMP_1, 0 - call_if_eq EventScript_16849C + call_if_eq Route22_EventScript_LateRivalApproach compare VAR_TEMP_1, 1 - call_if_eq EventScript_16849C + call_if_eq Route22_EventScript_LateRivalApproach compare VAR_TEMP_1, 2 - call_if_eq EventScript_1684A7 - msgbox gUnknown_8188A3C + call_if_eq Route22_EventScript_LateRivalApproachBottom + msgbox Route22_Text_LateRivalIntro setvar VAR_LAST_TALKED, 1 compare VAR_STARTER_MON, 2 - call_if_eq EventScript_1684B9 + call_if_eq Route22_EventScript_LateRivalSquirtle compare VAR_STARTER_MON, 1 - call_if_eq EventScript_1684C4 + call_if_eq Route22_EventScript_LateRivalBulbasaur compare VAR_STARTER_MON, 0 - call_if_eq EventScript_1684CF - msgbox gUnknown_8188B29 + call_if_eq Route22_EventScript_LateRivalCharmander + msgbox Route22_Text_LateRivalPostBattle closemessage delay 10 playbgm MUS_RIVAL2, 0 - applymovement 1, Movement_1684DA + applymovement 1, Route22_Movement_LateRivalExit waitmovement 0 fadedefaultbgm removeobject 1 @@ -223,30 +211,30 @@ EventScript_16841F:: @ 816841F releaseall end -EventScript_16849C:: @ 816849C - applymovement 1, Movement_1683D1 +Route22_EventScript_LateRivalApproach:: @ 816849C + applymovement 1, Route22_Movement_RivalApproach waitmovement 0 return -EventScript_1684A7:: @ 81684A7 - applymovement 1, Movement_1683D9 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3 +Route22_EventScript_LateRivalApproachBottom:: @ 81684A7 + applymovement 1, Route22_Movement_RivalApproachBottom + applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival waitmovement 0 return -EventScript_1684B9:: @ 81684B9 - trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Text_188B08 +Route22_EventScript_LateRivalSquirtle:: @ 81684B9 + trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Route22_Text_LateRivalDefeat return -EventScript_1684C4:: @ 81684C4 - trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Text_188B08 +Route22_EventScript_LateRivalBulbasaur:: @ 81684C4 + trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Route22_Text_LateRivalDefeat return -EventScript_1684CF:: @ 81684CF - trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Text_188B08 +Route22_EventScript_LateRivalCharmander:: @ 81684CF + trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Route22_Text_LateRivalDefeat return -Movement_1684DA:: @ 81684DA +Route22_Movement_LateRivalExit:: @ 81684DA walk_left walk_left walk_left @@ -256,6 +244,6 @@ Movement_1684DA:: @ 81684DA walk_left step_end -Route22_EventScript_1684E2:: @ 81684E2 - msgbox gUnknown_8188BFF, MSGBOX_SIGN +Route22_EventScript_LeagueGateSign:: @ 81684E2 + msgbox Route22_Text_LeagueGateSign, MSGBOX_SIGN end diff --git a/data/maps/Route22/text.inc b/data/maps/Route22/text.inc index 7bfe6931b..72b4ca28b 100644 --- a/data/maps/Route22/text.inc +++ b/data/maps/Route22/text.inc @@ -1,201 +1,66 @@ -Text_1882E1:: @ 81882E1 - .string "Strong TRAINERS and WATER POKéMON\n" - .string "are common sights in these parts.\p" - .string "They say that MISTY of the\n" - .string "CERULEAN GYM trains here.$" - -Text_18835A:: @ 818835A - .string "You want to know if the fish are\n" - .string "biting?$" - -Text_188383:: @ 8188383 - .string "Dang!$" - -Text_188389:: @ 8188389 - .string "I can't catch anything good.\n" - .string "Not one good POKéMON to be had!$" - -Text_1883C6:: @ 81883C6 - .string "I got a big haul!\n" - .string "Wanna go for it?$" - -Text_1883E9:: @ 81883E9 - .string "Heheh, MAGIKARP just don't make\n" - .string "the grade, do they?$" - -Text_18841D:: @ 818841D - .string "I seem to only catch MAGIKARP!$" - -Text_18843C:: @ 818843C - .string "The sea cleanses my body and soul!$" - -Text_18845F:: @ 818845F - .string "Ayah!$" - -Text_188465:: @ 8188465 - .string "The sea is great and all, but I\n" - .string "like the mountains, too.$" - -Text_18849E:: @ 818849E - .string "おれだって たまには\n" - .string "およぎに くるぜ!$" - -Text_1884B3:: @ 81884B3 - .string "ぐわわ!$" - -Text_1884B8:: @ 81884B8 - .string "うきやすそう だと?\n" - .string "うるせー おおきな おせわだッ!$" - -Text_1884D4:: @ 81884D4 - .string "I caught my POKéMON at sea.$" - -Text_1884F0:: @ 81884F0 - .string "Diver!!\n" - .string "Down!!$" - -Text_1884FF:: @ 81884FF - .string "Where'd you catch your POKéMON?$" - -Text_18851F:: @ 818851F - .string "Right now, I'm in a triathlon meet.$" - -Text_188543:: @ 8188543 - .string "Pant…\n" - .string "Pant… Pant…$" - -Text_188555:: @ 8188555 - .string "I'm beat! But, I still have the\n" - .string "bike race and marathon left!$" - -Text_188592:: @ 8188592 - .string "Ahh!\n" - .string "Feel the sun and the wind!$" - -Text_1885B2:: @ 81885B2 - .string "Yow!\n" - .string "I lost!$" - -Text_1885BF:: @ 81885BF - .string "I'm sunburnt to a crisp!$" - -Text_1885D8:: @ 81885D8 - .string "Hey, don't scare away the fish!$" - -Text_1885F8:: @ 81885F8 - .string "Sorry! I'm just so frustrated from\n" - .string "not catching anything.$" - -Text_188632:: @ 8188632 - .string "Sheesh, I haven't caught a thing.\n" - .string "Could this place actually be a\l" - .string "giant pool or something?$" - -Text_18868C:: @ 818868C - .string "Keep me company till I get a hit.$" - -Text_1886AE:: @ 81886AE - .string "That burned some time.$" - -Text_1886C5:: @ 81886C5 - .string "Oh wait!\n" - .string "I got a bite! Yeah!$" - -Text_1886E2:: @ 81886E2 - .string "LIL: Huh? A battle?\n" - .string "IAN, can't you do it alone?$" - -Text_188712:: @ 8188712 - .string "LIL: Oh, see?\n" - .string "We lost. Happy now?$" - -Text_188734:: @ 8188734 - .string "LIL: I'm tired.\n" - .string "Can't we go home already?$" - -Text_18875E:: @ 818875E - .string "LIL: Huh? A battle?\n" - .string "I can't be bothered to do it alone.\l" - .string "Bring two POKéMON, won't you?$" - -Text_1887B4:: @ 81887B4 - .string "IAN: My sis doesn't get enough\n" - .string "exercise, so I made her come.$" - -Text_1887F1:: @ 81887F1 - .string "IAN: Awww, Sis!\n" - .string "Get it together!$" - -Text_188812:: @ 8188812 - .string "IAN: Come on, Sis!\p" - .string "You're not going to lose weight\n" - .string "like this!$" - -Text_188850:: @ 8188850 - .string "IAN: We want a two-on-two battle.\n" - .string "So can you bring two POKéMON?$" - -gUnknown_8188890:: @ 8188890 - .string "{RIVAL}: Hey! {PLAYER}!\p" - .string "You're off to the POKéMON LEAGUE?\n" - .string "Forget about it!\p" - .string "You probably don't have any\n" - .string "BADGES, do you?\p" - .string "The guard won't let you through\n" - .string "without them.\p" - .string "By the way, did your POKéMON get\n" - .string "any stronger?$" - -Text_188959:: @ 8188959 - .string "Awww!\n" - .string "You just lucked out!$" - -gUnknown_8188974:: @ 8188974 - .string "I heard the POKéMON LEAGUE is\n" - .string "crawling with tough TRAINERS.\p" - .string "I have to figure out how to get\n" - .string "past them.\p" - .string "You should quit dawdling and get a\n" - .string "move on!$" - -Text_188A07:: @ 8188A07 - .string "{RIVAL}“なんだ?\n" - .string "ポケモン 2ひきも\l" - .string "もってるの なぜか だって?\p" - .string "おまえも\n" - .string "つかまえれば いい じゃん!$" - -gUnknown_8188A3C:: @ 8188A3C - .string "{RIVAL}: What? {PLAYER}!\n" - .string "What a surprise to see you here!\p" - .string "So you're going to the POKéMON\n" - .string "LEAGUE?\p" - .string "You collected all the BADGES, too?\n" - .string "That's cool!\p" - .string "Then I'll whip you, {PLAYER}, as a\n" - .string "warm-up for the POKéMON LEAGUE!\p" - .string "Come on!$" - -Text_188B08:: @ 8188B08 - .string "What!?\p" - .string "I was just careless, you!$" - -gUnknown_8188B29:: @ 8188B29 - .string "That loosened me up.\n" - .string "I'm ready for the POKéMON LEAGUE!\p" - .string "{PLAYER}, you need more practice.\p" - .string "But hey, you know that!\n" - .string "I'm out of here. Smell ya!$" - -Text_188BAF:: @ 8188BAF - .string "{RIVAL}“ひゃははッ {PLAYER}ー!\n" - .string "それで がんばってるのかよ!\l" - .string "おれの さいのうに くらべりゃ\l" - .string "{PLAYER}は まだまだ だな!\p" - .string "もっと れんしゅう こいよ!\n" - .string "あははーッ!$" - -gUnknown_8188BFF:: @ 8188BFF - .string "POKéMON LEAGUE\n" - .string "Front Gate$" +Route22_Text_EarlyRivalIntro:: @ 8188890 + .string "{RIVAL}: Hey! {PLAYER}!\p" + .string "You're off to the POKéMON LEAGUE?\n" + .string "Forget about it!\p" + .string "You probably don't have any\n" + .string "BADGES, do you?\p" + .string "The guard won't let you through\n" + .string "without them.\p" + .string "By the way, did your POKéMON get\n" + .string "any stronger?$" + +Route22_Text_EarlyRivalDefeat:: @ 8188959 + .string "Awww!\n" + .string "You just lucked out!$" + +Route22_Text_EarlyRivalPostBattle:: @ 8188974 + .string "I heard the POKéMON LEAGUE is\n" + .string "crawling with tough TRAINERS.\p" + .string "I have to figure out how to get\n" + .string "past them.\p" + .string "You should quit dawdling and get a\n" + .string "move on!$" + +@ Translated in RB as "{RIVAL}: What? Why do I have 2 POKéMON? You should catch some more too!" +Route22_Text_RivalShouldCatchSomeMons:: @ 8188A07 + .string "{RIVAL}“なんだ?\n" + .string "ポケモン 2ひきも\l" + .string "もってるの なぜか だって?\p" + .string "おまえも\n" + .string "つかまえれば いい じゃん!$" + +Route22_Text_LateRivalIntro:: @ 8188A3C + .string "{RIVAL}: What? {PLAYER}!\n" + .string "What a surprise to see you here!\p" + .string "So you're going to the POKéMON\n" + .string "LEAGUE?\p" + .string "You collected all the BADGES, too?\n" + .string "That's cool!\p" + .string "Then I'll whip you, {PLAYER}, as a\n" + .string "warm-up for the POKéMON LEAGUE!\p" + .string "Come on!$" + +Route22_Text_LateRivalDefeat:: @ 8188B08 + .string "What!?\p" + .string "I was just careless, you!$" + +Route22_Text_LateRivalPostBattle:: @ 8188B29 + .string "That loosened me up.\n" + .string "I'm ready for the POKéMON LEAGUE!\p" + .string "{PLAYER}, you need more practice.\p" + .string "But hey, you know that!\n" + .string "I'm out of here. Smell ya!$" + +@ Translated in RB as "{RIVAL}: Hahaha! {PLAYER}! That's your best? You're nowhere near as good as me, pal! Go train some more! You loser!" +Route22_Text_LateRivalVictory:: @ 8188BAF + .string "{RIVAL}“ひゃははッ {PLAYER}ー!\n" + .string "それで がんばってるのかよ!\l" + .string "おれの さいのうに くらべりゃ\l" + .string "{PLAYER}は まだまだ だな!\p" + .string "もっと れんしゅう こいよ!\n" + .string "あははーッ!$" + +Route22_Text_LeagueGateSign:: @ 8188BFF + .string "POKéMON LEAGUE\n" + .string "Front Gate$" |
