mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-01-16 21:46:58 +00:00
Code Issues Projects Releases Wiki Activity
2286 commits 1 branch 0 tags 490 MiB
Commit graph

1851 commits

Author SHA1 Message Date
cadmic
a590995c1a
Add missing vimode splits in iQue disassembly (#2393) 2024-12-28 15:55:00 -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
e10ecb2fa3
Set up iQue disassembly (#2384) 
* Set up iQue disassembly

* Label libultra vimodes

* Format

* skapi.c -> skapi.s

* Fix AudioDebug functions

* Group D_80134488 with fp.s in disassembly

* Label boot bss

* Add bss split for siacs
 2024-12-26 08:54:26 -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
cadmic
524597dc14
Reformat item00 drop tables (#2377) 2024-12-17 07:54:19 -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
Yanis
a59a60e414
Name cutscenes from dungeons (Spirit Boss Room, Jabu-Jabu's Belly and Ganon) (#2361) 
* name cs from dungeons

* review
 2024-12-13 21:17:04 -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
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
fig02
a96ada0bba
ru2 fixes (#2323) 2024-12-06 07:49:00 -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