mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-18 21:47:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_lyt_meter_dowsing OK

Browse Source
This commit is contained in:
robojumper
2025-04-13 18:47:07 +02:00
parent 27c8a5dac5
commit f12a768571
14 changed files with 1651 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/splits.txt
+4
View File
@@ -409,7 +409,11 @@ d/lyt/meter/d_lyt_meter_cross_btn.cpp:
d/lyt/meter/d_lyt_meter_dowsing.cpp:
.text start:0x800FAFD0 end:0x801003E8
.ctors start:0x804DB710 end:0x804DB714
.rodata start:0x804E6568 end:0x804E6928
.data start:0x80517CE0 end:0x80518A60
.sdata start:0x805724A8 end:0x805724F0
.sdata2 start:0x80579C38 end:0x80579C48
.bss start:0x805ABE90 end:0x805AC550
d/lyt/meter/d_lyt_meter_rupy.cpp:
.text start:0x801003F0 end:0x801026A8
config/SOUE01/symbols.txt
+203 -203
View File
@@ -4742,7 +4742,7 @@ __dt__15dLytBirdGauge_cFv = .text:0x800D5010; // type:function size:0x164
__dt__15dLytBossGauge_cFv = .text:0x800D5180; // type:function size:0x108
fn_800D5290 = .text:0x800D5290; // type:function size:0xB4
fn_800D5350 = .text:0x800D5350; // type:function size:0x30
fn_800D5380 = .text:0x800D5380; // type:function size:0x44
fn_800D5380__11dLytMeter_cFUc = .text:0x800D5380; // type:function size:0x44
fn_800D53D0 = .text:0x800D53D0; // type:function size:0x50
fn_800D5420 = .text:0x800D5420; // type:function size:0x114
isSilentRealm__11dLytMeter_cFv = .text:0x800D5540; // type:function size:0x4C
@@ -6091,115 +6091,115 @@ __dt__39sFStateID_c<24dLytMeterCrossBtnParts_c>Fv = .text:0x800FADF0; // type:fu
__dt__34sFStateID_c<19dLytMeterCrossBtn_c>Fv = .text:0x800FAE50; // type:function size:0x58
isSameName__34sFStateID_c<19dLytMeterCrossBtn_c>CFPCc = .text:0x800FAEB0; // type:function size:0x88
isSameName__39sFStateID_c<24dLytMeterCrossBtnParts_c>CFPCc = .text:0x800FAF40; // type:function size:0x88
fn_800FAFD0 = .text:0x800FAFD0; // type:function size:0x4
fn_800FAFE0 = .text:0x800FAFE0; // type:function size:0x8C
fn_800FB070 = .text:0x800FB070; // type:function size:0x4
fn_800FB080 = .text:0x800FB080; // type:function size:0x4
fn_800FB090 = .text:0x800FB090; // type:function size:0x9C
fn_800FB130 = .text:0x800FB130; // type:function size:0x4
fn_800FB140 = .text:0x800FB140; // type:function size:0x4
fn_800FB150 = .text:0x800FB150; // type:function size:0x98
fn_800FB1F0 = .text:0x800FB1F0; // type:function size:0x4
fn_800FB200 = .text:0x800FB200; // type:function size:0x4
fn_800FB210 = .text:0x800FB210; // type:function size:0x84
fn_800FB2A0 = .text:0x800FB2A0; // type:function size:0x4
fn_800FB2B0 = .text:0x800FB2B0; // type:function size:0x20
fn_800FB2D0 = .text:0x800FB2D0; // type:function size:0x10
fn_800FB2E0 = .text:0x800FB2E0; // type:function size:0x20
fn_800FB300 = .text:0x800FB300; // type:function size:0x4
fn_800FB310 = .text:0x800FB310; // type:function size:0x8C
fn_800FB3A0 = .text:0x800FB3A0; // type:function size:0x4
fn_800FB3B0 = .text:0x800FB3B0; // type:function size:0x4
fn_800FB3C0 = .text:0x800FB3C0; // type:function size:0x9C
fn_800FB460 = .text:0x800FB460; // type:function size:0x4
fn_800FB470 = .text:0x800FB470; // type:function size:0x4
fn_800FB480 = .text:0x800FB480; // type:function size:0x98
fn_800FB520 = .text:0x800FB520; // type:function size:0x4
fn_800FB530 = .text:0x800FB530; // type:function size:0x4
fn_800FB540 = .text:0x800FB540; // type:function size:0x84
fn_800FB5D0 = .text:0x800FB5D0; // type:function size:0x4
fn_800FB5E0 = .text:0x800FB5E0; // type:function size:0x20
fn_800FB600 = .text:0x800FB600; // type:function size:0x10
fn_800FB610 = .text:0x800FB610; // type:function size:0x4
fn_800FB620 = .text:0x800FB620; // type:function size:0x98
fn_800FB6C0 = .text:0x800FB6C0; // type:function size:0x4
fn_800FB6D0 = .text:0x800FB6D0; // type:function size:0x4
fn_800FB6E0 = .text:0x800FB6E0; // type:function size:0x84
fn_800FB770 = .text:0x800FB770; // type:function size:0x4
fn_800FB780 = .text:0x800FB780; // type:function size:0x4
fn_800FB790 = .text:0x800FB790; // type:function size:0x98
fn_800FB830 = .text:0x800FB830; // type:function size:0x4
fn_800FB840 = .text:0x800FB840; // type:function size:0x4
fn_800FB850 = .text:0x800FB850; // type:function size:0x84
fn_800FB8E0 = .text:0x800FB8E0; // type:function size:0x4
fn_800FB8F0 = .text:0x800FB8F0; // type:function size:0x20
fn_800FB910 = .text:0x800FB910; // type:function size:0x10
fn_800FB920 = .text:0x800FB920; // type:function size:0x4
fn_800FB930 = .text:0x800FB930; // type:function size:0x8C
fn_800FB9C0 = .text:0x800FB9C0; // type:function size:0x4
fn_800FB9D0 = .text:0x800FB9D0; // type:function size:0x4
fn_800FB9E0 = .text:0x800FB9E0; // type:function size:0x9C
fn_800FBA80 = .text:0x800FBA80; // type:function size:0x4
fn_800FBA90 = .text:0x800FBA90; // type:function size:0x4
fn_800FBAA0 = .text:0x800FBAA0; // type:function size:0x98
fn_800FBB40 = .text:0x800FBB40; // type:function size:0x4
fn_800FBB50 = .text:0x800FBB50; // type:function size:0x4
fn_800FBB60 = .text:0x800FBB60; // type:function size:0x84
fn_800FBBF0 = .text:0x800FBBF0; // type:function size:0x4
fn_800FBC00 = .text:0x800FBC00; // type:function size:0x20
fn_800FBC20 = .text:0x800FBC20; // type:function size:0x10
fn_800FBC30 = .text:0x800FBC30; // type:function size:0x4
fn_800FBC40 = .text:0x800FBC40; // type:function size:0x60
fn_800FBCA0 = .text:0x800FBCA0; // type:function size:0x8
fn_800FBCB0 = .text:0x800FBCB0; // type:function size:0xA0
fn_800FBD50 = .text:0x800FBD50; // type:function size:0x4
fn_800FBD60 = .text:0x800FBD60; // type:function size:0x2C0
fn_800FC020 = .text:0x800FC020; // type:function size:0x4
fn_800FC030 = .text:0x800FC030; // type:function size:0x2C0
fn_800FC2F0 = .text:0x800FC2F0; // type:function size:0x84
fn_800FC380 = .text:0x800FC380; // type:function size:0xC
fn_800FC390 = .text:0x800FC390; // type:function size:0x4
fn_800FC3A0 = .text:0x800FC3A0; // type:function size:0x28
fn_800FC3D0 = .text:0x800FC3D0; // type:function size:0x4
fn_800FC3E0 = .text:0x800FC3E0; // type:function size:0xC8
fn_800FC4B0 = .text:0x800FC4B0; // type:function size:0xF8
fn_800FC5B0 = .text:0x800FC5B0; // type:function size:0x4
fn_800FC5C0 = .text:0x800FC5C0; // type:function size:0x60
fn_800FC620 = .text:0x800FC620; // type:function size:0x78
fn_800FC6A0 = .text:0x800FC6A0; // type:function size:0x4
fn_800FC6B0 = .text:0x800FC6B0; // type:function size:0x104
fn_800FC7C0 = .text:0x800FC7C0; // type:function size:0x14C
fn_800FC910 = .text:0x800FC910; // type:function size:0x40
fn_800FC950 = .text:0x800FC950; // type:function size:0x134
fn_800FCA90 = .text:0x800FCA90; // type:function size:0xA8
fn_800FCB40 = .text:0x800FCB40; // type:function size:0x40
fn_800FCB80 = .text:0x800FCB80; // type:function size:0xC
fn_800FCB90 = .text:0x800FCB90; // type:function size:0x10C
fn_800FCCA0 = .text:0x800FCCA0; // type:function size:0x4
fn_800FCCB0 = .text:0x800FCCB0; // type:function size:0x2D8
fn_800FCF90 = .text:0x800FCF90; // type:function size:0x238
fn_800FD1D0 = .text:0x800FD1D0; // type:function size:0x4
fn_800FD1E0 = .text:0x800FD1E0; // type:function size:0x60
fn_800FD240 = .text:0x800FD240; // type:function size:0x84
fn_800FD2D0 = .text:0x800FD2D0; // type:function size:0x4
fn_800FD2E0 = .text:0x800FD2E0; // type:function size:0x474
fn_800FD760 = .text:0x800FD760; // type:function size:0x100
fn_800FD860 = .text:0x800FD860; // type:function size:0x8B0
fn_800FE110 = .text:0x800FE110; // type:function size:0x104
fn_800FE220 = .text:0x800FE220; // type:function size:0x198
fn_800FE3C0 = .text:0x800FE3C0; // type:function size:0xC4
fn_800FE490 = .text:0x800FE490; // type:function size:0x14
fn_800FE4B0 = .text:0x800FE4B0; // type:function size:0x158
fn_800FE610 = .text:0x800FE610; // type:function size:0x88
fn_800FE6A0 = .text:0x800FE6A0; // type:function size:0x88
fn_800FE730 = .text:0x800FE730; // type:function size:0x40
fn_800FE770 = .text:0x800FE770; // type:function size:0xB0
fn_800FE820 = .text:0x800FE820; // type:function size:0x174
fn_800FE9A0 = .text:0x800FE9A0; // type:function size:0x14
fn_800FE9C0 = .text:0x800FE9C0; // type:function size:0x14
fn_800FE9E0 = .text:0x800FE9E0; // type:function size:0xE4
fn_800FEAD0 = .text:0x800FEAD0; // type:function size:0x8
fn_800FEAE0 = .text:0x800FEAE0; // type:function size:0x8
initializeState_Wait__26dLytMeterDowsingMenuIcon_cFv = .text:0x800FAFD0; // type:function size:0x4
executeState_Wait__26dLytMeterDowsingMenuIcon_cFv = .text:0x800FAFE0; // type:function size:0x8C
finalizeState_Wait__26dLytMeterDowsingMenuIcon_cFv = .text:0x800FB070; // type:function size:0x4
initializeState_On__26dLytMeterDowsingMenuIcon_cFv = .text:0x800FB080; // type:function size:0x4
executeState_On__26dLytMeterDowsingMenuIcon_cFv = .text:0x800FB090; // type:function size:0x9C
finalizeState_On__26dLytMeterDowsingMenuIcon_cFv = .text:0x800FB130; // type:function size:0x4
initializeState_Select__26dLytMeterDowsingMenuIcon_cFv = .text:0x800FB140; // type:function size:0x4
executeState_Select__26dLytMeterDowsingMenuIcon_cFv = .text:0x800FB150; // type:function size:0x98
finalizeState_Select__26dLytMeterDowsingMenuIcon_cFv = .text:0x800FB1F0; // type:function size:0x4
initializeState_Off__26dLytMeterDowsingMenuIcon_cFv = .text:0x800FB200; // type:function size:0x4
executeState_Off__26dLytMeterDowsingMenuIcon_cFv = .text:0x800FB210; // type:function size:0x84
finalizeState_Off__26dLytMeterDowsingMenuIcon_cFv = .text:0x800FB2A0; // type:function size:0x4
init__26dLytMeterDowsingMenuIcon_cFv = .text:0x800FB2B0; // type:function size:0x20
execute__26dLytMeterDowsingMenuIcon_cFv = .text:0x800FB2D0; // type:function size:0x10
reset__26dLytMeterDowsingMenuIcon_cFv = .text:0x800FB2E0; // type:function size:0x20
initializeState_Wait__23dLytMeterDowsingBlink_cFv = .text:0x800FB300; // type:function size:0x4
executeState_Wait__23dLytMeterDowsingBlink_cFv = .text:0x800FB310; // type:function size:0x8C
finalizeState_Wait__23dLytMeterDowsingBlink_cFv = .text:0x800FB3A0; // type:function size:0x4
initializeState_On__23dLytMeterDowsingBlink_cFv = .text:0x800FB3B0; // type:function size:0x4
executeState_On__23dLytMeterDowsingBlink_cFv = .text:0x800FB3C0; // type:function size:0x9C
finalizeState_On__23dLytMeterDowsingBlink_cFv = .text:0x800FB460; // type:function size:0x4
initializeState_Select__23dLytMeterDowsingBlink_cFv = .text:0x800FB470; // type:function size:0x4
executeState_Select__23dLytMeterDowsingBlink_cFv = .text:0x800FB480; // type:function size:0x98
finalizeState_Select__23dLytMeterDowsingBlink_cFv = .text:0x800FB520; // type:function size:0x4
initializeState_Off__23dLytMeterDowsingBlink_cFv = .text:0x800FB530; // type:function size:0x4
executeState_Off__23dLytMeterDowsingBlink_cFv = .text:0x800FB540; // type:function size:0x84
finalizeState_Off__23dLytMeterDowsingBlink_cFv = .text:0x800FB5D0; // type:function size:0x4
init__23dLytMeterDowsingBlink_cFv = .text:0x800FB5E0; // type:function size:0x20
execute__23dLytMeterDowsingBlink_cFv = .text:0x800FB600; // type:function size:0x10
initializeState_Wait__23dLytMeterDowsingInput_cFv = .text:0x800FB610; // type:function size:0x4
executeState_Wait__23dLytMeterDowsingInput_cFv = .text:0x800FB620; // type:function size:0x98
finalizeState_Wait__23dLytMeterDowsingInput_cFv = .text:0x800FB6C0; // type:function size:0x4
initializeState_On__23dLytMeterDowsingInput_cFv = .text:0x800FB6D0; // type:function size:0x4
executeState_On__23dLytMeterDowsingInput_cFv = .text:0x800FB6E0; // type:function size:0x84
finalizeState_On__23dLytMeterDowsingInput_cFv = .text:0x800FB770; // type:function size:0x4
initializeState_Select__23dLytMeterDowsingInput_cFv = .text:0x800FB780; // type:function size:0x4
executeState_Select__23dLytMeterDowsingInput_cFv = .text:0x800FB790; // type:function size:0x98
finalizeState_Select__23dLytMeterDowsingInput_cFv = .text:0x800FB830; // type:function size:0x4
initializeState_Off__23dLytMeterDowsingInput_cFv = .text:0x800FB840; // type:function size:0x4
executeState_Off__23dLytMeterDowsingInput_cFv = .text:0x800FB850; // type:function size:0x84
finalizeState_Off__23dLytMeterDowsingInput_cFv = .text:0x800FB8E0; // type:function size:0x4
init__23dLytMeterDowsingInput_cFv = .text:0x800FB8F0; // type:function size:0x20
execute__23dLytMeterDowsingInput_cFv = .text:0x800FB910; // type:function size:0x10
initializeState_Wait__22dLytMeterDowsingText_cFv = .text:0x800FB920; // type:function size:0x4
executeState_Wait__22dLytMeterDowsingText_cFv = .text:0x800FB930; // type:function size:0x8C
finalizeState_Wait__22dLytMeterDowsingText_cFv = .text:0x800FB9C0; // type:function size:0x4
initializeState_On__22dLytMeterDowsingText_cFv = .text:0x800FB9D0; // type:function size:0x4
executeState_On__22dLytMeterDowsingText_cFv = .text:0x800FB9E0; // type:function size:0x9C
finalizeState_On__22dLytMeterDowsingText_cFv = .text:0x800FBA80; // type:function size:0x4
initializeState_Select__22dLytMeterDowsingText_cFv = .text:0x800FBA90; // type:function size:0x4
executeState_Select__22dLytMeterDowsingText_cFv = .text:0x800FBAA0; // type:function size:0x98
finalizeState_Select__22dLytMeterDowsingText_cFv = .text:0x800FBB40; // type:function size:0x4
initializeState_Off__22dLytMeterDowsingText_cFv = .text:0x800FBB50; // type:function size:0x4
executeState_Off__22dLytMeterDowsingText_cFv = .text:0x800FBB60; // type:function size:0x84
finalizeState_Off__22dLytMeterDowsingText_cFv = .text:0x800FBBF0; // type:function size:0x4
init__22dLytMeterDowsingText_cFv = .text:0x800FBC00; // type:function size:0x20
execute__22dLytMeterDowsingText_cFv = .text:0x800FBC20; // type:function size:0x10
initializeState_Invisible__18dLytMeterDowsing_cFv = .text:0x800FBC30; // type:function size:0x4
executeState_Invisible__18dLytMeterDowsing_cFv = .text:0x800FBC40; // type:function size:0x60
getPane__18dLytMeterDowsing_cFv = .text:0x800FBCA0; // type:function size:0x8
finalizeState_Invisible__18dLytMeterDowsing_cFv = .text:0x800FBCB0; // type:function size:0xA0
initializeState_Wait__18dLytMeterDowsing_cFv = .text:0x800FBD50; // type:function size:0x4
executeState_Wait__18dLytMeterDowsing_cFv = .text:0x800FBD60; // type:function size:0x2C0
finalizeState_Wait__18dLytMeterDowsing_cFv = .text:0x800FC020; // type:function size:0x4
initializeState_MenuSelectingIn__18dLytMeterDowsing_cFv = .text:0x800FC030; // type:function size:0x2C0
executeState_MenuSelectingIn__18dLytMeterDowsing_cFv = .text:0x800FC2F0; // type:function size:0x84
finalizeState_MenuSelectingIn__18dLytMeterDowsing_cFv = .text:0x800FC380; // type:function size:0xC
initializeState_MenuSelecting__18dLytMeterDowsing_cFv = .text:0x800FC390; // type:function size:0x4
executeState_MenuSelecting__18dLytMeterDowsing_cFv = .text:0x800FC3A0; // type:function size:0x28
finalizeState_MenuSelecting__18dLytMeterDowsing_cFv = .text:0x800FC3D0; // type:function size:0x4
initializeState_MenuSelectingOut__18dLytMeterDowsing_cFv = .text:0x800FC3E0; // type:function size:0xC8
executeState_MenuSelectingOut__18dLytMeterDowsing_cFv = .text:0x800FC4B0; // type:function size:0xF8
finalizeState_MenuSelectingOut__18dLytMeterDowsing_cFv = .text:0x800FC5B0; // type:function size:0x4
initializeState_Reset__18dLytMeterDowsing_cFv = .text:0x800FC5C0; // type:function size:0x60
executeState_Reset__18dLytMeterDowsing_cFv = .text:0x800FC620; // type:function size:0x78
finalizeState_Reset__18dLytMeterDowsing_cFv = .text:0x800FC6A0; // type:function size:0x4
initializeState_ToUse__18dLytMeterDowsing_cFv = .text:0x800FC6B0; // type:function size:0x104
executeState_ToUse__18dLytMeterDowsing_cFv = .text:0x800FC7C0; // type:function size:0x14C
finalizeState_ToUse__18dLytMeterDowsing_cFv = .text:0x800FC910; // type:function size:0x40
initializeState_ToUnuse__18dLytMeterDowsing_cFv = .text:0x800FC950; // type:function size:0x134
executeState_ToUnuse__18dLytMeterDowsing_cFv = .text:0x800FCA90; // type:function size:0xA8
finalizeState_ToUnuse__18dLytMeterDowsing_cFv = .text:0x800FCB40; // type:function size:0x40
initializeState_Unuse__18dLytMeterDowsing_cFv = .text:0x800FCB80; // type:function size:0xC
executeState_Unuse__18dLytMeterDowsing_cFv = .text:0x800FCB90; // type:function size:0x10C
finalizeState_Unuse__18dLytMeterDowsing_cFv = .text:0x800FCCA0; // type:function size:0x4
initializeState_DemoMove__18dLytMeterDowsing_cFv = .text:0x800FCCB0; // type:function size:0x2D8
executeState_DemoMove__18dLytMeterDowsing_cFv = .text:0x800FCF90; // type:function size:0x238
finalizeState_DemoMove__18dLytMeterDowsing_cFv = .text:0x800FD1D0; // type:function size:0x4
initializeState_DemoOut__18dLytMeterDowsing_cFv = .text:0x800FD1E0; // type:function size:0x60
executeState_DemoOut__18dLytMeterDowsing_cFv = .text:0x800FD240; // type:function size:0x84
finalizeState_DemoOut__18dLytMeterDowsing_cFv = .text:0x800FD2D0; // type:function size:0x4
build__18dLytMeterDowsing_cFPQ23d2d10ResAccIf_c = .text:0x800FD2E0; // type:function size:0x474
remove__18dLytMeterDowsing_cFv = .text:0x800FD760; // type:function size:0x100
execute__18dLytMeterDowsing_cFv = .text:0x800FD860; // type:function size:0x8B0
fn_800FE110__18dLytMeterDowsing_cFv = .text:0x800FE110; // type:function size:0x104
fn_800FE220__18dLytMeterDowsing_cFv = .text:0x800FE220; // type:function size:0x198
fn_800FE3C0__18dLytMeterDowsing_cFl = .text:0x800FE3C0; // type:function size:0xC4
fn_800FE490__18dLytMeterDowsing_cCFv = .text:0x800FE490; // type:function size:0x14
fn_800FE4B0__18dLytMeterDowsing_cCFv = .text:0x800FE4B0; // type:function size:0x158
fn_800FE610__18dLytMeterDowsing_cFv = .text:0x800FE610; // type:function size:0x88
convertToLytIndex__18dLytMeterDowsing_cCFl = .text:0x800FE6A0; // type:function size:0x88
getSelectedDowsingSlot__18dLytMeterDowsing_cCFv = .text:0x800FE730; // type:function size:0x40
setItemName__18dLytMeterDowsing_cFl = .text:0x800FE770; // type:function size:0xB0
setMessage__18dLytMeterDowsing_cFl = .text:0x800FE820; // type:function size:0x174
convertSlotIndexToAnm__18dLytMeterDowsing_cCFl = .text:0x800FE9A0; // type:function size:0x14
fn_800FE9C0__18dLytMeterDowsing_cCFl = .text:0x800FE9C0; // type:function size:0x14
shouldCall__18dLytMeterDowsing_cCFv = .text:0x800FE9E0; // type:function size:0xE4
getName__18dLytMeterDowsing_cCFv = .text:0x800FEAD0; // type:function size:0x8
getLyt__18dLytMeterDowsing_cFv = .text:0x800FEAE0; // type:function size:0x8
__sinit_\d_lyt_meter_dowsing_cpp = .text:0x800FEAF0; // type:function size:0x144C scope:local
__dt__41sFStateID_c<26dLytMeterDowsingMenuIcon_c>Fv = .text:0x800FFF40; // type:function size:0x58
__dt__38sFStateID_c<23dLytMeterDowsingBlink_c>Fv = .text:0x800FFFA0; // type:function size:0x58
@@ -9160,10 +9160,10 @@ fn_801676D0 = .text:0x801676D0; // type:function size:0x1C
fn_801676F0 = .text:0x801676F0; // type:function size:0x24
fn_80167720 = .text:0x80167720; // type:function size:0x58
fn_80167780 = .text:0x80167780; // type:function size:0x34
fn_801677C0 = .text:0x801677C0; // type:function size:0x30
fn_801677F0 = .text:0x801677F0; // type:function size:0x24
getDowsingItemIdForIndex__Fl = .text:0x801677C0; // type:function size:0x30
dowsingSlotForIndex__Fl = .text:0x801677F0; // type:function size:0x24
fn_80167820 = .text:0x80167820; // type:function size:0x34
getDowsingIconForPos = .text:0x80167860; // type:function size:0x5C
getLytIndexForDowsingIndex__Fl = .text:0x80167860; // type:function size:0x5C
fn_801678C0 = .text:0x801678C0; // type:function size:0x2C
fn_801678F0 = .text:0x801678F0; // type:function size:0x2C
fn_80167920 = .text:0x80167920; // type:function size:0x24
@@ -31606,68 +31606,68 @@ lbl_805179BC = .data:0x805179BC; // type:object size:0x9 data:string
__vt__19dLytMeterCrossBtn_c = .data:0x805179EC; // type:object size:0x34
__vt__34sFStateID_c<19dLytMeterCrossBtn_c> = .data:0x80517C78; // type:object size:0x34
__vt__39sFStateID_c<24dLytMeterCrossBtnParts_c> = .data:0x80517CAC; // type:object size:0x34
lbl_80517CE0 = .data:0x80517CE0; // type:object size:0x10
lbl_80517CF0 = .data:0x80517CF0; // type:object size:0x10
lbl_80517D00 = .data:0x80517D00; // type:object size:0xC
lbl_80517D0C = .data:0x80517D0C; // type:object size:0xC
lbl_80517D18 = .data:0x80517D18; // type:object size:0xC
lbl_80517D24 = .data:0x80517D24; // type:object size:0xC
lbl_80517D30 = .data:0x80517D30; // type:object size:0xC
lbl_80517D3C = .data:0x80517D3C; // type:object size:0xC
lbl_80517D48 = .data:0x80517D48; // type:object size:0xC
lbl_80517D54 = .data:0x80517D54; // type:object size:0xC
lbl_80517D60 = .data:0x80517D60; // type:object size:0xC
lbl_80517D6C = .data:0x80517D6C; // type:object size:0xC
lbl_80517D78 = .data:0x80517D78; // type:object size:0xC
lbl_80517D84 = .data:0x80517D84; // type:object size:0x64
lbl_80517DE8 = .data:0x80517DE8; // type:object size:0x14
lbl_80517DFC = .data:0x80517DFC; // type:object size:0xC
lbl_80517E08 = .data:0x80517E08; // type:object size:0x18
lbl_80517E20 = .data:0x80517E20; // type:object size:0xC
lbl_80517E2C = .data:0x80517E2C; // type:object size:0xC
lbl_80517E38 = .data:0x80517E38; // type:object size:0xC
lbl_80517E44 = .data:0x80517E44; // type:object size:0xC
lbl_80517E50 = .data:0x80517E50; // type:object size:0xC
lbl_80517E5C = .data:0x80517E5C; // type:object size:0xC
lbl_80517E68 = .data:0x80517E68; // type:object size:0xC
lbl_80517E74 = .data:0x80517E74; // type:object size:0xC
lbl_80517E80 = .data:0x80517E80; // type:object size:0xC
lbl_80517E8C = .data:0x80517E8C; // type:object size:0xC
lbl_80517CE0 = .data:0x80517CE0; // type:object size:0xF data:string
lbl_80517CF0 = .data:0x80517CF0; // type:object size:0xF data:string
lbl_80517D00 = .data:0x80517D00; // type:object size:0xA data:string
lbl_80517D0C = .data:0x80517D0C; // type:object size:0xB data:string
lbl_80517D18 = .data:0x80517D18; // type:object size:0xB data:string
lbl_80517D24 = .data:0x80517D24; // type:object size:0xB data:string
lbl_80517D30 = .data:0x80517D30; // type:object size:0xB data:string
lbl_80517D3C = .data:0x80517D3C; // type:object size:0xB data:string
lbl_80517D48 = .data:0x80517D48; // type:object size:0xB data:string
lbl_80517D54 = .data:0x80517D54; // type:object size:0xB data:string
lbl_80517D60 = .data:0x80517D60; // type:object size:0xB data:string
lbl_80517D6C = .data:0x80517D6C; // type:object size:0xB data:string
lbl_80517D78 = .data:0x80517D78; // type:object size:0xB data:string
lbl_80517D84 = .data:0x80517D84; // type:object size:0xB data:string
lbl_80517DE8 = .data:0x80517DE8; // type:object size:0x13 data:string
lbl_80517DFC = .data:0x80517DFC; // type:object size:0xB data:string
lbl_80517E08 = .data:0x80517E08; // type:object size:0x16 data:string
lbl_80517E20 = .data:0x80517E20; // type:object size:0xB data:string
lbl_80517E2C = .data:0x80517E2C; // type:object size:0xB data:string
lbl_80517E38 = .data:0x80517E38; // type:object size:0xB data:string
lbl_80517E44 = .data:0x80517E44; // type:object size:0xB data:string
lbl_80517E50 = .data:0x80517E50; // type:object size:0xB data:string
lbl_80517E5C = .data:0x80517E5C; // type:object size:0xB data:string
lbl_80517E68 = .data:0x80517E68; // type:object size:0xB data:string
lbl_80517E74 = .data:0x80517E74; // type:object size:0xB data:string
lbl_80517E80 = .data:0x80517E80; // type:object size:0xA data:string
lbl_80517E8C = .data:0x80517E8C; // type:object size:0xA data:string
lbl_80517E98 = .data:0x80517E98; // type:object size:0x1C data:string
lbl_80517EB4 = .data:0x80517EB4; // type:object size:0x14
lbl_80517EC8 = .data:0x80517EC8; // type:object size:0x20
lbl_80517EB4 = .data:0x80517EB4; // type:object size:0x11 data:string
lbl_80517EC8 = .data:0x80517EC8; // type:object size:0x1B data:string
lbl_80517EE8 = .data:0x80517EE8; // type:object size:0x10 data:string
lbl_80517EF8 = .data:0x80517EF8; // type:object size:0x18
lbl_80517F10 = .data:0x80517F10; // type:object size:0x1C
lbl_80517F2C = .data:0x80517F2C; // type:object size:0x10
lbl_80517F3C = .data:0x80517F3C; // type:object size:0x18
lbl_80517EF8 = .data:0x80517EF8; // type:object size:0x15 data:string
lbl_80517F10 = .data:0x80517F10; // type:object size:0x1A data:string
lbl_80517F2C = .data:0x80517F2C; // type:object size:0xF data:string
lbl_80517F3C = .data:0x80517F3C; // type:object size:0x17 data:string
lbl_80517F54 = .data:0x80517F54; // type:object size:0xC data:string
lbl_80517F60 = .data:0x80517F60; // type:object size:0x18
lbl_80517F78 = .data:0x80517F78; // type:object size:0x18
lbl_80517F90 = .data:0x80517F90; // type:object size:0xC
lbl_80517F9C = .data:0x80517F9C; // type:object size:0xC
lbl_80517FA8 = .data:0x80517FA8; // type:object size:0x18
lbl_80517FC0 = .data:0x80517FC0; // type:object size:0xC
lbl_80517FCC = .data:0x80517FCC; // type:object size:0x18
lbl_80517FE4 = .data:0x80517FE4; // type:object size:0xC
lbl_80517FF0 = .data:0x80517FF0; // type:object size:0x18
lbl_80518008 = .data:0x80518008; // type:object size:0xC
lbl_80518014 = .data:0x80518014; // type:object size:0x18
lbl_8051802C = .data:0x8051802C; // type:object size:0xC
lbl_80518038 = .data:0x80518038; // type:object size:0x10
lbl_80518048 = .data:0x80518048; // type:object size:0x10
lbl_80518058 = .data:0x80518058; // type:object size:0x10
lbl_80518068 = .data:0x80518068; // type:object size:0x20
lbl_80518088 = .data:0x80518088; // type:object size:0xC
lbl_80518094 = .data:0x80518094; // type:object size:0xC
lbl_805180A0 = .data:0x805180A0; // type:object size:0x18
lbl_805180B8 = .data:0x805180B8; // type:object size:0x20
lbl_80517F60 = .data:0x80517F60; // type:object size:0x16 data:string
lbl_80517F78 = .data:0x80517F78; // type:object size:0x16 data:string
lbl_80517F90 = .data:0x80517F90; // type:object size:0xB data:string
lbl_80517F9C = .data:0x80517F9C; // type:object size:0xB data:string
lbl_80517FA8 = .data:0x80517FA8; // type:object size:0x15 data:string
lbl_80517FC0 = .data:0x80517FC0; // type:object size:0xA data:string
lbl_80517FCC = .data:0x80517FCC; // type:object size:0x15 data:string
lbl_80517FE4 = .data:0x80517FE4; // type:object size:0xA data:string
lbl_80517FF0 = .data:0x80517FF0; // type:object size:0x15 data:string
lbl_80518008 = .data:0x80518008; // type:object size:0xA data:string
lbl_80518014 = .data:0x80518014; // type:object size:0x15 data:string
lbl_8051802C = .data:0x8051802C; // type:object size:0xA data:string
lbl_80518038 = .data:0x80518038; // type:object size:0xE data:string
lbl_80518048 = .data:0x80518048; // type:object size:0xF data:string
lbl_80518058 = .data:0x80518058; // type:object size:0xD data:string
lbl_80518068 = .data:0x80518068; // type:object size:0xE data:string
lbl_80518088 = .data:0x80518088; // type:object size:0x9 data:string
lbl_80518094 = .data:0x80518094; // type:object size:0x9 data:string
lbl_805180A0 = .data:0x805180A0; // type:object size:0x9 data:string
lbl_805180B8 = .data:0x805180B8; // type:object size:0x9 data:string
lbl_805180D8 = .data:0x805180D8; // type:object size:0xC data:string
lbl_805180E4 = .data:0x805180E4; // type:object size:0x10
lbl_805180E4 = .data:0x805180E4; // type:object size:0xE data:string
lbl_805180F4 = .data:0x805180F4; // type:object size:0x14 data:string
lbl_80518108 = .data:0x80518108; // type:object size:0x10
lbl_80518118 = .data:0x80518118; // type:object size:0x10
__vt__18dLytMeterDowsing_c = .data:0x80518128; // type:object size:0x830
lbl_80518108 = .data:0x80518108; // type:object size:0xE data:string
lbl_80518118 = .data:0x80518118; // type:object size:0xD data:string
__vt__18dLytMeterDowsing_c = .data:0x80518128; // type:object size:0x34
__vt__37sFStateID_c<22dLytMeterDowsingText_c> = .data:0x80518958; // type:object size:0x34
__vt__38sFStateID_c<23dLytMeterDowsingInput_c> = .data:0x8051898C; // type:object size:0x34
__vt__38sFStateID_c<23dLytMeterDowsingBlink_c> = .data:0x805189C0; // type:object size:0x34
@@ -38165,15 +38165,15 @@ lbl_80572488 = .sdata:0x80572488; // type:object size:0x7 data:string
lbl_80572490 = .sdata:0x80572490; // type:object size:0x7 data:string
lbl_80572498 = .sdata:0x80572498; // type:object size:0x7 data:string
lbl_805724A0 = .sdata:0x805724A0; // type:object size:0x4 data:4byte
lbl_805724A8 = .sdata:0x805724A8; // type:object size:0x8
lbl_805724B0 = .sdata:0x805724B0; // type:object size:0x8
lbl_805724B8 = .sdata:0x805724B8; // type:object size:0x8
lbl_805724C0 = .sdata:0x805724C0; // type:object size:0x8
lbl_805724C8 = .sdata:0x805724C8; // type:object size:0x8
lbl_805724D0 = .sdata:0x805724D0; // type:object size:0x8
lbl_805724D8 = .sdata:0x805724D8; // type:object size:0x8
lbl_805724E0 = .sdata:0x805724E0; // type:object size:0x8
lbl_805724E8 = .sdata:0x805724E8; // type:object size:0x8 data:4byte
lbl_805724A8 = .sdata:0x805724A8; // type:object size:0x7 data:string
lbl_805724B0 = .sdata:0x805724B0; // type:object size:0x7 data:string
lbl_805724B8 = .sdata:0x805724B8; // type:object size:0x7 data:string
lbl_805724C0 = .sdata:0x805724C0; // type:object size:0x7 data:string
lbl_805724C8 = .sdata:0x805724C8; // type:object size:0x7 data:string
lbl_805724D0 = .sdata:0x805724D0; // type:object size:0x7 data:string
lbl_805724D8 = .sdata:0x805724D8; // type:object size:0x7 data:string
lbl_805724E0 = .sdata:0x805724E0; // type:object size:0x7 data:string
lbl_805724E8 = .sdata:0x805724E8; // type:object size:0x4 data:4byte
lbl_805724F0 = .sdata:0x805724F0; // type:object size:0x8
lbl_805724F8 = .sdata:0x805724F8; // type:object size:0x8
lbl_80572500 = .sdata:0x80572500; // type:object size:0x8 data:4byte
@@ -48737,30 +48737,30 @@ LytMeterCrossBtnParts__STATE_OFF = .bss:0x805ABD60; // type:object size:0x30 dat
LytMeterCrossBtn__STATE_WAIT = .bss:0x805ABDA0; // type:object size:0x30 data:4byte
LytMeterCrossBtn__STATE_TO_USE = .bss:0x805ABDE0; // type:object size:0x30 data:4byte
LytMeterCrossBtn__STATE_UNUSE = .bss:0x805ABE60; // type:object size:0x30 data:4byte
lbl_805ABE90 = .bss:0x805ABE90; // type:object size:0x10
LytMeterDowsingMenuIcon__STATE_WAIT = .bss:0x805ABEA0; // type:object size:0x40 data:4byte
LytMeterDowsingMenuIcon__STATE_ON = .bss:0x805ABEE0; // type:object size:0x40 data:4byte
LytMeterDowsingMenuIcon__STATE_SELECT = .bss:0x805ABF20; // type:object size:0x40 data:4byte
LytMeterDowsingMenuIcon__STATE_OFF = .bss:0x805ABF60; // type:object size:0x40 data:4byte
LytMeterDowsingBlink__STATE_WAIT = .bss:0x805ABFA0; // type:object size:0x40 data:4byte
LytMeterDowsingBlink__STATE_ON = .bss:0x805ABFE0; // type:object size:0x40 data:4byte
LytMeterDowsingBlink__STATE_SELECT = .bss:0x805AC020; // type:object size:0x40 data:4byte
LytMeterDowsingBlink__STATE_OFF = .bss:0x805AC060; // type:object size:0x40 data:4byte
LytMeterDowsingInput__STATE_WAIT = .bss:0x805AC0A0; // type:object size:0x40 data:4byte
LytMeterDowsingInput__STATE_ON = .bss:0x805AC0E0; // type:object size:0x40 data:4byte
LytMeterDowsingInput__STATE_SELECT = .bss:0x805AC120; // type:object size:0x40 data:4byte
LytMeterDowsingInput__STATE_OFF = .bss:0x805AC160; // type:object size:0x40 data:4byte
LytMeterDowsingText__STATE_WAIT = .bss:0x805AC1A0; // type:object size:0x40 data:4byte
LytMeterDowsingText__STATE_ON = .bss:0x805AC1E0; // type:object size:0x40 data:4byte
LytMeterDowsingText__STATE_SELECT = .bss:0x805AC220; // type:object size:0x40 data:4byte
LytMeterDowsingText__STATE_OFF = .bss:0x805AC260; // type:object size:0x40 data:4byte
LytMeterDowsing__STATE_INVISIBLE = .bss:0x805AC2A0; // type:object size:0x40 data:4byte
LytMeterDowsing__STATE_WAIT = .bss:0x805AC2E0; // type:object size:0x80 data:4byte
LytMeterDowsing__STATE_MENU_SELECTING = .bss:0x805AC360; // type:object size:0x40 data:4byte
LytMeterDowsing__STATE_MENU_SELECTING_OUT = .bss:0x805AC3A0; // type:object size:0x80 data:4byte
LytMeterDowsing__STATE_TO_USE = .bss:0x805AC420; // type:object size:0x80 data:4byte
LytMeterDowsing__STATE_UNUSE = .bss:0x805AC4A0; // type:object size:0x40 data:4byte
LytMeterDowsing__STATE_DEMO_MOVE = .bss:0x805AC4E0; // type:object size:0x40 data:4byte
lbl_805ABE90 = .bss:0x805ABE90; // type:object size:0xC
LytMeterDowsingMenuIcon__STATE_WAIT = .bss:0x805ABEA0; // type:object size:0x30 data:4byte
LytMeterDowsingMenuIcon__STATE_ON = .bss:0x805ABEE0; // type:object size:0x30 data:4byte
LytMeterDowsingMenuIcon__STATE_SELECT = .bss:0x805ABF20; // type:object size:0x30 data:4byte
LytMeterDowsingMenuIcon__STATE_OFF = .bss:0x805ABF60; // type:object size:0x30 data:4byte
LytMeterDowsingBlink__STATE_WAIT = .bss:0x805ABFA0; // type:object size:0x30 data:4byte
LytMeterDowsingBlink__STATE_ON = .bss:0x805ABFE0; // type:object size:0x30 data:4byte
LytMeterDowsingBlink__STATE_SELECT = .bss:0x805AC020; // type:object size:0x30 data:4byte
LytMeterDowsingBlink__STATE_OFF = .bss:0x805AC060; // type:object size:0x30 data:4byte
LytMeterDowsingInput__STATE_WAIT = .bss:0x805AC0A0; // type:object size:0x30 data:4byte
LytMeterDowsingInput__STATE_ON = .bss:0x805AC0E0; // type:object size:0x30 data:4byte
LytMeterDowsingInput__STATE_SELECT = .bss:0x805AC120; // type:object size:0x30 data:4byte
LytMeterDowsingInput__STATE_OFF = .bss:0x805AC160; // type:object size:0x30 data:4byte
LytMeterDowsingText__STATE_WAIT = .bss:0x805AC1A0; // type:object size:0x30 data:4byte
LytMeterDowsingText__STATE_ON = .bss:0x805AC1E0; // type:object size:0x30 data:4byte
LytMeterDowsingText__STATE_SELECT = .bss:0x805AC220; // type:object size:0x30 data:4byte
LytMeterDowsingText__STATE_OFF = .bss:0x805AC260; // type:object size:0x30 data:4byte
LytMeterDowsing__STATE_INVISIBLE = .bss:0x805AC2A0; // type:object size:0x30 data:4byte
LytMeterDowsing__STATE_WAIT = .bss:0x805AC2E0; // type:object size:0x30 data:4byte
LytMeterDowsing__STATE_MENU_SELECTING = .bss:0x805AC360; // type:object size:0x30 data:4byte
LytMeterDowsing__STATE_MENU_SELECTING_OUT = .bss:0x805AC3A0; // type:object size:0x30 data:4byte
LytMeterDowsing__STATE_TO_USE = .bss:0x805AC420; // type:object size:0x30 data:4byte
LytMeterDowsing__STATE_UNUSE = .bss:0x805AC4A0; // type:object size:0x30 data:4byte
LytMeterDowsing__STATE_DEMO_MOVE = .bss:0x805AC4E0; // type:object size:0x30 data:4byte
LytMeterDowsing__STATE_DEMO_OUT = .bss:0x805AC520; // type:object size:0x30 data:4byte
lbl_805AC550 = .bss:0x805AC550; // type:object size:0x10
LytMeterRupyStart__STATE_WAIT = .bss:0x805AC560; // type:object size:0x40 data:4byte
configure.py
+1 -1
View File
@@ -397,7 +397,7 @@ config.libs = [
Object(Matching, "d/lyt/meter/d_lyt_meter_plus_btn.cpp"),
Object(Matching, "d/lyt/meter/d_lyt_meter_minus_btn.cpp"),
Object(Matching, "d/lyt/meter/d_lyt_meter_cross_btn.cpp"),
Object(NonMatching, "d/lyt/meter/d_lyt_meter_dowsing.cpp"),
Object(Matching, "d/lyt/meter/d_lyt_meter_dowsing.cpp"),
Object(NonMatching, "d/lyt/meter/d_lyt_meter_rupy.cpp"),
Object(NonMatching, "d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp"),
Object(NonMatching, "d/lyt/meter/d_lyt_meter_event_skip.cpp"),
include/d/lyt/d_lyt_area_caption.h
+1 -1
View File
@@ -47,7 +47,7 @@ public:
static void check();
static void set0xAAC(u8 arg);
static u8 get0xAAC();
static s32 get0xAAC();
private:
dLytAreaCaption_c() {
include/d/lyt/d_lyt_common_icon_item_maps.h
+2 -1
View File
@@ -34,7 +34,7 @@
#define LYT_CMN_ItemBigBugnet (15) // [14] uc_netB_00.tpl
#define LYT_CMN_ItemBoatCannon (16) // [ 7] uc_boatCannon_00.tpl
#define LYT_CMN_ItemHarp (17) // [ 0] tr_tategoto_00.tpl
#define LYT_CMN_ItemNone (18) // -------------------------
#define LYT_CMN_ItemInvalid (18) // -------------------------
// Pouch Items
#define LYT_CMN_PouchPotionHealyh (0) // [12] uc_bottleKusuriA_00.tpl
@@ -113,5 +113,6 @@
#define LYT_CMN_DowsingZelda (19) // [13] tr_dauzTarget_19.tpl
#define LYT_CMN_DowsingTrialGate (20) // [14] tr_dauzTarget_20.tpl
#define LYT_CMN_DowsingNewPlantSpecies (21) // [15] tr_dauzTarget_21.tpl
#define LYT_CMN_DowsingInvalid (22) // -------------------------
#endif
include/d/lyt/d_lyt_unknowns.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
enum DoButton_e {
DO_BUTTON_A = 0,
DO_BUTTON_B = 1,
DO_BUTTON_C = 2,
DO_BUTTON_Z = 3,
DO_BUTTON_NUN_STK = 4,
DO_BUTTON_REMOCON_BG = 5,
include/d/lyt/d_lyt_util_items.h
+5
View File
@@ -2,6 +2,7 @@
#define D_LYT_UTIL_ITEMS_H
#include "common.h"
#include "toBeSorted/dowsing_target.h"
bool isPouchBocoburinLocked();
@@ -11,4 +12,8 @@ s32 getPouchItemAmount(s32 slot, bool unk);
u8 getPouchItemNumberColor(s32 slot, bool unk);
f32 getShieldDurability(s32 slot, bool unk);
DowsingTarget::DowsingSlot dowsingSlotForIndex(s32 index);
s32 getLytIndexForDowsingIndex(s32 index);
u16 getDowsingItemIdForIndex(s32 index);
#endif
include/d/lyt/meter/d_lyt_meter.h
+26 -4
View File
@@ -43,7 +43,8 @@ public:
bool build(d2d::ResAccIf_c *resAcc);
bool remove();
bool draw();
bool fn_800D5380(u8);
bool fn_800D5650();
bool fn_800D5680();
@@ -64,6 +65,10 @@ public:
return field_0x1377E;
}
u8 getField_0x1377F() const {
return field_0x1377F;
}
dLytMeterNunStk_c *getNunStk() {
return &mNunStk;
}
@@ -112,12 +117,17 @@ public:
/* 0x13750 */ s32 field_0x13750;
/* 0x13754 */ u8 field_0x13754[0x13770 - 0x13754];
/* 0x13770 */ u8 field_0x13770;
/* 0x13771 */ u8 field_0x13771[0x1377E - 0x13771];
/* 0x13771 */ u8 field_0x13771[0x13774 - 0x13771];
/* 0x13774 */ u8 field_0x13774;
/* 0x13775 */ u8 field_0x13775[0x1377E - 0x13775];
/* 0x1377E */ u8 field_0x1377E;
/* 0x1377F */ u8 field_0x1375F[0x13792 - 0x1377F];
/* 0x1377F */ u8 field_0x1377F;
/* 0x13780 */ u8 field_0x13780[0x13792 - 0x13780];
/* 0x13792 */ u8 field_0x13792;
/* 0x13793 */ u8 field_0x13793;
/* 0x13794 */ u8 field_0x13794[0x137B4 - 0x13794];
/* 0x13794 */ u8 field_0x13794[0x1379A - 0x13794];
/* 0x1379A */ u8 field_0x1379A;
/* 0x1379B */ u8 field_0x1379B[0x137B4 - 0x1379B];
/* 0x137B4 */ mVec3_c mPos3;
/* 0x137C0 */ u32 field_0x137C0;
};
@@ -172,6 +182,18 @@ public:
return mMeter.field_0x13770;
}
u8 getMeterField_0x13774() const {
return mMeter.field_0x13774;
}
u8 getMeterField_0x1377F() const {
return mMeter.field_0x1377F;
}
u8 getMeterField_0x1379A() const {
return mMeter.field_0x1379A;
}
bool checkAllFlags(u32 mask) const {
return (mFlags & mask) == mask;
}
include/d/lyt/meter/d_lyt_meter_dowsing.h
+138 -28
View File
@@ -3,23 +3,39 @@
#include "d/lyt/d2d.h"
#include "d/lyt/d_lyt_common_icon_item.h"
#include "d/lyt/d_textbox.h"
#include "nw4r/lyt/lyt_pane.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dLytMeterDowsingMenuIcon_c {
public:
dLytMeterDowsingMenuIcon_c() : mStateMgr(*this, sStateID::null) {}
virtual ~dLytMeterDowsingMenuIcon_c() {}
void init();
void execute();
void reset();
void setAnm(d2d::AnmGroup_c *anim) {
mpAnm = anim;
}
void setShouldBeSelect(u32 v) {
mShouldBeSelect = v;
}
private:
STATE_FUNC_DECLARE(dLytMeterDowsingMenuIcon_c, Wait);
STATE_FUNC_DECLARE(dLytMeterDowsingMenuIcon_c, On);
STATE_FUNC_DECLARE(dLytMeterDowsingMenuIcon_c, Select);
STATE_FUNC_DECLARE(dLytMeterDowsingMenuIcon_c, Off);
UI_STATE_MGR_DECLARE(dLytMeterDowsingMenuIcon_c);
u32 field_0x40;
u32 field_0x44;
STATE_MGR_DEFINE_UTIL_CHANGESTATE(dLytMeterDowsingMenuIcon_c);
/* 0x04 */ UI_STATE_MGR_DECLARE(dLytMeterDowsingMenuIcon_c);
/* 0x40 */ d2d::AnmGroup_c *mpAnm;
/* 0x44 */ u32 mShouldBeSelect;
};
class dLytMeterDowsingBlink_c {
@@ -27,15 +43,29 @@ public:
dLytMeterDowsingBlink_c() : mStateMgr(*this, sStateID::null) {}
~dLytMeterDowsingBlink_c() {}
void init();
void execute();
void setAnm(d2d::AnmGroup_c *anim) {
mpAnm = anim;
}
void setShouldBeSelect(u32 v) {
mShouldBeSelect = v;
}
private:
STATE_FUNC_DECLARE(dLytMeterDowsingBlink_c, Wait);
STATE_FUNC_DECLARE(dLytMeterDowsingBlink_c, On);
STATE_FUNC_DECLARE(dLytMeterDowsingBlink_c, Select);
STATE_FUNC_DECLARE(dLytMeterDowsingBlink_c, Off);
UI_STATE_MGR_DECLARE(dLytMeterDowsingBlink_c);
u32 field_0x40;
u32 field_0x44;
STATE_MGR_DEFINE_UTIL_CHANGESTATE(dLytMeterDowsingBlink_c);
/* 0x04 */ UI_STATE_MGR_DECLARE(dLytMeterDowsingBlink_c);
/* 0x40 */ d2d::AnmGroup_c *mpAnm;
/* 0x44 */ u32 mShouldBeSelect;
};
class dLytMeterDowsingInput_c {
@@ -43,15 +73,29 @@ public:
dLytMeterDowsingInput_c() : mStateMgr(*this, sStateID::null) {}
~dLytMeterDowsingInput_c() {}
void init();
void execute();
void setAnm(d2d::AnmGroup_c *anim) {
mpAnm = anim;
}
void setShouldBeSelect(u32 v) {
mShouldBeSelect = v;
}
private:
STATE_FUNC_DECLARE(dLytMeterDowsingInput_c, Wait);
STATE_FUNC_DECLARE(dLytMeterDowsingInput_c, On);
STATE_FUNC_DECLARE(dLytMeterDowsingInput_c, Select);
STATE_FUNC_DECLARE(dLytMeterDowsingInput_c, Off);
UI_STATE_MGR_DECLARE(dLytMeterDowsingInput_c);
u32 field_0x40;
u32 field_0x44;
STATE_MGR_DEFINE_UTIL_CHANGESTATE(dLytMeterDowsingInput_c);
/* 0x00 */ UI_STATE_MGR_DECLARE(dLytMeterDowsingInput_c);
/* 0x3C */ d2d::AnmGroup_c *mpAnm;
/* 0x40 */ u32 mShouldBeSelect;
};
class dLytMeterDowsingText_c {
@@ -59,15 +103,29 @@ public:
dLytMeterDowsingText_c() : mStateMgr(*this, sStateID::null) {}
~dLytMeterDowsingText_c() {}
void init();
void execute();
void setAnm(d2d::AnmGroup_c *anim) {
mpAnm = anim;
}
void setShouldBeSelect(u32 v) {
mShouldBeSelect = v;
}
private:
STATE_FUNC_DECLARE(dLytMeterDowsingText_c, Wait);
STATE_FUNC_DECLARE(dLytMeterDowsingText_c, On);
STATE_FUNC_DECLARE(dLytMeterDowsingText_c, Select);
STATE_FUNC_DECLARE(dLytMeterDowsingText_c, Off);
UI_STATE_MGR_DECLARE(dLytMeterDowsingText_c);
u32 field_0x40;
u32 field_0x44;
STATE_MGR_DEFINE_UTIL_CHANGESTATE(dLytMeterDowsingText_c);
/* 0x00 */ UI_STATE_MGR_DECLARE(dLytMeterDowsingText_c);
/* 0x3C */ d2d::AnmGroup_c *mpAnm;
/* 0x40 */ u32 mShouldBeSelect;
};
class dLytMeterDowsing_c : public d2d::dSubPane {
@@ -76,13 +134,38 @@ public:
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
virtual nw4r::lyt::Pane *getPane() override {
return mLyt.getLayout()->GetRootPane();
}
virtual d2d::LytBase_c *getLyt() override {
return &mLyt;
}
virtual const char *getName() const override {
return mLyt.getName();
}
virtual ~dLytMeterDowsing_c() {}
bool shouldCall() const;
bool fn_800FE3C0(s32 arg);
bool fn_800FE490() const;
bool fn_800FE4B0() const;
bool fn_800FE610();
private:
void setItemName(s32 id);
void setMessage(s32 id);
u8 getSelectedDowsingSlot() const;
void fn_800FE110();
void fn_800FE220();
s32 convertToLytIndex(s32 slot) const;
s32 convertSlotIndexToAnm(s32 slot) const;
s32 fn_800FE9C0(s32) const;
nw4r::lyt::Pane *getPaneByIndex(s32 idx) const {
return mpPanes[idx];
}
STATE_FUNC_DECLARE(dLytMeterDowsing_c, Invisible);
STATE_FUNC_DECLARE(dLytMeterDowsing_c, Wait);
STATE_FUNC_DECLARE(dLytMeterDowsing_c, MenuSelectingIn);
@@ -95,21 +178,48 @@ private:
STATE_FUNC_DECLARE(dLytMeterDowsing_c, DemoMove);
STATE_FUNC_DECLARE(dLytMeterDowsing_c, DemoOut);
/* 0x008 */ dLytMeterDowsingMenuIcon_c mIcon[8];
/* 0x248 */ dLytMeterDowsingBlink_c mBlink;
/* 0x28C */ dLytMeterDowsingInput_c mInput;
/* 0x2D0 */ dLytMeterDowsingText_c mText[2];
/* 0x358 */ UI_STATE_MGR_DECLARE(dLytMeterDowsing_c);
STATE_MGR_DEFINE_UTIL_ISSTATE(dLytMeterDowsing_c);
STATE_MGR_DEFINE_UTIL_CHANGESTATE(dLytMeterDowsing_c);
/* 0x490 */ d2d::dLytSub mLyt;
/* 0x0008 */ dLytMeterDowsingMenuIcon_c mIcon[8];
/* 0x0248 */ dLytMeterDowsingBlink_c mBlink;
/* 0x028C */ dLytMeterDowsingInput_c mInput;
/* 0x02D0 */ dLytMeterDowsingText_c mText[2];
/* 0x0358 */ UI_STATE_MGR_DECLARE(dLytMeterDowsing_c);
/* 0x428 */ d2d::AnmGroup_c mAnmGroups[29];
/* 0xB68 */ u8 field_0xB68[0xBEC - 0xB68];
/* 0xBEC */ dLytCommonIconItem_c mItemIcons[9];
/* 0x0490 */ d2d::dLytSub mLyt;
/* 0x5434 */ d2d::SubPaneList mNodeList;
/* 0x5440 */ d2d::SubPaneListNode mNodes[9];
/* 0x??? */ u8 padding[0x11E34 - 0x11DF8];
/* 0x0428 */ d2d::AnmGroup_c mAnm[29];
/* 0x0B68 */ nw4r::lyt::Pane *mpPanes[22];
/* 0x0BC0 */ nw4r::lyt::Pane *mpOwnerPane;
/* 0x0BC4 */ dWindow_c *mpWindows[3];
/* 0x0BD0 */ dTextBox_c *mpSizeBoxes[3];
/* 0x0BDC */ dTextBox_c *mpTextBoxes[4];
/* 0x0BEC */ dLytCommonIconItem_c mItemIcons[9];
/* 0x5434 */ d2d::SubPaneList mSubpaneList;
/* 0x5440 */ d2d::SubPaneListNode mSubpanes[9];
/* 0x54D0 */ f32 mArrowRotation;
/* 0x54D4 */ f32 mArrowLength;
/* 0x54D8 */ s32 field_0x54D8;
/* 0x54D8 */ s32 field_0x54DC;
/* 0x54E0 */ s32 field_0x54E0;
/* 0x54E4 */ s32 field_0x54E4;
/* 0x54E8 */ s32 field_0x54E8;
/* 0x54EC */ s32 field_0x54EC;
/* 0x54F0 */ s32 field_0x54F0;
/* 0x54F4 */ s32 field_0x54F4;
/* 0x54F8 */ u32 field_0x54F8;
/* 0x54FC */ s32 mDemoFrame;
/* 0x5500 */ s32 field_0x5500;
/* 0x5504 */ u8 field_0x5504;
/* 0x5505 */ u8 field_0x5505;
/* 0x5506 */ u8 field_0x5506;
/* 0x5507 */ u8 field_0x5507;
/* 0x5508 */ u8 field_0x5508;
/* 0x5509 */ u8 field_0x5509;
/* 0x550A */ u8 field_0x550A;
/* 0x550B */ u8 field_0x550B;
};
#endif
include/toBeSorted/dowsing_target.h
+2 -2
View File
@@ -65,8 +65,8 @@ public:
static void init();
static void execute();
static u8 getTopDowsingIcon();
static u8 getLeftDowsingIcon();
static s32 getTopDowsingIcon();
static s32 getLeftDowsingIcon();
};
#endif
src/d/lyt/d_lyt_area_caption.cpp
+1 -1
View File
@@ -188,7 +188,7 @@ void dLytAreaCaption_c::set0xAAC(u8 arg) {
}
}
u8 dLytAreaCaption_c::get0xAAC() {
s32 dLytAreaCaption_c::get0xAAC() {
if (sInstance != nullptr) {
return sInstance->field_0xAAC;
}
src/d/lyt/meter/d_lyt_meter_dowsing.cpp
+1246
View File
File diff suppressed because it is too large Load Diff
src/d/lyt/meter/d_lyt_meter_item_select.cpp
+2 -1
View File
@@ -1804,6 +1804,7 @@ bool dLytMeterItemSelect_c::remove() {
if (!it->mpLytPane->LytMeter0x24()) {
continue;
}
// @bug checking nullptr after invoking virtual function on it
d2d::dSubPane *subPane = it->mpLytPane;
if (subPane != nullptr) {
nw4r::lyt::Pane *parent = subPane->getPane()->GetParent();
@@ -2708,7 +2709,7 @@ s32 dLytMeterItemSelect_c::getBaseItemLytIndexforInternalId(s32 idx) const {
return sInternalItemToLytIndex[field_0x5797];
}
return LYT_CMN_ItemNone;
return LYT_CMN_ItemInvalid;
}
extern "C" bool checkIsInSkykeepPuzzle();
src/toBeSorted/dowsing_target.cpp
+19 -18
View File
@@ -3,6 +3,7 @@
#include "c/c_math.h"
#include "d/flag/itemflag_manager.h"
#include "d/flag/storyflag_manager.h"
#include "d/lyt/d_lyt_common_icon_item_maps.h"
#include "m/m_mtx.h"
#include "toBeSorted/tlist.h"
@@ -228,40 +229,40 @@ static bool removeDowsingTarget(DowsingTarget *target) {
return false;
}
u8 DowsingTarget::getTopDowsingIcon() {
s32 DowsingTarget::getTopDowsingIcon() {
if (hasZeldaDowsing()) {
return 19;
return LYT_CMN_DowsingZelda;
} else if (hasAnyTrialDowsing()) {
return 20;
return LYT_CMN_DowsingTrialGate;
} else if (hasSacredWaterDowsing()) {
return 5;
return LYT_CMN_DowsingHolyWater;
} else if (hasSandshipDowsing()) {
return 18;
return LYT_CMN_DowsingSandship;
} else if (hasTadtoneDowsing()) {
return 17;
return LYT_CMN_DowsingTadtones;
} else if (hasPropellerDowsing()) {
return 10;
return LYT_CMN_DowsingWindmillPropeller;
} else if (hasWaterBasinDowsing()) {
return 14;
return LYT_CMN_DowsingWaterBasin;
}
return 19;
return LYT_CMN_DowsingZelda;
}
u8 DowsingTarget::getLeftDowsingIcon() {
s32 DowsingTarget::getLeftDowsingIcon() {
if (hasCrystalBallDowsing()) {
return 15;
return LYT_CMN_DowsingCrystalBall;
} else if (hasPumpkinDowsing()) {
return 12;
return LYT_CMN_DowsingPumpkinPatchPlower;
} else if (hasNewPlantSpeciesDowsing()) {
return 21;
return LYT_CMN_DowsingNewPlantSpecies;
} else if (hasPartyWheelDowsing()) {
return 13;
return LYT_CMN_DowsingPartyWheel;
} else if (hasKikwiDowsing()) {
return 8;
return LYT_CMN_DowsingKikwi;
} else if (hasKeyPieceDowsing()) {
return 11;
return LYT_CMN_DowsingEarthTempleKey;
} else if (hasDesertNodeDowsing()) {
return 7;
return LYT_CMN_DowsingPowerGenerators;
}
return 15;
return LYT_CMN_DowsingCrystalBall;
}