Rename map files, labels, and constants to be consistent and work with Polished Map

engine/overworld/field_move_messages.asm

@@ -28,7 +28,7 @@ IsSurfingAllowed:
 	bit 5, a
 	jr nz, .forcedToRideBike
 	ld a, [wCurMap]
-	cp SEAFOAM_ISLANDS_5
+	cp SEAFOAM_ISLANDS_B4F
 	ret nz
 	CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE
 	ret z

engine/overworld/npc_movement.asm

@@ -268,7 +268,7 @@ RLEList_PewterGymGuy:
 
 FreezeEnemyTrainerSprite:
 	ld a, [wCurMap]
-	cp POKEMONTOWER_7
+	cp POKEMON_TOWER_7F
 	ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them
 	ld hl, RivalIDs
 	ld a, [wEngagedTrainerClass]

engine/overworld/player_state.asm

@@ -55,14 +55,14 @@ CheckForceBikeOrSurf:
 	cp c ;compare x-coord
 	jr nz, .loop ; incorrect x-coord, check next item
 	ld a, [wCurMap]
-	cp SEAFOAM_ISLANDS_4
+	cp SEAFOAM_ISLANDS_B3F
 	ld a, $2
-	ld [wSeafoamIslands4CurScript], a
+	ld [wSeafoamIslandsB3FCurScript], a
 	jr z, .forceSurfing
 	ld a, [wCurMap]
-	cp SEAFOAM_ISLANDS_5
+	cp SEAFOAM_ISLANDS_B4F
 	ld a, $2
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	jr z, .forceSurfing
 	;force bike riding
 	ld hl, wd732
@@ -156,7 +156,7 @@ IsWarpTileInFrontOfPlayer:
 	push bc
 	call _GetTileAndCoordsInFrontOfPlayer
 	ld a, [wCurMap]
-	cp SS_ANNE_5
+	cp SS_ANNE_BOW
 	jr z, .ssAnne5
 	ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction
 	srl a
@@ -237,7 +237,7 @@ PrintSafariZoneSteps:
 	ld a, [wCurMap]
 	cp SAFARI_ZONE_EAST
 	ret c
-	cp UNKNOWN_DUNGEON_2
+	cp CERULEAN_CAVE_2F
 	ret nc
 	coord hl, 0, 0
 	ld b, 3

engine/overworld/set_blackout_map.asm

@@ -23,7 +23,7 @@ SetLastBlackoutMap:
 	ret
 
 SafariZoneRestHouses:
-	db SAFARI_ZONE_REST_HOUSE_2
-	db SAFARI_ZONE_REST_HOUSE_3
-	db SAFARI_ZONE_REST_HOUSE_4
+	db SAFARI_ZONE_WEST_REST_HOUSE
+	db SAFARI_ZONE_EAST_REST_HOUSE
+	db SAFARI_ZONE_NORTH_REST_HOUSE
 	db -1