Put const data in metalDoor

This commit is contained in:
Tal Hayon 2022-04-18 00:48:28 +03:00
parent ad2a1ebbdf
commit 33a9dfccd1
3 changed files with 12 additions and 18 deletions

View File

@ -1,12 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0812493C:: @ 0812493C
.4byte sub_080A0684
.4byte sub_080A0718
.4byte sub_080A074C
.4byte sub_080A07BC
.4byte sub_080A07F0

View File

@ -1544,7 +1544,7 @@ SECTIONS {
src/object/objectAD.o(.rodata);
data/const/object/objectAF.o(.rodata);
data/animations/object/objectAF.o(.rodata);
data/const/object/metalDoor.o(.rodata);
src/object/metalDoor.o(.rodata);
data/const/object/jailBars.o(.rodata);
data/animations/object/jailBars.o(.rodata);
data/animations/object/objectB2.o(.rodata);

View File

@ -9,13 +9,19 @@
#include "hitbox.h"
extern u32 sub_08083734(Entity*, u32);
extern void sub_080A080C(Entity*);
extern void sub_080A0870(Entity*);
extern void (*const gUnk_0812493C[])(Entity*);
void sub_080A080C(Entity*);
void sub_080A0870(Entity*);
void sub_080A0684(Entity*);
void sub_080A0718(Entity*);
void sub_080A074C(Entity*);
void sub_080A07BC(Entity*);
void sub_080A07F0(Entity*);
void MetalDoor(Entity* this) {
gUnk_0812493C[this->action](this);
static void (*const actionFuncs[])(Entity*) = {
sub_080A0684, sub_080A0718, sub_080A074C, sub_080A07BC, sub_080A07F0,
};
actionFuncs[this->action](this);
}
void sub_080A0684(Entity* this) {