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
363a7cda46
ovl_Oceff_Wipe4 OK ( #1007 )
...
* ovl_Oceff_Wipe4 decompiled
* pr review
* renamings
* renamings
* Material -> Model
* pr review
* Magic_Reset
2022-09-27 03:35:50 +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
6fab0f962c
Fix up some actor descriptions ( #1059 )
...
* Fix up some actor descriptions
* Respond to Elliptic's review
* Add ObjDowsing description
* Respond to hensldm's review
* Fix bad find-replace issue
2022-09-24 16:24:39 -03:00
96986bc3f1
Cleanup some "raw" actor flags ( #1044 )
...
* Cleanup some "raw" actor flags
* Respond to Anghelo's review
2022-09-24 16:20:12 -03:00
3d24a8be68
Document object_bdoor (Boss Doors) ( #1087 )
2022-09-24 16:15:18 -03:00
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
c222747977
Object_trt documented + other shopkeeper cleanup ( #1081 )
...
* trt skel
* Some cleanup
* Textures
* Better Tex names
* Small renames
* Animations
* Animation enum
* trt2
* format
* Update assets/xml/objects/object_trt.xml
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update assets/xml/objects/object_trt.xml
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Whitespace
* HairPiece -> Braid
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-09-24 16:03:34 -03:00
6bd4b58eb5
Document object_gs (Gossip Stone) ( #1078 )
...
* Document object_gs (Gossip Stone)
* Fix one of the names
2022-09-24 15:58:48 -03:00
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
a390da9b56
Document object_warp1 (blue warp, warp crystal, boss warp) ( #1075 )
...
* Document object_warp1 (blue warp, warp crystal, boss warp)
* Fix description for actor
2022-09-24 15:45:46 -03:00
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
be121f7dd7
Document Song of Time Clock assets in gameplay_keep ( #1068 )
2022-09-24 15:34:59 -03:00
4088aea3f7
Document object_lotus (lily pad) ( #1067 )
2022-09-24 15:28:49 -03:00
62502ac22f
Document object_mtoride (Woodfall scene objects) ( #1062 )
...
* Name everything in object_mtoride
* Get ready for PR
* Update some of the names
2022-09-24 15:21:01 -03:00
fd5ff73a35
Extract assets from link_animetion ( #1056 )
...
* Extract assets from link_animetion
* Add empty last line
2022-09-24 15:14:59 -03:00
c23112c855
ovl_En_Bee OK ( #1086 )
...
* all functions matching
* initial cleanup
* tatl hint
* clean up + SFX
* SFX
* more SFX
* func_800B3030
* SFX FIX
* castings
* clean up
* array of Vec3f
* for loop fix (Thanks @Maide)
* ACTORCAT_ITEMACTION
* a few nits
* ACTORCAT_ENEMY
* actor struct size restored
* ACTORCAT_ENEMY
* Update src/overlays/actors/ovl_En_Bee/z_en_bee.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* parenthesis
* parenthesis
* merge fail
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-09-24 15:07:11 -03:00
d968e58f9c
Obj_Kendo_Kanban OK and Documented (Decomp was mostly done already) ( #1057 )
...
* stuff
* Renaming in-process
- Changed action names and setup names based on examples.
- Undid some ill-advised changes that broke matching.
- Misc variable naming. Need verification and not all complete.
* wip renaming
* A bit more progress on determining names for everything.
* Done with naming.
* Touchup before review
* Updates from review:
- Leave displacementY/unk_AC0 naming to z_actor work.
- Remove unnecessary include of z64math.h, indirect inclusion preferred
- Add trailing comma for better formatting of sDisplayLists
- Rename of static vectors sNullVec3f->sZeroVec, sUnitVectorX->sUnitVecX
- Restore pad instead of using local const. Change const to #define
- Prefer index over idx
- Remove 'b' prefix from bHasNewRootCornerPos
- Const -> Enum and formatting in ObjKendoKanban_IsPlayerOnTop
- Rename 'Aerial' to 'Tumble'
* Missed items in review:
- Missed an instance of displacementY->unk_AC0 renaming (Cause of build failure)
- Whitespace formatting
- UNK_TYPE2 undo
* More adjustments from review:
- Undo accidental formatting changes to z64player.h, restoring to master.
- Naming and Formatting changes.
- Removing some comments.
* From review, qualify enum and #define with obj name, whitespace cleanup.
2022-09-24 15:00:53 -03:00
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
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
77be902c25
Effect Bomb2 Ok ( #1039 )
...
* OK
* PR
2022-09-24 14:31:20 -03:00
1402db4008
Effect Dfire OK ( #1038 )
...
* OK
* rename function
* MTXMODE enum
* PR
* Format
* % -> &
* note
2022-09-24 14:26:08 -03:00
b5a9189cef
Effect Deaddb OK ( #1037 )
...
* OK
* Add description
* format
* Fix EffectSsDeadDbInitParams size comment
2022-09-24 14:21:08 -03:00
71e4046415
Effect Deadds OK ( #1018 )
...
* OK
* cleanup
* Fix merge
* Small cleanups
2022-09-24 14:15:48 -03:00
fb4ca3fb17
Effect DtBubble OK ( #1017 )
...
* OK
* Some cleanup
* Format
* Name enum
2022-09-24 14:09:46 -03:00
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
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
85e141128b
set LANG variable to C ( #888 )
...
Co-authored-by: Loïs <loislag@outlook.fr>
2022-09-14 13:39:55 -03:00
aa6841a33b
ovl_Oceff_Wipe2 OK ( #1006 )
...
* ovl_Oceff_Wipe2 Decompiled
* pr review
* renamings
* renamings
2022-09-14 13:21:02 -03:00
420403a09a
ovl_En_Encount1 OK ( #1005 )
...
* 1 Non matching
* all functions matching
* new reloc problems
* Documenting
* ovl_En_Encount1 decompiled
* Co-authored-by: Synray synray@users.noreply.github.com
* Co-authored-by: petrie911 petrie911@users.noreply.github.com
* Co-authored-by: Fig02 fig02srl@gmail.com
* Co-authored-by: Maide eeeedddccc@hotmail.co.uk
* Co-authored-by: EllipticEllipsis EllipticEllipsis@users.noreply.github.com
* uncomment old reloc
* pr review
2022-09-14 13:12:31 -03:00
33f7ede84f
ovl_Oceff_Spot OK ( #1004 )
...
* ovl_Oceff_Spot decompiled
* format
* renamings and pr review
* pr review
* pr review
2022-09-14 13:07:46 -03:00
e47dc7da25
ovl_Oceff_Wipe3 OK ( #1001 )
...
* all functions matching
* ovl_Oceff_Wipe3 decompiled
* bss
* pr review
* pr review
* renamings
* pr review
2022-09-14 12:57:47 -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
3d430a5733
En_bubble OK ( #995 )
...
* bubble OK
* fixing elfbulb
* flag fix
* PR comments
* PR comments
* missed a fix
* PR fixes
* don't know how this got in there
* u to s
* small fix
2022-09-14 12:46:16 -03:00
90ade1be9f
ovl_En_Js Decompiled ( #991 )
...
* progress
* progress
* func_80968E38 (thanks @engineer124)
* progress
* remove comments
* general cleanup
* warnings
* all functions matching
* macros
* final details
* format
* ovl_En_Js Decompiled
* PLAYER_AO enums
* fix
* pr review
* re preview
* pr review
* pr review
* pr review
* resolving after merge
* conflict resolution
* pr review
* pr review
* pr review
2022-09-14 12:37:21 -03:00
98501be8df
Obj_Usiyane ( #902 )
...
* Obj_Usiyane
* PR
* RP
* PR
2022-09-14 12:32:22 -03:00
bb96e47f8d
General Cleanup 11 ( #992 )
...
* char -> UNK_TYPE1
* SubS fixes
* func_800B8500
* macros
* misc
* A few more GET_{ACTOR} vs {ACTOR}_GETw
* More Macros
* fix
* PARSE_TYPE -> GET_TYPE
* 1 more
2022-08-15 21:42:21 -04:00
f3a51c5403
General Cleanup 10 ( #990 )
...
* limbs -> limb
* Generated limbs
* Fix ENUMNAME
* goronLink fix
* actually save
* Boss011Limbs -> Boss011Limb
* keep skeletons
* remove comments
2022-08-15 20:40:41 -04:00
a67571c2bf
Purge `ExchangeItemID` enum ( #1026 )
...
* Purge ExchangeItemID enum
* Add stff to namefixer
* Rename FISHING_ROD
2022-08-15 15:04:42 -04:00
0f130c173d
Fix `EnHorseAction` enum ( #1022 )
...
* Fix enum
* Fix some constants
* ENHORSE_ACT_MOUNTED_IDLE_WHINNYING
* ACT -> ACTION
2022-08-15 15:01:07 -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
Tom Overton