reverbs are causing distortion

2 files changed, 24 insertions, 9 deletions

diff --git a/src/engine/fox_game.c b/src/engine/fox_game.c
index 146bf415..f96b1d9c 100644
--- a/src/engine/fox_game.c
+++ b/src/engine/fox_game.c
@@ -358,6 +358,10 @@ extern u8 gAudioSpecId;
 extern int audBuffer;
 extern AudioBufferParameters gAudioBufferParams;
 extern int countermin;
+
+extern unsigned short samples_high;
+extern unsigned short samples_low;
+
 void Game_Update(void) {
     s32 i;
     u8 partialFill;
@@ -626,8 +630,10 @@ void Game_Update(void) {
     }
     RCP_SetupDL(&gMasterDisp, SETUPDL_83);
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
-    Graphics_DisplaySmallText(10, 190, 1.0f, 1.0f, "SEC:");
-    Graphics_DisplaySmallNumber(90, 190, countermin);
+    Graphics_DisplaySmallText(10, 180, 1.0f, 1.0f, "SAM_HIGH:");
+    Graphics_DisplaySmallNumber(90, 180, samples_high + audBuffer);
+    Graphics_DisplaySmallText(10, 190, 1.0f, 1.0f, "SAM_LOW:");
+    Graphics_DisplaySmallNumber(90, 190, samples_low + audBuffer);
     Graphics_DisplaySmallText(10, 200, 1.0f, 1.0f, "AUDIOBUF:");
     Graphics_DisplaySmallNumber(90, 200, audBuffer);
     Graphics_DisplaySmallText(10, 210, 1.0f, 1.0f, "AUDIOSPEC:");
@@ -635,9 +641,9 @@ void Game_Update(void) {
     Graphics_DisplaySmallText(10, 220, 1.0f, 1.0f, "TICKS:");
     Graphics_DisplaySmallNumber(90, 220, gAudioBufferParams.ticksPerUpdate);
     if (gControllerPress[0].button & L_JPAD) {
-        //audBuffer-=10;
-    } else  if (gControllerPress[0].button & R_JPAD) {
-       // audBuffer+=10;
+      //  audBuffer-=1;
+    } else if (gControllerPress[0].button & R_JPAD) {
+       // audBuffer+=1;
     }
 }
 
diff --git a/src/engine/fox_std_lib.c b/src/engine/fox_std_lib.c
index b3c4e9c4..42efaf4a 100644
--- a/src/engine/fox_std_lib.c
+++ b/src/engine/fox_std_lib.c
@@ -31,7 +31,11 @@ void Lib_Texture_Scroll(u16* texture, s32 width, s32 height, u8 mode) {
     u16 tempPxl;
     s32 u;
     s32 v;
-    return;
+
+    // LTODO: figure out why this function crashes in other levels
+    if ((gCurrentLevel != LEVEL_SOLAR)) {
+        return;
+    }
     // LTodo: [HD-Textures] This is broken
 
     switch (mode) {
@@ -83,7 +87,12 @@ void Lib_Texture_Mottle(u16* dst, u16* src, u8 mode) {
     u8* dst8;
     u8* src8;
     s32 offset;
-    return;
+
+    // LTODO: figure out why this function crashes in other levels
+    // CAUSES CORRUPTION!!!!
+    if ((gCurrentLevel != LEVEL_SOLAR) || (gGameState == GSTATE_MAP)) {
+        return;
+    }
 
     // LTodo: [HD-Textures] This is broken
     dst = LOAD_ASSET(dst);
@@ -601,7 +610,7 @@ void Lib_TextureRect_CI8(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32
 }
 
 void Lib_TextureRect_RGBA16(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
-                         f32 yScale) {
+                            f32 yScale) {
     gDPSetTileCustom((*gfxPtr)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP,
                      G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
 
@@ -615,7 +624,7 @@ void Lib_TextureRect_RGBA16(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f
 }
 
 void Lib_TextureRect_RGBA16_MirX(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
-                              f32 yScale) {
+                                 f32 yScale) {
     gDPSetTileCustom((*gfxPtr)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP,
                      G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);