Put const data in heartContainer

This commit is contained in:
Tal Hayon 2022-04-17 20:44:10 +03:00
parent 1c6bc876b5
commit 4b4372dbd7
5 changed files with 3 additions and 17 deletions

View File

@ -42640,11 +42640,6 @@
"size": 60,
"type": "animation"
},
{
"path": "heartContainer/gUnk_08121C58.bin",
"start": 1186904,
"size": 12
},
{
"path": "animations/gSpriteAnimations_FileScreenObjects_0.bin",
"start": 1187364,

View File

@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08121C58:: @ 08121C58
.incbin "heartContainer/gUnk_08121C58.bin"

View File

@ -1422,7 +1422,6 @@ SECTIONS {
data/animations/object/object45.o(.rodata);
src/object/giantBookLadder.o(.rodata);
src/object/heartContainer.o(.rodata);
data/const/object/heartContainer.o(.rodata);
data/const/object/fileScreenObjects.o(.rodata);
data/animations/object/fileScreenObjects.o(.rodata);
data/const/object/object49.o(.rodata);

View File

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

View File

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