summaryrefslogtreecommitdiff
path: root/data/maps/SSAnne_2F_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_2F_Room3
parentc2bf9898a533a0b0cd2bba346e3df8c6f300f016 (diff)
Document SS Anne scripts
Diffstat (limited to 'data/maps/SSAnne_2F_Room3')
-rw-r--r--data/maps/SSAnne_2F_Room3/map.json4
-rw-r--r--data/maps/SSAnne_2F_Room3/scripts.inc8
-rw-r--r--data/maps/SSAnne_2F_Room3/text.inc4
3 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json
index 7cc2af8e7..8dbb1e408 100644
--- a/data/maps/SSAnne_2F_Room3/map.json
+++ b/data/maps/SSAnne_2F_Room3/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SSAnne_2F_Room3_EventScript_160CE0",
+ "script": "SSAnne_2F_Room3_EventScript_Gentleman",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SSAnne_2F_Room3_EventScript_160CE9",
+ "script": "SSAnne_2F_Room3_EventScript_OldMan",
"flag": "0"
}
],
diff --git a/data/maps/SSAnne_2F_Room3/scripts.inc b/data/maps/SSAnne_2F_Room3/scripts.inc
index 33924805b..8de8f47f3 100644
--- a/data/maps/SSAnne_2F_Room3/scripts.inc
+++ b/data/maps/SSAnne_2F_Room3/scripts.inc
@@ -1,10 +1,10 @@
SSAnne_2F_Room3_MapScripts:: @ 8160CDF
.byte 0
-SSAnne_2F_Room3_EventScript_160CE0:: @ 8160CE0
- msgbox gUnknown_8173E3A, MSGBOX_NPC
+SSAnne_2F_Room3_EventScript_Gentleman:: @ 8160CE0
+ msgbox SSAnne_2F_Room3_Text_SeenMonsFerryPeople, MSGBOX_NPC
end
-SSAnne_2F_Room3_EventScript_160CE9:: @ 8160CE9
- msgbox gUnknown_8173E7B, MSGBOX_NPC
+SSAnne_2F_Room3_EventScript_OldMan:: @ 8160CE9
+ msgbox SSAnne_2F_Room3_Text_SomeTreesCanBeCutDown, MSGBOX_NPC
end
diff --git a/data/maps/SSAnne_2F_Room3/text.inc b/data/maps/SSAnne_2F_Room3/text.inc
index c87c96ae0..680267ced 100644
--- a/data/maps/SSAnne_2F_Room3/text.inc
+++ b/data/maps/SSAnne_2F_Room3/text.inc
@@ -1,8 +1,8 @@
-gUnknown_8173E3A:: @ 8173E3A
+SSAnne_2F_Room3_Text_SeenMonsFerryPeople:: @ 8173E3A
.string "Ah, yes, I have seen some POKéMON\n"
.string "ferry people across the water!$"
-gUnknown_8173E7B:: @ 8173E7B
+SSAnne_2F_Room3_Text_SomeTreesCanBeCutDown:: @ 8173E7B
.string "Small trees can be chopped down\n"
.string "using the move CUT.\p"
.string "But remember this!\n"