From 3a7f92e7c75c4cdc6ef1ee788d743a87deaebcc6 Mon Sep 17 00:00:00 2001
From: Catobat <69204835+Catobat@users.noreply.github.com>
Date: Sun, 30 Apr 2023 21:58:05 +0200
Subject: [PATCH] Change customHitbox in InteractableObject to s8*

---
 include/structures.h      |  2 +-
 src/npc/drLeft.c          |  2 +-
 src/npc/mayorHagen.c      |  2 +-
 src/npc/rem.c             |  2 +-
 src/npc/smallTownMinish.c |  2 +-
 src/npc/smith.c           |  2 +-
 src/npc/stockwell.c       |  2 +-
 src/npc/townMinish.c      | 10 +++++-----
 src/object/windcrest.c    |  2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/structures.h b/include/structures.h
index 2560d32a..acebef3e 100644
--- a/include/structures.h
+++ b/include/structures.h
@@ -263,7 +263,7 @@ typedef struct {
     /*0x01*/ u8 type;
     /*0x02*/ u8 interactDirections; /* lower 4 bits determine Link's allowed facing directions to interact, 0 to allow (0000WSEN) */
     /*0x03*/ u8 kinstoneId;
-    /*0x04*/ const u8* customHitbox; /* if set, array contains x, y, width and height */
+    /*0x04*/ const s8* customHitbox; /* if set, array contains x, y, width and height */
     /*0x08*/ Entity* entity;
 } InteractableObject;
 
diff --git a/src/npc/drLeft.c b/src/npc/drLeft.c
index f8398668..37f1b0e0 100644
--- a/src/npc/drLeft.c
+++ b/src/npc/drLeft.c
@@ -77,7 +77,7 @@ void sub_0806C038(Entity* this) {
 }
 
 void sub_0806C09C(Entity* this) {
-    static const u8 gUnk_081133B4[] = {
+    static const s8 gUnk_081133B4[] = {
         0,
         6,
         8,
diff --git a/src/npc/mayorHagen.c b/src/npc/mayorHagen.c
index f2d8b0ee..01156ff0 100644
--- a/src/npc/mayorHagen.c
+++ b/src/npc/mayorHagen.c
@@ -38,7 +38,7 @@ void MayorHagen(Entity* this) {
 }
 
 void MayorHagen_MakeInteractable(Entity* this) {
-    static const u8 gUnk_08113F44[] = {
+    static const s8 gUnk_08113F44[] = {
         0,
         8,
         8,
diff --git a/src/npc/rem.c b/src/npc/rem.c
index b9b5f61e..6ea7e751 100644
--- a/src/npc/rem.c
+++ b/src/npc/rem.c
@@ -329,7 +329,7 @@ void sub_0806A914(Entity* this) {
 }
 
 void Rem_MakeInteractable(Entity* this) {
-    static const u8 gUnk_0811229C[] = { 0, 6, 10, 16 };
+    static const s8 gUnk_0811229C[] = { 0, 6, 10, 16 };
     AddInteractableWhenBigObject(this);
     SetInteractableObjectCollision(this, 0, 0, &gUnk_0811229C);
 }
diff --git a/src/npc/smallTownMinish.c b/src/npc/smallTownMinish.c
index 7c35917d..8b69b4ff 100644
--- a/src/npc/smallTownMinish.c
+++ b/src/npc/smallTownMinish.c
@@ -9,7 +9,7 @@
 
 void SmallTownMinish(Entity* this) {
     static const Hitbox gUnk_081142FC = { -2, 1, { 0, 0, 0, 0 }, 6, 6 };
-    static const u8 gUnk_08114304[] = { -2, 1, 6, 6 };
+    static const s8 gUnk_08114304[] = { -2, 1, 6, 6 };
     if (this->action == 0) {
         this->action++;
         this->hitbox = (Hitbox*)&gUnk_081142FC;
diff --git a/src/npc/smith.c b/src/npc/smith.c
index df3bf7c4..745acc7e 100644
--- a/src/npc/smith.c
+++ b/src/npc/smith.c
@@ -206,7 +206,7 @@ void sub_08066258(void) {
 }
 
 void Smith_ChangeInteractableHitbox(Entity* this) {
-    static const u8 gUnk_081103E0[] = {
+    static const s8 gUnk_081103E0[] = {
         0,
         6,
         8,
diff --git a/src/npc/stockwell.c b/src/npc/stockwell.c
index b3480117..cef0a8a1 100644
--- a/src/npc/stockwell.c
+++ b/src/npc/stockwell.c
@@ -9,7 +9,7 @@
 #include "game.h"
 
 #ifndef EU
-static const u8 gUnk_0810FDA0[] = { 0, 8, 10, 16 };
+static const s8 gUnk_0810FDA0[] = { 0, 8, 10, 16 };
 #endif
 
 extern u16 script_StockwellBuy[];
diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c
index 6cf3aa45..3dc58b06 100644
--- a/src/npc/townMinish.c
+++ b/src/npc/townMinish.c
@@ -129,11 +129,11 @@ static const SpriteLoadData gUnk_08112674[][4] = {
         { 0x0, 0x0, 0x0 },
     },
 };
-static const u8 gUnk_081126D4[][4] = {
-    { 0x0, 0x8, 0x8, 0x10 },
-    { 0xf8, 0xfe, 0x10, 0x8 },
-    { 0x0, 0x8, 0x8, 0x10 },
-    { 0x8, 0xfe, 0x10, 0x8 },
+static const s8 gUnk_081126D4[][4] = {
+    { 0, 8, 8, 16 },
+    { -8, -2, 16, 8 },
+    { 0, 8, 8, 16 },
+    { 8, -2, 16, 8 },
 };
 static const u8 gUnk_081126E4[4] = { 14, 13, 11, 7 };
 
diff --git a/src/object/windcrest.c b/src/object/windcrest.c
index e552126d..07802edb 100644
--- a/src/object/windcrest.c
+++ b/src/object/windcrest.c
@@ -23,7 +23,7 @@ void Windcrest(Entity* this) {
 }
 
 void Windcrest_ChangeInteractableHitbox(Entity* this) {
-    static const u8 gUnk_08125010[] = { 0, 0, 12, 12 };
+    static const s8 gUnk_08125010[] = { 0, 0, 12, 12 };
     SetInteractableObjectCollision(this, 1, 0xe, gUnk_08125010);
 }