Commit Graph

437 Commits

Author SHA1 Message Date
Derek Hensley b9ea1c19ab
Remove assets from automatic includes (#1683) 2024-09-10 15:16:56 -03:00
Derek Hensley e982c44721
Import data + bss (#1676)
* extract gfxprint font data as blobs

* Remove font from fault_drawer out name

* audio heap bss

* audio sequence bss

* audio session config bss

* Move code_801D1E80 down in the spec

* Gfxprint don't just include generated c file
2024-09-07 15:03:00 -07:00
Tharo f33aba87cc
[Audio 7/?] Extract sequences to assembly (#1677)
* [Audio 7/?] Extract sequences to assembly

Co-authored-by: MNGoldenEagle <17274702+MNGoldenEagle@users.noreply.github.com>
Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>

* Changes from OoT PR reviews

* Remove unused multiprocessing import and regen assets/xml/audio/sequences

---------

Co-authored-by: MNGoldenEagle <17274702+MNGoldenEagle@users.noreply.github.com>
Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>
2024-09-04 13:51:51 -04:00
Derek Hensley e8cd6e622f
Extract sFaultDrawerFont as blob (#1673) 2024-08-14 17:08:40 -04:00
Tharo fb7f6f1743
[Audio 2/?] Extract audio samples to wav (#1670)
* [Audio 2/?] Extract audio samples to wav

Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>

* How

* Hopefully fix warning I don't get locally

* [OoT Review] Pad default sample filenames, comment on the vadpcm frame encoder functions, other suggested changes

* Small tweaks to above

* Remove some obsolete code

---------

Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>
2024-08-08 19:39:12 -07:00
Tharo 6c4896d947
[Audio 1/?] Extract Samplebanks and Soundfonts to XML (#1666)
* [Audio 1/?] Extract Samplebanks and Soundfonts to XML

* Remove config.py in view of using config yamls for addresses in the future, implement suggested changes from OoT review

* Remove some commented out dead code, adjust setup-audio in makefile

* Move audio extraction from setup to assets in makefile
2024-08-08 14:11:38 +10:00
Derek Hensley 43cac34566
Misc Cleanup (#1665)
* prefix in-function static data in z_scene_proc with s

prefix in-function static data in z_eff_blure with s

prefix in-function static data in Graph_TaskSet00 with s

prefix in-function static data in Fault_SetOptions with s

* Use uintptr_t in main

* hardware_regs.ld

* Remove some unessary blob comments

* object_link_child_TLUT_00DA80

* object_kz texture and tlut

* initialize typos
2024-07-28 13:04:09 -04:00
Derek Hensley bd776e6bf5
Extract Keyframe Assets data (#1664)
* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "c31c5e9fe"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "c31c5e9fe"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* extract keyframe data

* initialize typo
2024-07-28 12:31:28 -04:00
Tharo 1685597d9a
ovl_En_Knight OK (#1659)
* En_Knight matching

* Cleanup

* Fix

* Documentation Pass

* Suggested changes. Use IGOS_LIMB_* whenever it's guaranteed that the skeleton is gIgosSkel, still using KNIGHT_LIMB_* whenever it's ambiguous

* Remove related undefined syms

* More suggested changes

* BODYPART_NONE and bodypart enum

* Suggested changes

* Braces

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* csCamId

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Various suggestions

* EnKnight_UpdateLimbCollider -> EnKnight_SetColliderSphere

* Yase/Debu -> Thin/Wide

* csCam -> subCam

* Format

* Fix

* animTranslation -> animMovement, dmgEffect -> drawDmgEff

* More brackets

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

---------

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2024-07-24 17:05:51 -07:00
Derek Hensley fb2ac7ecce
Document object_bob (#1656)
* Document object_bob

* Better prefix for object_cne

* object_bba better prefix
2024-07-14 18:49:44 -07:00
Derek Hensley 1a003f9460
More General Cleanup (#1658)
* gDs2nEyeTexAnim

* sEnMm2EmptyDL

* object_um_Matanimheader_007D10

* object_mnk_Matanimheader_019A20

* gTurtleEmpty2TexAnim

* object_iknv_obj_Matanimheader_0113E0

* object_botihasira_Matanimheader_001A48

* gTwinmoldEmptyTexAnim

* gBeaverYoungerBrotherEmptyTexAnim

* gNwcEyeTexAnim

* gTwinmoldEmptyTex1Anim gTwinmoldEmpty2TexAnim

* gGyorgEmpty1TexAnim gGyorgEmpty2TexAnim

* gBurlyGuyEmpty1TexAnim gBurlyGuyEmpty2TexAnim

* gKotakeEyeTexAnim

* gDmZl4EmptyTexAnim

* object_cs_Matanimheader_00F6D4

* gAnju1UnusedTexAnim

* Empty blobs

* EnKusa_IsUnderwater

* IsUnderwater functions

* s on static variable names in col check

* scene_texture_01_Tex_002D40

* object_ds2_Tex_0030D8 object_ds2_Tex_0034D8 object_ds2_Tex_0038D8

* object_gk

* undefined_syms

* object_fall2_Matanimheader_005CF0

* gTwinmoldEmpty1TexAnim typo
2024-07-11 15:41:28 -04:00
Tom Overton 2f653a6037
Add original asset names to all `object_t*` files (#1657) 2024-07-09 17:51:46 -07:00
Tom Overton eccbbd47dc
Explicitly extract room DLs that ZAPD can't detect (#1653) 2024-07-02 13:51:52 -07:00
Tom Overton bb221b4a0f
EnOkuta (Octorok and its projectiles) OK and documented (#1641)
* Match EnOkuta

* Match data

* Use the generated reloc

* Delete extern stuff and format

* Extract the DL

* Fix lots of stuff

* Copy a lot of names over from EnSyatekiOkuta

* SFX enums

* Lots more stuff

* Constants and other stuff

* Some more stuff I missed

* Name more functions using OoT/SyatekiOkuta as reference

* An easy function I missed

* Some floats

* Getter macros

* Types enum

* Name the cylinder inits a little clearer

* Create bodyparts enum and name all data

* Name all functions

* Name `timer` struct var and all temps

* Name the `jumpHeight` struct var

* Create damage effect enum

* Name the extracted DL

* Name `numConsecutiveProjectiles`

* Finish docs

* Document XML

* Clarify that this blue Octorok isn't the shooting gallery one

* Respond to reviews

* Stuff

---------

Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-06-23 18:09:22 -07:00
Tharo 384115d2a0
ovl_En_Death and ovl_En_Minideath (#1645)
* En_Death new build system edition

* Fix merge

* Matched

* Fix merge

* Some names

* Suggested changes

* Further suggested changes

* Add value comments to MinideathAction
2024-06-20 18:36:11 -07:00
mzxrules 2c680efa91
z_map decompiled (#1032)
* First batch of functions

* more ok

* z_map_data OK

* More OKs, MinimapList ZAPD breaking change

* func_80103A58 improvements, more OK

* func_80106D5C and func_801091F0 decomped

* func_801031D0 decomped and some fixes

* house cleaning, more OKs more decomp

* Even more OKs

* func_80105C40 almost OK, more OKs

* func_80108AF8 OK and more

* All functions attempted

* func_8010534C OK

* Start documentation, rename DoorCtx

* More OKs, split map_data.data, more doc

* incremental clean-up, more function names

* more function names

* func_801068FC OK

* old uncommitted changes

* minor tweaks

* implement easy fixes

* more fixes

* z_map_disp OK, implement more suggestions

* delete utility program

* migrate data

* TransiActor ->TransitionActor

* Major documentation pass

* first pass of changes

* warning fix attempt, revert ZFile.cpp

* Fix FAKE match

* Easy fixes

* implement gDPLoadTextureBlock_Runtime

* z_demo bss patch

* Extract white square texture

* Implement more suggestions

* rework MapIndex/DungeonIndex

* revert dungeonSceneIndex -> mapIndex in some spots, implement suggestions

* more suggestions

* minor nits

* fix #include
2024-06-20 18:21:37 -07:00
Wimmer bd596f9869
obj_tab (#1495)
* obj_tab

* obj_tab update

removed (actorfunc) and moved the LIMB enum

* object_tab update

* PR Review

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-06-11 17:59:53 -07:00
Parker 34e326bc34
obj_b_heart documentation continuation (#1642)
* obj_b_heart

Unused Heart Piece object

* Update object_b_heart.xml

* fixing name

---------

Co-authored-by: Wimmer <71473855+Wimmerrad@users.noreply.github.com>
2024-06-05 16:59:09 -07:00
Tharo 44057c087a
ovl_En_Wdhand (#1629)
* 2 non-matching

* Matching

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

* Cleanup + docs

* Suggested changes

* Format

* Update EnWdhand_GetInitVelocity

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-05-19 10:18:34 -07:00
Tharo c609d3dcae
c_keyframe.c decompiled and documented (#1630)
* 2 non-matching

* 1 function left

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

* Fully matching

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

* Documented, has bss reordering issues

* Fixes

* Apply suggestions

* Format

* Re-add cast oops

* Remove != 0 for override and transform limb draws, format

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-05-17 08:29:19 -04:00
Archez 77ea785cc1
fix song of time vtx count (#1624) 2024-05-08 10:48:28 -04:00
Tom Overton 6126e72df3
Add original asset names to all `object_s*` files (#1619) 2024-04-29 07:50:30 -07:00
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