Change customHitbox in InteractableObject to s8*

This commit is contained in:
Catobat 2023-04-30 21:58:05 +02:00
parent 5145a6909e
commit 3a7f92e7c7
9 changed files with 13 additions and 13 deletions

View File

@ -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;

View File

@ -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,

View File

@ -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,

View File

@ -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);
}

View File

@ -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;

View File

@ -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,

View File

@ -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[];

View File

@ -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 };

View File

@ -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);
}