falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Put const data in minishSizedEntrance

This commit is contained in:
Tal Hayon 2022-04-18 00:15:15 +03:00
parent cd4fdf40cb
commit de1df01c43
4 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/assets.json
View File

@ -42664,11 +42664,6 @@
"size": 4, "size": 4,
"type": "animation" "type": "animation"
}, },
{
"path": "minishSizedEntrance/gUnk_0812225C.bin",
"start": 1188444,
"size": 8
},
{ {
"path": "animations/gSpriteAnimations_PullableLever_0.bin", "path": "animations/gSpriteAnimations_PullableLever_0.bin",
"start": 1188548, "start": 1188548,

12
data/const/object/minishSizedEntrance.s
View File

@ -1,12 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08122254:: @ 08122254
.4byte sub_08090EC0
.4byte sub_08090F00
gUnk_0812225C:: @ 0812225C
.incbin "minishSizedEntrance/gUnk_0812225C.bin"

2
linker.ld
View File

@ -1429,7 +1429,7 @@ SECTIONS {
src/object/object4B.o(.rodata); src/object/object4B.o(.rodata);
src/object/pushableFurniture.o(.rodata); src/object/pushableFurniture.o(.rodata);
src/object/furniture.o(.rodata); src/object/furniture.o(.rodata);
data/const/object/minishSizedEntrance.o(.rodata); src/object/minishSizedEntrance.o(.rodata);
data/animations/object/minishSizedEntrance.o(.rodata); data/animations/object/minishSizedEntrance.o(.rodata);
src/object/giantRock2.o(.rodata); src/object/giantRock2.o(.rodata);
src/object/object53.o(.rodata); src/object/object53.o(.rodata);

16
src/object/minishSizedEntrance.c
View File

@ -2,11 +2,15 @@
#include "game.h" #include "game.h"
#include "functions.h" #include "functions.h"
extern void (*const gUnk_08122254[])(Entity*); void sub_08090F00(Entity*);
extern u16 gUnk_0812225C[]; void sub_08090EC0(Entity*);
void MinishSizedEntrance(Entity* this) { void MinishSizedEntrance(Entity* this) {
gUnk_08122254[this->action](this); static void (*const actionFuncs[])(Entity*) = {
sub_08090EC0,
sub_08090F00,
};
actionFuncs[this->action](this);
} }
void sub_08090EC0(Entity* this) { void sub_08090EC0(Entity* this) {
@ -22,6 +26,12 @@ void sub_08090EC0(Entity* this) {
} }
void sub_08090F00(Entity* this) { void sub_08090F00(Entity* this) {
static const u16 gUnk_0812225C[] = {
0x400,
0x100,
0x800,
0x200,
};
if (this->type == 1) { if (this->type == 1) {
Entity* parent = this->parent; Entity* parent = this->parent;
u32 mask = 1 << this->subtimer; u32 mask = 1 << this->subtimer;