Commit Graph

416 Commits

Author SHA1 Message Date
Anghelo Carvajal
76fadbd0e9
ovl_En_Door docs pass (#1603)
* DoorScheduleResult

* actionVar

* DOOR_DL_

* enums

* ENDOOR_TYPE_SCHEDULE and related stuff

* Name some functions and start figuring out stuff

* defines

* start documenting schedules

* Name Inn doors

* More door schedule naming

* ajar

* Name remaining schedule types

* parameters diagram and some cleanups

* Name renaiming types

* format

* rename some schedules

* Use more static_assert

* name anims

* yeet unrelated stuff

* requestOpen

* Yeet DoorScheduleResult

* whoops

* stuff i missed

* Update src/overlays/actors/ovl_En_Door/scheduleScripts.schl

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

* Update src/overlays/actors/ovl_En_Door/z_en_door.h

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

* Update src/overlays/actors/ovl_En_Door/z_en_door.h

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

* review

* Update src/overlays/actors/ovl_En_Pm/z_en_pm.c

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

* Update src/code/z_sub_s.c

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

* review

* FindScheduleDoor

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-04-22 18:34:02 -07:00
Jeff Padgham
47d43f2fa1
Mayor Dotour (ovl_en_dt) OK and documented (#1607)
* EnDt deecomp first pass, two nonmatching

* Some cleanup, got the big boy matching

* Some light cleanup, documenting blinking behaviour

* Fixed last non-matching with some permuter silliness

* Decompilation complete

* Mayor documentation, first pass

* Updating some unknown vars in baisen

* Added an enum for mayor's cutscene state

* Formatting pass for mayor

* Cleaning up unk var in mayor meeting method

* Some cleanup and changes based on PR feedback

* Another cleanup and fix pass based on PR feedback

* Updated mayor event flags according to their usage

* All the parentheses

* Another round of PR feedback cleanup

* Having another crack at naming/cleanup based on PR feedback

* Renaming animation symbols

* Fixing broken references in other actors from anim rename

---------

Co-authored-by: GinNoOokami <noreply>
2024-04-06 10:05:04 -07:00
Derek Hensley
a7fa8cc241
Clean2 (#1605)
* AnimationContext_Update

* TransitionTile_InitGraphics

* disasm files

* gPlayerFormItemRestrictions -> code_8012EC80

* fix

* Extract gCircleTex

* Const fixes

* gPlayerFormItemRestrictions suggestions

* Setup_InitRegs

* z_inventory
2024-02-20 14:04:23 +11:00
Tharo
7e716e120f
ovl_En_Kitan (#1535)
* Decompiled

* Documented

* Suggested changes, mention that on debug there is an assert(false) in EnKitan_GetQuestionMessageId

* Format

* Update
2024-02-07 10:21:54 -03:00
Derek Hensley
6a15ce9521
Extract Kanji + some adjacent docs (#1536)
* XML + docs

* PR

* newline

* newline pt2

* named textures in kanji.xml

* Kick Jenkins

---------

Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
2024-01-21 12:47:27 +11:00
Derek Hensley
fe6494187e
Text Extraction + some Message Docs (#1530)
* Some Decoder WIPs

* Improvements

* POC

* Fix bss

* another newline

* Staff OK

* Cleanup + fix progress script

* script cleanup

* Some docs

* makefile

* Extract text from extract_assets.py

* More docs

* Even more docs

* Other message assets

* Small cleanups

* Clean up decoders/encoders

* Message_SetupLoadItemIcon -> Message_DecodeHeader

* Some more docs

* Remove mkdmadata

* Fade Skippable

* More cmd docs

* 1 left

* Last notes

* HS_TIMER -> HS_TIME

* More general docs

* Format

* Note the charmap conversion for buttons in message_data_fmt_nes.h

* Remove trailing whitespace

* Small fixes

* PR
2024-01-19 21:16:57 -03:00
Derek Hensley
663834cbc0
Skybox Docs (#1534)
* xml

* Docs

* 0s
2024-01-14 15:56:19 -03:00
Tom Overton
54f7aa23b5
Add original asset names to all object_p* and object_r* files (#1519)
* Add original asset names to all `object_p*` and `object_r*` files

* Respond to review
2023-11-28 08:19:22 -03:00
engineer124
5284302c8f
z_en_test7.c Documentation Pass (#1497)
* copy over docs

* more docs

* some docs

* more docs

* small cleanup

* more small cleanup

* more small cleanup

* lerp time

* small reordering

* feather type

* general owl warp docs

* more cleanup

* rm redundant info

* PR Review

* PR Review
2023-11-27 21:21:52 +11:00
Tom Overton
3a952a655d
Boss05 (Bio Deku Baba) OK and documented (#1510)
* Init, Destroy, Update, easy actions

* Just the hard 3 + 1 left

* One left

* OK

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Data/bss in, extract colheader

* Clean up externs

* Better match for func_809EECBC

* Sfx

* Lot of naming

* fix build

* Name skel stuff

* name limbdraws

* name colliders

* Document `object_boss05`

* Port some names from Odolwa

* Name bio baba types (and relatedly clean up EnPp)

* Better names for the LimbDraw functions + some related vars

* Name all functions

* Name a lot of struct vars

* Colliders and body parts

* Name all struct vars (might come back for a few of these though)

* Name most stack vars

* Fragment states, ice data

* Limb rot index

* Damage effects

* Enum for hit reactions

* Enums for movement state/attack state

* Finish up

* Missed this in EnPp

* Respond to reviews

* Fix comment

* Reverse order for postlimbdraw, etc. functions

* Remove blank line at the top

* Respond to review

* Make a "getter" macro for the force detach timer

* Respond to review

---------

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2023-11-23 09:37:16 -03:00
Javarooster
282f84e3f3
Switched xml lines for gQuestIconSmallMagicJarTex and gQuestIconSmallKeyTex (#1513) 2023-11-23 14:54:01 +11:00
Javarooster
9eb3ee1306
Switch icon_item_static.xml offset addresses (#1512)
* Update icon_item_static.xml offsets

* Switched names for item_icon xml file

* Switched lines for icon_item_static.xml
2023-11-23 14:02:43 +11:00
engineer124
5ef277df2d
Animation Cleanup: En_P* (#1507)
* anim P cleanup

* PR Review

* PR Review

* Postbox Idle
2023-11-22 16:10:55 +11:00
Anghelo Carvajal
52c9137b48
Fix most hardcoded pointers in extracted assets (#1477) 2023-11-21 22:04:23 +11:00
Tharo
a441a3cb2d
Decompile ovl_En_Po_Composer (#1391)
* Decompiled, mostly named

* Few more labels and document object

* Review changes

* Further review changes

* Improve EnPoComposer_UpdateEnvColor

* PO_COMPOSER -> POE_COMPOSER, tweak animation names

* More changes

* OCARINA_MODE_EVENT

* fix merge

---------

Co-authored-by: angie <angheloalf95@gmail.com>
2023-11-10 09:52:11 -03:00
Tom Overton
42e1c438e1
Add original asset names to all object_n* and object_o* files (#1460) 2023-11-01 23:08:22 +11:00
engineer124
83ceaf3717
z_kankyo Decompiled (3 non-matching) (#1451)
* z_Kankyo progress

* build OK

* progress

* more progress

* Kankyo WIP

* Add docs

* func_800FEAF4

* more docs

* func_800FEAF4

* improve Init

* Small cleanup

* kankyo data

* data cleanup

* Environment_DrawLensFlare

* Match Environment_UpdateSkybox

* Match Environment_DrawRainImpl

* Start on Environment_UpdateLights

* Match Environment_DrawSandstorm

* gRainDropDL

* Some light renamings

* Fix merge

* cleanup

* improve non-equivalents

* cleanup

* PR Review

* match Environment_UpdatePostmanEvents

* PR Review

* small improvement to Environment_UpdatePostmanEvents from anon

* more cleanup

* void

* bits

* fix comment

* improve Environment_UpdateLights

* Skybox Stars Docs

* PR Review

* fix merge

* macros

* Add comments

* PR Review

* gRandFloat

* bug

---------

Co-authored-by: Rozelette <Uberpanzermensch@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-10-31 14:50:11 +11:00
Tom Overton
0492c8e89a
Document object_boss05 (Bio Deku Baba) (#1456) 2023-10-31 12:57:27 +11:00
Derek Hensley
23beee0717
ObjTakarayaWall OK (#1448)
* Takaraya Wall OK

* Docs

* Object docs

* Small cleanup

* undefined syms removal

* EnTakaraya_SpawnWalls docs

* PR

* Small cleanup

* Adjust comment

* PR

* More PR

* PR

* > 1

* ObjTakarayaWall_CanCarvePath
2023-10-29 09:33:07 -03:00
Tom Overton
2859cbbf5e
Boss01 (Odolwa) OK and documented (#1452)
* Boss01 (Odolwa) OK and documented

* Unify existing InitRand implementations

* Remove newlines after `// fallthrough`

* Respond to the rest of engineer's review

* Respond to most of anon's review

* Try to comment the shadow thing correctly

* Fix boss_01 after merge

* SEGMENTED_TO_VIRTUAL -> SEGMENTED_TO_K0

* Review

* Use DMG_SWORD_BEAM and update the comment in z64collision_check.h

* Respond to engineer's review
2023-10-29 08:29:43 +11:00
Anghelo Carvajal
c3b19739c6
map_grand_static and map_i_static (#1443)
* update makeyar.c

* xmls

* commit c files

* remove paddings and update the spec

* Tell ZAPD to not generate C files for the 2 problematic XMLs

* Rename symbols to follow style

* cleanup the generated files a bit

* comment on makeyar

* fix distclean deleting the `assets/c/` files

* actually fix distclean
2023-10-26 21:07:13 +11:00
Nuss
71fae65062
object_test3 (kafei) (#1431)
* naming

* improvements

* improvements

* ups
2023-10-24 08:32:07 +11:00
Anghelo Carvajal
1e19cfe869
Anju objects (#1444)
* bring over the objects from the other branch

* kafeis mask

* use symbols

* dman naming after assets

* stateFlags

* remaining stuff

* anim array bug

* Name everything in DmGm after DmAn

* WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED

* undef

* format

* idk

* ing

* format

* name animations from an4, thanks emil!

* emptydl

* disbelief

* review

* format

* Update assets/xml/objects/object_mask_kerfay.xml

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

* review

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-10-23 16:03:16 +11:00
Nuss
a468be77d5
object_owl (#1430)
* some naming

* naming

* comments

* improvements

* improvements
2023-10-23 10:31:55 +11:00
Wimmer
002f5ba6de
obj_oyu (#1436)
* object_oyu

object_oyu.xml / z_bg_goron_oyu.c updated

* Hot Spring Water Update

* updated comments

* GoronGraveyard prefix

* Update object_oyu.xml
2023-10-22 19:43:57 -03:00
Nuss
1d3f38dcaa
object_zoraegg (#1439)
* naming

* improvements

* bss order
2023-10-15 19:01:04 -03:00
Nuss
9e5777e473
object_po (#1426)
* naming

* typos and sLimbToBodyParts

* POE_LIMB_MAX instead of 21

* typos

* EnumName

* prefix
2023-10-15 21:02:31 +11:00
Wimmer
576cf6964c
Obj_visiblock (#1422)
* Obj_visiblock

Object for the Lens of Truth Platforms

* Update assets/xml/objects/object_visiblock.xml

DList update

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

* Update assets/xml/objects/object_visiblock.xml

Tex outname update

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

* Update z_obj_visiblock.c

DList name update

* Revert "Update assets/xml/objects/object_visiblock.xml
"

This reverts commit 228d6e8914.

* Revert "Update assets/xml/objects/object_visiblock.xml
"

This reverts commit 53a8786f26.

* Update object_visiblock.xml

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-13 14:23:09 -03:00
Wimmer
01d5816417
obj_big_fwall (#1435)
* Big Fire Wall

Big fire wall.xml / Z en encount3.c update

* RingOfFire update
2023-10-13 08:50:00 -03:00
Nuss
2c182bf7e3
object_icicle (#1421)
* Naming

* naming

* naming

* top comment
2023-10-11 10:44:20 -03:00
Tom Overton
dd4206bb24
Document object_jso (Garo and Garo Master) (#1428)
* Document `object_jso` (Garo and Garo Master)

* Fix TexAnim names
2023-10-10 12:11:21 +11:00
Nuss
e2dcde6a92
object_kinsta1_obj (#1415)
* naming

* Original naming

* Original naming

* wrong file

* Swamp Spider House Door

* naming

* ups

* fix
2023-10-09 22:13:48 +11:00
Nuss
e174672223
object_ladder (#1419)
* naming

* Original naming

* removed comments

* comments
2023-10-08 23:05:12 -03:00
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