From d0a6fa54a046ed86d5cd0489cf6166cab33da4fd Mon Sep 17 00:00:00 2001
From: gamemasterplc <gamemasterplc@gmail.com>
Date: Sat, 16 Nov 2024 12:20:08 -0600
Subject: [PATCH] Match w06Dll/fire.c in PAL

---
 configure.py          |  2 +-
 src/REL/w06Dll/fire.c | 31 +++++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/configure.py b/configure.py
index a57a1e7b..7eb2a1e6 100644
--- a/configure.py
+++ b/configure.py
@@ -1510,7 +1510,7 @@ config.libs = [
             Object(Matching, "REL/w06Dll/main.c"),
             Object(Matching, "REL/w06Dll/mg_item.c"),
             Object(Matching, "REL/w06Dll/mg_coin.c"),
-            Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w06Dll/fire.c"),
+            Object(Matching, "REL/w06Dll/fire.c"),
             Object(Matching, "REL/w06Dll/bridge.c"),
             Object(Matching, "REL/w06Dll/bowser.c"),
         },
diff --git a/src/REL/w06Dll/fire.c b/src/REL/w06Dll/fire.c
index 2fcc6899..f9fb964b 100755
--- a/src/REL/w06Dll/fire.c
+++ b/src/REL/w06Dll/fire.c
@@ -49,6 +49,24 @@ static s16 lbl_1_data_22A = -1;
 static s16 lbl_1_data_22C = -1;
 static s16 lbl_1_data_22E = -1;
 
+#if VERSION_PAL
+static s32 lbl_1_data_230[] = {
+    MAKE_MESSID(8, 0),
+    MAKE_MESSID(8, 1),
+    MAKE_MESSID(8, 2),
+    MAKE_MESSID(8, 3),
+    MAKE_MESSID(8, 4),
+    MAKE_MESSID(8, 5),
+    MAKE_MESSID(8, 6),
+    MAKE_MESSID(8, 7),
+    MAKE_MESSID(8, 8),
+    MAKE_MESSID(8, 9),
+    MAKE_MESSID(8, 10),
+    MAKE_MESSID(8, 11),
+    MAKE_MESSID(8, 12),
+    MAKE_MESSID(8, 13)
+};
+#else
 static s32 lbl_1_data_230[] = {
     MAKE_MESSID(8, 14),
     MAKE_MESSID(8, 15),
@@ -65,7 +83,7 @@ static s32 lbl_1_data_230[] = {
     MAKE_MESSID(8, 26),
     MAKE_MESSID(8, 27)
 };
-
+#endif
 void fn_1_6EF0(void) {
     BoardRollDispSet(0);
     lbl_1_bss_90 = HuPrcChildCreate(fn_1_6F80, 0x2003, 0x3800, 0, boardMainProc);
@@ -203,9 +221,12 @@ static void fn_1_74BC(s32 arg0) {
 static void fn_1_7574(void) {
     s32 temp_r3;
     s32 temp_r29;
+    #if VERSION_PAL
+    s32 playerNo = GWSystem.player_curr;
+    #endif
     s32 temp_r28;
     s32 i;
-
+    
     for (i = 0; i < 4; i++) {
         if (lbl_1_bss_C2[i] == 0) {
             continue;
@@ -218,11 +239,17 @@ static void fn_1_7574(void) {
             BoardWinCreate(0, MAKE_MESSID(48, 16), -1);
             BoardWinInsertMesSet(temp_r28, 0);
             BoardWinInsertMesSet(lbl_1_data_230[temp_r29], 1);
+            #if VERSION_PAL
+            GWSystem.player_curr = i;
+            #endif
             BoardWinPlayerSet(i);
             BoardWinWait();
             BoardWinKill();
         }
     }
+    #if VERSION_PAL
+    GWSystem.player_curr = playerNo;
+    #endif
 }
 
 static void fn_1_7674(s32 arg0) {