diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-03-14 17:03:58 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-03-24 23:27:31 +0100 |
| commit | 665d6716cb147a2db46447e163129189f01dbe72 (patch) | |
| tree | 69aa97f03be6a1d4f54a124ae81209af2341b703 /data | |
| parent | 8f4212c4ac36fc727c83c44477b56144a2426db7 (diff) | |
Split data_080D1C70.s and extract pointers
Diffstat (limited to 'data')
97 files changed, 951 insertions, 747 deletions
diff --git a/data/acroBandits.inc b/data/acroBandits.inc index c22fae89..e594a8f6 100644 --- a/data/acroBandits.inc +++ b/data/acroBandits.inc @@ -46,4 +46,4 @@ gUnk_080CE5F0:: @ 080CE5F0 .incbin "baserom.gba", 0x0CE5F0, 0x000000A gUnk_080CE5FA:: @ 080CE5FA - .incbin "baserom.gba", 0x0CE5FA, 0x0000014
\ No newline at end of file + .incbin "baserom.gba", 0x0CE5FA, 0x0000014 diff --git a/data/animations/acroBandits.inc b/data/animations/acroBandits.inc index 45b45954..c5602730 100644 --- a/data/animations/acroBandits.inc +++ b/data/animations/acroBandits.inc @@ -59,4 +59,4 @@ gUnk_080CE770:: @ 080CE770 .4byte gUnk_080CE6DB .4byte gUnk_080CE6E7 .4byte gUnk_080CE727 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/armos.inc b/data/animations/armos.inc index bfe62b6b..104d2029 100644 --- a/data/animations/armos.inc +++ b/data/animations/armos.inc @@ -34,4 +34,4 @@ gUnk_080CE264:: @ 080CE264 .4byte gUnk_080CE205 .4byte gUnk_080CE246 .4byte gUnk_080CE25E - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/ballChainSoldier.inc b/data/animations/ballChainSoldier.inc index 53e7104b..632382c8 100644 --- a/data/animations/ballChainSoldier.inc +++ b/data/animations/ballChainSoldier.inc @@ -134,4 +134,4 @@ gUnk_080D07EC:: @ 080D07EC .4byte gUnk_080D07C5 .4byte gUnk_080D07D2 .4byte gUnk_080D07DF - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/bombarossa.inc b/data/animations/bombarossa.inc index 276d3170..7d9d7ff4 100644 --- a/data/animations/bombarossa.inc +++ b/data/animations/bombarossa.inc @@ -3,4 +3,4 @@ gUnk_080CEB60:: @ 080CEB60 gUnk_080CEB6C:: @ 080CEB6C .4byte gUnk_080CEB60 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/cloudPiranha.inc b/data/animations/cloudPiranha.inc index d28e9d8a..e7a6f826 100644 --- a/data/animations/cloudPiranha.inc +++ b/data/animations/cloudPiranha.inc @@ -47,4 +47,4 @@ gUnk_080CF5CC:: @ 080CF5CC .4byte gUnk_080CF5A5 .4byte gUnk_080CF5B2 .4byte gUnk_080CF5BF - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/crow.inc b/data/animations/crow.inc index b3409359..962d88e9 100644 --- a/data/animations/crow.inc +++ b/data/animations/crow.inc @@ -24,4 +24,4 @@ gUnk_080CEA00:: @ 080CEA00 .4byte gUnk_080CE9CB .4byte gUnk_080CE9DC .4byte gUnk_080CE9ED - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/cuccoAggr.inc b/data/animations/cuccoAggr.inc index 39fd5b0d..ca7fb85b 100644 --- a/data/animations/cuccoAggr.inc +++ b/data/animations/cuccoAggr.inc @@ -18,4 +18,4 @@ gUnk_080CF890:: @ 080CF890 .4byte gUnk_080CF836 .4byte gUnk_080CF847 .4byte gUnk_080CF85F - .4byte gUnk_080CF87F
\ No newline at end of file + .4byte gUnk_080CF87F diff --git a/data/animations/curtain.inc b/data/animations/curtain.inc new file mode 100644 index 00000000..d73954d4 --- /dev/null +++ b/data/animations/curtain.inc @@ -0,0 +1,31 @@ + +gUnk_080D1CF0:: @ 080D1CF0 + .incbin "baserom.gba", 0x0D1CF0, 0x0000009 + +gUnk_080D1CF9:: @ 080D1CF9 + .incbin "baserom.gba", 0x0D1CF9, 0x0000009 + +gUnk_080D1D02:: @ 080D1D02 + .incbin "baserom.gba", 0x0D1D02, 0x0000020 + +gUnk_080D1D22:: @ 080D1D22 + .incbin "baserom.gba", 0x0D1D22, 0x0000001 + +gUnk_080D1D23:: @ 080D1D23 + .incbin "baserom.gba", 0x0D1D23, 0x0000003 + +gUnk_080D1D26:: @ 080D1D26 + .incbin "baserom.gba", 0x0D1D26, 0x0000001 + +gUnk_080D1D27:: @ 080D1D27 + .incbin "baserom.gba", 0x0D1D27, 0x0000005 + +gUnk_080D1D2C:: @ 080D1D2C + .incbin "baserom.gba", 0x0D1D2C, 0x0000008 + +gUnk_080D1D34:: @ 080D1D34 + .4byte gUnk_080D1CF0 + .4byte gUnk_080D1CF9 + .4byte gUnk_080D1D02 + .4byte gUnk_080D1D26 + .4byte 00000000 diff --git a/data/animations/doorMimic.s b/data/animations/doorMimic.s index ad5a862b..5189ba85 100644 --- a/data/animations/doorMimic.s +++ b/data/animations/doorMimic.s @@ -34,4 +34,4 @@ gUnk_080CB914:: @ 080CB914 .4byte gUnk_080CB901 .4byte gUnk_080CB901 .4byte gUnk_080CB8F0 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/enemy5A.inc b/data/animations/enemy5A.inc index 29566e75..5279eed4 100644 --- a/data/animations/enemy5A.inc +++ b/data/animations/enemy5A.inc @@ -63,4 +63,4 @@ gUnk_080D19B8:: @ 080D19B8 .4byte gUnk_080D1988 .4byte gUnk_080D19AD .4byte gUnk_080D1945 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/enemy5F.inc b/data/animations/enemy5F.inc new file mode 100644 index 00000000..048b59c6 --- /dev/null +++ b/data/animations/enemy5F.inc @@ -0,0 +1,44 @@ +gUnk_080D1DA0:: @ 080D1DA0 + .incbin "baserom.gba", 0x0D1DA0, 0x0000028 + +gUnk_080D1DC8:: @ 080D1DC8 + .incbin "baserom.gba", 0x0D1DC8, 0x0000004 + +gUnk_080D1DCC:: @ 080D1DCC + .incbin "baserom.gba", 0x0D1DCC, 0x0000004 + +gUnk_080D1DD0:: @ 080D1DD0 + .incbin "baserom.gba", 0x0D1DD0, 0x000000C + +gUnk_080D1DDC:: @ 080D1DDC + .incbin "baserom.gba", 0x0D1DDC, 0x000000C + +gUnk_080D1DE8:: @ 080D1DE8 + .incbin "baserom.gba", 0x0D1DE8, 0x000001D + +gUnk_080D1E05:: @ 080D1E05 + .incbin "baserom.gba", 0x0D1E05, 0x0000016 + +gUnk_080D1E1B:: @ 080D1E1B + .incbin "baserom.gba", 0x0D1E1B, 0x0000006 + +gUnk_080D1E21:: @ 080D1E21 + .incbin "baserom.gba", 0x0D1E21, 0x0000005 + +gUnk_080D1E26:: @ 080D1E26 + .incbin "baserom.gba", 0x0D1E26, 0x000000C + +gUnk_080D1E32:: @ 080D1E32 + .incbin "baserom.gba", 0x0D1E32, 0x0000012 + +gUnk_080D1E44:: @ 080D1E44 + .4byte gUnk_080D1DA0 + .4byte gUnk_080D1DC8 + .4byte gUnk_080D1DCC + .4byte gUnk_080D1DDC + .4byte gUnk_080D1DD0 + .4byte gUnk_080D1DE8 + .4byte gUnk_080D1E05 + .4byte gUnk_080D1E21 + .4byte gUnk_080D1E32 + .4byte 00000000 diff --git a/data/animations/enemy62.inc b/data/animations/enemy62.inc new file mode 100644 index 00000000..5f699d69 --- /dev/null +++ b/data/animations/enemy62.inc @@ -0,0 +1,258 @@ +gUnk_080D2368:: @ 080D2368 + .incbin "baserom.gba", 0x0D2368, 0x0000011 + +gUnk_080D2379:: @ 080D2379 + .incbin "baserom.gba", 0x0D2379, 0x0000011 + +gUnk_080D238A:: @ 080D238A + .incbin "baserom.gba", 0x0D238A, 0x0000011 + +gUnk_080D239B:: @ 080D239B + .incbin "baserom.gba", 0x0D239B, 0x0000011 + +gUnk_080D23AC:: @ 080D23AC + .incbin "baserom.gba", 0x0D23AC, 0x0000011 + +gUnk_080D23BD:: @ 080D23BD + .incbin "baserom.gba", 0x0D23BD, 0x0000011 + +gUnk_080D23CE:: @ 080D23CE + .incbin "baserom.gba", 0x0D23CE, 0x0000011 + +gUnk_080D23DF:: @ 080D23DF + .incbin "baserom.gba", 0x0D23DF, 0x0000011 + +gUnk_080D23F0:: @ 080D23F0 + .incbin "baserom.gba", 0x0D23F0, 0x0000011 + +gUnk_080D2401:: @ 080D2401 + .incbin "baserom.gba", 0x0D2401, 0x0000011 + +gUnk_080D2412:: @ 080D2412 + .incbin "baserom.gba", 0x0D2412, 0x0000011 + +gUnk_080D2423:: @ 080D2423 + .incbin "baserom.gba", 0x0D2423, 0x0000011 + +gUnk_080D2434:: @ 080D2434 + .incbin "baserom.gba", 0x0D2434, 0x0000011 + +gUnk_080D2445:: @ 080D2445 + .incbin "baserom.gba", 0x0D2445, 0x0000011 + +gUnk_080D2456:: @ 080D2456 + .incbin "baserom.gba", 0x0D2456, 0x0000011 + +gUnk_080D2467:: @ 080D2467 + .incbin "baserom.gba", 0x0D2467, 0x0000011 + +gUnk_080D2478:: @ 080D2478 + .incbin "baserom.gba", 0x0D2478, 0x0000011 + +gUnk_080D2489:: @ 080D2489 + .incbin "baserom.gba", 0x0D2489, 0x0000011 + +gUnk_080D249A:: @ 080D249A + .incbin "baserom.gba", 0x0D249A, 0x0000011 + +gUnk_080D24AB:: @ 080D24AB + .incbin "baserom.gba", 0x0D24AB, 0x0000011 + +gUnk_080D24BC:: @ 080D24BC + .incbin "baserom.gba", 0x0D24BC, 0x0000011 + +gUnk_080D24CD:: @ 080D24CD + .incbin "baserom.gba", 0x0D24CD, 0x0000011 + +gUnk_080D24DE:: @ 080D24DE + .incbin "baserom.gba", 0x0D24DE, 0x0000011 + +gUnk_080D24EF:: @ 080D24EF + .incbin "baserom.gba", 0x0D24EF, 0x0000011 + +gUnk_080D2500:: @ 080D2500 + .incbin "baserom.gba", 0x0D2500, 0x0000011 + +gUnk_080D2511:: @ 080D2511 + .incbin "baserom.gba", 0x0D2511, 0x0000011 + +gUnk_080D2522:: @ 080D2522 + .incbin "baserom.gba", 0x0D2522, 0x0000011 + +gUnk_080D2533:: @ 080D2533 + .incbin "baserom.gba", 0x0D2533, 0x0000011 + +gUnk_080D2544:: @ 080D2544 + .incbin "baserom.gba", 0x0D2544, 0x0000011 + +gUnk_080D2555:: @ 080D2555 + .incbin "baserom.gba", 0x0D2555, 0x0000011 + +gUnk_080D2566:: @ 080D2566 + .incbin "baserom.gba", 0x0D2566, 0x0000011 + +gUnk_080D2577:: @ 080D2577 + .incbin "baserom.gba", 0x0D2577, 0x0000011 + +gUnk_080D2588:: @ 080D2588 + .incbin "baserom.gba", 0x0D2588, 0x0000011 + +gUnk_080D2599:: @ 080D2599 + .incbin "baserom.gba", 0x0D2599, 0x0000011 + +gUnk_080D25AA:: @ 080D25AA + .incbin "baserom.gba", 0x0D25AA, 0x0000011 + +gUnk_080D25BB:: @ 080D25BB + .incbin "baserom.gba", 0x0D25BB, 0x0000011 + +gUnk_080D25CC:: @ 080D25CC + .incbin "baserom.gba", 0x0D25CC, 0x0000011 + +gUnk_080D25DD:: @ 080D25DD + .incbin "baserom.gba", 0x0D25DD, 0x0000011 + +gUnk_080D25EE:: @ 080D25EE + .incbin "baserom.gba", 0x0D25EE, 0x0000011 + +gUnk_080D25FF:: @ 080D25FF + .incbin "baserom.gba", 0x0D25FF, 0x0000011 + +gUnk_080D2610:: @ 080D2610 + .incbin "baserom.gba", 0x0D2610, 0x0000011 + +gUnk_080D2621:: @ 080D2621 + .incbin "baserom.gba", 0x0D2621, 0x0000011 + +gUnk_080D2632:: @ 080D2632 + .incbin "baserom.gba", 0x0D2632, 0x0000011 + +gUnk_080D2643:: @ 080D2643 + .incbin "baserom.gba", 0x0D2643, 0x0000011 + +gUnk_080D2654:: @ 080D2654 + .incbin "baserom.gba", 0x0D2654, 0x0000011 + +gUnk_080D2665:: @ 080D2665 + .incbin "baserom.gba", 0x0D2665, 0x0000011 + +gUnk_080D2676:: @ 080D2676 + .incbin "baserom.gba", 0x0D2676, 0x0000011 + +gUnk_080D2687:: @ 080D2687 + .incbin "baserom.gba", 0x0D2687, 0x0000011 + +gUnk_080D2698:: @ 080D2698 + .incbin "baserom.gba", 0x0D2698, 0x0000011 + +gUnk_080D26A9:: @ 080D26A9 + .incbin "baserom.gba", 0x0D26A9, 0x0000011 + +gUnk_080D26BA:: @ 080D26BA + .incbin "baserom.gba", 0x0D26BA, 0x0000011 + +gUnk_080D26CB:: @ 080D26CB + .incbin "baserom.gba", 0x0D26CB, 0x0000011 + +gUnk_080D26DC:: @ 080D26DC + .incbin "baserom.gba", 0x0D26DC, 0x0000011 + +gUnk_080D26ED:: @ 080D26ED + .incbin "baserom.gba", 0x0D26ED, 0x0000011 + +gUnk_080D26FE:: @ 080D26FE + .incbin "baserom.gba", 0x0D26FE, 0x0000011 + +gUnk_080D270F:: @ 080D270F + .incbin "baserom.gba", 0x0D270F, 0x0000011 + +gUnk_080D2720:: @ 080D2720 + .incbin "baserom.gba", 0x0D2720, 0x0000011 + +gUnk_080D2731:: @ 080D2731 + .incbin "baserom.gba", 0x0D2731, 0x0000011 + +gUnk_080D2742:: @ 080D2742 + .incbin "baserom.gba", 0x0D2742, 0x0000011 + +gUnk_080D2753:: @ 080D2753 + .incbin "baserom.gba", 0x0D2753, 0x0000011 + +gUnk_080D2764:: @ 080D2764 + .incbin "baserom.gba", 0x0D2764, 0x0000011 + +gUnk_080D2775:: @ 080D2775 + .incbin "baserom.gba", 0x0D2775, 0x0000011 + +gUnk_080D2786:: @ 080D2786 + .incbin "baserom.gba", 0x0D2786, 0x0000011 + +gUnk_080D2797:: @ 080D2797 + .incbin "baserom.gba", 0x0D2797, 0x0000011 + +gUnk_080D27A8:: @ 080D27A8 + .4byte gUnk_080D2368 + .4byte gUnk_080D2379 + .4byte gUnk_080D238A + .4byte gUnk_080D239B + .4byte gUnk_080D23AC + .4byte gUnk_080D23BD + .4byte gUnk_080D23CE + .4byte gUnk_080D23DF + .4byte gUnk_080D23F0 + .4byte gUnk_080D2401 + .4byte gUnk_080D2412 + .4byte gUnk_080D2423 + .4byte gUnk_080D2434 + .4byte gUnk_080D2445 + .4byte gUnk_080D2456 + .4byte gUnk_080D2467 + .4byte gUnk_080D2478 + .4byte gUnk_080D2489 + .4byte gUnk_080D249A + .4byte gUnk_080D24AB + .4byte gUnk_080D24BC + .4byte gUnk_080D24CD + .4byte gUnk_080D24DE + .4byte gUnk_080D24EF + .4byte gUnk_080D2500 + .4byte gUnk_080D2511 + .4byte gUnk_080D2522 + .4byte gUnk_080D2533 + .4byte gUnk_080D2544 + .4byte gUnk_080D2555 + .4byte gUnk_080D2566 + .4byte gUnk_080D2577 + .4byte gUnk_080D2588 + .4byte gUnk_080D2599 + .4byte gUnk_080D25AA + .4byte gUnk_080D25BB + .4byte gUnk_080D25CC + .4byte gUnk_080D25DD + .4byte gUnk_080D25EE + .4byte gUnk_080D25FF + .4byte gUnk_080D2610 + .4byte gUnk_080D2621 + .4byte gUnk_080D2632 + .4byte gUnk_080D2643 + .4byte gUnk_080D2654 + .4byte gUnk_080D2665 + .4byte gUnk_080D2676 + .4byte gUnk_080D2687 + .4byte gUnk_080D2698 + .4byte gUnk_080D26A9 + .4byte gUnk_080D26BA + .4byte gUnk_080D26CB + .4byte gUnk_080D26DC + .4byte gUnk_080D26ED + .4byte gUnk_080D26FE + .4byte gUnk_080D270F + .4byte gUnk_080D2720 + .4byte gUnk_080D2731 + .4byte gUnk_080D2742 + .4byte gUnk_080D2753 + .4byte gUnk_080D2764 + .4byte gUnk_080D2775 + .4byte gUnk_080D2786 + .4byte gUnk_080D2797 + .4byte 00000000 diff --git a/data/animations/eyegore.inc b/data/animations/eyegore.inc index 83c30eb6..9739a1dd 100644 --- a/data/animations/eyegore.inc +++ b/data/animations/eyegore.inc @@ -60,4 +60,4 @@ gUnk_080CE404:: @ 080CE404 .4byte gUnk_080CE3F8 .4byte gUnk_080CE3E0 .4byte gUnk_080CE3EC - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/fireballGuy.inc b/data/animations/fireballGuy.inc index fdf049d2..a9469093 100644 --- a/data/animations/fireballGuy.inc +++ b/data/animations/fireballGuy.inc @@ -13,4 +13,4 @@ gUnk_080D1839:: @ 080D1839 gUnk_080D185C:: @ 080D185C .4byte gUnk_080D1818 .4byte gUnk_080D1839 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/flyingSkull.inc b/data/animations/flyingSkull.inc index cda2d40d..86477611 100644 --- a/data/animations/flyingSkull.inc +++ b/data/animations/flyingSkull.inc @@ -3,4 +3,4 @@ gUnk_080CFBE8:: @ 080CFBE8 gUnk_080CFC0C:: @ 080CFC0C .4byte gUnk_080CFBE8 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/gibdo.inc b/data/animations/gibdo.inc index 71a93379..dbb2e2eb 100644 --- a/data/animations/gibdo.inc +++ b/data/animations/gibdo.inc @@ -79,4 +79,4 @@ gUnk_080CF418:: @ 080CF418 .4byte gUnk_080CF3DC .4byte gUnk_080CF3F0 .4byte gUnk_080CF404 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/gleerok.inc b/data/animations/gleerok.inc index 743f2371..f9d92bfd 100644 --- a/data/animations/gleerok.inc +++ b/data/animations/gleerok.inc @@ -542,4 +542,4 @@ gUnk_080CDD64:: @ 080CDD64 .4byte gUnk_080CDBAB .4byte gUnk_080CDBC4 .4byte gUnk_080CDBDD - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/greatFairy.s b/data/animations/greatFairy.s index ec8e1e06..7cae6daf 100644 --- a/data/animations/greatFairy.s +++ b/data/animations/greatFairy.s @@ -66,4 +66,4 @@ gUnk_08120878:: @ 08120878 .4byte gUnk_08120819 .4byte gUnk_08120826 .4byte gUnk_08120855 - .4byte gUnk_081207D7
\ No newline at end of file + .4byte gUnk_081207D7 diff --git a/data/animations/gyorgChild.inc b/data/animations/gyorgChild.inc new file mode 100644 index 00000000..165cb314 --- /dev/null +++ b/data/animations/gyorgChild.inc @@ -0,0 +1,66 @@ +gUnk_080D1EB6:: @ 080D1EB6 + .incbin "baserom.gba", 0x0D1EB6, 0x0000009 + +gUnk_080D1EBF:: @ 080D1EBF + .incbin "baserom.gba", 0x0D1EBF, 0x0000009 + +gUnk_080D1EC8:: @ 080D1EC8 + .incbin "baserom.gba", 0x0D1EC8, 0x0000009 + +gUnk_080D1ED1:: @ 080D1ED1 + .incbin "baserom.gba", 0x0D1ED1, 0x0000009 + +gUnk_080D1EDA:: @ 080D1EDA + .incbin "baserom.gba", 0x0D1EDA, 0x0000009 + +gUnk_080D1EE3:: @ 080D1EE3 + .incbin "baserom.gba", 0x0D1EE3, 0x0000009 + +gUnk_080D1EEC:: @ 080D1EEC + .incbin "baserom.gba", 0x0D1EEC, 0x0000009 + +gUnk_080D1EF5:: @ 080D1EF5 + .incbin "baserom.gba", 0x0D1EF5, 0x0000009 + +gUnk_080D1EFE:: @ 080D1EFE + .incbin "baserom.gba", 0x0D1EFE, 0x0000004 + +gUnk_080D1F02:: @ 080D1F02 + .incbin "baserom.gba", 0x0D1F02, 0x0000004 + +gUnk_080D1F06:: @ 080D1F06 + .incbin "baserom.gba", 0x0D1F06, 0x0000004 + +gUnk_080D1F0A:: @ 080D1F0A + .incbin "baserom.gba", 0x0D1F0A, 0x0000004 + +gUnk_080D1F0E:: @ 080D1F0E + .incbin "baserom.gba", 0x0D1F0E, 0x0000004 + +gUnk_080D1F12:: @ 080D1F12 + .incbin "baserom.gba", 0x0D1F12, 0x0000004 + +gUnk_080D1F16:: @ 080D1F16 + .incbin "baserom.gba", 0x0D1F16, 0x0000004 + +gUnk_080D1F1A:: @ 080D1F1A + .incbin "baserom.gba", 0x0D1F1A, 0x0000006 + +gUnk_080D1F20:: @ 080D1F20 + .4byte gUnk_080D1EB6 + .4byte gUnk_080D1EBF + .4byte gUnk_080D1EC8 + .4byte gUnk_080D1ED1 + .4byte gUnk_080D1EDA + .4byte gUnk_080D1EE3 + .4byte gUnk_080D1EEC + .4byte gUnk_080D1EF5 + .4byte gUnk_080D1EFE + .4byte gUnk_080D1F02 + .4byte gUnk_080D1F06 + .4byte gUnk_080D1F0A + .4byte gUnk_080D1F0E + .4byte gUnk_080D1F12 + .4byte gUnk_080D1F16 + .4byte gUnk_080D1F1A + .4byte 00000000 diff --git a/data/animations/gyorgFemaleEye.inc b/data/animations/gyorgFemaleEye.inc new file mode 100644 index 00000000..858bb29b --- /dev/null +++ b/data/animations/gyorgFemaleEye.inc @@ -0,0 +1,98 @@ +gUnk_080D2050:: @ 080D2050 + .incbin "baserom.gba", 0x0D2050, 0x0000014 + +gUnk_080D2064:: @ 080D2064 + .incbin "baserom.gba", 0x0D2064, 0x0000014 + +gUnk_080D2078:: @ 080D2078 + .incbin "baserom.gba", 0x0D2078, 0x0000014 + +gUnk_080D208C:: @ 080D208C + .incbin "baserom.gba", 0x0D208C, 0x0000014 + +gUnk_080D20A0:: @ 080D20A0 + .incbin "baserom.gba", 0x0D20A0, 0x0000014 + +gUnk_080D20B4:: @ 080D20B4 + .incbin "baserom.gba", 0x0D20B4, 0x0000014 + +gUnk_080D20C8:: @ 080D20C8 + .incbin "baserom.gba", 0x0D20C8, 0x0000014 + +gUnk_080D20DC:: @ 080D20DC + .incbin "baserom.gba", 0x0D20DC, 0x0000014 + +gUnk_080D20F0:: @ 080D20F0 + .incbin "baserom.gba", 0x0D20F0, 0x0000014 + +gUnk_080D2104:: @ 080D2104 + .incbin "baserom.gba", 0x0D2104, 0x0000014 + +gUnk_080D2118:: @ 080D2118 + .incbin "baserom.gba", 0x0D2118, 0x0000014 + +gUnk_080D212C:: @ 080D212C + .incbin "baserom.gba", 0x0D212C, 0x0000014 + +gUnk_080D2140:: @ 080D2140 + .incbin "baserom.gba", 0x0D2140, 0x0000014 + +gUnk_080D2154:: @ 080D2154 + .incbin "baserom.gba", 0x0D2154, 0x0000014 + +gUnk_080D2168:: @ 080D2168 + .incbin "baserom.gba", 0x0D2168, 0x0000014 + +gUnk_080D217C:: @ 080D217C + .incbin "baserom.gba", 0x0D217C, 0x0000014 + +gUnk_080D2190:: @ 080D2190 + .incbin "baserom.gba", 0x0D2190, 0x0000029 + +gUnk_080D21B9:: @ 080D21B9 + .incbin "baserom.gba", 0x0D21B9, 0x0000029 + +gUnk_080D21E2:: @ 080D21E2 + .incbin "baserom.gba", 0x0D21E2, 0x0000029 + +gUnk_080D220B:: @ 080D220B + .incbin "baserom.gba", 0x0D220B, 0x0000029 + +gUnk_080D2234:: @ 080D2234 + .incbin "baserom.gba", 0x0D2234, 0x0000010 + +gUnk_080D2244:: @ 080D2244 + .incbin "baserom.gba", 0x0D2244, 0x0000010 + +gUnk_080D2254:: @ 080D2254 + .incbin "baserom.gba", 0x0D2254, 0x0000010 + +gUnk_080D2264:: @ 080D2264 + .incbin "baserom.gba", 0x0D2264, 0x0000010 + +gUnk_080D2274:: @ 080D2274 + .4byte gUnk_080D2050 + .4byte gUnk_080D2064 + .4byte gUnk_080D2078 + .4byte gUnk_080D208C + .4byte gUnk_080D20A0 + .4byte gUnk_080D20B4 + .4byte gUnk_080D20C8 + .4byte gUnk_080D20DC + .4byte gUnk_080D20F0 + .4byte gUnk_080D2104 + .4byte gUnk_080D2118 + .4byte gUnk_080D212C + .4byte gUnk_080D2140 + .4byte gUnk_080D2154 + .4byte gUnk_080D2168 + .4byte gUnk_080D217C + .4byte gUnk_080D2190 + .4byte gUnk_080D21B9 + .4byte gUnk_080D21E2 + .4byte gUnk_080D220B + .4byte gUnk_080D2234 + .4byte gUnk_080D2244 + .4byte gUnk_080D2254 + .4byte gUnk_080D2264 + .4byte 00000000 diff --git a/data/animations/gyorgFemaleMouth.inc b/data/animations/gyorgFemaleMouth.inc new file mode 100644 index 00000000..79863193 --- /dev/null +++ b/data/animations/gyorgFemaleMouth.inc @@ -0,0 +1,21 @@ +gUnk_080D291C:: @ 080D291C + .incbin "baserom.gba", 0x0D291C, 0x0000011 + +gUnk_080D292D:: @ 080D292D + .incbin "baserom.gba", 0x0D292D, 0x0000011 + +gUnk_080D293E:: @ 080D293E + .incbin "baserom.gba", 0x0D293E, 0x000000C + +gUnk_080D294A:: @ 080D294A + .incbin "baserom.gba", 0x0D294A, 0x0000005 + +gUnk_080D294F:: @ 080D294F + .incbin "baserom.gba", 0x0D294F, 0x0000011 + +gUnk_080D2960:: @ 080D2960 + .4byte gUnk_080D291C + .4byte gUnk_080D292D + .4byte gUnk_080D293E + .4byte gUnk_080D294F + .4byte 00000000 diff --git a/data/animations/gyorgMale.inc b/data/animations/gyorgMale.inc new file mode 100644 index 00000000..68396f12 --- /dev/null +++ b/data/animations/gyorgMale.inc @@ -0,0 +1,10 @@ +gUnk_080D1C70:: @ 080D1C70 + .incbin "baserom.gba", 0x0D1C70, 0x0000021 + +gUnk_080D1C91:: @ 080D1C91 + .incbin "baserom.gba", 0x0D1C91, 0x000002B + +gUnk_080D1CBC:: @ 080D1CBC + .4byte gUnk_080D1C70 + .4byte gUnk_080D1C91 + .4byte 00000000 diff --git a/data/animations/keaton.inc b/data/animations/keaton.inc index ffca7550..025487d3 100644 --- a/data/animations/keaton.inc +++ b/data/animations/keaton.inc @@ -47,4 +47,4 @@ gUnk_080CE944:: @ 080CE944 .4byte gUnk_080CE8C9 .4byte gUnk_080CE8F2 .4byte gUnk_080CE91B - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/lakitu.s b/data/animations/lakitu.s index 73a2a7ef..2a43bff0 100644 --- a/data/animations/lakitu.s +++ b/data/animations/lakitu.s @@ -132,4 +132,4 @@ gUnk_080D0404:: @ 080D0404 .4byte gUnk_080D0381 .4byte gUnk_080D0392 .4byte gUnk_080D03A3 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/mazaalBracelet.inc b/data/animations/mazaalBracelet.inc index 7db18e9c..d0d48df0 100644 --- a/data/animations/mazaalBracelet.inc +++ b/data/animations/mazaalBracelet.inc @@ -104,4 +104,4 @@ gUnk_080CFEFC:: @ 080CFEFC .4byte gUnk_080CFEA3 .4byte gUnk_080CFEB0 .4byte gUnk_080CFEC1 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/mazaalHand.inc b/data/animations/mazaalHand.inc index 3bc36a0f..7f127419 100644 --- a/data/animations/mazaalHand.inc +++ b/data/animations/mazaalHand.inc @@ -40,4 +40,4 @@ gUnk_080CF014:: @ 080CF014 .4byte gUnk_080CEFE0 .4byte gUnk_080CEFE9 .4byte gUnk_080CF002 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/mazaalHead.inc b/data/animations/mazaalHead.inc index 930796f3..b48a7cfc 100644 --- a/data/animations/mazaalHead.inc +++ b/data/animations/mazaalHead.inc @@ -27,4 +27,4 @@ gUnk_080CEE70:: @ 080CEE70 .4byte gUnk_080CEE07 .4byte gUnk_080CEE3F .4byte gUnk_080CEE57 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/mazaalMacro.inc b/data/animations/mazaalMacro.inc index 8c389125..75fd7f2e 100644 --- a/data/animations/mazaalMacro.inc +++ b/data/animations/mazaalMacro.inc @@ -11,4 +11,4 @@ gUnk_080CEF24:: @ 080CEF24 .4byte gUnk_080CEF0C .4byte gUnk_080CEF08 .4byte gUnk_080CEF1D - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/octorokBoss.inc b/data/animations/octorokBoss.inc index 2a84792c..1a4b6dda 100644 --- a/data/animations/octorokBoss.inc +++ b/data/animations/octorokBoss.inc @@ -58,4 +58,4 @@ gUnk_080CF234:: @ 080CF234 .4byte gUnk_080CF186 .4byte gUnk_080CF158 .4byte gUnk_080CF16D - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/rollobite.s b/data/animations/rollobite.s index af713a14..14670607 100644 --- a/data/animations/rollobite.s +++ b/data/animations/rollobite.s @@ -104,4 +104,4 @@ gUnk_080CAA34:: @ 080CAA34 .4byte gUnk_080CA970 .4byte gUnk_080CA9B1 .4byte gUnk_080CA9F2 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/scissorsBeetle.inc b/data/animations/scissorsBeetle.inc index 29d9b573..54f6e94f 100644 --- a/data/animations/scissorsBeetle.inc +++ b/data/animations/scissorsBeetle.inc @@ -79,4 +79,4 @@ gUnk_080CF724:: @ 080CF724 .4byte gUnk_080CF700 .4byte gUnk_080CF70C .4byte gUnk_080CF718 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/slime.inc b/data/animations/slime.inc index 2d319fd6..ef0d2f5f 100644 --- a/data/animations/slime.inc +++ b/data/animations/slime.inc @@ -46,4 +46,4 @@ gUnk_080D1790:: @ 080D1790 .4byte gUnk_080D1773 .4byte gUnk_080D1778 .4byte gUnk_080D177D - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/spark.s b/data/animations/spark.s index 80817cae..0f72612a 100644 --- a/data/animations/spark.s +++ b/data/animations/spark.s @@ -8,4 +8,4 @@ gUnk_080CD258:: @ 080CD258 gUnk_080CD274:: @ 080CD274 .4byte gUnk_080CD258 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/spinyBeetle.inc b/data/animations/spinyBeetle.inc index 0f0d0abf..a98450a0 100644 --- a/data/animations/spinyBeetle.inc +++ b/data/animations/spinyBeetle.inc @@ -19,4 +19,4 @@ gUnk_080CEC70:: @ 080CEC70 .4byte gUnk_080CEC42 .4byte gUnk_080CEC4B .4byte gUnk_080CEC5C - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/stalfos.inc b/data/animations/stalfos.inc index 8c753fd0..d6ced3dc 100644 --- a/data/animations/stalfos.inc +++ b/data/animations/stalfos.inc @@ -149,4 +149,4 @@ gUnk_080CFAF0:: @ 080CFAF0 .4byte gUnk_080CFAE2 .4byte gUnk_080CFAE6 .4byte gUnk_080CFAEA - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/tektite.inc b/data/animations/tektite.inc index edd574f8..7eed2b8b 100644 --- a/data/animations/tektite.inc +++ b/data/animations/tektite.inc @@ -21,4 +21,4 @@ gUnk_080CDF38:: @ 080CDF38 .4byte gUnk_080CDF1A .4byte gUnk_080CDF27 .4byte gUnk_080CDF33 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/vaatiArm.inc b/data/animations/vaatiArm.inc index a7c43b1f..aaa9e240 100644 --- a/data/animations/vaatiArm.inc +++ b/data/animations/vaatiArm.inc @@ -95,4 +95,4 @@ gUnk_080D1530:: @ 080D1530 .4byte gUnk_080D150C .4byte gUnk_080D1525 .4byte gUnk_080D152A - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/vaatiBall.inc b/data/animations/vaatiBall.inc index df26855d..e9043c56 100644 --- a/data/animations/vaatiBall.inc +++ b/data/animations/vaatiBall.inc @@ -11,4 +11,4 @@ gUnk_080D1694:: @ 080D1694 .4byte gUnk_080D1638 .4byte gUnk_080D163D .4byte gUnk_080D166E - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/vaatiEyesMacro.inc b/data/animations/vaatiEyesMacro.inc index 358326ae..39eb7a98 100644 --- a/data/animations/vaatiEyesMacro.inc +++ b/data/animations/vaatiEyesMacro.inc @@ -9,4 +9,4 @@ gUnk_080CDEB1:: @ 080CDEB1 gUnk_080CDEC4:: @ 080CDEC4 .4byte gUnk_080CDEA0 .4byte gUnk_080CDEB1 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/vaatiProjectile.inc b/data/animations/vaatiProjectile.inc index 42cd2720..0b2b05e4 100644 --- a/data/animations/vaatiProjectile.inc +++ b/data/animations/vaatiProjectile.inc @@ -11,4 +11,4 @@ gUnk_080D06D0:: @ 080D06D0 .4byte gUnk_080D0688 .4byte gUnk_080D06A1 .4byte gUnk_080D06B2 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/vaatiRebornEnemy.inc b/data/animations/vaatiRebornEnemy.inc index fcb87726..c656223c 100644 --- a/data/animations/vaatiRebornEnemy.inc +++ b/data/animations/vaatiRebornEnemy.inc @@ -99,4 +99,4 @@ gUnk_080D0634:: @ 080D0634 .4byte gUnk_080D0609 .4byte gUnk_080D05F4 .4byte gUnk_080D061E - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/vaatiTransfigured.inc b/data/animations/vaatiTransfigured.inc index 46324da5..37459589 100644 --- a/data/animations/vaatiTransfigured.inc +++ b/data/animations/vaatiTransfigured.inc @@ -120,4 +120,4 @@ gUnk_080D0DB0:: @ 080D0DB0 .4byte gUnk_080D0D78 .4byte gUnk_080D0D91 .4byte gUnk_080D0DA1 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/vaatiWrath.inc b/data/animations/vaatiWrath.inc index 658aca0d..4c7d44e6 100644 --- a/data/animations/vaatiWrath.inc +++ b/data/animations/vaatiWrath.inc @@ -209,4 +209,4 @@ gUnk_080D11AC:: @ 080D11AC .4byte gUnk_080D117E .4byte gUnk_080D1197 .4byte 00000000 -
\ No newline at end of file + diff --git a/data/animations/wisp.inc b/data/animations/wisp.inc index 36db0c01..2751a855 100644 --- a/data/animations/wisp.inc +++ b/data/animations/wisp.inc @@ -7,4 +7,4 @@ gUnk_080CEBBD:: @ 080CEBBD gUnk_080CEBD0:: @ 080CEBD0 .4byte gUnk_080CEBAC .4byte gUnk_080CEBBD - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/wizzrobeFire.inc b/data/animations/wizzrobeFire.inc index a48b5b4a..a13c0da6 100644 --- a/data/animations/wizzrobeFire.inc +++ b/data/animations/wizzrobeFire.inc @@ -31,4 +31,4 @@ gUnk_080CE050:: @ 080CE050 .4byte gUnk_080CE029 .4byte gUnk_080CE036 .4byte gUnk_080CE043 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/wizzrobeIce.inc b/data/animations/wizzrobeIce.inc index 302f2219..4b12b327 100644 --- a/data/animations/wizzrobeIce.inc +++ b/data/animations/wizzrobeIce.inc @@ -31,4 +31,4 @@ gUnk_080CE100:: @ 080CE100 .4byte gUnk_080CE0D9 .4byte gUnk_080CE0E6 .4byte gUnk_080CE0F3 - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/animations/wizzrobeWind.inc b/data/animations/wizzrobeWind.inc index 163cbd9e..c5908cf8 100644 --- a/data/animations/wizzrobeWind.inc +++ b/data/animations/wizzrobeWind.inc @@ -32,4 +32,4 @@ gUnk_080CDFA0:: @ 080CDFA0 .4byte gUnk_080CDF91 .4byte gUnk_080CDF96 .4byte gUnk_080CDF9B - .4byte 00000000
\ No newline at end of file + .4byte 00000000 diff --git a/data/armos.inc b/data/armos.inc index f8140c9a..b4d0d777 100644 --- a/data/armos.inc +++ b/data/armos.inc @@ -18,4 +18,4 @@ gUnk_080CE13C:: @ 080CE13C .4byte sub_08030554 gUnk_080CE160:: @ 080CE160 - .incbin "baserom.gba", 0x0CE160, 0x0000004
\ No newline at end of file + .incbin "baserom.gba", 0x0CE160, 0x0000004 diff --git a/data/ballChainSoldier.inc b/data/ballChainSoldier.inc index bf59e48e..1273bb10 100644 --- a/data/ballChainSoldier.inc +++ b/data/ballChainSoldier.inc @@ -41,4 +41,4 @@ gUnk_080D073C:: @ 080D073C .incbin "baserom.gba", 0x0D073C, 0x0000004 gUnk_080D0740:: @ 080D0740 - .incbin "baserom.gba", 0x0D0740, 0x0000004
\ No newline at end of file + .incbin "baserom.gba", 0x0D0740, 0x0000004 diff --git a/data/businessScrubPrologue.inc b/data/businessScrubPrologue.inc index 32b2771d..8782dd33 100644 --- a/data/businessScrubPrologue.inc +++ b/data/businessScrubPrologue.inc @@ -1,4 +1,4 @@ -gUnk_080D19FC:: @ 080D19FC TODO asm/businessScrubPrologue.s +gUnk_080D19FC:: @ 080D19FC .4byte sub_08045B98 .4byte sub_08045BC8 .4byte sub_08001324 @@ -24,4 +24,4 @@ gUnk_080D1A3E:: @ 080D1A3E .incbin "baserom.gba", 0x0D1A3E, 0x0000010 gUnk_080D1A4E:: @ 080D1A4E - .incbin "baserom.gba", 0x0D1A4E, 0x0000016
\ No newline at end of file + .incbin "baserom.gba", 0x0D1A4E, 0x0000016 diff --git a/data/code_08049D30.inc b/data/code_08049D30.inc new file mode 100644 index 00000000..651eba8f --- /dev/null +++ b/data/code_08049D30.inc @@ -0,0 +1,128 @@ +gUnk_080D2C58:: @ 080D2C58 + .incbin "baserom.gba", 0x0D2C58, 0x00001CE + +gUnk_080D2E26:: @ 080D2E26 + .incbin "baserom.gba", 0x0D2E26, 0x0000492 + +gUnk_080D32B8:: @ 080D32B8 + .incbin "baserom.gba", 0x0D32B8, 0x0000030 + +gUnk_080D32E8:: @ 080D32E8 + .incbin "baserom.gba", 0x0D32E8, 0x0000020 + +gUnk_080D3308:: @ 080D3308 + .incbin "baserom.gba", 0x0D3308, 0x0000080 + +gUnk_080D3388:: @ 080D3388 + .incbin "baserom.gba", 0x0D3388, 0x0000040 + +gUnk_080D33C8:: @ 080D33C8 + .incbin "baserom.gba", 0x0D33C8, 0x0000090 + +gUnk_080D3458:: @ 080D3458 + .incbin "baserom.gba", 0x0D3458, 0x0000030 + +gUnk_080D3488:: @ 080D3488 + .incbin "baserom.gba", 0x0D3488, 0x0000030 + +gUnk_080D34B8:: @ 080D34B8 + .incbin "baserom.gba", 0x0D34B8, 0x0000020 + +gUnk_080D34D8:: @ 080D34D8 + .incbin "baserom.gba", 0x0D34D8, 0x0000030 + +gUnk_080D3508:: @ 080D3508 + .incbin "baserom.gba", 0x0D3508, 0x0000090 + +gUnk_080D3598:: @ 080D3598 + .incbin "baserom.gba", 0x0D3598, 0x0000040 + +gUnk_080D35D8:: @ 080D35D8 + .incbin "baserom.gba", 0x0D35D8, 0x0000070 + +gUnk_080D3648:: @ 080D3648 + .incbin "baserom.gba", 0x0D3648, 0x0000080 + +gUnk_080D36C8:: @ 080D36C8 + .incbin "baserom.gba", 0x0D36C8, 0x0000020 + +gUnk_080D36E8:: @ 080D36E8 + .incbin "baserom.gba", 0x0D36E8, 0x0000030 + +gUnk_080D3718:: @ 080D3718 + .incbin "baserom.gba", 0x0D3718, 0x0000030 + +gUnk_080D3748:: @ 080D3748 + .incbin "baserom.gba", 0x0D3748, 0x0000020 + +gUnk_080D3768:: @ 080D3768 + .incbin "baserom.gba", 0x0D3768, 0x0000020 + +gUnk_080D3788:: @ 080D3788 + .incbin "baserom.gba", 0x0D3788, 0x0000050 + +gUnk_080D37D8:: @ 080D37D8 + .incbin "baserom.gba", 0x0D37D8, 0x0000020 + +gUnk_080D37F8:: @ 080D37F8 + .incbin "baserom.gba", 0x0D37F8, 0x0000030 + +gUnk_080D3828:: @ 080D3828 + .incbin "baserom.gba", 0x0D3828, 0x0000080 + +gUnk_080D38A8:: @ 080D38A8 + .incbin "baserom.gba", 0x0D38A8, 0x0000030 + +gUnk_080D38D8:: @ 080D38D8 + .incbin "baserom.gba", 0x0D38D8, 0x0000040 + +gUnk_080D3918:: @ 080D3918 + .incbin "baserom.gba", 0x0D3918, 0x0000020 + +gUnk_080D3938:: @ 080D3938 + .incbin "baserom.gba", 0x0D3938, 0x0000017 + +gUnk_080D394F:: @ 080D394F + .incbin "baserom.gba", 0x0D394F, 0x0000029 + +gUnk_080D3978:: @ 080D3978 + .incbin "baserom.gba", 0x0D3978, 0x0000060 + +gUnk_080D39D8:: @ 080D39D8 + .incbin "baserom.gba", 0x0D39D8, 0x0000040 + +gUnk_080D3A18:: @ 080D3A18 + .incbin "baserom.gba", 0x0D3A18, 0x0000050 + +gUnk_080D3A68:: @ 080D3A68 + .incbin "baserom.gba", 0x0D3A68, 0x0000030 + +gUnk_080D3A98:: @ 080D3A98 + .incbin "baserom.gba", 0x0D3A98, 0x0000030 + +gUnk_080D3AC8:: @ 080D3AC8 + .incbin "baserom.gba", 0x0D3AC8, 0x0000020 + +gUnk_080D3AE8:: @ 080D3AE8 + .incbin "baserom.gba", 0x0D3AE8, 0x0000040 + +gUnk_080D3B28:: @ 080D3B28 + .incbin "baserom.gba", 0x0D3B28, 0x0000020 + +gUnk_080D3B48:: @ 080D3B48 + .incbin "baserom.gba", 0x0D3B48, 0x0000040 + +gUnk_080D3B88:: @ 080D3B88 + .incbin "baserom.gba", 0x0D3B88, 0x0000020 + +gUnk_080D3BA8:: @ 080D3BA8 + .incbin "baserom.gba", 0x0D3BA8, 0x0000020 + +gUnk_080D3BC8:: @ 080D3BC8 + .incbin "baserom.gba", 0x0D3BC8, 0x0000020 + +gUnk_080D3BE8:: @ 080D3BE8 + .4byte sub_08049E18 + .4byte sub_08049E4C + .4byte sub_08049E80 + .4byte sub_08049EB0 diff --git a/data/curtain.inc b/data/curtain.inc new file mode 100644 index 00000000..9650ad93 --- /dev/null +++ b/data/curtain.inc @@ -0,0 +1,13 @@ +gUnk_080D1CC8:: @ 080D1CC8 + .4byte sub_080481D0 + .4byte sub_080481E8 + .4byte sub_08001324 + .4byte sub_0804A7D4 + .4byte sub_08001242 + .4byte nullsub_26 + +gUnk_080D1CE0:: @ 080D1CE0 + .4byte sub_08048224 + .4byte sub_08048268 + .4byte sub_08048294 + .4byte nullsub_27 diff --git a/data/data_080CC6FC.s b/data/data_080CC6FC.s index 3d2346b5..ca448653 100644 --- a/data/data_080CC6FC.s +++ b/data/data_080CC6FC.s @@ -100,4 +100,4 @@ .include "data/takkuri.inc" .include "data/bowMoblin.inc" - .include "data/animations/bowMoblin.inc"
\ No newline at end of file + .include "data/animations/bowMoblin.inc" diff --git a/data/data_080D0448.s b/data/data_080D0448.s index db8afc6c..7f9f086b 100644 --- a/data/data_080D0448.s +++ b/data/data_080D0448.s @@ -52,4 +52,4 @@ .include "data/businessScrubPrologue.inc" - .include "data/gyorgFemale.inc"
\ No newline at end of file + .include "data/gyorgFemale.inc" diff --git a/data/data_080D1C70.s b/data/data_080D1C70.s index 0f32e4cf..221ebc2b 100644 --- a/data/data_080D1C70.s +++ b/data/data_080D1C70.s @@ -5,668 +5,31 @@ .align 2 -gUnk_080D1C70:: @ 080D1C70 - .incbin "baserom.gba", 0x0D1C70, 0x0000021 + @ TODO convert .inc files into .s files and include them in linker.ld + .include "data/animations/gyorgMale.inc" -gUnk_080D1C91:: @ 080D1C91 - .incbin "baserom.gba", 0x0D1C91, 0x000002B + .include "data/curtain.inc" + .include "data/animations/curtain.inc" -gUnk_080D1CBC:: @ 080D1CBC - .incbin "baserom.gba", 0x0D1CBC, 0x000000C + .include "data/enemy5F.inc" + .include "data/animations/enemy5F.inc" -gUnk_080D1CC8:: @ 080D1CC8 - .incbin "baserom.gba", 0x0D1CC8, 0x0000018 + .include "data/gyorgChild.inc" + .include "data/animations/gyorgChild.inc" -gUnk_080D1CE0:: @ 080D1CE0 - .incbin "baserom.gba", 0x0D1CE0, 0x0000010 + .include "data/gyorgFemaleEye.inc" + .include "data/animations/gyorgFemaleEye.inc" -gUnk_080D1CF0:: @ 080D1CF0 - .incbin "baserom.gba", 0x0D1CF0, 0x0000009 + .include "data/enemy62.inc" + .include "data/animations/enemy62.inc" -gUnk_080D1CF9:: @ 080D1CF9 - .incbin "baserom.gba", 0x0D1CF9, 0x0000009 + .include "data/gyorgFemaleMouth.inc" + .include "data/animations/gyorgFemaleMouth.inc" -gUnk_080D1D02:: @ 080D1D02 - .incbin "baserom.gba", 0x0D1D02, 0x0000020 + .include "data/enemy64.inc" -gUnk_080D1D22:: @ 080D1D22 - .incbin "baserom.gba", 0x0D1D22, 0x0000001 + .include "data/treeItem.inc" -gUnk_080D1D23:: @ 080D1D23 - .incbin "baserom.gba", 0x0D1D23, 0x0000003 + .include "data/enemy66.inc" -gUnk_080D1D26:: @ 080D1D26 - .incbin "baserom.gba", 0x0D1D26, 0x0000001 - -gUnk_080D1D27:: @ 080D1D27 - .incbin "baserom.gba", 0x0D1D27, 0x0000005 - -gUnk_080D1D2C:: @ 080D1D2C - .incbin "baserom.gba", 0x0D1D2C, 0x0000008 - -gUnk_080D1D34:: @ 080D1D34 - .incbin "baserom.gba", 0x0D1D34, 0x0000014 - -gUnk_080D1D48:: @ 080D1D48 - .incbin "baserom.gba", 0x0D1D48, 0x0000028 - -gUnk_080D1D70:: @ 080D1D70 - .incbin "baserom.gba", 0x0D1D70, 0x0000008 - -gUnk_080D1D78:: @ 080D1D78 - .incbin "baserom.gba", 0x0D1D78, 0x0000020 - -gUnk_080D1D98:: @ 080D1D98 - .incbin "baserom.gba", 0x0D1D98, 0x0000008 - -gUnk_080D1DA0:: @ 080D1DA0 - .incbin "baserom.gba", 0x0D1DA0, 0x0000028 - -gUnk_080D1DC8:: @ 080D1DC8 - .incbin "baserom.gba", 0x0D1DC8, 0x0000004 - -gUnk_080D1DCC:: @ 080D1DCC - .incbin "baserom.gba", 0x0D1DCC, 0x0000004 - -gUnk_080D1DD0:: @ 080D1DD0 - .incbin "baserom.gba", 0x0D1DD0, 0x000000C - -gUnk_080D1DDC:: @ 080D1DDC - .incbin "baserom.gba", 0x0D1DDC, 0x000000C - -gUnk_080D1DE8:: @ 080D1DE8 - .incbin "baserom.gba", 0x0D1DE8, 0x000001D - -gUnk_080D1E05:: @ 080D1E05 - .incbin "baserom.gba", 0x0D1E05, 0x0000016 - -gUnk_080D1E1B:: @ 080D1E1B - .incbin "baserom.gba", 0x0D1E1B, 0x0000006 - -gUnk_080D1E21:: @ 080D1E21 - .incbin "baserom.gba", 0x0D1E21, 0x0000005 - -gUnk_080D1E26:: @ 080D1E26 - .incbin "baserom.gba", 0x0D1E26, 0x000000C - -gUnk_080D1E32:: @ 080D1E32 - .incbin "baserom.gba", 0x0D1E32, 0x0000012 - -gUnk_080D1E44:: @ 080D1E44 - .incbin "baserom.gba", 0x0D1E44, 0x0000028 - -gUnk_080D1E6C:: @ 080D1E6C - .incbin "baserom.gba", 0x0D1E6C, 0x0000018 - -gUnk_080D1E84:: @ 080D1E84 - .incbin "baserom.gba", 0x0D1E84, 0x0000010 - -gUnk_080D1E94:: @ 080D1E94 - .incbin "baserom.gba", 0x0D1E94, 0x000000C - -gUnk_080D1EA0:: @ 080D1EA0 - .incbin "baserom.gba", 0x0D1EA0, 0x0000016 - -gUnk_080D1EB6:: @ 080D1EB6 - .incbin "baserom.gba", 0x0D1EB6, 0x0000009 - -gUnk_080D1EBF:: @ 080D1EBF - .incbin "baserom.gba", 0x0D1EBF, 0x0000009 - -gUnk_080D1EC8:: @ 080D1EC8 - .incbin "baserom.gba", 0x0D1EC8, 0x0000009 - -gUnk_080D1ED1:: @ 080D1ED1 - .incbin "baserom.gba", 0x0D1ED1, 0x0000009 - -gUnk_080D1EDA:: @ 080D1EDA - .incbin "baserom.gba", 0x0D1EDA, 0x0000009 - -gUnk_080D1EE3:: @ 080D1EE3 - .incbin "baserom.gba", 0x0D1EE3, 0x0000009 - -gUnk_080D1EEC:: @ 080D1EEC - .incbin "baserom.gba", 0x0D1EEC, 0x0000009 - -gUnk_080D1EF5:: @ 080D1EF5 - .incbin "baserom.gba", 0x0D1EF5, 0x0000009 - -gUnk_080D1EFE:: @ 080D1EFE - .incbin "baserom.gba", 0x0D1EFE, 0x0000004 - -gUnk_080D1F02:: @ 080D1F02 - .incbin "baserom.gba", 0x0D1F02, 0x0000004 - -gUnk_080D1F06:: @ 080D1F06 - .incbin "baserom.gba", 0x0D1F06, 0x0000004 - -gUnk_080D1F0A:: @ 080D1F0A - .incbin "baserom.gba", 0x0D1F0A, 0x0000004 - -gUnk_080D1F0E:: @ 080D1F0E - .incbin "baserom.gba", 0x0D1F0E, 0x0000004 - -gUnk_080D1F12:: @ 080D1F12 - .incbin "baserom.gba", 0x0D1F12, 0x0000004 - -gUnk_080D1F16:: @ 080D1F16 - .incbin "baserom.gba", 0x0D1F16, 0x0000004 - -gUnk_080D1F1A:: @ 080D1F1A - .incbin "baserom.gba", 0x0D1F1A, 0x0000006 - -gUnk_080D1F20:: @ 080D1F20 - .incbin "baserom.gba", 0x0D1F20, 0x0000014 - -gUnk_080D1F34:: @ 080D1F34 - .incbin "baserom.gba", 0x0D1F34, 0x0000030 - -gUnk_080D1F64:: @ 080D1F64 - .incbin "baserom.gba", 0x0D1F64, 0x0000018 - -gUnk_080D1F7C:: @ 080D1F7C - .incbin "baserom.gba", 0x0D1F7C, 0x0000014 - -gUnk_080D1F90:: @ 080D1F90 - .incbin "baserom.gba", 0x0D1F90, 0x0000080 - -gUnk_080D2010:: @ 080D2010 - .incbin "baserom.gba", 0x0D2010, 0x0000020 - -gUnk_080D2030:: @ 080D2030 - .incbin "baserom.gba", 0x0D2030, 0x0000020 - -gUnk_080D2050:: @ 080D2050 - .incbin "baserom.gba", 0x0D2050, 0x0000014 - -gUnk_080D2064:: @ 080D2064 - .incbin "baserom.gba", 0x0D2064, 0x0000014 - -gUnk_080D2078:: @ 080D2078 - .incbin "baserom.gba", 0x0D2078, 0x0000014 - -gUnk_080D208C:: @ 080D208C - .incbin "baserom.gba", 0x0D208C, 0x0000014 - -gUnk_080D20A0:: @ 080D20A0 - .incbin "baserom.gba", 0x0D20A0, 0x0000014 - -gUnk_080D20B4:: @ 080D20B4 - .incbin "baserom.gba", 0x0D20B4, 0x0000014 - -gUnk_080D20C8:: @ 080D20C8 - .incbin "baserom.gba", 0x0D20C8, 0x0000014 - -gUnk_080D20DC:: @ 080D20DC - .incbin "baserom.gba", 0x0D20DC, 0x0000014 - -gUnk_080D20F0:: @ 080D20F0 - .incbin "baserom.gba", 0x0D20F0, 0x0000014 - -gUnk_080D2104:: @ 080D2104 - .incbin "baserom.gba", 0x0D2104, 0x0000014 - -gUnk_080D2118:: @ 080D2118 - .incbin "baserom.gba", 0x0D2118, 0x0000014 - -gUnk_080D212C:: @ 080D212C - .incbin "baserom.gba", 0x0D212C, 0x0000014 - -gUnk_080D2140:: @ 080D2140 - .incbin "baserom.gba", 0x0D2140, 0x0000014 - -gUnk_080D2154:: @ 080D2154 - .incbin "baserom.gba", 0x0D2154, 0x0000014 - -gUnk_080D2168:: @ 080D2168 - .incbin "baserom.gba", 0x0D2168, 0x0000014 - -gUnk_080D217C:: @ 080D217C - .incbin "baserom.gba", 0x0D217C, 0x0000014 - -gUnk_080D2190:: @ 080D2190 - .incbin "baserom.gba", 0x0D2190, 0x0000029 - -gUnk_080D21B9:: @ 080D21B9 - .incbin "baserom.gba", 0x0D21B9, 0x0000029 - -gUnk_080D21E2:: @ 080D21E2 - .incbin "baserom.gba", 0x0D21E2, 0x0000029 - -gUnk_080D220B:: @ 080D220B - .incbin "baserom.gba", 0x0D220B, 0x0000029 - -gUnk_080D2234:: @ 080D2234 - .incbin "baserom.gba", 0x0D2234, 0x0000010 - -gUnk_080D2244:: @ 080D2244 - .incbin "baserom.gba", 0x0D2244, 0x0000010 - -gUnk_080D2254:: @ 080D2254 - .incbin "baserom.gba", 0x0D2254, 0x0000010 - -gUnk_080D2264:: @ 080D2264 - .incbin "baserom.gba", 0x0D2264, 0x0000010 - -gUnk_080D2274:: @ 080D2274 - .incbin "baserom.gba", 0x0D2274, 0x0000064 - -gUnk_080D22D8:: @ 080D22D8 - .incbin "baserom.gba", 0x0D22D8, 0x0000018 - -gUnk_080D22F0:: @ 080D22F0 - .incbin "baserom.gba", 0x0D22F0, 0x0000010 - -gUnk_080D2300:: @ 080D2300 - .incbin "baserom.gba", 0x0D2300, 0x0000048 - -gUnk_080D2348:: @ 080D2348 - .incbin "baserom.gba", 0x0D2348, 0x0000020 - -gUnk_080D2368:: @ 080D2368 - .incbin "baserom.gba", 0x0D2368, 0x0000011 - -gUnk_080D2379:: @ 080D2379 - .incbin "baserom.gba", 0x0D2379, 0x0000011 - -gUnk_080D238A:: @ 080D238A - .incbin "baserom.gba", 0x0D238A, 0x0000011 - -gUnk_080D239B:: @ 080D239B - .incbin "baserom.gba", 0x0D239B, 0x0000011 - -gUnk_080D23AC:: @ 080D23AC - .incbin "baserom.gba", 0x0D23AC, 0x0000011 - -gUnk_080D23BD:: @ 080D23BD - .incbin "baserom.gba", 0x0D23BD, 0x0000011 - -gUnk_080D23CE:: @ 080D23CE - .incbin "baserom.gba", 0x0D23CE, 0x0000011 - -gUnk_080D23DF:: @ 080D23DF - .incbin "baserom.gba", 0x0D23DF, 0x0000011 - -gUnk_080D23F0:: @ 080D23F0 - .incbin "baserom.gba", 0x0D23F0, 0x0000011 - -gUnk_080D2401:: @ 080D2401 - .incbin "baserom.gba", 0x0D2401, 0x0000011 - -gUnk_080D2412:: @ 080D2412 - .incbin "baserom.gba", 0x0D2412, 0x0000011 - -gUnk_080D2423:: @ 080D2423 - .incbin "baserom.gba", 0x0D2423, 0x0000011 - -gUnk_080D2434:: @ 080D2434 - .incbin "baserom.gba", 0x0D2434, 0x0000011 - -gUnk_080D2445:: @ 080D2445 - .incbin "baserom.gba", 0x0D2445, 0x0000011 - -gUnk_080D2456:: @ 080D2456 - .incbin "baserom.gba", 0x0D2456, 0x0000011 - -gUnk_080D2467:: @ 080D2467 - .incbin "baserom.gba", 0x0D2467, 0x0000011 - -gUnk_080D2478:: @ 080D2478 - .incbin "baserom.gba", 0x0D2478, 0x0000011 - -gUnk_080D2489:: @ 080D2489 - .incbin "baserom.gba", 0x0D2489, 0x0000011 - -gUnk_080D249A:: @ 080D249A - .incbin "baserom.gba", 0x0D249A, 0x0000011 - -gUnk_080D24AB:: @ 080D24AB - .incbin "baserom.gba", 0x0D24AB, 0x0000011 - -gUnk_080D24BC:: @ 080D24BC - .incbin "baserom.gba", 0x0D24BC, 0x0000011 - -gUnk_080D24CD:: @ 080D24CD - .incbin "baserom.gba", 0x0D24CD, 0x0000011 - -gUnk_080D24DE:: @ 080D24DE - .incbin "baserom.gba", 0x0D24DE, 0x0000011 - -gUnk_080D24EF:: @ 080D24EF - .incbin "baserom.gba", 0x0D24EF, 0x0000011 - -gUnk_080D2500:: @ 080D2500 - .incbin "baserom.gba", 0x0D2500, 0x0000011 - -gUnk_080D2511:: @ 080D2511 - .incbin "baserom.gba", 0x0D2511, 0x0000011 - -gUnk_080D2522:: @ 080D2522 - .incbin "baserom.gba", 0x0D2522, 0x0000011 - -gUnk_080D2533:: @ 080D2533 - .incbin "baserom.gba", 0x0D2533, 0x0000011 - -gUnk_080D2544:: @ 080D2544 - .incbin "baserom.gba", 0x0D2544, 0x0000011 - -gUnk_080D2555:: @ 080D2555 - .incbin "baserom.gba", 0x0D2555, 0x0000011 - -gUnk_080D2566:: @ 080D2566 - .incbin "baserom.gba", 0x0D2566, 0x0000011 - -gUnk_080D2577:: @ 080D2577 - .incbin "baserom.gba", 0x0D2577, 0x0000011 - -gUnk_080D2588:: @ 080D2588 - .incbin "baserom.gba", 0x0D2588, 0x0000011 - -gUnk_080D2599:: @ 080D2599 - .incbin "baserom.gba", 0x0D2599, 0x0000011 - -gUnk_080D25AA:: @ 080D25AA - .incbin "baserom.gba", 0x0D25AA, 0x0000011 - -gUnk_080D25BB:: @ 080D25BB - .incbin "baserom.gba", 0x0D25BB, 0x0000011 - -gUnk_080D25CC:: @ 080D25CC - .incbin "baserom.gba", 0x0D25CC, 0x0000011 - -gUnk_080D25DD:: @ 080D25DD - .incbin "baserom.gba", 0x0D25DD, 0x0000011 - -gUnk_080D25EE:: @ 080D25EE - .incbin "baserom.gba", 0x0D25EE, 0x0000011 - -gUnk_080D25FF:: @ 080D25FF - .incbin "baserom.gba", 0x0D25FF, 0x0000011 - -gUnk_080D2610:: @ 080D2610 - .incbin "baserom.gba", 0x0D2610, 0x0000011 - -gUnk_080D2621:: @ 080D2621 - .incbin "baserom.gba", 0x0D2621, 0x0000011 - -gUnk_080D2632:: @ 080D2632 - .incbin "baserom.gba", 0x0D2632, 0x0000011 - -gUnk_080D2643:: @ 080D2643 - .incbin "baserom.gba", 0x0D2643, 0x0000011 - -gUnk_080D2654:: @ 080D2654 - .incbin "baserom.gba", 0x0D2654, 0x0000011 - -gUnk_080D2665:: @ 080D2665 - .incbin "baserom.gba", 0x0D2665, 0x0000011 - -gUnk_080D2676:: @ 080D2676 - .incbin "baserom.gba", 0x0D2676, 0x0000011 - -gUnk_080D2687:: @ 080D2687 - .incbin "baserom.gba", 0x0D2687, 0x0000011 - -gUnk_080D2698:: @ 080D2698 - .incbin "baserom.gba", 0x0D2698, 0x0000011 - -gUnk_080D26A9:: @ 080D26A9 - .incbin "baserom.gba", 0x0D26A9, 0x0000011 - -gUnk_080D26BA:: @ 080D26BA - .incbin "baserom.gba", 0x0D26BA, 0x0000011 - -gUnk_080D26CB:: @ 080D26CB - .incbin "baserom.gba", 0x0D26CB, 0x0000011 - -gUnk_080D26DC:: @ 080D26DC - .incbin "baserom.gba", 0x0D26DC, 0x0000011 - -gUnk_080D26ED:: @ 080D26ED - .incbin "baserom.gba", 0x0D26ED, 0x0000011 - -gUnk_080D26FE:: @ 080D26FE - .incbin "baserom.gba", 0x0D26FE, 0x0000011 - -gUnk_080D270F:: @ 080D270F - .incbin "baserom.gba", 0x0D270F, 0x0000011 - -gUnk_080D2720:: @ 080D2720 - .incbin "baserom.gba", 0x0D2720, 0x0000011 - -gUnk_080D2731:: @ 080D2731 - .incbin "baserom.gba", 0x0D2731, 0x0000011 - -gUnk_080D2742:: @ 080D2742 - .incbin "baserom.gba", 0x0D2742, 0x0000011 - -gUnk_080D2753:: @ 080D2753 - .incbin "baserom.gba", 0x0D2753, 0x0000011 - -gUnk_080D2764:: @ 080D2764 - .incbin "baserom.gba", 0x0D2764, 0x0000011 - -gUnk_080D2775:: @ 080D2775 - .incbin "baserom.gba", 0x0D2775, 0x0000011 - -gUnk_080D2786:: @ 080D2786 - .incbin "baserom.gba", 0x0D2786, 0x0000011 - -gUnk_080D2797:: @ 080D2797 - .incbin "baserom.gba", 0x0D2797, 0x0000011 - -gUnk_080D27A8:: @ 080D27A8 - .incbin "baserom.gba", 0x0D27A8, 0x0000104 - -gUnk_080D28AC:: @ 080D28AC - .incbin "baserom.gba", 0x0D28AC, 0x0000020 - -gUnk_080D28CC:: @ 080D28CC - .incbin "baserom.gba", 0x0D28CC, 0x0000010 - -gUnk_080D28DC:: @ 080D28DC - .incbin "baserom.gba", 0x0D28DC, 0x0000008 - -gUnk_080D28E4:: @ 080D28E4 - .incbin "baserom.gba", 0x0D28E4, 0x0000008 - -gUnk_080D28EC:: @ 080D28EC - .incbin "baserom.gba", 0x0D28EC, 0x0000008 - -gUnk_080D28F4:: @ 080D28F4 - .incbin "baserom.gba", 0x0D28F4, 0x0000008 - -gUnk_080D28FC:: @ 080D28FC - .incbin "baserom.gba", 0x0D28FC, 0x0000008 - -gUnk_080D2904:: @ 080D2904 - .incbin "baserom.gba", 0x0D2904, 0x0000008 - -gUnk_080D290C:: @ 080D290C - .incbin "baserom.gba", 0x0D290C, 0x0000008 - -gUnk_080D2914:: @ 080D2914 - .incbin "baserom.gba", 0x0D2914, 0x0000008 - -gUnk_080D291C:: @ 080D291C - .incbin "baserom.gba", 0x0D291C, 0x0000011 - -gUnk_080D292D:: @ 080D292D - .incbin "baserom.gba", 0x0D292D, 0x0000011 - -gUnk_080D293E:: @ 080D293E - .incbin "baserom.gba", 0x0D293E, 0x000000C - -gUnk_080D294A:: @ 080D294A - .incbin "baserom.gba", 0x0D294A, 0x0000005 - -gUnk_080D294F:: @ 080D294F - .incbin "baserom.gba", 0x0D294F, 0x0000011 - -gUnk_080D2960:: @ 080D2960 - .incbin "baserom.gba", 0x0D2960, 0x0000014 - -gUnk_080D2974:: @ 080D2974 - .incbin "baserom.gba", 0x0D2974, 0x0000014 - -gUnk_080D2988:: @ 080D2988 - .incbin "baserom.gba", 0x0D2988, 0x0000008 - -gUnk_080D2990:: @ 080D2990 - .incbin "baserom.gba", 0x0D2990, 0x0000018 - -gUnk_080D29A8:: @ 080D29A8 - .incbin "baserom.gba", 0x0D29A8, 0x0000010 - -gUnk_080D29B8:: @ 080D29B8 - .incbin "baserom.gba", 0x0D29B8, 0x0000008 - -gUnk_080D29C0:: @ 080D29C0 - .incbin "baserom.gba", 0x0D29C0, 0x0000020 - -gUnk_080D29E0:: @ 080D29E0 - .byte 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - -gUnk_080D2AB0:: @ 080D2AB0 - .byte 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x00, 0x00, 0x00, 0x00 - -gUnk_080D2ABC:: @ 080D2ABC - .incbin "baserom.gba", 0x0D2ABC, 0x000019C - -gUnk_080D2C58:: @ 080D2C58 - .incbin "baserom.gba", 0x0D2C58, 0x00001CE - -gUnk_080D2E26:: @ 080D2E26 - .incbin "baserom.gba", 0x0D2E26, 0x0000492 - -gUnk_080D32B8:: @ 080D32B8 - .incbin "baserom.gba", 0x0D32B8, 0x0000030 - -gUnk_080D32E8:: @ 080D32E8 - .incbin "baserom.gba", 0x0D32E8, 0x0000020 - -gUnk_080D3308:: @ 080D3308 - .incbin "baserom.gba", 0x0D3308, 0x0000080 - -gUnk_080D3388:: @ 080D3388 - .incbin "baserom.gba", 0x0D3388, 0x0000040 - -gUnk_080D33C8:: @ 080D33C8 - .incbin "baserom.gba", 0x0D33C8, 0x0000090 - -gUnk_080D3458:: @ 080D3458 - .incbin "baserom.gba", 0x0D3458, 0x0000030 - -gUnk_080D3488:: @ 080D3488 - .incbin "baserom.gba", 0x0D3488, 0x0000030 - -gUnk_080D34B8:: @ 080D34B8 - .incbin "baserom.gba", 0x0D34B8, 0x0000020 - -gUnk_080D34D8:: @ 080D34D8 - .incbin "baserom.gba", 0x0D34D8, 0x0000030 - -gUnk_080D3508:: @ 080D3508 - .incbin "baserom.gba", 0x0D3508, 0x0000090 - -gUnk_080D3598:: @ 080D3598 - .incbin "baserom.gba", 0x0D3598, 0x0000040 - -gUnk_080D35D8:: @ 080D35D8 - .incbin "baserom.gba", 0x0D35D8, 0x0000070 - -gUnk_080D3648:: @ 080D3648 - .incbin "baserom.gba", 0x0D3648, 0x0000080 - -gUnk_080D36C8:: @ 080D36C8 - .incbin "baserom.gba", 0x0D36C8, 0x0000020 - -gUnk_080D36E8:: @ 080D36E8 - .incbin "baserom.gba", 0x0D36E8, 0x0000030 - -gUnk_080D3718:: @ 080D3718 - .incbin "baserom.gba", 0x0D3718, 0x0000030 - -gUnk_080D3748:: @ 080D3748 - .incbin "baserom.gba", 0x0D3748, 0x0000020 - -gUnk_080D3768:: @ 080D3768 - .incbin "baserom.gba", 0x0D3768, 0x0000020 - -gUnk_080D3788:: @ 080D3788 - .incbin "baserom.gba", 0x0D3788, 0x0000050 - -gUnk_080D37D8:: @ 080D37D8 - .incbin "baserom.gba", 0x0D37D8, 0x0000020 - -gUnk_080D37F8:: @ 080D37F8 - .incbin "baserom.gba", 0x0D37F8, 0x0000030 - -gUnk_080D3828:: @ 080D3828 - .incbin "baserom.gba", 0x0D3828, 0x0000080 - -gUnk_080D38A8:: @ 080D38A8 - .incbin "baserom.gba", 0x0D38A8, 0x0000030 - -gUnk_080D38D8:: @ 080D38D8 - .incbin "baserom.gba", 0x0D38D8, 0x0000040 - -gUnk_080D3918:: @ 080D3918 - .incbin "baserom.gba", 0x0D3918, 0x0000020 - -gUnk_080D3938:: @ 080D3938 - .incbin "baserom.gba", 0x0D3938, 0x0000017 - -gUnk_080D394F:: @ 080D394F - .incbin "baserom.gba", 0x0D394F, 0x0000029 - -gUnk_080D3978:: @ 080D3978 - .incbin "baserom.gba", 0x0D3978, 0x0000060 - -gUnk_080D39D8:: @ 080D39D8 - .incbin "baserom.gba", 0x0D39D8, 0x0000040 - -gUnk_080D3A18:: @ 080D3A18 - .incbin "baserom.gba", 0x0D3A18, 0x0000050 - -gUnk_080D3A68:: @ 080D3A68 - .incbin "baserom.gba", 0x0D3A68, 0x0000030 - -gUnk_080D3A98:: @ 080D3A98 - .incbin "baserom.gba", 0x0D3A98, 0x0000030 - -gUnk_080D3AC8:: @ 080D3AC8 - .incbin "baserom.gba", 0x0D3AC8, 0x0000020 - -gUnk_080D3AE8:: @ 080D3AE8 - .incbin "baserom.gba", 0x0D3AE8, 0x0000040 - -gUnk_080D3B28:: @ 080D3B28 - .incbin "baserom.gba", 0x0D3B28, 0x0000020 - -gUnk_080D3B48:: @ 080D3B48 - .incbin "baserom.gba", 0x0D3B48, 0x0000040 - -gUnk_080D3B88:: @ 080D3B88 - .incbin "baserom.gba", 0x0D3B88, 0x0000020 - -gUnk_080D3BA8:: @ 080D3BA8 - .incbin "baserom.gba", 0x0D3BA8, 0x0000020 - -gUnk_080D3BC8:: @ 080D3BC8 - .incbin "baserom.gba", 0x0D3BC8, 0x0000020 - -gUnk_080D3BE8:: @ 080D3BE8 - .incbin "baserom.gba", 0x0D3BE8, 0x0000010 + .include "data/code_08049D30.inc" diff --git a/data/dust.inc b/data/dust.inc index 048fadcb..010b7dcd 100644 --- a/data/dust.inc +++ b/data/dust.inc @@ -1,4 +1,4 @@ -gUnk_080D1588:: @ 080D1588 TODO asm/dust.s +gUnk_080D1588:: @ 080D1588 .4byte sub_08044134 .4byte sub_0804414C .4byte sub_08001324 @@ -16,4 +16,4 @@ gUnk_080D15A8:: @ 080D15A8 .4byte sub_080441CC gUnk_080D15B4:: @ 080D15B4 - .incbin "baserom.gba", 0x0D15B4, 0x0000050
\ No newline at end of file + .incbin "baserom.gba", 0x0D15B4, 0x0000050 diff --git a/data/enemy49.inc b/data/enemy49.inc index fafdeb2b..2f16d3e0 100644 --- a/data/enemy49.inc +++ b/data/enemy49.inc @@ -8,4 +8,4 @@ gUnk_080D0458:: @ 080D0458 .incbin "baserom.gba", 0x0D0458, 0x0000010 gUnk_080D0468:: @ 080D0468 - .incbin "baserom.gba", 0x0D0468, 0x0000008
\ No newline at end of file + .incbin "baserom.gba", 0x0D0468, 0x0000008 diff --git a/data/enemy4D.inc b/data/enemy4D.inc index 21e2224c..6c73d687 100644 --- a/data/enemy4D.inc +++ b/data/enemy4D.inc @@ -51,4 +51,4 @@ gUnk_080D0908:: @ 080D0908 .4byte sub_0803EFAC .4byte sub_0803EF70 .4byte sub_0803EF70 - .4byte sub_0803EFAC
\ No newline at end of file + .4byte sub_0803EFAC diff --git a/data/enemy50.inc b/data/enemy50.inc index 1c5dbdbc..86285bd6 100644 --- a/data/enemy50.inc +++ b/data/enemy50.inc @@ -30,4 +30,4 @@ gUnk_080D0E14:: @ 080D0E14 .incbin "baserom.gba", 0x0D0E14, 0x0000004 gUnk_080D0E18:: @ 080D0E18 - .incbin "baserom.gba", 0x0D0E18, 0x0000004
\ No newline at end of file + .incbin "baserom.gba", 0x0D0E18, 0x0000004 diff --git a/data/enemy5A.inc b/data/enemy5A.inc index 9b82ecb8..5e32c1bd 100644 --- a/data/enemy5A.inc +++ b/data/enemy5A.inc @@ -1,5 +1,5 @@ -gUnk_080D1888:: @ 080D1888 TODO asm/enemy5A.s +gUnk_080D1888:: @ 080D1888 .4byte sub_080456E8 .4byte sub_08045700 .4byte sub_080456E8 diff --git a/data/enemy5F.inc b/data/enemy5F.inc new file mode 100644 index 00000000..b8e0fcec --- /dev/null +++ b/data/enemy5F.inc @@ -0,0 +1,20 @@ +gUnk_080D1D48:: @ 080D1D48 + .4byte sub_080482EC + .4byte sub_08048330 + .4byte sub_0804835C + .4byte sub_08048388 + .4byte sub_080483F8 + .4byte sub_08048438 + .4byte sub_08048478 + .4byte sub_080484E8 + .4byte sub_08048550 + .4byte sub_080485A0 + +gUnk_080D1D70:: @ 080D1D70 + .incbin "baserom.gba", 0x0D1D70, 0x0000008 + +gUnk_080D1D78:: @ 080D1D78 + .incbin "baserom.gba", 0x0D1D78, 0x0000020 + +gUnk_080D1D98:: @ 080D1D98 + .incbin "baserom.gba", 0x0D1D98, 0x0000008 diff --git a/data/enemy62.inc b/data/enemy62.inc new file mode 100644 index 00000000..5906e340 --- /dev/null +++ b/data/enemy62.inc @@ -0,0 +1,19 @@ +gUnk_080D22D8:: @ 080D22D8 + .4byte sub_08048E04 + .4byte sub_08048E1C + .4byte sub_08001324 + .4byte sub_0804A7D4 + .4byte sub_08001242 + .4byte sub_08048E04 + +gUnk_080D22F0:: @ 080D22F0 + .4byte sub_08048EA4 + .4byte sub_08048ED0 + .4byte sub_08048F00 + .4byte sub_08048F30 + +gUnk_080D2300:: @ 080D2300 + .incbin "baserom.gba", 0x0D2300, 0x0000048 + +gUnk_080D2348:: @ 080D2348 + .incbin "baserom.gba", 0x0D2348, 0x0000020 diff --git a/data/enemy64.inc b/data/enemy64.inc new file mode 100644 index 00000000..c0a60866 --- /dev/null +++ b/data/enemy64.inc @@ -0,0 +1,38 @@ + +gUnk_080D2974:: @ 080D2974 + .4byte sub_08049100 + .4byte sub_080491EC + .4byte sub_080492A8 + .4byte sub_08049574 + .4byte sub_080496CC + +gUnk_080D2988:: @ 080D2988 + .4byte sub_0804920C + .4byte sub_08049274 + +gUnk_080D2990:: @ 080D2990 + .4byte sub_080492C8 + .4byte sub_08049358 + .4byte sub_080493E4 + .4byte sub_0804945C + .4byte sub_080494D0 + .4byte sub_08049538 + +gUnk_080D29A8:: @ 080D29A8 + .4byte sub_08049594 + .4byte sub_080495F8 + .4byte sub_0804965C + .4byte sub_0804969C + +gUnk_080D29B8:: @ 080D29B8 + .incbin "baserom.gba", 0x0D29B8, 0x0000008 + +gUnk_080D29C0:: @ 080D29C0 + .4byte sub_080496EC + .4byte sub_0804972C + .4byte sub_0804975C + .4byte sub_08049788 + .4byte sub_080497D0 + .4byte sub_08049804 + .4byte sub_08049888 + .4byte sub_080498B4 diff --git a/data/enemy66.inc b/data/enemy66.inc new file mode 100644 index 00000000..aaa1a206 --- /dev/null +++ b/data/enemy66.inc @@ -0,0 +1,2 @@ +gUnk_080D2ABC:: @ 080D2ABC + .incbin "baserom.gba", 0x0D2ABC, 0x000019C diff --git a/data/eyegore.inc b/data/eyegore.inc index c7df63be..6c3a2050 100644 --- a/data/eyegore.inc +++ b/data/eyegore.inc @@ -25,4 +25,4 @@ gUnk_080CE2F4:: @ 080CE2F4 .incbin "baserom.gba", 0x0CE2F4, 0x0000010 gUnk_080CE304:: @ 080CE304 - .incbin "baserom.gba", 0x0CE304, 0x0000008
\ No newline at end of file + .incbin "baserom.gba", 0x0CE304, 0x0000008 diff --git a/data/fireballGuy.inc b/data/fireballGuy.inc index 2f980689..e548303b 100644 --- a/data/fireballGuy.inc +++ b/data/fireballGuy.inc @@ -1,4 +1,4 @@ -gUnk_080D17E8:: @ 080D17E8 TODO src/enemy/fireballGuy.c +gUnk_080D17E8:: @ 080D17E8 .4byte sub_080453A4 .4byte sub_080453BC .4byte sub_08001324 @@ -15,4 +15,4 @@ gUnk_080D180C:: @ 080D180C .incbin "baserom.gba", 0x0D180C, 0x0000004 gUnk_080D1810:: @ 080D1810 - .incbin "baserom.gba", 0x0D1810, 0x0000008
\ No newline at end of file + .incbin "baserom.gba", 0x0D1810, 0x0000008 diff --git a/data/flyingPot.inc b/data/flyingPot.inc index ea685f3a..4d7d377c 100644 --- a/data/flyingPot.inc +++ b/data/flyingPot.inc @@ -25,4 +25,4 @@ gUnk_080CF278:: @ 080CF278 .4byte sub_08037218 gUnk_080CF290:: @ 080CF290 - .incbin "baserom.gba", 0x0CF290, 0x0000004
\ No newline at end of file + .incbin "baserom.gba", 0x0CF290, 0x0000004 diff --git a/data/flyingSkull.inc b/data/flyingSkull.inc index ed663221..f6e89807 100644 --- a/data/flyingSkull.inc +++ b/data/flyingSkull.inc @@ -31,4 +31,4 @@ gUnk_080CFBD4:: @ 080CFBD4 .4byte sub_08039FA4 gUnk_080CFBE4:: @ 080CFBE4 - .incbin "baserom.gba", 0x0CFBE4, 0x0000004
\ No newline at end of file + .incbin "baserom.gba", 0x0CFBE4, 0x0000004 diff --git a/data/ghini.inc b/data/ghini.inc index 2c59bc24..70a78f0b 100644 --- a/data/ghini.inc +++ b/data/ghini.inc @@ -1,6 +1,4 @@ - - -gUnk_080D0924:: @ 080D0924 TODO asm/ghini.s +gUnk_080D0924:: @ 080D0924 .4byte sub_0803F008 .4byte sub_0803F028 .4byte sub_0803F0F4 diff --git a/data/gleerok.inc b/data/gleerok.inc index 89796062..fb0844a3 100644 --- a/data/gleerok.inc +++ b/data/gleerok.inc @@ -96,4 +96,4 @@ gUnk_080CD878:: @ 080CD878 .4byte gUnk_080CD867 gUnk_080CD884:: @ 080CD884 - .incbin "baserom.gba", 0x0CD884, 0x000001F
\ No newline at end of file + .incbin "baserom.gba", 0x0CD884, 0x000001F diff --git a/data/gyorgChild.inc b/data/gyorgChild.inc new file mode 100644 index 00000000..a83f224d --- /dev/null +++ b/data/gyorgChild.inc @@ -0,0 +1,23 @@ +gUnk_080D1E6C:: @ 080D1E6C + .4byte sub_08048684 + .4byte sub_0804869C + .4byte sub_08001324 + .4byte sub_0804A7D4 + .4byte sub_08001242 + .4byte sub_080486AC + +gUnk_080D1E84:: @ 080D1E84 + .4byte sub_080486F4 + .4byte sub_0804877C + .4byte sub_0804882C + .4byte sub_08048904 + +gUnk_080D1E94:: @ 080D1E94 + .4byte sub_080486D0 + .4byte sub_080486D8 + .4byte sub_080486E0 + +gUnk_080D1EA0:: @ 080D1EA0 + .incbin "baserom.gba", 0x0D1EA0, 0x0000016 + + diff --git a/data/gyorgFemale.inc b/data/gyorgFemale.inc index b42d8e19..bf0b4dea 100644 --- a/data/gyorgFemale.inc +++ b/data/gyorgFemale.inc @@ -1,4 +1,4 @@ -gUnk_080D1A64:: @ 080D1A64 TODO asm/gyorgFemale.s +gUnk_080D1A64:: @ 080D1A64 .4byte sub_0804614C .4byte sub_0804625C .4byte sub_0804632C @@ -29,4 +29,4 @@ gUnk_080D1AF4:: @ 080D1AF4 .incbin "baserom.gba", 0x0D1AF4, 0x0000004 gUnk_080D1AF8:: @ 080D1AF8 - .incbin "baserom.gba", 0x0D1AF8, 0x0000004
\ No newline at end of file + .incbin "baserom.gba", 0x0D1AF8, 0x0000004 diff --git a/data/gyorgFemaleEye.inc b/data/gyorgFemaleEye.inc new file mode 100644 index 00000000..6b42fe4c --- /dev/null +++ b/data/gyorgFemaleEye.inc @@ -0,0 +1,23 @@ +gUnk_080D1F64:: @ 080D1F64 + .4byte sub_080489B4 + .4byte sub_080489CC + .4byte sub_08001324 + .4byte sub_0804A7D4 + .4byte sub_08001242 + .4byte sub_080489B4 + +gUnk_080D1F7C:: @ 080D1F7C + .4byte sub_08048AF0 + .4byte sub_08048B2C + .4byte sub_08048B84 + .4byte sub_08048BB0 + .4byte sub_08048CEC + +gUnk_080D1F90:: @ 080D1F90 + .incbin "baserom.gba", 0x0D1F90, 0x0000080 + +gUnk_080D2010:: @ 080D2010 + .incbin "baserom.gba", 0x0D2010, 0x0000020 + +gUnk_080D2030:: @ 080D2030 + .incbin "baserom.gba", 0x0D2030, 0x0000020 diff --git a/data/gyorgFemaleMouth.inc b/data/gyorgFemaleMouth.inc new file mode 100644 index 00000000..adf5558b --- /dev/null +++ b/data/gyorgFemaleMouth.inc @@ -0,0 +1,36 @@ +gUnk_080D28AC:: @ 080D28AC + .4byte gUnk_080D28DC + .4byte gUnk_080D28E4 + .4byte gUnk_080D28EC + .4byte gUnk_080D28F4 + .4byte gUnk_080D28FC + .4byte gUnk_080D2904 + .4byte gUnk_080D290C + .4byte gUnk_080D2914 + +gUnk_080D28CC:: @ 080D28CC + .incbin "baserom.gba", 0x0D28CC, 0x0000010 + +gUnk_080D28DC:: @ 080D28DC + .incbin "baserom.gba", 0x0D28DC, 0x0000008 + +gUnk_080D28E4:: @ 080D28E4 + .incbin "baserom.gba", 0x0D28E4, 0x0000008 + +gUnk_080D28EC:: @ 080D28EC + .incbin "baserom.gba", 0x0D28EC, 0x0000008 + +gUnk_080D28F4:: @ 080D28F4 + .incbin "baserom.gba", 0x0D28F4, 0x0000008 + +gUnk_080D28FC:: @ 080D28FC + .incbin "baserom.gba", 0x0D28FC, 0x0000008 + +gUnk_080D2904:: @ 080D2904 + .incbin "baserom.gba", 0x0D2904, 0x0000008 + +gUnk_080D290C:: @ 080D290C + .incbin "baserom.gba", 0x0D290C, 0x0000008 + +gUnk_080D2914:: @ 080D2914 + .incbin "baserom.gba", 0x0D2914, 0x0000008 diff --git a/data/mazaalHand.inc b/data/mazaalHand.inc index 651a65cd..ccdc2e15 100644 --- a/data/mazaalHand.inc +++ b/data/mazaalHand.inc @@ -18,4 +18,4 @@ gUnk_080CEF58:: @ 080CEF58 .4byte gUnk_080FD3C4 .4byte gUnk_080FD3C4 .4byte gUnk_080FD3C4 - .4byte gUnk_080FD3C4
\ No newline at end of file + .4byte gUnk_080FD3C4 diff --git a/data/mazaalMacro.inc b/data/mazaalMacro.inc index 7654f36a..d2c83eb3 100644 --- a/data/mazaalMacro.inc +++ b/data/mazaalMacro.inc @@ -28,4 +28,4 @@ gUnk_080CEED8:: @ 080CEED8 .incbin "baserom.gba", 0x0CEED8, 0x0000004 gUnk_080CEEDC:: @ 080CEEDC - .incbin "baserom.gba", 0x0CEEDC, 0x000002C
\ No newline at end of file + .incbin "baserom.gba", 0x0CEEDC, 0x000002C diff --git a/data/miniFireballGuy.inc b/data/miniFireballGuy.inc index 2b34c6da..b57296b0 100644 --- a/data/miniFireballGuy.inc +++ b/data/miniFireballGuy.inc @@ -8,4 +8,4 @@ gUnk_080D1868:: @ 080D1868 gUnk_080D1880:: @ 080D1880 .4byte sub_08045618 - .4byte sub_08045654
\ No newline at end of file + .4byte sub_08045654 diff --git a/data/miniSlime.inc b/data/miniSlime.inc index 90bac9dc..759b3e19 100644 --- a/data/miniSlime.inc +++ b/data/miniSlime.inc @@ -1,4 +1,4 @@ -gUnk_080D17C0:: @ 080D17C0 TODO src/enemy/miniSlime.c +gUnk_080D17C0:: @ 080D17C0 .4byte sub_08045220 .4byte sub_08045238 .4byte sub_08001324 @@ -10,4 +10,4 @@ gUnk_080D17D8:: @ 080D17D8 .4byte sub_080452A4 .4byte sub_080452E4 .4byte sub_080452FC - .4byte sub_08045374
\ No newline at end of file + .4byte sub_08045374 diff --git a/data/mulldozer.inc b/data/mulldozer.inc index 21a97699..dcbcc391 100644 --- a/data/mulldozer.inc +++ b/data/mulldozer.inc @@ -22,4 +22,4 @@ gUnk_080CEA54:: @ 080CEA54 .incbin "baserom.gba", 0x0CEA54, 0x0000002 gUnk_080CEA56:: @ 080CEA56 - .incbin "baserom.gba", 0x0CEA56, 0x0000010
\ No newline at end of file + .incbin "baserom.gba", 0x0CEA56, 0x0000010 diff --git a/data/octorokGolden.inc b/data/octorokGolden.inc index 5626c802..c6221071 100644 --- a/data/octorokGolden.inc +++ b/data/octorokGolden.inc @@ -15,4 +15,4 @@ gUnk_080CF490:: @ 080CF490 .incbin "baserom.gba", 0x0CF490, 0x0000008 gUnk_080CF498:: @ 080CF498 - .incbin "baserom.gba", 0x0CF498, 0x0000008
\ No newline at end of file + .incbin "baserom.gba", 0x0CF498, 0x0000008 diff --git a/data/rope.inc b/data/rope.inc index 27e71b32..8809feee 100644 --- a/data/rope.inc +++ b/data/rope.inc @@ -15,4 +15,4 @@ gUnk_080CE460:: @ 080CE460 gUnk_080CE470:: @ 080CE470 .4byte sub_0803140C .4byte sub_08031418 - .4byte sub_08031420
\ No newline at end of file + .4byte sub_08031420 diff --git a/data/ropeGolden.inc b/data/ropeGolden.inc index 66da1ff6..07449280 100644 --- a/data/ropeGolden.inc +++ b/data/ropeGolden.inc @@ -10,4 +10,4 @@ gUnk_080CF4E0:: @ 080CF4E0 .4byte sub_08038258 .4byte sub_0803827C .4byte sub_080382EC - .4byte sub_08038304
\ No newline at end of file + .4byte sub_08038304 diff --git a/data/slime.inc b/data/slime.inc index 227bd10e..cf3ec6df 100644 --- a/data/slime.inc +++ b/data/slime.inc @@ -1,4 +1,4 @@ -gUnk_080D16A4:: @ 080D16A4 TODO src/enemy/slime.c +gUnk_080D16A4:: @ 080D16A4 .4byte sub_08044F70 .4byte sub_08044F88 .4byte sub_08001324 diff --git a/data/smallPesto.inc b/data/smallPesto.inc index 95ba4773..c9f3696b 100644 --- a/data/smallPesto.inc +++ b/data/smallPesto.inc @@ -17,4 +17,4 @@ gUnk_080CE554:: @ 080CE554 .4byte sub_080316F0 gUnk_080CE560:: @ 080CE560 - .incbin "baserom.gba", 0x0CE560, 0x000000C
\ No newline at end of file + .incbin "baserom.gba", 0x0CE560, 0x000000C diff --git a/data/stalfos.inc b/data/stalfos.inc index 28d7fc64..2b285c5c 100644 --- a/data/stalfos.inc +++ b/data/stalfos.inc @@ -47,4 +47,4 @@ gUnk_080CF930:: @ 080CF930 .incbin "baserom.gba", 0x0CF930, 0x0000008 gUnk_080CF938:: @ 080CF938 - .incbin "baserom.gba", 0x0CF938, 0x000000A
\ No newline at end of file + .incbin "baserom.gba", 0x0CF938, 0x000000A diff --git a/data/takkuri.inc b/data/takkuri.inc index ffa1e0d0..fd8de689 100644 --- a/data/takkuri.inc +++ b/data/takkuri.inc @@ -17,4 +17,4 @@ gUnk_080CFF54:: @ 080CFF54 gUnk_080CFF6C:: @ 080CFF6C .4byte sub_0803BC7C .4byte sub_0803BC88 - .4byte sub_0803BC90
\ No newline at end of file + .4byte sub_0803BC90 diff --git a/data/tektite.inc b/data/tektite.inc index ce198819..15118fc0 100644 --- a/data/tektite.inc +++ b/data/tektite.inc @@ -13,4 +13,4 @@ gUnk_080CDEE8:: @ 080CDEE8 .4byte sub_0802F3F4 gUnk_080CDEF8:: @ 080CDEF8 - .incbin "baserom.gba", 0x0CDEF8, 0x0000004
\ No newline at end of file + .incbin "baserom.gba", 0x0CDEF8, 0x0000004 diff --git a/data/treeItem.inc b/data/treeItem.inc new file mode 100644 index 00000000..f735aaea --- /dev/null +++ b/data/treeItem.inc @@ -0,0 +1,17 @@ +gUnk_080D29E0:: @ 080D29E0 + .byte 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + +gUnk_080D2AB0:: @ 080D2AB0 + .byte 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x00, 0x00, 0x00, 0x00 diff --git a/data/vaatiBall.inc b/data/vaatiBall.inc index 889a202d..7abba2e4 100644 --- a/data/vaatiBall.inc +++ b/data/vaatiBall.inc @@ -1,5 +1,4 @@ - -gUnk_080D1604:: @ 080D1604 TODO src/enemy/vaatiBall.c +gUnk_080D1604:: @ 080D1604 .4byte sub_0804468C .4byte sub_0804474C .4byte sub_080447E0 @@ -15,4 +14,4 @@ gUnk_080D1628:: @ 080D1628 .incbin "baserom.gba", 0x0D1628, 0x0000007 gUnk_080D162F:: @ 080D162F - .incbin "baserom.gba", 0x0D162F, 0x0000009
\ No newline at end of file + .incbin "baserom.gba", 0x0D162F, 0x0000009 diff --git a/data/vaatiEyesMacro.inc b/data/vaatiEyesMacro.inc index d1b0f388..11392907 100644 --- a/data/vaatiEyesMacro.inc +++ b/data/vaatiEyesMacro.inc @@ -30,4 +30,4 @@ gUnk_080CDE90:: @ 080CDE90 .incbin "baserom.gba", 0x0CDE90, 0x0000008 gUnk_080CDE98:: @ 080CDE98 - .incbin "baserom.gba", 0x0CDE98, 0x0000008
\ No newline at end of file + .incbin "baserom.gba", 0x0CDE98, 0x0000008 diff --git a/data/vaatiRebornEnemy.inc b/data/vaatiRebornEnemy.inc index 35a84692..14c22833 100644 --- a/data/vaatiRebornEnemy.inc +++ b/data/vaatiRebornEnemy.inc @@ -1,5 +1,4 @@ - -gUnk_080D0470:: @ 080D0470 TODO asm/vaatiRebornEnemy.s +gUnk_080D0470:: @ 080D0470 .4byte sub_0803D134 .4byte sub_0803D264 .4byte sub_0803D408 @@ -37,4 +36,4 @@ gUnk_080D04D0:: @ 080D04D0 .incbin "baserom.gba", 0x0D04D0, 0x0000003 gUnk_080D04D3:: @ 080D04D3 - .incbin "baserom.gba", 0x0D04D3, 0x0000004
\ No newline at end of file + .incbin "baserom.gba", 0x0D04D3, 0x0000004 diff --git a/data/vaatiTransfigured.inc b/data/vaatiTransfigured.inc index ecd2aae6..5be37b3d 100644 --- a/data/vaatiTransfigured.inc +++ b/data/vaatiTransfigured.inc @@ -56,4 +56,4 @@ gUnk_080D0B74:: @ 080D0B74 .incbin "baserom.gba", 0x0D0B74, 0x0000010 gUnk_080D0B84:: @ 080D0B84 - .incbin "baserom.gba", 0x0D0B84, 0x0000020
\ No newline at end of file + .incbin "baserom.gba", 0x0D0B84, 0x0000020 diff --git a/data/vaatiWrath.inc b/data/vaatiWrath.inc index 525317ed..7f9bb89e 100644 --- a/data/vaatiWrath.inc +++ b/data/vaatiWrath.inc @@ -1,6 +1,4 @@ - - -gUnk_080D0E1C:: @ 080D0E1C TODO asm/vaatiWrath.s +gUnk_080D0E1C:: @ 080D0E1C .4byte sub_080413A0 .4byte sub_08042428 .4byte sub_080424A0 diff --git a/data/wisp.inc b/data/wisp.inc index fb71ecdb..7ad76f61 100644 --- a/data/wisp.inc +++ b/data/wisp.inc @@ -18,4 +18,4 @@ gUnk_080CEB98:: @ 080CEB98 gUnk_080CEBA4:: @ 080CEBA4 - .incbin "baserom.gba", 0x0CEBA4, 0x0000008
\ No newline at end of file + .incbin "baserom.gba", 0x0CEBA4, 0x0000008 diff --git a/data/wizzrobeIce.inc b/data/wizzrobeIce.inc index 0ed20e46..a3370a39 100644 --- a/data/wizzrobeIce.inc +++ b/data/wizzrobeIce.inc @@ -10,4 +10,4 @@ gUnk_080CE08C:: @ 080CE08C .4byte sub_0802FE90 .4byte sub_0802FEDC .4byte sub_0802FF68 -
\ No newline at end of file + diff --git a/data/wizzrobeWind.inc b/data/wizzrobeWind.inc index 08b87f8e..f41816db 100644 --- a/data/wizzrobeWind.inc +++ b/data/wizzrobeWind.inc @@ -10,4 +10,4 @@ gUnk_080CDF68:: @ 080CDF68 .4byte sub_0802F55C .4byte sub_0802F5DC .4byte sub_0802F668 - .4byte sub_0802F7AC
\ No newline at end of file + .4byte sub_0802F7AC |