mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-04 17:10:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Magic Numbers go bye-bye (Only Pouch Currently)

Browse Source
This commit is contained in:
elijah-thomas774
2025-03-31 19:14:14 -04:00
parent 95c710fab0
commit d85379e718
2 changed files with 87 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/lyt/d_lyt_common_icon_item.cpp
+29 -18
View File
@@ -2,6 +2,7 @@
#include "common.h"
#include "d/d_cs_base.h"
#include "d/lyt/d_lyt_common_icon_item_maps.h"
#include "d/lyt/d_structd.h"
#include <cstring>
@@ -368,25 +369,25 @@ void dLytCommonIconItemPart2_c::setShieldOnOff(bool onOff) {
}
void dLytCommonIconItemPart2_c::setItem(u8 item) {
if (item == 32) {
if (item == LYT_CMN_32) {
return;
}
u8 mappedItem = item;
realizeUnk();
if (item == 9) {
if (item == LYT_CMN_PotionHealthPlusPlusFull) {
if (mNumber == 1) {
mappedItem = 50;
mappedItem = LYT_CMN_PotionHealthPlusPlusHalf;
} else if (mNumber == 2) {
mappedItem = 9;
mappedItem = LYT_CMN_PotionHealthPlusPlusFull;
}
mHasNumber = false;
realizeNumberV();
} else if (item == 43) {
} else if (item == LYT_CMN_PotionRepairPlusPlusFull) {
if (mNumber == 1) {
mappedItem = 51;
mappedItem = LYT_CMN_PotionRepairPlusPlusHalf;
} else if (mNumber == 2) {
mappedItem = 43;
mappedItem = LYT_CMN_PotionRepairPlusPlusFull;
}
mHasNumber = false;
realizeNumberV();
@@ -476,17 +477,27 @@ void dLytCommonIconItemPart2_c::realizeShieldOnOff(bool onOff) {
u8 dLytCommonIconItemPart2_c::getShieldType() const {
switch (mItem) {
case 2:
case 15:
case 16: return 0; // Wooden Shield
case 3:
case 17:
case 18: return 1; // Iron Shield
case 4:
case 19:
case 20: return 2; // Goddess Shield
case 5: return 3; // Hylia's Shield
default: return 4;
case LYT_CMN_ShieldWoodA:
case LYT_CMN_ShieldWoodB:
case LYT_CMN_ShieldWoodC: {
return 0;
}
case LYT_CMN_ShieldIronA:
case LYT_CMN_ShieldIronB:
case LYT_CMN_ShieldIronC: {
return 1;
}
case LYT_CMN_ShieldHolyA:
case LYT_CMN_ShieldHolyB:
case LYT_CMN_ShieldHolyC: {
return 2;
}
case LYT_CMN_ShieldHylian: {
return 3;
}
default: {
return 4;
}
}
}