wild pokemon data

- Thanks to Sanqui for many Ruby/Sapphire names. https://github.com/Sanqui/romhacking/blob/master/pokemon/location-area-names
This commit is contained in:
YamaArashi 2015-10-25 22:56:06 -07:00
parent 269cda7ac9
commit 832b0b525f
8 changed files with 5585 additions and 23 deletions

View File

@ -1,5 +1,5 @@
.include "constants/constants.s"
.include "asm/macros.s"
.include "constants/constants.s"
.include "asm/charmap.s"
.syntax unified
@ -340538,7 +340538,7 @@ sub_80B4C74: ; 80B4C74
get_wild_data_index_for_map: ; 80B4CF8
push {r4-r6,lr}
movs r4, 0
ldr r0, =gUnknown_08552D48
ldr r0, =gWildMonHeaders
ldrb r1, [r0]
adds r5, r0, 0
cmp r1, 0xFF
@ -341389,7 +341389,7 @@ is_it_battle_time_2: ; 80B5288
lsrs r0, 24
cmp r0, 0x1
bne @080B543C
ldr r1, =gUnknown_08552D48
ldr r1, =gWildMonHeaders
lsls r2, r5, 2
adds r0, r2, r5
lsls r0, 2
@ -341409,7 +341409,7 @@ is_it_battle_time_2: ; 80B5288
bne @080B53D4
b @080B54FE
@080B53D4:
ldr r1, =gUnknown_08552D48
ldr r1, =gWildMonHeaders
adds r0, r4, r5
lsls r0, 2
adds r1, 0x4
@ -341441,7 +341441,7 @@ is_it_battle_time_2: ; 80B5288
cmp r0, 0x1
beq @080B54F6
@080B5418:
ldr r1, =gUnknown_08552D48
ldr r1, =gWildMonHeaders
adds r0, r4, r5
lsls r0, 2
adds r1, 0x4
@ -341481,7 +341481,7 @@ is_it_battle_time_2: ; 80B5288
lsrs r0, 24
cmp r0, 0x1
beq @080B54FE
ldr r1, =gUnknown_08552D48
ldr r1, =gWildMonHeaders
lsls r2, r5, 2
adds r0, r2, r5
lsls r0, 2
@ -341498,7 +341498,7 @@ is_it_battle_time_2: ; 80B5288
cmp r0, 0
beq @080B54FE
@080B5492:
ldr r1, =gUnknown_08552D48
ldr r1, =gWildMonHeaders
adds r0, r4, r5
lsls r0, 2
adds r1, 0x8
@ -341564,7 +341564,7 @@ sub_80B550C: ; 80B550C
ldr r0, =0x0000ffff
cmp r2, r0
beq @080B5568
ldr r1, =gUnknown_08552D48
ldr r1, =gWildMonHeaders
lsls r0, r2, 2
adds r0, r2
lsls r0, 2
@ -341697,7 +341697,7 @@ sub_80B5578: ; 80B5578
lsrs r0, 24
cmp r0, 0x1
bne @080B568C
ldr r1, =gUnknown_08552D48
ldr r1, =gWildMonHeaders
lsls r0, r4, 2
adds r0, r4
lsls r0, 2
@ -341746,7 +341746,7 @@ sub_80B5578: ; 80B5578
lsrs r0, 24
cmp r0, 0x1
beq @080B56F2
ldr r1, =gUnknown_08552D48
ldr r1, =gWildMonHeaders
lsls r0, r4, 2
adds r0, r4
lsls r0, 2
@ -341793,7 +341793,7 @@ sub_80B56FC: ; 80B56FC
ldr r0, =0x0000ffff
cmp r2, r0
beq @080B572C
ldr r0, =gUnknown_08552D48
ldr r0, =gWildMonHeaders
lsls r1, r2, 2
adds r1, r2
lsls r1, 2
@ -341836,7 +341836,7 @@ sub_80B5734: ; 80B5734
.align 2, 0
.pool
@080B5764:
ldr r4, =gUnknown_08552D48
ldr r4, =gWildMonHeaders
bl get_wild_data_index_for_map
lsls r0, 16
lsrs r0, 16
@ -341875,7 +341875,7 @@ wild_pokemon_rand_for_map: ; 80B57A0
ldr r0, =0x0000ffff
cmp r3, r0
beq @080B57D2
ldr r2, =gUnknown_08552D48
ldr r2, =gWildMonHeaders
lsls r1, r3, 2
adds r1, r3
lsls r1, 2
@ -341944,7 +341944,7 @@ sub_80B582C: ; 80B582C
ldr r0, =0x0000ffff
cmp r2, r0
beq @080B5868
ldr r1, =gUnknown_08552D48
ldr r1, =gWildMonHeaders
lsls r0, r2, 2
adds r0, r2
lsls r0, 2
@ -610102,7 +610102,7 @@ sub_813CB40: ; 813CB40
bne @0813CBC0
@0813CC44:
movs r6, 0
ldr r1, =gUnknown_08552D48
ldr r1, =gWildMonHeaders
ldrb r0, [r1]
cmp r0, 0xFF
beq @0813CCF8
@ -610137,7 +610137,7 @@ sub_813CB40: ; 813CB40
bl sub_813CD04
b @0813CC9C
@0813CC8C:
ldr r0, =gUnknown_08552D48
ldr r0, =gWildMonHeaders
adds r1, r4, r6
lsls r1, 2
adds r1, r0
@ -610148,7 +610148,7 @@ sub_813CB40: ; 813CB40
adds r0, r6, 0x1
lsls r0, 16
lsrs r6, r0, 16
ldr r1, =gUnknown_08552D48
ldr r1, =gWildMonHeaders
lsls r0, r6, 2
adds r0, r6
lsls r0, 2
@ -784849,7 +784849,7 @@ sub_8196B98: ; 8196B98
adds r2, r0, 0
mov r8, r1
movs r3, 0
ldr r0, =gUnknown_08552D48
ldr r0, =gWildMonHeaders
ldrb r1, [r0]
adds r7, r0, 0
cmp r1, 0xFF

