ruined city work

jbr1989 · May 7, 2022 · c4efe61 · c4efe61
1 parent 817eee4
commit c4efe61
Show file tree

Hide file tree

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

diff --git a/pokemon/pokemon/indeedee_female/overworld.png b/pokemon/pokemon/indeedee_female/overworld.png
diff --git a/pokemon/pokemon/indeedee_female/wilds_data.asm b/pokemon/pokemon/indeedee_female/wilds_data.asm
@@ -1,12 +1,12 @@
-    db DEFAULT ; Display name (DEFAULT for default name).
+    db INDEEDEE ; Display name (DEFAULT for default name).
 
     db 876 ; Dex number.
     db <It uses the horns on its head to sense the emotions of others. Males will act as valets for those they serve, looking after their every need.> ; Dex entry.
 
     db 28.0 ; Weight in kg.
     db 0.9 ; Height in meters.
 
-    db INDEEDEE 100 ; Base form(s) (MON_NAME for base species, then chance).
+    db INDEEDEE_FEMALE 50, INDEEDEE_MALE 50 ; Base form(s) (MON_NAME for base species, then chance).
 
     db TYPE ; Spawning biomes (TYPE as the final argument to apply type-based default tiles).
     db NONE ; Biome(s) in which aggressive groups might appear (NONE for no groups).

diff --git a/pokemon/pokemon/indeedee_male/overworld.png b/pokemon/pokemon/indeedee_male/overworld.png
diff --git a/pokemon/pokemon/indeedee_male/wilds_data.asm b/pokemon/pokemon/indeedee_male/wilds_data.asm
@@ -1,12 +1,12 @@
-    db DEFAULT ; Display name (DEFAULT for default name).
+    db INDEEDEE ; Display name (DEFAULT for default name).
 
     db 876 ; Dex number.
     db <It uses the horns on its head to sense the emotions of others. Males will act as valets for those they serve, looking after their every need.> ; Dex entry.
 
     db 28.0 ; Weight in kg.
     db 0.9 ; Height in meters.
 
-    db INDEEDEE 100 ; Base form(s) (MON_NAME for base species, then chance).
+    db INDEEDEE_FEMALE 50, INDEEDEE_MALE 50 ; Base form(s) (MON_NAME for base species, then chance).
 
     db TYPE ; Spawning biomes (TYPE as the final argument to apply type-based default tiles).
     db NONE ; Biome(s) in which aggressive groups might appear (NONE for no groups).

diff --git a/tiles/ruined_city/pokecenter/pokecenter-interior46.png b/tiles/ruined_city/pokecenter/pokecenter-interior46.png
diff --git a/tiles/ruined_city/pokecenter/pokecenter-interior47.png b/tiles/ruined_city/pokecenter/pokecenter-interior47.png
diff --git a/tiles/ruined_city/pokecenter/pokecenter0.png b/tiles/ruined_city/pokecenter/pokecenter0.png
diff --git a/tiles/ruined_city/pokecenter/pokecenter1.png b/tiles/ruined_city/pokecenter/pokecenter1.png
diff --git a/tiles/ruined_city/pokecenter/pokecenter12.png b/tiles/ruined_city/pokecenter/pokecenter12.png
diff --git a/tiles/ruined_city/pokecenter/pokecenter13.png b/tiles/ruined_city/pokecenter/pokecenter13.png
diff --git a/tiles/ruined_city/pokecenter/pokecenter16.png b/tiles/ruined_city/pokecenter/pokecenter16.png
diff --git a/tiles/ruined_city/pokecenter/pokecenter17.png b/tiles/ruined_city/pokecenter/pokecenter17.png
diff --git a/tiles/ruined_city/pokecenter/pokecenter4.png b/tiles/ruined_city/pokecenter/pokecenter4.png
diff --git a/tiles/ruined_city/pokecenter/pokecenter5.png b/tiles/ruined_city/pokecenter/pokecenter5.png
diff --git a/tiles/ruined_city/pokecenter/pokecenter8.png b/tiles/ruined_city/pokecenter/pokecenter8.png
diff --git a/tiles/ruined_city/pokecenter/pokecenter9.png b/tiles/ruined_city/pokecenter/pokecenter9.png