From 5807436943ebe1590fb077e17d9879c087afc6ae Mon Sep 17 00:00:00 2001 From: Baoulettes Date: Wed, 27 Apr 2022 04:50:56 +0200 Subject: [PATCH] Update Tunic/Navi mods with new variable name. --- soh/src/code/z_actor.c | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c index 0c46a8fc5..0ed71348e 100644 --- a/soh/src/code/z_actor.c +++ b/soh/src/code/z_actor.c @@ -335,36 +335,36 @@ void func_8002BE98(TargetContext* targetCtx, s32 actorCategory, GlobalContext* g void func_8002BF60(TargetContext* targetCtx, Actor* actor, s32 actorCategory, GlobalContext* globalCtx) { NaviColor* naviColor = &sNaviColorList[actorCategory]; if (actorCategory == ACTORCAT_PLAYER) { - naviColor->inner.r = CVar_GetS32("gNavi_Idle_Inner_Red", naviColor->inner.r); - naviColor->inner.g = CVar_GetS32("gNavi_Idle_Inner_Green", naviColor->inner.g); - naviColor->inner.b = CVar_GetS32("gNavi_Idle_Inner_Blue", naviColor->inner.b); - naviColor->outer.r = CVar_GetS32("gNavi_Idle_Outer_Red", naviColor->outer.r); - naviColor->outer.g = CVar_GetS32("gNavi_Idle_Outer_Green", naviColor->outer.g); - naviColor->outer.b = CVar_GetS32("gNavi_Idle_Outer_Blue", naviColor->outer.b); + naviColor->inner.r = CVar_GetS32("gNavi_Idle_Inner_R", naviColor->inner.r); + naviColor->inner.g = CVar_GetS32("gNavi_Idle_Inner_G", naviColor->inner.g); + naviColor->inner.b = CVar_GetS32("gNavi_Idle_Inner_B", naviColor->inner.b); + naviColor->outer.r = CVar_GetS32("gNavi_Idle_Outer_R", naviColor->outer.r); + naviColor->outer.g = CVar_GetS32("gNavi_Idle_Outer_G", naviColor->outer.g); + naviColor->outer.b = CVar_GetS32("gNavi_Idle_Outer_B", naviColor->outer.b); } if (actorCategory == ACTORCAT_NPC) { - naviColor->inner.r = CVar_GetS32("gNavi_NPC_Inner_Red", naviColor->inner.r); - naviColor->inner.g = CVar_GetS32("gNavi_NPC_Inner_Green", naviColor->inner.g); - naviColor->inner.b = CVar_GetS32("gNavi_NPC_Inner_Blue", naviColor->inner.b); - naviColor->outer.r = CVar_GetS32("gNavi_NPC_Outer_Red", naviColor->outer.r); - naviColor->outer.g = CVar_GetS32("gNavi_NPC_Outer_Green", naviColor->outer.g); - naviColor->outer.b = CVar_GetS32("gNavi_NPC_Outer_Blue", naviColor->outer.b); + naviColor->inner.r = CVar_GetS32("gNavi_NPC_Inner_R", naviColor->inner.r); + naviColor->inner.g = CVar_GetS32("gNavi_NPC_Inner_G", naviColor->inner.g); + naviColor->inner.b = CVar_GetS32("gNavi_NPC_Inner_B", naviColor->inner.b); + naviColor->outer.r = CVar_GetS32("gNavi_NPC_Outer_R", naviColor->outer.r); + naviColor->outer.g = CVar_GetS32("gNavi_NPC_Outer_G", naviColor->outer.g); + naviColor->outer.b = CVar_GetS32("gNavi_NPC_Outer_B", naviColor->outer.b); } if (actorCategory == ACTORCAT_BOSS || actorCategory == ACTORCAT_ENEMY) { - naviColor->inner.r = CVar_GetS32("gNavi_Enemy_Inner_Red", naviColor->inner.r); - naviColor->inner.g = CVar_GetS32("gNavi_Enemy_Inner_Green", naviColor->inner.g); - naviColor->inner.b = CVar_GetS32("gNavi_Enemy_Inner_Blue", naviColor->inner.b); - naviColor->outer.r = CVar_GetS32("gNavi_Enemy_Outer_Red", naviColor->outer.r); - naviColor->outer.g = CVar_GetS32("gNavi_Enemy_Outer_Green", naviColor->outer.g); - naviColor->outer.b = CVar_GetS32("gNavi_Enemy_Outer_Blue", naviColor->outer.b); + naviColor->inner.r = CVar_GetS32("gNavi_Enemy_Inner_R", naviColor->inner.r); + naviColor->inner.g = CVar_GetS32("gNavi_Enemy_Inner_G", naviColor->inner.g); + naviColor->inner.b = CVar_GetS32("gNavi_Enemy_Inner_B", naviColor->inner.b); + naviColor->outer.r = CVar_GetS32("gNavi_Enemy_Outer_R", naviColor->outer.r); + naviColor->outer.g = CVar_GetS32("gNavi_Enemy_Outer_G", naviColor->outer.g); + naviColor->outer.b = CVar_GetS32("gNavi_Enemy_Outer_B", naviColor->outer.b); } if (actorCategory == ACTORCAT_PROP) { - naviColor->inner.r = CVar_GetS32("gNavi_Prop_Inner_Red", naviColor->inner.r); - naviColor->inner.g = CVar_GetS32("gNavi_Prop_Inner_Green", naviColor->inner.g); - naviColor->inner.b = CVar_GetS32("gNavi_Prop_Inner_Blue", naviColor->inner.b); - naviColor->outer.r = CVar_GetS32("gNavi_Prop_Outer_Red", naviColor->outer.r); - naviColor->outer.g = CVar_GetS32("gNavi_Prop_Outer_Green", naviColor->outer.g); - naviColor->outer.b = CVar_GetS32("gNavi_Prop_Outer_Blue", naviColor->outer.b); + naviColor->inner.r = CVar_GetS32("gNavi_Prop_Inner_R", naviColor->inner.r); + naviColor->inner.g = CVar_GetS32("gNavi_Prop_Inner_G", naviColor->inner.g); + naviColor->inner.b = CVar_GetS32("gNavi_Prop_Inner_B", naviColor->inner.b); + naviColor->outer.r = CVar_GetS32("gNavi_Prop_Outer_R", naviColor->outer.r); + naviColor->outer.g = CVar_GetS32("gNavi_Prop_Outer_G", naviColor->outer.g); + naviColor->outer.b = CVar_GetS32("gNavi_Prop_Outer_B", naviColor->outer.b); } targetCtx->naviRefPos.x = actor->focus.pos.x; targetCtx->naviRefPos.y = actor->focus.pos.y + (actor->targetArrowOffset * actor->scale.y);