diff --git a/assets/assets.json b/assets/assets.json index 44af985f..8f341fdf 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -32723,11 +32723,6 @@ "start": 1084332, "size": 124 }, - { - "path": "manager31/gUnk_08108D5C.bin", - "start": 1084764, - "size": 24 - }, { "path": "manager32/gUnk_08108D74.bin", "start": 1084788, diff --git a/data/const/manager/manager31.s b/data/const/manager/manager31.s deleted file mode 100644 index 8045603c..00000000 --- a/data/const/manager/manager31.s +++ /dev/null @@ -1,8 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08108D5C:: @ 08108D5C - .incbin "manager31/gUnk_08108D5C.bin" diff --git a/linker.ld b/linker.ld index 125e86ac..65e1aa55 100644 --- a/linker.ld +++ b/linker.ld @@ -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); diff --git a/src/manager/manager31.c b/src/manager/manager31.c index f9a151bc..eae858e8 100644 --- a/src/manager/manager31.c +++ b/src/manager/manager31.c @@ -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) {