diff options
| author | fig02 <fig02srl@gmail.com> | 2020-03-30 14:52:06 -0400 |
|---|---|---|
| committer | fig02 <fig02srl@gmail.com> | 2020-03-30 14:52:06 -0400 |
| commit | daa7877c96bf1df0e080de2d4af138772963fe9b (patch) | |
| tree | be5568bc63cabba12e6e9f900e720a5abe0fbb51 /src | |
| parent | 9cb03972afebe5870f530ca1f1cc335d699fd75a (diff) | |
pr changes
Diffstat (limited to 'src')
4 files changed, 4 insertions, 3 deletions
diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 28a2f963f..fe21fd929 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -170,7 +170,7 @@ void ArrowFire_Fly(ArrowFire* this, GlobalContext* globalCtx) { ArrowFire_SetupAction(this, ArrowFire_Hit); this->timer = 32; this->alpha = 0xFF; - } else if (arrow->timer < 0x22) { + } else if (arrow->timer < 34) { if (this->alpha < 0x23) { Actor_Kill(&this->actor); } else { diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 475e5b135..2835ad6cf 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -170,7 +170,7 @@ void ArrowIce_Fly(ArrowIce* this, GlobalContext* globalCtx) { ArrowIce_SetupAction(this, &ArrowIce_Hit); this->timer = 32; this->alpha = 0xFF; - } else if (arrow->timer < 0x22) { + } else if (arrow->timer < 34) { if (this->alpha < 0x23) { Actor_Kill(&this->actor); } else { diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 621d90e1c..a91c2fce9 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -170,7 +170,7 @@ void ArrowLight_Fly(ArrowLight* this, GlobalContext* globalCtx) { ArrowLight_SetupAction(this, &ArrowLight_Hit); this->timer = 32; this->alpha = 0xFF; - } else if (arrow->timer < 0x22) { + } else if (arrow->timer < 34) { if (this->alpha < 0x23) { Actor_Kill(&this->actor); } else { diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h index cf9bf9559..3ac1e13ac 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h @@ -9,6 +9,7 @@ typedef struct { /* 0x014C */ char unk_14C[0xFC]; /* 0x0248 */ u8 timer; // used for dissapearing when flying or hitting a wall /* 0x0249 */ u8 hitWall; + /* 0x024A */ char unk_24A[0x16]; } EnArrow; // size = 0x0260 extern const ActorInit En_Arrow_InitVars; |