izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

More enums missed

Browse Source
This commit is contained in:
engineer124
2022-04-21 15:45:45 +10:00
parent 47ee89ee35
commit cdf61ca57a
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_parameter.c
+1 -1
View File
@@ -567,7 +567,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
return ITEM_BOW;
} else if (item == ITEM_OCARINA) {
INV_CONTENT(ITEM_OCARINA) = 0;
INV_CONTENT(ITEM_OCARINA) = ITEM_OCARINA;
return ITEM_NONE;
} else if (item == ITEM_MAGIC_BEANS) {
src/code/z_sram_NES.c
+18 -18
View File
@@ -230,8 +230,8 @@ void Sram_SaveEndOfCycle(GlobalContext* globalCtx) {
s16 sceneNum;
s32 j;
s32 i;
u8 temp;
u8 temp2;
u8 slot;
u8 item;
gSaveContext.save.daySpeed = 0;
gSaveContext.save.daysElapsed = 0;
@@ -306,26 +306,26 @@ void Sram_SaveEndOfCycle(GlobalContext* globalCtx) {
}
if (INV_CONTENT(ITEM_BOMB) == ITEM_BOMB) {
temp2 = INV_CONTENT(ITEM_BOMB);
if (AMMO(temp2) != 0) {
item = INV_CONTENT(ITEM_BOMB);
if (AMMO(item) != 0) {
gSaveContext.eventInf[7] |= 2;
}
}
if (INV_CONTENT(ITEM_NUT) == ITEM_NUT) {
temp2 = INV_CONTENT(ITEM_NUT);
if (AMMO(temp2) != 0) {
item = INV_CONTENT(ITEM_NUT);
if (AMMO(item) != 0) {
gSaveContext.eventInf[7] |= 4;
}
}
if (INV_CONTENT(ITEM_STICK) == ITEM_STICK) {
temp2 = INV_CONTENT(ITEM_STICK);
if (AMMO(temp2) != 0) {
item = INV_CONTENT(ITEM_STICK);
if (AMMO(item) != 0) {
gSaveContext.eventInf[7] |= 8;
}
}
if (INV_CONTENT(ITEM_BOW) == ITEM_BOW) {
temp2 = INV_CONTENT(ITEM_BOW);
if (AMMO(temp2) != 0) {
item = INV_CONTENT(ITEM_BOW);
if (AMMO(item) != 0) {
gSaveContext.eventInf[7] |= 0x10;
}
}
@@ -333,8 +333,8 @@ void Sram_SaveEndOfCycle(GlobalContext* globalCtx) {
for (i = 0; i < ARRAY_COUNT(D_801C67B0); i++) {
if (D_801C67B0[i] != ITEM_NONE) {
if ((gSaveContext.save.inventory.items[i] != ITEM_NONE) && (i != SLOT_PICTO_BOX)) {
temp2 = gSaveContext.save.inventory.items[i];
AMMO(temp2) = 0;
item = gSaveContext.save.inventory.items[i];
AMMO(item) = 0;
}
}
}
@@ -385,20 +385,20 @@ void Sram_SaveEndOfCycle(GlobalContext* globalCtx) {
}
if (STOLEN_ITEM_1 == ITEM_BOTTLE) {
temp = SLOT(ITEM_BOTTLE);
slot = SLOT(ITEM_BOTTLE);
for (i = 0; i < 6; i++) {
if (gSaveContext.save.inventory.items[temp + i] == ITEM_NONE) {
gSaveContext.save.inventory.items[temp + i] = ITEM_BOTTLE;
if (gSaveContext.save.inventory.items[slot + i] == ITEM_NONE) {
gSaveContext.save.inventory.items[slot + i] = ITEM_BOTTLE;
break;
}
}
}
if (STOLEN_ITEM_2 == ITEM_BOTTLE) {
temp = SLOT(ITEM_BOTTLE);
slot = SLOT(ITEM_BOTTLE);
for (i = 0; i < 6; i++) {
if (gSaveContext.save.inventory.items[temp + i] == ITEM_NONE) {
gSaveContext.save.inventory.items[temp + i] = ITEM_BOTTLE;
if (gSaveContext.save.inventory.items[slot + i] == ITEM_NONE) {
gSaveContext.save.inventory.items[slot + i] = ITEM_BOTTLE;
break;
}
}
src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c
+1 -1
View File
@@ -296,7 +296,7 @@ s32 func_80BED140(GlobalContext* globalCtx) {
}
s32 func_80BED208(EnAkindonuts* this) {
if ((u32)INV_CONTENT(ITEM_MAGIC_BEANS) != 10) {
if ((u32)INV_CONTENT(ITEM_MAGIC_BEANS) != ITEM_MAGIC_BEANS) {
return 0;
}