Skip to content

fix dark link not getting hit when stunned#5028

Merged
Archez merged 1 commit intoHarbourMasters:developfrom
briaguya0:fix-dark-link-stuns
Feb 9, 2025
Merged

fix dark link not getting hit when stunned#5028
Archez merged 1 commit intoHarbourMasters:developfrom
briaguya0:fix-dark-link-stuns

Conversation

@briaguya0
Copy link
Contributor

@briaguya0 briaguya0 commented Feb 9, 2025

in #3280 both 0x00400000 and 0x04000000 were replaced with PLAYER_STATE1_SHIELDING.

0x00400000 is PLAYER_STATE1_SHIELDING, but 0x04000000 is PLAYER_STATE1_DAMAGED

this fixes the spots in z_en_torch2 where we had PLAYER_STATE1_SHIELDING where it should have been PLAYER_STATE1_DAMAGED

Build Artifacts

in HarbourMasters#3280 both `0x00400000` and `0x04000000` were replaced with `PLAYER_STATE1_SHIELDING`.

`0x00400000` is `PLAYER_STATE1_SHIELDING`, but  `0x04000000` is `PLAYER_STATE1_DAMAGED`

this fixes the spots in `z_en_torch2` where we had `PLAYER_STATE1_SHIELDING` where it should have been `PLAYER_STATE1_DAMAGED`
Copy link
Member

@inspectredc inspectredc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I hope this is just isolated to this file, really sorry for the 🥖

@briaguya0
Copy link
Contributor Author

Ah I hope this is just isolated to this file, really sorry for the 🥖

no worries at all! i approved that PR so it's my 🥖 too

i did notice one other spot where the same incorrect replacement happened - that one is a strange one though #5029

@Archez Archez merged commit a7f8370 into HarbourMasters:develop Feb 9, 2025
5 checks passed
@briaguya0 briaguya0 deleted the fix-dark-link-stuns branch February 15, 2025 04:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants