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
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
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
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
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
5e860dd3e7
`z_parameter`: Hud Visibility ( #942 )
...
* Begin interface alpha docs
* More Interface Alpha
* cleanup docs
* Minor fixes
* Apply Discord Discussions
* More discussions
* More suggestions from OoT
* fix merge
2022-09-28 19:47:46 -03:00
77d8e386a3
Add comments to everything in the scene enum ( #1052 )
...
* Add comments to everything in the scene enum
* Respond to isghj5's review
* Respond to Elliptic's review
2022-09-27 13:42:15 +01:00
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
72d24b9995
Give Deku Princess/King/Butler's objects the "correct" name ( #1084 )
...
* Give Deku Princess/King/Butler's objects the "correct" name
* Document the actor/object discrepancy in the actors
* format
2022-09-27 00:59:31 +01:00
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
6d6304d1a0
Gamestates Cleanup ( #1047 )
...
* Setup
* ConsoleLogo
* TitleSetup
* MapSelect
* FileSelect
* Daytelop
* Save file
* PreNMI
* Final cleanup and format
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* DayTelop
* Split off setup
* split of prenmi
* readd SET
* shorten some gamestate member names
* Add comment about init
* Update include/z64.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Small cleanup of comments
* PR
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-09-24 16:40:40 -03:00
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
37a9b8e3c4
ActorContext Flags ( #1060 )
...
* actor context flags
* bracket cleanup
* comment out recursive name-fixer
* Empty-Commit
2022-09-24 16:29:21 -03:00
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
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
71a18d70cf
OK ( #1040 )
2022-09-24 14:36:55 -03:00
1402db4008
Effect Dfire OK ( #1038 )
...
* OK
* rename function
* MTXMODE enum
* PR
* Format
* % -> &
* note
2022-09-24 14:26:08 -03:00
2c6816ba77
Add enum for tatl hint id ( #993 )
...
* first round, need to investigate the others
* naming the remainder
* changed my mind on the name
* foooooormat
* fixing a number
* ...another one...
* names galore
* PR feedback
* fixing
* fixes
* 4mat
* adding "POE_SISTER"
* forgot a rename
2022-09-14 14:01:06 -03:00
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
bf26065867
EnAz and EnTwig (Beaver bros and the minigame rings) ( #999 )
...
* leave it to beavers
* match
* merge
* catchup part 2
* fix warnings
* I accidentally the xml
* hopefully that's all of them
* lol merge
* linked object
* now with more enums
* Update src/overlays/actors/ovl_En_Az/z_en_az.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* more fixes
* limbs and maths
* stuff
* more macro management
* last enum?
* more fixes
* fixed
* entrances
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-09-14 12:51:10 -03:00
a67571c2bf
Purge `ExchangeItemID` enum ( #1026 )
...
* Purge ExchangeItemID enum
* Add stff to namefixer
* Rename FISHING_ROD
2022-08-15 15:04:42 -04:00
c5254084c2
Matched several functions ( #1020 )
...
* matchmaker, matchmaker
* more matches
* one fix
* I'll format you good
* cleanup
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
2022-08-15 14:55:42 -04:00
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
132dd6a373
Entrance Macro ( #987 )
...
* POC
* fix
* Fix typo
* token POC
* The rest
* small cleanup
* More small cleanup
* ENTRANCE
* arg renames
* EntranceIndex -> Entrance
* format
* PR
* PR2
* Remove layer from entrance macro
* namefixer plus comments
* format
2022-08-15 14:45:28 -04:00
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
0082c299c6
Decompile Camera Helper Functions ( #1023 )
...
* helper functions
* more pr suggestions
2022-08-15 14:36:33 -04:00
d9a10948d3
aisetnextbuf.c OK (code_80194790.c) ( #982 )
...
* aisetnextbuf OK
* format
* Function headers
* Add comment
2022-08-09 20:49:20 -04:00
a80637fd59
Decompile and Document Camera `z_play` functions ( #933 )
...
* Document z_play camera functions
* cleanup function names
* PR Suggestion
* Fix master merge, add comments
* fix merge
* small fix
Co-authored-by: angie <angheloalf95@gmail.com>
2022-08-09 20:01:55 -04:00
b716e76d3e
Effect EnFire OK ( #977 )
...
* OK
* Gameplay keep fire
* &
* &2
* PR
* Fire textures
* Second mask
2022-08-07 19:59:23 -04:00
9a4319827b
General Cleanup 9 ( #961 )
...
* small z64animation cleanup
* z64
* actor
* bgcheck
* collisioncheck
* curve
* cutscene
* effect
* item
* light
* math
* player
* save
* save
* schedule
* skin
* transition
* Remove leading 0s from size = 0x10
* z64schedule enum
* PR
* enums
2022-08-07 19:43:58 -04:00
d0313fa766
Effect EnIce OK ( #976 )
...
* Ok
* Material/Model
* Cleanup
* format
* IceFragment Assets
* PR
2022-08-07 19:29:03 -04:00
bc3883d098
Effect Fhgflash OK ( #975 )
...
* OK
* format
* extract tex explicitly
* FHGFLASH_SHOCK_NO_ACTOR
* typo
* Hitmark
* sZeroVec
* eff
2022-08-07 19:24:05 -04:00
d88aa7ebbe
En_Paper ( #923 )
...
* En_Paper
* PR
2022-08-07 18:47:00 -04:00
29bf8142b9
Introduce Sfx Tables ( #927 )
...
* SfxTables
* Fix indexing
* fix voice text
* Rename with ordering
* Restore defines
2022-08-04 06:04:13 +01:00
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
e75d7020a9
AudioOcarina (1 NonMatching) ( #911 )
...
* AudioOcarina OK
* rm some comments
* PR Suggestions
* Add define
* cleanup
2022-08-04 05:21:50 +01:00
4693978015
ovl_Shot_Sun Decompiled ( #905 )
...
* matching functions, warnings and data pending.
* ovl_Shot_Sun Decompiled
* space
* pr review
* unk1202E -> lastPlayedSong Rename
* defines
* OCARINA_SONG enums
* format
* OCARINA_SONG Enums
* pr review
* pr review
2022-07-24 10:15:16 -04:00
04dd8d7b62
Decompile/Document bgCam and actorCsCam (combination of Camera/BgCheck/Play) ( #932 )
...
* Document bgCam and actorCsCam
* index
* Small PR suggestions
* small suggestions
* player stateflags
* Fix bss
* Fix BSS
* Fix bss
* Fix bss
2022-07-23 15:51:14 -04:00
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
6472f68323
Map Select: Docs and Cleanup ( #962 )
...
* Add Map Select Docs
* cleanup
* brackets
* Another typo
2022-07-23 15:30:19 -04:00
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
dfd00a8c1f
Match 3 functions ( #964 )
2022-07-23 15:09:55 -04:00
cde8874bb1
ovl_Dm_Char03 OK ( #963 )
...
* Decompile ovl_Dm_Char03
* review fixes
* more review fixes
* remove leading zeroes
2022-07-23 15:05:04 -04:00
260be2c36b
Hex Cleanup ( #960 )
...
* Hex Cleanup
* PR Suggestions
2022-07-23 14:57:47 -04:00
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
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
addfe3a613
Decomp `Message_GetState`, add `TextState` enum and some header reorganization ( #919 )
...
* Message_GetState
* Rename msgCtx->msgLength
* Replace some enums
* TEXT_STATE_CLOSING
* use enum on switches
* use enum when assigning to a variable
* some minor cleanups
* minor cleanup
* TEXT_STATE_CHOICE
* remove unused temp
* z64message.h and z64view.h
* steal some stuff from OoT
* add some stuff to namefixer
* fix shift
* minor doc comment
* Update MessageContext struct from andzura's branch
Co-authored-by: Andzura <11079691+Andzura@users.noreply.github.com>
* some other TextState uses I missed
* format
* statetimer in dec
* review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* format
* Batch () commit
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* format
* bss
* use text state defines on new actors
* fix matching
* bss
Co-authored-by: Andzura <11079691+Andzura@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-07-22 20:51:20 +01:00
f2b628241d
Cleanup SubCameras ( #936 )
...
* Cleanup SubCameras
* Add small bit of docs, remove comments
* Fix merge from master, missed test7
2022-07-22 15:24:37 +01:00
5f6c3df4ce
Transition System Docs ( #883 )
...
* Transition docs from OoT
* Cleanup
* Missed a spot
2022-07-22 15:05:20 +01:00
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
engineer124