falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

main npc funcs named

This commit is contained in:
theo3 2020-06-17 21:25:52 -07:00
parent 268dafde5d
commit 841a20ca2d
88 changed files with 587 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/anju.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0806C2C4 thumb_func_start Anju
sub_0806C2C4: @ 0x0806C2C4 Anju: @ 0x0806C2C4
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]
@ -94,8 +94,8 @@ sub_0806C354: @ 0x0806C354
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_0806C36C thumb_func_start Anju_Fusion
sub_0806C36C: @ 0x0806C36C Anju_Fusion: @ 0x0806C36C
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

8
asm/beedle.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_080632A8 thumb_func_start Beedle
sub_080632A8: @ 0x080632A8 Beedle: @ 0x080632A8
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r1, [r2, #0x10] ldrb r1, [r2, #0x10]
@ -174,8 +174,8 @@ sub_080633C8: @ 0x080633C8
_080633DE: _080633DE:
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_080633E0 thumb_func_start Beedle_Head
sub_080633E0: @ 0x080633E0 Beedle_Head: @ 0x080633E0
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x5a adds r0, #0x5a

8
asm/brocco.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08063524 thumb_func_start Brocco
sub_08063524: @ 0x08063524 Brocco: @ 0x08063524
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r1, [r2, #0x10] ldrb r1, [r2, #0x10]
@ -257,8 +257,8 @@ sub_080636F4: @ 0x080636F4
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_0806370C thumb_func_start Brocco_Fusion
sub_0806370C: @ 0x0806370C Brocco_Fusion: @ 0x0806370C
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

4
asm/carlov.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_0806BD54 thumb_func_start Carlov
sub_0806BD54: @ 0x0806BD54 Carlov: @ 0x0806BD54
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

12
asm/carpenter.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08067158 thumb_func_start Carpenter
sub_08067158: @ 0x08067158 Carpenter: @ 0x08067158
push {r4, r5, lr} push {r4, r5, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x84 adds r0, #0x84
@ -106,8 +106,8 @@ _08067224:
pop {r4, r5, pc} pop {r4, r5, pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_08067228 thumb_func_start Carpenter_Head
sub_08067228: @ 0x08067228 Carpenter_Head: @ 0x08067228
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xa] ldrb r0, [r4, #0xa]
@ -235,8 +235,8 @@ sub_08067314: @ 0x08067314
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_0806732C thumb_func_start Carpenter_Fusion
sub_0806732C: @ 0x0806732C Carpenter_Fusion: @ 0x0806732C
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

8
asm/castleMaid.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08064508 thumb_func_start Maid
sub_08064508: @ 0x08064508 Maid: @ 0x08064508
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r1, [r2, #0x10] ldrb r1, [r2, #0x10]
@ -24,8 +24,8 @@ _0806451E:
_08064522: _08064522:
pop {pc} pop {pc}
thumb_func_start sub_08064524 thumb_func_start Maid_Head
sub_08064524: @ 0x08064524 Maid_Head: @ 0x08064524
push {r4, r5, lr} push {r4, r5, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x5a adds r0, #0x5a

8
asm/castorWildsStatue.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08067380 thumb_func_start CastorWildsStatue
sub_08067380: @ 0x08067380 CastorWildsStatue: @ 0x08067380
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r1, [r4, #0x10] ldrb r1, [r4, #0x10]
@ -511,8 +511,8 @@ _08067748:
.align 2, 0 .align 2, 0
_0806774C: .4byte gUnk_02033280 _0806774C: .4byte gUnk_02033280
thumb_func_start sub_08067750 thumb_func_start CastorWildsStatue_Fusion
sub_08067750: @ 0x08067750 CastorWildsStatue_Fusion: @ 0x08067750
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

4
asm/cat.s
View File

@ -829,8 +829,8 @@ sub_08067DDC: @ 0x08067DDC
.align 2, 0 .align 2, 0
_08067DF8: .4byte gUnk_08110EF0 _08067DF8: .4byte gUnk_08110EF0
thumb_func_start sub_08067DFC thumb_func_start Cat_Fusion
sub_08067DFC: @ 0x08067DFC Cat_Fusion: @ 0x08067DFC
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

8
asm/cucco.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_0806E4A0 thumb_func_start Cucco
sub_0806E4A0: @ 0x0806E4A0 Cucco: @ 0x0806E4A0
push {lr} push {lr}
ldr r2, _0806E4B4 @ =gUnk_081145B4 ldr r2, _0806E4B4 @ =gUnk_081145B4
ldrb r1, [r0, #0xc] ldrb r1, [r0, #0xc]
@ -299,8 +299,8 @@ _0806E6D4: .4byte gUnk_02002A40
_0806E6D8: .4byte 0x000001C1 _0806E6D8: .4byte 0x000001C1
_0806E6DC: .4byte gUnk_081145D0 _0806E6DC: .4byte gUnk_081145D0
thumb_func_start sub_0806E6E0 thumb_func_start Cucco_Fusion
sub_0806E6E0: @ 0x0806E6E0 Cucco_Fusion: @ 0x0806E6E0
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

8
asm/cuccoChick.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_0806E710 thumb_func_start CuccoChick
sub_0806E710: @ 0x0806E710 CuccoChick: @ 0x0806E710
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldr r1, _0806E72C @ =gUnk_081145D4 ldr r1, _0806E72C @ =gUnk_081145D4
@ -211,8 +211,8 @@ sub_0806E884: @ 0x0806E884
.align 2, 0 .align 2, 0
_0806E890: .4byte 0x00000DB6 _0806E890: .4byte 0x00000DB6
thumb_func_start sub_0806E894 thumb_func_start CuccoChick_Fusion
sub_0806E894: @ 0x0806E894 CuccoChick_Fusion: @ 0x0806E894
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

8
asm/dampe.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0806BDAC thumb_func_start Dampe
sub_0806BDAC: @ 0x0806BDAC Dampe: @ 0x0806BDAC
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]
@ -91,8 +91,8 @@ sub_0806BE3C: @ 0x0806BE3C
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_0806BE54 thumb_func_start Dampe_Fusion
sub_0806BE54: @ 0x0806BE54 Dampe_Fusion: @ 0x0806BE54
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

8
asm/din.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08064790 thumb_func_start Din
sub_08064790: @ 0x08064790 Din: @ 0x08064790
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]
@ -111,8 +111,8 @@ _0806484E:
_08064858: .4byte gUnk_02002A40 _08064858: .4byte gUnk_02002A40
_0806485C: .4byte 0x00000141 _0806485C: .4byte 0x00000141
thumb_func_start sub_08064860 thumb_func_start Din_Fusion
sub_08064860: @ 0x08064860 Din_Fusion: @ 0x08064860
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

12
asm/dog.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08069B1C thumb_func_start Dog
sub_08069B1C: @ 0x08069B1C Dog: @ 0x08069B1C
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldr r1, _08069B40 @ =gUnk_08111D88 ldr r1, _08069B40 @ =gUnk_08111D88
@ -539,8 +539,8 @@ _08069F28:
_08069F2A: _08069F2A:
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_08069F2C thumb_func_start Dog_Head
sub_08069F2C: @ 0x08069F2C Dog_Head: @ 0x08069F2C
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x5a adds r0, #0x5a
@ -851,8 +851,8 @@ _0806A17A:
_0806A18C: .4byte gLinkState _0806A18C: .4byte gLinkState
_0806A190: .4byte gUnk_08111FD8 _0806A190: .4byte gUnk_08111FD8
thumb_func_start sub_0806A194 thumb_func_start Dog_Fusion
sub_0806A194: @ 0x0806A194 Dog_Fusion: @ 0x0806A194
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

4
asm/drLeft.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_0806BF80 thumb_func_start DrLeft
sub_0806BF80: @ 0x0806BF80 DrLeft: @ 0x0806BF80
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xa] ldrb r0, [r4, #0xa]

12
asm/ezloCap.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0806D86C thumb_func_start EzloCap
sub_0806D86C: @ 0x0806D86C EzloCap: @ 0x0806D86C
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]
@ -194,8 +194,8 @@ _0806D9C6:
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_0806D9D0 thumb_func_start NPC4E
sub_0806D9D0: @ 0x0806D9D0 NPC4E: @ 0x0806D9D0
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]
@ -594,8 +594,8 @@ sub_0806DCC0: @ 0x0806DCC0
.align 2, 0 .align 2, 0
_0806DCD0: .4byte gUnk_030010A0 _0806DCD0: .4byte gUnk_030010A0
thumb_func_start sub_0806DCD4 thumb_func_start NPC4E_Fusion
sub_0806DCD4: @ 0x0806DCD4 NPC4E_Fusion: @ 0x0806DCD4
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

12
asm/farmers.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0806BBE4 thumb_func_start Farmers
sub_0806BBE4: @ 0x0806BBE4 Farmers: @ 0x0806BBE4
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]
@ -74,8 +74,8 @@ sub_0806BC58: @ 0x0806BC58
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_0806BC64 thumb_func_start Farmers_Head
sub_0806BC64: @ 0x0806BC64 Farmers_Head: @ 0x0806BC64
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x5a adds r0, #0x5a
@ -160,8 +160,8 @@ sub_0806BCE8: @ 0x0806BCE8
.align 2, 0 .align 2, 0
_0806BCF8: .4byte gUnk_08113158 _0806BCF8: .4byte gUnk_08113158
thumb_func_start sub_0806BCFC thumb_func_start Farmers_Fusion
sub_0806BCFC: @ 0x0806BCFC Farmers_Fusion: @ 0x0806BCFC
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

8
asm/farore.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08064990 thumb_func_start Farore
sub_08064990: @ 0x08064990 Farore: @ 0x08064990
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]
@ -111,8 +111,8 @@ _08064A4E:
_08064A58: .4byte gUnk_02002A40 _08064A58: .4byte gUnk_02002A40
_08064A5C: .4byte 0x00000141 _08064A5C: .4byte 0x00000141
thumb_func_start sub_08064A60 thumb_func_start Farore_Fusion
sub_08064A60: @ 0x08064A60 Farore_Fusion: @ 0x08064A60
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

4
asm/festari.s
View File

@ -219,8 +219,8 @@ _0805FF94:
pop {r4, r5, r6, pc} pop {r4, r5, r6, pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_0805FFA0 thumb_func_start Festari_Fusion
sub_0805FFA0: @ 0x0805FFA0 Festari_Fusion: @ 0x0805FFA0
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

12
asm/forestMinish.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_0805FFD8 thumb_func_start ForestMinish
sub_0805FFD8: @ 0x0805FFD8 ForestMinish: @ 0x0805FFD8
push {r4, r5, lr} push {r4, r5, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r5, [r4, #0xc] ldrb r5, [r4, #0xc]
@ -110,8 +110,8 @@ sub_08060090: @ 0x08060090
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_080600A8 thumb_func_start ForestMinish_Head
sub_080600A8: @ 0x080600A8 ForestMinish_Head: @ 0x080600A8
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x5a adds r0, #0x5a
@ -523,8 +523,8 @@ _080603B0:
_080603B2: _080603B2:
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_080603B4 thumb_func_start ForestMinish_Fusion
sub_080603B4: @ 0x080603B4 ForestMinish_Fusion: @ 0x080603B4
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

8
asm/fusionMenuNPC.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_0806E8CC thumb_func_start FusionMenuNPC
sub_0806E8CC: @ 0x0806E8CC FusionMenuNPC: @ 0x0806E8CC
push {lr} push {lr}
adds r3, r0, #0 adds r3, r0, #0
ldr r2, _0806E8EC @ =gNPCFunctions ldr r2, _0806E8EC @ =gNPCFunctions
@ -31,8 +31,8 @@ _0806E8F4:
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_0806E8F8 thumb_func_start FusionMenuNPC_Head
sub_0806E8F8: @ 0x0806E8F8 FusionMenuNPC_Head: @ 0x0806E8F8
push {lr} push {lr}
adds r3, r0, #0 adds r3, r0, #0
ldr r2, _0806E918 @ =gNPCFunctions ldr r2, _0806E918 @ =gNPCFunctions

12
asm/gentari.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0805FD24 thumb_func_start Gentari
sub_0805FD24: @ 0x0805FD24 Gentari: @ 0x0805FD24
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]
@ -84,8 +84,8 @@ _0805FDBC:
pop {r4, pc} pop {r4, pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_0805FDC0 thumb_func_start Gentari_Fusion
sub_0805FDC0: @ 0x0805FDC0 Gentari_Fusion: @ 0x0805FDC0
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]
@ -114,8 +114,8 @@ _0805FDF4:
pop {r4, pc} pop {r4, pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_0805FDF8 thumb_func_start Festari
sub_0805FDF8: @ 0x0805FDF8 Festari: @ 0x0805FDF8
push {lr} push {lr}
ldr r2, _0805FE0C @ =gUnk_08109BBC ldr r2, _0805FE0C @ =gUnk_08109BBC
ldrb r1, [r0, #0xc] ldrb r1, [r0, #0xc]

8
asm/ghostBrothers.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08065BA4 thumb_func_start GhostBrothers
sub_08065BA4: @ 0x08065BA4 GhostBrothers: @ 0x08065BA4
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r1, [r4, #0x10] ldrb r1, [r4, #0x10]
@ -525,8 +525,8 @@ _08065F74:
_08065F88: .4byte gUnk_02002A40 _08065F88: .4byte gUnk_02002A40
_08065F8C: .4byte gUnk_08110280 _08065F8C: .4byte gUnk_08110280
thumb_func_start sub_08065F90 thumb_func_start GhostBrothers_Fusion
sub_08065F90: @ 0x08065F90 GhostBrothers_Fusion: @ 0x08065F90
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

8
asm/gina.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0806C13C thumb_func_start Gina
sub_0806C13C: @ 0x0806C13C Gina: @ 0x0806C13C
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]
@ -82,8 +82,8 @@ _0806C1BE:
_0806C1D2: _0806C1D2:
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_0806C1D4 thumb_func_start Gina_Fusion
sub_0806C1D4: @ 0x0806C1D4 Gina_Fusion: @ 0x0806C1D4
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

8
asm/gorman.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08069784 thumb_func_start Gorman
sub_08069784: @ 0x08069784 Gorman: @ 0x08069784
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r1, [r2, #0x10] ldrb r1, [r2, #0x10]
@ -453,8 +453,8 @@ _08069AE4:
str r0, [r2, #0x14] str r0, [r2, #0x14]
pop {pc} pop {pc}
thumb_func_start sub_08069AE8 thumb_func_start Gorman_Head
sub_08069AE8: @ 0x08069AE8 Gorman_Head: @ 0x08069AE8
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x5a adds r0, #0x5a

4
asm/goronMerchant.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08069544 thumb_func_start GoronMerchant
sub_08069544: @ 0x08069544 GoronMerchant: @ 0x08069544
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r1, [r4, #0x10] ldrb r1, [r4, #0x10]

8
asm/gregal.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0806CADC thumb_func_start Gregal
sub_0806CADC: @ 0x0806CADC Gregal: @ 0x0806CADC
push {lr} push {lr}
ldr r2, _0806CAF0 @ =gUnk_08113D8C ldr r2, _0806CAF0 @ =gUnk_08113D8C
ldrb r1, [r0, #0xa] ldrb r1, [r0, #0xa]
@ -355,8 +355,8 @@ sub_0806CD58: @ 0x0806CD58
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_0806CD70 thumb_func_start Gregal_Fusion
sub_0806CD70: @ 0x0806CD70 Gregal_Fusion: @ 0x0806CD70
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

8
asm/guardWithSpear.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08063CF8 thumb_func_start Guard
sub_08063CF8: @ 0x08063CF8 Guard: @ 0x08063CF8
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r1, [r2, #0x10] ldrb r1, [r2, #0x10]
@ -358,8 +358,8 @@ _08063FA6:
.align 2, 0 .align 2, 0
_08063FA8: .4byte gTextBox _08063FA8: .4byte gTextBox
thumb_func_start sub_08063FAC thumb_func_start Guard_Head
sub_08063FAC: @ 0x08063FAC Guard_Head: @ 0x08063FAC
push {r4, r5, r6, lr} push {r4, r5, r6, lr}
adds r6, r0, #0 adds r6, r0, #0
adds r0, #0x5a adds r0, #0x5a

12
asm/hurdyGurdyMan.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_0806E308 thumb_func_start HurdyGurdyMan
sub_0806E308: @ 0x0806E308 HurdyGurdyMan: @ 0x0806E308
push {r4, r5, lr} push {r4, r5, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r5, [r4, #0xc] ldrb r5, [r4, #0xc]
@ -112,8 +112,8 @@ _0806E3E0:
pop {r4, r5, pc} pop {r4, r5, pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_0806E3E4 thumb_func_start HurdyGurdyMan_Head
sub_0806E3E4: @ 0x0806E3E4 HurdyGurdyMan_Head: @ 0x0806E3E4
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x5a adds r0, #0x5a
@ -171,8 +171,8 @@ sub_0806E440: @ 0x0806E440
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_0806E458 thumb_func_start HurdyGurdyMan_Fusion
sub_0806E458: @ 0x0806E458 HurdyGurdyMan_Fusion: @ 0x0806E458
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

12
asm/kid.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_080620C8 thumb_func_start Kid
sub_080620C8: @ 0x080620C8 Kid: @ 0x080620C8
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r1, [r2, #0x10] ldrb r1, [r2, #0x10]
@ -973,8 +973,8 @@ _08062828: .4byte 0x0000064B
_0806282C: .4byte 0x0000064C _0806282C: .4byte 0x0000064C
_08062830: .4byte 0x0000064D _08062830: .4byte 0x0000064D
thumb_func_start sub_08062834 thumb_func_start Kid_Head
sub_08062834: @ 0x08062834 Kid_Head: @ 0x08062834
push {r4, r5, r6, r7, lr} push {r4, r5, r6, r7, lr}
adds r5, r0, #0 adds r5, r0, #0
ldrb r4, [r5, #0xa] ldrb r4, [r5, #0xa]
@ -1249,8 +1249,8 @@ sub_08062A48: @ 0x08062A48
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_08062A60 thumb_func_start Kid_Fusion
sub_08062A60: @ 0x08062A60 Kid_Fusion: @ 0x08062A60
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

8
asm/kingDaltus.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_080665E4 thumb_func_start KingDaltus
sub_080665E4: @ 0x080665E4 KingDaltus: @ 0x080665E4
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r1, [r4, #0x10] ldrb r1, [r4, #0x10]
@ -227,8 +227,8 @@ _0806676A:
.align 2, 0 .align 2, 0
_0806677C: .4byte gUnk_081104F8 _0806677C: .4byte gUnk_081104F8
thumb_func_start sub_08066780 thumb_func_start KingDaltus_Fusion
sub_08066780: @ 0x08066780 KingDaltus_Fusion: @ 0x08066780
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

4
asm/kingGustaf.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_0806C0B0 thumb_func_start KingGustaf
sub_0806C0B0: @ 0x0806C0B0 KingGustaf: @ 0x0806C0B0
push {r4, r5, lr} push {r4, r5, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

12
asm/librari.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0806B1CC thumb_func_start Librari
sub_0806B1CC: @ 0x0806B1CC Librari: @ 0x0806B1CC
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]
@ -181,8 +181,8 @@ _0806B316:
.align 2, 0 .align 2, 0
_0806B328: .4byte gUnk_08112D50 _0806B328: .4byte gUnk_08112D50
thumb_func_start sub_0806B32C thumb_func_start Librari_Fusion
sub_0806B32C: @ 0x0806B32C Librari_Fusion: @ 0x0806B32C
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]
@ -208,8 +208,8 @@ _0806B358:
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_0806B35C thumb_func_start Percy_Head
sub_0806B35C: @ 0x0806B35C Percy_Head: @ 0x0806B35C
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x5b adds r0, #0x5b

4
asm/librarians.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0806B9F0 thumb_func_start Librarians
sub_0806B9F0: @ 0x0806B9F0 Librarians: @ 0x0806B9F0
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

12
asm/mama.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0806C39C thumb_func_start Mama
sub_0806C39C: @ 0x0806C39C Mama: @ 0x0806C39C
push {r4, r5, lr} push {r4, r5, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r5, [r4, #0xc] ldrb r5, [r4, #0xc]
@ -117,8 +117,8 @@ _0806C474:
_0806C476: _0806C476:
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_0806C478 thumb_func_start Mama_Head
sub_0806C478: @ 0x0806C478 Mama_Head: @ 0x0806C478
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x5a adds r0, #0x5a
@ -196,8 +196,8 @@ sub_0806C4F8: @ 0x0806C4F8
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_0806C510 thumb_func_start Mama_Fusion
sub_0806C510: @ 0x0806C510 Mama_Fusion: @ 0x0806C510
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

4
asm/marcy.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08062CF0 thumb_func_start Marcy
sub_08062CF0: @ 0x08062CF0 Marcy: @ 0x08062CF0
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

8
asm/mayorHagen.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0806CDA8 thumb_func_start MayorHagen
sub_0806CDA8: @ 0x0806CDA8 MayorHagen: @ 0x0806CDA8
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r1, [r4, #0xc] ldrb r1, [r4, #0xc]
@ -164,8 +164,8 @@ _0806CED6:
.align 2, 0 .align 2, 0
_0806CEE4: .4byte gUnk_08113F48 _0806CEE4: .4byte gUnk_08113F48
thumb_func_start sub_0806CEE8 thumb_func_start MayorHagen_Fusion
sub_0806CEE8: @ 0x0806CEE8 MayorHagen_Fusion: @ 0x0806CEE8
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

12
asm/melari.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_080686D4 thumb_func_start Melari
sub_080686D4: @ 0x080686D4 Melari: @ 0x080686D4
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r1, [r4, #0x10] ldrb r1, [r4, #0x10]
@ -233,8 +233,8 @@ sub_08068884: @ 0x08068884
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_0806889C thumb_func_start Melari_Head
sub_0806889C: @ 0x0806889C Melari_Head: @ 0x0806889C
push {r4, r5, lr} push {r4, r5, lr}
adds r5, r0, #0 adds r5, r0, #0
adds r0, #0x5a adds r0, #0x5a
@ -346,8 +346,8 @@ sub_08068964: @ 0x08068964
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_0806897C thumb_func_start Melari_Fusion
sub_0806897C: @ 0x0806897C Melari_Fusion: @ 0x0806897C
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

8
asm/minishEzlo.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08062F70 thumb_func_start MinishEzlo
sub_08062F70: @ 0x08062F70 MinishEzlo: @ 0x08062F70
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]
@ -67,8 +67,8 @@ _08062FE4:
_08062FE8: .4byte gUnk_0810C48C _08062FE8: .4byte gUnk_0810C48C
_08062FEC: .4byte 0x000001CF _08062FEC: .4byte 0x000001CF
thumb_func_start sub_08062FF0 thumb_func_start MinishEzlo_Head
sub_08062FF0: @ 0x08062FF0 MinishEzlo_Head: @ 0x08062FF0
push {r4, r5, r6, r7, lr} push {r4, r5, r6, r7, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x5b adds r0, #0x5b

8
asm/ministerPotho.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_080667B0 thumb_func_start MinisterPotho
sub_080667B0: @ 0x080667B0 MinisterPotho: @ 0x080667B0
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r1, [r4, #0x10] ldrb r1, [r4, #0x10]
@ -223,8 +223,8 @@ _08066932:
.align 2, 0 .align 2, 0
_08066944: .4byte gUnk_08110650 _08066944: .4byte gUnk_08110650
thumb_func_start sub_08066948 thumb_func_start MinisterPotho_Fusion
sub_08066948: @ 0x08066948 MinisterPotho_Fusion: @ 0x08066948
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

4
asm/moblinLady.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_0806B9D0 thumb_func_start MoblinLady
sub_0806B9D0: @ 0x0806B9D0 MoblinLady: @ 0x0806B9D0
push {lr} push {lr}
adds r1, r0, #0 adds r1, r0, #0
ldrb r0, [r1, #0xc] ldrb r0, [r1, #0xc]

12
asm/mountainMinish.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08067E2C thumb_func_start MountainMinish
sub_08067E2C: @ 0x08067E2C MountainMinish: @ 0x08067E2C
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r1, [r4, #0x10] ldrb r1, [r4, #0x10]
@ -484,8 +484,8 @@ sub_080681D8: @ 0x080681D8
bx lr bx lr
.align 2, 0 .align 2, 0
thumb_func_start sub_080681E0 thumb_func_start MountainMinish_Head
sub_080681E0: @ 0x080681E0 MountainMinish_Head: @ 0x080681E0
push {r4, r5, lr} push {r4, r5, lr}
adds r5, r0, #0 adds r5, r0, #0
adds r0, #0x5a adds r0, #0x5a
@ -552,8 +552,8 @@ _08068268:
bl sub_0807000C bl sub_0807000C
pop {r4, r5, pc} pop {r4, r5, pc}
thumb_func_start sub_08068270 thumb_func_start MountainMinish_Fusion
sub_08068270: @ 0x08068270 MountainMinish_Fusion: @ 0x08068270
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

12
asm/mutoh.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08066FD8 thumb_func_start Mutoh
sub_08066FD8: @ 0x08066FD8 Mutoh: @ 0x08066FD8
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x84 adds r0, #0x84
@ -90,8 +90,8 @@ _0806707C:
pop {r4, pc} pop {r4, pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_08067080 thumb_func_start Mutoh_Head
sub_08067080: @ 0x08067080 Mutoh_Head: @ 0x08067080
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x5a adds r0, #0x5a
@ -167,8 +167,8 @@ sub_08067100: @ 0x08067100
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_08067118 thumb_func_start Mutoh_Fusion
sub_08067118: @ 0x08067118 Mutoh_Fusion: @ 0x08067118
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

8
asm/nayru.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08064890 thumb_func_start Nayru
sub_08064890: @ 0x08064890 Nayru: @ 0x08064890
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]
@ -111,8 +111,8 @@ _0806494E:
_08064958: .4byte gUnk_02002A40 _08064958: .4byte gUnk_02002A40
_0806495C: .4byte 0x00000141 _0806495C: .4byte 0x00000141
thumb_func_start sub_08064960 thumb_func_start Nayru_Fusion
sub_08064960: @ 0x08064960 Nayru_Fusion: @ 0x08064960
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

4
asm/npc23.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_080662D8 thumb_func_start NPC23
sub_080662D8: @ 0x080662D8 NPC23: @ 0x080662D8
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldr r1, _080662F4 @ =gUnk_081104C8 ldr r1, _080662F4 @ =gUnk_081104C8

4
asm/npc26.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08066978 thumb_func_start NPC26
sub_08066978: @ 0x08066978 NPC26: @ 0x08066978
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r1, [r4, #0x10] ldrb r1, [r4, #0x10]

4
asm/npc4E.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_0806DD44 thumb_func_start NPC4F
sub_0806DD44: @ 0x0806DD44 NPC4F: @ 0x0806DD44
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

4
asm/npc5.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_080609E8 thumb_func_start NPC5
sub_080609E8: @ 0x080609E8 NPC5: @ 0x080609E8
push {lr} push {lr}
ldr r2, _080609FC @ =gUnk_0810AC1C ldr r2, _080609FC @ =gUnk_0810AC1C
ldrb r1, [r0, #0xa] ldrb r1, [r0, #0xa]

8
asm/npc58.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_0806EAF4 thumb_func_start NPC58
sub_0806EAF4: @ 0x0806EAF4 NPC58: @ 0x0806EAF4
push {r4, r5, r6, r7, lr} push {r4, r5, r6, r7, lr}
adds r6, r0, #0 adds r6, r0, #0
ldrb r0, [r6, #0xc] ldrb r0, [r6, #0xc]
@ -95,8 +95,8 @@ _0806EBA8:
pop {r4, r5, r6, r7, pc} pop {r4, r5, r6, r7, pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_0806EBAC thumb_func_start NPC58_Head
sub_0806EBAC: @ 0x0806EBAC NPC58_Head: @ 0x0806EBAC
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
movs r0, #0xff movs r0, #0xff

4
asm/npc9.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08062AD8 thumb_func_start NPC9
sub_08062AD8: @ 0x08062AD8 NPC9: @ 0x08062AD8
push {lr} push {lr}
ldr r2, _08062AEC @ =gUnk_0810C290 ldr r2, _08062AEC @ =gUnk_0810C290
ldrb r1, [r0, #0xc] ldrb r1, [r0, #0xc]

8
asm/percy.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0806B3AC thumb_func_start Percy
sub_0806B3AC: @ 0x0806B3AC Percy: @ 0x0806B3AC
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r1, [r2, #0x10] ldrb r1, [r2, #0x10]
@ -326,8 +326,8 @@ sub_0806B60C: @ 0x0806B60C
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_0806B624 thumb_func_start Percy_Fusion
sub_0806B624: @ 0x0806B624 Percy_Fusion: @ 0x0806B624
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

4
asm/phonograph.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_0806E91C thumb_func_start Phonograph
sub_0806E91C: @ 0x0806E91C Phonograph: @ 0x0806E91C
push {r4, r5, lr} push {r4, r5, lr}
adds r5, r0, #0 adds r5, r0, #0
ldrb r0, [r5, #0xc] ldrb r0, [r5, #0xc]

4
asm/picolyteBottles.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0806DED0 thumb_func_start PicolyteBottle
sub_0806DED0: @ 0x0806DED0 PicolyteBottle: @ 0x0806DED0
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldr r1, _0806DEF8 @ =gUnk_081142BC ldr r1, _0806DEF8 @ =gUnk_081142BC

8
asm/pina.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08063A60 thumb_func_start Pina
sub_08063A60: @ 0x08063A60 Pina: @ 0x08063A60
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r1, [r2, #0x10] ldrb r1, [r2, #0x10]
@ -329,8 +329,8 @@ sub_08063CAC: @ 0x08063CAC
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_08063CC4 thumb_func_start Pina_Fusion
sub_08063CC4: @ 0x08063CC4 Pina_Fusion: @ 0x08063CC4
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

4
asm/pita.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08062E60 thumb_func_start Pita
sub_08062E60: @ 0x08062E60 Pita: @ 0x08062E60
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

8
asm/postman.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_080603FC thumb_func_start Postman
sub_080603FC: @ 0x080603FC Postman: @ 0x080603FC
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r1, [r2, #0x10] ldrb r1, [r2, #0x10]
@ -720,8 +720,8 @@ _08060970:
_08060974: .4byte gLinkEntity _08060974: .4byte gLinkEntity
_08060978: .4byte gUnk_0810AA70 _08060978: .4byte gUnk_0810AA70
thumb_func_start sub_0806097C thumb_func_start Postman_Fusion
sub_0806097C: @ 0x0806097C Postman_Fusion: @ 0x0806097C
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

12
asm/sittingPerson.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08063740 thumb_func_start SittingPerson
sub_08063740: @ 0x08063740 SittingPerson: @ 0x08063740
push {lr} push {lr}
ldr r2, _08063754 @ =gUnk_0810CBD8 ldr r2, _08063754 @ =gUnk_0810CBD8
ldrb r1, [r0, #0xc] ldrb r1, [r0, #0xc]
@ -295,8 +295,8 @@ _08063958:
_0806396C: .4byte gUnk_02002A40 _0806396C: .4byte gUnk_02002A40
_08063970: .4byte gUnk_0810CC08 _08063970: .4byte gUnk_0810CC08
thumb_func_start sub_08063974 thumb_func_start SittingPerson_Head
sub_08063974: @ 0x08063974 SittingPerson_Head: @ 0x08063974
push {r4, r5, lr} push {r4, r5, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r5, [r4, #0xa] ldrb r5, [r4, #0xa]
@ -351,8 +351,8 @@ sub_080639D0: @ 0x080639D0
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_080639E8 thumb_func_start SittingPerson_Fusion
sub_080639E8: @ 0x080639E8 SittingPerson_Fusion: @ 0x080639E8
push {r4, r5, lr} push {r4, r5, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

4
asm/smallTownMinish.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_0806E278 thumb_func_start SmallTownMinish
sub_0806E278: @ 0x0806E278 SmallTownMinish: @ 0x0806E278
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

12
asm/smith.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08065FC0 thumb_func_start Smith
sub_08065FC0: @ 0x08065FC0 Smith: @ 0x08065FC0
push {r4, r5, r6, lr} push {r4, r5, r6, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r1, [r4, #0x10] ldrb r1, [r4, #0x10]
@ -120,8 +120,8 @@ _080660A0:
.align 2, 0 .align 2, 0
_080660A4: .4byte gUnk_08110380 _080660A4: .4byte gUnk_08110380
thumb_func_start sub_080660A8 thumb_func_start Smith_Head
sub_080660A8: @ 0x080660A8 Smith_Head: @ 0x080660A8
push {r4, r5, lr} push {r4, r5, lr}
adds r5, r0, #0 adds r5, r0, #0
adds r0, #0x5a adds r0, #0x5a
@ -390,8 +390,8 @@ sub_08066288: @ 0x08066288
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_08066298 thumb_func_start Smith_Fusion
sub_08066298: @ 0x08066298 Smith_Fusion: @ 0x08066298
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

4
asm/stockwell.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08065054 thumb_func_start Stockwell
sub_08065054: @ 0x08065054 Stockwell: @ 0x08065054
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldr r1, _0806507C @ =gUnk_0810FDA4 ldr r1, _0806507C @ =gUnk_0810FDA4

12
asm/sturgeon.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08064A90 thumb_func_start Sturgeon
sub_08064A90: @ 0x08064A90 Sturgeon: @ 0x08064A90
push {r4, r5, lr} push {r4, r5, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r1, [r4, #0x10] ldrb r1, [r4, #0x10]
@ -245,8 +245,8 @@ _08064C68:
pop {r4, pc} pop {r4, pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_08064C6C thumb_func_start Sturgeon_Head
sub_08064C6C: @ 0x08064C6C Sturgeon_Head: @ 0x08064C6C
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x5a adds r0, #0x5a
@ -340,8 +340,8 @@ sub_08064D10: @ 0x08064D10
bx lr bx lr
.align 2, 0 .align 2, 0
thumb_func_start sub_08064D18 thumb_func_start Sturgeon_Fusion
sub_08064D18: @ 0x08064D18 Sturgeon_Fusion: @ 0x08064D18
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

4
asm/syrup.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_0806A2B4 thumb_func_start Syrup_Head
sub_0806A2B4: @ 0x0806A2B4 Syrup_Head: @ 0x0806A2B4
push {r4, r5, r6, lr} push {r4, r5, r6, lr}
mov r6, sb mov r6, sb
mov r5, r8 mov r5, r8

12
asm/teachers.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0806C5A8 thumb_func_start Teachers
sub_0806C5A8: @ 0x0806C5A8 Teachers: @ 0x0806C5A8
push {r4, r5, lr} push {r4, r5, lr}
adds r5, r0, #0 adds r5, r0, #0
ldrb r4, [r5, #0xc] ldrb r4, [r5, #0xc]
@ -119,8 +119,8 @@ sub_0806C674: @ 0x0806C674
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_0806C68C thumb_func_start Teachers_Head
sub_0806C68C: @ 0x0806C68C Teachers_Head: @ 0x0806C68C
push {r4, r5, r6, lr} push {r4, r5, r6, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x5a adds r0, #0x5a
@ -202,8 +202,8 @@ _0806C71C:
_0806C730: .4byte gUnk_02002A40 _0806C730: .4byte gUnk_02002A40
_0806C734: .4byte gUnk_08113930 _0806C734: .4byte gUnk_08113930
thumb_func_start sub_0806C738 thumb_func_start Teachers_Fusion
sub_0806C738: @ 0x0806C738 Teachers_Fusion: @ 0x0806C738
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

8
asm/tingleSiblings.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08064D58 thumb_func_start TingleSiblings
sub_08064D58: @ 0x08064D58 TingleSiblings: @ 0x08064D58
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r1, [r2, #0x10] ldrb r1, [r2, #0x10]
@ -377,8 +377,8 @@ _08065016:
mov r8, r3 mov r8, r3
pop {r4, r5, r6, r7, pc} pop {r4, r5, r6, r7, pc}
thumb_func_start sub_0806501C thumb_func_start TingleSiblings_Fusion
sub_0806501C: @ 0x0806501C TingleSiblings_Fusion: @ 0x0806501C
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r0, [r2, #0xc] ldrb r0, [r2, #0xc]

8
asm/townMinish.s
View File

@ -241,8 +241,8 @@ sub_0806ADFC: @ 0x0806ADFC
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_0806AE0C thumb_func_start TownMinish_Head
sub_0806AE0C: @ 0x0806AE0C TownMinish_Head: @ 0x0806AE0C
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r1, [r4, #0x10] ldrb r1, [r4, #0x10]
@ -702,8 +702,8 @@ _0806B16A:
_0806B17C: .4byte gUnk_02002A40 _0806B17C: .4byte gUnk_02002A40
_0806B180: .4byte gUnk_08112C60 _0806B180: .4byte gUnk_08112C60
thumb_func_start sub_0806B184 thumb_func_start TownMinish_Fusion
sub_0806B184: @ 0x0806B184 TownMinish_Fusion: @ 0x0806B184
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

12
asm/townsperson.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08061B8C thumb_func_start Townsperson
sub_08061B8C: @ 0x08061B8C Townsperson: @ 0x08061B8C
push {lr} push {lr}
adds r2, r0, #0 adds r2, r0, #0
ldrb r1, [r2, #0x10] ldrb r1, [r2, #0x10]
@ -118,8 +118,8 @@ _08061C58:
.align 2, 0 .align 2, 0
_08061C5C: .4byte 0x00000A01 _08061C5C: .4byte 0x00000A01
thumb_func_start sub_08061C60 thumb_func_start Townsperson_Head
sub_08061C60: @ 0x08061C60 Townsperson_Head: @ 0x08061C60
push {r4, r5, lr} push {r4, r5, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x58 adds r0, #0x58
@ -674,8 +674,8 @@ _08062084:
pop {pc} pop {pc}
.align 2, 0 .align 2, 0
thumb_func_start sub_08062088 thumb_func_start Townsperson_Fusion
sub_08062088: @ 0x08062088 Townsperson_Fusion: @ 0x08062088
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

4
asm/vaati.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_08066A5C thumb_func_start Vaati
sub_08066A5C: @ 0x08066A5C Vaati: @ 0x08066A5C
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldr r1, _08066A90 @ =gUnk_08110734 ldr r1, _08066A90 @ =gUnk_08110734

4
asm/vaatiReborn.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0806B664 thumb_func_start VaatiReborn
sub_0806B664: @ 0x0806B664 VaatiReborn: @ 0x0806B664
push {lr} push {lr}
ldr r2, _0806B678 @ =gUnk_08112F78 ldr r2, _0806B678 @ =gUnk_08112F78
ldrb r1, [r0, #0xc] ldrb r1, [r0, #0xc]

4
asm/wheaton.s
View File

@ -6,8 +6,8 @@
.text .text
thumb_func_start sub_08062E20 thumb_func_start Wheaton
sub_08062E20: @ 0x08062E20 Wheaton: @ 0x08062E20
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

12
asm/windTribespeople.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_0806C780 thumb_func_start WindTribespeople
sub_0806C780: @ 0x0806C780 WindTribespeople: @ 0x0806C780
push {lr} push {lr}
ldr r2, _0806C794 @ =gUnk_08113A7C ldr r2, _0806C794 @ =gUnk_08113A7C
ldrb r1, [r0, #0xc] ldrb r1, [r0, #0xc]
@ -146,8 +146,8 @@ sub_0806C870: @ 0x0806C870
bl sub_08078784 bl sub_08078784
pop {r4, pc} pop {r4, pc}
thumb_func_start sub_0806C888 thumb_func_start WindTribespeople_Head
sub_0806C888: @ 0x0806C888 WindTribespeople_Head: @ 0x0806C888
push {r4, r5, r6, r7, lr} push {r4, r5, r6, r7, lr}
adds r4, r0, #0 adds r4, r0, #0
adds r0, #0x5a adds r0, #0x5a
@ -421,8 +421,8 @@ _0806CA8A:
_0806CA8C: .4byte gUnk_08113B38 _0806CA8C: .4byte gUnk_08113B38
_0806CA90: .4byte gUnk_02033280 _0806CA90: .4byte gUnk_02033280
thumb_func_start sub_0806CA94 thumb_func_start WindTribespeople_Fusion
sub_0806CA94: @ 0x0806CA94 WindTribespeople_Fusion: @ 0x0806CA94
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

4
asm/zeldaFollower.s
View File

@ -7,8 +7,8 @@
.text .text
thumb_func_start sub_080682B0 thumb_func_start ZeldaFollower
sub_080682B0: @ 0x080682B0 ZeldaFollower: @ 0x080682B0
push {r4, lr} push {r4, lr}
adds r4, r0, #0 adds r4, r0, #0
ldrb r0, [r4, #0xc] ldrb r0, [r4, #0xc]

324
include/npc.h
View File

@ -10,169 +10,169 @@ typedef struct {
u8 unk; u8 unk;
} SpriteLoadData; } SpriteLoadData;
extern void sub_0805FD24(Entity*); extern void Gentari(Entity*);
extern void sub_0805FDC0(Entity*); extern void Gentari_Fusion(Entity*);
extern void sub_0805FDF8(Entity*); extern void Festari(Entity*);
extern void sub_0805FFA0(Entity*); extern void Festari_Fusion(Entity*);
extern void sub_0805FFD8(Entity*); extern void ForestMinish(Entity*);
extern void sub_080600A8(Entity*); extern void ForestMinish_Head(Entity*);
extern void sub_080603B4(Entity*); extern void ForestMinish_Fusion(Entity*);
extern void sub_080603FC(Entity*); extern void Postman(Entity*);
extern void sub_0806097C(Entity*); extern void Postman_Fusion(Entity*);
extern void sub_080609E8(Entity*); extern void NPC5(Entity*);
extern void sub_08061B8C(Entity*); extern void Townsperson(Entity*);
extern void sub_08061C60(Entity*); extern void Townsperson_Head(Entity*);
extern void sub_08062088(Entity*); extern void Townsperson_Fusion(Entity*);
extern void sub_080620C8(Entity*); extern void Kid(Entity*);
extern void sub_08062834(Entity*); extern void Kid_Head(Entity*);
extern void sub_08062A60(Entity*); extern void Kid_Fusion(Entity*);
extern void sub_08063CF8(Entity*); extern void Guard(Entity*);
extern void sub_08063FAC(Entity*); extern void Guard_Head(Entity*);
extern void sub_08062AD8(Entity*); extern void NPC9(Entity*);
extern void sub_08062B98(Entity*); extern void Stamp(Entity*);
extern void sub_08064508(Entity*); extern void Maid(Entity*);
extern void sub_08064524(Entity*); extern void Maid_Head(Entity*);
extern void sub_08062CF0(Entity*); extern void Marcy(Entity*);
extern void sub_08062E20(Entity*); extern void Wheaton(Entity*);
extern void sub_08062E60(Entity*); extern void Pita(Entity*);
extern void sub_08062F70(Entity*); extern void MinishEzlo(Entity*);
extern void sub_08062FF0(Entity*); extern void MinishEzlo_Head(Entity*);
extern void sub_080631E8(Entity*); extern void Mailbox(Entity*);
extern void sub_080632A8(Entity*); extern void Beedle(Entity*);
extern void sub_080633E0(Entity*); extern void Beedle_Head(Entity*);
extern void sub_08063524(Entity*); extern void Brocco(Entity*);
extern void sub_0806370C(Entity*); extern void Brocco_Fusion(Entity*);
extern void sub_08063740(Entity*); extern void SittingPerson(Entity*);
extern void sub_08063974(Entity*); extern void SittingPerson_Head(Entity*);
extern void sub_080639E8(Entity*); extern void SittingPerson_Fusion(Entity*);
extern void sub_08063A60(Entity*); extern void Pina(Entity*);
extern void sub_08063CC4(Entity*); extern void Pina_Fusion(Entity*);
extern void sub_08063CF8(Entity*); extern void Guard(Entity*);
extern void sub_08063FAC(Entity*); extern void Guard_Head(Entity*);
extern void sub_08064508(Entity*); extern void Maid(Entity*);
extern void sub_08064524(Entity*); extern void Maid_Head(Entity*);
extern void sub_08064790(Entity*); extern void Din(Entity*);
extern void sub_08064860(Entity*); extern void Din_Fusion(Entity*);
extern void sub_08064890(Entity*); extern void Nayru(Entity*);
extern void sub_08064960(Entity*); extern void Nayru_Fusion(Entity*);
extern void sub_08064990(Entity*); extern void Farore(Entity*);
extern void sub_08064A60(Entity*); extern void Farore_Fusion(Entity*);
extern void sub_08064A90(Entity*); extern void Sturgeon(Entity*);
extern void sub_08064C6C(Entity*); extern void Sturgeon_Head(Entity*);
extern void sub_08064D18(Entity*); extern void Sturgeon_Fusion(Entity*);
extern void sub_08064D58(Entity*); extern void TingleSiblings(Entity*);
extern void sub_0806501C(Entity*); extern void TingleSiblings_Fusion(Entity*);
extern void sub_08065054(Entity*); extern void Stockwell(Entity*);
extern void sub_08065534(Entity*); extern void Talon(Entity*);
extern void sub_080657A8(Entity*); extern void Talon_Head(Entity*);
extern void sub_080657DC(Entity*); extern void Talon_Fusion(Entity*);
extern void sub_0806581C(Entity*); extern void Malon(Entity*);
extern void sub_08065960(Entity*); extern void Malon_Fusion(Entity*);
extern void sub_08065990(Entity*); extern void Epona(Entity*);
extern void sub_08065B1C(Entity*); extern void Epona_Fusion(Entity*);
extern void sub_08065B4C(Entity*); extern void MilkCart(Entity*);
extern void sub_08065BA4(Entity*); extern void GhostBrothers(Entity*);
extern void sub_08065F90(Entity*); extern void GhostBrothers_Fusion(Entity*);
extern void sub_08065FC0(Entity*); extern void Smith(Entity*);
extern void sub_080660A8(Entity*); extern void Smith_Head(Entity*);
extern void sub_08066298(Entity*); extern void Smith_Fusion(Entity*);
extern void sub_080662D8(Entity*); extern void NPC23(Entity*);
extern void sub_080665E4(Entity*); extern void KingDaltus(Entity*);
extern void sub_08066780(Entity*); extern void KingDaltus_Fusion(Entity*);
extern void sub_080667B0(Entity*); extern void MinisterPotho(Entity*);
extern void sub_08066948(Entity*); extern void MinisterPotho_Fusion(Entity*);
extern void sub_08066978(Entity*); extern void NPC26(Entity*);
extern void sub_08066A5C(Entity*); extern void Vaati(Entity*);
extern void sub_08066CB4(Entity*); extern void Zelda(Entity*);
extern void sub_08066FD8(Entity*); extern void Mutoh(Entity*);
extern void sub_08067080(Entity*); extern void Mutoh_Head(Entity*);
extern void sub_08067118(Entity*); extern void Mutoh_Fusion(Entity*);
extern void sub_08067158(Entity*); extern void Carpenter(Entity*);
extern void sub_08067228(Entity*); extern void Carpenter_Head(Entity*);
extern void sub_0806732C(Entity*); extern void Carpenter_Fusion(Entity*);
extern void sub_08067380(Entity*); extern void CastorWildsStatue(Entity*);
extern void sub_08067750(Entity*); extern void CastorWildsStatue_Fusion(Entity*);
extern void sub_080677B4(Entity*); extern void Cat(Entity*);
extern void sub_08067DFC(Entity*); extern void Cat_Fusion(Entity*);
extern void sub_08067E2C(Entity*); extern void MountainMinish(Entity*);
extern void sub_080681E0(Entity*); extern void MountainMinish_Head(Entity*);
extern void sub_08068270(Entity*); extern void MountainMinish_Fusion(Entity*);
extern void sub_080682B0(Entity*); extern void ZeldaFollower(Entity*);
extern void sub_080686D4(Entity*); extern void Melari(Entity*);
extern void sub_0806889C(Entity*); extern void Melari_Head(Entity*);
extern void sub_0806897C(Entity*); extern void Melari_Fusion(Entity*);
extern void sub_080689C0(Entity*); extern void BladeBrothers(Entity*);
extern void sub_08068F4C(Entity*); extern void BladeBrothers_Fusion(Entity*);
extern void sub_08068F98(Entity*); extern void Cow(Entity*);
extern void sub_080692A0(Entity*); extern void Cow_Fusion(Entity*);
extern void sub_080692D0(Entity*); extern void Goron(Entity*);
extern void sub_08069514(Entity*); extern void Goron_Fusion(Entity*);
extern void sub_08069544(Entity*); extern void GoronMerchant(Entity*);
extern void sub_08069784(Entity*); extern void Gorman(Entity*);
extern void sub_08069AE8(Entity*); extern void Gorman_Head(Entity*);
extern void sub_08069B1C(Entity*); extern void Dog(Entity*);
extern void sub_08069F2C(Entity*); extern void Dog_Head(Entity*);
extern void sub_0806A194(Entity*); extern void Dog_Fusion(Entity*);
extern void Syrup(Entity*); extern void Syrup(Entity*);
extern void sub_0806A2B4(Entity*); extern void Syrup_Head(Entity*);
extern void sub_0806A358(Entity*); extern void Rem(Entity*);
extern void sub_0806ABC8(Entity*); extern void TownMinish(Entity*);
extern void sub_0806AE0C(Entity*); extern void TownMinish_Head(Entity*);
extern void sub_0806B184(Entity*); extern void TownMinish_Fusion(Entity*);
extern void sub_0806B1CC(Entity*); extern void Librari(Entity*);
extern void sub_0806B32C(Entity*); extern void Librari_Fusion(Entity*);
extern void sub_0806B3AC(Entity*); extern void Percy(Entity*);
extern void sub_0806B35C(Entity*); extern void Percy_Head(Entity*);
extern void sub_0806B624(Entity*); extern void Percy_Fusion(Entity*);
extern void sub_0806B664(Entity*); extern void VaatiReborn(Entity*);
extern void sub_0806B9D0(Entity*); extern void MoblinLady(Entity*);
extern void sub_0806B9F0(Entity*); extern void Librarians(Entity*);
extern void sub_0806BBE4(Entity*); extern void Farmers(Entity*);
extern void sub_0806BC64(Entity*); extern void Farmers_Head(Entity*);
extern void sub_0806BCFC(Entity*); extern void Farmers_Fusion(Entity*);
extern void sub_0806BD54(Entity*); extern void Carlov(Entity*);
extern void sub_0806BDAC(Entity*); extern void Dampe(Entity*);
extern void sub_0806BE54(Entity*); extern void Dampe_Fusion(Entity*);
extern void sub_0806BF80(Entity*); extern void DrLeft(Entity*);
extern void sub_0806C0B0(Entity*); extern void KingGustaf(Entity*);
extern void sub_0806C13C(Entity*); extern void Gina(Entity*);
extern void sub_0806C1D4(Entity*); extern void Gina_Fusion(Entity*);
extern void Simon(Entity*); extern void Simon(Entity*);
extern void sub_0806C2C4(Entity*); extern void Anju(Entity*);
extern void sub_0806C36C(Entity*); extern void Anju_Fusion(Entity*);
extern void sub_0806C39C(Entity*); extern void Mama(Entity*);
extern void sub_0806C478(Entity*); extern void Mama_Head(Entity*);
extern void sub_0806C510(Entity*); extern void Mama_Fusion(Entity*);
extern void sub_0806C550(Entity*); extern void Emma(Entity*);
extern void sub_0806C5A8(Entity*); extern void Teachers(Entity*);
extern void sub_0806C68C(Entity*); extern void Teachers_Head(Entity*);
extern void sub_0806C738(Entity*); extern void Teachers_Fusion(Entity*);
extern void sub_0806C780(Entity*); extern void WindTribespeople(Entity*);
extern void sub_0806C888(Entity*); extern void WindTribespeople_Head(Entity*);
extern void sub_0806CA94(Entity*); extern void WindTribespeople_Fusion(Entity*);
extern void sub_0806CADC(Entity*); extern void Gregal(Entity*);
extern void sub_0806CD70(Entity*); extern void Gregal_Fusion(Entity*);
extern void sub_0806CDA8(Entity*); extern void MayorHagen(Entity*);
extern void sub_0806CEE8(Entity*); extern void MayorHagen_Fusion(Entity*);
extern void sub_0806CF18(Entity*); extern void BigGoron(Entity*);
extern void sub_0806D86C(Entity*); extern void EzloCap(Entity*);
extern void sub_0806D9D0(Entity*); extern void NPC4E(Entity*);
extern void sub_0806DCD4(Entity*); extern void NPC4E_Fusion(Entity*);
extern void sub_0806DD44(Entity*); extern void NPC4F(Entity*);
extern void sub_0806DD78(Entity*); extern void ClothesRack(Entity*);
extern void sub_0806DED0(Entity*); extern void PicolyteBottle(Entity*);
extern void sub_0806E278(Entity*); extern void SmallTownMinish(Entity*);
extern void sub_0806E308(Entity*); extern void HurdyGurdyMan(Entity*);
extern void sub_0806E3E4(Entity*); extern void HurdyGurdyMan_Head(Entity*);
extern void sub_0806E458(Entity*); extern void HurdyGurdyMan_Fusion(Entity*);
extern void sub_0806E4A0(Entity*); extern void Cucco(Entity*);
extern void sub_0806E6E0(Entity*); extern void Cucco_Fusion(Entity*);
extern void sub_0806E710(Entity*); extern void CuccoChick(Entity*);
extern void sub_0806E894(Entity*); extern void CuccoChick_Fusion(Entity*);
extern void sub_0806E8CC(Entity*); extern void FusionMenuNPC(Entity*);
extern void sub_0806E8F8(Entity*); extern void FusionMenuNPC_Head(Entity*);
extern void sub_0806E91C(Entity*); extern void Phonograph(Entity*);
extern void sub_0806EAF4(Entity*); extern void NPC58(Entity*);
extern void sub_0806EBAC(Entity*); extern void NPC58_Head(Entity*);
#endif #endif

2
src/bigGoron.c
View File

@ -16,7 +16,7 @@ extern void PlaySFX(u32);
extern void sub_0806D02C(Entity*); extern void sub_0806D02C(Entity*);
extern Entity* sub_0805EB2C(u32, u32, u32, u32, u32); extern Entity* sub_0805EB2C(u32, u32, u32, u32, u32);
void sub_0806CF18(Entity* this) { void BigGoron(Entity* this) {
gUnk_081140D4[this->entityType.parameter1](this); gUnk_081140D4[this->entityType.parameter1](this);
} }

4
src/bladeBrothers.c
View File

@ -42,7 +42,7 @@ extern u16 gUnk_0811172A[];
extern u32 gUnk_0300402B; extern u32 gUnk_0300402B;
extern EntityData gUnk_080F3494; extern EntityData gUnk_080F3494;
void sub_080689C0(Entity* this) { void BladeBrothers(Entity* this) {
if ((this->flags & 2) != 0) { if ((this->flags & 2) != 0) {
gUnk_081115D0[this->action](this); gUnk_081115D0[this->action](this);
@ -397,7 +397,7 @@ void sub_08068F3C(Entity* this) {
} }
} }
void sub_08068F4C(Entity* this) { void BladeBrothers_Fusion(Entity* this) {
if (this->action == 0) { if (this->action == 0) {
this->action += 1; this->action += 1;

2
src/cat.c
View File

@ -7,7 +7,7 @@ extern void sub_08067C44();
extern void (*gCat[9])(Entity*); extern void (*gCat[9])(Entity*);
// Main // Main
void sub_080677B4(Entity* ent) { void Cat(Entity* ent) {
gCat[ent->action](ent); gCat[ent->action](ent);
sub_08067C44(ent); sub_08067C44(ent);
if (((ent->flags & 128) == 0) && ((ent->entityType).parameter1 != 5)) { if (((ent->flags & 128) == 0) && ((ent->entityType).parameter1 != 5)) {

2
src/clothesRack.c
View File

@ -3,6 +3,6 @@
extern void (*gUnk_0811423C[])(Entity*); extern void (*gUnk_0811423C[])(Entity*);
void sub_0806DD78(Entity* this) { void ClothesRack(Entity* this) {
gUnk_0811423C[this->action](this); gUnk_0811423C[this->action](this);
} }

4
src/cow.c
View File

@ -23,7 +23,7 @@ extern u32 Random();
extern u32 UpdateFuseInteraction(Entity*); extern u32 UpdateFuseInteraction(Entity*);
extern LinkState gLinkState; extern LinkState gLinkState;
void sub_08068F98(Entity* ent) { void Cow(Entity* ent) {
gUnk_08111914[ent->action](ent); gUnk_08111914[ent->action](ent);
sub_0806ED78(ent); sub_0806ED78(ent);
sub_0806920C(ent); sub_0806920C(ent);
@ -228,7 +228,7 @@ void sub_0806924C(Entity* ent) {
} }
} }
void sub_080692A0(Entity* ent) { void Cow_Fusion(Entity* ent) {
if (ent->action == 0) { if (ent->action == 0) {
ent->action++; ent->action++;
ent->spriteSettings.b.ss0 = 1; ent->spriteSettings.b.ss0 = 1;

2
src/emma.c
View File

@ -10,7 +10,7 @@ extern void sub_0807DD50(Entity*);
extern void sub_0807DD94(Entity*, u32); extern void sub_0807DD94(Entity*, u32);
extern void DoExitTransition(u32*); extern void DoExitTransition(u32*);
void sub_0806C550(Entity* param_1) void Emma(Entity* param_1)
{ {
if (param_1->action == 0) { if (param_1->action == 0) {

4
src/epona.c
View File

@ -10,7 +10,7 @@ void sub_08065AA4(Entity*);
extern void (*gUnk_0811006C[])(Entity*); extern void (*gUnk_0811006C[])(Entity*);
extern u32 gUnk_08110080[]; extern u32 gUnk_08110080[];
void sub_08065990(Entity* this) { void Epona(Entity* this) {
gUnk_0811006C[this->action](this); gUnk_0811006C[this->action](this);
sub_08065A64(this); sub_08065A64(this);
sub_0806ED78(this); sub_0806ED78(this);
@ -88,7 +88,7 @@ void sub_08065AA4(Entity* this) {
} }
} }
void sub_08065B1C(Entity* this) { void Epona_Fusion(Entity* this) {
if (this->action == 0) { if (this->action == 0) {
this->action += 1; this->action += 1;
this->spriteSettings.b.ss0 = 1; this->spriteSettings.b.ss0 = 1;

4
src/goron.c
View File

@ -7,7 +7,7 @@ extern void (*gUnk_08111A80[])(Entity*);
extern void (*gUnk_08111A8C[])(Entity*); extern void (*gUnk_08111A8C[])(Entity*);
extern u8 gUnk_02033280[]; extern u8 gUnk_02033280[];
void sub_080692D0(Entity* this) { void Goron(Entity* this) {
if (this->flags & 2) { if (this->flags & 2) {
gUnk_08111A8C[this->action](this); gUnk_08111A8C[this->action](this);
} else { } else {
@ -124,7 +124,7 @@ void sub_080694EC(Entity* this) {
this->field_0x80 = anim; this->field_0x80 = anim;
} }
void sub_08069514(Entity* this) { void Goron_Fusion(Entity* this) {
if (this->action == 0) { if (this->action == 0) {
this->action++; this->action++;
this->spriteSettings.b.ss0 = 1; this->spriteSettings.b.ss0 = 1;

2
src/mailbox.c
View File

@ -10,7 +10,7 @@ extern void CreateFx();
extern void (*gMailboxBehaviors[4])(Entity*); extern void (*gMailboxBehaviors[4])(Entity*);
void sub_080631E8(Entity* this) { void Mailbox(Entity* this) {
gMailboxBehaviors[this->action](this); gMailboxBehaviors[this->action](this);
if (this->action != 0) { if (this->action != 0) {

4
src/malon.c
View File

@ -7,7 +7,7 @@ extern Entity gLinkEntity;
extern void (*gUnk_0810FF5C[])(Entity* this); extern void (*gUnk_0810FF5C[])(Entity* this);
extern void (*gUnk_0810FF64[])(Entity* this); extern void (*gUnk_0810FF64[])(Entity* this);
void sub_0806581C(Entity* this) { void Malon(Entity* this) {
if (this->flags & 0x2) { if (this->flags & 0x2) {
gUnk_0810FF64[this->action](this); gUnk_0810FF64[this->action](this);
} else { } else {
@ -69,7 +69,7 @@ void sub_08065914(Entity* this) {
} }
} }
void sub_08065960(Entity* this) { void Malon_Fusion(Entity* this) {
if (this->action == 0) { if (this->action == 0) {
this->action++; this->action++;
this->spriteSettings.b.ss0 = 1; this->spriteSettings.b.ss0 = 1;

2
src/milkCart.c
View File

@ -8,7 +8,7 @@ extern void UpdateAnimationSingleFrame();
extern void (*gMilkCartBehaviors[2])(Entity*); extern void (*gMilkCartBehaviors[2])(Entity*);
void sub_08065B4C(Entity* ent) { void MilkCart(Entity* ent) {
gMilkCartBehaviors[ent->action](ent); gMilkCartBehaviors[ent->action](ent);
sub_0806ED78(ent); sub_0806ED78(ent);
} }

189
src/npc.c
View File

@ -3,61 +3,136 @@
#include "entity.h" #include "entity.h"
#include "npc.h" #include "npc.h"
//TODO: group into arrays of 3: [npc, npc_HEAD, npc_FUSION] //clang-format off
void (*const gNPCFunctions[])(Entity* ent) = { void (*const gNPCFunctions[][3])(Entity* ent) = {
DeleteEntity, NULL, NULL, sub_0805FD24, NULL, sub_0805FDC0, sub_0805FDF8, NULL, { DeleteEntity, NULL, NULL },
sub_0805FFA0, sub_0805FFD8, sub_080600A8, sub_080603B4, sub_080603FC, NULL, sub_0806097C, sub_080609E8, { Gentari, NULL, Gentari_Fusion },
NULL, NULL, sub_08061B8C, sub_08061C60, sub_08062088, sub_080620C8, sub_08062834, sub_08062A60, { Festari, NULL, Festari_Fusion },
sub_08063CF8, sub_08063FAC, NULL, sub_08062AD8, NULL, NULL, sub_08062B98, NULL, { ForestMinish, ForestMinish_Head, ForestMinish_Fusion },
NULL, sub_08064508, sub_08064524, NULL, sub_08062CF0, NULL, NULL, sub_08062E20, { Postman, NULL, Postman_Fusion },
NULL, NULL, sub_08062E60, NULL, NULL, sub_08062F70, sub_08062FF0, NULL, { NPC5, NULL, NULL },
sub_080631E8, NULL, NULL, sub_080632A8, sub_080633E0, NULL, sub_08063524, NULL, { Townsperson, Townsperson_Head, Townsperson_Fusion },
sub_0806370C, sub_08063740, sub_08063974, sub_080639E8, sub_08063A60, NULL, sub_08063CC4, sub_08063CF8, { Kid, Kid_Head, Kid_Fusion },
sub_08063FAC, NULL, sub_08064508, sub_08064524, NULL, sub_08064790, NULL, sub_08064860, { Guard, Guard_Head, NULL },
sub_08064890, NULL, sub_08064960, sub_08064990, NULL, sub_08064A60, sub_08064A90, sub_08064C6C, { NPC9, NULL, NULL },
sub_08064D18, sub_08064D58, NULL, sub_0806501C, sub_08065054, NULL, NULL, sub_08065534, { Stamp, NULL, NULL },
sub_080657A8, sub_080657DC, sub_0806581C, NULL, sub_08065960, sub_08065990, NULL, sub_08065B1C, { Maid, Maid_Head, NULL },
sub_08065B4C, NULL, NULL, sub_08065BA4, NULL, sub_08065F90, sub_08065FC0, sub_080660A8, { Marcy, NULL, NULL },
sub_08066298, sub_080662D8, NULL, NULL, sub_080665E4, NULL, sub_08066780, sub_080667B0, { Wheaton, NULL, NULL },
NULL, sub_08066948, sub_08066978, NULL, NULL, sub_08066A5C, NULL, NULL, { Pita, NULL, NULL },
sub_08066CB4, NULL, NULL, sub_08066FD8, sub_08067080, sub_08067118, sub_08067158, sub_08067228, { MinishEzlo, MinishEzlo_Head, NULL },
sub_0806732C, sub_08067380, NULL, sub_08067750, sub_080677B4, NULL, sub_08067DFC, sub_08067E2C, { Mailbox, NULL, NULL },
sub_080681E0, sub_08068270, sub_080682B0, NULL, NULL, sub_080686D4, sub_0806889C, sub_0806897C, { Beedle, Beedle_Head, NULL },
sub_080689C0, NULL, sub_08068F4C, sub_08068F98, NULL, sub_080692A0, sub_080692D0, NULL, { Brocco, NULL, Brocco_Fusion },
sub_08069514, sub_08069544, NULL, NULL, sub_08069784, sub_08069AE8, NULL, sub_08069B1C, { SittingPerson, SittingPerson_Head, SittingPerson_Fusion },
sub_08069F2C, sub_0806A194, Syrup, sub_0806A2B4, NULL, sub_0806A358, NULL, NULL, { Pina, NULL, Pina_Fusion },
sub_0806ABC8, sub_0806AE0C, sub_0806B184, sub_0806B1CC, NULL, sub_0806B32C, sub_0806B3AC, sub_0806B35C, { Guard, Guard_Head, NULL },
sub_0806B624, sub_0806B664, NULL, NULL, sub_0806B9D0, NULL, NULL, sub_0806B9F0, { Maid, Maid_Head, NULL },
NULL, NULL, sub_0806BBE4, sub_0806BC64, sub_0806BCFC, sub_0806BD54, NULL, NULL, { Din, NULL, Din_Fusion },
sub_0806BDAC, NULL, sub_0806BE54, sub_0806BF80, NULL, NULL, sub_0806C0B0, NULL, { Nayru, NULL, Nayru_Fusion },
NULL, sub_0806C13C, NULL, sub_0806C1D4, Simon, NULL, NULL, sub_0806C2C4, { Farore, NULL, Farore_Fusion },
NULL, sub_0806C36C, sub_0806C39C, sub_0806C478, sub_0806C510, sub_0806C550, NULL, NULL, { Sturgeon, Sturgeon_Head, Sturgeon_Fusion },
sub_0806C5A8, sub_0806C68C, sub_0806C738, sub_0806C780, sub_0806C888, sub_0806CA94, sub_0806CADC, NULL, { TingleSiblings, NULL, TingleSiblings_Fusion },
sub_0806CD70, sub_0806CDA8, NULL, sub_0806CEE8, sub_0806CF18, NULL, NULL, sub_0806D86C, { Stockwell, NULL, NULL },
NULL, NULL, sub_0806D9D0, NULL, sub_0806DCD4, sub_0806DD44, NULL, NULL, { Talon, Talon_Head, Talon_Fusion },
sub_0806DD78, NULL, NULL, sub_0806DED0, NULL, NULL, sub_0806E278, NULL, { Malon, NULL, Malon_Fusion },
NULL, sub_0806E308, sub_0806E3E4, sub_0806E458, sub_0806E4A0, NULL, sub_0806E6E0, sub_0806E710, { Epona, NULL, Epona_Fusion },
NULL, sub_0806E894, sub_0806E8CC, sub_0806E8F8, NULL, sub_0806E91C, NULL, NULL, { MilkCart, NULL, NULL },
sub_0806EAF4, sub_0806EBAC, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, { GhostBrothers, NULL, GhostBrothers_Fusion },
NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, { Smith, Smith_Head, Smith_Fusion },
NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, { NPC23, NULL, NULL },
DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, { KingDaltus, NULL, KingDaltus_Fusion },
NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, { MinisterPotho, NULL, MinisterPotho_Fusion },
NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, { NPC26, NULL, NULL },
DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, { Vaati, NULL, NULL },
NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, { Zelda, NULL, NULL },
NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, { Mutoh, Mutoh_Head, Mutoh_Fusion },
DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, { Carpenter, Carpenter_Head, Carpenter_Fusion },
NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, { CastorWildsStatue, NULL, CastorWildsStatue_Fusion },
NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, { Cat, NULL, Cat_Fusion },
DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, { MountainMinish, MountainMinish_Head, MountainMinish_Fusion },
NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, { ZeldaFollower, NULL, NULL },
NULL, NULL, DeleteEntity, NULL, NULL, DeleteEntity, NULL, NULL, { Melari, Melari_Head, Melari_Fusion },
}; { BladeBrothers, NULL, BladeBrothers_Fusion },
{ Cow, NULL, Cow_Fusion },
const u8 npc_unk[] = { { Goron, NULL, Goron_Fusion },
0x04, { GoronMerchant, NULL, NULL },
0x05, { Gorman, Gorman_Head, NULL },
0x06, { Dog, Dog_Head, Dog_Fusion },
0x06 { Syrup, Syrup_Head, NULL },
{ Rem, NULL, NULL },
{ TownMinish, TownMinish_Head, TownMinish_Fusion },
{ Librari, NULL, Librari_Fusion },
{ Percy, Percy_Head, Percy_Fusion },
{ VaatiReborn, NULL, NULL },
{ MoblinLady, NULL, NULL },
{ Librarians, NULL, NULL },
{ Farmers, Farmers_Head, Farmers_Fusion },
{ Carlov, NULL, NULL },
{ Dampe, NULL, Dampe_Fusion },
{ DrLeft, NULL, NULL },
{ KingGustaf, NULL, NULL },
{ Gina, NULL, Gina_Fusion },
{ Simon, NULL, NULL },
{ Anju, NULL, Anju_Fusion },
{ Mama, Mama_Head, Mama_Fusion },
{ Emma, NULL, NULL },
{ Teachers, Teachers_Head, Teachers_Fusion },
{ WindTribespeople, WindTribespeople_Head, WindTribespeople_Fusion },
{ Gregal, NULL, Gregal_Fusion },
{ MayorHagen, NULL, MayorHagen_Fusion },
{ BigGoron, NULL, NULL },
{ EzloCap, NULL, NULL },
{ NPC4E, NULL, NPC4E_Fusion },
{ NPC4F, NULL, NULL },
{ ClothesRack, NULL, NULL },
{ PicolyteBottle, NULL, NULL },
{ SmallTownMinish, NULL, NULL },
{ HurdyGurdyMan, HurdyGurdyMan_Head, HurdyGurdyMan_Fusion },
{ Cucco, NULL, Cucco_Fusion },
{ CuccoChick, NULL, CuccoChick_Fusion },
{ FusionMenuNPC, FusionMenuNPC_Head, NULL },
{ Phonograph, NULL, NULL },
{ NPC58, NPC58_Head, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL },
{ DeleteEntity, NULL, NULL }
}; };
//clang-format on
const u8 npc_unk[] = { 0x04, 0x05, 0x06, 0x06 };

2
src/rem.c
View File

@ -16,7 +16,7 @@ extern void (*gUnk_08112278[])(Entity*);
extern void gUnk_08012F0C; extern void gUnk_08012F0C;
void sub_0806A358(Entity* this) { void Rem(Entity* this) {
gUnk_08112260[this->entityType.parameter1](this); gUnk_08112260[this->entityType.parameter1](this);
} }

2
src/stamp.c
View File

@ -44,7 +44,7 @@ extern void (*gStampBehaviors2[2])(Entity*);
extern TextBox gTextBox; extern TextBox gTextBox;
extern u32 gUnk_0810C2E4; extern u32 gUnk_0810C2E4;
void sub_08062B98(Entity* ent) { void Stamp(Entity* ent) {
if ((ent->flags & 2) != 0) { if ((ent->flags & 2) != 0) {
gStampBehaviors2[ent->action](ent); gStampBehaviors2[ent->action](ent);
} else { } else {

6
src/talon.c
View File

@ -14,7 +14,7 @@ extern u8 gUnk_0810FED8[];
void sub_0806574C(Entity* this); void sub_0806574C(Entity* this);
void sub_08065534(Entity* this) { void Talon(Entity* this) {
if (this->flags & 2) { if (this->flags & 2) {
gUnk_0810FEC4[this->action](this); gUnk_0810FEC4[this->action](this);
} else { } else {
@ -143,14 +143,14 @@ void sub_08065780(Entity* this, u16* param_2) {
param_2[8] = gUnk_0810FED8[rand >> 8 & 7]; param_2[8] = gUnk_0810FED8[rand >> 8 & 7];
} }
void sub_080657A8(Entity* this) { void Talon_Head(Entity* this) {
sub_0806FF60(this, 0, ((this->frames.all & 7) + 0xB)); sub_0806FF60(this, 0, ((this->frames.all & 7) + 0xB));
sub_0806FF60(this, 1, this->animationList); sub_0806FF60(this, 1, this->animationList);
sub_0806FF88(this, 1, 0); sub_0806FF88(this, 1, 0);
sub_0807000C(this); sub_0807000C(this);
} }
void sub_080657DC(Entity* this) { void Talon_Fusion(Entity* this) {
if (this->action == 0) { if (this->action == 0) {
if (LoadExtraSpriteData(this, &gUnk_0810FEB0) != 0) { if (LoadExtraSpriteData(this, &gUnk_0810FEB0) != 0) {
this->action++; this->action++;

2
src/townMinish.c
View File

@ -12,7 +12,7 @@ extern void sub_0806ACC4(Entity *);
extern u32 LoadExtraSpriteData(Entity *, SpriteLoadData *); extern u32 LoadExtraSpriteData(Entity *, SpriteLoadData *);
extern SpriteLoadData gUnk_08112674[]; extern SpriteLoadData gUnk_08112674[];
void sub_0806ABC8(Entity *this) void TownMinish(Entity *this)
{ {
if ((this->flags & 2) == 0) { if ((this->flags & 2) == 0) {
(*gUnk_081126E8[this->action])(this); (*gUnk_081126E8[this->action])(this);

2
src/zelda.c
View File

@ -31,7 +31,7 @@ extern void (*gUnk_08110BD8[])(Entity* ent);
extern u8 gUnk_02033280[]; extern u8 gUnk_02033280[];
extern u16 gUnk_08110BE0[]; extern u16 gUnk_08110BE0[];
void sub_08066CB4(Entity* ent) { void Zelda(Entity* ent) {
gUnk_08110BD8[ent->action](ent); gUnk_08110BD8[ent->action](ent);
} }