v2.0.0

Fixes #270

.vscode/c_cpp_properties.json

@@ -25,7 +25,7 @@
                 "TARGET_N64=1",
                 "VERSION_US=1",
                 "F3DEX_GBI_2=1",
-                "F3DZEX_NON_GBI_2=1",
+                "F3DZEX_GBI_2=1",
                 "F3DEX_GBI_SHARED=1",
                 "NON_MATCHING=1",
                 "AVOID_UB=1"

CODEOWNERS

@@ -4,7 +4,6 @@
 # These owners will be the default owners for everything in the repo.
 *       @Reonu
 *       @thecozies
-*       @Mr-Wiseguy
 
 # Order is important. The last matching pattern has the most precedence.
 # So if a pull request only touches javascript files, only these owners

Makefile

@@ -108,7 +108,7 @@ else ifeq ($(GRUCODE),l3dex2) # Line3DEX2
 else ifeq ($(GRUCODE),f3dex2pl) # Fast3DEX2_PosLight
   DEFINES += F3DEX2PL_GBI=1 F3DEX_GBI_2=1 F3DEX_GBI_SHARED=1
 else ifeq ($(GRUCODE),f3dzex) # Fast3DZEX (2.08J / Animal Forest - Dōbutsu no Mori)
-  DEFINES += F3DZEX_NON_GBI_2=1 F3DEX_GBI_2=1 F3DEX_GBI_SHARED=1
+  DEFINES += F3DZEX_GBI_2=1 F3DEX_GBI_2=1 F3DEX_GBI_SHARED=1
 else ifeq ($(GRUCODE),super3d) # Super3D
   $(warning Super3D is experimental. Try at your own risk.)
   DEFINES += SUPER3D_GBI=1 F3D_NEW=1
@@ -323,25 +323,11 @@ ifeq ($(filter clean distclean print-%,$(MAKECMDGOALS)),)
   ifeq ($(NOEXTRACT),0)
     DUMMY != $(PYTHON) extract_assets.py $(VERSION) >&2 || echo FAIL
     ifeq ($(DUMMY),FAIL)
-      $(error Failed to extract assets from US ROM)
+      $(error Failed to extract assets)
     endif
-    ifneq (,$(wildcard baserom.jp.z64))
-      DUMMY != $(PYTHON) extract_assets.py jp >&2 || echo FAIL
-      ifeq ($(DUMMY),FAIL)
-        $(error Failed to extract assets from JP ROM)
-      endif
-    endif
-    ifneq (,$(wildcard baserom.eu.z64))
-      DUMMY != $(PYTHON) extract_assets.py eu >&2 || echo FAIL
-      ifeq ($(DUMMY),FAIL)
-        $(error Failed to extract assets from EU ROM)
-      endif
-    endif
-    ifneq (,$(wildcard baserom.sh.z64))
-      DUMMY != $(PYTHON) extract_assets.py sh >&2 || echo FAIL
-      ifeq ($(DUMMY),FAIL)
-        $(error Failed to extract assets from SH ROM)
-      endif
+    DUMMY != $(PYTHON) extract_assets.py jp >&2 || echo FAIL
+    ifeq ($(DUMMY),FAIL)
+      $(error Failed to extract assets)
     endif
   endif
 
@@ -630,8 +616,7 @@ $(BUILD_DIR)/src/usb/usb.o: CFLAGS += -Wno-unused-variable -Wno-sign-compare -Wn
 $(BUILD_DIR)/src/usb/debug.o: OPT_FLAGS := -O0
 $(BUILD_DIR)/src/usb/debug.o: CFLAGS += -Wno-unused-parameter -Wno-maybe-uninitialized
 # File specific opt flags
