01/05/2020 #2

LivingDexSS.gmx/LivingDexSS.project.gmx

@@ -52453,11 +52453,14 @@
     <script>scripts\form_get_string.gml</script>
     <script>scripts\form_get_gender_major.gml</script>
     <script>scripts\form_get_alcremie.gml</script>
+    <script>scripts\check_skip.gml</script>
+    <script>scripts\check_jump.gml</script>
   </scripts>
   <objects name="objects">
     <object>objects\obj_global</object>
     <object>objects\obj_slot</object>
     <object>objects\obj_header</object>
+    <object>objects\object3</object>
   </objects>
   <rooms name="rooms">
     <room>rooms\rom_dex</room>

LivingDexSS.gmx/datafiles/pokedata.csv

@@ -553,9 +553,9 @@ id,DexNo,Pokemon,Form,Type 1,Type 2,Boxable,Bankable
 552,381,LATIOS,,Dragon,Psychic,TRUE,TRUE
 553,381,LATIOS,MEGA,Dragon,Psychic,TRUE,FALSE
 554,382,KYOGRE,,Water,,TRUE,TRUE
-555,382,KYOGRE,PRIMAL,Water,,TRUE,TRUE
+555,382,KYOGRE,PRIMAL,Water,,TRUE,FALSE
 556,383,GROUDON,,Ground,,TRUE,TRUE
-557,383,GROUDON,PRIMAL,Ground,,TRUE,TRUE
+557,383,GROUDON,PRIMAL,Ground,,TRUE,FALSE
 558,384,RAYQUAZA,,Dragon,Flying,TRUE,TRUE
 559,384,RAYQUAZA,MEGA,Dragon,Flying,TRUE,FALSE
 560,385,JIRACHI,,Steel,Psychic,TRUE,TRUE
@@ -928,7 +928,7 @@ id,DexNo,Pokemon,Form,Type 1,Type 2,Boxable,Bankable
 927,656,FROAKIE,,Water,,TRUE,TRUE
 928,657,FROGADIER,,Water,,TRUE,TRUE
 929,658,GRENINJA,,Water,Dark,TRUE,TRUE
-930,658,GRENINJA,ASH,Water,Dark,TRUE,TRUE
+930,658,GRENINJA,ASH,Water,Dark,TRUE,FALSE
 931,659,BUNNELBY,,Normal,,TRUE,TRUE
 932,660,DIGGERSBY,,Normal,Ground,TRUE,TRUE
 933,661,FLETCHLING,,Normal,Flying,TRUE,TRUE

LivingDexSS.gmx/objects/obj_global.object.gmx

@@ -36,6 +36,7 @@ enum dex
     type1,
     type2,
     boxable,
+    bankable,
     sprite,
     own
 }
@@ -175,15 +176,26 @@ for (global.box_count=1; global.current<global.dex_len; global.box_count++)
         image_speed = 0;
     }
     
+    var jump = false;
+    
     for (var i=0; i<5; i++) // Box Y
         for (var j=0; j<6; j++) // Box X
         {
-            if (global.current<global.dex_len)
+            if (global.current<global.dex_len && !jump)
             {
-                make_slot(j, i, global.current);
+                while(!check_skip(global.current))
+                    global.current++;
                 
-                global.current++;
+                if (!check_jump(j, i, global.current))
+                {
+                    make_slot(j, i, global.current);
+                    global.current++;
+                }
+                else
+                    jump = true;
             }
+            
+            
         }
 }
 </string>

LivingDexSS.gmx/objects/object3.object.gmx

@@ -0,0 +1,23 @@
+<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
+<object>
+  <spriteName>&lt;undefined&gt;</spriteName>
+  <solid>0</solid>
+  <visible>-1</visible>
+  <depth>0</depth>
+  <persistent>0</persistent>
+  <parentName>&lt;undefined&gt;</parentName>
+  <maskName>&lt;undefined&gt;</maskName>
+  <events/>
+  <PhysicsObject>0</PhysicsObject>
+  <PhysicsObjectSensor>0</PhysicsObjectSensor>
+  <PhysicsObjectShape>0</PhysicsObjectShape>
+  <PhysicsObjectDensity>0.5</PhysicsObjectDensity>
+  <PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
+  <PhysicsObjectGroup>0</PhysicsObjectGroup>
+  <PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
+  <PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
+  <PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
+  <PhysicsObjectAwake>-1</PhysicsObjectAwake>
+  <PhysicsObjectKinematic>0</PhysicsObjectKinematic>
+  <PhysicsShapePoints/>
+</object>

LivingDexSS.gmx/scripts/check_jump.gml

@@ -0,0 +1,51 @@
+var px = argument0;
+var py = argument1;
+var pkmn = global.dexdata[argument2, dex.pokemon];
+var form = global.dexdata[argument2, dex.form];
+
+if (px || py)
+{
+    switch(pkmn)
+    {
+        // Starters
+        case "CHIKORITA":
+        case "TREECKO":
+        case "TURTWIG":
+        case "VICTINI":
+        case "CHESPIN":
+        case "ROWLET":
+        case "GROOKEY":
+            return true;
+        break;
+        
+        /*
+        // Formies
+        case "UNOWN":
+            if (form == "A")
+                return true;
+        break;
+        
+        case "FLABÉBÉ":
+            if (form == "RED FLOWER")
+                return true;
+        break;
+        
+        case "PUMPKABOO":
+            if (form == "SMALL SIZE")
+                return true;
+        break;
+        
+        case "MINIOR":
+            if (form == "BLUE CORE")
+                return true;
+        break;
+                
+        case "SCATTERBUG":   
+        case "MILCERY":
+            return true;
+        break;
+        */
+    }
+}
+
+return false;

LivingDexSS.gmx/scripts/check_skip.gml

@@ -0,0 +1,27 @@
+var pkmn = global.dexdata[argument0, dex.pokemon];
+var form = global.dexdata[argument0, dex.form];
+var bank = global.dexdata[argument0, dex.bankable];
+
+if (bank == "FALSE")
+    return false;
+
+switch(form)
+{
+    case "MEGA":
+    case "MEGA (X)":
+    case "MEGA (Y)":
+    case "PRIMAL":
+        return false;
+    break;
+}
+
+switch(pkmn)
+{
+    case "ARCEUS":
+    case "SILVALLY":
+        if (form != "NORMAL")
+            return false;
+    break;
+}
+
+return true;