Skip to content

Modern menu#16

Merged
Malkierian merged 19 commits intoMalkierian:modern-menufrom
aMannus:modern-menu
Feb 27, 2025
Merged

Modern menu#16
Malkierian merged 19 commits intoMalkierian:modern-menufrom
aMannus:modern-menu

Conversation

@Malkierian
Copy link
Owner

aMannus bump

aMannus and others added 19 commits February 17, 2025 17:43
* added TrailType enum

* fixed build, moved declaration

* added enhancement comment

* Apply suggestions from code review

---------

Co-authored-by: link5669 <acqmiles@gmail.com>
* Use VB hook to fix Deku Nut upgrade bug

* Use constexpr, remove unused extern

* Separate IS_RANDO out of value macro

* Restore mask check in hook

* Call VB hook in SkipMiscInteractions hook

* Mask of Truth hook not registered in rando
Assertion failed in CreateChildAltarHints because all 3 stones were placed on fairies/beehives while those were disabled

Fix: consolidate on Context building settings dependant location lists. Overworld vs Dungeon should not operate so differently
* Use gamemode enum

* update console command for file_select
* Exclude debug file and cutscene map from auto save

* Remove ganon's lair from auto save exclusion
…rs#5075)

* logic: allow finding big poe in bottle for reward logic

only applies when big poe count is set to 1

* Allow multiple big poe bottles for when big poe requirement > 1
* Move boss kill logic into CanKillEnemy

Added hammer as being able to defeat Morpha

* add hammer vs gohma, king dodongo, & twinrova
* Move adult trade to flags

* Move child trade to flags

* Fix vanilla

* Address review

* Rename `trade_shuffle` to `ShuffleTradeItems`

* Fix mac build

* Update GIVanillaBehavior.h

* Update z_kankyo.c

* Update z_en_heishi2.c
@Malkierian Malkierian merged commit 103e926 into Malkierian:modern-menu Feb 27, 2025
1 check passed
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.

9 participants