Commit Graph

274 Commits

Author SHA1 Message Date
Tom Overton 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
engineer124 532ec30973
Misc Cleanup 6 (#1307)
* more cleanup

* 3 more brackets

* PR Suggestions
2023-07-05 12:09:01 +10:00
Nuss 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 Hensley 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 Hensley 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 Hensley 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
engineer124 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 Overton 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
Nuss 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
SeDan01 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
Nuss e73034f8cd
object_snowwd (#1293)
* rename

* prefix fix
2023-06-17 13:42:40 -04:00
Nuss 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
SeDan01 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
TrulyNaN 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
StickyThwomp 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 Shaw 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
Derek Hensley 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
Thomas 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 Overton c84eab6efb
`z_fbdemo_wipe1` OK and assorted asset cleanup (#1244) 2023-05-27 10:28:27 +10:00
Zakru 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
Tom Overton 40846f3d3a
Ensure all boss title cards are extracted as IA8 (#1230) 2023-04-20 22:39:08 +01:00
Anghelo Carvajal 543c38ae06
`z_player_lib`: Dawn of the final PR (#1142)
* Player_GetMask and Player_RemoveMask

* some comments

* Player_ActionToBottle and Player_GetBottleHeld

* Player_DrawGetItemImpl and Player_DrawGetItem

* func_80123420 OK

* Decompile a few more functions

* Decompile a few more functions

* func_80122760

* func_80122868, func_801229A0 and func_801229EC

* func_80122F28

* func_8012301C

* func_801242B4

* func_801242DC

* func_80124420 nonmatching

* func_80126440

* func_801240C8 and func_801240DC

* func_8012405C and func_80124088

* func_80124020

* Player_IsBurningStickInRange

* func_8012754C

* func_80125318 and func_80125CE0

* func_801229FC

* func_80127B64

* func_80127488

* func_80122D44

* func_80122BA4

* func_80122C20 attempt

* func_80122EEC

* func_80122F9C

* func_80122FCC and func_8012300C

* func_80123448

* func_801234D4

* func_801235DC

* func_80123960

* func_80123BD4

* func_80123AA4

* func_801239AC

* func_801241B4

* func_80123C58 and func_80123C90

* func_80123D50 and func_80123DA4

* func_80123DC0, func_80123E90 and func_80123F14

* func_80124110 and func_80124148

* func_80124168 and func_80124190

* func_80124278

* func_80124F18 non_equivalent

* func_80125340 and func_8012536C

* func_801263FC

* func_801265C8

* func_8012669C

* func_80128B74

* func_80123140

* func_801246F4

* func_801253A4 NON_MATCHING

* func_801262C8

* func_80126AB4

* func_80126B8C

* func_80127438

* func_801278F8 NON_MATCHING

* Fix data split

* cleanup externs

* func_80128BD0 compiles...

* Rename Player_SetEquipmentData

* fix merge issues

* Fix types

* Improvement? Worse? I don't know at this point

* func_80128640 attempt

* func_80127BE8

* func_80127A60

* func_80127594 attempt

* func_801271B0

* func_8012364C NON_MATCHING

* func_80124618

* func_80124CC4 non matching

* func_801251C4

* func_80125580 non equivalent

* func_80128388

* cleanup

* remove some hardcoded pointers

* object symbol cleanup

* func_80124870 NON_EQUIVALENT

* name overridlimbdraw arguments

* func_80125D4C NON_EQUIVALENT

* func_80126BD0 NON_MATCHING

* Match func_80126BD0 thanks to anon58

* func_80127DA4 NON_EQUIVALENT

* fix merge issues

* some stealing from OoT

* small rename pass and cleanup

* Improve some

* CLAMP and fix warnings

* func_80125580 matched by mzx

* cleanup func_80128BD0  a bit

* import data

* func_80124CC4

* Rename objectFileTable to gObjectTable

* Improve func_80124FF0 thanks to maide

* fix renames

* Match func_80124FF0 thanks to Maide

* cleanup

* More cleaning up

* import bss

* Add PLAYER_STATE macros

* a bit more of cleanup

* run formatter

* func_80128BD0 a bit more deecent

* Add player limb enum

* Use limb enum

* cleanup and format

* Use symbols for player dlists groups

* A bunch more of pointers

* more object pointers

* Change the remaining object pointers

* Add a few missing dlist in link_child

* Small rename

* whoops

* Work on NON_MATCHINGs

* Cleanup

* Steal OoT renames from "sword" to "meleeWeapon"

* Fix some symbols

* Match func_80127594 and format

* Match func_80127DA4

* Matched func_801284A0

* Annotate D_801F59AC

* Matched func_80128640

* Some cleanup

* format

* stuffs

* some cleanups

* import stuff from pr

* swords and shields

* fixes

* bss

* cleanup Player_OverrideLimbDrawGameplayCommon

* progress on func_80125D4C

* PlayerMeleeWeapon enum

* Player_BButtonSwordFromAP

* GET_B_SWORD_FROM_AP

* GET_MELEE_WEAPON_FROM_AP

* PlayerBottle

* PlayerExplosive and PlayerSword

* misc fixes

* Various changes fromplayer_actor

* z64player.h stuff from player_actor

* Fixes

* skelanime stuff

* placeholders on z64item.h, save macros and ther cleanups

* <= PLAYER_AP_MINUS1

* Player_UpdateBunnyEarsKinematics

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* cleanup

* bodyPartsPos

* comment

* sizeof(u16)

* typo

* merge fixes

* fix

* fixes

* format

* fix merge

* fix merge

* func_80125D4C

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* func_80128BD0 improvement

* minor renames

* format

* whoops

* small cleanup

* Update src/code/z_player_lib.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* format

* _B_

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

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

* format

* remove gap

* whoops

* clanups

* remove stuff from permuter_settings

* steal some OoT docs

* some other docs vscode didn't add to the last commit

* format

* data as infunction-static data

* OoT docs stealing

* Improvements on Player_PostLimbDrawGameplay

* More improvement

* Match Player_PostLimbDrawGameplay

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* cleanups

* Convert unk_AF0 into an union and some other cleanups

* bss

* headLimbRot and upperLimbRot

* fix naming

* cleanups

* bss

* bss

* Update src/code/z_player_lib.c

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

* pr review

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* bss

* gesture

* namefixer

* gestureInfo

* IA_MIN and BOTTLE_EMPTY

* review

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* review

* D_801F59B0_LEN

* Remove LevelOfDetail enum

* bss

* review

* review

* gLinkDekuClosedFlowerDL gLinkDekuOpenFlowerDL

* _B_

* Player_DrawStrayFairyParticles

* fix build

---------

Co-authored-by: kyleburnette <kyle@kyleburnette.com>
Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-04-18 23:01:05 -04:00
Blythe 255c4599bf
ovl_En_Slime & object_slime OK and documented (#1175)
* decomped init, draw

* started slime

* finished func decomp en_slime

* object_slime and en_slime updates

* updated a few names

* finished up some naming

* en_slime and object_slime OK and documented

* slime xml cleanup

* Code cleanup round 1

* Cleanup 1 - missed a note

* Fixed improper use of bgcheck flags

* Some cleanup

* Namefix, name cleanup

* Function name cleanup, misc cleanup

* More name cleanup (pre-merge)

* Update color filter flag constants

* Tidying

---------

Co-authored-by: Blythe Hospelhorn <35576053+bhospelhorn@users.noreply.github.com>
2023-04-15 14:56:23 +10:00
krm01 34f9fb9886
[Doc] small, names for mayor dotour's eye and eyebrow textures (#1220)
* some naming and tlut assignments to dt eye textures

* update dotour overlays with new texture names

* critical formatting fix
2023-03-30 20:57:26 +11:00
Isghj e50ab59cf7
Documented `object_sth` and `object_ahg`, both used by `EnSth` (Moon gazer who wants to buy Ocean spiderhouse) (#1169)
* object_sth/object_ahg: docs

* Ssh: formatter

* Apply suggestions from code review

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

* Oops missed one

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

* Seth: fixes

* Sth: more requested changes

* Apply suggestions from code review

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

* Sth/Ahg: requested changes

* Apply suggestions from code review

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

* Sth: further function name requested changes

* Sth: minor note

* Sth: fix animation name

* Sth: forgot to rename saved flag

* Seth: change ocean wallet week reg name

* Sth: some requested changes

* Sth: fixed week event reg, added more

* Sth/Ssh/Si: changed from two defines to 1

* Si/Sth/Ssh: mistook fanfare for sfx, token define renamed

* Sth/Ssh/Sekihi: requested changes and some weekregflag docs

* Sekihi: fix missing header for skull count

* Sekihi: moved flag description to z64save

* Sekihi: moved flag description to z64save

* Sth: removed flag

* Update include/z64save.h

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

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2023-03-07 20:54:12 -03:00
Tom Overton c70ccf14d9
Add original asset names for all `object_e*` and `object_f*` files (#1181)
* Add original asset names for all `object_e*` and `object_f*` files

* Add c_keyframe note to fall2
2023-02-28 09:41:54 -05:00
Derek Hensley 8eb54f4b32
TransitionFade OK (#1160)
* Match fade

* Some adjustments from OoT PR

* Missed 1

* iREG(50)

* Fill

* Sync

* PR review
2023-02-24 13:20:18 -03:00
EllipticEllipsis 69f7540e33
EnGe2 (Gerudo in Purple) OK and documented, object_gla documented (#1071)
* OK, data imported

* Permuter settings

* Name data, a few functions and variables, cleanup

* Small amount of cleanup on some related actors

* Oops

* Document object

* Type and other macros

* Some cutscene stuff and temporary function names

* Proper path function names

* Name a couple more functions

* A couple more function names

* Name PathStatus enum

* Name rest of functions and formalise the documentation a bit

* Apply suggestions from code review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* limbs

* Format

* Review

* format

* weekeventregconvert and format

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2023-02-24 11:59:17 -03:00
Tom Overton 3e257354c1
Add original asset names for all object_d* files (#1162) 2023-02-21 17:43:34 -03:00
Isghj 4c4c0d7307
Document `object_po_fusen` (Poe Balloon from romani ranch) (#1167)
* PoFusen: Documented object

* PoFusen: Cleaning and docs

* Apply suggestions from code review

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

* PoFusen: fixes for requested changes, and additional changes

* PoSisters: replace NONEFFECT with NONE

* Fusen/Sisters: requested changes

* Fusen: more requested changes

* Fusen: removed documentation at request

* Apply suggestions from code review

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

* Po Fusen/Sisters: fix dmgeff naming

* Po Fuse/Sisters: more enum/define/limb name cohesive

* Apply suggestions from code review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* PoSisters: comment caplitalization

---------

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2023-02-21 17:09:08 -03:00
Tom Overton 50bd6056e2
Document EnSyatekiWf and do some slight cleanup on object_wf and other Syateki actors (#1168) 2023-02-21 16:42:20 -03:00
EllipticEllipsis 9297e6dd52
EnDekubaba OK and documented, object_dekubaba documented, EnKarebaba documented (#1088)
* OK, struct documented

* Data imported, update spec

* Name data

* Name all functions and variables

* Document object

* Bit more documentation

* Document Karebaba

* Add note to object_dekubaba

* Bit more cleanup

* Review

* Shadow

* Review

* Rename functions, add hit enum

* Figured out the enum

* Review

* MarkForDeath -> Kill
2023-02-21 14:30:09 -03:00
Alejandro Asenjo Nitti c52414ff79
ovl_En_Zod OK with some Docs (#1115)
* func_80BAF1EC matching

* progress

* Draw

* progress

* Co-authored-by: darkeye darkeye@users.noreply.github.com

* progress

* Co-authored-by: petrie911 petrie911@users.noreply.github.com

* header fix

* data imported OK, textures extracted

* reloc ok

* cleanup

* fogNear

* cleanup

* animations

* textIds

* some docs

* Co-authored-by: EllipticEllipsis <EllipticEllipsis@users.noreply.github.com>

* EnZodAnimations

* more docs

* docs

* default

* pr review

* singular

* pr review

* Actor_Kill

* revert text comments

* 0xFFFF

* pr review

* pr review

* enum in order

* ForeArm <-> Arm

* .

* .

* default in switch
2022-12-26 17:39:47 -03:00
EllipticEllipsis bbbe0b1821
code_801780F0 OK and documented, EnPaper documented (#1061)
* File split

* Split, OK and documented

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>

* Document relevant parts of DmBal

* Some EnPaper docs

* Document EnPaper

* Name functions

* Defake Actor_UpdateActor a bit

* Reword

* \cdot

* Fiddle with the description of the DE again

* Actually force is probably more correct

* Probably time to stop fiddling

* Format?

* Review

* Remove bug comment

* Review

* Rename to su_mtx, split off code_80140CE0

* Format

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2022-12-08 16:33:21 -03:00
Tom Overton fccd760be1
Add original asset names for all `object_b*` and `object_c*` files (and some related stuff) (#1152) 2022-11-21 16:31:28 +00:00
Tom Overton eafc5bb4c1
Document object_boss07 (Majora assets) (#1145)
* Document object_boss07 (Majora assets)

* Respond to hensldm's review

* Respond to Elliptic's review
2022-11-15 00:22:13 +00:00
Tom Overton 5a48403cfd
Add original asset names to all `object_a*` files (#1146) 2022-11-14 02:25:29 +00:00
petrie911 122a050d44
EnEgol (Eyegore), object_eg, and related actors EnEstone and EnEgblock (#1041)
* EnEgol (Eyegore), object_eg, and related actors EnEstone and EnEgblock

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* merge fixes
2022-11-06 00:16:55 -03:00
petrie911 fdae305a0a
EnTest3 (Kafei) (#1013)
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

Co-authored-by: Angie <angheloalf95@gmail.com>
2022-11-05 23:38:22 -03:00
Synray baaa79b979
ovl_En_Kaizoku OK (#945)
* ovl_En_Kaizoku OK

* format.sh

* Review changes

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* Fix building

* first pass

* picto

* format

* object

* sfx

* morecleanup

* and more naming

* boyo

* Update src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* floats

* steal some docs from OoT

* review

* format

* sort

* parens

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-11-03 21:42:27 -03:00
Derek Hensley f191044a05
General Cleanup 12 (#1139)
* undefined syms

* fire footprint outnames

* material/model DLs

* iceblock

* enHorse

* const ActorInit

* Remove some &

* flash

* KusaBushTypeDL

* gWarpTagGoronTrialBaseCollider -> gWarpTagGoronTrialBaseCol

* iceblock col
2022-10-28 13:58:27 -03:00
Alejandro Asenjo d863e7aeef
ovl_En_Rz OK (#1029)
* progress

* 4 functions left

* progress

* all functions matching

* ovl_En_Rz OK

* formatting

* a few things here and there

* whoops!

* pr review

* pr review

* remove temp

* pr review

* pr review

* casts removed

* merge fix

* pr review

* pr changes

* macros and enums

* struct

* defines in c file

* EnRzType in Header

* ROSA_SISTERS

* sEyeTextures

* animations

* @bug

* sEnRzEyeTextures

* func_80BFC674

* switch spaces and default

* format

* static

* animation docs

* link anim enum

* Rosa Sisters animations enum

* comment

* a few things

* EN_RZ_GET_SISTER fix

* comment on array size

* path enum

* EnRz_SetupPath

* EnRz_PathStatus

* EnRzPathStatus

* EnRz_Walk

* EnRz_StopToThink

* pr review

* singular

* step

* EnRz_GetPathStatus

* Actor_Kill

* review

Co-authored-by: Angie <angheloalf95@gmail.com>
2022-10-22 15:18:42 +01:00
Derek Hensley c1a0d0bd2b
EnOsn (Happy Mask Salesman) and object_osn Docs (#1135)
* Inital cleanup

* Object

* Docs

* Small things

* PR
2022-10-22 04:12:38 +01:00
Tom Overton f4904ab793
Document object_boss01 (Odolwa) (#1132)
* Document limbs

* Finish object

* Forgot this translation

* Respond to all reviews
2022-10-21 21:36:32 -03:00
Parker Burnett a848bb138d
Hg and Hgo documented (#1112)
* inital work

* en_hg done-zo

* finished hgo

* forgot to format...

* review comments from anon

* fixing review comments

* fixing comments

* update name

* fix
2022-10-21 04:01:59 +01:00
Tom Overton 75d7cf668c
Document object_boss_hakugin (Goht) (#1133) 2022-10-21 01:30:17 +01:00
Tom Overton 1d1b6986af
Document object_dnq (Deku Princess) (#1130)
* Document object_dnq (Deku Princess)

* Respond to reviews
2022-10-18 12:25:59 +01:00
Tom Overton b570e0c98e
object_dno (Deku King) documented (#1126) 2022-10-16 19:14:15 -03:00
Anghelo Carvajal 92d93701a9
`ovl_En_Nb` OK (#1030)
* mips2c general pass

* EnNb_Init

* EnNb_Destroy

* EnNb_Update

* draw functions

* func_80BBFE8C

* func_80BC0D84 non_matching

* func_80BBFE60 and minor fixes

* a bunch of functions

* And another bunch

* An attempt to the last function

* import data

* Match func_80BC0D84

* Use extracted symbols instead of hardcoded ones

* Match last function

* format

* Update the reloc in the spec

* regconvert and draw

* Small docs pass

* actorfixer and format

* Minor renames

* schedule

* cleanups

* namefixer

* minor cleanups

* yeet printing stuff

* Schedule and anims cleanup

* stateFlags

* Name limbs and anims

* Name more stuff in the asset

* Finish naming simple stuff

* format

* merge fixes

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* EnNb_UpdateSkelAnime

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* fix typo

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.c

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

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.c

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

* review

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* MTXMODE_APPLY

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* format

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.h

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.h

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.h

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* clamps

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-16 16:44:03 -03:00
Alejandro Asenjo 62b465b3ea
ovl_Bg_Dkjail_Ivy OK (#1014)
* ovl_Bg_Dkjail_Ivy OK

* Co-authored-by: petrie911 petrie911@users.noreply.github.com

* xml

* pr review

* pr review

* pos / vel / accel

* format

* angle

* Update src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* in-function static

* BgDkjailIvy_SetIdle

* _WaitForCut

* setup

* pr review

* Actor_Kill

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-16 04:36:25 +01:00