Rename maps:

- Underground -> UndergroundPath
- Route5UndergroundEntrance -> Route5UndergroundPathEntrance
- Route6UndergroundEntrance -> Route6UndergroundPathEntrance

- WarehouseEntrance -> GoldenrodUnderground
- UndergroundWarehouse -> GoldenrodUndergroundWarehouse
- UndergroundPathSwitchRoomEntrances -> GoldenrodUndergroundSwitchRoomEntrances

constants/event_flags.asm

@@ -145,11 +145,11 @@
 	const EVENT_ILEX_FOREST_HIDDEN_ETHER
 	const EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION
 	const EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL
-	const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_PARLYZ_HEAL
+	const EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL
-	const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_SUPER_POTION
+	const EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION
-	const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_ANTIDOTE
+	const EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE
-	const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION
+	const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION
-	const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE
+	const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE
 	const EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION
 	const EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL
 	const EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE
@@ -238,8 +238,8 @@
 	const EVENT_GOT_TM29_PSYCHIC
 ; Kanto hidden items
 	const EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE
-	const EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE
+	const EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE
-	const EVENT_UNDERGROUND_HIDDEN_X_SPECIAL
+	const EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL
 	const EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY
 	const EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND
 	const EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION
@@ -787,10 +787,10 @@
 	const EVENT_LEARNED_SLOWPOKETAIL
 	const EVENT_LEARNED_RATICATE_TAIL
 	const EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE
-	const EVENT_WAREHOUSE_LAYOUT_1
+	const EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
-	const EVENT_WAREHOUSE_LAYOUT_2
+	const EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
-	const EVENT_WAREHOUSE_LAYOUT_3
+	const EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
-	const EVENT_WAREHOUSE_BLOCKED_OFF
+	const EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
 	const EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
 	const EVENT_WILLS_ROOM_ENTRANCE_CLOSED
 	const EVENT_WILLS_ROOM_EXIT_OPEN
@@ -1691,7 +1691,7 @@
 	const EVENT_TIN_TOWER_8F_MAX_ELIXER
 	const EVENT_TIN_TOWER_8F_FULL_RESTORE
 	const EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL
-	const EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL
+	const EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL
 	const EVENT_BURNED_TOWER_1F_HP_UP
 	const EVENT_BURNED_TOWER_B1F_TM_ENDURE
 	const EVENT_NATIONAL_PARK_PARLYZ_HEAL
@@ -1720,15 +1720,15 @@
 	const EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
 	const EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
 	const EVENT_ILEX_FOREST_REVIVE
-	const EVENT_WAREHOUSE_ENTRANCE_COIN_CASE
+	const EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
-	const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
+	const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
-	const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL
+	const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
 	const EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
 	const EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
 	const EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
 	const EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
-	const EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER
+	const EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER
-	const EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
+	const EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
 	const EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
 	const EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
 	const EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE
@@ -1800,7 +1800,7 @@
 	const EVENT_RIVAL_CHERRYGROVE_CITY
 	const EVENT_RIVAL_AZALEA_TOWN
 	const EVENT_RIVAL_TEAM_ROCKET_BASE
-	const EVENT_RIVAL_UNDERGROUND_PATH
+	const EVENT_RIVAL_GOLDENROD_UNDERGROUND
 	const EVENT_RIVAL_VICTORY_ROAD
 	const EVENT_RIVAL_OLIVINE_CITY
 	const EVENT_RIVAL_SPROUT_TOWER
@@ -1945,10 +1945,10 @@
 	const EVENT_OPENED_MT_SILVER
 	const EVENT_FOUGHT_SNORLAX ; 750
 	const EVENT_LAKE_OF_RAGE_RED_GYARADOS
-	const EVENT_WAREHOUSE_ENTRANCE_GRANNY
+	const EVENT_GOLDENROD_UNDERGROUND_GRANNY
-	const EVENT_WAREHOUSE_ENTRANCE_GRAMPS
+	const EVENT_GOLDENROD_UNDERGROUND_GRAMPS
-	const EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER
+	const EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER
-	const EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER
+	const EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER
 	const EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
 	const EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
 	const EVENT_ROUTE_32_FRIEDA_OF_FRIDAY

constants/landmark_constants.asm

@@ -63,7 +63,7 @@ KANTO_LANDMARK EQU const_value
 	const ROUTE_24          ; 38
 	const ROUTE_25          ; 39
 	const ROUTE_5           ; 3a
-	const UNDERGROUND       ; 3b
+	const UNDERGROUND_PATH  ; 3b
 	const ROUTE_6           ; 3c
 	const VERMILION_CITY    ; 3d
 	const DIGLETTS_CAVE     ; 3e

constants/map_dimension_constants.asm

@@ -102,10 +102,10 @@ endm
 	mapgroup TEAM_ROCKET_BASE_B2F,                         9, 15 ; 50
 	mapgroup TEAM_ROCKET_BASE_B3F,                         9, 15 ; 51
 	mapgroup ILEX_FOREST,                                 27, 15 ; 52
-	mapgroup WAREHOUSE_ENTRANCE,                         18, 15 ; 53
+	mapgroup GOLDENROD_UNDERGROUND,                       18, 15 ; 53
-	mapgroup UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES,     18, 15 ; 54
+	mapgroup GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 18, 15 ; 54
 	mapgroup GOLDENROD_DEPT_STORE_B1F,                     9, 10 ; 55
-	mapgroup UNDERGROUND_WAREHOUSE,                       9, 10 ; 56
+	mapgroup GOLDENROD_UNDERGROUND_WAREHOUSE,              9, 10 ; 56
 	mapgroup MOUNT_MORTAR_1F_OUTSIDE,                     18, 20 ; 57
 	mapgroup MOUNT_MORTAR_1F_INSIDE,                      27, 20 ; 58
 	mapgroup MOUNT_MORTAR_2F_INSIDE,                      18, 20 ; 59
@@ -135,7 +135,7 @@ endm
 	mapgroup TOHJO_FALLS,                                  9, 15 ; 83
 	mapgroup DIGLETTS_CAVE,                               18, 10 ; 84
 	mapgroup MOUNT_MOON,                                   9, 15 ; 85
-	mapgroup UNDERGROUND,                                14,  3 ; 86
+	mapgroup UNDERGROUND_PATH,                            14,  3 ; 86
 	mapgroup ROCK_TUNNEL_1F,                              18, 15 ; 87
 	mapgroup ROCK_TUNNEL_B1F,                             18, 15 ; 88
 	mapgroup SAFARI_ZONE_FUCHSIA_GATE_BETA,                4,  5 ; 89
@@ -278,7 +278,7 @@ endm
 	mapgroup VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE,   4,  4 ; 10
 	mapgroup VERMILION_GYM,                                9,  5 ; 11
 	mapgroup ROUTE_6_SAFFRON_GATE,                         4,  5 ; 12
-	mapgroup ROUTE_6_UNDERGROUND_ENTRANCE,                4,  4 ; 13
+	mapgroup ROUTE_6_UNDERGROUND_PATH_ENTRANCE,            4,  4 ; 13
 
 	newgroup                                                    ; 13
 
@@ -469,7 +469,7 @@ endm
 	mapgroup SILPH_CO_1F,                                  4,  8 ; 10
 	mapgroup COPYCATS_HOUSE_1F,                            4,  4 ; 11
 	mapgroup COPYCATS_HOUSE_2F,                            3,  5 ; 12
