mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-07 21:40:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Matching, I guess

Browse Source
This commit is contained in:
robojumper
2025-04-10 20:30:27 +02:00
parent 803541336d
commit d19adefd7a
26 changed files with 1609 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/splits.txt
+2 -1
View File
@@ -360,7 +360,8 @@ d/lyt/meter/d_lyt_meter_item_select.cpp:
.ctors start:0x804DB700 end:0x804DB704
.rodata start:0x804E5B28 end:0x804E5F28
.data start:0x805153A8 end:0x80516A28
.sdata2 start:0x80579BD0 end:0x80579C08
.sdata start:0x805723F0 end:0x80572400
.sdata2 start:0x80579BD0 end:0x80579BF8
.bss start:0x805AACD0 end:0x805AB650
d/lyt/meter/d_lyt_meter_plus_btn.cpp:
config/SOUE01/symbols.txt
+152 -153
View File
@@ -902,8 +902,8 @@ fn_80026D70 = .text:0x80026D70; // type:function size:0x3C
fn_80026DB0 = .text:0x80026DB0; // type:function size:0xA0
fn_80026E50 = .text:0x80026E50; // type:function size:0x3C
fn_80026E90 = .text:0x80026E90; // type:function size:0x3C
fn_80026ED0 = .text:0x80026ED0; // type:function size:0x3C
fn_80026F10 = .text:0x80026F10; // type:function size:0x3C
fn_80026ED0__13EffectsStructFv = .text:0x80026ED0; // type:function size:0x3C
fn_80026F10__13EffectsStructFv = .text:0x80026F10; // type:function size:0x3C
fn_80026F50 = .text:0x80026F50; // type:function size:0xD8
fn_80027030 = .text:0x80027030; // type:function size:0xD8
fn_80027110 = .text:0x80027110; // type:function size:0xC8
@@ -961,13 +961,13 @@ EffectManager__dtor = .text:0x800296F0; // type:function size:0xBC
fn_800297B0 = .text:0x800297B0; // type:function size:0x90
fn_80029840 = .text:0x80029840; // type:function size:0x6C
fn_800298B0 = .text:0x800298B0; // type:function size:0x4
fn_800298C0 = .text:0x800298C0; // type:function size:0x4C
fn_800298C0__13EffectsStructFUsP7mVec3_cPvPvPvPv = .text:0x800298C0; // type:function size:0x4C
fn_80029910 = .text:0x80029910; // type:function size:0x4
fn_80029920 = .text:0x80029920; // type:function size:0x54
fn_80029980 = .text:0x80029980; // type:function size:0x64
fn_800299F0__13EffectsStructFUsP6mMtx_cPvPv = .text:0x800299F0; // type:function size:0x20
fn_80029A10__13EffectsStructFUsP7mVec3_cP7mAng3_cP7mVec3_cPvPv = .text:0x80029A10; // type:function size:0x54
fn_80029A70 = .text:0x80029A70; // type:function size:0x64
fn_80029A70__13EffectsStructFUsP7mVec3_cP7mAng3_cP7mVec3_cPvPv = .text:0x80029A70; // type:function size:0x64
fn_80029AE0 = .text:0x80029AE0; // type:function size:0x20
fn_80029B00 = .text:0x80029B00; // type:function size:0xD8
fn_80029BE0 = .text:0x80029BE0; // type:function size:0x43C
@@ -2490,14 +2490,14 @@ updateCurrentSword = .text:0x8005C110; // type:function size:0x24
doesPlayerHaveSword = .text:0x8005C140; // type:function size:0x1C
getSwordName = .text:0x8005C160; // type:function size:0x14
getCurrentlyEquippedShieldType = .text:0x8005C180; // type:function size:0x44
getCurrentSlingshotType = .text:0x8005C1D0; // type:function size:0x48
getCurrentBugNetType = .text:0x8005C220; // type:function size:0x48
getCurrentBeetleType = .text:0x8005C270; // type:function size:0x78
getCurrentBowType = .text:0x8005C2F0; // type:function size:0x60
getCurrentSlingshotType__7dAcPy_cFv = .text:0x8005C1D0; // type:function size:0x48
getCurrentBugNetType__7dAcPy_cFv = .text:0x8005C220; // type:function size:0x48
getCurrentBeetleType__7dAcPy_cFv = .text:0x8005C270; // type:function size:0x78
getCurrentBowType__7dAcPy_cFv = .text:0x8005C2F0; // type:function size:0x60
getCurrentMittsType = .text:0x8005C350; // type:function size:0x48
isPouchUsable = .text:0x8005C3A0; // type:function size:0x80
isInBossRushMinigameState = .text:0x8005C420; // type:function size:0x8
isItemRestrictedByBokoBase = .text:0x8005C430; // type:function size:0xB8
isItemRestrictedByBokoBase__7dAcPy_cF7ITEM_ID = .text:0x8005C430; // type:function size:0xB8
isItemRestricted = .text:0x8005C4F0; // type:function size:0xE0
fn_8005C5D0 = .text:0x8005C5D0; // type:function size:0x34
getLinkPtr2 = .text:0x8005C610; // type:function size:0x8
@@ -5466,7 +5466,7 @@ build__15dLytMeterABtn_cFPQ23d2d10ResAccIf_c = .text:0x800E02C0; // type:functio
remove__15dLytMeterABtn_cFv = .text:0x800E04A0; // type:function size:0x58
fn_800E0500 = .text:0x800E0500; // type:function size:0x370
fn_800E0870 = .text:0x800E0870; // type:function size:0x1E4
fn_800E0A60__10dTextBox_cFPCce = .text:0x800E0A60; // type:function size:0xA0
setMessageWithGlobalTextProcessor2__10dTextBox_cFPCcPve = .text:0x800E0A60; // type:function size:0xA0
getName__15dLytMeterABtn_cCFv = .text:0x800E0B00; // type:function size:0x8
getLyt__15dLytMeterABtn_cFv = .text:0x800E0B10; // type:function size:0x8
getPane__15dLytMeterABtn_cFv = .text:0x800E0B20; // type:function size:0x8
@@ -5810,42 +5810,42 @@ remove__21dLytMeterItemSelect_cFv = .text:0x800EE210; // type:function size:0x10
execute__21dLytMeterItemSelect_cFv = .text:0x800EE320; // type:function size:0x123C
getStateID__90sStateMgr_c<21dLytMeterItemSelect_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x800EF560; // type:function size:0x10
executeState__90sStateMgr_c<21dLytMeterItemSelect_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x800EF570; // type:function size:0x10
fn_800EF580 = .text:0x800EF580; // type:function size:0x128
fn_800EF6B0 = .text:0x800EF6B0; // type:function size:0x38
fn_800EF6F0 = .text:0x800EF6F0; // type:function size:0x18
fn_800EF710 = .text:0x800EF710; // type:function size:0x8
relatedToBWheelDisplay = .text:0x800EF720; // type:function size:0x7C
fn_800EF7A0 = .text:0x800EF7A0; // type:function size:0x14
fn_800EF7C0__21dLytMeterItemSelect_cFv = .text:0x800EF7C0; // type:function size:0xF8
fn_800EF8C0__21dLytMeterItemSelect_cFUc = .text:0x800EF8C0; // type:function size:0x10C
fn_800EF9D0 = .text:0x800EF9D0; // type:function size:0x100
fn_800EFAD0__21dLytMeterItemSelect_cFlb = .text:0x800EFAD0; // type:function size:0x200
fn_800EFCD0 = .text:0x800EFCD0; // type:function size:0xD0
fn_800EFDA0 = .text:0x800EFDA0; // type:function size:0x4C
fn_800EFDF0 = .text:0x800EFDF0; // type:function size:0x238
fn_800F0030 = .text:0x800F0030; // type:function size:0x114
fn_800F0150 = .text:0x800F0150; // type:function size:0x14
fn_800F0170 = .text:0x800F0170; // type:function size:0x14
fn_800F0190 = .text:0x800F0190; // type:function size:0x18
fn_800F01B0__21dLytMeterItemSelect_cFl = .text:0x800F01B0; // type:function size:0x30
fn_800F01E0__21dLytMeterItemSelect_cFl = .text:0x800F01E0; // type:function size:0xC
fn_800F01F0 = .text:0x800F01F0; // type:function size:0x28
fn_800F0220 = .text:0x800F0220; // type:function size:0xC8
fn_800F02F0 = .text:0x800F02F0; // type:function size:0x14
fn_800F0310 = .text:0x800F0310; // type:function size:0x128
fn_800F0440__21dLytMeterItemSelect_cFl = .text:0x800F0440; // type:function size:0x23C
fn_800F0680__21dLytMeterItemSelect_cFUc = .text:0x800F0680; // type:function size:0x78
fn_800F0700__21dLytMeterItemSelect_cFv = .text:0x800F0700; // type:function size:0xC8
fn_800F07D0__21dLytMeterItemSelect_cFl = .text:0x800F07D0; // type:function size:0xD4
fn_800F08B0 = .text:0x800F08B0; // type:function size:0xD4
fn_800F0990__21dLytMeterItemSelect_cFUc = .text:0x800F0990; // type:function size:0x44
fn_800F09E0__21dLytMeterItemSelect_cFv = .text:0x800F09E0; // type:function size:0xBC
fn_800F0AA0 = .text:0x800F0AA0; // type:function size:0x8
checkRollercoasterMinigameState = .text:0x800F0AB0; // type:function size:0x8
fn_800F0AC0 = .text:0x800F0AC0; // type:function size:0xA8
fn_800F0B70 = .text:0x800F0B70; // type:function size:0x8
fn_800F0B80 = .text:0x800F0B80; // type:function size:0x8
fn_800F0B90 = .text:0x800F0B90; // type:function size:0x8
fn_800EF580__21dLytMeterItemSelect_cFv = .text:0x800EF580; // type:function size:0x128
fn_800EF6B0__21dLytMeterItemSelect_cFUc = .text:0x800EF6B0; // type:function size:0x38
setOwnerPane__21dLytMeterItemSelect_cFPQ34nw4r3lyt4Pane = .text:0x800EF6F0; // type:function size:0x18
fn_800EF710__21dLytMeterItemSelect_cFUc = .text:0x800EF710; // type:function size:0x8
fn_800EF720__21dLytMeterItemSelect_cFl = .text:0x800EF720; // type:function size:0x7C
fn_800EF7A0__21dLytMeterItemSelect_cFbl = .text:0x800EF7A0; // type:function size:0x14
realizeSelectedWheelItem__21dLytMeterItemSelect_cFv = .text:0x800EF7C0; // type:function size:0xF8
fn_800EF8C0__21dLytMeterItemSelect_cFb = .text:0x800EF8C0; // type:function size:0x10C
realizeWheelNumberForLytIndex__21dLytMeterItemSelect_cFll = .text:0x800EF9D0; // type:function size:0x100
realizeBtnNumberForLytIndex__21dLytMeterItemSelect_cFlb = .text:0x800EFAD0; // type:function size:0x200
sprintf__16SizedWString<32>FPCwe = .text:0x800EFCD0; // type:function size:0xD0
realizeWheelNumberVForLytIndex__21dLytMeterItemSelect_cFll = .text:0x800EFDA0; // type:function size:0x4C
fn_800EFDF0__21dLytMeterItemSelect_cCFb = .text:0x800EFDF0; // type:function size:0x238
fn_800F0030__21dLytMeterItemSelect_cCFv = .text:0x800F0030; // type:function size:0x114
getBaseItemForBWheelSlot__21dLytMeterItemSelect_cFl = .text:0x800F0150; // type:function size:0x14
fn_800F0170__21dLytMeterItemSelect_cCFl = .text:0x800F0170; // type:function size:0x14
fn_800F0190__21dLytMeterItemSelect_cCFl = .text:0x800F0190; // type:function size:0x18
fn_800F01B0__21dLytMeterItemSelect_cCFl = .text:0x800F01B0; // type:function size:0x30
fn_800F01E0__21dLytMeterItemSelect_cCFl = .text:0x800F01E0; // type:function size:0xC
isSlotBocoburinLocked__21dLytMeterItemSelect_cFl = .text:0x800F01F0; // type:function size:0x28
fn_800F0220__21dLytMeterItemSelect_cFl = .text:0x800F0220; // type:function size:0xC8
fn_800F02F0__21dLytMeterItemSelect_cCFv = .text:0x800F02F0; // type:function size:0x14
fn_800F0310__21dLytMeterItemSelect_cFv = .text:0x800F0310; // type:function size:0x128
setBtnText__21dLytMeterItemSelect_cFl = .text:0x800F0440; // type:function size:0x23C
setBtnItem__21dLytMeterItemSelect_cFl = .text:0x800F0680; // type:function size:0x78
realizeWheelItems__21dLytMeterItemSelect_cFv = .text:0x800F0700; // type:function size:0xC8
baseItemLytIndexToCurrentVariant__21dLytMeterItemSelect_cCFl = .text:0x800F07D0; // type:function size:0xD4
baseItemIdToCurrentVariant__21dLytMeterItemSelect_cCF7ITEM_ID = .text:0x800F08B0; // type:function size:0xD4
getBaseItemLytIndexforUnkId__21dLytMeterItemSelect_cCFl = .text:0x800F0990; // type:function size:0x44
isWheelBlockedByCurrentAction__21dLytMeterItemSelect_cFv = .text:0x800F09E0; // type:function size:0xBC
isInSpiralChargeTutorialMinigame__21dLytMeterItemSelect_cFv = .text:0x800F0AA0; // type:function size:0x8
isInRollercoasterMinigame__21dLytMeterItemSelect_cFv = .text:0x800F0AB0; // type:function size:0x8
setCurrentItemText__21dLytMeterItemSelect_cF7ITEM_ID = .text:0x800F0AC0; // type:function size:0xA8
getName__21dLytMeterItemSelect_cCFv = .text:0x800F0B70; // type:function size:0x8
getLyt__21dLytMeterItemSelect_cFv = .text:0x800F0B80; // type:function size:0x8
getPane__21dLytMeterItemSelect_cFv = .text:0x800F0B90; // type:function size:0x8
build__37sFStateFct_c<21dLytMeterItemSelect_c>FRC12sStateIDIf_c = .text:0x800F0BA0; // type:function size:0x60
dispose__37sFStateFct_c<21dLytMeterItemSelect_c>FRP10sStateIf_c = .text:0x800F0C00; // type:function size:0xC
build__40sFStateFct_c<24dLytMeterItemSelectBtn_c>FRC12sStateIDIf_c = .text:0x800F0C10; // type:function size:0x60
@@ -5920,7 +5920,7 @@ initializeState__39sFStateID_c<24dLytMeterItemSelectBtn_c>CFR24dLytMeterItemSele
finalizeState__36sFStateID_c<21dLytMeterItemSelect_c>CFR21dLytMeterItemSelect_c = .text:0x800F1410; // type:function size:0x30
executeState__36sFStateID_c<21dLytMeterItemSelect_c>CFR21dLytMeterItemSelect_c = .text:0x800F1440; // type:function size:0x30
initializeState__36sFStateID_c<21dLytMeterItemSelect_c>CFR21dLytMeterItemSelect_c = .text:0x800F1470; // type:function size:0x30
__sinit_\d_lyt_meter_item_select_cpp = .text:0x800F14A0; // type:function size:0x1C60
__sinit_\d_lyt_meter_item_select_cpp = .text:0x800F14A0; // type:function size:0x1C60 scope:local
__dt__40sFStateID_c<25dLytMeterItemSelectIcon_c>Fv = .text:0x800F3100; // type:function size:0x58
__dt__41sFStateID_c<26dLytMeterItemSelectBlink_c>Fv = .text:0x800F3160; // type:function size:0x58
__dt__40sFStateID_c<25dLytMeterItemSelectText_c>Fv = .text:0x800F31C0; // type:function size:0x58
@@ -12385,7 +12385,7 @@ fn_80202D50 = .text:0x80202D50; // type:function size:0x8
fn_80202D60 = .text:0x80202D60; // type:function size:0x8
fn_80202D70 = .text:0x80202D70; // type:function size:0x8
fn_80202D80 = .text:0x80202D80; // type:function size:0x8
fn_80202D90 = .text:0x80202D90; // type:function size:0x48
fn_80202D90__7dAcPy_cFb = .text:0x80202D90; // type:function size:0x48
ActorLink__getTotalNumberOfBombs = .text:0x80202DE0; // type:function size:0x4
ActorLink__changeBombCounterAndPouch = .text:0x80202DF0; // type:function size:0x8
fn_80202E00 = .text:0x80202E00; // type:function size:0x7C
@@ -13563,13 +13563,13 @@ getTotalArrowCount__9dAcItem_cFv = .text:0x80251EE0; // type:function size:0x38
changeArrowCounter = .text:0x80251F20; // type:function size:0xC
AddOrRemoveArrows = .text:0x80251F30; // type:function size:0x9C
AcItem__getMaxNumberOfArrows = .text:0x80251FD0; // type:function size:0x8
getCurrentTotalArrowCapacity = .text:0x80251FE0; // type:function size:0x38
getTotalArrowCapacity__9dAcItem_cFv = .text:0x80251FE0; // type:function size:0x38
getBombsCounter = .text:0x80252020; // type:function size:0x8
getTotalBombCount__9dAcItem_cFv = .text:0x80252030; // type:function size:0x38
changeBombCounter = .text:0x80252070; // type:function size:0xC
changeBombCounterAndPouch = .text:0x80252080; // type:function size:0x9C
getMaxStandardBombCapacity = .text:0x80252120; // type:function size:0x8
getCurrentTotalBombCapacity = .text:0x80252130; // type:function size:0x38
getTotalBombCapacity__9dAcItem_cFv = .text:0x80252130; // type:function size:0x38
getCurrentTearCount = .text:0x80252170; // type:function size:0x8
AcItem__incrementTearCount = .text:0x80252180; // type:function size:0xC
getMaxTearCount = .text:0x80252190; // type:function size:0x8
@@ -13578,7 +13578,7 @@ getTotalSeedCount__9dAcItem_cFv = .text:0x802521B0; // type:function size:0x38
AcItem__changeSlingshotSeedCount = .text:0x802521F0; // type:function size:0xC
addDekuSeeds = .text:0x80252200; // type:function size:0x9C
AcItem__getMaxNumberOfSlingshotSeeds = .text:0x802522A0; // type:function size:0x8
getCurrentTotalSlingshotSeedCapacity = .text:0x802522B0; // type:function size:0x38
getTotalSeedCapacity__9dAcItem_cFv = .text:0x802522B0; // type:function size:0x38
getKeyPieceCount = .text:0x802522F0; // type:function size:0x8
increaseKeyPieceCounter = .text:0x80252300; // type:function size:0xC
getSmallKeyCounter = .text:0x80252310; // type:function size:0x8
@@ -28254,7 +28254,7 @@ lbl_804E5B48 = .rodata:0x804E5B48; // type:object size:0x110 data:4byte
lbl_804E5C58 = .rodata:0x804E5C58; // type:object size:0x20
lbl_804E5C78 = .rodata:0x804E5C78; // type:object size:0x260
lbl_804E5ED8 = .rodata:0x804E5ED8; // type:object size:0x20 data:4byte
lbl_804E5EF8 = .rodata:0x804E5EF8; // type:object size:0x30
lbl_804E5EF8 = .rodata:0x804E5EF8; // type:object size:0x2C
lbl_804E5F28 = .rodata:0x804E5F28; // type:object size:0x18 data:4byte
lbl_804E5F40 = .rodata:0x804E5F40; // type:object size:0x260
lbl_804E61A0 = .rodata:0x804E61A0; // type:object size:0x108 data:4byte
@@ -31390,84 +31390,84 @@ lbl_80515208 = .data:0x80515208; // type:object size:0x10
lbl_80515218 = .data:0x80515218; // type:object size:0x10
__vt__17dLytMeterNunStk_c = .data:0x80515228; // type:object size:0x14C
__vt__32sFStateID_c<17dLytMeterNunStk_c> = .data:0x80515374; // type:object size:0x34
lbl_805153A8 = .data:0x805153A8; // type:object size:0x10
lbl_805153B8 = .data:0x805153B8; // type:object size:0x10
lbl_805153C8 = .data:0x805153C8; // type:object size:0x10
lbl_805153A8 = .data:0x805153A8; // type:object size:0xF data:string
lbl_805153B8 = .data:0x805153B8; // type:object size:0xF data:string
lbl_805153C8 = .data:0x805153C8; // type:object size:0xA data:string
lbl_805153D8 = .data:0x805153D8; // type:object size:0x10 data:string
lbl_805153E8 = .data:0x805153E8; // type:object size:0xC data:string
lbl_805153F4 = .data:0x805153F4; // type:object size:0xC
lbl_80515400 = .data:0x80515400; // type:object size:0xC
lbl_8051540C = .data:0x8051540C; // type:object size:0xC
lbl_80515418 = .data:0x80515418; // type:object size:0xC
lbl_80515424 = .data:0x80515424; // type:object size:0xC
lbl_80515430 = .data:0x80515430; // type:object size:0xC
lbl_8051543C = .data:0x8051543C; // type:object size:0xC
lbl_80515448 = .data:0x80515448; // type:object size:0xC
lbl_80515454 = .data:0x80515454; // type:object size:0xC
lbl_80515460 = .data:0x80515460; // type:object size:0xC
lbl_8051546C = .data:0x8051546C; // type:object size:0xC
lbl_80515478 = .data:0x80515478; // type:object size:0x50
lbl_805154C8 = .data:0x805154C8; // type:object size:0x18
lbl_805154E0 = .data:0x805154E0; // type:object size:0xC
lbl_805154EC = .data:0x805154EC; // type:object size:0x1C
lbl_80515508 = .data:0x80515508; // type:object size:0xC
lbl_80515514 = .data:0x80515514; // type:object size:0xC
lbl_80515520 = .data:0x80515520; // type:object size:0xC
lbl_8051552C = .data:0x8051552C; // type:object size:0xC
lbl_80515538 = .data:0x80515538; // type:object size:0xC
lbl_80515544 = .data:0x80515544; // type:object size:0xC
lbl_80515550 = .data:0x80515550; // type:object size:0xC
lbl_8051555C = .data:0x8051555C; // type:object size:0xC
lbl_80515568 = .data:0x80515568; // type:object size:0xC
lbl_80515574 = .data:0x80515574; // type:object size:0xC
lbl_80515580 = .data:0x80515580; // type:object size:0x20
lbl_805153F4 = .data:0x805153F4; // type:object size:0xA data:string
lbl_80515400 = .data:0x80515400; // type:object size:0xB data:string
lbl_8051540C = .data:0x8051540C; // type:object size:0x9 data:string
lbl_80515418 = .data:0x80515418; // type:object size:0xB data:string
lbl_80515424 = .data:0x80515424; // type:object size:0xB data:string
lbl_80515430 = .data:0x80515430; // type:object size:0xB data:string
lbl_8051543C = .data:0x8051543C; // type:object size:0xB data:string
lbl_80515448 = .data:0x80515448; // type:object size:0xB data:string
lbl_80515454 = .data:0x80515454; // type:object size:0xB data:string
lbl_80515460 = .data:0x80515460; // type:object size:0xB data:string
lbl_8051546C = .data:0x8051546C; // type:object size:0xB data:string
lbl_80515478 = .data:0x80515478; // type:object size:0xB data:string
lbl_805154C8 = .data:0x805154C8; // type:object size:0x17 data:string
lbl_805154E0 = .data:0x805154E0; // type:object size:0xB data:string
lbl_805154EC = .data:0x805154EC; // type:object size:0x1A data:string
lbl_80515508 = .data:0x80515508; // type:object size:0xB data:string
lbl_80515514 = .data:0x80515514; // type:object size:0xB data:string
lbl_80515520 = .data:0x80515520; // type:object size:0xB data:string
lbl_8051552C = .data:0x8051552C; // type:object size:0xB data:string
lbl_80515538 = .data:0x80515538; // type:object size:0xB data:string
lbl_80515544 = .data:0x80515544; // type:object size:0xB data:string
lbl_80515550 = .data:0x80515550; // type:object size:0xB data:string
lbl_8051555C = .data:0x8051555C; // type:object size:0xB data:string
lbl_80515568 = .data:0x80515568; // type:object size:0xA data:string
lbl_80515574 = .data:0x80515574; // type:object size:0xA data:string
lbl_80515580 = .data:0x80515580; // type:object size:0x19 data:string
lbl_805155A0 = .data:0x805155A0; // type:object size:0x20 data:string
lbl_805155C0 = .data:0x805155C0; // type:object size:0x14
lbl_805155D4 = .data:0x805155D4; // type:object size:0x24
lbl_805155C0 = .data:0x805155C0; // type:object size:0x11 data:string
lbl_805155D4 = .data:0x805155D4; // type:object size:0x1F data:string
lbl_805155F8 = .data:0x805155F8; // type:object size:0x10 data:string
lbl_80515608 = .data:0x80515608; // type:object size:0x20
lbl_80515628 = .data:0x80515628; // type:object size:0x10
lbl_80515638 = .data:0x80515638; // type:object size:0x1C
lbl_80515608 = .data:0x80515608; // type:object size:0x1E data:string
lbl_80515628 = .data:0x80515628; // type:object size:0xF data:string
lbl_80515638 = .data:0x80515638; // type:object size:0x1B data:string
lbl_80515654 = .data:0x80515654; // type:object size:0xC data:string
lbl_80515660 = .data:0x80515660; // type:object size:0x1C data:string
lbl_8051567C = .data:0x8051567C; // type:object size:0x14
lbl_8051567C = .data:0x8051567C; // type:object size:0xD data:string
lbl_80515690 = .data:0x80515690; // type:object size:0x18 data:string
lbl_805156A8 = .data:0x805156A8; // type:object size:0x1C
lbl_805156C4 = .data:0x805156C4; // type:object size:0x20
lbl_805156E4 = .data:0x805156E4; // type:object size:0x10
lbl_805156F4 = .data:0x805156F4; // type:object size:0x1C
lbl_805156A8 = .data:0x805156A8; // type:object size:0x1A data:string
lbl_805156C4 = .data:0x805156C4; // type:object size:0x1E data:string
lbl_805156E4 = .data:0x805156E4; // type:object size:0xF data:string
lbl_805156F4 = .data:0x805156F4; // type:object size:0x1B data:string
lbl_80515710 = .data:0x80515710; // type:object size:0xC data:string
lbl_8051571C = .data:0x8051571C; // type:object size:0x1C
lbl_80515738 = .data:0x80515738; // type:object size:0xC
lbl_80515744 = .data:0x80515744; // type:object size:0x1C
lbl_80515760 = .data:0x80515760; // type:object size:0xC
lbl_8051576C = .data:0x8051576C; // type:object size:0x1C
lbl_80515788 = .data:0x80515788; // type:object size:0xC
lbl_80515794 = .data:0x80515794; // type:object size:0xC
lbl_805157A0 = .data:0x805157A0; // type:object size:0xC
lbl_805157AC = .data:0x805157AC; // type:object size:0xC
lbl_8051571C = .data:0x8051571C; // type:object size:0x19 data:string
lbl_80515738 = .data:0x80515738; // type:object size:0xA data:string
lbl_80515744 = .data:0x80515744; // type:object size:0x19 data:string
lbl_80515760 = .data:0x80515760; // type:object size:0xA data:string
lbl_8051576C = .data:0x8051576C; // type:object size:0x1A data:string
lbl_80515788 = .data:0x80515788; // type:object size:0xB data:string
lbl_80515794 = .data:0x80515794; // type:object size:0xB data:string
lbl_805157A0 = .data:0x805157A0; // type:object size:0xB data:string
lbl_805157AC = .data:0x805157AC; // type:object size:0xB data:string
lbl_805157B8 = .data:0x805157B8; // type:object size:0xC data:string
lbl_805157C4 = .data:0x805157C4; // type:object size:0x10
lbl_805157D4 = .data:0x805157D4; // type:object size:0x10
lbl_805157E4 = .data:0x805157E4; // type:object size:0x10
lbl_805157F4 = .data:0x805157F4; // type:object size:0xC
lbl_80515800 = .data:0x80515800; // type:object size:0xC
lbl_8051580C = .data:0x8051580C; // type:object size:0x10
lbl_8051581C = .data:0x8051581C; // type:object size:0x10
lbl_8051582C = .data:0x8051582C; // type:object size:0xC
lbl_80515838 = .data:0x80515838; // type:object size:0x38
lbl_80515870 = .data:0x80515870; // type:object size:0xC
lbl_8051587C = .data:0x8051587C; // type:object size:0xC
lbl_80515888 = .data:0x80515888; // type:object size:0xC
lbl_80515894 = .data:0x80515894; // type:object size:0x1C
lbl_805158B0 = .data:0x805158B0; // type:object size:0x20
lbl_805157C4 = .data:0x805157C4; // type:object size:0xD data:string
lbl_805157D4 = .data:0x805157D4; // type:object size:0xD data:string
lbl_805157E4 = .data:0x805157E4; // type:object size:0xD data:string
lbl_805157F4 = .data:0x805157F4; // type:object size:0xA data:string
lbl_80515800 = .data:0x80515800; // type:object size:0xB data:string
lbl_8051580C = .data:0x8051580C; // type:object size:0xE data:string
lbl_8051581C = .data:0x8051581C; // type:object size:0xF data:string
lbl_8051582C = .data:0x8051582C; // type:object size:0xA data:string
lbl_80515838 = .data:0x80515838; // type:object size:0xB data:string
lbl_80515870 = .data:0x80515870; // type:object size:0x9 data:string
lbl_8051587C = .data:0x8051587C; // type:object size:0x9 data:string
lbl_80515888 = .data:0x80515888; // type:object size:0x9 data:string
lbl_80515894 = .data:0x80515894; // type:object size:0x9 data:string
lbl_805158B0 = .data:0x805158B0; // type:object size:0x9 data:string
lbl_805158D0 = .data:0x805158D0; // type:object size:0x10 data:string
lbl_805158E0 = .data:0x805158E0; // type:object size:0x20
lbl_80515900 = .data:0x80515900; // type:object size:0x20
lbl_80515920 = .data:0x80515920; // type:object size:0x10
lbl_80515930 = .data:0x80515930; // type:object size:0x10
lbl_80515940 = .data:0x80515940; // type:object size:0x10
__vt__21dLytMeterItemSelect_c = .data:0x80515950; // type:object size:0x38
lbl_80515920 = .data:0x80515920; // type:object size:0xE data:string
lbl_80515930 = .data:0x80515930; // type:object size:0xD data:string
lbl_80515940 = .data:0x80515940; // type:object size:0xF data:string
__vt__21dLytMeterItemSelect_c = .data:0x80515950; // type:object size:0x34
__vt__60sFStateMgr_c<21dLytMeterItemSelect_c,20sStateMethodUsr_FI_c> = .data:0x80515988; // type:object size:0x30
__vt__90sStateMgr_c<21dLytMeterItemSelect_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x805159B8; // type:object size:0x30
__vt__37sFStateFct_c<21dLytMeterItemSelect_c> = .data:0x805159E8; // type:object size:0x14
@@ -33339,7 +33339,6 @@ __vt__56sFStateMgr_c<17dLytCommonArrow_c,20sStateMethodUsr_FI_c> = .data:0x80527
__vt__86sStateMgr_c<17dLytCommonArrow_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x80527418; // type:object size:0x30 scope:weak
__vt__33sFStateFct_c<17dLytCommonArrow_c> = .data:0x80527448; // type:object size:0x14 scope:weak
__vt__30sFState_c<17dLytCommonArrow_c> = .data:0x80527460; // type:object size:0x18 scope:weak
__vt__17dCursorHitCheck_c = .data:0x80527478; // type:object size:0x10 scope:weak
@8395 = .data:0x805274B4; // type:object size:0xC scope:local
@8396 = .data:0x805274C0; // type:object size:0xC scope:local
@8397 = .data:0x805274CC; // type:object size:0xC scope:local
@@ -38142,8 +38141,8 @@ lbl_805723D8 = .sdata:0x805723D8; // type:object size:0x8 data:4byte
lbl_805723E0 = .sdata:0x805723E0; // type:object size:0x8 data:4byte
lbl_805723E8 = .sdata:0x805723E8; // type:object size:0x8 data:4byte
lbl_805723F0 = .sdata:0x805723F0; // type:object size:0x4 data:4byte
lbl_805723F4 = .sdata:0x805723F4; // type:object size:0x8
lbl_805723FC = .sdata:0x805723FC; // type:object size:0x4
lbl_805723F4 = .sdata:0x805723F4; // type:object size:0x6 data:wstring
lbl_805723FC = .sdata:0x805723FC; // type:object size:0x2
lbl_80572400 = .sdata:0x80572400; // type:object size:0x8 data:4byte
lbl_80572408 = .sdata:0x80572408; // type:object size:0x8 data:4byte
lbl_80572410 = .sdata:0x80572410; // type:object size:0x8 data:4byte
@@ -40260,7 +40259,7 @@ sDoSomethingWithFileAOnTransition__9dScGame_c = .sbss:0x8057579F; // type:object
sPreventClearingSomeFlag__9dScGame_c = .sbss:0x805757A0; // type:object size:0x1 data:byte
sInstance__9dCsBase_c = .sbss:0x805757A8; // type:object size:0x8 data:4byte
C_GAME = .sbss:0x805757B0; // type:object size:0x8 data:4byte
LINK_PTR2 = .sbss:0x805757B8; // type:object size:0x4 data:4byte
LINK2__7dAcPy_c = .sbss:0x805757B8; // type:object size:0x4 data:4byte
lbl_805757BC = .sbss:0x805757BC; // type:object size:0x1 data:byte
lbl_805757C0 = .sbss:0x805757C0; // type:object size:0x4 data:float
lbl_805757C4 = .sbss:0x805757C4; // type:object size:0x2 data:2byte
@@ -48674,37 +48673,37 @@ LytMeterNunStk__STATE_WAIT = .bss:0x805AABE0; // type:object size:0x40 data:4byt
LytMeterNunStk__STATE_ON = .bss:0x805AAC20; // type:object size:0x40 data:4byte
LytMeterNunStk__STATE_ACTIVE = .bss:0x805AAC60; // type:object size:0x40 data:4byte
LytMeterNunStk__STATE_OFF = .bss:0x805AACA0; // type:object size:0x30 data:4byte
lbl_805AACD0 = .bss:0x805AACD0; // type:object size:0x10
LytMeterItemSelectIcon__STATE_WAIT = .bss:0x805AACE0; // type:object size:0x40 data:4byte
LytMeterItemSelectIcon__STATE_ON = .bss:0x805AAD20; // type:object size:0x40 data:4byte
LytMeterItemSelectIcon__STATE_SELECT = .bss:0x805AAD60; // type:object size:0x40 data:4byte
LytMeterItemSelectIcon__STATE_OFF = .bss:0x805AADA0; // type:object size:0x40 data:4byte
LytMeterItemSelectBlink__STATE_WAIT = .bss:0x805AADE0; // type:object size:0x40 data:4byte
LytMeterItemSelectBlink__STATE_ON = .bss:0x805AAE20; // type:object size:0x40 data:4byte
LytMeterItemSelectBlink__STATE_SELECT = .bss:0x805AAE60; // type:object size:0x40 data:4byte
LytMeterItemSelectBlink__STATE_OFF = .bss:0x805AAEA0; // type:object size:0x40 data:4byte
LytMeterItemSelectText__STATE_WAIT = .bss:0x805AAEE0; // type:object size:0x40 data:4byte
LytMeterItemSelectText__STATE_ON = .bss:0x805AAF20; // type:object size:0x40 data:4byte
LytMeterItemSelectText__STATE_SELECT = .bss:0x805AAF60; // type:object size:0x40 data:4byte
LytMeterItemSelectText__STATE_OFF = .bss:0x805AAFA0; // type:object size:0x40 data:4byte
LytMeterItemSelectBtn__STATE_INVISIBLE = .bss:0x805AAFE0; // type:object size:0x40 data:4byte
LytMeterItemSelectBtn__STATE_ON = .bss:0x805AB020; // type:object size:0x40 data:4byte
LytMeterItemSelectBtn__STATE_VISIBLE = .bss:0x805AB060; // type:object size:0x40 data:4byte
LytMeterItemSelectBtn__STATE_OFF = .bss:0x805AB0A0; // type:object size:0x40 data:4byte
LytMeterItemSelect__STATE_INIT_WAIT = .bss:0x805AB0E0; // type:object size:0x40 data:4byte
LytMeterItemSelect__LytMeterItemSelect__STATE_WAIT = .bss:0x805AB120; // type:object size:0x80 data:4byte
LytMeterItemSelect__STATE_SELECT = .bss:0x805AB1A0; // type:object size:0x40 data:4byte
LytMeterItemSelect__STATE_SET_IN = .bss:0x805AB1E0; // type:object size:0x40 data:4byte
LytMeterItemSelect__STATE_SET_SPECIAL_ITEM_IN = .bss:0x805AB220; // type:object size:0x40 data:4byte
LytMeterItemSelect__STATE_SET = .bss:0x805AB260; // type:object size:0x80 data:4byte
LytMeterItemSelect__STATE_SET_NONE = .bss:0x805AB2E0; // type:object size:0x40 data:4byte
LytMeterItemSelect__STATE_SELECT_OUT = .bss:0x805AB320; // type:object size:0x80 data:4byte
LytMeterItemSelect__STATE_RESET = .bss:0x805AB3A0; // type:object size:0x40 data:4byte
LytMeterItemSelect__STATE_RESET_OUT = .bss:0x805AB3E0; // type:object size:0xC0 data:4byte
LytMeterItemSelect__STATE_UNUSE = .bss:0x805AB4A0; // type:object size:0x80 data:4byte
LytMeterItemSelect__STATE_DEMO_OUT_0 = .bss:0x805AB520; // type:object size:0x40 data:4byte
LytMeterItemSelect__STATE_DEMO_OUT_1 = .bss:0x805AB560; // type:object size:0x80 data:4byte
LytMeterItemSelect__STATE_FRAME_OFF_MOVE = .bss:0x805AB5E0; // type:object size:0x40 data:4byte
lbl_805AACD0 = .bss:0x805AACD0; // type:object size:0xC
LytMeterItemSelectIcon__STATE_WAIT = .bss:0x805AACE0; // type:object size:0x30 data:4byte
LytMeterItemSelectIcon__STATE_ON = .bss:0x805AAD20; // type:object size:0x30 data:4byte
LytMeterItemSelectIcon__STATE_SELECT = .bss:0x805AAD60; // type:object size:0x30 data:4byte
LytMeterItemSelectIcon__STATE_OFF = .bss:0x805AADA0; // type:object size:0x30 data:4byte
LytMeterItemSelectBlink__STATE_WAIT = .bss:0x805AADE0; // type:object size:0x30 data:4byte
LytMeterItemSelectBlink__STATE_ON = .bss:0x805AAE20; // type:object size:0x30 data:4byte
LytMeterItemSelectBlink__STATE_SELECT = .bss:0x805AAE60; // type:object size:0x30 data:4byte
LytMeterItemSelectBlink__STATE_OFF = .bss:0x805AAEA0; // type:object size:0x30 data:4byte
LytMeterItemSelectText__STATE_WAIT = .bss:0x805AAEE0; // type:object size:0x30 data:4byte
LytMeterItemSelectText__STATE_ON = .bss:0x805AAF20; // type:object size:0x30 data:4byte
LytMeterItemSelectText__STATE_SELECT = .bss:0x805AAF60; // type:object size:0x30 data:4byte
LytMeterItemSelectText__STATE_OFF = .bss:0x805AAFA0; // type:object size:0x30 data:4byte
LytMeterItemSelectBtn__STATE_INVISIBLE = .bss:0x805AAFE0; // type:object size:0x30 data:4byte
LytMeterItemSelectBtn__STATE_ON = .bss:0x805AB020; // type:object size:0x30 data:4byte
LytMeterItemSelectBtn__STATE_VISIBLE = .bss:0x805AB060; // type:object size:0x30 data:4byte
LytMeterItemSelectBtn__STATE_OFF = .bss:0x805AB0A0; // type:object size:0x30 data:4byte
LytMeterItemSelect__STATE_INIT_WAIT = .bss:0x805AB0E0; // type:object size:0x30 data:4byte
LytMeterItemSelect__LytMeterItemSelect__STATE_WAIT = .bss:0x805AB120; // type:object size:0x30 data:4byte
LytMeterItemSelect__STATE_SELECT = .bss:0x805AB1A0; // type:object size:0x30 data:4byte
LytMeterItemSelect__STATE_SET_IN = .bss:0x805AB1E0; // type:object size:0x30 data:4byte
LytMeterItemSelect__STATE_SET_SPECIAL_ITEM_IN = .bss:0x805AB220; // type:object size:0x30 data:4byte
LytMeterItemSelect__STATE_SET = .bss:0x805AB260; // type:object size:0x30 data:4byte
LytMeterItemSelect__STATE_SET_NONE = .bss:0x805AB2E0; // type:object size:0x30 data:4byte
LytMeterItemSelect__STATE_SELECT_OUT = .bss:0x805AB320; // type:object size:0x30 data:4byte
LytMeterItemSelect__STATE_RESET = .bss:0x805AB3A0; // type:object size:0x30 data:4byte
LytMeterItemSelect__STATE_RESET_OUT = .bss:0x805AB3E0; // type:object size:0x30 data:4byte
LytMeterItemSelect__STATE_UNUSE = .bss:0x805AB4A0; // type:object size:0x30 data:4byte
LytMeterItemSelect__STATE_DEMO_OUT_0 = .bss:0x805AB520; // type:object size:0x30 data:4byte
LytMeterItemSelect__STATE_DEMO_OUT_1 = .bss:0x805AB560; // type:object size:0x30 data:4byte
LytMeterItemSelect__STATE_FRAME_OFF_MOVE = .bss:0x805AB5E0; // type:object size:0x30 data:4byte
LytMeterItemSelect__STATE_FRAME_OFF_OUT = .bss:0x805AB620; // type:object size:0x30 data:4byte
lbl_805AB650 = .bss:0x805AB650; // type:object size:0x10
LytMeterPlusBtn__STATE_WAIT = .bss:0x805AB660; // type:object size:0x40 data:4byte
configure.py
+1 -1
View File
@@ -393,7 +393,7 @@ config.libs = [
Object(NonMatching, "d/lyt/meter/d_lyt_meter_remocon_bg.cpp"),
Object(NonMatching, "d/lyt/meter/d_lyt_meter_nunchaku_bg.cpp"),
Object(NonMatching, "d/lyt/meter/d_lyt_meter_nun_stk.cpp"),
Object(NonMatching, "d/lyt/meter/d_lyt_meter_item_select.cpp"),
Object(Matching, "d/lyt/meter/d_lyt_meter_item_select.cpp"),
Object(NonMatching, "d/lyt/meter/d_lyt_meter_plus_btn.cpp"),
Object(NonMatching, "d/lyt/meter/d_lyt_meter_minus_btn.cpp"),
Object(NonMatching, "d/lyt/meter/d_lyt_meter_cross_btn.cpp"),
include/d/a/d_a_item.h
+7 -3
View File
@@ -51,9 +51,13 @@ public:
void getItemFromBWheelItem();
bool isStateWait();
static int getTotalBombCount();
static int getTotalArrowCount();
static int getTotalSeedCount();
static s32 getTotalBombCount();
static s32 getTotalArrowCount();
static s32 getTotalSeedCount();
static s32 getTotalBombCapacity();
static s32 getTotalSeedCapacity();
static s32 getTotalArrowCapacity();
static bool isRupee(ITEM_ID item);
static bool isKeyPiece(ITEM_ID item);
include/d/a/d_a_itembase.h
+1 -1
View File
@@ -109,7 +109,7 @@ enum ITEM_ID {
/* 0x066 */ ITEM_TREASURE_MEDAL = 102,
/* 0x067 */ ITEM_POTION_MEDAL = 103,
/* 0x068 */ ITEM_CURSED_MEDAL = 104,
/* 0x069 */ ITEM_SCATTERSHOT = 105,
/* 0x069 */ ITEM_MIGHTY_SCATTERSHOT = 105,
/* 0x06A */ ITEM_UNK_106 = 106,
/* 0x06B */ ITEM_UNK_107 = 107,
/* 0x06C */ ITEM_MEDIUM_WALLET = 108,
include/d/a/d_a_player.h
+14
View File
@@ -3,6 +3,7 @@
#include "common.h"
#include "d/a/d_a_base.h"
#include "d/a/d_a_itembase.h"
#include "d/a/obj/d_a_obj_base.h"
#include "m/m_allocator.h"
#include "m/m_angle.h"
@@ -61,6 +62,7 @@ public:
void setPosYRot(const mVec3_c &pos, mAng rot, UNKWORD, UNKWORD, UNKWORD);
// argument is always false in existing code, true doesn't seem to make a difference
void bonk(bool unk = false);
bool fn_80202D90(bool);
/* vt 0x080 */ virtual UNKWORD IfCurrentActionToActor(dAcBase_c *ac, UNKWORD);
/* vt 0x084 */ virtual void vt_0x084(dAcBase_c *ac, UNKWORD);
@@ -288,7 +290,19 @@ public:
return LINK;
}
static dAcPy_c *GetLink2() {
return LINK2;
}
static dAcPy_c *LINK;
static dAcPy_c *LINK2;
static s32 getCurrentBowType();
static s32 getCurrentSlingshotType();
static s32 getCurrentBeetleType();
static s32 getCurrentBugNetType();
static bool isItemRestrictedByBokoBase(ITEM_ID item);
};
#endif
include/d/lyt/d_lyt_common_icon_item.h
+12 -20
View File
@@ -8,27 +8,19 @@
#include "nw4r/lyt/lyt_bounding.h"
#include "s/s_State.hpp"
class dLytCommonIconItemPartBase_c {
public:
virtual ~dLytCommonIconItemPartBase_c() {}
virtual nw4r::lyt::Pane *getPane() = 0;
virtual d2d::LytBase_c *getLyt() = 0;
virtual const char *getName() const = 0;
};
/** B-Wheel item */
class dLytCommonIconItemPart1_c : public dLytCommonIconItemPartBase_c {
class dLytCommonIconItemPart1_c {
public:
dLytCommonIconItemPart1_c()
: mItem(0), mColor(0), field_0x2B4(false), mHasNumber(false), mSize(false), mBocoburinLocked(false) {}
virtual ~dLytCommonIconItemPart1_c() {}
virtual nw4r::lyt::Pane *getPane() override {
virtual nw4r::lyt::Pane *getPane() {
return mLyt.getLayout()->GetRootPane();
}
virtual d2d::LytBase_c *getLyt() override {
virtual d2d::LytBase_c *getLyt() {
return &mLyt;
}
virtual const char *getName() const override {
virtual const char *getName() const {
return mLyt.getName();
}
@@ -82,7 +74,7 @@ private:
};
/** Pouch item */
class dLytCommonIconItemPart2_c : public dLytCommonIconItemPartBase_c {
class dLytCommonIconItemPart2_c {
public:
dLytCommonIconItemPart2_c()
: mItem(0),
@@ -94,13 +86,13 @@ public:
mOnOff(true),
mDurability(0.0f) {}
virtual ~dLytCommonIconItemPart2_c() {}
virtual nw4r::lyt::Pane *getPane() override {
virtual nw4r::lyt::Pane *getPane() {
return mLyt.getLayout()->GetRootPane();
}
virtual d2d::LytBase_c *getLyt() override {
virtual d2d::LytBase_c *getLyt() {
return &mLyt;
}
virtual const char *getName() const override {
virtual const char *getName() const {
return mLyt.getName();
}
@@ -162,17 +154,17 @@ private:
};
/** Dowsing "item" */
class dLytCommonIconItemPart3_c : public dLytCommonIconItemPartBase_c {
class dLytCommonIconItemPart3_c {
public:
dLytCommonIconItemPart3_c() : mItem(0), mSize(false), mBocoburinLocked(false) {}
virtual ~dLytCommonIconItemPart3_c() {}
virtual nw4r::lyt::Pane *getPane() override {
virtual nw4r::lyt::Pane *getPane() {
return mLyt.getLayout()->GetRootPane();
}
virtual d2d::LytBase_c *getLyt() override {
virtual d2d::LytBase_c *getLyt() {
return &mLyt;
}
virtual const char *getName() const override {
virtual const char *getName() const {
return mLyt.getName();
}
include/d/lyt/d_lyt_common_icon_item_maps.h
+1
View File
@@ -34,6 +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) // -------------------------
// Pouch Items
#define LYT_CMN_PouchPotionHealyh (0) // [12] uc_bottleKusuriA_00.tpl
include/d/lyt/d_textbox.h
+9 -3
View File
@@ -1,6 +1,7 @@
#ifndef D_LYT_TEXTBOX_H
#define D_LYT_TEXTBOX_H
#include "common.h"
#include "d/lyt/d2d.h"
#include "libms/msgfile.h"
#include "nw4r/lyt/lyt_drawInfo.h"
@@ -47,8 +48,11 @@ public:
return mMyScale;
}
void fn_800E0A60(const char *area, ...) {
// TODO
void setMessageWithGlobalTextProcessor2(const char *message, void *unk, ...) {
va_list l;
va_start(l, str);
setMessageWithGlobalTextProcessorV(message, nullptr, unk, l);
va_end(l);
}
void setTextWithGlobalTextProcessor(const wchar_t *str);
@@ -58,7 +62,9 @@ public:
void setTextWithTextProcessor(const wchar_t *str, dTagProcessor_c *tagProcessor, void *, ...);
s32 calcTextLines(const wchar_t *src, dTagProcessor_c *tagProcessor);
void setMessageWithGlobalTextProcessorAndMsbtInfo(const MsbtInfo *info, const char *labelId, wchar_t *destBuf, u32 maxLen);
void setMessageWithGlobalTextProcessorAndMsbtInfo(
const MsbtInfo *info, const char *labelId, wchar_t *destBuf, u32 maxLen
);
void loadTextFormatVars();
void setupGX() const;
include/d/lyt/meter/d_lyt_meter.h
+20 -5
View File
@@ -49,6 +49,14 @@ public:
bool isSilentRealm();
u8 getField_0x13792() const {
return field_0x13792;
}
u8 getField_0x1377E() const {
return field_0x1377E;
}
/* 0x00004 */ d2d::ResAccIf_c mResAcc;
/* 0x00374 */ d2d::LytBase_c mLyt;
/* 0x00404 */ d2d::AnmGroup_c mAnmGroups[34];
@@ -91,7 +99,13 @@ public:
/* 0x1373C */ mVec3_c mPos2;
/* 0x13748 */ u8 field_0x13748[0x13750 - 0x13748];
/* 0x13750 */ s32 field_0x13750;
/* 0x13754 */ u8 field_0x13754[0x137B4 - 0x13754];
/* 0x13754 */ u8 field_0x13754[0x13770 - 0x13754];
/* 0x13770 */ u8 field_0x13770;
/* 0x13771 */ u8 field_0x13771[0x1377E - 0x13771];
/* 0x1377E */ u8 field_0x1377E;
/* 0x1377F */ u8 field_0x1375F[0x13792 - 0x1377F];
/* 0x13792 */ u8 field_0x13792;
/* 0x13793 */ u8 field_0x13793[0x137B4 - 0x13793];
/* 0x137B4 */ mVec3_c mPos3;
/* 0x137C0 */ u32 field_0x137C0;
};
@@ -110,6 +124,7 @@ STATIC_ASSERT(offsetof(dLytMeter_c, mRemoCon) == 0x12350);
STATIC_ASSERT(offsetof(dLytMeter_c, mNunBg) == 0x12440);
STATIC_ASSERT(offsetof(dLytMeter_c, mHeart) == 0x12608);
STATIC_ASSERT(offsetof(dLytMeter_c, mShield) == 0x12DA4);
STATIC_ASSERT(offsetof(dLytMeter_c, field_0x137C0) == 0x137C0);
// made up name
class dLytMeterContainer_c {
@@ -123,10 +138,6 @@ public:
bool remove();
bool draw();
bool checkFlag(u32 flag) {
return (mFlags & flag) == flag;
}
static dLytMeterContainer_c *GetInstance() {
return sInstance;
}
@@ -135,6 +146,10 @@ public:
return &sInstance->mMeter;
}
u8 getMeterField_0x13770() const {
return mMeter.field_0x13770;
}
bool checkAllFlags(u32 mask) const {
return (mFlags & mask) == mask;
}
include/d/lyt/meter/d_lyt_meter_a_btn.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
virtual d2d::LytBase_c *getLyt() override {
return &mLyt;
}
virtual const char *getName() const {
virtual const char *getName() const override {
return mLyt.getName();
}
include/d/lyt/meter/d_lyt_meter_item_select.h
+71 -19
View File
@@ -1,6 +1,7 @@
#ifndef D_LYT_METER_ITEM_SELECT_H
#define D_LYT_METER_ITEM_SELECT_H
#include "d/a/d_a_itembase.h"
#include "d/lyt/d2d.h"
#include "d/lyt/d_lyt_common_icon_item.h"
#include "d/lyt/d_textbox.h"
@@ -49,6 +50,10 @@ public:
mpAnm = anim;
}
void setShouldBeSelect(u32 v) {
mShouldBeSelect = v;
}
private:
STATE_FUNC_DECLARE(dLytMeterItemSelectBlink_c, Wait);
STATE_FUNC_DECLARE(dLytMeterItemSelectBlink_c, On);
@@ -73,6 +78,10 @@ public:
mpAnm = anim;
}
void setShouldBeSelect(u32 v) {
mShouldBeSelect = v;
}
private:
STATE_FUNC_DECLARE(dLytMeterItemSelectText_c, Wait);
STATE_FUNC_DECLARE(dLytMeterItemSelectText_c, On);
@@ -95,7 +104,7 @@ public:
void setVisible(bool bVisible);
void setVisible2(bool bVisible);
void execute();
bool isSettled() const;
void setAnm(d2d::AnmGroup_c *anim) {
@@ -114,6 +123,14 @@ public:
return mShouldBeVisible;
}
bool getInstant() const {
return mInstant;
}
void setOwnerPane(nw4r::lyt::Pane *p) {
mpPane2 = p;
}
private:
STATE_FUNC_DECLARE(dLytMeterItemSelectBtn_c, Invisible);
STATE_FUNC_DECLARE(dLytMeterItemSelectBtn_c, On);
@@ -140,24 +157,59 @@ 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 ~dLytMeterItemSelect_c() {}
static bool isInSpiralChargeTutorialMinigame();
static bool isInRollercoasterMinigame();
void fn_800EF580();
void fn_800EF6B0(u8);
void setOwnerPane(nw4r::lyt::Pane *p);
void fn_800EF710(u8);
void fn_800EF720(s32);
void fn_800EF7A0(bool, s32);
bool fn_800EFDF0(bool b) const;
bool fn_800F02F0() const;
bool fn_800F0220(s32 arg);
private:
void fn_800F0680(u8);
s32 fn_800F0990(u8);
s32 fn_800F07D0(s32);
void fn_800EFAD0(s32, bool);
void fn_800EF7C0();
void fn_800EF8C0(u8);
bool fn_800F09E0();
void fn_800F0440(s32);
void fn_800F0700();
bool fn_800F01B0(s32);
bool fn_800F01E0(s32);
void setBtnItem(s32 unkId);
void realizeSelectedWheelItem();
void fn_800EF8C0(bool);
bool isWheelBlockedByCurrentAction();
void setBtnText(s32);
bool fn_800F01B0(s32) const;
bool fn_800F01E0(s32) const;
bool isSlotBocoburinLocked(s32);
void fn_800F0310();
bool fn_800F0030() const;
s32 fn_800F0170(s32) const;
u8 fn_800F0190(s32) const;
bool isWheelIndexLocked(s32 idx);
void realizeWheelItems();
void realizeWheelNumberForLytIndex(s32 iconIdx, s32 lytItemIdx);
void realizeBtnNumberForLytIndex(s32 iconIdx, bool);
void realizeWheelNumberVForLytIndex(s32 iconIdx, s32 lytItemIdx);
void setCurrentItemText(ITEM_ID item);
static ITEM_ID getBaseItemForBWheelSlot(s32 idx);
ITEM_ID baseItemIdToCurrentVariant(ITEM_ID baseItem) const;
s32 baseItemLytIndexToCurrentVariant(s32 lytIndex) const;
s32 getBaseItemLytIndexforUnkId(s32 idx) const;
STATE_FUNC_DECLARE(dLytMeterItemSelect_c, InitWait);
STATE_FUNC_DECLARE(dLytMeterItemSelect_c, Wait);
@@ -192,7 +244,7 @@ private:
/* 0x0DA4 */ nw4r::lyt::Pane *mpPanes[17];
/* 0x0DE8 */ nw4r::lyt::Pane *mpSomePane;
/* 0x0DE8 */ nw4r::lyt::Pane *mpOwnerPane;
/* 0x0DEC */ dTextBox_c *mpTextBoxes[10];
/* 0x0E14 */ dWindow_c *mpWindows[4];
/* 0x0E24 */ dTextBox_c *mpSizeBoxes[4];
@@ -206,7 +258,7 @@ private:
/* 0x5754 */ s32 field_0x5754;
/* 0x5758 */ s32 field_0x5758;
/* 0x575C */ s32 field_0x575C;
/* 0x5760 */ s32 field_0x5760;
/* 0x5760 */ s32 mDemoMoveTimer;
/* 0x5764 */ s32 field_0x5764;
/* 0x5768 */ s32 field_0x5768;
/* 0x576C */ s32 field_0x576C;
@@ -234,8 +286,8 @@ private:
/* 0x57A0 */ u8 field_0x57A0;
/* 0x57A1 */ u8 field_0x57A1;
/* 0x57A2 */ u8 field_0x57A2;
/* 0x57A3 */ u8 field_0x57A3[8];
/* 0x57AB */ u8 field_0x57AB[8];
/* 0x57A3 */ bool field_0x57A3[8];
/* 0x57AB */ bool mIsBocoburinLocked[8];
/* 0x57B3 */ u8 field_0x57B3;
/* 0x57B4 */ u8 field_0x57B4;
/* 0x57B5 */ u8 field_0x57B5;
include/toBeSorted/counters/goddess_chest_counter.h
+3 -3
View File
@@ -8,9 +8,9 @@ public:
GoddessChestCounter() : Counter(0x43F) {}
virtual ~GoddessChestCounter() {};
virtual u16 getCommittedValue() override;
virtual u16 getMax() override;
virtual u16 getUncommittedValue() override;
virtual u16 getCommittedValue() const override;
virtual u16 getMax() const override;
virtual u16 getUncommittedValue() const override;
virtual void setValue(u16 num) override;
static GoddessChestCounter sInstance;
include/toBeSorted/effects_struct.h
+6
View File
@@ -28,8 +28,14 @@ public:
void fn_80029980(u16 effect, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, void *, void *);
void fn_800299F0(u16 effect, mMtx_c *mtx, void *, void *);
void fn_80029A10(u16 effect, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, void *, void *);
void fn_80029A70(u16 effect, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, void *, void *);
void setMtx(const mMtx_c &);
static void fn_800298C0(u16 effect, mVec3_c *pos, void*, void*, void*, void*);
void fn_80026ED0();
void fn_80026F10();
bool checkField0x00() const {
return field_0x00 != 0;
}
src/REL/d/a/obj/d_a_obj_dungeon_ship.cpp
+2 -2
View File
@@ -171,8 +171,8 @@ int dAcODungeonShip_c::doDelete() {
return SUCCEEDED;
}
extern "C" u16 PARTICLE_RESOURCE_ID_MAPPING_682_;
extern "C" u16 PARTICLE_RESOURCE_ID_MAPPING_683_;
extern "C" const u16 PARTICLE_RESOURCE_ID_MAPPING_682_;
extern "C" const u16 PARTICLE_RESOURCE_ID_MAPPING_683_;
int dAcODungeonShip_c::actorExecute() {
field_0x850++;
src/REL/d/a/obj/d_a_obj_tower_gearD101.cpp
+1 -1
View File
@@ -126,7 +126,7 @@ void dAcOTowerGearD101_c::initTransform() {
mMdl.setLocalMtx(field_0x3C4);
}
extern "C" u16 PARTICLE_RESOURCE_ID_MAPPING_585_;
extern "C" const u16 PARTICLE_RESOURCE_ID_MAPPING_585_;
void dAcOTowerGearD101_c::playVisualEffect() {
mEffects.fn_80029A10(PARTICLE_RESOURCE_ID_MAPPING_585_, &field_0x3F4, &rotation, nullptr, nullptr, nullptr);
}
src/REL/d/a/obj/d_a_obj_tower_hand_D101.cpp
+1 -1
View File
@@ -593,7 +593,7 @@ void dAcOTowerHandD101_c::executeState_RemainOpen() {
}
void dAcOTowerHandD101_c::finalizeState_RemainOpen() {}
extern "C" u16 PARTICLE_RESOURCE_ID_MAPPING_573;
extern "C" const u16 PARTICLE_RESOURCE_ID_MAPPING_573;
void dAcOTowerHandD101_c::initializeState_Close() {
mMdl.getAnm().setPlayState(m3d::PLAY_MODE_1);
mMdl.setRate(getCloseRate());
src/REL/d/a/obj/d_a_obj_tubo.cpp
+1 -1
View File
@@ -449,7 +449,7 @@ void dAcOtubo_c::finalizeState_Rebirth() {
extern "C" void fn_80027510(void *, bool);
extern "C" void fn_80027560(void *, bool, int);
extern "C" void *fn_800298B0(u16, mVec3_c *, mVec3_c *, u32, u32, u32, u32, u32);
extern "C" u16 PARTICLE_RESOURCE_ID_MAPPING_109_, PARTICLE_RESOURCE_ID_MAPPING_209_;
extern "C" const u16 PARTICLE_RESOURCE_ID_MAPPING_109_, PARTICLE_RESOURCE_ID_MAPPING_209_;
extern "C" void *ENVIRONMENT;
extern "C" void fn_80022BE0(void *, const mVec3_c &);
src/REL/d/a/obj/d_a_obj_tumble_weed.cpp
+1 -1
View File
@@ -259,7 +259,7 @@ bool dAcOTumbleWeed_c::checkInvalidGround() const {
code == POLY_ATTR_SAND_DEEP_SLOW;
}
extern "C" u16 PARTICLE_RESOURCE_ID_MAPPING_743_;
extern "C" const u16 PARTICLE_RESOURCE_ID_MAPPING_743_;
extern "C" void fn_800298B0(u16, mVec3_c *, mAng3_c *, u32, u32, u32, u32, u32);
void dAcOTumbleWeed_c::doBreak() {
src/d/a/obj/d_a_obj_tbox.cpp
+2 -2
View File
@@ -1933,8 +1933,8 @@ void dAcTbox_c::executeState_LoadArchive() {
void dAcTbox_c::finalizeState_LoadArchive() {}
extern "C" void fn_800298B0(u16 effectIndex, mVec3_c *, mAng3_c *, mVec3_c *, void *, void *, void *, void *);
extern "C" u16 PARTICLE_RESOURCE_ID_MAPPING_209_;
extern "C" bool isPouchItem(u16);
extern "C" const u16 PARTICLE_RESOURCE_ID_MAPPING_209_;
extern "C" const bool isPouchItem(u16);
extern "C" u8 adventurePouchFindItemSlot(ITEM_ID item);
extern "C" u16 findItemInItemCheck(ITEM_ID item);
extern "C" dAcItem_c *giveItem3(u16 item, s32);
src/d/a/obj/d_a_obj_water_spout.cpp
+1 -1
View File
@@ -60,7 +60,7 @@ int dAcOwaterSpout_c::draw() {
}
extern "C" void fn_800298B0(u16, mVec3_c *, mVec3_c *, mVec3_c *, u32, u32, u32, u32);
extern "C" u16 PARTICLE_RESOURCE_ID_MAPPING_213_;
extern "C" const u16 PARTICLE_RESOURCE_ID_MAPPING_213_;
void dAcOwaterSpout_c::initializeState_Wait() {
if (params == 1) {
src/d/lyt/d_lyt_area_caption.cpp
+4 -4
View File
@@ -105,9 +105,9 @@ bool dLytAreaCaptionParts_c::draw() {
void dLytAreaCaptionParts_c::setTextIfWaiting(const char *text) {
if (*mStateMgr.getStateID() == StateID_Wait) {
mTextBoxes[0]->fn_800E0A60(text, nullptr);
mTextBoxes[1]->fn_800E0A60(text, nullptr);
mTextBoxes[2]->fn_800E0A60(text, nullptr);
mTextBoxes[0]->setMessageWithGlobalTextProcessor2(text, nullptr);
mTextBoxes[1]->setMessageWithGlobalTextProcessor2(text, nullptr);
mTextBoxes[2]->setMessageWithGlobalTextProcessor2(text, nullptr);
field_0x54C = 1;
}
}
@@ -120,7 +120,7 @@ void dLytAreaCaptionParts_c::check() {
void dLytAreaCaptionParts_c::initializeState_Wait() {}
void dLytAreaCaptionParts_c::executeState_Wait() {
mTextBoxes[0]->fn_800E0A60("N_inOut_00", nullptr);
mTextBoxes[0]->setMessageWithGlobalTextProcessor2("N_inOut_00", nullptr);
}
void dLytAreaCaptionParts_c::finalizeState_Wait() {}
src/d/lyt/meter/d_lyt_meter.cpp
+4 -4
View File
@@ -30,7 +30,7 @@ STATE_DEFINE(dLytMeterParts_c, Out);
void dLytMeter1Button_c::initializeState_Wait() {}
void dLytMeter1Button_c::executeState_Wait() {
if (dLytMeterContainer_c::GetInstance()->checkFlag(0x80)) {
if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x80)) {
return;
}
mStateMgr.changeState(StateID_ToUnuse);
@@ -77,7 +77,7 @@ void dLytMeter1Button_c::initializeState_Unuse() {
field_0x1A4 = 15;
}
void dLytMeter1Button_c::executeState_Unuse() {
if (dLytMeterContainer_c::GetInstance()->checkFlag(0x80)) {
if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x80)) {
if (!(field_0x1A4 > 0)) {
mStateMgr.changeState(StateID_ToUse);
return;
@@ -143,7 +143,7 @@ bool dLytMeter1Button_c::execute() {
void dLytMeter2Button_c::initializeState_Wait() {}
void dLytMeter2Button_c::executeState_Wait() {
if (dLytMeterContainer_c::GetInstance()->checkFlag(0x100)) {
if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x100)) {
return;
}
mStateMgr.changeState(StateID_ToUnuse);
@@ -190,7 +190,7 @@ void dLytMeter2Button_c::initializeState_Unuse() {
field_0x1A4 = 15;
}
void dLytMeter2Button_c::executeState_Unuse() {
if (dLytMeterContainer_c::GetInstance()->checkFlag(0x100)) {
if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x100)) {
if (!(field_0x1A4 > 0)) {
mStateMgr.changeState(StateID_ToUse);
return;
src/d/lyt/meter/d_lyt_meter_a_btn.cpp
+6
View File
@@ -1,5 +1,6 @@
#include "d/lyt/meter/d_lyt_meter_a_btn.h"
#include "common.h"
#include "d/lyt/d_textbox.h"
#include "d/lyt/d_window.h"
@@ -139,3 +140,8 @@ bool dLytMeterABtn_c::remove() {
}
return true;
}
void dLytMeterABtn_c::fn_800E0870(u32) {
// TODO, just getting this function to spawn to figure out its signature
mpTextBoxes[0]->setMessageWithGlobalTextProcessor2("", nullptr);
}
src/d/lyt/meter/d_lyt_meter_item_select.cpp
+1284 -106
View File
File diff suppressed because it is too large Load Diff
src/toBeSorted/special_item_drop_mgr.cpp
+2 -4
View File
@@ -385,8 +385,6 @@ static const struct {
};
static const u16 RAND_RUPEE_ARRAY[3] = {ITEM_GREEN_RUPEE, ITEM_BLUE_RUPEE, ITEM_RED_RUPEE};
extern "C" int getCurrentBowType();
extern "C" int getCurrentSlingshotType();
extern "C" bool isHeroMode();
// 800c7bb0
@@ -402,12 +400,12 @@ int SpecialItemDropMgr::fn_800C7BB0(int specialItemId) {
int weight = e->mDropChance;
if (entryIdx == 9 || entryIdx == 10) {
if (getCurrentBowType() == 0) {
if (dAcPy_c::getCurrentBowType() == 0) {
// No arrows until you get the Bow
weight = 0;
}
} else if (entryIdx == 11) {
if (getCurrentSlingshotType() == 0) {
if (dAcPy_c::getCurrentSlingshotType() == 0) {
// No seeds until you get the Slingshot
weight = 0;
}