From e12ce49178c1a9dd7b0ec978e3ebfc98350770a0 Mon Sep 17 00:00:00 2001
From: Snesrev <snesrev@protonmail.com>
Date: Tue, 4 Apr 2023 03:48:48 +0200
Subject: [PATCH] Maridia puffer bug

---
 src/sm_a8.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/sm_a8.c b/src/sm_a8.c
index 3a0d596..2c80213 100644
--- a/src/sm_a8.c
+++ b/src/sm_a8.c
@@ -3243,8 +3243,7 @@ void MaridiaPuffer_Func_6(void) {  // 0xA8D9DB
   uint32 t = ((Abs16(r18) & 0xFF00) >> 8) * E->mpr_var_D;
   if (R26)
     t = -(int32)t;
-  t = t + E->base.x_subpos;
-  E->base.x_subpos = t, E->base.x_pos = t >> 16;
+  AddToHiLo(&E->base.x_pos, &E->base.x_subpos, t);
 }
 
 void MaridiaPuffer_Func_7(void) {  // 0xA8DA28
@@ -3256,8 +3255,7 @@ void MaridiaPuffer_Func_7(void) {  // 0xA8DA28
   uint32 t = ((Abs16(r18) & 0xFF00) >> 8) * E->mpr_var_D;
   if (R26)
     t = -(int32)t;
-  t = t + E->base.y_subpos;
-  E->base.y_subpos = t, E->base.y_pos = t >> 16;
+  AddToHiLo(&E->base.y_pos, &E->base.y_subpos, t);
 }
 
 void MaridiaPuffer_Func_8(uint16 k) {  // 0xA8DA71