Merge remote-tracking branch 'upstream/preview' into gfx-rdp

DragonMinded · Mar 2, 2024 · eeb2a79 · eeb2a79
2 parents 4be19a6 + 5264dc9
commit eeb2a79
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/include/rsp_queue.inc b/include/rsp_queue.inc
@@ -350,6 +350,7 @@ RSPQ_PROFILE_START_TIME:      .long 0
 RSPQ_CURRENT_OVL:             .half 0
 
     .align 4
+    SCRATCH_MEM: # the following 32-bytes can be used by any overlay as temporary scratch-memory
     .ascii "Dragon RSP Queue"
     .ascii "Rasky & Snacchus"
 

diff --git a/src/mempak.c b/src/mempak.c
@@ -868,8 +868,8 @@ int format_mempak( int controller )
     static uint8_t cpakid_array[] = {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00 - 0x07 (0 - 7) */
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08 - 0x0f (8 - 15) */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10 - 0x1f (16 - 23) */
-        0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0xFE, 0xF1  /* 0x20 - 0x2f (24 - 32) */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10 - 0x17 (16 - 23) */
+        0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0xFE, 0xF1  /* 0x18 - 0x1f (24 - 31) */
     };
 
     /* Assign 'random' value to ID */