summaryrefslogtreecommitdiff
path: root/data/maps/ThreeIsland_House2
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-02-26 16:02:29 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-02-27 12:51:23 -0500
commitd3adca3f9d13ebcc58f4d7e77e57dd0b5a94769d (patch)
tree133e9e81da8552d0e3c276ab48f0ec68d0d3d85a /data/maps/ThreeIsland_House2
parent43f66fce5574592ac1c37b9452fe858e482156bb (diff)
Document Three Island scripts
Diffstat (limited to 'data/maps/ThreeIsland_House2')
-rw-r--r--data/maps/ThreeIsland_House2/map.json4
-rw-r--r--data/maps/ThreeIsland_House2/scripts.inc8
-rw-r--r--data/maps/ThreeIsland_House2/text.inc4
3 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json
index a2fc4f7e3..c8dfc26ff 100644
--- a/data/maps/ThreeIsland_House2/map.json
+++ b/data/maps/ThreeIsland_House2/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "ThreeIsland_House2_EventScript_1718F9",
+ "script": "ThreeIsland_House2_EventScript_Rocker",
"flag": "0"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "ThreeIsland_House2_EventScript_1718E0",
+ "script": "ThreeIsland_House2_EventScript_Man",
"flag": "0"
}
],
diff --git a/data/maps/ThreeIsland_House2/scripts.inc b/data/maps/ThreeIsland_House2/scripts.inc
index a9fd52298..d66a13530 100644
--- a/data/maps/ThreeIsland_House2/scripts.inc
+++ b/data/maps/ThreeIsland_House2/scripts.inc
@@ -1,14 +1,14 @@
ThreeIsland_House2_MapScripts:: @ 81718DF
.byte 0
-ThreeIsland_House2_EventScript_1718E0:: @ 81718E0
+ThreeIsland_House2_EventScript_Man:: @ 81718E0
lock
faceplayer
famechecker FAMECHECKER_SABRINA, 1
- msgbox gUnknown_81A32CA
+ msgbox ThreeIsland_House2_Text_IAdmireSabrina
release
end
-ThreeIsland_House2_EventScript_1718F9:: @ 81718F9
- msgbox gUnknown_81A3245, MSGBOX_NPC
+ThreeIsland_House2_EventScript_Rocker:: @ 81718F9
+ msgbox ThreeIsland_House2_Text_CantMakeThisSpoonBend, MSGBOX_NPC
end
diff --git a/data/maps/ThreeIsland_House2/text.inc b/data/maps/ThreeIsland_House2/text.inc
index cae2b9055..c265b2805 100644
--- a/data/maps/ThreeIsland_House2/text.inc
+++ b/data/maps/ThreeIsland_House2/text.inc
@@ -1,4 +1,4 @@
-gUnknown_81A3245:: @ 81A3245
+ThreeIsland_House2_Text_CantMakeThisSpoonBend:: @ 81A3245
.string "Urrrrrrrrgggghhhh…\n"
.string "Kwaaaaah!\p"
.string "…It's useless! I can't make this\n"
@@ -6,7 +6,7 @@ gUnknown_81A3245:: @ 81A3245
.string "Maybe I really don't have any\n"
.string "psychic powers.$"
-gUnknown_81A32CA:: @ 81A32CA
+ThreeIsland_House2_Text_IAdmireSabrina:: @ 81A32CA
.string "You know about a girl GYM LEADER\n"
.string "in SAFFRON CITY?\p"
.string "She uses PSYCHIC-type POKéMON,\n"