Merge zeldaret/oot's main
#147
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
* Decompile N64 anti-piracy checks in overlays * Fix BSS splits (I think) * Use physical address and comment on meaning Co-authored-by: Tharo <[email protected]> --------- Co-authored-by: Tharo <[email protected]>
… (#2045) * Use BSS section start from map file * Expand comment about section start heuristic * Reword
…m.c, z_en_toryo.c (#2047) * Add DEG_TO_BINANG2/RAD_TO_BINANG2 * Remove redundant cast
* Misc N64 actor changes * Apply naming suggestions
* Match z_scene_table.c * Attempt to fix bss ordering * Forward declare PlayState instead * Untangle circular includes in z64scene.h
Co-authored-by: Tharo <[email protected]>
* Match boot_main.c, logutils.c, z_locale.c (text) * review * review 2
* Allow building the Debug ROM without debug features * Fix bss * Add comment * Reword again * Fix bss
* Add "disasm sym_info.py" script for investigating the expected memory layout * review * add friendly error if context.csv is missing * rom as hexadecimal * require spimdisasm 1.28.1 (technically not *required* but may as well) * some fixups on symbol lookup logic
* Move non-libultra libc functions to src/libc/ * Add explicit nops in delay slots * Don't rely on CPP expanding undefined macros to 0 * Delete old Makefile rules * Fix type of memset()
* Match more overlay draw functions * Review
* match n64dd text * format * fixups * add n64dd segment using baserom * cleanup syms 1 * cleanup symbols 2 * cleanup D_800FF4B0 * fix declaration usage and linking for D_800FF4B0
* Document AnimSfxType and related functions * Rename ANIMSFX_TYPE_DEFAULT to ANIMSFX_TYPE_NO_OFFSET * Fix format * Rename walking types and improve comments * Apply comment suggestion * Address review * Fix format * Address review
* Pause docs: page backgrounds vertices and quads * update disasm metadata
* Add T macro for translated debug strings * Hyral -> Hyrule * put some more care into z_std_dma
…string (#2074) * full string translation z_std_dma * Remove FORMAT TEST
* T() in idle.c, irqmgr.c, padmgr.c, z_locale.c * T() in z_sram.c * T() in z_bgcheck.c, z_scene.c * format
* document special idle anims * review * format * remove SPECIAL_IDLE_ANIMSFX_MAX
* [includes] z_collision_check.c * bss
* document most of Player_ChooseNextIdleAnim * finish documenting Player_ChooseNextIdleAnim * capital letter * dummy block numbers for the script * fix bss * bug comment * SpeicalIdle -> Fidget, clean up related things * fix rng chance comment * normal -> default * rework Player_CheckForIdleAnim * swap idle anim defines * remove COMMON_FIDGET * add ARRAY_COUNT_2D * change macro def
…1 (#2253) * [ntsc-1.0/1.1] Extract assets (except audio) for ntsc-1.0 and ntsc-1.1 * Fix merge with pal-1.0/1.1
* [ntsc-1.0/1.1] Match audio library * Don't include versions.h in audio table headers * Include versions.h where audio tables are used
* Docs: some player rotation logic/data * Improve misleading comment * rename temps * unk_6AE_rotFlags * format * disasm metadata
* use missed reg macros * do action indexing cleanup * misc * doc fixup ish in KaleidoScope_SetPageVertices * newline_police * `43` -> `(PAGE_BG_QUADS + WORLD_MAP_QUAD_28)`
* document Player_Action_Idle * Player_DecelerateToZero * cleanup R_RUN_SPEED_LIMIT usages * format * typo * reorder reg * shake timer is used for fall damage * comment on shake timer only being processed in one place * format and edit comment * shakeTimer -> fallDamageStunTimer
* name talking related things * Player_Action_TalkExchangeItem -> Player_Action_ExchangeItem * splitting action stuff to new PR * format
* document turn in place * format * modify comments * sWaterSpeedFactor
* Document Player_Action_8084ECA4 * Name func_8083721C * Add note * Move BottleCatchAnimationData declaration * Apply format * Revert "Name func_8083721C" This reverts commit aeb7ea83abf470e81f88056e577bd1fb796ad7ec. * Revert "Merge branch 'main' of github.com:zeldaret/oot into bottle-info" This reverts commit 10f1a4500368a66097c80cdb08f86ff2456ba9fb, reversing changes made to 547280abf2a041a8f6884d43b2eada7802c7feec. * Reapply "Merge branch 'main' of github.com:zeldaret/oot into bottle-info" This reverts commit e9bf122be5a5641d31238d53c7ba788e560d8dd1. * Some more bottle docs (#1) * more docs * struct comments * format.py * Revert "Merge branch 'main' of github.com:zeldaret/oot into bottle-info" This reverts commit 10f1a4500368a66097c80cdb08f86ff2456ba9fb, reversing changes made to 547280abf2a041a8f6884d43b2eada7802c7feec. * add clarifying comment * review, fix bss --------- Co-authored-by: fig02 <[email protected]>
* Rename RoomBehavior2 * fig proposal * fig comment
* minor en_changer documentation update * rename EnChanger->chestOpened to selectedChest, formatting * update asm comment on EnChanger_OpenChests * use EnExItemType enum instead of EXITEM_COUNTER define
* Document Player_Action_8084F390 * Rename linkYawToStepTowards into shapeYawTarget * Fix BSS * Address reviews * Fix format * Address Review
* Rename RoomBehaviorType1 to RoomType * suggestions * Update include/z64scene.h --------- Co-authored-by: fig02 <[email protected]>
* Add multiversion instructions to README * Direct users toward Makefile * Modify options "below" instead of "in the Makefile" * Reword
* document object_bba * Clean up cne * object bob * object_aob * object_cob * object_bji * object_ahg * object_boj * All functions named plus some cleanup * enums * Remove body wiggle comments * Format * Remove case comments * comments with default * Format * format
* document ACTOR_FLAG_THROW_ONLY * flip function name * add comments
|
the audio stuff is done (except a clean up PR I think) so this is finally good to go, merging in 3 days from now |
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.
works on my machine™