Epsilon_02/pokeemerald-modern
1
0
Fork 0
mirror of https://github.com/resetes12/pokeemerald synced 2025-10-06 00:12:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Outfit box can't be used while biking, surfing or diving to prevent avatar from breaking

Browse Source
This commit is contained in:
resetes12
2025-08-31 19:36:49 +02:00
parent 5a15280144
commit bc88e5611b
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/strings.h
View File

@@ -3199,6 +3199,7 @@ extern const u8 gText_HealingHeart[];
extern const u8 gText_OutfitBox_RS[];
extern const u8 gText_OutfitBox_Em[];
extern const u8 gText_OutfitBox_CantUse[];
extern const u8 gText_OutfitBox_CantUseBikeSurfUnderwater[];
//tx_randomizer_and_challenges
extern const u8 gText_NuzlockeCantThrowPokeBallRoute[];

10
src/item_use.c
View File

@@ -727,10 +727,18 @@ void ItemUseOutOfBattle_InfiniteRareCandies(u8 taskId)
void ItemUseOutOfBattle_OutfitBox(u8 taskId)
{
if (gTasks[taskId].tUsingRegisteredKeyItem) // to account for pressing select in the overworld
if (gTasks[taskId].tUsingRegisteredKeyItem) // to account for pressing select in the overworld, although you can't use it there
{
DisplayItemMessageOnField(taskId, gText_OutfitBox_CantUse, Task_CloseCantUseKeyItemMessage);
}
//You can't change your outfit while riding a bike, surfing or diving
else if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_MACH_BIKE)
|| (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_ACRO_BIKE)
|| (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
|| (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_UNDERWATER))
{
DisplayItemMessage(taskId, 1, gText_OutfitBox_CantUseBikeSurfUnderwater, CloseItemMessage);
}
else
{
PlayFanfare(SE_USE_ITEM);

1
src/strings.c
View File

@@ -1887,6 +1887,7 @@ const u8 gText_HealingHeart[] = _("The soft HEALING HEART\nfully healed your par
const u8 gText_OutfitBox_RS[] = _("You are now wearing your secondary\noutfit!{PAUSE 120}{WAIT_SE}");
const u8 gText_OutfitBox_Em[] = _("You are now wearing your main\noutfit!{PAUSE 120}{WAIT_SE}");
const u8 gText_OutfitBox_CantUse[] = _("The OUTFIT BOX can only be\nused from the BAG.{PAUSE 120}");
const u8 gText_OutfitBox_CantUseBikeSurfUnderwater[] = _("You can't use the OUTFIT BOX while\nBIKING, SURFING, or DIVING!{PAUSE 120}");
//tx_randomizer_and_challenges
const u8 gText_NuzlockeCantThrowPokeBallRoute[] = _("You have already used your encounter\nfor this area!{PAUSE_UNTIL_PRESS}");