Rename map files, labels, and constants to be consistent and work wit…

…h Polished Map

audio.asm

@@ -1,4 +1,3 @@
-
 INCLUDE "constants.asm"
 
 
@@ -12,7 +11,6 @@ SECTION "Sound Effect Headers 3", ROMX ; BANK $1f
 INCLUDE "audio/headers/sfxheaders3.asm"
 
 
-
 SECTION "Music Headers 1", ROMX ; BANK $02
 INCLUDE "audio/headers/musicheaders1.asm"
 
@@ -23,7 +21,6 @@ SECTION "Music Headers 3", ROMX ; BANK $1f
 INCLUDE "audio/headers/musicheaders3.asm"
 
 
-
 SECTION "Sound Effects 1", ROMX ; BANK $02
 
 INCLUDE "audio/sfx/snare1_1.asm"

data/force_bike_surf.asm

@@ -4,8 +4,8 @@ ForcedBikeOrSurfMaps:
  db ROUTE_16,$0B,$11
  db ROUTE_18,$08,$21
  db ROUTE_18,$09,$21
- db SEAFOAM_ISLANDS_4,$07,$12
- db SEAFOAM_ISLANDS_4,$07,$13
- db SEAFOAM_ISLANDS_5,$0E,$04
- db SEAFOAM_ISLANDS_5,$0E,$05
+ db SEAFOAM_ISLANDS_B3F,$07,$12
+ db SEAFOAM_ISLANDS_B3F,$07,$13
+ db SEAFOAM_ISLANDS_B4F,$0E,$04
+ db SEAFOAM_ISLANDS_B4F,$0E,$05
  db $FF ;end

data/hidden_item_coords.asm

@@ -2,38 +2,38 @@ HiddenItemCoords:
 ; map ID, then coords
  db VIRIDIAN_FOREST,$12,$01
  db VIRIDIAN_FOREST,$2a,$10
- db MT_MOON_3,$0c,$12
+ db MT_MOON_B2F,$0c,$12
  db ROUTE_25,$03,$26
  db ROUTE_9,$07,$0e
- db SS_ANNE_6,$09,$0d
- db SS_ANNE_10,$01,$03
+ db SS_ANNE_KITCHEN,$09,$0d
+ db SS_ANNE_B1F_ROOMS,$01,$03
  db ROUTE_10,$11,$09
  db ROUTE_10,$35,$10
- db ROCKET_HIDEOUT_1,$0f,$15
- db ROCKET_HIDEOUT_3,$11,$1b
- db ROCKET_HIDEOUT_4,$01,$19
- db POKEMONTOWER_5,$0c,$04
+ db ROCKET_HIDEOUT_B1F,$0f,$15
+ db ROCKET_HIDEOUT_B3F,$11,$1b
+ db ROCKET_HIDEOUT_B4F,$01,$19
+ db POKEMON_TOWER_5F,$0c,$04
  db ROUTE_13,$0e,$01
  db ROUTE_13,$0d,$10
- db MANSION_4,$09,$01
- db SAFARI_ZONE_ENTRANCE,$01,$0a
+ db POKEMON_MANSION_B1F,$09,$01
+ db SAFARI_ZONE_GATE,$01,$0a
  db SAFARI_ZONE_WEST,$05,$06
  db SILPH_CO_5F,$03,$0c
  db SILPH_CO_9F,$0f,$02
  db COPYCATS_HOUSE_2F,$01,$01
- db UNKNOWN_DUNGEON_1,$0b,$0e
- db UNKNOWN_DUNGEON_3,$03,$1b
+ db CERULEAN_CAVE_1F,$0b,$0e
+ db CERULEAN_CAVE_B1F,$03,$1b
  db POWER_PLANT,$10,$11
  db POWER_PLANT,$01,$0c
- db SEAFOAM_ISLANDS_3,$0f,$0f
- db SEAFOAM_ISLANDS_5,$11,$19
- db MANSION_1,$10,$08
- db MANSION_3,$09,$01
+ db SEAFOAM_ISLANDS_B2F,$0f,$0f
+ db SEAFOAM_ISLANDS_B4F,$11,$19
+ db POKEMON_MANSION_1F,$10,$08
+ db POKEMON_MANSION_3F,$09,$01
  db ROUTE_23,$2c,$09
  db ROUTE_23,$46,$13
  db ROUTE_23,$5a,$08
- db VICTORY_ROAD_2,$02,$05
- db VICTORY_ROAD_2,$07,$1a
+ db VICTORY_ROAD_2F,$02,$05
+ db VICTORY_ROAD_2F,$07,$1a
  db UNUSED_MAP_6F,$0b,$0e
  db VIRIDIAN_CITY,$04,$0e
  db ROUTE_11,$05,$30
@@ -43,14 +43,14 @@ HiddenItemCoords:
  db ROUTE_17,$48,$11
  db ROUTE_17,$5b,$04
  db ROUTE_17,$79,$08
