Commit Graph

245 Commits

Author SHA1 Message Date
Anghelo Carvajal f39d412bfe
Actors revert cleanup (#1221)
* Revert "ovl_Bg_Keikoku_Spr OK (#111)"

This reverts commit fed1b37da1.

* Revert "z_bg_tobira01 OK (#168)"

This reverts commit 54aef44a9e.

* Revert "Bg_Lotus OK (#86)"

This reverts commit d0af9587ba.

* Revert "Door_Spiral OK (from zel) (#87)"

This reverts commit 6e4d156ad7.

* Revert "en_invadepoh OK (#200)"

This reverts commit e1219e7351.

* Revert "ovl_Item_B_Heart OK (#110)"

This reverts commit f0cd2db055.

* Revert "ovl_Obj_Boyo OK (#112)"

This reverts commit 536a484f73.

* more reverts and fix building

* restore timeconv.py

* restore func_800BFD84
2023-04-01 21:10:00 -03:00
engineer124 f3c811d298
`z_parameter`: Buttons (part 9) (#1192)
* import button docs

* cleanup

* sync timer val

* add flag comments

* Update src/code/z_parameter.c

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

* Update src/code/z_parameter.c

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

* Update src/code/z_parameter.c

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

* fix merge master

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-03-30 20:26:35 +11:00
engineer124 6685a4775e
Audio `sequence.c` OK and documented (#1201)
* import sequence docs

* cleanup

* do not need raw hex
2023-03-30 19:53:47 +11:00
engineer124 2cb01b5b6a
z_room (1 non-matching) (#1143)
* begin room docs and decomp

* match Room_DrawImageSingle

* match Room_DrawImageMulti

* Room_AllocateAndLoad non-matching

* big improvements on Room_DrawCullable

* match Room_AllocateAndLoad

* improvement?

* cleanup

* comments

* cleanup

* small pr suggestions

* PR Suggestions

* cleanup sceneCmds

* some PR

* PR Suggestions

* more PR Suggestions

* col to collision
2023-03-23 09:36:09 +11:00
Derek Hensley 03c8d46ed2
Slowly Cleanup (#1213)
* Add slowly.h

* Init and destroy

* File header
2023-03-20 00:48:49 +11:00
Anghelo Carvajal c833969ea7
`z_actor` documentation pass (#1154)
* ActorContext_unk_1F4

* a

* ACTOR_FLAG_IGNORE_QUAKE

* ACTOR_FLAG_TALK_REQUESTED and ACTOR_FLAG_CANT_LOCK_ON

* actorCtx->unkC => ctorCtx->halfDaysBit

* HALFDAYBIT defines

* actor.halfDaysBits

* format

* Actor_InitHalfDaysBit

* Name actor-killing functions

* cleanup variables.h a bit

* DAWN

* bss

* Actor_RequestRumble and Actor_GetArrowDmgFlags

* name vars of func_800BC620

* format

* fix missing PLAYER_IA

* Actor_OfferGetItem

* Actor_SetClosestSecretDistance

* freezeCategoryPlayerFlags1

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

* DROPFLAG_

* a

* COLORFILTER

* format

* sCategoryFreezeMasks

* Actor_OfferCarry

* review

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

* change hex to dec

* COLORFILTER_INTENSITY_FLAG

* format

* review

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

* shiftedHalfDaysBit

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

* cleanup

* Undo Actor_RequestRumble

* Undo ACTOR_FLAG_IGNORE_QUAKE

* format

* Remove COLORFILTER_GET_BUFFLAG

* Undo Actor_KillAllFromUnloadedRooms

* format

* Update Actor_OfferGetItem comment

* Update Actor_OfferGetItem description

* diving

* bss

* namefixer

* format

* speed

* review

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-03-09 12:35:23 -05:00
Anghelo Carvajal 496b4928ea
Rename `GameInfo` to `RegEditor` (#1178)
* Rename RegEditor and move it to regs.h

* bring over some minor doc from oot

* add missing include

* Update tools/disasm/variables.txt

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

* update comment

* bss

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-03-08 23:53:38 -05:00
Anghelo Carvajal 2f1e7b3de8
Stack cleanups (#1193)
* Use STACK and STACK_TOP everywhere

* format

* remove fake variable

* bss

* review

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

* Update src/boot_O2_g3/boot_main.c

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

* review

* renames

* more renames

* and more

* whoopsie, forgot those too

* hopefully the last cleanup

* forgot some stuff

* a

* bss

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-03-08 15:25:51 -03:00
Derek Hensley 184f5858ff
Debug mode (#1185)
* OK

* Docs

* PR

* Format

* Update include/z64debug_display.h

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

* Update include/z64debug_display.h

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-03-08 00:06:49 -05:00
Derek Hensley c917880261
Misc cleanup 13 (#1189)
* FaultAddrConv Functions

* Invisible Ruppe macros

* skybox

* Z64 header defines

* ActorId

* remove i from KaleidoManager_FaultAddrConv

* size_t and parens
2023-03-07 23:44:18 -05:00
engineer124 e8f906100b
NPC Tracking (#1184)
* npc tracking

* fix func declaration

* more cleanup

* rm named var

* more cleanup
2023-03-07 23:33:16 -03:00
Francis Jeanneau 263fca77c3
EnSi OK (#1174)
* [decomp,actor] Decompile Init,Destroy & unnamed functions (func_8098CA20 is WIP)

* [ovl_En_Si] Match func_8098CA20 function

* [0vl_En_Si] Comment data in spec

* [ovl_En_Si] Start documentation & cleanup

* [ovl_En_Si] Clang format

* [spec] Update ovl_En_Si reloc target

* Style fixes & adjust fanfare parameter

* Remove goto & styling fixes

* Styling fixes

* Remove unnecessary function declarations & dead code

* Styling fixes & doc (MR suggestions)

* Move GET_CHEST_FLAG macro to header file

* Rename colliderSphere variable to collider

* Rename func_8098CA20 to EnSi_UpdateCollision

* Rename func_8098CBDC to EnSi_DraggedByHookshot

* Rename func_8098CAD0 to EnSi_GiveToken

* Rename func_8098CB70 to EnSi_Wait

* Styling adjustment

* Update tools/disasm/function.txt with new function names

---------

Co-authored-by: Francis <francis.jeanneau@sparkmicro.com>
2023-03-01 22:17:30 -03:00
Anghelo Carvajal 1e03e13b37
`z_eff_footmark` cleanup (#1180)
* z64eff_footmark.h

* arraycount and other clenaups

* flag

* extract data

* gEffFootprints

* singular

* minor cleanup

* review

* pos

* mf

* format
2023-02-27 17:56:04 -05:00
louist103 2080f9906f
EnStopHeishi OK (#1156)
* merge data

* its broken

* func_80AE7718

* IDK for now

* OK

* cleanups

* format

* PR fixes

* Delete BuildInfo.h

* PR fixes

* PR fixes

* PR fixes

* Update z_en_stop_heishi.c
2023-02-24 13:42:59 -03: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 50bd6056e2
Document EnSyatekiWf and do some slight cleanup on object_wf and other Syateki actors (#1168) 2023-02-21 16:42:20 -03:00
Anghelo Carvajal 5bc388b9a9
Introduce `object_table.h` (#1136)
* object_table

* segmentsymbols

* format

* review

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

* bss

* add more descriptions to the object_table

* DEFINE_OBJECT_SIZE_ZERO

* Update include/tables/object_table.h

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

* Rename `z_scene_dlftbls.c` to `object_table.c`

* bss

* bss

* bss

* bss

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2023-02-21 16:05:12 -03:00
Derek Hensley 5941e09b22
Fbdemo (TransitionTile) OK (#1163)
* Fbdemo OK

* Cleanup

* sync and format

* Fix functions.h

* format

* SQ
2023-02-21 15:36:56 -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
Derek Hensley ab8d34b8dc
Play (2 NON_MATCHINGS) (#1109)
* Bring over progress from another branch

Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>

* cleanup, fake match Play_Init

* small fixes

* Some small cleanup

* Match func_80165460 (from debug)

* Match func_80165658

* Match func_80165DB8, func_80165DCC, func_80165DF0, func_80165E04

* Match func_80167DE4 (from debug)

* Match func_80167F0C

* Match func_80168DAC

* Matched func_80169100

* Matched func_801691F0

* import D_801DFA18

* match Play_Main thanks to debug

* cleanup

* synray does it again

* add docs from debug

* fix func_801656A4

* more docs and cleanup

* Match func_80166B30 and diff fake match in Init

* import transition docs from OoT

* Play Update, sort of

* cleanup Play_Update

* more cleanup

* slightly more docs

* small docs

* Play_Draw WIP Thanks @petrie911

* progress?

* two more matches

* format

* misc play docs

* transitions cleanup

* Motion Blur

* Transitions

* Fog

* Bombers notebook + small cleanup

* bss

* Camera Functions

* Picto functions

* Init

* MotionBlur Clean up

* Floor Surface

* Pictographs some more

* regs

* fix circular dependency problem

* Cleanup PR commits outside play

* namefixer

* PR picto

* PR audio

* PR small clean ups

* debug strings

* Picto defines

* bss

* enums

* remove void

* typedefs

* Hireso -> BombersNotebook

* bss comments

* bss and I8/I5 functions

* Smaller PR comments

* Transitions

* Combine enums

* Revert "Combine enums"

This reverts commit 0da1ebcaed.

* Fix Transition defines

* RGBA16 macros

* Unname

* worldCoverAlpha

* Rename Update and Draw

* PR review, plus annotate bug

* Clean up nonmatchings with a closer DrawGame

* Format

* New macros

* UpdateMain and DrawMain

* Fix merge

* Small cleanups from PR

* zFar

* Intensity macros

* Format

* Remove bss comments

* Compression/decompression

* Small cleanup

* Format

* More PR cleanup

* Cleanup picto stuff

* format

* Fix compression comments

* Play processes state enums DONE -> READY

* cutscene comment

* fix bss

Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: angie <angheloalf95@gmail.com>
2023-01-14 12:18:13 -03:00
mzxrules e2b61f88e4
sys_cmpdata OK (#1065)
* sys_cmpdata decomp

* implement suggestions

* sys_cmpdata OK

* format

* implement suggestion

* make bss data public

* format bleh
2023-01-14 00:29:50 -03:00
engineer124 9c37452bf7
`audio_thread.c` OK and Documented (code_80192BE0.c) (#1117)
* copy docs from audio

* PR Suggestions Round 1

* more PR suggestions

* fix bss

* PR Suggestions

* oops, duplicate

* apply OoT Feedback, fix bss

* cleanup

* spacing

* bss

Co-authored-by: angie <angheloalf95@gmail.com>
2022-12-08 17:41:03 -03:00
engineer124 b73d18b154
`z_parameter`: Main (#1157)
* main docs

* formatting and bss issues

* PR Suggestions

* missed enums

* better macros/enums

* restrictions improvement, still wip

* fix name, more common restriction patterns

* more restrictions cleanup

* rm comment
2022-12-08 15:54:38 -03:00
louist103 90469fd442
Use pointer types instead of s32 (#1151)
* pointers

* remove from segment_symbols

* format
2022-11-21 19:45:46 -03:00
engineer124 f92c4e6b02
`z_parameter`: Time (1 non-matching) (#1144)
* import time docs

* cleanup

* fix display list

* missed one

* three-day events

* PR Suggestions and cleanup

* adjust comment

* more macros

* PR Suggestions

* move InterfaceContext
2022-11-20 20:20:09 -03:00
engineer124 1792268c94
`z_parameter`: Minigames (#1131)
* minigame docs

* cleanup

* vertices and cleanup

* fix bss

* change to perfectLetters

* fix parameter static

* more PR, namefixer

* PR Suggestions
2022-11-19 14:13:05 -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
engineer124 7b81d6e950
Kaleido_Update OK and documented (#1113)
* Kaleido Update

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

* fill in enums

* PR Suggestions

* more PR Suggestions

* missed one

* pause state range macros

* fix bss

* PR suggestions, doc roll

Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
2022-10-23 02:44:23 +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
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
Anghelo Carvajal bd373940ac
`z_player_lib`: Part 2 (#938)
* preparations

* import data

* PLAYER_STATE1

* PLAYER_STATE2

* PLAYER_STATE3

* import bss

* format stuff

* bss cleanup

* more cleaning and some naming

* face

* cleaning up link human object a bit

* Remove PHYSICAL_TO_VIRTUAL2

* Update src/code/z_player_lib.c

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

* review

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

* format

* /* CAT */

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

* naming some stuff on objects

* format

* invert flags endian

* review

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

* format

* drawmask

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

* naming

* another round of human object naming

* enum renames

* sActionModelGroups and use enum as types

* PlayerAnimType

* PLAYER_MODELTYPE_

* determined ranges of PlayerModelType

* name PLAYER_MODELGROUP_DEFAULT

* format

* sheath

* dlist groups placeholder namse

* PLAYER_MODELGROUP_BOTTLE

* Some fierce deity naming

* Right hands

* zora skel dlists

* deku limb dlists

* left hands

* name most modelgroups

* more hand naming

* regs as dec

* fix in horse

* Use BUTTON_ITEM_EQUIP macro

* review

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

* reformat D_801AED58

* Sword sheaths

* swords and shields

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

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

* playerForm on Player_DrawImpl

* fomat

* Update src/code/z_player_lib.c

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

* Update assets/xml/objects/gameplay_keep.xml

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

* review

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

* VIRTUAL_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(gEffBubble1Tex))

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

* singular limb enum names

* fix bss

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

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

* review

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

* name goron shielding limbs

* name limb

* Update src/code/z_player_lib.c

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

* bss

* bss

* format

* namefixer

* bss

* bss

* bss

* bss

* format

* bss

* review

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

* fix bss

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-10-15 19:12:01 -03:00
Tom Overton b35accc955
ObjY2Shutter OK and documented (#1119)
* ovl_Obj_Y2shutter decompiled

* cleanups

* more review fixes

* format

* document shutter assets and add ShutterType enum

* rename xml assets, remove unnecessary parenthesis

* move ShutterType enum to header file

* forgot enum in comparison

* Respond to review

* Finish docs

* Raise/Lower -> Open/Close

Co-authored-by: Chloe <kojlax@protonmail.com>
Co-authored-by: Chloe <>
2022-10-14 08:59:13 -03:00
engineer124 7204b08498
Rename audio context (#1114) 2022-10-13 17:17:27 -03:00
engineer124 f3db029936
z_kaleido_collect.c (1 non-matching) and Mostly Documented (Pause Menu Quest Page) (#1108)
* import quest docs

* cleanup

* eol

* temp change to non-eq

* more missed stuff

* fix questVtx

* PR suggestions

* adjust comment

* missed two

* PR Suggestions
2022-10-13 04:39:39 +01:00
engineer124 868029b213
Import Camera Data (#1097)
* import camera data

* cleanup

* easier-to-read cam-hud-visibility

* PR Suggestions

* fix camflag macros

* fix bss

* camera data summary

* small cleanup

* cleanup camera data

* cam data mode enums
2022-10-13 04:26:35 +01:00
Derek Hensley 8e6843f04e
DmChar08 OK (#1085)
* progress

* progress

* about to merge data. probably a bad idea

* matches with ZAPD

* docs

* done for now

* progress

* about to merge data. probably a bad idea

* matches with ZAPD

* docs

* done for now

* Fix makefile and add non matching to spec

* did some git stuff

* Git being a problem as usual

* format

* PR fixes

* PR fixes

* PR fixes

* Merge master and fixes

* going to merge play

* merged in the big one

* docs

* PR fixes

* format

* Clean up

* transition

* Better init

* Glitchy animations

* PR

* Format

* PR comments

* Missed one

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

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

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

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

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

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

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

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

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

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

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

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

* fix conflicts

* Fix conflicts

* format

* PR

Co-authored-by: louist103 <louist103@gmail.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-10-06 21:46:58 -03:00
engineer124 f379012742
z_kaleido_map.c OK and Documented (Pause Menu Map Page) + related icon_item statics (dungeon/field/jpn) (#1094)
* import pause menu map page

* better owl-warp docs

* fix func name

* missed some owlwarps

* fix merge from master

* fix scene region code

* PR Suggestions

* add comment

* add description of gWorldMapImageTex, thanks @EllipticEllipsis

* clearup docs

* missed a comma

* bad formatter, drop comment

* more cleanup
2022-10-05 06:15:39 +01:00
engineer124 3e32379c2b
audio_synthesis.c OK and Documented (#1090)
* import synth docs

* cleanup

* small followup cleanup

* PR Suggestions, small cleanup

* fix bss

* PR suggestion

* fix enum

* PR Suggestions
2022-10-02 20:24:10 +01:00
engineer124 841da5f138
View & Shrink_Window Docs (#1049)
* view and shrink_window docs

* cleanup

* move func declaration to header

* move struct to local

* PR Suggestions

* g to s
2022-10-02 11:32:57 -03:00
chloe!! 063d24f491
ovl_En_Door_Etc OK (#994)
* ovl_En_Door_Etc OK

* review fixes

* more review fixes

* name yawDiff variables

* various vixes

* Update src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c

Co-authored-by: Chloe <>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-02 06:07:07 +01:00
Tom Overton c3c08e944c
EnWiz (Wizrobe) OK and documented, EnWizFire (Wizrobe Magic) documented, object_wiz documented (#1054)
* Good start

* Limb draw stuff OK

* A ton more functions

* func_80A477E8 OK

* func_80A456A0 OK

* func_80A460A4 OK

* func_80A46990 OK

* func_80A46414 OK

* EnWiz_Update OK

* func_80A45CD8 OK
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>

* EnWiz_Draw OK

* Use generated reloc and object symbols

* Document object stuff related to Wizzrobe itself

* Some more names

* A bunch more names

* Name even more stuff (sensing a pattern?)

* Document damage tables and damage effects

* Bunch of stuff mostly related to ghosts

* Name all struct vars and functions

* Fix WizFire build issue

* Split up dmgFlags

* Apparently it's spelled "Wizrobe" in this game

* Name all assets EXCEPT the ones used by wiz_fire

* Apparently, the blob is vertices

* Name all remaining variables

* Some function comments

* (Probably) the final touches on EnWiz docs before PR

* Name a ton of stuff in EnWizFire

* Finish naming everything in EnWizFire

* Finish documentation

* Respond to Engineer's clean-up review

* Respond to Anghelo's first review

* Use TATL_HINT_ID enum

* Enum comments for animations, and better names for some damage effects

* Fix build after merging master

* Respond to Elliptic's review

* Define INITIAL_CUR_PLATFORM_INDEX

* Drop _CUR_ from the name

* Rename one of the enum values

* Respond to Elliptic's WizFire review

* Every switch has a default
2022-10-01 16:14:06 +01:00
Tom Overton bbc8aec36a
(Mostly) document EnSyatekiDekunuts (Shooting Gallery Deku Scrub) (#1095)
* (Mostly) document EnSyatekiDekunuts (Shooting Gallery Deku Scrub)

* Respond to Elliptic's review
2022-09-30 23:55:05 -03:00
engineer124 ab5fd663cc
Quake & Distortion Cleanup (#1102)
* quake cleanup

* cleanup

* more cleanup

* remove cast

* q comes before r...

* unname goron function, leave it to another PR

* PR Suggestions
2022-09-30 23:01:39 -03:00
engineer124 b080fb3700
z_kaleido_mask.c Ok and Documented (Pause Menu Mask Page) (#1093)
* import mask docs

* cleanup

* some PR

* fix merge from master

* fix merge

* move cursor result
2022-10-01 01:51:49 +01:00
Tom Overton 42a8bf6876
Document BgCraceMovebg (sliding doors in Deku Shrine) and object_crace_object (#1101)
* Document BgCraceMovebg (sliding doors in Deku Shrine) and object_crace_object

* Respond to Elliptic's review

* Fix build issue

* Respond to Elliptic's second review

* ACTUALLY put the BSS above the data, forgot the InitVars were data

* Respond to hensldm's review
2022-09-30 20:15:43 +01:00
engineer124 1af942ae12
Audio Sequences: Scene/Ambience/SeqFlags Functions OK (#1033)
* import audio scene seq docs

* cleanup

* fix scene cmd

* small fixes

* more PR suggestions

* missed comment

* rename spot to resume

* cleanup comments

* SEQ_IO_VAL_NONE

* Empty-Commit

* another PR suggestion
2022-09-30 08:49:35 -03:00
Derek Hensley 3a723efb15
SceneNum -> SceneId (#1036)
* sceneNum -> sceneId

* horse data scene -> sceneId

* Clean up scene table

* format

* PR comments

* Some more

* It helps if you actually save the file

* PR

* Remove comment

* Format

* Conflicts
2022-09-30 03:22:59 +01:00
engineer124 8f2fe9b3c7
`z_parameter`: Timers (#1031)
* import timers from parameter branch

* more cleanup

* small namechange

* improved docs

* more cleanup

* one more namechange

* another small cleanup...

* fix destroy

* plurals

* revert graphic function names

* PR suggestions, better docs

* revert namechange, better postman timer name

* oops

* fix merge

* fix merge

* fix bss

* PR Suggestions
2022-09-29 09:57:44 -03:00
Tom Overton 91d4e29dfa
Document object_zos (Evan) (#1091)
* Name all but one DList

* Name keyboard textures

* Finish object

* Respond to Elliptic's review

* Respond to Anghelo's review

* Comments for animations in array

* Respond to Engineer's review
2022-09-27 22:48:57 +01:00
Tom Overton aa54982318
EnGrasshopper (Dragonflies) OK and documented, object_grasshopper documented (#1043)
* EnGrasshopper (Dragonflies) OK and documented, object_grasshopper documented

* Type macro

* Limb enum for sJntSphElementsInit

* Respond to hensldm's review

* Use TATL_HINT_ID enum

* Respond to reviews

* Increase size of shadowBodyPartsPos to 24

* Change 14 to a define
2022-09-27 20:50:02 +01:00
Tom Overton f0311e6ca4
Document EnSyatekiCrow (#1063)
* Document EnSyatekiCrow

* Simplify static var names

* Respond to Elliptic's review
2022-09-27 18:28:39 +01:00
engineer124 ee82e65c1a
z_kaleido_item.c Ok and Documented (Pause Menu Item Page) (#1027)
* import wip from kaleido

* small cleanup

* add for-loop comments

* pr review 1

* spacing

* Update src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c

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

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-09-27 04:37:00 +01:00
engineer124 00bf71460f
Item cleanup: Item drops, rupees, signs (#1048)
* item cleanup

* pr suggestions

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-09-24 16:45:53 -03:00
engineer124 0e1b244354
Audio: Various Cleanup and Docs (#1034)
* cleanup and docs

* pr suggestions

* audio errors

* fix bss

* Empty-Commit
2022-09-24 16:35:37 -03:00
Tom Overton fc94be22ac
Document object_az (Beaver Bros.) (#1083)
* Document object_az (Beaver Bros.)

* Respond to Elliptic's review
2022-09-24 16:09:58 -03:00
Tom Overton 76dc0dd867
Document object_dblue_object (Great Bay Temple objects) (#1077)
* Document everything except the unknown blob and the weird collision

* Add the last unused texture, thanks Tharo!

* Finish up documentation

* Respond to Elliptic's review
2022-09-24 15:51:10 -03:00
Tom Overton 8fa3a58b35
Document object_market_obj (West Clock Town Market) (#1074)
* Document object_market_obj (West Clock Town Market)

* Update the names of ground textures

* Respond to Elliptic's review
2022-09-24 15:40:36 -03:00
Tom Overton 0aede274ae
Document BgInibsMoveBg (Twinmold's Arena) and object_inibs_object (#1055)
* Document BgInibsMoveBg (Twinmold's Arena) and object_inibs_object

* Respond to hensldm's review
2022-09-24 14:54:40 -03:00
Parker Burnett b4adfb0a22
Fbdemo_triforce OK with documentation (#1053)
* close to done

* OK and doc'd

* PR feedback

* 4mat

* PR feedback round 2

* fixed engineers comment
2022-09-24 14:49:07 -03:00
engineer124 cdee1fc45b
`z_kaleido_prompt.c` Ok and Documented (Pause Menu Save/Continue Prompt. Unused) (#1045)
* kaleido prompt ok

* fix pauseCtx
2022-09-24 14:43:21 -03:00
Derek Hensley f31056ef8a
Effect Dust OK (#1016)
* OK

* Some cleanup

* Description

* format

* Better name

* whoops

* Array count

* Name dust texture arrays

* Fix

* static

* Update dust tex outnames
2022-09-24 14:04:03 -03:00
engineer124 6451bcf158
`z_parameter`: Magic (#934)
* Document magic

* Cleanup

* Few fixes

* PR Suggestions, More Lens Docs

* Few comments

* missed a spot

* Better macros/names

* Deactivate Lens

* more PR suggestions

* fix names
2022-09-14 13:49:17 -03:00
Tom Overton 78684187fe
Make names related to animations more consistent (#998)
* Make names related to animations more consistent

* Standardize on sAnimationInfo

* Respond to hensldm's review

* Standardize on ChangeAnim

* Respond to hensldm's review

* Small formatting thing

* Consistency after merging master

* A few more things I missed

* Respond to Elliptic's review

* Some more stuff that was requested
2022-08-15 14:51:38 -04:00
engineer124 82fe521721
Audio Sfx (code_801A5BD0 and selected sfx functions in code_8019AF00.c) OK and Documented (#798)
* Rename functions

* code_801A5BD0 OK

* PR 1, improve spacing

* Rename unused struct

* Rename Sfx Variables

* PR Feedback, update names

* Add comment

* cleanup vars

* Fix merge

* Rework documentation, include more functions in sfx system

* PR suggestions

* fix AudioSfx_MuteBanks

* missed enum

* more cleanup

* more suggestions
2022-08-15 14:39:57 -04:00
Tom Overton e44c98884b
EnRat (Real Bombchu) OK and Documented, object_rat documented 🐀💣 (#966)
* EnRat_Init and EnRat_Destroy OK

* Tons of actionFuncs and other stuff

* EnRat_Update OK

* func_80A566E0 OK and better match for func_80A56EB8

* All draw functions OK

* EnRat OK

* Document object_rat

* Port documentation from Bom_Chu

* Document/name a few more things

* Name all funcs and struct vars

* Un-name unk_18D

* Name some more stuff

* Final round of docs before I ask for help

* Let's just PR this I suppose

* Respond to isghj5's review

* Name a variable I forgot to name

* hookedState stuff

* Clean up forward declares

* Fix after merge

* Respond to reviews

* Limbs -> Limb

* Names for these rascally Vec3f temps

* Name all the vec3fs for real this time

* world -> surface

* surfaceTangent -> forwardPos; there are many tangents, but only one is forward

* Use Elliptic's names + documentation

* worldForwardInHome -> worldPlusForwardInHome
2022-08-15 14:16:31 -04:00
Blythe f66ef00aeb
EnSGoro OK and documented (#895)
* EnSGoro OK and documented

* Format fix attempt for EnSGoro

* Requested format changes

* EnSGoro additional cleanup

* Fixed updated names

* fork merge (wip - don't review)

* Misc. formatting updates

Also had to un-eat some changes made upstream in functions.txt and variables.txt.

* A couple minor tweaks
2022-08-15 14:12:54 -04:00
Tom Overton f4f0ce7523
EnPp (Hiploop) OK and documented, object_pp documented (#997)
* EnPp OK

* Format

* Animation naming consistency

* Respond to jpburnett's review

* Animation name consistency
2022-08-09 20:44:07 -04:00
Tom Overton dbe98b9776
Document powder keg assets (#967)
* Document powder keg assets

* Add "barrel" to one of the asset names

* Update variables.txt

* ptr -> fuseSegmentPtr
2022-08-07 19:38:37 -04:00
EllipticEllipsis 91b2bc3a88
EnGe1 OK and documented, document `z_snap` (#952)
* Move PictoActor typedefs to z64actor.h

* OK, data imported

* Minor snap stuff

* Name most functions and variables

* Name most of object, apart from animations

* Document snap

* Fix actors to use the PictoActor struct

* Format

* Finish documenting EnGe1

* Finish documenting z_snap and related actors

* Format

* Review, format

* Name last couple of things

* bss

* Review

* Review

* bss

* Introduce z64snap.h, add SCREEN_TO_DEVICE macros

* Back to PROJECTED_TO_SCREEN
2022-08-04 05:53:53 +01:00
engineer124 e75d7020a9
AudioOcarina (1 NonMatching) (#911)
* AudioOcarina OK

* rm some comments

* PR Suggestions

* Add define

* cleanup
2022-08-04 05:21:50 +01:00
engineer124 6fc12c3a70
Inventory Editor Ok and Documented (z_kaleido_debug.c) (#954)
* Match Debug Menu

* Many docs and discussions

* Missed one

* A bit more

* More PR Suggestions

* phrasing

* hex health

* Fix
2022-07-23 15:44:49 -04:00
engineer124 6472f68323
Map Select: Docs and Cleanup (#962)
* Add Map Select Docs

* cleanup

* brackets

* Another typo
2022-07-23 15:30:19 -04:00
engineer124 f3f147cc3d
`z_draw` OK and Documented (#900)
* Import data for z_draw

* Match z_draw

* cleanup

* rupees

* Some object gi docs

* More documents

* Add explanation on function names

* more cleanup

* Fixed some things

* More docs

* Object docs WIP, still not done. I'll continue tomorrow

* More WIP, should just be mask gi objects left now

* Some masks done, many more to go

* cleanup

* Last masks finish

* Shield Stolen

* cleanup

* Apply various dicussions

* remove casts

* PR Suggestions

* Sync PowderKeg
2022-07-23 15:25:20 -04:00
Isghj fbb38416ca
`ovl_En_Po_Sisters` and `object_po_sisters`Documented (#930)
* EnPoSisters: basic docs back in

* EnPoSisters: some docs

* EnPoSisters: some docs

* EnPoSisters: more docs 2

* EnPoSisters: more docs

* PoSisters: documented most of object xml

* PoSisters: swapped DL

* PoSisters: more docs

* EnPoSisters: minor docs

* PoSisters: more docs

* PoSisters: fix wrong prefix

* PoSisters:Minor docks

* more doc

* more fun

* More functions named, all of them?

* doc

* EnPoSisters: docs, formater pass

* z_actor: removed comment, fixes formater

* Apply suggestions from code review

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

* PoSisters: formater

* PoSister: requested object xml changes

* Apply suggestions from code review

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

* PoSisters: remove bgId comment, add meg reverse timer comments, format

* PoSisters: megCountRemaining union and some comments, formater pass

* PoSisters: better first actionfunc name

* PoSisters: Skeleton -> Skel

* PoSisters: Formater pls

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-07-23 15:19:49 -04:00
Tom Overton 40bfef9f02
Document object_ma2 (Cremia) (#950)
* Document object_ma2 (Cremia)

* Clarify what the box is for

* Use CREMIA_LIMB_MAX in Invadepoh
2022-07-23 14:26:45 -04:00
Tom Overton ba8e12a80b
Document object_ma1 (Romani) (#948)
* Document object_ma1 (Romani)

* Sync up one of the mouth name textures with how I did it for Cremia

* Specify what the box is for

* Respond to hensldm's review

* Sync texture names with what Anghelo is doing in his Obj_Um PR
2022-07-23 14:12:36 -04:00
Tom Overton 9449ced63f
En_Syateki_Man (Shooting Gallery Man) documented (#894)
* Document a ton of syateki_man

* Document swamp actor lists

* Document animations

* Document player positions

* Document talk flags

* Name wave and spawn index

* Name everything involved in the swamp game

* A hex score I missed

* Some slight town game doc

* Document octorok flags

* Better way of doing octorok flags

* Macros for getting/setting high scores

* Update a variable I missed

* Name remaining struct vars

* Create enum for shootingGameState

* Remove anonymous unions

* hitState -> hitType

* Comment for values next to enums

* Name some more stuff

* Name stuff in Town-RunGame

* Name sGameStartTimer

* Name some more stuff

* Name all static variables

* One more round of comments and such

* Respond to hensldm's review

* GET_INDEX -> GET_ID

* Respond to Elliptic's review (or at least the parts I can respond to right now)

* More review responses

* Add some stuff to z64saves.h I missed
2022-07-23 14:06:11 -04:00
Anghelo Carvajal 3f49adb91d
`ovl_Obj_Um` OK (#887)
* Pass the whole actor in mips2c

* hacky way to fix some types

* decomp a few functions and second mips2c pass

* draw

* another mips2c pass

* some functions

* Init almost matching

* mips2c pass

* Match update and a few more

* A bunch of functions

* horses gonna horse

* func_80B7A860

* mips2c pass

* func_80B7984C

* func_80B795A0

* func_80B783E0

* func_80B78764

* Tried func_80B7BEA4

* func_80B79BA0

* func_80B7A494

* func_80B7A614

* lots of non equivalents

* fix

* Match func_80B77770

* func_80B7BEA4

* import data

* func_80B7B93C

* minor fixes

* ObjUm_Init

* func_80B7AF30

* func_80B7B18C

* func_80B7BABC

* func_80B77FA4

* func_80B7B598

* func_80B781DC is equivalent

* func_80B781DC

* func_80B7BABC

* Cleanup

* limbs

* minor members renames

* First docs pass

* small pass

* yes

* another pass

* more renames

* flags defines

* arePotsBroken

* some flags

* yet another docs pass

* Some members named

* Add weekEventReg docs

* small rename

* And more

* Another 2

* actorfixer and other fixes

* format

* Use extracted object symbols

* fixes

* Some stuff improved

* very minor naming

* format

* remove debugging stuff

* cleanup

* Some EnHorse stuff

* horse params

* ! FAKE

* Update include/functions.h

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

* review

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

* review

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

* Update assets/xml/objects/object_um.xml

* IS_BANDIT_TYPE

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

* review

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* remove a fake match

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

* Update src/overlays/actors/ovl_En_Horse/z_en_horse.h

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

* Update src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* review

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

* anim enum

* name anim enum

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* review

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

* remove repeated forward declarations

* fixes

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* comment

* review

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

* areAllPotsBroken

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

* fix merge

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>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-07-23 14:00:32 -04:00
engineer124 601f44cb7f
audio_seqplayer.c OK and partial docs (#833)
* Import audio_seqplayer progress from main audio branch

* cleanup

* Better docs

* Small fix

* More

* Cleanup and update

* PR Suggestions

* PR Suggestions

* mute flags
2022-07-22 06:21:02 +01:00
Tom Overton 7732f5e96d
Boss_02 Documentation, Part 2: Document Twinmold Param Types and name most BSS variables (#931)
* Boss_02 Documentation, Part 2: Document Twinmold Param Types and name most BSS variables

* Respond to hensldm's review
2022-07-22 05:53:14 +01:00
Tom Overton 905c089beb
Document En_Dg (dog) and do some light cleanup on En_Racedog (#926)
* Document some low-hanging fruit in EnDg

* Animation and type documentation

* Document a bunch of stuff

* Name more functions

* Params macro

* Defines for dog flags

* Name all struct variables

* Give all animations better names

* Better name for Swim2

* Document/name a bunch of stuff

* Make index enum

* Respond to engineer's review

* Respond to mzx's review

* Fix up comment (again)

* Respond to hensldm's review
2022-07-22 05:48:55 +01:00
Chloe 215164738b
ovl_Obj_Purify OK (#937)
* ovl_Obj_Purify decompiled and partially documented

* document member names

* variable names and format

* oops missed some booleans

* review fixes

* more review fixes

* even more review fixes

* rename ObjPurifyInfoList to sObjPurifyInfo
2022-07-19 12:27:01 -04:00
EllipticEllipsis 69e514b37e
EnBat OK and documented (#924)
* OK, start documentation

* Name some more stuff

* Name rest of functions and bss var, tidy up floats

* Document object and paramflags

* Cleanup bat

* Cleanup crow

* Cleanup firefly

* Couple of minor things in arrow

* Review 1

* PLAYER_STATE

* Remove unnecessary f32 casts

* Review

* Review
2022-07-19 12:16:36 -04:00
Alejandro Asenjo ba886cc8fa
ovl_Dm_Al Decompiled + Some Documentation (#913)
* all functions matching, data isn't?

* cleanup in progress

* ovl_Dm_Al Decompiled

* pr review

* Documentation Fixes and new entries

* forgot one

* pr review
2022-07-19 12:01:26 -04:00
Alejandro Asenjo abf70f6dd2
ovl_Eff_Kamejima_Wave Decompiled (#908)
* almost there

* ovl_Eff_Kamejima_Wave Decompiled

* Us removal

* minor clean up

* pr review

* review

* sikihi rollback and function name fix

* params rename

* SetVtxAlpha

* params prefix

* Jenkins re-run
2022-07-19 11:54:30 -04:00
engineer124 8e45eb7b1f
`z_parameter`: Items & Import Data (#799)
* Import Data

* More functions

* cleanup

* Add Enum

* Many changes, PR and add-ons

* Fix bss

* Better data

* Extra space

* DoubleDefense is boolean

* Missed a macro

* More enums missed

* macro -> enum

* More item cleanup...

* missing/wrong quest items

* Next PR Review

* Revert Interface_AddMagic to Parameter_AddMagic

* Remove QUEST_HEART_CONTAINER

* Fix bss

* Move Color_RGB16 up + fix incorrect numbers

* Add texture pointers

* Add comment

* EQUIP_SLOT_A

* rm redundant comment

* Fix merge

* PR Suggestions

* fix bss
2022-07-12 00:45:55 -04:00
Anghelo Carvajal 87506f7c19
`z_player_lib`: Part 1 (#688)
* fix some symbols and file splits

* PLAYER_STATE macros

* Move over a few functions

* AP functions and update struct

* another small bunch

* Add player_lib prototypes

* A few more functions

* Some fixes and add stuff to actorfixer

* format

* bss

* Elliptic's review

* Engineer's review

* Some renames and cleanups

* bss

* A bit of cleaning up

* Player_DrawZoraShield

* format

* actorfixer, bss and format

* Forgot to merge master again

* Rename some LinkGoron dlists

* PlayerMeleeWeaponAnimation enum

* format

* actorfixer, bss and format

* more bss

* actorfixer

* format

* actorfixer and format

* bss

* Update src/code/z_player_lib.c

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

* sEnvironmentTextTriggers

* Update include/z64save.h

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

* Update src/code/z_player_lib.c

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

* Update src/code/z_player_lib.c

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

* Update src/code/z_player_lib.c

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

* breman mask march comment

* fix

* fixes

* bss

* RESPAWN_MODE_RETURN

* review

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

* format

* Engineer's review

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

* Update src/code/z_player_lib.c

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

* review

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

* Update include/z64player.h

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

* review

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

* format

* unused mwas

* fixes

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-07-11 23:43:46 -04:00
Derek Hensley 85b19de4ab
General Cleanup 4 (#871)
* PartTimerWorker -> PartTimer

* cleanup

* format

* objChan draw macro

* Fix macro

* Fix warning

* PR Review

* Missed 1 ull

* UINT16_MAX

* Remove todo from footmark

* Remove * from tex in AnimatedMat_DrawTexCycle
2022-07-11 23:06:21 -04:00
Tom Overton acb9216daa
Document object_uch (Aliens) and remove a dummy label match in EnInvadepoh (#899)
* Document object_uch (Aliens)

* Remove dummy label match that has been annoying me for a year!!!!!!!!!!!!!

* Respond to reviews

* Fix a small thing brought up in review

* Swap to gAlienJerkingAnim
2022-07-11 22:52:43 -04:00
Anghelo Carvajal 45eed680d6
`code_8013EC10` and `code_80182CE0` (`z_rumble` and `sys_rumble`) (#763)
* First pass

* import bss

* cleanup warnings

* PadMgr_ControllerHasRumblePak

* z64rumble.h

* rename file to z_rumble.c

* format

* Update src/code/z_rumble.c

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

* Update src/code/z_rumble.c

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

* name a temp

* minor cleaning

* bss

* match code_80182CE0

* import data and cleanups

* Rename RumbleManager struct and sys_rumble file

* Rename functions from sys_rumble

* Rename parameter to distSq

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

* more notes and a bit of cleaning

* Name Rumble_Add and Rumble_AddForced

* some extra notes

* Rename Rumble_Override and Rumble_Request

* document states

* minor renames

* actorfixer

* format

* very minor docs

* whoops

* remove redundant prevent_bss_reordering

* Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c

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

* Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c

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

* Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c

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

* namefixer

* Update src/code/sys_rumble.c

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

* fix

* Elliptic review

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

* minor cleanups

* Update include/z64rumble.h

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

* review

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

* Update src/code/sys_rumble.c

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

* Update src/code/z_rumble.c

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

* review

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

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-29 22:08:03 +01:00
Tom Overton 158d1b26b0
PlayState rename (#835)
* PlayState rename

* Make this work with the latest master and run format

* Respond to hensldm's review

* Respond to Elliptic's review

* Add Effect_GetPlayState to namefixer.py

* Add missed comma
2022-06-26 11:57:37 -04:00
Derek Hensley 37d3934e2c
Code_800E8EA0 Docs (#832)
* Start

* Add notes from OOT

* D_801D0D50 -> gDbgCamEnabled

* Rotation Functions

* Text function

* RotateBack -> RotateForward

* Flags functions

* Document rotation func returns

* Remove comment from play

* Rename play function, add notes about Flags, add notes about focus

* Update notes a little

* Update src/code/code_800E8EA0.c

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

* Fix apostrophes

* Bring over OoT changes

* TurnTo -> Track in SubS systesm

* format and remove OoT specific comment

* Remove old comments

* namefixer

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-06-20 01:16:30 +01:00
Derek Hensley d318b1f285
SubS Time Paths (Finale) (#823)
* Merge in sub_s_models

* Update subs DL names

* Unused Weight pathing

* Function headers for weightpathing

* TimePathing WIP

* Timepathing, still unsure about unk184

* Move subs functions from functions.h to z64subs.h

* Add fake comment

* Some cleanup and renames

* Renames/cleanup of actors that use timepath

* Cleanup

* More cleanup

* Rename unk stuff

* Merge in upstream/master

* TimeElapsed -> elapsedTime

* Fix

* Final cleanup

* Fix waypoint comments

* Review pt. 1

* Add clarifying comment to SubS_TimePathing_FillWeightArray

* format.sh

* Fix order comments

* weightArray -> knots

* Review pt 1

* Review pt 2

* Update src/code/z_sub_s.c

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

* Update src/code/z_sub_s.c

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

Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-20 00:49:20 +01:00
EllipticEllipsis af0123de1e
`z_fcurve_data` OK, match last function in `z_fcurve_data_skelanime`, document SkelCurve system (#776)
* Match SkelCurve_Update

Co-authored-by: Kelebek1 <34639600+Kelebek1@users.noreply.github.com>

* Match and document z_fcurve_data

* Begin documenting SkelCurve

* More documentation

* Deformat header

* Pluralise knotCount

* Sort out jointTable

* Rename frameCount

* Format

* More documentation

* Cleanup on DemoEffect

* Remove space on typedef

* Format, couple of fixes in the header

* Review

* Oops

* Fix EnBox, DemoTreLgt, use macros in EnTorch

Co-authored-by: Kelebek1 <34639600+Kelebek1@users.noreply.github.com>
2022-06-19 03:38:10 +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
Derek Hensley 271b7c7827
Gfxprint OK (#826)
* Match last two functions as well as some cleanup

* One more small cleanup

* Reviews

* format

* Move internal GFXP_FLAG defines to c file

* Format
2022-06-19 02:56:10 +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
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
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