-$(BUILD_DIR)/src/audio/heap.o:          OPT_FLAGS := -Os -fno-jump-tables
-$(BUILD_DIR)/src/audio/synthesis.o:     OPT_FLAGS := -Os -fno-jump-tables
+$(BUILD_DIR)/src/audio/*.o:                   OPT_FLAGS := -Os -fno-jump-tables
 
 $(BUILD_DIR)/src/engine/surface_collision.o:  OPT_FLAGS := $(COLLISION_OPT_FLAGS)
 $(BUILD_DIR)/src/engine/math_util.o:          OPT_FLAGS := $(MATH_UTIL_OPT_FLAGS)

README.md

@@ -29,7 +29,6 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
 - **CrashOveride**: creating the [ultrasm64](https://github.com/CrashOveride95/ultrasm64) repo
 - **falcobuster**: Original coordinate overflow fix (world scale), ASM version of extended bounds
 - **anonymous_moose**: porting falco's extended bounds to decomp
-- **tuxlovesyou**: `LOAD_MIO0_TEXTURE` macro and moral support
 
 Thanks to Frame#5375 and AloXado320 for also helping with silhouette stuff
 

VERSION.txt

@@ -1 +1 @@
-v2.0.2
+v2.0.0

actors/flyguy/model.inc.c

@@ -10,7 +10,7 @@ ALIGNED8 static const Texture flyguy_seg8_texture_0800E088[] = {
 
 // 0x0800F088
 ALIGNED8 static const Texture flyguy_seg8_texture_0800F088[] = {
-#include "actors/flyguy/flyguy_face.custom.rgba16.inc.c"
+#include "actors/flyguy/flyguy_face.rgba16.inc.c"
 };
 
 // 0x0800F888

actors/warp_pipe/model.inc.c

@@ -96,7 +96,7 @@ static const Vtx warp_pipe_seg3_vertex_03007DC0[] = {
 
 // 0x03007E40
 ALIGNED8 static const Texture warp_pipe_seg3_texture_03007E40[] = {
-#include "actors/warp_pipe/warp_pipe_side.custom.rgba16.inc.c"
+#include "actors/warp_pipe/warp_pipe_side.rgba16.inc.c"
 };
 
 // 0x03008E40 - 0x03008F98

data/behavior_data.c

@@ -791,7 +791,6 @@ const BehaviorScript bhvWfBreakableWallLeft[] = {
     // WF breakable walls - common:
     OR_INT(oFlags, (OBJ_FLAG_ACTIVE_FROM_AFAR | OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)),
     SET_HITBOX(/*Radius*/ 300, /*Height*/ 400),
-    SET_FLOAT(oDrawingDistance, 4500),
     SET_INT(oIntangibleTimer, 0),
     BEGIN_LOOP(),
         CALL_NATIVE(bhv_wf_breakable_wall_loop),

include/config/config_audio.h

@@ -4,12 +4,12 @@
  * AUDIO SETTINGS *
  ******************/
 
-// Fixes the castle music sometimes triggering after getting a dialog.
+// Fixes the castle music sometimes triggering after getting a dialog
 #define CASTLE_MUSIC_FIX
 
-// Increases the audio heap size to allow for more concurrent notes to be played and for more custom sequences/banks to be imported (not supported for SH).
+// Increase audio heap size to allow for more concurrent notes to be played and for more custom sequences/banks to be imported (not supported for SH)
 #define EXPAND_AUDIO_HEAP
 
-// Uses 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.
+// 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. Hurts emulator and console performance.
-// #define BETTER_REVERB
+//#define BETTER_REVERB

include/config/config_benchmark.h

@@ -3,11 +3,11 @@
 /**********************
  * BENCHMARK SETTINGS *
  **********************/
-
 /**
- * Enabling this will enable a set of defines in order to run a benchmark on the game.
- * Currently this just starts the credits, and enables PUPPYPRINT_DEBUG.
+ * Enabling this will enable a set of defines in order to run a benchmark on the game
+ * Currently this just starts the credits, and enables puppyprint debug
 */
