summaryrefslogtreecommitdiff
path: root/data/maps/SixIsland_WaterPath
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SixIsland_WaterPath')
-rw-r--r--data/maps/SixIsland_WaterPath/map.json18
-rw-r--r--data/maps/SixIsland_WaterPath/scripts.inc8
-rw-r--r--data/maps/SixIsland_WaterPath/text.inc50
3 files changed, 38 insertions, 38 deletions
diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json
index 97e30aa5c..0aefb4478 100644
--- a/data/maps/SixIsland_WaterPath/map.json
+++ b/data/maps/SixIsland_WaterPath/map.json
@@ -41,7 +41,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "SixIsland_WaterPath_EventScript_1AC555",
+ "script": "SixIsland_WaterPath_EventScript_Rose",
"flag": "0"
},
{
@@ -54,7 +54,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "SixIsland_WaterPath_EventScript_1AC593",
+ "script": "SixIsland_WaterPath_EventScript_Edward",
"flag": "0"
},
{
@@ -67,7 +67,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "SixIsland_WaterPath_EventScript_1AC5D1",
+ "script": "SixIsland_WaterPath_EventScript_Samir",
"flag": "0"
},
{
@@ -80,7 +80,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "SixIsland_WaterPath_EventScript_1AC60F",
+ "script": "SixIsland_WaterPath_EventScript_Denise",
"flag": "0"
},
{
@@ -93,7 +93,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "SixIsland_WaterPath_EventScript_1AC64D",
+ "script": "SixIsland_WaterPath_EventScript_Miu",
"flag": "0"
},
{
@@ -106,7 +106,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "SixIsland_WaterPath_EventScript_1AC693",
+ "script": "SixIsland_WaterPath_EventScript_Mia",
"flag": "0"
},
{
@@ -119,7 +119,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "SixIsland_WaterPath_EventScript_1AC6D9",
+ "script": "SixIsland_WaterPath_EventScript_Earl",
"flag": "0"
},
{
@@ -172,7 +172,7 @@
"x": 8,
"y": 14,
"elevation": 0,
- "script": "SixIsland_WaterPath_EventScript_168B41"
+ "script": "SixIsland_WaterPath_EventScript_HornWantedSign"
},
{
"type": "hidden_item",
@@ -209,7 +209,7 @@
"x": 12,
"y": 54,
"elevation": 0,
- "script": "SixIsland_WaterPath_EventScript_168B4A"
+ "script": "SixIsland_WaterPath_EventScript_RouteSign"
}
]
}
diff --git a/data/maps/SixIsland_WaterPath/scripts.inc b/data/maps/SixIsland_WaterPath/scripts.inc
index 27f49d4aa..0df3fab4b 100644
--- a/data/maps/SixIsland_WaterPath/scripts.inc
+++ b/data/maps/SixIsland_WaterPath/scripts.inc
@@ -1,10 +1,10 @@
SixIsland_WaterPath_MapScripts:: @ 8168B40
.byte 0
-SixIsland_WaterPath_EventScript_168B41:: @ 8168B41
- msgbox gUnknown_818BD0C, MSGBOX_SIGN
+SixIsland_WaterPath_EventScript_HornWantedSign:: @ 8168B41
+ msgbox SixIsland_WaterPath_Text_WantedUltimateHorn, MSGBOX_SIGN
end
-SixIsland_WaterPath_EventScript_168B4A:: @ 8168B4A
- msgbox gUnknown_818BD27, MSGBOX_SIGN
+SixIsland_WaterPath_EventScript_RouteSign:: @ 8168B4A
+ msgbox SixIsland_WaterPath_Text_RouteSign, MSGBOX_SIGN
end
diff --git a/data/maps/SixIsland_WaterPath/text.inc b/data/maps/SixIsland_WaterPath/text.inc
index 70a8ce017..7ee28923a 100644
--- a/data/maps/SixIsland_WaterPath/text.inc
+++ b/data/maps/SixIsland_WaterPath/text.inc
@@ -1,102 +1,102 @@
-Text_18B896:: @ 818B896
+SixIsland_WaterPath_Text_RoseIntro:: @ 818B896
.string "I let a pleasant breeze lead me\n"
.string "all the way here.$"
-Text_18B8C8:: @ 818B8C8
+SixIsland_WaterPath_Text_RoseDefeat:: @ 818B8C8
.string "Giggle… You're so cute when you're\n"
.string "determined.$"
-Text_18B8F7:: @ 818B8F7
+SixIsland_WaterPath_Text_RosePostBattle:: @ 818B8F7
.string "I want to go to the woods over\n"
.string "there, but…\p"
.string "There are lots of BUG POKéMON.\n"
.string "They scare me a little.$"
-Text_18B959:: @ 818B959
+SixIsland_WaterPath_Text_EdwardIntro:: @ 818B959
.string "I'm practicing in secret so no one\n"
.string "can see me.$"
-Text_18B988:: @ 818B988
+SixIsland_WaterPath_Text_EdwardDefeat:: @ 818B988
.string "Nobody saw me losing, right?$"
-Text_18B9A5:: @ 818B9A5
+SixIsland_WaterPath_Text_EdwardPostBattle:: @ 818B9A5
.string "As a performer, I don't want people\n"
.string "to know about the effort I put in.$"
-Text_18B9EC:: @ 818B9EC
+SixIsland_WaterPath_Text_SamirIntro:: @ 818B9EC
.string "What, you're suggesting that you're\n"
.string "sick of seeing SWIMMERS like me?\p"
.string "Aww, don't be hatin'!$"
-Text_18BA47:: @ 818BA47
+SixIsland_WaterPath_Text_SamirDefeat:: @ 818BA47
.string "Oh, no, no, no.$"
-Text_18BA57:: @ 818BA57
+SixIsland_WaterPath_Text_SamirPostBattle:: @ 818BA57
.string "I couldn't lift the stigma of being\n"
.string "a SWIMMER…$"
-Text_18BA86:: @ 818BA86
+SixIsland_WaterPath_Text_DeniseIntro:: @ 818BA86
.string "My boyfriend's always busy, so I\n"
.string "come swimming by myself.$"
-Text_18BAC0:: @ 818BAC0
+SixIsland_WaterPath_Text_DeniseDefeat:: @ 818BAC0
.string "Awww, I knew this would happen!$"
-Text_18BAE0:: @ 818BAE0
+SixIsland_WaterPath_Text_DenisePostBattle:: @ 818BAE0
.string "When I can't be with my boyfriend,\n"
.string "I spend time with the POKéMON he\l"
.string "gave me.$"
-Text_18BB2D:: @ 818BB2D
+SixIsland_WaterPath_Text_EarlIntro:: @ 818BB2D
.string "Tell me, where are the mountains\n"
.string "around these parts?$"
-Text_18BB62:: @ 818BB62
+SixIsland_WaterPath_Text_EarlDefeat:: @ 818BB62
.string "I lost my way while I was busy\n"
.string "battling!$"
-Text_18BB8B:: @ 818BB8B
+SixIsland_WaterPath_Text_EarlPostBattle:: @ 818BB8B
.string "Aren't there any mountains around\n"
.string "these parts?$"
-Text_18BBBA:: @ 818BBBA
+SixIsland_WaterPath_Text_MiuIntro:: @ 818BBBA
.string "MIU: Hello, POKéMON!\n"
.string "It's time to play!$"
-Text_18BBE2:: @ 818BBE2
+SixIsland_WaterPath_Text_MiuDefeat:: @ 818BBE2
.string "MIU: Oh, no!\n"
.string "Mommy!$"
-Text_18BBF6:: @ 818BBF6
+SixIsland_WaterPath_Text_MiuPostBattle:: @ 818BBF6
.string "MIU: It makes me all sad inside\n"
.string "when we lose…$"
-Text_18BC24:: @ 818BC24
+SixIsland_WaterPath_Text_MiuNotEnoughMons:: @ 818BC24
.string "MIU: MIA and I are TWINS.\n"
.string "We want to battle together.$"
-Text_18BC5A:: @ 818BC5A
+SixIsland_WaterPath_Text_MiaIntro:: @ 818BC5A
.string "MIA: Hello, POKéMON!\n"
.string "It's time to battle!$"
-Text_18BC84:: @ 818BC84
+SixIsland_WaterPath_Text_MiaDefeat:: @ 818BC84
.string "MIA: You're mean!\n"
.string "You're bad for winning!$"
-Text_18BCAE:: @ 818BCAE
+SixIsland_WaterPath_Text_MiaPostBattle:: @ 818BCAE
.string "MIA: Ohh…\n"
.string "I'm sorry, my POKéMON…$"
-Text_18BCCF:: @ 818BCCF
+SixIsland_WaterPath_Text_MiaNotEnoughMons:: @ 818BCCF
.string "MIA: Oh, you only have one\n"
.string "POKéMON?\p"
.string "Don't you feel lonesome?$"
-gUnknown_818BD0C:: @ 818BD0C
+SixIsland_WaterPath_Text_WantedUltimateHorn:: @ 818BD0C
.string "Wanted!\n"
.string "The Ultimate Horn!$"
-gUnknown_818BD27:: @ 818BD27
+SixIsland_WaterPath_Text_RouteSign:: @ 818BD27
.string "WATER PATH\n"
.string "Leads to RUIN VALLEY$"