Backport dawn intro outfit fix from move-handlers

TeamLumi · Jan 18, 2024 · 5c3ce11 · 5c3ce11
1 parent c78456d
commit 5c3ce11
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/mod/features/gender_neutral_boutique.cpp b/src/mod/features/gender_neutral_boutique.cpp
@@ -45,6 +45,10 @@ void exl_gender_neutral_boutique_main() {
     // Remove bike outfit override for battles on cycling road
     using namespace exl::armv8::inst;
     using namespace exl::armv8::reg;
-    exl::patch::CodePatcher p(0x0202f120);
-    p.WriteInst(Movz(X0, 0));
+    exl::patch::CodePatcher p(0);
+    auto inst = nn::vector<exl::patch::Instruction> {
+        { 0x0202f120, Movz(X0, 0) }, // Remove bike outfit override for battles on cycling road
+        { 0x02cf3d38, Movz(W21, 1) }, // Reindex Dawn default outfit for intro
+    };
+    p.WriteInst(inst);
 };