diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2026-02-22 22:50:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-22 22:50:27 +0100 |
| commit | 0d4dbb61a0099226d530b384533bda45e7b5ef69 (patch) | |
| tree | 8907f40c856c78fb47e27ca1653adc7a3e08fb98 /src/code | |
| parent | abdae818bda2f397c23e41078a4d89079b9fa7b8 (diff) | |
Fix F3DEX2 ucode name on N64 versions (not PosLight) (#2701)
* Fix F3DEX2 ucode name on N64 versions (not PosLight)
* put the not-PosLight / PosLight differences under F3DEX_GBI_PL
* revert bss changes
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/graph.c | 16 | ||||
| -rw-r--r-- | src/code/sys_ucode.c | 5 |
2 files changed, 21 insertions, 0 deletions
diff --git a/src/code/graph.c b/src/code/graph.c index c6b5f3cb6..826dd71c0 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -50,13 +50,21 @@ OSTime sGraphPrevTaskTimeStart; FaultClient sGraphFaultClient; UCodeInfo D_8012D230[3] = { +#ifndef F3DEX_GBI_PL + { UCODE_TYPE_F3DZEX, gspF3DZEX2_NoN_fifoTextStart }, +#else { UCODE_TYPE_F3DZEX, gspF3DZEX2_NoN_PosLight_fifoTextStart }, +#endif { UCODE_TYPE_UNK, NULL }, { UCODE_TYPE_S2DEX, gspS2DEX2d_fifoTextStart }, }; UCodeInfo D_8012D248[3] = { +#ifndef F3DEX_GBI_PL + { UCODE_TYPE_F3DZEX, gspF3DZEX2_NoN_fifoTextStart }, +#else { UCODE_TYPE_F3DZEX, gspF3DZEX2_NoN_PosLight_fifoTextStart }, +#endif { UCODE_TYPE_UNK, NULL }, { UCODE_TYPE_S2DEX, gspS2DEX2d_fifoTextStart }, }; @@ -81,7 +89,11 @@ void Graph_DisassembleUCode(Gfx* workBuf) { disassembler.enableLog = R_UCODE_DISAS_LOG_LEVEL; UCodeDisas_RegisterUCode(&disassembler, ARRAY_COUNT(D_8012D230), D_8012D230); +#ifndef F3DEX_GBI_PL + UCodeDisas_SetCurUCode(&disassembler, gspF3DZEX2_NoN_fifoTextStart); +#else UCodeDisas_SetCurUCode(&disassembler, gspF3DZEX2_NoN_PosLight_fifoTextStart); +#endif UCodeDisas_Disassemble(&disassembler, workBuf); @@ -120,7 +132,11 @@ void Graph_UCodeFaultClient(Gfx* workBuf) { UCodeDisas_Init(&disassembler); disassembler.enableLog = true; UCodeDisas_RegisterUCode(&disassembler, ARRAY_COUNT(D_8012D248), D_8012D248); +#ifndef F3DEX_GBI_PL + UCodeDisas_SetCurUCode(&disassembler, gspF3DZEX2_NoN_fifoTextStart); +#else UCodeDisas_SetCurUCode(&disassembler, gspF3DZEX2_NoN_PosLight_fifoTextStart); +#endif UCodeDisas_Disassemble(&disassembler, workBuf); UCodeDisas_Destroy(&disassembler); } diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c index 71ae00390..d1e609802 100644 --- a/src/code/sys_ucode.c +++ b/src/code/sys_ucode.c @@ -1,8 +1,13 @@ #include "ultra64.h" #include "sys_ucode.h" +#ifndef F3DEX_GBI_PL +u64* sDefaultGSPUCodeText = gspF3DZEX2_NoN_fifoTextStart; +u64* sDefaultGSPUCodeData = gspF3DZEX2_NoN_fifoDataStart; +#else u64* sDefaultGSPUCodeText = gspF3DZEX2_NoN_PosLight_fifoTextStart; u64* sDefaultGSPUCodeData = gspF3DZEX2_NoN_PosLight_fifoDataStart; +#endif u64* SysUcode_GetUCodeBoot(void) { return rspbootTextStart; |