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

windTribespeople

This commit is contained in:
theo3 2020-06-19 19:59:57 -07:00
parent cae2706938
commit 82ee1318aa
40 changed files with 302 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/beedle.s
View File

@ -184,15 +184,15 @@ Beedle_Head: @ 0x080633E0
ands r2, r0 ands r2, r0
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
pop {r4, pc} pop {r4, pc}

16
asm/carpenter.s
View File

@ -121,11 +121,11 @@ Carpenter_Head: @ 0x08067228
ands r2, r0 ands r2, r0
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
adds r0, #0x5b adds r0, #0x5b
ldrb r0, [r0] ldrb r0, [r0]
@ -133,15 +133,15 @@ Carpenter_Head: @ 0x08067228
ands r2, r0 ands r2, r0
adds r0, r4, #0 adds r0, r4, #0
movs r1, #2 movs r1, #2
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #2 movs r2, #2
bl sub_0806FFD8 bl SetSpriteSubEntryOffsetData2
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
b _080672AC b _080672AC
@ -154,15 +154,15 @@ _0806727E:
ands r2, r0 ands r2, r0
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
_080672AC: _080672AC:

6
asm/castleMaid.s
View File

@ -50,15 +50,15 @@ _08064548:
subs r2, #1 subs r2, #1
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
adds r2, r5, #0 adds r2, r5, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
pop {r4, r5, pc} pop {r4, r5, pc}

12
asm/code_0806FA6C.s
View File

@ -632,8 +632,8 @@ sub_0806FF48: @ 0x0806FF48
.align 2, 0 .align 2, 0
_0806FF5C: .4byte gUnk_020000C0 _0806FF5C: .4byte gUnk_020000C0
thumb_func_start sub_0806FF60 thumb_func_start SetExtraSpriteFrame
sub_0806FF60: @ 0x0806FF60 SetExtraSpriteFrame: @ 0x0806FF60
push {lr} push {lr}
adds r3, r2, #0 adds r3, r2, #0
adds r0, #0x28 adds r0, #0x28
@ -656,8 +656,8 @@ _0806FF82:
.align 2, 0 .align 2, 0
_0806FF84: .4byte gUnk_020000C0 _0806FF84: .4byte gUnk_020000C0
thumb_func_start sub_0806FF88 thumb_func_start SetSpriteSubEntryOffsetData1
sub_0806FF88: @ 0x0806FF88 SetSpriteSubEntryOffsetData1: @ 0x0806FF88
push {r4, r5, lr} push {r4, r5, lr}
adds r5, r1, #0 adds r5, r1, #0
adds r0, #0x28 adds r0, #0x28
@ -700,8 +700,8 @@ sub_0806FFBC: @ 0x0806FFBC
.align 2, 0 .align 2, 0
_0806FFD4: .4byte gUnk_020000C0 _0806FFD4: .4byte gUnk_020000C0
thumb_func_start sub_0806FFD8 thumb_func_start SetSpriteSubEntryOffsetData2
sub_0806FFD8: @ 0x0806FFD8 SetSpriteSubEntryOffsetData2: @ 0x0806FFD8
push {r4, r5, lr} push {r4, r5, lr}
adds r5, r1, #0 adds r5, r1, #0
adds r0, #0x28 adds r0, #0x28

6
asm/dog.s
View File

@ -558,15 +558,15 @@ _08069F46:
subs r2, #1 subs r2, #1
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
pop {r4, pc} pop {r4, pc}

6
asm/farmers.s
View File

@ -84,15 +84,15 @@ Farmers_Head: @ 0x0806BC64
ands r2, r0 ands r2, r0
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
pop {r4, pc} pop {r4, pc}

6
asm/forestMinish.s
View File

@ -133,15 +133,15 @@ _080600BA:
_080600CA: _080600CA:
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
pop {r4, pc} pop {r4, pc}

6
asm/gorman.s
View File

@ -464,15 +464,15 @@ Gorman_Head: @ 0x08069AE8
adds r2, #0xf adds r2, #0xf
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
pop {r4, pc} pop {r4, pc}

10
asm/guardWithSpear.s
View File

@ -403,23 +403,23 @@ _08063FF6:
subs r4, #1 subs r4, #1
adds r0, r6, #0 adds r0, r6, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r6, #0 adds r0, r6, #0
movs r1, #1 movs r1, #1
adds r2, r5, #0 adds r2, r5, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r6, #0 adds r0, r6, #0
movs r1, #2 movs r1, #2
adds r2, r4, #0 adds r2, r4, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r6, #0 adds r0, r6, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r6, #0 adds r0, r6, #0
movs r1, #1 movs r1, #1
movs r2, #2 movs r2, #2
bl sub_0806FFD8 bl SetSpriteSubEntryOffsetData2
adds r0, r6, #0 adds r0, r6, #0
bl sub_0807000C bl sub_0807000C
pop {r4, r5, r6, pc} pop {r4, r5, r6, pc}

6
asm/hurdyGurdyMan.s
View File

