918e263e78
merge master
2022-09-30 10:09:44 -04: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
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
1c8d95d04b
merge master
2022-09-25 18:48:20 -04: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
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
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
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
16758bd7bd
Play_Draw WIP Thanks @petrie911
2022-08-20 16:57:11 -04:00
a0f786c2ad
small docs
2022-08-20 12:00:43 -04:00
9001ed07b7
slightly more docs
2022-08-20 11:47:33 -04:00
8673cbe677
cleanup Play_Update
2022-08-20 11:21:40 -04:00
b4463f0d5f
import transition docs from OoT
2022-08-20 02:03:34 -04:00
6476e90bb7
Match func_80166B30 and diff fake match in Init
2022-08-19 17:37:12 -07:00
28ef080dbf
more docs and cleanup
2022-08-19 19:30:53 -04:00
36ce1ab877
add docs from debug
2022-08-19 19:16:59 -04:00
e975c4df38
cleanup
2022-08-19 18:41:33 -04:00
a1ed41ecea
match Play_Main thanks to debug
2022-08-19 18:22:55 -04:00
dd363101b7
Matched func_801691F0
2022-08-19 00:12:00 -07:00
e1c17c5da3
Match func_80168DAC
2022-08-19 00:01:29 -07:00
afffe39763
Match func_80167F0C
2022-08-17 21:44:34 -07:00
f5e71876ef
Match func_80167DE4 (from debug)
2022-08-17 21:19:40 -07:00
5b6043cf6d
small fixes
2022-08-16 15:25:50 -04:00
6693c168a8
cleanup, fake match Play_Init
2022-08-16 15:22:21 -04:00
6ab0b075cd
Bring over progress from another branch
...
Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com >
2022-08-15 23:35:50 -07:00
a67571c2bf
Purge ExchangeItemID enum ( #1026 )
...
* Purge ExchangeItemID enum
* Add stff to namefixer
* Rename FISHING_ROD
2022-08-15 15:04: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
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
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
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
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
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
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
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
c8c55a15d3
EnBjt OK and documented ( #912 )
...
* OK, data imported
* Fix some typos
* Start docs
* Struct almost finished
* Start object, add state enum
* undefined_syms
* Finish object, name some more stuff
* Name a few states and another function
* PlayState
* Minor tweaks in z_room and z_sub_s
* Complete documentation
* spec
* Review 1
* functions.txt
* Schedule result enum
* Rename schedule results
* Review
* Remove update comments
* Inventory_DeleteItem
* PLAYER_STATE
* Format
* Review
* Update struct name
2022-07-22 05:17:06 +01:00
cbeeeb172a
EnBaba Documented (Bomb Shop Lady) ( #825 )
...
* 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
* SubS Time Paths
* Still needs dialog action functions
* Fix waypoint comments
* Review pt. 1
* Baba review
* ScheduleResult -> ScheduleOutput
* Forgot to update functions.txt oops
* Add clarifying comment to SubS_TimePathing_FillWeightArray
* format.sh
* Finish up docs
* Fix order comments
* Fix
* Change bombShopkeeper struct member to
* Fix a few merge mistakes
* Add ScheduleOutput to namefixer
* format
* Format and fix merge
* Review
* PR
* z64schedule.h
* text summary
Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com >
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
2022-07-22 05:05:28 +01:00
engineer124