encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

d_meter_string done (#2023)

Browse Source 
* d_meter_string done

* remove asm

* some other d_meter fixes
This commit is contained in:
TakaRikka
2024-01-03 16:12:17 +02:00
committed by GitHub
parent f5bf24c77e
commit 2e15998e7a
27 changed files with 455 additions and 3236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/com/d_com_inf_game.h
+5
View File
@@ -437,6 +437,7 @@ public:
JKRArchive* getFontArchive() { return mFontArchive; }
JKRArchive* getRubyArchive() { return mRubyArchive; }
JKRArchive* getMeterButtonArchive() { return mMeterButtonArchive; }
JKRArchive* getAllMapArchive() { return mAllMapArchive; }
void setFieldMapArchive2(JKRArchive* arc) { mFieldMapArchive2 = arc; }
void setAnmArchive(JKRArchive* arc) { mAnmArchive = arc; }
@@ -2924,6 +2925,10 @@ inline JKRArchive* dComIfGp_getMeterButtonArchive() {
return g_dComIfG_gameInfo.play.getMeterButtonArchive();
}
inline JKRArchive* dComIfGp_getAllMapArchive() {
return g_dComIfG_gameInfo.play.getAllMapArchive();
}
inline void dComIfGp_onPauseFlag() {
g_dComIfG_gameInfo.play.onPauseFlag();
}
include/d/meter/d_meter2.h
+5 -21
View File
@@ -10,8 +10,12 @@ class J2DAnmTextureSRTKey;
class J2DAnmTransformKey;
class JKRExpHeap;
class JKRHeap;
class dMeter2Draw_c;
class dMeterMap_c;
class dMeterString_c;
class dMeterButton_c;
class dMeterHaihai_c;
class dMeterSub_c : public dDlst_base_c {
public:
@@ -31,26 +35,6 @@ public:
/* 80194138 */ virtual bool isDead();
};
class dMeterString_c : public dMeterSub_c {
public:
/* 8020ED60 */ dMeterString_c(int);
/* 8020F5A4 */ void createString(int);
/* 8020F66C */ void playBckAnimation(f32);
/* 8020F6EC */ void drawPikari();
/* 8020FA88 */ void isLeadByte(int);
/* 8020F1B0 */ virtual void draw();
/* 8020EDF4 */ virtual ~dMeterString_c();
/* 8020EE70 */ virtual int _create();
/* 8020F150 */ virtual int _execute(u32);
/* 8020F49C */ virtual int _delete();
/* 0x04 */ u8 field_0x4[0x40 - 0x4];
};
class dMeterButton_c;
class dMeterHaihai_c;
class dMeter2_c : public msg_class {
public:
enum {
@@ -106,7 +90,7 @@ public:
/* 802254C0 */ void alphaAnimeButtonCross();
/* 802256DC */ bool isShowLightDrop();
/* 802258A0 */ void killSubContents(u8);
/* 80225960 */ BOOL isKeyVisible();
/* 80225960 */ u8 isKeyVisible();
/* 802259F8 */ int isArrowEquip();
/* 80225A64 */ int isPachinkoEquip();
include/d/meter/d_meter2_info.h
+7 -2
View File
@@ -60,7 +60,7 @@ public:
f32 getStringLength(J2DTextBox*, char*);
f32 getStringLength(JUTFont*, f32, f32, char*);
void onDirectUseItem(int);
bool isDirectUseItem(int);
BOOL isDirectUseItem(int);
int setMeterString(s32);
void resetWarpStatus(void);
void warpInProc(void);
@@ -364,7 +364,7 @@ inline void dMeter2Info_setMaxCount(u8 count) {
g_meter2_info.setMaxCount(count);
}
inline bool dMeter2Info_isDirectUseItem(int param_0) {
inline BOOL dMeter2Info_isDirectUseItem(int param_0) {
return g_meter2_info.isDirectUseItem(param_0);
}
@@ -656,6 +656,11 @@ inline s16 dMeter2Info_getHorseLifeCount() {
return g_meter2_info.getHorseLifeCount();
}
inline void dMeter2Info_resetMeterString() {
g_meter2_info.resetMeterString();
}
const char* dMeter2Info_getNumberTextureName(int pIndex);
void dMeter2Info_recieveLetter();
u8 dMeter2Info_getNewLetterNum();
include/d/meter/d_meter_string.h
+36 -1
View File
@@ -1,6 +1,41 @@
#ifndef D_METER_D_METER_STRING_H
#define D_METER_D_METER_STRING_H
#include "dolphin/types.h"
#include "d/meter/d_meter2.h"
class dMeterString_c : public dMeterSub_c {
public:
/* 8020ED60 */ dMeterString_c(int);
/* 8020F5A4 */ int createString(int);
/* 8020F66C */ void playBckAnimation(f32);
/* 8020F6EC */ void drawPikari();
/* 8020FA88 */ bool isLeadByte(int);
/* 8020F1B0 */ virtual void draw();
/* 8020EDF4 */ virtual ~dMeterString_c();
/* 8020EE70 */ virtual int _create();
/* 8020F150 */ virtual int _execute(u32);
/* 8020F49C */ virtual int _delete();
f32 acc(s16 param_0, s16 param_1, s16 param_2) {
return ((f32)(param_1 - param_2) * (f32)(param_1 - param_2)) / ((f32)(param_0 - param_2) * (f32)(param_0 - param_2));
}
/* 0x04 */ J2DScreen* mpScreen;
/* 0x08 */ J2DAnmTransformKey* mpGetInBck;
/* 0x0C */ CPaneMgr* mpParentPane;
/* 0x10 */ CPaneMgr* mpRootPane;
/* 0x14 */ CPaneMgr* mpTextPane;
/* 0x18 */ JKRArchive* mpMapArchive;
/* 0x1C */ u8 field_0x1C[0x24 - 0x1C];
/* 0x24 */ int mStringID;
/* 0x28 */ u8 field_0x28;
/* 0x2C */ f32 mAnimFrame;
/* 0x30 */ f32 mPikariAnimFrame;
/* 0x34 */ int mStringID2;
/* 0x38 */ s16 mOffsetX;
/* 0x3A */ s16 mOffsetY;
/* 0x3C */ u8 field_0x3c;
};
#endif /* D_METER_D_METER_STRING_H */