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

Merge pull request #344 from hatal175/cucco

This commit is contained in:
notyourav 2022-02-02 00:55:41 -08:00 committed by GitHub
parent 408fec1619 38011442e0
commit 6c5a8a3600
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 67 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
asm/non_matching/cucco/sub_0806E564.inc
View File

@ -1,64 +0,0 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xd]
cmp r0, #0
bne _0806E5AA
adds r0, #1
strb r0, [r4, #0xd]
bl Random
movs r2, #1
ands r0, r2
cmp r0, #0
beq _0806E590
ldrb r0, [r4, #0x18]
lsls r1, r0, #0x19
lsrs r1, r1, #0x1f
eors r1, r2
lsls r1, r1, #6
subs r2, #0x42
ands r2, r0
orrs r2, r1
strb r2, [r4, #0x18]
_0806E590:
bl Random
movs r1, #1
ands r0, r1
adds r0, #1
strb r0, [r4, #0xe]
movs r0, #0xc0
lsls r0, r0, #9
str r0, [r4, #0x20]
adds r0, r4, #0
movs r1, #1
bl InitAnimationForceUpdate
_0806E5AA:
movs r1, #0xa0
lsls r1, r1, #6
adds r0, r4, #0
bl GravityUpdate
cmp r0, #0
bne _0806E5D4
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
lsls r0, r0, #0x18
lsrs r1, r0, #0x18
cmp r1, #0
bne _0806E5CE
movs r0, #1
strb r0, [r4, #0xc]
strb r1, [r4, #0xd]
b _0806E5D4
_0806E5CE:
movs r0, #0xc0
lsls r0, r0, #9
str r0, [r4, #0x20]
_0806E5D4:
adds r0, r4, #0
bl sub_0806E65C
adds r0, r4, #0
bl UpdateAnimationSingleFrame
pop {r4, pc}
.align 2, 0
.syntax divided

50
asm/non_matching/cucco/sub_0806E5E4.inc
View File

@ -1,50 +0,0 @@
.syntax unified
push {r4, r5, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xd]
cmp r0, #0
bne _0806E622
adds r0, #1
strb r0, [r4, #0xd]
bl Random
movs r5, #1
ands r0, r5
cmp r0, #0
beq _0806E612
ldrb r0, [r4, #0x18]
lsls r1, r0, #0x19
lsrs r1, r1, #0x1f
eors r1, r5
lsls r1, r1, #6
movs r2, #0x41
rsbs r2, r2, #0
ands r2, r0
orrs r2, r1
strb r2, [r4, #0x18]
_0806E612:
bl Random
adds r1, r0, #0
ands r1, r5
adds r1, #2
adds r0, r4, #0
bl InitAnimationForceUpdate
_0806E622:
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _0806E638
movs r1, #0
movs r0, #1
strb r0, [r4, #0xc]
strb r1, [r4, #0xd]
_0806E638:
adds r0, r4, #0
bl sub_0806E65C
adds r0, r4, #0
bl UpdateAnimationSingleFrame
pop {r4, r5, pc}
.align 2, 0
.syntax divided

26
asm/non_matching/cucco/sub_0806E6A8.inc
View File

@ -1,26 +0,0 @@
.syntax unified
push {r4, r5, lr}
adds r4, r0, #0
movs r5, #0
bl sub_08002632
ldr r1, _0806E6D4 @ =gSave
ldr r2, _0806E6D8 @ =0x000001C1
adds r1, r1, r2
adds r0, r0, r1
ldrb r0, [r0]
cmp r0, #0xf3
bne _0806E6C2
movs r5, #1
_0806E6C2:
ldr r0, _0806E6DC @ =gUnk_081145D0
lsls r1, r5, #1
adds r1, r1, r0
ldrh r0, [r1]
adds r1, r4, #0
bl MessageNoOverlap
pop {r4, r5, pc}
.align 2, 0
_0806E6D4: .4byte gSave
_0806E6D8: .4byte 0x000001C1
_0806E6DC: .4byte gUnk_081145D0
.syntax divided

10
assets/assets.json
View File

@ -41015,16 +41015,6 @@
"start": 1131772,
"size": 64
},
{
"path": "cucco/gUnk_081145C8.bin",
"start": 1131976,
"size": 8
},
{
"path": "cucco/gUnk_081145D0.bin",
"start": 1131984,
"size": 4
},
{
"path": "phonograph/gUnk_081145E4.bin",
"start": 1132004,

18
data/const/npc/cucco.s
View File

@ -1,18 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081145B4:: @ 081145B4
.4byte sub_0806E4B8
.4byte sub_0806E4EC
.4byte sub_0806E564
.4byte sub_0806E5E4
.4byte sub_0806E648
gUnk_081145C8:: @ 081145C8
.incbin "cucco/gUnk_081145C8.bin"
gUnk_081145D0:: @ 081145D0
.incbin "cucco/gUnk_081145D0.bin"

2
linker.ld
View File

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

78
src/npc/cucco.c
View File

@ -1,20 +1,19 @@
#include "npc.h"
#include "functions.h"
extern void (*const gUnk_081145B4[])(Entity*);
void (*const Cucco_Actions[])(Entity*);
const u16 Cucco_Sounds[];
const u16 Cucco_Messages[];
void sub_0806E4EC(Entity*);
void sub_0806E6A8(Entity*);
extern u16 gUnk_081145C8[];
void Cucco_ShowMessage(Entity*);
void sub_0806E65C(Entity* this);
void Cucco(Entity* this) {
gUnk_081145B4[this->action](this);
Cucco_Actions[this->action](this);
}
void sub_0806E4B8(Entity* this) {
void Cucco_Init(Entity* this) {
this->action += 1;
this->field_0x68.HALF.LO = sub_0801E99C(this);
sub_080787A8(this, this->field_0x68.HALF.LO);
@ -37,16 +36,56 @@ void sub_0806E4EC(Entity* this) {
}
this->subAction = 0;
if ((Random() & 1) != 0) {
EnqueueSFX(gUnk_081145C8[Random() & 3]);
EnqueueSFX(Cucco_Sounds[Random() & 3]);
}
}
sub_0806E65C(this);
UpdateAnimationSingleFrame(this);
}
ASM_FUNC("asm/non_matching/cucco/sub_0806E564.inc", void sub_0806E564(Entity* this))
void Cucco_Fly(Entity* this) {
if (this->subAction == 0) {
this->subAction++;
if (Random() & 1) {
this->spriteSettings.flipX ^= 1;
}
ASM_FUNC("asm/non_matching/cucco/sub_0806E5E4.inc", void sub_0806E5E4(Entity* this))
this->actionDelay = (Random() & 1) + 1;
this->zVelocity = 0x18000;
InitAnimationForceUpdate(this, 1);
}
if (GravityUpdate(this, 0x2800) == 0) {
if (--this->actionDelay == 0) {
this->action = 1;
this->subAction = 0;
} else {
this->zVelocity = 0x18000;
}
}
sub_0806E65C(this);
UpdateAnimationSingleFrame(this);
}
void Cucco_Idle(Entity* this) {
if (this->subAction == 0) {
this->subAction++;
if (Random() & 1) {
this->spriteSettings.flipX ^= 1;
}
InitAnimationForceUpdate(this, (Random() & 1) + 2);
}
if (this->frame & 0x80) {
this->action = 1;
this->subAction = 0;
}
sub_0806E65C(this);
UpdateAnimationSingleFrame(this);
}
void sub_0806E648(Entity* this) {
if (UpdateFuseInteraction(this) != 0) {
@ -61,7 +100,7 @@ void sub_0806E65C(Entity* this) {
this->action = 4;
sub_0806F118(this);
} else {
sub_0806E6A8(this);
Cucco_ShowMessage(this);
}
} else {
ResetPlayerAnimationAndAction();
@ -71,7 +110,15 @@ void sub_0806E65C(Entity* this) {
}
}
ASM_FUNC("asm/non_matching/cucco/sub_0806E6A8.inc", void sub_0806E6A8(Entity* this))
void Cucco_ShowMessage(Entity* this) {
u32 val = 0;
u32 index = sub_08002632(this);
if (gSave.unk1C1[index] == 0xf3) {
val = 1;
}
MessageNoOverlap(Cucco_Messages[val], this);
}
void Cucco_Fusion(Entity* this) {
if (this->action == 0) {
@ -82,3 +129,10 @@ void Cucco_Fusion(Entity* this) {
UpdateAnimationSingleFrame(this);
}
}
void (*const Cucco_Actions[])(Entity*) = {
Cucco_Init, sub_0806E4EC, Cucco_Fly, Cucco_Idle, sub_0806E648,
};
const u16 Cucco_Sounds[] = { SFX_VO_CUCCO1, SFX_VO_CUCCO2, SFX_VO_CUCCO3, SFX_VO_CUCCO4 };
const u16 Cucco_Messages[] = { 0xdb4, 0xdb5 };