Commit Graph

1726 Commits

Author SHA1 Message Date
Alejandro Asenjo fed7cec4ed
ovl_Bg_Haka_Bombwall partially decompiled (1 NON_MATCHING) (#947)
* progress

* 1 non matching + reloc issues?

* final details

* format

* final details

* reverting changes to ovl_Bg_Kin2_Bombwall

* undefined_syms

* undef

* warnings

* pr review
2022-07-22 06:15:20 +01:00
Alejandro Asenjo 6dd31c00e5
ovl_Eff_Change Decompiled (#946)
* all functions matching

* progress

* ovl_Eff_Change Decompiled

* ovl_Eff_Change Decompiled

* space

* spec
2022-07-22 06:09:44 +01:00
Derek Hensley 5c7f21f6d2
Effect Gfire Ok (#941)
* OK

* description
2022-07-22 06:02:55 +01:00
Derek Hensley 64ea6665bd
Effect Gspk OK (#939)
* OK

* cleanup

* newline
2022-07-22 05:58:08 +01:00
Tom Overton 7732f5e96d
Boss_02 Documentation, Part 2: Document Twinmold Param Types and name most BSS variables (#931)
* Boss_02 Documentation, Part 2: Document Twinmold Param Types and name most BSS variables

* Respond to hensldm's review
2022-07-22 05:53:14 +01:00
Tom Overton 905c089beb
Document En_Dg (dog) and do some light cleanup on En_Racedog (#926)
* Document some low-hanging fruit in EnDg

* Animation and type documentation

* Document a bunch of stuff

* Name more functions

* Params macro

* Defines for dog flags

* Name all struct variables

* Give all animations better names

* Better name for Swim2

* Document/name a bunch of stuff

* Make index enum

* Respond to engineer's review

* Respond to mzx's review

* Fix up comment (again)

* Respond to hensldm's review
2022-07-22 05:48:55 +01:00
Alejandro Asenjo d1d1bf8ec6
ovl_Dm_Char04 Decompiled (#925)
* all functions matching

* Data imported

* ovl_Dm_Char04 Decompiled

* ovl_Dm_Char04 Decompiled

* pr reviews

* number

* parenthesis

* renamings i forgot

* more renamings

* Elliptic number magic

* cast remove

* timer
2022-07-22 05:43:36 +01:00
Alejandro Asenjo a935cbc6ae
ovl_Obj_Ocarinalift Decompiled (#920)
* all functions matching

* data imported

* ovl_Obj_Ocarinalift Decompiled

* pr review

* params prefix

* Jenkins re-run

* pr review

* pr review
2022-07-22 05:27:02 +01:00
EllipticEllipsis c8c55a15d3
EnBjt OK and documented (#912)
* OK, data imported

* Fix some typos

* Start docs

* Struct almost finished

* Start object, add state enum

* undefined_syms

* Finish object, name some more stuff

* Name a few states and another function

* PlayState

* Minor tweaks in z_room and z_sub_s

* Complete documentation

* spec

* Review 1

* functions.txt

* Schedule result enum

* Rename schedule results

* Review

* Remove update comments

* Inventory_DeleteItem

* PLAYER_STATE

* Format

* Review

* Update struct name
2022-07-22 05:17:06 +01:00
Derek Hensley cbeeeb172a
EnBaba Documented (Bomb Shop Lady) (#825)
* Merge in sub_s_models

* Update subs DL names

* Unused Weight pathing

* Function headers for weightpathing

* TimePathing WIP

* Timepathing, still unsure about unk184

* Move subs functions from functions.h to z64subs.h

* Add fake comment

* Some cleanup and renames

* Renames/cleanup of actors that use timepath

* Cleanup

* More cleanup

* Rename unk stuff

* Merge in upstream/master

* TimeElapsed -> elapsedTime

* Fix

* Final cleanup

* SubS Time Paths

* Still needs dialog action functions

* Fix waypoint comments

* Review pt. 1

* Baba review

* ScheduleResult -> ScheduleOutput

* Forgot to update functions.txt oops

* Add clarifying comment to SubS_TimePathing_FillWeightArray

* format.sh

* Finish up docs

* Fix order comments

* Fix

* Change bombShopkeeper struct member to

* Fix a few merge mistakes

* Add ScheduleOutput to namefixer

* format

* Format and fix merge

* Review

* PR

* z64schedule.h

* text summary

Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2022-07-22 05:05:28 +01:00
Alejandro Asenjo f0e4581e22
ovl_En_Sth2 Decompiled and Documented (#898)
* ovl_En_Sth2 Decompiled and Documented

* &

* enum

* space

* pr review

* warnings

* pr review

* trailing coma + format

* pr review

* trailing coma

* review

* focusOffset
2022-07-22 04:57:49 +01:00
Derek Hensley 6661b566a9
Effect Gripple (#940)
* OK

* description

* undef

* format
2022-07-19 12:32:00 -04:00
Chloe 215164738b
ovl_Obj_Purify OK (#937)
* ovl_Obj_Purify decompiled and partially documented

* document member names

* variable names and format

* oops missed some booleans

* review fixes

* more review fixes

* even more review fixes

* rename ObjPurifyInfoList to sObjPurifyInfo
2022-07-19 12:27:01 -04:00
Alejandro Asenjo 095a312937
ovl_Bg_Fu_Mizu Decompiled (#935)
* All functions matching + data imported

* ovl_Bg_Fu_Mizu Decompiled

* heightTarget
2022-07-19 12:21:51 -04:00
EllipticEllipsis 69e514b37e
EnBat OK and documented (#924)
* OK, start documentation

* Name some more stuff

* Name rest of functions and bss var, tidy up floats

* Document object and paramflags

* Cleanup bat

* Cleanup crow

* Cleanup firefly

* Couple of minor things in arrow

* Review 1

* PLAYER_STATE

* Remove unnecessary f32 casts

* Review

* Review
2022-07-19 12:16:36 -04:00
Alejandro Asenjo bd94105568
ovl_Eff_Lastday Decompiled (#921)
* all functions matching

* ovl_Eff_Lastday Decompiled

* renaming

* final clean up

* enums

* pr review

* pr review

* Prefix

* renamings
2022-07-19 12:10:35 -04:00
Alejandro Asenjo aebbebd6cf
ovl_Obj_Lift Decompiled and Documented (#917)
* progress

* all functions matching

* data imported

* ovl_Obj_Lift Decompiled and Documented

* pr review

* chain assignments

* pr review

* fixes

* yOffsets
2022-07-19 12:05:40 -04:00
Alejandro Asenjo ba886cc8fa
ovl_Dm_Al Decompiled + Some Documentation (#913)
* all functions matching, data isn't?

* cleanup in progress

* ovl_Dm_Al Decompiled

* pr review

* Documentation Fixes and new entries

* forgot one

* pr review
2022-07-19 12:01:26 -04:00
Alejandro Asenjo abf70f6dd2
ovl_Eff_Kamejima_Wave Decompiled (#908)
* almost there

* ovl_Eff_Kamejima_Wave Decompiled

* Us removal

* minor clean up

* pr review

* review

* sikihi rollback and function name fix

* params rename

* SetVtxAlpha

* params prefix

* Jenkins re-run
2022-07-19 11:54:30 -04:00
Alejandro Asenjo a22e72acfe
ovl_En_Sekihi Decompiled and Documented (#907)
* progress

* All functions matching

* ovl_En_Sekihi Decompiled and Documented

* pr review

* pr review

* params enum

* corrections and renaming

* pr review

* Update src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c

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

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-19 11:49:07 -04:00
Alejandro Asenjo ba1c5803ad
ovl_Bg_Fire_Wall decompiled (#890)
* progress

* xml

* data imported

* all matching functions

* ovl_Bg_Fire_Wall decompiled

* review

* review

* GET_PLAYER

* EnEncount4

* AT_HIT

* pr reviews

* pr review
2022-07-19 11:44:51 -04:00
Alejandro Asenjo d150a04e6a
ovl_Obj_Hsblock decompiled (#866)
* ovl_Obj_Hsblock decompiled

* PlayState + PR Reviews

* s

* pr review

* sFocusHeights

* displaylists rename

* bring up names from OOT

* fix

* fix

* xml comment
2022-07-19 11:38:47 -04:00
Parker Burnett 356fde3045
En_Ik OK (#821)
* starting en_ik

* updating and more matching funcs

* matched more functions and ran format.sh

* matched another, started on init

* updating things with master, and more matches

* another function down

* some more progress

* some documenting

* master merge

* maybe some progress?

* one more func left

* IK OK

* inital cleanup passthrough

* fixing warnings and formatting

* some cleanup

* touch up

* more docs

* doin dat dere docs

* actorfixer

* finishing function names

* initial round of fixes

* format

* Naming things

* namefixer

* review comments pt2

* comment updates

* PR Feedback

* forgot a format

* naming enum

* more fixes

* minor fix

* minor fix

* format

* fixes for daaays

* for some reason these keep showing up?

* fixing blob

* names

* fixes

* naming things...can't discern the last ones...

* updating TLUT and names

* formating and fisxes

* fixing func name

* naming effect variable

* name fixer, and renaming variable

* Fixing xml

* forgot to fix name
2022-07-18 04:19:11 +01:00
Derek Hensley 03a7e00c4b
Hotfix (#929) 2022-07-12 06:24:29 +01:00
engineer124 8e45eb7b1f
`z_parameter`: Items & Import Data (#799)
* Import Data

* More functions

* cleanup

* Add Enum

* Many changes, PR and add-ons

* Fix bss

* Better data

* Extra space

* DoubleDefense is boolean

* Missed a macro

* More enums missed

* macro -> enum

* More item cleanup...

* missing/wrong quest items

* Next PR Review

* Revert Interface_AddMagic to Parameter_AddMagic

* Remove QUEST_HEART_CONTAINER

* Fix bss

* Move Color_RGB16 up + fix incorrect numbers

* Add texture pointers

* Add comment

* EQUIP_SLOT_A

* rm redundant comment

* Fix merge

* PR Suggestions

* fix bss
2022-07-12 00:45:55 -04:00
engineer124 fda5da2500
Introducing z64camera.h (#797)
* Introduce z64camera.h

* format

* Oops

* Change paramData to u8

* BINANG_TO_DEGF and DEGF_TO_BINANG to z64camera.h

* Fix bss, thanks Anon

* Update with docs from OoT

* Cleanup

* Fix activeCamId

* underwater

* remove interface alpha stuff

* Oops

* To Hex

* Cleanup cam settings comments

* PR Suggestions

* More PR Suggestions

* trackActor -> focalActor

* Fix merge

* Fix bss, thanks Anon
2022-07-12 00:25:40 -04:00
Anghelo Carvajal 628482f3c4
hotfix disasm for python 3.6 (#928) 2022-07-12 00:01:58 -04:00
Parker Burnett 66c4d743b3
Adding Docker Support (#914)
* Adding dockerfile and instructions for building

* fixing readme and updating Dockerfile

* Adding packages and practicerom support
2022-07-11 23:54:17 -04:00
Anghelo Carvajal 87506f7c19
`z_player_lib`: Part 1 (#688)
* fix some symbols and file splits

* PLAYER_STATE macros

* Move over a few functions

* AP functions and update struct

* another small bunch

* Add player_lib prototypes

* A few more functions

* Some fixes and add stuff to actorfixer

* format

* bss

* Elliptic's review

* Engineer's review

* Some renames and cleanups

* bss

* A bit of cleaning up

* Player_DrawZoraShield

* format

* actorfixer, bss and format

* Forgot to merge master again

* Rename some LinkGoron dlists

* PlayerMeleeWeaponAnimation enum

* format

* actorfixer, bss and format

* more bss

* actorfixer

* format

* actorfixer and format

* bss

* Update src/code/z_player_lib.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* sEnvironmentTextTriggers

* Update include/z64save.h

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/code/z_player_lib.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/code/z_player_lib.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/code/z_player_lib.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* breman mask march comment

* fix

* fixes

* bss

* RESPAWN_MODE_RETURN

* review

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

* format

* Engineer's review

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

* Update src/code/z_player_lib.c

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

* review

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update include/z64player.h

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

* review

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

* format

* unused mwas

* fixes

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-07-11 23:43:46 -04:00
Derek Hensley cd5de59431
General Cleanup 6 (#886)
* Actor structs and enums

* whoops

* whoops 2-4

* PR Review

* tabs yuck

* Last few

* boss3
2022-07-11 23:26:58 -04:00
Tom Overton e9d4b31c3d
z_map_exp OK and somewhat documented (#877)
* z_map_exp OK

* some names

* Some more docs

* Update prototypes in functions.h

* Use reg name

* namefixer

* Respond to review

* Respond to review

* Respond to review

* Add some blank lines after breaks, whoops

* Respond to review

* Respond to Engineer's review, pt 2

* Respond to Engineer's review, Pt 3

* Add newline char to end of z64map.h

* Respond to engineer's review, Pt 4

* Respond to multiple reviews
2022-07-11 23:23:01 -04:00
Derek Hensley 3b87504adc
General Cleanup 5 (#872)
* TexAnim

* Animmode

* Collider ArrayCount

* Rand_Next

* Revert "Rand_Next"

This reverts commit ba1046ac54.

* kendo_js cast

* PR review
2022-07-11 23:18:38 -04:00
engineer124 ab6ef2535e
Match and Document code_80172BC0.c (#909)
* Match code_80172BC0.c

* Better match

* brackets

* Fix
2022-07-11 23:14:07 -04:00
Tom Overton 08ff2a6184
object_rotlift documented, various cleanup of Deku Flower stuff, finish documentation of ObjRotlift (#879)
* Make params-packing macro

* Move limb enum to object

* Minor deku flower cleanup

* Document object_rotlift

* Rotlift cleanup and documentation

* Respond to review
2022-07-11 23:10:24 -04:00
Derek Hensley 85b19de4ab
General Cleanup 4 (#871)
* PartTimerWorker -> PartTimer

* cleanup

* format

* objChan draw macro

* Fix macro

* Fix warning

* PR Review

* Missed 1 ull

* UINT16_MAX

* Remove todo from footmark

* Remove * from tex in AnimatedMat_DrawTexCycle
2022-07-11 23:06:21 -04:00
Tom Overton 81ce7bebcc
Remove a dummy label match in BgHakuginBombwall (#901) 2022-07-11 23:00:42 -04:00
Tom Overton 0fbc8ec9fb
Document object_boss04 (Wart and Bubbles) (#915)
* Document object_boss04 (Wart and Bubbles)

* Use WART_LIMB_MAX

* Fix include error
2022-07-11 22:56:12 -04:00
Tom Overton acb9216daa
Document object_uch (Aliens) and remove a dummy label match in EnInvadepoh (#899)
* Document object_uch (Aliens)

* Remove dummy label match that has been annoying me for a year!!!!!!!!!!!!!

* Respond to reviews

* Fix a small thing brought up in review

* Swap to gAlienJerkingAnim
2022-07-11 22:52:43 -04:00
Isghj d9a39c6ccc
`object_keikoku_demo`: documented (Lost Woods Trees) (#863)
* object_keikoku_demo: Doc'd

* Update src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c

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

* DmOpstage: requested changes

* Update assets/xml/objects/object_keikoku_demo.xml

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

* DmOpstage: SnakeCase

* DmOpStage: Mention duplicate textures in xml

* DmOpstage: formater pls

* Update src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h

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

* DmOpstage: moved object description

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-11 22:49:07 -04:00
Lucas 2995d72965
`ovl_En_Fall2` OK (#916)
* `ovl_En_Fall2` decompiled

* Suggested changes

* Minor suggestions

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

* Don't commit directly from github

* Define vertices in xml, add macro

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-11 22:44:19 -04:00
Alejandro Asenjo 6616f542f1
ovl_Elf_Msg4 decompiled (#884)
* ovl_Elf_Msg4 decompiled

* pr review

* GET_PLAYER

* actorPtr should stay Actor*

* pr review

* SWITCHFLAG

* ELFMSG5_GET_FF

* parenthesis

* pr review

* conflict
2022-07-11 22:40:17 -04:00
Alejandro Asenjo a2f78fbc44
ovl_En_Bh Decompiled (#906)
* ovl_En_Bh Decompiled

* some minor things

* Documentation

* pr review

* gEnBh - > gBh

* noneSkel nonsense fix

* pr review

* pr review
2022-07-11 22:36:11 -04:00
Lucas 9726a30109
`ovl_En_Part` OK (#903)
* `ovl_En_Part` decompiled

* Suggested changes

* Rename body part displaylist

* Suggested changes

* Rename displaylist and params enum

* Remove randvar, rename enum from params to type
2022-07-11 22:32:35 -04:00
Tom Overton c667452329
Document Twinmold Effects (#896) 2022-07-11 22:29:01 -04:00
Maide 9969b204bc
Obj_Chikuwa (#893)
* Obj_Chikuwa

* PR
2022-07-11 22:25:54 -04:00
Maide 122e4f3982
Obj_Toudai (#892)
* Obj_Toudai

* PR
2022-07-11 22:21:04 -04:00
Maide 2167cb6a77
Bg_Iknv_Doukutu (#891)
* Bg_Iknv_Doukutu

* PR
2022-07-11 22:14:14 -04:00
Alejandro Asenjo 69b4bd8998
ovl_Bg_F40_Flift decompiled (#885)
* ovl_Bg_F40_Flift decompiled

* format

* pr reviews

* pr review
2022-07-11 22:10:29 -04:00
Alejandro Asenjo 9bcd3e2fea
ovl_Elf_Msg5 decompiled (#882)
* ovl_Elf_Msg5 decompiled

* pr review changes

* pr reviews

* ELFMSG5_GET_FF
2022-07-11 22:06:44 -04:00
Alejandro Asenjo 6dec68464f
ovl_Elf_Msg2 decompiled (#881)
* ovl_Elf_Msg2 decompiled

* pr review changes

* ELFMSG2_GET_SWITCHFLAG
2022-07-11 22:03:04 -04:00