From 843740204bb3d94095bafd252fccb135e92032f8 Mon Sep 17 00:00:00 2001
From: Joshua Sigona <sigonasr2@gmail.com>
Date: Thu, 21 Oct 2021 18:32:58 +0900
Subject: [PATCH] Completed last minute bugs and cleanup

---
 bin/sig/RabiRandomTeleportation.class | Bin 10011 -> 9706 bytes
 src/sig/RabiRandomTeleportation.java  |  11 ++++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/sig/RabiRandomTeleportation.class b/bin/sig/RabiRandomTeleportation.class
index a032d99904cb0962d329590b4c6012e4527de154..67a660de7ab20b6a16e93651e05437d7cfee29b5 100644
GIT binary patch
delta 1036
zcmY*YU2GIp7(M59W@mRg!CiNU22z?0U0WQ2l}30d1jHC)w2?p*Di4G~R!OO7N?XH=
z6+vP&F~%E{5)<Rf1M;I#TDO%#MTNS6L^LWbP=6>0f{+l<RIRMv3?lLA-ur#$JKx{A
zZ#{D1Vf*m)J^cXg;V+%`D{*&cAqFz*U?Ofa#SSnt+O;))mY$6UZg;o?FA`Rp-_)9&
z|74UO5UjD$%3Tg#Vkc2P<sm&cF)?ZjPnW}Py(BqpdN21_{D_D*`fYwqlfU|@nnzbQ
zXZ;lp`*46T*ED6b&)VFFoW*{kLXRaYN(p0y-{MP#HF`8z9r?`R0Up$Mq$WT8xx)gY
z0`P?;NOjl|7;lse)ZV-lY`no^4&LNfggd4FR{r_R8?#Te%(`>YO{f#2=C=-`2x~v?
z;3}>KwjrHMW%Nk0Odm|O8s~_#USOxYmb!MSU9t%lqJWyw)to-W@x5&9<+dKIP4fLb
z)_dJ-%X6o`I62MT+NrFn{IHijTZ$d^Q}f)rrT99iGRjlar1KJNm2nSXx_+#3bNdj_
z;snQVQURxwg<+M!Y2{%=-Gwu%7K7L(=sAc4xv?EP<n;$$<~XT_EQ8OFc`p<_+|T{I
z4<($9TD~SWOBf8~`3Z<ViK;`ih%rbG5-6e?mIb{jQ$FrbJn$F%2Q4X1$s&(rs`;tD
znyGFdSf)K`ts#%$;9Mf7Yq(~fhc=jW&3I|9IJm)}Ys6EzVxeTFk>Zh{Z`gI_1cB`h
zoe31)#q9yXQX!by&4G7{Ln$8pAJR2KSlw<sBP09LOQ-mCyPq&2_-|Gw)C<ct=J{P{
z_EXsJC)6?V42q{A^mIaDHCphTG|_>#k^67bi{MK47f_Ci@bD|{#wE<eWh|D{m-i}M
zk;rQj`y1BccRY_#tdkjcVD6X@{f*7Ij`w6{yQt73(mTos&WU`2#Via&f%E?^rW{}J
z1W(GqJ@oUGUR*V)Y*-M65S!sDOkoRe`qiq6=6#U~!PFyj5aaj!LE<vPHcwg+H6Ydp
zKHkG0>pSJ4Le<!TgQfB#oG|_P8$kXf`$njU)1nZ{8b^W{o)L8c@^7%5Kl40d{{V5H
B2i*Vw

delta 1316
zcmZ`&ZA_JA7{0ED_vIW8@AMqbIXE58lfbm&_=w6jYKE?uE5gk+180s`J7z@WNNBXy
z=|fxfgFfDB&bAi%!~9r@&<jbC86_DAepG;B8Jdb(7MM1R)BPSkT0eUKJkR~y*L_{j
zbKUnlbniRGo`a)%+W_3cYYm=Pyg}caNgyKzW?-r==km=gYTWKU!(2Ca67IXJ9;q}#
zCHdn?7#_iYXkZjE531Q<U?cYsX>$v$JAG*@n<h(2Cri9;wh;P#=DPflR+tJn6s-n^
zF`^ZE%Ooseo59cUJmIP_E2<+)*0}jO!5l~83rC{ek+?@BX1JZ|uM8fr`cty9zhRe)
zorJgCtTA&c%*uyz?q6FKF&{E`2vVd!Q4xu(^RNf?E*`dS^=DfP1JkV4{>;Sh4fe9n
zs`JlYe%#;*xCzaaQiuPfA?loXbKdxdBObiL(+1w+86r5h=wHz#tI8v**WZ5QvLsqO
zYtRk1vpa9i3}jd(folHIcqovS?9m>C3vNJlH|n9U8TE5VGit*D?g}??sm%{;?zT~9
z<MlmwycN}@em0H)KKfrkvjdQ9iH!l9Pp7<W;{_*PJ{FJBiNqF(H-?+=Sfn64OB78%
zZ~EBg-mxHneRA-L#N)~>EN|hb!tLiihp~w@HuqbnZwT>At1Fa|8DK{X4{nQXD$cUm
zy)E_{sM=J!Iv{Q*V7rXcN!(@?&)ypC<{)~MhQlfkM^pihsv;ayE6}H+=vQy!xY~>p
zsvZNX4X0E)eo`G6RGsL>4q;g=mWg55iCq%?iI+G<EF`DF<PjD?F^s!-l#7tSJCMgZ
zIdh51t2~COa;J_d&|vdhxm2qVEV5Rl=cdN+Ba{o&fa@?9yX4MFW@>Z#9DZl*PoER*
zFS900oiH<~1$CPP8*~PBZ*qOCcZ0^D<_*-xIuhn<0si3F0Z+a@U0~huqz@fikm3-m
z6!+&fvH!hTUx26ngA8hMSiTrP&*oq_B+ZGMJ{^Mpd96=9TlS*UCg<36+T>F`k~t@t
zl6a;83YA!oC*={F@Gj~n8?X#PdGUFqVF+PdKrSv~J}%(_Sxt!_#bv1+mf8{2;tHO@
zRXm4l!V<kMM1Nr`{>J+Rc9Uopv%2J`I7?T&FH4<4#<}snq@j~Tya0+&TikhtEG(c$
zP#SJVHj`zii`-MZ7(c6($Z3l%Dib@WL9>uN3TsVfN>xwdbf+_k3y{Q1{6)AkB)?Fe
zt7J`T1xuUxYf*y)Dn4)?C*eqnm@_)5V?bV(k${MjzsV3$TK&6I!(oodDt|my@d~dZ
F=^v={UAO=M

diff --git a/src/sig/RabiRandomTeleportation.java b/src/sig/RabiRandomTeleportation.java
index 38e364d..6708094 100644
--- a/src/sig/RabiRandomTeleportation.java
+++ b/src/sig/RabiRandomTeleportation.java
@@ -36,8 +36,8 @@ public class RabiRandomTeleportation {
 	long areaAddress = 0;
 	long fightingBossAddress = 0;
 	
-	long MIN_ALIVE_TIME=4500;
-	long MAX_ALIVE_TIME=7500;
+	long MIN_ALIVE_TIME=45000;
+	long MAX_ALIVE_TIME=75000;
 	long LAST_TELEPORT_TIME=System.currentTimeMillis();
 	long NEXT_TELEPORT_TIME=(long)(Math.random()*(MAX_ALIVE_TIME-MIN_ALIVE_TIME))+MIN_ALIVE_TIME+LAST_TELEPORT_TIME;
 	
@@ -204,12 +204,12 @@ public class RabiRandomTeleportation {
 		bunnyTeleportingAddress = 0xA73054;
 		fightingBossAddress = 0xA72E08;
 		areaAddress = 0xA600AC;
-		System.out.println("Erina X:"+readFloatFromPointer(0xC,entityArrayPtr));
+		/*System.out.println("Erina X:"+readFloatFromPointer(0xC,entityArrayPtr));
 		System.out.println("Erina Y:"+readFloatFromPointer(0xC+0x4,entityArrayPtr));
 		System.out.println("Map: "+readIntFromMemory(mapAreaXAddress)+","+readIntFromMemory(mapAreaYAddress));
 		long entityArrayPtrOffset = readIntFromMemory(0x96DA3C)-rabiRibiMemOffset;
 		writeFloatToMemory(entityArrayPtrOffset+0xC,9600);
-		writeFloatToMemory(entityArrayPtrOffset+0xC+0x4,9240);
+		writeFloatToMemory(entityArrayPtrOffset+0xC+0x4,9240);*/
 		//updateEventValue((short)166,16,12,15,7);
 		//20x11
 		//TeleportBunnyToRandomLocation();
@@ -220,6 +220,7 @@ public class RabiRandomTeleportation {
 				LAST_TELEPORT_TIME=System.currentTimeMillis();
 				NEXT_TELEPORT_TIME=(long)(Math.random()*(MAX_ALIVE_TIME-MIN_ALIVE_TIME))+MIN_ALIVE_TIME+LAST_TELEPORT_TIME;
 				//System.out.println(NEXT_TELEPORT_TIME);
+				 
 			}
 			try {
 				Thread.sleep(1000);
@@ -248,7 +249,7 @@ public class RabiRandomTeleportation {
 		} while (tries<200&&readIntFromMemory(areaAddress)!=chosenLoc.area);
 		
 		try {
-			Thread.sleep(500);
+			Thread.sleep(200);
 		} catch (InterruptedException e) {
 			e.printStackTrace();
 		}