diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-23 03:41:52 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-23 03:51:15 -0400 |
| commit | 185b0a1c86e442d9c3ecd38d7c3fc7cfdb24be21 (patch) | |
| tree | 0a7b16d82178d2d99f41bbb0be80ba7e9ab84f23 /data/wild/swarm_grass.asm | |
| parent | 4c480a23dc2f81323b48670612cb23516a544e86 (diff) | |
Wild Pokemon functions and data
Replaced encounter rates with percent values
Added new constants denoting the number of wild Pokemon in the grass and water wild constructs
Annotated and relabeled the encounter generating functions
Renamed a WRAM address associaed with the temporary storage of the wild Pokemon's species
Moved spawn constants to constants/map_constants.asm for use anywhere in the disassembly
Diffstat (limited to 'data/wild/swarm_grass.asm')
| -rw-r--r-- | data/wild/swarm_grass.asm | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/data/wild/swarm_grass.asm b/data/wild/swarm_grass.asm index 319b71d3c..61d0d8532 100644 --- a/data/wild/swarm_grass.asm +++ b/data/wild/swarm_grass.asm @@ -1,59 +1,59 @@ ; swarms in grass ; Dunsparce swarm - db GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE - db $0a,$0a,$0a ; encounter rates: morn/day/nite + map DARK_CAVE_VIOLET_ENTRANCE + db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn - db 3,GEODUDE - db 3,DUNSPARCE - db 2,ZUBAT - db 2,GEODUDE - db 2,DUNSPARCE - db 4,DUNSPARCE - db 4,DUNSPARCE + db 3, GEODUDE + db 3, DUNSPARCE + db 2, ZUBAT + db 2, GEODUDE + db 2, DUNSPARCE + db 4, DUNSPARCE + db 4, DUNSPARCE ; day - db 3,GEODUDE - db 3,DUNSPARCE - db 2,ZUBAT - db 2,GEODUDE - db 2,DUNSPARCE - db 4,DUNSPARCE - db 4,DUNSPARCE + db 3, GEODUDE + db 3, DUNSPARCE + db 2, ZUBAT + db 2, GEODUDE + db 2, DUNSPARCE + db 4, DUNSPARCE + db 4, DUNSPARCE ; nite - db 3,GEODUDE - db 3,DUNSPARCE - db 2,ZUBAT - db 2,GEODUDE - db 2,DUNSPARCE - db 4,DUNSPARCE - db 4,DUNSPARCE + db 3, GEODUDE + db 3, DUNSPARCE + db 2, ZUBAT + db 2, GEODUDE + db 2, DUNSPARCE + db 4, DUNSPARCE + db 4, DUNSPARCE ; Yanma swarm - db GROUP_ROUTE_35, MAP_ROUTE_35 - db $19,$19,$19 ; encounter rates: morn/day/nite + map ROUTE_35 + db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - db 12,NIDORAN_M - db 12,NIDORAN_F - db 12,YANMA - db 14,YANMA - db 14,PIDGEY - db 10,DITTO - db 10,DITTO + db 12, NIDORAN_M + db 12, NIDORAN_F + db 12, YANMA + db 14, YANMA + db 14, PIDGEY + db 10, DITTO + db 10, DITTO ; day - db 12,NIDORAN_M - db 12,NIDORAN_F - db 12,YANMA - db 14,YANMA - db 14,PIDGEY - db 10,DITTO - db 10,DITTO + db 12, NIDORAN_M + db 12, NIDORAN_F + db 12, YANMA + db 14, YANMA + db 14, PIDGEY + db 10, DITTO + db 10, DITTO ; nite - db 12,NIDORAN_M - db 12,NIDORAN_F - db 12,YANMA - db 14,YANMA - db 14,HOOTHOOT - db 10,DITTO - db 10,DITTO + db 12, NIDORAN_M + db 12, NIDORAN_F + db 12, YANMA + db 14, YANMA + db 14, HOOTHOOT + db 10, DITTO + db 10, DITTO - db $ff ; end + db -1 ; end |