Merge pull request #141 from bloppers/phasemem

P2/phasemem.c: Match SetPhase, ClearPhase
TheOnlyZac · Jan 4, 2025 · 84ec24c · 84ec24c
2 parents fd491c4 + 87a4fcf
commit 84ec24c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/config/sly1.yaml b/config/sly1.yaml
@@ -174,7 +174,8 @@ segments:
     #- [0x, asm, P2/ms]
     #- [0x, asm, P2/murray]
     - [0x917e0, asm, P2/path]
-    - [0x92e70, asm, P2/phasemem]
+    - [0x92e70, c, P2/phasemem]
+    - [0x92ebc, asm, P2/phasemem_padding] # 4 bytes padding to align P2/phasemem
     - [0x92ec0, asm, P2/pipe]
     - [0x93068, asm, P2/pnt]
     - [0x931a8, c, P2/po]
@@ -403,7 +404,7 @@ segments:
     #- [0x, data, P2/murray]
     #- [0x, data, P2/path]
 
-    - [0x16aba4, data, P2/phasemem]
+    - [0x16aba4, .data, P2/phasemem]
     - [0x16aba8, data, P2/pipe]
     - [0x16abac, data]
 

diff --git a/include/phasemem.h b/include/phasemem.h
@@ -6,6 +6,16 @@
 
 #include "common.h"
 
-// ...
+enum PHASE {
+    PHASE_Nil = -1,
+    PHASE_None = 0x0,
+    PHASE_Startup = 0x1,
+    PHASE_Load = 0x2,
+    PHASE_Main = 0x3,
+    PHASE_Mpeg = 0x4,
+    PHASE_Max = 0x5
+};
+
+extern PHASE g_phase;
 
 #endif // PHASEMEM_H
diff --git a/src/P2/phasemem.c b/src/P2/phasemem.c
@@ -0,0 +1,15 @@
+#include <phasemem.h>
+#include <sdk/ee/eekernel.h>
+
+PHASE g_phase = PHASE_None;
+
+void SetPhase(PHASE phase) {
+    if (g_phase != phase) {
+        FlushCache(0);
+        g_phase = phase;
+    }
+}
+
+void ClearPhase(void) {
+    g_phase = PHASE_None;
+}