Commit Graph

1733 Commits

Author SHA1 Message Date
Derek Hensley 9e72c240d9
Z_message (2 NON_MATCHINGS) (#1398)
* matched func_8014D62C

* matched func_8014D304

* matched func_80149048

* matched func_80159438 & func_8014CDF0

* matched Message_GetState

* matched func_80152CAC

* matched func_80149454

* matched func_801491DC

* matched func_80150A84

* matched func_801496C8

* matched func_80149C18

* func_8014995C progress

* matched 8014995C

* matched func_80153EF0

* fix MessageContext lottery guess array size to match func_801496C8

* matched 80148D64

* matched func_8014AAD0

* progress func_8014CFDC

* matched func_8014CFDC

* progress func_801514B0

* progress#2 func_801514B0

* matched func_801514B0

* progress func_8014C70C

* Progress on few functions

* fix some variables & func name

* change unk11F00 type and usages

* func_8014C70C matched

* match func_8015268c

* fix building

* format

* engi message WIP

* enums, cleanup

* missed one

* oops

* even more enums

* another oops

* func_8015E7EC NON_MATCHING

* cleanup Message_DrawTextCredits

* MSGMODE cleanup

* import sFontWidths

* Import z_message_nes data

* Message_DrawTextNES draft

* fix types in message_nes

* Message_DrawTextNES NON_EQUIVALENT

* Message_DrawTextNES improvement

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

* Import bss

* fixes

* Data clean up

* Delete Message_Decode m2c output

* Readd Message_Update data

* import data

* func declaration

* cleanup

* Language enum

* fix naming, some flags

* Update functions and variables related to the bombers notebook event queue.

* Update renamed variables.txt

* format

* attempt Message_DecodeCredits

* begin Message_DecodeNES

* decode cleanup

* incremental improvements on Message_DecodeNES

* oops

* more progress

* first attempt at Message_Decode

* cleanup Message_Decode

* Message_Decode progress

* good progress on decode loops

* more progress

* good Message_Decode progress, thank anon

* decode creep

* big improvements, thanks anon/hatal

* small nes improvement

* cleanup

* match Message_DrawTextDefault, big progress on Message_DrawTextNES

* namefixer for save structs

* Some cleanup/fix non-equivalencies in decodes

* cleanup

* Small cleanup

* func_80150A84

* TextBoxType enum usage

* Format

* match Message_DecodeCredit by Maide, small improvement in Message_DrawTextNES

* comments

* some docs

* cleanup, improve matches

* Some improvement

Co-Authored-By: Santiago <github-santaclose-noreplay@NA.com>

* Fixes

* Missed

* Match Message_DrawTextNES

* Move functions to z64message.h

* string macros

* Small cleanups

* 1 more small thing

* decompme scratches

* Cleanup

* Item enum

* PR

* SEGMENT_ROM_START

* PR

* format

* ocarina cleanup

---------

Co-authored-by: andzura <andzura@andzura.fr>
Co-authored-by: Angie <angheloalf95@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Zoey Zolotova <zoey.zolotova@gmail.com>
Co-authored-by: Santiago <github-santaclose-noreplay@NA.com>
2023-10-04 08:51:45 +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
Nuss f6a2f4492a
En_Encount3 decompiled (#1405)
* data

* some matches

* draw func

* Update func

* improvements

* forgot extern

* improvements

* improvements

* improvements

* improvements
2023-10-03 18:58:46 +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
Derek Hensley 4ca54d704e
Speedmeter OK (#1393)
* Match

* data + bss

* x

* Small cleanup

* maxVal

* gUnkTimeAcc

* SET_FULLSCREEN_VIEWPORT_HIRES

* Update permuter settings

* SET_FULLSCREEN_VIEWPORT_DYNAMIC
2023-10-03 15:52:41 +11:00
engineer124 2a485ad774
Animation Cleanup: En_J* (#1401)
* cleanup J

* small fix
2023-10-01 17:12:09 +11:00
engineer124 1509349bd7
Animation Cleanup: En_K* (#1402)
* cleanup k

* one more name
2023-10-01 12:56:38 +11:00
engineer124 33aaaea2c4
Start Player Item Docs (#1396)
* Copy Fig Docs

* small cleanup

* ItemChangeType comment

* bool

* item change comments

* PR Review

* rm comments
2023-09-30 17:28:14 +10:00
engineer124 9b1335aa7b
Animation Cleanup: En_I* (#1400)
* cleanup I

* oops
2023-09-29 10:14:05 -03:00
engineer124 64b1fafd33
Animation Cleanup: En_H* (#1399)
* begin H

* more cleanup
2023-09-29 13:39:25 +10:00
engineer124 408a1bba5d
Player Docs: Initial framework for "Action Change Lists" (#1397)
* copy fig docs

* adjust wording

* another fix

* fix bool

* PR Suggestion
2023-09-29 12:58:00 +10: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
Derek Hensley d4c41f0263
z_message_nes (1 NON_MATCHING) (#1394)
* Bring over progress

* Some docs

* scratch urls + format

* Fixes

* Match Message_DrawTextNES

* String macros

* color structs
2023-09-27 14:24:52 +10:00
engineer124 775501b28b
Animation Cleanup: En_G* (#1395)
* wip

* more cleanup

* more cleanup

* one more thing

* one more default case

* missed brackets

* PR Review
2023-09-26 18:24:12 -03:00
engineer124 1d1e6ef03b
Name player's generic `actionVar`s (#1392)
* action-vars

* single bracket
2023-09-25 14:15:40 -03:00
Nuss 4e9e6c007c
Ovl_Dm_Hina decompiled (#1380)
* data

* all functions without func_80A1F75C

* func_80A1F75C

* improvements

* usage update

* fix

* x->y->z orders

* improvements

* != 0
2023-09-25 18:16:58 +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
Anghelo Carvajal a017b8f228
Cleanup pass for CIC6105.c (#1371)
* IO_READ

* CIC6105.h

* CIC defines

* sRomInfoFaultClient

* CIC6105_Init

* CIC6105_Destroy

* hopefully final cleanup

* review

* bss

* bss
2023-09-24 19:23:44 +10:00
Derek Hensley 2e87212038
z_message_staff (1 NON-MATCHING) (#1376)
* z_message_staff from z_message branch

* Use highscores array

* Clean up

* format

* PR cleanup

* PR Review

* Fix bss

* Fix bss
2023-09-24 18:46:07 +10:00
Tom Overton 3d3ca57022
EnKame (Snapper) documented (#1383)
* EnKame (Snapper) documented

* Respond to engineer's review
2023-09-24 18:25:13 +10:00
Nuss 20f8470ea0
En_Snowwd documentation (#1387)
* documentation

* improvements

* improvements
2023-09-24 12:42:11 +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
engineer124 b88aa2c0fc
Player docs: Control Stick Input and Movement (#1385)
* player input docs

* player prefix

* rm comments

* TRUNCF_BINANG
2023-09-23 13:52:06 -03:00
Nuss cfe656be2f
ovl_Bg_Lotus decompiled (#1374)
* ovl_Bg_Lotus decompiled

* improvements

* improvements

* padding removed

* block removed

* improvements

* bracket

* if-else

* line
2023-09-23 10:45:09 -03:00
Derek Hensley 19a605c2e7
master to main rename (#1379)
* master -> main

* Missed some instances of master
2023-09-22 12:57:21 -03:00
Yanis42 d353e56be6
removed TransformUpdateIndex in z_demo_tre_lgt.c (#1386) 2023-09-20 13:28:00 -03:00
Nuss fa71fbeaab
Stone Tower Smoke (#1382)
* funen xml

* description

* outname
2023-09-19 15:04:23 +10:00
engineer124 df800c74ae
PreRender.c OK (#1320)
* begin prerender

* match func_801716C4

* copy more docs from OoT

* begin func_801720FC

* improve func_801720FC

* match func_801720FC

* background 2D

* merge master

* func_801717F8 attempt

* z64prerender.h

* import bss

* non-equivalent

* document func_801716C4

* cleanup comments

* import tharo docs

* minor improvement on PreRender_DivotFilter

* Match PreRender_DivotFilter

* Remove fakes

* format

* Fix comment about RM_VISCVG in PreRender_FetchFbufCoverage

* PreRender cleanup

* PR Review

* review

* listalloc.h

* bss

* capitalization

---------

Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-09-15 19:34:16 -03:00
Anghelo Carvajal 4b30f1a654
Move libultra variables to their respective headers (#1369)
* internal_rsp; move size_t and NULL to ultratypes.h

* guint.h

* Move system variables to os_system.h

* controller, pi and vi

* osint.h

* piint.h

* siint, ucode, viint, voiceinternal

* Remove remaining variables from variables.h

* format

* final renames

* bss

* review

* review
2023-09-15 11:02:27 -03:00
Derek Hensley 626f09266d
Flash Headers (#1367)
* Move flash stuff

* format

* Cleanup

* format

* bss names

* Small cleanup

* osFlashGetAddr

* uintptr_t
2023-09-15 09:41:51 -03:00
AbdooOwd 57501ed415
`z_obj_tokei_tobira` OK undocumented (#1336)
* Fixes

* `z_obj_tokei_tobira` OK undocumented

* Revert "Fixes"

This reverts commit b3358254df.

* Fixes

* Data imported + Code Optimization

* Formatting

* cleaning + fixes

* formatting

* More fixes

* Last fixes

* OK undocumented

* More fixes

* Fixes

* Formatting again

* I hate Jenkins

* Removed a comment

* Review apply

* Formatting

* Applied reviews

* Review Applied

* Update src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h

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

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-09-15 00:39:21 -03:00
Derek Hensley 99dd8a41f9
Docs namefixer (#1378) 2023-09-14 23:24:39 -03: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 cd38fbbab4
Change all uses of "rotational velocity" to "angular velocity" (#1375)
* Change all uses of "rotational velocity" to "angular velocity"

* Respond to review
2023-09-14 12:06:52 +10:00
Tom Overton 17068dadef
EnInvadepohDemo (Aliens cutscene actors) OK and documented (#1363)
* EnInvadepohDemo (Aliens cutscene actors) OK and documented

* Make bss variables non-static

* Provide type to Actor_SpawnAsChild

* Respond to hensldm's review

* Introduce obvious misformat

* Format again, see if that fixes it?

* Push the misformat up so I can see how Jenkins complains

* Fix formatting on my end (again)

* Apparently I had to merge master to fix the formatting issue??????

* Respond to engineer's review
2023-09-14 11:29:30 +10:00
Derek Hensley 190b78549e
Non libultra Boot Cleanup (#1370)
* reorganize

* math64

* rcp_utils

* osSyncPrintfUnused

* comment spacing
2023-09-12 10:38:31 +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
Derek Hensley c8304925da
Subrepo Updates (#1368)
* git subrepo pull --force tools/asm-processor

subrepo:
  subdir:   "tools/asm-processor"
  merged:   "fed1e3ddb"
upstream:
  origin:   "git@github.com:simonlindholm/asm-processor.git"
  branch:   "main"
  commit:   "fed1e3ddb"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* git subrepo pull tools/asm-differ

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "4ed847317"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ"
  branch:   "main"
  commit:   "4ed847317"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* git subrepo pull --force tools/ZAPD

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

* git subrepo pull (merge) --force tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "8ce048376"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "8ce048376"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"
2023-09-08 20:17:54 +10:00
Anghelo Carvajal 4fa13e4132
Move libultra function declarations to libultra headers (#1196)
* Delete unused headers

* Move PR and io to ultra64

* move headers to ultra64

* more cleanups

* more reorganizing

* i think that should be all

* format

* ifdef guards cleanup

* Add IO_READ and IO_WRITE macros for future use

* warnings

* review

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* warnings again

* warn

* ifdef guards

* fix merge

* fix merge

* fix merge

* bss

* padutils.h

* bss

* bss

* bss

* fix merge

* bss

* bss

* bss

* fix merge

* fixes

* fixes

* bss

* bss

* fix merge

* fix

* fix

* fix includepaths

* fix paths

* bss

* fix

* ultra64/ -> PR/

* header guards

* fix ehader guards

* fix

* fix++

* format

* bss is borken

* prevent 2

* :despair:

* bss

* rename assert to dbg_hungup

* fix

* a

* fix

* bss

* fix

* bss

* bss

---------

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2023-09-02 15:34:29 -04:00
Anghelo Carvajal 9cceea48f3
Documentation pass for the Target system (#1281)
* cleanup

* import bss

* sActorHiliteMtx

* some cleanups on func_800BB604

* Actor_IsInTargetableRange

* rematch func_800BB604

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

* Name ACTOR_FLAG_UNFRIENDLY and ACTOR_FLAG_FRIENDLY

* Rename some Target_ functions

* cleanusp

* TargetMode enum

* Target_800B82EC

* sNaming

* more

* more naming

* fairyHintPos

* rotation

* ACTOR_FLAG_TARGETABLE

* update namefixer

* remove trailing comma

* bss

* Wall of text for Target_800BB604

* function naming

* cleanups

* Target_GetAdjustedDistSq

* NotLeash

* more comments

* minor comment

* review

* fix

* rotZTick

* review

* name last members

* fix

* review

* review

* more namefixer

* swap members

* comment

* Update src/code/z_actor.c

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

* Update src/code/z_actor.c

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

* review

* format

* Update src/code/z_actor.c

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

* Update include/z64actor.h

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

* review

* review

* fix

* fix

---------

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-09-02 15:16:45 -04:00
Derek Hensley cbf9d98dba
ASM_PROC_FORCE (#1362) 2023-08-23 13:48:14 -04: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
Derek Hensley 8059537150
Game bss and cleanup (#1356)
* Game bss and cleanup

* Match Oot with rdp time variables

* PR review

* Namefixer
2023-08-21 21:44:28 -04:00
Derek Hensley 312fcafe2d
Small General cleanup (#1360)
* Draw things

* EffectSsFhgFlash_SpawnShock enum

* gohtIndex

* colliders

* ObjGhaka_Init

* func_80B3C39C

* undef syms
2023-08-20 18:50:55 +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
engineer124 0cceee6eba
Animation Cleanup: En_C* and En_D* Actors (#1327)
* En_C cleanup

* En_D

* more cleanup

* name enums

* missed one

* PR Review

* remove padding
2023-08-15 14:23:33 +10:00
Synray 33ca9daece
z_bgcheck OK (#1358)
* z_bgcheck OK

* Format

* Cleanup

* Cleanup

* Review changes

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-15 13:58:49 +10:00