diff options
| author | Tal Hayon <talhayon1@gmail.com> | 2022-04-18 23:40:23 +0300 |
|---|---|---|
| committer | Tal Hayon <talhayon1@gmail.com> | 2022-04-18 23:40:23 +0300 |
| commit | 737e39dc2b443b2e59dabfbd2c54bd2f17d10d2c (patch) | |
| tree | 4e78ff94a6fa09838df346486d5e0675acbba13c | |
| parent | db1d23dd693cc4cbceb6d4d5e5f21bd484018e22 (diff) | |
Put const data in manager36
| -rw-r--r-- | assets/assets.json | 5 | ||||
| -rw-r--r-- | data/const/manager/manager36.s | 9 | ||||
| -rw-r--r-- | linker.ld | 2 | ||||
| -rw-r--r-- | src/manager/manager36.c | 7 |
4 files changed, 5 insertions, 18 deletions
diff --git a/assets/assets.json b/assets/assets.json index da91f04b..4cf6c012 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -32724,11 +32724,6 @@ "size": 124 }, { - "path": "manager36/gUnk_08108DA8.bin", - "start": 1084840, - "size": 20 - }, - { "path": "manager39/gUnk_08108DE8.bin", "start": 1084904, "size": 64 diff --git a/data/const/manager/manager36.s b/data/const/manager/manager36.s deleted file mode 100644 index e17cd7b6..00000000 --- a/data/const/manager/manager36.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08108DA8:: @ 08108DA8 - .incbin "manager36/gUnk_08108DA8.bin" - @@ -1143,7 +1143,7 @@ SECTIONS { src/manager/manager32.o(.rodata); src/manager/manager34.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/manager38.o(.rodata); data/const/manager/manager39.o(.rodata); diff --git a/src/manager/manager36.c b/src/manager/manager36.c index 7dcf71c4..c05df49b 100644 --- a/src/manager/manager36.c +++ b/src/manager/manager36.c @@ -7,11 +7,12 @@ typedef struct { u16 sound; } Manager36_unk; -extern Manager36_unk gUnk_08108DA8[]; - // Repeatedly plays the same sound with a fixed wait time 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) { manager->action += 1; manager->unk_0e = 0; |