summaryrefslogtreecommitdiff
path: root/src/object
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2022-04-17 20:44:10 +0300
committerTal Hayon <talhayon1@gmail.com>2022-04-17 20:44:10 +0300
commit4b4372dbd7c7d966246020cedf43ed4b28f75bcd (patch)
treec99ed8710b39a239d3f601aa02596ed6b26ee12d /src/object
parent1c6bc876b5fd15d3703954a50acab9169c7562f9 (diff)
Put const data in heartContainer
Diffstat (limited to 'src/object')
-rw-r--r--src/object/heartContainer.c4
-rw-r--r--src/object/object30.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/object/heartContainer.c b/src/object/heartContainer.c
index b195e6f6..9d02d53f 100644
--- a/src/object/heartContainer.c
+++ b/src/object/heartContainer.c
@@ -17,7 +17,7 @@ static void (*const gHeartContainerActions[])(Entity*) = {
sub_0808E764,
};
-extern Hitbox gUnk_08121C58;
+const Hitbox3D gUnk_08121C58 = { 0, -3, { 5, 3, 3, 5 }, 6, 6, 12, {} };
void HeartContainer(Entity* this) {
gHeartContainerActions[this->action](this);
@@ -30,7 +30,7 @@ static void sub_0808E6A0(Entity* this) {
this->action = 1;
this->type = 0x62;
this->spriteSettings.draw = 0;
- this->hitbox = &gUnk_08121C58;
+ this->hitbox = (Hitbox*)&gUnk_08121C58;
this->collisionLayer = 3;
this->updatePriority = PRIO_NO_BLOCK;
}
diff --git a/src/object/object30.c b/src/object/object30.c
index 6a999eb3..6ebc3d4f 100644
--- a/src/object/object30.c
+++ b/src/object/object30.c
@@ -21,7 +21,7 @@ typedef struct {
} Object30Entity;
extern u32 sub_0806F798(Entity*);
-extern const Hitbox gUnk_08121C58;
+extern const Hitbox3D gUnk_08121C58;
void Object30_Init(Object30Entity*);
void Object30_Action1(Object30Entity*);