Commit Graph

1483 Commits

Author SHA1 Message Date
MegaIDK
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
MegaIDK
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
MegaIDK
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
Blythe
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
engineer124
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
engineer124
05c2221769
Audio Load and Heap Headers (#1329)
* more header splits

* cleanup

* adjust comments
2023-08-12 12:33:58 -04:00
gamestabled
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
Anghelo Carvajal
656fd08ee8
Gamestate table (#1354)
* gamestate_table.h

* move macros

* bss

* format
2023-08-12 11:44:35 -04:00
Tom Overton
138dd55662
Document object_tl (Snapper) (#1349)
* Document object_tl (Snapper)

* Rename skelAnimes/jointTables/morphTables
2023-08-12 17:31:46 +10:00
Isghj
93dbe1a02a
Tools: add assets/xml folder to rename_sym.sh directories 2023-08-12 15:37:04 +10:00
MegaIDK
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
engineer124
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
Derek Hensley
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
MegaIDK
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
Anghelo Carvajal
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
engineer124
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
engineer124
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
Tom Overton
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
Isghj
5625603b56
ShotSun: some docs (#1348) 2023-08-04 12:35:59 +10:00
engineer124
253209d722
Bottle Params (#1328)
* bottle param docs

* none to any

* reorder

* macro use

* PR Review

* brackets
2023-08-02 11:27:03 +10:00
engineer124
fa30dea28d
namefixer.py hotfix (#1347)
* namefixer hotfix

* Actor_OfferTalkExchangeEquiCylinder
2023-08-01 09:55:14 -04:00
Derek Hensley
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
Tom Overton
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
Tom Overton
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
MegaIDK
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
Derek Hensley
eb6b837d65
Clang-Format 14 (#1321)
* format

* Update dockerfile and other documentation

* Update mac instructions
2023-07-27 12:15:40 -04:00
Derek Hensley
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
Tom Overton
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
engineer124
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
engineer124
6d94e0ce9b
ClearTag Params Cleanup (#1308)
* clearTag params

* header ordering

* brackets

* cleanup

* add note
2023-07-14 14:56:08 -04:00
Derek Hensley
2aa028c20f
schedule_static docs (#1324)
* Finish off schedule_static

* gBombersNotebookBarSmallTex
2023-07-14 11:59:13 +10:00
Tom Overton
4727253718
Add original asset names to all object_g* files (#1323) 2023-07-14 11:15:10 +10:00
engineer124
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
Derek Hensley
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
engineer124
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
Tom Overton
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
Tom Overton
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
engineer124
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
Anghelo Carvajal
b3eae0e5b7
Port OoT's docs for fault.c and fault_drawer.c (#1199)
* fault.h

* some docs stealing

* fix building

* fault_internal.h

* pass

* finish stealing docs

* finish cleanup

* format

* warning

* Update src/boot_O2_g3/fault.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/boot_O2_g3/fault.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/boot_O2_g3/fault.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* arggggg

* arggggg part 2

* STACK

* PHYS_TO_K0(0x400000)

* format

* fix

* Instance

* format

* Neutral reset

* variables.h cleanup

* bss

* frameBuffer

* format

* Update src/boot_O2_g3/fault.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/boot_O2_g3/fault.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* bss

* bss

* bss

* callback cleanup

* fix function declarations

* fix again

* bss

* bss

* Update src/overlays/actors/ovl_En_Fishing/z_en_fishing.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/boot_O2_g3/fault.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* bss

* bss

* Update src/boot_O2_g3/fault.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* review

* import bss

* format

* minor cleanup

* bss

* review

* fix

* bss

* bss

* bss

* bss

* bss

* format

* a

* Z_PRIORITY_FAULT

* bss

* fix

* idle.c bss doesn't want to get fixed :c

* review

* bss

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-07-08 14:41:25 -04:00
Derek Hensley
a506e8620a
Fidget Tables Docs (#1316)
* Docs for SubS_FillLimbRotTables and Actor_FillLimbRotTables

* Fidget

* Format

* ///

* UpdateFidgetTables

* Clarify comment

* Adjust comments slightly

* Update src/code/z_actor.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sub_s.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-07-07 07:54:43 +10:00
Derek Hensley
3bb9b365fc
RequiredScopeTemp Cleanup (#1315)
* REmove some requiredScopeTemps

* Bring down invFrozenTimer
2023-07-06 08:46:11 +10:00
engineer124
532ec30973
Misc Cleanup 6 (#1307)
* more cleanup

* 3 more brackets

* PR Suggestions
2023-07-05 12:09:01 +10:00
engineer124
857a0cfdaf
item_name_static documented and ItemId updates (#1304)
* WIP

* map static

* finish english names

* jpn

* revert map name

* name prefix

* boss to big

* more comments

* item enums

* more items

* more

* PR Suggestions

* PR Suggestion
2023-07-04 09:52:36 -04:00
engineer124
0f572acbda
map_static_name docs (#1298)
* map static docs

* adjust comment

* improve comments

* PR Suggestions

* map point

* adjust comments
2023-07-04 17:58:02 +10:00
louist103
0c4f2524d8
Obj_wind (#1309)
* Initial decomp done

* Matched

* format

* PR Fixes

* Fixes

* Fixes

* Update src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* new names

* Format

---------

Co-authored-by: louist103 <louist103@pop-os.localdomain>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-07-04 17:44:57 +10:00
Nuss
3b1b054e93
Object names rename/comments from the OoT equivalent (#1282)
* object_fu(Bean Seller)

* object_bombf (Bomb flower)

* object_ds2 (Potion Shop Guy)

* object_fu (guruguru)

* object_hata (Red Flag on Post)

* object_lightswitch (Sun Switch)

* object_rr (Like Like)

* Tower Collapse Bars?

* object_vm (Beamos)

* ups

* object_fu EnumName

* improvements

* Offset

* improvements

* object_ms enums and outnames

* missing prefix

* improvements

* improvements
2023-07-03 16:08:30 -04:00
Stuff is on GitLab
5fd8afd1db
fix: wrong offset-comments in GraphicsContext (#1314)
* fix: wrong offset-comments in GraphicsContext

* fix: match gfx member names to offsets
2023-07-03 20:38:15 +10:00
Derek Hensley
5c7d745102
Some partial objects cleanup (#1313)
* tanron1

* gm

* tanron4

* sekihi

* dkjail

* dor02

* dor04

* blobs

* comments

* parens

* Unknown
2023-07-02 10:31:54 -04:00
Derek Hensley
f54a9b2831
Some Gameplay keep docs (starts at the top) (#1310)
* bottles

* hookshot

* swords

* masks

* remove _tex from outnames

* Headers

* 003400 Vtx

* unknown mask

* LinkMask name based on renders
2023-06-28 23:49:15 -04:00
Derek Hensley
22035890fa
Idle + Main bss and cleanup (#1292)
* Idle bss and cleanup

* main bss and cleanup

* format

* Remove pad comment about sAudioMgr

* PR

* Missed a couple size_t changes

* unused pads

* static
2023-06-26 10:18:50 +10:00