Added F3DEX2 2.07 (Rocket: Robot on Wheels)

2026-01-21 10:37:45 -08:00 · 2020-12-19 20:42:36 -05:00
parent dcc6abb8ed
commit 15c5b6eee9
4 changed files with 25 additions and 17 deletions
--- a/14
+++ b/14
@@ -7,6 +7,7 @@ NoN ?= 0
 # Selects which version of a given microcode to build:
 # F3DEX2:
 #  2.08  (Banjo-Tooie, the best game on the N64)
+#  2.07  (Rocket: Robot on Wheels)
 #  2.04H (Kirby 64, Smash 64)
 #  
 # F3DZEX:
@@ -20,14 +21,16 @@ ARMIPS ?= armips
 OUTPUT_DIR ?= ./

 # List of all microcodes buildable with this codebase
-UCODES := F3DEX2_2.08 F3DEX2_2.04H \
-          F3DEX2_NoN_2.08 F3DEX2_NoN_2.04H \
+UCODES := F3DEX2_2.08 F3DEX2_2.07 F3DEX2_2.04H \
+          F3DEX2_NoN_2.08 F3DEX2_NoN_2.07 F3DEX2_NoN_2.04H \
          F3DZEX_2.08J F3DZEX_2.08I F3DZEX_2.06H \
-		  F3DZEX_NoN_2.08J F3DZEX_NoN_2.08I F3DZEX_NoN_2.06H
+		      F3DZEX_NoN_2.08J F3DZEX_NoN_2.08I F3DZEX_NoN_2.06H

 # F3DEX2
 MD5_CODE_F3DEX2_2.08      := 6ccf5fc392e440fb23bc7d7f7d71047c
 MD5_DATA_F3DEX2_2.08      := 3a3a406acb4295d33fa6e918dd3a7ae4
+MD5_CODE_F3DEX2_2.07      := 1523b8e38a9eae698b48909a0c0c0279
+MD5_DATA_F3DEX2_2.07      := 25be72ec04e2e6a23dfa7666645f0662
 MD5_CODE_F3DEX2_NoN_2.08  := b5c366b55a032f232aa309cda21be3d7
 MD5_DATA_F3DEX2_NoN_2.08  := 2c8dedc1b1e2fe6405c9895c4290cf2b
 MD5_CODE_F3DEX2_2.04H     := d3a58568fa7cf042de370912a47c3b5f
@@ -43,8 +46,10 @@ MD5_DATA_F3DZEX_NoN_2.06H := e48c7679f1224b7c0947dcd5a4d0c713
 # Microcode strings
 # F3DEX2
 NAME_F3DEX2_2.08      := RSP Gfx ucode F3DEX       fifo 2.08  Yoshitaka Yasumoto 1999 Nintendo.
+NAME_F3DEX2_2.07      := RSP Gfx ucode F3DEX       fifo 2.07  Yoshitaka Yasumoto 1998 Nintendo.
 NAME_F3DEX2_2.04H     := RSP Gfx ucode F3DEX       fifo 2.04H Yoshitaka Yasumoto 1998 Nintendo.
 NAME_F3DEX2_NoN_2.08  := RSP Gfx ucode F3DEX.NoN   fifo 2.08  Yoshitaka Yasumoto 1999 Nintendo.
+NAME_F3DEX2_NoN_2.07  := RSP Gfx ucode F3DEX.NoN   fifo 2.07  Yoshitaka Yasumoto 1998 Nintendo.
 NAME_F3DEX2_NoN_2.04H := RSP Gfx ucode F3DEX.NoN   fifo 2.04H Yoshitaka Yasumoto 1998 Nintendo.
 # F3DZEX
 NAME_F3DZEX_2.08J     := RSP Gfx ucode F3DZEX.NoN  fifo 2.08J Yoshitaka Yasumoto/Kawasedo 1999.
@@ -56,7 +61,8 @@ NAME_F3DZEX_NoN_2.08I := RSP Gfx ucode F3DZEX.NoN  fifo 2.08I Yoshitaka Yasumoto
 NAME_F3DZEX_NoN_2.06H := RSP Gfx ucode F3DZEX.NoN  fifo 2.06H Yoshitaka Yasumoto 1998 Nintendo.

 ID_F3DEX2_2.04H := 0
-ID_F3DEX2_2.08  := 1
+ID_F3DEX2_2.07  := 1
+ID_F3DEX2_2.08  := 2

 ID_F3DZEX_2.06H := 0
 ID_F3DZEX_2.08I := 1
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@ Matching and (partially) documented disassemblies of the f3dex2/f3dzex N64 RSP m

 Currently matches the following microcodes:
 * F3DEX2 2.08  (Banjo-Tooie)
