Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes pre-proc to a normal if for Item Desc Header (#7231)

Browse Source
This commit is contained in:
Alex 2025-06-27 22:31:31 +02:00 committed by GitHub
parent d1577d96ad
commit c5b939a312
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/overworld.c
View File

@ -915,7 +915,7 @@ static void LoadMapFromWarp(bool32 a1)
ClearTempFieldEventData();
ResetDexNavSearch();
// reset hours override on every warp
sHoursOverride = 0;
sHoursOverride = 0;
ResetCyclingRoadChallengeData();
RestartWildEncounterImmunitySteps();
#if FREE_MATCH_CALL == FALSE
@ -3513,8 +3513,6 @@ bool8 GetSetItemObtained(u16 item, enum ItemObtainFlags caseId)
return FALSE;
}
#if OW_SHOW_ITEM_DESCRIPTIONS != OW_ITEM_DESCRIPTIONS_OFF
EWRAM_DATA static u8 sHeaderBoxWindowId = 0;
EWRAM_DATA u8 sItemIconSpriteId = 0;
EWRAM_DATA u8 sItemIconSpriteId2 = 0;
@ -3566,6 +3564,12 @@ static u8 ReformatItemDescription(u16 item, u8 *dest)
void ScriptShowItemDescription(struct ScriptContext *ctx)
{
if (OW_SHOW_ITEM_DESCRIPTIONS == OW_ITEM_DESCRIPTIONS_OFF)
{
(void) ScriptReadByte(ctx);
return;
}
u8 headerType = ScriptReadByte(ctx);
Script_RequestEffects(SCREFF_V1 | SCREFF_HARDWARE);
@ -3609,6 +3613,9 @@ void ScriptShowItemDescription(struct ScriptContext *ctx)
void ScriptHideItemDescription(struct ScriptContext *ctx)
{
if (OW_SHOW_ITEM_DESCRIPTIONS == OW_ITEM_DESCRIPTIONS_OFF)
return;
Script_RequestEffects(SCREFF_V1 | SCREFF_SAVE | SCREFF_HARDWARE);
DestroyItemIconSprite();
@ -3684,17 +3691,6 @@ static void DestroyItemIconSprite(void)
}
}
#else
void ScriptShowItemDescription(struct ScriptContext *ctx)
{
(void) ScriptReadByte(ctx);
}
void ScriptHideItemDescription(struct ScriptContext *ctx)
{
}
#endif // OW_SHOW_ITEM_DESCRIPTIONS
// returns old sHoursOverride
u16 SetTimeOfDay(u16 hours)
{