mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-08 14:36:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_meter2_draw done (#2028)

Browse Source 
* d_meter2_draw done

* some meter_draw doc

* remove asm

* d_file_sel_info fixed
This commit is contained in:
TakaRikka
2024-01-09 06:10:40 -08:00
committed by GitHub
parent 28bef08667
commit 99f0efe975
103 changed files with 4216 additions and 14622 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/file/d_file_sel_info.cpp
+80 -268
View File
@@ -1,164 +1,24 @@
//
// Generated By: dol2asm
// Translation Unit: d/file/d_file_sel_info
//
/**
* d_file_sel_info.cpp
* File Select Screen File Info
*/
#include "d/file/d_file_sel_info.h"
#include "JSystem/J2DGraph/J2DScreen.h"
#include "JSystem/J2DGraph/J2DTextBox.h"
#include "stdio.h"
#include "d/com/d_com_inf_game.h"
#include "d/meter/d_meter2_info.h"
#include "d/pane/d_pane_class.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" void __ct__12dFile_info_cFP10JKRArchiveUc();
extern "C" void __dt__12dFile_info_cFv();
extern "C" void screenSet__12dFile_info_cFv();
extern "C" void setSaveData__12dFile_info_cFP10dSv_save_ciUc();
extern "C" void setHeartCnt__12dFile_info_cFP10dSv_save_c();
extern "C" void setSaveDate__12dFile_info_cFP10dSv_save_c();
extern "C" void setPlayTime__12dFile_info_cFP10dSv_save_c();
extern "C" void modeWait__12dFile_info_cFv();
extern "C" void modeMove__12dFile_info_cFv();
extern "C" void _draw__12dFile_info_cFv();
extern "C" void draw__16dDlst_FileInfo_cFv();
extern "C" void __sinit_d_file_sel_info_cpp();
extern "C" void __dt__16dDlst_FileInfo_cFv();
extern "C" extern char const* const d_file_d_file_sel_info__stringBase0;
//
// External References:
//
extern "C" void mDoExt_getMesgFont__Fv();
extern "C" void mDoExt_removeMesgFont__Fv();
extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c();
extern "C" void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c();
extern "C" void __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void __ct__9J2DScreenFv();
extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive();
extern "C" void draw__9J2DScreenFffPC14J2DGrafContext();
extern "C" void getStringPtr__10J2DTextBoxCFv();
extern "C" void setString__10J2DTextBoxFsPCce();
extern "C" void _savegpr_22();
extern "C" void _savegpr_26();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_22();
extern "C" void _restgpr_26();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void __div2i();
extern "C" void __mod2i();
extern "C" extern void* __vt__12dDlst_base_c[3];
//
// Declarations:
//
/* ############################################################################################## */
/* 803948B8-803948B8 020F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_803948B8 = "zelda_file_select_info_text.blo";
SECTION_DEAD static char const* const stringBase_803948D8 = "";
SECTION_DEAD static char const* const stringBase_803948D9 = "tt_heart_00.bti";
#pragma pop
#include "stdio.h"
/* 803BB498-803BB4A8 0185B8 000C+04 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
/* padding */
0x00,
0x00,
0x00,
0x00,
};
/* 803BB4A8-803BB548 0185C8 00A0+00 1/1 0/0 0/0 .data l_htag$3879 */
SECTION_DATA static u64 l_htag[20] = {
'hear_20', 'hear_21', 'hear_22', 'hear_23', 'hear_24', 'hear_25', 'hear_26',
'hear_27', 'hear_28', 'hear_29', 'hear_30', 'hear_31', 'hear_32', 'hear_33',
'hear_34', 'hear_35', 'hear_36', 'hear_37', 'hear_38', 'hear_39',
};
/* 803BB548-803BB558 -00001 0010+00 1/1 0/0 0/0 .data amariheartTex$3880 */
SECTION_DATA static const char* amariheartTex[4] = {
"tt_heart_00.bti",
"tt_heart_00.bti",
"tt_heart_00.bti",
"tt_heart_00.bti",
};
/* 803BB558-803BB564 -00001 000C+00 0/1 0/0 0/0 .data @3953 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3953[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)modeWait__12dFile_info_cFv,
};
#pragma pop
/* 803BB564-803BB570 -00001 000C+00 0/1 0/0 0/0 .data @3954 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3954[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)modeMove__12dFile_info_cFv,
};
#pragma pop
/* 803BB570-803BB588 018690 0018+00 0/1 0/0 0/0 .data fileWarningProc */
#pragma push
#pragma force_active on
SECTION_DATA static u8 fileWarningProc[24] = {
static u8 cNullVec__6Z2Calc[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#pragma pop
/* 803BB588-803BB598 0186A8 0010+00 3/3 0/0 0/0 .data __vt__16dDlst_FileInfo_c */
SECTION_DATA extern void* __vt__16dDlst_FileInfo_c[4] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__16dDlst_FileInfo_cFv,
(void*)__dt__16dDlst_FileInfo_cFv,
};
/* 803BB598-803BB5B0 0186B8 000C+0C 2/2 0/0 0/0 .data __vt__12dFile_info_c */
SECTION_DATA extern void* __vt__12dFile_info_c[3 + 3 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dFile_info_cFv,
/* padding */
NULL,
NULL,
NULL,
};
/* 80192434-801924A0 18CD74 006C+00 0/0 3/3 0/0 .text __ct__12dFile_info_cFP10JKRArchiveUc */
dFile_info_c::dFile_info_c(JKRArchive* arc, u8 param_1) {
mArchive = arc;
dFile_info_c::dFile_info_c(JKRArchive* i_archive, u8 param_1) {
mArchive = i_archive;
field_0x22 = param_1;
mFileInfo.mBasePane = NULL;
screenSet();
@@ -166,7 +26,6 @@ dFile_info_c::dFile_info_c(JKRArchive* arc, u8 param_1) {
}
/* 801924A0-80192570 18CDE0 00D0+00 1/0 0/0 0/0 .text __dt__12dFile_info_cFv */
#ifdef NONMATCHING
dFile_info_c::~dFile_info_c() {
delete mFileInfo.Scr;
delete mDatBase;
@@ -174,21 +33,12 @@ dFile_info_c::~dFile_info_c() {
mDoExt_removeMesgFont();
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm dFile_info_c::~dFile_info_c() {
extern "C" asm void __dt__12dFile_info_cFv() {
nofralloc
#include "asm/d/file/d_file_sel_info/__dt__12dFile_info_cFv.s"
}
#pragma pop
#endif
/* 80192570-80192954 18CEB0 03E4+00 1/1 0/0 0/0 .text screenSet__12dFile_info_cFv */
void dFile_info_c::screenSet() {
mFileInfo.Scr = new J2DScreen();
JUT_ASSERT(mFileInfo.Scr != 0);
mFileInfo.Scr->setPriority("zelda_file_select_info_text.blo", 0x1100000, mArchive);
mFileInfo.mFont = mDoExt_getMesgFont();
mFileInfo.Scr->search('w_cp_ef1')->hide();
@@ -196,47 +46,47 @@ void dFile_info_c::screenSet() {
mDatBase = new CPaneMgrAlpha(mFileInfo.Scr, 'w_dat_i1', 2, NULL);
mNoDatBase = new CPaneMgrAlpha(mFileInfo.Scr, 'w_nda_i1', 2, NULL);
J2DTextBox* tboxs[4];
tboxs[0] = (J2DTextBox*)mFileInfo.Scr->search('f_s_t_02');
tboxs[1] = (J2DTextBox*)mFileInfo.Scr->search('f_p_t_02');
J2DTextBox* info_text[4];
info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('f_s_t_02');
info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('f_p_t_02');
mFileInfo.Scr->search('w_s_t_01')->hide();
mFileInfo.Scr->search('w_p_t_01')->hide();
for (int i = 0; i < 2; i++) {
tboxs[i]->setFont(mFileInfo.mFont);
tboxs[i]->setString(0x20, "");
info_text[i]->setFont(mFileInfo.mFont);
info_text[i]->setString(0x20, "");
}
dMeter2Info_getString(0x3D0, tboxs[0]->getStringPtr(), NULL); // Save time
dMeter2Info_getString(0x3D1, tboxs[1]->getStringPtr(), NULL); // Total play time
dMeter2Info_getString(0x3D0, info_text[0]->getStringPtr(), NULL); // Save time
dMeter2Info_getString(0x3D1, info_text[1]->getStringPtr(), NULL); // Total play time
tboxs[0] = (J2DTextBox*)mFileInfo.Scr->search('f_name01');
tboxs[1] = (J2DTextBox*)mFileInfo.Scr->search('f_new_1');
info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('f_name01');
info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('f_new_1');
mFileInfo.Scr->search('w_name01')->hide();
mFileInfo.Scr->search('w_new_1')->hide();
tboxs[2] = (J2DTextBox*)mFileInfo.Scr->search('w_time01');
tboxs[3] = (J2DTextBox*)mFileInfo.Scr->search('w_ptim01');
info_text[2] = (J2DTextBox*)mFileInfo.Scr->search('w_time01');
info_text[3] = (J2DTextBox*)mFileInfo.Scr->search('w_ptim01');
for (int i = 0; i < 4; i++) {
tboxs[i]->setFont(mFileInfo.mFont);
tboxs[i]->setString(0x40, "");
info_text[i]->setFont(mFileInfo.mFont);
info_text[i]->setString(0x40, "");
}
mPlayerName = tboxs[0]->getStringPtr();
mSaveStatus = tboxs[1]->getStringPtr();
mSaveDate = tboxs[2]->getStringPtr();
mPlayTime = tboxs[3]->getStringPtr();
mPlayerName = info_text[0]->getStringPtr();
mSaveStatus = info_text[1]->getStringPtr();
mSaveDate = info_text[2]->getStringPtr();
mPlayTime = info_text[3]->getStringPtr();
}
/* 80192954-80192AA0 18D294 014C+00 0/0 3/3 0/0 .text setSaveData__12dFile_info_cFP10dSv_save_ciUc
*/
int dFile_info_c::setSaveData(dSv_save_c* save, int checksumValid, u8 data_num) {
if (checksumValid) {
char* player_name = save->getPlayer().getPlayerInfo().getLinkName();
if (*player_name == NULL) {
if (field_0x22 == 1 && data_num == dComIfGs_getDataNum()) {
save->getPlayer().getPlayerStatusA().setLife(i_dComIfGs_getLife());
setHeartCnt(save);
save->getPlayer().getPlayerStatusA().setLife(12);
int dFile_info_c::setSaveData(dSv_save_c* i_savedata, BOOL i_validChksum, u8 i_dataNo) {
if (i_validChksum) {
char* player_name = i_savedata->getPlayer().getPlayerInfo().getLinkName();
if (*player_name == 0) {
if (field_0x22 == 1 && i_dataNo == dComIfGs_getDataNum()) {
i_savedata->getPlayer().getPlayerStatusA().setLife(i_dComIfGs_getLife());
setHeartCnt(i_savedata);
i_savedata->getPlayer().getPlayerStatusA().setLife(12);
strcpy(mPlayerName, dComIfGs_getPlayerName());
strcpy(mSaveDate, "");
strcpy(mPlayTime, "");
@@ -247,10 +97,10 @@ int dFile_info_c::setSaveData(dSv_save_c* save, int checksumValid, u8 data_num)
return 1;
}
} else {
setHeartCnt(save);
setHeartCnt(i_savedata);
strcpy(mPlayerName, player_name);
setSaveDate(save);
setPlayTime(save);
setSaveDate(i_savedata);
setPlayTime(i_savedata);
return 0;
}
} else {
@@ -260,46 +110,63 @@ int dFile_info_c::setSaveData(dSv_save_c* save, int checksumValid, u8 data_num)
}
/* 80192AA0-80192C08 18D3E0 0168+00 1/1 0/0 0/0 .text setHeartCnt__12dFile_info_cFP10dSv_save_c */
void dFile_info_c::setHeartCnt(dSv_save_c* save) {
u16 life = save->getPlayer().getPlayerStatusA().getLife();
s32 count = (life & 0xffff) / 5;
void dFile_info_c::setHeartCnt(dSv_save_c* i_savedata) {
static u64 l_htag[] = {
'hear_20', 'hear_21', 'hear_22', 'hear_23', 'hear_24', 'hear_25', 'hear_26',
'hear_27', 'hear_28', 'hear_29', 'hear_30', 'hear_31', 'hear_32', 'hear_33',
'hear_34', 'hear_35', 'hear_36', 'hear_37', 'hear_38', 'hear_39',
};
static const char* amariheartTex[] = {
"tt_heart_00.bti",
"tt_heart_00.bti",
"tt_heart_00.bti",
"tt_heart_00.bti",
};
u16 life = i_savedata->getPlayer().getPlayerStatusA().getLife();
s32 count = (life & 0xFFFF) / 5;
s32 quarter_count = life % 5;
if (quarter_count != 0) {
count++;
}
J2DPicture* heartP[20];
J2DPicture* heart_tex[20];
for (int i = 0; i < 20; i++) {
heartP[i] = (J2DPicture*)mFileInfo.Scr->search(l_htag[i]);
heart_tex[i] = (J2DPicture*)mFileInfo.Scr->search(l_htag[i]);
if (i < save->getPlayer().getPlayerStatusA().getMaxLife() / 5) {
heartP[i]->show();
if (i < i_savedata->getPlayer().getPlayerStatusA().getMaxLife() / 5) {
heart_tex[i]->show();
if (i < count) {
if (quarter_count != 0 && i == count - 1) {
heartP[i]->changeTexture(amariheartTex[quarter_count - 1], 0);
heart_tex[i]->changeTexture(amariheartTex[quarter_count - 1], 0);
} else {
heartP[i]->changeTexture("tt_heart_00.bti", 0);
heart_tex[i]->changeTexture("tt_heart_00.bti", 0);
}
} else {
heartP[i]->changeTexture("tt_heart_00.bti", 0);
heart_tex[i]->changeTexture("tt_heart_00.bti", 0);
}
} else {
heartP[i]->hide();
heart_tex[i]->hide();
}
}
}
/* 803BB570-803BB588 018690 0018+00 0/1 0/0 0/0 .data fileWarningProc */
typedef void (dFile_info_c::*procFunc)();
procFunc fileWarningProc[] = {&dFile_info_c::modeWait, &dFile_info_c::modeMove};
/* 80192C08-80192C70 18D548 0068+00 1/1 0/0 0/0 .text setSaveDate__12dFile_info_cFP10dSv_save_c */
void dFile_info_c::setSaveDate(dSv_save_c* save) {
void dFile_info_c::setSaveDate(dSv_save_c* i_savedata) {
OSCalendarTime time;
OSTicksToCalendarTime(save->getPlayer().getPlayerStatusB().getDateIpl(), &time);
OSTicksToCalendarTime(i_savedata->getPlayer().getPlayerStatusB().getDateIpl(), &time);
sprintf(mSaveDate, "%02d/%02d/%d %02d:%02d", time.month + 1, time.day_of_month, time.year,
time.hours, time.minutes);
}
/* 80192C70-80192D58 18D5B0 00E8+00 1/1 0/0 0/0 .text setPlayTime__12dFile_info_cFP10dSv_save_c */
void dFile_info_c::setPlayTime(dSv_save_c* save) {
s64 time = save->getPlayer().getPlayerInfo().getTotalTime() / (OS_BUS_CLOCK / 4);
void dFile_info_c::setPlayTime(dSv_save_c* i_savedata) {
s64 time = i_savedata->getPlayer().getPlayerInfo().getTotalTime() / (OS_BUS_CLOCK / 4);
// 3599940 = 999:59 in seconds
if (time >= 3599940) {
@@ -312,85 +179,30 @@ void dFile_info_c::setPlayTime(dSv_save_c* save) {
}
/* 80192D58-80192D5C 18D698 0004+00 1/0 0/0 0/0 .text modeWait__12dFile_info_cFv */
void dFile_info_c::modeWait() {
/* empty function */
}
void dFile_info_c::modeWait() {}
/* 80192D5C-80192D60 18D69C 0004+00 1/0 0/0 0/0 .text modeMove__12dFile_info_cFv */
void dFile_info_c::modeMove() {
/* empty function */
}
void dFile_info_c::modeMove() {}
/* 80192D60-80192D9C 18D6A0 003C+00 0/0 2/2 0/0 .text _draw__12dFile_info_cFv */
void dFile_info_c::_draw() {
dComIfGd_set2DOpa(&mFileInfo);
}
/* ############################################################################################## */
/* 804539F8-804539FC 001FF8 0004+00 1/1 0/0 0/0 .sdata2 @4000 */
SECTION_SDATA2 static f32 lit_4000 = 1.0f;
/* 804539FC-80453A00 001FFC 0004+00 1/1 0/0 0/0 .sdata2 @4001 */
SECTION_SDATA2 static u8 lit_4001[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 80192D9C-80192E88 18D6DC 00EC+00 1/0 0/0 0/0 .text draw__16dDlst_FileInfo_cFv */
// vtable order issue
#ifdef NONMATCHING
void dDlst_FileInfo_c::draw() {
Mtx m;
J2DGrafContext* ctx = dComIfGp_getCurrentGrafPort();
J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
if (mBasePane != NULL) {
MtxP glbMtx2 = mBasePane->getGlbMtx();
// Fake match
MtxP glbMtx = (MtxP)&glbMtx2[0][0];
// fake match?
MtxP glb_mtx = (MtxP)&mBasePane->getGlbMtx()[0][0];
MTXScale(m, mBasePane->getWidth() / field_0x10->getWidth(),
mBasePane->getHeight() / field_0x10->getHeight(), 1.0f);
MTXConcat(glbMtx, m, glbMtx);
Scr->search('Nm_02')->setMtx(glbMtx);
mBasePane->getHeight() / field_0x10->getHeight(), 1.0f);
MTXConcat(glb_mtx, m, glb_mtx);
Scr->search('Nm_02')->setMtx(glb_mtx);
}
Scr->draw(0.0f, 0.0f, ctx);
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm void dDlst_FileInfo_c::draw() {
extern "C" asm void draw__16dDlst_FileInfo_cFv() {
nofralloc
#include "asm/d/file/d_file_sel_info/draw__16dDlst_FileInfo_cFv.s"
}
#pragma pop
#endif
/* 80192E88-80192EC8 18D7C8 0040+00 0/0 1/0 0/0 .text __sinit_d_file_sel_info_cpp */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void __sinit_d_file_sel_info_cpp() {
nofralloc
#include "asm/d/file/d_file_sel_info/__sinit_d_file_sel_info_cpp.s"
Scr->draw(0.0f, 0.0f, graf_ctx);
}
#pragma pop
#pragma push
#pragma force_active on
REGISTER_CTORS(0x80192E88, __sinit_d_file_sel_info_cpp);
#pragma pop
/* 80192EC8-80192F10 18D808 0048+00 1/0 0/0 0/0 .text __dt__16dDlst_FileInfo_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dDlst_FileInfo_c::~dDlst_FileInfo_c() {
nofralloc
#include "asm/d/file/d_file_sel_info/__dt__16dDlst_FileInfo_cFv.s"
}
#pragma pop
/* 803948B8-803948B8 020F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/menu/d_menu_calibration.cpp
+16 -16
View File
@@ -316,31 +316,31 @@ void dMenu_Calibration_c::setHIO(bool i_useHIO) {
if (g_drawHIO.mCollectScreen.mButtonDebugON || i_useHIO) {
if (field_0x94 != NULL) {
field_0x94->paneTrans(g_drawHIO.mCollectScreen.mAButtonPosX,
g_drawHIO.mCollectScreen.mAButtonPosY);
field_0x94->scale(g_drawHIO.mCollectScreen.mAButtonScale,
g_drawHIO.mCollectScreen.mAButtonScale);
field_0x94->paneTrans(g_drawHIO.mCollectScreen.mButtonAPosX,
g_drawHIO.mCollectScreen.mButtonAPosY);
field_0x94->scale(g_drawHIO.mCollectScreen.mButtonAScale,
g_drawHIO.mCollectScreen.mButtonAScale);
}
if (field_0x98 != NULL) {
field_0x98->paneTrans(g_drawHIO.mCollectScreen.mBButtonPosX,
g_drawHIO.mCollectScreen.mBButtonPosY);
field_0x98->scale(g_drawHIO.mCollectScreen.mBButtonScale,
g_drawHIO.mCollectScreen.mBButtonScale);
field_0x98->paneTrans(g_drawHIO.mCollectScreen.mButtonBPosX,
g_drawHIO.mCollectScreen.mButtonBPosY);
field_0x98->scale(g_drawHIO.mCollectScreen.mButtonBScale,
g_drawHIO.mCollectScreen.mButtonBScale);
}
if (field_0x9c != NULL) {
field_0x9c->paneTrans(g_drawHIO.mCollectScreen.mAButtonTextPosX,
g_drawHIO.mCollectScreen.mAButtonTextPosY);
field_0x9c->scale(g_drawHIO.mCollectScreen.mAButtonTextScale,
g_drawHIO.mCollectScreen.mAButtonTextScale);
field_0x9c->paneTrans(g_drawHIO.mCollectScreen.mButtonATextPosX,
g_drawHIO.mCollectScreen.mButtonATextPosY);
field_0x9c->scale(g_drawHIO.mCollectScreen.mButtonATextScale,
g_drawHIO.mCollectScreen.mButtonATextScale);
}
if (field_0xa0 != NULL) {
field_0xa0->paneTrans(g_drawHIO.mCollectScreen.mBButtonTextPosX,
g_drawHIO.mCollectScreen.mBButtonTextPosY);
field_0xa0->scale(g_drawHIO.mCollectScreen.mBButtonTextScale,
g_drawHIO.mCollectScreen.mBButtonTextScale);
field_0xa0->paneTrans(g_drawHIO.mCollectScreen.mButtonBTextPosX,
g_drawHIO.mCollectScreen.mButtonBTextPosY);
field_0xa0->scale(g_drawHIO.mCollectScreen.mButtonBTextScale,
g_drawHIO.mCollectScreen.mButtonBTextScale);
}
}
}
src/d/menu/d_menu_collect.cpp
+16 -16
View File
@@ -2344,28 +2344,28 @@ void dMenu_Collect2D_c::setHIO(bool i_useHIO) {
if (g_drawHIO.mCollectScreen.mButtonDebugON || i_useHIO) {
if (mpButtonAB[0] != NULL) {
mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonPosX,
g_drawHIO.mCollectScreen.mAButtonPosY);
mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mAButtonScale,
g_drawHIO.mCollectScreen.mAButtonScale);
mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonAPosX,
g_drawHIO.mCollectScreen.mButtonAPosY);
mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mButtonAScale,
g_drawHIO.mCollectScreen.mButtonAScale);
}
if (mpButtonAB[1] != NULL) {
mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonPosX,
g_drawHIO.mCollectScreen.mBButtonPosY);
mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mBButtonScale,
g_drawHIO.mCollectScreen.mBButtonScale);
mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBPosX,
g_drawHIO.mCollectScreen.mButtonBPosY);
mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mButtonBScale,
g_drawHIO.mCollectScreen.mButtonBScale);
}
if (mpButtonText[0] != NULL) {
mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonTextPosX,
g_drawHIO.mCollectScreen.mAButtonTextPosY);
mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mAButtonTextScale,
g_drawHIO.mCollectScreen.mAButtonTextScale);
mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonATextPosX,
g_drawHIO.mCollectScreen.mButtonATextPosY);
mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mButtonATextScale,
g_drawHIO.mCollectScreen.mButtonATextScale);
}
if (mpButtonText[1] != NULL) {
mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonTextPosX,
g_drawHIO.mCollectScreen.mBButtonTextPosY);
mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mBButtonTextScale,
g_drawHIO.mCollectScreen.mBButtonTextScale);
mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBTextPosX,
g_drawHIO.mCollectScreen.mButtonBTextPosY);
mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mButtonBTextScale,
g_drawHIO.mCollectScreen.mButtonBTextScale);
}
}
}
src/d/menu/d_menu_fishing.cpp
+16 -16
View File
@@ -624,28 +624,28 @@ void dMenu_Fishing_c::setHIO(bool param_0) {
}
if (g_drawHIO.mCollectScreen.mButtonDebugON != false || param_0) {
if (mpButtonAB[0] != NULL) {
mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonPosX,
g_drawHIO.mCollectScreen.mAButtonPosY);
mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mAButtonScale,
g_drawHIO.mCollectScreen.mAButtonScale);
mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonAPosX,
g_drawHIO.mCollectScreen.mButtonAPosY);
mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mButtonAScale,
g_drawHIO.mCollectScreen.mButtonAScale);
}
if (mpButtonAB[1] != NULL) {
mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonPosX,
g_drawHIO.mCollectScreen.mBButtonPosY);
mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mBButtonScale,
g_drawHIO.mCollectScreen.mBButtonScale);
mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBPosX,
g_drawHIO.mCollectScreen.mButtonBPosY);
mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mButtonBScale,
g_drawHIO.mCollectScreen.mButtonBScale);
}
if (mpButtonText[0] != NULL) {
mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonTextPosX,
g_drawHIO.mCollectScreen.mAButtonTextPosY);
mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mAButtonTextScale,
g_drawHIO.mCollectScreen.mAButtonTextScale);
mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonATextPosX,
g_drawHIO.mCollectScreen.mButtonATextPosY);
mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mButtonATextScale,
g_drawHIO.mCollectScreen.mButtonATextScale);
}
if (mpButtonText[1] != NULL) {
mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonTextPosX,
g_drawHIO.mCollectScreen.mBButtonTextPosY);
mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mBButtonTextScale,
g_drawHIO.mCollectScreen.mBButtonTextScale);
mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBTextPosX,
g_drawHIO.mCollectScreen.mButtonBTextPosY);
mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mButtonBTextScale,
g_drawHIO.mCollectScreen.mButtonBTextScale);
}
}
}
src/d/menu/d_menu_insect.cpp
+16 -16
View File
@@ -897,28 +897,28 @@ void dMenu_Insect_c::setHIO(bool i_useHIO) {
}
if (g_drawHIO.mCollectScreen.mButtonDebugON != false || i_useHIO) {
if (mpButtonAB[0]) {
mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonPosX,
g_drawHIO.mCollectScreen.mAButtonPosY);
mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mAButtonScale,
g_drawHIO.mCollectScreen.mAButtonScale);
mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonAPosX,
g_drawHIO.mCollectScreen.mButtonAPosY);
mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mButtonAScale,
g_drawHIO.mCollectScreen.mButtonAScale);
}
if (mpButtonAB[1]) {
mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonPosX,
g_drawHIO.mCollectScreen.mBButtonPosY);
mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mBButtonScale,
g_drawHIO.mCollectScreen.mBButtonScale);
mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBPosX,
g_drawHIO.mCollectScreen.mButtonBPosY);
mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mButtonBScale,
g_drawHIO.mCollectScreen.mButtonBScale);
}
if (mpButtonText[0]) {
mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonTextPosX,
g_drawHIO.mCollectScreen.mAButtonTextPosY);
mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mAButtonTextScale,
g_drawHIO.mCollectScreen.mAButtonTextScale);
mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonATextPosX,
g_drawHIO.mCollectScreen.mButtonATextPosY);
mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mButtonATextScale,
g_drawHIO.mCollectScreen.mButtonATextScale);
}
if (mpButtonText[1]) {
mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonTextPosX,
g_drawHIO.mCollectScreen.mBButtonTextPosY);
mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mBButtonTextScale,
g_drawHIO.mCollectScreen.mBButtonTextScale);
mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBTextPosX,
g_drawHIO.mCollectScreen.mButtonBTextPosY);
mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mButtonBTextScale,
g_drawHIO.mCollectScreen.mButtonBTextScale);
}
}
}
src/d/menu/d_menu_option.cpp
+12 -12
View File
@@ -3024,27 +3024,27 @@ void dMenu_Option_c::setHIO(bool i_useHIO) {
}
if (g_drawHIO.mCollectScreen.mButtonDebugON != false || i_useHIO) {
if (mpButtonAB[0] != NULL) {
mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonPosX,
g_drawHIO.mCollectScreen.mAButtonPosY);
f32 AButtonScale = g_drawHIO.mCollectScreen.mAButtonScale;
mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonAPosX,
g_drawHIO.mCollectScreen.mButtonAPosY);
f32 AButtonScale = g_drawHIO.mCollectScreen.mButtonAScale;
mpButtonAB[0]->scale(AButtonScale, AButtonScale);
}
if (mpButtonAB[1] != NULL) {
mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonPosX,
g_drawHIO.mCollectScreen.mBButtonPosY);
f32 BButtonScale = g_drawHIO.mCollectScreen.mBButtonScale;
mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBPosX,
g_drawHIO.mCollectScreen.mButtonBPosY);
f32 BButtonScale = g_drawHIO.mCollectScreen.mButtonBScale;
mpButtonAB[1]->scale(BButtonScale, BButtonScale);
}
if (mpButtonText[0] != NULL) {
mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonTextPosX,
g_drawHIO.mCollectScreen.mAButtonTextPosY);
f32 AButtonTextScale = g_drawHIO.mCollectScreen.mAButtonTextScale;
mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonATextPosX,
g_drawHIO.mCollectScreen.mButtonATextPosY);
f32 AButtonTextScale = g_drawHIO.mCollectScreen.mButtonATextScale;
mpButtonText[0]->scale(AButtonTextScale, AButtonTextScale);
}
if (mpButtonText[1] != NULL) {
mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonTextPosX,
g_drawHIO.mCollectScreen.mBButtonTextPosY);
f32 BButtonTextScale = g_drawHIO.mCollectScreen.mBButtonTextScale;
mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBTextPosX,
g_drawHIO.mCollectScreen.mButtonBTextPosY);
f32 BButtonTextScale = g_drawHIO.mCollectScreen.mButtonBTextScale;
mpButtonText[1]->scale(BButtonTextScale, BButtonTextScale);
}
}
src/d/menu/d_menu_skill.cpp
+16 -16
View File
@@ -777,28 +777,28 @@ void dMenu_Skill_c::setHIO(bool i_useHIO) {
}
if (g_drawHIO.mCollectScreen.mButtonDebugON != false || i_useHIO) {
if (mpButtonAB[0]) {
mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonPosX,
g_drawHIO.mCollectScreen.mAButtonPosY);
mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mAButtonScale,
g_drawHIO.mCollectScreen.mAButtonScale);
mpButtonAB[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonAPosX,
g_drawHIO.mCollectScreen.mButtonAPosY);
mpButtonAB[0]->scale(g_drawHIO.mCollectScreen.mButtonAScale,
g_drawHIO.mCollectScreen.mButtonAScale);
}
if (mpButtonAB[1]) {
mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonPosX,
g_drawHIO.mCollectScreen.mBButtonPosY);
mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mBButtonScale,
g_drawHIO.mCollectScreen.mBButtonScale);
mpButtonAB[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBPosX,
g_drawHIO.mCollectScreen.mButtonBPosY);
mpButtonAB[1]->scale(g_drawHIO.mCollectScreen.mButtonBScale,
g_drawHIO.mCollectScreen.mButtonBScale);
}
if (mpButtonText[0]) {
mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mAButtonTextPosX,
g_drawHIO.mCollectScreen.mAButtonTextPosY);
mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mAButtonTextScale,
g_drawHIO.mCollectScreen.mAButtonTextScale);
mpButtonText[0]->paneTrans(g_drawHIO.mCollectScreen.mButtonATextPosX,
g_drawHIO.mCollectScreen.mButtonATextPosY);
mpButtonText[0]->scale(g_drawHIO.mCollectScreen.mButtonATextScale,
g_drawHIO.mCollectScreen.mButtonATextScale);
}
if (mpButtonText[1]) {
mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mBButtonTextPosX,
g_drawHIO.mCollectScreen.mBButtonTextPosY);
mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mBButtonTextScale,
g_drawHIO.mCollectScreen.mBButtonTextScale);
mpButtonText[1]->paneTrans(g_drawHIO.mCollectScreen.mButtonBTextPosX,
g_drawHIO.mCollectScreen.mButtonBTextPosY);
mpButtonText[1]->scale(g_drawHIO.mCollectScreen.mButtonBTextScale,
g_drawHIO.mCollectScreen.mButtonBTextScale);
}
}
}
src/d/meter/d_meter2.cpp
+179 -179
View File
@@ -181,15 +181,15 @@ extern "C" void drawButtonBin__13dMeter2Draw_cFUc();
extern "C" void drawButtonXY__13dMeter2Draw_cFiUcUcbb();
extern "C" void getButtonCrossParentInitTransY__13dMeter2Draw_cFv();
extern "C" void drawButtonCross__13dMeter2Draw_cFff();
extern "C" void setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv();
extern "C" void setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv();
extern "C" void setAlphaButtonChange__13dMeter2Draw_cFb();
extern "C" void setAlphaButtonAnimeMin__13dMeter2Draw_cFv();
extern "C" void setAlphaButtonAnimeMax__13dMeter2Draw_cFv();
extern "C" void setAlphaButtonAAnimeMin__13dMeter2Draw_cFv();
extern "C" void setAlphaButtonAAnimeMax__13dMeter2Draw_cFv();
extern "C" void setAlphaButtonBAnimeMin__13dMeter2Draw_cFv();
extern "C" void setAlphaButtonBAnimeMax__13dMeter2Draw_cFv();
extern "C" void setAlphButtonACrossAnimeMin__13dMeter2Draw_cFv();
extern "C" void setAlphButtonACrossAnimeMax__13dMeter2Draw_cFv();
extern "C" void setAlphButtonAChange__13dMeter2Draw_cFb();
extern "C" void setAlphButtonAAnimeMin__13dMeter2Draw_cFv();
extern "C" void setAlphButtonAAnimeMax__13dMeter2Draw_cFv();
extern "C" void setAlphButtonAAAnimeMin__13dMeter2Draw_cFv();
extern "C" void setAlphButtonAAAnimeMax__13dMeter2Draw_cFv();
extern "C" void setAlphButtonABAnimeMin__13dMeter2Draw_cFv();
extern "C" void setAlphButtonABAnimeMax__13dMeter2Draw_cFv();
extern "C" void setButtonIconAAlpha__13dMeter2Draw_cFUcUlb();
extern "C" void setButtonIconBAlpha__13dMeter2Draw_cFUcUlb();
extern "C" void setButtonIconMidonaAlpha__13dMeter2Draw_cFUl();
@@ -202,7 +202,7 @@ extern "C" void isButtonVisible__13dMeter2Draw_cFv();
extern "C" void getCameraSubject__13dMeter2Draw_cFv();
extern "C" void getItemSubject__13dMeter2Draw_cFv();
extern "C" void getPlayerSubject__13dMeter2Draw_cFv();
extern "C" void isBButtonShow__13dMeter2Draw_cFb();
extern "C" void isButtonBShow__13dMeter2Draw_cFb();
extern "C" void getButtonTimer__13dMeter2Draw_cFv();
extern "C" void isFloatingMessageVisible__13dMeter2Info_cFv();
extern "C" void isDirectUseItem__13dMeter2Info_cFi();
@@ -329,8 +329,8 @@ int dMeter2_c::_create() {
mDoSetFlag = dComIfGp_isDoSetFlag(2);
for (int i = 0; i < 2; i++) {
mAButtonTalkPosX[i] = 0.0f;
mAButtonTalkPosY[i] = 0.0f;
mButtonATalkPosX[i] = 0.0f;
mButtonATalkPosY[i] = 0.0f;
}
field_0x144 = 1.0f;
@@ -868,18 +868,18 @@ void dMeter2_c::moveLife() {
draw_life = true;
}
if (mLifeGaugeScale != g_drawHIO.mLifeGaugeScale) {
mLifeGaugeScale = g_drawHIO.mLifeGaugeScale;
if (mLifeGaugeScale != g_drawHIO.mLifeParentScale) {
mLifeGaugeScale = g_drawHIO.mLifeParentScale;
draw_life = true;
}
if (mHeartScale != g_drawHIO.mHeartScale) {
mHeartScale = g_drawHIO.mHeartScale;
if (mHeartScale != g_drawHIO.mHeartMarkScale) {
mHeartScale = g_drawHIO.mHeartMarkScale;
draw_life = true;
}
if (mLargeHeartScale != g_drawHIO.mLargeHeartScale) {
mLargeHeartScale = g_drawHIO.mLargeHeartScale;
if (mLargeHeartScale != g_drawHIO.mBigHeartScale) {
mLargeHeartScale = g_drawHIO.mBigHeartScale;
draw_life = true;
}
@@ -1182,12 +1182,12 @@ void dMeter2_c::moveLightDrop() {
pos_x = g_drawHIO.mLightDrop.mVesselTalkPosX;
pos_y = g_drawHIO.mLightDrop.mVesselTalkPosY;
scale = g_drawHIO.mLightDrop.mVesselTalkScale;
alpha = g_drawHIO.mLightDrop.mVesselTalkAlpha;
alpha = g_drawHIO.mLightDrop.mVesselAlpha[1];
} else {
pos_x = g_drawHIO.mLightDrop.mVesselPosX;
pos_y = g_drawHIO.mLightDrop.mVesselPosY;
scale = g_drawHIO.mLightDrop.mVesselScale;
alpha = g_drawHIO.mLightDrop.mVesselAlpha;
alpha = g_drawHIO.mLightDrop.mVesselAlpha[0];
}
if (mVesselPosX != pos_x) {
@@ -1504,84 +1504,84 @@ void dMeter2_c::moveButtonA() {
field_0x1fd = 0;
}
if (mAButtonScale != g_drawHIO.mAButtonScale) {
mAButtonScale = g_drawHIO.mAButtonScale;
if (mButtonAScale != g_drawHIO.mButtonAScale) {
mButtonAScale = g_drawHIO.mButtonAScale;
draw_buttonA = true;
}
for (int i = 0; i < 2; i++) {
if (mAButtonTalkScale[i] != g_drawHIO.mAButtonTalkScale[i]) {
mAButtonTalkScale[i] = g_drawHIO.mAButtonTalkScale[i];
if (mButtonATalkScale[i] != g_drawHIO.mButtonATalkScale[i]) {
mButtonATalkScale[i] = g_drawHIO.mButtonATalkScale[i];
draw_buttonA = true;
}
}
if (mAButtonPosX != g_drawHIO.mAButtonPosX) {
mAButtonPosX = g_drawHIO.mAButtonPosX;
if (mButtonAPosX != g_drawHIO.mButtonAPosX) {
mButtonAPosX = g_drawHIO.mButtonAPosX;
draw_buttonA = true;
}
if (mAButtonPosY != g_drawHIO.mAButtonPosY) {
mAButtonPosY = g_drawHIO.mAButtonPosY;
if (mButtonAPosY != g_drawHIO.mButtonAPosY) {
mButtonAPosY = g_drawHIO.mButtonAPosY;
draw_buttonA = true;
}
if (mAButtonFontScale != g_drawHIO.mAButtonFontScale) {
mAButtonFontScale = g_drawHIO.mAButtonFontScale;
if (mButtonATextScale != g_drawHIO.mButtonATextScale) {
mButtonATextScale = g_drawHIO.mButtonATextScale;
draw_buttonA = true;
}
if (mAButtonFontPosX != g_drawHIO.mAButtonFontPosX) {
mAButtonFontPosX = g_drawHIO.mAButtonFontPosX;
if (mButtonATextPosX != g_drawHIO.mButtonATextPosX) {
mButtonATextPosX = g_drawHIO.mButtonATextPosX;
draw_buttonA = true;
}
if (mAButtonFontPosY != g_drawHIO.mAButtonFontPosY) {
mAButtonFontPosY = g_drawHIO.mAButtonFontPosY;
if (mButtonATextPosY != g_drawHIO.mButtonATextPosY) {
mButtonATextPosY = g_drawHIO.mButtonATextPosY;
draw_buttonA = true;
}
if (isShowLightDrop()) {
pos_x[0] = g_drawHIO.mAButtonVesselPosX;
pos_y[0] = g_drawHIO.mAButtonVesselPosY;
pos_x[0] = g_drawHIO.mButtonAVesselPosX;
pos_y[0] = g_drawHIO.mButtonAVesselPosY;
pos_x[1] = 0.0f;
pos_y[1] = 0.0f;
var_f31 = 1.0f;
} else if (isShowFlag(0)) {
if (isShowFlag(1)) {
for (int i = 0; i < 2; i++) {
pos_x[i] = g_drawHIO.mAButtonTalkPosX[i];
pos_y[i] = g_drawHIO.mAButtonTalkPosY[i];
pos_x[i] = g_drawHIO.mButtonATalkPosX[i];
pos_y[i] = g_drawHIO.mButtonATalkPosY[i];
}
} else {
for (int i = 0; i < 2; i++) {
pos_x[i] = g_drawHIO.mAButtonTalkAPosX[i];
pos_y[i] = g_drawHIO.mAButtonTalkAPosY[i];
pos_x[i] = g_drawHIO.mButtonATalkAPosX[i];
pos_y[i] = g_drawHIO.mButtonATalkAPosY[i];
}
}
var_f31 = 1.0f;
} else {
pos_x[0] = g_drawHIO.mAButtonPosX;
pos_y[0] = g_drawHIO.mAButtonPosY;
pos_x[0] = g_drawHIO.mButtonAPosX;
pos_y[0] = g_drawHIO.mButtonAPosY;
pos_x[1] = 0.0f;
pos_y[1] = 0.0f;
var_f31 = 1.0f;
}
for (int i = 0; i < 2; i++) {
if (mAButtonTalkPosX[i] != pos_x[i]) {
cLib_addCalc2(&mAButtonTalkPosX[i], pos_x[i], 1.0f, 10.0f);
if (mButtonATalkPosX[i] != pos_x[i]) {
cLib_addCalc2(&mButtonATalkPosX[i], pos_x[i], 1.0f, 10.0f);
draw_buttonA = true;
if ((f32)fabs(mAButtonTalkPosX[i] - pos_x[i]) < 0.1f) {
mAButtonTalkPosX[i] = pos_x[i];
if ((f32)fabs(mButtonATalkPosX[i] - pos_x[i]) < 0.1f) {
mButtonATalkPosX[i] = pos_x[i];
}
}
if (mAButtonTalkPosY[i] != pos_y[i]) {
cLib_addCalc2(&mAButtonTalkPosY[i], pos_y[i], 1.0f, 10.0f);
if (mButtonATalkPosY[i] != pos_y[i]) {
cLib_addCalc2(&mButtonATalkPosY[i], pos_y[i], 1.0f, 10.0f);
draw_buttonA = true;
if ((f32)fabs(mAButtonTalkPosY[i] - pos_y[i]) < 0.1f) {
mAButtonTalkPosY[i] = pos_y[i];
if ((f32)fabs(mButtonATalkPosY[i] - pos_y[i]) < 0.1f) {
mButtonATalkPosY[i] = pos_y[i];
}
}
}
@@ -1600,8 +1600,8 @@ void dMeter2_c::moveButtonA() {
}
if (draw_buttonA) {
mpMeterDraw->drawButtonA(mDoStatus, mAButtonTalkPosX[0], mAButtonTalkPosY[0],
mAButtonTalkPosX[1], mAButtonTalkPosY[1], field_0x144, var_r29,
mpMeterDraw->drawButtonA(mDoStatus, mButtonATalkPosX[0], mButtonATalkPosY[0],
mButtonATalkPosX[1], mButtonATalkPosY[1], field_0x144, var_r29,
((mStatus & 0x100) ||
daPy_getPlayerActorClass()->checkHawkWait() ||
daPy_getPlayerActorClass()->checkGrassWhistle()) != false);
@@ -1681,25 +1681,25 @@ void dMeter2_c::moveButtonB() {
field_0x1fe = 0;
}
if (field_0x2cc != g_drawHIO.mBButtonScale) {
field_0x2cc = g_drawHIO.mBButtonScale;
if (field_0x2cc != g_drawHIO.mButtonBScale) {
field_0x2cc = g_drawHIO.mButtonBScale;
draw_buttonB = true;
}
for (int i = 0; i < 2; i++) {
if (field_0x2ec[i] != g_drawHIO.mBButtonTalkScale[i]) {
field_0x2ec[i] = g_drawHIO.mBButtonTalkScale[i];
if (field_0x2ec[i] != g_drawHIO.mButtonBTalkScale[i]) {
field_0x2ec[i] = g_drawHIO.mButtonBTalkScale[i];
draw_buttonB = true;
}
}
if (mBButtonPosX != g_drawHIO.mBButtonPosX) {
mBButtonPosX = g_drawHIO.mBButtonPosX;
if (mButtonBPosX != g_drawHIO.mButtonBPosX) {
mButtonBPosX = g_drawHIO.mButtonBPosX;
draw_buttonB = true;
}
if (mBButtonPosY != g_drawHIO.mBButtonPosY) {
mBButtonPosY = g_drawHIO.mBButtonPosY;
if (mButtonBPosY != g_drawHIO.mButtonBPosY) {
mButtonBPosY = g_drawHIO.mButtonBPosY;
draw_buttonB = true;
}
@@ -1708,54 +1708,54 @@ void dMeter2_c::moveButtonB() {
}
for (int i = 0; i < 2; i++) {
if (mBItemBaseScale[i] != g_drawHIO.mBItemBaseScale[i]) {
mBItemBaseScale[i] = g_drawHIO.mBItemBaseScale[i];
if (mItemBBaseScale[i] != g_drawHIO.mItemBBaseScale[i]) {
mItemBBaseScale[i] = g_drawHIO.mItemBBaseScale[i];
draw_buttonB = true;
}
if (mBItemBasePosX[i] != g_drawHIO.mBItemBasePosX[i]) {
mBItemBasePosX[i] = g_drawHIO.mBItemBasePosX[i];
if (mItemBBasePosX[i] != g_drawHIO.mItemBBasePosX[i]) {
mItemBBasePosX[i] = g_drawHIO.mItemBBasePosX[i];
draw_buttonB = true;
}
if (mBItemBasePosY[i] != g_drawHIO.mBItemBasePosY[i]) {
mBItemBasePosY[i] = g_drawHIO.mBItemBasePosY[i];
if (mItemBBasePosY[i] != g_drawHIO.mItemBBasePosY[i]) {
mItemBBasePosY[i] = g_drawHIO.mItemBBasePosY[i];
draw_buttonB = true;
}
}
if (mBButtonFontScale != g_drawHIO.mBButtonFontScale) {
mBButtonFontScale = g_drawHIO.mBButtonFontScale;
if (mButtonBFontScale != g_drawHIO.mButtonBFontScale) {
mButtonBFontScale = g_drawHIO.mButtonBFontScale;
draw_buttonB = true;
}
if (mBButtonFontPosX != g_drawHIO.mBButtonFontPosX) {
mBButtonFontPosX = g_drawHIO.mBButtonFontPosX;
if (mButtonBFontPosX != g_drawHIO.mButtonBFontPosX) {
mButtonBFontPosX = g_drawHIO.mButtonBFontPosX;
draw_buttonB = true;
}
if (mBButtonFontPosY != g_drawHIO.mBButtonFontPosY) {
mBButtonFontPosY = g_drawHIO.mBButtonFontPosY;
if (mButtonBFontPosY != g_drawHIO.mButtonBFontPosY) {
mButtonBFontPosY = g_drawHIO.mButtonBFontPosY;
draw_buttonB = true;
}
if (isShowLightDrop()) {
pos_x[0] = g_drawHIO.mBButtonVesselPosX;
pos_y[0] = g_drawHIO.mBButtonVesselPosY;
pos_x[0] = g_drawHIO.mButtonBVesselPosX;
pos_y[0] = g_drawHIO.mButtonBVesselPosY;
pos_x[1] = 0.0f;
pos_y[1] = 0.0f;
var_f31 = 1.0f;
} else if (isShowFlag(1)) {
for (int i = 0; i < 2; i++) {
pos_x[i] = g_drawHIO.mBButtonTalkPosX[i];
pos_y[i] = g_drawHIO.mBButtonTalkPosY[i];
pos_x[i] = g_drawHIO.mButtonBTalkPosX[i];
pos_y[i] = g_drawHIO.mButtonBTalkPosY[i];
}
var_f31 = 1.0f;
} else {
for (int i = 0; i < 2; i++) {
if (field_0x128 != 0 && i == 0) {
pos_x[i] = g_drawHIO.mBButtonWolfPosX;
pos_y[i] = g_drawHIO.mBButtonWolfPosY;
pos_x[i] = g_drawHIO.mButtonBWolfPosX;
pos_y[i] = g_drawHIO.mButtonBWolfPosY;
} else {
pos_x[i] = 0.0f;
pos_y[i] = 0.0f;
@@ -1764,7 +1764,7 @@ void dMeter2_c::moveButtonB() {
var_f31 = 1.0f;
}
if (mpMeterDraw->isBButtonShow(false)) {
if (mpMeterDraw->isButtonBShow(false)) {
if (field_0x1ff == 0) {
field_0x1ff = 1;
draw_buttonB = true;
@@ -1867,63 +1867,63 @@ void dMeter2_c::moveButtonR() {
void dMeter2_c::moveButtonZ() {
bool draw_buttonZ = false;
if (field_0x324 != g_drawHIO.mZButtonScale) {
field_0x324 = g_drawHIO.mZButtonScale;
if (field_0x324 != g_drawHIO.mButtonZScale) {
field_0x324 = g_drawHIO.mButtonZScale;
draw_buttonZ = true;
}
if (field_0x328 != g_drawHIO.mZButtonPosX) {
field_0x328 = g_drawHIO.mZButtonPosX;
if (field_0x328 != g_drawHIO.mButtonZPosX) {
field_0x328 = g_drawHIO.mButtonZPosX;
draw_buttonZ = true;
}
if (field_0x32c != g_drawHIO.mZButtonPosY) {
field_0x32c = g_drawHIO.mZButtonPosY;
if (field_0x32c != g_drawHIO.mButtonZPosY) {
field_0x32c = g_drawHIO.mButtonZPosY;
draw_buttonZ = true;
}
if (field_0x384 != g_drawHIO.mZButtonItemScale) {
field_0x384 = g_drawHIO.mZButtonItemScale;
if (field_0x384 != g_drawHIO.mButtonZItemScale) {
field_0x384 = g_drawHIO.mButtonZItemScale;
draw_buttonZ = true;
}
if (field_0x388 != g_drawHIO.mZButtonItemPosX) {
field_0x388 = g_drawHIO.mZButtonItemPosX;
if (field_0x388 != g_drawHIO.mButtonZItemPosX) {
field_0x388 = g_drawHIO.mButtonZItemPosX;
draw_buttonZ = true;
}
if (field_0x38c != g_drawHIO.mZButtonItemPosY) {
field_0x38c = g_drawHIO.mZButtonItemPosY;
if (field_0x38c != g_drawHIO.mButtonZItemPosY) {
field_0x38c = g_drawHIO.mButtonZItemPosY;
draw_buttonZ = true;
}
if (field_0x3e4 != g_drawHIO.mZButtonItemBaseScale) {
field_0x3e4 = g_drawHIO.mZButtonItemBaseScale;
if (field_0x3e4 != g_drawHIO.mButtonZItemBaseScale) {
field_0x3e4 = g_drawHIO.mButtonZItemBaseScale;
draw_buttonZ = true;
}
if (field_0x3e8 != g_drawHIO.mZButtonItemBasePosX) {
field_0x3e8 = g_drawHIO.mZButtonItemBasePosX;
if (field_0x3e8 != g_drawHIO.mButtonZItemBasePosX) {
field_0x3e8 = g_drawHIO.mButtonZItemBasePosX;
draw_buttonZ = true;
}
if (field_0x3ec != g_drawHIO.mZButtonItemBasePosY) {
field_0x3ec = g_drawHIO.mZButtonItemBasePosY;
if (field_0x3ec != g_drawHIO.mButtonZItemBasePosY) {
field_0x3ec = g_drawHIO.mButtonZItemBasePosY;
draw_buttonZ = true;
}
if (field_0x330 != g_drawHIO.mZButtonFontScale) {
field_0x330 = g_drawHIO.mZButtonFontScale;
if (field_0x330 != g_drawHIO.mButtonZFontScale) {
field_0x330 = g_drawHIO.mButtonZFontScale;
draw_buttonZ = true;
}
if (field_0x334 != g_drawHIO.mZButtonFontPosX) {
field_0x334 = g_drawHIO.mZButtonFontPosX;
if (field_0x334 != g_drawHIO.mButtonZFontPosX) {
field_0x334 = g_drawHIO.mButtonZFontPosX;
draw_buttonZ = true;
}
if (field_0x338 != g_drawHIO.mZButtonFontPosY) {
field_0x338 = g_drawHIO.mZButtonFontPosY;
if (field_0x338 != g_drawHIO.mButtonZFontPosY) {
field_0x338 = g_drawHIO.mButtonZFontPosY;
draw_buttonZ = true;
}
@@ -2035,94 +2035,94 @@ void dMeter2_c::moveButtonXY() {
spC[i] = 0;
}
if (field_0x33c != g_drawHIO.mXButtonScale) {
field_0x33c = g_drawHIO.mXButtonScale;
if (field_0x33c != g_drawHIO.mButtonXScale) {
field_0x33c = g_drawHIO.mButtonXScale;
sp8[0] = 1;
}
if (field_0x340 != g_drawHIO.mXButtonPosX) {
field_0x340 = g_drawHIO.mXButtonPosX;
if (field_0x340 != g_drawHIO.mButtonXPosX) {
field_0x340 = g_drawHIO.mButtonXPosX;
sp8[0] = 1;
}
if (field_0x344 != g_drawHIO.mXButtonPosY) {
field_0x344 = g_drawHIO.mXButtonPosY;
if (field_0x344 != g_drawHIO.mButtonXPosY) {
field_0x344 = g_drawHIO.mButtonXPosY;
sp8[0] = 1;
}
if (field_0x348 != g_drawHIO.mYButtonScale) {
field_0x348 = g_drawHIO.mYButtonScale;
if (field_0x348 != g_drawHIO.mButtonYScale) {
field_0x348 = g_drawHIO.mButtonYScale;
sp8[1] = 1;
}
if (field_0x34c != g_drawHIO.mYButtonPosX) {
field_0x34c = g_drawHIO.mYButtonPosX;
if (field_0x34c != g_drawHIO.mButtonYPosX) {
field_0x34c = g_drawHIO.mButtonYPosX;
sp8[1] = 1;
}
if (field_0x350 != g_drawHIO.mYButtonPosY) {
field_0x350 = g_drawHIO.mYButtonPosY;
if (field_0x350 != g_drawHIO.mButtonYPosY) {
field_0x350 = g_drawHIO.mButtonYPosY;
sp8[1] = 1;
}
if (field_0x360 != g_drawHIO.mXButtonItemScale) {
field_0x360 = g_drawHIO.mXButtonItemScale;
if (field_0x360 != g_drawHIO.mButtonXItemScale) {
field_0x360 = g_drawHIO.mButtonXItemScale;
sp8[0] = 1;
}
if (field_0x364 != g_drawHIO.mXButtonItemPosX) {
field_0x364 = g_drawHIO.mXButtonItemPosX;
if (field_0x364 != g_drawHIO.mButtonXItemPosX) {
field_0x364 = g_drawHIO.mButtonXItemPosX;
sp8[0] = 1;
}
if (field_0x368 != g_drawHIO.mXButtonItemPosY) {
field_0x368 = g_drawHIO.mXButtonItemPosY;
if (field_0x368 != g_drawHIO.mButtonXItemPosY) {
field_0x368 = g_drawHIO.mButtonXItemPosY;
sp8[0] = 1;
}
if (field_0x36c != g_drawHIO.mYButtonItemScale) {
field_0x36c = g_drawHIO.mYButtonItemScale;
if (field_0x36c != g_drawHIO.mButtonYItemScale) {
field_0x36c = g_drawHIO.mButtonYItemScale;
sp8[1] = 1;
}
if (field_0x370 != g_drawHIO.mYButtonItemPosX) {
field_0x370 = g_drawHIO.mYButtonItemPosX;
if (field_0x370 != g_drawHIO.mButtonYItemPosX) {
field_0x370 = g_drawHIO.mButtonYItemPosX;
sp8[1] = 1;
}
if (field_0x374 != g_drawHIO.mYButtonItemPosY) {
field_0x374 = g_drawHIO.mYButtonItemPosY;
if (field_0x374 != g_drawHIO.mButtonYItemPosY) {
field_0x374 = g_drawHIO.mButtonYItemPosY;
sp8[1] = 1;
}
for (int i = 0; i < 2; i++) {
if (field_0x39c[i] != g_drawHIO.mXButtonItemBaseScale[i]) {
field_0x39c[i] = g_drawHIO.mXButtonItemBaseScale[i];
if (field_0x39c[i] != g_drawHIO.mButtonXItemBaseScale[i]) {
field_0x39c[i] = g_drawHIO.mButtonXItemBaseScale[i];
sp8[0] = 1;
}
if (field_0x3a4[i] != g_drawHIO.mXButtonItemBasePosX[i]) {
field_0x3a4[i] = g_drawHIO.mXButtonItemBasePosX[i];
if (field_0x3a4[i] != g_drawHIO.mButtonXItemBasePosX[i]) {
field_0x3a4[i] = g_drawHIO.mButtonXItemBasePosX[i];
sp8[0] = 1;
}
if (field_0x3ac[i] != g_drawHIO.mXButtonItemBasePosY[i]) {
field_0x3ac[i] = g_drawHIO.mXButtonItemBasePosY[i];
if (field_0x3ac[i] != g_drawHIO.mButtonXItemBasePosY[i]) {
field_0x3ac[i] = g_drawHIO.mButtonXItemBasePosY[i];
sp8[0] = 1;
}
if (field_0x3b4[i] != g_drawHIO.mYButtonItemBaseScale[i]) {
field_0x3b4[i] = g_drawHIO.mYButtonItemBaseScale[i];
if (field_0x3b4[i] != g_drawHIO.mButtonYItemBaseScale[i]) {
field_0x3b4[i] = g_drawHIO.mButtonYItemBaseScale[i];
sp8[1] = 1;
}
if (field_0x3bc[i] != g_drawHIO.mYButtonItemBasePosX[i]) {
field_0x3bc[i] = g_drawHIO.mYButtonItemBasePosX[i];
if (field_0x3bc[i] != g_drawHIO.mButtonYItemBasePosX[i]) {
field_0x3bc[i] = g_drawHIO.mButtonYItemBasePosX[i];
sp8[1] = 1;
}
if (field_0x3c4[i] != g_drawHIO.mYButtonItemBasePosY[i]) {
field_0x3c4[i] = g_drawHIO.mYButtonItemBasePosY[i];
if (field_0x3c4[i] != g_drawHIO.mButtonYItemBasePosY[i]) {
field_0x3c4[i] = g_drawHIO.mButtonYItemBasePosY[i];
sp8[1] = 1;
}
}
@@ -2135,24 +2135,24 @@ void dMeter2_c::moveButtonXY() {
}
}
if (field_0x3f0 != g_drawHIO.mXYButtonFontScale) {
field_0x3f0 = g_drawHIO.mXYButtonFontScale;
if (field_0x3f0 != g_drawHIO.mButtonXYTextScale) {
field_0x3f0 = g_drawHIO.mButtonXYTextScale;
for (int i = 0; i < 2; i++) {
sp8[i] = 1;
}
}
if (field_0x3f4 != g_drawHIO.mXYButtonFontPosX) {
field_0x3f4 = g_drawHIO.mXYButtonFontPosX;
if (field_0x3f4 != g_drawHIO.mButtonXYTextPosX) {
field_0x3f4 = g_drawHIO.mButtonXYTextPosX;
for (int i = 0; i < 2; i++) {
sp8[i] = 1;
}
}
if (field_0x3f8 != g_drawHIO.mXYButtonFontPosY) {
field_0x3f8 = g_drawHIO.mXYButtonFontPosY;
if (field_0x3f8 != g_drawHIO.mButtonXYTextPosY) {
field_0x3f8 = g_drawHIO.mButtonXYTextPosY;
for (int i = 0; i < 2; i++) {
sp8[i] = 1;
@@ -2329,33 +2329,33 @@ void dMeter2_c::moveButtonCross() {
draw_cross = false;
var_f31 = 0.0f;
if (mDPadButtonOFFPosX != g_drawHIO.mDPadButtonOFFPosX) {
mDPadButtonOFFPosX = g_drawHIO.mDPadButtonOFFPosX;
if (mButtonCrossOFFPosX != g_drawHIO.mButtonCrossOFFPosX) {
mButtonCrossOFFPosX = g_drawHIO.mButtonCrossOFFPosX;
draw_cross = true;
}
if (mDPadButtonOFFPosY != g_drawHIO.mDPadButtonOFFPosY) {
mDPadButtonOFFPosY = g_drawHIO.mDPadButtonOFFPosY;
if (mButtonCrossOFFPosY != g_drawHIO.mButtonCrossOFFPosY) {
mButtonCrossOFFPosY = g_drawHIO.mButtonCrossOFFPosY;
draw_cross = true;
}
if (mDPadButtonONPosX != g_drawHIO.mDPadButtonONPosX) {
mDPadButtonONPosX = g_drawHIO.mDPadButtonONPosX;
if (mButtonCrossONPosX != g_drawHIO.mButtonCrossONPosX) {
mButtonCrossONPosX = g_drawHIO.mButtonCrossONPosX;
draw_cross = true;
}
if (mDPadButtonONPosY != g_drawHIO.mDPadButtonONPosY) {
mDPadButtonONPosY = g_drawHIO.mDPadButtonONPosY;
if (mButtonCrossONPosY != g_drawHIO.mButtonCrossONPosY) {
mButtonCrossONPosY = g_drawHIO.mButtonCrossONPosY;
draw_cross = true;
}
if (mDPadButtonScale != g_drawHIO.mDPadButtonScale) {
mDPadButtonScale = g_drawHIO.mDPadButtonScale;
if (mButtonCrossScale != g_drawHIO.mButtonCrossScale) {
mButtonCrossScale = g_drawHIO.mButtonCrossScale;
draw_cross = true;
}
if (mDPadButtonLetterSpacing != g_drawHIO.mDPadButtonLetterSpacing) {
mDPadButtonLetterSpacing = g_drawHIO.mDPadButtonLetterSpacing;
if (mButtonCrossTextScale != g_drawHIO.mButtonCrossTextScale) {
mButtonCrossTextScale = g_drawHIO.mButtonCrossTextScale;
draw_cross = true;
}
@@ -2364,14 +2364,14 @@ void dMeter2_c::moveButtonCross() {
temp_f1 = (temp_f31 - mpMeterDraw->getButtonCrossParentInitTransY()) - 15.0f;
if (mpMap->isDispPosInsideFlg()) {
if (field_0x1b4 < g_drawHIO.mDPadButtonMoveFrame) {
if (field_0x1b4 < g_drawHIO.mButtonCrossMoveFrame) {
field_0x1b4++;
draw_cross = true;
} else {
field_0x1b4 = g_drawHIO.mDPadButtonMoveFrame;
field_0x1b4 = g_drawHIO.mButtonCrossMoveFrame;
}
var_f31 = mDPadButtonONPosY + temp_f1;
var_f31 = mButtonCrossONPosY + temp_f1;
} else {
if (field_0x1b4 > 0) {
field_0x1b4--;
@@ -2380,12 +2380,12 @@ void dMeter2_c::moveButtonCross() {
field_0x1b4 = 0;
}
var_f31 = mDPadButtonOFFPosY;
var_f31 = mButtonCrossOFFPosY;
}
}
temp_f30 = mDPadButtonOFFPosX + (((f32)field_0x1b4 / (f32)g_drawHIO.mDPadButtonMoveFrame) *
(mDPadButtonONPosX - mDPadButtonOFFPosX));
temp_f30 = mButtonCrossOFFPosX + (((f32)field_0x1b4 / (f32)g_drawHIO.mButtonCrossMoveFrame) *
(mButtonCrossONPosX - mButtonCrossOFFPosX));
if (field_0x15c != var_f31) {
cLib_addCalc2(&field_0x15c, var_f31, 0.5f, 50.0f);
if ((f32)fabs(field_0x15c - var_f31) < 0.5f) {
@@ -3139,41 +3139,41 @@ void dMeter2_c::alphaAnimeButton() {
((mStatus & 0x40000000) && !(mStatus & 0x100)) || (mStatus & 0x80000000) || (mStatus & 8) ||
(mStatus & 0x10) || (mStatus & 0x20) || (mStatus & 0x04000000) || (mStatus & 0x10000000))
{
mpMeterDraw->setAlphaButtonAnimeMin();
mpMeterDraw->setAlphaButtonAAnimeMin();
mpMeterDraw->setAlphaButtonBAnimeMin();
mpMeterDraw->setAlphButtonAAnimeMin();
mpMeterDraw->setAlphButtonAAAnimeMin();
mpMeterDraw->setAlphButtonABAnimeMin();
} else if (!(mStatus & 0x1000000) &&
((mStatus & 0x100) || daPy_getPlayerActorClass()->checkHawkWait() ||
(mStatus & 0x40) && dComIfGp_event_checkHind(1)))
{
mpMeterDraw->setAlphaButtonAnimeMin();
mpMeterDraw->setAlphButtonAAnimeMin();
var_31 = 1;
} else if (dMeter2Info_getItemExplainWindowStatus()) {
mpMeterDraw->setAlphaButtonAnimeMin();
mpMeterDraw->setAlphButtonAAnimeMin();
var_31 = 1;
} else {
mpMeterDraw->setAlphaButtonAnimeMax();
mpMeterDraw->setAlphButtonAAnimeMax();
}
field_0x1e6 = 0;
if (var_31 == 1) {
if (dMeter2Info_getItemExplainWindowStatus()) {
mpMeterDraw->setAlphaButtonAAnimeMin();
mpMeterDraw->setAlphButtonAAAnimeMin();
} else if ((mStatus & 0x100) || daPy_getPlayerActorClass()->checkHawkWait() ||
!dComIfGp_event_checkHind(2))
{
mpMeterDraw->setAlphaButtonAAnimeMax();
mpMeterDraw->setAlphButtonAAAnimeMax();
onShowFlag(0);
} else {
mpMeterDraw->setAlphaButtonAAnimeMin();
mpMeterDraw->setAlphButtonAAAnimeMin();
}
if (mpMeterDraw->isBButtonShow(false)) {
mpMeterDraw->setAlphaButtonBAnimeMax();
if (mpMeterDraw->isButtonBShow(false)) {
mpMeterDraw->setAlphButtonABAnimeMax();
onShowFlag(1);
} else {
mpMeterDraw->setAlphaButtonBAnimeMin();
mpMeterDraw->setAlphButtonABAnimeMin();
}
}
@@ -3210,7 +3210,7 @@ void dMeter2_c::alphaAnimeButton() {
}
}
mpMeterDraw->setAlphaButtonChange(false);
mpMeterDraw->setAlphButtonAChange(false);
}
/* 802254C0-802256DC 21FE00 021C+00 1/1 0/0 0/0 .text alphaAnimeButtonCross__9dMeter2_cFv
@@ -3224,7 +3224,7 @@ void dMeter2_c::alphaAnimeButtonCross() {
(mStatus & 0x10000000) || (mStatus & 0x20000000)) ||
daPy_getPlayerActorClass()->checkEnemyAttentionLock() || dMeter2Info_isGameStatus(1))
{
mpMeterDraw->setAlphaButtonCrossAnimeMin();
mpMeterDraw->setAlphButtonACrossAnimeMin();
if ((!i_dComIfGp_event_chkEventFlag(0x40) || dMeter2Info_isGameStatus(2) ||
(mStatus & 0x100)) &&
@@ -3233,13 +3233,13 @@ void dMeter2_c::alphaAnimeButtonCross() {
field_0x190--;
}
} else if (dMeter2Info_isSub2DStatus(1) || dMeter2Info_isFloatingMessageVisible()) {
mpMeterDraw->setAlphaButtonCrossAnimeMin();
mpMeterDraw->setAlphButtonACrossAnimeMin();
if (field_0x190 < 5) {
field_0x190++;
}
} else {
mpMeterDraw->setAlphaButtonCrossAnimeMax();
mpMeterDraw->setAlphButtonACrossAnimeMax();
if (field_0x190 < 5) {
field_0x190++;
src/d/meter/d_meter2_draw.cpp
+3056 -1728
View File
File diff suppressed because it is too large Load Diff
src/d/meter/d_meter_HIO.cpp
+304 -304
View File
@@ -38,18 +38,18 @@ dMeter_drawCollectHIO_c::dMeter_drawCollectHIO_c() {
mHeartPiecePosY = 0.0f;
mHeartPieceScale = 1.0f;
mButtonDebugON = false;
mAButtonPosX = -22.3f;
mAButtonPosY = 24.9f;
mAButtonScale = 1.3f;
mBButtonPosX = -22.3f;
mBButtonPosY = 25.0f;
mBButtonScale = 1.3f;
mAButtonTextPosX = -24.9f;
mAButtonTextPosY = 24.9f;
mAButtonTextScale = 1.1f;
mBButtonTextPosX = -27.5f;
mBButtonTextPosY = 26.0f;
mBButtonTextScale = 1.1f;
mButtonAPosX = -22.3f;
mButtonAPosY = 24.9f;
mButtonAScale = 1.3f;
mButtonBPosX = -22.3f;
mButtonBPosY = 25.0f;
mButtonBScale = 1.3f;
mButtonATextPosX = -24.9f;
mButtonATextPosY = 24.9f;
mButtonATextScale = 1.1f;
mButtonBTextPosX = -27.5f;
mButtonBTextPosY = 26.0f;
mButtonBTextScale = 1.1f;
mColorDebugON = false;
mVesselBack[VESSEL_HEART].set(0, 0, 0, 0);
mVesselFront[VESSEL_HEART].set(250, 250, 210, 220);
@@ -285,33 +285,33 @@ dMeter_drawSkillHIO_c::dMeter_drawSkillHIO_c() {
/* 801FEAF0-801FEFF0 1F9430 0500+00 1/1 0/0 0/0 .text __ct__25dMeter_drawEmpButtonHIO_cFv
*/
dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() {
mHighlightScale = 2.5f;
mHighlightFrontInner.set(255, 255, 255, 185);
mHighlightFrontOuter.set(0, 155, 0, 0);
mHighlightBackInner.set(255, 255, 255, 87);
mHighlightBackOuter.set(0, 115, 0, 0);
mHighlightAnimSpeed = 0.772705f;
mPikariScale = 2.5f;
mPikariFrontInner.set(255, 255, 255, 185);
mPikariFrontOuter.set(0, 155, 0, 0);
mPikariBackInner.set(255, 255, 255, 87);
mPikariBackOuter.set(0, 115, 0, 0);
mPikariAnimSpeed = 0.772705f;
mHighlightFastScale = 3.0f;
mHighlightFastFrontInner.set(255, 255, 255, 255);
mHighlightFastFrontOuter.set(220, 220, 215, 0);
mHighlightFastBackInner.set(255, 255, 190, 255);
mHighlightFastBackOuter.set(200, 200, 210, 0);
mHighlightFastAnimSpeed = 2.0f;
mPikariFastScale = 3.0f;
mPikariFastFrontInner.set(255, 255, 255, 255);
mPikariFastFrontOuter.set(220, 220, 215, 0);
mPikariFastBackInner.set(255, 255, 190, 255);
mPikariFastBackOuter.set(200, 200, 210, 0);
mPikariFastAnimSpeed = 2.0f;
mHighlightListenScale = 1.0f;
mHighlightListenFrontInner.set(255, 255, 255, 185);
mHighlightListenFrontOuter.set(0, 155, 0, 0);
mHighlightListenBackInner.set(255, 255, 255, 87);
mHighlightListenBackOuter.set(0, 115, 0, 0);
mHighlightListenAnimSpeed = 0.3f;
mPikariListenScale = 1.0f;
mPikariListenFrontInner.set(255, 255, 255, 185);
mPikariListenFrontOuter.set(0, 155, 0, 0);
mPikariListenBackInner.set(255, 255, 255, 87);
mPikariListenBackOuter.set(0, 115, 0, 0);
mPikariListenAnimSpeed = 0.3f;
mHighlightRepeatHitScale = 2.5f;
mHighlightRepeatHitFrontInner.set(255, 255, 255, 185);
mHighlightRepeatHitFrontOuter.set(0, 155, 0, 0);
mHighlightRepeatHitBackInner.set(255, 255, 255, 87);
mHighlightRepeatHitBackOuter.set(0, 115, 0, 0);
mHighlightRepeatHitAnimSpeed = 1.1f;
mPikariRepeatHitScale = 2.5f;
mPikariRepeatHitFrontInner.set(255, 255, 255, 185);
mPikariRepeatHitFrontOuter.set(0, 155, 0, 0);
mPikariRepeatHitBackInner.set(255, 255, 255, 87);
mPikariRepeatHitBackOuter.set(0, 115, 0, 0);
mPikariRepeatHitAnimSpeed = 1.1f;
mRepeatHitScale = 1.15f;
mRepeatHitFrameNum = 4;
@@ -324,21 +324,21 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() {
mEmpButtonPosY = 175.0f;
mEmpButtonScale = 1.0f;
mAButtonPosX = 0.0f;
mAButtonPosY = 0.0f;
mAButtonScale = 1.0f;
mButtonAPosX = 0.0f;
mButtonAPosY = 0.0f;
mButtonAScale = 1.0f;
mBButtonPosX = 0.0f;
mBButtonPosY = 0.0f;
mBButtonScale = 1.0f;
mButtonBPosX = 0.0f;
mButtonBPosY = 0.0f;
mButtonBScale = 1.0f;
mRButtonPosX = 0.0f;
mRButtonPosY = 0.0f;
mRButtonScale = 1.0f;
mZButtonPosX = 0.0f;
mZButtonPosY = 0.0f;
mZButtonScale = 1.0f;
mButtonZPosX = 0.0f;
mButtonZPosY = 0.0f;
mButtonZScale = 1.0f;
m3DButtonPosX = 0.0f;
m3DButtonPosY = 0.0f;
@@ -352,13 +352,13 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() {
mSButtonPosY = -392.0f;
mSButtonScale = 0.9f;
mXButtonPosX = 0.0f;
mXButtonPosY = 0.0f;
mXButtonScale = 1.0f;
mButtonXPosX = 0.0f;
mButtonXPosY = 0.0f;
mButtonXScale = 1.0f;
mYButtonPosX = 0.0f;
mYButtonPosY = 0.0f;
mYButtonScale = 1.0f;
mButtonYPosX = 0.0f;
mButtonYPosY = 0.0f;
mButtonYScale = 1.0f;
mNunchukPosX = 0.0f;
mNunchukPosY = 0.0f;
@@ -396,13 +396,13 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() {
mNunchukAttackPosY = 0.0f;
mNunchukAttackScale = 1.0f;
mABButtonPosX = 0.0f;
mABButtonPosY = 0.0f;
mABButtonScale = 1.0f;
mAButtonBPosX = 0.0f;
mAButtonBPosY = 0.0f;
mAButtonBScale = 1.0f;
mNunchukZButtonPosX = 0.0f;
mNunchukZButtonPosY = 0.0f;
mNunchukZButtonScale = 1.0f;
mNunchukButtonZPosX = 0.0f;
mNunchukButtonZPosY = 0.0f;
mNunchukButtonZScale = 1.0f;
mNunchukCButtonPosX = 0.0f;
mNunchukCButtonPosY = 0.0f;
@@ -559,23 +559,23 @@ dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c() {
mGetInTextAnimSpeed = 1.0f;
mGetInTextWaitFrames = 10;
mGetInTextAlphaFrames = 10;
mGetInHighlightAppearFrames = 30;
mGetInHighlightScale = 1.8f;
mGetInHighlightFrontInner.set(255, 255, 167, 80);
mGetInHighlightFrontOuter.set(220, 110, 30, 0);
mGetInHighlightBackInner.set(255, 255, 190, 90);
mGetInHighlightBackOuter.set(170, 110, 0, 0);
mGetInHighlightAnimSpeed = 0.6f;
mGetInPikariAppearFrames = 30;
mGetInPikariScale = 1.8f;
mGetInPikariFrontInner.set(255, 255, 167, 80);
mGetInPikariFrontOuter.set(220, 110, 30, 0);
mGetInPikariBackInner.set(255, 255, 190, 90);
mGetInPikariBackOuter.set(170, 110, 0, 0);
mGetInPikariAnimSpeed = 0.6f;
mGetInTextLocation = 0;
mStartHighlightAppearFrames = 30;
mStartHighlightScale = 1.8f;
mStartHighlightFrontInner.set(255, 255, 167, 80);
mStartHighlightFrontOuter.set(220, 110, 30, 0);
mStartHighlightBackInner.set(255, 255, 190, 90);
mStartHighlightBackOuter.set(170, 110, 0, 0);
mStartHighlightAnimSpeed = 0.6f;
mStartHighlightDisplayFrames = 30;
mStartPikariAppearFrames = 30;
mStartPikariScale = 1.8f;
mStartPikariFrontInner.set(255, 255, 167, 80);
mStartPikariFrontOuter.set(220, 110, 30, 0);
mStartPikariBackInner.set(255, 255, 190, 90);
mStartPikariBackOuter.set(170, 110, 0, 0);
mStartPikariAnimSpeed = 0.6f;
mStartPikariDisplayFrames = 30;
mReadyFightTextSizeX = 1.0f;
mReadyFightTextSizeY = 1.0f;
@@ -584,13 +584,13 @@ dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c() {
mReadyFightTextAnimSpeed = 1.0f;
mReadyFightTextWaitFrames = 10;
field_0x172 = 10;
mReadyFightHighlightAppearFrames = 30;
mReadyFightHighlightScale = 1.8f;
mReadyFightHighlightFrontInner.set(255, 255, 167, 80);
mReadyFightHighlightFrontOuter.set(220, 110, 30, 0);
mReadyFightHighlightBackInner.set(255, 255, 190, 90);
mReadyFightHighlightBackOuter.set(170, 110, 0, 0);
mReadyFightHighlightAnimSpeed = 0.6f;
mReadyFightPikariAppearFrames = 30;
mReadyFightPikariScale = 1.8f;
mReadyFightPikariFrontInner.set(255, 255, 167, 80);
mReadyFightPikariFrontOuter.set(220, 110, 30, 0);
mReadyFightPikariBackInner.set(255, 255, 190, 90);
mReadyFightPikariBackOuter.set(170, 110, 0, 0);
mReadyFightPikariAnimSpeed = 0.6f;
}
/* 801FF31C-801FF5B8 1F9C5C 029C+00 1/1 0/0 0/0 .text __ct__25dMeter_drawLightDropHIO_cFv
@@ -601,19 +601,19 @@ dMeter_drawLightDropHIO_c::dMeter_drawLightDropHIO_c() {
mVesselPosY = 11.0f;
mVesselPosX_4x3 = -20.0f;
mVesselPosY_4x3 = 6.6f;
mVesselAlpha = 1.0f;
mVesselAlpha[0] = 1.0f;
mVesselTalkScale = 0.76f;
mVesselTalkPosX = 20.0f;
mVesselTalkPosY = -35.0f;
mVesselTalkAlpha = 0.5f;
mVesselAlpha[1] = 0.5f;
mDropGetScale = 2.5f;
mDropGetScaleAnimFrameNum = 20;
mDropScale = 1.0f;
mHighlightInterval = 1;
mPikariInterval = 1;
field_0x54 = 0xFFF1;
mVesselDecorAlpha = 0.5f;
mVesselAlpha[2] = 0.5f;
mDropAlpha = 1.0f;
mDropOnColorBlack.set(30, 255, 255, 0);
@@ -621,28 +621,28 @@ dMeter_drawLightDropHIO_c::dMeter_drawLightDropHIO_c() {
mDropOffColorBlack.set(0, 0, 0, 0);
mDropOffColorWhite.set(255, 255, 255, 255);
mHighlightLoopScale = 0.6f;
mHighlightLoopFrontInner[0].set(255, 255, 255, 255);
mHighlightLoopFrontOuter[0].set(0, 0, 0, 0);
mHighlightLoopBackInner[0].set(255, 255, 255, 255);
mHighlightLoopBackOuter[0].set(126, 238, 218, 0);
mHighlightLoopAnimSpeed = 0.2f;
mPikariLoopScale = 0.6f;
mPikariLoopFrontInner[0].set(255, 255, 255, 255);
mPikariLoopFrontOuter[0].set(0, 0, 0, 0);
mPikariLoopBackInner[0].set(255, 255, 255, 255);
mPikariLoopBackOuter[0].set(126, 238, 218, 0);
mPikariLoopAnimSpeed = 0.2f;
mHighlightLoopBackScale = 0.7f;
mHighlightLoopFrontInner[1].set(255, 255, 255, 255);
mHighlightLoopFrontOuter[1].set(0, 0, 0, 0);
mHighlightLoopBackInner[1].set(255, 255, 255, 255);
mHighlightLoopBackOuter[1].set(126, 238, 218, 0);
mHighlightLoopBackStopFrame = 19.0f;
mPikariLoopBackScale = 0.7f;
mPikariLoopFrontInner[1].set(255, 255, 255, 255);
mPikariLoopFrontOuter[1].set(0, 0, 0, 0);
mPikariLoopBackInner[1].set(255, 255, 255, 255);
mPikariLoopBackOuter[1].set(126, 238, 218, 0);
mPikariLoopBackStopFrame = 19.0f;
mDropHighlightFrontInner.set(255, 255, 255, 255);
mDropHighlightFrontOuter.set(0, 0, 0, 0);
mDropHighlightBackInner.set(255, 255, 255, 255);
mDropHighlightBackOuter.set(126, 238, 218, 0);
mDropHighlightAnimSpeed = 0.1f;
mDropHighlightAnimSpeed_Completed = 0.6f;
mHighlightScaleNormal = 1.3f;
mHighlightScaleComplete = 0.3f;
mDropPikariFrontInner.set(255, 255, 255, 255);
mDropPikariFrontOuter.set(0, 0, 0, 0);
mDropPikariBackInner.set(255, 255, 255, 255);
mDropPikariBackOuter.set(126, 238, 218, 0);
mDropPikariAnimSpeed = 0.1f;
mDropPikariAnimSpeed_Completed = 0.6f;
mPikariScaleNormal = 1.3f;
mPikariScaleComplete = 0.3f;
mAnimDebug = 0;
}
@@ -653,19 +653,19 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() {
mNoMagicPosY = -15.0f;
mHUDScale = 1.0f;
mHUDAlpha = 1.0f;
mParentScale = 1.0f;
mParentAlpha = 1.0f;
mLifeGaugeScale = 1.0f;
mLifeGaugeHeartAlpha = 1.0f;
mLifeGaugeBaseAlpha = 0.4f;
mLifeParentScale = 1.0f;
mLifeParentHeartAlpha = 1.0f;
mHeartBaseAlpha = 0.4f;
mLifeGaugePosX = 5.0f;
mLifeGaugePosY = 18.0f;
mHeartScale = 1.0f;
mHeartMarkScale = 1.0f;
mHeartAlpha = 0.7f;
mLargeHeartScale = 1.0f;
mLargeHeartAlpha = 1.0f;
mBigHeartScale = 1.0f;
mBigHeartAlpha = 1.0f;
mMagicMeterScale = 0.7f;
mMagicMeterAlpha = 1.0f;
@@ -698,44 +698,44 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() {
mButtonDisplayBackScale = 1.0f;
mButtonDisplayBackAlpha = 1.0f;
mAButtonScale = 1.1f;
mAButtonAlpha = 1.0f;
mAButtonPosX = 0.0f;
mAButtonPosY = 0.0f;
mAButtonTalkScale[0] = 1.0f;
mAButtonTalkPosX[0] = 0.0f;
mAButtonTalkPosY[0] = -63.0f;
mAButtonTalkAScale = 1.0f;
mAButtonTalkAPosX[0] = 0.0f;
mAButtonTalkAPosY[0] = -49.0f;
mButtonAScale = 1.1f;
mButtonAAlpha = 1.0f;
mButtonAPosX = 0.0f;
mButtonAPosY = 0.0f;
mButtonATalkScale[0] = 1.0f;
mButtonATalkPosX[0] = 0.0f;
mButtonATalkPosY[0] = -63.0f;
mButtonATalkAScale = 1.0f;
mButtonATalkAPosX[0] = 0.0f;
mButtonATalkAPosY[0] = -49.0f;
mAButtonTalkScale[1] = 1.0f;
mAButtonTalkPosX[1] = -20.0f;
mAButtonTalkPosY[1] = -62.0f;
mAButtonFontTalkAScale = 1.0f;
mAButtonTalkAPosX[1] = -20.0f;
mAButtonTalkAPosY[1] = -48.0f;
mButtonATalkScale[1] = 1.0f;
mButtonATalkPosX[1] = -20.0f;
mButtonATalkPosY[1] = -62.0f;
mButtonATextTalkAScale = 1.0f;
mButtonATalkAPosX[1] = -20.0f;
mButtonATalkAPosY[1] = -48.0f;
mAButtonVesselPosX = 0.0f;
mAButtonVesselPosY = 0.0f;
mButtonAVesselPosX = 0.0f;
mButtonAVesselPosY = 0.0f;
mBButtonScale = 1.1f;
mBButtonAlpha = 1.0f;
mBButtonPosX = -2.2f;
mBButtonPosY = -1.3f;
mBButtonTalkScale[0] = 1.0f;
mBButtonTalkPosX[0] = 0.0f;
mBButtonTalkPosY[0] = -62.0f;
mButtonBScale = 1.1f;
mButtonBAlpha = 1.0f;
mButtonBPosX = -2.2f;
mButtonBPosY = -1.3f;
mButtonBTalkScale[0] = 1.0f;
mButtonBTalkPosX[0] = 0.0f;
mButtonBTalkPosY[0] = -62.0f;
mBButtonTalkScale[1] = 1.0f;
mBButtonTalkPosX[1] = -9.2f;
mBButtonTalkPosY[1] = -65.0f;
mButtonBTalkScale[1] = 1.0f;
mButtonBTalkPosX[1] = -9.2f;
mButtonBTalkPosY[1] = -65.0f;
mBButtonWolfPosX = 0.0f;
mBButtonWolfPosY = 0.0f;
mButtonBWolfPosX = 0.0f;
mButtonBWolfPosY = 0.0f;
mBButtonVesselPosX = 0.0f;
mBButtonVesselPosY = 0.0f;
mButtonBVesselPosX = 0.0f;
mButtonBVesselPosY = 0.0f;
mMidnaIconScale = 1.1f;
mMidnaIconAlpha = 1.0f;
@@ -747,15 +747,15 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() {
field_0x13c = 0.0f;
field_0x140 = 0.0f;
mXButtonScale = 1.0f;
mXButtonAlpha = 0.9f;
mXButtonPosX = 0.0f;
mXButtonPosY = 0.0f;
mButtonXScale = 1.0f;
mButtonXAlpha = 0.9f;
mButtonXPosX = 0.0f;
mButtonXPosY = 0.0f;
mYButtonScale = 1.0f;
mYButtonAlpha = 0.9f;
mYButtonPosX = 0.0f;
mYButtonPosY = 0.0f;
mButtonYScale = 1.0f;
mButtonYAlpha = 0.9f;
mButtonYPosX = 0.0f;
mButtonYPosY = 0.0f;
field_0x164 = 1.5f;
field_0x168 = 1.0f;
@@ -774,33 +774,33 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() {
field_0x324 = 0.0f;
field_0x328 = 0.0f;
mZButtonScale = 1.0f;
mZButtonAlpha = 0.9f;
mZButtonPosX = 0.0f;
mZButtonPosY = 0.0f;
mButtonZScale = 1.0f;
mButtonZAlpha = 0.9f;
mButtonZPosX = 0.0f;
mButtonZPosY = 0.0f;
mBButtonItemPosX = 3.0f;
mBButtonItemPosY = 18.0f;
mBButtonItemRotation = 0.0f;
mBButtonItemScale = 1.4f;
mButtonBItemPosX[0] = 3.0f;
mButtonBItemPosY[0] = 18.0f;
mButtonBItemRotation[0] = 0.0f;
mButtonBItemScale[0] = 1.4f;
mBButtonSwordPosX = 17.0f;
mBButtonSwordPosY = 25.0f;
mBButtonSwordRotation = 76.0f;
mBButtonSwordScale = 2.3f;
mButtonBItemPosX[1] = 17.0f;
mButtonBItemPosY[1] = 25.0f;
mButtonBItemRotation[1] = 76.0f;
mButtonBItemScale[1] = 2.3f;
mBButtonFishingPosX = 4.0f;
mBButtonFishingPosY = 22.0f;
mBButtonFishingRotation = 20.0f;
mBButtonFishingScale = 2.1f;
mButtonBItemPosX[2] = 4.0f;
mButtonBItemPosY[2] = 22.0f;
mButtonBItemRotation[2] = 20.0f;
mButtonBItemScale[2] = 2.1f;
mXButtonItemPosX = 4.0f;
mXButtonItemPosY = -14.0f;
mXButtonItemScale = 1.5f;
mButtonXItemPosX = 4.0f;
mButtonXItemPosY = -14.0f;
mButtonXItemScale = 1.5f;
mYButtonItemPosX = 0.0f;
mYButtonItemPosY = 0.0f;
mYButtonItemScale = 1.5f;
mButtonYItemPosX = 0.0f;
mButtonYItemPosY = 0.0f;
mButtonYItemScale = 1.5f;
field_0x1cc = 0.0f;
field_0x1d0 = 0.0f;
@@ -818,46 +818,46 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() {
field_0x208 = 0.0f;
field_0x218 = 1.0f;
mBItemNumPosX = 0.0f;
mBItemNumPosY = 0.0f;
mBItemNumScale = 1.0f;
mItemBNumPosX = 0.0f;
mItemBNumPosY = 0.0f;
mItemBNumScale = 1.0f;
for (int i = 0; i < 3; i++) {
mButtonItemRotation[i] = 0.0f;
}
mZButtonItemPosX = 0.0f;
mZButtonItemPosY = 0.0f;
mZButtonItemScale = 1.0f;
mButtonZItemPosX = 0.0f;
mButtonZItemPosY = 0.0f;
mButtonZItemScale = 1.0f;
for (int i = 0; i < 2; i++) {
mBItemBaseScale[i] = 1.0f;
mBItemBasePosX[i] = 0.0f;
mBItemBasePosY[i] = 0.0f;
mItemBBaseScale[i] = 1.0f;
mItemBBasePosX[i] = 0.0f;
mItemBBasePosY[i] = 0.0f;
}
mBItemBaseAlpha[0] = 0.5f;
mBItemBaseAlpha[1] = 0.5f;
mItemBBaseAlpha[0] = 0.5f;
mItemBBaseAlpha[1] = 0.5f;
mXButtonItemBaseScale[0] = 1.5f;
mXButtonItemBasePosX[0] = 14.0f;
mXButtonItemBasePosY[0] = -12.0f;
mXButtonItemBaseAlpha[0] = 0.5f;
mButtonXItemBaseScale[0] = 1.5f;
mButtonXItemBasePosX[0] = 14.0f;
mButtonXItemBasePosY[0] = -12.0f;
mButtonXItemBaseAlpha[0] = 0.5f;
mXButtonItemBaseScale[1] = 1.5f;
mXButtonItemBasePosX[1] = 0.0f;
mXButtonItemBasePosY[1] = 0.0f;
mXButtonItemBaseAlpha[1] = 1.0f;
mButtonXItemBaseScale[1] = 1.5f;
mButtonXItemBasePosX[1] = 0.0f;
mButtonXItemBasePosY[1] = 0.0f;
mButtonXItemBaseAlpha[1] = 1.0f;
mYButtonItemBaseScale[0] = 1.5f;
mYButtonItemBasePosX[0] = -15.0f;
mYButtonItemBasePosY[0] = -12.0f;
mYButtonItemBaseAlpha[0] = 0.5f;
mButtonYItemBaseScale[0] = 1.5f;
mButtonYItemBasePosX[0] = -15.0f;
mButtonYItemBasePosY[0] = -12.0f;
mButtonYItemBaseAlpha[0] = 0.5f;
mYButtonItemBaseScale[1] = 1.5f;
mYButtonItemBasePosX[1] = 0.0f;
mYButtonItemBasePosY[1] = 0.0f;
mYButtonItemBaseAlpha[1] = 0.5f;
mButtonYItemBaseScale[1] = 1.5f;
mButtonYItemBasePosX[1] = 0.0f;
mButtonYItemBasePosY[1] = 0.0f;
mButtonYItemBaseAlpha[1] = 0.5f;
field_0x280 = 1.5f;
field_0x288 = 0.0f;
@@ -869,42 +869,42 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() {
field_0x294 = 4.0f;
field_0x298[1] = 1.0f;
mZButtonItemBaseScale = 1.0f;
mZButtonItemBasePosX = 0.0f;
mZButtonItemBasePosY = 0.0f;
mZButtonItemBaseAlpha = 0.5f;
mButtonZItemBaseScale = 1.0f;
mButtonZItemBasePosX = 0.0f;
mButtonZItemBasePosY = 0.0f;
mButtonZItemBaseAlpha = 0.5f;
mButtonBaseAlpha = 0.55f;
mAButtonFontActionID = 1001;
mButtonATextActionID = 1001;
field_0x2cc = 1001;
mAButtonTextDebug = false;
mButtonATextDebug = false;
mAButtonFontSpacing = 1.0f;
mAButtonFontScale = 1.0f;
mAButtonFontPosX = 0.0f;
mAButtonFontPosY = 0.0f;
mAButtonFontColor.set(255, 255, 255, 255);
mButtonATextSpacing = 1.0f;
mButtonATextScale = 1.0f;
mButtonATextPosX = 0.0f;
mButtonATextPosY = 0.0f;
mButtonATextColor.set(255, 255, 255, 255);
mBButtonFontScale = 1.0f;
mBButtonFontPosX = -8.0f;
mBButtonFontPosY = 4.0f;
mBButtonFontColor.set(255, 255, 255, 255);
mButtonBFontScale = 1.0f;
mButtonBFontPosX = -8.0f;
mButtonBFontPosY = 4.0f;
mButtonBFontColor.set(255, 255, 255, 255);
field_0x2e4 = 1.0f;
field_0x2e8 = 0.0f;
field_0x2ec = 0.0f;
field_0x2f0.set(255, 255, 255, 255);
mXYButtonFontScale = 1.0f;
mXYButtonFontPosX = 0.0f;
mXYButtonFontPosY = 0.0f;
mXYButtonFontColor.set(255, 255, 255, 255);
mButtonXYTextScale = 1.0f;
mButtonXYTextPosX = 0.0f;
mButtonXYTextPosY = 0.0f;
mButtonXYTextColor.set(255, 255, 255, 255);
mZButtonFontScale = 1.0f;
mZButtonFontPosX = 0.0f;
mZButtonFontPosY = -4.7f;
mZButtonFontColor.set(255, 255, 255, 255);
mButtonZFontScale = 1.0f;
mButtonZFontPosX = 0.0f;
mButtonZFontPosY = -4.7f;
mButtonZFontColor.set(255, 255, 255, 255);
mRupeeKeyScale = 1.0f;
mRupeeKeyPosX = 9.2f;
@@ -945,37 +945,37 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() {
mSpurBarPosX = 6.6f;
mSpurBarPosY = -1.3f;
mAButtonHorsePosX = 2.2f;
mAButtonHorsePosY = 0.0f;
mAButtonHorseScale = 0.85f;
mButtonAHorsePosX = 2.2f;
mButtonAHorsePosY = 0.0f;
mButtonAHorseScale = 0.85f;
mAButtonHighlightScale = 1.5f;
mBButtonHighlightScale = 0.7f;
mButtonAPikariScale = 1.5f;
mButtonBPikariScale = 0.7f;
field_0x3cc = 1.0f;
mZButtonHighlightScale = 1.2f;
mXYButtonHighlightScale = 1.2f;
mMidnaIconHighlightScale = 1.0f;
mSpurIconHighlightScale = 2.5f;
mSpurIconReviveHighlightScale = 1.3f;
mButtonZPikariScale = 1.2f;
mButtonXYPikariScale = 1.2f;
mMidnaIconPikariScale = 1.0f;
mSpurIconPikariScale = 2.5f;
mSpurIconRevivePikariScale = 1.3f;
field_0x3f0 = 0.0f;
field_0x3f4 = 0.0f;
field_0x3f8 = 1.0f;
mDPadButtonScale = 0.9f;
mDPadButtonOFFPosX = 12.0f;
mDPadButtonOFFPosY = 0.0f;
mDPadButtonONPosX = 12.0f;
mDPadButtonONPosY = 0.0f;
mDPadButtonLetterSpacing = 0.9f;
mDPadButtonAlpha = 1.0f;
mDPadButtonITEMAlpha = 1.0f;
mDPadButtonMAPAlpha = 1.0f;
mDPadButtonMoveFrame = 5;
mButtonCrossScale = 0.9f;
mButtonCrossOFFPosX = 12.0f;
mButtonCrossOFFPosY = 0.0f;
mButtonCrossONPosX = 12.0f;
mButtonCrossONPosY = 0.0f;
mButtonCrossTextScale = 0.9f;
mButtonCrossAlpha = 1.0f;
mButtonCrossITEMAlpha = 1.0f;
mButtonCrossMAPAlpha = 1.0f;
mButtonCrossMoveFrame = 5;
field_0x422 = 10;
field_0x424 = 20;
mXYButtonsItemDimAlpha = 128;
mXYButtonsBaseDimAlpha = 128;
mButtonXYItemDimAlpha = 128;
mButtonXYBaseDimAlpha = 128;
field_0x42c = 128;
for (int i = 0; i < 4; i++) {
@@ -984,41 +984,41 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() {
mMaxSpurAmount = 6;
mSpurIconHighlightFrontInner.set(255, 255, 255, 255);
mSpurIconHighlightFrontOuter.set(140, 232, 228, 0);
mSpurIconHighlightBackInner.set(255, 255, 190, 255);
mSpurIconHighlightBackOuter.set(55, 215, 90, 0);
mSpurIconHighlightAnimSpeed = 1.5f;
mSpurIconPikariFrontInner.set(255, 255, 255, 255);
mSpurIconPikariFrontOuter.set(140, 232, 228, 0);
mSpurIconPikariBackInner.set(255, 255, 190, 255);
mSpurIconPikariBackOuter.set(55, 215, 90, 0);
mSpurIconPikariAnimSpeed = 1.5f;
mSpurIconReviveHighlightFrontInner.set(255, 255, 255, 255);
mSpurIconReviveHighlightFrontOuter.set(220, 110, 30, 0);
mSpurIconReviveHighlightBackInner.set(255, 255, 190, 255);
mSpurIconReviveHighlightBackOuter.set(170, 110, 0, 0);
mSpurIconReviveHighlightAnimSpeed = 0.5f;
mSpurIconRevivePikariFrontInner.set(255, 255, 255, 255);
mSpurIconRevivePikariFrontOuter.set(220, 110, 30, 0);
mSpurIconRevivePikariBackInner.set(255, 255, 190, 255);
mSpurIconRevivePikariBackOuter.set(170, 110, 0, 0);
mSpurIconRevivePikariAnimSpeed = 0.5f;
mZButtonHighlightFrontInner.set(255, 255, 255, 255);
mZButtonHighlightFrontOuter.set(0, 0, 0, 0);
mZButtonHighlightBackInner.set(255, 255, 255, 255);
mZButtonHighlightBackOuter.set(160, 160, 110, 0);
mZButtonHighlightAnimSpeed = 0.4f;
mButtonZPikariFrontInner.set(255, 255, 255, 255);
mButtonZPikariFrontOuter.set(0, 0, 0, 0);
mButtonZPikariBackInner.set(255, 255, 255, 255);
mButtonZPikariBackOuter.set(160, 160, 110, 0);
mButtonZPikariAnimSpeed = 0.4f;
mXYButtonHighlightFrontInner.set(255, 255, 255, 255);
mXYButtonHighlightFrontOuter.set(0, 0, 0, 0);
mXYButtonHighlightBackInner.set(255, 255, 255, 255);
mXYButtonHighlightBackOuter.set(160, 160, 110, 0);
mXYButtonHighlightAnimSpeed = 0.4f;
mButtonXYPikariFrontInner.set(255, 255, 255, 255);
mButtonXYPikariFrontOuter.set(0, 0, 0, 0);
mButtonXYPikariBackInner.set(255, 255, 255, 255);
mButtonXYPikariBackOuter.set(160, 160, 110, 0);
mButtonXYPikariAnimSpeed = 0.4f;
mAButtonHighlightFrontInner.set(255, 255, 255, 160);
mAButtonHighlightFrontOuter.set(0, 0, 0, 0);
mAButtonHighlightBackInner.set(255, 255, 255, 128);
mAButtonHighlightBackOuter.set(0, 255, 0, 0);
mAButtonHighlightAnimSpeed = 0.4f;
mButtonAPikariFrontInner.set(255, 255, 255, 160);
mButtonAPikariFrontOuter.set(0, 0, 0, 0);
mButtonAPikariBackInner.set(255, 255, 255, 128);
mButtonAPikariBackOuter.set(0, 255, 0, 0);
mButtonAPikariAnimSpeed = 0.4f;
mBButtonHighlightFrontInner.set(255, 180, 180, 160);
mBButtonHighlightFrontOuter.set(0, 0, 0, 0);
mBButtonHighlightBackInner.set(255, 255, 255, 128);
mBButtonHighlightBackOuter.set(255, 0, 0, 0);
mBButtonHighlightAnimSpeed = 0.4f;
mButtonBPikariFrontInner.set(255, 180, 180, 160);
mButtonBPikariFrontOuter.set(0, 0, 0, 0);
mButtonBPikariBackInner.set(255, 255, 255, 128);
mButtonBPikariBackOuter.set(255, 0, 0, 0);
mButtonBPikariAnimSpeed = 0.4f;
field_0x4a8.set(255, 180, 180, 160);
field_0x4ac.set(0, 0, 0, 0);
@@ -1040,11 +1040,11 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() {
field_0x4e0 = 0.4f;
field_0x3d4 = 0.7f;
mMidnaIconHighlightFrontInner.set(200, 235, 255, 255);
mMidnaIconHighlightFrontOuter.set(0, 0, 0, 0);
mMidnaIconHighlightBackInner.set(255, 255, 255, 255);
mMidnaIconHighlightBackOuter.set(140, 200, 125, 0);
mMidnaIconHighlightAnimSpeed = 0.5f;
mMidnaIconPikariFrontInner.set(200, 235, 255, 255);
mMidnaIconPikariFrontOuter.set(0, 0, 0, 0);
mMidnaIconPikariBackInner.set(255, 255, 255, 255);
mMidnaIconPikariBackOuter.set(140, 200, 125, 0);
mMidnaIconPikariAnimSpeed = 0.5f;
mMidnaIconFlashRate = 50;
mScrollArrowScaleX = 1.0f;
@@ -1197,12 +1197,12 @@ dMeter_ringHIO_c::dMeter_ringHIO_c() {
mRingScaleH = 1.5f;
mRingScaleV = 1.5f;
mHighlightScale = 2.5f;
mHighlightFrontInner.set(255, 255, 255, 185);
mHighlightFrontOuter.set(0, 155, 0, 0);
mHighlightBackInner.set(255, 255, 255, 87);
mHighlightBackOuter.set(0, 115, 0, 0);
mHighlightAnimSpeed = 0.772705f;
mPikariScale = 2.5f;
mPikariFrontInner.set(255, 255, 255, 185);
mPikariFrontOuter.set(0, 155, 0, 0);
mPikariBackInner.set(255, 255, 255, 87);
mPikariBackOuter.set(0, 115, 0, 0);
mPikariAnimSpeed = 0.772705f;
mCursorInitSpeed = 5000;
mCursorMax = 10000;
@@ -1429,29 +1429,29 @@ dMeter_fmapHIO_c::dMeter_fmapHIO_c() {
mDoIconScale = 0.9f;
mButtonDebugON = false;
mZButtonPosX = 25.0f;
mZButtonPosY = 25.0f;
mZButtonScale = 0.92f;
mButtonZPosX = 25.0f;
mButtonZPosY = 25.0f;
mButtonZScale = 0.92f;
mAButtonPosX = -0.5f;
mAButtonPosY = 1.0f;
mAButtonScale = 0.92f;
mButtonAPosX = -0.5f;
mButtonAPosY = 1.0f;
mButtonAScale = 0.92f;
mBButtonPosX = -1.0f;
mBButtonPosY = -1.0f;
mBButtonScale = 1.05f;
mButtonBPosX = -1.0f;
mButtonBPosY = -1.0f;
mButtonBScale = 1.05f;
mZButtonTextPosX = 20.0f;
mZButtonTextPosY = 12.0f;
mZButtonTextScale = 0.95f;
mButtonZTextPosX = 20.0f;
mButtonZTextPosY = 12.0f;
mButtonZTextScale = 0.95f;
mAButtonTextPosX = -7.5f;
mAButtonTextPosY = 8.0f;
mAButtonTextScale = 0.95f;
mButtonATextPosX = -7.5f;
mButtonATextPosY = 8.0f;
mButtonATextScale = 0.95f;
mBButtonTextPosX = -7.0f;
mBButtonTextPosY = 5.0f;
mBButtonTextScale = 0.95f;
mButtonBTextPosX = -7.0f;
mButtonBTextPosY = 5.0f;
mButtonBTextScale = 0.95f;
mMapBlink[WORLD_VIEW].mSelectedRegion.mBlack.set(29, 24, 0, 0);
mMapBlink[WORLD_VIEW].mSelectedRegion.mWhite.set(255, 255, 255, 255);
src/d/meter/d_meter_button.cpp
+63 -63
View File
@@ -274,7 +274,7 @@ void dMeterButton_c::draw() {
var_r23 = 1;
if (field_0x4b8[i] == 0 && field_0x4bc[i] == 0) {
field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mHighlightRepeatHitAnimSpeed;
field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mPikariRepeatHitAnimSpeed;
}
s16 temp_r6 = g_drawHIO.mEmpButton.mRepeatHitFrameNum;
@@ -309,7 +309,7 @@ void dMeterButton_c::draw() {
{
var_r22 = 1;
if (field_0x2e8[i] <= 0.0f) {
field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mHighlightListenAnimSpeed;
field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mPikariListenAnimSpeed;
}
}
@@ -369,46 +369,46 @@ void dMeterButton_c::draw() {
if (daPy_getPlayerActorClass()->i_getSumouMode()) {
dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari(
vtx.x, vtx.y, &field_0x2e8[i], 1.8f,
g_drawHIO.mEmpButton.mHighlightListenFrontOuter,
g_drawHIO.mEmpButton.mHighlightListenFrontInner,
g_drawHIO.mEmpButton.mHighlightListenBackOuter,
g_drawHIO.mEmpButton.mHighlightListenBackInner,
g_drawHIO.mEmpButton.mHighlightListenAnimSpeed, 3);
g_drawHIO.mEmpButton.mPikariListenFrontOuter,
g_drawHIO.mEmpButton.mPikariListenFrontInner,
g_drawHIO.mEmpButton.mPikariListenBackOuter,
g_drawHIO.mEmpButton.mPikariListenBackInner,
g_drawHIO.mEmpButton.mPikariListenAnimSpeed, 3);
} else {
dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari(
vtx.x, vtx.y, &field_0x2e8[i],
g_drawHIO.mEmpButton.mHighlightListenScale,
g_drawHIO.mEmpButton.mHighlightListenFrontOuter,
g_drawHIO.mEmpButton.mHighlightListenFrontInner,
g_drawHIO.mEmpButton.mHighlightListenBackOuter,
g_drawHIO.mEmpButton.mHighlightListenBackInner,
g_drawHIO.mEmpButton.mHighlightListenAnimSpeed, 3);
g_drawHIO.mEmpButton.mPikariListenScale,
g_drawHIO.mEmpButton.mPikariListenFrontOuter,
g_drawHIO.mEmpButton.mPikariListenFrontInner,
g_drawHIO.mEmpButton.mPikariListenBackOuter,
g_drawHIO.mEmpButton.mPikariListenBackInner,
g_drawHIO.mEmpButton.mPikariListenAnimSpeed, 3);
}
} else if (var_r23) {
dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari(
vtx.x, vtx.y, &field_0x2e8[i],
g_drawHIO.mEmpButton.mHighlightRepeatHitScale,
g_drawHIO.mEmpButton.mHighlightRepeatHitFrontOuter,
g_drawHIO.mEmpButton.mHighlightRepeatHitFrontInner,
g_drawHIO.mEmpButton.mHighlightRepeatHitBackOuter,
g_drawHIO.mEmpButton.mHighlightRepeatHitBackInner,
g_drawHIO.mEmpButton.mHighlightRepeatHitAnimSpeed, 0);
g_drawHIO.mEmpButton.mPikariRepeatHitScale,
g_drawHIO.mEmpButton.mPikariRepeatHitFrontOuter,
g_drawHIO.mEmpButton.mPikariRepeatHitFrontInner,
g_drawHIO.mEmpButton.mPikariRepeatHitBackOuter,
g_drawHIO.mEmpButton.mPikariRepeatHitBackInner,
g_drawHIO.mEmpButton.mPikariRepeatHitAnimSpeed, 0);
} else if (isFastSet(i)) {
dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari(
vtx.x, vtx.y, &field_0x2e8[i], g_drawHIO.mEmpButton.mHighlightFastScale,
g_drawHIO.mEmpButton.mHighlightFastFrontOuter,
g_drawHIO.mEmpButton.mHighlightFastFrontInner,
g_drawHIO.mEmpButton.mHighlightFastBackOuter,
g_drawHIO.mEmpButton.mHighlightFastBackInner,
g_drawHIO.mEmpButton.mHighlightFastAnimSpeed, 0);
vtx.x, vtx.y, &field_0x2e8[i], g_drawHIO.mEmpButton.mPikariFastScale,
g_drawHIO.mEmpButton.mPikariFastFrontOuter,
g_drawHIO.mEmpButton.mPikariFastFrontInner,
g_drawHIO.mEmpButton.mPikariFastBackOuter,
g_drawHIO.mEmpButton.mPikariFastBackInner,
g_drawHIO.mEmpButton.mPikariFastAnimSpeed, 0);
} else {
dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari(
vtx.x, vtx.y, &field_0x2e8[i], g_drawHIO.mEmpButton.mHighlightScale,
g_drawHIO.mEmpButton.mHighlightFrontOuter,
g_drawHIO.mEmpButton.mHighlightFrontInner,
g_drawHIO.mEmpButton.mHighlightBackOuter,
g_drawHIO.mEmpButton.mHighlightBackInner,
g_drawHIO.mEmpButton.mHighlightAnimSpeed, 0);
vtx.x, vtx.y, &field_0x2e8[i], g_drawHIO.mEmpButton.mPikariScale,
g_drawHIO.mEmpButton.mPikariFrontOuter,
g_drawHIO.mEmpButton.mPikariFrontInner,
g_drawHIO.mEmpButton.mPikariBackOuter,
g_drawHIO.mEmpButton.mPikariBackInner,
g_drawHIO.mEmpButton.mPikariAnimSpeed, 0);
}
}
}
@@ -1559,32 +1559,32 @@ void dMeterButton_c::updateButton() {
mpParent->scale(mParentScale, mParentScale);
}
if (mButtonAPosX != g_drawHIO.mEmpButton.mAButtonPosX ||
mButtonAPosY != g_drawHIO.mEmpButton.mAButtonPosY)
if (mButtonAPosX != g_drawHIO.mEmpButton.mButtonAPosX ||
mButtonAPosY != g_drawHIO.mEmpButton.mButtonAPosY)
{
mButtonAPosX = g_drawHIO.mEmpButton.mAButtonPosX;
mButtonAPosY = g_drawHIO.mEmpButton.mAButtonPosY;
mButtonAPosX = g_drawHIO.mEmpButton.mButtonAPosX;
mButtonAPosY = g_drawHIO.mEmpButton.mButtonAPosY;
paneTrans(mpButtonA, field_0x304[0] + (mButtonAPosX + field_0x18c[0]), mButtonAPosY, 0xFF);
}
if (mButtonAScale != g_drawHIO.mEmpButton.mAButtonScale) {
mButtonAScale = g_drawHIO.mEmpButton.mAButtonScale;
if (mButtonAScale != g_drawHIO.mEmpButton.mButtonAScale) {
mButtonAScale = g_drawHIO.mEmpButton.mButtonAScale;
if (!dComIfGp_isDoSetFlag(4)) {
mpButtonA->scale(mButtonAScale, mButtonAScale);
}
}
if (mButtonBPosX != g_drawHIO.mEmpButton.mBButtonPosX ||
mButtonBPosY != g_drawHIO.mEmpButton.mBButtonPosY)
if (mButtonBPosX != g_drawHIO.mEmpButton.mButtonBPosX ||
mButtonBPosY != g_drawHIO.mEmpButton.mButtonBPosY)
{
mButtonBPosX = g_drawHIO.mEmpButton.mBButtonPosX;
mButtonBPosY = g_drawHIO.mEmpButton.mBButtonPosY;
mButtonBPosX = g_drawHIO.mEmpButton.mButtonBPosX;
mButtonBPosY = g_drawHIO.mEmpButton.mButtonBPosY;
paneTrans(mpButtonB, field_0x304[1] + (mButtonBPosX + field_0x18c[1]), mButtonBPosY, 0xFF);
}
if (mButtonBScale != g_drawHIO.mEmpButton.mBButtonScale) {
mButtonBScale = g_drawHIO.mEmpButton.mBButtonScale;
if (mButtonBScale != g_drawHIO.mEmpButton.mButtonBScale) {
mButtonBScale = g_drawHIO.mEmpButton.mButtonBScale;
mpButtonB->scale(mButtonBScale, mButtonBScale);
}
@@ -1603,16 +1603,16 @@ void dMeterButton_c::updateButton() {
mpButtonR->scale(mButtonRScale, mButtonRScale);
}
if (mButtonZPosX != g_drawHIO.mEmpButton.mZButtonPosX ||
mButtonZPosY != g_drawHIO.mEmpButton.mZButtonPosY)
if (mButtonZPosX != g_drawHIO.mEmpButton.mButtonZPosX ||
mButtonZPosY != g_drawHIO.mEmpButton.mButtonZPosY)
{
mButtonZPosX = g_drawHIO.mEmpButton.mZButtonPosX;
mButtonZPosY = g_drawHIO.mEmpButton.mZButtonPosY;
mButtonZPosX = g_drawHIO.mEmpButton.mButtonZPosX;
mButtonZPosY = g_drawHIO.mEmpButton.mButtonZPosY;
paneTrans(mpButtonZ, field_0x304[3] + (mButtonZPosX + field_0x18c[3]), mButtonZPosY, 0xFF);
}
if (mButtonZScale != g_drawHIO.mEmpButton.mZButtonScale) {
mButtonZScale = g_drawHIO.mEmpButton.mZButtonScale;
if (mButtonZScale != g_drawHIO.mEmpButton.mButtonZScale) {
mButtonZScale = g_drawHIO.mEmpButton.mButtonZScale;
mpButtonZ->scale(mButtonZScale, mButtonZScale);
}
@@ -1660,30 +1660,30 @@ void dMeterButton_c::updateButton() {
mpButtonS->scale(mButtonSScale, mButtonSScale);
}
if (mButtonXPosX != g_drawHIO.mEmpButton.mXButtonPosX ||
mButtonXPosY != g_drawHIO.mEmpButton.mXButtonPosY)
if (mButtonXPosX != g_drawHIO.mEmpButton.mButtonXPosX ||
mButtonXPosY != g_drawHIO.mEmpButton.mButtonXPosY)
{
mButtonXPosX = g_drawHIO.mEmpButton.mXButtonPosX;
mButtonXPosY = g_drawHIO.mEmpButton.mXButtonPosY;
mButtonXPosX = g_drawHIO.mEmpButton.mButtonXPosX;
mButtonXPosY = g_drawHIO.mEmpButton.mButtonXPosY;
paneTrans(mpButtonX, field_0x304[7] + (mButtonXPosX + field_0x18c[7]), mButtonXPosY, 0xFF);
}
if (mButtonXScale != g_drawHIO.mEmpButton.mXButtonScale) {
mButtonXScale = g_drawHIO.mEmpButton.mXButtonScale;
if (mButtonXScale != g_drawHIO.mEmpButton.mButtonXScale) {
mButtonXScale = g_drawHIO.mEmpButton.mButtonXScale;
mpButtonX->scale(mButtonXScale, mButtonXScale);
}
if (mButtonYPosX != g_drawHIO.mEmpButton.mYButtonPosX ||
mButtonYPosY != g_drawHIO.mEmpButton.mYButtonPosY)
if (mButtonYPosX != g_drawHIO.mEmpButton.mButtonYPosX ||
mButtonYPosY != g_drawHIO.mEmpButton.mButtonYPosY)
{
mButtonYPosX = g_drawHIO.mEmpButton.mYButtonPosX;
mButtonYPosY = g_drawHIO.mEmpButton.mYButtonPosY;
mButtonYPosX = g_drawHIO.mEmpButton.mButtonYPosX;
mButtonYPosY = g_drawHIO.mEmpButton.mButtonYPosY;
paneTrans(mpButtonY, field_0x304[8] + (mButtonXPosX + field_0x18c[8]), mButtonYPosY, 0xFF);
}
if (mButtonYScale != g_drawHIO.mEmpButton.mYButtonScale) {
mButtonYScale = g_drawHIO.mEmpButton.mYButtonScale;
if (mButtonYScale != g_drawHIO.mEmpButton.mButtonYScale) {
mButtonYScale = g_drawHIO.mEmpButton.mButtonYScale;
mpButtonY->scale(mButtonYScale, mButtonYScale);
}
@@ -3355,9 +3355,9 @@ void dMeterButton_c::pikariCheck() {
(dComIfGp_isNunCSetFlag(1) && field_0x4be[i] == BUTTON_NUNC_e) ||
(dComIfGp_isBottleSetFlag(1) && field_0x4be[i] == BUTTON_BIN_e))
{
field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mHighlightFastAnimSpeed;
field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mPikariFastAnimSpeed;
} else {
field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mHighlightAnimSpeed;
field_0x2e8[i] = 18.0f - g_drawHIO.mEmpButton.mPikariAnimSpeed;
}
}
src/d/meter/d_meter_hakusha.cpp
+20 -20
View File
@@ -80,8 +80,8 @@ int dMeterHakusha_c::_create() {
mpButtonA->setAlphaRate(0.0f);
mpButtonScreen->search('info_n')->translate(0.0f, 0.0f);
field_0x100 = g_drawHIO.mAButtonHorsePosX;
field_0x104 = g_drawHIO.mAButtonHorsePosY;
field_0x100 = g_drawHIO.mButtonAHorsePosX;
field_0x104 = g_drawHIO.mButtonAHorsePosY;
if (strcmp(dComIfGp_getStartStageName(), "F_SP108") == 0) {
mpHakushaParent->paneTrans(g_drawHIO.mSpurBarPosX + 28.4f, g_drawHIO.mSpurBarPosY);
@@ -90,8 +90,8 @@ int dMeterHakusha_c::_create() {
}
mpHakushaParent->scale(g_drawHIO.mSpurBarScale, g_drawHIO.mSpurBarScale);
mpButtonA->paneTrans(g_drawHIO.mAButtonHorsePosX, g_drawHIO.mAButtonHorsePosY);
mpButtonA->scale(g_drawHIO.mAButtonHorseScale, g_drawHIO.mAButtonHorseScale);
mpButtonA->paneTrans(g_drawHIO.mButtonAHorsePosX, g_drawHIO.mButtonAHorsePosY);
mpButtonA->scale(g_drawHIO.mButtonAHorseScale, g_drawHIO.mButtonAHorseScale);
mpHakushaOn->scale(g_drawHIO.mSpurIconScale, g_drawHIO.mSpurIconScale);
mpHakushaOff->scale(g_drawHIO.mUsedSpurIconScale, g_drawHIO.mUsedSpurIconScale);
@@ -138,17 +138,17 @@ void dMeterHakusha_c::draw() {
if (mHakushaStatus[i] == 0) {
dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikariHakusha(
center.x, center.y, mHakushaAnimFrame[i], g_drawHIO.mSpurIconHighlightScale,
g_drawHIO.mSpurIconHighlightFrontOuter, g_drawHIO.mSpurIconHighlightFrontInner,
g_drawHIO.mSpurIconHighlightBackOuter, g_drawHIO.mSpurIconHighlightBackInner);
center.x, center.y, mHakushaAnimFrame[i], g_drawHIO.mSpurIconPikariScale,
g_drawHIO.mSpurIconPikariFrontOuter, g_drawHIO.mSpurIconPikariFrontInner,
g_drawHIO.mSpurIconPikariBackOuter, g_drawHIO.mSpurIconPikariBackInner);
} else {
dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikariHakusha(
center.x, center.y, mHakushaAnimFrame[i],
g_drawHIO.mSpurIconReviveHighlightScale,
g_drawHIO.mSpurIconReviveHighlightFrontOuter,
g_drawHIO.mSpurIconReviveHighlightFrontInner,
g_drawHIO.mSpurIconReviveHighlightBackOuter,
g_drawHIO.mSpurIconReviveHighlightBackInner);
g_drawHIO.mSpurIconRevivePikariScale,
g_drawHIO.mSpurIconRevivePikariFrontOuter,
g_drawHIO.mSpurIconRevivePikariFrontInner,
g_drawHIO.mSpurIconRevivePikariBackOuter,
g_drawHIO.mSpurIconRevivePikariBackInner);
}
}
}
@@ -219,11 +219,11 @@ void dMeterHakusha_c::updateHakusha() {
if (mHakushaNum != dMeter2Info_getHorseLifeCount()) {
if (mHakushaNum > dMeter2Info_getHorseLifeCount()) {
mHakushaAnimFrame[dMeter2Info_getHorseLifeCount()] =
18.0f - g_drawHIO.mSpurIconHighlightAnimSpeed;
18.0f - g_drawHIO.mSpurIconPikariAnimSpeed;
mHakushaStatus[dMeter2Info_getHorseLifeCount()] = 0;
} else if (mHakushaNum < dMeter2Info_getHorseLifeCount()) {
for (int i = mHakushaNum; i < dMeter2Info_getHorseLifeCount(); i++) {
mHakushaAnimFrame[i] = 18.0f - g_drawHIO.mSpurIconReviveHighlightAnimSpeed;
mHakushaAnimFrame[i] = 18.0f - g_drawHIO.mSpurIconRevivePikariAnimSpeed;
mHakushaStatus[i] = 1;
}
}
@@ -234,9 +234,9 @@ void dMeterHakusha_c::updateHakusha() {
for (int i = 0; i < getHakushaNum(); i++) {
if (mHakushaAnimFrame[i] > 0.0f) {
if (mHakushaStatus[i] == 0) {
mHakushaAnimFrame[i] += g_drawHIO.mSpurIconHighlightAnimSpeed;
mHakushaAnimFrame[i] += g_drawHIO.mSpurIconPikariAnimSpeed;
} else {
mHakushaAnimFrame[i] += g_drawHIO.mSpurIconReviveHighlightAnimSpeed;
mHakushaAnimFrame[i] += g_drawHIO.mSpurIconRevivePikariAnimSpeed;
}
if (mHakushaAnimFrame[i] > 28.0f) {
@@ -280,8 +280,8 @@ void dMeterHakusha_c::updateHakusha() {
mButtonAPosY = abtn_y_offset + field_0x104;
if (g_drawHIO.mSpurDebug) {
field_0x100 = g_drawHIO.mAButtonHorsePosX;
field_0x104 = g_drawHIO.mAButtonHorsePosY;
field_0x100 = g_drawHIO.mButtonAHorsePosX;
field_0x104 = g_drawHIO.mButtonAHorsePosY;
if (strcmp(dComIfGp_getStartStageName(), "F_SP108") == 0) {
mpHakushaParent->paneTrans(g_drawHIO.mSpurBarPosX + 28.4f, g_drawHIO.mSpurBarPosY);
@@ -290,8 +290,8 @@ void dMeterHakusha_c::updateHakusha() {
}
mpHakushaParent->scale(g_drawHIO.mSpurBarScale, g_drawHIO.mSpurBarScale);
mpButtonA->paneTrans(g_drawHIO.mAButtonHorsePosX, g_drawHIO.mAButtonHorsePosY);
mpButtonA->scale(g_drawHIO.mAButtonHorseScale, g_drawHIO.mAButtonHorseScale);
mpButtonA->paneTrans(g_drawHIO.mButtonAHorsePosX, g_drawHIO.mButtonAHorsePosY);
mpButtonA->scale(g_drawHIO.mButtonAHorseScale, g_drawHIO.mButtonAHorseScale);
mpHakushaOn->scale(g_drawHIO.mSpurIconScale, g_drawHIO.mSpurIconScale);
mpHakushaOff->scale(g_drawHIO.mUsedSpurIconScale, g_drawHIO.mUsedSpurIconScale);
src/d/meter/d_meter_string.cpp
+8 -8
View File
@@ -131,9 +131,9 @@ void dMeterString_c::draw() {
if (mPikariAnimFrame > 0.0f) {
drawPikari();
} else if (mPikariAnimFrame == -1.0f &&
mAnimFrame > g_drawHIO.mMiniGame.mReadyFightHighlightAppearFrames)
mAnimFrame > g_drawHIO.mMiniGame.mReadyFightPikariAppearFrames)
{
mPikariAnimFrame = 18.0f - g_drawHIO.mMiniGame.mReadyFightHighlightAnimSpeed;
mPikariAnimFrame = 18.0f - g_drawHIO.mMiniGame.mReadyFightPikariAnimSpeed;
}
if (mAnimFrame >= var_f31) {
@@ -247,12 +247,12 @@ void dMeterString_c::drawPikari() {
if (c != 0x20 && c != 0x8140) {
dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari(
(temp_f24 / 2) + (var_f25 + var_f29), center.y, &frame,
g_drawHIO.mMiniGame.mReadyFightHighlightScale,
g_drawHIO.mMiniGame.mReadyFightHighlightFrontOuter,
g_drawHIO.mMiniGame.mReadyFightHighlightFrontInner,
g_drawHIO.mMiniGame.mReadyFightHighlightBackOuter,
g_drawHIO.mMiniGame.mReadyFightHighlightBackInner,
g_drawHIO.mMiniGame.mReadyFightHighlightAnimSpeed, 0);
g_drawHIO.mMiniGame.mReadyFightPikariScale,
g_drawHIO.mMiniGame.mReadyFightPikariFrontOuter,
g_drawHIO.mMiniGame.mReadyFightPikariFrontInner,
g_drawHIO.mMiniGame.mReadyFightPikariBackOuter,
g_drawHIO.mMiniGame.mReadyFightPikariBackInner,
g_drawHIO.mMiniGame.mReadyFightPikariAnimSpeed, 0);
}
var_f29 += temp_f24;