summaryrefslogtreecommitdiff
path: root/data/maps/MtPyre_6F
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-11-09 12:23:30 -0500
committerhuderlem <huderlem@gmail.com>2019-11-09 12:32:13 -0600
commit5ac8b126e96bae1be77725f9638a0e01c56b0767 (patch)
treeaba880b7a3a645cf8497895e3ac08911440fabd3 /data/maps/MtPyre_6F
parente4d65addf40ad017919bbaa92d08720d76ef332e (diff)
Document Mt Pyre scripts
Diffstat (limited to 'data/maps/MtPyre_6F')
-rw-r--r--data/maps/MtPyre_6F/map.json4
-rw-r--r--data/maps/MtPyre_6F/scripts.inc46
2 files changed, 25 insertions, 25 deletions
diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json
index 3c889a7e0..c2de09055 100644
--- a/data/maps/MtPyre_6F/map.json
+++ b/data/maps/MtPyre_6F/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "MtPyre_6F_EventScript_231D3B",
+ "script": "MtPyre_6F_EventScript_Valerie",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "MtPyre_6F_EventScript_231D9D",
+ "script": "MtPyre_6F_EventScript_Cedric",
"flag": "0"
}
],
diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc
index bc975e942..e3bdd928e 100644
--- a/data/maps/MtPyre_6F/scripts.inc
+++ b/data/maps/MtPyre_6F/scripts.inc
@@ -1,69 +1,69 @@
MtPyre_6F_MapScripts:: @ 8231D3A
.byte 0
-MtPyre_6F_EventScript_231D3B:: @ 8231D3B
- trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67
+MtPyre_6F_EventScript_Valerie:: @ 8231D3B
+ trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_ValerieIntro, MtPyre_6F_Text_ValerieDefeat, MtPyre_6F_EventScript_RegisterValerie
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq MtPyre_6F_EventScript_231D86
- msgbox MtPyre_6F_Text_231DFC, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq MtPyre_6F_EventScript_RematchValerie
+ msgbox MtPyre_6F_Text_ValeriePostBattle, MSGBOX_DEFAULT
release
end
-MtPyre_6F_EventScript_231D67:: @ 8231D67
+MtPyre_6F_EventScript_RegisterValerie:: @ 8231D67
special PlayerFaceTrainerAfterBattle
waitmovement 0
- msgbox MtPyre_6F_Text_231E43, MSGBOX_DEFAULT
+ msgbox MtPyre_6F_Text_ValerieRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_VALERIE_1
release
end
-MtPyre_6F_EventScript_231D86:: @ 8231D86
- trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB
- msgbox MtPyre_6F_Text_231EE1, MSGBOX_AUTOCLOSE
+MtPyre_6F_EventScript_RematchValerie:: @ 8231D86
+ trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_ValerieRematchIntro, MtPyre_6F_Text_ValerieRematchDefeat
+ msgbox MtPyre_6F_Text_ValeriePostRematch, MSGBOX_AUTOCLOSE
end
-MtPyre_6F_EventScript_231D9D:: @ 8231D9D
- trainerbattle_single TRAINER_CEDRIC, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A
- msgbox MtPyre_6F_Text_231F5C, MSGBOX_AUTOCLOSE
+MtPyre_6F_EventScript_Cedric:: @ 8231D9D
+ trainerbattle_single TRAINER_CEDRIC, MtPyre_6F_Text_CedricIntro, MtPyre_6F_Text_CedricDefeat
+ msgbox MtPyre_6F_Text_CedricPostBattle, MSGBOX_AUTOCLOSE
end
-MtPyre_6F_Text_231DB4: @ 8231DB4
+MtPyre_6F_Text_ValerieIntro: @ 8231DB4
.string "When I'm here…\n"
.string "A curious power flows into me…$"
-MtPyre_6F_Text_231DE2: @ 8231DE2
+MtPyre_6F_Text_ValerieDefeat: @ 8231DE2
.string "The power is ebbing away…$"
-MtPyre_6F_Text_231DFC: @ 8231DFC
+MtPyre_6F_Text_ValeriePostBattle: @ 8231DFC
.string "Perhaps the power is from the spirits\n"
.string "of POKéMON in fitful sleep here…$"
-MtPyre_6F_Text_231E43: @ 8231E43
+MtPyre_6F_Text_ValerieRegister: @ 8231E43
.string "Fufufu… I lost the match, but…\n"
.string "I have this little ability…\p"
.string "Without ever laying my hands on\n"
.string "your POKéNAV… Hiyah!$"
-MtPyre_6F_Text_231EB3: @ 8231EB3
+MtPyre_6F_Text_ValerieRematchIntro: @ 8231EB3
.string "Behind you…\n"
.string "What is it…$"
-MtPyre_6F_Text_231ECB: @ 8231ECB
+MtPyre_6F_Text_ValerieRematchDefeat: @ 8231ECB
.string "Something faded away…$"
-MtPyre_6F_Text_231EE1: @ 8231EE1
+MtPyre_6F_Text_ValeriePostRematch: @ 8231EE1
.string "The POKéMON at rest here…\n"
.string "Sometimes, they play…$"
-MtPyre_6F_Text_231F11: @ 8231F11
+MtPyre_6F_Text_CedricIntro: @ 8231F11
.string "Have you lost your bearings?\n"
.string "Have no fear for I am here!$"
-MtPyre_6F_Text_231F4A: @ 8231F4A
+MtPyre_6F_Text_CedricDefeat: @ 8231F4A
.string "Weren't you lost?$"
-MtPyre_6F_Text_231F5C: @ 8231F5C
+MtPyre_6F_Text_CedricPostBattle: @ 8231F5C
.string "I had this feeling that a lost TRAINER\n"
.string "would be panicked and easy to beat.\p"
.string "It's dirty and I won't try it again…$"