+
 // #define ENABLE_CREDITS_BENCHMARK
 
 #ifdef ENABLE_CREDITS_BENCHMARK

include/config/config_camera.h

@@ -4,37 +4,37 @@
  * CAMERA SETTINGS *
  *******************/
 
-// Forces the camera mode to your choice (except when swimming or flying).
+// Force the camera mode to your choice (except when swimming or flying)
 // It does this by setting the area's camera->defMode to this mode, and also
-// changes hardcoded modes to use c->defMode.
-//      Note: removes door cutscenes due to the way they're designed to work with specific modes.
-//      Search for FORCED_CAMERA_MODE in camera.c for more information.
+// changes hardcoded modes to use c->defMode
+//      Note: removes door cutscenes due to the way they're designed to work with specific modes
+//      Search for FORCED_CAMERA_MODE in camera.c for more information
 #define FORCED_CAMERA_MODE        CAMERA_MODE_8_DIRECTIONS
 
-// Changes hardcoded camera mode reverting to instead use the area's default mode (defMode).
-// If you're using a FORCED_CAMERA_MODE, this must be on for it to work.
+// Changes hardcoded camera mode reverting to instead use the area's default mode (defMode)
+// If you're using a FORCED_CAMERA_MODE, this must be on for it to work
 #define USE_COURSE_DEFAULT_MODE
 
 /***** Movement specific camera modes: *****/
-// Camera mode when Mario is < 400 units away from the water surface (default is CAMERA_MODE_WATER_SURFACE).
+// Camera mode when Mario is < 400 units away from the water surface (default is CAMERA_MODE_WATER_SURFACE)
 #define WATER_SURFACE_CAMERA_MODE CAMERA_MODE_WATER_SURFACE
-// Camera mode when Mario is > 800 units away from the water surface (default is CAMERA_MODE_BEHIND_MARIO).
+// Camera mode when Mario is > 800 units away from the water surface (default is CAMERA_MODE_BEHIND_MARIO)
 #define DEEP_WATER_CAMERA_MODE    CAMERA_MODE_BEHIND_MARIO
-// Camera mode when Mario is flying (default is CAMERA_MODE_BEHIND_MARIO).
+// Camera mode when Mario is flying (default is CAMERA_MODE_BEHIND_MARIO)
 #define FLYING_CAMERA_MODE        CAMERA_MODE_BEHIND_MARIO
 /*******************************************/
 
-// Makes the camera approach Mario's height much more quickly.
+// Makes the camera approach Mario's height much more quickly
 #define FAST_VERTICAL_CAMERA_MOVEMENT
 
-// Enables "parallel lakitu camera" or "aglab cam" which lets you move the camera smoothly with the D-pad.
+// Enables "parallel lakitu camera" or "aglab cam" which lets you move the camera smoothly with the dpad
 #define PARALLEL_LAKITU_CAM
 
 // Enables Puppy Camera 2, a rewritten camera that can be freely configured and modified.
 // #define PUPPYCAM
 
 // Note: Reonucam is available, but because we had no time to test it properly, it's included as a patch rather than being in the code by default.
-// Run this command to apply the patch if you want to use it:
+// Run this command to apply the patch if you want to use it: 
 // tools/apply_patch.sh enhancements/reonucam.patch
 // Consider it a beta, but it should work fine. Please report any bugs with it. Applying the patch will simply add a define here, so you can still turn it off even after patching.
 
@@ -42,13 +42,13 @@
 /***** Vanilla config options *****/
 /**********************************/
 
-// Included for ENABLE_VANILLA_LEVEL_SPECIFIC_CHECKS define.
+// Included for ENABLE_VANILLA_LEVEL_SPECIFIC_CHECKS define
 #include "config_game.h"
 
-// Allow course specific camera processing.
-// You will likely want this disabled in non-vanilla hacks.
+// Allow course specific camera processing
+// You will likely want this disabled in non-vanilla hacks
 // This is automatically enabled when ENABLE_VANILLA_LEVEL_SPECIFIC_CHECKS is enabled,
