diff options
| author | petrie911 <69443847+petrie911@users.noreply.github.com> | 2020-11-19 15:49:08 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 16:49:08 -0500 |
| commit | cf24a76fe4b5c0ae2eaf716bbd08185ce345560b (patch) | |
| tree | 89e034af162a1d458408b06fd3488017e00eabbf /src/code/z_map_exp.c | |
| parent | 930cee306181de187c0c7df6857a92606c5f2bb6 (diff) | |
Three new matching functions (#492)
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* match
* new matches
* format
* need to kill the asm, too
* whoops dlists
* one more match
* no more temp
* let's fix Gameplay_ChangeCameraStatus while we're at it
* formatted
Diffstat (limited to 'src/code/z_map_exp.c')
| -rw-r--r-- | src/code/z_map_exp.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index c9259e8da..8608f5122 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -380,8 +380,8 @@ void Minimap_Draw(GlobalContext* globalCtx) { case SCENE_ICE_DOUKUTO: if (!R_MINIMAP_TOGGLED) { func_80094520(globalCtx->state.gfxCtx); - gDPSetCombineLERP(OVERLAY_DISP++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, - PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(OVERLAY_DISP++, 1, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 1, 0, PRIMITIVE, 0, + TEXEL0, 0, PRIMITIVE, 0); if (gSaveContext.inventory.dungeonItems[mapIndex] & gBitFlags[DUNGEON_MAP]) { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 100, 255, 255, interfaceCtx->minimapAlpha); @@ -438,8 +438,8 @@ void Minimap_Draw(GlobalContext* globalCtx) { func_80094520(globalCtx->state.gfxCtx); gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_MINIMAP_COLOR(0), R_MINIMAP_COLOR(1), - R_MINIMAP_COLOR(2), interfaceCtx->minimapAlpha); + gDPSetPrimColor(OVERLAY_DISP++, 0, 0, R_MINIMAP_COLOR(0), R_MINIMAP_COLOR(1), R_MINIMAP_COLOR(2), + interfaceCtx->minimapAlpha); gDPLoadTextureBlock_4b(OVERLAY_DISP++, interfaceCtx->mapSegment, G_IM_FMT_IA, gMapData->owMinimapWidth[mapIndex], gMapData->owMinimapHeight[mapIndex], 0, @@ -476,8 +476,7 @@ void Minimap_Draw(GlobalContext* globalCtx) { G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(OVERLAY_DISP++, 1080, 616, 1112, 648, G_TX_RENDERTILE, 0, 0, 1024, - 1024); + gSPTextureRectangle(OVERLAY_DISP++, 1080, 616, 1112, 648, G_TX_RENDERTILE, 0, 0, 1024, 1024); } Minimap_DrawCompassIcons(globalCtx); // Draw icons for the player spawn and current position |