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

Merge pull request #241 from hatal175/chuchu 

Decompile EU sub_0801F428
This commit is contained in:
notyourav 2022-01-04 16:19:23 -08:00 committed by GitHub
parent 0698806e00 0280065914
commit 07a0c88eb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
asm/non_matching/eu/sub_0801F428.inc
View File

@ -1,47 +0,0 @@
.syntax unified
push {r4, r5, lr}
adds r5, r0, #0
bl sub_0804A720
movs r4, #0
movs r0, #1
strb r0, [r5, #0xc]
bl Random
strb r0, [r5, #0xe]
adds r0, r5, #0
adds r0, #0x45
ldrb r1, [r0]
adds r0, #0x3b
strb r1, [r0]
adds r0, #2
strb r4, [r0]
ldrb r0, [r5, #0xb]
cmp r0, #0
beq _0801F484
movs r0, #3
strb r0, [r5, #0xc]
movs r0, #0x1e
strb r0, [r5, #0xf]
adds r0, r5, #0
movs r1, #1
bl sub_08049F84
strb r0, [r5, #0x15]
ldrb r0, [r5, #0x10]
movs r1, #0x80
orrs r0, r1
strb r0, [r5, #0x10]
adds r2, r5, #0
adds r2, #0x29
ldrb r1, [r2]
movs r0, #0x39
rsbs r0, r0, #0
ands r0, r1
movs r1, #0x18
orrs r0, r1
strb r0, [r2]
adds r0, r5, #0
movs r1, #2
bl InitializeAnimation
_0801F484:
pop {r4, r5, pc}
.align 2, 0
.syntax divided

13
src/enemy/chuchu.c
View File

@ -331,9 +331,6 @@ void sub_0801F3AC(Entity* this) {
}
}
#ifdef EU
ASM_FUNC("asm/non_matching/eu/sub_0801F428.inc", void sub_0801F428(Entity* this))
#else
void sub_0801F428(Entity* this) {
sub_0804A720(this);
this->action = 1;
@ -345,12 +342,20 @@ void sub_0801F428(Entity* this) {
this->action = 3;
this->field_0xf = 30;
#ifdef EU
this->direction = sub_08049F84(this, 1);
#endif
COLLISION_ON(this);
this->spritePriority.b1 = 3;
#ifndef EU
this->spriteSettings.draw = 1;
#endif
InitializeAnimation(this, 2);
}
#endif
void sub_0801F48C(Entity* this) {
GetNextFrame(this);