mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-24 16:01:26 +00:00
Code Issues Projects Releases Wiki Activity
2410 commits 1 branch 0 tags 565 MiB
Commit graph

239 commits

Author SHA1 Message Date
Dragorn421
7b503e9e8c
Merge branch 'main' into meta_new_assets_2025 2025-02-16 23:03:51 +01:00
Dragorn421
7cb604387b
assets xmls fixes 2025-02-16 13:14:10 +01:00
cadmic
bbcdf22647
Identify some unaccounted and blob asset data (#1953) 
* Identify some unaccounted and blob asset data

* Add bug comments for flex skeleton weirdness

* Use (SkeletonHeader*) cast instead of .sh

* Fix vtx counts
 2025-02-14 08:06:49 +01:00
Dragorn421
e3831947b0
Assets fixups 2 (#2461) 2025-02-12 12:56:04 -05:00
Dragorn421
15692565fe
extract sTransCircleDL and sTransWipeDL 2025-02-10 22:29:49 +01:00
Dragorn421
dae083d039
fixups, gc-eu OK 2025-02-09 14:36:14 +01:00
Dragorn421
485640273d
Merge branch 'main' into meta_new_assets_2025 2025-02-09 13:34:09 +01:00
Dragorn421
bb7215b25a
introduce RawPointers xml attribute to ignore specific pointers and keep them raw 2025-02-09 12:19:44 +01:00
Dragorn421
6b857c6c71
handle dependencies between xmls 2025-02-09 11:39:24 +01:00
Dragorn421
8ef1c164a4
xml fixes 2025-02-08 18:10:17 +01:00
Dragorn421
924d8e81b9
Assets fixups (#2454) 
* Assets fixups

* gDCRoom0TLUT, also object_mo.xml and ddan.xml

* gMegami3TLUT -> Tex

* yeet gDCRoom0TLUT (crashes ZAPD for an unknown reason)
 2025-02-07 12:43:09 -05:00
Dragorn421
d5018d37fd
ntsc-1.0 OK 2025-02-06 21:01:49 +01:00
Dragorn421
3446ede90b
yeet XmlPath from ExternalFile usage 2025-02-06 14:12:50 +01:00
Dragorn421
f70a07f8cf
Merge branch 'main' into meta_new_assets_2025 2025-02-05 19:21:41 +01:00
Dragorn421
8411c34b38
wip: New assets system tm 
Builds gc-eu-mq-dbg OK from clean after
1) make setup
2) python3 -m tools.assets.extract -j
3) replace 0x80A8E610 with sShadowTex in extracted/gc-eu-mq-dbg/assets/overlays/ovl_En_Jsjutan/sShadowMaterialDL.inc.c
4) make various symbols in extracted data like sTex static
 2025-02-05 16:31:29 +01:00