@ -124,15 +124,15 @@ HurdyGurdyMan_Head: @ 0x0806E3E4
adds r2, #8 adds r2, #8
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
pop {r4, pc} pop {r4, pc}

24
asm/kid.s
View File

@ -1028,19 +1028,19 @@ _080628A6:
adds r0, r5, #0 adds r0, r5, #0
movs r1, #0 movs r1, #0
adds r2, r6, #0 adds r2, r6, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
adds r2, r7, #0 adds r2, r7, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #2 movs r1, #2
adds r2, r4, #0 adds r2, r4, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
movs r2, #2 movs r2, #2
@ -1058,24 +1058,24 @@ _080628E8:
subs r2, #1 subs r2, #1
adds r0, r5, #0 adds r0, r5, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
adds r2, r6, #0 adds r2, r6, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #2 movs r1, #2
adds r2, r7, #0 adds r2, r7, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #2 movs r1, #2
movs r2, #1 movs r2, #1
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
_08062916: _08062916:
bl sub_0806FFD8 bl SetSpriteSubEntryOffsetData2
adds r0, r5, #0 adds r0, r5, #0
bl sub_0807000C bl sub_0807000C
b _08062946 b _08062946
@ -1083,15 +1083,15 @@ _08062922:
adds r0, r5, #0 adds r0, r5, #0
movs r1, #0 movs r1, #0
adds r2, r6, #0 adds r2, r6, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
adds r2, r7, #0 adds r2, r7, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r5, #0 adds r0, r5, #0
bl sub_0807000C bl sub_0807000C
_08062946: _08062946:

10
asm/librari.s
View File

@ -219,7 +219,7 @@ Percy_Head: @ 0x0806B35C
adds r2, #0x13 adds r2, #0x13
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
adds r0, #0x5a adds r0, #0x5a
ldrb r0, [r0] ldrb r0, [r0]
@ -228,19 +228,19 @@ Percy_Head: @ 0x0806B35C
adds r2, #0xb adds r2, #0xb
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #2 movs r1, #2
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #2 movs r1, #2
movs r2, #1 movs r2, #1
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
movs r1, #2 movs r1, #2
movs r2, #0 movs r2, #0
bl sub_0806FFD8 bl SetSpriteSubEntryOffsetData2
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
pop {r4, pc} pop {r4, pc}

6
asm/mama.s
View File

@ -127,15 +127,15 @@ Mama_Head: @ 0x0806C478
ands r2, r0 ands r2, r0
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
pop {r4, pc} pop {r4, pc}

14
asm/melari.s
View File

