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)

View File

@ -73,32 +73,7 @@ EngineFlags:
engine_flag wUnlockedUnowns, 7 ; unused
; fly
engine_flag wVisitedSpawns, SPAWN_HOME
engine_flag wVisitedSpawns, SPAWN_DEBUG
engine_flag wVisitedSpawns, SPAWN_PALLET
engine_flag wVisitedSpawns, SPAWN_VIRIDIAN
engine_flag wVisitedSpawns, SPAWN_PEWTER
engine_flag wVisitedSpawns, SPAWN_CERULEAN
engine_flag wVisitedSpawns, SPAWN_ROCK_TUNNEL
engine_flag wVisitedSpawns, SPAWN_VERMILION
engine_flag wVisitedSpawns, SPAWN_LAVENDER
engine_flag wVisitedSpawns, SPAWN_SAFFRON
engine_flag wVisitedSpawns, SPAWN_CELADON
engine_flag wVisitedSpawns, SPAWN_FUCHSIA
engine_flag wVisitedSpawns, SPAWN_CINNABAR
engine_flag wVisitedSpawns, SPAWN_INDIGO
engine_flag wVisitedSpawns, SPAWN_NEW_BARK
engine_flag wVisitedSpawns, SPAWN_CHERRYGROVE
engine_flag wVisitedSpawns, SPAWN_VIOLET
engine_flag wVisitedSpawns, SPAWN_AZALEA
engine_flag wVisitedSpawns, SPAWN_CIANWOOD
engine_flag wVisitedSpawns, SPAWN_GOLDENROD
engine_flag wVisitedSpawns, SPAWN_OLIVINE
engine_flag wVisitedSpawns, SPAWN_ECRUTEAK
engine_flag wVisitedSpawns, SPAWN_MAHOGANY
engine_flag wVisitedSpawns, SPAWN_LAKE_OF_RAGE
engine_flag wVisitedSpawns, SPAWN_BLACKTHORN
engine_flag wVisitedSpawns, SPAWN_MT_SILVER
engine_flag wVisitedSpawns, SPAWN_LEVEL_1
engine_flag wVisitedSpawns, NUM_SPAWNS ; unused
engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -2,29 +2,5 @@ Flypoints:
; entries correspond to FLY_* constants
; Johto
; landmark, spawn point
db LANDMARK_NEW_BARK_TOWN, SPAWN_NEW_BARK
db LANDMARK_CHERRYGROVE_CITY, SPAWN_CHERRYGROVE
db LANDMARK_VIOLET_CITY, SPAWN_VIOLET
db LANDMARK_AZALEA_TOWN, SPAWN_AZALEA
db LANDMARK_GOLDENROD_CITY, SPAWN_GOLDENROD
db LANDMARK_ECRUTEAK_CITY, SPAWN_ECRUTEAK
db LANDMARK_OLIVINE_CITY, SPAWN_OLIVINE
db LANDMARK_CIANWOOD_CITY, SPAWN_CIANWOOD
db LANDMARK_MAHOGANY_TOWN, SPAWN_MAHOGANY
db LANDMARK_LAKE_OF_RAGE, SPAWN_LAKE_OF_RAGE
db LANDMARK_BLACKTHORN_CITY, SPAWN_BLACKTHORN
db LANDMARK_SILVER_CAVE, SPAWN_MT_SILVER
; Kanto
db LANDMARK_PALLET_TOWN, SPAWN_PALLET
db LANDMARK_VIRIDIAN_CITY, SPAWN_VIRIDIAN
db LANDMARK_PEWTER_CITY, SPAWN_PEWTER
db LANDMARK_CERULEAN_CITY, SPAWN_CERULEAN
db LANDMARK_VERMILION_CITY, SPAWN_VERMILION
db LANDMARK_ROCK_TUNNEL, SPAWN_ROCK_TUNNEL
db LANDMARK_LAVENDER_TOWN, SPAWN_LAVENDER
db LANDMARK_CELADON_CITY, SPAWN_CELADON
db LANDMARK_SAFFRON_CITY, SPAWN_SAFFRON
db LANDMARK_FUCHSIA_CITY, SPAWN_FUCHSIA
db LANDMARK_CINNABAR_ISLAND, SPAWN_CINNABAR
db LANDMARK_INDIGO_PLATEAU, SPAWN_INDIGO
db LANDMARK_LEVEL_1, SPAWN_LEVEL_1
db -1 ; end

View File

