izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Change Magic_Reset

Browse Source
This commit is contained in:
engineer124
2022-05-26 14:30:12 +10:00
parent 1245328efe
commit 611fb1afd1
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -1
View File
@@ -1934,7 +1934,7 @@ void Health_GiveHearts(s16 hearts);
void Rupees_ChangeBy(s16 rupeeChange);
void Inventory_ChangeAmmo(s16 item, s16 ammoChange);
void Magic_Add(GlobalContext* globalCtx, s16 magicToAdd);
void Magic_Reset(GameState* gamestate);
void Magic_Reset(GlobalContext* globalCtx);
s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 type);
// void func_80116FD8(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
// void func_801170B8(void);
src/code/z_actor.c
+1 -1
View File
@@ -2218,7 +2218,7 @@ s32 func_800B90AC(GlobalContext* globalCtx, Actor* actor, CollisionPoly* polygon
void Actor_DisableLens(GlobalContext* globalCtx) {
if (globalCtx->actorCtx.lensActive) {
globalCtx->actorCtx.lensActive = false;
Magic_Reset(&globalCtx->state);
Magic_Reset(globalCtx);
}
}
src/code/z_parameter.c
+1 -1
View File
@@ -3174,7 +3174,7 @@ void Magic_Add(GlobalContext* globalCtx, s16 magicToAdd) {
}
}
void Magic_Reset(GameState* gamestate) {
void Magic_Reset(GlobalContext* globalCtx) {
if ((gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY) && (gSaveContext.magicState != MAGIC_STATE_FILL)) {
sMagicMeterOutlinePrimRed = sMagicMeterOutlinePrimGreen = sMagicMeterOutlinePrimBlue = 255;
gSaveContext.magicState = MAGIC_STATE_IDLE;
src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
+1 -1
View File
@@ -81,7 +81,7 @@ void ArrowFire_Init(Actor* thisx, GlobalContext* globalCtx) {
void ArrowFire_Destroy(Actor* thisx, GlobalContext* globalCtx) {
ArrowFire* this = THIS;
Magic_Reset(&globalCtx->state);
Magic_Reset(globalCtx);
Collider_DestroyQuad(globalCtx, &this->collider1);
Collider_DestroyQuad(globalCtx, &this->collider2);
}
src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
+1 -1
View File
@@ -57,7 +57,7 @@ void ArrowIce_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void ArrowIce_Destroy(Actor* thisx, GlobalContext* globalCtx) {
Magic_Reset(&globalCtx->state);
Magic_Reset(globalCtx);
(void)"消滅"; // Unreferenced in retail, means "Disappearance"
}
src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
+1 -1
View File
@@ -56,7 +56,7 @@ void ArrowLight_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void ArrowLight_Destroy(Actor* thisx, GlobalContext* globalCtx) {
Magic_Reset(&globalCtx->state);
Magic_Reset(globalCtx);
(void)"消滅"; // Unreferenced in retail, means "Disappearance"
}
src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+5 -5
View File
@@ -139,7 +139,7 @@ void EnArrow_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
if ((this->actor.params >= ENARROW_3) && (this->actor.params < ENARROW_6) && (this->actor.child == NULL)) {
Magic_Reset(&globalCtx->state);
Magic_Reset(globalCtx);
}
}
@@ -162,13 +162,13 @@ void func_8088A594(EnArrow* this, GlobalContext* globalCtx) {
this->bubble.unk_148++;
if (this->bubble.unk_148 > 20) {
this->actionFunc = func_8088ACE0;
Magic_Reset(&globalCtx->state);
Magic_Reset(globalCtx);
}
}
} else {
if ((this->actor.params != ENARROW_8) && (player->unk_D57 == 0)) {
if (this->actor.params == ENARROW_7) {
Magic_Reset(&globalCtx->state);
Magic_Reset(globalCtx);
}
Actor_MarkForDeath(&this->actor);
return;
@@ -202,7 +202,7 @@ void func_8088A594(EnArrow* this, GlobalContext* globalCtx) {
this->bubble.unk_144 = CLAMP_MIN(this->bubble.unk_144, 3.5f);
func_8088A514(this);
this->unk_260 = 99;
Magic_Reset(&globalCtx->state);
Magic_Reset(globalCtx);
} else if (this->actor.params >= ENARROW_6) {
if ((this->actor.params == ENARROW_8) && (this->actor.world.rot.x < 0)) {
Actor_SetScale(&this->actor, 0.009f);
@@ -311,7 +311,7 @@ void func_8088AA98(EnArrow* this, GlobalContext* globalCtx) {
return;
}
Magic_Reset(&globalCtx->state);
Magic_Reset(globalCtx);
}
}
}
src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c
+1 -1
View File
@@ -38,7 +38,7 @@ void OceffWipe6_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void OceffWipe6_Destroy(Actor* thisx, GlobalContext* globalCtx) {
Magic_Reset(&globalCtx->state);
Magic_Reset(globalCtx);
globalCtx->msgCtx.unk120B0 = 0;
}