Commit Graph

2695 Commits

Author SHA1 Message Date
Yanis
4608e7f97d HackerOoT clean-up (#154)
* makefile changes

* minor 'if's cleanup

* changed version to ntsc-1.2 and removed hackeroot-mq

* fixed some build issues

* format files

* fix boot issues

* remove mod_assets system

* add f3dex2 offsets for ntsc 1.0, 1.1 and 1.2

* update F3DEX3

* format

* make adjustements

* post-merge fixes

* remove settings.json from tracking

* temp delete c_cpp_properties.json

* hopefully fix .vscode oddities

* fixed sym_info

* fix build issues

* fixed profiler issues

Co-authored by: Thar0 <17233964+Thar0@users.noreply.github.com>

* format + don't format example scene sources

* proper f3dex3 patches folders

---------

Co-authored-by: Yanis42 <35189056+Yanis42@users.noreply.github.com>
2025-07-02 14:36:16 +02:00
Yanis
48d94830db Merge pull request #172 from Yanis002/decomp_merge
Merge zeldaret/main
2025-06-02 14:02:46 +02:00
Yanis002
bddcf58f31 fix issues 2025-06-02 13:33:52 +02:00
Yanis002
97a565996c Merge remote-tracking branch 'decomp/main' into decomp_merge 2025-06-02 13:11:36 +02:00
Dragorn421
d2ef102802 Add Vtx[] resources in xmls for undocumented assets (#2547) 2025-06-01 18:53:56 +02:00
Dragorn421
a4182086ee T() macro in overlays 9 (#2552)
* T() okarina_effect, ossan, reeba, rr

* T() ru1, sb, sth, syateki_itm

* T() syateki_niw, ta, takara_man, tite

* T() tubo_trap, wall_tubo, weather_tag, wf

* T() wonder_talk, wonder_talk2

* review
2025-06-01 17:53:13 +02:00
Pepe20129
1f9bf023a0 Document kaleido debug menu (#2506)
* Document kaleido debug menu

* Fix BSS

* bss

* Address reviews

* bss

* add #pragma increment_block_number to z_parameter and let CI do its thing

* bss

* buffer -> digitBuf

* reformat comments on sSectionPositions. trick clang-format into not ruining the array by adding // comments on their own line

* rename to KaleidoScope_DrawInventoryEditor

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2025-06-01 17:10:49 +02:00
Dragorn421
f4028e49b9 T() macro in overlays 10 (#2553)
* T() mm2, niw, file_choose, file_nameset, kaleido_equipment, kaleido_item

* T() girla, ossan, xc

* review
2025-06-01 09:37:42 -04:00
Dragorn421
66a7720dcd csdis.py: write CS_CMD_ACTOR_CUE_ names in actor cue list header (#2561) 2025-06-01 09:18:13 -04:00
Dragorn421
84d4b6701f T() macro in overlays 8 (#2551)
* There is no bank!!

* T() horse_game_check, hs, ice_hono, insect

* T() ishi, kusa

* T() kakasi, kakasi2, kakasi3

* T() Got the rail data

* T() ko, ny, okarina_tag

* review

* review2
2025-05-31 14:14:22 +02:00
Dragorn421
186dfb4aa9 GetItem_Draw: giDrawId and comment GID_ values (#2556)
* rename GetItem_Draw's arg drawId -> giDrawId

* comment GID_ enum values on sDrawItemTable

* drawId -> giDrawId in GetItem_DrawXxx
2025-05-31 17:41:58 +09:00
Dragorn421
fd5fbe138d Commit icon_item_24_static, icon_item_{fra,ger,jpn,nes}_static, item_name_static (#2562)
* commit icon_item_24_static

* commit icon_item_LANG_static for LANG in fra,ger,jpn,nes

* commit item_name_static
2025-05-31 10:26:04 +02:00
Dragorn421
dd6e8a87e9 Add Vtx[] resources in xmls for documented assets 1 (#2549)
* Add Vtx[] resources in xmls for documented assets 1

* fix duplicate gTriforceVtx (the existing gTriforceVtx resource was too short)
2025-05-31 10:09:06 +02:00
Dragorn421
ae0396f83b Fix Link eyes left/right (#2558)
* Fix gLinkAdultEyes Left/Right Tex names

* swap PLAYER_EYES_ LEFT/RIGHT and related

* comment on gLinkChildEyesLeftTex/Right appearing swapped
2025-05-31 09:48:19 +02:00
Derek Hensley
8a95f90b20 sPlayerFaces as array of structs instead of 2d array (#2559) 2025-05-29 09:17:38 -04:00
Dragorn421
d62bf87542 Fix sym_info.py for older Python (#2557) 2025-05-29 02:26:58 -04:00
Dragorn421
e991255a45 T() macro in overlays 7 (#2545)
* T() fish, fr, g_switch

* T() ge1, ge2, gm, goroiwa

* T() heishi1-3

* review
2025-05-28 02:04:48 +09:00
Dragorn421
6459f33800 T() macro in overlays 6 (#2544)
* z_en_dns.c and questionable translation for 売りナッツ

* T() dnt_demo, dnt_jiji, dnt_nomal with translating the probably misspelled デグナッツ as deku scrub (japanese text of the game uses デクナッツ (note the second character is slightly different) and is translated to english as Deku Scrub)

* T() dy_extra, encount2, ex_ruppy, fhg_fire, fire_rock

* review

* なにみの? -> What?
2025-05-28 01:46:27 +09:00
Dragorn421
1eaae98ed3 T() macro in overlays 4 (#2533)
* T() macro in various overlays

* revert problematic T() in mir_ray
2025-05-27 18:00:25 +02:00
Dragorn421
91e9553ee5 [assets system] Fix fusing resource buffer markers (#2548) 2025-05-27 17:41:51 +02:00
Dragorn421
a399f90f9a [assets] Sort gkeep resources by offset (#2550) 2025-05-27 11:19:57 -04:00
Dragorn421
68ea3bcc00 [assets] Better automatic names for subdata of Anim and Col data (#2543)
* better auto names for anim subdata

* better auto names for col subdata
2025-05-26 20:15:20 -04:00
Dragorn421
ecb9b64354 Commit icon_item_static (#2546)
* cp extracted/PAL_VERSION/... assets/...

* make NTSC compatible

* include cleanup

* progress

* progress2

* format

* comments
2025-05-26 17:44:06 -04:00
Dragorn421
6b9656b42a Commit object_link_child (#2542)
* add Vtx resources to object_link_child.xml

* object_link_child.xml limb enum and tlut blob

* cp extracted/... assets/...

* start cleanup, delete useless declarations

* inhibit object_link_child.c source gen

* move textures _WIDTH and _HEIGHT to .c, remove useless tex decls

* comments

* fixup object_link_boy comments

* remove unreferenced DLs decls

* rm 0 padding

* format the .c

* fixup

* bss
2025-05-26 16:59:33 -04:00
Dragorn421
b3a16a61d4 Cleanup colliders 4 (#2470)
* cleanup around `ColliderJntSphElement` usage

* cleanup around `ColliderCylinder` usage

* cleanup around `ColliderCylinderInit` usage

* cleanup around `ColliderTrisElement`, `ColliderTris` usage

* cleanup around `ColliderTrisElementInit`, `ColliderTrisInit` usage

* cleanup around `ColliderQuadInit` usage

* sColliderInit -> sCollider<Type>Init

* format

* triElemInit -> triElementInit
2025-05-26 19:15:33 +02:00