1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-27 11:34:29 +00:00
Commit graph

757 commits

Author SHA1 Message Date
Sirius902
f7cd4e20e9 Name it prevInvincibilityTimer 2020-10-18 18:08:43 -07:00
Sirius902
011dab8cc8 Ugly match func_80A75FA0 2020-10-18 18:03:42 -07:00
Sirius902
8dd6f65756 Work a bit on func_80A75C38 2020-10-18 17:51:09 -07:00
Sirius902
2bc429161c Name stuff in func_80A76E2C 2020-10-18 12:00:22 -07:00
Sirius902
e7c24b58c1 Autocomplete sucks 2020-10-18 02:33:15 -07:00
Sirius902
88bc81daf5 Progress 2020-10-18 02:32:38 -07:00
Sirius902
e8b2417884 Progress 2020-10-15 14:24:09 -07:00
Sirius902
02e27c9502 Progress 2020-10-15 12:06:15 -07:00
Sirius902
1365f3e68b Merge branch 'master' into ovl_En_Ik 2020-10-15 00:21:28 -07: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
2941fd3540 Merge branch 'master' into ovl_En_Ik 2020-10-12 21:16:47 -07: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
558856d234 Eh early return probably makes more sense here 2020-10-06 12:50:58 -07:00
Sirius902
8046499566 Progress 2020-10-06 00:05:27 -07:00
Sirius902
37a020d139 Progress 2020-10-05 23:27:31 -07:00
Sirius902
5beac36d9e Progress 2020-10-05 22:10:31 -07:00
Sirius902
4137b6ba23 Progress 2020-10-05 21:39:26 -07:00
Sirius902
1b2beb745f func_80A74674 2020-10-05 21:10:55 -07:00
Sirius902
03ad7401bb match func_80A74BA4 2020-10-05 18:30:20 -07:00
Sirius902
a9eef3b022 Fix stack on func_80A74BA4 2020-10-05 17:56:13 -07:00
Sirius902
4920d40453 Better diff again 2020-10-05 17:53:57 -07:00
Sirius902
d824f48039 Slightly better diff 2020-10-05 17:48:38 -07:00
Sirius902
f56668c8e2 Merge branch 'master' into ovl_En_Ik 2020-10-04 12:31:32 -07: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
petrie911
704598652a
Kibako (#420)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* box

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h

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

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

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

* kakera macros

* kakera macros

* names

* one more rename

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-10-04 11:16:21 -04:00
i82orbom
fcea7c23a4
z_en_kakasi3.c OK (#430)
* Decompiles z_en_kakasi3.c

* EnKakasi3_Init

* Some more progress

* 2 remaining

* func_80A918E4

* z_en_kakasi3.c OK

* PR suggestions

* Additional PR fixes

* Removes not needed var in z_en_kakasi3.h struct

* Another PR rev round

Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-10-04 10:39:21 -04:00
Electrk
4dfc9d3c3c
BgSpot03Taki (#414)
* Migrate data, fix header, add undefined symbol, decompile Init function

* Decompiled Destroy function

* Decompiled func_808ADEF0 and adjusted struct some

* Decompiled Update function

* Fixed sInitChain stuff

* Preliminary Draw function decompilation

* Replaced code with OPEN_DISPS and CLOSE_DISPS and some hex with decimal

* Working on Draw function still

* More permuter test stuff

* Got Draw matching except for one little TwoTex issue

* Added NON_MATCHING

* Removed false alarm

* Got most of the functions decompiled; 1 non-matching, 1 not started

* Ran format.sh on file

* These two symbols should be arrays

* Got func_808ADAE0 mostly decompiled

* Got func_808ADAE0 fully decompiled!

* Removed necessary files (except _Draw)

* Successfully decompiled Draw function

* Decompiled Draw function
+ Added proper includes to spec

* Removed Draw function assembly

* Moved func_800F46E0 prototype to functions.h

* Renamed unk_174 to bufferIndex

* Replaced state constants with enum

* Renamed func_808ADAE0 to BgSpot03Taki_ApplyOpeningAlpha

* Renamed func_808ADAE0 to BgSpot03Taki_ApplyOpeningAlpha

* Made changes as per pull request comments

Co-authored-by: fig02 <fig02srl@gmail.com>
2020-10-04 10:14:28 -04:00
fullgrowngaming
85cf70bcd3
En_Rl OK (#378)
* Approx. half of en_rl matched

* More En_Rl work

* 5 functions left

* One function left

* En_Rl OK and all matching

* Formatted and cleaned up style things.

* Deleted asm and fixed spec

* Forgot to delete the stuff in the data folder again

* Made all requested changes.

* Forgot one requested change

* Implemented dragorn's documentation suggestions

* Implemented dragorn's documentation suggestions

* Made further requested changes

Co-authored-by: fig02 <fig02srl@gmail.com>
2020-10-04 10:09:20 -04:00
fig02
269aa0f36f
en_reeba OK (#434)
* leever progress

* leever progress

* leever progress

* 2 non matchings

* test

* merge master, match two functions

* progress

* OK

* revert permissions change

* remove unwanted file

* review

* use decr

* merge

* merge and review

* early return

* vt
2020-10-04 09:17:44 -04:00
petrie911
5d39ae1cc7
Rakkatenjo (#419)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* bonk

* static var cleanup

* one more rename
2020-10-04 08:58:33 -04:00
petrie911
4ac8e70f5a
Obj_Syokudai (#412)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* torches

* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

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

* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

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

* cleanup

* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

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

* small cleanup

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-10-04 08:54:09 -04:00
petrie911
a52743e8cd
Bg_Hidan_Curtain (#411)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* flame circles

* merge and description

* Update src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c

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

* formatting and other cleanup

* names

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-10-04 08:48:48 -04:00
petrie911
3576f4c169
Po event (#368)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* and now for poe sister stuff

* more matches

* awful control flow still needed

* complex control is comples

* matched and documented

* also remove .s

* ZAP

* .s files never die

* more cleaning

* a little more cleanup

* data cleanup

* merge and fix

* removing globalCtx2

* dlists

* forgot this

* now with ColHeader

* a little more

* one last name change
2020-10-04 08:45:23 -04:00
Dragorn421
2cea0d8b82
Fix ichaindis.py always outputting an unsigned value (#435) 2020-10-03 22:38:39 -04:00
petrie911
686b44d8f8
Bg_Mori_Kaitenkabe (#410)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* spinny wall

* cleanup

* wait for mori tex

* merge and better (?) names
2020-10-03 22:18:41 -04:00
Sirius902
046d0f2a44 Use quotes for vt import 2020-10-03 16:37:30 -07:00