Put const data in fireplace

This commit is contained in:
Tal Hayon 2022-04-18 00:41:56 +03:00
parent 6de7b5c333
commit 24b936f2fb
3 changed files with 7 additions and 13 deletions

View File

@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123D98:: @ 08123D98
.4byte sub_0809B708
.4byte sub_0809B7A0

View File

@ -1504,7 +1504,7 @@ SECTIONS {
src/object/cabinFurniture.o(.rodata);
src/object/doubleBookshelf.o(.rodata);
src/object/book.o(.rodata);
data/const/object/fireplace.o(.rodata);
src/object/fireplace.o(.rodata);
src/object/object8E.o(.rodata);
src/object/frozenWaterElement.o(.rodata);
src/object/object90.o(.rodata);

View File

@ -1,14 +1,17 @@
#include "object.h"
#include "functions.h"
extern void (*gUnk_08123D98[])(Entity*);
void sub_0809B7A0(Entity* this);
void sub_0809B7DC(Entity* this);
void sub_0809B7C0(Entity* this);
void sub_0809B708(Entity* this);
void Fireplace(Entity* e) {
gUnk_08123D98[e->action](e);
static void (*const actionFuncs[])(Entity*) = {
sub_0809B708,
sub_0809B7A0,
};
actionFuncs[e->action](e);
}
void sub_0809B708(Entity* this) {