View File

@ -3,6 +3,7 @@
.include "asm/macros/window.s"
.include "asm/macros/pokemon_data.s"
.include "asm/macros/ec.s"
.include "asm/macros/map.s"
.macro include_range start, end
.incbin "base_emerald.gba", \start, \end - \start

15
asm/macros/map.s Normal file
View File

@ -0,0 +1,15 @@
.macro new_map_group
.set cur_map_group, cur_map_group + 1
.set cur_map_num, 0
.endm
.macro map_group map_name
.set GROUP_\map_name, cur_map_group
.set MAP_\map_name, cur_map_num
.set cur_map_num, cur_map_num + 1
.endm
.macro map map_name
.byte GROUP_\map_name
.byte MAP_\map_name
.endm

View File

@ -28,10 +28,10 @@
.2byte (\level << 9) | \move
.endm
.macro evo_entry method, parameter, target_pokemon
.macro evo_entry method, parameter, target_species
.2byte \method
.2byte \parameter
.2byte \target_pokemon
.2byte \target_species
.2byte 0 ; padding
.endm
@ -42,3 +42,16 @@
.macro egg_moves_begin species
.2byte 20000 + \species
.endm
; If the min level equals the max level, only one level argument is needed.
.macro wild_mon species, min_level, max_level
.byte \min_level
.ifb \max_level
.byte \min_level
.else
.byte \max_level
.endif
.2byte SPECIES_\species
.endm

View File

@ -12,3 +12,4 @@
.include "constants/easy_chat_constants.s"
.include "constants/trainer_class_constants.s"
.include "constants/battle_frontier_constants.s"
.include "constants/map_constants.s"

587
constants/map_constants.s Normal file
View File

