Put const data in mask

This commit is contained in:
Tal Hayon 2022-04-18 00:22:50 +03:00
parent 7a65a8a845
commit ac8b0220b5
3 changed files with 11 additions and 13 deletions

View File

@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
MaskActionFuncs:: @ 081227A4
.4byte sub_080929A4
.4byte sub_08092A94
.4byte sub_08092B0C
.4byte Mask_Delete+1

View File

@ -1446,7 +1446,7 @@ SECTIONS {
data/animations/object/lavaPlatform.o(.rodata);
src/object/paper.o(.rodata);
src/object/object5B.o(.rodata);
data/const/object/mask.o(.rodata);
src/object/mask.o(.rodata);
src/object/houseDoorInterior.o(.rodata);
src/object/whirlwind.o(.rodata);
data/animations/object/whirlwind.o(.rodata);

View File

@ -1,9 +1,18 @@
#include "object.h"
#include "functions.h"
extern void (*MaskActionFuncs[])(Entity*);
void sub_080929A4(Entity*);
void sub_08092A94(Entity*);
void sub_08092B0C(Entity*);
void Mask_Delete(Entity*);
void Mask(Entity* this) {
static void (*const MaskActionFuncs[])(Entity*) = {
sub_080929A4,
sub_08092A94,
sub_08092B0C,
Mask_Delete,
};
MaskActionFuncs[this->action](this);
}