engineer124 and GitHub
dfd00a8c1f
Match 3 functions ( #964 )
2022-07-23 15:09:55 -04:00
Chloe and GitHub
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
engineer124 and GitHub
260be2c36b
Hex Cleanup ( #960 )
...
* Hex Cleanup
* PR Suggestions
2022-07-23 14:57:47 -04:00
Tom Overton and GitHub
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
engineer124 and GitHub
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
engineer124 and GitHub
5f6c3df4ce
Transition System Docs ( #883 )
...
* Transition docs from OoT
* Cleanup
* Missed a spot
2022-07-22 15:05:20 +01:00
engineer124 and GitHub
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
EllipticEllipsis and GitHub
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
EllipticEllipsis and GitHub
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
engineer124 and GitHub
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
engineer124 and GitHub
fda5da2500
Introducing z64camera.h ( #797 )
...
* Introduce z64camera.h
* format
* Oops
* Change paramData to u8
* BINANG_TO_DEGF and DEGF_TO_BINANG to z64camera.h
* Fix bss, thanks Anon
* Update with docs from OoT
* Cleanup
* Fix activeCamId
* underwater
* remove interface alpha stuff
* Oops
* To Hex
* Cleanup cam settings comments
* PR Suggestions
* More PR Suggestions
* trackActor -> focalActor
* Fix merge
* Fix bss, thanks Anon
2022-07-12 00:25:40 -04:00
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
Tom Overton and GitHub
e9d4b31c3d
z_map_exp OK and somewhat documented ( #877 )
...
* z_map_exp OK
* some names
* Some more docs
* Update prototypes in functions.h
* Use reg name
* namefixer
* Respond to review
* Respond to review
* Respond to review
* Add some blank lines after breaks, whoops
* Respond to review
* Respond to Engineer's review, pt 2
* Respond to Engineer's review, Pt 3
* Add newline char to end of z64map.h
* Respond to engineer's review, Pt 4
* Respond to multiple reviews
2022-07-11 23:23:01 -04:00
engineer124 and GitHub
ab6ef2535e
Match and Document code_80172BC0.c ( #909 )
...
* Match code_80172BC0.c
* Better match
* brackets
* Fix
2022-07-11 23:14:07 -04:00
Derek Hensley and GitHub
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
2995d72965
ovl_En_Fall2 OK (#916 )
...
* `ovl_En_Fall2` decompiled
* Suggested changes
* Minor suggestions
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Don't commit directly from github
* Define vertices in xml, add macro
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
2022-07-11 22:44:19 -04:00
Lucas and GitHub
9726a30109
ovl_En_Part OK (#903 )
...
* `ovl_En_Part` decompiled
* Suggested changes
* Rename body part displaylist
* Suggested changes
* Rename displaylist and params enum
* Remove randvar, rename enum from params to type
2022-07-11 22:32:35 -04:00
Derek Hensley and GitHub
0346fde02b
Effect Gsplash OK ( #876 )
...
* Ok
* Save?
* undef syms
2022-07-11 21:51:56 -04:00
Derek Hensley and GitHub
f85a398162
Effect Hahen Ok ( #875 )
...
* OK
* format
* gameplay keep
* undef syms
* drawFlags -> params
* Format
* Fix railskb include
* DL consistency with OoT
* Hex
2022-07-11 21:48:37 -04:00
Derek Hensley and GitHub
94372c3670
Effect Hitmark Ok ( #874 )
...
* OK
* gameplay keep
* undef syms
* Cleanup
* format
* HitMark -> Hitmark
* Remove EffectSsHitmark_Spawn from functions.h
* PR
2022-07-11 21:45:03 -04:00
Chloe and GitHub
78a29fb17b
ovl_Dm_Char02 decompiled ( #869 )
...
* ovl_Dm_Char02 decompiled
* remove m2c comments
* remove ovl_Dm_Char02 data in spec
* ran format.sh
* fix format version
* use our reloc
* fix reviews
* rename context/playstate structs
* format
* more review fixing
* even more review fixing
2022-07-11 21:37:42 -04:00
Alejandro Asenjo and GitHub
35961a7cb9
ovl_Demo_Getitem decompiled ( #861 )
...
* ovl_Demo_Getitem decompiled
* * PlayState
* PR reviews
* pr review changes
* renaming
* objectIndex
2022-07-11 21:13:29 -04:00
engineer124andGitHub
ChloeandGitHub
Tom OvertonandGitHub
Alejandro AsenjoandGitHub