summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authornotyourav <65437533+notyourav@users.noreply.github.com>2022-01-04 16:19:23 -0800
committerGitHub <noreply@github.com>2022-01-04 16:19:23 -0800
commit07a0c88eb7ca2ea29db1abab8151887f72d45bbd (patch)
tree85846be37f4d9b11b62875957b2684a91120d423 /src
parent0698806e00d7da64f5c007e23426ed68d52c69ea (diff)
parent028006591481eed1142879887d98b2f90e9d9799 (diff)
Merge pull request #241 from hatal175/chuchu
Decompile EU sub_0801F428
Diffstat (limited to 'src')
-rw-r--r--src/enemy/chuchu.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c
index 9f10023a..308fb47f 100644
--- a/src/enemy/chuchu.c
+++ b/src/enemy/chuchu.c
@@ -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);