Commit Graph

308 Commits

Author SHA1 Message Date
Eblo
207df24ffd
Fix bug with two-handed sword magic and dance (#819)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
2024-11-03 15:13:09 -06:00
louist103
cbc89b8af4
Fix item id type (#813)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
* fix wrong type

* Update z_kaleido_item.c
2024-10-21 10:51:47 -05:00
Eblo
64ebfa222e
[Enhancement] Two-handed sword spin attacks (#679)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
* Enhancement to enable magic for 2-handed swords

Create a new magic charge size for the two-handed swords
Add utility method for determining if the held item's button is being pressed, not just B

* Clean up two-handed sword spin attacks

Add hook for thunder matrix transformation, move that logic into TwoHandedSwordSpinAttack
Move held item button press function into TwoHandedSwordSpinAttack.cpp
Add enhancement to the searchable menu
Clean up logic for magic spin attack form check
Use variadic args for hooks

* Remove redundant includes from TwoHandedSwordSpinAttack.cpp

* Use extern on TwoHandedSwordSpinAttack structs
2024-10-10 14:38:51 -05:00
Garrett Cox
0129959d7b
Fix fairy container and seahorse rendering (#804) 2024-10-10 13:38:58 -05:00
Eblo
3ebfdb3928
[Enhancement] Skip the scarecrow song (#723)
* Add enhancement to skip the scarecrow song

* Update SkipScarecrowSong to use variadic args
2024-10-10 10:51:05 -05:00
Eblo
bb386e25a0
[Enhancement] Enable putaway as Fierce Deity (#717)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
* Add enhancement to enable putaway as Fierce Deity

* Fix hooks for putaway and FD sword wield

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-10-10 07:51:05 -05:00
Eblo
0b16bced84
[Cheat] Allow Elegy of Emptiness anywhere (#712)
* Add cheat to allow Elegy of Emptiness anywhere

* Use modern menu for Elegy Anywhere, rename VB

Removed redundant null from Elegy scene check
Moved ElegyAnywhere enhancement's menu order

* Remove extraneous widgets from ElegyAnywhere menu
2024-10-09 23:46:05 -05:00
balloondude2
b7d7a2d9bf
[Enhancement] Add option to always get the Cremia Hug Cutscene after completing the milk run (#688)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
* Cremia always gives hugs after getting Romani Mask. Adds enhancement option but the option doesn't change anything yet

* moved cremia enhancement out of cutscene files

* hook works now

* change enhancement to picklist

* cleaned conditional

* move to minigame section and add modern menu item

* clang format
2024-10-08 23:26:13 -05:00
Archez
fa702ed90c
Extract pause maps and minimaps, support alt assets, fix pause map icons (#780)
Some checks failed
generate-builds / generate-2ship-otr (push) Has been cancelled
generate-builds / build-macos (push) Has been cancelled
generate-builds / build-linux (push) Has been cancelled
generate-builds / build-windows (push) Has been cancelled
* extract pause maps and minimaps and support alt assets

* Fix missing door transitions on pause menu map
2024-10-07 13:05:17 -04:00
mckinlee
7e10b1315e
[Enhancement] Disable Takkuri Steal (#776)
* simple and works

* implement proxy's feedback
Co-authored-by: Garrett Joe Cox <garrettjcox@gmail.com>

* forgot to remove unneeded check from testing

* remove null arg

* simple and works

* implement proxy's feedback
Co-authored-by: Garrett Joe Cox <garrettjcox@gmail.com>

* forgot to remove unneeded check from testing

* remove null arg

* changes

* bump lus

* add checkbox to modern menu

* clang

* archez feedback

* proxy feedback
2024-10-07 11:02:36 -05:00
Archez
cae9c27c62
Add HD support for Igos room curtains (#783) 2024-10-07 10:25:34 -05:00
Garrett Cox
790d36bfbc
Add options for first person aiming (#596)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
2024-10-06 20:55:16 -05:00
Archez
69edc89292
[Enhancement] Keep Express Mail in the same cycle (#791)
* Add enhancement for reusing letter to mama in one cycle

* add menu widget item for express mail
2024-10-05 12:54:00 -04:00
Garrett Cox
a93f011253
Move GameInteractor & NameTag src up to root of 2s2h (#799) 2024-10-05 10:33:10 -05:00
Garrett Cox
d9d6dbdf51
Remove unnecessary headers in favor of directory headers (#800) 2024-10-05 10:06:49 -05:00
Garrett Cox
da04b7f859
Change GI_VB_ to VB_ (#798) 2024-10-05 10:02:53 -05:00
Garrett Cox
f31674a12e
Add fix for ikana great fairy fountain color (#788)
Some checks are pending
generate-builds / generate-2ship-otr (push) Waiting to run
generate-builds / build-macos (push) Blocked by required conditions
generate-builds / build-linux (push) Blocked by required conditions
generate-builds / build-windows (push) Blocked by required conditions
2024-10-03 16:02:51 -04:00
Garrett Cox
c474a82a94
Mirror Mode (#535)
* Mirror mode initial version

* Update mm/src/code/z_actor.c

Co-authored-by: Archez <Archez@users.noreply.github.com>

* mirror mode support for minimaps and dungeon pause map

* mirror mode support overworld pause map and song of soaring

* mirror mode support for various remaining things

* mirror mode support pause warp enhancement

* Add searchable menu item

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
Co-authored-by: Archez <archez39@me.com>
2024-10-02 23:44:36 -04:00
Archez
b1eea9ca76
Use variadic arguments with GameInteractor_Should (#766)
* PoC of using variadic arguments with GameInteractor_Should

* va_list boilerplate in SHOULD macro

* drop opt arg in favor of variadic arg changes

* account for default type promotion

* remove demo code
2024-09-26 12:39:05 -04:00
Archez
25887952c9
[Enhancement] Actor Nametags (#746)
Some checks failed
generate-builds / generate-2ship-otr (push) Failing after 0s
generate-builds / build-macos (push) Has been skipped
generate-builds / build-linux (push) Has been skipped
generate-builds / build-windows (push) Has been skipped
* add new GI hooks

* move collision viewer to draw hook

* actor viewer tweaks; prevent crash when actors are killed

* add ShipUtils

* add actor name tags

* add debug name tags to actor viewer

* fixes

* headers?

* cleanup actor viewer

* Add more options for actor name tags

* headers

* headers

* ditch fmt::join cause linux package managers use old spdlog/fmt

* just a little more cleanup
2024-09-13 10:10:59 -04:00
Archez
137ca0de12
fix zora magic shield alpha (#768)
Some checks failed
generate-builds / generate-2ship-otr (push) Failing after 0s
generate-builds / build-macos (push) Has been skipped
generate-builds / build-linux (push) Has been skipped
generate-builds / build-windows (push) Has been skipped
2024-09-12 16:32:19 -04:00
balloondude2
4d1ddff798
Fix some Fierce Diety interactions in Clock Town (#730)
* fix fd town archery softlock

* allow FD to leave town
2024-09-08 19:01:02 -04:00
Archez
bbfa903a99
fix more incorrect dpad handling for hud updates (#764) 2024-09-08 18:54:11 -04:00
Archez
6ff3be97de
fix some actor shadow textures not updating (#758) 2024-09-08 18:45:54 -04:00
Eblo
185e761f78
[Enhancement] Fierce Deity Anchored Backwalk Animation (#670)
* Add Fierce Deity anchored backwalk enhancement

* adjust ztarget hook to clamp speed instead of modifying animation frame logic

---------

Co-authored-by: Archez <archez39@me.com>
2024-09-03 23:00:11 -04:00
balloondude2
ea8809ddd0
Allow non-ascii characters in filepath on Windows (#743) 2024-09-03 22:41:16 -04:00
Archez
0c2a51c9f4
Various custom asset support (#756)
* use asset paths for better custom asset support

* fix keyframe animation timings

* display title cards as a full texture

* asset support for gfxprint

* support pause menu overworld map

* fix more resources that need to be loaded

* pr feedback
2024-08-23 17:19:41 -04:00
Archez
542feb038e
Implement save backups and better invalid json detection (#749) 2024-08-18 18:04:25 -04:00
Garrett Cox
53faf37dc1
Add persistent bunny mask enhancement (#537) 2024-08-18 11:41:17 -04:00
Garrett Cox
4a57bdbc5f
Add widescreen actor culling option (#652) 2024-08-09 16:42:34 -04:00
mckinlee
0ec23b34ba
[Enhancement] Pause Owl Warp (#620)
* Add Pause Owl Warp Enhancement

- **mm/2s2h/BenGui/BenMenuBar.cpp**: Updated menu to include new enhancement options.
- **mm/2s2h/Enhancements/Enhancements.cpp**: Registered the new Pause Owl Warp enhancement.
- **mm/2s2h/Enhancements/Enhancements.h**: Declared functions for the new enhancement.
- **mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp**: Implemented the Pause Owl Warp functionality.
- **mm/2s2h/Enhancements/Songs/PauseOwlWarp.h**: Header file for the Pause Owl Warp implementation.
- **mm/include/functions.h**: Added function declarations related to the new enhancement.
- **mm/src/overlays/kaleido_scope/ovl_kaleido_map.c**: Modified to support the new enhancement.
- **mm/src/overlays/kaleido_scope/ovl_kaleido_scope_NES.c**: Modified to support the new enhancement.

* ran clang-format script

* Additional logic and bug fixes

* Fix PauseOwlWarp cursor logic triggering on dungeon map
-Added a check to ensure PauseOwlWarp's cursor logic is only triggered when not in a dungeon.

* Add Song of Soaring check
- To make it more in line with vanilla, you are now required to have the Song of Soaring to use this enhancement.

* bug fix and ran clang-format script
-My previous commit had a extra condition that wasn't needed that caused a bug where the world map points locations pointed to activated owl statues.

* added more checks

* Simplified complex conditional statements

* possibly fix macos build issue?

* index warping logic added

* implement feedback from Archez

* shot in the dark macos build fix?

* how bout now?

* revert back to previous commit

* if this fixed the macos build issue it'll be thanks to cclark25... let's pray

* add debugeditor check - thanks archez!

* Moved debugEditor check to prevent triggering ALL pauseOwlWarp logic. wtf was I thinking earlier
2024-08-05 15:18:52 -04:00
Captain Kitty Cat
51af06463f
Item drops 3D! (#633)
* Initial 3D Item Drops Toggle

* Use generic hooks and other tweaks

* 3d drop fixes and changes

* move slime item draw to VB hook; fix arrow GID

* whitespacing

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
Co-authored-by: Archez <archez39@me.com>
2024-07-23 21:39:25 -04:00
Archez
24d8d47ab2 Merge remote-tracking branch 'origin/develop' into merge-develop-rika 2024-07-11 22:05:15 -04:00
Archez
0455c0f053
Fixes for cycle reset, fairy bottle, auto save, and save editor equips (#740)
* fixes for cycle reset, fairy bottle, and save editor equips

* prevent auto save during minigames

* prevent crash with fast mask transform
2024-07-10 13:02:02 -04:00
Archez
2bb149b367
Tweak: Improve Save Editor time options (#729)
* improve save editor time options

* set gPlayState after early returns to avoid dangling ptr

* avoid crash with day 0 on daytelop
2024-07-08 17:57:17 -04:00
Archez
7458760c75
Fix rumble lasting too long (#736) 2024-07-08 17:50:03 -04:00
Archez
f201a494d2
Fix: Clean up flags when using debug warp (#728)
* Fix: Clean up flags when using debug warp

* comments
2024-06-28 17:48:24 -04:00
Archez
6af9227293
Fix: Add reset func for cucco storm (#725) 2024-06-28 12:02:26 -04:00
Archez
36f31463f3
add reset func for EnBats actor (#724) 2024-06-28 11:01:00 -04:00
Archez
03a33628cb
fix skybox textures not reloading (#719) 2024-06-26 17:45:50 -04:00
Archez
60673fac35
Fix: Prevent crash on loading OOB info panel textures in kaleido (#720) 2024-06-26 10:36:05 -04:00
Archez
72f6fd158c
Fix Dawn Of screen crashing with 4th glitch (#718) 2024-06-25 23:40:51 -04:00
Garrett Cox
2e4710c6c2
Tweaks to warp point (#666)
* Tweaks to warp point

* wait for console logo exit

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
2024-06-25 00:16:10 -04:00
balloondude2
3ef3e7a239
[Enhancement] Fix Fierce Deity interactions with Bombers (#674)
* Allow FD to talk to Bomber Jim. Adds comments to unknown data.

* fd works with blue bombers and guard bomber

* clang format
2024-06-24 20:46:58 -04:00
louist103
a933d73589
Fix the check for preventing a HESS crash. (#710)
* Fix the check

* Change style

* Another fix in SKelanime.

* Format
2024-06-23 17:11:21 -04:00
Archez
a38b9daa6d
Add HUD Editor support for horse carrots (#704) 2024-06-23 15:19:33 -04:00
inspectredc
e87d7c6954
Delete z_message_tables.inc (#685) 2024-06-18 20:01:17 -04:00
Archez
8b2b12dbe8
Bump latest lus and bring over Array resource (#689)
* bump latest lus and bring over array resource

* use upstream otrexporter
2024-06-18 20:00:16 -04:00
Archez
c2199dddcf
Fix: Add reset func for moon crash giants cutscene (#694) 2024-06-15 15:52:42 -04:00
inspectredc
a383b4b330
Fix Fast Text Not Working on Instant Textboxes (#662)
* Fix Fast Text Not Working on Instant Textboxes

* format
2024-06-14 20:55:24 -04:00