mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-28 15:56:51 +00:00
Code Issues Projects Releases Wiki Activity
2250 commits 1 branch 0 tags 486 MiB
Commit graph

2250 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
fig02
016aef482b
Document Culling (#2318) 
* document culling

* format

* depth -> distance

* format

* var name

* new graph link

* rephrase actor flags

* tharo's comments + some more tweaks

* is this causing the problem?

* change wording

* cant scope the temp

* format

* dragorn review

* bad merge

* player -> camera in descriptions

* more its

* cadmic review

* goddamn it why do i have that habit

* projected
 2024-12-13 08:12:52 -05:00
Jordan Longstaff
a897017af5
Rename EVENTCHKINF flags for payments to Happy Mask salesman (#2331) 
* Rename EVENTCHKINF flags for payments to Happy Mask salesman

* Tweak renames
 2024-12-12 21:24:47 -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
Jordan Longstaff
c57dff4f78
Rename item get flags for Forest Stage upgrades (#2333) 
* Rename item get flags for Forest Stage upgrades

* Fix Jenkins build error

* Document shared flag bug

* Rename shared flag

* Massive documenting comments

* GDI - remove one trailing whitespace
 2024-12-12 10:43:58 -05:00
Jordan Longstaff
c780c4e147
Rename EVENTCHKINF_69 (#2330) 
* Rename EVENTCHKINF_69

* Rename CS flag
 2024-12-11 05:51:51 -05:00
Jordan Longstaff
b01b20697e
Renamed EVENTCHKINF_3C (#2324) 
* Renamed EVENTCHKINF_3C

* Renamed to Nabooru Knuckle

* Format for Jenkins
 2024-12-10 11:00:18 -05:00
Jordan Longstaff
c04ed0e76c
Rename "temp" variables in Adult Ruto functions (#2335) 
* Rename "temp" variables in Adult Ruto functions

* Change to yaw
 2024-12-10 01:34:55 -05:00
Jordan Longstaff
07751d3d44
Rename symbols related to Kakariko Well being drained (#2332) 2024-12-10 00:18:40 -05:00
Jordan Longstaff
c21c3fe3da
Renamed EVENTCHKINF_33 (#2326) 
* Renamed EVENTCHKINF_33

* Rename: Gave letter to King Zora
 2024-12-09 23:53:41 -05:00
Jordan Longstaff
b76fe9d0b8
Rename EVENTCHKINF_4D (#2329) 
* Rename EVENTCHKINF_4D

* Second rename
 2024-12-09 22:24:06 -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
Jordan Longstaff
e9b165b6e5
Add names for Medallion cutscene data (#2319) 
* Add names for Medallion cutscene data

* Rename to Cs at end
 2024-12-08 20:45:02 -05:00
cadmic
d886e76960
Split code_800D31A0.c into sys_freeze.c and sys_debug_controller.c (#2315) 2024-12-08 19:38:58 -05:00
cadmic
40930acf11
Rename code_80069420.c -> z_memory_utils.c (#2314) 
* Rename code_80069420.c -> z_memory.c

* z_memory -> z_memory_utils
 2024-12-08 18:55:14 -05:00
cadmic
64de4a0f5d
Rename code_800BB0A0.c -> z_cutscene_spline.c (#2313) 
* Rename code_800BB0A0.c -> z_camera_spline.c

* z_camera_spline -> z_cutscene_spline
 2024-12-08 17:56:51 -05:00
cadmic
06ceb8e661
Use MM names for some unnamed code files (#2312) 2024-12-08 16:52:48 -05:00
fig02
bda5e94ded
Document Player Params (#2307) 
* document player params

* better bgcamindex comment

* cant use -1 for condition

* fix match

* define for default bgcam

* doesnt work

* matches

* better comment
 2024-12-08 14:56:01 -05:00
Jordan Longstaff
7a0a90b16a
Name Sleeping Waterfall state machine function (#2320) 
* Name Sleeping Waterfall state machine function

* Rename function, second iteration
 2024-12-08 07:12:41 -05:00
Jordan Longstaff
4d28d34d9a
Renamed EVENTCHKINF_4B (#2328) 2024-12-07 19:26:05 -05:00
Jordan Longstaff
df2450ac17
Replaced EVENTCHKINF_4E (#2327) 
* Replaced EVENTCHKINF_4E

* Add "set but unused" comment

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

---------

Co-authored-by: mzxrules <mzxrules@gmail.com>
 2024-12-07 18:19:55 -05:00
Jordan Longstaff
6735eb25d6
Rename EVENTCHKINF_02 (#2322) 
* Rename EVENTCHKINF_02

* Rename to EVENTCHKINF_MIDO_DENIED_DEKU_TREE_ACCESS
 2024-12-07 17:01:21 -05:00
Jordan Longstaff
4d902dcd95
Renamed EVENTCHKINF_3A (#2325) 
* Renamed EVENTCHKINF_3A

* Remove redundant comment
 2024-12-07 15:46:47 -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
fig02
a96ada0bba
ru2 fixes (#2323) 2024-12-06 07:49:00 -05:00
cadmic
b2d3c0523d
Name asset extraction tools more consistently (#2316) 2024-12-04 19:44:16 -05:00
Jordan Longstaff
3a07abbfac
Rename and document Adult Ruto functions (#2288) 
* Rename and document Adult Ruto functions

* Rename struct fields also

* Add enums for Ruto actions and draw configs

* Proper name for Water Medallion cutscene data

* Suggested changes

* More suggested changes

* Bring back naming consistency

* Better documentation for EnRu2_CheckWaterMedallionCutscene

Co-authored-by: fig02 <fig02srl@gmail.com>

* Renaming suggestions

* Rename EnRu2_AccelerateUp

* Revert macros

* Actually, fix macros

* Remove extra blank line

* Rename macros with GET

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-12-04 18:20:19 -05:00
Yanis
54c4ce8ca6
named missing actor cue lists command types (#2317) 2024-12-02 19:52:23 -05:00
mracsys
bdc774058d
More descriptive names for CS_BEGIN_CUTSCENE and CS_END (#2311) 
* rename CS_BEGIN_CUTSCENE and CS_END

* matching

* naming consistency for END command, improved comments

* remove CS_CMD_NONE

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

* remove comma from end of enum

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "c04562d30"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "c04562d30"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "cce3d93"

---------

Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-12-02 16:50:58 -05:00
Tharo
3f703a39d9
Fix some more GCC warnings, mark some bugs based on GCC warnings (#2309) 
* Fix some more GCC warnings, mark some bugs based on GCC warnings

* Weird formatting

* Suggested changes

* More weird indentation I guess

* UNREACHABLE() macro, add missing NORETURNs to fault_n64.c

* AVOID_UB for PAL path in z_file_nameset.c

* Remove comments about return types

* Remove temp no longer needed
 2024-12-02 04:40:49 -05:00
engineer124
6199634ffb
Minor Cleanup (#2308) 
* cleanup

* more

* fix floats
 2024-12-01 07:55:50 -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
fig02
cddca30442
Player Docs: Document Some Start Mode Actions (#2305) 
* document blue warp arrive

* document warp song, door, and time travel

* document grotto and farores wind

* move animsfx

* review

* unname appear
 2024-11-27 21:19:53 -05:00
Leonid Kapitonov
53962a2cd8
Document Actor "Fidget Tables" (#2287) 
* Document `func_80034F54` and related data

new name: `UpdateLimbOverrides`
reason:
- `0x814` and `0x940` constants
- `*_OverrideLimbDraw` functions

additionally:
- move constants into `z64animation.h`
- use these constant for existing formulas
- properly name corresponding actors' fields
- add occasional explicit limbs limit constants

* port over the MM "fidget" naming

* remove redundant comments
* move and rename `FIDGET_*` constants
* introduce a `FIDGET_SCALE` constant, as no other value is applied

* remove generally unrelated changes

* apply PR suggestion

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

* fix (?) fidgetTable size

following the https://github.com/zeldaret/oot/pull/2287#discussion_r1832371833 suggestion

* remove an unused `struct EnMu` field @ `0x024A`

a continuation to the 211263295c
automatic padding commpensates its absence

* remove MM mention as "it would get unruly fast"

https://github.com/zeldaret/oot/pull/2287#discussion_r1833470468

* rename `overridePerLimb` -> `fidgetFrequency`

https://github.com/zeldaret/oot/pull/2287#discussion_r1837211873

* give better names to the constants

https://github.com/zeldaret/oot/pull/2287#discussion_r1837211873

* remove unnecesasry braces from a comment

https://github.com/zeldaret/oot/pull/2287#discussion_r1842642196

* make the comment multiline "officially"

* restore `limbIndex` naming for this PR

43afb7b7cb (r1842644602)

* apply a PR suggestion

https://github.com/zeldaret/oot/pull/2287#discussion_r1842787653

---------

Co-authored-by: mzxrules <mzxrules@gmail.com>
 2024-11-27 13:50:44 -05:00
fig02
33391c0a5b
Name Remaining Hookshot Actor Flags (#2306) 
* name remaining hookshot flags

* tweak comments

* period
 2024-11-23 23:19:27 -05:00
Tharo
e10c64a0b4
Add a PARAMS_PACK macro for building actor params setters (#2304) 2024-11-23 22:19:12 -05:00
fig02
6239f8e0b3
Document Hookshot Attachment (#2300) 
* document hookshot attachment

* change comment

* swap hookshot function comment

* remove comments
 2024-11-21 19:46:49 -05:00
fig02
e0e0e93644
Player: Name all Start Modes (#2302) 
* name some start modes

* document blue warp mode

* Revert "document blue warp mode"

This reverts commit d4071a8123.

* name movement modes

* fix door mode comment, it is not broken

* Player_PutSwordInHand

* typo

* how the hell did that happen

* add sword clarification
 2024-11-20 03:22:55 -05:00
fig02
ae1a1adcf1
Player Docs: Begin "Start Mode" Documentation (#2301) 
* set up start mode

* note unused modes

* fix bss
 2024-11-18 18:47:41 -05:00
cadmic
5881164453
Fix VROM address handling in sym_info.py (#2292) 2024-11-17 17:34:23 -05:00
fig02
17edb82c0d
Decouple Debug Features From gc-eu-mq-dbg (#2296) 
* rename OOT_DEBUG to DEBUG_FEATURES

* makefile changes

* add DEBUG_ASSETS

* fix DEBUG_FEATURES usages

* format

* fix errors

* review

* fix problem and review2

* review

* add DEBUG_FEATURES to DEBUG_ASSETS check

* review

* whoops

* format
 2024-11-17 17:02:07 -05:00
cadmic
cf4dc98cc9
Use debug macros even in N64-only code (#2298) 
* Use debug macros even in N64-only code

* Use UNK_FILE/UNK_LINE instead
 2024-11-15 13:18:05 -05:00
Leonid Kapitonov
e46fcbdbc9
Document enum PauseState game over parts (#2283) 
* [document] `enum PauseState`, game over parts

* apply Jenkins fixes (automatic code formatting)

also, as previously, i've rerun the "make" to check integrity

* add `PAUSE_STATE_GAME_OVER_*` comments

in case it helps to rename them later, if the need ever arises

* improve `PAUSE_STATE_GAME_OVER_SAVE_*` comments

also i've noticed, that `z64pause.h` doesn't comply fully with the `.clang-format`

temporary changing a couple of setting to
- ColumnLimit: 0
- AlignTrailingComments: false
fixes the issue. i don't want to push unrelated formatting here

* remove redundant comments

https://github.com/zeldaret/oot/pull/2283#discussion_r1827652667

* apply PR naming suggestions

reverified with
> `check_format.py ...`
> `make ...`
 2024-11-15 03:37:10 -05:00
cadmic
c55a1dab57
fix_bss.py: Fix infinite loop after linker errors (#2297) 2024-11-14 12:35:35 -05:00
cadmic
8ce69c3ac9
Completely match ntsc-1.0/1.1 bss and add to CI (#2294) 2024-11-12 17:39:08 -05:00
Pepe20129
a04912a017
Use the T macro in z_select (#2273) 
* Use the T macro in z_select

* Address reviews

* Apply Format

* Fix day & night
 2024-11-12 13:35: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
cadmic
d886ebe711
[ntsc-1.0/1.1] Match audio and loose ends (#2293) 
* Match ntsc-1.0/1.1 loose ends

* Revert audioseq_padding

* Fix spelling
 2024-11-11 17:50:56 -05:00