From 52111b669913db3557216fba26327c6905a44858 Mon Sep 17 00:00:00 2001
From: TakaRikka <takarikka@outlook.com>
Date: Mon, 30 Mar 2026 13:08:29 -0700
Subject: [PATCH] the rest of maddie's flower stuff

---
 src/d/actor/d_flower.inc | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/d/actor/d_flower.inc b/src/d/actor/d_flower.inc
index 0018a79960..3a5a25529a 100644
--- a/src/d/actor/d_flower.inc
+++ b/src/d/actor/d_flower.inc
@@ -5,8 +5,14 @@
 #include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
 #include "SSystem/SComponent/c_counter.h"
 
+#if TARGET_PC
+const u16 l_J_Ohana00_64TEX__width = 64;
+const u16 l_J_Ohana00_64TEX__height = 64;
+#else
 const u16 l_J_Ohana00_64TEX__width = 63;
 const u16 l_J_Ohana00_64TEX__height = 63;
+#endif
+
 #include "assets/l_J_Ohana00_64TEX.h"
 
 static u8 l_flowerPos[708] = {
@@ -72,8 +78,8 @@ static u8 l_flowerNormal[180] = {
     0x46, 0x54, 0x0D, 0x3C, 0x4B, 0xEE, 0x80, 0x3F, 0x7F, 0xF5, 0xF9, 0x3C, 0x49, 0x81, 0xBF,
 };
 
-static u8 l_flowerColor[8] = {
-    0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0xB2, 0xB2, 0xFF,
+static GXColor l_flowerColor[2] = {
+    {0xFF, 0xFF, 0xFF, 0xFF}, {0xB2, 0xB2, 0xB2, 0xFF}
 };
 
 static u8 l_flowerTexCoord[] = {
@@ -108,8 +114,14 @@ l_matDL__d_a_grass(l_J_Ohana00_64TEX)
 #include "assets/l_matLight4DL.h"
 l_matLight4DL(l_J_Ohana00_64TEX)
 
+#if TARGET_PC
+const u16 l_J_Ohana01_64128_0419TEX__width = 64;
+const u16 l_J_Ohana01_64128_0419TEX__height = 128;
+#else
 const u16 l_J_Ohana01_64128_0419TEX__width = 63;
 const u16 l_J_Ohana01_64128_0419TEX__height = 127;
+#endif
+
 #include "assets/l_J_Ohana01_64128_0419TEX.h"
 
 static u8 l_flowerPos2[1224] = {
@@ -213,8 +225,8 @@ static u8 l_flowerNormal2[288] = {
     0x3B, 0x76, 0x7B, 0x1C, 0x3B, 0x99, 0x6B, 0x76, 0x3F, 0x7F, 0xF5, 0xF9, 0xBC, 0x8A, 0x1D, 0xFC,
 };
 
-static u8 l_flowerColor2[8] = {
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0xFF,
+static GXColor l_flowerColor2[2] = {
+    {0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xB2, 0xFF}
 };
 
 static u8 l_flowerTexCoord2[] = {