@ -7,204 +7,9 @@ ENDM
Landmarks:
; entries correspond to constants/landmark_constants.asm
table_width 4, Landmarks
landmark -8, -16, SpecialMapName
landmark 140, 100, NewBarkTownName
landmark 128, 100, Route29Name
landmark 100, 100, CherrygroveCityName
landmark 100, 80, Route30Name
landmark 96, 60, Route31Name
landmark 84, 60, VioletCityName
landmark 85, 58, SproutTowerName
landmark 84, 92, Route32Name
landmark 76, 76, RuinsOfAlphName
landmark 84, 124, UnionCaveName
landmark 82, 124, Route33Name
landmark 68, 124, AzaleaTownName
landmark 70, 122, SlowpokeWellName
landmark 52, 120, IlexForestName
landmark 52, 112, Route34Name
landmark 52, 92, GoldenrodCityName
landmark 50, 92, RadioTowerName
landmark 52, 76, Route35Name
landmark 52, 60, NationalParkName
landmark 64, 60, Route36Name
landmark 68, 52, Route37Name
landmark 68, 44, EcruteakCityName
landmark 70, 42, TinTowerName
landmark 66, 42, BurnedTowerName
landmark 52, 44, Route38Name
landmark 36, 48, Route39Name
landmark 36, 60, OlivineCityName
landmark 38, 62, LighthouseName
landmark 28, 56, BattleTowerName
landmark 28, 64, Route40Name
landmark 28, 92, WhirlIslandsName
landmark 28, 100, Route41Name
landmark 20, 100, CianwoodCityName
landmark 92, 44, Route42Name
landmark 84, 44, MtMortarName
landmark 108, 44, MahoganyTownName
landmark 108, 36, Route43Name
landmark 108, 28, LakeOfRageName
landmark 120, 44, Route44Name
landmark 130, 38, IcePathName
landmark 132, 44, BlackthornCityName
landmark 132, 36, DragonsDenName
landmark 132, 64, Route45Name
landmark 112, 72, DarkCaveName
landmark 124, 88, Route46Name
landmark 148, 68, SilverCaveName
assert_table_length KANTO_LANDMARK
landmark 52, 108, PalletTownName
landmark 52, 92, Route1Name
landmark 52, 76, ViridianCityName
landmark 52, 64, Route2Name
landmark 52, 52, PewterCityName
landmark 64, 52, Route3Name
landmark 76, 52, MtMoonName
landmark 88, 52, Route4Name
landmark 100, 52, CeruleanCityName
landmark 100, 44, Route24Name
landmark 108, 36, Route25Name
landmark 100, 60, Route5Name
landmark 108, 76, UndergroundName
landmark 100, 76, Route6Name
landmark 100, 84, VermilionCityName
landmark 88, 60, DiglettsCaveName
landmark 88, 68, Route7Name
landmark 116, 68, Route8Name
landmark 116, 52, Route9Name
landmark 132, 52, RockTunnelName
landmark 132, 56, Route10Name
landmark 132, 60, PowerPlantName
landmark 132, 68, LavenderTownName
landmark 140, 68, LavRadioTowerName
landmark 76, 68, CeladonCityName
landmark 100, 68, SaffronCityName
landmark 116, 84, Route11Name
landmark 132, 80, Route12Name
landmark 124, 100, Route13Name
landmark 116, 112, Route14Name
landmark 104, 116, Route15Name
landmark 68, 68, Route16Name
landmark 68, 92, Route17Name
landmark 80, 116, Route18Name
landmark 92, 116, FuchsiaCityName
landmark 92, 128, Route19Name
landmark 76, 132, Route20Name
landmark 68, 132, SeafoamIslandsName
landmark 52, 132, CinnabarIslandName
landmark 52, 120, Route21Name
landmark 36, 68, Route22Name
landmark 28, 52, VictoryRoadName
landmark 28, 44, Route23Name
landmark 28, 36, IndigoPlateauName
landmark 28, 92, Route26Name
landmark 20, 100, Route27Name
landmark 12, 100, TohjoFallsName
landmark 20, 68, Route28Name
landmark 140, 116, FastShipName
landmark -8, -16, SpecialLandmarkName
landmark 140, 100, Level1LandmarkName
assert_table_length NUM_LANDMARKS
NewBarkTownName: db "NEW BARK¯TOWN@"
CherrygroveCityName: db "CHERRYGROVE¯CITY@"
VioletCityName: db "VIOLET CITY@"
AzaleaTownName: db "AZALEA TOWN@"
GoldenrodCityName: db "GOLDENROD¯CITY@"
EcruteakCityName: db "ECRUTEAK¯CITY@"
OlivineCityName: db "OLIVINE¯CITY@"
CianwoodCityName: db "CIANWOOD¯CITY@"
MahoganyTownName: db "MAHOGANY¯TOWN@"
BlackthornCityName: db "BLACKTHORN¯CITY@"
LakeOfRageName: db "LAKE OF¯RAGE@"
SilverCaveName: db "SILVER CAVE@"
SproutTowerName: db "SPROUT¯TOWER@"
RuinsOfAlphName: db "RUINS¯OF ALPH@"
UnionCaveName: db "UNION CAVE@"
SlowpokeWellName: db "SLOWPOKE¯WELL@"
RadioTowerName: db "RADIO TOWER@"
PowerPlantName: db "POWER PLANT@"
NationalParkName: db "NATIONAL¯PARK@"
TinTowerName: db "TIN TOWER@"
LighthouseName: db "LIGHTHOUSE@"
WhirlIslandsName: db "WHIRL¯ISLANDS@"
MtMortarName: db "MT.MORTAR@"
DragonsDenName: db "DRAGON'S¯DEN@"
IcePathName: db "ICE PATH@"
NotApplicableName: db "N/A@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese
PalletTownName: db "PALLET TOWN@"
ViridianCityName: db "VIRIDIAN¯CITY@"
PewterCityName: db "PEWTER CITY@"
CeruleanCityName: db "CERULEAN¯CITY@"
LavenderTownName: db "LAVENDER¯TOWN@"
VermilionCityName: db "VERMILION¯CITY@"
CeladonCityName: db "CELADON¯CITY@"
SaffronCityName: db "SAFFRON¯CITY@"
FuchsiaCityName: db "FUCHSIA¯CITY@"
CinnabarIslandName: db "CINNABAR¯ISLAND@"
IndigoPlateauName: db "INDIGO¯PLATEAU@"
VictoryRoadName: db "VICTORY¯ROAD@"
MtMoonName: db "MT.MOON@"
RockTunnelName: db "ROCK TUNNEL@"
LavRadioTowerName: db "LAV¯RADIO TOWER@"
SilphCoName: db "SILPH CO.@" ; unreferenced
SafariZoneName: db "SAFARI ZONE@" ; unreferenced
SeafoamIslandsName: db "SEAFOAM¯ISLANDS@"
PokemonMansionName: db "#MON¯MANSION@" ; unreferenced
CeruleanCaveName: db "CERULEAN¯CAVE@" ; unreferenced
Route1Name: db "ROUTE 1@"
Route2Name: db "ROUTE 2@"
Route3Name: db "ROUTE 3@"
Route4Name: db "ROUTE 4@"
Route5Name: db "ROUTE 5@"
Route6Name: db "ROUTE 6@"
Route7Name: db "ROUTE 7@"
Route8Name: db "ROUTE 8@"
Route9Name: db "ROUTE 9@"
Route10Name: db "ROUTE 10@"
Route11Name: db "ROUTE 11@"
Route12Name: db "ROUTE 12@"
Route13Name: db "ROUTE 13@"
Route14Name: db "ROUTE 14@"
Route15Name: db "ROUTE 15@"
Route16Name: db "ROUTE 16@"
Route17Name: db "ROUTE 17@"
Route18Name: db "ROUTE 18@"
Route19Name: db "ROUTE 19@"
Route20Name: db "ROUTE 20@"
Route21Name: db "ROUTE 21@"
Route22Name: db "ROUTE 22@"
Route23Name: db "ROUTE 23@"
Route24Name: db "ROUTE 24@"
Route25Name: db "ROUTE 25@"
Route26Name: db "ROUTE 26@"
Route27Name: db "ROUTE 27@"
Route28Name: db "ROUTE 28@"
Route29Name: db "ROUTE 29@"
Route30Name: db "ROUTE 30@"
Route31Name: db "ROUTE 31@"
Route32Name: db "ROUTE 32@"
Route33Name: db "ROUTE 33@"
Route34Name: db "ROUTE 34@"
Route35Name: db "ROUTE 35@"
Route36Name: db "ROUTE 36@"
Route37Name: db "ROUTE 37@"
Route38Name: db "ROUTE 38@"
Route39Name: db "ROUTE 39@"
Route40Name: db "ROUTE 40@"
Route41Name: db "ROUTE 41@"
Route42Name: db "ROUTE 42@"
Route43Name: db "ROUTE 43@"
Route44Name: db "ROUTE 44@"
Route45Name: db "ROUTE 45@"
Route46Name: db "ROUTE 46@"
DarkCaveName: db "DARK CAVE@"
IlexForestName: db "ILEX¯FOREST@"
BurnedTowerName: db "BURNED¯TOWER@"
FastShipName: db "FAST SHIP@"
ViridianForestName: db "VIRIDIAN¯FOREST@" ; unreferenced
DiglettsCaveName: db "DIGLETT'S¯CAVE@"
TohjoFallsName: db "TOHJO FALLS@"
UndergroundName: db "UNDERGROUND@"
BattleTowerName: db "BATTLE¯TOWER@"
SpecialMapName: db "SPECIAL@"
Level1LandmarkName: db "LEVEL 1@"
SpecialLandmarkName: db "SPECIAL@"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -12,32 +12,7 @@ MapGroupRoofs:
; values are indexes for Roofs (see below)
table_width 1, MapGroupRoofs
db -1 ; 0
db ROOF_OLIVINE ; 1 (Olivine)
db ROOF_AZALEA ; 2 (Mahogany)
db -1 ; 3
db ROOF_VIOLET ; 4 (Ecruteak)
db ROOF_AZALEA ; 5 (Blackthorn)
db -1 ; 6
db -1 ; 7
db ROOF_AZALEA ; 8 (Azalea)
db ROOF_AZALEA ; 9 (Lake of Rage)
db ROOF_VIOLET ; 10 (Violet)
db ROOF_GOLDENROD ; 11 (Goldenrod)
db -1 ; 12
db -1 ; 13
db -1 ; 14
db -1 ; 15
db -1 ; 16
db -1 ; 17
db -1 ; 18
db ROOF_NEW_BARK ; 19 (Silver Cave)
db -1 ; 20
db -1 ; 21
db ROOF_OLIVINE ; 22 (Cianwood)
db -1 ; 23
db ROOF_NEW_BARK ; 24 (New Bark)
db -1 ; 25
db ROOF_NEW_BARK ; 26 (Cherrygrove)
db ROOF_OLIVINE ; 1 (Level1)
assert_table_length NUM_MAP_GROUPS + 1
Roofs:

