summaryrefslogtreecommitdiff
path: root/src/d/d_menu_option.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/d/d_menu_option.cpp')
-rw-r--r--src/d/d_menu_option.cpp993
1 files changed, 35 insertions, 958 deletions
diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp
index d09dce3540..05b5a096ec 100644
--- a/src/d/d_menu_option.cpp
+++ b/src/d/d_menu_option.cpp
@@ -1,10 +1,10 @@
//
-// Generated By: dol2asm
-// Translation Unit: d/d_menu_option
+// Option Menu
//
#include "d/d_menu_option.h"
#include "JSystem/JKernel/JKRMemArchive.h"
+#include "JSystem/J2DGraph/J2DAnmLoader.h"
#include "d/d_com_inf_game.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
@@ -15,200 +15,19 @@
#include "d/d_meter_HIO.h"
#include "d/d_meter_haihai.h"
#include "d/d_msg_string.h"
-#include "dol2asm.h"
#include "dolphin/os/OSRtc.h"
#include "dolphin/types.h"
#include "f_op/f_op_msg_mng.h"
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_graphic.h"
#include "string.h"
-#include "JSystem/J2DGraph/J2DAnmLoader.h"
-
-//
-// Forward References:
-//
-
-extern "C" void __ct__14dMenu_Option_cFP10JKRArchiveP9STControl();
-extern "C" void __dt__14dMenu_Option_cFv();
-extern "C" void _create__14dMenu_Option_cFv();
-extern "C" void _delete__14dMenu_Option_cFv();
-extern "C" void _move__14dMenu_Option_cFv();
-extern "C" void _draw__14dMenu_Option_cFv();
-extern "C" void drawHaihai__14dMenu_Option_cFv();
-extern "C" void isSync__14dMenu_Option_cFv();
-extern "C" void checkLeftTrigger__14dMenu_Option_cFv();
-extern "C" void checkRightTrigger__14dMenu_Option_cFv();
-extern "C" void setAnimation__14dMenu_Option_cFv();
-extern "C" void _open__14dMenu_Option_cFv();
-extern "C" void _close__14dMenu_Option_cFv();
-extern "C" void atten_init__14dMenu_Option_cFv();
-extern "C" void atten_move__14dMenu_Option_cFv();
-extern "C" void vib_init__14dMenu_Option_cFv();
-extern "C" void vib_move__14dMenu_Option_cFv();
-extern "C" void sound_init__14dMenu_Option_cFv();
-extern "C" void sound_move__14dMenu_Option_cFv();
-extern "C" void change_init__14dMenu_Option_cFv();
-extern "C" void change_move__14dMenu_Option_cFv();
-extern "C" void confirm_open_init__14dMenu_Option_cFv();
-extern "C" void confirm_open_move__14dMenu_Option_cFv();
-extern "C" void confirm_move_init__14dMenu_Option_cFv();
-extern "C" void confirm_move_move__14dMenu_Option_cFv();
-extern "C" void confirm_select_init__14dMenu_Option_cFv();
-extern "C" void confirm_select_move__14dMenu_Option_cFv();
-extern "C" void confirm_close_init__14dMenu_Option_cFv();
-extern "C" void confirm_close_move__14dMenu_Option_cFv();
-extern "C" void tv_open1_move__14dMenu_Option_cFv();
-extern "C" void tv_open2_move__14dMenu_Option_cFv();
-extern "C" void tv_move_move__14dMenu_Option_cFv();
-extern "C" void tv_close1_move__14dMenu_Option_cFv();
-extern "C" void tv_close2_move__14dMenu_Option_cFv();
-extern "C" void calibration_open1_move__14dMenu_Option_cFv();
-extern "C" void calibration_open2_move__14dMenu_Option_cFv();
-extern "C" void calibration_move_move__14dMenu_Option_cFv();
-extern "C" void calibration_close1_move__14dMenu_Option_cFv();
-extern "C" void calibration_close2_move__14dMenu_Option_cFv();
-extern "C" void menuVisible__14dMenu_Option_cFv();
-extern "C" void menuShow__14dMenu_Option_cFi();
-extern "C" void menuHide__14dMenu_Option_cFi();
-extern "C" void screenSet__14dMenu_Option_cFv();
-extern "C" void setSoundMode__14dMenu_Option_cFUl();
-extern "C" void setAttenString__14dMenu_Option_cFv();
-extern "C" void setVibString__14dMenu_Option_cFv();
-extern "C" void setSoundString__14dMenu_Option_cFv();
-extern "C" void setCursorPos__14dMenu_Option_cFUc();
-extern "C" void setSelectColor__14dMenu_Option_cFUcb();
-extern "C" void getSelectType__14dMenu_Option_cFv();
-extern "C" void changeBarColor__14dMenu_Option_cFb();
-extern "C" void setHIO__14dMenu_Option_cFb();
-extern "C" void cursorAnime__14dMenu_Option_cFf();
-extern "C" void setZButtonString__14dMenu_Option_cFUs();
-extern "C" void changeTVCheck__14dMenu_Option_cFv();
-extern "C" void setAButtonString__14dMenu_Option_cFUs();
-extern "C" void setBButtonString__14dMenu_Option_cFUs();
-extern "C" void isRumbleSupported__14dMenu_Option_cFv();
-extern "C" bool dpdMenuMove__14dMenu_Option_cFv();
-extern "C" void paneResize__14dMenu_Option_cFUx();
-extern "C" void initialize__14dMenu_Option_cFv();
-extern "C" void yesnoMenuMoveAnmInitSet__14dMenu_Option_cFii();
-extern "C" void yesnoMenuMoveAnm__14dMenu_Option_cFv();
-extern "C" void yesnoSelectMoveAnm__14dMenu_Option_cFv();
-extern "C" void yesnoCursorShow__14dMenu_Option_cFv();
-extern "C" void yesNoSelectStart__14dMenu_Option_cFv();
-extern "C" void yesnoSelectAnmSet__14dMenu_Option_cFv();
-extern "C" void yesnoCancelAnmSet__14dMenu_Option_cFv();
-extern "C" void yesnoWakuAlpahAnmInit__14dMenu_Option_cFUcUcUcUc();
-extern "C" void yesnoWakuAlpahAnm__14dMenu_Option_cFUc();
-extern "C" void draw__14dMenu_Option_cFv();
-extern "C" void __sinit_d_menu_option_cpp();
-extern "C" extern char const* const d_menu_d_menu_option__stringBase0;
-
-//
-// External References:
-//
-
-extern "C" void mDoExt_getMesgFont__Fv();
-extern "C" void mDoExt_getRubyFont__Fv();
-extern "C" void create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap();
-extern "C" void fopMsgM_messageGet__FPcUl();
-extern "C" void setNowVibration__14dComIfG_play_cFUc();
-extern "C" void getNowVibration__14dComIfG_play_cFv();
-extern "C" void checkTrigger__9STControlFv();
-extern "C" void checkLeftTrigger__9STControlFv();
-extern "C" void checkRightTrigger__9STControlFv();
-extern "C" void checkUpTrigger__9STControlFv();
-extern "C" void checkDownTrigger__9STControlFv();
-extern "C" void getSound__19dSv_player_config_cFv();
-extern "C" void setSound__19dSv_player_config_cFUc();
-extern "C" void setVibration__19dSv_player_config_cFUc();
-extern "C" void __ct__15dFile_warning_cFP10JKRArchiveUc();
-extern "C" void _move__15dFile_warning_cFv();
-extern "C" void openInit__15dFile_warning_cFv();
-extern "C" void closeInit__15dFile_warning_cFv();
-extern "C" void drawSelf__15dFile_warning_cFv();
-extern "C" void setText__15dFile_warning_cFUl();
-extern "C" void setFontColor__15dFile_warning_cFQ28JUtility6TColorQ28JUtility6TColor();
-extern "C" void __ct__Q28JUtility6TColorFv();
-extern "C" void __ct__16dSelect_cursor_cFUcfP10JKRArchive();
-extern "C" void setPos__16dSelect_cursor_cFffP7J2DPaneb();
-extern "C" void setParam__16dSelect_cursor_cFfffff();
-extern "C" void setScale__16dSelect_cursor_cFf();
-extern "C" void setAlphaRate__16dSelect_cursor_cFf();
-extern "C" void _move__19dMenu_Calibration_cFv();
-extern "C" void dMw_fade_out__5dMw_cFv();
-extern "C" void dMw_fade_in__5dMw_cFv();
-extern "C" void __ct__14dMeterHaihai_cFUc();
-extern "C" void drawHaihai__14dMeterHaihai_cFUcffff();
-extern "C" void getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c();
-extern "C" void dMeter2Info_set2DVibration__Fv();
-extern "C" void dMeter2Info_set2DVibrationM__Fv();
-extern "C" void __ct__12dMsgString_cFv();
-extern "C" void __dt__12dMsgString_cFv();
-extern "C" void __ct__8CPaneMgrFv();
-extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap();
-extern "C" void __dt__8CPaneMgrFv();
-extern "C" void paneTrans__8CPaneMgrFff();
-extern "C" void
-colorAnime__8CPaneMgrFsQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorUc();
-extern "C" void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs();
-extern "C" void dPaneClass_showNullPane__FP9J2DScreen();
-extern "C" void show__13CPaneMgrAlphaFv();
-extern "C" void hide__13CPaneMgrAlphaFv();
-extern "C" void setAlphaRate__13CPaneMgrAlphaFf();
-extern "C" void alphaAnime__13CPaneMgrAlphaFsUcUcUc();
-extern "C" void cLib_addCalc2__FPffff();
-extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
-extern "C" void setOutputMode__10Z2AudioMgrFUl();
-extern "C" void* __nw__FUl();
-extern "C" void __dl__FPv();
-extern "C" void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader();
-extern "C" void startPatternedRumble__Q210JUTGamePad7CRumbleFPvQ310JUTGamePad7CRumble7ERumbleUl();
-extern "C" void getBounds__7J2DPaneFv();
-extern "C" void setBasePosition__7J2DPaneF15J2DBasePosition();
-extern "C" void animationTransform__7J2DPaneFv();
-extern "C" void __ct__9J2DScreenFv();
-extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive();
-extern "C" void draw__9J2DScreenFffPC14J2DGrafContext();
-extern "C" void animation__9J2DScreenFv();
-extern "C" void __ct__10J2DPictureFPC7ResTIMG();
-extern "C" void getStringPtr__10J2DTextBoxCFv();
-extern "C" void setString__10J2DTextBoxFsPCce();
-extern "C" void load__20J2DAnmLoaderDataBaseFPCv();
-extern "C" void __construct_array();
-extern "C" void __ptmf_scall();
-extern "C" void _savegpr_20();
-extern "C" void _savegpr_23();
-extern "C" void _savegpr_24();
-extern "C" void _savegpr_25();
-extern "C" void _savegpr_26();
-extern "C" void _savegpr_27();
-extern "C" void _savegpr_28();
-extern "C" void _savegpr_29();
-extern "C" void _restgpr_20();
-extern "C" void _restgpr_23();
-extern "C" void _restgpr_24();
-extern "C" void _restgpr_25();
-extern "C" void _restgpr_26();
-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 m_gamePad__8mDoCPd_c[16];
-extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
-extern "C" u8 mFader__13mDoGph_gInf_c[4];
-extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
-extern "C" u8 sRumbleSupported__10JUTGamePad[4];
-
-//
-// Declarations:
-//
/* ############################################################################################## */
/* 803BDBA8-803BDBB4 01ACC8 000C+00 1/1 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,
};
-#ifdef NONMATCHING
typedef void (dMenu_Option_c::*initFunc)();
static initFunc init[] = {
&dMenu_Option_c::atten_init, &dMenu_Option_c::vib_init,
@@ -238,423 +57,16 @@ static calibrationFunc calibration_process[] = {
&dMenu_Option_c::calibration_close2_move,
};
-#else
-/* 803BDBB4-803BDBC0 -00001 000C+00 0/1 0/0 0/0 .data @3838 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3838[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)atten_init__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDBC0-803BDBCC -00001 000C+00 0/1 0/0 0/0 .data @3839 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3839[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)vib_init__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDBCC-803BDBD8 -00001 000C+00 0/1 0/0 0/0 .data @3840 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3840[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)sound_init__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDBD8-803BDBE4 -00001 000C+00 0/1 0/0 0/0 .data @3841 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3841[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)change_init__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDBE4-803BDBF0 -00001 000C+00 0/1 0/0 0/0 .data @3842 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3842[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)confirm_open_init__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDBF0-803BDBFC -00001 000C+00 0/1 0/0 0/0 .data @3843 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3843[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)confirm_move_init__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDBFC-803BDC08 -00001 000C+00 0/1 0/0 0/0 .data @3844 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3844[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)confirm_select_init__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDC08-803BDC14 -00001 000C+00 0/1 0/0 0/0 .data @3845 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3845[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)confirm_close_init__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDC14-803BDC74 01AD34 0060+00 1/2 0/0 0/0 .data init */
-SECTION_DATA static u8 init[96] = {
- 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, 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,
-};
-
-/* 803BDC74-803BDC80 -00001 000C+00 0/1 0/0 0/0 .data @3846 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3846[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)atten_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDC80-803BDC8C -00001 000C+00 0/1 0/0 0/0 .data @3847 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3847[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)vib_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDC8C-803BDC98 -00001 000C+00 0/1 0/0 0/0 .data @3848 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3848[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)sound_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDC98-803BDCA4 -00001 000C+00 0/1 0/0 0/0 .data @3849 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3849[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)change_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDCA4-803BDCB0 -00001 000C+00 0/1 0/0 0/0 .data @3850 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3850[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)confirm_open_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDCB0-803BDCBC -00001 000C+00 0/1 0/0 0/0 .data @3851 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3851[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)confirm_move_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDCBC-803BDCC8 -00001 000C+00 0/1 0/0 0/0 .data @3852 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3852[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)confirm_select_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDCC8-803BDCD4 -00001 000C+00 0/1 0/0 0/0 .data @3853 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3853[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)confirm_close_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDCD4-803BDD34 01ADF4 0060+00 1/2 0/0 0/0 .data process */
-SECTION_DATA static u8 process[96] = {
- 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, 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,
-};
-
-/* 803BDD34-803BDD40 -00001 000C+00 0/1 0/0 0/0 .data @3854 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3854[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)tv_open1_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDD40-803BDD4C -00001 000C+00 0/1 0/0 0/0 .data @3855 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3855[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)tv_open2_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDD4C-803BDD58 -00001 000C+00 0/1 0/0 0/0 .data @3856 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3856[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)tv_move_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDD58-803BDD64 -00001 000C+00 0/1 0/0 0/0 .data @3857 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3857[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)tv_close1_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDD64-803BDD70 -00001 000C+00 0/1 0/0 0/0 .data @3858 */
+// Unclear why this is created
#pragma push
#pragma force_active on
-SECTION_DATA static void* lit_3858[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)tv_close2_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDD70-803BDDAC 01AE90 003C+00 3/4 0/0 0/0 .data tv_process */
-SECTION_DATA static u8 tv_process[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,
-};
-
-/* 803BDDAC-803BDDB8 -00001 000C+00 0/1 0/0 0/0 .data @3859 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3859[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)calibration_open1_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDDB8-803BDDC4 -00001 000C+00 0/1 0/0 0/0 .data @3860 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3860[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)calibration_open2_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDDC4-803BDDD0 -00001 000C+00 0/1 0/0 0/0 .data @3861 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3861[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)calibration_move_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDDD0-803BDDDC -00001 000C+00 0/1 0/0 0/0 .data @3862 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3862[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)calibration_close1_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDDDC-803BDDE8 -00001 000C+00 0/1 0/0 0/0 .data @3863 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3863[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)calibration_close2_move__14dMenu_Option_cFv,
-};
-#pragma pop
-
-/* 803BDDE8-803BDE54 01AF08 003C+30 0/1 0/0 0/0 .data calibration_process */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u8 calibration_process[60 + 48 /* 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,
+static u8 calibration_padding[36 /* padding */] = {
/* 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,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#pragma pop
-#endif
-
-/* 803BDE54-803BDE70 01AF74 0010+0C 2/2 0/0 0/0 .data __vt__14dMenu_Option_c */
-SECTION_DATA extern void* __vt__14dMenu_Option_c[4 + 3 /* padding */] = {
- (void*)NULL /* RTTI */,
- (void*)NULL,
- (void*)draw__14dMenu_Option_cFv,
- (void*)__dt__14dMenu_Option_cFv,
- /* padding */
- NULL,
- NULL,
- NULL,
-};
/* 801E1F10-801E2014 1DC850 0104+00 0/0 2/2 0/0 .text
* __ct__14dMenu_Option_cFP10JKRArchiveP9STControl */
@@ -676,103 +88,51 @@ dMenu_Option_c::~dMenu_Option_c() {}
static const u32 dMo_soundMode[3] = {0, 1, 2};
/* 80396EB8-80396EE0 023518 0028+00 0/1 0/0 0/0 .rodata text_a_tag$3904 */
-#pragma push
-#pragma force_active on
static const u64 text_a_tag_3904[5] = {
'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5',
};
-#pragma pop
/* 80396EE0-80396F08 023540 0028+00 0/1 0/0 0/0 .rodata text_b_tag$3905 */
-#pragma push
-#pragma force_active on
static const u64 text_b_tag_3905[5] = {
'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5',
};
-#pragma pop
/* 80396F08-80396F18 023568 0010+00 0/1 0/0 0/0 .rodata l_tagName012$3918 */
-#pragma push
-#pragma force_active on
static const u64 l_tagName012[2] = {
'w_no_n',
'w_yes_n',
};
-#pragma pop
/* 80396F18-80396F28 023578 0010+00 0/1 0/0 0/0 .rodata l_tagName013$3919 */
-#pragma push
-#pragma force_active on
static const u64 l_tagName013[2] = {
'w_no_t',
'w_yes_t',
};
-#pragma pop
/* 80396F28-80396F38 023588 0010+00 0/1 0/0 0/0 .rodata l_tagName9$3928 */
-#pragma push
-#pragma force_active on
static const u64 l_tagName9[2] = {
'w_no_m',
'w_yes_m',
};
-#pragma pop
/* 80396F38-80396F48 023598 0010+00 0/1 0/0 0/0 .rodata l_tagName10$3929 */
-#pragma push
-#pragma force_active on
static const u64 l_tagName10[2] = {
'w_no_g',
'w_yes_g',
};
-#pragma pop
/* 80396F48-80396F58 0235A8 0010+00 0/1 0/0 0/0 .rodata l_tagName11$3930 */
-#pragma push
-#pragma force_active on
static const u64 l_tagName11[2] = {
'w_no_gr',
'w_yes_gr',
};
-#pragma pop
-
-/* 803975D8-803975D8 023C38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_803975D8 = "zelda_option_select_menu.blo";
-SECTION_DEAD static char const* const stringBase_803975F5 = "";
-SECTION_DEAD static char const* const stringBase_803975F6 = "zelda_option_base.blo";
-SECTION_DEAD static char const* const stringBase_8039760C = "zelda_option_menu_text.blo";
-SECTION_DEAD static char const* const stringBase_80397627 = "zelda_option_menu_shadow.blo";
-SECTION_DEAD static char const* const stringBase_80397644 = "zelda_option_check.blo";
-SECTION_DEAD static char const* const stringBase_8039765B = "zelda_collect_soubi_do_icon_parts.blo";
-SECTION_DEAD static char const* const stringBase_80397681 = "tt_block8x8.bti";
-SECTION_DEAD static char const* const stringBase_80397691 = "zelda_file_select_yes_no_window.blo";
-SECTION_DEAD static char const* const stringBase_803976B5 = "zelda_file_select_yes_no_window.bck";
-SECTION_DEAD static char const* const stringBase_803976D9 = "zelda_file_select_yes_no_window.bpk";
-SECTION_DEAD static char const* const stringBase_803976FD = "zelda_file_select_yes_no_window.btk";
-#pragma pop
/* 80454328-8045432C 002928 0002+02 1/1 0/0 0/0 .sdata2 l_msgNum2$3920 */
-SECTION_SDATA2 static u8 l_msgNum2[2 + 2 /* padding */] = {
+static const u8 l_msgNum2[2] = {
0x08,
0x07,
- /* padding */
- 0x00,
- 0x00,
};
-/* 8045432C-80454330 00292C 0004+00 11/11 0/0 0/0 .sdata2 @4068 */
-SECTION_SDATA2 static u8 lit_4068[4] = {
- 0x00,
- 0x00,
- 0x00,
- 0x00,
-};
-
-/* 80454330-80454334 002930 0004+00 18/18 0/0 0/0 .sdata2 @4069 */
-SECTION_SDATA2 static f32 lit_4069 = 1.0f;
-
/* 801E205C-801E2C1C 1DC99C 0BC0+00 1/1 0/0 0/0 .text _create__14dMenu_Option_cFv */
void dMenu_Option_c::_create() {
mpFont = mDoExt_getMesgFont();
@@ -920,7 +280,6 @@ void dMenu_Option_c::_create() {
setHIO(true);
}
-
/* 801E2C1C-801E3408 1DD55C 07EC+00 0/0 3/3 0/0 .text _delete__14dMenu_Option_cFv */
void dMenu_Option_c::_delete() {
delete mpString;
@@ -1100,8 +459,6 @@ void dMenu_Option_c::_delete() {
}
/* 801E3408-801E36CC 1DDD48 02C4+00 0/0 2/2 0/0 .text _move__14dMenu_Option_cFv */
-#ifdef NONMATCHING
-// matches but sinit and literals
void dMenu_Option_c::_move() {
mpStick->checkTrigger();
if (field_0x3ea != 0 && !isRumbleSupported()) {
@@ -1163,25 +520,6 @@ skip:
}
setHIO(false);
}
-#else
-void dMenu_Option_c::_move() {
- // NONMATCHING
-}
-#endif
-
-/* ############################################################################################## */
-/* 80454334-80454338 002934 0004+00 1/1 0/0 0/0 .sdata2 @4442 */
-SECTION_SDATA2 static f32 lit_4442 = 608.0f;
-
-/* 80454338-80454340 002938 0004+04 1/1 0/0 0/0 .sdata2 @4443 */
-SECTION_SDATA2 static f32 lit_4443[1 + 1 /* padding */] = {
- 448.0f,
- /* padding */
- 0.0f,
-};
-
-/* 80454340-80454348 002940 0008+00 1/1 0/0 0/0 .sdata2 @4445 */
-SECTION_SDATA2 static f64 lit_4445 = 4503599627370496.0 /* cast u32 to float */;
/* 801E36CC-801E38CC 1DE00C 0200+00 1/1 1/1 0/0 .text _draw__14dMenu_Option_cFv */
void dMenu_Option_c::_draw() {
@@ -1211,20 +549,6 @@ void dMenu_Option_c::_draw() {
}
}
-
-/* ############################################################################################## */
-/* 80454348-8045434C 002948 0004+00 1/1 0/0 0/0 .sdata2 @4469 */
-SECTION_SDATA2 static f32 lit_4469 = 43.0f / 10.0f;
-
-/* 8045434C-80454350 00294C 0004+00 1/1 0/0 0/0 .sdata2 @4470 */
-SECTION_SDATA2 static f32 lit_4470 = -5.0f;
-
-/* 80454350-80454354 002950 0004+00 5/5 0/0 0/0 .sdata2 @4471 */
-SECTION_SDATA2 static f32 lit_4471 = 0.5f;
-
-/* 80454354-80454358 002954 0004+00 11/11 0/0 0/0 .sdata2 @4472 */
-SECTION_SDATA2 static f32 lit_4472 = -1.0f;
-
/* 801E38CC-801E3A7C 1DE20C 01B0+00 1/1 0/0 0/0 .text drawHaihai__14dMenu_Option_cFv */
void dMenu_Option_c::drawHaihai() {
CPaneMgr pane;
@@ -1251,7 +575,6 @@ void dMenu_Option_c::drawHaihai() {
}
}
-
/* 801E3A7C-801E3AA4 1DE3BC 0028+00 0/0 1/1 0/0 .text isSync__14dMenu_Option_cFv */
bool dMenu_Option_c::isSync() {
if (mpMount != NULL && mpMount->sync() == false) {
@@ -1270,10 +593,6 @@ bool dMenu_Option_c::checkRightTrigger() {
return mpStick->checkRightTrigger();
}
-/* ############################################################################################## */
-/* 80454358-80454360 002958 0008+00 8/8 0/0 0/0 .sdata2 @4520 */
-SECTION_SDATA2 static f64 lit_4520 = 4503601774854144.0 /* cast s32 to float */;
-
/* 801E3AEC-801E3B98 1DE42C 00AC+00 4/4 0/0 0/0 .text setAnimation__14dMenu_Option_cFv */
void dMenu_Option_c::setAnimation() {
s16 frameMax;
@@ -1293,14 +612,6 @@ void dMenu_Option_c::setAnimation() {
field_0x30->setFrame(field_0x3c4);
}
-
-/* ############################################################################################## */
-/* 803975D8-803975D8 023C38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_80397721 = "/res/Layout/optres.arc";
-#pragma pop
-
/* 801E3B98-801E3DE0 1DE4D8 0248+00 0/0 2/2 0/0 .text _open__14dMenu_Option_cFv */
bool dMenu_Option_c::_open() {
if (!mpMount) {
@@ -1349,7 +660,6 @@ bool dMenu_Option_c::_open() {
}
}
-
/* 801E3DE0-801E3F6C 1DE720 018C+00 0/0 1/1 0/0 .text _close__14dMenu_Option_cFv */
bool dMenu_Option_c::_close() {
s16 closeFrame = g_drawHIO.mOptionScreen.mCloseFrames;
@@ -1379,7 +689,6 @@ bool dMenu_Option_c::_close() {
}
}
-
/* 801E3F6C-801E3FC4 1DE8AC 0058+00 2/1 0/0 0/0 .text atten_init__14dMenu_Option_cFv */
void dMenu_Option_c::atten_init() {
mpDrawCursor->setAlphaRate(1.0f);
@@ -1388,10 +697,7 @@ void dMenu_Option_c::atten_init() {
setBButtonString(0x3F9);
}
-
/* 801E3FC4-801E41A0 1DE904 01DC+00 1/0 0/0 0/0 .text atten_move__14dMenu_Option_cFv */
-#ifdef NONMATCHING
-// matches but sinit and literals
void dMenu_Option_c::atten_move() {
bool downTrigger = mpStick->checkDownTrigger();
bool leftTrigger = checkLeftTrigger();
@@ -1428,11 +734,6 @@ void dMenu_Option_c::atten_move() {
changeTVCheck();
}
}
-#else
-void dMenu_Option_c::atten_move() {
- // NONMATCHING
-}
-#endif
/* 801E41A0-801E41F8 1DEAE0 0058+00 1/0 0/0 0/0 .text vib_init__14dMenu_Option_cFv */
void dMenu_Option_c::vib_init() {
@@ -1442,10 +743,7 @@ void dMenu_Option_c::vib_init() {
setBButtonString(0x3F9);
}
-
/* 801E41F8-801E4488 1DEB38 0290+00 1/0 0/0 0/0 .text vib_move__14dMenu_Option_cFv */
-#ifdef NONMATCHING
-// matches but sinit and literals
void dMenu_Option_c::vib_move() {
bool upTrigger = mpStick->checkUpTrigger();
bool downTrigger = mpStick->checkDownTrigger();
@@ -1494,11 +792,6 @@ void dMenu_Option_c::vib_move() {
changeTVCheck();
}
}
-#else
-void dMenu_Option_c::vib_move() {
- // NONMATCHING
-}
-#endif
/* 801E4488-801E44E0 1DEDC8 0058+00 1/0 0/0 0/0 .text sound_init__14dMenu_Option_cFv */
void dMenu_Option_c::sound_init() {
@@ -1508,10 +801,7 @@ void dMenu_Option_c::sound_init() {
setBButtonString(0x3F9);
}
-
/* 801E44E0-801E48AC 1DEE20 03CC+00 1/0 0/0 0/0 .text sound_move__14dMenu_Option_cFv */
-#ifdef NONMATCHING
-// matches but sinit and literals
void dMenu_Option_c::sound_move() {
bool upTrigger = mpStick->checkUpTrigger();
mpStick->checkDownTrigger();
@@ -1579,11 +869,6 @@ void dMenu_Option_c::sound_move() {
changeTVCheck();
}
}
-#else
-void dMenu_Option_c::sound_move() {
- // NONMATCHING
-}
-#endif
/* 801E48AC-801E48E8 1DF1EC 003C+00 1/0 0/0 0/0 .text change_init__14dMenu_Option_cFv */
void dMenu_Option_c::change_init() {
@@ -1591,13 +876,7 @@ void dMenu_Option_c::change_init() {
setBButtonString(0x3F9);
}
-/* ############################################################################################## */
-/* 80454360-80454364 002960 0004+00 2/2 0/0 0/0 .sdata2 @4862 */
-SECTION_SDATA2 static f32 lit_4862 = 5.0f;
-
/* 801E48E8-801E4B34 1DF228 024C+00 1/0 0/0 0/0 .text change_move__14dMenu_Option_cFv */
-#ifdef NONMATCHING
-// matches but sinit and literals
void dMenu_Option_c::change_move() {
f32 x = 0.0f;
@@ -1658,11 +937,6 @@ void dMenu_Option_c::change_move() {
field_0x3ef = field_0x3f5;
}
}
-#else
-void dMenu_Option_c::change_move() {
- // NONMATCHING
-}
-#endif
/* 801E4B34-801E4C10 1DF474 00DC+00 1/0 0/0 0/0 .text confirm_open_init__14dMenu_Option_cFv */
void dMenu_Option_c::confirm_open_init() {
@@ -1681,14 +955,6 @@ void dMenu_Option_c::confirm_open_init() {
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
-
-/* ############################################################################################## */
-/* 80454364-80454368 002964 0004+00 2/2 0/0 0/0 .sdata2 @4893 */
-SECTION_SDATA2 static f32 lit_4893 = 2.0f / 5.0f;
-
-/* 80454368-8045436C 002968 0004+00 2/2 0/0 0/0 .sdata2 @4894 */
-SECTION_SDATA2 static f32 lit_4894 = 1.0f / 10.0f;
-
/* 801E4C10-801E4CE4 1DF550 00D4+00 1/0 0/0 0/0 .text confirm_open_move__14dMenu_Option_cFv */
void dMenu_Option_c::confirm_open_move() {
bool status = mpWarning->getStatus();
@@ -1708,7 +974,6 @@ void dMenu_Option_c::confirm_open_move() {
setAnimation();
}
-
/* 801E4CE4-801E4D20 1DF624 003C+00 1/0 0/0 0/0 .text confirm_move_init__14dMenu_Option_cFv */
void dMenu_Option_c::confirm_move_init() {
setAButtonString(0x40C);
@@ -1752,10 +1017,8 @@ void dMenu_Option_c::confirm_move_move() {
setAnimation();
}
-
/* 801E4E98-801E4E9C 1DF7D8 0004+00 1/0 0/0 0/0 .text confirm_select_init__14dMenu_Option_cFv */
void dMenu_Option_c::confirm_select_init() {
- /* empty function */
}
/* 801E4E9C-801E4F18 1DF7DC 007C+00 1/0 0/0 0/0 .text confirm_select_move__14dMenu_Option_cFv */
@@ -1781,17 +1044,6 @@ void dMenu_Option_c::confirm_close_init() {
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
-
-/* ############################################################################################## */
-/* 8045436C-80454370 00296C 0004+00 2/2 0/0 0/0 .sdata2 @5026 */
-SECTION_SDATA2 static f32 lit_5026 = 101.0f / 100.0f;
-
-/* 80454370-80454374 002970 0004+00 2/2 0/0 0/0 .sdata2 @5027 */
-SECTION_SDATA2 static f32 lit_5027 = 17.0f / 20.0f;
-
-/* 80454374-80454378 002974 0004+00 2/2 0/0 0/0 .sdata2 @5028 */
-SECTION_SDATA2 static f32 lit_5028 = 1.0f / 50.0f;
-
/* 801E4FB0-801E51CC 1DF8F0 021C+00 1/0 0/0 0/0 .text confirm_close_move__14dMenu_Option_cFv */
void dMenu_Option_c::confirm_close_move() {
bool status = mpWarning->getStatus();
@@ -1835,7 +1087,6 @@ void dMenu_Option_c::confirm_close_move() {
setAnimation();
}
-
/* 801E51CC-801E5244 1DFB0C 0078+00 1/0 0/0 0/0 .text tv_open1_move__14dMenu_Option_cFv
*/
void dMenu_Option_c::tv_open1_move() {
@@ -1849,7 +1100,6 @@ void dMenu_Option_c::tv_open1_move() {
}
}
-
/* 801E5244-801E5260 1DFB84 001C+00 1/0 0/0 0/0 .text tv_open2_move__14dMenu_Option_cFv
*/
void dMenu_Option_c::tv_open2_move() {
@@ -1870,7 +1120,6 @@ void dMenu_Option_c::tv_move_move() {
}
}
-
/* 801E5300-801E5364 1DFC40 0064+00 1/0 0/0 0/0 .text tv_close1_move__14dMenu_Option_cFv
*/
void dMenu_Option_c::tv_close1_move() {
@@ -1987,345 +1236,222 @@ void dMenu_Option_c::menuHide(int index) {
/* ############################################################################################## */
/* 80396F58-80396F88 0235B8 0030+00 0/1 0/0 0/0 .rodata tag_frame$5201 */
-#pragma push
-#pragma force_active on
static const u64 tag_frame[6] = {
'flame_00', 'flame_01', 'flame_02', 'flame_03', 'flame_04', 'flame_05',
};
-#pragma pop
/* 80396F88-80396FB8 0235E8 0030+00 0/1 0/0 0/0 .rodata tag_menu0$5202 */
-#pragma push
-#pragma force_active on
static const u64 tag_menu0[6] = {
'fenu_t0', 'fenu_t1', 'fenu_t2', 'fenu_t3', 'fenu_t4', 'fenu_t5',
};
-#pragma pop
/* 80396FB8-80396FE8 023618 0030+00 0/1 0/0 0/0 .rodata let_n$5214 */
-#pragma push
-#pragma force_active on
static const u64 let_n[6] = {
'let_00_n', 'let_01_n', 'let_02_n', 'let_03_n', 'let_04_n', 'let_05_n',
};
-#pragma pop
/* 80396FE8-80397018 023648 0030+00 0/1 0/0 0/0 .rodata let2_n$5215 */
-#pragma push
-#pragma force_active on
static const u64 let2_n[6] = {
'let_00_n', 'let_01_n', 'let_02_n', 'let_03_n', 'let_04_n',
};
-#pragma pop
/* 80397018-80397048 023678 0030+00 0/1 0/0 0/0 .rodata menu_n$5216 */
-#pragma push
-#pragma force_active on
static const u64 menu_n[6] = {
'menu_n0', 'menu_n1', 'menu_n2', 'menu_n3', 'menu_n4', 'menu_n5',
};
-#pragma pop
/* 80397048-80397078 0236A8 0030+00 0/1 0/0 0/0 .rodata menu2_n$5217 */
-#pragma push
-#pragma force_active on
static const u64 menu2_n[6] = {
'mw_n_0', 'mw_n_1', 'mw_n_2', 'mw_n_3', 'mw_n_4',
};
-#pragma pop
/* 80397078-803970A8 0236D8 0030+00 0/1 0/0 0/0 .rodata al0_n$5218 */
-#pragma push
-#pragma force_active on
static const u64 al0_n[6] = {
's_grr_00', 's_grr_01', 's_grr_02', 's_grr_03', 's_grr_04', 's_grr_05',
};
-#pragma pop
/* 803970A8-803970D8 023708 0030+00 0/1 0/0 0/0 .rodata al1_n$5219 */
-#pragma push
-#pragma force_active on
static const u64 al1_n[6] = {
'c_grr_00', 'c_grr_01', 'c_grr_02', 'c_grr_03', 'c_grr_04', 'c_grr_05',
};
-#pragma pop
/* 803970D8-80397108 023738 0030+00 0/1 0/0 0/0 .rodata al2_n$5220 */
-#pragma push
-#pragma force_active on
static const u64 al2_n[6] = {
's_grl_00', 's_grl_01', 's_grl_02', 's_grl_03', 's_grl_04', 's_grl_05',
};
-#pragma pop
/* 80397108-80397138 023768 0030+00 0/1 0/0 0/0 .rodata al3_n$5221 */
-#pragma push
-#pragma force_active on
static const u64 al3_n[6] = {
'c_grl_00', 'c_grl_01', 'c_grl_02', 'c_grl_03', 'c_grl_04', 'c_grl_05',
};
-#pragma pop
/* 80397138-80397160 023798 0028+00 0/1 0/0 0/0 .rodata haihail_n$5238 */
-#pragma push
-#pragma force_active on
static const u64 haihail_n[5] = {
'y_set_l0', 'y_set_l1', 'y_set_l2', 'y_set_l3', 'y_set_l4',
};
-#pragma pop
/* 80397160-80397188 0237C0 0028+00 0/1 0/0 0/0 .rodata haihair_n$5239 */
-#pragma push
-#pragma force_active on
static const u64 haihair_n[5] = {
'y_set_r0', 'y_set_r1', 'y_set_r2', 'y_set_r3', 'y_set_r4',
};
-#pragma pop
/* 80397188-803971B8 0237E8 0030+00 0/1 0/0 0/0 .rodata menu3_n$5256 */
-#pragma push
-#pragma force_active on
static const u64 menu3_n[6] = {
'menuapn0', 'menuapn1', 'menuapn2', 'menuapn3', 'menuapn4',
};
-#pragma pop
/* 803971B8-803971E0 023818 0028+00 0/1 0/0 0/0 .rodata tv_btnA$5275 */
-#pragma push
-#pragma force_active on
static const u64 tv_btnA[5] = {
'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at',
};
-#pragma pop
/* 803971E0-80397208 023840 0028+00 0/1 0/0 0/0 .rodata ftv_btnA$5276 */
-#pragma push
-#pragma force_active on
static const u64 ftv_btnA[5] = {
'font_a1', 'font_at2', 'font_at3', 'font_at4', 'font_at',
};
-#pragma pop
/* 80397208-80397218 023868 0010+00 0/1 0/0 0/0 .rodata fenu_t0$5282 */
-#pragma push
-#pragma force_active on
static const u64 fenu_t0[2] = {
'fenu_t0s',
'fenu_t0',
};
-#pragma pop
/* 80397218-80397228 023878 0010+00 0/1 0/0 0/0 .rodata menu_t0$5283 */
-#pragma push
-#pragma force_active on
static const u64 menu_t0[2] = {
'menu_t0s',
'menu_t0',
};
-#pragma pop
/* 80397228-80397238 023888 0010+00 0/1 0/0 0/0 .rodata fenu_t2$5289 */
-#pragma push
-#pragma force_active on
static const u64 fenu_t2[2] = {
'fenu_t1s',
'fenu_t1',
};
-#pragma pop
/* 80397238-80397248 023898 0010+00 0/1 0/0 0/0 .rodata menu_t2$5290 */
-#pragma push
-#pragma force_active on
static const u64 menu_t2[2] = {
'menu_t1s',
'menu_t1',
};
-#pragma pop
/* 80397248-80397258 0238A8 0010+00 0/1 0/0 0/0 .rodata fenu_t3$5296 */
-#pragma push
-#pragma force_active on
static const u64 fenu_t3[2] = {'fenu_t2s', 'fenu_t2'};
-#pragma pop
/* 80397258-80397268 0238B8 0010+00 0/1 0/0 0/0 .rodata menu_t3$5297 */
-#pragma push
-#pragma force_active on
static const u64 menu_t3[2] = {
'menu_t2s',
'menu_t2',
};
-#pragma pop
/* 80397268-80397278 0238C8 0010+00 0/1 0/0 0/0 .rodata fenu_t4$5303 */
-#pragma push
-#pragma force_active on
static const u64 fenu_t4[2] = {
'fenu_t3s',
'fenu_t3',
};
-#pragma pop
/* 80397278-80397288 0238D8 0010+00 0/1 0/0 0/0 .rodata menu_t4$5304 */
-#pragma push
-#pragma force_active on
static const u64 menu_t4[2] = {
'menu_t3s',
'menu_t3',
};
-#pragma pop
/* 80397288-80397298 0238E8 0010+00 0/1 0/0 0/0 .rodata fenu_t1$5310 */
-#pragma push
-#pragma force_active on
static const u64 fenu_t1[2] = {
'fenu_t4s',
'fenu_t4',
};
-#pragma pop
/* 80397298-803972A8 0238F8 0010+00 0/1 0/0 0/0 .rodata menu_t1$5311 */
-#pragma push
-#pragma force_active on
static const u64 menu_t1[2] = {
'menu_t4s',
'menu_t4',
};
-#pragma pop
/* 803972A8-803972B8 023908 0010+00 0/1 0/0 0/0 .rodata fenu_t5$5317 */
-#pragma push
-#pragma force_active on
static const u64 fenu_t5[2] = {
'fenu_t5s',
'fenu_t5',
};
-#pragma pop
/* 803972B8-803972C8 023918 0010+00 0/1 0/0 0/0 .rodata menu_t5$5318 */
-#pragma push
-#pragma force_active on
static const u64 menu_t5[2] = {
'menu_t5s',
'menu_t5',
};
-#pragma pop
/* 803972C8-803972F8 023928 0030+00 0/1 0/0 0/0 .rodata menut_0$5324 */
-#pragma push
-#pragma force_active on
static const u64 menut_0[6] = {
'menut0as', 'menut0a', 'menut0a2', 'menut0a1', 'menut0a4', 'menut0a3',
};
-#pragma pop
/* 803972F8-80397328 023958 0030+00 0/1 0/0 0/0 .rodata fenut_0$5325 */
-#pragma push
-#pragma force_active on
static const u64 fenut_0[6] = {
'menut010', 'menut0a9', 'menut0a8', 'menut0a7', 'menut0a6', 'menut0a5',
};
-#pragma pop
/* 80397328-80397358 023988 0030+00 0/1 0/0 0/0 .rodata menut_1$5332 */
-#pragma push
-#pragma force_active on
static const u64 menut_1[6] = {
'menut1as', 'menut1a', 'menut1a2', 'menut1a1', 'menut1a4', 'menut1a3',
};
-#pragma pop
/* 80397358-80397388 0239B8 0030+00 0/1 0/0 0/0 .rodata fenut_1$5333 */
-#pragma push
-#pragma force_active on
static const u64 fenut_1[6] = {
'menut110', 'menut1a9', 'menut1a8', 'menut1a7', 'menut1a6', 'menut1a5',
};
-#pragma pop
/* 80397388-803973B8 0239E8 0030+00 0/1 0/0 0/0 .rodata menut_2$5340 */
-#pragma push
-#pragma force_active on
static const u64 menut_2[6] = {
'menut2as', 'menut2a', 'menut2a2', 'menut2a1', 'menut2a4', 'menut2a3',
};
-#pragma pop
/* 803973B8-803973E8 023A18 0030+00 0/1 0/0 0/0 .rodata fenut_2$5341 */
-#pragma push
-#pragma force_active on
static const u64 fenut_2[6] = {
'menut210', 'menut2a9', 'menut2a8', 'menut2a7', 'menut2a6', 'menut2a5',
};
-#pragma pop
/* 803973E8-80397418 023A48 0030+00 0/1 0/0 0/0 .rodata menut_3$5348 */
-#pragma push
-#pragma force_active on
static const u64 menut_3[6] = {
'menut3a5', 'menut3a6', 'menut3a7', 'menut3a8', 'menut3a9', 'menut310',
};
-#pragma pop
/* 80397418-80397448 023A78 0030+00 0/1 0/0 0/0 .rodata fenut_3$5349 */
-#pragma push
-#pragma force_active on
static const u64 fenut_3[6] = {
'menut315', 'menut314', 'menut313', 'menut312', 'menut311', 'menut001',
};
-#pragma pop
/* 80397448-80397478 023AA8 0030+00 0/1 0/0 0/0 .rodata menut_4$5356 */
-#pragma push
-#pragma force_active on
static const u64 menut_4[6] = {
'menut3as', 'menut3a', 'menut3a2', 'menut3a1', 'menut3a4', 'menut3a3',
};
-#pragma pop
/* 80397478-803974A8 023AD8 0030+00 0/1 0/0 0/0 .rodata fenut_4$5357 */
-#pragma push
-#pragma force_active on
static const u64 fenut_4[6] = {
'menut321', 'menut320', 'menut319', 'menut318', 'menut317', 'menut316',
};
-#pragma pop
/* 803974A8-803974D8 023B08 0030+00 0/1 0/0 0/0 .rodata tx$5381 */
-#pragma push
-#pragma force_active on
static const u64 tx[6] = {
'w_p_tex5', 'w_p_tex6', 'w_p_tex3', 'w_p_tex4', 'fps_tex1', 'f_p_tex1',
};
-#pragma pop
/* 803974D8-803974F8 023B38 0020+00 0/0 0/0 0/0 .rodata op_tx$5393 */
-#pragma push
-#pragma force_active on
static const u64 op_tx[4] = {
'w_text_n',
'w_btn_n',
'w_k_t_n',
'w_abtn_n',
};
-#pragma pop
/* 803974F8-80397510 023B58 0018+00 0/1 0/0 0/0 .rodata z_tx$5399 */
-#pragma push
-#pragma force_active on
static const u64 z_tx[3] = {
'z_gc_n',
};
-#pragma pop
/* 80397510-80397560 023B70 0050+00 0/1 0/0 0/0 .rodata txTV$5409 */
-#pragma push
-#pragma force_active on
static const u64 txTV[10] = {
'menu_t61', 'menu_t2', 'menu_t91', 'menu_t1', 'menut101',
'menu_t01', 'menu_t71', 'menu_t3', 'menu_t81', 'menu_t4',
};
-#pragma pop
/* 801E5678-801E6FBC 1DFFB8 1944+00 1/1 0/0 0/0 .text screenSet__14dMenu_Option_cFv */
void dMenu_Option_c::screenSet() {
@@ -2569,7 +1695,6 @@ void dMenu_Option_c::screenSet() {
}
}
-
/* 801E6FBC-801E7004 1E18FC 0048+00 2/2 0/0 0/0 .text setSoundMode__14dMenu_Option_cFUl
*/
void dMenu_Option_c::setSoundMode(u32 param_0) {
@@ -2871,14 +1996,10 @@ void dMenu_Option_c::changeTVCheck() {
}
}
-
/* 80397560-80397588 023BC0 0028+00 0/0 0/0 0/0 .rodata txTVhide$5410 */
-#pragma push
-#pragma force_active on
static const u64 txTVhide[5] = {
'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n',
};
-#pragma pop
/* 80397588-803975B0 023BE8 0028+00 1/1 0/0 0/0 .rodata text_a_tag$6194 */
static const u64 text_a_tag_6194[5] = {
@@ -2890,22 +2011,20 @@ void dMenu_Option_c::setAButtonString(u16 i_stringID) {
u32 stringId = i_stringID;
if (stringId != field_0x3dc) {
field_0x3dc = i_stringID;
- }
-
- if (stringId == 0) {
- for (int i = 0; i < 5; i++) {
- J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_a_tag_6194[i]);
- strcpy(textBox->getStringPtr(), "");
- }
- } else {
- for (int i = 0; i < 5; i++) {
- J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_a_tag_6194[i]);
- dMeter2Info_getStringKanji(stringId, textBox->getStringPtr(), NULL);
+ if (stringId == 0) {
+ for (int i = 0; i < 5; i++) {
+ J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_a_tag_6194[i]);
+ strcpy(textBox->getStringPtr(), "");
+ }
+ } else {
+ for (int i = 0; i < 5; i++) {
+ J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_a_tag_6194[i]);
+ dMeter2Info_getStringKanji(stringId, textBox->getStringPtr(), NULL);
+ }
}
}
}
-
/* 803975B0-803975D8 023C10 0028+00 1/1 0/0 0/0 .rodata text_b_tag$6217 */
static const u64 text_b_tag_6217[5] = {
'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5',
@@ -2916,22 +2035,21 @@ void dMenu_Option_c::setBButtonString(u16 i_stringID) {
u32 stringId = i_stringID;
if (stringId != field_0x3de) {
field_0x3de = i_stringID;
- }
- if (stringId == 0) {
- for (int i = 0; i < 5; i++) {
- J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_b_tag_6217[i]);
- strcpy(textBox->getStringPtr(), "");
- }
- } else {
- for (int i = 0; i < 5; i++) {
- J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_b_tag_6217[i]);
- dMeter2Info_getStringKanji(stringId, textBox->getStringPtr(), NULL);
+ if (stringId == 0) {
+ for (int i = 0; i < 5; i++) {
+ J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_b_tag_6217[i]);
+ strcpy(textBox->getStringPtr(), "");
+ }
+ } else {
+ for (int i = 0; i < 5; i++) {
+ J2DTextBox* textBox = (J2DTextBox*)mpScreenIcon->search(text_b_tag_6217[i]);
+ dMeter2Info_getStringKanji(stringId, textBox->getStringPtr(), NULL);
+ }
}
}
}
-
/* 801E80A0-801E80AC 1E29E0 000C+00 4/4 0/0 0/0 .text isRumbleSupported__14dMenu_Option_cFv */
bool dMenu_Option_c::isRumbleSupported() {
return JUTGamePad::sRumbleSupported >> 0x1f;
@@ -2944,26 +2062,21 @@ bool dMenu_Option_c::dpdMenuMove() {
/* ############################################################################################## */
/* 80454378-8045437C 002978 0004+00 1/1 0/0 0/0 .sdata2 @6256 */
-SECTION_SDATA2 static f32 lit_6256 = 10.0f;
+// SECTION_SDATA2 static f32 lit_6256 = 10.0f;
/* 801E80B4-801E8210 1E29F4 015C+00 1/1 0/0 0/0 .text paneResize__14dMenu_Option_cFUx */
-#ifdef NONMATCHING
-// float regswap
void dMenu_Option_c::paneResize(u64 i_tag) {
f32 boundsY = mpClipScreen->search(i_tag)->getBounds().i.y;
f32 boundsX = mpClipScreen->search(i_tag)->getBounds().i.x - 5.0f;
mpClipScreen->search(i_tag)->move(boundsX, boundsY);
- f32 height = mpClipScreen->search(i_tag)->getHeight();
- f32 width = mpClipScreen->search(i_tag)->getWidth();
+ // Fake match
+ JGeometry::TBox2<f32>& bounds = mpClipScreen->search(i_tag)->mBounds;
+ boundsY = bounds.f.y - bounds.i.y;
+ boundsX = mpClipScreen->search(i_tag)->getWidth();
- mpClipScreen->search(i_tag)->resize(width + 10.0f, height);
+ mpClipScreen->search(i_tag)->resize(boundsX + 10.0f, boundsY);
}
-#else
-void dMenu_Option_c::paneResize(u64 param_0) {
- // NONMATCHING
-}
-#endif
/* 801E8210-801E82C4 1E2B50 00B4+00 1/1 1/1 0/0 .text initialize__14dMenu_Option_cFv */
void dMenu_Option_c::initialize() {
@@ -3009,7 +2122,6 @@ void dMenu_Option_c::yesnoMenuMoveAnmInitSet(int param_0, int param_1) {
mpYesNoSelBase_c[1]->getPanePtr()->animationTransform();
}
-
/* 801E8438-801E85D4 1E2D78 019C+00 2/2 0/0 0/0 .text yesnoMenuMoveAnm__14dMenu_Option_cFv */
bool dMenu_Option_c::yesnoMenuMoveAnm() {
bool ret;
@@ -3048,7 +2160,6 @@ bool dMenu_Option_c::yesnoMenuMoveAnm() {
return ret;
}
-
/* 80450730-80450738 0001B0 0008+00 2/2 0/0 0/0 .sdata OptYnSelStartFrameTbl */
static s32 OptYnSelStartFrameTbl[2] = {1251, 1236};
@@ -3121,16 +2232,6 @@ u8 dMenu_Option_c::yesnoSelectMoveAnm() {
return ret;
}
-
-/* 8045437C-80454380 00297C 0004+00 1/1 0/0 0/0 .sdata2 @6507 */
-SECTION_SDATA2 static f32 lit_6507 = 24.0f / 25.0f;
-
-/* 80454380-80454384 002980 0004+00 1/1 0/0 0/0 .sdata2 @6508 */
-SECTION_SDATA2 static f32 lit_6508 = 21.0f / 25.0f;
-
-/* 80454384-80454388 002984 0004+00 1/1 0/0 0/0 .sdata2 @6509 */
-SECTION_SDATA2 static f32 lit_6509 = 3.0f / 50.0f;
-
/* 801E8888-801E89F8 1E31C8 0170+00 2/2 0/0 0/0 .text yesnoCursorShow__14dMenu_Option_cFv
*/
void dMenu_Option_c::yesnoCursorShow() {
@@ -3148,7 +2249,6 @@ void dMenu_Option_c::yesnoCursorShow() {
}
}
-
/* 801E89F8-801E8AC8 1E3338 00D0+00 1/1 0/0 0/0 .text yesNoSelectStart__14dMenu_Option_cFv */
void dMenu_Option_c::yesNoSelectStart() {
if (field_0x3f9 != 0) {
@@ -3164,7 +2264,6 @@ void dMenu_Option_c::yesNoSelectStart() {
}
}
-
/* 801E8AC8-801E8C38 1E3408 0170+00 1/1 0/0 0/0 .text yesnoSelectAnmSet__14dMenu_Option_cFv */
void dMenu_Option_c::yesnoSelectAnmSet() {
if (field_0x3fa != 0xff) {
@@ -3183,7 +2282,6 @@ void dMenu_Option_c::yesnoSelectAnmSet() {
}
}
-
/* 801E8C38-801E8CB0 1E3578 0078+00 2/2 0/0 0/0 .text yesnoCancelAnmSet__14dMenu_Option_cFv */
void dMenu_Option_c::yesnoCancelAnmSet() {
Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
@@ -3191,7 +2289,6 @@ void dMenu_Option_c::yesnoCancelAnmSet() {
yesnoMenuMoveAnmInitSet(0x47D, 0x473);
}
-
/* 801E8CB0-801E8CFC 1E35F0 004C+00 1/1 0/0 0/0 .text
* yesnoWakuAlpahAnmInit__14dMenu_Option_cFUcUcUcUc */
void dMenu_Option_c::yesnoWakuAlpahAnmInit(u8 i_idx, u8 param_1, u8 param_2, u8 param_3) {
@@ -3236,23 +2333,3 @@ u8 dMenu_Option_c::yesnoWakuAlpahAnm(u8 i_idx) {
}
return ret;
}
-
-/* 801E8E6C-801E8E8C 1E37AC 0020+00 1/0 0/0 0/0 .text draw__14dMenu_Option_cFv */
-// void dMenu_Option_c::draw() {
-extern "C" void draw__14dMenu_Option_cFv() {
- // NONMATCHING
-}
-
-/* 801E8E8C-801E9118 1E37CC 028C+00 0/0 1/0 0/0 .text __sinit_d_menu_option_cpp */
-#ifdef NONMATCHING
-
-#else
-void __sinit_d_menu_option_cpp(){// NONMATCHING
-}
-
-#pragma push
-#pragma force_active on
-REGISTER_CTORS(0x801E8E8C, __sinit_d_menu_option_cpp);
-#pragma pop
-
-#endif \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 11:07:11 +0000