-// but feel free to override it if you really want to for some reason/
+// but feel free to override it if you really want to for some reason
 #ifdef ENABLE_VANILLA_LEVEL_SPECIFIC_CHECKS
     #define ENABLE_VANILLA_CAM_PROCESSING
 #endif

include/config/config_collision.h

@@ -8,10 +8,10 @@
 // The defined number is the forward speed threshold before the change is active, since it's only noticeable at lower speeds.
 #define FAST_FLOOR_ALIGN 10
 
-// Automatically calculates the optimal collision distance for an object based on its vertices.
+// Automatically calculate the optimal collision distance for an object based on its vertices.
 #define AUTO_COLLISION_DISTANCE
 
-// Allows all surfaces types to have force, (doesn't require setting force, just allows it to be optional).
+// Allow all surfaces types to have force, (doesn't require setting force, just allows it to be optional).
 #define ALL_SURFACES_HAVE_FORCE
 
 // Number of walls that can push Mario at once. Vanilla is 4.

include/config/config_cutscenes.h

@@ -6,8 +6,8 @@
 
 // -- CUTSCENE SKIPS --
 
-// Skips the peach letter cutscene.
+// Skip peach letter cutscene
 #define PEACH_SKIP
 
-// Skips the title/splash screen (Super Mario 64 logo).
-// #define SKIP_TITLE_SCREEN
+// Uncomment this if you want to skip the title screen (Super Mario 64 logo)
+//#define SKIP_TITLE_SCREEN

include/config/config_debug.h

@@ -7,50 +7,46 @@
 // Enables most debug options, including PUPPYPRINT_DEBUG.
 // #define DEBUG_ALL
 
-// Disables all debug options (except PUPPYPRINT).
+// Disables all debug options (except PUPPYPRINT)
 #define DISABLE_ALL
 
-// Enables a comprehensive standalone profiler. Automatically enabled by PUPPYPRINT_DEBUG.
-// If not using PUPPYPRINT_DEBUG, press L to toggle the profiler.
-// #define USE_PROFILER
-
 // TEST LEVEL
 // Uncomment this define and set a test level in order to boot straight into said level.
 // This allows you to quickly test the level you're working on.
 // If you want the game to boot normally, just comment out the define again.
 // #define TEST_LEVEL LEVEL_BOB
 
-// Enables debug level select. Hold L while the game boots to turn it on.
+// Enable debug level select. Hold L while the game boots to turn it on.
 #define DEBUG_LEVEL_SELECT
 
-// Enables debug free move (D-pad up to enter, A to exit).
+// Enable debug free move (DPad up to enter, A to exit).
 #define ENABLE_DEBUG_FREE_MOVE
 
-// Enables a custom, enhanced performance profiler. (Enables PUPPYPRINT by default in config_safeguards).
+// Include a custom, enhanced performance profiler. (Enables PUPPYPRINT by default in config_safeguards).
 // #define PUPPYPRINT_DEBUG 1
 
-// Uses cycles instead of microseconds in Puppyprint debug output.
+// Use cycles instead of microseconds in Puppyprint debug output.
 // #define PUPPYPRINT_DEBUG_CYCLES
 
-// A vanilla style debug mode. It doesn't rely on a text engine, but it's much less powerful that PUPPYPRINT_DEBUG.
-// Press D-pad left to show the debug UI.
+// A vanilla style debug mode. It doesn't rely on a text engine, but it's much less powerful that PUPPYPRINT_DEBUG. 
+// Press DPAD left to show the debug UI.
 // #define VANILLA_STYLE_CUSTOM_DEBUG
 
-// Visual debug enables some collision visuals. Tapping Right on the D-pad will cycle between visual hitboxes, visual surfaces, both, and neither.
+// Visual debug enables some collision visuals. Tapping Right on the dpad will cycle between visual hitboxes, visual surfaces, both, and neither.
 // If puppyprint is enabled, then this can be cycled only while the screen is active.
 // #define VISUAL_DEBUG
 
