Put const data in object86

This commit is contained in:
Tal Hayon 2022-04-18 00:40:47 +03:00
parent 9557443a85
commit 6de7b5c333
3 changed files with 10 additions and 16 deletions

View File

@ -1,12 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081237F8:: @ 081237F8
.4byte sub_08099DD0
.4byte sub_08099E10
.4byte sub_08099E58
.4byte sub_08099E8C
.4byte nullsub_534

View File

@ -1495,7 +1495,7 @@ SECTIONS {
data/animations/object/smallIceBlock.o(.rodata);
src/object/bigIceBlock.o(.rodata);
data/animations/object/bigIceBlock.o(.rodata);
data/const/object/object86.o(.rodata);
src/object/object86.o(.rodata);
data/animations/object/object86.o(.rodata);
src/object/octorokBossObject.o(.rodata);
src/object/macroBook.o(.rodata);

View File

@ -2,12 +2,18 @@
#include "item.h"
void sub_08099ECC(Entity*);
void sub_08099DD0(Entity*);
void sub_08099E10(Entity*);
void sub_08099E58(Entity*);
void sub_08099E8C(Entity*);
void nullsub_534(Entity*);
extern void sub_0805B390(u32);
extern void (*const gUnk_081237F8[])(Entity*);
void Object86(Entity* this) {
gUnk_081237F8[this->action](this);
static void (*const actionFuncs[])(Entity*) = {
sub_08099DD0, sub_08099E10, sub_08099E58, sub_08099E8C, nullsub_534,
};
actionFuncs[this->action](this);
}
void sub_08099DD0(Entity* this) {