mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-29 16:44:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

One regswap remaining

Browse Source
This commit is contained in:
robojumper
2025-12-27 17:27:08 +01:00
parent baae144a6e
commit 6bb94000fd
3 changed files with 669 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/symbols.txt
+26 -17
View File
@@ -15873,22 +15873,22 @@ buildSubpanes__14dLytShopMain_cFv = .text:0x802A3860; // type:function size:0x30
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__14dLytShopMain_cFv = .text:0x802A4550; // type:function size:0x8E4
getItemTier__14dLytShopMain_cFl = .text:0x802A4430; // type:function size:0x5C
getItemIndex__14dLytShopMain_cFl = .text:0x802A4490; // type:function size:0x68
getItemKind__14dLytShopMain_cFl = .text:0x802A4500; // type:function size:0x44
handleNavigation__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
dLytShopMain__showShopLytMaybeMaybe = .text:0x802A5800; // type:function size:0x1C8
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__14dLytShopMain_cFv = .text:0x802A5BD0; // type:function size:0xD0
fn_802A5CA0__14dLytShopMain_cFb = .text:0x802A5CA0; // type:function size:0xD4
displayMaterialCheck__14dLytShopMain_cFv = .text:0x802A5010; // type:function size:0x74C
getItemIconOffset__14dLytShopMain_cFUc = .text:0x802A5760; // type:function size:0x18
getMaterialIconOffset__14dLytShopMain_cFUc = .text:0x802A5780; // type:function size:0x14
calcNumDigits__14dLytShopMain_cFl = .text:0x802A57A0; // type:function size:0x58
loadMaterialCheckItemText__14dLytShopMain_cFv = .text:0x802A5800; // type:function size:0x1C8
loadPrice__14dLytShopMain_cFl = .text:0x802A59D0; // type:function size:0x118
getSelectedUpgradeCosts__14dLytShopMain_cCFv = .text:0x802A5AF0; // type:function size:0xA0
getCurrentlySelectedPouchItemId__14dLytShopMain_cCFv = .text:0x802A5B90; // type:function size:0x1C
isMaterialCheck__14dLytShopMain_cCFv = .text:0x802A5BB0; // type:function size:0x18
hideUpgradeCostPanes__14dLytShopMain_cFv = .text:0x802A5BD0; // type:function size:0xD0
setShowCancelButtons__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
@@ -15930,7 +15930,7 @@ getStateID__79sStateMgr_c<10dLytShop_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13s
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
getSelectedUpgradeCosts__10dLytShop_cCFv = .text:0x802A6B00; // type:function size:0x8
__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
@@ -37354,7 +37354,16 @@ lbl_8053C530 = .data:0x8053C530; // type:object size:0xC data:string
lbl_8053C53C = .data:0x8053C53C; // type:object size:0xB data:string
lbl_8053C548 = .data:0x8053C548; // type:object size:0xF data:string
lbl_8053C558 = .data:0x8053C558; // type:object size:0xF data:string
lbl_8053C568 = .data:0x8053C568; // type:object size:0xF4
lbl_8053C568 = .data:0x8053C568; // type:object size:0xE data:string
lbl_8053C578 = .data:0x8053C578; // type:object size:0x64
lbl_8053C5DC = .data:0x8053C5DC; // type:object size:0xD data:string
lbl_8053C5EC = .data:0x8053C5EC; // type:object size:0xE data:string
lbl_8053C5FC = .data:0x8053C5FC; // type:object size:0xD data:string
lbl_8053C60C = .data:0x8053C60C; // type:object size:0xE data:string
lbl_8053C61C = .data:0x8053C61C; // type:object size:0xD data:string
lbl_8053C62C = .data:0x8053C62C; // type:object size:0xE data:string
lbl_8053C63C = .data:0x8053C63C; // type:object size:0xD data:string
lbl_8053C64C = .data:0x8053C64C; // type:object size:0xE data:string
lbl_8053C65C = .data:0x8053C65C; // type:object size:0xC data:string
lbl_8053C668 = .data:0x8053C668; // type:object size:0xC data:string
lbl_8053C674 = .data:0x8053C674; // type:object size:0xC data:string
include/d/lyt/d_lyt_shop.h
+41 -20
View File
@@ -18,6 +18,18 @@ public:
SERVICE_SHIELD_REPAIR,
};
struct ShopUpgradeMaterialCost {
/* 0x0 */ s16 itemId;
/* 0x2 */ s16 amount;
};
struct ShopUpgradeCosts {
/* 0x0 */ s16 newItemId;
/* 0x2 */ s16 oldItemId;
/* 0x4 */ s16 price;
/* 0x6 */ ShopUpgradeMaterialCost matCosts[4];
};
private:
enum Phase_e {
PHASE_SELECT_ITEM,
@@ -43,12 +55,12 @@ public:
return mService;
}
bool getField_0x116DD() const {
return field_0x116DD;
bool isCancel() const {
return mIsCancel;
}
bool getField_0x116DE() const {
return field_0x116DE;
bool isConfirm() const {
return mIsConfirm;
}
void retry() {
@@ -64,29 +76,34 @@ public:
void setModeOut();
void setModeInOut();
ShopUpgradeCosts getSelectedUpgradeCosts() const;
s32 getCurrentlySelectedPouchItemId() const;
bool isMaterialCheck() const;
private:
static const s32 NUM_ITEMS = 12;
static const s32 NUM_MATERIAL_CHECK_ITEMS = 8;
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 displayMaterialCheck();
void prepareRemodelStoreStuff(s32 service);
void showShopLytMaybe();
void showPriceMaybe(s32 value);
void loadMaterialCheckItemText();
void loadPrice(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);
void hideUpgradeCostPanes();
void setShowCancelButtons(bool show);
s32 getItemIndex(s32 id);
s32 getItemKind(s32 index);
s32 getItemIconOffset(u8 variant);
s32 getMaterialIconOffset(u8 variant);
STATE_FUNC_DECLARE(dLytShopMain_c, ModeNone);
STATE_FUNC_DECLARE(dLytShopMain_c, ModeSelectIn);
@@ -113,11 +130,11 @@ private:
/* 0x11610 */ d2d::SubPaneList mUpgradeList;
/* 0x1161C */ d2d::SubPaneListNode mUpgradeNodes[12];
/* 0x116DC */ bool mIsIdle;
/* 0x116DD */ bool field_0x116DD;
/* 0x116DE */ bool field_0x116DE;
/* 0x116DD */ bool mIsCancel;
/* 0x116DE */ bool mIsConfirm;
/* 0x116DF */ bool mUpgradeLoaded;
/* 0x116E0 */ bool mPrevPointerVisible;
/* 0x116E1 */ bool field_0x116E1;
/* 0x116E1 */ bool mShowCancelBtns;
/* 0x116E4 */ s32 mPhase;
/* 0x116E8 */ s32 mCurrentNavTarget;
/* 0x116EC */ s32 mStateStep;
@@ -125,11 +142,11 @@ private:
/* 0x116F4 */ s32 mService;
/* 0x116F8 */ s32 mItemCount;
/* 0x116FC */ s32 mUpgradeCostCount;
/* 0x11700 */ UNKWORD field_0x11700;
/* 0x11700 */ s32 mConfirmedNavTarget;
/* 0x11704 */ s32 mItemUpgradeIdxes[NUM_ITEMS];
/* 0x11734 */ s32 mItemPouchSlots[NUM_ITEMS];
/* 0x11764 */ u8 mItemKinds[NUM_ITEMS];
/* 0x11770 */ u8 field_0x11770[8];
/* 0x11770 */ u8 mMaterialCheckItemKinds[NUM_MATERIAL_CHECK_ITEMS];
};
class dLytShop_c : public dLytBase_c {
@@ -149,6 +166,10 @@ public:
virtual int draw() override;
virtual int doDelete() override;
dLytShopMain_c::ShopUpgradeCosts getSelectedUpgradeCosts() const;
// TODO - add more inlines for REL 44
private:
static dLytShop_c *sInstance;
src/d/lyt/d_lyt_shop.cpp
+602 -301
View File
File diff suppressed because it is too large Load Diff