Bugfixes and New MM options (#187)

* bug fixing and MM options

added the Majora's Mask bottles as an option along with the option to uncap the jumping velocity. added an option for the audio delay workaround and fixed errors for the camera debugger

* removed zone.identifier

* cleaned up and changed bottle textures to my own

* deleted the zone identifier again why

* cleanup and new bottle fill texture

* finalized

* whoopsie

* my last commit frfr

* fix

---------

Co-authored-by: Yanis002 <35189056+Yanis002@users.noreply.github.com>

include/config/config_debug_features.h

@@ -37,7 +37,7 @@
 // ``CAN_SHOW_CS_INFOS``
 #define SHOW_CS_INFOS false
 // ``IS_CS_CONTROL_ENABLED``
-#define ENABLE_CS_CONTROL false
+#define ENABLE_CS_CONTROL true
 
 // Allow skip on the title screen (if using ``ENABLE_CS_CONTROL``)
 // ``CS_CAN_SKIP_TITLE_SCREEN``

include/config/config_game.h

@@ -12,6 +12,9 @@
 // Add a fix for the Stale Reference Manipulation glitch (OoT's Pandora's Box)
 #define FIX_SRM true
 
+// Delay the audio update by 3ms (causes the audio to go out intermittently)
+#define AUDIO_DELAY false
+
 /**
  * Enable mempak-related code
  */
@@ -26,6 +29,9 @@
 // Enables the beep sound at low health (vanilla behavior)
 #define ENABLE_LOW_HEALTH_BEEP true
 
+// Clamps the jumping velocity (setting to false uncaps the jump speed like in MM)
+#define CLAMPED_JUMP_VELOCITY true
+
 // Make the Bunny Hood Mask behave like in Majora's Mask where it increases Link's speed when equipped.
 #define MM_BUNNY_HOOD false
 #define MM_BUNNY_HOOD_SPEED 1.5f
@@ -83,8 +89,9 @@
  * Enable Cutscene Improvements (from Majora's Mask)
  *
  * This includes actor cutscenes
+ * (will cause softlocks!)
  */
-#define ENABLE_CUTSCENE_IMPROVEMENTS true
+#define ENABLE_CUTSCENE_IMPROVEMENTS false
 
 /**
  * Enable MM Title Cards

include/config/config_graphics.h

@@ -31,6 +31,9 @@
 // Enable or disable Link's LOD model (the low poly model)
 #define ENABLE_LINK_LOD false
 
+// Use the Majora's Mask Model for Bottles
+#define MM_BOTTLE_MODEL true
+
 // Disables AA (Improves console performance but causes visible seams between unconnected geometry).
 // #define DISABLE_AA false
 
@@ -56,7 +59,7 @@
  * Use the button combo Z + R + D-Pad Up to toggle
  * Note: pre-rendered scenes with the fixed camera mode won't re-scale properly
 */
-#define ENABLE_WIDESCREEN false
+#define ENABLE_WIDESCREEN true
 
 // Force widescreen mode regardless of SaveContext
 #define FORCE_WIDESCREEN false