* fix colliderinit typo
* migrate data
* init has 1 problem
* progress
* progress
* builds now
* progress
* progress
* lots of funcs matched
* many functions, fix warnings
* 1 left
* done
* docs progress
* remove graphovl
* missed some
* change some funcs
* some more
* another
* format
* more docs
* cleanups1
* limbs, DLs, textures
* limbs named (thanks elliptic)
* more docs
* Name animations, import symbols
* Named sections of xml
* more docs
* rename limbs and use flag macros
* name
* review1 and use limb enum
* review2
* agro -> aggro
* review3
* review4
* review5
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
* .data OK
* Progress
* push some old stuff
* Finish a chain
* Progress
* Progress
* Run mathfixer.py
* Progress
* match one more
* Up to date
* Match func_80A97610
* func_80A96FD0
* most of the way through the mega switch
* small formatting thing. still stuck on the switch
* start a big switch function
* a little closer
* done with matching for now starting objects
* func_80A97738 OK!
* func_80A995CC OK!
* func_80A99864 OK!
* en_ko OK!
* Code clean-up pass
* more EnKo cleanups, object_fa and object_kw1 textures documented
* complete object_km1, more EnKo documentation
* More documentation
* delete asm
* Clean-up rebase issues
* bleh
* Implement Dragorn's suggestions
* fix spec, implement fig's suggestions
* whoops (ill leave it for the docs tho lol)
* whoops again
* i made an ouchie
* smile
* last one for real
Co-authored-by: Louis <35883445+louist103@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
* Match EnTg_Destroy
* Match EnTg_Init
* Matching EnTg_Update
* Match func_80B18360
Moving both 'return phi;'s into a single return at the end of the function causes the assembly to not match.
* Probably equivalent, non-matching func_80B183F8
* Matching EnTg_Draw
* Matching update function
* Matching func_80B18778
* All functions decompiled
* Move data to C code
* All functions matched excepted weird switch/case
* Last matching function
* Remove unused ASM
* Name obvious symbols
* Clang format
* Name text-related functions and variables
* Describe actor as Dancing Couple
See https://github.com/zeldaret/oot/pull/866#discussion_r664726581
* Use named constants
* Name drawing constants
* Use THIS macro for void*
* Name the function that sets environment color
* Add comments to parts of code that aren't clear
* Rename timesSpokenTo to nextDialogue, treat isTalking as boolean
* 13 functions left, data imported
* 2 left
* 1 left
* OK
* Begin naming
* sfx rename
* spec
* Begin naming, add LINK_IS_CHILD to EnDu
* Fix spelling of its/it's
* Document most of object_dekubaba, import symbols
* Document draw functions, begin on actionfuncs
* New actor function names, some float constants
* Name almost everything
* Delete asm
* Name size, format
* Review changes
* Review changes
* Brackets, format
* Forest and shadow temple
* fire temple
* Water temple
* Spirit temple
* Deku tree
* jabu jabu
* DC
* Inside Ganons castle
* GTG
* Castle courtyard
* great fairy's fountain
* chamber of sages
* shooting gallery
* Temple of time
* market
* back alley
* kokir shop
* goron shop
* zora shop
* House of skulltula
* bazarr
* potion shop
* gravekeepers hut
* lakeside lab
* hyrule field
* kak
* graveyard
* zoras river
* kokiri forest
* lake hylia
* zoras domain
* zoras fountain
* gerudo valley
* lost woods
* the rest of them
* cleanup
* final cleanup
* PR fixes (Zel)
* Fra -> FRA and cleanup map_name_static
* map_name_static
* DONE
* SHould be it
* Done done done done
* vector
* remove another pr
* ?
* Start decompiling Fishing
* Decompile more functions in Fishing
* Decompile a few more functions in Fishing
* Decompile func_80B6E9E0 and func_80B7825C (non matching)
* Minor Fishing cleanups
* Migrate fishing bss to C and match 3 functions
* Decompile and match Fishing_Update
* Migrate fishing data to C and minor cleanups
* Fix the object_fish xml and use its symbols in Fishing
* Partially document Fishing and object_fish
* Add more documentation/cleanups to Fishing and object_fish
* Use object_fish symbols in Demo_Ec and fix naming
* Minor fixes to Fishing docs
* Apply review suggestions for Fishing
* Apply 2 more review suggestions for Fishing
* Apply some review suggestions for Fishing
* fix colliderinit typo
* fix initchain
* reloc
* progress
* progress
* Pick off a few easy functions, reduce number of warnings
* more tough OKs
* Getting closer to all OK, fix en_girla header
* some hard OKs, 7 to go
* two funcs remaining
* func_80AC7094 OK!
* Fix warnings, begin documentation
* get most of object_ossan documented, document some of en_ossan
* improve en_girla function names
* more EnOssan documentation
* more documentation
* en_tana basically complete, en_girla vars all named, en_ossan documentation improvements
* delete TIME ITSELF
* object_oF1d_map OK
* more names, fixed a poition typo
* Nearly all en_ossan functions named, all variables named
* format.sh
* forgot to delete data
* implement pr changes
* EnOssan OK! implement most of Roman's suggestions
* ugh
* implement figs suggestions
* implement roman's suggestion
* Can't tell my left from my other left
Co-authored-by: fig02 <fig02srl@gmail.com>
* Object_FU limbs and skel OK
* limbs OK
* Object_FU textures OK
* Object_FU face textures OK
* Symbols in en_fu.c
* en_fu.c limb enum
* Remove Object_fu from undefined_syms, move textures to draw, and small cleanup
* Object_bird OK
* Object_Bird OK, added cutscene for shot sun, and song of storms
* Rainbow Bridge CS
* Great fairy CS
* Cutscene -> Cs
* remove '&' from Cutscenes
* Cleanup object_bird
* Update z_en_fu.c
* Update z_en_fu.h
* Update z_en_fu.c
* Update z_en_fu.h
* Update z_en_fu.h
* DC intro CS
* Zeldas lullaby CS
* Nabooru Knuckle CS
* Owl Lake Hylia CS
* Sun song CS
* Undefined sym in Boss Dodongo
* Missed a few more
* DC tex name
* Windmill man limbs
* Add symbols, does NOT build OK
* parameter OK with syms
* Use `static` more and inline arrays
* wip docs
* Start on Interface_Draw, NOT OK yet
* rename variables since interface dev is weird
* nonmatching for now
* kaleido
* Update src/code/z_parameter.c
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
* Make most texture rectangles use shifts
* fix symbols for all interface things
* done with interface_draw for now
* Update z_parameter.c
* format files
* fix wrong function calls
* fix bss
* improvements in matching
* remove button enum for now
* (void)0 to fix warning
* make conditional look nicer
* fix
* fix wrong combiner
* Update src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* format
* remove "HUD" naming
* review suggestions
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* OK
* Some naming
* Name more, correct typo in Biri, extract skel
* just Draws need names, fix typos in bili and warp1
* Decompile object_vali and add symbols
* Few more names
* Bari naming done
* object_bl completed, symbols added
* Label object_bl
* Formatter
* delete asm
* review changes
* review changes
* review
* Ruto limbs
* RutoLimb enum
* the enum doesn't go in en_door
* Limb DLists
* Name almost all textures and clean up EnRu1.c
* remove padding
* Name all but 1 animation and remove undefined syms
* Object MA limbs OK
* (MA1)Most textures
* Small renames in EnMa1.c
* Object MA1 OK
* add base object for Mjin
* Mjin OK
* Update object_ma1.xml
* PR fixes (Fig)
* PR fixes
* Missed one
* Update assets/xml/objects/object_ru1.xml
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Object_hakach_objects OK and fix a warning in z_play.c
* Object Warp1 OK
* Object_spot16_obj OK
* object_cs Skeleton and limbs OK
* Limbs are broken
* Limbs OK
* Object_CS OK
* Object_jya_door OK
* fix errors and add new lines
* PR fixes (AngheloAlf)
* PR fixes (EllipticEllipsis)
* PR fixes (Fig)
* Rename Spot16 and Jya
* GraveYard -> Graveyard
* PR fixes
* -s
* PR fixes
* Mostly done but shifted
* still messed up
* Almost OK
* OBJECT_JYA_OBJ OK, OBJECT_GR OK
* Done
* Merge master and format
* Cleanup
* Cleanup 2
* Start object MB dont merge yet
* Object_MB OK
* Object_ydan_objects OK
* General 'ydan' actor cleanup
* Forgot some small things
* Object_EC OK
* add .gitkeep and run format
* Object_sd OK but no textures cause of a zap issue
* PR fixes
* Fix object_sd
* fix ydan
* delete .gitkeep files
* OBJECT_BOX as far as it can go with current ZAP
* Fix undefined_syms
* Start child link object
* Push progress, dont merge yet
* Object_mori_objects OK
* Fixed?
* Fix conflicts again
* Seems like i missed some textures
* Extract data for BgBombwall
* More field
* ZAP YEP 2.0
* Object_Box OK
* Object_SD ok. Ready to merge
* remove ASM and merge master
* remove ASM
* remove files wrongfully added to docs/
* Almost done
* Change comment in z_player_lib.c
* forgot some DLists in player_lib.c
* Fix conflict, run format
* Same as before but this time with Tex and TLUT
* Last few things
* fix object_GR and add limbs to object_sd
* Nane -> Name
* gChildDekuShieldMtx is now a matrix and not a blob
* PR fixes (Fig)
* add a space for comment in z_player_lib.c
* re push and new lines
* PR fixes (AngheloAlf)
* PR fixes (Roman)
* Fix Heishi2
* PR fixes (Fig)
* Replace spacing in a file
* PR fixes (Roman)
* it's crashing
* fix stuff
* fix xmls
* problematic objects
* fix tabs
* Fix suffixes
* add missing new lines
* Add comments to the problematic objects
* Find and replace fixes
* Add Fig's objects
* I forgot to add a Name in a cutscene, so I'm adding it here
* Update object decomp tutorial a little bit
* Update problematic objects
* Update docs/tutorial/object_decomp.md
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Change comments
* comment out a few blobs
* dammit tluts
* Change a bunch of objects
* update the last bunch
* update comments on oA11 and oB2
* Ninja-edit to fix compatibility with ZAPD's PR 142
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Decompile ovl_kaleido_scope + minor cleanups
* Add a common header for ovl_kaleido_scope
* Start cleaning up and documenting kaleido_scope (+ some interface docs)
* Improve and fix some kaleido_scope non matchings
* Match KaleidoSetup_Init
* Extract icon_item_fra/ger_static files
* Add more documentation and matches to kaleido_scope
* Improve the z_kaleido_collect.c non matching
* Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c
* Update most kaleido variables to be static
* Improve GS flag macros
* Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script
* Various minor fixes and improvements
* Minor fixes and review changes
* Review changes part 2
* Rename gSetTileCustom to gDPSetTileCustom
* Review changes part 3
* Matching
* Some naming
* spec
* Name another function
* Name animations, clarify use of GI_MAX and GI_NONE
* Documented bottle range functions
* Simplify squared distance function in EnIceHono, actor descriptions
* Functions for dropped fish
* More naming
* Change 65535.5f to (0xFFFF + 0.5f)
* Change 65535.5f to (0xFFFF + 0.5f)
* name phases
* Named other types, Docile functions
* Naming complete
* delete asm
* format, remove outdated comment
* Fix a few DrawFlexOpa arguments
* Review changes
* Change back to original playSound
* Function comments per review
* finished object_skb
* neglected the limbs and dlists, so I added them
* adding the textures
* fixing some names
* ....forgot to change the c file....
* hopefully fixed formatting issue
* Initial xml
* most of in-code references
* Add limbs and evrything else
* Functions used by EnRiverSound
* Fix forearm and use void* for textures
* Run formatter
* OK a few functions
* BgMizuMovebg_Draw OK, make tweaks to bg_mizu_bwall
* migrate data
* create mizu_objects, defines for water temple water level
* clean up some code
* implement most suggestions
* review
* review2
* formatting
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Data imported, 8 easy functions matched
* Init only remaining nonmatching, data in
* some renaming & fiddling with Init, still nonmatching
* fix colours
* Init still not matching
* Decompile object_tp
* renames
* Rename func_80B20DE0
* Horrible new idea
* Known equivalent, docs next
* Another attempt
* Finished naming in object_tp
* Named functions, more enums
* DrawBridge -> Drawbridge
* skulltulla -> Skulltula
* Name almost all struct variables
* Named most of the temps
* delete asm
* spec
* Missed data file, whoops
* Review
* More review changes
* 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>
* 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)
* 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>
* 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>
* 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>