mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-10 19:17:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Work on multiple files (#2102)

Browse Source 
* d_menu_skill OK

* remove asm and update progress

* work on multiple files

* remove asm

* update progress
This commit is contained in:
Trueffel
2024-03-20 08:10:26 +01:00
committed by GitHub
parent eb086d59c1
commit 4ea2b399be
16 changed files with 254 additions and 1096 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/kankyo/d_kankyo_wether.cpp
+3 -3
View File
@@ -1324,7 +1324,7 @@ SECTION_SDATA2 static f32 lit_5193 = 0.00139999995008111f;
u8 data_80450EE0;
/* 80059728-80059E38 054068 0710+00 1/1 0/0 0/0 .text wether_move_vrkumo__Fv */
// gameinfo load issue, cmath instruction order / reg alloc
// Matches with literals
#ifdef NONMATCHING
static void wether_move_vrkumo() {
BOOL var_r31 = false;
@@ -1431,9 +1431,9 @@ static void wether_move_vrkumo() {
temp_f27_2 += 24575.0f;
sp8.x = cM_ssin(temp_f27_2) * cM_scos(temp_r4_2);
sp8.x = cM_scos(temp_r4_2) * cM_ssin(temp_f27_2);
sp8.y = cM_ssin(temp_r4_2);
sp8.z = cM_scos(temp_f27_2) * cM_scos(temp_r4_2);
sp8.z = cM_scos(temp_r4_2) * cM_scos(temp_f27_2);
g_env_light.mpVrkumoPacket->field_0x1150 += (sp8.x * var_f31) * 0.0014f;
g_env_light.mpVrkumoPacket->field_0x1154 += (sp8.z * var_f31) * 0.0014f;
src/d/menu/d_menu_collect.cpp
+4 -7
View File
@@ -3332,7 +3332,7 @@ void dMenu_Collect3D_c::draw() {
}
/* 801B6A30-801B6D30 1B1370 0300+00 2/2 0/0 0/0 .text setJ3D__17dMenu_Collect3D_cFPCcPCcPCc */
// b issue and regalloc
// regalloc
#ifdef NONMATCHING
void dMenu_Collect3D_c::setJ3D(const char* param_0, const char* param_1, const char* param_2) {
JKRArchive* resArchive = dComIfGp_getCollectResArchive();
@@ -3349,10 +3349,7 @@ void dMenu_Collect3D_c::setJ3D(const char* param_0, const char* param_1, const c
J3DAnmTransform* pbck = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(
resArchive->getResource('BCK ', param_1), J3DLOADER_UNK_FLAG0);
mpBckAnm = new mDoExt_bckAnm();
if (mpBckAnm == NULL) {
return;
}
if (mpBckAnm->init(pbck, 1, 2, 1.0f, 0, -1, false) != 0) {
if (mpBckAnm == NULL || !mpBckAnm->init(pbck, 1, 2, 1.0f, 0, -1, false)) {
return;
}
}
@@ -3361,8 +3358,8 @@ void dMenu_Collect3D_c::setJ3D(const char* param_0, const char* param_1, const c
resArchive->getResource('BRK ', param_2), J3DLOADER_UNK_FLAG0);
pbrk->searchUpdateMaterialID(modelData);
mpBrkAnm = new mDoExt_brkAnm();
if (mpBrkAnm != NULL) {
mpBrkAnm->init(modelData, pbrk, -1, 2, 1.0f, 0, -1);
if (mpBrkAnm == NULL || !mpBrkAnm->init(modelData, pbrk, -1, 2, 1.0f, 0, -1)) {
return;
}
}
}
src/d/menu/d_menu_ring.cpp
+164 -36
View File
@@ -8,7 +8,6 @@
#include "JSystem/J2DGraph/J2DScreen.h"
#include "JSystem/J2DGraph/J2DTextBox.h"
#include "JSystem/JKernel/JKRExpHeap.h"
#include "string.h"
#include "SSystem/SComponent/c_math.h"
#include "d/a/d_a_alink.h"
#include "d/d_item_data.h"
@@ -26,6 +25,7 @@
#include "dol2asm.h"
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_graphic.h"
#include "string.h"
//
// Forward References:
@@ -693,8 +693,7 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i
mpItemTex[i][k] = new J2DPicture(mpItemBuf[i][k]);
mpItemTex[i][k]->setBasePosition(J2DBasePosition_4);
}
dMeter2Info_setItemColor(item, mpItemTex[i][0], mpItemTex[i][1],
mpItemTex[i][2], NULL);
dMeter2Info_setItemColor(item, mpItemTex[i][0], mpItemTex[i][1], mpItemTex[i][2], NULL);
u8 texScale = dItem_data::getTexScale(item);
f32 fVar1 = (texScale / 100.0f);
f32 fVar2 = (mpItemBuf[i][0]->width / 48.0f);
@@ -1118,8 +1117,7 @@ bool dMenu_Ring_c::isMoveEnd() {
} else {
field_0x6bc = 0xff;
}
Z2GetAudioMgr()->seStart(Z2SE_ITEM_RING_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_ITEM_RING_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
dMeter2Info_set2DVibrationM();
ret = 1;
}
@@ -1339,13 +1337,17 @@ void dMenu_Ring_c::setJumpItem(bool i_useVibrationM) {
if (field_0x6b3 == 0) {
field_0x538[0] = g_ringHIO.mSelectItemScale;
field_0x538[1] = g_ringHIO.mUnselectItemScale;
if (field_0x6b4[0] != dComIfGs_getSelectItemIndex(0) || field_0x6b8[0] != dComIfGs_getMixItemIndex(0)) {
if (field_0x6b4[0] != dComIfGs_getSelectItemIndex(0) ||
field_0x6b8[0] != dComIfGs_getMixItemIndex(0))
{
field_0x674[0] = 1;
}
} else if (field_0x6b3 == 1) {
field_0x538[0] = g_ringHIO.mUnselectItemScale;
field_0x538[1] = g_ringHIO.mSelectItemScale;
if (field_0x6b4[1] != dComIfGs_getSelectItemIndex(1) || field_0x6b8[1] != dComIfGs_getMixItemIndex(1)) {
if (field_0x6b4[1] != dComIfGs_getSelectItemIndex(1) ||
field_0x6b8[1] != dComIfGs_getMixItemIndex(1))
{
field_0x674[1] = 1;
}
}
@@ -1385,14 +1387,47 @@ asm void dMenu_Ring_c::setJumpItem(bool param_0) {
#endif
/* 801EC20C-801EC3B0 1E6B4C 01A4+00 2/2 0/0 0/0 .text setScale__12dMenu_Ring_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Ring_c::setScale() {
nofralloc
#include "asm/d/menu/d_menu_ring/setScale__12dMenu_Ring_cFv.s"
void dMenu_Ring_c::setScale() {
u32 itemId;
for (int i = 0; i < field_0x6ae; i++) {
if (field_0x6cf != 0xff) {
itemId = 0;
switch (field_0x6cf) {
case 0:
itemId = 0x4DE;
break;
case 1:
itemId = 0x4E0;
break;
}
setNameString(itemId);
setItemScale(i, g_ringHIO.mUnselectItemScale);
for (int j = 0; j < 2; j++) {
if (j == field_0x6cf) {
setButtonScale(j, g_ringHIO.mSelectButtonScale);
} else {
setButtonScale(j, g_ringHIO.mUnselectButtonScale);
}
}
} else {
if (i == mStatus && (field_0x6b0 == 0 || field_0x6b0 == 2 || field_0x6b0 == 3)) {
itemId = dComIfGs_getItem(field_0x690[i], false) + 0x165;
if (dMeter2Info_getRentalBombBag() != 0xff &&
field_0x690[i] == dMeter2Info_getRentalBombBag() + 0xf)
{
itemId = 0x16D;
}
setNameString(itemId);
setItemScale(i, g_ringHIO.mSelectItemScale);
} else {
setItemScale(i, g_ringHIO.mUnselectItemScale);
}
for (int j = 0; j < 2; j++) {
setButtonScale(j, g_ringHIO.mUnselectButtonScale);
}
}
}
}
#pragma pop
/* 801EC3B0-801EC504 1E6CF0 0154+00 1/1 0/0 0/0 .text setNameString__12dMenu_Ring_cFUl */
#ifdef NONMATCHING
@@ -1463,8 +1498,7 @@ void dMenu_Ring_c::setActiveCursor() {
}
}
} else if (mDoCPd_c::getTrigX(PAD_1) || mDoCPd_c::getTrigY(PAD_1)) {
Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
0);
Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
}
}
@@ -1547,6 +1581,35 @@ void dMenu_Ring_c::stick_wait_init() {
/* 801ED31C-801ED490 1E7C5C 0174+00 1/0 0/0 0/0 .text stick_wait_proc__12dMenu_Ring_cFv
*/
// Matches with literals
#ifdef NONMATCHING
void dMenu_Ring_c::stick_wait_proc() {
u8 item = dComIfGs_getItem(field_0x690[mStatus], false);
if (item != 0xff) {
setDoStatus(0x24);
} else {
setDoStatus(0);
}
if (dMw_A_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0x4000) && openExplain(item)) {
dMeter2Info_setItemExplainWindowStatus(1);
field_0x6c4 = mStatus;
field_0x6b0 = 2;
dMeter2Info_set2DVibration();
setDoStatus(0);
return;
}
if (dMw_A_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0x4000)) {
Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
if (field_0x672 > 0) {
field_0x672--;
} else if (getStickInfo(mpStick) != 0) {
field_0x6b0 = 1;
field_0x6b2 = 0;
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -1555,6 +1618,7 @@ asm void dMenu_Ring_c::stick_wait_proc() {
#include "asm/d/menu/d_menu_ring/stick_wait_proc__12dMenu_Ring_cFv.s"
}
#pragma pop
#endif
/* 801ED490-801ED53C 1E7DD0 00AC+00 1/0 0/0 0/0 .text stick_move_init__12dMenu_Ring_cFv
*/
@@ -1603,7 +1667,7 @@ SECTION_SDATA2 static u8 lit_5651[8] = {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Ring_c::stick_move_proc() {
asm f32 dMenu_Ring_c::stick_move_proc() {
nofralloc
#include "asm/d/menu/d_menu_ring/stick_move_proc__12dMenu_Ring_cFv.s"
}
@@ -1685,6 +1749,25 @@ asm void dMenu_Ring_c::stick_explain_force_proc() {
/* 801EDB14-801EDC98 1E8454 0184+00 2/2 0/0 0/0 .text setSelectItem__12dMenu_Ring_cFiUc
*/
// Matches with literals
#ifdef NONMATCHING
void dMenu_Ring_c::setSelectItem(int i_idx, u8 i_itemNo) {
f32 texScale = 1.0f;
if (i_itemNo != 0xff) {
if (field_0x6be[i_idx] == 0) {
field_0x6be[i_idx] = 1;
} else {
field_0x6be[i_idx] = 0;
}
field_0x686[i_idx] = dMeter2Info_readItemTexture(i_itemNo, mpSelectItemTexBuf[i_idx][field_0x6be[i_idx]][0], mpSelectItemTex[i_idx][0], mpSelectItemTexBuf[i_idx][field_0x6be[i_idx]][1], mpSelectItemTex[i_idx][1],
mpSelectItemTexBuf[i_idx][field_0x6be[i_idx]][2], mpSelectItemTex[i_idx][2], NULL, NULL, -1);
texScale = dItem_data::getTexScale(i_itemNo) / 100.0f;
}
field_0x548[i_idx] = mpSelectItemTexBuf[i_idx][field_0x6be[i_idx]][0]->width / 48.0f * texScale;
field_0x558[i_idx] = mpSelectItemTexBuf[i_idx][field_0x6be[i_idx]][0]->height / 48.0f * texScale;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -1693,6 +1776,7 @@ asm void dMenu_Ring_c::setSelectItem(int param_0, u8 param_1) {
#include "asm/d/menu/d_menu_ring/setSelectItem__12dMenu_Ring_cFiUc.s"
}
#pragma pop
#endif
/* ############################################################################################## */
/* 80454414-80454418 002A14 0004+00 1/1 0/0 0/0 .sdata2 @5811 */
@@ -1735,31 +1819,75 @@ s32 dMenu_Ring_c::getCursorPos(u8 param_0) {
}
/* 801EE058-801EE15C 1E8998 0104+00 4/4 0/0 0/0 .text getItemNum__12dMenu_Ring_cFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm u8 dMenu_Ring_c::getItemNum(u8 param_0) {
nofralloc
#include "asm/d/menu/d_menu_ring/getItemNum__12dMenu_Ring_cFUc.s"
u8 dMenu_Ring_c::getItemNum(u8 i_slotNo) {
u8 item = dComIfGs_getItem(i_slotNo, false);
u8 ret = 0;
switch (item) {
case 0x50:
ret = 0;
break;
case 0x70:
case 0x71:
case 0x72:
ret = dComIfGs_getBombNum(i_slotNo - 0xF);
break;
case 0x76:
ret = dComIfGs_getBottleNum(i_slotNo - 0xB);
break;
case 0x43:
case 0x53:
case 0x54:
case 0x55:
case 0x56:
ret = dComIfGs_getArrowNum();
break;
case 0x4B:
ret = dComIfGs_getPachinkoNum();
break;
}
return ret;
}
#pragma pop
/* 801EE15C-801EE228 1E8A9C 00CC+00 4/4 0/0 0/0 .text getItemMaxNum__12dMenu_Ring_cFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm u8 dMenu_Ring_c::getItemMaxNum(u8 param_0) {
nofralloc
#include "asm/d/menu/d_menu_ring/getItemMaxNum__12dMenu_Ring_cFUc.s"
u8 dMenu_Ring_c::getItemMaxNum(u8 i_slotNo) {
u8 item = dComIfGs_getItem(i_slotNo, false);
u8 ret = 0;
switch (item) {
case 0x50:
ret = 1;
break;
case 0x70:
case 0x71:
case 0x72:
ret = dComIfGs_getBombMax(item);
break;
case 0x76:
ret = dComIfGs_getBottleMax();
break;
case 0x43:
case 0x53:
case 0x54:
case 0x55:
case 0x56:
ret = dComIfGs_getArrowMax();
break;
case 0x4B:
ret = dComIfGs_getPachinkoMax();
break;
}
return ret;
}
#pragma pop
/* 801EE228-801EE63C 1E8B68 0414+00 1/1 0/0 0/0 .text checkExplainForce__12dMenu_Ring_cFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMenu_Ring_c::checkExplainForce() {
asm bool dMenu_Ring_c::checkExplainForce() {
nofralloc
#include "asm/d/menu/d_menu_ring/checkExplainForce__12dMenu_Ring_cFv.s"
}
@@ -1924,8 +2052,8 @@ void dMenu_Ring_c::setMixMessage() {
}
if (!mpTextParent[4]->isVisible()) {
field_0x570 = 18.0f - g_ringHIO.mHighlightAnimSpeed;
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ICON, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ICON, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
mpTextParent[4]->show();
} else if (isMixItemOn()) {
@@ -1935,8 +2063,8 @@ void dMenu_Ring_c::setMixMessage() {
}
if (!mpTextParent[4]->isVisible()) {
field_0x570 = 18.0f - g_ringHIO.mHighlightAnimSpeed;
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ICON, NULL, 0, 0, 1.0f, 1.0f,
-1.0f, -1.0f, 0);
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ICON, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-1.0f, 0);
}
mpTextParent[4]->show();
} else {
src/d/meter/d_meter2.cpp
+18 -267
View File
@@ -22,223 +22,6 @@
#include "f_op/f_op_msg_mng.h"
#include "rel/d/a/d_a_horse/d_a_horse.h"
//
// Forward References:
//
extern "C" void _create__9dMeter2_cFv();
extern "C" void _execute__9dMeter2_cFv();
extern "C" void _draw__9dMeter2_cFv();
extern "C" void _delete__9dMeter2_cFv();
extern "C" void emphasisButtonDelete__9dMeter2_cFv();
extern "C" void setLifeZero__9dMeter2_cFv();
extern "C" void checkStatus__9dMeter2_cFv();
extern "C" void moveLife__9dMeter2_cFv();
extern "C" void moveKantera__9dMeter2_cFv();
extern "C" void moveOxygen__9dMeter2_cFv();
extern "C" void moveLightDrop__9dMeter2_cFv();
extern "C" void moveRupee__9dMeter2_cFv();
extern "C" void moveKey__9dMeter2_cFv();
extern "C" void moveButtonA__9dMeter2_cFv();
extern "C" void moveButtonB__9dMeter2_cFv();
extern "C" void moveButtonR__9dMeter2_cFv();
extern "C" void moveButtonZ__9dMeter2_cFv();
extern "C" void moveButton3D__9dMeter2_cFv();
extern "C" void moveButtonC__9dMeter2_cFv();
extern "C" void moveButtonS__9dMeter2_cFv();
extern "C" void moveButtonXY__9dMeter2_cFv();
extern "C" void moveButtonCross__9dMeter2_cFv();
extern "C" void moveTouchSubMenu__9dMeter2_cFv();
extern "C" void moveSubContents__9dMeter2_cFv();
extern "C" void move2DContents__9dMeter2_cFv();
extern "C" void checkSubContents__9dMeter2_cFv();
extern "C" void check2DContents__9dMeter2_cFv();
extern "C" void moveBombNum__9dMeter2_cFv();
extern "C" void moveBottleNum__9dMeter2_cFv();
extern "C" void moveArrowNum__9dMeter2_cFv();
extern "C" void movePachinkoNum__9dMeter2_cFv();
extern "C" void alphaAnimeLife__9dMeter2_cFv();
extern "C" void alphaAnimeKantera__9dMeter2_cFv();
extern "C" void alphaAnimeOxygen__9dMeter2_cFv();
extern "C" void alphaAnimeLightDrop__9dMeter2_cFv();
extern "C" void alphaAnimeRupee__9dMeter2_cFv();
extern "C" void alphaAnimeKey__9dMeter2_cFv();
extern "C" void alphaAnimeButton__9dMeter2_cFv();
extern "C" void alphaAnimeButtonCross__9dMeter2_cFv();
extern "C" void isShowLightDrop__9dMeter2_cFv();
extern "C" void killSubContents__9dMeter2_cFUc();
extern "C" void isKeyVisible__9dMeter2_cFv();
extern "C" void isArrowEquip__9dMeter2_cFv();
extern "C" void isPachinkoEquip__9dMeter2_cFv();
extern "C" static void dMeter2_Draw__FP9dMeter2_c();
extern "C" static void dMeter2_Execute__FP9dMeter2_c();
extern "C" static bool dMeter2_IsDelete__FP9dMeter2_c();
extern "C" static void dMeter2_Delete__FP9dMeter2_c();
extern "C" static void dMeter2_Create__FP9msg_class();
extern "C" extern char const* const d_meter_d_meter2__stringBase0;
// extern "C" extern void* g_profile_METER2[10];
//
// External References:
//
extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap();
extern "C" void fopMsgM_setStageLayer__FPv();
extern "C" void fopMsgM_setMessageID__FUi();
extern "C" void fopMsgM_Create__FsPFPv_iPv();
extern "C" void fopMsgM_createExpHeap__FUlP7JKRHeap();
extern "C" void fopMsgM_destroyExpHeap__FP10JKRExpHeap();
extern "C" void setItemBombNumCount__14dComIfG_play_cFUcs();
extern "C" void getItemBombNumCount__14dComIfG_play_cFUc();
extern "C" void clearItemBombNumCount__14dComIfG_play_cFUc();
extern "C" void getLayerNo__14dComIfG_play_cFi();
extern "C" void getTimerMode__14dComIfG_play_cFv();
extern "C" void dComIfGs_setSelectItemIndex__FiUc();
extern "C" void dComIfGs_setMixItemIndex__FiUc();
extern "C" void dComIfGs_getSelectMixItemNoArrowIndex__Fi();
extern "C" void dComIfGs_getMixItemIndex__Fi();
extern "C" void dComIfGp_setSelectItem__Fi();
extern "C" void dComIfGp_getSelectItem__Fi();
extern "C" void dComIfGp_setHeapLockFlag__FUc();
extern "C" void dComIfGp_offHeapLockFlag__Fi();
extern "C" void dComIfGp_getSubHeap2D__Fi();
extern "C" void dComIfGp_getSelectItemNum__Fi();
extern "C" void dComIfGp_getSelectItemMaxNum__Fi();
extern "C" void getSelectItemIndex__21dSv_player_status_a_cCFi();
extern "C" void getRupeeMax__21dSv_player_status_a_cCFv();
extern "C" void setItem__17dSv_player_item_cFiUc();
extern "C" void getItem__17dSv_player_item_cCFib();
extern "C" void setBombNum__24dSv_player_item_record_cFUcUc();
extern "C" void getBombNum__24dSv_player_item_record_cCFUc();
extern "C" void getBottleNum__24dSv_player_item_record_cCFUc();
extern "C" void getBombNum__21dSv_player_item_max_cCFUc();
extern "C" void onCollectCrystal__20dSv_player_collect_cFUc();
extern "C" void isCollectCrystal__20dSv_player_collect_cCFUc();
extern "C" void onCollectMirror__20dSv_player_collect_cFUc();
extern "C" void isCollectMirror__20dSv_player_collect_cCFUc();
extern "C" void getLightDropNum__16dSv_light_drop_cCFUc();
extern "C" void isLightDropGetFlag__16dSv_light_drop_cCFUc();
extern "C" void isEventBit__11dSv_event_cCFUs();
extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c();
extern "C" bool CalcSubjectAngle__9dCamera_cFPsPs();
extern "C" void dCam_getBody__Fv();
extern "C" void __ct__8dScope_cFUc();
extern "C" void dKy_darkworld_check__Fv();
extern "C" bool getBombFlag__9dMw_HIO_cFv();
extern "C" bool getArrowFlag__9dMw_HIO_cFv();
extern "C" bool getPachinkoFlag__9dMw_HIO_cFv();
extern "C" void __ct__14dMeterButton_cFv();
extern "C" void _execute__14dMeterButton_cFUlbbbbbbbbbbbbbbbbbbbbbb();
extern "C" void isClose__14dMeterButton_cFv();
extern "C" void setString__14dMeterButton_cFPcUcUcUc();
extern "C" void hideAll__14dMeterButton_cFv();
extern "C" void __ct__14dMeterHaihai_cFUc();
extern "C" void __ct__15dMeterHakusha_cFPv();
extern "C" void isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv();
extern "C" void getMapDispEdgeTop__11dMeterMap_cFv();
extern "C" void setMapAlpha__11dMeterMap_cFUc();
extern "C" void __ct__11dMeterMap_cFP9J2DScreen();
extern "C" void _move__11dMeterMap_cFUl();
extern "C" void _draw__11dMeterMap_cFv();
extern "C" void meter_map_move__11dMeterMap_cFUl();
extern "C" void __ct__14dMeterString_cFi();
extern "C" void createString__14dMeterString_cFi();
extern "C" void __ct__13dMeter2Draw_cFP10JKRExpHeap();
extern "C" void exec__13dMeter2Draw_cFUl();
extern "C" void drawLife__13dMeter2Draw_cFssff();
extern "C" void setAlphaLifeChange__13dMeter2Draw_cFb();
extern "C" void setAlphaLifeAnimeMin__13dMeter2Draw_cFv();
extern "C" void setAlphaLifeAnimeMax__13dMeter2Draw_cFv();
extern "C" void drawKantera__13dMeter2Draw_cFllff();
extern "C" void setAlphaKanteraChange__13dMeter2Draw_cFb();
extern "C" void setAlphaKanteraAnimeMin__13dMeter2Draw_cFv();
extern "C" void setAlphaKanteraAnimeMax__13dMeter2Draw_cFv();
extern "C" void drawOxygen__13dMeter2Draw_cFllff();
extern "C" void setAlphaOxygenChange__13dMeter2Draw_cFb();
extern "C" void setAlphaOxygenAnimeMin__13dMeter2Draw_cFv();
extern "C" void setAlphaOxygenAnimeMax__13dMeter2Draw_cFv();
extern "C" void drawLightDrop__13dMeter2Draw_cFUcUcffffUc();
extern "C" void setAlphaLightDropChange__13dMeter2Draw_cFb();
extern "C" void getNowLightDropRateCalc__13dMeter2Draw_cFv();
extern "C" void setAlphaLightDropAnimeMin__13dMeter2Draw_cFv();
extern "C" void setAlphaLightDropAnimeMax__13dMeter2Draw_cFv();
extern "C" void drawRupee__13dMeter2Draw_cFs();
extern "C" void setAlphaRupeeChange__13dMeter2Draw_cFb();
extern "C" void setAlphaRupeeAnimeMin__13dMeter2Draw_cFv();
extern "C" void setAlphaRupeeAnimeMax__13dMeter2Draw_cFv();
extern "C" void drawKey__13dMeter2Draw_cFs();
extern "C" void setAlphaKeyChange__13dMeter2Draw_cFb();
extern "C" void setAlphaKeyAnimeMin__13dMeter2Draw_cFv();
extern "C" void setAlphaKeyAnimeMax__13dMeter2Draw_cFv();
extern "C" void drawButtonA__13dMeter2Draw_cFUcfffffbb();
extern "C" void drawButtonB__13dMeter2Draw_cFUcbfffffb();
extern "C" void drawButtonR__13dMeter2Draw_cFUcUcbb();
extern "C" void drawButtonZ__13dMeter2Draw_cFUc();
extern "C" void drawButton3D__13dMeter2Draw_cFUc();
extern "C" void drawButtonC__13dMeter2Draw_cFUcb();
extern "C" void drawButtonS__13dMeter2Draw_cFUc();
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 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();
extern "C" void setButtonIconAlpha__13dMeter2Draw_cFiUcUlb();
extern "C" void getActionString__13dMeter2Draw_cFUcUcPUc();
extern "C" void setItemNum__13dMeter2Draw_cFUcUcUc();
extern "C" void drawItemNum__13dMeter2Draw_cFUcf();
extern "C" void drawKanteraMeter__13dMeter2Draw_cFUcf();
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 isButtonBShow__13dMeter2Draw_cFb();
extern "C" void getButtonTimer__13dMeter2Draw_cFv();
extern "C" void isFloatingMessageVisible__13dMeter2Info_cFv();
extern "C" void isDirectUseItem__13dMeter2Info_cFi();
extern "C" void decHotSpringTimer__13dMeter2Info_cFv();
extern "C" bool dMeter2Info_is2DActiveTouchArea__Fv();
extern "C" void isPlaceMessage__12dMsgObject_cFv();
extern "C" void getStatus__12dMsgObject_cFv();
extern "C" void dTimer_createStockTimer__Fv();
extern "C" void cLib_addCalc2__FPffff();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void heartGaugeOn__11Z2StatusMgrFv();
extern "C" void freeAll__7JKRHeapFv();
extern "C" void getTotalFreeSize__7JKRHeapFv();
extern "C" void* __nw__FUl();
extern "C" void _savegpr_18();
extern "C" void _savegpr_19();
extern "C" void _savegpr_21();
extern "C" void _savegpr_23();
extern "C" void _savegpr_25();
extern "C" void _savegpr_27();
extern "C" void _savegpr_29();
extern "C" void _restgpr_18();
extern "C" void _restgpr_19();
extern "C" void _restgpr_21();
extern "C" void _restgpr_23();
extern "C" void _restgpr_25();
extern "C" void _restgpr_27();
extern "C" void _restgpr_29();
extern "C" u8 m_mode__7dDemo_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
//
/* 8021EA14-8021F128 219354 0714+00 1/1 0/0 0/0 .text _create__9dMeter2_cFv */
int dMeter2_c::_create() {
stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo();
@@ -1764,7 +1547,7 @@ void dMeter2_c::moveButtonB() {
var_f31 = 1.0f;
}
if (mpMeterDraw->isButtonBShow(false)) {
if (mpMeterDraw->isBButtonShow(false)) {
if (field_0x1ff == 0) {
field_0x1ff = 1;
draw_buttonB = true;
@@ -3057,18 +2840,8 @@ void dMeter2_c::alphaAnimeLightDrop() {
mpMeterDraw->setAlphaLightDropChange(false);
}
/* ############################################################################################## */
/* 80399338-80399338 025998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399347 = "R_SP127";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8039934F = "";
#pragma pop
/* 80224DC0-80224F70 21F700 01B0+00 1/1 0/0 0/0 .text alphaAnimeRupee__9dMeter2_cFv */
// gameinfo loads have issues
#ifdef NONMATCHING
void dMeter2_c::alphaAnimeRupee() {
if ((mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x80)) ||
daPy_getPlayerActorClass()->getSumouMode() ||
@@ -3087,20 +2860,8 @@ void dMeter2_c::alphaAnimeRupee() {
mpMeterDraw->setAlphaRupeeChange(false);
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2_c::alphaAnimeRupee() {
nofralloc
#include "asm/d/meter/d_meter2/alphaAnimeRupee__9dMeter2_cFv.s"
}
#pragma pop
#endif
/* 80224F70-802250F4 21F8B0 0184+00 1/1 0/0 0/0 .text alphaAnimeKey__9dMeter2_cFv */
// masking issues
#ifdef NONMATCHING
void dMeter2_c::alphaAnimeKey() {
if ((mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x40)) ||
!isKeyVisible() || (mStatus & 0x40000000) || (mStatus & 0x1000) || (mStatus & 0x100000) ||
@@ -3108,7 +2869,7 @@ void dMeter2_c::alphaAnimeKey() {
(daPy_getPlayerActorClass()->checkCanoeSlider() &&
(dComIfG_getTimerMode() == 3 || dComIfG_getTimerMode() == 4)) ||
(mStatus & 0x100) || (mStatus & 8) || (mStatus & 0x10) ||
(mStatus & 0x1000000) | (mStatus & 0x20) || (mStatus & 0x4000000) ||
(mStatus & 0x1000000) || (mStatus & 0x20) || (mStatus & 0x4000000) ||
(mStatus & 0x8000000) || (mStatus & 0x10000000) || dMeter2Info_isSub2DStatus(1))
{
mpMeterDraw->setAlphaKeyAnimeMin();
@@ -3118,16 +2879,6 @@ void dMeter2_c::alphaAnimeKey() {
mpMeterDraw->setAlphaKeyChange(false);
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2_c::alphaAnimeKey() {
nofralloc
#include "asm/d/meter/d_meter2/alphaAnimeKey__9dMeter2_cFv.s"
}
#pragma pop
#endif
/* 802250F4-802254C0 21FA34 03CC+00 1/1 0/0 0/0 .text alphaAnimeButton__9dMeter2_cFv */
void dMeter2_c::alphaAnimeButton() {
@@ -3139,41 +2890,41 @@ void dMeter2_c::alphaAnimeButton() {
((mStatus & 0x40000000) && !(mStatus & 0x100)) || (mStatus & 0x80000000) || (mStatus & 8) ||
(mStatus & 0x10) || (mStatus & 0x20) || (mStatus & 0x04000000) || (mStatus & 0x10000000))
{
mpMeterDraw->setAlphButtonAAnimeMin();
mpMeterDraw->setAlphButtonAAAnimeMin();
mpMeterDraw->setAlphButtonABAnimeMin();
mpMeterDraw->setAlphaButtonAnimeMin();
mpMeterDraw->setAlphaButtonAAnimeMin();
mpMeterDraw->setAlphaButtonBAnimeMin();
} else if (!(mStatus & 0x1000000) &&
((mStatus & 0x100) || daPy_getPlayerActorClass()->checkHawkWait() ||
(mStatus & 0x40) && dComIfGp_event_checkHind(1)))
{
mpMeterDraw->setAlphButtonAAnimeMin();
mpMeterDraw->setAlphaButtonAnimeMin();
var_31 = 1;
} else if (dMeter2Info_getItemExplainWindowStatus()) {
mpMeterDraw->setAlphButtonAAnimeMin();
mpMeterDraw->setAlphaButtonAnimeMin();
var_31 = 1;
} else {
mpMeterDraw->setAlphButtonAAnimeMax();
mpMeterDraw->setAlphaButtonAnimeMax();
}
field_0x1e6 = 0;
if (var_31 == 1) {
if (dMeter2Info_getItemExplainWindowStatus()) {
mpMeterDraw->setAlphButtonAAAnimeMin();
mpMeterDraw->setAlphaButtonAAnimeMin();
} else if ((mStatus & 0x100) || daPy_getPlayerActorClass()->checkHawkWait() ||
!dComIfGp_event_checkHind(2))
{
mpMeterDraw->setAlphButtonAAAnimeMax();
mpMeterDraw->setAlphaButtonAAnimeMax();
onShowFlag(0);
} else {
mpMeterDraw->setAlphButtonAAAnimeMin();
mpMeterDraw->setAlphaButtonAAnimeMin();
}
if (mpMeterDraw->isButtonBShow(false)) {
mpMeterDraw->setAlphButtonABAnimeMax();
if (mpMeterDraw->isBButtonShow(false)) {
mpMeterDraw->setAlphaButtonBAnimeMax();
onShowFlag(1);
} else {
mpMeterDraw->setAlphButtonABAnimeMin();
mpMeterDraw->setAlphaButtonBAnimeMin();
}
}
@@ -3210,7 +2961,7 @@ void dMeter2_c::alphaAnimeButton() {
}
}
mpMeterDraw->setAlphButtonAChange(false);
mpMeterDraw->setAlphaButtonChange(false);
}
/* 802254C0-802256DC 21FE00 021C+00 1/1 0/0 0/0 .text alphaAnimeButtonCross__9dMeter2_cFv
@@ -3224,7 +2975,7 @@ void dMeter2_c::alphaAnimeButtonCross() {
(mStatus & 0x10000000) || (mStatus & 0x20000000)) ||
daPy_getPlayerActorClass()->checkEnemyAttentionLock() || dMeter2Info_isGameStatus(1))
{
mpMeterDraw->setAlphButtonACrossAnimeMin();
mpMeterDraw->setAlphaButtonCrossAnimeMin();
if ((!dComIfGp_event_chkEventFlag(0x40) || dMeter2Info_isGameStatus(2) ||
(mStatus & 0x100)) &&
@@ -3233,13 +2984,13 @@ void dMeter2_c::alphaAnimeButtonCross() {
field_0x190--;
}
} else if (dMeter2Info_isSub2DStatus(1) || dMeter2Info_isFloatingMessageVisible()) {
mpMeterDraw->setAlphButtonACrossAnimeMin();
mpMeterDraw->setAlphaButtonCrossAnimeMin();
if (field_0x190 < 5) {
field_0x190++;
}
} else {
mpMeterDraw->setAlphButtonACrossAnimeMax();
mpMeterDraw->setAlphaButtonCrossAnimeMax();
if (field_0x190 < 5) {
field_0x190++;
src/d/meter/d_meter2_draw.cpp
+37 -37
View File
@@ -1209,7 +1209,7 @@ void dMeter2Draw_c::initButton() {
drawButtonC(dComIfGp_getCStickStatus(), true);
drawButtonS(dComIfGp_getSButtonStatus());
setAlphButtonAChange(true);
setAlphaButtonChange(true);
mpButtonParent->setAlphaRate(0.0f);
}
@@ -2245,7 +2245,7 @@ void dMeter2Draw_c::drawButtonA(u8 i_action, f32 i_posX, f32 i_posY, f32 i_textP
f32 var_f31 = g_drawHIO.mButtonAScale;
f32 var_f30 = g_drawHIO.mButtonATextScale;
if (isButtonBShow(false)) {
if (isBButtonShow(false)) {
var_f31 = g_drawHIO.mButtonATalkScale[0];
var_f30 = g_drawHIO.mButtonATalkScale[1];
} else if (param_7) {
@@ -2310,7 +2310,7 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos
f32 var_f31 = g_drawHIO.mButtonBScale;
f32 var_f30 = g_drawHIO.mButtonBFontScale;
if (isButtonBShow(true)) {
if (isBButtonShow(true)) {
var_f31 = g_drawHIO.mButtonBTalkScale[0];
var_f30 = g_drawHIO.mButtonBTalkScale[1];
}
@@ -2660,41 +2660,41 @@ void dMeter2Draw_c::drawButtonCross(f32 i_posX, f32 i_posY) {
}
/* 80218338-802183A8 212C78 0070+00 0/0 1/1 0/0 .text
* setAlphButtonACrossAnimeMin__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphButtonACrossAnimeMin() {
* setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphaButtonCrossAnimeMin() {
if (mpButtonCrossParent->getAlphaRate() != 0.0f) {
mpButtonCrossParent->setAlphaRate(g_drawHIO.mParentAlpha);
setAlphaAnimeMin(mpButtonCrossParent, 5);
}
setAlphButtonACrossItemAnimeMin();
setAlphButtonACrossMapAnimeMin();
setAlphaButtonCrossItemAnimeMin();
setAlphaButtonCrossMapAnimeMin();
}
/* 802183A8-80218448 212CE8 00A0+00 0/0 1/1 0/0 .text
* setAlphButtonACrossAnimeMax__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphButtonACrossAnimeMax() {
* setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphaButtonCrossAnimeMax() {
if (g_drawHIO.mParentAlpha != mpButtonCrossParent->getAlphaRate()) {
mpButtonCrossParent->setAlphaRate(g_drawHIO.mParentAlpha);
setAlphaAnimeMax(mpButtonCrossParent, 5);
}
if (dMeter2Info_isItemOpenCheck()) {
setAlphButtonACrossItemAnimeMax();
setAlphaButtonCrossItemAnimeMax();
} else {
setAlphButtonACrossItemAnimeMin();
setAlphaButtonCrossItemAnimeMin();
}
if (dMeter2Info_isMapOpenCheck()) {
setAlphButtonACrossMapAnimeMax();
setAlphaButtonCrossMapAnimeMax();
} else {
setAlphButtonACrossMapAnimeMin();
setAlphaButtonCrossMapAnimeMin();
}
}
/* 80218448-80218524 212D88 00DC+00 2/2 0/0 0/0 .text
* setAlphButtonACrossItemAnimeMin__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphButtonACrossItemAnimeMin() {
* setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphaButtonCrossItemAnimeMin() {
if (mpTextI->getAlphaRate() != 0.0f) {
mpTextI->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossITEMAlpha);
setAlphaAnimeMin(mpTextI, 5);
@@ -2709,8 +2709,8 @@ void dMeter2Draw_c::setAlphButtonACrossItemAnimeMin() {
}
/* 80218524-802185E8 212E64 00C4+00 1/1 0/0 0/0 .text
* setAlphButtonACrossItemAnimeMax__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphButtonACrossItemAnimeMax() {
* setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphaButtonCrossItemAnimeMax() {
if (g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossITEMAlpha != mpTextI->getAlphaRate()) {
mpTextI->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossITEMAlpha);
setAlphaAnimeMax(mpTextI, 5);
@@ -2725,8 +2725,8 @@ void dMeter2Draw_c::setAlphButtonACrossItemAnimeMax() {
}
/* 802185E8-802186C4 212F28 00DC+00 2/2 0/0 0/0 .text
* setAlphButtonACrossMapAnimeMin__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphButtonACrossMapAnimeMin() {
* setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphaButtonCrossMapAnimeMin() {
if (mpTextM->getAlphaRate() != 0.0f) {
mpTextM->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossMAPAlpha);
setAlphaAnimeMin(mpTextM, 5);
@@ -2741,8 +2741,8 @@ void dMeter2Draw_c::setAlphButtonACrossMapAnimeMin() {
}
/* 802186C4-80218788 213004 00C4+00 1/1 0/0 0/0 .text
* setAlphButtonACrossMapAnimeMax__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphButtonACrossMapAnimeMax() {
* setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphaButtonCrossMapAnimeMax() {
if (g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossMAPAlpha != mpTextM->getAlphaRate()) {
mpTextM->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossMAPAlpha);
setAlphaAnimeMax(mpTextM, 5);
@@ -2756,8 +2756,8 @@ void dMeter2Draw_c::setAlphButtonACrossMapAnimeMax() {
}
}
/* 80218788-8021901C 2130C8 0894+00 1/1 1/1 0/0 .text setAlphButtonAChange__13dMeter2Draw_cFb */
void dMeter2Draw_c::setAlphButtonAChange(bool param_0) {
/* 80218788-8021901C 2130C8 0894+00 1/1 1/1 0/0 .text setAlphaButtonChange__13dMeter2Draw_cFb */
void dMeter2Draw_c::setAlphaButtonChange(bool param_0) {
bool set_parent = false;
bool set_buttonA = false;
bool set_buttonB = false;
@@ -2955,8 +2955,8 @@ void dMeter2Draw_c::setAlphButtonAChange(bool param_0) {
}
}
/* 8021901C-802190A8 21395C 008C+00 0/0 1/1 0/0 .text setAlphButtonAAnimeMin__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphButtonAAnimeMin() {
/* 8021901C-802190A8 21395C 008C+00 0/0 1/1 0/0 .text setAlphaButtonAnimeMin__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphaButtonAnimeMin() {
if (mpButtonParent->getAlphaRate() != 0.0f) {
mpButtonParent->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha);
setAlphaAnimeMin(mpButtonParent, 5);
@@ -2967,8 +2967,8 @@ void dMeter2Draw_c::setAlphButtonAAnimeMin() {
}
}
/* 802190A8-80219174 2139E8 00CC+00 0/0 1/1 0/0 .text setAlphButtonAAnimeMax__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphButtonAAnimeMax() {
/* 802190A8-80219174 2139E8 00CC+00 0/0 1/1 0/0 .text setAlphaButtonAnimeMax__13dMeter2Draw_cFv */
void dMeter2Draw_c::setAlphaButtonAnimeMax() {
if (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha != mpButtonParent->getAlphaRate()) {
mpButtonParent->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha);
setAlphaAnimeMax(mpButtonParent, 5);
@@ -2985,9 +2985,9 @@ void dMeter2Draw_c::setAlphButtonAAnimeMax() {
}
}
/* 80219174-80219258 213AB4 00E4+00 0/0 1/1 0/0 .text setAlphButtonAAAnimeMin__13dMeter2Draw_cFv
/* 80219174-80219258 213AB4 00E4+00 0/0 1/1 0/0 .text setAlphaButtonAAnimeMin__13dMeter2Draw_cFv
*/
void dMeter2Draw_c::setAlphButtonAAAnimeMin() {
void dMeter2Draw_c::setAlphaButtonAAnimeMin() {
if (mpButtonA->getAlphaRate() != 0.0f) {
mpButtonA->setAlphaRate(g_drawHIO.mButtonAAlpha *
(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha));
@@ -3002,9 +3002,9 @@ void dMeter2Draw_c::setAlphButtonAAAnimeMin() {
}
}
/* 80219258-80219324 213B98 00CC+00 0/0 1/1 0/0 .text setAlphButtonAAAnimeMax__13dMeter2Draw_cFv
/* 80219258-80219324 213B98 00CC+00 0/0 1/1 0/0 .text setAlphaButtonAAnimeMax__13dMeter2Draw_cFv
*/
void dMeter2Draw_c::setAlphButtonAAAnimeMax() {
void dMeter2Draw_c::setAlphaButtonAAnimeMax() {
if (g_drawHIO.mButtonAAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha) !=
mpButtonA->getAlphaRate())
{
@@ -3021,9 +3021,9 @@ void dMeter2Draw_c::setAlphButtonAAAnimeMax() {
}
}
/* 80219324-80219474 213C64 0150+00 0/0 1/1 0/0 .text setAlphButtonABAnimeMin__13dMeter2Draw_cFv
/* 80219324-80219474 213C64 0150+00 0/0 1/1 0/0 .text setAlphaButtonBAnimeMin__13dMeter2Draw_cFv
*/
void dMeter2Draw_c::setAlphButtonABAnimeMin() {
void dMeter2Draw_c::setAlphaButtonBAnimeMin() {
if (mpButtonB->getAlphaRate() != 0.0f) {
mpButtonB->setAlphaRate(g_drawHIO.mButtonBAlpha *
(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha));
@@ -3047,9 +3047,9 @@ void dMeter2Draw_c::setAlphButtonABAnimeMin() {
}
}
/* 80219474-802195A4 213DB4 0130+00 0/0 1/1 0/0 .text setAlphButtonABAnimeMax__13dMeter2Draw_cFv
/* 80219474-802195A4 213DB4 0130+00 0/0 1/1 0/0 .text setAlphaButtonBAnimeMax__13dMeter2Draw_cFv
*/
void dMeter2Draw_c::setAlphButtonABAnimeMax() {
void dMeter2Draw_c::setAlphaButtonBAnimeMax() {
if (mpButtonB->getAlphaRate() !=
g_drawHIO.mButtonBAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha))
{
@@ -4037,8 +4037,8 @@ bool dMeter2Draw_c::getPlayerSubject() {
return dComIfGp_checkPlayerStatus0(0, 0x8000000);
}
/* 8021BCC0-8021BDD0 216600 0110+00 2/2 2/2 0/0 .text isButtonBShow__13dMeter2Draw_cFb */
bool dMeter2Draw_c::isButtonBShow(bool param_0) {
/* 8021BCC0-8021BDD0 216600 0110+00 2/2 2/2 0/0 .text isBButtonShow__13dMeter2Draw_cFb */
bool dMeter2Draw_c::isBButtonShow(bool param_0) {
if (dMsgObject_getMsgObjectClass() == NULL) {
return false;
}
src/d/meter/d_meter_map.cpp
+5 -103
View File
@@ -1,10 +1,11 @@
//
// Generated By: dol2asm
// Translation Unit: d/meter/d_meter_map
//
/**
* d_meter_map.cpp
*
*/
#include "d/meter/d_meter_map.h"
#include "JSystem/J2DGraph/J2DGrafContext.h"
#include "d/a/d_a_player.h"
#include "d/map/d_map.h"
#include "d/menu/d_menu_window.h"
#include "d/meter/d_meter2_info.h"
@@ -12,81 +13,6 @@
#include "f_op/f_op_overlap_mng.h"
#include "m_Do/m_Do_controller_pad.h"
//
// Forward References:
//
extern "C" void isEnableDispMap__11dMeterMap_cFv();
extern "C" void getMapDispSizeTypeNo__11dMeterMap_cFv();
extern "C" void isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv();
extern "C" void getMapDispEdgeBottomY_Layout__11dMeterMap_cFv();
extern "C" void isEventRunCheck__11dMeterMap_cFv();
extern "C" void getMapDispEdgeLeftX_Layout__11dMeterMap_cFv();
extern "C" void getMapDispEdgeTop__11dMeterMap_cFv();
extern "C" bool getDispPosInside_OffsetX__11dMeterMap_cFv();
extern "C" void getDispPosOutSide_OffsetX__11dMeterMap_cFv();
extern "C" void setDispPosInsideFlg_SE_On__11dMeterMap_cFv();
extern "C" void setDispPosOutsideFlg_SE_On__11dMeterMap_cFv();
extern "C" void setMapAlpha__11dMeterMap_cFUc();
extern "C" void isMapOpenCheck__11dMeterMap_cFv();
extern "C" void __ct__11dMeterMap_cFP9J2DScreen();
extern "C" void __dt__11dMeterMap_cFv();
extern "C" void _create__11dMeterMap_cFP9J2DScreen();
extern "C" void _delete__11dMeterMap_cFv();
extern "C" void _move__11dMeterMap_cFUl();
extern "C" void _draw__11dMeterMap_cFv();
extern "C" void draw__11dMeterMap_cFv();
extern "C" void ctrlShowMap__11dMeterMap_cFv();
extern "C" void checkMoveStatus__11dMeterMap_cFv();
extern "C" void isShow__11dMeterMap_cFUl();
extern "C" void isFmapScreen__11dMeterMap_cFv();
extern "C" void isDmapScreen__11dMeterMap_cFv();
extern "C" void meter_map_move__11dMeterMap_cFUl();
extern "C" void keyCheck__11dMeterMap_cFv();
extern "C" extern char const* const d_meter_d_meter_map__stringBase0;
//
// External References:
//
extern "C" void fopOvlpM_IsDoingReq__Fv();
extern "C" void getStatusRoomDt__20dStage_roomControl_cFi();
extern "C" void __ct__6dMap_cFiiii();
extern "C" void _move__6dMap_cFffif();
extern "C" void _draw__6dMap_cFv();
extern "C" void dComIfGp_mapShow__Fv();
extern "C" void dComIfGp_mapHide__Fv();
extern "C" void dComIfGp_checkMapShow__Fv();
extern "C" void isDungeonItem__12dSv_memBit_cCFi();
extern "C" void onEventBit__11dSv_event_cFUs();
extern "C" void isEventBit__11dSv_event_cCFUs();
extern "C" void getMapPlayerPos__10dMapInfo_nFv();
extern "C" void isExistMapPathData__8dMpath_cFv();
extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c();
extern "C" void dMw_LEFT_TRIGGER__Fv();
extern "C" void dMw_RIGHT_TRIGGER__Fv();
extern "C" void dMeter2Info_set2DVibration__Fv();
extern "C" void getStatus__12dMsgObject_cFv();
extern "C" void cLib_addCalcAngleS__FPsssss();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void __ct__10J2DPictureFPC7ResTIMG();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
//
/* 8020D49C-8020D528 207DDC 008C+00 1/1 0/0 0/0 .text isEnableDispMap__11dMeterMap_cFv */
bool dMeterMap_c::isEnableDispMap() {
bool minimapEnable = false;
@@ -168,8 +94,6 @@ f32 dMeterMap_c::getMapDispEdgeBottomY_Layout() {
}
/* 8020D698-8020D72C 207FD8 0094+00 2/2 0/0 0/0 .text isEventRunCheck__11dMeterMap_cFv */
// missing gameinfo load
#ifdef NONMATCHING
bool dMeterMap_c::isEventRunCheck() {
if (dComIfGp_event_runCheck()) {
return true;
@@ -179,16 +103,6 @@ bool dMeterMap_c::isEventRunCheck() {
return dComIfGp_event_runCheck() != field_0x30 ? 1 : 0;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool dMeterMap_c::isEventRunCheck() {
nofralloc
#include "asm/d/meter/d_meter_map/isEventRunCheck__11dMeterMap_cFv.s"
}
#pragma pop
#endif
/* 8020D72C-8020D75C 20806C 0030+00 2/2 0/0 0/0 .text getMapDispEdgeLeftX_Layout__11dMeterMap_cFv
*/
@@ -540,8 +454,6 @@ u8 dMeterMap_c::checkMoveStatus() {
}
/* 8020E4C8-8020E620 208E08 0158+00 2/2 0/0 0/0 .text isShow__11dMeterMap_cFUl */
// extra gameinfo label load for dComIfGp_event_checkHind
#ifdef NONMATCHING
bool dMeterMap_c::isShow(u32 param_0) {
if ((param_0 & 0x4000) || fopOvlpM_IsDoingReq() ||
((param_0 & 0x40) && dComIfGp_event_checkHind(0x100) &&
@@ -557,16 +469,6 @@ bool dMeterMap_c::isShow(u32 param_0) {
}
return true;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool dMeterMap_c::isShow(u32 param_0) {
nofralloc
#include "asm/d/meter/d_meter_map/isShow__11dMeterMap_cFUl.s"
}
#pragma pop
#endif
/* 8020E620-8020E70C 208F60 00EC+00 3/3 0/0 0/0 .text isFmapScreen__11dMeterMap_cFv */
bool dMeterMap_c::isFmapScreen() {