mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-04 06:54:33 +00:00
Fix misc 22 (#1971)
* remove trailing whitespace * fix/docbug about dright for next page of fault menu * // size = ...; -> // size = ... * access `ColliderJntSph.elements` as an array * fixup doc in PreRender.c * empty line after decl * gdSPDefLights1 xyz arguments for direction are signed 8bit values * doc bug of bad use of free in EffDust actor * decimal for Actor.colorFilterTimer * shopItemEntries -> sShopItemEntries * HEISHI4_AT_KAKRIKO_ENTRANCE -> HEISHI4_AT_KAKARIKO_ENTRANCE * format
This commit is contained in:
parent
4dc70fefee
commit
2ce4742bf6
21 changed files with 49 additions and 42 deletions
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue