From 5ddc418777bb02e531104f4b8820647432b2706e Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Fri, 13 Oct 2023 19:14:18 -0400 Subject: [PATCH] redicle -> reticle (#3257) --- soh/assets/objects/object_link_boy/object_link_boy.h | 4 ++-- soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml | 2 +- soh/assets/xml/GC_MQ_PAL_F/objects/object_link_boy.xml | 2 +- soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml | 2 +- soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml | 2 +- soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml | 2 +- soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml | 2 +- soh/src/code/z_player_lib.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/soh/assets/objects/object_link_boy/object_link_boy.h b/soh/assets/objects/object_link_boy/object_link_boy.h index 084225d14..13ad2b3a1 100644 --- a/soh/assets/objects/object_link_boy/object_link_boy.h +++ b/soh/assets/objects/object_link_boy/object_link_boy.h @@ -309,8 +309,8 @@ static const ALIGN_ASSET(2) char gLinkAdultHookshotDesignTex[] = dgLinkAdultHook #define dgLinkAdultHookshotChainTex "__OTR__objects/object_link_boy/gLinkAdultHookshotChainTex" static const ALIGN_ASSET(2) char gLinkAdultHookshotChainTex[] = dgLinkAdultHookshotChainTex; -#define dgLinkAdultHookshotRedicleVtx "__OTR__objects/object_link_boy/gLinkAdultHookshotRedicleVtx" -static const ALIGN_ASSET(2) char gLinkAdultHookshotRedicleVtx[] = dgLinkAdultHookshotRedicleVtx; +#define dgLinkAdultHookshotReticleVtx "__OTR__objects/object_link_boy/gLinkAdultHookshotReticleVtx" +static const ALIGN_ASSET(2) char gLinkAdultHookshotReticleVtx[] = dgLinkAdultHookshotReticleVtx; #define dgLinkAdultHookshotReticleTex "__OTR__objects/object_link_boy/gLinkAdultHookshotReticleTex" static const ALIGN_ASSET(2) char gLinkAdultHookshotReticleTex[] = dgLinkAdultHookshotReticleTex; diff --git a/soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml b/soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml index 8500b975b..60b9e0984 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/assets/xml/GC_MQ_PAL_F/objects/object_link_boy.xml b/soh/assets/xml/GC_MQ_PAL_F/objects/object_link_boy.xml index 02075c999..6351af505 100644 --- a/soh/assets/xml/GC_MQ_PAL_F/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_MQ_PAL_F/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml b/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml index 7c0014699..5342d5271 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml index 02075c999..6351af505 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml b/soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml index 02075c999..6351af505 100644 --- a/soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml +++ b/soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml b/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml index 02075c999..6351af505 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index 98dacc982..32a3e6e48 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -1369,7 +1369,7 @@ void Player_DrawHookshotReticle(PlayState* play, Player* this, f32 hookshotRange const Color_RGBA8 color = CVarGetColor("gCosmetics.HookshotReticle_NonTarget.Value", defaultColor); gDPSetPrimColor(WORLD_OVERLAY_DISP++, 0, 0, color.r, color.g, color.b, color.a); } - gSPVertex(WORLD_OVERLAY_DISP++, (uintptr_t)gLinkAdultHookshotRedicleVtx, 3, 0); + gSPVertex(WORLD_OVERLAY_DISP++, (uintptr_t)gLinkAdultHookshotReticleVtx, 3, 0); gSP1Triangle(WORLD_OVERLAY_DISP++, 0, 1, 2, 0); CLOSE_DISPS(play->state.gfxCtx);