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 diff --git a/graphics/pokegear/icons.png b/graphics/pokegear/icons.png index 6176b8209..c2e1b4c1a 100644 Binary files a/graphics/pokegear/icons.png and b/graphics/pokegear/icons.png differ diff --git a/graphics/pokegear/menu_sprites.pal b/graphics/pokegear/menu_sprites.pal index b7adfd228..a8421fb1a 100644 --- a/graphics/pokegear/menu_sprites.pal +++ b/graphics/pokegear/menu_sprites.pal @@ -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 diff --git a/graphics/pokegear/phone_call.png b/graphics/pokegear/phone_call.png index 45897dd11..636ee4753 100644 Binary files a/graphics/pokegear/phone_call.png and b/graphics/pokegear/phone_call.png differ diff --git a/graphics/pokegear/phone_call_icon.png b/graphics/pokegear/phone_call_icon.png index b7d9f142e..22af4544f 100755 Binary files a/graphics/pokegear/phone_call_icon.png and b/graphics/pokegear/phone_call_icon.png differ 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); }