HackerOoT clean-up (#154)

* makefile changes

* minor 'if's cleanup

* changed version to ntsc-1.2 and removed hackeroot-mq

* fixed some build issues

* format files

* fix boot issues

* remove mod_assets system

* add f3dex2 offsets for ntsc 1.0, 1.1 and 1.2

* update F3DEX3

* format

* make adjustements

* post-merge fixes

* remove settings.json from tracking

* temp delete c_cpp_properties.json

* hopefully fix .vscode oddities

* fixed sym_info

* fix build issues

* fixed profiler issues

Co-authored by: Thar0 <17233964+Thar0@users.noreply.github.com>

* format + don't format example scene sources

* proper f3dex3 patches folders

---------

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

include/compression.h

@@ -3,14 +3,19 @@
 
 #include "ultra64.h"
 #include "z64dma.h"
+#include "config.h"
 
+#if COMPRESS_YAZ
 void* Yaz0_FirstDMA(void);
 void* Yaz0_NextDMA(u8* curSrcPos);
 void Yaz0_DecompressImpl(u8* src, u8* dst);
-
 void Yaz0_Decompress(uintptr_t romStart, u8* dst, size_t size);
+#elif COMPRESS_GZIP
 void gzip_decompress(uintptr_t romStart, u8* dst, size_t size);
+#elif COMPRESS_LZO
 void LZO_Decompress(unsigned int pstart, unsigned char* op, unsigned int sz);
+#elif COMPRESS_APLIB
 void Aplib_Decompress(unsigned rom, unsigned char* dst, unsigned compSz);
+#endif
 
 #endif

include/config.h

@@ -2,6 +2,7 @@
 #define CONFIG_H
 
 #include "libc/stdbool.h"
+#include "versions.h"
 
 /**
  * All HackerOoT config headers included into one.

include/config/config_safeguards.h

@@ -13,21 +13,11 @@
 /*****************
  * config_debug.h
  */
-#if RELEASE_ROM
+#if !DEBUG_FEATURES
     #undef SKIP_N64_BOOT_LOGO
     #undef BOOT_TO_SCENE
     #undef BOOT_TO_SCENE_NEW_GAME_ONLY
     #undef BOOT_TO_FILE_SELECT
-    #undef DEBUG_FEATURES
-
-    #define SKIP_N64_BOOT_LOGO false
-    #define BOOT_TO_SCENE false
-    #define BOOT_TO_SCENE_NEW_GAME_ONLY false
-    #define BOOT_TO_FILE_SELECT false
-    #define DEBUG_FEATURES false
-#endif
-
-#if !DEBUG_FEATURES
     #undef SHOW_CS_INFOS
     #undef SHOW_INPUT_DISPLAY
     #undef SHOW_TIME_INFOS
@@ -51,6 +41,10 @@
     #undef ENABLE_HACKER_DEBUG
     #undef ENABLE_PROFILER
 
+    #define SKIP_N64_BOOT_LOGO false
+    #define BOOT_TO_SCENE false
+    #define BOOT_TO_SCENE_NEW_GAME_ONLY false
+    #define BOOT_TO_FILE_SELECT false
     #define SHOW_CS_INFOS false
     #define SHOW_INPUT_DISPLAY false
     #define SHOW_TIME_INFOS false
@@ -159,58 +153,6 @@
     #define ENABLE_F3DEX3 false
 #endif
 
-
-/**
- * Default settings if not using HackerOoT mode
-*/
-#if !ENABLE_HACKEROOT
-    #undef SKIP_N64_BOOT_LOGO
-    #undef BOOT_TO_SCENE
-    #undef BOOT_TO_SCENE_NEW_GAME_ONLY
-    #undef BOOT_TO_FILE_SELECT
-    #undef SHOW_CS_INFOS
-    #undef SHOW_INPUT_DISPLAY
-    #undef SHOW_TIME_INFOS
-    #undef INCLUDE_TEST_SCENES
-    #undef ENABLE_NO_CLIP
-    #undef ENABLE_CS_CONTROL
-    #undef ENABLE_FRAMERATE_OPTIONS
-    #undef ENABLE_MAP_SELECT
-    #undef ENABLE_INV_EDITOR
-    #undef ENABLE_EVENT_EDITOR
-    #undef ENABLE_REG_EDITOR
-    #undef ENABLE_CAMERA_DEBUGGER
-    #undef ENABLE_AUDIO_DEBUGGER
-    #undef ENABLE_ACTOR_DEBUGGER
-    #undef ENABLE_MSG_DEBUGGER
-    #undef ENABLE_DEBUG_SAVE
-    #undef MAP_SELECT_ON_FILE_1
-    #undef ENABLE_MOTION_BLUR_DEBUG
-
-    #define SKIP_N64_BOOT_LOGO true
-    #define BOOT_TO_SCENE false
-    #define BOOT_TO_SCENE_NEW_GAME_ONLY false
-    #define BOOT_TO_FILE_SELECT false
-    #define SHOW_CS_INFOS false
-    #define SHOW_INPUT_DISPLAY false
-    #define SHOW_TIME_INFOS false
-    #define INCLUDE_TEST_SCENES true
-    #define ENABLE_NO_CLIP false
-    #define ENABLE_CS_CONTROL false
-    #define ENABLE_FRAMERATE_OPTIONS false
-    #define ENABLE_MAP_SELECT true
-    #define ENABLE_INV_EDITOR false
-    #define ENABLE_EVENT_EDITOR false
-    #define ENABLE_REG_EDITOR false
-    #define ENABLE_CAMERA_DEBUGGER true
-    #define ENABLE_AUDIO_DEBUGGER false
-    #define ENABLE_ACTOR_DEBUGGER false
-    #define ENABLE_MSG_DEBUGGER false
-    #define ENABLE_DEBUG_SAVE false
-    #define MAP_SELECT_ON_FILE_1 true
-    #define ENABLE_MOTION_BLUR_DEBUG false
-#endif
-
 #if ENABLE_PROFILER && !ENABLE_HACKER_DEBUG
 #error "ENABLE_PROFILER requires ENABLE_HACKER_DEBUG"
 #endif
@@ -218,7 +160,7 @@
 /**
  * Game
 */
-#define IS_MOTION_BLUR_ENABLED (ENABLE_HACKEROOT && ENABLE_MOTION_BLUR)
+#define IS_MOTION_BLUR_ENABLED (ENABLE_MOTION_BLUR)
 
 /**
  * Debug
@@ -237,7 +179,7 @@
 #define IS_DEBUG_BOOT_ENABLED (DEBUG_FEATURES && ENABLE_DEBUG_BOOT)
 #define IS_DEBUG_SAVE_ENABLED (DEBUG_FEATURES && ENABLE_DEBUG_SAVE)
 #define CAN_INCLUDE_TEST_SCENES (DEBUG_ASSETS && INCLUDE_TEST_SCENES)
-#define CAN_INCLUDE_EXAMPLE_SCENE (DEBUG_ASSETS && INCLUDE_EXAMPLE_SCENE)
+#define CAN_INCLUDE_EXAMPLE_SCENE (DEBUG_FEATURES && INCLUDE_EXAMPLE_SCENE)
 
 // In-game editors
 #define IS_INV_EDITOR_ENABLED (DEBUG_FEATURES && ENABLE_INV_EDITOR)

include/ultra64/gbi.h

@@ -10,6 +10,10 @@
         #define NO_SYNCS_IN_TEXTURE_LOADS
     #endif
     #include "gbi.f3dex3.h"
+
+    // see `Error_please_update_viewport_Z_and_Y_see_GBI`
+    #undef G_MAXZ
+    #define G_MAXZ G_NEW_MAXZ
 #else
 #include "mbi.h"
 #include "ultratypes.h"

include/z64save.h

@@ -12,14 +12,10 @@ typedef enum ZTargetSetting {
 } ZTargetSetting;
 
 typedef enum Language {
-#if OOT_NTSC
     /* 0 */ LANGUAGE_JPN,
     /* 1 */ LANGUAGE_ENG,
-#else
-    /* 0 */ LANGUAGE_ENG,
-    /* 1 */ LANGUAGE_GER,
-    /* 2 */ LANGUAGE_FRA,
-#endif
+    /* 2 */ LANGUAGE_GER,
+    /* 3 */ LANGUAGE_FRA,
     /*   */ LANGUAGE_MAX
 } Language;
 

include/z64thread.h

@@ -10,18 +10,19 @@
 #define THREAD_ID_SCHED       5
 #define THREAD_ID_PADMGR      7
 
+#define THREAD_ID_N64DD       8
+#define THREAD_ID_DDMSG       9
+#define THREAD_ID_AUDIOMGR   10
+
 #if ENABLE_PROFILER
-#define THREAD_ID_PIMGR       8
-#define THREAD_ID_VIMGR       9
+#define THREAD_ID_PIMGR       11
+#define THREAD_ID_VIMGR       12
 #else
 // Not sure why these are zero in vanilla.
 #define THREAD_ID_PIMGR       0
 #define THREAD_ID_VIMGR       0
 #endif
 
-#define THREAD_ID_N64DD       8
-#define THREAD_ID_DDMSG       9
-#define THREAD_ID_AUDIOMGR   10
 #define THREAD_ID_DMAMGR     18
 #define THREAD_ID_IRQMGR     19