diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2023-01-17 15:42:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-17 15:42:09 -0500 |
| commit | 1fe862515d4cea739cb3c462914851dcd9eae242 (patch) | |
| tree | a128eeb7540d9c961a0a9ccec3ed8f77245ed92f /soh/src/code | |
| parent | 6eef813e5d94209abc7ea9713d64fa17699ad24f (diff) | |
fix top left dungeon entrance icon in graveyard (#2303)
Co-authored-by: briaguya <briaguya>
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_map_exp.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/soh/src/code/z_map_exp.c b/soh/src/code/z_map_exp.c index 33c89fe47..45ae89099 100644 --- a/soh/src/code/z_map_exp.c +++ b/soh/src/code/z_map_exp.c @@ -897,21 +897,17 @@ void Minimap_Draw(PlayState* play) { //No idea why and how Original value work but this does actually fix them all. PosY = PosY+1024; } - if ((gMapData->owEntranceFlag[sEntranceIconMapIndex] == 0xFFFF) || - ((gMapData->owEntranceFlag[sEntranceIconMapIndex] != 0xFFFF) && - (gSaveContext.infTable[26] & gBitFlags[gMapData->owEntranceFlag[mapIndex]]))) { + if (((gMapData->owEntranceFlag[sEntranceIconMapIndex] == 0xFFFF) || + ((gMapData->owEntranceFlag[sEntranceIconMapIndex] != 0xFFFF) && + (gSaveContext.infTable[26] & gBitFlags[gMapData->owEntranceFlag[mapIndex]]) + )) || CVar_GetS32("gAlwaysShowDungeonMinimapIcon", 0)) { if (!Map0 || !CVar_GetS32("gFixDungeonMinimapIcon", 0)) { gDPLoadTextureBlock(OVERLAY_DISP++, gMapDungeonEntranceIconTex, G_IM_FMT_RGBA, G_IM_SIZ_16b, IconSize, IconSize, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPWideTextureRectangle(OVERLAY_DISP++, TopLeftX, TopLeftY, TopLeftW, TopLeftH, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); } - } else if (CVar_GetS32("gAlwaysShowDungeonMinimapIcon", 0) != 0){ //Ability to show entrance Before beating the dungeon itself - gDPLoadTextureBlock(OVERLAY_DISP++, gMapDungeonEntranceIconTex, G_IM_FMT_RGBA, G_IM_SIZ_16b, - IconSize, IconSize, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPWideTextureRectangle(OVERLAY_DISP++, TopLeftX, TopLeftY, TopLeftW, TopLeftH, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); - } + } } s16 entranceX = OTRGetRectDimensionFromRightEdge(270 + X_Margins_Minimap); |