summaryrefslogtreecommitdiff
path: root/data/maps/SixIsland
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SixIsland')
-rw-r--r--data/maps/SixIsland/map.json6
-rw-r--r--data/maps/SixIsland/scripts.inc12
-rw-r--r--data/maps/SixIsland/text.inc6
3 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json
index ec8c1ffe3..bc04c47d8 100644
--- a/data/maps/SixIsland/map.json
+++ b/data/maps/SixIsland/map.json
@@ -31,7 +31,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SixIsland_EventScript_167EEB",
+ "script": "SixIsland_EventScript_Boy",
"flag": "0"
},
{
@@ -44,7 +44,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "SixIsland_EventScript_167EE2",
+ "script": "SixIsland_EventScript_Hiker",
"flag": "0"
}
],
@@ -85,7 +85,7 @@
"x": 9,
"y": 17,
"elevation": 0,
- "script": "SixIsland_EventScript_167EF4"
+ "script": "SixIsland_EventScript_IslandSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/SixIsland/scripts.inc b/data/maps/SixIsland/scripts.inc
index 01d373654..863390ba8 100644
--- a/data/maps/SixIsland/scripts.inc
+++ b/data/maps/SixIsland/scripts.inc
@@ -6,14 +6,14 @@ SixIsland_OnTransition:: @ 8167EDE
setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND
end
-SixIsland_EventScript_167EE2:: @ 8167EE2
- msgbox gUnknown_81831EF, MSGBOX_NPC
+SixIsland_EventScript_Hiker:: @ 8167EE2
+ msgbox SixIsland_Text_ThatWayToWaterPathRuinValley, MSGBOX_NPC
end
-SixIsland_EventScript_167EEB:: @ 8167EEB
- msgbox gUnknown_8183255, MSGBOX_NPC
+SixIsland_EventScript_Boy:: @ 8167EEB
+ msgbox SixIsland_Text_SkyAtNightIsFantastic, MSGBOX_NPC
end
-SixIsland_EventScript_167EF4:: @ 8167EF4
- msgbox gUnknown_81831C6, MSGBOX_SIGN
+SixIsland_EventScript_IslandSign:: @ 8167EF4
+ msgbox SixIsland_Text_IslandSign, MSGBOX_SIGN
end
diff --git a/data/maps/SixIsland/text.inc b/data/maps/SixIsland/text.inc
index bade2abd1..0d2fc43ce 100644
--- a/data/maps/SixIsland/text.inc
+++ b/data/maps/SixIsland/text.inc
@@ -1,14 +1,14 @@
-gUnknown_81831C6:: @ 81831C6
+SixIsland_Text_IslandSign:: @ 81831C6
.string "SIX ISLAND\n"
.string "Fortune Island of Aged Wisdom$"
-gUnknown_81831EF:: @ 81831EF
+SixIsland_Text_ThatWayToWaterPathRuinValley:: @ 81831EF
.string "Keep going this way and you'll get\n"
.string "to the WATER PATH.\p"
.string "Stay on that and you'll get to\n"
.string "the RUIN VALLEY.$"
-gUnknown_8183255:: @ 8183255
+SixIsland_Text_SkyAtNightIsFantastic:: @ 8183255
.string "When you're this far away from the\n"
.string "city, the sky at night is fantastic.$"