From 326cb5d1b306c2572829ba4b714fb4d89877b125 Mon Sep 17 00:00:00 2001 From: Ariel A <24759293+aarant@users.noreply.github.com> Date: Thu, 26 May 2022 19:42:11 -0400 Subject: [PATCH 1/6] Updated Combusken follower sprite. Credit: Jaizu --- .../object_events/pics/pokemon/combusken.png | Bin 546 -> 7331 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/object_events/pics/pokemon/combusken.png b/graphics/object_events/pics/pokemon/combusken.png index dded375fe9014ee6a8bf6b9e99141e163271fd64..b95ae2af8babc39cea21a91cbb873e43cbc5db2a 100644 GIT binary patch literal 7331 zcmeHMXH-*L(+(gaO;MC0Ed~S>LJ|^6LhntGuAr2VoRCnG2!T*UI;envQj{uKP!vHy z5K#n`jx-UJCMdlKDu^P&dqD5K-u1nI?pojb@1C_z&N+K#p4s!v?7jA^oUybp;^o@Q z1%W_#O^o%e!DkJ4L$|Pjzvbl~=^)#q3~M|SO823WC|&@R5l9E1KmdgVfdupw zU8J1fe~UMIed6GwEqvQLd>}ee%;B-`HbaH}%qORIo-3L0e|u9=n6XuC8oRzS5wcdB z7;m3j7=rPHf3zveI5ZT$`0diXufwYa?B^1Bpx%#nR+XbC|)auc4arms~WmvAuXfeyU`>~sECbekz?Dkus z^Td;DS|4p2id)uNCM=eYUn)4Ab>8fqgXs_X%g;jtn@1Bq$zN-lm~r3|Y%ezZTmTI% zv{|9pwa?#J4OkXAsJPB!O39TIul{=f;#|Xw#FO@w{$&?7P1>2zjLO+!=BJtEh6_Kc zv**{BR{}n0s}Uk%RK%-HZYLpsg7GuUH%awl=!h`h<9{5Aefj9=PnsI zUOI7!ra3>;mbu>^+ZDLyjrGvH;gs7wv!I%SdP$e5y0hsljv@ivZ<`bEk20Nu3;F|* zcir!#w7Py{d$JlT9;(*ySm#^Tm5YjR9q%e|T9w3WE96viX@B}Lo?Okoc4~Ev|A7Es zcSUO?Z(EtBp8N}!0WR@W!O5r5%`--xmEU_IDW@w_>qc2wZ;s_xj&&OZwRN8eYbRa~ z-$i86vESpKYR&C2r6@H%o|E&|(_rkgQVu(xqvMn|0f?{@5?P({tI4}*aH~*x4%f{n z@A7!r<4D7wDouB;`qC3DF}NZMbmv`3(5y#$9paa}c*U`l`mA-F*wxf{p-M)uwUU@> zmwu;wWp7K*K!(FCh}w#qX~sWIQsii~hmkG0^vYnGZXw&xYo^kfHO4gO$&bwG`u1^l1wt z+(A)i&%xW)Y@+SqLfd*S7|_xw9ysGz+L?htt$qk6 z8!*!yaDv1^X|D&xr0VYz_V$ZQ84uIijYY~B!%31Et|NU-hV>eb2+w=)44epCOD^*x z*+k^fmn_#Co>$*_k78>KJ{35Y_%shoEb(6%weGhiG-N!sE(>Z4TKG|9<1pE%MKya} z-tu9NgiY^wc@nZr)iw+n(b#jL={Rx(lX*&_sP?R5hRTiZxLJe1>4K1!IbQ$cr#X|o z5FQ+8hIXz}ao30Rpk9$y0qBvp)vi&Jxk9~BtSz?FJa0sBiUjp-m z6yjQavgEc!&SEOKrtHaQWG^(z4tm}7++ny|?IU-2SNMrOehc-ylh|A7=4o#lf22Gf z--{{?&fd!9icL(Hya~tjpzlR;HJ0}kndDp>Ns+HW7v$VEH7FTiJ)&rKr2XSVp6~~) z1HHhsowP`TpN-4?>;uXcyGdm<6e;ey?(NYKo%`H!w*!*J4c_dZi71pY8d@}#`?}|N zQv&ZUL!(w-Am^dns%|i^#$|=xwd=xlc;z1xM;lz2&MoLTleyW#T8qZ(LjBzxx>e=M zwIZZrsgG#PP`UT9Fx^T;Zwv>zbi6HxR|ep4pZ~G7sQXLi(_lIwa_Q2W>6?KoQE@R< z@M1xUa#y@WN%TbLUk<2{XKlPw_($Y-<-oI6V9A7xi9V1kB zqN-2fgOV5QmV-p$ygac@t(oG+bP8CA$;ED$?!rCScv-Srwzk<1+Uoe35{TSpa~8Ow zV+~bpO7qOeH2J~9!Zl^L61=xm?vsy^b`?Im+;eBrRBY|Ytf84isd^t@ufO~WmJmB; zirp>X_!j5SJM&zi7cA8#oewi#ypj7fC#Wsmx$vQ&bR?lA@lDBHe9^g^oKZUquG7&& zgLL1Mz29$lTT7PJm<4T>iQp|z%b99k+ExqGDRwQNEE7uIL? zb2^jURyg77qEENH$*XV9Glbt^();O(=PbeoO&34EvFJj&pA6xzd1}u!Xa(hsv#$%P zcq_2a-LN4hH?wFAr~ENXptfn8#e5|tseV`exbdCnGM!5TSW1$gOV+JYvG=n%avcX^ zo}_hgquy;vt^LAzTl7}T7NPAoW~fBLwlMBHJbAKfMP%#SP zS80UE+#YtTV^%0pvOMJ+7OAJRcJDX2He&9GkUm^;yjzwtUpg}0l1C$gwD$a6_^_&` z-t{^8__CvsvyxfGY$Y!9u|-jzFuJ?2!-X7}W!7EdTDe%96aBu8qm*E?BRNr#6Y`k9 z%9USCS-^OZ{z4;2TAcata5n^^mZ3UVYdX26RBmy7II4SV$d95iX+Gw(jFiB_zKr*( zRY!f!u(@6hbXJYQzO`XbNeoMmV~OT{;oVksR+1Hn{=N(_0F@0#c$^i*G18f$+F4eeDAFe zIhtoxbIY|!9rlo%-UYp^$>B7C`93Vs8g0c-Wr}rtIKOpn&M~fR+kWlzGm>VOb0^7_ zlhOQ&GfvMTyHwOe$n_e^4axD0SNT)4y|b=DDX2+9sfI&e>znGVnEhA_y#=hxg9L;7 z3Zq`Eu&LCZ+b<-=GR0*l$CUi)Vas*|xev-K_i6*D&|qJUgSMKlot0G}`2V z9-E;l?8Ie99xut|#^BLe-LS?i`fCY5j2Iogh&ww#Jv=3PW7i4x%TGgn>n+ejx?>CE zvQSki+;Yco$13^ip0O0tN584$PRUqJ3wd!zJq=OOeLMyB5w!e<9cC$wCwf2I7e$v^ zv+8;#Xb&%NKasjN?A6{}(BQ%=HsgXX>Qu9v7aa9Ewgo-9rd`~gw5NIE6l)K z{)zenqg4a)g{vm6mjuGww&f$$o%0*oA1?2)Xig`v2%mK$wdu#n-+u{pf(T$UEt(>; z8uqq9XZDWDlm}*sT5)(o#Cv6{^}pt3iFU$BFSnm1KNWWvxd1EKDW+PdM4*k7y)g5vo z!^a=6=UIEM9C`MXPVQo{$^RJ3cF~^a z^_ddHP>ijQi?a7dL`uZjaR|CQi5+LxSzvqK*<{jbV7lsJP2Tyw_Jr2ZVDP|WwkT5S zO;WqmWskIEi|5aepR(hrhK22fT;Y=4)xc31I~+Be|MBMy}V+Q(wGWOv&7RmL*)Ue@%!jqDuP~zW;4Q`5=yEwY?^_ z=VNb1&4A2Q!Z`sf>(=t{xS4a(^DOCVH60fegwIQUqj1&17ET$yP2t!|3$IqHsQ993 zArU6;cmE`ts3`0E{mstH0ZbZ`ww^;-US>NO<8yWg%xnp4orEZ0i*(fd5RO3eR=^W! zZh%67Hyv!DAP{w}06L!F2{52;fIEe%0h_OS0)tYB8n7cu=16n89zdoT2l)UtK^C@z zAWs682-DK!QV+m^0Nwxt4-N44qWa*!IPiUA7y*NBsxUk?U`Nd@p?WkQ0E$t- zC?Mem0Th2lm?jrg-G@lRS?e4Af&jlXU}Oe^jzb`rOr`=8tw8f}N1(7+ECQ*BP*jA2 z8gSo0Dgz$?r}|26K>Wne2Yd-W6gq=Kqe3?@@oqFfh6W4<%AtSE&zo*;{wF-u_ZJHw zABX@v9f49nBD}p3zgze+4E#ZmUlaPT7QVJ%r-`rzd})3@1i-)_pfV(XhaeLEw5R*| zcx{G5Bp?7Uz#CNc1-+vF=F-T--11M04GP>T-tA!Y5x)XrZT8yZjRHZ5&Sl$XQHnG+whMg(g+kHZu6C(j8y^f00E9AVDWGa3a|2NmR@)U2{ZuL z0EJ4VF@66M*;2d#8wP%ZPn5C}S{a4HsA3cqQAp&^z&8=?0Uuwm7B^5)NCm~8l8waR zz;Hln@f(#20&K#9(ctua06c@{V@soXX}~rhpc|H(1rAmJnHFP;FQ^f?QS-m5-Uc}F z^Xum#@S<#rpwP|2#o-A*o%rJY0pg}3(C(**K*m$u0dR%?DyculDgPy1ssuENq=YBI zRRC3GFykt2a5n(!23I8kZc3`k7>p92`ge3+8i~Qg`v5xbV5DF)Utr3nRQ(XHrT^44vSg` zudCQ~59}*PtRoi1$H%AARUQV~vbdQU=|fJliy4C-oOELcU+{k^{*9Xjl943@4stL| z%ndlk*+n1{LfIUd!l2DP6MY?98FH*VTsAZ9{FVm;wg;P%bFA!QqJ+~`vzz0l-xuBMJ?9P8%&Uo$nPDEv!D>HC zkX{d$m!wouE;>00kQO^H3tdVxaZUBUcc|qt0(YutdqeA@nS;zIZ>wzIQ3XTVH~B#4 z%*RDJpp&QaA0z~tSHvV(MfOK$brxsXD&eoQ=FPA>v7?LFh2G7phZ?Q=^Y~_~%{+Qd zc0VFSrb69icl%B}XmolaJK%j_V6HX(2wCDKZ&dEL2JTS%dFg$LvXR&U0+>*UiGhXw J9bMOm{{SP7B2EAR delta 465 zcmV;?0WSWdIiduRBa>A~5@ z-22KF;UQLS zEDp6zAyuol_mwbt<4d8QFlP%R?V>_ zwfYBU94g%IcbsS4JkPuTmb63tj;w?FHoJxP4CKQHe|EkB(3p0>R-A4_00000NkvXX Hu0mjf1P9;| From 11a7aa1ec8e2bbba14d08cf2800f56ad29092211 Mon Sep 17 00:00:00 2001 From: Ariel A <24759293+aarant@users.noreply.github.com> Date: Sun, 29 May 2022 00:54:44 -0400 Subject: [PATCH 2/6] Made cutting trees follower-safe. --- data/scripts/field_move_scripts.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 3e99fc08e2..a9ba2355c7 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -25,6 +25,7 @@ EventScript_UseCut:: end EventScript_CutTreeDown:: + setflag FLAG_SAFE_FOLLOWER_MOVEMENT applymovement VAR_LAST_TALKED, Movement_CutTreeDown waitmovement 0 removeobject VAR_LAST_TALKED From e5885c1284edcf1cea632490bc6a0da1bdc28483 Mon Sep 17 00:00:00 2001 From: Ariel A <24759293+aarant@users.noreply.github.com> Date: Tue, 21 Jun 2022 19:44:30 -0400 Subject: [PATCH 3/6] Fixed Registeel graphics to use OW sprite. --- data/maps/AncientTomb/map.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index 06254e1f98..8614b64300 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -12,10 +12,10 @@ "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", - "connections": null, + "connections": 0, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_REGISTEEL", + "graphics_id": "OBJ_EVENT_GFX_OW_MON", "x": 8, "y": 7, "elevation": 3, @@ -51,7 +51,9 @@ "dest_warp_id": 1 } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", From 3a1be34d246a9f3f557c876453f331515bf332d7 Mon Sep 17 00:00:00 2001 From: Ariel A <24759293+aarant@users.noreply.github.com> Date: Tue, 21 Jun 2022 19:58:35 -0400 Subject: [PATCH 4/6] Updated Skiploom & Shuppet OW sprites. Credit: Jaizu --- .../object_events/pics/pokemon/shuppet.png | Bin 418 -> 6750 bytes .../object_events/pics/pokemon/skiploom.png | Bin 488 -> 7233 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/object_events/pics/pokemon/shuppet.png b/graphics/object_events/pics/pokemon/shuppet.png index b79ede1d07031eccc0c6e4360792e27ceff0e712..533e6ae55b6646edce9d6f4cfd0bdc2e989d747e 100644 GIT binary patch literal 6750 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 IzU%4#0H34iPyhe` delta 407 zcmV;I0cifgIOqeABa3%FM#2j=CoUrnkr)%nPwYLmmh0utDY=YqWih z=b=GO>3a3uV4BaL`G3LmNr-!FhIvn$!SCt5Lag#d<~3EI*Ix}A+d2abb7IpP>+{+M zyju884J$mSY38$tHtBYgz6D%hllv{&N5A#bYhjyoX>I{y--n#EeZFj$UekYTE&GjM zoZ!7T0n@A5ZISsc3K4O>*ox#9GVN4^J;&e0CjuXFdRAe>rwjl9002ovPDHLkV1fzC B#aRFV From 87140b935262d0fd6c1266791bf22c9db9037655 Mon Sep 17 00:00:00 2001 From: Ariel A <24759293+aarant@users.noreply.github.com> Date: Tue, 21 Jun 2022 20:03:27 -0400 Subject: [PATCH 5/6] Fixed Regirock & Registeel puzzle freezing follower pokemon. --- src/braille_puzzles.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 26caa830d3..d7a28e47a0 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -1,5 +1,6 @@ #include "global.h" #include "event_data.h" +#include "event_object_movement.h" #include "field_camera.h" #include "field_effect.h" #include "script.h" @@ -214,6 +215,7 @@ static void DoBrailleRegirockEffect(void) PlaySE(SE_BANG); FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED); ScriptContext2_Disable(); + UnfreezeObjectEvents(); } bool8 ShouldDoBrailleRegisteelEffect(void) @@ -253,6 +255,7 @@ static void DoBrailleRegisteelEffect(void) PlaySE(SE_BANG); FlagSet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED); ScriptContext2_Disable(); + UnfreezeObjectEvents(); } // theory: another commented out DoBrailleWait and Task_BrailleWait. From e60a0b161ce79f31dc4e469da308b43dfb4eca4c Mon Sep 17 00:00:00 2001 From: Ariel A <24759293+aarant@users.noreply.github.com> Date: Tue, 21 Jun 2022 22:03:37 -0400 Subject: [PATCH 6/6] Updated FOLLOWER_SAFE_MOVEMENT logic. --- src/scrcmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scrcmd.c b/src/scrcmd.c index 2461b0d960..58be7085f5 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -105,6 +105,7 @@ bool8 ScrCmd_nop1(struct ScriptContext *ctx) bool8 ScrCmd_end(struct ScriptContext *ctx) { + FlagClear(FLAG_SAFE_FOLLOWER_MOVEMENT); StopScript(ctx); return FALSE; } @@ -295,6 +296,7 @@ bool8 ScrCmd_returnram(struct ScriptContext *ctx) bool8 ScrCmd_endram(struct ScriptContext *ctx) { + FlagClear(FLAG_SAFE_FOLLOWER_MOVEMENT); ClearRamScript(); StopScript(ctx); return TRUE; @@ -1270,7 +1272,6 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx) { u8 playerObjectId; struct ObjectEvent *followerObject = GetFollowerObject(); - FlagClear(FLAG_SAFE_FOLLOWER_MOVEMENT); // Release follower from movement iff it exists and is in the shadowing state if (followerObject && gSprites[followerObject->spriteId].data[1] == 0) ClearObjectEventMovement(followerObject, &gSprites[followerObject->spriteId]); @@ -1287,7 +1288,6 @@ bool8 ScrCmd_release(struct ScriptContext *ctx) { u8 playerObjectId; struct ObjectEvent *followerObject = GetFollowerObject(); - FlagClear(FLAG_SAFE_FOLLOWER_MOVEMENT); // Release follower from movement iff it exists and is in the shadowing state if (followerObject && gSprites[followerObject->spriteId].data[1] == 0) ClearObjectEventMovement(followerObject, &gSprites[followerObject->spriteId]);