Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TWEAK: Add transition to the Time Travel feature #3276

Merged
merged 2 commits into from
Oct 15, 2023

Conversation

PurpleHato
Copy link
Member

@PurpleHato PurpleHato commented Oct 11, 2023

Just a tiny touch-up that I should have included from the start for this feature

Before:

TT1.mp4

After:

TT2.mp4

Build Artifacts

@briaguya-ai
Copy link
Contributor

might be worth making a code cleanup issue to move away from magic numbers for transitions, definitely not something that needs to be a part of this PR

@garrettjoecox
Copy link
Contributor

might be worth making a code cleanup issue to move away from magic numbers for transitions, definitely not something that needs to be a part of this PR

Decomp has you covered https://github.com/zeldaret/oot/blob/main/include/z64transition.h

@garrettjoecox garrettjoecox merged commit 3ed976e into HarbourMasters:develop Oct 15, 2023
garrettjoecox added a commit that referenced this pull request Oct 16, 2023
* typo on asset attribute for pal1.1 (#3264)

* typo on asset attribute

* base address fix

* [Cosmetic] Adds Bunny Hood to Cosmetic Editor (#3245)

* Color and Invisible Checkbox

GI model crashes when talking to mask salesman

* Update z_player.c

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>

* Update z_player.c

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>

* Move bunny hood coloring to patch

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>

* redicle -> reticle (#3257)

* Equip Tunic and Boots while performing most actions (#3239)

* tunics and boot equips initial

todo: find an appropriate place to first put Player_AssignTunicBoots

* move to more appropriate place

* assign -> use

* [Difficulty Options] All Dogs are Richard (#3243)

* Oops, all Richards!

* Sure is

* Randomizer - Colored hints (#3259)

* Colored hints

* Missed 2 french translations

* add save editor field for current b button item (#3262)

* TWEAK: Add transition to the Time Travel feature (#3276)

* ADD/ Proper Transition

* REM: Dupe

* MM Bunny Hood effect separated from ability to equip as adult (#3253)

* adult separator

* use cross instead of checkmark

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>

* suggested load fix

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>

---------

Co-authored-by: Adam Bird <Archez@users.noreply.github.com>
Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com>
Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants