1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-27 23:36:22 +00:00
Commit graph

4 commits

Author SHA1 Message Date
cadmic
1b0e35c89a
Extract NTSC assets for gc-us (#1973)
* Extract NTSC assets for gc-us

* Extract kanji

https://github.com/zeldaret/mm/pull/1536

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
2024-06-26 06:22:26 -04:00
louist103
665283432b
Even more objects (#913)
* malon adult limbs and enum

* malon adult animations

* Malon Adult textures

* Object_ma2 OK

* Cleanup undefined syms file

* more cleanup

* object_in OK

* change

* Object_TA limbs and Limb DLs ok

* Textures in DLs OK

* Object TA animations OK

* Object TA OK

* clean up the xml

* almost done with impa textures

* name impa draw funcs

* fix globalCtx2 in talon_init

* more progress in impa

* eye texture stuff

* impa OK

* remove files

* fix messed up merge

* Switch MA2 blink timer from hex

* Name a function

* Fix skelanime fixer

* Missing malon adult TLUT

* add some missing symbols in DemoEc

* Fix conflicts, part2

* Clean up TLUT related stuff and some minor things

* Remove unused externs from z_demo_ec

* Remove unused symbols from undefined_syms.txt

* PR fixes (Dragorn)

* Dragorn fixes

* Fix various texture-related issues in object_link_child

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_ta.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update assets/xml/objects/object_in.xml

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* fix ingo and the rest of Dragorns fix

* impa fixes

* fix ingo again

* fix windmill man missing TLUT

* Fix impa in viewer

* Roman's fixes

* Add limb

* Missed an animation

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-11-24 19:37:36 +01:00
Anghelo Carvajal
5c147e5e03
ZAPD update: Gotta go fast! (#877)
* copy over the xml

* Rename anims

* A bunch of renames

* minor extract_assets fixes

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "820678b4e"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "820678b4e"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Change rgb5a1 to rgba16

* eye and eyebrows

* some dlists

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "6be9af65d"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "6be9af65d"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
2021-07-27 22:16:03 -04:00
Anghelo Carvajal
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