recompile from symbol tomls

patches/Makefile

@@ -6,7 +6,7 @@ LD      ?= ld.lld
 CFLAGS   := -target mips -mips2 -mabi=32 -O2 -G0 -mno-abicalls -mno-odd-spreg -mno-check-zero-division \
 			-fomit-frame-pointer -ffast-math -fno-unsafe-math-optimizations -fno-builtin-memset \
 			-Wall -Wextra -Wno-incompatible-library-redeclaration -Wno-unused-parameter -Wno-unknown-pragmas -Wno-unused-variable -Wno-unused-but-set-variable -Wno-missing-braces -Wno-unsupported-floating-point-opt -Wno-switch
-CPPFLAGS := -nostdinc -DTARGET_N64 -DF3DEX_GBI_2 -D_LANGUAGE_C -DMIPS -I ../lib/DukeNukemZeroHour/include -I ../lib/DukeNukemZeroHour/libs/libultra/PR -I../lib/rt64/include
+CPPFLAGS := -nostdinc -DTARGET_N64 -DF3DEX_GBI_2 -D_LANGUAGE_C -DMIPS -I ../lib/DukeNukemZeroHour/include -I ../lib/DukeNukemZeroHour/libs/libultra/include/2.0I -I ../lib/rt64/include -I ../lib/N64ModernRuntime/N64Recomp/include
 LDFLAGS  := -nostdlib -T patches.ld -T syms.ld -Map patches.map --unresolved-symbols=ignore-all --emit-relocs
 
 C_SRCS := $(wildcard *.c)

patches/misc_funcs.h

@@ -12,8 +12,8 @@ DECLARE_FUNC(u16, recomp_get_pending_warp);
 DECLARE_FUNC(u32, recomp_get_pending_set_time);
 DECLARE_FUNC(s32, recomp_autosave_enabled);
 DECLARE_FUNC(void, recomp_load_overlays, u32 rom, void* ram, u32 size);
-DECLARE_FUNC(s32, osPiStartDma_recomp, OSIoMesg* mb, s32 priority, s32 direction, uintptr_t devAddr, void* vAddr, size_t nbytes,
-                 OSMesgQueue* mq);
+// DECLARE_FUNC(s32, osPiStartDma_recomp, OSIoMesg* mb, s32 priority, s32 direction, u32 devAddr, void* vAddr, size_t nbytes,
+//                  OSMesgQueue* mq);
 DECLARE_FUNC(float, recomp_get_aspect_ratio, float);
 DECLARE_FUNC(s32, recomp_get_target_framerate, s32);
 DECLARE_FUNC(s32, recomp_high_precision_fb_enabled);

patches/patch_helpers.h

@@ -4,7 +4,7 @@
 #ifdef MIPS
 #include "ultra64.h"
 #else
-//#include "librecomp/recomp.h"
+#include "recomp.h"
 #endif
 
 #ifdef __cplusplus

patches/patches.h

@@ -31,32 +31,28 @@
 
 #include "PR/ultratypes.h"
 #include "rt64_extended_gbi.h"
-#include "PR/gbi.h"
-#include "PR/os_thread.h"
-#include "PR/os_message.h"
-#include "common_structs.h"
-#include "structs.h"
-#include "externs.h"
-#include "misc_funcs.h"
-#include "defines.h"
-#include "macros.h"
-#include "course.h"
-#include "mk64.h"
-#include "objects.h"
-#include "render_objects.h"
-#include "mk64_tagging.h"
-#include "actor_types.h"
-#include "misc_funcs.h"
-#include "menu_items.h"
-#include "menus.h"
-#include "sounds.h"
-#include "objects.h"
-#include "debug.h"
+// #include "PR/gbi.h"
+// #include "PR/os_thread.h"
+// #include "PR/os_message.h"
+// #include "common_structs.h"
+// #include "structs.h"
+// #include "externs.h"
+// #include "misc_funcs.h"
+// #include "defines.h"
+// #include "macros.h"
+// #include "course.h"
+// #include "mk64.h"
+// #include "objects.h"
+// #include "render_objects.h"
+// #include "mk64_tagging.h"
+// #include "actor_types.h"
+// #include "misc_funcs.h"
+// #include "menu_items.h"
+// #include "menus.h"
+// #include "sounds.h"
+// #include "objects.h"
+// #include "debug.h"
 
-extern s32 gCamera1Skipped;
-extern s32 gCamera2Skipped;
-extern s32 gCamera3Skipped;
-extern s32 gCamera4Skipped;
 
 #define MAKE_RGB(r, g, b) (((r) << 0x10) | ((g) << 0x08) | (b << 0x00))
 

patches/print.c

@@ -1,8 +1,13 @@
-#if 0
+#if 1
 #include "patches.h"
 
 #include "misc_funcs.h"
-#include "libc/stdarg.h"
+// #include "libc/stdarg.h"
+
+typedef char *va_list;
+
+#define va_start(vp, parmN) (vp = ((va_list)&parmN + sizeof(parmN)))
+#define va_end(__list)
 
 typedef unsigned int size_t;
 
@@ -25,11 +30,11 @@ RECOMP_EXPORT int recomp_printf(const char* fmt, ...) {
 
     return ret;
 }
-    #else
-    void dummy_function(void) {
-        int dummyVar = 0;
+#else
+void dummy_function(void) {
+    int dummyVar = 0;
 
-        if (dummyVar);
-    }
-    #endif
+    if (dummyVar);
+}
+#endif