Merge https://github.com/CrashOveride95/ultrasm64

Makefile

@@ -112,20 +112,14 @@ TARGET := sm64.$(VERSION)
 
 
 # GRUCODE - selects which RSP microcode to use.
-#   f3d_old - default for JP and US versions
-#   f3d_new - default for EU and Shindou versions
 #   f3dex   -
 #   f3dex2  -
 #   l3dex2  - F3DEX2 version that only renders in wireframe
 #   f3dzex  - newer, experimental microcode used in Animal Crossing
 #   super3d - extremely experimental version of Fast3D lacking many features for speed
-$(eval $(call validate-option,GRUCODE,f3d_old f3dex f3dex2 f3dex2pl f3d_new f3dzex super3d l3dex2))
+$(eval $(call validate-option,GRUCODE,f3dex f3dex2 f3dex2pl f3dzex super3d l3dex2))
 
-ifeq      ($(GRUCODE),f3d_old)
-  DEFINES += F3D_OLD=1
-else ifeq ($(GRUCODE),f3d_new) # Fast3D 2.0H
-  DEFINES += F3D_NEW=1
-else ifeq ($(GRUCODE),f3dex) # Fast3DEX
+ifeq ($(GRUCODE),f3dex) # Fast3DEX
   DEFINES += F3DEX_GBI=1 F3DEX_GBI_SHARED=1
 else ifeq ($(GRUCODE),f3dex2) # Fast3DEX2
   DEFINES += F3DEX_GBI_2=1 F3DEX_GBI_SHARED=1
@@ -538,7 +532,7 @@ libultra: $(BUILD_DIR)/libultra.a
 $(BUILD_DIR)/asm/boot.o:              $(IPL3_RAW_FILES)
 $(BUILD_DIR)/src/game/crash_screen.o: $(CRASH_TEXTURE_C_FILES)
 $(BUILD_DIR)/src/game/version.o:      $(BUILD_DIR)/src/game/version_data.h
-$(BUILD_DIR)/lib/rsp.o:               $(BUILD_DIR)/rsp/rspboot.bin $(BUILD_DIR)/rsp/fast3d.bin $(BUILD_DIR)/rsp/audio.bin
+$(BUILD_DIR)/lib/rsp.o:               $(BUILD_DIR)/rsp/rspboot.bin $(BUILD_DIR)/rsp/audio.bin
 $(SOUND_BIN_DIR)/sound_data.o:        $(SOUND_BIN_DIR)/sound_data.ctl $(SOUND_BIN_DIR)/sound_data.tbl $(SOUND_BIN_DIR)/sequences.bin $(SOUND_BIN_DIR)/bank_sets
 $(BUILD_DIR)/levels/scripts.o:        $(BUILD_DIR)/include/level_headers.h
 

include/n64/PR/ucode.h

@@ -226,14 +226,26 @@ extern u64 gspF3DZEX2_PosLight_fifoTextStart[],
            gspF3DZEX2_PosLight_fifoTextEnd[];
 extern u64 gspF3DZEX2_PosLight_fifoDataStart[],
            gspF3DZEX2_PosLight_fifoDataEnd[];
+extern u64 gspF3DZEX2_PosLight_xbusTextStart[],
+           gspF3DZEX2_PosLight_xbusTextEnd[];
+extern u64 gspF3DZEX2_PosLight_xbusDataStart[],
+           gspF3DZEX2_PosLight_xbusDataEnd[];
 extern u64 gspF3DZEX2_NoN_PosLight_fifoTextStart[],
            gspF3DZEX2_NoN_PosLight_fifoTextEnd[];
 extern u64 gspF3DZEX2_NoN_PosLight_fifoDataStart[],
            gspF3DZEX2_NoN_PosLight_fifoDataEnd[];
+extern u64 gspF3DZEX2_NoN_PosLight_xbusTextStart[],
+           gspF3DZEX2_NoN_PosLight_xbusTextEnd[];
+extern u64 gspF3DZEX2_NoN_PosLight_xbusDataStart[],
+           gspF3DZEX2_NoN_PosLight_xbusDataEnd[];
 extern u64 gspL3DZEX2_PosLight_fifoTextStart[],
            gspL3DZEX2_PosLight_fifoTextEnd[];
 extern u64 gspL3DZEX2_PosLight_fifoDataStart[],
            gspL3DZEX2_PosLight_fifoDataEnd[];
+extern u64 gspL3DZEX2_PosLight_xbusTextStart[],
+           gspL3DZEX2_PosLight_xbusTextEnd[];
+extern u64 gspL3DZEX2_PosLight_xbusDataStart[],
+           gspL3DZEX2_PosLight_xbusDataEnd[];
 
 /**************************************************************************
  *