diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 36f41643..1deb32c9 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -27,246 +27,246 @@ ENDM mapconst CINNABAR_ISLAND, 15, 14 ; $08 mapconst INDIGO_PLATEAU, 9, 10 ; $09 mapconst SAFFRON_CITY, 18, 20 ; $0A -DEF NUM_CITY_MAPS EQU const_value - mapconst UNUSED_MAP_0B, 18, 20 ; $0B ; Citrine City +DEF NUM_CITY_MAPS EQU const_value ; eorsunica: move this line under CITRINE_CITY to include it in the Fly Map + mapconst CITRINE_CITY, 18, 20 ; $0B + mapconst CELADON_UNIVERSITY_OUTSIDE, 20, 21 ; $0C DEF FIRST_ROUTE_MAP EQU const_value - mapconst ROUTE_1, 18, 10 ; $0C - mapconst ROUTE_2, 36, 10 ; $0D - mapconst ROUTE_3, 9, 35 ; $0E - mapconst ROUTE_4, 9, 45 ; $0F - mapconst ROUTE_5, 18, 10 ; $10 - mapconst ROUTE_6, 18, 10 ; $11 - mapconst ROUTE_7, 9, 10 ; $12 - mapconst ROUTE_8, 9, 30 ; $13 - mapconst ROUTE_9, 13, 30 ; $14 - mapconst ROUTE_10, 40, 10 ; $15 - mapconst ROUTE_11, 9, 30 ; $16 - mapconst ROUTE_12, 54, 10 ; $17 - mapconst ROUTE_13, 9, 30 ; $18 - mapconst ROUTE_14, 27, 10 ; $19 - mapconst ROUTE_15, 9, 30 ; $1A - mapconst ROUTE_16, 9, 20 ; $1B - mapconst ROUTE_17, 72, 10 ; $1C - mapconst ROUTE_18, 9, 25 ; $1D - mapconst ROUTE_19, 27, 10 ; $1E - mapconst ROUTE_20, 15, 50 ; $1F - mapconst ROUTE_21, 45, 10 ; $20 - mapconst ROUTE_22, 9, 20 ; $21 - mapconst ROUTE_23, 72, 10 ; $22 - mapconst ROUTE_24, 18, 10 ; $23 - mapconst ROUTE_25, 9, 37 ; $24 + mapconst ROUTE_1, 18, 10 ; $0D + mapconst ROUTE_2, 36, 10 ; $0E + mapconst ROUTE_3, 9, 35 ; $0F + mapconst ROUTE_4, 9, 45 ; $00 + mapconst ROUTE_5, 18, 10 ; $11 + mapconst ROUTE_6, 18, 10 ; $12 + mapconst ROUTE_7, 9, 10 ; $13 + mapconst ROUTE_8, 9, 30 ; $14 + mapconst ROUTE_9, 13, 30 ; $15 + mapconst ROUTE_10, 40, 10 ; $16 + mapconst ROUTE_11, 9, 30 ; $17 + mapconst ROUTE_12, 54, 10 ; $18 + mapconst ROUTE_13, 9, 30 ; $19 + mapconst ROUTE_14, 27, 10 ; $1A + mapconst ROUTE_15, 9, 30 ; $1B + mapconst ROUTE_16, 9, 20 ; $1C + mapconst ROUTE_17, 72, 10 ; $1D + mapconst ROUTE_18, 9, 25 ; $1E + mapconst ROUTE_19, 27, 10 ; $1F + mapconst ROUTE_20, 15, 50 ; $10 + mapconst ROUTE_21, 45, 10 ; $21 + mapconst ROUTE_22, 9, 20 ; $22 + mapconst ROUTE_23, 72, 10 ; $23 + mapconst ROUTE_24, 18, 10 ; $24 + mapconst ROUTE_25, 9, 37 ; $25 DEF FIRST_INDOOR_MAP EQU const_value - mapconst REDS_HOUSE_1F, 4, 4 ; $25 - mapconst REDS_HOUSE_2F, 4, 4 ; $26 - mapconst BLUES_HOUSE, 4, 4 ; $27 - mapconst OAKS_LAB, 6, 7 ; $28 - mapconst VIRIDIAN_POKECENTER, 4, 7 ; $29 - mapconst VIRIDIAN_MART, 4, 4 ; $2A - mapconst VIRIDIAN_SCHOOL_HOUSE, 4, 4 ; $2B - mapconst VIRIDIAN_NICKNAME_HOUSE, 4, 4 ; $2C - mapconst VIRIDIAN_GYM, 9, 10 ; $2D - mapconst DIGLETTS_CAVE_ROUTE_2, 4, 4 ; $2E - mapconst VIRIDIAN_FOREST_NORTH_GATE, 4, 5 ; $2F - mapconst ROUTE_2_TRADE_HOUSE, 4, 4 ; $30 - mapconst ROUTE_2_GATE, 4, 5 ; $31 - mapconst VIRIDIAN_FOREST_SOUTH_GATE, 4, 5 ; $32 - mapconst VIRIDIAN_FOREST, 24, 17 ; $33 - mapconst MUSEUM_1F, 4, 10 ; $34 - mapconst MUSEUM_2F, 4, 7 ; $35 - mapconst PEWTER_GYM, 7, 5 ; $36 - mapconst PEWTER_NIDORAN_HOUSE, 4, 4 ; $37 - mapconst PEWTER_MART, 4, 4 ; $38 - mapconst PEWTER_SPEECH_HOUSE, 4, 4 ; $39 - mapconst PEWTER_POKECENTER, 4, 7 ; $3A - mapconst MT_MOON_1F, 18, 20 ; $3B - mapconst MT_MOON_B1F, 14, 14 ; $3C - mapconst MT_MOON_B2F, 18, 20 ; $3D - mapconst CERULEAN_TRASHED_HOUSE, 4, 4 ; $3E - mapconst CERULEAN_TRADE_HOUSE, 4, 4 ; $3F - mapconst CERULEAN_POKECENTER, 4, 7 ; $40 - mapconst CERULEAN_GYM, 7, 5 ; $41 - mapconst BIKE_SHOP, 4, 4 ; $42 - mapconst CERULEAN_MART, 4, 4 ; $43 - mapconst MT_MOON_POKECENTER, 4, 7 ; $44 - mapconst CERULEAN_TRASHED_HOUSE_COPY, 4, 4 ; $45 - Unused - mapconst ROUTE_5_GATE, 3, 4 ; $46 - mapconst UNDERGROUND_PATH_ROUTE_5, 4, 4 ; $47 - mapconst DAYCARE, 4, 4 ; $48 - mapconst ROUTE_6_GATE, 3, 4 ; $49 - mapconst UNDERGROUND_PATH_ROUTE_6, 4, 4 ; $4A - mapconst UNDERGROUND_PATH_ROUTE_6_COPY, 4, 4 ; $4B - Unused - mapconst ROUTE_7_GATE, 4, 3 ; $4C - mapconst UNDERGROUND_PATH_ROUTE_7, 4, 4 ; $4D - mapconst UNDERGROUND_PATH_ROUTE_7_COPY, 4, 4 ; $4E - Unused - mapconst ROUTE_8_GATE, 4, 3 ; $4F - mapconst UNDERGROUND_PATH_ROUTE_8, 4, 4 ; $50 - mapconst ROCK_TUNNEL_POKECENTER, 4, 7 ; $51 - mapconst ROCK_TUNNEL_1F, 18, 20 ; $52 - mapconst POWER_PLANT, 18, 20 ; $53 - mapconst ROUTE_11_GATE_1F, 5, 4 ; $54 - mapconst DIGLETTS_CAVE_ROUTE_11, 4, 4 ; $55 - mapconst ROUTE_11_GATE_2F, 4, 4 ; $56 - mapconst ROUTE_12_GATE_1F, 4, 5 ; $57 - mapconst BILLS_HOUSE, 4, 7 ; $58 - mapconst VERMILION_POKECENTER, 4, 7 ; $59 - mapconst POKEMON_FAN_CLUB, 4, 4 ; $5A - mapconst VERMILION_MART, 4, 4 ; $5B - mapconst VERMILION_GYM, 9, 5 ; $5C - mapconst VERMILION_PIDGEY_HOUSE, 4, 4 ; $5D - mapconst VERMILION_DOCK, 6, 14 ; $5E - mapconst SS_ANNE_1F, 9, 20 ; $5F - mapconst SS_ANNE_2F, 9, 20 ; $60 - mapconst SS_ANNE_3F, 3, 10 ; $61 - mapconst SS_ANNE_B1F, 4, 15 ; $62 - mapconst SS_ANNE_BOW, 7, 10 ; $63 - mapconst SS_ANNE_KITCHEN, 8, 7 ; $64 - mapconst SS_ANNE_CAPTAINS_ROOM, 4, 3 ; $65 - mapconst SS_ANNE_1F_ROOMS, 8, 12 ; $66 - mapconst SS_ANNE_2F_ROOMS, 8, 12 ; $67 - mapconst SS_ANNE_B1F_ROOMS, 8, 12 ; $68 - mapconst SILPH_GAUNTLET_1F, 9, 10 ; $69 - Was UNUSED_MAP_69 - mapconst SILPH_GAUNTLET_2F, 10, 13 ; $6A - Was UNUSED_MAP_6A - mapconst SILPH_GAUNTLET_3F, 13, 17 ; $6B - Was UNUSED_MAP_6B - mapconst VICTORY_ROAD_1F, 9, 10 ; $6C - mapconst SILPH_GAUNTLET_4F, 9, 10 ; $6D - Was UNUSED_MAP_6D - mapconst SILPH_GAUNTLET_5F, 9, 10 ; $6E - Was UNUSED_MAP_6E - mapconst SILPH_GAUNTLET_6F, 12, 12 ; $6F - Was UNUSED_MAP_6F - mapconst SILPH_GAUNTLET_7F, 5, 6 ; $70 - Was UNUSED_MAP_70 - mapconst LANCES_ROOM, 13, 13 ; $71 - mapconst FARAWAY_ISLAND_OUTSIDE, 18, 15 ; $72 - Was UNUSED_MAP_72 - mapconst FARAWAY_ISLAND_INSIDE, 11, 15 ; $73 - Was UNUSED_MAP_73 - mapconst POKEMON_MANSION_B2F, 12, 15 ; $74 - Was UNUSED_MAP_74 - mapconst MT_MOON_CRATER, 25, 25 ; $75 - Was UNUSED_MAP_75 - mapconst HALL_OF_FAME, 4, 5 ; $76 - mapconst UNDERGROUND_PATH_NORTH_SOUTH, 24, 4 ; $77 - mapconst CHAMPIONS_ROOM, 4, 4 ; $78 - mapconst UNDERGROUND_PATH_WEST_EAST, 4, 25 ; $79 - mapconst CELADON_MART_1F, 4, 10 ; $7A - mapconst CELADON_MART_2F, 4, 10 ; $7B - mapconst CELADON_MART_3F, 4, 10 ; $7C - mapconst CELADON_MART_4F, 4, 10 ; $7D - mapconst CELADON_MART_ROOF, 4, 10 ; $7E - mapconst CELADON_MART_ELEVATOR, 2, 2 ; $7F - mapconst CELADON_MANSION_1F, 6, 4 ; $80 - mapconst CELADON_MANSION_2F, 6, 4 ; $81 - mapconst CELADON_MANSION_3F, 6, 4 ; $82 - mapconst CELADON_MANSION_ROOF, 6, 4 ; $83 - mapconst CELADON_MANSION_ROOF_HOUSE, 4, 4 ; $84 - mapconst CELADON_POKECENTER, 4, 7 ; $85 - mapconst CELADON_GYM, 9, 5 ; $86 - mapconst GAME_CORNER, 9, 10 ; $87 - mapconst CELADON_MART_5F, 4, 10 ; $88 - mapconst GAME_CORNER_PRIZE_ROOM, 4, 5 ; $89 - mapconst CELADON_DINER, 4, 5 ; $8A - mapconst CELADON_CHIEF_HOUSE, 4, 4 ; $8B - mapconst CELADON_HOTEL, 4, 7 ; $8C - mapconst LAVENDER_POKECENTER, 4, 7 ; $8D - mapconst POKEMON_TOWER_1F, 9, 10 ; $8E - mapconst POKEMON_TOWER_2F, 9, 10 ; $8F - mapconst POKEMON_TOWER_3F, 9, 10 ; $90 - Now unused - mapconst POKEMON_TOWER_4F, 9, 10 ; $91 - Now unused - mapconst POKEMON_TOWER_5F, 9, 10 ; $92 - Now unused - mapconst POKEMON_TOWER_6F, 9, 10 ; $93 - mapconst POKEMON_TOWER_7F, 9, 10 ; $94 - mapconst MR_FUJIS_HOUSE, 4, 4 ; $95 - mapconst LAVENDER_MART, 4, 4 ; $96 - mapconst LAVENDER_CUBONE_HOUSE, 4, 4 ; $97 - mapconst FUCHSIA_MART, 4, 4 ; $98 - mapconst FUCHSIA_BILLS_GRANDPAS_HOUSE, 4, 4 ; $99 - mapconst FUCHSIA_POKECENTER, 4, 7 ; $9A - mapconst WARDENS_HOUSE, 4, 5 ; $9B - mapconst SAFARI_ZONE_GATE, 3, 4 ; $9C - mapconst FUCHSIA_GYM, 9, 5 ; $9D - mapconst FUCHSIA_MEETING_ROOM, 4, 7 ; $9E - mapconst SEAFOAM_ISLANDS_B1F, 9, 15 ; $9F - mapconst SEAFOAM_ISLANDS_B2F, 9, 15 ; $A0 - mapconst SEAFOAM_ISLANDS_B3F, 9, 15 ; $A1 - mapconst SEAFOAM_ISLANDS_B4F, 9, 15 ; $A2 - mapconst VERMILION_OLD_ROD_HOUSE, 4, 4 ; $A3 - Now unused - mapconst FUCHSIA_GOOD_ROD_HOUSE, 4, 4 ; $A4 - mapconst POKEMON_MANSION_1F, 14, 15 ; $A5 - mapconst CINNABAR_GYM, 9, 10 ; $A6 - mapconst CINNABAR_LAB, 4, 9 ; $A7 - mapconst CINNABAR_LAB_TRADE_ROOM, 4, 4 ; $A8 - mapconst CINNABAR_LAB_METRONOME_ROOM, 4, 4 ; $A9 - mapconst CINNABAR_LAB_FOSSIL_ROOM, 4, 4 ; $AA - mapconst CINNABAR_POKECENTER, 4, 7 ; $AB - mapconst CINNABAR_MART, 4, 4 ; $AC - mapconst CINNABAR_MART_COPY, 4, 4 ; $AD - Unused - mapconst INDIGO_PLATEAU_LOBBY, 6, 8 ; $AE - mapconst COPYCATS_HOUSE_1F, 4, 4 ; $AF - mapconst COPYCATS_HOUSE_2F, 4, 4 ; $B0 - mapconst FIGHTING_DOJO, 6, 5 ; $B1 - mapconst SAFFRON_GYM, 9, 10 ; $B2 - mapconst SAFFRON_PIDGEY_HOUSE, 4, 4 ; $B3 - mapconst SAFFRON_MART, 4, 4 ; $B4 - mapconst SILPH_CO_1F, 9, 15 ; $B5 - mapconst SAFFRON_POKECENTER, 4, 7 ; $B6 - mapconst MR_PSYCHICS_HOUSE, 4, 4 ; $B7 - mapconst ROUTE_15_GATE_1F, 5, 4 ; $B8 - mapconst ROUTE_15_GATE_2F, 4, 4 ; $B9 - mapconst ROUTE_16_GATE_1F, 7, 4 ; $BA - mapconst ROUTE_16_GATE_2F, 4, 4 ; $BB - mapconst ROUTE_16_FLY_HOUSE, 4, 4 ; $BC - mapconst ROUTE_12_SUPER_ROD_HOUSE, 4, 4 ; $BD - mapconst ROUTE_18_GATE_1F, 5, 4 ; $BE - mapconst ROUTE_18_GATE_2F, 4, 4 ; $BF - mapconst SEAFOAM_ISLANDS_1F, 9, 15 ; $C0 - mapconst ROUTE_22_GATE, 4, 5 ; $C1 - mapconst VICTORY_ROAD_2F, 9, 15 ; $C2 - mapconst ROUTE_12_GATE_2F, 4, 4 ; $C3 - mapconst VERMILION_TRADE_HOUSE, 4, 4 ; $C4 - mapconst DIGLETTS_CAVE, 18, 20 ; $C5 - mapconst VICTORY_ROAD_3F, 9, 15 ; $C6 - mapconst ROCKET_HIDEOUT_B1F, 14, 11 ; $C7 - mapconst ROCKET_HIDEOUT_B2F, 14, 15 ; $C8 - Now unused, Citrine PokeCenter? - mapconst ROCKET_HIDEOUT_B3F, 14, 15 ; $C9 - Now unused, Citrine PokeMart? - mapconst ROCKET_HIDEOUT_B4F, 12, 15 ; $CA - Now unused, Citrine House 1? - mapconst ROCKET_HIDEOUT_ELEVATOR, 4, 3 ; $CB - Now unused, Citrine Dock? - mapconst UNUSED_MAP_CC, 0, 0 ; $CC - Unused, Citrine House 2? - mapconst UNUSED_MAP_CD, 0, 0 ; $CD - Unused, Citrine Cave 1F? - mapconst UNUSED_MAP_CE, 0, 0 ; $CE - Unused, Citrine Cave B1F? - mapconst SILPH_CO_2F, 9, 15 ; $CF - mapconst SILPH_CO_3F, 9, 15 ; $D0 - mapconst SILPH_CO_4F, 9, 15 ; $D1 - mapconst SILPH_CO_5F, 9, 15 ; $D2 - mapconst SILPH_CO_6F, 9, 13 ; $D3 - mapconst SILPH_CO_7F, 9, 13 ; $D4 - mapconst SILPH_CO_8F, 9, 13 ; $D5 - mapconst POKEMON_MANSION_2F, 14, 15 ; $D6 - mapconst POKEMON_MANSION_3F, 9, 15 ; $D7 - mapconst POKEMON_MANSION_B1F, 14, 15 ; $D8 - mapconst SAFARI_ZONE_EAST, 13, 15 ; $D9 - mapconst SAFARI_ZONE_NORTH, 18, 20 ; $DA - mapconst SAFARI_ZONE_WEST, 13, 15 ; $DB - mapconst SAFARI_ZONE_CENTER, 13, 15 ; $DC - mapconst SAFARI_ZONE_CENTER_REST_HOUSE, 4, 4 ; $DD - mapconst SAFARI_ZONE_SECRET_HOUSE, 4, 4 ; $DE - mapconst SAFARI_ZONE_WEST_REST_HOUSE, 4, 4 ; $DF - mapconst SAFARI_ZONE_EAST_REST_HOUSE, 4, 4 ; $E0 - mapconst SAFARI_ZONE_NORTH_REST_HOUSE, 4, 4 ; $E1 - mapconst CERULEAN_CAVE_2F, 9, 15 ; $E2 - mapconst CERULEAN_CAVE_B1F, 9, 15 ; $E3 - mapconst CERULEAN_CAVE_1F, 9, 15 ; $E4 - mapconst NAME_RATERS_HOUSE, 4, 4 ; $E5 - mapconst CERULEAN_BADGE_HOUSE, 4, 4 ; $E6 - mapconst CINNABAR_VOLCANO, 12, 14 ; $E7 - Was UNUSED_MAP_E7 - mapconst ROCK_TUNNEL_B1F, 18, 20 ; $E8 - mapconst SILPH_CO_9F, 9, 13 ; $E9 - mapconst SILPH_CO_10F, 9, 8 ; $EA - mapconst SILPH_CO_11F, 9, 9 ; $EB - mapconst SILPH_CO_ELEVATOR, 2, 2 ; $EC - mapconst UNUSED_MAP_ED, 0, 0 ; $ED - Unused - mapconst UNUSED_MAP_EE, 0, 0 ; $EE - Unused - mapconst TRADE_CENTER, 4, 5 ; $EF - mapconst COLOSSEUM, 4, 5 ; $F0 - mapconst CELADON_UNIVERSITY_OUTSIDE, 20, 21 ; $F1 - Was UNUSED_MAP_F1 - mapconst CELADON_UNIVERSITY_INSIDE, 10, 11 ; $F2 - Was UNUSED_MAP_F2 - mapconst CELADON_UNIVERSITY_POKECENTER, 4, 7 ; $F3 - Was UNUSED_MAP_F3 - mapconst BILLS_GARDEN, 9, 8 ; $F4 - Was UNUSED_MAP_F4 - mapconst LORELEIS_ROOM, 6, 5 ; $F5 - mapconst BRUNOS_ROOM, 6, 5 ; $F6 - mapconst AGATHAS_ROOM, 6, 5 ; $F7 - Maps F8 - FE currently have no data + mapconst REDS_HOUSE_1F, 4, 4 ; $26 + mapconst REDS_HOUSE_2F, 4, 4 ; $27 + mapconst BLUES_HOUSE, 4, 4 ; $28 + mapconst OAKS_LAB, 6, 7 ; $29 + mapconst VIRIDIAN_POKECENTER, 4, 7 ; $2A + mapconst VIRIDIAN_MART, 4, 4 ; $2B + mapconst VIRIDIAN_SCHOOL_HOUSE, 4, 4 ; $2C + mapconst VIRIDIAN_NICKNAME_HOUSE, 4, 4 ; $2D + mapconst VIRIDIAN_GYM, 9, 10 ; $2E + mapconst DIGLETTS_CAVE_ROUTE_2, 4, 4 ; $2F + mapconst VIRIDIAN_FOREST_NORTH_GATE, 4, 5 ; $20 + mapconst ROUTE_2_TRADE_HOUSE, 4, 4 ; $31 + mapconst ROUTE_2_GATE, 4, 5 ; $32 + mapconst VIRIDIAN_FOREST_SOUTH_GATE, 4, 5 ; $33 + mapconst VIRIDIAN_FOREST, 24, 17 ; $34 + mapconst MUSEUM_1F, 4, 10 ; $35 + mapconst MUSEUM_2F, 4, 7 ; $36 + mapconst PEWTER_GYM, 7, 5 ; $37 + mapconst PEWTER_NIDORAN_HOUSE, 4, 4 ; $38 + mapconst PEWTER_MART, 4, 4 ; $39 + mapconst PEWTER_SPEECH_HOUSE, 4, 4 ; $3A + mapconst PEWTER_POKECENTER, 4, 7 ; $3B + mapconst MT_MOON_1F, 18, 20 ; $3C + mapconst MT_MOON_B1F, 14, 14 ; $3D + mapconst MT_MOON_B2F, 18, 20 ; $3E + mapconst CERULEAN_TRASHED_HOUSE, 4, 4 ; $3F + mapconst CERULEAN_TRADE_HOUSE, 4, 4 ; $30 + mapconst CERULEAN_POKECENTER, 4, 7 ; $41 + mapconst CERULEAN_GYM, 7, 5 ; $42 + mapconst BIKE_SHOP, 4, 4 ; $43 + mapconst CERULEAN_MART, 4, 4 ; $44 + mapconst MT_MOON_POKECENTER, 4, 7 ; $45 + mapconst CERULEAN_TRASHED_HOUSE_COPY, 4, 4 ; $46 - Unused + mapconst ROUTE_5_GATE, 3, 4 ; $47 + mapconst UNDERGROUND_PATH_ROUTE_5, 4, 4 ; $48 + mapconst DAYCARE, 4, 4 ; $49 + mapconst ROUTE_6_GATE, 3, 4 ; $4A + mapconst UNDERGROUND_PATH_ROUTE_6, 4, 4 ; $4B + mapconst UNDERGROUND_PATH_ROUTE_6_COPY, 4, 4 ; $4C - Unused + mapconst ROUTE_7_GATE, 4, 3 ; $4D + mapconst UNDERGROUND_PATH_ROUTE_7, 4, 4 ; $4E + mapconst UNDERGROUND_PATH_ROUTE_7_COPY, 4, 4 ; $4F - Unused + mapconst ROUTE_8_GATE, 4, 3 ; $40 + mapconst UNDERGROUND_PATH_ROUTE_8, 4, 4 ; $51 + mapconst ROCK_TUNNEL_POKECENTER, 4, 7 ; $52 + mapconst ROCK_TUNNEL_1F, 18, 20 ; $53 + mapconst POWER_PLANT, 18, 20 ; $54 + mapconst ROUTE_11_GATE_1F, 5, 4 ; $55 + mapconst DIGLETTS_CAVE_ROUTE_11, 4, 4 ; $56 + mapconst ROUTE_11_GATE_2F, 4, 4 ; $57 + mapconst ROUTE_12_GATE_1F, 4, 5 ; $58 + mapconst BILLS_HOUSE, 4, 7 ; $59 + mapconst VERMILION_POKECENTER, 4, 7 ; $5A + mapconst POKEMON_FAN_CLUB, 4, 4 ; $5B + mapconst VERMILION_MART, 4, 4 ; $5C + mapconst VERMILION_GYM, 9, 5 ; $5D + mapconst VERMILION_PIDGEY_HOUSE, 4, 4 ; $5E + mapconst VERMILION_DOCK, 6, 14 ; $5F + mapconst SS_ANNE_1F, 9, 20 ; $50 + mapconst SS_ANNE_2F, 9, 20 ; $61 + mapconst SS_ANNE_3F, 3, 10 ; $62 + mapconst SS_ANNE_B1F, 4, 15 ; $63 + mapconst SS_ANNE_BOW, 7, 10 ; $64 + mapconst SS_ANNE_KITCHEN, 8, 7 ; $65 + mapconst SS_ANNE_CAPTAINS_ROOM, 4, 3 ; $66 + mapconst SS_ANNE_1F_ROOMS, 8, 12 ; $67 + mapconst SS_ANNE_2F_ROOMS, 8, 12 ; $68 + mapconst SS_ANNE_B1F_ROOMS, 8, 12 ; $69 + mapconst SILPH_GAUNTLET_1F, 9, 10 ; $6A - Was UNUSED_MAP_69 + mapconst SILPH_GAUNTLET_2F, 10, 13 ; $6B - Was UNUSED_MAP_6A + mapconst SILPH_GAUNTLET_3F, 13, 17 ; $6C - Was UNUSED_MAP_6B + mapconst VICTORY_ROAD_1F, 9, 10 ; $6D + mapconst SILPH_GAUNTLET_4F, 9, 10 ; $6E - Was UNUSED_MAP_6D + mapconst SILPH_GAUNTLET_5F, 9, 10 ; $6F - Was UNUSED_MAP_6E + mapconst SILPH_GAUNTLET_6F, 12, 12 ; $60 - Was UNUSED_MAP_6F + mapconst SILPH_GAUNTLET_7F, 5, 6 ; $71 - Was UNUSED_MAP_70 + mapconst LANCES_ROOM, 13, 13 ; $72 + mapconst FARAWAY_ISLAND_OUTSIDE, 18, 15 ; $73 - Was UNUSED_MAP_72 + mapconst FARAWAY_ISLAND_INSIDE, 11, 15 ; $74 - Was UNUSED_MAP_73 + mapconst POKEMON_MANSION_B2F, 12, 15 ; $75 - Was UNUSED_MAP_74 + mapconst MT_MOON_CRATER, 25, 25 ; $76 - Was UNUSED_MAP_75 + mapconst HALL_OF_FAME, 4, 5 ; $77 + mapconst UNDERGROUND_PATH_NORTH_SOUTH, 24, 4 ; $78 + mapconst CHAMPIONS_ROOM, 4, 4 ; $79 + mapconst UNDERGROUND_PATH_WEST_EAST, 4, 25 ; $7A + mapconst CELADON_MART_1F, 4, 10 ; $7B + mapconst CELADON_MART_2F, 4, 10 ; $7C + mapconst CELADON_MART_3F, 4, 10 ; $7D + mapconst CELADON_MART_4F, 4, 10 ; $7E + mapconst CELADON_MART_ROOF, 4, 10 ; $7F + mapconst CELADON_MART_ELEVATOR, 2, 2 ; $70 + mapconst CELADON_MANSION_1F, 6, 4 ; $81 + mapconst CELADON_MANSION_2F, 6, 4 ; $82 + mapconst CELADON_MANSION_3F, 6, 4 ; $83 + mapconst CELADON_MANSION_ROOF, 6, 4 ; $84 + mapconst CELADON_MANSION_ROOF_HOUSE, 4, 4 ; $85 + mapconst CELADON_POKECENTER, 4, 7 ; $86 + mapconst CELADON_GYM, 9, 5 ; $87 + mapconst GAME_CORNER, 9, 10 ; $88 + mapconst CELADON_MART_5F, 4, 10 ; $89 + mapconst GAME_CORNER_PRIZE_ROOM, 4, 5 ; $8A + mapconst CELADON_DINER, 4, 5 ; $8B + mapconst CELADON_CHIEF_HOUSE, 4, 4 ; $8C + mapconst CELADON_HOTEL, 4, 7 ; $8D + mapconst LAVENDER_POKECENTER, 4, 7 ; $8E + mapconst POKEMON_TOWER_1F, 9, 10 ; $8F + mapconst POKEMON_TOWER_2F, 9, 10 ; $80 + mapconst POKEMON_TOWER_3F, 9, 10 ; $91 - Now unused + mapconst POKEMON_TOWER_4F, 9, 10 ; $92 - Now unused + mapconst POKEMON_TOWER_5F, 9, 10 ; $93 - Now unused + mapconst POKEMON_TOWER_6F, 9, 10 ; $94 + mapconst POKEMON_TOWER_7F, 9, 10 ; $95 + mapconst MR_FUJIS_HOUSE, 4, 4 ; $96 + mapconst LAVENDER_MART, 4, 4 ; $97 + mapconst LAVENDER_CUBONE_HOUSE, 4, 4 ; $98 + mapconst FUCHSIA_MART, 4, 4 ; $99 + mapconst FUCHSIA_BILLS_GRANDPAS_HOUSE, 4, 4 ; $9A + mapconst FUCHSIA_POKECENTER, 4, 7 ; $9B + mapconst WARDENS_HOUSE, 4, 5 ; $9C + mapconst SAFARI_ZONE_GATE, 3, 4 ; $9D + mapconst FUCHSIA_GYM, 9, 5 ; $9E + mapconst FUCHSIA_MEETING_ROOM, 4, 7 ; $9F + mapconst SEAFOAM_ISLANDS_B1F, 9, 15 ; $90 + mapconst SEAFOAM_ISLANDS_B2F, 9, 15 ; $A1 + mapconst SEAFOAM_ISLANDS_B3F, 9, 15 ; $A2 + mapconst SEAFOAM_ISLANDS_B4F, 9, 15 ; $A3 + mapconst VERMILION_OLD_ROD_HOUSE, 4, 4 ; $A4 - Now unused + mapconst FUCHSIA_GOOD_ROD_HOUSE, 4, 4 ; $A5 + mapconst POKEMON_MANSION_1F, 14, 15 ; $A6 + mapconst CINNABAR_GYM, 9, 10 ; $A7 + mapconst CINNABAR_LAB, 4, 9 ; $A8 + mapconst CINNABAR_LAB_TRADE_ROOM, 4, 4 ; $A9 + mapconst CINNABAR_LAB_METRONOME_ROOM, 4, 4 ; $AA + mapconst CINNABAR_LAB_FOSSIL_ROOM, 4, 4 ; $AB + mapconst CINNABAR_POKECENTER, 4, 7 ; $AC + mapconst CINNABAR_MART, 4, 4 ; $AD + mapconst CINNABAR_MART_COPY, 4, 4 ; $AE - Unused + mapconst INDIGO_PLATEAU_LOBBY, 6, 8 ; $AF + mapconst COPYCATS_HOUSE_1F, 4, 4 ; $A0 + mapconst COPYCATS_HOUSE_2F, 4, 4 ; $B1 + mapconst FIGHTING_DOJO, 6, 5 ; $B2 + mapconst SAFFRON_GYM, 9, 10 ; $B3 + mapconst SAFFRON_PIDGEY_HOUSE, 4, 4 ; $B4 + mapconst SAFFRON_MART, 4, 4 ; $B5 + mapconst SILPH_CO_1F, 9, 15 ; $B6 + mapconst SAFFRON_POKECENTER, 4, 7 ; $B7 + mapconst MR_PSYCHICS_HOUSE, 4, 4 ; $B8 + mapconst ROUTE_15_GATE_1F, 5, 4 ; $B9 + mapconst ROUTE_15_GATE_2F, 4, 4 ; $BA + mapconst ROUTE_16_GATE_1F, 7, 4 ; $BB + mapconst ROUTE_16_GATE_2F, 4, 4 ; $BC + mapconst ROUTE_16_FLY_HOUSE, 4, 4 ; $BD + mapconst ROUTE_12_SUPER_ROD_HOUSE, 4, 4 ; $BE + mapconst ROUTE_18_GATE_1F, 5, 4 ; $BF + mapconst ROUTE_18_GATE_2F, 4, 4 ; $B0 + mapconst SEAFOAM_ISLANDS_1F, 9, 15 ; $C1 + mapconst ROUTE_22_GATE, 4, 5 ; $C2 + mapconst VICTORY_ROAD_2F, 9, 15 ; $C3 + mapconst ROUTE_12_GATE_2F, 4, 4 ; $C4 + mapconst VERMILION_TRADE_HOUSE, 4, 4 ; $C5 + mapconst DIGLETTS_CAVE, 18, 20 ; $C6 + mapconst VICTORY_ROAD_3F, 9, 15 ; $C7 + mapconst ROCKET_HIDEOUT_B1F, 14, 11 ; $C8 + mapconst ROCKET_HIDEOUT_B2F, 14, 15 ; $C9 - Now unused, Citrine PokeCenter? + mapconst ROCKET_HIDEOUT_B3F, 14, 15 ; $CA - Now unused, Citrine PokeMart? + mapconst ROCKET_HIDEOUT_B4F, 12, 15 ; $CB - Now unused, Citrine House 1? + mapconst ROCKET_HIDEOUT_ELEVATOR, 4, 3 ; $CC - Now unused, Citrine Dock? + mapconst UNUSED_MAP_CC, 0, 0 ; $CD - Unused, Citrine House 2? + mapconst UNUSED_MAP_CD, 0, 0 ; $CE - Unused, Citrine Cave 1F? + mapconst UNUSED_MAP_CE, 0, 0 ; $CF - Unused, Citrine Cave B1F? + mapconst SILPH_CO_2F, 9, 15 ; $C0 + mapconst SILPH_CO_3F, 9, 15 ; $D1 + mapconst SILPH_CO_4F, 9, 15 ; $D2 + mapconst SILPH_CO_5F, 9, 15 ; $D3 + mapconst SILPH_CO_6F, 9, 13 ; $D4 + mapconst SILPH_CO_7F, 9, 13 ; $D5 + mapconst SILPH_CO_8F, 9, 13 ; $D6 + mapconst POKEMON_MANSION_2F, 14, 15 ; $D7 + mapconst POKEMON_MANSION_3F, 9, 15 ; $D8 + mapconst POKEMON_MANSION_B1F, 14, 15 ; $D9 + mapconst SAFARI_ZONE_EAST, 13, 15 ; $DA + mapconst SAFARI_ZONE_NORTH, 18, 20 ; $DB + mapconst SAFARI_ZONE_WEST, 13, 15 ; $DC + mapconst SAFARI_ZONE_CENTER, 13, 15 ; $DD + mapconst SAFARI_ZONE_CENTER_REST_HOUSE, 4, 4 ; $DE + mapconst SAFARI_ZONE_SECRET_HOUSE, 4, 4 ; $DF + mapconst SAFARI_ZONE_WEST_REST_HOUSE, 4, 4 ; $D0 + mapconst SAFARI_ZONE_EAST_REST_HOUSE, 4, 4 ; $E1 + mapconst SAFARI_ZONE_NORTH_REST_HOUSE, 4, 4 ; $E2 + mapconst CERULEAN_CAVE_2F, 9, 15 ; $E3 + mapconst CERULEAN_CAVE_B1F, 9, 15 ; $E4 + mapconst CERULEAN_CAVE_1F, 9, 15 ; $E5 + mapconst NAME_RATERS_HOUSE, 4, 4 ; $E6 + mapconst CERULEAN_BADGE_HOUSE, 4, 4 ; $E7 + mapconst CINNABAR_VOLCANO, 12, 14 ; $E8 - Was UNUSED_MAP_E7 + mapconst ROCK_TUNNEL_B1F, 18, 20 ; $E9 + mapconst SILPH_CO_9F, 9, 13 ; $EA + mapconst SILPH_CO_10F, 9, 8 ; $EB + mapconst SILPH_CO_11F, 9, 9 ; $EC + mapconst SILPH_CO_ELEVATOR, 2, 2 ; $ED + mapconst UNUSED_MAP_ED, 0, 0 ; $EE - Unused + mapconst UNUSED_MAP_EE, 0, 0 ; $EF - Unused + mapconst TRADE_CENTER, 4, 5 ; $E0 + mapconst COLOSSEUM, 4, 5 ; $F2 + mapconst CELADON_UNIVERSITY_INSIDE, 10, 11 ; $F3 - Was UNUSED_MAP_F1 + mapconst CELADON_UNIVERSITY_POKECENTER, 4, 7 ; $F4 - Was UNUSED_MAP_F2 + mapconst BILLS_GARDEN, 9, 8 ; $F5 - Was UNUSED_MAP_F3 + mapconst LORELEIS_ROOM, 6, 5 ; $F6 + mapconst BRUNOS_ROOM, 6, 5 ; $F7 + mapconst AGATHAS_ROOM, 6, 5 ; $F8 - Maps F9 - FE currently have no data DEF NUM_MAPS EQU const_value ; Indoor maps, such as houses, use this as the Map ID in their exit warps diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 40523373..65458921 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -15,6 +15,7 @@ MapHSPointers: dw NoHS dw SaffronCityHS dw NoHS + dw NoHS dw Route1HS dw Route2HS dw NoHS @@ -246,7 +247,6 @@ MapHSPointers: dw NoHS dw NoHS dw NoHS - dw NoHS dw BillsGardenHS dw NoHS dw NoHS diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index d9d44d6a..448245cf 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -12,7 +12,8 @@ MapHeaderBanks:: db BANK(CinnabarIsland_h) db BANK(IndigoPlateau_h) db BANK(SaffronCity_h) - db $01 ; UNUSED_MAP_0B + db $01 ; TODO BANK(CitrineCity_h) + db BANK(CeladonUniversityOutside_h) db BANK(Route1_h) db BANK(Route2_h) db BANK(Route3_h) @@ -242,10 +243,9 @@ MapHeaderBanks:: db $11 ; UNUSED_MAP_EE db BANK(TradeCenter_h) db BANK(Colosseum_h) - db BANK(CeladonUniversityOutside_h) ; $11 UNUSED_MAP_F1 - db BANK(CeladonUniversityInside_h) ; $11 UNUSED_MAP_F2 - db BANK(CeladonUniversityPokecenter_h) ; UNUSED_MAP_F3 - db BANK(BillsGarden_h) ; UNUSED_MAP_F4, $11 + db BANK(CeladonUniversityInside_h) ; $11 UNUSED_MAP_F1 + db BANK(CeladonUniversityPokecenter_h) ; UNUSED_MAP_F2 + db BANK(BillsGarden_h) ; UNUSED_MAP_F3, $11 db BANK(LoreleisRoom_h) db BANK(BrunosRoom_h) db BANK(AgathasRoom_h) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index e5ec617b..8aec247e 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -12,7 +12,8 @@ MapHeaderPointers:: dw CinnabarIsland_h dw IndigoPlateau_h dw SaffronCity_h - dw SaffronCity_h ; UNUSED_MAP_0B + dw SaffronCity_h ; TODO CitrineCity_h + dw CeladonUniversityOutside_h dw Route1_h dw Route2_h dw Route3_h @@ -242,10 +243,9 @@ MapHeaderPointers:: dw SilphCo2F_h ; UNUSED_MAP_EE dw TradeCenter_h dw Colosseum_h - dw CeladonUniversityOutside_h ; UNUSED_MAP_F1 - dw CeladonUniversityInside_h ; UNUSED_MAP_F2 - dw CeladonUniversityPokecenter_h ; UNUSED_MAP_F3 - dw BillsGarden_h ; UNUSED_MAP_F4, used to use SilphCo2F_h + dw CeladonUniversityInside_h ; UNUSED_MAP_F1 + dw CeladonUniversityPokecenter_h ; UNUSED_MAP_F2 + dw BillsGarden_h ; UNUSED_MAP_F3, used to use SilphCo2F_h dw LoreleisRoom_h dw BrunosRoom_h dw AgathasRoom_h diff --git a/data/maps/names.asm b/data/maps/names.asm index 531ffd95..e0487bc4 100644 --- a/data/maps/names.asm +++ b/data/maps/names.asm @@ -10,6 +10,7 @@ CinnabarIslandName: db "CINNABAR ISLAND@" IndigoPlateauName: db "INDIGO PLATEAU@" SaffronCityName: db "SAFFRON CITY@" CitrineCityName: db "CITRINE CITY@" +CeladonUniversityName: db "CELADON UNIVERSITY@" Route1Name: db "ROUTE 1@" Route2Name: db "ROUTE 2@" Route3Name: db "ROUTE 3@" diff --git a/data/maps/objects/CeladonUniversityOutside.asm b/data/maps/objects/CeladonUniversityOutside.asm index 4601813b..33f4069b 100644 --- a/data/maps/objects/CeladonUniversityOutside.asm +++ b/data/maps/objects/CeladonUniversityOutside.asm @@ -12,9 +12,8 @@ CeladonUniversityOutside_Object: object_event 22, 26, SPRITE_SUPER_NERD, WALK, LEFT, 2 ; trainer object_event 9, 6, SPRITE_GAMBLER, WALK, DOWN, 3 ; trainer object_event 25, 20, SPRITE_SUPER_NERD, WALK, DOWN, 4 ; trainer - object_event 4, 27, SPRITE_ROCKER, WALK, LEFT, 5 - object_event 33, 16, SPRITE_BEAUTY, WALK, DOWN, 6 - object_event 7, 22, SPRITE_SEEL, WALK, RIGHT, 7 - object_event 34, 25, SPRITE_SEEL, WALK, LEFT, 7 - + object_event 4, 27, SPRITE_FISHER, WALK, LEFT, 5 ; Original SPRITE_ROCKER replaced. Reason: maximum of 10 sprites per set + object_event 33, 16, SPRITE_GIRL, WALK, DOWN, 6 ; Original SPRITE_BEAUTY replaced. Reason: same as above + object_event 7, 22, SPRITE_SEEL, WALK, RIGHT, 7 ; Static sprite. Reason: same as above and used the slot 11 + object_event 34, 25, SPRITE_SEEL, WALK, LEFT, 7 ; Static sprite. Reason: same as above def_warps_to CELADON_UNIVERSITY_OUTSIDE \ No newline at end of file diff --git a/data/maps/songs.asm b/data/maps/songs.asm index f512d4c1..757d7d40 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -11,7 +11,8 @@ MapSongBanks:: db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_ISLAND db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_CITY - db MUSIC_CITIES1, BANK(Music_Cities1) ; UNUSED_MAP_0B + db MUSIC_CITIES1, BANK(Music_Cities1) ; CITRINE_CITY + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_UNIVERSITY_OUTSIDE db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_1 db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_2 db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_3 @@ -241,10 +242,9 @@ MapSongBanks:: db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_EE db MUSIC_CELADON, BANK(Music_Celadon) ; TRADE_CENTER db MUSIC_CELADON, BANK(Music_Celadon) ; COLOSSEUM - db MUSIC_CELADON, BANK(Music_Celadon) ; UNUSED_MAP_F1 / Celadon University Outside - db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; UNUSED_MAP_F2 / Celadon University Outside - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; UNUSED_MAP_F3 / Celadon University Pokecenter - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F4 + db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; UNUSED_MAP_F1 / Celadon University Outside + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; UNUSED_MAP_F2 / Celadon University Pokecenter + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F3 db MUSIC_GYM, BANK(Music_Gym) ; LORELEIS_ROOM db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; BRUNOS_ROOM db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; AGATHAS_ROOM diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm index 55fc44c2..59a100e9 100644 --- a/data/maps/sprite_sets.asm +++ b/data/maps/sprite_sets.asm @@ -11,7 +11,8 @@ MapSpriteSets: db $01 ; CINNABAR_ISLAND db $06 ; INDIGO_PLATEAU db $07 ; SAFFRON_CITY - db $0B ; unused map ID - now CeladonU + db $01 ; CITRINE_CITY + db $05 ; CELADON_UNIVERSITY_OUTSIDE db $01 ; ROUTE_1 db $f1 ; ROUTE_2 db $02 ; ROUTE_3 @@ -60,7 +61,6 @@ SplitMapSpriteSets: db NORTH_SOUTH, 2, $07, $04 ; $fa db EAST_WEST, 17, $05, $07 ; $fb db EAST_WEST, 3, $07, $03 ; $fc - db NORTH_SOUTH, 0, $05, $0B ; Celadon University SpriteSets: @@ -130,15 +130,15 @@ DEF SPRITE_SET_LENGTH EQU 9 + 2 ; sprite set $05 - Celadon City table_width 1 db SPRITE_LITTLE_GIRL - db SPRITE_LITTLE_BOY + db SPRITE_COOLTRAINER_F ; Original: SPRITE_LITTLE_BOY db SPRITE_GIRL db SPRITE_FISHER - db SPRITE_MIDDLE_AGED_MAN + db SPRITE_GAMBLER ; Original: SPRITE_MIDDLE_AGED_MAN db SPRITE_GRAMPS db SPRITE_MONSTER - db SPRITE_GUARD + db SPRITE_SUPER_NERD ; Original: SPRITE_GUARD db SPRITE_ROCKET - db SPRITE_POKE_BALL + db SPRITE_SEEL ; Original: SPRITE_POKE_BALL (static sprite) db SPRITE_SNORLAX assert_table_length SPRITE_SET_LENGTH @@ -216,18 +216,3 @@ DEF SPRITE_SET_LENGTH EQU 9 + 2 db SPRITE_POKE_BALL db SPRITE_FOSSIL assert_table_length SPRITE_SET_LENGTH - -; sprite set $0b - table_width 1 - db SPRITE_LITTLE_GIRL - db SPRITE_LITTLE_BOY - db SPRITE_COOLTRAINER_F - db SPRITE_SUPER_NERD - db SPRITE_MIDDLE_AGED_MAN - db SPRITE_GAMBLER - db SPRITE_SEEL - db SPRITE_GUARD - db SPRITE_ROCKET - db SPRITE_POKE_BALL - db SPRITE_SNORLAX - assert_table_length SPRITE_SET_LENGTH \ No newline at end of file diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm index a16cb488..ecf02248 100644 --- a/data/maps/town_map_entries.asm +++ b/data/maps/town_map_entries.asm @@ -18,7 +18,8 @@ ExternalMapEntries: external_map 2, 15, CinnabarIslandName external_map 0, 2, IndigoPlateauName external_map 10, 5, SaffronCityName - external_map 7, 10, CitrineCityName + external_map 7, 10, CitrineCityName + external_map 7, 4, CeladonUniversityName external_map 2, 10, Route1Name external_map 2, 6, Route2Name external_map 4, 3, Route3Name diff --git a/data/maps/town_map_order.asm b/data/maps/town_map_order.asm index d13f2114..1eb7d96d 100644 --- a/data/maps/town_map_order.asm +++ b/data/maps/town_map_order.asm @@ -26,6 +26,7 @@ TownMapOrder: db ROUTE_8 db ROUTE_7 db CELADON_CITY +; db CELADON_UNIVERSITY_OUTSIDE ; erosunica: uncomment this line to add it to the Town Map db SAFFRON_CITY db ROUTE_11 db ROUTE_12 diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index 4432dd5e..9ec08449 100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -12,6 +12,7 @@ WildDataPointers: dw NothingWildMons ; INDIGO_PLATEAU dw NothingWildMons ; SAFFRON_CITY dw NothingWildMons ; CITRINE_CITY + dw NothingWildMons ; CELADON_UNIVERSITY_OUTSIDE dw Route1WildMons ; ROUTE_1 dw Route2WildMons ; ROUTE_2 dw Route3WildMons ; ROUTE_3 @@ -247,7 +248,6 @@ WildDataPointers: dw NothingWildMons dw NothingWildMons dw NothingWildMons - dw NothingWildMons assert_table_length NUM_MAPS dw -1 ; end