diff options
| author | SonicDcer <alejandro.asenjo88@gmail.com> | 2026-06-15 03:13:19 -0300 |
|---|---|---|
| committer | SonicDcer <alejandro.asenjo88@gmail.com> | 2026-06-15 03:13:19 -0300 |
| commit | cee62dd2c39ecf9c032c573fabed1fbb08f9517a (patch) | |
| tree | 34594092ae41c0d92b2b05c0f52be1d8bd18a253 /include | |
| parent | ed6604310a74c2207716a5bee32ae05d5fd00f7a (diff) | |
| parent | b96d7e4c530a11975b0f7a618253b9a0ea225880 (diff) | |
Merge branch 'main' of github.com:HarbourMasters/Starship
Diffstat (limited to 'include')
| -rw-r--r-- | include/fox_record.h | 18 | ||||
| -rw-r--r-- | include/functions.h | 2 | ||||
| -rw-r--r-- | include/i5.h | 2 |
3 files changed, 17 insertions, 5 deletions
diff --git a/include/fox_record.h b/include/fox_record.h index 531b6c42..6d9cec6e 100644 --- a/include/fox_record.h +++ b/include/fox_record.h @@ -1,6 +1,6 @@ /** * Used to reproduce recordings made from real N64 hardware - * to accurately reproduce Cutscenes at the correct speed. + * to accurately play cutscenes at the correct speed. * These recordings adjust gVisPerFrame during runtime to produce * the same behaviour as the original game. */ @@ -15,8 +15,20 @@ typedef struct Record { } Record; extern Record gCarrierCutsceneRecord[13]; +extern Record gWarpzoneCsRecord[19]; +extern Record gA6GorgonCsRecord[12]; +extern Record gSyRobotCutsceneRecord[3]; +extern Record gAndrossRobotKillCutscene2[20]; +extern Record gAndrossRobotKillCutscene1[25]; +extern Record gMacbethCutsceneRecord[14]; +extern Record gGrangaCutsceneRecord[13]; +extern Record gMeCrusherCutsceneRecord[3]; +extern Record gEndingCsRecord[37]; +extern Record gSolarIntroCsRecord[16]; -void UpdateVisPerFrameFromRecording(Record* record, s32 maxFrames); -void UpdateVisPerFrameFromRecording_Ending(Record* record, s32 maxFrames); +extern int gA6GorgonCsFrameCount; +extern int gWarpzoneCsFrameCount; + +void UpdateVisPerFrameFromRecording(Record* record, s32 maxFrames, int* frameCounter); #endif diff --git a/include/functions.h b/include/functions.h index a7217af0..b224066d 100644 --- a/include/functions.h +++ b/include/functions.h @@ -505,7 +505,7 @@ void Ending_Main(void); void Ending_Draw(void); // sf_i5_5 -bool Ground_801B49D0(Actor* actor); +bool Ground_List_Setup(Actor* actor); // libultra void gSPSegmentLoadRes(void* value, int segNum, uintptr_t target); diff --git a/include/i5.h b/include/i5.h index ea4c4b94..af06200c 100644 --- a/include/i5.h +++ b/include/i5.h @@ -49,7 +49,7 @@ void Macbeth_MaProximityLight_Init(Scenery *); void Macbeth_Actor207_Init(Actor *); void Macbeth_801ACFBC(void); void Macbeth_801AD080(void); -void Ground_801B5110(f32, f32, f32); +void Ground_Init(f32, f32, f32); void Ground_801B58AC(Gfx **, f32); bool Ground_801B6AEC(f32, f32, f32); s32 Ground_801B6E20(f32, f32, f32 *, f32 *, f32 *); |