1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-09 22:15:03 +00:00
Commit graph

886 commits

Author SHA1 Message Date
angie
0455594c8d
changes asked by @louist103
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-30 02:28:19 -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
Zelllll
20c1f4e648
Decompile Gameplay_Keep and fix all existing decompiled objects (#595)
* First batch of files

* Add missing folders back

* Fix missing folders again

* Finish fixing existing texture files

* Gameplay_Keep XML finished

* Most actor gameplay_keep undefined syms removed

* Only ~200 gkeep symbols remain

* All gkeep symbols that ZAP supports are fixed

* Cleanup, and make gkeep names more accurate

* Starting to figure out what some unknown blobs are, merge zeldaret in

* fix a few more things

* refactor gkeep

* Change how gitkeep is handled

* gkeep xml cleanup

* Gkeep finished, now just waiting up ZAP updates

* 100 link animations finished

* 150 link animations finished

* 200 link animations finished

* 250 link animations finished

* 350 link animations finished

* 400 link animations finished

* 450 link animations finished

* 500 link animations finished

* 550 link animations finished

* All Link animations finished

cannot build yet because ZAP doesn't have LinkAnimationHeader yet

* xml changes for new zap stuff

* finish gameplay_keep

* fixing existing objects

* ready for pr besides zap padding issue

* mostly ready for pr

* format all c files

* all conflicts fixed

* make changes that roman requested

* fix thing i didn't mean to change

* some animation symbols renamed

* fixed roman's stuff

* lifemeter hardcoded pointers removed

* fix issue with incorrect data in gameplay_keep

* removed unused asm

* fixed most of fig's comments

* fix all of fig's comments

* reformat files

* Update assets/xml/textures/icon_item_static.xml

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

* Update assets/xml/textures/icon_item_static.xml

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

* fixed stuff

* fixed most of roman's comments

* remove leading zeroes

* should build now

* git subrepo pull --force tools/ZAPD

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

* all of gkeep symbols fixed

* compiler error fixed

* format files

* final changes

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-24 19:36:40 -05:00
angie
22da97e9f3
remove defined symbols from undefined_syms
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-23 15:03:48 -03:00
angie
2d95db923d
delete reloc
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-23 14:47:01 -03:00
angie
05438ae79a
fix merge problems
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-23 01:30:04 -03:00
angie
48964ff2a8
Merge remote-tracking branch 'upstream/master' into ovl_Eff_Dust 2021-01-23 01:22:30 -03:00
angie
272fc5ca0f
format files
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-23 01:20:46 -03:00
angie
82bba72375
Add an enum for the possibles values for actor.param
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-23 00:49:17 -03:00
Zelllll
84195fcef6
Bg_Spot06_Objects OK and documented (#605)
* stuck on init

* init matches

* more functions matched

* just a few functions left

* three functions left

* all finished

* fix compiler error

* various improvements

* add actor description

* remove unused asm

* fix remaining dyna things

* Update src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c

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

* Update src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c

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

* fixed all of roman's comments

* format c files

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2021-01-22 19:55:38 -05:00
Anghelo
4b81648341 Rename a few variables and functions
Signed-off-by: Anghelo <angheloalf95@gmail.com>
2021-01-22 19:45:16 -03:00
fig02
588de66d06
git subrepo pull --force tools/ZAPD (#653)
subrepo:
  subdir:   "tools/ZAPD"
  merged:   "2e1174063"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "2e1174063"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
2021-01-22 16:25:08 -05:00
Anghelo
191c962c22 void func_8099E4F4(EffDust *this, GlobalContext *globalCtx) matching
Signed-off-by: Anghelo <angheloalf95@gmail.com>
2021-01-22 15:21:29 -03:00
Anghelo
c4d302387f Rename most members of the struct
Signed-off-by: Anghelo <angheloalf95@gmail.com>
2021-01-22 13:37:22 -03:00
Anghelo
be1ea6ca30 void func_8099E784(EffDust *this, GlobalContext *globalCtx)
Signed-off-by: Anghelo <angheloalf95@gmail.com>
2021-01-22 13:19:08 -03:00
Anghelo
73878dc6ce func_8099E784 matching. needs cleanup
Signed-off-by: Anghelo <angheloalf95@gmail.com>
2021-01-22 12:42:11 -03:00
Anghelo
56128e9f80 almost there (func_8099E784)
Signed-off-by: Anghelo <angheloalf95@gmail.com>
2021-01-22 12:19:42 -03:00
Anghelo
936ddfa923 func_8099E784 still not matching
Signed-off-by: Anghelo <angheloalf95@gmail.com>
2021-01-22 11:26:37 -03:00
Anghelo
428c3cc81e NON_MATCHING func_8099E784 - score 100
Signed-off-by: Anghelo <angheloalf95@gmail.com>
2021-01-22 10:36:12 -03:00
angie
68dac2dcc0
NON_MATCHING void func_8099E784(EffDust *this, GlobalContext *globalCtx)
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-22 02:22:54 -03:00
Anghelo
1f5595a01a void func_8099DFC0(EffDust *this, GlobalContext *globalCtx)
Signed-off-by: Anghelo <angheloalf95@gmail.com>
2021-01-21 22:09:16 -03:00
Zelllll
d739765031
Bg_Haka_Zou OK (#598)
* started init, not matched yet

* all except init matched

* haka_zou OK

* haka_zou done

* fix jenkins problem

* various improvements

* removed unused asm

* fixed things

* fixed new dyna names

* more dyna fixes

* ok now?????

* this better build OK

* applied roman's suggestions

* function renames

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-21 10:21:05 -05:00
Blackop778
3f669bea1e
Decompile Bg Jya Cobra (#588)
* Start work on Jya Cobra

* Match two functions

* Work on func_80896ABC

* func_80896CB4 and most of func_80896D78

* Fix func_80895BEC, clean up func_80896ABC

* Work on func_80896EE4

* Match func_80896EE4

* Nearly match func_80895A70, finish BgJyaCobra_Draw

* Match func_808969F8, start on func_80895C74

* Work on func_80895C74 and func_80895EF0, data move
Also ran permuter

* Some cleanup

* Almost match func_80895C74, tiny bit of work on func_80895EF0

* Remove variables in func_80895EF0

* Make init match nicer

* Work on func_80896518

* Progress in func_80896518

* Figured something out in func_80896518
Going to experiment with stack stuff

* func_80896518 has tiny stack and regalloc issues

* Work on func_80895EF0

* Some work on func_80895EF0

* Update diff script

* Work on func_90995EF0
Use 2d array indexing in func_80895EF0
Small regalloc improvement in func_80896518
Change not equal to to less than where possible

* match func_80896ABC and func_80896D78

* Improve func_80895EF0 a bit

* Do some cleanup

* Change commented out functions to ifdefs

* Another bit of cleanup

* Run formatter

* Remove now unused include

* Another another bit of cleanup

* Revert update to diff script

* PR suggestions

* PR comments

* PR comments, a bit of documentation

* Run formatter

* Apply suggestions from code review

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

* More PR comments

* actor fixes

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-21 09:55:11 -05:00
Roman971
70a3acf111
Match Player_Init (player_actor OK) (#651) 2021-01-21 08:48:21 -05:00
Anghelo
9c78969ddb NON_MATCHING void func_8099E4F4(EffDust *this, GlobalContext *globalCtx)
Signed-off-by: Anghelo <angheloalf95@gmail.com>
2021-01-21 08:51:06 -03:00
EllipticEllipsis
0e76c84c45
EnMThunder, 1 nonmatching (#604)
* Data migrated, all but Draw matched

* Draw likely equivalent
but serious regalloc issues,
and that last Gfx_TwoTexScroll is being very stubborn

* Merge remote-tracking branch 'upstream/master' into Thunder

* some improvements, set up to PR as nonmatching

* spec

* corrected header

* added function to functions.h

* delete asm

* Added new collider init

Co-authored-by: fig02 <fig02srl@gmail.com>
2021-01-21 00:47:38 -05:00
Random
be84e1f0f8
Add Cygwin support (#594)
* Add Cygwin support

* revert .gitignore changes

* Add Cygwin instructions

* corrections

* specify dependencies in README.md
2021-01-20 14:46:25 -05:00
maekclena
d2563b3b91
ovl_En_Hy (#602)
* ovl_En_Hy

* Remove extra EOL

* Rebase + PR review
2021-01-20 13:28:04 -05:00
Tharo
3daeaf2446
Reduce hardcoded sizes for a few data tables (#646)
Co-authored-by: Thar0 <maximilianc64@gmail.com>
2021-01-20 13:15:17 -05:00
Anghelo
39fa5ad8c1 Members renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com>
2021-01-20 11:47:38 -03:00
petrie911
7c6b953f38
Change DECR to use -- (#649)
* DECR fix

* cleanup on some literals

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-19 14:27:57 -05:00
petrie911
cb9d85de34
relocs (#645)
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-18 19:15:04 -05:00
petrie911
15cf179fc2
En_Owl and En_Viewer OK (#642)
* match viewer

* owl ok

* format

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-18 18:52:55 -05:00
fig02
04ea6b1395
Quick type fix (#644)
* quick fix

* functions.h
2021-01-18 16:36:41 -05:00
fig02
00a5edea71
Actor Struct Changes (and a few related things) (#617)
* reformat header

* type -> category

* done for now i think

* some more stuff

* first -> head

* focus

* flag comment

* ground -> floor

* remove asm, name wrapper funcs

* name func, format

* review

* targetPriority, format

* 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"

* comment

* review

* feet flags

* horse shadow
2021-01-18 16:04:04 -05:00
angie
52298c1ffa
void EffDust_UpdateFunc_8099DD74(EffDust *this, GlobalContext *globalCtx)
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-18 00:28:20 -03:00
angie
6cb3ef2e41
void func_8099DB28(EffDust *this, GlobalContext *globalCtx)
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-18 00:17:49 -03:00
zelda2774
20206fba0d
Fix non-matching in audio_heap (#640)
Co-authored-by: zelda2774 <zelda2774@invalid>
2021-01-17 21:31:47 -05:00
petrie911
02994f5339
Document Collision_Check (#468)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* some decomp

* still playing around with this

* rename functions

* ZAP again

* ZAP again

* the renaming begins

* more renaming. hopefully didn't break anything

* change all the things

* this and then merge

* and done

* one little thing

* small docs, small rename

* changed mind on cylinder and quad elements

* something

* more stuff

* more docs

* more adjustments

* Fixed some types

* more fixes

* all sorts of cleanup

* now with flags

* match!

* names and such

* update tools

* damage tables

* ColChkInfo

* one more thing

* formatting

* more formatting

* anime merge

* some stuff

* damage table

* again

* changes

* .s

* changes

* oc2 type

* a couple things

* format

* un-name magic arrows, not enough proof yet

* fix damage table script and remove old one

* EnAObj

* changes

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-17 21:13:36 -05:00
angie
fe676802fa
void func_8099D8E0(EffDust *this)
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-17 21:25:11 -03:00
angie
2127777234
EffDust_Update, EffDust_Draw, renaming and cleanup
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-17 17:33:02 -03:00
angie
c57b9e2946
void EffDust_Init(Actor *thisx, GlobalContext *globalCtx)
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-17 17:16:16 -03:00
angie
ef7ca54add
Fix functions declarations
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-17 15:53:18 -03:00
angie
678233f749
Fix some pointers in the struct
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-17 15:32:52 -03:00
angie
c9ae3d5d3a
void EffDust_Destroy(Actor *thisx, GlobalContext *globalCtx)
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-16 21:18:36 -03:00
angie
ca4d40a2b1
void func_8099D8D8(void *arg0, s32 arg1)
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-16 19:26:59 -03:00
angie
2a1abee058
void func_8099D8D0(void *arg0, s32 arg1)
Signed-off-by: angie <angheloalf95@gmail.com>
2021-01-16 19:25:02 -03:00
engineer124
f786f958bb
En_Viewer (one non-matching) (#570)
* init commit

* en_viewer 20/24 functions decompiled

* en_viewer 22/24 functions decompiled

* EnViewer 1 func non-matching, down to stack

* cleanup, 1 non-matching

* ran formatter

* remove extra space in undefined_syms.txt

* remove data.s

* update math & skelAnime names

* pr feedback

* review

* semicolon

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-16 12:33:37 -05:00
AdamKiddle
9be264da9d
TwoHeadArena Cleanup (#633)
* TwoHeadArena cleanup

* remove params

* remove params

* prettying up the struct a little

* remove unecessary cast
2021-01-15 17:18:15 -05:00
silv3rwing07
447c6514b9
Fixed descriptions of Zelda's Lullaby, Song of Time, and Scarecrow's Song effect actors (#579)
* Fixed descriptions of Zelda's Lullaby, Song of Time, and Scarecrow's Song effect actors

* Added enums for song types

* fixes

Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-15 16:50:44 -05:00