- db UNDERGROUND_PATH_NS,$04,$03
- db UNDERGROUND_PATH_NS,$22,$04
- db UNDERGROUND_PATH_WE,$02,$0c
- db UNDERGROUND_PATH_WE,$05,$15
+ db UNDERGROUND_PATH_NORTH_SOUTH,$04,$03
+ db UNDERGROUND_PATH_NORTH_SOUTH,$22,$04
+ db UNDERGROUND_PATH_WEST_EAST,$02,$0c
+ db UNDERGROUND_PATH_WEST_EAST,$05,$15
  db CELADON_CITY,$0f,$30
  db ROUTE_25,$01,$0a
- db MT_MOON_3,$09,$21
- db SEAFOAM_ISLANDS_4,$10,$09
+ db MT_MOON_B2F,$09,$21
+ db SEAFOAM_ISLANDS_B3F,$10,$09
  db VERMILION_CITY,$0b,$0e
  db CERULEAN_CITY,$08,$0f
  db ROUTE_4,$03,$28

data/hidden_objects.asm

@@ -4,7 +4,7 @@ HiddenObjectMaps:
  db OAKS_LAB
  db VIRIDIAN_POKECENTER
  db VIRIDIAN_MART
- db VIRIDIAN_SCHOOL
+ db VIRIDIAN_SCHOOL_HOUSE
  db VIRIDIAN_GYM
  db MUSEUM_1F
  db PEWTER_GYM
@@ -16,7 +16,7 @@ HiddenObjectMaps:
  db LAVENDER_POKECENTER
  db VERMILION_POKECENTER
  db VERMILION_GYM
- db CELADON_MANSION_2
+ db CELADON_MANSION_2F
  db CELADON_POKECENTER
  db CELADON_GYM
  db GAME_CORNER
@@ -31,56 +31,56 @@ HiddenObjectMaps:
  db TRADE_CENTER
  db COLOSSEUM
  db VIRIDIAN_FOREST
- db MT_MOON_3
+ db MT_MOON_B2F
  db INDIGO_PLATEAU
  db ROUTE_25
  db ROUTE_9
- db SS_ANNE_6
- db SS_ANNE_10
- db ROCKET_HIDEOUT_1
- db ROCKET_HIDEOUT_3
- db ROCKET_HIDEOUT_4
+ db SS_ANNE_KITCHEN
+ db SS_ANNE_B1F_ROOMS
+ db ROCKET_HIDEOUT_B1F
+ db ROCKET_HIDEOUT_B3F
+ db ROCKET_HIDEOUT_B4F
  db SAFFRON_POKECENTER
- db POKEMONTOWER_5
+ db POKEMON_TOWER_5F
  db ROUTE_13
- db SAFARI_ZONE_ENTRANCE
+ db SAFARI_ZONE_GATE
  db SAFARI_ZONE_WEST
  db SILPH_CO_5F
  db SILPH_CO_9F
  db COPYCATS_HOUSE_2F
- db UNKNOWN_DUNGEON_1
- db UNKNOWN_DUNGEON_3
+ db CERULEAN_CAVE_1F
+ db CERULEAN_CAVE_B1F
  db POWER_PLANT
- db SEAFOAM_ISLANDS_3
- db SEAFOAM_ISLANDS_5
- db MANSION_1
- db MANSION_3
+ db SEAFOAM_ISLANDS_B2F
+ db SEAFOAM_ISLANDS_B4F
+ db POKEMON_MANSION_1F
+ db POKEMON_MANSION_3F
  db ROUTE_23
- db VICTORY_ROAD_2
- db $6F
+ db VICTORY_ROAD_2F
+ db UNUSED_MAP_6F
  db BILLS_HOUSE
  db VIRIDIAN_CITY
- 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 ROUTE_15_GATE_2F
- db LAVENDER_HOUSE_1
- db CELADON_MANSION_5
+ db MR_FUJIS_HOUSE
+ db CELADON_MANSION_ROOF_HOUSE
  db FIGHTING_DOJO
  db ROUTE_10
  db INDIGO_PLATEAU_LOBBY
- db CINNABAR_LAB_4
+ db CINNABAR_LAB_FOSSIL_ROOM
  db BIKE_SHOP
  db ROUTE_11
  db ROUTE_12
- db MANSION_2
- db MANSION_4
+ db POKEMON_MANSION_2F
+ db POKEMON_MANSION_B1F
  db SILPH_CO_11F
  db ROUTE_17
- db UNDERGROUND_PATH_NS
- db UNDERGROUND_PATH_WE
+ db UNDERGROUND_PATH_NORTH_SOUTH
+ db UNDERGROUND_PATH_WEST_EAST
  db CELADON_CITY
- db SEAFOAM_ISLANDS_4
+ db SEAFOAM_ISLANDS_B3F
  db VERMILION_CITY
  db CERULEAN_CITY
  db ROUTE_4