Merge branch 'experimental' of https://github.com/Reonu/HackerSM64 into experimental

include/config.h

@@ -128,7 +128,7 @@
 // Number of supported areas per level.
 #define AREA_COUNT 8
 // Lightweight directional lighting engine by Fazana. Intended for giving proximity and positional pointlights to small objects.
-#define PUPPYLIGHTS
+//#define PUPPYLIGHTS
 
 // BUG/GAME QOL FIXES
 // Fix instant warp offset not working when warping across different areas

src/game/puppylights.c

@@ -9,6 +9,8 @@ but it will not be affected by environmental tinting. If you wish for an object
 simply set the object flag OBJ_FLAG_EMIT_LIGHT and set some values to o->puppylight.
 **/
 
+#ifdef PUPPYLIGHTS
+
 #include <ultra64.h>
 #include "types.h"
 #include "puppylights.h"
@@ -309,3 +311,5 @@ void obj_disable_light(struct Object *obj)
 {
     obj->oFlags &= ~OBJ_FLAG_EMIT_LIGHT;
 }
+
+#endif

src/game/puppylights.h

@@ -1,5 +1,8 @@
 #ifndef PUPPYLIGHTS_H
 #define PUPPYLIGHTS_H
+
+#ifdef PUPPYLIGHTS
+
 #include "types.h"
 #include "command_macros_base.h"
 
@@ -48,3 +51,4 @@ extern void set_light_properties(struct PuppyLight *light, s32 x, s32 y, s32 z,
 extern void puppylights_allocate(void);
 
 #endif
+#endif