Merge branch 'master' into rebase

This commit is contained in:
Pheenoh 2022-12-20 16:44:19 -07:00 committed by GitHub
commit e6ad43f094
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -4,15 +4,15 @@
#include "dolphin/types.h"
#include "d/d_stage.h"
class dPath {
public:
class dStage_dPnt_c;
struct dPath {
/* 0x0 */ u16 m_num;
/* 0x2 */ u16 m_nextID;
/* 0x4 */ u8 field_0x4;
/* 0x5 */ u8 m_closed;
/* 0x6 */ u8 field_0x6;
/* 0x8 */ dStage_dPnt_c* m_points;
};
// should be move to dlib TU per chn debug

View File

@ -244,11 +244,11 @@ public:
/* 8000FAE8 */ virtual ~mDoExt_morf_c();
void setPlaySpeed(f32 speed) { mFrameCtrl.setRate(speed); }
void setFrame(f32 frame) { mFrameCtrl.setFrame((s16)frame); }
f32 getPlaySpeed() { return mFrameCtrl.getRate(); }
f32 getFrame() { return mFrameCtrl.getFrame(); }
u8 getPlayMode() { return mFrameCtrl.getAttribute(); }
bool isLoop() { return mFrameCtrl.checkState(2); }
void setFrame(f32 frame) { mFrameCtrl.setFrame((s16)frame); }
f32 getEndFrame() { return mFrameCtrl.getEnd(); }
bool isStop() {