diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2026-08-01 07:44:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-01 07:44:31 -0500 |
| commit | b3dcb18a9b3b8799f7acd7045c5c637056ec19fe (patch) | |
| tree | 1511ddd95462532e4534e592a1d113a0c4b5bd06 | |
| parent | 63fde12a15ef3940fdaea6f8f255d866742e0c78 (diff) | |
Fix Goron rolling ignores magic (#1834)
| -rw-r--r-- | mm/2s2h/Enhancements/Masks/GoronRollingIgnoresMagic.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/2s2h/Enhancements/Masks/GoronRollingIgnoresMagic.cpp b/mm/2s2h/Enhancements/Masks/GoronRollingIgnoresMagic.cpp index 307995288..fd34ad696 100644 --- a/mm/2s2h/Enhancements/Masks/GoronRollingIgnoresMagic.cpp +++ b/mm/2s2h/Enhancements/Masks/GoronRollingIgnoresMagic.cpp @@ -17,7 +17,10 @@ void RegisterGoronRollingIgnoresMagic() { COND_VB_SHOULD(VB_GORON_ROLL_CONSUME_MAGIC, CVAR, { *should = false; }); // Disable check for if the player has magic to increase spike level - COND_VB_SHOULD(VB_GORON_ROLL_INCREASE_SPIKE_LEVEL, CVAR, { *should = true; }); + COND_VB_SHOULD(VB_GORON_ROLL_INCREASE_SPIKE_LEVEL, CVAR, { + Player* player = GET_PLAYER(gPlayState); + *should = player->av2.actionVar2 >= 0x36B0; + }); // Mimicking the vanilla condition minus the magic check COND_VB_SHOULD(VB_GORON_ROLL_DISABLE_SPIKE_MODE, CVAR, { |