diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-03-23 09:36:09 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-23 09:36:09 +1100 |
| commit | 2cb01b5b6a69635f7c8f554cf97442268aff28be (patch) | |
| tree | a0603a4c4827fb4068d806d11638c1503c356650 /src/code/z_parameter.c | |
| parent | 9bb978527f619abbedbc5119fa2811385b29c01e (diff) | |
z_room (1 non-matching) (#1143)
* begin room docs and decomp
* match Room_DrawImageSingle
* match Room_DrawImageMulti
* Room_AllocateAndLoad non-matching
* big improvements on Room_DrawCullable
* match Room_AllocateAndLoad
* improvement?
* cleanup
* comments
* cleanup
* small pr suggestions
* PR Suggestions
* cleanup sceneCmds
* some PR
* PR Suggestions
* more PR Suggestions
* col to collision
Diffstat (limited to 'src/code/z_parameter.c')
| -rw-r--r-- | src/code/z_parameter.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index f3bfb530f..ca127a8b6 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1767,7 +1767,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { break; } - if ((play->roomCtx.curRoom.unk3 == 1) && (interfaceCtx->minimapAlpha >= 255)) { + if ((play->roomCtx.curRoom.behaviorType1 == ROOM_BEHAVIOR_TYPE1_1) && (interfaceCtx->minimapAlpha >= 255)) { interfaceCtx->minimapAlpha = 255; } } @@ -5096,8 +5096,9 @@ void Interface_Draw(PlayState* play) { // Load in Grandma's Story gSPLoadUcodeL(OVERLAY_DISP++, gspS2DEX2_fifo); gfx = OVERLAY_DISP; - func_80172758(&gfx, sStoryTextures[interfaceCtx->storyType], sStoryTLUTs[interfaceCtx->storyType], - SCREEN_WIDTH, SCREEN_HEIGHT, 2, 1, 0x8000, 0x100, 0.0f, 0.0f, 1.0f, 1.0f, 0); + Prerender_DrawBackground2D(&gfx, sStoryTextures[interfaceCtx->storyType], + sStoryTLUTs[interfaceCtx->storyType], SCREEN_WIDTH, SCREEN_HEIGHT, 2, 1, 0x8000, + 0x100, 0.0f, 0.0f, 1.0f, 1.0f, 0); OVERLAY_DISP = gfx; gSPLoadUcode(OVERLAY_DISP++, SysUcode_GetUCode(), SysUcode_GetUCodeData()); |