@ -0,0 +1,587 @@
.set cur_map_group, -1
new_map_group
map_group PETALBURG_CITY ; 0.0
map_group SLATEPORT_CITY ; 0.1
map_group MAUVILLE_CITY ; 0.2
map_group RUSTBORO_CITY ; 0.3
map_group FORTREE_CITY ; 0.4
map_group LILYCOVE_CITY ; 0.5
map_group MOSSDEEP_CITY ; 0.6
map_group SOOTOPOLIS_CITY ; 0.7
map_group EVER_GRANDE_CITY ; 0.8
map_group LITTLEROOT_TOWN ; 0.9
map_group OLDALE_TOWN ; 0.10
map_group DEWFORD_TOWN ; 0.11
map_group LAVARIDGE_TOWN ; 0.12
map_group FALLARBOR_TOWN ; 0.13
map_group VERDANTURF_TOWN ; 0.14
map_group PACIFIDLOG_TOWN ; 0.15
map_group ROUTE_101 ; 0.16
map_group ROUTE_102 ; 0.17
map_group ROUTE_103 ; 0.18
map_group ROUTE_104 ; 0.19
map_group ROUTE_105 ; 0.20
map_group ROUTE_106 ; 0.21
map_group ROUTE_107 ; 0.22
map_group ROUTE_108 ; 0.23
map_group ROUTE_109 ; 0.24
map_group ROUTE_110 ; 0.25
map_group ROUTE_111 ; 0.26
map_group ROUTE_112 ; 0.27
map_group ROUTE_113 ; 0.28
map_group ROUTE_114 ; 0.29
map_group ROUTE_115 ; 0.30
map_group ROUTE_116 ; 0.31
map_group ROUTE_117 ; 0.32
map_group ROUTE_118 ; 0.33
map_group ROUTE_119 ; 0.34
map_group ROUTE_120 ; 0.35
map_group ROUTE_121 ; 0.36
map_group ROUTE_122 ; 0.37
map_group ROUTE_123 ; 0.38
map_group ROUTE_124 ; 0.39
map_group ROUTE_125 ; 0.40
map_group ROUTE_126 ; 0.41
map_group ROUTE_127 ; 0.42
map_group ROUTE_128 ; 0.43
map_group ROUTE_129 ; 0.44
map_group ROUTE_130 ; 0.45
map_group ROUTE_131 ; 0.46
map_group ROUTE_132 ; 0.47
map_group ROUTE_133 ; 0.48
map_group ROUTE_134 ; 0.49
map_group UNDERWATER_1 ; 0.50
map_group UNDERWATER_2 ; 0.51
map_group UNDERWATER_3 ; 0.52
map_group UNDERWATER_4 ; 0.53
map_group UNDERWATER_5 ; 0.54
map_group UNDERWATER_6 ; 0.55
map_group UNDERWATER_7 ; 0.56
new_map_group
map_group LITTLEROOT_TOWN_BRENDANS_HOUSE_1F ; 1.0
map_group LITTLEROOT_TOWN_BRENDANS_HOUSE_2F ; 1.1
map_group LITTLEROOT_TOWN_MAYS_HOUSE_1F ; 1.2
map_group LITTLEROOT_TOWN_MAYS_HOUSE_2F ; 1.3
map_group LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB ; 1.4
new_map_group
map_group OLDALE_TOWN_HOUSE_1 ; 2.0
map_group OLDALE_TOWN_HOUSE_2 ; 2.1
map_group OLDALE_TOWN_POKEMON_CENTER_1F ; 2.2
map_group OLDALE_TOWN_POKEMON_CENTER_2F ; 2.3
map_group OLDALE_TOWN_MART ; 2.4
new_map_group
map_group DEWFORD_TOWN_HOUSE_1 ; 3.0
map_group DEWFORD_TOWN_POKEMON_CENTER_1F ; 3.1
map_group DEWFORD_TOWN_POKEMON_CENTER_2F ; 3.2
map_group DEWFORD_TOWN_GYM ; 3.3
map_group DEWFORD_TOWN_HALL ; 3.4
map_group DEWFORD_TOWN_HOUSE_2 ; 3.5
new_map_group
map_group LAVARIDGE_TOWN_HERB_SHOP ; 4.0
map_group LAVARIDGE_TOWN_GYM_1F ; 4.1
map_group LAVARIDGE_TOWN_GYM_B1F ; 4.2
map_group LAVARIDGE_TOWN_HOUSE ; 4.3
map_group LAVARIDGE_TOWN_MART ; 4.4
map_group LAVARIDGE_TOWN_POKEMON_CENTER_1F ; 4.5
map_group LAVARIDGE_TOWN_POKEMON_CENTER_2F ; 4.6
new_map_group
map_group FALLARBOR_TOWN_MART ; 5.0
map_group FALLARBOR_TOWN_BATTLE_TENT_LOBBY ; 5.1
map_group FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR ; 5.2
map_group FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM ; 5.3
map_group FALLARBOR_TOWN_POKEMON_CENTER_1F ; 5.4
map_group FALLARBOR_TOWN_POKEMON_CENTER_2F ; 5.5
map_group FALLARBOR_TOWN_HOUSE_1 ; 5.6
map_group FALLARBOR_TOWN_HOUSE_2 ; 5.7
new_map_group
map_group VERDANTURF_TOWN_BATTLE_TENT_LOBBY ; 6.0
map_group VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR ; 6.1
map_group VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM ; 6.2
map_group VERDANTURF_TOWN_MART ; 6.3
map_group VERDANTURF_TOWN_POKEMON_CENTER_1F ; 6.4
map_group VERDANTURF_TOWN_POKEMON_CENTER_2F ; 6.5
map_group VERDANTURF_TOWN_WANDAS_HOUSE ; 6.6
map_group VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE ; 6.7
map_group VERDANTURF_TOWN_HOUSE ; 6.8
new_map_group
map_group PACIFIDLOG_TOWN_POKEMON_CENTER_1F ; 7.0
map_group PACIFIDLOG_TOWN_POKEMON_CENTER_2F ; 7.1
map_group PACIFIDLOG_TOWN_HOUSE_1 ; 7.2
map_group PACIFIDLOG_TOWN_HOUSE_2 ; 7.3
map_group PACIFIDLOG_TOWN_HOUSE_3 ; 7.4
map_group PACIFIDLOG_TOWN_HOUSE_4 ; 7.5
map_group PACIFIDLOG_TOWN_HOUSE_5 ; 7.6
new_map_group
map_group PETALBURG_CITY_WALLYS_HOUSE ; 8.0
map_group PETALBURG_CITY_GYM ; 8.1
map_group PETALBURG_CITY_HOUSE_1 ; 8.2
map_group PETALBURG_CITY_HOUSE_2 ; 8.3
map_group PETALBURG_CITY_POKEMON_CENTER_1F ; 8.4
map_group PETALBURG_CITY_POKEMON_CENTER_2F ; 8.5
map_group PETALBURG_CITY_MART ; 8.6
new_map_group
map_group SLATEPORT_CITY_STERNS_SHIPYARD_1F ; 9.0
map_group SLATEPORT_CITY_STERNS_SHIPYARD_2F ; 9.1
map_group SLATEPORT_CITY_BATTLE_TENT_LOBBY ; 9.2
map_group SLATEPORT_CITY_BATTLE_TENT_CORRIDOR ; 9.3
map_group SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM ; 9.4
map_group SLATEPORT_CITY_HOUSE_1 ; 9.5
map_group SLATEPORT_CITY_POKEMON_FAN_CLUB ; 9.6
map_group SLATEPORT_CITY_OCEANIC_MUSEUM_1F ; 9.7
map_group SLATEPORT_CITY_OCEANIC_MUSEUM_2F ; 9.8
map_group SLATEPORT_CITY_HARBOR ; 9.9
map_group SLATEPORT_CITY_HOUSE_2 ; 9.10
map_group SLATEPORT_CITY_POKEMON_CENTER_1F ; 9.11
map_group SLATEPORT_CITY_POKEMON_CENTER_2F ; 9.12
map_group SLATEPORT_CITY_MART ; 9.13
new_map_group
map_group MAUVILLE_CITY_GYM ; 10.0
map_group MAUVILLE_CITY_BIKE_SHOP ; 10.1
map_group MAUVILLE_CITY_HOUSE_1 ; 10.2
map_group MAUVILLE_CITY_GAME_CORNER ; 10.3
map_group MAUVILLE_CITY_HOUSE_2 ; 10.4
map_group MAUVILLE_CITY_POKEMON_CENTER_1F ; 10.5
map_group MAUVILLE_CITY_POKEMON_CENTER_2F ; 10.6
map_group MAUVILLE_CITY_MART ; 10.7
new_map_group
map_group RUSTBORO_CITY_DEVON_CORP_1F ; 11.0
map_group RUSTBORO_CITY_DEVON_CORP_2F ; 11.1
map_group RUSTBORO_CITY_DEVON_CORP_3F ; 11.2
map_group RUSTBORO_CITY_GYM ; 11.3
map_group RUSTBORO_CITY_POKEMON_SCHOOL ; 11.4
map_group RUSTBORO_CITY_POKEMON_CENTER_1F ; 11.5
map_group RUSTBORO_CITY_POKEMON_CENTER_2F ; 11.6
map_group RUSTBORO_CITY_MART ; 11.7
map_group RUSTBORO_CITY_FLAT_1_1F ; 11.8
map_group RUSTBORO_CITY_FLAT_1_2F ; 11.9
map_group RUSTBORO_CITY_HOUSE_1 ; 11.10
map_group RUSTBORO_CITY_CUTTERS_HOUSE ; 11.11
map_group RUSTBORO_CITY_HOUSE_2 ; 11.12
map_group RUSTBORO_CITY_FLAT_2_1F ; 11.13
map_group RUSTBORO_CITY_FLAT_2_2F ; 11.14
map_group RUSTBORO_CITY_FLAT_2_3F ; 11.15
map_group RUSTBORO_CITY_HOUSE_3 ; 11.16
new_map_group
map_group FORTREE_CITY_HOUSE_1 ; 12.0
map_group FORTREE_CITY_GYM ; 12.1
map_group FORTREE_CITY_POKEMON_CENTER_1F ; 12.2
map_group FORTREE_CITY_POKEMON_CENTER_2F ; 12.3
map_group FORTREE_CITY_MART ; 12.4
map_group FORTREE_CITY_HOUSE_2 ; 12.5
map_group FORTREE_CITY_HOUSE_3 ; 12.6
map_group FORTREE_CITY_HOUSE_4 ; 12.7
map_group FORTREE_CITY_HOUSE_5 ; 12.8
map_group FORTREE_CITY_DECORATION_SHOP ; 12.9
new_map_group
map_group LILYCOVE_CITY_COVE_LILY_MOTEL_1F ; 13.0
map_group LILYCOVE_CITY_COVE_LILY_MOTEL_2F ; 13.1
map_group LILYCOVE_CITY_LILYCOVE_MUSEUM_1F ; 13.2
map_group LILYCOVE_CITY_LILYCOVE_MUSEUM_2F ; 13.3
map_group LILYCOVE_CITY_CONTEST_LOBBY ; 13.4
map_group LILYCOVE_CITY_CONTEST_HALL ; 13.5
map_group LILYCOVE_CITY_POKEMON_CENTER_1F ; 13.6
map_group LILYCOVE_CITY_POKEMON_CENTER_2F ; 13.7
map_group LILYCOVE_CITY_UNUSED_MART ; 13.8
map_group LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB ; 13.9
map_group LILYCOVE_CITY_HARBOR ; 13.10
map_group LILYCOVE_CITY_MOVE_DELETERS_HOUSE ; 13.11
map_group LILYCOVE_CITY_HOUSE_1 ; 13.12
map_group LILYCOVE_CITY_HOUSE_2 ; 13.13
map_group LILYCOVE_CITY_HOUSE_3 ; 13.14
map_group LILYCOVE_CITY_HOUSE_4 ; 13.15
map_group LILYCOVE_CITY_DEPARTMENT_STORE_1F ; 13.16
map_group LILYCOVE_CITY_DEPARTMENT_STORE_2F ; 13.17
map_group LILYCOVE_CITY_DEPARTMENT_STORE_3F ; 13.18
map_group LILYCOVE_CITY_DEPARTMENT_STORE_4F ; 13.19
map_group LILYCOVE_CITY_DEPARTMENT_STORE_5F ; 13.20
map_group LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP ; 13.21
map_group LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR ; 13.22
new_map_group
map_group MOSSDEEP_CITY_GYM ; 14.0
map_group MOSSDEEP_CITY_HOUSE_1 ; 14.1
map_group MOSSDEEP_CITY_HOUSE_2 ; 14.2
map_group MOSSDEEP_CITY_POKEMON_CENTER_1F ; 14.3
map_group MOSSDEEP_CITY_POKEMON_CENTER_2F ; 14.4
map_group MOSSDEEP_CITY_MART ; 14.5
map_group MOSSDEEP_CITY_HOUSE_3 ; 14.6
map_group MOSSDEEP_CITY_STEVENS_HOUSE ; 14.7
map_group MOSSDEEP_CITY_HOUSE_4 ; 14.8
map_group MOSSDEEP_CITY_SPACE_CENTER_1F ; 14.9
map_group MOSSDEEP_CITY_SPACE_CENTER_2F ; 14.10
map_group MOSSDEEP_CITY_GAME_CORNER_1F ; 14.11
map_group MOSSDEEP_CITY_GAME_CORNER_B1F ; 14.12
new_map_group
map_group SOOTOPOLIS_CITY_GYM_1F ; 15.0
map_group SOOTOPOLIS_CITY_GYM_B1F ; 15.1
map_group SOOTOPOLIS_CITY_POKEMON_CENTER_1F ; 15.2
map_group SOOTOPOLIS_CITY_POKEMON_CENTER_2F ; 15.3
map_group SOOTOPOLIS_CITY_MART ; 15.4
map_group SOOTOPOLIS_CITY_HOUSE_1 ; 15.5
map_group SOOTOPOLIS_CITY_HOUSE_2 ; 15.6
map_group SOOTOPOLIS_CITY_HOUSE_3 ; 15.7
map_group SOOTOPOLIS_CITY_HOUSE_4 ; 15.8
map_group SOOTOPOLIS_CITY_HOUSE_5 ; 15.9
map_group SOOTOPOLIS_CITY_HOUSE_6 ; 15.10
map_group SOOTOPOLIS_CITY_HOUSE_7 ; 15.11
map_group SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE ; 15.12
map_group SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F ; 15.13
map_group SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F ; 15.14
new_map_group
map_group EVER_GRANDE_CITY_SIDNEYS_ROOM ; 16.0
map_group EVER_GRANDE_CITY_PHOEBES_ROOM ; 16.1
map_group EVER_GRANDE_CITY_GLACIAS_ROOM ; 16.2
map_group EVER_GRANDE_CITY_DRAKES_ROOM ; 16.3
map_group EVER_GRANDE_CITY_CHAMPIONS_ROOM ; 16.4
map_group EVER_GRANDE_CITY_HALL_1 ; 16.5
map_group EVER_GRANDE_CITY_HALL_2 ; 16.6
map_group EVER_GRANDE_CITY_HALL_3 ; 16.7
map_group EVER_GRANDE_CITY_HALL_4 ; 16.8
map_group EVER_GRANDE_CITY_HALL_5 ; 16.9
map_group EVER_GRANDE_CITY_POKEMON_LEAGUE_1F ; 16.10
map_group EVER_GRANDE_CITY_HALL_OF_FAME ; 16.11
map_group EVER_GRANDE_CITY_POKEMON_CENTER_1F ; 16.12
map_group EVER_GRANDE_CITY_POKEMON_CENTER_2F ; 16.13
map_group EVER_GRANDE_CITY_POKEMON_LEAGUE_2F ; 16.14
new_map_group
map_group ROUTE_104_MR_BRINEYS_HOUSE ; 17.0
map_group ROUTE_104_PRETTY_PETAL_FLOWER_SHOP ; 17.1
new_map_group
map_group ROUTE_111_WINSTRATE_FAMILYS_HOUSE ; 18.0
map_group ROUTE_111_OLD_LADYS_REST_STOP ; 18.1
new_map_group
map_group ROUTE_112_CABLE_CAR_STATION ; 19.0
map_group MT_CHIMNEY_CABLE_CAR_STATION ; 19.1
new_map_group
map_group ROUTE_114_FOSSIL_MANIACS_HOUSE ; 20.0
map_group ROUTE_114_FOSSIL_MANIACS_TUNNEL ; 20.1
map_group ROUTE_114_LANETTES_HOUSE ; 20.2
new_map_group
map_group ROUTE_116_TUNNELERS_REST_HOUSE ; 21.0
new_map_group
map_group ROUTE_117_POKEMON_DAY_CARE ; 22.0
new_map_group
map_group ROUTE_121_SAFARI_ZONE_ENTRANCE ; 23.0
new_map_group
map_group METEOR_FALLS_1F_1R ; 24.0
map_group METEOR_FALLS_1F_2R ; 24.1
map_group METEOR_FALLS_B1F_1R ; 24.2
map_group METEOR_FALLS_B1F_2R ; 24.3
map_group RUSTURF_TUNNEL ; 24.4
map_group UNDERWATER_SOOTOPOLIS_CITY ; 24.5
map_group DESERT_RUINS ; 24.6
map_group GRANITE_CAVE_1F ; 24.7
map_group GRANITE_CAVE_B1F ; 24.8
map_group GRANITE_CAVE_B2F ; 24.9
map_group GRANITE_CAVE_STEVENS_ROOM ; 24.10
map_group PETALBURG_WOODS ; 24.11
map_group MT_CHIMNEY ; 24.12
map_group JAGGED_PASS ; 24.13
map_group FIERY_PATH ; 24.14
map_group MT_PYRE_1F ; 24.15
map_group MT_PYRE_2F ; 24.16
map_group MT_PYRE_3F ; 24.17
map_group MT_PYRE_4F ; 24.18
map_group MT_PYRE_5F ; 24.19
map_group MT_PYRE_6F ; 24.20
map_group MT_PYRE_EXTERIOR ; 24.21
map_group MT_PYRE_SUMMIT ; 24.22
map_group AQUA_HIDEOUT_1F ; 24.23
map_group AQUA_HIDEOUT_B1F ; 24.24
map_group AQUA_HIDEOUT_B2F ; 24.25
map_group UNDERWATER_SEAFLOOR_CAVERN ; 24.26
map_group SEAFLOOR_CAVERN_ENTRANCE ; 24.27
map_group SEAFLOOR_CAVERN_ROOM_1 ; 24.28
map_group SEAFLOOR_CAVERN_ROOM_2 ; 24.29
map_group SEAFLOOR_CAVERN_ROOM_3 ; 24.30
map_group SEAFLOOR_CAVERN_ROOM_4 ; 24.31
map_group SEAFLOOR_CAVERN_ROOM_5 ; 24.32
map_group SEAFLOOR_CAVERN_ROOM_6 ; 24.33
map_group SEAFLOOR_CAVERN_ROOM_7 ; 24.34
map_group SEAFLOOR_CAVERN_ROOM_8 ; 24.35
map_group SEAFLOOR_CAVERN_ROOM_9 ; 24.36
map_group CAVE_OF_ORIGIN_ENTRANCE ; 24.37
map_group CAVE_OF_ORIGIN_1F ; 24.38
map_group CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_1 ; 24.39
map_group CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_2 ; 24.40
map_group CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_3 ; 24.41
map_group CAVE_OF_ORIGIN_B1F ; 24.42
map_group VICTORY_ROAD_1F ; 24.43
map_group VICTORY_ROAD_B1F ; 24.44
map_group VICTORY_ROAD_B2F ; 24.45
map_group SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM ; 24.46
map_group SHOAL_CAVE_LOW_TIDE_INNER_ROOM ; 24.47
map_group SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM ; 24.48
map_group SHOAL_CAVE_LOW_TIDE_LOWER_ROOM ; 24.49
map_group SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM ; 24.50
map_group SHOAL_CAVE_HIGH_TIDE_INNER_ROOM ; 24.51
map_group NEW_MAUVILLE_ENTRANCE ; 24.52
map_group NEW_MAUVILLE_INSIDE ; 24.53
map_group ABANDONED_SHIP_DECK ; 24.54
map_group ABANDONED_SHIP_CORRIDORS_1F ; 24.55
map_group ABANDONED_SHIP_ROOMS_1F ; 24.56
map_group ABANDONED_SHIP_CORRIDORS_B1F ; 24.57
map_group ABANDONED_SHIP_ROOMS_B1F ; 24.58
map_group ABANDONED_SHIP_ROOMS_2_B1F ; 24.59
map_group ABANDONED_SHIP_UNDERWATER_1 ; 24.60
map_group ABANDONED_SHIP_ROOM_B1F ; 24.61
map_group ABANDONED_SHIP_ROOMS_2_1F ; 24.62
map_group ABANDONED_SHIP_CAPTAINS_OFFICE ; 24.63
map_group ABANDONED_SHIP_UNDERWATER_2 ; 24.64
map_group ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS ; 24.65
map_group ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS ; 24.66
map_group ISLAND_CAVE ; 24.67
map_group ANCIENT_TOMB ; 24.68
map_group UNDERWATER_ROUTE_134 ; 24.69
map_group UNDERWATER_SEALED_CHAMBER ; 24.70
map_group SEALED_CHAMBER_OUTER_ROOM ; 24.71
map_group SEALED_CHAMBER_INNER_ROOM ; 24.72
map_group SCORCHED_SLAB ; 24.73
map_group AQUA_HIDEOUT_UNUSED_RUBY_MAP_1 ; 24.74
map_group AQUA_HIDEOUT_UNUSED_RUBY_MAP_2 ; 24.75
map_group AQUA_HIDEOUT_UNUSED_RUBY_MAP_3 ; 24.76
map_group SKY_PILLAR_ENTRANCE ; 24.77
map_group SKY_PILLAR_OUTSIDE ; 24.78
map_group SKY_PILLAR_1F ; 24.79
map_group SKY_PILLAR_2F ; 24.80
map_group SKY_PILLAR_3F ; 24.81
map_group SKY_PILLAR_4F ; 24.82
map_group SHOAL_CAVE_LOW_TIDE_ICE_ROOM ; 24.83
map_group SKY_PILLAR_5F ; 24.84
map_group SKY_PILLAR_TOP ; 24.85
map_group MAGMA_HIDEOUT_1F ; 24.86
map_group MAGMA_HIDEOUT_2F_1R ; 24.87
map_group MAGMA_HIDEOUT_2F_2R ; 24.88
map_group MAGMA_HIDEOUT_3F_1R ; 24.89
map_group MAGMA_HIDEOUT_3F_2R ; 24.90
map_group MAGMA_HIDEOUT_4F ; 24.91
map_group MAGMA_HIDEOUT_3F_3R ; 24.92
map_group MAGMA_HIDEOUT_2F_3R ; 24.93
map_group MIRAGE_TOWER_1F ; 24.94
map_group MIRAGE_TOWER_2F ; 24.95
map_group MIRAGE_TOWER_3F ; 24.96
map_group MIRAGE_TOWER_4F ; 24.97
map_group DESERT_UNDERPASS ; 24.98
map_group ARTISAN_CAVE_B1F ; 24.99
map_group ARTISAN_CAVE_1F ; 24.100
map_group UNDERWATER_MARINE_CAVE ; 24.101
map_group MARINE_CAVE_ENTRANCE ; 24.102
map_group MARINE_CAVE_END ; 24.103
map_group TERRA_CAVE_ENTRANCE ; 24.104
map_group TERRA_CAVE_END ; 24.105
map_group ALTERING_CAVE ; 24.106
map_group METEOR_FALLS_STEVENS_CAVE ; 24.107
new_map_group
map_group SECRET_BASE_RED_CAVE_1 ; 25.0
map_group SECRET_BASE_BROWN_CAVE_1 ; 25.1
map_group SECRET_BASE_BLUE_CAVE_1 ; 25.2
map_group SECRET_BASE_YELLOW_CAVE_1 ; 25.3
map_group SECRET_BASE_TREE_1 ; 25.4
map_group SECRET_BASE_SHRUB_1 ; 25.5
map_group SECRET_BASE_RED_CAVE_2 ; 25.6
map_group SECRET_BASE_BROWN_CAVE_2 ; 25.7
map_group SECRET_BASE_BLUE_CAVE_2 ; 25.8
map_group SECRET_BASE_YELLOW_CAVE_2 ; 25.9
map_group SECRET_BASE_TREE_2 ; 25.10
map_group SECRET_BASE_SHRUB_2 ; 25.11
map_group SECRET_BASE_RED_CAVE_3 ; 25.12
map_group SECRET_BASE_BROWN_CAVE_3 ; 25.13
map_group SECRET_BASE_BLUE_CAVE_3 ; 25.14
map_group SECRET_BASE_YELLOW_CAVE_3 ; 25.15
map_group SECRET_BASE_TREE_3 ; 25.16
map_group SECRET_BASE_SHRUB_3 ; 25.17
map_group SECRET_BASE_RED_CAVE_4 ; 25.18
map_group SECRET_BASE_BROWN_CAVE_4 ; 25.19
map_group SECRET_BASE_BLUE_CAVE_4 ; 25.20
map_group SECRET_BASE_YELLOW_CAVE_4 ; 25.21
map_group SECRET_BASE_TREE_4 ; 25.22
map_group SECRET_BASE_SHRUB_4 ; 25.23
map_group SINGLE_BATTLE_COLOSSEUM ; 25.24
map_group TRADE_CENTER ; 25.25
map_group RECORD_CORNER ; 25.26
map_group DOUBLE_BATTLE_COLOSSEUM ; 25.27
map_group LINK_CONTEST_ROOM_1 ; 25.28
map_group UNKNOWN_MAP_25_29 ; 25.29
map_group UNKNOWN_MAP_25_30 ; 25.30
map_group UNKNOWN_MAP_25_31 ; 25.31
map_group UNKNOWN_MAP_25_32 ; 25.32
map_group UNKNOWN_MAP_25_33 ; 25.33
map_group UNKNOWN_MAP_25_34 ; 25.34
map_group LINK_CONTEST_ROOM_2 ; 25.35
map_group LINK_CONTEST_ROOM_3 ; 25.36
map_group LINK_CONTEST_ROOM_4 ; 25.37
map_group LINK_CONTEST_ROOM_5 ; 25.38
map_group LINK_CONTEST_ROOM_6 ; 25.39
map_group INSIDE_OF_TRUCK ; 25.40
map_group SS_TIDAL_CORRIDOR ; 25.41
map_group SS_TIDAL_LOWER_DECK ; 25.42
map_group SS_TIDAL_ROOMS ; 25.43
map_group BATTLE_PYRAMID_SQUARE_1 ; 25.44
map_group BATTLE_PYRAMID_SQUARE_2 ; 25.45
map_group BATTLE_PYRAMID_SQUARE_3 ; 25.46
map_group BATTLE_PYRAMID_SQUARE_4 ; 25.47
map_group BATTLE_PYRAMID_SQUARE_5 ; 25.48
map_group BATTLE_PYRAMID_SQUARE_6 ; 25.49
map_group BATTLE_PYRAMID_SQUARE_7 ; 25.50
map_group BATTLE_PYRAMID_SQUARE_8 ; 25.51
map_group BATTLE_PYRAMID_SQUARE_9 ; 25.52
map_group BATTLE_PYRAMID_SQUARE_10 ; 25.53
map_group BATTLE_PYRAMID_SQUARE_11 ; 25.54
map_group BATTLE_PYRAMID_SQUARE_12 ; 25.55
map_group BATTLE_PYRAMID_SQUARE_13 ; 25.56
map_group BATTLE_PYRAMID_SQUARE_14 ; 25.57
map_group BATTLE_PYRAMID_SQUARE_15 ; 25.58
map_group BATTLE_PYRAMID_SQUARE_16 ; 25.59
map_group UNKNOWN_MAP_25_60 ; 25.60
new_map_group
map_group SAFARI_ZONE_NORTHWEST ; 26.0
map_group SAFARI_ZONE_NORTH ; 26.1
map_group SAFARI_ZONE_SOUTHWEST ; 26.2
map_group SAFARI_ZONE_SOUTH ; 26.3
map_group BATTLE_FRONTIER_OUTSIDE_WEST ; 26.4
map_group BATTLE_FRONTIER_BATTLE_TOWER_LOBBY ; 26.5
map_group BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR ; 26.6
map_group BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR ; 26.7
map_group BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM ; 26.8
map_group SOUTHERN_ISLAND_EXTERIOR ; 26.9
map_group SOUTHERN_ISLAND_INTERIOR ; 26.10
map_group SAFARI_ZONE_REST_HOUSE ; 26.11
map_group SAFARI_ZONE_NORTHEAST ; 26.12
map_group SAFARI_ZONE_SOUTHEAST ; 26.13
map_group BATTLE_FRONTIER_OUTSIDE_EAST ; 26.14
map_group BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM ; 26.15
map_group BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 ; 26.16
map_group BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2 ; 26.17
map_group BATTLE_FRONTIER_BATTLE_DOME_LOBBY ; 26.18
map_group BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR ; 26.19
map_group BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM ; 26.20
map_group BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM ; 26.21
map_group BATTLE_FRONTIER_BATTLE_PALACE_LOBBY ; 26.22
map_group BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR ; 26.23
map_group BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM ; 26.24
map_group BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY ; 26.25
map_group BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE ; 26.26
map_group BATTLE_FRONTIER_BATTLE_PYRAMID_TOP ; 26.27
map_group BATTLE_FRONTIER_BATTLE_ARENA_LOBBY ; 26.28
map_group BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR ; 26.29
map_group BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM ; 26.30
map_group BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY ; 26.31
map_group BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM ; 26.32
map_group BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM ; 26.33
map_group BATTLE_FRONTIER_BATTLE_PIKE_LOBBY ; 26.34
map_group BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR ; 26.35
map_group BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM ; 26.36
map_group BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 ; 26.37
map_group BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_2 ; 26.38
map_group BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_3 ; 26.39
map_group BATTLE_FRONTIER_RANKING_HALL ; 26.40
map_group BATTLE_FRONTIER_LOUNGE_1 ; 26.41
map_group BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER ; 26.42
map_group BATTLE_FRONTIER_LOUNGE_2 ; 26.43
map_group BATTLE_FRONTIER_LOUNGE_3 ; 26.44
map_group BATTLE_FRONTIER_LOUNGE_4 ; 26.45
map_group BATTLE_FRONTIER_SCOTTS_HOUSE ; 26.46
map_group BATTLE_FRONTIER_LOUNGE_5 ; 26.47
map_group BATTLE_FRONTIER_LOUNGE_6 ; 26.48
map_group BATTLE_FRONTIER_LOUNGE_7 ; 26.49
map_group BATTLE_FRONTIER_RECEPTION_GATE ; 26.50
map_group BATTLE_FRONTIER_LOUNGE_8 ; 26.51
map_group BATTLE_FRONTIER_LOUNGE_9 ; 26.52
map_group BATTLE_FRONTIER_POKEMON_CENTER_1F ; 26.53
map_group BATTLE_FRONTIER_POKEMON_CENTER_2F ; 26.54
map_group BATTLE_FRONTIER_MART ; 26.55
map_group FARAWAY_ISLAND_ENTRANCE ; 26.56
map_group FARAWAY_ISLAND_INTERIOR ; 26.57
map_group BIRTH_ISLAND_EXTERIOR ; 26.58
map_group BIRTH_ISLAND_HARBOR ; 26.59
map_group TRAINER_HILL_ENTRANCE ; 26.60
map_group TRAINER_HILL_1F ; 26.61
map_group TRAINER_HILL_2F ; 26.62
map_group TRAINER_HILL_3F ; 26.63
map_group TRAINER_HILL_4F ; 26.64
map_group TRAINER_HILL_ROOF ; 26.65
map_group NAVEL_ROCK_EXTERIOR ; 26.66
map_group NAVEL_ROCK_HARBOR ; 26.67
map_group NAVEL_ROCK_ENTRANCE ; 26.68
map_group NAVEL_ROCK_B1F ; 26.69
map_group NAVEL_ROCK_FORK ; 26.70
map_group NAVEL_ROCK_UP_1 ; 26.71
map_group NAVEL_ROCK_UP_2 ; 26.72
map_group NAVEL_ROCK_UP_3 ; 26.73
map_group NAVEL_ROCK_UP_4 ; 26.74
map_group NAVEL_ROCK_TOP ; 26.75
map_group NAVEL_ROCK_DOWN_1 ; 26.76
map_group NAVEL_ROCK_DOWN_2 ; 26.77
map_group NAVEL_ROCK_DOWN_3 ; 26.78
map_group NAVEL_ROCK_DOWN_4 ; 26.79
map_group NAVEL_ROCK_DOWN_5 ; 26.80
map_group NAVEL_ROCK_DOWN_6 ; 26.81
map_group NAVEL_ROCK_DOWN_7 ; 26.82
map_group NAVEL_ROCK_DOWN_8 ; 26.83
map_group NAVEL_ROCK_DOWN_9 ; 26.84
map_group NAVEL_ROCK_DOWN_10 ; 26.85
map_group NAVEL_ROCK_DOWN_11 ; 26.86
map_group NAVEL_ROCK_BOTTOM ; 26.87
map_group TRAINER_HILL_ELEVATOR ; 26.88
new_map_group
map_group ROUTE_104_PROTOTYPE ; 27.0
map_group ROUTE_104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP ; 27.1
new_map_group
map_group ROUTE_109_SEASHORE_HOUSE ; 28.0
new_map_group
map_group ROUTE_110_TRICK_HOUSE_ENTRANCE ; 29.0
map_group ROUTE_110_TRICK_HOUSE_END ; 29.1
map_group ROUTE_110_TRICK_HOUSE_CORRIDOR ; 29.2
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_1 ; 29.3
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_2 ; 29.4
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_3 ; 29.5
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_4 ; 29.6
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_5 ; 29.7
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_6 ; 29.8
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_7 ; 29.9
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_8 ; 29.10
map_group ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_1 ; 29.11
map_group ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_2 ; 29.12
new_map_group
map_group ROUTE_113_GLASS_WORKSHOP ; 30.0
new_map_group
map_group ROUTE_123_BERRY_MASTERS_HOUSE ; 31.0
new_map_group
map_group ROUTE_119_WEATHER_INSTITUTE_1F ; 32.0
map_group ROUTE_119_WEATHER_INSTITUTE_2F ; 32.1
map_group ROUTE_119_HOUSE ; 32.2
new_map_group
map_group ROUTE_124_DIVING_TREASURE_HUNTERS_HOUSE ; 33.0

View File

@ -3393,10 +3393,12 @@ gUnknown_085507B4: ; 85507B4
.incbin "base_emerald.gba", 0x5507b4, 0x18
gUnknown_085507CC: ; 85507CC
.incbin "base_emerald.gba", 0x5507cc, 0x257c
.incbin "base_emerald.gba", 0x5507cc, 0x18
gUnknown_08552D48: ; 8552D48
.incbin "base_emerald.gba", 0x552d48, 0xb4c
; 85507E4
.include "data/wild_mons.s"
.incbin "base_emerald.gba", 0x55370c, 0x188
gUnknown_08553894: ; 8553894
.incbin "base_emerald.gba", 0x553894, 0x180

4943
data/wild_mons.s Normal file

File diff suppressed because it is too large Load Diff