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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Reonu
2021-05-09 22:16:25 +01:00
parent c6febf909e 1fe697b02e
commit b7e7c82e93
8 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -113,7 +113,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 super3d))
$(eval $(call validate-option,GRUCODE,f3d_old f3dex f3dex2 f3dex2pl f3d_new f3dzex super3d))
ifeq ($(GRUCODE),f3d_old)
DEFINES += F3D_OLD=1
@@ -123,6 +123,8 @@ else 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
else ifeq ($(GRUCODE),f3dex2pl) # Fast3DEX2_PosLight
DEFINES += F3DEX2PL_GBI=1 F3DEX_GBI_2=1 F3DEX_GBI_SHARED=1
else ifeq ($(GRUCODE),f3dzex) # Fast3DZEX (2.08J / Animal Forest - Dōbutsu no Mori)
DEFINES += F3DZEX_GBI_2=1 F3DEX_GBI_2=1 F3DEX_GBI_SHARED=1
else ifeq ($(GRUCODE),super3d) # Super3D

2
include/ique/PR/gbi.h
View File

@@ -4795,7 +4795,7 @@ typedef union {
#define gDPNoOpTag(pkt, tag) gDPParam(pkt, G_NOOP, tag)
#define gsDPNoOpTag(tag) gsDPParam(G_NOOP, tag)
#if defined(F3DZEX_GBI_2) || defined(F3DZEX_NON_GBI_2) || defined(L3DZEX_GBI)
#if defined(F3DZEX_GBI_2) || defined(F3DZEX_NON_GBI_2) || defined(L3DZEX_GBI) || defined(F3DEX2PL_GBI)
#include "gbi-poslight.h"
#endif

3
include/ique/PR/ucode.h
View File

@@ -178,6 +178,9 @@ extern u64 gspF3DLX2_Rej_fifoDataStart[],gspF3DLX2_Rej_fifoDataEnd[];
extern u64 gspL3DEX2_fifoTextStart[], gspL3DEX2_fifoTextEnd[];
extern u64 gspL3DEX2_fifoDataStart[], gspL3DEX2_fifoDataEnd[];
extern u64 gspF3DEX2_PosLight_fifoTextStart[], gspF3DEX2_PosLight_fifoTextEnd[];
extern u64 gspF3DEX2_PosLight_fifoDataStart[], gspF3DEX2_PosLight_fifoDataEnd[];
/* XBUS version */
extern u64 gspF3DEX2_xbusTextStart[], gspF3DEX2_xbusTextEnd[];
extern u64 gspF3DEX2_xbusDataStart[], gspF3DEX2_xbusDataEnd[];

3
include/n64/PR/ucode.h
View File

@@ -178,6 +178,9 @@ extern u64 gspF3DLX2_Rej_fifoDataStart[],gspF3DLX2_Rej_fifoDataEnd[];
extern u64 gspL3DEX2_fifoTextStart[], gspL3DEX2_fifoTextEnd[];
extern u64 gspL3DEX2_fifoDataStart[], gspL3DEX2_fifoDataEnd[];
extern u64 gspF3DEX2_PosLight_fifoTextStart[], gspF3DEX2_PosLight_fifoTextEnd[];
extern u64 gspF3DEX2_PosLight_fifoDataStart[], gspF3DEX2_PosLight_fifoDataEnd[];
/* XBUS version */
extern u64 gspF3DEX2_xbusTextStart[], gspF3DEX2_xbusTextEnd[];
extern u64 gspF3DEX2_xbusDataStart[], gspF3DEX2_xbusDataEnd[];

BIN
lib/PR/f3dex2pl/F3DEX2_PosLight.bin Normal file
View File

Binary file not shown.

BIN
lib/PR/f3dex2pl/F3DEX2_PosLight_data.bin Normal file
View File

Binary file not shown.

16
lib/rsp.s
View File

@@ -23,11 +23,15 @@ glabel gspFast3D_fifoTextEnd
#else /* Use one of the Fast3DEX series grucodes. */
#ifndef F3DZEX_GBI_2
#if F3DEX_GBI_2 == 1
#if F3DEX2PL_GBI == 1
glabel gspF3DEX2_PosLight_fifoTextStart
.incbin "lib/PR/f3dex2pl/F3DEX2_PosLight.bin"
glabel gspF3DEX2_PosLight_fifoTextEnd
#elif F3DEX_GBI_2 == 1
glabel gspF3DEX2_fifoTextStart
.incbin "lib/PR/f3dex2/F3DEX2.bin"
glabel gspF3DEX2_fifoTextEnd
#elseif F3DEX_GBI == 1
#elif F3DEX_GBI == 1
glabel gspF3DEX_fifoTextStart
.incbin "lib/PR/f3dex/F3DEX.bin"
glabel gspF3DEX_fifoTextEnd
@@ -175,11 +179,15 @@ glabel gspFast3D_fifoDataEnd
#else /* Using one of the Fast3DEX series grucodes */
#ifndef F3DZEX_GBI_2
#if F3DEX_GBI_2 == 1
#if F3DEX2PL_GBI == 1
glabel gspF3DEX2_PosLight_fifoDataStart
.incbin "lib/PR/f3dex2pl/F3DEX2_PosLight_data.bin"
glabel gspF3DEX2_PosLight_fifoDataEnd
#elif F3DEX_GBI_2 == 1
glabel gspF3DEX2_fifoDataStart
.incbin "lib/PR/f3dex2/F3DEX2_data.bin"
glabel gspF3DEX2_fifoDataEnd
#elseif F3DEX_GBI == 1
#elif F3DEX_GBI == 1
glabel gspF3DEX_fifoDataStart
.incbin "lib/PR/f3dex/F3DEX_data.bin"
glabel gspF3DEX_fifoDataEnd

3
src/game/game_init.c
View File

@@ -243,6 +243,9 @@ void create_task_structure(void) {
#ifdef F3DZEX_GBI_2
gGfxSPTask->task.t.ucode = gspF3DZEX2_PosLight_fifoTextStart;
gGfxSPTask->task.t.ucode_data = gspF3DZEX2_PosLight_fifoDataStart;
#elif F3DEX2PL_GBI
gGfxSPTask->task.t.ucode = gspF3DEX2_PosLight_fifoTextStart;
gGfxSPTask->task.t.ucode_data = gspF3DEX2_PosLight_fifoDataStart;
#elif F3DEX_GBI_2
gGfxSPTask->task.t.ucode = gspF3DEX2_fifoTextStart;
gGfxSPTask->task.t.ucode_data = gspF3DEX2_fifoDataStart;