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 /data | |
| 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 'data')
| -rw-r--r-- | data/rsp.rodata.s | 8 | ||||
| -rw-r--r-- | data/rsp.text.s | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/data/rsp.rodata.s b/data/rsp.rodata.s index 6688f7c62..e60c52213 100644 --- a/data/rsp.rodata.s +++ b/data/rsp.rodata.s @@ -13,15 +13,19 @@ glabel aspMainDataStart .incbin "incbin/aspMainData" glabel aspMainDataEnd -#if !PLATFORM_N64 +#ifndef F3DEX_GBI_PL +glabel gspF3DZEX2_NoN_fifoDataStart + .incbin "incbin/gspF3DZEX2_NoN_fifoData" +glabel gspF3DZEX2_NoN_fifoDataEnd +#else glabel gspF3DZEX2_NoN_PosLight_fifoTextStart .incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoText" glabel gspF3DZEX2_NoN_PosLight_fifoTextEnd -#endif glabel gspF3DZEX2_NoN_PosLight_fifoDataStart .incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoData" glabel gspF3DZEX2_NoN_PosLight_fifoDataEnd +#endif glabel gspS2DEX2d_fifoDataStart .incbin "incbin/gspS2DEX2d_fifoData" diff --git a/data/rsp.text.s b/data/rsp.text.s index a40252853..34033443b 100644 --- a/data/rsp.text.s +++ b/data/rsp.text.s @@ -13,10 +13,10 @@ glabel aspMainTextStart .incbin "incbin/aspMainText" glabel aspMainTextEnd -#if PLATFORM_N64 -glabel gspF3DZEX2_NoN_PosLight_fifoTextStart - .incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoText" -glabel gspF3DZEX2_NoN_PosLight_fifoTextEnd +#ifndef F3DEX_GBI_PL +glabel gspF3DZEX2_NoN_fifoTextStart + .incbin "incbin/gspF3DZEX2_NoN_fifoText" +glabel gspF3DZEX2_NoN_fifoTextEnd #endif glabel gspS2DEX2d_fifoTextStart |