Commit Graph

1463 Commits

Author SHA1 Message Date
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
Derek Hensley
a2c2c45a0e
Import some bss (#1301)
* flg_set

* EnItem00

* pad_801DC9C0

* EventMgr

* sPad

* files.txt

* const s32 sPad
2023-06-25 19:49:39 -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
541199888c
Setup for Player Cutscene Docs (#1270)
* player cs docs setup

* more docs

* more docs

* missed enums

* more docs, but broken. Need to fix sPlayerCsModeAnimFuncs

* fix

* rm enum

* more minor docs

* PR suggestion

* typo

* csActionFunc

* PR Suggestion

* fix bss

* fix bss
2023-06-25 08:33:22 -04:00
engineer124
21655f31c5
Audio Effects Cleanup (#1295)
* audio effects cleanup

* more cleanup

* header comments

* more docs

* cleanup

* file name fix

* swap if

* more cleanup

* move comment

* ADSR notes

* fix bss, pr review
2023-06-24 19:56:48 -04:00
Anghelo Carvajal
9b341a4d6a
A few UB fixes (#1272)
* Fix OoB in ObjDriftie

* Fix OoB in EnHorseLinkChild

* Fix negative shift in jpegdecode

* more oob fixes

* AVOID_UB

* clean

* huh?

* change viint.h macros

* objdriftice

* ub labelling

* review

* review

* fix z_parameter arrays

* u32 cast

* missing &
2023-06-24 18:40:26 +10:00
engineer124
19da43859e
Document Player's bgcheck routine (#1275)
* Thanks Fig

* cleanup

* more docs

* cleanup

* oops

* cleanup comment

* add comment to SurfaceType_GetSceneExitIndex

* fix bss
2023-06-24 16:39:55 +10:00
Derek Hensley
5619dc5b5e
Load Docs (#1222)
* Sync with OoT

* Macro cleanup

* Some cleanup/rename load system name to Fragment

* Format

* bss

* Some clarifying comments regarding fragments

* PR suggestions

* size_t and numRelocations
2023-06-24 14:26:36 +10: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
Tom Overton
11dac8d020
Name the weekeventreg that corresponds with the Clock Tower opening (#1303)
* Name the weekeventreg that corresponds with the Clock Tower opening

* Explanatory comment

* Drop IS

* Try to clean up the comment
2023-06-23 10:36:12 -04:00
Tom Overton
96a1d37084
Cleanup of Shooting Gallery actors (#1302)
* Change `EN_SYATEKI_*` enums/defines to `SG_*`

* Name shooting gallery weekeventregs

* Get rid of names on unions (this is what I wanted to begin with!)

* Use ARRAY_COUNT(sGuayFlagsPerWave) instead of 3

* Actually give a proper name for SG_DEKU_GET_PARAM_FF00

* Use anon's suggestion for path param name

* Remove comment that isn't true? What was I cooking back then

* Animation naming stuff + comments

* Tons of score and shooting game logic cleanup

* Fix build issues

* Some more Octorok docs

* Use ANIMMODE enum in EnShn

* Put a bug tag on the weird behavior in EnSyatekiWf
2023-06-21 09:29:16 -04:00
Nuss
763830b185
ovl_En_Dnh decompiled (#1289)
* all func except func_80A50D40

* func_80A50D40

* decompiled

* forgot an line

* improvements

* SkeletonHeader

* format

* forgot to remove wrong include

* D_80A5143C and improvements

* improvements

* added limb

* format

* forgot the header

* object_tro

* OutName fix

* improvements

* THIS upcast

* limb rename
2023-06-21 23:27:42 +10:00
Derek Hensley
35a0f70538
Doc schedule_dma_static (#1296)
* Doc schedule_dma_static

* Update assets/xml/archives/schedule_dma_static.xml

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* xml whitespace

* Remove unused from name

* pose

* ia8 -> large

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2023-06-21 19:00:07 +10:00
Derek Hensley
c0ac061e6f
AudioMgr cleanup (#1300)
* AudioMgr cleanup

* Remove D_801D14F0 from variables.h
2023-06-21 17:50:26 +10:00
engineer124
9c0fc94fe3
Audio Sfx Functions Decompiled and Documented (code_8019AF00.c) (#1242)
* sfx decomp and docs

* function headers

* namefixer

* oops

* better sfx name

* PR review

* namefixer

* PR review

* float

* namefixer

* namefixer

* namefixer

* PR Suggestions
2023-06-20 23:13:51 -04:00
SeDan01
7194936203
object_firefly Decomp (#1285)
* object_firefly dLists and skel

* most limbs, textures

* more limbs, comments, outnames.

* fixed d list name in z_en_firefly

* enum name fix, limbIndex numbers fix, root name fix

* llvm changes because of format.py

* deleted llvms and max limbs number fixed

* z_en_firefly changes after clang format

* error in the build because of these two

* fixed limbIndex issue and added enum names instead

* equal sign that was missing

* limbIndex number was wrong

* z_en_firefly.h include changes and morph/joint table changes

* build retry

* format.py again and build retry
2023-06-20 18:09:50 +10:00
Tom Overton
bea420f8a1
Create an enum for the various face_reaction reaction sets (#1299)
* Create an enum for the various `face_reaction` reaction sets

* Respond to reviews

* Add blank line
2023-06-20 17:50:15 +10:00
Anghelo Carvajal
a5cc630cef
Add yar (Yaz0 ARchives) support to build system (#1255)
* 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

* Update tools/buildtools/makeyar.c

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

* Update tools/buildtools/makeyar.c

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

* Update tools/buildtools/makeyar.c

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

* Update tools/buildtools/makeyar.c

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-06-18 18:13:57 -04:00
engineer124
0a55ca0b40
Document Song of Time Cutscenes (Test6) (#1269)
* import docs

* cleanup

* more eventinf docs

* more cleanup

* more docs

* more docs

* more docs

* sZoraBarrierEnvLighting

* comments

* PR Suggestion

* fix bss
2023-06-18 17:02:50 +10:00
Anghelo Carvajal
587d12e3cb
Yet another header cleanup (#1284)
* thread, scene and interface

* non header stuff

* fix missing stuff

* z64sound_source.h

* collision_check.h

* Update include/z64sound_source.h

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

* Update include/z64scene.h

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

* Update include/z64thread.h

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

* review

* review

* Update src/code/z_collision_check.c

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

* Update src/code/z_sound_source.c

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-06-18 16:43:47 +10:00
Tom Overton
9c40dea770
Document EnSyatekiOkuta (Shooting Gallery Octorok) (#1287)
* Initial docs

* Tons of stuff done

* Fix spacing thing now that the function is actually named

* Temporarily add un-macro'd flags as comment

* Name and document EnSyatekiOkuta_IsHiddenByAnotherOctorok

* Finish naming all functions

* Better macros + explanations

* Comments on a lot of functions

* Some stuff I was supposed to revert

* Fix merge issue

* Another merge fix

* Make data static + move it in-function

* Respond to engineer's review

* circleOrCrossAlpha -> hitResultAlpha

* Respond to more of engineer's feedback

* octorokHitType -> lastHitOctorokType

* Animation enum stuff
2023-06-17 18:15:55 -04:00