summaryrefslogtreecommitdiff
path: root/data/maps/SSAnne_B1F_Room3
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-23 02:52:56 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-23 02:52:56 -0500
commitd4f32c10a832899d4a28e658d1d48356ec4fa29e (patch)
treea641fc9d0bafd3a2eab4660bb925c5100696aa01 /data/maps/SSAnne_B1F_Room3
parentc2bf9898a533a0b0cd2bba346e3df8c6f300f016 (diff)
Document SS Anne scripts
Diffstat (limited to 'data/maps/SSAnne_B1F_Room3')
-rw-r--r--data/maps/SSAnne_B1F_Room3/map.json2
-rw-r--r--data/maps/SSAnne_B1F_Room3/scripts.inc6
-rw-r--r--data/maps/SSAnne_B1F_Room3/text.inc6
3 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json
index 78786691b..70237229c 100644
--- a/data/maps/SSAnne_B1F_Room3/map.json
+++ b/data/maps/SSAnne_B1F_Room3/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "SSAnne_B1F_Room3_EventScript_160D8F",
+ "script": "SSAnne_B1F_Room3_EventScript_Dylan",
"flag": "0"
},
{
diff --git a/data/maps/SSAnne_B1F_Room3/scripts.inc b/data/maps/SSAnne_B1F_Room3/scripts.inc
index df90031ac..9d0ffc95e 100644
--- a/data/maps/SSAnne_B1F_Room3/scripts.inc
+++ b/data/maps/SSAnne_B1F_Room3/scripts.inc
@@ -1,7 +1,7 @@
SSAnne_B1F_Room3_MapScripts:: @ 8160D8E
.byte 0
-SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F
- trainerbattle_single TRAINER_SAILOR_DYLAN, Text_1742A6, Text_1742C3
- msgbox gUnknown_81742D2, MSGBOX_AUTOCLOSE
+SSAnne_B1F_Room3_EventScript_Dylan:: @ 8160D8F
+ trainerbattle_single TRAINER_SAILOR_DYLAN, SSAnne_B1F_Room3_Text_DylanIntro, SSAnne_B1F_Room3_Text_DylanDefeat
+ msgbox SSAnne_B1F_Room3_Text_DylanPostBattle, MSGBOX_AUTOCLOSE
end
diff --git a/data/maps/SSAnne_B1F_Room3/text.inc b/data/maps/SSAnne_B1F_Room3/text.inc
index f74b96052..cec2b5ec6 100644
--- a/data/maps/SSAnne_B1F_Room3/text.inc
+++ b/data/maps/SSAnne_B1F_Room3/text.inc
@@ -1,11 +1,11 @@
-Text_1742A6:: @ 81742A6
+SSAnne_B1F_Room3_Text_DylanIntro:: @ 81742A6
.string "I like feisty kids like you!$"
-Text_1742C3:: @ 81742C3
+SSAnne_B1F_Room3_Text_DylanDefeat:: @ 81742C3
.string "Argh!\n"
.string "Lost it!$"
-gUnknown_81742D2:: @ 81742D2
+SSAnne_B1F_Room3_Text_DylanPostBattle:: @ 81742D2
.string "Sea POKéMON live in deep water.\n"
.string "You'll need a ROD to fish them up!$"