summaryrefslogtreecommitdiff
path: root/data/maps/SSTidalLowerDeck
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-11-08 03:37:46 -0500
committerhuderlem <huderlem@gmail.com>2019-11-14 18:07:56 -0600
commit0f53aeb19b39677b111e6c1b1176fb83efc773d3 (patch)
treebd80028ecc0de495a6caeda3d35c09b3f7d0e726 /data/maps/SSTidalLowerDeck
parentba6571909092005f4da1672cc7c89063c0aadc1e (diff)
Document SS Tidal scripts
Diffstat (limited to 'data/maps/SSTidalLowerDeck')
-rw-r--r--data/maps/SSTidalLowerDeck/map.json4
-rw-r--r--data/maps/SSTidalLowerDeck/scripts.inc24
2 files changed, 14 insertions, 14 deletions
diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json
index 3e678ca8c..45610454a 100644
--- a/data/maps/SSTidalLowerDeck/map.json
+++ b/data/maps/SSTidalLowerDeck/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 4,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "SSTidalLowerDeck_EventScript_23C819",
+ "script": "SSTidalLowerDeck_EventScript_Phillip",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 4,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "SSTidalLowerDeck_EventScript_23C830",
+ "script": "SSTidalLowerDeck_EventScript_Leonard",
"flag": "0"
}
],
diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc
index 68761376d..c90366c23 100644
--- a/data/maps/SSTidalLowerDeck/scripts.inc
+++ b/data/maps/SSTidalLowerDeck/scripts.inc
@@ -1,38 +1,38 @@
SSTidalLowerDeck_MapScripts:: @ 823C818
.byte 0
-SSTidalLowerDeck_EventScript_23C819:: @ 823C819
- trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0
- msgbox SSTidalLowerDeck_Text_23C8B4, MSGBOX_AUTOCLOSE
+SSTidalLowerDeck_EventScript_Phillip:: @ 823C819
+ trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_PhillipIntro, SSTidalLowerDeck_Text_PhillipDefeat
+ msgbox SSTidalLowerDeck_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE
end
-SSTidalLowerDeck_EventScript_23C830:: @ 823C830
- trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D
- msgbox SSTidalLowerDeck_Text_23C98E, MSGBOX_AUTOCLOSE
+SSTidalLowerDeck_EventScript_Leonard:: @ 823C830
+ trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_LeonardIntro, SSTidalLowerDeck_Text_LeonardDefeat
+ msgbox SSTidalLowerDeck_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE
end
-SSTidalLowerDeck_Text_23C847: @ 823C847
+SSTidalLowerDeck_Text_PhillipIntro: @ 823C847
.string "Arrrgh! I'm fed up and dog-tired of\n"
.string "cleaning this huge place!\p"
.string "Let's have a quick battle!$"
-SSTidalLowerDeck_Text_23C8A0: @ 823C8A0
+SSTidalLowerDeck_Text_PhillipDefeat: @ 823C8A0
.string "Little bro, I lost!$"
-SSTidalLowerDeck_Text_23C8B4: @ 823C8B4
+SSTidalLowerDeck_Text_PhillipPostBattle: @ 823C8B4
.string "We're the CLEANUP BROTHERS!\p"
.string "The old one dumps the detergent,\n"
.string "and the young one does the scrubbing!$"
-SSTidalLowerDeck_Text_23C917: @ 823C917
+SSTidalLowerDeck_Text_LeonardIntro: @ 823C917
.string "This is the bottom of the ship's hull.\n"
.string "There's plenty of room.\l"
.string "It'll be alright for a POKéMON battle.$"
-SSTidalLowerDeck_Text_23C97D: @ 823C97D
+SSTidalLowerDeck_Text_LeonardDefeat: @ 823C97D
.string "Big bro, I lost!$"
-SSTidalLowerDeck_Text_23C98E: @ 823C98E
+SSTidalLowerDeck_Text_LeonardPostBattle: @ 823C98E
.string "We're the CLEANUP BROTHERS!\p"
.string "The old one dumps the detergent,\n"
.string "and the young one does the scrubbing!$"