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
2f1e7b3de8
Stack cleanups ( #1193 )
...
* Use STACK and STACK_TOP everywhere
* format
* remove fake variable
* bss
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* Update src/boot_O2_g3/boot_main.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* review
* renames
* more renames
* and more
* whoopsie, forgot those too
* hopefully the last cleanup
* forgot some stuff
* a
* bss
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
2023-03-08 15:25:51 -03:00
Derek Hensley and GitHub
9f529aaf2a
HF progress script ( #1200 )
2023-03-08 13:54:56 -03: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 Hensley and GitHub
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
engineer124 and GitHub
9b33e6a3a5
rename audio files ( #1188 )
2023-03-08 00:14:43 -03:00
engineer124 and GitHub
e8f906100b
NPC Tracking ( #1184 )
...
* npc tracking
* fix func declaration
* more cleanup
* rm named var
* more cleanup
2023-03-07 23:33:16 -03:00
e50ab59cf7
Documented object_sth and object_ahg, both used by EnSth (Moon gazer who wants to buy Ocean spiderhouse) ( #1169 )
...
* object_sth/object_ahg: docs
* Ssh: formatter
* Apply suggestions from code review
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com >
* Oops missed one
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com >
* Seth: fixes
* Sth: more requested changes
* Apply suggestions from code review
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* Sth/Ahg: requested changes
* Apply suggestions from code review
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
* Sth: further function name requested changes
* Sth: minor note
* Sth: fix animation name
* Sth: forgot to rename saved flag
* Seth: change ocean wallet week reg name
* Sth: some requested changes
* Sth: fixed week event reg, added more
* Sth/Ssh/Si: changed from two defines to 1
* Si/Sth/Ssh: mistook fanfare for sfx, token define renamed
* Sth/Ssh/Sekihi: requested changes and some weekregflag docs
* Sekihi: fix missing header for skull count
* Sekihi: moved flag description to z64save
* Sekihi: moved flag description to z64save
* Sth: removed flag
* Update include/z64save.h
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
---------
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com >
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com >
2023-03-07 20:54:12 -03:00
engineer124 and GitHub
e8f3039264
speedXZ -> speed ( #1186 )
...
* speedXZ to speed
* brackets
2023-03-03 11:07:51 -03:00
engineer124 and GitHub
cc8772a896
Name Actor_PlaySfx and Player_PlaySfx ( #1190 )
...
* name funcs
* namefixer
* function comments
2023-03-03 00:09:16 -05:00
engineer124 and GitHub
5729b6d3f1
actor math cleanup ( #1187 )
2023-03-02 21:16:00 -03:00
263fca77c3
EnSi OK ( #1174 )
...
* [decomp,actor] Decompile Init,Destroy & unnamed functions (func_8098CA20 is WIP)
* [ovl_En_Si] Match func_8098CA20 function
* [0vl_En_Si] Comment data in spec
* [ovl_En_Si] Start documentation & cleanup
* [ovl_En_Si] Clang format
* [spec] Update ovl_En_Si reloc target
* Style fixes & adjust fanfare parameter
* Remove goto & styling fixes
* Styling fixes
* Remove unnecessary function declarations & dead code
* Styling fixes & doc (MR suggestions)
* Move GET_CHEST_FLAG macro to header file
* Rename colliderSphere variable to collider
* Rename func_8098CA20 to EnSi_UpdateCollision
* Rename func_8098CBDC to EnSi_DraggedByHookshot
* Rename func_8098CAD0 to EnSi_GiveToken
* Rename func_8098CB70 to EnSi_Wait
* Styling adjustment
* Update tools/disasm/function.txt with new function names
---------
Co-authored-by: Francis <francis.jeanneau@sparkmicro.com >
2023-03-01 22:17:30 -03:00
Anghelo Carvajal and GitHub
1e03e13b37
z_eff_footmark cleanup (#1180 )
...
* z64eff_footmark.h
* arraycount and other clenaups
* flag
* extract data
* gEffFootprints
* singular
* minor cleanup
* review
* pos
* mf
* format
2023-02-27 17:56:04 -05:00
louist103 and GitHub
2080f9906f
EnStopHeishi OK ( #1156 )
...
* merge data
* its broken
* func_80AE7718
* IDK for now
* OK
* cleanups
* format
* PR fixes
* Delete BuildInfo.h
* PR fixes
* PR fixes
* PR fixes
* Update z_en_stop_heishi.c
2023-02-24 13:42:59 -03:00
Derek Hensley and GitHub
8eb54f4b32
TransitionFade OK ( #1160 )
...
* Match fade
* Some adjustments from OoT PR
* Missed 1
* iREG(50)
* Fill
* Sync
* PR review
2023-02-24 13:20:18 -03:00
engineer124 and GitHub
e75c51e841
WeekEventFlags: Entrance Cutscenes Watched ( #1166 )
...
* entrance regs
* cleanup comments
* add comment
* comments
* missed a space
* fix placement of comment
2023-02-24 12:08:06 -03:00
69f7540e33
EnGe2 (Gerudo in Purple) OK and documented, object_gla documented ( #1071 )
...
* OK, data imported
* Permuter settings
* Name data, a few functions and variables, cleanup
* Small amount of cleanup on some related actors
* Oops
* Document object
* Type and other macros
* Some cutscene stuff and temporary function names
* Proper path function names
* Name a couple more functions
* A couple more function names
* Name PathStatus enum
* Name rest of functions and formalise the documentation a bit
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* limbs
* Format
* Review
* format
* weekeventregconvert and format
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
Co-authored-by: angie <angheloalf95@gmail.com >
2023-02-24 11:59:17 -03:00
Tom Overton and GitHub
50bd6056e2
Document EnSyatekiWf and do some slight cleanup on object_wf and other Syateki actors ( #1168 )
2023-02-21 16:42:20 -03:00
a7fd595136
Debloating z64.h 1: Introducing z64skybox.h ( #1150 )
...
* z64skybox.h
* Add a few placeholder values on the enum
* Remove unused structs on z64.h
* Update include/z64skybox.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* move skybox functions
* format
* Revert ARRAY_COUNT(msg)
* bss
* whoops
* Update include/z64.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* SkyboxDraw -> Skybox_
* use enum in z_play
* format
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
2023-02-21 16:31:11 -03:00
5bc388b9a9
Introduce object_table.h ( #1136 )
...
* object_table
* segmentsymbols
* format
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* bss
* add more descriptions to the object_table
* DEFINE_OBJECT_SIZE_ZERO
* Update include/tables/object_table.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* Rename `z_scene_dlftbls.c` to `object_table.c`
* bss
* bss
* bss
* bss
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
2023-02-21 16:05:12 -03:00
Derek Hensley and GitHub
5941e09b22
Fbdemo (TransitionTile) OK ( #1163 )
...
* Fbdemo OK
* Cleanup
* sync and format
* Fix functions.h
* format
* SQ
2023-02-21 15:36:56 -03:00
engineer124 and GitHub
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
EllipticEllipsis and GitHub
9297e6dd52
EnDekubaba OK and documented, object_dekubaba documented, EnKarebaba documented ( #1088 )
...
* OK, struct documented
* Data imported, update spec
* Name data
* Name all functions and variables
* Document object
* Bit more documentation
* Document Karebaba
* Add note to object_dekubaba
* Bit more cleanup
* Review
* Shadow
* Review
* Rename functions, add hit enum
* Figured out the enum
* Review
* MarkForDeath -> Kill
2023-02-21 14:30:09 -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
mzxrules and GitHub
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
louist103andGitHub
mzxrulesandGitHub