Commit Graph

380 Commits

Author SHA1 Message Date
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
Derek Hensley bfe22610f7
EffectSsStone1 Ok (#730)
* EffectSsStone1 OK

* gameplay object stuff

* unk_C -> reg0

* Fix

* Reverse order of stone textures

* undef syms
2022-04-17 19:35:13 +01: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
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 f5ba6986f9
Obj_Pzlblock (#755)
* Obj_Pzlblock

* PR
2022-03-29 21:05:33 +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
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
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
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
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
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
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 5684b342b6
En_Vm (#678)
* En_Vm

* Hidden funcs >:

* PR

* PR
2022-03-24 22:55:58 -03:00
Maide 0fbbde8d7d
Demo_Syoten (#672)
* Demo_Syoten

* Fix build, use UNK_PTR

* Use Vtx

* Keyframe stuff

* PR

* BSS

* PR

* Fix fix
2022-03-24 22:41:04 -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
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
Derek Hensley 1e4411a871
General Cleanup 2 (#681)
* cleanup

* Clean up toto

* More ClockTime macro

* rename pad

* EnGo and format

* EntityLineTest booleans

* Other bgcheck tests

* Graph Allocs

* Lib_Segmented

* Fix toto comment

* Remove macro comment for EnBigpo_DrawLantern

* Format and remove sym from undefined_syms.txt

* PR suggestions

* BgIkanaRay params

* One day i'll remember

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-05 12:03:20 -03:00
EllipticEllipsis 7fcefd8d3f
Decompile and partially document some functions in z_play (#582)
* Decomp 10 functions in z_play, start documentation

* Add numbers to enums in z_en_torch2.h

* Decompile a 5 more functions (56 unattempted)

* Add more details, name some more variables

* Bit more Doxygen

* Format

* Fix arguments

* Add symbols to actorfixer.py

* Merge branch 'master' into play

* Fix z_actor

* Review

* Deduplicate CycleSceneFlags

* Fix warning

* Fix unk4

* Review
2022-03-05 11:57:28 -03:00
Anghelo Carvajal 6017869b1e
`z_player_call` OK (#693)
* Match functions

* Rename functions

* Import data and bss, and minor fixes

* Format

* Whoops

* Add some protos to z_player
2022-03-05 11:51:51 -03:00
Maide f87cabbc55
En_Butte (#683) 2022-03-05 11:27:33 -03:00
Anghelo Carvajal 77cfd399d0
`z_demo` with 4 NON_MATCHINGs (#514)
* starting

* a bunch

* and another bunch

* a bunch

* Match func_800EB1DC

* func_800EB4B4

* func_800EB6F8

* 2 more

* fix prototype of a random kankyo function

* func_800EBD60 non matching

* func_800EC678 matched?

* func_800EC6D4

* break

* func_800ECD7C

* A bunch of functions

* func_800EE200

* func_800EDF78 and func_800EE0CC

* func_800EDBE0 NON_MATCHING

* Cutscene_Init NON_MATCHING

* func_800EA324 NON_EQUIVALENT

* Fix warnings

* func_800EC924 NON_EQUIVALENT

* Cutscene_ProcessCommands NON_EQUIVALENT

* Format

* Split z_demo data and import it

* Import bss

* Match func_800EB364

* Rename Cutscene_Command_SetTime

* Improve Cutscene_ProcessCommands a bit (still not equivalent, probably)

* Improve Cutscene_ProcessCommands thanks to engineer and anon

* Cutscene_ProcessCommands NON_MATCHING

* Name some commands

* Fix

* Renames based on Engineer knowledge of Audio stuff

* More command names

* Cutscene_Command_GiveTatlToPlayer

* Some cutscene commands macros

* more command macros

* Macros for unknown commands

* Improve Cutscene_Command_Textbox a bit

* Rename stuff

* Name Terminator and Camera

* MOTIONBLUR

* Macros for textbox commands

* CS_PLAYER_ACTION_LIST

* A few macro renames

* Small cleaning

* A bit more of cleanup

* Rumble

* Entrance comments in func_800EB6F8

* Some var renames

* CS_CMD_FADESCREEN

* More clean up

* Clean functions protos

* Move CutsceneStateHandler out of z64.h

* Cutscene_DoNothing

* Cutscene_IsPlayingCs & Cutscene_GetSceneSetupIndex

* And more renames

* name some stuff in the cutscenecontext struct

* npcActionIndex->actorActionIndex

* Undo names of CS_STATE_ enum

* Name Cutscene_ActorTranslate family of functions

* small docs pass

* sfxconvert and format

* Hopefully last cleanup

* Add some missing functions to actorfixer

* Fix merge issues and remove trailing commas

* Cutscene commands fix

* Cutscene_Command_Misc improved by engineer

* Update src/code/z_demo.c

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

* Apply suggestions from code review

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

* Address review

* bss

* Match Cutscene_Command_Textbox by anon58

* Fix merge issues

* Match Cutscene_Command_Misc by @hensldm

* review

* float time macros

* fix merge issues

* format

* Fix building assets

* fix merge issues

* format

* Fix

* format

* fix merge issues

* fix

* fix

* format

* fix issues and run format

* bss

* Fix conflicts, bss and formatter

* 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>

* Update include/z64.h

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

* Update include/z64cutscene.h

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

* Update include/z64cutscene.h

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

* Update include/z64cutscene.h

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* address review and fix some stuff

* fix merge problems

* more fixes and format

* Fixes

* 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>

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Update src/code/z_demo.c

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

* Engineer suggestions

* format

* Elliptic review

* Use dec for ShrinkWindow_SetLetterboxTarget

* add a few comments

* Cutscene_Command_ChooseCreditsScenes

* Update src/code/z_demo.c

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

* format

* some cleanups and some comments

* change actorActionCmd from hex to dec in the codebase

* minor comment on textboxcmd

* ahhhh

* Update src/code/z_demo.c

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

* brackets

* minor comments

* rewording

* im dumb

* brackets

* another bracket

* Dawn of the New Day

* Update src/code/z_demo.c

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

* fixes

* Cutscene_Command_TransitionFX by Anon

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2022-03-04 19:14:52 -05:00
Maide 8b7cbb1273
En_Gk (#580)
* En_Gk

* Merge

* Merge

* TrasnformDraw

* PR

* a

* Ok

* PR
2022-02-28 03:03:03 +00:00
Maide 84e13ff2a0
Obj_Comb (#632)
* Obj_Comb

* PR
2022-02-28 02:29:56 +00:00
Maide bb6b580a6b
Mir_Ray (1 non-matching) (#634)
* Mir_Ray

* PR

* fmt
2022-02-28 02:18:40 +00:00
engineer124 fa069535d0
Camera Preparation (#644)
* Copy progress from z_camera

* cleanup functions.h

* Oops

* Revert `SUB16` and `ADD16` back to original names

* PR Suggestions

* PR Suggestions

* Fix merge with master
2022-02-20 00:33:47 +00:00
Derek Hensley 71c0120fbd
SubS Cutscenes, Flags, Objects, and Angles (#665)
* Bring cutscene code over

* Document cutscene functions

* Bring over flags code

* Document flags

* Bring Object code over

* Document object functions

* Better infinite loop comment

* Remove Effect_add correction

* Bring func_8013D5E8 code over

* Document angle helper

* ActorFixer

* Rename angle helper

* Missed gs

* Should probably test before commiting

* Better angle helper name as well as typo fix

* English is hard

* Len to num

* Fix merge

* Fix merge

* Format

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2022-02-19 23:49:36 +00:00
Maide b949669131
Door_Shutter (#623)
* Door_Shutter

* PR

* Fix macro

* PR

Co-authored-by: angie <angheloalf95@gmail.com>
2022-02-19 23:05:22 +00:00
Maide 3f15c0017a
En_Zoraegg (#630)
* En_Zoraegg

* Revert bgCheckFlags

* roomInf

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-02-19 21:36:16 +00:00
Tom Overton 8e3d28b536
En_Syateki_Wf (Shooting Gallery Wolfos) OK (#673)
* EnSyatekiWf_Init and EnSyatekiWf_Destroy OK

* func_80A201CC OK

* func_80A20284 OK

* func_80A2030C and func_80A20320 OK

* func_80A20378 OK

* func_80A200E0 OK

* func_80A203DC OK

* func_80A20670 OK

* func_80A206DC and func_80A20710 OK

* func_80A2075C OK

* func_80A2079C and func_80A20800 OK

* func_80A208F8 OK

* Import data to C

* func_80A20858 OK

* EnSyatekiWf_Update OK

* Draw functions OK

* Use generated reloc

* Delete struct padding

* Use object symbols

* Name the statics

* ANIMMODE enum

* Misc cleanup

* Format

* Respond to review

* Change do-while loops to just be while loops

* Decimal counter
2022-02-19 21:26:04 +00:00
Maide 08acf42204
En_Kendo_Js (#606)
* En_Kendo_Js

* PR

* PR

* PR
2022-02-19 20:09:27 +00:00
Derek Hensley 6e62ae4075
SubS Animations and LimbRotTables (#624)
* Bring over the matching code, rename struct vars to be consistent, and move animation structs to z64animation.h

* Clean up function prototypes

* Format and some stack var renames

* Update tutorial

* Rename animation structs

* Rename SubS functions

* Rename Actor function

* Rename arg names

* Bring over code for func_8013D9C8

* Rename and cleanup

* Some more cleanup

* Small cleanup

* Animmode enum

* Adjust actorfixer

* More uses of animmode enum, as well as fixing typo

* Change hex 0xD to 13

* typo

* Fix merge

* Format

* Fix merge

* Actorfixer

* Format
2022-02-14 02:10:56 +00:00
Derek Hensley 0625803c17
Ovl_En_Cne_01 Ok and Documented (#641)
* Decomp and document Cne01

* Document object_cne

* split enhy header from z64

* Cleanup

* Actually include new z_en_hy header

* Actor flags

* Add header to object_cne

* screen defines

* Useage of ENHY_LIMB_MAX
2022-02-14 00:30:30 +00:00
Maide 66b309218c
Bg_Dblue_Movebg (#568)
* Bg_Dblue_Movebg

* UNK_TYPE1

* PR

* Match Draw (thanks Anon58)

* Match

* data

* PR
2022-02-13 23:24:26 +00:00
Maide 5fa02d9725
En_Arrow (1 non-matching) (#551)
* En_Arrow

* Remove comment

* UNK_TYPE1

* Add thing

* Merge

* Merge

* PR

* PR

* PR
2022-02-13 23:14:13 +00:00
engineer124 2104c16362
code_8012EC80.c OK and Documented + parameter_static extraction (#534)
* Match remaining functions of code_8012EC80.c

* parameter_static extracted and OK

* Small Progress

* Documentation all over the place

* Finish Documenting

* Cleanup

* Name more textures

* Update knowledge on deku playground player name

* All textures from parameter_static known now

* Finish documenting and validating parameter_static

* More up-to-date SaveContext docs

* More docs

* More cleanup

* Sun -> Star

* Minor touchup

* More cleanup

* pictograph -> pictoBox

* Remove the "unused" part

* More accurate name: hour lines

* It's gsDPLoadTextureBlock, not gsDPSetTextureImage

* Fix parameter_static and merge issues

* More docs from new PRs and Parameter WIP

* Missed a name

* Move parameter_static to interface assets

* Clean up code_8012EC80.c data

* Fix comment

* Add comments to parameter_static

* Oops

* fix merge

* Missed a PR review suggestion

* Fix merge
2022-02-05 01:49:21 +00:00
Maide 69d7a2e585
Obj_Bean (#467)
* Obj_Bean

* Fix non-matching (thanks engineer)

* PR

* undef

* fmt

* PR

* PR

* Merge

* Merge

* PR
2022-02-05 00:27:29 +00:00
engineer124 35d8154ef0
Audio Playback OK and Mostly Documented (#556)
* Audio Playback OK

* name a temp

* cleanup functions.h
2022-01-30 18:02:44 -03:00
engineer124 bc7249960d
Rename "Quake2" -> "Distortion" (#588)
* rename `quake2` -> `distortion`

* Small touch-up

* cleanup and better spacing

* PR Feedback from OoT

* missed a small thing

* Name `billboardMtx` using better knowledge of sys_matrix functions thanks to `z_view`

* Add documentation to `SurfaceType_GetConveyorType`

* Cleanup Conveyor Type docs

* update cycle to phase
2022-01-30 17:55:42 -03:00
Maide e4010be70c
Obj_Oshihiki (#636) 2022-01-29 20:00:43 -05:00
Maide 6d52cee5fe
En_Bom (#537)
* Broken

* En_Bom

* PR

* PR

* Merge

* PR
2022-01-18 22:19:15 -05:00
Derek Hensley aa90d1ee2b
SubS Skelanime functions (#572)
* Bring code over

* Change ActorDraw typedefs from actor to thisx

* Rename functions

* Format

* Rename and clean up limb draws

* Some more limb draw cleanup

* Some more cleanup

* Function comments

* Last bit of cleanup

* update tutorial

* More tutorial and format

* Remove extra newlines form actorfixer

* Missed one

* Remove some unnecessary casts

* Fix SkelAnime transform functions in functions.h

* Remove bug comments, and add note

* Remove some more unneeded casts and rename one variable

* format

* Fix merge

* Format
2022-01-16 20:14:34 +00:00
engineer124 9e6a6eee4c
Audio_Effects OK and Documented (#549)
* Audio_Effects OK

* Remove duplicate

* PR Suggestion

* Small cleanup

* Small Touchup
2022-01-16 18:24:58 +00:00
EllipticEllipsis 924fa9aadf
EnMag OK and documented (#547)
* Name textures in object_mag

* Corrections

* tabs -> spaces

* OK, data imported

* Remove obsolete comment

* Start documentation

* Defines for most texture sizes

* Name most static variables, add state enum

* Macros, name all the statics

* Couple of minor tweaks to other files

* Name some more effect stuff

* Fix kanfont data

* Name everything else, move macros

* Format

* Review
2022-01-16 17:55:03 +00:00
Anghelo Carvajal c44e26a143
`__osMalloc.c` OK (#395)
* __osRealloc

* match __osCheckArena

* cleanup

* Import bss, unreferenced strings and cleanup

* format

* Reviews

* Move convert.h to ultra64/

* Make the os_malloc.h header

* potato

* renames and fixes

* format

* small doc pass
}

* format

* minor changes

* Introduce system_malloc.h

* Docs pass

* fix

* format

* stuff

* Apply suggestions from code review

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

* review

* format

* remove repeated sentence

* Apply suggestions from code review

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

* include headers

* review

* Rename __osMallocAddHeap

* remove @brief

* Update src/boot_O2/__osMalloc.c

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

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-01-11 23:25:14 +00:00
engineer124 133e02a8a7
z_sound_source OK (#353)
* z_sound_source OK

* Fix Pos

* Lib_PlaySfxByPos

* Change function names

* format

* Update names to match OoT

* cleanup from the merge

* Fix name
2022-01-11 00:27:36 +00:00
Anghelo Carvajal 6069a1585f
`z_actor` with some documentation, with 1 NON_EQUIVALENTs (#401)
* Match Player_GetHeight

* Another bunch

* Fix merge conflict

* rename Gfx_DrawDListXlu

* add WEEROR

* Actor_Spawn

* almost Actor_SpawnTransitionActors  and Actor_Delete

* A bunch of small actors

* More renames

* format

* Some Player renames

* a few more

* import data

* run formatter

* func_800B7170

* whoops

* Fix merge issues

* Whoops 2

* func_800B83BC and func_800B83F8

* Actor_IsActorFacingPlayerAndWithinRange

* add some prototypes

* match Actor_UpdateBgCheckInfo

* func_800B7678

* mark Actor_SpawnAsChildAndCutscene as non_matching

* Actor_Draw

* Update is chaotic

* 2 new matches

* func_800BC8B8

* Another bunch

* function renames

* run formatter

* cleanup

* remove unnecesary casts

* add missing sfx

* Fix renames

* fix merge

* func_800BF7CC

* small bunch

* another bunch

* func_800BE184 non_matching

* two more

* split z_cheap_proc

* Another bunch

* another bunch

* a few and a non matching

* yeee

* a

* Actor_DrawAll non_equivalent

* Actor_RecordUndrawnActor

* i don't know what to put in this commit message

* func_800B4B50 non matching

* func_800B42F8 non matching

* func_800B5040

* func_800B5814 non_equiv

* func_800B6584

* func_800B6608

* func_800B6680

* func_800B7E04

* func_800B8118

* func_800b9170

* ,

* func_800BC4EC

* func_800BA6FC

* func_800BA798

* func_800BA8B8

* Actor_LoadOverlay

* small cleanup

* func_800BB2D0

* meh

* func_800BBAC0

* func_800BC270

* func_800B5208 non matching

* Fix warnings

* meh

* rename some ActorShadow_ functions

* fairy

* Flags_

* fix warnings

* format

* Actor_PickUp and family

* func_800B8E58

* match Actor_RemoveFromCategory

* another bit of docs

* Match func_800B86C8

* And another bit

* rename Player_GetRunSpeedLimit

* func_800B9E84

* func_800BE63C

* func_800BB8EC

* match func_800B5814

* match func_800B9334

* cleanup

* fix conflicts: first pass

* another fix

* actorfixer fix

* fix conflicts

* func_800BE680 non_equivalent

* Improve func_800BE680 a bit

* func_800BE680 equivalent (?)

* func_800BE680 equivalent

* Actor_UpdateActor equivalent

* format

* use some  ExchangeItemID enum values

* Some more cleaning

* more cleanup

* More name stealing from OoT

* match func_800B82EC

* match func_800B9D1C and a bit of cleanup

* Add ACTOR_FLAGS placeholders

* Renames and match func_800BE184

* last pass of name stealing

* format

* fix conflicts

* more cleanup

* more cleanup

* cleanup and OVERLAY_RELOCATION_OFFSET macro

* Remove prototypes of obviously internal-only functions,
update variable names,
forward declare where necessary,
remove all `param_\d`s

* remove newlines

* minor rename

* Use ACTOR_FLAGS in z_actor

* Match func_800BE3D0

* Rename movement functions

* Document Actor_CalcOffsetOrientedToDrawRotation

* velX -> horizontalSpeed

* A bit of documentation for actor movement functions

* format

* Fix merge issues

* format

* Format

* Fix renames

* fix warnings

* fix conflicts

* review :D

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

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

* Fix

* format

* Actor_SpawnSetupActors

* engineer review

* Update src/code/z_actor.c

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

* A bunch of Engineer's reviews

* more Engineer's review

* a

* whoops

* run actorfixer

* c'mon

* 😮‍💨

* whoops

* warning

* More engineer's review

* run format

* I'm dumb

* a

* match func_800BE680

* Match Actor_DrawZTarget

* Match Actor_SpawnAsChildAndCutscene, fix non-equivalent in Actor_UpdateActor

* Fix merge issue

* format

* update actor

* Steal a bit of @Thar0 documentation from OoT's z_message

* Run actorfixer

* Fix renames

* Match func_800B4B50 thanks to @hensldm

* Improve ActorShadow_DrawFeet thanks to @hensldm

* whoops

* Actor_PlaySfxAtProjectedPos

* Actor_UpdateActor matched by @hensldm

* Match func_800BA2FC by @hensldm

* Match Actor_SpawnTransitionActors by @hensldm

* Match func_800BB604 by @hensldm

* Match Actor_DrawAll by @hensldm

* ActorShadow_DrawFeet by @hensldm

* Actor_UpdateAll by @hensldm

* Match func_800BCCDC by @engineer124

* Small Actor_PlaySfxAtPos by @engineer124

* ACTOR_FLAGS_ALL and a bit of cleanup

* Add invisible comment

* Small docs pass

* Fix merge

* Engineer's review

* format lol

* Actor_DrawDoorLock docs

* Actor_SpawnShieldParticlesMetal

* fix merge issues

* sActorFaultClient

* fix

* commit message

* Run actorfixer.py && format.sh

* Fix warnings

* fixes

* format

* bss

* Update include/functions.h

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

* Address review

* Fix merge issues, format and such

* fix merge issues

* Add ACTORCAT_MAX

* actorList -> actorLists

* Fix merge issues

* format

* Enable WERROR on jenkinsfile

* Fix merge

* Use object symbols

* address review

* format

* review

* fix merge issues

* fix

* VRAM_PTR_SIZE, small cleanup and format

* review

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2022-01-10 12:04:28 -05:00
Derek Hensley 7611d833d9
SubS Actor Getters OK (#475)
* Bring over matching actor getters

* Add arg names

* Rename functions

* Adjust rename_sym script to update sizes csvs

* Fix wrong function prototype

* whitespace

* Rename functions

* Fix actorfixer

* Format

* Add function comments and file header

* Fix merge

* format

* Fix merge

* format

* Move D_0407D590 down

* Fix merge

* Steal idea from z_actor PR to return  directly

* Swap function name order

* Fix merge
2022-01-04 07:28:25 +00:00
Derek Hensley 8cd978585e
EnItem00 OK (#519)
* Match three nonmatchings

* Remove duplicate parens

* turn u32 into s32

* fix thiefbird

* Remove some unnessesary casts

* Fix merge
2022-01-04 05:44:57 +00:00
Maide f66a9f8d0e
Object_Kankyo (1 non-matching) (#445)
* Object_Kankyo

* Removing permuter

* PR

* Re-add description

* PR
2022-01-04 04:24:35 +00:00
Maide 429a5ee9ff
En_St (#443)
* En_St

* Warning

* PR

* undef

* PR
2022-01-04 04:09:32 +00:00
Maide 934c562471
En_Wiz_Fire (#406)
* En_Wiz_Fire

* Remove padding

* PR

* PR

* Object

* Undef

* PR
2022-01-04 03:51:11 +00:00
Maide 0b45e0f87a
En_Go (3 non-matching) (#405)
* En_Go

* PR

* PR

* Object

* Undef

* PR
2022-01-04 03:45:36 +00:00
kyleburnette 3af87ca611
pfsreadwrite file OK, contpfs OK and data/bss migrated, pfsgetstatus OK (#385)
* pfsreadwrite file OK, contpfs OK and data/bss migrated, pfsgetstatus OK

* Made tharo's suggestions

* Update pfsgetstatus.c

* Made suggested changes (other than uintptr_t)
2022-01-04 03:29:11 +00:00
Maide 618b25f41d
En_Fishing (3 non-matching) (#378)
* En_Fishing

* PR

* PR

* Object

* Undef

* PR

* format
2022-01-03 18:48:37 -05:00
Tom Overton 44ccdbe0d5
En_Talk_Gibud (Gibdos in the well) OK and somewhat documented (#486)
* Good start

* More progress

* More progress, need to try importing data now

* Import data to C

* Match a tricky item function

* Matched another item function

* Improve definition of EnTalkGibudUnkStruct

* func_80AFFD3C OK

* Draw functions done

* EnTalkGibud_Init OK

* EnTalkGibud OK

* Document item and switch flag stuff

* Name all static variables

* Enum for animations

* Document type

* Document limb stuff

* Tons of documentation

* Document effect stuff

* Document most unknown struct vars

* Name most functions

* Name final function + document text IDs

* Organize forward declarations

* Name stack variables

* Document damage effects

* Document limbs

* One final pass

* Respond to Anghelo's review

* Respond to Anghelo's second review

* Add space to force Jenkins to rerun (testing PR dashboard, please ignore)

* Removing previously added space

* Fix limb enum to add LIMB_NONE

* Run ./format.sh, whoops

* Respond to hensldm review + small cleanup

* Respond to engineer's review

* Fix item enum

* This is a legacy PR, so using autogenned object symbols

* Fix merge conflict

* Move Talk_Gibud specific enums to .c
2021-12-28 02:15:32 +00:00
Tom Overton 527c54b66e
Obj_Tokeidai (Clock Tower) OK and mostly documented (#442)
* Migrate data to C

* ObjTokeidai_Init OK

* ObjTokeidai_Destroy OK

* func_80AB2BBC OK

* func_80AB3BB0 OK

* func_80AB29F8 OK

* func_80AB27B4 OK

* func_80AB2834 OK

* func_80AB2790 OK

* func_80AB28C8 OK

* ObjTokeidai_Update OK

* func_80AB4040 OK

* func_80AB3010 OK

* func_80AB3CCC OK

* func_80AB3240 OK

* func_80AB3C50 OK

* func_80AB4080 OK

* func_80AB4160 OK

* func_80AB319C OK

* func_80AB3BE8 OK

* func_80AB3BD8 OK

* func_80AB3B34 OK

* func_80AB3A7C OK

* func_80AB3ED0 OK

* func_80AB39BC OK

* func_80AB38B0 OK

* func_80AB3880 OK

* func_80AB363C OK

* func_80AB36C4 OK

* func_80AB3808 OK

* func_80AB365C OK

* func_80AB3598 OK

* func_80AB3544 OK

* func_80AB34CC OK

* func_80AB3370 OK

* func_80AB32F0 OK

* ObjTokeidai_Draw OK

* func_80AB4894 OK

* func_80AB4664 OK

* func_80AB4394 OK

* Use compiled reloc

* Initial documentation pass

* Little more documentation

* Last bit of first pass documentation

* Finish documentation

* Respond to review feedback

* Respond to Anghelo's feedback

* Incorporate new enum

* Respond to engineer's feedback

* Respond to engineer's feedback

* Update comments because the things I thought were unused ARE actually used

* Switch to using "Open" instead of "Transform"

* Run ./format.sh

* Respond to engineer + hensldm by removing some macros

* Fix func_801A3F54 argument

* Fix func_801A3F54 argument

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

* This is a legacy PR, so using autogenned object symbols

* Move enum to .c

* Revert "Move enum to .c"

This reverts commit de13c50f0a.

* Move tokeidai-specific defines to .c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-12-28 02:10:15 +00:00
Maide 7cb71922e3
En_Geg (#436)
* En_Geg

* Format comments

* PR

* Object

* undef

* PR
2021-12-28 01:44:27 +00:00
EllipticEllipsis 96eff2a4fd
Building on Macs (#513)
* Building on Macs

* Add Mac building documentation

* Review

* Update for new z64compress

* Review

* git subrepo pull --force tools/ZAPD

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

* Fix some obvious warnings

* Rewrite docs

* -;

* git subrepo pull --force tools/ZAPD

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

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-12-28 01:07:41 +00:00
Lucas Shaw 5455cbc0c8
z_kaleido_manager and z_kaleido_scope_call OK (#489)
* migrated data and bss for z_kaleido_manager, renamed ovl_Player_Actor to ovl_player_actor to make it work with the data

* z_kaleido_manager OK

* add to functions.h variables.h and variables.txt

* init

* rename parameters in func_80163700

* rename func_80163700 to KaleidoManager_FaultAddrConvFunc

* change u32 casts to uintptr_t casts in z_kaleido_manager. (u8 *) casts must stay, they are the only casts that match

* ran format, uintptr_t

* made suggested changes
2021-12-27 03:59:50 +00:00
engineer124 27903c6286
code_80194710 OK (Audio libultra_code_O2) (#474)
* code_80194710.c OK

* Add new line after variable declaration

* format

* Function declarations

* Name changes to match OoT

* Rename file

* s32 -> size_t
2021-12-27 03:51:37 +00:00
EllipticEllipsis 76c39482bc
contchannelreset OK (#428)
* contchannelreset OK

* Add to functions.h

* Rename argument
2021-12-27 03:42:31 +00:00
Roman971 6c2f521373
Decompile and clean up some effect files (#342)
* Decompile various effect files and cleanup z_effect.c

* Decompile z_eff_tire_mark.c and cleanup structs

* Small cleanups

* Apply most review suggestions

* Apply more review suggestions

* Change eff_shield_particle vertices to be extracted as an asset

* Add relevant effect functions to actorfixer.py
2021-12-27 02:51:16 +00:00
Maide 6fba9aa388
En_Fz (#528)
* En_Fz

* UNK_TYPE1

* AC WHY

* gameplay_keep

* a
2021-12-27 02:42:56 +00:00
Maide ae2ba19d7b
En_Aob_01 (#440)
* En_Aob_01

* PR

* Object

* Fix weird capitalisation

* undef
2021-12-27 02:01:37 +00:00
Maide 2df8e5d433
En_Elf (#371)
* En_Elf

* En_Elf

* PR

* PR

* Format
2021-12-27 01:47:56 +00:00
Maide ba4f676f4e
Obj_Iceblock (#367)
* Obj_Iceblock

* PR

* PR

* Object

* Undef
2021-12-27 01:40:25 +00:00
Maide cee404f6b2
Door_Warp1 (2 non-matching) (#347)
* Door_Warp1

* Rebase

* Rebase

* PR

* Object

* Format

* Undef

* def more

* Whoops
2021-12-27 01:25:39 +00:00
Maide a3478c4056
En_Tru (1 non-matching) (#325)
* En_Tru

* Fixups

* PR

* The meme

* I rebased by accident sorry

* Add object memes

* Type
2021-12-22 16:25:00 +00:00
Maide aad8f64c65
En_Gs (#431)
* En_Gs

* PR

* PR

* PR

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

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

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-12-21 12:57:41 -03:00
engineer124 51ee1c2c70
Name coordinate transformation matrix similar to OoT (#499)
* name coordiante transformation names similar to OoT

* update actorfixer
2021-12-19 20:32:41 +00:00
Derek Hensley a7cece0fca
Code_800f07c0 OK with some documentation (#373)
* Matched func_800F07C0

* Matched func_800F0888

* Matched func_800F0944

* Matched func_800F09B4

* Matched func_800F0A94

* Matched func_800F0E94

* Matched func_800F0EEC

* Matched func_800F0F28

* Matched func_800F0FF0

* Matched func_800F10AC

* Matched func_800F112C

* Matched func_800F0DD4

* Matched func_800F0CE4

* Matched func_800F0A20

* Matched func_800F0BB4

* Fix functions.h

* Migrated data and add some doc comments, having BSS issues

* BSS fix

* Fix merge conflict

* Document

* Run Formatter

* Actually save functions.h

* Rename UnusedNPC to EnHy

* Change some rets and run format

* PR review

* Fix merge conflict

* Minor touchups

* Fix renamed func

* Change char to UNK_TYPE1

* Add header

* Rename two functions

* Fix capital X's in undefined_syms

* Convert char to UNK_TYPE1 in EnDoor

* Change huge ternary into if else for readability

* Fix up EnIn

* Better whitespace

* Format

* Revert UNK_TYPE1s in EnDoor

* Rename file

* Missed rename in undefined_syms
2021-12-19 20:14:36 +00:00
EllipticEllipsis 1274b81c5e
sys_ucode OK (#432)
* sys_ucode OK

* Update file split of data

* Format

* Name symbols, sizes -> u32

* Correct undefined_syms

* Format
2021-12-19 20:08:31 +00:00
Derek Hensley 98ba231fb0
pause (Frame Advance) OK (#455)
* Matched

* Rename and format

* typo

* Missed renames

* Revert "Missed renames"

This reverts commit 64d9f70464.

* Revert "typo"

This reverts commit 81696364d3.

* Revert "Rename and format"

This reverts commit aec7d245e8.

* Rename functions

* Add header explaining frame advance

* Header

* Format
2021-12-19 19:54:52 +00:00
Lucas Shaw ff231e093a
z_vr_box_draw OK (#481)
* z_vr_box_draw OK

* ok

* Removed z_vr_box_draw.data.s, its actually z_sram_NES.data.s

* Added enum SkyboxId
2021-12-07 04:36:02 +00:00
Maide 08cf506be7
Dm_Stk (#350)
* Dm_Stk

* PR
2021-12-06 21:45:28 +00:00
Derek Hensley b5da6b9bf9
Fault and Fault_Drawer (3 MATCHING and 1 NON_MATCHING) (#434)
* Matched last functions except Fault_FindNextStackCall

* Bss in drawer and cleanup

* Update define and format

* PR comments

* Formating PR suggestions

* Small format

* Fault_FindNextStackCall

* Change grays to dark gray and light gray
2021-12-06 21:03:21 +00:00
Derek Hensley e177e99933
Elf_Message OK (#457)
* Matched

* Rename function
2021-12-06 14:42:17 -05:00
Rozelette 56d76d6458
En_Cow 🐮 (#493)
* OK

* Address feedback

* Adjust comparison
2021-12-01 12:32:15 -05:00
mzxrules 6b493d3f9d
z_bgcheck.c (#357)
* first few functions

* two more almost matching functions

* Rebase to NBS, get it to compile

* BgCheck_RaycastFloorStaticList OK, fix-up some functions

* BgCheck_SphVsStaticWall OK! and a few others

* more z_bgcheck NON_MATCHINGS

* OK more functions, reorganize external reference #defines

* More functions OK, more struct fixes

* More OKs

* Decomp all the way to the end of bgcheck

* All functions attempted

* Rename functions

* formatting, data migration

* Give names to unk structs, rename some structs, fix some non-equivalent functions

* WaterBox_GetSurfaceImpl OK

* BgCheck_ResetPolyCheckTbl OK, improve WaterBox_GetSurface2 codegen, eliminate warnings and clean up source.

* BcCheck3_BgActorInit ->BgCheck3_BgActorInit, fix warnings

* pr change requests

* fix crc maybe

* implement more changes

* implement alf's changes
2021-11-23 13:29:18 -03:00
Maide 837eb1c806
En_Tk (#338)
* En_Tk

* PR

* Warnings

Co-authored-by: root <root@Careface.localdomain>
2021-11-20 12:10:37 -03:00
engineer124 ea17d924e4
Audio BGM Macros (#460)
* Introduce bgms

* Fill in bgm enums

* Rename bgm to clearer names

* Fix spacing

* Fix "No_Music" define

* remove comment

* Improve bgm names, found another seqId function

* Another seqId function

* Another name change

* Woods of Mystery -> Sarias Song

* add saria's song bgm to pierre

* Another bgm function found!

* Add bgm's to `gSaveContext.seqIndex`
2021-11-20 11:01:37 -03:00
Anghelo Carvajal 2854294009
`z_jpeg`, `jpegutils` and `jpegdecoder` OK (#322)
* this is a disaster

* two more

* func_800F470C

* split and rename jpegutils and jpegdecoder

* match jpegutils

* match jpegdecoder.c

* audio_rodata

* data split

* Split rsp

* Steal documentation from OoT

* cleanup

* Format

* remove removed members in JpegContext

* Update include/z64.h

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

* Update src/code/jpegdecoder.c

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

* Update include/functions.h

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Update src/code/jpegutils.c

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

* review renames

* true

* Some type fixes

* Update include/z64.h

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

* add comment

* Update src/code/z_jpeg.c

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

* format

* bss fix

* decr

* format

* z64jpeg.h

* Add stdbool

* Rename audio_init_params

* whoops

* whoops++

* whoops#

* remove extra dumb variables in variables.txt

* fix

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-11-19 17:34:45 -03:00
Derek Hensley 9b51336f09
Sub_S Prototypes and approriate header stuff (#408)
* Add sub_s prototypes

* Rename limbDrawTable to jointTable

* Rename UnkActorDraws

* Fix warnings

* Fix warnings
2021-11-19 12:45:26 -03:00
Isghj 89b9d90826
En_Kakasi (Scarecrow) (#279)
* EnKakasi: rebase progress into one commit

* EnKakasi: fixes to get compiling on master, still doesn't match

* EnKakasi: is this even progress?

* EnKakasi: docs and cleaning

* EnKaksi: damn it, that master merge really messed up more than I thought, after clean build something really weird is going on and now I REALLY need firstdiff

* EnKakasi: Back to building, NOT OK

* fixed a code

* only rodata left to fix

* EnKakasi: functions got removed in included functions

* EnKakasi: thanks to fig mentioning there were missing cases, OK

* EnKakasi: (OK) docs and cleaning

* EnKakasi: Init now matches

* EnKakasi: cleaning and docs

* EnKakasi: more cleaning and docs

* EnKakasi: forgot function declarations

* EnKakasi: spec

* EnKakasi: animation array symbols added

* EnKakasi: formater pass

* EnKakasi: type warning fix

* EnKakasi: little descriptor

* EnKakasi: OK thanks to AngheloAlf

* Apply suggestions from code review

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

* Update src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c

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

* Apply suggestions from code review

Splitting this into pieces to not have a huge pile of bugs

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

* EnKakasi: wrong type of inverse flag

* Apply suggestions from code review

Batch 2

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

* EnKakasi: RIP Anime

* Apply suggestions from code review

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

* EnKakasi: Anim enum update

* EnKakasi: Removed text documentation

* EnKakas: return of THIS

* Update src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c

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

* EnKakasi: mystery solved but not understood

* Apply suggestions from code review

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

* EnKakasi: rename EnKakasi_CheckAnimateSFX to EnKakasi_CheckAnimationSfx (no real reason to shorten Animation to Animate, and SFX is not initialism, its a shorten)

* EnKakasi: minor change to touch jenkins

* EnKakasi: is it loise-uni?

* EnKakasi: fixed skelanime changes

* EnKakasi: formater pass

* EnKakasi: requested changes

* Update src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h

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

* EnKakasi: removed un needed pad

* EnKakasi: removed redundant documentation comment

Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2021-11-18 14:33:23 -03:00
EllipticEllipsis 7134e81898
sys_initial_check OK, documented, error message files debinarised (#437)
* OK

* Symbols and other documentation

* Remove externs

* spec

* More documentation, decompile the texture files,
some uintptr_t and size_t

* Top-of-file comment

* Move symbols back into right order

* Use some defines

* Missed an osTvType and a size_t

* Add missing header to os.h

* Use segment symbol macros

* Remove duplicate header

* Address review suggestions
2021-11-15 19:57:16 -03:00
Kenix3 0c3bba3ff6
Moves func_800CB000 to z_bg_item, decompiles func_800CB000, and documents z_bg_item and a few DynaPolyActor struct members. (#407)
* Moves func_800CB000 to z_bg_item, decompiles func_800CB000, and documents z_bg_item and a few DynaPolyActor struct members.

* Adding usage of dynapoly state flag defines.

* Formats z_bg_item

* Update z_bg_item.c

* Update z_bg_collect.c

* Update z_bg_item.c

* Update z_bg_item.c

* Renames z_bg_item system to DynaPolyActor

* Format
2021-11-14 19:06:34 -03:00
Maide 602f348928
En_Pm (#309)
* En_Pm

* Format

* PR

* a

* a

* Finally fixed?

* PR

* Fix enum
2021-11-11 22:41:59 -03:00
EllipticEllipsis 285381e662
vimgr OK (#421)
* vimgr OK

* spec

* OSIoMesg, add OS_MESG defines, other review

* Review
2021-11-11 15:30:31 -03:00
EllipticEllipsis b245740020
CRC files OK and documented (#409)
* crc.c OK and documented

* chmod calc_bss.sh and add base dir to includes

* Port voicecrc work, add documentation

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

* Add full stop

* Review

* Format

* Add some more `!= 0`s

* size_t

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-11-11 15:03:05 -03:00