mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 08:50:23 +00:00
Code Issues Projects Releases Wiki Activity
2498 commits 1 branch 0 tags 561 MiB
Commit graph

2000 commits

Author SHA1 Message Date
Dragorn421
1df6a3ee12
Assets: Move limb enums into xmls 1 (#2625) 2025-06-12 15:46:13 -04:00
Dragorn421
5870caba8b
Introduce CAM_DATA_SET_, CAM_ITEM_TYPE_ and name Player_SetTurnAroundCamera, Player_RequestCameraSetting (#2608) 
* Introduce `CAM_SET_CAMERA_DATA_`, `CAM_ITEM_TYPE_` and name `Player_CameraChangeSettingTurnAround`

* bss and formatting

* func_80835E44 -> Player_RequestCameraSetting

* -> Player_SetTurnAroundCamera

* -> CAM_DATA_SET_
 2025-06-10 22:18:00 -04:00
Dragorn421
939b292991
Commit object_ganon_anime3 (#2611) 
* Commit object_ganon_anime3

* rm from write_source.txt

* bss
 2025-06-09 15:07:35 -04:00
Dragorn421
d4a87889ff
Commit some assets/overlays/ 2 (#2610) 
* Commit some `assets/overlays/` 2

* format
 2025-06-09 07:06:46 -04:00
Jordan Longstaff
09a179960f
Child Ruto Actions: Enums (#2603) 
* Child Ruto Actions: Enums

* Stronger typedefs

* Fix wrong action enum usage

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

* Undo single-line formatting of actions array

* Fix formatting

* Remove trailing commas

* Move all enums to header

* Index action functions with comments

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2025-06-08 11:16:34 -04:00
Dragorn421
39de1e0204
WeaponInfo docs (#1596) 
* WeaponInfo docs

* format

* disasm metadata

* merge fixup

* Add MELEE_WEAPON_INFO_TIP and _BASE

* format

* Offset
 2025-06-07 23:37:13 -04:00
Tharo
45bee14f2f
Document fog functions Gfx_SetFog(2) and Play_SetFog (#1922) 
* Document fog functions Gfx_SetFog(2) and Play_SetFog

* review

* Apply suggestions from code review

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

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2025-06-07 22:44:20 -04:00
Dragorn421
714f43b9e9
Commit do_action_static (#2597) 
* Commit `do_action_static`

* fix

* rm do_action_static from write_source.txt
 2025-06-07 21:31:57 -04:00
Dragorn421
d3d5898f17
Update docs/Documenting.md (#1265) 
* Update docs/Documenting.md

* fix
 2025-06-07 19:37:46 -04:00
Dragorn421
c418bbb19c
Add Vtx[] resources in xmls for (partially) documented assets 10 (#2609) 
* Add Vtx[] resources in xmls for (partially) documented assets 10

* bss
 2025-06-07 17:57:18 -04:00
hiisuya
cba896c45c
Doc Actor: En_Ma2 (Adult Malon) (#2593) 
* ma2 actor docs start

* doc inftable entries in ma2

* removed testing prints

* added file description

* format.py ran
 2025-06-07 21:25:55 +02:00
Dragorn421
484abb1d39
Add Vtx[] resources in xmls for (partially) documented assets 9 (#2607) 2025-06-08 00:26:59 +09:00
Dragorn421
da40e39c97
Add Vtx[] resources in xmls for (partially) documented assets 7 (#2605) 
* Add Vtx[] resources in xmls for (partially) documented assets 7

* bss
 2025-06-07 10:51:44 -04:00
Jordan Longstaff
597bd27f5b
Child Ruto Part 7: Limb draw functions (#2575) 
* Child Ruto Part 7: Limb draw functions

* Add comment

* Rename vectors, remove comment

* Rename again
 2025-06-06 12:17:11 -04:00
Jordan Longstaff
b37f62fc1f
Child Ruto Part 4: Eye and mouth index enums (#2571) 
* Child Ruto Part 4: Eye and mouth index enums

* Suggested changes

* Rename struct variables
 2025-06-06 12:00:02 -04:00
Dragorn421
a750282d2d
Add various undocumented resources in xmls 1 (#2589) 
* Add various undocumented resources in xmls 1

* bss
 2025-06-05 20:24:29 -04:00
Jordan Longstaff
6e804b165e
Child Ruto Part 5: Colliders (#2572) 
* Child Ruto Part 5: Colliders

* Suggested refactoring

* Missed function rename
 2025-06-05 19:51:35 -04:00
Dragorn421
d1ac2561b5
T() macro loose ends 3 (#2592) 
* Remaining weird T()

* cleanup "発生" as ~"spawn"

* single strings T()

* more single strings T()

* more single strings T() (InitDynaPoly helpers)
 2025-06-05 17:49:09 -04:00
Jordan Longstaff
57097bf36e
Child Ruto Part 3: Water states (#2570) 
* Child Ruto Part 3: Water states

* Update function names too

* Rename more water-related variables

* Revise/remove comments

* Enum updates
 2025-06-05 16:31:21 -04:00
Jordan Longstaff
61284297bf
Child Ruto Part 6: Switch flag and type functions (#2574) 
* Child Ruto Part 6: Switch flag and type functions

* Add type enum and getter macros

* Fix macros

* Fix macros better

* Revert improper usage

* Move macros to header

* Refactor enum

* Move type enum to header
 2025-06-05 13:24:11 -04:00
Jordan Longstaff
892bddbcce
Child Ruto Part 13: Animation change function (#2581) 
* Child Ruto Part 13: Animation change function

* Update function signature

* Revert playReversed parameter type

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

* Missed call

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

* Revert the other parameter type

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

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2025-06-04 16:29:13 -04:00
Jordan Longstaff
d0bc691ec8
Child Ruto Part 9: Camera setting (#2577) 
* Child Ruto Part 9: Camera setting

* Add comment

* Rename "Jabu-Jabu context" to "Big Octo platform"

* Rename getter and setter
 2025-06-04 15:11:37 -04:00
fig02
28cc9d68cf
Remove "z64" prefix from all headers (#2518) 
* z64 - a

* z64 - b

* z64 - c

* z64 - d

* z64 - e

* z64 - f

* z64 - g

* z64 - h

* z64 - i

* z64 - l

* z64 - m

* z64 - o

* z64 - p

* z64 - q

* z64 - r

* z64 - s

* z64 - t

* z64 - v

* restore file

* fix merge

* fix merge

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2025-06-04 14:38:33 -04:00
Dragorn421
e8b708a448
T() macro loose ends 2 (#2564) 
* More T() in niw_girl, ossan, rr, ta, tana, wall_tubo, yabusame_mark

* Add and use LOG_STRING_T()

* include debug.h in translation.h

* Kyaaaaaa

* bss

* comment on Yabusame mato possible typo

* Revert "Kyaaaaaa"

This reverts commit 95097831fa.

* (Kuzu)hara

* 原 -> "-Hara" from dev name, possibly
 2025-06-04 13:15:01 -04:00
Dragorn421
c903555e83
Commit some assets/overlays/ (#2582) 
* Commit (inline) some assets/overlays/

* rm padding

* ovl_file_choose
 2025-06-04 07:44:10 -04:00
Jordan Longstaff
4980836ba3
Child Ruto Part 11: Idle Carry Timer (#2579) 
* Child Ruto Part 11: Carry timer

* Rename carry timer as suggested
 2025-06-04 06:58:38 +02:00
Jordan Longstaff
7085b48483
Child Ruto Part 10: Head rotation (#2578) 
* Child Ruto Part 10: Head rotation

* Rename head turn speed variable
 2025-06-04 06:39:19 +02:00
Dragorn421
aa00eb2c4d
Add Vtx[] resources in xmls for (partially) documented assets 2 (#2565) 
* Add Vtx[] resources in xmls for (partially) documented assets 2

* non-pal too

* Revert "non-pal too"

This reverts commit ac8b38b3a8.

* fix

* bss
 2025-06-03 22:24:26 -04:00
Jordan Longstaff
dec2c89c10
Child Ruto Part 8: Init branches (#2576) 2025-06-03 21:47:10 -04:00
Dragorn421
66f367e449
Commit g_pn_*.c files (#2573) 2025-06-03 20:30:44 -04:00
Dragorn421
31f8c32ed9
Rename damageEffect -> damageReaction (#2554) 
* CollisionCheckInfo.damageEffect -> damageReaction

* damageEffect -> damageReaction in other structs/temps

* DMGEFF -> DMGREAC

* EnSkb.lastDamageEffect -> lastDamageReaction

* EnTest.lastDamageEffect -> lastDamageReaction

* enums: DamageEffect -> DamageReaction

* cleanup: EnGeldBDamageReactions -> EnGeldBDamageReaction

* DMG_ENTRY effect -> reaction

* cleanup: GELDB_DMG_ -> GELDB_DMGREAC_

* PEAHAT_DMG_EFF -> PEAHAT_DMGREAC

* cleanup: RR_DMG_ -> RR_DMGREAC_

* cleanup: EnWallmas DAMAGE_EFFECT_ -> WALLMAS_DMGREAC_

* cleanup: EnPeehat's DamageReaction -> EnPeehatDamageReaction

* format

* review

* _DMGREAC_ -> _DMG_REAC_

* _DMG_REAC_ -> _DMG_REACT_

* format
 2025-06-03 18:45:32 -04:00
Dragorn421
0c1b1231d3
T() macro loose ends 1 (#2563) 
* more T() in debug_malloc.c graph.c z_actor.c malloc.c

* more T() in Zl2, Zl3

* T() diving_game, fire_rock

* T() girla

* more T() in heishi[124]

* T() in hs2, kakasi2, ru2

* format

* keaton

* Diving GO
 2025-06-03 06:40:55 -04:00
Jordan Longstaff
1627f8415b
Child Ruto Part 2: Rename resurfacing animation (#2569) 2025-06-02 12:15:29 -04: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
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
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
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
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
Dragorn421
c854743d84
T() macro in overlays 5 (#2537) 
* T() in some ovl_En_*

* T() in some more ovl_En_*

* old man appears
 2025-05-25 17:57:27 -04:00
Dragorn421
4201359f89
Finalize and commit object_link_boy (#2528) 
* Finalize and commit object_link_boy

* bss

* format

* dont write extracted/.../object_link_boy.c

* sizes for dls and texs

* fix OK

* TEX_LEN
 2025-05-25 20:21:16 +02:00
Dragorn421
b44ff69ded
Pause doc: Equipment page (#2538) 
* [Pause menu docs] Equipment page

* final name
 2025-05-25 13:59:05 +02:00
Dragorn421
6d56b1b8e0
Cleanup includes in header files (#2540) 
* Cleanup includes in header files

* include libc headers without libc/ prefix

* fix

* fix2

* fix3

* fix4

* some bss lol

* bss

* fix
 2025-05-24 16:20:51 -04:00