@ -245,7 +245,7 @@ Melari_Head: @ 0x0806889C
ldrb r2, [r5, #0x1e] ldrb r2, [r5, #0x1e]
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
movs r0, #0x20 movs r0, #0x20
ands r0, r4 ands r0, r4
cmp r0, #0 cmp r0, #0
@ -256,32 +256,32 @@ Melari_Head: @ 0x0806889C
adds r0, r5, #0 adds r0, r5, #0
movs r1, #0 movs r1, #0
adds r2, r4, #0 adds r2, r4, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #2 movs r1, #2
movs r2, #0xff movs r2, #0xff
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
b _08068906 b _08068906
_080688E2: _080688E2:
adds r0, r5, #0 adds r0, r5, #0
movs r1, #0 movs r1, #0
movs r2, #0xff movs r2, #0xff
bl sub_0806FF60 bl SetExtraSpriteFrame
movs r0, #0xe1 movs r0, #0xe1
rsbs r0, r0, #0 rsbs r0, r0, #0
ands r4, r0 ands r4, r0
adds r0, r5, #0 adds r0, r5, #0
movs r1, #2 movs r1, #2
adds r2, r4, #0 adds r2, r4, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
movs r2, #2 movs r2, #2
bl sub_0806FFD8 bl SetSpriteSubEntryOffsetData2
_08068906: _08068906:
adds r0, r5, #0 adds r0, r5, #0
bl sub_0807000C bl sub_0807000C

6
asm/minishEzlo.s
View File

@ -104,11 +104,11 @@ _0806301E:
subs r2, #1 subs r2, #1
adds r0, r4, #0 adds r0, r4, #0
adds r1, r6, #0 adds r1, r6, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
adds r0, r4, #0 adds r0, r4, #0
adds r1, r5, #0 adds r1, r5, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
adds r1, r5, #0 adds r1, r5, #0
adds r2, r7, #0 adds r2, r7, #0
@ -116,7 +116,7 @@ _0806301E:
adds r0, r4, #0 adds r0, r4, #0
adds r1, r5, #0 adds r1, r5, #0
adds r2, r6, #0 adds r2, r6, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
pop {r4, r5, r6, r7, pc} pop {r4, r5, r6, r7, pc}

18
asm/mountainMinish.s
View File

@ -496,7 +496,7 @@ MountainMinish_Head: @ 0x080681E0
ldrb r2, [r5, #0x1e] ldrb r2, [r5, #0x1e]
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
movs r0, #0x40 movs r0, #0x40
ands r0, r4 ands r0, r4
cmp r0, #0 cmp r0, #0
@ -507,15 +507,15 @@ MountainMinish_Head: @ 0x080681E0
adds r2, r4, #4 adds r2, r4, #4
adds r0, r5, #0 adds r0, r5, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #2 movs r1, #2
movs r2, #0xff movs r2, #0xff
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
b _08068268 b _08068268
_08068226: _08068226:
movs r0, #0x20 movs r0, #0x20
@ -525,28 +525,28 @@ _08068226:
adds r0, r5, #0 adds r0, r5, #0
movs r1, #0 movs r1, #0
movs r2, #0xff movs r2, #0xff
bl sub_0806FF60 bl SetExtraSpriteFrame
movs r0, #0xe1 movs r0, #0xe1
rsbs r0, r0, #0 rsbs r0, r0, #0
ands r4, r0 ands r4, r0
adds r0, r5, #0 adds r0, r5, #0
movs r1, #2 movs r1, #2
adds r2, r4, #0 adds r2, r4, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
movs r2, #2 movs r2, #2
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
b _08068268 b _08068268
_08068254: _08068254:
adds r0, r5, #0 adds r0, r5, #0
movs r1, #0 movs r1, #0
movs r2, #0xff movs r2, #0xff
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #2 movs r1, #2
movs r2, #0xff movs r2, #0xff
bl sub_0806FF60 bl SetExtraSpriteFrame
_08068268: _08068268:
adds r0, r5, #0 adds r0, r5, #0
bl sub_0807000C bl sub_0807000C

6
asm/mutoh.s
View File

@ -101,15 +101,15 @@ Mutoh_Head: @ 0x08067080
ands r2, r0 ands r2, r0
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
pop {r4, pc} pop {r4, pc}

8
asm/npc58.s
View File

@ -107,25 +107,25 @@ NPC58_Head: @ 0x0806EBAC
ldrsh r2, [r0, r1] ldrsh r2, [r0, r1]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
adds r0, #0x6a adds r0, #0x6a
movs r1, #0 movs r1, #0
ldrsh r2, [r0, r1] ldrsh r2, [r0, r1]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
adds r0, #0x6c adds r0, #0x6c
movs r1, #0 movs r1, #0
ldrsh r2, [r0, r1] ldrsh r2, [r0, r1]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #2 movs r1, #2
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #3 movs r1, #3
movs r2, #0xa movs r2, #0xa
bl sub_0806FF60 bl SetExtraSpriteFrame
movs r2, #0xc movs r2, #0xc
rsbs r2, r2, #0 rsbs r2, r2, #0
adds r0, r4, #0 adds r0, r4, #0

6
asm/sittingPerson.s
View File

@ -312,7 +312,7 @@ SittingPerson_Head: @ 0x08063974
adds r2, r2, r0 adds r2, r2, r0
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldr r2, _080639CC @ =gUnk_0810CD88 ldr r2, _080639CC @ =gUnk_0810CD88
ldrb r1, [r4, #0x1e] ldrb r1, [r4, #0x1e]
movs r0, #3 movs r0, #3
@ -326,11 +326,11 @@ SittingPerson_Head: @ 0x08063974
adds r2, r2, r0 adds r2, r2, r0
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
pop {r4, r5, pc} pop {r4, r5, pc}

8
asm/smith.s
View File

@ -129,7 +129,7 @@ Smith_Head: @ 0x080660A8
ldrb r2, [r5, #0x1e] ldrb r2, [r5, #0x1e]
adds r0, r5, #0 adds r0, r5, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
movs r0, #0x40 movs r0, #0x40
ands r4, r0 ands r4, r0
cmp r4, #0 cmp r4, #0
@ -137,18 +137,18 @@ Smith_Head: @ 0x080660A8
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
movs r2, #0x16 movs r2, #0x16
bl sub_0806FF60 bl SetExtraSpriteFrame
b _080660D8 b _080660D8
_080660CE: _080660CE:
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
movs r2, #0xff movs r2, #0xff
bl sub_0806FF60 bl SetExtraSpriteFrame
_080660D8: _080660D8:
adds r0, r5, #0 adds r0, r5, #0
movs r1, #0 movs r1, #0
movs r2, #1 movs r2, #1
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r5, #0 adds r0, r5, #0
bl sub_0807000C bl sub_0807000C
pop {r4, r5, pc} pop {r4, r5, pc}

6
asm/sturgeon.s
View File

@ -255,15 +255,15 @@ Sturgeon_Head: @ 0x08064C6C
ands r2, r0 ands r2, r0
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
pop {r4, pc} pop {r4, pc}

12
asm/syrup.s
View File

@ -42,7 +42,7 @@ Syrup_Head: @ 0x0806A2B4
adds r2, #0x10 adds r2, #0x10
adds r0, r5, #0 adds r0, r5, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldr r0, _0806A354 @ =gUnk_08112204 ldr r0, _0806A354 @ =gUnk_08112204
adds r4, r4, r0 adds r4, r4, r0
ldrb r2, [r4] ldrb r2, [r4]
@ -52,26 +52,26 @@ Syrup_Head: @ 0x0806A2B4
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
mov r2, r8 mov r2, r8
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r6, #0x1c adds r6, #0x1c
adds r0, r5, #0 adds r0, r5, #0
movs r1, #2 movs r1, #2
adds r2, r6, #0 adds r2, r6, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
movs r0, #0x1a movs r0, #0x1a
add sb, r0 add sb, r0
adds r0, r5, #0 adds r0, r5, #0
movs r1, #3 movs r1, #3
mov r2, sb mov r2, sb
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r5, #0 adds r0, r5, #0
movs r1, #1 movs r1, #1
movs r2, #3 movs r2, #3
bl sub_0806FFD8 bl SetSpriteSubEntryOffsetData2
adds r0, r5, #0 adds r0, r5, #0
bl sub_0807000C bl sub_0807000C
pop {r3, r4} pop {r3, r4}

16
asm/teachers.s
View File

@ -140,15 +140,15 @@ Teachers_Head: @ 0x0806C68C
adds r2, #3 adds r2, #3
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
adds r2, r6, #0 adds r2, r6, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
b _0806C70A b _0806C70A
@ -156,23 +156,23 @@ _0806C6D2:
adds r2, #6 adds r2, #6
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r2, r5, #3 adds r2, r5, #3
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #2 movs r1, #2
adds r2, r6, #0 adds r2, r6, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #2 movs r1, #2
movs r2, #1 movs r2, #1
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
movs r1, #2 movs r1, #2
movs r2, #0 movs r2, #0
bl sub_0806FFD8 bl SetSpriteSubEntryOffsetData2
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
_0806C70A: _0806C70A:

14
asm/townMinish.s
View File

@ -264,22 +264,22 @@ TownMinish_Head: @ 0x0806AE0C
adds r2, #0x1c adds r2, #0x1c
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
b _0806AE46 b _0806AE46
_0806AE3C: _0806AE3C:
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
movs r2, #0xff movs r2, #0xff
bl sub_0806FF60 bl SetExtraSpriteFrame
_0806AE46: _0806AE46:
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
b _0806AEA4 b _0806AEA4
@ -304,15 +304,15 @@ _0806AE72:
_0806AE82: _0806AE82:
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
_0806AEA4: _0806AEA4:

6
asm/townsperson.s
View File

@ -137,7 +137,7 @@ Townsperson_Head: @ 0x08061C60
adds r2, r1, r2 adds r2, r1, r2
adds r0, r4, #0 adds r0, r4, #0
movs r1, #0 movs r1, #0
bl sub_0806FF60 bl SetExtraSpriteFrame
ldrb r2, [r4, #0x1e] ldrb r2, [r4, #0x1e]
ldrb r0, [r4, #0xa] ldrb r0, [r4, #0xa]
lsls r0, r0, #2 lsls r0, r0, #2
@ -146,11 +146,11 @@ Townsperson_Head: @ 0x08061C60
adds r2, r2, r0 adds r2, r2, r0
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
bl sub_0806FF60 bl SetExtraSpriteFrame
adds r0, r4, #0 adds r0, r4, #0
movs r1, #1 movs r1, #1
movs r2, #0 movs r2, #0
bl sub_0806FF88 bl SetSpriteSubEntryOffsetData1
adds r0, r4, #0 adds r0, r4, #0
bl sub_0807000C bl sub_0807000C
pop {r4, r5, pc} pop {r4, r5, pc}

260
asm/windTribespeople.s
View File

@ -6,266 +6,6 @@
.text .text
thumb_func_start WindTribespeople
WindTribespeople: @ 0x0806C780
push {lr}
ldr r2, _0806C794 @ =gUnk_08113A7C
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0806C794: .4byte gUnk_08113A7C
thumb_func_start sub_0806C798
sub_0806C798: @ 0x0806C798
push {r4, lr}
adds r4, r0, #0
ldrb r1, [r4, #0xa]
lsls r1, r1, #4
ldr r0, _0806C7D0 @ =gUnk_08113A1C
adds r1, r1, r0
adds r0, r4, #0
bl LoadExtraSpriteData
cmp r0, #0
beq _0806C7CE
movs r2, #1
movs r0, #1
strb r0, [r4, #0xc]
ldrb r1, [r4, #0x18]
subs r0, #5
ands r0, r1
orrs r0, r2
strb r0, [r4, #0x18]
ldrb r0, [r4, #0xe]
strb r0, [r4, #0x14]
adds r0, r4, #0
bl sub_0807DD50
adds r0, r4, #0
bl sub_0806C7D4
_0806C7CE:
pop {r4, pc}
.align 2, 0
_0806C7D0: .4byte gUnk_08113A1C
thumb_func_start sub_0806C7D4
sub_0806C7D4: @ 0x0806C7D4
push {r4, lr}
adds r4, r0, #0
adds r2, r4, #0
adds r2, #0x39
movs r0, #0
ldrsb r0, [r2, r0]
cmp r0, #2
bne _0806C7F4
movs r1, #0
movs r0, #3
strb r0, [r4, #0xc]
strb r1, [r2]
adds r0, r4, #0
bl sub_0806F118
b _0806C82C
_0806C7F4:
adds r0, r4, #0
movs r1, #0
bl sub_0807DD94
ldrb r0, [r4, #0xb]
cmp r0, #3
bne _0806C82C
movs r0, #0x58
bl CheckGlobalFlag
cmp r0, #0
bne _0806C82C
movs r0, #0x63
bl CheckLocalFlag
cmp r0, #0
beq _0806C82C
movs r0, #0
bl CheckRoomFlag
cmp r0, #0
beq _0806C82C
movs r0, #7
strb r0, [r4, #0xb]
ldr r1, _0806C830 @ =gUnk_08014A80
adds r0, r4, #0
bl sub_0807DD80
_0806C82C:
pop {r4, pc}
.align 2, 0
_0806C830: .4byte gUnk_08014A80
thumb_func_start sub_0806C834
sub_0806C834: @ 0x0806C834
push {lr}
adds r2, r0, #0
ldr r0, _0806C858 @ =gTextBox
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
cmp r0, #0
bne _0806C856
ldrb r0, [r2, #0xc]
subs r0, #1
strb r0, [r2, #0xc]
ldrb r1, [r2, #0x14]
lsrs r1, r1, #1
adds r1, #4
adds r0, r2, #0
bl InitializeAnimation
_0806C856:
pop {pc}
.align 2, 0
_0806C858: .4byte gTextBox
thumb_func_start sub_0806C85C
sub_0806C85C: @ 0x0806C85C
push {r4, lr}
adds r4, r0, #0
bl UpdateFuseInteraction
cmp r0, #0
beq _0806C86C
movs r0, #1
strb r0, [r4, #0xc]
_0806C86C:
pop {r4, pc}
.align 2, 0
thumb_func_start sub_0806C870
sub_0806C870: @ 0x0806C870
push {r4, lr}
adds r4, r0, #0
bl sub_0801E99C
adds r1, r4, #0
adds r1, #0x68
strb r0, [r1]
ldrb r1, [r1]
adds r0, r4, #0
bl sub_08078784
pop {r4, pc}
thumb_func_start WindTribespeople_Head
WindTribespeople_Head: @ 0x0806C888
push {r4, r5, r6, r7, lr}
adds r4, r0, #0
adds r0, #0x5a
ldrb r1, [r0]
movs r7, #0x3f
ands r7, r1
ldrb r0, [r4, #0xa]
cmp r0, #4
bne _0806C8D4
adds r0, r4, #0
movs r1, #0
movs r2, #9
bl sub_0806FF60
adds r0, r4, #0
movs r1, #1
adds r2, r7, #0
bl sub_0806FF60
ldrb r2, [r4, #0x1e]
adds r0, r4, #0
movs r1, #2
bl sub_0806FF60
adds r0, r4, #0
movs r1, #2
movs r2, #0
bl sub_0806FFD8
adds r0, r4, #0
movs r1, #2
movs r2, #1
bl sub_0806FF88
adds r0, r4, #0
bl sub_0807000C
b _0806C90A
_0806C8D4:
movs r0, #0x40
ands r0, r1
cmp r0, #0
beq _0806C8E2
movs r6, #1
movs r5, #0
b _0806C8E6
_0806C8E2:
movs r6, #0
movs r5, #1
_0806C8E6:
adds r0, r4, #0
adds r1, r6, #0
adds r2, r7, #0
bl sub_0806FF60
ldrb r2, [r4, #0x1e]
adds r0, r4, #0
adds r1, r5, #0
bl sub_0806FF60
adds r0, r4, #0
adds r1, r5, #0
adds r2, r6, #0
bl sub_0806FF88
adds r0, r4, #0
bl sub_0807000C
_0806C90A:
pop {r4, r5, r6, r7, pc}
thumb_func_start sub_0806C90C
sub_0806C90C: @ 0x0806C90C
push {lr}
movs r2, #0
str r2, [r1, #0x14]
ldr r3, _0806C924 @ =gUnk_08113A8C
ldrb r2, [r0, #0xb]
lsls r2, r2, #2
adds r2, r2, r3
ldr r2, [r2]
bl _call_via_r2
pop {pc}
.align 2, 0
_0806C924: .4byte gUnk_08113A8C
thumb_func_start sub_0806C928
sub_0806C928: @ 0x0806C928
push {lr}
ldr r1, _0806C93C @ =gUnk_02002A40
ldrb r1, [r1, #8]
lsls r1, r1, #3
ldr r2, _0806C940 @ =gUnk_08113ABC
adds r1, r1, r2
bl ShowNPCDialogue
pop {pc}
.align 2, 0
_0806C93C: .4byte gUnk_02002A40
_0806C940: .4byte gUnk_08113ABC
thumb_func_start sub_0806C944
sub_0806C944: @ 0x0806C944
push {r4, lr}
adds r4, r0, #0
movs r0, #0x58
bl CheckGlobalFlag
cmp r0, #0
bne _0806C956
movs r1, #0
b _0806C964
_0806C956:
movs r0, #0x63
bl CheckLocalFlag
movs r1, #2
cmp r0, #0
beq _0806C964
movs r1, #1
_0806C964:
ldr r0, _0806C974 @ =gUnk_08113B0C
lsls r1, r1, #1
adds r1, r1, r0
ldrh r0, [r1]
adds r1, r4, #0
bl TextboxNoOverlap
pop {r4, pc}
.align 2, 0
_0806C974: .4byte gUnk_08113B0C
thumb_func_start sub_0806C978 thumb_func_start sub_0806C978
sub_0806C978: @ 0x0806C978 sub_0806C978: @ 0x0806C978
push {r4, lr} push {r4, lr}

2
include/entity.h
View File

@ -144,6 +144,6 @@ typedef struct Entity {
} Entity; } Entity;
#define COORD_TO_TILE(entity) ((((entity->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 0x3fU) | (((entity->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 0x3fU) << 6) #define COORD_TO_TILE(entity) ((((entity->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 0x3fU) | (((entity->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 0x3fU) * 64)
#endif #endif

4
include/functions.h
View File

@ -60,8 +60,8 @@ extern void sub_0807DD94(Entity*, u32);
extern Entity* sub_0805EB00(u32, u32, u32); extern Entity* sub_0805EB00(u32, u32, u32);
extern Entity* sub_0805EB2C(u32, u32, u32, u32, u32); extern Entity* sub_0805EB2C(u32, u32, u32, u32, u32);
extern s32 sub_0806ED9C(Entity*, u32, u32); extern s32 sub_0806ED9C(Entity*, u32, u32);
extern void sub_0806FF60(Entity*, u32, u32); extern void SetExtraSpriteFrame(Entity*, u32, u32);
extern void sub_0806FF88(Entity*, u32, u32); extern void SetSpriteSubEntryOffsetData1(Entity*, u32, u32);
extern void sub_0807000C(Entity*); extern void sub_0807000C(Entity*);
extern void sub_0805E47C(Entity*); extern void sub_0805E47C(Entity*);
extern void sub_0805E584(Entity*); extern void sub_0805E584(Entity*);

5
include/sprite.h
View File

@ -23,4 +23,9 @@ typedef struct {
} PACKED b; } PACKED b;
} PACKED frameSettings; } PACKED frameSettings;
} Frame; } Frame;
typedef struct {
u8 numGfxTiles;
u16 gfxTileIndex;
} FrameGfxData;
#endif #endif

1
linker.ld
View File

@ -540,6 +540,7 @@ SECTIONS {
asm/mama.o(.text); asm/mama.o(.text);
src/emma.o(.text); src/emma.o(.text);
asm/teachers.o(.text); asm/teachers.o(.text);
src/windTribespeople.o(.text);
asm/windTribespeople.o(.text); asm/windTribespeople.o(.text);
asm/gregal.o(.text); asm/gregal.o(.text);
asm/mayorHagen.o(.text); asm/mayorHagen.o(.text);

7
src/loadRoom.c
View File

@ -20,13 +20,8 @@ void LoadRoom(void)
sub_0804B128(0); sub_0804B128(0);
LoadRoomEntityList(); LoadRoomEntityList();
iVar1 = CheckGlobalFlag(21); if (CheckGlobalFlag(21)) sub_0804B058(sub_0804B128(2));
if (iVar1 != 0) {
dat = sub_0804B128(2);
sub_0804B058(dat);
}
sub_0804B128(3); sub_0804B128(3);
sub_0804B1AC(); sub_0804B1AC();
sub_0801AC98(); sub_0801AC98();
return;
} }

5
src/mailbox.c
View File

@ -59,7 +59,6 @@ void sub_08063280(Entity* this, u32 unused) {
e = this; e = this;
UpdateAnimationSingleFrame(); UpdateAnimationSingleFrame();
var = e->frames.all & 0x7F; var = e->frames.all & 0x7F;
e->frames.all = e->frames.all ^ var; e->frames.all ^= var;
if (var == 2) if (var == 2) CreateFx(e, 49, 0);
CreateFx(e, 49, 0);
} }

2
src/milkCart.c
View File

@ -16,7 +16,7 @@ void MilkCart(Entity* ent) {
void sub_08065B6C(Entity* ent) { void sub_08065B6C(Entity* ent) {
ent->action++; ent->action++;
ent->spriteSettings.b.ss0 = 1; ent->spriteSettings.b.ss0 = 1;
(ent->y).HALF.LO += -32768; (ent->y).HALF.LO += -0x8000;
ent->animationState = 6; ent->animationState = 6;
InitAnimationForceUpdate(ent, 3); InitAnimationForceUpdate(ent, 3);
} }

2
src/object1A.c
View File

@ -24,7 +24,7 @@ void sub_080869DC(Entity* ent) {
ent->action = 1; ent->action = 1;
ent->spriteSettings.b.ss0 = 0; ent->spriteSettings.b.ss0 = 0;
ent->boundingBox = &gUnk_080FD1A8; ent->boundingBox = &gUnk_080FD1A8;
ent->field_0x3c = ent->field_0x3c | 16; ent->field_0x3c |= 16;
itemEntity = CreateObject(0, ent->entityType.form, 0); itemEntity = CreateObject(0, ent->entityType.form, 0);
if (itemEntity != NULL) { if (itemEntity != NULL) {
itemEntity->actionDelay = 10; itemEntity->actionDelay = 10;

2
src/object1D.c
View File

@ -15,4 +15,4 @@ void sub_080874F8(Entity* this)
DeleteThisEntity(); DeleteThisEntity();
} }
void nullsub_117(){} void nullsub_117(Entity* this){}

8
src/ocarina.c
View File

@ -39,14 +39,14 @@ void OcarinaUse(ItemBehavior* itemBeh, s32 inputFlags) {
var = gLinkEntity.spriteSettings.raw & ~0x40; var = gLinkEntity.spriteSettings.raw & ~0x40;
gLinkEntity.spriteSettings.raw &= var; gLinkEntity.spriteSettings.raw &= var;
gLinkEntity.flags = gLinkEntity.flags & 127; gLinkEntity.flags &= 127;
gLinkEntity.itemCooldown = 2; gLinkEntity.itemCooldown = 2;
gLinkState.flags.all = (gLinkState.flags.all | 0x10000000); gLinkState.flags.all |= 0x10000000;
gLinkState.filler8[0] = 255; gLinkState.filler8[0] = 255;
gUnk_02034490 = 1; gUnk_02034490 = 1;
bVar1 = (8 >> inputFlags); bVar1 = (8 >> inputFlags);
gLinkState.unk3 = bVar1 | gLinkState.unk3; gLinkState.unk3 |= bVar1;
gLinkState.keepFacing = bVar1 | gLinkState.keepFacing; gLinkState.keepFacing |= bVar1;
sub_08078F60(); sub_08078F60();
sub_08077D38(itemBeh, inputFlags); sub_08077D38(itemBeh, inputFlags);
PlaySFX(534); PlaySFX(534);

4
src/octorok.c
View File

@ -109,11 +109,9 @@ void sub_0801EBC8(Entity* ent) {
#endif #endif
void sub_0801EBF4(Entity* ent) { void sub_0801EBF4(Entity* ent) {
u8 bVar1;
u32 uVar2; u32 uVar2;
bVar1 = ent->actionDelay -= 1; if (--ent->actionDelay == 0) {
if (bVar1 == 0) {
ent->action = 2; ent->action = 2;
uVar2 = Random(); uVar2 = Random();
ent->actionDelay = gUnk_080CA170[uVar2 & 3]; ent->actionDelay = gUnk_080CA170[uVar2 & 3];

6
src/talon.c
View File

@ -144,9 +144,9 @@ void sub_08065780(Entity* this, u16* param_2) {
} }
void Talon_Head(Entity* this) { void Talon_Head(Entity* this) {
sub_0806FF60(this, 0, ((this->frames.all & 7) + 0xB)); SetExtraSpriteFrame(this, 0, ((this->frames.all & 7) + 0xB));
sub_0806FF60(this, 1, this->frameIndex); SetExtraSpriteFrame(this, 1, this->frameIndex);
sub_0806FF88(this, 1, 0); SetSpriteSubEntryOffsetData1(this, 1, 0);
sub_0807000C(this); sub_0807000C(this);
} }

5
src/well.c
View File

@ -19,8 +19,7 @@ void sub_080A0EB0(Entity* ent) {
u32 tilePos; u32 tilePos;
ent->action = 1; ent->action = 1;
tilePos = (((ent->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 0x3F) | tilePos = COORD_TO_TILE(ent);
((((ent->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 0x3F) * 64);
ent->field_0x80 = tilePos; ent->field_0x80 = tilePos;
SetTile(16509, ent->field_0x80, 1); SetTile(16509, ent->field_0x80, 1);
} }
@ -29,7 +28,7 @@ void sub_080A0EF0(Entity* ent) {
s32 tileIndex; s32 tileIndex;
tileIndex = GetTileType(ent->field_0x80, 1); tileIndex = GetTileType(ent->field_0x80, 1);
if (tileIndex != 16509) { if (tileIndex != 0x407D) {
sub_08078B48(); sub_08078B48();
gLinkEntity.x.WORD = ent->x.WORD; gLinkEntity.x.WORD = ent->x.WORD;
gLinkEntity.y.HALF.HI = ent->y.HALF.HI + 4; gLinkEntity.y.HALF.HI = ent->y.HALF.HI + 4;

157
src/windTribespeople.c Normal file
View File

@ -0,0 +1,157 @@
#include "global.h"
#include "entity.h"
#include "npc.h"
#include "textbox.h"
typedef struct {
u8 filler[8];
u8 unk;
} struct_02002A40;
extern u32 LoadExtraSpriteData(Entity*, SpriteLoadData*);
extern void sub_0807DD50(Entity*);
extern void sub_0806C7D4(Entity*);
extern void sub_0806F118(Entity*);
extern void sub_0807DD94(Entity*, u32);
extern void sub_0807DD80(Entity*, u32*);
extern u32 CheckGlobalFlag(u32);
extern u32 CheckLocalFlag(u32);
extern u32 CheckRoomFlag(u32);
extern u32 sub_0801E99C();
extern void InitializeAnimation(Entity*, u32);
extern u32 UpdateFuseInteraction();
extern void sub_08078784(Entity*, u32);
extern void SetExtraSpriteFrame(Entity*, u32, u32);
extern void SetSpriteSubEntryOffsetData2(Entity*, u32, u32);
extern void SetSpriteSubEntryOffsetData1(Entity*, u32, u32);
extern void sub_0807000C(Entity*);
extern void ShowNPCDialogue(Entity*, u16*);
extern void TextboxNoOverlap(u32, Entity*);
extern void (*const gUnk_08113A7C[])(Entity*);
extern void (*const gUnk_08113A8C[])(Entity*, Entity*);
extern SpriteLoadData gUnk_08113A1C[];
extern u32 gUnk_08014A80;
extern u16 gUnk_08113ABC[];
extern struct_02002A40 gUnk_02002A40;
extern u16 gUnk_08113B0C[];
void WindTribespeople(Entity* this) {
gUnk_08113A7C[this->action](this);
}
void sub_0806C798(Entity* this) {
s32 iVar1;
iVar1 = LoadExtraSpriteData(this, gUnk_08113A1C + (this->entityType.form * 4));
if (iVar1 != 0) {
this->action = 1;
this->spriteSettings.b.ss0 = 1;
this->animationState = this->actionDelay;
sub_0807DD50(this);
sub_0806C7D4(this);
}
}
void sub_0806C7D4(Entity* this) {
u32 iVar1;
u32 uVar2;
if (this->interactType == '\x02') {
this->action = 3;
this->interactType = '\0';
sub_0806F118(this);
} else {
sub_0807DD94(this, 0);
if ((this->entityType.parameter == 3) && (!CheckGlobalFlag(0x58)) && (CheckLocalFlag(0x63)) &&
(CheckRoomFlag(0))) {
(this->entityType).parameter = 7;
sub_0807DD80(this, &gUnk_08014A80);
}
}
}
void sub_0806C834(Entity* this) {
if ((gTextBox.doTextBox & 0x7f) == 0) {
--this->action;
InitializeAnimation(this, (this->animationState / 2) + 4);
}
}
void sub_0806C85C(Entity* this) {
if (UpdateFuseInteraction() != 0) {
this->action = 1;
}
}
void sub_0806C870(Entity *this)
{
u8 bVar1;
bVar1 = sub_0801E99C();
this->field_0x68 = bVar1;
sub_08078784(this, this->field_0x68);
}
void WindTribespeople_Head(Entity *this)
{
u32 uVar1;
u32 uVar2;
u8 pbVar3;
pbVar3 = (this->frames.all & 0x3F);
if (this->entityType.form == 4) {
SetExtraSpriteFrame(this, 0, 9);
SetExtraSpriteFrame(this, 1, pbVar3);
SetExtraSpriteFrame(this, 2, this->frameIndex);
SetSpriteSubEntryOffsetData2(this, 2, 0);
SetSpriteSubEntryOffsetData1(this, 2, 1);
sub_0807000C(this);
}
else {
if (this->frames.b.f2 != 0) {
uVar2 = 1;
uVar1 = 0;
}
else {
uVar2 = 0;
uVar1 = 1;
}
SetExtraSpriteFrame(this, uVar2, pbVar3);
SetExtraSpriteFrame(this, uVar1, this->frameIndex);
SetSpriteSubEntryOffsetData1(this, uVar1, uVar2);
sub_0807000C(this);
}
}
//body and head entities?
void sub_0806C90C(Entity *param_1,Entity *param_2)
{
*(u32 *)&param_2->animationState = 0;
gUnk_08113A8C[param_1->entityType.parameter](param_1, param_2);
}
void sub_0806C928(Entity *this)
{
ShowNPCDialogue(this, gUnk_08113ABC + (gUnk_02002A40.unk * 4));
}
void sub_0806C944(Entity *this)
{
int iVar1;
int iVar2;
iVar1 = CheckGlobalFlag(0x58);
if (iVar1 == 0) {
iVar2 = 0;
}
else {
iVar1 = CheckLocalFlag(0x63);
iVar2 = 2;
if (iVar1 != 0) {
iVar2 = 1;
}
}
TextboxNoOverlap(gUnk_08113B0C[iVar2], this);
}