Skip to content

vi: Match visual/cutscene functions #2039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ribbanya merged 2 commits into from
Jan 6, 2026
+29 −5
Merged

vi: Match visual/cutscene functions #2039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23a21b9
vi1201v1: Match fn_8031FC30 and fn_8031FCBC
itsgrimetime Jan 5, 2026
c957dbc
Merge branch 'master' into batch/vi-20241230
ribbanya Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions src/melee/vi/vi1201v1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#include "vi/vi1201v1.static.h"

#include <baselib/aobj.h>
#include <baselib/cobj.h>
#include <baselib/gobj.h>
#include <baselib/gobjplink.h>
#include <baselib/jobj.h>
#include <dolphin/gx/GXStruct.h>

Expand Down Expand Up @@ -49,9 +52,30 @@ void fn_8031FB90(HSD_GObj* gobj)
}
}

/// #fn_8031FC30
void fn_8031FC30(HSD_GObj* gobj)
{
HSD_CObj* cobj = GET_COBJ(gobj);
HSD_CObjAnim(cobj);
if (cobj->aobj->curr_frame == 1.0F) {
vi_8031C9B4(0xD, 0);
}
if (cobj->aobj->curr_frame == 30.0F) {
un_8031F9D8(un_804D6FFC, un_804D6FFD);
}
if (cobj->aobj->curr_frame == cobj->aobj->end_frame) {
lb_800145F4();
gm_801A4B60();
}
}

/// #fn_8031FCBC
void fn_8031FCBC(HSD_GObj* gobj)
{
if ((f32) un_804D6FF8 >= 30.0F) {
HSD_GObjPLink_80390228(gobj);
} else {
un_804D6FF8 = un_804D6FF8 + 1;
}
}

/// #un_8031FD18_OnEnter

Expand Down
6 changes: 3 additions & 3 deletions src/melee/vi/vi1201v1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

/* 31F990 */ void un_8031F990(HSD_GObj*);
/* 31F9B4 */ void un_8031F9B4(HSD_GObj*);
/* 31F9D8 */ UNK_RET un_8031F9D8(UNK_PARAMS);
/* 31F9D8 */ void un_8031F9D8(u8, u8);
/* 31FAA8 */ UNK_RET fn_8031FAA8(UNK_PARAMS);
/* 31FB90 */ void fn_8031FB90(HSD_GObj*);
/* 31FC30 */ UNK_RET fn_8031FC30(UNK_PARAMS);
/* 31FCBC */ UNK_RET fn_8031FCBC(UNK_PARAMS);
/* 31FC30 */ void fn_8031FC30(HSD_GObj*);
/* 31FCBC */ void fn_8031FCBC(HSD_GObj*);
/* 31FD18 */ void un_8031FD18_OnEnter(UNK_T);
/* 320490 */ void un_80320490_OnFrame(void);
/* 3204B0 */ void un_803204B0(int, int);
Expand Down