From b010db7c19207f0e607d5ccaf0d1f2350dda3964 Mon Sep 17 00:00:00 2001 From: Random <28494085+Random06457@users.noreply.github.com> Date: Sun, 11 Oct 2020 19:45:08 +0200 Subject: Decompile z_sram.c (#431) * Decompile z_sram.c * rename Sram_CalcChecksum to Sram_WriteSaveSlot * progress * done i think * add original name comments * temp substructs * minor fixes * review * review 2 * fix Co-authored-by: fig --- src/code/z_map_exp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/code/z_map_exp.c') diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index c409d0cf8..68e68e0f3 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -46,7 +46,7 @@ void Map_SetFloorPalettesData(GlobalContext* globalCtx, s16 floor) { interfaceCtx->unk_140[i + 16] = 0; } - if (gSaveContext.dungeonItems[mapIndex] & gBitFlags[DUNGEON_MAP]) { + if (gSaveContext.inventory.dungeonItems[mapIndex] & gBitFlags[DUNGEON_MAP]) { interfaceCtx->unk_140[30] = 0; interfaceCtx->unk_140[31] = 1; } @@ -383,7 +383,7 @@ void Minimap_Draw(GlobalContext* globalCtx) { gDPSetCombineLERP(oGfxCtx->overlay.p++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0); - if (gSaveContext.dungeonItems[mapIndex] & gBitFlags[DUNGEON_MAP]) { + if (gSaveContext.inventory.dungeonItems[mapIndex] & gBitFlags[DUNGEON_MAP]) { gDPSetPrimColor(oGfxCtx->overlay.p++, 0, 0, 100, 255, 255, interfaceCtx->minimapAlpha); gDPLoadTextureBlock_4b(oGfxCtx->overlay.p++, interfaceCtx->mapSegment, G_IM_FMT_I, 96, 85, 0, @@ -395,7 +395,7 @@ void Minimap_Draw(GlobalContext* globalCtx) { 0, 0, 1024, 1024); } - if (gSaveContext.dungeonItems[mapIndex] & gBitFlags[DUNGEON_COMPASS]) { + if (gSaveContext.inventory.dungeonItems[mapIndex] & gBitFlags[DUNGEON_COMPASS]) { Minimap_DrawCompassIcons(globalCtx); // Draw icons for the player spawn and current position func_80094520(globalCtx->state.gfxCtx); MapMark_DrawConditionally(globalCtx); @@ -525,7 +525,7 @@ void Map_Update(GlobalContext* globalCtx) { case SCENE_HAKADANCH: case SCENE_ICE_DOUKUTO: interfaceCtx->unk_140[30] = 0; - if (gSaveContext.dungeonItems[mapIndex] & gBitFlags[DUNGEON_MAP]) { + if (gSaveContext.inventory.dungeonItems[mapIndex] & gBitFlags[DUNGEON_MAP]) { interfaceCtx->unk_140[31] = 1; } else { interfaceCtx->unk_140[31] = 0; -- cgit v1.2.3