From 3a1bb61493361dd0989e64f908477b9f1781b2e2 Mon Sep 17 00:00:00 2001
From: "Joshua \"Yoshi\" Askharoun" <jjask7@gmail.com>
Date: Mon, 24 Nov 2025 02:42:41 -0600
Subject: [PATCH] Mark INIT instruction as handled

---
 libs/UIX.DecompXml/Decompiler.Script.cs |  3 +++
 test/NOWPLAYINGLAND_decomp.uix          | 12 ------------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/libs/UIX.DecompXml/Decompiler.Script.cs b/libs/UIX.DecompXml/Decompiler.Script.cs
index e197556..76a1bd7 100644
--- a/libs/UIX.DecompXml/Decompiler.Script.cs
+++ b/libs/UIX.DecompXml/Decompiler.Script.cs
@@ -800,6 +800,9 @@ partial class Decompiler
                 stack.Push(Parenthesize(typeCastExpr));
                 break;
 
+            case OpCode.InitializeInstance: // Always handled by ConstructObject
+                return true;
+
             default:
                 return false;
         }
diff --git a/test/NOWPLAYINGLAND_decomp.uix b/test/NOWPLAYINGLAND_decomp.uix
index d848063..f90c4ae 100644
--- a/test/NOWPLAYINGLAND_decomp.uix
+++ b/test/NOWPLAYINGLAND_decomp.uix
@@ -315,8 +315,6 @@ if (SelectionManager.Count != 0)
 {
     if (AddToPlaylistDialog == null)
     {
-        // Unsupported instruction: INIT 649
-        ;
         AddToPlaylistDialog = new playlistDialog:AddToPlaylistDialog();
     }
 
@@ -408,8 +406,6 @@ if (!this.IsQuickMix())
 [DeclareTrigger(Properties.Invoked)]
 if (PropertiesDialog == null)
 {
-    // Unsupported instruction: INIT 636
-    ;
     PropertiesDialog = new libraryDialogs:PropertiesDialog();
 }
 
@@ -432,8 +428,6 @@ foreach (zuneUI:PlaybackTrack track in SelectionManager.SelectedItems)
 [DeclareTrigger(SaveAsPlaylist.Invoked)]
 if (SaveAsPlaylistDialog == null)
 {
-    // Unsupported instruction: INIT 652
-    ;
     SaveAsPlaylistDialog = new playlistDialog:CreatePlaylistDialog();
     SaveAsPlaylistDialog.BaseDefaultPlaylistName = zuneUI:Shell.LoadString(zuneUI:StringId.IDS_NEW_NOWPLAYING_PLAYLIST_NAME);
 }
@@ -497,8 +491,6 @@ if (attachment != null)
 {
     if (MessageComposer == null)
     {
-        // Unsupported instruction: INIT 490
-        ;
         MessageComposer = new socialComposer:MessageComposer();
     }
 
@@ -521,8 +513,6 @@ if (PlayingMusic)
 
     if (AddToFavoritesComposer == null)
     {
-        // Unsupported instruction: INIT 1509
-        ;
         AddToFavoritesComposer = new socialComposer:AddToFavoritesComposer();
     }
 
@@ -1043,8 +1033,6 @@ TrackName.Content = Model.Title;
 [DeclareTrigger(SignInModel.Invoked)]
 if (SignInDialog == null)
 {
-    // Unsupported instruction: INIT 567
-    ;
     SignInDialog = new signInDialog:SignInDialog();
 }