diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-11 22:59:30 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-11 22:59:30 -0500 |
| commit | 213dcc70d77ade7cf587d57016cc5bb405494fe8 (patch) | |
| tree | e2a91b6700c87dbad04dcf918054c4ae26871776 /data/wild | |
| parent | f1f84743f7759a0f808f935add82439ba6637d2b (diff) | |
More consistent data tables
Diffstat (limited to 'data/wild')
| -rw-r--r-- | data/wild/bug_contest_mons.asm | 2 | ||||
| -rw-r--r-- | data/wild/johto_grass.asm | 2 | ||||
| -rw-r--r-- | data/wild/johto_water.asm | 2 | ||||
| -rw-r--r-- | data/wild/kanto_grass.asm | 2 | ||||
| -rw-r--r-- | data/wild/kanto_water.asm | 2 | ||||
| -rw-r--r-- | data/wild/roammon_maps.asm | 2 | ||||
| -rw-r--r-- | data/wild/swarm_grass.asm | 4 | ||||
| -rw-r--r-- | data/wild/swarm_water.asm | 4 |
8 files changed, 18 insertions, 2 deletions
diff --git a/data/wild/bug_contest_mons.asm b/data/wild/bug_contest_mons.asm index 1b74fb3ee..c3cdeaa8a 100644 --- a/data/wild/bug_contest_mons.asm +++ b/data/wild/bug_contest_mons.asm @@ -1,3 +1,4 @@ +ContestMons: ; 97d87 ; %, species, min, max db 20, CATERPIE, 7, 18 db 20, WEEDLE, 7, 18 @@ -10,3 +11,4 @@ db 5, SCYTHER, 13, 14 db 5, PINSIR, 13, 14 db -1, VENOMOTH, 30, 40 +; 97db3 diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index f241dd5d8..be435b048 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -1,5 +1,7 @@ ; Johto Pokémon in grass +JohtoGrassWildMons: ; 0x2a5e9 + map SPROUT_TOWER_2F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm index a4d957ef0..d6e11c3a0 100644 --- a/data/wild/johto_water.asm +++ b/data/wild/johto_water.asm @@ -1,5 +1,7 @@ ; Johto Pokémon in water +JohtoWaterWildMons: ; 0x2b11d + map RUINS_OF_ALPH_OUTSIDE db 2 percent ; encounter rate db 15, WOOPER diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm index e06627d19..415514748 100644 --- a/data/wild/kanto_grass.asm +++ b/data/wild/kanto_grass.asm @@ -1,5 +1,7 @@ ; Kanto Pokémon in grass +KantoGrassWildMons: ; 0x2b274 + map DIGLETTS_CAVE db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite ; morn diff --git a/data/wild/kanto_water.asm b/data/wild/kanto_water.asm index 558d56a26..71fab48fb 100644 --- a/data/wild/kanto_water.asm +++ b/data/wild/kanto_water.asm @@ -1,5 +1,7 @@ ; Kanto Pokémon in water +KantoWaterWildMons: ; 0x2b7f7 + map TOHJO_FALLS db 4 percent ; encounter rate db 20, GOLDEEN diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm index 403ebef25..ee213bff5 100644 --- a/data/wild/roammon_maps.asm +++ b/data/wild/roammon_maps.asm @@ -12,6 +12,7 @@ endr db 0 endm +RoamMaps: ; 2a40f roam_map ROUTE_29, 2, ROUTE_30, ROUTE_46 roam_map ROUTE_30, 2, ROUTE_29, ROUTE_31 roam_map ROUTE_31, 3, ROUTE_30, ROUTE_32, ROUTE_36 @@ -29,3 +30,4 @@ endm roam_map ROUTE_45, 2, ROUTE_44, ROUTE_46 roam_map ROUTE_46, 2, ROUTE_45, ROUTE_29 db -1 ; end +; 2a4a0 diff --git a/data/wild/swarm_grass.asm b/data/wild/swarm_grass.asm index 61d0d8532..a26417f64 100644 --- a/data/wild/swarm_grass.asm +++ b/data/wild/swarm_grass.asm @@ -1,4 +1,6 @@ -; swarms in grass +; Pokémon swarms in grass + +SwarmGrassWildMons: ; 0x2b8d0 ; Dunsparce swarm map DARK_CAVE_VIOLET_ENTRANCE diff --git a/data/wild/swarm_water.asm b/data/wild/swarm_water.asm index 67751b2bd..3f69af512 100644 --- a/data/wild/swarm_water.asm +++ b/data/wild/swarm_water.asm @@ -1,4 +1,6 @@ -; swarms in water +; Pokémon swarms in water + +SwarmWaterWildMons: ; 0x2b92f ; No swarms encountered while surfing in Crystal |