print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Remove Fast3D

Browse Source
This commit is contained in:
CrashOveride95
2021-09-17 17:53:53 -04:00
parent c049b71dad
commit a6c001d42c
4 changed files with 3 additions and 1802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -114,20 +114,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
@@ -521,7 +515,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

8
lib/rsp.s
View File

@@ -15,10 +15,6 @@ glabel rspbootTextEnd
glabel gspSuper3D_fifoTextStart
.incbin "lib/PR/super3d/Super3D.bin"
glabel gspSuper3D_fifoTextEnd
#else
glabel gspFast3D_fifoTextStart /* Use regular Fast3D bins (default) */
.incbin "rsp/fast3d.bin"
glabel gspFast3D_fifoTextEnd
#endif
#else /* Use one of the Fast3DEX series grucodes. */
@@ -171,10 +167,6 @@ glabel gspS2DEX2_fifoTextEnd
glabel gspSuper3D_fifoDataStart
.incbin "lib/PR/super3d/Super3D_data.bin"
glabel gspSuper3D_fifoDataEnd
#else
glabel gspFast3D_fifoDataStart
.incbin "rsp/fast3d_data.bin"
glabel gspFast3D_fifoDataEnd
#endif
#else /* Using one of the Fast3DEX series grucodes */

1766
rsp/fast3d.s
View File

File diff suppressed because it is too large Load Diff

19
rsp/gbi.inc
View File

@@ -1,19 +0,0 @@
// GBI: Graphics Binary Interface
G_FOG equ 0x00010000
G_LIGHTING equ 0x00020000
G_TEXTURE_GEN equ 0x00040000
G_TEXTURE_GEN_LINEAR equ 0x00080000
G_FOG_H equ (G_FOG/0x10000)
G_LIGHTING_H equ (G_LIGHTING/0x10000)
G_TEXTURE_GEN_H equ (G_TEXTURE_GEN/0x10000)
G_TEXTURE_GEN_LINEAR_H equ(G_TEXTURE_GEN_LINEAR/0x10000)
G_CULL_BACK equ 0x00002000
G_CULL_FRONT equ 0x00001000
G_ZBUFFER equ 0x00000001
G_TEXTURE_ENABLE equ 0x00000002
G_SHADE equ 0x00000004