in https://github.com/HarbourMasters/Shipwright/pull/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`
* Move fairy checks to separate file
* Moves pot locations to ShipInit function
* Move Freestanding locations to a ShipInit function
* Remove some extra newlines that were pasted in
* Move fish locations to ShipInit function
* Remove ON_BOOT, as it's not really necessary
* Fix weird spacing
* don't put away items when equipping tunics/boots
* vb
* don't need that return
* ok i guess i'm going down the rabbit hole
* more rabbit hole
* shipinit and more hooks
* clean up
* use fewer params, add a missing condition
* make the loops make sense
* rando: vanilla dungeon rewards
* gift from rauru is dungeon location, not pocket
* missing apostrophe in preset description
* neither pocket nor gift should be listed in dungeonRewardLocations
* Add "Blue Warp" to the boss sides of the blue warp pairs to differentiate from the bosses on the other sides of boss doors.
Fix some names that weren't the same in both pairs of entrances.
Renamed a few other entrances for clarification.
* Add function to check entrance name consistency.
Fix remaining non-matching names.
* Document CheckEntranceNames.
Remove declaration of it from the header.
* skip z_title with button press
* use `RegisterShipInitFunc`
* rip out a bunch of custom ztitle code
* ok now it's almost fully back to vanilla
* titles are back for a limited time
enjoy #Skipping
* move old customizations into new custom draw
* finally getting the hang of this shipinit thing
* vb should let it snow
* boot sequence logic
* clean up logic to better handle changing boot sequence settings
* remove fast file select stuff
* remove authentic logo screen setting
* about window - not super pretty but not ugly imo
* maybe this fixes windows
* maybe alloca? idk why it's working in other files
* just pulling in every include hoping something works
* Revert
This reverts commit c1d02c9a40.
* try some macro fixing magic
* fix another c vs cpp thing
* do it without an extra var
* make `GitCommitHashTruncated` a private member on `AboutWindow` instead of truncating on draw
* move logo asset defs to `soh_assets.h`
* Apply suggestions from code review
Co-authored-by: Archez <Archez@users.noreply.github.com>
* VB_SHOULDN'T
---------
Co-authored-by: Archez <Archez@users.noreply.github.com>
Sarge-117