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.

Sign up for GitHub

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

Jump to bottom

Flags stuff #3014

Merged
merged 2 commits into from
Jun 20, 2023
Merged

Flags stuff #3014

merged 2 commits into from
Jun 20, 2023

Conversation

garrettjoecox
Copy link
Contributor

@garrettjoecox garrettjoecox commented Jun 17, 2023 •
edited by github-actions bot
Loading

Needed this for some ongoing/upcoming work, figured I'd get it in separate. I spent like an hour doing this by hand then deemed it a better idea to come up with a script to do it.

First commit is my manual adjustments that the script wouldn't handle, along with renames. Second commit is result of the script.

Build Artifacts

@briaguya-ai
Copy link
Contributor

would you mind throwing the script up on a gist or something and linking it? might be helpful if someone wants to do something similar in the future

@garrettjoecox
Copy link
Contributor Author

would you mind throwing the script up on a gist or something and linking it? might be helpful if someone wants to do something similar in the future

https://gist.github.com/garrettjoecox/0f807e0e2f654cf19686b291bbd20c23

@Archez
Copy link
Contributor

Archez commented Jun 17, 2023

Honestly this is something I wished would happen at some point. I know decomp had since replaced a lot of these with either the macro or function equivalent (for matching purposes). Sick to see you just nailed it all! 🚀

@garrettjoecox
Copy link
Contributor Author

Honestly this is something I wished would happen at some point. I know decomp had since replaced a lot of these with either the macro or function equivalent (for matching purposes). Sick to see you just nailed it all! 🚀

