mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-18 06:12:20 -05:00
Code Issues Projects Releases Wiki Activity

Adult Ruto function and property names pulled in from decomp (#4654)

Browse Source 
* Adult Ruto function and property names pulled in from decomp

* Align name changes more with decomp

* Nope, missed a couple more
This commit is contained in:
Jordan Longstaff 2024-12-09 21:23:57 -05:00 committed by GitHub
parent 6823b6990b
commit 35dcf93c51
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 461 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/soh/Enhancements/timesaver_hook_handlers.cpp
View File

@ -38,7 +38,7 @@ extern int32_t D_8011D3AC;
extern void BgSpot03Taki_HandleWaterfallState(BgSpot03Taki* bgSpot03Taki, PlayState* play); extern void BgSpot03Taki_HandleWaterfallState(BgSpot03Taki* bgSpot03Taki, PlayState* play);
extern void BgSpot03Taki_ApplyOpeningAlpha(BgSpot03Taki* bgSpot03Taki, s32 bufferIndex); extern void BgSpot03Taki_ApplyOpeningAlpha(BgSpot03Taki* bgSpot03Taki, s32 bufferIndex);
extern void func_80AF36EC(EnRu2* enRu2, PlayState* play); extern void EnRu2_SetEncounterSwitchFlag(EnRu2* enRu2, PlayState* play);
} }
#define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).GetContextOptionIndex() #define RAND_GET_OPTION(option) Rando::Context::GetInstance()->GetOption(option).GetContextOptionIndex()
@ -893,7 +893,7 @@ void TimeSaverOnActorInitHandler(void* actorRef) {
if (actor->id == ACTOR_EN_RU2 && gPlayState->sceneNum == SCENE_WATER_TEMPLE) { if (actor->id == ACTOR_EN_RU2 && gPlayState->sceneNum == SCENE_WATER_TEMPLE) {
if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) { if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) {
EnRu2* enRu2 = (EnRu2*)actor; EnRu2* enRu2 = (EnRu2*)actor;
func_80AF36EC(enRu2, gPlayState); EnRu2_SetEncounterSwitchFlag(enRu2, gPlayState);
Actor_Kill(actor); Actor_Kill(actor);
} }
} }

762
soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View File

File diff suppressed because it is too large Load Diff

18
soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h
View File

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

2
soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c
View File

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