From bd5f810a3bcd8b1b646aed560631c544bef654cc Mon Sep 17 00:00:00 2001 From: thecozies <79979276+thecozies@users.noreply.github.com> Date: Mon, 27 Dec 2021 12:58:27 -0600 Subject: [PATCH] Develop/refactor default defines (#242) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Changed default config options * Added build dir to includePaths for pngs * disable NO_SLEEP by default * Disable puppyprint by default Sorry fazana ๐Ÿ˜” * fix typos * add comment about BETTER_REVERB console perf * disable blue coin switch retry by default * Update config_audio.h Co-authored-by: Reonu Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com> --- .vscode/c_cpp_properties.json | 1 + include/config/config_audio.h | 2 +- include/config/config_debug.h | 6 +++--- include/config/config_game.h | 4 ++-- include/config/config_graphics.h | 2 +- include/config/config_movement.h | 8 ++++---- include/config/config_objects.h | 6 +++--- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index a3359dc08..62a27bd0c 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -6,6 +6,7 @@ "${workspaceFolder}/include/n64/**", "${workspaceFolder}/include/**", "${workspaceFolder}/textures/**", + "${workspaceFolder}/build/us_n64/**", "${workspaceFolder}/**" ], "forcedInclude": [ diff --git a/include/config/config_audio.h b/include/config/config_audio.h index 6b1073b1e..1d1f52706 100644 --- a/include/config/config_audio.h +++ b/include/config/config_audio.h @@ -11,5 +11,5 @@ #define EXPAND_AUDIO_HEAP // Use a much better implementation of reverb over vanilla's fake echo reverb. Great for caves or eerie levels, as well as just a better audio experience in general. -// Reverb parameters can be configured in audio/synthesis.c to meet desired aesthetic/performance needs. Currently US/JP only. +// Reverb parameters can be configured in audio/synthesis.c to meet desired aesthetic/performance needs. Currently US/JP only. Hurts emulator and console performance. //#define BETTER_REVERB diff --git a/include/config/config_debug.h b/include/config/config_debug.h index 185f0ef0e..53cfc14ff 100644 --- a/include/config/config_debug.h +++ b/include/config/config_debug.h @@ -8,7 +8,7 @@ //#define DEBUG_ALL // Disables all debug options (except PUPPYPRINT) -//#define DISABLE_ALL +#define DISABLE_ALL // TEST LEVEL // Uncomment this define and set a test level in order to boot straight into said level. @@ -29,9 +29,9 @@ //#define CUSTOM_DEBUG // Include Puppyprint, a display library for text and large images. -#define PUPPYPRINT +//#define PUPPYPRINT // Include a custom, enhanced performance profiler (Requires PUPPYPRINT). -#define PUPPYPRINT_DEBUG 1 +//#define PUPPYPRINT_DEBUG 1 // Use cycles instead of microseconds in Puppyprint debug output. //#define PUPPYPRINT_DEBUG_CYCLES diff --git a/include/config/config_game.h b/include/config/config_game.h index e7e2c3836..6f0bffc02 100644 --- a/include/config/config_game.h +++ b/include/config/config_game.h @@ -45,7 +45,7 @@ #define EASIER_DIALOG_TRIGGER // Show an "A" when Mario is able to talk [requires EASIER_DIALOG_TRIGGER] -#define DIALOG_INDICATOR +// #define DIALOG_INDICATOR // Include the English characters that were missing from US segment2 // J, Q, V, X, Z, ยจ, !, !!, ?, &, %, ., and the beta key. @@ -73,4 +73,4 @@ #endif // DISABLE_LIVES #ifndef START_LEVEL #define START_LEVEL LEVEL_CASTLE_GROUNDS -#endif \ No newline at end of file +#endif diff --git a/include/config/config_graphics.h b/include/config/config_graphics.h index 17ff63c47..31698098f 100644 --- a/include/config/config_graphics.h +++ b/include/config/config_graphics.h @@ -51,7 +51,7 @@ #define HD_SHADOWS // Makes certain objects (mainly trees) transparent when the camera gets close. -#define OBJ_OPACITY_BY_CAM_DIST +// #define OBJ_OPACITY_BY_CAM_DIST // Fixes the game reading the ia8 burn smoke texture as an rgba16. #define BURN_SMOKE_FIX diff --git a/include/config/config_movement.h b/include/config/config_movement.h index 08b443b42..9517e6afa 100644 --- a/include/config/config_movement.h +++ b/include/config/config_movement.h @@ -9,19 +9,19 @@ // Fixes Mario's turn ground radius by allowing Mario to turn around at any speed. // Basically a simpler version of GROUND_TURN_FIX but smoother & closer to vanilla. -#define GROUND_TURNING_AROUND_FIX +// #define GROUND_TURNING_AROUND_FIX // Improved hanging: // - Doesn't require holding down the A button -// - Percise turning control -// - Preventis falling from the edges +// - Precise turning control +// - Prevents falling from the edges #define BETTER_HANGING // Change the movement speed when hanging from a ceiling (the vanilla value is 4.0f, has no effect if BETTER_HANGING is enabled) #define HANGING_SPEED 12.0f // Prevents Mario from falling asleep while idle -#define NO_SLEEP +// #define NO_SLEEP // Disables fall damage #define NO_FALL_DAMAGE diff --git a/include/config/config_objects.h b/include/config/config_objects.h index 16314fbc3..b0064cf08 100644 --- a/include/config/config_objects.h +++ b/include/config/config_objects.h @@ -15,12 +15,12 @@ #define COIN_LAVA_FLICKER // Allow for retries on collecting the remaining blue coins from a blue coin switch. -#define BLUE_COIN_SWITCH_RETRY +//#define BLUE_COIN_SWITCH_RETRY // -- GOOMBA -- // Tiny Goombas (from THI) always drop their coin. -#define TINY_GOOMBA_ALWAYS_DROPS_COIN +// #define TINY_GOOMBA_ALWAYS_DROPS_COIN // Floombas! These fellas sport custom behaviors (bhvFloomba, bhvFloombaTripletSpawner) and of course the iconic Floomba texture. // Also support macros (macro_floomba, macro_huge_floomba, macro_tiny_floomba, macro_floomba_triplet_spawner, macro_floomba_quintuplet_spawner). @@ -36,7 +36,7 @@ // -- MR I -- -// Uncomment to allow MR I to shoot his partical in any direction +// Uncomment to allow MR I to shoot his particle in any direction // #define MR_I_PITCH_SHOOTING // -- WATER RING --