-// Opens all courses and doors. Used for debugging purposes to unlock all content.
+// Open all courses and doors. Used for debugging purposes to unlock all content.
 #define UNLOCK_ALL
 
 // Same as above, but also reads all save file flags as complete.
 // This will not overwrite existing save file data unless you save over it.
 // #define COMPLETE_SAVE_FILE
 
-// Removes the limit on FPS.
+// Removes the limit on FPS
 // #define UNLOCK_FPS
 
-// Includes vanilla debug functionality.
+// Include vanilla debug functionality.
 // #define VANILLA_DEBUG
 
 // Forces a crash when the game starts. Useful for debugging the crash screen.

include/config/config_game.h

@@ -4,62 +4,65 @@
  * GAME SETTINGS *
  *****************/
 
-/**
+/** 
  * Enables some mechanics that change behavior depending on hardcoded level numbers.
- * You may also need to change sLevelsWithRooms in object_helpers.c.
- * TODO: separate this into separate defines, behavior params, or make these mechanics otherwise dynamic.
+ * You may also need to change sLevelsWithRooms in object_helpers.c
+ * TODO: separate this into separate defines, behavior params, or make these mechanics otherwise dynamic
 */
 // #define ENABLE_VANILLA_LEVEL_SPECIFIC_CHECKS
 
-// Disables lives and hides the lives counter.
+// Disable lives and hide the lives counter
 #define DISABLE_LIVES
 
-// Saves the number of lives to the save file (Does nothing if DISABLE_LIVES is enabled).
+// Save number of lives to the save file (Does nothing if DISABLE_LIVES is enabled)
 #define SAVE_NUM_LIVES
 
-// This is the number of lives Mario starts with after a game over or starting the game for the first time (must be lower than 127).
+// The number of lives Mario starts with after a game over or starting the game for the first time (must be lower than 127)
 #define DEFAULT_NUM_LIVES 4
 
-// This can be 0..127.
+// This can be 0..127
 #define MAX_NUM_LIVES   100
 
-// This can be 0..32767.
+// This can be 0..32767
 #define MAX_NUM_COINS   999
 
-// Air/breath meter is separate from health meter when underwater.
+// Air/Breath meter is separate from health meter when underwater
 // #define BREATH_METER
 
 // Number of coins to spawn the "100 coin" star. If you remove the define altogether, then there won't be a 100 coin star at all.
 #define X_COIN_STAR 100
 
-// Stars don't kick you out of the level (does not play nicely with vanilla).
+/*
+ * Stars don't kick you out of the level (does not play nicely with vanilla)
+ * In v2.0 there are numerous issues with this define that can be seen here https://github.com/Reonu/HackerSM64/issues/258
+ * Use at your own risk.
+*/
 // #define NON_STOP_STARS
 
-// Bowser keys always exit the level. Only has an effect if NON_STOP_STARS is enabled.
-// #define KEYS_EXIT_LEVEL
-
-// Uncomment this if you want global star IDs (useful for creating an open world hack ala MVC).
+// Uncomment this if you want global star IDs (useful for creating an open world hack ala MVC)
 // #define GLOBAL_STAR_IDS
 
-// Number of possible unique model ID's (keep it higher than 256).
+// Number of possible unique model ID's (keep it higher than 256)
 #define MODEL_ID_COUNT 256
 
 // Number of supported areas per level.
 #define AREA_COUNT 8
 
 // Makes signs and NPCs easier to talk to.
+// NOTE: Currently has issues with talking to Bowser post-fight,
+// https://github.com/Reonu/HackerSM64/issues/273
 // #define EASIER_DIALOG_TRIGGER
 
