mirror of https://github.com/zeldaret/tmc.git
Put const data in manager1D
This commit is contained in:
parent
dcd206fd9e
commit
ea286b3285
|
@ -32723,11 +32723,6 @@
|
|||
"start": 1084332,
|
||||
"size": 124
|
||||
},
|
||||
{
|
||||
"path": "manager1D/gUnk_08108C88.bin",
|
||||
"start": 1084552,
|
||||
"size": 4
|
||||
},
|
||||
{
|
||||
"path": "manager1F/gUnk_08108C9C.bin",
|
||||
"start": 1084572,
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_08108C80:: @ 08108C80
|
||||
.4byte sub_0805B5E0
|
||||
.4byte sub_0805B638
|
||||
|
||||
gUnk_08108C88:: @ 08108C88
|
||||
.incbin "manager1D/gUnk_08108C88.bin"
|
|
@ -1128,7 +1128,7 @@ SECTIONS {
|
|||
data/const/manager/manager1A.o(.rodata);
|
||||
src/manager/manager1B.o(.rodata);
|
||||
src/manager/manager1C.o(.rodata);
|
||||
data/const/manager/manager1D.o(.rodata);
|
||||
src/manager/manager1D.o(.rodata);
|
||||
src/manager/manager1E.o(.rodata);
|
||||
data/const/manager/manager1F.o(.rodata);
|
||||
src/manager/manager22.o(.rodata);
|
||||
|
|
|
@ -2,15 +2,19 @@
|
|||
#include "room.h"
|
||||
#include "screen.h"
|
||||
|
||||
extern void (*const gUnk_08108C80[])(Manager*);
|
||||
|
||||
extern u16 gUnk_08108C88[];
|
||||
void sub_0805B5E0(Manager*);
|
||||
void sub_0805B638(Manager*);
|
||||
|
||||
void Manager1D_Main(Manager* this) {
|
||||
gUnk_08108C80[this->action](this);
|
||||
static void (*const actionFuncs[])(Manager*) = {
|
||||
sub_0805B5E0,
|
||||
sub_0805B638,
|
||||
};
|
||||
actionFuncs[this->action](this);
|
||||
}
|
||||
|
||||
void sub_0805B5E0(Manager* this) {
|
||||
static const u16 gUnk_08108C88[] = { 0x1e07, 0x1e07 };
|
||||
this->action = 1;
|
||||
|
||||
gScreen.lcd.displayControl |= DISPCNT_BG3_ON;
|
||||
|
|
Loading…
Reference in New Issue