From ac16219ff462029ea22b3f61eed4c6e105aca777 Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Mon, 15 Mar 2021 22:46:47 +0100 Subject: [PATCH] Split managers and extract pointers --- asm/intr.s | 2 +- data/animations/npc/gentari.inc | 46 ++++++ data/const/manager/manager1.inc | 24 ++++ data/const/manager/manager10.inc | 2 + data/const/manager/manager12.inc | 29 ++++ data/const/manager/manager13.inc | 8 ++ data/const/manager/manager14.inc | 12 ++ data/const/manager/manager15.inc | 43 ++++++ data/const/manager/manager17.inc | 3 + data/const/manager/manager18.inc | 2 + data/const/manager/manager1A.inc | 114 +++++++++++++++ data/const/manager/manager1B.inc | 12 ++ data/const/manager/manager1C.inc | 12 ++ data/const/manager/manager1D.inc | 6 + data/const/manager/manager1F.inc | 5 + data/const/manager/manager22.inc | 2 + data/const/manager/manager23.inc | 5 + data/const/manager/manager24.inc | 14 ++ data/const/manager/manager2B.inc | 2 + data/const/manager/manager2E.inc | 8 ++ data/const/manager/manager3.inc | 2 + data/const/manager/manager31.inc | 2 + data/const/manager/manager32.inc | 8 ++ data/const/manager/manager34.inc | 4 + data/const/manager/manager35.inc | 5 + data/const/manager/manager36.inc | 3 + data/const/manager/manager37.inc | 14 ++ data/const/manager/manager38.inc | 3 + data/const/manager/manager39.inc | 18 +++ data/const/manager/manager4.inc | 206 +++++++++++++++++++++++++++ data/const/manager/managerD.inc | 4 + data/const/manager/managerF.inc | 26 ++++ data/const/playerItem/item11.inc | 6 + data/data_08107BC8.s | 74 +--------- data/data_08108308.s | 235 ++----------------------------- data/data_08108C94.s | 22 +-- data/data_08108D30.s | 221 ++++++++++++++--------------- include/manager.h | 2 +- src/arm_proxy.c | 2 +- src/manager/manager4.c | 8 +- 40 files changed, 782 insertions(+), 434 deletions(-) create mode 100644 data/animations/npc/gentari.inc create mode 100644 data/const/manager/manager1.inc create mode 100644 data/const/manager/manager10.inc create mode 100644 data/const/manager/manager12.inc create mode 100644 data/const/manager/manager13.inc create mode 100644 data/const/manager/manager14.inc create mode 100644 data/const/manager/manager15.inc create mode 100644 data/const/manager/manager17.inc create mode 100644 data/const/manager/manager18.inc create mode 100644 data/const/manager/manager1A.inc create mode 100644 data/const/manager/manager1B.inc create mode 100644 data/const/manager/manager1C.inc create mode 100644 data/const/manager/manager1D.inc create mode 100644 data/const/manager/manager1F.inc create mode 100644 data/const/manager/manager22.inc create mode 100644 data/const/manager/manager23.inc create mode 100644 data/const/manager/manager24.inc create mode 100644 data/const/manager/manager2B.inc create mode 100644 data/const/manager/manager2E.inc create mode 100644 data/const/manager/manager3.inc create mode 100644 data/const/manager/manager31.inc create mode 100644 data/const/manager/manager32.inc create mode 100644 data/const/manager/manager34.inc create mode 100644 data/const/manager/manager35.inc create mode 100644 data/const/manager/manager36.inc create mode 100644 data/const/manager/manager37.inc create mode 100644 data/const/manager/manager38.inc create mode 100644 data/const/manager/manager39.inc create mode 100644 data/const/manager/manager4.inc create mode 100644 data/const/manager/managerD.inc create mode 100644 data/const/manager/managerF.inc create mode 100644 data/const/playerItem/item11.inc diff --git a/asm/intr.s b/asm/intr.s index 3332c380..c8e377bf 100644 --- a/asm/intr.s +++ b/asm/intr.s @@ -704,7 +704,7 @@ _080B225C: .4byte DeleteThisEntity _080B2260: .4byte ObjectUpdate _080B2264: .4byte NPCUpdate _080B2268: .4byte ItemUpdate -_080B226C: .4byte sub_08017508 +_080B226C: .4byte ManagerUpdate _080B2270: .4byte gUnk_03003DD0 _080B2274: .4byte gUnk_080026A4 _080B2278: .4byte gUnk_03003DD0 diff --git a/data/animations/npc/gentari.inc b/data/animations/npc/gentari.inc new file mode 100644 index 00000000..b27c0ebd --- /dev/null +++ b/data/animations/npc/gentari.inc @@ -0,0 +1,46 @@ +gUnk_08109AD8:: @ 08109AD8 + .incbin "baserom.gba", 0x109AD8, 0x0000005 + +gUnk_08109ADD:: @ 08109ADD + .incbin "baserom.gba", 0x109ADD, 0x0000005 + +gUnk_08109AE2:: @ 08109AE2 + .incbin "baserom.gba", 0x109AE2, 0x0000005 + +gUnk_08109AE7:: @ 08109AE7 + .incbin "baserom.gba", 0x109AE7, 0x0000005 + +gUnk_08109AEC:: @ 08109AEC + .incbin "baserom.gba", 0x109AEC, 0x0000011 + +gUnk_08109AFD:: @ 08109AFD + .incbin "baserom.gba", 0x109AFD, 0x000000B + +gUnk_08109B08:: @ 08109B08 + .incbin "baserom.gba", 0x109B08, 0x0000006 + +gUnk_08109B0E:: @ 08109B0E + .incbin "baserom.gba", 0x109B0E, 0x000002D + +gUnk_08109B3B:: @ 08109B3B + .incbin "baserom.gba", 0x109B3B, 0x0000025 + +gUnk_08109B60:: @ 08109B60 + .incbin "baserom.gba", 0x109B60, 0x0000020 + +gUnk_08109B80:: @ 08109B80 + .4byte gUnk_08109AD8 + .4byte gUnk_08109ADD + .4byte gUnk_08109AE2 + .4byte gUnk_08109AE7 + .4byte gUnk_08109AEC + .4byte gUnk_08109AEC + .4byte gUnk_08109AEC + .4byte gUnk_08109AFD + .4byte gUnk_08109B0E + .4byte gUnk_08109ADD + .4byte gUnk_08109B0E + .4byte gUnk_08109AE7 + .4byte gUnk_08109B3B + .4byte gUnk_08109B60 + .4byte 00000000 diff --git a/data/const/manager/manager1.inc b/data/const/manager/manager1.inc new file mode 100644 index 00000000..a05a3ac7 --- /dev/null +++ b/data/const/manager/manager1.inc @@ -0,0 +1,24 @@ +gUnk_08107C1C:: @ 08107C1C + .incbin "baserom.gba", 0x107C1C, 0x000000E + +gUnk_08107C2A:: @ 08107C2A + .incbin "baserom.gba", 0x107C2A, 0x0000006 + +gUnk_08107C30:: @ 08107C30 + .incbin "baserom.gba", 0x107C30, 0x0000010 + +gUnk_08107C40:: @ 08107C40 + .incbin "baserom.gba", 0x107C40, 0x0000008 + +gUnk_08107C48:: @ 08107C48 + .4byte nullsub_494 + .4byte nullsub_494 + .4byte sub_080573AC + .4byte nullsub_494 + .4byte sub_08057450 + +gUnk_08107C5C:: @ 08107C5C + .4byte sub_08057118 + .4byte sub_08057174 + .4byte sub_0805728C + .4byte sub_080572D4 diff --git a/data/const/manager/manager10.inc b/data/const/manager/manager10.inc new file mode 100644 index 00000000..62eae63b --- /dev/null +++ b/data/const/manager/manager10.inc @@ -0,0 +1,2 @@ +gUnk_08108390:: @ 08108390 + .incbin "baserom.gba", 0x108390, 0x0000008 diff --git a/data/const/manager/manager12.inc b/data/const/manager/manager12.inc new file mode 100644 index 00000000..d6f4f689 --- /dev/null +++ b/data/const/manager/manager12.inc @@ -0,0 +1,29 @@ +gUnk_08108398:: @ 08108398 + .incbin "baserom.gba", 0x108398, 0x0000016 + +gUnk_081083AE:: @ 081083AE + .incbin "baserom.gba", 0x1083AE, 0x0000016 + +gUnk_081083C4:: @ 081083C4 + .incbin "baserom.gba", 0x1083C4, 0x0000016 + +gUnk_081083DA:: @ 081083DA + .incbin "baserom.gba", 0x1083DA, 0x0000018 + +gUnk_081083F2:: @ 081083F2 + .incbin "baserom.gba", 0x1083F2, 0x0000016 + +gUnk_08108408:: @ 08108408 + .incbin "baserom.gba", 0x108408, 0x000003C + +gUnk_08108444:: @ 08108444 + .incbin "baserom.gba", 0x108444, 0x0000024 + +gUnk_08108468:: @ 08108468 + .incbin "baserom.gba", 0x108468, 0x0000026 + +gUnk_0810848E:: @ 0810848E + .incbin "baserom.gba", 0x10848E, 0x0000035 + +gUnk_081084C3:: @ 081084C3 + .incbin "baserom.gba", 0x1084C3, 0x0000005 diff --git a/data/const/manager/manager13.inc b/data/const/manager/manager13.inc new file mode 100644 index 00000000..8c744b61 --- /dev/null +++ b/data/const/manager/manager13.inc @@ -0,0 +1,8 @@ +gUnk_081084C8:: @ 081084C8 + .incbin "baserom.gba", 0x1084C8, 0x000004A + +gUnk_08108512:: @ 08108512 + .incbin "baserom.gba", 0x108512, 0x000001E + +gUnk_08108530:: @ 08108530 + .incbin "baserom.gba", 0x108530, 0x0000058 diff --git a/data/const/manager/manager14.inc b/data/const/manager/manager14.inc new file mode 100644 index 00000000..cd62c688 --- /dev/null +++ b/data/const/manager/manager14.inc @@ -0,0 +1,12 @@ +gUnk_08108588:: @ 08108588 + .incbin "baserom.gba", 0x108588, 0x0000012 + +gUnk_0810859A:: @ 0810859A + .incbin "baserom.gba", 0x10859A, 0x000000A + +gUnk_081085A4:: @ 081085A4 + .4byte sub_08059E80 + .4byte sub_0805A040 + .4byte sub_0805A048 + .4byte sub_0805A0C0 + .4byte sub_08059EF8 diff --git a/data/const/manager/manager15.inc b/data/const/manager/manager15.inc new file mode 100644 index 00000000..92e2821d --- /dev/null +++ b/data/const/manager/manager15.inc @@ -0,0 +1,43 @@ +gUnk_081085B8:: @ 081085B8 + .incbin "baserom.gba", 0x1085B8, 0x0000020 + +gUnk_081085D8:: @ 081085D8 + .4byte sub_0805A298 + .4byte sub_0805A2E4 + .4byte sub_0805A3D4 + .4byte sub_0805A3D4 + .4byte sub_0805A500 + .4byte sub_0805A660 + .4byte sub_0805A664 + .4byte sub_0805A804 + +gUnk_081085F8:: @ 081085F8 + .4byte 00000000 + .4byte sub_0805A464 + .4byte sub_0805A370 + .4byte sub_0805A394 + .4byte nullsub_496 + +gUnk_0810860C:: @ 0810860C + .4byte 00000000 + .4byte sub_0805A464 + .4byte sub_0805A480 + .4byte sub_0805A498 + .4byte sub_0805A4B4 + +gUnk_08108620:: @ 08108620 + .4byte 00000000 + .4byte sub_0805A5FC + .4byte sub_0805A618 + .4byte sub_0805A628 + .4byte sub_0805A64C + .4byte sub_0805A65C + +gUnk_08108638:: @ 08108638 + .4byte sub_0805A6E8 + .4byte sub_0805A758 + .4byte sub_0805A76C + .4byte sub_0805A7E4 + +gUnk_08108648:: @ 08108648 + .incbin "baserom.gba", 0x108648, 0x000000C diff --git a/data/const/manager/manager17.inc b/data/const/manager/manager17.inc new file mode 100644 index 00000000..70a65adf --- /dev/null +++ b/data/const/manager/manager17.inc @@ -0,0 +1,3 @@ +gUnk_08108654:: @ 08108654 + .4byte sub_0805AD60 + .4byte sub_0805AD80 diff --git a/data/const/manager/manager18.inc b/data/const/manager/manager18.inc new file mode 100644 index 00000000..3e3ce111 --- /dev/null +++ b/data/const/manager/manager18.inc @@ -0,0 +1,2 @@ +gUnk_0810865C:: @ 0810865C + .incbin "baserom.gba", 0x10865C, 0x000000C diff --git a/data/const/manager/manager1A.inc b/data/const/manager/manager1A.inc new file mode 100644 index 00000000..3d54bfaf --- /dev/null +++ b/data/const/manager/manager1A.inc @@ -0,0 +1,114 @@ +gUnk_08108668:: @ 08108668 + .4byte sub_0805B048 + .4byte sub_0805B168 + +gUnk_08108670:: @ 08108670 + .incbin "baserom.gba", 0x108670, 0x000000C + +gUnk_0810867C:: @ 0810867C + .incbin "baserom.gba", 0x10867C, 0x000000C + +gUnk_08108688:: @ 08108688 + .incbin "baserom.gba", 0x108688, 0x000000C + +gUnk_08108694:: @ 08108694 + .incbin "baserom.gba", 0x108694, 0x000000C + +gUnk_081086A0:: @ 081086A0 + .incbin "baserom.gba", 0x1086A0, 0x0000009 + +gUnk_081086A9:: @ 081086A9 + .incbin "baserom.gba", 0x1086A9, 0x0000003 + +gUnk_081086AC:: @ 081086AC + .incbin "baserom.gba", 0x1086AC, 0x000000C + +gUnk_081086B8:: @ 081086B8 + .incbin "baserom.gba", 0x1086B8, 0x000000C + +gUnk_081086C4:: @ 081086C4 + .incbin "baserom.gba", 0x1086C4, 0x000000C + +gUnk_081086D0:: @ 081086D0 + .incbin "baserom.gba", 0x1086D0, 0x0000001 + +gUnk_081086D1:: @ 081086D1 + .incbin "baserom.gba", 0x1086D1, 0x000000B + +gUnk_081086DC:: @ 081086DC + .incbin "baserom.gba", 0x1086DC, 0x0000008 + +gUnk_081086E4:: @ 081086E4 + .incbin "baserom.gba", 0x1086E4, 0x0000008 + +gUnk_081086EC:: @ 081086EC + .incbin "baserom.gba", 0x1086EC, 0x0000008 + +gUnk_081086F4:: @ 081086F4 + .incbin "baserom.gba", 0x1086F4, 0x0000008 + +gUnk_081086FC:: @ 081086FC + .incbin "baserom.gba", 0x1086FC, 0x0000008 + +gUnk_08108704:: @ 08108704 + .incbin "baserom.gba", 0x108704, 0x0000003 + +gUnk_08108707:: @ 08108707 + .incbin "baserom.gba", 0x108707, 0x0000005 + +gUnk_0810870C:: @ 0810870C + .incbin "baserom.gba", 0x10870C, 0x0000008 + +gUnk_08108714:: @ 08108714 + .incbin "baserom.gba", 0x108714, 0x0000008 + +gUnk_0810871C:: @ 0810871C + .incbin "baserom.gba", 0x10871C, 0x0000008 + +gUnk_08108724:: @ 08108724 + .incbin "baserom.gba", 0x108724, 0x0000008 + +gUnk_0810872C:: @ 0810872C + .incbin "baserom.gba", 0x10872C, 0x0000008 + +gUnk_08108734:: @ 08108734 + .incbin "baserom.gba", 0x108734, 0x0000008 + +gUnk_0810873C:: @ 0810873C + .incbin "baserom.gba", 0x10873C, 0x0000008 + +gUnk_08108744:: @ 08108744 + .incbin "baserom.gba", 0x108744, 0x0000006 + +gUnk_0810874A:: @ 0810874A + .incbin "baserom.gba", 0x10874A, 0x0000002 + +gUnk_0810874C:: @ 0810874C + .incbin "baserom.gba", 0x10874C, 0x0000008 + +gUnk_08108754:: @ 08108754 + .incbin "baserom.gba", 0x108754, 0x0000008 + +gUnk_0810875C:: @ 0810875C + .incbin "baserom.gba", 0x10875C, 0x0000002 + +gUnk_0810875E:: @ 0810875E + .incbin "baserom.gba", 0x10875E, 0x0000006 + +gUnk_08108764:: @ 08108764 + .incbin "baserom.gba", 0x108764, 0x00000AF + +gUnk_08108813:: @ 08108813 + .incbin "baserom.gba", 0x108813, 0x0000031 + +gUnk_08108844:: @ 08108844 + .incbin "baserom.gba", 0x108844, 0x0000020 + +gUnk_08108864:: @ 08108864 + .incbin "baserom.gba", 0x108864, 0x0000237 + +gUnk_08108A9B:: @ 08108A9B + .incbin "baserom.gba", 0x108A9B, 0x0000177 + +gUnk_08108C12:: @ 08108C12 + .incbin "baserom.gba", 0x108C12, 0x0000016 diff --git a/data/const/manager/manager1B.inc b/data/const/manager/manager1B.inc new file mode 100644 index 00000000..05e8790e --- /dev/null +++ b/data/const/manager/manager1B.inc @@ -0,0 +1,12 @@ +gUnk_08108C28:: @ 08108C28 + .incbin "baserom.gba", 0x108C28, 0x000001C + +gUnk_08108C44:: @ 08108C44 + .incbin "baserom.gba", 0x108C44, 0x0000010 + +gUnk_08108C54:: @ 08108C54 + .4byte sub_0805B448 + .4byte sub_0805B474 + +gUnk_08108C5C:: @ 08108C5C + .incbin "baserom.gba", 0x108C5C, 0x0000008 diff --git a/data/const/manager/manager1C.inc b/data/const/manager/manager1C.inc new file mode 100644 index 00000000..213775f5 --- /dev/null +++ b/data/const/manager/manager1C.inc @@ -0,0 +1,12 @@ +gUnk_08108C64:: @ 08108C64 + .4byte sub_0805B554 + .4byte sub_0805B55C + +gUnk_08108C6C:: @ 08108C6C + .incbin "baserom.gba", 0x108C6C, 0x000000B + +gUnk_08108C77:: @ 08108C77 + .incbin "baserom.gba", 0x108C77, 0x0000005 + +gUnk_08108C7C:: @ 08108C7C + .incbin "baserom.gba", 0x108C7C, 0x0000004 diff --git a/data/const/manager/manager1D.inc b/data/const/manager/manager1D.inc new file mode 100644 index 00000000..dbccc9ac --- /dev/null +++ b/data/const/manager/manager1D.inc @@ -0,0 +1,6 @@ +gUnk_08108C80:: @ 08108C80 + .4byte sub_0805B5E0 + .4byte sub_0805B638 + +gUnk_08108C88:: @ 08108C88 + .incbin "baserom.gba", 0x108C88, 0x0000004 diff --git a/data/const/manager/manager1F.inc b/data/const/manager/manager1F.inc new file mode 100644 index 00000000..318315b5 --- /dev/null +++ b/data/const/manager/manager1F.inc @@ -0,0 +1,5 @@ +gUnk_08108C94:: @ 08108C94 + .incbin "baserom.gba", 0x108C94, 0x0000008 + +gUnk_08108C9C:: @ 08108C9C + .incbin "baserom.gba", 0x108C9C, 0x000000C diff --git a/data/const/manager/manager22.inc b/data/const/manager/manager22.inc new file mode 100644 index 00000000..bbbb8b13 --- /dev/null +++ b/data/const/manager/manager22.inc @@ -0,0 +1,2 @@ +gUnk_08108CA8:: @ 08108CA8 + .incbin "baserom.gba", 0x108CA8, 0x0000024 diff --git a/data/const/manager/manager23.inc b/data/const/manager/manager23.inc new file mode 100644 index 00000000..6ed24445 --- /dev/null +++ b/data/const/manager/manager23.inc @@ -0,0 +1,5 @@ +gUnk_08108CCC:: @ 08108CCC + .4byte sub_0805BC8C + .4byte sub_0805BCD4 + .4byte sub_0805BD5C + .4byte sub_0805BDB4 diff --git a/data/const/manager/manager24.inc b/data/const/manager/manager24.inc new file mode 100644 index 00000000..cf264992 --- /dev/null +++ b/data/const/manager/manager24.inc @@ -0,0 +1,14 @@ +gUnk_08108CDC:: @ 08108CDC + .4byte sub_0805BF30 + .4byte sub_0805BF78 + .4byte sub_0805BFA4 + +gUnk_08108CE8:: @ 08108CE8 + .4byte sub_0805C050 + .4byte sub_0805C178 + .4byte sub_0805C294 + .4byte sub_0805C3B4 + .4byte sub_0805C4E0 + +gUnk_08108CFC:: @ 08108CFC + .incbin "baserom.gba", 0x108CFC, 0x0000008 diff --git a/data/const/manager/manager2B.inc b/data/const/manager/manager2B.inc new file mode 100644 index 00000000..052d47b5 --- /dev/null +++ b/data/const/manager/manager2B.inc @@ -0,0 +1,2 @@ +gUnk_08108D30:: @ 08108D30 + .incbin "baserom.gba", 0x108D30, 0x000000C diff --git a/data/const/manager/manager2E.inc b/data/const/manager/manager2E.inc new file mode 100644 index 00000000..557bc50d --- /dev/null +++ b/data/const/manager/manager2E.inc @@ -0,0 +1,8 @@ +gUnk_08108D3C:: @ 08108D3C + .incbin "baserom.gba", 0x108D3C, 0x0000008 + +gUnk_08108D44:: @ 08108D44 + .incbin "baserom.gba", 0x108D44, 0x000000C + +gUnk_08108D50:: @ 08108D50 + .incbin "baserom.gba", 0x108D50, 0x000000C diff --git a/data/const/manager/manager3.inc b/data/const/manager/manager3.inc new file mode 100644 index 00000000..d937fad6 --- /dev/null +++ b/data/const/manager/manager3.inc @@ -0,0 +1,2 @@ +gUnk_08107C6C:: @ 08107C6C + .incbin "baserom.gba", 0x107C6C, 0x0000004 diff --git a/data/const/manager/manager31.inc b/data/const/manager/manager31.inc new file mode 100644 index 00000000..513b6129 --- /dev/null +++ b/data/const/manager/manager31.inc @@ -0,0 +1,2 @@ +gUnk_08108D5C:: @ 08108D5C + .incbin "baserom.gba", 0x108D5C, 0x0000018 diff --git a/data/const/manager/manager32.inc b/data/const/manager/manager32.inc new file mode 100644 index 00000000..84e759b6 --- /dev/null +++ b/data/const/manager/manager32.inc @@ -0,0 +1,8 @@ +gUnk_08108D74:: @ 08108D74 + .incbin "baserom.gba", 0x108D74, 0x0000008 + +gUnk_08108D7C:: @ 08108D7C + .4byte sub_0805D7DC + .4byte sub_0805D860 + .4byte sub_0805D900 + .4byte sub_0805D98C diff --git a/data/const/manager/manager34.inc b/data/const/manager/manager34.inc new file mode 100644 index 00000000..a869f690 --- /dev/null +++ b/data/const/manager/manager34.inc @@ -0,0 +1,4 @@ +gUnk_08108D8C:: @ 08108D8C + .4byte sub_0805DBB4 + .4byte sub_0805DBCC + .4byte nullsub_498 diff --git a/data/const/manager/manager35.inc b/data/const/manager/manager35.inc new file mode 100644 index 00000000..b9f59def --- /dev/null +++ b/data/const/manager/manager35.inc @@ -0,0 +1,5 @@ +gUnk_08108D98:: @ 08108D98 + .4byte sub_0805DC9C + .4byte sub_0805DCC8 + .4byte sub_0805DD24 + .4byte sub_0805DD68 diff --git a/data/const/manager/manager36.inc b/data/const/manager/manager36.inc new file mode 100644 index 00000000..a597b752 --- /dev/null +++ b/data/const/manager/manager36.inc @@ -0,0 +1,3 @@ +gUnk_08108DA8:: @ 08108DA8 + .incbin "baserom.gba", 0x108DA8, 0x0000014 + diff --git a/data/const/manager/manager37.inc b/data/const/manager/manager37.inc new file mode 100644 index 00000000..5353e1a5 --- /dev/null +++ b/data/const/manager/manager37.inc @@ -0,0 +1,14 @@ +gUnk_08108DBC:: @ 08108DBC + .4byte sub_0805DE50 + .4byte sub_0805DFE8 + +gUnk_08108DC4:: @ 08108DC4 + .4byte sub_0805DE68 + .4byte sub_0805DEB8 + .4byte sub_0805DF4C + .4byte sub_0805DF98 + .4byte sub_0805DFCC + +gUnk_08108DD8:: @ 08108DD8 + .4byte sub_0805E000 + .4byte sub_0805E078 diff --git a/data/const/manager/manager38.inc b/data/const/manager/manager38.inc new file mode 100644 index 00000000..b1d5c05f --- /dev/null +++ b/data/const/manager/manager38.inc @@ -0,0 +1,3 @@ +gUnk_08108DE0:: @ 08108DE0 + .4byte sub_0805E0C0 + .4byte sub_0805E0F4 diff --git a/data/const/manager/manager39.inc b/data/const/manager/manager39.inc new file mode 100644 index 00000000..4e83978f --- /dev/null +++ b/data/const/manager/manager39.inc @@ -0,0 +1,18 @@ +gUnk_08108DE8:: @ 08108DE8 + .incbin "baserom.gba", 0x108DE8, 0x0000040 + +gUnk_08108E28:: @ 08108E28 + .4byte sub_0805E140 + .4byte sub_0805E18C + +gUnk_08108E30:: @ 08108E30 + .incbin "baserom.gba", 0x108E30, 0x0000018 + +gUnk_08108E48:: @ 08108E48 + .incbin "baserom.gba", 0x108E48, 0x0000002 + +gUnk_08108E4A:: @ 08108E4A + .incbin "baserom.gba", 0x108E4A, 0x0000016 + +gUnk_08108E60:: @ 08108E60 + .incbin "baserom.gba", 0x108E60, 0x000000C diff --git a/data/const/manager/manager4.inc b/data/const/manager/manager4.inc new file mode 100644 index 00000000..b49447e8 --- /dev/null +++ b/data/const/manager/manager4.inc @@ -0,0 +1,206 @@ +gUnk_08107C70:: @ 08107C70 + .4byte sub_0805786C + .4byte sub_08057920 + +gUnk_08107C78:: @ 08107C78 + .incbin "baserom.gba", 0x107C78, 0x0000008 + +gUnk_08107C80:: @ 08107C80 + .incbin "baserom.gba", 0x107C80, 0x0000018 + +gUnk_08107C98:: @ 08107C98 + .incbin "baserom.gba", 0x107C98, 0x0000028 + +gUnk_08107CC0:: @ 08107CC0 + .incbin "baserom.gba", 0x107CC0, 0x0000010 + +gUnk_08107CD0:: @ 08107CD0 + .incbin "baserom.gba", 0x107CD0, 0x0000010 + +gUnk_08107CE0:: @ 08107CE0 + .incbin "baserom.gba", 0x107CE0, 0x0000018 + +gUnk_08107CF8:: @ 08107CF8 + .incbin "baserom.gba", 0x107CF8, 0x000000A + +gUnk_08107D02:: @ 08107D02 + .incbin "baserom.gba", 0x107D02, 0x0000006 + +gUnk_08107D08:: @ 08107D08 + .incbin "baserom.gba", 0x107D08, 0x0000018 + +gUnk_08107D20:: @ 08107D20 + .incbin "baserom.gba", 0x107D20, 0x0000018 + +gUnk_08107D38:: @ 08107D38 + .incbin "baserom.gba", 0x107D38, 0x0000010 + +gUnk_08107D48:: @ 08107D48 + .incbin "baserom.gba", 0x107D48, 0x0000020 + +gUnk_08107D68:: @ 08107D68 + .incbin "baserom.gba", 0x107D68, 0x0000010 + +gUnk_08107D78:: @ 08107D78 + .incbin "baserom.gba", 0x107D78, 0x0000018 + +gUnk_08107D90:: @ 08107D90 + .incbin "baserom.gba", 0x107D90, 0x0000010 + +gUnk_08107DA0:: @ 08107DA0 + .incbin "baserom.gba", 0x107DA0, 0x0000020 + +diggingCaveEntrances:: @ 08107DC0 + .4byte gUnk_08107C80 + .4byte gUnk_08107C78 + .4byte gUnk_08107CC0 + .4byte gUnk_08107C98 + .4byte gUnk_08107CF8 + .4byte gUnk_08107C78 + .4byte gUnk_08107CD0 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107CE0 + .4byte gUnk_08107D08 + .4byte gUnk_08107D20 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107D38 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107D48 + .4byte gUnk_08107D68 + .4byte gUnk_08107C78 + .4byte gUnk_08107D78 + .4byte gUnk_08107D90 + .4byte gUnk_08107C78 + .4byte gUnk_08107DA0 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 + .4byte gUnk_08107C78 diff --git a/data/const/manager/managerD.inc b/data/const/manager/managerD.inc new file mode 100644 index 00000000..68fad9a1 --- /dev/null +++ b/data/const/manager/managerD.inc @@ -0,0 +1,4 @@ +gUnk_08108308:: @ 08108308 + .4byte sub_08058DE8 + .4byte sub_08058E18 + .4byte sub_08058E34 diff --git a/data/const/manager/managerF.inc b/data/const/manager/managerF.inc new file mode 100644 index 00000000..b2e445f6 --- /dev/null +++ b/data/const/manager/managerF.inc @@ -0,0 +1,26 @@ +gUnk_08108314:: @ 08108314 + .4byte sub_08058EE4 + .4byte sub_08058FB0 + .4byte sub_08058FB0 + .4byte sub_08059094 + .4byte sub_080590E0 + .4byte sub_08059124 + .4byte sub_080591CC + .4byte sub_08059220 + .4byte sub_08059290 + .4byte sub_080592A4 + .4byte sub_08059368 + .4byte sub_0805938C + .4byte sub_08059424 + .4byte sub_0805947C + .4byte sub_080594DC + .4byte sub_08059548 + +gUnk_08108354:: @ 08108354 + .incbin "baserom.gba", 0x108354, 0x000002C + +gUnk_08108380:: @ 08108380 + .4byte script_0800E600 + .4byte script_0800E62C + .4byte script_0800E658 + .4byte script_0800E684 diff --git a/data/const/playerItem/item11.inc b/data/const/playerItem/item11.inc new file mode 100644 index 00000000..3d9ad52e --- /dev/null +++ b/data/const/playerItem/item11.inc @@ -0,0 +1,6 @@ +gUnk_08109AC8:: @ 08109AC8 + .4byte sub_0805FBE8 + .4byte sub_0805FC74 + +gUnk_08109AD0:: @ 08109AD0 + .incbin "baserom.gba", 0x109AD0, 0x0000008 diff --git a/data/data_08107BC8.s b/data/data_08107BC8.s index 599388bd..fe30e85b 100755 --- a/data/data_08107BC8.s +++ b/data/data_08107BC8.s @@ -16,77 +16,11 @@ gUnk_08107C14:: @ 08107C14 gUnk_08107C18:: @ 08107C18 .incbin "baserom.gba", 0x107C18, 0x0000004 -gUnk_08107C1C:: @ 08107C1C - .incbin "baserom.gba", 0x107C1C, 0x000000E -gUnk_08107C2A:: @ 08107C2A - .incbin "baserom.gba", 0x107C2A, 0x0000006 + @ TODO convert .inc files into .s files and include them in linker.ld + .include "data/const/manager/manager1.inc" -gUnk_08107C30:: @ 08107C30 - .incbin "baserom.gba", 0x107C30, 0x0000010 + .include "data/const/manager/manager3.inc" -gUnk_08107C40:: @ 08107C40 - .incbin "baserom.gba", 0x107C40, 0x0000008 + .include "data/const/manager/manager4.inc" -gUnk_08107C48:: @ 08107C48 - .incbin "baserom.gba", 0x107C48, 0x0000014 - -gUnk_08107C5C:: @ 08107C5C - .incbin "baserom.gba", 0x107C5C, 0x0000010 - -gUnk_08107C6C:: @ 08107C6C - .incbin "baserom.gba", 0x107C6C, 0x0000004 - -gUnk_08107C70:: @ 08107C70 - .incbin "baserom.gba", 0x107C70, 0x0000008 - -gUnk_08107C78:: @ 08107C78 - .incbin "baserom.gba", 0x107C78, 0x0000008 - -gUnk_08107C80:: @ 08107C80 - .incbin "baserom.gba", 0x107C80, 0x0000018 - -gUnk_08107C98:: @ 08107C98 - .incbin "baserom.gba", 0x107C98, 0x0000028 - -gUnk_08107CC0:: @ 08107CC0 - .incbin "baserom.gba", 0x107CC0, 0x0000010 - -gUnk_08107CD0:: @ 08107CD0 - .incbin "baserom.gba", 0x107CD0, 0x0000010 - -gUnk_08107CE0:: @ 08107CE0 - .incbin "baserom.gba", 0x107CE0, 0x0000018 - -gUnk_08107CF8:: @ 08107CF8 - .incbin "baserom.gba", 0x107CF8, 0x000000A - -gUnk_08107D02:: @ 08107D02 - .incbin "baserom.gba", 0x107D02, 0x0000006 - -gUnk_08107D08:: @ 08107D08 - .incbin "baserom.gba", 0x107D08, 0x0000018 - -gUnk_08107D20:: @ 08107D20 - .incbin "baserom.gba", 0x107D20, 0x0000018 - -gUnk_08107D38:: @ 08107D38 - .incbin "baserom.gba", 0x107D38, 0x0000010 - -gUnk_08107D48:: @ 08107D48 - .incbin "baserom.gba", 0x107D48, 0x0000020 - -gUnk_08107D68:: @ 08107D68 - .incbin "baserom.gba", 0x107D68, 0x0000010 - -gUnk_08107D78:: @ 08107D78 - .incbin "baserom.gba", 0x107D78, 0x0000018 - -gUnk_08107D90:: @ 08107D90 - .incbin "baserom.gba", 0x107D90, 0x0000010 - -gUnk_08107DA0:: @ 08107DA0 - .incbin "baserom.gba", 0x107DA0, 0x0000020 - -gUnk_08107DC0:: @ 08107DC0 - .incbin "baserom.gba", 0x107DC0, 0x0000264 diff --git a/data/data_08108308.s b/data/data_08108308.s index 766c4202..6aa28759 100644 --- a/data/data_08108308.s +++ b/data/data_08108308.s @@ -4,236 +4,29 @@ .section .rodata .align 2 -gUnk_08108308:: @ 08108308 - .incbin "baserom.gba", 0x108308, 0x000000C + @ TODO convert .inc files into .s files and include them in linker.ld + .include "data/const/manager/managerD.inc" -gUnk_08108314:: @ 08108314 - .incbin "baserom.gba", 0x108314, 0x0000040 + .include "data/const/manager/managerF.inc" -gUnk_08108354:: @ 08108354 - .incbin "baserom.gba", 0x108354, 0x000002C + .include "data/const/manager/manager10.inc" -gUnk_08108380:: @ 08108380 - .incbin "baserom.gba", 0x108380, 0x0000010 + .include "data/const/manager/manager12.inc" -gUnk_08108390:: @ 08108390 - .incbin "baserom.gba", 0x108390, 0x0000008 + .include "data/const/manager/manager13.inc" -gUnk_08108398:: @ 08108398 - .incbin "baserom.gba", 0x108398, 0x0000016 + .include "data/const/manager/manager14.inc" -gUnk_081083AE:: @ 081083AE - .incbin "baserom.gba", 0x1083AE, 0x0000016 + .include "data/const/manager/manager15.inc" -gUnk_081083C4:: @ 081083C4 - .incbin "baserom.gba", 0x1083C4, 0x0000016 + .include "data/const/manager/manager17.inc" -gUnk_081083DA:: @ 081083DA - .incbin "baserom.gba", 0x1083DA, 0x0000018 + .include "data/const/manager/manager18.inc" -gUnk_081083F2:: @ 081083F2 - .incbin "baserom.gba", 0x1083F2, 0x0000016 + .include "data/const/manager/manager1A.inc" -gUnk_08108408:: @ 08108408 - .incbin "baserom.gba", 0x108408, 0x000003C + .include "data/const/manager/manager1B.inc" -gUnk_08108444:: @ 08108444 - .incbin "baserom.gba", 0x108444, 0x0000024 + .include "data/const/manager/manager1C.inc" -gUnk_08108468:: @ 08108468 - .incbin "baserom.gba", 0x108468, 0x0000026 - -gUnk_0810848E:: @ 0810848E - .incbin "baserom.gba", 0x10848E, 0x0000035 - -gUnk_081084C3:: @ 081084C3 - .incbin "baserom.gba", 0x1084C3, 0x0000005 - -gUnk_081084C8:: @ 081084C8 - .incbin "baserom.gba", 0x1084C8, 0x000004A - -gUnk_08108512:: @ 08108512 - .incbin "baserom.gba", 0x108512, 0x000001E - -gUnk_08108530:: @ 08108530 - .incbin "baserom.gba", 0x108530, 0x0000058 - -gUnk_08108588:: @ 08108588 - .incbin "baserom.gba", 0x108588, 0x0000012 - -gUnk_0810859A:: @ 0810859A - .incbin "baserom.gba", 0x10859A, 0x000000A - -gUnk_081085A4:: @ 081085A4 - .incbin "baserom.gba", 0x1085A4, 0x0000014 - -gUnk_081085B8:: @ 081085B8 - .incbin "baserom.gba", 0x1085B8, 0x0000020 - -gUnk_081085D8:: @ 081085D8 - .incbin "baserom.gba", 0x1085D8, 0x0000020 - -gUnk_081085F8:: @ 081085F8 - .incbin "baserom.gba", 0x1085F8, 0x0000014 - -gUnk_0810860C:: @ 0810860C - .incbin "baserom.gba", 0x10860C, 0x0000014 - -gUnk_08108620:: @ 08108620 - .incbin "baserom.gba", 0x108620, 0x0000018 - -gUnk_08108638:: @ 08108638 - .incbin "baserom.gba", 0x108638, 0x0000010 - -gUnk_08108648:: @ 08108648 - .incbin "baserom.gba", 0x108648, 0x000000C - -gUnk_08108654:: @ 08108654 - .incbin "baserom.gba", 0x108654, 0x0000008 - -gUnk_0810865C:: @ 0810865C - .incbin "baserom.gba", 0x10865C, 0x000000C - -gUnk_08108668:: @ 08108668 - .incbin "baserom.gba", 0x108668, 0x0000008 - -gUnk_08108670:: @ 08108670 - .incbin "baserom.gba", 0x108670, 0x000000C - -gUnk_0810867C:: @ 0810867C - .incbin "baserom.gba", 0x10867C, 0x000000C - -gUnk_08108688:: @ 08108688 - .incbin "baserom.gba", 0x108688, 0x000000C - -gUnk_08108694:: @ 08108694 - .incbin "baserom.gba", 0x108694, 0x000000C - -gUnk_081086A0:: @ 081086A0 - .incbin "baserom.gba", 0x1086A0, 0x0000009 - -gUnk_081086A9:: @ 081086A9 - .incbin "baserom.gba", 0x1086A9, 0x0000003 - -gUnk_081086AC:: @ 081086AC - .incbin "baserom.gba", 0x1086AC, 0x000000C - -gUnk_081086B8:: @ 081086B8 - .incbin "baserom.gba", 0x1086B8, 0x000000C - -gUnk_081086C4:: @ 081086C4 - .incbin "baserom.gba", 0x1086C4, 0x000000C - -gUnk_081086D0:: @ 081086D0 - .incbin "baserom.gba", 0x1086D0, 0x0000001 - -gUnk_081086D1:: @ 081086D1 - .incbin "baserom.gba", 0x1086D1, 0x000000B - -gUnk_081086DC:: @ 081086DC - .incbin "baserom.gba", 0x1086DC, 0x0000008 - -gUnk_081086E4:: @ 081086E4 - .incbin "baserom.gba", 0x1086E4, 0x0000008 - -gUnk_081086EC:: @ 081086EC - .incbin "baserom.gba", 0x1086EC, 0x0000008 - -gUnk_081086F4:: @ 081086F4 - .incbin "baserom.gba", 0x1086F4, 0x0000008 - -gUnk_081086FC:: @ 081086FC - .incbin "baserom.gba", 0x1086FC, 0x0000008 - -gUnk_08108704:: @ 08108704 - .incbin "baserom.gba", 0x108704, 0x0000003 - -gUnk_08108707:: @ 08108707 - .incbin "baserom.gba", 0x108707, 0x0000005 - -gUnk_0810870C:: @ 0810870C - .incbin "baserom.gba", 0x10870C, 0x0000008 - -gUnk_08108714:: @ 08108714 - .incbin "baserom.gba", 0x108714, 0x0000008 - -gUnk_0810871C:: @ 0810871C - .incbin "baserom.gba", 0x10871C, 0x0000008 - -gUnk_08108724:: @ 08108724 - .incbin "baserom.gba", 0x108724, 0x0000008 - -gUnk_0810872C:: @ 0810872C - .incbin "baserom.gba", 0x10872C, 0x0000008 - -gUnk_08108734:: @ 08108734 - .incbin "baserom.gba", 0x108734, 0x0000008 - -gUnk_0810873C:: @ 0810873C - .incbin "baserom.gba", 0x10873C, 0x0000008 - -gUnk_08108744:: @ 08108744 - .incbin "baserom.gba", 0x108744, 0x0000006 - -gUnk_0810874A:: @ 0810874A - .incbin "baserom.gba", 0x10874A, 0x0000002 - -gUnk_0810874C:: @ 0810874C - .incbin "baserom.gba", 0x10874C, 0x0000008 - -gUnk_08108754:: @ 08108754 - .incbin "baserom.gba", 0x108754, 0x0000008 - -gUnk_0810875C:: @ 0810875C - .incbin "baserom.gba", 0x10875C, 0x0000002 - -gUnk_0810875E:: @ 0810875E - .incbin "baserom.gba", 0x10875E, 0x0000006 - -gUnk_08108764:: @ 08108764 - .incbin "baserom.gba", 0x108764, 0x00000AF - -gUnk_08108813:: @ 08108813 - .incbin "baserom.gba", 0x108813, 0x0000031 - -gUnk_08108844:: @ 08108844 - .incbin "baserom.gba", 0x108844, 0x0000020 - -gUnk_08108864:: @ 08108864 - .incbin "baserom.gba", 0x108864, 0x0000237 - -gUnk_08108A9B:: @ 08108A9B - .incbin "baserom.gba", 0x108A9B, 0x0000177 - -gUnk_08108C12:: @ 08108C12 - .incbin "baserom.gba", 0x108C12, 0x0000016 - -gUnk_08108C28:: @ 08108C28 - .incbin "baserom.gba", 0x108C28, 0x000001C - -gUnk_08108C44:: @ 08108C44 - .incbin "baserom.gba", 0x108C44, 0x0000010 - -gUnk_08108C54:: @ 08108C54 - .incbin "baserom.gba", 0x108C54, 0x0000008 - -gUnk_08108C5C:: @ 08108C5C - .incbin "baserom.gba", 0x108C5C, 0x0000008 - -gUnk_08108C64:: @ 08108C64 - .incbin "baserom.gba", 0x108C64, 0x0000008 - -gUnk_08108C6C:: @ 08108C6C - .incbin "baserom.gba", 0x108C6C, 0x000000B - -gUnk_08108C77:: @ 08108C77 - .incbin "baserom.gba", 0x108C77, 0x0000005 - -gUnk_08108C7C:: @ 08108C7C - .incbin "baserom.gba", 0x108C7C, 0x0000004 - -gUnk_08108C80:: @ 08108C80 - .incbin "baserom.gba", 0x108C80, 0x0000008 - -gUnk_08108C88:: @ 08108C88 - .incbin "baserom.gba", 0x108C88, 0x0000004 + .include "data/const/manager/manager1D.inc" diff --git a/data/data_08108C94.s b/data/data_08108C94.s index 7d6cf7b4..229e08dd 100644 --- a/data/data_08108C94.s +++ b/data/data_08108C94.s @@ -4,23 +4,11 @@ .section .rodata .align 2 -gUnk_08108C94:: @ 08108C94 - .incbin "baserom.gba", 0x108C94, 0x0000008 + @ TODO convert .inc files into .s files and include them in linker.ld + .include "data/const/manager/manager1F.inc" -gUnk_08108C9C:: @ 08108C9C - .incbin "baserom.gba", 0x108C9C, 0x000000C + .include "data/const/manager/manager22.inc" -gUnk_08108CA8:: @ 08108CA8 - .incbin "baserom.gba", 0x108CA8, 0x0000024 + .include "data/const/manager/manager23.inc" -gUnk_08108CCC:: @ 08108CCC - .incbin "baserom.gba", 0x108CCC, 0x0000010 - -gUnk_08108CDC:: @ 08108CDC - .incbin "baserom.gba", 0x108CDC, 0x000000C - -gUnk_08108CE8:: @ 08108CE8 - .incbin "baserom.gba", 0x108CE8, 0x0000014 - -gUnk_08108CFC:: @ 08108CFC - .incbin "baserom.gba", 0x108CFC, 0x0000008 + .include "data/const/manager/manager24.inc" \ No newline at end of file diff --git a/data/data_08108D30.s b/data/data_08108D30.s index d637ad39..6e39725f 100644 --- a/data/data_08108D30.s +++ b/data/data_08108D30.s @@ -4,68 +4,26 @@ .section .rodata .align 2 -gUnk_08108D30:: @ 08108D30 - .incbin "baserom.gba", 0x108D30, 0x000000C + @ TODO convert .inc files into .s files and include them in linker.ld + .include "data/const/manager/manager2B.inc" -gUnk_08108D3C:: @ 08108D3C - .incbin "baserom.gba", 0x108D3C, 0x0000008 + .include "data/const/manager/manager2E.inc" -gUnk_08108D44:: @ 08108D44 - .incbin "baserom.gba", 0x108D44, 0x000000C + .include "data/const/manager/manager31.inc" -gUnk_08108D50:: @ 08108D50 - .incbin "baserom.gba", 0x108D50, 0x000000C + .include "data/const/manager/manager32.inc" -gUnk_08108D5C:: @ 08108D5C - .incbin "baserom.gba", 0x108D5C, 0x0000018 + .include "data/const/manager/manager34.inc" -gUnk_08108D74:: @ 08108D74 - .incbin "baserom.gba", 0x108D74, 0x0000008 + .include "data/const/manager/manager35.inc" -gUnk_08108D7C:: @ 08108D7C - .incbin "baserom.gba", 0x108D7C, 0x0000010 + .include "data/const/manager/manager36.inc" -gUnk_08108D8C:: @ 08108D8C - .incbin "baserom.gba", 0x108D8C, 0x000000B + .include "data/const/manager/manager37.inc" -gUnk_08108D97:: @ 08108D97 - .incbin "baserom.gba", 0x108D97, 0x0000001 + .include "data/const/manager/manager38.inc" -gUnk_08108D98:: @ 08108D98 - .incbin "baserom.gba", 0x108D98, 0x0000010 - -gUnk_08108DA8:: @ 08108DA8 - .incbin "baserom.gba", 0x108DA8, 0x0000014 - -gUnk_08108DBC:: @ 08108DBC - .incbin "baserom.gba", 0x108DBC, 0x0000008 - -gUnk_08108DC4:: @ 08108DC4 - .incbin "baserom.gba", 0x108DC4, 0x0000014 - -gUnk_08108DD8:: @ 08108DD8 - .incbin "baserom.gba", 0x108DD8, 0x0000008 - -gUnk_08108DE0:: @ 08108DE0 - .incbin "baserom.gba", 0x108DE0, 0x0000008 - -gUnk_08108DE8:: @ 08108DE8 - .incbin "baserom.gba", 0x108DE8, 0x0000040 - -gUnk_08108E28:: @ 08108E28 - .incbin "baserom.gba", 0x108E28, 0x0000008 - -gUnk_08108E30:: @ 08108E30 - .incbin "baserom.gba", 0x108E30, 0x0000018 - -gUnk_08108E48:: @ 08108E48 - .incbin "baserom.gba", 0x108E48, 0x0000002 - -gUnk_08108E4A:: @ 08108E4A - .incbin "baserom.gba", 0x108E4A, 0x0000016 - -gUnk_08108E60:: @ 08108E60 - .incbin "baserom.gba", 0x108E60, 0x000000C + .include "data/const/manager/manager39.inc" gUnk_08108E6C:: @ 08108E6C .incbin "baserom.gba", 0x108E6C, 0x000000C @@ -74,7 +32,8 @@ gUnk_08108E78:: @ 08108E78 .incbin "baserom.gba", 0x108E78, 0x0000018 gUnk_08108E90:: @ 08108E90 - .incbin "baserom.gba", 0x108E90, 0x0000008 + .4byte gUnk_08108E6C + .4byte gUnk_08108E78 gUnk_08108E98:: @ 08108E98 .incbin "baserom.gba", 0x108E98, 0x000000C @@ -83,7 +42,8 @@ gUnk_08108EA4:: @ 08108EA4 .incbin "baserom.gba", 0x108EA4, 0x0000018 gUnk_08108EBC:: @ 08108EBC - .incbin "baserom.gba", 0x108EBC, 0x0000008 + .4byte gUnk_08108E98 + .4byte gUnk_08108EA4 gUnk_08108EC4:: @ 08108EC4 .incbin "baserom.gba", 0x108EC4, 0x000000C @@ -92,7 +52,8 @@ gUnk_08108ED0:: @ 08108ED0 .incbin "baserom.gba", 0x108ED0, 0x0000018 gUnk_08108EE8:: @ 08108EE8 - .incbin "baserom.gba", 0x108EE8, 0x0000008 + .4byte gUnk_08108EC4 + .4byte gUnk_08108ED0 gUnk_08108EF0:: @ 08108EF0 .incbin "baserom.gba", 0x108EF0, 0x000000C @@ -101,7 +62,8 @@ gUnk_08108EFC:: @ 08108EFC .incbin "baserom.gba", 0x108EFC, 0x0000018 gUnk_08108F14:: @ 08108F14 - .incbin "baserom.gba", 0x108F14, 0x0000008 + .4byte gUnk_08108EF0 + .4byte gUnk_08108EFC gUnk_08108F1C:: @ 08108F1C .incbin "baserom.gba", 0x108F1C, 0x000000C @@ -110,7 +72,8 @@ gUnk_08108F28:: @ 08108F28 .incbin "baserom.gba", 0x108F28, 0x0000018 gUnk_08108F40:: @ 08108F40 - .incbin "baserom.gba", 0x108F40, 0x0000008 + .4byte gUnk_08108F1C + .4byte gUnk_08108F28 gUnk_08108F48:: @ 08108F48 .incbin "baserom.gba", 0x108F48, 0x0000004 @@ -122,7 +85,8 @@ gUnk_08108F54:: @ 08108F54 .incbin "baserom.gba", 0x108F54, 0x0000018 gUnk_08108F6C:: @ 08108F6C - .incbin "baserom.gba", 0x108F6C, 0x0000008 + .4byte gUnk_08108F48 + .4byte gUnk_08108F54 gUnk_08108F74:: @ 08108F74 .incbin "baserom.gba", 0x108F74, 0x000000C @@ -131,7 +95,8 @@ gUnk_08108F80:: @ 08108F80 .incbin "baserom.gba", 0x108F80, 0x0000018 gUnk_08108F98:: @ 08108F98 - .incbin "baserom.gba", 0x108F98, 0x0000008 + .4byte gUnk_08108F74 + .4byte gUnk_08108F80 gUnk_08108FA0:: @ 08108FA0 .incbin "baserom.gba", 0x108FA0, 0x000000C @@ -140,7 +105,8 @@ gUnk_08108FAC:: @ 08108FAC .incbin "baserom.gba", 0x108FAC, 0x0000018 gUnk_08108FC4:: @ 08108FC4 - .incbin "baserom.gba", 0x108FC4, 0x0000008 + .4byte gUnk_08108FA0 + .4byte gUnk_08108FAC gUnk_08108FCC:: @ 08108FCC .incbin "baserom.gba", 0x108FCC, 0x000000C @@ -149,7 +115,8 @@ gUnk_08108FD8:: @ 08108FD8 .incbin "baserom.gba", 0x108FD8, 0x0000018 gUnk_08108FF0:: @ 08108FF0 - .incbin "baserom.gba", 0x108FF0, 0x0000008 + .4byte gUnk_08108FCC + .4byte gUnk_08108FD8 gUnk_08108FF8:: @ 08108FF8 .incbin "baserom.gba", 0x108FF8, 0x000000C @@ -164,7 +131,8 @@ gUnk_08109019:: @ 08109019 .incbin "baserom.gba", 0x109019, 0x0000003 gUnk_0810901C:: @ 0810901C - .incbin "baserom.gba", 0x10901C, 0x0000008 + .4byte gUnk_08108FF8 + .4byte gUnk_08109004 gUnk_08109024:: @ 08109024 .incbin "baserom.gba", 0x109024, 0x000000C @@ -176,7 +144,8 @@ gUnk_08109033:: @ 08109033 .incbin "baserom.gba", 0x109033, 0x0000015 gUnk_08109048:: @ 08109048 - .incbin "baserom.gba", 0x109048, 0x0000008 + .4byte gUnk_08109024 + .4byte gUnk_08109030 gUnk_08109050:: @ 08109050 .incbin "baserom.gba", 0x109050, 0x000000C @@ -185,7 +154,8 @@ gUnk_0810905C:: @ 0810905C .incbin "baserom.gba", 0x10905C, 0x0000018 gUnk_08109074:: @ 08109074 - .incbin "baserom.gba", 0x109074, 0x0000008 + .4byte gUnk_08109050 + .4byte gUnk_0810905C gUnk_0810907C:: @ 0810907C .incbin "baserom.gba", 0x10907C, 0x000000C @@ -194,7 +164,8 @@ gUnk_08109088:: @ 08109088 .incbin "baserom.gba", 0x109088, 0x0000018 gUnk_081090A0:: @ 081090A0 - .incbin "baserom.gba", 0x1090A0, 0x0000008 + .4byte gUnk_0810907C + .4byte gUnk_08109088 gUnk_081090A8:: @ 081090A8 .incbin "baserom.gba", 0x1090A8, 0x000000C @@ -203,7 +174,8 @@ gUnk_081090B4:: @ 081090B4 .incbin "baserom.gba", 0x1090B4, 0x0000018 gUnk_081090CC:: @ 081090CC - .incbin "baserom.gba", 0x1090CC, 0x0000008 + .4byte gUnk_081090A8 + .4byte gUnk_081090B4 gUnk_081090D4:: @ 081090D4 .incbin "baserom.gba", 0x1090D4, 0x000000C @@ -212,7 +184,8 @@ gUnk_081090E0:: @ 081090E0 .incbin "baserom.gba", 0x1090E0, 0x0000018 gUnk_081090F8:: @ 081090F8 - .incbin "baserom.gba", 0x1090F8, 0x0000008 + .4byte gUnk_081090D4 + .4byte gUnk_081090E0 gUnk_08109100:: @ 08109100 .incbin "baserom.gba", 0x109100, 0x000000C @@ -221,37 +194,58 @@ gUnk_0810910C:: @ 0810910C .incbin "baserom.gba", 0x10910C, 0x0000018 gUnk_08109124:: @ 08109124 - .incbin "baserom.gba", 0x109124, 0x0000008 + .4byte gUnk_08109100 + .4byte gUnk_0810910C gUnk_0810912C:: @ 0810912C .incbin "baserom.gba", 0x10912C, 0x000000C gUnk_08109138:: @ 08109138 - .incbin "baserom.gba", 0x109138, 0x0000008 + .4byte gUnk_0810912C + .4byte gUnk_081090E0 gUnk_08109140:: @ 08109140 .incbin "baserom.gba", 0x109140, 0x0000018 gUnk_08109158:: @ 08109158 - .incbin "baserom.gba", 0x109158, 0x0000008 + .4byte gUnk_08109100 + .4byte gUnk_08109140 gUnk_08109160:: @ 08109160 .incbin "baserom.gba", 0x109160, 0x0000018 gUnk_08109178:: @ 08109178 - .incbin "baserom.gba", 0x109178, 0x0000008 + .4byte gUnk_081090D4 + .4byte gUnk_08109160 gUnk_08109180:: @ 08109180 .incbin "baserom.gba", 0x109180, 0x000000C gUnk_0810918C:: @ 0810918C - .incbin "baserom.gba", 0x10918C, 0x0000008 + .4byte gUnk_08109180 + .4byte gUnk_0810910C gUnk_08109194:: @ 08109194 - .incbin "baserom.gba", 0x109194, 0x0000009 - -gUnk_0810919D:: @ 0810919D - .incbin "baserom.gba", 0x10919D, 0x0000047 + .4byte gUnk_08108E90 + .4byte gUnk_08108EBC + .4byte gUnk_08108EE8 + .4byte gUnk_08108F14 + .4byte gUnk_08108F40 + .4byte gUnk_08108F6C + .4byte gUnk_08108F98 + .4byte gUnk_08108FC4 + .4byte gUnk_08108FF0 + .4byte gUnk_0810901C + .4byte gUnk_08109048 + .4byte gUnk_08109074 + .4byte gUnk_081090A0 + .4byte gUnk_081090CC + .4byte gUnk_081090F8 + .4byte gUnk_08109124 + .4byte gUnk_08109138 + .4byte gUnk_08109158 + .4byte gUnk_08109178 + .4byte gUnk_0810918C gUnk_081091E4:: @ 081091E4 .incbin "baserom.gba", 0x1091E4, 0x000000A @@ -266,7 +260,13 @@ gUnk_08109202:: @ 08109202 .incbin "baserom.gba", 0x109202, 0x0000012 gUnk_08109214:: @ 08109214 - .incbin "baserom.gba", 0x109214, 0x000001C + .4byte gUnk_089B1D90 + .4byte gUnk_089B1D90 + .4byte gUnk_089B1D90 + .4byte gUnk_089B1D90 + .4byte gUnk_089B1D90 + .4byte gUnk_089B1D90 + .4byte gUnk_089B1D90 gUnk_08109230:: @ 08109230 .incbin "baserom.gba", 0x109230, 0x0000014 @@ -274,14 +274,23 @@ gUnk_08109230:: @ 08109230 gUnk_08109244:: @ 08109244 .incbin "baserom.gba", 0x109244, 0x0000004 -gUnk_08109248:: @ 08109248 +gUnk_08109248:: @ 08109248 TODO might be a pointer array? .incbin "baserom.gba", 0x109248, 0x0000024 gUnk_0810926C:: @ 0810926C .incbin "baserom.gba", 0x10926C, 0x0000040 gUnk_081092AC:: @ 081092AC - .incbin "baserom.gba", 0x1092AC, 0x0000028 + .4byte gUnk_086926A0 + .4byte gUnk_08692780 + .4byte gUnk_08692860 + .4byte gUnk_08692940 + .4byte gUnk_08692A20 + .4byte gUnk_08692B00 + .4byte gUnk_08692BE0 + .4byte gUnk_08692CC0 + .4byte gUnk_08692DA0 + .4byte gUnk_08692E80 gUnk_081092D4:: @ 081092D4 .incbin "baserom.gba", 0x1092D4, 0x000002F @@ -326,7 +335,16 @@ gUnk_08109906:: @ 08109906 .incbin "baserom.gba", 0x109906, 0x000012A gUnk_08109A30:: @ 08109A30 - .incbin "baserom.gba", 0x109A30, 0x0000028 + .4byte sub_0805FA04 + .4byte sub_0805FA98 + .4byte sub_0805FBC4 + .4byte gUnk_08109AB8 + .4byte gUnk_08109AA8 + .4byte gUnk_08109A98 + .4byte gUnk_08109A88 + .4byte gUnk_08109A78 + .4byte gUnk_08109A68 + .4byte gUnk_08109A58 gUnk_08109A58:: @ 08109A58 .incbin "baserom.gba", 0x109A58, 0x0000010 @@ -352,46 +370,11 @@ gUnk_08109AA8:: @ 08109AA8 gUnk_08109AB8:: @ 08109AB8 .incbin "baserom.gba", 0x109AB8, 0x0000010 -gUnk_08109AC8:: @ 08109AC8 - .incbin "baserom.gba", 0x109AC8, 0x0000008 - -gUnk_08109AD0:: @ 08109AD0 - .incbin "baserom.gba", 0x109AD0, 0x0000008 - -gUnk_08109AD8:: @ 08109AD8 - .incbin "baserom.gba", 0x109AD8, 0x0000005 - -gUnk_08109ADD:: @ 08109ADD - .incbin "baserom.gba", 0x109ADD, 0x0000005 - -gUnk_08109AE2:: @ 08109AE2 - .incbin "baserom.gba", 0x109AE2, 0x0000005 - -gUnk_08109AE7:: @ 08109AE7 - .incbin "baserom.gba", 0x109AE7, 0x0000005 - -gUnk_08109AEC:: @ 08109AEC - .incbin "baserom.gba", 0x109AEC, 0x0000011 - -gUnk_08109AFD:: @ 08109AFD - .incbin "baserom.gba", 0x109AFD, 0x000000B - -gUnk_08109B08:: @ 08109B08 - .incbin "baserom.gba", 0x109B08, 0x0000006 - -gUnk_08109B0E:: @ 08109B0E - .incbin "baserom.gba", 0x109B0E, 0x000002D - -gUnk_08109B3B:: @ 08109B3B - .incbin "baserom.gba", 0x109B3B, 0x0000025 - -gUnk_08109B60:: @ 08109B60 - .incbin "baserom.gba", 0x109B60, 0x0000020 - -gUnk_08109B80:: @ 08109B80 - .incbin "baserom.gba", 0x109B80, 0x000003C + .include "data/const/playerItem/item11.inc" @ TODO convert .inc files into .s files and include them in linker.ld + .include "data/animations/npc/gentari.inc" + .include "data/const/npc/festari.inc" .include "data/animations/npc/festari.inc" diff --git a/include/manager.h b/include/manager.h index d86f203c..66d2e202 100644 --- a/include/manager.h +++ b/include/manager.h @@ -122,7 +122,7 @@ extern struct { u8 unk_0b; } gUnk_03004030; -extern DiggingCaveEntrance* gUnk_08107DC0[]; +extern DiggingCaveEntrance* diggingCaveEntrances[]; typedef struct { u8 unk_00; diff --git a/src/arm_proxy.c b/src/arm_proxy.c index 4e153936..e564ced8 100644 --- a/src/arm_proxy.c +++ b/src/arm_proxy.c @@ -339,7 +339,7 @@ void ObjectUpdate(Entity* this) { DrawEntity(this); } -void sub_08017508(Entity* this) { +void ManagerUpdate(Entity* this) { if (!sub_0805E3B0(this)) gManagerFunctions[this->id](this); } diff --git a/src/manager/manager4.c b/src/manager/manager4.c index 3d396682..a509fe13 100644 --- a/src/manager/manager4.c +++ b/src/manager/manager4.c @@ -25,11 +25,11 @@ void sub_0805786C(Manager* this) { if (gUnk_03004030.unk_00 == 0) { gUnk_03004030.unk_0a = 0xFF; roomID = gRoomControls.roomID; - tmp = gUnk_08107DC0[gRoomControls.areaID]; + tmp = diggingCaveEntrances[gRoomControls.areaID]; tmp = sub_08057AA8(tmp, roomID); if (tmp != 0) { roomID = tmp->target_roomID; - tmp = gUnk_08107DC0[tmp->target_areaID]; + tmp = diggingCaveEntrances[tmp->target_areaID]; tmp = sub_08057AA8(tmp, roomID); if (tmp != 0) { gUnk_03004030.unk_00 = tmp; @@ -37,7 +37,7 @@ void sub_0805786C(Manager* this) { } } roomID = gRoomControls.roomID; - tmp = gUnk_08107DC0[gRoomControls.areaID]; + tmp = diggingCaveEntrances[gRoomControls.areaID]; uVar = 0x81 << 7; for (tmp = sub_08057AA8(tmp, roomID); tmp != 0; tmp = sub_08057AA8(tmp, roomID)) { SetTile(uVar, tmp->unk_00 + 0x3F, 1); @@ -55,7 +55,7 @@ void sub_08057920(Manager* this) { DiggingCaveEntrance* tmp; u8 roomID; roomID = gRoomControls.roomID; - for (tmp = gUnk_08107DC0[gRoomControls.areaID]; (tmp = sub_08057AA8(tmp, roomID)) != 0 && !sub_0805795C(this, tmp); + for (tmp = diggingCaveEntrances[gRoomControls.areaID]; (tmp = sub_08057AA8(tmp, roomID)) != 0 && !sub_0805795C(this, tmp); tmp++) ; }