View File

@ -5,83 +5,4 @@ MACRO scene_var
ENDM
MapScenes::
scene_var POKECENTER_2F, wPokecenter2FSceneID
scene_var TRADE_CENTER, wTradeCenterSceneID
scene_var COLOSSEUM, wColosseumSceneID
scene_var TIME_CAPSULE, wTimeCapsuleSceneID
scene_var POWER_PLANT, wPowerPlantSceneID
scene_var CERULEAN_GYM, wCeruleanGymSceneID
scene_var ROUTE_25, wRoute25SceneID
scene_var TRAINER_HOUSE_B1F, wTrainerHouseB1FSceneID
scene_var VICTORY_ROAD_GATE, wVictoryRoadGateSceneID
scene_var SAFFRON_MAGNET_TRAIN_STATION, wSaffronMagnetTrainStationSceneID
scene_var ROUTE_16_GATE, wRoute16GateSceneID
scene_var ROUTE_17_ROUTE_18_GATE, wRoute17Route18GateSceneID
scene_var INDIGO_PLATEAU_POKECENTER_1F, wIndigoPlateauPokecenter1FSceneID
scene_var WILLS_ROOM, wWillsRoomSceneID
scene_var KOGAS_ROOM, wKogasRoomSceneID
scene_var BRUNOS_ROOM, wBrunosRoomSceneID
scene_var KARENS_ROOM, wKarensRoomSceneID
scene_var LANCES_ROOM, wLancesRoomSceneID
scene_var HALL_OF_FAME, wHallOfFameSceneID
scene_var ROUTE_27, wRoute27SceneID
scene_var NEW_BARK_TOWN, wNewBarkTownSceneID
scene_var ELMS_LAB, wElmsLabSceneID
scene_var PLAYERS_HOUSE_1F, wPlayersHouse1FSceneID
scene_var ROUTE_29, wRoute29SceneID
scene_var CHERRYGROVE_CITY, wCherrygroveCitySceneID
scene_var MR_POKEMONS_HOUSE, wMrPokemonsHouseSceneID
scene_var ROUTE_32, wRoute32SceneID
scene_var ROUTE_35_NATIONAL_PARK_GATE, wRoute35NationalParkGateSceneID
scene_var ROUTE_36, wRoute36SceneID
scene_var ROUTE_36_NATIONAL_PARK_GATE, wRoute36NationalParkGateSceneID
scene_var AZALEA_TOWN, wAzaleaTownSceneID
scene_var GOLDENROD_GYM, wGoldenrodGymSceneID
scene_var GOLDENROD_MAGNET_TRAIN_STATION, wGoldenrodMagnetTrainStationSceneID
scene_var GOLDENROD_POKECENTER_1F, wGoldenrodPokecenter1FSceneID
scene_var OLIVINE_CITY, wOlivineCitySceneID
scene_var ROUTE_34, wRoute34SceneID ; unused
scene_var ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID ; unused
scene_var ECRUTEAK_TIN_TOWER_ENTRANCE, wEcruteakTinTowerEntranceSceneID
scene_var WISE_TRIOS_ROOM, wWiseTriosRoomSceneID
scene_var ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID
scene_var ECRUTEAK_GYM, wEcruteakGymSceneID
scene_var MAHOGANY_TOWN, wMahoganyTownSceneID
scene_var ROUTE_42, wRoute42SceneID
scene_var CIANWOOD_CITY, wCianwoodCitySceneID
scene_var BATTLE_TOWER_1F, wBattleTower1FSceneID
scene_var BATTLE_TOWER_BATTLE_ROOM, wBattleTowerBattleRoomSceneID
scene_var BATTLE_TOWER_ELEVATOR, wBattleTowerElevatorSceneID
scene_var BATTLE_TOWER_HALLWAY, wBattleTowerHallwaySceneID
scene_var BATTLE_TOWER_OUTSIDE, wBattleTowerOutsideSceneID ; unused
scene_var ROUTE_43_GATE, wRoute43GateSceneID
scene_var MOUNT_MOON, wMountMoonSceneID
scene_var SPROUT_TOWER_3F, wSproutTower3FSceneID
scene_var TIN_TOWER_1F, wTinTower1FSceneID
scene_var BURNED_TOWER_1F, wBurnedTower1FSceneID
scene_var BURNED_TOWER_B1F, wBurnedTowerB1FSceneID
scene_var RADIO_TOWER_5F, wRadioTower5FSceneID
scene_var RUINS_OF_ALPH_OUTSIDE, wRuinsOfAlphOutsideSceneID
scene_var RUINS_OF_ALPH_RESEARCH_CENTER, wRuinsOfAlphResearchCenterSceneID
scene_var RUINS_OF_ALPH_HO_OH_CHAMBER, wRuinsOfAlphHoOhChamberSceneID
scene_var RUINS_OF_ALPH_KABUTO_CHAMBER, wRuinsOfAlphKabutoChamberSceneID
scene_var RUINS_OF_ALPH_OMANYTE_CHAMBER, wRuinsOfAlphOmanyteChamberSceneID
scene_var RUINS_OF_ALPH_AERODACTYL_CHAMBER, wRuinsOfAlphAerodactylChamberSceneID
scene_var RUINS_OF_ALPH_INNER_CHAMBER, wRuinsOfAlphInnerChamberSceneID
scene_var MAHOGANY_MART_1F, wMahoganyMart1FSceneID
scene_var TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FSceneID
scene_var TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FSceneID
scene_var TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FSceneID
scene_var GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID
scene_var SILVER_CAVE_ROOM_3, wSilverCaveRoom3SceneID ; unused
scene_var VICTORY_ROAD, wVictoryRoadSceneID
scene_var DRAGONS_DEN_B1F, wDragonsDenB1FSceneID
scene_var DRAGON_SHRINE, wDragonShrineSceneID
scene_var OLIVINE_PORT, wOlivinePortSceneID
scene_var VERMILION_PORT, wVermilionPortSceneID
scene_var FAST_SHIP_1F, wFastShip1FSceneID
scene_var FAST_SHIP_B1F, wFastShipB1FSceneID
scene_var MOUNT_MOON_SQUARE, wMountMoonSquareSceneID
scene_var MOBILE_TRADE_ROOM, wMobileTradeRoomSceneID
scene_var MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID
db -1 ; end

