james bond will return.

include/Makefile.targets

@@ -50,12 +50,7 @@ $(BUILD_DIR)/$(OBSEGMENT): $(OBSEG_RZ) $(IMAGE_OBJS)
 
 #Build C files in src/
 $(BUILD_DIR)/src/%.o: src/%.c 
-	@if grep -q 'GLOBAL_ASM(' $<; then \
-		$(ASM_PREPROC) $(OPTIMIZATION) $< | $(CC) -c $(CFLAGS) tools/asm-processor/include-stdin.c -o $@ $(OPTIMIZATION); \
-		$(ASM_PREPROC) $(OPTIMIZATION) $< --post-process $@ --assembler "$(AS) $(ASFLAGS)" --asm-prelude tools/asm-processor/prelude.s; \
-	else \
-		$(CC) -c $(CFLAGS) -o $@ $(OPTIMIZATION) $<; \
-	fi
+	$(CC) -c $(CFLAGS) -o $@ $(OPTIMIZATION) $<
 
 
 #Build RamRom

include/ultra64.h

@@ -18,8 +18,3 @@
 #include <PR/ucode.h>
 
 #endif
-
-//temporary catchall fix since not all files in master include bondgame
-#ifdef __INTELLISENSE__
-#define GLOBAL_ASM(...)
-#endif