1398898b70
object_goma ( #754 )
...
* testing
* all named
* oh god spelling
* fixes
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain >
2021-04-04 17:54:56 -04:00
208167361b
Poe Objects ( #743 )
...
* poe objects
* Last unaccounted resolved, name suffix fixes
* remove _tex
* missed 2
* format
Co-authored-by: Fig02 <fig02srl@gmail.com >
2021-04-04 23:48:12 +02:00
8b87e53b76
Graveyard objects: bg_spot02_objects ( #751 )
...
* BgSpot02Objects 4 non-matching
* Bg_Spot02 3 non-matching but all down to regalloc
* finish file
* spec
* asm
* rename var
* rename func
* review
Co-authored-by: Fig02 <fig02srl@gmail.com >
2021-04-04 00:32:23 +02:00
288320317c
Gohma (ovl_Boss_Goma) ( #397 )
...
* 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 >
2021-04-03 16:58:33 -04:00
9834f5517e
EnDivingGame OK ( #745 )
...
* update
* EnDivingGame_Draw OK
* dont feel like working on this function today
* fixed build errors
* fixing some merge conflicts
Signed-off-by: Angie <angheloalf95@gmail.com >
* more conflict fixing
Signed-off-by: Angie <angheloalf95@gmail.com >
* all merge conflicts fixed
Signed-off-by: Angie <angheloalf95@gmail.com >
* EnDivingGame_Update OK
Signed-off-by: Angie <angheloalf95@gmail.com >
* remove DECR
Signed-off-by: Angie <angheloalf95@gmail.com >
* format and unused_asm
Signed-off-by: Angie <angheloalf95@gmail.com >
* change reloc in spec
Signed-off-by: Angie <angheloalf95@gmail.com >
* damn reloc
Signed-off-by: Angie <angheloalf95@gmail.com >
* Apply suggestions from code review
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com >
* use OPEN_DISPS macro
Signed-off-by: Angie <angheloalf95@gmail.com >
* batch of suggestions
Signed-off-by: Angie <angheloalf95@gmail.com >
* more suggestions
Signed-off-by: Angie <angheloalf95@gmail.com >
* more changes, but this isn't ready yet
Signed-off-by: Angie <angheloalf95@gmail.com >
* rename two timers
Signed-off-by: angie <angheloalf95@gmail.com >
* Update src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com >
* grabbedRuppiesCounter
Signed-off-by: angie <angheloalf95@gmail.com >
* a lot of vec
Signed-off-by: angie <angheloalf95@gmail.com >
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com >
* fix some typos
Signed-off-by: angie <angheloalf95@gmail.com >
* allRupeesThrowed
Signed-off-by: angie <angheloalf95@gmail.com >
* rupeesLeftToThrow
Signed-off-by: Angie <angheloalf95@gmail.com >
* boolean changes and minor comments
Signed-off-by: Angie <angheloalf95@gmail.com >
* and more renaming
Signed-off-by: Angie <angheloalf95@gmail.com >
* renaiming and chained assign
Signed-off-by: Angie <angheloalf95@gmail.com >
* rename 3 functions
Signed-off-by: Angie <angheloalf95@gmail.com >
* final rename and add two enums
Signed-off-by: angie <angheloalf95@gmail.com >
* format
Signed-off-by: angie <angheloalf95@gmail.com >
* enum naming
Signed-off-by: angie <angheloalf95@gmail.com >
Co-authored-by: Lucas Shaw <lgs84@cornell.edu >
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com >
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com >
2021-04-03 12:15:16 -04:00
c94e595dc1
Misc objects problems ( #748 )
...
* 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 >
2021-04-02 19:30:26 -04:00
fa5e785760
Add needed rules for prerenders extraction ( #752 )
...
* update makefile
Signed-off-by: Angie <angheloalf95@gmail.com >
* change jfif to jpg
Signed-off-by: angie <angheloalf95@gmail.com >
2021-04-03 00:07:29 +02:00
9b4482314a
OnePointDemo OK ( #719 )
...
* 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 >
2021-03-31 12:18:31 -04:00
28cfd82a4f
Phantom Ganon (ovl_Boss_Ganondrof) and related actors ( #442 )
...
* 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 >
2021-03-29 15:35:46 -04:00
86f16cf662
"decompile" ovl_map_mark_data, make minor tweaks to z_map_mark.c ( #704 )
...
* "decompile" ovl_map_mark_data, make minor tweaks to z_map_mark.c
* implement some suggestions
* eliminate wrapping braces
2021-03-29 19:24:08 +02:00
f4499a8de2
En_Clear_Tag OK and documented ( #689 )
...
* 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 >
2021-03-29 19:14:08 +02:00
ed4021a6fe
EnJj and object_jj OK ( #741 )
...
* 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 >
2021-03-28 20:02:09 -04:00
1639417327
code_80110450 (game over) OK* ( #739 )
...
* OK (sort of)
* remove hack
* clean up comments
2021-03-28 19:50:46 -04:00
187d2d1500
document code_8008E6A0 (frame advance) ( #737 )
...
* OK
* fixes
* format
* remove gotos, thanks petrie
2021-03-28 19:35:16 -04:00
7f3be6e37f
en_mm and object_mm OK ( #735 )
...
* almost done
* progress
* OK
* update mm2
* delete asm
* whitespace
* Update assets/xml/objects/object_mm.xml
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* Update src/overlays/actors/ovl_En_Mm/z_en_mm.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* name data
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2021-03-28 19:18:41 -04:00
11e5be77d5
bg_ice_shelter OK ( #736 )
...
* ok
* OK
* asm
2021-03-28 18:53:28 -04:00
941f79215c
ovl_Demo_6K ( #726 )
...
* ovl_Demo_6K
* PR review
* Update src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
Co-authored-by: fig02 <fig02srl@gmail.com >
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2021-03-29 00:40:38 +02:00
71bbaab485
git subrepo pull --force tools/ZAPD ( #742 )
...
subrepo:
subdir: "tools/ZAPD"
merged: "c4773301a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "c4773301a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2021-03-27 23:57:14 -04:00
b338f12498
object_horse_ganon, object_horse_link_child, object_horse_normal and object_horse_zelda OK ( #724 )
...
* object_horse_zelda
Signed-off-by: angie <angheloalf95@gmail.com >
* object_horse_normal
Signed-off-by: angie <angheloalf95@gmail.com >
* object_horse_link_child
Signed-off-by: angie <angheloalf95@gmail.com >
* object_horse_ganon
Signed-off-by: angie <angheloalf95@gmail.com >
* object_horse
Signed-off-by: angie <angheloalf95@gmail.com >
* object_hni
Signed-off-by: Angie <angheloalf95@gmail.com >
* ZAPD is falling to do vtx
Signed-off-by: Angie <angheloalf95@gmail.com >
* Testing
Signed-off-by: Angie <angheloalf95@gmail.com >
* Rename horse_link_child variables
Signed-off-by: angie <angheloalf95@gmail.com >
* horse_zelda with names
Signed-off-by: angie <angheloalf95@gmail.com >
* I'm suspecting that this game doesn't use z_en_horse_ganon
Signed-off-by: angie <angheloalf95@gmail.com >
* Child epona eye textures
Signed-off-by: Angie <angheloalf95@gmail.com >
* Extract eyes textures from Epona
Signed-off-by: Angie <angheloalf95@gmail.com >
* Small rename
Signed-off-by: Angie <angheloalf95@gmail.com >
* change references in EnHorseNormal
Signed-off-by: angie <angheloalf95@gmail.com >
* Rename a few HorseNormal animations
Signed-off-by: angie <angheloalf95@gmail.com >
* Add normal horse eye texture
Signed-off-by: angie <angheloalf95@gmail.com >
* Add some textures
Signed-off-by: angie <angheloalf95@gmail.com >
* change pointers in EnViewer
Signed-off-by: angie <angheloalf95@gmail.com >
* Rename some animations of HorseGanon
Signed-off-by: angie <angheloalf95@gmail.com >
* Add a few dlists in object_horse
Signed-off-by: Angie <angheloalf95@gmail.com >
* Add whinnies
Signed-off-by: Angie <angheloalf95@gmail.com >
* Rename last animations remaining in horse_normal and horse_ganon
Signed-off-by: angie <angheloalf95@gmail.com >
* Remove epona and ingo's horse
Signed-off-by: angie <angheloalf95@gmail.com >
* ./format.sh
Signed-off-by: angie <angheloalf95@gmail.com >
* Give a proper name to horses animations
Signed-off-by: angie <angheloalf95@gmail.com >
* add trailling comma
Signed-off-by: Angie <angheloalf95@gmail.com >
* remove union of skeletons
Signed-off-by: angie <angheloalf95@gmail.com >
* change skeletonheader* to void*
Signed-off-by: angie <angheloalf95@gmail.com >
* remove cast
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* remove cast 2
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
* format.sh
Signed-off-by: angie <angheloalf95@gmail.com >
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2021-03-27 23:44:11 -04:00
3aad8f7244
object_du OK ( #693 )
...
* .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 >
2021-03-27 23:02:45 -04:00
833dc2928d
ovl_En_Jsjutan with 1 non_matching ( #713 )
...
* 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 >
2021-03-27 22:47:25 -04:00
43b45b91c9
object_zl2, object_zl2_anime1 & object_zl2_anime2 OK ( #694 )
...
* 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 >
2021-03-27 22:24:28 -04:00
97f80eeb3f
Update asm_processor and use static variables in En_Torch2 ( #740 )
...
* Update asm_processor to current master
* Update variables in En_Torch2 to actually be static
This is now possible because asm_processor was updated to handle static symbols in GLOBAL_ASM
* Update tutorial to reflect changes about static symbol limitations
2021-03-27 16:26:59 -04:00
b863784893
EnMu OK ( #722 )
...
* Commit Before Draw Decomp
* Closer EnMu_Draw
* Matched draw function
* EnMu Matching with OK
* Removed ASM
* EnMu OK
* Implemented pull request changes as of 2020/03/16
* Reverted header
* Split increment and switched 0s to NULLs
2021-03-27 21:14:38 +01:00
d141e39e77
Finished decomp of code_800F7260 (1 non-matching) ( #733 )
...
* improved match
* decomped
* I dunno
* matched
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain >
2021-03-27 21:01:50 +01:00
cf78de2b11
Obj_Mure3 OK ( #720 )
...
* matched
* format
* review
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain >
Co-authored-by: fig02 <fig02srl@gmail.com >
2021-03-27 15:50:26 -04:00
8b57f36d32
Update Jenkins links in README ( #738 )
2021-03-26 02:57:07 +09:00
dab0d957fe
Objects used in DemoEffect OK ( #731 )
...
* object_triforce_spot
* object_gi_jewel
* object_efc_crystal_light
* object_efc_fire_ball
* object_efc_lgt_shower
* object_god_lgt
* object_light_ring
* object_efc_tw
* undefined_syms
* fix gameplay_keep
2021-03-23 20:40:36 -04:00
effd4256c9
Tutorial docs ( #715 )
...
* Move tutorial into docs folder
* Merge remote-tracking branch 'upstream/master' into tutorial_docs
* Object decomp added
* contents and intro updates
* mention object decomp in beginning
* Addressed Fig's review
* Update EnSkb to jointTable and morphTable
* minor table tweak
* typo
* Alter to say ZAPD makes the object output folder
* Apply suggestions from code review
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl >
* More review changes
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl >
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com >
2021-03-24 01:15:35 +01:00
5562b2ef6f
Fix some fixable warnings ( #728 )
...
* 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 >
2021-03-23 19:45:42 -04:00
9b9a983860
Jenkins refactor ( #732 )
...
* Jenkins refactor
* reorder
2021-03-22 21:17:02 -04:00
8f0549cd9a
PreRender decomped and equivalent (one small non-matching) ( #723 )
...
* now equivalent
* stuff
* remove struct
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain >
2021-03-20 15:10:10 -04:00
493bdbc3c6
git subrepo pull --force tools/ZAPD ( #727 )
...
subrepo:
subdir: "tools/ZAPD"
merged: "4751db5c9"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "4751db5c9"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2021-03-20 12:02:12 -04:00
77ec4d4916
object_bg and object_mir_ray OK ( #714 )
...
* object_bg and object_mir_ray
* remove externs in mir_ray
* newline at end of xml
* fix a couple of warnings in Obj_Tsubo
2021-03-18 03:46:42 -04:00
e48e565ffe
object_hidan_objects OK ( #695 )
...
* xml
Signed-off-by: angie <angheloalf95@gmail.com >
* add to spec and remove repetaed entries
Signed-off-by: Angie <angheloalf95@gmail.com >
* add some dlists
Signed-off-by: Angie <angheloalf95@gmail.com >
* add a few offsets
Signed-off-by: Angie <angheloalf95@gmail.com >
* fireballs textures
Signed-off-by: Angie <angheloalf95@gmail.com >
* add some unused dlists
Signed-off-by: Angie <angheloalf95@gmail.com >
* change the references in decompiled objects
Signed-off-by: angie <angheloalf95@gmail.com >
* change the references from non matching actors
Signed-off-by: angie <angheloalf95@gmail.com >
* add blob
Signed-off-by: angie <angheloalf95@gmail.com >
* changes requested by @Zelllll
Signed-off-by: angie <angheloalf95@gmail.com >
* why is this object so big?
Signed-off-by: angie <angheloalf95@gmail.com >
* rename a lot of stuff
Signed-off-by: Angie <angheloalf95@gmail.com >
* this object never ends
Signed-off-by: angie <angheloalf95@gmail.com >
* Some floats
Signed-off-by: angie <angheloalf95@gmail.com >
* stones blocks
Signed-off-by: angie <angheloalf95@gmail.com >
* rename fireball and stuff
Signed-off-by: Angie <angheloalf95@gmail.com >
* Stationary flame thrower
Signed-off-by: Angie <angheloalf95@gmail.com >
* SpinningFlamethrower
Signed-off-by: Angie <angheloalf95@gmail.com >
* Rename the lasts textures
Signed-off-by: Angie <angheloalf95@gmail.com >
* some random renamings
Signed-off-by: Angie <angheloalf95@gmail.com >
* run format
Signed-off-by: Angie <angheloalf95@gmail.com >
* Remove .gitkeep
Signed-off-by: angie <angheloalf95@gmail.com >
2021-03-18 03:23:59 -04:00
6b9a44e5a0
object_gj OK ( #698 )
...
* 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 >
2021-03-17 17:53:05 -04:00
d3311f9a29
Various objects ( #677 )
...
* object_okuta
* object_crow
* object_wallmaster
* named wallmaster textures
* object_dodongo
* object_firefly
* object_fire
2021-03-17 17:06:56 -04:00
7b68e8b771
object_anubice OK ( #696 )
...
* xml
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* add all the object to xml
Signed-off-by: Angie <angheloalf95@gmail.com >
* add object to srccode
Signed-off-by: Angie <angheloalf95@gmail.com >
* A bit of naming
Signed-off-by: angie <angheloalf95@gmail.com >
* final rename
Signed-off-by: angie <angheloalf95@gmail.com >
* add unused particle
Signed-off-by: angie <angheloalf95@gmail.com >
* rename unused particle dls
Signed-off-by: angie <angheloalf95@gmail.com >
* delete gitkeep
Signed-off-by: angie <angheloalf95@gmail.com >
* run format.sh
Signed-off-by: angie <angheloalf95@gmail.com >
2021-03-17 21:22:06 +01:00
7f55e088e5
Match ObjMure2_SetPosShrubCircle ( #721 )
...
* Match ObjMure2_SetPosShrubCircle
* reloc
Co-authored-by: zelda2774 <zelda2774@invalid>
2021-03-17 19:52:14 +01:00
867b5a87ba
Add distclean rule to makefile ( #716 )
...
* Add clean_everything rule to makefile
Signed-off-by: angie <angheloalf95@gmail.com >
* change `clean_everything` to `distclean`
Signed-off-by: angie <angheloalf95@gmail.com >
* Somehow forgot to commit the makefile
Signed-off-by: angie <angheloalf95@gmail.com >
* Remove nuke
Signed-off-by: angie <angheloalf95@gmail.com >
* Remove redundant variables
Signed-off-by: angie <angheloalf95@gmail.com >
* Forgot to remove `TEXTURE_DIRS`
Signed-off-by: angie <angheloalf95@gmail.com >
2021-03-14 12:07:46 -04:00
42af56b231
git subrepo pull --force tools/ZAPD ( #718 )
...
subrepo:
subdir: "tools/ZAPD"
merged: "4bf6600a3"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "4bf6600a3"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2021-03-14 11:40:25 -04:00
8a730123b6
DoorKiller OK ( #631 )
...
* Init done
* slight tweak
* Destroy done
* func_80995020
* func_809951C4 done
* started func_80995A84
* func_80995A84, func_80995284, func_809952B8 done
* started the mess that is func_80995368
* most functions done except for 3 trouble cases
* func_80995368 done
* func_809958E4 done
* fully matching. Documentation and cleanup to come
* fixed fake matches
* documentation progress
* More documentation
* getting close on tidying up everything
* Finalised documentation and made some comments and name changes in player and other door files
* formatting and final touches to comments
* pr stuff
* merge master
* merge
* format
* remove unused asm after merge
* review
* \n
Co-authored-by: fig02 <fig02srl@gmail.com >
2021-03-14 11:21:15 -04:00
ca5a9aa7d1
EnEncount2 and EnFireRock OK ( #659 )
...
* first two funcs done
* fixing struct var name due to external use
* func_80A07CA4 done
* started EnEncount2_Update
* EnEncount2_Update done
* Encount2 done!
* EnFireRock_Init done (but will only match once initvars are uncommented
* progress
* 4 funcs left
* Fully matching
* minor formatting
* renames
* change structs back to normal
* formatting
* removing unused comments
* even more formatting stuff
* removed unused asm
* pr stuff
* pr stuff
* added newline at end of file
* some merge suggestions
* more pr stuff
* review
Co-authored-by: fig02 <fig02srl@gmail.com >
2021-03-14 10:39:41 -04:00
8e0fa07a7e
ovl_Item_Shield OK ( #717 )
...
* ovl_Item_Shield OK
* ovl_Item_Shield fix spec
* review changes
* review comments 2
2021-03-11 15:47:00 -05:00
7c5ae8cc03
ovl_bg_haka_ship OK ( #712 )
...
* 2 non matchings left
* decompiled ovl_Bg_Haka_Ship
* review suggestions
* parent/child (Actor*)
* removed unneeded cast
* removed DECR
* review 2 suggestions, removed some redundant parentheses
2021-03-10 19:02:22 -05:00
80d0b2785d
ovl_En_Brob OK ( #708 )
...
* ovl_En_Brob OK
* Review changes
2021-02-28 10:43:25 -05:00
2b70c84307
ovl_Demo_Du OK ( #683 )
...
* DemoDu_Init and externed data
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* functions called by init
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* DemoDu_Destroy
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* DemoDu_Update
Signed-off-by: angie <angheloalf95@gmail.com >
* DemoDu_Draw
Signed-off-by: angie <angheloalf95@gmail.com >
* func_80969FD0
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8096B840
Signed-off-by: angie <angheloalf95@gmail.com >
* two non matching functions
Signed-off-by: angie <angheloalf95@gmail.com >
* import data
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8096BF60
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8096BF54
Signed-off-by: angie <angheloalf95@gmail.com >
* about half of the updates functions
Signed-off-by: angie <angheloalf95@gmail.com >
* almost the other half of update functions
Signed-off-by: angie <angheloalf95@gmail.com >
* the rest of the updates functions
Signed-off-by: angie <angheloalf95@gmail.com >
* DemoDu_UpdateEyes
Signed-off-by: angie <angheloalf95@gmail.com >
* bunch of functions
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8096A970
Signed-off-by: angie <angheloalf95@gmail.com >
* Another chunk of functions
Signed-off-by: angie <angheloalf95@gmail.com >
* More functions and a bit of renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* More functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* a bit of renaming and five more functions
Signed-off-by: angie <angheloalf95@gmail.com >
* nonmatching function still not matching
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8096B57C and a bit of renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* func_8096A528
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* move static variables around
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* another bit of renaming
Signed-off-by: angie <angheloalf95@gmail.com >
* REG
Signed-off-by: angie <angheloalf95@gmail.com >
* Document the functions that give the medallion to player
Signed-off-by: angie <angheloalf95@gmail.com >
* More function renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* more function renaming
Signed-off-by: angie <angheloalf95@gmail.com >
* firemedallion and credits
Signed-off-by: angie <angheloalf95@gmail.com >
* rename some variables in a nonmatching function
Signed-off-by: angie <angheloalf95@gmail.com >
* i hate this function, and it is so dumb.
it took me days to figure it out, the error was so stupid
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* rename mouthtextures and some variables
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* Rename almost all the missing functions
Signed-off-by: angie <angheloalf95@gmail.com >
* whoops, i forgot to run format.sh
Signed-off-by: angie <angheloalf95@gmail.com >
* Renaming the references to the cutscene at the chamber of the sages after killing ganon
Thanks to @tharo
Signed-off-by: angie <angheloalf95@gmail.com >
* Many of the changes requested by @petrie911
Signed-off-by: angie <angheloalf95@gmail.com >
* Inline the assignments at DemoDu_CsGoronsRuby_SpawnDustWhenHittingLink
Signed-off-by: angie <angheloalf95@gmail.com >
* change wrong type
Signed-off-by: angie <angheloalf95@gmail.com >
* changes requested by @fig02
Signed-off-by: angie <angheloalf95@gmail.com >
* run format
Signed-off-by: angie <angheloalf95@gmail.com >
* remove s prefix in dustPosOffsets
Signed-off-by: angie <angheloalf95@gmail.com >
2021-02-28 10:19:54 -05:00
62606737f1
ovl_Demo_Gj Ok ( #670 )
...
* a bunch of functions
Signed-off-by: angie <angheloalf95@gmail.com >
* another bunch of functions
Signed-off-by: angie <angheloalf95@gmail.com >
* add dummies to func_8097911C to match it
Signed-off-by: angie <angheloalf95@gmail.com >
* fix some functions declarations
Signed-off-by: angie <angheloalf95@gmail.com >
* Add functions of the array used by the update function
Signed-off-by: angie <angheloalf95@gmail.com >
* add functions used by draw
Signed-off-by: angie <angheloalf95@gmail.com >
* draw and update functions
Signed-off-by: angie <angheloalf95@gmail.com >
* DemoGj_Init
Signed-off-by: angie <angheloalf95@gmail.com >
* fix some functions declarations
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* 9 small functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* Some unmatched functions and 12 small matched functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* another 7 small functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* add data
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* small types fixes
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* six more functions
Signed-off-by: angie <angheloalf95@gmail.com >
* func_80978C20
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8097BA48
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* five repeated functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* Array of cylinders and two other functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* seven equals and problematic functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* func_80978F60 and func_80979860
Signed-off-by: angie <angheloalf95@gmail.com >
* func_8097923C doesn't want to match :c
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* three not matching functions
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* func_80978AFC
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* three more
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* DemoGj_FindGanon
Signed-off-by: angie <angheloalf95@gmail.com >
* func_809797E4
Signed-off-by: angie <angheloalf95@gmail.com >
* func_80978B90
Signed-off-by: angie <angheloalf95@gmail.com >
* last non matching function
Signed-off-by: angie <angheloalf95@gmail.com >
* erase reloc
Signed-off-by: angie <angheloalf95@gmail.com >
* a bit of renaming
Signed-off-by: angie <angheloalf95@gmail.com >
* another chunk of renaming
Signed-off-by: angie <angheloalf95@gmail.com >
* fix reg macros and a few comments
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* vt, arrayfuncs renaming and another bit of renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* More renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* i'm hating this actor
Signed-off-by: angie <angheloalf95@gmail.com >
* format
Signed-off-by: angie <angheloalf95@gmail.com >
* Changes asked by @shawlucas
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* swap globalCtx and globalCtx2
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* Move static variables nearer to where they are used and general cleanup
Signed-off-by: Anghelo <angheloalf95@gmail.com >
* A bunch of changes
Signed-off-by: angie <angheloalf95@gmail.com >
* run format.sh
Signed-off-by: angie <angheloalf95@gmail.com >
* Forgot to change updateMode
Signed-off-by: Angie <angheloalf95@gmail.com >
* Rename the references to object_gj
Signed-off-by: Angie <angheloalf95@gmail.com >
* Rename some functions
Signed-off-by: Angie <angheloalf95@gmail.com >
* document the actor params, a few members and rename some draw functions
Signed-off-by: Angie <angheloalf95@gmail.com >
* Rename DemoGj_DrawRubbleDisplayList into DemoGj_DrawRotated
Signed-off-by: angie <angheloalf95@gmail.com >
* The first type is the the rubble that is around the fight's arena
Signed-off-by: angie <angheloalf95@gmail.com >
* rename the enums
Signed-off-by: angie <angheloalf95@gmail.com >
* Document the value read from the Ganon instance and rename a few functions from that
Signed-off-by: Angie <angheloalf95@gmail.com >
* rename init and draw functions
Signed-off-by: Angie <angheloalf95@gmail.com >
* rename smoke spawner functions
Signed-off-by: angie <angheloalf95@gmail.com >
* run format.sh
Signed-off-by: angie <angheloalf95@gmail.com >
* fix merge issues
Signed-off-by: Angie <angheloalf95@gmail.com >
2021-02-28 09:53:46 -05:00
c47372d397
Update z64actor.h ( #710 )
2021-02-24 22:37:20 -05:00
e0bab1163e
lifemeter fixes ( #709 )
2021-02-24 15:42:25 -05:00
petrie911