summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_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/BattleFrontier_PokemonCenter_1F
parenta4b4ecd470622c2e28bcd9dc93e236a71344dafd (diff)
Document remainder of poke centers
Diffstat (limited to 'data/maps/BattleFrontier_PokemonCenter_1F')
-rw-r--r--data/maps/BattleFrontier_PokemonCenter_1F/map.json10
-rw-r--r--data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc31
2 files changed, 21 insertions, 20 deletions
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json
index 8f8153c08..743bab8b0 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/map.json
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "BattleFrontier_PokemonCenter_1F_EventScript_267908",
+ "script": "BattleFrontier_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": "BattleFrontier_PokemonCenter_1F_EventScript_267916",
+ "script": "BattleFrontier_PokemonCenter_1F_EventScript_SchoolKid",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "BattleFrontier_PokemonCenter_1F_EventScript_26791F",
+ "script": "BattleFrontier_PokemonCenter_1F_EventScript_Man",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "BattleFrontier_PokemonCenter_1F_EventScript_267928",
+ "script": "BattleFrontier_PokemonCenter_1F_EventScript_Picnicker",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "BattleFrontier_PokemonCenter_1F_EventScript_267931",
+ "script": "BattleFrontier_PokemonCenter_1F_EventScript_Skitty",
"flag": "0"
}
],
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
index 84aeef182..f77d9ab83 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
@@ -1,13 +1,14 @@
BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
- map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904
+ map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
-BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904
+BattleFrontier_PokemonCenter_1F_OnTransition: @ 8267904
setrespawn HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST
end
-BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908
+@ VAR_0x800B is the Nurse's object event id
+BattleFrontier_PokemonCenter_1F_EventScript_Nurse:: @ 8267908
setvar VAR_0x800B, 1
call Common_EventScript_PkmnCenterNurse
waitmessage
@@ -15,29 +16,29 @@ BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908
release
end
-BattleFrontier_PokemonCenter_1F_EventScript_267916:: @ 8267916
- msgbox BattleFrontier_PokemonCenter_1F_Text_267944, MSGBOX_NPC
+BattleFrontier_PokemonCenter_1F_EventScript_SchoolKid:: @ 8267916
+ msgbox BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon, MSGBOX_NPC
end
-BattleFrontier_PokemonCenter_1F_EventScript_26791F:: @ 826791F
- msgbox BattleFrontier_PokemonCenter_1F_Text_2679EB, MSGBOX_NPC
+BattleFrontier_PokemonCenter_1F_EventScript_Man:: @ 826791F
+ msgbox BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena, MSGBOX_NPC
end
-BattleFrontier_PokemonCenter_1F_EventScript_267928:: @ 8267928
- msgbox BattleFrontier_PokemonCenter_1F_Text_267A4B, MSGBOX_NPC
+BattleFrontier_PokemonCenter_1F_EventScript_Picnicker:: @ 8267928
+ msgbox BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge, MSGBOX_NPC
end
-BattleFrontier_PokemonCenter_1F_EventScript_267931:: @ 8267931
+BattleFrontier_PokemonCenter_1F_EventScript_Skitty:: @ 8267931
lock
faceplayer
waitse
playmoncry SPECIES_SKITTY, 0
- msgbox BattleFrontier_PokemonCenter_1F_Text_267A90, MSGBOX_DEFAULT
+ msgbox BattleFrontier_PokemonCenter_1F_Text_Skitty, MSGBOX_DEFAULT
waitmoncry
release
end
-BattleFrontier_PokemonCenter_1F_Text_267944: @ 8267944
+BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon: @ 8267944
.string "There was someone here using a \n"
.string "POKéMON I've never seen before.\p"
.string "I never learned about it at\n"
@@ -45,15 +46,15 @@ BattleFrontier_PokemonCenter_1F_Text_267944: @ 8267944
.string "I wonder where you can catch POKéMON\n"
.string "like that.$"
-BattleFrontier_PokemonCenter_1F_Text_2679EB: @ 82679EB
+BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena: @ 82679EB
.string "Okay! Next stop, the BATTLE ARENA!\n"
.string "I'd better get the right POKéMON from\l"
.string "the PC Storage System.$"
-BattleFrontier_PokemonCenter_1F_Text_267A4B: @ 8267A4B
+BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge: @ 8267A4B
.string "Giggle… I'm going to go through every\n"
.string "challenge with just this baby!$"
-BattleFrontier_PokemonCenter_1F_Text_267A90: @ 8267A90
+BattleFrontier_PokemonCenter_1F_Text_Skitty: @ 8267A90
.string "SKITTY: Mya myaaah!$"