Commit Graph
1410 Commits
Author SHA1 Message Date
Derek HensleyandGitHub bc632ac931 Update link (#1291) 2023-06-15 00:27:34 +10:00
196f9dba52 EnSw OK (#1283)
* EnSw OK

Decompiled the last remaining function.

* Update src/overlays/actors/ovl_En_Sw/z_en_sw.c

Add FAKE comment.

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

---------

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
2023-06-12 12:57:33 -04:00
NussandGitHub 21671975ec ovl_En_Snowwd decompiled (#1276)
* ovl_En_Snowwd decompiled

* formatting

* improved

* improvements

* D_80AF7AC8

* params

* D_06001AA0

* improvements
2023-06-11 09:35:09 -04:00
47be99fb0c libultra voice OK (#1264)
* Import all libultra voice code

* Libultra voice cleanup

* more cleanup

* more cleanup/docs

* cleanup variables.h

* File:

* PR review 1

* adjust comment

* more review

* More (p)

* SWRITEFORMAT

* consistent spacing

* fix bss

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2023-06-10 10:31:05 -04:00
engineer124andGitHub 8672dc0a57 Misc Cleanup 4 (#1271)
* begin next cleanup

* more cleanup

* climbAnim

* more cleanup

* more

* quick, a few more before anyone looks

* PR

* another fix

* table

* another small cleanup

* PR Suggestion
2023-06-10 09:37:43 -04:00
e19b139504 Tree Asset Decomp for object_tree (#1278)
* Basic Tree Asset Decomp

* renamed outnames

---------

Co-authored-by: Yoe <you@example.com>
2023-06-10 10:31:39 +10:00
engineer124andGitHub f05d1723d6 Persistent Cycle Weekeventregs (#1267)
* persistent weekeventregs

* move macro

* PR Suggestions

* 2 to ALT

* PR Suggestions
2023-06-08 14:46:13 -04:00
8c961f2b16 Play_Hireso (Bombers Notebook) OK w/ Docs (#1235)
* Start

* Try every function

* Import data

* Docs from message branch

* Fix non-equivalency for func_8016AE1C

* Everything looks NON_MATCHING

* Some more clean up and docs

* Some cleanup

* Small format

* Small improvements here and there

* Match a couple

* Anotha one

* and than there was 1

* and than there were none :)

* Lots of docs

* Finish code docs

* schedule static

* Macros + cleanup

* text ids array cleanup

* Entries cleanup

* Use sBombersNotebookEntries in macros

* Some docs from message branch

* eventIndex -> event

* Remove outdated comments

* PR

* BOMBERS_NOTEBOOK_ENTRY_SIZE

* tables

* Token pasting to simplify

* Some more fixes

* PR pt 1

* Format

* Bring over BombersNotebook docs from z_message branch

Co-authored-by: ZoeyZolotova <zoey.zolotova@gmail.com>

* Full enum glory

* Format

* Name weekeventregs

* typo

* Some comments

* bss

* Review

* bss

* Update src/code/z_play_hireso.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Fix

* Namefixer

* bss

* Format

* 0 = 0x0000

---------

Co-authored-by: ZoeyZolotova <zoey.zolotova@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-06-06 10:54:50 -04:00
a0701c170b z64game.h (#1250)
* z64game.h

* grrrrr

* fix missing stuff

* Update include/z64game.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update include/z64game.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* review

* global.h to the top

* reiew

* fix

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-06-06 08:54:18 -04:00
Derek HensleyandGitHub 4cce444661 Misc cleanup (#1273)
* this2 -> thisx

* exchangeItemId enums

* Sleep_Cycles

* ENENCOUNT1_PATH_INDEX_NONE

* Fram enums
2023-06-06 04:13:47 +01:00
engineer124andGitHub 7f5087d0b2 sys_math.c Rename (#1258)
* rename via comments

* missed a comment

* math header

* name boot_80086760.c functions

* PR Review

* rm cam comment

* Elliptic review

* alphabetical
2023-06-05 22:16:34 -04:00
engineer124andGitHub f92a61db27 Misc Cleanup 3 (#1268)
* begin more cleanup

* more enums

* typo

* ==

* fix go.h

* fix RaceDogInfo struct

* PR Review

* PR Suggestions

* missed one

* missed even more

* fix params

* fix number
2023-06-06 08:57:45 +10:00
8cabbb1a2b File Select (1 Non-Matching) (#1158)
* Everything below Main OK,
and some small ones at the top

* 3 more short ones

* FileChoose_Main

* SelectModeUpdate/Draw

* SelectMode update functions done

* 2 more small ones

* ConfigModeDraw

* SetWindowVtx

* FileChoose_FadeInMenuElements

* Rest of the Config Mode Update Functions

* Minor cleanup

* FileChoose_UpdateMainMenu

* Make xml for title_static

* Minor correction

* One nasty draw, thanks Synray

Co-Authored-By: Synray <31429825+Synray@users.noreply.github.com>

* import data

* some cleanup

* import OoT docs

* missed some docs

* some progress

* FileSelect_SetWindowContentVtx WIP

* improve FileSelect_SetWindowContentVtx

* match z_file_nameset_NES

* cleanup and docs

* title static

* a few more functions

* even more functions

* small cleanup

* Data Cleanup

* 2 more matches

* z_file_choose_80807940 OK

* cleanup

* fix merge master

* FileSelect_DrawFileInfo wip

* small cleanup

* minor

* fix merge

* match FileSelect_DrawFileInfo

* cleanup

* fix merge

* fix merge

* sram cleanup

* document select mode

* many docs

* more docs

* more cleanup

* small nitpick

* consistency

* more cleanup

* more cleanup

* small

* small typos

* octal bad

* pr review

* noop

* elliptic review

* more review

* non-matching

* oops

* more suggestions

* keyboard formatting

* fix master

* sound

* padding

---------

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
2023-06-05 15:03:02 -04:00
Derek HensleyandGitHub cd53dd317f Some pathing docs (#1205)
* Some pathing docs

* Missed one

* Uno mas

* Uno mas x2

* Cleanup

* fix

* namefixer

* NULL

* More

* PR

* Actually remove SQ

* -1 define, plus some more pathing cleanup

* Actor macros instead

* Format

* ADDITIONAL_PATH_INDEX_NONE

* Remove reliance on PATH_INDEX_NONE

* Missed some PathIndex cleanup

* Review

* format
2023-06-05 12:46:39 +10:00
engineer124andGitHub 47bc7c12e2 Misc Cleanup (#1257)
* a lot of brackets, and some other things

* oops

* another bracket

* check flag all

* just a few more...

* PR suggestions

* PR comment

* pr

* one more bracket
2023-06-04 15:43:12 -04:00
NussandGitHub a995e4cf61 ovl_Eff_Stk decompiled (#1265)
* ovl_Eff_Stk decompiled

* ovl_Eff_Stk improvements

* ovl_Eff_Stk forgot to remove variables

* ovl_Eff_Stk improvements
2023-06-02 11:50:57 -04:00
engineer124andGitHub 91182a796b Match Interface_DrawClock (#1261)
* Match Interface_DrawClock

* oops

* space

* combine ifs to help indentation

* small adjustment

* PR Suggestions

* extra space

* Section:
2023-06-02 15:09:49 +10:00
engineer124andGitHub 4b25b4d8e6 Misc Cleanup 2 (#1260)
* more misc cleanup

* PR suggestions

* more abs alt, csId

* more cleanup, can't help it

* fix incorrect sq

* more fixes
2023-06-02 14:39:39 +10:00
0261dc0a5c ovl_Bg_F40_Swlift OK and documented. obj_f40_obj documented. (#1171)
* Ported ovl_Bg_F40_Swlift to most recent zeldaret/master.

* Ran formatter.

* Attempt at fixing formatter problem.

* Applied PR changes suggestions and added authors

Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: Isghj5 <isghj5@gmail.com>
Co-authored-by: Tom-Overton <tom.overton@outlook.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>

* More PR fixes. Put object_f40_obj unused descriptor as comments. Added another author.

Co-authored-by: AngheloAlf <angheloalf95@gmail.com>

* Fixed some effect of handling merge conflicts. Some early returns added and renames in object_f40_obj.xml

---------

Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: Isghj5 <isghj5@gmail.com>
Co-authored-by: Tom-Overton <tom.overton@outlook.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
Co-authored-by: AngheloAlf <angheloalf95@gmail.com>
2023-06-02 14:25:03 +10:00
StickyThwompandGitHub 95c5796e41 ovl_En_Go OK and documented (Decomp was mostly done already) (#1080)
* Match remaining functions in z_en_go:

- Changed some already matching functions for uniformity with the tricky match (early continue from loop). In some cases, this eliminated some strange constructs, in others, it didn't leave much difference.
- Comments/Notes to start understanding/naming process.

* WIP renaming

* More WIP renaming.

* More renaming, Effects (See oot for continuation) and some flags)

* MessageScript documenting.

* Util for dumping message data by textId value.

* Identify some messages.

* Formatting, figuring out event flags.

* More WIP naming

* WIP renaming.

* WIP renaming

* WIP naming and organizing

* WIP more renaming.

* WIP renaming/organizing.

* Near-Final Cleanup before review.

* Rename Taisou and Hakugin animations and associated functions/variables.

* Misc Cleanup.

* Undo changes to variables.txt

* Removed msgtableparser.py (Split to another branch)

* Removal of uncompiled Message Script details.

* Fixup spec file

* First part of hensldm's suggested changes from review. Awaiting discussion.

* Second part of hensldm's suggested changes.

* Fixup missed 'Animation' suffix and functions.txt

* Update .xml files and related source per tom-overton's comments

* Align w/ engineer124's Quake Cleanup #1102

* fixup

* Run format.sh after merge.

* Add brackets around one-line conditional blocks

* Remainder of hensldm's comments from review.

* First pass at Elliptic's comments.

* Rename functions UpdateToX -> ChangeToX

* Header cleanup.

* Run Format, remove accidental commit of .orig file.

* Fixup ActorInit

* Review comments addressed, plus a few unsolicited changes.
- Location of function declarations moved above static data, below types: References in the codebase were mixed, but this just made more sense.
- Function name changes: It didn't fit into subsystems based on Goron Type, so I quit trying to name functions that way. Loss of a bit of "which function applies to which type", but it looks a bit cleaner, sooo...
- Took a stab at making effectTable usage a bit clearer. Just using a EnGoEffect* everywhere and not inherently knowing if it was for one element, or an array really bugged me.
- "GraveBro" names changed. They're all "brothers".

* Changes from engineer124's review.
- "Stretcher" replaced with "Athletic" as a descriptor of goron type.
- Misc formatting and naming changes

* Restructure switch-case statment for early break, and added missing default cases. Removed #define for 0 for actionFlags bitmask.

* Relocate WEEKEVENTREG comments, remove SCENE comments.

* Updated WEEKEVENTREG define names

* Update WEEKEVENTREG names in Goron Shrine Door.

* ELDER -> ELDERS, and revert formatting on z64save.h

* Fixed re-applying changes over wrong defines.

* Adjust Weekeventreg names and comments.

* Update comment as well.
2023-06-02 13:30:48 +10:00
KidFerozandGitHub e0ae4e24f7 ovl_Bg_Keikoku_Spr (#1228)
* ovl_Bg_Keikoku_Spr

* format

* format

* Co-authored-by: Alejandro Asenjo Nitti <sonicdcer@users.noreply.github.com>

* Co-authored-by: Alejandro Asenjo Nitti <sonicdcer@users.noreply.github.com>
2023-06-01 19:41:37 -04:00
eb24680be3 z_horse.c OK (#1245)
* func_800F3940

* func_800F3B2C, func_800F415C and func_800F41E4

* func_800F40A0

* func_800F3ED4

* func_800F3C44

* func_800F3B68 NON_MATCHING

* func_800F3A64 kinda

* func_800F39B4

* cleanups

* import data

* fix fake match

* format

* Scene enum

* minor cleanup on data usage

* Horse_RotateToPoint and ENHORSE_PARAMS

* scene setup index

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* fix merge

* z64horse.h

* Renames

* and even more renames

* format

* fix

* review

* Horse_IsActive

* review

* bss

* fix

* remove comments

* Update src/code/z_horse.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* review

* Update src/code/z_horse.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* review

---------

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-06-01 15:11:11 -04:00
engineer124andGitHub 64959177d9 match func_808DDE9C (#1262) 2023-05-31 16:27:30 -04:00
engineer124andGitHub b9f2411cd2 match EnKanban_Update (#1263) 2023-05-31 15:02:37 -04:00
Lucas ShawandGitHub 72c4f378cb ovl_Demo_Moonend ok (#1249)
* Progress

* one more

* OK

* update

* finished z_demo_moonend

* update reloc

* actually updated reloc

* fix symbols

* made suggested changes

* reformat

* Made suggested changes

* forgot to run format.py

* made suggested changes

* made suggested changes

* moved cueid to be in scope
2023-05-31 11:01:08 +10:00