-	mapgroup ROUTE_5_UNDERGROUND_ENTRANCE,                4,  4 ; 13
+	mapgroup ROUTE_5_UNDERGROUND_PATH_ENTRANCE,            4,  4 ; 13
 	mapgroup ROUTE_5_SAFFRON_CITY_GATE,                    4,  5 ; 14
 	mapgroup ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE,             4,  4 ; 15
 

data/maps/map_scenes.asm

@@ -73,7 +73,7 @@ MapScenes:: ; 4d01e
 	scene_def TEAM_ROCKET_BASE_B1F,                        wTeamRocketBaseB1FSceneID
 	scene_def TEAM_ROCKET_BASE_B2F,                        wTeamRocketBaseB2FSceneID
 	scene_def TEAM_ROCKET_BASE_B3F,                        wTeamRocketBaseB3FSceneID
-	scene_def UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, wUndergroundPathSwitchRoomEntrancesSceneID
+	scene_def GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID
 	scene_def SILVER_CAVE_ROOM_3,                          wSilverCaveRoom3SceneID
 	scene_def VICTORY_ROAD,                                wVictoryRoadSceneID
 	scene_def DRAGONS_DEN_B1F,                             wDragonsDenB1FSceneID

engine/events_3.asm

@@ -78,7 +78,7 @@ ReturnFromMapSetupScript:: ; b8000
 	ret z
 	cp LAV_RADIO_TOWER
 	ret z
-	cp UNDERGROUND
+	cp UNDERGROUND_PATH
 	ret z
 	cp INDIGO_PLATEAU
 	ret z

engine/std_scripts.asm

@@ -497,7 +497,7 @@ InitializeEventsScript:
 	setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
 	setevent EVENT_RIVAL_CHERRYGROVE_CITY
 	setevent EVENT_RIVAL_AZALEA_TOWN
-	setevent EVENT_RIVAL_UNDERGROUND_PATH
+	setevent EVENT_RIVAL_GOLDENROD_UNDERGROUND
 	setevent EVENT_AZALEA_TOWN_SLOWPOKES
 	setevent EVENT_KURTS_HOUSE_SLOWPOKE
 	setevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
@@ -550,8 +550,8 @@ InitializeEventsScript:
 	setevent EVENT_ECRUTEAK_POKE_CENTER_BILL
 	setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
 	setevent EVENT_LAKE_OF_RAGE_LANCE
-	setevent EVENT_WAREHOUSE_LAYOUT_1
+	setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
-	setevent EVENT_WAREHOUSE_BLOCKED_OFF
+	setevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
 	setevent EVENT_DRAGONS_DEN_CLAIR
 	setevent EVENT_RIVAL_OLIVINE_CITY
 	setevent EVENT_RIVAL_VICTORY_ROAD

event/basement_key.asm

@@ -1,11 +1,11 @@
 _BasementKey: ; 507b4
 ; Are we even in the right map to use this?
 	ld a, [MapGroup]
-	cp GROUP_WAREHOUSE_ENTRANCE
+	cp GROUP_GOLDENROD_UNDERGROUND
 	jr nz, .nope
 
 	ld a, [MapNumber]
-	cp MAP_WAREHOUSE_ENTRANCE
+	cp MAP_GOLDENROD_UNDERGROUND
 	jr nz, .nope
 ; Are we on the tile in front of the door?
 	call GetFacingTileCoord

maps.asm

@@ -139,7 +139,7 @@ SECTION "Map Scripts 8", ROMX
 
 INCLUDE "maps/DiglettsCave.asm"
 INCLUDE "maps/MountMoon.asm"
-INCLUDE "maps/Underground.asm"
+INCLUDE "maps/UndergroundPath.asm"
 INCLUDE "maps/RockTunnel1F.asm"
 INCLUDE "maps/RockTunnelB1F.asm"
 INCLUDE "maps/SafariZoneFuchsiaGateBeta.asm"
@@ -176,10 +176,10 @@ INCLUDE "maps/Route2946Gate.asm"
 SECTION "Map Scripts 10", ROMX
 
 INCLUDE "maps/Route22.asm"
-INCLUDE "maps/WarehouseEntrance.asm"
+INCLUDE "maps/GoldenrodUnderground.asm"
-INCLUDE "maps/UndergroundPathSwitchRoomEntrances.asm"
+INCLUDE "maps/GoldenrodUndergroundSwitchRoomEntrances.asm"
 INCLUDE "maps/GoldenrodDeptStoreB1F.asm"
-INCLUDE "maps/UndergroundWarehouse.asm"
+INCLUDE "maps/GoldenrodUndergroundWarehouse.asm"
 INCLUDE "maps/MountMortar1FOutside.asm"
 INCLUDE "maps/MountMortar1FInside.asm"
 INCLUDE "maps/MountMortar2FInside.asm"
@@ -304,7 +304,7 @@ INCLUDE "maps/SaffronTrainStation.asm"
 INCLUDE "maps/SilphCo1F.asm"
 INCLUDE "maps/CopycatsHouse1F.asm"
 INCLUDE "maps/CopycatsHouse2F.asm"
-INCLUDE "maps/Route5UndergroundEntrance.asm"
+INCLUDE "maps/Route5UndergroundPathEntrance.asm"
 INCLUDE "maps/Route5SaffronCityGate.asm"
 INCLUDE "maps/Route5CleanseTagSpeechHouse.asm"
 
@@ -350,7 +350,7 @@ INCLUDE "maps/VermilionMart.asm"
 INCLUDE "maps/VermilionHouseDiglettsCaveSpeechHouse.asm"
 INCLUDE "maps/VermilionGym.asm"
 INCLUDE "maps/Route6SaffronGate.asm"
-INCLUDE "maps/Route6UndergroundEntrance.asm"
+INCLUDE "maps/Route6UndergroundPathEntrance.asm"
 INCLUDE "maps/Pokecenter2F.asm"
 INCLUDE "maps/TradeCenter.asm"
 INCLUDE "maps/Colosseum.asm"

maps/GoldenrodCity.asm

@@ -572,8 +572,8 @@ GoldenrodCity_MapEventHeader:
 	warp_def $15, $e, 1, GOLDENROD_GAME_CORNER
 	warp_def $f, $5, 1, RADIO_TOWER_1F
 	warp_def $1, $13, 3, ROUTE_35_GOLDENROD_GATE
-	warp_def $5, $9, 8, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES
+	warp_def $5, $9, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def $1d, $b, 5, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES
+	warp_def $1d, $b, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
 	warp_def $1b, $f, 1, GOLDENROD_POKECENTER_1F
 
 .CoordEvents:

maps/GoldenrodDeptStoreB1F.asm

@@ -27,9 +27,9 @@ UnknownScript_0x7d78a:
 	jump UnknownScript_0x7d791
 
 UnknownScript_0x7d791:
-	checkevent EVENT_WAREHOUSE_LAYOUT_2
+	checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
 	iftrue .Layout2
-	checkevent EVENT_WAREHOUSE_LAYOUT_3
+	checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
 	iftrue .Layout3
 	changeblock $a, $8, $d
 	return
@@ -43,7 +43,7 @@ UnknownScript_0x7d791:
 	return
 
 UnknownScript_0x7d7ac:
-	clearevent EVENT_WAREHOUSE_BLOCKED_OFF
+	clearevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
 	return
 
 GoldenrodDeptStoreB1FBlackBelt1Script:
@@ -115,7 +115,7 @@ GoldenrodDeptStoreB1F_MapEventHeader:
 
 .Warps:
 	db 3
