Commit Graph

543 Commits

Author SHA1 Message Date
Alejandro Asenjo 2c10d51022
ovl_Bg_Ikninside OK (#848)
* ovl_Bg_Ikninside decompiled

* PR review fixes

* pr review fixes

* pr review fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 00:21:44 +01:00
Alejandro Asenjo 8d6b4d68ad
ovl_Bg_Keikoku_Saku decompiled (#847)
* ovl_Bg_Keikoku_Saku decompiled

* reloc change

* BGKEIKOKUSAKU_GET_SWITCHFLAG name fix

* pr review fixes

* pr review fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 00:18:03 +01:00
Alejandro Asenjo f0c1e17fd0
ovl_Dm_Bal decompiled (#846)
* All functions match, data import problem present

* * importing succeed
* final clean up
* fixed warnings

* pr fixes

* pr review fixes

* PR review fix

* pr review fixes

* fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 00:13:25 +01:00
Alejandro Asenjo 1ce5d13677
z_dm_opstage decompiled (#845)
* z_dm_opstage progress

* z_dm_opstage decompiled

* pr review fixes

* pr review fixes

* pr review fixes

* params var removal

* macro tunning + params removal

* final (hopefully)

* prototype was unnecessary

* pr review  changes

* pr review fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 00:07:13 +01:00
Alejandro Asenjo 9e6bc5db8b
ovl_en_hata decompiled (#844)
* z_en_hara progress

* ovl_En_Hata Decompiled

* PR review fixes

* pr review fixes

* PR review fixes

* format

* PR review fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 00:00:03 +01:00
Alejandro Asenjo aea2e67f79
z_en_sc_ruppe decompiled (#843)
* z_en_sc_ruppe decompiled

* PR Review fixes

* PR Review fixes

* PR review fixes

* pr review fixes

* pr review fixes

* Ruppe -> Rupee

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-19 23:52:45 +01:00
Alejandro Asenjo 3997776e5b
obj_boat decompiled (#842)
* obj_boat decompiled

* PR review fixes

* pr review fixes

* PR Review fixes

* PR review fixes

* final cleanup

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-19 23:45:00 +01:00
Isghj ab7625db65
`DmZl` OK and some docs of `object_zl4` (Child Zelda used in one cutscene) (#834)
* DmZl: start

* DmZl: progress

* DmZl4: progress

* DmZl: OK

* DmZl: data integrated

* DmZl: object docs

* DmZl: more object docs

* DmZl: more docs

* DmZl: Some Zl4 animations

* ObjectZl4: docs

* DmZl: formater pass

* DmZl: more docs

* DmZl: docs

* DmZl: params documentation

* Apply suggestions from code review

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

* DmZl: requested changes, minor fixes, formater pass

* Update src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c

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

* Update assets/xml/objects/object_zl4.xml

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

* DmZl: some requested changes

* DmZl: Change Eye Texture names for accuracy, formatter pass

* DmZl: Eye texture indexes specified

* DmZl: fixed struct variable names

* DmZl: some requested changes

* DmZl: removed comment

* DmZl: change to unused index

* DmZl: changed some xml comments

* DmZl: requested changes 1

* Update src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c

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

* DmZl: fixing issues, formatter pass

* DmZl: moved switch case

* DmZl: fixed object reference, wrong file

* Update src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c

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

* Update assets/xml/objects/object_zl4.xml

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

* DmZl: mouth and eye state comments

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-19 23:36:07 +01:00
Alejandro Asenjo 67345d9be5
z_bg_astr_bombwall decompiled (#841)
* z_bg_astr_bombwall decompiled

* review fixes

* formatting

* pr review fixes

* PR review fixes

* PR review fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-19 23:28:48 +01:00
Derek Hensley 689ef2fe0b
Effect Icepiece OK (#839)
* OK

* Final cleanup

* format

* PR plus forgot to rename Matrix_RotateY
2022-06-19 23:18:54 +01:00
Derek Hensley 1a37ef95d1
Effect Icesmoke OK (#838)
* Ok

* Name DL and tex

* Matrix renames
2022-06-19 23:10:21 +01:00
Derek Hensley 9831e5e063
Effect Kfire OK (#837)
* OK

* Small change

* Matrix renames

* else if
2022-06-19 23:05:12 +01:00
Maide 56c517dc07
Obj_Toge (#815)
* Obj_Toge

* Wat

* One more thing

* PR

* PR

* a

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-19 03:45:09 +01:00
Derek Hensley 9bf84176d4
Load OK (#792)
* Progress

* cleanup

* Fix comment

* progress

* OK

* Review pt1

* Update comments

* update comments some more

* Renamings

* Add headers and some parens cleanup

* Remove zelda64

* PR review

* bss

* Explain each relocation type a bit in the header comment

* Relocate_Addr macro

* Split off into z64load.h

* Adjust comment slightly based on OOT review

* OverlayRelocationType -> MIPSRelocationType

* Last bit of cleanup from OoT

* format

* Split off functions
2022-06-19 03:28:55 +01:00
Maide 98ba755751
En_Horse_Link_Child (#806)
* EnHorseLinkChild

* PR

* PR
2022-06-19 03:23:25 +01:00
Maide dd8221c798
En_Time_Tag (#810)
* En_Time_Tag

* BSS

* PR

* PR
2022-06-19 03:19:33 +01:00
Kristopher Early e3c0c5c3fa
Obj_Tokei_Turret OK (#820)
* actor fully matched

* named collision parameters]

* fixed spec reloc.o

* Addressing Review Comments!

* Addressing Additional Review Comments

* fixing enum names

Co-authored-by: MrPolymorph <{ID}+{username}@users.noreply.github.com>
2022-06-19 03:08:42 +01:00
Isghj b3104f898b
`Effect_Ss_Extra` (points that appear above targets in Swamp Archery Minigame) and `object_yabusame_point` (#822)
* EffectExtra: start

* EffectExtra: matched

* EffectExtra: docs

* EffectExtra: warnings

* Update src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

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

* Update src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

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

* Update src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

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

* Update src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

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

* Update src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

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

* Update assets/xml/objects/object_yabusame_point.xml

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

* Update src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

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

* EffectExtra: fixes

* Update src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

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

God damn it lenovo

* Extra delete

* EffectExtra: namefixer

* EffectExtra: updated brief description

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-06-19 03:00:48 +01:00
mzxrules ec43a32c26
z_en_box.c, z_demo_tre_lgt.c OK, some object_box documentation (#703)
* All functions attempted, 2 NON_MATCHINGs

* z_en_box OK, more documentation

* format

* en_box cleanups, fix GI item table

* z_demo_tre_lgt OK

* format.sh

* pr suggestions 1

* object_box improvements

* Merge remote-tracking branch 'origin/master' into z_en_box

* Revert "Merge remote-tracking branch 'origin/master' into z_en_box"

This reverts commit 5aacdf26e4.

* more suggested changes

* fix comment
2022-06-18 10:33:59 -04:00
EllipticEllipsis 8049dec339
`sys_matrix` OK, documented, rename some other mathematics functions (#787)
* Import data and bss, add some name options

* Decomp rest of stack functions,
remove RSPMatrix,
split header

* sys_matrix OK (thanks Tharo)

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* pragma weaks in sinf and cosf, change documentation
change mcros to use 0x8000

* Rename sinf and cosf

* Correct initialisation of sMtxFClear

* More minor cleanup

* Rename stack functions

* Matrix_InsertMatrix -> Matrix_Mult

* The big transpose rename

* Fix MirRay_DrawReflectedBeam

* Matrix_InsertTranslation -> Matrix_Translate

* Matrix_Insert.Rotation_s -> Matrix_Rotate$1S
+ RotateY -> RotateYS

* Matrix_Insert(.)Rotation_f -> Matrix_Rotate$1F

* Matrix_RotateStateAroundXAxis -> Matrix_RotateXFApply
Matrix_SetStateXRotation -> Matrix_RotateXFNew

* Matrix_MultiplyVector3fByState -> Matrix_MultVec3f

* Matrix_MultiplyVector3fXZByCurrentState -> Matrix_MultVec3fXZ

* Matrix_GetStateTranslation -> Matrix_MultZero

* Matrix_GetStateTranslationAndScaled(.) -> Matrix_MultVec$1

* Matrix_FromRSPMatrix -> Matrix_MtxToMtxF

* Matrix_MultiplyVector3fByMatrix -> Matrix_MultVec3fExt

* Matrix_TransposeXYZ -> Matrix_Transpose

* Matrix_ToRSPMatrix -> Matrix_MtxFToMtx

* Matrix_AppendToPolyOpaDisp -> Matrix_MtxFToNewMtx
and document the conversion functions

* Matrix_NormalizeXYZ -> Matrix_ReplaceRotation

* Matrix_InsertRotationAroundUnitVector_f -> Matrix_RotateAxisF and S

* Matrix_InsertRotation -> Matrix_RotateZYX

* Document the last functions

* Small cleanup

* Matrix_JointPosition -> Matrix_TranslateRotateZYX

* Matrix_SetStateRotationAndTranslation -> Matrix_SetTranslateRotateYXZ

* func_8018219C -> Matrix_MtxFToYXZRot

* func_801822C4 -> Matrix_MtxFToZYXRot

* Fix files

* Format

* Review 1

* Renames

* Fix warning in EnDragon

* Format

* Convert `mode` to an actual enum

* Add enums, typedefs, externs to sys_matrix header

* Review

* One more

* More review

* Fix function names

* Format

* Fix names

* Format

* Review

* engineer's review

* Fix build

* Format

* Fix again

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2022-05-25 23:24:39 -04:00
Derek Hensley e1477702ca
EffectSsKirakira OK (#801)
* OK

* cleanup

* KiraKira -> Kirakira
2022-05-25 22:23:27 -04:00
Isghj 12b995093f
`EnNwc` OK and three objects documented (`object_niw` and `object_nwc` and `object_hs`) and some Actor docs( `EnNiw` and `EnAttackNiw` and `EnHg`) (#715)
* EnNwc: OK and some Niw Docs

* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.c

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.c

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.c

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* EnNwc: Overwrite->Override

* EnAttackNiw: fix merges

* AttackNiw and Niw: some docs

* formater pass

* EnNwc: fixed savecontext change

* Niw and Attackniw: more docs

* Apply suggestions from code review

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

* Nwc,Niw: requested doc changes

* Nwc: extracted and marked broken texture

* Apply suggestions from code review

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

* EnNwc: more requested changes

* Nwc: more requested changes

* Apply suggestions from code review

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

* EnHs: object_hs documented, some ovl_En_Hs docs

* EnHs: animation names

* EnHs: some text docs

* EnHs: fear anim changed to shivering now that we know it was used in OOT

* EnHs: more docs and format pass

* Apply suggestions from code review

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

* EnHs: more docs and updates to var name changes

* Niw,Nwc,Hs: added description to object files

* Hs: changed from playerOffset to offset

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-05-25 22:19:38 -04:00
Isghj 6d3bcc5cbb
`EnFamos` OK with `object_famos` (#789)
* EnFamos: redo begin

* EnFamos: back to where I was previously

* EnFamos: matched looping draw function

* EnFamos: OK

* Famos: some docs

* Famos: some docs

* Famos: sfx convert pass

* EnFamos: some docs

* EnFamos: more docs

* Enfamos: more docks

* EnFamos: more doc

* EnFamos: more docks

* EnFamos: mass to dec

* Famos: limb enum

* Famos: more docs all functions named

* Famos: all struct mapped

* Apply suggestions from code review

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

* Famos: fix declaration order

* Famos: requested changes

* Famos: draw func using proper sSetupDL indexing

* Famos: fix text anim mismatch, change tlut to match gFamos SnakeCase

* Famos: formater pls

* Famos: requested changes

* Famos: more requested changes

* Apply suggestions from code review

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

* Update assets/xml/objects/object_famos.xml

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

* Famos: requested changes and format pass

* Apply suggestions from code review

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

* Famos: more requested changes

* Famos: more requested changes

* Famos: another change

* Apply suggestions from code review

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

* Famos: made define macro for agro distance

* Famos: separated conditions on separate lines

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2022-05-25 22:11:07 -04:00
Derek Hensley c2afdf6eb0
EffectSsLightning OK (#800)
* OK

* Document and gameplay keep

* cleanup

* Rotate -> Rot

* Update description
2022-05-25 22:01:46 -04:00
Maide af1a4b01ef
En_Scopecrow (#808)
* En_Scopecrow

* PR
2022-05-25 21:40:34 -04:00
engineer124 9fcf1bd55b
Match 9 Various NON_MATCHING functions (#811)
* Match func_80A3C8D8 (obj_vspinyroll OK)

* `EnHorse_Update` OK

* Match EnHorse_Init & EnHorse_FleePlayer (en_horse OK)

* Fake match func_80BF43FC (en_rg OK)

* func_80A66930 + func_80A671E0 (obj_driftice OK)

* Match func_80940588 (goroiwa OK)

* Match func_80ABBFC0 (@anon)

Co-authored-by: hensldm <https://github.com/hensldm>

* PR Suggestions

* PR suggestions
2022-05-25 21:33:31 -04:00
Maide 0fb3fb8634
Bg_Ikana_Bombwall (#812) 2022-05-25 21:09:57 -04:00
Maide e227684d9b
En_Boom (#813)
* En_Boom

* Match (thanks Anon)

* Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c

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

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-05-25 21:04:10 -04:00
Derek Hensley 6f2531cc66
Door_Warp1 OK (#816)
* Match doorwarp1

* pad
2022-05-25 20:55:04 -04:00
Parker Burnett 3374f41d1c
En_wiz_brock OK and documented (#817)
* wiz brock OK

* wiz_brok OK and documented

* fixing text

* fixing PR comments

* addressing PR

* fixing comma for format
2022-05-25 20:16:04 -04:00
Tom Overton 8ba8780bb5
En_Snowman (Eeno and snowballs) OK and documented. object_snowman documented (#818)
* EnSnowman_Init OK

* EnSnowman_Destroy OK

* func_80B173D0 OK and better match for EnSnowman_Init

* EnSnowman_Draw OK

* func_80B19948 OK

* func_80B19998 OK

* func_80B19718 OK

* func_80B1746C and func_80B177EC OK

* Match a ton of functions

* func_80B18B30 OK

* func_80B180A4 OK

* func_80B18C7C OK

* func_80B18124 OK

* EnSnowman_Update OK

* func_80B17144 OK

* func_80B19474 OK

* func_80B18F50 OK

* All functions OK

* Import data to C

* Use object symbols

* Misc cleanup

* Fully document object_snowman

* Low hanging fruit

* Document snowman types

* Some more minor stuff

* Some more minor cleanup and naming

* Name some more functions

* More names

* Even more names

* Turns out, they're called Eeno!

* limbPos -> bodyPartsPos as per Fig's suggestion

* Update some more names

* Committing so I can push up stuff for the snowballPos naming

* More names + use generated reloc

* First pass name on every function

* First pass names on all struct vars

* Document the mega eeno glitch

* Get rid of garbage "split dead" naming

* First pass documentation on combine state

* Better names and some documentation

* Last doc pass before PR

* Respond to Elliptic's review

* / 100.0f -> * 0.01f
2022-05-25 19:59:36 -04:00
Rozelette e67fb5cf16
code_801323D0 (z_schedule) (#509)
* OK

* Initial documentation pass

* Pass 2. Add script by Tharo

* Renamed source file

* Documentation cleanup

* Update to latest master

* Feedback

* Bad merge

* Permissions

* Clang format

* Feedback

* format

* Use calculation instead of constant

* Rename as per suggestions

* Fix bss ordering and minor merge conflicts (from Maide)

* Update to current codebase and address feedback

* Fixup names to match new enums

* Format

* Fix duplicate include

* BSS shenanigans
2022-05-21 12:08:19 -04:00
Kristopher Early 02f4785df8
Bg_Open_Spot OK (#783)
* Fully Matched Bg_Open_Spot

* addressing review comments

variable names inline with convension

variable naming clarity

* remove redundant return. change padding type

* texScroll to texScrolls
2022-04-26 22:12:13 +01:00
engineer124 de853e8643
`do_action_static` OK and Documented (#802)
* do_action_static OK

* Add in week_static

* Spacing

* Oops

* Swap order
2022-04-24 17:34:55 +01:00
Maide 51dcbd728e
Demo_Effect (#764)
* Demo_Effect

* PR

* PR

* Fix
2022-04-24 17:09:41 +01:00
Tom Overton cc759afc9e
Bg_Sinkai_Kabe OK and documented, object_sinkai_kabe documented (#786)
* Bg_Sinkai_Kabe OK and documented, object_sinkai_kabe documented

* Respond to Elliptic's review

* Drop "child" from deepPythonChild
2022-04-22 04:21:42 +01:00
nckwntzl bb784413b9
ObjBlockStop OK and documented (#788)
* init and func_809466F0 matching

* fully matching

* renamed functions

* added include and used oshihiki macro

* fixed spec to use correct reloc

* ran format

* cleaned up comments

* addressed the suggestions and used macro in ObjBlockstop_Update

* fixed one more cast

* ran format.sh

* EllipticEllipsis changes

* ran format

* renamed CheckCollision to CheckForBlock
2022-04-22 03:45:16 +01:00
Tom Overton 81efaf8551
En_Raf (Carnivorous Lily Pad) OK and documented, object_raf documented (#794)
* EnRaf_Init OK

* func_80A17060, func_80A18080, and func_80A180B4 OK

* EnRaf_Destroy, func_80A1712C, func_80A171D8, and func_80A17414 OK

* func_80A17464 and func_80A17530 OK

* EnRaf_Draw OK

* func_80A175E4, func_80A17848, and func_80A178A0 OK

* func_80A18A90 OK

* func_80A179C8 and func_80A17C6C OK

* func_80A1859C OK

* func_80A17D14 and EnRaf_Update OK

* func_80A18B8C and func_80A18DA0 OK, EnRafParticle documented

* func_80A16D40, func_80A16D6C, func_80A17D54, and func_80A17DDC OK

* func_80A17E1C OK

* Use object symbols

* Import data to C and use generated reloc

* Misc cleanup

* Document animations and skeleton

* Finish documenting object_raf

* Some low-hanging fruit

* Some actions I figured out

* Name revival stuff

* Document type stuff

* Bob and player height stuff

* Name a few more things (some of the names are bad but whatever)

* Finally move Vec3f data inline like I've wanted to do for ages

* Some more low-hanging fruit

* limbRot name

* Name the chew stuff

* First pass names on everything, even if they're bad

* Some last-minute stuff before PR

* Respond to Elliptic's review

* Manually specify texture dimensions

* Format

* Add comment about pointless check

* Respond to Elliptic's second review
2022-04-22 03:22:07 +01:00
Tom Overton 232b901ccf
En_Bbfall (Red Bubble) OK and documented (#780)
* EnBbfall_Init OK

* EnBbfall_Destroy, func_808BF5E0, and func_808BF734 OK

* func_808BF578 and func_808BF7A0 OK

* func_808BF4B4, func_808BF830, and func_808BF894 OK

* func_808BF438, func_808BF514, func_808BF8DC OK

* func_808BFA18 and func_808BFA3C OK

* EnBbfall_Draw OK, thanks Tharo, Anon, and Maide!

* LimbDraw functions OK

* All functions OK, thanks Anon for the loop in Update!

* Migrate data to C

* Use generated reloc and object symbols

* Port over a ton of documentation from EnBb

* Use ARRAY_COUNT for all loops

* Do a ton more documentation

* Name unused animation in object_bb

* Copy "floorType" variable name from OoT

* Use enum values for collider type

* Respond to reviews

* Add comment explaining EnBbfall_IsTouchingLava
2022-04-22 02:04:37 +01:00
Thomas c7753f43b0
Obj_Dora (#779)
* Initial implementation of Obj_Dora

* Final function and documentation for Obj Dora

* Implemented review feedback

* Moved enums inside dora c file, renamed temp to timeHalfHour

* Cleaning, renaming, moving and converted float to easily searchable value
2022-04-22 00:30:29 +01:00
Maide 578e36cdbd
Bg_Ikana_Block (#761)
* Bg_Ikana_Block

* Fix
2022-04-17 20:06:55 +01:00
Derek Hensley bfe22610f7
EffectSsStone1 Ok (#730)
* EffectSsStone1 OK

* gameplay object stuff

* unk_C -> reg0

* Fix

* Reverse order of stone textures

* undef syms
2022-04-17 19:35:13 +01:00
Derek Hensley f4bb821b56
EffectSsSbn OK (#751)
* Ok

* Cleanup and document

* File header description

* rename scroll related regs

* undef syms

* Cleanup for PR

* Move comment

* Add todo
2022-04-17 19:07:25 +01:00
Maide 313fdecf37
Bg_Kin2_Shelf (#759)
* Bg_Kin2_Shelf

* PR
2022-04-17 18:39:13 +01:00
Maide bbc6dd77ea
Obj_Nozoki (#704)
* Obj_Nozoki

* GID

* PR

* Merge

* PR
2022-04-17 11:08:16 -04:00
Maide afd3ae243d
En_Test6 (#627)
* En_Test6

* ArrCount

* Always forget params

* PR

* Move defs

* PR

* Fix

* PR

* Merge

* Merge

* PR

* Fix

* PR

* PR

* Fix bss

* Match (thanks Anon)

* bss

* PR

* Merge

* bss

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
2022-04-09 05:38:54 +01:00
Derek Hensley 06412c070f
Cleanup 3 (#778)
* lights

* D_801D88A0 -> gScarecrowSpawnSongPtr

* Misc fixes

* CHECK_FLAG_ALL

* Trailing commas in enums

* matches

* Remove todo from lights bss

* Update src/overlays/actors/ovl_En_In/z_en_in.c

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

* thisx -> this2

* fix

* Todos

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-04-07 20:39:11 +01:00
Tom Overton 8a0b0b7ec8
En_Syateki_Okuta (Shooting Gallery Octorok) OK (#772)
* EnSyatekiOkuta_Init and EnSyatekiOkuta_Destroy OK

* func_80A36260, func_80A362A8, func_80A362F8, and func_80A36350 OK

* func_80A361F4 OK

* Decomp a bunch of functions

* Better match for func_80A368E0

* func_80A36CB0 OK

* Draw functions OK

* All functions OK

* Import data to C

* Use object symbols

* Final cleanup and generated spec

* Remove something I missed

* char -> UNK_TYPE1

* Respond to reviews

* Remove static from unnamed variables, whoops
2022-04-07 19:23:13 +01:00
Tom Overton 50c5ab0fc7
En_Dragon (Deep Python) OK and documented. object_utubo documented (#771)
* EnDragon_Init OK

* func_80B5EDF0 OK

* func_80B5EAA0 OK

* EnDragon_Destroy OK

* EnDragon_Update OK

* func_80B60138 OK

* func_80B5EE3C OK

* func_80B5EF88 OK

* func_80B5F418 OK

* func_80B5ED90 OK

* func_80B5EB40 OK (commented out because data is not imported yet)

* Import data into C

* Uncomment func_80B5EB40

* func_80B5EFD0 OK

* func_80B5F3A4 OK

* func_80B5F888 OK

* func_80B5FCC0 OK

* Draw functions OK

* func_80B5FD68 OK

* func_80B5F508 OK

* func_80B5F8D8 OK

* Better match on func_80B5FD68

* Use generated reloc

* Remove undefined_syms for this actor

* Some minor cleanup

* Make the data like Anghelo said

* Document object_utubo

* Name a bunch of stuff

* Name some more stuff

* Some documentation around death

* Documentation for actions

* Name a bunch of junk

* Use regs instead of directly accessing gGameInfo

* Name the player position vars

* Update weekEventReg references

* Name and list out states

* Name timer

* Document extend stuff

* Finish documentation

* Respond to Anghelo's review

* Respond to hensldm's review

* The thing Anghelo suggested *actually* matches
2022-04-06 21:03:27 -04:00
Thomas 33643b9471
Obj_Hariko (#766)
* Initial decompilation of hariko

* Documented and touched up on ObjHariko header

* Documented Hariko assets and added review suggestions

* Added file comment, shuffled function order

* Added DL suffix to hariko dlists

* Updated hariko body out name to hariko_body
2022-03-30 04:13:44 +01:00
Maide 89ecf74189
Obj_Bigicicle (#753)
* Obj_Bigicicle

* PR

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2022-03-29 22:39:06 +01:00
Tom Overton 6faf186a95
En_Wallmas (Wallmaster) OK and documented. object_wallmaster documented (#731)
* EnWallmas_Init and EnWallmas_Destroy OK

* func_80874B88 OK

* func_80874BE4 OK

* func_80874D1C OK

* func_80874DE8 OK

* func_80874F14 OK

* A bunch of small functions OK

* A bunch of smaller functions OK again

* func_808752CC OK

* func_808758C8 OK

* func_80875910 and func_8087596C OK

* func_808756AC and func_8087571C OK

* EnWallmas_Update OK

* func_80875A74 OK

* func_80874A88 and func_80874B04 OK

* A bunch of functions OK

* func_808759B8 and func_80875A0C

* EnWallmas_Draw OK

* func_808760A4 and func_80876118 OK

* func_80875F04 OK

* Use object symbols

* Import data to C

* Use generated reloc

* Document object_wallmaster

* Misc cleanup

* Name the DrawDamageEffects variables

* Name draw functions

* Enum for damage values

* Port function names from OoT

* Last cleanup before PR

* Respond to Elliptic's review

* Respond to Elliptic's second review

* gWallmasterWaitAnim -> gWallmasterIdleAnim

* Change all EnWallmas to Wallmaster (except the actor's name itself)

* Respond to hensldm's review

* Fix merge conflicts
2022-03-29 22:33:32 +01:00
Maide b4842eb16c
Mir_Ray3 (1 non-matching) (#695) 2022-03-29 22:26:56 +01:00
Maide 7280d10404
En_Horse (2 non-matching) (#413)
* En_Horse

* a

* Warnings

* Warnigns 2

* PR

* Formats

* Fix

* PR

* Merge

* Merge

* Merge
2022-03-29 22:15:26 +01:00
Anghelo Carvajal 72bae2b6ba
`z_kaleido_setup` (#768)
* KaleidoSetup_Init

* func_800F4C0C

* func_800F4A10 NON_EQUIVALENT

* fixes

* func_800F4A10

* import data

* Rename Play_InCsMode

* Name KaleidoSetup_Update

* minor cleanup

* Update src/code/z_play.c

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

* Update src/overlays/actors/ovl_En_Bom/z_en_bom.c

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

* Update src/overlays/actors/ovl_En_Gs/z_en_gs.c

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

* Update src/code/z_kaleido_setup.c

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

* Update src/code/z_kaleido_setup.c

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

* Update src/code/z_kaleido_setup.c

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

* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c

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

* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c

* unname D_801BDB00

* format

* a

* actorfixer

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2022-03-29 22:04:41 +01:00
Maide 8c7d8359fa
Obj_Hamishi (#762) 2022-03-29 21:44:07 +01:00
Derek Hensley 486e7cbe83
SubS General Pathing Helpers (#760)
* Brought code over and cleanup

* cleanup functions.h and format

* add comment

* Whitespace

* Format

* Update src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c

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

* Format

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-29 21:37:58 +01:00
Maide cabb14e4b7
Obj_Smork (#758)
* Obj_Smork

* PR

* PR
2022-03-29 21:29:35 +01:00
Maide 7ea2474b71
En_Kujiya (#757)
* En_Kujiya

* En_Kujiya

* PR
2022-03-29 21:21:56 +01:00
Maide 98143afb1c
En_Test (#756)
* En_Test

* PR

* PR

* PR

* Fix
2022-03-29 21:14:29 +01:00
Maide f5ba6986f9
Obj_Pzlblock (#755)
* Obj_Pzlblock

* PR
2022-03-29 21:05:33 +01:00
Maide cdc475bea9
Bg_F40_Block (#754) 2022-03-29 20:59:59 +01:00
Derek Hensley ec9909c65c
Boot_800862E0 OK (#769)
* boot_800862E0 OK

* Ran format.sh

* attempt at fixing bss reordering

* boot_800862E0 OK (for real this time)

* Run formatter

* Changes u32 pointers to uintptr_t and sizes to size_t

* Run formatter

* Fix bss reordering

* Delete baserom.mm.us.rev1.z64:Zone.Identifier

* Cleanup and some notes

* Try my best to document

* remove comments

* Remove D_80097508 from variables.h

Co-authored-by: kyleburnette <kyle@kyleburnette.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-29 20:42:44 +01:00
LtPeriwinkle afec1c56a6
EnNeoReeba OK and documented, object_rb mostly doc'd (#750)
* match some functions

* finish decompiling

* mostly document except some dmgeffs

* Document object_rb

* update functions.txt, damagetable

* remove number comments

* suggestions

* format and fix enum names

* comment object_rb.xml
2022-03-29 19:12:35 +01:00
Maide 72265fac92
Obj_Entotu (#745)
* Obj_Entotu

* Time macro

* PR

* Merge
2022-03-29 18:56:20 +01:00
Maide 6132d950e3
En_Light (#744)
* En_Light

* PR

* PR

* Format
2022-03-29 18:48:25 +01:00
Maide c127a5a0ca
Elf_Msg6 (#743)
* Elf_Msg6

* Elf_Msg6
2022-03-29 18:34:18 +01:00
Isghj 275f13881b
`EffectEnIceBlock` OK, `object_ice_block` documented (and minor `Obj_Iceblock` documented) (#748)
* EffIceBlock: OK

* object_ice_block: documented

* EffectIceBlock: matching gfxCtx in the draw function

* Iceblock: removed undefined sym

Co-authored-by: Isghj8 <isghj8@gmail.com>
2022-03-29 18:28:19 +01:00
Isghj cbffe83c9b
EnWarpTag OK (Warping pedestals in Goron Trial) (#747)
* EnWarpTag: OK

* Apply suggestions from code review

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

* WarpTag: move macros

* WarpTag: format

* WarpTag: fix save entrance index

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-29 18:21:36 +01:00
Maide 9af2914992
Obj_Grass_Carry (#741)
* Obj_Grass_Carry

* Fix?

* Fix2?

* Merge

* Test

* Merge
2022-03-29 18:16:05 +01:00
Maide a8e9b6c9b3
OBj_Fireshield (#740) 2022-03-29 18:08:50 +01:00
Maide 37e82498df
Dm_Gm (#739)
* Dm_Gm

* PR
2022-03-29 17:55:32 +01:00
Maide ea3bbee803
Dm_An (#737)
* Dm_An

* Merge
2022-03-29 17:49:44 +01:00
Anghelo Carvajal 78acaef73d
`ovl_Boss_03`: Gyorg OK (#736)
* Boss03_Init NON_EQUIVALENT

* rand functions

* Boss03_Draw

* match the limb draws

* Match Boss03_Init by Synray and Engineer

* A bit of cleanup

* a bunch of functions

* another bunch of functions

* func_809E299C and GyorgEffect

* import data

* A bit of cleanup

* effects related functions

* func_809E2DA0

* func_809E34B8 NON_EQUIVALENT

* func_809E3968 NON_EQUIVALENT

* func_809E3D98

* func_809E421C NON_EQUIVALENT

* func_809E475C

* func_809E497C

* func_809E4C90

* func_809E6640 NON_MATCHING

* func_809E6A38

* Match func_809E6640 by Tharo

* func_809E7D00

* func_809E8810

* func_809E4E80 NON_EQUIVALENT

* func_809E5B64

* func_809E6CB4

* Boss03_Update NON_EQUIVALENT

* func_809E81E4 attempt

* Boss03_Update improvement thanks to Petrie

* func_809E81E4 NON_MATCHING

* func_809E34B8 is at least equivalent

* cleanups

* format

* import bss

* more cleanup and minor renames

* Match func_809E81E4

* cleanup effect functions

* a few more renames

* func_809E4E80 matched by Maide

* documentation pass

* name workTimer

* macros

* More renames

* Improve func_809E34B8 a bit and match Boss03_ChewPlayer

* defines placeholders for work timer, enum for effects and other minor renames

* actorfixer

* some cleanups

* effects named

* Some more renames and cleanups

* more cleanups

* Boss03_UpdateCollision, Boss03_SeaweedUpdate and Boss03_SeaweedDraw

* Rename more actionfuncs

* cleanup undefined syms

* collision stuff and run formatter

* more cleanups

* more cleanups i forgot to commit

* and yet more clenaup

* Add notes

* Remove debugging stuff

* format

* Match the last 3 functions by Anon58

* bit of cleaning

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* PR

* format

* Remove some if (1) from Boss03_IntroCutscene

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.h

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* PR

* address pr

* prevent_bss_reordering

* Anon review

* seaweed stuff thanks to elliptic

* format

* whoops

* huh

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* address PR

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Address PR

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

* Sectioning

* whoops

* a

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

* a

* kinda

* ,

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* remove redundant comment

* actorfixer

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2022-03-29 17:41:44 +01:00
Derek Hensley 84dd09048e
EffectSsSibuki OK (#735)
* OK

* Small formating

* Fix merge
2022-03-29 17:26:46 +01:00
Maide 26d7085ac2
Obj_Armos (#734)
* Obj_Armos

* PR
2022-03-29 17:16:28 +01:00
Maide 348e87083b
Bg_Breakwall (#733)
* Bg_Breakwall

* PR and match (thanks petrie)

* PR

* Merge
2022-03-29 17:11:08 +01:00
Parker Burnett e19705f7eb
En_crow OK and Documented (#698)
* this is the guay

* do you know the guay?

* No guay!

* got too excited to pr lol, fixes are here

* Majoras Mask: No Guay Home

* fixing objects

* 4mattt
2022-03-29 16:55:29 +01:00
Maide f187471a33
En_Fu_Mato (#675)
* En_Fu_Mato

* A bit of fmt

* PR

* PR

* Merge
2022-03-29 16:46:40 +01:00
Maide b567c4ee68
En_Hs (#746)
* En_Hs

* Add limb switch

* Merge
2022-03-29 16:29:34 +01:00
Maide 1ff183bc05
En_Test7 (#628)
* En_Test7

* Clean some stuff

* I hate BSS

* PR

* Fix

* Merge

* Fix

* Match (thanks Anon)

* PR

* PR

* PR

* Fix
2022-03-28 21:25:08 -04:00
Anghelo Carvajal b08880f7a7
`z_sram_NES` with 2 NON_MATCHINGs and 1 NON_EQUIVALENTs (#531)
* Rename Sram_InitDebugSave

* Sram_InitDebugSave

* err

* Sram_IncrementDay

* non_matchings

* func_80146F5C and protos

* func_80146EE8

* func_80145698

* func_80143A54

* Split SaveContext

* problems with bss

* Fix bss

* more

* a small bunch

* Fix warnings

* almost everything

* two attempts

* at least compiles

* import data

* bss

* format

* stuff?

* Progress?

* More progress

* clean up data a little

* More progress

* disaster

* re split data

* A bit less of a disaster

* Fix renamed stuff

* data stuff

* fix conflicts

* format

* CycleSceneFlags

* some enums

* cleanup

* Fix merge issues

* format

* some changes

* format

* Lots of progress on z_sram_NES, but no matches yet

* SaveContent Documentation

* Oops

* Oops2

* Document more SaveContext

* Oops, don't need that anymore

* add small comment

* Another comment

* dekuPlaygroundPlayerName

* Fix merge issues

* format

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* remove magic number

* format

* fix merge issues

* bss

* format

* macro cleanup

* review

* merge issues

* review

* cleanup

* UNK_TYPE1

* Fix

* Remove comment

* small change

* conflicts

* review

* fix

* fixes

* format

* Update actorCtx renames part

* Match func_80143B0C thanks to Petrie and Anon

* minor cleaning pass

* format

* cleanup

* more minor cleanups

* Macros for accessing gSaveContext.save.stolenItems

* Introduce STOLEN_ITEM_NONE and remove CLEAR_STOLEN_ITEM_

* format

* Update include/macros.h

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* @hensldm review

* Update include/functions.h

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

* Update include/functions.h

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

* Rename QUEST_SONG_NEW_WAVE

* Add scene name comments to D_801C5FC0

* rename horseData.yaw

* Update include/functions.h

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* // = CUR_UPG_VALUE(UPG_WALLET);

* run actorfixer and format

* fix bss

* Fix merge problems and run format

* Some improvements to func_801457CC by anon

* bss

* format

* run actorfixer

* actorfixer, bss and format

* Use original names for the RESPAWN_MODE enum because the current ones are bad

* QUEST_SONG_BOSSA_NOVA

* some minor fixes on the SaveContext struct according to the debug rom

* Merge Inventory.items and Inventory.masks

* a

* simplify saveBuf accesses

* A few func renames

* actorfixer

* bss

* fixes

* bss

* actorfixer

* actorfixer and format

* actorfixer

* whoops

* whops

* bss

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-03-27 12:37:02 -03:00
quaantuum 95c6ddbcc8
Decompile obj_wturn (#564)
* Decompile obj_wturn

* Format

* Rename struct member

* Make suggestions

* Format

* Fix warning

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
2022-03-27 12:14:55 -03:00
engineer124 02cb971616
En_Gakufu OK and Documented + Related Audio Functions (#662)
* Gakufu OK, copy progress from audio WIP

* Extraction

* import wip in prep for audio data import

* Add in `code_8019AF00.c` functions

* Finish docs

* Spacing

* Add enum

* Many PR suggestions

* Another enum

* PR Suggestions

* Fix bss

* Move comment higher

* Fix bss

Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-27 11:52:43 -03:00
louist103 928acac500
Bombers2 OK (#721)
* OK

* OK

* cleanups

* restore makefile

* format

* format

* format

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h

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

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h

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

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c

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

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c

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

* Update src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c

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

* Update src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c

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

* Update object_cs.xml

* fixes

* format

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-27 11:47:34 -03:00
engineer124 f1d1173558
River_Sound OK and Documented + River_Sound Related `z_actor`/`Audio` Functions (#661)
* First pass of `func_800BCCDC`

* river_sound OK (copy progress from audio WIP)

* Copy progress from `code_8019AF00.c` (still waiting for data to be imported)

* More docs

* feedback

* Add in `code_8019AF00.c` functions

* format

* params

* Minor cleanup

* Small fix

* one more

* Better names

* Add comment, cleanup Idx

* Fix bss

* Fix BSS
2022-03-27 11:42:19 -03:00
Maide 9e230005b0
En_Fu_Kago (#729)
* En_Fu_Kago

* PR
2022-03-27 11:36:59 -03:00
Maide 9e13859495
En_Tru_Mt (#726)
* En_Tru_Mt

* PR

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-27 11:32:08 -03:00
Maide 38eef9252e
En_Kbt (#732)
* En_Kbt

* PR

* a
2022-03-27 11:27:09 -03:00
Maide 35bc48de54
En_Maruta (#725)
* En_Maruta

* Match (thanks petrie)

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-27 11:22:16 -03:00
Maide ba1595b5ad
En_Hanabi (#728)
* En_Hanabi

* PR
2022-03-27 11:17:15 -03:00
Maide 47cc65e134
Bg_Dblue_Balance (#724)
* Bg_Dblue_Balance

* PR
2022-03-27 11:12:00 -03:00
Maide e6ca183a88
Bg_Dblue_Waterfall (#723)
* Bg_Dblue_Waterfall

* UNK
2022-03-27 11:07:03 -03:00
Maide 145b2f6a61
En_Jgame_Tsn (#722)
* En_Jgame_Tsn

* Merge
2022-03-27 11:01:23 -03:00
immibis 061ebc3b12
z_obj_chan OK (#591)
* z_obj_chan OK

* update Obj_Chan

* Obj_Chan updates

* Update for name changes. gameplay_keep object header is needed

* format

* more updates

* more changes

* Simplify floats

Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-27 10:56:20 -03:00
Maide c0979dcb07
Obj_Vspinyroll (1 non-matching) (#712)
* Obj_Vspinyroll

* PR
2022-03-27 10:51:15 -03:00
Maide 36391bee46
En_Mk (#711)
* En_Mk

* PR
2022-03-27 10:44:55 -03:00
Maide 5649458e2f
Bg_Hakugin_Bombwall (#709) 2022-03-27 10:23:46 -03:00
Tom Overton 3986732c5d
En_Syateki_Dekunuts (Shooting Gallery Deku Scrub) OK (#716)
* Import data to C

* EnSyatekiDekunuts_Init OK

* EnSyatekiDekunuts_Destroy OK

* func_80A2BE54 OK

* func_80A2BF18 OK

* func_80A2BFC4 OK

* func_80A2C0F8 OK

* func_80A2C150 and func_80A2C168 OK

* func_80A2C1AC OK and better match on func_80A2BFC4

* func_80A2C208 OK

* func_80A2C27C OK

* func_80A2C2E0 and func_80A2C33C OK

* func_80A2C3F0 OK

* func_80A2C478 and func_80A2C48C OK

* EnSyatekiDekunuts_Update OK

* func_80A2C4D0 OK

* func_80A2C5DC OK

* EnSyatekiDekunuts_Draw OK

* func_80A2C8A0 OK

* Use generated reloc and minor cleanup

* Use object symbols

* Last bit of cleanup

* Use limb enum values for all syateki actors I've worked on

* M_PI / 4
2022-03-26 03:07:25 +00:00
Tom Overton acd84bda77
En_Bb (Blue Bubble) OK and documented. object_bb documented (#713)
* EnBb_Init OK

* EnBb_Destroy OK

* func_808C20D4 OK

* func_808C2238 OK

* func_808C1FF4 OK

* func_808C1E94 OK

* func_808C2344 OK

* func_808C23EC OK

* EnBb_Update OK

* func_808C2E34 OK

* func_808C254C OK

* func_808C272C OK

* func_808C2B94 OK

* func_808C2A00 OK

* func_808C1F00 OK

* func_808C1F74 OK

* func_808C25E0 OK

* func_808C28CC OK

* func_808C2B1C OK

* func_808C2BD0 OK

* func_808C2C38 OK

* func_808C2CB4 OK

* func_808C2CF0 OK

* func_808C2D78 OK

* EnBb_Draw OK

* func_808C32EC OK

* func_808C3324 OK

* Migrate data to C

* Use generated reloc

* Object symbols and misc cleanup

* Name struct vars that are used with Actor_DrawDamageEffects

* Name most things in the object

* Name attackRange

* Good enough names for limbs for now

* Might as well name the limb draw stuff for now

* Name flame width/height

* Enum for damage effects

* Name some more stuff from OoT

* Name a lot more stuff

* First pass names on all functions

* Name jinxTimer on gSaveContext

* Name sLimbIndexToLimbPos

* First pass name to the rest of the limb draw system

* More cleanup

* Last cleanup before PR

* Incorporate Actor_DrawDamageEffect stuff

* Respond to hensldm's review
2022-03-26 02:57:18 +00:00
louist103 7d4aaef0cd
Fire and Light arrows (#710)
* fire arrow OK

* Light arrows OK

* Format

* Assets

* Mtx Mode

* PR fixes

* pr fixes

* Update src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c

* Update src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
2022-03-26 02:51:41 +00:00
Maide 36e48fcd91
En_Tanron1 (#708)
* En_Tanron1

* PR

* Fmt

* PR and match (thanks petrie)
2022-03-26 02:33:02 +00:00
Maide e43a92de18
En_Attack_Niw (#707)
* En_Attack_Niw

* PR

* newline
2022-03-26 02:23:06 +00:00
Maide 7c624422de
En_Horse_Game_Check (#706)
* En_Horse_Game_Check

* PR
2022-03-26 02:16:28 +00:00
Parker Burnett 9362fee5e8
En_kusa OK and Documented (#640)
* matched one function

* More matches

* more matches

* cleaning up some stuff

* making some progress

* two new matches, and a partial match

* meh...i'll come back to this

* fixing ctx names

* more matches

* OK and documented

* fixing data stuff

* PR suggestions

* fixing name and DL issues

* fixing pr suggestions

* PR feedback

* ....format....

* PR fix

* fixes

* dang format

* fixing name

* I'm blind

* fixing obj_grass
2022-03-26 02:10:25 +00:00
Maide 2746266881
En_Hidden_Nuts (#705)
* En_Hidden_Nuts

* PR
2022-03-26 02:04:42 +00:00
Derek Hensley 69c0e15a45
EffectSsBubble OK (#702)
* Decompile eff_ss_bubble

* Document effBubble stuff in gameplay keep

* newline

* Formatting is hard

* PR suggestions

* Amplitude -> Max
2022-03-26 01:54:05 +00:00
Maide 59ec3f721a
Obj_Driftice (2 non-matching) (#700)
* Obj_Driftice

* PR
2022-03-26 01:46:13 +00:00
Maide b7639a7c6f
En_Wood02 (#697)
* En_Wood02

* statics£

* PR

* PR
2022-03-26 01:39:33 +00:00
Maide 844b5efb6f
En_Sda (#691)
* En_Sda

* Format hello?

* PR
2022-03-26 01:33:42 +00:00
Maide ad6d314422
Obj_Kendo_Kanban (1 non-matching) (#687)
* Obj_Kendo_Kanban

* PR
2022-03-26 01:25:35 +00:00
Maide 10995051e0
En_Tanron5 (#653)
* En_Tanron5

* Stuff

* PR

* Fix

* Use x/z instead of x/y

* BSS

* Merge

* bss
2022-03-26 01:19:14 +00:00
Kristopher Early ad9e6e2ae5
ovl_Obj_Yasi (#719)
* parking

* z_obj_yasi successfully decompiled and matched

* removed commented code.

* more cleanup..

* Code Styling changes.

* Swapped to use BINANG_SUB macro.

* Formatting.

* addressing PR comments

* formatting
2022-03-26 01:00:21 +00:00
Nick ce7aa87454
Oceff wipe6 (#686)
* Uncorrupted; Not OK

* Merged upstream -- actually OK

* Update assets/xml/overlays/ovl_Oceff_Wipe6.xml

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

* - Removed Extra 0 characters; clang-format-11

* Removed new warnings.

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-03-24 23:45:37 -03:00
fig02 80cbdb956d
En_Tanron4 OK (seagulls) (#714)
* Seagull OK

* small fixes

* review 1

* review 2
2022-03-24 23:39:34 -03:00
Maide ecb4afd822
Bg_Spdweb (1 non-matching) (#685)
* Bg_Spdweb

* PR
2022-03-24 23:30:02 -03:00
Maide 9a54ec9e0b
En_Bombers (#684)
* En_Bombers

* No need for this >:

* Override

* PR
2022-03-24 23:21:14 -03:00
Tom Overton d5e692d0e1
En_Bom_Chu (Bombchu) OK and documented (#679)
* EnBomChu_Init OK

* EnBomChu_Destroy OK

* func_808F7868 OK

* func_808F79D4 OK

* func_808F7E74 OK

* func_808F7FA0 OK

* func_808F77E4 OK

* func_808F75D0 OK

* func_808F7944 OK

* func_808F7A84 OK

* func_808F818C OK

* func_808F8080 OK

* func_808F7FD0 OK

* EnBomChu_Update OK

* EnBomChu_Draw OK

* Drop unnecessary cast in Update

* Import data into C

* Object symbol

* Use generated reloc

* Port over OoT struct var names

* Name all statics

* Misc cleanup

* Name some of the new struct vars introduced in MM

* Port over most OoT function names

* Name movingSpeed based on in-game observation

* Name final param in EnBomChu_SpawnRipplesAndSplashes

* More cleanup and OOT port

* Some more names

* More docs

* Name last function

* Final little cleanup

* First round of review fixes

* Change the name of that one function

* More precise comment
2022-03-24 23:07:59 -03:00
Maide 5684b342b6
En_Vm (#678)
* En_Vm

* Hidden funcs >:

* PR

* PR
2022-03-24 22:55:58 -03:00
Maide 44db1ac61a
En_Bombf (#677)
* En_Bombf

* PR

* PR
2022-03-24 22:48:19 -03:00
Maide 0fbbde8d7d
Demo_Syoten (#672)
* Demo_Syoten

* Fix build, use UNK_PTR

* Use Vtx

* Keyframe stuff

* PR

* BSS

* PR

* Fix fix
2022-03-24 22:41:04 -03:00
Parker Burnett 950f3a247e
En_guard_nuts OK and Partially documented (#668)
* guard_nuts OK

* doing some documenting

* more docs

* more docs

* minor changes

* touch ups

* format

* pr feedback

* fixing a name

* ran actor_fixer
2022-03-24 22:34:50 -03:00
Tom Overton cbfa42c070
En_Mt_tag OK and documented (Goron Race Manager) (#659)
* EnMttag_Init OK

* EnMttag_Destroy OK

* EnMttag_Update OK

* func_809CF9A0 OK

* Update struct

* func_809CF444 OK

* func_809CFA00 OK

* func_809CF394 OK

* func_809CF8EC OK

* func_809CFA54 OK

* func_809CF350 OK

* func_809CF848 OK

* func_809CF950 OK

* func_809CFBC4 OK

* func_809CFD98 OK

* func_809CFE28 OK

* func_809CFF94 OK

* func_809CFC38 OK

* Get super close on func_809CF4EC

* Import data

* Get a start on func_809CF67C

* func_809CF4EC OK, thanks engineer!

* func_809CF67C OK, thanks engineer!

* Use the generated reloc

* Name message functions and raceGorons array

* Name some more stuff

* Name more functions

* Name most functions

* Take a stab at trying to figure out what the data represents

* Much better naming and understanding

* Name more

* Strip out debugging junk

* Better name

* Name the rest of the variables

* Describe bug

* Document the h*ck out of things

* Simplify PlayerCheatStatus a bit

* Use sCheckpointPositions as per engineer's advice

* Do some really stupid naming nonsense to explain the side effect of a function

* Fix Racing/RaceGoron inconsistency

* Decimal weekEventReg accesses

* Rename to EnMttag_UpdateCheckPoints

* Capitalization consistency + update functions.txt

* Respond to review

* Respond to review

* Respond to Elliptic's review

* idk if Elliptic meant the function name or the variable so let's just do both lol

* Fix function name changed by z_demo merge
2022-03-24 22:28:03 -03:00
Parker Burnett 3431b542ff
En_look_nuts OK with docs (#674)
* OK

* some documenting

* lgtm

* format

* spacing things out

* one other name

* PR feedback

* fix enum

* addressing PR

* actor fixer

* fixing PR
2022-03-24 22:22:46 -03:00
Maide 20fed85f67
En_Ah (#658)
* En_Ah

* PR
2022-03-24 22:17:07 -03:00
Maide 0a8fd53273
En_Elfgrp (#654)
* En_Elforg

* PR

* PR

* PR
2022-03-24 22:11:43 -03:00
Maide f87c8290c8
En_Tsn (#651)
* En_Tsn

* PR

* PR

* Merge
2022-03-24 22:05:40 -03:00
Maide 7ee4615cd0
Obj_Spidertent (1 non-matching) (#639)
* Obj_Spidertent

* Match func_80B2FC98 (thanks Anon58)

* PR

* Fix

* PR

* PR
2022-03-24 21:56:51 -03:00
Maide 47ef03494b
Obj_Spinyroll (2 non-matching) (#635)
* Obj_Spinyroll

* syms

* PR

* PR

* PR
2022-03-24 21:49:47 -03:00
Maide ad25a1dc47
Obj_Skateblock (#622)
* Obj_Skateblock

* PR

* PR

* PR

* PR

* Something weird happened
2022-03-24 21:44:00 -03:00
Tom Overton 17489d9a1d
En_Fishing OK (three functions matched) (#742)
* EnFishing_UpdateOwner OK

* EnFishing_UpdateFish OK

* Respond to engineer's review

* EnFishing_UpdateLure OK, thanks Synray!

* Remove NON_MATCHING from spec
2022-03-24 21:32:24 -03:00
Anghelo Carvajal 1599192b85
Script for checking relocs correctly updated on spec (#718)
* Script to check for relocs on spec

* add reloc_spec_check to jenkinsfile

* add colors

* Use light red instead of red

* Go back to red

* fix EnDoor reloc
2022-03-24 21:25:41 -03:00
Maide 49aeece9ee
Obj_Grass (#617)
* Obj_Grass

* PR

* PR

* PR

* Match (thanks Synray)
2022-03-24 21:20:21 -03:00
engineer124 b852a9a930
Audio_Load OK and Documented (#620)
* Copy audio_load progress from main branch

* Fix warning

* fix UB

* cleanup WIP

* Add docs, bss still broken

* bss fix

* bytesRemaining with size_t

* PR Suggestions

* PR Suggestions

* Fix bss

* Fix bss

* PR Suggestions
2022-03-23 21:22:13 -04:00
Anghelo Carvajal 92c4d42f44
`z_skin` and `z_skin_awb` OK and documented a bit (#415)
* oot copypaste

* func_8013859C non matching and func_80138700

* protos

* the other functions

* func_80138300

* progress

* func_80137F58

* func_80137EBC

* func_80137B34 NON_MATCHING

* func_80137970

* func_8013835C

* z64skin

* some docs

* some bits

* Match func_80137B34

* Match Skin_DrawImpl

* Match Skin_Init tahnks to Anon

* Some docs?

* AnimatedLimb

* SkinVtx

* more names

* fix merge issue

* format

* another clean

* trailing comma

* cleanup

* format

* add some descriptions

* Import bss

* last cleanup

* Update ZAPD symbol map

* Reanme gIdentityMtx and gIdentityMtxF

* fix merge issues

* bss

* review

* Update include/z64skin.h

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

* bss

* Port @fig02 skin docs

* format and a few changes

* format

* Port over OoT review

* fixes

* Engineer's review

* format

* address pr

* Fix bss

* fix bss

* Update src/code/z_skin_awb.c

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

* bss

* bss

* undo

* pr

* Skin_Setup

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-03-23 17:30:34 -04:00
mzxrules f1560614d6
z_object_switch OK (#527)
* z_obj_switch all functions attempted

* z_obj_switch OK

* Document z_obj_switch

* update gameplay_dangeon_keep references

* pr changes implemented

* fix warnings

* pr suggestions, name all functions
2022-03-10 05:49:11 -05:00
Maide 6ed7b0849c
En_Osk (#670)
* En_Osk

* PR

* run actorfixer

Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-09 23:19:00 -03:00
immibis fa321be0f3
Bg_F40_Switch OK and documented (#526)
* Bg_F40_Switch OK and documented

* updates for Bg_F40_Switch PR

* update names

* formatting

* func_80BC46B0 → BgF40Switch_CheckAll
2022-03-09 22:08:36 -03:00
Derek Hensley d36b0d506d
Misc NON_MATCHINGS/NON_EQUIVALENTS (#696)
* Match the rest in fireObj

* Fix FireObjLightParams struct

* Fix up bomjima

* Match ObjSnowball

* 2 functions in EnGoroiwa

* Rename randMultiplier

* Minor cleanup

* More cleanup

* Boss02 Ok

* Match Boss06_Draw

* format

* bss

* Remove static from osFlash bss

* PR suggestions

* Remove LightInfoPositional

* 0x4000

* Format

* Cleanup

* Fix bombjima data

* Boss02 newline

* PR stuff

* Change func_8012CF0C to NON_EQUIVALENT

* Matched func_8012CF0C by AngheloAlf

* RSPMatrix -> Mtx

* Bubbles fix
2022-03-09 22:02:27 -03:00
Maide 040db7ac40
En_Mm3 (#671)
* En_Mm3

* PR

* Merge
2022-03-05 12:57:38 -03:00
Parker Burnett 4a18f3ca4d
En_shn OK (#638)
* Building on Macs

* Add Mac building documentation

* Review

* Update for new z64compress

* Review

* getting some matching done

* gettting some more matches

* actor fixer

* almost OK

* Shn OK

* fixing data and warnings

* finishing touches

* forgot to update spec

* dang comments not being formatted

* this should fix things

* fixing feedback and other fixes

* fixing things

* fixing things

* addressing PR

* format and minor fix

* actorfixer

* fixing actor

* fixing enum

* yay format

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-05 12:45:49 -03:00
Parker Burnett 10a1ef8f1d
Bg_ingate OK (#643)
* close, 2 functions left, both close

* documenting what I can

* fixing things

* fixing

* changing weekEventReg

* master fix

* ran actorfixer
2022-03-05 12:22:43 -03:00
Maide 26d71ffbf6
En_Prz (#656)
* En_Prz

* PR

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-05 12:09:23 -03:00
Anghelo Carvajal 6017869b1e
`z_player_call` OK (#693)
* Match functions

* Rename functions

* Import data and bss, and minor fixes

* Format

* Whoops

* Add some protos to z_player
2022-03-05 11:51:51 -03:00
Maide d9155eb498
Bg_Hakugin_Switch (#699) 2022-03-05 11:42:55 -03:00
Tom Overton f9dac7d483
En_Racedog OK (#690)
* func_80B24630 OK

* func_80B248B8 OK

* func_80B246F4 OK

* func_80B25448 OK

* func_80B256BC OK

* EnRacedog_Draw OK

* LimbDraw functions OK

* func_80B2583C OK

* func_80B258D8 OK

* EnRacedog_Update OK

* func_80B255AC OK

* func_80B2538C OK

* func_80B252F8 OK

* Data imported to C

* Update struct to have everything Init needs

* func_80B24E14 OK

* EnRacedog_Destroy OK

* func_80B24C14 OK

* EnRacedog_Init OK

* func_80B2478C OK

* func_80B24CB4 OK

* func_80B251EC OK

* func_80B24F08 OK

* func_80B25490 OK

* Use generated reloc

* Object symbols and other misc cleanup

* More cleanup

* Move data to be in-function like how Dg does it

* Rename to ENRACEDOG_GET_3E0 until this actor is actually documented

* Last itty bitty cleanup

* Better header

* Forgot to name the LimbDraw functions, whoops

* Respond to reviews

* Match how Dg does weekEventReg stuff

* Respond to review
2022-03-05 11:34:26 -03:00
Maide f87cabbc55
En_Butte (#683) 2022-03-05 11:27:33 -03:00
Maide 640f039cce
En_Gg2 (#676)
Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-05 11:22:16 -03:00
Maide 1c955e56b0
En_Tab (#657)
* En_Tab

* PR
2022-03-05 11:16:36 -03:00
Maide 888448decf
Obj_Hakaisi (#655)
* Obj_Hakaisi

* Fix

* PR
2022-03-05 11:10:55 -03:00
Tom Overton f4a9d117b1
En_Syateki_Crow (Shooting Gallery Guay) OK (#694)
* EnSyatekiCrow_Init OK

* EnSyatekiCrow_Destroy OK

* func_809CA5D4

* func_809CA67C OK

* func_809CA71C OK

* func_809CA840 OK

* func_809CA8E4 OK

* EnSyatekiCrow_Update OK

* func_809CAAF8 OK

* func_809CABC0 OK

* func_809CACD0 OK

* EnSyatekiCrow_Draw OK

* func_809CAE5C OK

* func_809CAF2C OK

* Migrate data to C

* Object symbols

* Use generated reloc

* Name static variables

* Name LimbDraw functions

* Remove struct padding

* Respond to review

* Respond to Elliptic's review
2022-03-05 11:03:59 -03:00
Averane 5f9e906727
EnHeishi OK and documented (#597)
* EnHeishi first pass

* fixed references to updated function names

* fixed references to updated function names part 2

* removed unnecessary externs

* pr fixes

* fix header

* fix object files to match demoheishi changes

* cleanup

* PR comments addressed

* merge master

* use actors flags with change for demoheishi too
2022-03-05 10:58:54 -03:00
emilybrooks aa6c316102
Ovl_En_Drs OK and Documented (#669)
* done

* merged master, some cleanup

* more cleanup

* review 1

* removed the skelAnime temp

* format

* prototype newline

* globalctx2
2022-03-05 10:54:09 -03:00
Anghelo Carvajal 77cfd399d0
`z_demo` with 4 NON_MATCHINGs (#514)
* starting

* a bunch

* and another bunch

* a bunch

* Match func_800EB1DC

* func_800EB4B4

* func_800EB6F8

* 2 more

* fix prototype of a random kankyo function

* func_800EBD60 non matching

* func_800EC678 matched?

* func_800EC6D4

* break

* func_800ECD7C

* A bunch of functions

* func_800EE200

* func_800EDF78 and func_800EE0CC

* func_800EDBE0 NON_MATCHING

* Cutscene_Init NON_MATCHING

* func_800EA324 NON_EQUIVALENT

* Fix warnings

* func_800EC924 NON_EQUIVALENT

* Cutscene_ProcessCommands NON_EQUIVALENT

* Format

* Split z_demo data and import it

* Import bss

* Match func_800EB364

* Rename Cutscene_Command_SetTime

* Improve Cutscene_ProcessCommands a bit (still not equivalent, probably)

* Improve Cutscene_ProcessCommands thanks to engineer and anon

* Cutscene_ProcessCommands NON_MATCHING

* Name some commands

* Fix

* Renames based on Engineer knowledge of Audio stuff

* More command names

* Cutscene_Command_GiveTatlToPlayer

* Some cutscene commands macros

* more command macros

* Macros for unknown commands

* Improve Cutscene_Command_Textbox a bit

* Rename stuff

* Name Terminator and Camera

* MOTIONBLUR

* Macros for textbox commands

* CS_PLAYER_ACTION_LIST

* A few macro renames

* Small cleaning

* A bit more of cleanup

* Rumble

* Entrance comments in func_800EB6F8

* Some var renames

* CS_CMD_FADESCREEN

* More clean up

* Clean functions protos

* Move CutsceneStateHandler out of z64.h

* Cutscene_DoNothing

* Cutscene_IsPlayingCs & Cutscene_GetSceneSetupIndex

* And more renames

* name some stuff in the cutscenecontext struct

* npcActionIndex->actorActionIndex

* Undo names of CS_STATE_ enum

* Name Cutscene_ActorTranslate family of functions

* small docs pass

* sfxconvert and format

* Hopefully last cleanup

* Add some missing functions to actorfixer

* Fix merge issues and remove trailing commas

* Cutscene commands fix

* Cutscene_Command_Misc improved by engineer

* Update src/code/z_demo.c

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

* Apply suggestions from code review

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

* Address review

* bss

* Match Cutscene_Command_Textbox by anon58

* Fix merge issues

* Match Cutscene_Command_Misc by @hensldm

* review

* float time macros

* fix merge issues

* format

* Fix building assets

* fix merge issues

* format

* Fix

* format

* fix merge issues

* fix

* fix

* format

* fix issues and run format

* bss

* Fix conflicts, bss and formatter

* Update include/functions.h

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

* Update include/functions.h

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

* Update include/z64.h

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

* Update include/z64cutscene.h

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

* Update include/z64cutscene.h

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

* Update include/z64cutscene.h

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* address review and fix some stuff

* fix merge problems

* more fixes and format

* Fixes

* Update include/functions.h

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

* Update include/functions.h

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Engineer suggestions

* format

* Elliptic review

* Use dec for ShrinkWindow_SetLetterboxTarget

* add a few comments

* Cutscene_Command_ChooseCreditsScenes

* Update src/code/z_demo.c

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

* format

* some cleanups and some comments

* change actorActionCmd from hex to dec in the codebase

* minor comment on textboxcmd

* ahhhh

* Update src/code/z_demo.c

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

* brackets

* minor comments

* rewording

* im dumb

* brackets

* another bracket

* Dawn of the New Day

* Update src/code/z_demo.c

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

* fixes

* Cutscene_Command_TransitionFX by Anon

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2022-03-04 19:14:52 -05:00
Maide 8b7cbb1273
En_Gk (#580)
* En_Gk

* Merge

* Merge

* TrasnformDraw

* PR

* a

* Ok

* PR
2022-02-28 03:03:03 +00:00
Maide d60f3fcf2c
En_Gg (#585)
* En_Gg

* remove syms

* merge

* Merge

* PR

* PR
2022-02-28 02:59:07 +00:00
Maide e127ee650a
En_Pr2 (#587)
* En_Pr2

* Cringe

* Merge

* PR

* Revert EnEncount1

* PR
2022-02-28 02:52:39 +00:00
Maide 6f4b349020
En_Zob (#593)
* En_Zob

* Merge

* Merge

* Merge

* PR

* fixer
2022-02-28 02:44:29 +00:00
Maide c9f64d3344
Obj_Hunsui (#626)
* Obj_Hunsui

* PR

* Merge

* Merge
2022-02-28 02:38:36 +00:00
Maide 84e13ff2a0
Obj_Comb (#632)
* Obj_Comb

* PR
2022-02-28 02:29:56 +00:00
Maide bb6b580a6b
Mir_Ray (1 non-matching) (#634)
* Mir_Ray

* PR

* fmt
2022-02-28 02:18:40 +00:00
Maide 484263dedc
Obj_Bombiwa (#637)
* Obj_Bombiwa

* PR
2022-02-28 02:11:06 +00:00
louist103 684df37ebc
En_Door (#571)
* progress

* it matches mostly

* symbols

* done for now

* fix warnings and stuff

* formatter

* NON_EQUIVALENT

* pr fixes

* formatter and actorfixer

* fix pm

* more fixes

* PR fixes

* it actually builds again

* matching function

Co-authored-by: Louis <louist103@pop-os.localdomain>
2022-02-27 17:37:24 -05:00
Derek Hensley f67ecbc3c2
EnBba01 Ok and Documented (#667)
* Decomp Bba_01

* Doc bba01

* Document object_bba

* Remove new line

* Cleanup/rename EnHy to help differentiate it from overlays

* Adjust xml comment

* PR suggestions

* English is hard

* English is hard 2

* Add note about invalid textIds

* typo

* Fix merge

* Remove 0 defines
2022-02-19 23:27:15 +00:00
Maide b949669131
Door_Shutter (#623)
* Door_Shutter

* PR

* Fix macro

* PR

Co-authored-by: angie <angheloalf95@gmail.com>
2022-02-19 23:05:22 +00:00
Maide 3f15c0017a
En_Zoraegg (#630)
* En_Zoraegg

* Revert bgCheckFlags

* roomInf

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-02-19 21:36:16 +00:00
Tom Overton 8e3d28b536
En_Syateki_Wf (Shooting Gallery Wolfos) OK (#673)
* EnSyatekiWf_Init and EnSyatekiWf_Destroy OK

* func_80A201CC OK

* func_80A20284 OK

* func_80A2030C and func_80A20320 OK

* func_80A20378 OK

* func_80A200E0 OK

* func_80A203DC OK

* func_80A20670 OK

* func_80A206DC and func_80A20710 OK

* func_80A2075C OK

* func_80A2079C and func_80A20800 OK

* func_80A208F8 OK

* Import data to C

* func_80A20858 OK

* EnSyatekiWf_Update OK

* Draw functions OK

* Use generated reloc

* Delete struct padding

* Use object symbols

* Name the statics

* ANIMMODE enum

* Misc cleanup

* Format

* Respond to review

* Change do-while loops to just be while loops

* Decimal counter
2022-02-19 21:26:04 +00:00
Tom Overton debcfa3d72
Bg_Numa_Hana (Wooden Flower in Woodfall Temple) OK and documented, partial documentation of object_numa_obj (#666)
* Import data to C

* BgNumaHana_Init OK

* BgNumaHana_Destroy OK

* BgNumaHana_Update OK

* func_80A1A500 OK

* func_80A1AE08 and func_80A1AE1C OK

* func_80A1AA14 and func_80A1AA28 OK

* func_80A1AA38 and func_80A1AA4C OK

* A few more functions

* Finish most functions

* func_80A1A56C OK

* BgNumaHana_Draw OK

* Use generated reloc

* Use object symbols

* Actor flags

* Minor cleanup

* Some initial documentation

* More documentation

* Document flower petal struct

* Some more struct vars

* Name everything else

* Finish documenting the object for the flower

* Final doc pass

* UNK_TYPE

* Respond to review and fix build
2022-02-19 21:18:15 +00:00
Parker Burnett 249871642f
Obj_kinoko OK (#646)
* z_obj_kinoko OK

* fixing DL and changing to thisx

* naming display list

* minor fix

* fixing PR suggestions

* addressing PR

* reverting name and leaving a comment
2022-02-19 21:12:22 +00:00
Maide 0e6cf608d2
En_Pr (#631) 2022-02-19 20:59:15 +00:00
Maide 717adf8ed8
En_Sth (#625)
* En_Sth

* Skull tokens

* PR
2022-02-19 20:49:57 +00:00
Maide e2d546c8f0
En_Bom_Bowl_Man (#616)
* En_Bom_Bowl_Man

* sAnimations

* Fixup data

* PR
2022-02-19 20:45:21 +00:00
Maide c91423abae
En_Baba (#592)
* En_Baba

* Merge

* Merge

* PR

* PR

* Apply suggestions from code review

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

* Update src/overlays/actors/ovl_En_Baba/z_en_baba.c

* format

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2022-02-19 20:38:52 +00:00
Maide 2b5fe949fe
En_Tanron2 (#615)
* En_Tanron2

* Format

* PR
2022-02-19 20:27:21 +00:00
Maide 320a1a3030
Dm_Char00 (#611)
* Dm_Char00

* Replace other macros

* PR
2022-02-19 20:22:45 +00:00
Maide 9f5217c81f
En_Zow (#607)
* En_Zow

* Matching

* PR
2022-02-19 20:16:21 +00:00
Maide 08acf42204
En_Kendo_Js (#606)
* En_Kendo_Js

* PR

* PR

* PR
2022-02-19 20:09:27 +00:00
retro 557825636f
EnOsn OK (#603)
* start working on struct

* init matching

* destroy matched

* func_80AD0830 and update matching

* func_80AD1634 matching

* idle matching

* func_80AD16A8 matching

* cleanup

* func_80AD0A24 matching

* cleanup

* func_80AD144C matching

* func_80AD14C8 almost matchign

* func_80AD14C8 matching

* func_80AD19A0 matching

* func_80AD0AB0 matching

* func_80AD0998 matching

* func_80AD1398 matchign

* cleanup

* func_80AD0B38 matching

* func_80AD0E10 matching

* func_80AD08B0 matching

* func_80AD10FC matching

* EnOsn_Draw matching

* func_80AD1DA8 matching

* func_80AD1E28 matching

* document

* update kafei mask

* import data

* actorfixer

* fix warnings

* cleanup

* format and cleanup

* use unk_type

* most feedback done

* format

* change unks to vec3s

* treat as bool

* use CHECK_QUEST_ITEM macro

* use CHECK_QUEST_ITEM macro

* some documentation

* format

* some feedback done

* fix fallthrough spacing in switch

* split up func_80AD1398

* format

* more feedback

* param macro

* use param macro

* replace returns with break

* remove padding

* fix for upstream merge

* feedback

* move some data inline

* feedback

* fetch upstream

Co-authored-by: retro <retro@retros-air.home>
Co-authored-by: retro <retro@retros-mbp.home>
Co-authored-by: retro <retro@retros-MacBook-Pro.local>
2022-02-19 19:48:05 +00:00
Maide 271cf4de70
Obj_Snowball2 (#596)
* Obj_Snowball2

* Merge

* merge

* PR
2022-02-19 19:41:46 +00:00
Maide 5d3ddfac00
En_Al (#595)
* En_Al

* Merge

* Merge

* PR

* Names

* PR
2022-02-19 19:34:09 +00:00
Maide 9ddf530f9b
En_Karebaba (#590)
* En_Karebaba

* merge

* Merge

* PR
2022-02-19 19:17:20 +00:00
Maide 2d6a74c0aa
Dm_Char01 (#589)
* Dm_Char01

* Merge

* Extract verts

* PR
2022-02-19 19:11:13 +00:00
Maide 3086543498
En_Ja (#581)
* En_Ja

* Fix a problem

* Merge

* Merge

* TrasnformDraw

* Need static data

* PR
2022-02-19 19:04:34 +00:00
Isghj 926b575d13
EnAni OK (Man in Tree in South Termina Field) (#566)
* EnAni:Start

* EnAni: done with matching

* EnAni: docs

* EnAni: forgot the display lists, they wouldnt load in z64utils, had to use limb->DL to name them

* EnAni: forgot the spec, so rusty

* Apply suggestions from code review

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

* EnAni: more requested changes

* EnAni: format pass

* EnAni: remove typedef warning

* EnAni: typdef attempt

* Apply suggestions from code review

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

* EnAni: changed ani state flags from enum to defines

* EnAni: formatter no

* EnAni: undefined behavior

* EnAni: chest rot discovered

* EnAni: fixes after merging

* EnAni: flags docs

* EnAni: flags at top using enum

* EnAni: jenkins bait

* EnAni: revert bgcheck flag

* EnAni: single doc

* EnOssan: format after fix to EnAni

* EnAni: requested changes, some documentation changes

* EnAni: forgot to re-extract

* EnAni: better object naming

* EnAni: changed STATE_SUFFERING to STATE_WRITHING to match object docs, removed extra whitespace from defines

* EnAni: removed object comment about z64util not rendering them

* EnAni: flipped actor flag to match OOT

* EnAni: formater pls

* EnAni: Animatation Enum values in Animation_change calls

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-02-19 18:59:43 +00:00
Isghj 26d1982f19
EnYb OK (Kamaro, the dancing ghost) (#562)
* EnYb: start

* EnYb: ah I broke it

* EnYb: well at least the draw function matched...

* EnYb: back to semi-matching

* EnYb: Back to OK, workable again

* EnYb: init matches now, ugly as it is for dma padding

* EnYb: probably not progress

* EnYb: fixes to master merge, back to OK

* EnYb: custom shadow function matches

* EnYb: more docs, this last function sucks

* EnYb: OK thanks to Anon and myxrules

* EnYb: docs

* EnYb: more docs

* EnYb: formatter pass

* EnYb: removed unused symbols

* Requested changes part 1

* EnYb: Minor changes

* EnYb: forgot the spec

* EnYb: some display lists documented based on limbs, but two remain because their limbs dont highlight in z64Utils

* EnYb:one wrong entry

* EnYb: maybe better object documentation

* EnYb: fix warnings

* EnYb: flag docs

* EnYb: changed function

* EnYb: more documentation

* EnYb: flags enum at top

* Update src/overlays/actors/ovl_En_Yb/z_en_yb.c

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

* Update src/overlays/actors/ovl_En_Yb/z_en_yb.c

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

* EnYb: PR fixes

* EnYb: formater is picky

* EnYb: jenkins bait

* EnYb: correct array access

* EnYb: formater pass

* Apply suggestions from code review

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

* EnYb: fixes

* EnYb: more requested changes, formater pass

* EnYb: renamed padding

* EnYb: object xml name updates

* EnYb: merge fix

* EnYb: limb enum and small changes

* EnYb: scale float fraction found

* EnYb: better object limb naming

* EnYb: formater pls

* EnYb: flipped actor flags to match OOT

* Apply suggestions from code review

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

* EnYb: more requested changes

* EnYb: more animMode enum found

* EnYb: doc player playing ocarina

Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2022-02-19 09:57:09 -05:00
engineer124 01ca078226
Import code_8019AF00.c (Audio) data & bss, introduce z64ocarina.h (#575)
* Import code_8018AF00 Data

* code_8019AF00.c BSS Imported

* format

* Small touch-up

* rename `bgm.h` to `sequence.h`

* Missed a variable

* PR Feedback 1
2022-02-14 01:38:46 +00:00
Maide 7565f9f052
En_Insect (#652)
* En_Insect

* WHO DIDN'T FORMAT?!

* PR
2022-02-14 01:32:56 +00:00
Maide a5e631d03f
En_Zov (#649)
* En_Zov

* PR

* PR
2022-02-14 01:18:42 +00:00
Tom Overton 3597e4809f
En_Jg (Goron Elder) OK and documented. Also document object_jg (#594)
* Migrate data to C

* Init / Destroy / Update / Draw

* Functions called from Update

* Better Init match

* A few more functions

* A few more functions

* Drum-spawning function OK

* EnJg OK

* Name a few struct vars

* Name some static vars

* Name limbs

* Name limb DLs

* Name some textures

* Name all remaining textures

* First pass animation names + use object in actor file

* Add drum to XML + clean it up

* Better translations, thanks Emily!

* Some more documentation

* Improvements

* Params accessor for s_goro

* Proper object symbols for Jg_Gakki

* Delete unnecessary undefined_syms

* Text defines for my own sanity

* Some more names

* Document point/path stuff

* Name every function, even if the names are bad

* Params macro for if he's in goron shrine

* Some misc improvements

* Document EnJg_GetShrineGoronToFocusOn better

* Final cleanup before PR

* Change action name because this actor is dumb!

* Run actorfixer

* Rename some variables now that a function is named

* ProcessTalkRequest takes GameState

* Run actorfixer

* Use new actor flags

* Update text ID names to match my text ID PR

* Define the limb enum in the object

* Be consistent about where the EnumName is

* Don't name limbs after the actor

* Basic enum for drum limb

* Fix stuff after merge

* Do if/else if/else

* Remove textId defines

* Decimal weekEventReg accesses
2022-02-13 20:07:26 -05:00
Maide 45cee7d8af
Obj_Dhouse (#648)
* Obj_Dhouse

* PR

* PR
2022-02-14 00:58:19 +00:00
Derek Hensley 0625803c17
Ovl_En_Cne_01 Ok and Documented (#641)
* Decomp and document Cne01

* Document object_cne

* split enhy header from z64

* Cleanup

* Actually include new z_en_hy header

* Actor flags

* Add header to object_cne

* screen defines

* Useage of ENHY_LIMB_MAX
2022-02-14 00:30:30 +00:00
Maide 9e9b84cb2c
Dm_Char05 (#583)
* Dm_Char05

* Params

* Syms

* Earpstone

* Merge
2022-02-13 23:58:41 +00:00
Maide 5fe04d87e0
Bg_Ikana_Rotaryroom (#573)
* Bg_Ikana_Rotaryroom

* Merge

* Merge

* PR

* PR
2022-02-13 23:39:10 +00:00
Maide 66b309218c
Bg_Dblue_Movebg (#568)
* Bg_Dblue_Movebg

* UNK_TYPE1

* PR

* Match Draw (thanks Anon58)

* Match

* data

* PR
2022-02-13 23:24:26 +00:00
Maide 5fa02d9725
En_Arrow (1 non-matching) (#551)
* En_Arrow

* Remove comment

* UNK_TYPE1

* Add thing

* Merge

* Merge

* PR

* PR

* PR
2022-02-13 23:14:13 +00:00
Parker Burnett 0f7f5de084
En_am OK (#501)
* en_am ok

* clean up

* applying feedback and some docs, need finish still

* this should fix things

* fixing things

* fixing things and running format

* post actor_fixer

* adding object header and fixing comments

* formatting and adding enum for limbs

* addressing pr, naming things, cleanup

* fixing enum in header

* doing some docs and fixing format
2022-02-13 12:02:31 -05:00
Averane 40d1bc00fe
EnDemoheishi OK and documented (#584)
* EnDemoheishi decomp first pass

* object decomp

* whitespace between declarations and statements added

* various PR fixes

* format for CI

* various PR fixes 2 + format

* missed one texture output name

* fix texture docs in unrelated files

* fix demoheishi shared texture naming

* made object sdn properties generic for soldiers

* missed outName modifications

* fixed references to updated function names

* reverting some texture changes to unrelated objects & use object specific names for lips and fingers textures

* added textId comment

* various PR comments addressed

* added enum for animations

* reverting halt animation naming

* moved animation enum to actor class

* fixed enum names

* fix typo

* more PR fixes

* format

* fix for broken build after other PR merge

* format

* merge fixes

* isTalking

* Enum - Calf to shin

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

* Object - Calf to shin

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

* DList - Calf to Shin

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

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-02-05 19:52:39 -05:00
engineer124 2104c16362
code_8012EC80.c OK and Documented + parameter_static extraction (#534)
* Match remaining functions of code_8012EC80.c

* parameter_static extracted and OK

* Small Progress

* Documentation all over the place

* Finish Documenting

* Cleanup

* Name more textures

* Update knowledge on deku playground player name

* All textures from parameter_static known now

* Finish documenting and validating parameter_static

* More up-to-date SaveContext docs

* More docs

* More cleanup

* Sun -> Star

* Minor touchup

* More cleanup

* pictograph -> pictoBox

* Remove the "unused" part

* More accurate name: hour lines

* It's gsDPLoadTextureBlock, not gsDPSetTextureImage

* Fix parameter_static and merge issues

* More docs from new PRs and Parameter WIP

* Missed a name

* Move parameter_static to interface assets

* Clean up code_8012EC80.c data

* Fix comment

* Add comments to parameter_static

* Oops

* fix merge

* Missed a PR review suggestion

* Fix merge
2022-02-05 01:49:21 +00:00
engineer124 bcdd99df08
Importing audio_data.c (#473)
* import audio_data.c

* frequency of -> harmonic

* Name remaining filter data

* Note to Pitch
2022-02-05 00:39:21 +00:00
Maide 69d7a2e585
Obj_Bean (#467)
* Obj_Bean

* Fix non-matching (thanks engineer)

* PR

* undef

* fmt

* PR

* PR

* Merge

* Merge

* PR
2022-02-05 00:27:29 +00:00