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 manager36

This commit is contained in:
Tal Hayon 2022-04-18 23:40:23 +03:00
parent db1d23dd69
commit 737e39dc2b
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/assets.json
View File

@ -32723,11 +32723,6 @@
"start": 1084332, "start": 1084332,
"size": 124 "size": 124
}, },
{
"path": "manager36/gUnk_08108DA8.bin",
"start": 1084840,
"size": 20
},
{ {
"path": "manager39/gUnk_08108DE8.bin", "path": "manager39/gUnk_08108DE8.bin",
"start": 1084904, "start": 1084904,

9
data/const/manager/manager36.s
View File

@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108DA8:: @ 08108DA8
.incbin "manager36/gUnk_08108DA8.bin"

2
linker.ld
View File

@ -1143,7 +1143,7 @@ SECTIONS {
src/manager/manager32.o(.rodata); src/manager/manager32.o(.rodata);
src/manager/manager34.o(.rodata); src/manager/manager34.o(.rodata);
src/manager/manager35.o(.rodata); src/manager/manager35.o(.rodata);
data/const/manager/manager36.o(.rodata); src/manager/manager36.o(.rodata);
data/const/manager/manager37.o(.rodata); data/const/manager/manager37.o(.rodata);
data/const/manager/manager38.o(.rodata); data/const/manager/manager38.o(.rodata);
data/const/manager/manager39.o(.rodata); data/const/manager/manager39.o(.rodata);

7
src/manager/manager36.c
View File

@ -7,11 +7,12 @@ typedef struct {
u16 sound; u16 sound;
} Manager36_unk; } Manager36_unk;
extern Manager36_unk gUnk_08108DA8[];
// Repeatedly plays the same sound with a fixed wait time // Repeatedly plays the same sound with a fixed wait time
void Manager36_Main(Manager* manager) { void Manager36_Main(Manager* manager) {
Manager36_unk* unk = &gUnk_08108DA8[manager->unk_0a]; static const Manager36_unk gUnk_08108DA8[] = {
{ 0x10, SFX_ELEMENT_INFUSE }, { 0x20, SFX_1C8 }, { 0x20, SFX_1C8 }, { 0x40, SFX_1A9 }, { 0x20, SFX_21F }
};
const Manager36_unk* unk = &gUnk_08108DA8[manager->unk_0a];
if (manager->action == 0) { if (manager->action == 0) {
manager->action += 1; manager->action += 1;
manager->unk_0e = 0; manager->unk_0e = 0;