summaryrefslogtreecommitdiff
path: root/data/maps/RustboroCity_PokemonCenter_1F
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-11-03 12:29:41 -0500
committerhuderlem <huderlem@gmail.com>2019-11-04 16:42:28 -0600
commit878eb523d7bc773b6efda729dac3626b85084507 (patch)
tree83984877f9ee1b5e9fc7b1cedfd47a6eb8189e0b /data/maps/RustboroCity_PokemonCenter_1F
parenta4b4ecd470622c2e28bcd9dc93e236a71344dafd (diff)
Document remainder of poke centers
Diffstat (limited to 'data/maps/RustboroCity_PokemonCenter_1F')
-rw-r--r--data/maps/RustboroCity_PokemonCenter_1F/map.json8
-rw-r--r--data/maps/RustboroCity_PokemonCenter_1F/scripts.inc21
2 files changed, 15 insertions, 14 deletions
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json
index b91dd25ac..db28ddcf3 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/map.json
+++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_PokemonCenter_1F_EventScript_214D76",
+ "script": "RustboroCity_PokemonCenter_1F_EventScript_Nurse",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_PokemonCenter_1F_EventScript_214D84",
+ "script": "RustboroCity_PokemonCenter_1F_EventScript_Man",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_PokemonCenter_1F_EventScript_214D8D",
+ "script": "RustboroCity_PokemonCenter_1F_EventScript_Boy",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_PokemonCenter_1F_EventScript_214D96",
+ "script": "RustboroCity_PokemonCenter_1F_EventScript_Girl",
"flag": "0"
}
],
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
index 46555ba28..ca10592b0 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
@@ -8,7 +8,8 @@ RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D
call Common_EventScript_UpdateBrineyLocation
end
-RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76
+@ VAR_0x800B is the Nurse's object event id
+RustboroCity_PokemonCenter_1F_EventScript_Nurse:: @ 8214D76
setvar VAR_0x800B, 1
call Common_EventScript_PkmnCenterNurse
waitmessage
@@ -16,31 +17,31 @@ RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76
release
end
-RustboroCity_PokemonCenter_1F_EventScript_214D84:: @ 8214D84
- msgbox RustboroCity_PokemonCenter_1F_Text_214D9F, MSGBOX_NPC
+RustboroCity_PokemonCenter_1F_EventScript_Man:: @ 8214D84
+ msgbox RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities, MSGBOX_NPC
end
-RustboroCity_PokemonCenter_1F_EventScript_214D8D:: @ 8214D8D
- msgbox RustboroCity_PokemonCenter_1F_Text_214E13, MSGBOX_NPC
+RustboroCity_PokemonCenter_1F_EventScript_Boy:: @ 8214D8D
+ msgbox RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon, MSGBOX_NPC
end
-RustboroCity_PokemonCenter_1F_EventScript_214D96:: @ 8214D96
- msgbox RustboroCity_PokemonCenter_1F_Text_214E81, MSGBOX_NPC
+RustboroCity_PokemonCenter_1F_EventScript_Girl:: @ 8214D96
+ msgbox RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor, MSGBOX_NPC
end
-RustboroCity_PokemonCenter_1F_Text_214D9F: @ 8214D9F
+RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities: @ 8214D9F
.string "My POKéMON has a NAIVE nature, and my\n"
.string "friend's has a JOLLY nature.\p"
.string "It's fascinating how POKéMON have\n"
.string "personalities!$"
-RustboroCity_PokemonCenter_1F_Text_214E13: @ 8214E13
+RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon: @ 8214E13
.string "Just like people, there are male and\n"
.string "female POKéMON.\p"
.string "But no one seems to have any idea how\n"
.string "they're different.$"
-RustboroCity_PokemonCenter_1F_Text_214E81: @ 8214E81
+RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor: @ 8214E81
.string "The man next door gave me an HM!\p"
.string "I used it to teach my POKéMON how to\n"
.string "CUT down skinny trees.$"