mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-02 17:44:25 +00:00
Code Issues Projects Releases Wiki Activity
948 commits 1 branch 0 tags 501 MiB
Commit graph

948 commits

This branch
This branch
All branches
Author SHA1 Message Date
angie
12e0e5d2a6 Merge branch 'ovl_Demo_Gj' of github.com:AngheloAlf/oot into ovl_Eff_Dust 2021-01-31 23:54:15 -03:00
angie
777c1ce913
Merge remote-tracking branch 'upstream/master' into ovl_Demo_Gj 2021-01-31 23:49:12 -03:00
angie
b251f1d234
Merge remote-tracking branch 'upstream/master' into ovl_Eff_Dust 2021-01-31 23:47:19 -03:00
EllipticEllipsis
1fbc0f1943
Gerudo3 OK and documented (#593) 
* Ge3: OK and data migrated

* Functions and most variables named

* finished enums for limbs, inlined data

* spec updated, asm deleted

* fix dists

* changes

* changes

Co-authored-by: Fig02 <fig02srl@gmail.com>
 2021-01-31 18:39:41 -05:00
Tharo
badb1d9d5e
ovl_Demo_Kankyo OK (#608) 
* Decompiled, not yet matched

* Another match

* Fix merge

* OK

* Move cutscene data to separate source files, name some functions and variables

* Small cleanup

* Some docs

* Small improvements

* Struct_Unk_150 -> DemoKankyo_Unk_150

* Review Suggestions

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

* Further review changes

* rm reloc asm

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2021-01-31 18:38:23 -05:00
Zelllll
5da5263176
En_Cs OK and mostly documented (#639) 
* all except one matching

* documented and ready for pr

* remove unused asm

* change mass thing
 2021-01-31 18:32:19 -05:00
Zelllll
da993894d3
En_Daiku_Kakariko OK (Kakariko Village Carpenters) (#635) 
* mostly done, one function left

* daiku_kakariko OK

* should be ready for pr

* removed unused asm

* should build OK now

* builds OK now

* all of fig's suggestions resolved
 2021-01-31 18:14:47 -05:00
petrie911
8137c016a2
Demo_Ik (#620) 
* match

* docs might be a while

* cues

* .s

* review

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
 2021-01-31 15:33:48 -05:00
louist103
45a21b0ac7
EnNy OK (#624) 
* get data in

* Match Init and one other

* match some more

* match a bunch more

* merge master

* OK

* Some naming done

* OBJECT_NY almost done. waiting on ZAP changes

* Remove ASM

* Cleanup

* Commit before merge

* fix damage table

* Change comment
 2021-01-31 15:32:55 -05:00
Zelllll
a25ae3a584
En_Mk OK (lakeside lab dude) (#616) 
* en_mk OK

* ready for pr

* ok now

* anim mode enums

* fixed dodojr

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
 2021-01-31 15:26:34 -05:00
Zelllll
9b91229422
Bg_Spot00_Hanebasi (Drawbridge) OK (#614) 
* drawbridge progress

* matched cursed draw functions

* drawbridge OK

* fix error that made it not OK

* documentation improvements

* format fix

* update with new actor struct

* Update src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

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

* Update src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

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

* Update src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

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

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2021-01-31 15:09:04 -05:00
Zelllll
dde70e3c66
En_Dodojr (Baby Dodongo) OK (#609) 
* some functions finished

* some more progress

* a bit more progress

* more functions done, one wip

* 2 functions remain

* one function remains

* actor mostly done, still one function left

* some progress, still not equivalent

* dodojr OK

* dodojr ready

* correct actor struct

* Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c

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

* Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c

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

* Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c

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

* builds OK now

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2021-01-31 14:59:50 -05:00
Tharo
3e322f5d35
ovl_En_Sa (#625) 
* Decompiled

* Add missing sfx id name

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

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
 2021-01-31 14:35:58 -05:00
Tharo
31b0ea2db8
ovl_En_Du (#630) 
* Decompiled

* asm

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
 2021-01-31 14:01:16 -05:00
Lucas Shaw
6fd644dff5
libm.s -> ll.c (#661) 
* .

* remove tools/ZAP2 from origin master

* libm.s -> ll.c

* fix progress.py (i think?)
 2021-01-31 13:27:50 -05:00
engineer124
8e8421fdec
Gorons: En_Go & En_Go2 OK (#556) 
* moved en_go rodata

* EnGo 20/45 functions decompiled

* EnGo 25/45 functions decompiled

* EnGo 28/45 functions decompiled

* EnGo 32/45 functions decompiled

* minor attempts

* init Goron 2 6/98 decompiled (baby functions)

* Goron2 14/98 func decompiled

* Goron2 30/98 func decompiled

* EnGo 34/45 functions decompiled

* EnGo 38/45 functions decompiled

* Goron2 44/98 functions decompiled

* Goron2 58/98 functions decompiled

* Merged EnGo and EnGo2: 38/45, 58/98 functions decompiled

* EnGo EnGo2: 38/45, 65/98 functions decompiled

* EnGo EnGo2: 38/45, 70/98 functions decompiled

* EnGo EnGo2: 39/45, 72/98 functions decompiled

* EnGo EnGo2: 39/45, 80/98 functions decompiled

* EnGo EnGo2: 39/45, 88/98 functions decompiled

* EnGo EnGo2: 39/45, 92/98 functions decompiled

* typo in GoronType

* EnGo EnGo2: 40/45, 93/98 functions decompiled

* EnGo EnGo2: 45/45, 93/98 functions decompiled

* EnGo EnGo2 fully decomped

* begin cleanup

* the cleanup continues

* continue cleaning

* Documentation and renaming attempt

* more cleanup

* more cleanup

* Apply suggestions from code review

Committing suggestions

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>

* more pr suggestions

* more pr and gns feedback

* fixed comment

* cleanup

* update math & skelAnime names

* goron1

* goron2

* relocs

* review

Co-authored-by: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: fig <fig02srl@gmail.com>
 2021-01-31 13:02:28 -05:00
engineer124
9f3e8cbf97
En_Fz Freezard (#519) 
* En_Fr 47 of 48 func decomped

* En_Fz Frezzard 26/36 func decompiled

* En_Fz Freezard fully decomped

* revert EnFr to independently submit EnFz

* EnFz fully decompiled

* more cleanup

* pr feedback

* pr feedback

* petries review

* asm

* review

Co-authored-by: Fig02 <fig02srl@gmail.com>
 2021-01-31 18:47:34 +01:00
EllipticEllipsis
c2b5ae3ed2
EnTr, 1 nonmatching, mostly documented (#621) 
* 2 functions left, data imported

* one function left

* setup for NON_MATCHING

* struct variables named

* most of the functions named, type enums

* delete ASM

* Actor fixes
 2021-01-31 00:07:58 -05:00
angie
24c4f0201c
Merge remote-tracking branch 'upstream/master' into ovl_Demo_Gj 2021-01-30 17:10:12 -03:00
angie
b8ada3cd35
Merge remote-tracking branch 'upstream/master' into ovl_Eff_Dust 2021-01-30 16:55:51 -03:00
petrie911
9607ce34fd
object_torch2, object_blkobj, and object_geldb (#592) 
* objects are fun

* more objects

* again

* fixes to geldb

* one more thing

* forgot s

* type fix

* some formatting

* change Gerudo name

* git subrepo pull --force tools/ZAPD

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

* organize xmls

* outname

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
 2021-01-30 14:16:18 -05:00
AdamKiddle
3db87244b4
EnTrap OK (#615) 
* Manual migration of work to new branch due to screwing up git

* removing unused asm

* formatting

* Fixing a comment

* Adding a missing sound define
 2021-01-30 13:29:37 -05:00
petrie911
6f6270100b
En_Horse_Game_Check (#619) 
* stuff

* name functions

* whoops

* horse head

* matched and documented

* merge actor

* relocs

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
 2021-01-30 13:17:43 -05:00
angie
0455594c8d
changes asked by @louist103 
Signed-off-by: angie <angheloalf95@gmail.com>
 2021-01-30 02:28:19 -03:00
Anghelo
18d4776b64 Changes asked by @shawlucas 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
 2021-01-29 15:05:20 -03:00
angie
777a710570
format 
Signed-off-by: angie <angheloalf95@gmail.com>
 2021-01-28 22:25:14 -03:00
angie
ee8bf86091
i'm hating this actor 
Signed-off-by: angie <angheloalf95@gmail.com>
 2021-01-28 22:18:58 -03:00
Anghelo
d3d592f09c More renaming 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
 2021-01-28 18:47:03 -03:00
Anghelo
01c5ca72b6 vt, arrayfuncs renaming and another bit of renaming 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
 2021-01-28 10:48:15 -03:00
Anghelo
7c7c876221 fix reg macros and a few comments 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
 2021-01-28 08:44:39 -03:00
angie
af07cb5f5c
another chunk of renaming 
Signed-off-by: angie <angheloalf95@gmail.com>
 2021-01-28 01:06:55 -03:00
angie
40aa6f0677
a bit of renaming 
Signed-off-by: angie <angheloalf95@gmail.com>
 2021-01-28 00:28:04 -03:00
angie
2ab385bde3
erase reloc 
Signed-off-by: angie <angheloalf95@gmail.com>
 2021-01-28 00:04:36 -03:00
angie
a53a2e7601
last non matching function 
Signed-off-by: angie <angheloalf95@gmail.com>
 2021-01-27 23:51:11 -03:00
angie
8f80240c8e
func_80978B90 
Signed-off-by: angie <angheloalf95@gmail.com>
 2021-01-27 23:33:23 -03:00
angie
177aab5f44
func_809797E4 
Signed-off-by: angie <angheloalf95@gmail.com>
 2021-01-27 22:47:54 -03:00
angie
eacc42001c
DemoGj_FindGanon 
Signed-off-by: angie <angheloalf95@gmail.com>
 2021-01-27 21:58:14 -03:00
Anghelo
2bc133ef08 three more 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
 2021-01-27 19:51:21 -03:00
Anghelo
b36e257517 func_80978AFC 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
 2021-01-27 18:30:45 -03:00
Anghelo
59e4d104d8 three not matching functions 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
 2021-01-27 17:45:41 -03:00
Anghelo
ef2f7e5a66 Merge remote-tracking branch 'upstream/master' into ovl_Eff_Dust 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
 2021-01-27 15:13:08 -03:00
Anghelo
7d056884b5 func_8097923C doesn't want to match :c 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
 2021-01-27 10:08:49 -03:00
angie
5ba3eb50b8
func_80978F60 and func_80979860 
Signed-off-by: angie <angheloalf95@gmail.com>
 2021-01-27 00:39:27 -03:00
Anghelo
3356fb91c4 seven equals and problematic functions 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
 2021-01-26 18:18:12 -03:00
Anghelo
4b9af9eee9 Array of cylinders and two other functions 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
 2021-01-26 16:22:13 -03:00
Anghelo
efeae53e62 five repeated functions 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
 2021-01-26 13:00:15 -03:00
Anghelo
764f972e61 func_8097BA48 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
 2021-01-26 10:50:45 -03:00
angie
506406f9f4
func_80978C20 
Signed-off-by: angie <angheloalf95@gmail.com>
 2021-01-26 00:03:53 -03:00
angie
e8d79dff7d
six more functions 
Signed-off-by: angie <angheloalf95@gmail.com>
 2021-01-25 23:53:15 -03:00
Anghelo
c7137f34d7 small types fixes 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
 2021-01-25 19:37:53 -03:00