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

cleanup

Browse Source
This commit is contained in:
engineer124
2022-04-19 20:22:39 +10:00
parent 5162cd235f
commit 6ab2f2992b
7 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -1
View File
@@ -1915,7 +1915,7 @@ void Interface_LoadItemIconImpl(GlobalContext* globalCtx, u8 arg1);
// void func_80112C0C(void);
u8 Item_Give(GlobalContext* globalCtx, u8 item);
u8 Item_CheckObtainability(u8 item);
void Inventory_DeleteItem(s16 item, s16 invSlot);
void Inventory_DeleteItem(s16 item, s16 slot);
void Inventory_UnequipItem(s16 item);
s32 Inventory_ReplaceItem(GlobalContext* globalCtx, u8 oldItem, u8 newItem);
void Inventory_UpdateDeitySwordEquip(GlobalContext* globalCtx) ;
src/code/z_kaleido_setup.c
+4 -4
View File
@@ -124,10 +124,10 @@ void KaleidoSetup_Init(GlobalContext* globalCtx) {
pauseCtx->unk_258 = 11;
pauseCtx->unk_25A = 0;
pauseCtx->unk_25E[PAUSE_0] = 999;
pauseCtx->unk_25E[PAUSE_1] = XREG(94) + 3;
pauseCtx->unk_25E[PAUSE_2] = 999;
pauseCtx->unk_25E[PAUSE_3] = 999;
pauseCtx->cursorItem[PAUSE_0] = 999;
pauseCtx->cursorItem[PAUSE_1] = XREG(94) + 3;
pauseCtx->cursorItem[PAUSE_2] = 999;
pauseCtx->cursorItem[PAUSE_3] = 999;
pauseCtx->unk_268[PAUSE_0] = 0;
pauseCtx->unk_268[PAUSE_1] = XREG(94) + 3;
src/code/z_parameter.c
+2 -2
View File
@@ -920,10 +920,10 @@ u8 Item_CheckObtainability(u8 item) {
return Item_CheckObtainabilityImpl(item);
}
void Inventory_DeleteItem(s16 item, s16 invSlot) {
void Inventory_DeleteItem(s16 item, s16 slot) {
s16 btn;
gSaveContext.save.inventory.items[invSlot] = ITEM_NONE;
gSaveContext.save.inventory.items[slot] = ITEM_NONE;
for (btn = 1; btn < 4; btn++) {
if (GET_CUR_FORM_BTN_ITEM(btn) == item) {
src/code/z_sram_NES.c
-1
View File
@@ -407,7 +407,6 @@ void Sram_SaveEndOfCycle(GlobalContext* globalCtx) {
SET_STOLEN_ITEM_1(STOLEN_ITEM_NONE);
SET_STOLEN_ITEM_2(STOLEN_ITEM_NONE);
// ??
Inventory_DeleteItem(ITEM_OCARINA_FAIRY, SLOT_TRADE_DEED);
Inventory_DeleteItem(ITEM_SLINGSHOT, SLOT_TRADE_KEY_MAMA);
Inventory_DeleteItem(ITEM_LONGSHOT, SLOT_TRADE_COUPLE);
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 (INV_CONTENT(ITEM_BEAN) != 10U) {
if ((u32)INV_CONTENT(ITEM_BEAN) != 10) {
return 0;
}
src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
+1 -1
View File
@@ -357,7 +357,7 @@ void EnGinkoMan_WaitForDialogueInput(EnGinkoMan* this, GlobalContext* globalCtx)
this->isNewAccount = true;
}
Rupees_ChangeBy((s16)-globalCtx->msgCtx.bankRupeesSelected);
Rupees_ChangeBy(-globalCtx->msgCtx.bankRupeesSelected);
this->previousBankValue = gSaveContext.save.bankRupees & 0xFFFF;
gSaveContext.save.bankRupees =
((gSaveContext.save.bankRupees & 0xFFFF) + globalCtx->msgCtx.bankRupeesSelected) |
src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c
+2 -2
View File
@@ -331,7 +331,7 @@ void func_80BCB6D0(EnScopenuts* this, GlobalContext* globalCtx) {
}
}
} else if (temp_v0 == 4) {
if (Message_ShouldAdvance(globalCtx) != 0) {
if (Message_ShouldAdvance(globalCtx)) {
switch (globalCtx->msgCtx.choiceIndex) {
case 0:
if (gSaveContext.save.playerData.rupees < this->unk_358) {
@@ -343,7 +343,7 @@ void func_80BCB6D0(EnScopenuts* this, GlobalContext* globalCtx) {
func_8019F208();
globalCtx->msgCtx.msgMode = 0x43;
globalCtx->msgCtx.unk12023 = 4;
Rupees_ChangeBy(this->unk_358 * -1);
Rupees_ChangeBy(-this->unk_358);
this->actionFunc = func_80BCB90C;
}
break;