mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-07 12:03:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_msg_scrn_3select done (#2153)

Browse Source 
* msg_scrn_3select done

* remove asm

* d_msg_scrn_jimaku done
This commit is contained in:
TakaRikka
2024-05-10 23:53:18 -07:00
committed by GitHub
parent 1718216dac
commit 41e19d2d31
49 changed files with 1149 additions and 4356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/msg/d_msg_scrn_3select.cpp
+871 -676
View File
File diff suppressed because it is too large Load Diff
src/d/msg/d_msg_scrn_base.cpp
+4 -4
View File
@@ -16,7 +16,7 @@ dMsgScrnBase_c::~dMsgScrnBase_c() {}
/* 8023C16C-8023C234 236AAC 00C8+00 1/1 9/9 0/0 .text init__14dMsgScrnBase_cFv */
void dMsgScrnBase_c::init() {
mpScreen = NULL;
mpPmp_c = NULL;
mpPmP_c = NULL;
field_0x54 = 0;
for (int i = 0; i < 7; i++) {
@@ -110,18 +110,18 @@ void dMsgScrnBase_c::setRubyString(char* i_string) {
/* 8023C458-8023C480 236D98 0028+00 1/0 0/0 0/0 .text fukiScale__14dMsgScrnBase_cFf */
void dMsgScrnBase_c::fukiScale(f32 i_scale) {
mpPmp_c->paneScale(i_scale, i_scale);
mpPmP_c->paneScale(i_scale, i_scale);
}
/* 8023C480-8023C4A4 236DC0 0024+00 1/0 0/0 0/0 .text fukiTrans__14dMsgScrnBase_cFff */
void dMsgScrnBase_c::fukiTrans(f32 i_posX, f32 i_posY) {
mpPmp_c->paneTrans(i_posX, i_posY);
mpPmP_c->paneTrans(i_posX, i_posY);
}
/* 8023C4A4-8023C4F4 236DE4 0050+00 1/0 0/0 0/0 .text fukiAlpha__14dMsgScrnBase_cFf */
void dMsgScrnBase_c::fukiAlpha(f32 i_alpha) {
fontAlpha(i_alpha);
mpPmp_c->setAlphaRate(i_alpha);
mpPmP_c->setAlphaRate(i_alpha);
}
/* 8023C4F4-8023C574 236E34 0080+00 1/0 5/0 0/0 .text fontAlpha__14dMsgScrnBase_cFf */
src/d/msg/d_msg_scrn_boss.cpp
+6 -6
View File
@@ -18,8 +18,8 @@ dMsgScrnBoss_c::dMsgScrnBoss_c() {
mpScreen->setPriority("zelda_boss_name.blo", 0x20000, dComIfGp_getMsgArchive(4));
dPaneClass_showNullPane(mpScreen);
mpPmp_c = new CPaneMgr(mpScreen, 'n_all', 2, NULL);
mpPmp_c->scale(g_MsgObject_HIO_c.mBossNameScaleX, g_MsgObject_HIO_c.mBossNameScaleY);
mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 2, NULL);
mpPmP_c->scale(g_MsgObject_HIO_c.mBossNameScaleX, g_MsgObject_HIO_c.mBossNameScaleY);
mpFontParent = new CPaneMgr(mpScreen, 's_font_n', 0, NULL);
mpFontParent->scale(g_MsgObject_HIO_c.mBossNameCharSizeX, g_MsgObject_HIO_c.mBossNameCharSizeY);
@@ -57,8 +57,8 @@ dMsgScrnBoss_c::~dMsgScrnBoss_c() {
delete mpScreen;
mpScreen = NULL;
delete mpPmp_c;
mpPmp_c = NULL;
delete mpPmP_c;
mpPmP_c = NULL;
delete mpFontParent;
mpFontParent = NULL;
@@ -76,7 +76,7 @@ dMsgScrnBoss_c::~dMsgScrnBoss_c() {
/* 8023CA88-8023CB98 2373C8 0110+00 1/0 0/0 0/0 .text exec__14dMsgScrnBoss_cFv */
void dMsgScrnBoss_c::exec() {
mpPmp_c->scale(g_MsgObject_HIO_c.mBossNameScaleX, g_MsgObject_HIO_c.mBossNameScaleY);
mpPmP_c->scale(g_MsgObject_HIO_c.mBossNameScaleX, g_MsgObject_HIO_c.mBossNameScaleY);
mpFontParent->scale(g_MsgObject_HIO_c.mBossNameCharSizeX, g_MsgObject_HIO_c.mBossNameCharSizeY);
mpFontParent->paneTrans(g_MsgObject_HIO_c.mBossNameCharPosX,
@@ -100,7 +100,7 @@ void dMsgScrnBoss_c::drawSelf() {
/* 8023CBF0-8023CC7C 237530 008C+00 1/0 0/0 0/0 .text fukiAlpha__14dMsgScrnBoss_cFf */
void dMsgScrnBoss_c::fukiAlpha(f32 i_alpha) {
mpPmp_c->setAlphaRate(i_alpha);
mpPmP_c->setAlphaRate(i_alpha);
mpBaseParent->setAlphaRate(i_alpha * g_MsgObject_HIO_c.mBossNameBaseAlpha);
for (int i = 0; i < 7; i++) {
src/d/msg/d_msg_scrn_howl.cpp
+6 -6
View File
@@ -451,7 +451,7 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() {
JUT_ASSERT(73, fg != false);
dPaneClass_showNullPane(mpScreen);
mpScreen->search('line00')->hide();
mpPmp_c = new CPaneMgr(mpScreen, 'n_all', 3, NULL);
mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 3, NULL);
JUT_ASSERT(79, mpPmP_c != 0);
mpScreen->search('ag_n')->hide();
field_0x1994 = 0.0f;
@@ -618,8 +618,8 @@ dMsgScrnHowl_c::~dMsgScrnHowl_c() {
delete mpScreen;
mpScreen = NULL;
delete mpPmp_c;
mpPmp_c = NULL;
delete mpPmP_c;
mpPmP_c = NULL;
for (int i = 0; i < 2; i++) {
delete mpButtonIcon[i];
@@ -683,7 +683,7 @@ void dMsgScrnHowl_c::exec() {
(this->*init_proc[field_0x2798])();
}
f32 dVar10 = mpPmp_c->getAlphaRate();
f32 dVar10 = mpPmP_c->getAlphaRate();
f32 fVar1;
f32 fVar2;
if (field_0x2798 == 3) {
@@ -869,12 +869,12 @@ void dMsgScrnHowl_c::fukiScale(f32 param_0) {
/* 80242038-8024205C 23C978 0024+00 1/0 0/0 0/0 .text fukiTrans__14dMsgScrnHowl_cFff */
void dMsgScrnHowl_c::fukiTrans(f32 param_0, f32 param_1) {
mpPmp_c->paneTrans(param_0, param_1);
mpPmP_c->paneTrans(param_0, param_1);
}
/* 8024205C-80242080 23C99C 0024+00 1/0 0/0 0/0 .text fukiAlpha__14dMsgScrnHowl_cFf */
void dMsgScrnHowl_c::fukiAlpha(f32 param_0) {
mpPmp_c->setAlphaRate(param_0);
mpPmP_c->setAlphaRate(param_0);
}
/* 80242080-802420D4 23C9C0 0054+00 0/0 1/1 0/0 .text isKeyCheck__14dMsgScrnHowl_cFv */
src/d/msg/d_msg_scrn_jimaku.cpp
+155 -248
View File
@@ -1,272 +1,179 @@
//
// Generated By: dol2asm
// Translation Unit: msg/scrn/d_msg_scrn_jimaku
//
/**
* d_msg_scrn_jimaku.cpp
*
*/
#include "d/msg/d_msg_scrn_jimaku.h"
#include "dol2asm.h"
#include "JSystem/J2DGraph/J2DGrafContext.h"
#include "JSystem/J2DGraph/J2DScreen.h"
#include "JSystem/J2DGraph/J2DTextBox.h"
#include "d/com/d_com_inf_game.h"
#include "d/msg/d_msg_object.h"
#include "d/msg/d_msg_scrn_light.h"
#include "d/pane/d_pane_class.h"
//
// Types:
//
struct dMsgScrnLight_c {
/* 80245934 */ dMsgScrnLight_c(u8, u8);
};
struct JKRExpHeap {};
struct dMsgScrnJimaku_c {
/* 80244558 */ dMsgScrnJimaku_c(u8, JKRExpHeap*);
/* 80244A74 */ ~dMsgScrnJimaku_c();
/* 80244C2C */ void exec();
/* 80244D34 */ void drawSelf();
/* 80244D8C */ void fukiAlpha(f32);
/* 80244E2C */ void fukiScale(f32);
/* 80244E30 */ void fukiTrans(f32, f32);
/* 80244E34 */ void fontAlpha(f32);
};
struct dMsgScrnBase_c {
/* 80238C40 */ void setSelectRubyString(char*, char*, char*);
/* 80238C44 */ void setSelectString(char*, char*, char*);
/* 80238C48 */ bool selectAnimeMove(u8, u8, bool);
/* 80238C50 */ void selectAnimeInit(u8, u8, f32, u8);
/* 80238C54 */ void arwAnimeMove();
/* 80238C58 */ void arwAnimeInit();
/* 80238C5C */ void fukiPosCalc(u8);
/* 80238C60 */ bool isSelect();
/* 80238C68 */ bool selectAnimeEnd();
/* 80238C70 */ void dotAnimeMove();
/* 80238C74 */ void dotAnimeInit();
/* 8023C0DC */ dMsgScrnBase_c();
/* 8023C124 */ ~dMsgScrnBase_c();
/* 8023C16C */ void init();
/* 8023C234 */ void multiDraw();
/* 8023C274 */ void draw();
/* 8023C32C */ void drawOutFont(f32, f32, f32);
/* 8023C574 */ void isTalkNow();
};
struct JUtility {
struct TColor {};
};
struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE548 */ void free(void*);
};
struct JKRArchive {};
struct J2DTextBox {
/* 8030074C */ void setString(s16, char const*, ...);
};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
};
struct CPaneMgrAlpha {
/* 802557D0 */ void setAlphaRate(f32);
};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802542E8 */ void getGlobalPosX();
/* 80254364 */ void getGlobalPosY();
/* 80254458 */ void setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 802545B0 */ void paneTrans(f32, f32);
};
//
// Forward References:
//
extern "C" void __ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap();
extern "C" void __dt__16dMsgScrnJimaku_cFv();
extern "C" void exec__16dMsgScrnJimaku_cFv();
extern "C" void drawSelf__16dMsgScrnJimaku_cFv();
extern "C" void fukiAlpha__16dMsgScrnJimaku_cFf();
extern "C" void fukiScale__16dMsgScrnJimaku_cFf();
extern "C" void fukiTrans__16dMsgScrnJimaku_cFff();
extern "C" void fontAlpha__16dMsgScrnJimaku_cFf();
extern "C" extern char const* const msg_scrn_d_msg_scrn_jimaku__stringBase0;
//
// External References:
//
SECTION_INIT void memset();
extern "C" void mDoExt_getMesgFont__Fv();
extern "C" void dComIfGp_getSubHeap2D__Fi();
extern "C" void setSelectRubyString__14dMsgScrnBase_cFPcPcPc();
extern "C" void setSelectString__14dMsgScrnBase_cFPcPcPc();
extern "C" bool selectAnimeMove__14dMsgScrnBase_cFUcUcb();
extern "C" void selectAnimeInit__14dMsgScrnBase_cFUcUcfUc();
extern "C" void arwAnimeMove__14dMsgScrnBase_cFv();
extern "C" void arwAnimeInit__14dMsgScrnBase_cFv();
extern "C" void fukiPosCalc__14dMsgScrnBase_cFUc();
extern "C" bool isSelect__14dMsgScrnBase_cFv();
extern "C" bool selectAnimeEnd__14dMsgScrnBase_cFv();
extern "C" void dotAnimeMove__14dMsgScrnBase_cFv();
extern "C" void dotAnimeInit__14dMsgScrnBase_cFv();
extern "C" void __ct__14dMsgScrnBase_cFv();
extern "C" void __dt__14dMsgScrnBase_cFv();
extern "C" void init__14dMsgScrnBase_cFv();
extern "C" void multiDraw__14dMsgScrnBase_cFv();
extern "C" void draw__14dMsgScrnBase_cFv();
extern "C" void drawOutFont__14dMsgScrnBase_cFfff();
extern "C" void isTalkNow__14dMsgScrnBase_cFv();
extern "C" void __ct__15dMsgScrnLight_cFUcUc();
extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap();
extern "C" void getGlobalPosX__8CPaneMgrFv();
extern "C" void getGlobalPosY__8CPaneMgrFv();
extern "C" void setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor();
extern "C" void paneTrans__8CPaneMgrFff();
extern "C" void dPaneClass_showNullPane__FP9J2DScreen();
extern "C" void setAlphaRate__13CPaneMgrAlphaFf();
extern "C" void alloc__7JKRHeapFUli();
extern "C" void free__7JKRHeapFPv();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void __ct__9J2DScreenFv();
extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive();
extern "C" void setString__10J2DTextBoxFsPCce();
extern "C" void _savegpr_23();
extern "C" void _savegpr_24();
extern "C" void _savegpr_27();
extern "C" void _savegpr_28();
extern "C" void _restgpr_23();
extern "C" void _restgpr_24();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_MsgObject_HIO_c[1040];
//
// Declarations:
//
/* ############################################################################################## */
/* 80399A80-80399A80 0260E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80399A80 = "zelda_jimaku_message_text.blo";
SECTION_DEAD static char const* const stringBase_80399A9E = "";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_80399A9F = "";
#pragma pop
/* 803C11E8-803C1240 01E308 0058+00 2/2 0/0 0/0 .data __vt__16dMsgScrnJimaku_c */
SECTION_DATA extern void* __vt__16dMsgScrnJimaku_c[22] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)draw__14dMsgScrnBase_cFv,
(void*)__dt__16dMsgScrnJimaku_cFv,
(void*)exec__16dMsgScrnJimaku_cFv,
(void*)multiDraw__14dMsgScrnBase_cFv,
(void*)drawSelf__16dMsgScrnJimaku_cFv,
(void*)setSelectString__14dMsgScrnBase_cFPcPcPc,
(void*)setSelectRubyString__14dMsgScrnBase_cFPcPcPc,
(void*)arwAnimeInit__14dMsgScrnBase_cFv,
(void*)arwAnimeMove__14dMsgScrnBase_cFv,
(void*)dotAnimeInit__14dMsgScrnBase_cFv,
(void*)dotAnimeMove__14dMsgScrnBase_cFv,
(void*)isSelect__14dMsgScrnBase_cFv,
(void*)selectAnimeInit__14dMsgScrnBase_cFUcUcfUc,
(void*)selectAnimeMove__14dMsgScrnBase_cFUcUcb,
(void*)selectAnimeEnd__14dMsgScrnBase_cFv,
(void*)fukiScale__16dMsgScrnJimaku_cFf,
(void*)fukiTrans__16dMsgScrnJimaku_cFff,
(void*)fukiAlpha__16dMsgScrnJimaku_cFf,
(void*)fontAlpha__16dMsgScrnJimaku_cFf,
(void*)fukiPosCalc__14dMsgScrnBase_cFUc,
};
/* 80454CB0-80454CB4 0032B0 0004+00 2/2 0/0 0/0 .sdata2 @3941 */
SECTION_SDATA2 static u8 lit_3941[4] = {
0x00,
0x00,
0x00,
0x00,
};
/* 80454CB4-80454CB8 0032B4 0004+00 1/1 0/0 0/0 .sdata2 @3942 */
SECTION_SDATA2 static f32 lit_3942 = 6.0f / 5.0f;
extern "C" extern dMsgObject_HIO_c g_MsgObject_HIO_c;
/* 80244558-80244A74 23EE98 051C+00 0/0 1/1 0/0 .text __ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* param_1) {
nofralloc
#include "asm/msg/scrn/d_msg_scrn_jimaku/__ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap.s"
dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) {
if (i_heap != NULL) {
heap = i_heap;
} else {
heap = dComIfGp_getSubHeap2D(7);
}
init();
mpScreen = new J2DScreen();
JUT_ASSERT(mpScreen != 0);
bool fg = mpScreen->setPriority("zelda_jimaku_message_text.blo", 0x20000,
dComIfGp_getMsgCommonArchive());
JUT_ASSERT(fg != false);
dPaneClass_showNullPane(mpScreen);
mpLight_c = new dMsgScrnLight_c(0, param_0);
JUT_ASSERT(mpLight_c != 0);
void* mpBuf = heap->alloc(0x106A, 0x20);
JUT_ASSERT(mpBuf != 0);
memset(mpBuf, 0, 0x106A);
mCharInfoPtr = (CharInfo_c*)mpBuf;
mpPmP_c = new CPaneMgr(mpScreen, 'mg_null', 3, NULL);
JUT_ASSERT(mpPmP_c != 0);
mpPmP_c->scale(g_MsgObject_HIO_c.mSubtitleScaleX, g_MsgObject_HIO_c.mSubtitleScaleY);
field_0xcc = g_MsgObject_HIO_c.mBoxPos[0][5];
mpPmP_c->paneTrans(0.0f, field_0xcc);
mpTm_c[0] = new CPaneMgr(mpScreen, 'mg_e4lin', 0, NULL);
JUT_ASSERT(mpTm_c[0] != 0);
mpTm_c[1] = new CPaneMgr(mpScreen, 't4_s', 0, NULL);
JUT_ASSERT(mpTm_c[1] != 0);
mpScreen->search('n_3line')->hide();
mpScreen->search('n_3fline')->hide();
mpScreen->search('n_e4line')->show();
for (int i = 0; i < 2; i++) {
((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpTm_c[i]->getPanePtr())->setString(0x200, "");
mpTm_c[i]->setBlackWhite(g_MsgObject_HIO_c.mBoxStartBlack[4 + (i * 10)],
g_MsgObject_HIO_c.mBoxStartWhite[4 + (i * 10)]);
if (mpTmr_c[i] != NULL) {
((J2DTextBox*)mpTmr_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpTmr_c[i]->getPanePtr())->setString(0x200, "");
mpTmr_c[i]->setBlackWhite(g_MsgObject_HIO_c.mBoxStartBlack[4 + (i * 10)],
g_MsgObject_HIO_c.mBoxStartWhite[4 + (i * 10)]);
}
}
((J2DTextBox*)mpTm_c[0]->getPanePtr())->getFontSize(mFontSize);
mTBoxWidth = mpTm_c[0]->getSizeX();
mTBoxHeight = mpTm_c[0]->getSizeY();
mLineSpace = ((J2DTextBox*)mpTm_c[0]->getPanePtr())->getLineSpace();
mCharSpace = ((J2DTextBox*)mpTm_c[0]->getPanePtr())->getCharSpace();
for (int i = 0; i < 2; i++) {
((J2DTextBox*)mpTm_c[i]->getPanePtr())->setLineSpace(mLineSpace);
mpTm_c[i]->resize(mpTm_c[i]->getSizeX() * 1.2f, mpTm_c[i]->getSizeY());
}
mTextBoxPosX = mpTm_c[0]->getGlobalPosX();
mTextBoxPosY = mpTm_c[0]->getGlobalPosY();
for (int i = 0; i < 2; i++) {
if (mpTmr_c[i] != NULL) {
((J2DTextBox*)mpTmr_c[i]->getPanePtr())->setLineSpace(mLineSpace);
if (i == 0) {
J2DTextBox::TFontSize font_size;
((J2DTextBox*)mpTmr_c[0]->getPanePtr())->getFontSize(font_size);
mRubySize = font_size.mSizeX;
mRubyCharSpace = ((J2DTextBox*)mpTmr_c[0]->getPanePtr())->getCharSpace();
}
mpTmr_c[i]->resize(mpTmr_c[i]->getSizeX() * 1.2f, mpTmr_c[i]->getSizeY());
}
}
}
#pragma pop
/* 80244A74-80244C2C 23F3B4 01B8+00 1/0 0/0 0/0 .text __dt__16dMsgScrnJimaku_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dMsgScrnJimaku_c::~dMsgScrnJimaku_c() {
nofralloc
#include "asm/msg/scrn/d_msg_scrn_jimaku/__dt__16dMsgScrnJimaku_cFv.s"
}
#pragma pop
dMsgScrnJimaku_c::~dMsgScrnJimaku_c() {
delete mpScreen;
mpScreen = NULL;
/* ############################################################################################## */
/* 80454CB8-80454CC0 0032B8 0004+04 2/2 0/0 0/0 .sdata2 @4021 */
SECTION_SDATA2 static f32 lit_4021[1 + 1 /* padding */] = {
1.0f,
/* padding */
0.0f,
};
delete mpLight_c;
mpLight_c = NULL;
if (mCharInfoPtr != NULL) {
heap->free(mCharInfoPtr);
mCharInfoPtr = NULL;
}
delete mpPmP_c;
mpPmP_c = NULL;
for (int i = 0; i < 2; i++) {
delete mpTm_c[i];
mpTm_c[i] = NULL;
if (mpTmr_c[i] != NULL) {
delete mpTmr_c[i];
mpTmr_c[i] = NULL;
}
}
dComIfGp_getMsgArchive(0)->removeResourceAll();
dComIfGp_getMsgArchive(1)->removeResourceAll();
dComIfGp_getMsgCommonArchive()->removeResourceAll();
}
/* 80244C2C-80244D34 23F56C 0108+00 1/0 0/0 0/0 .text exec__16dMsgScrnJimaku_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgScrnJimaku_c::exec() {
nofralloc
#include "asm/msg/scrn/d_msg_scrn_jimaku/exec__16dMsgScrnJimaku_cFv.s"
void dMsgScrnJimaku_c::exec() {
if (isTalkNow()) {
fukiAlpha(1.0f);
}
mpPmP_c->scale(g_MsgObject_HIO_c.mSubtitleScaleX, g_MsgObject_HIO_c.mSubtitleScaleY);
for (int i = 0; i < 2; i++) {
mpTm_c[i]->setBlackWhite(g_MsgObject_HIO_c.mBoxStartBlack[4 + (i * 10)],
g_MsgObject_HIO_c.mBoxStartWhite[4 + (i * 10)]);
if (mpTmr_c[i] != NULL) {
mpTmr_c[i]->setBlackWhite(g_MsgObject_HIO_c.mBoxStartBlack[4 + (i * 10)],
g_MsgObject_HIO_c.mBoxStartWhite[4 + (i * 10)]);
}
}
}
#pragma pop
/* 80244D34-80244D8C 23F674 0058+00 1/0 0/0 0/0 .text drawSelf__16dMsgScrnJimaku_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgScrnJimaku_c::drawSelf() {
nofralloc
#include "asm/msg/scrn/d_msg_scrn_jimaku/drawSelf__16dMsgScrnJimaku_cFv.s"
void dMsgScrnJimaku_c::drawSelf() {
dComIfGp_getCurrentGrafPort()->setup2D();
drawOutFont(0.0f, 0.0f, 1.0f);
}
#pragma pop
/* 80244D8C-80244E2C 23F6CC 00A0+00 1/0 0/0 0/0 .text fukiAlpha__16dMsgScrnJimaku_cFf */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgScrnJimaku_c::fukiAlpha(f32 param_0) {
nofralloc
#include "asm/msg/scrn/d_msg_scrn_jimaku/fukiAlpha__16dMsgScrnJimaku_cFf.s"
void dMsgScrnJimaku_c::fukiAlpha(f32 i_alpha) {
mpPmP_c->setAlphaRate(i_alpha * g_MsgObject_HIO_c.mSubtitleAlphaP);
for (int i = 0; i < 2; i++) {
mpTm_c[i]->setAlphaRate(i_alpha * mCharAlphaRate);
if (mpTmr_c[i] != NULL) {
mpTmr_c[i]->setAlphaRate(i_alpha * mCharAlphaRate);
}
}
}
#pragma pop
/* 80244E2C-80244E30 23F76C 0004+00 1/0 0/0 0/0 .text fukiScale__16dMsgScrnJimaku_cFf */
void dMsgScrnJimaku_c::fukiScale(f32 param_0) {
/* empty function */
}
void dMsgScrnJimaku_c::fukiScale(f32 i_scale) {}
/* 80244E30-80244E34 23F770 0004+00 1/0 0/0 0/0 .text fukiTrans__16dMsgScrnJimaku_cFff */
void dMsgScrnJimaku_c::fukiTrans(f32 param_0, f32 param_1) {
/* empty function */
}
void dMsgScrnJimaku_c::fukiTrans(f32 i_posX, f32 i_posY) {}
/* 80244E34-80244E38 23F774 0004+00 1/0 0/0 0/0 .text fontAlpha__16dMsgScrnJimaku_cFf */
void dMsgScrnJimaku_c::fontAlpha(f32 param_0) {
/* empty function */
}
/* 80399A80-80399A80 0260E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
void dMsgScrnJimaku_c::fontAlpha(f32 i_alpha) {}
src/d/msg/d_msg_scrn_kanban.cpp
+10 -10
View File
@@ -42,14 +42,14 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) {
field_0xd0->searchUpdateMaterialID(mpScreen);
field_0xd8 = 0.0f;
mpPmp_c = new CPaneMgr(mpScreen, 'n_size', 2, NULL);
JUT_ASSERT(60, mpPmp_c != 0);
mpPmp_c->getPanePtr()->setAnimation(field_0xcc);
mpPmP_c = new CPaneMgr(mpScreen, 'n_size', 2, NULL);
JUT_ASSERT(60, mpPmP_c != 0);
mpPmP_c->getPanePtr()->setAnimation(field_0xcc);
field_0xcc->setFrame(1.0f);
mpPmp_c->getPanePtr()->animationTransform();
mpPmp_c->getPanePtr()->setAnimation((J2DAnmTransform*)NULL);
mpPmp_c->scale(g_MsgObject_HIO_c.mBoxStoneScaleX, g_MsgObject_HIO_c.mBoxStoneScaleY);
mpPmP_c->getPanePtr()->animationTransform();
mpPmP_c->getPanePtr()->setAnimation((J2DAnmTransform*)NULL);
mpPmP_c->scale(g_MsgObject_HIO_c.mBoxStoneScaleX, g_MsgObject_HIO_c.mBoxStoneScaleY);
mpBack_c = new CPaneMgr(mpScreen, 'back_b', 0, NULL);
JUT_ASSERT(68, mpBack_c != 0);
@@ -109,8 +109,8 @@ dMsgScrnKanban_c::~dMsgScrnKanban_c() {
delete field_0xd0;
field_0xd0 = NULL;
delete mpPmp_c;
mpPmp_c = NULL;
delete mpPmP_c;
mpPmP_c = NULL;
delete mpBack_c;
mpBack_c = NULL;
@@ -144,7 +144,7 @@ void dMsgScrnKanban_c::exec() {
fukiAlpha(1.0f);
}
mpPmp_c->scale(g_MsgObject_HIO_c.mBoxStoneScaleX, g_MsgObject_HIO_c.mBoxStoneScaleY);
mpPmP_c->scale(g_MsgObject_HIO_c.mBoxStoneScaleX, g_MsgObject_HIO_c.mBoxStoneScaleY);
}
/* 80245618-802456A0 23FF58 0088+00 1/0 0/0 0/0 .text draw__16dMsgScrnKanban_cFv */
@@ -158,7 +158,7 @@ void dMsgScrnKanban_c::draw() {
/* 802456A0-80245754 23FFE0 00B4+00 1/0 0/0 0/0 .text fukiAlpha__16dMsgScrnKanban_cFf */
void dMsgScrnKanban_c::fukiAlpha(f32 param_0) {
mpBack_c->setAlphaRate(param_0);
mpPmp_c->setAlphaRate(param_0 * g_MsgObject_HIO_c.mBoxStoneAlphaP);
mpPmP_c->setAlphaRate(param_0 * g_MsgObject_HIO_c.mBoxStoneAlphaP);
mpSpot_c->setAlphaRate(param_0);
for (int i = 0; i < 3; i++) {
src/d/msg/d_msg_scrn_place.cpp
+6 -6
View File
@@ -31,8 +31,8 @@ dMsgScrnPlace_c::dMsgScrnPlace_c() {
mpScreen->setPriority("zelda_stage_title_foreign.blo", 0x20000, dComIfGp_getMsgArchive(4));
dPaneClass_showNullPane(mpScreen);
mpPmp_c = new CPaneMgr(mpScreen, 'n_all', 2, NULL);
mpPmp_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY);
mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 2, NULL);
mpPmP_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY);
mpFontParent = new CPaneMgr(mpScreen, 's_font_n', 0, NULL);
mpFontParent->scale(g_MsgObject_HIO_c.mStageTitleCharSizeX,
@@ -74,8 +74,8 @@ dMsgScrnPlace_c::~dMsgScrnPlace_c() {
delete mpScreen;
mpScreen = NULL;
delete mpPmp_c;
mpPmp_c = NULL;
delete mpPmP_c;
mpPmP_c = NULL;
delete mpFontParent;
mpFontParent = NULL;
@@ -93,7 +93,7 @@ dMsgScrnPlace_c::~dMsgScrnPlace_c() {
/* 80246924-80246A44 241264 0120+00 1/0 0/0 0/0 .text exec__15dMsgScrnPlace_cFv */
void dMsgScrnPlace_c::exec() {
mpPmp_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY);
mpPmP_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY);
mpFontParent->scale(g_MsgObject_HIO_c.mStageTitleCharSizeX,
g_MsgObject_HIO_c.mStageTitleCharSizeY);
@@ -119,7 +119,7 @@ void dMsgScrnPlace_c::drawSelf() {
/* 80246A9C-80246B28 2413DC 008C+00 1/0 0/0 0/0 .text fukiAlpha__15dMsgScrnPlace_cFf */
void dMsgScrnPlace_c::fukiAlpha(f32 i_rate) {
mpPmp_c->setAlphaRate(i_rate);
mpPmP_c->setAlphaRate(i_rate);
mpBaseParent->setAlphaRate(i_rate * g_MsgObject_HIO_c.mStageTitleBaseAlpha);
for (int i = 0; i < 7; i++) {
src/d/msg/d_msg_scrn_staff.cpp
+5 -5
View File
@@ -27,7 +27,7 @@ dMsgScrnStaff_c::dMsgScrnStaff_c(u8 unused) {
mpScreen->setPriority("zelda_staff_roll.blo", 0x20000, dComIfGp_getMsgArchive(6));
dPaneClass_showNullPane(mpScreen);
mpPmp_c = new CPaneMgr(mpScreen, 'ROOT', 2, NULL);
mpPmP_c = new CPaneMgr(mpScreen, 'ROOT', 2, NULL);
mpScreen->search('left_n')->hide();
mpScreen->search('right_n')->hide();
@@ -58,8 +58,8 @@ dMsgScrnStaff_c::~dMsgScrnStaff_c() {
delete mpScreen;
mpScreen = NULL;
delete mpPmp_c;
mpPmp_c = NULL;
delete mpPmP_c;
mpPmP_c = NULL;
for (int i = 0; i < 6; i++) {
delete mpTm_c[i];
@@ -71,7 +71,7 @@ dMsgScrnStaff_c::~dMsgScrnStaff_c() {
/* 80246EE8-80246F68 241828 0080+00 1/0 0/0 0/0 .text exec__15dMsgScrnStaff_cFv */
void dMsgScrnStaff_c::exec() {
mpPmp_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY);
mpPmP_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY);
if (isTalkNow()) {
fukiAlpha(1.0f);
}
@@ -86,7 +86,7 @@ void dMsgScrnStaff_c::drawSelf() {
/* 80246FC0-80246FE4 241900 0024+00 1/0 0/0 0/0 .text fukiAlpha__15dMsgScrnStaff_cFf */
void dMsgScrnStaff_c::fukiAlpha(f32 i_rate) {
mpPmp_c->setAlphaRate(i_rate);
mpPmP_c->setAlphaRate(i_rate);
}
/* 80246FE4-80246FE8 241924 0004+00 1/0 0/0 0/0 .text fukiScale__15dMsgScrnStaff_cFf */
src/d/msg/d_msg_scrn_tree.cpp
+9 -9
View File
@@ -46,12 +46,12 @@ dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) {
field_0xd4->searchUpdateMaterialID(mpScreen);
field_0xe0 = 0.0f;
mpPmp_c = new CPaneMgr(mpScreen, 'n_size', 2, NULL);
mpPmp_c->getPanePtr()->setAnimation(field_0xcc);
mpPmP_c = new CPaneMgr(mpScreen, 'n_size', 2, NULL);
mpPmP_c->getPanePtr()->setAnimation(field_0xcc);
field_0xcc->setFrame(1.0f);
mpPmp_c->getPanePtr()->animationTransform();
mpPmp_c->getPanePtr()->setAnimation((J2DAnmTransform*)NULL);
mpPmp_c->scale(g_MsgObject_HIO_c.mBoxWoodScaleX, g_MsgObject_HIO_c.mBoxWoodScaleY);
mpPmP_c->getPanePtr()->animationTransform();
mpPmP_c->getPanePtr()->setAnimation((J2DAnmTransform*)NULL);
mpPmP_c->scale(g_MsgObject_HIO_c.mBoxWoodScaleX, g_MsgObject_HIO_c.mBoxWoodScaleY);
field_0xc4 = new CPaneMgr(mpScreen, 'back_b', 0, NULL);
field_0xc8 = new CPaneMgr(mpScreen, 'spot00', 0, NULL);
@@ -112,8 +112,8 @@ dMsgScrnTree_c::~dMsgScrnTree_c() {
delete field_0xd4;
field_0xd4 = NULL;
delete mpPmp_c;
mpPmp_c = NULL;
delete mpPmP_c;
mpPmP_c = NULL;
delete field_0xc4;
field_0xc4 = NULL;
@@ -152,7 +152,7 @@ void dMsgScrnTree_c::exec() {
if (isTalkNow()) {
fukiAlpha(1.0f);
}
mpPmp_c->scale(g_MsgObject_HIO_c.mBoxWoodScaleX, g_MsgObject_HIO_c.mBoxWoodScaleY);
mpPmP_c->scale(g_MsgObject_HIO_c.mBoxWoodScaleX, g_MsgObject_HIO_c.mBoxWoodScaleY);
}
/* 80249270-802492F8 243BB0 0088+00 1/0 0/0 0/0 .text draw__14dMsgScrnTree_cFv */
@@ -166,7 +166,7 @@ void dMsgScrnTree_c::draw() {
/* 802492F8-802493AC 243C38 00B4+00 1/0 0/0 0/0 .text fukiAlpha__14dMsgScrnTree_cFf */
void dMsgScrnTree_c::fukiAlpha(f32 param_0) {
field_0xc4->setAlphaRate(param_0);
mpPmp_c->setAlphaRate(param_0 * g_MsgObject_HIO_c.mBoxWoodAlphaP);
mpPmP_c->setAlphaRate(param_0 * g_MsgObject_HIO_c.mBoxWoodAlphaP);
field_0xc8->setAlphaRate(param_0);
for (int i = 0; i < 3; i++) {