Merge branch 'JamzOJamz:main' into main

JamzOJamz · Jan 7, 2025 · 57309af · 57309af
2 parents a923321 + eb0e361
commit 57309af
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/Assets/Pokemon/Butterfree.png b/Assets/Pokemon/Butterfree.png
diff --git a/Assets/Pokemon/Butterfree_Mini.png b/Assets/Pokemon/Butterfree_Mini.png
diff --git a/Assets/Pokemon/Butterfree_Mini_S.png b/Assets/Pokemon/Butterfree_Mini_S.png
diff --git a/Assets/Pokemon/Butterfree_S.png b/Assets/Pokemon/Butterfree_S.png
diff --git a/Content/Pokemon/Butterfree.hjson b/Content/Pokemon/Butterfree.hjson
@@ -3,9 +3,14 @@
   {
     Transform:
     {
-      DrawOffsetY: -2
+      Width: 30
+      Height: 32
+    }
+    WanderingHoverBehaviour:
+    {
+      FrameCount: 5
+      FrameTime: 4
     }
-    WanderingHoverBehaviour: {}
     SpawnController:
     {
       Stage: 3

diff --git a/credits.txt b/credits.txt
@@ -1,14 +1,15 @@
 - JamzOJamz -
-Almost all new code in 1.0
+Programming
 Data for all Pokémon
 GUI code and design
 Multiplayer compatibility
 
 - InfinaMii -
+Programming
 Rare Candy sprite
 Thrown Poké Ball sprites
 Base code for Poké Ball, Pokémon, Evolution
-All 0.1 code basically
+Pre-release 0.1
 
 - Jackal Chan -
 Pokémon sprites