diff options
| author | Caladius <Caladius@users.noreply.github.com> | 2026-01-06 09:28:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-06 09:28:56 -0500 |
| commit | de61cd8a9116f77096a481e3a354494aaa8e6790 (patch) | |
| tree | d888e10d391a6959b726fbeec37136af9f018821 /mm/src/code | |
| parent | b2fb5b230563488f030664989fa7b0b0160705c7 (diff) | |
[Rando] Enemy Soul Shuffle (#1284)
* Add Aliens and initial code moved from old build.
* Update Enemy Souls to latest Develop and fix issues.
* Change Stalchild Animation to Idle
* Fix Stalchild Eyes
* Adds Hiploop to keep in line with Enemy Drops
* correction
* Update Matrix Calls
* Remove comment
* Remove Garo for now
* Add Octorok Soul req for Upper Canyon Access
* Add soul requirement for Red Switch
* Grant Soul INF when the option is off
* Adds Nejiron Soul
* Add Flying Pot Soul
* ew (#14)
* cleanup
* Add Bubble Soul
* Adds Freezard
* Change Soul behaivor to Invincible
* header cleanup and arg consolidation
* Fixes OnFileCreate to actually shuffle Enemy Souls. took this op. to fix up Boss Souls shuffling as it was needed to cleanly shuffle Enemy Souls.
* Naming Updates
* Name Updates pt2
* Add Tracker Icons and adds a Default to avoid erroring
* Fix Iron Knuckle Helmet
* revert item icon default and add soul flame to tatl target for enemies that are invincible.
* Move VBs to GameInteractor_VanillaBehavior.h
* Use VB_PERFORM_AC_COLLISION for enemy souls
* Add enemy souls for closer parity with drops
Stub out enemy draw funcs
Use macros to streamline existing skeleton inits
Logically account for enemy souls in CanKillEnemy
Fix logical quirk with Ikana ice arrows
* Draw everything
* Remove unused INIT arg from SETUP_FLEX_SKEL
* Add Igos, Keeta, Gomess
Make soul RIs contiguous, separate boss and enemy
Ignore target color for EnInvadepoh
Remove Real Bombchus and Flying Pots for now
Require Gekko and Snapper souls for beating both
* Add Enemy Souls to item tracker
* clang format
---------
Co-authored-by: mckinlee <mckinlee@ymail.com>
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_actor.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/src/code/z_actor.c b/mm/src/code/z_actor.c index 6fed8a875..03148315c 100644 --- a/mm/src/code/z_actor.c +++ b/mm/src/code/z_actor.c @@ -648,9 +648,10 @@ void Attention_Draw(Attention* attention, PlayState* play) { actor->focus.pos.z, MTXMODE_NEW); Matrix_RotateYS(play->gameplayFrames * 0xBB8, MTXMODE_APPLY); Matrix_Scale((iREG(27) + 35) / 1000.0f, (iREG(28) + 60) / 1000.0f, (iREG(29) + 50) / 1000.0f, MTXMODE_APPLY); - - gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, attentionColor->primary.r, attentionColor->primary.g, - attentionColor->primary.b, 255); + if (GameInteractor_Should(VB_DRAW_LOCK_ON_ARROW, true, actor)) { + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, attentionColor->primary.r, attentionColor->primary.g, + attentionColor->primary.b, 255); + } MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx); gSPDisplayList(POLY_XLU_DISP++, gLockOnArrowDL); FrameInterpolation_RecordCloseChild(); |