From dffed216136c79b27e416bbacf34e9038bbb5b8e Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Mon, 18 Apr 2022 00:45:50 +0300 Subject: Put const data in lighttableSwitch --- src/object/lightableSwitch.c | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/object/lightableSwitch.c b/src/object/lightableSwitch.c index a3680f93..ae10b872 100644 --- a/src/object/lightableSwitch.c +++ b/src/object/lightableSwitch.c @@ -8,21 +8,33 @@ #include "hitbox.h" #include "object.h" -extern void (*const gUnk_081243B4[])(Entity*); -extern void (*const gUnk_081243BC[])(Entity*); -extern void (*const gUnk_081243C4[])(Entity*); - -static void sub_0809EB30(Entity* this); -static void sub_0809EAD8(Entity* this); -static void sub_0809EABC(Entity* this); +static void sub_0809EB30(Entity*); +static void sub_0809EAD8(Entity*); +static void sub_0809EABC(Entity*); +static void sub_0809EA1C(Entity*); +static void sub_0809EB68(Entity*); +static void sub_0809EA34(Entity*); +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) { - gUnk_081243B4[this->type](this); + static void (*const typeFuncs[])(Entity*) = { + sub_0809EA1C, + sub_0809EB68, + }; + typeFuncs[this->type](this); sub_0809EB30(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) { @@ -93,7 +105,13 @@ static void sub_0809EB30(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) { -- cgit v1.2.3