1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 12:04:29 +00:00
Commit graph

733 commits

Author SHA1 Message Date
Sirius902
1cc2c8ddd1 Cleanup BgGanonOtyuka_Draw 2020-11-14 20:25:57 -08:00
Sirius902
aec2bb45ba func_808760DC 2020-11-14 20:13:46 -08:00
Sirius902
a03c89906b BgGanonOtyuka_Update 2020-11-14 20:10:52 -08:00
Sirius902
c20d8db4a8 Terrible match BgGanonOtyuka_Draw 2020-11-14 20:01:26 -08:00
Sirius902
719384c728 Stuff 2020-11-14 19:47:55 -08:00
Sirius902
55d2969095 More BgGanonOtyuka_Draw 2020-11-14 19:39:30 -08:00
Sirius902
53b52f63e7 More progress 2020-11-14 18:59:42 -08:00
Sirius902
fffb7b6bea Work more on draw 2020-11-14 18:28:05 -08:00
Sirius902
361b8627ec Work on BgGanonOtyuka_Draw 2020-11-14 17:25:30 -08:00
Sirius902
c6df7283bf Rename shockwave to flash 2020-11-14 15:39:24 -08:00
Sirius902
25135ca511 BgGanonOtyuka_Destroy 2020-11-14 15:36:38 -08:00
Sirius902
c62af97314 Add newline 2020-11-14 15:33:50 -08:00
Sirius902
3e101aab1b Name some more stuff 2020-11-14 15:32:46 -08:00
Sirius902
5ed7c3999b Cleanup more data 2020-11-14 15:27:16 -08:00
Sirius902
1ee91be458 Cool data stuff 2020-11-14 15:22:29 -08:00
Sirius902
eda0503985 Split gfx into another file 2020-11-14 14:14:48 -08:00
Sirius902
e5fffd74f8 Use texture symbol in dlist 2020-11-14 14:01:54 -08:00
Sirius902
d4fc865c7f Migrate data 2020-11-14 13:53:11 -08:00
Sirius902
17d0f9b57c BgGanonOtyuka_Init 2020-11-14 13:11:24 -08:00
Sirius902
49f150955b Merge remote-tracking branch 'upstream/master' 2020-10-29 20:00:50 -07:00
fig02
3c5fe66dcd
Use macros for oGfxCtx accesses (#465)
* fix colliderinit typo

* fix initchain

* reloc

* add defines

* add defines

* missed some on merge

* rename gfxCtx and add comment

* remove space
2020-10-29 17:31:09 -04:00
Tharo
92bb1fb210
Decompile the last of libultra_code_O2 (#464)
* Decompile osPfsFileState, move guMtxL2F to asm/

* Remove asm

* Add some prototypes to functions.h
2020-10-28 15:59:18 -04:00
Zelllll
af326f5b78
En_Niw (Cucco) OK (#429)
* Cucco progress

* Cucco decompiled, one non-matching

* Update z_en_niw.c

* Update z_en_niw.h

* Update z_en_niw.c

* Delete EnNiw_Destroy.s

* Delete EnNiw_Draw.s

* Delete EnNiw_Init.s

* Delete EnNiw_Update.s

* Delete func_80AB5BF8.s

* Delete func_80AB5FA0.s

* Delete func_80AB6100.s

* Delete func_80AB627C.s

* Delete func_80AB6324.s

* Delete func_80AB63A8.s

* Delete func_80AB840C.s

* Delete func_80AB70F8.s

* Delete func_80AB6D08.s

* Delete func_80AB6BF8.s

* Delete func_80AB6A38.s

* Delete func_80AB7F60.s

* Delete func_80AB6F04.s

* Delete func_80AB6570.s

* Delete func_80AB7204.s

* Delete func_80AB714C.s

* Delete func_80AB7328.s

* Delete func_80AB7290.s

* Delete func_80AB7420.s

* Delete func_80AB747C.s

* Delete func_80AB8168.s

* Delete func_80AB8258.s

* Delete func_80AB6EB4.s

* Delete func_80AB70A0.s

* Delete func_80AB6450.s

* Delete z_en_niw.data.s

* Delete z_en_niw.reloc.s

* Update undefined_syms.txt

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Add boolean suggestion

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Made suggested changes

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Most suggested changes made

* More changes made, fixed compiler error

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Cleaned up En_Niw

* Cleaned up En_Niw

* Cleaned up En_Niw

* Merged Cucco conflicts

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Made requested changes (Cucco)

* Added actor description

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.h

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.h

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.h

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.h

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

* Made requested En_Niw changes

* Removed DECR from En_Niw

* Reduced number of if (1)'s

* Update EnNiw

* Some Cucco documentation

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
2020-10-28 13:20:10 -04:00
fig02
6e000fcc54
En_Elf Decompiled (#432)
* init matched

* everything but navi OK

* progress

* 4 left

* remove asm

* progress

* progress

* asm and spec

* remove comment

* suggestion

* review1

* use type enum

* name func

* overridelimbdraw

* review 2

* forgot one

* merge master

* format
2020-10-28 13:02:35 -04:00
petrie911
3ba022128c
Bg_Hidan_Fwbig (#450)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* long firewall is long

* Fwbig documented, some cleanup on Zl1

* format

* merge and cleanup

* last things
2020-10-27 01:29:01 -04:00
Roman971
daf624fe48
Revert accidental rename of Matrix_MtxFToNewMtx (#460) 2020-10-26 20:47:43 -04:00
emilybrooks
ce3542f60c
ovl_bg_spot11_oasis OK (#454)
* Decompiled ovl_bg_spot11_oasis

* Forgot to rename the init chain

* Renamed draw function, corrected include statments, corrected the waterbox pointer assignment, removed early return, removed unnecessary cast

* Forgot to add a newline
2020-10-26 20:23:34 -04:00
louist103
eea81d97d8
BgJyaBombchuiwa OK (#452)
* Fixed upstream

* Almost done

* Done

* PR fixes

* PR fix

Co-authored-by: Louis <5883445+louist103@users.noreply.github.com>
2020-10-26 12:55:37 -04:00
petrie911
93fc51e9b6
Oshihiki (#441)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* matching

* format

* document and format

* .s files

* cleanup and macros in block-related actors

* fixed a few more things, also an error I cso an error I caught in another file.
2020-10-26 09:33:58 -04:00
Tharo
695552f0b8
code_800F7260 (#433)
* Split code_800F7260

* More function splits, migrate rodata

* Initial progress

* Small progress

* More substantial progress, finally figured out structs

* 2 functions left

* Move prototypes to functions.h

* Remove unused asm, move most externs to variables.h

* Fix merge

* Ran formatter

* Brackets to avoid && &

Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>

* More variables to variables.h

* Braces around early return

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

* ARRAY_COUNT in sBankSizes and remove unnecessary temp vars

Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-10-26 07:58:56 -04:00
Roman971
b4096eee34
Fix D_80854514 to not be cut off (#455) 2020-10-26 06:48:40 -04:00
Sirius902
9d427598cc Merge remote-tracking branch 'upstream/master' 2020-10-21 01:15:01 -07:00
zelda2774
9e5cbcdd57
Small asm-processor optimization (#459)
Co-authored-by: zelda2774 <zelda2774@invalid>
2020-10-18 19:10:31 -04:00
Sirius902
3fb19b68a4 Merge remote-tracking branch 'upstream/master' 2020-10-15 00:21:06 -07:00
Roman971
d02153707e
A few minor fixes/cleanups (#449) 2020-10-13 12:32:19 -04:00
Sirius902
860297681c Merge remote-tracking branch 'upstream/master' 2020-10-12 21:16:26 -07:00
Roman971
57db7ba526
Match a few more functions (#446) 2020-10-12 23:15:42 -04:00
Ethan Roseman
08c4065a5e
Decompiled ovl_Bg_Haka_MeganeBG (#448) 2020-10-12 20:44:22 -04:00
Sirius902
5c631e3170
ovl_En_Horse_Normal (#403)
* merge upstream

* Merge upstream

* Match EnHorseNormal_Init

* Work on EnHorseNormal_Draw (probably finish depending functions first)

* func_80A6CC88

* Work on EnHorseNormal_Draw

* Clang format

* Properly use OPEN_DISPS

* Stop using thisx lol

* Use the funny angle number

* Use &D_04049AD0 because it's not a display list?

* Stop using fun macros to fix stack

* EnHorseNormal_Draw

* EnHorseNormal_Destroy

* EnHorseNormal_Update

* Use disp macros EnHorseNormal_Draw

* Correctly type D_04049AD0

* func_80A6C570

* Name some draw stuff

* Fix names

* Make if condition more readable

* func_80A6B30C and fix incorrect  pointer types

* Function prototypes

* func_80A6B250

* Add header comment

* Move skin function to functions.h

* Change to stable

* Cleanup a little

* Match some more

* Work on func_80A6BE6C (won't compile yet)

* Work on func_80A6BE6C again

* Progress

* func_80A6CAFC

* Match all but one :)

* Work on func_80A6BE6C

* Work more on func_80A6BE6C

* Multiply floating point by integer lol

* Reorder assignment to almost match

* func_80A6BE6C

* Fix warning and remove unnecessary forward declarations

* Data section

* Cleanup data a bit

* More cleanup and clang format

* Clang format is a little confused

* More cleanup

* Formatting

* Revert formatting on z_bg_spot01_objects2.c

* Name unk_14C

* Add clone comment

* Name clonePos

* Name and cleanup

* Name some animation related stuff

* Remove unnecessary assignment

* Name cloneRotY

* Use ARRAY_COUNT for sAnimations

* Add more to unknown struct layout

* Use u8 for last struct member

* Use s32 for length

* Add padding disclaimer

* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c

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

* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c

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

* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c

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

* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c

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

* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c

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

* Various suggestions

* Replace 10430.378f

* Remove padding because alignment

* Move function array out of function

* Remove struct name being present twice unecessarily

* Oops forgot the s

* Don't separate static vars from others

* Some cleanup

* Use ARRAY_COUNT(sJntSphItemsInit)

* Minor cleanup

* Rename enum members

* Oops forgot to rename enum

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-10-12 18:45:16 -04:00
Tharo
fff616d2be
Decompile z_kanfont (#443)
* Decompile z_kanfont.c

* Cleanups

* off -> offset

* Kanfont -> Font , Keep so-far unused Font fields as padding, Remove MessageData sub-struct
2020-10-12 17:42:17 -04:00
fig02
ed719f3da0
Make Gamestates use thisx for entry point functions (#437)
* fix colliderinit typo

* fix initchain

* reloc

* thisx

* sample

* review

* forgot sample main
2020-10-11 21:52:50 -04:00
Random
b010db7c19
Decompile z_sram.c (#431)
* Decompile z_sram.c

* rename Sram_CalcChecksum to Sram_WriteSaveSlot

* progress

* done i think

* add original name comments

* temp substructs

* minor fixes

* review

* review 2

* fix

Co-authored-by: fig <fig02srl@gmail.com>
2020-10-11 13:45:08 -04:00
maekclena
9d35542207
ovl_En_Butte (#440)
* ovl_En_Butte

* Delete asm and inline static data

* Style

* PR review
2020-10-11 09:21:12 -04:00
i82orbom
6b3b4aa883
z_bg_gnd_soulmeiro.c OK (#439)
* Starts z_bg_gnd_soulmeiro.c

* Init

* Some more progress

* BgGndSoulmeiro_Draw

* Some more progress

* Matched

* Removes unused asm

* PR suggestions

* Update comment

Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-10-10 20:05:59 -04:00
Sirius902
e684b35eed Merge remote-tracking branch 'upstream/master' 2020-10-04 12:28:19 -07:00
i82orbom
9bfad1ebd6
z_en_kakasi.c OK (#428)
* Starts decompiling z_en_kakasi

* Destroy

* EnKakasi_Init

* func_80A8F660

* func_80A8F75C

* func_80A8F28C

* func_80A8F320 equivalent, non matching due to regalloc

* EnKakasi_Draw

* func_80A8FBB8

* func_80A8FAA4

* func_80A8F9C8

* z_en_kakasi.c OK (1 equivalent, 1 non-matching)

* Fixed one non matching

* z_en_kakasi.c OK

* Removes unused asm

* Some fixes

* Additional fixes

* PR fixes

* Rename angle reference to yaw

* Change low rotation values to decimal

Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-10-04 12:17:54 -04:00
i82orbom
353d4d134f
z_en_kakasi2.c (#427)
* Decompiles z_en_kakasi2

- EnKakasi2_Init

* Destroy

* func_80A90264

* Finishes z_en_kakasi2

* Remove unused data/reloc

* Some hex fixes

* Some fixes

* Addresses PR comments

* Rename temp to be more generic

* More var renaming, timer modulo

* Change low rotation values to decimal

Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-10-04 12:15:01 -04:00
kroemker
ca2c493374
Match EnIceHono (#335)
* Match EnIceHono

* Cleanup for PR

* Delete unused asm

* Fix formatting

* Requested style changes

* PR fixes

* More PR fixes

* PR fixes
2020-10-04 12:13:37 -04:00
Sirius902
213bac4657
ovl_En_Ishi (#425)
* merge upstream

* Merge upstream

* Use Petrie's data section

* Move assignment to declaration

* EnIshi_Init without messing with formatting

* EnIshi_Draw

* Update asm

* Remove war of the zeros

* Type function pointers

* Match a few

* Remove extra * in comment

* Progress

* func_80A7E5A8 and add translation

* Cleanup func_80A7E5A8 and work on func_80A7E824

* Work on func_80A7E824

* Cursed asf match for func_80A7E824

* Re-use variable in cursed function to avoid warning

* func_80A7F0A8

* func_80A7F514

* Use C data

* Various fixes

* Move data around

* Clang format and stuff

* Stuff

* Pretty suspicious just saying

* Add janky hack warnings

* Use enum for type

* Cleanup enum a bit

* Use small and large instead of rock and boulder

* Name EnIshi_SetupCollider

* Remove static var space

* Update translation

* Name some stuff

* Name sRockScales

* Use object id defines for func_80029E8C

* Properly type var to s16

* Make match slightly less fake

* Yay no more fake match for func_80A7E824!

* Use thisx all throughout func_80A7E824 for consistency

* Rename to EnIshi_InitCollider

* Remove asm

* Only use thisx where required in func_80A7E824

* Cleanup and naming

* More naming

* Naming

* Finish naming

* Rename sCylinderInit to sCylinderInits

* Actually finish naming

* Minor cleanup

* Header comment

* Format effect function usage properly

* More formatting

* Various changes

* Minor cleanup

* review

Co-authored-by: fig02 <fig02srl@gmail.com>
2020-10-04 12:00:15 -04:00
fig02
728a789a2f
Kibako Reloc (#436)
* fix colliderinit typo

* fix initchain

* reloc
2020-10-04 11:20:00 -04:00