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 manager31

This commit is contained in:
Tal Hayon 2022-04-18 23:33:17 +03:00
parent 036d01172a
commit ddc0882309
4 changed files with 5 additions and 17 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,
"size": 124
},
{
"path": "manager31/gUnk_08108D5C.bin",
"start": 1084764,
"size": 24
},
{
"path": "manager32/gUnk_08108D74.bin",
"start": 1084788,

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

@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108D5C:: @ 08108D5C
.incbin "manager31/gUnk_08108D5C.bin"

2
linker.ld
View File

@ -1139,7 +1139,7 @@ SECTIONS {
src/manager/manager28.o(.rodata);
src/manager/manager2B.o(.rodata);
src/manager/manager2E.o(.rodata);
data/const/manager/manager31.o(.rodata);
src/manager/manager31.o(.rodata);
data/const/manager/manager32.o(.rodata);
data/const/manager/manager34.o(.rodata);
data/const/manager/manager35.o(.rodata);

7
src/manager/manager31.c
View File

@ -16,14 +16,15 @@ typedef struct {
u16 y;
} GoronShopSpawnData;
extern GoronShopSpawnData gUnk_08108D5C[3];
/*
Spawns the shop items for the kinstones for the goron merchant.
*/
void Manager31_Main(Manager31* this) {
static const GoronShopSpawnData gUnk_08108D5C[3] = { { 0x6e, 0x3, 0x210, 0x210 },
{ 0x71, 0x2, 0x220, 0x210 },
{ 0x73, 0x3, 0x230, 0x210 } };
s32 uVar2;
GoronShopSpawnData* spawnData;
const GoronShopSpawnData* spawnData;
s32 count;
if (this->manager.action == 0) {