summaryrefslogtreecommitdiff
path: root/data/maps/FortreeCity_PokemonCenter_2F
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-10-11 04:14:09 -0400
committerhuderlem <huderlem@gmail.com>2019-10-12 15:14:57 -0500
commit1b7607bd91a9bdf9ee5e2ccbf895727bc53f9254 (patch)
tree8c6d3f18074117dbcf9807c4baffbad922a29610 /data/maps/FortreeCity_PokemonCenter_2F
parent9b81fe1b62ed44365f0aaae7aa252f146fb0c90c (diff)
Document cable_club.inc
Diffstat (limited to 'data/maps/FortreeCity_PokemonCenter_2F')
-rw-r--r--data/maps/FortreeCity_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/FortreeCity_PokemonCenter_2F/scripts.inc21
2 files changed, 15 insertions, 14 deletions
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json
index 79bdfad30..42aca8164 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/map.json
+++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FortreeCity_PokemonCenter_2F_EventScript_27375B",
+ "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FortreeCity_PokemonCenter_2F_EventScript_273761",
+ "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FortreeCity_PokemonCenter_2F_EventScript_273767",
+ "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FortreeCity_PokemonCenter_2F_EventScript_276B03",
+ "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
index 2ab9510f3..96dfd6e55 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
@@ -1,19 +1,20 @@
FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E
- map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276C3B
- map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276B6C
- map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_276BBE
- map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
+ map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
+ map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_OnTransition
.byte 0
-FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653
- call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+@ The below 3 are unused and leftover from RS
+FortreeCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8217653
+ call CableClub_EventScript_Colosseum
end
-FortreeCity_PokemonCenter_2F_EventScript_217659:: @ 8217659
- call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+FortreeCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8217659
+ call CableClub_EventScript_TradeCenter
end
-FortreeCity_PokemonCenter_2F_EventScript_21765F:: @ 821765F
- call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+FortreeCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 821765F
+ call CableClub_EventScript_RecordCorner
end