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 lighttableSwitch

This commit is contained in:
Tal Hayon 2022-04-18 00:45:50 +03:00
parent 017b419abd
commit dffed21613
3 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
data/const/object/lightableSwitch.s
View File

@ -1,19 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081243B4:: @ 081243B4
.4byte sub_0809EA1C
.4byte sub_0809EB68
gUnk_081243BC:: @ 081243BC
.4byte sub_0809EA34
.4byte sub_0809EA80
gUnk_081243C4:: @ 081243C4
.4byte sub_0809EB80
.4byte sub_0809EBD8
.4byte sub_0809EC08
.4byte nullsub_126

2
linker.ld
View File

@ -1523,7 +1523,7 @@ SECTIONS {
src/object/object9B.o(.rodata); src/object/object9B.o(.rodata);
data/animations/object/object9B.o(.rodata); data/animations/object/object9B.o(.rodata);
src/object/treeHidingPortal.o(.rodata); src/object/treeHidingPortal.o(.rodata);
data/const/object/lightableSwitch.o(.rodata); src/object/lightableSwitch.o(.rodata);
src/object/fan.o(.rodata); src/object/fan.o(.rodata);
data/animations/object/fan.o(.rodata); data/animations/object/fan.o(.rodata);
src/object/angryStatue.o(.rodata); src/object/angryStatue.o(.rodata);

38
src/object/lightableSwitch.c
View File

@ -8,21 +8,33 @@
#include "hitbox.h" #include "hitbox.h"
#include "object.h" #include "object.h"
extern void (*const gUnk_081243B4[])(Entity*); static void sub_0809EB30(Entity*);
extern void (*const gUnk_081243BC[])(Entity*); static void sub_0809EAD8(Entity*);
extern void (*const gUnk_081243C4[])(Entity*); static void sub_0809EABC(Entity*);
static void sub_0809EA1C(Entity*);
static void sub_0809EB30(Entity* this); static void sub_0809EB68(Entity*);
static void sub_0809EAD8(Entity* this); static void sub_0809EA34(Entity*);
static void sub_0809EABC(Entity* this); static void sub_0809EA80(Entity*);
static void nullsub_126(Entity*);
static void sub_0809EC08(Entity*);
static void sub_0809EBD8(Entity*);
static void sub_0809EB80(Entity*);
void LightableSwitch(Entity* this) { void LightableSwitch(Entity* this) {
gUnk_081243B4[this->type](this); static void (*const typeFuncs[])(Entity*) = {
sub_0809EA1C,
sub_0809EB68,
};
typeFuncs[this->type](this);
sub_0809EB30(this); sub_0809EB30(this);
} }
void sub_0809EA1C(Entity* this) { void sub_0809EA1C(Entity* this) {
gUnk_081243BC[this->action](this); static void (*const actionFuncs[])(Entity*) = {
sub_0809EA34,
sub_0809EA80,
};
actionFuncs[this->action](this);
} }
void sub_0809EA34(Entity* this) { void sub_0809EA34(Entity* this) {
@ -93,7 +105,13 @@ static void sub_0809EB30(Entity* this) {
} }
void sub_0809EB68(Entity* this) { void sub_0809EB68(Entity* this) {
gUnk_081243C4[this->action](this); static void (*const actionFuncs[])(Entity*) = {
sub_0809EB80,
sub_0809EBD8,
sub_0809EC08,
nullsub_126,
};
actionFuncs[this->action](this);
} }
void sub_0809EB80(Entity* this) { void sub_0809EB80(Entity* this) {