* 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>
* .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>
* xml
Signed-off-by: Angie <angheloalf95@gmail.com>
* add xmls of anime1 and anime2
Signed-off-by: Angie <angheloalf95@gmail.com>
* add unaccounted data from animes
Signed-off-by: Angie <angheloalf95@gmail.com>
* add all unaccounted data and a bit of renaming
Signed-off-by: Angie <angheloalf95@gmail.com>
* add to spec and change the pointer to the decompiled names
Signed-off-by: Angie <angheloalf95@gmail.com>
* add palettes
Signed-off-by: angie <angheloalf95@gmail.com>
* delete gitkeep
Signed-off-by: angie <angheloalf95@gmail.com>
* run format
Signed-off-by: angie <angheloalf95@gmail.com>
* change palette to Tlut
Signed-off-by: angie <angheloalf95@gmail.com>
* change `Tlut` to `TLUT`
Signed-off-by: angie <angheloalf95@gmail.com>
* Fix setup warnings
Signed-off-by: angie <angheloalf95@gmail.com>
* Casting the problems away
Signed-off-by: angie <angheloalf95@gmail.com>
* I don't really like changing the type to void
Signed-off-by: angie <angheloalf95@gmail.com>
* We're out of EARLY hell
Signed-off-by: angie <angheloalf95@gmail.com>
* ./format.sh
Signed-off-by: angie <angheloalf95@gmail.com>
* Change skel type to "Normal"
Signed-off-by: angie <angheloalf95@gmail.com>
* Changes requested
Signed-off-by: angie <angheloalf95@gmail.com>
* suggestion of roman
Signed-off-by: angie <angheloalf95@gmail.com>
* early is back :c
Signed-off-by: angie <angheloalf95@gmail.com>
* This will be a fix in ZAPD
Signed-off-by: angie <angheloalf95@gmail.com>
* 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>
* 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>
* 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>
* fix colliderinit typo
* fix initchain
* start init
* match init
* progress
* progress
* more funcs
* match func_809B3DD8
* progress
* last func almost done
* enum
* name some more types
* progress
* all but one
* fix warning
* remove undefined syms
* match arrows
* review
* spec
* remove asm
* get data in
* Match Init and one other
* match some more
* match a bunch more
* merge master
* OK
* Some naming done
* OBJECT_NY almost done. waiting on ZAP changes
* Remove ASM
* Cleanup
* Commit before merge
* fix damage table
* Change comment
* 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>
* 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>
* 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>