-	warp_def $2, $11, 3, UNDERGROUND_WAREHOUSE
+	warp_def $2, $11, 3, GOLDENROD_UNDERGROUND_WAREHOUSE
 	warp_def $4, $9, 1, GOLDENROD_DEPT_STORE_ELEVATOR
 	warp_def $4, $a, 2, GOLDENROD_DEPT_STORE_ELEVATOR
 

maps/GoldenrodDeptStoreElevator.asm

@@ -14,30 +14,30 @@ MapGoldenrodDeptStoreElevatorSignpost0Script:
 	playsound SFX_ELEVATOR
 	earthquake 60
 	waitsfx
-	checkevent EVENT_WAREHOUSE_BLOCKED_OFF
+	checkevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
 	iftrue .Done
-	checkevent EVENT_WAREHOUSE_LAYOUT_1
+	checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
 	iftrue .BoxLayout1
-	checkevent EVENT_WAREHOUSE_LAYOUT_2
+	checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
 	iftrue .BoxLayout2
-	checkevent EVENT_WAREHOUSE_LAYOUT_3
+	checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
 	iftrue .BoxLayout3
 .BoxLayout3:
-	setevent EVENT_WAREHOUSE_LAYOUT_1
+	setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
-	clearevent EVENT_WAREHOUSE_LAYOUT_2
+	clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
-	clearevent EVENT_WAREHOUSE_LAYOUT_3
+	clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
 	end
 
 .BoxLayout1:
-	clearevent EVENT_WAREHOUSE_LAYOUT_1
+	clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
-	setevent EVENT_WAREHOUSE_LAYOUT_2
+	setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
-	clearevent EVENT_WAREHOUSE_LAYOUT_3
+	clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
 	end
 
 .BoxLayout2:
-	clearevent EVENT_WAREHOUSE_LAYOUT_1
+	clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
-	clearevent EVENT_WAREHOUSE_LAYOUT_2
+	clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
-	setevent EVENT_WAREHOUSE_LAYOUT_3
+	setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
 	end
 
 .Done:

maps/GoldenrodUnderground.asm

@@ -1,15 +1,15 @@
 const_value set 2
-	const WAREHOUSEENTRANCE_SUPER_NERD1
+	const GOLDENRODUNDERGROUND_SUPER_NERD1
-	const WAREHOUSEENTRANCE_SUPER_NERD2
+	const GOLDENRODUNDERGROUND_SUPER_NERD2
-	const WAREHOUSEENTRANCE_SUPER_NERD3
+	const GOLDENRODUNDERGROUND_SUPER_NERD3
-	const WAREHOUSEENTRANCE_SUPER_NERD4
+	const GOLDENRODUNDERGROUND_SUPER_NERD4
-	const WAREHOUSEENTRANCE_POKE_BALL
+	const GOLDENRODUNDERGROUND_POKE_BALL
-	const WAREHOUSEENTRANCE_GRAMPS
+	const GOLDENRODUNDERGROUND_GRAMPS
-	const WAREHOUSEENTRANCE_SUPER_NERD5
+	const GOLDENRODUNDERGROUND_SUPER_NERD5
-	const WAREHOUSEENTRANCE_SUPER_NERD6
+	const GOLDENRODUNDERGROUND_SUPER_NERD6
-	const WAREHOUSEENTRANCE_GRANNY
+	const GOLDENRODUNDERGROUND_GRANNY
 
-WarehouseEntrance_MapScriptHeader:
+GoldenrodUnderground_MapScriptHeader:
 .SceneScripts:
 	db 0
 
@@ -58,56 +58,56 @@ WarehouseEntrance_MapScriptHeader:
 	if_equal SATURDAY, .Saturday
 
 .Sunday:
-	disappear WAREHOUSEENTRANCE_GRAMPS
+	disappear GOLDENRODUNDERGROUND_GRAMPS
-	disappear WAREHOUSEENTRANCE_SUPER_NERD5
+	disappear GOLDENRODUNDERGROUND_SUPER_NERD5
-	appear WAREHOUSEENTRANCE_SUPER_NERD6
+	appear GOLDENRODUNDERGROUND_SUPER_NERD6
-	appear WAREHOUSEENTRANCE_GRANNY
+	appear GOLDENRODUNDERGROUND_GRANNY
 	return
 
 .Monday:
-	disappear WAREHOUSEENTRANCE_GRAMPS
+	disappear GOLDENRODUNDERGROUND_GRAMPS
 	checkmorn
 	iffalse .NotMondayMorning
-	appear WAREHOUSEENTRANCE_GRAMPS
+	appear GOLDENRODUNDERGROUND_GRAMPS
 .NotMondayMorning:
-	disappear WAREHOUSEENTRANCE_SUPER_NERD5
+	disappear GOLDENRODUNDERGROUND_SUPER_NERD5
-	disappear WAREHOUSEENTRANCE_SUPER_NERD6
+	disappear GOLDENRODUNDERGROUND_SUPER_NERD6
-	disappear WAREHOUSEENTRANCE_GRANNY
+	disappear GOLDENRODUNDERGROUND_GRANNY
 	return
 
 .Tuesday:
-	disappear WAREHOUSEENTRANCE_GRAMPS
+	disappear GOLDENRODUNDERGROUND_GRAMPS
-	appear WAREHOUSEENTRANCE_SUPER_NERD5
+	appear GOLDENRODUNDERGROUND_SUPER_NERD5
-	disappear WAREHOUSEENTRANCE_SUPER_NERD6
+	disappear GOLDENRODUNDERGROUND_SUPER_NERD6
-	disappear WAREHOUSEENTRANCE_GRANNY
+	disappear GOLDENRODUNDERGROUND_GRANNY
 	return
 
 .Wednesday:
-	disappear WAREHOUSEENTRANCE_GRAMPS
+	disappear GOLDENRODUNDERGROUND_GRAMPS
-	disappear WAREHOUSEENTRANCE_SUPER_NERD5
+	disappear GOLDENRODUNDERGROUND_SUPER_NERD5
-	appear WAREHOUSEENTRANCE_SUPER_NERD6
+	appear GOLDENRODUNDERGROUND_SUPER_NERD6
-	disappear WAREHOUSEENTRANCE_GRANNY
+	disappear GOLDENRODUNDERGROUND_GRANNY
 	return
 
 .Thursday:
-	disappear WAREHOUSEENTRANCE_GRAMPS
+	disappear GOLDENRODUNDERGROUND_GRAMPS
-	appear WAREHOUSEENTRANCE_SUPER_NERD5
+	appear GOLDENRODUNDERGROUND_SUPER_NERD5
-	disappear WAREHOUSEENTRANCE_SUPER_NERD6
+	disappear GOLDENRODUNDERGROUND_SUPER_NERD6
-	disappear WAREHOUSEENTRANCE_GRANNY
+	disappear GOLDENRODUNDERGROUND_GRANNY
 	return
 
 .Friday:
-	disappear WAREHOUSEENTRANCE_GRAMPS
+	disappear GOLDENRODUNDERGROUND_GRAMPS
-	disappear WAREHOUSEENTRANCE_SUPER_NERD5
+	disappear GOLDENRODUNDERGROUND_SUPER_NERD5
-	appear WAREHOUSEENTRANCE_SUPER_NERD6
+	appear GOLDENRODUNDERGROUND_SUPER_NERD6
-	disappear WAREHOUSEENTRANCE_GRANNY
+	disappear GOLDENRODUNDERGROUND_GRANNY
 	return
 
 .Saturday:
