diff --git a/Makefile b/Makefile index b5fe5805..a62c42d2 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ TARGET := sm64.$(VERSION) # f3dex2 - # 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 f3d_new f3dzex)) +$(eval $(call validate-option,GRUCODE,f3d_old f3dex f3dex2 f3d_new f3dzex super3d)) ifeq ($(GRUCODE),f3d_old) DEFINES += F3D_OLD=1 diff --git a/asm/slidec.s b/asm/slidec.s index 5c9c4fcd..f932e72b 100644 --- a/asm/slidec.s +++ b/asm/slidec.s @@ -56,4 +56,3 @@ pressloop3: lbu $11,($25) add $25,1 add $11,18 b pressloop2 - .end diff --git a/include/PR/ucode.h b/include/PR/ucode.h index 9916fdd0..23b94102 100644 --- a/include/PR/ucode.h +++ b/include/PR/ucode.h @@ -118,16 +118,16 @@ extern u64 gspLine3D_fifoTextStart[], gspLine3D_fifoTextEnd[]; extern u64 gspLine3D_fifoDataStart[], gspLine3D_fifoDataEnd[]; /* super 3D ucode: */ -extern long long int gspSuper3DTextStart[], gspSuper3DTextEnd[]; -extern long long int gspSuper3DDataStart[], gspSuper3DDataEnd[]; +extern u64 gspSuper3DTextStart[], gspSuper3DTextEnd[]; +extern u64 gspSuper3DDataStart[], gspSuper3DDataEnd[]; /* 3D ucode with output to DRAM: */ -extern long long int gspSuper3D_dramTextStart[], gspSuper3D_dramTextEnd[]; -extern long long int gspSuper3D_dramDataStart[], gspSuper3D_dramDataEnd[]; +extern u64 gspSuper3D_dramTextStart[], gspSuper3D_dramTextEnd[]; +extern u64 gspSuper3D_dramDataStart[], gspSuper3D_dramDataEnd[]; /* 3D ucode with output through DRAM FIFO to RDP: */ -extern long long int gspSuper3D_fifoTextStart[], gspSuper3D_fifoTextEnd[]; -extern long long int gspSuper3D_fifoDataStart[], gspSuper3D_fifoDataEnd[]; +extern u64 gspSuper3D_fifoTextStart[], gspSuper3D_fifoTextEnd[]; +extern u64 gspSuper3D_fifoDataStart[], gspSuper3D_fifoDataEnd[]; /* 2D sprite ucode: */