diff options
| author | Tal Hayon <talhayon1@gmail.com> | 2022-04-18 23:21:43 +0300 |
|---|---|---|
| committer | Tal Hayon <talhayon1@gmail.com> | 2022-04-18 23:21:43 +0300 |
| commit | 52be07a588a7eb2c6b8118466572734ac2ae6de8 (patch) | |
| tree | 8df1f2e72bde5cfd30164cdcd3224c83bec710b1 | |
| parent | ea286b32852efd1ab8a2ac51c79a17d5c0cd9b22 (diff) | |
Put const data in manager1F
| -rw-r--r-- | assets/assets.json | 5 | ||||
| -rw-r--r-- | data/const/manager/manager1F.s | 12 | ||||
| -rw-r--r-- | linker.ld | 2 | ||||
| -rw-r--r-- | src/manager/manager1F.c | 12 |
4 files changed, 9 insertions, 22 deletions
diff --git a/assets/assets.json b/assets/assets.json index a9a2f276..dedc213b 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -32724,11 +32724,6 @@ "size": 124 }, { - "path": "manager1F/gUnk_08108C9C.bin", - "start": 1084572, - "size": 12 - }, - { "path": "manager24/gUnk_08108CFC.bin", "start": 1084668, "size": 8 diff --git a/data/const/manager/manager1F.s b/data/const/manager/manager1F.s deleted file mode 100644 index 4036b98d..00000000 --- a/data/const/manager/manager1F.s +++ /dev/null @@ -1,12 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08108C94:: @ 08108C94 - .4byte sub_0805B70C - .4byte sub_0805B744 - -gUnk_08108C9C:: @ 08108C9C - .incbin "manager1F/gUnk_08108C9C.bin" @@ -1130,7 +1130,7 @@ SECTIONS { src/manager/manager1C.o(.rodata); src/manager/manager1D.o(.rodata); src/manager/manager1E.o(.rodata); - data/const/manager/manager1F.o(.rodata); + src/manager/manager1F.o(.rodata); src/manager/manager22.o(.rodata); data/const/manager/manager23.o(.rodata); data/const/manager/manager24.o(.rodata); diff --git a/src/manager/manager1F.c b/src/manager/manager1F.c index 1ad3135e..49effc47 100644 --- a/src/manager/manager1F.c +++ b/src/manager/manager1F.c @@ -13,14 +13,17 @@ typedef struct { u8 field_0x3d; u16 field_0x3e; } Manager1F; -extern void (*const gUnk_08108C94[])(Manager1F*); void sub_0805B778(Manager1F*); - -extern u16 gUnk_08108C9C[]; +void sub_0805B70C(Manager1F*); +void sub_0805B744(Manager1F*); void Manager1F_Main(Manager1F* this) { - gUnk_08108C94[this->manager.action](this); + static void (*const actionFuncs[])(Manager1F*) = { + sub_0805B70C, + sub_0805B744, + }; + actionFuncs[this->manager.action](this); } void sub_0805B70C(Manager1F* this) { @@ -47,5 +50,6 @@ void sub_0805B744(Manager1F* this) { } void sub_0805B778(Manager1F* this) { + static const u16 gUnk_08108C9C[] = { 0x358, 0x359, 0x356, 0x35a, 0x35a, 0x357 }; SetTileType(gUnk_08108C9C[this->manager.unk_0a * 2 + this->manager.unk_0b], this->field_0x38, this->field_0x36); } |