Commit Graph

358 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
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
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
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
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
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
Nuss
e73034f8cd
object_snowwd (#1293)
* rename

* prefix fix
2023-06-17 13:42:40 -04:00
Nuss
21671975ec
ovl_En_Snowwd decompiled (#1276)
* ovl_En_Snowwd decompiled

* formatting

* improved

* improvements

* D_80AF7AC8

* params

* D_06001AA0

* improvements
2023-06-11 09:35:09 -04:00
SeDan01
e19b139504
Tree Asset Decomp for object_tree (#1278)
* Basic Tree Asset Decomp

* renamed outnames

---------

Co-authored-by: Yoe <you@example.com>
2023-06-10 10:31:39 +10:00
Derek Hensley
8c961f2b16
Play_Hireso (Bombers Notebook) OK w/ Docs (#1235)
* Start

* Try every function

* Import data

* Docs from message branch

* Fix non-equivalency for func_8016AE1C

* Everything looks NON_MATCHING

* Some more clean up and docs

* Some cleanup

* Small format

* Small improvements here and there

* Match a couple

* Anotha one

* and than there was 1

* and than there were none :)

* Lots of docs

* Finish code docs

* schedule static

* Macros + cleanup

* text ids array cleanup

* Entries cleanup

* Use sBombersNotebookEntries in macros

* Some docs from message branch

* eventIndex -> event

* Remove outdated comments

* PR

* BOMBERS_NOTEBOOK_ENTRY_SIZE

* tables

* Token pasting to simplify

* Some more fixes

* PR pt 1

* Format

* Bring over BombersNotebook docs from z_message branch

Co-authored-by: ZoeyZolotova <zoey.zolotova@gmail.com>

* Full enum glory

* Format

* Name weekeventregs

* typo

* Some comments

* bss

* Review

* bss

* Update src/code/z_play_hireso.c

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

* Fix

* Namefixer

* bss

* Format

* 0 = 0x0000

---------

Co-authored-by: ZoeyZolotova <zoey.zolotova@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-06-06 10:54:50 -04:00
engineer124
8cabbb1a2b
File Select (1 Non-Matching) (#1158)
* Everything below Main OK,
and some small ones at the top

* 3 more short ones

* FileChoose_Main

* SelectModeUpdate/Draw

* SelectMode update functions done

* 2 more small ones

* ConfigModeDraw

* SetWindowVtx

* FileChoose_FadeInMenuElements

* Rest of the Config Mode Update Functions

* Minor cleanup

* FileChoose_UpdateMainMenu

* Make xml for title_static

* Minor correction

* One nasty draw, thanks Synray

Co-Authored-By: Synray <31429825+Synray@users.noreply.github.com>

* import data

* some cleanup

* import OoT docs

* missed some docs

* some progress

* FileSelect_SetWindowContentVtx WIP

* improve FileSelect_SetWindowContentVtx

* match z_file_nameset_NES

* cleanup and docs

* title static

* a few more functions

* even more functions

* small cleanup

* Data Cleanup

* 2 more matches

* z_file_choose_80807940 OK

* cleanup

* fix merge master

* FileSelect_DrawFileInfo wip

* small cleanup

* minor

* fix merge

* match FileSelect_DrawFileInfo

* cleanup

* fix merge

* fix merge

* sram cleanup

* document select mode

* many docs

* more docs

* more cleanup

* small nitpick

* consistency

* more cleanup

* more cleanup

* small

* small typos

* octal bad

* pr review

* noop

* elliptic review

* more review

* non-matching

* oops

* more suggestions

* keyboard formatting

* fix master

* sound

* padding

---------

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
2023-06-05 15:03:02 -04:00
TrulyNaN
0261dc0a5c
ovl_Bg_F40_Swlift OK and documented. obj_f40_obj documented. (#1171)
* Ported ovl_Bg_F40_Swlift to most recent zeldaret/master.

* Ran formatter.

* Attempt at fixing formatter problem.

* Applied PR changes suggestions and added authors

Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: Isghj5 <isghj5@gmail.com>
Co-authored-by: Tom-Overton <tom.overton@outlook.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>

* More PR fixes. Put object_f40_obj unused descriptor as comments. Added another author.

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

* Fixed some effect of handling merge conflicts. Some early returns added and renames in object_f40_obj.xml

---------

Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: Isghj5 <isghj5@gmail.com>
Co-authored-by: Tom-Overton <tom.overton@outlook.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
Co-authored-by: AngheloAlf <angheloalf95@gmail.com>
2023-06-02 14:25:03 +10:00
StickyThwomp
95c5796e41
ovl_En_Go OK and documented (Decomp was mostly done already) (#1080)
* Match remaining functions in z_en_go:

- Changed some already matching functions for uniformity with the tricky match (early continue from loop). In some cases, this eliminated some strange constructs, in others, it didn't leave much difference.
- Comments/Notes to start understanding/naming process.

* WIP renaming

* More WIP renaming.

* More renaming, Effects (See oot for continuation) and some flags)

* MessageScript documenting.

* Util for dumping message data by textId value.

* Identify some messages.

* Formatting, figuring out event flags.

* More WIP naming

* WIP renaming.

* WIP renaming

* WIP naming and organizing

* WIP more renaming.

* WIP renaming/organizing.

* Near-Final Cleanup before review.

* Rename Taisou and Hakugin animations and associated functions/variables.

* Misc Cleanup.

* Undo changes to variables.txt

* Removed msgtableparser.py (Split to another branch)

* Removal of uncompiled Message Script details.

* Fixup spec file

* First part of hensldm's suggested changes from review. Awaiting discussion.

* Second part of hensldm's suggested changes.

* Fixup missed 'Animation' suffix and functions.txt

* Update .xml files and related source per tom-overton's comments

* Align w/ engineer124's Quake Cleanup #1102

* fixup

* Run format.sh after merge.

* Add brackets around one-line conditional blocks

* Remainder of hensldm's comments from review.

* First pass at Elliptic's comments.

* Rename functions UpdateToX -> ChangeToX

* Header cleanup.

* Run Format, remove accidental commit of .orig file.

* Fixup ActorInit

* Review comments addressed, plus a few unsolicited changes.
- Location of function declarations moved above static data, below types: References in the codebase were mixed, but this just made more sense.
- Function name changes: It didn't fit into subsystems based on Goron Type, so I quit trying to name functions that way. Loss of a bit of "which function applies to which type", but it looks a bit cleaner, sooo...
- Took a stab at making effectTable usage a bit clearer. Just using a EnGoEffect* everywhere and not inherently knowing if it was for one element, or an array really bugged me.
- "GraveBro" names changed. They're all "brothers".

* Changes from engineer124's review.
- "Stretcher" replaced with "Athletic" as a descriptor of goron type.
- Misc formatting and naming changes

* Restructure switch-case statment for early break, and added missing default cases. Removed #define for 0 for actionFlags bitmask.

* Relocate WEEKEVENTREG comments, remove SCENE comments.

* Updated WEEKEVENTREG define names

* Update WEEKEVENTREG names in Goron Shrine Door.

* ELDER -> ELDERS, and revert formatting on z64save.h

* Fixed re-applying changes over wrong defines.

* Adjust Weekeventreg names and comments.

* Update comment as well.
2023-06-02 13:30:48 +10:00
Lucas Shaw
72c4f378cb
ovl_Demo_Moonend ok (#1249)
* Progress

* one more

* OK

* update

* finished z_demo_moonend

* update reloc

* actually updated reloc

* fix symbols

* made suggested changes

* reformat

* Made suggested changes

* forgot to run format.py

* made suggested changes

* made suggested changes

* moved cueid to be in scope
2023-05-31 11:01:08 +10:00
louist103
f8ac9d2e9a
fbdemo wipe 3 Matching (#1254)
* OK

* PR fixes

* someone please add clang-format-11 to the AUR thanks

* Add outname

* Update z_fbdemo_wipe3.c

* ARRAY_COUNTU
2023-05-30 00:07:04 -04:00
engineer124
aa0a968791
Kaleido OK & icon_item_vtx_static (Documented) (#1243)
* Begin Kaleido

* WIP

* DW macros for gbi

* More Progress

* Match KaleidoScope_GrayOutTextureRGBA32

* DrawGameOver wip

* Add some function names

* A few more matching, some docs

* More docs, data wip

* Import Kaleido Data

* Data cleanup

* Some progress

* Match TitleCard_Draw Again (Thanks Roman)

* Match KaleidoScope_DrawDebugEditor

* KaleidoScope_UpdateDebugEditor WIP

* Some cleanup

* z_kaleido_debug.c OK

* Cleanup

* match func_8081B6EC

* more wip, data cleanup

* match func_80825A50

* match KaleidoScope_InitVertices

* cursor progress

* name func

* item headers

* match KaleidoScope_DrawItemSelect

* KaleidoScope_UpdateItemEquip WIP

* match kaleido item

* doc kaleido item

* z_kaleido_prompt ok

* kaleido mask setup

* small cleanup

* kaleido mask OK

* mask cleanup

* small fix

* quest page setup

* doc save prompt

* sync with prompt docs

* KaleidoScope_Update WIP

* More progress on KaleidoScope_Update

* kaleido update cleanup

* KaleidoScope_Update OK

* Slightly cleaner match in KaleidoScope_Update

* match KaleidoScope_DrawPages and KaleidoScope_DrawGameOver, organize data

* more cleanup

* match KaleidoScope_Draw and KaleidoScope_SetView

* match KaleidoScope_UpdateNamePanel

* match another 2 funcs, segment docs

* another KaleidoScope_UpdateNamePanel ?

* swap update name panel names

* another match, only 2 large/similar vtx function in kaleido nes

* more setup for drawInfoPanel

* match KaleidoScope_DrawDungeonStrayFairyCount, 8 funcs left

* document KaleidoScope_DrawDungeonStrayFairyCount

* KaleidoScope_DrawInfoPanel1 WIP

* match KaleidoScope_DrawInfoPanel2

* gameover pause states

* name two pause states

* match KaleidoScope_UpdateDungeonCursor and KaleidoScope_UpdateWorldMapCursor

* match KaleidoScope_DrawDungeonMap

* KaleidoScope_DrawWorldMap WIP

* cleanup map

* some cursor/texture docs

* more cursor docs

* KaleidoScope_UpdateQuestCursor wip

* match KaleidoScope_UpdateQuestCursor

* quest cleanup

* KaleidoScope_DrawQuestStatus WIP, broke gakufu

* match KaleidoScope_DrawInfoPanel1, Kaleido NES OK

* pause substates

* more cleanup

* map progress

* very small improvements to KaleidoScope_DrawWorldMap

* match KaleidoScope_DrawWorldMap

* cleanup KaleidoScope_DrawWorldMap

* rematch EnGakufu_ProcessNotes, thanks anon58

* gameover and misc docs

* more docs

* small cleanup of maps

* owl warp and other docs

* symmetry in pause state

* some docs and cleanup

* docs

* more docs from OoT WIP

* fix

* quest page docs

* more enums

* more cleanup and enums

* another round of docs

* doc cursor indices

* map docs

* some docs

* cleanup for-loops

* cleanup

* else if

* small docs

* icon_item_field_static

* dungeon static

* eol

* icon item jpn static

* vtx static

* jpn static comments

* import parameter texture functions

* mask cleanup

* sync with PRs

* some docs

* more docs

* fix bss

* some docs

* sync with PR

* quest docs

* fix quest vtx

* sync with PR

* sync with PR

* fix typo

* small cleanup

* vtx madness

* more vtx

* add quad docs

* cleanup vtx

* cleanup

* cleanup

* revert gbi changes

* cleanup

* more cleanup

* another cleanup

* remove empty comment

* some PR review

* more naming suggestions

* namefixer

* L button to Z button

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-05-29 12:04:21 -04:00
Derek Hensley
fc475a9756
Docs Cleanup (#1153)
* sysheap

* Gorons

* Update goron comment

* functions.h

* Update src/boot_O2/system_heap.c

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

* add header

* Fix header guards

* Update data

* Add malloc and free to header

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-05-29 13:04:07 +10:00
Thomas
20f7e2199a
ovl_Bg_Tobira01 OK and documented (#1247)
* Decompiled source of tobira01

* Documented and formatted in prep for merge request

* Added spacing, renamed unused back to what it was, added definitions, changed 1.6666 to division

* Ran weekeventreg script, added additional spaces throughout the file, removed the macros for 0 and 60, updated some missed this casts, renamed spot11 out names

* Converted gSaveContext calls over to CLEAR_WEEKEVENTREG calls from review feedback

* Reformatted some files

* More review feedback

* Removed _tex
2023-05-28 14:19:53 -04:00
Tom Overton
c84eab6efb
z_fbdemo_wipe1 OK and assorted asset cleanup (#1244) 2023-05-27 10:28:27 +10:00
Zakru
35c45eab70
EnAnd OK and documented (#1224)
* EnAnd before data

* EnAnd data

* EnAnd preliminary renaming

* EnAnd document object

* EnAnd finalize pre-PR documenting

* EnAnd style improvements

* EnAnd refactor eye textures

* EnAnd make some parts more explicit

* EnAnd cutscene refactor according to suggestions

* EnAnd style improvements
2023-05-15 20:51:47 +10:00
Tom Overton
40846f3d3a
Ensure all boss title cards are extracted as IA8 (#1230) 2023-04-20 22:39:08 +01:00
Anghelo Carvajal
543c38ae06
z_player_lib: Dawn of the final PR (#1142)
* Player_GetMask and Player_RemoveMask

* some comments

* Player_ActionToBottle and Player_GetBottleHeld

* Player_DrawGetItemImpl and Player_DrawGetItem

* func_80123420 OK

* Decompile a few more functions

* Decompile a few more functions

* func_80122760

* func_80122868, func_801229A0 and func_801229EC

* func_80122F28

* func_8012301C

* func_801242B4

* func_801242DC

* func_80124420 nonmatching

* func_80126440

* func_801240C8 and func_801240DC

* func_8012405C and func_80124088

* func_80124020

* Player_IsBurningStickInRange

* func_8012754C

* func_80125318 and func_80125CE0

* func_801229FC

* func_80127B64

* func_80127488

* func_80122D44

* func_80122BA4

* func_80122C20 attempt

* func_80122EEC

* func_80122F9C

* func_80122FCC and func_8012300C

* func_80123448

* func_801234D4

* func_801235DC

* func_80123960

* func_80123BD4

* func_80123AA4

* func_801239AC

* func_801241B4

* func_80123C58 and func_80123C90

* func_80123D50 and func_80123DA4

* func_80123DC0, func_80123E90 and func_80123F14

* func_80124110 and func_80124148

* func_80124168 and func_80124190

* func_80124278

* func_80124F18 non_equivalent

* func_80125340 and func_8012536C

* func_801263FC

* func_801265C8

* func_8012669C

* func_80128B74

* func_80123140

* func_801246F4

* func_801253A4 NON_MATCHING

* func_801262C8

* func_80126AB4

* func_80126B8C

* func_80127438

* func_801278F8 NON_MATCHING

* Fix data split

* cleanup externs

* func_80128BD0 compiles...

* Rename Player_SetEquipmentData

* fix merge issues

* Fix types

* Improvement? Worse? I don't know at this point

* func_80128640 attempt

* func_80127BE8

* func_80127A60

* func_80127594 attempt

* func_801271B0

* func_8012364C NON_MATCHING

* func_80124618

* func_80124CC4 non matching

* func_801251C4

* func_80125580 non equivalent

* func_80128388

* cleanup

* remove some hardcoded pointers

* object symbol cleanup

* func_80124870 NON_EQUIVALENT

* name overridlimbdraw arguments

* func_80125D4C NON_EQUIVALENT

* func_80126BD0 NON_MATCHING

* Match func_80126BD0 thanks to anon58

* func_80127DA4 NON_EQUIVALENT

* fix merge issues

* some stealing from OoT

* small rename pass and cleanup

* Improve some

* CLAMP and fix warnings

* func_80125580 matched by mzx

* cleanup func_80128BD0  a bit

* import data

* func_80124CC4

* Rename objectFileTable to gObjectTable

* Improve func_80124FF0 thanks to maide

* fix renames

* Match func_80124FF0 thanks to Maide

* cleanup

* More cleaning up

* import bss

* Add PLAYER_STATE macros

* a bit more of cleanup

* run formatter

* func_80128BD0 a bit more deecent

* Add player limb enum

* Use limb enum

* cleanup and format

* Use symbols for player dlists groups

* A bunch more of pointers

* more object pointers

* Change the remaining object pointers

* Add a few missing dlist in link_child

* Small rename

* whoops

* Work on NON_MATCHINGs

* Cleanup

* Steal OoT renames from "sword" to "meleeWeapon"

* Fix some symbols

* Match func_80127594 and format

* Match func_80127DA4

* Matched func_801284A0

* Annotate D_801F59AC

* Matched func_80128640

* Some cleanup

* format

* stuffs

* some cleanups

* import stuff from pr

* swords and shields

* fixes

* bss

* cleanup Player_OverrideLimbDrawGameplayCommon

* progress on func_80125D4C

* PlayerMeleeWeapon enum

* Player_BButtonSwordFromAP

* GET_B_SWORD_FROM_AP

* GET_MELEE_WEAPON_FROM_AP

* PlayerBottle

* PlayerExplosive and PlayerSword

* misc fixes

* Various changes fromplayer_actor

* z64player.h stuff from player_actor

* Fixes

* skelanime stuff

* placeholders on z64item.h, save macros and ther cleanups

* <= PLAYER_AP_MINUS1

* Player_UpdateBunnyEarsKinematics

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* cleanup

* bodyPartsPos

* comment

* sizeof(u16)

* typo

* merge fixes

* fix

* fixes

* format

* fix merge

* fix merge

* func_80125D4C

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* func_80128BD0 improvement

* minor renames

* format

* whoops

* small cleanup

* Update src/code/z_player_lib.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* format

* _B_

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

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

* format

* remove gap

* whoops

* clanups

* remove stuff from permuter_settings

* steal some OoT docs

* some other docs vscode didn't add to the last commit

* format

* data as infunction-static data

* OoT docs stealing

* Improvements on Player_PostLimbDrawGameplay

* More improvement

* Match Player_PostLimbDrawGameplay

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* cleanups

* Convert unk_AF0 into an union and some other cleanups

* bss

* headLimbRot and upperLimbRot

* fix naming

* cleanups

* bss

* bss

* Update src/code/z_player_lib.c

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

* pr review

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* bss

* gesture

* namefixer

* gestureInfo

* IA_MIN and BOTTLE_EMPTY

* review

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* review

* D_801F59B0_LEN

* Remove LevelOfDetail enum

* bss

* review

* review

* gLinkDekuClosedFlowerDL gLinkDekuOpenFlowerDL

* _B_

* Player_DrawStrayFairyParticles

* fix build

---------

Co-authored-by: kyleburnette <kyle@kyleburnette.com>
Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-04-18 23:01:05 -04:00
Blythe
255c4599bf
ovl_En_Slime & object_slime OK and documented (#1175)
* decomped init, draw

* started slime

* finished func decomp en_slime

* object_slime and en_slime updates

* updated a few names

* finished up some naming

* en_slime and object_slime OK and documented

* slime xml cleanup

* Code cleanup round 1

* Cleanup 1 - missed a note

* Fixed improper use of bgcheck flags

* Some cleanup

* Namefix, name cleanup

* Function name cleanup, misc cleanup

* More name cleanup (pre-merge)

* Update color filter flag constants

* Tidying

---------

Co-authored-by: Blythe Hospelhorn <35576053+bhospelhorn@users.noreply.github.com>
2023-04-15 14:56:23 +10:00
krm01
34f9fb9886
[Doc] small, names for mayor dotour's eye and eyebrow textures (#1220)
* some naming and tlut assignments to dt eye textures

* update dotour overlays with new texture names

* critical formatting fix
2023-03-30 20:57:26 +11:00
Isghj
e50ab59cf7
Documented object_sth and object_ahg, both used by EnSth (Moon gazer who wants to buy Ocean spiderhouse) (#1169)
* object_sth/object_ahg: docs

* Ssh: formatter

* Apply suggestions from code review

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

* Oops missed one

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

* Seth: fixes

* Sth: more requested changes

* Apply suggestions from code review

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

* Sth/Ahg: requested changes

* Apply suggestions from code review

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

* Sth: further function name requested changes

* Sth: minor note

* Sth: fix animation name

* Sth: forgot to rename saved flag

* Seth: change ocean wallet week reg name

* Sth: some requested changes

* Sth: fixed week event reg, added more

* Sth/Ssh/Si: changed from two defines to 1

* Si/Sth/Ssh: mistook fanfare for sfx, token define renamed

* Sth/Ssh/Sekihi: requested changes and some weekregflag docs

* Sekihi: fix missing header for skull count

* Sekihi: moved flag description to z64save

* Sekihi: moved flag description to z64save

* Sth: removed flag

* Update include/z64save.h

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

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2023-03-07 20:54:12 -03:00