summaryrefslogtreecommitdiff
path: root/data/wild
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2018-06-24 16:09:41 +0200
committermid-kid <esteve.varela@gmail.com>2018-06-24 16:13:22 +0200
commit1d9a68dbdd0132035f1fc7b7ea8f7fdc24741507 (patch)
tree3af0a92f5f7dc10f32eed04d9daae52749fc33c2 /data/wild
parent131875d3e37044ec995287af7c93decd86a0d659 (diff)
Remove all address comments
Diffstat (limited to 'data/wild')
-rw-r--r--data/wild/bug_contest_mons.asm3
-rw-r--r--data/wild/fish.asm78
-rw-r--r--data/wild/flee_mons.asm7
-rw-r--r--data/wild/probabilities.asm6
-rw-r--r--data/wild/roammon_maps.asm3
-rw-r--r--data/wild/treemon_maps.asm6
-rw-r--r--data/wild/treemons.asm17
7 files changed, 55 insertions, 65 deletions
diff --git a/data/wild/bug_contest_mons.asm b/data/wild/bug_contest_mons.asm
index c3cdeaa8a..797127038 100644
--- a/data/wild/bug_contest_mons.asm
+++ b/data/wild/bug_contest_mons.asm
@@ -1,4 +1,4 @@
-ContestMons: ; 97d87
+ContestMons:
; %, species, min, max
db 20, CATERPIE, 7, 18
db 20, WEEDLE, 7, 18
@@ -11,4 +11,3 @@ ContestMons: ; 97d87
db 5, SCYTHER, 13, 14
db 5, PINSIR, 13, 14
db -1, VENOMOTH, 30, 40
-; 97db3
diff --git a/data/wild/fish.asm b/data/wild/fish.asm
index ee8299ccb..919a75c15 100644
--- a/data/wild/fish.asm
+++ b/data/wild/fish.asm
@@ -5,7 +5,7 @@ fishgroup: MACRO
dbwww \1, \2, \3, \4
ENDM
-FishGroups: ; 92488
+FishGroups:
; 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
@@ -21,192 +21,191 @@ FishGroups: ; 92488
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
+.Shore_Old:
db 70 percent + 1, MAGIKARP, 10
db 85 percent + 1, MAGIKARP, 10
db 100 percent, KRABBY, 10
-.Shore_Good: ; 924ec
+.Shore_Good:
db 35 percent, MAGIKARP, 20
db 70 percent, KRABBY, 20
db 90 percent + 1, KRABBY, 20
db 100 percent, time_group 0
-.Shore_Super: ; 924f8
+.Shore_Super:
db 40 percent, KRABBY, 40
db 70 percent, time_group 1
db 90 percent + 1, KRABBY, 40
db 100 percent, KINGLER, 40
-.Ocean_Old: ; 92504
+.Ocean_Old:
db 70 percent + 1, MAGIKARP, 10
db 85 percent + 1, MAGIKARP, 10
db 100 percent, TENTACOOL, 10
-.Ocean_Good: ; 9250d
+.Ocean_Good:
db 35 percent, MAGIKARP, 20
db 70 percent, TENTACOOL, 20
db 90 percent + 1, CHINCHOU, 20
db 100 percent, time_group 2
-.Ocean_Super: ; 92519
+.Ocean_Super:
db 40 percent, CHINCHOU, 40
db 70 percent, time_group 3
db 90 percent + 1, TENTACRUEL, 40
db 100 percent, LANTURN, 40
-.Lake_Old: ; 92525
+.Lake_Old:
db 70 percent + 1, MAGIKARP, 10
db 85 percent + 1, MAGIKARP, 10
db 100 percent, GOLDEEN, 10
-.Lake_Good: ; 9252e
+.Lake_Good:
db 35 percent, MAGIKARP, 20
db 70 percent, GOLDEEN, 20
db 90 percent + 1, GOLDEEN, 20
db 100 percent, time_group 4
-.Lake_Super: ; 9253a
+.Lake_Super:
db 40 percent, GOLDEEN, 40
db 70 percent, time_group 5
db 90 percent + 1, MAGIKARP, 40
db 100 percent, SEAKING, 40
-.Pond_Old: ; 92546
+.Pond_Old:
db 70 percent + 1, MAGIKARP, 10
db 85 percent + 1, MAGIKARP, 10
db 100 percent, POLIWAG, 10
-.Pond_Good: ; 9254f
+.Pond_Good:
db 35 percent, MAGIKARP, 20
db 70 percent, POLIWAG, 20
db 90 percent + 1, POLIWAG, 20
db 100 percent, time_group 6
-.Pond_Super: ; 9255b
+.Pond_Super:
db 40 percent, POLIWAG, 40
db 70 percent, time_group 7
db 90 percent + 1, MAGIKARP, 40
db 100 percent, POLIWAG, 40
-.Dratini_Old: ; 92567
+.Dratini_Old:
db 70 percent + 1, MAGIKARP, 10
db 85 percent + 1, MAGIKARP, 10
db 100 percent, MAGIKARP, 10
-.Dratini_Good: ; 92570
+.Dratini_Good:
db 35 percent, MAGIKARP, 20
db 70 percent, MAGIKARP, 20
db 90 percent + 1, MAGIKARP, 20
db 100 percent, time_group 8
-.Dratini_Super: ; 9257c
+.Dratini_Super:
db 40 percent, MAGIKARP, 40
db 70 percent, time_group 9
db 90 percent + 1, MAGIKARP, 40
db 100 percent, DRAGONAIR, 40
-.Qwilfish_Swarm_Old: ; 92588
+.Qwilfish_Swarm_Old:
db 70 percent + 1, MAGIKARP, 5
db 85 percent + 1, MAGIKARP, 5
db 100 percent, QWILFISH, 5
-.Qwilfish_Swarm_Good: ; 92591
+.Qwilfish_Swarm_Good:
db 35 percent, MAGIKARP, 20
db 70 percent, QWILFISH, 20
db 90 percent + 1, QWILFISH, 20
db 100 percent, time_group 10
-.Qwilfish_Swarm_Super: ; 9259d
+.Qwilfish_Swarm_Super:
db 40 percent, QWILFISH, 40
db 70 percent, time_group 11
db 90 percent + 1, QWILFISH, 40
db 100 percent, QWILFISH, 40
-.Remoraid_Swarm_Old: ; 925a9
+.Remoraid_Swarm_Old:
db 70 percent + 1, MAGIKARP, 10
db 85 percent + 1, MAGIKARP, 10
db 100 percent, REMORAID, 10
-.Remoraid_Swarm_Good: ; 925b2
+.Remoraid_Swarm_Good:
db 35 percent, MAGIKARP, 20
db 70 percent, REMORAID, 20
db 90 percent + 1, REMORAID, 20
db 100 percent, time_group 12
-.Remoraid_Swarm_Super: ; 925be
+.Remoraid_Swarm_Super:
db 40 percent, REMORAID, 40
db 70 percent, time_group 13
db 90 percent + 1, REMORAID, 40
db 100 percent, REMORAID, 40
-.Gyarados_Old: ; 925ca
+.Gyarados_Old:
db 70 percent + 1, MAGIKARP, 10
db 85 percent + 1, MAGIKARP, 10
db 100 percent, MAGIKARP, 10
-.Gyarados_Good: ; 925d3
+.Gyarados_Good:
db 35 percent, MAGIKARP, 20
db 70 percent, MAGIKARP, 20
db 90 percent + 1, MAGIKARP, 20
db 100 percent, time_group 14
-.Gyarados_Super: ; 925df
+.Gyarados_Super:
db 40 percent, MAGIKARP, 40
db 70 percent, time_group 15
db 90 percent + 1, MAGIKARP, 40
db 100 percent, MAGIKARP, 40
-.Dratini_2_Old: ; 925eb
+.Dratini_2_Old:
db 70 percent + 1, MAGIKARP, 10
db 85 percent + 1, MAGIKARP, 10
db 100 percent, MAGIKARP, 10
-.Dratini_2_Good: ; 925f4
+.Dratini_2_Good:
db 35 percent, MAGIKARP, 10
db 70 percent, MAGIKARP, 10
db 90 percent + 1, MAGIKARP, 10
db 100 percent, time_group 16
-.Dratini_2_Super: ; 92600
+.Dratini_2_Super:
db 40 percent, MAGIKARP, 10
db 70 percent, time_group 17
db 90 percent + 1, MAGIKARP, 10
db 100 percent, DRAGONAIR, 10
-.WhirlIslands_Old: ; 9260c
+.WhirlIslands_Old:
db 70 percent + 1, MAGIKARP, 10
db 85 percent + 1, MAGIKARP, 10
db 100 percent, KRABBY, 10
-.WhirlIslands_Good: ; 92615
+.WhirlIslands_Good:
db 35 percent, MAGIKARP, 20
db 70 percent, KRABBY, 20
db 90 percent + 1, KRABBY, 20
db 100 percent, time_group 18
-.WhirlIslands_Super: ; 92621
+.WhirlIslands_Super:
db 40 percent, KRABBY, 40
db 70 percent, time_group 19
db 90 percent + 1, KINGLER, 40
db 100 percent, SEADRA, 40
.Qwilfish_NoSwarm_Old:
-.Qwilfish_Old: ; 9262d
+.Qwilfish_Old:
db 70 percent + 1, MAGIKARP, 10
db 85 percent + 1, MAGIKARP, 10
db 100 percent, TENTACOOL, 10
.Qwilfish_NoSwarm_Good:
-.Qwilfish_Good: ; 92636
+.Qwilfish_Good:
db 35 percent, MAGIKARP, 20
db 70 percent, TENTACOOL, 20
db 90 percent + 1, TENTACOOL, 20
db 100 percent, time_group 20
.Qwilfish_NoSwarm_Super:
-.Qwilfish_Super: ; 92642
+.Qwilfish_Super:
db 40 percent, TENTACOOL, 40
db 70 percent, time_group 21
db 90 percent + 1, MAGIKARP, 40
db 100 percent, QWILFISH, 40
-.Remoraid_Old: ; 9264e
+.Remoraid_Old:
db 70 percent + 1, MAGIKARP, 10
db 85 percent + 1, MAGIKARP, 10
db 100 percent, POLIWAG, 10
-.Remoraid_Good: ; 92657
+.Remoraid_Good:
db 35 percent, MAGIKARP, 20
db 70 percent, POLIWAG, 20
db 90 percent + 1, POLIWAG, 20
db 100 percent, time_group 6
-.Remoraid_Super: ; 92663
+.Remoraid_Super:
db 40 percent, POLIWAG, 40
db 70 percent, time_group 7
db 90 percent + 1, MAGIKARP, 40
db 100 percent, REMORAID, 40
-; 9266f
-TimeFishGroups: ; 9266f
+TimeFishGroups:
; day nite
db CORSOLA, 20, STARYU, 20 ; 0
db CORSOLA, 40, STARYU, 40 ; 1
@@ -230,4 +229,3 @@ TimeFishGroups: ; 9266f
db HORSEA, 40, HORSEA, 40 ; 19
db TENTACOOL, 20, TENTACOOL, 20 ; 20
db TENTACOOL, 40, TENTACOOL, 40 ; 21
-; 926c7
diff --git a/data/wild/flee_mons.asm b/data/wild/flee_mons.asm
index 2c235d2e6..ae2a3a569 100644
--- a/data/wild/flee_mons.asm
+++ b/data/wild/flee_mons.asm
@@ -1,7 +1,7 @@
FleeMons:
; referenced by TryEnemyFlee and FastBallMultiplier
-SometimesFleeMons: ; 3c59a
+SometimesFleeMons:
db MAGNEMITE
db GRIMER
db TANGELA
@@ -17,7 +17,7 @@ SometimesFleeMons: ; 3c59a
db HERACROSS
db -1
-OftenFleeMons: ; 3c5a8
+OftenFleeMons:
db CUBONE
db ARTICUNO
db ZAPDOS
@@ -28,8 +28,7 @@ OftenFleeMons: ; 3c5a8
db TEDDIURSA
db -1
-AlwaysFleeMons: ; 3c5b1
+AlwaysFleeMons:
db RAIKOU
db ENTEI
db -1
-; 3c5b4
diff --git a/data/wild/probabilities.asm b/data/wild/probabilities.asm
index 1813603c2..bf3144bbe 100644
--- a/data/wild/probabilities.asm
+++ b/data/wild/probabilities.asm
@@ -3,7 +3,7 @@ mon_prob: MACRO
db \1, \2 * 2
ENDM
-GrassMonProbTable: ; 2a1cb
+GrassMonProbTable:
mon_prob 30, 0 ; 30% chance
mon_prob 60, 1 ; 30% chance
mon_prob 80, 2 ; 20% chance
@@ -11,10 +11,8 @@ GrassMonProbTable: ; 2a1cb
mon_prob 95, 4 ; 5% chance
mon_prob 99, 5 ; 4% chance
mon_prob 100, 6 ; 1% chance
-; 2a1d9
-WaterMonProbTable: ; 2a1d9
+WaterMonProbTable:
mon_prob 60, 0 ; 60% chance
mon_prob 90, 1 ; 30% chance
mon_prob 100, 2 ; 10% chance
-; 2a1df
diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm
index a57f561b2..747dffae1 100644
--- a/data/wild/roammon_maps.asm
+++ b/data/wild/roammon_maps.asm
@@ -11,7 +11,7 @@ endr
db 0
ENDM
-RoamMaps: ; 2a40f
+RoamMaps:
; there are NUM_ROAMMON_MAPS entries
; start map, ...other maps
roam_map ROUTE_29, ROUTE_30, ROUTE_46
@@ -31,4 +31,3 @@ RoamMaps: ; 2a40f
roam_map ROUTE_45, ROUTE_44, ROUTE_46
roam_map ROUTE_46, ROUTE_45, ROUTE_29
db -1 ; end
-; 2a4a0
diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm
index 8bc742a3e..b85962399 100644
--- a/data/wild/treemon_maps.asm
+++ b/data/wild/treemon_maps.asm
@@ -3,7 +3,7 @@ treemon_map: MACRO
db \2 ; treemon set
ENDM
-TreeMonMaps: ; b825e
+TreeMonMaps:
treemon_map ROUTE_26, TREEMON_SET_KANTO
treemon_map ROUTE_27, TREEMON_SET_KANTO
treemon_map ROUTE_28, TREEMON_SET_CITY
@@ -39,12 +39,10 @@ TreeMonMaps: ; b825e
treemon_map SILVER_CAVE_OUTSIDE, TREEMON_SET_CITY
treemon_map ILEX_FOREST, TREEMON_SET_FOREST
db -1
-; b82c5
-RockMonMaps: ; b82c5
+RockMonMaps:
treemon_map CIANWOOD_CITY, TREEMON_SET_ROCK
treemon_map ROUTE_40, TREEMON_SET_ROCK
treemon_map DARK_CAVE_VIOLET_ENTRANCE, TREEMON_SET_ROCK
treemon_map SLOWPOKE_WELL_B1F, TREEMON_SET_ROCK
db -1
-; b82d2
diff --git a/data/wild/treemons.asm b/data/wild/treemons.asm
index 5a29d675c..a6b1922f3 100644
--- a/data/wild/treemons.asm
+++ b/data/wild/treemons.asm
@@ -1,4 +1,4 @@
-TreeMons: ; b82e8
+TreeMons:
; entries correspond to TREEMON_SET_* constants
dw TreeMonSet_City
dw TreeMonSet_Canyon
@@ -15,7 +15,7 @@ TreeMons: ; b82e8
; db %, species, level
TreeMonSet_City:
-TreeMonSet_Canyon: ; b82fa
+TreeMonSet_Canyon:
; common
db 50, SPEAROW, 10
db 15, SPEAROW, 10
@@ -33,7 +33,7 @@ TreeMonSet_Canyon: ; b82fa
db 5, AIPOM, 10
db -1
-TreeMonSet_Town: ; b8320
+TreeMonSet_Town:
; common
db 50, SPEAROW, 10
db 15, EKANS, 10
@@ -51,7 +51,7 @@ TreeMonSet_Town: ; b8320
db 5, AIPOM, 10
db -1
-TreeMonSet_Route: ; b8346
+TreeMonSet_Route:
; common
db 50, HOOTHOOT, 10
db 15, SPINARAK, 10
@@ -69,7 +69,7 @@ TreeMonSet_Route: ; b8346
db 5, EXEGGCUTE, 10
db -1
-TreeMonSet_Kanto: ; b836c
+TreeMonSet_Kanto:
; common
db 50, HOOTHOOT, 10
db 15, EKANS, 10
@@ -87,7 +87,7 @@ TreeMonSet_Kanto: ; b836c
db 5, EXEGGCUTE, 10
db -1
-TreeMonSet_Lake: ; b8392
+TreeMonSet_Lake:
; common
db 50, HOOTHOOT, 10
db 15, VENONAT, 10
@@ -105,7 +105,7 @@ TreeMonSet_Lake: ; b8392
db 5, EXEGGCUTE, 10
db -1
-TreeMonSet_Forest: ; b83b8
+TreeMonSet_Forest:
; common
db 50, HOOTHOOT, 10
db 15, PINECO, 10
@@ -123,8 +123,7 @@ TreeMonSet_Forest: ; b83b8
db 5, KAKUNA, 10
db -1
-TreeMonSet_Rock: ; b83de
+TreeMonSet_Rock:
db 90, KRABBY, 15
db 10, SHUCKLE, 15
db -1
-; b83e5