mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-28 08:25:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_lyt_shop 91%

Browse Source
This commit is contained in:
robojumper
2025-12-26 23:43:00 +01:00
parent cffba79e3f
commit baae144a6e
10 changed files with 2236 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/splits.txt
+2
View File
@@ -1666,7 +1666,9 @@ d/lyt/d_lyt_shop.cpp:
.ctors start:0x804DB884 end:0x804DB888
.rodata start:0x804EF130 end:0x804EF8B0
.data start:0x8053BF50 end:0x8053CFC8
.sdata start:0x80573BE8 end:0x80573C10
.sbss start:0x805759B0 end:0x805759B8
.sdata2 start:0x8057C7B0 end:0x8057C7C0
.bss start:0x805B67C0 end:0x805B6C18
d/lyt/d_lyt_deposit.cpp:
config/SOUE01/symbols.txt
+147 -144
View File
@@ -9126,9 +9126,9 @@ hasPouchSlot__Flb = .text:0x801669E0; // type:function size:0x50
getPouchItemIdForIndex__Flb = .text:0x80166A30; // type:function size:0x5C
getPouchItemForSlot__Flb = .text:0x80166A90; // type:function size:0x70
getPouchItemAmount__Flb = .text:0x80166B00; // type:function size:0x8C
fn_80166B90 = .text:0x80166B90; // type:function size:0xBC
getPouchShieldDurability2__Flb = .text:0x80166B90; // type:function size:0xBC
fn_80166C50 = .text:0x80166C50; // type:function size:0x48
fn_80166CA0 = .text:0x80166CA0; // type:function size:0x48
getEvenMoreShieldStuff__Flb = .text:0x80166CA0; // type:function size:0x48
getPouchItemNumberColor__Flb = .text:0x80166CF0; // type:function size:0x84
isPouchBocoburinLocked__Fv = .text:0x80166D80; // type:function size:0x34
getPouchShieldDurability__Flb = .text:0x80166DC0; // type:function size:0xC8
@@ -15826,59 +15826,59 @@ initializeState__32sFStateID_c<17dLytDemoDowsing_c>CFR17dLytDemoDowsing_c = .tex
__sinit_\d_lyt_demo_dowsing_cpp = .text:0x802A1520; // type:function size:0x1C0
__dt__32sFStateID_c<17dLytDemoDowsing_c>Fv = .text:0x802A16E0; // type:function size:0x58
isSameName__32sFStateID_c<17dLytDemoDowsing_c>CFPCc = .text:0x802A1740; // type:function size:0x88
fn_802A17D0 = .text:0x802A17D0; // type:function size:0x4
dLytShopMain__stateModeNoneUpdate = .text:0x802A17E0; // type:function size:0x10
fn_802A17F0 = .text:0x802A17F0; // type:function size:0x4
fn_802A1800 = .text:0x802A1800; // type:function size:0x4
dLytShopMain__stateModeSelectInUpdate = .text:0x802A1810; // type:function size:0x168
fn_802A1980 = .text:0x802A1980; // type:function size:0x4
dLytShopMain__stateModeSelectCheckEnter = .text:0x802A1990; // type:function size:0x20
dLytShopMain__stateModeSelectCheckUpdate = .text:0x802A19B0; // type:function size:0xD8
fn_802A1A90 = .text:0x802A1A90; // type:function size:0x4
fn_802A1AA0 = .text:0x802A1AA0; // type:function size:0x4
dLytShopMain__stateModeSelectOutUpdate = .text:0x802A1AB0; // type:function size:0xDC
fn_802A1B90 = .text:0x802A1B90; // type:function size:0x4
fn_802A1BA0 = .text:0x802A1BA0; // type:function size:0x4
dLytShopMain__stateModeOutInUpdate = .text:0x802A1BB0; // type:function size:0x324
fn_802A1EE0 = .text:0x802A1EE0; // type:function size:0x4
dLytShopMain__stateModeMaterialCheck = .text:0x802A1EF0; // type:function size:0x1C
dLytShopMain__stateModeMaterialCheckUpdate = .text:0x802A1F10; // type:function size:0xDC
fn_802A1FF0 = .text:0x802A1FF0; // type:function size:0x4
fn_802A2000 = .text:0x802A2000; // type:function size:0x4
dLytShopMain__stateModeOutUpdate = .text:0x802A2010; // type:function size:0x170
fn_802A2180 = .text:0x802A2180; // type:function size:0x4
fn_802A2190 = .text:0x802A2190; // type:function size:0x4
dLytShopMain__stateModeInOutUpdate = .text:0x802A21A0; // type:function size:0x264
fn_802A2410 = .text:0x802A2410; // type:function size:0x4
fn_802A2420 = .text:0x802A2420; // type:function size:0x200
fn_802A2620 = .text:0x802A2620; // type:function size:0xA4
fn_802A26D0 = .text:0x802A26D0; // type:function size:0xA0
fn_802A2770 = .text:0x802A2770; // type:function size:0x6C
fn_802A27E0 = .text:0x802A27E0; // type:function size:0x58
fn_802A2840 = .text:0x802A2840; // type:function size:0x438
fn_802A2C80 = .text:0x802A2C80; // type:function size:0x3C8
fn_802A3050 = .text:0x802A3050; // type:function size:0x10
fn_802A3060 = .text:0x802A3060; // type:function size:0x50
fn_802A30B0 = .text:0x802A30B0; // type:function size:0x1F8
dLytShopMain__setStateModeNone = .text:0x802A32B0; // type:function size:0x50
fn_802A3300 = .text:0x802A3300; // type:function size:0x10
fn_802A3310 = .text:0x802A3310; // type:function size:0x154
dLytShopMain__setStateModeSelectCheck = .text:0x802A3470; // type:function size:0x50
fn_802A34C0 = .text:0x802A34C0; // type:function size:0xE0
fn_802A35A0 = .text:0x802A35A0; // type:function size:0xFC
dLytShopMain__setStateModeMaterialCheck = .text:0x802A36A0; // type:function size:0x58
fn_802A3700 = .text:0x802A3700; // type:function size:0x94
fn_802A37A0 = .text:0x802A37A0; // type:function size:0xB4
fn_802A3860 = .text:0x802A3860; // type:function size:0x30C
dLytShop__prepareRemodelStoreStuff = .text:0x802A3B70; // type:function size:0x47C
dLytShop__addItemToDisplayed = .text:0x802A3FF0; // type:function size:0x2C8
fn_802A42C0 = .text:0x802A42C0; // type:function size:0x168
fn_802A4430 = .text:0x802A4430; // type:function size:0x5C
initializeState_ModeNone__14dLytShopMain_cFv = .text:0x802A17D0; // type:function size:0x4
executeState_ModeNone__14dLytShopMain_cFv = .text:0x802A17E0; // type:function size:0x10
finalizeState_ModeNone__14dLytShopMain_cFv = .text:0x802A17F0; // type:function size:0x4
initializeState_ModeSelectIn__14dLytShopMain_cFv = .text:0x802A1800; // type:function size:0x4
executeState_ModeSelectIn__14dLytShopMain_cFv = .text:0x802A1810; // type:function size:0x168
finalizeState_ModeSelectIn__14dLytShopMain_cFv = .text:0x802A1980; // type:function size:0x4
initializeState_ModeSelectCheck__14dLytShopMain_cFv = .text:0x802A1990; // type:function size:0x20
executeState_ModeSelectCheck__14dLytShopMain_cFv = .text:0x802A19B0; // type:function size:0xD8
finalizeState_ModeSelectCheck__14dLytShopMain_cFv = .text:0x802A1A90; // type:function size:0x4
initializeState_ModeSelectOut__14dLytShopMain_cFv = .text:0x802A1AA0; // type:function size:0x4
executeState_ModeSelectOut__14dLytShopMain_cFv = .text:0x802A1AB0; // type:function size:0xDC
finalizeState_ModeSelectOut__14dLytShopMain_cFv = .text:0x802A1B90; // type:function size:0x4
initializeState_ModeOutIn__14dLytShopMain_cFv = .text:0x802A1BA0; // type:function size:0x4
executeState_ModeOutIn__14dLytShopMain_cFv = .text:0x802A1BB0; // type:function size:0x324
finalizeState_ModeOutIn__14dLytShopMain_cFv = .text:0x802A1EE0; // type:function size:0x4
initializeState_ModeMaterialCheck__14dLytShopMain_cFv = .text:0x802A1EF0; // type:function size:0x1C
executeState_ModeMaterialCheck__14dLytShopMain_cFv = .text:0x802A1F10; // type:function size:0xDC
finalizeState_ModeMaterialCheck__14dLytShopMain_cFv = .text:0x802A1FF0; // type:function size:0x4
initializeState_ModeOut__14dLytShopMain_cFv = .text:0x802A2000; // type:function size:0x4
executeState_ModeOut__14dLytShopMain_cFv = .text:0x802A2010; // type:function size:0x170
finalizeState_ModeOut__14dLytShopMain_cFv = .text:0x802A2180; // type:function size:0x4
initializeState_ModeInOut__14dLytShopMain_cFv = .text:0x802A2190; // type:function size:0x4
executeState_ModeInOut__14dLytShopMain_cFv = .text:0x802A21A0; // type:function size:0x264
finalizeState_ModeInOut__14dLytShopMain_cFv = .text:0x802A2410; // type:function size:0x4
__ct__14dLytShopMain_cFv = .text:0x802A2420; // type:function size:0x200
__dt__53sFStateMgr_c<14dLytShopMain_c,20sStateMethodUsr_FI_c>Fv = .text:0x802A2620; // type:function size:0xA4
__dt__83sStateMgr_c<14dLytShopMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802A26D0; // type:function size:0xA0
__dt__30sFStateFct_c<14dLytShopMain_c>Fv = .text:0x802A2770; // type:function size:0x6C
__dt__27sFState_c<14dLytShopMain_c>Fv = .text:0x802A27E0; // type:function size:0x58
build__14dLytShopMain_cFPQ23d2d10ResAccIf_c = .text:0x802A2840; // type:function size:0x438
execute__14dLytShopMain_cFv = .text:0x802A2C80; // type:function size:0x3C8
executeState__83sStateMgr_c<14dLytShopMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802A3050; // type:function size:0x10
draw__14dLytShopMain_cFv = .text:0x802A3060; // type:function size:0x50
remove__14dLytShopMain_cFv = .text:0x802A30B0; // type:function size:0x1F8
setModeNone__14dLytShopMain_cFv = .text:0x802A32B0; // type:function size:0x50
changeState__83sStateMgr_c<14dLytShopMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x802A3300; // type:function size:0x10
setModeSelectIn__14dLytShopMain_cFv = .text:0x802A3310; // type:function size:0x154
setModeSelectCheck__14dLytShopMain_cFv = .text:0x802A3470; // type:function size:0x50
setModeSelectOut__14dLytShopMain_cFv = .text:0x802A34C0; // type:function size:0xE0
setModeOutIn__14dLytShopMain_cFv = .text:0x802A35A0; // type:function size:0xFC
setModeMaterialCheck__14dLytShopMain_cFv = .text:0x802A36A0; // type:function size:0x58
setModeOut__14dLytShopMain_cFv = .text:0x802A3700; // type:function size:0x94
setModeInOut__14dLytShopMain_cFv = .text:0x802A37A0; // type:function size:0xB4
buildSubpanes__14dLytShopMain_cFv = .text:0x802A3860; // type:function size:0x30C
prepareRemodelStoreStuff__14dLytShopMain_cFl = .text:0x802A3B70; // type:function size:0x47C
addItemToDisplayed__14dLytShopMain_cFlll = .text:0x802A3FF0; // type:function size:0x2C8
buildMaterialCheckIcons__14dLytShopMain_cFPQ23d2d10ResAccIf_cUc = .text:0x802A42C0; // type:function size:0x168
fn_802A4430__14dLytShopMain_cFl = .text:0x802A4430; // type:function size:0x5C
fn_802A4490 = .text:0x802A4490; // type:function size:0x68
fn_802A4500 = .text:0x802A4500; // type:function size:0x44
fn_802A4550 = .text:0x802A4550; // type:function size:0x8E4
fn_802A4E40 = .text:0x802A4E40; // type:function size:0x1C4
dLytShopMain__updateShopStuffMaybe = .text:0x802A5010; // type:function size:0x74C
fn_802A4550__14dLytShopMain_cFv = .text:0x802A4550; // type:function size:0x8E4
checkNav__14dLytShopMain_cFv = .text:0x802A4E40; // type:function size:0x1C4
updateShopStuffMaybe__14dLytShopMain_cFv = .text:0x802A5010; // type:function size:0x74C
fn_802A5760 = .text:0x802A5760; // type:function size:0x18
fn_802A5780 = .text:0x802A5780; // type:function size:0x14
dLytShopMain__getDigitsInPrice = .text:0x802A57A0; // type:function size:0x58
@@ -15887,85 +15887,85 @@ dLytShopMain__showPriceMaybe = .text:0x802A59D0; // type:function size:0x118
fn_802A5AF0 = .text:0x802A5AF0; // type:function size:0xA0
fn_802A5B90 = .text:0x802A5B90; // type:function size:0x1C
fn_802A5BB0 = .text:0x802A5BB0; // type:function size:0x18
fn_802A5BD0 = .text:0x802A5BD0; // type:function size:0xD0
fn_802A5CA0 = .text:0x802A5CA0; // type:function size:0xD4
fn_802A5D80 = .text:0x802A5D80; // type:function size:0x4
dLytShop__stateNoneUpdate = .text:0x802A5D90; // type:function size:0x68
fn_802A5E00 = .text:0x802A5E00; // type:function size:0x10
fn_802A5E10 = .text:0x802A5E10; // type:function size:0x4
fn_802A5E20 = .text:0x802A5E20; // type:function size:0x4
dLytShop__stateSelectInUpdate = .text:0x802A5E30; // type:function size:0x68
fn_802A5EA0 = .text:0x802A5EA0; // type:function size:0x4
fn_802A5EB0 = .text:0x802A5EB0; // type:function size:0x4
dLytShop__stateSelectCheckUpdate = .text:0x802A5EC0; // type:function size:0x140
fn_802A6000 = .text:0x802A6000; // type:function size:0x4
fn_802A6010 = .text:0x802A6010; // type:function size:0x4
dLytShop__stateSelectOutUpdate = .text:0x802A6020; // type:function size:0x64
fn_802A6090 = .text:0x802A6090; // type:function size:0x4
fn_802A60A0 = .text:0x802A60A0; // type:function size:0x4
dLytShop__stateOutInUpdate = .text:0x802A60B0; // type:function size:0x5C
fn_802A6110 = .text:0x802A6110; // type:function size:0x4
fn_802A6120 = .text:0x802A6120; // type:function size:0x4
dLytShop__stateMaterialCheckUpdate = .text:0x802A6130; // type:function size:0x10C
fn_802A6240 = .text:0x802A6240; // type:function size:0x4
fn_802A6250 = .text:0x802A6250; // type:function size:0x4
dLytShop__stateOutUpdate = .text:0x802A6260; // type:function size:0x5C
fn_802A62C0 = .text:0x802A62C0; // type:function size:0x4
fn_802A62D0 = .text:0x802A62D0; // type:function size:0x4
dLytShop__stateInOutUpdate = .text:0x802A62E0; // type:function size:0x5C
fn_802A6340 = .text:0x802A6340; // type:function size:0x4
fn_802A6350 = .text:0x802A6350; // type:function size:0x4
fn_802A6360 = .text:0x802A6360; // type:function size:0x4
fn_802A6370 = .text:0x802A6370; // type:function size:0x4
dLytShop__ctor = .text:0x802A6380; // type:function size:0xF8
fn_802A6480 = .text:0x802A6480; // type:function size:0x58
fn_802A64E0 = .text:0x802A64E0; // type:function size:0x6C
fn_802A6550 = .text:0x802A6550; // type:function size:0xA0
fn_802A65F0 = .text:0x802A65F0; // type:function size:0xA4
dLytShopMain__dtor = .text:0x802A66A0; // type:function size:0x1E8
fn_802A6890 = .text:0x802A6890; // type:function size:0x54
dLytShop__init = .text:0x802A68F0; // type:function size:0x6C
dLytShop__update = .text:0x802A6960; // type:function size:0xB0
fn_802A6A10 = .text:0x802A6A10; // type:function size:0x10
fn_802A6A20 = .text:0x802A6A20; // type:function size:0x10
dLytShop__draw = .text:0x802A6A30; // type:function size:0x78
dLytShop__delete = .text:0x802A6AB0; // type:function size:0x44
fn_802A5BD0__14dLytShopMain_cFv = .text:0x802A5BD0; // type:function size:0xD0
fn_802A5CA0__14dLytShopMain_cFb = .text:0x802A5CA0; // type:function size:0xD4
initializeState_None__10dLytShop_cFv = .text:0x802A5D80; // type:function size:0x4
executeState_None__10dLytShop_cFv = .text:0x802A5D90; // type:function size:0x68
changeState__79sStateMgr_c<10dLytShop_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x802A5E00; // type:function size:0x10
finalizeState_None__10dLytShop_cFv = .text:0x802A5E10; // type:function size:0x4
initializeState_SelectIn__10dLytShop_cFv = .text:0x802A5E20; // type:function size:0x4
executeState_SelectIn__10dLytShop_cFv = .text:0x802A5E30; // type:function size:0x68
finalizeState_SelectIn__10dLytShop_cFv = .text:0x802A5EA0; // type:function size:0x4
initializeState_SelectCheck__10dLytShop_cFv = .text:0x802A5EB0; // type:function size:0x4
executeState_SelectCheck__10dLytShop_cFv = .text:0x802A5EC0; // type:function size:0x140
finalizeState_SelectCheck__10dLytShop_cFv = .text:0x802A6000; // type:function size:0x4
initializeState_SelectOut__10dLytShop_cFv = .text:0x802A6010; // type:function size:0x4
executeState_SelectOut__10dLytShop_cFv = .text:0x802A6020; // type:function size:0x64
finalizeState_SelectOut__10dLytShop_cFv = .text:0x802A6090; // type:function size:0x4
initializeState_OutIn__10dLytShop_cFv = .text:0x802A60A0; // type:function size:0x4
executeState_OutIn__10dLytShop_cFv = .text:0x802A60B0; // type:function size:0x5C
finalizeState_OutIn__10dLytShop_cFv = .text:0x802A6110; // type:function size:0x4
initializeState_MaterialCheck__10dLytShop_cFv = .text:0x802A6120; // type:function size:0x4
executeState_MaterialCheck__10dLytShop_cFv = .text:0x802A6130; // type:function size:0x10C
finalizeState_MaterialCheck__10dLytShop_cFv = .text:0x802A6240; // type:function size:0x4
initializeState_Out__10dLytShop_cFv = .text:0x802A6250; // type:function size:0x4
executeState_Out__10dLytShop_cFv = .text:0x802A6260; // type:function size:0x5C
finalizeState_Out__10dLytShop_cFv = .text:0x802A62C0; // type:function size:0x4
initializeState_InOut__10dLytShop_cFv = .text:0x802A62D0; // type:function size:0x4
executeState_InOut__10dLytShop_cFv = .text:0x802A62E0; // type:function size:0x5C
finalizeState_InOut__10dLytShop_cFv = .text:0x802A6340; // type:function size:0x4
initializeState_End__10dLytShop_cFv = .text:0x802A6350; // type:function size:0x4
executeState_End__10dLytShop_cFv = .text:0x802A6360; // type:function size:0x4
finalizeState_End__10dLytShop_cFv = .text:0x802A6370; // type:function size:0x4
dLytShop_c_classInit__Fv = .text:0x802A6380; // type:function size:0xF8
__dt__23sFState_c<10dLytShop_c>Fv = .text:0x802A6480; // type:function size:0x58
__dt__26sFStateFct_c<10dLytShop_c>Fv = .text:0x802A64E0; // type:function size:0x6C
__dt__79sStateMgr_c<10dLytShop_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802A6550; // type:function size:0xA0
__dt__49sFStateMgr_c<10dLytShop_c,20sStateMethodUsr_FI_c>Fv = .text:0x802A65F0; // type:function size:0xA4
__dt__14dLytShopMain_cFv = .text:0x802A66A0; // type:function size:0x1E8
build__10dLytShop_cFv = .text:0x802A6890; // type:function size:0x54
create__10dLytShop_cFv = .text:0x802A68F0; // type:function size:0x6C
execute__10dLytShop_cFv = .text:0x802A6960; // type:function size:0xB0
getStateID__79sStateMgr_c<10dLytShop_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802A6A10; // type:function size:0x10
executeState__79sStateMgr_c<10dLytShop_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802A6A20; // type:function size:0x10
draw__10dLytShop_cFv = .text:0x802A6A30; // type:function size:0x78
doDelete__10dLytShop_cFv = .text:0x802A6AB0; // type:function size:0x44
fn_802A6B00 = .text:0x802A6B00; // type:function size:0x8
fn_802A6B10 = .text:0x802A6B10; // type:function size:0x28C
fn_802A6DA0 = .text:0x802A6DA0; // type:function size:0x60
fn_802A6E00 = .text:0x802A6E00; // type:function size:0xC
fn_802A6E10 = .text:0x802A6E10; // type:function size:0x60
fn_802A6E70 = .text:0x802A6E70; // type:function size:0xC
fn_802A6E80 = .text:0x802A6E80; // type:function size:0x1C
fn_802A6EA0 = .text:0x802A6EA0; // type:function size:0x1C
fn_802A6EC0 = .text:0x802A6EC0; // type:function size:0x1C
fn_802A6EE0 = .text:0x802A6EE0; // type:function size:0x1C
fn_802A6F00 = .text:0x802A6F00; // type:function size:0x1C
fn_802A6F20 = .text:0x802A6F20; // type:function size:0x1C
fn_802A6F40 = .text:0x802A6F40; // type:function size:0x10
fn_802A6F50 = .text:0x802A6F50; // type:function size:0x10
fn_802A6F60 = .text:0x802A6F60; // type:function size:0x10
fn_802A6F70 = .text:0x802A6F70; // type:function size:0x10
fn_802A6F80 = .text:0x802A6F80; // type:function size:0x10
fn_802A6F90 = .text:0x802A6F90; // type:function size:0x10
fn_802A6FA0 = .text:0x802A6FA0; // type:function size:0x10
fn_802A6FB0 = .text:0x802A6FB0; // type:function size:0x10
fn_802A6FC0 = .text:0x802A6FC0; // type:function size:0x10
fn_802A6FD0 = .text:0x802A6FD0; // type:function size:0x10
fn_802A6FE0 = .text:0x802A6FE0; // type:function size:0x10
fn_802A6FF0 = .text:0x802A6FF0; // type:function size:0x10
fn_802A7000 = .text:0x802A7000; // type:function size:0x10
fn_802A7010 = .text:0x802A7010; // type:function size:0x30
fn_802A7040 = .text:0x802A7040; // type:function size:0x30
fn_802A7070 = .text:0x802A7070; // type:function size:0x30
fn_802A70A0 = .text:0x802A70A0; // type:function size:0x30
fn_802A70D0 = .text:0x802A70D0; // type:function size:0x30
fn_802A7100 = .text:0x802A7100; // type:function size:0x30
dLytShop__initStates = .text:0x802A7130; // type:function size:0xCD0
dLytShopMain__stateDtor = .text:0x802A7E00; // type:function size:0x58
dLytShop__dtor = .text:0x802A7E60; // type:function size:0x58
fn_802A7EC0 = .text:0x802A7EC0; // type:function size:0x88
fn_802A7F50 = .text:0x802A7F50; // type:function size:0x88
__dt__10dLytShop_cFv = .text:0x802A6B10; // type:function size:0x28C
build__26sFStateFct_c<10dLytShop_c>FRC12sStateIDIf_c = .text:0x802A6DA0; // type:function size:0x60
dispose__26sFStateFct_c<10dLytShop_c>FRP10sStateIf_c = .text:0x802A6E00; // type:function size:0xC
build__30sFStateFct_c<14dLytShopMain_c>FRC12sStateIDIf_c = .text:0x802A6E10; // type:function size:0x60
dispose__30sFStateFct_c<14dLytShopMain_c>FRP10sStateIf_c = .text:0x802A6E70; // type:function size:0xC
initialize__23sFState_c<10dLytShop_c>Fv = .text:0x802A6E80; // type:function size:0x1C
execute__23sFState_c<10dLytShop_c>Fv = .text:0x802A6EA0; // type:function size:0x1C
finalize__23sFState_c<10dLytShop_c>Fv = .text:0x802A6EC0; // type:function size:0x1C
initialize__27sFState_c<14dLytShopMain_c>Fv = .text:0x802A6EE0; // type:function size:0x1C
execute__27sFState_c<14dLytShopMain_c>Fv = .text:0x802A6F00; // type:function size:0x1C
finalize__27sFState_c<14dLytShopMain_c>Fv = .text:0x802A6F20; // type:function size:0x1C
initializeState__79sStateMgr_c<10dLytShop_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802A6F40; // type:function size:0x10
finalizeState__79sStateMgr_c<10dLytShop_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802A6F50; // type:function size:0x10
refreshState__79sStateMgr_c<10dLytShop_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802A6F60; // type:function size:0x10
getState__79sStateMgr_c<10dLytShop_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802A6F70; // type:function size:0x10
getNewStateID__79sStateMgr_c<10dLytShop_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802A6F80; // type:function size:0x10
getOldStateID__79sStateMgr_c<10dLytShop_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802A6F90; // type:function size:0x10
initializeState__83sStateMgr_c<14dLytShopMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802A6FA0; // type:function size:0x10
finalizeState__83sStateMgr_c<14dLytShopMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802A6FB0; // type:function size:0x10
refreshState__83sStateMgr_c<14dLytShopMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802A6FC0; // type:function size:0x10
getState__83sStateMgr_c<14dLytShopMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802A6FD0; // type:function size:0x10
getNewStateID__83sStateMgr_c<14dLytShopMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802A6FE0; // type:function size:0x10
getStateID__83sStateMgr_c<14dLytShopMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802A6FF0; // type:function size:0x10
getOldStateID__83sStateMgr_c<14dLytShopMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802A7000; // type:function size:0x10
finalizeState__29sFStateID_c<14dLytShopMain_c>CFR14dLytShopMain_c = .text:0x802A7010; // type:function size:0x30
executeState__29sFStateID_c<14dLytShopMain_c>CFR14dLytShopMain_c = .text:0x802A7040; // type:function size:0x30
initializeState__29sFStateID_c<14dLytShopMain_c>CFR14dLytShopMain_c = .text:0x802A7070; // type:function size:0x30
finalizeState__25sFStateID_c<10dLytShop_c>CFR10dLytShop_c = .text:0x802A70A0; // type:function size:0x30
executeState__25sFStateID_c<10dLytShop_c>CFR10dLytShop_c = .text:0x802A70D0; // type:function size:0x30
initializeState__25sFStateID_c<10dLytShop_c>CFR10dLytShop_c = .text:0x802A7100; // type:function size:0x30
__sinit_\d_lyt_shop_cpp = .text:0x802A7130; // type:function size:0xCD0
__dt__29sFStateID_c<14dLytShopMain_c>Fv = .text:0x802A7E00; // type:function size:0x58
__dt__25sFStateID_c<10dLytShop_c>Fv = .text:0x802A7E60; // type:function size:0x58
isSameName__25sFStateID_c<10dLytShop_c>CFPCc = .text:0x802A7EC0; // type:function size:0x88
isSameName__29sFStateID_c<14dLytShopMain_c>CFPCc = .text:0x802A7F50; // type:function size:0x88
initializeState_ModeNone__17dLytDepositMain_cFv = .text:0x802A7FE0; // type:function size:0x4
executeState_ModeNone__17dLytDepositMain_cFv = .text:0x802A7FF0; // type:function size:0x10
finalizeState_ModeNone__17dLytDepositMain_cFv = .text:0x802A8000; // type:function size:0x4
@@ -37336,7 +37336,10 @@ lbl_8053C3F4 = .data:0x8053C3F4; // type:object size:0xA data:string
lbl_8053C400 = .data:0x8053C400; // type:object size:0xB data:string
jumptable_8053C40C = .data:0x8053C40C; // type:object size:0x24 scope:local
jumptable_8053C430 = .data:0x8053C430; // type:object size:0x24 scope:local
lbl_8053C454 = .data:0x8053C454; // type:object size:0x44
lbl_8053C454 = .data:0x8053C454; // type:object size:0xF data:string
lbl_8053C464 = .data:0x8053C464; // type:object size:0x13 data:string
lbl_8053C478 = .data:0x8053C478; // type:object size:0x10 data:string
lbl_8053C488 = .data:0x8053C488; // type:object size:0xF data:string
lbl_8053C498 = .data:0x8053C498; // type:object size:0xD data:string
lbl_8053C4A8 = .data:0x8053C4A8; // type:object size:0xD data:string
lbl_8053C4B8 = .data:0x8053C4B8; // type:object size:0xD data:string
@@ -37364,18 +37367,18 @@ lbl_8053C6D0 = .data:0x8053C6D0; // type:object size:0xD data:string
lbl_8053C6E0 = .data:0x8053C6E0; // type:object size:0x10 data:4byte
g_profile_LYT_SHOP = .data:0x8053C6F0; // type:object size:0x10
lbl_8053C700 = .data:0x8053C700; // type:object size:0x18 data:string
dLytShop__vtable = .data:0x8053C718; // type:object size:0x50
lbl_8053C768 = .data:0x8053C768; // type:object size:0x30
lbl_8053C798 = .data:0x8053C798; // type:object size:0x30
lbl_8053C7C8 = .data:0x8053C7C8; // type:object size:0x18
lbl_8053C7E0 = .data:0x8053C7E0; // type:object size:0x18
lbl_8053C7F8 = .data:0x8053C7F8; // type:object size:0x10
lbl_8053C808 = .data:0x8053C808; // type:object size:0x30
lbl_8053C838 = .data:0x8053C838; // type:object size:0x30
lbl_8053C868 = .data:0x8053C868; // type:object size:0x18
lbl_8053C880 = .data:0x8053C880; // type:object size:0x6E0
lbl_8053CF60 = .data:0x8053CF60; // type:object size:0x34
lbl_8053CF94 = .data:0x8053CF94; // type:object size:0x34
__vt__10dLytShop_c = .data:0x8053C718; // type:object size:0x50
__vt__49sFStateMgr_c<10dLytShop_c,20sStateMethodUsr_FI_c> = .data:0x8053C768; // type:object size:0x30
__vt__79sStateMgr_c<10dLytShop_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x8053C798; // type:object size:0x30
__vt__26sFStateFct_c<10dLytShop_c> = .data:0x8053C7C8; // type:object size:0x18
__vt__23sFState_c<10dLytShop_c> = .data:0x8053C7E0; // type:object size:0x18
__vt__14dLytShopMain_c = .data:0x8053C7F8; // type:object size:0x10
__vt__53sFStateMgr_c<14dLytShopMain_c,20sStateMethodUsr_FI_c> = .data:0x8053C808; // type:object size:0x30
__vt__83sStateMgr_c<14dLytShopMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x8053C838; // type:object size:0x30
__vt__30sFStateFct_c<14dLytShopMain_c> = .data:0x8053C868; // type:object size:0x18
__vt__27sFState_c<14dLytShopMain_c> = .data:0x8053C880; // type:object size:0x6E0
__vt__29sFStateID_c<14dLytShopMain_c> = .data:0x8053CF60; // type:object size:0x34
__vt__25sFStateID_c<10dLytShop_c> = .data:0x8053CF94; // type:object size:0x34
@24934 = .data:0x8053CFC8; // type:object size:0x17 scope:local data:string
...data.0 = .data:0x8053CFC8; // type:label scope:local
@24935 = .data:0x8053CFE0; // type:object size:0xB scope:local data:string
include/d/a/d_a_item.h
+1
View File
@@ -48,6 +48,7 @@ public:
static void spawnDrop(u16 item, u32 room, const mVec3_c &pos, const mAng3_c &rot);
static void giveItem22(ITEM_ID, s32, s32);
static void giveItem(ITEM_ID, s32, s32);
// TODO should these be u16?
static u32 checkFlag(u32 flag);
static bool hasItem(u32 flag) {
return checkFlag(flag);
include/d/lyt/d_lyt_common_icon_item_maps.h
+3 -3
View File
@@ -55,7 +55,7 @@
#define LYT_CMN_ItemInvalid (18) // -------------------------
// Pouch Items
#define LYT_CMN_PouchPotionHealyh (0) // [12] uc_bottleKusuriA_00.tpl
#define LYT_CMN_PouchPotionHealth (0) // [12] uc_bottleKusuriA_00.tpl
#define LYT_CMN_PouchBottle (1) // [ 5] uc_bottleEmpty_00.tpl
#define LYT_CMN_PouchShieldWoodA (2) // [39] uc_shieldWoodA_00.tpl
#define LYT_CMN_PouchShieldIronA (3) // [36] uc_shieldIronA_00.tpl
@@ -68,8 +68,8 @@
#define LYT_CMN_PouchPotionAirPlus (10) // [ 4] uc_bottleAirB_00.tpl
#define LYT_CMN_PouchPotionStaminaPlus (11) // [ 8] uc_bottleGutsB_00.tpl
#define LYT_CMN_PouchBlank4 (12) // [ 0] tr_black4_00.tpl
#define LYT_CMN_PouchPotionGaurdian (13) // [16] uc_bottleMutekiA_00.tpl
#define LYT_CMN_PouchPotionGaurdianPlus (14) // [17] uc_bottleMutekiB_00.tpl
#define LYT_CMN_PouchPotionGuardian (13) // [16] uc_bottleMutekiA_00.tpl
#define LYT_CMN_PouchPotionGuardianPlus (14) // [17] uc_bottleMutekiB_00.tpl
#define LYT_CMN_PouchShieldWoodB (15) // [40] uc_shieldWoodB_00.tpl
#define LYT_CMN_PouchShieldWoodC (16) // [41] uc_shieldWoodC_00.tpl
#define LYT_CMN_PouchShieldIronB (17) // [37] uc_shieldIronB_00.tpl
include/d/lyt/d_lyt_common_icon_material.h
+5
View File
@@ -132,6 +132,11 @@ private:
class dLytCommonIconMaterial_c : public d2d::dSubPane {
public:
enum Variant_e {
BUG,
TREASURE,
};
dLytCommonIconMaterial_c() : mStateMgr(*this, sStateID::null), mPart(2) {}
~dLytCommonIconMaterial_c() {}
include/d/lyt/d_lyt_deposit.h
-3
View File
@@ -139,8 +139,6 @@ private:
STATE_FUNC_DECLARE(dLytDepositMain_c, ModeArrangementOut);
STATE_FUNC_DECLARE(dLytDepositMain_c, ModeOut);
STATE_MGR_DEFINE_UTIL_CHANGESTATE(dLytDepositMain_c);
/* 0x00004 */ UI_STATE_MGR_DECLARE(dLytDepositMain_c);
/* 0x00040 */ d2d::LytBase_c mLyt;
/* 0x000D0 */ d2d::AnmGroup_c mAnm[36];
@@ -227,7 +225,6 @@ private:
STATE_FUNC_DECLARE(dLytDeposit_c, Out);
STATE_MGR_DEFINE_UTIL_ISSTATE(dLytDeposit_c);
STATE_MGR_DEFINE_UTIL_CHANGESTATE(dLytDeposit_c);
/* 0x0008C */ UI_STATE_MGR_DECLARE(dLytDeposit_c);
/* 0x000C8 */ d2d::ResAccIf_c mResAcc;
include/d/lyt/d_lyt_shop.h
+161 -1
View File
@@ -1,14 +1,174 @@
#ifndef D_LYT_SHOP_H
#define D_LYT_SHOP_H
class dLytShop_c {
#include "d/d_cursor_hit_check.h"
#include "d/d_pad_nav.h"
#include "d/lyt/d2d.h"
#include "d/lyt/d_lyt_base.h"
#include "d/lyt/d_lyt_common_icon_item.h"
#include "d/lyt/d_lyt_common_icon_material.h"
#include "nw4r/lyt/lyt_bounding.h"
#include "s/s_State.hpp"
class dLytShopMain_c {
public:
enum Service_e {
SERVICE_POTION_INFUSE,
SERVICE_GEAR_UPGRADE,
SERVICE_SHIELD_REPAIR,
};
private:
enum Phase_e {
PHASE_SELECT_ITEM,
PHASE_MATERIAL_CHECK,
};
public:
dLytShopMain_c();
virtual ~dLytShopMain_c() {
dPadNav::setNavEnabled(false, false);
}
bool build(d2d::ResAccIf_c *resAcc);
bool execute();
bool draw();
bool remove();
bool isIdle() const {
return mIsIdle;
}
s32 getService() const {
return mService;
}
bool getField_0x116DD() const {
return field_0x116DD;
}
bool getField_0x116DE() const {
return field_0x116DE;
}
void retry() {
mIsIdle = false;
}
void setModeNone();
void setModeSelectIn();
void setModeSelectCheck();
void setModeSelectOut();
void setModeOutIn();
void setModeMaterialCheck();
void setModeOut();
void setModeInOut();
private:
static const s32 NUM_ITEMS = 12;
void buildSubpanes();
void handleNavigation();
s32 checkNav();
void buildMaterialCheckIcons(d2d::ResAccIf_c *resAcc, u8 variant);
void addItemToDisplayed(s32 itemIdx, s32 itemKind, s32 pouchSlot);
void updateShopStuffMaybe();
void prepareRemodelStoreStuff(s32 service);
void showShopLytMaybe();
void showPriceMaybe(s32 value);
s32 getItemTier(s32 item);
s32 calcNumDigits(s32 value);
void fn_802A5CA0(bool);
void fn_802A5BD0();
s32 fn_802A4490(s32);
s32 fn_802A4500(s32);
s32 fn_802A5760(u8);
s32 fn_802A5780(u8);
STATE_FUNC_DECLARE(dLytShopMain_c, ModeNone);
STATE_FUNC_DECLARE(dLytShopMain_c, ModeSelectIn);
STATE_FUNC_DECLARE(dLytShopMain_c, ModeSelectCheck);
STATE_FUNC_DECLARE(dLytShopMain_c, ModeSelectOut);
STATE_FUNC_DECLARE(dLytShopMain_c, ModeOutIn);
STATE_FUNC_DECLARE(dLytShopMain_c, ModeMaterialCheck);
STATE_FUNC_DECLARE(dLytShopMain_c, ModeOut);
STATE_FUNC_DECLARE(dLytShopMain_c, ModeInOut);
/* 0x00004 */ UI_STATE_MGR_DECLARE(dLytShopMain_c);
/* 0x00040 */ d2d::LytBase_c mLyts[3];
/* 0x001F0 */ d2d::AnmGroup_c mAnmItemSelect[9];
/* 0x00430 */ d2d::AnmGroup_c mAnmMaterialCheck[18];
/* 0x008B0 */ d2d::AnmGroup_c mAnmShopInfo[2];
/* 0x00930 */ nw4r::lyt::Bounding *mpItemBoundings[13];
/* 0x00964 */ nw4r::lyt::Bounding *mpMaterialCheckChoiceBoundings[2];
/* 0x0096C */ dCursorHitCheckLyt_c mCsHitChecks[3];
/* 0x009E4 */ dLytCommonIconItem_c mBWheelOrPouchItemIcons[24];
/* 0x0CAA4 */ dLytCommonIconItem_c mUpgradePreviewIcons[4];
/* 0x0EAC4 */ dLytCommonIconMaterial_c mUpgradeCostIcons[8];
/* 0x11484 */ d2d::SubPaneList mItemList;
/* 0x11490 */ d2d::SubPaneListNode mBWheelOrPouchNodes[24];
/* 0x11610 */ d2d::SubPaneList mUpgradeList;
/* 0x1161C */ d2d::SubPaneListNode mUpgradeNodes[12];
/* 0x116DC */ bool mIsIdle;
/* 0x116DD */ bool field_0x116DD;
/* 0x116DE */ bool field_0x116DE;
/* 0x116DF */ bool mUpgradeLoaded;
/* 0x116E0 */ bool mPrevPointerVisible;
/* 0x116E1 */ bool field_0x116E1;
/* 0x116E4 */ s32 mPhase;
/* 0x116E8 */ s32 mCurrentNavTarget;
/* 0x116EC */ s32 mStateStep;
/* 0x116F0 */ s32 mUpgradeIdx;
/* 0x116F4 */ s32 mService;
/* 0x116F8 */ s32 mItemCount;
/* 0x116FC */ s32 mUpgradeCostCount;
/* 0x11700 */ UNKWORD field_0x11700;
/* 0x11704 */ s32 mItemUpgradeIdxes[NUM_ITEMS];
/* 0x11734 */ s32 mItemPouchSlots[NUM_ITEMS];
/* 0x11764 */ u8 mItemKinds[NUM_ITEMS];
/* 0x11770 */ u8 field_0x11770[8];
};
class dLytShop_c : public dLytBase_c {
public:
dLytShop_c() : mStateMgr(*this) {}
virtual ~dLytShop_c() {
removeLyt();
}
static dLytShop_c *GetInstance() {
return sInstance;
}
virtual bool build() override;
virtual int create() override;
virtual int execute() override;
virtual int draw() override;
virtual int doDelete() override;
private:
static dLytShop_c *sInstance;
STATE_FUNC_DECLARE(dLytShop_c, None);
STATE_FUNC_DECLARE(dLytShop_c, SelectIn);
STATE_FUNC_DECLARE(dLytShop_c, SelectCheck);
STATE_FUNC_DECLARE(dLytShop_c, SelectOut);
STATE_FUNC_DECLARE(dLytShop_c, OutIn);
STATE_FUNC_DECLARE(dLytShop_c, MaterialCheck);
STATE_FUNC_DECLARE(dLytShop_c, Out);
STATE_FUNC_DECLARE(dLytShop_c, InOut);
STATE_FUNC_DECLARE(dLytShop_c, End);
STATE_MGR_DEFINE_UTIL_ISSTATE(dLytShop_c);
/* 0x0008C */ UI_STATE_MGR_DECLARE(dLytShop_c);
/* 0x000C8 */ d2d::ResAccIf_c mResAcc;
/* 0x00438 */ dLytShopMain_c mMain;
/* 0x11BB0 */ bool mInRequest;
/* 0x11BB1 */ bool mIsMovingOut;
};
#endif
include/d/lyt/d_lyt_util_items.h
+6
View File
@@ -63,6 +63,7 @@ void getCaptionItemLabel(s32 itemId, SizedString<32> &buf);
void getDowsingLabel(s32 itemId, SizedString<32> &buf);
void getPauseCategoryLabel(s32 itemId, SizedString<32> &buf);
// TODO these could be u16
const wchar_t *getItemText(s32 itemId);
const wchar_t *getCaptionItemText(s32 itemId);
const wchar_t *getDowsingText(s32 itemId);
@@ -76,8 +77,13 @@ u8 getPouchItemForSlot(s32 slot, bool unk);
bool hasPouchSlot(s32 slot, bool unk);
s32 getPouchItemAmount(s32 slot, bool unk);
u8 getPouchItemNumberColor(s32 slot, bool unk);
// not sure about this one
f32 getPouchShieldDurability(s32 slot, bool unk);
u32 getPouchItemIdForIndex(s32 slot, bool unk);
// not sure about this one
f32 getPouchShieldDurability2(s32 slot, bool unk);
// not sure about this one
s32 getEvenMoreShieldStuff(s32 slot, bool unk);
u8 getDepositItemForSlot(s32 slot);
s32 getDepositItemAmount(s32 slot);
src/d/d_room.cpp
+2 -1
View File
@@ -3,6 +3,7 @@
#include "common.h"
#include "d/a/d_a_base.h"
#include "d/a/d_a_item.h"
#include "d/a/d_a_itembase.h"
#include "d/a/obj/d_a_obj_base.h"
#include "d/col/bg/d_bg_s.h"
#include "d/col/bg/d_bg_w_base.h"
@@ -287,7 +288,7 @@ void dRoom_c::drawOnMapIfVisible(mMtx_c *mtx, int param) {
bool drawFully = true;
if (dStageMgr_c::GetInstance()->isAreaTypeDungeonOrBoss()) {
drawFully = dStage_c::GetInstance()->hasVisitedRoom(roomid);
if (!drawFully && !dAcItem_c::checkFlag(/* DUNGEON_MAP_FI */ 0x32)) {
if (!drawFully && !dAcItem_c::checkFlag(ITEM_DUNGEON_MAP_FI)) {
return;
}
} else {
src/d/lyt/d_lyt_shop.cpp
+1909
View File
File diff suppressed because it is too large Load Diff