View File

@ -1,486 +1,3 @@
SECTION "Map Scripts 1", ROMX
INCLUDE "maps/GoldenrodGym.asm"
INCLUDE "maps/GoldenrodBikeShop.asm"
INCLUDE "maps/GoldenrodHappinessRater.asm"
INCLUDE "maps/BillsFamilysHouse.asm"
INCLUDE "maps/GoldenrodMagnetTrainStation.asm"
INCLUDE "maps/GoldenrodFlowerShop.asm"
INCLUDE "maps/GoldenrodPPSpeechHouse.asm"
INCLUDE "maps/GoldenrodNameRater.asm"
INCLUDE "maps/GoldenrodDeptStore1F.asm"
INCLUDE "maps/GoldenrodDeptStore2F.asm"
INCLUDE "maps/GoldenrodDeptStore3F.asm"
INCLUDE "maps/GoldenrodDeptStore4F.asm"
INCLUDE "maps/GoldenrodDeptStore5F.asm"
INCLUDE "maps/GoldenrodDeptStore6F.asm"
INCLUDE "maps/GoldenrodDeptStoreElevator.asm"
INCLUDE "maps/GoldenrodDeptStoreRoof.asm"
INCLUDE "maps/GoldenrodGameCorner.asm"
SECTION "Map Scripts 2", ROMX
INCLUDE "maps/RuinsOfAlphOutside.asm"
INCLUDE "maps/RuinsOfAlphHoOhChamber.asm"
INCLUDE "maps/RuinsOfAlphKabutoChamber.asm"
INCLUDE "maps/RuinsOfAlphOmanyteChamber.asm"
INCLUDE "maps/RuinsOfAlphAerodactylChamber.asm"
INCLUDE "maps/RuinsOfAlphInnerChamber.asm"
INCLUDE "maps/RuinsOfAlphResearchCenter.asm"
INCLUDE "maps/RuinsOfAlphHoOhItemRoom.asm"
INCLUDE "maps/RuinsOfAlphKabutoItemRoom.asm"
INCLUDE "maps/RuinsOfAlphOmanyteItemRoom.asm"
INCLUDE "maps/RuinsOfAlphAerodactylItemRoom.asm"
INCLUDE "maps/RuinsOfAlphHoOhWordRoom.asm"
INCLUDE "maps/RuinsOfAlphKabutoWordRoom.asm"
INCLUDE "maps/RuinsOfAlphOmanyteWordRoom.asm"
INCLUDE "maps/RuinsOfAlphAerodactylWordRoom.asm"
INCLUDE "maps/UnionCave1F.asm"
INCLUDE "maps/UnionCaveB1F.asm"
INCLUDE "maps/UnionCaveB2F.asm"
INCLUDE "maps/SlowpokeWellB1F.asm"
INCLUDE "maps/SlowpokeWellB2F.asm"
INCLUDE "maps/OlivineLighthouse1F.asm"
INCLUDE "maps/OlivineLighthouse2F.asm"
INCLUDE "maps/OlivineLighthouse3F.asm"
INCLUDE "maps/OlivineLighthouse4F.asm"
SECTION "Map Scripts 3", ROMX
INCLUDE "maps/NationalPark.asm"
INCLUDE "maps/NationalParkBugContest.asm"
INCLUDE "maps/RadioTower1F.asm"
INCLUDE "maps/RadioTower2F.asm"
INCLUDE "maps/RadioTower3F.asm"
INCLUDE "maps/RadioTower4F.asm"
SECTION "Map Scripts 4", ROMX
INCLUDE "maps/RadioTower5F.asm"
INCLUDE "maps/OlivineLighthouse5F.asm"
INCLUDE "maps/OlivineLighthouse6F.asm"
INCLUDE "maps/GoldenrodPokecenter1F.asm"
INCLUDE "maps/PokecomCenterAdminOfficeMobile.asm"
INCLUDE "maps/IlexForestAzaleaGate.asm"
INCLUDE "maps/Route34IlexForestGate.asm"
INCLUDE "maps/DayCare.asm"
SECTION "Map Scripts 5", ROMX
INCLUDE "maps/Route11.asm"
INCLUDE "maps/VioletMart.asm"
INCLUDE "maps/VioletGym.asm"
INCLUDE "maps/EarlsPokemonAcademy.asm"
INCLUDE "maps/VioletNicknameSpeechHouse.asm"
INCLUDE "maps/VioletPokecenter1F.asm"
INCLUDE "maps/VioletKylesHouse.asm"
INCLUDE "maps/Route32RuinsOfAlphGate.asm"
INCLUDE "maps/Route32Pokecenter1F.asm"
INCLUDE "maps/Route35GoldenrodGate.asm"
INCLUDE "maps/Route35NationalParkGate.asm"
INCLUDE "maps/Route36RuinsOfAlphGate.asm"
INCLUDE "maps/Route36NationalParkGate.asm"
SECTION "Map Scripts 6", ROMX
INCLUDE "maps/Route8.asm"
INCLUDE "maps/MahoganyMart1F.asm"
INCLUDE "maps/TeamRocketBaseB1F.asm"
INCLUDE "maps/TeamRocketBaseB2F.asm"
INCLUDE "maps/TeamRocketBaseB3F.asm"
INCLUDE "maps/IlexForest.asm"
SECTION "Map Scripts 7", ROMX
INCLUDE "maps/LakeOfRage.asm"
INCLUDE "maps/CeladonDeptStore1F.asm"
INCLUDE "maps/CeladonDeptStore2F.asm"
INCLUDE "maps/CeladonDeptStore3F.asm"
INCLUDE "maps/CeladonDeptStore4F.asm"
INCLUDE "maps/CeladonDeptStore5F.asm"
INCLUDE "maps/CeladonDeptStore6F.asm"
INCLUDE "maps/CeladonDeptStoreElevator.asm"
INCLUDE "maps/CeladonMansion1F.asm"
INCLUDE "maps/CeladonMansion2F.asm"
INCLUDE "maps/CeladonMansion3F.asm"
INCLUDE "maps/CeladonMansionRoof.asm"
INCLUDE "maps/CeladonMansionRoofHouse.asm"
INCLUDE "maps/CeladonPokecenter1F.asm"
INCLUDE "maps/CeladonPokecenter2FBeta.asm"
INCLUDE "maps/CeladonGameCorner.asm"
INCLUDE "maps/CeladonGameCornerPrizeRoom.asm"
INCLUDE "maps/CeladonGym.asm"
INCLUDE "maps/CeladonCafe.asm"
INCLUDE "maps/Route16FuchsiaSpeechHouse.asm"
INCLUDE "maps/Route16Gate.asm"
INCLUDE "maps/Route7SaffronGate.asm"
INCLUDE "maps/Route17Route18Gate.asm"
SECTION "Map Scripts 8", ROMX
INCLUDE "maps/DiglettsCave.asm"
INCLUDE "maps/MountMoon.asm"
INCLUDE "maps/UndergroundPath.asm"
INCLUDE "maps/RockTunnel1F.asm"
INCLUDE "maps/RockTunnelB1F.asm"
INCLUDE "maps/SafariZoneFuchsiaGateBeta.asm"
INCLUDE "maps/SafariZoneBeta.asm"
INCLUDE "maps/VictoryRoad.asm"
INCLUDE "maps/OlivinePort.asm"
INCLUDE "maps/VermilionPort.asm"
INCLUDE "maps/FastShip1F.asm"
INCLUDE "maps/FastShipCabins_NNW_NNE_NE.asm"
INCLUDE "maps/FastShipCabins_SW_SSW_NW.asm"
INCLUDE "maps/FastShipCabins_SE_SSE_CaptainsCabin.asm"
INCLUDE "maps/FastShipB1F.asm"
INCLUDE "maps/OlivinePortPassage.asm"
INCLUDE "maps/VermilionPortPassage.asm"
INCLUDE "maps/MountMoonSquare.asm"
INCLUDE "maps/MountMoonGiftShop.asm"
INCLUDE "maps/TinTowerRoof.asm"
SECTION "Map Scripts 9", ROMX
INCLUDE "maps/Route34.asm"
INCLUDE "maps/ElmsLab.asm"
INCLUDE "maps/PlayersHouse1F.asm"
INCLUDE "maps/PlayersHouse2F.asm"
INCLUDE "maps/PlayersNeighborsHouse.asm"
INCLUDE "maps/ElmsHouse.asm"
INCLUDE "maps/Route26HealHouse.asm"
INCLUDE "maps/DayOfWeekSiblingsHouse.asm"
INCLUDE "maps/Route27SandstormHouse.asm"
INCLUDE "maps/Route29Route46Gate.asm"
SECTION "Map Scripts 10", ROMX
INCLUDE "maps/Route22.asm"
INCLUDE "maps/GoldenrodUnderground.asm"
INCLUDE "maps/GoldenrodUndergroundSwitchRoomEntrances.asm"
INCLUDE "maps/GoldenrodDeptStoreB1F.asm"
INCLUDE "maps/GoldenrodUndergroundWarehouse.asm"
INCLUDE "maps/MountMortar1FOutside.asm"
INCLUDE "maps/MountMortar1FInside.asm"
INCLUDE "maps/MountMortar2FInside.asm"
INCLUDE "maps/MountMortarB1F.asm"
INCLUDE "maps/IcePath1F.asm"
INCLUDE "maps/IcePathB1F.asm"
INCLUDE "maps/IcePathB2FMahoganySide.asm"
INCLUDE "maps/IcePathB2FBlackthornSide.asm"
INCLUDE "maps/IcePathB3F.asm"
INCLUDE "maps/LavenderPokecenter1F.asm"
INCLUDE "maps/LavenderPokecenter2FBeta.asm"
INCLUDE "maps/MrFujisHouse.asm"
INCLUDE "maps/LavenderSpeechHouse.asm"
INCLUDE "maps/LavenderNameRater.asm"
INCLUDE "maps/LavenderMart.asm"
INCLUDE "maps/SoulHouse.asm"
INCLUDE "maps/LavRadioTower1F.asm"
INCLUDE "maps/Route8SaffronGate.asm"
INCLUDE "maps/Route12SuperRodHouse.asm"
SECTION "Map Scripts 11", ROMX
INCLUDE "maps/EcruteakTinTowerEntrance.asm"
INCLUDE "maps/WiseTriosRoom.asm"
INCLUDE "maps/EcruteakPokecenter1F.asm"
INCLUDE "maps/EcruteakLugiaSpeechHouse.asm"
INCLUDE "maps/DanceTheater.asm"
INCLUDE "maps/EcruteakMart.asm"
INCLUDE "maps/EcruteakGym.asm"
INCLUDE "maps/EcruteakItemfinderHouse.asm"
INCLUDE "maps/ViridianGym.asm"
INCLUDE "maps/ViridianNicknameSpeechHouse.asm"
INCLUDE "maps/TrainerHouse1F.asm"
INCLUDE "maps/TrainerHouseB1F.asm"
INCLUDE "maps/ViridianMart.asm"
INCLUDE "maps/ViridianPokecenter1F.asm"
INCLUDE "maps/ViridianPokecenter2FBeta.asm"
INCLUDE "maps/Route2NuggetHouse.asm"
INCLUDE "maps/Route2Gate.asm"
INCLUDE "maps/VictoryRoadGate.asm"
SECTION "Map Scripts 12", ROMX
INCLUDE "maps/OlivinePokecenter1F.asm"
INCLUDE "maps/OlivineGym.asm"
INCLUDE "maps/OlivineTimsHouse.asm"
INCLUDE "maps/OlivineHouseBeta.asm"
INCLUDE "maps/OlivinePunishmentSpeechHouse.asm"
INCLUDE "maps/OlivineGoodRodHouse.asm"
INCLUDE "maps/OlivineCafe.asm"
INCLUDE "maps/OlivineMart.asm"
INCLUDE "maps/Route38EcruteakGate.asm"
INCLUDE "maps/Route39Barn.asm"
INCLUDE "maps/Route39Farmhouse.asm"
INCLUDE "maps/ManiasHouse.asm"
INCLUDE "maps/CianwoodGym.asm"
INCLUDE "maps/CianwoodPokecenter1F.asm"
INCLUDE "maps/CianwoodPharmacy.asm"
INCLUDE "maps/CianwoodPhotoStudio.asm"
INCLUDE "maps/CianwoodLugiaSpeechHouse.asm"
INCLUDE "maps/PokeSeersHouse.asm"
INCLUDE "maps/BattleTower1F.asm"
INCLUDE "maps/BattleTowerBattleRoom.asm"
INCLUDE "maps/BattleTowerElevator.asm"
INCLUDE "maps/BattleTowerHallway.asm"
INCLUDE "maps/Route40BattleTowerGate.asm"
INCLUDE "maps/BattleTowerOutside.asm"
SECTION "Map Scripts 13", ROMX
INCLUDE "maps/IndigoPlateauPokecenter1F.asm"
INCLUDE "maps/WillsRoom.asm"
INCLUDE "maps/KogasRoom.asm"
INCLUDE "maps/BrunosRoom.asm"
INCLUDE "maps/KarensRoom.asm"
INCLUDE "maps/LancesRoom.asm"
INCLUDE "maps/HallOfFame.asm"
SECTION "Map Scripts 14", ROMX
INCLUDE "maps/CeruleanCity.asm"
INCLUDE "maps/SproutTower1F.asm"
INCLUDE "maps/SproutTower2F.asm"
INCLUDE "maps/SproutTower3F.asm"
INCLUDE "maps/TinTower1F.asm"
INCLUDE "maps/TinTower2F.asm"
INCLUDE "maps/TinTower3F.asm"
INCLUDE "maps/TinTower4F.asm"
INCLUDE "maps/TinTower5F.asm"
INCLUDE "maps/TinTower6F.asm"
INCLUDE "maps/TinTower7F.asm"
INCLUDE "maps/TinTower8F.asm"
INCLUDE "maps/TinTower9F.asm"
INCLUDE "maps/BurnedTower1F.asm"
INCLUDE "maps/BurnedTowerB1F.asm"
SECTION "Map Scripts 15", ROMX
INCLUDE "maps/CeruleanGymBadgeSpeechHouse.asm"
INCLUDE "maps/CeruleanPoliceStation.asm"
INCLUDE "maps/CeruleanTradeSpeechHouse.asm"
INCLUDE "maps/CeruleanPokecenter1F.asm"
INCLUDE "maps/CeruleanPokecenter2FBeta.asm"
INCLUDE "maps/CeruleanGym.asm"
INCLUDE "maps/CeruleanMart.asm"
INCLUDE "maps/Route10Pokecenter1F.asm"
INCLUDE "maps/Route10Pokecenter2FBeta.asm"
INCLUDE "maps/PowerPlant.asm"
INCLUDE "maps/BillsHouse.asm"
INCLUDE "maps/FightingDojo.asm"
INCLUDE "maps/SaffronGym.asm"
INCLUDE "maps/SaffronMart.asm"
INCLUDE "maps/SaffronPokecenter1F.asm"
INCLUDE "maps/SaffronPokecenter2FBeta.asm"
INCLUDE "maps/MrPsychicsHouse.asm"
INCLUDE "maps/SaffronMagnetTrainStation.asm"
INCLUDE "maps/SilphCo1F.asm"
INCLUDE "maps/CopycatsHouse1F.asm"
INCLUDE "maps/CopycatsHouse2F.asm"
INCLUDE "maps/Route5UndergroundPathEntrance.asm"
INCLUDE "maps/Route5SaffronGate.asm"
INCLUDE "maps/Route5CleanseTagHouse.asm"
SECTION "Map Scripts 16", ROMX
INCLUDE "maps/PewterCity.asm"
INCLUDE "maps/WhirlIslandNW.asm"
INCLUDE "maps/WhirlIslandNE.asm"
INCLUDE "maps/WhirlIslandSW.asm"
INCLUDE "maps/WhirlIslandCave.asm"
INCLUDE "maps/WhirlIslandSE.asm"
INCLUDE "maps/WhirlIslandB1F.asm"
INCLUDE "maps/WhirlIslandB2F.asm"
INCLUDE "maps/WhirlIslandLugiaChamber.asm"
INCLUDE "maps/SilverCaveRoom1.asm"
INCLUDE "maps/SilverCaveRoom2.asm"
INCLUDE "maps/SilverCaveRoom3.asm"
INCLUDE "maps/SilverCaveItemRooms.asm"
INCLUDE "maps/DarkCaveVioletEntrance.asm"
INCLUDE "maps/DarkCaveBlackthornEntrance.asm"
INCLUDE "maps/DragonsDen1F.asm"
INCLUDE "maps/DragonsDenB1F.asm"
INCLUDE "maps/DragonShrine.asm"
INCLUDE "maps/TohjoFalls.asm"
INCLUDE "maps/AzaleaPokecenter1F.asm"
INCLUDE "maps/CharcoalKiln.asm"
INCLUDE "maps/AzaleaMart.asm"
INCLUDE "maps/KurtsHouse.asm"
INCLUDE "maps/AzaleaGym.asm"
SECTION "Map Scripts 17", ROMX
INCLUDE "maps/MahoganyTown.asm"
INCLUDE "maps/Route32.asm"
INCLUDE "maps/VermilionFishingSpeechHouse.asm"
INCLUDE "maps/VermilionPokecenter1F.asm"
INCLUDE "maps/VermilionPokecenter2FBeta.asm"
INCLUDE "maps/PokemonFanClub.asm"
INCLUDE "maps/VermilionMagnetTrainSpeechHouse.asm"
INCLUDE "maps/VermilionMart.asm"
INCLUDE "maps/VermilionDiglettsCaveSpeechHouse.asm"
INCLUDE "maps/VermilionGym.asm"
INCLUDE "maps/Route6SaffronGate.asm"
INCLUDE "maps/Route6UndergroundPathEntrance.asm"
INCLUDE "maps/Pokecenter2F.asm"
INCLUDE "maps/TradeCenter.asm"
INCLUDE "maps/Colosseum.asm"
INCLUDE "maps/TimeCapsule.asm"
INCLUDE "maps/MobileTradeRoom.asm"
INCLUDE "maps/MobileBattleRoom.asm"
SECTION "Map Scripts 18", ROMX
INCLUDE "maps/Route36.asm"
INCLUDE "maps/FuchsiaCity.asm"
INCLUDE "maps/BlackthornGym1F.asm"
INCLUDE "maps/BlackthornGym2F.asm"
INCLUDE "maps/BlackthornDragonSpeechHouse.asm"
INCLUDE "maps/BlackthornEmysHouse.asm"
INCLUDE "maps/BlackthornMart.asm"
INCLUDE "maps/BlackthornPokecenter1F.asm"
INCLUDE "maps/MoveDeletersHouse.asm"
INCLUDE "maps/FuchsiaMart.asm"
INCLUDE "maps/SafariZoneMainOffice.asm"
INCLUDE "maps/FuchsiaGym.asm"
INCLUDE "maps/BillsBrothersHouse.asm"
INCLUDE "maps/FuchsiaPokecenter1F.asm"
INCLUDE "maps/FuchsiaPokecenter2FBeta.asm"
INCLUDE "maps/SafariZoneWardensHome.asm"
INCLUDE "maps/Route15FuchsiaGate.asm"
INCLUDE "maps/CherrygroveMart.asm"
INCLUDE "maps/CherrygrovePokecenter1F.asm"
INCLUDE "maps/CherrygroveGymSpeechHouse.asm"
INCLUDE "maps/GuideGentsHouse.asm"
INCLUDE "maps/CherrygroveEvolutionSpeechHouse.asm"
INCLUDE "maps/Route30BerryHouse.asm"
INCLUDE "maps/MrPokemonsHouse.asm"
INCLUDE "maps/Route31VioletGate.asm"
SECTION "Map Scripts 19", ROMX
INCLUDE "maps/AzaleaTown.asm"
INCLUDE "maps/GoldenrodCity.asm"
INCLUDE "maps/SaffronCity.asm"
INCLUDE "maps/MahoganyRedGyaradosSpeechHouse.asm"
INCLUDE "maps/MahoganyGym.asm"
INCLUDE "maps/MahoganyPokecenter1F.asm"
INCLUDE "maps/Route42EcruteakGate.asm"
INCLUDE "maps/LakeOfRageHiddenPowerHouse.asm"
INCLUDE "maps/LakeOfRageMagikarpHouse.asm"
INCLUDE "maps/Route43MahoganyGate.asm"
INCLUDE "maps/Route43Gate.asm"
INCLUDE "maps/RedsHouse1F.asm"
INCLUDE "maps/RedsHouse2F.asm"
INCLUDE "maps/BluesHouse.asm"
INCLUDE "maps/OaksLab.asm"
SECTION "Map Scripts 20", ROMX
INCLUDE "maps/CherrygroveCity.asm"
INCLUDE "maps/Route35.asm"
INCLUDE "maps/Route43.asm"
INCLUDE "maps/Route44.asm"
INCLUDE "maps/Route45.asm"
INCLUDE "maps/Route19.asm"
INCLUDE "maps/Route25.asm"
SECTION "Map Scripts 21", ROMX
INCLUDE "maps/CianwoodCity.asm"
INCLUDE "maps/Route27.asm"
INCLUDE "maps/Route29.asm"
INCLUDE "maps/Route30.asm"
INCLUDE "maps/Route38.asm"
INCLUDE "maps/Route13.asm"
INCLUDE "maps/PewterNidoranSpeechHouse.asm"
INCLUDE "maps/PewterGym.asm"
INCLUDE "maps/PewterMart.asm"
INCLUDE "maps/PewterPokecenter1F.asm"
INCLUDE "maps/PewterPokecenter2FBeta.asm"
INCLUDE "maps/PewterSnoozeSpeechHouse.asm"
SECTION "Map Scripts 22", ROMX
INCLUDE "maps/EcruteakCity.asm"
INCLUDE "maps/BlackthornCity.asm"
INCLUDE "maps/Route26.asm"
INCLUDE "maps/Route28.asm"
INCLUDE "maps/Route31.asm"
INCLUDE "maps/Route39.asm"
INCLUDE "maps/Route40.asm"
INCLUDE "maps/Route41.asm"
INCLUDE "maps/Route12.asm"
SECTION "Map Scripts 23", ROMX
INCLUDE "maps/NewBarkTown.asm"
INCLUDE "maps/VioletCity.asm"
INCLUDE "maps/OlivineCity.asm"
INCLUDE "maps/Route37.asm"
INCLUDE "maps/Route42.asm"
INCLUDE "maps/Route46.asm"
INCLUDE "maps/ViridianCity.asm"
INCLUDE "maps/CeladonCity.asm"
INCLUDE "maps/Route15.asm"
INCLUDE "maps/VermilionCity.asm"
INCLUDE "maps/Route9.asm"
INCLUDE "maps/CinnabarPokecenter1F.asm"
INCLUDE "maps/CinnabarPokecenter2FBeta.asm"
INCLUDE "maps/Route19FuchsiaGate.asm"
INCLUDE "maps/SeafoamGym.asm"
SECTION "Map Scripts 24", ROMX
INCLUDE "maps/Route33.asm"
INCLUDE "maps/Route2.asm"
INCLUDE "maps/Route1.asm"
INCLUDE "maps/PalletTown.asm"
INCLUDE "maps/Route21.asm"
INCLUDE "maps/CinnabarIsland.asm"
INCLUDE "maps/Route20.asm"
INCLUDE "maps/Route18.asm"
INCLUDE "maps/Route17.asm"
INCLUDE "maps/Route16.asm"
INCLUDE "maps/Route7.asm"
INCLUDE "maps/Route14.asm"
INCLUDE "maps/LavenderTown.asm"
INCLUDE "maps/Route6.asm"
INCLUDE "maps/Route5.asm"
INCLUDE "maps/Route24.asm"
INCLUDE "maps/Route3.asm"
INCLUDE "maps/Route4.asm"
INCLUDE "maps/Route10South.asm"
INCLUDE "maps/Route23.asm"
INCLUDE "maps/SilverCavePokecenter1F.asm"
INCLUDE "maps/Route28SteelWingHouse.asm"
SECTION "Map Scripts 25", ROMX
INCLUDE "maps/SilverCaveOutside.asm"
INCLUDE "maps/Route10North.asm"
INCLUDE "maps/Level1_Map1.asm"

