summaryrefslogtreecommitdiff
path: root/data/maps/FallarborTown_PokemonCenter_2F
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/FallarborTown_PokemonCenter_2F')
-rw-r--r--data/maps/FallarborTown_PokemonCenter_2F/map.json8
-rw-r--r--data/maps/FallarborTown_PokemonCenter_2F/scripts.inc21
2 files changed, 15 insertions, 14 deletions
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json
index 029a4a9c6..60bca57a9 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/map.json
+++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "FallarborTown_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": "FallarborTown_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": "FallarborTown_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": "FallarborTown_PokemonCenter_2F_EventScript_276B03",
+ "script": "CableClub_EventScript_MysteryGiftMan",
"flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
}
],
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
index 0d5332647..e9912ee68 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
@@ -1,19 +1,20 @@
FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB
- map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B
- map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C
- map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE
- map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
+ map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
+ map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
-FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00
- call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+@ The below 3 are unused and leftover from RS
+FallarborTown_PokemonCenter_2F_EventScript_Colosseum:: @ 8200F00
+ call CableClub_EventScript_Colosseum
end
-FallarborTown_PokemonCenter_2F_EventScript_200F06:: @ 8200F06
- call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+FallarborTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 8200F06
+ call CableClub_EventScript_TradeCenter
end
-FallarborTown_PokemonCenter_2F_EventScript_200F0C:: @ 8200F0C
- call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+FallarborTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 8200F0C
+ call CableClub_EventScript_RecordCorner
end