fix pokemon attributes and the wilds_data script

jbr1989 · May 6, 2022 · 817eee4 · 817eee4
1 parent 9b42fad
commit 817eee4
Show file tree

Hide file tree

Showing 33 changed files with 34 additions and 34 deletions.
diff --git a/pokemon/pokemon/bellossom/wilds_data.asm b/pokemon/pokemon/bellossom/wilds_data.asm
@@ -37,7 +37,7 @@
     db 0 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
-    db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
+    db 0 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 
     ; Overworld sprite properties.
 

diff --git a/pokemon/pokemon/blissey/wilds_data.asm b/pokemon/pokemon/blissey/wilds_data.asm
@@ -37,7 +37,7 @@
     db 0 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
-    db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
+    db 0 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 
     ; Overworld sprite properties.
 

diff --git a/pokemon/pokemon/carvanha/wilds_data.asm b/pokemon/pokemon/carvanha/wilds_data.asm
@@ -34,7 +34,7 @@
 
     ; Overworld properties (0 = no, 1 = yes).
 
-    db 0 ; Swim-only movement.
+    db 1 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).

diff --git a/pokemon/pokemon/chansey/wilds_data.asm b/pokemon/pokemon/chansey/wilds_data.asm
@@ -35,9 +35,9 @@
     ; Overworld properties (0 = no, 1 = yes).
 
     db 0 ; Swim-only movement.
-    db 0 ; Flee from player.
+    db 1 ; Flee from player.
     db 0 ; Lunge at player.
-    db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
+    db 0 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 
     ; Overworld sprite properties.
 

diff --git a/pokemon/pokemon/chinchou/wilds_data.asm b/pokemon/pokemon/chinchou/wilds_data.asm
@@ -34,7 +34,7 @@
 
     ; Overworld properties (0 = no, 1 = yes).
 
-    db 0 ; Swim-only movement.
+    db 1 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).

diff --git a/pokemon/pokemon/conkeldurr/wilds_data.asm b/pokemon/pokemon/conkeldurr/wilds_data.asm
@@ -12,7 +12,7 @@
     db NONE ; Biome(s) in which aggressive groups might appear (NONE for no groups).
     db NONE ; Tile which serves as this mon's disguise (NONE for no disguise).
     db TYPE ; Habitat tiles (TYPE as the final argument to apply type-based default tiles).
-    db TYPE ; Harvestable items (TYPE as the final argument to apply type-based default items).
+    db CONCRETE, TYPE ; Harvestable items (TYPE as the final argument to apply type-based default items).
 
     ; Field moves (0 = unable, 1 = able, 2 = force unable).
 

diff --git a/pokemon/pokemon/duraludon/wilds_data.asm b/pokemon/pokemon/duraludon/wilds_data.asm
@@ -37,7 +37,7 @@
     db 0 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
-    db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
+    db 2 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 
     ; Overworld sprite properties.
 

diff --git a/pokemon/pokemon/ekans/wilds_data.asm b/pokemon/pokemon/ekans/wilds_data.asm
@@ -35,7 +35,7 @@
     ; Overworld properties (0 = no, 1 = yes).
 
     db 0 ; Swim-only movement.
-    db 0 ; Flee from player.
+    db 1 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 

diff --git a/pokemon/pokemon/feebas/wilds_data.asm b/pokemon/pokemon/feebas/wilds_data.asm
@@ -34,7 +34,7 @@
 
     ; Overworld properties (0 = no, 1 = yes).
 
-    db 0 ; Swim-only movement.
+    db 1 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).

diff --git a/pokemon/pokemon/gardevoir/wilds_data.asm b/pokemon/pokemon/gardevoir/wilds_data.asm
@@ -37,7 +37,7 @@
     db 0 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
-    db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
+    db 0 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 
     ; Overworld sprite properties.
 

diff --git a/pokemon/pokemon/goldeen/wilds_data.asm b/pokemon/pokemon/goldeen/wilds_data.asm
@@ -34,7 +34,7 @@
 
     ; Overworld properties (0 = no, 1 = yes).
 
