mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-09 02:50:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_meter_hakusha done (#2020)

Browse Source 
* meter_hakusha done

* remove asm
This commit is contained in:
TakaRikka
2024-01-02 10:59:20 -08:00
committed by GitHub
parent cde861cb85
commit 4d0c96ef03
17 changed files with 396 additions and 1530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/meter/d_meter2_info.h
+6 -1
View File
@@ -163,6 +163,7 @@ public:
void resetBlinkButton() { mBlinkButton = 0; }
s16 getFloatingMessageTimer() { return mFloatingMessageTimer; }
u16 getFloatingMessageID() { return mFloatingMessageID; }
s16 getHorseLifeCount() { return mHorseLifeCount; }
void setCollectCursorPosXY(u8 x, u8 y) {
mCollectCursorPosX = x;
mCollectCursorPosY = y;
@@ -196,7 +197,7 @@ public:
/* 0x8C */ s32 mMeterString;
/* 0x90 */ u32 mTempBits;
/* 0x94 */ s16 mMsgKeyWaitTimer;
/* 0x96 */ u16 mHorseLifeCount;
/* 0x96 */ s16 mHorseLifeCount;
/* 0x98 */ u16 unk152;
/* 0x9A */ u16 mHotSpringTimer[4];
/* 0xA2 */ u16 mSub2DStatus;
@@ -651,6 +652,10 @@ inline u32 dMeter2Info_getFloatingMessageID() {
return g_meter2_info.getFloatingMessageID();
}
inline s16 dMeter2Info_getHorseLifeCount() {
return g_meter2_info.getHorseLifeCount();
}
const char* dMeter2Info_getNumberTextureName(int pIndex);
void dMeter2Info_recieveLetter();
u8 dMeter2Info_getNewLetterNum();
include/d/meter/d_meter_hakusha.h
+42 -1
View File
@@ -1,6 +1,47 @@
#ifndef D_METER_D_METER_HAKUSHA_H
#define D_METER_D_METER_HAKUSHA_H
#include "dolphin/types.h"
#include "d/meter/d_meter2.h"
class dMeterHakusha_c : public dMeterSub_c {
public:
struct hakusha_data {
f32 pos_x;
f32 pos_y;
u8 flags;
};
/* 8020C320 */ dMeterHakusha_c(void*);
/* 8020CC58 */ void alphaAnimeHakusha(u32);
/* 8020CD6C */ void updateHakusha();
/* 8020D258 */ void setAlphaHakushaAnimeMin();
/* 8020D308 */ void setAlphaHakushaAnimeMax();
/* 8020D3B8 */ void setAlphaButtonAnimeMin();
/* 8020D41C */ void setAlphaButtonAnimeMax();
/* 8020D480 */ int getHakushaNum();
/* 8020C850 */ virtual void draw();
/* 8020C384 */ virtual ~dMeterHakusha_c();
/* 8020C400 */ virtual int _create();
/* 8020C808 */ virtual int _execute(u32);
/* 8020CABC */ virtual int _delete();
/* 0x004 */ J2DScreen* field_0x004;
/* 0x008 */ J2DScreen* mpHakushaScreen;
/* 0x00C */ J2DScreen* mpButtonScreen;
/* 0x010 */ CPaneMgr* mpHakushaParent;
/* 0x014 */ CPaneMgr* mpHakushaPos[6];
/* 0x02C */ CPaneMgr* mpHakushaOn;
/* 0x030 */ CPaneMgr* mpHakushaOff;
/* 0x034 */ CPaneMgr* mpButtonA;
/* 0x038 */ hakusha_data mHakushaData[12];
/* 0x0C8 */ f32 mHakushaAnimFrame[12];
/* 0x0F8 */ f32 mButtonAPosX;
/* 0x0FC */ f32 mButtonAPosY;
/* 0x100 */ f32 field_0x100;
/* 0x104 */ f32 field_0x104;
/* 0x108 */ s16 mHakushaNum;
/* 0x10A */ u8 mHakushaStatus[12];
};
#endif /* D_METER_D_METER_HAKUSHA_H */