summaryrefslogtreecommitdiff
path: root/src/object/gyorgBossObject.c
diff options
context:
space:
mode:
authorElliptic Ellipsis <elliptic.ellipsis@gmail.com>2022-06-22 00:00:57 +0100
committerElliptic Ellipsis <elliptic.ellipsis@gmail.com>2022-06-22 00:00:57 +0100
commit69568e03b0e717ec0e451cf753ebfde88c48e010 (patch)
tree522a315a27038d377d66338863abac1e6ba3fe26 /src/object/gyorgBossObject.c
parent66fb42033db0e282339dd0bdb485dde0d1d4c26a (diff)
Should be the rest of them
Diffstat (limited to 'src/object/gyorgBossObject.c')
-rw-r--r--src/object/gyorgBossObject.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/object/gyorgBossObject.c b/src/object/gyorgBossObject.c
index 8a2ee8b4..251b3969 100644
--- a/src/object/gyorgBossObject.c
+++ b/src/object/gyorgBossObject.c
@@ -63,7 +63,7 @@ void GyorgBossObject_SetupStart(GyorgBossObjectEntity* this) {
return;
super->action = 1;
super->myHeap = heap;
- this->timer = 0x258;
+ this->timer = 600;
this->unk_6c = 0;
heap->boss = this;
tmp = CreateEnemy(GYORG_FEMALE, 0);
@@ -120,7 +120,7 @@ void GyorgBossObject_FemalePhase1(GyorgBossObjectEntity* this) {
if (((GyorgHeap*)super->myHeap)->female->base.health == 0) {
// start male phase 1
super->action = 3;
- super->timer = 0x23;
+ super->timer = 35;
this->unk_6c = 1;
this->unk_78 = 0x400;
this->unk_7b = 1;
@@ -156,7 +156,7 @@ void GyorgBossObject_FemalePhase2(GyorgBossObjectEntity* this) {
// start male phase 2
((GyorgHeap*)super->myHeap)->male1->base.health = 12;
super->action = 5;
- super->timer = 0x23;
+ super->timer = 35;
this->unk_6c = 2;
this->unk_78 = 0x400;
this->unk_7b = 1;
@@ -191,7 +191,7 @@ void GyorgBossObject_FemalePhase3(GyorgBossObjectEntity* this) {
// start male phase 3
((GyorgHeap*)super->myHeap)->male2->base.health = 12;
super->action = 7;
- super->timer = 0x23;
+ super->timer = 35;
this->unk_6c = 0x104;
this->unk_78 = 0x400;
SoundReq(SFX_BOSS_DIE);
@@ -228,8 +228,8 @@ void GyorgBossObject_FemalePhase4(GyorgBossObjectEntity* this) {
if (PlayerCanBeMoved() && gPlayerEntity.z.HALF.HI == 0) {
super->action = 9;
super->timer = 0;
- super->subtimer = 0xF0;
- this->timer = 0x1a4;
+ super->subtimer = 240;
+ this->timer = 420;
super->direction = 0;
super->speed = 0x60;
gPlayerState.flags &= ~PL_FLAGS20000;