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

Merge pull request #300 from hatal175/sub_0803AA98 

Match sub_0803AA98
This commit is contained in:
notyourav 2022-01-20 21:15:59 -08:00 committed by GitHub
parent dae9e7bc74 1c84f155e9
commit 82c9634d19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
asm/non_matching/mazaal/sub_0803AA98.inc
View File

@ -1,60 +0,0 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
ldr r2, _0803AB0C @ =gUnk_080CED6C
ldr r0, [r4, #0x50]
ldrb r0, [r0, #0xf]
lsrs r0, r0, #4
adds r0, #3
ldrb r1, [r4, #0xa]
lsls r1, r1, #1
adds r0, r0, r1
movs r1, #7
ands r0, r1
adds r0, r0, r2
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
adds r0, #4
strh r0, [r4, #0x36]
adds r0, r4, #0
bl sub_0803B870
cmp r0, #0
bne _0803AB0A
adds r0, r4, #0
bl LinearMoveUpdate
adds r0, r4, #0
bl sub_0803B6F4
cmp r0, #0
beq _0803AB0A
movs r0, #0x14
strb r0, [r4, #0xc]
movs r0, #0x40
strh r0, [r4, #0x24]
adds r0, r4, #0
movs r1, #0xa
bl InitializeAnimation
ldr r2, [r4, #0x74]
ldrb r1, [r2, #0x10]
movs r0, #0x80
orrs r0, r1
strb r0, [r2, #0x10]
ldr r2, [r4, #0x54]
adds r1, r2, #0
adds r1, #0x3f
movs r0, #0x13
strb r0, [r1]
adds r0, r2, #0
movs r1, #5
bl InitAnimationForceUpdate
movs r0, #0xb7
lsls r0, r0, #1
bl SoundReq
_0803AB0A:
pop {r4, pc}
.align 2, 0
_0803AB0C: .4byte gUnk_080CED6C
.syntax divided

7
src/enemy/mazaalBracelet.c
View File

@ -590,8 +590,7 @@ void sub_0803AA00(Entity* this) {
} }
} }
} }
void sub_0803AA98(Entity* this) {
NONMATCH("asm/non_matching/mazaal/sub_0803AA98.inc", void sub_0803AA98(Entity* this)) {
Entity* temp; Entity* temp;
s8* ptr; s8* ptr;
u32 index; u32 index;
@ -605,7 +604,8 @@ NONMATCH("asm/non_matching/mazaal/sub_0803AA98.inc", void sub_0803AA98(Entity* t
this->action = 0x14; this->action = 0x14;
this->speed = 0x40; this->speed = 0x40;
InitializeAnimation(this, 10); InitializeAnimation(this, 10);
(*(Entity**)&this->field_0x74)->flags |= 0x80; temp = (*(Entity**)&this->field_0x74);
temp->flags |= 0x80;
temp = this->child; temp = this->child;
temp->hitType = 0x13; temp->hitType = 0x13;
InitAnimationForceUpdate(temp, 5); InitAnimationForceUpdate(temp, 5);
@ -613,7 +613,6 @@ NONMATCH("asm/non_matching/mazaal/sub_0803AA98.inc", void sub_0803AA98(Entity* t
} }
} }
} }
END_NONMATCH
void sub_0803AB10(Entity* this) { void sub_0803AB10(Entity* this) {
s8* ptr; s8* ptr;