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
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
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
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
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
3eec91504c
Some static texture files "decompiled" ( #658 )
...
* .
* remove tools/ZAP2 from origin master
* Some texture files
* fix tabs in new texture files
* map_i_static
* some updates
* update names
* update more names
* nintendo_rogo_static
* title_static ok
* Added segment= to the texture files
* do_action_static update
* Made suggested changes
* Made suggested changes
* Fixed spec
2021-02-24 13:41:43 -05:00
f57e0467d2
Decompile object_syokudai and object_ydan_objects ( #699 )
...
* add deku and torch objects
* why git?
2021-02-17 14:42:59 -05:00
982c645167
Armos and object_am OK ( #652 )
...
* 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-15 19:41:55 +01:00
d615ec4f31
z_bg_jya_ironobj and object_jya_iron OK ( #676 )
...
* z_bg_jya_ironobj OK
* decompile object_jya_iron, clean up code
* implement requested changes
2021-02-13 19:10:40 -05:00
0a1c16d440
gameplay_dangeon_keep ( #665 )
...
* xml done
* add references in
* missed a few
* newline
* review
2021-02-12 18:33:55 -05:00
b8c2ec1f60
Forest Stage and related actors and objects ( #618 )
...
* 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-12 17:25:02 -05:00
ef272322eb
dekunuts OK ( #664 )
...
* 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-12 17:22:48 -05:00
da55eaa2d8
En_Zl4 ( #590 )
...
* 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-12 17:16:40 -05:00
7ee8c8011c
All* Get Item objects decompiled ( #668 )
...
* 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-12 22:57:06 +01:00
dff2dfef0f
En_Arrow OK ( #648 )
...
* 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-02 20:30:21 -05:00
6615d212eb
Demo_Kekkai, its object, and its cutscenes ( #627 )
...
* 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-02-01 14:52:23 -05:00
45a21b0ac7
EnNy OK ( #624 )
...
* 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-31 15:32:55 -05:00
9607ce34fd
object_torch2, object_blkobj, and object_geldb ( #592 )
...
* 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-30 14:16:18 -05:00
20c1f4e648
Decompile Gameplay_Keep and fix all existing decompiled objects ( #595 )
...
* 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-24 19:36:40 -05:00
ba0c6965ca
Remove submodule and use subrepo for ZAPD ( #591 )
...
* 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
2021-01-01 23:24:29 -05:00
2dfa188706
Docs for the Anime part of SkelAnime ( #517 )
...
* 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-29 17:46:46 -05:00
b95643b397
Updated Texture Asset Handling ( #478 )
...
* 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 >
2020-12-26 06:39:52 -05:00
fig02