summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhatal175 <hatal175@users.noreply.github.com>2024-08-12 09:27:55 +0300
committerGitHub <noreply@github.com>2024-08-11 23:27:55 -0700
commit2fa4bf9f51942e893d9f0a9d20d23b9b118fd48f (patch)
treebfd48a04e50d34e87c3a0ef3578aa6b79dd2b91e /src
parent7894ea5140a30c8241efe465a0442eab6b789984 (diff)
dMsgScrnHowl_c OK (#2189)
Diffstat (limited to 'src')
-rw-r--r--src/d/msg/d_msg_scrn_howl.cpp915
1 files changed, 268 insertions, 647 deletions
diff --git a/src/d/msg/d_msg_scrn_howl.cpp b/src/d/msg/d_msg_scrn_howl.cpp
index 2b5cd4fe83..db30ff23a1 100644
--- a/src/d/msg/d_msg_scrn_howl.cpp
+++ b/src/d/msg/d_msg_scrn_howl.cpp
@@ -1,160 +1,28 @@
//
-// Generated By: dol2asm
-// Translation Unit: msg/scrn/d_msg_scrn_howl
+// Howl Screen
//
#include "d/msg/d_msg_scrn_howl.h"
#include "m_Do/m_Do_controller_pad.h"
+#include "m_Do/m_Do_graphic.h"
#include "d/msg/d_msg_object.h"
#include "d/pane/d_pane_class.h"
#include "d/a/d_a_alink.h"
+#include "d/meter/d_meter2.h"
+#include "d/meter/d_meter2_draw.h"
#include "JSystem/JUtility/JUTTexture.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/J2DGraph/J2DGrafContext.h"
#include "JSystem/J2DGraph/J2DScreen.h"
#include "Z2AudioLib/Z2WolfHowlMgr.h"
-#include "dol2asm.h"
-
-//
-// Forward References:
-//
-
-extern "C" void __ct__14dMsgScrnHowl_cFv();
-extern "C" void __dt__14dMsgScrnHowl_cFv();
-extern "C" void exec__14dMsgScrnHowl_cFv();
-extern "C" void drawSelf__14dMsgScrnHowl_cFv();
-extern "C" void guide_on_init__14dMsgScrnHowl_cFv();
-extern "C" void guide_on_proc__14dMsgScrnHowl_cFv();
-extern "C" void guide_off_init__14dMsgScrnHowl_cFv();
-extern "C" void guide_off_proc__14dMsgScrnHowl_cFv();
-extern "C" void guide_stop_init__14dMsgScrnHowl_cFv();
-extern "C" void guide_stop_proc__14dMsgScrnHowl_cFv();
-extern "C" void guide_demo_play_init__14dMsgScrnHowl_cFv();
-extern "C" void guide_demo_play_proc__14dMsgScrnHowl_cFv();
-extern "C" void guide_off_test_init__14dMsgScrnHowl_cFv();
-extern "C" void guide_off_test_proc__14dMsgScrnHowl_cFv();
-extern "C" void fukiScale__14dMsgScrnHowl_cFf();
-extern "C" void fukiTrans__14dMsgScrnHowl_cFff();
-extern "C" void fukiAlpha__14dMsgScrnHowl_cFf();
-extern "C" void isKeyCheck__14dMsgScrnHowl_cFv();
-extern "C" void resetLine__14dMsgScrnHowl_cFv();
-extern "C" void drawWave__14dMsgScrnHowl_cFv();
-extern "C" void drawGuide__14dMsgScrnHowl_cFv();
-extern "C" void drawGuide2__14dMsgScrnHowl_cFv();
-extern "C" void drawEffect__14dMsgScrnHowl_cFv();
-extern "C" void calcMain__14dMsgScrnHowl_cFv();
-extern "C" void calcWave__14dMsgScrnHowl_cFv();
-extern "C" void calcGuide__14dMsgScrnHowl_cFv();
-extern "C" void moveLineV__14dMsgScrnHowl_cFb();
-extern "C" void moveBaseLength__14dMsgScrnHowl_cFb();
-extern "C" void getOnLineNum__14dMsgScrnHowl_cFi();
-extern "C" void addCount__14dMsgScrnHowl_cFs();
-extern "C" void addCountGuide__14dMsgScrnHowl_cFs();
-extern "C" void getNowPlotPitch__14dMsgScrnHowl_cFf();
-extern "C" void getPlotPitch__14dMsgScrnHowl_cFf();
-extern "C" void calcPitchLevel__14dMsgScrnHowl_cFv();
-extern "C" void initGuideData__14dMsgScrnHowl_cFv();
-extern "C" void getGuideDataSize__14dMsgScrnHowl_cFv();
-extern "C" void getGuideDataType__14dMsgScrnHowl_cFi();
-extern "C" void __sinit_d_msg_scrn_howl_cpp();
-extern "C" extern char const* const msg_scrn_d_msg_scrn_howl__stringBase0;
-
-//
-// External References:
-//
-
-extern "C" void mDoExt_getMesgFont__Fv();
-extern "C" void
-drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc();
-extern "C" void getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c();
-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 fontAlpha__14dMsgScrnBase_cFf();
-extern "C" void __ct__8CPaneMgrFv();
-extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap();
-extern "C" void __dt__8CPaneMgrFv();
-extern "C" void getGlobalPosX__8CPaneMgrFv();
-extern "C" void getGlobalPosY__8CPaneMgrFv();
-extern "C" void paneTrans__8CPaneMgrFff();
-extern "C" void getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs();
-extern "C" void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs();
-extern "C" void dPaneClass_showNullPane__FP9J2DScreen();
-extern "C" void setAlphaRate__13CPaneMgrAlphaFf();
-extern "C" void getAlphaRate__13CPaneMgrAlphaFv();
-extern "C" void cLib_addCalc2__FPffff();
-extern "C" void getNowInputValue__13Z2WolfHowlMgrFv();
-extern "C" void getCorrectLine__13Z2WolfHowlMgrFUc();
-extern "C" void getCorrectLineNum__13Z2WolfHowlMgrFv();
-extern "C" void getOnLineNum__13Z2WolfHowlMgrFv();
-extern "C" void startGuideMelody__13Z2WolfHowlMgrFb();
-extern "C" void* __nw__FUl();
-extern "C" void __dl__FPv();
-extern "C" void func_802E90C0();
-extern "C" void getBounds__7J2DPaneFv();
-extern "C" void __ct__9J2DScreenFv();
-extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive();
-extern "C" void __ct__10J2DPictureFPC7ResTIMG();
-extern "C" void getStringPtr__10J2DTextBoxCFv();
-extern "C" void setString__10J2DTextBoxFsPCce();
-extern "C" void __ptmf_scall();
-extern "C" void _savegpr_21();
-extern "C" void _savegpr_23();
-extern "C" void _savegpr_24();
-extern "C" void _savegpr_26();
-extern "C" void _savegpr_27();
-extern "C" void _savegpr_28();
-extern "C" void _savegpr_29();
-extern "C" void _restgpr_21();
-extern "C" void _restgpr_23();
-extern "C" void _restgpr_24();
-extern "C" void _restgpr_26();
-extern "C" void _restgpr_27();
-extern "C" void _restgpr_28();
-extern "C" void _restgpr_29();
-extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
-
-extern dMsgObject_HIO_c g_MsgObject_HIO_c;
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 80399A20-80399A20 026080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_80399A20 = "zelda_wolf_howl.blo";
-SECTION_DEAD static char const* const stringBase_80399A34 = "";
-SECTION_DEAD static char const* const stringBase_80399A35 = "tt_ginnouroko_s3tc.bti";
-SECTION_DEAD static char const* const stringBase_80399A4C = "tt_black_32.bti";
-SECTION_DEAD static char const* const stringBase_80399A5C = "tt_iastarRR.bti";
-SECTION_DEAD static char const* const stringBase_80399A6C = "tt_block8x8.bti";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_80399A7C = "\0\0\0";
-#pragma pop
/* 803C0FD0-803C0FDC 01E0F0 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */
-SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
+static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
typedef void (dMsgScrnHowl_c::*dMsgScrnHowl_cFunc)();
-#ifdef NONMATCHING
static dMsgScrnHowl_cFunc init_proc[5] = {
&dMsgScrnHowl_c::guide_on_init,
&dMsgScrnHowl_c::guide_off_init,
@@ -162,69 +30,7 @@ static dMsgScrnHowl_cFunc init_proc[5] = {
&dMsgScrnHowl_c::guide_demo_play_init,
&dMsgScrnHowl_c::guide_off_test_init,
};
-#else
-
-/* 803C0FDC-803C0FE8 -00001 000C+00 0/1 0/0 0/0 .data @4173 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_4173[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)guide_on_init__14dMsgScrnHowl_cFv,
-};
-#pragma pop
-/* 803C0FE8-803C0FF4 -00001 000C+00 0/1 0/0 0/0 .data @4174 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_4174[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)guide_off_init__14dMsgScrnHowl_cFv,
-};
-#pragma pop
-
-/* 803C0FF4-803C1000 -00001 000C+00 0/1 0/0 0/0 .data @4175 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_4175[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)guide_stop_init__14dMsgScrnHowl_cFv,
-};
-#pragma pop
-
-/* 803C1000-803C100C -00001 000C+00 0/1 0/0 0/0 .data @4176 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_4176[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)guide_demo_play_init__14dMsgScrnHowl_cFv,
-};
-#pragma pop
-
-/* 803C100C-803C1018 -00001 000C+00 0/1 0/0 0/0 .data @4177 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_4177[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)guide_off_test_init__14dMsgScrnHowl_cFv,
-};
-#pragma pop
-
-/* 803C1018-803C1054 01E138 003C+00 1/3 0/0 0/0 .data init_proc */
-SECTION_DATA static u8 init_proc[60] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-#endif
-
-#ifdef NONMATCHING
static dMsgScrnHowl_cFunc process[5] = {
&dMsgScrnHowl_c::guide_on_proc,
&dMsgScrnHowl_c::guide_off_proc,
@@ -232,217 +38,30 @@ static dMsgScrnHowl_cFunc process[5] = {
&dMsgScrnHowl_c::guide_demo_play_proc,
&dMsgScrnHowl_c::guide_off_test_proc,
};
-#else
-/* 803C1054-803C1060 -00001 000C+00 0/1 0/0 0/0 .data @4178 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_4178[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)guide_on_proc__14dMsgScrnHowl_cFv,
-};
-#pragma pop
-
-/* 803C1060-803C106C -00001 000C+00 0/1 0/0 0/0 .data @4179 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_4179[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)guide_off_proc__14dMsgScrnHowl_cFv,
-};
-#pragma pop
-
-/* 803C106C-803C1078 -00001 000C+00 0/1 0/0 0/0 .data @4180 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_4180[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)guide_stop_proc__14dMsgScrnHowl_cFv,
-};
-#pragma pop
-
-/* 803C1078-803C1084 -00001 000C+00 0/1 0/0 0/0 .data @4181 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_4181[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)guide_demo_play_proc__14dMsgScrnHowl_cFv,
-};
-#pragma pop
-
-/* 803C1084-803C1090 -00001 000C+00 0/1 0/0 0/0 .data @4182 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_4182[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)guide_off_test_proc__14dMsgScrnHowl_cFv,
-};
-#pragma pop
-
-/* 803C1090-803C10D0 01E1B0 003C+04 1/2 0/0 0/0 .data process */
-SECTION_DATA static u8 process[60 + 4 /* padding */] = {
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- 0x00,
- /* padding */
- 0x00,
- 0x00,
- 0x00,
- 0x00,
-};
-#endif
/* 803C10D0-803C10E8 01E1F0 0018+00 0/1 0/0 0/0 .data ylinen_tag$4210 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u64 ylinen_tag[3] = {
+static u64 ylinen_tag[3] = {
'ylinen00',
'ylinen02',
'ylinen04',
};
-#pragma pop
/* 803C10E8-803C1120 01E208 0038+00 0/1 0/0 0/0 .data tlinen_tag$4211 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u64 tlinen_tag[7] = {
+static u64 tlinen_tag[7] = {
'tlinen00', 'tlinen01', 'tlinen02', 'tlinen03', 'tlinen04', 'tlinen05', 'tlinen06',
};
-#pragma pop
/* 803C1120-803C1158 01E240 0038+00 0/0 0/0 0/0 .data tline_tag$4212 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u64 tline_tag[7] = {
+static u64 tline_tag[7] = {
'tline00', 'tline01', 'tline02', 'tline03', 'tlinen04', 'tline05', 'tline06',
};
-#pragma pop
/* 803C1158-803C1190 01E278 0038+00 0/0 0/0 0/0 .data tlines_tag$4213 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u64 tlines_tag[7] = {
+static u64 tlines_tag[7] = {
'tlines00', 'tlines01', 'tlines02', 'tlines03', 'tlines04', 'tlines05', 'tlines06',
};
-#pragma pop
-
-/* 803C1190-803C11E8 01E2B0 0058+00 2/2 0/0 0/0 .data __vt__14dMsgScrnHowl_c */
-SECTION_DATA extern void* __vt__14dMsgScrnHowl_c[22] = {
- (void*)NULL /* RTTI */,
- (void*)NULL,
- (void*)draw__14dMsgScrnBase_cFv,
- (void*)__dt__14dMsgScrnHowl_cFv,
- (void*)exec__14dMsgScrnHowl_cFv,
- (void*)multiDraw__14dMsgScrnBase_cFv,
- (void*)drawSelf__14dMsgScrnHowl_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__14dMsgScrnHowl_cFf,
- (void*)fukiTrans__14dMsgScrnHowl_cFff,
- (void*)fukiAlpha__14dMsgScrnHowl_cFf,
- (void*)fontAlpha__14dMsgScrnBase_cFf,
- (void*)fukiPosCalc__14dMsgScrnBase_cFUc,
-};
-
-/* 80454C50-80454C54 003250 0004+00 14/14 0/0 0/0 .sdata2 @4427 */
-SECTION_SDATA2 static u8 lit_4427[4] = {
- 0x00,
- 0x00,
- 0x00,
- 0x00,
-};
-
-/* 80454C54-80454C58 003254 0004+00 1/1 0/0 0/0 .sdata2 @4428 */
-SECTION_SDATA2 static f32 lit_4428 = 350.0f;
-
-/* 80454C58-80454C5C 003258 0004+00 2/2 0/0 0/0 .sdata2 @4429 */
-SECTION_SDATA2 static f32 lit_4429 = 255.0f;
-
-/* 80454C5C-80454C60 00325C 0004+00 2/2 0/0 0/0 .sdata2 @4430 */
-SECTION_SDATA2 static f32 lit_4430 = 3.0f;
-
-/* 80454C60-80454C68 003260 0004+04 8/8 0/0 0/0 .sdata2 @4431 */
-SECTION_SDATA2 static f32 lit_4431[1 + 1 /* padding */] = {
- 1.0f,
- /* padding */
- 0.0f,
-};
-
-/* 80454C68-80454C70 003268 0008+00 4/4 0/0 0/0 .sdata2 @4434 */
-SECTION_SDATA2 static f64 lit_4434 = 4503601774854144.0 /* cast s32 to float */;
/* 8024096C-80241784 23B2AC 0E18+00 0/0 1/1 0/0 .text __ct__14dMsgScrnHowl_cFv */
-// Matches with literals (Maybe minor issue with tag arrays)
-#ifdef NONMATCHING
dMsgScrnHowl_c::dMsgScrnHowl_c() {
init();
mpScreen = new J2DScreen();
@@ -546,7 +165,7 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() {
JUT_ASSERT(242, mpLineH[i] != 0);
}
for (int i = 0; i < 7; i++) {
- mpLineV[i] = new CPaneMgr(mpScreen, tline_tag[i], 2, NULL);
+ mpLineV[i] = new CPaneMgr(mpScreen, tlinen_tag[i], 2, NULL);
JUT_ASSERT(247, mpLineV[i] != 0);
}
Mtx mtx2;
@@ -602,16 +221,6 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() {
}
resetLine();
}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm dMsgScrnHowl_c::dMsgScrnHowl_c() {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/__ct__14dMsgScrnHowl_cFv.s"
-}
-#pragma pop
-#endif
/* 80241784-80241A70 23C0C4 02EC+00 1/0 0/0 0/0 .text __dt__14dMsgScrnHowl_cFv */
dMsgScrnHowl_c::~dMsgScrnHowl_c() {
@@ -654,23 +263,7 @@ dMsgScrnHowl_c::~dMsgScrnHowl_c() {
dComIfGp_getMsgArchive(5)->removeResourceAll();;
}
-/* ############################################################################################## */
-/* 80454C70-80454C74 003270 0004+00 7/7 0/0 0/0 .sdata2 @4561 */
-SECTION_SDATA2 static f32 lit_4561 = 0.5f;
-
-/* 80454C74-80454C78 003274 0004+00 2/2 0/0 0/0 .sdata2 @4562 */
-SECTION_SDATA2 static f32 lit_4562 = 1.0f / 5.0f;
-
-/* 80454C78-80454C80 003278 0004+04 2/2 0/0 0/0 .sdata2 @4563 */
-SECTION_SDATA2 static f32 lit_4563[1 + 1 /* padding */] = {
- 1.0f / 10.0f,
- /* padding */
- 0.0f,
-};
-
/* 80241A70-80241C30 23C3B0 01C0+00 1/0 0/0 0/0 .text exec__14dMsgScrnHowl_cFv */
-// Matches with literals
-#ifdef NONMATCHING
void dMsgScrnHowl_c::exec() {
field_0x2799 = field_0x2798;
(this->*process[field_0x2798])();
@@ -683,7 +276,7 @@ void dMsgScrnHowl_c::exec() {
(this->*init_proc[field_0x2798])();
}
- f32 dVar10 = mpPmP_c->getAlphaRate();
+ f32 alphaRate = mpPmP_c->getAlphaRate();
f32 fVar1;
f32 fVar2;
if (field_0x2798 == 3) {
@@ -705,29 +298,13 @@ void dMsgScrnHowl_c::exec() {
field_0x1998 = fVar2;
}
}
- mpButtonIcon[0]->setAlphaRate(field_0x1994 * dVar10);
- mpButtonIcon[1]->setAlphaRate(field_0x1994 * dVar10);
- mpButtonText[0]->setAlphaRate(field_0x1998 * dVar10);
- mpButtonText[1]->setAlphaRate(field_0x1998 * dVar10);
-}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dMsgScrnHowl_c::exec() {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/exec__14dMsgScrnHowl_cFv.s"
+ mpButtonIcon[0]->setAlphaRate(field_0x1994 * alphaRate);
+ mpButtonIcon[1]->setAlphaRate(field_0x1994 * alphaRate);
+ mpButtonText[0]->setAlphaRate(field_0x1998 * alphaRate);
+ mpButtonText[1]->setAlphaRate(field_0x1998 * alphaRate);
}
-#pragma pop
-#endif
-
-/* ############################################################################################## */
-/* 80454C80-80454C88 003280 0008+00 6/6 0/0 0/0 .sdata2 @4587 */
-SECTION_SDATA2 static f64 lit_4587 = 4503599627370496.0 /* cast u32 to float */;
/* 80241C30-80241D58 23C570 0128+00 1/0 0/0 0/0 .text drawSelf__14dMsgScrnHowl_cFv */
-// Matches with literals
-#ifdef NONMATCHING
void dMsgScrnHowl_c::drawSelf() {
J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
GXGetScissor(&field_0x2114, &field_0x2118, &field_0x211c, &field_0x2120);
@@ -744,21 +321,10 @@ void dMsgScrnHowl_c::drawSelf() {
grafContext->scissor(field_0x2114, field_0x2118, field_0x211c, field_0x2120);
grafContext->setScissor();
}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dMsgScrnHowl_c::drawSelf() {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/drawSelf__14dMsgScrnHowl_cFv.s"
-}
-#pragma pop
-#endif
/* 80241D58-80241D5C 23C698 0004+00 1/0 0/0 0/0 .text guide_on_init__14dMsgScrnHowl_cFv
*/
void dMsgScrnHowl_c::guide_on_init() {
- /* empty function */
}
/* 80241D5C-80241DFC 23C69C 00A0+00 1/0 0/0 0/0 .text guide_on_proc__14dMsgScrnHowl_cFv
@@ -783,7 +349,6 @@ void dMsgScrnHowl_c::guide_on_proc() {
/* 80241DFC-80241E00 23C73C 0004+00 1/0 0/0 0/0 .text guide_off_init__14dMsgScrnHowl_cFv
*/
void dMsgScrnHowl_c::guide_off_init() {
- /* empty function */
}
/* 80241E00-80241E7C 23C740 007C+00 1/0 0/0 0/0 .text guide_off_proc__14dMsgScrnHowl_cFv
@@ -802,7 +367,6 @@ void dMsgScrnHowl_c::guide_off_proc() {
/* 80241E7C-80241E80 23C7BC 0004+00 1/0 0/0 0/0 .text guide_stop_init__14dMsgScrnHowl_cFv
*/
void dMsgScrnHowl_c::guide_stop_init() {
- /* empty function */
}
/* 80241E80-80241F28 23C7C0 00A8+00 1/0 0/0 0/0 .text guide_stop_proc__14dMsgScrnHowl_cFv
@@ -854,17 +418,14 @@ void dMsgScrnHowl_c::guide_demo_play_proc() {
/* 8024202C-80242030 23C96C 0004+00 1/0 0/0 0/0 .text guide_off_test_init__14dMsgScrnHowl_cFv */
void dMsgScrnHowl_c::guide_off_test_init() {
- /* empty function */
}
/* 80242030-80242034 23C970 0004+00 1/0 0/0 0/0 .text guide_off_test_proc__14dMsgScrnHowl_cFv */
void dMsgScrnHowl_c::guide_off_test_proc() {
- /* empty function */
}
/* 80242034-80242038 23C974 0004+00 1/0 0/0 0/0 .text fukiScale__14dMsgScrnHowl_cFf */
void dMsgScrnHowl_c::fukiScale(f32 param_0) {
- /* empty function */
}
/* 80242038-8024205C 23C978 0024+00 1/0 0/0 0/0 .text fukiTrans__14dMsgScrnHowl_cFff */
@@ -888,8 +449,6 @@ bool dMsgScrnHowl_c::isKeyCheck() {
}
/* 802420D4-80242198 23CA14 00C4+00 5/5 0/0 0/0 .text resetLine__14dMsgScrnHowl_cFv */
-// Matches with literals
-#ifdef NONMATCHING
void dMsgScrnHowl_c::resetLine() {
field_0x2195 = 0;
field_0x2128 = 0;
@@ -914,39 +473,8 @@ void dMsgScrnHowl_c::resetLine() {
moveBaseLength(true);
field_0x2138 = getGuideDataSize();
}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dMsgScrnHowl_c::resetLine() {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/resetLine__14dMsgScrnHowl_cFv.s"
-}
-#pragma pop
-#endif
-
-/* ############################################################################################## */
-/* 80454C88-80454C8C 003288 0004+00 2/2 0/0 0/0 .sdata2 @4824 */
-SECTION_SDATA2 static f32 lit_4824 = 30.0f;
-
-/* 80454C8C-80454C90 00328C 0004+00 1/1 0/0 0/0 .sdata2 @4825 */
-SECTION_SDATA2 static f32 lit_4825 = 16.0f;
-
-/* 80454C90-80454C94 003290 0004+00 1/1 0/0 0/0 .sdata2 @4826 */
-SECTION_SDATA2 static f32 lit_4826 = 32.0f;
-
-/* 80454C94-80454C98 003294 0004+00 4/4 0/0 0/0 .sdata2 @4827 */
-SECTION_SDATA2 static f32 lit_4827 = 2.0f;
-
-/* 80454C98-80454C9C 003298 0004+00 1/1 0/0 0/0 .sdata2 @4828 */
-SECTION_SDATA2 static f32 lit_4828 = 5.0f;
-
-/* 80454C9C-80454CA0 00329C 0004+00 1/1 0/0 0/0 .sdata2 @4829 */
-SECTION_SDATA2 static f32 lit_4829 = 15.0f;
/* 80242198-802427A8 23CAD8 0610+00 1/1 0/0 0/0 .text drawWave__14dMsgScrnHowl_cFv */
-// float regallocs
-#ifdef NONMATCHING
void dMsgScrnHowl_c::drawWave() {
J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
f32 local_e0 = mpLineH[0]->getGlobalPosX();
@@ -967,9 +495,8 @@ void dMsgScrnHowl_c::drawWave() {
Vec this_02 = field_0x140;
f32 fVar1 = mDoGph_gInf_c::getWidthF() / 608.0f;
f32 fVar2 = mDoGph_gInf_c::getHeightF() / 448.0f;
- f32 dVar16 = mDoGph_gInf_c::getMinXF();
grafContext->scissor(
- (fVar12.x - dVar16) / fVar1 - 16.0f,
+ (fVar12.x - mDoGph_gInf_c::getMinXF()) / fVar1 - 16.0f,
(fVar12.y / fVar2) / fVar2 - 16.0f,
32.0f + (this_02.x - fVar12.x) / fVar1,
32.0f + ((this_02.y - fVar12.y) + 2.0f)
@@ -1014,8 +541,7 @@ void dMsgScrnHowl_c::drawWave() {
if (cVar9 != 0) {
f32 local_c4 = local_54;
f32 dVar16 = 5.0f;
- fVar2 = local_e0 - local_54;
- f32 f19 = fVar2 / 5.0f;
+ f32 f19 = (local_e0 - local_54) / 5.0f;
f32 f17 = (fVar2 - local_c8) / 5.0f;
for (int iVar15 = 0; iVar15 < 5; iVar15++) {
mpTopBallTail[iVar15]->setAlpha(cVar9);
@@ -1065,57 +591,266 @@ void dMsgScrnHowl_c::drawWave() {
}
}
}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dMsgScrnHowl_c::drawWave() {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/drawWave__14dMsgScrnHowl_cFv.s"
-}
-#pragma pop
-#endif
/* 802427A8-80242FE4 23D0E8 083C+00 1/1 0/0 0/0 .text drawGuide__14dMsgScrnHowl_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dMsgScrnHowl_c::drawGuide() {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/drawGuide__14dMsgScrnHowl_cFv.s"
-}
-#pragma pop
-
-/* ############################################################################################## */
-/* 80454CA0-80454CA4 0032A0 0004+00 1/1 0/0 0/0 .sdata2 @5203 */
-SECTION_SDATA2 static f32 lit_5203 = 18.0f;
+void dMsgScrnHowl_c::drawGuide() {
+ J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
+ Vec local_b0 = field_0x128;
+ Vec local_bc = field_0x140;
+ grafContext->scissor(
+ (local_b0.x - mDoGph_gInf_c::getMinXF()) / (mDoGph_gInf_c::getWidthF() / 608.0f),
+ field_0x2118, (local_bc.x - local_b0.x) / (mDoGph_gInf_c::getWidthF() / 608.0f),
+ field_0x2120);
+ grafContext->setScissor();
+ f32 local_cc = mpLineH[0]->getGlobalPosX();
+ s16 sVar12 = 0;
+ f32 local_d0 = 0.0f;
+ f32 local_d4 = 0.0f;
+ f32 local_d8 = 0.0f;
+ f32 local_dc = 0.0f;
+ for (int i = 0; i < 0x15d; i++) {
+ f32 local_e0 = local_cc;
+ f32 local_e4 = field_0xd80[sVar12];
+ int dVar4 = field_0x2198[sVar12];
+ local_cc += field_0x1980;
+ sVar12 = addCountGuide(sVar12);
+ f32 local_e8 = local_cc;
+ f32 local_ec = field_0xd80[sVar12];
+ if (local_e4 > 0.0f && local_ec > 0.0f && local_e4 == local_ec) {
+ f32 local_f0 = 0.5f * (local_e0 + local_cc);
+ f32 local_f4 = local_e4;
+ f32 local_f8 = field_0x1988 * g_MsgObject_HIO_c.mHowlHIO.mLineThickness;
+ f32 local_fc = field_0x198c * g_MsgObject_HIO_c.mHowlHIO.mLineThickness;
+ int iVar15 = getOnLineNum(field_0x212e + i - 1);
+ f32 dVar16 = 0.0f;
+ if (iVar15 >= 0 && field_0x213a[iVar15] != 0 && field_0x2158[iVar15] != 0) {
+ dVar16 = ((f32)field_0x2158[iVar15] / (f32)field_0x213a[iVar15]);
+ if (dVar16 > 1.0f) {
+ dVar16 = 1.0f;
+ }
+ JUtility::TColor local_100;
+ JUtility::TColor local_104;
+ JUtility::TColor local_108;
+ JUtility::TColor local_10c;
+ JUtility::TColor local_110;
+ JUtility::TColor TStack_114;
+ local_10c.set(0xff, 0xff, 0xff, 0xff);
+ TStack_114.set(0xff, 0xff, 0xff, 0xff);
+ f32 local_118;
+ f32 local_11c;
+ switch(dVar4) {
+ case 1:
+ local_108.set(g_MsgObject_HIO_c.mHowlHIO.mGuideUpperBlack);
+ local_110.set(g_MsgObject_HIO_c.mHowlHIO.mAnswerUpperBlack);
+ local_118 = g_MsgObject_HIO_c.mHowlHIO.mGuideUpperAlpha;
+ local_11c = g_MsgObject_HIO_c.mHowlHIO.mAnswerUpperAlpha;
+ break;
+ case 2:
+ local_108.set(g_MsgObject_HIO_c.mHowlHIO.mGuideMidBlack);
+ local_110.set(g_MsgObject_HIO_c.mHowlHIO.mAnswerMidBlack);
+ local_118 = g_MsgObject_HIO_c.mHowlHIO.mGuideMidAlpha;
+ local_11c = g_MsgObject_HIO_c.mHowlHIO.mAnswerMidAlpha;
+ break;
+ case 3:
+ local_108.set(g_MsgObject_HIO_c.mHowlHIO.mGuideLowerBlack);
+ local_110.set(g_MsgObject_HIO_c.mHowlHIO.mAnswerLowerBlack);
+ local_118 = g_MsgObject_HIO_c.mHowlHIO.mGuideLowerAlpha;
+ local_11c = g_MsgObject_HIO_c.mHowlHIO.mAnswerLowerAlpha;
+ break;
+ }
-/* 80242FE4-802435BC 23D924 05D8+00 1/1 0/0 0/0 .text drawGuide2__14dMsgScrnHowl_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dMsgScrnHowl_c::drawGuide2() {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/drawGuide2__14dMsgScrnHowl_cFv.s"
+ local_100.r = local_108.r + dVar16 * (local_110.r - local_108.r);
+ local_100.g = local_108.g + dVar16 * (local_110.g - local_108.g);
+ local_100.b = local_108.b + dVar16 * (local_110.b - local_108.b);
+ local_100.a = 0;
+ local_104.set(0xff, 0xff, 0xff, 0xff);
+ mpGuideDot->setBlackWhite(local_100, local_104);
+ f32 fVar3;
+ if (field_0x2798 == 4) {
+ local_100.r = local_108.r * dVar16;
+ local_100.g = local_108.g * dVar16;
+ local_100.b = local_108.b * dVar16;
+ local_100.a = local_108.a * dVar16;
+ local_104.r = local_10c.r * dVar16;
+ local_104.g = local_10c.g * dVar16;
+ local_104.b = local_10c.b * dVar16;
+ local_104.a = local_10c.a * dVar16;
+ dVar16 = local_118 * dVar16;
+ } else {
+ dVar16 = local_118 + (dVar16 * (local_11c - local_118));
+ }
+ } else {
+ switch (dVar4) {
+ case 1:
+ mpGuideDot->setBlackWhite(g_MsgObject_HIO_c.mHowlHIO.mGuideUpperBlack,
+ g_MsgObject_HIO_c.mHowlHIO.mGuideUpperWhite);
+ dVar16 = g_MsgObject_HIO_c.mHowlHIO.mGuideUpperAlpha;
+ break;
+ case 2:
+ mpGuideDot->setBlackWhite(g_MsgObject_HIO_c.mHowlHIO.mGuideMidBlack,
+ g_MsgObject_HIO_c.mHowlHIO.mGuideMidWhite);
+ dVar16 = g_MsgObject_HIO_c.mHowlHIO.mGuideMidAlpha;
+ break;
+ case 3:
+ mpGuideDot->setBlackWhite(g_MsgObject_HIO_c.mHowlHIO.mGuideLowerBlack,
+ g_MsgObject_HIO_c.mHowlHIO.mGuideLowerWhite);
+ dVar16 = g_MsgObject_HIO_c.mHowlHIO.mGuideLowerAlpha;
+ break;
+ }
+ if (field_0x2798 == 4) {
+ dVar16 = 0.0f;
+ }
+ }
+ if (dVar16 > 0.0f) {
+ mpGuideDot->setAlpha(
+ dVar16 * (mpScreen->search('line00')->getAlpha() * mpPmP_c->getAlphaRate()));
+ mpGuideDot->draw((2.0f + (local_f0 - local_f8 / 2)), (local_f4 - local_fc / 2),
+ local_f8, local_fc, false, false, false);
+ }
+ }
+ if (i == 0) {
+ local_d0 = local_e0;
+ local_d4 = local_e4;
+ }
+ if (i == field_0x2128 - 2) {
+ local_d8 = local_e8;
+ local_dc = local_ec;
+ }
+ }
}
-#pragma pop
-/* ############################################################################################## */
-/* 80454CA4-80454CA8 0032A4 0004+00 1/1 0/0 0/0 .sdata2 @5233 */
-SECTION_SDATA2 static f32 lit_5233 = 12.0f;
+/* 80242FE4-802435BC 23D924 05D8+00 1/1 0/0 0/0 .text drawGuide2__14dMsgScrnHowl_cFv */
+void dMsgScrnHowl_c::drawGuide2() {
+ J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
+ if (field_0x2798 == 3) {
+ drawEffect();
+ } else {
+ field_0x199c = 0.0f;
+ }
+ Vec local_58 = field_0x128;
+ Vec local_64 = field_0x140;
+ f32 local_70 = mDoGph_gInf_c::getHeightF() / 448.0f;
+ grafContext->scissor(
+ (local_58.x - mDoGph_gInf_c::getMinXF()) / (mDoGph_gInf_c::getWidthF() / 608.0f),
+ field_0x2118, (local_64.x - local_58.x) / (mDoGph_gInf_c::getWidthF() / 608.0f),
+ field_0x2120);
+ grafContext->setScissor();
+ f32 local_74 = mpLineH[0]->getGlobalPosX();
+ s16 local_134 = 0;
+ f32 local_78 = 0.0f;
+ f32 local_7c = 0.0f;
+ f32 local_80 = 0.0f;
+ f32 local_84 = 0.0f;
+ int local_88;
+ if (mPlotTime < field_0x2136) {
+ local_88 = 0;
+ } else {
+ local_88 = mPlotTime - field_0x2136;
+ }
+ for (int i = 0; i < 0x15d; i++) {
+ f32 local_8c = local_74;
+ f32 local_90 = field_0xd80[local_134];
+ u8 dVar8 = field_0x2198[local_134];
+ u8 dVar2 = field_0x2498[i + local_88];
+ f32 local_94 = 1.0f;
+ local_74 += field_0x1980;
+ local_134 = addCountGuide(local_134);
+ f32 local_98 = local_74;
+ f32 local_9c = field_0xd80[local_134];
+ if (local_90 > 0.0f && local_9c > 0.0f && local_90 == local_9c) {
+ f32 local_a0 = (local_8c + local_74) * 0.5f;
+ f32 local_a4 = local_90;
+ f32 local_a8 = field_0x1988 * g_MsgObject_HIO_c.mHowlHIO.mLineThickness;
+ f32 local_ac = field_0x198c * g_MsgObject_HIO_c.mHowlHIO.mLineThickness;
+ int local_b0 = getOnLineNum(field_0x212e + i - 1);
+ f32 guideAlpha = 0.0f;
+ if (local_b0 >= 0 && dVar2 != 0) {
+ JUtility::TColor local_b4;
+ JUtility::TColor local_b8;
+ switch (dVar8) {
+ case 1:
+ local_b4.set(g_MsgObject_HIO_c.mHowlHIO.mGuideUpperBlack);
+ local_b8.set(g_MsgObject_HIO_c.mHowlHIO.mGuideUpperWhite);
+ guideAlpha = g_MsgObject_HIO_c.mHowlHIO.mGuideUpperAlpha;
+ break;
+ case 2:
+ local_b4.set(g_MsgObject_HIO_c.mHowlHIO.mGuideMidBlack);
+ local_b8.set(g_MsgObject_HIO_c.mHowlHIO.mGuideMidWhite);
+ guideAlpha = g_MsgObject_HIO_c.mHowlHIO.mGuideMidAlpha;
+ break;
+ case 3:
+ local_b4.set(g_MsgObject_HIO_c.mHowlHIO.mGuideLowerBlack);
+ local_b8.set(g_MsgObject_HIO_c.mHowlHIO.mGuideLowerWhite);
+ guideAlpha = g_MsgObject_HIO_c.mHowlHIO.mGuideLowerAlpha;
+ break;
+ }
-/* 80454CA8-80454CAC 0032A8 0004+00 1/1 0/0 0/0 .sdata2 @5234 */
-SECTION_SDATA2 static f32 lit_5234 = 50.0f;
+ mpGuideDot->setBlackWhite(local_b4, local_b8);
+ } else {
+ guideAlpha = 0.0f;
+ }
+ if (field_0x2798 == 3 && mPlotTime > 0 && mPlotTime == local_88 + i) {
+ u8 onlineNum = getOnLineNum(mPlotTime);
+ if (onlineNum == field_0x279b && field_0x2176[field_0x279b] == 0) {
+ field_0x2176[field_0x279b] = 1;
+ field_0x19a0[field_0x279b] = local_a0;
+ field_0x1a18[field_0x279b] = local_a4;
+ field_0x1a90[field_0x279b] = 18.0f - g_MsgObject_HIO_c.mHowlHIO.mAnmSpeed;
+ field_0x279b++;
+ }
+ }
+ if (guideAlpha > 0.0f && local_94 > 0.0f) {
+ mpGuideDot->setAlpha(local_94 *
+ (guideAlpha * (mpScreen->search('line00')->getAlpha() *
+ mpPmP_c->getAlphaRate())));
+ mpGuideDot->draw(2.0f + (local_a0 - local_a8 / 2), local_a4 - local_ac / 2,
+ local_a8, local_ac, false, false, false);
+ }
+ }
+ if (i == 0) {
+ local_78 = local_8c;
+ local_7c = local_90;
+ }
+ if (i == field_0x2128 - 2) {
+ local_80 = local_98;
+ local_84 = local_9c;
+ }
+ }
+ for (int i = 0; i < 30; i++) {
+ if (field_0x1a90[i] > 0.0f) {
+ dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari(
+ field_0x19a0[i], field_0x1a18[i], &field_0x1a90[i],
+ g_MsgObject_HIO_c.mHowlHIO.mHighlightScale,
+ g_MsgObject_HIO_c.mHowlHIO.mHighlightMoyaR1,
+ g_MsgObject_HIO_c.mHowlHIO.mHighlightMoyaR0,
+ g_MsgObject_HIO_c.mHowlHIO.mHighlightMoyabsR1,
+ g_MsgObject_HIO_c.mHowlHIO.mHighlightMoyabsR0, g_MsgObject_HIO_c.mHowlHIO.mAnmSpeed,
+ 5);
+ }
+ }
+}
/* 802435BC-80243838 23DEFC 027C+00 1/1 0/0 0/0 .text drawEffect__14dMsgScrnHowl_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dMsgScrnHowl_c::drawEffect() {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/drawEffect__14dMsgScrnHowl_cFv.s"
+void dMsgScrnHowl_c::drawEffect() {
+ J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
+ Vec vec1 = field_0x128;
+ Vec vec2 = field_0x140;
+ mDoGph_gInf_c::getHeightF();
+ grafContext->scissor(
+ (vec1.x - mDoGph_gInf_c::getMinXF()) / (mDoGph_gInf_c::getWidthF() / 608.0f), field_0x2118,
+ 12.0f + ((vec2.x - vec1.x) / (mDoGph_gInf_c::getWidthF() / 608.0f)), field_0x2120);
+ grafContext->setScissor();
+ u8 timer = daAlink_getAlinkActorClass()->getWolfHowlMgrP()->getReleaseTimer();
+ u8 screenAlpha = mpScreen->search('line00')->getAlpha();
+ mpWaveTex->setAlpha((screenAlpha * mpPmP_c->getAlphaRate()) * ((30 - timer) / 30.0f));
+ f32 fVar2 = field_0x2128 * field_0x1980;
+ f32 fVar3 = mpLineH[0]->getGlobalPosX() - field_0x27a8;
+ field_0x199c = fVar3 + fVar2;
+ mpWaveTex->draw(field_0x199c - 50.0f, mpLineH[0]->getGlobalPosY(), 50.0f,
+ (mpLineH[2]->getGlobalPosY() + mpLineH[2]->getSizeY()) -
+ mpLineH[0]->getGlobalPosY(),
+ false, false, false);
}
-#pragma pop
/* 80243838-8024389C 23E178 0064+00 3/3 0/0 0/0 .text calcMain__14dMsgScrnHowl_cFv */
void dMsgScrnHowl_c::calcMain() {
@@ -1129,8 +864,6 @@ void dMsgScrnHowl_c::calcMain() {
}
/* 8024389C-80243A50 23E1DC 01B4+00 1/1 0/0 0/0 .text calcWave__14dMsgScrnHowl_cFv */
-// Matches with literals
-#ifdef NONMATCHING
void dMsgScrnHowl_c::calcWave() {
if (field_0x2128 < field_0x2136) {
field_0x2132 = field_0x2128;
@@ -1165,20 +898,8 @@ void dMsgScrnHowl_c::calcWave() {
field_0x180[field_0x2132] = getNowPlotPitch(-daAlink_getAlinkActorClass()->getWolfHowlMgrP()->getNowInputValue());
field_0x1b14[field_0x2132] = g_MsgObject_HIO_c.mHowlHIO.mWaveformDotLen;
}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dMsgScrnHowl_c::calcWave() {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/calcWave__14dMsgScrnHowl_cFv.s"
-}
-#pragma pop
-#endif
/* 80243A50-80243BE0 23E390 0190+00 1/1 0/0 0/0 .text calcGuide__14dMsgScrnHowl_cFv */
-// Matches with literals
-#ifdef NONMATCHING
void dMsgScrnHowl_c::calcGuide() {
if (field_0x2138 != 0) {
if ((daAlink_getAlinkActorClass()->getWolfHowlTimer() != 0) || (field_0x2798 == 3)) {
@@ -1208,20 +929,8 @@ void dMsgScrnHowl_c::calcGuide() {
}
}
}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dMsgScrnHowl_c::calcGuide() {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/calcGuide__14dMsgScrnHowl_cFv.s"
-}
-#pragma pop
-#endif
/* 80243BE0-80243DCC 23E520 01EC+00 2/2 0/0 0/0 .text moveLineV__14dMsgScrnHowl_cFb */
-// Matches with literals
-#ifdef NONMATCHING
void dMsgScrnHowl_c::moveLineV(bool param_0) {
f32 dVar7 = (mpLineH[0]->getInitPosX() - mpLineV[0]->getInitCenterPosX());
f32 fVar1;
@@ -1255,21 +964,9 @@ void dMsgScrnHowl_c::moveLineV(bool param_0) {
fVar3 += g_MsgObject_HIO_c.mHowlHIO.mLineSpaceOffset;
}
}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dMsgScrnHowl_c::moveLineV(bool param_0) {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/moveLineV__14dMsgScrnHowl_cFb.s"
-}
-#pragma pop
-#endif
/* 80243DCC-80243EEC 23E70C 0120+00 2/2 0/0 0/0 .text moveBaseLength__14dMsgScrnHowl_cFb
*/
-// Matches with literals
-#ifdef NONMATCHING
void dMsgScrnHowl_c::moveBaseLength(bool param_0) {
if (param_0) {
field_0x1990 = 0.0f;
@@ -1286,16 +983,6 @@ void dMsgScrnHowl_c::moveBaseLength(bool param_0) {
mpABase->resize((dVar8 - dVar7), mpABase->getSizeY());
mpABase->move(dVar9 + mpABase->getInitPosX(), mpABase->getPosY());
}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dMsgScrnHowl_c::moveBaseLength(bool param_0) {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/moveBaseLength__14dMsgScrnHowl_cFb.s"
-}
-#pragma pop
-#endif
/* 80243EEC-80243F58 23E82C 006C+00 2/2 0/0 0/0 .text getOnLineNum__14dMsgScrnHowl_cFi */
s8 dMsgScrnHowl_c::getOnLineNum(int param_0) {
@@ -1332,14 +1019,8 @@ s16 dMsgScrnHowl_c::addCountGuide(s16 param_0) {
return param_0;
}
-/* ############################################################################################## */
-/* 80454CAC-80454CB0 0032AC 0004+00 1/1 0/0 0/0 .sdata2 @5508 */
-SECTION_SDATA2 static f32 lit_5508 = -1.0f;
-
/* 80243F94-80244108 23E8D4 0174+00 2/2 0/0 0/0 .text getNowPlotPitch__14dMsgScrnHowl_cFf
*/
-// Matches with literals
-#ifdef NONMATCHING
f32 dMsgScrnHowl_c::getNowPlotPitch(f32 param_0) {
if (param_0 < 0.0f) {
param_0 *= -1.0f;
@@ -1347,20 +1028,8 @@ f32 dMsgScrnHowl_c::getNowPlotPitch(f32 param_0) {
}
return mpLineH[1]->getGlobalCenterPosY() + (param_0 * (mpLineH[2]->getGlobalCenterPosY() - mpLineH[1]->getGlobalCenterPosY()));
}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm f32 dMsgScrnHowl_c::getNowPlotPitch(f32 param_0) {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/getNowPlotPitch__14dMsgScrnHowl_cFf.s"
-}
-#pragma pop
-#endif
/* 80244108-8024414C 23EA48 0044+00 2/2 0/0 0/0 .text getPlotPitch__14dMsgScrnHowl_cFf */
-// Matches with literals
-#ifdef NONMATCHING
f32 dMsgScrnHowl_c::getPlotPitch(f32 param_0) {
if (1.0f == param_0) {
return field_0x1b08[0];
@@ -1373,41 +1042,17 @@ f32 dMsgScrnHowl_c::getPlotPitch(f32 param_0) {
}
return 0.0f;
}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm f32 dMsgScrnHowl_c::getPlotPitch(f32 param_0) {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/getPlotPitch__14dMsgScrnHowl_cFf.s"
-}
-#pragma pop
-#endif
/* 8024414C-802441FC 23EA8C 00B0+00 2/2 0/0 0/0 .text calcPitchLevel__14dMsgScrnHowl_cFv
*/
-// Matches with literals
-#ifdef NONMATCHING
void dMsgScrnHowl_c::calcPitchLevel() {
field_0x1b08[0] = mpLineH[0]->getGlobalCenterPosY();
field_0x1b08[1] = mpLineH[1]->getGlobalCenterPosY();
field_0x1b08[2] = mpLineH[2]->getGlobalCenterPosY();
}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dMsgScrnHowl_c::calcPitchLevel() {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/calcPitchLevel__14dMsgScrnHowl_cFv.s"
-}
-#pragma pop
-#endif
/* 802441FC-80244304 23EB3C 0108+00 1/1 0/0 0/0 .text initGuideData__14dMsgScrnHowl_cFv
*/
-// Matches with literals
-#ifdef NONMATCHING
void dMsgScrnHowl_c::initGuideData() {
calcPitchLevel();
for (int i = 0; i < 350; i++) {
@@ -1427,16 +1072,6 @@ void dMsgScrnHowl_c::initGuideData() {
}
}
}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dMsgScrnHowl_c::initGuideData() {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/initGuideData__14dMsgScrnHowl_cFv.s"
-}
-#pragma pop
-#endif
/* 80244304-8024438C 23EC44 0088+00 2/2 0/0 0/0 .text getGuideDataSize__14dMsgScrnHowl_cFv */
u16 dMsgScrnHowl_c::getGuideDataSize() {
@@ -1462,19 +1097,5 @@ u8 dMsgScrnHowl_c::getGuideDataType(int param_0) {
return 0;
}
-/* 80244454-80244558 23ED94 0104+00 0/0 1/0 0/0 .text __sinit_d_msg_scrn_howl_cpp */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void __sinit_d_msg_scrn_howl_cpp() {
- nofralloc
-#include "asm/msg/scrn/d_msg_scrn_howl/__sinit_d_msg_scrn_howl_cpp.s"
-}
-#pragma pop
-
-#pragma push
-#pragma force_active on
-REGISTER_CTORS(0x80244454, __sinit_d_msg_scrn_howl_cpp);
-#pragma pop
/* 80399A20-80399A20 026080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */