Commit Graph
112 Commits
Author SHA1 Message Date
Derek HensleyandGitHub 03c8d46ed2 Slowly Cleanup (#1213)
* Add slowly.h

* Init and destroy

* File header
2023-03-20 00:48:49 +11:00
engineer124andGitHub a17949e730 Document z_en_time_tag (#1140)
* time-tag docs

* simplify enums

* PR Reviews

* PR Suggestions

* small change

* small fix

* PR Suggestions

* add extra func ref

* rm raw text from first actor I decompiled

* Stock Pot Inn

* fix master merge
2023-03-16 13:47:38 +11:00
2987390a20 Audio seqplayer.c: AudioSeq_ to AudioScript_ (#1202)
* AudioSeq_ to AudioScript_

* Update src/audio/lib/playback.c

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

* format

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-03-15 11:09:49 +11:00
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
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
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 HensleyandGitHub 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
engineer124andGitHub 9b33e6a3a5 rename audio files (#1188) 2023-03-08 00:14:43 -03:00
engineer124andGitHub e8f906100b NPC Tracking (#1184)
* npc tracking

* fix func declaration

* more cleanup

* rm named var

* more cleanup
2023-03-07 23:33:16 -03:00
engineer124andGitHub cc8772a896 Name Actor_PlaySfx and Player_PlaySfx (#1190)
* name funcs

* namefixer

* function comments
2023-03-03 00:09:16 -05:00
engineer124andGitHub 5729b6d3f1 actor math cleanup (#1187) 2023-03-02 21:16:00 -03:00
Derek HensleyandGitHub 5941e09b22 Fbdemo (TransitionTile) OK (#1163)
* Fbdemo OK

* Cleanup

* sync and format

* Fix functions.h

* format

* SQ
2023-02-21 15:36:56 -03:00
engineer124andGitHub 6f60872ddb Lens docs (#1123)
* match MirRay_ReflectedBeam

* match Actor_DrawLensActors

* match func_80B9E8D4

* lens docs

* more lens docs

* fix

* cleanup

* move define down

* Actor_AddToLensActors

* small comment adj

* add one more comment

* fix bss
2023-02-21 15:06:22 -03:00
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 0da1ebcaed69a3ce0fbd5942460b67f80f0e15e7.

* 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
mzxrulesandGitHub 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
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
a5425e4ffc Import EnAObj's data and a few cleanups (#1111)
* try to import data

* bss

* spec

* name actionfuncs

* macros for params

* review

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

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-12-08 16:47:03 -03:00
engineer124andGitHub 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
engineer124andGitHub 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
engineer124andGitHub 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
engineer124andGitHub a0c65bb3c6 z_parameter: Textures (#1076)
* match and doc texture functions

* name suggestions @Tharo

* << 2 as much as possible

* gfx

* fix merge

* texture docs
2022-11-08 19:46:30 +00:00
mzxrulesandGitHub 577a4a772b Fix last two functions in sys_math_atan (#1066)
* Fix extra Atan2 funcs

* format

* make Math_GetAtan2Tbl private

* rename Depr to XY

* ./format.sh i loathe thee

* namefixer.py changes
2022-11-07 21:21:51 -03:00
a8c7a5bb89 Player preparation 1 (#1058)
* Bring over new stuff from player.h

* door type

* PlayerModelGroup

* CSMODE

* PLAYER_PARAMS

* functions.h

* item.h

* a

* format

* ED

* stuff

* Magic_Reset

* bodyPartsPos

* format

* review

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

* format

* params and fixes

* GetItemId

* yes

* 2

* warnning

* closestSecretDistSq

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

* Name the other PLAYER_DOORTYPE

* review

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

* remove pyelftools

* PlayerActionParam Player_GetExchangeItemId

* Update include/z64animation.h

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

* bss

* bss

* fix linkanimation warning

* bss

* bss

* format

* fix

* namefixer

* format

* fix

* fixes

* namefixer

* bss

* fixes

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2022-11-06 20:49:04 -03:00
engineer124andGitHub c6ec00f0dd Match func_80142440 (z_vr_box.c OK) (#1127)
* match func_80142440

* run full formatter

* docs and cleanup

* PR Suggestions
2022-10-28 02:28:33 +01:00
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