* all functions matched, data imported
* some function names
* more naming
* corrections, naming
* some state flags named
* naming completed (some may be inaccurate)
* spec
* delete asm
* Review changes
* review
* review
Co-authored-by: Fig02 <fig02srl@gmail.com>
* 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>
* 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
* 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>
* 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>
* 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>
* z_lifemeter cleanup finished, one non-matching
* made Health_UpdateData a bit better, nowhere near matching still
* lifemeter done for now
* fixed define issue
* improve z_lifemeter, still doesn't match
* z_lifemeter done
* Rename functions
* Add files via upload
* Update Health_Update.s
* fix missing symbols in asm file
* Update Health_Update.s
* Update Health_Update.s
* fixed stuff
* Add files via upload
* Delete Health_Update.s
* Rename things according to Roman's suggestions
* lifemeter done hopefully
* fix unused asm that for some reason didn't merge
* fix feedback
* compiles right now
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
* beginning of migrating changes
* got matching
* changed order a bit
* clean up bgcheck
* fix conflict
* fix conflict again
* first stab at identifying types, some oks
* Clean up most bad structs/pointer math, move relevant structs to z64bgcheck.h, get some OKs
* more OKs, z_bgcheck.bss migration, update some sys_math3d.c args
* couple more OKs
* pushing some OKs
* fix compilation issues
* code_800430A0.c OK, more files decomp'd
* 8003A3E0 big OK :)
* Decomp most of func_8003C614, decomp helper funcs
* Decomp SurfaceType, CamData, and WaterBox property related functions
* more OKs, big OK in 8003C078
* more OKs, more progress, move a function definition in z_collision_check to functions.h
* more clean-ups, more OKs, dyn_vtx is now defined as u8*
* 8003A5B8, 8003A7D8, 8003C614, 8003DD6C OK, document function args better
* data migrated, more OKs
* 80041240 OK, func_8003B3C8 and func_8003BB18 disassembled
* func_80040284, 800409A8 non_matching, add IS_ZERO macro
* All asm files have C representations, some big OKs, lots of minor tweaks
* More OKs, non-matching code cleanup
* 8003FBF4 and 80040BE4 OK, improve codegen for most functions
* format z_bgcheck.c
* fix warnings, compile errors on NON_MATCHING
* func_8003EE80 is now NON_MATCHING
* begin documenting some functions
* formatting
* more documentation, func_8003A95C OK
* fix PHYSICAL_TO_VIRTUAL changes
* fix var rename
* More documentation, functions 80040E40, 80041648 OK, change types to not be compatible with ZAP
* func_8004239C ok, more NON_MATCHING improvements, more documentation
* Implement most suggested changes
* Convert comments to slower comments
* /**
* Implement ZAP2 changes
* my anti-virus ate my format.sh results
* Rename a couple hundred functions, fix minor stuff
* rename var so that clang formats correctly
* run format.sh
* implement Petrie's matches/suggestions
* format
* matches
* and the asm
* slight error
* Add SSList
* two more matches
* stuff
* implement code changes
* clean up Petrie's matchings
Co-authored-by: Arthur <arthurtilly413@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* 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
* 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
* more names
* so many names
* we got subsystems now
* slight cleanup
* merge part 2
* new naming scheme
* slight adjustment
* no limit
* syms maybe
* step one
* OK, it's fixed
* table
* some names and such
* comments**
* update zap
* gitkeep to please jenkins
* ZAP
* fixer
* fixer2
* fixer3
* zap
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
* 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
* Auto stash before rebase of "upstream/master"
* A large number of scenes have been decompiled.
* Fixed makefile
* Decompiled around 40 scenes.
* Removed old file
* Finished matching remaining scenes.
* Removed old commented out spec lines
* Decompiled a few object files.
* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.
* Updated texture and object file decomp
* Fixed newline issue with ZAPD
* Moved scenes/ into the assets/ folder
* Fixed a few compile errors
* Auto stash before rebase of "upstream/master"
* A large number of scenes have been decompiled.
* Fixed makefile
* Decompiled around 40 scenes.
* Removed old file
* Finished matching remaining scenes.
* Removed old commented out spec lines
* Decompiled a few object files.
* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.
* Updated texture and object file decomp
* Moved scenes/ into the assets/ folder
* Fixed a few compile errors
* Fixed merge issues.
* Fixed makefile merge error
* Fixed additional merge error
* Fixed several more merge issues
* Commented out gameplay_keep and sk2 extraction, since currently unused.
* Reenabled gameplay_keep extraction since it's used in the spec
* Fixed build error
* Removed test struct
* Fixed makefile error that would happen on fresh builds
* Fixed merge issue
* Removed relative paths
* Multithreading on extraction, spec uses numbers, few changes to XMLs
* Removed redundant code from the extract_assets script
* object_sk2 and object_spot09_obj OK
* object_spot11_obj OK
* object_spot17_obj OK
* Test: One of the gameplay_keep dlists given a proper symbol
* Updated asset symbol names based on new naming scheme
* XMLs use "Offset" instead of "Address" now
* Fixed merge issues, updated ovl_Magic_Dark xml and gfx file
* Updated to use latest build of ZAPD
* Updated ZAPD again
* Updated ZAP to remove assimp dependency
* Jenkins Test: Added .gitkeep file
* Updated ZAP once more
* Updated png file name to comply with new naming scheme.
* Fixed bad include
Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
* 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
* 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
* small improvement
* also minor
* merge
* matches
* the room?
* woo matches
* spelling fix
* 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
* 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
* woo watch out
* data and such
* stuff
* more decomp
* another match
* match and docs
* more docs
* little more cleanup
* SFX macros
* little more
* more attempts to match
* naming things
* I give up on the match
* also spec
* changes
* hex
* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.h
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Fully decompiles demo_effect actor.
* Formats z_demo_effect.c
* GET_ACTOR_TYPE is renamed to GET_EFFECT_TYPE
* Implements OPEN_DISPS macros for all draw functions.
* Fixes ugly float values
* Removes unnecessary union structs in the DemoEffect actor struct
* Renames DemoEffect SkelAnimeCurve member to skelCurve
* Names initObjectBankIndex DemoEffect struct member
* Renames jewel display list holders
* Renames initialization function pointers to initUpdateFunc and initDrawFunc
* Renames primitive and environment color DemoEffect struct members.
* Fixes a couple missed floats.
* Renames most draw and update functions.
* Finishes naming all update functions.
* Adds additional SFX defines.
* Renames the rest of the functions
* Renames all external object display lists and vertex references
* Renames DemoEffect global data variables
* Renames DemoEffect Medal function to GetItem because it's used by LightArrows too
* Fixes DemoEffect Timewarp_Timeblock documentation.
* DemoEffect_TimewarpTimeblock updates shrink functions to use decimal
* Converts DemoEffect hex to decimal where appopriate
* Names the rest of DemoEffect struct members.
* Names DemoEffect triforceSpot crystalLightOpacity
* Adds DemoEffect enums for light effect color and god lgt types.
* Renames DemoEffect_UpdateBlueOrb to DemoEffect_UpdateBlueOrbGrow
* Fixes compiler warning in DemoEffect_JewelSparkle
* Renames DemoEffect_MedalSparkle argument
* Reformatting DemoEffect struct offset comments.
* Formats z_demo_effect
* Updates DemoEffect oGfxCtx to use the new macros.
* Adds comments detailing what each function in the DemoEffect system does.
* Removes z_demo_effect.data.s
* Renames DemoEffect global variables and sets them to static
* Removes pointer from DemoEffect function references
* Removes unncecessary default: break; statements in DemoEffect
* Converts rotation values to hex in DemoEffect
* DemoEffect effectFlags now uses ~1 rather than 65534
* DemoEffect_DrawGodLgt now uses a cleaner conditional statement
* eventChkInf in DemoEffect now uses 1 << 9 and 1 << 11
* DemoEffect now uses VT macros.
* Converts DemoEffect colors to hex.
* Changes M_PI / 32768.0f to M_PI / 0x8000
* Updates demo_effect enums to be all caps
* ovl_demo_effect reloc info is now included via build process rather than included from original asm
* Adds param packing macro
* DemoEffect struct unions are now typedef'd outside of the main struct
* Reformats DemoEffect sJewelSparkleColors
* Removes an if(globalCtx){} in DemoEffect_Init
* Removes ActorFunc cast in DemoEffect_Wait
* Removes unncessary comment in DemoEffect_MedalSparkle
* Timer check in DemoEffect_UpdateLightRingShrinking now uses <= 255 rather than < 256
* Removes unnecessary comment in DemoEffect_SetJewelColor
* Removes unncessary comment in DemoEffect_MoveJewelActivateDoorOfTime
* Converts an angle to hex in DemoEffect_MoveJewelActivateDoorOfTime
* Converts a while to for loop in DemoEffect_JewelSparkle
* Moves stack variables in DemoEffect_UpdateDust to a new line for each one
* Removes globalCtx2 assignment to the beginning of the function in DemoEffect_DrawJewel
* Removes unnecessary comment in DemoEffect_DrawCrystalLight
* No longer wrapping rotation reset in if(1){} in DemoEffect_DrawGodLgt
* Converts DemoEffect if statements to use != 0 and == 0 when non-boolean ints are checked.
* DemoEffect initDrawFunc now uses type ActorFunc rather than DemoEffectFunc
* review 2
Co-authored-by: fig <fig02srl@gmail.com>
* cleanup
* name camera action functions
* decompile a few small functions, name a few Camera struct members
* decompile camera data, decompile a few camera functions
* Split ASM for code_800BB0A0
* removing code_800BB0A0.s
* PR Requests, Camera WIP
* remove #define NON_MATCHING from db_camera
* rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c
* camera wip
* rename some struct memebers, some decomp wip
* pr updates
* camera wip
* name some fields in Camera Struct, being making sense of Camera_Update
* Camera WIP
* wip
* wip
* add z64camera.h header, begin creating CameraSetting macros
* wip
* wip
* wip
* wip
* migrate camera bss to c
* match a couple functions in db_camera
* match some small db_camera functions
* wip
* migrate db_camera rodata, match a few functions
* remote db_camera.rodata.s
* match some of db_camera
* identify types of some unknown data pieces
* some small wip
* Match Camera_Init, some function changes, some struct name changes. Change unk_C0 and unk_CC to floats from Vec3fs
* add naming for a few more Camera struct members
* wip
* match func_80043F94
* Match Camera_Jump1
* document some of Camera_Jump1
* wip
* match Camera_Jump3
* Match Camera_Update, FeelsAmazing
* wip
* wip
* match Camera_SetParam
* minor cleanup
* wip
* wip
* match Camera_KeepOn0
* some documentation, modify some matching functions to match style of others.
* match Camera_Demo1
* match camera_demo9
* document Camera_Demo1 and Camera_Demo9
* wip
* Match camera_battle4
* match camera_unique2
* Match Camera_Unique3
* match camera_special6
* match Camera_Special5
* wip
* document camera_special6
* naming updates
* match camera_Unique1
* match Camera_Unique0
* wip
* Match Camera_CalcUpFromPitchYawRoll
* match func_80045508
* document Camera_Battle4
* document several camera functions, move camera data to separate file
* rename phi/theta to pitch/yaw
* wip
* uniq9 wip
* Camera_Unqiue9 OK
* document Camera_Unique9
* name unk_160 in camera struct
* wip
* wip
* minor updates
* fix conflicts
* wip
* wip
* Olib updates
* wip
* wip
* rename most Math3D functions, few matches, documentation
* wip
* document most of math3d
* wip
* wip
* wip
* pr updates
* Match Camera_Fixed4
* match func_80058E8C
* pr updates
* add missing comment block finalizer
* Merge math3dupdates
* match Camera_ChangeSetting
* Match Camera_ChangeMode
* match func_80058148
* Match Camera_Special9
* decompile the rest of camera data
* match Camera_Demo5
* name a few camera functions in z_play
* match func_80046CB4, some work on other fucntions
* wip
* impove some non matchings
* fix function rename
* match func_800588B4
* match Camera_Subj4
* wip
* Camera_Demo3 matching, Camera_Battle1 big progress
* Camera_Normal2 OK
* wip
* match Camera_Parallel1
* normalize some things across functions
* match Camera_Normal1
* Match Camera_Normal3
* some cleanup
* more cleanup
* more cleanup , match Camera_CalcDefaultPitch
* data formatting
* Match Camera_Jump2
* document Camera_Jump2
* Match Camera_KeepOn3
* document some of Camera_KeepOn3
* improve some non_matchings
* match func_80045C74 and func_800460A8
* code cleanup, documentation
* match Camera_KeepOn1
* Match Camera_Subj3
* Match Camera_Battle1
* remove non_matching from func_80044adc and func_80046e20
* name several members of Battle1
* more documentation on Battle1
* cleanup
* renaming Camera_Vec3fScaleXYZFactor to Camera_Vec3fTranslateByUnitVector
* reorganize update structs, remove final references to params, remove CameraParams union
* implement camera enums into player
* Renaming Camera_GetDir to Camera_GetInputDir, Camera_GetRealDir to Camera_GetCamDir, etc, implement camera enum's into player
* remove non-global camera variables from variables.h
* clean up some variable declarations
* finish pr comment updates
* fix some warnings
* data formatting
* finish commenting on data
* delete unused asm
* remove asm
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
* more matchings, some cleanup
* small cleanup
* Fixed upstream
* Migrate data and Decomp Init
* Decomp a few more functions
* Small change before starting
* Back to this file
* Match action func chains, func_8096DE94, func_8096DF9C, func_8096E0A4
* Match all except 1 function in first back of actionFuncs
* matched a bunch in bank D_8097053C
* Match the first few draw functions
* match a few more draws and start one
* All matched but one. All equivalent
* Name setup funcs
* finish naming functions
* Fix Gfx stuff
* Remove 'expectedc'
* General clean up
* fix
* progress
* cleanup
* remove reloc
* review 2
* fix awful function pointer thing
Co-authored-by: fig <fig02srl@gmail.com>
* Poe actors progress
* Some more progress, En_Poh almost matching
* Further progress
* Fix merge
* Decompile data
* Actor struct cleanups
* More functions OK
* Progress
* Last function decompiled, some nonmatchings left
* Few more OK, skelanime_init definition changes
* Progress
* Style improvements, OPEN/CLOSE_DISPS, few more OK
* Few more style improvements, function prototype additions/changes, another function OK
* Remove unused asm, begin documentation
* Use generated reloc
* Cleanup, format
* Remove a few no longer needed comments
* PR suggestions
* DISP macros
* Missed some FrameUpdateMatrix != 0 replacements
* EnPoField_InteractWithSoul -> EnPoField_SoulInteract, eyeImageIdx -> eyeTextureIdx
* Fix merge, reformat
* Review Suggestions
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Further review suggestions
* Ran formatter
* Less DECR usage
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
