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

d_meter2 mostly complete (#310)

Browse Source 
* d_meter2 mostly complete

* remove asm
This commit is contained in:
TakaRikka
2023-03-18 15:25:47 -07:00
committed by GitHub
parent 808032a02b
commit 721880831e
51 changed files with 3013 additions and 6424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_scope.cpp
+2 -53
View File
@@ -8,57 +8,6 @@
#include "d/com/d_com_inf_game.h"
#include "dol2asm.h"
//
// Types:
//
class dScope_c : public dMeterSub_c {
public:
enum {
/* 0 */ PROC_OPEN,
/* 1 */ PROC_MOVE,
/* 2 */ PROC_CLOSE,
};
/* 80193690 */ dScope_c(u8);
/* 80193FB4 */ void open_init();
/* 80193FD0 */ void open_proc();
/* 80194048 */ void move_init();
/* 8019404C */ void move_proc();
/* 80194050 */ void close_init();
/* 80194054 */ void close_proc();
/* 80193C68 */ virtual void draw();
/* 8019396C */ virtual ~dScope_c();
/* 80193B90 */ virtual int _execute(u32);
/* 80193FA0 */ virtual int isDead();
/* 0x04 */ J2DScreen* mHawkEyeScrn;
/* 0x08 */ J2DScreen* mZoomInOutScrn;
/* 0x0C */ CPaneMgr* mHawkEyeRootPane;
/* 0x10 */ CPaneMgr* mZoomInOutRootPane;
/* 0x14 */ CPaneMgr* mHawkEyePanes[3];
/* 0x20 */ CPaneMgr* mZoomInOutPanes[3][2];
/* 0x38 */ J2DPicture* mpWipeTex;
/* 0x3C */ J2DPicture* mpBlackTex;
/* 0x40 */ u8 field_0x40[0x48 - 0x40];
/* 0x48 */ JUtility::TColor field_0x48[2];
/* 0x50 */ JUtility::TColor field_0x50[2];
/* 0x58 */ u32 field_0x58;
/* 0x5C */ u32 field_0x5c;
/* 0x60 */ u8 field_0x60[0x78 - 0x60];
/* 0x78 */ f32 mWidth;
/* 0x7C */ f32 mHeight;
/* 0x80 */ f32 mScale;
/* 0x84 */ f32 mAlpha;
/* 0x88 */ s16 mOpenTimer;
/* 0x8A */ s16 field_0x8a;
/* 0x8C */ u8 mProcess;
/* 0x8D */ u8 field_0x8d;
/* 0x8E */ u8 mIsDead;
/* 0x8F */ u8 field_0x8f;
};
//
// Forward References:
//
@@ -339,8 +288,8 @@ extern "C" asm void draw__8dScope_cFv() {
#endif
/* 80193FA0-80193FB4 18E8E0 0014+00 1/0 0/0 0/0 .text isDead__8dScope_cFv */
int dScope_c::isDead() {
return mIsDead != false;
bool dScope_c::isDead() {
return mIsDead != false ? 1 : 0;
}
/* 80193FB4-80193FD0 18E8F4 001C+00 1/0 0/0 0/0 .text open_init__8dScope_cFv */
src/d/meter/d_meter2.cpp
+2419 -472
View File
File diff suppressed because it is too large Load Diff
src/d/meter/d_meter2_draw.cpp
+5 -5
View File
@@ -2105,7 +2105,7 @@ asm void dMeter2Draw_c::drawButtonXY(int param_0, u8 param_1, u8 param_2, bool p
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Draw_c::getButtonCrossParentInitTransY() {
asm f32 dMeter2Draw_c::getButtonCrossParentInitTransY() {
nofralloc
#include "asm/d/meter/d_meter2_draw/getButtonCrossParentInitTransY__13dMeter2Draw_cFv.s"
}
@@ -2332,7 +2332,7 @@ static u8 i_text_buf[32];
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Draw_c::getActionString(u8 param_0, u8 param_1, u8* param_2) {
asm char* dMeter2Draw_c::getActionString(u8 param_0, u8 param_1, u8* param_2) {
nofralloc
#include "asm/d/meter/d_meter2_draw/getActionString__13dMeter2Draw_cFUcUcPUc.s"
}
@@ -2687,7 +2687,7 @@ bool dMeter2Draw_c::getCanoeFishing() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Draw_c::getCameraSubject() {
asm bool dMeter2Draw_c::getCameraSubject() {
nofralloc
#include "asm/d/meter/d_meter2_draw/getCameraSubject__13dMeter2Draw_cFv.s"
}
@@ -2698,7 +2698,7 @@ asm void dMeter2Draw_c::getCameraSubject() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Draw_c::getItemSubject() {
asm bool dMeter2Draw_c::getItemSubject() {
nofralloc
#include "asm/d/meter/d_meter2_draw/getItemSubject__13dMeter2Draw_cFv.s"
}
@@ -2714,7 +2714,7 @@ bool dMeter2Draw_c::getPlayerSubject() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Draw_c::isBButtonShow(bool param_0) {
asm bool dMeter2Draw_c::isBButtonShow(bool param_0) {
nofralloc
#include "asm/d/meter/d_meter2_draw/isBButtonShow__13dMeter2Draw_cFb.s"
}
src/d/meter/d_meter2_info.cpp
+1 -1
View File
@@ -326,7 +326,7 @@ int dMeter2Info_c::setFloatingFlow(u16 flowID, s16 msgTimer, bool wakuVisible) {
/* 8021C1DC-8021C1F0 216B1C 0014+00 0/0 4/4 0/0 .text isFloatingMessageVisible__13dMeter2Info_cFv
*/
int dMeter2Info_c::isFloatingMessageVisible() {
bool dMeter2Info_c::isFloatingMessageVisible() {
return mFloatingMessageTimer > 0;
}
src/d/meter/d_meter_HIO.cpp
+28 -28
View File
@@ -877,19 +877,19 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() {
mAButtonAlpha = 1.0f;
mAButtonPosX = 0.0f;
mAButtonPosY = 0.0f;
mAButtonTalkScale = 1.0f;
mAButtonTalkPosX = 0.0f;
mAButtonTalkPosY = -63.0f;
mAButtonTalkScale[0] = 1.0f;
mAButtonTalkPosX[0] = 0.0f;
mAButtonTalkPosY[0] = -63.0f;
mAButtonTalkAScale = 1.0f;
mAButtonTalkAPosX = 0.0f;
mAButtonTalkAPosY = -49.0f;
mAButtonTalkAPosX[0] = 0.0f;
mAButtonTalkAPosY[0] = -49.0f;
mAButtonFontTalkScale = 1.0f;
mAButtonFontTalkPosX = -20.0f;
mAButtonFontTalkPosY = -62.0f;
mAButtonTalkScale[1] = 1.0f;
mAButtonTalkPosX[1] = -20.0f;
mAButtonTalkPosY[1] = -62.0f;
mAButtonFontTalkAScale = 1.0f;
mAButtonFontTalkAPosX = -20.0f;
mAButtonFontTalkAPosY = -48.0f;
mAButtonTalkAPosX[1] = -20.0f;
mAButtonTalkAPosY[1] = -48.0f;
mAButtonVesselPosX = 0.0f;
mAButtonVesselPosY = 0.0f;
@@ -898,13 +898,13 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() {
mBButtonAlpha = 1.0f;
mBButtonPosX = -2.2f;
mBButtonPosY = -1.3f;
mBButtonTalkScale = 1.0f;
mBButtonTalkPosX = 0.0f;
mBButtonTalkPosY = -62.0f;
mBButtonTalkScale[0] = 1.0f;
mBButtonTalkPosX[0] = 0.0f;
mBButtonTalkPosY[0] = -62.0f;
mBButtonFontTalkScale = 1.0f;
mBButtonFontTalkPosX = -9.2f;
mBButtonFontTalkPosY = -65.0f;
mBButtonTalkScale[1] = 1.0f;
mBButtonTalkPosX[1] = -9.2f;
mBButtonTalkPosY[1] = -65.0f;
mBButtonWolfPosX = 0.0f;
mBButtonWolfPosY = 0.0f;
@@ -1014,24 +1014,24 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() {
mBItemBaseAlpha[0] = 0.5f;
mBItemBaseAlpha[1] = 0.5f;
mXButtonItemBaseScale = 1.5f;
mXButtonItemBasePosX = 14.0f;
mXButtonItemBasePosY = -12.0f;
mXButtonItemBaseScale[0] = 1.5f;
mXButtonItemBasePosX[0] = 14.0f;
mXButtonItemBasePosY[0] = -12.0f;
mXButtonItemBaseAlpha[0] = 0.5f;
mXButtonItemBaseNoItemScale = 1.5f;
mXButtonItemBaseNoItemPosX = 0.0f;
mXButtonItemBaseNoItemPosY = 0.0f;
mXButtonItemBaseScale[1] = 1.5f;
mXButtonItemBasePosX[1] = 0.0f;
mXButtonItemBasePosY[1] = 0.0f;
mXButtonItemBaseAlpha[1] = 1.0f;
mYButtonItemBaseScale = 1.5f;
mYButtonItemBasePosX = -15.0f;
mYButtonItemBasePosY = -12.0f;
mYButtonItemBaseScale[0] = 1.5f;
mYButtonItemBasePosX[0] = -15.0f;
mYButtonItemBasePosY[0] = -12.0f;
mYButtonItemBaseAlpha[0] = 0.5f;
mYButtonItemBaseNoItemScale = 1.5f;
mYButtonItemBaseNoItemPosX = 0.0f;
mYButtonItemBaseNoItemPosY = 0.0f;
mYButtonItemBaseScale[1] = 1.5f;
mYButtonItemBasePosX[1] = 0.0f;
mYButtonItemBasePosY[1] = 0.0f;
mYButtonItemBaseAlpha[1] = 0.5f;
field_0x280 = 1.5f;