mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-24 07:10:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

more mapping

Browse Source
This commit is contained in:
elijah-thomas774
2025-04-01 08:46:13 -04:00
parent d85379e718
commit abcaf2c9ed
2 changed files with 127 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/lyt/d_lyt_common_icon_item_maps.h
+110 -52
View File
@@ -1,58 +1,116 @@
#ifndef D_LYT_COMMON_ICON_MAPS_H
#define D_LYT_COMMON_ICON_MAPS_H
// Bugs
#define LYT_CMN_BugDekuHornet (0) // [ 0] tr_bugIcon_00.tpl
#define LYT_CMN_BugBlessedButterfly (1) // [ 1] tr_bugIcon_01.tpl
#define LYT_CMN_BugGerudoDragonfly (2) // [ 2] tr_bugIcon_02.tpl
#define LYT_CMN_BugStarryFirefly (3) // [ 3] tr_bugIcon_03.tpl
#define LYT_CMN_BugWoodlandRhinoBetle (4) // [ 4] tr_bugIcon_04.tpl
#define LYT_CMN_BugVolcanicLadyBug (5) // [ 5] tr_bugIcon_05.tpl
#define LYT_CMN_BugSandCicada (6) // [ 6] tr_bugIcon_06.tpl
#define LYT_CMN_BugSkyStagBeetle (7) // [ 7] tr_bugIcon_07.tpl
#define LYT_CMN_BugFaronGrasshopper (8) // [ 8] tr_bugIcon_08.tpl
#define LYT_CMN_BugSkyloftMantis (9) // [ 9] tr_bugIcon_09.tpl
#define LYT_CMN_BugLanayruAnt (10) // [10] tr_bugIcon_10.tpl
#define LYT_CMN_BugEldinRoller (11) // [11] tr_bugIcon_11.tpl
// Items
#define LYT_CMN_ItemBombBag (0) // [ 8] uc_bomb_00.tpl
#define LYT_CMN_ItemBow (1) // [ 9] uc_bowA_00.tpl
#define LYT_CMN_ItemSlingshot (2) // [15] uc_pachinkoA_00.tpl
#define LYT_CMN_ItemBeetle (3) // [ 3] uc_beetleA_00.tpl
#define LYT_CMN_ItemClawshots (4) // [12] uc_hookShot_00.tpl
#define LYT_CMN_ItemBugnet (5) // [13] uc_netA_00.tpl
#define LYT_CMN_ItemWhip (6) // [ 2] tr_whip_00.tpl
#define LYT_CMN_ItemGustBellows (7) // [ 1] tr_vacuumIcon_00.tpl
#define LYT_CMN_ItemHookBeetle (8) // [ 4] uc_beetleB_00.tpl
#define LYT_CMN_ItemQuickBeetle (9) // [ 5] uc_beetleC_00.tpl
#define LYT_CMN_ItemToughBeetle (10) // [ 6] uc_beetleD_00.tpl
#define LYT_CMN_ItemIronBow (11) // [10] uc_bowB_00.tpl
#define LYT_CMN_ItemSacredBow (12) // [11] uc_bowC_00.tpl
#define LYT_CMN_ItemScattershot (13) // [16] uc_pachinkoB_00.tpl
#define LYT_CMN_ItemSailcloth (14) // [17] uc_stoleIcon_00.tpl
#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
// Pouch Items
#define LYT_CMN_PotionHealyh (0) // uc_bottleKusuriA_00.tpl
#define LYT_CMN_Bottle (1) // uc_bottleEmpty_00.tpl
#define LYT_CMN_ShieldWoodA (2) // uc_shieldWoodA_00.tpl
#define LYT_CMN_ShieldIronA (3) // uc_shieldIronA_00.tpl
#define LYT_CMN_ShieldHolyA (4) // uc_shieldHolyA_00.tpl
#define LYT_CMN_ShieldHylian (5) // uc_shieldHylia_00.tpl
#define LYT_CMN_PotionAir (6) // uc_bottleAirA_00.tpl
#define LYT_CMN_PotionStamina (7) // uc_bottleGutsA_00.tpl
#define LYT_CMN_PotionHealthPlus (8) // uc_bottleKusuriB_00.tpl
#define LYT_CMN_PotionHealthPlusPlusFull (9) // uc_bottleKusuriC_00.tpl
#define LYT_CMN_PotionAirPlus (10) // uc_bottleAirB_00.tpl
#define LYT_CMN_PotionStaminaPlus (11) // uc_bottleGutsB_00.tpl
#define LYT_CMN_Blank4 (12) // tr_black4_00.tpl
#define LYT_CMN_PotionGaurdian (13) // uc_bottleMutekiA_00.tpl
#define LYT_CMN_PotionGaurdianPlus (14) // uc_bottleMutekiB_00.tpl
#define LYT_CMN_ShieldWoodB (15) // uc_shieldWoodB_00.tpl
#define LYT_CMN_ShieldWoodC (16) // uc_shieldWoodC_00.tpl
#define LYT_CMN_ShieldIronB (17) // uc_shieldIronB_00.tpl
#define LYT_CMN_ShieldIronC (18) // uc_shieldIronC_00.tpl
#define LYT_CMN_ShieldHolyB (19) // uc_shieldHolyB_00.tpl
#define LYT_CMN_ShieldHolyC (20) // uc_shieldHolyC_00.tpl
#define LYT_CMN_SeedSatchelSmall (21) // uc_spareSeedA_00.tpl
#define LYT_CMN_SeedSatchelMed (22) // uc_spareSeedB_00.tpl
#define LYT_CMN_SeedSatchelBig (23) // uc_spareSeedC_00.tpl
#define LYT_CMN_QuiverSmall (24) // uc_spareQuiverA_00.tpl
#define LYT_CMN_QuiverMed (25) // uc_spareQuiverB_00.tpl
#define LYT_CMN_QuiverBig (26) // uc_spareQuiverC_00.tpl
#define LYT_CMN_BombBagSmall (27) // uc_spareBombBagA_00.tpl
#define LYT_CMN_BombBagMed (28) // uc_spareBombBagB_00.tpl
#define LYT_CMN_BombBagBig (29) // uc_spareBombBagC_00.tpl
#define LYT_CMN_GlitteringSpores (30) // uc_bottleKinokoB_00.tpl
#define LYT_CMN_HolyWater (31) // uc_bottleHoly_00.tpl
#define LYT_CMN_32 (32) // tr_rupyCrystal_02.tpl // Assuming Unused
#define LYT_CMN_33 (33) // tr_rupyCrystal_02.tpl
#define LYT_CMN_34 (34) // tr_rupyCrystal_03.tpl
#define LYT_CMN_MedalDurable (35) // uc_medalDurable_00.tpl
#define LYT_CMN_MedalHeart (36) // uc_medalHeart_00.tpl
#define LYT_CMN_MedalLife (37) // uc_medalLife_00.tpl
#define LYT_CMN_MedalRupee (38) // uc_medalLucky_00.tpl
#define LYT_CMN_MedalTreasure (39) // uc_medalReturn_00.tpl
#define LYT_CMN_MedalCursed (40) // uc_medalDemon_00.tpl
#define LYT_CMN_PotionRepair (41) // uc_bottleRepairA_00.tpl
#define LYT_CMN_PotionRepairPlus (42) // uc_bottleRepairB_00.tpl
#define LYT_CMN_PotionRepairPlusPlusFull (43) // uc_bottleRepairC_01.tpl
#define LYT_CMN_FairyBottle (44) // uc_bottleFairy_00.tpl
#define LYT_CMN_Water (45) // uc_bottleWater_00.tpl
#define LYT_CMN_PumpkinSoup (46) // uc_bottlePumpkinA_00.tpl
#define LYT_CMN_PumpkinSoupCold (47) // uc_bottlePumpkinB_00.tpl
#define LYT_CMN_MushroomSpores (48) // uc_bottleKinokoA_00.tpl
#define LYT_CMN_MedalBug (49) // uc_medalHunter_00.tpl
#define LYT_CMN_PotionHealthPlusPlusHalf (50) // uc_bottleKusuriC_01.tpl
#define LYT_CMN_PotionRepairPlusPlusHalf (51) // uc_bottleRepairC_00.tpl
#define LYT_CMN_PouchPotionHealyh (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
#define LYT_CMN_PouchShieldHolyA (4) // [32] uc_shieldHolyA_00.tpl
#define LYT_CMN_PouchShieldHylian (5) // [35] uc_shieldHylia_00.tpl
#define LYT_CMN_PouchPotionAir (6) // [ 3] uc_bottleAirA_00.tpl
#define LYT_CMN_PouchPotionStamina (7) // [ 7] uc_bottleGutsA_00.tpl
#define LYT_CMN_PouchPotionHealthPlus (8) // [13] uc_bottleKusuriB_00.tpl
#define LYT_CMN_PouchPotionHealthPlusPlusFull (9) // [14] uc_bottleKusuriC_00.tpl
#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_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
#define LYT_CMN_PouchShieldIronC (18) // [38] uc_shieldIronC_00.tpl
#define LYT_CMN_PouchShieldHolyB (19) // [33] uc_shieldHolyB_00.tpl
#define LYT_CMN_PouchShieldHolyC (20) // [34] uc_shieldHolyC_00.tpl
#define LYT_CMN_PouchSeedSatchelSmall (21) // [48] uc_spareSeedA_00.tpl
#define LYT_CMN_PouchSeedSatchelMed (22) // [49] uc_spareSeedB_00.tpl
#define LYT_CMN_PouchSeedSatchelBig (23) // [50] uc_spareSeedC_00.tpl
#define LYT_CMN_PouchQuiverSmall (24) // [45] uc_spareQuiverA_00.tpl
#define LYT_CMN_PouchQuiverMed (25) // [46] uc_spareQuiverB_00.tpl
#define LYT_CMN_PouchQuiverBig (26) // [47] uc_spareQuiverC_00.tpl
#define LYT_CMN_PouchBombBagSmall (27) // [42] uc_spareBombBagA_00.tpl
#define LYT_CMN_PouchBombBagMed (28) // [43] uc_spareBombBagB_00.tpl
#define LYT_CMN_PouchBombBagBig (29) // [44] uc_spareBombBagC_00.tpl
#define LYT_CMN_PouchGlitteringSpores (30) // [11] uc_bottleKinokoB_00.tpl
#define LYT_CMN_PouchHolyWater (31) // [ 9] uc_bottleHoly_00.tpl
#define LYT_CMN_Pouch32 (32) // [ 1] tr_rupyCrystal_02.tpl // Assuming Unused
#define LYT_CMN_Pouch33 (33) // [ 1] tr_rupyCrystal_02.tpl
#define LYT_CMN_Pouch34 (34) // [ 2] tr_rupyCrystal_03.tpl
#define LYT_CMN_PouchMedalDurable (35) // [26] uc_medalDurable_00.tpl
#define LYT_CMN_PouchMedalHeart (36) // [27] uc_medalHeart_00.tpl
#define LYT_CMN_PouchMedalLife (37) // [29] uc_medalLife_00.tpl
#define LYT_CMN_PouchMedalRupee (38) // [30] uc_medalLucky_00.tpl
#define LYT_CMN_PouchMedalTreasure (39) // [31] uc_medalReturn_00.tpl
#define LYT_CMN_PouchMedalCursed (40) // [25] uc_medalDemon_00.tpl
#define LYT_CMN_PouchPotionRepair (41) // [20] uc_bottleRepairA_00.tpl
#define LYT_CMN_PouchPotionRepairPlus (42) // [21] uc_bottleRepairB_00.tpl
#define LYT_CMN_PouchPotionRepairPlusPlusFull (43) // [23] uc_bottleRepairC_01.tpl
#define LYT_CMN_PouchFairyBottle (44) // [ 6] uc_bottleFairy_00.tpl
#define LYT_CMN_PouchWater (45) // [24] uc_bottleWater_00.tpl
#define LYT_CMN_PouchPumpkinSoup (46) // [20] uc_bottlePumpkinA_00.tpl
#define LYT_CMN_PouchPumpkinSoupCold (47) // [21] uc_bottlePumpkinB_00.tpl
#define LYT_CMN_PouchMushroomSpores (48) // [10] uc_bottleKinokoA_00.tpl
#define LYT_CMN_PouchMedalBug (49) // [28] uc_medalHunter_00.tpl
#define LYT_CMN_PouchPotionHealthPlusPlusHalf (50) // [15] uc_bottleKusuriC_01.tpl
#define LYT_CMN_PouchPotionRepairPlusPlusHalf (51) // [22] uc_bottleRepairC_00.tpl
// Dowsing Icons
#define LYT_CMN_DowsingNone (0) // [ 1] tr_dauzTarget_00.tpl
#define LYT_CMN_DowsingHeart (1) // [ 2] tr_dauzTarget_01.tpl
#define LYT_CMN_Dowsing2 (2) // [ 3] tr_dauzTarget_02.tpl
#define LYT_CMN_DowsingGratitudeCrystal (3) // [21] uk_dawGenki_00.tpl
#define LYT_CMN_DowsingRupee (4) // [ 4] tr_dauzTarget_04.tpl
#define LYT_CMN_DowsingHolyWater (5) // [20] uc_bottleHoly_00.tpl
#define LYT_CMN_DowsingTreasure (6) // [ 5] tr_dauzTarget_06.tpl
#define LYT_CMN_DowsingPowerGenerators (7) // [ 6] tr_dauzTarget_07.tpl
#define LYT_CMN_DowsingKikwi (8) // [ 7] tr_dauzTarget_08.tpl
#define LYT_CMN_DowsingLook (9) // [ 0] tr_cameraMark_00.tpl
#define LYT_CMN_DowsingWindmillPropeller (10) // [ 8] tr_dauzTarget_10.tpl
#define LYT_CMN_DowsingEarthTempleKey (11) // [18] ts_keyKakera_00.tpl
#define LYT_CMN_DowsingPumpkinPatchPlower (12) // [16] ts_dauzPump_00.tpl
#define LYT_CMN_DowsingPartyWheel (13) // [ 9] tr_dauzTarget_13.tpl
#define LYT_CMN_DowsingWaterBasin (14) // [19] ts_waterPot_00.tpl
#define LYT_CMN_DowsingCrystalBall (15) // [10] tr_dauzTarget_15.tpl
#define LYT_CMN_DowsingGoddessCube (16) // [17] ts_GdsCube_00.tpl
#define LYT_CMN_DowsingTadtones (17) // [11] tr_dauzTarget_17.tpl
#define LYT_CMN_DowsingSandship (18) // [12] tr_dauzTarget_18.tpl
#define LYT_CMN_DowsingZelda (19) // [13] tr_dauzTarget_19.tpl
#define LYT_CMN_DowsingTrialGate (20) // [14] tr_dauzTarget_20.tpl
#define LYT_CMN_DowsingNewPlantSpecies (21) // [15] tr_dauzTarget_21.tpl
#endif
src/d/lyt/d_lyt_common_icon_item.cpp
+17 -17
View File
@@ -369,25 +369,25 @@ void dLytCommonIconItemPart2_c::setShieldOnOff(bool onOff) {
}
void dLytCommonIconItemPart2_c::setItem(u8 item) {
if (item == LYT_CMN_32) {
if (item == LYT_CMN_Pouch32) {
return;
}
u8 mappedItem = item;
realizeUnk();
if (item == LYT_CMN_PotionHealthPlusPlusFull) {
if (item == LYT_CMN_PouchPotionHealthPlusPlusFull) {
if (mNumber == 1) {
mappedItem = LYT_CMN_PotionHealthPlusPlusHalf;
mappedItem = LYT_CMN_PouchPotionHealthPlusPlusHalf;
} else if (mNumber == 2) {
mappedItem = LYT_CMN_PotionHealthPlusPlusFull;
mappedItem = LYT_CMN_PouchPotionHealthPlusPlusFull;
}
mHasNumber = false;
realizeNumberV();
} else if (item == LYT_CMN_PotionRepairPlusPlusFull) {
} else if (item == LYT_CMN_PouchPotionRepairPlusPlusFull) {
if (mNumber == 1) {
mappedItem = LYT_CMN_PotionRepairPlusPlusHalf;
mappedItem = LYT_CMN_PouchPotionRepairPlusPlusHalf;
} else if (mNumber == 2) {
mappedItem = LYT_CMN_PotionRepairPlusPlusFull;
mappedItem = LYT_CMN_PouchPotionRepairPlusPlusFull;
}
mHasNumber = false;
realizeNumberV();
@@ -477,22 +477,22 @@ void dLytCommonIconItemPart2_c::realizeShieldOnOff(bool onOff) {
u8 dLytCommonIconItemPart2_c::getShieldType() const {
switch (mItem) {
case LYT_CMN_ShieldWoodA:
case LYT_CMN_ShieldWoodB:
case LYT_CMN_ShieldWoodC: {
case LYT_CMN_PouchShieldWoodA:
case LYT_CMN_PouchShieldWoodB:
case LYT_CMN_PouchShieldWoodC: {
return 0;
}
case LYT_CMN_ShieldIronA:
case LYT_CMN_ShieldIronB:
case LYT_CMN_ShieldIronC: {
case LYT_CMN_PouchShieldIronA:
case LYT_CMN_PouchShieldIronB:
case LYT_CMN_PouchShieldIronC: {
return 1;
}
case LYT_CMN_ShieldHolyA:
case LYT_CMN_ShieldHolyB:
case LYT_CMN_ShieldHolyC: {
case LYT_CMN_PouchShieldHolyA:
case LYT_CMN_PouchShieldHolyB:
case LYT_CMN_PouchShieldHolyC: {
return 2;
}
case LYT_CMN_ShieldHylian: {
case LYT_CMN_PouchShieldHylian: {
return 3;
}
default: {