1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-12 09:50:50 +00:00
Commit graph

1402 commits

Author SHA1 Message Date
Dragorn421
6f8b4d82d5
Cleanup colliders 3 (#2467)
* standardize s[Name][Collider]JntSphElementsInit[Name]

* standardize ColliderCylinder struct members names on `[name]collider[s][Cylinder]`

* format

* fix

* fix2

* fix3

* collidersCylinder -> colliderCylinders
2025-02-14 22:41:32 -05:00
cadmic
bbcdf22647
Identify some unaccounted and blob asset data (#1953)
* Identify some unaccounted and blob asset data

* Add bug comments for flex skeleton weirdness

* Use (SkeletonHeader*) cast instead of .sh

* Fix vtx counts
2025-02-14 08:06:49 +01:00
mzxrules
4639914583
Reduce overlay dependencies on global.h (6) (#2468)
* add some headers, split some of z64.h

* MtxClear -> IdentityMtx

* more misc cleanups

* move D_80116280 to header, fix build issue

* remove z64.h

* Revert "MtxClear -> IdentityMtx"

This reverts commit 8fc74c0672.

* split z64path.h and z64skin.h functions

* z64face_reaction.h

* cleanup overlay global references

* trim padding

* bss
2025-02-13 18:15:14 -05:00
mzxrules
494aecc9fc
Reduce overlay dependencies on global.h (5) (#2466)
* remove global.h dependency from all actors

* fix compiler error

* fix another build issue

* fix bss
2025-02-12 21:50:46 +01:00
Dragorn421
1d2c912fbb
Cleanup colliders struct members 2 (#2465)
* Cleanup colliders 2

* format

* fixes & review
2025-02-12 13:37:05 -05:00
Dragorn421
ae89a8e47b
Polish up docs on EnDaiku and EnDaikuKakariko (#2463) 2025-02-11 09:02:05 -05:00
Dragorn421
3dd893c210
Cleanup colliders struct members 1 (#2462)
* Standardize some ColliderJntSphElement buffer members on `colliderElements`

* Standardize some ColliderTrisElement buffer members on `colliderElements`

* format
2025-02-10 20:02:56 -05:00
mzxrules
130ac11458
Reduce overlay dependencies on global.h (4) (#2456)
* remove more global.h references

* .bss
2025-02-08 19:30:24 -05:00
mzxrules
03a2612246
Rename gMtx(F)Clear to gIdentityMtx(F) (#2458) 2025-02-08 19:00:32 -05:00
mzxrules
54939bac3a
Reduce overlay dependencies on global.h (3) (#2449)
* kill more global.h references

* .format.py

* bss

* ique
2025-02-05 21:07:19 +01:00
Tharo
c028db03b4
Finish matching ique-cn (#2451)
* git subrepo clone git@github.com:Thar0/com-plugin.git tools/com-plugin

subrepo:
  subdir:   "tools/com-plugin"
  merged:   "e8543312d"
upstream:
  origin:   "git@github.com:Thar0/com-plugin.git"
  branch:   "main"
  commit:   "e8543312d"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* ique-cn OK

* Review suggestions

* Most suggestions

* git subrepo pull tools/com-plugin

subrepo:
  subdir:   "tools/com-plugin"
  merged:   "81595ed1c"
upstream:
  origin:   "git@github.com:Thar0/com-plugin.git"
  branch:   "main"
  commit:   "81595ed1c"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* Fix other versions
2025-02-04 06:55:04 -05:00
cadmic
ef53bfd693
[iQue] Match z_file_copy_erase (#2447)
* [iQue] Match z_file_copy_erase

* Reword comment
2025-01-29 14:17:13 -05:00
cadmic
748859595a
[iQue] Match z_fishing (#2445) 2025-01-28 02:36:07 -05:00
mzxrules
d855f2bfd8
Split z64debug_display.h, z64draw.h, z_en_item00.h (#2443)
* z64debug_display.h

* z64draw.h

* z_en_item00.h

* bss
2025-01-27 13:01:54 -05:00
mzxrules
7dd3a83313
Reduce overlay dependencies on global.h (2) (#2442)
* reduce overlay dependencies on global.h

* merge cleanup

* more missed headers
2025-01-27 12:17:50 -05:00
cadmic
cd21783a44
[iQue] Match z_en_mag (#2439)
* [iQue] Match z_en_mag

* Add comment for iQue "PRESS"

* Format
2025-01-24 23:41:32 -05:00
cadmic
5bca304cbc
[iQue] Unify file select actionButtonAlpha and confirmButtonAlpha (#2436)
* Fix all confirmButtonAlpha indices

* Unify actionButtonAlpha and confirmButtonAlpha

* Restore ConfirmButtonIndex

* Add comment for actionButtonAlpha
2025-01-24 23:00:46 -05:00
mzxrules
f448a48cd6
Create headers for some libu64 files (#2440)
* Create headers for some libu64 files

* apply bss patch
2025-01-24 13:25:05 -05:00
mzxrules
ab37332793
Reduce overlay dependencies on global.h (1) (#2438)
* Reduce actor dependencies on global.h

* move dependency on z64play.h into the .c files

* add some missing dependencies
2025-01-23 14:39:23 -05:00
Tharo
afa0842de4
[iQue] Import libultra audio library files (#2433)
Note about comments in these files:
The libultra audio library was originally available to developers in
source code form, unlike most of libultra. These files are based on
these source code forms, adapted to meet the style of this project.
The comments in the files as of this commit are, apart from the style,
comments from the original SGI authors.
2025-01-21 15:21:48 -05:00
cadmic
284ecb114e
[iQue] Match z_actor (#2431)
* [iQue] Match z_actor

* Reword comment
2025-01-19 22:29:35 -05:00
mzxrules
161c789886
Restructure event flags in z64save.h (4/?): Haggling Townsfolk (#2395)
* Haggling Townsfolk flags

* suggestion

* so there's not going to be a We U?
2025-01-17 22:23:23 -05:00
cadmic
d066586872
[iQue] Match z_sram (#2426)
* [iQue] z_sram: Use iQue-specific read/write macros

* [iQue] z_sram: Make checksum a struct

* [iQue] z_sram: Finish matching

* Call the trigraph usage a bug

* Fix bss

* Sram_iQueReadWrite -> Sram_ReadWriteIQue

* Use SRAM_HEADER_MAGIC for loop bound

* Rename sZeldaMagic -> sSramDefaultHeader and use less char literals
2025-01-17 06:56:22 -05:00
cadmic
2b9b7a40b0
[iQue] Match z_end_title, z_construct, z_common_data, z_parameter, z_title, z_opening (#2424)
* [iQue] Match z_end_title

* [iQue] Match z_construct

* [iQue] Match z_common_data

* [iQue] Match z_parameter

* [iQue] Match z_title, z_opening

* Actually match z_parameter

* Give up on stack issues

* this->exit = true
2025-01-14 11:55:47 -05:00
cadmic
e2ed5568e5
[iQue] Match ovl_kaleido_scope (#2421)
* [iQue] Match ovl_kaleido_scope

* Add bug comment for OOB reads

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

* Preemptively fix merge conflicts

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2025-01-14 08:32:00 -05:00
Ben Villalobos
dbfa95fd01
Descriptions for Gohma Larva vs Boss Gohma (#2420)
* Add descriptions for gohma vs boss gohma

* Fix capitalization
2025-01-12 14:22:18 -05:00
Tharo
b19b06a531
[iQue] Match remaining libultra/os files (#2414)
* Match remaining libultra/os files

* Align box id macros

* Fix bss, format

* Fix BSS

* Clarify some comments

* More bug comment

* Comment

* Fix BSS
2025-01-10 18:54:02 -05:00
Tharo
a57d449196
[iQue] Match remaining libultra/io files (#2411)
* [iQue] Match remaining libultra/io files

* Match osSpTaskYielded

* Fix bss, remove double space in controller.h

* Fix BSS
2025-01-09 19:31:11 -05:00
cadmic
f329507f97
[iQue] Create/update macros for printing debug strings (#2398) 2025-01-08 10:33:49 -05:00
cadmic
9dafc2f2e4
[iQue] Build some C files with EGCS (#2396) 2025-01-02 03:35:22 -05:00
mzxrules
95d5f5b18d
Restructure event flags in z64save.h (3/?): Cursed Family Rewards (#2392)
* Cursed Family reward event flags

* tunic -> shirt
2024-12-28 21:29:10 -05:00
mzxrules
ba6a83533a
Restructure event flags in z64save.h (2/?): Carpenters (#2385)
* Clean up EVENTCHKINF for Carpenters

* hardcode EVENTCHKINF_INDEX_CARPENTERS_RESCUED
2024-12-27 18:48:56 -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
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
Yanis
582f040789
use CS_TEXT_NORMAL when needed (#2367) 2024-12-15 15:11:25 -05:00
Yanis
76c1b621ac
Name cutscenes of remaining actors (#2366)
* name cs from remaining actors

* small change for consistency

* review
2024-12-15 14:29:52 -05:00
cadmic
8056312c39
Remove ‾ character from source files (#2371) 2024-12-15 12:22:45 -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
Yanis
db8d351c5b
Name some scene cutscenes 2 (Graveyard, Meadow and Lake Hylia) (#2339)
* name cs from graveyard, meadow and lake hylia

* `gLakeHyliaWaterRaisingCs` --> `gLakeHyliaRestoredCs`
2024-12-14 19:53:28 -05:00
Leonid Kapitonov
0f27d2fea3
document func_8002F368 (#2358) 2024-12-14 14:59:22 -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
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