From 32a2d8f997557ea7f0724272b1252b0a3699837b Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Thu, 25 Feb 2021 04:35:01 +0100 Subject: [PATCH 1/3] Apply suggested improvements --- asm/non_matching/ezloCap/sub_0806DA04.inc | 3 ++- src/ezloCap.c | 17 ++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/asm/non_matching/ezloCap/sub_0806DA04.inc b/asm/non_matching/ezloCap/sub_0806DA04.inc index 4b0ae7b6..75da6b38 100644 --- a/asm/non_matching/ezloCap/sub_0806DA04.inc +++ b/asm/non_matching/ezloCap/sub_0806DA04.inc @@ -12,4 +12,5 @@ pop {pc} .align 2, 0 _0806DA18: .4byte gUnk_0811415C - .syntax divided \ No newline at end of file + .syntax divided + \ No newline at end of file diff --git a/src/ezloCap.c b/src/ezloCap.c index fce6880f..55541256 100644 --- a/src/ezloCap.c +++ b/src/ezloCap.c @@ -40,7 +40,7 @@ NONMATCH("asm/non_matching/ezloCap/sub_0806D908.inc", void sub_0806D908(Entity* } END_NONMATCH -void sub_0806D944(Entity* this) { +void sub_0806D944(Entity* this) { // called when talk to ezlo, also when ezlo moves after you this->spriteSettings.b.flipX = 0; if (this->x.WORD <= gPlayerEntity.x.WORD) { this->spriteSettings.b.flipX = 1; @@ -90,7 +90,7 @@ void sub_0806DA1C(Entity* this, u32* param_2) { sub_0808091C((ScreenTransitionData*)(gUnk_081141A4)[param_2[1]], (u32)(gUnk_081141E4[param_2[1]])); } -// Returns the kingstone id? +// Returns the kinstone id? u8 sub_0806DA3C(Entity* this) { u32 result; @@ -127,15 +127,15 @@ u8 sub_0806DA3C(Entity* this) { return result; } -// Check whether a kingstone fusion is possible and store the result somewhere in param_2? -void sub_0806DAAC(Entity* this, u32 param_2) { +// Check whether a kinstone fusion is possible and store the result somewhere in param_2? +void sub_0806DAAC(Entity* this, u32* param_2) { u32 uVar1; uVar1 = CheckKinstoneFused(sub_0806DA3C(this)); - *(u32*)(param_2 + 0x14) = uVar1; + param_2[5] = uVar1; gUnk_02033280.unk_07 |= 1; } -// maybe actually execute the keystone fusion? +// maybe actually execute the kinstone fusion? void sub_0806DAD0(Entity* this) { sub_08078790(this, sub_0806DA3C(this)); } @@ -172,9 +172,8 @@ void sub_0806DB44(Entity* this, u32* param_2) { } } -void sub_0806DB84( - Entity* this, - u8 unused) { // The unused param just had to be added, so that a mov r1, #0 in NPC4E_Fusion is matching correctly +// The unused param just had to be added, so that a mov r1, #0 in NPC4E_Fusion is matching correctly +void sub_0806DB84(Entity* this, u8 unused) { Entity* ent; this->hitbox = &gUnk_08114154; ent = CreateObject(0x3e, 4, 0); From ba841c7504c0f4720395bc7754d254806621289e Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Sat, 27 Feb 2021 23:10:23 +0100 Subject: [PATCH 2/3] Extract constant data for ezloCap --- data/data_08108D30.s | 864 ---------------------------------------- data/data_0811415C.s | 849 +++++++++++++++++++++++++++++++++++++++ include/functions.h | 2 +- linker.ld | 4 +- src/{ => npc}/ezloCap.c | 84 +++- 5 files changed, 916 insertions(+), 887 deletions(-) create mode 100644 data/data_0811415C.s rename src/{ => npc}/ezloCap.c (65%) diff --git a/data/data_08108D30.s b/data/data_08108D30.s index 492d4aa5..445dfc43 100644 --- a/data/data_08108D30.s +++ b/data/data_08108D30.s @@ -4692,867 +4692,3 @@ gUnk_08114100:: @ 08114100 gUnk_08114104:: @ 08114104 .incbin "baserom.gba", 0x114104, 0x0000030 - -gUnk_08114134:: @ 08114134 - .incbin "baserom.gba", 0x114134, 0x0000010 - -gUnk_08114144:: @ 08114144 - .incbin "baserom.gba", 0x114144, 0x0000010 - -gUnk_08114154:: @ 08114154 - .incbin "baserom.gba", 0x114154, 0x0000008 - -gUnk_0811415C:: @ 0811415C - .incbin "baserom.gba", 0x11415C, 0x0000048 - -gUnk_081141A4:: @ 081141A4 - .incbin "baserom.gba", 0x1141A4, 0x0000040 - -gUnk_081141E4:: @ 081141E4 - .incbin "baserom.gba", 0x1141E4, 0x0000010 - -gUnk_081141F4:: @ 081141F4 - .incbin "baserom.gba", 0x1141F4, 0x0000014 - -gUnk_08114208:: @ 08114208 - .incbin "baserom.gba", 0x114208, 0x0000005 - -gUnk_0811420D:: @ 0811420D - .incbin "baserom.gba", 0x11420D, 0x0000004 - -gUnk_08114211:: @ 08114211 - .incbin "baserom.gba", 0x114211, 0x0000005 - -gUnk_08114216:: @ 08114216 - .incbin "baserom.gba", 0x114216, 0x0000009 - -gUnk_0811421F:: @ 0811421F - .incbin "baserom.gba", 0x11421F, 0x0000009 - -gUnk_08114228:: @ 08114228 - .incbin "baserom.gba", 0x114228, 0x0000014 - -gUnk_0811423C:: @ 0811423C - .incbin "baserom.gba", 0x11423C, 0x0000008 - -gUnk_08114244:: @ 08114244 - .incbin "baserom.gba", 0x114244, 0x0000019 - -gUnk_0811425D:: @ 0811425D - .incbin "baserom.gba", 0x11425D, 0x0000019 - -gUnk_08114276:: @ 08114276 - .incbin "baserom.gba", 0x114276, 0x0000019 - -gUnk_0811428F:: @ 0811428F - .incbin "baserom.gba", 0x11428F, 0x0000019 - -gUnk_081142A8:: @ 081142A8 - .incbin "baserom.gba", 0x1142A8, 0x0000014 - -gUnk_081142BC:: @ 081142BC - .incbin "baserom.gba", 0x1142BC, 0x0000010 - -gUnk_081142CC:: @ 081142CC - .incbin "baserom.gba", 0x1142CC, 0x0000010 - -gUnk_081142DC:: @ 081142DC - .incbin "baserom.gba", 0x1142DC, 0x0000020 - -gUnk_081142FC:: @ 081142FC - .incbin "baserom.gba", 0x1142FC, 0x0000008 - -gUnk_08114304:: @ 08114304 - .incbin "baserom.gba", 0x114304, 0x0000004 - -gUnk_08114308:: @ 08114308 - .incbin "baserom.gba", 0x114308, 0x0000128 - -gUnk_08114430:: @ 08114430 - .incbin "baserom.gba", 0x114430, 0x0000002 - -gUnk_08114432:: @ 08114432 - .incbin "baserom.gba", 0x114432, 0x0000012 - -gUnk_08114444:: @ 08114444 - .incbin "baserom.gba", 0x114444, 0x0000084 - -gUnk_081144C8:: @ 081144C8 - .incbin "baserom.gba", 0x1144C8, 0x0000005 - -gUnk_081144CD:: @ 081144CD - .incbin "baserom.gba", 0x1144CD, 0x0000005 - -gUnk_081144D2:: @ 081144D2 - .incbin "baserom.gba", 0x1144D2, 0x0000005 - -gUnk_081144D7:: @ 081144D7 - .incbin "baserom.gba", 0x1144D7, 0x0000005 - -gUnk_081144DC:: @ 081144DC - .incbin "baserom.gba", 0x1144DC, 0x0000014 - -gUnk_081144F0:: @ 081144F0 - .incbin "baserom.gba", 0x1144F0, 0x000000C - -gUnk_081144FC:: @ 081144FC - .incbin "baserom.gba", 0x1144FC, 0x0000035 - -gUnk_08114531:: @ 08114531 - .incbin "baserom.gba", 0x114531, 0x000000B - -gUnk_0811453C:: @ 0811453C - .incbin "baserom.gba", 0x11453C, 0x0000011 - -gUnk_0811454D:: @ 0811454D - .incbin "baserom.gba", 0x11454D, 0x0000011 - -gUnk_0811455E:: @ 0811455E - .incbin "baserom.gba", 0x11455E, 0x0000011 - -gUnk_0811456F:: @ 0811456F - .incbin "baserom.gba", 0x11456F, 0x0000005 - -gUnk_08114574:: @ 08114574 - .incbin "baserom.gba", 0x114574, 0x0000005 - -gUnk_08114579:: @ 08114579 - .incbin "baserom.gba", 0x114579, 0x0000007 - -gUnk_08114580:: @ 08114580 - .incbin "baserom.gba", 0x114580, 0x0000034 - -gUnk_081145B4:: @ 081145B4 - .incbin "baserom.gba", 0x1145B4, 0x0000014 - -gUnk_081145C8:: @ 081145C8 - .incbin "baserom.gba", 0x1145C8, 0x0000008 - -gUnk_081145D0:: @ 081145D0 - .incbin "baserom.gba", 0x1145D0, 0x0000004 - -gUnk_081145D4:: @ 081145D4 - .incbin "baserom.gba", 0x1145D4, 0x0000010 - -gUnk_081145E4:: @ 081145E4 - .incbin "baserom.gba", 0x1145E4, 0x00000D4 - -gUnk_081146B8:: @ 081146B8 - .incbin "baserom.gba", 0x1146B8, 0x0000018 - -gUnk_081146D0:: @ 081146D0 - .incbin "baserom.gba", 0x1146D0, 0x0000014 - -gUnk_081146E4:: @ 081146E4 - .incbin "baserom.gba", 0x1146E4, 0x0000010 - -gUnk_081146F4:: @ 081146F4 - .incbin "baserom.gba", 0x1146F4, 0x00000A8 - -gUnk_0811479C:: @ 0811479C - .incbin "baserom.gba", 0x11479C, 0x0000048 - -gUnk_081147E4:: @ 081147E4 - .incbin "baserom.gba", 0x1147E4, 0x0000020 - -gUnk_08114804:: @ 08114804 - .incbin "baserom.gba", 0x114804, 0x0000010 - -gUnk_08114814:: @ 08114814 - .incbin "baserom.gba", 0x114814, 0x0000010 - -gUnk_08114824:: @ 08114824 - .incbin "baserom.gba", 0x114824, 0x0000040 - -gUnk_08114864:: @ 08114864 - .incbin "baserom.gba", 0x114864, 0x0000010 - -gUnk_08114874:: @ 08114874 - .incbin "baserom.gba", 0x114874, 0x0000030 - -gUnk_081148A4:: @ 081148A4 - .incbin "baserom.gba", 0x1148A4, 0x0000020 - -gUnk_081148C4:: @ 081148C4 - .incbin "baserom.gba", 0x1148C4, 0x0000020 - -gUnk_081148E4:: @ 081148E4 - .incbin "baserom.gba", 0x1148E4, 0x0000030 - -gUnk_08114914:: @ 08114914 - .incbin "baserom.gba", 0x114914, 0x0000030 - -gUnk_08114944:: @ 08114944 - .incbin "baserom.gba", 0x114944, 0x0000030 - -gUnk_08114974:: @ 08114974 - .incbin "baserom.gba", 0x114974, 0x0000010 - -gUnk_08114984:: @ 08114984 - .incbin "baserom.gba", 0x114984, 0x0000010 - -gUnk_08114994:: @ 08114994 - .incbin "baserom.gba", 0x114994, 0x0000010 - -gUnk_081149A4:: @ 081149A4 - .incbin "baserom.gba", 0x1149A4, 0x0000010 - -gUnk_081149B4:: @ 081149B4 - .incbin "baserom.gba", 0x1149B4, 0x0000010 - -gUnk_081149C4:: @ 081149C4 - .incbin "baserom.gba", 0x1149C4, 0x0000030 - -gUnk_081149F4:: @ 081149F4 - .incbin "baserom.gba", 0x1149F4, 0x0000020 - -gUnk_08114A14:: @ 08114A14 - .incbin "baserom.gba", 0x114A14, 0x0000058 - -gUnk_08114A6C:: @ 08114A6C - .incbin "baserom.gba", 0x114A6C, 0x0000020 - -gUnk_08114A8C:: @ 08114A8C - .incbin "baserom.gba", 0x114A8C, 0x0000030 - -gUnk_08114ABC:: @ 08114ABC - .incbin "baserom.gba", 0x114ABC, 0x0000028 - -gUnk_08114AE4:: @ 08114AE4 - .incbin "baserom.gba", 0x114AE4, 0x0000400 - -gUnk_08114EE4:: @ 08114EE4 - .incbin "baserom.gba", 0x114EE4, 0x0000018 - -gUnk_08114EFC:: @ 08114EFC - .incbin "baserom.gba", 0x114EFC, 0x0000010 - -gUnk_08114F0C:: @ 08114F0C - .incbin "baserom.gba", 0x114F0C, 0x0000024 - -gUnk_08114F30:: @ 08114F30 - .incbin "baserom.gba", 0x114F30, 0x0000004 - -gUnk_08114F34:: @ 08114F34 - .incbin "baserom.gba", 0x114F34, 0x0000004 - -gUnk_08114F38:: @ 08114F38 - .incbin "baserom.gba", 0x114F38, 0x0000020 - -gUnk_08114F58:: @ 08114F58 - .incbin "baserom.gba", 0x114F58, 0x0000020 - -gUnk_08114F78:: @ 08114F78 - .incbin "baserom.gba", 0x114F78, 0x0000008 - -gUnk_08114F80:: @ 08114F80 - .incbin "baserom.gba", 0x114F80, 0x0000008 - -gUnk_08114F88:: @ 08114F88 - .incbin "baserom.gba", 0x114F88, 0x0000010 - -gUnk_08114F98:: @ 08114F98 - .incbin "baserom.gba", 0x114F98, 0x00003F4 - -gUnk_0811538C:: @ 0811538C - .incbin "baserom.gba", 0x11538C, 0x0000153 - -gUnk_081154DF:: @ 081154DF - .incbin "baserom.gba", 0x1154DF, 0x0000042 - -gUnk_08115521:: @ 08115521 - .incbin "baserom.gba", 0x115521, 0x0000002 - -gUnk_08115523:: @ 08115523 - .incbin "baserom.gba", 0x115523, 0x0000003 - -gUnk_08115526:: @ 08115526 - .incbin "baserom.gba", 0x115526, 0x00001FE - -gUnk_08115724:: @ 08115724 - .incbin "baserom.gba", 0x115724, 0x00003D4 - -gUnk_08115AF8:: @ 08115AF8 - .incbin "baserom.gba", 0x115AF8, 0x00003A4 - -gUnk_08115E9C:: @ 08115E9C - .incbin "baserom.gba", 0x115E9C, 0x0000176 - -gUnk_08116012:: @ 08116012 - .incbin "baserom.gba", 0x116012, 0x000026E - -gUnk_08116280:: @ 08116280 - .incbin "baserom.gba", 0x116280, 0x00002B0 - -gUnk_08116530:: @ 08116530 - .incbin "baserom.gba", 0x116530, 0x00001D3 - -gUnk_08116703:: @ 08116703 - .incbin "baserom.gba", 0x116703, 0x0000085 - -gUnk_08116788:: @ 08116788 - .incbin "baserom.gba", 0x116788, 0x0000100 - -gUnk_08116888:: @ 08116888 - .incbin "baserom.gba", 0x116888, 0x0000017 - -gUnk_0811689F:: @ 0811689F - .incbin "baserom.gba", 0x11689F, 0x00001FD - -gUnk_08116A9C:: @ 08116A9C - .incbin "baserom.gba", 0x116A9C, 0x0000270 - -gUnk_08116D0C:: @ 08116D0C - .incbin "baserom.gba", 0x116D0C, 0x00000C8 - -gUnk_08116DD4:: @ 08116DD4 - .incbin "baserom.gba", 0x116DD4, 0x0000071 - -gUnk_08116E45:: @ 08116E45 - .incbin "baserom.gba", 0x116E45, 0x000011F - -gUnk_08116F64:: @ 08116F64 - .incbin "baserom.gba", 0x116F64, 0x00002A4 - -gUnk_08117208:: @ 08117208 - .incbin "baserom.gba", 0x117208, 0x0000038 - -gUnk_08117240:: @ 08117240 - .incbin "baserom.gba", 0x117240, 0x000039C - -gUnk_081175DC:: @ 081175DC - .incbin "baserom.gba", 0x1175DC, 0x00002D4 - -gUnk_081178B0:: @ 081178B0 - .incbin "baserom.gba", 0x1178B0, 0x00002D4 - -gUnk_08117B84:: @ 08117B84 - .incbin "baserom.gba", 0x117B84, 0x00001E0 - -gUnk_08117D64:: @ 08117D64 - .incbin "baserom.gba", 0x117D64, 0x00000DC - -gUnk_08117E40:: @ 08117E40 - .incbin "baserom.gba", 0x117E40, 0x0000128 - -gUnk_08117F68:: @ 08117F68 - .incbin "baserom.gba", 0x117F68, 0x000006C - -gUnk_08117FD4:: @ 08117FD4 - .incbin "baserom.gba", 0x117FD4, 0x00001AD - -gUnk_08118181:: @ 08118181 - .incbin "baserom.gba", 0x118181, 0x0000033 - -gUnk_081181B4:: @ 081181B4 - .incbin "baserom.gba", 0x1181B4, 0x0000030 - -gUnk_081181E4:: @ 081181E4 - .incbin "baserom.gba", 0x1181E4, 0x0000054 - -gUnk_08118238:: @ 08118238 - .incbin "baserom.gba", 0x118238, 0x000002C - -gUnk_08118264:: @ 08118264 - .incbin "baserom.gba", 0x118264, 0x0000034 - -gUnk_08118298:: @ 08118298 - .incbin "baserom.gba", 0x118298, 0x0000100 - -gUnk_08118398:: @ 08118398 - .incbin "baserom.gba", 0x118398, 0x0000024 - -gUnk_081183BC:: @ 081183BC - .incbin "baserom.gba", 0x1183BC, 0x00000B0 - -gUnk_0811846C:: @ 0811846C - .incbin "baserom.gba", 0x11846C, 0x000003C - -gUnk_081184A8:: @ 081184A8 - .incbin "baserom.gba", 0x1184A8, 0x00000B0 - -gUnk_08118558:: @ 08118558 - .incbin "baserom.gba", 0x118558, 0x00001C8 - -gUnk_08118720:: @ 08118720 - .incbin "baserom.gba", 0x118720, 0x0000048 - -gUnk_08118768:: @ 08118768 - .incbin "baserom.gba", 0x118768, 0x0000018 - -gUnk_08118780:: @ 08118780 - .incbin "baserom.gba", 0x118780, 0x0000008 - -gUnk_08118788:: @ 08118788 - .incbin "baserom.gba", 0x118788, 0x000000C - -gUnk_08118794:: @ 08118794 - .incbin "baserom.gba", 0x118794, 0x000012C - -gUnk_081188C0:: @ 081188C0 - .incbin "baserom.gba", 0x1188C0, 0x0000088 - -gUnk_08118948:: @ 08118948 - .incbin "baserom.gba", 0x118948, 0x0000018 - -gUnk_08118960:: @ 08118960 - .incbin "baserom.gba", 0x118960, 0x0000014 - -gUnk_08118974:: @ 08118974 - .incbin "baserom.gba", 0x118974, 0x0000014 - -gUnk_08118988:: @ 08118988 - .incbin "baserom.gba", 0x118988, 0x0000278 - -gUnk_08118C00:: @ 08118C00 - .incbin "baserom.gba", 0x118C00, 0x0000138 - -gUnk_08118D38:: @ 08118D38 - .incbin "baserom.gba", 0x118D38, 0x000006C - -gUnk_08118DA4:: @ 08118DA4 - .incbin "baserom.gba", 0x118DA4, 0x000002C - -gUnk_08118DD0:: @ 08118DD0 - .incbin "baserom.gba", 0x118DD0, 0x000000C - -gUnk_08118DDC:: @ 08118DDC - .incbin "baserom.gba", 0x118DDC, 0x0000080 - -gUnk_08118E5C:: @ 08118E5C - .incbin "baserom.gba", 0x118E5C, 0x00000A8 - -gUnk_08118F04:: @ 08118F04 - .incbin "baserom.gba", 0x118F04, 0x0000038 - -gUnk_08118F3C:: @ 08118F3C - .incbin "baserom.gba", 0x118F3C, 0x0000028 - -gUnk_08118F64:: @ 08118F64 - .incbin "baserom.gba", 0x118F64, 0x0000034 - -gUnk_08118F98:: @ 08118F98 - .incbin "baserom.gba", 0x118F98, 0x0000108 - -gUnk_081190A0:: @ 081190A0 - .incbin "baserom.gba", 0x1190A0, 0x0000044 - -gUnk_081190E4:: @ 081190E4 - .incbin "baserom.gba", 0x1190E4, 0x0000038 - -gUnk_0811911C:: @ 0811911C - .incbin "baserom.gba", 0x11911C, 0x0000010 - -gUnk_0811912C:: @ 0811912C - .incbin "baserom.gba", 0x11912C, 0x000005C - -gUnk_08119188:: @ 08119188 - .incbin "baserom.gba", 0x119188, 0x0000120 - -gUnk_081192A8:: @ 081192A8 - .incbin "baserom.gba", 0x1192A8, 0x00002A0 - -gUnk_08119548:: @ 08119548 - .incbin "baserom.gba", 0x119548, 0x000027C - -gUnk_081197C4:: @ 081197C4 - .incbin "baserom.gba", 0x1197C4, 0x0000030 - -gUnk_081197F4:: @ 081197F4 - .incbin "baserom.gba", 0x1197F4, 0x00000D0 - -gUnk_081198C4:: @ 081198C4 - .incbin "baserom.gba", 0x1198C4, 0x0000028 - -gUnk_081198EC:: @ 081198EC - .incbin "baserom.gba", 0x1198EC, 0x00000B8 - -gUnk_081199A4:: @ 081199A4 - .incbin "baserom.gba", 0x1199A4, 0x0000054 - -gUnk_081199F8:: @ 081199F8 - .incbin "baserom.gba", 0x1199F8, 0x000007C - -gUnk_08119A74:: @ 08119A74 - .incbin "baserom.gba", 0x119A74, 0x000007C - -gUnk_08119AF0:: @ 08119AF0 - .incbin "baserom.gba", 0x119AF0, 0x000008C - -gUnk_08119B7C:: @ 08119B7C - .incbin "baserom.gba", 0x119B7C, 0x0000074 - -gUnk_08119BF0:: @ 08119BF0 - .incbin "baserom.gba", 0x119BF0, 0x0000074 - -gUnk_08119C64:: @ 08119C64 - .incbin "baserom.gba", 0x119C64, 0x0000090 - -gUnk_08119CF4:: @ 08119CF4 - .incbin "baserom.gba", 0x119CF4, 0x0000060 - -gUnk_08119D54:: @ 08119D54 - .incbin "baserom.gba", 0x119D54, 0x0000054 - -gUnk_08119DA8:: @ 08119DA8 - .incbin "baserom.gba", 0x119DA8, 0x0000054 - -gUnk_08119DFC:: @ 08119DFC - .incbin "baserom.gba", 0x119DFC, 0x000001C - -gUnk_08119E18:: @ 08119E18 - .incbin "baserom.gba", 0x119E18, 0x000002C - -gUnk_08119E44:: @ 08119E44 - .incbin "baserom.gba", 0x119E44, 0x000006C - -gUnk_08119EB0:: @ 08119EB0 - .incbin "baserom.gba", 0x119EB0, 0x0000028 - -gUnk_08119ED8:: @ 08119ED8 - .incbin "baserom.gba", 0x119ED8, 0x00000A8 - -gUnk_08119F80:: @ 08119F80 - .incbin "baserom.gba", 0x119F80, 0x0000024 - -gUnk_08119FA4:: @ 08119FA4 - .incbin "baserom.gba", 0x119FA4, 0x0000024 - -gUnk_08119FC8:: @ 08119FC8 - .incbin "baserom.gba", 0x119FC8, 0x000000C - -gUnk_08119FD4:: @ 08119FD4 - .incbin "baserom.gba", 0x119FD4, 0x0000048 - -gUnk_0811A01C:: @ 0811A01C - .incbin "baserom.gba", 0x11A01C, 0x0000030 - -gUnk_0811A04C:: @ 0811A04C - .incbin "baserom.gba", 0x11A04C, 0x000001C - -gUnk_0811A068:: @ 0811A068 - .incbin "baserom.gba", 0x11A068, 0x000003C - -gUnk_0811A0A4:: @ 0811A0A4 - .incbin "baserom.gba", 0x11A0A4, 0x0000028 - -gUnk_0811A0CC:: @ 0811A0CC - .incbin "baserom.gba", 0x11A0CC, 0x0000018 - -gUnk_0811A0E4:: @ 0811A0E4 - .incbin "baserom.gba", 0x11A0E4, 0x0000040 - -gUnk_0811A124:: @ 0811A124 - .incbin "baserom.gba", 0x11A124, 0x0000020 - -gUnk_0811A144:: @ 0811A144 - .incbin "baserom.gba", 0x11A144, 0x0000038 - -gUnk_0811A17C:: @ 0811A17C - .incbin "baserom.gba", 0x11A17C, 0x000004C - -gUnk_0811A1C8:: @ 0811A1C8 - .incbin "baserom.gba", 0x11A1C8, 0x0000030 - -gUnk_0811A1F8:: @ 0811A1F8 - .incbin "baserom.gba", 0x11A1F8, 0x0000030 - -gUnk_0811A228:: @ 0811A228 - .incbin "baserom.gba", 0x11A228, 0x0000058 - -gUnk_0811A280:: @ 0811A280 - .incbin "baserom.gba", 0x11A280, 0x000000C - -gUnk_0811A28C:: @ 0811A28C - .incbin "baserom.gba", 0x11A28C, 0x000001C - -gUnk_0811A2A8:: @ 0811A2A8 - .incbin "baserom.gba", 0x11A2A8, 0x0000028 - -gUnk_0811A2D0:: @ 0811A2D0 - .incbin "baserom.gba", 0x11A2D0, 0x000002C - -gUnk_0811A2FC:: @ 0811A2FC - .incbin "baserom.gba", 0x11A2FC, 0x0000214 - -gUnk_0811A510:: @ 0811A510 - .incbin "baserom.gba", 0x11A510, 0x000024C - -gUnk_0811A75C:: @ 0811A75C - .incbin "baserom.gba", 0x11A75C, 0x000004C - -gUnk_0811A7A8:: @ 0811A7A8 - .incbin "baserom.gba", 0x11A7A8, 0x00000C4 - -gUnk_0811A86C:: @ 0811A86C - .incbin "baserom.gba", 0x11A86C, 0x0000060 - -gUnk_0811A8CC:: @ 0811A8CC - .incbin "baserom.gba", 0x11A8CC, 0x00000E8 - -gUnk_0811A9B4:: @ 0811A9B4 - .incbin "baserom.gba", 0x11A9B4, 0x0000078 - -gUnk_0811AA2C:: @ 0811AA2C - .incbin "baserom.gba", 0x11AA2C, 0x0000050 - -gUnk_0811AA7C:: @ 0811AA7C - .incbin "baserom.gba", 0x11AA7C, 0x000009C - -gUnk_0811AB18:: @ 0811AB18 - .incbin "baserom.gba", 0x11AB18, 0x00000E0 - -gUnk_0811ABF8:: @ 0811ABF8 - .incbin "baserom.gba", 0x11ABF8, 0x0000019 - -gUnk_0811AC11:: @ 0811AC11 - .incbin "baserom.gba", 0x11AC11, 0x0000113 - -gUnk_0811AD24:: @ 0811AD24 - .incbin "baserom.gba", 0x11AD24, 0x00000A8 - -gUnk_0811ADCC:: @ 0811ADCC - .incbin "baserom.gba", 0x11ADCC, 0x00000E4 - -gUnk_0811AEB0:: @ 0811AEB0 - .incbin "baserom.gba", 0x11AEB0, 0x0000028 - -gUnk_0811AED8:: @ 0811AED8 - .incbin "baserom.gba", 0x11AED8, 0x000004C - -gUnk_0811AF24:: @ 0811AF24 - .incbin "baserom.gba", 0x11AF24, 0x0000010 - -gUnk_0811AF34:: @ 0811AF34 - .incbin "baserom.gba", 0x11AF34, 0x0000030 - -gUnk_0811AF64:: @ 0811AF64 - .incbin "baserom.gba", 0x11AF64, 0x0000028 - -gUnk_0811AF8C:: @ 0811AF8C - .incbin "baserom.gba", 0x11AF8C, 0x0000030 - -gUnk_0811AFBC:: @ 0811AFBC - .incbin "baserom.gba", 0x11AFBC, 0x0000014 - -gUnk_0811AFD0:: @ 0811AFD0 - .incbin "baserom.gba", 0x11AFD0, 0x0000030 - -gUnk_0811B000:: @ 0811B000 - .incbin "baserom.gba", 0x11B000, 0x000001C - -gUnk_0811B01C:: @ 0811B01C - .incbin "baserom.gba", 0x11B01C, 0x0000010 - -gUnk_0811B02C:: @ 0811B02C - .incbin "baserom.gba", 0x11B02C, 0x0000084 - -gUnk_0811B0B0:: @ 0811B0B0 - .incbin "baserom.gba", 0x11B0B0, 0x0000080 - -gUnk_0811B130:: @ 0811B130 - .incbin "baserom.gba", 0x11B130, 0x0000048 - -gUnk_0811B178:: @ 0811B178 - .incbin "baserom.gba", 0x11B178, 0x0000018 - -gUnk_0811B190:: @ 0811B190 - .incbin "baserom.gba", 0x11B190, 0x0000084 - -gUnk_0811B214:: @ 0811B214 - .incbin "baserom.gba", 0x11B214, 0x0000044 - -gUnk_0811B258:: @ 0811B258 - .incbin "baserom.gba", 0x11B258, 0x000003C - -gUnk_0811B294:: @ 0811B294 - .incbin "baserom.gba", 0x11B294, 0x0000068 - -gUnk_0811B2FC:: @ 0811B2FC - .incbin "baserom.gba", 0x11B2FC, 0x0000050 - -gUnk_0811B34C:: @ 0811B34C - .incbin "baserom.gba", 0x11B34C, 0x0000048 - -gUnk_0811B394:: @ 0811B394 - .incbin "baserom.gba", 0x11B394, 0x0000010 - -gUnk_0811B3A4:: @ 0811B3A4 - .incbin "baserom.gba", 0x11B3A4, 0x0000010 - -gUnk_0811B3B4:: @ 0811B3B4 - .incbin "baserom.gba", 0x11B3B4, 0x0000014 - -gUnk_0811B3C8:: @ 0811B3C8 - .incbin "baserom.gba", 0x11B3C8, 0x0000040 - -gUnk_0811B408:: @ 0811B408 - .incbin "baserom.gba", 0x11B408, 0x0000138 - -gUnk_0811B540:: @ 0811B540 - .incbin "baserom.gba", 0x11B540, 0x0000024 - -gUnk_0811B564:: @ 0811B564 - .incbin "baserom.gba", 0x11B564, 0x0000014 - -gUnk_0811B578:: @ 0811B578 - .incbin "baserom.gba", 0x11B578, 0x00003C8 - -gUnk_0811B940:: @ 0811B940 - .incbin "baserom.gba", 0x11B940, 0x000004C - -gUnk_0811B98C:: @ 0811B98C - .incbin "baserom.gba", 0x11B98C, 0x0000014 - -gUnk_0811B9A0:: @ 0811B9A0 - .incbin "baserom.gba", 0x11B9A0, 0x0000008 - -gUnk_0811B9A8:: @ 0811B9A8 - .incbin "baserom.gba", 0x11B9A8, 0x0000020 - -gUnk_0811B9C8:: @ 0811B9C8 - .incbin "baserom.gba", 0x11B9C8, 0x0000008 - -gUnk_0811B9D0:: @ 0811B9D0 - .incbin "baserom.gba", 0x11B9D0, 0x0000008 - -gUnk_0811B9D8:: @ 0811B9D8 - .incbin "baserom.gba", 0x11B9D8, 0x0000008 - -gUnk_0811B9E0:: @ 0811B9E0 - .incbin "baserom.gba", 0x11B9E0, 0x0000080 - -gUnk_0811BA60:: @ 0811BA60 - .incbin "baserom.gba", 0x11BA60, 0x0000008 - -gUnk_0811BA68:: @ 0811BA68 - .incbin "baserom.gba", 0x11BA68, 0x000000C - -gUnk_0811BA74:: @ 0811BA74 - .incbin "baserom.gba", 0x11BA74, 0x0000008 - -gUnk_0811BA7C:: @ 0811BA7C - .incbin "baserom.gba", 0x11BA7C, 0x000000C - -gUnk_0811BA88:: @ 0811BA88 - .incbin "baserom.gba", 0x11BA88, 0x000000C - -gUnk_0811BA94:: @ 0811BA94 - .incbin "baserom.gba", 0x11BA94, 0x0000008 - -gUnk_0811BA9C:: @ 0811BA9C - .incbin "baserom.gba", 0x11BA9C, 0x0000020 - -gUnk_0811BABC:: @ 0811BABC - .incbin "baserom.gba", 0x11BABC, 0x0000008 - -gUnk_0811BAC4:: @ 0811BAC4 - .incbin "baserom.gba", 0x11BAC4, 0x0000010 - -gUnk_0811BAD4:: @ 0811BAD4 - .incbin "baserom.gba", 0x11BAD4, 0x0000010 - -gUnk_0811BAE4:: @ 0811BAE4 - .incbin "baserom.gba", 0x11BAE4, 0x000000C - -gUnk_0811BAF0:: @ 0811BAF0 - .incbin "baserom.gba", 0x11BAF0, 0x000003C - -gUnk_0811BB2C:: @ 0811BB2C - .incbin "baserom.gba", 0x11BB2C, 0x000000C - -gUnk_0811BB38:: @ 0811BB38 - .incbin "baserom.gba", 0x11BB38, 0x0000004 - -gUnk_0811BB3C:: @ 0811BB3C - .incbin "baserom.gba", 0x11BB3C, 0x000000C - -gUnk_0811BB48:: @ 0811BB48 - .incbin "baserom.gba", 0x11BB48, 0x0000008 - -gUnk_0811BB50:: @ 0811BB50 - .incbin "baserom.gba", 0x11BB50, 0x0000008 - -gUnk_0811BB58:: @ 0811BB58 - .incbin "baserom.gba", 0x11BB58, 0x0000008 - -gUnk_0811BB60:: @ 0811BB60 - .incbin "baserom.gba", 0x11BB60, 0x0000008 - -gUnk_0811BB68:: @ 0811BB68 - .incbin "baserom.gba", 0x11BB68, 0x0000008 - -gUnk_0811BB70:: @ 0811BB70 - .incbin "baserom.gba", 0x11BB70, 0x0000010 - -gUnk_0811BB80:: @ 0811BB80 - .incbin "baserom.gba", 0x11BB80, 0x0000008 - -gUnk_0811BB88:: @ 0811BB88 - .incbin "baserom.gba", 0x11BB88, 0x0000008 - -gUnk_0811BB90:: @ 0811BB90 - .incbin "baserom.gba", 0x11BB90, 0x0000008 - -gUnk_0811BB98:: @ 0811BB98 - .incbin "baserom.gba", 0x11BB98, 0x0000014 - -gUnk_0811BBAC:: @ 0811BBAC - .incbin "baserom.gba", 0x11BBAC, 0x0000010 - -gUnk_0811BBBC:: @ 0811BBBC - .incbin "baserom.gba", 0x11BBBC, 0x0000006 - -gUnk_0811BBC2:: @ 0811BBC2 - .incbin "baserom.gba", 0x11BBC2, 0x0000006 - -gUnk_0811BBC8:: @ 0811BBC8 - .incbin "baserom.gba", 0x11BBC8, 0x0000006 - -gUnk_0811BBCE:: @ 0811BBCE - .incbin "baserom.gba", 0x11BBCE, 0x0000006 - -gUnk_0811BBD4:: @ 0811BBD4 - .incbin "baserom.gba", 0x11BBD4, 0x0000010 - -gUnk_0811BBE4:: @ 0811BBE4 - .incbin "baserom.gba", 0x11BBE4, 0x0000008 - -gUnk_0811BBEC:: @ 0811BBEC - .incbin "baserom.gba", 0x11BBEC, 0x000000C - -gUnk_0811BBF8:: @ 0811BBF8 - .incbin "baserom.gba", 0x11BBF8, 0x0000010 - -gUnk_0811BC08:: @ 0811BC08 - .incbin "baserom.gba", 0x11BC08, 0x0000020 - -gUnk_0811BC28:: @ 0811BC28 - .incbin "baserom.gba", 0x11BC28, 0x0000008 - -gUnk_0811BC30:: @ 0811BC30 - .incbin "baserom.gba", 0x11BC30, 0x0000008 - -gUnk_0811BC38:: @ 0811BC38 - .incbin "baserom.gba", 0x11BC38, 0x0000008 - -gUnk_0811BC40:: @ 0811BC40 - .incbin "baserom.gba", 0x11BC40, 0x0000008 - -gUnk_0811BC48:: @ 0811BC48 - .incbin "baserom.gba", 0x11BC48, 0x0000018 - -gUnk_0811BC60:: @ 0811BC60 - .incbin "baserom.gba", 0x11BC60, 0x0000020 - -gUnk_0811BC80:: @ 0811BC80 - .incbin "baserom.gba", 0x11BC80, 0x0000008 - -gUnk_0811BC88:: @ 0811BC88 - .incbin "baserom.gba", 0x11BC88, 0x0000010 - -gUnk_0811BC98:: @ 0811BC98 - .incbin "baserom.gba", 0x11BC98, 0x000001C - -gUnk_0811BCB4:: @ 0811BCB4 - .incbin "baserom.gba", 0x11BCB4, 0x0000010 diff --git a/data/data_0811415C.s b/data/data_0811415C.s new file mode 100644 index 00000000..862f9459 --- /dev/null +++ b/data/data_0811415C.s @@ -0,0 +1,849 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +@ TODO rename this file +gUnk_08114208:: @ 08114208 + .incbin "baserom.gba", 0x114208, 0x0000005 + +gUnk_0811420D:: @ 0811420D + .incbin "baserom.gba", 0x11420D, 0x0000004 + +gUnk_08114211:: @ 08114211 + .incbin "baserom.gba", 0x114211, 0x0000005 + +gUnk_08114216:: @ 08114216 + .incbin "baserom.gba", 0x114216, 0x0000009 + +gUnk_0811421F:: @ 0811421F + .incbin "baserom.gba", 0x11421F, 0x0000009 + +gUnk_08114228:: @ 08114228 + .incbin "baserom.gba", 0x114228, 0x0000014 + +gUnk_0811423C:: @ 0811423C + .incbin "baserom.gba", 0x11423C, 0x0000008 + +gUnk_08114244:: @ 08114244 + .incbin "baserom.gba", 0x114244, 0x0000019 + +gUnk_0811425D:: @ 0811425D + .incbin "baserom.gba", 0x11425D, 0x0000019 + +gUnk_08114276:: @ 08114276 + .incbin "baserom.gba", 0x114276, 0x0000019 + +gUnk_0811428F:: @ 0811428F + .incbin "baserom.gba", 0x11428F, 0x0000019 + +gUnk_081142A8:: @ 081142A8 + .incbin "baserom.gba", 0x1142A8, 0x0000014 + +gUnk_081142BC:: @ 081142BC + .incbin "baserom.gba", 0x1142BC, 0x0000010 + +gUnk_081142CC:: @ 081142CC + .incbin "baserom.gba", 0x1142CC, 0x0000010 + +gUnk_081142DC:: @ 081142DC + .incbin "baserom.gba", 0x1142DC, 0x0000020 + +gUnk_081142FC:: @ 081142FC + .incbin "baserom.gba", 0x1142FC, 0x0000008 + +gUnk_08114304:: @ 08114304 + .incbin "baserom.gba", 0x114304, 0x0000004 + +gUnk_08114308:: @ 08114308 + .incbin "baserom.gba", 0x114308, 0x0000128 + +gUnk_08114430:: @ 08114430 + .incbin "baserom.gba", 0x114430, 0x0000002 + +gUnk_08114432:: @ 08114432 + .incbin "baserom.gba", 0x114432, 0x0000012 + +gUnk_08114444:: @ 08114444 + .incbin "baserom.gba", 0x114444, 0x0000084 + +gUnk_081144C8:: @ 081144C8 + .incbin "baserom.gba", 0x1144C8, 0x0000005 + +gUnk_081144CD:: @ 081144CD + .incbin "baserom.gba", 0x1144CD, 0x0000005 + +gUnk_081144D2:: @ 081144D2 + .incbin "baserom.gba", 0x1144D2, 0x0000005 + +gUnk_081144D7:: @ 081144D7 + .incbin "baserom.gba", 0x1144D7, 0x0000005 + +gUnk_081144DC:: @ 081144DC + .incbin "baserom.gba", 0x1144DC, 0x0000014 + +gUnk_081144F0:: @ 081144F0 + .incbin "baserom.gba", 0x1144F0, 0x000000C + +gUnk_081144FC:: @ 081144FC + .incbin "baserom.gba", 0x1144FC, 0x0000035 + +gUnk_08114531:: @ 08114531 + .incbin "baserom.gba", 0x114531, 0x000000B + +gUnk_0811453C:: @ 0811453C + .incbin "baserom.gba", 0x11453C, 0x0000011 + +gUnk_0811454D:: @ 0811454D + .incbin "baserom.gba", 0x11454D, 0x0000011 + +gUnk_0811455E:: @ 0811455E + .incbin "baserom.gba", 0x11455E, 0x0000011 + +gUnk_0811456F:: @ 0811456F + .incbin "baserom.gba", 0x11456F, 0x0000005 + +gUnk_08114574:: @ 08114574 + .incbin "baserom.gba", 0x114574, 0x0000005 + +gUnk_08114579:: @ 08114579 + .incbin "baserom.gba", 0x114579, 0x0000007 + +gUnk_08114580:: @ 08114580 + .incbin "baserom.gba", 0x114580, 0x0000034 + +gUnk_081145B4:: @ 081145B4 + .incbin "baserom.gba", 0x1145B4, 0x0000014 + +gUnk_081145C8:: @ 081145C8 + .incbin "baserom.gba", 0x1145C8, 0x0000008 + +gUnk_081145D0:: @ 081145D0 + .incbin "baserom.gba", 0x1145D0, 0x0000004 + +gUnk_081145D4:: @ 081145D4 + .incbin "baserom.gba", 0x1145D4, 0x0000010 + +gUnk_081145E4:: @ 081145E4 + .incbin "baserom.gba", 0x1145E4, 0x00000D4 + +gUnk_081146B8:: @ 081146B8 + .incbin "baserom.gba", 0x1146B8, 0x0000018 + +gUnk_081146D0:: @ 081146D0 + .incbin "baserom.gba", 0x1146D0, 0x0000014 + +gUnk_081146E4:: @ 081146E4 + .incbin "baserom.gba", 0x1146E4, 0x0000010 + +gUnk_081146F4:: @ 081146F4 + .incbin "baserom.gba", 0x1146F4, 0x00000A8 + +gUnk_0811479C:: @ 0811479C + .incbin "baserom.gba", 0x11479C, 0x0000048 + +gUnk_081147E4:: @ 081147E4 + .incbin "baserom.gba", 0x1147E4, 0x0000020 + +gUnk_08114804:: @ 08114804 + .incbin "baserom.gba", 0x114804, 0x0000010 + +gUnk_08114814:: @ 08114814 + .incbin "baserom.gba", 0x114814, 0x0000010 + +gUnk_08114824:: @ 08114824 + .incbin "baserom.gba", 0x114824, 0x0000040 + +gUnk_08114864:: @ 08114864 + .incbin "baserom.gba", 0x114864, 0x0000010 + +gUnk_08114874:: @ 08114874 + .incbin "baserom.gba", 0x114874, 0x0000030 + +gUnk_081148A4:: @ 081148A4 + .incbin "baserom.gba", 0x1148A4, 0x0000020 + +gUnk_081148C4:: @ 081148C4 + .incbin "baserom.gba", 0x1148C4, 0x0000020 + +gUnk_081148E4:: @ 081148E4 + .incbin "baserom.gba", 0x1148E4, 0x0000030 + +gUnk_08114914:: @ 08114914 + .incbin "baserom.gba", 0x114914, 0x0000030 + +gUnk_08114944:: @ 08114944 + .incbin "baserom.gba", 0x114944, 0x0000030 + +gUnk_08114974:: @ 08114974 + .incbin "baserom.gba", 0x114974, 0x0000010 + +gUnk_08114984:: @ 08114984 + .incbin "baserom.gba", 0x114984, 0x0000010 + +gUnk_08114994:: @ 08114994 + .incbin "baserom.gba", 0x114994, 0x0000010 + +gUnk_081149A4:: @ 081149A4 + .incbin "baserom.gba", 0x1149A4, 0x0000010 + +gUnk_081149B4:: @ 081149B4 + .incbin "baserom.gba", 0x1149B4, 0x0000010 + +gUnk_081149C4:: @ 081149C4 + .incbin "baserom.gba", 0x1149C4, 0x0000030 + +gUnk_081149F4:: @ 081149F4 + .incbin "baserom.gba", 0x1149F4, 0x0000020 + +gUnk_08114A14:: @ 08114A14 + .incbin "baserom.gba", 0x114A14, 0x0000058 + +gUnk_08114A6C:: @ 08114A6C + .incbin "baserom.gba", 0x114A6C, 0x0000020 + +gUnk_08114A8C:: @ 08114A8C + .incbin "baserom.gba", 0x114A8C, 0x0000030 + +gUnk_08114ABC:: @ 08114ABC + .incbin "baserom.gba", 0x114ABC, 0x0000028 + +gUnk_08114AE4:: @ 08114AE4 + .incbin "baserom.gba", 0x114AE4, 0x0000400 + +gUnk_08114EE4:: @ 08114EE4 + .incbin "baserom.gba", 0x114EE4, 0x0000018 + +gUnk_08114EFC:: @ 08114EFC + .incbin "baserom.gba", 0x114EFC, 0x0000010 + +gUnk_08114F0C:: @ 08114F0C + .incbin "baserom.gba", 0x114F0C, 0x0000024 + +gUnk_08114F30:: @ 08114F30 + .incbin "baserom.gba", 0x114F30, 0x0000004 + +gUnk_08114F34:: @ 08114F34 + .incbin "baserom.gba", 0x114F34, 0x0000004 + +gUnk_08114F38:: @ 08114F38 + .incbin "baserom.gba", 0x114F38, 0x0000020 + +gUnk_08114F58:: @ 08114F58 + .incbin "baserom.gba", 0x114F58, 0x0000020 + +gUnk_08114F78:: @ 08114F78 + .incbin "baserom.gba", 0x114F78, 0x0000008 + +gUnk_08114F80:: @ 08114F80 + .incbin "baserom.gba", 0x114F80, 0x0000008 + +gUnk_08114F88:: @ 08114F88 + .incbin "baserom.gba", 0x114F88, 0x0000010 + +gUnk_08114F98:: @ 08114F98 + .incbin "baserom.gba", 0x114F98, 0x00003F4 + +gUnk_0811538C:: @ 0811538C + .incbin "baserom.gba", 0x11538C, 0x0000153 + +gUnk_081154DF:: @ 081154DF + .incbin "baserom.gba", 0x1154DF, 0x0000042 + +gUnk_08115521:: @ 08115521 + .incbin "baserom.gba", 0x115521, 0x0000002 + +gUnk_08115523:: @ 08115523 + .incbin "baserom.gba", 0x115523, 0x0000003 + +gUnk_08115526:: @ 08115526 + .incbin "baserom.gba", 0x115526, 0x00001FE + +gUnk_08115724:: @ 08115724 + .incbin "baserom.gba", 0x115724, 0x00003D4 + +gUnk_08115AF8:: @ 08115AF8 + .incbin "baserom.gba", 0x115AF8, 0x00003A4 + +gUnk_08115E9C:: @ 08115E9C + .incbin "baserom.gba", 0x115E9C, 0x0000176 + +gUnk_08116012:: @ 08116012 + .incbin "baserom.gba", 0x116012, 0x000026E + +gUnk_08116280:: @ 08116280 + .incbin "baserom.gba", 0x116280, 0x00002B0 + +gUnk_08116530:: @ 08116530 + .incbin "baserom.gba", 0x116530, 0x00001D3 + +gUnk_08116703:: @ 08116703 + .incbin "baserom.gba", 0x116703, 0x0000085 + +gUnk_08116788:: @ 08116788 + .incbin "baserom.gba", 0x116788, 0x0000100 + +gUnk_08116888:: @ 08116888 + .incbin "baserom.gba", 0x116888, 0x0000017 + +gUnk_0811689F:: @ 0811689F + .incbin "baserom.gba", 0x11689F, 0x00001FD + +gUnk_08116A9C:: @ 08116A9C + .incbin "baserom.gba", 0x116A9C, 0x0000270 + +gUnk_08116D0C:: @ 08116D0C + .incbin "baserom.gba", 0x116D0C, 0x00000C8 + +gUnk_08116DD4:: @ 08116DD4 + .incbin "baserom.gba", 0x116DD4, 0x0000071 + +gUnk_08116E45:: @ 08116E45 + .incbin "baserom.gba", 0x116E45, 0x000011F + +gUnk_08116F64:: @ 08116F64 + .incbin "baserom.gba", 0x116F64, 0x00002A4 + +gUnk_08117208:: @ 08117208 + .incbin "baserom.gba", 0x117208, 0x0000038 + +gUnk_08117240:: @ 08117240 + .incbin "baserom.gba", 0x117240, 0x000039C + +gUnk_081175DC:: @ 081175DC + .incbin "baserom.gba", 0x1175DC, 0x00002D4 + +gUnk_081178B0:: @ 081178B0 + .incbin "baserom.gba", 0x1178B0, 0x00002D4 + +gUnk_08117B84:: @ 08117B84 + .incbin "baserom.gba", 0x117B84, 0x00001E0 + +gUnk_08117D64:: @ 08117D64 + .incbin "baserom.gba", 0x117D64, 0x00000DC + +gUnk_08117E40:: @ 08117E40 + .incbin "baserom.gba", 0x117E40, 0x0000128 + +gUnk_08117F68:: @ 08117F68 + .incbin "baserom.gba", 0x117F68, 0x000006C + +gUnk_08117FD4:: @ 08117FD4 + .incbin "baserom.gba", 0x117FD4, 0x00001AD + +gUnk_08118181:: @ 08118181 + .incbin "baserom.gba", 0x118181, 0x0000033 + +gUnk_081181B4:: @ 081181B4 + .incbin "baserom.gba", 0x1181B4, 0x0000030 + +gUnk_081181E4:: @ 081181E4 + .incbin "baserom.gba", 0x1181E4, 0x0000054 + +gUnk_08118238:: @ 08118238 + .incbin "baserom.gba", 0x118238, 0x000002C + +gUnk_08118264:: @ 08118264 + .incbin "baserom.gba", 0x118264, 0x0000034 + +gUnk_08118298:: @ 08118298 + .incbin "baserom.gba", 0x118298, 0x0000100 + +gUnk_08118398:: @ 08118398 + .incbin "baserom.gba", 0x118398, 0x0000024 + +gUnk_081183BC:: @ 081183BC + .incbin "baserom.gba", 0x1183BC, 0x00000B0 + +gUnk_0811846C:: @ 0811846C + .incbin "baserom.gba", 0x11846C, 0x000003C + +gUnk_081184A8:: @ 081184A8 + .incbin "baserom.gba", 0x1184A8, 0x00000B0 + +gUnk_08118558:: @ 08118558 + .incbin "baserom.gba", 0x118558, 0x00001C8 + +gUnk_08118720:: @ 08118720 + .incbin "baserom.gba", 0x118720, 0x0000048 + +gUnk_08118768:: @ 08118768 + .incbin "baserom.gba", 0x118768, 0x0000018 + +gUnk_08118780:: @ 08118780 + .incbin "baserom.gba", 0x118780, 0x0000008 + +gUnk_08118788:: @ 08118788 + .incbin "baserom.gba", 0x118788, 0x000000C + +gUnk_08118794:: @ 08118794 + .incbin "baserom.gba", 0x118794, 0x000012C + +gUnk_081188C0:: @ 081188C0 + .incbin "baserom.gba", 0x1188C0, 0x0000088 + +gUnk_08118948:: @ 08118948 + .incbin "baserom.gba", 0x118948, 0x0000018 + +gUnk_08118960:: @ 08118960 + .incbin "baserom.gba", 0x118960, 0x0000014 + +gUnk_08118974:: @ 08118974 + .incbin "baserom.gba", 0x118974, 0x0000014 + +gUnk_08118988:: @ 08118988 + .incbin "baserom.gba", 0x118988, 0x0000278 + +gUnk_08118C00:: @ 08118C00 + .incbin "baserom.gba", 0x118C00, 0x0000138 + +gUnk_08118D38:: @ 08118D38 + .incbin "baserom.gba", 0x118D38, 0x000006C + +gUnk_08118DA4:: @ 08118DA4 + .incbin "baserom.gba", 0x118DA4, 0x000002C + +gUnk_08118DD0:: @ 08118DD0 + .incbin "baserom.gba", 0x118DD0, 0x000000C + +gUnk_08118DDC:: @ 08118DDC + .incbin "baserom.gba", 0x118DDC, 0x0000080 + +gUnk_08118E5C:: @ 08118E5C + .incbin "baserom.gba", 0x118E5C, 0x00000A8 + +gUnk_08118F04:: @ 08118F04 + .incbin "baserom.gba", 0x118F04, 0x0000038 + +gUnk_08118F3C:: @ 08118F3C + .incbin "baserom.gba", 0x118F3C, 0x0000028 + +gUnk_08118F64:: @ 08118F64 + .incbin "baserom.gba", 0x118F64, 0x0000034 + +gUnk_08118F98:: @ 08118F98 + .incbin "baserom.gba", 0x118F98, 0x0000108 + +gUnk_081190A0:: @ 081190A0 + .incbin "baserom.gba", 0x1190A0, 0x0000044 + +gUnk_081190E4:: @ 081190E4 + .incbin "baserom.gba", 0x1190E4, 0x0000038 + +gUnk_0811911C:: @ 0811911C + .incbin "baserom.gba", 0x11911C, 0x0000010 + +gUnk_0811912C:: @ 0811912C + .incbin "baserom.gba", 0x11912C, 0x000005C + +gUnk_08119188:: @ 08119188 + .incbin "baserom.gba", 0x119188, 0x0000120 + +gUnk_081192A8:: @ 081192A8 + .incbin "baserom.gba", 0x1192A8, 0x00002A0 + +gUnk_08119548:: @ 08119548 + .incbin "baserom.gba", 0x119548, 0x000027C + +gUnk_081197C4:: @ 081197C4 + .incbin "baserom.gba", 0x1197C4, 0x0000030 + +gUnk_081197F4:: @ 081197F4 + .incbin "baserom.gba", 0x1197F4, 0x00000D0 + +gUnk_081198C4:: @ 081198C4 + .incbin "baserom.gba", 0x1198C4, 0x0000028 + +gUnk_081198EC:: @ 081198EC + .incbin "baserom.gba", 0x1198EC, 0x00000B8 + +gUnk_081199A4:: @ 081199A4 + .incbin "baserom.gba", 0x1199A4, 0x0000054 + +gUnk_081199F8:: @ 081199F8 + .incbin "baserom.gba", 0x1199F8, 0x000007C + +gUnk_08119A74:: @ 08119A74 + .incbin "baserom.gba", 0x119A74, 0x000007C + +gUnk_08119AF0:: @ 08119AF0 + .incbin "baserom.gba", 0x119AF0, 0x000008C + +gUnk_08119B7C:: @ 08119B7C + .incbin "baserom.gba", 0x119B7C, 0x0000074 + +gUnk_08119BF0:: @ 08119BF0 + .incbin "baserom.gba", 0x119BF0, 0x0000074 + +gUnk_08119C64:: @ 08119C64 + .incbin "baserom.gba", 0x119C64, 0x0000090 + +gUnk_08119CF4:: @ 08119CF4 + .incbin "baserom.gba", 0x119CF4, 0x0000060 + +gUnk_08119D54:: @ 08119D54 + .incbin "baserom.gba", 0x119D54, 0x0000054 + +gUnk_08119DA8:: @ 08119DA8 + .incbin "baserom.gba", 0x119DA8, 0x0000054 + +gUnk_08119DFC:: @ 08119DFC + .incbin "baserom.gba", 0x119DFC, 0x000001C + +gUnk_08119E18:: @ 08119E18 + .incbin "baserom.gba", 0x119E18, 0x000002C + +gUnk_08119E44:: @ 08119E44 + .incbin "baserom.gba", 0x119E44, 0x000006C + +gUnk_08119EB0:: @ 08119EB0 + .incbin "baserom.gba", 0x119EB0, 0x0000028 + +gUnk_08119ED8:: @ 08119ED8 + .incbin "baserom.gba", 0x119ED8, 0x00000A8 + +gUnk_08119F80:: @ 08119F80 + .incbin "baserom.gba", 0x119F80, 0x0000024 + +gUnk_08119FA4:: @ 08119FA4 + .incbin "baserom.gba", 0x119FA4, 0x0000024 + +gUnk_08119FC8:: @ 08119FC8 + .incbin "baserom.gba", 0x119FC8, 0x000000C + +gUnk_08119FD4:: @ 08119FD4 + .incbin "baserom.gba", 0x119FD4, 0x0000048 + +gUnk_0811A01C:: @ 0811A01C + .incbin "baserom.gba", 0x11A01C, 0x0000030 + +gUnk_0811A04C:: @ 0811A04C + .incbin "baserom.gba", 0x11A04C, 0x000001C + +gUnk_0811A068:: @ 0811A068 + .incbin "baserom.gba", 0x11A068, 0x000003C + +gUnk_0811A0A4:: @ 0811A0A4 + .incbin "baserom.gba", 0x11A0A4, 0x0000028 + +gUnk_0811A0CC:: @ 0811A0CC + .incbin "baserom.gba", 0x11A0CC, 0x0000018 + +gUnk_0811A0E4:: @ 0811A0E4 + .incbin "baserom.gba", 0x11A0E4, 0x0000040 + +gUnk_0811A124:: @ 0811A124 + .incbin "baserom.gba", 0x11A124, 0x0000020 + +gUnk_0811A144:: @ 0811A144 + .incbin "baserom.gba", 0x11A144, 0x0000038 + +gUnk_0811A17C:: @ 0811A17C + .incbin "baserom.gba", 0x11A17C, 0x000004C + +gUnk_0811A1C8:: @ 0811A1C8 + .incbin "baserom.gba", 0x11A1C8, 0x0000030 + +gUnk_0811A1F8:: @ 0811A1F8 + .incbin "baserom.gba", 0x11A1F8, 0x0000030 + +gUnk_0811A228:: @ 0811A228 + .incbin "baserom.gba", 0x11A228, 0x0000058 + +gUnk_0811A280:: @ 0811A280 + .incbin "baserom.gba", 0x11A280, 0x000000C + +gUnk_0811A28C:: @ 0811A28C + .incbin "baserom.gba", 0x11A28C, 0x000001C + +gUnk_0811A2A8:: @ 0811A2A8 + .incbin "baserom.gba", 0x11A2A8, 0x0000028 + +gUnk_0811A2D0:: @ 0811A2D0 + .incbin "baserom.gba", 0x11A2D0, 0x000002C + +gUnk_0811A2FC:: @ 0811A2FC + .incbin "baserom.gba", 0x11A2FC, 0x0000214 + +gUnk_0811A510:: @ 0811A510 + .incbin "baserom.gba", 0x11A510, 0x000024C + +gUnk_0811A75C:: @ 0811A75C + .incbin "baserom.gba", 0x11A75C, 0x000004C + +gUnk_0811A7A8:: @ 0811A7A8 + .incbin "baserom.gba", 0x11A7A8, 0x00000C4 + +gUnk_0811A86C:: @ 0811A86C + .incbin "baserom.gba", 0x11A86C, 0x0000060 + +gUnk_0811A8CC:: @ 0811A8CC + .incbin "baserom.gba", 0x11A8CC, 0x00000E8 + +gUnk_0811A9B4:: @ 0811A9B4 + .incbin "baserom.gba", 0x11A9B4, 0x0000078 + +gUnk_0811AA2C:: @ 0811AA2C + .incbin "baserom.gba", 0x11AA2C, 0x0000050 + +gUnk_0811AA7C:: @ 0811AA7C + .incbin "baserom.gba", 0x11AA7C, 0x000009C + +gUnk_0811AB18:: @ 0811AB18 + .incbin "baserom.gba", 0x11AB18, 0x00000E0 + +gUnk_0811ABF8:: @ 0811ABF8 + .incbin "baserom.gba", 0x11ABF8, 0x0000019 + +gUnk_0811AC11:: @ 0811AC11 + .incbin "baserom.gba", 0x11AC11, 0x0000113 + +gUnk_0811AD24:: @ 0811AD24 + .incbin "baserom.gba", 0x11AD24, 0x00000A8 + +gUnk_0811ADCC:: @ 0811ADCC + .incbin "baserom.gba", 0x11ADCC, 0x00000E4 + +gUnk_0811AEB0:: @ 0811AEB0 + .incbin "baserom.gba", 0x11AEB0, 0x0000028 + +gUnk_0811AED8:: @ 0811AED8 + .incbin "baserom.gba", 0x11AED8, 0x000004C + +gUnk_0811AF24:: @ 0811AF24 + .incbin "baserom.gba", 0x11AF24, 0x0000010 + +gUnk_0811AF34:: @ 0811AF34 + .incbin "baserom.gba", 0x11AF34, 0x0000030 + +gUnk_0811AF64:: @ 0811AF64 + .incbin "baserom.gba", 0x11AF64, 0x0000028 + +gUnk_0811AF8C:: @ 0811AF8C + .incbin "baserom.gba", 0x11AF8C, 0x0000030 + +gUnk_0811AFBC:: @ 0811AFBC + .incbin "baserom.gba", 0x11AFBC, 0x0000014 + +gUnk_0811AFD0:: @ 0811AFD0 + .incbin "baserom.gba", 0x11AFD0, 0x0000030 + +gUnk_0811B000:: @ 0811B000 + .incbin "baserom.gba", 0x11B000, 0x000001C + +gUnk_0811B01C:: @ 0811B01C + .incbin "baserom.gba", 0x11B01C, 0x0000010 + +gUnk_0811B02C:: @ 0811B02C + .incbin "baserom.gba", 0x11B02C, 0x0000084 + +gUnk_0811B0B0:: @ 0811B0B0 + .incbin "baserom.gba", 0x11B0B0, 0x0000080 + +gUnk_0811B130:: @ 0811B130 + .incbin "baserom.gba", 0x11B130, 0x0000048 + +gUnk_0811B178:: @ 0811B178 + .incbin "baserom.gba", 0x11B178, 0x0000018 + +gUnk_0811B190:: @ 0811B190 + .incbin "baserom.gba", 0x11B190, 0x0000084 + +gUnk_0811B214:: @ 0811B214 + .incbin "baserom.gba", 0x11B214, 0x0000044 + +gUnk_0811B258:: @ 0811B258 + .incbin "baserom.gba", 0x11B258, 0x000003C + +gUnk_0811B294:: @ 0811B294 + .incbin "baserom.gba", 0x11B294, 0x0000068 + +gUnk_0811B2FC:: @ 0811B2FC + .incbin "baserom.gba", 0x11B2FC, 0x0000050 + +gUnk_0811B34C:: @ 0811B34C + .incbin "baserom.gba", 0x11B34C, 0x0000048 + +gUnk_0811B394:: @ 0811B394 + .incbin "baserom.gba", 0x11B394, 0x0000010 + +gUnk_0811B3A4:: @ 0811B3A4 + .incbin "baserom.gba", 0x11B3A4, 0x0000010 + +gUnk_0811B3B4:: @ 0811B3B4 + .incbin "baserom.gba", 0x11B3B4, 0x0000014 + +gUnk_0811B3C8:: @ 0811B3C8 + .incbin "baserom.gba", 0x11B3C8, 0x0000040 + +gUnk_0811B408:: @ 0811B408 + .incbin "baserom.gba", 0x11B408, 0x0000138 + +gUnk_0811B540:: @ 0811B540 + .incbin "baserom.gba", 0x11B540, 0x0000024 + +gUnk_0811B564:: @ 0811B564 + .incbin "baserom.gba", 0x11B564, 0x0000014 + +gUnk_0811B578:: @ 0811B578 + .incbin "baserom.gba", 0x11B578, 0x00003C8 + +gUnk_0811B940:: @ 0811B940 + .incbin "baserom.gba", 0x11B940, 0x000004C + +gUnk_0811B98C:: @ 0811B98C + .incbin "baserom.gba", 0x11B98C, 0x0000014 + +gUnk_0811B9A0:: @ 0811B9A0 + .incbin "baserom.gba", 0x11B9A0, 0x0000008 + +gUnk_0811B9A8:: @ 0811B9A8 + .incbin "baserom.gba", 0x11B9A8, 0x0000020 + +gUnk_0811B9C8:: @ 0811B9C8 + .incbin "baserom.gba", 0x11B9C8, 0x0000008 + +gUnk_0811B9D0:: @ 0811B9D0 + .incbin "baserom.gba", 0x11B9D0, 0x0000008 + +gUnk_0811B9D8:: @ 0811B9D8 + .incbin "baserom.gba", 0x11B9D8, 0x0000008 + +gUnk_0811B9E0:: @ 0811B9E0 + .incbin "baserom.gba", 0x11B9E0, 0x0000080 + +gUnk_0811BA60:: @ 0811BA60 + .incbin "baserom.gba", 0x11BA60, 0x0000008 + +gUnk_0811BA68:: @ 0811BA68 + .incbin "baserom.gba", 0x11BA68, 0x000000C + +gUnk_0811BA74:: @ 0811BA74 + .incbin "baserom.gba", 0x11BA74, 0x0000008 + +gUnk_0811BA7C:: @ 0811BA7C + .incbin "baserom.gba", 0x11BA7C, 0x000000C + +gUnk_0811BA88:: @ 0811BA88 + .incbin "baserom.gba", 0x11BA88, 0x000000C + +gUnk_0811BA94:: @ 0811BA94 + .incbin "baserom.gba", 0x11BA94, 0x0000008 + +gUnk_0811BA9C:: @ 0811BA9C + .incbin "baserom.gba", 0x11BA9C, 0x0000020 + +gUnk_0811BABC:: @ 0811BABC + .incbin "baserom.gba", 0x11BABC, 0x0000008 + +gUnk_0811BAC4:: @ 0811BAC4 + .incbin "baserom.gba", 0x11BAC4, 0x0000010 + +gUnk_0811BAD4:: @ 0811BAD4 + .incbin "baserom.gba", 0x11BAD4, 0x0000010 + +gUnk_0811BAE4:: @ 0811BAE4 + .incbin "baserom.gba", 0x11BAE4, 0x000000C + +gUnk_0811BAF0:: @ 0811BAF0 + .incbin "baserom.gba", 0x11BAF0, 0x000003C + +gUnk_0811BB2C:: @ 0811BB2C + .incbin "baserom.gba", 0x11BB2C, 0x000000C + +gUnk_0811BB38:: @ 0811BB38 + .incbin "baserom.gba", 0x11BB38, 0x0000004 + +gUnk_0811BB3C:: @ 0811BB3C + .incbin "baserom.gba", 0x11BB3C, 0x000000C + +gUnk_0811BB48:: @ 0811BB48 + .incbin "baserom.gba", 0x11BB48, 0x0000008 + +gUnk_0811BB50:: @ 0811BB50 + .incbin "baserom.gba", 0x11BB50, 0x0000008 + +gUnk_0811BB58:: @ 0811BB58 + .incbin "baserom.gba", 0x11BB58, 0x0000008 + +gUnk_0811BB60:: @ 0811BB60 + .incbin "baserom.gba", 0x11BB60, 0x0000008 + +gUnk_0811BB68:: @ 0811BB68 + .incbin "baserom.gba", 0x11BB68, 0x0000008 + +gUnk_0811BB70:: @ 0811BB70 + .incbin "baserom.gba", 0x11BB70, 0x0000010 + +gUnk_0811BB80:: @ 0811BB80 + .incbin "baserom.gba", 0x11BB80, 0x0000008 + +gUnk_0811BB88:: @ 0811BB88 + .incbin "baserom.gba", 0x11BB88, 0x0000008 + +gUnk_0811BB90:: @ 0811BB90 + .incbin "baserom.gba", 0x11BB90, 0x0000008 + +gUnk_0811BB98:: @ 0811BB98 + .incbin "baserom.gba", 0x11BB98, 0x0000014 + +gUnk_0811BBAC:: @ 0811BBAC + .incbin "baserom.gba", 0x11BBAC, 0x0000010 + +gUnk_0811BBBC:: @ 0811BBBC + .incbin "baserom.gba", 0x11BBBC, 0x0000006 + +gUnk_0811BBC2:: @ 0811BBC2 + .incbin "baserom.gba", 0x11BBC2, 0x0000006 + +gUnk_0811BBC8:: @ 0811BBC8 + .incbin "baserom.gba", 0x11BBC8, 0x0000006 + +gUnk_0811BBCE:: @ 0811BBCE + .incbin "baserom.gba", 0x11BBCE, 0x0000006 + +gUnk_0811BBD4:: @ 0811BBD4 + .incbin "baserom.gba", 0x11BBD4, 0x0000010 + +gUnk_0811BBE4:: @ 0811BBE4 + .incbin "baserom.gba", 0x11BBE4, 0x0000008 + +gUnk_0811BBEC:: @ 0811BBEC + .incbin "baserom.gba", 0x11BBEC, 0x000000C + +gUnk_0811BBF8:: @ 0811BBF8 + .incbin "baserom.gba", 0x11BBF8, 0x0000010 + +gUnk_0811BC08:: @ 0811BC08 + .incbin "baserom.gba", 0x11BC08, 0x0000020 + +gUnk_0811BC28:: @ 0811BC28 + .incbin "baserom.gba", 0x11BC28, 0x0000008 + +gUnk_0811BC30:: @ 0811BC30 + .incbin "baserom.gba", 0x11BC30, 0x0000008 + +gUnk_0811BC38:: @ 0811BC38 + .incbin "baserom.gba", 0x11BC38, 0x0000008 + +gUnk_0811BC40:: @ 0811BC40 + .incbin "baserom.gba", 0x11BC40, 0x0000008 + +gUnk_0811BC48:: @ 0811BC48 + .incbin "baserom.gba", 0x11BC48, 0x0000018 + +gUnk_0811BC60:: @ 0811BC60 + .incbin "baserom.gba", 0x11BC60, 0x0000020 + +gUnk_0811BC80:: @ 0811BC80 + .incbin "baserom.gba", 0x11BC80, 0x0000008 + +gUnk_0811BC88:: @ 0811BC88 + .incbin "baserom.gba", 0x11BC88, 0x0000010 + +gUnk_0811BC98:: @ 0811BC98 + .incbin "baserom.gba", 0x11BC98, 0x000001C + +gUnk_0811BCB4:: @ 0811BCB4 + .incbin "baserom.gba", 0x11BCB4, 0x0000010 diff --git a/include/functions.h b/include/functions.h index 451785cc..ecf438fb 100644 --- a/include/functions.h +++ b/include/functions.h @@ -79,7 +79,7 @@ extern void sub_080791D0(); extern void sub_0805EC9C(); extern void sub_0805EC60(); extern void sub_080873D0(); -extern u8 sub_080045D4(s16, s16, u32, u32); +extern u32 sub_080045D4(s16, s16, u32, u32); extern void sub_0806F69C(Entity*); extern void sub_0805E3A0(void*, u32); extern void sub_0806D0B0(Entity*); diff --git a/linker.ld b/linker.ld index 07848cbf..1d83ac02 100644 --- a/linker.ld +++ b/linker.ld @@ -627,7 +627,7 @@ SECTIONS { src/npc/mayorHagen.o(.text); src/npc/bigGoron.o(.text); asm/bigGoron.o(.text); - src/ezloCap.o(.text); + src/npc/ezloCap.o(.text); asm/npc4E.o(.text); src/npc/clothesRack.o(.text); asm/clothesRack.o(.text); @@ -1014,6 +1014,8 @@ SECTIONS { src/manager/manager27.o(.rodata); src/manager/manager28.o(.rodata); data/data_08108D30.o(.rodata); + src/npc/ezloCap.o(.rodata); + data/data_0811415C.o(.rodata); src/item.o(.rodata); data/data_0811BD44.o(.rodata); data/room_headers.o(.rodata); diff --git a/src/ezloCap.c b/src/npc/ezloCap.c similarity index 65% rename from src/ezloCap.c rename to src/npc/ezloCap.c index 55541256..50b1c2e6 100644 --- a/src/ezloCap.c +++ b/src/npc/ezloCap.c @@ -6,28 +6,28 @@ #include "script.h" extern Hitbox gUnk_080FD170; - -extern u16* gUnk_08114144; - -extern u32 gUnk_081141A4[]; -extern u8 gUnk_081141E4[]; - -extern Hitbox gUnk_08114154; extern void gUnk_08016030; // Cutscene data type? extern void gUnk_0801606C; // Cutscene data type? -extern void gUnk_081141F4; // tiles that are changed? - extern void sub_0809623C(Entity*); extern void sub_08096260(Entity*); -void EzloCap(Entity* this) { +const u8 gUnk_08114134[]; +const u8 gUnk_08114144[]; +const Hitbox gUnk_08114154; +const u8 gUnk_0811415C[]; +const ScreenTransitionData* const gUnk_081141A4[]; +const u8 gUnk_081141E4[]; +const u8 gUnk_081141F4[]; + +void EzloCap( + Entity* this) { // 0x0806D86C // Ezlo as a cap in the Minish Woods, is destroyed as soon as link wears ezlo if (this->action == 0) { this->action += 1; sub_0805E3A0(this, 2); sub_0807DD50(this); } - sub_0807DDAC(this, 0); + sub_0807DDAC(this, NULL); sub_0807DDE4(this); UpdateAnimationSingleFrame(this); } @@ -64,7 +64,9 @@ void sub_0806D9A4(Entity* this) { gPlayerEntity.animationState = 4; } -void NPC4E(Entity* this) { +void NPC4E(Entity* this) { // 0x0806D9D0 // is created when link enters minish woods for the first time and + // destroyed once he wears ezlo. Also exists when entering hyrule for the second time + // and fusing kinstones. Is destroyed as soon as the kinstone is fused. if (this->action == 0) { this->action = 1; this->spriteSettings.b.draw = 4; @@ -76,13 +78,6 @@ void NPC4E(Entity* this) { } NONMATCH("asm/non_matching/ezloCap/sub_0806DA04.inc", void sub_0806DA04(Entity* this, u32 param_2)) { - u8 direction = - sub_080045D4(this->x.HALF.HI, this->y.HALF.HI, (int)gPlayerEntity.x.HALF.HI, (int)gPlayerEntity.y.HALF.HI); - this->direction = direction; - - this->animationState = - (this->animationState & 0x80) | - gUnk_08114144[(((direction) << 0x18) >> 0x19)]; // somehow the cast from u8 to u32 of direction is an issue here } END_NONMATCH @@ -224,7 +219,7 @@ void sub_0806DC58(Entity* this) { } void sub_0806DC7C() { - u16* tiles = &gUnk_081141F4; + u16* tiles = (u16*)&gUnk_081141F4; while (*tiles != 0) { u32 tile = (u32)*tiles; tiles = tiles + 1; @@ -236,7 +231,7 @@ void sub_0806DCA0() { u16 uVar1; u16* tiles; - tiles = &gUnk_081141F4; + tiles = (u16*)&gUnk_081141F4; while (*tiles != 0) { u16 tile = *tiles; tiles = tiles + 1; @@ -274,3 +269,50 @@ void NPC4E_Fusion(Entity* this) { } } } + +// rodata +const u8 gUnk_08114134[] = { 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, + 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07, 0x00 }; + +// animation states +const u8 gUnk_08114144[] = { 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, + 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07, 0x00 }; + +const BoundingBox gUnk_08114154 = { 0, -8, 0, 0, 0, 0, 24, 8 }; + +const u8 gUnk_0811415C[] = { // 0x48 + 0x00, 0x00, 0x08, 0x08, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x04, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0a, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x04, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x04, 0x0e, 0x00, + 0x00, 0x00, 0x00, 0xf8, 0x18, 0x08, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x08, 0x0e, 0x00, 0x00, 0x00 +}; +extern ScreenTransitionData gUnk_0813AB6C; +extern ScreenTransitionData gUnk_0813ABBC; +extern ScreenTransitionData gUnk_0813ABE4; +extern ScreenTransitionData gUnk_0813ABF8; +extern ScreenTransitionData gUnk_0813AC0C; +extern ScreenTransitionData gUnk_0813AC20; +extern ScreenTransitionData gUnk_0813AC5C; +extern ScreenTransitionData gUnk_0813AC70; +extern ScreenTransitionData gUnk_0813AC84; +extern ScreenTransitionData gUnk_0813AC98; +extern ScreenTransitionData gUnk_0813ACAC; +extern ScreenTransitionData gUnk_0813ACC0; +extern ScreenTransitionData gUnk_0813ACD4; +extern ScreenTransitionData gUnk_0813ACE8; +extern ScreenTransitionData gUnk_0813AC5C; +extern ScreenTransitionData gUnk_0813ACFC; +// Array of pointers to ScreenTransitionData +const ScreenTransitionData* const gUnk_081141A4[] = { &gUnk_0813AB6C, &gUnk_0813ABBC, &gUnk_0813ABE4, &gUnk_0813ABF8, + &gUnk_0813AC0C, &gUnk_0813AC20, &gUnk_0813AC5C, &gUnk_0813AC70, + &gUnk_0813AC84, &gUnk_0813AC98, &gUnk_0813ACAC, &gUnk_0813ACC0, + &gUnk_0813ACD4, &gUnk_0813ACE8, &gUnk_0813AC5C, &gUnk_0813ACFC }; +// param_2 for the call to sub_0808091C, same indices as gUnk_081141A4 +const u8 gUnk_081141E4[] = { 0x02, 0x02, 0x04, 0x04, 0x02, 0x02, 0x09, 0x02, + 0x02, 0x04, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02 }; + +// tiles that are changed? +const u8 gUnk_081141F4[] = { // 0x14 + 0x7a, 0x04, 0x7b, 0x04, 0xaf, 0x05, 0xef, 0x05, 0x38, 0x07, + 0x39, 0x07, 0x3a, 0x07, 0x3b, 0x07, 0x00, 0x00, 0x00, 0x00 +}; \ No newline at end of file From 27992b7e5fc9721bfea0da6e72100766ff0acbbf Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Mon, 1 Mar 2021 02:26:53 +0100 Subject: [PATCH 3/3] Refactor rest of ezloCap --- asm/non_matching/ezloCap/sub_0806D8A0.inc | 55 ----------- asm/non_matching/ezloCap/sub_0806D908.inc | 32 ------- asm/non_matching/ezloCap/sub_0806DA04.inc | 16 ---- data/{data_0811415C.s => data_08114208.s} | 1 - linker.ld | 2 +- src/npc/ezloCap.c | 110 +++++++++++++++------- 6 files changed, 76 insertions(+), 140 deletions(-) delete mode 100644 asm/non_matching/ezloCap/sub_0806D8A0.inc delete mode 100644 asm/non_matching/ezloCap/sub_0806D908.inc delete mode 100644 asm/non_matching/ezloCap/sub_0806DA04.inc rename data/{data_0811415C.s => data_08114208.s} (99%) diff --git a/asm/non_matching/ezloCap/sub_0806D8A0.inc b/asm/non_matching/ezloCap/sub_0806D8A0.inc deleted file mode 100644 index 64c18349..00000000 --- a/asm/non_matching/ezloCap/sub_0806D8A0.inc +++ /dev/null @@ -1,55 +0,0 @@ - .syntax unified - - .text - - push {r4, r5, lr} - adds r4, r0, #0 - adds r3, r1, #0 - movs r2, #0 - movs r0, #8 - strb r0, [r3, #0x19] - ldr r0, [r3, #8] - movs r1, #2 - orrs r0, r1 - str r0, [r3, #8] - str r2, [r3, #0x14] - movs r2, #0x10 - ldrb r0, [r4, #0x18] - lsls r0, r0, #0x19 - cmp r0, #0 - bge _0806D8C2 - rsbs r2, r2, #0 -_0806D8C2: - ldr r1, _0806D900 @ =gPlayerEntity - movs r5, #0x2e - ldrsh r0, [r1, r5] - adds r2, r2, r0 - movs r0, #0x32 - ldrsh r1, [r1, r0] - adds r1, #2 - strh r2, [r3, #0x1e] - strh r1, [r3, #0x22] - movs r3, #0x2e - ldrsh r0, [r4, r3] - subs r2, r2, r0 - movs r5, #0x32 - ldrsh r0, [r4, r5] - subs r1, r1, r0 - adds r0, r2, #0 - bl sub_080045DA - strb r0, [r4, #0x15] - ldrb r2, [r4, #0x14] - movs r1, #0x80 - ands r1, r2 - ldr r2, _0806D904 @ =gUnk_08114134 - lsls r0, r0, #0x18 - lsrs r0, r0, #0x1c - adds r0, r0, r2 - ldrb r0, [r0] - orrs r1, r0 - strb r1, [r4, #0x14] - pop {r4, r5, pc} - .align 2, 0 -_0806D900: .4byte gPlayerEntity -_0806D904: .4byte gUnk_08114134 - .syntax divided diff --git a/asm/non_matching/ezloCap/sub_0806D908.inc b/asm/non_matching/ezloCap/sub_0806D908.inc deleted file mode 100644 index d8e1a399..00000000 --- a/asm/non_matching/ezloCap/sub_0806D908.inc +++ /dev/null @@ -1,32 +0,0 @@ - .syntax unified - - .text - - push {r4, r5, lr} - adds r4, r0, #0 - movs r1, #0x2e - ldrsh r0, [r4, r1] - movs r2, #0x32 - ldrsh r1, [r4, r2] - ldr r3, _0806D93C @ =gPlayerEntity - movs r5, #0x2e - ldrsh r2, [r3, r5] - movs r5, #0x32 - ldrsh r3, [r3, r5] - bl sub_080045D4 - strb r0, [r4, #0x15] - ldrb r2, [r4, #0x14] - movs r1, #0x80 - ands r1, r2 - ldr r2, _0806D940 @ =gUnk_08114144 - lsls r0, r0, #0x18 - lsrs r0, r0, #0x19 - adds r0, r0, r2 - ldrb r0, [r0] - orrs r1, r0 - strb r1, [r4, #0x14] - pop {r4, r5, pc} - .align 2, 0 -_0806D93C: .4byte gPlayerEntity -_0806D940: .4byte gUnk_08114144 - .syntax divided diff --git a/asm/non_matching/ezloCap/sub_0806DA04.inc b/asm/non_matching/ezloCap/sub_0806DA04.inc deleted file mode 100644 index 75da6b38..00000000 --- a/asm/non_matching/ezloCap/sub_0806DA04.inc +++ /dev/null @@ -1,16 +0,0 @@ - .syntax unified - .text - - push {lr} - ldr r3, [r1, #4] - lsls r3, r3, #3 - ldr r1, _0806DA18 @ =gUnk_0811415C - adds r3, r3, r1 - ldrb r2, [r3, #4] - movs r1, #1 - bl sub_08078850 - pop {pc} - .align 2, 0 -_0806DA18: .4byte gUnk_0811415C - .syntax divided - \ No newline at end of file diff --git a/data/data_0811415C.s b/data/data_08114208.s similarity index 99% rename from data/data_0811415C.s rename to data/data_08114208.s index 862f9459..18307d1d 100644 --- a/data/data_0811415C.s +++ b/data/data_08114208.s @@ -4,7 +4,6 @@ .section .rodata .align 2 -@ TODO rename this file gUnk_08114208:: @ 08114208 .incbin "baserom.gba", 0x114208, 0x0000005 diff --git a/linker.ld b/linker.ld index 1d83ac02..423c5cc5 100644 --- a/linker.ld +++ b/linker.ld @@ -1015,7 +1015,7 @@ SECTIONS { src/manager/manager28.o(.rodata); data/data_08108D30.o(.rodata); src/npc/ezloCap.o(.rodata); - data/data_0811415C.o(.rodata); + data/data_08114208.o(.rodata); src/item.o(.rodata); data/data_0811BD44.o(.rodata); data/room_headers.o(.rodata); diff --git a/src/npc/ezloCap.c b/src/npc/ezloCap.c index 50b1c2e6..13ecd8f9 100644 --- a/src/npc/ezloCap.c +++ b/src/npc/ezloCap.c @@ -18,10 +18,17 @@ const Hitbox gUnk_08114154; const u8 gUnk_0811415C[]; const ScreenTransitionData* const gUnk_081141A4[]; const u8 gUnk_081141E4[]; -const u8 gUnk_081141F4[]; +const u16 gUnk_081141F4[]; -void EzloCap( - Entity* this) { // 0x0806D86C // Ezlo as a cap in the Minish Woods, is destroyed as soon as link wears ezlo +typedef struct { + u32 unk_00; + s8 unk_04; +} gUnk_0810C89C_struct; + +extern void sub_08078850(Entity*, u32, u8 /* TODO this is a s8 in beedle.c*/, gUnk_0810C89C_struct*); + +// Ezlo as a cap in the Minish Woods, is destroyed as soon as link wears ezlo +void EzloCap(Entity* this) { if (this->action == 0) { this->action += 1; sub_0805E3A0(this, 2); @@ -32,21 +39,55 @@ void EzloCap( UpdateAnimationSingleFrame(this); } -NONMATCH("asm/non_matching/ezloCap/sub_0806D8A0.inc", void sub_0806D8A0(Entity* this, u32 param_2)) { -} -END_NONMATCH +typedef struct { + u8 unk_00[4]; + u32 field_04; + u32 field_08; + u8 unk_0c[8]; + u32 field_14; + u8 unk_18; + u8 field_19; + u8 unk_1a[3]; + u16 field_1e; + u8 unk_20[2]; + u16 field_22; +} paramStruct; -NONMATCH("asm/non_matching/ezloCap/sub_0806D908.inc", void sub_0806D908(Entity* this)) { -} -END_NONMATCH +void sub_0806D8A0(Entity* this, paramStruct* param_2) { + s32 xOffset; + s32 yOffset; -void sub_0806D944(Entity* this) { // called when talk to ezlo, also when ezlo moves after you + param_2->field_19 = 8; + param_2->field_08 |= 2; + param_2->field_14 = 0; + xOffset = 16; + if (this->spriteSettings.b.flipX) { + xOffset = -xOffset; + } + xOffset += gPlayerEntity.x.HALF.HI; + yOffset = gPlayerEntity.y.HALF.HI + 2; + param_2->field_1e = xOffset; + param_2->field_22 = yOffset; + + xOffset -= this->x.HALF.HI; + this->direction = sub_080045DA(xOffset, yOffset - this->y.HALF.HI); + this->animationState = (this->animationState & 0x80) | gUnk_08114134[this->direction >> 4]; +} + +void sub_0806D908(Entity* this) { + this->direction = sub_080045D4(this->x.HALF.HI, this->y.HALF.HI, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI); + this->animationState = (this->animationState & 0x80) | gUnk_08114144[this->direction >> 0x1]; +} + +// called when talk to ezlo, also when ezlo moves after you +void sub_0806D944(Entity* this) { this->spriteSettings.b.flipX = 0; if (this->x.WORD <= gPlayerEntity.x.WORD) { this->spriteSettings.b.flipX = 1; } } +// Ezlo Angry FX void sub_0806D96C(Entity* this) { Entity* fx = CreateFx(this, 0x42, 0); if (fx != NULL) { @@ -64,9 +105,10 @@ void sub_0806D9A4(Entity* this) { gPlayerEntity.animationState = 4; } -void NPC4E(Entity* this) { // 0x0806D9D0 // is created when link enters minish woods for the first time and - // destroyed once he wears ezlo. Also exists when entering hyrule for the second time - // and fusing kinstones. Is destroyed as soon as the kinstone is fused. +// NPC4E is created when link enters minish woods for the first time and +// destroyed once he wears ezlo. Also exists when entering hyrule for the second time +// and fusing kinstones. Is destroyed as soon as the kinstone is fused. +void NPC4E(Entity* this) { if (this->action == 0) { this->action = 1; this->spriteSettings.b.draw = 4; @@ -77,9 +119,12 @@ void NPC4E(Entity* this) { // 0x0806D9D0 // is created when link enters minis } } -NONMATCH("asm/non_matching/ezloCap/sub_0806DA04.inc", void sub_0806DA04(Entity* this, u32 param_2)) { +void sub_0806DA04(Entity* this, u32* param_2) { + // TODO gUnk_0811415C should be a gUnk_0810C89C_struct[], but then a lot of bytes everywhere are wrong? + gUnk_0810C89C_struct* a = (gUnk_0810C89C_struct*)&( + (gUnk_0810C89C_struct*)gUnk_0811415C)[param_2[1]]; // cast necessary to no longer make it a const* ? + sub_08078850(this, 1, a->unk_04, a); } -END_NONMATCH void sub_0806DA1C(Entity* this, u32* param_2) { sub_0808091C((ScreenTransitionData*)(gUnk_081141A4)[param_2[1]], (u32)(gUnk_081141E4[param_2[1]])); @@ -170,7 +215,7 @@ void sub_0806DB44(Entity* this, u32* param_2) { // The unused param just had to be added, so that a mov r1, #0 in NPC4E_Fusion is matching correctly void sub_0806DB84(Entity* this, u8 unused) { Entity* ent; - this->hitbox = &gUnk_08114154; + this->hitbox = (Hitbox*)&gUnk_08114154; ent = CreateObject(0x3e, 4, 0); if (ent != NULL) { PositionRelative(this, ent, -0x80000, 0); @@ -219,9 +264,9 @@ void sub_0806DC58(Entity* this) { } void sub_0806DC7C() { - u16* tiles = (u16*)&gUnk_081141F4; + const u16* tiles = gUnk_081141F4; while (*tiles != 0) { - u32 tile = (u32)*tiles; + u32 tile = *tiles; tiles = tiles + 1; SetTileType(0x4072, tile, 1); } @@ -229,13 +274,11 @@ void sub_0806DC7C() { void sub_0806DCA0() { u16 uVar1; - u16* tiles; - - tiles = (u16*)&gUnk_081141F4; + const u16* tiles = gUnk_081141F4; while (*tiles != 0) { - u16 tile = *tiles; + u32 tile = *tiles; tiles = tiles + 1; - sub_0807BA8C((u32)tile, 1); + sub_0807BA8C(tile, 1); } } @@ -270,7 +313,7 @@ void NPC4E_Fusion(Entity* this) { } } -// rodata +// animation states const u8 gUnk_08114134[] = { 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07, 0x00 }; @@ -278,14 +321,13 @@ const u8 gUnk_08114134[] = { 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, const u8 gUnk_08114144[] = { 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07, 0x00 }; -const BoundingBox gUnk_08114154 = { 0, -8, 0, 0, 0, 0, 24, 8 }; +const Hitbox gUnk_08114154 = { 0, -8, 0, 0, 0, 0, 24, 8 }; -const u8 gUnk_0811415C[] = { // 0x48 - 0x00, 0x00, 0x08, 0x08, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x10, 0x04, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0a, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x04, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x04, 0x0e, 0x00, - 0x00, 0x00, 0x00, 0xf8, 0x18, 0x08, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x08, 0x0e, 0x00, 0x00, 0x00 -}; +const u8 gUnk_0811415C[] = { 0x00, 0x00, 0x08, 0x08, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x0e, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x04, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0a, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x04, 0x0e, + 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x04, 0x0e, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0x08, + 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x08, 0x0e, 0x00, 0x00, 0x00 }; extern ScreenTransitionData gUnk_0813AB6C; extern ScreenTransitionData gUnk_0813ABBC; extern ScreenTransitionData gUnk_0813ABE4; @@ -307,12 +349,10 @@ const ScreenTransitionData* const gUnk_081141A4[] = { &gUnk_0813AB6C, &gUnk_0813 &gUnk_0813AC0C, &gUnk_0813AC20, &gUnk_0813AC5C, &gUnk_0813AC70, &gUnk_0813AC84, &gUnk_0813AC98, &gUnk_0813ACAC, &gUnk_0813ACC0, &gUnk_0813ACD4, &gUnk_0813ACE8, &gUnk_0813AC5C, &gUnk_0813ACFC }; + // param_2 for the call to sub_0808091C, same indices as gUnk_081141A4 const u8 gUnk_081141E4[] = { 0x02, 0x02, 0x04, 0x04, 0x02, 0x02, 0x09, 0x02, 0x02, 0x04, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02 }; // tiles that are changed? -const u8 gUnk_081141F4[] = { // 0x14 - 0x7a, 0x04, 0x7b, 0x04, 0xaf, 0x05, 0xef, 0x05, 0x38, 0x07, - 0x39, 0x07, 0x3a, 0x07, 0x3b, 0x07, 0x00, 0x00, 0x00, 0x00 -}; \ No newline at end of file +const u16 gUnk_081141F4[] = { 0x047a, 0x047b, 0x05af, 0x05ef, 0x0738, 0x0739, 0x073a, 0x073b, 0x0000, 0x0000 };