From c323ecb9c3419318cbcd369117edb5eda05f487d Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Mon, 2 May 2022 18:42:20 -0400 Subject: [PATCH] fixes jirachi & viridian river crash --- Data/Map040.rxdata | Bin 41870 -> 41313 bytes Data/Map724.rxdata | Bin 27801 -> 27785 bytes Data/MapInfos.rxdata | Bin 36404 -> 36404 bytes .../001_Battler/003_Battler_ChangeSelf.rb | 4 ++ .../002_Move/005_Move_Effects_000-07F.rb | 62 +++++++++--------- Data/System.rxdata | Bin 27394 -> 27394 bytes 6 files changed, 35 insertions(+), 31 deletions(-) diff --git a/Data/Map040.rxdata b/Data/Map040.rxdata index b541db2ca758b4fc07773d9edfb87c636e25ceb8..bd64e7bb4caa18b2acc1a72ae843038c53ed75be 100644 GIT binary patch literal 41313 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 BE$;vT literal 41870 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 diff --git a/Data/Map724.rxdata b/Data/Map724.rxdata index d31c2ec6edbe6a758e9f3a9d38e964a983209747..b4f284c2c64c768c6434b694d800caafce3bba80 100644 GIT binary patch literal 27785 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 QT7-uy4*E`7|JEz^|L8fjS^xk5 literal 27801 zcmeG_X>c3Yc>rWDK#CG6l9DA^l9vluqHK!dAz3muc0tOb%p`I-B9x19*d_2tyl{bq zu?td+?IhD_;-5Xz>5tm&bUK~hXL>s6k=WI=PV1)EWICNr>h!jIO?ph5q#pPCcK7Z1 z7FY4EZ!DqhyKnmGSdQ)!U=?n0d!r3$?Yjma9R8T!*Fsi@_9 zOCQ+YNPT1O~`{Z^}R`_-RW85 zgf1>qRV8I{of;Lfq*d!Gxd!x5#Jx;QB9K|thwQ6a9|`+70V6MIwK6rRR@3sLJ6wx1 z`TPZTc5i;5phG96%EaQDqSEqAez2eub$QW(E|w~iFa_MP4#yX1nF`J|jg5O>!D(kA8g!5C7ObZU)>D}_NC^kBxJ<9j041hO8(PyKOtCJ5l&>Hl zBlo$gfKXe!X%GOi85yIm(s~^!odIbzNS!D~F~6r^H0a6-X+RU8z##QSrADjJX3*+y zxj~+4l3HnlW}xv(L#bD2Ny{G#v-Xm8t_PZFb)`g&4Vrul(3C2mUnP*+qN(o*IA2!` zIIcmT&_B!z95RyV44I~Z8X&b+W=cHZ!Ba8$JWx>7b!9_e1P&Qm9XYhFsH+zJMaD0^ zPDt6L-KYTXRw^@cm(+dnePa{n^6A0`-4B1S!TC%9Xb|axn%vVZ?*V4Yd;8^H(9yny zw5y@!->P`8<7)0#%-Id&hjvoRx|*7gZP@ z&S3*pX;hphC`z%W8KR*z!A4Lca(0^hgn`9mLCo>P;9{^KIR5d6VEp@F{Jk*#{j}R2 zKgimVdygacBlV>VimFaGmxd=sETar6ds1XZtmGQ8;i<}q_~E%HhQ!$uYoH9K*;BwE z0n3)bT5f2~Ab$jD3;3r%1wrvp`9Prw5$Ckkmw&1X?ql8G3m92w0j(@K&C${-qn9bA zAa!Xq!pLz=afYUzOqp+HSU+yFf*mK~$}o-^7sG0tnLK}XQ%yES)wgh|9Wmu+4N)hg zs-r-}b!2I?hMWQ|7OToCa9Avp64k-}j*3O}cvKJb@8B9~Y`~QuSp%*&$ml4W`7S%R zB;Ud;iVgZIDLNSuXOT((K>xF1MFEYfX=16OQ8YA7oO5sls!3`qBuw4`92_)(!7PEv zh55=f*5h`!pnSt~Dgm;@Iw}+3Ziu?k(4cGG08_Y90ZYJoU^h1Ot*5HJ}V3u8}?s(6Oe zc~nzCa+Wp!?vyi3PVd3O9f+{iz`5A3t6hat}hC~iQq@gtkqsb$x77FO^OpqRZ ztU(l*v}pdo^Nx1D@|)_IH6Me;?>S z%|G=6k*8?nnRAh6Fk<9&gm6aBjebvO{R|%=h-SnK@DEUphRl1q)Dne{=e*%9#NekxZYnuNPfDZoTU$YLR zZVHxcjM3sT6cSwym`bp~wG~JdAALl8h+W_@tY?`MmmIxFel=6nCEMukt!HyMV;YG}* zM)v;#>z`4S*dz(bSb13T4f$BnOvHvZ%fhViHJF7&MzFy|Wb7;?A_I_!?1e<6oAw0~ zF_wg+DSR{2K}b=|bP(p>^!vxpPJ%9gO95t#dVGUxUh#~_yr!m;Og4^vP1Ac?;m*Xy zeVK=QcV}>aAdGucnL-*PA1-pT>()X|v(!2$RDO0Hl<4?4NOV6)bPy!kNALAX)G8_T zI>zqs71Dr!MXS<}LEX)O$P(&s-)4)5sdsuIEoDAPbSeFW25G%Dw^rGdrHMkyaJch* zOydRV@Oz-hLR7SRmFDuYN**KEh8;WOF|0>nzBQbPsk(uY5LO3=psQBXEKP+%su}J& zayouLBhD3Fuo#fxODs+zc_a0Zi3z(NfI_>M9_I+{&a4AX!nm;x)C1!_PGPc|b)bx= z4g%lpO78I@W~T7#tNudK7X2F}XlgL~gW~UWbb-iCk)zcisytR~t2|~|OsFhm!Zos@ zTO+e83nTWxyTRdt*G=Hdo_ubO3h{wk8#-&HNuoV(ya{Rl6Idcc{@FE`RuhYLlXCo* zLj(B!wrM!zr9mW6VkeEw<~Zw(LkhYb%NA{&9Y-%hWwt~?XDly&Bb@OEMdJ}bZ*if?lsy$vUQX`fLht56(;TQ7X`|3s29SnD183GHpSBGYn}&99TMSia z+YE%9HHL|zzsBCejylnhZA4)u#g`In7J$P-NYT3x(mGUgDct%hz%&>i^!gZl4}kaE zO%HIqe#Zmwt6@2JECBxw9_|hW;HzQWuHFTsxJZTDG>&tE?-+|ZoOP}7b0E=vJNQ08 z_qCL0%d`ilUA&a)Q(?}eF_MZ-*W#yC-^0V*G8K%E`}r{L+fkxyj_!jwx{rcA@vKx@ z=@jtVicsz1)Kw@>?Y(%78scNHJ^%$OY8z)yfr`~RUemr{Ryl&70HnLwWlnL5?y*74 zAn%5tF!g6CnxjYH8XA>5hi(HT2ELghO_kJ#geDmW|?$5|$?t4a+v__WA^Sd#C`9F_W3FOz%nKPK32 zdKg};_K0fE!fcoHkRSNmE?+)>c-!|kcnHtglQ2UeY`Wk~PL`}dHT8@5%SMC=85@y# z0S*g+zBmg3p)#kFrU}x$SI8;1q63MsxjN6Q=s+>Ytm-&~tumv56`kH)wk=6H6&*$o z>)tHC^o84{Y4SQ`xEArMjnqsauRBRB4#UHU>v#z!xM;!B9!6lFc+C1_G`Q(t2ChoI zxXX-6y;xz1&8|Pu8a1w%MXn<3NSkUjlnt{Cg?POw@^N0hs=joI7{lWapF24+j*Ca;@pz0=2IGcsy9o{Kdr&XtE8swC2)%nW7HAideqI{YBn4+^|uY7T8r(%@q?AlDXRWgUEZB@)S4e^|yeT%-x zGquB6MbPq0`|Qq5+gCM#^)$>Va9`CCEUbI#X?+VfwU%c3k#I5?QBsSWXtkRPTA|ub zP0ierX@!Zd5p~LYJ2f@5J`i7-Yg__E?)<$70xUX5ok0wzJvBat&5QX)zeg{y{jlSZ zy_KLJ;X;3u3;i)J^vAi-pX5S+nhX6|F7)TQ&|l<2Kg)&w3K#loTHnx9J!ZMXoR`(VMrQ~wp=IpBuWQ1{&CDT8Lw?n6*a;CT*dTXUn zoA9@FvLxTd>__Wl>0RM=JINCD?$X&wmKHjbEJaN2h@5F#r*_y~L=YE|Gi?uX_I)^K z#=vFZjTl&AJB7QPJPDKKGHz@9~7vi?V9(vUFen7Kx8{(as zFxmcp0$143|L+D49Hql8IdB?_-f)x8op1v#?)%1#mzXLK(|+H$fXvjs_K7sDrK3)V)4DgS5T zYQb?8&Rrpb17f=+;%$e(dydRN!QFPjKnxKsTVazJyUBdzpVscCi*1tF;>LfQU9mmQ zoVAIgYs>eVSUcReNS$qH$MBB-1jzaz$a)XW`X-#$;B>;sMkJUKMY+~eah40)8}}q8 zm}qFbVBA^U(q$SN2&e;FI67O8yd5~ei6Y|EC4(t&WI=M<%E=zW-_~`>uiqW7F8Lqf zb~|;+ow}s|?yJt!C4-YYq9A!Qrgqq028oL(NNyW(tR{)eSQwjPY(7d423#f7D9!Dr zn{3<0_$1y2;>X#(QTOJ7j%^^G=i!DCbYgSzN5Z%_4b0lC1UTEm+Y1859|nmIf<&>( ze2_v#*^_PbE!+khh$VW!-hO9>zOOJHb3$(`?&kh&wSl;kafp*`v?qiyO!<24NGwB- z1%$9&g^o^g;09yS2~7IYu;AU6$LL8P2awKA$KgSP8WDhRw?Uo6r)^;jj`!J|qywCB zcigDH7&cBFGpfJK!`&gH`sFZg*Qf^N8EH*7m8fG-K?&PtU{ROq&12!`&fiz7@vpN;ASTMGCcbp6p1pP3w#<5+7TD65UH7@AA0FJJ~j2 zu!pv(8^)cZ_xZ-{wa0f}eSnqV*|QM$00-`)5BNB6Crcjh6-3G7;>!cL=`^JAcW_`B zbS3SE22N1eo+BAUM}k2iPQNZX$Pt3;Oh6pbc}x6!OJ&bc@#b4CZw8HjQ{_4jcZZzG zcZPAh&Lk+$NH4POp#cWD7#d)(H%NPZ67_}#9g^k?VXkbFna7vrPw;SeNSdDw<94Na zTZIPWSVG6p043T>;rSUML+K`Oomf5y>TM@r+vs&!)E z^Qw=T&v@58_iH8aMy-5*L21I{s8wZS5gq|wgr~2U6+>y}yNmdE*;H=tE=b`A;e8C= z_&t+OB*u1Lw~zy867O|h=N&q{Q0x5r5{6{Gno_}O_juytsZXT*?`I_I^{lVmr&G_R zqTbQ?o=tmS-gbUm-d4}1z3u$8MYn4YpMUJ$e*O6TWB0c6)3<}qvIY~0$6CC`9sRo% zwj+^n<=3kJTi5Ob&Wz^GZALSgU(Qc>Y@9{_x>fDMW3%XE)+zkil)NKg*2({QclH_S zSzkNvHAcGWd0ozW&w0N;1K!O2xw>h)y6}{s3+@%cZw%ixVMBO2M!Vqkc%0A5S@!;} z^ry@hJNCAp&R)o}H-iU{8T_5|xjy8+eo%N`ctQ9f!G*kY_^>n5b~y0rP`s=6 z=SXgu+wQrcPn+8JTudF@{xQYv!JkFy_#c}p1pmPX&BA|Ff`7-PHEZyo;6?n0O#s?m SSf^!pg61LLN%OycCH@~7zPFSB diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 1f1020806377dd7876b0096116eedb45d75cf532..0f327f0e2a67887794c4759c2af65f602d994f71 100644 GIT binary patch delta 75 zcmdlohiS_krVUeB7~M8cW4SC1q_Pwa@H2*N);4&{J6WKXWwVT(B@<9M%t4n4DBR*C cEWy;yGRPvP`DTn|DN=Wd=&N#jVo^0FVS1-T(jq diff --git a/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb b/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb index a5c0a3119..dddffc247 100644 --- a/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb +++ b/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb @@ -274,6 +274,10 @@ class PokeBattle_Battler end def pbTransform(target) + if target.is_a?(Integer) + @battle.pbDisplay(_INTL("But it failed...")) + return + end oldAbil = @ability_id @effects[PBEffects::Transform] = true @effects[PBEffects::TransformSpecies] = target.species diff --git a/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb b/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb index 10c2f01ff..99210346d 100644 --- a/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb +++ b/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb @@ -2717,34 +2717,34 @@ end ################# # Fusion Swap # ############### -class PokeBattle_Move_080 < PokeBattle_Move - def pbMoveFailed?(user,targets) - if targets[0].effects[PBEffects::Transform] - @battle.pbDisplay(_INTL("But it failed!")) - return true - end - return false - end - - def pbFailsAgainstTarget?(user,target) - if target.effects[PBEffects::Transform] || - target.effects[PBEffects::Illusion] || - !target.pokemon.isFusion? - @battle.pbDisplay(_INTL("But it failed!")) - return true - end - return false - end - - def pbEffectAgainstTarget(user,target) - body = getBasePokemonID(target.pokemon.species, true) - head = getBasePokemonID(target.pokemon.species, false) - newspecies = (head) * Settings::NB_POKEMON + body - target.pbTransform(newspecies) - end - - def pbShowAnimation(id,user,targets,hitNum=0,showAnimation=true) - super - @battle.scene.pbChangePokemon(user,targets[0].pokemon) - end -end +# class PokeBattle_Move_XXX < PokeBattle_Move +# def pbMoveFailed?(user,targets) +# if targets[0].effects[PBEffects::Transform] +# @battle.pbDisplay(_INTL("But it failed!")) +# return true +# end +# return false +# end +# +# def pbFailsAgainstTarget?(user,target) +# if target.effects[PBEffects::Transform] || +# target.effects[PBEffects::Illusion] || +# !target.pokemon.isFusion? +# @battle.pbDisplay(_INTL("But it failed!")) +# return true +# end +# return false +# end +# +# def pbEffectAgainstTarget(user,target) +# body = getBasePokemonID(target.pokemon.species, true) +# head = getBasePokemonID(target.pokemon.species, false) +# newspecies = (head) * Settings::NB_POKEMON + body +# target.pbTransform(newspecies) +# end +# +# def pbShowAnimation(id,user,targets,hitNum=0,showAnimation=true) +# super +# @battle.scene.pbChangePokemon(user,targets[0].pokemon) +# end +# end diff --git a/Data/System.rxdata b/Data/System.rxdata index da0dce05e578aa55f626cbd5f39f23e83f91e294..a63bb0f1657f293b216db6c70e0b9aed7dc5eb15 100644 GIT binary patch delta 26 icmZp=#@KX?aRY}q%l#ke%$s?{#RD02H>+gaV*&t(EeTQp delta 26 icmZp=#@KX?aRY}qi?Qk~rp-L!;(?6mn^iLIF#!N|DF{CR