partially working colossal wallet

This commit is contained in:
TakaRikka
2026-06-11 03:10:45 -07:00
parent 43817ea4e5
commit 6692eff3a3
6 changed files with 30 additions and 2 deletions
+4
View File
@@ -400,4 +400,8 @@ BOOL isBottleItem(u8 item_no);
u8 check_itemno(int i_itemNo);
BOOL isInsect(u8 i_itemNo);
#if TARGET_PC
void item_func_WALLET_LV4();
#endif
#endif /* D_D_ITEM_H */
+7
View File
@@ -350,4 +350,11 @@ enum {
/* 0xFF */ dItemNo_NONE_e,
};
#if TARGET_PC
// HD item mappings
enum {
dItemNo_WALLET_LV4_e = 0xDA,
};
#endif
#endif /* D_D_ITEM_DATA_H */
+8 -1
View File
@@ -229,7 +229,7 @@ static void (*item_func_ptr[256])() = {
item_func_F_MAYFLY,
item_func_noentry,
item_func_noentry,
item_func_noentry,
DUSK_IF_ELSE(item_func_WALLET_LV4, item_func_noentry),
item_func_noentry,
item_func_noentry,
item_func_noentry,
@@ -2187,4 +2187,11 @@ int addBombCount(u8 i_bombType, u8 i_addNum) {
return i_addNum;
}
#if TARGET_PC
// HD item functions
void item_func_WALLET_LV4() {
dComIfGs_setWalletSize(3);
}
#endif
u8* dEnemyItem_c::mData;
+4
View File
@@ -221,7 +221,11 @@ dItem_itemResource dItem_data::item_resource[] = {
{"O_gD_kagm", 0x0009, 0x000F, 0x0006, 0x000C,-0x0001, -0x1, -0x1, 0x0031, 0x50, 0x0000},
{"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
{"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
#if TARGET_PC
{"O_gD_puL4", 0x0001,-0x0001,-0x0001, -0x0001,-0x0001, -0x1, -0x1, 0x00AF, 0x26, 0x0251},
#else
{"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
#endif
{"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
{"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
{"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+2
View File
@@ -685,6 +685,8 @@ void dMenu_Collect2D_c::screenSet() {
field_0x184[0][3] = 0x199;
} else if (dComIfGs_getWalletSize() == BIG_WALLET) {
field_0x184[0][3] = 0x19a;
} if (dusk::tphd_active() && dComIfGs_getWalletSize() == 3) {
field_0x184[0][3] = 0x19c;
} else {
field_0x184[0][3] = 0x19b;
}
+5 -1
View File
@@ -118,7 +118,7 @@ u8 dSv_player_status_a_c::getMixItemIndex(int i_no) const {
}
u16 dSv_player_status_a_c::getRupeeMax() const {
if (mWalletSize < 3) { // if you make this a default, it wont match. Compiler, pls.
if (mWalletSize < 3 IF_DUSK(|| (dusk::tphd_active() && mWalletSize < 4))) { // if you make this a default, it wont match. Compiler, pls.
switch (mWalletSize) {
case WALLET:
#if TARGET_PC
@@ -138,6 +138,10 @@ u16 dSv_player_status_a_c::getRupeeMax() const {
#else
return 1000;
#endif
#if TARGET_PC
case 3: // colossal wallet
return 9999;
#endif
}
}