1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-26 19:04:20 +00:00
Commit graph

12 commits

Author SHA1 Message Date
petrie911
629d1c8968
Add remaining undefined syms (#500)
* 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

* syms

* Update src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-12-01 21:50:35 -05:00
Sirius902
5d03824f93
ovl_Bg_Ganon_Otyuka (#488)
* merge upstream

* Merge upstream

* BgGanonOtyuka_Init

* Migrate data

* Use texture symbol in dlist

* Split gfx into another file

* Cool data stuff

* Cleanup more data

* Name some more stuff

* Add newline

* BgGanonOtyuka_Destroy

* Rename shockwave to flash

* Work on BgGanonOtyuka_Draw

* Work more on draw

* More progress

* More BgGanonOtyuka_Draw

* Stuff

* Terrible match BgGanonOtyuka_Draw

* BgGanonOtyuka_Update

* func_808760DC

* Cleanup BgGanonOtyuka_Draw

* Cleanup

* More cleanup

* Work on func_80875A0C

* Rename to color

* func_80875C88

* func_80875A0C

* Stuff

* Stuff

* Name top and bottom dlists

* Name some verts

* Add back in accidentally removed D_808772E0

* Name side dlist

* Name dlists

* Name flash verts

* Only add unk_198 to BossGanon

* Name drop timer

* Name isFalling

* Name stuff

* Name stuff relating to sides

* Use Side enum

* Use cardinal directions for sides

* More naming / cleanup

* Rename to SIDE_ALL

* Replace enum with defines

* Flash state

* Reorder add

* Rename to flashHeight

* Revert "Rename to flashHeight"

This reverts commit fa1ca87630.

* Correct sides

* Rename to unwalledSides

* Put f32 on 0x8000

* Cleanup

* Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h

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

* Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c

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

* Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c

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

* Cleanup

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-11-29 05:05:30 -05:00
Random
174af7384d
libultra cleanup (#215)
* cleanup libultra

* fixes

- use quotes instead of <> for includes
- add macros for zelda specific thread priorities
- fix Makefile
- properly format the remaining pfs structs

* fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL

* remove ULTRA_ABS

* fix includes

* update z_player.c/z_lib.c + run format.sh

* merge upstream/master

* fix include in En_Goroiwa

* fix includes
2020-10-03 11:22:44 -04:00
Roman971
5acc4e2f66
Fix some jump table labels being treated as separate functions (#120) 2020-05-06 14:56:35 -04:00
Roman971
1425678d8a
More actor cleanup Part 3 (#118)
* Add custom types for actor specific functions (like actions)

* Add a forward struct declaration for all other actors
2020-05-05 18:53:15 -04:00
Roman971
f114df8929
More actor cleanup Part 2 (#116)
* Change all main actor functions to take a 'Actor* thisx' argument

* Change all actor callbacks to also take a 'Actor* thisx' argument
2020-05-04 15:02:51 -04:00
Roman971
3ca6082084
More actor cleanup Part 1 (#107)
* Fix naming and structs in z_en_item00.c and z_en_a_keep.c

* Decompile init vars in z_en_item00.c and z_en_a_keep.c

* Create missing .h files for the last few actors

* Fix some collider member names in actor structs

* Fix old actors not properly using "actionFunc" / "SetupAction"

* Remove some local temporary actor structs

* Fix some actor header includes to be absolute instead of relative
2020-05-01 14:26:16 -04:00
Lucas Shaw
045a92d7c3
Big actor cleanup (fixed) (#69)
* Started doing cleanup

* did more work

* did more migration

* migrated more rodata and worked on some structs

* did more work

* Removal of ROOM field from initvars, some rodata migration, some string decompilation

* General update

* Decompiled vt strings

* Tool work

* Tool improvements

* 270 overlay rodata files remaining

* better float handling

* floats

* Many more floats

* migrated boss_mo

* assorted fixes

* Migrated 10

* tool improvements

* migrated 10

* 10 more

* 1 more

* did a few more

* fixes

* 10 more

* more floats

* Did some more, updated migrate-rodata.py to 'modify' the C file after processing in order to make to compiler process it as if it was changed.

* removed changes made to script by accident

* migrated largest rodata - ovl_fishing

* Did some more

* 114 remaining

* 99 left !

* almost done migrating rodata

* did some more, done for tonight

* almost done, tried add support to the script for z_player

* All possible rodata migrated in actor overlays

* update

* removed static from all overlays, ran format.sh

* Removed unknown actor structs

* converted a few floats

* Added new lines to header files that were missing them. Removed unused asm files

* Removed unused asm files

* Formatting newlines

Further formatting

spacing

.float spacing

More space formatting

More spacing formatting

Removing .balign 4 after floats

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2020-04-14 14:16:34 -04:00
Roman971
3acb30694b Fix actor init vars brace style under bootstrap comments 2020-03-24 00:35:35 +01:00
Roman971
51290f6126 Partially format header files 2020-03-22 22:50:15 +01:00
Roman971
8cfe7cce9f Format all src C files 2020-03-22 22:20:03 +01:00
Jack Walker
087f561f77 First proper commit. 2020-03-17 00:31:30 -04:00