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

Match Interface_LoadItemIcon

Browse Source
This commit is contained in:
engineer124
2021-12-29 01:54:42 +11:00
parent a95ad585bf
commit 7a9aa3c157
5 changed files with 24 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+3 -3
View File
@@ -2053,8 +2053,8 @@ void Interface_ChangeAlpha(u16 param_1);
// void func_80111CB4(void);
// void Interface_SetSceneRestrictions(void);
void Interface_InitMinigame(GlobalContext* globalCtx);
void Interface_LoadItemIcon(GlobalContext* globalCtx, u8 arg1);
// void func_80112BE4(void);
void Interface_LoadItemIconImpl(GlobalContext* globalCtx, u8 arg1);
// void Interface_LoadItemIcon(void);
// void func_80112C0C(void);
u8 Item_Give(GlobalContext* globalCtx, u8 param_2);
// void Item_CheckObtainabilityImpl(void);
@@ -3197,7 +3197,7 @@ s32 func_80178A94(s32 param_1, s32 param_2);
// void func_80178C80(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
// void func_80178D7C(void);
// void func_80178DAC(void);
// void func_80178E3C(void);
void func_80178E3C(u32 romSegment, u32 arg1, void* dst, u32 size);
// void func_80178E7C(void);
// void Check_WriteRGBA16Pixel(u16* buffer, u32 x, u32 y, u32 value);
// void Check_WriteI4Pixel(u16* buffer, u32 x, u32 y, u32 value);
src/code/z_parameter.c
+16 -31
View File
@@ -1402,9 +1402,6 @@ void Interface_SetSceneRestrictions(GlobalContext* globalCtx) {
void func_80112AF4(void) {
}
/**
* Initializes Romani's balloon horseback archery minigame
*/
void Interface_InitMinigame(GlobalContext* globalCtx) {
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
@@ -1418,28 +1415,16 @@ void Interface_InitMinigame(GlobalContext* globalCtx) {
interfaceCtx->hbaAmmo = 20;
}
void func_80178E3C(u32 romSegment, u32 arg1, void* dst, u32 size);
#ifdef NON_EQUIVALENT
void Interface_LoadItemIcon(GlobalContext* globalCtx, u8 arg1) {
void Interface_LoadItemIconImpl(GlobalContext* globalCtx, u8 arg1) {
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
u8 phi_v0;
u32 new_var = arg1;
if (arg1 == 0) {
phi_v0 = gSaveContext.save.equips.buttonItems[CUR_FORM][arg1];
} else {
phi_v0 = gSaveContext.save.equips.buttonItems[0][arg1];
}
func_80178E3C((u32)_icon_item_static_testSegmentRomStart, phi_v0 & 0xFF,
(u32)interfaceCtx->iconItemSegment + (arg1 * 0x1000), 0x1000);
func_80178E3C(_icon_item_static_testSegmentRomStart, CUR_FORM_BTN_ITEM(new_var),
&interfaceCtx->iconItemSegment[new_var * 0x1000], 0x1000);
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_LoadItemIcon.s")
#endif
void func_80112BE4(GlobalContext* globalCtx, u8 arg1) {
Interface_LoadItemIcon(globalCtx, arg1);
void Interface_LoadItemIcon(GlobalContext* globalCtx, u8 arg1) {
Interface_LoadItemIconImpl(globalCtx, arg1);
}
void func_80112C0C(GlobalContext* globalCtx, u16 flag) {
@@ -1454,12 +1439,12 @@ void func_80112C0C(GlobalContext* globalCtx, u16 flag) {
(gSaveContext.save.equips.buttonItems[CUR_FORM][0] == ITEM_BOMBCHU) ||
(gSaveContext.save.equips.buttonItems[CUR_FORM][0] == ITEM_FISHING_POLE)) {
gSaveContext.save.equips.buttonItems[CUR_FORM][0] = gSaveContext.buttonStatus[0];
Interface_LoadItemIcon(globalCtx, 0);
Interface_LoadItemIconImpl(globalCtx, 0);
}
} else if (gSaveContext.save.equips.buttonItems[CUR_FORM][0] == ITEM_NONE) {
if (gSaveContext.save.equips.buttonItems[CUR_FORM][0] != ITEM_NONE) {
gSaveContext.save.equips.buttonItems[CUR_FORM][0] = gSaveContext.buttonStatus[0];
Interface_LoadItemIcon(globalCtx, 0);
Interface_LoadItemIconImpl(globalCtx, 0);
}
}
@@ -1523,7 +1508,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
value = item - ITEM_SWORD_KOKIRI - 1;
SET_EQUIP_VALUE(EQUIP_SWORD, value);
gSaveContext.save.equips.buttonItems[CUR_FORM][0] = item;
Interface_LoadItemIcon(globalCtx, 0);
Interface_LoadItemIconImpl(globalCtx, 0);
if (item == ITEM_SWORD_RAZOR) {
gSaveContext.save.playerData.swordHealth = 100;
}
@@ -1866,15 +1851,15 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
if ((slot + i) == gSaveContext.save.equips.cButtonSlots[0][1]) {
gSaveContext.save.equips.buttonItems[0][1] = item;
Interface_LoadItemIcon(globalCtx, 1);
Interface_LoadItemIconImpl(globalCtx, 1);
gSaveContext.buttonStatus[1] = 0;
} else if ((slot + i) == gSaveContext.save.equips.cButtonSlots[0][2]) {
gSaveContext.save.equips.buttonItems[0][2] = item;
Interface_LoadItemIcon(globalCtx, 2);
Interface_LoadItemIconImpl(globalCtx, 2);
gSaveContext.buttonStatus[2] = 0;
} else if ((slot + i) == gSaveContext.save.equips.cButtonSlots[0][3]) {
gSaveContext.save.equips.buttonItems[0][3] = item;
Interface_LoadItemIcon(globalCtx, 3);
Interface_LoadItemIconImpl(globalCtx, 3);
gSaveContext.buttonStatus[3] = 0;
}
@@ -1908,7 +1893,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
} else {
gSaveContext.save.equips.buttonItems[0][i] = item;
}
Interface_LoadItemIcon(globalCtx, i);
Interface_LoadItemIconImpl(globalCtx, i);
return ITEM_NONE;
}
}
@@ -1988,7 +1973,7 @@ s32 Inventory_ReplaceItem(GlobalContext* globalCtx, u8 oldItem, u8 newItem) {
gSaveContext.save.equips.buttonItems[0][i] = newItem;
}
Interface_LoadItemIcon(globalCtx, i);
Interface_LoadItemIconImpl(globalCtx, i);
break;
}
}
@@ -2029,7 +2014,7 @@ void func_80114FD0(GlobalContext* globalCtx, u8 item, u8 arg2) {
} else {
gSaveContext.save.equips.buttonItems[0][arg2] = item;
}
Interface_LoadItemIcon(globalCtx, arg2);
Interface_LoadItemIconImpl(globalCtx, arg2);
globalCtx->pauseCtx.unk_25E[0] = item;
gSaveContext.buttonStatus[arg2] = 0;
if (item == ITEM_HOT_SPRING_WATER) {
@@ -2050,7 +2035,7 @@ void func_801152B8(GlobalContext* globalCtx, s16 slot, s16 item) {
} else {
gSaveContext.save.equips.buttonItems[0][i] = item;
}
Interface_LoadItemIcon(globalCtx, i);
Interface_LoadItemIconImpl(globalCtx, i);
}
}
}
src/overlays/actors/ovl_En_Kgy/z_en_kgy.c
+1 -1
View File
@@ -732,7 +732,7 @@ void func_80B41E18(EnKgy* this, GlobalContext* globalCtx) {
this->actor.textId = 0xC43;
CUR_FORM_EQUIP(EQUIP_SLOT_B) = ITEM_NONE;
TAKE_EQUIPPED_ITEM(EQUIP_SWORD);
Interface_LoadItemIcon(globalCtx, 0);
Interface_LoadItemIconImpl(globalCtx, 0);
func_80B40C74(globalCtx);
break;
tools/disasm/functions.txt
+2 -2
View File
@@ -2109,8 +2109,8 @@
0x801129E4:("Interface_SetSceneRestrictions",),
0x80112AF4:("func_80112AF4",),
0x80112AFC:("Interface_InitMinigame",),
0x80112B40:("Interface_LoadItemIcon",),
0x80112BE4:("func_80112BE4",),
0x80112B40:("Interface_LoadItemIconImpl",),
0x80112BE4:("Interface_LoadItemIcon",),
0x80112C0C:("func_80112C0C",),
0x80112E80:("Item_Give",),
0x801143CC:("Item_CheckObtainabilityImpl",),
tools/sizes/code_functions.csv
+2 -2
View File
@@ -1623,8 +1623,8 @@ asm/non_matchings/code/z_parameter/func_80111CB4.s,func_80111CB4,0x80111CB4,0x34
asm/non_matchings/code/z_parameter/Interface_SetSceneRestrictions.s,Interface_SetSceneRestrictions,0x801129E4,0x44
asm/non_matchings/code/z_parameter/func_80112AF4.s,func_80112AF4,0x80112AF4,0x2
asm/non_matchings/code/z_parameter/Interface_InitMinigame.s,Interface_InitMinigame,0x80112AFC,0x11
asm/non_matchings/code/z_parameter/Interface_LoadItemIcon.s,Interface_LoadItemIcon,0x80112B40,0x29
asm/non_matchings/code/z_parameter/func_80112BE4.s,func_80112BE4,0x80112BE4,0xA
asm/non_matchings/code/z_parameter/Interface_LoadItemIconImpl.s,Interface_LoadItemIconImpl,0x80112B40,0x29
asm/non_matchings/code/z_parameter/Interface_LoadItemIcon.s,Interface_LoadItemIcon,0x80112BE4,0xA
asm/non_matchings/code/z_parameter/func_80112C0C.s,func_80112C0C,0x80112C0C,0x9D
asm/non_matchings/code/z_parameter/Item_Give.s,Item_Give,0x80112E80,0x553
asm/non_matchings/code/z_parameter/Item_CheckObtainabilityImpl.s,Item_CheckObtainabilityImpl,0x801143CC,0x16B
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
1623 asm/non_matchings/code/z_parameter/Interface_SetSceneRestrictions.s Interface_SetSceneRestrictions 0x801129E4 0x44
1624 asm/non_matchings/code/z_parameter/func_80112AF4.s func_80112AF4 0x80112AF4 0x2
1625 asm/non_matchings/code/z_parameter/Interface_InitMinigame.s Interface_InitMinigame 0x80112AFC 0x11
1626 asm/non_matchings/code/z_parameter/Interface_LoadItemIcon.s asm/non_matchings/code/z_parameter/Interface_LoadItemIconImpl.s Interface_LoadItemIcon Interface_LoadItemIconImpl 0x80112B40 0x29
1627 asm/non_matchings/code/z_parameter/func_80112BE4.s asm/non_matchings/code/z_parameter/Interface_LoadItemIcon.s func_80112BE4 Interface_LoadItemIcon 0x80112BE4 0xA
1628 asm/non_matchings/code/z_parameter/func_80112C0C.s func_80112C0C 0x80112C0C 0x9D
1629 asm/non_matchings/code/z_parameter/Item_Give.s Item_Give 0x80112E80 0x553
1630 asm/non_matchings/code/z_parameter/Item_CheckObtainabilityImpl.s Item_CheckObtainabilityImpl 0x801143CC 0x16B