diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-28 04:21:03 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-28 04:21:03 -0500 |
| commit | eae373576ddb6893d500d4a4134538f480b0d322 (patch) | |
| tree | 7564a4e9d24de648d11988c1733c6966f92e0cde /data/maps/VictoryRoad_1F | |
| parent | 8a8bb4fb02b04852f9d4a16ce447c8c5c4870dea (diff) | |
Document Victory Road scripts
Diffstat (limited to 'data/maps/VictoryRoad_1F')
| -rw-r--r-- | data/maps/VictoryRoad_1F/map.json | 6 | ||||
| -rw-r--r-- | data/maps/VictoryRoad_1F/scripts.inc | 30 | ||||
| -rw-r--r-- | data/maps/VictoryRoad_1F/text.inc | 12 |
3 files changed, 24 insertions, 24 deletions
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 03b6b0cdd..9f5ddc540 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "VictoryRoad_1F_EventScript_160F7B", + "script": "VictoryRoad_1F_EventScript_Rolando", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "VictoryRoad_1F_EventScript_160F64", + "script": "VictoryRoad_1F_EventScript_Naomi", "flag": "0" }, { @@ -129,7 +129,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_VICTORY_ROAD_1F", "var_value": 99, - "script": "VictoryRoad_1F_EventScript_160F33" + "script": "VictoryRoad_1F_EventScript_FloorSwitch" } ], "bg_events": [ diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 79d01278f..5bdc91202 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -5,24 +5,24 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 VictoryRoad_1F_OnLoad:: @ 8160F10 compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - call_if_ne EventScript_160F1C + call_if_ne VictoryRoad_1F_EventScript_SetRockBarrier end -EventScript_160F1C:: @ 8160F1C - setmetatile 12, 14, 775, 1 - setmetatile 12, 15, 791, 1 +VictoryRoad_1F_EventScript_SetRockBarrier:: @ 8160F1C + setmetatile 12, 14, METATILE_Cave_RockBarrier_Top, 1 + setmetatile 12, 15, METATILE_Cave_RockBarrier_Bottom, 1 return VictoryRoad_1F_OnTransition:: @ 8160F2F setworldmapflag FLAG_WORLD_MAP_VICTORY_ROAD_1F end -VictoryRoad_1F_EventScript_160F33:: @ 8160F33 +VictoryRoad_1F_EventScript_FloorSwitch:: @ 8160F33 lockall compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 - goto_if_eq EventScript_160F62 - setmetatile 12, 14, 721, 0 - setmetatile 12, 15, 737, 0 + goto_if_eq VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed + setmetatile 12, 14, METATILE_Cave_Floor_Ledge_Top, 0 + setmetatile 12, 15, METATILE_Cave_Floor_Ledge_Bottom, 0 playse SE_RU_GASYAN special DrawWholeMapView waitse @@ -31,16 +31,16 @@ VictoryRoad_1F_EventScript_160F33:: @ 8160F33 releaseall end -EventScript_160F62:: @ 8160F62 +VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed:: @ 8160F62 releaseall end -VictoryRoad_1F_EventScript_160F64:: @ 8160F64 - trainerbattle_single TRAINER_COOLTRAINER_NAOMI, Text_174710, Text_174738 - msgbox gUnknown_8174744, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Naomi:: @ 8160F64 + trainerbattle_single TRAINER_COOLTRAINER_NAOMI, VictoryRoad_1F_Text_NaomiIntro, VictoryRoad_1F_Text_NaomiDefeat + msgbox VictoryRoad_1F_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B - trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, Text_174784, Text_1747B8 - msgbox gUnknown_81747C8, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Rolando:: @ 8160F7B + trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, VictoryRoad_1F_Text_RolandoIntro, VictoryRoad_1F_Text_RolandoDefeat + msgbox VictoryRoad_1F_Text_RolandoPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_1F/text.inc b/data/maps/VictoryRoad_1F/text.inc index 46cd136ad..d83abf202 100644 --- a/data/maps/VictoryRoad_1F/text.inc +++ b/data/maps/VictoryRoad_1F/text.inc @@ -1,22 +1,22 @@ -Text_174710:: @ 8174710 +VictoryRoad_1F_Text_NaomiIntro:: @ 8174710 .string "I wonder if you are good enough\n" .string "for me?$" -Text_174738:: @ 8174738 +VictoryRoad_1F_Text_NaomiDefeat:: @ 8174738 .string "I lost out…$" -gUnknown_8174744:: @ 8174744 +VictoryRoad_1F_Text_NaomiPostBattle:: @ 8174744 .string "I never wanted to lose to anybody,\n" .string "especially to a younger kid…$" -Text_174784:: @ 8174784 +VictoryRoad_1F_Text_RolandoIntro:: @ 8174784 .string "I can see you're good.\n" .string "Let me see exactly how good!$" -Text_1747B8:: @ 81747B8 +VictoryRoad_1F_Text_RolandoDefeat:: @ 81747B8 .string "I had a chance…$" -gUnknown_81747C8:: @ 81747C8 +VictoryRoad_1F_Text_RolandoPostBattle:: @ 81747C8 .string "Tch!\n" .string "I concede, you are better than I!$" |