-	disappear WAREHOUSEENTRANCE_GRAMPS
+	disappear GOLDENRODUNDERGROUND_GRAMPS
-	appear WAREHOUSEENTRANCE_SUPER_NERD5
+	appear GOLDENRODUNDERGROUND_SUPER_NERD5
-	disappear WAREHOUSEENTRANCE_SUPER_NERD6
+	disappear GOLDENRODUNDERGROUND_SUPER_NERD6
-	appear WAREHOUSEENTRANCE_GRANNY
+	appear GOLDENRODUNDERGROUND_GRANNY
 	return
 
 TrainerSupernerdEric:
@@ -159,7 +159,7 @@ GrannyScript_0x7c132:
 	checkcode VAR_WEEKDAY
 	if_equal SUNDAY, .Open
 	if_equal SATURDAY, .Open
-	jump WarehouseEntranceScript_ShopClosed
+	jump GoldenrodUndergroundScript_ShopClosed
 
 .Open:
 	pokemart MARTTYPE_BITTER, MART_UNDERGROUND
@@ -169,14 +169,14 @@ GrannyScript_0x7c132:
 GrampsScript_0x7c146:
 	opentext
 	checkflag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED
-	iftrue WarehouseEntranceScript_ShopClosed
+	iftrue GoldenrodUndergroundScript_ShopClosed
 	checkcode VAR_WEEKDAY
 	if_equal MONDAY, .CheckMorn
-	jump WarehouseEntranceScript_ShopClosed
+	jump GoldenrodUndergroundScript_ShopClosed
 
 .CheckMorn:
 	checkmorn
-	iffalse WarehouseEntranceScript_ShopClosed
+	iffalse GoldenrodUndergroundScript_ShopClosed
 	pokemart MARTTYPE_BARGAIN, 0
 	closetext
 	end
@@ -187,7 +187,7 @@ OlderHaircutBrotherScript:
 	if_equal TUESDAY, .DoHaircut
 	if_equal THURSDAY, .DoHaircut
 	if_equal SATURDAY, .DoHaircut
-	jump WarehouseEntranceScript_ShopClosed
+	jump GoldenrodUndergroundScript_ShopClosed
 
 .DoHaircut:
 	checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
@@ -270,7 +270,7 @@ YoungerHaircutBrotherScript:
 	if_equal SUNDAY, .DoHaircut
 	if_equal WEDNESDAY, .DoHaircut
 	if_equal FRIDAY, .DoHaircut
-	jump WarehouseEntranceScript_ShopClosed
+	jump GoldenrodUndergroundScript_ShopClosed
 
 .DoHaircut:
 	checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
@@ -396,29 +396,26 @@ BasementDoorScript::
 	closetext
 	end
 
-WarehouseEntranceScript_ShopClosed:
+GoldenrodUndergroundScript_ShopClosed:
 	writetext UnknownText_0x7c904
 	waitbutton
 	closetext
 	end
 
-WarehouseEntranceCoinCase:
+GoldenrodUndergroundCoinCase:
 	itemball COIN_CASE
 
-MapWarehouseEntranceSignpost1Script:
+MapGoldenrodUndergroundSignpost1Script:
 	jumptext UnknownText_0x7c91a
 
-WarehouseEntranceHiddenParlyzHeal:
+GoldenrodUndergroundHiddenParlyzHeal:
-	dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL
+	dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL
 
+GoldenrodUndergroundHiddenSuperPotion:
+	dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION
 
-WarehouseEntranceHiddenSuperPotion:
+GoldenrodUndergroundHiddenAntidote:
-	dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_SUPER_POTION, SUPER_POTION
+	dwb EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE
-
-
-WarehouseEntranceHiddenAntidote:
-	dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_ANTIDOTE, ANTIDOTE
-
 
 SupernerdEricSeenText:
 	text "I got booted out"
@@ -649,18 +646,18 @@ UnknownText_0x7c91a:
 	line "THIS POINT"
 	done
 
-WarehouseEntrance_MapEventHeader:
+GoldenrodUnderground_MapEventHeader:
 	; filler
 	db 0, 0
 
 .Warps:
 	db 6
-	warp_def $2, $3, 7, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES
+	warp_def $2, $3, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def $22, $3, 4, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES
+	warp_def $22, $3, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def $6, $12, 4, WAREHOUSE_ENTRANCE
+	warp_def $6, $12, 4, GOLDENROD_UNDERGROUND
-	warp_def $1f, $15, 3, WAREHOUSE_ENTRANCE
+	warp_def $1f, $15, 3, GOLDENROD_UNDERGROUND
-	warp_def $1f, $16, 3, WAREHOUSE_ENTRANCE
+	warp_def $1f, $16, 3, GOLDENROD_UNDERGROUND
-	warp_def $1b, $16, 1, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES
+	warp_def $1b, $16, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
 
 .CoordEvents:
 	db 0
@@ -668,10 +665,10 @@ WarehouseEntrance_MapEventHeader:
 .BGEvents:
 	db 5
 	bg_event 6, 18, BGEVENT_READ, BasementDoorScript
-	bg_event 6, 19, BGEVENT_READ, MapWarehouseEntranceSignpost1Script
+	bg_event 6, 19, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script
-	bg_event 13, 6, BGEVENT_ITEM, WarehouseEntranceHiddenParlyzHeal
+	bg_event 13, 6, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal
-	bg_event 18, 4, BGEVENT_ITEM, WarehouseEntranceHiddenSuperPotion
+	bg_event 18, 4, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion
-	bg_event 8, 17, BGEVENT_ITEM, WarehouseEntranceHiddenAntidote
+	bg_event 8, 17, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote
 
 .ObjectEvents:
 	db 9
@@ -679,8 +676,8 @@ WarehouseEntrance_MapEventHeader:
 	object_event SPRITE_SUPER_NERD, 9, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1
 	object_event SPRITE_SUPER_NERD, 27, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1
 	object_event SPRITE_SUPER_NERD, 6, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1
-	object_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WarehouseEntranceCoinCase, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE
+	object_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
-	object_event SPRITE_GRAMPS, 11, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS
+	object_event SPRITE_GRAMPS, 11, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_GOLDENROD_UNDERGROUND_GRAMPS
-	object_event SPRITE_SUPER_NERD, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER
+	object_event SPRITE_SUPER_NERD, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER
-	object_event SPRITE_SUPER_NERD, 15, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER
+	object_event SPRITE_SUPER_NERD, 15, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER
-	object_event SPRITE_GRANNY, 21, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_WAREHOUSE_ENTRANCE_GRANNY
+	object_event SPRITE_GRANNY, 21, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_GOLDENROD_UNDERGROUND_GRANNY

maps/GoldenrodUndergroundSwitchRoomEntrances.asm

@@ -31,19 +31,19 @@ doorstate: macro
 endm
 
 const_value set 2
-	const UNDERGROUNDPATHSWITCHROOMENTRANCES_PHARMACIST1
+	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1
-	const UNDERGROUNDPATHSWITCHROOMENTRANCES_PHARMACIST2
+	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST2
-	const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET1
+	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET1
-	const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET2
+	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET2
-	const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET3
+	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET3
-	const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET_GIRL
+	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET_GIRL
-	const UNDERGROUNDPATHSWITCHROOMENTRANCES_TEACHER
+	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_TEACHER
-	const UNDERGROUNDPATHSWITCHROOMENTRANCES_SUPER_NERD
+	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SUPER_NERD
-	const UNDERGROUNDPATHSWITCHROOMENTRANCES_POKE_BALL1
+	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_POKE_BALL1
-	const UNDERGROUNDPATHSWITCHROOMENTRANCES_POKE_BALL2
+	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_POKE_BALL2
-	const UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER
+	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 
-UndergroundPathSwitchRoomEntrances_MapScriptHeader:
+GoldenrodUndergroundSwitchRoomEntrances_MapScriptHeader:
 .SceneScripts:
 	db 2
 	scene_script .DummyScene0
