mirror of
https://github.com/HarbourMasters/Shipwright
synced 2026-05-31 09:31:26 -04:00
Merge branch 'develop-zhora' of github.com:HarbourMasters/Shipwright into get-item-rework
This commit is contained in:
Christopher Leggett
+178
-113
@@ -825,11 +825,11 @@ NatureAmbienceDataIO sNatureAmbienceDataIO[20] = {
|
||||
};
|
||||
|
||||
u32 sOcarinaAllowedBtnMask = (BTN_A | BTN_CUP | BTN_CDOWN | BTN_CLEFT | BTN_CRIGHT);
|
||||
s32 sOcarinaABtnMap = BTN_A;
|
||||
s32 sOcarinaCUPBtnMap = BTN_CUP;
|
||||
s32 sOcarinaCDownBtnMap = BTN_CDOWN;
|
||||
s32 sOcarinaCLeftBtnMap = BTN_CLEFT;
|
||||
s32 sOcarinaCRightBtnMap = BTN_CRIGHT;
|
||||
s32 sOcarinaD5BtnMap = BTN_CUP;
|
||||
s32 sOcarinaB4BtnMap = BTN_CLEFT;
|
||||
s32 sOcarinaA4BtnMap = BTN_CRIGHT;
|
||||
s32 sOcarinaF4BtnMap = BTN_CDOWN;
|
||||
s32 sOcarinaD4BtnMap = BTN_A;
|
||||
u8 sOcarinaInpEnabled = 0;
|
||||
s8 D_80130F10 = 0; // "OCA", ocarina active?
|
||||
u8 sCurOcarinaBtnVal = 0xFF;
|
||||
@@ -1013,9 +1013,9 @@ OcarinaNote sOcarinaSongs[OCARINA_SONG_MAX][20] = {
|
||||
|
||||
OcarinaNote* sPlaybackSong = sOcarinaSongs[0];
|
||||
u8 sFrogsSongNotes[14] = {
|
||||
OCARINA_NOTE_A, OCARINA_NOTE_C_LEFT, OCARINA_NOTE_C_RIGHT, OCARINA_NOTE_C_DOWN, OCARINA_NOTE_C_LEFT,
|
||||
OCARINA_NOTE_C_RIGHT, OCARINA_NOTE_C_DOWN, OCARINA_NOTE_A, OCARINA_NOTE_C_DOWN, OCARINA_NOTE_A,
|
||||
OCARINA_NOTE_C_DOWN, OCARINA_NOTE_C_RIGHT, OCARINA_NOTE_C_LEFT, OCARINA_NOTE_A,
|
||||
OCARINA_NOTE_D4, OCARINA_NOTE_B4, OCARINA_NOTE_A4, OCARINA_NOTE_F4, OCARINA_NOTE_B4,
|
||||
OCARINA_NOTE_A4, OCARINA_NOTE_F4, OCARINA_NOTE_D4, OCARINA_NOTE_F4, OCARINA_NOTE_D4,
|
||||
OCARINA_NOTE_F4, OCARINA_NOTE_A4, OCARINA_NOTE_B4, OCARINA_NOTE_D4,
|
||||
};
|
||||
u8* gFrogsSongPtr = sFrogsSongNotes;
|
||||
u8 sRecordingState = 0;
|
||||
@@ -1044,124 +1044,124 @@ OcarinaSongInfo gOcarinaSongNotes[OCARINA_SONG_MAX] = {
|
||||
// Minuet
|
||||
{ 6,
|
||||
{
|
||||
OCARINA_NOTE_A,
|
||||
OCARINA_NOTE_C_UP,
|
||||
OCARINA_NOTE_C_LEFT,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_LEFT,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_D4,
|
||||
OCARINA_NOTE_D5,
|
||||
OCARINA_NOTE_B4,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_B4,
|
||||
OCARINA_NOTE_A4,
|
||||
} },
|
||||
// Bolero
|
||||
{ 8,
|
||||
{
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_A,
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_A,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_F4,
|
||||
OCARINA_NOTE_D4,
|
||||
OCARINA_NOTE_F4,
|
||||
OCARINA_NOTE_D4,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_F4,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_F4,
|
||||
} },
|
||||
// Serenade
|
||||
{ 5,
|
||||
{
|
||||
OCARINA_NOTE_A,
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_LEFT,
|
||||
OCARINA_NOTE_D4,
|
||||
OCARINA_NOTE_F4,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_B4,
|
||||
} },
|
||||
// Requiem
|
||||
{ 6,
|
||||
{
|
||||
OCARINA_NOTE_A,
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_A,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_A,
|
||||
OCARINA_NOTE_D4,
|
||||
OCARINA_NOTE_F4,
|
||||
OCARINA_NOTE_D4,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_F4,
|
||||
OCARINA_NOTE_D4,
|
||||
} },
|
||||
// Nocturne
|
||||
{ 7,
|
||||
{
|
||||
OCARINA_NOTE_C_LEFT,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_A,
|
||||
OCARINA_NOTE_C_LEFT,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_B4,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_D4,
|
||||
OCARINA_NOTE_B4,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_F4,
|
||||
} },
|
||||
// Prelude
|
||||
{ 6,
|
||||
{
|
||||
OCARINA_NOTE_C_UP,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_UP,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_LEFT,
|
||||
OCARINA_NOTE_C_UP,
|
||||
OCARINA_NOTE_D5,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_D5,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_B4,
|
||||
OCARINA_NOTE_D5,
|
||||
} },
|
||||
// Sarias
|
||||
{ 6,
|
||||
{
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_LEFT,
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_LEFT,
|
||||
OCARINA_NOTE_F4,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_B4,
|
||||
OCARINA_NOTE_F4,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_B4,
|
||||
} },
|
||||
// Epona
|
||||
{ 6,
|
||||
{
|
||||
OCARINA_NOTE_C_UP,
|
||||
OCARINA_NOTE_C_LEFT,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_UP,
|
||||
OCARINA_NOTE_C_LEFT,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_D5,
|
||||
OCARINA_NOTE_B4,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_D5,
|
||||
OCARINA_NOTE_B4,
|
||||
OCARINA_NOTE_A4,
|
||||
} },
|
||||
// Lullaby
|
||||
{ 6,
|
||||
{
|
||||
OCARINA_NOTE_C_LEFT,
|
||||
OCARINA_NOTE_C_UP,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_LEFT,
|
||||
OCARINA_NOTE_C_UP,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_B4,
|
||||
OCARINA_NOTE_D5,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_B4,
|
||||
OCARINA_NOTE_D5,
|
||||
OCARINA_NOTE_A4,
|
||||
} },
|
||||
// Suns
|
||||
{ 6,
|
||||
{
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_C_UP,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_C_UP,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_F4,
|
||||
OCARINA_NOTE_D5,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_F4,
|
||||
OCARINA_NOTE_D5,
|
||||
} },
|
||||
// Song of Time
|
||||
{ 6,
|
||||
{
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_A,
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_C_RIGHT,
|
||||
OCARINA_NOTE_A,
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_D4,
|
||||
OCARINA_NOTE_F4,
|
||||
OCARINA_NOTE_A4,
|
||||
OCARINA_NOTE_D4,
|
||||
OCARINA_NOTE_F4,
|
||||
} },
|
||||
// Storms
|
||||
{ 6,
|
||||
{
|
||||
OCARINA_NOTE_A,
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_C_UP,
|
||||
OCARINA_NOTE_A,
|
||||
OCARINA_NOTE_C_DOWN,
|
||||
OCARINA_NOTE_C_UP,
|
||||
OCARINA_NOTE_D4,
|
||||
OCARINA_NOTE_F4,
|
||||
OCARINA_NOTE_D5,
|
||||
OCARINA_NOTE_D4,
|
||||
OCARINA_NOTE_F4,
|
||||
OCARINA_NOTE_D5,
|
||||
} },
|
||||
// Scarecrow
|
||||
{ 8, { 0, 0, 0, 0, 0, 0, 0, 0 } },
|
||||
@@ -1247,24 +1247,49 @@ void func_800F56A8(void);
|
||||
void Audio_PlayNatureAmbienceSequence(u8 natureAmbienceId);
|
||||
s32 Audio_SetGanonDistVol(u8 targetVol);
|
||||
|
||||
// Function originally not called, so repurposing for DPad input
|
||||
void func_800EC960(u8 dpad) {
|
||||
if (dpad) {
|
||||
sOcarinaAllowedBtnMask =
|
||||
(BTN_A | BTN_CUP | BTN_CDOWN | BTN_CLEFT | BTN_CRIGHT | BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT);
|
||||
sOcarinaABtnMap = BTN_A;
|
||||
sOcarinaCUPBtnMap = BTN_CUP | BTN_DUP;
|
||||
sOcarinaCDownBtnMap = BTN_CDOWN | BTN_DDOWN;
|
||||
sOcarinaCLeftBtnMap = BTN_CLEFT | BTN_DLEFT;
|
||||
sOcarinaCRightBtnMap = BTN_CRIGHT | BTN_DRIGHT;
|
||||
// Right stick as virtual C buttons
|
||||
#define RSTICK_UP 0x100000
|
||||
#define RSTICK_DOWN 0x200000
|
||||
#define RSTICK_LEFT 0x400000
|
||||
#define RSTICK_RIGHT 0x800000
|
||||
|
||||
// Function originally not called, so repurposing for control mapping
|
||||
void Audio_OcaUpdateBtnMap(bool customControls, bool dpad, bool rStick) {
|
||||
if (customControls) {
|
||||
sOcarinaD5BtnMap = CVar_GetS32("gOcarinaD5BtnMap", BTN_CUP);
|
||||
sOcarinaB4BtnMap = CVar_GetS32("gOcarinaB4BtnMap", BTN_CLEFT);
|
||||
sOcarinaA4BtnMap = CVar_GetS32("gOcarinaA4BtnMap", BTN_CRIGHT);
|
||||
sOcarinaF4BtnMap = CVar_GetS32("gOcarinaF4BtnMap", BTN_CDOWN);
|
||||
sOcarinaD4BtnMap = CVar_GetS32("gOcarinaD4BtnMap", BTN_A);
|
||||
} else {
|
||||
sOcarinaAllowedBtnMask = (BTN_A | BTN_CUP | BTN_CDOWN | BTN_CLEFT | BTN_CRIGHT);
|
||||
sOcarinaABtnMap = BTN_A;
|
||||
sOcarinaCUPBtnMap = BTN_CUP;
|
||||
sOcarinaCDownBtnMap = BTN_CDOWN;
|
||||
sOcarinaCLeftBtnMap = BTN_CLEFT;
|
||||
sOcarinaCRightBtnMap = BTN_CRIGHT;
|
||||
sOcarinaD5BtnMap = BTN_CUP;
|
||||
sOcarinaB4BtnMap = BTN_CLEFT;
|
||||
sOcarinaA4BtnMap = BTN_CRIGHT;
|
||||
sOcarinaF4BtnMap = BTN_CDOWN;
|
||||
sOcarinaD4BtnMap = BTN_A;
|
||||
}
|
||||
|
||||
if (dpad) {
|
||||
sOcarinaD5BtnMap |= BTN_DUP;
|
||||
sOcarinaB4BtnMap |= BTN_DLEFT;
|
||||
sOcarinaA4BtnMap |= BTN_DRIGHT;
|
||||
sOcarinaF4BtnMap |= BTN_DDOWN;
|
||||
}
|
||||
|
||||
if (rStick) {
|
||||
sOcarinaD5BtnMap |= RSTICK_UP;
|
||||
sOcarinaB4BtnMap |= RSTICK_LEFT;
|
||||
sOcarinaA4BtnMap |= RSTICK_RIGHT;
|
||||
sOcarinaF4BtnMap |= RSTICK_DOWN;
|
||||
}
|
||||
|
||||
sOcarinaAllowedBtnMask = (
|
||||
sOcarinaD5BtnMap |
|
||||
sOcarinaB4BtnMap |
|
||||
sOcarinaA4BtnMap |
|
||||
sOcarinaF4BtnMap |
|
||||
sOcarinaD4BtnMap
|
||||
);
|
||||
}
|
||||
|
||||
void Audio_GetOcaInput(void) {
|
||||
@@ -1278,6 +1303,22 @@ void Audio_GetOcaInput(void) {
|
||||
sPrevOcarinaBtnPress = sp18;
|
||||
sCurOcaStick.x = input->rel.stick_x;
|
||||
sCurOcaStick.y = input->rel.stick_y;
|
||||
|
||||
s8 rstick_x = input->cur.right_stick_x;
|
||||
s8 rstick_y = input->cur.right_stick_y;
|
||||
const s8 sensitivity = 64;
|
||||
if (rstick_x > sensitivity) {
|
||||
sCurOcarinaBtnPress |= RSTICK_RIGHT;
|
||||
}
|
||||
if (rstick_x < -sensitivity) {
|
||||
sCurOcarinaBtnPress |= RSTICK_LEFT;
|
||||
}
|
||||
if (rstick_y > sensitivity) {
|
||||
sCurOcarinaBtnPress |= RSTICK_UP;
|
||||
}
|
||||
if (rstick_y < -sensitivity) {
|
||||
sCurOcarinaBtnPress |= RSTICK_DOWN;
|
||||
}
|
||||
}
|
||||
|
||||
f32 Audio_OcaAdjStick(s8 inp) {
|
||||
@@ -1495,7 +1536,17 @@ void func_800ED200(void) {
|
||||
u8 j;
|
||||
u8 k;
|
||||
|
||||
if (CHECK_BTN_ANY(sCurOcarinaBtnPress, BTN_L) && CHECK_BTN_ANY(sCurOcarinaBtnPress, sOcarinaAllowedBtnMask)) {
|
||||
u32 disableSongBtnMap;
|
||||
if (CVar_GetS32("gCustomOcarinaControls", 0)) {
|
||||
disableSongBtnMap = CVar_GetS32("gOcarinaDisableBtnMap", BTN_L);
|
||||
} else {
|
||||
disableSongBtnMap = BTN_L;
|
||||
}
|
||||
|
||||
if (
|
||||
CHECK_BTN_ANY(sCurOcarinaBtnPress, disableSongBtnMap)
|
||||
&& CHECK_BTN_ANY(sCurOcarinaBtnPress, sOcarinaAllowedBtnMask)
|
||||
) {
|
||||
func_800ECC04((u16)D_80130F3C);
|
||||
return;
|
||||
}
|
||||
@@ -1548,7 +1599,9 @@ void func_800ED200(void) {
|
||||
|
||||
void func_800ED458(s32 arg0) {
|
||||
u32 phi_v1_2;
|
||||
bool dpad = CVar_GetS32("gDpadOcarinaText", 0);
|
||||
bool customControls = CVar_GetS32("gCustomOcarinaControls", 0);
|
||||
bool dpad = CVar_GetS32("gDpadOcarina", 0);
|
||||
bool rStick = CVar_GetS32("gRStickOcarina", 0);
|
||||
|
||||
if (D_80130F3C != 0 && sOcarinaDropInputTimer != 0) {
|
||||
sOcarinaDropInputTimer--;
|
||||
@@ -1569,35 +1622,47 @@ void func_800ED458(s32 arg0) {
|
||||
D_8016BA18 &= phi_v1_2;
|
||||
}
|
||||
|
||||
func_800EC960(dpad);
|
||||
if (D_8016BA18 & sOcarinaABtnMap) {
|
||||
osSyncPrintf("Presss NA_KEY_D4 %08x\n", sOcarinaABtnMap);
|
||||
Audio_OcaUpdateBtnMap(customControls, dpad, rStick);
|
||||
if (D_8016BA18 & sOcarinaD4BtnMap) {
|
||||
osSyncPrintf("Presss NA_KEY_D4 %08x\n", sOcarinaD4BtnMap);
|
||||
sCurOcarinaBtnVal = 2;
|
||||
sCurOcarinaBtnIdx = 0;
|
||||
} else if (D_8016BA18 & sOcarinaCDownBtnMap) {
|
||||
osSyncPrintf("Presss NA_KEY_F4 %08x\n", sOcarinaCDownBtnMap);
|
||||
} else if (D_8016BA18 & sOcarinaF4BtnMap) {
|
||||
osSyncPrintf("Presss NA_KEY_F4 %08x\n", sOcarinaF4BtnMap);
|
||||
sCurOcarinaBtnVal = 5;
|
||||
sCurOcarinaBtnIdx = 1;
|
||||
} else if (D_8016BA18 & sOcarinaCRightBtnMap) {
|
||||
osSyncPrintf("Presss NA_KEY_A4 %08x\n", sOcarinaCRightBtnMap);
|
||||
} else if (D_8016BA18 & sOcarinaA4BtnMap) {
|
||||
osSyncPrintf("Presss NA_KEY_A4 %08x\n", sOcarinaA4BtnMap);
|
||||
sCurOcarinaBtnVal = 9;
|
||||
sCurOcarinaBtnIdx = 2;
|
||||
} else if (D_8016BA18 & sOcarinaCLeftBtnMap) {
|
||||
osSyncPrintf("Presss NA_KEY_B4 %08x\n", sOcarinaCRightBtnMap);
|
||||
} else if (D_8016BA18 & sOcarinaB4BtnMap) {
|
||||
osSyncPrintf("Presss NA_KEY_B4 %08x\n", sOcarinaA4BtnMap);
|
||||
sCurOcarinaBtnVal = 0xB;
|
||||
sCurOcarinaBtnIdx = 3;
|
||||
} else if (D_8016BA18 & sOcarinaCUPBtnMap) {
|
||||
osSyncPrintf("Presss NA_KEY_D5 %08x\n", sOcarinaCUPBtnMap);
|
||||
} else if (D_8016BA18 & sOcarinaD5BtnMap) {
|
||||
osSyncPrintf("Presss NA_KEY_D5 %08x\n", sOcarinaD5BtnMap);
|
||||
sCurOcarinaBtnVal = 0xE;
|
||||
sCurOcarinaBtnIdx = 4;
|
||||
}
|
||||
|
||||
if (sCurOcarinaBtnVal != 0xFF && sCurOcarinaBtnPress & 0x10 && sRecordingState != 2) {
|
||||
u32 noteSharpBtnMap;
|
||||
if (customControls) {
|
||||
noteSharpBtnMap = CVar_GetS32("gOcarinaSharpBtnMap", BTN_R);
|
||||
} else {
|
||||
noteSharpBtnMap = BTN_R;
|
||||
}
|
||||
if ((sCurOcarinaBtnVal != 0xFF) && (sCurOcarinaBtnPress & noteSharpBtnMap) && (sRecordingState != 2)) {
|
||||
sCurOcarinaBtnIdx += 0x80;
|
||||
sCurOcarinaBtnVal++;
|
||||
}
|
||||
|
||||
if ((sCurOcarinaBtnVal != 0xFF) && (sCurOcarinaBtnPress & 0x2000) && (sRecordingState != 2)) {
|
||||
u32 noteFlatBtnMap;
|
||||
if (customControls) {
|
||||
noteFlatBtnMap = CVar_GetS32("gOcarinaFlatBtnMap", BTN_Z);
|
||||
} else {
|
||||
noteFlatBtnMap = BTN_Z;
|
||||
}
|
||||
if ((sCurOcarinaBtnVal != 0xFF) && (sCurOcarinaBtnPress & noteFlatBtnMap) && (sRecordingState != 2)) {
|
||||
sCurOcarinaBtnIdx += 0x40;
|
||||
sCurOcarinaBtnVal--;
|
||||
}
|
||||
|
||||
+53
-30
@@ -651,7 +651,7 @@ void Flags_UnsetSwitch(GlobalContext* globalCtx, s32 flag) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests if current scene unknown flag is set.
|
||||
* Tests if unknown flag is set.
|
||||
*/
|
||||
s32 Flags_GetUnknown(GlobalContext* globalCtx, s32 flag) {
|
||||
if (flag < 0x20) {
|
||||
@@ -662,7 +662,7 @@ s32 Flags_GetUnknown(GlobalContext* globalCtx, s32 flag) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets current scene unknown flag.
|
||||
* Sets unknown flag.
|
||||
*/
|
||||
void Flags_SetUnknown(GlobalContext* globalCtx, s32 flag) {
|
||||
if (flag < 0x20) {
|
||||
@@ -673,7 +673,7 @@ void Flags_SetUnknown(GlobalContext* globalCtx, s32 flag) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Unsets current scene unknown flag.
|
||||
* Unsets unknown flag.
|
||||
*/
|
||||
void Flags_UnsetUnknown(GlobalContext* globalCtx, s32 flag) {
|
||||
if (flag < 0x20) {
|
||||
@@ -1395,7 +1395,7 @@ void func_8002DE04(GlobalContext* globalCtx, Actor* actorA, Actor* actorB) {
|
||||
}
|
||||
|
||||
void func_8002DE74(GlobalContext* globalCtx, Player* player) {
|
||||
if ((globalCtx->roomCtx.curRoom.unk_03 != 4) && func_800C0CB8(globalCtx)) {
|
||||
if ((globalCtx->roomCtx.curRoom.behaviorType1 != ROOM_BEHAVIOR_TYPE1_4) && func_800C0CB8(globalCtx)) {
|
||||
Camera_ChangeSetting(Gameplay_GetCamera(globalCtx, MAIN_CAM), CAM_SET_HORSE);
|
||||
}
|
||||
}
|
||||
@@ -2384,9 +2384,9 @@ void func_80030488(GlobalContext* globalCtx) {
|
||||
LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, D_8015BC10);
|
||||
}
|
||||
|
||||
void func_800304B0(GlobalContext* globalCtx) {
|
||||
if (globalCtx->actorCtx.unk_03 != 0) {
|
||||
globalCtx->actorCtx.unk_03 = 0;
|
||||
void Actor_DisableLens(GlobalContext* globalCtx) {
|
||||
if (globalCtx->actorCtx.lensActive) {
|
||||
globalCtx->actorCtx.lensActive = false;
|
||||
func_800876C8(globalCtx);
|
||||
}
|
||||
}
|
||||
@@ -2426,7 +2426,7 @@ void func_800304DC(GlobalContext* globalCtx, ActorContext* actorCtx, ActorEntry*
|
||||
func_8002FA60(globalCtx);
|
||||
}
|
||||
|
||||
u32 D_80116068[] = {
|
||||
u32 D_80116068[ACTORCAT_MAX] = {
|
||||
0x100000C0, 0x100000C0, 0x00000000, 0x100004C0, 0x00000080, 0x300000C0,
|
||||
0x10000080, 0x00000000, 0x300000C0, 0x100004C0, 0x00000000, 0x100000C0,
|
||||
};
|
||||
@@ -2679,26 +2679,35 @@ void func_80030ED8(Actor* actor) {
|
||||
}
|
||||
}
|
||||
|
||||
void func_80030FA8(GraphicsContext* gfxCtx) {
|
||||
#define LENS_MASK_WIDTH 64
|
||||
#define LENS_MASK_HEIGHT 64
|
||||
// 26 and 6 are for padding between the mask texture and the screen borders
|
||||
#define LENS_MASK_OFFSET_S ((SCREEN_WIDTH / 2 - LENS_MASK_WIDTH) - 26)
|
||||
#define LENS_MASK_OFFSET_T ((SCREEN_HEIGHT / 2 - LENS_MASK_HEIGHT) - 6)
|
||||
|
||||
void Actor_DrawLensOverlay(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx);
|
||||
|
||||
gDPLoadTextureBlock(POLY_XLU_DISP++, gLensOfTruthMaskTex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0,
|
||||
G_TX_MIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
|
||||
gDPLoadTextureBlock(POLY_XLU_DISP++, gLensOfTruthMaskTex, G_IM_FMT_I, G_IM_SIZ_8b, LENS_MASK_WIDTH,
|
||||
LENS_MASK_HEIGHT, 0, G_TX_MIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD,
|
||||
G_TX_NOLOD);
|
||||
|
||||
s32 x = OTRGetRectDimensionFromLeftEdge(0) << 2;
|
||||
s32 w = OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH) << 2;
|
||||
|
||||
float ratio = OTRGetAspectRatio();
|
||||
|
||||
gDPSetTileSize(POLY_XLU_DISP++, G_TX_RENDERTILE, 384, 224, 892, 732);
|
||||
// TODO: Do correct math to fix it
|
||||
gSPWideTextureRectangle(POLY_XLU_DISP++, x, 0, x + abs(x), 960, G_TX_RENDERTILE, 0, 0, 0, 0);
|
||||
gSPWideTextureRectangle(POLY_XLU_DISP++, 0, 0, w, 960, G_TX_RENDERTILE, 2240, 1600, 576, 597);
|
||||
gDPSetTileSize(POLY_XLU_DISP++, G_TX_RENDERTILE, (SCREEN_WIDTH / 2 - LENS_MASK_WIDTH) << 2,
|
||||
(SCREEN_HEIGHT / 2 - LENS_MASK_HEIGHT) << 2, (SCREEN_WIDTH / 2 + LENS_MASK_WIDTH - 1) << 2,
|
||||
(SCREEN_HEIGHT / 2 + LENS_MASK_HEIGHT - 1) << 2);
|
||||
gSPWideTextureRectangle(POLY_XLU_DISP++, x, 0, x + abs(x), SCREEN_HEIGHT << 2, G_TX_RENDERTILE, 0, 0, 0, 0);
|
||||
gSPWideTextureRectangle(POLY_XLU_DISP++, 0, 0, w, SCREEN_HEIGHT << 2, G_TX_RENDERTILE,
|
||||
LENS_MASK_OFFSET_S << 5, LENS_MASK_OFFSET_T << 5,
|
||||
(1 << 10) * (SCREEN_WIDTH - 2 * LENS_MASK_OFFSET_S) / SCREEN_WIDTH,
|
||||
(1 << 10) * (SCREEN_HEIGHT - 2 * LENS_MASK_OFFSET_T) / SCREEN_HEIGHT);
|
||||
gDPPipeSync(POLY_XLU_DISP++);
|
||||
CLOSE_DISPS(gfxCtx);
|
||||
}
|
||||
|
||||
void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** invisibleActors) {
|
||||
void Actor_DrawLensActors(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** invisibleActors) {
|
||||
Actor** invisibleActor;
|
||||
GraphicsContext* gfxCtx;
|
||||
s32 i;
|
||||
@@ -2711,28 +2720,41 @@ void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** inv
|
||||
|
||||
gDPPipeSync(POLY_XLU_DISP++);
|
||||
|
||||
if (globalCtx->roomCtx.curRoom.showInvisActors == 0) {
|
||||
if (globalCtx->roomCtx.curRoom.lensMode == LENS_MODE_HIDE_ACTORS) {
|
||||
// Update both the color frame buffer and the z-buffer
|
||||
gDPSetOtherMode(POLY_XLU_DISP++,
|
||||
G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE |
|
||||
G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE,
|
||||
G_AC_THRESHOLD | G_ZS_PRIM | Z_UPD | G_RM_CLD_SURF | G_RM_CLD_SURF2);
|
||||
|
||||
gDPSetCombineMode(POLY_XLU_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
|
||||
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 0, 0, 255);
|
||||
|
||||
// the z-buffer will later only allow drawing inside the lens circle
|
||||
} else {
|
||||
// Update the z-buffer but not the color frame buffer
|
||||
gDPSetOtherMode(POLY_XLU_DISP++,
|
||||
G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE |
|
||||
G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE,
|
||||
G_AC_THRESHOLD | G_ZS_PRIM | Z_UPD | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL |
|
||||
GBL_c1(G_BL_CLR_BL, G_BL_0, G_BL_CLR_MEM, G_BL_1MA) |
|
||||
GBL_c2(G_BL_CLR_BL, G_BL_0, G_BL_CLR_MEM, G_BL_1MA));
|
||||
|
||||
// inverts the mask image, which initially is 0 inner and 74 outer,
|
||||
// by setting the combiner to draw 74 - image instead of the image
|
||||
gDPSetCombineLERP(POLY_XLU_DISP++, PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, 0, PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, 0,
|
||||
PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, 0, PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, 0);
|
||||
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0xFF, 74, 74, 74, 74);
|
||||
|
||||
// the z-buffer will later only allow drawing outside the lens circle
|
||||
}
|
||||
|
||||
// Together with the depth source set above, this sets the depth to the closest.
|
||||
// For a pixel with such a depth value, the z-buffer will reject drawing to that pixel.
|
||||
gDPSetPrimDepth(POLY_XLU_DISP++, 0, 0);
|
||||
|
||||
func_80030FA8(gfxCtx);
|
||||
// The z-buffer will be updated where the mask is not fully transparent.
|
||||
Actor_DrawLensOverlay(gfxCtx);
|
||||
|
||||
// "Magic lens invisible Actor display START"
|
||||
gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ 見えないＡcｔｏｒ表示 START", numInvisibleActors);
|
||||
@@ -2747,7 +2769,9 @@ void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** inv
|
||||
// "Magic lens invisible Actor display END"
|
||||
gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ 見えないＡcｔｏｒ表示 END", numInvisibleActors);
|
||||
|
||||
if (globalCtx->roomCtx.curRoom.showInvisActors != 0) {
|
||||
if (globalCtx->roomCtx.curRoom.lensMode != LENS_MODE_HIDE_ACTORS) {
|
||||
// Draw the lens overlay to the color frame buffer
|
||||
|
||||
gDPNoOpString(POLY_OPA_DISP++, "青い眼鏡(外側)", 0); // "Blue spectacles (exterior)"
|
||||
|
||||
gDPPipeSync(POLY_XLU_DISP++);
|
||||
@@ -2759,7 +2783,7 @@ void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** inv
|
||||
gDPSetCombineMode(POLY_XLU_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
|
||||
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 0, 0, 255);
|
||||
|
||||
func_80030FA8(gfxCtx);
|
||||
Actor_DrawLensOverlay(gfxCtx);
|
||||
|
||||
gDPNoOpString(POLY_OPA_DISP++, "青い眼鏡(外側)", 1); // "Blue spectacles (exterior)"
|
||||
}
|
||||
@@ -2844,8 +2868,8 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) {
|
||||
if ((HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(71) == 0)) {
|
||||
if ((actor->init == NULL) && (actor->draw != NULL) && (actor->flags & (ACTOR_FLAG_5 | ACTOR_FLAG_6))) {
|
||||
if ((actor->flags & ACTOR_FLAG_7) &&
|
||||
((globalCtx->roomCtx.curRoom.showInvisActors == 0) || (globalCtx->actorCtx.unk_03 != 0) ||
|
||||
(actor->room != globalCtx->roomCtx.curRoom.num))) {
|
||||
((globalCtx->roomCtx.curRoom.lensMode == LENS_MODE_HIDE_ACTORS) ||
|
||||
globalCtx->actorCtx.lensActive || (actor->room != globalCtx->roomCtx.curRoom.num))) {
|
||||
ASSERT(invisibleActorCounter < INVISIBLE_ACTOR_MAX);
|
||||
invisibleActors[invisibleActorCounter] = actor;
|
||||
invisibleActorCounter++;
|
||||
@@ -2871,10 +2895,10 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) {
|
||||
}
|
||||
|
||||
if ((HREG(64) != 1) || (HREG(72) != 0)) {
|
||||
if (globalCtx->actorCtx.unk_03 != 0) {
|
||||
func_8003115C(globalCtx, invisibleActorCounter, invisibleActors);
|
||||
if (globalCtx->actorCtx.lensActive) {
|
||||
Actor_DrawLensActors(globalCtx, invisibleActorCounter, invisibleActors);
|
||||
if ((globalCtx->csCtx.state != CS_STATE_IDLE) || Player_InCsMode(globalCtx)) {
|
||||
func_800304B0(globalCtx);
|
||||
Actor_DisableLens(globalCtx);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3231,6 +3255,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId
|
||||
Actor* Actor_SpawnAsChild(ActorContext* actorCtx, Actor* parent, GlobalContext* globalCtx, s16 actorId, f32 posX,
|
||||
f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params) {
|
||||
Actor* spawnedActor = Actor_Spawn(actorCtx, globalCtx, actorId, posX, posY, posZ, rotX, rotY, rotZ, params);
|
||||
|
||||
if (spawnedActor == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -3993,8 +4018,6 @@ void Actor_DrawDoorLock(GlobalContext* globalCtx, s32 frame, s32 type) {
|
||||
f32 chainsTranslateX;
|
||||
f32 chainsTranslateY;
|
||||
f32 rotZStep;
|
||||
static u32 epoch = 0;
|
||||
epoch++;
|
||||
|
||||
entry = &sDoorLocksInfo[type];
|
||||
chainRotZ = entry->chainsRotZInit;
|
||||
@@ -4008,7 +4031,7 @@ void Actor_DrawDoorLock(GlobalContext* globalCtx, s32 frame, s32 type) {
|
||||
chainsTranslateY = cosf(entry->chainAngle - chainRotZ) * (10 - frame) * 0.1f * entry->chainLength;
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
FrameInterpolation_RecordOpenChild(entry, epoch + i * 25);
|
||||
FrameInterpolation_RecordOpenChild(entry, i);
|
||||
Matrix_Put(&baseMtxF);
|
||||
Matrix_RotateZ(chainRotZ, MTXMODE_APPLY);
|
||||
Matrix_Translate(chainsTranslateX, chainsTranslateY, 0.0f, MTXMODE_APPLY);
|
||||
|
||||
@@ -397,6 +397,16 @@ s32 CollisionPoly_LineVsPoly(CollisionPoly* poly, Vec3s* vtxList, Vec3f* posA, V
|
||||
(poly->normal.x * posB->x + poly->normal.y * posB->y + poly->normal.z * posB->z) * COLPOLY_NORMAL_FRAC +
|
||||
plane.originDist;
|
||||
|
||||
#ifdef __WIIU__
|
||||
// on some platforms this ends up as very small numbers due to rounding issues
|
||||
if (IS_ZERO(planeDistA)) {
|
||||
planeDistA = 0.0f;
|
||||
}
|
||||
if (IS_ZERO(planeDistB)) {
|
||||
planeDistB = 0.0f;
|
||||
}
|
||||
#endif
|
||||
|
||||
planeDistDelta = planeDistA - planeDistB;
|
||||
if ((planeDistA >= 0.0f && planeDistB >= 0.0f) || (planeDistA < 0.0f && planeDistB < 0.0f) ||
|
||||
(chkOneFace && planeDistA < 0.0f && planeDistB > 0.0f) || IS_ZERO(planeDistDelta)) {
|
||||
|
||||
+109
-97
@@ -11,7 +11,7 @@
|
||||
s16 Camera_ChangeSettingFlags(Camera* camera, s16 setting, s16 flags);
|
||||
s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 flags);
|
||||
s32 Camera_QRegInit(void);
|
||||
s32 Camera_CheckWater(Camera* camera);
|
||||
s32 Camera_UpdateWater(Camera* camera);
|
||||
|
||||
#define RELOAD_PARAMS \
|
||||
(camera->animState == 0 || camera->animState == 0xA || camera->animState == 0x14 || R_RELOAD_CAM_PARAMS)
|
||||
@@ -28,6 +28,12 @@ s32 Camera_CheckWater(Camera* camera);
|
||||
#define FLG_ADJSLOPE (1 << 0)
|
||||
#define FLG_OFFGROUND (1 << 7)
|
||||
|
||||
#define DISTORTION_HOT_ROOM (1 << 0)
|
||||
#define DISTORTION_UNDERWATER_WEAK (1 << 1)
|
||||
#define DISTORTION_UNDERWATER_MEDIUM (1 << 2)
|
||||
#define DISTORTION_UNDERWATER_STRONG (1 << 3)
|
||||
#define DISTORTION_UNDERWATER_FISHING (1 << 4)
|
||||
|
||||
#include "z_camera_data.inc"
|
||||
|
||||
/*===============================================================*/
|
||||
@@ -972,7 +978,7 @@ s32 func_80045B08(Camera* camera, VecSph* eyeAtDir, f32 yExtra, s16 arg3) {
|
||||
f32 phi_f2;
|
||||
Vec3f posOffsetTarget;
|
||||
Vec3f atTarget;
|
||||
f32 sp38; // unused
|
||||
f32 pad;
|
||||
f32 temp_ret;
|
||||
PosRot* playerPosRot = &camera->playerPosRot;
|
||||
|
||||
@@ -1410,8 +1416,8 @@ s32 Camera_Noop(Camera* camera) {
|
||||
}
|
||||
|
||||
s32 SetCameraManual(Camera* camera) {
|
||||
f32 newCamX = -D_8015BD7C->state.input[0].cur.cam_x;
|
||||
f32 newCamY = D_8015BD7C->state.input[0].cur.cam_y;
|
||||
f32 newCamX = -D_8015BD7C->state.input[0].cur.right_stick_x * 10.0f;
|
||||
f32 newCamY = D_8015BD7C->state.input[0].cur.right_stick_y * 10.0f;
|
||||
|
||||
if ((fabsf(newCamX) >= 15.0f || fabsf(newCamY) >= 15.0f) && camera->globalCtx->manualCamera == false) {
|
||||
camera->globalCtx->manualCamera = true;
|
||||
@@ -1479,8 +1485,8 @@ s32 Camera_Free(Camera* camera) {
|
||||
|
||||
camera->animState = 1;
|
||||
|
||||
f32 newCamX = -D_8015BD7C->state.input[0].cur.cam_x;
|
||||
f32 newCamY = D_8015BD7C->state.input[0].cur.cam_y;
|
||||
f32 newCamX = -D_8015BD7C->state.input[0].cur.right_stick_x * 10.0f;
|
||||
f32 newCamY = D_8015BD7C->state.input[0].cur.right_stick_y * 10.0f;
|
||||
|
||||
camera->globalCtx->camX += newCamX;
|
||||
camera->globalCtx->camY += newCamY;
|
||||
@@ -7004,19 +7010,20 @@ void func_80057FC4(Camera* camera) {
|
||||
if (camera != &camera->globalCtx->mainCamera) {
|
||||
camera->prevSetting = camera->setting = CAM_SET_FREE0;
|
||||
camera->unk_14C &= ~0x4;
|
||||
} else if (camera->globalCtx->roomCtx.curRoom.mesh->polygon.type != 1) {
|
||||
switch (camera->globalCtx->roomCtx.curRoom.unk_03) {
|
||||
case 1:
|
||||
} else if (camera->globalCtx->roomCtx.curRoom.meshHeader->base.type != 1) {
|
||||
switch (camera->globalCtx->roomCtx.curRoom.behaviorType1) {
|
||||
case ROOM_BEHAVIOR_TYPE1_1:
|
||||
Camera_ChangeDoorCam(camera, NULL, -99, 0, 0, 18, 10);
|
||||
camera->prevSetting = camera->setting = CAM_SET_DUNGEON0;
|
||||
break;
|
||||
case 0:
|
||||
case ROOM_BEHAVIOR_TYPE1_0:
|
||||
osSyncPrintf("camera: room type: default set field\n");
|
||||
Camera_ChangeDoorCam(camera, NULL, -99, 0, 0, 18, 10);
|
||||
camera->prevSetting = camera->setting = CAM_SET_NORMAL0;
|
||||
break;
|
||||
default:
|
||||
osSyncPrintf("camera: room type: default set etc (%d)\n", camera->globalCtx->roomCtx.curRoom.unk_03);
|
||||
osSyncPrintf("camera: room type: default set etc (%d)\n",
|
||||
camera->globalCtx->roomCtx.curRoom.behaviorType1);
|
||||
Camera_ChangeDoorCam(camera, NULL, -99, 0, 0, 18, 10);
|
||||
camera->prevSetting = camera->setting = CAM_SET_NORMAL0;
|
||||
camera->unk_14C |= 4;
|
||||
@@ -7095,7 +7102,7 @@ void Camera_InitPlayerSettings(Camera* camera, Player* player) {
|
||||
osSyncPrintf(VT_FGCOL(BLUE) "camera: personalize ---" VT_RST "\n");
|
||||
|
||||
if (camera->thisIdx == MAIN_CAM) {
|
||||
Camera_CheckWater(camera);
|
||||
Camera_UpdateWater(camera);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7203,7 +7210,7 @@ void Camera_PrintSettings(Camera* camera) {
|
||||
}
|
||||
}
|
||||
|
||||
s32 Camera_CheckWater(Camera* camera) {
|
||||
s32 Camera_UpdateWater(Camera* camera) {
|
||||
f32 waterY;
|
||||
s16 newQuakeId;
|
||||
s32 waterLightsIndex;
|
||||
@@ -7280,7 +7287,7 @@ s32 Camera_CheckWater(Camera* camera) {
|
||||
camera->unk_14C |= 0x100;
|
||||
osSyncPrintf("kankyo changed water, sound on\n");
|
||||
Environment_EnableUnderwaterLights(camera->globalCtx, waterLightsIndex);
|
||||
camera->unk_150 = 0x50;
|
||||
camera->waterDistortionTimer = 80;
|
||||
}
|
||||
|
||||
Audio_SetExtraFilter(0x20);
|
||||
@@ -7299,13 +7306,13 @@ s32 Camera_CheckWater(Camera* camera) {
|
||||
}
|
||||
}
|
||||
|
||||
if (camera->unk_150 > 0) {
|
||||
camera->unk_150--;
|
||||
camera->unk_152 |= 8;
|
||||
} else if (camera->globalCtx->sceneNum == 0x49) {
|
||||
camera->unk_152 |= 0x10;
|
||||
if (camera->waterDistortionTimer > 0) {
|
||||
camera->waterDistortionTimer--;
|
||||
camera->distortionFlags |= DISTORTION_UNDERWATER_STRONG;
|
||||
} else if (camera->globalCtx->sceneNum == SCENE_TURIBORI) {
|
||||
camera->distortionFlags |= DISTORTION_UNDERWATER_FISHING;
|
||||
} else {
|
||||
camera->unk_152 |= 2;
|
||||
camera->distortionFlags |= DISTORTION_UNDERWATER_WEAK;
|
||||
}
|
||||
} else {
|
||||
if (camera->unk_14C & 0x100) {
|
||||
@@ -7315,21 +7322,18 @@ s32 Camera_CheckWater(Camera* camera) {
|
||||
if (*quakeId != 0) {
|
||||
Quake_RemoveFromIdx(*quakeId);
|
||||
}
|
||||
camera->unk_150 = 0;
|
||||
camera->unk_152 = 0;
|
||||
camera->waterDistortionTimer = 0;
|
||||
camera->distortionFlags = 0;
|
||||
}
|
||||
Audio_SetExtraFilter(0);
|
||||
}
|
||||
//! @bug: doesn't always return a value, but sometimes does.
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the room to be hot camera quake flag
|
||||
*/
|
||||
s32 Camera_SetRoomHotFlag(Camera* camera) {
|
||||
camera->unk_152 &= ~1;
|
||||
if (camera->globalCtx->roomCtx.curRoom.unk_02 == 3) {
|
||||
camera->unk_152 |= 1;
|
||||
s32 Camera_UpdateHotRoom(Camera* camera) {
|
||||
camera->distortionFlags &= ~DISTORTION_HOT_ROOM;
|
||||
if (camera->globalCtx->roomCtx.curRoom.behaviorType2 == ROOM_BEHAVIOR_TYPE2_3) {
|
||||
camera->distortionFlags |= DISTORTION_HOT_ROOM;
|
||||
}
|
||||
|
||||
return 1;
|
||||
@@ -7364,80 +7368,87 @@ s32 Camera_DbgChangeMode(Camera* camera) {
|
||||
return true;
|
||||
}
|
||||
|
||||
s16 D_8011DB08 = 0x3F0;
|
||||
s16 D_8011DB0C = 0x156;
|
||||
void func_80058E8C(Camera* camera) {
|
||||
s32 pad3;
|
||||
f32 sp60;
|
||||
s32 pad;
|
||||
s32 pad1;
|
||||
s32 pad4;
|
||||
f32 phi_f2;
|
||||
s32 pad2;
|
||||
f32 phi_f0;
|
||||
f32 phi_f20;
|
||||
f32 sp40;
|
||||
f32 sp3C;
|
||||
f32 sp38;
|
||||
f32 sp34;
|
||||
s16 depthPhase = 0x3F0;
|
||||
s16 screenPlanePhase = 0x156;
|
||||
void Camera_UpdateDistortion(Camera* camera) {
|
||||
f32 scaleFactor;
|
||||
f32 speedFactor;
|
||||
f32 depthPhaseStep;
|
||||
f32 screenPlanePhaseStep;
|
||||
s32 pad[5];
|
||||
f32 xScale;
|
||||
f32 yScale;
|
||||
f32 zScale;
|
||||
f32 speed;
|
||||
|
||||
if (camera->unk_152 != 0) {
|
||||
if (camera->unk_152 & 4) {
|
||||
phi_f0 = 0.0f;
|
||||
phi_f2 = 170.0f;
|
||||
sp3C = 0.01f;
|
||||
sp40 = -0.01f;
|
||||
sp38 = 0.0f;
|
||||
sp34 = 0.6f;
|
||||
phi_f20 = camera->unk_150 / 60.0f;
|
||||
sp60 = 1.0f;
|
||||
} else if (camera->unk_152 & 8) {
|
||||
phi_f0 = 248.0f;
|
||||
phi_f2 = -90.0f;
|
||||
sp38 = 0.2f;
|
||||
sp34 = 0.2f;
|
||||
sp40 = -0.3f;
|
||||
sp3C = 0.3f;
|
||||
phi_f20 = camera->unk_150 / 80.0f;
|
||||
sp60 = 1.0f;
|
||||
} else if (camera->unk_152 & 2) {
|
||||
phi_f0 = 359.2f;
|
||||
phi_f2 = -18.5f;
|
||||
sp40 = 0.09f;
|
||||
sp38 = 0.01f;
|
||||
sp3C = 0.09f;
|
||||
sp34 = 0.08f;
|
||||
phi_f20 =
|
||||
if (camera->distortionFlags != 0) {
|
||||
if (camera->distortionFlags & DISTORTION_UNDERWATER_MEDIUM) {
|
||||
depthPhaseStep = 0.0f;
|
||||
screenPlanePhaseStep = 170.0f;
|
||||
|
||||
xScale = -0.01f;
|
||||
yScale = 0.01f;
|
||||
zScale = 0.0f;
|
||||
|
||||
speed = 0.6f;
|
||||
scaleFactor = camera->waterDistortionTimer / 60.0f;
|
||||
speedFactor = 1.0f;
|
||||
} else if (camera->distortionFlags & DISTORTION_UNDERWATER_STRONG) {
|
||||
depthPhaseStep = 248.0f;
|
||||
screenPlanePhaseStep = -90.0f;
|
||||
|
||||
xScale = -0.3f;
|
||||
yScale = 0.3f;
|
||||
zScale = 0.2f;
|
||||
|
||||
speed = 0.2f;
|
||||
scaleFactor = camera->waterDistortionTimer / 80.0f;
|
||||
speedFactor = 1.0f;
|
||||
} else if (camera->distortionFlags & DISTORTION_UNDERWATER_WEAK) {
|
||||
depthPhaseStep = 359.2f;
|
||||
screenPlanePhaseStep = -18.5f;
|
||||
|
||||
xScale = 0.09f;
|
||||
yScale = 0.09f;
|
||||
zScale = 0.01f;
|
||||
|
||||
speed = 0.08f;
|
||||
scaleFactor =
|
||||
(((camera->waterYPos - camera->eye.y) > 150.0f ? 1.0f : (camera->waterYPos - camera->eye.y) / 150.0f) *
|
||||
0.45f) +
|
||||
(camera->speedRatio * 0.45f);
|
||||
sp60 = phi_f20;
|
||||
} else if (camera->unk_152 & 1) {
|
||||
// hot room flag
|
||||
phi_f2 = 150.0f;
|
||||
phi_f0 = 0.0f;
|
||||
sp3C = 0.01f;
|
||||
sp38 = 0.01f;
|
||||
sp40 = -0.01f;
|
||||
sp34 = 0.6f;
|
||||
sp60 = 1.0f;
|
||||
phi_f20 = 1.0f;
|
||||
speedFactor = scaleFactor;
|
||||
} else if (camera->distortionFlags & DISTORTION_HOT_ROOM) {
|
||||
// Gives the hot-room a small mirage-like appearance
|
||||
depthPhaseStep = 0.0f;
|
||||
screenPlanePhaseStep = 150.0f;
|
||||
|
||||
xScale = -0.01f;
|
||||
yScale = 0.01f;
|
||||
zScale = 0.01f;
|
||||
|
||||
speed = 0.6f;
|
||||
speedFactor = 1.0f;
|
||||
scaleFactor = 1.0f;
|
||||
} else {
|
||||
// DISTORTION_UNDERWATER_FISHING
|
||||
return;
|
||||
}
|
||||
D_8011DB08 += DEGF_TO_BINANG(phi_f0);
|
||||
D_8011DB0C += DEGF_TO_BINANG(phi_f2);
|
||||
Math_CosS(D_8011DB08);
|
||||
Math_SinS(D_8011DB08);
|
||||
Math_SinS(D_8011DB0C);
|
||||
func_800AA76C(&camera->globalCtx->view, 0.0f, 0.0f, 0.0f);
|
||||
func_800AA78C(&camera->globalCtx->view, Math_SinS(D_8011DB0C) * (sp40 * phi_f20) + 1.0f,
|
||||
Math_CosS(D_8011DB0C) * (sp3C * phi_f20) + 1.0f, Math_CosS(D_8011DB08) * (sp38 * phi_f20) + 1.0f);
|
||||
func_800AA7AC(&camera->globalCtx->view, sp34 * sp60);
|
||||
|
||||
depthPhase += DEGF_TO_BINANG(depthPhaseStep);
|
||||
screenPlanePhase += DEGF_TO_BINANG(screenPlanePhaseStep);
|
||||
|
||||
View_SetDistortionOrientation(&camera->globalCtx->view, Math_CosS(depthPhase) * 0.0f, Math_SinS(depthPhase) * 0.0f,
|
||||
Math_SinS(screenPlanePhase) * 0.0f);
|
||||
View_SetDistortionScale(&camera->globalCtx->view, Math_SinS(screenPlanePhase) * (xScale * scaleFactor) + 1.0f,
|
||||
Math_CosS(screenPlanePhase) * (yScale * scaleFactor) + 1.0f,
|
||||
Math_CosS(depthPhase) * (zScale * scaleFactor) + 1.0f);
|
||||
View_SetDistortionSpeed(&camera->globalCtx->view, speed * speedFactor);
|
||||
|
||||
camera->unk_14C |= 0x40;
|
||||
|
||||
} else if (camera->unk_14C & 0x40) {
|
||||
func_800AA814(&camera->globalCtx->view);
|
||||
View_ClearDistortion(&camera->globalCtx->view);
|
||||
camera->unk_14C &= ~0x40;
|
||||
}
|
||||
}
|
||||
@@ -7506,8 +7517,8 @@ Vec3s Camera_Update(Camera* camera) {
|
||||
|
||||
if (sOOBTimer < 200) {
|
||||
if (camera->status == CAM_STAT_ACTIVE) {
|
||||
Camera_CheckWater(camera);
|
||||
Camera_SetRoomHotFlag(camera);
|
||||
Camera_UpdateWater(camera);
|
||||
Camera_UpdateHotRoom(camera);
|
||||
}
|
||||
|
||||
if (!(camera->unk_14C & 4)) {
|
||||
@@ -7647,7 +7658,8 @@ Vec3s Camera_Update(Camera* camera) {
|
||||
|
||||
camera->skyboxOffset = quake.eyeOffset;
|
||||
|
||||
func_80058E8C(camera);
|
||||
Camera_UpdateDistortion(camera);
|
||||
|
||||
if ((camera->globalCtx->sceneNum == SCENE_SPOT00) && (camera->fov < 59.0f)) {
|
||||
View_SetScale(&camera->globalCtx->view, 0.79f);
|
||||
} else {
|
||||
@@ -7844,7 +7856,7 @@ s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 flags) {
|
||||
func_80078884(0);
|
||||
break;
|
||||
case 2:
|
||||
if (camera->globalCtx->roomCtx.curRoom.unk_03 == 1) {
|
||||
if (camera->globalCtx->roomCtx.curRoom.behaviorType1 == ROOM_BEHAVIOR_TYPE1_1) {
|
||||
func_80078884(NA_SE_SY_ATTENTION_URGENCY);
|
||||
} else {
|
||||
func_80078884(NA_SE_SY_ATTENTION_ON);
|
||||
|
||||
@@ -563,6 +563,7 @@ void func_8001DFC8(EnItem00* this, GlobalContext* globalCtx) {
|
||||
|
||||
if (gSaveContext.n64ddFlag && this->actor.params == ITEM00_SMALL_KEY) {
|
||||
this->actor.shape.yOffset = 600.0f;
|
||||
this->actor.shape.rot.y += 960;
|
||||
}
|
||||
|
||||
Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f);
|
||||
@@ -721,15 +722,17 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
|
||||
if (CVar_GetS32("gNewDrops", 0)) { //set the rotation system on selected model only :)
|
||||
|
||||
if ((this->actor.params == ITEM00_RUPEE_GREEN) || (this->actor.params == ITEM00_RUPEE_BLUE) ||
|
||||
(this->actor.params == ITEM00_RUPEE_RED) || (this->actor.params == ITEM00_ARROWS_SINGLE) ||
|
||||
(this->actor.params == ITEM00_ARROWS_SMALL) || (this->actor.params == ITEM00_ARROWS_MEDIUM) ||
|
||||
(this->actor.params == ITEM00_ARROWS_LARGE) || (this->actor.params == ITEM00_BOMBS_A) ||
|
||||
(this->actor.params == ITEM00_BOMBS_B) || (this->actor.params == ITEM00_NUTS) ||
|
||||
(this->actor.params == ITEM00_MAGIC_SMALL) || (this->actor.params == ITEM00_SEEDS) ||
|
||||
(this->actor.params == ITEM00_SMALL_KEY) || (this->actor.params == ITEM00_MAGIC_LARGE) ||
|
||||
(this->actor.params == ITEM00_HEART) || (this->actor.params == ITEM00_BOMBS_SPECIAL) || this->actor.params == ITEM00_HEART_PIECE) {
|
||||
(this->actor.params == ITEM00_MAGIC_SMALL) || (this->actor.params == ITEM00_SEEDS) ||
|
||||
(this->actor.params == ITEM00_MAGIC_LARGE) || (this->actor.params == ITEM00_HEART) ||
|
||||
(this->actor.params == ITEM00_BOMBS_SPECIAL) || this->actor.params == ITEM00_HEART_PIECE) {
|
||||
this->actor.shape.rot.y += 960;
|
||||
}
|
||||
if (this->actor.params == ITEM00_SMALL_KEY && !gSaveContext.n64ddFlag) {
|
||||
this->actor.shape.rot.y += 960;
|
||||
}
|
||||
}
|
||||
@@ -1195,16 +1198,19 @@ void EnItem00_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
this->actor.world.rot.x = 0x4000;
|
||||
this->actor.shape.shadowScale = 0.5f;
|
||||
GetItem_Draw(globalCtx, GID_KEY_SMALL);
|
||||
break;
|
||||
} else {
|
||||
Actor_SetScale(&this->actor, 0.03f);
|
||||
this->scale = 0.03f;
|
||||
this->actor.shape.yOffset = 320.0f;
|
||||
this->actor.shape.shadowScale = 6.0f;
|
||||
this->actor.world.rot.x = 0;
|
||||
this->actor.shape.rot.y = 0;
|
||||
if (!gSaveContext.n64ddFlag) {
|
||||
this->actor.world.rot.x = 0;
|
||||
this->actor.shape.rot.y = 0;
|
||||
}
|
||||
EnItem00_DrawCollectible(this, globalCtx);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case ITEM00_SHIELD_DEKU:
|
||||
GetItem_Draw(globalCtx, GID_SHIELD_DEKU);
|
||||
break;
|
||||
|
||||
+8
-14
@@ -36,8 +36,8 @@ typedef struct {
|
||||
} LightningBolt; // size = 0x20
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ s32 unk0;
|
||||
/* 0x04 */ s32 unk1;
|
||||
/* 0x00 */ s32 unk_00;
|
||||
/* 0x04 */ s32 unk_04;
|
||||
} Struct_8011FAF0; // size = 0x8
|
||||
|
||||
Struct_8011FAF0 D_8011FAF0[] = {
|
||||
@@ -215,7 +215,7 @@ u8 sGameOverLightsIntensity;
|
||||
u16 D_8015FDB0;
|
||||
|
||||
s32 func_8006F0A0(s32 a0) {
|
||||
s32 ret = ((a0 >> 4 & 0x7FF) << D_8011FAF0[a0 >> 15 & 7].unk0) + D_8011FAF0[a0 >> 15 & 7].unk1;
|
||||
s32 ret = ((a0 >> 4 & 0x7FF) << D_8011FAF0[a0 >> 15 & 7].unk_00) + D_8011FAF0[a0 >> 15 & 7].unk_04;
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -1459,8 +1459,6 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env
|
||||
LENS_FLARE_RING, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1,
|
||||
LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1,
|
||||
};
|
||||
static u32 epoch = 0;
|
||||
epoch++;
|
||||
|
||||
OPEN_DISPS(gfxCtx);
|
||||
|
||||
@@ -1517,7 +1515,7 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env
|
||||
}
|
||||
|
||||
for (i = 0; i < ARRAY_COUNT(lensFlareTypes); i++) {
|
||||
FrameInterpolation_RecordOpenChild("Lens Flare", epoch + i * 25);
|
||||
FrameInterpolation_RecordOpenChild("Lens Flare", i);
|
||||
|
||||
Matrix_Translate(pos.x, pos.y, pos.z, MTXMODE_NEW);
|
||||
|
||||
@@ -1642,8 +1640,6 @@ void Environment_DrawRain(GlobalContext* globalCtx, View* view, GraphicsContext*
|
||||
Vec3f unused = { 0.0f, 0.0f, 0.0f };
|
||||
Vec3f windDirection = { 0.0f, 0.0f, 0.0f };
|
||||
Player* player = GET_PLAYER(globalCtx);
|
||||
static u32 epoch = 0;
|
||||
epoch++;
|
||||
|
||||
if (!(globalCtx->cameraPtrs[0]->unk_14C & 0x100) && (globalCtx->envCtx.unk_EE[2] == 0)) {
|
||||
OPEN_DISPS(gfxCtx);
|
||||
@@ -1673,7 +1669,7 @@ void Environment_DrawRain(GlobalContext* globalCtx, View* view, GraphicsContext*
|
||||
|
||||
// draw rain drops
|
||||
for (i = 0; i < globalCtx->envCtx.unk_EE[1]; i++) {
|
||||
FrameInterpolation_RecordOpenChild("Rain Drop", epoch + i * 25);
|
||||
FrameInterpolation_RecordOpenChild("Rain Drop", i);
|
||||
|
||||
temp2 = Rand_ZeroOne();
|
||||
temp1 = Rand_ZeroOne();
|
||||
@@ -1709,7 +1705,7 @@ void Environment_DrawRain(GlobalContext* globalCtx, View* view, GraphicsContext*
|
||||
u8 firstDone = false;
|
||||
|
||||
for (i = 0; i < globalCtx->envCtx.unk_EE[1]; i++) {
|
||||
FrameInterpolation_RecordOpenChild("Droplet Ring", epoch + i * 25);
|
||||
FrameInterpolation_RecordOpenChild("Droplet Ring", i);
|
||||
|
||||
if (!firstDone) {
|
||||
func_80093D84(gfxCtx);
|
||||
@@ -1925,13 +1921,11 @@ void Environment_DrawLightning(GlobalContext* globalCtx, s32 unused) {
|
||||
s32 pad[2];
|
||||
Vec3f unused1 = { 0.0f, 0.0f, 0.0f };
|
||||
Vec3f unused2 = { 0.0f, 0.0f, 0.0f };
|
||||
static u32 epoch = 0;
|
||||
epoch++;
|
||||
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx);
|
||||
|
||||
for (i = 0; i < ARRAY_COUNT(sLightningBolts); i++) {
|
||||
FrameInterpolation_RecordOpenChild("Lightning Bolt", epoch + i * 25);
|
||||
FrameInterpolation_RecordOpenChild("Lightning Bolt", i);
|
||||
|
||||
switch (sLightningBolts[i].state) {
|
||||
case LIGHTNING_BOLT_START:
|
||||
@@ -2454,7 +2448,7 @@ void Environment_AdjustLights(GlobalContext* globalCtx, f32 arg1, f32 arg2, f32
|
||||
f32 temp;
|
||||
s32 i;
|
||||
|
||||
if (globalCtx->roomCtx.curRoom.unk_03 != 5 && func_800C0CB8(globalCtx)) {
|
||||
if (globalCtx->roomCtx.curRoom.behaviorType1 != ROOM_BEHAVIOR_TYPE1_5 && func_800C0CB8(globalCtx)) {
|
||||
arg1 = CLAMP_MIN(arg1, 0.0f);
|
||||
arg1 = CLAMP_MAX(arg1, 1.0f);
|
||||
|
||||
|
||||
@@ -413,8 +413,6 @@ void HealthMeter_Draw(GlobalContext* globalCtx) {
|
||||
s32 curCombineModeSet = 0;
|
||||
u8* curBgImgLoaded = NULL;
|
||||
s32 ddHeartCountMinusOne = gSaveContext.inventory.defenseHearts - 1;
|
||||
static u32 epoch = 0;
|
||||
epoch++;
|
||||
|
||||
OPEN_DISPS(gfxCtx);
|
||||
|
||||
@@ -452,7 +450,7 @@ void HealthMeter_Draw(GlobalContext* globalCtx) {
|
||||
}
|
||||
|
||||
for (i = 0; i < totalHeartCount; i++) {
|
||||
FrameInterpolation_RecordOpenChild("HealthMeter Heart", epoch + i * 25);
|
||||
FrameInterpolation_RecordOpenChild("HealthMeter Heart", i);
|
||||
|
||||
if ((ddHeartCountMinusOne < 0) || (i > ddHeartCountMinusOne)) {
|
||||
if (i < fullHeartCount) {
|
||||
|
||||
+265
-208
@@ -70,30 +70,93 @@ s16 gOcarinaSongItemMap[] = {
|
||||
|
||||
s32 sCharTexSize;
|
||||
s32 sCharTexScale;
|
||||
s16 sOcarinaNoteAPrimR;
|
||||
s16 sOcarinaNoteAPrimB;
|
||||
s16 sOcarinaNoteAPrimG;
|
||||
s16 sOcarinaNoteAEnvR;
|
||||
s16 sOcarinaNoteAEnvB;
|
||||
s16 sOcarinaNoteAEnvG;
|
||||
s16 sOcarinaNoteCPrimR;
|
||||
s16 sOcarinaNoteCPrimB;
|
||||
s16 sOcarinaNoteCPrimG;
|
||||
s16 sOcarinaNoteCEnvR;
|
||||
s16 sOcarinaNoteCEnvB;
|
||||
s16 sOcarinaNoteCEnvG;
|
||||
s16 sOcarinaNoteCUpPrimR;
|
||||
s16 sOcarinaNoteCUpPrimB;
|
||||
s16 sOcarinaNoteCUpPrimG;
|
||||
s16 sOcarinaNoteCLeftPrimR;
|
||||
s16 sOcarinaNoteCLeftPrimB;
|
||||
s16 sOcarinaNoteCLeftPrimG;
|
||||
s16 sOcarinaNoteCDownPrimR;
|
||||
s16 sOcarinaNoteCDownPrimB;
|
||||
s16 sOcarinaNoteCDownPrimG;
|
||||
s16 sOcarinaNoteCRightPrimR;
|
||||
s16 sOcarinaNoteCRightPrimB;
|
||||
s16 sOcarinaNoteCRightPrimG;
|
||||
|
||||
Color_RGB8 sOcarinaNoteABtnEnv;
|
||||
Color_RGB8 sOcarinaNoteCBtnEnv;
|
||||
Color_RGB8 sOcarinaNoteCBtnPrim;
|
||||
|
||||
Color_RGB8 sOcarinaNoteD5Prim;
|
||||
Color_RGB8 sOcarinaNoteB4Prim;
|
||||
Color_RGB8 sOcarinaNoteA4Prim;
|
||||
Color_RGB8 sOcarinaNoteF4Prim;
|
||||
Color_RGB8 sOcarinaNoteD4Prim;
|
||||
|
||||
// If the "separate" bool is set, use the "gCCC<cDirection>BtnPrim<R/G/B> CVars
|
||||
// to set the button color. Otherwise, use sOcarinaNoteCBtnPrim.
|
||||
void Message_SetCustomOrGeneralCColor(Color_RGB8* color, bool separate, char cDirection) {
|
||||
if (!separate) {
|
||||
*color = sOcarinaNoteCBtnPrim;
|
||||
return;
|
||||
}
|
||||
|
||||
// C direction is '*' @ idx 4
|
||||
// Color component is '*' @ idx 12
|
||||
char cVar[] = "gCCC*BtnPrim*";
|
||||
cVar[4] = cDirection;
|
||||
cVar[12] = 'R';
|
||||
color->r = CVar_GetS32(cVar, 255);
|
||||
cVar[12] = 'G';
|
||||
color->g = CVar_GetS32(cVar, 255);
|
||||
cVar[12] = 'B';
|
||||
color->b = CVar_GetS32(cVar, 50);
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
bool separateC;
|
||||
bool dpad;
|
||||
bool rightStick;
|
||||
} CustomNoteOptions;
|
||||
|
||||
// Set the non-null button color corresponding to the button map
|
||||
//
|
||||
// If the assigned button is A, a C button, Start, or the D-pad, then it'll be
|
||||
// colored to the corresponding CVar. Otherwise, its color will be equal to
|
||||
// sOcarinaNoteCBtnPrim.
|
||||
void Message_SetCustomOcarinaNoteColor(Color_RGB8* color, s32 btnMap, CustomNoteOptions* flags) {
|
||||
switch (btnMap) {
|
||||
case BTN_A:
|
||||
color->r = CVar_GetS32("gCCABtnPrimR", 80);
|
||||
color->g = CVar_GetS32("gCCABtnPrimG", 255);
|
||||
color->b = CVar_GetS32("gCCABtnPrimB", 150);
|
||||
break;
|
||||
case BTN_CUP:
|
||||
Message_SetCustomOrGeneralCColor(color, flags->separateC, 'U');
|
||||
break;
|
||||
case BTN_CDOWN:
|
||||
Message_SetCustomOrGeneralCColor(color, flags->separateC, 'D');
|
||||
break;
|
||||
case BTN_CLEFT:
|
||||
Message_SetCustomOrGeneralCColor(color, flags->separateC, 'L');
|
||||
break;
|
||||
case BTN_CRIGHT:
|
||||
Message_SetCustomOrGeneralCColor(color, flags->separateC, 'R');
|
||||
break;
|
||||
case BTN_START:
|
||||
color->r = CVar_GetS32("gCCStartBtnPrimR", 200);
|
||||
color->g = CVar_GetS32("gCCStartBtnPrimG", 0);
|
||||
color->b = CVar_GetS32("gCCStartBtnPrimB", 0);
|
||||
break;
|
||||
case BTN_DUP:
|
||||
case BTN_DDOWN:
|
||||
case BTN_DLEFT:
|
||||
case BTN_DRIGHT:
|
||||
color->r = CVar_GetS32("gCCDpadPrimR", 255) * 103 / 255;
|
||||
color->g = CVar_GetS32("gCCDpadPrimG", 255) * 103 / 255;
|
||||
color->b = CVar_GetS32("gCCDpadPrimB", 255) * 103 / 255;
|
||||
break;
|
||||
case 0:
|
||||
if (flags->dpad && !flags->rightStick) {
|
||||
// D pad is dark gray even when set to white, so emulate that.
|
||||
color->r = CVar_GetS32("gCCDpadPrimR", 255) * 103 / 255;
|
||||
color->g = CVar_GetS32("gCCDpadPrimG", 255) * 103 / 255;
|
||||
color->b = CVar_GetS32("gCCDpadPrimB", 255) * 103 / 255;
|
||||
break;
|
||||
} // else fall through
|
||||
default:
|
||||
*color = sOcarinaNoteCBtnPrim;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void Message_ResetOcarinaNoteState(void) {
|
||||
R_OCARINA_NOTES_YPOS(0) = 189;
|
||||
@@ -105,45 +168,47 @@ void Message_ResetOcarinaNoteState(void) {
|
||||
sOcarinaNotesAlphaValues[0] = sOcarinaNotesAlphaValues[1] = sOcarinaNotesAlphaValues[2] =
|
||||
sOcarinaNotesAlphaValues[3] = sOcarinaNotesAlphaValues[4] = sOcarinaNotesAlphaValues[5] =
|
||||
sOcarinaNotesAlphaValues[6] = sOcarinaNotesAlphaValues[7] = sOcarinaNotesAlphaValues[8] = 0;
|
||||
sOcarinaNoteAEnvR = 10;
|
||||
sOcarinaNoteAEnvG = 10;
|
||||
sOcarinaNoteAEnvB = 10;
|
||||
sOcarinaNoteCEnvR = 10;
|
||||
sOcarinaNoteCEnvG = 10;
|
||||
sOcarinaNoteCEnvB = 10;
|
||||
if (CVar_GetS32("gHudColors", 1) == 0) {
|
||||
sOcarinaNoteAPrimR = 80;
|
||||
sOcarinaNoteAPrimG = 150;
|
||||
sOcarinaNoteAPrimB = 255;
|
||||
sOcarinaNoteCPrimR = 255;
|
||||
sOcarinaNoteCPrimG = 255;
|
||||
sOcarinaNoteCPrimB = 50;
|
||||
} else if (CVar_GetS32("gHudColors", 1) == 1) {
|
||||
sOcarinaNoteAPrimR = 80;
|
||||
sOcarinaNoteAPrimG = 255;
|
||||
sOcarinaNoteAPrimB = 150;
|
||||
sOcarinaNoteCPrimR = 255;
|
||||
sOcarinaNoteCPrimG = 255;
|
||||
sOcarinaNoteCPrimB = 50;
|
||||
} else if (CVar_GetS32("gHudColors", 1) == 2) {
|
||||
sOcarinaNoteAPrimR = CVar_GetS32("gCCABtnPrimR", 80);
|
||||
sOcarinaNoteAPrimG = CVar_GetS32("gCCABtnPrimR", 255);
|
||||
sOcarinaNoteAPrimB = CVar_GetS32("gCCABtnPrimR", 150);
|
||||
sOcarinaNoteCPrimR = CVar_GetS32("gCCCBtnPrimR", 255);
|
||||
sOcarinaNoteCPrimG = CVar_GetS32("gCCCBtnPrimG", 255);
|
||||
sOcarinaNoteCPrimB = CVar_GetS32("gCCCBtnPrimB", 50);
|
||||
sOcarinaNoteCUpPrimR = CVar_GetS32("gCCCUBtnPrimR", 255);
|
||||
sOcarinaNoteCUpPrimG = CVar_GetS32("gCCCUBtnPrimG", 255);
|
||||
sOcarinaNoteCUpPrimB = CVar_GetS32("gCCCUBtnPrimB", 50);
|
||||
sOcarinaNoteCLeftPrimR = CVar_GetS32("gCCCLBtnPrimR", 255);
|
||||
sOcarinaNoteCLeftPrimG = CVar_GetS32("gCCCLBtnPrimG", 255);
|
||||
sOcarinaNoteCLeftPrimB = CVar_GetS32("gCCCLBtnPrimB", 50);
|
||||
sOcarinaNoteCDownPrimR = CVar_GetS32("gCCCDBtnPrimR", 255);
|
||||
sOcarinaNoteCDownPrimG = CVar_GetS32("gCCCDBtnPrimG", 255);
|
||||
sOcarinaNoteCDownPrimB = CVar_GetS32("gCCCDBtnPrimB", 50);
|
||||
sOcarinaNoteCRightPrimR = CVar_GetS32("gCCCRBtnPrimR", 255);
|
||||
sOcarinaNoteCRightPrimG = CVar_GetS32("gCCCRBtnPrimG", 255);
|
||||
sOcarinaNoteCRightPrimB = CVar_GetS32("gCCCRBtnPrimB", 50);
|
||||
sOcarinaNoteABtnEnv = (Color_RGB8){ .r = 10, .g = 10, .b = 10 };
|
||||
sOcarinaNoteCBtnEnv = (Color_RGB8){ .r = 10, .g = 10, .b = 10 };
|
||||
|
||||
if (CVar_GetS32("gHudColors", 1) != 2) { // N64/GameCube
|
||||
if (CVar_GetS32("gHudColors", 1) == 0) {
|
||||
sOcarinaNoteD4Prim = (Color_RGB8){ .r = 80, .g = 150, .b = 255 };
|
||||
} else if (CVar_GetS32("gHudColors", 1) == 1) {
|
||||
sOcarinaNoteD4Prim = (Color_RGB8){ .r = 80, .g = 255, .b = 150 };
|
||||
}
|
||||
|
||||
sOcarinaNoteCBtnPrim = (Color_RGB8){ .r = 255, .g = 255, .b = 50 };
|
||||
sOcarinaNoteD5Prim = sOcarinaNoteCBtnPrim;
|
||||
sOcarinaNoteB4Prim = sOcarinaNoteCBtnPrim;
|
||||
sOcarinaNoteA4Prim = sOcarinaNoteCBtnPrim;
|
||||
sOcarinaNoteF4Prim = sOcarinaNoteCBtnPrim;
|
||||
} else { // Custom
|
||||
sOcarinaNoteCBtnPrim.r = CVar_GetS32("gCCCBtnPrimR", 255);
|
||||
sOcarinaNoteCBtnPrim.g = CVar_GetS32("gCCCBtnPrimG", 255);
|
||||
sOcarinaNoteCBtnPrim.b = CVar_GetS32("gCCCBtnPrimB", 50);
|
||||
|
||||
CustomNoteOptions options = (CustomNoteOptions){
|
||||
.separateC = CVar_GetS32("gCCparated", 0),
|
||||
.dpad = CVar_GetS32("gDpadOcarina", 0),
|
||||
.rightStick = CVar_GetS32("gDpadRStick", 0),
|
||||
};
|
||||
|
||||
if (CVar_GetS32("gCustomOcarinaControls", 0)) {
|
||||
Message_SetCustomOcarinaNoteColor(&sOcarinaNoteD5Prim, CVar_GetS32("gOcarinaD5BtnMap", BTN_CUP), &options);
|
||||
Message_SetCustomOcarinaNoteColor(&sOcarinaNoteB4Prim, CVar_GetS32("gOcarinaB4BtnMap", BTN_CLEFT), &options);
|
||||
Message_SetCustomOcarinaNoteColor(&sOcarinaNoteA4Prim, CVar_GetS32("gOcarinaA4BtnMap", BTN_CRIGHT), &options);
|
||||
Message_SetCustomOcarinaNoteColor(&sOcarinaNoteF4Prim, CVar_GetS32("gOcarinaF4BtnMap", BTN_CDOWN), &options);
|
||||
Message_SetCustomOcarinaNoteColor(&sOcarinaNoteD4Prim, CVar_GetS32("gOcarinaD4BtnMap", BTN_A), &options);
|
||||
} else {
|
||||
Message_SetCustomOrGeneralCColor(&sOcarinaNoteD5Prim, options.separateC, 'U');
|
||||
Message_SetCustomOrGeneralCColor(&sOcarinaNoteB4Prim, options.separateC, 'L');
|
||||
Message_SetCustomOrGeneralCColor(&sOcarinaNoteA4Prim, options.separateC, 'R');
|
||||
Message_SetCustomOrGeneralCColor(&sOcarinaNoteF4Prim, options.separateC, 'D');
|
||||
sOcarinaNoteD4Prim.r = CVar_GetS32("gCCABtnPrimR", 80);
|
||||
sOcarinaNoteD4Prim.g = CVar_GetS32("gCCABtnPrimG", 255);
|
||||
sOcarinaNoteD4Prim.b = CVar_GetS32("gCCABtnPrimB", 150);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -208,7 +273,7 @@ void Message_HandleChoiceSelection(GlobalContext* globalCtx, u8 numChoices) {
|
||||
static s16 sAnalogStickHeld = false;
|
||||
MessageContext* msgCtx = &globalCtx->msgCtx;
|
||||
Input* input = &globalCtx->state.input[0];
|
||||
bool dpad = CVar_GetS32("gDpadOcarinaText", 0);
|
||||
bool dpad = CVar_GetS32("gDpadText", 0);
|
||||
|
||||
if ((input->rel.stick_y >= 30 && !sAnalogStickHeld) || (dpad && CHECK_BTN_ALL(input->press.button, BTN_DUP))) {
|
||||
sAnalogStickHeld = true;
|
||||
@@ -2290,213 +2355,213 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
|
||||
case MSGMODE_OCARINA_CORRECT_PLAYBACK:
|
||||
case MSGMODE_SONG_PLAYBACK_SUCCESS:
|
||||
case MSGMODE_SCARECROW_RECORDING_DONE:
|
||||
r = ABS(sOcarinaNoteAPrimR - sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][0]) /
|
||||
r = ABS(sOcarinaNoteD4Prim.r - sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][0]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
g = ABS(sOcarinaNoteAPrimG - sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][1]) /
|
||||
g = ABS(sOcarinaNoteD4Prim.g - sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][1]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
b = ABS(sOcarinaNoteAPrimB - sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][2]) /
|
||||
b = ABS(sOcarinaNoteD4Prim.b - sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][2]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
|
||||
if (sOcarinaNoteAPrimR >= sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][0]) {
|
||||
sOcarinaNoteAPrimR -= r;
|
||||
if (sOcarinaNoteD4Prim.r >= sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][0]) {
|
||||
sOcarinaNoteD4Prim.r -= r;
|
||||
} else {
|
||||
sOcarinaNoteAPrimR += r;
|
||||
sOcarinaNoteD4Prim.r += r;
|
||||
}
|
||||
if (sOcarinaNoteAPrimG >= sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][1]) {
|
||||
sOcarinaNoteAPrimG -= g;
|
||||
if (sOcarinaNoteD4Prim.g >= sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][1]) {
|
||||
sOcarinaNoteD4Prim.g -= g;
|
||||
} else {
|
||||
sOcarinaNoteAPrimG += g;
|
||||
sOcarinaNoteD4Prim.g += g;
|
||||
}
|
||||
if (sOcarinaNoteAPrimB >= sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][2]) {
|
||||
sOcarinaNoteAPrimB -= b;
|
||||
if (sOcarinaNoteD4Prim.b >= sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][2]) {
|
||||
sOcarinaNoteD4Prim.b -= b;
|
||||
} else {
|
||||
sOcarinaNoteAPrimB += b;
|
||||
sOcarinaNoteD4Prim.b += b;
|
||||
}
|
||||
|
||||
r = ABS(sOcarinaNoteAEnvR - sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][0]) /
|
||||
r = ABS(sOcarinaNoteABtnEnv.r - sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][0]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
g = ABS(sOcarinaNoteAEnvG - sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][1]) /
|
||||
g = ABS(sOcarinaNoteABtnEnv.g - sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][1]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
b = ABS(sOcarinaNoteAEnvB - sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][2]) /
|
||||
b = ABS(sOcarinaNoteABtnEnv.b - sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][2]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
|
||||
if (sOcarinaNoteCEnvR >= sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][0]) {
|
||||
sOcarinaNoteAEnvR -= r;
|
||||
if (sOcarinaNoteCBtnEnv.r >= sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][0]) {
|
||||
sOcarinaNoteABtnEnv.r -= r;
|
||||
} else {
|
||||
sOcarinaNoteAEnvR += r;
|
||||
sOcarinaNoteABtnEnv.r += r;
|
||||
}
|
||||
if (sOcarinaNoteCEnvG >= sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][1]) {
|
||||
sOcarinaNoteAEnvG -= g;
|
||||
if (sOcarinaNoteCBtnEnv.g >= sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][1]) {
|
||||
sOcarinaNoteABtnEnv.g -= g;
|
||||
} else {
|
||||
sOcarinaNoteAEnvG += g;
|
||||
sOcarinaNoteABtnEnv.g += g;
|
||||
}
|
||||
if (sOcarinaNoteCEnvB >= sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][2]) {
|
||||
sOcarinaNoteAEnvB -= b;
|
||||
if (sOcarinaNoteCBtnEnv.b >= sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][2]) {
|
||||
sOcarinaNoteABtnEnv.b -= b;
|
||||
} else {
|
||||
sOcarinaNoteAEnvB += b;
|
||||
sOcarinaNoteABtnEnv.b += b;
|
||||
}
|
||||
|
||||
r = ABS(sOcarinaNoteCPrimR - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][0]) /
|
||||
r = ABS(sOcarinaNoteCBtnPrim.r - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][0]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
g = ABS(sOcarinaNoteCPrimG - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][1]) /
|
||||
g = ABS(sOcarinaNoteCBtnPrim.g - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][1]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
b = ABS(sOcarinaNoteCPrimB - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][2]) /
|
||||
b = ABS(sOcarinaNoteCBtnPrim.b - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][2]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
|
||||
ru = ABS(sOcarinaNoteCUpPrimR - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][0]) /
|
||||
ru = ABS(sOcarinaNoteD5Prim.r - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][0]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
gu = ABS(sOcarinaNoteCUpPrimG - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][1]) /
|
||||
gu = ABS(sOcarinaNoteD5Prim.g - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][1]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
bu = ABS(sOcarinaNoteCUpPrimB - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][2]) /
|
||||
bu = ABS(sOcarinaNoteD5Prim.b - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][2]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
rl = ABS(sOcarinaNoteCLeftPrimR - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][0]) /
|
||||
rl = ABS(sOcarinaNoteB4Prim.r - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][0]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
gl = ABS(sOcarinaNoteCLeftPrimG - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][1]) /
|
||||
gl = ABS(sOcarinaNoteB4Prim.g - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][1]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
bl = ABS(sOcarinaNoteCLeftPrimB - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][2]) /
|
||||
bl = ABS(sOcarinaNoteB4Prim.b - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][2]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
rd = ABS(sOcarinaNoteCDownPrimR - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][0]) /
|
||||
rd = ABS(sOcarinaNoteF4Prim.r - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][0]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
gd = ABS(sOcarinaNoteCDownPrimG - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][1]) /
|
||||
gd = ABS(sOcarinaNoteF4Prim.g - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][1]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
bd = ABS(sOcarinaNoteCDownPrimB - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][2]) /
|
||||
bd = ABS(sOcarinaNoteF4Prim.b - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][2]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
rr = ABS(sOcarinaNoteCRightPrimR - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][0]) /
|
||||
rr = ABS(sOcarinaNoteA4Prim.r - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][0]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
gr = ABS(sOcarinaNoteCRightPrimG - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][1]) /
|
||||
gr = ABS(sOcarinaNoteA4Prim.g - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][1]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
br = ABS(sOcarinaNoteCRightPrimB - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][2]) /
|
||||
br = ABS(sOcarinaNoteA4Prim.b - sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][2]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
|
||||
if (sOcarinaNoteCPrimR >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][0]) {
|
||||
sOcarinaNoteCPrimR -= r;
|
||||
if (sOcarinaNoteCBtnPrim.r >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][0]) {
|
||||
sOcarinaNoteCBtnPrim.r -= r;
|
||||
} else {
|
||||
sOcarinaNoteCPrimR += r;
|
||||
sOcarinaNoteCBtnPrim.r += r;
|
||||
}
|
||||
if (sOcarinaNoteCPrimG >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][1]) {
|
||||
sOcarinaNoteCPrimG -= g;
|
||||
if (sOcarinaNoteCBtnPrim.g >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][1]) {
|
||||
sOcarinaNoteCBtnPrim.g -= g;
|
||||
} else {
|
||||
sOcarinaNoteCPrimG += g;
|
||||
sOcarinaNoteCBtnPrim.g += g;
|
||||
}
|
||||
if (sOcarinaNoteCPrimB >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][2]) {
|
||||
sOcarinaNoteCPrimB -= b;
|
||||
if (sOcarinaNoteCBtnPrim.b >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][2]) {
|
||||
sOcarinaNoteCBtnPrim.b -= b;
|
||||
} else {
|
||||
sOcarinaNoteCPrimB += b;
|
||||
sOcarinaNoteCBtnPrim.b += b;
|
||||
}
|
||||
|
||||
if (sOcarinaNoteCUpPrimR >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][0]) {
|
||||
sOcarinaNoteCUpPrimR -= ru;
|
||||
if (sOcarinaNoteD5Prim.r >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][0]) {
|
||||
sOcarinaNoteD5Prim.r -= ru;
|
||||
} else {
|
||||
sOcarinaNoteCUpPrimR += ru;
|
||||
sOcarinaNoteD5Prim.r += ru;
|
||||
}
|
||||
if (sOcarinaNoteCUpPrimG >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][1]) {
|
||||
sOcarinaNoteCUpPrimG -= gu;
|
||||
if (sOcarinaNoteD5Prim.g >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][1]) {
|
||||
sOcarinaNoteD5Prim.g -= gu;
|
||||
} else {
|
||||
sOcarinaNoteCUpPrimG += gu;
|
||||
sOcarinaNoteD5Prim.g += gu;
|
||||
}
|
||||
if (sOcarinaNoteCUpPrimB >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][2]) {
|
||||
sOcarinaNoteCUpPrimB -= bu;
|
||||
if (sOcarinaNoteD5Prim.b >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][2]) {
|
||||
sOcarinaNoteD5Prim.b -= bu;
|
||||
} else {
|
||||
sOcarinaNoteCUpPrimB += bu;
|
||||
sOcarinaNoteD5Prim.b += bu;
|
||||
}
|
||||
|
||||
if (sOcarinaNoteCLeftPrimR >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][0]) {
|
||||
sOcarinaNoteCLeftPrimR -= rl;
|
||||
if (sOcarinaNoteB4Prim.r >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][0]) {
|
||||
sOcarinaNoteB4Prim.r -= rl;
|
||||
} else {
|
||||
sOcarinaNoteCLeftPrimR += rl;
|
||||
sOcarinaNoteB4Prim.r += rl;
|
||||
}
|
||||
if (sOcarinaNoteCLeftPrimG >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][1]) {
|
||||
sOcarinaNoteCLeftPrimG -= gl;
|
||||
if (sOcarinaNoteB4Prim.g >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][1]) {
|
||||
sOcarinaNoteB4Prim.g -= gl;
|
||||
} else {
|
||||
sOcarinaNoteCLeftPrimG += gl;
|
||||
sOcarinaNoteB4Prim.g += gl;
|
||||
}
|
||||
if (sOcarinaNoteCLeftPrimB >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][2]) {
|
||||
sOcarinaNoteCLeftPrimB -= bl;
|
||||
if (sOcarinaNoteB4Prim.b >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][2]) {
|
||||
sOcarinaNoteB4Prim.b -= bl;
|
||||
} else {
|
||||
sOcarinaNoteCLeftPrimB += bl;
|
||||
sOcarinaNoteB4Prim.b += bl;
|
||||
}
|
||||
|
||||
if (sOcarinaNoteCDownPrimR >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][0]) {
|
||||
sOcarinaNoteCDownPrimR -= rd;
|
||||
if (sOcarinaNoteF4Prim.r >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][0]) {
|
||||
sOcarinaNoteF4Prim.r -= rd;
|
||||
} else {
|
||||
sOcarinaNoteCDownPrimR += rd;
|
||||
sOcarinaNoteF4Prim.r += rd;
|
||||
}
|
||||
if (sOcarinaNoteCDownPrimG >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][1]) {
|
||||
sOcarinaNoteCDownPrimG -= gd;
|
||||
if (sOcarinaNoteF4Prim.g >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][1]) {
|
||||
sOcarinaNoteF4Prim.g -= gd;
|
||||
} else {
|
||||
sOcarinaNoteCDownPrimG += gd;
|
||||
sOcarinaNoteF4Prim.g += gd;
|
||||
}
|
||||
if (sOcarinaNoteCDownPrimB >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][2]) {
|
||||
sOcarinaNoteCDownPrimB -= bd;
|
||||
if (sOcarinaNoteF4Prim.b >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][2]) {
|
||||
sOcarinaNoteF4Prim.b -= bd;
|
||||
} else {
|
||||
sOcarinaNoteCDownPrimB += bd;
|
||||
sOcarinaNoteF4Prim.b += bd;
|
||||
}
|
||||
|
||||
if (sOcarinaNoteCRightPrimR >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][0]) {
|
||||
sOcarinaNoteCRightPrimR -= rr;
|
||||
if (sOcarinaNoteA4Prim.r >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][0]) {
|
||||
sOcarinaNoteA4Prim.r -= rr;
|
||||
} else {
|
||||
sOcarinaNoteCRightPrimR += rr;
|
||||
sOcarinaNoteA4Prim.r += rr;
|
||||
}
|
||||
if (sOcarinaNoteCRightPrimG >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][1]) {
|
||||
sOcarinaNoteCRightPrimG -= gr;
|
||||
if (sOcarinaNoteA4Prim.g >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][1]) {
|
||||
sOcarinaNoteA4Prim.g -= gr;
|
||||
} else {
|
||||
sOcarinaNoteCRightPrimG += gr;
|
||||
sOcarinaNoteA4Prim.g += gr;
|
||||
}
|
||||
if (sOcarinaNoteCRightPrimB >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][2]) {
|
||||
sOcarinaNoteCRightPrimB -= br;
|
||||
if (sOcarinaNoteA4Prim.b >= sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][2]) {
|
||||
sOcarinaNoteA4Prim.b -= br;
|
||||
} else {
|
||||
sOcarinaNoteCRightPrimB += br;
|
||||
sOcarinaNoteA4Prim.b += br;
|
||||
}
|
||||
|
||||
r = ABS(sOcarinaNoteCEnvR - sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][0]) /
|
||||
r = ABS(sOcarinaNoteCBtnEnv.r - sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][0]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
g = ABS(sOcarinaNoteCEnvG - sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][1]) /
|
||||
g = ABS(sOcarinaNoteCBtnEnv.g - sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][1]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
b = ABS(sOcarinaNoteCEnvB - sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][2]) /
|
||||
b = ABS(sOcarinaNoteCBtnEnv.b - sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][2]) /
|
||||
sOcarinaNoteFlashTimer;
|
||||
|
||||
if (sOcarinaNoteCEnvR >= sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][0]) {
|
||||
sOcarinaNoteCEnvR -= r;
|
||||
if (sOcarinaNoteCBtnEnv.r >= sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][0]) {
|
||||
sOcarinaNoteCBtnEnv.r -= r;
|
||||
} else {
|
||||
sOcarinaNoteCEnvR += r;
|
||||
sOcarinaNoteCBtnEnv.r += r;
|
||||
}
|
||||
if (sOcarinaNoteCEnvG >= sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][1]) {
|
||||
sOcarinaNoteCEnvG -= g;
|
||||
if (sOcarinaNoteCBtnEnv.g >= sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][1]) {
|
||||
sOcarinaNoteCBtnEnv.g -= g;
|
||||
} else {
|
||||
sOcarinaNoteCEnvG += g;
|
||||
sOcarinaNoteCBtnEnv.g += g;
|
||||
}
|
||||
if (sOcarinaNoteCEnvB >= sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][2]) {
|
||||
sOcarinaNoteCEnvB -= b;
|
||||
if (sOcarinaNoteCBtnEnv.b >= sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][2]) {
|
||||
sOcarinaNoteCBtnEnv.b -= b;
|
||||
} else {
|
||||
sOcarinaNoteCEnvB += b;
|
||||
sOcarinaNoteCBtnEnv.b += b;
|
||||
}
|
||||
|
||||
sOcarinaNoteFlashTimer--;
|
||||
if (sOcarinaNoteFlashTimer == 0) {
|
||||
sOcarinaNoteAPrimR = sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][0];
|
||||
sOcarinaNoteAPrimG = sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][1];
|
||||
sOcarinaNoteAPrimB = sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][2];
|
||||
sOcarinaNoteAEnvR = sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][0];
|
||||
sOcarinaNoteAEnvG = sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][1];
|
||||
sOcarinaNoteAEnvB = sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][2];
|
||||
sOcarinaNoteCPrimR = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][0];
|
||||
sOcarinaNoteCPrimG = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][1];
|
||||
sOcarinaNoteCPrimB = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][2];
|
||||
sOcarinaNoteCUpPrimR = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][0];
|
||||
sOcarinaNoteCUpPrimG = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][1];
|
||||
sOcarinaNoteCUpPrimB = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][2];
|
||||
sOcarinaNoteCLeftPrimR = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][0];
|
||||
sOcarinaNoteCLeftPrimG = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][1];
|
||||
sOcarinaNoteCLeftPrimB = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][2];
|
||||
sOcarinaNoteCDownPrimR = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][0];
|
||||
sOcarinaNoteCDownPrimG = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][1];
|
||||
sOcarinaNoteCDownPrimB = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][2];
|
||||
sOcarinaNoteCRightPrimR = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][0];
|
||||
sOcarinaNoteCRightPrimG = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][1];
|
||||
sOcarinaNoteCRightPrimB = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][2];
|
||||
sOcarinaNoteCEnvR = sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][0];
|
||||
sOcarinaNoteCEnvG = sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][1];
|
||||
sOcarinaNoteCEnvB = sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][2];
|
||||
sOcarinaNoteD4Prim.r = sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][0];
|
||||
sOcarinaNoteD4Prim.g = sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][1];
|
||||
sOcarinaNoteD4Prim.b = sOcarinaNoteAPrimColors[sOcarinaNoteFlashColorIdx][2];
|
||||
sOcarinaNoteABtnEnv.r = sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][0];
|
||||
sOcarinaNoteABtnEnv.g = sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][1];
|
||||
sOcarinaNoteABtnEnv.b = sOcarinaNoteAEnvColors[sOcarinaNoteFlashColorIdx][2];
|
||||
sOcarinaNoteCBtnPrim.r = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][0];
|
||||
sOcarinaNoteCBtnPrim.g = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][1];
|
||||
sOcarinaNoteCBtnPrim.b = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx][2];
|
||||
sOcarinaNoteD5Prim.r = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][0];
|
||||
sOcarinaNoteD5Prim.g = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][1];
|
||||
sOcarinaNoteD5Prim.b = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+5][2];
|
||||
sOcarinaNoteB4Prim.r = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][0];
|
||||
sOcarinaNoteB4Prim.g = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][1];
|
||||
sOcarinaNoteB4Prim.b = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+2][2];
|
||||
sOcarinaNoteF4Prim.r = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][0];
|
||||
sOcarinaNoteF4Prim.g = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][1];
|
||||
sOcarinaNoteF4Prim.b = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+3][2];
|
||||
sOcarinaNoteA4Prim.r = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][0];
|
||||
sOcarinaNoteA4Prim.g = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][1];
|
||||
sOcarinaNoteA4Prim.b = sOcarinaNoteCPrimColors[sOcarinaNoteFlashColorIdx+4][2];
|
||||
sOcarinaNoteCBtnEnv.r = sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][0];
|
||||
sOcarinaNoteCBtnEnv.g = sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][1];
|
||||
sOcarinaNoteCBtnEnv.b = sOcarinaNoteCEnvColors[sOcarinaNoteFlashColorIdx][2];
|
||||
sOcarinaNoteFlashTimer = 3;
|
||||
sOcarinaNoteFlashColorIdx ^= 1;
|
||||
}
|
||||
@@ -3120,32 +3185,24 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
|
||||
}
|
||||
|
||||
gDPPipeSync(gfx++);
|
||||
if (sOcarinaNoteBuf[i] == OCARINA_NOTE_A) {
|
||||
if (CVar_GetS32("gHudColors", 1) == 0) { //A buttons :)
|
||||
gDPSetPrimColor(gfx++, 0, 0, 80, 150, 255, sOcarinaNotesAlphaValues[i]);
|
||||
} else if (CVar_GetS32("gHudColors", 1) == 1) {
|
||||
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteAPrimR, sOcarinaNoteAPrimG, sOcarinaNoteAPrimB, sOcarinaNotesAlphaValues[i]);
|
||||
} else if (CVar_GetS32("gHudColors", 1) == 2) {
|
||||
gDPSetPrimColor(gfx++, 0, 0, CVar_GetS32("gCCABtnPrimR", 80), CVar_GetS32("gCCABtnPrimG", 255), CVar_GetS32("gCCABtnPrimB", 150), sOcarinaNotesAlphaValues[i]);
|
||||
}
|
||||
gDPSetEnvColor(gfx++, sOcarinaNoteAEnvR, sOcarinaNoteAEnvG, sOcarinaNoteAEnvB, 0);
|
||||
|
||||
// Since I don't know what exactly these Env vars are used for, I elected keep their usage
|
||||
// consistent with the note played, rather than having AEnv be used for whatever note A happens to
|
||||
// play at the moment and CEnv for everything else, even with custom controls enabled.
|
||||
if (sOcarinaNoteBuf[i] == OCARINA_NOTE_D4) {
|
||||
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteD4Prim.r, sOcarinaNoteD4Prim.g, sOcarinaNoteD4Prim.b, sOcarinaNotesAlphaValues[i]);
|
||||
gDPSetEnvColor(gfx++, sOcarinaNoteABtnEnv.r, sOcarinaNoteABtnEnv.g, sOcarinaNoteABtnEnv.b, 0);
|
||||
} else {
|
||||
if (CVar_GetS32("gHudColors", 1) == 0) { //C buttons :)
|
||||
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCPrimR, sOcarinaNoteCPrimG, sOcarinaNoteCPrimB, sOcarinaNotesAlphaValues[i]);
|
||||
} else if (CVar_GetS32("gHudColors", 1) == 1) {
|
||||
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCPrimR, sOcarinaNoteCPrimG, sOcarinaNoteCPrimB, sOcarinaNotesAlphaValues[i]);
|
||||
} else if (CVar_GetS32("gHudColors", 1) == 2 && !CVar_GetS32("gCCparated", 0)) {
|
||||
gDPSetPrimColor(gfx++, 0, 0, CVar_GetS32("gCCCBtnPrimR", 255), CVar_GetS32("gCCCBtnPrimG", 255), CVar_GetS32("gCCCBtnPrimB", 180), sOcarinaNotesAlphaValues[i]);
|
||||
} else if (sOcarinaNoteBuf[i] == OCARINA_NOTE_C_UP && CVar_GetS32("gHudColors", 1) == 2 && CVar_GetS32("gCCparated", 0)) {
|
||||
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCUpPrimR, sOcarinaNoteCUpPrimG, sOcarinaNoteCUpPrimB, sOcarinaNotesAlphaValues[i]);
|
||||
} else if (sOcarinaNoteBuf[i] == OCARINA_NOTE_C_LEFT && CVar_GetS32("gHudColors", 1) == 2 && CVar_GetS32("gCCparated", 0)) {
|
||||
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCLeftPrimR, sOcarinaNoteCLeftPrimG, sOcarinaNoteCLeftPrimB, sOcarinaNotesAlphaValues[i]);
|
||||
} else if (sOcarinaNoteBuf[i] == OCARINA_NOTE_C_RIGHT && CVar_GetS32("gHudColors", 1) == 2 && CVar_GetS32("gCCparated", 0)) {
|
||||
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCRightPrimR, sOcarinaNoteCRightPrimG, sOcarinaNoteCRightPrimB, sOcarinaNotesAlphaValues[i]);
|
||||
} else if (sOcarinaNoteBuf[i] == OCARINA_NOTE_C_DOWN && CVar_GetS32("gHudColors", 1) == 2 && CVar_GetS32("gCCparated", 0)) {
|
||||
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteCDownPrimR, sOcarinaNoteCDownPrimG, sOcarinaNoteCDownPrimB, sOcarinaNotesAlphaValues[i]);
|
||||
if (sOcarinaNoteBuf[i] == OCARINA_NOTE_D5) {
|
||||
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteD5Prim.r, sOcarinaNoteD5Prim.g, sOcarinaNoteD5Prim.b, sOcarinaNotesAlphaValues[i]);
|
||||
} else if (sOcarinaNoteBuf[i] == OCARINA_NOTE_B4) {
|
||||
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteB4Prim.r, sOcarinaNoteB4Prim.g, sOcarinaNoteB4Prim.b, sOcarinaNotesAlphaValues[i]);
|
||||
} else if (sOcarinaNoteBuf[i] == OCARINA_NOTE_A4) {
|
||||
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteA4Prim.r, sOcarinaNoteA4Prim.g, sOcarinaNoteA4Prim.b, sOcarinaNotesAlphaValues[i]);
|
||||
} else if (sOcarinaNoteBuf[i] == OCARINA_NOTE_F4) {
|
||||
gDPSetPrimColor(gfx++, 0, 0, sOcarinaNoteF4Prim.r, sOcarinaNoteF4Prim.g, sOcarinaNoteF4Prim.b, sOcarinaNotesAlphaValues[i]);
|
||||
}
|
||||
gDPSetEnvColor(gfx++, sOcarinaNoteCEnvR, sOcarinaNoteCEnvG, sOcarinaNoteCEnvB, 0);
|
||||
gDPSetEnvColor(gfx++, sOcarinaNoteCBtnEnv.r, sOcarinaNoteCBtnEnv.g, sOcarinaNoteCBtnEnv.b, 0);
|
||||
}
|
||||
|
||||
gDPLoadTextureBlock(gfx++, sOcarinaNoteTextures[sOcarinaNoteBuf[i]], G_IM_FMT_IA, G_IM_SIZ_8b, 16,
|
||||
|
||||
@@ -817,7 +817,7 @@ void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) {
|
||||
break;
|
||||
}
|
||||
|
||||
if ((globalCtx->roomCtx.curRoom.unk_03 == 1) && (interfaceCtx->minimapAlpha >= 0xFF)) {
|
||||
if ((globalCtx->roomCtx.curRoom.behaviorType1 == ROOM_BEHAVIOR_TYPE1_1) && (interfaceCtx->minimapAlpha >= 255)) {
|
||||
interfaceCtx->minimapAlpha = 255;
|
||||
}
|
||||
}
|
||||
@@ -2795,7 +2795,7 @@ s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2) {
|
||||
case 2:
|
||||
if ((gSaveContext.unk_13F0 == 0) || (gSaveContext.unk_13F0 == 7)) {
|
||||
if (gSaveContext.unk_13F0 == 7) {
|
||||
globalCtx->actorCtx.unk_03 = 0;
|
||||
globalCtx->actorCtx.lensActive = false;
|
||||
}
|
||||
gSaveContext.unk_13F8 = gSaveContext.magic - arg1;
|
||||
gSaveContext.unk_13F0 = 1;
|
||||
@@ -2807,7 +2807,7 @@ s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2) {
|
||||
case 1:
|
||||
if ((gSaveContext.unk_13F0 == 0) || (gSaveContext.unk_13F0 == 7)) {
|
||||
if (gSaveContext.unk_13F0 == 7) {
|
||||
globalCtx->actorCtx.unk_03 = 0;
|
||||
globalCtx->actorCtx.lensActive = false;
|
||||
}
|
||||
gSaveContext.unk_13F8 = gSaveContext.magic - arg1;
|
||||
gSaveContext.unk_13F0 = 6;
|
||||
@@ -2835,7 +2835,7 @@ s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2) {
|
||||
case 4:
|
||||
if ((gSaveContext.unk_13F0 == 0) || (gSaveContext.unk_13F0 == 7)) {
|
||||
if (gSaveContext.unk_13F0 == 7) {
|
||||
globalCtx->actorCtx.unk_03 = 0;
|
||||
globalCtx->actorCtx.lensActive = false;
|
||||
}
|
||||
gSaveContext.unk_13F8 = gSaveContext.magic - arg1;
|
||||
gSaveContext.unk_13F0 = 4;
|
||||
@@ -3024,8 +3024,8 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) {
|
||||
}
|
||||
if ((gSaveContext.magic == 0) || ((func_8008F2F8(globalCtx) >= 2) && (func_8008F2F8(globalCtx) < 5)) ||
|
||||
!hasLens ||
|
||||
(globalCtx->actorCtx.unk_03 == 0)) {
|
||||
globalCtx->actorCtx.unk_03 = 0;
|
||||
!globalCtx->actorCtx.lensActive) {
|
||||
globalCtx->actorCtx.lensActive = false;
|
||||
Audio_PlaySoundGeneral(NA_SE_SY_GLASSMODE_OFF, &D_801333D4, 4, &D_801333E0, &D_801333E0,
|
||||
&D_801333E8);
|
||||
gSaveContext.unk_13F0 = 0;
|
||||
@@ -5898,7 +5898,8 @@ void Interface_Update(GlobalContext* globalCtx) {
|
||||
gTimeIncrement = sPrevTimeIncrement;
|
||||
globalCtx->msgCtx.ocarinaMode = OCARINA_MODE_04;
|
||||
}
|
||||
} else if ((globalCtx->roomCtx.curRoom.unk_03 != 1) && (interfaceCtx->restrictions.sunsSong != 3)) {
|
||||
} else if ((globalCtx->roomCtx.curRoom.behaviorType1 != ROOM_BEHAVIOR_TYPE1_1) &&
|
||||
(interfaceCtx->restrictions.sunsSong != 3)) {
|
||||
if ((gSaveContext.dayTime >= 0x4555) && (gSaveContext.dayTime < 0xC001)) {
|
||||
gSaveContext.nextDayTime = 0;
|
||||
globalCtx->fadeTransition = 4;
|
||||
|
||||
@@ -307,7 +307,7 @@ void Gameplay_Init(GameState* thisx) {
|
||||
Audio_SetExtraFilter(0);
|
||||
Quake_Init();
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
for (i = 0; i < ARRAY_COUNT(globalCtx->cameraPtrs); i++) {
|
||||
globalCtx->cameraPtrs[i] = NULL;
|
||||
}
|
||||
|
||||
@@ -1933,7 +1933,7 @@ void Gameplay_TriggerRespawn(GlobalContext* globalCtx) {
|
||||
}
|
||||
|
||||
s32 func_800C0CB8(GlobalContext* globalCtx) {
|
||||
return (globalCtx->roomCtx.curRoom.mesh->polygon.type != 1) && (YREG(15) != 0x20) && (YREG(15) != 0x30) &&
|
||||
return (globalCtx->roomCtx.curRoom.meshHeader->base.type != 1) && (YREG(15) != 0x20) && (YREG(15) != 0x30) &&
|
||||
(YREG(15) != 0x40) && (globalCtx->sceneNum != SCENE_HAIRAL_NIWA);
|
||||
}
|
||||
|
||||
|
||||
@@ -322,7 +322,7 @@ void Player_SetBootData(GlobalContext* globalCtx, Player* this) {
|
||||
IREG(69) = bootRegs[15];
|
||||
MREG(95) = bootRegs[16];
|
||||
|
||||
if (globalCtx->roomCtx.curRoom.unk_03 == 2) {
|
||||
if (globalCtx->roomCtx.curRoom.behaviorType1 == ROOM_BEHAVIOR_TYPE1_2) {
|
||||
REG(45) = 500;
|
||||
}
|
||||
}
|
||||
@@ -615,7 +615,7 @@ s32 func_8008F2F8(GlobalContext* globalCtx) {
|
||||
TextTriggerEntry* triggerEntry;
|
||||
s32 var;
|
||||
|
||||
if (globalCtx->roomCtx.curRoom.unk_02 == 3) { // Room is hot
|
||||
if (globalCtx->roomCtx.curRoom.behaviorType2 == ROOM_BEHAVIOR_TYPE2_3) { // Room is hot
|
||||
var = 0;
|
||||
} else if ((this->unk_840 > 80) &&
|
||||
((this->currentBoots == PLAYER_BOOTS_IRON) || (this->unk_840 >= 300))) { // Deep underwater
|
||||
|
||||
@@ -1012,7 +1012,7 @@ void func_80093C80(GlobalContext* globalCtx) {
|
||||
|
||||
func_80093D18(gfxCtx);
|
||||
|
||||
if (globalCtx->roomCtx.curRoom.unk_03 == 3) {
|
||||
if (globalCtx->roomCtx.curRoom.behaviorType1 == ROOM_BEHAVIOR_TYPE1_3) {
|
||||
OPEN_DISPS(gfxCtx);
|
||||
|
||||
gDPSetColorDither(POLY_OPA_DISP++, G_CD_DISABLE);
|
||||
|
||||
@@ -53,7 +53,7 @@ void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) {
|
||||
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
}
|
||||
|
||||
polygon0 = &room->mesh->polygon0;
|
||||
polygon0 = &room->meshHeader->polygon0;
|
||||
polygonDlist = SEGMENTED_TO_VIRTUAL(polygon0->start);
|
||||
for (i = 0; i < polygon0->num; i++) {
|
||||
if ((flags & 1) && (polygonDlist->opa != NULL)) {
|
||||
@@ -113,7 +113,7 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) {
|
||||
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
}
|
||||
|
||||
polygon2 = &room->mesh->polygon2;
|
||||
polygon2 = &room->meshHeader->polygon2;
|
||||
polygonDlist = SEGMENTED_TO_VIRTUAL(polygon2->start);
|
||||
spA4 = spB8;
|
||||
|
||||
@@ -346,7 +346,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) {
|
||||
|
||||
camera = GET_ACTIVE_CAM(globalCtx);
|
||||
sp9C = (camera->setting == CAM_SET_PREREND_FIXED);
|
||||
polygon1 = &room->mesh->polygon1;
|
||||
polygon1 = &room->meshHeader->polygon1;
|
||||
polygonDlist = SEGMENTED_TO_VIRTUAL(polygon1->dlist);
|
||||
sp98 = (flags & 1) && sp9C && polygon1->single.source && !(SREG(25) & 1);
|
||||
sp94 = (flags & 1) && polygonDlist->opa && !(SREG(25) & 2);
|
||||
@@ -447,7 +447,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) {
|
||||
|
||||
camera = GET_ACTIVE_CAM(globalCtx);
|
||||
sp98 = (camera->setting == CAM_SET_PREREND_FIXED);
|
||||
polygon1 = &room->mesh->polygon1;
|
||||
polygon1 = &room->meshHeader->polygon1;
|
||||
polygonDlist = SEGMENTED_TO_VIRTUAL(polygon1->dlist);
|
||||
bgImage = func_80096A74(polygon1, globalCtx);
|
||||
sp94 = (flags & 1) && sp98 && bgImage->source && !(SREG(25) & 1);
|
||||
@@ -494,7 +494,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) {
|
||||
|
||||
// Room Draw Polygon Type 1
|
||||
void func_80096F6C(GlobalContext* globalCtx, Room* room, u32 flags) {
|
||||
PolygonType1* polygon1 = &room->mesh->polygon1;
|
||||
PolygonType1* polygon1 = &room->meshHeader->polygon1;
|
||||
|
||||
if (polygon1->format == 1) {
|
||||
func_80096680(globalCtx, room, flags);
|
||||
@@ -626,8 +626,8 @@ void Room_Draw(GlobalContext* globalCtx, Room* room, u32 flags) {
|
||||
if (room->segment != NULL)
|
||||
{
|
||||
gSegments[3] = VIRTUAL_TO_PHYSICAL(room->segment);
|
||||
ASSERT(room->mesh->polygon.type < ARRAY_COUNTU(sRoomDrawHandlers));
|
||||
sRoomDrawHandlers[room->mesh->polygon.type](globalCtx, room, flags);
|
||||
ASSERT(room->meshHeader->base.type < ARRAY_COUNTU(sRoomDrawHandlers));
|
||||
sRoomDrawHandlers[room->meshHeader->base.type](globalCtx, room, flags);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+61
-62
@@ -168,11 +168,11 @@ s32 Scene_ExecuteCommands(GlobalContext* globalCtx, SceneCmd* sceneCmd) {
|
||||
osSyncPrintf("*** Scene_Word = { code=%d, data1=%02x, data2=%04x } ***\n", cmdCode, sceneCmd->base.data1,
|
||||
sceneCmd->base.data2);
|
||||
|
||||
if (cmdCode == 0x14) {
|
||||
if (cmdCode == SCENE_CMD_ID_END) {
|
||||
break;
|
||||
}
|
||||
|
||||
if (cmdCode <= 0x19) {
|
||||
if (cmdCode < ARRAY_COUNT(gSceneCmdHandlers)) {
|
||||
gSceneCmdHandlers[cmdCode](globalCtx, sceneCmd);
|
||||
} else {
|
||||
osSyncPrintf(VT_FGCOL(RED));
|
||||
@@ -184,7 +184,7 @@ s32 Scene_ExecuteCommands(GlobalContext* globalCtx, SceneCmd* sceneCmd) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
void func_80098508(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandSpawnList(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
ActorEntry* linkEntry = globalCtx->linkActorEntry = (ActorEntry*)SEGMENTED_TO_VIRTUAL(cmd->spawnList.segment) +
|
||||
globalCtx->setupEntranceList[globalCtx->curSpawn].spawn;
|
||||
s16 linkObjectId;
|
||||
@@ -197,19 +197,16 @@ void func_80098508(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
Object_Spawn(&globalCtx->objectCtx, linkObjectId);
|
||||
}
|
||||
|
||||
// Scene Command 0x01: Actor List
|
||||
void func_800985DC(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandActorList(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->numSetupActors = cmd->actorList.num;
|
||||
globalCtx->setupActorList = SEGMENTED_TO_VIRTUAL(cmd->actorList.segment);
|
||||
}
|
||||
|
||||
// Scene Command 0x02: Unused 02
|
||||
void func_80098630(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandUnused2(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->unk_11DFC = SEGMENTED_TO_VIRTUAL(cmd->unused02.segment);
|
||||
}
|
||||
|
||||
// Scene Command 0x03: Collision Header
|
||||
void func_80098674(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandCollisionHeader(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
CollisionHeader* colHeader = SEGMENTED_TO_VIRTUAL(cmd->colHeader.segment);
|
||||
|
||||
colHeader->vtxList = SEGMENTED_TO_VIRTUAL(colHeader->vtxList);
|
||||
@@ -221,19 +218,16 @@ void func_80098674(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
BgCheck_Allocate(&globalCtx->colCtx, globalCtx, colHeader);
|
||||
}
|
||||
|
||||
// Scene Command 0x04: Room List
|
||||
void func_800987A4(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandRoomList(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->numRooms = cmd->roomList.num;
|
||||
globalCtx->roomList = SEGMENTED_TO_VIRTUAL(cmd->roomList.segment);
|
||||
}
|
||||
|
||||
// Scene Command 0x06: Entrance List
|
||||
void func_800987F8(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandEntranceList(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->setupEntranceList = SEGMENTED_TO_VIRTUAL(cmd->entranceList.segment);
|
||||
}
|
||||
|
||||
// Scene Command 0x07: Special Files
|
||||
void func_8009883C(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandSpecialFiles(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
if (cmd->specialFiles.keepObjectId != OBJECT_INVALID) {
|
||||
globalCtx->objectCtx.subKeepIndex = Object_Spawn(&globalCtx->objectCtx, cmd->specialFiles.keepObjectId);
|
||||
gSegments[5] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment);
|
||||
@@ -244,21 +238,18 @@ void func_8009883C(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
}
|
||||
}
|
||||
|
||||
// Scene Command 0x08: Room Behavior
|
||||
void func_80098904(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->roomCtx.curRoom.unk_03 = cmd->roomBehavior.gpFlag1;
|
||||
globalCtx->roomCtx.curRoom.unk_02 = cmd->roomBehavior.gpFlag2 & 0xFF;
|
||||
globalCtx->roomCtx.curRoom.showInvisActors = (cmd->roomBehavior.gpFlag2 >> 8) & 1;
|
||||
void Scene_CommandRoomBehavior(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->roomCtx.curRoom.behaviorType1 = cmd->roomBehavior.gpFlag1;
|
||||
globalCtx->roomCtx.curRoom.behaviorType2 = cmd->roomBehavior.gpFlag2 & 0xFF;
|
||||
globalCtx->roomCtx.curRoom.lensMode = (cmd->roomBehavior.gpFlag2 >> 8) & 1;
|
||||
globalCtx->msgCtx.disableWarpSongs = (cmd->roomBehavior.gpFlag2 >> 0xA) & 1;
|
||||
}
|
||||
|
||||
// Scene Command 0x0A: Mesh Header
|
||||
void func_80098958(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->roomCtx.curRoom.mesh = SEGMENTED_TO_VIRTUAL(cmd->mesh.segment);
|
||||
void Scene_CommandMeshHeader(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->roomCtx.curRoom.meshHeader = SEGMENTED_TO_VIRTUAL(cmd->mesh.segment);
|
||||
}
|
||||
|
||||
// Scene Command 0x0B: Object List
|
||||
void func_8009899C(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandObjectList(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
s32 i;
|
||||
s32 j;
|
||||
s32 k;
|
||||
@@ -307,8 +298,7 @@ void func_8009899C(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->objectCtx.num = i;
|
||||
}
|
||||
|
||||
// Scene Command 0x0C: Light List
|
||||
void func_80098B74(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandLightList(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
s32 i;
|
||||
LightInfo* lightInfo = SEGMENTED_TO_VIRTUAL(cmd->lightList.segment);
|
||||
|
||||
@@ -318,13 +308,11 @@ void func_80098B74(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
}
|
||||
}
|
||||
|
||||
// Scene Command 0x0D: Path List
|
||||
void func_80098C24(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandPathList(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->setupPathList = SEGMENTED_TO_VIRTUAL(cmd->pathList.segment);
|
||||
}
|
||||
|
||||
// Scene Command 0x0E: Transition Actor List
|
||||
void func_80098C68(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandTransitionActorList(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->transiActorCtx.numActors = cmd->transiActorList.num;
|
||||
globalCtx->transiActorCtx.list = SEGMENTED_TO_VIRTUAL(cmd->transiActorList.segment);
|
||||
}
|
||||
@@ -333,27 +321,23 @@ void TransitionActor_InitContext(GameState* state, TransitionActorContext* trans
|
||||
transiActorCtx->numActors = 0;
|
||||
}
|
||||
|
||||
// Scene Command 0x0F: Light Setting List
|
||||
void func_80098CC8(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandLightSettingsList(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->envCtx.numLightSettings = cmd->lightSettingList.num;
|
||||
globalCtx->envCtx.lightSettingsList = SEGMENTED_TO_VIRTUAL(cmd->lightSettingList.segment);
|
||||
}
|
||||
|
||||
// Scene Command 0x11: Skybox Settings
|
||||
void func_80098D1C(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandSkyboxSettings(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->skyboxId = cmd->skyboxSettings.skyboxId;
|
||||
globalCtx->envCtx.unk_17 = globalCtx->envCtx.unk_18 = cmd->skyboxSettings.unk_05;
|
||||
globalCtx->envCtx.indoors = cmd->skyboxSettings.unk_06;
|
||||
}
|
||||
|
||||
// Scene Command 0x12: Skybox Disables
|
||||
void func_80098D5C(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandSkyboxDisables(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->envCtx.skyboxDisabled = cmd->skyboxDisables.unk_04;
|
||||
globalCtx->envCtx.sunMoonDisabled = cmd->skyboxDisables.unk_05;
|
||||
}
|
||||
|
||||
// Scene Command 0x10: Time Settings
|
||||
void func_80098D80(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandTimeSettings(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
if ((cmd->timeSettings.hour != 0xFF) && (cmd->timeSettings.min != 0xFF)) {
|
||||
gSaveContext.skyboxTime = gSaveContext.dayTime =
|
||||
((cmd->timeSettings.hour + (cmd->timeSettings.min / 60.0f)) * 60.0f) / ((f32)(24 * 60) / 0x10000);
|
||||
@@ -388,8 +372,7 @@ void func_80098D80(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
}
|
||||
}
|
||||
|
||||
// Scene Command 0x05: Wind Settings
|
||||
void func_80099090(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandWindSettings(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
s8 x = cmd->windSettings.x;
|
||||
s8 y = cmd->windSettings.y;
|
||||
s8 z = cmd->windSettings.z;
|
||||
@@ -401,17 +384,14 @@ void func_80099090(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->envCtx.windSpeed = cmd->windSettings.unk_07;
|
||||
}
|
||||
|
||||
// Scene Command 0x13: Exit List
|
||||
void func_800990F0(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandExitList(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->setupExitList = SEGMENTED_TO_VIRTUAL(cmd->exitList.segment);
|
||||
}
|
||||
|
||||
// Scene Command 0x09: Undefined
|
||||
void func_80099134(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandUndefined9(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
}
|
||||
|
||||
// Scene Command 0x15: Sound Settings
|
||||
void func_80099140(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandSoundSettings(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->sequenceCtx.seqId = cmd->soundSettings.seqId;
|
||||
globalCtx->sequenceCtx.natureAmbienceId = cmd->soundSettings.natureAmbienceId;
|
||||
|
||||
@@ -420,13 +400,11 @@ void func_80099140(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
}
|
||||
}
|
||||
|
||||
// Scene Command 0x16: Echo Setting
|
||||
void func_8009918C(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandEchoSettings(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
globalCtx->roomCtx.curRoom.echo = cmd->echoSettings.echo;
|
||||
}
|
||||
|
||||
// Scene Command 0x18: Alternate Headers
|
||||
void func_800991A0(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandAlternateHeaderList(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
s32 pad;
|
||||
SceneCmd* altHeader;
|
||||
|
||||
@@ -439,7 +417,7 @@ void func_800991A0(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
|
||||
if (altHeader != NULL) {
|
||||
Scene_ExecuteCommands(globalCtx, SEGMENTED_TO_VIRTUAL(altHeader));
|
||||
(cmd + 1)->base.code = 0x14;
|
||||
(cmd + 1)->base.code = SCENE_CMD_ID_END;
|
||||
} else {
|
||||
// "Coughh! There is no specified dataaaaa!"
|
||||
osSyncPrintf("\nげぼはっ！ 指定されたデータがないでええっす！");
|
||||
@@ -453,21 +431,20 @@ void func_800991A0(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
|
||||
if (altHeader != NULL) {
|
||||
Scene_ExecuteCommands(globalCtx, SEGMENTED_TO_VIRTUAL(altHeader));
|
||||
(cmd + 1)->base.code = 0x14;
|
||||
(cmd + 1)->base.code = SCENE_CMD_ID_END;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Scene Command 0x17: Cutscene Data
|
||||
void func_8009934C(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
void Scene_CommandCutsceneData(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
osSyncPrintf("\ngame_play->demo_play.data=[%x]", globalCtx->csCtx.segment);
|
||||
globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(cmd->cutsceneData.segment);
|
||||
}
|
||||
|
||||
// Scene Command 0x19: Misc. Settings (Camera & World Map Area)
|
||||
void func_800993C0(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
// Camera & World Map Area
|
||||
void Scene_CommandMiscSettings(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
YREG(15) = cmd->miscSettings.cameraMovement;
|
||||
gSaveContext.worldMapArea = cmd->miscSettings.area;
|
||||
|
||||
@@ -487,11 +464,33 @@ void func_800993C0(GlobalContext* globalCtx, SceneCmd* cmd) {
|
||||
}
|
||||
}
|
||||
|
||||
void (*gSceneCmdHandlers[])(GlobalContext*, SceneCmd*) = {
|
||||
func_80098508, func_800985DC, func_80098630, func_80098674, func_800987A4, func_80099090, func_800987F8,
|
||||
func_8009883C, func_80098904, func_80099134, func_80098958, func_8009899C, func_80098B74, func_80098C24,
|
||||
func_80098C68, func_80098CC8, func_80098D80, func_80098D1C, func_80098D5C, func_800990F0, NULL,
|
||||
func_80099140, func_8009918C, func_8009934C, func_800991A0, func_800993C0,
|
||||
void (*gSceneCmdHandlers[SCENE_CMD_ID_MAX])(GlobalContext*, SceneCmd*) = {
|
||||
Scene_CommandSpawnList, // SCENE_CMD_ID_SPAWN_LIST
|
||||
Scene_CommandActorList, // SCENE_CMD_ID_ACTOR_LIST
|
||||
Scene_CommandUnused2, // SCENE_CMD_ID_UNUSED_2
|
||||
Scene_CommandCollisionHeader, // SCENE_CMD_ID_COLLISION_HEADER
|
||||
Scene_CommandRoomList, // SCENE_CMD_ID_ROOM_LIST
|
||||
Scene_CommandWindSettings, // SCENE_CMD_ID_WIND_SETTINGS
|
||||
Scene_CommandEntranceList, // SCENE_CMD_ID_ENTRANCE_LIST
|
||||
Scene_CommandSpecialFiles, // SCENE_CMD_ID_SPECIAL_FILES
|
||||
Scene_CommandRoomBehavior, // SCENE_CMD_ID_ROOM_BEHAVIOR
|
||||
Scene_CommandUndefined9, // SCENE_CMD_ID_UNDEFINED_9
|
||||
Scene_CommandMeshHeader, // SCENE_CMD_ID_MESH_HEADER
|
||||
Scene_CommandObjectList, // SCENE_CMD_ID_OBJECT_LIST
|
||||
Scene_CommandLightList, // SCENE_CMD_ID_LIGHT_LIST
|
||||
Scene_CommandPathList, // SCENE_CMD_ID_PATH_LIST
|
||||
Scene_CommandTransitionActorList, // SCENE_CMD_ID_TRANSITION_ACTOR_LIST
|
||||
Scene_CommandLightSettingsList, // SCENE_CMD_ID_LIGHT_SETTINGS_LIST
|
||||
Scene_CommandTimeSettings, // SCENE_CMD_ID_TIME_SETTINGS
|
||||
Scene_CommandSkyboxSettings, // SCENE_CMD_ID_SKYBOX_SETTINGS
|
||||
Scene_CommandSkyboxDisables, // SCENE_CMD_ID_SKYBOX_DISABLES
|
||||
Scene_CommandExitList, // SCENE_CMD_ID_EXIT_LIST
|
||||
NULL, // SCENE_CMD_ID_END
|
||||
Scene_CommandSoundSettings, // SCENE_CMD_ID_SOUND_SETTINGS
|
||||
Scene_CommandEchoSettings, // SCENE_CMD_ID_ECHO_SETTINGS
|
||||
Scene_CommandCutsceneData, // SCENE_CMD_ID_CUTSCENE_DATA
|
||||
Scene_CommandAlternateHeaderList, // SCENE_CMD_ID_ALTERNATE_HEADER_LIST
|
||||
Scene_CommandMiscSettings, // SCENE_CMD_ID_MISC_SETTINGS
|
||||
};
|
||||
|
||||
RomFile sNaviMsgFiles[] = {
|
||||
|
||||
@@ -2401,12 +2401,14 @@ void func_8009FE58(GlobalContext* globalCtx) {
|
||||
temp = 0.020000001f;
|
||||
|
||||
if (globalCtx->pauseCtx.state == 0) {
|
||||
func_800AA76C(&globalCtx->view, ((360.00018f / 65535.0f) * (M_PI / 180.0f)) * temp * Math_CosS(D_8012A39C),
|
||||
((360.00018f / 65535.0f) * (M_PI / 180.0f)) * temp * Math_SinS(D_8012A39C),
|
||||
((360.00018f / 65535.0f) * (M_PI / 180.0f)) * temp * Math_SinS(D_8012A3A0));
|
||||
func_800AA78C(&globalCtx->view, 1.f + (0.79999995f * temp * Math_SinS(D_8012A3A0)),
|
||||
1.f + (0.39999998f * temp * Math_CosS(D_8012A3A0)), 1.f + (1 * temp * Math_CosS(D_8012A39C)));
|
||||
func_800AA7AC(&globalCtx->view, 0.95f);
|
||||
View_SetDistortionOrientation(&globalCtx->view,
|
||||
((360.00018f / 65535.0f) * (M_PI / 180.0f)) * temp * Math_CosS(D_8012A39C),
|
||||
((360.00018f / 65535.0f) * (M_PI / 180.0f)) * temp * Math_SinS(D_8012A39C),
|
||||
((360.00018f / 65535.0f) * (M_PI / 180.0f)) * temp * Math_SinS(D_8012A3A0));
|
||||
View_SetDistortionScale(&globalCtx->view, 1.f + (0.79999995f * temp * Math_SinS(D_8012A3A0)),
|
||||
1.f + (0.39999998f * temp * Math_CosS(D_8012A3A0)),
|
||||
1.f + (1 * temp * Math_CosS(D_8012A39C)));
|
||||
View_SetDistortionSpeed(&globalCtx->view, 0.95f);
|
||||
}
|
||||
|
||||
switch (globalCtx->roomCtx.unk_74[0]) {
|
||||
|
||||
+65
-59
@@ -64,7 +64,7 @@ void View_Init(View* view, GraphicsContext* gfxCtx) {
|
||||
|
||||
view->unk_124 = 0;
|
||||
view->flags = 1 | 2 | 4;
|
||||
func_800AA7B8(view);
|
||||
View_InitDistortion(view);
|
||||
}
|
||||
|
||||
void View_GetParams(View* view, Vec3f* eye, Vec3f* lookAt, Vec3f* up) {
|
||||
@@ -193,81 +193,87 @@ void func_800AA550(View* view) {
|
||||
CLOSE_DISPS(gfxCtx);
|
||||
}
|
||||
|
||||
void func_800AA76C(View* view, f32 x, f32 y, f32 z) {
|
||||
view->unk_E8.x = x;
|
||||
view->unk_E8.y = y;
|
||||
view->unk_E8.z = z;
|
||||
void View_SetDistortionOrientation(View* view, f32 rotX, f32 rotY, f32 rotZ) {
|
||||
view->distortionOrientation.x = rotX;
|
||||
view->distortionOrientation.y = rotY;
|
||||
view->distortionOrientation.z = rotZ;
|
||||
}
|
||||
|
||||
void func_800AA78C(View* view, f32 x, f32 y, f32 z) {
|
||||
view->unk_F4.x = x;
|
||||
view->unk_F4.y = y;
|
||||
view->unk_F4.z = z;
|
||||
void View_SetDistortionScale(View* view, f32 scaleX, f32 scaleY, f32 scaleZ) {
|
||||
view->distortionScale.x = scaleX;
|
||||
view->distortionScale.y = scaleY;
|
||||
view->distortionScale.z = scaleZ;
|
||||
}
|
||||
|
||||
s32 func_800AA7AC(View* view, f32 arg1) {
|
||||
view->unk_100 = arg1;
|
||||
s32 View_SetDistortionSpeed(View* view, f32 speed) {
|
||||
view->distortionSpeed = speed;
|
||||
}
|
||||
|
||||
void func_800AA7B8(View* view) {
|
||||
view->unk_E8.x = 0.0f;
|
||||
view->unk_E8.y = 0.0f;
|
||||
view->unk_E8.z = 0.0f;
|
||||
view->unk_F4.x = 1.0f;
|
||||
view->unk_F4.y = 1.0f;
|
||||
view->unk_F4.z = 1.0f;
|
||||
view->unk_104 = view->unk_E8;
|
||||
view->unk_110 = view->unk_F4;
|
||||
view->unk_100 = 0.0f;
|
||||
void View_InitDistortion(View* view) {
|
||||
view->distortionOrientation.x = 0.0f;
|
||||
view->distortionOrientation.y = 0.0f;
|
||||
view->distortionOrientation.z = 0.0f;
|
||||
view->distortionScale.x = 1.0f;
|
||||
view->distortionScale.y = 1.0f;
|
||||
view->distortionScale.z = 1.0f;
|
||||
view->curDistortionOrientation = view->distortionOrientation;
|
||||
view->curDistortionScale = view->distortionScale;
|
||||
view->distortionSpeed = 0.0f;
|
||||
}
|
||||
|
||||
void func_800AA814(View* view) {
|
||||
view->unk_E8.x = 0.0f;
|
||||
view->unk_E8.y = 0.0f;
|
||||
view->unk_E8.z = 0.0f;
|
||||
view->unk_F4.x = 1.0f;
|
||||
view->unk_F4.y = 1.0f;
|
||||
view->unk_F4.z = 1.0f;
|
||||
view->unk_100 = 1.0f;
|
||||
void View_ClearDistortion(View* view) {
|
||||
view->distortionOrientation.x = 0.0f;
|
||||
view->distortionOrientation.y = 0.0f;
|
||||
view->distortionOrientation.z = 0.0f;
|
||||
view->distortionScale.x = 1.0f;
|
||||
view->distortionScale.y = 1.0f;
|
||||
view->distortionScale.z = 1.0f;
|
||||
view->distortionSpeed = 1.0f;
|
||||
}
|
||||
|
||||
void func_800AA840(View* view, Vec3f vec1, Vec3f vec2, f32 arg3) {
|
||||
view->unk_E8 = vec1;
|
||||
view->unk_F4 = vec2;
|
||||
view->unk_100 = arg3;
|
||||
void View_SetDistortion(View* view, Vec3f orientation, Vec3f scale, f32 speed) {
|
||||
view->distortionOrientation = orientation;
|
||||
view->distortionScale = scale;
|
||||
view->distortionSpeed = speed;
|
||||
}
|
||||
|
||||
s32 func_800AA890(View* view, Mtx* mtx) {
|
||||
MtxF mf;
|
||||
s32 View_StepDistortion(View* view, Mtx* projectionMtx) {
|
||||
MtxF projectionMtxF;
|
||||
|
||||
if (view->unk_100 == 0.0f) {
|
||||
return 0;
|
||||
} else if (view->unk_100 == 1.0f) {
|
||||
view->unk_104 = view->unk_E8;
|
||||
view->unk_110 = view->unk_F4;
|
||||
view->unk_100 = 0.0f;
|
||||
if (view->distortionSpeed == 0.0f) {
|
||||
return false;
|
||||
} else if (view->distortionSpeed == 1.0f) {
|
||||
view->curDistortionOrientation = view->distortionOrientation;
|
||||
view->curDistortionScale = view->distortionScale;
|
||||
view->distortionSpeed = 0.0f;
|
||||
} else {
|
||||
view->unk_104.x += ((view->unk_E8.x - view->unk_104.x) * view->unk_100);
|
||||
view->unk_104.y += ((view->unk_E8.y - view->unk_104.y) * view->unk_100);
|
||||
view->unk_104.z += ((view->unk_E8.z - view->unk_104.z) * view->unk_100);
|
||||
view->curDistortionOrientation.x =
|
||||
F32_LERPIMP(view->curDistortionOrientation.x, view->distortionOrientation.x, view->distortionSpeed);
|
||||
view->curDistortionOrientation.y =
|
||||
F32_LERPIMP(view->curDistortionOrientation.y, view->distortionOrientation.y, view->distortionSpeed);
|
||||
view->curDistortionOrientation.z =
|
||||
F32_LERPIMP(view->curDistortionOrientation.z, view->distortionOrientation.z, view->distortionSpeed);
|
||||
|
||||
view->unk_110.x += ((view->unk_F4.x - view->unk_110.x) * view->unk_100);
|
||||
view->unk_110.y += ((view->unk_F4.y - view->unk_110.y) * view->unk_100);
|
||||
view->unk_110.z += ((view->unk_F4.z - view->unk_110.z) * view->unk_100);
|
||||
view->curDistortionScale.x =
|
||||
F32_LERPIMP(view->curDistortionScale.x, view->distortionScale.x, view->distortionSpeed);
|
||||
view->curDistortionScale.y =
|
||||
F32_LERPIMP(view->curDistortionScale.y, view->distortionScale.y, view->distortionSpeed);
|
||||
view->curDistortionScale.z =
|
||||
F32_LERPIMP(view->curDistortionScale.z, view->distortionScale.z, view->distortionSpeed);
|
||||
}
|
||||
|
||||
Matrix_MtxToMtxF(mtx, &mf);
|
||||
Matrix_Put(&mf);
|
||||
Matrix_RotateX(view->unk_104.x, MTXMODE_APPLY);
|
||||
Matrix_RotateY(view->unk_104.y, MTXMODE_APPLY);
|
||||
Matrix_RotateZ(view->unk_104.z, MTXMODE_APPLY);
|
||||
Matrix_Scale(view->unk_110.x, view->unk_110.y, view->unk_110.z, MTXMODE_APPLY);
|
||||
Matrix_RotateZ(-view->unk_104.z, MTXMODE_APPLY);
|
||||
Matrix_RotateY(-view->unk_104.y, MTXMODE_APPLY);
|
||||
Matrix_RotateX(-view->unk_104.x, MTXMODE_APPLY);
|
||||
MATRIX_TOMTX(mtx);
|
||||
Matrix_MtxToMtxF(projectionMtx, &projectionMtxF);
|
||||
Matrix_Put(&projectionMtxF);
|
||||
Matrix_RotateX(view->curDistortionOrientation.x, MTXMODE_APPLY);
|
||||
Matrix_RotateY(view->curDistortionOrientation.y, MTXMODE_APPLY);
|
||||
Matrix_RotateZ(view->curDistortionOrientation.z, MTXMODE_APPLY);
|
||||
Matrix_Scale(view->curDistortionScale.x, view->curDistortionScale.y, view->curDistortionScale.z, MTXMODE_APPLY);
|
||||
Matrix_RotateZ(-view->curDistortionOrientation.z, MTXMODE_APPLY);
|
||||
Matrix_RotateY(-view->curDistortionOrientation.y, MTXMODE_APPLY);
|
||||
Matrix_RotateX(-view->curDistortionOrientation.x, MTXMODE_APPLY);
|
||||
Matrix_ToMtx(projectionMtx, "../z_view.c", 566);
|
||||
|
||||
return 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
void func_800AAA50(View* view, s32 arg1) {
|
||||
@@ -424,7 +430,7 @@ s32 func_800AAA9C(View* view) {
|
||||
|
||||
view->projection = *projection;
|
||||
|
||||
func_800AA890(view, projection);
|
||||
View_StepDistortion(view, projection);
|
||||
|
||||
gSPPerspNormalize(POLY_OPA_DISP++, view->normal);
|
||||
gSPMatrix(POLY_OPA_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
|
||||
|
||||
Reference in New Issue
Block a user