Merge zeldaret/oot changes
#162
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
* rename CS_BEGIN_CUTSCENE and CS_END * matching * naming consistency for END command, improved comments * remove CS_CMD_NONE Co-authored-by: mzxrules <[email protected]> * remove comma from end of enum * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "c04562d30" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "c04562d30" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "cce3d93" --------- Co-authored-by: mzxrules <[email protected]> Co-authored-by: fig02 <[email protected]>
* Rename and document Adult Ruto functions * Rename struct fields also * Add enums for Ruto actions and draw configs * Proper name for Water Medallion cutscene data * Suggested changes * More suggested changes * Bring back naming consistency * Better documentation for EnRu2_CheckWaterMedallionCutscene Co-authored-by: fig02 <[email protected]> * Renaming suggestions * Rename EnRu2_AccelerateUp * Revert macros * Actually, fix macros * Remove extra blank line * Rename macros with GET --------- Co-authored-by: fig02 <[email protected]>
* give names for hyrule field and kakariko cutscenes * review
* Renamed EVENTCHKINF_3A * Remove redundant comment
* Rename EVENTCHKINF_02 * Rename to EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS
* Replaced EVENTCHKINF_4E * Add "set but unused" comment Co-authored-by: mzxrules <[email protected]> --------- Co-authored-by: mzxrules <[email protected]>
* Name Sleeping Waterfall state machine function * Rename function, second iteration
* document player params * better bgcamindex comment * cant use -1 for condition * fix match * define for default bgcam * doesnt work * matches * better comment
* Rename code_800BB0A0.c -> z_camera_spline.c * z_camera_spline -> z_cutscene_spline
* Rename code_80069420.c -> z_memory.c * z_memory -> z_memory_utils
* Add names for Medallion cutscene data * Rename to Cs at end
* Document `func_80AAA250` new name: `EnMd_ReverseAnimation` * rename `enum EnMdAnimation` > `enum EnMdAnimIndex` * Document `struct EnMd` fields (and functions) the list: * `func_80AAAC78` -> `EnMd_TrackMessageState` * `func_80AAAA24` -> `EnMd_UpdateAnimState_WithTalking` * `func_80AAA92C` -> `EnMd_SetAnimState` * `func_80AAA93C` -> `EnMd_UpdateAnimState` * `func_80AAA274` -> `EnMd_UpdateAnimState1` * `func_80AAA308` -> `EnMd_UpdateAnimState2` * `func_80AAA39C` -> `EnMd_UpdateAnimState3` * `func_80AAA474` -> `EnMd_UpdateAnimState4` * `func_80AAA508` -> `EnMd_UpdateAnimState5` * `func_80AAA5A4` -> `EnMd_UpdateAnimState6` * `func_80AAA638` -> `EnMd_UpdateAnimState7` * `func_80AAA6D4` -> `EnMd_UpdateAnimState8` * `func_80AAA768` -> `EnMd_UpdateAnimState9` * `func_80AAA7FC` -> `EnMd_UpdateAnimState10` * `func_80AAA890` -> `EnMd_UpdateAnimState11` * Document `func_80AAB158` new name: `EnMd_UpdateTalking` * Document `func_80034DD4` @ `z_actor.c` new name: `Actor_SmoothStep_Attention` * Document `func_80AAB5A4` new name: `EnMd_SmoothStep_Attention` * Document Mido's action functions the list: * `func_80AAB874` -> `EnMd_Idle` * `func_80AAB8F8` -> `EnMd_Watch` * `func_80AAB948` -> `EnMd_BlockPath` * `func_80AABC10` -> `EnMd_ListenToOcarina` * `func_80AABD0C` -> `EnMd_Walk` * rename flag `temp2` -> `canUpdateTalking` * (re)document Mido's animations via blender and fast64 * marginally improve comments * marginally improve comments * actually, yes, let's name action functions as such * Document eye textures as an enum to clarify for `EnMd_UpdateEyes` * rename `eyeIdx` -> `eyeTexIndex` Mido has two eyes and different textures for them * Undocument eye textures as an enum i was wrong: `_Draw` function might not follow the eyes texture order it is its own thing, like `enum EnMdBlinking` or nothing at all, yeah * ugh, and fix a typo with blinking rushing is no good * drop the `Action` suffix zeldaret/oot#2289 (comment) * rename animation states as sequences zeldaret/oot#2289 (comment) * `func_80034DD4` -> `Actor_FadeInOut` zeldaret/oot#2289 (comment) * rename animation states as sequences a continuation of b11a9e9942e1725824e54099f84085ff2165e854 * `func_80034DD4` -> `Actor_UpdateAlphaByDistance` zeldaret/oot#2289 (comment) * clarify a comment * Document `actor.params` bits allocation * apply review suggestions * apply review suggestions * apply review suggestions * apply review suggestions * apply review suggestions
* Rename EVENTCHKINF_4D * Second rename
* Renamed EVENTCHKINF_33 * Rename: Gave letter to King Zora
* Rename "temp" variables in Adult Ruto functions * Change to yaw
* Renamed EVENTCHKINF_3C * Renamed to Nabooru Knuckle * Format for Jenkins
* Rename EVENTCHKINF_69 * Rename CS flag
* Rename item get flags for Forest Stage upgrades * Fix Jenkins build error * Document shared flag bug * Rename shared flag * Massive documenting comments * GDI - remove one trailing whitespace
* named kokiri forest cutscenes (and related parts) * added missing pal n64 names (and changes in code) * removed unneeded comments * add kokiri forest duplicates from spirit temple * review 1 * review 2 (+ build fix)
* Rename EVENTCHKINF flags for payments to Happy Mask salesman * Tweak renames
* document culling * format * depth -> distance * format * var name * new graph link * rephrase actor flags * tharo's comments + some more tweaks * is this causing the problem? * change wording * cant scope the temp * format * dragorn review * bad merge * player -> camera in descriptions * more its * cadmic review * goddamn it why do i have that habit * projected
…oron City) (#2356) * name cs from gerudo fortress, dmc and goron city * format and updated comment about the darunia dancing cutscene * review 2
… Desert Colossus) (#2355) * name cs from domain, fountain, lost woods and colossus * review
* document z_horse.h * .bss * suggestions and more comments * bss * INGORACE -> INGO_RACE * format header macros * FIx incorrect type comparision * EnInMode -> EnInStartMode * R_EXITED_SCENE_RIDING_HORSE
… longer qualify them as const and incrementally link instead (#2381)
* Set up build system for ique-cn * Fix size of fbdemo_circle assets * Treat iQue as NTSC and Use "NES" for Chinese text * Revert z_kanfont
* Simplify most event flags * EVENTINF_HORSES_INDEX -> EVENTINF_INDEX_HORSES * Add missing index numbers * pr suggestions * Clean up INGO_RACE flags
* Fix editing PATH in macOS build instructions * Need quotes for paths with spaces
* Move D_80134488 from system_heap.c to fp.s * Add declarations * Fix bss
* iQue text extraction * More consistent terminology * Fixes for jpn, split each encoding into a separate charmap file, merge enc.nes.h and enc.chn.h * Merge nes and chn in DEFINE_MESSAGE macros * Remove redundant defines in nes_message_data_static
* Set up iQue disassembly * Label libultra vimodes * Format * skapi.c -> skapi.s * Fix AudioDebug functions * Group D_80134488 with fp.s in disassembly * Label boot bss * Add bss split for siacs
* Download ido-recomp compiler binaries instead of committing them * Skip downloading compilers if ido_recomp/ exists * Use make instead of bash script
* Match iQue compression * Use a dict * Use Makefile variables for compression settings * Put COMPRESS_ARGS last * Pad iQue ROMs to 16 KiB * Replace --pad-rom with --pad-to and --fill-padding-bytes * Clarify --fill-padding-bytes
* Clean up EVENTCHKINF for Carpenters * hardcode EVENTCHKINF_INDEX_CARPENTERS_RESCUED
* as0 * Fix ASOPTFLAGS for src/libc, remove unnecessary noreorder region in kanread * Suggested changes * Use %half to load the boot bss size for matching Co-authored-by: cadmic <[email protected]> * Wrap all of __osProbeTLB in noreorder --------- Co-authored-by: cadmic <[email protected]>
…392) * Cursed Family reward event flags * tunic -> shirt
* Download EGCS binutils and gcc for iQue * Use curl -s for cleaner output
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.
not sure if the pal 60 thing still works, otherwise builds and runs properly