@@ -112,10 +112,10 @@ UndergroundPathSwitchRoomEntrances_MapScriptHeader:
 	return
 
 SuperNerdScript_0x7ca7a:
-	jumptextfaceplayer UndergroundPathSwitchRoomEntrances_SuperNerdText
+	jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_SuperNerdText
 
 TeacherScript_0x7ca7d:
-	jumptextfaceplayer UndergroundPathSwitchRoomEntrances_TeacherText
+	jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_TeacherText
 
 UndergroundSilverScene1:
 	spriteface PLAYER, RIGHT
@@ -123,14 +123,14 @@ UndergroundSilverScene1:
 	special Special_FadeOutMusic
 	pause 15
 	playsound SFX_EXIT_BUILDING
-	appear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER
+	appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 	waitsfx
-	applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement1
+	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement1
 	spriteface PLAYER, RIGHT
 	scall UndergroundSilverBattleScript
-	applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1
+	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1
 	playsound SFX_EXIT_BUILDING
-	disappear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER
+	disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 	setscene 1
 	waitsfx
 	playmapmusic
@@ -142,14 +142,14 @@ UndergroundSilverScene2:
 	special Special_FadeOutMusic
 	pause 15
 	playsound SFX_EXIT_BUILDING
-	appear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER
+	appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 	waitsfx
-	applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement2
+	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement2
 	spriteface PLAYER, RIGHT
 	scall UndergroundSilverBattleScript
-	applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2
+	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2
 	playsound SFX_EXIT_BUILDING
-	disappear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER
+	disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 	setscene 1
 	waitsfx
 	playmapmusic
@@ -166,13 +166,13 @@ UndergroundSilverBattleScript:
 	writetext UndergroundSilverBeforeText
 	waitbutton
 	closetext
-	setevent EVENT_RIVAL_UNDERGROUND_PATH
+	setevent EVENT_RIVAL_GOLDENROD_UNDERGROUND
 	checkevent EVENT_GOT_TOTODILE_FROM_ELM
 	iftrue .Totodile
 	checkevent EVENT_GOT_CHIKORITA_FROM_ELM
 	iftrue .Chikorita
 	winlosstext UndergroundSilverWinText, UndergroundSilverLossText
-	setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER
+	setlasttalked GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 	loadtrainer RIVAL1, RIVAL1_4_TOTODILE
 	startbattle
 	dontrestartmapmusic
@@ -181,7 +181,7 @@ UndergroundSilverBattleScript:
 
 .Totodile:
 	winlosstext UndergroundSilverWinText, UndergroundSilverLossText
-	setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER
+	setlasttalked GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 	loadtrainer RIVAL1, RIVAL1_4_CHIKORITA
 	startbattle
 	dontrestartmapmusic
@@ -190,7 +190,7 @@ UndergroundSilverBattleScript:
 
 .Chikorita:
 	winlosstext UndergroundSilverWinText, UndergroundSilverLossText
-	setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER
+	setlasttalked GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 	loadtrainer RIVAL1, RIVAL1_4_CYNDAQUIL
 	startbattle
 	dontrestartmapmusic
@@ -279,22 +279,22 @@ Switch1Script:
 	iftrue .On
 	writetext SwitchRoomText_OffTurnOn
 	yesorno
-	iffalse UndergroundPathSwitchRoomEntrances_DontToggle
+	iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
 	copybytetovar UndergroundSwitchPositions
 	addvar 1
 	copyvartobyte UndergroundSwitchPositions
 	setevent EVENT_SWITCH_1
-	jump UndergroundPathSwitchRoomEntrances_UpdateDoors
+	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
 .On:
 	writetext SwitchRoomText_OnTurnOff
 	yesorno
-	iffalse UndergroundPathSwitchRoomEntrances_DontToggle
+	iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
 	copybytetovar UndergroundSwitchPositions
 	addvar -1
 	copyvartobyte UndergroundSwitchPositions
 	clearevent EVENT_SWITCH_1
-	jump UndergroundPathSwitchRoomEntrances_UpdateDoors
+	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
 Switch2Script:
 	opentext
@@ -304,22 +304,22 @@ Switch2Script:
 	iftrue .On
 	writetext SwitchRoomText_OffTurnOn
 	yesorno
-	iffalse UndergroundPathSwitchRoomEntrances_DontToggle
+	iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
 	copybytetovar UndergroundSwitchPositions
 	addvar 2
 	copyvartobyte UndergroundSwitchPositions
 	setevent EVENT_SWITCH_2
-	jump UndergroundPathSwitchRoomEntrances_UpdateDoors
+	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
 .On:
 	writetext SwitchRoomText_OnTurnOff
 	yesorno
-	iffalse UndergroundPathSwitchRoomEntrances_DontToggle
+	iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
 	copybytetovar UndergroundSwitchPositions
 	addvar -2
 	copyvartobyte UndergroundSwitchPositions
 	clearevent EVENT_SWITCH_2
-	jump UndergroundPathSwitchRoomEntrances_UpdateDoors
+	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
 Switch3Script:
 	opentext
@@ -329,22 +329,22 @@ Switch3Script:
 	iftrue .On
 	writetext SwitchRoomText_OffTurnOn
 	yesorno
-	iffalse UndergroundPathSwitchRoomEntrances_DontToggle
+	iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
 	copybytetovar UndergroundSwitchPositions
 	addvar 3
 	copyvartobyte UndergroundSwitchPositions
 	setevent EVENT_SWITCH_3
-	jump UndergroundPathSwitchRoomEntrances_UpdateDoors
+	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
 .On:
 	writetext SwitchRoomText_OnTurnOff
 	yesorno
-	iffalse UndergroundPathSwitchRoomEntrances_DontToggle
+	iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
 	copybytetovar UndergroundSwitchPositions
 	addvar -3
 	copyvartobyte UndergroundSwitchPositions
 	clearevent EVENT_SWITCH_3
-	jump UndergroundPathSwitchRoomEntrances_UpdateDoors
+	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
 EmergencySwitchScript:
 	opentext
@@ -354,32 +354,32 @@ EmergencySwitchScript:
 	iftrue .On
 	writetext SwitchRoomText_OffTurnOn
 	yesorno
-	iffalse UndergroundPathSwitchRoomEntrances_DontToggle
+	iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
 	writebyte 7
 	copyvartobyte UndergroundSwitchPositions
 	setevent EVENT_EMERGENCY_SWITCH
 	setevent EVENT_SWITCH_1
 	setevent EVENT_SWITCH_2
 	setevent EVENT_SWITCH_3
-	jump UndergroundPathSwitchRoomEntrances_UpdateDoors
+	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
 .On:
 	writetext SwitchRoomText_OnTurnOff
 	yesorno
-	iffalse UndergroundPathSwitchRoomEntrances_DontToggle
+	iffalse GoldenrodUndergroundSwitchRoomEntrances_DontToggle
 	writebyte 0
 	copyvartobyte UndergroundSwitchPositions
 	clearevent EVENT_EMERGENCY_SWITCH
 	clearevent EVENT_SWITCH_1
 	clearevent EVENT_SWITCH_2
 	clearevent EVENT_SWITCH_3