In case you or anyone is wondering why I opted for using the methods over the macros we got from decomp, it's because we'll be adding hooks for all flag sets. (technically we could do this in the macro but I'd prefer it be a function)

briaguya-ai
briaguya-ai reviewed Jun 17, 2023
View reviewed changes
soh/include/z64save.h Outdated Show resolved Hide resolved
soh/include/z64save.h Outdated Show resolved Hide resolved
soh/include/z64save.h Outdated Show resolved Hide resolved
soh/include/z64save.h Outdated Show resolved Hide resolved
soh/include/z64save.h Outdated Show resolved Hide resolved
soh/include/z64save.h Outdated Show resolved Hide resolved
soh/include/z64save.h Outdated Show resolved Hide resolved
soh/include/z64save.h Outdated Show resolved Hide resolved
soh/include/z64save.h Outdated Show resolved Hide resolved
soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c Outdated Show resolved Hide resolved
briaguya-ai
briaguya-ai reviewed Jun 17, 2023
View reviewed changes
Copy link
Contributor

@briaguya-ai briaguya-ai left a comment

Choose a reason for hiding this comment

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

overall i think this is looking good now, i'm not sure what kind of testing we want to do to ensure nothing breaks but i feel like we should do something

left another couple comments, one question and one somewhat unrelated cleanup suggestion

soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c Show resolved Hide resolved
soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c Outdated Show resolved Hide resolved
@aMannus
Copy link
Contributor

aMannus commented Jun 17, 2023

This is awesome! Less magic numbers AND not having to deal with bit magic, love it!

leggettc18
leggettc18 approved these changes Jun 17, 2023
View reviewed changes
Copy link
Contributor

@leggettc18 leggettc18 left a comment

Choose a reason for hiding this comment

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

Definitely needs a playthrough for testing or something, maybe we can make it one of the first MacReady PRs so there's lots of time for playtesting, but definitely in favor of the change.

@leggettc18 leggettc18 added the needs playtesting Needs general playtesting to ensure correctness label Jun 17, 2023
@garrettjoecox garrettjoecox added this to the MacReady milestone Jun 17, 2023
@garrettjoecox garrettjoecox mentioned this pull request Jun 17, 2023
Closed
7 tasks
@garrettjoecox garrettjoecox mentioned this pull request Jun 20, 2023
Closed
63 tasks
briaguya-ai
briaguya-ai approved these changes Jun 20, 2023
View reviewed changes
Copy link
Contributor

@briaguya-ai briaguya-ai left a comment

Choose a reason for hiding this comment

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

sulu is out let's :shipit:

@leggettc18 leggettc18 merged commit 7c5efb2 into HarbourMasters:develop Jun 20, 2023
8 checks passed
Alto1772 pushed a commit to Alto1772/Kingship that referenced this pull request Jun 27, 2023
@garrettjoecox @Alto1772
Flags stuff (HarbourMasters#3014)
71fb4c0 
* Manual adjustments to flags

* Script run to adjust flags
Pepper0ni pushed a commit to Pepper0ni/Shipwright that referenced this pull request Aug 3, 2023
@garrettjoecox @Pepper0ni
Flags stuff (HarbourMasters#3014)
9118333 
* Manual adjustments to flags

* Script run to adjust flags
Archez pushed a commit to Archez/Shipwright that referenced this pull request Aug 5, 2023
@garrettjoecox @Archez
Flags stuff (HarbourMasters#3014)
f919647 
* Manual adjustments to flags

* Script run to adjust flags
Archez added a commit to Archez/Shipwright that referenced this pull request Aug 5, 2023
@Archez
Triforce Hunt - Squashed commit of the following:
f4d1a72 
commit e68d300
Author: aMannus <mannusmenting@gmail.com>
Date:   Sat Jul 22 20:04:05 2023 +0200

    Fix timer completion & 50+ triforce pieces

commit 4423f94
Author: aMannus <mannusmenting@gmail.com>
Date:   Wed Jul 12 12:26:17 2023 +0200

    Finish translations

commit e26a05f
Author: aMannus <mannusmenting@gmail.com>
Date:   Wed Jul 5 20:35:13 2023 +0200

    French translation and update defaults

commit 8e7f0e0
Author: aMannus <mannusmenting@gmail.com>
Date:   Tue Jul 4 09:40:39 2023 +0200

    Small ImGui adjustments

commit 0b20570
Author: aMannus <mannusmenting@gmail.com>
Date:   Tue Jul 4 09:28:51 2023 +0200

    Update Item Tracker Settings initial size

commit c5aeda3
Author: aMannus <mannusmenting@gmail.com>
Date:   Tue Jul 4 08:53:58 2023 +0200

    Forced save on completion improvements

commit 0095e63
Author: aMannus <mannusmenting@gmail.com>
Date:   Mon Jul 3 20:37:37 2023 +0200

    Clean-up

commit 01cb50a
Author: aMannus <mannusmenting@gmail.com>
Date:   Mon Jul 3 20:19:42 2023 +0200

    Disable GBK option in ImGui with Triforce Hunt on

commit 8570dc2
Author: aMannus <mannusmenting@gmail.com>
Date:   Mon Jul 3 19:49:44 2023 +0200

    Better text boxes

commit c4d6580
Author: aMannus <mannusmenting@gmail.com>
Date:   Mon Jul 3 14:14:47 2023 +0200

    Grant GBK to player after hunt is completed

commit 4114ce2
Author: aMannus <mannusmenting@gmail.com>
Date:   Mon Jul 3 13:40:41 2023 +0200

    Triforce pieces can show up as icetraps

commit 510af61
Author: aMannus <mannusmenting@gmail.com>
Date:   Sun Jul 2 22:19:22 2023 +0200

    Bit of cleanup

commit d52cffc
Author: aMannus <mannusmenting@gmail.com>
Date:   Sun Jul 2 22:13:48 2023 +0200

    Start of making Triforce Hunt the win condition

commit 852f1c4
Author: aMannus <mannusmenting@gmail.com>
Date:   Sun Jul 2 18:03:02 2023 +0200

    More reverting

commit 41020b2
Author: aMannus <mannusmenting@gmail.com>
Date:   Sun Jul 2 17:57:22 2023 +0200

    Revert parts of logic

commit eae8df8
Author: aMannus <mannusmenting@gmail.com>
Date:   Sun Jul 2 14:45:35 2023 +0200

    Gameplaystats timestamp

commit 34d8189
Author: aMannus <mannusmenting@gmail.com>
Date:   Sun Jul 2 13:24:03 2023 +0200

    Finish item tracker

commit 27eec6b
Author: aMannus <mannusmenting@gmail.com>
Date:   Sun Jul 2 13:00:20 2023 +0200

    Triforce pieces in save editor & fix build

commit 61ec6dc
Author: aMannus <mannusmenting@gmail.com>
Date:   Sun Jul 2 12:50:20 2023 +0200

    Multiple triforce piece models

commit 57bd911
Author: aMannus <mannusmenting@gmail.com>
Date:   Sat Jul 1 22:59:44 2023 +0200

    Completed triforce model on GI done

commit d4df0f3
Author: aMannus <mannusmenting@gmail.com>
Date:   Sat Jul 1 17:58:09 2023 +0200

    Completed triangle on triforce completion

commit 8303d1e
Author: aMannus <mannusmenting@gmail.com>
Date:   Sat Jul 1 15:00:25 2023 +0200

    Initial item tracker stuff

commit 93984b3
Author: aMannus <mannusmenting@gmail.com>
Date:   Fri Jun 30 21:41:40 2023 +0200

    Credits warp + start of item tracker

commit 1de7097
Author: aMannus <mannusmenting@gmail.com>
Date:   Fri Jun 30 16:28:04 2023 +0200

    Triforce model is now a shard

commit a82f591
Author: aMannus <mannusmenting@gmail.com>
Date:   Fri Jun 30 16:15:43 2023 +0200

    Better triforce model, finish adding triforce pieces to logic

commit 08b2931
Author: aMannus <mannusmenting@gmail.com>
Date:   Fri Jun 30 12:03:51 2023 +0200

    Disable triforce greyscaling

commit 5c441f1
Author: aMannus <mannusmenting@gmail.com>
Date:   Fri Jun 30 11:43:03 2023 +0200

    Initial work to make triforce pieces their own rando item

commit acfc04d
Author: louist103 <35883445+louist103@users.noreply.github.com>
Date:   Tue Jun 27 19:53:35 2023 -0400

    Add an error for implicit functions (HarbourMasters#3017)

    * Add the flag and fix errors

    * switch assert and skin matrix

    * new LUS

    * Use normal assert

    * hopefully fix WiiU

    Signed-off-by: Louis <louist103@pop-os.localdomain>

    ---------

    Signed-off-by: Louis <louist103@pop-os.localdomain>
    Co-authored-by: Louis <louist103@pop-os.localdomain>
    Co-authored-by: Christopher Leggett <chris@leggett.dev>

commit 7c5efb2
Author: Garrett Cox <garrettjcox@gmail.com>
Date:   Tue Jun 20 10:54:02 2023 -0500

    Flags stuff (HarbourMasters#3014)

    * Manual adjustments to flags

    * Script run to adjust flags
louist103 pushed a commit to louist103/Shipwright-1 that referenced this pull request Aug 11, 2023
@garrettjoecox @louist103
Flags stuff (HarbourMasters#3014)
84871d7 
* Manual adjustments to flags

* Script run to adjust flags
@garrettjoecox garrettjoecox deleted the flags-stuff branch August 16, 2023 00:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leggettc18 leggettc18 leggettc18 approved these changes

@briaguya-ai briaguya-ai briaguya-ai approved these changes

Assignees
No one assigned
Labels
needs playtesting Needs general playtesting to ensure correctness
Projects
None yet
Milestone
MacReady
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@garrettjoecox @briaguya-ai @Archez @aMannus @leggettc18