diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-04-17 12:38:11 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-04-18 22:04:16 +0200 |
| commit | cfc4cd8238b282aaf4d2933f8bbc9f161e250729 (patch) | |
| tree | 17ee3cf7f3fa75ece4332127d4fe34607a1c80c5 /data/const | |
| parent | f82b7976912a5bfbe4d6ecb2c0f9bccbfbc4d86b (diff) | |
Extract more pointers from data section
Diffstat (limited to 'data/const')
27 files changed, 882 insertions, 90 deletions
diff --git a/data/const/code_08049D30.s b/data/const/code_08049D30.s index 914c321b..27249f58 100644 --- a/data/const/code_08049D30.s +++ b/data/const/code_08049D30.s @@ -5,127 +5,622 @@ .align 2 gUnk_080D2C58:: @ 080D2C58 - .incbin "baserom.gba", 0x0D2C58, 0x00001CE + .incbin "baserom.gba", 0x0D2C58, 0x0000004 + .4byte gUnk_080D34D8 + .incbin "baserom.gba", 0x0D2C60, 0x000000C + .4byte gUnk_080D32B8 + .incbin "baserom.gba", 0x0D2C70, 0x000000C + .4byte gUnk_080D32E8 + .incbin "baserom.gba", 0x0D2C80, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D2C90, 0x000000C + .4byte gUnk_080FD198 + .incbin "baserom.gba", 0x0D2CA0, 0x000000C + .4byte gUnk_080D3B48 + .incbin "baserom.gba", 0x0D2CB0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D2CC0, 0x000000C + .4byte gUnk_080D3AC8 + .incbin "baserom.gba", 0x0D2CD0, 0x000000C + .4byte gUnk_080FD1CC + .incbin "baserom.gba", 0x0D2CE0, 0x000000C + .4byte gUnk_080D3308 + .incbin "baserom.gba", 0x0D2CF0, 0x000000C + .4byte gUnk_080FD468 + .incbin "baserom.gba", 0x0D2D00, 0x000000C + .4byte gUnk_080FD468 + .incbin "baserom.gba", 0x0D2D10, 0x000000C + .4byte gUnk_080FD528 + .incbin "baserom.gba", 0x0D2D20, 0x000000C + .4byte gUnk_080D3388 + .incbin "baserom.gba", 0x0D2D30, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D2D40, 0x000000C + .4byte gUnk_080D33C8 + .incbin "baserom.gba", 0x0D2D50, 0x000000C + .4byte gUnk_080D3458 + .incbin "baserom.gba", 0x0D2D60, 0x000000C + .4byte gUnk_080D3488 + .incbin "baserom.gba", 0x0D2D70, 0x000000C + .4byte gUnk_080D34B8 + .incbin "baserom.gba", 0x0D2D80, 0x000000C + .4byte gUnk_080D3508 + .incbin "baserom.gba", 0x0D2D90, 0x000000C + .4byte gUnk_080FD250 + .incbin "baserom.gba", 0x0D2DA0, 0x000000C + .4byte gUnk_080D3BA8 + .incbin "baserom.gba", 0x0D2DB0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D2DC0, 0x000000C + .4byte gUnk_080FD268 + .incbin "baserom.gba", 0x0D2DD0, 0x000000C + .4byte gUnk_080D35D8 + .incbin "baserom.gba", 0x0D2DE0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D2DF0, 0x000000C + .4byte gUnk_080FD2B0 + .incbin "baserom.gba", 0x0D2E00, 0x000000C + .4byte gUnk_080D3598 + .incbin "baserom.gba", 0x0D2E10, 0x000000C + .4byte gUnk_080FD318 + .incbin "baserom.gba", 0x0D2E20, 0x0000006 gUnk_080D2E26:: @ 080D2E26 - .incbin "baserom.gba", 0x0D2E26, 0x0000492 + .incbin "baserom.gba", 0x0D2E26, 0x0000006 + .4byte gUnk_080FD2C0 + .incbin "baserom.gba", 0x0D2E30, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D2E40, 0x000000C + .4byte gUnk_080FD2C0 + .incbin "baserom.gba", 0x0D2E50, 0x000000C + .4byte gUnk_080FD2C8 + .incbin "baserom.gba", 0x0D2E60, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D2E70, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D2E80, 0x000000C + .4byte gUnk_080FD2B8 + .incbin "baserom.gba", 0x0D2E90, 0x000000C + .4byte gUnk_080D3648 + .incbin "baserom.gba", 0x0D2EA0, 0x000000C + .4byte gUnk_080D3AE8 + .incbin "baserom.gba", 0x0D2EB0, 0x000000C + .4byte gUnk_080D36C8 + .incbin "baserom.gba", 0x0D2EC0, 0x000000C + .4byte gUnk_080D36E8 + .incbin "baserom.gba", 0x0D2ED0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D2EE0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D2EF0, 0x000000C + .4byte gUnk_080FD2F8 + .incbin "baserom.gba", 0x0D2F00, 0x000000C + .4byte gUnk_080FD300 + .incbin "baserom.gba", 0x0D2F10, 0x000000C + .4byte gUnk_080FD480 + .incbin "baserom.gba", 0x0D2F20, 0x000000C + .4byte gUnk_080D3718 + .incbin "baserom.gba", 0x0D2F30, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D2F40, 0x000000C + .4byte gUnk_080FD2C0 + .incbin "baserom.gba", 0x0D2F50, 0x000000C + .4byte gUnk_080D3B88 + .incbin "baserom.gba", 0x0D2F60, 0x000000C + .4byte gUnk_080FD410 + .incbin "baserom.gba", 0x0D2F70, 0x000000C + .4byte gUnk_080D3748 + .incbin "baserom.gba", 0x0D2F80, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D2F90, 0x000000C + .4byte gUnk_080D3768 + .incbin "baserom.gba", 0x0D2FA0, 0x000000C + .4byte gUnk_080FD568 + .incbin "baserom.gba", 0x0D2FB0, 0x000000C + .4byte gUnk_080D3788 + .incbin "baserom.gba", 0x0D2FC0, 0x000000C + .4byte gUnk_080D37F8 + .incbin "baserom.gba", 0x0D2FD0, 0x000000C + .4byte gUnk_080D37D8 + .incbin "baserom.gba", 0x0D2FE0, 0x000000C + .4byte gUnk_080D3828 + .incbin "baserom.gba", 0x0D2FF0, 0x000000C + .4byte gUnk_080FD338 + .incbin "baserom.gba", 0x0D3000, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3010, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3020, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3030, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3040, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3050, 0x000000C + .4byte gUnk_080FD170 + .incbin "baserom.gba", 0x0D3060, 0x000000C + .4byte gUnk_080D38A8 + .incbin "baserom.gba", 0x0D3070, 0x000000C + .4byte gUnk_080D3918 + .incbin "baserom.gba", 0x0D3080, 0x000000C + .4byte gUnk_080FD338 + .incbin "baserom.gba", 0x0D3090, 0x000000C + .4byte gUnk_080D38D8 + .incbin "baserom.gba", 0x0D30A0, 0x000000C + .4byte gUnk_080FD410 + .incbin "baserom.gba", 0x0D30B0, 0x000000C + .4byte gUnk_080D3BC8 + .incbin "baserom.gba", 0x0D30C0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D30D0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D30E0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D30F0, 0x000000C + .4byte gUnk_080D3938 + .incbin "baserom.gba", 0x0D3100, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3110, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3120, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3130, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3140, 0x000000C + .4byte gUnk_080D3978 + .incbin "baserom.gba", 0x0D3150, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3160, 0x000000C + .4byte gUnk_080D39D8 + .incbin "baserom.gba", 0x0D3170, 0x000000C + .4byte gUnk_080D3A18 + .incbin "baserom.gba", 0x0D3180, 0x000000C + .4byte gUnk_080FD188 + .incbin "baserom.gba", 0x0D3190, 0x000000C + .4byte gUnk_080FD1A0 + .incbin "baserom.gba", 0x0D31A0, 0x000000C + .4byte gUnk_080D34D8 + .incbin "baserom.gba", 0x0D31B0, 0x000000C + .4byte gUnk_080D3A68 + .incbin "baserom.gba", 0x0D31C0, 0x000000C + .4byte gUnk_080D3A98 + .incbin "baserom.gba", 0x0D31D0, 0x000000C + .4byte gUnk_080FD498 + .incbin "baserom.gba", 0x0D31E0, 0x000000C + .4byte gUnk_080FD4A4 + .incbin "baserom.gba", 0x0D31F0, 0x000000C + .4byte gUnk_080D3B28 + .incbin "baserom.gba", 0x0D3200, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3210, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3220, 0x000000C + .4byte gUnk_080FD54C + .incbin "baserom.gba", 0x0D3230, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3240, 0x000000C + .4byte gUnk_080FD448 + .incbin "baserom.gba", 0x0D3250, 0x000000C + .4byte gUnk_080FD448 + .incbin "baserom.gba", 0x0D3260, 0x000000C + .4byte gUnk_080FD458 + .incbin "baserom.gba", 0x0D3270, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3280, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3290, 0x000000C + .4byte gUnk_080FD54C + .incbin "baserom.gba", 0x0D32A0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D32B0, 0x0000008 gUnk_080D32B8:: @ 080D32B8 - .incbin "baserom.gba", 0x0D32B8, 0x0000030 + .incbin "baserom.gba", 0x0D32B8, 0x0000004 + .4byte gUnk_080FD468 + .incbin "baserom.gba", 0x0D32C0, 0x000000C + .4byte gUnk_080FD468 + .incbin "baserom.gba", 0x0D32D0, 0x000000C + .4byte gUnk_080FD468 + .incbin "baserom.gba", 0x0D32E0, 0x0000008 gUnk_080D32E8:: @ 080D32E8 - .incbin "baserom.gba", 0x0D32E8, 0x0000020 + .incbin "baserom.gba", 0x0D32E8, 0x0000004 + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D32F0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3300, 0x0000008 gUnk_080D3308:: @ 080D3308 - .incbin "baserom.gba", 0x0D3308, 0x0000080 + .incbin "baserom.gba", 0x0D3308, 0x0000004 + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3310, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3320, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3330, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3340, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3350, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3360, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3370, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3380, 0x0000008 gUnk_080D3388:: @ 080D3388 - .incbin "baserom.gba", 0x0D3388, 0x0000040 + .incbin "baserom.gba", 0x0D3388, 0x0000004 + .4byte gUnk_080FD1DC + .incbin "baserom.gba", 0x0D3390, 0x000000C + .4byte gUnk_080FD1E4 + .incbin "baserom.gba", 0x0D33A0, 0x000000C + .4byte gUnk_080FD1E4 + .incbin "baserom.gba", 0x0D33B0, 0x000000C + .4byte gUnk_080FD1EC + .incbin "baserom.gba", 0x0D33C0, 0x0000008 gUnk_080D33C8:: @ 080D33C8 - .incbin "baserom.gba", 0x0D33C8, 0x0000090 + .incbin "baserom.gba", 0x0D33C8, 0x0000004 + .4byte gUnk_080FD1FC + .incbin "baserom.gba", 0x0D33D0, 0x000000C + .4byte gUnk_080FD204 + .incbin "baserom.gba", 0x0D33E0, 0x000000C + .4byte gUnk_080FD20C + .incbin "baserom.gba", 0x0D33F0, 0x000000C + .4byte gUnk_080FD20C + .incbin "baserom.gba", 0x0D3400, 0x000000C + .4byte gUnk_080FD20C + .incbin "baserom.gba", 0x0D3410, 0x000000C + .4byte gUnk_080FD20C + .incbin "baserom.gba", 0x0D3420, 0x000000C + .4byte gUnk_080FD20C + .incbin "baserom.gba", 0x0D3430, 0x000000C + .4byte gUnk_080FD20C + .incbin "baserom.gba", 0x0D3440, 0x000000C + .4byte gUnk_080FD214 + .incbin "baserom.gba", 0x0D3450, 0x0000008 gUnk_080D3458:: @ 080D3458 - .incbin "baserom.gba", 0x0D3458, 0x0000030 + .incbin "baserom.gba", 0x0D3458, 0x0000004 + .4byte gUnk_080FD21C + .incbin "baserom.gba", 0x0D3460, 0x000000C + .4byte gUnk_080FD21C + .incbin "baserom.gba", 0x0D3470, 0x000000C + .4byte gUnk_080FD21C + .incbin "baserom.gba", 0x0D3480, 0x0000008 gUnk_080D3488:: @ 080D3488 - .incbin "baserom.gba", 0x0D3488, 0x0000030 + .incbin "baserom.gba", 0x0D3488, 0x0000004 + .4byte gUnk_080FD22C + .incbin "baserom.gba", 0x0D3490, 0x000000C + .4byte gUnk_080FD22C + .incbin "baserom.gba", 0x0D34A0, 0x000000C + .4byte gUnk_080FD22C + .incbin "baserom.gba", 0x0D34B0, 0x0000008 gUnk_080D34B8:: @ 080D34B8 - .incbin "baserom.gba", 0x0D34B8, 0x0000020 + .incbin "baserom.gba", 0x0D34B8, 0x0000004 + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D34C0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D34D0, 0x0000008 gUnk_080D34D8:: @ 080D34D8 - .incbin "baserom.gba", 0x0D34D8, 0x0000030 + .incbin "baserom.gba", 0x0D34D8, 0x0000004 + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D34E0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D34F0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3500, 0x0000008 gUnk_080D3508:: @ 080D3508 - .incbin "baserom.gba", 0x0D3508, 0x0000090 + .incbin "baserom.gba", 0x0D3508, 0x0000004 + .4byte gUnk_080FD238 + .incbin "baserom.gba", 0x0D3510, 0x000000C + .4byte gUnk_080FD240 + .incbin "baserom.gba", 0x0D3520, 0x000000C + .4byte gUnk_080FD248 + .incbin "baserom.gba", 0x0D3530, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3540, 0x000000C + .4byte gUnk_080FD238 + .incbin "baserom.gba", 0x0D3550, 0x000000C + .4byte gUnk_080FD240 + .incbin "baserom.gba", 0x0D3560, 0x000000C + .4byte gUnk_080FD248 + .incbin "baserom.gba", 0x0D3570, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3580, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3590, 0x0000008 gUnk_080D3598:: @ 080D3598 - .incbin "baserom.gba", 0x0D3598, 0x0000040 + .incbin "baserom.gba", 0x0D3598, 0x0000004 + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D35A0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D35B0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D35C0, 0x000000C + .4byte gUnk_080FD21C + .incbin "baserom.gba", 0x0D35D0, 0x0000008 gUnk_080D35D8:: @ 080D35D8 - .incbin "baserom.gba", 0x0D35D8, 0x0000070 + .incbin "baserom.gba", 0x0D35D8, 0x0000004 + .4byte gUnk_080FD290 + .incbin "baserom.gba", 0x0D35E0, 0x000000C + .4byte gUnk_080FD298 + .incbin "baserom.gba", 0x0D35F0, 0x000000C + .4byte gUnk_080FD298 + .incbin "baserom.gba", 0x0D3600, 0x000000C + .4byte gUnk_080FD298 + .incbin "baserom.gba", 0x0D3610, 0x000000C + .4byte gUnk_080FD2A0 + .incbin "baserom.gba", 0x0D3620, 0x000000C + .4byte gUnk_080FD2A0 + .incbin "baserom.gba", 0x0D3630, 0x000000C + .4byte gUnk_080FD2A0 + .incbin "baserom.gba", 0x0D3640, 0x0000008 gUnk_080D3648:: @ 080D3648 - .incbin "baserom.gba", 0x0D3648, 0x0000080 + .incbin "baserom.gba", 0x0D3648, 0x0000004 + .4byte gUnk_080FD2D8 + .incbin "baserom.gba", 0x0D3650, 0x000000C + .4byte gUnk_080FD2E0 + .incbin "baserom.gba", 0x0D3660, 0x000000C + .4byte gUnk_080FD2D0 + .incbin "baserom.gba", 0x0D3670, 0x000000C + .4byte gUnk_080FD2D0 + .incbin "baserom.gba", 0x0D3680, 0x000000C + .4byte gUnk_080FD2D0 + .incbin "baserom.gba", 0x0D3690, 0x000000C + .4byte gUnk_080FD2D0 + .incbin "baserom.gba", 0x0D36A0, 0x000000C + .4byte gUnk_080FD2D0 + .incbin "baserom.gba", 0x0D36B0, 0x000000C + .4byte gUnk_080FD2D0 + .incbin "baserom.gba", 0x0D36C0, 0x0000008 gUnk_080D36C8:: @ 080D36C8 - .incbin "baserom.gba", 0x0D36C8, 0x0000020 + .incbin "baserom.gba", 0x0D36C8, 0x0000004 + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D36D0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D36E0, 0x0000008 gUnk_080D36E8:: @ 080D36E8 - .incbin "baserom.gba", 0x0D36E8, 0x0000030 + .incbin "baserom.gba", 0x0D36E8, 0x0000004 + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D36F0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3700, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3710, 0x0000008 gUnk_080D3718:: @ 080D3718 - .incbin "baserom.gba", 0x0D3718, 0x0000030 + .incbin "baserom.gba", 0x0D3718, 0x0000004 + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3720, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3730, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3740, 0x0000008 gUnk_080D3748:: @ 080D3748 - .incbin "baserom.gba", 0x0D3748, 0x0000020 + .incbin "baserom.gba", 0x0D3748, 0x0000004 + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3750, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3760, 0x0000008 gUnk_080D3768:: @ 080D3768 - .incbin "baserom.gba", 0x0D3768, 0x0000020 + .incbin "baserom.gba", 0x0D3768, 0x0000004 + .4byte gUnk_080FD168 + .incbin "baserom.gba", 0x0D3770, 0x000000C + .4byte gUnk_080FD168 + .incbin "baserom.gba", 0x0D3780, 0x0000008 gUnk_080D3788:: @ 080D3788 - .incbin "baserom.gba", 0x0D3788, 0x0000050 + .incbin "baserom.gba", 0x0D3788, 0x0000004 + .4byte gUnk_080FD354 + .incbin "baserom.gba", 0x0D3790, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D37A0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D37B0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D37C0, 0x000000C + .4byte gUnk_080FD38C + .incbin "baserom.gba", 0x0D37D0, 0x0000008 gUnk_080D37D8:: @ 080D37D8 - .incbin "baserom.gba", 0x0D37D8, 0x0000020 + .incbin "baserom.gba", 0x0D37D8, 0x0000004 + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D37E0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D37F0, 0x0000008 gUnk_080D37F8:: @ 080D37F8 - .incbin "baserom.gba", 0x0D37F8, 0x0000030 + .incbin "baserom.gba", 0x0D37F8, 0x0000004 + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3800, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3810, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3820, 0x0000008 gUnk_080D3828:: @ 080D3828 - .incbin "baserom.gba", 0x0D3828, 0x0000080 + .incbin "baserom.gba", 0x0D3828, 0x0000004 + .4byte gUnk_080FD3CC + .incbin "baserom.gba", 0x0D3830, 0x000000C + .4byte gUnk_080FD3DC + .incbin "baserom.gba", 0x0D3840, 0x000000C + .4byte gUnk_080FD3DC + .incbin "baserom.gba", 0x0D3850, 0x000000C + .4byte gUnk_080FD3DC + .incbin "baserom.gba", 0x0D3860, 0x000000C + .4byte gUnk_080FD3DC + .incbin "baserom.gba", 0x0D3870, 0x000000C + .4byte gUnk_080FD3E4 + .incbin "baserom.gba", 0x0D3880, 0x000000C + .4byte gUnk_080FD3EC + .incbin "baserom.gba", 0x0D3890, 0x000000C + .4byte gUnk_080FD3EC + .incbin "baserom.gba", 0x0D38A0, 0x0000008 gUnk_080D38A8:: @ 080D38A8 - .incbin "baserom.gba", 0x0D38A8, 0x0000030 + .incbin "baserom.gba", 0x0D38A8, 0x0000004 + .4byte gUnk_080FD580 + .incbin "baserom.gba", 0x0D38B0, 0x000000C + .4byte gUnk_080FD580 + .incbin "baserom.gba", 0x0D38C0, 0x000000C + .4byte gUnk_080FD580 + .incbin "baserom.gba", 0x0D38D0, 0x0000008 gUnk_080D38D8:: @ 080D38D8 - .incbin "baserom.gba", 0x0D38D8, 0x0000040 + .incbin "baserom.gba", 0x0D38D8, 0x0000004 + .4byte gUnk_080FD35C + .incbin "baserom.gba", 0x0D38E0, 0x000000C + .4byte gUnk_080FD36C + .incbin "baserom.gba", 0x0D38F0, 0x000000C + .4byte gUnk_080FD37C + .incbin "baserom.gba", 0x0D3900, 0x000000C + .4byte gUnk_080FD384 + .incbin "baserom.gba", 0x0D3910, 0x0000008 gUnk_080D3918:: @ 080D3918 - .incbin "baserom.gba", 0x0D3918, 0x0000020 + .incbin "baserom.gba", 0x0D3918, 0x0000004 + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3920, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3930, 0x0000008 gUnk_080D3938:: @ 080D3938 - .incbin "baserom.gba", 0x0D3938, 0x0000017 - -gUnk_080D394F:: @ 080D394F - .incbin "baserom.gba", 0x0D394F, 0x0000029 + .incbin "baserom.gba", 0x0D3938, 0x0000004 + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3940, 0x000000C + .4byte gUnk_080FD588 + .incbin "baserom.gba", 0x0D3950, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3960, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3970, 0x0000008 gUnk_080D3978:: @ 080D3978 - .incbin "baserom.gba", 0x0D3978, 0x0000060 + .incbin "baserom.gba", 0x0D3978, 0x0000004 + .4byte gUnk_080FD530 + .incbin "baserom.gba", 0x0D3980, 0x000000C + .4byte gUnk_080FD1C4 + .incbin "baserom.gba", 0x0D3990, 0x000000C + .4byte gUnk_080FD1C4 + .incbin "baserom.gba", 0x0D39A0, 0x000000C + .4byte gUnk_080FD1C4 + .incbin "baserom.gba", 0x0D39B0, 0x000000C + .4byte gUnk_080FD1C4 + .incbin "baserom.gba", 0x0D39C0, 0x000000C + .4byte gUnk_080FD1C4 + .incbin "baserom.gba", 0x0D39D0, 0x0000008 gUnk_080D39D8:: @ 080D39D8 - .incbin "baserom.gba", 0x0D39D8, 0x0000040 + .incbin "baserom.gba", 0x0D39D8, 0x0000004 + .4byte gUnk_080FD544 + .incbin "baserom.gba", 0x0D39E0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D39F0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3A00, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3A10, 0x0000008 gUnk_080D3A18:: @ 080D3A18 - .incbin "baserom.gba", 0x0D3A18, 0x0000050 + .incbin "baserom.gba", 0x0D3A18, 0x0000004 + .4byte gUnk_080FD538 + .incbin "baserom.gba", 0x0D3A20, 0x000000C + .4byte gUnk_080FD538 + .incbin "baserom.gba", 0x0D3A30, 0x000000C + .4byte gUnk_080FD538 + .incbin "baserom.gba", 0x0D3A40, 0x000000C + .4byte gUnk_080FD538 + .incbin "baserom.gba", 0x0D3A50, 0x000000C + .4byte gUnk_080FD538 + .incbin "baserom.gba", 0x0D3A60, 0x0000008 gUnk_080D3A68:: @ 080D3A68 - .incbin "baserom.gba", 0x0D3A68, 0x0000030 + .incbin "baserom.gba", 0x0D3A68, 0x0000004 + .4byte gUnk_080FD488 + .incbin "baserom.gba", 0x0D3A70, 0x000000C + .4byte gUnk_080FD488 + .incbin "baserom.gba", 0x0D3A80, 0x000000C + .4byte gUnk_080FD488 + .incbin "baserom.gba", 0x0D3A90, 0x0000008 gUnk_080D3A98:: @ 080D3A98 - .incbin "baserom.gba", 0x0D3A98, 0x0000030 + .incbin "baserom.gba", 0x0D3A98, 0x0000004 + .4byte gUnk_080FD490 + .incbin "baserom.gba", 0x0D3AA0, 0x000000C + .4byte gUnk_080FD490 + .incbin "baserom.gba", 0x0D3AB0, 0x000000C + .4byte gUnk_080FD490 + .incbin "baserom.gba", 0x0D3AC0, 0x0000008 gUnk_080D3AC8:: @ 080D3AC8 - .incbin "baserom.gba", 0x0D3AC8, 0x0000020 + .incbin "baserom.gba", 0x0D3AC8, 0x0000004 + .4byte gUnk_080FD1A0 + .incbin "baserom.gba", 0x0D3AD0, 0x000000C + .4byte gUnk_080FD1A0 + .incbin "baserom.gba", 0x0D3AE0, 0x0000008 gUnk_080D3AE8:: @ 080D3AE8 - .incbin "baserom.gba", 0x0D3AE8, 0x0000040 + .incbin "baserom.gba", 0x0D3AE8, 0x0000004 + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3AF0, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3B00, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3B10, 0x000000C + .4byte gUnk_080FD150 + .incbin "baserom.gba", 0x0D3B20, 0x0000008 gUnk_080D3B28:: @ 080D3B28 - .incbin "baserom.gba", 0x0D3B28, 0x0000020 + .incbin "baserom.gba", 0x0D3B28, 0x0000004 + .4byte gUnk_080FD168 + .incbin "baserom.gba", 0x0D3B30, 0x000000C + .4byte gUnk_080FD168 + .incbin "baserom.gba", 0x0D3B40, 0x0000008 gUnk_080D3B48:: @ 080D3B48 - .incbin "baserom.gba", 0x0D3B48, 0x0000040 + .incbin "baserom.gba", 0x0D3B48, 0x0000004 + .4byte gUnk_080FD1B4 + .incbin "baserom.gba", 0x0D3B50, 0x000000C + .4byte gUnk_080FD1B4 + .incbin "baserom.gba", 0x0D3B60, 0x000000C + .4byte gUnk_080FD1B4 + .incbin "baserom.gba", 0x0D3B70, 0x000000C + .4byte gUnk_080FD1B4 + .incbin "baserom.gba", 0x0D3B80, 0x0000008 gUnk_080D3B88:: @ 080D3B88 - .incbin "baserom.gba", 0x0D3B88, 0x0000020 + .incbin "baserom.gba", 0x0D3B88, 0x0000004 + .4byte gUnk_080FD330 + .incbin "baserom.gba", 0x0D3B90, 0x000000C + .4byte gUnk_080FD330 + .incbin "baserom.gba", 0x0D3BA0, 0x0000008 gUnk_080D3BA8:: @ 080D3BA8 - .incbin "baserom.gba", 0x0D3BA8, 0x0000020 + .incbin "baserom.gba", 0x0D3BA8, 0x0000004 + .4byte gUnk_080FD258 + .incbin "baserom.gba", 0x0D3BB0, 0x000000C + .4byte gUnk_080FD258 + .incbin "baserom.gba", 0x0D3BC0, 0x0000008 gUnk_080D3BC8:: @ 080D3BC8 - .incbin "baserom.gba", 0x0D3BC8, 0x0000020 + .incbin "baserom.gba", 0x0D3BC8, 0x0000004 + .4byte gUnk_080FD258 + .incbin "baserom.gba", 0x0D3BD0, 0x000000C + .4byte gUnk_080FD258 + .incbin "baserom.gba", 0x0D3BE0, 0x0000008 gUnk_080D3BE8:: @ 080D3BE8 .4byte sub_08049E18 diff --git a/data/const/enemy/enemy66.s b/data/const/enemy/enemy66.s index 036bc6b8..0274ade7 100644 --- a/data/const/enemy/enemy66.s +++ b/data/const/enemy/enemy66.s @@ -5,4 +5,6 @@ .align 2 gUnk_080D2ABC:: @ 080D2ABC - .incbin "baserom.gba", 0x0D2ABC, 0x000019C + .incbin "baserom.gba", 0x0D2ABC, 0x0000058 + .4byte sub_08029270 + .incbin "baserom.gba", 0x0D2B18, 0x0000140 diff --git a/data/const/enemy/gleerok.s b/data/const/enemy/gleerok.s index 9e53a6eb..f834ba3d 100644 --- a/data/const/enemy/gleerok.s +++ b/data/const/enemy/gleerok.s @@ -58,7 +58,7 @@ gUnk_080CD828:: @ 080CD828 .4byte sub_0802E300 gUnk_080CD840:: @ 080CD840 - .4byte gUnk_08100804 + .4byte 0x08100804 @ not a pointer! gUnk_080CD844:: @ 080CD844 .incbin "baserom.gba", 0x0CD844, 0x0000004 diff --git a/data/const/enemy/vaatiArm.s b/data/const/enemy/vaatiArm.s index 47e1d5c1..8d50dea9 100644 --- a/data/const/enemy/vaatiArm.s +++ b/data/const/enemy/vaatiArm.s @@ -40,7 +40,13 @@ gUnk_080D1286:: @ 080D1286 .incbin "baserom.gba", 0x0D1286, 0x000000A gUnk_080D1290:: @ 080D1290 - .incbin "baserom.gba", 0x0D1290, 0x000001C + .4byte sub_08042894 + .4byte sub_080428AC + .4byte sub_080428FC + .4byte sub_08042944 + .4byte sub_08042970 + .4byte sub_080429D4 + .4byte sub_080429FC gUnk_080D12AC:: @ 080D12AC .incbin "baserom.gba", 0x0D12AC, 0x0000004 diff --git a/data/const/manager/manager1A.s b/data/const/manager/manager1A.s index 56708d5b..08855570 100644 --- a/data/const/manager/manager1A.s +++ b/data/const/manager/manager1A.s @@ -102,19 +102,71 @@ gUnk_0810875E:: @ 0810875E .incbin "baserom.gba", 0x10875E, 0x0000006 gUnk_08108764:: @ 08108764 - .incbin "baserom.gba", 0x108764, 0x00000AF + .incbin "baserom.gba", 0x108764, 0x0000020 + .4byte gUnk_08108670 + .incbin "baserom.gba", 0x108788, 0x0000010 + .4byte gUnk_08108688 + .incbin "baserom.gba", 0x10879C, 0x0000014 + .4byte gUnk_0810875C + .incbin "baserom.gba", 0x1087B4, 0x000000C + .4byte gUnk_08108694 + .incbin "baserom.gba", 0x1087C4, 0x0000010 + .4byte gUnk_081086A0 + .incbin "baserom.gba", 0x1087D8, 0x0000010 + .4byte gUnk_081086AC + .incbin "baserom.gba", 0x1087EC, 0x0000027 gUnk_08108813:: @ 08108813 - .incbin "baserom.gba", 0x108813, 0x0000031 + .incbin "baserom.gba", 0x108813, 0x0000001 + .4byte gUnk_081086DC + .incbin "baserom.gba", 0x108818, 0x0000010 + .4byte gUnk_081086E4 + .incbin "baserom.gba", 0x10882C, 0x0000010 + .4byte gUnk_081086EC + .incbin "baserom.gba", 0x108840, 0x0000004 gUnk_08108844:: @ 08108844 - .incbin "baserom.gba", 0x108844, 0x0000020 + .incbin "baserom.gba", 0x108844, 0x000000C + .4byte gUnk_081086F4 + .incbin "baserom.gba", 0x108854, 0x0000010 gUnk_08108864:: @ 08108864 - .incbin "baserom.gba", 0x108864, 0x0000237 + .incbin "baserom.gba", 0x108864, 0x0000010 + .4byte gUnk_0810867C + .incbin "baserom.gba", 0x108878, 0x00001B8 + .4byte gUnk_081086FC + .incbin "baserom.gba", 0x108A34, 0x0000010 + .4byte gUnk_08108704 + .incbin "baserom.gba", 0x108A48, 0x0000024 + .4byte gUnk_0810870C + .incbin "baserom.gba", 0x108A70, 0x0000010 + .4byte gUnk_08108714 + .incbin "baserom.gba", 0x108A84, 0x0000010 + .4byte gUnk_0810871C + .incbin "baserom.gba", 0x108A98, 0x0000003 gUnk_08108A9B:: @ 08108A9B - .incbin "baserom.gba", 0x108A9B, 0x0000177 + .incbin "baserom.gba", 0x108A9B, 0x0000021 + .4byte gUnk_08108724 + .incbin "baserom.gba", 0x108AC0, 0x0000010 + .4byte gUnk_0810872C + .incbin "baserom.gba", 0x108AD4, 0x0000024 + .4byte gUnk_08108734 + .incbin "baserom.gba", 0x108AFC, 0x0000024 + .4byte gUnk_0810873C + .incbin "baserom.gba", 0x108B24, 0x0000010 + .4byte gUnk_08108744 + .incbin "baserom.gba", 0x108B38, 0x0000010 + .4byte gUnk_0810874C + .incbin "baserom.gba", 0x108B4C, 0x0000010 + .4byte gUnk_08108754 + .incbin "baserom.gba", 0x108B60, 0x0000020 + .4byte gUnk_081086B8 + .incbin "baserom.gba", 0x108B84, 0x0000010 + .4byte gUnk_081086C4 + .incbin "baserom.gba", 0x108B98, 0x0000010 + .4byte gUnk_081086D0 + .incbin "baserom.gba", 0x108BAC, 0x0000066 gUnk_08108C12:: @ 08108C12 .incbin "baserom.gba", 0x108C12, 0x0000016 diff --git a/data/const/manager/manager1F.s b/data/const/manager/manager1F.s index 9dd06cf3..39a7aaa6 100644 --- a/data/const/manager/manager1F.s +++ b/data/const/manager/manager1F.s @@ -5,7 +5,8 @@ .align 2 gUnk_08108C94:: @ 08108C94 - .incbin "baserom.gba", 0x108C94, 0x0000008 + .4byte sub_0805B70C + .4byte sub_0805B744 gUnk_08108C9C:: @ 08108C9C .incbin "baserom.gba", 0x108C9C, 0x000000C diff --git a/data/const/manager/manager2B.s b/data/const/manager/manager2B.s index 9f9096f1..c917c9cc 100644 --- a/data/const/manager/manager2B.s +++ b/data/const/manager/manager2B.s @@ -5,4 +5,6 @@ .align 2 gUnk_08108D30:: @ 08108D30 - .incbin "baserom.gba", 0x108D30, 0x000000C + .4byte sub_0805D02C + .4byte sub_0805D0C4 + .4byte sub_0805D0FC diff --git a/data/const/manager/manager2E.s b/data/const/manager/manager2E.s index 746c7aa1..5c8d9593 100644 --- a/data/const/manager/manager2E.s +++ b/data/const/manager/manager2E.s @@ -5,10 +5,15 @@ .align 2 gUnk_08108D3C:: @ 08108D3C - .incbin "baserom.gba", 0x108D3C, 0x0000008 + .4byte sub_0805D268 + .4byte sub_0805D32C gUnk_08108D44:: @ 08108D44 - .incbin "baserom.gba", 0x108D44, 0x000000C + .4byte sub_0805D280 + .4byte sub_0805D2C0 + .4byte sub_0805D2F4 gUnk_08108D50:: @ 08108D50 - .incbin "baserom.gba", 0x108D50, 0x000000C + .4byte sub_0805D344 + .4byte sub_0805D36C + .4byte sub_0805D384 diff --git a/data/const/npc/dog.s b/data/const/npc/dog.s index 7e02d4c6..2409e3fb 100644 --- a/data/const/npc/dog.s +++ b/data/const/npc/dog.s @@ -30,16 +30,50 @@ gUnk_08111E30:: @ 08111E30 .incbin "baserom.gba", 0x111E30, 0x0000004 gUnk_08111E34:: @ 08111E34 - .incbin "baserom.gba", 0x111E34, 0x00000AD - -gUnk_08111EE1:: @ 08111EE1 - .incbin "baserom.gba", 0x111EE1, 0x0000047 + .incbin "baserom.gba", 0x111E34, 0x00000A4 + .4byte sub_0806A0A4 + .incbin "baserom.gba", 0x111EDC, 0x0000004 + .4byte sub_0806A0A4 + .incbin "baserom.gba", 0x111EE4, 0x0000004 + .4byte sub_0806A0A4 + .incbin "baserom.gba", 0x111EEC, 0x0000004 + .4byte sub_0806A0A4 + .incbin "baserom.gba", 0x111EF4, 0x0000004 + .4byte sub_0806A0A4 + .incbin "baserom.gba", 0x111EFC, 0x0000004 + .4byte sub_0806A0A4 + .incbin "baserom.gba", 0x111F04, 0x0000004 + .4byte sub_0806A0A4 + .incbin "baserom.gba", 0x111F0C, 0x0000004 + .4byte sub_0806A0A4 + .incbin "baserom.gba", 0x111F14, 0x0000004 + .4byte sub_0806A0A4 + .incbin "baserom.gba", 0x111F1C, 0x0000004 + .4byte sub_0806A0A4 + .incbin "baserom.gba", 0x111F24, 0x0000004 gUnk_08111F28:: @ 08111F28 - .incbin "baserom.gba", 0x111F28, 0x0000008 + .4byte sub_0806A144 + .incbin "baserom.gba", 0x111F2C, 0x0000004 gUnk_08111F30:: @ 08111F30 - .incbin "baserom.gba", 0x111F30, 0x0000044 + .4byte sub_0806A144 + .incbin "baserom.gba", 0x111F34, 0x0000004 + .4byte sub_0806A144 + .incbin "baserom.gba", 0x111F3C, 0x0000004 + .4byte sub_0806A144 + .incbin "baserom.gba", 0x111F44, 0x0000004 + .4byte sub_0806A144 + .incbin "baserom.gba", 0x111F4C, 0x0000004 + .4byte sub_0806A144 + .incbin "baserom.gba", 0x111F54, 0x0000004 + .4byte sub_0806A144 + .incbin "baserom.gba", 0x111F5C, 0x0000004 + .4byte sub_0806A144 + .incbin "baserom.gba", 0x111F64, 0x0000004 + .4byte sub_0806A144 + .incbin "baserom.gba", 0x111F6C, 0x0000004 + .4byte sub_0806A144 gUnk_08111F74:: @ 08111F74 .incbin "baserom.gba", 0x111F74, 0x0000064 diff --git a/data/const/npc/forestMinish.s b/data/const/npc/forestMinish.s index b37da717..c3ddcdf0 100644 --- a/data/const/npc/forestMinish.s +++ b/data/const/npc/forestMinish.s @@ -72,7 +72,15 @@ gUnk_08109F97:: @ 08109F97 .incbin "baserom.gba", 0x109F97, 0x00000B1 gUnk_0810A048:: @ 0810A048 - .incbin "baserom.gba", 0x10A048, 0x0000111 + .incbin "baserom.gba", 0x10A048, 0x0000024 + .4byte sub_080601D4 + .incbin "baserom.gba", 0x10A070, 0x0000004 + .4byte sub_080601D4 + .incbin "baserom.gba", 0x10A078, 0x0000004 + .4byte sub_080601D4 + .incbin "baserom.gba", 0x10A080, 0x0000004 + .4byte sub_080601D4 + .incbin "baserom.gba", 0x10A088, 0x00000D1 gUnk_0810A159:: @ 0810A159 .incbin "baserom.gba", 0x10A159, 0x0000048 diff --git a/data/const/npc/moblinLady.s b/data/const/npc/moblinLady.s index bb10c353..fc95a028 100644 --- a/data/const/npc/moblinLady.s +++ b/data/const/npc/moblinLady.s @@ -8,4 +8,5 @@ gUnk_08113004:: @ 08113004 .incbin "baserom.gba", 0x113004, 0x0000020 gUnk_08113024:: @ 08113024 - .incbin "baserom.gba", 0x113024, 0x0000008 + .4byte gUnk_08113004 + .incbin "baserom.gba", 0x113028, 0x0000004 diff --git a/data/const/npc/percy.s b/data/const/npc/percy.s index ee9c5baf..8fc41067 100644 --- a/data/const/npc/percy.s +++ b/data/const/npc/percy.s @@ -8,7 +8,10 @@ gUnk_08112E1C:: @ 08112E1C .incbin "baserom.gba", 0x112E1C, 0x0000010 gUnk_08112E2C:: @ 08112E2C - .incbin "baserom.gba", 0x112E2C, 0x0000028 + .incbin "baserom.gba", 0x112E2C, 0x0000004 + .4byte sub_0806B504 + .incbin "baserom.gba", 0x112E34, 0x000001C + .4byte sub_0806B540 gUnk_08112E54:: @ 08112E54 .incbin "baserom.gba", 0x112E54, 0x0000008 diff --git a/data/const/npc/sittingPerson.s b/data/const/npc/sittingPerson.s index 0ac0e8cd..2ec4e57d 100644 --- a/data/const/npc/sittingPerson.s +++ b/data/const/npc/sittingPerson.s @@ -25,7 +25,39 @@ gUnk_0810CC04:: @ 0810CC04 .incbin "baserom.gba", 0x10CC04, 0x0000004 gUnk_0810CC08:: @ 0810CC08 - .incbin "baserom.gba", 0x10CC08, 0x0000180 + .incbin "baserom.gba", 0x10CC08, 0x00000C4 + .4byte sub_0806387C + .incbin "baserom.gba", 0x10CCD0, 0x0000004 + .4byte sub_0806387C + .incbin "baserom.gba", 0x10CCD8, 0x0000004 + .4byte sub_0806387C + .incbin "baserom.gba", 0x10CCE0, 0x0000004 + .4byte sub_0806387C + .incbin "baserom.gba", 0x10CCE8, 0x0000004 + .4byte sub_0806387C + .incbin "baserom.gba", 0x10CCF0, 0x0000004 + .4byte sub_0806387C + .incbin "baserom.gba", 0x10CCF8, 0x0000004 + .4byte sub_0806387C + .incbin "baserom.gba", 0x10CD00, 0x0000004 + .4byte sub_0806387C + .incbin "baserom.gba", 0x10CD08, 0x0000004 + .4byte sub_0806390C + .incbin "baserom.gba", 0x10CD10, 0x0000004 + .4byte sub_0806390C + .incbin "baserom.gba", 0x10CD18, 0x0000004 + .4byte sub_0806390C + .incbin "baserom.gba", 0x10CD20, 0x0000004 + .4byte sub_0806390C + .incbin "baserom.gba", 0x10CD28, 0x0000004 + .4byte sub_0806390C + .incbin "baserom.gba", 0x10CD30, 0x0000004 + .4byte sub_0806390C + .incbin "baserom.gba", 0x10CD38, 0x0000004 + .4byte sub_0806390C + .incbin "baserom.gba", 0x10CD40, 0x0000004 + .4byte sub_0806390C + .incbin "baserom.gba", 0x10CD48, 0x0000040 gUnk_0810CD88:: @ 0810CD88 .incbin "baserom.gba", 0x10CD88, 0x0000018 diff --git a/data/const/npc/townMinish.s b/data/const/npc/townMinish.s index 221e4476..c4a78657 100644 --- a/data/const/npc/townMinish.s +++ b/data/const/npc/townMinish.s @@ -24,13 +24,105 @@ gUnk_081126E8:: @ 081126E8 .4byte sub_0806AC3C gUnk_081126F0:: @ 081126F0 - .incbin "baserom.gba", 0x1126F0, 0x000024C + .incbin "baserom.gba", 0x1126F0, 0x0000004 + .4byte sub_0806B004 + .incbin "baserom.gba", 0x1126F8, 0x0000004 + .4byte sub_0806B004 + .incbin "baserom.gba", 0x112700, 0x0000004 + .4byte sub_0806B004 + .incbin "baserom.gba", 0x112708, 0x0000004 + .4byte sub_0806B004 + .incbin "baserom.gba", 0x112710, 0x0000004 + .4byte sub_0806B004 + .incbin "baserom.gba", 0x112718, 0x0000004 + .4byte sub_0806B004 + .incbin "baserom.gba", 0x112720, 0x0000004 + .4byte sub_0806B004 + .incbin "baserom.gba", 0x112728, 0x0000004 + .4byte sub_0806B004 + .incbin "baserom.gba", 0x112730, 0x0000004 + .4byte sub_0806B064 + .incbin "baserom.gba", 0x112738, 0x0000004 + .4byte sub_0806B064 + .incbin "baserom.gba", 0x112740, 0x0000004 + .4byte sub_0806B064 + .incbin "baserom.gba", 0x112748, 0x0000004 + .4byte sub_0806B064 + .incbin "baserom.gba", 0x112750, 0x0000004 + .4byte sub_0806B064 + .incbin "baserom.gba", 0x112758, 0x0000004 + .4byte sub_0806B064 + .incbin "baserom.gba", 0x112760, 0x0000004 + .4byte sub_0806B064 + .incbin "baserom.gba", 0x112768, 0x0000004 + .4byte sub_0806B064 + .incbin "baserom.gba", 0x112770, 0x0000144 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x1128B8, 0x0000004 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x1128C0, 0x0000004 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x1128C8, 0x0000004 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x1128D0, 0x0000004 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x1128D8, 0x0000004 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x1128E0, 0x0000004 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x1128E8, 0x0000004 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x1128F0, 0x0000004 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x1128F8, 0x0000004 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x112900, 0x0000004 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x112908, 0x0000004 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x112910, 0x0000004 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x112918, 0x0000004 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x112920, 0x0000004 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x112928, 0x0000004 + .4byte sub_0806B098 + .incbin "baserom.gba", 0x112930, 0x0000004 + .4byte sub_0806B0E0 + .incbin "baserom.gba", 0x112938, 0x0000004 gUnk_0811293C:: @ 0811293C - .incbin "baserom.gba", 0x11293C, 0x0000001 - -gUnk_0811293D:: @ 0811293D - .incbin "baserom.gba", 0x11293D, 0x00002B3 + .4byte sub_0806B0E0 + .incbin "baserom.gba", 0x112940, 0x0000004 + .4byte sub_0806B0E0 + .incbin "baserom.gba", 0x112948, 0x0000004 + .4byte sub_0806B0E0 + .incbin "baserom.gba", 0x112950, 0x0000004 + .4byte sub_0806B0E0 + .incbin "baserom.gba", 0x112958, 0x0000004 + .4byte sub_0806B0E0 + .incbin "baserom.gba", 0x112960, 0x0000004 + .4byte sub_0806B0E0 + .incbin "baserom.gba", 0x112968, 0x0000004 + .4byte sub_0806B0E0 + .incbin "baserom.gba", 0x112970, 0x0000004 + .4byte sub_0806B134 + .incbin "baserom.gba", 0x112978, 0x0000004 + .4byte sub_0806B134 + .incbin "baserom.gba", 0x112980, 0x0000004 + .4byte sub_0806B134 + .incbin "baserom.gba", 0x112988, 0x0000004 + .4byte sub_0806B134 + .incbin "baserom.gba", 0x112990, 0x0000004 + .4byte sub_0806B134 + .incbin "baserom.gba", 0x112998, 0x0000004 + .4byte sub_0806B134 + .incbin "baserom.gba", 0x1129A0, 0x0000004 + .4byte sub_0806B134 + .incbin "baserom.gba", 0x1129A8, 0x0000004 + .4byte sub_0806B134 + .incbin "baserom.gba", 0x1129B0, 0x0000240 gUnk_08112BF0:: @ 08112BF0 .4byte sub_0806B004 diff --git a/data/const/npc/townsperson.s b/data/const/npc/townsperson.s index 185296ac..cb65d071 100644 --- a/data/const/npc/townsperson.s +++ b/data/const/npc/townsperson.s @@ -95,7 +95,9 @@ gUnk_0810BA01:: @ 0810BA01 .incbin "baserom.gba", 0x10BA01, 0x0000117 gUnk_0810BB18:: @ 0810BB18 - .incbin "baserom.gba", 0x10BB18, 0x0000059 + .incbin "baserom.gba", 0x10BB18, 0x0000044 + .4byte sub_0806200C + .incbin "baserom.gba", 0x10BB60, 0x0000011 gUnk_0810BB71:: @ 0810BB71 .incbin "baserom.gba", 0x10BB71, 0x000005B diff --git a/data/const/object/bell.s b/data/const/object/bell.s index 34f1a8a5..6c69eff4 100644 --- a/data/const/object/bell.s +++ b/data/const/object/bell.s @@ -12,4 +12,5 @@ gUnk_0812338C:: @ 0812338C .incbin "baserom.gba", 0x12338C, 0x0000024 gUnk_081233B0:: @ 081233B0 - .incbin "baserom.gba", 0x1233B0, 0x0000008 + .4byte gUnk_0812338C + .incbin "baserom.gba", 0x1233B4, 0x0000004 diff --git a/data/const/object/bird.s b/data/const/object/bird.s index 6d6afb49..4f26d41b 100644 --- a/data/const/object/bird.s +++ b/data/const/object/bird.s @@ -37,4 +37,5 @@ gUnk_08123F0C:: @ 08123F0C .incbin "baserom.gba", 0x123F0C, 0x0000014 gUnk_08123F20:: @ 08123F20 - .incbin "baserom.gba", 0x123F20, 0x0000008 + .4byte gUnk_08123F0C + .incbin "baserom.gba", 0x123F24, 0x0000004 diff --git a/data/const/object/itemOnGround.s b/data/const/object/itemOnGround.s index e17d1d64..453a2575 100644 --- a/data/const/object/itemOnGround.s +++ b/data/const/object/itemOnGround.s @@ -11,16 +11,42 @@ gUnk_0811E7C4:: @ 0811E7C4 .4byte sub_08080910 gUnk_0811E7D4:: @ 0811E7D4 - .incbin "baserom.gba", 0x11E7D4, 0x0000014 + .4byte sub_08080F20 + .4byte sub_080811EC + .4byte sub_0808122C + .4byte sub_08081328 + .4byte sub_0808136C gUnk_0811E7E8:: @ 0811E7E8 - .incbin "baserom.gba", 0x11E7E8, 0x000002C + .4byte sub_080810A8 + .4byte sub_080810FC + .4byte sub_08081150 + .4byte sub_08081134 + .4byte sub_08081188 + .4byte sub_080810A8 + .4byte sub_080810A8 + .4byte sub_080811AC + .4byte sub_080811C8 + .4byte sub_080811D8 + .4byte sub_080810A8 gUnk_0811E814:: @ 0811E814 - .incbin "baserom.gba", 0x11E814, 0x000002C + .4byte sub_08081248 + .4byte sub_08081248 + .4byte sub_0808126C + .4byte sub_0808127C + .4byte nullsub_113 + .4byte sub_080812A0 + .4byte sub_08081248 + .4byte sub_080812A8 + .4byte sub_080812E8 + .4byte nullsub_510 + .4byte sub_08081248 gUnk_0811E840:: @ 0811E840 - .incbin "baserom.gba", 0x11E840, 0x000000C + .4byte sub_080813D4 + .4byte sub_080813E8 + .4byte sub_080813F0 gUnk_0811E84C:: @ 0811E84C .incbin "baserom.gba", 0x11E84C, 0x00000B0 diff --git a/data/const/object/lavaPlatform.s b/data/const/object/lavaPlatform.s index 56e9bd30..7e11d101 100644 --- a/data/const/object/lavaPlatform.s +++ b/data/const/object/lavaPlatform.s @@ -26,4 +26,6 @@ gUnk_08122684:: @ 08122684 .incbin "baserom.gba", 0x122684, 0x0000014 gUnk_08122698:: @ 08122698 - .incbin "baserom.gba", 0x122698, 0x000000C + .4byte gUnk_08122670 + .4byte gUnk_08122684 + .incbin "baserom.gba", 0x1226A0, 0x0000004 diff --git a/data/const/object/object1D.s b/data/const/object/object1D.s index 99b553b5..dfc82433 100644 --- a/data/const/object/object1D.s +++ b/data/const/object/object1D.s @@ -5,7 +5,10 @@ .align 2 gUnk_081208A0:: @ 081208A0 - .incbin "baserom.gba", 0x1208A0, 0x0000008 + .4byte sub_080874F8 + .4byte nullsub_117 gUnk_081208A8:: @ 081208A8 - .incbin "baserom.gba", 0x1208A8, 0x0000010 + .incbin "baserom.gba", 0x1208A8, 0x0000008 + .4byte gUnk_081208A8 + .incbin "baserom.gba", 0x1208B4, 0x0000004 diff --git a/data/const/object/object68.s b/data/const/object/object68.s index 525ba8a1..0204864b 100644 --- a/data/const/object/object68.s +++ b/data/const/object/object68.s @@ -12,7 +12,8 @@ gUnk_08122A18:: @ 08122A18 .incbin "baserom.gba", 0x122A18, 0x0000008 gUnk_08122A20:: @ 08122A20 - .incbin "baserom.gba", 0x122A20, 0x0000008 + .incbin "baserom.gba", 0x122A20, 0x0000004 + .4byte sub_080948E8 gUnk_08122A28:: @ 08122A28 .incbin "baserom.gba", 0x122A28, 0x000000C diff --git a/data/const/object/object93.s b/data/const/object/object93.s index f38c1928..a2c09bf5 100644 --- a/data/const/object/object93.s +++ b/data/const/object/object93.s @@ -12,10 +12,12 @@ gUnk_08123E88:: @ 08123E88 .incbin "baserom.gba", 0x123E88, 0x0000014 gUnk_08123E9C:: @ 08123E9C - .incbin "baserom.gba", 0x123E9C, 0x0000008 + .4byte gUnk_08123E88 + .incbin "baserom.gba", 0x123EA0, 0x0000004 gUnk_08123EA4:: @ 08123EA4 .incbin "baserom.gba", 0x123EA4, 0x0000014 gUnk_08123EB8:: @ 08123EB8 - .incbin "baserom.gba", 0x123EB8, 0x0000008 + .4byte gUnk_08123EA4 + .incbin "baserom.gba", 0x123EBC, 0x0000004 diff --git a/data/const/object/swordsmanNewsletter.s b/data/const/object/swordsmanNewsletter.s index 24d6a10e..770806ef 100644 --- a/data/const/object/swordsmanNewsletter.s +++ b/data/const/object/swordsmanNewsletter.s @@ -8,7 +8,8 @@ gUnk_081228A8:: @ 081228A8 .incbin "baserom.gba", 0x1228A8, 0x0000008 gUnk_081228B0:: @ 081228B0 - .incbin "baserom.gba", 0x1228B0, 0x0000008 + .4byte sub_080933D8 + .4byte sub_080933FC gUnk_081228B8:: @ 081228B8 .incbin "baserom.gba", 0x1228B8, 0x0000010 diff --git a/data/const/playerItem/playerItemBow.s b/data/const/playerItem/playerItemBow.s index 408054aa..84c28f0c 100644 --- a/data/const/playerItem/playerItemBow.s +++ b/data/const/playerItem/playerItemBow.s @@ -11,4 +11,11 @@ gUnk_080B3E30:: @ 080B3E30 .4byte sub_08019444 gUnk_080B3E40:: @ 080B3E40 - .incbin "baserom.gba", 0x0B3E40, 0x0000030 + .incbin "baserom.gba", 0x0B3E40, 0x0000008 + .4byte gUnk_080B3E78 + .incbin "baserom.gba", 0x0B3E4C, 0x0000008 + .4byte gUnk_080B3E70 + .incbin "baserom.gba", 0x0B3E58, 0x0000008 + .4byte gUnk_080B3E78 + .incbin "baserom.gba", 0x0B3E64, 0x0000008 + .4byte gUnk_080B3E70 diff --git a/data/const/projectile/projectile16.s b/data/const/projectile/projectile16.s index 6aa2543d..bc333109 100644 --- a/data/const/projectile/projectile16.s +++ b/data/const/projectile/projectile16.s @@ -20,4 +20,5 @@ gUnk_0812A3E0:: @ 0812A3E0 .incbin "baserom.gba", 0x12A3E0, 0x0000014 gUnk_0812A3F4:: @ 0812A3F4 - .incbin "baserom.gba", 0x12A3F4, 0x0000008 + .4byte gUnk_0812A3E0 + .incbin "baserom.gba", 0x12A3F8, 0x0000004 diff --git a/data/const/projectile/projectile18.s b/data/const/projectile/projectile18.s index dfbac69d..591ae81c 100644 --- a/data/const/projectile/projectile18.s +++ b/data/const/projectile/projectile18.s @@ -13,8 +13,13 @@ gUnk_0812A418:: @ 0812A418 .4byte sub_080AAD70 gUnk_0812A430:: @ 0812A430 - .incbin "baserom.gba", 0x12A430, 0x0000010 + .4byte sub_080AADBC + .4byte sub_080AAE88 + .4byte sub_080AAF00 + .4byte sub_080AAF10 gUnk_0812A440:: @ 0812A440 - .incbin "baserom.gba", 0x12A440, 0x000000C + .4byte sub_080AAD98 + .4byte nullsub_541 + .4byte sub_080AADA4 diff --git a/data/const/projectile/projectileD.s b/data/const/projectile/projectileD.s index 8000f4d2..3290016f 100644 --- a/data/const/projectile/projectileD.s +++ b/data/const/projectile/projectileD.s @@ -19,7 +19,14 @@ gUnk_081299E4:: @ 081299E4 .4byte sub_080A9448 gUnk_081299F8:: @ 081299F8 - .incbin "baserom.gba", 0x1299F8, 0x0000020 + .incbin "baserom.gba", 0x1299F8, 0x0000004 + .4byte gUnk_08129A20 + .incbin "baserom.gba", 0x129A00, 0x0000004 + .4byte gUnk_08129A18 + .incbin "baserom.gba", 0x129A08, 0x0000004 + .4byte gUnk_08129A20 + .incbin "baserom.gba", 0x129A10, 0x0000004 + .4byte gUnk_08129A18 gUnk_08129A18:: @ 08129A18 .incbin "baserom.gba", 0x129A18, 0x0000008 |