Put const data in manager23

This commit is contained in:
Tal Hayon 2022-04-18 23:23:27 +03:00
parent 52be07a588
commit 9373fb7a82
3 changed files with 12 additions and 15 deletions

View File

@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108CCC:: @ 08108CCC
.4byte sub_0805BC8C
.4byte sub_0805BCD4
.4byte sub_0805BD5C
.4byte sub_0805BDB4

View File

@ -1132,7 +1132,7 @@ SECTIONS {
src/manager/manager1E.o(.rodata);
src/manager/manager1F.o(.rodata);
src/manager/manager22.o(.rodata);
data/const/manager/manager23.o(.rodata);
src/manager/manager23.o(.rodata);
data/const/manager/manager24.o(.rodata);
src/manager/manager26.o(.rodata);
src/manager/manager27.o(.rodata);

View File

@ -6,8 +6,6 @@
#include "object.h"
#include "game.h"
extern void (*const gUnk_08108CCC[])(Manager*);
typedef struct {
Manager manager;
u16 field_0x20;
@ -23,11 +21,21 @@ typedef struct {
void sub_0805BE94(Manager23*);
void sub_0805BEC4(Manager23*);
void sub_0805BC8C(Manager23*);
void sub_0805BCD4(Manager23*);
void sub_0805BD5C(Manager23*);
void sub_0805BDB4(Manager23*);
void sub_0805BE70(Manager23*, u32);
void Manager23_Main(Manager* this) {
gUnk_08108CCC[this->unk_0a](this);
static void (*const gUnk_08108CCC[])(Manager23*) = {
sub_0805BC8C,
sub_0805BCD4,
sub_0805BD5C,
sub_0805BDB4,
};
gUnk_08108CCC[this->unk_0a]((Manager23*)this);
}
void sub_0805BC8C(Manager23* this) {