* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* Lots of functions matched. Some big ones are close.
* Five left unmatched, one close.
* Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched.
* Three unmatched, one essentially matched, the rest matched.
* More fixes.
* Documented more of the structure and cleaned up a bit.
* BossFd2, BgVbSima, and EnVbBall matched and documented
* Also removed unneeded .s files
* And need to name EnVbBall's functions
* give this a shot
* fix conflict
* one more try
* removing darkmeiro changes
* and again
* now OK from make clean
* minor cleanup
* One more matching function for BossFd
* which means it doesn't need its .s
* splitting
* splitting
* splitting
* forgot some .s
* fancy new names
* fancy new names
* trying again
* sneaky .s files
* sound effects and some hex to decimal conversions
* Sound effects and static variable cleanup
* format.sh and clean up static variables
* sfx and formatting
* ZAP and cleanup
* small cleanup
* cleanup and ZAP
* ZAP
* looking at the giant function again
* looking at the giant function again
* Only the big function left.
* Those .s files aren't mine, officer
* float literals might be fixed. regalloc still a nightmare
* almost done with the big function
* should make now
* not much of a change
* all functions match. rodata somehow doesn't.
* forgot some things
* lots of cleanup
* and a little more
* small error
* large cleanup. Also BossFd has function names and inlined variable declarations
* still more cleanup
* the quest for 0.1f continues
* forgot to put NON_MATCHING back in
* Data structures fully documented. Still more cleanup.
* DECR now works with BossFd2
* should match now
* cleanup
* small cleanup
* cleanup and names
* tiny thing
* particles and headers and stuff
* now with more enums
* merge
* test
* end test
* update
* cleanup
* object 2
* object 1
* doc object_fd2
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "6f874af4a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "6f874af4a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* formatting
* .s
* merge actor
* vertex arrays
* a little more
* formatting
* merge opd
* fixed damage check
* cleanup
* fixes
* effect struct
* review
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig02 <fig02srl@gmail.com>
* starting toki_hikari
* func_808BA018 matched and some work on other func
* init and draw matched, one to go
* matched final function, removed ASM, updated spec
* adding suggested changes
* Started
* did some more
* did a few more
* update
* Fixed corrupted git repo
* did some more
* Did a few more functions
* taking a break
* fix undefined
* matched the stupid hard function
* a few more
* did some more, done for tonight
* commit in case i mess up
* 3 non matching
* .
* remove tools/ZAP2 from origin master
* idk
* i cant figure this out
* object_xc OK
* compiles now
* the evil function is now ok
* z_en_xc OK
* some documentation
* more documentation i guess
* more documentation
* more z_en_xc docs
* z_en_xc updates
* Final pass, its been nearly a year
* Remove unnecessary comment
* forgot to remove unused asm
* Merge
* Made suggested changes and fixed warnings in z_en_xc
* Remove symbols from undefined_syms.txt
* Add some missing animmode to en_Xc
* review
* review
* fix tot cutscene
* comment
Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Fixed upstream
* move .data
* match init
* mathc func_808C1D00
* match func_808C32F4, func_808C2B38, func_808C3224, func_808C2AB0
* match func_808C30F4, func_808C2A40, func_808C3704, func_808C3704
* func_808C18B0
* match another chain of functions
* Match func_808C29B0, Draw, and most of OverrideLimbDraw
* start update
* Really close
* Almost match update, match Override Limb Draw
* start the big switch
* Make a little progress on the big switch function
* Test
* chip away at the big one some more
* test
* progress
* More progress
* Add
* Finished another chain of functions
* Decomp effect functions
* Get the whole file in C
* Move data to its own C file
* Start the effect file en_bdfire.c
* Messed up expected
* Finish EnBdfire.c
* A little clean up
* done as far as I can get it
* Delete scenes directory
* Delete graphs directory
* Delete graphovl.py
* match and such
* Delete BossDodongo_Update.s
* PR fixes
* restore old IDO
* Color Filter
* PR fixes (Roman)
* Fixed added assets
* remove asm
* PR fixes (Roman)
* quick format change
* remove unwanted files
Co-authored-by: Louis <5883445+louist103@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
* object_ge1
* more stuff named
* object_gla OK, symbols added to C
* eff fire fix in gameplay_keep
* object_nb OK, fixed gameplay_keep
* replaced symbols in EnNb, limb enums
* Change EnGeldB limb enums to hex
* Use enum in header too
* Add descriptions to EnGe2 and EnNb, rearrange xml
* Reorder xml
* review changes
* match a few
* delete ASM
* Almost done
* One reg swap left
* GlobalCtx2 YEP
* Start object SKJ
* Start some documentation
* Big doc pass
* Name the first batch of functions
* Done
* fix some issues real quick
* lets try this again
* remove left over doc tools and add 3 textures
* Finish object_skj docs
* PR fixes
* PR fixes
* Delete BuildInfo.ha
* PR fixes (Roman)
* PR fixes (Roman)
* two matches
* cleanup and formatting
* Update assets/xml/overlays/ovl_Bg_Jya_Cobra.xml
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* no more extract
* format
* owl exterminators
* new match
* new match
* small thing
* whoops
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* First pass
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* more matching fun
* fun with bongo
* clean this up later
* found the matching versions
* diff.py has escaped?
* now with more docs
* Now with floor and more docs
* one more thing
* incremental progress
* It's Bongo time
* one little thing
* merge ZAP
* update
* camera
* gfx now in their own file
* now with more object decomp
* name animations
* now shiftable
* missed some. also DECR
* opd merge
* start xml
* now with xml asset extraction
* format
* cleanup
* removed union
Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* named members of TitleCardContext
* changed screenX/Y to just x/y
* added clarifying comments and renamed timer -> duration because i think its better
* changed names to delayTimer and durationTimer
* made texture a void*
Co-authored-by: gamestabled <chandler2016@yahoo.com>
* ovl_Boss_Goma OK, except func_80917D98
* ovl_Boss_Goma OK and documented
* Minor cleanup: shorten enums, use named constants...
* Floats with .0f, less useless static usage, details on oversight about spawning child gohmas, cleanup...
* More documentation, hopefully less weird about documenting setups and actions
* fix fhg_fire
* remove warnings
* formatting things
* newlines
* review
Co-authored-by: Fig02 <fig02srl@gmail.com>
* fix hidan door
Signed-off-by: angie <angheloalf95@gmail.com>
* doors and lens of truth in gameplaykeep
Signed-off-by: angie <angheloalf95@gmail.com>
* other minor fixes
Signed-off-by: angie <angheloalf95@gmail.com>
* Fix a typo
Signed-off-by: Angie <angheloalf95@gmail.com>
* matches
* more matches
* progress?
* it's time
* so close
* organize declarations
* docs
* more fixes
* more fixes
* fix stage 1
* more fixes
* first try
* demo ids in decimal
* final cleanup
* one more thing
* fixes
* more cleanup
* onepointcs
* OnePointCutscene
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
* It's Phantom Ganon time
* Fhg_Fire matched
* small touch up
* more documentation
* starting naming fire
* renaming
* cleanup
* hooray for new names
* merge
* first pass
* camera status
* bgcheck
* object 1
* object 2
* .s
* .s
* fig's comments
* implementing zel's suggestions and a few other things
* the work begins
* work continues
* docs, shifts, cleanup
* cleanup
* texture names
* addressing the rest of the notes
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* Decompile and document En_Clear_Tag
* Adds a define for setting the total count of ClearTag particles.
* Fixes swap in particle effect struct member names.
Additionally, implements the DECR macro where available.
Additionally, implements the CLAMP_MIN macro.
Additionally, adds more comments inside of functions explaining how the Arwing works.
* Reformats z_en_clear_tag.c after recent fixes.
* Removes not OK DECR and CLAMP_MIN macros.
I don't know why they built locally OK for me. May have had a stale build.
* Added static to data declarations.
Additionally added white spacing between data definitions.
* Various syling fixes in EnClearTag
Fixes inconsistent usage of particle/effect. They're Effect is the better name, so I went with that.
Fixed a naming issue in CalculateFloorTangent.
Adds s prefix to all the static variables.
Renames clearTagParticlesBuffer to sClearTagEffects
Consistent capitalization in comments.
Adds more descriptive comments to function level comments that didn't say a lot already.
Renamed gameplay.particleEffects to gameplay.specialEffects.
Renames cameraNumber to cameraId.
Fixed capitalization in display list variable names.
* Always capitalize the A in arwing.
* Fixes issue with overzealous replacement of arwing -> Arwing
* Renames arwing display lists to include the g prefix.
* Renames effect seed -> random
* Removes unnecessary decrement timer comments.
* Updates Arwing comments to detail why it's important that the roll is updated to zero.
* Updates stack variable names in EnClearTag_Update to be more consistent with each other.
* Updates Arwing crashing documentation.
* Further update documentation on arwing crashing.
* Even further updates to Arwing crashing docs.
* Fixes issue of missing newline in En_Clear_Tag.xml
* targetDirection reset now has a chained assignment
* Rotation angle to hex
* Fixes rotation hex and identifies float.
* Updates arwing fire check.
* Arwing cutscene timer is multiplied by 128 rather than shifting 7
* Updates scaledCrashingTimer assignment to be more consistent.
* Updates max scale to multiply by 2
* Gives name to the work buffer indices.
Additionally, makes enum names more consistent.
* Removes unnecessary globalCtx2 in EnClearTag_CreateFlashEffect
* Runs format.sh after recent changes.
* Updated path of ClearTag assets.
* Clear tag now uses Arwing in the display list name for all effects.
* Updates work buffer to expand and contract as new enums are added.
* Uses c99 defines in my c89
* Updates the unknown 8 bytes in en_clear_tag
* review
Co-authored-by: fig02 <fig02srl@gmail.com>
* Shift to new branch
* object_jj decomped
* docs
* Documented blinking, various other things
* more naming
* Most stuff in the object named
* implement eye enums
* delete asm
* Changes from Fig's review
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* .gitkeep and xml
Signed-off-by: angie <angheloalf95@gmail.com>
* comment out most of the xml
Signed-off-by: angie <angheloalf95@gmail.com>
* add all animations
Signed-off-by: angie <angheloalf95@gmail.com>
* textures
Signed-off-by: angie <angheloalf95@gmail.com>
* more textures
Signed-off-by: angie <angheloalf95@gmail.com>
* another texture
Signed-off-by: angie <angheloalf95@gmail.com>
* eye and mouth textures
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* add to spec and comment out a problematic skeleton
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* replace almost all d_ references
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* add missing include
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* fix problems with overlapping data
Signed-off-by: angie <angheloalf95@gmail.com>
* replace references to Darunia's skeleton
Signed-off-by: Angie <angheloalf95@gmail.com>
* rename cutscenes in en_du
Signed-off-by: Angie <angheloalf95@gmail.com>
* last renaming
Signed-off-by: Angie <angheloalf95@gmail.com>
* ups, forgot to delete some pointers from undefined_syms.txt
Signed-off-by: Angie <angheloalf95@gmail.com>
* Rename the animations
Signed-off-by: angie <angheloalf95@gmail.com>
* run format
Signed-off-by: angie <angheloalf95@gmail.com>
* gDaruniaSageFormationAnim
Signed-off-by: angie <angheloalf95@gmail.com>
* update actor symbols from object
Signed-off-by: angie <angheloalf95@gmail.com>
* rename eyes
Signed-off-by: angie <angheloalf95@gmail.com>
* rename a mouth texture
Signed-off-by: angie <angheloalf95@gmail.com>
* run format.sh
Signed-off-by: angie <angheloalf95@gmail.com>
* typo
Signed-off-by: angie <angheloalf95@gmail.com>
* delete gitkeep
Signed-off-by: angie <angheloalf95@gmail.com>
* link of the pr
Signed-off-by: Angie <angheloalf95@gmail.com>
* update the cs name to the correct one
Signed-off-by: angie <angheloalf95@gmail.com>
* tlut
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* add object name to outname in palettes
Signed-off-by: angie <angheloalf95@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Init
Signed-off-by: angie <angheloalf95@gmail.com>
* destroy and non_matching update
Signed-off-by: angie <angheloalf95@gmail.com>
* declare externs to data
Signed-off-by: angie <angheloalf95@gmail.com>
* nonmatching draw
Signed-off-by: angie <angheloalf95@gmail.com>
* everything is a disaster
Signed-off-by: angie <angheloalf95@gmail.com>
* import bss
Signed-off-by: angie <angheloalf95@gmail.com>
* first step to extract data
Signed-off-by: angie <angheloalf95@gmail.com>
* import data
Signed-off-by: angie <angheloalf95@gmail.com>
* func_80A89860
Signed-off-by: angie <angheloalf95@gmail.com>
* draw
Signed-off-by: angie <angheloalf95@gmail.com>
* func_80A89A6C is crap
Signed-off-by: angie <angheloalf95@gmail.com>
* EnJsjutan_Update
Signed-off-by: angie <angheloalf95@gmail.com>
* change some hexs into decs
Signed-off-by: angie <angheloalf95@gmail.com>
* convert hexs of D_80A8AA98 into decimals and run format.sh
Signed-off-by: angie <angheloalf95@gmail.com>
* move data to its own file
Signed-off-by: angie <angheloalf95@gmail.com>
* this function is nightmare
Signed-off-by: angie <angheloalf95@gmail.com>
* i'm really trying
Signed-off-by: angie <angheloalf95@gmail.com>
* i think i am finally doing it
Signed-off-by: angie <angheloalf95@gmail.com>
* move the temps to where they are used
Signed-off-by: angie <angheloalf95@gmail.com>
* rename distance
Signed-off-by: Angie <angheloalf95@gmail.com>
* rename a few variables
Signed-off-by: Angie <angheloalf95@gmail.com>
* unclamp stuff :s
Signed-off-by: Angie <angheloalf95@gmail.com>
* i tried to see if i'm going better that older way
Signed-off-by: Angie <angheloalf95@gmail.com>
* moving stuff around
Signed-off-by: Angie <angheloalf95@gmail.com>
* this is the third try
Signed-off-by: angie <angheloalf95@gmail.com>
* changing bit by bit
Signed-off-by: angie <angheloalf95@gmail.com>
* step by step
Signed-off-by: angie <angheloalf95@gmail.com>
* more stuff
Signed-off-by: angie <angheloalf95@gmail.com>
* slow
Signed-off-by: angie <angheloalf95@gmail.com>
* a few small changes
Signed-off-by: angie <angheloalf95@gmail.com>
* go back to second try
Signed-off-by: Angie <angheloalf95@gmail.com>
* changing a s8 to u8 made a bigger difference than expected
Signed-off-by: Angie <angheloalf95@gmail.com>
* i am slowly doing it
Signed-off-by: Angie <angheloalf95@gmail.com>
* some problems are so dumb
Signed-off-by: Angie <angheloalf95@gmail.com>
* it is improving slowly again
Signed-off-by: Angie <angheloalf95@gmail.com>
* erase the old tries
Signed-off-by: Angie <angheloalf95@gmail.com>
* remove four variables
Signed-off-by: Angie <angheloalf95@gmail.com>
* fix the missing instructions at the end
Signed-off-by: angie <angheloalf95@gmail.com>
* theres only regalloc problems left
Signed-off-by: angie <angheloalf95@gmail.com>
* fix stack
Signed-off-by: angie <angheloalf95@gmail.com>
* add ifdef non_matching
Signed-off-by: Angie <angheloalf95@gmail.com>
* i'm getting desesperate
Signed-off-by: Angie <angheloalf95@gmail.com>
* Remove unnecessary casts
Signed-off-by: Angie <angheloalf95@gmail.com>
* random stuff that improves codegen
Signed-off-by: angie <angheloalf95@gmail.com>
* dumb is dumb
Signed-off-by: angie <angheloalf95@gmail.com>
* erase stuff
Signed-off-by: angie <angheloalf95@gmail.com>
* add some comments
Signed-off-by: Angie <angheloalf95@gmail.com>
* use bomb_explosion param and add some comments
Signed-off-by: angie <angheloalf95@gmail.com>
* add a few comments in about stuff
Signed-off-by: Angie <angheloalf95@gmail.com>
* extract carpet's texture instead of hardcode it
Signed-off-by: Angie <angheloalf95@gmail.com>
* set segment 128 in the xml
Signed-off-by: Angie <angheloalf95@gmail.com>
* Add baseaddress, which fixes dlist in xml
Signed-off-by: Angie <angheloalf95@gmail.com>
* fix the second dlist
Signed-off-by: Angie <angheloalf95@gmail.com>
* compiler complain that the symbol doesn't exists
Signed-off-by: angie <angheloalf95@gmail.com>
* last cleanup
Signed-off-by: angie <angheloalf95@gmail.com>
* format and delete unused asm
Signed-off-by: angie <angheloalf95@gmail.com>
* Cleanup and add a few comments
Signed-off-by: Angie <angheloalf95@gmail.com>
* add non matching to spec
Signed-off-by: angie <angheloalf95@gmail.com>
* update xml and add a note to future people
Signed-off-by: angie <angheloalf95@gmail.com>
* Finally remove z_en_jsjutan_data.c
Signed-off-by: angie <angheloalf95@gmail.com>
* Rename extracted variables
Signed-off-by: angie <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
