mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-19 13:54:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Format

Browse Source
This commit is contained in:
Elliptic Ellipsis
2022-06-28 03:28:39 +01:00
parent 890a554427
commit 598896cefd
12 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/gyorgChild.c
+1 -2
View File
@@ -77,8 +77,7 @@ void GyorgChild_OnGrabbed_Action3(GyorgChildEntity* this) {
void GyorgChild_Action0(GyorgChildEntity* this) {
static const s8 gUnk_080D1EA0[] = {
80, 1, 64, 1, 48, 0x1, 32, 1, 16, 1, 0,
0, 16, -1, 32, -1, 48, -1, 64, -1, 80, -1,
80, 1, 64, 1, 48, 1, 32, 1, 16, 1, 0, 0, 16, -1, 32, -1, 48, -1, 64, -1, 80, -1,
};
super->gustJarFlags = 1;
super->spriteOrientation.flipY = 3;
src/enemy/keaton.c
+1 -2
View File
@@ -153,8 +153,7 @@ void sub_080325C4(Entity* this) {
}
u32 sub_080325E8(Entity* this) {
if ((sub_08049FA0(this) && sub_08049FDC(this, 1)) &&
(EntityInRectRadius(this, gUnk_020000B0, 0x68, 0x40) != 0)) {
if ((sub_08049FA0(this) && sub_08049FDC(this, 1)) && (EntityInRectRadius(this, gUnk_020000B0, 0x68, 0x40) != 0)) {
if (((GetFacingDirection(this, gUnk_020000B0) - (DirectionRound(this->frame)) + 2) & 0x1F) < 5) {
this->action = 3;
this->timer = 12;
src/enemy/octorokBoss.c
+3 -3
View File
@@ -380,7 +380,7 @@ void OctorokBoss_Intro_SubAction3(OctorokBossEntity* this) {
void OctorokBoss_Intro_SubAction4(OctorokBossEntity* this) {
if (this->timer-- == 0) {
super->subAction = 5;
this->timer = 45;;
this->timer = 45;
// Make the player look towards the exit
gPlayerEntity.animationState = 0;
} else {
@@ -715,7 +715,7 @@ void OctorokBoss_Action1_Attack_Type2_1(OctorokBossEntity* this) {
this->heap->targetAngle = this->angle.HALF.HI;
} else {
super->type2 = 2;
this->timer = 45;;
this->timer = 45;
}
SoundReq(SFX_155);
}
@@ -813,7 +813,7 @@ void OctorokBoss_ExecuteAttackVacuum(OctorokBossEntity* this) {
if (this->unk_80 == 1) {
this->unk_80 = 2;
super->type2 = 2;
this->timer = 45;;
this->timer = 45;
this->angularSpeed.HWORD = 0x100;
this->heap->field_0x2 = 0;
return;