-	jump UndergroundPathSwitchRoomEntrances_UpdateDoors
+	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
-UndergroundPathSwitchRoomEntrances_DontToggle:
+GoldenrodUndergroundSwitchRoomEntrances_DontToggle:
 	closetext
 	end
 
-UndergroundPathSwitchRoomEntrances_UpdateDoors:
+GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
 	copybytetovar UndergroundSwitchPositions
 	if_equal 0, .Position0
 	if_equal 1, .Position1
@@ -623,19 +623,17 @@ UndergroundPathSwitchRoomEntrances_UpdateDoors:
 	clearevent EVENT_SWITCH_14
 	end
 
-UndergroundPathSwitchRoomEntrancesSmokeBall:
+GoldenrodUndergroundSwitchRoomEntrancesSmokeBall:
 	itemball SMOKE_BALL
 
-UndergroundPathSwitchRoomEntrancesFullHeal:
+GoldenrodUndergroundSwitchRoomEntrancesFullHeal:
 	itemball FULL_HEAL
 
-UndergroundPathSwitchRoomEntrancesHiddenMaxPotion:
+GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion:
-	dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION
+	dwb EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION
-
-
-UndergroundPathSwitchRoomEntrancesHiddenRevive:
-	dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE
 
+GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive:
+	dwb EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE
 
 UndergroundSilverApproachMovement1:
 	step DOWN
@@ -751,7 +749,7 @@ UndergroundSilverLossText:
 	cont "under my heels."
 	done
 
-UndergroundPathSwitchRoomEntrances_SuperNerdText:
+GoldenrodUndergroundSwitchRoomEntrances_SuperNerdText:
 	text "I was challenged"
 	line "to a battle down-"
 	cont "stairs."
@@ -761,7 +759,7 @@ UndergroundPathSwitchRoomEntrances_SuperNerdText:
 	cont "better be careful."
 	done
 
-UndergroundPathSwitchRoomEntrances_TeacherText:
+GoldenrodUndergroundSwitchRoomEntrances_TeacherText:
 	text "There are some"
 	line "shops downstairs…"
 
@@ -931,19 +929,19 @@ SwitchRoomText_Emergency:
 	line "EMERGENCY."
 	done
 
-UndergroundPathSwitchRoomEntrances_MapEventHeader:
+GoldenrodUndergroundSwitchRoomEntrances_MapEventHeader:
 	; filler
 	db 0, 0
 
 .Warps:
 	db 9
-	warp_def $3, $17, 6, WAREHOUSE_ENTRANCE
+	warp_def $3, $17, 6, GOLDENROD_UNDERGROUND
-	warp_def $a, $16, 1, UNDERGROUND_WAREHOUSE
+	warp_def $a, $16, 1, GOLDENROD_UNDERGROUND_WAREHOUSE
-	warp_def $a, $17, 2, UNDERGROUND_WAREHOUSE
+	warp_def $a, $17, 2, GOLDENROD_UNDERGROUND_WAREHOUSE
-	warp_def $19, $5, 2, WAREHOUSE_ENTRANCE
+	warp_def $19, $5, 2, GOLDENROD_UNDERGROUND
 	warp_def $1d, $4, 14, GOLDENROD_CITY
 	warp_def $1d, $5, 14, GOLDENROD_CITY
-	warp_def $19, $15, 1, WAREHOUSE_ENTRANCE
+	warp_def $19, $15, 1, GOLDENROD_UNDERGROUND
 	warp_def $1d, $14, 13, GOLDENROD_CITY
 	warp_def $1d, $15, 13, GOLDENROD_CITY
 
@@ -958,8 +956,8 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader:
 	bg_event 1, 10, BGEVENT_READ, Switch2Script
 	bg_event 1, 2, BGEVENT_READ, Switch3Script
 	bg_event 11, 20, BGEVENT_READ, EmergencySwitchScript
-	bg_event 9, 8, BGEVENT_ITEM, UndergroundPathSwitchRoomEntrancesHiddenMaxPotion
+	bg_event 9, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion
-	bg_event 8, 1, BGEVENT_ITEM, UndergroundPathSwitchRoomEntrancesHiddenRevive
+	bg_event 8, 1, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive
 
 .ObjectEvents:
 	db 11
@@ -971,6 +969,6 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader:
 	object_event SPRITE_ROCKET_GIRL, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event SPRITE_TEACHER, 27, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1
 	object_event SPRITE_SUPER_NERD, 27, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1
-	object_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UndergroundPathSwitchRoomEntrancesSmokeBall, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
+	object_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
-	object_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UndergroundPathSwitchRoomEntrancesFullHeal, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL
+	object_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
-	object_event SPRITE_SILVER, 3, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_UNDERGROUND_PATH
+	object_event SPRITE_SILVER, 3, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND

maps/GoldenrodUndergroundWarehouse.asm

@@ -1,13 +1,13 @@
 const_value set 2
-	const UNDERGROUNDWAREHOUSE_ROCKET1
+	const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET1
-	const UNDERGROUNDWAREHOUSE_ROCKET2
+	const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET2
-	const UNDERGROUNDWAREHOUSE_ROCKET3
+	const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET3
-	const UNDERGROUNDWAREHOUSE_GENTLEMAN
+	const GOLDENRODUNDERGROUNDWAREHOUSE_GENTLEMAN
-	const UNDERGROUNDWAREHOUSE_POKE_BALL1
+	const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL1
-	const UNDERGROUNDWAREHOUSE_POKE_BALL2
+	const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL2
-	const UNDERGROUNDWAREHOUSE_POKE_BALL3
+	const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL3
 
-UndergroundWarehouse_MapScriptHeader:
+GoldenrodUndergroundWarehouse_MapScriptHeader:
 .SceneScripts:
 	db 0
 
@@ -77,9 +77,9 @@ GentlemanScript_0x7d9bf:
 	buttonsound
 	verbosegiveitem CARD_KEY
 	setevent EVENT_RECEIVED_CARD_KEY
-	setevent EVENT_WAREHOUSE_LAYOUT_1
+	setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
-	clearevent EVENT_WAREHOUSE_LAYOUT_2
+	clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
-	clearevent EVENT_WAREHOUSE_LAYOUT_3
+	clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
 	writetext UnknownText_0x7dc5b
 	buttonsound
 UnknownScript_0x7d9de:
@@ -88,13 +88,13 @@ UnknownScript_0x7d9de:
 	closetext
 	end
 
-UndergroundWarehouseMaxEther:
+GoldenrodUndergroundWarehouseMaxEther:
 	itemball MAX_ETHER
 
-UndergroundWarehouseTMSleepTalk:
+GoldenrodUndergroundWarehouseTMSleepTalk:
 	itemball TM_SLEEP_TALK
 
-UndergroundWarehouseUltraBall:
+GoldenrodUndergroundWarehouseUltraBall:
 	itemball ULTRA_BALL
 
 GruntM24SeenText:
@@ -210,14 +210,14 @@ UnknownText_0x7dc8d:
 	line "MON nationwide!"
 	done
 
-UndergroundWarehouse_MapEventHeader:
+GoldenrodUndergroundWarehouse_MapEventHeader:
 	; filler
 	db 0, 0
 
 .Warps:
 	db 3
-	warp_def $c, $2, 2, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES
+	warp_def $c, $2, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def $c, $3, 3, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES
+	warp_def $c, $3, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
 	warp_def $2, $11, 1, GOLDENROD_DEPT_STORE_B1F
 
 .CoordEvents:
@@ -232,6 +232,6 @@ UndergroundWarehouse_MapEventHeader:
 	object_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event SPRITE_ROCKET, 3, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event SPRITE_GENTLEMAN, 8, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UndergroundWarehouseMaxEther, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER
