mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-25 14:16:11 +00:00
Code Issues Projects Releases Wiki Activity

More data fixes (#1929)

Browse source
This commit is contained in:
cadmic 2024-03-23 09:30:09 -07:00 committed by GitHub
parent bd0941405d
commit 872940d664
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/audio/general.c
View file

@ -100,7 +100,11 @@ f32 D_801305E4[4] = { 1.0f, 1.12246f, 1.33484f, 1.33484f }; // 2**({0, 2, 5, 5}/
f32 D_801305F4 = 1.0f;
u8 sGanonsTowerLevelsVol[8] = { 127, 80, 75, 73, 70, 68, 65, 60 };
u8 sEnterGanonsTowerTimer = 0;
#if OOT_DEBUG
s8 sSoundMode = SOUNDMODE_SURROUND;
#else
s8 sSoundMode = SOUNDMODE_STEREO;
#endif
s8 D_80130608 = 0;
s8 sAudioCutsceneFlag = 0;
s8 sSpecReverb = 0;

4
src/code/code_800FC620.c
View file

@ -13,7 +13,11 @@ typedef struct InitFunc {
// .data
void* sInitFuncs = NULL;
#if OOT_DEBUG
char sNew[] = "new";
#else
char sNew[] = "";
#endif
char D_80134488[0x18] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x80, 0x00, 0x00,

2
src/overlays/actors/ovl_Demo_Im/z_demo_im.c
View file

@ -58,7 +58,9 @@ static void* sEyeTextures[] = {
gImpaEyeClosedTex,
};
#if OOT_DEBUG
static u32 D_8098783C = 0;
#endif
static ColliderCylinderInitType1 sCylinderInit = {
{

2
src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
View file

@ -69,7 +69,9 @@ static void* sMouthTextures[] = {
gSariaMouthSmilingOpenTex, gSariaMouthFrowningTex,
};
#if OOT_DEBUG
static u32 D_80990108 = 0;
#endif
#include "z_demo_sa_cutscene_data.inc.c"

2
src/overlays/actors/ovl_En_Nb/z_en_nb.c
View file

@ -83,7 +83,9 @@ static void* sEyeTextures[] = {
gNabooruEyeClosedTex,
};
#if OOT_DEBUG
static s32 D_80AB4318 = 0;
#endif
#include "z_en_nb_cutscene_data.inc.c"

2
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View file

@ -61,7 +61,9 @@ static void* sEyeTextures[] = {
gAdultRutoEyeClosedTex,
};
#if OOT_DEBUG
static UNK_TYPE D_80AF4118 = 0;
#endif
#include "z_en_ru2_cutscene_data.inc.c"

4
src/overlays/actors/ovl_En_Xc/z_en_xc.c
View file

@ -472,7 +472,6 @@ void EnXc_SetColossusWindSFX(PlayState* play) {
if (gSaveContext.sceneLayer == 4) {
static s32 D_80B41D90 = 0;
static Vec3f sPos = { 0.0f, 0.0f, 0.0f };
static f32 sMaxSpeed = 0.0f;
static Vec3f D_80B42DB0;
s32 pad;
s16 sceneId = play->sceneId;
@ -487,8 +486,9 @@ void EnXc_SetColossusWindSFX(PlayState* play) {
if (D_80B41D90 != 0) {
f32 speed = Math3D_Vec3f_DistXYZ(&D_80B42DB0, eye) / 7.058922f;
#if OOT_DEBUG
static f32 sMaxSpeed = 0.0f;
sMaxSpeed = CLAMP_MIN(sMaxSpeed, speed);
PRINTF("MAX speed = %f\n", sMaxSpeed);
#endif