mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-09 05:44:26 +00:00
Code Issues Projects Releases Wiki Activity

Rename and document Adult Ruto functions (#2288)

Browse source 
* 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>
This commit is contained in:
Jordan Longstaff 2024-12-04 18:20:19 -05:00 • committed by GitHub
parent 54c4ce8ca6
commit 3a07abbfac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 423 additions and 284 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

687
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View file

File diff suppressed because it is too large Load diff

16
src/overlays/actors/ovl_En_Ru2/z_en_ru2.h
View file

@ -14,18 +14,18 @@ typedef struct EnRu2 {
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ Vec3s jointTable[23];
/* 0x021A */ Vec3s morphTable[23];
/* 0x02A4 */ s16 unk_2A4;
/* 0x02A6 */ s16 unk_2A6;
/* 0x02A4 */ s16 eyeIndex;
/* 0x02A6 */ s16 blinkTimer;
/* 0x02A8 */ s32 action;
/* 0x02AC */ s32 drawConfig;
/* 0x02B0 */ f32 unk_2B0;
/* 0x02B0 */ f32 fadeTimer;
/* 0x02B4 */ u32 alpha;
/* 0x02B8 */ s32 unk_2B8;
/* 0x02B8 */ s32 isLightBall;
/* 0x02BC */ s32 cueId;
/* 0x02C0 */ u16 unk_2C0;
/* 0x02C2 */ u8 unk_2C2;
/* 0x02C3 */ u8 unk_2C3;
/* 0x02C4 */ f32 unk_2C4;
/* 0x02C0 */ u16 swimmingUpFrame;
/* 0x02C2 */ u8 textboxCount; // increments on advancement through dialogue in Water Temple
/* 0x02C3 */ u8 lastDialogState;
/* 0x02C4 */ f32 encounterTimer;
/* 0x02C8 */ ColliderCylinder collider;
} EnRu2; // size = 0x0314

2
src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c
View file

@ -2,7 +2,7 @@
#include "z64cutscene_commands.h"
// clang-format off
static CutsceneData D_80AF411C[] = {
static CutsceneData gWaterMedallionCS[] = {
CS_HEADER(35, 3338),
CS_UNK_DATA_LIST(0x00000020, 1),
CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000),

2
tools/csdis_re.py
View file

@ -36,7 +36,7 @@ HARDCODED_SYM_ROM = {
"D_80B4C5D0": 0xF022D0,
"D_80ABF9D0": 0xE75A40,
"D_80ABFB40": 0xE75BB0,
"D_80AF411C": 0xEAA0FC,
"gWaterMedallionCS": 0xEAA0FC,
"D_80A88164": 0xE3ED34,
"D_808BB2F0": 0xC89FF0,
"D_808BB7A0": 0xC8A4A0,