From 7eb40022fad17217cb8e5a50c1a78875ea0044bf Mon Sep 17 00:00:00 2001 From: moriyafaith Date: Mon, 19 Aug 2024 12:47:33 -0400 Subject: [PATCH 1/4] update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5d8d738b4..fa0b18db6 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ data/scripts/move_tutors.inc src/data/wild_encounters.h berry_fix/ld_script.sed berry_fix/payload/ld_script.sed +*.ase From e8a464b5fb58d7d2e6e4d744a9997fac309f51b5 Mon Sep 17 00:00:00 2001 From: moriyafaith Date: Mon, 19 Aug 2024 16:00:46 -0400 Subject: [PATCH 2/4] New Pokegear Icon Sprites --- graphics/pokegear/icons.png | Bin 650 -> 586 bytes graphics/pokegear/menu_sprites.pal | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/graphics/pokegear/icons.png b/graphics/pokegear/icons.png index 6176b820982f0b5708d9da21c696cdffbdcd6149..c2e1b4c1a58aaabab30308a7e42605a2e475b493 100644 GIT binary patch delta 538 zcmV+#0_FXR1Dx0=!YHiyah4Va7dPeb@ zb${0WnLbSW^rr(bf9z})fN88I1A*8+NCT$$0e~2rDFsNB2oO~Q0Hlv%i~v(02MPlS z1i=Vl8iJu5!o@m}O$3a^IxKhBhprEI>qD(guxZDs_z{o=LIHoGAJ-=92h@i~!xSKC z1O$jH7zqdyy23D^mOq}!=N073=$t=+r`3;_X+Up~ia{MzvZ0``9K9H;e5=QumR0POu; cAHJs#p98PHIzBa=^8f$<07*qoM6N<$g3e_09smFU delta 603 zcmV-h0;K)Q1d0Wa7#Rcu0001xym@l~000DMK}|sb0I`n?{9y%=F(!XXN^0KK-mJZ> zi;K;3YJ({;F}b8dy8r+H32;bRa{vGi!vFvd!vV){sAK>D00(qQO+^Rf2o?YbE9d^- zF#rGn7j#8fbW?9;ba!ELWdKJ^L{LsgAa-SPATusBafPJe0005HNklK#+j@tK-&~e~N(FHanr-%%g1Ue3^n8jId0C*dmb)bmO7@os; zBY;657k6C#;*X2{k!#Bza!1z=KWuP|# ztm=~Df?0}Swiaqg^r;85_~Q&v*8pmTiu5xBYKUe6dT0zMkegbmXvh$dL$BG8rV${| z!G|OTB$fBkj!{_cYVpT;f28`OKWNh-(6s>cL7)`AgLpTghMaJqA%S>p<( Date: Mon, 19 Aug 2024 16:01:15 -0400 Subject: [PATCH 3/4] Pokegear Phone Call sprites --- graphics/pokegear/phone_call.png | Bin 312 -> 219 bytes graphics/pokegear/phone_call_icon.png | Bin 285 -> 198 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/pokegear/phone_call.png b/graphics/pokegear/phone_call.png index 45897dd11b4abf37632583aa2a70c9fd4157f041..636ee475398ef45c5e260043ab08c040a6ab57fb 100644 GIT binary patch delta 162 zcmV;T0A2sM0^0$Q7#Roy0000$-i>Pj000DMK}|sb0I`mI`%#mTdn|r1P{`om=$N3W zaCnGzzPZQ%0034=L_t(2k(JR)4!|G?1W-5th($07*qoM6N<$f~)OA=Kufz delta 256 zcmcc3xPxheL^2CA0|P^=UP2a-VlVOZb!C6T%_1($rTD;u8z>}R;u=vBoS#-wo>-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5GiQY`6?zK#qG8~eHcB(hF4 z)T!S)g<;G8t6A^1DBPPe<>k9(pc=*`Z+DmfOW8ji1#)6MT^vIy=J;O7s!>5-XjZmzrIUva%1oj;Oo9n{#xbA z*L>y#MwTNpn9bRaT;$txr=_H}`Hw^MA69vx!$J?2Pg1+PA7~MSr>mdKI;Vst0O;mi APXGV_ diff --git a/graphics/pokegear/phone_call_icon.png b/graphics/pokegear/phone_call_icon.png index b7d9f142eba778f2ae916e0f26eea4cee13b25c9..22af4544f83c4cd64d10d8fec08a41e92167edde 100755 GIT binary patch delta 122 zcmV-=0EPdZ0>%N57#Roy0000)q>9D>000DMK}|sb0I`mI`%#mTdp}k|Nkl&pIwn?+ohbH_``jX)vs64!{5;QX|b^2DN4 z26rEq06%wyveY64V?C3?)+G;tN;pai{M>;u#y~cMSA(WJkYY)9^mSxl*x1kgCy{lc zp?xxAlDE6d|E27ojsj&JJzX3_D&`~$xG?kFU=_K@I%S0-15?)vCNB@BTe}+*E-Q!} zC|G$Z@2&6dkK6&y+`AekTzYp`!;wRz@l&CzswWeJ>SEuG8;%`u2U+Rq>gTe~DWM4f DB{@TT From 37c5131bf59b318ae8a21b7967ca5866fff7a3bc Mon Sep 17 00:00:00 2001 From: moriyafaith Date: Mon, 19 Aug 2024 16:01:43 -0400 Subject: [PATCH 4/4] Added shoulder buttons changing Pokegear cards in LR mode --- src/pokegear.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/pokegear.c b/src/pokegear.c index 88ee6a51d..38cbae515 100644 --- a/src/pokegear.c +++ b/src/pokegear.c @@ -881,11 +881,13 @@ static void Task_Pokegear3(u8 taskId) PlaySE(SE_POKENAV_OFF); return; } - else if (JOY_NEW(START_BUTTON)) + else if (JOY_NEW(START_BUTTON) + || (JOY_NEW(L_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { newCard = ChangeCardWithDelta(-1, sPokegearStruct.currentCard); } - else if (JOY_NEW(SELECT_BUTTON)) + else if (JOY_NEW(SELECT_BUTTON) + || (JOY_NEW(R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { newCard = ChangeCardWithDelta(1, sPokegearStruct.currentCard); } @@ -953,11 +955,13 @@ static void Task_SwapCards(u8 taskId) s16 *data = gTasks[taskId].data; u8 newCard = tNewCard; - if (JOY_NEW(START_BUTTON)) + if (JOY_NEW(START_BUTTON) + || (JOY_NEW(L_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { newCard = ChangeCardWithDelta(-1, tNewCard); } - else if (JOY_NEW(SELECT_BUTTON)) + else if (JOY_NEW(SELECT_BUTTON) + || (JOY_NEW(R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { newCard = ChangeCardWithDelta(1, tNewCard); }