ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upcoming' into overworldsnow

Browse Source
This commit is contained in:
kittenchilly 2023-09-10 13:21:28 -05:00
commit 2642b81303
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/item_use.c
View File

@ -211,7 +211,7 @@ void ItemUseOutOfBattle_ExpShare(u8 taskId)
if (!gTasks[taskId].data[2]) // to account for pressing select in the overworld if (!gTasks[taskId].data[2]) // to account for pressing select in the overworld
DisplayItemMessageOnField(taskId, gText_ExpShareOff, Task_CloseCantUseKeyItemMessage); DisplayItemMessageOnField(taskId, gText_ExpShareOff, Task_CloseCantUseKeyItemMessage);
else else
DisplayItemMessage(taskId, 1, gText_ExpShareOff, CloseItemMessage); DisplayItemMessage(taskId, FONT_NORMAL, gText_ExpShareOff, CloseItemMessage);
} }
else else
{ {
@ -219,7 +219,7 @@ void ItemUseOutOfBattle_ExpShare(u8 taskId)
if (!gTasks[taskId].data[2]) // to account for pressing select in the overworld if (!gTasks[taskId].data[2]) // to account for pressing select in the overworld
DisplayItemMessageOnField(taskId, gText_ExpShareOn, Task_CloseCantUseKeyItemMessage); DisplayItemMessageOnField(taskId, gText_ExpShareOn, Task_CloseCantUseKeyItemMessage);
else else
DisplayItemMessage(taskId, 1, gText_ExpShareOn, CloseItemMessage); DisplayItemMessage(taskId, FONT_NORMAL, gText_ExpShareOn, CloseItemMessage);
} }
FlagToggle(I_EXP_SHARE_FLAG); FlagToggle(I_EXP_SHARE_FLAG);
#else #else