Commit Graph

577 Commits

Author SHA1 Message Date
Anghelo Carvajal 3f49adb91d
`ovl_Obj_Um` OK (#887)
* Pass the whole actor in mips2c

* hacky way to fix some types

* decomp a few functions and second mips2c pass

* draw

* another mips2c pass

* some functions

* Init almost matching

* mips2c pass

* Match update and a few more

* A bunch of functions

* horses gonna horse

* func_80B7A860

* mips2c pass

* func_80B7984C

* func_80B795A0

* func_80B783E0

* func_80B78764

* Tried func_80B7BEA4

* func_80B79BA0

* func_80B7A494

* func_80B7A614

* lots of non equivalents

* fix

* Match func_80B77770

* func_80B7BEA4

* import data

* func_80B7B93C

* minor fixes

* ObjUm_Init

* func_80B7AF30

* func_80B7B18C

* func_80B7BABC

* func_80B77FA4

* func_80B7B598

* func_80B781DC is equivalent

* func_80B781DC

* func_80B7BABC

* Cleanup

* limbs

* minor members renames

* First docs pass

* small pass

* yes

* another pass

* more renames

* flags defines

* arePotsBroken

* some flags

* yet another docs pass

* Some members named

* Add weekEventReg docs

* small rename

* And more

* Another 2

* actorfixer and other fixes

* format

* Use extracted object symbols

* fixes

* Some stuff improved

* very minor naming

* format

* remove debugging stuff

* cleanup

* Some EnHorse stuff

* horse params

* ! FAKE

* Update include/functions.h

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

* review

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

* review

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

* Update assets/xml/objects/object_um.xml

* IS_BANDIT_TYPE

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

* review

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* remove a fake match

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

* Update src/overlays/actors/ovl_En_Horse/z_en_horse.h

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

* Update src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* review

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

* anim enum

* name anim enum

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* review

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

* remove repeated forward declarations

* fixes

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* comment

* review

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

* areAllPotsBroken

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

* fix merge

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-07-23 14:00:32 -04:00
Tom Overton aa87f0de89
Fix namefixer.py (#972)
* Fix namefixer.py

* Fix contributing link (I think)
2022-07-23 02:11:23 +01:00
Anghelo Carvajal addfe3a613
Decomp `Message_GetState`, add `TextState` enum and some header reorganization (#919)
* Message_GetState

* Rename msgCtx->msgLength

* Replace some enums

* TEXT_STATE_CLOSING

* use enum on switches

* use enum when assigning to a variable

* some minor cleanups

* minor cleanup

* TEXT_STATE_CHOICE

* remove unused temp

* z64message.h and z64view.h

* steal some stuff from OoT

* add some stuff to namefixer

* fix shift

* minor doc comment

* Update MessageContext struct from andzura's branch

Co-authored-by: Andzura <11079691+Andzura@users.noreply.github.com>

* some other TextState uses I missed

* format

* statetimer in dec

* review

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

* review

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

* review

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

* format

* Batch () commit

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

* review

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

* format

* bss

* use text state defines on new actors

* fix matching

* bss

Co-authored-by: Andzura <11079691+Andzura@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-07-22 20:51:20 +01:00
engineer124 f2b628241d
Cleanup SubCameras (#936)
* Cleanup SubCameras

* Add small bit of docs, remove comments

* Fix merge from master, missed test7
2022-07-22 15:24:37 +01:00
engineer124 5f6c3df4ce
Transition System Docs (#883)
* Transition docs from OoT

* Cleanup

* Missed a spot
2022-07-22 15:05:20 +01:00
engineer124 601f44cb7f
audio_seqplayer.c OK and partial docs (#833)
* Import audio_seqplayer progress from main audio branch

* cleanup

* Better docs

* Small fix

* More

* Cleanup and update

* PR Suggestions

* PR Suggestions

* mute flags
2022-07-22 06:21:02 +01:00
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 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
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
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 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
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
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
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
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
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 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
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
Tom Overton c667452329
Document Twinmold Effects (#896) 2022-07-11 22:29:01 -04:00
Derek Hensley f85a398162
Effect Hahen Ok (#875)
* OK

* format

* gameplay keep

* undef syms

* drawFlags -> params

* Format

* Fix railskb include

* DL consistency with OoT

* Hex
2022-07-11 21:48:37 -04:00
Derek Hensley 94372c3670
Effect Hitmark Ok (#874)
* OK

* gameplay keep

* undef syms

* Cleanup

* format

* HitMark -> Hitmark

* Remove EffectSsHitmark_Spawn from functions.h

* PR
2022-07-11 21:45:03 -04:00
Chloe 78a29fb17b
ovl_Dm_Char02 decompiled (#869)
* ovl_Dm_Char02 decompiled

* remove m2c comments

* remove ovl_Dm_Char02 data in spec

* ran format.sh

* fix format version

* use our reloc

* fix reviews

* rename context/playstate structs

* format

* more review fixing

* even more review fixing
2022-07-11 21:37:42 -04:00
Alejandro Asenjo 5ffdc0a387
ovl_Obj_Jgame_Light decompiled (#867)
* ovl_Obj_Jgame_Light decompiled

* xml

* doc

* pr review

* playstate

* playstate

* pr review

* pr review

* missing macro

* pr review

* pr review

* pr review

* pr review

* isOn
2022-07-11 21:30:18 -04:00
Alejandro Asenjo 35961a7cb9
ovl_Demo_Getitem decompiled (#861)
* ovl_Demo_Getitem decompiled

* * PlayState
* PR reviews

* pr review changes

* renaming

* objectIndex
2022-07-11 21:13:29 -04:00
Isghj ea42d8d118
Ds2n: OK (unused potion shop man from OoT) (#858)
* Ds2n: OK

* Ds2n: requested changes

* EnDs2n: GlobalCtx is dead

* Ds2n: formater pls

* Update src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h

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

* Update src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h

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

* Update src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c

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

* Ds2n: more limbs named

* Ds2n: right, formatter for longer limb names

* EnDs2: moved comment back... did git merge the wrong way?

* Ds2n: broken anim is clearly wrong, its something else

* Ds2n: almost mappeded entire blob

* Ds2n: found another texture

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-11 21:06:06 -04:00
Alejandro Asenjo 3cdb4597f3
ovl_Bg_Spout_Fire decompiled (#853)
* ovl_Bg_Spout_Fire decompiled, asset decomp pending

* object_fwall decompiled

* fwall Texture leftovers name update from OOT

* pr review fixes

* pr review fixes

* renaming

* xml

* xml

* xml

* xml

Co-authored-by: SonicDcer <noreply@github.com>
2022-07-11 20:47:58 -04:00
TrulyNaN 84ce52ae4e
ovl_Bg_Ikana_Mirror OK and documented (#873)
* test commit

* undoing test commit

* making sure this is the right repo

* removing test file

* init for OSH bombable wall started. put back Actor* in function declarations.

* BgKin2Bombwall_Init is matching.

* started z_bg_kin2_bombwall destroy function. One mismatch right now.

* BgKin2Bombwall_Destroy matches.

* BgKin2Bombwall_Draw matches.

* Fixed BgKin2Bombwall_Init

* BgKin2Bombwall_Init and BgKin2Bombwall_Destroy both match. Fixed s32 array in struct.

* BgKin2Bombwall_Draw and BgKin2Bombwall_Update match.

* Only func_80B6E020 and func_80B6E090 left to match in ovl_Bg_Kin2_Bombwall.

* func_80B6E020 from ovl_Bg_Kin2_Bombwall matches.

* Went from 8925 to about 5-6k diff score for func_80B6E090 in ovl_Bg_Kin2_Bombwall

* Took func_80B6E090 from about 5300 diff score to about 4300 diff score in ovl_Bg_Kin2_Bombwall.

* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 4k ish to 3277

* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 3277 to 2262.

* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 2262 to 1589.

* only slight progress on ovl_Bg_Kinw_Bombwall's func_80B6E090

* Got to 1473 diff score on ovl_Bg_Kinw_Bombwall's func_80B6E090

* Put in the changes made by EllipticEllipsis and hensldm for ovl_Bg_Kin2_Bombwall's func_8066E090.

* renamed some symbols. Fake symbol removal makes nonzero diff, but rom OK's after make.

* moving declarations around, ordering.

* One.word.away. from importing data in ovl_Bg_Kin2_Bombwall.

* ovl_Bg_Kin2_Bombwall data imported. Matching.

* Edited spec for reloc of ovl_Bg_Kin2_Bombwall.

* Removed extra comments for ovl_Bg_Kin2_Bombwall.

* unpushed stuff. dunno.

* forgot to save z_bg_kin2_bombwall.c

* need to commit before make-ing in master.

* Ported z_bg_kin2_bombwall's code. Data next.

* Imported data for merging z_bg_kin2_bombwall. Yes, I yelled when it OK'd.

* Added comments to remember what does what in z_bg_kin2_bombwall.

* Some comments in z_bg_kin2_bombwall.c and function names ideas.

* Added comments for function name ideas. Cleaned up temps in z_bg_kin2_bombwall except in func_80B6E090.

* Renamed most functions and some variables in z_bg_kin2_bombwall.

* Made a name suggestion for func_80B6E020 after testing in game.

* Ran format.sh.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

1 and 0 replaced by true and false in func_80B6E020.

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

Bending to the x-- supremacy.

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* PR fixes (not done yet) including more consistent use of THIS, removing arg0 and arg1 variable names, standardizing params for z_bg_kin2_bombwall, turning some if-return to if-else, removing unnecessary casts.

* Applied isghj5's and EllipticEllipsis' suggestions except for the object file in z_bg_kin2_bombwall. Object file next.

* Screwd up formatting.

* Thinking of playing with object_kin2_obj.

* Documented most of object_kin2_obj based on bombwall, fence and shelf actors.

* Had forgotten an arg1 in z_bg_kin2_bombwall.c

* First commit for ovl_Bg_Ikana_Mirror branch.

* Started decompiling ovl_Bg_Ikana_Mirror. Setup functions and _Update done matching.

* Replaced a float by its fractional representation. I need to learn float magic.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.h

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

* Applied more formatting and naming remarks from PR about the C file. Assets and object stuff next.

* Display lists and collision header in z_bg_kin2_bombwall.c renamed after their descriptive names in the object's XML file. Name for Ocean Spider House drawers chests left to change.

* Working on BgIkanaMirror_Destroy. Stack and registers left essentially.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* One extra line in an if, collision naming convention applied and renamed Ocean Spider House nightstands to drawers chests.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* Changed drawers chest to chest of drawers in object_kin2_obj and z_bg_kin2_shelf.

* Removed some unnecessary comment.

* almost done with BgIkanaMirror_Destroy function.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* BgIkanaMirror_Destroy OK.

* Almost done with BgIkanaMirror_Init. Mostly stack stuff left.

* Registers and stack left to fix for BgIkanaMirror_Init.

* BgIkanaMirror_Init matching.

* Ran permuter to improve BgIkanaMirror_Draw's score.

* Actually not mad at permuter for BgIkanaMirror_Draw headstart.

* Matched func_80B7F730 in ovl_Bg_Ikana_Mirror. Progress on its _Init done too.

* func_80B7FA9C in ovl_Bg_Ikana_Mirror is matching. _Init left then documentation.

* Mistake in last commit message: actually, _Draw is left for ovl_Bg_Ikana_Mirror.

* Going to do some groceries, so pushing. About 2/3 across func_80B7FBA4 in ovl_Bg_Ikana_Mirror.

* func_80B7FBA4 in ovl_Bg_Ikana_Mirror is matching. _Draw then data left.

* Need to switch branch.

* Fixed BgKin2Bombwall_SpawnEffects after the Rand_Next() type update.

* Switching branch.

* Learning to decomp draw functions with BgIkanaMirror_Draw. YEP

* Switching branch.

* Went through the first wave of graphics macros attempts for BgIkanaMirror_Draw.

* Removed some temps in BgIkanaMirror_Draw.

* Second pass of macro attempts for BgIkanaMirror_Draw.

* Diff score for BgIkanaMirror_Draw at 1873. Getting there.

* BgIkanaMirror_Draw diff score down to 854. 4 instructions off and registers to fix.

* Instructions are matching for BgIkanaMirror_Draw. Registers left.

* BgIkanaMirror_Draw matches. Data next. Adding some co-authors

* BgIkanaMirror_Draw matches. Data next. Adding some co-authors

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Tom-Overton <hensley.derek58@gmail.com>
Co-authored-by: Isghj5 <isghj5@gmail.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>

* Data imported and OK.

Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>

* Removed commented lines of unused code and useless externs. Documenting C file and object next.

* Renamed fields in actor and variables in 3 functions for ovl_bg_ikana_mirror. Some conventions applied.

* Renamed more variables in the struct and C file for ovl_bg_ikana_mirror.

* More cleanups and naming in ovl_Bg_Ikana_Mirror.

* Renamed some functions in ovl_Bg_Ikana_Mirror. More cleanups. Object documentation next once function names confirmed.

* Renamed collision header, animated textures and display lists for ovl_Bg_Ikana_Mirror in ovl_Bg_Ikana_Mirror and object_ikana_obj. Some textures left to rename.

* Renamed textures only used by ovl_Bg_Ikana_Mirror. Must go back through docs for conventions and styles plus an extra cleanup before PR.

* Went through merging and review docs for extra cleanups. Adding co-authors for documentation.

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>

* Creating branch to merge ovl_Bg_Ikana_Mirror.

* Fixed the merge from zeldaret/mm. ovl_Bg_Ikana_Mirror OK and documented. PR-ready.

* Applied first batch of fixes from PR comments. Adding co-authors for documentation and a function rewrite.

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>

* Renamed the colliders in ovl_Bg_Ikana_Mirror's struct and fixed naming in object file plus spacing cleanups.

* Full rename for data and temps with respect to the mirror's and light rays' respective colliders.

* Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.h

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

* Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c

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

* Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c

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

* Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c

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

* Formatting needed to be applied after commiting suggestions.

* Renamed more textures and removed unnecessary array sizes in the data.

* Forgot to run formatter.

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Isghj5 <isghj5@gmail.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
2022-07-11 20:43:19 -04:00
Anghelo Carvajal 54957f8735
Yet another disasm.py speedup (#918)
* starting point

* add rabbitizer stuff, but commented out

* kinda works now, except for symbols

* trying to fix using symbols for disassembly

* more fixes

* fix branches and some format changes

* make disasm.py runnable again 😅

* fix double words

* hopefully fix jumptables

* fix delay slot spacing on entry.s

* Fix delay slot shenanigans

* minor format update

* re enable multithreading

* add rabbitizer to requirements.txt and cleanup the file

* cleanup

* more cleanup

* more cleanups

* getImmOverride

* black

* hopefully final cleanup

* diff.py requirements

* Install python dependencies on jenkinsfile

* --no-cache

* Remove `--no-cache --upgrade`

* branch_likely_delay_slot_save

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

* review

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

* a

* Don't use $FpcCsr

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-11 20:13:14 -04:00
Anghelo Carvajal 45eed680d6
`code_8013EC10` and `code_80182CE0` (`z_rumble` and `sys_rumble`) (#763)
* First pass

* import bss

* cleanup warnings

* PadMgr_ControllerHasRumblePak

* z64rumble.h

* rename file to z_rumble.c

* format

* Update src/code/z_rumble.c

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

* Update src/code/z_rumble.c

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

* name a temp

* minor cleaning

* bss

* match code_80182CE0

* import data and cleanups

* Rename RumbleManager struct and sys_rumble file

* Rename functions from sys_rumble

* Rename parameter to distSq

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

* more notes and a bit of cleaning

* Name Rumble_Add and Rumble_AddForced

* some extra notes

* Rename Rumble_Override and Rumble_Request

* document states

* minor renames

* actorfixer

* format

* very minor docs

* whoops

* remove redundant prevent_bss_reordering

* Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c

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

* Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c

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

* Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c

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

* namefixer

* Update src/code/sys_rumble.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* fix

* Elliptic review

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

* minor cleanups

* Update include/z64rumble.h

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

* review

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

* Update src/code/sys_rumble.c

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

* Update src/code/z_rumble.c

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

* review

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

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-29 22:08:03 +01:00
Tom Overton 158d1b26b0
PlayState rename (#835)
* PlayState rename

* Make this work with the latest master and run format

* Respond to hensldm's review

* Respond to Elliptic's review

* Add Effect_GetPlayState to namefixer.py

* Add missed comma
2022-06-26 11:57:37 -04:00
TrulyNaN 53fc438d81
Merge z_bg_kin2 bombwall (#840)
* test commit

* undoing test commit

* making sure this is the right repo

* removing test file

* init for OSH bombable wall started. put back Actor* in function declarations.

* BgKin2Bombwall_Init is matching.

* started z_bg_kin2_bombwall destroy function. One mismatch right now.

* BgKin2Bombwall_Destroy matches.

* BgKin2Bombwall_Draw matches.

* Fixed BgKin2Bombwall_Init

* BgKin2Bombwall_Init and BgKin2Bombwall_Destroy both match. Fixed s32 array in struct.

* BgKin2Bombwall_Draw and BgKin2Bombwall_Update match.

* Only func_80B6E020 and func_80B6E090 left to match in ovl_Bg_Kin2_Bombwall.

* func_80B6E020 from ovl_Bg_Kin2_Bombwall matches.

* Went from 8925 to about 5-6k diff score for func_80B6E090 in ovl_Bg_Kin2_Bombwall

* Took func_80B6E090 from about 5300 diff score to about 4300 diff score in ovl_Bg_Kin2_Bombwall.

* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 4k ish to 3277

* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 3277 to 2262.

* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 2262 to 1589.

* only slight progress on ovl_Bg_Kinw_Bombwall's func_80B6E090

* Got to 1473 diff score on ovl_Bg_Kinw_Bombwall's func_80B6E090

* Put in the changes made by EllipticEllipsis and hensldm for ovl_Bg_Kin2_Bombwall's func_8066E090.

* renamed some symbols. Fake symbol removal makes nonzero diff, but rom OK's after make.

* moving declarations around, ordering.

* One.word.away. from importing data in ovl_Bg_Kin2_Bombwall.

* ovl_Bg_Kin2_Bombwall data imported. Matching.

* Edited spec for reloc of ovl_Bg_Kin2_Bombwall.

* Removed extra comments for ovl_Bg_Kin2_Bombwall.

* unpushed stuff. dunno.

* forgot to save z_bg_kin2_bombwall.c

* need to commit before make-ing in master.

* Ported z_bg_kin2_bombwall's code. Data next.

* Imported data for merging z_bg_kin2_bombwall. Yes, I yelled when it OK'd.

* Added comments to remember what does what in z_bg_kin2_bombwall.

* Some comments in z_bg_kin2_bombwall.c and function names ideas.

* Added comments for function name ideas. Cleaned up temps in z_bg_kin2_bombwall except in func_80B6E090.

* Renamed most functions and some variables in z_bg_kin2_bombwall.

* Made a name suggestion for func_80B6E020 after testing in game.

* Ran format.sh.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

1 and 0 replaced by true and false in func_80B6E020.

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

Bending to the x-- supremacy.

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* PR fixes (not done yet) including more consistent use of THIS, removing arg0 and arg1 variable names, standardizing params for z_bg_kin2_bombwall, turning some if-return to if-else, removing unnecessary casts.

* Applied isghj5's and EllipticEllipsis' suggestions except for the object file in z_bg_kin2_bombwall. Object file next.

* Screwd up formatting.

* Thinking of playing with object_kin2_obj.

* Documented most of object_kin2_obj based on bombwall, fence and shelf actors.

* Had forgotten an arg1 in z_bg_kin2_bombwall.c

* Replaced a float by its fractional representation. I need to learn float magic.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.h

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

* Applied more formatting and naming remarks from PR about the C file. Assets and object stuff next.

* Display lists and collision header in z_bg_kin2_bombwall.c renamed after their descriptive names in the object's XML file. Name for Ocean Spider House drawers chests left to change.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* One extra line in an if, collision naming convention applied and renamed Ocean Spider House nightstands to drawers chests.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* Changed drawers chest to chest of drawers in object_kin2_obj and z_bg_kin2_shelf.

* Removed some unnecessary comment.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* Fixed BgKin2Bombwall_SpawnEffects after the Rand_Next() type update.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

Rand_Next() update.

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

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

Rand_Next() update.

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

* Adding Co-authors
Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by Derek-Hensley hensley.derek58@gmail.com
Co-authored-by Maide eeeedddccc@hotmail.co.uk
Co-authored-by Tom-Overton tom.overton@outlook.com
Co-authored-by Fig02 fig02srl@gmail.com
Co-authored-by Parker-Burnett burnettparker@gmail.com
Co-authored-by isghj5 isghj5@gmail.com

* Adding Co-authors
Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by Derek-Hensley hensley.derek58@gmail.com
Co-authored-by Maide eeeedddccc@hotmail.co.uk
Co-authored-by Tom-Overton tom.overton@outlook.com
Co-authored-by Fig02 fig02srl@gmail.com
Co-authored-by Parker-Burnett burnettparker@gmail.com
Co-authored-by isghj5 isghj5@gmail.com

* Adding Co-authors
Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by Derek-Hensley hensley.derek58@gmail.com
Co-authored-by Maide eeeedddccc@hotmail.co.uk
Co-authored-by Tom-Overton tom.overton@outlook.com
Co-authored-by Fig02 fig02srl@gmail.com
Co-authored-by Parker-Burnett burnettparker@gmail.com
Co-authored-by isghj5 isghj5@gmail.com

* Adding Co-authors
Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by Derek-Hensley hensley.derek58@gmail.com
Co-authored-by Maide eeeedddccc@hotmail.co.uk
Co-authored-by Tom-Overton tom.overton@outlook.com
Co-authored-by Fig02 fig02srl@gmail.com
Co-authored-by Parker-Burnett burnettparker@gmail.com
Co-authored-by isghj5 isghj5@gmail.com

* Adding Co-authors

Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by Derek-Hensley hensley.derek58@gmail.com
Co-authored-by Maide eeeedddccc@hotmail.co.uk
Co-authored-by Tom-Overton tom.overton@outlook.com
Co-authored-by Fig02 fig02srl@gmail.com
Co-authored-by Parker-Burnett burnettparker@gmail.com
Co-authored-by isghj5 isghj5@gmail.com

* Adding Co-authors

Co-authored-by: EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by: Derek-Hensley hensley.derek58@gmail.com
Co-authored-by: Maide eeeedddccc@hotmail.co.uk
Co-authored-by: Tom-Overton tom.overton@outlook.com
Co-authored-by: Fig02 fig02srl@gmail.com
Co-authored-by: Parker-Burnett burnettparker@gmail.com
Co-authored-by: isghj5 isghj5@gmail.com

* Adding Co-authors

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
Co-authored-by: Tom-Overton <tom.overton@outlook.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
Co-authored-by: Parker-Burnett <burnettparker@gmail.com>
Co-authored-by: isghj5 <isghj5@gmail.com>

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
Co-authored-by: Tom-Overton <tom.overton@outlook.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
Co-authored-by: Parker-Burnett <burnettparker@gmail.com>
Co-authored-by: isghj5 <isghj5@gmail.com>
2022-06-20 20:57:09 +01:00
mzxrules 361d8573e9
z_obj_tsubo OK (#784)
* 4 unattempts left

* z_obj_tsubo OK

* name some functions

* implement suggestions

* implement EllipticEllipsis changes

* implement more suggestions
2022-06-20 20:44:12 +01:00
Derek Hensley 37d3934e2c
Code_800E8EA0 Docs (#832)
* Start

* Add notes from OOT

* D_801D0D50 -> gDbgCamEnabled

* Rotation Functions

* Text function

* RotateBack -> RotateForward

* Flags functions

* Document rotation func returns

* Remove comment from play

* Rename play function, add notes about Flags, add notes about focus

* Update notes a little

* Update src/code/code_800E8EA0.c

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

* Fix apostrophes

* Bring over OoT changes

* TurnTo -> Track in SubS systesm

* format and remove OoT specific comment

* Remove old comments

* namefixer

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-06-20 01:16:30 +01:00
Tom Overton 6d371502e1
Actor effect cleanup (#828)
* Change "particle" to "effect" in most actors

* Undo accidental comment change

* Effect count defines

* Make struct names consistent

* Fix minislime

* Change particle to effect in Demo_Kankyo

* Some tiny things I missed
2022-06-20 01:11:47 +01:00
Derek Hensley d318b1f285
SubS Time Paths (Finale) (#823)
* 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

* Fix waypoint comments

* Review pt. 1

* Add clarifying comment to SubS_TimePathing_FillWeightArray

* format.sh

* Fix order comments

* weightArray -> knots

* Review pt 1

* Review pt 2

* Update src/code/z_sub_s.c

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

* Update src/code/z_sub_s.c

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

Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-20 00:49:20 +01:00
Tom Overton a039a2f34a
BgIkanaDharma (punchable pillar segments in STT) OK (#851)
* Bg_Ikana_Dharma decompiled

* Bg_Ikana_Dharma more stuff

* remove & from function pointers

* use THIS macro

* use THIS macro

* return -> else

* GET_PLAYER

* slightly better match (this2 only used once)

* fix warnings; name variables

* better match in BgIkanaDharma_Init; more param macros

* Rebase to latest master and some minor cleanup

* More cleanup

* Document object

* Respond to isghj5's review

* Respond to Elliptic's review

* Better pack macro

* Respond to hensldm's review

Co-authored-by: immibis <immibis@gmail.com>
2022-06-20 00:38:51 +01:00
Alejandro Asenjo f0c1e17fd0
ovl_Dm_Bal decompiled (#846)
* All functions match, data import problem present

* * importing succeed
* final clean up
* fixed warnings

* pr fixes

* pr review fixes

* PR review fix

* pr review fixes

* fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 00:13:25 +01:00
Alejandro Asenjo 9e6bc5db8b
ovl_en_hata decompiled (#844)
* z_en_hara progress

* ovl_En_Hata Decompiled

* PR review fixes

* pr review fixes

* PR review fixes

* format

* PR review fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 00:00:03 +01:00
Isghj ab7625db65
`DmZl` OK and some docs of `object_zl4` (Child Zelda used in one cutscene) (#834)
* DmZl: start

* DmZl: progress

* DmZl4: progress

* DmZl: OK

* DmZl: data integrated

* DmZl: object docs

* DmZl: more object docs

* DmZl: more docs

* DmZl: Some Zl4 animations

* ObjectZl4: docs

* DmZl: formater pass

* DmZl: more docs

* DmZl: docs

* DmZl: params documentation

* Apply suggestions from code review

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

* DmZl: requested changes, minor fixes, formater pass

* Update src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c

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

* Update assets/xml/objects/object_zl4.xml

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

* DmZl: some requested changes

* DmZl: Change Eye Texture names for accuracy, formatter pass

* DmZl: Eye texture indexes specified

* DmZl: fixed struct variable names

* DmZl: some requested changes

* DmZl: removed comment

* DmZl: change to unused index

* DmZl: changed some xml comments

* DmZl: requested changes 1

* Update src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c

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

* DmZl: fixing issues, formatter pass

* DmZl: moved switch case

* DmZl: fixed object reference, wrong file

* Update src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c

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

* Update assets/xml/objects/object_zl4.xml

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

* DmZl: mouth and eye state comments

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-19 23:36:07 +01:00
EllipticEllipsis af0123de1e
`z_fcurve_data` OK, match last function in `z_fcurve_data_skelanime`, document SkelCurve system (#776)
* Match SkelCurve_Update

Co-authored-by: Kelebek1 <34639600+Kelebek1@users.noreply.github.com>

* Match and document z_fcurve_data

* Begin documenting SkelCurve

* More documentation

* Deformat header

* Pluralise knotCount

* Sort out jointTable

* Rename frameCount

* Format

* More documentation

* Cleanup on DemoEffect

* Remove space on typedef

* Format, couple of fixes in the header

* Review

* Oops

* Fix EnBox, DemoTreLgt, use macros in EnTorch

Co-authored-by: Kelebek1 <34639600+Kelebek1@users.noreply.github.com>
2022-06-19 03:38:10 +01:00
Derek Hensley 9bf84176d4
Load OK (#792)
* Progress

* cleanup

* Fix comment

* progress

* OK

* Review pt1

* Update comments

* update comments some more

* Renamings

* Add headers and some parens cleanup

* Remove zelda64

* PR review

* bss

* Explain each relocation type a bit in the header comment

* Relocate_Addr macro

* Split off into z64load.h

* Adjust comment slightly based on OOT review

* OverlayRelocationType -> MIPSRelocationType

* Last bit of cleanup from OoT

* format

* Split off functions
2022-06-19 03:28:55 +01:00
Maide 98ba755751
En_Horse_Link_Child (#806)
* EnHorseLinkChild

* PR

* PR
2022-06-19 03:23:25 +01:00
Derek Hensley 271b7c7827
Gfxprint OK (#826)
* Match last two functions as well as some cleanup

* One more small cleanup

* Reviews

* format

* Move internal GFXP_FLAG defines to c file

* Format
2022-06-19 02:56:10 +01:00
Tom Overton 03ba917853
Dm_Stk (Skull Kid) documented, object_stk and object_stk3 fully documented, object_stk2 mostly documented (#827)
* Most of object_stk done

* Document the original name for every animation

* First pass names on every single animation

* Enum for animations

* Enum for limbs

* Very low hanging fruit in dm_stk

* Document a lot more in dm_stk

* Name most remaining struct vars

* Name a bunch of functions

* First pass names to all sound functions

* Name most functions

* Name all other object symbols used by dm_stk

* Name all remaining functions and struct vars

* Much better animation names and documentation

* Lots more function documentation

* Document some stuff

* Name the title cutscene thing

* Last little bit of cleanup

* Format

* Rename SFX functions

* Fix typo in header comment

* Respond to Elliptic's review

* Respond to Elliptic's clarification about Version1/2

* hitCount -> deflectCount

* Take into account some of the feedback that was given for DmZl4
2022-06-19 02:51:58 +01:00
Tom Overton d1b75e4c4b
VisMono OK and documented (#829)
* VisMono OK and documented

* Add some more parentheses

* Fix functions.h

* Respond to hansldm's review
2022-06-19 02:46:41 +01:00
mzxrules ec43a32c26
z_en_box.c, z_demo_tre_lgt.c OK, some object_box documentation (#703)
* All functions attempted, 2 NON_MATCHINGs

* z_en_box OK, more documentation

* format

* en_box cleanups, fix GI item table

* z_demo_tre_lgt OK

* format.sh

* pr suggestions 1

* object_box improvements

* Merge remote-tracking branch 'origin/master' into z_en_box

* Revert "Merge remote-tracking branch 'origin/master' into z_en_box"

This reverts commit 5aacdf26e4.

* more suggested changes

* fix comment
2022-06-18 10:33:59 -04:00
EllipticEllipsis 8049dec339
`sys_matrix` OK, documented, rename some other mathematics functions (#787)
* Import data and bss, add some name options

* Decomp rest of stack functions,
remove RSPMatrix,
split header

* sys_matrix OK (thanks Tharo)

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

* pragma weaks in sinf and cosf, change documentation
change mcros to use 0x8000

* Rename sinf and cosf

* Correct initialisation of sMtxFClear

* More minor cleanup

* Rename stack functions

* Matrix_InsertMatrix -> Matrix_Mult

* The big transpose rename

* Fix MirRay_DrawReflectedBeam

* Matrix_InsertTranslation -> Matrix_Translate

* Matrix_Insert.Rotation_s -> Matrix_Rotate$1S
+ RotateY -> RotateYS

* Matrix_Insert(.)Rotation_f -> Matrix_Rotate$1F

* Matrix_RotateStateAroundXAxis -> Matrix_RotateXFApply
Matrix_SetStateXRotation -> Matrix_RotateXFNew

* Matrix_MultiplyVector3fByState -> Matrix_MultVec3f

* Matrix_MultiplyVector3fXZByCurrentState -> Matrix_MultVec3fXZ

* Matrix_GetStateTranslation -> Matrix_MultZero

* Matrix_GetStateTranslationAndScaled(.) -> Matrix_MultVec$1

* Matrix_FromRSPMatrix -> Matrix_MtxToMtxF

* Matrix_MultiplyVector3fByMatrix -> Matrix_MultVec3fExt

* Matrix_TransposeXYZ -> Matrix_Transpose

* Matrix_ToRSPMatrix -> Matrix_MtxFToMtx

* Matrix_AppendToPolyOpaDisp -> Matrix_MtxFToNewMtx
and document the conversion functions

* Matrix_NormalizeXYZ -> Matrix_ReplaceRotation

* Matrix_InsertRotationAroundUnitVector_f -> Matrix_RotateAxisF and S

* Matrix_InsertRotation -> Matrix_RotateZYX

* Document the last functions

* Small cleanup

* Matrix_JointPosition -> Matrix_TranslateRotateZYX

* Matrix_SetStateRotationAndTranslation -> Matrix_SetTranslateRotateYXZ

* func_8018219C -> Matrix_MtxFToYXZRot

* func_801822C4 -> Matrix_MtxFToZYXRot

* Fix files

* Format

* Review 1

* Renames

* Fix warning in EnDragon

* Format

* Convert `mode` to an actual enum

* Add enums, typedefs, externs to sys_matrix header

* Review

* One more

* More review

* Fix function names

* Format

* Fix names

* Format

* Review

* engineer's review

* Fix build

* Format

* Fix again

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2022-05-25 23:24:39 -04:00
Derek Hensley e1477702ca
EffectSsKirakira OK (#801)
* OK

* cleanup

* KiraKira -> Kirakira
2022-05-25 22:23:27 -04:00
Isghj 12b995093f
`EnNwc` OK and three objects documented (`object_niw` and `object_nwc` and `object_hs`) and some Actor docs( `EnNiw` and `EnAttackNiw` and `EnHg`) (#715)
* EnNwc: OK and some Niw Docs

* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.c

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.c

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.c

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* EnNwc: Overwrite->Override

* EnAttackNiw: fix merges

* AttackNiw and Niw: some docs

* formater pass

* EnNwc: fixed savecontext change

* Niw and Attackniw: more docs

* Apply suggestions from code review

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

* Nwc,Niw: requested doc changes

* Nwc: extracted and marked broken texture

* Apply suggestions from code review

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

* EnNwc: more requested changes

* Nwc: more requested changes

* Apply suggestions from code review

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

* EnHs: object_hs documented, some ovl_En_Hs docs

* EnHs: animation names

* EnHs: some text docs

* EnHs: fear anim changed to shivering now that we know it was used in OOT

* EnHs: more docs and format pass

* Apply suggestions from code review

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

* EnHs: more docs and updates to var name changes

* Niw,Nwc,Hs: added description to object files

* Hs: changed from playerOffset to offset

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-05-25 22:19:38 -04:00
Derek Hensley f1d1d83206
Makefile Changes (#727)
* Change makefile so rom doesn't need to match by default for compression, also change JenkinsFile to split off compression step from building

* Swap uncompressed and compressed in all target

* Forgot to change check warnings stage name

* Intentionally produce non_matching

* Fix

* Add assets target

* Jenkins assets

* Update update_current_warnings

* .make_options config file

* Change comment at top

* Add toggle options for CC_CHECK and OBJDUMP

* Small cleanup

* Whitespace

* More

* bin dumping

* Whitespace

* Review

* Fix comment
2022-05-25 22:15:28 -04:00
Isghj 6d3bcc5cbb
`EnFamos` OK with `object_famos` (#789)
* EnFamos: redo begin

* EnFamos: back to where I was previously

* EnFamos: matched looping draw function

* EnFamos: OK

* Famos: some docs

* Famos: some docs

* Famos: sfx convert pass

* EnFamos: some docs

* EnFamos: more docs

* Enfamos: more docks

* EnFamos: more doc

* EnFamos: more docks

* EnFamos: mass to dec

* Famos: limb enum

* Famos: more docs all functions named

* Famos: all struct mapped

* Apply suggestions from code review

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

* Famos: fix declaration order

* Famos: requested changes

* Famos: draw func using proper sSetupDL indexing

* Famos: fix text anim mismatch, change tlut to match gFamos SnakeCase

* Famos: formater pls

* Famos: requested changes

* Famos: more requested changes

* Apply suggestions from code review

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

* Update assets/xml/objects/object_famos.xml

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

* Famos: requested changes and format pass

* Apply suggestions from code review

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

* Famos: more requested changes

* Famos: more requested changes

* Famos: another change

* Apply suggestions from code review

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

* Famos: made define macro for agro distance

* Famos: separated conditions on separate lines

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2022-05-25 22:11:07 -04:00
Derek Hensley c2afdf6eb0
EffectSsLightning OK (#800)
* OK

* Document and gameplay keep

* cleanup

* Rotate -> Rot

* Update description
2022-05-25 22:01:46 -04:00
Derek Hensley a6e90d144c
SubS models (#807)
* Bring model code over

* SubS_UpdateLimb

* SubS_TurnToPoint

* SubS_TurnToPointMultiTarget

* Adjust comment

* Another comment

* Review

* options as structs

* bss

* adj -> step, SubS_TurnToPointMultiTarget -> SubS_TurnToPointStep, various comment cleanups

* Fix SubS_TurnToPointStep header comment
2022-05-25 21:44:09 -04:00
Maide e227684d9b
En_Boom (#813)
* En_Boom

* Match (thanks Anon)

* Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c

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

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-05-25 21:04:10 -04:00
Parker Burnett 3374f41d1c
En_wiz_brock OK and documented (#817)
* wiz brock OK

* wiz_brok OK and documented

* fixing text

* fixing PR comments

* addressing PR

* fixing comma for format
2022-05-25 20:16:04 -04:00
Tom Overton 8ba8780bb5
En_Snowman (Eeno and snowballs) OK and documented. object_snowman documented (#818)
* EnSnowman_Init OK

* EnSnowman_Destroy OK

* func_80B173D0 OK and better match for EnSnowman_Init

* EnSnowman_Draw OK

* func_80B19948 OK

* func_80B19998 OK

* func_80B19718 OK

* func_80B1746C and func_80B177EC OK

* Match a ton of functions

* func_80B18B30 OK

* func_80B180A4 OK

* func_80B18C7C OK

* func_80B18124 OK

* EnSnowman_Update OK

* func_80B17144 OK

* func_80B19474 OK

* func_80B18F50 OK

* All functions OK

* Import data to C

* Use object symbols

* Misc cleanup

* Fully document object_snowman

* Low hanging fruit

* Document snowman types

* Some more minor stuff

* Some more minor cleanup and naming

* Name some more functions

* More names

* Even more names

* Turns out, they're called Eeno!

* limbPos -> bodyPartsPos as per Fig's suggestion

* Update some more names

* Committing so I can push up stuff for the snowballPos naming

* More names + use generated reloc

* First pass name on every function

* First pass names on all struct vars

* Document the mega eeno glitch

* Get rid of garbage "split dead" naming

* First pass documentation on combine state

* Better names and some documentation

* Last doc pass before PR

* Respond to Elliptic's review

* / 100.0f -> * 0.01f
2022-05-25 19:59:36 -04:00
Rozelette e67fb5cf16
code_801323D0 (z_schedule) (#509)
* OK

* Initial documentation pass

* Pass 2. Add script by Tharo

* Renamed source file

* Documentation cleanup

* Update to latest master

* Feedback

* Bad merge

* Permissions

* Clang format

* Feedback

* format

* Use calculation instead of constant

* Rename as per suggestions

* Fix bss ordering and minor merge conflicts (from Maide)

* Update to current codebase and address feedback

* Fixup names to match new enums

* Format

* Fix duplicate include

* BSS shenanigans
2022-05-21 12:08:19 -04:00
Tom Overton 0ccd71c2da
Document object_wf (#796)
* Document object_wf

* Respond to Elliptic's review

* Fix warning
2022-04-30 10:41:08 -04:00
Tom Overton d0d36b603d
Document object_shn (Shooting Gallery Men and Swamp Guide) (#805)
* Limbs, skeleton, limb DLs, main textures

* Finish documenting object_shn

* Name the eyeIndex variable in syateki_man

* Use limb enum in syateki_man

* One more limb enum I forgot, sorry

* Respond to Elliptic's review
2022-04-24 18:14:14 +01:00
EllipticEllipsis 31f0e19b57
Enable full IDO warnings (#781)
* Fix a lot of IDO warnings (and some Clang ones)

* Format

* Put FULL_DISASM=0 back

* Fix bss
2022-04-22 05:48:41 +01:00
Derek Hensley e50c346ab8
SubS Shadows, Cutscenes, Exchange, and Planes (#773)
* Bring code over

* Rename

* clean up variables.h

* Bring over some more code as well as cleanup

* remove newline in functions.h

* format

* Add plane functions

* Remove from actorfixer

* Add some more docs to plane functions

* Use temp for better format

* change func_8013E8F8 to return an s32

* rename origin back to pos

* format

* Add docs to SubS_ComputePlane

* format

* gfxContextPtr -> globalCtx

* bss

* Better docs of SubS_ComputePlane

* Normal -> unitVec

* Review pt. 1

* Update plane comment

* SubS_ActorAndPlayerAreFacing -> SubS_ActorAndPlayerFaceEachOther

* Add subs texture defines

* Update include/z64math.h

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

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-04-22 05:11:54 +01:00
Tom Overton 10d9025267
Document En_Racedog (and some low-hanging fruit in En_Dg) (#782)
* Dog color documentation

* Simplify floats

* Text ID and some speed doc

* Macros for condition

* Index documentation

* Name the sprint speed multiplier

* Racedog animations

* Document a few things regarding the race start

* Doc selection arrow stuff

* Some low-hanging fruit

* Some path stuff, mostly copied from Jg

* Some speed docs

* More race stuff

* Add a ton of documentation, mostly so I can go to bed

* Document rotation stuff (but I'm not super confident in it)

* Port very low-hanging fruit from Racedog to Dg

* Document cross-product stuff

* Finish docs

* Fix Aob_01

* First response to reviews

* Change it to GetFloorRot
2022-04-22 04:41:08 +01:00
Tom Overton cc759afc9e
Bg_Sinkai_Kabe OK and documented, object_sinkai_kabe documented (#786)
* Bg_Sinkai_Kabe OK and documented, object_sinkai_kabe documented

* Respond to Elliptic's review

* Drop "child" from deepPythonChild
2022-04-22 04:21:42 +01:00
nckwntzl bb784413b9
ObjBlockStop OK and documented (#788)
* init and func_809466F0 matching

* fully matching

* renamed functions

* added include and used oshihiki macro

* fixed spec to use correct reloc

* ran format

* cleaned up comments

* addressed the suggestions and used macro in ObjBlockstop_Update

* fixed one more cast

* ran format.sh

* EllipticEllipsis changes

* ran format

* renamed CheckCollision to CheckForBlock
2022-04-22 03:45:16 +01:00
Tom Overton 81efaf8551
En_Raf (Carnivorous Lily Pad) OK and documented, object_raf documented (#794)
* EnRaf_Init OK

* func_80A17060, func_80A18080, and func_80A180B4 OK

* EnRaf_Destroy, func_80A1712C, func_80A171D8, and func_80A17414 OK

* func_80A17464 and func_80A17530 OK

* EnRaf_Draw OK

* func_80A175E4, func_80A17848, and func_80A178A0 OK

* func_80A18A90 OK

* func_80A179C8 and func_80A17C6C OK

* func_80A1859C OK

* func_80A17D14 and EnRaf_Update OK

* func_80A18B8C and func_80A18DA0 OK, EnRafParticle documented

* func_80A16D40, func_80A16D6C, func_80A17D54, and func_80A17DDC OK

* func_80A17E1C OK

* Use object symbols

* Import data to C and use generated reloc

* Misc cleanup

* Document animations and skeleton

* Finish documenting object_raf

* Some low-hanging fruit

* Some actions I figured out

* Name revival stuff

* Document type stuff

* Bob and player height stuff

* Name a few more things (some of the names are bad but whatever)

* Finally move Vec3f data inline like I've wanted to do for ages

* Some more low-hanging fruit

* limbRot name

* Name the chew stuff

* First pass names on everything, even if they're bad

* Some last-minute stuff before PR

* Respond to Elliptic's review

* Manually specify texture dimensions

* Format

* Add comment about pointless check

* Respond to Elliptic's second review
2022-04-22 03:22:07 +01:00
Tom Overton 232b901ccf
En_Bbfall (Red Bubble) OK and documented (#780)
* EnBbfall_Init OK

* EnBbfall_Destroy, func_808BF5E0, and func_808BF734 OK

* func_808BF578 and func_808BF7A0 OK

* func_808BF4B4, func_808BF830, and func_808BF894 OK

* func_808BF438, func_808BF514, func_808BF8DC OK

* func_808BFA18 and func_808BFA3C OK

* EnBbfall_Draw OK, thanks Tharo, Anon, and Maide!

* LimbDraw functions OK

* All functions OK, thanks Anon for the loop in Update!

* Migrate data to C

* Use generated reloc and object symbols

* Port over a ton of documentation from EnBb

* Use ARRAY_COUNT for all loops

* Do a ton more documentation

* Name unused animation in object_bb

* Copy "floorType" variable name from OoT

* Use enum values for collider type

* Respond to reviews

* Add comment explaining EnBbfall_IsTouchingLava
2022-04-22 02:04:37 +01:00
louist103 776edea91a
git subrepo pull --force tools/ZAPD (#785)
subrepo:
  subdir:   "tools/ZAPD"
  merged:   "87cb648b"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "87cb648b"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
2022-04-21 23:56:34 +01:00
EllipticEllipsis ad42edb034
Add OoT's `namefixer.py` (#775)
* Add OoT's namefixer.py

* Absorb actorfixer into namefixer

* Merge remote-tracking branch 'upstream/master' into namefixer

* Remove problematic functions

* Add sanity check

* Review
2022-04-17 20:35:35 +01:00
Derek Hensley f4bb821b56
EffectSsSbn OK (#751)
* Ok

* Cleanup and document

* File header description

* rename scroll related regs

* undef syms

* Cleanup for PR

* Move comment

* Add todo
2022-04-17 19:07:25 +01:00
Maide bbc6dd77ea
Obj_Nozoki (#704)
* Obj_Nozoki

* GID

* PR

* Merge

* PR
2022-04-17 11:08:16 -04:00
Maide afd3ae243d
En_Test6 (#627)
* En_Test6

* ArrCount

* Always forget params

* PR

* Move defs

* PR

* Fix

* PR

* Merge

* Merge

* PR

* Fix

* PR

* PR

* Fix bss

* Match (thanks Anon)

* bss

* PR

* Merge

* bss

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
2022-04-09 05:38:54 +01:00
Derek Hensley 06412c070f
Cleanup 3 (#778)
* lights

* D_801D88A0 -> gScarecrowSpawnSongPtr

* Misc fixes

* CHECK_FLAG_ALL

* Trailing commas in enums

* matches

* Remove todo from lights bss

* Update src/overlays/actors/ovl_En_In/z_en_in.c

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

* thisx -> this2

* fix

* Todos

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-04-07 20:39:11 +01:00
EllipticEllipsis c2f4572d13
Document EnKujiya (Lottery Shop) (#777)
* 7

* 7

* Update assets/xml/objects/object_kujiya.xml

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

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-04-07 20:27:24 +01:00
Tom Overton 8a0b0b7ec8
En_Syateki_Okuta (Shooting Gallery Octorok) OK (#772)
* EnSyatekiOkuta_Init and EnSyatekiOkuta_Destroy OK

* func_80A36260, func_80A362A8, func_80A362F8, and func_80A36350 OK

* func_80A361F4 OK

* Decomp a bunch of functions

* Better match for func_80A368E0

* func_80A36CB0 OK

* Draw functions OK

* All functions OK

* Import data to C

* Use object symbols

* Final cleanup and generated spec

* Remove something I missed

* char -> UNK_TYPE1

* Respond to reviews

* Remove static from unnamed variables, whoops
2022-04-07 19:23:13 +01:00
Tom Overton 50c5ab0fc7
En_Dragon (Deep Python) OK and documented. object_utubo documented (#771)
* EnDragon_Init OK

* func_80B5EDF0 OK

* func_80B5EAA0 OK

* EnDragon_Destroy OK

* EnDragon_Update OK

* func_80B60138 OK

* func_80B5EE3C OK

* func_80B5EF88 OK

* func_80B5F418 OK

* func_80B5ED90 OK

* func_80B5EB40 OK (commented out because data is not imported yet)

* Import data into C

* Uncomment func_80B5EB40

* func_80B5EFD0 OK

* func_80B5F3A4 OK

* func_80B5F888 OK

* func_80B5FCC0 OK

* Draw functions OK

* func_80B5FD68 OK

* func_80B5F508 OK

* func_80B5F8D8 OK

* Better match on func_80B5FD68

* Use generated reloc

* Remove undefined_syms for this actor

* Some minor cleanup

* Make the data like Anghelo said

* Document object_utubo

* Name a bunch of stuff

* Name some more stuff

* Some documentation around death

* Documentation for actions

* Name a bunch of junk

* Use regs instead of directly accessing gGameInfo

* Name the player position vars

* Update weekEventReg references

* Name and list out states

* Name timer

* Document extend stuff

* Finish documentation

* Respond to Anghelo's review

* Respond to hensldm's review

* The thing Anghelo suggested *actually* matches
2022-04-06 21:03:27 -04:00
EllipticEllipsis 15dfaf0862
ABI FPR names (#767)
* Add o32 to disassembler and update macro.inc

* Add a variable for asm processor to makefile
and improve objdump flags

* Update diff settings

* git subrepo pull --force tools/asm-differ

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "1236288d1"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ"
  branch:   "main"
  commit:   "1236288d1"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Remove * import and implement option

* Fix some stuff in the makefile

* Update asm-processor

* Review

* Fix old var name
2022-03-31 18:22:19 +01:00
Anghelo Carvajal 54a4d1eb12
Fix actorfixer (#774) 2022-03-30 04:23:20 +01:00
Tom Overton 6faf186a95
En_Wallmas (Wallmaster) OK and documented. object_wallmaster documented (#731)
* EnWallmas_Init and EnWallmas_Destroy OK

* func_80874B88 OK

* func_80874BE4 OK

* func_80874D1C OK

* func_80874DE8 OK

* func_80874F14 OK

* A bunch of small functions OK

* A bunch of smaller functions OK again

* func_808752CC OK

* func_808758C8 OK

* func_80875910 and func_8087596C OK

* func_808756AC and func_8087571C OK

* EnWallmas_Update OK

* func_80875A74 OK

* func_80874A88 and func_80874B04 OK

* A bunch of functions OK

* func_808759B8 and func_80875A0C

* EnWallmas_Draw OK

* func_808760A4 and func_80876118 OK

* func_80875F04 OK

* Use object symbols

* Import data to C

* Use generated reloc

* Document object_wallmaster

* Misc cleanup

* Name the DrawDamageEffects variables

* Name draw functions

* Enum for damage values

* Port function names from OoT

* Last cleanup before PR

* Respond to Elliptic's review

* Respond to Elliptic's second review

* gWallmasterWaitAnim -> gWallmasterIdleAnim

* Change all EnWallmas to Wallmaster (except the actor's name itself)

* Respond to hensldm's review

* Fix merge conflicts
2022-03-29 22:33:32 +01:00
Maide 7280d10404
En_Horse (2 non-matching) (#413)
* En_Horse

* a

* Warnings

* Warnigns 2

* PR

* Formats

* Fix

* PR

* Merge

* Merge

* Merge
2022-03-29 22:15:26 +01:00
Anghelo Carvajal 72bae2b6ba
`z_kaleido_setup` (#768)
* KaleidoSetup_Init

* func_800F4C0C

* func_800F4A10 NON_EQUIVALENT

* fixes

* func_800F4A10

* import data

* Rename Play_InCsMode

* Name KaleidoSetup_Update

* minor cleanup

* Update src/code/z_play.c

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

* Update src/overlays/actors/ovl_En_Bom/z_en_bom.c

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

* Update src/overlays/actors/ovl_En_Gs/z_en_gs.c

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

* Update src/code/z_kaleido_setup.c

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

* Update src/code/z_kaleido_setup.c

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

* Update src/code/z_kaleido_setup.c

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

* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c

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

* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c

* unname D_801BDB00

* format

* a

* actorfixer

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2022-03-29 22:04:41 +01:00
Derek Hensley 486e7cbe83
SubS General Pathing Helpers (#760)
* Brought code over and cleanup

* cleanup functions.h and format

* add comment

* Whitespace

* Format

* Update src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c

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

* Format

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-29 21:37:58 +01:00
Maide 98143afb1c
En_Test (#756)
* En_Test

* PR

* PR

* PR

* Fix
2022-03-29 21:14:29 +01:00
Derek Hensley 036a68cb3e
Effects Stick and Kakera cleanup (#752)
* cleanup

* cleanup

* idx -> index
2022-03-29 20:52:37 +01:00
Derek Hensley ec9909c65c
Boot_800862E0 OK (#769)
* boot_800862E0 OK

* Ran format.sh

* attempt at fixing bss reordering

* boot_800862E0 OK (for real this time)

* Run formatter

* Changes u32 pointers to uintptr_t and sizes to size_t

* Run formatter

* Fix bss reordering

* Delete baserom.mm.us.rev1.z64:Zone.Identifier

* Cleanup and some notes

* Try my best to document

* remove comments

* Remove D_80097508 from variables.h

Co-authored-by: kyleburnette <kyle@kyleburnette.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-29 20:42:44 +01:00
LtPeriwinkle afec1c56a6
EnNeoReeba OK and documented, object_rb mostly doc'd (#750)
* match some functions

* finish decompiling

* mostly document except some dmgeffs

* Document object_rb

* update functions.txt, damagetable

* remove number comments

* suggestions

* format and fix enum names

* comment object_rb.xml
2022-03-29 19:12:35 +01:00
Isghj 275f13881b
`EffectEnIceBlock` OK, `object_ice_block` documented (and minor `Obj_Iceblock` documented) (#748)
* EffIceBlock: OK

* object_ice_block: documented

* EffectIceBlock: matching gfxCtx in the draw function

* Iceblock: removed undefined sym

Co-authored-by: Isghj8 <isghj8@gmail.com>
2022-03-29 18:28:19 +01:00
Isghj cbffe83c9b
EnWarpTag OK (Warping pedestals in Goron Trial) (#747)
* EnWarpTag: OK

* Apply suggestions from code review

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

* WarpTag: move macros

* WarpTag: format

* WarpTag: fix save entrance index

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-29 18:21:36 +01:00
Maide 37e82498df
Dm_Gm (#739)
* Dm_Gm

* PR
2022-03-29 17:55:32 +01:00
Anghelo Carvajal 78acaef73d
`ovl_Boss_03`: Gyorg OK (#736)
* Boss03_Init NON_EQUIVALENT

* rand functions

* Boss03_Draw

* match the limb draws

* Match Boss03_Init by Synray and Engineer

* A bit of cleanup

* a bunch of functions

* another bunch of functions

* func_809E299C and GyorgEffect

* import data

* A bit of cleanup

* effects related functions

* func_809E2DA0

* func_809E34B8 NON_EQUIVALENT

* func_809E3968 NON_EQUIVALENT

* func_809E3D98

* func_809E421C NON_EQUIVALENT

* func_809E475C

* func_809E497C

* func_809E4C90

* func_809E6640 NON_MATCHING

* func_809E6A38

* Match func_809E6640 by Tharo

* func_809E7D00

* func_809E8810

* func_809E4E80 NON_EQUIVALENT

* func_809E5B64

* func_809E6CB4

* Boss03_Update NON_EQUIVALENT

* func_809E81E4 attempt

* Boss03_Update improvement thanks to Petrie

* func_809E81E4 NON_MATCHING

* func_809E34B8 is at least equivalent

* cleanups

* format

* import bss

* more cleanup and minor renames

* Match func_809E81E4

* cleanup effect functions

* a few more renames

* func_809E4E80 matched by Maide

* documentation pass

* name workTimer

* macros

* More renames

* Improve func_809E34B8 a bit and match Boss03_ChewPlayer

* defines placeholders for work timer, enum for effects and other minor renames

* actorfixer

* some cleanups

* effects named

* Some more renames and cleanups

* more cleanups

* Boss03_UpdateCollision, Boss03_SeaweedUpdate and Boss03_SeaweedDraw

* Rename more actionfuncs

* cleanup undefined syms

* collision stuff and run formatter

* more cleanups

* more cleanups i forgot to commit

* and yet more clenaup

* Add notes

* Remove debugging stuff

* format

* Match the last 3 functions by Anon58

* bit of cleaning

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* PR

* format

* Remove some if (1) from Boss03_IntroCutscene

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.h

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* PR

* address pr

* prevent_bss_reordering

* Anon review

* seaweed stuff thanks to elliptic

* format

* whoops

* huh

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* address PR

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Address PR

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

* Sectioning

* whoops

* a

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

* a

* kinda

* ,

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* remove redundant comment

* actorfixer

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2022-03-29 17:41:44 +01:00
Maide 348e87083b
Bg_Breakwall (#733)
* Bg_Breakwall

* PR and match (thanks petrie)

* PR

* Merge
2022-03-29 17:11:08 +01:00
Parker Burnett e19705f7eb
En_crow OK and Documented (#698)
* this is the guay

* do you know the guay?

* No guay!

* got too excited to pr lol, fixes are here

* Majoras Mask: No Guay Home

* fixing objects

* 4mattt
2022-03-29 16:55:29 +01:00
Maide b567c4ee68
En_Hs (#746)
* En_Hs

* Add limb switch

* Merge
2022-03-29 16:29:34 +01:00
Anghelo Carvajal 84d9efda92
ZAPD update: Cutscene extraction (#770)
* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "89a0b2628"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "89a0b2628"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "efae567d3"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "efae567d3"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
2022-03-29 16:13:24 +01:00
Maide 1ff183bc05
En_Test7 (#628)
* En_Test7

* Clean some stuff

* I hate BSS

* PR

* Fix

* Merge

* Fix

* Match (thanks Anon)

* PR

* PR

* PR

* Fix
2022-03-28 21:25:08 -04:00
Anghelo Carvajal b08880f7a7
`z_sram_NES` with 2 NON_MATCHINGs and 1 NON_EQUIVALENTs (#531)
* Rename Sram_InitDebugSave

* Sram_InitDebugSave

* err

* Sram_IncrementDay

* non_matchings

* func_80146F5C and protos

* func_80146EE8

* func_80145698

* func_80143A54

* Split SaveContext

* problems with bss

* Fix bss

* more

* a small bunch

* Fix warnings

* almost everything

* two attempts

* at least compiles

* import data

* bss

* format

* stuff?

* Progress?

* More progress

* clean up data a little

* More progress

* disaster

* re split data

* A bit less of a disaster

* Fix renamed stuff

* data stuff

* fix conflicts

* format

* CycleSceneFlags

* some enums

* cleanup

* Fix merge issues

* format

* some changes

* format

* Lots of progress on z_sram_NES, but no matches yet

* SaveContent Documentation

* Oops

* Oops2

* Document more SaveContext

* Oops, don't need that anymore

* add small comment

* Another comment

* dekuPlaygroundPlayerName

* Fix merge issues

* format

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* remove magic number

* format

* fix merge issues

* bss

* format

* macro cleanup

* review

* merge issues

* review

* cleanup

* UNK_TYPE1

* Fix

* Remove comment

* small change

* conflicts

* review

* fix

* fixes

* format

* Update actorCtx renames part

* Match func_80143B0C thanks to Petrie and Anon

* minor cleaning pass

* format

* cleanup

* more minor cleanups

* Macros for accessing gSaveContext.save.stolenItems

* Introduce STOLEN_ITEM_NONE and remove CLEAR_STOLEN_ITEM_

* format

* Update include/macros.h

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* @hensldm review

* Update include/functions.h

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

* Update include/functions.h

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

* Rename QUEST_SONG_NEW_WAVE

* Add scene name comments to D_801C5FC0

* rename horseData.yaw

* Update include/functions.h

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* // = CUR_UPG_VALUE(UPG_WALLET);

* run actorfixer and format

* fix bss

* Fix merge problems and run format

* Some improvements to func_801457CC by anon

* bss

* format

* run actorfixer

* actorfixer, bss and format

* Use original names for the RESPAWN_MODE enum because the current ones are bad

* QUEST_SONG_BOSSA_NOVA

* some minor fixes on the SaveContext struct according to the debug rom

* Merge Inventory.items and Inventory.masks

* a

* simplify saveBuf accesses

* A few func renames

* actorfixer

* bss

* fixes

* bss

* actorfixer

* actorfixer and format

* actorfixer

* whoops

* whops

* bss

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-03-27 12:37:02 -03:00
Andzura 4f3202fd7e
z_message progress (#701)
* 8 functions matching, 1 non-matching, 45 untouched

* match func_801518B0

* match func_8014CC14

* matching 8 func, 1 non-matching

* matched func_80148CBC

* matched func_80156758

* matched func_80147564

* matched func_80151BB4

* matched func80152EC0/Message_Spawn_Song_Effect

* matched func_80151C9C

* WIP func_80148B98

* WIP func_80151938

* matched func_80151938

* matched func_80148B98

* matched func_80147734

* matched func_80147624

* WIP func_8014EBC

* match func_801518B0

* matched func_80147564

* matched func80152EC0/Message_Spawn_Song_Effect

* matched func_80151C9C

* WIP func_80148B98

* matched func_80151938

* matched func_80148B98

* matched func_80147734

* matched func_80147624

* WIP#2 func_8014EBC

* matched func_80149EBC

* WIP func_8014CCB4

* matched func_8014CCB4

* matched func_80151A68

* WIP func_8014D62C

* fix func_8015A68 signature

* z_message_nes & z_message_staff progress

* z_message_nes & z_message_staff renaming

* documenting z_message

* cleaning & renaming

* documenting MessageContext

* matched func_80151A68

* format

* naming convention fix

* re-add func_80147564

* apply renaming of Message_ShouldAdvanceSilent on the whole project

* re-format, add clang-format off/on in z_message.c needed for matching

* rename staff => credits; add renames in actorfixer.

* change rupees array to ascii

* remove useless comments

* change MessageContext.decodedBuffer to a union

* remove decodedBuffer from actorfixer

* applied AngheloAlf suggestions & ran sfxconvert on z_message.c

* rename message_struct => message_data_static; revert decodedBuffer as union creating differences.

* use true/false instead of 1/0

* use SET_FULLSCREEN_VIEWPORT macro in func_80152c64

* AngheloAlf suggestions.

* extract assign from dayTime calculation for readability in Message_LoadTimeNES

* remove bss_reordering from osFlash, idle & boot_main to typedef MessageTableEntry in message_data_static & make decodedBuffer an union.

* remove useless casts

* Changes hexa to ascii chars when it's meaningful;
add comments to func_8014CCB4 to show what hexa constant means.

* Hensldm suggestions

* ran actorfixer on new changes; fix new bss reordering error introduced with rebase

* use new TIME_TO_MINUTES_F macro

* re-ran format.sh

* hensldm suggestions #2 + overall cleaning

* remove useless parenthesis

* Update include/message_data_static.h

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

* actorfixer and format

* more fixes

Co-authored-by: Andzura <andzura@andzura.fr>
Co-authored-by: abaud <adrien.baud@inria.fr>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-27 12:09:47 -03:00
engineer124 02cb971616
En_Gakufu OK and Documented + Related Audio Functions (#662)
* Gakufu OK, copy progress from audio WIP

* Extraction

* import wip in prep for audio data import

* Add in `code_8019AF00.c` functions

* Finish docs

* Spacing

* Add enum

* Many PR suggestions

* Another enum

* PR Suggestions

* Fix bss

* Move comment higher

* Fix bss

Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-27 11:52:43 -03:00
louist103 928acac500
Bombers2 OK (#721)
* OK

* OK

* cleanups

* restore makefile

* format

* format

* format

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h

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

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h

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

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c

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

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c

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

* Update src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c

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

* Update src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c

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

* Update object_cs.xml

* fixes

* format

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-27 11:47:34 -03:00
engineer124 f1d1173558
River_Sound OK and Documented + River_Sound Related `z_actor`/`Audio` Functions (#661)
* First pass of `func_800BCCDC`

* river_sound OK (copy progress from audio WIP)

* Copy progress from `code_8019AF00.c` (still waiting for data to be imported)

* More docs

* feedback

* Add in `code_8019AF00.c` functions

* format

* params

* Minor cleanup

* Small fix

* one more

* Better names

* Add comment, cleanup Idx

* Fix bss

* Fix BSS
2022-03-27 11:42:19 -03:00
Maide 9e13859495
En_Tru_Mt (#726)
* En_Tru_Mt

* PR

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-27 11:32:08 -03:00
Maide 38eef9252e
En_Kbt (#732)
* En_Kbt

* PR

* a
2022-03-27 11:27:09 -03:00
Maide ba1595b5ad
En_Hanabi (#728)
* En_Hanabi

* PR
2022-03-27 11:17:15 -03:00
Maide 145b2f6a61
En_Jgame_Tsn (#722)
* En_Jgame_Tsn

* Merge
2022-03-27 11:01:23 -03:00
immibis 061ebc3b12
z_obj_chan OK (#591)
* z_obj_chan OK

* update Obj_Chan

* Obj_Chan updates

* Update for name changes. gameplay_keep object header is needed

* format

* more updates

* more changes

* Simplify floats

Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-27 10:56:20 -03:00
Maide 36391bee46
En_Mk (#711)
* En_Mk

* PR
2022-03-27 10:44:55 -03:00
Tom Overton 3986732c5d
En_Syateki_Dekunuts (Shooting Gallery Deku Scrub) OK (#716)
* Import data to C

* EnSyatekiDekunuts_Init OK

* EnSyatekiDekunuts_Destroy OK

* func_80A2BE54 OK

* func_80A2BF18 OK

* func_80A2BFC4 OK

* func_80A2C0F8 OK

* func_80A2C150 and func_80A2C168 OK

* func_80A2C1AC OK and better match on func_80A2BFC4

* func_80A2C208 OK

* func_80A2C27C OK

* func_80A2C2E0 and func_80A2C33C OK

* func_80A2C3F0 OK

* func_80A2C478 and func_80A2C48C OK

* EnSyatekiDekunuts_Update OK

* func_80A2C4D0 OK

* func_80A2C5DC OK

* EnSyatekiDekunuts_Draw OK

* func_80A2C8A0 OK

* Use generated reloc and minor cleanup

* Use object symbols

* Last bit of cleanup

* Use limb enum values for all syateki actors I've worked on

* M_PI / 4
2022-03-26 03:07:25 +00:00
Tom Overton acd84bda77
En_Bb (Blue Bubble) OK and documented. object_bb documented (#713)
* EnBb_Init OK

* EnBb_Destroy OK

* func_808C20D4 OK

* func_808C2238 OK

* func_808C1FF4 OK

* func_808C1E94 OK

* func_808C2344 OK

* func_808C23EC OK

* EnBb_Update OK

* func_808C2E34 OK

* func_808C254C OK

* func_808C272C OK

* func_808C2B94 OK

* func_808C2A00 OK

* func_808C1F00 OK

* func_808C1F74 OK

* func_808C25E0 OK

* func_808C28CC OK

* func_808C2B1C OK

* func_808C2BD0 OK

* func_808C2C38 OK

* func_808C2CB4 OK

* func_808C2CF0 OK

* func_808C2D78 OK

* EnBb_Draw OK

* func_808C32EC OK

* func_808C3324 OK

* Migrate data to C

* Use generated reloc

* Object symbols and misc cleanup

* Name struct vars that are used with Actor_DrawDamageEffects

* Name most things in the object

* Name attackRange

* Good enough names for limbs for now

* Might as well name the limb draw stuff for now

* Name flame width/height

* Enum for damage effects

* Name some more stuff from OoT

* Name a lot more stuff

* First pass names on all functions

* Name jinxTimer on gSaveContext

* Name sLimbIndexToLimbPos

* First pass name to the rest of the limb draw system

* More cleanup

* Last cleanup before PR

* Incorporate Actor_DrawDamageEffect stuff

* Respond to hensldm's review
2022-03-26 02:57:18 +00:00
louist103 7d4aaef0cd
Fire and Light arrows (#710)
* fire arrow OK

* Light arrows OK

* Format

* Assets

* Mtx Mode

* PR fixes

* pr fixes

* Update src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c

* Update src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
2022-03-26 02:51:41 +00:00
Derek Hensley 9a41b76f35
SubS ActorPathing (#689)
* Bring code over

* Clean up

* Renames

* Cleanup

* Split SubS stuff from z64 into z64subs

* newline

* Bss

* Name callbacks

* bss

* bss
2022-03-26 02:43:14 +00:00
Maide e43a92de18
En_Attack_Niw (#707)
* En_Attack_Niw

* PR

* newline
2022-03-26 02:23:06 +00:00
Parker Burnett 9362fee5e8
En_kusa OK and Documented (#640)
* matched one function

* More matches

* more matches

* cleaning up some stuff

* making some progress

* two new matches, and a partial match

* meh...i'll come back to this

* fixing ctx names

* more matches

* OK and documented

* fixing data stuff

* PR suggestions

* fixing name and DL issues

* fixing pr suggestions

* PR feedback

* ....format....

* PR fix

* fixes

* dang format

* fixing name

* I'm blind

* fixing obj_grass
2022-03-26 02:10:25 +00:00
Derek Hensley 69c0e15a45
EffectSsBubble OK (#702)
* Decompile eff_ss_bubble

* Document effBubble stuff in gameplay keep

* newline

* Formatting is hard

* PR suggestions

* Amplitude -> Max
2022-03-26 01:54:05 +00:00
Maide b7639a7c6f
En_Wood02 (#697)
* En_Wood02

* statics£

* PR

* PR
2022-03-26 01:39:33 +00:00
Nick ce7aa87454
Oceff wipe6 (#686)
* Uncorrupted; Not OK

* Merged upstream -- actually OK

* Update assets/xml/overlays/ovl_Oceff_Wipe6.xml

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

* - Removed Extra 0 characters; clang-format-11

* Removed new warnings.

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-03-24 23:45:37 -03:00
fig02 80cbdb956d
En_Tanron4 OK (seagulls) (#714)
* Seagull OK

* small fixes

* review 1

* review 2
2022-03-24 23:39:34 -03:00
Maide 9a54ec9e0b
En_Bombers (#684)
* En_Bombers

* No need for this >:

* Override

* PR
2022-03-24 23:21:14 -03:00
Derek Hensley 984a5061c2
ObjectFsn documented (#680)
* Cleanup some shopkeepers

* More cleanup

* Document animations

* General cleanup

* Animation enums

* Limb maxes

* More Cleanup

* Some more minor stuff

* fsn cutscene state

* Parens and postlimbdraw

* Ossan Limbs

* Remove ENFSN_LIMB_MAX

* SI_MAX

* Compound macro

* Document gameplayKeep textures used by shopkeepers

* Ani Limbs in Ossan

* Format

* PR suggestion

* Remove trueTmp from EnFsn
2022-03-24 23:14:14 -03:00
Tom Overton d5e692d0e1
En_Bom_Chu (Bombchu) OK and documented (#679)
* EnBomChu_Init OK

* EnBomChu_Destroy OK

* func_808F7868 OK

* func_808F79D4 OK

* func_808F7E74 OK

* func_808F7FA0 OK

* func_808F77E4 OK

* func_808F75D0 OK

* func_808F7944 OK

* func_808F7A84 OK

* func_808F818C OK

* func_808F8080 OK

* func_808F7FD0 OK

* EnBomChu_Update OK

* EnBomChu_Draw OK

* Drop unnecessary cast in Update

* Import data into C

* Object symbol

* Use generated reloc

* Port over OoT struct var names

* Name all statics

* Misc cleanup

* Name some of the new struct vars introduced in MM

* Port over most OoT function names

* Name movingSpeed based on in-game observation

* Name final param in EnBomChu_SpawnRipplesAndSplashes

* More cleanup and OOT port

* Some more names

* More docs

* Name last function

* Final little cleanup

* First round of review fixes

* Change the name of that one function

* More precise comment
2022-03-24 23:07:59 -03:00
Maide 5684b342b6
En_Vm (#678)
* En_Vm

* Hidden funcs >:

* PR

* PR
2022-03-24 22:55:58 -03:00
Parker Burnett 950f3a247e
En_guard_nuts OK and Partially documented (#668)
* guard_nuts OK

* doing some documenting

* more docs

* more docs

* minor changes

* touch ups

* format

* pr feedback

* fixing a name

* ran actor_fixer
2022-03-24 22:34:50 -03:00
Tom Overton cbfa42c070
En_Mt_tag OK and documented (Goron Race Manager) (#659)
* EnMttag_Init OK

* EnMttag_Destroy OK

* EnMttag_Update OK

* func_809CF9A0 OK

* Update struct

* func_809CF444 OK

* func_809CFA00 OK

* func_809CF394 OK

* func_809CF8EC OK

* func_809CFA54 OK

* func_809CF350 OK

* func_809CF848 OK

* func_809CF950 OK

* func_809CFBC4 OK

* func_809CFD98 OK

* func_809CFE28 OK

* func_809CFF94 OK

* func_809CFC38 OK

* Get super close on func_809CF4EC

* Import data

* Get a start on func_809CF67C

* func_809CF4EC OK, thanks engineer!

* func_809CF67C OK, thanks engineer!

* Use the generated reloc

* Name message functions and raceGorons array

* Name some more stuff

* Name more functions

* Name most functions

* Take a stab at trying to figure out what the data represents

* Much better naming and understanding

* Name more

* Strip out debugging junk

* Better name

* Name the rest of the variables

* Describe bug

* Document the h*ck out of things

* Simplify PlayerCheatStatus a bit

* Use sCheckpointPositions as per engineer's advice

* Do some really stupid naming nonsense to explain the side effect of a function

* Fix Racing/RaceGoron inconsistency

* Decimal weekEventReg accesses

* Rename to EnMttag_UpdateCheckPoints

* Capitalization consistency + update functions.txt

* Respond to review

* Respond to review

* Respond to Elliptic's review

* idk if Elliptic meant the function name or the variable so let's just do both lol

* Fix function name changed by z_demo merge
2022-03-24 22:28:03 -03:00
Parker Burnett 3431b542ff
En_look_nuts OK with docs (#674)
* OK

* some documenting

* lgtm

* format

* spacing things out

* one other name

* PR feedback

* fix enum

* addressing PR

* actor fixer

* fixing PR
2022-03-24 22:22:46 -03:00
Maide f87c8290c8
En_Tsn (#651)
* En_Tsn

* PR

* PR

* Merge
2022-03-24 22:05:40 -03:00
Maide 7ee4615cd0
Obj_Spidertent (1 non-matching) (#639)
* Obj_Spidertent

* Match func_80B2FC98 (thanks Anon58)

* PR

* Fix

* PR

* PR
2022-03-24 21:56:51 -03:00
Anghelo Carvajal 1599192b85
Script for checking relocs correctly updated on spec (#718)
* Script to check for relocs on spec

* add reloc_spec_check to jenkinsfile

* add colors

* Use light red instead of red

* Go back to red

* fix EnDoor reloc
2022-03-24 21:25:41 -03:00
engineer124 e77a22e8a9
Audio_Heap OK and Documented (#621)
* copy audio_heap progress from main branch

* Add filter bugs

* PR Review + Docs

* format

* typo

* Improve audio buffer notes

* Add documentation

* PR Feedback

* PR Suggestions

* Fix bss

* PR Suggestions

* PR typo

* Fix warning
2022-03-23 23:40:31 -04:00
engineer124 b852a9a930
Audio_Load OK and Documented (#620)
* Copy audio_load progress from main branch

* Fix warning

* fix UB

* cleanup WIP

* Add docs, bss still broken

* bss fix

* bytesRemaining with size_t

* PR Suggestions

* PR Suggestions

* Fix bss

* Fix bss

* PR Suggestions
2022-03-23 21:22:13 -04:00
Anghelo Carvajal 92c4d42f44
`z_skin` and `z_skin_awb` OK and documented a bit (#415)
* oot copypaste

* func_8013859C non matching and func_80138700

* protos

* the other functions

* func_80138300

* progress

* func_80137F58

* func_80137EBC

* func_80137B34 NON_MATCHING

* func_80137970

* func_8013835C

* z64skin

* some docs

* some bits

* Match func_80137B34

* Match Skin_DrawImpl

* Match Skin_Init tahnks to Anon

* Some docs?

* AnimatedLimb

* SkinVtx

* more names

* fix merge issue

* format

* another clean

* trailing comma

* cleanup

* format

* add some descriptions

* Import bss

* last cleanup

* Update ZAPD symbol map

* Reanme gIdentityMtx and gIdentityMtxF

* fix merge issues

* bss

* review

* Update include/z64skin.h

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

* bss

* Port @fig02 skin docs

* format and a few changes

* format

* Port over OoT review

* fixes

* Engineer's review

* format

* address pr

* Fix bss

* fix bss

* Update src/code/z_skin_awb.c

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

* bss

* bss

* undo

* pr

* Skin_Setup

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-03-23 17:30:34 -04:00
mzxrules f1560614d6
z_object_switch OK (#527)
* z_obj_switch all functions attempted

* z_obj_switch OK

* Document z_obj_switch

* update gameplay_dangeon_keep references

* pr changes implemented

* fix warnings

* pr suggestions, name all functions
2022-03-10 05:49:11 -05:00
immibis fa321be0f3
Bg_F40_Switch OK and documented (#526)
* Bg_F40_Switch OK and documented

* updates for Bg_F40_Switch PR

* update names

* formatting

* func_80BC46B0 → BgF40Switch_CheckAll
2022-03-09 22:08:36 -03:00
Derek Hensley d36b0d506d
Misc NON_MATCHINGS/NON_EQUIVALENTS (#696)
* Match the rest in fireObj

* Fix FireObjLightParams struct

* Fix up bomjima

* Match ObjSnowball

* 2 functions in EnGoroiwa

* Rename randMultiplier

* Minor cleanup

* More cleanup

* Boss02 Ok

* Match Boss06_Draw

* format

* bss

* Remove static from osFlash bss

* PR suggestions

* Remove LightInfoPositional

* 0x4000

* Format

* Cleanup

* Fix bombjima data

* Boss02 newline

* PR stuff

* Change func_8012CF0C to NON_EQUIVALENT

* Matched func_8012CF0C by AngheloAlf

* RSPMatrix -> Mtx

* Bubbles fix
2022-03-09 22:02:27 -03:00
engineer124 fe32df0e82
Document `Actor_DrawDamageEffects` (#645)
* Being documenting `Actor_DrawDamageEffects` and apply to actors

* More doc progress

* Small cleanup

* Document display lists

* more cleanup

* Fix Typo

* PR Review

* Shock -> Spark

* Missed one

* Missed another

* Fix dust textures

* Remove `_tex` from `light_orb_tex` (so that it matches convention)

* electric stun -> electric spark

* Fix mistake

* Fix float

* spark -> sparks where applicable

* Missed even more shocks...

* Name `drawDmgEffTimer` for consistency

* Fix BSS
2022-03-09 20:37:27 -03:00
Maide 040db7ac40
En_Mm3 (#671)
* En_Mm3

* PR

* Merge
2022-03-05 12:57:38 -03:00
Parker Burnett 4a18f3ca4d
En_shn OK (#638)
* Building on Macs

* Add Mac building documentation

* Review

* Update for new z64compress

* Review

* getting some matching done

* gettting some more matches

* actor fixer

* almost OK

* Shn OK

* fixing data and warnings

* finishing touches

* forgot to update spec

* dang comments not being formatted

* this should fix things

* fixing feedback and other fixes

* fixing things

* fixing things

* addressing PR

* format and minor fix

* actorfixer

* fixing actor

* fixing enum

* yay format

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-05 12:45:49 -03:00