1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Commit graph

2521 commits

Author SHA1 Message Date
Jordan Longstaff
80c4f33da5
Child Ruto Actions Part 1: Zora's Fountain (#2600)
* Child Ruto Actions Part 1: Zora's Fountain

* Oops, forgot sound effects

* Reformat

* Rename action enum entries

* Suggested changes
2025-06-30 08:41:47 +02:00
Dragorn421
d45353ee33
Cleanup extracted colliders 3: Use HIT_SPECIAL_EFFECT_, HIT_BACKLASH_ names (#2646)
* Cleanup extracted colliders 3: Use `HIT_SPECIAL_EFFECT_`, `HIT_BACKLASH_` names

* revert removing FLARE_DANCER_BODY_DMG (oops)
2025-06-28 18:06:42 -04:00
Dragorn421
b5f980570c
Pause docs: UIOverlay quads dimensions (#2644) 2025-06-28 15:23:00 +09:00
Dragorn421
ffd84af543
Fixup docker (#2642)
* Fixup docker

* comma
2025-06-28 08:05:50 +02:00
Dragorn421
88f452af10
Reevaluate player hit response names (#2640)
* PlayerHitResponseType

* PLAYER_HIT_RESPONSE_ICE_TRAP -> FROZEN

* PLAYER_KNOCKBACK_LARGE_SHOCK, PLAYER_HIT_RESPONSE_ELECTRIC_SHOCK -> PLAYER_KNOCKBACK_LARGE_ELECTRIFIED, PLAYER_HIT_RESPONSE_ELECTRIFIED

* damageResponseType -> hitResponseType
2025-06-27 04:45:44 +09:00
Dragorn421
d44c341c2d
Camera_KeepOn4 docs 2: RO and RW data (#2632)
* `Camera_KeepOn4` docs 2: RO and RW data

* fix unk_14 rename

* CAM_DATA_UNK_22 -> CAM_DATA_INIT_TIMER
2025-06-26 21:11:38 +02:00
Dragorn421
b7935dad12
Cleanup extracted colliders 2: ARRAY_COUNT (#2643) 2025-06-25 21:20:55 +09:00
Dragorn421
6234d7f2aa
Commit objects 1: tp, triforce_spot, umajump, vase, yukabyun, zg (#2634)
* commit object_zg

* commit object_yukabyun

* commit object_vase

* commit object_umajump

* commit object_triforce_spot

* commit object_tp

* fixup1

* format
2025-06-25 13:09:14 +02:00
Dragorn421
affb39624f
Pause docs: "uiOverlay" quads (renamed from "InfoPanel") (#2635)
* Pause docs: "InfoPanel" quads

* bss

* rename infoPanelVtx to decorVtx

* rename to uiOverlayVtx / UI_OVERLAY_QUAD_

* fixup
2025-06-25 00:08:26 +02:00
Dragorn421
d52ba1ed26
Cleanup extracted colliders 1 (#2641) 2025-06-24 17:53:55 +02:00
Dragorn421
ad7ef14b5d
Name HIT_BACKLASH_ and HIT_SPECIAL_EFFECT_ values (#2639)
* Name HIT_BACKLASH_ and HIT_SPECIAL_EFFECT_ values

* SHOCK -> ELECTRIC
2025-06-22 17:36:09 +02:00
Dragorn421
04a92708cf
Rename AT effect to hitSpecialEffect (#2637)
* Rename AT `effect` to `hitSpecialEffect`

* bss
2025-06-20 10:12:45 +02:00
Leonid Kapitonov
b11fdab792
Document Save.cutsceneIndex and adjacent data / code (#2286)
* introduce `enum CutsceneIndex` as a first step

* crudely rename `enum CutsceneIndex` entries

* run `check_format.py ...` separetely

so that it doesn't clutter previous commit. still, allowing `clangd LSP` to run format-on-save yields inconsistent results for me with the project's tooling, especially for header files

* apply a draft PR suggestion

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

* rename `CS_INDEX_*` with PR suggestions

and some additional observations
reverified with
> `check_format.py ...`
> `make ...`

additionally:
- current clang-format lacks a rule for trailing commas
- compiler says about them `cfe: Warning 624`

* improve `CS_INDEX_*` naming, rem `ENTRANCE` suffix

https://github.com/zeldaret/oot/pull/2286#discussion_r1829165205

reverified with
> `check_format.py ...`
> `make ...`

* apply Jenkins fixes

https://jenkins.deco.mp/job/OOT/job/PR-2286/4/console

hmm, i do need this automation locally to

* apply a PR suggestion

https://github.com/zeldaret/oot/pull/2286#discussion_r1829219841

* remove redundant comments, fix the header comment

and add a comment chunk from https://github.com/zeldaret/oot/pull/2286#discussion_r1829108940

* rename the flag for freeing `nextCutsceneIndex`

* rename the flag for automatic `sceneLayer` calc

it gets assigned to the `nextCutsceneIndex`,
so `CS_INDEX_NONE` name was misleading

* use explicit scene layer names instead of numbers

* ok, now the last two `CS_INDEX_*` are less unknown

the purpose of `CS_INDEX_BARRIER` is not quite clear still

* apply Jenkins fixes

https://jenkins.deco.mp/job/OOT/job/PR-2286/14/console

* run `fix_bss` locally

`ntsc-1.2` refused to comply though

* revert all local to the branch bss shifts

* ugh, use defines instead of an enum

probably size of enum entries doesn't match well? originally these were
just numbers. besides, not like it's a real enumeration from zero to a
value or some bit flags

* still, add a BSS pragma for `z_demo.c`

* apply review changes

* factor out a cutscene layer formula

* give scene layers names throughout code

* apply Jenkins fixes

https://jenkins.deco.mp/job/OOT/job/PR-2286/32/console

* tweak `CS_INDEX` descriptions

* apply PR review suggestions

* rename "auto" -> "default"

* apply PR review suggestions

https://github.com/zeldaret/oot/pull/2286#discussion_r1868693980

essentially reverts 106cb1021b, except for 2 generic `z_scene.c` lines

* apply Jenkins fixes

https://jenkins.deco.mp/job/OOT/job/PR-2286/77/console

* Apply suggestions from code review

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

* apply Jenkins fixes

https://jenkins.deco.mp/job/OOT/job/PR-2286/175/console

* Move CS_INDEX_* macros to z64save.h, with the definition of gSaveContext.save.cutsceneIndex

* `#define CS_INDEX_D 0xFFFD` and co.

Co-authored-by: cadmic <cadmic24@gmail.com>

* add comment on CS_INDEX_D

* review

* CS_INDEX_NONE is back

* bss

* expand comment about 0xFFFD

* fix comment about 0xFFFF usage

* review

---------

Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: cadmic <cadmic24@gmail.com>
2025-06-17 15:54:52 +02:00
Dragorn421
bc5839a32c
fixup rename hitBacklash (#2638) 2025-06-17 14:01:13 +02:00
Dragorn421
e8c59385bc
Rename acDmgInfo.effect -> hitBacklash (#2555)
* CollisionCheckInfo.atHitEffect -> atHitBacklash

* ColliderElementDamageInfoAC.effect -> hitBacklash

* add HIT_BACKLASH_ enum

* bss

* bss

* bss

* bss

* bss

* Update comments
2025-06-17 05:23:49 -04:00
Dragorn421
fc2992abf6
Pause docs: misc docs (#2636)
* doc `KaleidoScope_SetCursorPos`

* doc bug in `KaleidoScope_DrawWorldMap`

* fix anonymous enum

* `D_808321A8` -> `sSavedButtonStatus`

* s16 decimal for `sVtxPageMapDungeonQuads``X/Y/Width/Height`

* Use `LANGUAGE_` enum for indexing language-indexed regs
2025-06-16 13:13:31 +02:00
Dragorn421
fd1ea6bc1a
Macroify PlaySfxGeneral calls: introduce SFX_PLAY_CENTERED and SFX_PLAY_AT_POS (#2633)
* Add `SFX_PLAY_CENTERED`

* Add `SFX_PLAY_AT_POS`
2025-06-15 18:28:37 -04:00
Dragorn421
05a2818557
Assets: Move limb enums into xmls 4 (#2631) 2025-06-15 14:32:54 -04:00
Dragorn421
d3ed137878
Assets: Move limb enums into xmls 3 (#2630) 2025-06-15 13:55:11 -04:00
Dragorn421
2054637cab
Name most object_gi_* textures (#2629)
* Name most `object_gi_*` textures

* gGiButterflyTex
2025-06-14 23:06:12 +02:00
Dragorn421
7547603989
Pause doc: DrawInfoPanel textures (#2628)
* Pause doc: DrawInfoPanel textures

* plural Widths
2025-06-14 22:06:53 +02:00
Dragorn421
8a823a7ad2
Camera_KeepOn4 docs 1 (#2627)
* `Camera_KeepOn4` docs 1

* add comment

* backticks around at, eye
2025-06-13 17:45:22 -04:00
Dragorn421
e4e14a6bcf
Assets: Move limb enums into xmls 2 (#2626) 2025-06-12 17:23:47 -04:00
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
7ddd468ed6
object_zo: finalize, split and commit (#2624) 2025-06-10 19:36:16 -04:00
Dragorn421
dba40d9dc3
Remove Static from xmls (#2616) 2025-06-10 18:20:10 -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
Dragorn421
f213f6bae2
.d files: use -MP (fixes make with deleted deps) (#2615) 2025-06-08 18:52:10 -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
37a89e340f
Add Vtx[] resources in xmls for (partially) documented assets 8 (#2606) 2025-06-07 17:10:36 +02: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
Dragorn421
600d680970
Add various undocumented resources in xmls 4 (#2604) 2025-06-07 09:52:23 -04:00
mracsys
ed02a9db65
Add additional Bazaar display list definitions (#2494)
* add unreferenced display lists to shop1 room 0 xml

* match naming scheme

* add missed display lists for shop1 room 0
2025-06-06 19:23:01 -04:00
Dragorn421
7a816391bb
Remove OutName from xmls (both on File and Texture) (#2596) 2025-06-06 22:07:53 +02:00
Dragorn421
e1fb3a974f
Add various undocumented resources in xmls 3 (#2595) 2025-06-06 14:44:13 -04:00
Dragorn421
f73e564817
Add various undocumented resources in xmls 2 (#2594) 2025-06-06 13:24: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
c6dbebfcd2
Fix too long filenames for windows (#2591) 2025-06-05 23:02:04 -04:00
Dragorn421
b84d1afc67
Better automatic names for Limbs and JointKeys, and implement more get_as_xml (#2590) 2025-06-05 21:55:30 -04:00
Dragorn421
747006fdd4
Add Vtx[] resources in xmls for (partially) documented assets 5 (#2587) 2025-06-05 21:38:01 -04:00