e48e565ffe
object_hidan_objects OK ( #695 )
...
* xml
Signed-off-by: angie <angheloalf95@gmail.com >
* add to spec and remove repetaed entries
Signed-off-by: Angie <angheloalf95@gmail.com >
* add some dlists
Signed-off-by: Angie <angheloalf95@gmail.com >
* add a few offsets
Signed-off-by: Angie <angheloalf95@gmail.com >
* fireballs textures
Signed-off-by: Angie <angheloalf95@gmail.com >
* add some unused dlists
Signed-off-by: Angie <angheloalf95@gmail.com >
* change the references in decompiled objects
Signed-off-by: angie <angheloalf95@gmail.com >
* change the references from non matching actors
Signed-off-by: angie <angheloalf95@gmail.com >
* add blob
Signed-off-by: angie <angheloalf95@gmail.com >
* changes requested by @Zelllll
Signed-off-by: angie <angheloalf95@gmail.com >
* why is this object so big?
Signed-off-by: angie <angheloalf95@gmail.com >
* rename a lot of stuff
Signed-off-by: Angie <angheloalf95@gmail.com >
* this object never ends
Signed-off-by: angie <angheloalf95@gmail.com >
* Some floats
Signed-off-by: angie <angheloalf95@gmail.com >
* stones blocks
Signed-off-by: angie <angheloalf95@gmail.com >
* rename fireball and stuff
Signed-off-by: Angie <angheloalf95@gmail.com >
* Stationary flame thrower
Signed-off-by: Angie <angheloalf95@gmail.com >
* SpinningFlamethrower
Signed-off-by: Angie <angheloalf95@gmail.com >
* Rename the lasts textures
Signed-off-by: Angie <angheloalf95@gmail.com >
* some random renamings
Signed-off-by: Angie <angheloalf95@gmail.com >
* run format
Signed-off-by: Angie <angheloalf95@gmail.com >
* Remove .gitkeep
Signed-off-by: angie <angheloalf95@gmail.com >
2021-03-18 03:23:59 -04:00
6b9a44e5a0
object_gj OK ( #698 )
...
* xml
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* add spec
Signed-off-by: angie <angheloalf95@gmail.com >
* replace all hardcoded pointers in demo_gj
Signed-off-by: angie <angheloalf95@gmail.com >
* add the rest of the unaccounted data as a blob
Signed-off-by: angie <angheloalf95@gmail.com >
* i forgot to erase a undefined_sym
Signed-off-by: angie <angheloalf95@gmail.com >
* name everything in object_gj
Signed-off-by: angie <angheloalf95@gmail.com >
* Categorize by how are ussed each rubble
Signed-off-by: Angie <angheloalf95@gmail.com >
* forgot to erase the externs
Signed-off-by: angie <angheloalf95@gmail.com >
* the cool laser meme is ded
Signed-off-by: angie <angheloalf95@gmail.com >
* delete gitkeep
Signed-off-by: angie <angheloalf95@gmail.com >
2021-03-17 17:53:05 -04:00
d3311f9a29
Various objects ( #677 )
...
* object_okuta
* object_crow
* object_wallmaster
* named wallmaster textures
* object_dodongo
* object_firefly
* object_fire
2021-03-17 17:06:56 -04:00
7b68e8b771
object_anubice OK ( #696 )
...
* xml
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* add all the object to xml
Signed-off-by: Angie <angheloalf95@gmail.com >
* add object to srccode
Signed-off-by: Angie <angheloalf95@gmail.com >
* A bit of naming
Signed-off-by: angie <angheloalf95@gmail.com >
* final rename
Signed-off-by: angie <angheloalf95@gmail.com >
* add unused particle
Signed-off-by: angie <angheloalf95@gmail.com >
* rename unused particle dls
Signed-off-by: angie <angheloalf95@gmail.com >
* delete gitkeep
Signed-off-by: angie <angheloalf95@gmail.com >
* run format.sh
Signed-off-by: angie <angheloalf95@gmail.com >
2021-03-17 21:22:06 +01:00
7f55e088e5
Match ObjMure2_SetPosShrubCircle ( #721 )
...
* Match ObjMure2_SetPosShrubCircle
* reloc
Co-authored-by: zelda2774 <zelda2774@invalid>
2021-03-17 19:52:14 +01:00
8a730123b6
DoorKiller OK ( #631 )
...
* Init done
* slight tweak
* Destroy done
* func_80995020
* func_809951C4 done
* started func_80995A84
* func_80995A84, func_80995284, func_809952B8 done
* started the mess that is func_80995368
* most functions done except for 3 trouble cases
* func_80995368 done
* func_809958E4 done
* fully matching. Documentation and cleanup to come
* fixed fake matches
* documentation progress
* More documentation
* getting close on tidying up everything
* Finalised documentation and made some comments and name changes in player and other door files
* formatting and final touches to comments
* pr stuff
* merge master
* merge
* format
* remove unused asm after merge
* review
* \n
Co-authored-by: fig02 <fig02srl@gmail.com >
2021-03-14 11:21:15 -04:00
ca5a9aa7d1
EnEncount2 and EnFireRock OK ( #659 )
...
* first two funcs done
* fixing struct var name due to external use
* func_80A07CA4 done
* started EnEncount2_Update
* EnEncount2_Update done
* Encount2 done!
* EnFireRock_Init done (but will only match once initvars are uncommented
* progress
* 4 funcs left
* Fully matching
* minor formatting
* renames
* change structs back to normal
* formatting
* removing unused comments
* even more formatting stuff
* removed unused asm
* pr stuff
* pr stuff
* added newline at end of file
* some merge suggestions
* more pr stuff
* review
Co-authored-by: fig02 <fig02srl@gmail.com >
2021-03-14 10:39:41 -04:00
8e0fa07a7e
ovl_Item_Shield OK ( #717 )
...
* ovl_Item_Shield OK
* ovl_Item_Shield fix spec
* review changes
* review comments 2
2021-03-11 15:47:00 -05:00
7c5ae8cc03
ovl_bg_haka_ship OK ( #712 )
...
* 2 non matchings left
* decompiled ovl_Bg_Haka_Ship
* review suggestions
* parent/child (Actor*)
* removed unneeded cast
* removed DECR
* review 2 suggestions, removed some redundant parentheses
2021-03-10 19:02:22 -05:00
80d0b2785d
ovl_En_Brob OK ( #708 )
...
* ovl_En_Brob OK
* Review changes
2021-02-28 10:43:25 -05:00
2b70c84307
ovl_Demo_Du OK ( #683 )
...
* DemoDu_Init and externed data
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* functions called by init
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* DemoDu_Destroy
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* DemoDu_Update
Signed-off-by: angie <angheloalf95@gmail.com >
* DemoDu_Draw
Signed-off-by: angie <angheloalf95@gmail.com >
* func_80969FD0
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8096B840
Signed-off-by: angie <angheloalf95@gmail.com >
* two non matching functions
Signed-off-by: angie <angheloalf95@gmail.com >
* import data
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8096BF60
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8096BF54
Signed-off-by: angie <angheloalf95@gmail.com >
* about half of the updates functions
Signed-off-by: angie <angheloalf95@gmail.com >
* almost the other half of update functions
Signed-off-by: angie <angheloalf95@gmail.com >
* the rest of the updates functions
Signed-off-by: angie <angheloalf95@gmail.com >
* DemoDu_UpdateEyes
Signed-off-by: angie <angheloalf95@gmail.com >
* bunch of functions
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8096A970
Signed-off-by: angie <angheloalf95@gmail.com >
* Another chunk of functions
Signed-off-by: angie <angheloalf95@gmail.com >
* More functions and a bit of renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* More functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* a bit of renaming and five more functions
Signed-off-by: angie <angheloalf95@gmail.com >
* nonmatching function still not matching
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8096B57C and a bit of renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* func_8096A528
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* move static variables around
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* another bit of renaming
Signed-off-by: angie <angheloalf95@gmail.com >
* REG
Signed-off-by: angie <angheloalf95@gmail.com >
* Document the functions that give the medallion to player
Signed-off-by: angie <angheloalf95@gmail.com >
* More function renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* more function renaming
Signed-off-by: angie <angheloalf95@gmail.com >
* firemedallion and credits
Signed-off-by: angie <angheloalf95@gmail.com >
* rename some variables in a nonmatching function
Signed-off-by: angie <angheloalf95@gmail.com >
* i hate this function, and it is so dumb.
it took me days to figure it out, the error was so stupid
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* rename mouthtextures and some variables
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* Rename almost all the missing functions
Signed-off-by: angie <angheloalf95@gmail.com >
* whoops, i forgot to run format.sh
Signed-off-by: angie <angheloalf95@gmail.com >
* Renaming the references to the cutscene at the chamber of the sages after killing ganon
Thanks to @tharo
Signed-off-by: angie <angheloalf95@gmail.com >
* Many of the changes requested by @petrie911
Signed-off-by: angie <angheloalf95@gmail.com >
* Inline the assignments at DemoDu_CsGoronsRuby_SpawnDustWhenHittingLink
Signed-off-by: angie <angheloalf95@gmail.com >
* change wrong type
Signed-off-by: angie <angheloalf95@gmail.com >
* changes requested by @fig02
Signed-off-by: angie <angheloalf95@gmail.com >
* run format
Signed-off-by: angie <angheloalf95@gmail.com >
* remove s prefix in dustPosOffsets
Signed-off-by: angie <angheloalf95@gmail.com >
2021-02-28 10:19:54 -05:00
62606737f1
ovl_Demo_Gj Ok ( #670 )
...
* a bunch of functions
Signed-off-by: angie <angheloalf95@gmail.com >
* another bunch of functions
Signed-off-by: angie <angheloalf95@gmail.com >
* add dummies to func_8097911C to match it
Signed-off-by: angie <angheloalf95@gmail.com >
* fix some functions declarations
Signed-off-by: angie <angheloalf95@gmail.com >
* Add functions of the array used by the update function
Signed-off-by: angie <angheloalf95@gmail.com >
* add functions used by draw
Signed-off-by: angie <angheloalf95@gmail.com >
* draw and update functions
Signed-off-by: angie <angheloalf95@gmail.com >
* DemoGj_Init
Signed-off-by: angie <angheloalf95@gmail.com >
* fix some functions declarations
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* 9 small functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* Some unmatched functions and 12 small matched functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* another 7 small functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* add data
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* small types fixes
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* six more functions
Signed-off-by: angie <angheloalf95@gmail.com >
* func_80978C20
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8097BA48
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* five repeated functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* Array of cylinders and two other functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* seven equals and problematic functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* func_80978F60 and func_80979860
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8097923C doesn't want to match :c
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* three not matching functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* func_80978AFC
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* three more
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* DemoGj_FindGanon
Signed-off-by: angie <angheloalf95@gmail.com >
* func_809797E4
Signed-off-by: angie <angheloalf95@gmail.com >
* func_80978B90
Signed-off-by: angie <angheloalf95@gmail.com >
* last non matching function
Signed-off-by: angie <angheloalf95@gmail.com >
* erase reloc
Signed-off-by: angie <angheloalf95@gmail.com >
* a bit of renaming
Signed-off-by: angie <angheloalf95@gmail.com >
* another chunk of renaming
Signed-off-by: angie <angheloalf95@gmail.com >
* fix reg macros and a few comments
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* vt, arrayfuncs renaming and another bit of renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* More renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* i'm hating this actor
Signed-off-by: angie <angheloalf95@gmail.com >
* format
Signed-off-by: angie <angheloalf95@gmail.com >
* Changes asked by @shawlucas
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* swap globalCtx and globalCtx2
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* Move static variables nearer to where they are used and general cleanup
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* A bunch of changes
Signed-off-by: angie <angheloalf95@gmail.com >
* run format.sh
Signed-off-by: angie <angheloalf95@gmail.com >
* Forgot to change updateMode
Signed-off-by: Angie <angheloalf95@gmail.com >
* Rename the references to object_gj
Signed-off-by: Angie <angheloalf95@gmail.com >
* Rename some functions
Signed-off-by: Angie <angheloalf95@gmail.com >
* document the actor params, a few members and rename some draw functions
Signed-off-by: Angie <angheloalf95@gmail.com >
* Rename DemoGj_DrawRubbleDisplayList into DemoGj_DrawRotated
Signed-off-by: angie <angheloalf95@gmail.com >
* The first type is the the rubble that is around the fight's arena
Signed-off-by: angie <angheloalf95@gmail.com >
* rename the enums
Signed-off-by: angie <angheloalf95@gmail.com >
* Document the value read from the Ganon instance and rename a few functions from that
Signed-off-by: Angie <angheloalf95@gmail.com >
* rename init and draw functions
Signed-off-by: Angie <angheloalf95@gmail.com >
* rename smoke spawner functions
Signed-off-by: angie <angheloalf95@gmail.com >
* run format.sh
Signed-off-by: angie <angheloalf95@gmail.com >
* fix merge issues
Signed-off-by: Angie <angheloalf95@gmail.com >
2021-02-28 09:53:46 -05:00
e0bab1163e
lifemeter fixes ( #709 )
2021-02-24 15:42:25 -05:00
d30ef91417
Rename Matrix_Pull to Matrix_Pop ( #703 )
2021-02-24 14:28:04 -05:00
579d7008fb
ovl_en_yabusame_mark, 1 nonmatching ( #707 )
...
* 1 nonmatching (func_80B42F74)
* #ifdef NON_MATCHING
* deleted unused asm
* review suggestions
* sCollisionVertices
2021-02-21 19:10:24 -05:00
bbbf657b4b
z_en_peehat ( #660 )
...
* decomp most of En_Peehat
* z_en_peehat code decomp'd and OK
* complete data migration
* first pass at documentation
* minor code clean-up
* documentation pass
* fix spec (hopefully), implement some of petrie's suggestions
* implement requested changes
* fix compiler warnings
* implement fig's changes
* implement roman's changes
2021-02-21 09:25:53 -05:00
8022585465
obj_tsubo OK ( #702 )
...
* Getting started
* matched tsubo_init
* matched func_80BA0DF4 and func_80BA100C
* matched func_80BA1294, with progress func_80BA15BC
* matched final func, deleted asm, some documenting
* Fixing some control flow, and names
* Fixing suggested changes (some still remain)
* adding the dangeon_keep gfx
2021-02-20 20:32:35 -05:00
55ae8ad741
Minor gfx cleanups in some actors ( #706 )
...
* Minor gfx cleanups in some actors
* Fix frustum names
2021-02-17 19:06:07 -05:00
f57e0467d2
Decompile object_syokudai and object_ydan_objects ( #699 )
...
* add deku and torch objects
* why git?
2021-02-17 14:42:59 -05:00
ad751f02d2
Match EnFr_Update ( #705 )
2021-02-17 14:14:36 -05:00
56e94e1e34
En_Ba OK ( #700 )
...
* init done
* Everything done except for draw
* matching
* Tidied for pr
* merge master into en_ba
* run format.sh
* fixing merge mistakes
* how many different ways can I screw up a merge challenge
* some pr comments
2021-02-15 17:59:59 -05:00
2c56a6e99a
z_en skb, 1 non-matching, with some documentation ( #669 )
...
* breathing new life into these skeletons
* StalZone Progress StalZone
* another match
* matched override
* some progress
* one down, one to go
* naming and prepping for pr
* removing asm and prepping for PR
* fixing damage table and asm issues
* hopefully this fixes it (thank you louis)
* fixing some suggested changes
* inlining data into EnSkb_SpawnDebris
* Fixing suggestions and adding a note
* fixing the asm and function name
* fix
* whoops
Co-authored-by: Fig02 <fig02srl@gmail.com >
2021-02-15 17:52:22 -05:00
88b05cd9a2
En_anubice OK ( #688 )
...
* init, func_809B1120, and func_809B11C0 OK
Also migrate data to c
* Match Destroy, func_809B142C, func_809B1524, func_809B15CC
Start on func_809B16AC, but float register diffs :(
* Everything OK but func_809B16AC
and what a devil it is...
* Work on func_809B16AC
What an ugly function
* Do some documentation
* More documentation
* Run formatter
* Rename a few things
* Address PR comments
* Missed a couple angle macro opportunities
* Update src/overlays/actors/ovl_En_Anubice/z_en_anubice.c
Co-authored-by: mzxrules <mzxrules@gmail.com >
* Anubice OK
* Deleted the wrong part of the spec
* A curtain was missed
* Forgot a comment
I changed the declaration but not the reference :I
* More PR comments
Co-authored-by: mzxrules <mzxrules@gmail.com >
2021-02-15 16:27:22 -05:00
ecedc4f059
Decompiled ovl_Bg_Hidan_Hrock ( #690 )
...
* Fixing mkldscript.c for mac
* 1 to go
* merge update
* almost
* small update
* updating API with master
* NON_MATCHING
* names of vars
* almost matching
Signed-off-by: angie <angheloalf95@gmail.com >
* BgHidanHrock_Init matching
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* renames
* format
* PR suggestions
Co-authored-by: angie <angheloalf95@gmail.com >
2021-02-15 14:33:41 -05:00
982c645167
Armos and object_am OK ( #652 )
...
* started
* all but 2
* OK
* docs progress
* lots of docs
* add gitkeep back
* all funcs named
* small fix
* 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"
* object_am
* change
* ready i think
* last thing
* asm
* progress
2021-02-15 19:41:55 +01:00
79c8accfab
z_play.c OK ( #701 )
...
* z_play.c OK
* Change ~0x13 -> -20
* Back to hex
2021-02-15 18:29:06 +01:00
5bc23f58f8
ovl_En_Anubice_Fire OK ( #687 )
...
* init, destroy and other func
Signed-off-by: angie <angheloalf95@gmail.com >
* func_809B2B48
Signed-off-by: angie <angheloalf95@gmail.com >
* EnAnubiceFire_Update
Signed-off-by: angie <angheloalf95@gmail.com >
* EnAnubiceFire_Draw NON_MATCHING
Signed-off-by: angie <angheloalf95@gmail.com >
* import data
Signed-off-by: angie <angheloalf95@gmail.com >
* inline some static variables
Signed-off-by: angie <angheloalf95@gmail.com >
* EnAnubiceFire_Draw
Signed-off-by: angie <angheloalf95@gmail.com >
* func_809B27D8
Signed-off-by: angie <angheloalf95@gmail.com >
* final cleanup
Signed-off-by: angie <angheloalf95@gmail.com >
* ups
Signed-off-by: angie <angheloalf95@gmail.com >
* changes requested by @petrie911
Signed-off-by: angie <angheloalf95@gmail.com >
* changes requested by @Roman971
Signed-off-by: angie <angheloalf95@gmail.com >
* I somehow forgot to delete that file
Signed-off-by: angie <angheloalf95@gmail.com >
* i don't know what to put in this message
Signed-off-by: angie <angheloalf95@gmail.com >
2021-02-14 15:37:22 -05:00
97cfe49797
Magic Fire OK ( #662 )
...
* all done, graphics commands written in draw however very messy and non matching
* figuring out data
* OK
* formatting before merge
* pr stuff
* more pr stuff
* pr changes
2021-02-14 12:55:11 -05:00
f9d96d9f73
Fix most compiler warnings in the boot and code segments ( #674 )
...
* Less warnings in boot & code segments
* few more warnings gone
* Ran formatter
* z_view warning gone
* -> 1
* f31 -> 31
* Remove function casts
* Few more small improvements
* Separate declaration and assignment in func_80091738 and Item_Give
Co-authored-by: Thar0 <maximilianc64@gmail.com >
2021-02-13 19:49:40 -05:00
d615ec4f31
z_bg_jya_ironobj and object_jya_iron OK ( #676 )
...
* z_bg_jya_ironobj OK
* decompile object_jya_iron, clean up code
* implement requested changes
2021-02-13 19:10:40 -05:00
f9886c1097
z_bg_hidan_sima OK ( #680 )
...
* z_bg_hidan_sima OK
* cleanup code
* implement suggestions
2021-02-13 18:31:25 -05:00
12348ca3df
ObjWarp2block OK ( #685 )
...
* ObjWarp2block OK
* Address petrie's comments
* Rename unused temp to reflect that it's padding
* Address fig comments
* Use a single byte in offset and size comments
* Address roman's comments
2021-02-13 17:51:08 -05:00
f214743494
Fix func_800BC5E0 NON_EQUIVALENT (matched) ( #697 )
...
* mark func_800BC5E0 NON_EQUIVALENT
* fixed
2021-02-13 17:45:00 +01:00
cf06b27b15
Decompile en_sw ( #679 )
...
* decompile ovl_en_sw
* remove unused asm
* some cleanup, run format
* review
* review
Co-authored-by: Fig02 <fig02srl@gmail.com >
2021-02-12 20:52:39 -05:00
4d30626033
Bg_Breakwall OK and documented ( #684 )
...
* cleanup breakwall
* fix mistake in header
* make some data static
* reloc stuffs
* ready for pr
* Remove asm
* Update src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com >
* fix petrie's stuff
* fixed all feedback
* Update src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com >
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2021-02-12 20:51:59 -05:00
6d01247f34
ovl_Eff_Dust OK ( #655 )
...
* void func_8099D8D0(void *arg0, s32 arg1)
Signed-off-by: angie <angheloalf95@gmail.com >
* void func_8099D8D8(void *arg0, s32 arg1)
Signed-off-by: angie <angheloalf95@gmail.com >
* void EffDust_Destroy(Actor *thisx, GlobalContext *globalCtx)
Signed-off-by: angie <angheloalf95@gmail.com >
* Fix some pointers in the struct
Signed-off-by: angie <angheloalf95@gmail.com >
* Fix functions declarations
Signed-off-by: angie <angheloalf95@gmail.com >
* void EffDust_Init(Actor *thisx, GlobalContext *globalCtx)
Signed-off-by: angie <angheloalf95@gmail.com >
* EffDust_Update, EffDust_Draw, renaming and cleanup
Signed-off-by: angie <angheloalf95@gmail.com >
* void func_8099D8E0(EffDust *this)
Signed-off-by: angie <angheloalf95@gmail.com >
* void func_8099DB28(EffDust *this, GlobalContext *globalCtx)
Signed-off-by: angie <angheloalf95@gmail.com >
* void EffDust_UpdateFunc_8099DD74(EffDust *this, GlobalContext *globalCtx)
Signed-off-by: angie <angheloalf95@gmail.com >
* Members renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* NON_MATCHING void func_8099E4F4(EffDust *this, GlobalContext *globalCtx)
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* void func_8099DFC0(EffDust *this, GlobalContext *globalCtx)
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* NON_MATCHING void func_8099E784(EffDust *this, GlobalContext *globalCtx)
Signed-off-by: angie <angheloalf95@gmail.com >
* NON_MATCHING func_8099E784 - score 100
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* func_8099E784 still not matching
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* almost there (func_8099E784)
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* func_8099E784 matching. needs cleanup
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* void func_8099E784(EffDust *this, GlobalContext *globalCtx)
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* Rename most members of the struct
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* void func_8099E4F4(EffDust *this, GlobalContext *globalCtx) matching
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* Rename a few variables and functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* Add an enum for the possibles values for actor.param
Signed-off-by: angie <angheloalf95@gmail.com >
* format files
Signed-off-by: angie <angheloalf95@gmail.com >
* fix merge problems
Signed-off-by: angie <angheloalf95@gmail.com >
* delete reloc
Signed-off-by: angie <angheloalf95@gmail.com >
* remove defined symbols from undefined_syms
Signed-off-by: angie <angheloalf95@gmail.com >
* a bunch of functions
Signed-off-by: angie <angheloalf95@gmail.com >
* another bunch of functions
Signed-off-by: angie <angheloalf95@gmail.com >
* add dummies to func_8097911C to match it
Signed-off-by: angie <angheloalf95@gmail.com >
* fix some functions declarations
Signed-off-by: angie <angheloalf95@gmail.com >
* Add functions of the array used by the update function
Signed-off-by: angie <angheloalf95@gmail.com >
* add functions used by draw
Signed-off-by: angie <angheloalf95@gmail.com >
* draw and update functions
Signed-off-by: angie <angheloalf95@gmail.com >
* DemoGj_Init
Signed-off-by: angie <angheloalf95@gmail.com >
* fix some functions declarations
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* 9 small functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* Some unmatched functions and 12 small matched functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* another 7 small functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* add data
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* small types fixes
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* six more functions
Signed-off-by: angie <angheloalf95@gmail.com >
* func_80978C20
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8097BA48
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* five repeated functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* Array of cylinders and two other functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* seven equals and problematic functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* func_80978F60 and func_80979860
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8097923C doesn't want to match :c
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* three not matching functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* func_80978AFC
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* three more
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* DemoGj_FindGanon
Signed-off-by: angie <angheloalf95@gmail.com >
* func_809797E4
Signed-off-by: angie <angheloalf95@gmail.com >
* func_80978B90
Signed-off-by: angie <angheloalf95@gmail.com >
* last non matching function
Signed-off-by: angie <angheloalf95@gmail.com >
* erase reloc
Signed-off-by: angie <angheloalf95@gmail.com >
* a bit of renaming
Signed-off-by: angie <angheloalf95@gmail.com >
* another chunk of renaming
Signed-off-by: angie <angheloalf95@gmail.com >
* fix reg macros and a few comments
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* vt, arrayfuncs renaming and another bit of renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* More renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* i'm hating this actor
Signed-off-by: angie <angheloalf95@gmail.com >
* format
Signed-off-by: angie <angheloalf95@gmail.com >
* Changes asked by @shawlucas
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* changes asked by @louist103
Signed-off-by: angie <angheloalf95@gmail.com >
* Revert "Merge branch 'ovl_Demo_Gj' of github.com:AngheloAlf/oot into ovl_Eff_Dust"
This reverts commit 12e0e5d2a6b251f1d234angheloalf95@gmail.com >
* Rename the param's enum and move it to header
Signed-off-by: angie <angheloalf95@gmail.com >
* add file description
Signed-off-by: angie <angheloalf95@gmail.com >
* Some changes requested by @Roman971
Signed-off-by: angie <angheloalf95@gmail.com >
* more changes
Signed-off-by: angie <angheloalf95@gmail.com >
* Change the particles amount from hex to decimal
Signed-off-by: angie <angheloalf95@gmail.com >
* `format.sh` should also format headers :s
Signed-off-by: angie <angheloalf95@gmail.com >
2021-02-12 19:04:22 -05:00
fb1909bb92
En_Sth OK ( #672 )
...
* all functions matching
* en_sth OK
* text formatting and added a description at the top
* some suggested changes
* merge master and remove text comments
Co-authored-by: Fig02 <fig02srl@gmail.com >
2021-02-12 18:34:37 -05:00
0a1c16d440
gameplay_dangeon_keep ( #665 )
...
* xml done
* add references in
* missed a few
* newline
* review
2021-02-12 18:33:55 -05:00
61dacd0882
Ovl_En_Gb OK ( #691 )
...
* Progress
* Matched
* Cleanup, some names
Co-authored-by: Thar0 <maximilianc64@gmail.com >
2021-02-12 17:37:13 -05:00
0b2a4e9d7f
ovl_Bg_Hidan_Rock OK ( #657 )
...
* void BgHidanRock_Init(Actor *thisx, GlobalContext *globalCtx)
Signed-off-by: angie <angheloalf95@gmail.com >
* small functions
Signed-off-by: angie <angheloalf95@gmail.com >
* BgHidanRock_Destroy
Signed-off-by: angie <angheloalf95@gmail.com >
* BgHidanRock_Update
Signed-off-by: angie <angheloalf95@gmail.com >
* BgHidanRock_Draw
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8088B69C
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8088B79C
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8088B990
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8088B268 and move data
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8088BC40
Signed-off-by: angie <angheloalf95@gmail.com >
* erase reloc
Signed-off-by: angie <angheloalf95@gmail.com >
* a bit of cleanup
Signed-off-by: angie <angheloalf95@gmail.com >
* ups
Signed-off-by: angie <angheloalf95@gmail.com >
* another bit of cleanup
Signed-off-by: angie <angheloalf95@gmail.com >
* Changes requested by @petrie911
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* More changes requested by @petrie911
Signed-off-by: angie <angheloalf95@gmail.com >
* fix some types
Signed-off-by: angie <angheloalf95@gmail.com >
2021-02-12 17:33:03 -05:00
d373661acd
Minor z_bgcheck documentation fixes ( #675 )
...
* Fix minor documentation issues
* Update include/z64bgcheck.h
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
Co-authored-by: fig02 <fig02srl@gmail.com >
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2021-02-12 17:30:21 -05:00
43bba20796
Bg haka huta OK ( #682 )
...
* starting haka_huta with new changes
* matched last func, deleting asm
* added changes from review
2021-02-12 17:29:05 -05:00
bcf2694f93
Make func_800C213C match original ROM ( #678 )
...
* Make func_800C213C match original ROM
The C code for this function was very close to done, and was
functionally equivalent to the ROM. This commit uses a few tricks
to convince the compiler to allocate the same registers as the original
ROM. The two tricks used are:
1. Introduced a new temporary variable "yinc".
2. Added a "do while(0) {}" line in two places.
Both of these ideas came from the decomp-permuter tool. I took the
do/while idea and guess as to what it might have been in the original
code. I imagined that the "do while(0) {}" was probably left over from
a standard multi-line macro, which for some reason had an empty body.
I further suggest that maybe the empty body is because it was a feature
compiled out during RELEASE builds - perhaps a debug logging macro.
* Use simpler code for func_800C213C
Replaced dummy LOG macro with "do {} while(0);". This version makes
less assumptions about what the original code looked like.
2021-02-12 17:26:42 -05:00
b8c2ec1f60
Forest Stage and related actors and objects ( #618 )
...
* starting out
* match demo
* full match
* cleanup
* more names
* more names
* headers
* dist from link
* docs
* objects
* format
* organization of xmls
* merge actor
* Update src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* Update src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* format
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain >
Co-authored-by: Fig02 <fig02srl@gmail.com >
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2021-02-12 17:25:02 -05:00
ef272322eb
dekunuts OK ( #664 )
...
* dekunuts OK
* named unk_19A
* improved the match, got rid of volatile
* one unaccounted blob
* finished object_dekunuts
* capitalization consistency
* suggested changes
* suggested changes again
2021-02-12 17:22:48 -05:00
da55eaa2d8
En_Zl4 ( #590 )
...
* significant progress
* cutscene data
* match
* docs
* dist from link
* compiler warnings
* cutscene and such
* object decomp
* stuff
* cleanup
* name some things
* stuff
* cutscenes fixed
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "44f5d7cb9"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "44f5d7cb9"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* 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"
* reorder
* unused content
* documented cutscene dlists
* enviewer update
* Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* formatter
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain >
Co-authored-by: Fig02 <fig02srl@gmail.com >
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2021-02-12 17:16:40 -05:00
7ee8c8011c
All* Get Item objects decompiled ( #668 )
...
* All get item objects OK
* Name z_draw functions
* fix skulltula tokens draw ids
* Review suggestions, merge extract_single_asset into extract_assets as an optional argument
Co-authored-by: Thar0 <maximilianc64@gmail.com >
2021-02-12 22:57:06 +01:00
5f552a369c
z_skin OK and z_skin_awb decomped (one barely nonmatching) ( #632 )
...
* skin_awb some functions done
* more matches
* stuff
* matching skins
* closer?
* less skin
* skin
* format
* one thing
* merge actor
Co-authored-by: gns <adamkiddle23@gmail.com >
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain >
2021-02-12 20:41:34 +01:00
ec31611c0e
EnBili OK and documented ( #654 )
...
* OK, data imported
* reloc
* some naming, some floats
* named almost everything
* description
* delete asm
* missing static
* Address review comments
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* Update src/overlays/actors/ovl_En_Bili/z_en_bili.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2021-02-07 20:43:02 -05:00
b029225000
ovl_En_Weiyer ( #650 )
...
* ovl_En_Weiyer
* PR review
* PR review
2021-02-07 18:31:24 -05:00
Anghelo Carvajal