+	object_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER
-	object_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UndergroundWarehouseTMSleepTalk, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
+	object_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
-	object_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UndergroundWarehouseUltraBall, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL
+	object_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL

maps/Route5.asm

@@ -45,7 +45,7 @@ Route5_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $f, $11, 1, ROUTE_5_UNDERGROUND_ENTRANCE
+	warp_def $f, $11, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
 	warp_def $11, $8, 1, ROUTE_5_SAFFRON_CITY_GATE
 	warp_def $11, $9, 2, ROUTE_5_SAFFRON_CITY_GATE
 	warp_def $b, $a, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE

maps/Route5UndergroundEntrance.asm

@@ -1,40 +0,0 @@
-const_value set 2
-	const ROUTE5UNDERGROUNDENTRANCE_TEACHER
-
-Route5UndergroundEntrance_MapScriptHeader:
-.SceneScripts:
-	db 0
-
-.MapCallbacks:
-	db 0
-
-Route5UndergroundEntranceTeacherScript:
-	jumptextfaceplayer Route5UndergroundEntranceTeacherText
-
-Route5UndergroundEntranceTeacherText:
-	text "Many cities in"
-	line "JOHTO have long"
-
-	para "histories. I'd"
-	line "love to visit!"
-	done
-
-Route5UndergroundEntrance_MapEventHeader:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def $7, $3, 1, ROUTE_5
-	warp_def $7, $4, 1, ROUTE_5
-	warp_def $3, $4, 1, UNDERGROUND
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 1
-	object_event SPRITE_TEACHER, 2, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundEntranceTeacherScript, -1

maps/Route5UndergroundPathEntrance.asm

@@ -0,0 +1,40 @@
+const_value set 2
+	const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER
+
+Route5UndergroundPathEntrance_MapScriptHeader:
+.SceneScripts:
+	db 0
+
+.MapCallbacks:
+	db 0
+
+Route5UndergroundPathEntranceTeacherScript:
+	jumptextfaceplayer Route5UndergroundPathEntranceTeacherText
+
+Route5UndergroundPathEntranceTeacherText:
+	text "Many cities in"
+	line "JOHTO have long"
+
+	para "histories. I'd"
+	line "love to visit!"
+	done
+
+Route5UndergroundPathEntrance_MapEventHeader:
+	; filler
+	db 0, 0
+
+.Warps:
+	db 3
+	warp_def $7, $3, 1, ROUTE_5
+	warp_def $7, $4, 1, ROUTE_5
+	warp_def $3, $4, 1, UNDERGROUND_PATH
+
+.CoordEvents:
+	db 0
+
+.BGEvents:
+	db 0
+
+.ObjectEvents:
+	db 1
+	object_event SPRITE_TEACHER, 2, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1

maps/Route6.asm

@@ -97,7 +97,7 @@ Route6_MapEventHeader:
 
 .Warps:
 	db 2
-	warp_def $3, $11, 1, ROUTE_6_UNDERGROUND_ENTRANCE
+	warp_def $3, $11, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
 	warp_def $1, $6, 3, ROUTE_6_SAFFRON_GATE
 
 .CoordEvents:

maps/Route6UndergroundPathEntrance.asm

@@ -1,11 +1,11 @@
-Route6UndergroundEntrance_MapScriptHeader:
+Route6UndergroundPathEntrance_MapScriptHeader:
 .SceneScripts:
 	db 0
 
 .MapCallbacks:
 	db 0
 
-Route6UndergroundEntrance_MapEventHeader:
+Route6UndergroundPathEntrance_MapEventHeader:
 	; filler
 	db 0, 0
 
@@ -13,7 +13,7 @@ Route6UndergroundEntrance_MapEventHeader:
 	db 3
 	warp_def $7, $3, 1, ROUTE_6
 	warp_def $7, $4, 1, ROUTE_6
-	warp_def $3, $4, 2, UNDERGROUND
+	warp_def $3, $4, 2, UNDERGROUND_PATH
 
 .CoordEvents:
 	db 0

maps/Underground.asm

@@ -1,34 +0,0 @@
-Underground_MapScriptHeader:
-.SceneScripts:
-	db 0
-
-.MapCallbacks:
-	db 0
-
-UndergroundHiddenFullRestore:
-	dwb EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE, FULL_RESTORE
-
-
-UndergroundHiddenXSpecial:
-	dwb EVENT_UNDERGROUND_HIDDEN_X_SPECIAL, X_SPECIAL
-
-
-Underground_MapEventHeader:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def $2, $3, 3, ROUTE_5_UNDERGROUND_ENTRANCE
-	warp_def $18, $3, 3, ROUTE_6_UNDERGROUND_ENTRANCE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 9, 3, BGEVENT_ITEM, UndergroundHiddenFullRestore
-	bg_event 19, 1, BGEVENT_ITEM, UndergroundHiddenXSpecial
-
-.ObjectEvents:
-	db 0

maps/UndergroundPath.asm

@@ -0,0 +1,34 @@
+UndergroundPath_MapScriptHeader:
+.SceneScripts:
+	db 0
+
+.MapCallbacks:
+	db 0
+
+UndergroundPathHiddenFullRestore:
+	dwb EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE
+
+
+UndergroundPathHiddenXSpecial:
+	dwb EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL
+
+
+UndergroundPath_MapEventHeader:
+	; filler
+	db 0, 0
+
+.Warps:
+	db 2
+	warp_def $2, $3, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
+	warp_def $18, $3, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
+
+.CoordEvents:
+	db 0
+
+.BGEvents:
+	db 2
+	bg_event 9, 3, BGEVENT_ITEM, UndergroundPathHiddenFullRestore
+	bg_event 19, 1, BGEVENT_ITEM, UndergroundPathHiddenXSpecial
+
+.ObjectEvents:
+	db 0

maps/blockdata.asm

@@ -462,8 +462,8 @@ NationalPark_BlockData:
 NationalParkBugContest_BlockData:
 	INCBIN "maps/NationalPark.blk"
 
-Route6UndergroundEntrance_BlockData:
+Route5UndergroundPathEntrance_BlockData:
-Route5UndergroundEntrance_BlockData:
+Route6UndergroundPathEntrance_BlockData:
 	INCBIN "maps/UndergroundPathEntrance.blk"
 
 BetaPokecenterTradeStation_BlockData:
@@ -571,17 +571,17 @@ Route16_BlockData:
 Route18_BlockData:
 	INCBIN "maps/Route18.blk"
 
-WarehouseEntrance_BlockData:
+GoldenrodUnderground_BlockData:
-	INCBIN "maps/WarehouseEntrance.blk"
+	INCBIN "maps/GoldenrodUnderground.blk"
 
-UndergroundPathSwitchRoomEntrances_BlockData:
+GoldenrodUndergroundSwitchRoomEntrances_BlockData:
-	INCBIN "maps/UndergroundPathSwitchRoomEntrances.blk"
+	INCBIN "maps/GoldenrodUndergroundSwitchRoomEntrances.blk"
 
 GoldenrodDeptStoreB1F_BlockData:
 	INCBIN "maps/GoldenrodDeptStoreB1F.blk"
 
-UndergroundWarehouse_BlockData:
+GoldenrodUndergroundWarehouse_BlockData:
-	INCBIN "maps/UndergroundWarehouse.blk"
+	INCBIN "maps/GoldenrodUndergroundWarehouse.blk"
 
 BetaElevator_BlockData:
 	INCBIN "maps/BetaElevator.blk"
