diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/PreRender.c | 5 | ||||
| -rw-r--r-- | src/code/fault.c | 4 | ||||
| -rw-r--r-- | src/code/graph.c | 1 | ||||
| -rw-r--r-- | src/code/z_player_lib.c | 2 | ||||
| -rw-r--r-- | src/code/z_view.c | 1 |
5 files changed, 9 insertions, 4 deletions
diff --git a/src/code/PreRender.c b/src/code/PreRender.c index df71d059e..e960acfec 100644 --- a/src/code/PreRender.c +++ b/src/code/PreRender.c @@ -659,11 +659,12 @@ void PreRender_AntiAliasFilter(PreRender* this, s32 x, s32 y) { } } - // The background color is determined by averaging the penultimate minimum and maximum pixels, and subtracting the + // The background color is determined by adding the penultimate minimum and maximum pixels, and subtracting the // ForeGround color: - // BackGround = (pMax + pMin) - (ForeGround) * 2 + // BackGround = (pMax + pMin) - ForeGround // OutputColor = cvg * ForeGround + (1.0 - cvg) * BackGround + // = ForeGround + (1.0 - cvg) * (BackGround - ForeGround) invCvg = 7 - buffCvg[7]; outR = buffR[7] + ((s32)(invCvg * (pmaxR + pminR - (buffR[7] * 2)) + 4) >> 3); outG = buffG[7] + ((s32)(invCvg * (pmaxG + pminG - (buffG[7] * 2)) + 4) >> 3); diff --git a/src/code/fault.c b/src/code/fault.c index 7d8e62fef..16f1a183f 100644 --- a/src/code/fault.c +++ b/src/code/fault.c @@ -35,7 +35,7 @@ * - End Screen * This page informs you that there are no more pages to display. * - * To navigate the pages, START and A may be used to advance to the next page, and L toggles whether to + * To navigate the pages, DPad-Right or A may be used to advance to the next page, and L toggles whether to * automatically scroll to the next page after some time has passed. * DPad-Up may be pressed to enable sending fault pages over osSyncPrintf as well as displaying them on-screen. * DPad-Down disables sending fault pages over osSyncPrintf. @@ -911,6 +911,8 @@ void Fault_DrawMemDump(uintptr_t pc, uintptr_t sp, uintptr_t cLeftJump, uintptr_ } while (input->press.button == 0); // Move to next page + //! @bug DPad-Right does not move to the next page, unlike when on any other page + // START moving to the next page is unique to this page. if (CHECK_BTN_ALL(input->press.button, BTN_START) || CHECK_BTN_ALL(input->cur.button, BTN_A)) { return; } diff --git a/src/code/graph.c b/src/code/graph.c index 33b523ea2..92df90d8f 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -462,6 +462,7 @@ void Graph_ThreadEntry(void* arg0) { if (gameState == NULL) { #if OOT_DEBUG char faultMsg[0x50]; + PRINTF("確保失敗\n"); // "Failure to secure" sprintf(faultMsg, "CLASS SIZE= %d bytes", size); diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 391407644..80d4c210d 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -1785,7 +1785,7 @@ void Player_DrawPauseImpl(PlayState* play, void* gameplayKeep, void* linkObject, // Note: the viewport x and y values are overwritten below, before usage static Vp viewport = { (PAUSE_EQUIP_PLAYER_WIDTH / 2) << 2, (PAUSE_EQUIP_PLAYER_HEIGHT / 2) << 2, G_MAXZ / 2, 0, (PAUSE_EQUIP_PLAYER_WIDTH / 2) << 2, (PAUSE_EQUIP_PLAYER_HEIGHT / 2) << 2, G_MAXZ / 2, 0 }; - static Lights1 lights1 = gdSPDefLights1(80, 80, 80, 255, 255, 255, 84, 84, 172); + static Lights1 lights1 = gdSPDefLights1(80, 80, 80, 255, 255, 255, 84, 84, -84); static Vec3f lightDir = { 89.8f, 0.0f, 89.8f }; u8 playerSwordAndShield[2]; Gfx* opaRef; diff --git a/src/code/z_view.c b/src/code/z_view.c index 7ed124742..850979368 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -380,6 +380,7 @@ s32 View_ApplyPerspective(View* view) { if (QREG(88) & 2) { s32 i; MtxF mf; + Matrix_MtxToMtxF(view->viewingPtr, &mf); PRINTF("viewing\n"); |