Commit Graph

163 Commits

Author SHA1 Message Date
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
Tom Overton 4543b5ade6
Document object_obj_tokeidai and improve documentation on ovl_Obj_Tokeidai (#569)
* Document object_obj_tokeidai XML

* Change "outer ring" to "minute ring" to better describe what it is

* Rename "sun and moon disk" to "sun and moon panel"

* Preserve ordering

* Standardize on "staircase to rooftop"

* Standardize on calling it "Exterior Gear" to contrast with all the interior stuff

* Lots more documentation

* Make it more obvious that the macros refer to clock time, not regular time

* More documentation and spacing

* Better document counterweight draw

* Respond to Anghelo's and engineer's reviews

* Split tokeidai into separate files

* Revert "Split tokeidai into separate files"

This reverts commit eed1fe5ff6.
2022-01-30 17:41:21 -03:00
Tom Overton 0e6662aafd
Document objects used with En_Fall (fall, fall2, lodmoon, moonston) (#558)
* Document lodmoon

* Document moonston

* Document the open-mouth moon part of fall2

* Document object_fall

* Move flags to .c

* palette -> tlut

* File header comment

* OPEN_DISPS/CLOSE_DISPS spacing

* Lots more spacing

* Add spaces after breaks

* Better describe the subtypes

* More fixes

* Be a little more specific in fireball comments

* Respond to Elliptic's second review

* I need to stop forgetting to run ./format.sh

* Single line comment styling

* Preserve ordering
2022-01-30 17:19:41 -03:00
Maide 5eb1b417de
En_Hint_Skb (#554)
* En_Hint_Skb

* Merge

* Actorfixer fail

* Merge

* PR
2022-01-30 17:13:46 -03:00
Maide 06a14e73ea
En_Scopenuts (#560)
* En_Scopenuts

* Merge

* PR

* Fix

* PR
2022-01-30 17:00:19 -03:00
LtPeriwinkle af26d4edac
EnBigokuta OK and documented + object_bigokuta documented (#563)
* EnBigokuta like half matched

* match all but 2 functions

* match all the functions

* import data

* name object stuff

* use new object symbols, do some documenting

* fix name of headUndersideTex

* name some struct members

* finish documenting

* Address comments

spacing, unkFunc comments, temp names, remove parens, reorder pads,
data formatting, limb enum

* address comments

* move empty line

* change the ARRAY_COUNT
2022-01-30 16:37:39 -03:00
Maide e4010be70c
Obj_Oshihiki (#636) 2022-01-29 20:00:43 -05:00
Maide c840e04c27
En_Trt2 (#448)
* Trt2

* Whoops

* PR

* PR

* PR

* Merge

* Merge

* Merge

* bgcheck

* I got trolled >:
2022-01-29 18:45:32 -05:00
Lucas Shaw 850823c2ee
ovl_Obj_Kzsaku OK (#506)
* ovl_Obj_Kzsaku OK

* add packing macro

* made suggested changes

* switch pad order

* made some suggested changes. still don't know completely about naming

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-01-23 09:40:47 -03: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
Maide b47941968d
En_Ig (#533)
* En_Ig

* UNK_TYPE1

* Remove syms

* PR

* PR

* Merge

* Merge
2022-01-16 17:46:08 +00:00
Parker Burnett 7aa3766d67
En_hgOK (#394)
* en_hgo OK

* Formatting changed somehow?...hopefully this fixes

* who would win, Cammoguy or one letter?

* format

* addressing review comments

* fixing PR comments

* fixing and merging master

* forgot to format

* fixes warnings?

* minor documentation...don't have tools to do more

* Fixing things, hopefully OK

* formatting...

* clean-up undefined syms
2022-01-16 09:37:21 -05: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
Tom Overton 9c682e5e52
Document Deku Flower objects and other Obj_Etcetera-related cleanup (#544)
* Document Deku Flower objects

* Fix warnings, whoops

* Respond to Elliptic's review

* Better formatting

* Small typo fix
2022-01-04 06:57:45 +00:00
Maide d90a15ba6e
En_Kame (#536)
* En_Kame

* PR
2022-01-04 06:25:29 +00:00
Maide bf6a4c04be
En_Ssh (#532)
* En_Ssh

* ptrs

* PR
2022-01-04 06:11:59 +00:00
Maide 897e68fbae
Boss_04 (#529)
* Boss_04

* What even is spelling anyway

* PR

* PR
2022-01-04 06:02:29 +00:00
retro de61e04312
EnMm2 OK (#492)
* all matching except draw

* all matching

* done except importing data

* data extracted

* added xml for asset extraction

* clang format

* remove global_asm macros

* bit of documentation

* format

* use THIS macro

* remove unnecessary &

* space between vars and code

* feedback

* use OPEN_DISPS, CLOSE_DISPS, and POLY_OPA_DISP++ macros

* remove comment

* use matrix macros

* change comment format

* change comment format

* rename assets in xml

* fix indent
2022-01-04 04:56:35 +00:00
kyleburnette 99761a9c0d
EnColMan OK (#479)
* EnColMan OK

* Fix description at top of file

* Made suggested changes

* Make suggested changes

* Format

* Include gameplay_keep and use symbols
2022-01-04 04:51:03 +00:00
Maide 9a0079de8a
En_Gb2 (#453)
* En_Gb2

* Negs

* PR

* Update src/overlays/actors/ovl_En_Gb2/z_en_gb2.c

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

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-01-04 04:35:21 +00:00
Maide 22a759a923
En_Peehat (#444)
* En_Peehat

* Fix

* Revert m2ctx

* PR

* Warning

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

* Warning

* PR

* undef

* PR
2022-01-04 04:09:32 +00:00
Maide 4ee7dc1da6
En_Bomjima (1 non-equiv) (#433)
* En_Bomjima

* Damn caps

* PR

* PR

* undef

* PR
2022-01-04 03:57:40 +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
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
Tom Overton 70419d6044
En_Fall (the moon, Moon's Tear, and effects) OK and mostly documented (#476)
* EnFall_Init OK

* EnFall_Destroy OK

* EnFall_Update OK

* func_80A6C3AC and func_80A6C3FC OK

* func_80A6BF90 OK

* func_80A6CA9C OK

* func_80A6CD38 OK

* func_80A6CF60 OK

* func_80A6C9A8 OK

* Import data into C

* func_80A6CB74 OK

* func_80A6CD74 OK

* func_80A6CF70 OK

* func_80A6CECC OK

* func_80A6D698 OK

* func_80A6D220 OK

* func_80A6D100 OK

* func_80A6D75C OK

* func_80A6D88C OK

* func_80A6D98C OK

* func_80A6DC20 OK

* func_80A6DA7C OK

* func_80A6DC40 OK

* func_80A6DD3C OK

* func_80A6E214 OK

* func_80A6E37C OK

* func_80A6C7C0 OK

* func_80A6D444 OK

* func_80A6C1DC OK

* func_80A6D504 OK

* func_80A6E07C OK

* Move all statics to in-function

* Migrate bss to C and use compiled reloc

* Clean up UnkFallStruct

* Initial documentation pass

* Some more function names

* Name some more unknowns

* Name yet more unknowns

* Name all struct variables and static data

* Do one last documentation pass

* Respond to engineer's style review

* Respond to hensldm's review

* This is a legacy PR, so using autogenned object symbols
2021-12-28 01:26:06 +00:00
engineer124 f19571dfcd
Bigslime OK and Documented (#361)
* git subrepo pull tools/asm-differ --force

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

* git subrepo pull tools/graphovl --force

subrepo:
  subdir:   "tools/graphovl"
  merged:   "f5fe93d7"
upstream:
  origin:   "https://github.com/AngheloAlf/graphovl.git"
  branch:   "master"
  commit:   "f5fe93d7"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/ZAPD --force

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

* Bring Bigslime over from old branch

* Format

* Improve docs

* format

* More cleanup

* Fix Zero Vectors Name

* Improve docs

* Spelling/Grammar

* Small typo

* Extra space

* Fix zapd merge conflict

* tab

* Fix remaining names

* format

* Better documentation

* format

* fix

* Add names to identity matrices

* Minor Cleanup

* easier to read comments

* Another touch-up

* Missed a spot

* one more...

* typo

* Another typo

* Fix merge master, fix EnBigslime_ApplyDamageEffectBigslime

* PR Feedback

* Fix variable

* Add in gZeroVec3f in new prs

* Fix gZeroVec3f

* gZeroVec3f

* PR Feedback, move lots of static data inside functions

* Use z_actor decomp of `func_800BE680` for better macro name

* Naming gone wrong, but fixed now

* Fix dList

* Add an extra line of docs about shadows for a function

* dList -> shadowDList

* Next round of PR feedback

* Document object file, still need to double check some

* Small cleanup

* Improve and fix many docs, unname unknown material texture

* format

* Oops

* Clean up blobs from object file

* Aha! I finally get what's going on

* Remove Bigslime undefined_syms

* Remove more undefined symbols

Co-authored-by: Angie <angheloalf95@gmail.com>
2021-12-27 04:24:45 +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
Isghj af7525e2d3
[Object] Bigpo object documentation (+ some gameplay_keep) (#525)
* Bigpo: object documentation starts and already issues

* Bigpo: almost all named

* Bigpo: done with object except ubused blobs

* Bigpo: added flame docs to gameplay_keep and minor cleaning, format pass

* Bigpo: forgot to remove sym and replace everywhere, with formater pass

* Bigpo: forgot about actorfixer

* Bigpo: disasm cant find asset xml values, have to put this undefined sym back for now

* Bigpo: warnings

* Bigpo: remove extern for gameplay_keep display list reference from aqua

* EnBigpo: suggested fixes to header calls and function name

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-12-27 03:08:36 +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 5b7fb5bfde
En_Bomjimb (#461)
* En_Bomjimb

* PR

* PR
2021-12-27 02:14:19 +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 ddb3405219
En_Rail_Skb (#418)
* En_Rail_Skb

* PR

* PR

* Object

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

* En_Elf

* PR

* PR

* Format
2021-12-27 01:47:56 +00:00
Maide d3e8ea9e5a
En_Akindonuts (#349)
* En_Akindonuts

* Enums

* Rebase

* PR

* PR

* Object

* Uncomment blob

* Undef
2021-12-27 01:32:45 +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
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
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
Tom Overton 038eb997d0
En_Tanron3 (Gyorg's fishes) OK and somewhat documented (#376)
* Import data to C

* EnTanron3_Init OK

* EnTanron3_Destroy OK

* func_80BB897C OK

* func_80BB91D4 OK

* func_80BB9288 OK

* EnTanron3_Draw OK

* func_80BB95FC OK

* EnTanron3_Update OK

* func_80BB9308 OK

* func_80BB87D4 OK

* func_80BB85A0 OK

* func_80BB8A48 OK

* Update spec with compiled reloc

* Name most of the functions

* Name a few more things

* Merge animation system changes

* Name remaining unnamed variables

* Finish documentation

* Use modulo for fogTimer

* Move enum/structs to .h

* boss03Parent -> sGyorg

* D_80BB9720 -> sZeroVec

* Move initialization of effectPtr up

* Use 2 * M_PI

* Use MTXMODE_NEW

* 65536.0f -> 0x10000

* timer += 1 -> timer++

* Timer cleanup

* Remove unneccesary parentheses

* When performing bitwise operations on timer, use hex

* Lowercase "fish" in the comment at the top

* Respond to jpburnett's feedback

* Respond to Elliptic and Kenix's reviews

* Undo renaming the Gyorg var, but keep the comment

* Add a little bit more documentation

* Variable renames

* Remove a comment that no longer applies

* Document some swimming behavior

* PICK_DIRECTION -> PICK_NEW_DEVIATION

* Minor comment tweak

* Respond to Elliptic's review

* Remove timer inconsistency
2021-12-19 19:40:39 +00:00
Nick Sturgeon 70990bf43f
ovl_En_Test5 (Spring Water Modifier) OK with attempted documentation (#483)
* Implement asm functions in C

* Clean up code with documentation

* Apply styling suggestions

* Apply feedback
2021-12-19 19:34:28 +00:00
EllipticEllipsis d5b71bd0f5
Tutorial (#362)
* ObjTree OK, data imported

* EnMs OK, data imported

* And the spec

* OK

* Some minor edits

* A lot of preliminary stuff

* Mostly complete beginning

* First draft of other functions doc

* Whoops, forgot the GlobalContext pad

* Draw functions (minus colour), create Data

* Data

* gitignore, some progress on documenting

* Review comments, continue documenting

* spec

* Finish off documentation

* undefined_syms

* Add a couple of todos

* One more

* At least add tools for object decomp

* Start conversion table stuff

* Document ObjTree

* Document EnMs

* Add more tables to conversions

* Maide's review

* Review

* Review

* Typos and incomplete thoughts

* Update vscode.md

* Correct function/variable names

* Review suggestions

* Format

* Missed one

* Rename functions and format

* Fix ObjTree

* Update actorfixer.py, fix some variable names

* Some review

* Review suggestions

* More review

* Hopefully fix all the thisx references

* Missed one
2021-12-16 18:47:18 -05: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
Tom Overton d218c9be23
En_Stream (unused water vortex from OoT) OK (#480)
* En_Stream (unused water vortex from OoT) OK

* Better names in EnStream_PlayerIsInRange

* Enum for whether the player is in range
2021-12-06 23:52:18 +00:00
retro 5b7df3f1ca
EnHitTag OK (#482)
* EnHitTag all matching, data still not imported

* rename loop counter variable to i

* imported data

* use generated reloc

* cleanup

* name func_80BE20E8, document with ITEM00_RUPEE_GREEN enum, use if-return-implication in WaitForHit

* add switchflag param macro

* use previously unused pCylinder as function arguments

* use THIS macro and change switchflag macro to take actor pointer

* space between var declaration and code

* format

* rename pCylinder to cylinder

* rename cylinder to collider

* change ColliderCylinder* to pad

Co-authored-by: retro <retro@DESKTOP-KGV19SQ.localdomain>
2021-12-06 21:50:59 +00:00
Maide 08cf506be7
Dm_Stk (#350)
* Dm_Stk

* PR
2021-12-06 21:45:28 +00:00
Derek Hensley e177e99933
Elf_Message OK (#457)
* Matched

* Rename function
2021-12-06 14:42:17 -05:00
mzxrules ce1de034df
z_obj_mure.c (#364)
* a bunch of OKs and close functions

* OK All but 1 function

* Clean up code

* Match

* implement suggestions

* OBJMURE_CHILD_STATE_DEAD

* Update src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c

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

* use enum for type tests

* add OBJMURE_TYPE_MAX

Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-11-30 22:18:58 -03: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
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
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
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
Parker Burnett 77b9431f11
En_hakurock rOcK (#355)
* inital commit with a good chunk done

* adsjfkalsdfh

* can't figure this out for the life of me...

* I'll come back to this later

* not finished, but at least OKs

* blah, still stuck

* en_hakurock OK

* minor clean up

* formatting and pushing up changes

* fixing spec

* fixing warnings and addressing feedback

* addressing PR comments from engineer

* fixing enum

* format
2021-11-06 00:59:45 -03:00
Anghelo Carvajal 278ff4a4b3
`motor.c` OK (#397)
* use motor in the spec

* import bss

* Delete viextendvstart.c

* rename functions

* move stuff and format

* remove globals.h and ultra64.h

* Update src/libultra/io/motor.c

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

* add motor.h to padmgr

* fix

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-11-06 00:29:56 -03:00
Derek Hensley 49f55ff005
EnvFlags OK (#404)
* Matched

* Remove magic number

* Rename system to EnvFlags
2021-11-05 23:15:47 -03:00
Tom Overton c706b2be70
En_Baguo (Nejiron) OK and mostly documented (#351)
* Migrate data to C

* EnBaguo_Init OK

* EnBaguo_Destroy OK

* func_80A3B220 OK

* func_80A3B2CC OK

* func_80A3B2CC OK

* func_80A3B794 OK

* func_80A3B5E0 OK

* func_80A3B7B8 OK

* EnBaguo_Update OK

* func_80A3B8F8

* func_80A3BE24 OK, some other not-OK junk

* func_80A3BE60 OK (wow this is bad!)

* Document the blink system

* func_80A3C17C OK

* Document timer and fix warnings

* func_80A3C008 OK

* Rename x/y/z so it's clear they are positions

* func_80A3BE60 OK in a not-crazy way

* func_80A3B958 OK

* func_80A3BF0C OK

* Make the rotation a Vec3s

* Update the spec to use the built reloc

* Use ARRAY_COUNT instead of hardcoded length

* Document the state stuff

* Document NejironParticle

* Document the rolling rotation stuff

* unk_1BC -> maxDistanceFromHome

* unk_1B8 -> zRollDirection

* Name the two draw functions

* Name the static variables properly

* Name all other functions

* Clean up forward declares

* Last bit of documentation and cleanup

* Add an enum for the rolling direction

* Add explanatory comment

* state -> action and move action descriptions inline

* Use enum for Stone Mask

* Use "Setup" for the setup function

* Document the damage effect

* Add some space around the for-loop

* ./format.sh

* Use % 8 everywhere

* Use -= instead of += a negative number

* Switch order of max check

* Use CLEAR_TAG_POP enum value

* eyeIndexTemp -> eyeIndex

* visible -> isVisible

* Move enums above structs

* Merge animation system changes

* yDist fix

* Respond to review feedback
2021-11-05 10:14:22 -03:00
Maide 418e09bf6f
En_Floormas (#307)
* En_Floormas

* Format
2021-11-04 18:30:05 -04:00
petrie911 ad4c16d40f
osFlash (#158)
* some matches

* Decompile code_0x80186A70 Add defines for KSEG0/1 and (Un)Cached RDRAM

* format

* cleanup

* moved osFlash and imported data

* implement fixes

* format again

* Update include/functions.h

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

* Update include/variables.h

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

* Update src/libultra/flash/osFlash.c

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

* Update src/libultra/flash/osFlash.c

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

* returns are needed

* format

* Update src/libultra/flash/osFlash.c

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

* Update src/libultra/flash/osFlash.c

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

* Update src/libultra/flash/osFlash.c

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

* Update src/libultra/flash/osFlash.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/libultra/flash/osFlash.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/libultra/flash/osFlash.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* should be fixed

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: MMDecomp <mmdecomp@gmail.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-11-03 18:30:20 -04:00
louist103 8e88768a70
Fireobj Kinda OK (#400)
* done

* format

* PR fixes

* revert formatting z64.h

* Update warnings_build_current.txt
2021-11-03 15:09:43 -03:00
Anghelo Carvajal 5e7c19ce29
Match `SkelAnime_GetFrameDataLegacy` (#392)
* Properly rename SkelAnime_GetFrameDataLegacy

* Match
2021-11-03 12:23:37 -03:00
louist103 fcbd524b5d
Debug display mostly OK (#399)
* WIP

* done?

* remove something from variables.h

* missed a warning

* PR fixes (AngheloAlf)

* fix lights

* restore ZAPD makefile

* format

* format again

* fix a graph alloc

* Missed one in skin
2021-11-03 11:52:01 -03:00
Derek Hensley 888627d364
Common data OK (#398)
* Matched common data

* Change one hex to dec
2021-11-03 11:15:39 -03:00
Lucas Shaw 52960d5c2f
z_path.c OK (#379)
* z_path.c OK

* Ran format
2021-11-03 10:55:08 -03:00
kyleburnette 4841a4a0bf
padsetup OK (#383)
* padsetup OK

* Made tharo's suggestions

* Made arg name consistent
2021-11-02 17:35:57 -04:00
Maide 829d1d4c2a
En_Po_Sisters (#345)
* En_Po_Sisters

* Tharo magic

* Rebase

* PR

* Fix make and actorfixer

* Format
2021-10-31 16:07:08 -03:00
Tom Overton d4effceefd
En_Elforg (Stray Fairy) OK and mostly documented (#359)
* Migrate data to C

* EnElforg_Init OK

* func_80ACC470 OK

* EnElforg_Destroy OK

* EnElforg_Update OK

* func_80ACCBD0 OK

* func_80ACCBB8 OK

* func_80ACD6EC OK

* func_80ACD59C OK

* func_80ACD6A8 OK

* func_80ACD610 OK

* func_80ACD878 OK

* Declare animated materials for Elforg

* EnElforg_Draw OK

* func_80ACCC98 OK

* func_80ACC7E4 OK

* func_80ACC8D4 OK

* func_80ACCEB0 OK

* func_80ACC994 OK

* PLAYER -> GET_PLAYER

* func_80ACCE4C OK

* func_80ACC934 OK

* func_80ACCAC0 OK

* func_80ACD2E4 OK

* func_80ACD1F0 OK

* func_80ACD164 OK

* func_80ACD1B0 OK (maybe fakematch but oh well)

* func_80ACD088 OK

* Better match for func_80ACD1B0

* Use compiled reloc

* Move static data to appropriate function

* Name sCylinderInit appropriately

* Add explanatory comment

* Clean up forward declarations

* Add macro for the flag

* Macro and enum for type

* Add STRAY_FAIRY_GET_PARAM_1C0 macro (no clue what this does)

* Document the area stuff

* Name some functions

* Document timer and direction

* Eliminate some early returns

* Tons more documentation

* Name remaining functions

* Document flags

* Name targetDistanceFromHome

* fairyFountainTimer -> secondaryTimer, since it's used outside of Fairy Fountains

* Name the unknown flag

* Name the collider fairy type

* Last bit of renaming/documenting

* Remove zero check

* Use hex constant for newAngle

* Merge animation updates

* Use 0x10000 instead of 65536.0f

* Use decimal for alpha

* Move yDifference initialization up to the same line as declaration

* Use +=/-=

* <= 30 instead of < 31

* += -1 -> --

* >= 81 -> > 80

* 0xDFFFFFFF -> ~0x20000000

* EnElforg_InitializeSpeedAndRotation -> EnElforg_InitializeParams
2021-10-31 13:25:10 -03:00
Tharo b1b114e142
Decompile graph.c (#274)
* Decompiled, 1 non-matching, add some bss reordering helpers

* Document stuff

* Review suggestions

* graphutil.c -> graphalloc.c

* Try to fix fault callback warnings

* Remove extra comments in GfxMasterList

* char pad -> u32 pad

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

* Fix gameState

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

* Other suggestions

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-10-29 15:30:48 -03:00
Maide de3fc29d51
En_Ot ~~(1 non-matching)~~ (#302)
* En_Ot

* Fix
2021-10-27 11:59:21 -03:00
Maide c97a8e5225
En_Tite (#318)
* En_Tite

* Fix
2021-10-27 11:02:26 -03:00
Maide a60c47a970
En_Fish2 (#292)
* En_Fish2

* Fix
2021-10-27 10:28:52 -03:00
Tom Overton bfd1ab28a6
En_Giant OK and mostly documented (#346)
* Migrate data to C

* EnGiant_Destroy OK

* EnGiant_Init OK

* func_80B01A74 OK

* Comment what each of the quest items are

* Put a little comment for myself on func_80B01A74 because it was confusing me lol

* Very early names (they're all bad)

* func_80B01990 OK

* EnGiant_Update OK

* func_80B024AC OK

* func_80B023D0 OK

* func_80B024D8 OK

* func_80B02354 OK (this function is bad!)

* func_80B020A0 OK

* func_80B01EE8 OK

* func_80B01E84 OK

* func_80B0211C OK

* func_80B02234 OK

* unk_250 -> sfxId and label SFX

* func_80B02688 OK

* func_80B026C4 OK

* EnGiant_Draw OK

* Update spec

* Fix up the static data

* unk_24E -> alpha

* Document some of the animation stuff

* Name EnGiant_IsNotFreed

* Document the giant types better

* Minor cleanup

* Add explanatory comment

* Rename the functions in functions.txt too, whoops

* Document sFaceTextures and blink routine

* Document all the various animations

* Name EnGiant_PlaySound

* Document some functions and change an unknown to action

* Add an SFX id I missed

* Name all the action funcs

* Name last two functions

* Mark one case as unused

* Change func_800F5A8C to use arg0, arg1, arg2, etc.

* Move sFaceTextures to EnGiant_Draw and comment what they are

* EnGiant_IsNotFreed -> EnGiant_IsImprisoned

* Use booleans in EnGiant_IsImprisoned

* **/ -> */

* action -> csAction

* Make macros for all type conditional checks

* Add warning about inconsistency

* Document the cs actions

* Add some documentation to animation-changing functions

* Update the function name in functions.txt too

* Improve GIANT_TYPE macros

* Remove an unncessary early return

* Incorporate animation changes
2021-10-25 09:22:17 -03:00
Tharo ef53ba8261
z_game_over.c (#263)
* game over

* Fixes

* Revert save field rename

* Fix comment indent

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

* Add bss reordering stuff, fix bss reordering in z_scene_proc

* Enum uggestions, fix item id

* link -> player in enum comments

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-10-24 13:41:50 -03:00
Lucas Shaw dcf44596d2
Animation system updated, some more boot files decompiled (+6%), z_fcurve_data_skelanime decompiled (1 non-matching), some asm files split, etc (#89)
* Progress on various files

* gfxprint stuff

* split some rodata, add iconv for rodata string parsing

* z_std_dma rodata

* 2 nonmatchings in gfxprint

* mtxuty-cvt ok

* more

* match a function in idle.c

* progress

* Cleanup

* Rename BgPolygon to CollisionPoly

* progress

* some effect stuff

* more effect progress

* updates

* made suggested changes

* z_effect_soft_sprite_old_init mostly ok

* remove old effects enum

* gamealloc.c OK

* added more files

* motor.c almost done

* motor.c OK

* updates

* migration of two files

* listalloc.c oK

* z_fcurve_data_skelanime split

* z_fcurve_data_skelanime.c decompiled

* more files split

* z_malloc.c OK

* contpfs.c OK

* fault.c rodata migrated

* migrated fault_drawer rodata

* update

* update preprocess.py

* renamed functions in z_skelanime

* started z_skelanime cleanup

* like halfway through fixing z_skelanime

* animation system updated to meet oot standards

* remove unused animation structs

* rename matrix structs to fit oot

* Add -woff 712

* fix diff_settings.py because i accidentally broke it before

* fixed merge conflict, doesn't match though

* It matches now

* Updates

* Fixed warnings...added gcc code syntax checking

* Remove gcc check, added in Tharo's PR

* warnings fixed (i think)

* fixed all warnings i think

* ok

* not sure what to do

* Fix all warnings i think (z_en_a_keep needs some file cleanup thouguh)

* it matches if i do this

* remove comment

* accidentally put osPfsFreeBlocks in epilinkhandle.c

* memcmp -> bcmp

* change u32 size to size_t size, delete string.h because it caused unnecessary confusion with defining size_t twice

* format.sh

* MTXMODE_NEW and MTXMODE_APPLY to matrix functions

* Made suggested changes

* pragma sFaultDrawerFont instead of including in repo

* add some functions to functions.h

* Bss reordering fixed in z_collision_check...added hack to disasm.py

* Updated z_en_a_keep.c

* Missed suggestion in EnAObj_Destroy

* .

* update z_fcurve_Data_skelanime and z_skelanime with suggestions

* devmgr.c ok

* minor changes

* Addressed comments

* remove redundant file

* gfxp -> dlist in game.c

* updated actorfixer.py

* fixed warnings in z_malloc

* Change void* back to Actor*

* format

* Add the soft_sprit comments back

* Rename SV->Flex

* remove .common

* run format

* Update src/code/z_skelanime.c

* u32 channel

Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-10-24 10:59:14 -04:00
EllipticEllipsis 151e098e48
`z_debug` OK (#330)
* z_debug OK

* Rename function

* Remove duplicate struct

* Update z64.h
2021-10-14 12:25:14 -03:00
Maide 94e6ebaec9
En_Fu (#343)
* En_Fu

* Fix non-matching, thanks Anon58
2021-10-11 16:48:03 -03:00
EllipticEllipsis 565b1f7579
`flg_set.c` OK and documented (#335)
* Draw OK, Update very much not

* Flag table imported

* Update OK

* Actually OK this time

* Begin documenting

* Rename some stuff

* Rename functions

* spec

* Review

* Format

* Anghelo's review

* Fix lifemeter bss

* Format

* Missed one

* idle.c bss
2021-10-11 15:28:16 -03:00
Maide a2666a6ee0
En_Sw (6 non-matching) (#295)
* En_Sw

* spec

* Sw

* Fix
2021-10-11 13:41:02 -04:00
Maide 1774416598
En_Poh (#291)
* En_Poh

* PR

* PR

* Fix wrong float
2021-10-11 10:21:17 -03:00
Maide f059baa87f
En_Owl (#271)
* En_Owl

* a

* PR

* a

* Rebase
2021-10-10 21:36:24 -04:00
Tom Overton fbd1a79942
Arrow_Ice OK (#314)
* Migrate data and ArrowIce_Init OK

* ArrowIce_Destroy OK (also define func_80115D5C in functions.h, maybe a bad thing???)

* ArrowIce_SetupAction OK

* func_809224DC OK

* ArrowIce_Update OK

* func_809227F4 OK (but with hacky float constant)

* func_809225D0 OK and use float constant in func_809227F4

* func_80922628 OK

* ArrowIce_Draw OK

* Migrate D_80924200.s to C

* Apply better names in ice_gfx, and document Draw slightly

* Name struct vars to match OoT

* Update function names to match OoT

* Explain that arrow's timer and hitFlags came from OoT

* Update spec + "migrate" bss to C

* Do a hex -> decimal conversion I missed

* Remove blank line in-between headers

* Remove extraneous forward declare

* Move initialization of arrow up one line

* Remove parentheses

* Use else if

* Use decrement operation

* Use decimal for an alpha calculation

* Switch func_80115D5C to take GameState*

* Put pad on the top of Draw

* Move initialization of arrow up (again)

* Early return from Update if we're killed

* Extract assets instead of putting them in the repo

* Add explanatory comment to top of file

* += 1 -> ++

* Use VEC3F_LERPIMPDST macro

* Force a jenkins rerun by adding a space

* Remove the space from the last commit

* Move literal to the back of the conditional

* Respond to review feedback

* Add ArrowIce_LerpFiredPosition to functions.txt
2021-09-30 10:34:45 -03:00
EllipticEllipsis f80b08450f
ShrinkWindow OK (#303)
* OK, small amount of documentation, import bss

* Remove comments

* Actually commit functions.txt

* Add renames to actorfixer.py, review
2021-09-29 21:55:41 -04:00
Anghelo Carvajal 2f000058f5
`ovl_select`: ZELDA MAP SELECT matched and documented (#310)
* basic functions

* errr

* Progress, kinda

* func_808016E8

* func_808019FC and func_80801A64

* Import data

* Format

* some progress

* func_808013B8

* func_80801620

* fix stuff

* func_80800930

* improve func_80800A44 a bit

* At least it is equivalent now

* matches!

* small renames

* Use generated reloc

* move functions

* Renaming a lot of stuff

* Some functions renames

* Rename members

* Add translations for everything

* Run formatter

* Update include/alloca.h

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

* Update src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c

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

* review changes

* review comments

* Update src/overlays/gamestates/ovl_select/z_select.h

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

* Update src/overlays/gamestates/ovl_select/z_select.h

Co-authored-by: Kenix3 <kenixwhisperwind@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: Kenix3 <kenixwhisperwind@gmail.com>
2021-09-28 22:23:08 -04:00
Maide 9478fc760f
Thiefbird (#290)
* Thiefbird

* Fix enums

* Rename funcs

* PR
2021-09-28 17:56:25 -04:00
Maide edb1dd4675
En_Zot (#320)
* En_Zot

* PR
2021-09-28 10:28:06 -03:00
Tom Overton 0f4bdbc020
Obj_Etcetera (Deku Flower) OK and somewhat documented (#326)
* Migrate data to C

* ObjEtcetera_Init OK

* ObjEtcetera_Destroy OK

* ObjEtcetera_Update OK

* func_80A7C690 OK

* func_80A7C718 OK

* func_80A7C168 OK

* func_80A7BE8C OK

* Make the draw functions take Actor*

* CollisionCheck_SetAC should take a Collider

* func_80A7BDC8 OK (with silly dummy label meme)

* func_80A7C1F0 OK

* unk_276 is almost certainly a u16 since I constantly have to cast it, so just retype it

* func_80A7BF08 OK

* Some minor cleanup

* Convert D_80A7C80C to array of CollisionHeader*

* Finish defining struct to prepare for func_80A7C308

* func_80A7C308 OK

* Move gameplay_keep symbols to variables.h

* Explanatory comment at the top

* Type gameplay_keep animation headers too

* Update the spec (why do I always forget this?)

* Rename func_80A7BDC8 to ObjEtcetera_PerformFlutter (name still up for debate)

* Name objIndex

* Document the types of flowers

* Name displayListPtr

* Name burrowFlag and provide a macro

* Name specialFlutterScale and clean up some things with newer understanding

* Give the draw functions (bad) names

* Name ObjEtcetera_Idle

* Name ObjEtcetera_Setup (name sucks but oh well lol)

* Name ObjEtcetera_ReturnToIdle. These names all suck but they're a start

* Document some of ObjEtcetera_Idle's behavior

* Name and document objectIds

* Remove the burrow macro because it's frankly more confusing for now

* Name the draw functions something slightly better

* MUCH better names for things + more documentation

* Clean up ObjEtcetera_Setup a bit

* Call it NUMBER_OF_FLOWER_TYPES instead

* A few more name changes

* Link -> Player in comments

* displayListPtr -> dList

* Trailing commas + format

* Move initialization of type up

* Improve conditional check

* Use BGCHECK_SCENE macro

* Move initialization of floorBgId up

* Use documentation comment style

* Match ObjEtcetera_DoNormalOscillation without a dummy label

* param_2 -> arg1

* Insert blank line after scoped pad

* OBJETCETERA_TYPE -> DEKU_FLOWER_TYPE

* Cleanup and rename enum

* Break up ObjEtcetera_Setup a bit and convert DekuFlowerType to an s32 to remove warnings

* Whoops, run format

* Delete leading 0 on struct comments

* Rename pad to requiredScopeTemp to match my other PR
2021-09-28 08:18:31 -04:00
Maide 27e41b73a8
En_Rd (#316)
* En_Rd

* PR

* a
2021-09-27 23:17:28 -03:00
Maide 039fc4623e
En_Syateki_Man (#269)
* En_Syateki_Man

* a
2021-09-25 13:22:51 -03:00
Tom Overton 6ecea0ec6f
Obj_KIbako cleanup (#280)
* Modify Kibako to use the same ID/FLAG macros as Kibako2

* Define KIBAKO_BANK_INDEX

* Add explanatory comment at the top of the file

* Add Kibako function names to functions.txt

* Define KIBAKO_BOMBER_CAN_HIDE_IN_BOX
2021-09-02 11:44:50 -04:00
gamestabled b3816cd26b
ObjMakeoshihiki OK (#272)
* ObjMakeoshihiki OK

* suggested changed

Co-authored-by: gamestabled <gamest@bl.edu>
2021-09-02 10:49:00 -04:00