ref: 52605b764a6ecfb781ca9e70d51dad909dabe7c3
parent: f53d65c536096213b6826765f81a0f436c88fe72
author: PikalaxALT <[email protected]>
date: Sat Oct 17 16:49:34 EDT 2015
Add commented numbers to map/group constants
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -5268,7 +5268,7 @@
call Function3df2c
call WaitBGMap
call Function309d
- call Function1fbf
+ call ResetTextRelatedRAM
call Function3ee27
and a
ret
@@ -5279,7 +5279,7 @@
ld a, [wd0ee]
and $c0
ld [wd0ee], a
- call Function1fbf
+ call ResetTextRelatedRAM
call Function32f9
scf
ret
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -6,445 +6,472 @@
; map group ids
const_def
- newgroup
- mapgroup OLIVINE_POKECENTER_1F, 4, 5
- mapgroup OLIVINE_GYM, 8, 5
- mapgroup OLIVINE_VOLTORB_HOUSE, 4, 4
- mapgroup OLIVINE_HOUSE_BETA, 4, 4
- mapgroup OLIVINE_PUNISHMENT_SPEECH_HOUSE, 4, 4
- mapgroup OLIVINE_GOOD_ROD_HOUSE, 4, 4
- mapgroup OLIVINE_CAFE, 4, 4
- mapgroup OLIVINE_MART, 4, 6
- mapgroup ROUTE_38_ECRUTEAK_GATE, 4, 5
- mapgroup ROUTE_39_BARN, 4, 4
- mapgroup ROUTE_39_FARMHOUSE, 4, 4
- mapgroup ROUTE_38, 9, 20
- mapgroup ROUTE_39, 18, 10
- mapgroup OLIVINE_CITY, 18, 20
+ newgroup ; 1
- newgroup
- mapgroup MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 4, 4
- mapgroup MAHOGANY_GYM, 9, 5
- mapgroup MAHOGANY_POKECENTER_1F, 4, 5
- mapgroup ROUTE_42_ECRUTEAK_GATE, 4, 5
- mapgroup ROUTE_42, 9, 30
- mapgroup ROUTE_44, 9, 30
- mapgroup MAHOGANY_TOWN, 9, 10
+ mapgroup OLIVINE_POKECENTER_1F, 4, 5 ; 1
+ mapgroup OLIVINE_GYM, 8, 5 ; 2
+ mapgroup OLIVINE_VOLTORB_HOUSE, 4, 4 ; 3
+ mapgroup OLIVINE_HOUSE_BETA, 4, 4 ; 4
+ mapgroup OLIVINE_PUNISHMENT_SPEECH_HOUSE, 4, 4 ; 5
+ mapgroup OLIVINE_GOOD_ROD_HOUSE, 4, 4 ; 6
+ mapgroup OLIVINE_CAFE, 4, 4 ; 7
+ mapgroup OLIVINE_MART, 4, 6 ; 8
+ mapgroup ROUTE_38_ECRUTEAK_GATE, 4, 5 ; 9
+ mapgroup ROUTE_39_BARN, 4, 4 ; 10
+ mapgroup ROUTE_39_FARMHOUSE, 4, 4 ; 11
+ mapgroup ROUTE_38, 9, 20 ; 12
+ mapgroup ROUTE_39, 18, 10 ; 13
+ mapgroup OLIVINE_CITY, 18, 20 ; 14
- newgroup
- mapgroup SPROUT_TOWER_1F, 8, 10
- mapgroup SPROUT_TOWER_2F, 8, 10
- mapgroup SPROUT_TOWER_3F, 8, 10
- mapgroup TIN_TOWER_1F, 9, 10
- mapgroup TIN_TOWER_2F, 9, 10
- mapgroup TIN_TOWER_3F, 9, 10
- mapgroup TIN_TOWER_4F, 9, 10
- mapgroup TIN_TOWER_5F, 9, 10
- mapgroup TIN_TOWER_6F, 9, 10
- mapgroup TIN_TOWER_7F, 9, 10
- mapgroup TIN_TOWER_8F, 9, 10
- mapgroup TIN_TOWER_9F, 9, 10
- mapgroup BURNED_TOWER_1F, 9, 10
- mapgroup BURNED_TOWER_B1F, 9, 10
- mapgroup NATIONAL_PARK, 27, 20
- mapgroup NATIONAL_PARK_BUG_CONTEST, 27, 20
- mapgroup RADIO_TOWER_1F, 4, 9
- mapgroup RADIO_TOWER_2F, 4, 9
- mapgroup RADIO_TOWER_3F, 4, 9
- mapgroup RADIO_TOWER_4F, 4, 9
- mapgroup RADIO_TOWER_5F, 4, 9
- mapgroup RUINS_OF_ALPH_OUTSIDE, 18, 10
- mapgroup RUINS_OF_ALPH_HO_OH_CHAMBER, 5, 4
- mapgroup RUINS_OF_ALPH_KABUTO_CHAMBER, 5, 4
- mapgroup RUINS_OF_ALPH_OMANYTE_CHAMBER, 5, 4
- mapgroup RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5, 4
- mapgroup RUINS_OF_ALPH_INNER_CHAMBER, 14, 10
- mapgroup RUINS_OF_ALPH_RESEARCH_CENTER, 4, 4
- mapgroup RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 5, 4
- mapgroup RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 5, 4
- mapgroup RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 5, 4
- mapgroup RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 5, 4
- mapgroup RUINS_OF_ALPH_HO_OH_WORD_ROOM, 12, 10
- mapgroup RUINS_OF_ALPH_KABUTO_WORD_ROOM, 7, 10
- mapgroup RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 8, 10
- mapgroup RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 7, 10
- mapgroup UNION_CAVE_1F, 18, 10
- mapgroup UNION_CAVE_B1F, 18, 10
- mapgroup UNION_CAVE_B2F, 18, 10
- mapgroup SLOWPOKE_WELL_B1F, 9, 10
- mapgroup SLOWPOKE_WELL_B2F, 9, 10
- mapgroup OLIVINE_LIGHTHOUSE_1F, 9, 10
- mapgroup OLIVINE_LIGHTHOUSE_2F, 9, 10
- mapgroup OLIVINE_LIGHTHOUSE_3F, 9, 10
- mapgroup OLIVINE_LIGHTHOUSE_4F, 9, 10
- mapgroup OLIVINE_LIGHTHOUSE_5F, 9, 10
- mapgroup OLIVINE_LIGHTHOUSE_6F, 9, 10
- mapgroup MAHOGANY_MART_1F, 4, 4
- mapgroup TEAM_ROCKET_BASE_B1F, 9, 15
- mapgroup TEAM_ROCKET_BASE_B2F, 9, 15
- mapgroup TEAM_ROCKET_BASE_B3F, 9, 15
- mapgroup ILEX_FOREST, 27, 15
- mapgroup WAREHOUSE_ENTRANCE, 18, 15
- mapgroup UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, 18, 15
- mapgroup GOLDENROD_DEPT_STORE_B1F, 9, 10
- mapgroup UNDERGROUND_WAREHOUSE, 9, 10
- mapgroup MOUNT_MORTAR_1F_OUTSIDE, 18, 20
- mapgroup MOUNT_MORTAR_1F_INSIDE, 27, 20
- mapgroup MOUNT_MORTAR_2F_INSIDE, 18, 20
- mapgroup MOUNT_MORTAR_B1F, 18, 20
- mapgroup ICE_PATH_1F, 18, 20
- mapgroup ICE_PATH_B1F, 18, 10
- mapgroup ICE_PATH_B2F_MAHOGANY_SIDE, 9, 10
- mapgroup ICE_PATH_B2F_BLACKTHORN_SIDE, 9, 5
- mapgroup ICE_PATH_B3F, 9, 10
- mapgroup WHIRL_ISLAND_NW, 9, 5
- mapgroup WHIRL_ISLAND_NE, 9, 10
- mapgroup WHIRL_ISLAND_SW, 9, 10
- mapgroup WHIRL_ISLAND_CAVE, 9, 5
- mapgroup WHIRL_ISLAND_SE, 9, 5
- mapgroup WHIRL_ISLAND_B1F, 18, 20
- mapgroup WHIRL_ISLAND_B2F, 18, 10
- mapgroup WHIRL_ISLAND_LUGIA_CHAMBER, 9, 10
- mapgroup SILVER_CAVE_ROOM_1, 18, 10
- mapgroup SILVER_CAVE_ROOM_2, 18, 15
- mapgroup SILVER_CAVE_ROOM_3, 18, 10
- mapgroup SILVER_CAVE_ITEM_ROOMS, 9, 10
- mapgroup DARK_CAVE_VIOLET_ENTRANCE, 18, 20
- mapgroup DARK_CAVE_BLACKTHORN_ENTRANCE, 18, 15
- mapgroup DRAGONS_DEN_1F, 9, 5
- mapgroup DRAGONS_DEN_B1F, 18, 20
- mapgroup DRAGON_SHRINE, 5, 5
- mapgroup TOHJO_FALLS, 9, 15
- mapgroup DIGLETTS_CAVE, 18, 10
- mapgroup MOUNT_MOON, 9, 15
- mapgroup UNDERGROUND, 14, 3
- mapgroup ROCK_TUNNEL_1F, 18, 15
- mapgroup ROCK_TUNNEL_B1F, 18, 15
- mapgroup SAFARI_ZONE_FUCHSIA_GATE_BETA, 4, 5
- mapgroup SAFARI_ZONE_BETA, 18, 10
- mapgroup VICTORY_ROAD, 36, 10
+ newgroup ; 2
- newgroup
- mapgroup ECRUTEAK_HOUSE, 9, 10
- mapgroup WISE_TRIOS_ROOM, 4, 4
- mapgroup ECRUTEAK_POKECENTER_1F, 4, 5
- mapgroup ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4
- mapgroup DANCE_THEATRE, 7, 6
- mapgroup ECRUTEAK_MART, 4, 6
- mapgroup ECRUTEAK_GYM, 9, 5
- mapgroup ECRUTEAK_ITEMFINDER_HOUSE, 4, 4
- mapgroup ECRUTEAK_CITY, 18, 20
+ mapgroup MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 4, 4 ; 1
+ mapgroup MAHOGANY_GYM, 9, 5 ; 2
+ mapgroup MAHOGANY_POKECENTER_1F, 4, 5 ; 3
+ mapgroup ROUTE_42_ECRUTEAK_GATE, 4, 5 ; 4
+ mapgroup ROUTE_42, 9, 30 ; 5
+ mapgroup ROUTE_44, 9, 30 ; 6
+ mapgroup MAHOGANY_TOWN, 9, 10 ; 7
- newgroup
- mapgroup BLACKTHORN_GYM_1F, 9, 5
- mapgroup BLACKTHORN_GYM_2F, 9, 5
- mapgroup BLACKTHORN_DRAGON_SPEECH_HOUSE, 4, 4
- mapgroup BLACKTHORN_DODRIO_TRADE_HOUSE, 4, 4
- mapgroup BLACKTHORN_MART, 4, 6
- mapgroup BLACKTHORN_POKECENTER_1F, 4, 5
- mapgroup MOVE_DELETERS_HOUSE, 4, 4
- mapgroup ROUTE_45, 45, 10
- mapgroup ROUTE_46, 18, 10
- mapgroup BLACKTHORN_CITY, 18, 20
+ newgroup ; 3
- newgroup
- mapgroup CINNABAR_POKECENTER_1F, 4, 5
- mapgroup CINNABAR_POKECENTER_2F_BETA, 4, 8
- mapgroup ROUTE_19___FUCHSIA_GATE, 4, 5
- mapgroup SEAFOAM_GYM, 4, 5
- mapgroup ROUTE_19, 18, 10
- mapgroup ROUTE_20, 9, 30
- mapgroup ROUTE_21, 18, 10
- mapgroup CINNABAR_ISLAND, 9, 10
+ mapgroup SPROUT_TOWER_1F, 8, 10 ; 1
+ mapgroup SPROUT_TOWER_2F, 8, 10 ; 2
+ mapgroup SPROUT_TOWER_3F, 8, 10 ; 3
+ mapgroup TIN_TOWER_1F, 9, 10 ; 4
+ mapgroup TIN_TOWER_2F, 9, 10 ; 5
+ mapgroup TIN_TOWER_3F, 9, 10 ; 6
+ mapgroup TIN_TOWER_4F, 9, 10 ; 7
+ mapgroup TIN_TOWER_5F, 9, 10 ; 8
+ mapgroup TIN_TOWER_6F, 9, 10 ; 9
+ mapgroup TIN_TOWER_7F, 9, 10 ; 10
+ mapgroup TIN_TOWER_8F, 9, 10 ; 11
+ mapgroup TIN_TOWER_9F, 9, 10 ; 12
+ mapgroup BURNED_TOWER_1F, 9, 10 ; 13
+ mapgroup BURNED_TOWER_B1F, 9, 10 ; 14
+ mapgroup NATIONAL_PARK, 27, 20 ; 15
+ mapgroup NATIONAL_PARK_BUG_CONTEST, 27, 20 ; 16
+ mapgroup RADIO_TOWER_1F, 4, 9 ; 17
+ mapgroup RADIO_TOWER_2F, 4, 9 ; 18
+ mapgroup RADIO_TOWER_3F, 4, 9 ; 19
+ mapgroup RADIO_TOWER_4F, 4, 9 ; 20
+ mapgroup RADIO_TOWER_5F, 4, 9 ; 21
+ mapgroup RUINS_OF_ALPH_OUTSIDE, 18, 10 ; 22
+ mapgroup RUINS_OF_ALPH_HO_OH_CHAMBER, 5, 4 ; 23
+ mapgroup RUINS_OF_ALPH_KABUTO_CHAMBER, 5, 4 ; 24
+ mapgroup RUINS_OF_ALPH_OMANYTE_CHAMBER, 5, 4 ; 25
+ mapgroup RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5, 4 ; 26
+ mapgroup RUINS_OF_ALPH_INNER_CHAMBER, 14, 10 ; 27
+ mapgroup RUINS_OF_ALPH_RESEARCH_CENTER, 4, 4 ; 28
+ mapgroup RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 5, 4 ; 29
+ mapgroup RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 5, 4 ; 30
+ mapgroup RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 5, 4 ; 31
+ mapgroup RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 5, 4 ; 32
+ mapgroup RUINS_OF_ALPH_HO_OH_WORD_ROOM, 12, 10 ; 33
+ mapgroup RUINS_OF_ALPH_KABUTO_WORD_ROOM, 7, 10 ; 34
+ mapgroup RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 8, 10 ; 35
+ mapgroup RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 7, 10 ; 36
+ mapgroup UNION_CAVE_1F, 18, 10 ; 37
+ mapgroup UNION_CAVE_B1F, 18, 10 ; 38
+ mapgroup UNION_CAVE_B2F, 18, 10 ; 39
+ mapgroup SLOWPOKE_WELL_B1F, 9, 10 ; 40
+ mapgroup SLOWPOKE_WELL_B2F, 9, 10 ; 41
+ mapgroup OLIVINE_LIGHTHOUSE_1F, 9, 10 ; 42
+ mapgroup OLIVINE_LIGHTHOUSE_2F, 9, 10 ; 43
+ mapgroup OLIVINE_LIGHTHOUSE_3F, 9, 10 ; 44
+ mapgroup OLIVINE_LIGHTHOUSE_4F, 9, 10 ; 45
+ mapgroup OLIVINE_LIGHTHOUSE_5F, 9, 10 ; 46
+ mapgroup OLIVINE_LIGHTHOUSE_6F, 9, 10 ; 47
+ mapgroup MAHOGANY_MART_1F, 4, 4 ; 48
+ mapgroup TEAM_ROCKET_BASE_B1F, 9, 15 ; 49
+ mapgroup TEAM_ROCKET_BASE_B2F, 9, 15 ; 50
+ mapgroup TEAM_ROCKET_BASE_B3F, 9, 15 ; 51
+ mapgroup ILEX_FOREST, 27, 15 ; 52
+ mapgroup WAREHOUSE_ENTRANCE, 18, 15 ; 53
+ mapgroup UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, 18, 15 ; 54
+ mapgroup GOLDENROD_DEPT_STORE_B1F, 9, 10 ; 55
+ mapgroup UNDERGROUND_WAREHOUSE, 9, 10 ; 56
+ mapgroup MOUNT_MORTAR_1F_OUTSIDE, 18, 20 ; 57
+ mapgroup MOUNT_MORTAR_1F_INSIDE, 27, 20 ; 58
+ mapgroup MOUNT_MORTAR_2F_INSIDE, 18, 20 ; 59
+ mapgroup MOUNT_MORTAR_B1F, 18, 20 ; 60
+ mapgroup ICE_PATH_1F, 18, 20 ; 61
+ mapgroup ICE_PATH_B1F, 18, 10 ; 62
+ mapgroup ICE_PATH_B2F_MAHOGANY_SIDE, 9, 10 ; 63
+ mapgroup ICE_PATH_B2F_BLACKTHORN_SIDE, 9, 5 ; 64
+ mapgroup ICE_PATH_B3F, 9, 10 ; 65
+ mapgroup WHIRL_ISLAND_NW, 9, 5 ; 66
+ mapgroup WHIRL_ISLAND_NE, 9, 10 ; 67
+ mapgroup WHIRL_ISLAND_SW, 9, 10 ; 68
+ mapgroup WHIRL_ISLAND_CAVE, 9, 5 ; 69
+ mapgroup WHIRL_ISLAND_SE, 9, 5 ; 70
+ mapgroup WHIRL_ISLAND_B1F, 18, 20 ; 71
+ mapgroup WHIRL_ISLAND_B2F, 18, 10 ; 72
+ mapgroup WHIRL_ISLAND_LUGIA_CHAMBER, 9, 10 ; 73
+ mapgroup SILVER_CAVE_ROOM_1, 18, 10 ; 74
+ mapgroup SILVER_CAVE_ROOM_2, 18, 15 ; 75
+ mapgroup SILVER_CAVE_ROOM_3, 18, 10 ; 76
+ mapgroup SILVER_CAVE_ITEM_ROOMS, 9, 10 ; 77
+ mapgroup DARK_CAVE_VIOLET_ENTRANCE, 18, 20 ; 78
+ mapgroup DARK_CAVE_BLACKTHORN_ENTRANCE, 18, 15 ; 79
+ mapgroup DRAGONS_DEN_1F, 9, 5 ; 80
+ mapgroup DRAGONS_DEN_B1F, 18, 20 ; 81
+ mapgroup DRAGON_SHRINE, 5, 5 ; 82
+ mapgroup TOHJO_FALLS, 9, 15 ; 83
+ mapgroup DIGLETTS_CAVE, 18, 10 ; 84
+ mapgroup MOUNT_MOON, 9, 15 ; 85
+ mapgroup UNDERGROUND, 14, 3 ; 86
+ mapgroup ROCK_TUNNEL_1F, 18, 15 ; 87
+ mapgroup ROCK_TUNNEL_B1F, 18, 15 ; 88
+ mapgroup SAFARI_ZONE_FUCHSIA_GATE_BETA, 4, 5 ; 89
+ mapgroup SAFARI_ZONE_BETA, 18, 10 ; 90
+ mapgroup VICTORY_ROAD, 36, 10 ; 91
- newgroup
- mapgroup CERULEAN_GYM_BADGE_SPEECH_HOUSE, 4, 4
- mapgroup CERULEAN_POLICE_STATION, 4, 4
- mapgroup CERULEAN_TRADE_SPEECH_HOUSE, 4, 4
- mapgroup CERULEAN_POKECENTER_1F, 4, 5
- mapgroup CERULEAN_POKECENTER_2F_BETA, 4, 8
- mapgroup CERULEAN_GYM, 8, 5
- mapgroup CERULEAN_MART, 4, 6
- mapgroup ROUTE_10_POKECENTER_1F, 4, 5
- mapgroup ROUTE_10_POKECENTER_2F_BETA, 4, 8
- mapgroup POWER_PLANT, 9, 10
- mapgroup BILLS_HOUSE, 4, 4
- mapgroup ROUTE_4, 9, 20
- mapgroup ROUTE_9, 9, 30
- mapgroup ROUTE_10_NORTH, 9, 10
- mapgroup ROUTE_24, 9, 10
- mapgroup ROUTE_25, 9, 30
- mapgroup CERULEAN_CITY, 18, 20
+ newgroup ; 4
- newgroup
- mapgroup AZALEA_POKECENTER_1F, 4, 5
- mapgroup CHARCOAL_KILN, 4, 4
- mapgroup AZALEA_MART, 4, 6
- mapgroup KURTS_HOUSE, 4, 8
- mapgroup AZALEA_GYM, 8, 5
- mapgroup ROUTE_33, 9, 10
- mapgroup AZALEA_TOWN, 9, 20
+ mapgroup ECRUTEAK_HOUSE, 9, 10 ; 1
+ mapgroup WISE_TRIOS_ROOM, 4, 4 ; 2
+ mapgroup ECRUTEAK_POKECENTER_1F, 4, 5 ; 3
+ mapgroup ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 ; 4
+ mapgroup DANCE_THEATRE, 7, 6 ; 5
+ mapgroup ECRUTEAK_MART, 4, 6 ; 6
+ mapgroup ECRUTEAK_GYM, 9, 5 ; 7
+ mapgroup ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 ; 8
+ mapgroup ECRUTEAK_CITY, 18, 20 ; 9
- newgroup
- mapgroup LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 4, 4
- mapgroup LAKE_OF_RAGE_MAGIKARP_HOUSE, 4, 4
- mapgroup ROUTE_43_MAHOGANY_GATE, 4, 5
- mapgroup ROUTE_43_GATE, 4, 5
- mapgroup ROUTE_43, 27, 10
- mapgroup LAKE_OF_RAGE, 18, 20
+ newgroup ; 5
- newgroup
- mapgroup ROUTE_32, 45, 10
- mapgroup ROUTE_35, 18, 10
- mapgroup ROUTE_36, 9, 30
- mapgroup ROUTE_37, 9, 10
- mapgroup VIOLET_CITY, 18, 20
- mapgroup VIOLET_MART, 4, 6
- mapgroup VIOLET_GYM, 8, 5
- mapgroup EARLS_POKEMON_ACADEMY, 8, 4
- mapgroup VIOLET_NICKNAME_SPEECH_HOUSE, 4, 4
- mapgroup VIOLET_POKECENTER_1F, 4, 5
- mapgroup VIOLET_ONIX_TRADE_HOUSE, 4, 4
- mapgroup ROUTE_32_RUINS_OF_ALPH_GATE, 4, 5
- mapgroup ROUTE_32_POKECENTER_1F, 4, 5
- mapgroup ROUTE_35_GOLDENROD_GATE, 4, 5
- mapgroup ROUTE_35_NATIONAL_PARK_GATE, 4, 4
- mapgroup ROUTE_36_RUINS_OF_ALPH_GATE, 4, 5
- mapgroup ROUTE_36_NATIONAL_PARK_GATE, 4, 5
+ mapgroup BLACKTHORN_GYM_1F, 9, 5 ; 1
+ mapgroup BLACKTHORN_GYM_2F, 9, 5 ; 2
+ mapgroup BLACKTHORN_DRAGON_SPEECH_HOUSE, 4, 4 ; 3
+ mapgroup BLACKTHORN_DODRIO_TRADE_HOUSE, 4, 4 ; 4
+ mapgroup BLACKTHORN_MART, 4, 6 ; 5
+ mapgroup BLACKTHORN_POKECENTER_1F, 4, 5 ; 6
+ mapgroup MOVE_DELETERS_HOUSE, 4, 4 ; 7
+ mapgroup ROUTE_45, 45, 10 ; 8
+ mapgroup ROUTE_46, 18, 10 ; 9
+ mapgroup BLACKTHORN_CITY, 18, 20 ; 10
- newgroup
- mapgroup ROUTE_34, 27, 10
- mapgroup GOLDENROD_CITY, 18, 20
- mapgroup GOLDENROD_GYM, 9, 10
- mapgroup GOLDENROD_BIKE_SHOP, 4, 4
- mapgroup GOLDENROD_HAPPINESS_RATER, 4, 4
- mapgroup GOLDENROD_BILLS_HOUSE, 4, 4
- mapgroup GOLDENROD_MAGNET_TRAIN_STATION, 9, 10
- mapgroup GOLDENROD_FLOWER_SHOP, 4, 4
- mapgroup GOLDENROD_PP_SPEECH_HOUSE, 4, 4
- mapgroup GOLDENROD_NAME_RATERS_HOUSE, 4, 4
- mapgroup GOLDENROD_DEPT_STORE_1F, 4, 8
- mapgroup GOLDENROD_DEPT_STORE_2F, 4, 8
- mapgroup GOLDENROD_DEPT_STORE_3F, 4, 8
- mapgroup GOLDENROD_DEPT_STORE_4F, 4, 8
- mapgroup GOLDENROD_DEPT_STORE_5F, 4, 8
- mapgroup GOLDENROD_DEPT_STORE_6F, 4, 8
- mapgroup GOLDENROD_DEPT_STORE_ELEVATOR, 2, 2
- mapgroup GOLDENROD_DEPT_STORE_ROOF, 4, 8
- mapgroup GOLDENROD_GAME_CORNER, 7, 10
- mapgroup GOLDENROD_POKECENTER_1F, 4, 5
- mapgroup GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16
- mapgroup ILEX_FOREST_AZALEA_GATE, 4, 5
- mapgroup ROUTE_34_ILEX_FOREST_GATE, 4, 5
- mapgroup DAYCARE, 4, 5
+ newgroup ; 6
+
+ mapgroup CINNABAR_POKECENTER_1F, 4, 5 ; 1
+ mapgroup CINNABAR_POKECENTER_2F_BETA, 4, 8 ; 2
+ mapgroup ROUTE_19___FUCHSIA_GATE, 4, 5 ; 3
+ mapgroup SEAFOAM_GYM, 4, 5 ; 4
+ mapgroup ROUTE_19, 18, 10 ; 5
+ mapgroup ROUTE_20, 9, 30 ; 6
+ mapgroup ROUTE_21, 18, 10 ; 7
+ mapgroup CINNABAR_ISLAND, 9, 10 ; 8
+
+ newgroup ; 7
+
+ mapgroup CERULEAN_GYM_BADGE_SPEECH_HOUSE, 4, 4 ; 1
+ mapgroup CERULEAN_POLICE_STATION, 4, 4 ; 2
+ mapgroup CERULEAN_TRADE_SPEECH_HOUSE, 4, 4 ; 3
+ mapgroup CERULEAN_POKECENTER_1F, 4, 5 ; 4
+ mapgroup CERULEAN_POKECENTER_2F_BETA, 4, 8 ; 5
+ mapgroup CERULEAN_GYM, 8, 5 ; 6
+ mapgroup CERULEAN_MART, 4, 6 ; 7
+ mapgroup ROUTE_10_POKECENTER_1F, 4, 5 ; 8
+ mapgroup ROUTE_10_POKECENTER_2F_BETA, 4, 8 ; 9
+ mapgroup POWER_PLANT, 9, 10 ; 10
+ mapgroup BILLS_HOUSE, 4, 4 ; 11
+ mapgroup ROUTE_4, 9, 20 ; 12
+ mapgroup ROUTE_9, 9, 30 ; 13
+ mapgroup ROUTE_10_NORTH, 9, 10 ; 14
+ mapgroup ROUTE_24, 9, 10 ; 15
+ mapgroup ROUTE_25, 9, 30 ; 16
+ mapgroup CERULEAN_CITY, 18, 20 ; 17
+
+ newgroup ; 8
+
+ mapgroup AZALEA_POKECENTER_1F, 4, 5 ; 1
+ mapgroup CHARCOAL_KILN, 4, 4 ; 2
+ mapgroup AZALEA_MART, 4, 6 ; 3
+ mapgroup KURTS_HOUSE, 4, 8 ; 4
+ mapgroup AZALEA_GYM, 8, 5 ; 5
+ mapgroup ROUTE_33, 9, 10 ; 6
+ mapgroup AZALEA_TOWN, 9, 20 ; 7
+
+ newgroup ; 9
+
+ mapgroup LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 4, 4 ; 1
+ mapgroup LAKE_OF_RAGE_MAGIKARP_HOUSE, 4, 4 ; 2
+ mapgroup ROUTE_43_MAHOGANY_GATE, 4, 5 ; 3
+ mapgroup ROUTE_43_GATE, 4, 5 ; 4
+ mapgroup ROUTE_43, 27, 10 ; 5
+ mapgroup LAKE_OF_RAGE, 18, 20 ; 6
+
+ newgroup ; 10
+
+ mapgroup ROUTE_32, 45, 10 ; 1
+ mapgroup ROUTE_35, 18, 10 ; 2
+ mapgroup ROUTE_36, 9, 30 ; 3
+ mapgroup ROUTE_37, 9, 10 ; 4
+ mapgroup VIOLET_CITY, 18, 20 ; 5
+ mapgroup VIOLET_MART, 4, 6 ; 6
+ mapgroup VIOLET_GYM, 8, 5 ; 7
+ mapgroup EARLS_POKEMON_ACADEMY, 8, 4 ; 8
+ mapgroup VIOLET_NICKNAME_SPEECH_HOUSE, 4, 4 ; 9
+ mapgroup VIOLET_POKECENTER_1F, 4, 5 ; 10
+ mapgroup VIOLET_ONIX_TRADE_HOUSE, 4, 4 ; 11
+ mapgroup ROUTE_32_RUINS_OF_ALPH_GATE, 4, 5 ; 12
+ mapgroup ROUTE_32_POKECENTER_1F, 4, 5 ; 13
+ mapgroup ROUTE_35_GOLDENROD_GATE, 4, 5 ; 14
+ mapgroup ROUTE_35_NATIONAL_PARK_GATE, 4, 4 ; 15
+ mapgroup ROUTE_36_RUINS_OF_ALPH_GATE, 4, 5 ; 16
+ mapgroup ROUTE_36_NATIONAL_PARK_GATE, 4, 5 ; 17
+
+ newgroup ; 11
+
+ mapgroup ROUTE_34, 27, 10 ; 1
+ mapgroup GOLDENROD_CITY, 18, 20 ; 2
+ mapgroup GOLDENROD_GYM, 9, 10 ; 3
+ mapgroup GOLDENROD_BIKE_SHOP, 4, 4 ; 4
+ mapgroup GOLDENROD_HAPPINESS_RATER, 4, 4 ; 5
+ mapgroup GOLDENROD_BILLS_HOUSE, 4, 4 ; 6
+ mapgroup GOLDENROD_MAGNET_TRAIN_STATION, 9, 10 ; 7
+ mapgroup GOLDENROD_FLOWER_SHOP, 4, 4 ; 8
+ mapgroup GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 9
+ mapgroup GOLDENROD_NAME_RATERS_HOUSE, 4, 4 ; 10
+ mapgroup GOLDENROD_DEPT_STORE_1F, 4, 8 ; 11
+ mapgroup GOLDENROD_DEPT_STORE_2F, 4, 8 ; 12
+ mapgroup GOLDENROD_DEPT_STORE_3F, 4, 8 ; 13
+ mapgroup GOLDENROD_DEPT_STORE_4F, 4, 8 ; 14
+ mapgroup GOLDENROD_DEPT_STORE_5F, 4, 8 ; 15
+ mapgroup GOLDENROD_DEPT_STORE_6F, 4, 8 ; 16
+ mapgroup GOLDENROD_DEPT_STORE_ELEVATOR, 2, 2 ; 17
+ mapgroup GOLDENROD_DEPT_STORE_ROOF, 4, 8 ; 18
+ mapgroup GOLDENROD_GAME_CORNER, 7, 10 ; 19
+ mapgroup GOLDENROD_POKECENTER_1F, 4, 5 ; 20
+ mapgroup GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16 ; 21
+ mapgroup ILEX_FOREST_AZALEA_GATE, 4, 5 ; 22
+ mapgroup ROUTE_34_ILEX_FOREST_GATE, 4, 5 ; 23
+ mapgroup DAYCARE, 4, 5 ; 24
+
+ newgroup ; 12
+
+ mapgroup ROUTE_6, 9, 10 ; 1
+ mapgroup ROUTE_11, 9, 20 ; 2
+ mapgroup VERMILION_CITY, 18, 20 ; 3
+ mapgroup VERMILION_HOUSE_FISHING_SPEECH_HOUSE, 4, 4 ; 4
+ mapgroup VERMILION_POKECENTER_1F, 4, 5 ; 5
+ mapgroup VERMILION_POKECENTER_2F_BETA, 4, 8 ; 6
+ mapgroup POKEMON_FAN_CLUB, 4, 5 ; 7
+ mapgroup VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 4, 4 ; 8
+ mapgroup VERMILION_MART, 4, 6 ; 9
+ mapgroup VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10
+ mapgroup VERMILION_GYM, 9, 5 ; 11
+ mapgroup ROUTE_6_SAFFRON_GATE, 4, 5 ; 12
+ mapgroup ROUTE_6_UNDERGROUND_ENTRANCE, 4, 4 ; 13
+
+ newgroup ; 13
+
+ mapgroup ROUTE_1, 18, 10 ; 1
+ mapgroup PALLET_TOWN, 9, 10 ; 2
+ mapgroup REDS_HOUSE_1F, 4, 4 ; 3
+ mapgroup REDS_HOUSE_2F, 4, 4 ; 4
+ mapgroup BLUES_HOUSE, 4, 4 ; 5
+ mapgroup OAKS_LAB, 6, 5 ; 6
+
+ newgroup ; 14
+
+ mapgroup ROUTE_3, 9, 30 ; 1
+ mapgroup PEWTER_CITY, 18, 20 ; 2
+ mapgroup PEWTER_NIDORAN_SPEECH_HOUSE, 4, 4 ; 3
+ mapgroup PEWTER_GYM, 7, 5 ; 4
+ mapgroup PEWTER_MART, 4, 6 ; 5
+ mapgroup PEWTER_POKECENTER_1F, 4, 5 ; 6
+ mapgroup PEWTER_POKECENTER_2F_BETA, 4, 8 ; 7
+ mapgroup PEWTER_SNOOZE_SPEECH_HOUSE, 4, 4 ; 8
+
+ newgroup ; 15
+
+ mapgroup OLIVINE_PORT, 18, 10 ; 1
+ mapgroup VERMILION_PORT, 18, 10 ; 2
+ mapgroup FAST_SHIP_1F, 9, 16 ; 3
+ mapgroup FAST_SHIP_CABINS_NNW_NNE_NE, 16, 4 ; 4
+ mapgroup FAST_SHIP_CABINS_SW_SSW_NW, 16, 4 ; 5
+ mapgroup FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 17, 5 ; 6
+ mapgroup FAST_SHIP_B1F, 8, 16 ; 7
+ mapgroup OLIVINE_PORT_PASSAGE, 9, 10 ; 8
+ mapgroup VERMILION_PORT_PASSAGE, 9, 10 ; 9
+ mapgroup MOUNT_MOON_SQUARE, 9, 15 ; 10
+ mapgroup MOUNT_MOON_GIFT_SHOP, 4, 4 ; 11
+ mapgroup TIN_TOWER_ROOF, 9, 10 ; 12
- newgroup
- mapgroup ROUTE_6, 9, 10
- mapgroup ROUTE_11, 9, 20
- mapgroup VERMILION_CITY, 18, 20
- mapgroup VERMILION_HOUSE_FISHING_SPEECH_HOUSE, 4, 4
- mapgroup VERMILION_POKECENTER_1F, 4, 5
- mapgroup VERMILION_POKECENTER_2F_BETA, 4, 8
- mapgroup POKEMON_FAN_CLUB, 4, 5
- mapgroup VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 4, 4
- mapgroup VERMILION_MART, 4, 6
- mapgroup VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4
- mapgroup VERMILION_GYM, 9, 5
- mapgroup ROUTE_6_SAFFRON_GATE, 4, 5
- mapgroup ROUTE_6_UNDERGROUND_ENTRANCE, 4, 4
+ newgroup ; 16
- newgroup
- mapgroup ROUTE_1, 18, 10
- mapgroup PALLET_TOWN, 9, 10
- mapgroup REDS_HOUSE_1F, 4, 4
- mapgroup REDS_HOUSE_2F, 4, 4
- mapgroup BLUES_HOUSE, 4, 4
- mapgroup OAKS_LAB, 6, 5
+ mapgroup ROUTE_23, 9, 10 ; 1
+ mapgroup INDIGO_PLATEAU_POKECENTER_1F, 7, 9 ; 2
+ mapgroup WILLS_ROOM, 9, 5 ; 3
+ mapgroup KOGAS_ROOM, 9, 5 ; 4
+ mapgroup BRUNOS_ROOM, 9, 5 ; 5
+ mapgroup KARENS_ROOM, 9, 5 ; 6
+ mapgroup LANCES_ROOM, 12, 5 ; 7
+ mapgroup HALL_OF_FAME, 7, 5 ; 8
- newgroup
- mapgroup ROUTE_3, 9, 30
- mapgroup PEWTER_CITY, 18, 20
- mapgroup PEWTER_NIDORAN_SPEECH_HOUSE, 4, 4
- mapgroup PEWTER_GYM, 7, 5
- mapgroup PEWTER_MART, 4, 6
- mapgroup PEWTER_POKECENTER_1F, 4, 5
- mapgroup PEWTER_POKECENTER_2F_BETA, 4, 8
- mapgroup PEWTER_SNOOZE_SPEECH_HOUSE, 4, 4
+ newgroup ; 17
- newgroup
- mapgroup OLIVINE_PORT, 18, 10
- mapgroup VERMILION_PORT, 18, 10
- mapgroup FAST_SHIP_1F, 9, 16
- mapgroup FAST_SHIP_CABINS_NNW_NNE_NE, 16, 4
- mapgroup FAST_SHIP_CABINS_SW_SSW_NW, 16, 4
- mapgroup FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 17, 5
- mapgroup FAST_SHIP_B1F, 8, 16
- mapgroup OLIVINE_PORT_PASSAGE, 9, 10
- mapgroup VERMILION_PORT_PASSAGE, 9, 10
- mapgroup MOUNT_MOON_SQUARE, 9, 15
- mapgroup MOUNT_MOON_GIFT_SHOP, 4, 4
- mapgroup TIN_TOWER_ROOF, 9, 10
+ mapgroup ROUTE_13, 9, 30 ; 1
+ mapgroup ROUTE_14, 18, 10 ; 2
+ mapgroup ROUTE_15, 9, 20 ; 3
+ mapgroup ROUTE_18, 9, 10 ; 4
+ mapgroup FUCHSIA_CITY, 18, 20 ; 5
+ mapgroup FUCHSIA_MART, 4, 6 ; 6
+ mapgroup SAFARI_ZONE_MAIN_OFFICE, 4, 4 ; 7
+ mapgroup FUCHSIA_GYM, 9, 5 ; 8
+ mapgroup FUCHSIA_BILL_SPEECH_HOUSE, 4, 4 ; 9
+ mapgroup FUCHSIA_POKECENTER_1F, 4, 5 ; 10
+ mapgroup FUCHSIA_POKECENTER_2F_BETA, 4, 8 ; 11
+ mapgroup SAFARI_ZONE_WARDENS_HOME, 4, 5 ; 12
+ mapgroup ROUTE_15_FUCHSIA_GATE, 4, 5 ; 13
- newgroup
- mapgroup ROUTE_23, 9, 10
- mapgroup INDIGO_PLATEAU_POKECENTER_1F, 7, 9
- mapgroup WILLS_ROOM, 9, 5
- mapgroup KOGAS_ROOM, 9, 5
- mapgroup BRUNOS_ROOM, 9, 5
- mapgroup KARENS_ROOM, 9, 5
- mapgroup LANCES_ROOM, 12, 5
- mapgroup HALL_OF_FAME, 7, 5
+ newgroup ; 18
- newgroup
- mapgroup ROUTE_13, 9, 30
- mapgroup ROUTE_14, 18, 10
- mapgroup ROUTE_15, 9, 20
- mapgroup ROUTE_18, 9, 10
- mapgroup FUCHSIA_CITY, 18, 20
- mapgroup FUCHSIA_MART, 4, 6
- mapgroup SAFARI_ZONE_MAIN_OFFICE, 4, 4
- mapgroup FUCHSIA_GYM, 9, 5
- mapgroup FUCHSIA_BILL_SPEECH_HOUSE, 4, 4
- mapgroup FUCHSIA_POKECENTER_1F, 4, 5
- mapgroup FUCHSIA_POKECENTER_2F_BETA, 4, 8
- mapgroup SAFARI_ZONE_WARDENS_HOME, 4, 5
- mapgroup ROUTE_15_FUCHSIA_GATE, 4, 5
+ mapgroup ROUTE_8, 9, 20 ; 1
+ mapgroup ROUTE_12, 27, 10 ; 2
+ mapgroup ROUTE_10_SOUTH, 9, 10 ; 3
+ mapgroup LAVENDER_TOWN, 9, 10 ; 4
+ mapgroup LAVENDER_POKECENTER_1F, 4, 5 ; 5
+ mapgroup LAVENDER_POKECENTER_2F_BETA, 4, 8 ; 6
+ mapgroup MR_FUJIS_HOUSE, 4, 5 ; 7
+ mapgroup LAVENDER_TOWN_SPEECH_HOUSE, 4, 4 ; 8
+ mapgroup LAVENDER_NAME_RATER, 4, 4 ; 9
+ mapgroup LAVENDER_MART, 4, 6 ; 10
+ mapgroup SOUL_HOUSE, 4, 5 ; 11
+ mapgroup LAV_RADIO_TOWER_1F, 4, 10 ; 12
+ mapgroup ROUTE_8_SAFFRON_GATE, 4, 5 ; 13
+ mapgroup ROUTE_12_SUPER_ROD_HOUSE, 4, 4 ; 14
- newgroup
- mapgroup ROUTE_8, 9, 20
- mapgroup ROUTE_12, 27, 10
- mapgroup ROUTE_10_SOUTH, 9, 10
- mapgroup LAVENDER_TOWN, 9, 10
- mapgroup LAVENDER_POKECENTER_1F, 4, 5
- mapgroup LAVENDER_POKECENTER_2F_BETA, 4, 8
- mapgroup MR_FUJIS_HOUSE, 4, 5
- mapgroup LAVENDER_TOWN_SPEECH_HOUSE, 4, 4
- mapgroup LAVENDER_NAME_RATER, 4, 4
- mapgroup LAVENDER_MART, 4, 6
- mapgroup SOUL_HOUSE, 4, 5
- mapgroup LAV_RADIO_TOWER_1F, 4, 10
- mapgroup ROUTE_8_SAFFRON_GATE, 4, 5
- mapgroup ROUTE_12_SUPER_ROD_HOUSE, 4, 4
+ newgroup ; 19
- newgroup
- mapgroup ROUTE_28, 9, 20
- mapgroup SILVER_CAVE_OUTSIDE, 18, 20
- mapgroup SILVER_CAVE_POKECENTER_1F, 4, 5
- mapgroup ROUTE_28_FAMOUS_SPEECH_HOUSE, 4, 4
+ mapgroup ROUTE_28, 9, 20 ; 1
+ mapgroup SILVER_CAVE_OUTSIDE, 18, 20 ; 2
+ mapgroup SILVER_CAVE_POKECENTER_1F, 4, 5 ; 3
+ mapgroup ROUTE_28_FAMOUS_SPEECH_HOUSE, 4, 4 ; 4
- newgroup
- mapgroup POKECENTER_2F, 4, 8
- mapgroup TRADE_CENTER, 4, 5
- mapgroup COLOSSEUM, 4, 5
- mapgroup TIME_CAPSULE, 4, 5
- mapgroup MOBILE_TRADE_ROOM_MOBILE, 4, 5
- mapgroup MOBILE_BATTLE_ROOM, 4, 5
+ newgroup ; 20
- newgroup
- mapgroup ROUTE_7, 9, 10
- mapgroup ROUTE_16, 9, 10
- mapgroup ROUTE_17, 45, 10
- mapgroup CELADON_CITY, 18, 20
- mapgroup CELADON_DEPT_STORE_1F, 4, 8
- mapgroup CELADON_DEPT_STORE_2F, 4, 8
- mapgroup CELADON_DEPT_STORE_3F, 4, 8
- mapgroup CELADON_DEPT_STORE_4F, 4, 8
- mapgroup CELADON_DEPT_STORE_5F, 4, 8
- mapgroup CELADON_DEPT_STORE_6F, 4, 8
- mapgroup CELADON_DEPT_STORE_ELEVATOR, 2, 2
- mapgroup CELADON_MANSION_1F, 5, 4
- mapgroup CELADON_MANSION_2F, 5, 4
- mapgroup CELADON_MANSION_3F, 5, 4
- mapgroup CELADON_MANSION_ROOF, 5, 4
- mapgroup CELADON_MANSION_ROOF_HOUSE, 4, 4
- mapgroup CELADON_POKECENTER_1F, 4, 5
- mapgroup CELADON_POKECENTER_2F_BETA, 4, 8
- mapgroup CELADON_GAME_CORNER, 7, 10
- mapgroup CELADON_GAME_CORNER_PRIZE_ROOM, 3, 3
- mapgroup CELADON_GYM, 9, 5
- mapgroup CELADON_CAFE, 4, 6
- mapgroup ROUTE_16_FUCHSIA_SPEECH_HOUSE, 4, 4
- mapgroup ROUTE_16_GATE, 4, 5
- mapgroup ROUTE_7_SAFFRON_GATE, 4, 5
- mapgroup ROUTE_17_18_GATE, 4, 5
+ mapgroup POKECENTER_2F, 4, 8 ; 1
+ mapgroup TRADE_CENTER, 4, 5 ; 2
+ mapgroup COLOSSEUM, 4, 5 ; 3
+ mapgroup TIME_CAPSULE, 4, 5 ; 4
+ mapgroup MOBILE_TRADE_ROOM_MOBILE, 4, 5 ; 5
+ mapgroup MOBILE_BATTLE_ROOM, 4, 5 ; 6
- newgroup
- mapgroup ROUTE_40, 18, 10
- mapgroup ROUTE_41, 27, 25
- mapgroup CIANWOOD_CITY, 27, 15
- mapgroup MANIAS_HOUSE, 4, 4
- mapgroup CIANWOOD_GYM, 9, 5
- mapgroup CIANWOOD_POKECENTER_1F, 4, 5
- mapgroup CIANWOOD_PHARMACY, 4, 4
- mapgroup CIANWOOD_CITY_PHOTO_STUDIO, 4, 4
- mapgroup CIANWOOD_LUGIA_SPEECH_HOUSE, 4, 4
- mapgroup POKE_SEERS_HOUSE, 4, 4
- mapgroup BATTLE_TOWER_1F, 5, 8
- mapgroup BATTLE_TOWER_BATTLE_ROOM, 4, 4
- mapgroup BATTLE_TOWER_ELEVATOR, 2, 2
- mapgroup BATTLE_TOWER_HALLWAY, 2, 11
- mapgroup ROUTE_40_BATTLE_TOWER_GATE, 4, 5
- mapgroup BATTLE_TOWER_OUTSIDE, 14, 10
+ newgroup ; 21
- newgroup
- mapgroup ROUTE_2, 27, 10
- mapgroup ROUTE_22, 9, 20
- mapgroup VIRIDIAN_CITY, 18, 20
- mapgroup VIRIDIAN_GYM, 9, 5
- mapgroup VIRIDIAN_NICKNAME_SPEECH_HOUSE, 4, 4
- mapgroup TRAINER_HOUSE_1F, 7, 5
- mapgroup TRAINER_HOUSE_B1F, 8, 5
- mapgroup VIRIDIAN_MART, 4, 6
- mapgroup VIRIDIAN_POKECENTER_1F, 4, 5
- mapgroup VIRIDIAN_POKECENTER_2F_BETA, 4, 8
- mapgroup ROUTE_2_NUGGET_SPEECH_HOUSE, 4, 4
- mapgroup ROUTE_2_GATE, 4, 5
- mapgroup VICTORY_ROAD_GATE, 9, 10
+ mapgroup ROUTE_7, 9, 10 ; 1
+ mapgroup ROUTE_16, 9, 10 ; 2
+ mapgroup ROUTE_17, 45, 10 ; 3
+ mapgroup CELADON_CITY, 18, 20 ; 4
+ mapgroup CELADON_DEPT_STORE_1F, 4, 8 ; 5
+ mapgroup CELADON_DEPT_STORE_2F, 4, 8 ; 6
+ mapgroup CELADON_DEPT_STORE_3F, 4, 8 ; 7
+ mapgroup CELADON_DEPT_STORE_4F, 4, 8 ; 8
+ mapgroup CELADON_DEPT_STORE_5F, 4, 8 ; 9
+ mapgroup CELADON_DEPT_STORE_6F, 4, 8 ; 10
+ mapgroup CELADON_DEPT_STORE_ELEVATOR, 2, 2 ; 11
+ mapgroup CELADON_MANSION_1F, 5, 4 ; 12
+ mapgroup CELADON_MANSION_2F, 5, 4 ; 13
+ mapgroup CELADON_MANSION_3F, 5, 4 ; 14
+ mapgroup CELADON_MANSION_ROOF, 5, 4 ; 15
+ mapgroup CELADON_MANSION_ROOF_HOUSE, 4, 4 ; 16
+ mapgroup CELADON_POKECENTER_1F, 4, 5 ; 17
+ mapgroup CELADON_POKECENTER_2F_BETA, 4, 8 ; 18
+ mapgroup CELADON_GAME_CORNER, 7, 10 ; 19
+ mapgroup CELADON_GAME_CORNER_PRIZE_ROOM, 3, 3 ; 20
+ mapgroup CELADON_GYM, 9, 5 ; 21
+ mapgroup CELADON_CAFE, 4, 6 ; 22
+ mapgroup ROUTE_16_FUCHSIA_SPEECH_HOUSE, 4, 4 ; 23
+ mapgroup ROUTE_16_GATE, 4, 5 ; 24
+ mapgroup ROUTE_7_SAFFRON_GATE, 4, 5 ; 25
+ mapgroup ROUTE_17_18_GATE, 4, 5 ; 26
- newgroup
- mapgroup ROUTE_26, 54, 10
- mapgroup ROUTE_27, 9, 40
- mapgroup ROUTE_29, 9, 30
- mapgroup NEW_BARK_TOWN, 9, 10
- mapgroup ELMS_LAB, 6, 5
- mapgroup KRISS_HOUSE_1F, 4, 5
- mapgroup KRISS_HOUSE_2F, 3, 4
- mapgroup KRISS_NEIGHBORS_HOUSE, 4, 4
- mapgroup ELMS_HOUSE, 4, 4
- mapgroup ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4
- mapgroup ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4
- mapgroup ROUTE_27_SANDSTORM_HOUSE, 4, 4
- mapgroup ROUTE_29_46_GATE, 4, 5
+ newgroup ; 22
- newgroup
- mapgroup ROUTE_5, 9, 10
- mapgroup SAFFRON_CITY, 18, 20
- mapgroup FIGHTING_DOJO, 6, 5
- mapgroup SAFFRON_GYM, 9, 10
- mapgroup SAFFRON_MART, 4, 6
- mapgroup SAFFRON_POKECENTER_1F, 4, 5
- mapgroup SAFFRON_POKECENTER_2F_BETA, 4, 8
- mapgroup MR_PSYCHICS_HOUSE, 4, 4
- mapgroup SAFFRON_TRAIN_STATION, 9, 10
- mapgroup SILPH_CO_1F, 4, 8
- mapgroup COPYCATS_HOUSE_1F, 4, 4
- mapgroup COPYCATS_HOUSE_2F, 3, 5
- mapgroup ROUTE_5_UNDERGROUND_ENTRANCE, 4, 4
- mapgroup ROUTE_5_SAFFRON_CITY_GATE, 4, 5
- mapgroup ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4
+ mapgroup ROUTE_40, 18, 10 ; 1
+ mapgroup ROUTE_41, 27, 25 ; 2
+ mapgroup CIANWOOD_CITY, 27, 15 ; 3
+ mapgroup MANIAS_HOUSE, 4, 4 ; 4
+ mapgroup CIANWOOD_GYM, 9, 5 ; 5
+ mapgroup CIANWOOD_POKECENTER_1F, 4, 5 ; 6
+ mapgroup CIANWOOD_PHARMACY, 4, 4 ; 7
+ mapgroup CIANWOOD_CITY_PHOTO_STUDIO, 4, 4 ; 8
+ mapgroup CIANWOOD_LUGIA_SPEECH_HOUSE, 4, 4 ; 9
+ mapgroup POKE_SEERS_HOUSE, 4, 4 ; 10
+ mapgroup BATTLE_TOWER_1F, 5, 8 ; 11
+ mapgroup BATTLE_TOWER_BATTLE_ROOM, 4, 4 ; 12
+ mapgroup BATTLE_TOWER_ELEVATOR, 2, 2 ; 13
+ mapgroup BATTLE_TOWER_HALLWAY, 2, 11 ; 14
+ mapgroup ROUTE_40_BATTLE_TOWER_GATE, 4, 5 ; 15
+ mapgroup BATTLE_TOWER_OUTSIDE, 14, 10 ; 16
- newgroup
- mapgroup ROUTE_30, 27, 10
- mapgroup ROUTE_31, 9, 20
- mapgroup CHERRYGROVE_CITY, 9, 20
- mapgroup CHERRYGROVE_MART, 4, 6
- mapgroup CHERRYGROVE_POKECENTER_1F, 4, 5
- mapgroup CHERRYGROVE_GYM_SPEECH_HOUSE, 4, 4
- mapgroup GUIDE_GENTS_HOUSE, 4, 4
- mapgroup CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 4, 4
- mapgroup ROUTE_30_BERRY_SPEECH_HOUSE, 4, 4
- mapgroup MR_POKEMONS_HOUSE, 4, 4
- mapgroup ROUTE_31_VIOLET_GATE, 4, 5
+ newgroup ; 23
+
+ mapgroup ROUTE_2, 27, 10 ; 1
+ mapgroup ROUTE_22, 9, 20 ; 2
+ mapgroup VIRIDIAN_CITY, 18, 20 ; 3
+ mapgroup VIRIDIAN_GYM, 9, 5 ; 4
+ mapgroup VIRIDIAN_NICKNAME_SPEECH_HOUSE, 4, 4 ; 5
+ mapgroup TRAINER_HOUSE_1F, 7, 5 ; 6
+ mapgroup TRAINER_HOUSE_B1F, 8, 5 ; 7
+ mapgroup VIRIDIAN_MART, 4, 6 ; 8
+ mapgroup VIRIDIAN_POKECENTER_1F, 4, 5 ; 9
+ mapgroup VIRIDIAN_POKECENTER_2F_BETA, 4, 8 ; 10
+ mapgroup ROUTE_2_NUGGET_SPEECH_HOUSE, 4, 4 ; 11
+ mapgroup ROUTE_2_GATE, 4, 5 ; 12
+ mapgroup VICTORY_ROAD_GATE, 9, 10 ; 13
+
+ newgroup ; 24
+
+ mapgroup ROUTE_26, 54, 10 ; 1
+ mapgroup ROUTE_27, 9, 40 ; 2
+ mapgroup ROUTE_29, 9, 30 ; 3
+ mapgroup NEW_BARK_TOWN, 9, 10 ; 4
+ mapgroup ELMS_LAB, 6, 5 ; 5
+ mapgroup KRISS_HOUSE_1F, 4, 5 ; 6
+ mapgroup KRISS_HOUSE_2F, 3, 4 ; 7
+ mapgroup KRISS_NEIGHBORS_HOUSE, 4, 4 ; 8
+ mapgroup ELMS_HOUSE, 4, 4 ; 9
+ mapgroup ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10
+ mapgroup ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11
+ mapgroup ROUTE_27_SANDSTORM_HOUSE, 4, 4 ; 12
+ mapgroup ROUTE_29_46_GATE, 4, 5 ; 13
+
+ newgroup ; 25
+
+ mapgroup ROUTE_5, 9, 10 ; 1
+ mapgroup SAFFRON_CITY, 18, 20 ; 2
+ mapgroup FIGHTING_DOJO, 6, 5 ; 3
+ mapgroup SAFFRON_GYM, 9, 10 ; 4
+ mapgroup SAFFRON_MART, 4, 6 ; 5
+ mapgroup SAFFRON_POKECENTER_1F, 4, 5 ; 6
+ mapgroup SAFFRON_POKECENTER_2F_BETA, 4, 8 ; 7
+ mapgroup MR_PSYCHICS_HOUSE, 4, 4 ; 8
+ mapgroup SAFFRON_TRAIN_STATION, 9, 10 ; 9
+ mapgroup SILPH_CO_1F, 4, 8 ; 10
+ mapgroup COPYCATS_HOUSE_1F, 4, 4 ; 11
+ mapgroup COPYCATS_HOUSE_2F, 3, 5 ; 12
+ mapgroup ROUTE_5_UNDERGROUND_ENTRANCE, 4, 4 ; 13
+ mapgroup ROUTE_5_SAFFRON_CITY_GATE, 4, 5 ; 14
+ mapgroup ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4 ; 15
+
+ newgroup ; 26
+
+ mapgroup ROUTE_30, 27, 10 ; 1
+ mapgroup ROUTE_31, 9, 20 ; 2
+ mapgroup CHERRYGROVE_CITY, 9, 20 ; 3
+ mapgroup CHERRYGROVE_MART, 4, 6 ; 4
+ mapgroup CHERRYGROVE_POKECENTER_1F, 4, 5 ; 5
+ mapgroup CHERRYGROVE_GYM_SPEECH_HOUSE, 4, 4 ; 6
+ mapgroup GUIDE_GENTS_HOUSE, 4, 4 ; 7
+ mapgroup CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 4, 4 ; 8
+ mapgroup ROUTE_30_BERRY_SPEECH_HOUSE, 4, 4 ; 9
+ mapgroup MR_POKEMONS_HOUSE, 4, 4 ; 10
+ mapgroup ROUTE_31_VIOLET_GATE, 4, 5 ; 11
+
; elevator floors
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -82,7 +82,7 @@
add_predef Predef_LoadSGBLayout
add_predef Function91d11
add_predef CheckContestMon
- add_predef Function8c20f
+ add_predef Predef_StartBattle
add_predef Predef35
add_predef Predef36
add_predef PlayBattleAnim
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -3011,7 +3011,7 @@
Script_loadfont: ; 0x97b1c
; script command 0x47
- call Function2e08
+ call LoadFont
ret
; 0x97b20
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -486,21 +486,23 @@
ret
; 1fbf
-Function1fbf:: ; 1fbf
+ResetTextRelatedRAM:: ; 1fbf
ld hl, wcf71
- call Function1ff0
+ call .bytefill
ld hl, wcf81
- call Function1ff0
+ call .bytefill
ld hl, wcf91
- call Function1ff0
+ call .bytefill
ld hl, wcfa1
- call Function1ff0
+ call .bytefill
+
ld a, [rSVBK]
push af
ld a, $7
ld [rSVBK], a
+
xor a
- ld hl, $dfff
+ ld hl, w7_dfff
rept 2
ld [hld], a
endr
@@ -508,12 +510,13 @@
ld [wcf71], a
ld a, h
ld [wcf72], a
+
pop af
ld [rSVBK], a
ret
; 1ff0
-Function1ff0:: ; 1ff0
+.bytefill: ; 1ff0
ld bc, $0010
xor a
call ByteFill
--- a/home/window.asm
+++ b/home/window.asm
@@ -1,6 +1,6 @@
ResetWindow:: ; 2dba
- call Function1fbf
+ call ResetTextRelatedRAM
ld a, [hROMBank]
push af
ld a, BANK(Function6454) ; and BANK(Function64bf)
@@ -30,7 +30,7 @@
; 2de2
Function2de2:: ; 2de2
- call Function1fbf
+ call ResetTextRelatedRAM
xor a
ld [hBGMapMode], a
call Function2173
@@ -46,8 +46,8 @@
ret
; 2e08
-Function2e08:: ; 2e08
- call Function1fbf
+LoadFont:: ; 2e08
+ call ResetTextRelatedRAM
ld a, [hROMBank]
push af
ld a, BANK(Function6454) ; and BANK(Function64bf)
@@ -68,7 +68,9 @@
push af
ld a, $1
ld [hOAMUpdate], a
+
callba Function104110
+
pop af
ld [hOAMUpdate], a
ret
--- a/main.asm
+++ b/main.asm
@@ -111,7 +111,7 @@
call ClearTileMap
call Functione5f
call Functione51
- call Function1fbf
+ call ResetTextRelatedRAM
ret
; 5b54
@@ -1461,7 +1461,7 @@
GameInit:: ; 642e
callba Function14f1c
- call Function1fbf
+ call ResetTextRelatedRAM
call WhiteBGMap
call ClearTileMap
ld a, $98
@@ -1481,6 +1481,7 @@
call DelayFrame
ld a, [hOAMUpdate]
push af
+
ld a, $1
ld [hOAMUpdate], a
ld a, [hBGMapMode]
@@ -1488,6 +1489,7 @@
xor a
ld [hBGMapMode], a
call Function6473
+
pop af
ld [hBGMapMode], a
pop af
@@ -1504,7 +1506,7 @@
ld a, $90
ld [hWY], a
call Function2173
- ld a, $9c
+ ld a, VBGMap1 / $100
call Function64b9
call Function2e20
callba Function49409
@@ -1514,8 +1516,8 @@
xor a
ld [hBGMapMode], a
ld [hWY], a
- callba Function64db
- ld a, $98
+ callba Function64db ; no need to callba
+ ld a, VBGMap0 / $100
call Function64b9
xor a
ld [wd152], a
@@ -1540,7 +1542,9 @@
push af
ld a, $1
ld [hOAMUpdate], a
+
call Function64cd
+
pop af
ld [hOAMUpdate], a
ret
@@ -12419,7 +12423,7 @@
StartMenu:: ; 125cd
- call Function1fbf
+ call ResetTextRelatedRAM
ld de, SFX_MENU
call PlaySFX
@@ -14393,7 +14397,7 @@
jp UseRegisteredItem
.NotRegistered
- call Function2e08
+ call LoadFont
ld b, BANK(ItemMayBeRegisteredText)
ld hl, ItemMayBeRegisteredText
call MapTextbox
@@ -14527,7 +14531,7 @@
; 133df
.NoFunction ; 133df
- call Function2e08
+ call LoadFont
call CantUseItem
call Function2dcf
and a
@@ -14535,7 +14539,7 @@
; 133ea
.Current ; 133ea
- call Function2e08
+ call LoadFont
call DoItemEffect
call Function2dcf
and a
@@ -32782,7 +32786,7 @@
ld de, OTPartyCount
call Function2c059
ld hl, wcfc4
- ld a, $50
+ ld a, "@"
ld [hli], a
ld [hl], $68
ld hl, Sprites + $18
@@ -32792,7 +32796,7 @@
Function2c143: ; 2c143
ld de, Buffer1
ld c, $6
-.asm_2c148
+.loop
ld a, [wcfc5]
ld [hli], a
ld a, [wcfc4]
@@ -32808,7 +32812,7 @@
ld [wcfc4], a
inc de
dec c
- jr nz, .asm_2c148
+ jr nz, .loop
ret
; 2c165
@@ -32828,20 +32832,20 @@
call WhiteBGMap
call Functione5f
hlcoord 2, 3
- ld b, $9
- ld c, $e
+ ld b, 9
+ ld c, 14
call TextBox
hlcoord 4, 5
ld de, PlayerName
call PlaceString
hlcoord 4, 10
- ld de, wd26b
+ ld de, OTPlayerName
call PlaceString
hlcoord 9, 8
ld a, $69
ld [hli], a
ld [hl], $6a
- callba Function2c10d
+ callba Function2c10d ; no need to callba
ld b, $8
call GetSGBLayout
call Function32f9
@@ -34113,9 +34117,12 @@
; 2ee18
Function2ee18: ; 2ee18
+; If we're not in a communications room,
+; we don't need to be here.
ld a, [InLinkBattle]
and a
ret z
+
callba Function2c1b2
ld c, 150
call DelayFrames
@@ -34132,20 +34139,21 @@
ld b, 6
ld hl, PartyMon1HP
ld de, PartyMon2 - PartyMon1 - 1
-.asm_2ee3d
+
+.loop
ld a, [hli]
or [hl]
- jr nz, .asm_2ee45
+ jr nz, .okay
add hl, de
dec b
- jr nz, .asm_2ee3d
+ jr nz, .loop
-.asm_2ee45
+.okay
ld de, PartyMon1Level - PartyMon1HP
add hl, de
ld a, [hl]
ld [BattleMonLevel], a
- predef Function8c20f
+ predef Predef_StartBattle
callba Function3ed9f
ld a, 1
ld [hBGMapMode], a
@@ -34305,7 +34313,7 @@
callab ResetEnemyStatLevels
- call Function1fbf
+ call ResetTextRelatedRAM
ld hl, hBGMapAddress
xor a
@@ -40135,7 +40143,7 @@
call ClearTileMap
call Functione5f
call Functione51
- call Function1fbf
+ call ResetTextRelatedRAM
ret
; 49ee0
@@ -54554,7 +54562,7 @@
; 8c20f
-Function8c20f: ; 8c20f
+Predef_StartBattle: ; 8c20f
call Function8c26d
ld a, [rBGP]
ld [wcfc7], a
@@ -54581,13 +54589,16 @@
push af
ld a, $5
ld [rSVBK], a
+
ld hl, Unkn1Pals
ld bc, $0040
xor a
call ByteFill
+
pop af
ld [rSVBK], a
- ld a, $ff
+
+ ld a, %11111111
ld [wcfc7], a
call DmgToCgbBGPals
call DelayFrame
@@ -54596,6 +54607,7 @@
ld [hLCDStatCustom + 1], a
ld [hLCDStatCustom + 2], a
ld [hSCY], a
+
ld a, $1
ld [rSVBK], a
pop af
@@ -54619,7 +54631,7 @@
call Function8c2aa
.resume
- ld a, $90
+ ld a, SCREEN_HEIGHT_PX
ld [hWY], a
call DelayFrame
xor a
@@ -54630,7 +54642,7 @@
ld [hli], a
endr
ld [hl], a
- call Function8c6d8
+ call WipeLYOverrides
ret
; 8c2a0
@@ -54647,15 +54659,18 @@
ld b, BANK(GFX_8c2f4)
ld c, 2
call Request2bpp
+
ld a, [rVBK]
push af
ld a, $1
ld [rVBK], a
+
ld de, GFX_8c2f4
- ld hl, VTiles1 tile $7e
+ ld hl, VTiles4 tile $7e
ld b, BANK(GFX_8c2f4)
ld c, 2
call Request2bpp
+
pop af
ld [rVBK], a
ret
@@ -54669,6 +54684,7 @@
push hl
ld hl, w6_d000
ld bc, $28 * $10
+
.loop
ld [hl], -1
inc hl
@@ -54676,6 +54692,7 @@
ld a, c
or b
jr nz, .loop
+
pop hl
ld de, w6_d000
ld b, BANK(Function8c2cf) ; BANK(@)
@@ -54705,7 +54722,7 @@
; 8c323
.jumptable: ; 8c323 (23:4323)
- dw .DetermineWhichAnimation ; 00
+ dw StartTrainerBattle_DetermineWhichAnimation ; 00
; Animation 1: cave
dw StartTrainerBattle_LoadPokeBallGraphics ; 01
@@ -54751,7 +54768,7 @@
dw StartTrainerBattle_Finish ; 20
-.DetermineWhichAnimation: ; 8c365 (23:4365)
+StartTrainerBattle_DetermineWhichAnimation: ; 8c365 (23:4365)
; The screen flashes a different number of
; times depending on the level of your lead
; Pokemon relative to the opponent's.
@@ -55272,27 +55289,27 @@
db %00001111, %11110000
db %00000011, %11000000
-Function8c6d8: ; 8c6d8
+WipeLYOverrides: ; 8c6d8
ld a, [rSVBK]
push af
ld a, $5
ld [rSVBK], a
ld hl, LYOverrides
- call Function8c6ef
+ call .wipe
ld hl, LYOverridesBackup
- call Function8c6ef
+ call .wipe
pop af
ld [rSVBK], a
ret
; 8c6ef
-Function8c6ef: ; 8c6ef
+.wipe: ; 8c6ef
xor a
- ld c, $90
-.asm_8c6f2
+ ld c, SCREEN_HEIGHT_PX
+.loop
ld [hli], a
dec c
- jr nz, .asm_8c6f2
+ jr nz, .loop
ret
; 8c6f7
@@ -55341,7 +55358,7 @@
sine_wave $100
; 8c768
-macro_8c792: macro
+zoombox: macro
; width, height, start y, start x
db \1, \2
dwcoord \3, \4
@@ -55379,20 +55396,20 @@
; 8c792 (23:4792)
.boxes: ; 8c792
- macro_8c792 4, 2, 8, 8
- macro_8c792 6, 4, 7, 7
- macro_8c792 8, 6, 6, 6
- macro_8c792 10, 8, 5, 5
- macro_8c792 12, 10, 4, 4
- macro_8c792 14, 12, 3, 3
- macro_8c792 16, 14, 2, 2
- macro_8c792 18, 16, 1, 1
- macro_8c792 20, 18, 0, 0
+ zoombox 4, 2, 8, 8
+ zoombox 6, 4, 7, 7
+ zoombox 8, 6, 6, 6
+ zoombox 10, 8, 5, 5
+ zoombox 12, 10, 4, 4
+ zoombox 14, 12, 3, 3
+ zoombox 16, 14, 2, 2
+ zoombox 18, 16, 1, 1
+ zoombox 20, 18, 0, 0
db -1
; 8c7b7
.Copy: ; 8c7b7 (23:47b7)
- ld a, -1
+ ld a, $ff
.row
push bc
push hl
--- a/wram.asm
+++ b/wram.asm
@@ -1872,6 +1872,8 @@
ds 1
ds 1
+SECTION "Enemy Party", WRAMX, BANK [1]
+OTPlayerName::
wd26b:: ds 1
wd26c:: ds 1
wd26d:: ds 4
@@ -1878,9 +1880,6 @@
wd271:: ds 5
wd276:: ds 10
-
-SECTION "Enemy Party", WRAMX, BANK [1]
-
OTPartyCount:: ds 1 ; d280
OTPartySpecies:: ds PARTY_LENGTH ; d281
OTPartyEnd:: ds 1
@@ -2741,3 +2740,7 @@
w6_d600:: ds $600
INCLUDE "sram.asm"
+
+SECTION "WRAM 7", WRAMX, BANK [7]
+w7_d000:: ds $1000 - 1
+w7_dfff:: ds 1