From e755148f1673b23d41016fa58def537b2e3a9ddf Mon Sep 17 00:00:00 2001
From: MelonSpeedruns <melonspeedruns@outlook.com>
Date: Sat, 25 Apr 2026 16:59:04 -0400
Subject: [PATCH] Fix some UBs (#544)

Co-authored-by: MelonSpeedruns <melonspeedruns@stratobox.net>
---
 src/d/actor/d_a_alink.cpp | 5 +++++
 src/d/actor/d_flower.inc  | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp
index 4fea05cd53..28c979bab4 100644
--- a/src/d/actor/d_a_alink.cpp
+++ b/src/d/actor/d_a_alink.cpp
@@ -5877,6 +5877,11 @@ void daAlink_c::setItemMatrix(int param_0) {
     modelCalc(mSheathModel);
 
     int var_r26;
+
+    #if AVOID_UB
+    var_r26 = 0;
+    #endif
+
     if (!checkNoResetFlg3(FLG3_UNK_4000000)) {
         if (mEquipItem == 0x103 || param_0 != 0) {
             mSwordModel->setBaseTRMtx(mpLinkModel->getAnmMtx(mLeftItemJntNo));
diff --git a/src/d/actor/d_flower.inc b/src/d/actor/d_flower.inc
index 58daa354a1..1850e1e1ad 100644
--- a/src/d/actor/d_flower.inc
+++ b/src/d/actor/d_flower.inc
@@ -789,6 +789,10 @@ void dFlower_packet_c::draw() {
 
                 GXColor sp28;
 
+                #if AVOID_UB
+                sp28 = {1, 1, 1, 1};
+                #endif
+
                 //u8 sp26, sp25, sp24;
                 GXColor sp24;
                 sp24.r = -0.4f * temp_r29->AmbCol.r * var_f29;