Skip to content

Conversation

@MegaMech
Copy link
Contributor

No description provided.

@MegaMech MegaMech added the do not merge Not ready or not valid changes label Mar 22, 2022
@MegaMech MegaMech closed this Mar 22, 2022
MelonSpeedruns referenced this pull request in MelonSpeedruns/Shipwright Mar 31, 2022
Fix Tektite death particles
Kenix3 pushed a commit that referenced this pull request May 11, 2022
* Initial Linux/GCC support commit

* Add instructins for linux in the README

* apply suggestions by @Erotemic and @Emill

* Fix python 3.10 symlink line

* Fix func_80041E80 type mismatch (#3)

Type mismatch functions.h:664

* Makefile: clean OTRExporter/libultraship/ZAPDTR with distclean and fix CXX_FILES

* Makefile: find C/CXX_FILES automatically

* Makefile: remove ugly conditions in find commands

* cleanup _MSC_VER usage

* fix Windows build

* cleanup extraction scripts

* fix Windows build

* Fix Windows path separator issue

* fix rumble support for linux

* use glew-cmake in dockerfile

* add pulseaudio backend

* fix ZAPDTR linkage

* Check for "soh.elf" in directory (#6)

hide second button if `soh.exe` or `soh.elf` is present

* Fix hardcoded segment addresses (#5)

* fix condition

* hack lus -> soh dep for ZAPDTR

Co-authored-by: sholdee <[email protected]>
Co-authored-by: qurious-pixel <[email protected]>
Co-authored-by: GaryOderNichts <[email protected]>
raincode00 pushed a commit to raincode00/Shipwright that referenced this pull request May 16, 2022
hide second button if `soh.exe` or `soh.elf` is present
PurpleHato referenced this pull request in PurpleHato/Shipwright Jun 4, 2022
briaguya0 pushed a commit that referenced this pull request Aug 2, 2022
leggettc18 referenced this pull request in leggettc18/Shipwright Oct 15, 2022
Kenix3 pushed a commit to Kenix3/Shipwright that referenced this pull request Oct 19, 2022
* Initial Linux/GCC support commit

* Add instructins for linux in the README

* apply suggestions by @Erotemic and @Emill

* Fix python 3.10 symlink line

* Fix func_80041E80 type mismatch (HarbourMasters#3)

Type mismatch functions.h:664

* Makefile: clean OTRExporter/libultraship/ZAPDTR with distclean and fix CXX_FILES

* Makefile: find C/CXX_FILES automatically

* Makefile: remove ugly conditions in find commands

* cleanup _MSC_VER usage

* fix Windows build

* cleanup extraction scripts

* fix Windows build

* Fix Windows path separator issue

* fix rumble support for linux

* use glew-cmake in dockerfile

* add pulseaudio backend

* fix ZAPDTR linkage

* Check for "soh.elf" in directory (HarbourMasters#6)

hide second button if `soh.exe` or `soh.elf` is present

* Fix hardcoded segment addresses (HarbourMasters#5)

* fix condition

* hack lus -> soh dep for ZAPDTR

Co-authored-by: sholdee <[email protected]>
Co-authored-by: qurious-pixel <[email protected]>
Co-authored-by: GaryOderNichts <[email protected]>
Archez referenced this pull request in Archez/Shipwright Nov 21, 2022
inspectredc pushed a commit to inspectredc/Shipwright that referenced this pull request Nov 30, 2023
Malkierian pushed a commit that referenced this pull request Oct 7, 2024
* Convert ocarina buttons & skip scarecrow song to VB

* Move most of boss rush & rupee/key counters to VB

* Move BossRush_HandleCompleteBoss to VB

* Convert boss timestamps to VB

* Move being able to open doors to VB

* Convert Entrance_OverrideWeatherState to VB

* Move boss souls to hook_handlers.cpp

* Update hook_handlers.cpp

* Move infinite upgrades to hook_handlers.cpp

* Move skeleton key to hook_handlers.cpp

* Move swim and child wallet to hook_handlers.cpp

* Move ganons boss key to hook_handlers.cpp

* Move triforce hunt to hook_handlers.cpp

* Move randomizer sheik spawn to hook_handlers.cpp

* Update BossRush.h

* Convert spoiling items to VB

* Move load game stuff to hook_handlers.cpp

* Move warp song handling to hook_handlers.cpp

* Convert being able to play bowling to VB

* Move shooting gallery man handling to hook_handlers.cpp

* Move spirit temple silver block removal to hook_handlers.cpp

* Fix build

* Move last beehive stuff to hook_handlers.cpp

* Fix build

* Add VB_CLOSE_PAUSE_MENU

* Add VB_BE_ABLE_TO_SAVE

* Add VB_RENDER_YES_ON_CONTINUE_PROMPT

* Add VB_SPAWN_BLUE_WARP

* Add VB_BLUE_WARP_ADULT_WARP_OUT

* Add VB_BG_BREAKWALL_BREAK

* Convert Saria stuff to VB

* Remove now unused check

* Add VB_GANON_HEAL_BEFORE_FIGHT

* Update hook_handlers.cpp

* Fix blue warp offsets

* Fixes from review

* Improve documentation

* Update BossRush.cpp

* Fix my stupidity

* Fix #4327

* Update hook_handlers.cpp

* Fix blue warps

* Use ultralib types & clean header

* Replace options amount macro with BR_OPTIONS_MAX

* Remove unused includes

* Remove accidental line doubling

* Tweaks to boss rush (#6)

* Update GameInteractor_HookTable.h

---------

Co-authored-by: Garrett Cox <[email protected]>
Jameriquiah pushed a commit to Jameriquiah/Shipwright that referenced this pull request Dec 31, 2025
This header file defines custom equipment display lists for various items, including weapons and shields, with appropriate alignment macros.

Add ResourceMgr_PatchCustomGfxByName function

Add ResourceMgr_PatchCustomGfxByName function

Add custom equipment patching functionality

This file implements custom equipment patching for various items, including swords, shields, and ocarinas, based on player context and equipped items. It registers hooks to update the display lists for custom equipment dynamically.

Implement custom scaling for Deku Shield on child

Added support for custom scaling of the Deku Shield when the player is a child.

Include GameInteractor and ResourceManager headers

Added includes for GameInteractor and ResourceManager.

Fix include path for ResourceManager header

Replace ResourceManager include with ResourceManagerHelpers

Fix include path for ResourceManagerHelpers header

Implement equipment visibility updates for child and adult

Add custom equipment Dlists handler registration

Add custom equipment header to mods.cpp

Add include for custom equipment header

Add custom equipment header with registration function

Add include guards to customequipment.h

Add function declaration for RegisterPatchCustomEquipmentDlistsHandler

Add UpdatePatchCustomEquipmentDlists function declaration

Remove UpdatePatchCustomEquipmentDlists declaration

Removed the declaration of UpdatePatchCustomEquipmentDlists function.

Remove custom equipment include from mods.cpp

Removed unnecessary include for custom equipment.

Add ShipInit.hpp include to customequipment.cpp

Add custom equipment header to mods.cpp

Add Patch Hand Handler registration

Add RegisterPatchHandHandler function declaration

Call UpdatePatchCustomEquipmentDlists after registration

Change enhancement setting check in PatchOrUnpatch

Change setting check from 'EnabledMods' to 'AltAssets'

Call UpdatePatchCustomEquipmentDlists after registration

Fix registration of OnAssetAltChange hook

Update customequipment.cpp

Update customequipment.cpp

Update customequipment.cpp

Update customequipment.cpp

Update ResourceManagerHelpers.cpp

Update Custom Equipment (#1)

* Update customequipment.cpp

* Shipinit and 2 new hooks

* Fix Build error

* Cleanup ShipInit

* Come on Shipinit, work...

* Woops

* Error between user and keyboard

* Forgot this existed

* Add Enter FPS hook

* Remove "duplicate" hook and test disable extra hook

* Vanilla Fix please, i want vanilla

* I said i wanted vanilla

Alt equipment Unstable Build (HarbourMasters#3)

* Update customequipment.cpp

* Shipinit and 2 new hooks

* Fix Build error

* Cleanup ShipInit

* Come on Shipinit, work...

* Woops

* Error between user and keyboard

* Forgot this existed

* Add Enter FPS hook

* Remove "duplicate" hook and test disable extra hook

* Vanilla Fix please, i want vanilla

* I said i wanted vanilla

* Scaling Cleanup

* Remove cond_hook

* Lets Pray

* FINAL PRAYER!

* go back!

* GO BACK MORE

Alt equipment Cleanup (HarbourMasters#4)

* Update ResourceManagerHelpers.cpp

* Electric Boogalooooo

* Revert Resourcemanager and make "revised" resourcemanager function for custom

* Forgot header file....

* Revert more stuff

* Hookshot better be hooking now

* hoooooks

* wooops

* scatterbrain moment

* Forceloadhookshot dl

* i forgor

* Revert last stuff and cleanup

* Dont give custom equipment special treatment

* git failed

* lets try this style

* new try

* Helpers Hope

* I believe in this one

* No helpers this time

* once more

* Im at the tip of this hookshot

* im tired

* Im feeling fancy

* Cleanslate

Alt equipment (HarbourMasters#5)

* Another layer

* Fux sake

* really?

* again?

Clang time

BugFix for swordless child link (some timeless support) (HarbourMasters#6)

* BugFix for child link back sword

* Second try

* Test this

* Another one

* Getting close

* Timeless support

* Sanity check

* Final patch for timeless

Alt equipment suggestions (HarbourMasters#7)

* first pass

* im dumb

* i forgor

* seriously?

* Hopefully lastone

* frogot

* clang

Optimize and make customequip.cpp more readable

Applied fix to a crash when changing age

clang

Final Fixes

forgot to save

clang clang

one line.....

Thx pat!

I shouldnt have done that

Removed a line along time ago that was being used for something that wasnt apparent on my end

Update CVAR to correct CVAR

* FOUND IT

* Cleanup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do not merge Not ready or not valid changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant