1763 Commits

Author SHA1 Message Date
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
engineer124
f545f164b4
Switch Flag "None" macro (#1412)
* switch flag none

* cleanup brackets

* individual actor switch flag none

* missed some, small cleanup

* <= 0x80
2023-10-15 19:59:25 +11:00
Tom Overton
a1bdc6c382
EnJso (Garo) OK and documented (#1440)
* EnJso (Garo) OK and documented

* Respond to review

* Replace some weird ifs with early returns

* Respond to Anghelo's review
2023-10-15 17:39:47 +11:00
engineer124
93713a1da0
Audio Sequences Decompiled & Documented (z_obj_sound OK, more code_8019AF00.c) (#1407)
* import audio docs

* cleanup

* SEQ_SCREEN_WEIGHTED_DIST

* PR

* PR
2023-10-13 17:39:10 -03: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 228d6e8914d1a9df7f996809bd876b44130ddf86.

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

This reverts commit 53a8786f269e60899408946283e2e55513890486.

* Update object_visiblock.xml

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-13 14:23:09 -03:00
Nuss
a03335d325
ovl_Door_Spiral decompiled (#1432)
* data

* some matching

* all funcs

* improvements

* improvements

* improvements

* small clean up
2023-10-13 14:04:36 -03:00
Wimmer
01d5816417
obj_big_fwall (#1435)
* Big Fire Wall

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

* RingOfFire update
2023-10-13 08:50:00 -03:00
CodeOverFLow
2e344b8d15
Boyo (#1341)
* updated variables.txt

* continue investigation

* format to style

* matching more asm

* still more asm matching

* finally matching

* matching even more

* add rodata

* match more asm for Update

* matching 99.58% of ObjBoyo_Update

* matched ObjBoyo_Update

* some cleanup

* formatted

* review: remove ACTOR_COLLISION_HANDLING_CASES define

* review: fix main functions parameters

* review: fix collision function signatures

* review: fix ObjBoyo_FindCollidedActor parameters

* review: better formatting for InitVars

* review: fix ObjBoyoCollisionHandler typedef

* review: fix segmented AnimatedMaterial

* review: fix static ColliderCylinderInit

* review: disassembled initchain

* review: fix collision functions

* review: fix functions.txt

* review: fix variables.txt

* review: clean z_obj_boyo.h

* review: fix ObjBoyo_Destroy

* remove fake variable from ObjBoyo_Init

* review: rematch FindCollidedActor

* review: make asm match again

* review: update spec file

* review: fix spec file

* review: remove static D_***

* review: fix bad logic to find collided actor

* review: fix ObjBoyo size (local make is now OK)

* review: rename collision handlers array

* review: use constant

* review: clean PushPlayer function

* review: fix LSP bad renaming

* review: use GET_PLAYER macro

* review: remove ugly pointer deref

* review: replace += 1 with ++

* review: return NULL to emphasize it is a pointer

* review: check against NULL instead of 0

* review: remove unnecessary casts

* review: use constants

* review: remove unnecessary include

* review: rename variables + fix assembly matching

* review: change ++i to i++

* review: fix inline comments

* review: replace != with < in for loop
2023-10-13 18:59:49 +11:00
Nuss
2c182bf7e3
object_icicle (#1421)
* Naming

* naming

* naming

* top comment
2023-10-11 10:44:20 -03:00
mzxrules
f17e85d1fd
ovl_Obj_Grass_Unit OK and some grass documentation (#1172)
* z_obj_grass_unit OK

* document some grass

* pr suggestions, add grass_unit comment

* pr suggestions

* implement constants
2023-10-11 09:32:02 -03:00
Tom Overton
dd4206bb24
Document object_jso (Garo and Garo Master) (#1428)
* Document `object_jso` (Garo and Garo Master)

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

* Original naming

* Original naming

* wrong file

* Swamp Spider House Door

* naming

* ups

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

* Original naming

* removed comments

* comments
2023-10-08 23:05:12 -03:00
Nuss
ab4c207be4
object_random_obj (#1416)
* naming

* Secret Shrine doors

* naming

* OutName
2023-10-08 22:25:49 -03:00
Nuss
d25e10dcc2
object_redead_obj (#1417)
* naming

* comment

* Out Name

* The Gibdo's Well Doors

* naming

* typos
2023-10-08 22:07:54 -03:00
Nuss
808f60a1fa
naming (#1425) 2023-10-08 21:39:15 -03:00
Nuss
5dced7a09b
object_f40_switch (#1418)
* naming

* naming to gStoneTowerFloorSwitch
2023-10-08 21:13:41 -03:00
engineer124
ae4a8fbe00
Object Name Cleanup (#1427) 2023-10-08 20:57:25 -03:00
Zach North
da0c9072f5
Document object_skb (#1404)
* object_skb: Limb and Anim docs

* object_skb: DL and text docs

* Formatting changed files

* Changed names for some bones to reflect oot names

* updating some names to address code review comments

* Whoops, forgot to change the name of MAX

* Rename EnHinkSkbAnimation in src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c

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

* Changed STALCHILD_ANIM_x to STALCHILD_HINT_ANIM_x

* forgot to rename both parts of a typedef enum

* gStalchildSwingOnBranch missing Anim tag

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

* Fixed all instances of gStalchildSwingOnBranchAnim

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-07 16:11:10 +11:00
Nuss
43df8f4454
object_comb (#1420)
* naming

* OutName
2023-10-07 15:47:03 +11:00
Nuss
a980067bd8
ovl_En_Takaraya decompiled (#1409)
* EnTakaraya_Destroy

* some matching

* some matching

* some matching

* matched func_80ADF7CC

* func_80ADEF74 wrong arg

* data

* clean up

* improvements

* actionFunc pointer

* fake

* improvements

* improvements

* naming for the bool

* function naming

* improvements

* improvements

* GET_PLAYER_FORM macro

* macro
2023-10-07 12:40:59 +11:00
Nuss
16bc54b63b
object_lightblock (#1414)
* naming

* Original naming

* sun block
2023-10-07 07:40:56 +11:00
Nuss
6ea91335c5
object_zl1 (#1381)
* object_zl1

* formating

* improvements

* offset

* order

* offset

* blobs

* offset
2023-10-05 21:45:26 -03:00
engineer124
e810559391
Object Cleanup (#1410)
* object cleanup

* namefixer

* objectPtr

* PR Review

* PR Review

* more uses of macro

* missed another one
2023-10-05 17:37:52 -03:00
Tom Overton
ac8d49ea6f
Skeleton and shin name cleanup (#1413)
* Skeleton and shin name cleanup

* Use ANI_LIMB_MAX
2023-10-05 10:19:30 -03:00
Derek Hensley
03d1a794e1
z_kankyo pt 1 (#1377)
* z64environment.h

* remove todo

* Cleanup

* data + bss + 2 functions

* Bring over simple functions

* Remove lerp comment

* code functions csv

* Remove docs changes

* ZBufValToFixedPoint

* Remove leading 0's

* SEGMENT macros

* eventDayCount

* format

* z64bombers_notebook.h

* fix merge

* Comments

---------

Co-authored-by: angie <angheloalf95@gmail.com>
2023-10-05 16:08:08 +11:00
engineer124
d3104be63c
Switch Flag Cleanup (#1406)
* cleanup switchFlag

* more cleanup

* switchFlags
2023-10-05 15:44:51 +11:00
fig02
f4a490bb6a
Port Proposed OoT Object Docs (#1361)
* port docs in z_scene

* undo accidental ctrl-f

* another fix

* expose Object_SpawnPersistent

---------

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2023-10-04 14:01:04 +11:00
MegaIDK
d635b81ee6
document object_kanban (cuttable sign) (#1364)
* initial commit of doc

* comment

* model and material

* indeed c file exists

* renamed confusing stuff

* space

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-04 13:31:06 +11:00
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 actionVars (#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