* 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>
* 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>
* 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>
* 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>
* 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>
* matched functions, still need data
* shopnuts OK
* cleaned up some things in hintnuts by comparing to shopnuts
* merge with new animation stuff
* fixing merge 2
* suggested changes
* missed a DECR
* suggestions
* Migrate data to C
* Partially decompile Init
* func_80B959D0 OK
* ObjKibako2_Destroy OK
* ObjKibako2_Update OK
* ObjKibako2_Draw OK
* func_80B95CA4 OK
* ObjKibako2_Init OK
* func_80B95DFC
* func_80B95ED4 OK
* func_80B95A28 OK
* Name functions
* Delete unused asm and update spec
* Fixup math post rebase
* Name statics
* Clean up variable names
* Run formatter
* xzDistFromLink -> xzDistToLink
* Respond to feedback in ObjKibako2_Break
* Type sp2C as a CollisionHeader* and initalize it when declaring it
* Respond to remaining review feedback
* Respond to review feedback from Roman
* EnTite_Update matching
* Fixes to update
* made good progress, func_80B1A2A0 is in a good place to be matching soon
* Merge stuff
* func_80B19E94 done, func_80B18CC4 done
* EnTite_Destroy and EnTite_Init done
* Commenting out sDamageTable and EnTite_Init until all the data matches
* Some more small functions done
* more progress
* func_80B19918 done
* func_80B18E7C done
* func_80B19524 done
* more progress
* EnTite_Draw equiv but nonmatching, file otherwise done
* Found some unstaged changed on old laptop
* Draw matching: File fully matching!
* Documentation
* finished documentation
* deleted data files
* update spec
* fixed waterY -> yDistToWater rename after merge
* ran format.sh
* fixing accidental renames in camera
* Fixed some obvious number/comment formatting issues
* Removed unecessary prototypes
* merge
* running format.sh
* suggestions
* more pr comment changes
* format to push
* one more change
* more renames (see pr comments)
* merge
* renames
* format.sh
* fix renames
* function comment formatting
* merge + format
* endless merge fixes
* merge fixes until die
* yet again a merge fix
* pr suggestions
* objmure2 about halfway
* all decompiled, one non-matching
* some documentation
* mure2 done, one nonmatching
* Update spec
* Update z_obj_mure2.c
* Update z_obj_mure2.c
* Add files via upload
* fix formatting
* Fix fake match
* Changed data formatting
* More formatting changes
* fixed name of var
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* match
* sfx fix
* should be good to go
* comments and such
* Matrix macros escape me
* format
* fix bubble
* remove comments
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig <fig02srl@gmail.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* bwall
* cleanup
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* slug-o-cola
* sfx macros
* Matched
* this will have to do
* well maybe a little more
* good enough
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* a good start
* done
* Log
* formatting
* thisx
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* OK
* documented (with one odd float value)
* delete asm and alter spec
* uniformise spawn data to sIsSpawned,
fix compile warnings in Bg_Jya_Lift and Bg_Mori_Elevator
* translate last printf
* re-delete modified asm
* addressed review comments
* remove outdated comment
* addressed comments, made defines
* untrack scenes dir
* remove scenes dir
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* Oh boy more giant functions
* now functional, but not equivalent
* Now only non-matching
* cleaned up illusion room
* much closer. static variables still suck though
* much closer. static variables still suck though
* some docs and cleanup. matching is horrible.
* static varaibles are a troublesome lot
* ifdef
* merge ZAP
* merge again
* small cleanup
* small fixes
* swordstate
* resolve conflict
* comments and such
Co-authored-by: fig <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* init, destroy, update, couple of others decomped
* 2 functions remain
* data migrated
* 1 function left
* OK
thanks mostly to Petrie and the permuter,
and no thanks to my find/replace skills
* documented and deleted asm
* updated spec
* delete data
* address review comments
* Apply review suggestions
* getting things started
* all matched, rock solid
* deleted assembly, formatted, and cleaned spec
* yikes, forgot to hit -d on deleting the asm
* Fixed suggestions and some documentation
* fixing a few compiler warnings
* added suggestions
* removing assembly to fix merge issues
* Documented function names
* Fix some non matchings in actors and parameter
- `EnTuboTrap_HandleImpact` from `z_en_tubo_trap.c` (fully matching)
- `func_80ADA35C` from `z_en_po_sisters.c` (fully matching)
- `func_80B0B81C` from `z_en_stream.c` (fully matching)
- `Item_Give` from `z_parameter.c` (1 non matching left)
* Rectify bss ordering comment
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* a few fake syms
* two more
* format
* EnStream_Init OK
* func_80B0B7A0 OK
* EnStream_Destroy OK
* EnStream_Update OK
* Make func_80B0B7A0 take this instead of thisx like other SetupActions
* func_80B0BAC8 OK
* func_80B0B934 OK
* func_80B0B81C not OK, but very close and I give up
* EnStream_Draw OK
* Delete unused ASM and do a little cleanup
* Provide better names for functions
* Make the file buildable when NONMATCHING is used
* Flip comparisons in EnStream_SuckPlayer as per review
* NONMATCHING -> NON_MATCHING
* Remove & for function pointers
* Type D_06000950 and remove the & in Draw
* Remove unnecessary "struct"
* Remove unnecessary forward declaration
* Make func_80B0B81C take Vec3f*, not PosRot*
* Use the generated reloc when NON_MATCHING
* Move func_80B0B81C forward declare to the else block
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* rupees and, for some reason, pots
* and now an even larger man
* now for the gallery
* more progress
* naming continues
* even more docs
* another match
* match, fix, a new enum
* Update src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
* fixes except globalctx
* well one more
* and now globalCtx