-    db 0 ; Swim-only movement.
+    db 1 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).

diff --git a/pokemon/pokemon/gurdurr/wilds_data.asm b/pokemon/pokemon/gurdurr/wilds_data.asm
@@ -12,7 +12,7 @@
     db NONE ; Biome(s) in which aggressive groups might appear (NONE for no groups).
     db NONE ; Tile which serves as this mon's disguise (NONE for no disguise).
     db TYPE ; Habitat tiles (TYPE as the final argument to apply type-based default tiles).
-    db TYPE ; Harvestable items (TYPE as the final argument to apply type-based default items).
+    db SCRAP_METAL, TYPE ; Harvestable items (TYPE as the final argument to apply type-based default items).
 
     ; Field moves (0 = unable, 1 = able, 2 = force unable).
 

diff --git a/pokemon/pokemon/gyarados/wilds_data.asm b/pokemon/pokemon/gyarados/wilds_data.asm
@@ -34,7 +34,7 @@
 
     ; Overworld properties (0 = no, 1 = yes).
 
-    db 0 ; Swim-only movement.
+    db 1 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).

diff --git a/pokemon/pokemon/horsea/wilds_data.asm b/pokemon/pokemon/horsea/wilds_data.asm
@@ -34,7 +34,7 @@
 
     ; Overworld properties (0 = no, 1 = yes).
 
-    db 0 ; Swim-only movement.
+    db 1 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).

diff --git a/pokemon/pokemon/jumpluff/wilds_data.asm b/pokemon/pokemon/jumpluff/wilds_data.asm
@@ -37,7 +37,7 @@
     db 0 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
-    db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
+    db 0 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 
     ; Overworld sprite properties.
 

diff --git a/pokemon/pokemon/kingdra/wilds_data.asm b/pokemon/pokemon/kingdra/wilds_data.asm
@@ -34,7 +34,7 @@
 
     ; Overworld properties (0 = no, 1 = yes).
 
-    db 0 ; Swim-only movement.
+    db 1 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).

diff --git a/pokemon/pokemon/lanturn/wilds_data.asm b/pokemon/pokemon/lanturn/wilds_data.asm
@@ -34,7 +34,7 @@
 
     ; Overworld properties (0 = no, 1 = yes).
 
-    db 0 ; Swim-only movement.
+    db 1 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).

diff --git a/pokemon/pokemon/lapras/wilds_data.asm b/pokemon/pokemon/lapras/wilds_data.asm
@@ -34,7 +34,7 @@
 
     ; Overworld properties (0 = no, 1 = yes).
 
-    db 0 ; Swim-only movement.
+    db 1 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).

diff --git a/pokemon/pokemon/magikarp/wilds_data.asm b/pokemon/pokemon/magikarp/wilds_data.asm
@@ -34,7 +34,7 @@
 
     ; Overworld properties (0 = no, 1 = yes).
 
-    db 0 ; Swim-only movement.
+    db 1 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).

diff --git a/pokemon/pokemon/marill/wilds_data.asm b/pokemon/pokemon/marill/wilds_data.asm
@@ -37,7 +37,7 @@
     db 0 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
-    db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
+    db 0 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 
     ; Overworld sprite properties.
 

diff --git a/pokemon/pokemon/pidgey/wilds_data.asm b/pokemon/pokemon/pidgey/wilds_data.asm
@@ -35,7 +35,7 @@
     ; Overworld properties (0 = no, 1 = yes).
 
     db 0 ; Swim-only movement.
-    db 0 ; Flee from player.
+    db 1 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 

diff --git a/pokemon/pokemon/pinsir/wilds_data.asm b/pokemon/pokemon/pinsir/wilds_data.asm
@@ -37,7 +37,7 @@
     db 0 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
-    db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
+    db 2 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 
     ; Overworld sprite properties.
 

