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 pot

This commit is contained in:
Tal Hayon 2022-04-16 23:43:38 +03:00
parent cec735cee2
commit 11bb972c8e
3 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
data/const/object/pot.s
View File

@ -1,30 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0811F090:: @ 0811F090
.4byte sub_0808222C
.4byte sub_08082310
.4byte sub_080824F8
.4byte sub_080826E4
.4byte sub_08082614
.4byte sub_08082824
gUnk_0811F0A8:: @ 0811F0A8
.4byte sub_08082510
.4byte nullsub_511
.4byte sub_08082588
.4byte sub_0808259C
.4byte sub_080825E8
.4byte sub_080825F0
.4byte sub_08082608
gUnk_0811F0C4:: @ 0811F0C4
.4byte sub_080826FC
.4byte sub_0808270C
.4byte sub_08082778
.4byte sub_080827F8
.4byte nullsub_512
.4byte sub_08082818

2
linker.ld
View File

@ -1332,7 +1332,7 @@ SECTIONS {
src/object/button.o(.rodata);
src/object/minishEmoticon.o(.rodata);
data/animations/object/minishEmoticon.o(.rodata);
data/const/object/pot.o(.rodata);
src/object/pot.o(.rodata);
data/animations/object/pot.o(.rodata);
src/object/ezloCap.o(.rodata);
data/animations/object/ezloCap.o(.rodata);

38
src/object/pot.c
View File

@ -11,16 +11,34 @@
void sub_08082824(Entity*);
static void sub_08082850(Entity*, Entity*);
void sub_08082608(Entity*);
extern void (*const gUnk_0811F090[])(Entity*);
extern void (*const gUnk_0811F0A8[])(Entity*);
extern void (*const gUnk_0811F0C4[])(Entity*);
void sub_0808222C(Entity*);
void sub_08082310(Entity*);
void sub_080824F8(Entity*);
void sub_080826E4(Entity*);
void sub_08082614(Entity*);
void sub_08082824(Entity*);
void sub_08082510(Entity*);
void nullsub_511(Entity*);
void sub_08082588(Entity*);
void sub_0808259C(Entity*);
void sub_080825E8(Entity*);
void sub_080825F0(Entity*);
void sub_08082608(Entity*);
void sub_08082818(Entity*);
void nullsub_512(Entity*);
void sub_080827F8(Entity*);
void sub_08082778(Entity*);
void sub_0808270C(Entity*);
void sub_080826FC(Entity*);
extern void RegisterCarryEntity(Entity*);
extern void sub_08016A6C(Entity*);
void Pot(Entity* this) {
gUnk_0811F090[this->action](this);
static void (*const actionFuncs[])(Entity*) = {
sub_0808222C, sub_08082310, sub_080824F8, sub_080826E4, sub_08082614, sub_08082824,
};
actionFuncs[this->action](this);
this->contactFlags = 0;
}
@ -111,7 +129,10 @@ void sub_08082310(Entity* this) {
}
void sub_080824F8(Entity* this) {
gUnk_0811F0A8[this->subAction](this);
static void (*const subActionFuncs[])(Entity*) = {
sub_08082510, nullsub_511, sub_08082588, sub_0808259C, sub_080825E8, sub_080825F0, sub_08082608,
};
subActionFuncs[this->subAction](this);
}
void sub_08082510(Entity* this) {
@ -200,7 +221,10 @@ void sub_08082614(Entity* this) {
}
void sub_080826E4(Entity* this) {
gUnk_0811F0C4[this->subAction](this);
static void (*const subActionFuncs[])(Entity*) = {
sub_080826FC, sub_0808270C, sub_08082778, sub_080827F8, nullsub_512, sub_08082818,
};
subActionFuncs[this->subAction](this);
}
void sub_080826FC(Entity* this) {