From 7687a0aa4187b581d579d089331a868701a8cdbe Mon Sep 17 00:00:00 2001
From: Cubitect <cubitect@gmail.com>
Date: Mon, 3 Oct 2016 23:49:00 +0100
Subject: [PATCH] simplified 'get player position'

---
 ASMEventMarker.py    |  10 ++++------
 ASMEventMarker.pyc   | Bin 6546 -> 6537 bytes
 ASMVillageMarker.py  |  10 ++++------
 ASMVillageMarker.pyc | Bin 4582 -> 4573 bytes
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ASMEventMarker.py b/ASMEventMarker.py
index c25b979..de72694 100644
--- a/ASMEventMarker.py
+++ b/ASMEventMarker.py
@@ -137,12 +137,10 @@ def create_mod(util):
         pos = findOps(lines,pos+1,[['ldc','culling']])
         if pos is None:
             break
-        pos = findOps(lines,pos+1,[['dstore']])
-        playerX = endw(lines[pos],1)
-        pos = findOps(lines,pos+1,[['dstore']])
-        playerY = endw(lines[pos],1)
-        pos = findOps(lines,pos+1,[['dstore']])
-        playerZ = endw(lines[pos],1)
+        pos = findOps(lines,pos+1,[['dload'],['dload'],['dload']])
+        playerX = endw(lines[pos-2],1)
+        playerY = endw(lines[pos-1],1)
+        playerZ = endw(lines[pos  ],1)
         pos = findOps(lines,pos+1,[['ldc','hand']])
         lines.insert(pos+2,'dload '+playerX+'\n')
         lines.insert(pos+3,'dload '+playerY+'\n')
diff --git a/ASMEventMarker.pyc b/ASMEventMarker.pyc
index ef67fc46430674faa6c20846a5e7b546ac478c9e..428fdb6fbeb411a3cefd7e3b7d6143b750a39a50 100644
GIT binary patch
delta 226
zcmbPa+-c0t{F#^Q)xA#>*^`*Q@NCRp#?4{HSR%|&bf0IkB#)DJN&!PUBLjp?XJ%+-
zW~gOiC}C%)VPvRbVn`8TkdRE_W@u(&sAZdck4ub^ee*${GEPob1_p+doczR;&5mOI
zjQX}fu6{;-ZmNE6Vo643VzGWeQGR++Vs36`Ub=pIW=TeAlD=cGuWx=zaA{`A<oDug
bO#c`ri%Yy?)nF876rao|X-TpnX_7hsXc0q6

delta 252
zcmeA)o@C6<{F#?aIppa?_9P|=-i_JIxH;k&ON1GUn0Y5l@;IfXGcq(YGt@FMl&~|@
zFf!CIF-WFxGc+?X)Uq*@ut0@?BH}3p3_!KGm9yhhzIiTB87CJT0|P@!aY=qr>Sh_S
zenxp+AYVTtKQ~oBH?brmGqG4dH$NpMGcR2~%-1p4ck(T9H6|v;$xIUOIAs`x8Nqn+
MR|!jk8e=7O0Q;yrIsgCw

diff --git a/ASMVillageMarker.py b/ASMVillageMarker.py
index eae50a5..1529e1c 100644
--- a/ASMVillageMarker.py
+++ b/ASMVillageMarker.py
@@ -86,12 +86,10 @@ def create_mod(util):
         pos = findOps(lines,pos+1,[['ldc','culling']])
         if pos is None:
             break
-        pos = findOps(lines,pos+1,[['dstore']])
-        playerX = endw(lines[pos],1)
-        pos = findOps(lines,pos+1,[['dstore']])
-        playerY = endw(lines[pos],1)
-        pos = findOps(lines,pos+1,[['dstore']])
-        playerZ = endw(lines[pos],1)
+        pos = findOps(lines,pos+1,[['dload'],['dload'],['dload']])
+        playerX = endw(lines[pos-2],1)
+        playerY = endw(lines[pos-1],1)
+        playerZ = endw(lines[pos  ],1)
         pos = findOps(lines,pos+1,[['ldc','hand']])
         lines.insert(pos+2,'dload '+playerX+'\n')
         lines.insert(pos+3,'dload '+playerY+'\n')
diff --git a/ASMVillageMarker.pyc b/ASMVillageMarker.pyc
index a8c1593111341b0e3b43733be39006b469af7913..85e4cc39e5545a377d1be3f1993de8ef08e3da1f 100644
GIT binary patch
delta 240
zcmaE+d{>#B`7<vU!~IVa*^?OkH)b)hvs*Ei@G%rwO)h44c1rPKNM~e#km<|}&CCq7
zObjJ#3^j}lHB1aC+zb+uDLf3#OboTmNWwe_VV2D@9KYB&Ss54@QgZSWQ#LE`M=<K!
z1G)Mc`MIh3xrrqinTf^v0Y&-gMTxn&nR)5@>6s-NrAhjZ!M?uvDZ!<gC6lKMXfQ6D
Yd_Z72s|KSuqxj?mK}(X&*deF~09*z_i2wiq

delta 253
zcmcbs{7jjh`7<w<oW;|L>`9Ep8?%_$+2a^X_!x@fCKt0ir=>G8G&3{QGBK2}G1M?J
z)G#qfrtmN{GcnXMGn6nxg@7XBDLxE9wYZhD;8VW&2m3EJE;a@RhLqxx{G!y&zxg5<
z<@JGl{fzwFRQ=q<l8ns6V*T9wl$6Z8bp0@2$6(*d>jgz8PZtnoTs3*Mz;sR-Mqx%U
Mp6o7YNrYZK0M}YRq5uE@