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 manager18

This commit is contained in:
Tal Hayon 2022-04-18 23:02:08 +03:00
parent 4ce714ee5c
commit 46b82dce97
4 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/assets.json
View File

@ -32288,11 +32288,6 @@
"JP": -828 "JP": -828
} }
}, },
{
"path": "manager18/gUnk_0810865C.bin",
"start": 1082972,
"size": 12
},
{ {
"path": "manager1A/gUnk_08108670_EU.bin", "path": "manager1A/gUnk_08108670_EU.bin",
"variants": [ "variants": [

8
data/const/manager/manager18.s
View File

@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0810865C:: @ 0810865C
.incbin "manager18/gUnk_0810865C.bin"

2
linker.ld
View File

@ -1124,7 +1124,7 @@ SECTIONS {
src/manager/manager14.o(.rodata); src/manager/manager14.o(.rodata);
src/manager/manager15.o(.rodata); src/manager/manager15.o(.rodata);
src/manager/manager17.o(.rodata); src/manager/manager17.o(.rodata);
data/const/manager/manager18.o(.rodata); src/manager/manager18.o(.rodata);
data/const/manager/manager1A.o(.rodata); data/const/manager/manager1A.o(.rodata);
data/const/manager/manager1B.o(.rodata); data/const/manager/manager1B.o(.rodata);
data/const/manager/manager1C.o(.rodata); data/const/manager/manager1C.o(.rodata);

4
src/manager/manager18.c
View File

@ -10,9 +10,11 @@ typedef struct {
void sub_0805AEDC(Manager18*); void sub_0805AEDC(Manager18*);
void sub_0805AF3C(Manager18*); void sub_0805AF3C(Manager18*);
extern u16 gUnk_0810865C[];
void Manager18_Main(Manager18* this) { void Manager18_Main(Manager18* this) {
static const u16 gUnk_0810865C[] = {
0xf01, 0xe02, 0xe03, 0xe04, 0, 0,
};
if (this == NULL) { if (this == NULL) {
if (gArea.onEnter != sub_0805AEDC) { if (gArea.onEnter != sub_0805AEDC) {
sub_0805AEDC(NULL); sub_0805AEDC(NULL);