diff options
Diffstat (limited to 'data/wild/fish.asm')
| -rw-r--r-- | data/wild/fish.asm | 76 |
1 files changed, 41 insertions, 35 deletions
diff --git a/data/wild/fish.asm b/data/wild/fish.asm index 91a887b53..ee8299ccb 100644 --- a/data/wild/fish.asm +++ b/data/wild/fish.asm @@ -1,19 +1,25 @@ time_group EQUS "0," ; use the nth TimeFishGroups entry +fishgroup: MACRO +; chance, old rod, good rod, super rod + dbwww \1, \2, \3, \4 +ENDM + FishGroups: ; 92488 - dbwww 50 percent + 1, .Shore_Old, .Shore_Good, .Shore_Super - dbwww 50 percent + 1, .Ocean_Old, .Ocean_Good, .Ocean_Super - dbwww 50 percent + 1, .Lake_Old, .Lake_Good, .Lake_Super - dbwww 50 percent + 1, .Pond_Old, .Pond_Good, .Pond_Super - dbwww 50 percent + 1, .Dratini_Old, .Dratini_Good, .Dratini_Super - dbwww 50 percent + 1, .Qwilfish_Swarm_Old, .Qwilfish_Swarm_Good, .Qwilfish_Swarm_Super - dbwww 50 percent + 1, .Remoraid_Swarm_Old, .Remoraid_Swarm_Good, .Remoraid_Swarm_Super - dbwww 50 percent + 1, .Gyarados_Old, .Gyarados_Good, .Gyarados_Super - dbwww 50 percent + 1, .Dratini_2_Old, .Dratini_2_Good, .Dratini_2_Super - dbwww 50 percent + 1, .WhirlIslands_Old, .WhirlIslands_Good, .WhirlIslands_Super - dbwww 50 percent + 1, .Qwilfish_Old, .Qwilfish_Good, .Qwilfish_Super - dbwww 50 percent + 1, .Remoraid_Old, .Remoraid_Good, .Remoraid_Super - dbwww 50 percent + 1, .Qwilfish_NoSwarm_Old, .Qwilfish_NoSwarm_Good, .Qwilfish_NoSwarm_Super +; entries correspond to FISHGROUP_* constants + fishgroup 50 percent + 1, .Shore_Old, .Shore_Good, .Shore_Super + fishgroup 50 percent + 1, .Ocean_Old, .Ocean_Good, .Ocean_Super + fishgroup 50 percent + 1, .Lake_Old, .Lake_Good, .Lake_Super + fishgroup 50 percent + 1, .Pond_Old, .Pond_Good, .Pond_Super + fishgroup 50 percent + 1, .Dratini_Old, .Dratini_Good, .Dratini_Super + fishgroup 50 percent + 1, .Qwilfish_Swarm_Old, .Qwilfish_Swarm_Good, .Qwilfish_Swarm_Super + fishgroup 50 percent + 1, .Remoraid_Swarm_Old, .Remoraid_Swarm_Good, .Remoraid_Swarm_Super + fishgroup 50 percent + 1, .Gyarados_Old, .Gyarados_Good, .Gyarados_Super + fishgroup 50 percent + 1, .Dratini_2_Old, .Dratini_2_Good, .Dratini_2_Super + fishgroup 50 percent + 1, .WhirlIslands_Old, .WhirlIslands_Good, .WhirlIslands_Super + fishgroup 50 percent + 1, .Qwilfish_Old, .Qwilfish_Good, .Qwilfish_Super + fishgroup 50 percent + 1, .Remoraid_Old, .Remoraid_Good, .Remoraid_Super + fishgroup 50 percent + 1, .Qwilfish_NoSwarm_Old, .Qwilfish_NoSwarm_Good, .Qwilfish_NoSwarm_Super .Shore_Old: ; 924e3 db 70 percent + 1, MAGIKARP, 10 @@ -202,26 +208,26 @@ FishGroups: ; 92488 TimeFishGroups: ; 9266f ; day nite - db CORSOLA, 20, STARYU, 20 - db CORSOLA, 40, STARYU, 40 - db SHELLDER, 20, SHELLDER, 20 - db SHELLDER, 40, SHELLDER, 40 - db GOLDEEN, 20, GOLDEEN, 20 - db GOLDEEN, 40, GOLDEEN, 40 - db POLIWAG, 20, POLIWAG, 20 - db POLIWAG, 40, POLIWAG, 40 - db DRATINI, 20, DRATINI, 20 - db DRATINI, 40, DRATINI, 40 - db QWILFISH, 20, QWILFISH, 20 - db QWILFISH, 40, QWILFISH, 40 - db REMORAID, 20, REMORAID, 20 - db REMORAID, 40, REMORAID, 40 - db GYARADOS, 20, GYARADOS, 20 - db GYARADOS, 40, GYARADOS, 40 - db DRATINI, 10, DRATINI, 10 - db DRATINI, 10, DRATINI, 10 - db HORSEA, 20, HORSEA, 20 - db HORSEA, 40, HORSEA, 40 - db TENTACOOL, 20, TENTACOOL, 20 - db TENTACOOL, 40, TENTACOOL, 40 + db CORSOLA, 20, STARYU, 20 ; 0 + db CORSOLA, 40, STARYU, 40 ; 1 + db SHELLDER, 20, SHELLDER, 20 ; 2 + db SHELLDER, 40, SHELLDER, 40 ; 3 + db GOLDEEN, 20, GOLDEEN, 20 ; 4 + db GOLDEEN, 40, GOLDEEN, 40 ; 5 + db POLIWAG, 20, POLIWAG, 20 ; 6 + db POLIWAG, 40, POLIWAG, 40 ; 7 + db DRATINI, 20, DRATINI, 20 ; 8 + db DRATINI, 40, DRATINI, 40 ; 9 + db QWILFISH, 20, QWILFISH, 20 ; 10 + db QWILFISH, 40, QWILFISH, 40 ; 11 + db REMORAID, 20, REMORAID, 20 ; 12 + db REMORAID, 40, REMORAID, 40 ; 13 + db GYARADOS, 20, GYARADOS, 20 ; 14 + db GYARADOS, 40, GYARADOS, 40 ; 15 + db DRATINI, 10, DRATINI, 10 ; 16 + db DRATINI, 10, DRATINI, 10 ; 17 + db HORSEA, 20, HORSEA, 20 ; 18 + db HORSEA, 40, HORSEA, 40 ; 19 + db TENTACOOL, 20, TENTACOOL, 20 ; 20 + db TENTACOOL, 40, TENTACOOL, 40 ; 21 ; 926c7 |