summaryrefslogtreecommitdiff
path: root/assets/xml/objects
AgeCommit message (Collapse)Author
2021-05-01Decompile `object_zo` :dolphin: (#794)Anghelo Carvajal
* 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
2021-04-30General object cleanup (#799)Anghelo Carvajal
* Object cleanup * Fix running man * fix mm symbols
2021-04-25z_bg_mizu_movebg and object_mizu_objects (#747)mzxrules
* 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>
2021-04-21EnTp, 1 nonmatching, and object_tp (#782)EllipticEllipsis
* 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
2021-04-17Volvagia (ovl_Boss_Fd) and related actors (#352)petrie911
* 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>
2021-04-14ovl_En_Xc and object_xc OK (#746)Lucas Shaw
* 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>
2021-04-14object_horse and object_hni (#772)Anghelo Carvajal
* 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 the other horses from this branch Signed-off-by: angie <angheloalf95@gmail.com> * Rename Epona animations Signed-off-by: angie <angheloalf95@gmail.com> * rename animations of ingo's horse Signed-off-by: angie <angheloalf95@gmail.com> * add textures in hni Signed-off-by: angie <angheloalf95@gmail.com> * Give proper animation names Signed-off-by: angie <angheloalf95@gmail.com> * Update symbols Signed-off-by: angie <angheloalf95@gmail.com> * cutscenes Signed-off-by: angie <angheloalf95@gmail.com> * ./format.sh Signed-off-by: angie <angheloalf95@gmail.com> * Apply suggestions from code review Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Add most of epona's textures and some limbs Signed-off-by: angie <angheloalf95@gmail.com> * add a bunch of textures and limbs of hni Signed-off-by: Angie <angheloalf95@gmail.com> * typo Signed-off-by: Angie <angheloalf95@gmail.com> * trailling comma memes Signed-off-by: Angie <angheloalf95@gmail.com> * all textures from hni Signed-off-by: angie <angheloalf95@gmail.com> * The remaining epona's textures Signed-off-by: Angie <angheloalf95@gmail.com> * Use proper names for bridge cutscene Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-04-10Gerudo objects (#757)EllipticEllipsis
* 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
2021-04-10Player animation offsets (#762)EllipticEllipsis
* Changed PlayerAnimations to be named with offsets * named hover boots timer * update EnIshi sCylinderInits
2021-04-10Decompile and mostly document EnSkj, EnSkjNeedle, and OBJECT_SKJ. One ↵louist103
NON_MATCHING (#750) * 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)
2021-04-06Bongo Bongo (ovl_Boss_Sst) (#458)petrie911
* 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>
2021-04-04object_goma (#754)petrie911
* testing * all named * oh god spelling * fixes Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-04-04Poe Objects (#743)Tharo
* poe objects * Last unaccounted resolved, name suffix fixes * remove _tex * missed 2 * format Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-04-02Misc objects problems (#748)Anghelo Carvajal
* 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-03-29Phantom Ganon (ovl_Boss_Ganondrof) and related actors (#442)petrie911
* 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-28EnJj and object_jj OK (#741)EllipticEllipsis
* 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-28en_mm and object_mm OK (#735)fig02
* 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-27object_horse_ganon, object_horse_link_child, object_horse_normal and ↵Anghelo Carvajal
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-27object_du OK (#693)Anghelo Carvajal
* .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-27object_zl2, object_zl2_anime1 & object_zl2_anime2 OK (#694)Anghelo Carvajal
* 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-23Objects used in DemoEffect OK (#731)EllipticEllipsis
* 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-23Fix some fixable warnings (#728)Anghelo Carvajal
* 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-18object_bg and object_mir_ray OK (#714)EllipticEllipsis
* 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-18object_hidan_objects OK (#695)Anghelo Carvajal
* 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-17object_gj OK (#698)Anghelo Carvajal
* 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-17Various objects (#677)gamestabled
* object_okuta * object_crow * object_wallmaster * named wallmaster textures * object_dodongo * object_firefly * object_fire
2021-03-17object_anubice OK (#696)Anghelo Carvajal
* 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-02-17Decompile object_syokudai and object_ydan_objects (#699)Zelllll
* add deku and torch objects * why git?
2021-02-15Armos and object_am OK (#652)fig02
* started * all but 2 * OK * docs progress * lots of docs * add gitkeep back * all funcs named * small fix * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * object_am * change * ready i think * last thing * asm * progress
2021-02-13z_bg_jya_ironobj and object_jya_iron OK (#676)mzxrules
* z_bg_jya_ironobj OK * decompile object_jya_iron, clean up code * implement requested changes
2021-02-12gameplay_dangeon_keep (#665)fig02
* xml done * add references in * missed a few * newline * review
2021-02-12Forest Stage and related actors and objects (#618)petrie911
* 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>
2021-02-12dekunuts OK (#664)gamestabled
* dekunuts OK * named unk_19A * improved the match, got rid of volatile * one unaccounted blob * finished object_dekunuts * capitalization consistency * suggested changes * suggested changes again
2021-02-12En_Zl4 (#590)petrie911
* significant progress * cutscene data * match * docs * dist from link * compiler warnings * cutscene and such * object decomp * stuff * cleanup * name some things * stuff * cutscenes fixed * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "44f5d7cb9" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "44f5d7cb9" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * reorder * unused content * documented cutscene dlists * enviewer update * Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Zl4/z_en_zl4.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * formatter 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>
2021-02-12All* Get Item objects decompiled (#668)Tharo
* 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>
2021-02-02En_Arrow OK (#648)fig02
* 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
2021-02-01Demo_Kekkai, its object, and its cutscenes (#627)petrie911
* first pass * scene * object * name * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "44f5d7cb9" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "44f5d7cb9" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * now with cutscenes * one last name * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * ZAPD works * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "2e1174063" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "2e1174063" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * now with vtx arrays * revert zap changes * review Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-31EnNy OK (#624)louist103
* 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
2021-01-30object_torch2, object_blkobj, and object_geldb (#592)petrie911
* objects are fun * more objects * again * fixes to geldb * one more thing * forgot s * type fix * some formatting * change Gerudo name * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0305ec2c2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0305ec2c2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * organize xmls * outname Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-01-24Decompile Gameplay_Keep and fix all existing decompiled objects (#595)Zelllll
* 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>
2021-01-01Remove submodule and use subrepo for ZAPD (#591)fig02
* remove zap * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "cd4a8760b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "cd4a8760b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * remove thanks.md * zap2 -> zapd and spec changes * remove submodule init
2020-12-29Docs for the Anime part of SkelAnime (#517)petrie911
* 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>
2020-12-26Updated Texture Asset Handling (#478)Nicholas Estelami
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-05 09:52:54 +0000