1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-05 01:06:37 +00:00
Commit graph

1300 commits

Author SHA1 Message Date
petrie911
2dfa188706
Docs for the Anime part of SkelAnime (#517)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* more names

* so many names

* we got subsystems now

* slight cleanup

* merge part 2

* new naming scheme

* slight adjustment

* no limit

* syms maybe

* step one

* OK, it's fixed

* table

* some names and such

* comments**

* update zap

* gitkeep to please jenkins

* ZAP

* fixer

* fixer2

* fixer3

* zap

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig <fig02srl@gmail.com>
2020-12-29 17:46:46 -05:00
petrie911
e4d88bf942
En_Bb (Bubble (flying skull)) (#551)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* bubbles!

* match

* stuff

* more names

* let's go

* SFX error

* fixes

* also formatting

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bb/z_en_bb.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-29 16:06:20 -05:00
petrie911
94d51ce86f
Bg_Mizu_Bwall (#543)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* bwall

* cleanup

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-29 13:35:01 -05:00
petrie911
9fcf8a4430
En_Bw (Torch Slug) (#537)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* slug-o-cola

* sfx macros

* Matched

* this will have to do

* well maybe a little more

* good enough
2020-12-29 13:32:32 -05:00
petrie911
695bc37be4
Bg_Gnd_Iceblock and Bg_Ice_Objects (sliding ice blocks) (#534)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* a good start

* done

* Log

* formatting

* thisx

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-29 13:11:11 -05:00
EllipticEllipsis
21e367a7cb
Bigmirror OK and documented (#530)
* OK

* documented (with one odd float value)

* delete asm and alter spec

* uniformise spawn data to sIsSpawned,
fix compile warnings in Bg_Jya_Lift and Bg_Mori_Elevator

* translate last printf

* re-delete modified asm

* addressed review comments

* remove outdated comment

* addressed comments, made defines

* untrack scenes dir

* remove scenes dir
2020-12-29 03:50:56 -05:00
Tharo
b50e079e1b
Decompile z_skin.c (#548)
* z_skin progress

* Some more progress

* Some real progress

* Decompiled, 1 nonmatching

* Remove unused asm

* pad -> D_80160FC0

Co-authored-by: Thar0 <maximilianc64@gmail.com>
2020-12-29 00:30:23 -05:00
petrie911
42f2d38b8f
En_Torch2 (#486)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* Oh boy more giant functions

* now functional, but not equivalent

* Now only non-matching

* cleaned up illusion room

* much closer. static variables still suck though

* much closer. static variables still suck though

* some docs and cleanup. matching is horrible.

* static varaibles are a troublesome  lot

* ifdef

* merge ZAP

* merge again

* small cleanup

* small fixes

* swordstate

* resolve conflict

* comments and such

Co-authored-by: fig <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-28 20:56:24 -05:00
zelda2774
1e6bd7f623
Fix multiprocessing usage for extract_assets as well (#575)
Co-authored-by: zelda2774 <zelda2774@invalid>
2020-12-28 18:37:52 -05:00
zelda2774
ed17c81a33
Fix extract_baserom with non-forking multiprocessing (#572)
Co-authored-by: zelda2774 <zelda2774@invalid>
2020-12-28 17:19:48 -05:00
engineer124
86898891da
matched EnGeldB_DodgeRanged (#565)
* EnGeldB_DodgeRanged OK

* EnGeldB_DodgeRanged OK with u16

* minor cleanup

* pr feedback
2020-12-28 07:22:31 -05:00
Synray
fef0697063
Match 4 functions in z_player.c (#560)
* Match 4 functions z_player.c

Only Player_Init left

* Cleanup

* Review changes

* Unnecessary changes

* Remove asm again
2020-12-27 20:45:03 -05:00
zelda2774
dadf69a67e
Speed up make (#568)
Co-authored-by: zelda2774 <zelda2774@invalid>
2020-12-27 17:59:57 -05:00
petrie911
3727cc38b8
matched Math3D_CylVsLineSeg and fixed a Math_ error (#564)
* matched cylvsline

* slight name adjustment

* format

* and asm

* comment cleanup

* fixed misspelling and added mathfixer tool

* formatting

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2020-12-27 11:13:38 -05:00
Nicholas Estelami
b95643b397
Updated Texture Asset Handling (#478)
* Auto stash before rebase of "upstream/master"

* A large number of scenes have been decompiled.

* Fixed makefile

* Decompiled around 40 scenes.

* Removed old file

* Finished matching remaining scenes.

* Removed old commented out spec lines

* Decompiled a few object files.

* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.

* Updated texture and object file decomp

* Fixed newline issue with ZAPD

* Moved scenes/ into the assets/ folder

* Fixed a few compile errors

* Auto stash before rebase of "upstream/master"

* A large number of scenes have been decompiled.

* Fixed makefile

* Decompiled around 40 scenes.

* Removed old file

* Finished matching remaining scenes.

* Removed old commented out spec lines

* Decompiled a few object files.

* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.

* Updated texture and object file decomp

* Moved scenes/ into the assets/ folder

* Fixed a few compile errors

* Fixed merge issues.

* Fixed makefile merge error

* Fixed additional merge error

* Fixed several more merge issues

* Commented out gameplay_keep and sk2 extraction, since currently unused.

* Reenabled gameplay_keep extraction since it's used in the spec

* Fixed build error

* Removed test struct

* Fixed makefile error that would happen on fresh builds

* Fixed merge issue

* Removed relative paths

* Multithreading on extraction, spec uses numbers, few changes to XMLs

* Removed redundant code from the extract_assets script

* object_sk2 and object_spot09_obj OK

* object_spot11_obj OK

* object_spot17_obj OK

* Test: One of the gameplay_keep dlists given a proper symbol

* Updated asset symbol names based on new naming scheme

* XMLs use "Offset" instead of "Address" now

* Fixed merge issues, updated ovl_Magic_Dark xml and gfx file

* Updated to use latest build of ZAPD

* Updated ZAPD again

* Updated ZAP to remove assimp dependency

* Jenkins Test: Added .gitkeep file

* Updated ZAP once more

* Updated png file name to comply with new naming scheme.

* Fixed bad include

Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 06:39:52 -05:00
petrie911
8fa6cb6ff9
Consistent naming for Math_ functions (#542)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* maths

* Factoriali -> Factorial

* soon, soon

* renames

* rand

* docs

* merged

* formatting

* little more cleanup

* asm crept back in

* changes to MathF

* smooth criminal

* functions.h
2020-12-26 05:44:53 -05:00
Lucas Shaw
81c269b417
z_demo_tre_lgt OK (#521)
* z_demo_tre_lgt ok

* ok

* made suggested changes

* fixed
2020-12-25 19:24:16 -05:00
Ethan Roseman
60b1f5dd41
Fixing mkldscript.c for mac (#563) 2020-12-25 16:38:57 -05:00
petrie911
a8ae9f48b7
z_scene_table, z_view, and z_fbdemo_fade OK (#561)
* fbdemo

* the view is clear

* more matchings

* scene table doesn't want to be nice

* small thing in view

* can do

* accidentally a value
2020-12-25 16:19:52 -05:00
Roman971
09ddf4f71e
Match 5 more functions in z_player.c and improve the others (#559) 2020-12-22 23:37:42 -05:00
petrie911
e4b84365ff
z_collision_check OK (#558)
* another match

* fix variables

* comment

* functions.h

* last match
2020-12-22 15:59:56 -05:00
petrie911
4f2259e24e
Fix bug in sfxconvert.py (#553)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* small fix to function parser

* off by one error
2020-12-22 12:00:28 -05:00
Synray
bde4a411b3
Add .PHONY and add 'test' target to Makefile (#526) 2020-12-21 19:14:25 -05:00
EllipticEllipsis
df704a9f80
MirRay OK and documented (#528)
* init, destroy, update, couple of others decomped

* 2 functions remain

* data migrated

* 1 function left

* OK
thanks mostly to Petrie and the permuter,
and no thanks to my find/replace skills

* documented and deleted asm

* updated spec

* delete data

* address review comments

* Apply review suggestions
2020-12-21 12:28:57 -05:00
Zelllll
06ceb6ad40
Obj_Hamishi OK (#539)
* obj_hamishi OK

* Update src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* made suggested changes

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-20 13:39:06 -05:00
Revo
5c8e745645
Pass NON_MATCHING to spec when defined. (#549) 2020-12-20 13:10:13 -05:00
Parker Burnett
2d35a25212
z_bg_jya_haheniron OK (#524)
* getting things started

* all matched, rock solid

* deleted assembly, formatted, and cleaned spec

* yikes, forgot to hit -d on deleting the asm

* Fixed suggestions and some documentation

* fixing a few compiler warnings

* added suggestions

* removing assembly to fix merge issues

* Documented function names
2020-12-20 13:03:31 -05:00
Synray
5ab8a39cd0
En_Zl3 OK (#546)
* zl3 OK

* Remove asm

* Use generated reloc
2020-12-20 12:21:09 -05:00
Synray
b0200efbeb
ovl_En_Zo OK (#522)
* Decompile ovl_En_Zo

* Label ovl_En_Zo

* clang-format

* Cleanup

* Review changes

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Use generated reloc

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Review Changes

* Remove reloc data

* Review changes

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-20 02:38:08 -05:00
louist103
3237f176cd
Fix a couple of actors to use auto generated reloc (#547)
* FIX RELOC

* Update spec

* Delete z_bg_spot15_saku.reloc.s

* Add endseg back

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

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2020-12-19 11:16:34 -05:00
Zelllll
eadf85f17c
Bg_Haka_Sgami OK (#532)
* spinning scythe trap, 4/6 matching

* fixed typo

* Almost matched sgami init

* Matched sgami Init

* starting to clean up func_8087E858

* func_8087E858 half-way done

* Scythe matched

* update scythe

* Removed asm files

* Delete z_bg_haka_sgami.reloc.s

* Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update z_bg_haka_sgami.c

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-19 04:59:35 -05:00
Zelllll
3369d0657d
Bg_Relay_Objects OK (#536)
* bg_relay_objects OK

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update z_bg_relay_objects.c

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-18 23:46:52 -05:00
petrie911
2373c779d1
additional matching functions in z_room, z_camera, and En_Zl3 (#541)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* small improvement

* also minor

* merge

* matches

* the room?

* woo matches

* spelling fix
2020-12-18 22:09:38 -05:00
Roman971
83e53bbaf2
Fix some non matchings in actors and parameter (#540)
* Fix some non matchings in actors and parameter

- `EnTuboTrap_HandleImpact` from `z_en_tubo_trap.c` (fully matching)
- `func_80ADA35C` from `z_en_po_sisters.c` (fully matching)
- `func_80B0B81C` from `z_en_stream.c` (fully matching)
- `Item_Give` from `z_parameter.c` (1 non matching left)

* Rectify bss ordering comment
2020-12-17 19:12:22 -05:00
petrie911
0376242365
Remove inline THIS-> from actors (#538)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* THIS

* PLAYER
2020-12-17 17:49:41 -05:00
petrie911
6e78efd0c5
Remove some unaligned fake symbols (#535)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* a few fake syms

* two more

* format
2020-12-16 22:10:42 -05:00
Tharo
5632df406b
Fix colliderinit.py to run from project root (#531)
* Now works from root but not from overlayhelpers

* Fix to run from anywhere
2020-12-15 18:27:35 -05:00
petrie911
92e9f2d370
Undefined Symbols in the ASM (#527)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* now with more symbols
2020-12-12 14:22:33 -05:00
Tom Overton
3062045acd
En_Stream (vortex) 7/8 matching, 1 equivalent (#512)
* EnStream_Init OK

* func_80B0B7A0 OK

* EnStream_Destroy OK

* EnStream_Update OK

* Make func_80B0B7A0 take this instead of thisx like other SetupActions

* func_80B0BAC8 OK

* func_80B0B934 OK

* func_80B0B81C not OK, but very close and I give up

* EnStream_Draw OK

* Delete unused ASM and do a little cleanup

* Provide better names for functions

* Make the file buildable when NONMATCHING is used

* Flip comparisons in EnStream_SuckPlayer as per review

* NONMATCHING -> NON_MATCHING

* Remove & for function pointers

* Type D_06000950 and remove the & in Draw

* Remove unnecessary "struct"

* Remove unnecessary forward declaration

* Make func_80B0B81C take Vec3f*, not PosRot*

* Use the generated reloc when NON_MATCHING

* Move func_80B0B81C forward declare to the else block
2020-12-12 01:14:26 -05:00
petrie911
f05a584dea
G_Switch, Syateki_Itm, and Syateki_Man (Shooting gallery and related actors) (#523)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* rupees and, for some reason, pots

* and now an even larger man

* now for the gallery

* more progress

* naming continues

* even more docs

* another match

* match, fix, a new enum

* Update src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c

* fixes except globalctx

* well one more

* and now globalCtx
2020-12-11 17:38:23 -05:00
engineer124
bc8e3745c7
moved rodata for Iceblock (#525) 2020-12-11 11:55:41 -05:00
Synray
51b204f8e1
Match gfxprint.c (#520)
* Match gfxprint.c

* Review changes

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-11 10:58:06 -05:00
petrie911
d4e16bbacf
En_GeldB (#516)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* woo watch out

* data and such

* stuff

* more decomp

* another match

* match and docs

* more docs

* little more cleanup

* SFX macros

* little more

* more attempts to match

* naming things

* I give up on the match

* also spec

* changes

* hex

* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-10 15:00:17 -05:00
petrie911
0c2b92125f
New tool: sfxconvert (#514)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* new tool

* python function conventions

* new name

* new error handling

* whoops comments
2020-12-09 19:39:32 -05:00
Ethan Roseman
96512ee3ab
Decompiled ovl_En_Ta (#518)
* First steps

* more

* done

* format

* PR comments

* PR comments
2020-12-08 16:39:41 -05:00
Kenix3
353684c638
ovl_demo_effect 100% OK (#466)
* Fully decompiles demo_effect actor.

* Formats z_demo_effect.c

* GET_ACTOR_TYPE is renamed to GET_EFFECT_TYPE

* Implements OPEN_DISPS macros for all draw functions.

* Fixes ugly float values

* Removes unnecessary union structs in the DemoEffect actor struct

* Renames DemoEffect SkelAnimeCurve member to skelCurve

* Names initObjectBankIndex DemoEffect struct member

* Renames jewel display list holders

* Renames initialization function pointers to initUpdateFunc and initDrawFunc

* Renames primitive and environment color DemoEffect struct members.

* Fixes a couple missed floats.

* Renames most draw and update functions.

* Finishes naming all update functions.

* Adds additional SFX defines.

* Renames the rest of the functions

* Renames all external object display lists and vertex references

* Renames DemoEffect global data variables

* Renames DemoEffect Medal function to GetItem because it's used by LightArrows too

* Fixes DemoEffect Timewarp_Timeblock documentation.

* DemoEffect_TimewarpTimeblock updates shrink functions to use decimal

* Converts DemoEffect hex to decimal where appopriate

* Names the rest of DemoEffect struct members.

* Names DemoEffect triforceSpot crystalLightOpacity

* Adds DemoEffect enums for light effect color and god lgt types.

* Renames DemoEffect_UpdateBlueOrb to DemoEffect_UpdateBlueOrbGrow

* Fixes compiler warning in DemoEffect_JewelSparkle

* Renames DemoEffect_MedalSparkle argument

* Reformatting DemoEffect struct offset comments.

* Formats z_demo_effect

* Updates DemoEffect oGfxCtx to use the new macros.

* Adds comments detailing what each function in the DemoEffect system does.

* Removes z_demo_effect.data.s

* Renames DemoEffect global variables and sets them to static

* Removes pointer from DemoEffect function references

* Removes unncecessary default: break; statements in DemoEffect

* Converts rotation values to hex in DemoEffect

* DemoEffect effectFlags now uses ~1 rather than 65534

* DemoEffect_DrawGodLgt now uses a cleaner conditional statement

* eventChkInf in DemoEffect now uses 1 << 9 and 1 << 11

* DemoEffect now uses VT macros.

* Converts DemoEffect colors to hex.

* Changes M_PI / 32768.0f to M_PI / 0x8000

* Updates demo_effect enums to be all caps

* ovl_demo_effect reloc info is now included via build process rather than included from original asm

* Adds param packing macro

* DemoEffect struct unions are now typedef'd outside of the main struct

* Reformats DemoEffect sJewelSparkleColors

* Removes an if(globalCtx){} in DemoEffect_Init

* Removes ActorFunc cast in DemoEffect_Wait

* Removes unncessary comment in DemoEffect_MedalSparkle

* Timer check in DemoEffect_UpdateLightRingShrinking now uses <= 255 rather than < 256

* Removes unnecessary comment in DemoEffect_SetJewelColor

* Removes unncessary comment in DemoEffect_MoveJewelActivateDoorOfTime

* Converts an angle to hex in DemoEffect_MoveJewelActivateDoorOfTime

* Converts a while to for loop in DemoEffect_JewelSparkle

* Moves stack variables in DemoEffect_UpdateDust to a new line for each one

* Removes globalCtx2 assignment to the beginning of the function in DemoEffect_DrawJewel

* Removes unnecessary comment in DemoEffect_DrawCrystalLight

* No longer wrapping rotation reset in if(1){} in DemoEffect_DrawGodLgt

* Converts DemoEffect if statements to use != 0 and == 0 when non-boolean ints are checked.

* DemoEffect initDrawFunc now uses type ActorFunc rather than DemoEffectFunc

* review 2

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-07 12:48:29 -05:00
gamestabled
eff219f79b
enum fix in impa (#515) 2020-12-06 19:01:02 -05:00
krimtonz
321388673b
decompile z_camera (#398)
* cleanup

* name camera action functions

* decompile a few small functions, name a few Camera struct members

* decompile camera data, decompile a few camera functions

* Split ASM for code_800BB0A0

* removing code_800BB0A0.s

* PR Requests, Camera WIP

* remove #define NON_MATCHING from db_camera

* rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c

* camera wip

* rename some struct memebers, some decomp wip

* pr updates

* camera wip

* name some fields in Camera Struct, being making sense of Camera_Update

* Camera WIP

* wip

* wip

* add z64camera.h header, begin creating CameraSetting macros

* wip

* wip

* wip

* wip

* migrate camera bss to c

* match a couple functions in db_camera

* match some small db_camera functions

* wip

* migrate db_camera rodata, match a few functions

* remote db_camera.rodata.s

* match some of db_camera

* identify types of some unknown data pieces

* some small wip

* Match Camera_Init, some function changes, some struct name changes.  Change unk_C0 and unk_CC to floats from Vec3fs

* add naming for a few more Camera struct members

* wip

* match func_80043F94

* Match Camera_Jump1

* document some of Camera_Jump1

* wip

* match Camera_Jump3

* Match Camera_Update, FeelsAmazing

* wip

* wip

* match Camera_SetParam

* minor cleanup

* wip

* wip

* match Camera_KeepOn0

* some documentation, modify some matching functions to match style of others.

* match Camera_Demo1

* match camera_demo9

* document Camera_Demo1 and Camera_Demo9

* wip

* Match camera_battle4

* match camera_unique2

* Match Camera_Unique3

* match camera_special6

* match Camera_Special5

* wip

* document camera_special6

* naming updates

* match camera_Unique1

* match Camera_Unique0

* wip

* Match Camera_CalcUpFromPitchYawRoll

* match func_80045508

* document Camera_Battle4

* document several camera functions, move camera data to separate file

* rename phi/theta to pitch/yaw

* wip

* uniq9 wip

* Camera_Unqiue9 OK

* document Camera_Unique9

* name unk_160 in camera struct

* wip

* wip

* minor updates

* fix conflicts

* wip

* wip

* Olib updates

* wip

* wip

* rename most Math3D functions, few matches, documentation

* wip

* document most of math3d

* wip

* wip

* wip

* pr updates

* Match Camera_Fixed4

* match func_80058E8C

* pr updates

* add missing comment block finalizer

* Merge math3dupdates

* match Camera_ChangeSetting

* Match Camera_ChangeMode

* match func_80058148

* Match Camera_Special9

* decompile the rest of camera data

* match Camera_Demo5

* name a few camera functions in z_play

* match func_80046CB4, some work on other fucntions

* wip

* impove some non matchings

* fix function rename

* match func_800588B4

* match Camera_Subj4

* wip

* Camera_Demo3 matching, Camera_Battle1 big progress

* Camera_Normal2 OK

* wip

* match Camera_Parallel1

* normalize some things across functions

* match Camera_Normal1

* Match Camera_Normal3

* some cleanup

* more cleanup

* more cleanup , match Camera_CalcDefaultPitch

* data formatting

* Match Camera_Jump2

* document Camera_Jump2

* Match Camera_KeepOn3

* document some of Camera_KeepOn3

* improve some non_matchings

* match func_80045C74 and func_800460A8

* code cleanup, documentation

* match Camera_KeepOn1

* Match Camera_Subj3

* Match Camera_Battle1

* remove non_matching from func_80044adc and func_80046e20

* name several members of Battle1

* more documentation on Battle1

* cleanup

* renaming Camera_Vec3fScaleXYZFactor to Camera_Vec3fTranslateByUnitVector

* reorganize update structs, remove final references to params, remove CameraParams union

* implement camera enums into player

* Renaming Camera_GetDir to Camera_GetInputDir, Camera_GetRealDir to Camera_GetCamDir, etc, implement camera enum's into player

* remove non-global camera variables from variables.h

* clean up some variable declarations

* finish pr comment updates

* fix some warnings

* data formatting

* finish commenting on data

* delete unused asm

* remove asm

Co-authored-by: fig <fig02srl@gmail.com>
2020-12-06 17:39:47 -05:00
EllipticEllipsis
dadee87f94
Bombchu bowling OK (#496)
* All functions decompiled, most named

* asm deleted, spec and undefined_syms included

* missed a static

* Some cleanup on comments and osSyncPrintfs

* asm

Co-authored-by: fig02 <fig02srl@gmail.com>
2020-12-06 13:48:51 -05:00
petrie911
b097c58caf
En_Dodongo (#498)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* I can't wait to bomb some do dodongos

* a whole heap of bombchus

* matched

* more names

* Dodongo dislikes smoke

* i am error

* merge

* fixes

* Update src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-06 13:06:17 -05:00