Commit Graph

3045 Commits

Author SHA1 Message Date
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
Patrick12115
d74699740e
[Enhancement] Instant Recall (#589)
* Instant Recall

* clang it

* Moved to Category "Equipment"

* pr review feedback

---------

Co-authored-by: Archez <archez39@me.com>
2024-08-18 23:24:14 -04:00
Archez
542feb038e
Implement save backups and better invalid json detection (#749) 2024-08-18 18:04:25 -04:00
Hoeloe
b0ca99f18c
[Enhancement] MM3D style clock (#713) 2024-08-18 17:55:02 -04:00
Garrett Cox
53faf37dc1
Add persistent bunny mask enhancement (#537) 2024-08-18 11:41:17 -04:00
Archez
63ffddb67b
Bump LUS (#754) 2024-08-14 18:41:31 -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
balloondude2
d0caa0f78c
[Cheat] Stop time in Temples and Dungeons (#700)
* add cheat to stop time in temples

* better tooltip

* adds option to stop time in dungeons

* clean up

* add other pirate fortress scenes

* add new hook

* update tooltips

* rename hook

* add clarification

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

* clean combobox

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
2024-08-05 15:12:08 -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
57cb5d2b51
Merge develop-rika -> develop
Merge develop-rika -> develop
2024-07-11 22:36:55 -04:00
Archez
24d8d47ab2 Merge remote-tracking branch 'origin/develop' into merge-develop-rika 2024-07-11 22:05:15 -04:00
balloondude2
aa1b0108f4
[Enhancement] Preseve time speed during cycle reset (#658)
* preseve time speed during cycle reset enhancement

* clang format

* update variable assignment

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

* add default value

* better initial value

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
2024-07-11 21:44:08 -04:00
Archez
e0731a194c
Bump Rika Charlie (#739) 2024-07-11 15:08:32 -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
5984bdea19
Fix crash with graphics menu index out of bounds (#738) 2024-07-08 23:47:42 -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
Malkierian
dcc38678a6
Eliminate Graphics Menu Lag (#733)
* Moved non-dynamic window backend data to external variables and update function called on init and combobox change.

* clang
2024-07-05 23:33:05 -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
da76b32433
Fix incorrect flag setting in save editor (#722) 2024-06-27 09:19:20 -04:00
Archez
00403e452f
Tweak FreeLock reset logic (#721) 2024-06-26 18:37:21 -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
Malkierian
1f3ca038a8
PowerShell clang fix (#714)
* Fixes script running in commandline mode by adding System.Net inclusion at the top.
Also adds clang-format.exe to gitignore.

* Change System.Net namespace to System.
2024-06-24 23:42:12 -04:00
inspectredc
791064e870
Add Basic README (#664)
* Add basic readme

* Update README.md

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
2024-06-24 23:17:36 -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
0d4e554ac6
Save editor temple clear fix (#709) 2024-06-24 09:34:40 -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
Archez
120562952c
bump lus with color combiner fixes (#711) 2024-06-23 14:51:57 -04:00
Archez
fc309f5eaa
bump lus with ucode change (#708) 2024-06-22 15:05:32 -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
justawayofthesamurai
cc3e015f12
Added a fix for the moonjump so it doesn't crash the game when changing the day. (#693) 2024-06-15 15:02:30 -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
inspectredc
df81f97e43
Add Free Look Camera Reset (#663) 2024-06-14 20:55:05 -04:00
inspectredc
e60ca15ae6
Merge pull request #683 from HarbourMasters/develop-rika
`develop-rika` -> `develop`
2024-06-10 11:51:48 +01:00
briaguya
84b9b4218a
ci: wget sdl from gh release (#677)
fix that worked from https://github.com/HarbourMasters/2ship2harkinian/pull/676 but pointing to the right branch
2024-06-08 21:53:14 +01:00
Garrett Cox
6fd7fc3a9d
Merge pull request #659 from HarbourMasters/develop-rika
`develop-rika` -> `develop`
2024-06-04 07:42:49 -05:00
Patrick12115
51a6d9d926
[Enhancement] Fast Deku Flower Launch (#549)
* Add fast deku flower launch enhancement

Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com>

* Migrate to a hook

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-06-04 01:58:32 -05:00
Archez
4b36181ee2
Fix dungeon map palette loading (#653) 2024-06-04 01:57:47 -05:00
Patrick12115
5e17828cc4
[Cheat] Longer Deku Flower Gliding (#548)
* Add Longer Flower Glide enhancement

Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com>

* Tweak to just modify an array

* Update mm/2s2h/Enhancements/Cheats/LongerFlowerGlide.cpp

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-06-04 00:02:48 -05:00
Patrick12115
d2a11f1476
[Enhancement] Instant Putaway (#547)
* Instant Putaway Enhancement

Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com>

* Tweak some things and merge with Player Movement

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-06-03 22:38:29 -05:00
Garrett Cox
f8f00e6d9b
Add draw distance enhancements for actors and scene geometry (#539) 2024-06-02 23:15:33 -05:00