Decompile last function in CuccoChick + data

This commit is contained in:
Tal Hayon 2022-02-11 03:34:00 +02:00
parent f8d8c0fd92
commit 1705f682e5
3 changed files with 33 additions and 18 deletions

View File

@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081145D4:: @ 081145D4
.4byte sub_0806E730
.4byte sub_0806E764
.4byte sub_0806E7B0
.4byte sub_0806E824

View File

@ -1326,7 +1326,7 @@ SECTIONS {
data/const/npc/hurdyGurdyMan.o(.rodata);
data/animations/npc/hurdyGurdyMan.o(.rodata);
src/npc/cucco.o(.rodata);
data/const/npc/cuccoChick.o(.rodata);
src/npc/cuccoChick.o(.rodata);
data/const/npc/phonograph.o(.rodata);
data/const/npc/npc58.o(.rodata);
src/npcDefinitions.o(.rodata);

View File

@ -1,20 +1,27 @@
#include "npc.h"
#include "functions.h"
extern void (*const gUnk_081145D4[])(Entity*);
void CuccoChick_Init(Entity*);
void sub_0806E764(Entity*);
void CuccoChick_Fly(Entity*);
void sub_0806E824(Entity*);
void sub_0806E838(Entity* this);
void sub_0806E884(Entity* this);
void CuccoChick(Entity* this) {
gUnk_081145D4[this->action](this);
static void (*const CuccoChick_Actions[])(Entity*) = {
CuccoChick_Init,
sub_0806E764,
CuccoChick_Fly,
sub_0806E824,
};
CuccoChick_Actions[this->action](this);
sub_0806ED78(this);
}
void sub_0806E730(Entity* this) {
void CuccoChick_Init(Entity* this) {
this->action += 1;
this->field_0x68.HALF.LO = sub_0801E99C(this);
sub_080787A8(this, this->field_0x68.HALF.LO);
@ -33,13 +40,32 @@ void sub_0806E764(Entity* this) {
this->action = 2;
this->subAction = 0;
if ((Random() & 1) != 0) {
EnqueueSFX(0xd6);
EnqueueSFX(SFX_VO_CHEEP);
}
}
sub_0806E838(this);
}
ASM_FUNC("asm/non_matching/cuccoChick/sub_0806E7B0.inc", void sub_0806E7B0(Entity* this))
void CuccoChick_Fly(Entity* this) {
if (this->subAction == 0) {
this->subAction++;
if ((Random() & 1) != 0) {
this->spriteSettings.flipX ^= 1;
}
this->actionDelay = (Random() & 3) + 1;
this->zVelocity = 0x10000;
this->frameIndex = 1;
}
if (GravityUpdate(this, 0x3000) == 0) {
if (--this->actionDelay == 0) {
this->action = 1;
this->subAction = 0;
} else {
this->zVelocity = 0x10000;
}
}
sub_0806E838(this);
}
void sub_0806E824(Entity* this) {
if (UpdateFuseInteraction(this) != 0) {