Commit Graph

383 Commits

Author SHA1 Message Date
Nuss
ab4c207be4
object_random_obj (#1416)
* naming

* Secret Shrine doors

* naming

* OutName
2023-10-08 22:25:49 -03:00
Nuss
d25e10dcc2
object_redead_obj (#1417)
* naming

* comment

* Out Name

* The Gibdo's Well Doors

* naming

* typos
2023-10-08 22:07:54 -03:00
Nuss
808f60a1fa
naming (#1425) 2023-10-08 21:39:15 -03:00
Nuss
5dced7a09b
object_f40_switch (#1418)
* naming

* naming to gStoneTowerFloorSwitch
2023-10-08 21:13:41 -03:00
engineer124
ae4a8fbe00
Object Name Cleanup (#1427) 2023-10-08 20:57:25 -03:00
Zach North
da0c9072f5
Document object_skb (#1404)
* object_skb: Limb and Anim docs

* object_skb: DL and text docs

* Formatting changed files

* Changed names for some bones to reflect oot names

* updating some names to address code review comments

* Whoops, forgot to change the name of MAX

* Rename EnHinkSkbAnimation in src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c

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

* Changed STALCHILD_ANIM_x to STALCHILD_HINT_ANIM_x

* forgot to rename both parts of a typedef enum

* gStalchildSwingOnBranch missing Anim tag

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

* Fixed all instances of gStalchildSwingOnBranchAnim

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-07 16:11:10 +11:00
Nuss
43df8f4454
object_comb (#1420)
* naming

* OutName
2023-10-07 15:47:03 +11:00
Nuss
a980067bd8
ovl_En_Takaraya decompiled (#1409)
* EnTakaraya_Destroy

* some matching

* some matching

* some matching

* matched func_80ADF7CC

* func_80ADEF74 wrong arg

* data

* clean up

* improvements

* actionFunc pointer

* fake

* improvements

* improvements

* naming for the bool

* function naming

* improvements

* improvements

* GET_PLAYER_FORM macro

* macro
2023-10-07 12:40:59 +11:00
Nuss
16bc54b63b
object_lightblock (#1414)
* naming

* Original naming

* sun block
2023-10-07 07:40:56 +11:00
Nuss
6ea91335c5
object_zl1 (#1381)
* object_zl1

* formating

* improvements

* offset

* order

* offset

* blobs

* offset
2023-10-05 21:45:26 -03:00
Tom Overton
ac8d49ea6f
Skeleton and shin name cleanup (#1413)
* Skeleton and shin name cleanup

* Use ANI_LIMB_MAX
2023-10-05 10:19:30 -03:00
MegaIDK
d635b81ee6
document object_kanban (cuttable sign) (#1364)
* initial commit of doc

* comment

* model and material

* indeed c file exists

* renamed confusing stuff

* space

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-04 13:31:06 +11:00
Anghelo Carvajal
f08a69a2cb
ovl_Bg_Dy_Yoseizo and related docs (#1390)
* Add ido setting to permuter

* OK

* Data imported & named, change spec

* Some easy naming

* Cleanup

* More object stuff and enums

* Document EnDyExtra

* Document DemoGetitem

* Document DemoEffect

* Some work on Elforg

* Elforg params macro, some more on Elfgrp

* Defines for number of fairies

* Tweak some flags wording

* Label beam

* Elfgrp: Name most of the stray fairy handling stuff

* cleanup

* fix typo

* GreatFairyAnimation

* name animations

* BgDyYoseizo_TrainPlayer

* Choose behaviour?

* fix merge

* format

* self review

* WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK

* jenkins

* review

* Update src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c

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

* review

* Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c

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

* Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c

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

* Update src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c

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

* Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c

* review

---------

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-04 08:13:22 +11:00
Tom Overton
9d043f0197
Add original asset names to all object_l* and object_m* files (#1403) 2023-10-03 17:26:50 +11:00
Zach North
0fdd63a350
Document object_mk (#1389)
* Updated object_mk animation, limb, and skeleton names

* Updated object_mk texture and DList names

* Added comment to object_mk.xml

* Remove "ing" from Anim names

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

* Update z_en_mk.c to not use "ing" in names

* Running formatter

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-09-28 13:19:28 +10:00
Tom Overton
b96732818a
Add original asset names to all object_k* files (#1388)
* Add original asset names to all `object_k*` files

* Comment first, name second

* Comment for object_ka
2023-09-24 08:49:04 -03:00
MegaIDK
c6d3115fd3
document object_ha (donkeys) (#1366)
* initial commit of doc

* line

* headerrr

* forgot about renamed anims

* format

* horrrse

* format
2023-09-24 20:10:06 +10:00
EllipticEllipsis
17e7f470e2
EnGe3 (Aveil) OK and documented, object_geldb documented (#1072)
* OK

* Import data

* Name functions and variables

* CSACTION enum

* Finish code documentation, do most of object

* Document object

* Finish docs

* Apply suggestions from code review

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

* More review

* Format

* Review

* Format

* fix merge

* weekEventReg

* PR

* review

* format

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2023-09-24 12:11:36 +10:00
Nuss
fa71fbeaab
Stone Tower Smoke (#1382)
* funen xml

* description

* outname
2023-09-19 15:04:23 +10:00
Tom Overton
548ea08838
Provide names (and original names) for all Termina Field cutscenes (#1373)
* Provide names (and original names) for all Termina Field cutscenes

* Respond to Anghelo's review

* Respond to isghj's review
2023-09-15 08:33:55 +10:00
MegaIDK
0c7b90cf97
document object_fish (#1359)
* initial commit of object_fish documentation

* spaces after offset

* separate categories

* extra owner

* name changes

* forgor the .c

* format

* changed name of funcit

* forgor some OutName
2023-09-14 21:48:57 +10:00
Tom Overton
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
MegaIDK
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
MegaIDK
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
Isghj
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
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
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
Tom Overton
138dd55662
Document object_tl (Snapper) (#1349)
* Document object_tl (Snapper)

* Rename skelAnimes/jointTables/morphTables
2023-08-12 17:31:46 +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
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
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
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
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
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
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
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
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
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
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
283a37affb
Misc Cleanup 2 (#1306)
* Cleanup undefined_syms.txt

* removed unused from Bba textures

* eyegore beamos textures

* object_eg Unused -> Beamons

* ssh

* segment 0x07
2023-06-25 08:44:42 -04:00
engineer124
aa9e368561
icon_item_static and icon_item_24_static documented (#1297)
* extract_archives.py

* autogenerated xmls

* build OK

* cleanup

* Use symbols in gItemIcons

* change how archives are generated

* makeyar in C

* Rename segments

* rename .archive.o to .yar.o

* Explanation at the top of programs

* fix progress calculation

* Ignore archives in progress script

* merge

* document icon items

* cleanup

* remove duplicate headers

* jap -> jpn

* PR review

* link human

* PR Review

* missed some

---------

Co-authored-by: angie <angheloalf95@gmail.com>
2023-06-23 10:57:01 -04:00