View File

@ -5,29 +5,4 @@ MapGroupRoofSGBPalInds:
table_width 1, MapGroupRoofSGBPalInds
db PREDEFPAL_ROUTES
db PREDEFPAL_OLIVINE
db PREDEFPAL_MAHOGANY
db PREDEFPAL_DUNGEONS
db PREDEFPAL_ECRUTEAK
db PREDEFPAL_BLACKTHORN
db PREDEFPAL_CINNABAR
db PREDEFPAL_CERULEAN
db PREDEFPAL_AZALEA
db PREDEFPAL_LAKE_OF_RAGE
db PREDEFPAL_VIOLET
db PREDEFPAL_GOLDENROD
db PREDEFPAL_VERMILION
db PREDEFPAL_PALLET
db PREDEFPAL_PEWTER
db PREDEFPAL_VERMILION
db PREDEFPAL_INDIGO
db PREDEFPAL_FUCHSIA
db PREDEFPAL_LAVENDER
db PREDEFPAL_SILVER_CAVE
db PREDEFPAL_FUCHSIA
db PREDEFPAL_CELADON
db PREDEFPAL_CIANWOOD
db PREDEFPAL_VIRIDIAN
db PREDEFPAL_NEW_BARK
db PREDEFPAL_SAFFRON
db PREDEFPAL_CHERRYGROVE
assert_table_length NUM_MAP_GROUPS + 1

