mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-29 00:06:33 +00:00
Code Issues Projects Releases Wiki Activity
2282 commits 1 branch 0 tags 486 MiB
Commit graph

999 commits

Author SHA1 Message Date
cadmic
1662ac70af
Fix iQue audio and line numbers (#2386) 2024-12-26 17:42:38 -05:00
cadmic
8a48c17cc8
Move D_80134488 from system_heap.c to fp.s (#2387) 
* Move D_80134488 from system_heap.c to fp.s

* Add declarations

* Fix bss
 2024-12-24 12:49:31 -05:00
mzxrules
ee4b3474a5
Restructure event flags in z64save.h (1/?) (#2380) 
* Simplify most event flags

* EVENTINF_HORSES_INDEX -> EVENTINF_INDEX_HORSES

* Add missing index numbers

* pr suggestions

* Clean up INGO_RACE flags
 2024-12-21 16:03:10 -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
Tharo
81df2d4ba3
Move const-qualified data from session_config.c to session_init.c, no longer qualify them as const and incrementally link instead (#2381) 2024-12-20 20:41:14 -05:00
mzxrules
1adf696588
Document z_horse.c and related actors (#2278) 
* document z_horse.h

* .bss

* suggestions and more comments

* bss

* INGORACE -> INGO_RACE

* format header macros

* FIx incorrect type comparision

* EnInMode -> EnInStartMode

* R_EXITED_SCENE_RIDING_HORSE
 2024-12-17 10:51:56 -05:00
Jordan Longstaff
fdcfe49b44
Rename event check flags for boss battles (#2376) 2024-12-16 18:08:25 -05:00
Yanis
34c1b41780
Name cutscenes from the Master Sword and Deku Tree Mouth actors (#2364) 
* name cs from master sword & deku tree actors

* review 1

* review 2

* choice declined/accepted renames

* review 3

* updated comment about the ms reveal flag
 2024-12-16 07:12:44 -05:00
fig02
ff78b1263b
Add macros for line number differences (#2365) 
* initial work, think I got all of them

* cleanup line_numbers.h

* fix gc-eu-mq-dbg

* fix matching problems

* remove old lines

* format

* missed some stuff

* comment fixes

* other

* review changes
 2024-12-15 11:07:21 -05:00
Leonid Kapitonov
0f27d2fea3
document func_8002F368 (#2358) 2024-12-14 14:59:22 -05:00
Tharo
9170902f8d
Move build.c definitions to the makefile, introduce and use libultra version defines in libultra instead of PLATFORM defines (#2353) 
* Move build.c definitions to the makefile, introduce and use libultra version defines in libultra instead of PLATFORM defines

* MAJOR+MINOR versions -> VERSION+PATCH, stringify build defines in makefile, let the libultra version determine the OPTFLAGS for libultra files

* Clang format moment

* Remove LIBULTRA_VERSION_ID, tweak OS_VERSION and libultra version definitions

* Better fix for formatting problems
 2024-12-13 20:28:28 -05:00
Tharo
df5d4cb467
[Audio 10/10] Loose ends (#2337) 
* Introduce afile_sizes, generate headers of sizes for soundfonts and sequences

* Initial tools/audio README

* Versioning for samplebank extraction

* Clean up the disassemble_sequence.py runnable interface

* Add static assertions for maximum bank sizes

* Boost optimization for audio tools

* Samplebank XML doc

* Soundfont XML doc

* More docs in sampleconv for vadpcm

* Various tools fixes/cleanup

* VADPCM doc

* Try to fix md formatting

* VADPCM doc can come later

* Fix merge with PR 9

* Fix blobs from MM

* Try to fix bss

* Try fix bss round 2

* Fix sampleconv memset bug

* Suggested documentation tweaks
 2024-12-13 19:26:36 -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
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
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
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
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
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
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
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
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
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
fig02
0d04f51e8e
Document Arrow Related Actor Flags (#2284) 
* name arrow actor flags

* fix flag check
 2024-11-05 07:31:28 -05:00
fig02
e50581b9fb
ACTOR_FLAG_ENKUSA_CUT -> ACTOR_FLAG_GRASS_DESTROYED (#2285) 
* rename enkusa cut to bush destroyed

* bush -> grass

* clump
 2024-11-04 18:22:44 -05:00
Pepe20129
2c1d2d74bc
Document PLAYER_STATE1_SHIELDING (#2279) 
* Document `PLAYER_STATE1_SHIELDING`

* Fix format
 2024-10-24 22:14:34 -04:00
fig02
3677c11140
Document ACTOR_FLAG_CAN_PRESS_SWITCHES (#2275) 
* document switch activation

* format

* activate -> press

* fix comment
 2024-10-20 23:19:14 -04:00
fig02
f4210323a2
Document ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT (#2276) 
* name ACTOR_FLAG_HIT_PLAYER_THUMP_SFX

* ACTOR_FLAG_HIT_PLAYER_THUMP_SFX -> ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT
 2024-10-20 22:29:50 -04:00
fig02
e55e909477
Document ACTOR_FLAG_UPDATE_DURING_OCARINA and PLAYER_STATE2_USING_OCARINA (#2277) 
* Document ACTOR_FLAG_UPDATE_DURING_OCARINA

* document PLAYER_STATE2_USING_OCARINA

* format

* comment tweak

* treat var as flag
 2024-10-17 21:44:35 -04:00
fig02
df1815cf8f
Document ACTOR_FLAG_THROW_ONLY (#2274) 
* document ACTOR_FLAG_THROW_ONLY

* flip function name

* add comments
 2024-10-15 14:10:21 -04: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
mzxrules
2f54db142e
Rename RoomBehaviorType1 to RoomType (#2271) 
* Rename RoomBehaviorType1 to RoomType

* suggestions

* Update include/z64scene.h

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
 2024-10-14 15:23:50 -04:00