Skip to content

Entrance Docs #3332

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

Merged
merged 23 commits into from
Nov 19, 2023
Merged

Entrance Docs #3332

merged 23 commits into from
Nov 19, 2023

Conversation

inspectredc
Copy link
Contributor

@inspectredc inspectredc commented Oct 26, 2023

This depends on #3322, will leave some comments on things i've noticed/added/changed tomorrow

Build Artifacts

@inspectredc
Copy link
Contributor Author

Forgot to leave a comment on this:

Aside from updating the docs this adds a few enums/macros to randomizer_entrance.h:

  • Randomiser grotto entrance enum
  • Macro to obtain an entrance index from the grotto enum (load vs exit)
  • Macro for generating the 'field' of EntranceInfo

Other things to note are:

  • The entrance macros in GameInteractor.h are just defined as their corresponding new entrance index enum rather than replacing each instance of the macro's usage (though this can be done)
  • The entrance macros in randomizer_entrance.h are also just defined as their corresponding new entrance index enum

@briaguya-ai
Copy link
Contributor

not sure what the merge conflict here is...

@inspectredc
Copy link
Contributor Author

looks like just a conflict with one of the autosave fix lines added above it, pushing changes now

@Archez
Copy link
Contributor

Archez commented Nov 19, 2023

Now that #3322 is merged, there is a few more conflicts here

@inspectredc
Copy link
Contributor Author

updated 👍🏼

Copy link
Contributor

@Archez Archez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love it 🔥

@briaguya-ai briaguya-ai merged commit 80ef399 into HarbourMasters:develop Nov 19, 2023
A-Green-Spoon pushed a commit to A-Green-Spoon/Shipwright that referenced this pull request Nov 30, 2023
* transition variables renamed

* transition circle

* transition wipe

* sand storm

* remaining sceneloadflag rename

* transition trigger macros

* transition mode enum

* transition type enum

* tc set params

* creg debug transitions

* introduce entrance table + return entrance indices + entrance info macros

* randomizer entrance pass through

* cleanup some missing scene enums

* randomizer entrance tracker pass through

* randomizer grotto pass through

* gSaveContext.entranceIndex

* misc lists

* z_select pass through

* respawn entrance index

* nextEntranceIndex

* add missing include
jamieklassen pushed a commit to jamieklassen/Shipwright that referenced this pull request Mar 10, 2024
* transition variables renamed

* transition circle

* transition wipe

* sand storm

* remaining sceneloadflag rename

* transition trigger macros

* transition mode enum

* transition type enum

* tc set params

* creg debug transitions

* introduce entrance table + return entrance indices + entrance info macros

* randomizer entrance pass through

* cleanup some missing scene enums

* randomizer entrance tracker pass through

* randomizer grotto pass through

* gSaveContext.entranceIndex

* misc lists

* z_select pass through

* respawn entrance index

* nextEntranceIndex

* add missing include
@briaguya-ai briaguya-ai mentioned this pull request Apr 7, 2024
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.

3 participants