View File

@ -5,39 +5,11 @@ MACRO spawn
ENDM
SpawnPoints:
; entries correspond to SPAWN_* constants
; entries correspond to SPAWN_* constants (see constants/map_data_constants.asm)
table_width 4, SpawnPoints
spawn PLAYERS_HOUSE_2F, 3, 3
spawn VIRIDIAN_POKECENTER_1F, 5, 3
spawn PALLET_TOWN, 5, 6
spawn VIRIDIAN_CITY, 23, 26
spawn PEWTER_CITY, 13, 26
spawn CERULEAN_CITY, 19, 22
spawn ROUTE_10_NORTH, 11, 2
spawn VERMILION_CITY, 9, 6
spawn LAVENDER_TOWN, 5, 6
spawn SAFFRON_CITY, 9, 30
spawn CELADON_CITY, 29, 10
spawn FUCHSIA_CITY, 19, 28
spawn CINNABAR_ISLAND, 11, 12
spawn ROUTE_23, 9, 6
spawn NEW_BARK_TOWN, 13, 6
spawn CHERRYGROVE_CITY, 29, 4
spawn VIOLET_CITY, 31, 26
spawn ROUTE_32, 11, 74
spawn AZALEA_TOWN, 15, 10
spawn CIANWOOD_CITY, 23, 44
spawn GOLDENROD_CITY, 15, 28
spawn OLIVINE_CITY, 13, 22
spawn ECRUTEAK_CITY, 23, 28
spawn MAHOGANY_TOWN, 15, 14
spawn LAKE_OF_RAGE, 21, 29
spawn BLACKTHORN_CITY, 21, 30
spawn SILVER_CAVE_OUTSIDE, 23, 20
spawn FAST_SHIP_CABINS_SW_SSW_NW, 6, 2
spawn LEVEL_1_MAP_1, 3, 3 ; SPAWN_LEVEL_1
; spawn LEVEL_2_MAP_1, 5, 3 ; SPAWN_LEVEL_2
spawn N_A, -1, -1

