1
0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-21 12:54:51 +00:00

Match retail code_800D31A0.c (#1698)

This commit is contained in:
cadmic 2024-02-02 10:33:00 -08:00 committed by GitHub
parent 67d4f0f36a
commit a337416530
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions

View File

@ -103,7 +103,9 @@ extern s32 gScreenWidth;
extern s32 gScreenHeight; extern s32 gScreenHeight;
extern Mtx gMtxClear; extern Mtx gMtxClear;
extern MtxF gMtxFClear; extern MtxF gMtxFClear;
#if OOT_DEBUG
extern u32 gIsCtrlr2Valid; extern u32 gIsCtrlr2Valid;
#endif
extern s16* gWaveSamples[9]; extern s16* gWaveSamples[9];
extern f32 gBendPitchOneOctaveFrequencies[256]; extern f32 gBendPitchOneOctaveFrequencies[256];
extern f32 gBendPitchTwoSemitonesFrequencies[256]; extern f32 gBendPitchTwoSemitonesFrequencies[256];

View File

@ -1,15 +1,18 @@
#include "global.h" #include "global.h"
#include "terminal.h" #include "terminal.h"
#if OOT_DEBUG
u32 gIsCtrlr2Valid = false; u32 gIsCtrlr2Valid = false;
#endif
NORETURN void func_800D31A0(void) { NORETURN void func_800D31A0(void) {
PRINTF(VT_FGCOL(RED) "\n**** Freeze!! ****\n" VT_RST); PRINTF(VT_FGCOL(RED) "\n**** Freeze!! ****\n" VT_RST);
while (true) { for (;;) {
Sleep_Msec(1000); Sleep_Msec(1000);
} }
} }
#if OOT_DEBUG
void func_800D31F0(void) { void func_800D31F0(void) {
gIsCtrlr2Valid = (gPadMgr.validCtrlrsMask & 2) != 0; gIsCtrlr2Valid = (gPadMgr.validCtrlrsMask & 2) != 0;
} }
@ -17,3 +20,4 @@ void func_800D31F0(void) {
void func_800D3210(void) { void func_800D3210(void) {
gIsCtrlr2Valid = false; gIsCtrlr2Valid = false;
} }
#endif