Merge zeldaret/oot changes #155
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…OCARINA` (#2277) * Document ACTOR_FLAG_UPDATE_DURING_OCARINA * document PLAYER_STATE2_USING_OCARINA * format * comment tweak * treat var as flag
* name ACTOR_FLAG_HIT_PLAYER_THUMP_SFX * ACTOR_FLAG_HIT_PLAYER_THUMP_SFX -> ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT
* document switch activation * format * activate -> press * fix comment
* Remove hardcoded bash location in tools/preprocess.sh * Add more tolerant shebang to tools/preprocess.sh
* Document `PLAYER_STATE1_SHIELDING` * Fix format
* libu64 * logutils.o -> debug.o in spec * stackcheck.c is part of libu64 * review * add paragraph about Overlay_Load calling an external function * audio code*
* rename enkusa cut to bush destroyed * bush -> grass * clump
* name arrow actor flags * fix flag check
* Match ntsc-1.0/1.1 loose ends * Revert audioseq_padding * Fix spelling
…0 and 1.1 audio extraction (#2291) * [Audio 9/?] Multiversion samplebank and soundfont extraction xmls, 1.0 and 1.1 audio extraction * Rework multiversion samplebanks to reduce duplicates
* Use the T macro in z_select * Address reviews * Apply Format * Fix day & night
* [document] `enum PauseState`, game over parts * apply Jenkins fixes (automatic code formatting) also, as previously, i've rerun the "make" to check integrity * add `PAUSE_STATE_GAME_OVER_*` comments in case it helps to rename them later, if the need ever arises * improve `PAUSE_STATE_GAME_OVER_SAVE_*` comments also i've noticed, that `z64pause.h` doesn't comply fully with the `.clang-format` temporary changing a couple of setting to - ColumnLimit: 0 - AlignTrailingComments: false fixes the issue. i don't want to push unrelated formatting here * remove redundant comments zeldaret/oot#2283 (comment) * apply PR naming suggestions reverified with > `check_format.py ...` > `make ...`
* Use debug macros even in N64-only code * Use UNK_FILE/UNK_LINE instead
* rename OOT_DEBUG to DEBUG_FEATURES * makefile changes * add DEBUG_ASSETS * fix DEBUG_FEATURES usages * format * fix errors * review * fix problem and review2 * review * add DEBUG_FEATURES to DEBUG_ASSETS check * review * whoops * format
* set up start mode * note unused modes * fix bss
* name some start modes * document blue warp mode * Revert "document blue warp mode" This reverts commit d4071a81234b5a8a52635ff4ad8f5a7946cd5660. * name movement modes * fix door mode comment, it is not broken * Player_PutSwordInHand * typo * how the hell did that happen * add sword clarification
* document hookshot attachment * change comment * swap hookshot function comment * remove comments
* name remaining hookshot flags * tweak comments * period
* Document `func_80034F54` and related data new name: `UpdateLimbOverrides` reason: - `0x814` and `0x940` constants - `*_OverrideLimbDraw` functions additionally: - move constants into `z64animation.h` - use these constant for existing formulas - properly name corresponding actors' fields - add occasional explicit limbs limit constants * port over the MM "fidget" naming * remove redundant comments * move and rename `FIDGET_*` constants * introduce a `FIDGET_SCALE` constant, as no other value is applied * remove generally unrelated changes * apply PR suggestion Co-authored-by: mzxrules <[email protected]> * fix (?) fidgetTable size following the zeldaret/oot#2287 (comment) suggestion * remove an unused `struct EnMu` field @ `0x024A` a continuation to the 211263295cd8768d63c1426025cf913ba6bedc18 automatic padding commpensates its absence * remove MM mention as "it would get unruly fast" zeldaret/oot#2287 (comment) * rename `overridePerLimb` -> `fidgetFrequency` zeldaret/oot#2287 (comment) * give better names to the constants zeldaret/oot#2287 (comment) * remove unnecesasry braces from a comment zeldaret/oot#2287 (comment) * make the comment multiline "officially" * restore `limbIndex` naming for this PR zeldaret/oot@43afb7b#r1842644602 * apply a PR suggestion zeldaret/oot#2287 (comment) --------- Co-authored-by: mzxrules <[email protected]>
* document blue warp arrive * document warp song, door, and time travel * document grotto and farores wind * move animsfx * review * unname appear
…ilar to other scenes (#2310) * rename time-specific scene file textures * linter fixes
* cleanup * more * fix floats
* Fix some more GCC warnings, mark some bugs based on GCC warnings * Weird formatting * Suggested changes * More weird indentation I guess * UNREACHABLE() macro, add missing NORETURNs to fault_n64.c * AVOID_UB for PAL path in z_file_nameset.c * Remove comments about return types * Remove temp no longer needed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
took me several hours but here we are, someone should check
idle.cjust in case I broke the refresh rate stuff (I'm not an expert in this area so idk if I did a bad merge or not)I'll probably wait until monday then I'll merge this (so we can get more commits, hopefully), there's no reasons not to after all, maybe I'll go back to a weekly schedule on these updates (or once every two weeks?)