Leahnaya/DexTool
1
0
Fork 0
mirror of https://github.com/PoshoDev/DexTool.git synced 2026-08-11 03:56:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

01/08/2020 #1

Browse Source
This commit is contained in:
TheGreenTie
2020-02-17 14:44:09 -06:00
parent e12941edd0
commit bb3a97018d
5 changed files with 1141 additions and 1125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
LivingDexSS.gmx/LivingDexSS.project.gmx
View File

@@ -52460,7 +52460,6 @@
<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>

2229
LivingDexSS.gmx/datafiles/pokedata.csv
View File

File diff suppressed because it is too large Load Diff

26
LivingDexSS.gmx/objects/obj_global.object.gmx
View File

@@ -183,7 +183,7 @@ for (global.box_count=1; global.current&lt;global.dex_len; global.box_count++)
{
if (global.current&lt;global.dex_len &amp;&amp; !jump)
{
while(!check_skip(global.current))
while(/*global.savedata[global.current] || */ !check_skip(global.current))
global.current++;
if (!check_jump(j, i, global.current))
@@ -194,8 +194,6 @@ for (global.box_count=1; global.current&lt;global.dex_len; global.box_count++)
else
jump = true;
}
}
}
</string>
@@ -424,6 +422,28 @@ draw_guidelines(false);
</arguments>
</action>
</event>
<event eventtype="9" enumb="83">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string></string>
</argument>
</arguments>
</action>
</event>
</events>
<PhysicsObject>0</PhysicsObject>
<PhysicsObjectSensor>0</PhysicsObjectSensor>

2
LivingDexSS.gmx/objects/obj_slot.object.gmx
View File

@@ -113,7 +113,7 @@ color = get_color3(own, true);
<kind>1</kind>
<string>/// CLICKEDY CLICK
if (++own &gt; 6)
if (++own &gt; 4)
own = 0;
global.various_to = own;

8
LivingDexSS.gmx/scripts/get_color3.gml
View File

@@ -6,10 +6,8 @@ if (!argument1)
case 0: return c_white;
case 1: return c_red;
case 2: return c_blue;
case 3: return c_orange;
case 4: return c_purple;
case 5: return c_yellow;
case 6: return c_aqua;
case 3: return c_yellow;
case 4: return c_aqua;
}
else
switch(argument0)
@@ -19,6 +17,4 @@ else
case 2: return c_navy;
case 3: return c_dkgray;
case 4: return c_dkgray;
case 5: return c_dkgray;
case 6: return c_dkgray;
}