View File

@ -12,41 +12,41 @@ PhoneContacts:
; entries correspond to PHONE_* constants
table_width PHONE_CONTACT_SIZE, PhoneContacts
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONECONTACT_MOM, PLAYERS_HOUSE_1F, ANYTIME, MomPhoneCalleeScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONECONTACT_BILL, N_A, ANYTIME, BillPhoneCalleeScript, 0, BillPhoneCallerScript
phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, ANYTIME, ElmPhoneCalleeScript, 0, ElmPhoneCallerScript
phone SCHOOLBOY, JACK1, NATIONAL_PARK, ANYTIME, JackPhoneCalleeScript, ANYTIME, JackPhoneCallerScript
phone POKEFANF, BEVERLY1, NATIONAL_PARK, ANYTIME, BeverlyPhoneCalleeScript, ANYTIME, BeverlyPhoneCallerScript
phone SAILOR, HUEY1, OLIVINE_LIGHTHOUSE_2F, ANYTIME, HueyPhoneCalleeScript, ANYTIME, HueyPhoneCallerScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone COOLTRAINERM, GAVEN3, ROUTE_26, ANYTIME, GavenPhoneCalleeScript, ANYTIME, GavenPhoneCallerScript
phone COOLTRAINERF, BETH1, ROUTE_26, ANYTIME, BethPhoneCalleeScript, ANYTIME, BethPhoneCallerScript
phone BIRD_KEEPER, JOSE2, ROUTE_27, ANYTIME, JosePhoneCalleeScript, ANYTIME, JosePhoneCallerScript
phone COOLTRAINERF, REENA1, ROUTE_27, ANYTIME, ReenaPhoneCalleeScript, ANYTIME, ReenaPhoneCallerScript
phone YOUNGSTER, JOEY1, ROUTE_30, ANYTIME, JoeyPhoneCalleeScript, ANYTIME, JoeyPhoneCallerScript
phone BUG_CATCHER, WADE1, ROUTE_31, ANYTIME, WadePhoneCalleeScript, ANYTIME, WadePhoneCallerScript
phone FISHER, RALPH1, ROUTE_32, ANYTIME, RalphPhoneCalleeScript, ANYTIME, RalphPhoneCallerScript
phone PICNICKER, LIZ1, ROUTE_32, ANYTIME, LizPhoneCalleeScript, ANYTIME, LizPhoneCallerScript
phone HIKER, ANTHONY2, ROUTE_33, ANYTIME, AnthonyPhoneCalleeScript, ANYTIME, AnthonyPhoneCallerScript
phone CAMPER, TODD1, ROUTE_34, ANYTIME, ToddPhoneCalleeScript, ANYTIME, ToddPhoneCallerScript
phone PICNICKER, GINA1, ROUTE_34, ANYTIME, GinaPhoneCalleeScript, ANYTIME, GinaPhoneCallerScript
phone JUGGLER, IRWIN1, ROUTE_35, ANYTIME, IrwinPhoneCalleeScript, ANYTIME, IrwinPhoneCallerScript
phone BUG_CATCHER, ARNIE1, ROUTE_35, ANYTIME, ArniePhoneCalleeScript, ANYTIME, ArniePhoneCallerScript
phone SCHOOLBOY, ALAN1, ROUTE_36, ANYTIME, AlanPhoneCalleeScript, ANYTIME, AlanPhoneCallerScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone LASS, DANA1, ROUTE_38, ANYTIME, DanaPhoneCalleeScript, ANYTIME, DanaPhoneCallerScript
phone SCHOOLBOY, CHAD1, ROUTE_38, ANYTIME, ChadPhoneCalleeScript, ANYTIME, ChadPhoneCallerScript
phone POKEFANM, DEREK1, ROUTE_39, ANYTIME, DerekPhoneCalleeScript, ANYTIME, DerekPhoneCallerScript
phone FISHER, TULLY1, ROUTE_42, ANYTIME, TullyPhoneCalleeScript, ANYTIME, TullyPhoneCallerScript
phone POKEMANIAC, BRENT1, ROUTE_43, ANYTIME, BrentPhoneCalleeScript, ANYTIME, BrentPhoneCallerScript
phone PICNICKER, TIFFANY3, ROUTE_43, ANYTIME, TiffanyPhoneCalleeScript, ANYTIME, TiffanyPhoneCallerScript
phone BIRD_KEEPER, VANCE1, ROUTE_44, ANYTIME, VancePhoneCalleeScript, ANYTIME, VancePhoneCallerScript
phone FISHER, WILTON1, ROUTE_44, ANYTIME, WiltonPhoneCalleeScript, ANYTIME, WiltonPhoneCallerScript
phone BLACKBELT_T, KENJI3, ROUTE_45, ANYTIME, KenjiPhoneCalleeScript, ANYTIME, KenjiPhoneCallerScript
phone HIKER, PARRY1, ROUTE_45, ANYTIME, ParryPhoneCalleeScript, ANYTIME, ParryPhoneCallerScript
phone PICNICKER, ERIN1, ROUTE_46, ANYTIME, ErinPhoneCalleeScript, ANYTIME, ErinPhoneCallerScript
phone TRAINER_NONE, PHONECONTACT_BUENA, GOLDENROD_DEPT_STORE_ROOF, ANYTIME, BuenaPhoneCalleeScript, ANYTIME, BuenaPhoneCallerScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
assert_table_length NUM_PHONE_CONTACTS + 1

View File

@ -8,12 +8,5 @@ ENDM
SpecialPhoneCallList:
; entries correspond to SPECIALCALL_* constants
table_width SPECIALCALL_SIZE, SpecialPhoneCallList
specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript
specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript
specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript
specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript
specialcall SpecialCallWhereverYouAre, PHONECONTACT_ELM, ElmPhoneCallerScript
specialcall SpecialCallWhereverYouAre, PHONECONTACT_BIKESHOP, BikeShopPhoneCallerScript
specialcall SpecialCallWhereverYouAre, PHONECONTACT_MOM, MomPhoneLectureScript
specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript
; specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript
assert_table_length NUM_SPECIALCALLS

Some files were not shown because too many files have changed in this diff Show More