Tharo
c028db03b4
Finish matching ique-cn (#2451) 
* git subrepo clone git@github.com:Thar0/com-plugin.git tools/com-plugin

subrepo:
  subdir:   "tools/com-plugin"
  merged:   "e8543312d"
upstream:
  origin:   "git@github.com:Thar0/com-plugin.git"
  branch:   "main"
  commit:   "e8543312d"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* ique-cn OK

* Review suggestions

* Most suggestions

* git subrepo pull tools/com-plugin

subrepo:
  subdir:   "tools/com-plugin"
  merged:   "81595ed1c"
upstream:
  origin:   "git@github.com:Thar0/com-plugin.git"
  branch:   "main"
  commit:   "81595ed1c"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* Fix other versions
 2025-02-04 06:55:04 -05:00
cadmic
cd21783a44
[iQue] Match z_en_mag (#2439) 
* [iQue] Match z_en_mag

* Add comment for iQue "PRESS"

* Format
 2025-01-24 23:41:32 -05:00
Tharo
fbeb477e68
iQue text extraction (#2383) 
* iQue text extraction

* More consistent terminology

* Fixes for jpn, split each encoding into a separate charmap file, merge enc.nes.h and enc.chn.h

* Merge nes and chn in DEFINE_MESSAGE macros

* Remove redundant defines in nes_message_data_static
 2024-12-25 12:07:08 -05:00
cadmic
471fe51c82
Set up build system for ique-cn (#2382) 
* Set up build system for ique-cn

* Fix size of fbdemo_circle assets

* Treat iQue as NTSC and Use "NES" for Chinese text

* Revert z_kanfont
 2024-12-21 14:13:56 -05:00
Yanis
f88e62bfe1
fix tiny mistake (#2368) 2024-12-16 10:53:59 -05:00
Yanis
76c1b621ac
Name cutscenes of remaining actors (#2366) 
* name cs from remaining actors

* small change for consistency

* review
 2024-12-15 14:29:52 -05:00
Yanis
b270d58f43
Name cutscenes from Temple of Time (#2363) 
* name temple of time cutscenes

* review
 2024-12-15 13:00:51 -05:00
Yanis
2eb0b91516
Name cutscenes from Death Mountain Trail (#2357) 
* name dmt cutscenes

* review
 2024-12-15 07:24:17 -05:00
Yanis
db8d351c5b
Name some scene cutscenes 2 (Graveyard, Meadow and Lake Hylia) (#2339) 
* name cs from graveyard, meadow and lake hylia

* `gLakeHyliaWaterRaisingCs` --> `gLakeHyliaRestoredCs`
 2024-12-14 19:53:28 -05:00
Yanis
793516290e
name cs from chamber of sages, link's house, courtyard and shooting gallery (#2362) 2024-12-13 23:26:06 -05:00
Yanis
a59a60e414
Name cutscenes from dungeons (Spirit Boss Room, Jabu-Jabu's Belly and Ganon) (#2361) 
* name cs from dungeons

* review
 2024-12-13 21:17:04 -05:00
Yanis
4b20d8269b
Naming cutscenes from Lon-Lon Ranch (#2359) 
* name cs from ranch

* fixed llr credits cs dest part 5 and 6 being inverted

* format
 2024-12-13 18:28:48 -05:00
Yanis
d12750b956
Name some cutscenes 3 (Zora's Domain, Zora's Fountain, Lost Woods and Desert Colossus) (#2355) 
* name cs from domain, fountain, lost woods and colossus

* review
 2024-12-13 17:28:20 -05:00
Yanis
2f40fed5c1
Naming some cutscenes 4 (Gerudo Fortress, Death Mountain Crater and Goron City) (#2356) 
* name cs from gerudo fortress, dmc and goron city

* format and updated comment about the darunia dancing cutscene

* review 2
 2024-12-13 17:03:51 -05:00
Yanis
0fc36972fb
Name Kokiri Forest cutscenes (and related ones) (#2338) 
* named kokiri forest cutscenes (and related parts)

* added missing pal n64 names (and changes in code)

* removed unneeded comments

* add kokiri forest duplicates from spirit temple

* review 1

* review 2 (+ build fix)
 2024-12-12 20:21:49 -05:00
Leonid Kapitonov
9305a71458
Document Mido functions, fields, and animations (#2289) 
* Document `func_80AAA250`

new name: `EnMd_ReverseAnimation`

* rename `enum EnMdAnimation` > `enum EnMdAnimIndex`

* Document `struct EnMd` fields (and functions)

the list:

* `func_80AAAC78` -> `EnMd_TrackMessageState`
* `func_80AAAA24` -> `EnMd_UpdateAnimState_WithTalking`

* `func_80AAA92C` -> `EnMd_SetAnimState`
* `func_80AAA93C` -> `EnMd_UpdateAnimState`
* `func_80AAA274` -> `EnMd_UpdateAnimState1`
* `func_80AAA308` -> `EnMd_UpdateAnimState2`
* `func_80AAA39C` -> `EnMd_UpdateAnimState3`
* `func_80AAA474` -> `EnMd_UpdateAnimState4`
* `func_80AAA508` -> `EnMd_UpdateAnimState5`
* `func_80AAA5A4` -> `EnMd_UpdateAnimState6`
* `func_80AAA638` -> `EnMd_UpdateAnimState7`
* `func_80AAA6D4` -> `EnMd_UpdateAnimState8`
* `func_80AAA768` -> `EnMd_UpdateAnimState9`
* `func_80AAA7FC` -> `EnMd_UpdateAnimState10`
* `func_80AAA890` -> `EnMd_UpdateAnimState11`

* Document `func_80AAB158`

new name: `EnMd_UpdateTalking`

* Document `func_80034DD4` @ `z_actor.c`

new name: `Actor_SmoothStep_Attention`

* Document `func_80AAB5A4`

new name: `EnMd_SmoothStep_Attention`

* Document Mido's action functions

the list:
* `func_80AAB874` -> `EnMd_Idle`
* `func_80AAB8F8` -> `EnMd_Watch`
* `func_80AAB948` -> `EnMd_BlockPath`
* `func_80AABC10` -> `EnMd_ListenToOcarina`
* `func_80AABD0C` -> `EnMd_Walk`

* rename flag `temp2` -> `canUpdateTalking`

* (re)document Mido's animations

via blender and fast64

* marginally improve comments

* marginally improve comments

* actually, yes, let's name action functions as such

* Document eye textures as an enum

to clarify for `EnMd_UpdateEyes`

* rename `eyeIdx` -> `eyeTexIndex`

Mido has two eyes and different textures for them

* Undocument eye textures as an enum

i was wrong: `_Draw` function might not follow the eyes texture order
it is its own thing, like `enum EnMdBlinking` or nothing at all, yeah

* ugh, and fix a typo with blinking

rushing is no good

* drop the `Action` suffix

https://github.com/zeldaret/oot/pull/2289#discussion_r1837272286

* rename animation states as sequences

https://github.com/zeldaret/oot/pull/2289#discussion_r1837274923

* `func_80034DD4` -> `Actor_FadeInOut`

https://github.com/zeldaret/oot/pull/2289#discussion_r1837267267

* rename animation states as sequences

a continuation of b11a9e9942

* `func_80034DD4` -> `Actor_UpdateAlphaByDistance`

https://github.com/zeldaret/oot/pull/2289#discussion_r1838398475

* clarify a comment

* Document `actor.params` bits allocation

* apply review suggestions

* apply review suggestions

* apply review suggestions

* apply review suggestions

* apply review suggestions
 2024-12-09 08:06:05 -05:00
Yanis
da7958db22
Name some scene cutscenes (Hyrule Field and Kakariko Village) (#2321) 
* give names for hyrule field and kakariko cutscenes

* review
 2024-12-07 06:25:14 -05:00
mracsys
e0bd123312
Document time-specific textures for Deku Tree and Gerudo Fortress similar to other scenes (#2310) 
* rename time-specific scene file textures

* linter fixes
 2024-11-30 13:56:59 -05:00
Tharo
2d454933f3
[Audio 9/?] Multiversion samplebank and soundfont extraction xmls, 1.0 and 1.1 audio extraction (#2291) 
* [Audio 9/?] Multiversion samplebank and soundfont extraction xmls, 1.0 and 1.1 audio extraction

* Rework multiversion samplebanks to reduce duplicates
 2024-11-12 08:47:34 -05:00
Derek Hensley
a53fb02699
EnHy + objects docs (#1499) 
* document object_bba

* Clean up cne

* object bob

* object_aob

* object_cob

* object_bji

* object_ahg

* object_boj

* All functions named plus some cleanup

* enums

* Remove body wiggle comments

* Format

* Remove case comments

* comments with default

* Format

* format
 2024-10-15 05:20:46 -04:00
cadmic
d3bf8ae78b
[ntsc-1.0/1.1] Extract assets (except audio) for ntsc-1.0 and ntsc-1.1 (#2253) 
* [ntsc-1.0/1.1] Extract assets (except audio) for ntsc-1.0 and ntsc-1.1

* Fix merge with pal-1.0/1.1
 2024-10-09 14:22:57 +02:00
cadmic
04498f808f
[PAL N64] Match file select language selection (#2240) 
* [PAL N64] Match file select language selection

* sInitialLanguageInputTimerY -> sInitialLanguageInputTimerX
 2024-09-28 13:12:57 -04:00
cadmic
2f3c8084c9
[PAL N64] Set up build system and extract assets for pal-1.0 and pal-1.1 (#2205) 
* [PAL N64] Set up build system and extract assets

* TOOD -> TODO

* Apparently this is what the formatter wants
 2024-09-26 15:19:23 -04:00
cadmic
f7a0117e7d
[ntsc-1.0/1.1] Match z_boss_ganon.c and z_boss_ganon2.c changes from PAL 1.0 (#2228) 2024-09-25 23:36:58 -04:00
cadmic
dc9782b5b3
[PAL N64] Rename file select assets (#2197) 2024-09-16 16:40:20 -04:00
AJ Otto
58d8abfe03
Added eye texture offsets for extraction for object_oE5.xml (#2181) 
* Blob object_oE5_Blob_003A40 corrected to extract eye half open and eye closed textures for object_oE5

* Fixed spacing in object_oE5 xml file for commit
 2024-09-10 13:53:49 -04:00
cadmic
e52d135e15
[ntsc-1.2] Import n64dd code from Decompollaborate/n64dd (#2136) 
* Import n64dd code from Decompollaborate/n64dd

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>

* Don't stub out missing textures

* Remove @brief

* Add low-effort file comments

* Match OoT if style

* Fix n64dd matching due to int vs long

* Fix English n64dd error textures

* Compress n64dd segment

* Align n64dd to 0x40

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
 2024-09-08 03:37:15 +09:00
fig02
88c4475967
Target -> Attention (System Rename) (#2149) 
* TargetContext -> Attention

* targetCtx -> attention

* Target_ -> Attention_

* FindTargetableActor -> FindActor

* targetableActorP -> attentionActorP

* data vars (and 1 function I missed)

* targetMode -> attentionRangeType

* attention range enum comments

* ATTENTION_RANGE_

* attention range data

* TargetColor -> AttentionColor

* missed one

* fixup color variables

* targetArrowOffset -> lockOnArrowOffset

* focus pos comment

* targetPriority -> attentionPriority

* assets

* loose-ends

* Attention System Description

* format

* skj range type

* enemy bgm
 2024-09-07 09:23:04 -04:00
Dragorn421
3a9ebfbbad
Pause doc: World map points (#2141) 
* Pause doc: World map points

* bss

* `WORLD_MAP_POINT_HYLIA_LAKESIDE` -> `_LAKE_HYLIA`
 2024-09-07 17:14:08 +09:00
Dragorn421
dc469461a9
Pause docs: WorldMapArea enum and related data (#2130) 
* Pause docs: WorldMapArea enum and related data

* `WORLD_MAP_AREA_20` -> `_QUESTION_MARK`

* bss
 2024-09-04 17:51:08 -04:00
Tharo
f1911cd937
[Audio 7/?] Extract sequences to assembly (#2119) 
* [Audio 7/?] Extract sequences to assembly

Co-authored-by: MNGoldenEagle <17274702+MNGoldenEagle@users.noreply.github.com>
Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>

* Suggested changes, some extra sequence disassembler cleanup

* Remove unused multiprocessing import and regen assets/xml/audio/sequences

---------

Co-authored-by: MNGoldenEagle <17274702+MNGoldenEagle@users.noreply.github.com>
Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>
 2024-09-05 02:55:04 +09:00
cadmic
8366b8731e
Set up build system and disassembly for ntsc-1.2 (#2021) 
* Set up build system for ntsc-1.2

* Set up disassembly for ntsc-1.2

* Add all unnamed functions to functions.txt

* Update docs/retail_versions.md for ntsc-1.2

* Format

* Update docs/retail_versions.md

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

* Remove mention of US

* OOT_N64 -> PLATFORM_N64, OOT_GC -> PLATFORM_GC

* Move mtxutil to libultra/gu

* Fix libultra/io bss splits

* Fix merge

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2024-08-11 06:20:43 -04:00
cadmic
d495436190
Match remaining GC retail versions (#2019) 
* Match the remaining GC retail versions

* Fix BSS ordering for existing versions

* Disable clang-format for #pragma increment_block_number

* sramResetCode -> sSramResetCode

* Replace 0xFF3F with or-ing all buttons together

* Revert "Disable clang-format for #pragma increment_block_number"

This reverts commit 406b6d26c9.

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2024-08-09 20:58:46 -04:00
Tharo
ef329e633a
[Audio 2/?] Extract audio samples to wav (#2020) 
* [Audio 2/?] Extract audio samples to wav

Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>

* How

* Hopefully fix warning I don't get locally

* Pad default sample filenames, comment on the vadpcm frame encoder functions, other suggested changes

* Small tweaks to above

* Remove some obsolete code

---------

Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>
 2024-08-08 22:39:18 -04:00
cadmic
feac688313
Match NTSC file select (#1998) 
* Match NTSC file select

Co-authored-by: inspectredc <inspectredc@gmail.com>

* nes -> eng in macros

* Duplicate more code but use less #ifs

* Format

---------

Co-authored-by: inspectredc <inspectredc@gmail.com>
 2024-08-08 00:27:02 -04:00