mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-28 15:18:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #341 from Henny022p/subtask

Browse Source
This commit is contained in:
notyourav
2022-02-01 20:28:25 -08:00
committed by GitHub
parent b455aaf013 5824dc8467
commit dcc3ac2192
44 changed files with 2597 additions and 4230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/gleerok.c
+3 -3
View File
@@ -125,7 +125,7 @@ void sub_0802D034(GleerokEntity* this) {
void sub_0802D158(GleerokEntity* this) {
super->action = 1;
gUnk_02034490[0] = 1;
gUnk_02034490.unk0 = 1;
SetFade(7, 8);
}
@@ -373,7 +373,7 @@ void sub_0802D650(GleerokEntity* this) {
void sub_0802D674(GleerokEntity* this) {
u32 val;
gUnk_02034490[0] = 1;
gUnk_02034490.unk0 = 1;
if (gPlayerEntity.z.WORD != 0)
return;
@@ -464,7 +464,7 @@ void sub_0802D7B4(GleerokEntity* this) {
#ifndef EU
gPlayerState.controlMode = CONTROL_1;
#endif
gUnk_02034490[0] = 0;
gUnk_02034490.unk0 = 0;
SoundReq(BGM_BOSS_THEME);
return;
} else {
src/enemy/octorokBoss.c
+3 -3
View File
@@ -197,7 +197,7 @@ void OctorokBoss_Hit_SubAction0(Entity* this) {
GET_HELPER(this)->fallingStonesTimer = 0;
if (GET_BOSS_PHASE(this) == 4) {
this->subAction = 4;
gUnk_02034490[0] = 1;
gUnk_02034490.unk0 = 1;
sub_08078B48();
SoundReq(SFX_BOSS_DIE);
} else {
@@ -504,7 +504,7 @@ ASM_FUNC("asm/non_matching/octorokBoss/OctorokBoss_Init.inc", void OctorokBoss_I
void OctorokBoss_Intro(Entity* this) {
sub_08078B48();
gUnk_02034490[0] = 1;
gUnk_02034490.unk0 = 1;
sub_08036F60(this);
OctorokBoss_Intro_SubActions[this->subAction](this);
sub_0805EC9C(this, this->field_0x76.HWORD, this->field_0x74.HWORD, GET_ANGLE(this));
@@ -578,7 +578,7 @@ void OctorokBoss_Intro_SubAction5(Entity* this) {
this->subAction = 0;
gRoomControls.unk5 = gPlayerEntity.animationState;
OctorokBoss_SetAttackTimer(this);
gUnk_02034490[0] = 0;
gUnk_02034490.unk0 = 0;
SoundReq(BGM_BOSS_THEME);
}
} else {