Commit Graph
279 Commits
Author SHA1 Message Date
9e85f5545a Shopkeeper weekeventregs (#1325)
* Ossan

* sob1 talked

* fsn weekeventregs

* Curiosity shop 3rd day item to special item

* Kotake

* Format

* Kotake bottle

* PR suggestions

* Koume Kiosk -> Kiosk Koume

* Update include/z64save.h

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

---------

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2023-07-18 14:51:56 -04:00
Tom OvertonandGitHub 76e02120a0 Add original asset names to all object_h* files (#1330)
* Add original asset names to all `object_h*` files

* Soften language used in `object_hunsui`, because we can't say for sure that we know the names of the collision files, even if it feels pretty clear

* Switch from "is" to "might be" on the DLs too
2023-07-18 14:25:25 -04:00
b3f4b8a9cb Animation Cleanup: En_B* Actors (#1326)
* En_B

* more cleanup

* another if (1) fixed

* more cleanup

* more cleanup

* rot

* PR Suggestions

* fix vtx

* rm more Draw

* Update assets/xml/objects/object_yb.xml

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

* Update assets/xml/objects/object_bigpo.xml

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

---------

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2023-07-14 16:33:58 -04:00
Tom OvertonandGitHub 4727253718 Add original asset names to all object_g* files (#1323) 2023-07-14 11:15:10 +10:00
Derek HensleyandGitHub 913cd981c0 Deku Playground Docs (#1318)
* Actor shared memory

* EnGameLupy

* EnLiftNuts

* object_dnt

* PR Suggestions

* Things I missed

* sPad

* Format

* PR comments
2023-07-10 22:47:39 -04:00
Tom OvertonandGitHub 08006cc0ea Document EnTanron5 (destructible props, fragments, and item drops in Twinmold's arena) (#1319)
* Document EnTanron5 (destructible props, fragments, and item drops in Twinmold's arena)

* Respond to engineer's review

* Updated the type names, used "ruin" instead of "prop" in comments, and addressed Anon's review

* Missed this instance of "prop"

* Respond to engineer's review

* Update OutNames too
2023-07-10 18:02:22 -04:00
engineer124andGitHub 532ec30973 Misc Cleanup 6 (#1307)
* more cleanup

* 3 more brackets

* PR Suggestions
2023-07-05 12:09:01 +10:00
NussandGitHub 3b1b054e93 Object names rename/comments from the OoT equivalent (#1282)
* object_fu(Bean Seller)

* object_bombf (Bomb flower)

* object_ds2 (Potion Shop Guy)

* object_fu (guruguru)

* object_hata (Red Flag on Post)

* object_lightswitch (Sun Switch)

* object_rr (Like Like)

* Tower Collapse Bars?

* object_vm (Beamos)

* ups

* object_fu EnumName

* improvements

* Offset

* improvements

* object_ms enums and outnames

* missing prefix

* improvements

* improvements
2023-07-03 16:08:30 -04:00
Derek HensleyandGitHub 5c7d745102 Some partial objects cleanup (#1313)
* tanron1

* gm

* tanron4

* sekihi

* dkjail

* dor02

* dor04

* blobs

* comments

* parens

* Unknown
2023-07-02 10:31:54 -04:00
Derek HensleyandGitHub f54a9b2831 Some Gameplay keep docs (starts at the top) (#1310)
* bottles

* hookshot

* swords

* masks

* remove _tex from outnames

* Headers

* 003400 Vtx

* unknown mask

* LinkMask name based on renders
2023-06-28 23:49:15 -04:00
Derek HensleyandGitHub 283a37affb Misc Cleanup 2 (#1306)
* Cleanup undefined_syms.txt

* removed unused from Bba textures

* eyegore beamos textures

* object_eg Unused -> Beamons

* ssh

* segment 0x07
2023-06-25 08:44:42 -04:00
aa9e368561 icon_item_static and icon_item_24_static documented (#1297)
* extract_archives.py

* autogenerated xmls

* build OK

* cleanup

* Use symbols in gItemIcons

* change how archives are generated

* makeyar in C

* Rename segments

* rename .archive.o to .yar.o

* Explanation at the top of programs

* fix progress calculation

* Ignore archives in progress script

* merge

* document icon items

* cleanup

* remove duplicate headers

* jap -> jpn

* PR review

* link human

* PR Review

* missed some

---------

Co-authored-by: angie <angheloalf95@gmail.com>
2023-06-23 10:57:01 -04:00
Tom OvertonandGitHub 96a1d37084 Cleanup of Shooting Gallery actors (#1302)
* Change `EN_SYATEKI_*` enums/defines to `SG_*`

* Name shooting gallery weekeventregs

* Get rid of names on unions (this is what I wanted to begin with!)

* Use ARRAY_COUNT(sGuayFlagsPerWave) instead of 3

* Actually give a proper name for SG_DEKU_GET_PARAM_FF00

* Use anon's suggestion for path param name

* Remove comment that isn't true? What was I cooking back then

* Animation naming stuff + comments

* Tons of score and shooting game logic cleanup

* Fix build issues

* Some more Octorok docs

* Use ANIMMODE enum in EnShn

* Put a bug tag on the weird behavior in EnSyatekiWf
2023-06-21 09:29:16 -04:00
NussandGitHub 763830b185 ovl_En_Dnh decompiled (#1289)
* all func except func_80A50D40

* func_80A50D40

* decompiled

* forgot an line

* improvements

* SkeletonHeader

* format

* forgot to remove wrong include

* D_80A5143C and improvements

* improvements

* added limb

* format

* forgot the header

* object_tro

* OutName fix

* improvements

* THIS upcast

* limb rename
2023-06-21 23:27:42 +10:00
SeDan01andGitHub 7194936203 object_firefly Decomp (#1285)
* object_firefly dLists and skel

* most limbs, textures

* more limbs, comments, outnames.

* fixed d list name in z_en_firefly

* enum name fix, limbIndex numbers fix, root name fix

* llvm changes because of format.py

* deleted llvms and max limbs number fixed

* z_en_firefly changes after clang format

* error in the build because of these two

* fixed limbIndex issue and added enum names instead

* equal sign that was missing

* limbIndex number was wrong

* z_en_firefly.h include changes and morph/joint table changes

* build retry

* format.py again and build retry
2023-06-20 18:09:50 +10:00
NussandGitHub e73034f8cd object_snowwd (#1293)
* rename

* prefix fix
2023-06-17 13:42:40 -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
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
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
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
fc475a9756 Docs Cleanup (#1153)
* sysheap

* Gorons

* Update goron comment

* functions.h

* Update src/boot_O2/system_heap.c

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

* add header

* Fix header guards

* Update data

* Add malloc and free to header

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-05-29 13:04:07 +10:00
ThomasandGitHub 20f7e2199a ovl_Bg_Tobira01 OK and documented (#1247)
* Decompiled source of tobira01

* Documented and formatted in prep for merge request

* Added spacing, renamed unused back to what it was, added definitions, changed 1.6666 to division

* Ran weekeventreg script, added additional spaces throughout the file, removed the macros for 0 and 60, updated some missed this casts, renamed spot11 out names

* Converted gSaveContext calls over to CLEAR_WEEKEVENTREG calls from review feedback

* Reformatted some files

* More review feedback

* Removed _tex
2023-05-28 14:19:53 -04:00
Tom OvertonandGitHub c84eab6efb z_fbdemo_wipe1 OK and assorted asset cleanup (#1244) 2023-05-27 10:28:27 +10:00
ZakruandGitHub 35c45eab70 EnAnd OK and documented (#1224)
* EnAnd before data

* EnAnd data

* EnAnd preliminary renaming

* EnAnd document object

* EnAnd finalize pre-PR documenting

* EnAnd style improvements

* EnAnd refactor eye textures

* EnAnd make some parts more explicit

* EnAnd cutscene refactor according to suggestions

* EnAnd style improvements
2023-05-15 20:51:47 +10:00