1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-05 11:44:31 +00:00
Commit graph

1025 commits

Author SHA1 Message Date
cadmic
06904e1ee7
[iQue] Match z_message (#2435)
* [iQue] z_message: work around EGCS bug

* [iQue] z_message: finish matching

* Yabusame -> Horseback archery

* Add missing PRINTF parameter

* Collapse for loops

* Better-looking macros

* gold stars -> gold skulls
2025-01-21 21:16:39 -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
cadmic
c76d2a8a4d
[iQue] Match z_kanfont (#2428) 2025-01-19 19:41:14 -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
cadmic
bdc6b50153
[iQue] Define EGCS macro instead of relying on __GNUC__ (#2423)
* [iQue] Define EGCS macro instead of relying on __GNUC__

* Revert longlong.h
2025-01-13 08:32:25 -05:00
cadmic
7aa9808b7e
[iQue] Use CPP includes in spec and update for iQue (#2399)
* Update spec for iQue

* Use CPP includes for spec overlays, scenes, and libultra

* Fix iQue + DEBUG_FEATURES

* Define BBPLAYER, merge function definitions

* Add Makefile dependency on spec_includes

* Fix libc order for iQue

* Match src/libultra/bb/sa/common.c to fix linker errors

* Use C versions of getcount/setcompare for iQue

* Format

* Small fixes to line up boot segment

* Remove zlib.c
2025-01-11 22:44:14 -05:00
Tharo
8d213e61cf
[iQue] Match PI-related files in libultra/io (#2408)
* [iQue] Match PI-related files in libultra/io, set correct thread ID for vimgr

* Create a define for the hardcoded address in devmgr.c

* Fix BSS
2025-01-10 21:15:43 -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
cadmic
e4ad4e5eee
[iQue] Match remaining src/boot files (#2417)
* [iQue] Match remaining src/boot files

* Fix debug ROM

* Use -funsigned-char

* Sort ique before gc in LNx macros
2025-01-10 18:47:55 +01:00
cadmic
26f91bd3bb
[iQue] Match gzip/zlib decompression (#2416)
* [iQue] Match gzip/zlib decompression

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Update missed renames in disassembly

* Fix some formatting

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2025-01-10 14:31:20 +01:00
Tharo
94971a61b4
[iQue] Match handwritten asm files in libultra/os, match C replacements of osGetCount and __osSetCompare (#2413)
* [iQue] Match handwritten asm files in libultra/os, match C replacements of osGetCount and __osSetCompare

* Format

* Adjust some label names in dcache functions
2025-01-10 06:16:19 -05:00
Tharo
eed11e3fb5
[iQue] Import vimodes from ultralib (#2403)
* [iQue] Import vimodes from ultralib

* Account for pixel_advance change on iQue

* Actually do the fix properly
2025-01-10 05:55:31 -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
Tharo
a3c3c38fea
[iQue] Match libultra/libc (#2407) 2025-01-07 04:19:18 -05:00
Tharo
aaf9c939a4
[iQue] Match osViSetMode (#2404) 2025-01-07 00:21:25 -05:00
Tharo
9a60c941fe
[iQue] Match exceptasm.s and parameters.s (#2401) 2025-01-06 02:23:23 -05:00
Tharo
bd606ba038
[iQue] Match skapi.s, create bbskapi.h documenting the syscalls (#2400) 2025-01-03 22:58:26 -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
Tharo
7e082f0c4f
Use IDO for assembling handwritten asm files in src (#2390)
* as0

* Fix ASOPTFLAGS for src/libc, remove unnecessary noreorder region in kanread

* Suggested changes

* Use %half to load the boot bss size for matching

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

* Wrap all of __osProbeTLB in noreorder

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
2024-12-28 15:18:45 -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
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