-// Shows an "A" when Mario is able to talk [requires EASIER_DIALOG_TRIGGER].
+// Show an "A" when Mario is able to talk [requires EASIER_DIALOG_TRIGGER]
 // #define DIALOG_INDICATOR
 
 // Include the English characters that were missing from US segment2
 // J, Q, V, X, Z, ¨, !, !!, ?, &, %, ., and the beta key.
-// [MAKE SURE TO INCLUDE EU AND JP/SH BASEROMS IN THE REPO TO OBTAIN THE ASSETS]
+// [MAKE SURE TO ALSO BUILD FROM JP/SH AND EU TO OBTAIN THE ASSETS]
 // If this is disabled, backup assets will be used.
 // #define COMPLETE_EN_US_SEGMENT2
 
-// Removes multi-language cake screen.
+/// Removes multi-language cake screen
 #define EU_CUSTOM_CAKE_FIX
 
 // Adds multiple languages to the game. Just a placeholder for the most part, because it only works with EU, and must be enabled with EU.
@@ -68,6 +71,5 @@
 // Prevents infinite death loops by always restoring Mario's health when he's warped to any kind of warp while dead.
 #define PREVENT_DEATH_LOOP
 
-// The level that the game starts with immediately after file select.
-// The levelscript needs to have a MARIO_POS command for this to work.
+// The level that the game starts in after file select. The levelscript needs to have a MARIO_POS command for this to work.
 #define START_LEVEL LEVEL_CASTLE_GROUNDS

include/config/config_goddard.h

@@ -4,11 +4,11 @@
  * GODDARD SETTINGS *
  ********************/
 
-// Enables Goddard (the Mario head).
+// Uncomment this if you want to keep the mario head and not skip it
 // #define KEEP_MARIO_HEAD
 
-// Enables the Goddard easter egg from Shindou (has no effect if KEEP_MARIO_HEAD is disabled).
+// Goddard easter egg from Shindou (has no effect if KEEP_MARIO_HEAD is disabled)
 #define GODDARD_EASTER_EGG
 
-// Disables the demo that plays when idle on the start screen (has no effect if KEEP_MARIO_HEAD is disabled).
+// Disables the demo that plays when idle on the start screen (has no effect if KEEP_MARIO_HEAD is disabled)
 #define DISABLE_DEMO

include/config/config_graphics.h

@@ -4,21 +4,21 @@
  * GRAPHICS SETTINGS *
  *********************/
 
-// The size of the master display list (gDisplayListHead). 6400 is vanilla.
+// Size of how large the master display list (gDisplayListHead) can be. 6400 is vanilla
 #define GFX_POOL_SIZE 10000
 
-// Show a watermark on the title screen that reads "Made with HackerSM64", instead of the copyright message.
+// Show a watermark in the title screen that reads "Made with HackerSM64", instead of the copyright message
 #define INTRO_CREDIT
 
-// Spawns floombas on the title screen.
+// Spawn floombas in the title screen
 #define INTRO_FLOOMBAS
 
-// Enables widescreen (16:9) support.
+// Enable widescreen (16:9) support
 #define WIDE
 
 // Skybox size modifier, changing this will add support for larger skybox images. NOTE: Vanilla skyboxes may break if you change this option. Be sure to rescale them accordingly.
 // Whenever you change this, make sure to run "make -C tools clean" to rebuild the skybox tool (alternatively go into skyconv.c and change the file in any way (like adding/deleting a space) to specifically rebuild that tool).
-// When increasing this, you should probably also increase the GFX pool size (the GFX_POOL_SIZE define above).
+// When increasing this, you should probably also increase the GFX pool size. (the GFX_POOL_SIZE define above)
 #define SKYBOX_SIZE 1
 
 // When this option is enabled, LODs will ONLY work on console.
@@ -26,26 +26,26 @@
 // Regardless of whether this setting is enabled or not, you can use gIsConsole to wrap your own code in a console check.
 #define AUTO_LOD
 
