From c44d0dfa2ee0164a01045c4a0dc37545862b28e3 Mon Sep 17 00:00:00 2001
From: Moses_of_Egypt <mosesbobadilla@gmail.com>
Date: Tue, 8 Sep 2026 02:53:00 -0400
Subject: [PATCH 1/2] Make compatible with combo rom

---
 LynnaLib/FileParser.cs | 78 ++++++++++++++++++++++++++++++++++++++----
 LynnaLib/Project.cs    |  2 +-
 2 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/LynnaLib/FileParser.cs b/LynnaLib/FileParser.cs
index c8f4d7b..d8303aa 100644
--- a/LynnaLib/FileParser.cs
+++ b/LynnaLib/FileParser.cs
@@ -516,6 +516,8 @@ void ParseLine(string pureLine, DictionaryLinkedList<InstanceResolver<FileCompon
                             break;
                         }
                     case "m_dungeondata":
+                    case "m_dungeondata_ages":
+                    case "m_dungeondata_seasons":
                         {
                             if (!(fTokens.Count == 9))
                             {
@@ -673,11 +675,13 @@ void ParseLine(string pureLine, DictionaryLinkedList<InstanceResolver<FileCompon
                 // Check if we're currently skipping over stuff because of .ifdefs
                 if (ifdefCondition == false)
                 {
-                    if (tokens[0].ToLower() == ".ifdef" || tokens[0].ToLower() == ".ifndef")
+                    if (tokens[0].ToLower() == ".ifdef" || tokens[0].ToLower() == ".ifndef" ||
+                        tokens[0].ToLower() == ".if")
                     {
                         ifdefDepth++;
                     }
-                    else if (tokens[0].ToLower() == ".else" && failedIfdefDepth == ifdefDepth - 1)
+                    else if ((tokens[0].ToLower() == ".else" || tokens[0].ToLower() == ".elif") &&
+                             failedIfdefDepth == ifdefDepth - 1)
                     {
                         ifdefCondition = true;
                     }
@@ -782,6 +786,64 @@ void ParseLine(string pureLine, DictionaryLinkedList<InstanceResolver<FileCompon
                             break;
                         }
 
+                    case ".if":
+                    case ".elif":
+                        {
+                            bool definedConditionFound = false;
+                            bool definedCondition = false;
+                            bool logicalOr = true;
+                            for (int j = 1; j < tokens.Count; j++)
+                            {
+                                if (tokens[j] == "&&") {
+                                    logicalOr = false;
+                                    j++;
+                                }
+                                else if (tokens[j] == "||") 
+                                {
+                                    logicalOr = true;
+                                    j++;
+                                }
+
+                                if (tokens[j].StartsWith("defined", StringComparison.CurrentCultureIgnoreCase) ||
+                                    tokens[j].StartsWith("!defined", StringComparison.CurrentCultureIgnoreCase))
+                                {
+                                    if (tokens[j].Contains('(') && tokens[j].Contains(')')) {
+                                        definedConditionFound = true;
+
+                                        bool negate = tokens[j].StartsWith('!');
+                                        string tokenName = tokens[j].Split("(", 2)[1].TrimEnd(')');
+
+                                        bool exists = Project.GetDefinition(tokenName) != null;
+                                        if (negate) exists = !exists;
+                                        if (logicalOr)
+                                        {
+                                            definedCondition = definedCondition || exists;
+                                        }
+                                        else 
+                                        {
+                                            definedCondition = definedCondition && exists;
+                                        }
+                                    }
+                                }
+                            }
+
+                            if (definedConditionFound) {
+                                ifdefDepth++;
+                                if (definedCondition)
+                                {
+                                    ifdefCondition = true;
+                                }
+                                else
+                                {
+                                    ifdefCondition = false;
+                                    failedIfdefDepth = ifdefDepth - 1;
+                                }
+                                break;
+                            }
+                            // fall through if the matching failed
+                            goto default;
+                        }
+
                     case ".ifdef":
                         if (tokens.Count < 2)
                         {
@@ -856,11 +918,11 @@ void ParseLine(string pureLine, DictionaryLinkedList<InstanceResolver<FileCompon
                                 if (tokens[0][tokens[0].Length - 1] == ':')
                                     s = tokens[0].Substring(0, tokens[0].Length - 1);
 
-                                if (s[0] == '@')
+                                /*if (s[0] == '@')
                                 {
                                     log.Info(warningString + "Ignoring label '" + s + "': child labels not supported.");
                                     break;
-                                }
+                                }*/
 
                                 FileComponent addedComponent;
                                 if (context == "RAMSECTION" || context == "ENUM")
@@ -943,8 +1005,12 @@ void AddDefinition(string def, string value, bool replace = false)
         void AddLabelToDictionaries(Label label)
         {
             // See above note about RecordChange().
-            LabelDictionary.Add(label.Name, new(label));
-            Project.AddLabel(label.Name, this);
+            if (!(label.Name.StartsWith('@') && LabelDictionary.ContainsKey(label.Name))) {
+                LabelDictionary.Add(label.Name, new(label));
+            }
+            if (!(label.Name.StartsWith('@') && Project.HasLabel(label.Name))) {
+                Project.AddLabel(label.Name, this);
+            }
         }
 
         public Label GetLabel(string labelStr)
diff --git a/LynnaLib/Project.cs b/LynnaLib/Project.cs
index e1beac5..74b4117 100644
--- a/LynnaLib/Project.cs
+++ b/LynnaLib/Project.cs
@@ -659,7 +659,7 @@ void VisitDirectoriesRecursively(string directory, Action<string> action)
             string ignoreDirectory = (GameString == "ages" ? "seasons" : "ages");
             foreach (string d in Helper.GetSortedDirectories(baseDirectory + directory))
             {
-                if (d == ignoreDirectory)
+                if (d == ignoreDirectory || d == "combo")
                     continue;
                 VisitDirectoriesRecursively(directory + d, action);
             }

From 64816435b4736feb503a755c44466334b2015878 Mon Sep 17 00:00:00 2001
From: Moses_of_Egypt <mosesbobadilla@gmail.com>
Date: Thu, 10 Sep 2026 00:57:43 -0400
Subject: [PATCH 2/2] Add ability to build combo rom

---
 LynnaLab/src/BuildDialog.cs    | 9 ++++++---
 LynnaLab/src/GlobalConfig.cs   | 1 +
 LynnaLab/src/SettingsDialog.cs | 3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/LynnaLab/src/BuildDialog.cs b/LynnaLab/src/BuildDialog.cs
index 6a6f16c..ab57881 100644
--- a/LynnaLab/src/BuildDialog.cs
+++ b/LynnaLab/src/BuildDialog.cs
@@ -205,6 +205,9 @@ void OnMakeExited(object sender, object args)
     {
         Helper.MainThreadInvoke(OnMakeExitedBody);
     }
+    string GameString { get { 
+        return Top.GlobalConfig.BuildComboRom ? "combo" : Project.GameString;
+    }}
 
     void OnMakeExitedBody()
     {
@@ -233,14 +236,14 @@ void OnMakeExitedBody()
             "Select Emulator",
             () =>
             {
-                ImGui.Text($"Your gameboy emulator path has not been configured.\nSelect your emulator executable file now to run {Project.GameString}.gbc.");
+                ImGui.Text($"Your gameboy emulator path has not been configured.\nSelect your emulator executable file now to run {GameString}.gbc.");
                 if (ImGui.Button("OK"))
                 {
                     SelectEmulatorDialog((runCommand) =>
                     {
                         if (runCommand == null)
                         {
-                            processView.AppendText($"Emulator not configured, couldn't run {Project.GameString}.gbc.", "error");
+                            processView.AppendText($"Emulator not configured, couldn't run {GameString}.gbc.", "error");
                         }
                         else
                         {
@@ -303,7 +306,7 @@ void RunGame(string runCommand)
 
     (string, string) SubstituteString(string s)
     {
-        s = s.Replace("{GAME}", Project.GameString);
+        s = s.Replace("{GAME}", GameString);
 
         // Old format: space separator
         if (!s.Contains("|"))
diff --git a/LynnaLab/src/GlobalConfig.cs b/LynnaLab/src/GlobalConfig.cs
index c72612a..b8c0783 100644
--- a/LynnaLab/src/GlobalConfig.cs
+++ b/LynnaLab/src/GlobalConfig.cs
@@ -115,4 +115,5 @@ public void Save()
     // Other
     public bool AutoAdjustGroupNumber { get; set; } = true;
     public bool ScrollToZoom { get; set; } = true;
+    public bool BuildComboRom { get; set; } = true;
 }
diff --git a/LynnaLab/src/SettingsDialog.cs b/LynnaLab/src/SettingsDialog.cs
index ba33dd7..c389062 100644
--- a/LynnaLab/src/SettingsDialog.cs
+++ b/LynnaLab/src/SettingsDialog.cs
@@ -215,6 +215,9 @@ public override void Render()
             ImGuiX.Checkbox("Scroll to Zoom", new Accessor<bool>(() => GlobalConfig.ScrollToZoom));
             ImGuiX.TooltipOnHover("Applies to minimaps, scratchpad, and tileset editor.");
 
+            ImGuiX.Checkbox("Build Combo ROM", new Accessor<bool>(() => GlobalConfig.BuildComboRom));
+            ImGuiX.TooltipOnHover("The built ROM will contain both games.");
+
             endSection();
         }