diff --git a/pokemon/pokemon/poochyena/wilds_data.asm b/pokemon/pokemon/poochyena/wilds_data.asm
@@ -37,7 +37,7 @@
     db 0 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
-    db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
+    db 2 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 
     ; Overworld sprite properties.
 

diff --git a/pokemon/pokemon/rattata/wilds_data.asm b/pokemon/pokemon/rattata/wilds_data.asm
@@ -35,7 +35,7 @@
     ; Overworld properties (0 = no, 1 = yes).
 
     db 0 ; Swim-only movement.
-    db 0 ; Flee from player.
+    db 1 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 

diff --git a/pokemon/pokemon/remoraid/wilds_data.asm b/pokemon/pokemon/remoraid/wilds_data.asm
@@ -34,7 +34,7 @@
 
     ; Overworld properties (0 = no, 1 = yes).
 
-    db 0 ; Swim-only movement.
+    db 1 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).

diff --git a/pokemon/pokemon/seadra/wilds_data.asm b/pokemon/pokemon/seadra/wilds_data.asm
@@ -34,7 +34,7 @@
 
     ; Overworld properties (0 = no, 1 = yes).
 
-    db 0 ; Swim-only movement.
+    db 1 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).

diff --git a/pokemon/pokemon/seaking/wilds_data.asm b/pokemon/pokemon/seaking/wilds_data.asm
@@ -34,7 +34,7 @@
 
     ; Overworld properties (0 = no, 1 = yes).
 
-    db 0 ; Swim-only movement.
+    db 1 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).

diff --git a/pokemon/pokemon/sharpedo/wilds_data.asm b/pokemon/pokemon/sharpedo/wilds_data.asm
@@ -34,7 +34,7 @@
 
     ; Overworld properties (0 = no, 1 = yes).
 
-    db 0 ; Swim-only movement.
+    db 1 ; Swim-only movement.
     db 0 ; Flee from player.
     db 1 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).

diff --git a/pokemon/pokemon/skarmory/wilds_data.asm b/pokemon/pokemon/skarmory/wilds_data.asm
@@ -37,7 +37,7 @@
     db 0 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
-    db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
+    db 2 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 
     ; Overworld sprite properties.
 

diff --git a/pokemon/pokemon/sneasel/wilds_data.asm b/pokemon/pokemon/sneasel/wilds_data.asm
@@ -37,7 +37,7 @@
     db 0 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
-    db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
+    db 2 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 
     ; Overworld sprite properties.
 

diff --git a/pokemon/pokemon/spearow/wilds_data.asm b/pokemon/pokemon/spearow/wilds_data.asm
@@ -35,7 +35,7 @@
     ; Overworld properties (0 = no, 1 = yes).
 
     db 0 ; Swim-only movement.
-    db 0 ; Flee from player.
+    db 1 ; Flee from player.
     db 0 ; Lunge at player.
     db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 

diff --git a/pokemon/pokemon/tauros/wilds_data.asm b/pokemon/pokemon/tauros/wilds_data.asm
@@ -37,7 +37,7 @@
     db 0 ; Swim-only movement.
     db 0 ; Flee from player.
     db 0 ; Lunge at player.
-    db 1 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
+    db 2 ; Aggression level (0 = never aggro, 1 = normal, 2 = always aggro).
 
     ; Overworld sprite properties.
 

diff --git a/pokemon/pokemon/timburr/wilds_data.asm b/pokemon/pokemon/timburr/wilds_data.asm
@@ -12,7 +12,7 @@
     db NONE ; Biome(s) in which aggressive groups might appear (NONE for no groups).
     db NONE ; Tile which serves as this mon's disguise (NONE for no disguise).
     db TYPE ; Habitat tiles (TYPE as the final argument to apply type-based default tiles).
-    db TYPE ; Harvestable items (TYPE as the final argument to apply type-based default items).
+    db LOG, TYPE ; Harvestable items (TYPE as the final argument to apply type-based default items).
 
     ; Field moves (0 = unable, 1 = able, 2 = force unable).