mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 13:30:47 +00:00
Code Issues Projects Releases Wiki Activity

pr changes

Browse source
This commit is contained in:
fig02 2020-03-30 14:52:06 -04:00
parent 9cb03972af
commit daa7877c96
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
View file

@ -170,7 +170,7 @@ void ArrowFire_Fly(ArrowFire* this, GlobalContext* globalCtx) {
ArrowFire_SetupAction(this, ArrowFire_Hit); ArrowFire_SetupAction(this, ArrowFire_Hit);
this->timer = 32; this->timer = 32;
this->alpha = 0xFF; this->alpha = 0xFF;
} else if (arrow->timer < 0x22) { } else if (arrow->timer < 34) {
if (this->alpha < 0x23) { if (this->alpha < 0x23) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} else { } else {

2
src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
View file

@ -170,7 +170,7 @@ void ArrowIce_Fly(ArrowIce* this, GlobalContext* globalCtx) {
ArrowIce_SetupAction(this, &ArrowIce_Hit); ArrowIce_SetupAction(this, &ArrowIce_Hit);
this->timer = 32; this->timer = 32;
this->alpha = 0xFF; this->alpha = 0xFF;
} else if (arrow->timer < 0x22) { } else if (arrow->timer < 34) {
if (this->alpha < 0x23) { if (this->alpha < 0x23) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} else { } else {

2
src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
View file

@ -170,7 +170,7 @@ void ArrowLight_Fly(ArrowLight* this, GlobalContext* globalCtx) {
ArrowLight_SetupAction(this, &ArrowLight_Hit); ArrowLight_SetupAction(this, &ArrowLight_Hit);
this->timer = 32; this->timer = 32;
this->alpha = 0xFF; this->alpha = 0xFF;
} else if (arrow->timer < 0x22) { } else if (arrow->timer < 34) {
if (this->alpha < 0x23) { if (this->alpha < 0x23) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} else { } else {

1
src/overlays/actors/ovl_En_Arrow/z_en_arrow.h
View file

@ -9,6 +9,7 @@ typedef struct {
/* 0x014C */ char unk_14C[0xFC]; /* 0x014C */ char unk_14C[0xFC];
/* 0x0248 */ u8 timer; // used for dissapearing when flying or hitting a wall /* 0x0248 */ u8 timer; // used for dissapearing when flying or hitting a wall
/* 0x0249 */ u8 hitWall; /* 0x0249 */ u8 hitWall;
/* 0x024A */ char unk_24A[0x16];
} EnArrow; // size = 0x0260 } EnArrow; // size = 0x0260
extern const ActorInit En_Arrow_InitVars; extern const ActorInit En_Arrow_InitVars;