@@ -953,8 +953,8 @@ FuchsiaGym_BlockData:
 SafariZoneBeta_BlockData:
 	INCBIN "maps/SafariZoneBeta.blk"
 
-Underground_BlockData:
+UndergroundPath_BlockData:
-	INCBIN "maps/Underground.blk"
+	INCBIN "maps/UndergroundPath.blk"
 
 Route39Barn_BlockData:
 	INCBIN "maps/Route39Barn.blk"

maps/map_headers.asm

@@ -124,10 +124,10 @@ MapGroup_Dungeons:
 	map_header TeamRocketBaseB2F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE
 	map_header TeamRocketBaseB3F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE
 	map_header IlexForest, TILESET_ILEX_FOREST, CAVE, ILEX_FOREST, MUSIC_UNION_CAVE, 0, PALETTE_NITE, FISHGROUP_POND
-	map_header WarehouseEntrance, TILESET_GATE, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE
+	map_header GoldenrodUnderground, TILESET_GATE, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE
-	map_header UndergroundPathSwitchRoomEntrances, TILESET_GYM_1, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE
+	map_header GoldenrodUndergroundSwitchRoomEntrances, TILESET_GYM_1, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE
 	map_header GoldenrodDeptStoreB1F, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE
-	map_header UndergroundWarehouse, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE
+	map_header GoldenrodUndergroundWarehouse, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE
 	map_header MountMortar1FOutside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE
 	map_header MountMortar1FInside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE
 	map_header MountMortar2FInside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE
@@ -157,7 +157,7 @@ MapGroup_Dungeons:
 	map_header TohjoFalls, TILESET_CAVE, CAVE, TOHJO_FALLS, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE
 	map_header DiglettsCave, TILESET_CAVE, CAVE, DIGLETTS_CAVE, MUSIC_MT_MOON, 1, PALETTE_NITE, FISHGROUP_SHORE
 	map_header MountMoon, TILESET_CAVE, CAVE, MT_MOON, MUSIC_MT_MOON, 1, PALETTE_NITE, FISHGROUP_SHORE
-	map_header Underground, TILESET_UNDERGROUND, GATE, UNDERGROUND, MUSIC_MT_MOON, 0, PALETTE_NITE, FISHGROUP_SHORE
+	map_header UndergroundPath, TILESET_UNDERGROUND, GATE, UNDERGROUND_PATH, MUSIC_MT_MOON, 0, PALETTE_NITE, FISHGROUP_SHORE
 	map_header RockTunnel1F, TILESET_WHIRL_ISLANDS, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, 1, PALETTE_DARK, FISHGROUP_SHORE
 	map_header RockTunnelB1F, TILESET_WHIRL_ISLANDS, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, 1, PALETTE_DARK, FISHGROUP_SHORE
 	map_header SafariZoneFuchsiaGateBeta, TILESET_GATE, INDOOR, FUCHSIA_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -300,7 +300,7 @@ MapGroup_Vermilion:
 	map_header VermilionHouseDiglettsCaveSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header VermilionGym, TILESET_GAME_CORNER, INDOOR, VERMILION_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route6SaffronGate, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route6UndergroundEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE
 
 
 MapGroup_Pallet:
@@ -491,7 +491,7 @@ MapGroup_Saffron:
 	map_header SilphCo1F, TILESET_POWER_PLANT, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
-	map_header Route5UndergroundEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE
+	map_header Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route5SaffronCityGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 	map_header Route5CleanseTagSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
 

maps/second_map_headers.asm

@@ -416,10 +416,10 @@ endm
 	map_header_2 TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $0, 0
 	map_header_2 TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $0, 0
 	map_header_2 IlexForest, ILEX_FOREST, $5, 0
-	map_header_2 WarehouseEntrance, WAREHOUSE_ENTRANCE, $0, 0
+	map_header_2 GoldenrodUnderground, GOLDENROD_UNDERGROUND, $0, 0
-	map_header_2 UndergroundPathSwitchRoomEntrances, UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, $0, 0
+	map_header_2 GoldenrodUndergroundSwitchRoomEntrances, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, $0, 0
 	map_header_2 GoldenrodDeptStoreB1F, GOLDENROD_DEPT_STORE_B1F, $0, 0
-	map_header_2 UndergroundWarehouse, UNDERGROUND_WAREHOUSE, $0, 0
+	map_header_2 GoldenrodUndergroundWarehouse, GOLDENROD_UNDERGROUND_WAREHOUSE, $0, 0
 	map_header_2 MountMortar1FOutside, MOUNT_MORTAR_1F_OUTSIDE, $9, 0
 	map_header_2 MountMortar1FInside, MOUNT_MORTAR_1F_INSIDE, $9, 0
 	map_header_2 MountMortar2FInside, MOUNT_MORTAR_2F_INSIDE, $9, 0
@@ -464,7 +464,7 @@ endm
 	map_header_2 Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $0, 0
 	map_header_2 DiglettsCave, DIGLETTS_CAVE, $9, 0
 	map_header_2 MountMoon, MOUNT_MOON, $9, 0
-	map_header_2 Underground, UNDERGROUND, $0, 0
+	map_header_2 UndergroundPath, UNDERGROUND_PATH, $0, 0
 	map_header_2 RockTunnel1F, ROCK_TUNNEL_1F, $9, 0
 	map_header_2 RockTunnelB1F, ROCK_TUNNEL_B1F, $9, 0
 	map_header_2 SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $0, 0
@@ -552,7 +552,7 @@ endm
 	map_header_2 VermilionHouseDiglettsCaveSpeechHouse, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, $0, 0
 	map_header_2 VermilionGym, VERMILION_GYM, $0, 0
 	map_header_2 Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $0, 0
-	map_header_2 Route6UndergroundEntrance, ROUTE_6_UNDERGROUND_ENTRANCE, $0, 0
+	map_header_2 Route6UndergroundPathEntrance, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, $0, 0
 	map_header_2 RedsHouse1F, REDS_HOUSE_1F, $0, 0
 	map_header_2 RedsHouse2F, REDS_HOUSE_2F, $0, 0
 	map_header_2 BluesHouse, BLUES_HOUSE, $0, 0
@@ -672,7 +672,7 @@ endm
 	map_header_2 SilphCo1F, SILPH_CO_1F, $0, 0
 	map_header_2 CopycatsHouse1F, COPYCATS_HOUSE_1F, $0, 0
 	map_header_2 CopycatsHouse2F, COPYCATS_HOUSE_2F, $0, 0
-	map_header_2 Route5UndergroundEntrance, ROUTE_5_UNDERGROUND_ENTRANCE, $0, 0
+	map_header_2 Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $0, 0
 	map_header_2 Route5SaffronCityGate, ROUTE_5_SAFFRON_CITY_GATE, $0, 0
 	map_header_2 Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $0, 0
 	map_header_2 CherrygroveMart, CHERRYGROVE_MART, $0, 0

wram.asm

@@ -2494,7 +2494,7 @@ wMahoganyMart1FSceneID::                     db ; d9b1
 wTeamRocketBaseB1FSceneID::                       db ; d9b2
 wTeamRocketBaseB2FSceneID::                       db ; d9b3
 wTeamRocketBaseB3FSceneID::                       db ; d9b4
-wUndergroundPathSwitchRoomEntrancesSceneID:: db ; d9b5
+wGoldenrodUndergroundSwitchRoomEntrancesSceneID:: db ; d9b5
 wSilverCaveRoom3SceneID::                         db ; d9b6
 wVictoryRoadSceneID::                             db ; d9b7
 wDragonsDenB1FSceneID::                           db ; d9b8