-// Enables Puppyprint, a display library for text and large images.
-// Automatically enabled when PUPPYPRINT_DEBUG is enabled.
+// Include Puppyprint, a display library for text and large images.
+// Automatically included when PUPPYPRINT_DEBUG is enabled
 // #define PUPPYPRINT
 
-// Disables AA (Improves console performance but causes visible seams between unconnected geometry).
+// Disable AA (Improves console performance but causes visible seams between unconnected geometry).
 // #define DISABLE_AA
 
 // Makes the coins ia8 64x64 instead of ia16 32x32. Uses new ia8 textures so that vanilla coins look better.
 #define IA8_COINS
 
-// Similar to the above, but 30 FPS (Textures by InTheBeef, cleaned up by Arceveti).
+// Similar to the above, but 30 FPS (Textures by InTheBeef, cleaned up by Arceveti)
 #define IA8_30FPS_COINS
 
-// Use .rej microcode for certain objects (experimental - only should be used when F3DEX_GBI_2 is defined).
+// Use .rej microcode for certain objects (experimental - only should be used when F3DZEX_GBI_2 is defined).
 // For advanced users only. Does not work perfectly out the box, best used when exported actor models are
 // using 64 vertex sizes, offered by Fast64 in the microcode menu.
 // #define OBJECTS_REJ
 
 /**
- * Mario's silhouette when behind solid objects/surfaces.
+ * Mario's silhouette when behind solid objects/surfaces
  * Also enables new render layers, such as LAYER_ALPHA_DECAL.
  * The number is the intensity of the silhouette, from 0-255.
  * NOTE: The overlap between Mario's model parts is visible on certain HLE plugins.
@@ -63,28 +63,24 @@
 // Fixes the game reading the ia8 burn smoke texture as an rgba16.
 #define BURN_SMOKE_FIX
 
-// Disables the fix to Koopa's unshelled model.
+// Disable the fix to Koopa's unshelled model.
 #define KOOPA_KEEP_PINK_SHORTS
 
-// Uses the star object's model in the star dance cutscene.
-// This has a side effect of making the star dance star also transparent when Mario collects a transparent star.
-// #define STAR_DANCE_USES_STARS_MODEL
-
 // Lightweight directional lighting engine by Fazana. Intended for giving proximity and positional pointlights to small objects.
-// NOTE: Still breaks occasionally, and PUPPYLIGHT_NODE might not work in areas that aren't area 1.
+// NOTE: Stil breaks occasionally, and PUPPYLIGHT_NODE doesn't work in areas that aren't area 1.
 // #define PUPPYLIGHTS
 
 // Uses the correct "up" vector for the guLookAtReflect call in geo_process_master_list_sub.
-// It is sideways in vanilla, and since vanilla's environment map textures are sideways too, those will appear as sideways in-game if this is enabled.
+// It is sideways in vanilla, and since vanilla's environment map textures are sideways too, they will appear as sideways in-game if this is enabled.
 // Make sure your custom environment map textures are the correct orientation.
 // #define FIX_REFLECT_MTX
 
 // This improves performance a bit, and does not seem to break anything.
 #define DISABLE_GRAPH_NODE_TYPE_FUNCTIONAL
 
-// Disables all object shadows. You'll probably only want this either as a last resort for performance or if you're making a super stylized hack.
+// Disables object shadows. You'll probably only want this either as a last resort for performance or if you're making a super stylized hack.
 // #define DISABLE_SHADOWS
 
-// Uses old shadow IDs for Fast64 compatibility. This is a temporary fix until Fast64 is updated to use the enum defines.
+// Use old shadow IDs for Fast64 compatibility. This is a temporary fix until Fast64 is updated to use the enum defines.
 // NOTE: When this is enabled, The 49th hardcoded rectangle shadow will act as a regular circular shadow, due to Mario's shadow ID being 99 in vanilla.
 #define LEGACY_SHADOW_IDS