Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor Pokegear update. #51

Open
wants to merge 4 commits into
base: progress
Choose a base branch
from
+13 −8
Open

Minor Pokegear update. #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7eb4002
update gitignore
MoriyaFaith Aug 19, 2024
e8a464b
New Pokegear Icon Sprites
MoriyaFaith Aug 19, 2024
43f9074
Pokegear Phone Call sprites
MoriyaFaith Aug 19, 2024
37c5131
Added shoulder buttons changing Pokegear cards in LR mode
MoriyaFaith Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file modified graphics/pokegear/icons.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions graphics/pokegear/menu_sprites.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ JASC-PAL
148 148 139
0 255 0
0 51 0
74 74 106
222 213 222
112 120 136
235 235 240
172 189 172
139 139 205
115 106 131
224 224 232
152 160 168
41 49 49
Binary file modified graphics/pokegear/phone_call.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/pokegear/phone_call_icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 8 additions & 4 deletions src/pokegear.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down