diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2023-10-16 09:22:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-16 09:22:39 -0500 |
| commit | 8357c2aa1b446c205d00e6d335083c3420da402e (patch) | |
| tree | fe73fb2ffc27b1c2d17f75bdcb7bee6c70e4a3bb /soh/src/code | |
| parent | 8c7786d4bb39b1098dc8dba09c5203aa61e4e976 (diff) | |
| parent | fe90ad0268efbe78fbd73b5567a35563339aa94f (diff) | |
Merge pull request #3294 from HarbourMasters/develop
develop -> develop-rando (10/16/23) 2: Electric Boogaloo
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_play.c | 2 | ||||
| -rw-r--r-- | soh/src/code/z_player_lib.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index dfafbb7ff..fb4628834 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -653,7 +653,7 @@ void Play_Init(GameState* thisx) { Fault_AddClient(&D_801614B8, ZeldaArena_Display, NULL, NULL); // In order to keep bunny hood equipped on first load, we need to pre-set the age reqs for the item and slot - if (CVarGetInteger("gMMBunnyHood", BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA || CVarGetInteger("gTimelessEquipment", 0)) { + if ((CVarGetInteger("gMMBunnyHood", BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA && CVarGetInteger("gAdultBunnyHood", 0)) || CVarGetInteger("gTimelessEquipment", 0)) { gItemAgeReqs[ITEM_MASK_BUNNY] = 9; if(INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_MASK_BUNNY) gSlotAgeReqs[SLOT_TRADE_CHILD] = 9; 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); |