b8af819165
DynaPoly Docs Pass ( #1194 )
...
* dyna docs
* init flags
* more docs
* cleanup
* partial PR review
* another bracket
* hold to press
* PR cleanup
2023-04-18 18:36:53 -04:00
38d21bbe97
Name some `SurfaceType_` functions ( #1155 )
...
* enums
* renaming functions
* fixes
* SurfaceType_IsSoft
* type fixing
* format
* Update src/code/z_bgcheck.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_bgcheck.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* SurfaceType_GetFloorEffect
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* format
* bss
* cleanups
* extra material docs
* cleanup
* cleanups
* Remove Bg prefix
* minor fixes
* Remove BG_
* SURFACE_MATERIAL_DIRT_SHALLOW
* format
* bss
* bss
* review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* format
* format again
* bug
* format
* namefixer
* bss
* bss
* bss
* review
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2023-04-18 18:14:36 -04:00
4647ebb91b
`stackcheck.h` ( #1204 )
...
* stackcheck.h
* warning
* Update src/boot_O2/stackcheck.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/boot_O2/stackcheck.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/boot_O2/stackcheck.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* stack
* format
* bss
* review
* review
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-04-18 17:50:34 -04:00
823746d495
Angle Conversions ( #1216 )
...
* Angle Conversions
* Format
* namefixer
* Renames in ObjHsStump_Appear
* Format
* once more
* Explicit cast in EnSsh
* Update src/overlays/actors/ovl_En_Fishing/z_en_fishing.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-04-18 16:34:58 -04:00
a67d086add
Defines for flags passed to `Actor_UpdateBgCheckInfo` ( #1197 )
...
* add flags
* add comment
* small fix
---------
Co-authored-by: angie <angheloalf95@gmail.com>
2023-04-18 16:02:56 -04:00
44b04292cd
Match `DynaPoly_ExpandSRT` ( #1203 )
...
* match DynaPoly_ExpandSRT
* name variables
* oops
2023-04-18 14:49:36 -04:00
3dd7a5a399
Add --convert-statics=global-with-filename ( #1217 )
2023-04-18 14:21:01 -04:00
8efba39749
z_viszbuf (code_801420C0) OK ( #1211 )
...
* first pass
* Match
* variables.txt
* Update include/functions.h
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
---------
Co-authored-by: angie <angheloalf95@gmail.com>
2023-04-18 12:42:08 -04:00
255c4599bf
ovl_En_Slime & object_slime OK and documented ( #1175 )
...
* decomped init, draw
* started slime
* finished func decomp en_slime
* object_slime and en_slime updates
* updated a few names
* finished up some naming
* en_slime and object_slime OK and documented
* slime xml cleanup
* Code cleanup round 1
* Cleanup 1 - missed a note
* Fixed improper use of bgcheck flags
* Some cleanup
* Namefix, name cleanup
* Function name cleanup, misc cleanup
* More name cleanup (pre-merge)
* Update color filter flag constants
* Tidying
---------
Co-authored-by: Blythe Hospelhorn <35576053+bhospelhorn@users.noreply.github.com>
2023-04-15 14:56:23 +10:00
4faad208c6
Introduce `SaveContext.gameMode` enum ( #1198 )
...
* gamemode enum
* owl save
* trailing enum comma
2023-04-07 13:09:00 +10:00
f39d412bfe
Actors revert cleanup ( #1221 )
...
* Revert "ovl_Bg_Keikoku_Spr OK (#111 )"
This reverts commit fed1b37da1#168 )"
This reverts commit 54aef44a9e#86 )"
This reverts commit d0af9587ba#87 )"
This reverts commit 6e4d156ad7#200 )"
This reverts commit e1219e7351#110 )"
This reverts commit f0cd2db055#112 )"
This reverts commit 536a484f73
2023-04-01 21:10:00 -03:00
d9493a5b99
Update documentation to use updated Z64Utils release + updated directions ( #1223 )
2023-03-31 05:11:57 +01:00
d8064bb070
Effect table ( #1209 )
...
* effect_ss_table.h
* monkaBSS
* format
* Remove InitVars extern headers
* Remove `const` from InitVars
* cleanup
* cleanup
* format
* bss
* bss
* bss
2023-03-30 13:17:55 -03:00
34f9fb9886
[Doc] small, names for mayor dotour's eye and eyebrow textures ( #1220 )
...
* some naming and tlut assignments to dt eye textures
* update dotour overlays with new texture names
* critical formatting fix
2023-03-30 20:57:26 +11:00
f3c811d298
`z_parameter`: Buttons (part 9) ( #1192 )
...
* import button docs
* cleanup
* sync timer val
* add flag comments
* Update src/code/z_parameter.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/code/z_parameter.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/code/z_parameter.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* fix merge master
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-03-30 20:26:35 +11:00
6685a4775e
Audio `sequence.c` OK and documented ( #1201 )
...
* import sequence docs
* cleanup
* do not need raw hex
2023-03-30 19:53:47 +11:00
045c3537a9
`z64game_over.h` ( #1183 )
...
* z64game_over.h
* format
* Update include/z64game_over.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-03-24 15:29:54 -03:00
147e4fcedc
THA docs ( #1177 )
...
* THA docs
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* format
* namefixer
* yada
* remove zero pad comment
* Update include/z64.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/thga.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* namefixer
* bss
* namefixer
---------
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-03-24 14:38:04 -03:00
f3d2c56d1d
Updated function names in ovl_En_Bom & added documentation from OoT ( #1219 )
...
* Updated function names in ovl_En_Bom & added documentation from OoT
* Renamed BombType struct members
* Updated instances of BOMB_BODY
* Updated more instances of BombType
---------
Co-authored-by: swinginman <swinginman@DESKTOP-V7R1DTC.localdomain>
2023-03-23 17:25:54 -03:00
2cb01b5b6a
z_room (1 non-matching) ( #1143 )
...
* begin room docs and decomp
* match Room_DrawImageSingle
* match Room_DrawImageMulti
* Room_AllocateAndLoad non-matching
* big improvements on Room_DrawCullable
* match Room_AllocateAndLoad
* improvement?
* cleanup
* comments
* cleanup
* small pr suggestions
* PR Suggestions
* cleanup sceneCmds
* some PR
* PR Suggestions
* more PR Suggestions
* col to collision
2023-03-23 09:36:09 +11:00
9bb978527f
Misc Cleanup 14 ( #1214 )
...
* bgId
* z64scene.h whitespace
* SubS_ComputeTrackPointRot casts
* Macros cleanup
* ifs
* Empty Loops
* Lights_FindBufSlot void
* SkelAnime_GetFrameData
* };
* Struct inits
* fs
* @todo
* Bug comments
* EnPofusen and ObjUm
* Trailing comma
* Revert "bgId"
This reverts commit eea073c5ac399fd57550dea896c874
2023-03-21 11:12:22 -03:00
6d1bc6e34b
Ignore other rom extensions ( #1218 )
2023-03-21 10:28:24 -03:00
03c8d46ed2
Slowly Cleanup ( #1213 )
...
* Add slowly.h
* Init and destroy
* File header
2023-03-20 00:48:49 +11:00
6ff77ab092
Recomp v0.6 ( #1215 )
2023-03-18 08:03:17 -03:00
58022571ba
subrepo asm-processor ( #1212 )
...
* yeet
* git subrepo clone git@github.com:simonlindholm/asm-processor.git tools/asm-processor
subrepo:
subdir: "tools/asm-processor"
merged: "bbd86ea1f"
upstream:
origin: "git@github.com:simonlindholm/asm-processor.git"
branch: "main"
commit: "bbd86ea1f"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2023-03-17 15:16:30 +11:00
a17949e730
Document z_en_time_tag ( #1140 )
...
* time-tag docs
* simplify enums
* PR Reviews
* PR Suggestions
* small change
* small fix
* PR Suggestions
* add extra func ref
* rm raw text from first actor I decompiled
* Stock Pot Inn
* fix master merge
2023-03-16 13:47:38 +11:00
2987390a20
Audio `seqplayer.c`: AudioSeq_ to AudioScript_ ( #1202 )
...
* AudioSeq_ to AudioScript_
* Update src/audio/lib/playback.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* format
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-03-15 11:09:49 +11:00
0c3a48ef94
Subrepos update ( #1208 )
...
* git subrepo pull tools/asm-differ --force
subrepo:
subdir: "tools/asm-differ"
merged: "ae408664a"
upstream:
origin: "https://github.com/simonlindholm/asm-differ "
branch: "main"
commit: "ae408664a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull (merge) tools/fado --force
subrepo:
subdir: "tools/fado"
merged: "8d896ee97"
upstream:
origin: "git@github.com:EllipticEllipsis/fado.git"
branch: "master"
commit: "8d896ee97"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/graphovl --force
subrepo:
subdir: "tools/graphovl"
merged: "dab4addae"
upstream:
origin: "https://github.com/AngheloAlf/graphovl.git "
branch: "master"
commit: "dab4addae"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/z64compress --force
subrepo:
subdir: "tools/z64compress"
merged: "43035d97f"
upstream:
origin: "https://github.com/z64me/z64compress.git "
branch: "main"
commit: "43035d97f"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/ZAPD --force
subrepo:
subdir: "tools/ZAPD"
merged: "23929ec93"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "23929ec93"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* Revert "git subrepo pull tools/z64compress --force"
This reverts commit 2e487b5008
2023-03-15 10:51:47 +11:00
c833969ea7
`z_actor` documentation pass ( #1154 )
...
* ActorContext_unk_1F4
* a
* ACTOR_FLAG_IGNORE_QUAKE
* ACTOR_FLAG_TALK_REQUESTED and ACTOR_FLAG_CANT_LOCK_ON
* actorCtx->unkC => ctorCtx->halfDaysBit
* HALFDAYBIT defines
* actor.halfDaysBits
* format
* Actor_InitHalfDaysBit
* Name actor-killing functions
* cleanup variables.h a bit
* DAWN
* bss
* Actor_RequestRumble and Actor_GetArrowDmgFlags
* name vars of func_800BC620
* format
* fix missing PLAYER_IA
* Actor_OfferGetItem
* Actor_SetClosestSecretDistance
* freezeCategoryPlayerFlags1
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* DROPFLAG_
* a
* COLORFILTER
* format
* sCategoryFreezeMasks
* Actor_OfferCarry
* review
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* change hex to dec
* COLORFILTER_INTENSITY_FLAG
* format
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* shiftedHalfDaysBit
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* cleanup
* Undo Actor_RequestRumble
* Undo ACTOR_FLAG_IGNORE_QUAKE
* format
* Remove COLORFILTER_GET_BUFFLAG
* Undo Actor_KillAllFromUnloadedRooms
* format
* Update Actor_OfferGetItem comment
* Update Actor_OfferGetItem description
* diving
* bss
* namefixer
* format
* speed
* review
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-03-09 12:35:23 -05:00
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
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
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
d7af72273d
z64frameadvance.h ( #1182 )
2023-03-07 23:19:08 -05:00
9b33e6a3a5
rename audio files ( #1188 )
2023-03-08 00:14:43 -03:00
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
2cce8f6767
Introduce BgCheckFlags Defines ( #1195 )
...
* flags
* cleanup
* adjust comment
2023-03-04 19:53:56 -03:00
8b025badd1
`z_fireobj.h` header ( #1179 )
...
* fireobj.h
* name states and cleanups
* minor cleanups
* format
* bss
* review
* bss
* review
2023-03-04 15:53:10 -03:00
e8f3039264
speedXZ -> speed ( #1186 )
...
* speedXZ to speed
* brackets
2023-03-03 11:07:51 -03:00
cc8772a896
Name `Actor_PlaySfx` and `Player_PlaySfx` ( #1190 )
...
* name funcs
* namefixer
* function comments
2023-03-03 00:09:16 -05:00
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
c70ccf14d9
Add original asset names for all `object_e*` and `object_f*` files ( #1181 )
...
* Add original asset names for all `object_e*` and `object_f*` files
* Add c_keyframe note to fall2
2023-02-28 09:41:54 -05:00
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
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
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
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
engineer124