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 manager1C

This commit is contained in:
Tal Hayon 2022-04-18 23:13:24 +03:00
parent 1bb08eca42
commit dcd206fd9e
4 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/assets.json
View File

@ -32723,16 +32723,6 @@
"start": 1084332,
"size": 124
},
{
"path": "manager1C/gUnk_08108C6C.bin",
"start": 1084524,
"size": 16
},
{
"path": "manager1C/gUnk_08108C7C.bin",
"start": 1084540,
"size": 4
},
{
"path": "manager1D/gUnk_08108C88.bin",
"start": 1084552,

15
data/const/manager/manager1C.s
View File

@ -1,15 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108C64:: @ 08108C64
.4byte sub_0805B554
.4byte sub_0805B55C
gUnk_08108C6C:: @ 08108C6C
.incbin "manager1C/gUnk_08108C6C.bin"
gUnk_08108C7C:: @ 08108C7C
.incbin "manager1C/gUnk_08108C7C.bin"

2
linker.ld
View File

@ -1127,7 +1127,7 @@ SECTIONS {
src/manager/manager18.o(.rodata);
data/const/manager/manager1A.o(.rodata);
src/manager/manager1B.o(.rodata);
data/const/manager/manager1C.o(.rodata);
src/manager/manager1C.o(.rodata);
data/const/manager/manager1D.o(.rodata);
src/manager/manager1E.o(.rodata);
data/const/manager/manager1F.o(.rodata);

15
src/manager/manager1C.c
View File

@ -3,13 +3,15 @@
#include "room.h"
#include "enemy.h"
extern void (*const gUnk_08108C64[])(Manager*);
extern u16 gUnk_08108C6C[];
extern s8 gUnk_08108C7C[];
void sub_0805B554(Manager*);
void sub_0805B55C(Manager*);
void Manager1C_Main(Manager* manager) {
gUnk_08108C64[manager->action](manager);
static void (*const actionFuncs[])(Manager*) = {
sub_0805B554,
sub_0805B55C,
};
actionFuncs[manager->action](manager);
}
// Initial setup
@ -20,6 +22,9 @@ void sub_0805B554(Manager* manager) {
// Spawn water drops every 0xf frames
void sub_0805B55C(Manager* manager) {
static const s16 gUnk_08108C6C[] = { -0x64, -0x3c, -0x14, 0x14, 0x3c, 0x64, 0x8c, 0xb4 };
static const s8 gUnk_08108C7C[] = { -0x32, -0x19, 0x0, 0x19 };
if (--manager->unk_0e == 0) {
Entity* waterDrop;
manager->unk_0e = 0xf;