+* F3DEX2 2.07  (Rocket: Robot on Wheels)
 * F3DEX2 2.04H (Kirby 64, Smash 64)
 * F3DZEX 2.08J (Animal Forest)
 * F3DZEX 2.08I (Majora's Mask)
--- a/f3dex2.s
+++ b/f3dex2.s
@@ -161,6 +161,7 @@ numLights:
 .dw 0x01000BA8
 fogFactor:
 .dw 0x00000000
+textureSettings:
 .dw 0x00000000
 .dw 0x00000000
 geometryModeLabel:
@@ -366,7 +367,7 @@ start:
    lqv $v31[0], 0x01B0(r0)
    lqv $v30[0], 0x01C0(r0)
    li s7, 0x0BA8
-.if !(UCODE_IS_206_OR_OLDER)
+.if !(UCODE_IS_207_OR_OLDER)
    vadd $v1, $v0, $v0
 .endif
    li s6, 0x0D00
@@ -428,9 +429,8 @@ f3dzex_00001130:
    lw k0, lo(OSTask) + OSTask_data_ptr
 load_overlay1_init:
    li t3, overlayInfo1 ; set up loading of overlay 1
-.if !(UCODE_IS_206_OR_OLDER)
-    nop
-.endif
+.align 8
+
    jal load_overlay_and_enter ; load overlay 1 and enter
     move t4, ra ; set up the return address, since load_overlay_and_enter returns to t4
 displaylist_dma: ; loads inputBufferLength bytes worth of displaylist data via DMA into inputBuffer
@@ -474,7 +474,7 @@ G_SPECIAL_1_handler: ; Seems to be a manual trigger for mvp recalculation
 .endif

 G_DMA_IO_handler:
-    jal segmented_to_virtual ; Convert the provided segmented address (in t8) to a virtual one
+    jal segmented_to_physical ; Convert the provided segmented address (in t8) to a virtual one
     lh s4, (inputBufferEnd - 0x07)(k1) ; Get the 16 bits in the middle of the command word (since k1 was already incremented for the next command)
    andi s3, t9, 0x0FF8 ; Mask out any bits in the DRAM address to ensure 8-byte alignment
    ; At this point, s4's highest bit is the flag, it's next 13 bits are the DMEM address, and then it's last two bits are the upper 2 of size
@@ -508,7 +508,7 @@ G_NOOP_handler:
     addi s7, s7, 0x0008        ; Increment the next RDP command pointer by 2 words
 G_SETxIMG_handler:
    li ra, G_RDP_handler        ; Load the RDP command handler into the return address, then fall through to convert the address to virtual
-segmented_to_virtual:
+segmented_to_physical:
    srl t3, t8, 22              ; Copy (segment index << 2) into t3
    andi t3, t3, 0x003C         ; Clear the bottom 2 bits that remained during the shift
    lw t3, lo(segmentTable)(t3) ; Get the current address of the segment
@@ -732,15 +732,15 @@ f3dzex_000014C4:
 f3dzex_000014EC:
    jr s8
     sw sp, 0x03CC
-    nop

+.align 8
 ; Leave room for loading overlay 2 if it is larger than overlay 3 (true for f3dzex)
 .orga max(Overlay2End - Overlay2Address + orga(Overlay3Address), orga())
 Overlay3End:

 G_VTX_handler:
    lhu s4, vtxTableAddress(t9) ; Load the address of the provided vertex array
-    jal segmented_to_virtual ; Convert the vertex array's segmented address (in t8) to a virtual one
+    jal segmented_to_physical ; Convert the vertex array's segmented address (in t8) to a virtual one
     lhu at, (inputBufferEnd - 0x07)(k1) ; Load the size of the vertex array to copy into reg at
    sub s4, s4, at ; Calculate the address to DMA the provided vertices into
    jal dma_read_write ; DMA read the vertices from DRAM
@@ -1398,8 +1398,8 @@ f3dzex_ovl0_00001084:
 break:
    mtc0 t4, SP_STATUS
    break 0
-    nop
-    nop
+     nop
+.align 8
 Overlay0End:

 ; end overlay 0
@@ -1411,7 +1411,7 @@ G_DL_handler:
    lbu at, lo(displayListStackLength) ; Get the DL stack length
    sll v0, t9, 15 ; Shifts the push/nopush value to the highest bit in v0
 f3dzex_ovl1_00001008:
-    jal segmented_to_virtual
+    jal segmented_to_physical
     add v1, k0, k1
    bltz v0, displaylist_dma ; If the operation is nopush (branch) then simply DMA the new displaylist
     move k0, t8 ; Set the
@@ -1421,7 +1421,7 @@ f3dzex_ovl1_00001020:
    j displaylist_dma
     sb at, lo(displayListStackLength)
 G_TEXTURE_handler:
-    li t3, 0x1140
+    li t3, textureSettings + 0xF5C
 G_TEXRECT_handler:
 G_TEXRECTFLIP_handler:
    sw t9, -0x0F5C(t3)
@@ -1504,7 +1504,7 @@ load_mtx:
    add t4, t4, v0       ; Shift the... todo what is going on here exactly?
    sw r0, lo(mvpValid) ; Mark the mvp matrix as out-of-date
 G_MOVEMEM_handler:
-    jal segmented_to_virtual ; convert the memory address (in t8) to a virtual one
+    jal segmented_to_physical ; convert the memory address (in t8) to a virtual one
 do_movemem:
     andi at, t9, 0x00FE                ; Move the movemem table index into at (bits 1-7 of the first command word)
    lbu s3, (inputBufferEnd - 0x07)(k1) ; Move the second byte of the first command word into s3
--- a/rsp/rsp_defs.inc
+++ b/rsp/rsp_defs.inc
@@ -42,4 +42,5 @@ TYPE_F3DZEX equ 1

 UCODE_HAS_POINT_LIGHTING equ (UCODE_TYPE == TYPE_F3DZEX && UCODE_ID >= 1)
 UCODE_IS_206_OR_OLDER equ ((UCODE_TYPE == TYPE_F3DZEX && UCODE_ID < 1) || (UCODE_TYPE == TYPE_F3DEX2 && UCODE_ID < 1))
+UCODE_IS_207_OR_OLDER equ ((UCODE_TYPE == TYPE_F3DZEX && UCODE_ID < 1) || (UCODE_TYPE == TYPE_F3DEX2 && UCODE_ID < 2))
 UCODE_IS_F3DEX2_204H equ (UCODE_TYPE == TYPE_F3DEX2 && UCODE_ID == 0)