summaryrefslogtreecommitdiff
path: root/data/maps/LavenderTown_PokemonCenter_2F
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/LavenderTown_PokemonCenter_2F')
-rw-r--r--data/maps/LavenderTown_PokemonCenter_2F/map.json10
-rw-r--r--data/maps/LavenderTown_PokemonCenter_2F/scripts.inc13
2 files changed, 12 insertions, 11 deletions
diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json
index cc72593c7..beefaa49a 100644
--- a/data/maps/LavenderTown_PokemonCenter_2F/map.json
+++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CF6",
+ "script": "Common_EventScript_UnionRoomAttendant",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8CFC",
+ "script": "Common_EventScript_WirelessClubAttendant",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "LavenderTown_PokemonCenter_2F_EventScript_1A8D02",
+ "script": "Common_EventScript_DirectCornerAttendant",
"flag": "0"
},
{
@@ -78,14 +78,14 @@
"x": 5,
"y": 1,
"elevation": 0,
- "dest_map": "MAP_UNKNOWN_MAP_00_04",
+ "dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
},
{
"x": 9,
"y": 1,
"elevation": 0,
- "dest_map": "MAP_UNKNOWN_MAP_00_01",
+ "dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
}
],
diff --git a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc
index 45f05a491..2ef3c6643 100644
--- a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc
@@ -5,14 +5,15 @@ LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122
map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
.byte 0
-LavenderTown_PokemonCenter_2F_EventScript_16B137:: @ 816B137
- call EventScript_1BB4A3
+@ The below 3 are unused and leftover from RS
+LavenderTown_PokemonCenter_2F_EventScript_Colosseum:: @ 816B137
+ call CableClub_EventScript_Colosseum
end
-EventScript_16B13D:: @ 816B13D
- call EventScript_1BB6AB
+LavenderTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 816B13D
+ call CableClub_EventScript_TradeCenter
end
-EventScript_16B143:: @ 816B143
- call EventScript_1BB7DE
+LavenderTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 816B143
+ call CableClub_EventScript_RecordCorner
end