Remove original maps and object events (#1)

This commit is contained in:
xCrystal
2023-07-25 15:33:08 +02:00
parent 60cacea4b0
commit 5147904f78
790 changed files with 175 additions and 88149 deletions

View File

@@ -63,32 +63,7 @@
const ENGINE_UNLOCKED_UNOWNS_UNUSED_6
const ENGINE_UNLOCKED_UNOWNS_UNUSED_7
; wVisitedSpawns
const ENGINE_FLYPOINT_PLAYERS_HOUSE
const ENGINE_FLYPOINT_DEBUG
const ENGINE_FLYPOINT_PALLET
const ENGINE_FLYPOINT_VIRIDIAN
const ENGINE_FLYPOINT_PEWTER
const ENGINE_FLYPOINT_CERULEAN
const ENGINE_FLYPOINT_ROCK_TUNNEL
const ENGINE_FLYPOINT_VERMILION
const ENGINE_FLYPOINT_LAVENDER
const ENGINE_FLYPOINT_SAFFRON
const ENGINE_FLYPOINT_CELADON
const ENGINE_FLYPOINT_FUCHSIA
const ENGINE_FLYPOINT_CINNABAR
const ENGINE_FLYPOINT_INDIGO_PLATEAU
const ENGINE_FLYPOINT_NEW_BARK
const ENGINE_FLYPOINT_CHERRYGROVE
const ENGINE_FLYPOINT_VIOLET
const ENGINE_FLYPOINT_AZALEA
const ENGINE_FLYPOINT_CIANWOOD
const ENGINE_FLYPOINT_GOLDENROD
const ENGINE_FLYPOINT_OLIVINE
const ENGINE_FLYPOINT_ECRUTEAK
const ENGINE_FLYPOINT_MAHOGANY
const ENGINE_FLYPOINT_LAKE_OF_RAGE
const ENGINE_FLYPOINT_BLACKTHORN
const ENGINE_FLYPOINT_SILVER_CAVE
const ENGINE_FLYPOINT_LEVEL_1
const ENGINE_FLYPOINT_UNUSED
; wLuckyNumberShowFlag
const ENGINE_LUCKY_NUMBER_SHOW

View File

@@ -1,103 +1,7 @@
; Landmarks indexes (see data/maps/landmarks.asm)
const_def
const LANDMARK_SPECIAL ; 00
; Johto landmarks
const LANDMARK_NEW_BARK_TOWN ; 01
const LANDMARK_ROUTE_29 ; 02
const LANDMARK_CHERRYGROVE_CITY ; 03
const LANDMARK_ROUTE_30 ; 04
const LANDMARK_ROUTE_31 ; 05
const LANDMARK_VIOLET_CITY ; 06
const LANDMARK_SPROUT_TOWER ; 07
const LANDMARK_ROUTE_32 ; 08
const LANDMARK_RUINS_OF_ALPH ; 09
const LANDMARK_UNION_CAVE ; 0a
const LANDMARK_ROUTE_33 ; 0b
const LANDMARK_AZALEA_TOWN ; 0c
const LANDMARK_SLOWPOKE_WELL ; 0d
const LANDMARK_ILEX_FOREST ; 0e
const LANDMARK_ROUTE_34 ; 0f
const LANDMARK_GOLDENROD_CITY ; 10
const LANDMARK_RADIO_TOWER ; 11
const LANDMARK_ROUTE_35 ; 12
const LANDMARK_NATIONAL_PARK ; 13
const LANDMARK_ROUTE_36 ; 14
const LANDMARK_ROUTE_37 ; 15
const LANDMARK_ECRUTEAK_CITY ; 16
const LANDMARK_TIN_TOWER ; 17
const LANDMARK_BURNED_TOWER ; 18
const LANDMARK_ROUTE_38 ; 19
const LANDMARK_ROUTE_39 ; 1a
const LANDMARK_OLIVINE_CITY ; 1b
const LANDMARK_LIGHTHOUSE ; 1c
const LANDMARK_BATTLE_TOWER ; 1d
const LANDMARK_ROUTE_40 ; 1e
const LANDMARK_WHIRL_ISLANDS ; 1f
const LANDMARK_ROUTE_41 ; 20
const LANDMARK_CIANWOOD_CITY ; 21
const LANDMARK_ROUTE_42 ; 22
const LANDMARK_MT_MORTAR ; 23
const LANDMARK_MAHOGANY_TOWN ; 24
const LANDMARK_ROUTE_43 ; 25
const LANDMARK_LAKE_OF_RAGE ; 26
const LANDMARK_ROUTE_44 ; 27
const LANDMARK_ICE_PATH ; 28
const LANDMARK_BLACKTHORN_CITY ; 29
const LANDMARK_DRAGONS_DEN ; 2a
const LANDMARK_ROUTE_45 ; 2b
const LANDMARK_DARK_CAVE ; 2c
const LANDMARK_ROUTE_46 ; 2d
const LANDMARK_SILVER_CAVE ; 2e
DEF KANTO_LANDMARK EQU const_value
const LANDMARK_PALLET_TOWN ; 2f
const LANDMARK_ROUTE_1 ; 30
const LANDMARK_VIRIDIAN_CITY ; 31
const LANDMARK_ROUTE_2 ; 32
const LANDMARK_PEWTER_CITY ; 33
const LANDMARK_ROUTE_3 ; 34
const LANDMARK_MT_MOON ; 35
const LANDMARK_ROUTE_4 ; 36
const LANDMARK_CERULEAN_CITY ; 37
const LANDMARK_ROUTE_24 ; 38
const LANDMARK_ROUTE_25 ; 39
const LANDMARK_ROUTE_5 ; 3a
const LANDMARK_UNDERGROUND_PATH ; 3b
const LANDMARK_ROUTE_6 ; 3c
const LANDMARK_VERMILION_CITY ; 3d
const LANDMARK_DIGLETTS_CAVE ; 3e
const LANDMARK_ROUTE_7 ; 3f
const LANDMARK_ROUTE_8 ; 40
const LANDMARK_ROUTE_9 ; 41
const LANDMARK_ROCK_TUNNEL ; 42
const LANDMARK_ROUTE_10 ; 43
const LANDMARK_POWER_PLANT ; 44
const LANDMARK_LAVENDER_TOWN ; 45
const LANDMARK_LAV_RADIO_TOWER ; 46
const LANDMARK_CELADON_CITY ; 47
const LANDMARK_SAFFRON_CITY ; 48
const LANDMARK_ROUTE_11 ; 49
const LANDMARK_ROUTE_12 ; 4a
const LANDMARK_ROUTE_13 ; 4b
const LANDMARK_ROUTE_14 ; 4c
const LANDMARK_ROUTE_15 ; 4d
const LANDMARK_ROUTE_16 ; 4e
const LANDMARK_ROUTE_17 ; 4f
const LANDMARK_ROUTE_18 ; 50
const LANDMARK_FUCHSIA_CITY ; 51
const LANDMARK_ROUTE_19 ; 52
const LANDMARK_ROUTE_20 ; 53
const LANDMARK_SEAFOAM_ISLANDS ; 54
const LANDMARK_CINNABAR_ISLAND ; 55
const LANDMARK_ROUTE_21 ; 56
const LANDMARK_ROUTE_22 ; 57
const LANDMARK_VICTORY_ROAD ; 58
const LANDMARK_ROUTE_23 ; 59
const LANDMARK_INDIGO_PLATEAU ; 5a
const LANDMARK_ROUTE_26 ; 5b
const LANDMARK_ROUTE_27 ; 5c
const LANDMARK_TOHJO_FALLS ; 5d
const LANDMARK_ROUTE_28 ; 5e
const LANDMARK_FAST_SHIP ; 5f
const LANDMARK_LEVEL_1 ; 01
DEF NUM_LANDMARKS EQU const_value
; used in CaughtData

View File

@@ -35,470 +35,13 @@ ENDM
; - scripts and events (see data/maps/scripts.asm)
const_def
newgroup OLIVINE ; 1
map_const OLIVINE_POKECENTER_1F, 5, 4 ; 1
map_const OLIVINE_GYM, 5, 8 ; 2
map_const OLIVINE_TIMS_HOUSE, 4, 4 ; 3
map_const OLIVINE_HOUSE_BETA, 4, 4 ; 4
map_const OLIVINE_PUNISHMENT_SPEECH_HOUSE, 4, 4 ; 5
map_const OLIVINE_GOOD_ROD_HOUSE, 4, 4 ; 6
map_const OLIVINE_CAFE, 4, 4 ; 7
map_const OLIVINE_MART, 6, 4 ; 8
map_const ROUTE_38_ECRUTEAK_GATE, 5, 4 ; 9
map_const ROUTE_39_BARN, 4, 4 ; 10
map_const ROUTE_39_FARMHOUSE, 4, 4 ; 11
map_const ROUTE_38, 20, 9 ; 12
map_const ROUTE_39, 10, 18 ; 13
map_const OLIVINE_CITY, 20, 18 ; 14
newgroup LEVEL_1 ; 1
map_const LEVEL_1_MAP_1, 5, 4 ; 1
; map_const LEVEL_1_MAP_2, 5, 8 ; 2
endgroup
newgroup MAHOGANY ; 2
map_const MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 4, 4 ; 1
map_const MAHOGANY_GYM, 5, 9 ; 2
map_const MAHOGANY_POKECENTER_1F, 5, 4 ; 3
map_const ROUTE_42_ECRUTEAK_GATE, 5, 4 ; 4
map_const ROUTE_42, 30, 9 ; 5
map_const ROUTE_44, 30, 9 ; 6
map_const MAHOGANY_TOWN, 10, 9 ; 7
endgroup
; newgroup LEVEL_2 ; 2
; map_const LEVEL_2_MAP_1, 4, 4 ; 1
; endgroup
newgroup DUNGEONS ; 3
map_const SPROUT_TOWER_1F, 10, 8 ; 1
map_const SPROUT_TOWER_2F, 10, 8 ; 2
map_const SPROUT_TOWER_3F, 10, 8 ; 3
map_const TIN_TOWER_1F, 10, 9 ; 4
map_const TIN_TOWER_2F, 10, 9 ; 5
map_const TIN_TOWER_3F, 10, 9 ; 6
map_const TIN_TOWER_4F, 10, 9 ; 7
map_const TIN_TOWER_5F, 10, 9 ; 8
map_const TIN_TOWER_6F, 10, 9 ; 9
map_const TIN_TOWER_7F, 10, 9 ; 10
map_const TIN_TOWER_8F, 10, 9 ; 11
map_const TIN_TOWER_9F, 10, 9 ; 12
map_const BURNED_TOWER_1F, 10, 9 ; 13
map_const BURNED_TOWER_B1F, 10, 9 ; 14
map_const NATIONAL_PARK, 20, 27 ; 15
map_const NATIONAL_PARK_BUG_CONTEST, 20, 27 ; 16
map_const RADIO_TOWER_1F, 9, 4 ; 17
map_const RADIO_TOWER_2F, 9, 4 ; 18
map_const RADIO_TOWER_3F, 9, 4 ; 19
map_const RADIO_TOWER_4F, 9, 4 ; 20
map_const RADIO_TOWER_5F, 9, 4 ; 21
map_const RUINS_OF_ALPH_OUTSIDE, 10, 18 ; 22
map_const RUINS_OF_ALPH_HO_OH_CHAMBER, 4, 5 ; 23
map_const RUINS_OF_ALPH_KABUTO_CHAMBER, 4, 5 ; 24
map_const RUINS_OF_ALPH_OMANYTE_CHAMBER, 4, 5 ; 25
map_const RUINS_OF_ALPH_AERODACTYL_CHAMBER, 4, 5 ; 26
map_const RUINS_OF_ALPH_INNER_CHAMBER, 10, 14 ; 27
map_const RUINS_OF_ALPH_RESEARCH_CENTER, 4, 4 ; 28
map_const RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 4, 5 ; 29
map_const RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 4, 5 ; 30
map_const RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 4, 5 ; 31
map_const RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 4, 5 ; 32
map_const RUINS_OF_ALPH_HO_OH_WORD_ROOM, 10, 12 ; 33
map_const RUINS_OF_ALPH_KABUTO_WORD_ROOM, 10, 7 ; 34
map_const RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 10, 8 ; 35
map_const RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 10, 7 ; 36
map_const UNION_CAVE_1F, 10, 18 ; 37
map_const UNION_CAVE_B1F, 10, 18 ; 38
map_const UNION_CAVE_B2F, 10, 18 ; 39
map_const SLOWPOKE_WELL_B1F, 10, 9 ; 40
map_const SLOWPOKE_WELL_B2F, 10, 9 ; 41
map_const OLIVINE_LIGHTHOUSE_1F, 10, 9 ; 42
map_const OLIVINE_LIGHTHOUSE_2F, 10, 9 ; 43
map_const OLIVINE_LIGHTHOUSE_3F, 10, 9 ; 44
map_const OLIVINE_LIGHTHOUSE_4F, 10, 9 ; 45
map_const OLIVINE_LIGHTHOUSE_5F, 10, 9 ; 46
map_const OLIVINE_LIGHTHOUSE_6F, 10, 9 ; 47
map_const MAHOGANY_MART_1F, 4, 4 ; 48
map_const TEAM_ROCKET_BASE_B1F, 15, 9 ; 49
map_const TEAM_ROCKET_BASE_B2F, 15, 9 ; 50
map_const TEAM_ROCKET_BASE_B3F, 15, 9 ; 51
map_const ILEX_FOREST, 15, 27 ; 52
map_const GOLDENROD_UNDERGROUND, 15, 18 ; 53
map_const GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 15, 18 ; 54
map_const GOLDENROD_DEPT_STORE_B1F, 10, 9 ; 55
map_const GOLDENROD_UNDERGROUND_WAREHOUSE, 10, 9 ; 56
map_const MOUNT_MORTAR_1F_OUTSIDE, 20, 18 ; 57
map_const MOUNT_MORTAR_1F_INSIDE, 20, 27 ; 58
map_const MOUNT_MORTAR_2F_INSIDE, 20, 18 ; 59
map_const MOUNT_MORTAR_B1F, 20, 18 ; 60
map_const ICE_PATH_1F, 20, 18 ; 61
map_const ICE_PATH_B1F, 10, 18 ; 62
map_const ICE_PATH_B2F_MAHOGANY_SIDE, 10, 9 ; 63
map_const ICE_PATH_B2F_BLACKTHORN_SIDE, 5, 9 ; 64
map_const ICE_PATH_B3F, 10, 9 ; 65
map_const WHIRL_ISLAND_NW, 5, 9 ; 66
map_const WHIRL_ISLAND_NE, 10, 9 ; 67
map_const WHIRL_ISLAND_SW, 10, 9 ; 68
map_const WHIRL_ISLAND_CAVE, 5, 9 ; 69
map_const WHIRL_ISLAND_SE, 5, 9 ; 70
map_const WHIRL_ISLAND_B1F, 20, 18 ; 71
map_const WHIRL_ISLAND_B2F, 10, 18 ; 72
map_const WHIRL_ISLAND_LUGIA_CHAMBER, 10, 9 ; 73
map_const SILVER_CAVE_ROOM_1, 10, 18 ; 74
map_const SILVER_CAVE_ROOM_2, 15, 18 ; 75
map_const SILVER_CAVE_ROOM_3, 10, 18 ; 76
map_const SILVER_CAVE_ITEM_ROOMS, 10, 9 ; 77
map_const DARK_CAVE_VIOLET_ENTRANCE, 20, 18 ; 78
map_const DARK_CAVE_BLACKTHORN_ENTRANCE, 15, 18 ; 79
map_const DRAGONS_DEN_1F, 5, 9 ; 80
map_const DRAGONS_DEN_B1F, 20, 18 ; 81
map_const DRAGON_SHRINE, 5, 5 ; 82
map_const TOHJO_FALLS, 15, 9 ; 83
map_const DIGLETTS_CAVE, 10, 18 ; 84
map_const MOUNT_MOON, 15, 9 ; 85
map_const UNDERGROUND_PATH, 3, 14 ; 86
map_const ROCK_TUNNEL_1F, 15, 18 ; 87
map_const ROCK_TUNNEL_B1F, 15, 18 ; 88
map_const SAFARI_ZONE_FUCHSIA_GATE_BETA, 5, 4 ; 89
map_const SAFARI_ZONE_BETA, 10, 18 ; 90
map_const VICTORY_ROAD, 10, 36 ; 91
endgroup
newgroup ECRUTEAK ; 4
map_const ECRUTEAK_TIN_TOWER_ENTRANCE, 10, 9 ; 1
map_const WISE_TRIOS_ROOM, 4, 4 ; 2
map_const ECRUTEAK_POKECENTER_1F, 5, 4 ; 3
map_const ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 ; 4
map_const DANCE_THEATER, 6, 7 ; 5
map_const ECRUTEAK_MART, 6, 4 ; 6
map_const ECRUTEAK_GYM, 5, 9 ; 7
map_const ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 ; 8
map_const ECRUTEAK_CITY, 20, 18 ; 9
endgroup
newgroup BLACKTHORN ; 5
map_const BLACKTHORN_GYM_1F, 5, 9 ; 1
map_const BLACKTHORN_GYM_2F, 5, 9 ; 2
map_const BLACKTHORN_DRAGON_SPEECH_HOUSE, 4, 4 ; 3
map_const BLACKTHORN_EMYS_HOUSE, 4, 4 ; 4
map_const BLACKTHORN_MART, 6, 4 ; 5
map_const BLACKTHORN_POKECENTER_1F, 5, 4 ; 6
map_const MOVE_DELETERS_HOUSE, 4, 4 ; 7
map_const ROUTE_45, 10, 45 ; 8
map_const ROUTE_46, 10, 18 ; 9
map_const BLACKTHORN_CITY, 20, 18 ; 10
endgroup
newgroup CINNABAR ; 6
map_const CINNABAR_POKECENTER_1F, 5, 4 ; 1
map_const CINNABAR_POKECENTER_2F_BETA, 8, 4 ; 2
map_const ROUTE_19_FUCHSIA_GATE, 5, 4 ; 3
map_const SEAFOAM_GYM, 5, 4 ; 4
map_const ROUTE_19, 10, 18 ; 5
map_const ROUTE_20, 30, 9 ; 6
map_const ROUTE_21, 10, 18 ; 7
map_const CINNABAR_ISLAND, 10, 9 ; 8
endgroup
newgroup CERULEAN ; 7
map_const CERULEAN_GYM_BADGE_SPEECH_HOUSE, 4, 4 ; 1
map_const CERULEAN_POLICE_STATION, 4, 4 ; 2
map_const CERULEAN_TRADE_SPEECH_HOUSE, 4, 4 ; 3
map_const CERULEAN_POKECENTER_1F, 5, 4 ; 4
map_const CERULEAN_POKECENTER_2F_BETA, 8, 4 ; 5
map_const CERULEAN_GYM, 5, 8 ; 6
map_const CERULEAN_MART, 6, 4 ; 7
map_const ROUTE_10_POKECENTER_1F, 5, 4 ; 8
map_const ROUTE_10_POKECENTER_2F_BETA, 8, 4 ; 9
map_const POWER_PLANT, 10, 9 ; 10
map_const BILLS_HOUSE, 4, 4 ; 11
map_const ROUTE_4, 20, 9 ; 12
map_const ROUTE_9, 30, 9 ; 13
map_const ROUTE_10_NORTH, 10, 9 ; 14
map_const ROUTE_24, 10, 9 ; 15
map_const ROUTE_25, 30, 9 ; 16
map_const CERULEAN_CITY, 20, 18 ; 17
endgroup
newgroup AZALEA ; 8
map_const AZALEA_POKECENTER_1F, 5, 4 ; 1
map_const CHARCOAL_KILN, 4, 4 ; 2
map_const AZALEA_MART, 6, 4 ; 3
map_const KURTS_HOUSE, 8, 4 ; 4
map_const AZALEA_GYM, 5, 8 ; 5
map_const ROUTE_33, 10, 9 ; 6
map_const AZALEA_TOWN, 20, 9 ; 7
endgroup
newgroup LAKE_OF_RAGE ; 9
map_const LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 4, 4 ; 1
map_const LAKE_OF_RAGE_MAGIKARP_HOUSE, 4, 4 ; 2
map_const ROUTE_43_MAHOGANY_GATE, 5, 4 ; 3
map_const ROUTE_43_GATE, 5, 4 ; 4
map_const ROUTE_43, 10, 27 ; 5
map_const LAKE_OF_RAGE, 20, 18 ; 6
endgroup
newgroup VIOLET ; 10
map_const ROUTE_32, 10, 45 ; 1
map_const ROUTE_35, 10, 18 ; 2
map_const ROUTE_36, 30, 9 ; 3
map_const ROUTE_37, 10, 9 ; 4
map_const VIOLET_CITY, 20, 18 ; 5
map_const VIOLET_MART, 6, 4 ; 6
map_const VIOLET_GYM, 5, 8 ; 7
map_const EARLS_POKEMON_ACADEMY, 4, 8 ; 8
map_const VIOLET_NICKNAME_SPEECH_HOUSE, 4, 4 ; 9
map_const VIOLET_POKECENTER_1F, 5, 4 ; 10
map_const VIOLET_KYLES_HOUSE, 4, 4 ; 11
map_const ROUTE_32_RUINS_OF_ALPH_GATE, 5, 4 ; 12
map_const ROUTE_32_POKECENTER_1F, 5, 4 ; 13
map_const ROUTE_35_GOLDENROD_GATE, 5, 4 ; 14
map_const ROUTE_35_NATIONAL_PARK_GATE, 4, 4 ; 15
map_const ROUTE_36_RUINS_OF_ALPH_GATE, 5, 4 ; 16
map_const ROUTE_36_NATIONAL_PARK_GATE, 5, 4 ; 17
endgroup
newgroup GOLDENROD ; 11
map_const ROUTE_34, 10, 27 ; 1
map_const GOLDENROD_CITY, 20, 18 ; 2
map_const GOLDENROD_GYM, 10, 9 ; 3
map_const GOLDENROD_BIKE_SHOP, 4, 4 ; 4
map_const GOLDENROD_HAPPINESS_RATER, 4, 4 ; 5
map_const BILLS_FAMILYS_HOUSE, 4, 4 ; 6
map_const GOLDENROD_MAGNET_TRAIN_STATION, 10, 9 ; 7
map_const GOLDENROD_FLOWER_SHOP, 4, 4 ; 8
map_const GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 9
map_const GOLDENROD_NAME_RATER, 4, 4 ; 10
map_const GOLDENROD_DEPT_STORE_1F, 8, 4 ; 11
map_const GOLDENROD_DEPT_STORE_2F, 8, 4 ; 12
map_const GOLDENROD_DEPT_STORE_3F, 8, 4 ; 13
map_const GOLDENROD_DEPT_STORE_4F, 8, 4 ; 14
map_const GOLDENROD_DEPT_STORE_5F, 8, 4 ; 15
map_const GOLDENROD_DEPT_STORE_6F, 8, 4 ; 16
map_const GOLDENROD_DEPT_STORE_ELEVATOR, 2, 2 ; 17
map_const GOLDENROD_DEPT_STORE_ROOF, 8, 4 ; 18
map_const GOLDENROD_GAME_CORNER, 10, 7 ; 19
map_const GOLDENROD_POKECENTER_1F, 5, 4 ; 20
map_const POKECOM_CENTER_ADMIN_OFFICE_MOBILE, 16, 16 ; 21
map_const ILEX_FOREST_AZALEA_GATE, 5, 4 ; 22
map_const ROUTE_34_ILEX_FOREST_GATE, 5, 4 ; 23
map_const DAY_CARE, 5, 4 ; 24
endgroup
newgroup VERMILION ; 12
map_const ROUTE_6, 10, 9 ; 1
map_const ROUTE_11, 20, 9 ; 2
map_const VERMILION_CITY, 20, 18 ; 3
map_const VERMILION_FISHING_SPEECH_HOUSE, 4, 4 ; 4
map_const VERMILION_POKECENTER_1F, 5, 4 ; 5
map_const VERMILION_POKECENTER_2F_BETA, 8, 4 ; 6
map_const POKEMON_FAN_CLUB, 5, 4 ; 7
map_const VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 4, 4 ; 8
map_const VERMILION_MART, 6, 4 ; 9
map_const VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10
map_const VERMILION_GYM, 5, 9 ; 11
map_const ROUTE_6_SAFFRON_GATE, 5, 4 ; 12
map_const ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13
endgroup
newgroup PALLET ; 13
map_const ROUTE_1, 10, 18 ; 1
map_const PALLET_TOWN, 10, 9 ; 2
map_const REDS_HOUSE_1F, 4, 4 ; 3
map_const REDS_HOUSE_2F, 4, 4 ; 4
map_const BLUES_HOUSE, 4, 4 ; 5
map_const OAKS_LAB, 5, 6 ; 6
endgroup
newgroup PEWTER ; 14
map_const ROUTE_3, 30, 9 ; 1
map_const PEWTER_CITY, 20, 18 ; 2
map_const PEWTER_NIDORAN_SPEECH_HOUSE, 4, 4 ; 3
map_const PEWTER_GYM, 5, 7 ; 4
map_const PEWTER_MART, 6, 4 ; 5
map_const PEWTER_POKECENTER_1F, 5, 4 ; 6
map_const PEWTER_POKECENTER_2F_BETA, 8, 4 ; 7
map_const PEWTER_SNOOZE_SPEECH_HOUSE, 4, 4 ; 8
endgroup
newgroup FAST_SHIP ; 15
map_const OLIVINE_PORT, 10, 18 ; 1
map_const VERMILION_PORT, 10, 18 ; 2
map_const FAST_SHIP_1F, 16, 9 ; 3
map_const FAST_SHIP_CABINS_NNW_NNE_NE, 4, 16 ; 4
map_const FAST_SHIP_CABINS_SW_SSW_NW, 4, 16 ; 5
map_const FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 5, 17 ; 6
map_const FAST_SHIP_B1F, 16, 8 ; 7
map_const OLIVINE_PORT_PASSAGE, 10, 9 ; 8
map_const VERMILION_PORT_PASSAGE, 10, 9 ; 9
map_const MOUNT_MOON_SQUARE, 15, 9 ; 10
map_const MOUNT_MOON_GIFT_SHOP, 4, 4 ; 11
map_const TIN_TOWER_ROOF, 10, 9 ; 12
endgroup
newgroup INDIGO ; 16
map_const ROUTE_23, 10, 9 ; 1
map_const INDIGO_PLATEAU_POKECENTER_1F, 9, 7 ; 2
map_const WILLS_ROOM, 5, 9 ; 3
map_const KOGAS_ROOM, 5, 9 ; 4
map_const BRUNOS_ROOM, 5, 9 ; 5
map_const KARENS_ROOM, 5, 9 ; 6
map_const LANCES_ROOM, 5, 12 ; 7
map_const HALL_OF_FAME, 5, 7 ; 8
endgroup
newgroup FUCHSIA ; 17
map_const ROUTE_13, 30, 9 ; 1
map_const ROUTE_14, 10, 18 ; 2
map_const ROUTE_15, 20, 9 ; 3
map_const ROUTE_18, 10, 9 ; 4
map_const FUCHSIA_CITY, 20, 18 ; 5
map_const FUCHSIA_MART, 6, 4 ; 6
map_const SAFARI_ZONE_MAIN_OFFICE, 4, 4 ; 7
map_const FUCHSIA_GYM, 5, 9 ; 8
map_const BILLS_BROTHERS_HOUSE, 4, 4 ; 9
map_const FUCHSIA_POKECENTER_1F, 5, 4 ; 10
map_const FUCHSIA_POKECENTER_2F_BETA, 8, 4 ; 11
map_const SAFARI_ZONE_WARDENS_HOME, 5, 4 ; 12
map_const ROUTE_15_FUCHSIA_GATE, 5, 4 ; 13
endgroup
newgroup LAVENDER ; 18
map_const ROUTE_8, 20, 9 ; 1
map_const ROUTE_12, 10, 27 ; 2
map_const ROUTE_10_SOUTH, 10, 9 ; 3
map_const LAVENDER_TOWN, 10, 9 ; 4
map_const LAVENDER_POKECENTER_1F, 5, 4 ; 5
map_const LAVENDER_POKECENTER_2F_BETA, 8, 4 ; 6
map_const MR_FUJIS_HOUSE, 5, 4 ; 7
map_const LAVENDER_SPEECH_HOUSE, 4, 4 ; 8
map_const LAVENDER_NAME_RATER, 4, 4 ; 9
map_const LAVENDER_MART, 6, 4 ; 10
map_const SOUL_HOUSE, 5, 4 ; 11
map_const LAV_RADIO_TOWER_1F, 10, 4 ; 12
map_const ROUTE_8_SAFFRON_GATE, 5, 4 ; 13
map_const ROUTE_12_SUPER_ROD_HOUSE, 4, 4 ; 14
endgroup
newgroup SILVER ; 19
map_const ROUTE_28, 20, 9 ; 1
map_const SILVER_CAVE_OUTSIDE, 20, 18 ; 2
map_const SILVER_CAVE_POKECENTER_1F, 5, 4 ; 3
map_const ROUTE_28_STEEL_WING_HOUSE, 4, 4 ; 4
endgroup
newgroup CABLE_CLUB ; 20
map_const POKECENTER_2F, 8, 4 ; 1
map_const TRADE_CENTER, 5, 4 ; 2
map_const COLOSSEUM, 5, 4 ; 3
map_const TIME_CAPSULE, 5, 4 ; 4
map_const MOBILE_TRADE_ROOM, 5, 4 ; 5
map_const MOBILE_BATTLE_ROOM, 5, 4 ; 6
endgroup
newgroup CELADON ; 21
map_const ROUTE_7, 10, 9 ; 1
map_const ROUTE_16, 10, 9 ; 2
map_const ROUTE_17, 10, 45 ; 3
map_const CELADON_CITY, 20, 18 ; 4
map_const CELADON_DEPT_STORE_1F, 8, 4 ; 5
map_const CELADON_DEPT_STORE_2F, 8, 4 ; 6
map_const CELADON_DEPT_STORE_3F, 8, 4 ; 7
map_const CELADON_DEPT_STORE_4F, 8, 4 ; 8
map_const CELADON_DEPT_STORE_5F, 8, 4 ; 9
map_const CELADON_DEPT_STORE_6F, 8, 4 ; 10
map_const CELADON_DEPT_STORE_ELEVATOR, 2, 2 ; 11
map_const CELADON_MANSION_1F, 4, 5 ; 12
map_const CELADON_MANSION_2F, 4, 5 ; 13
map_const CELADON_MANSION_3F, 4, 5 ; 14
map_const CELADON_MANSION_ROOF, 4, 5 ; 15
map_const CELADON_MANSION_ROOF_HOUSE, 4, 4 ; 16
map_const CELADON_POKECENTER_1F, 5, 4 ; 17
map_const CELADON_POKECENTER_2F_BETA, 8, 4 ; 18
map_const CELADON_GAME_CORNER, 10, 7 ; 19
map_const CELADON_GAME_CORNER_PRIZE_ROOM, 3, 3 ; 20
map_const CELADON_GYM, 5, 9 ; 21
map_const CELADON_CAFE, 6, 4 ; 22
map_const ROUTE_16_FUCHSIA_SPEECH_HOUSE, 4, 4 ; 23
map_const ROUTE_16_GATE, 5, 4 ; 24
map_const ROUTE_7_SAFFRON_GATE, 5, 4 ; 25
map_const ROUTE_17_ROUTE_18_GATE, 5, 4 ; 26
endgroup
newgroup CIANWOOD ; 22
map_const ROUTE_40, 10, 18 ; 1
map_const ROUTE_41, 25, 27 ; 2
map_const CIANWOOD_CITY, 15, 27 ; 3
map_const MANIAS_HOUSE, 4, 4 ; 4
map_const CIANWOOD_GYM, 5, 9 ; 5
map_const CIANWOOD_POKECENTER_1F, 5, 4 ; 6
map_const CIANWOOD_PHARMACY, 4, 4 ; 7
map_const CIANWOOD_PHOTO_STUDIO, 4, 4 ; 8
map_const CIANWOOD_LUGIA_SPEECH_HOUSE, 4, 4 ; 9
map_const POKE_SEERS_HOUSE, 4, 4 ; 10
map_const BATTLE_TOWER_1F, 8, 5 ; 11
map_const BATTLE_TOWER_BATTLE_ROOM, 4, 4 ; 12
map_const BATTLE_TOWER_ELEVATOR, 2, 2 ; 13
map_const BATTLE_TOWER_HALLWAY, 11, 2 ; 14
map_const ROUTE_40_BATTLE_TOWER_GATE, 5, 4 ; 15
map_const BATTLE_TOWER_OUTSIDE, 10, 14 ; 16
endgroup
newgroup VIRIDIAN ; 23
map_const ROUTE_2, 10, 27 ; 1
map_const ROUTE_22, 20, 9 ; 2
map_const VIRIDIAN_CITY, 20, 18 ; 3
map_const VIRIDIAN_GYM, 5, 9 ; 4
map_const VIRIDIAN_NICKNAME_SPEECH_HOUSE, 4, 4 ; 5
map_const TRAINER_HOUSE_1F, 5, 7 ; 6
map_const TRAINER_HOUSE_B1F, 5, 8 ; 7
map_const VIRIDIAN_MART, 6, 4 ; 8
map_const VIRIDIAN_POKECENTER_1F, 5, 4 ; 9
map_const VIRIDIAN_POKECENTER_2F_BETA, 8, 4 ; 10
map_const ROUTE_2_NUGGET_HOUSE, 4, 4 ; 11
map_const ROUTE_2_GATE, 5, 4 ; 12
map_const VICTORY_ROAD_GATE, 10, 9 ; 13
endgroup
newgroup NEW_BARK ; 24
map_const ROUTE_26, 10, 54 ; 1
map_const ROUTE_27, 40, 9 ; 2
map_const ROUTE_29, 30, 9 ; 3
map_const NEW_BARK_TOWN, 10, 9 ; 4
map_const ELMS_LAB, 5, 6 ; 5
map_const PLAYERS_HOUSE_1F, 5, 4 ; 6
map_const PLAYERS_HOUSE_2F, 4, 3 ; 7
map_const PLAYERS_NEIGHBORS_HOUSE, 4, 4 ; 8
map_const ELMS_HOUSE, 4, 4 ; 9
map_const ROUTE_26_HEAL_HOUSE, 4, 4 ; 10
map_const DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11
map_const ROUTE_27_SANDSTORM_HOUSE, 4, 4 ; 12
map_const ROUTE_29_ROUTE_46_GATE, 5, 4 ; 13
endgroup
newgroup SAFFRON ; 25
map_const ROUTE_5, 10, 9 ; 1
map_const SAFFRON_CITY, 20, 18 ; 2
map_const FIGHTING_DOJO, 5, 6 ; 3
map_const SAFFRON_GYM, 10, 9 ; 4
map_const SAFFRON_MART, 6, 4 ; 5
map_const SAFFRON_POKECENTER_1F, 5, 4 ; 6
map_const SAFFRON_POKECENTER_2F_BETA, 8, 4 ; 7
map_const MR_PSYCHICS_HOUSE, 4, 4 ; 8
map_const SAFFRON_MAGNET_TRAIN_STATION, 10, 9 ; 9
map_const SILPH_CO_1F, 8, 4 ; 10
map_const COPYCATS_HOUSE_1F, 4, 4 ; 11
map_const COPYCATS_HOUSE_2F, 5, 3 ; 12
map_const ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13
map_const ROUTE_5_SAFFRON_GATE, 5, 4 ; 14
map_const ROUTE_5_CLEANSE_TAG_HOUSE, 4, 4 ; 15
endgroup
newgroup CHERRYGROVE ; 26
map_const ROUTE_30, 10, 27 ; 1
map_const ROUTE_31, 20, 9 ; 2
map_const CHERRYGROVE_CITY, 20, 9 ; 3
map_const CHERRYGROVE_MART, 6, 4 ; 4
map_const CHERRYGROVE_POKECENTER_1F, 5, 4 ; 5
map_const CHERRYGROVE_GYM_SPEECH_HOUSE, 4, 4 ; 6
map_const GUIDE_GENTS_HOUSE, 4, 4 ; 7
map_const CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 4, 4 ; 8
map_const ROUTE_30_BERRY_HOUSE, 4, 4 ; 9
map_const MR_POKEMONS_HOUSE, 4, 4 ; 10
map_const ROUTE_31_VIOLET_GATE, 5, 4 ; 11
endgroup
DEF NUM_MAP_GROUPS EQU const_value ; 26
DEF NUM_MAP_GROUPS EQU const_value

View File

@@ -72,70 +72,15 @@ DEF NUM_FISHGROUPS EQU const_value - 1
; SpawnPoints indexes (see data/maps/spawn_points.asm)
const_def
const SPAWN_HOME
const SPAWN_DEBUG
; kanto
const SPAWN_PALLET
const SPAWN_VIRIDIAN
const SPAWN_PEWTER
const SPAWN_CERULEAN
const SPAWN_ROCK_TUNNEL
const SPAWN_VERMILION
const SPAWN_LAVENDER
const SPAWN_SAFFRON
const SPAWN_CELADON
const SPAWN_FUCHSIA
const SPAWN_CINNABAR
const SPAWN_INDIGO
; johto
const SPAWN_NEW_BARK
const SPAWN_CHERRYGROVE
const SPAWN_VIOLET
const SPAWN_UNION_CAVE
const SPAWN_AZALEA
const SPAWN_CIANWOOD
const SPAWN_GOLDENROD
const SPAWN_OLIVINE
const SPAWN_ECRUTEAK
const SPAWN_MAHOGANY
const SPAWN_LAKE_OF_RAGE
const SPAWN_BLACKTHORN
const SPAWN_MT_SILVER
const SPAWN_FAST_SHIP
const SPAWN_LEVEL_1
; const SPAWN_LEVEL_2
DEF NUM_SPAWNS EQU const_value
DEF SPAWN_N_A EQU -1
; Flypoints indexes (see data/maps/flypoints.asm)
const_def
; johto
DEF JOHTO_FLYPOINT EQU const_value
const FLY_NEW_BARK
const FLY_CHERRYGROVE
const FLY_VIOLET
const FLY_AZALEA
const FLY_GOLDENROD
const FLY_ECRUTEAK
const FLY_OLIVINE
const FLY_CIANWOOD
const FLY_MAHOGANY
const FLY_LAKE_OF_RAGE
const FLY_BLACKTHORN
const FLY_MT_SILVER
; kanto
DEF KANTO_FLYPOINT EQU const_value
const FLY_PALLET
const FLY_VIRIDIAN
const FLY_PEWTER
const FLY_CERULEAN
const FLY_VERMILION
const FLY_ROCK_TUNNEL
const FLY_LAVENDER
const FLY_CELADON
const FLY_SAFFRON
const FLY_FUCHSIA
const FLY_CINNABAR
const FLY_INDIGO
const FLY_1
DEF NUM_FLYPOINTS EQU const_value
DEF MAX_OUTDOOR_SPRITES EQU 23 ; see engine/overworld/overworld.asm

View File

@@ -43,14 +43,6 @@ DEF NUM_PHONE_CONTACTS EQU const_value - 1
; SpecialPhoneCallList indexes (see data/phone/special_calls.asm)
const_def
const SPECIALCALL_NONE
const SPECIALCALL_POKERUS
const SPECIALCALL_ROBBED
const SPECIALCALL_ASSISTANT
const SPECIALCALL_WEIRDBROADCAST
const SPECIALCALL_SSTICKET
const SPECIALCALL_BIKESHOP
const SPECIALCALL_WORRIED
const SPECIALCALL_MASTERBALL
DEF NUM_SPECIALCALLS EQU const_value - 1
DEF SPECIALCALL_SIZE EQU 6

View File

@@ -176,7 +176,7 @@ DEF GRASS_WILDDATA_LENGTH EQU 2 + 3 + NUM_GRASSMON * 2 * 3
DEF WATER_WILDDATA_LENGTH EQU 2 + 1 + NUM_WATERMON * 2
DEF FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3
DEF NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm)
DEF NUM_ROAMMON_MAPS EQU 1 ; RoamMaps table size (see data/wild/roammon_maps.asm)
; treemon sets
; TreeMons indexes (see data/wild/treemons.asm)