39523baf8c
Add original asset names to all `object_i*` and `object_j*` files ( #1365 )
...
* Add original asset names to all `object_i*` and `object_j*` files
* Remove MM3D name from `object_ishi`; asset names that start with `zelda2_` almost certainly come from Grezzo.
2023-09-11 16:07:53 +10:00
81424208e6
document object_zov (lulu the zora vocalist) ( #1357 )
...
* initial commit of object_zov documentation
* morphFrames and mouth name change
* sAnimations array name instead of sAnimationInfo
* forgor format
* separate categories
2023-09-11 15:27:23 +10:00
c8304925da
Subrepo Updates ( #1368 )
...
* git subrepo pull --force tools/asm-processor
subrepo:
subdir: "tools/asm-processor"
merged: "fed1e3ddb"
upstream:
origin: "git@github.com:simonlindholm/asm-processor.git"
branch: "main"
commit: "fed1e3ddb"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
* git subrepo pull tools/asm-differ
subrepo:
subdir: "tools/asm-differ"
merged: "4ed847317"
upstream:
origin: "https://github.com/simonlindholm/asm-differ "
branch: "main"
commit: "4ed847317"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "7f398831f"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "7f398831f"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
* git subrepo pull (merge) --force tools/fado
subrepo:
subdir: "tools/fado"
merged: "8ce048376"
upstream:
origin: "git@github.com:EllipticEllipsis/fado.git"
branch: "master"
commit: "8ce048376"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
2023-09-08 20:17:54 +10:00
4fa13e4132
Move libultra function declarations to libultra headers ( #1196 )
...
* Delete unused headers
* Move PR and io to ultra64
* move headers to ultra64
* more cleanups
* more reorganizing
* i think that should be all
* format
* ifdef guards cleanup
* Add IO_READ and IO_WRITE macros for future use
* warnings
* review
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* warnings again
* warn
* ifdef guards
* fix merge
* fix merge
* fix merge
* bss
* padutils.h
* bss
* bss
* bss
* fix merge
* bss
* bss
* bss
* fix merge
* fixes
* fixes
* bss
* bss
* fix merge
* fix
* fix
* fix includepaths
* fix paths
* bss
* fix
* ultra64/ -> PR/
* header guards
* fix ehader guards
* fix
* fix++
* format
* bss is borken
* prevent 2
* :despair:
* bss
* rename assert to dbg_hungup
* fix
* a
* fix
* bss
* fix
* bss
* bss
---------
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2023-09-02 15:34:29 -04:00
9cceea48f3
Documentation pass for the Target system ( #1281 )
...
* cleanup
* import bss
* sActorHiliteMtx
* some cleanups on func_800BB604
* Actor_IsInTargetableRange
* rematch func_800BB604
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* Name ACTOR_FLAG_UNFRIENDLY and ACTOR_FLAG_FRIENDLY
* Rename some Target_ functions
* cleanusp
* TargetMode enum
* Target_800B82EC
* sNaming
* more
* more naming
* fairyHintPos
* rotation
* ACTOR_FLAG_TARGETABLE
* update namefixer
* remove trailing comma
* bss
* Wall of text for Target_800BB604
* function naming
* cleanups
* Target_GetAdjustedDistSq
* NotLeash
* more comments
* minor comment
* review
* fix
* rotZTick
* review
* name last members
* fix
* review
* review
* more namefixer
* swap members
* comment
* Update src/code/z_actor.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/code/z_actor.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
* format
* Update src/code/z_actor.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/z64actor.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
* review
* fix
* fix
---------
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-09-02 15:16:45 -04:00
cbf9d98dba
ASM_PROC_FORCE ( #1362 )
2023-08-23 13:48:14 -04:00
108b482ad0
document remaining door assets ( #1351 )
...
* initial commit of remaining door asset documentation
* format
* forgor the g removed comments
* space in metal door desc
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* space in spider door dsc
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-22 12:09:19 +10:00
8059537150
Game bss and cleanup ( #1356 )
...
* Game bss and cleanup
* Match Oot with rdp time variables
* PR review
* Namefixer
2023-08-21 21:44:28 -04:00
312fcafe2d
Small General cleanup ( #1360 )
...
* Draw things
* EffectSsFhgFlash_SpawnShock enum
* gohtIndex
* colliders
* ObjGhaka_Init
* func_80B3C39C
* undef syms
2023-08-20 18:50:55 +10:00
c5d6185a88
`En_Horse_Link_Child` and `object_horse_link_child` partially documented. ( #1353 )
...
* ChildHorse: some documentation
* OOT Horse: more documentation
* OOT Horse: more documentation
* OOT Horse: more documentation
* might be busted
* OOT Epona: more documents aft
* OOT Epona: some object documentation, continued documentation
* format
* OOT Epona: requested changes
* OOT Epona: minor documentation changes
* what is this warning, c pls
* OOT Horse: git nudge
* OOT Epona: requested changes to enums
* OOT Epona: Anim
* Update src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* OOT Epona: change enum name
* OOT Epona: Requested changes
* OOT Epona: More requested changes
* OOT Epona: removed incorrect padding guess
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-15 14:59:51 +10:00
0cceee6eba
Animation Cleanup: En_C* and En_D* Actors ( #1327 )
...
* En_C cleanup
* En_D
* more cleanup
* name enums
* missed one
* PR Review
* remove padding
2023-08-15 14:23:33 +10:00
33ca9daece
z_bgcheck OK ( #1358 )
...
* z_bgcheck OK
* Format
* Cleanup
* Cleanup
* Review changes
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-15 13:58:49 +10:00
ef51974049
document object_mkk ( #1350 )
...
* initial commit of object_mkk documentation
* forgot door
* spaces
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-15 11:34:57 +10:00
09100194b3
document object_hana (graveyard flower) ( #1355 )
...
* initial commit object_hana documentation
* explain how object is organized
* change whole flower set name
* a litle space
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-15 10:44:53 +10:00
17b7f3f90e
document object_tsubo, object_racetsubo and object_obj_chan ( #1346 )
...
* initial commit of object_tsubo, object_racetsubo and object_obj_chan documentation
* little description in chandelier xml
* desc between root and file
* changed green pot to race pot
* changed race pot to magic pot
* space in desc
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-15 10:34:52 +10:00
f0ca606cd2
object_bal & EnBal OK and documented ( #1317 )
...
* object_bal and z_en_bal initial push
* Formatting, updated named audio funcs
* Cleanup, labeled some week events
* trying to fix merge issues
* Merge, misc cleanup
* Fix buildability after merge
* Fixed formatting issues
* static variable name fixes
* Cleanup & object item renames
* Formatting
* Additional name cleanup
* Name & comment tidying
* Updated function names referenced by EnBal
2023-08-14 11:38:33 -04:00
affb1eaf0f
Body Parts Docs ( #1333 )
...
* body parts WIP
* continue WIP
* finish body parts
* cleanup
* missed one
* Missed Enum
* PR Review
* next PR review
* s32 cast
* TRUNCF_BINANG
* rm unnecessary shadow
* PR Review
* missed some
* oops
2023-08-14 10:08:45 -04:00
05c2221769
Audio Load and Heap Headers ( #1329 )
...
* more header splits
* cleanup
* adjust comments
2023-08-12 12:33:58 -04:00
a6a94e543c
EnMnk OK and partially documented. handing off to the next ape enthusiast ( #1277 )
...
* EnMnk OK and partially documented. handing off to the next ape enthusiast
* run format.py
* fix trailing comma warning
* Monkey PR Review (#1 )
* PR Review
* a little more
* oops
* Reordering Monkey, anim
* cleanup, typos
* More PR Suggestions
* namefixer
* fix master
* limbIndex
* PR Review
---------
Co-authored-by: gamestabled <gamestabled@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2023-08-12 12:15:14 -04:00
656fd08ee8
Gamestate table ( #1354 )
...
* gamestate_table.h
* move macros
* bss
* format
2023-08-12 11:44:35 -04:00
138dd55662
Document object_tl (Snapper) ( #1349 )
...
* Document object_tl (Snapper)
* Rename skelAnimes/jointTables/morphTables
2023-08-12 17:31:46 +10:00
93dbe1a02a
Tools: add assets/xml folder to rename_sym.sh directories
2023-08-12 15:37:04 +10:00
c4c7ca9f61
document object_dinofos ( #1343 )
...
* initial commit of object_dinofos documentation
* forgot to format
* dinolfoslimb
* eye texturs
* desc position and eye tex name change
* forgor the rest
* removed object .h from .c #includes
2023-08-12 13:35:43 +10:00
2f1996a526
Animation Cleanup: En_E* ( #1331 )
...
* begin E
* more cleanup
* limb index
* small cleanup
* format
* PR Review
* sLimbToBodyParts
* more bodypart cleanup
2023-08-10 21:26:29 -04:00
e1e30586c9
Fix first_diff and sym_info for older and new ld ( #1342 )
...
* Fix map parsing for ld >= 2.40
* mapfile_parser
* Paths
* mapfile_parser requirement
* Move tools back
* Comment
* Add ability to decode instructions for first_diff
* import error for mapfile_parser
* PR comments from OOT
* ,s
2023-08-10 20:58:20 -04:00
b65577de4e
document object_fr ( #1339 )
...
* initial commit of object_fr documentation
* fixed unused texture height
* format and slight limb name changes
* froglimb
* removed object .h from actor .c #includes
* change eye textur
* sIsInitialized
* named anim enum values
2023-08-09 22:33:08 -04:00
d107b6c2a9
`z64vi*.h` and `sys_cfb.h` headers ( #1259 )
...
* z64vimode.h
* z64viscvg.h
* z64vis*.h
* VisCvg
* sys_cfb.h
* a bit of naming
* review
* Renames
* bss
* fix
* bss
* bss
* bss
* messed up the merge
* bss is borken
* reordering 2
* remove prevent header from fault.c
2023-08-09 19:44:31 -04:00
17b774effe
Animation Cleanup: En_F* ( #1332 )
...
* Anim F Cleanup
* minifrog
* cleanup
* more cleanup
* cleanup fishing limb
* format
* spacing
* PR Review
2023-08-06 10:02:37 -04:00
4ae00e909e
Fix Cutscene Bss ( #1305 )
...
* demo bss
* fix bss
* sPad
* also matching
* static bss pad
* ultratypes
* spacing
* cleanup
2023-08-04 16:36:03 -04:00
27ccadc77e
Document the function that handles the Giant's Mask cutscene in Boss02 ( #1345 )
...
* Document the function that handles the Giant's Mask cutscene in Boss02
* Remove newline between fallthrough and next case
2023-08-04 13:06:36 +10:00
5625603b56
ShotSun: some docs ( #1348 )
2023-08-04 12:35:59 +10:00
253209d722
Bottle Params ( #1328 )
...
* bottle param docs
* none to any
* reorder
* macro use
* PR Review
* brackets
2023-08-02 11:27:03 +10:00
fa30dea28d
namefixer.py hotfix ( #1347 )
...
* namefixer hotfix
* Actor_OfferTalkExchangeEquiCylinder
2023-08-01 09:55:14 -04:00
410d412d0a
Talk Exchange System Docs ( #1312 )
...
* Fix typo
* PLAYER_IA_HELD
* Actor offer exchange item functions
* SubS_OfferExchangeItemCustom
* SubS_OfferItem + enum
* Actors that use Subs_OfferItem
* SubS_OfferExchangeItemFacing
* Comments
* Format
* Better comment
* EnRg
* function names and comments
* Split enum
* exchangeItemId -> exchangeItemAction
* namefixer
* PR comments
* Missed a comment
* Max -> Mask
* SubS_SetOfferMode
* Some more comments updating
* rg comment
* PLAYER_IA_CONTINUE
* Revert back to PLAYER_IA_MINUS1
* Comment typos/grammar
* Verify functions
* yawRange
* Actor_OfferTalkNearby
* Actor_OfferTalkExchangeEquiCylinder
* format
* Actor_OfferTalkNearColChkInfoCylinder
* OfferTalk comments
* Actor_OfferTalkExchange comment enum
* format
2023-08-01 09:40:12 +10:00
70a54256b7
Remove plural "Limbs" from object decomp example ( #1344 )
...
* Remove plural "Limbs" from object decomp example
* Missed one
2023-07-29 09:44:02 -04:00
bbfbc4073e
Update ZAPD subrepo ( #1338 )
...
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "cb0342425"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "cb0342425"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "110b9eb"
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "505024b33"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "505024b33"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "110b9eb"
* Disable Wno-hardcoded-pointer for `make assets`
2023-07-28 18:20:12 -04:00
6f7d6cc47e
initial commit of rock object_ishi documentation ( #1340 )
...
Co-authored-by: MegaIDK <pc@DESKTOP-37QIOUU.localdomain>
2023-07-27 20:16:46 -04:00
eb6b837d65
Clang-Format 14 ( #1321 )
...
* format
* Update dockerfile and other documentation
* Update mac instructions
2023-07-27 12:15:40 -04:00
9e85f5545a
Shopkeeper weekeventregs ( #1325 )
...
* Ossan
* sob1 talked
* fsn weekeventregs
* Curiosity shop 3rd day item to special item
* Kotake
* Format
* Kotake bottle
* PR suggestions
* Koume Kiosk -> Kiosk Koume
* Update include/z64save.h
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
---------
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2023-07-18 14:51:56 -04:00
76e02120a0
Add original asset names to all `object_h*` files ( #1330 )
...
* Add original asset names to all `object_h*` files
* Soften language used in `object_hunsui`, because we can't say for sure that we know the names of the collision files, even if it feels pretty clear
* Switch from "is" to "might be" on the DLs too
2023-07-18 14:25:25 -04:00
b3f4b8a9cb
Animation Cleanup: En_B* Actors ( #1326 )
...
* En_B
* more cleanup
* another if (1) fixed
* more cleanup
* more cleanup
* rot
* PR Suggestions
* fix vtx
* rm more Draw
* Update assets/xml/objects/object_yb.xml
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
* Update assets/xml/objects/object_bigpo.xml
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
---------
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2023-07-14 16:33:58 -04:00
6d94e0ce9b
ClearTag Params Cleanup ( #1308 )
...
* clearTag params
* header ordering
* brackets
* cleanup
* add note
2023-07-14 14:56:08 -04:00
2aa028c20f
schedule_static docs ( #1324 )
...
* Finish off schedule_static
* gBombersNotebookBarSmallTex
2023-07-14 11:59:13 +10:00
4727253718
Add original asset names to all `object_g*` files ( #1323 )
2023-07-14 11:15:10 +10:00
e7f3921414
Animation Cleanup Part 2: En_A* Actors ( #1322 )
...
* en_A
* more cleanup
* more cleanup
* another one
* more cleanup
* Suggestion
* Oops
2023-07-12 22:08:56 -04:00
913cd981c0
Deku Playground Docs ( #1318 )
...
* Actor shared memory
* EnGameLupy
* EnLiftNuts
* object_dnt
* PR Suggestions
* Things I missed
* sPad
* Format
* PR comments
2023-07-10 22:47:39 -04:00
db6268a12e
Template Docs For Player Action ( #1279 )
...
* generic action names
* more docs
* add comment
* more renaming
* do nothing
* another rename
* Swap Init
* simplify name
* more cleanup
* setup
* deku stick
* PR Review
* rm comment
* missed some
2023-07-10 19:28:25 -04:00
7cbd63c33d
Provide original sequence names for all BGM and rename some sequences ( #1311 )
...
* Provide original sequence names for all BGM and rename some sequences
* Include official soundtrack names, respond to reviews, rename some more sequences based on new evidence
* Forgot to rename the shooting gallery sequence, oops
* Rephrase the comment on NA_BGM_CLOCK_TOWN_MAIN_SEQUENCE
2023-07-10 18:30:21 -04:00
08006cc0ea
Document EnTanron5 (destructible props, fragments, and item drops in Twinmold's arena) ( #1319 )
...
* Document EnTanron5 (destructible props, fragments, and item drops in Twinmold's arena)
* Respond to engineer's review
* Updated the type names, used "ruin" instead of "prop" in comments, and addressed Anon's review
* Missed this instance of "prop"
* Respond to engineer's review
* Update OutNames too
2023-07-10 18:02:22 -04:00
82318a1c1b
Animation Cleanup Part 1: Dm Actors ( #1290 )
...
* DM cleanup
* cleanup
* fix pointer
* rm unused anim enum
* PR Suggestions
* spacing
* missed one
* More PR Suggestions
* oops
2023-07-10 10:00:42 -04:00
Tom Overton