From f38b962a5844502889ec00a98d0c9ed2a1151695 Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Thu, 17 Sep 2026 10:05:55 -0400
Subject: demo d_file_error OK, fmap/fmap2 work, misc (#1208)

* d_file_error OK, use J2DPane inlines everywhere

* d_menu_fmap demo work

* fmap and fmap2 work

* fix demo regression with ternary fakematch

* inline cleanup, f_pc_profile OK for demo

* fix min/max bss order

* lstair almost for demo
---
 src/f_pc/f_pc_node_req.cpp | 20 +++++++++++++++-----
 src/f_pc/f_pc_profile.cpp  |  3 ++-
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'src/f_pc')

diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp
index 912deaf4..18c0a985 100644
--- a/src/f_pc/f_pc_node_req.cpp
+++ b/src/f_pc/f_pc_node_req.cpp
@@ -164,7 +164,7 @@ s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) {
     currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead;
     while (currentNode != NULL) {
         currentNdCr = currentNode->mNodeCrReq;
-        if ((currentNdCr->mParameter == 2 || currentNdCr->mParameter == 4 || currentNdCr->mParameter == 1) && currentNdCr->mNodeProc.mProcId == bsPcId)
+        if ((currentNdCr->mParameter == 2 || currentNdCr->mParameter == DEMO_SELECT(3, 4) || currentNdCr->mParameter == 1) && currentNdCr->mNodeProc.mProcId == bsPcId)
             return 0;
         currentNode = (request_node_class*)NODE_GET_NEXT((&currentNode->base));
     }
@@ -189,9 +189,19 @@ s32 fpcNdRq_IsIng(process_node_class* i_procNode) {
 /* 8003F774-8003F8EC       .text fpcNdRq_Create__FUl */
 node_create_request* fpcNdRq_Create(u32 i_requestSize) {
     static node_create_request clear = {
-        NULL, NULL,       NULL, NULL,       0,      NULL, NULL,   NULL, NULL,
-        0,    NULL,       NULL, NULL,       0,      0,    NULL,   5,    0xFFFFFFFF,
-        NULL, 0xFFFFFFFE, NULL, 0xFFFFFFFE, 0x7FFF, NULL, 0x7FFF,
+        /* mCreateTag        */ NULL, NULL, NULL, NULL, 0,
+        /* mProcMthCls       */ NULL, NULL, NULL, NULL, 0, NULL, NULL,
+        /* mReqPhsProc       */ NULL, 0,
+        /* mpPhsHandler      */ NULL,
+        /* mpNodeCrReqMthCls */ NULL,
+        /* mParameter        */ DEMO_SELECT(4, 5),
+        /* mRequestId        */ 0xFFFFFFFF,
+        /* mNodeProc         */ NULL, 0xFFFFFFFE,
+        /* mpLayerClass      */ NULL,
+        /* mCreatingID       */ 0xFFFFFFFE,
+        /* mProcName         */ fpcNm_INVALID_e,
+        /* mpUserData        */ NULL,
+        /* unk_0x60          */ 0x7FFF,
     };
 
     node_create_request* req = (node_create_request*)cMl::memalignB(-4, i_requestSize);
@@ -299,7 +309,7 @@ node_create_request* fpcNdRq_Request(u32 i_requestSize, int i_reqType,
     case 2:
         req = fpcNdRq_ChangeNode(i_requestSize, i_procNode, i_procName, i_data);
         break;
-    case 4:
+    case DEMO_SELECT(3, 4):
         break;
     }
 
diff --git a/src/f_pc/f_pc_profile.cpp b/src/f_pc/f_pc_profile.cpp
index cd1f5c2e..792b2a79 100644
--- a/src/f_pc/f_pc_profile.cpp
+++ b/src/f_pc/f_pc_profile.cpp
@@ -9,5 +9,6 @@ process_profile_definition** g_fpcPf_ProfileList_p;
 
 /* 8004003C-80040050       .text fpcPf_Get__Fs */
 process_profile_definition* fpcPf_Get(s16 i_profName) {
-    return g_fpcPf_ProfileList_p[i_profName];
+    int profName = i_profName;
+    return g_fpcPf_ProfileList_p[profName];
 }
-- 
cgit v1.2.3