Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-10-02 06:20:38 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename external functions in item.h

Browse Source
This commit is contained in:
lhearachel
2023-08-31 21:22:58 -07:00
parent 3d77876464
commit 6d8902003b
41 changed files with 291 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
include/item.h
View File

@@ -75,27 +75,27 @@ typedef struct ItemData {
u8 padding[2];
} ItemData;
void sub_0207CDEC(void * param0, u16 param1, u16 param2);
u16 sub_0207CE78(u16 param0, u16 param1);
u16 sub_0207CF10(u16 param0);
u16 Item_GetIndexOfIconNCER(void);
u16 Item_GetIndexOfIconNANR(void);
void * Item_LoadDataOrGFX(u16 param0, u16 param1, u32 param2);
void Item_GetNameIntoString(Strbuf *dst, u16 param1, u32 param2);
void Item_GetDescriptionIntoString(Strbuf *dst, u16 param1, u16 param2);
s32 Item_GetAttribute(u16 param0, u16 param1, u32 param2);
s32 Item_GetAttributeFromStruct(ItemData * param0, u16 param1);
const u16 GetMoveFromTMOrHMItemID(u16 param0);
u8 Item_IsMoveHM(u16 param0);
u8 Item_GetTMOrHMNumberFromID(u16 param0);
u8 Item_IsMail(u16 param0);
u8 sub_0207D2F0(u16 param0);
u16 sub_0207D310(u8 param0);
u8 Item_IsBerry(u16 param0);
u8 sub_0207D344(u16 param0);
u16 sub_0207D354(u8 param0);
u8 Item_IsHerbalMedicine(u16 param0);
void * sub_0207D388(int param0);
ItemData * sub_0207D3B0(ItemData * param0, u16 param1);
void Item_MoveInPocket(void *pocket, u16 srcSlot, u16 dstSlot);
u16 Item_ID(u16 item, u16 type);
u16 Item_FromGBAID(u16 param0);
u16 Item_IconNCERFile(void);
u16 Item_IconNANRFile(void);
void* Item_Load(u16 item, u16 type, u32 heapID);
void Item_LoadName(Strbuf *dst, u16 item, u32 heapID);
void Item_LoadDescription(Strbuf *dst, u16 item, u16 heapID);
s32 Item_LoadParam(u16 item, u16 param, u32 heapID);
s32 Item_Get(ItemData *itemData, u16 param);
const u16 Item_MoveForTMHM(u16 item);
u8 Item_IsHMMove(u16 move);
u8 Item_TMHMNumber(u16 item);
u8 Item_IsMail(u16 item);
u8 Item_MailNumber(u16 item);
u16 Item_ForMailNumber(u8 mail);
u8 Item_IsBerry(u16 item);
u8 Item_BerryNumber(u16 item);
u16 Item_ForBerryNumber(u8 item);
u8 Item_IsHerbalMedicine(u16 item);
void* ItemTable_Load(int heapID);
ItemData* ItemTable_Index(ItemData *itemTable, u16 index);
#endif // POKEPLATINUM_ITEM_DATA_H
#endif // POKEPLATINUM_ITEM_DATA_H

44
src/item.c
View File

@@ -679,7 +679,7 @@ const u16 sBerryItemIDs[] = {
ITEM_ROWAP_BERRY
};
void sub_0207CDEC (void * param0, u16 param1, u16 param2)
void Item_MoveInPocket (void * param0, u16 param1, u16 param2)
{
BagItem * v0;
BagItem v1;
@@ -707,7 +707,7 @@ void sub_0207CDEC (void * param0, u16 param1, u16 param2)
v0[param2] = v1;
}
u16 sub_0207CE78 (u16 param0, u16 param1)
u16 Item_ID (u16 param0, u16 param1)
{
switch (param1) {
case 0:
@@ -747,7 +747,7 @@ u16 sub_0207CE78 (u16 param0, u16 param1)
return 0;
}
u16 sub_0207CF10 (u16 param0)
u16 Item_FromGBAID (u16 param0)
{
u16 v0;
@@ -760,17 +760,17 @@ u16 sub_0207CF10 (u16 param0)
return 0;
}
u16 Item_GetIndexOfIconNCER (void)
u16 Item_IconNCERFile (void)
{
return 1;
}
u16 Item_GetIndexOfIconNANR (void)
u16 Item_IconNANRFile (void)
{
return 0;
}
void * Item_LoadDataOrGFX (u16 itemID, u16 attributeID, u32 heapID)
void * Item_Load (u16 itemID, u16 attributeID, u32 heapID)
{
if (itemID > 467) {
itemID = 0;
@@ -788,7 +788,7 @@ void * Item_LoadDataOrGFX (u16 itemID, u16 attributeID, u32 heapID)
return NULL;
}
void Item_GetNameIntoString (Strbuf* dest, u16 itemID, u32 heapID)
void Item_LoadName (Strbuf* dest, u16 itemID, u32 heapID)
{
UnkStruct_0200B144 * msgData = sub_0200B144(1, 26, 392, heapID);
@@ -796,7 +796,7 @@ void Item_GetNameIntoString (Strbuf* dest, u16 itemID, u32 heapID)
sub_0200B190(msgData);
}
void Item_GetDescriptionIntoString (Strbuf* dest, u16 itemID, u16 heapID)
void Item_LoadDescription (Strbuf* dest, u16 itemID, u16 heapID)
{
UnkStruct_0200B144 * msgData = sub_0200B144(1, 26, 391, heapID);
@@ -804,19 +804,19 @@ void Item_GetDescriptionIntoString (Strbuf* dest, u16 itemID, u16 heapID)
sub_0200B190(msgData);
}
s32 Item_GetAttribute (u16 itemID, u16 attributeID, u32 heapID)
s32 Item_LoadParam (u16 itemID, u16 attributeID, u32 heapID)
{
ItemData * v0;
s32 v1;
v0 = (ItemData *)Item_LoadDataOrGFX(itemID, 0, heapID);
v1 = Item_GetAttributeFromStruct(v0, attributeID);
v0 = (ItemData *)Item_Load(itemID, 0, heapID);
v1 = Item_Get(v0, attributeID);
Heap_FreeToHeapExplicit(heapID, v0);
return v1;
}
s32 Item_GetAttributeFromStruct (ItemData * itemData, u16 attributeID)
s32 Item_Get (ItemData * itemData, u16 attributeID)
{
switch (attributeID) {
case 0:
@@ -957,7 +957,7 @@ static s32 GetPartyAttribute (ItemPartyParam * partyParam, u16 attributeID)
return 0;
}
const u16 GetMoveFromTMOrHMItemID (u16 itemID)
const u16 Item_MoveForTMHM (u16 itemID)
{
if ((itemID < 328) || (itemID > 427)) {
return 0;
@@ -967,7 +967,7 @@ const u16 GetMoveFromTMOrHMItemID (u16 itemID)
return sMovesTMHM[itemID];
}
u8 Item_IsMoveHM (u16 moveID)
u8 Item_IsHMMove (u16 moveID)
{
u8 v0;
@@ -980,7 +980,7 @@ u8 Item_IsMoveHM (u16 moveID)
return FALSE;
}
u8 Item_GetTMOrHMNumberFromID (u16 itemID)
u8 Item_TMHMNumber (u16 itemID)
{
if ((itemID < 328) || (itemID > 427)) {
return 0;
@@ -1002,7 +1002,7 @@ u8 Item_IsMail (u16 itemID)
return FALSE;
}
u8 sub_0207D2F0 (u16 param0)
u8 Item_MailNumber (u16 param0)
{
u32 i;
@@ -1015,7 +1015,7 @@ u8 sub_0207D2F0 (u16 param0)
return 0;
}
u16 sub_0207D310 (u8 param0)
u16 Item_ForMailNumber (u8 param0)
{
if (param0 >= 12) {
return 0;
@@ -1037,7 +1037,7 @@ u8 Item_IsBerry (u16 itemID)
return FALSE;
}
u8 sub_0207D344 (u16 param0)
u8 Item_BerryNumber (u16 param0)
{
if (param0 < 149) {
return 0xff;
@@ -1046,7 +1046,7 @@ u8 sub_0207D344 (u16 param0)
return param0 - 149;
}
u16 sub_0207D354 (u8 param0)
u16 Item_ForBerryNumber (u8 param0)
{
if (param0 >= 64) {
return 0xffff;
@@ -1064,13 +1064,13 @@ u8 Item_IsHerbalMedicine (u16 itemID)
return FALSE;
}
void * sub_0207D388 (int param0)
void * ItemTable_Load (int param0)
{
int v0 = sub_0207CE78(467, 0);
int v0 = Item_ID(467, 0);
return NARC_AllocAndReadFromMemberByIndexPair(NARC_INDEX_ITEMTOOL__ITEMDATA__PL_ITEM_DATA, 0, param0, 0, 36 * v0);
}
ItemData * sub_0207D3B0 (ItemData * param0, u16 param1)
ItemData * ItemTable_Index (ItemData * param0, u16 param1)
{
u8 * v0;

2
src/overlay005/ov5_021E622C.c
View File

@@ -2441,7 +2441,7 @@ static void ov5_021E6948 (Pokemon * param0, BoxPokemon * param1, BoxPokemon * pa
for (v0 = 0; v0 < 4; v0++) {
if (v7->unk_00[v0] != 0) {
for (v1 = 0; v1 < 100; v1++) {
if (v7->unk_00[v0] == GetMoveFromTMOrHMItemID(328 + v1)) {
if (v7->unk_00[v0] == Item_MoveForTMHM(328 + v1)) {
if (sub_02077FE4(v3, v6, v1)) {
if (sub_020770C4(param0, v7->unk_00[v0]) == 0xffff) {
sub_02077134(param0, v7->unk_00[v0]);

18
src/overlay007/ov7_0224CD28.c
View File

@@ -617,7 +617,7 @@ static void ov7_0224D6BC (UnkStruct_ov7_0224D008 * param0)
v4 = ov7_0224D698(param0, param0->unk_290[v3]);
if ((v4 <= 420) && (v4 >= 328)) {
v1 = sub_0200B1EC(v5, GetMoveFromTMOrHMItemID(v4));
v1 = sub_0200B1EC(v5, Item_MoveForTMHM(v4));
sub_02013A6C(param0->unk_7C, v1, param0->unk_290[v3]);
Strbuf_Free(v1);
@@ -672,10 +672,10 @@ static void ov7_0224D85C (UnkStruct_0200112C * param0, u32 param1, u8 param2)
if (v0->unk_2A9 == 0) {
v1 = Strbuf_Init(130, 11);
Item_GetDescriptionIntoString(v1, (u16)param1, 11);
Item_LoadDescription(v1, (u16)param1, 11);
} else if (v0->unk_2A9 == 3) {
v1 = Strbuf_Init(130, 11);
Item_GetDescriptionIntoString(v1, (u16)param1, 11);
Item_LoadDescription(v1, (u16)param1, 11);
} else if (v0->unk_2A9 == 1) {
UnkStruct_0200B144 * v2;
@@ -1050,7 +1050,7 @@ static u8 ov7_0224E098 (UnkStruct_ov7_0224D008 * param0)
sub_0200B60C(param0->unk_8C, 2, param0->unk_2B0 * param0->unk_2AC, 6, 0, 1);
if ((param0->unk_2AA <= 420) && (param0->unk_2AA >= 328)) {
u16 v2 = GetMoveFromTMOrHMItemID(param0->unk_2AA);
u16 v2 = Item_MoveForTMHM(param0->unk_2AA);
sub_0200B630(param0->unk_8C, 3, v2);
@@ -1137,7 +1137,7 @@ static u8 ov7_0224E3D8 (UnkStruct_ov7_0224D008 * param0)
sub_0200B77C(param0->unk_8C, 0, param0->unk_2AA);
}
sub_0200B7B4(param0->unk_8C, 1, Item_GetAttribute(param0->unk_2AA, 5, 11));
sub_0200B7B4(param0->unk_8C, 1, Item_LoadParam(param0->unk_2AA, 5, 11));
} else if (param0->unk_2A9 == 3) {
if (param0->unk_2AC == 1) {
sub_0200B70C(param0->unk_8C, 0, param0->unk_2AA);
@@ -1146,7 +1146,7 @@ static u8 ov7_0224E3D8 (UnkStruct_ov7_0224D008 * param0)
}
v0 = sub_0200B1EC(param0->unk_88, 6);
sub_0200B7B4(param0->unk_8C, 1, Item_GetAttribute(param0->unk_2AA, 5, 11));
sub_0200B7B4(param0->unk_8C, 1, Item_LoadParam(param0->unk_2AA, 5, 11));
} else {
if (param0->unk_2A9 == 1) {
ov7_0224E834(param0, param0->unk_2AA, 0);
@@ -1299,7 +1299,7 @@ static void ov7_0224E834 (UnkStruct_ov7_0224D008 * param0, u16 param1, u16 param
static u32 ov7_0224E890 (UnkStruct_ov7_0224D008 * param0, u16 param1)
{
if (param0->unk_2A9 == 0) {
return Item_GetAttribute(param1, 0, 11);
return Item_LoadParam(param1, 0, 11);
} else if (param0->unk_2A9 == 3) {
return ov7_0224E8CC(param0, param1);
} else if (param0->unk_2A9 == 1) {
@@ -1513,12 +1513,12 @@ static void ov7_0224EB7C (UnkStruct_ov7_0224D008 * param0, u16 param1)
v0 = sub_02009DC8(param0->unk_94.unk_194[0], 2);
sub_02009968(param0->unk_94.unk_194[0], v0, 16, sub_0207CE78(param1, 1), 0, 11);
sub_02009968(param0->unk_94.unk_194[0], v0, 16, Item_ID(param1, 1), 0, 11);
sub_0200A4C0(v0);
v0 = sub_02009DC8(param0->unk_94.unk_194[1], 1);
sub_020099D4(param0->unk_94.unk_194[1], v0, 16, sub_0207CE78(param1, 2), 0, 11);
sub_020099D4(param0->unk_94.unk_194[1], v0, 16, Item_ID(param1, 2), 0, 11);
sub_0200A6B8(v0);
}

10
src/overlay013/ov13_0221FC20.c
View File

@@ -383,16 +383,16 @@ static u8 ov13_0221FFDC (UnkStruct_ov13_022213F0 * param0)
return 17;
}
if ((Item_GetAttribute(v0->unk_22, 36, v0->unk_0C) != 0) && (Item_GetAttribute(v0->unk_22, 37, v0->unk_0C) == 0) && (param0->unk_04[v0->unk_11].unk_17_7 == 0)) {
if ((Item_LoadParam(v0->unk_22, 36, v0->unk_0C) != 0) && (Item_LoadParam(v0->unk_22, 37, v0->unk_0C) == 0) && (param0->unk_04[v0->unk_11].unk_17_7 == 0)) {
param0->unk_2075 = 13;
return 22;
}
if (ov16_0223E30C(v0->unk_08, v0->unk_28, v0->unk_2C[v0->unk_11], 0, v0->unk_22) == 1) {
if (Item_GetAttribute(v0->unk_22, 37, v0->unk_0C) != 0) {
if (Item_LoadParam(v0->unk_22, 37, v0->unk_0C) != 0) {
param0->unk_2075 = 13;
} else {
if ((ov13_022213F0(param0, v0->unk_11) == 1) && (Item_GetAttribute(v0->unk_22, 23, v0->unk_0C) == 0)) {
if ((ov13_022213F0(param0, v0->unk_11) == 1) && (Item_LoadParam(v0->unk_22, 23, v0->unk_0C) == 0)) {
ov13_02221A54(v0->unk_08, v0->unk_22, v0->unk_33, v0->unk_0C);
param0->unk_04[v0->unk_11].unk_00 = ov16_0223DFAC(v0->unk_08, v0->unk_28, v0->unk_2C[v0->unk_11]);
v0->unk_20 = GetMonData(param0->unk_04[v0->unk_11].unk_00, MON_DATA_163, NULL);
@@ -817,7 +817,7 @@ static u8 ov13_022207B8 (UnkStruct_ov13_022213F0 * param0)
{
ov13_022216C0(param0, 5);
if (Item_GetAttribute(param0->unk_00->unk_22, 37, param0->unk_00->unk_0C) != 0) {
if (Item_LoadParam(param0->unk_00->unk_22, 37, param0->unk_00->unk_0C) != 0) {
return 24;
}
@@ -1721,7 +1721,7 @@ static u8 ov13_022219DC (UnkStruct_ov13_022213F0 * param0)
v0 = param0->unk_04[param0->unk_00->unk_11].unk_30[param0->unk_00->unk_34].unk_00;
}
return Item_IsMoveHM(v0);
return Item_IsHMMove(v0);
}
static void ov13_02221A04 (UnkStruct_ov13_022213F0 * param0)

20
src/overlay013/ov13_02221A88.c
View File

@@ -1481,7 +1481,7 @@ static void ov13_02223E68 (UnkStruct_ov13_022213F0 * param0)
ov13_0222317C(param0, v0, 1 + v1);
}
if (Item_GetAttribute(param0->unk_00->unk_22, 37, param0->unk_00->unk_0C) == 0) {
if (Item_LoadParam(param0->unk_00->unk_22, 37, param0->unk_00->unk_0C) == 0) {
ov13_022221C8(param0, 94);
}
@@ -1565,36 +1565,36 @@ void ov13_02224144 (UnkStruct_ov13_022213F0 * param0)
u8 v6;
v1 = param0->unk_00;
v2 = Item_LoadDataOrGFX(v1->unk_22, 0, v1->unk_0C);
v2 = Item_Load(v1->unk_22, 0, v1->unk_0C);
v0 = ov16_0223DFAC(v1->unk_08, v1->unk_28, v1->unk_2C[v1->unk_11]);
v4 = GetMonData(v0, MON_DATA_163, NULL);
v5 = 0;
if (Item_GetAttributeFromStruct(v2, 15) != 0) {
if (Item_Get(v2, 15) != 0) {
v5 |= 0x1;
}
if (Item_GetAttributeFromStruct(v2, 16) != 0) {
if (Item_Get(v2, 16) != 0) {
v5 |= 0x2;
}
if (Item_GetAttributeFromStruct(v2, 17) != 0) {
if (Item_Get(v2, 17) != 0) {
v5 |= 0x4;
}
if (Item_GetAttributeFromStruct(v2, 18) != 0) {
if (Item_Get(v2, 18) != 0) {
v5 |= 0x8;
}
if (Item_GetAttributeFromStruct(v2, 19) != 0) {
if (Item_Get(v2, 19) != 0) {
v5 |= 0x10;
}
if (Item_GetAttributeFromStruct(v2, 20) != 0) {
if (Item_Get(v2, 20) != 0) {
v5 |= 0x20;
}
if (Item_GetAttributeFromStruct(v2, 21) != 0) {
if (Item_Get(v2, 21) != 0) {
v5 |= 0x40;
}
@@ -1609,7 +1609,7 @@ void ov13_02224144 (UnkStruct_ov13_022213F0 * param0)
sub_0200B60C(param0->unk_1FA8, 1, v4 - param0->unk_04[v1->unk_11].unk_10, 3, 0, 1);
sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3);
Strbuf_Free(v3);
} else if ((Item_GetAttributeFromStruct(v2, 36) != 0) || (Item_GetAttributeFromStruct(v2, 37) != 0)) {
} else if ((Item_Get(v2, 36) != 0) || (Item_Get(v2, 37) != 0)) {
sub_0200B1B8(param0->unk_1FA4, 87, param0->unk_1FAC);
} else if (v5 == 0x1) {
v3 = sub_0200B1EC(param0->unk_1FA4, 92);

2
src/overlay013/ov13_022264F4.c
View File

@@ -406,7 +406,7 @@ static u8 ov13_02226A5C (UnkStruct_ov13_02227244 * param0)
if (param0->unk_114D == 3) {
int v1 = ov13_02227244(param0);
u32 v2 = Item_GetAttribute(v0->unk_1C, 7, v0->unk_0C);
u32 v2 = Item_LoadParam(v0->unk_1C, 7, v0->unk_0C);
if ((v0->unk_18 != 0) && (v0->unk_1C != 55) && (v2 != 3)) {
Pokemon * v3;

2
src/overlay013/ov13_02227288.c
View File

@@ -352,7 +352,7 @@ static void ov13_02227910 (UnkStruct_ov13_02227244 * param0, u32 param1)
v0 = &param0->unk_2C[2];
v1 = Strbuf_Init(130, param0->unk_00->unk_0C);
Item_GetDescriptionIntoString(v1, param0->unk_3C[param0->unk_114D][param1].item, param0->unk_00->unk_0C);
Item_LoadDescription(v1, param0->unk_3C[param0->unk_114D][param1].item, param0->unk_00->unk_0C);
sub_0201D78C(v0, 0, v1, 4, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
Strbuf_Free(v1);
sub_0201A9A4(v0);

2
src/overlay013/ov13_02227A4C.c
View File

@@ -61,7 +61,7 @@ void ov13_02227AC8 (UnkStruct_ov13_02227244 * param0)
}
if (!((v0->item == 0) || (v0->quantity == 0))) {
v4 = Item_GetAttribute(v0->item, 13, param0->unk_00->unk_0C);
v4 = Item_LoadParam(v0->item, 13, param0->unk_00->unk_0C);
for (v3 = 0; v3 < 5; v3++) {
if ((v4 & (1 << v3)) == 0) {

12
src/overlay013/ov13_02227BDC.c
View File

@@ -97,24 +97,24 @@ static void ov13_02227C54 (UnkStruct_ov13_02227244 * param0)
v0 = ov16_0223E010(param0->unk_00->unk_00);
for (v1 = 0; v1 < 6; v1++) {
sub_0200CC3C(v0, param0->unk_30C, v2, sub_0207CE78(1, 1), 0, NNS_G2D_VRAM_TYPE_2DSUB, 46263 + v1);
sub_0200CDC4(param0->unk_08, 3, v0, param0->unk_30C, v2, sub_0207CE78(1, 2), 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 46263 + v1);
sub_0200CC3C(v0, param0->unk_30C, v2, Item_ID(1, 1), 0, NNS_G2D_VRAM_TYPE_2DSUB, 46263 + v1);
sub_0200CDC4(param0->unk_08, 3, v0, param0->unk_30C, v2, Item_ID(1, 2), 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 46263 + v1);
}
sub_0200CE24(v0, param0->unk_30C, v2, Item_GetIndexOfIconNCER(), 0, 46263);
sub_0200CE54(v0, param0->unk_30C, v2, Item_GetIndexOfIconNANR(), 0, 46263);
sub_0200CE24(v0, param0->unk_30C, v2, Item_IconNCERFile(), 0, 46263);
sub_0200CE54(v0, param0->unk_30C, v2, Item_IconNANRFile(), 0, 46263);
NARC_dtor(v2);
}
static void ov13_02227D10 (UnkStruct_ov13_02227244 * param0, u16 param1, u32 param2)
{
UnkStruct_0200C6E4 * v0 = ov16_0223E010(param0->unk_00->unk_00);
sub_0200D948(v0, param0->unk_30C, 16, sub_0207CE78(param1, 1), 0, param2);
sub_0200D948(v0, param0->unk_30C, 16, Item_ID(param1, 1), 0, param2);
}
static void ov13_02227D48 (UnkStruct_ov13_02227244 * param0, u16 param1, u16 param2, u32 param3)
{
sub_02003050(param0->unk_08, 16, sub_0207CE78(param1, 2), param0->unk_00->unk_0C, 3, 0x20, param2 * 16);
sub_02003050(param0->unk_08, 16, Item_ID(param1, 2), param0->unk_00->unk_0C, 3, 0x20, param2 * 16);
}
static UnkStruct_0200D0F4 * ov13_02227D78 (UnkStruct_ov13_02227244 * param0, u32 param1)

60
src/overlay016/ov16_0223DF00.c
View File

@@ -588,7 +588,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
v1 = ov16_0223DFAC(param0, param1, param2);
v6 = 0;
if (Item_GetAttribute(param4, 15, 5)) {
if (Item_LoadParam(param4, 15, 5)) {
v3 = GetMonData(v1, MON_DATA_160, NULL);
if (v3 & 0x7) {
@@ -608,7 +608,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 16, 5)) {
if (Item_LoadParam(param4, 16, 5)) {
v3 = GetMonData(v1, MON_DATA_160, NULL);
if (v3 & 0xf88) {
@@ -625,7 +625,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 17, 5)) {
if (Item_LoadParam(param4, 17, 5)) {
v3 = GetMonData(v1, MON_DATA_160, NULL);
if (v3 & 0x10) {
@@ -642,7 +642,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 18, 5)) {
if (Item_LoadParam(param4, 18, 5)) {
v3 = GetMonData(v1, MON_DATA_160, NULL);
if (v3 & 0x20) {
@@ -659,7 +659,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 19, 5)) {
if (Item_LoadParam(param4, 19, 5)) {
v3 = GetMonData(v1, MON_DATA_160, NULL);
if (v3 & 0x40) {
@@ -676,7 +676,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 20, 5)) {
if (Item_LoadParam(param4, 20, 5)) {
if ((v4 == param2) || (v5 == param2)) {
v3 = ov16_02252060(v0, param1, 53, NULL);
@@ -688,7 +688,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 21, 5)) {
if (Item_LoadParam(param4, 21, 5)) {
if ((v4 == param2) || (v5 == param2)) {
v3 = ov16_02252060(v0, param1, 53, NULL);
@@ -700,7 +700,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 22, 5)) {
if (Item_LoadParam(param4, 22, 5)) {
v3 = ov16_0225B45C(param0, v0, 1, param1);
if (v3 == 0) {
@@ -712,7 +712,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 27, 5)) {
if (Item_LoadParam(param4, 27, 5)) {
if ((v4 == param2) || (v5 == param2)) {
if (ov16_02252060(v0, param1, 19, NULL) < 12) {
ov16_02252A14(v0, param1, 19, 1);
@@ -721,7 +721,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 28, 5)) {
if (Item_LoadParam(param4, 28, 5)) {
if ((v4 == param2) || (v5 == param2)) {
if (ov16_02252060(v0, param1, 20, NULL) < 12) {
ov16_02252A14(v0, param1, 20, 1);
@@ -730,7 +730,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 29, 5)) {
if (Item_LoadParam(param4, 29, 5)) {
if ((v4 == param2) || (v5 == param2)) {
if (ov16_02252060(v0, param1, 22, NULL) < 12) {
ov16_02252A14(v0, param1, 22, 1);
@@ -739,7 +739,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 30, 5)) {
if (Item_LoadParam(param4, 30, 5)) {
if ((v4 == param2) || (v5 == param2)) {
if (ov16_02252060(v0, param1, 23, NULL) < 12) {
ov16_02252A14(v0, param1, 23, 1);
@@ -748,7 +748,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 31, 5)) {
if (Item_LoadParam(param4, 31, 5)) {
if ((v4 == param2) || (v5 == param2)) {
if (ov16_02252060(v0, param1, 21, NULL) < 12) {
ov16_02252A14(v0, param1, 21, 1);
@@ -757,7 +757,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 32, 5)) {
if (Item_LoadParam(param4, 32, 5)) {
if ((v4 == param2) || (v5 == param2)) {
if (ov16_02252060(v0, param1, 24, NULL) < 12) {
ov16_02252A14(v0, param1, 24, 1);
@@ -766,7 +766,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 33, 5)) {
if (Item_LoadParam(param4, 33, 5)) {
if ((v4 == param2) || (v5 == param2)) {
v3 = ov16_02252060(v0, param1, 53, NULL);
@@ -778,8 +778,8 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 36, 5)) {
v3 = Item_GetAttribute(param4, 55, 5);
if (Item_LoadParam(param4, 36, 5)) {
v3 = Item_LoadParam(param4, 55, 5);
if (GetMonData(v1, MON_DATA_58 + param3, NULL) != GetMonData(v1, MON_DATA_66 + param3, NULL)) {
sub_0207536C(v1, MON_DATA_58 + param3, v3);
@@ -794,8 +794,8 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 37, 5)) {
v3 = Item_GetAttribute(param4, 55, 5);
if (Item_LoadParam(param4, 37, 5)) {
v3 = Item_LoadParam(param4, 55, 5);
for (param3 = 0; param3 < 4; param3++) {
if (GetMonData(v1, MON_DATA_58 + param3, NULL) != GetMonData(v1, MON_DATA_66 + param3, NULL)) {
@@ -812,10 +812,10 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 38, 5)) {
if (Item_LoadParam(param4, 38, 5)) {
v3 = 0;
if (Item_GetAttribute(param4, 23, 5)) {
if (Item_LoadParam(param4, 23, 5)) {
if (GetMonData(v1, MON_DATA_163, NULL) == 0) {
v3 = 1;
}
@@ -824,7 +824,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
if ((v3) && (GetMonData(v1, MON_DATA_163, NULL) != GetMonData(v1, MON_DATA_164, NULL))) {
v3 = Item_GetAttribute(param4, 54, 5);
v3 = Item_LoadParam(param4, 54, 5);
switch (v3) {
case 255:
@@ -850,7 +850,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
sub_0207536C(v1, MON_DATA_163, v3);
if (!Item_GetAttribute(param4, 23, 5)) {
if (!Item_LoadParam(param4, 23, 5)) {
if (ov16_0223E208(param0, param1)) {
ov16_022523E8(v0, param1, 95, &v3);
} else {
@@ -864,21 +864,21 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
}
}
if (Item_GetAttribute(param4, 45, 5)) {
if (Item_LoadParam(param4, 45, 5)) {
if ((GetMonData(v1, MON_DATA_FRIENDSHIP, NULL) < 100) && (v2 == 1)) {
v6 = Item_GetAttribute(param4, 56, 5);
v6 = Item_LoadParam(param4, 56, 5);
}
}
if (Item_GetAttribute(param4, 46, 5)) {
if (Item_LoadParam(param4, 46, 5)) {
if ((GetMonData(v1, MON_DATA_FRIENDSHIP, NULL) >= 100) && (GetMonData(v1, MON_DATA_FRIENDSHIP, NULL) < 200) && (v2 == 1)) {
v6 = Item_GetAttribute(param4, 57, 5);
v6 = Item_LoadParam(param4, 57, 5);
}
}
if (Item_GetAttribute(param4, 47, 5)) {
if (Item_LoadParam(param4, 47, 5)) {
if ((GetMonData(v1, MON_DATA_FRIENDSHIP, NULL) >= 200) && (v2 == 1)) {
v6 = Item_GetAttribute(param4, 58, 5);
v6 = Item_LoadParam(param4, 58, 5);
}
}
@@ -894,7 +894,7 @@ BOOL ov16_0223E30C (UnkStruct_0207ADB4 * param0, int param1, int param2, int par
v3 = GetMonData(v1, MON_DATA_HELD_ITEM, NULL);
if (Item_GetAttribute(param4, 1, 5) == 53) {
if (Item_LoadParam(param4, 1, 5) == 53) {
v6 = v6 * 150 / 100;
}
}

8
src/overlay016/ov16_022405FC.c
View File

@@ -7664,7 +7664,7 @@ static void ov16_02248E74 (UnkStruct_0201CD38 * param0, void * param1)
for (v1 = v2->unk_30[6]; v1 < ov16_0223DF60(v2->unk_00, v6); v1++) {
v3 = ov16_0223DFAC(v2->unk_00, v6, v1);
v9 = GetMonData(v3, MON_DATA_HELD_ITEM, NULL);
v10 = Item_GetAttribute(v9, 1, 5);
v10 = Item_LoadParam(v9, 1, 5);
if ((v10 == 51) || (v2->unk_04->monsGainingExp[v5] & sub_020787CC(v1))) {
break;
@@ -7686,7 +7686,7 @@ static void ov16_02248E74 (UnkStruct_0201CD38 * param0, void * param1)
u32 v12;
v9 = GetMonData(v3, MON_DATA_HELD_ITEM, NULL);
v10 = Item_GetAttribute(v9, 1, 5);
v10 = Item_LoadParam(v9, 1, 5);
if (((v8 & 0x1) == 0) && ((v2->unk_04->battleMons[1].curHP + v2->unk_04->battleMons[3].curHP) == 0) && (GetMonData(v3, MON_DATA_163, NULL)) && (v2->unk_04->expJinglePlayed == 0)) {
sub_0200549C(1127);
@@ -8125,8 +8125,8 @@ static void ov16_022499C0 (Party * param0, int param1, int param2, int param3)
v8 = sub_02075874(param2, param3, 5);
v7 = Party_GetPokemonBySlotIndex(param0, param1);
v4 = GetMonData(v7, MON_DATA_HELD_ITEM, NULL);
v5 = Item_GetAttribute(v4, 1, 5);
v6 = Item_GetAttribute(v4, 2, 5);
v5 = Item_LoadParam(v4, 1, 5);
v6 = Item_LoadParam(v4, 2, 5);
v3 = 0;
for (v0 = 0; v0 < 6; v0++) {

2
src/overlay016/ov16_0224B940.c
View File

@@ -183,7 +183,7 @@ void * ov16_0224B940 (UnkStruct_0207ADB4 * param0)
ov16_02251604(param0, v0);
MoveTable_Load(&v0->aiContext.moveTable);
v0->aiContext.itemTable = sub_0207D388(5);
v0->aiContext.itemTable = ItemTable_Load(5);
return v0;
}

8
src/overlay016/ov16_0225177C.c
View File

@@ -6159,7 +6159,7 @@ BOOL ov16_02259B9C (UnkStruct_0207ADB4 * param0, BattleContext * param1, int * p
}
if ((param1->battleMons[param1->msgBattlerTemp].species == 493) && (param1->battleMons[param1->msgBattlerTemp].curHP) && (ov16_02255A4C(param1, param1->msgBattlerTemp) == 121)) {
v1 = sub_02077988(Item_GetAttribute(param1->battleMons[param1->msgBattlerTemp].heldItem, 1, 5));
v1 = sub_02077988(Item_LoadParam(param1->battleMons[param1->msgBattlerTemp].heldItem, 1, 5));
if (param1->battleMons[param1->msgBattlerTemp].formNum != v1) {
param1->battleMons[param1->msgBattlerTemp].formNum = v1;
@@ -6961,10 +6961,10 @@ s32 ov16_0225B0FC (BattleContext * param0, u16 param1, u16 param2)
ItemData * v0;
u16 v1;
v1 = sub_0207CE78(param1, 0);
v0 = sub_0207D3B0(param0->aiContext.itemTable, v1);
v1 = Item_ID(param1, 0);
v0 = ItemTable_Index(param0->aiContext.itemTable, v1);
return Item_GetAttributeFromStruct(v0, param2);
return Item_Get(v0, param2);
}
int ov16_0225B120 (UnkStruct_0207ADB4 * param0, BattleContext * param1, int param2)

16
src/overlay016/ov16_0225CBB8.c
View File

@@ -3800,7 +3800,7 @@ static void ov16_022611DC (UnkStruct_0201CD38 * param0, void * param1)
}
break;
case 0:
if ((((v0->unk_08->unk_04->unk_11 < 2) && ((ov16_0223DF0C(v0->unk_00) == (0x2 | 0x1)) || (ov16_0223DF0C(v0->unk_00) == ((0x2 | 0x1) | 0x10)))) || (v0->unk_08->unk_04->unk_11 < 1)) && (Item_GetAttribute(v0->unk_04->unk_1C, 38, 5))) {
if ((((v0->unk_08->unk_04->unk_11 < 2) && ((ov16_0223DF0C(v0->unk_00) == (0x2 | 0x1)) || (ov16_0223DF0C(v0->unk_00) == ((0x2 | 0x1) | 0x10)))) || (v0->unk_08->unk_04->unk_11 < 1)) && (Item_LoadParam(v0->unk_04->unk_1C, 38, 5))) {
if (ov16_0223EDAC(v0->unk_00) == 1) {
v0->unk_12 = 17;
} else {
@@ -4081,37 +4081,37 @@ static void ov16_022611DC (UnkStruct_0201CD38 * param0, void * param1)
v30.tags = 2;
v30.params[0] = v28 | (v0->unk_08->unk_0C[v28] << 8);
if (Item_GetAttribute(v0->unk_04->unk_1C, 15, 5)) {
if (Item_LoadParam(v0->unk_04->unk_1C, 15, 5)) {
v31 = 0;
v32++;
}
if (Item_GetAttribute(v0->unk_04->unk_1C, 16, 5)) {
if (Item_LoadParam(v0->unk_04->unk_1C, 16, 5)) {
v31 = 1;
v32++;
}
if (Item_GetAttribute(v0->unk_04->unk_1C, 17, 5)) {
if (Item_LoadParam(v0->unk_04->unk_1C, 17, 5)) {
v31 = 2;
v32++;
}
if (Item_GetAttribute(v0->unk_04->unk_1C, 18, 5)) {
if (Item_LoadParam(v0->unk_04->unk_1C, 18, 5)) {
v31 = 3;
v32++;
}
if (Item_GetAttribute(v0->unk_04->unk_1C, 19, 5)) {
if (Item_LoadParam(v0->unk_04->unk_1C, 19, 5)) {
v31 = 4;
v32++;
}
if (Item_GetAttribute(v0->unk_04->unk_1C, 20, 5)) {
if (Item_LoadParam(v0->unk_04->unk_1C, 20, 5)) {
v31 = 5;
v32++;
}
if (Item_GetAttribute(v0->unk_04->unk_1C, 21, 5)) {
if (Item_LoadParam(v0->unk_04->unk_1C, 21, 5)) {
v31 = 6;
v32++;
}

4
src/overlay019/ov19_021D0D80.c
View File

@@ -4174,7 +4174,7 @@ static void ov19_021D58AC (UnkStruct_ov19_021D4DF0 * param0, BoxPokemon * param1
}
if (v0->unk_06 != 0) {
Item_GetNameIntoString(v0->unk_1C, v0->unk_06, 9);
Item_LoadName(v0->unk_1C, v0->unk_06, 9);
} else {
sub_0200B1B8(param2->unk_18C, 20, v0->unk_1C);
}
@@ -4281,7 +4281,7 @@ static void ov19_021D5BE8 (UnkStruct_ov19_021D4DF0 * param0, u16 param1, UnkStru
v0->unk_06 = param1;
if (v0->unk_06 != 0) {
Item_GetNameIntoString(v0->unk_1C, v0->unk_06, 9);
Item_LoadName(v0->unk_1C, v0->unk_06, 9);
} else {
sub_0200B1B8(param2->unk_18C, 20, v0->unk_1C);
}

4
src/overlay019/ov19_021DB8E4.c
View File

@@ -713,11 +713,11 @@ static void ov19_021DC4F8 (UnkStruct_ov19_021DBA9C * param0, u32 param1)
ov19_021D783C(&v0, &v2, ov19_021D77D0(param0->unk_00), v1->unk_1C, v1->unk_20, 0);
NNS_G2dInitImageProxy(&v2);
v4 = sub_02006F50(16, sub_0207CE78(param1, 1), 0, &v3, 10);
v4 = sub_02006F50(16, Item_ID(param1, 1), 0, &v3, 10);
v3->mapingType = GX_GetOBJVRamModeChar();
NNS_G2dLoadImage1DMapping(v3, 1520 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &v2);
sub_02006E84(16, sub_0207CE78(param1, 2), 1, 6 * 0x20, 0x20, 10);
sub_02006E84(16, Item_ID(param1, 2), 1, 6 * 0x20, 0x20, 10);
param0->unk_90 = ov19_021D785C(param0->unk_08, &v0, 18, 224, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
if (param0->unk_90) {

10
src/overlay019/ov19_021DE3E8.c
View File

@@ -110,7 +110,7 @@ static void ov19_021DE450 (UnkStruct_ov19_021DE3E8 * param0)
int v4;
ov19_021D783C(&v0, &v1, ov19_021D77D0(param0->unk_04), param0->unk_14->unk_1C, param0->unk_14->unk_20, 0);
v3 = sub_02006F50(16, sub_0207CE78(1, 1), 0, &v2, 10);
v3 = sub_02006F50(16, Item_ID(1, 1), 0, &v2, 10);
if (v3) {
int v5;
@@ -228,8 +228,8 @@ static void ov19_021DE5D4 (UnkStruct_ov19_021DE3E8 * param0)
v2 = 2;
}
sub_02006EC0(16, sub_0207CE78(v0, 1), 0, Unk_ov19_021E04CC[v3].unk_00, 0, 0, 10);
sub_02006E84(16, sub_0207CE78(v0, 2), 1, Unk_ov19_021E04CC[v3].unk_04 * 0x20, 0x20, 10);
sub_02006EC0(16, Item_ID(v0, 1), 0, Unk_ov19_021E04CC[v3].unk_00, 0, 0, 10);
sub_02006E84(16, Item_ID(v0, 2), 1, Unk_ov19_021E04CC[v3].unk_04 * 0x20, 0x20, 10);
sub_02021E80(param0->unk_1C[v3], v2);
ov19_021D78AC(param0->unk_1C[v3], 2);
@@ -269,8 +269,8 @@ static void ov19_021DE718 (UnkStruct_ov19_021DE3E8 * param0, int param1, int par
ov19_021DE694(param0, &v0, &v1);
sub_02006EC0(16, sub_0207CE78(param2, 1), 0, Unk_ov19_021E04CC[param1].unk_00, 0, 0, 10);
sub_02006E84(16, sub_0207CE78(param2, 2), 1, Unk_ov19_021E04CC[param1].unk_04 * 0x20, 0x20, 10);
sub_02006EC0(16, Item_ID(param2, 1), 0, Unk_ov19_021E04CC[param1].unk_00, 0, 0, 10);
sub_02006E84(16, Item_ID(param2, 2), 1, Unk_ov19_021E04CC[param1].unk_04 * 0x20, 0x20, 10);
sub_02021E80(param0->unk_1C[param1], v1);
ov19_021D78AC(param0->unk_1C[param1], 3);

2
src/overlay082/ov82_0223B2E0.c
View File

@@ -178,7 +178,7 @@ static int ov82_0223B470 (UnkStruct_ov83_0223C344 * param0)
v3 = 0;
for (v0 = 0; v0 < 64; v0++) {
v4 = sub_0207D354(v0);
v4 = Item_ForBerryNumber(v0);
if (sub_0207D688(v5, v4, 1, param0->unk_00) == 1) {
sub_02097320(param0->unk_18, v4, 0);

28
src/overlay084/ov84_0223B5A0.c
View File

@@ -881,7 +881,7 @@ static void ov84_0223BE84 (UnkStruct_0200B144 * param0, Strbuf *param1, u16 para
static void ov84_0223BE94 (UnkStruct_0200B144 * param0, Strbuf *param1, u16 param2, u32 param3)
{
sub_0200B1B8(param0, GetMoveFromTMOrHMItemID(param2), param1);
sub_0200B1B8(param0, Item_MoveForTMHM(param2), param1);
}
static void ov84_0223BEAC (UnkStruct_ov84_0223B5A0 * param0)
@@ -1922,7 +1922,7 @@ static void ov84_0223D42C (UnkStruct_ov84_0223B5A0 * param0)
u16 v1 = v0->unk_06 + v0->unk_04;
if (!((param0->unk_47B == v1) || (param0->unk_47B == (v1 - 1)))) {
sub_0207CDEC(v0->unk_00, param0->unk_47B - 1, v1 - 1);
Item_MoveInPocket(v0->unk_00, param0->unk_47B - 1, v1 - 1);
sub_02013A3C(param0->unk_160);
ov84_0223BFBC(param0);
}
@@ -1981,7 +1981,7 @@ static void ov84_0223D5AC (UnkStruct_ov84_0223B5A0 * param0)
u8 v2;
u8 v3[12];
v0 = Item_LoadDataOrGFX(param0->unk_C4->unk_66, 0, 6);
v0 = Item_Load(param0->unk_C4->unk_66, 0, 6);
v1 = 0;
v2 = param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_08;
@@ -1997,7 +1997,7 @@ static void ov84_0223D5AC (UnkStruct_ov84_0223B5A0 * param0)
v1++;
}
} else {
if (Item_GetAttributeFromStruct(v0, 6) != 0) {
if (Item_Get(v0, 6) != 0) {
if ((param0->unk_C4->unk_66 == 450) && (param0->unk_C4->unk_76_0 == 1)) {
v3[v1] = 1;
} else if (param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_08 == 5) {
@@ -2013,7 +2013,7 @@ static void ov84_0223D5AC (UnkStruct_ov84_0223B5A0 * param0)
v1++;
}
}
if (Item_GetAttributeFromStruct(v0, 3) == 0) {
if (Item_Get(v0, 3) == 0) {
v3[v1] = 8;
v1++;
@@ -2022,7 +2022,7 @@ static void ov84_0223D5AC (UnkStruct_ov84_0223B5A0 * param0)
v1++;
}
}
if (Item_GetAttributeFromStruct(v0, 4) != 0) {
if (Item_Get(v0, 4) != 0) {
if (sub_0207D3FC(param0->unk_C8) == param0->unk_C4->unk_66) {
v3[v1] = 7;
} else {
@@ -2117,7 +2117,7 @@ static int ov84_0223D858 (UnkStruct_ov84_0223B5A0 * param0)
ov84_0223FD84(param0);
v1 = Item_GetAttribute(param0->unk_C4->unk_66, 6, 6);
v1 = Item_LoadParam(param0->unk_C4->unk_66, 6, 6);
v0 = (UnkFuncPtr_02069238)sub_020683F4(2, v1);
if (v0 != NULL) {
@@ -2195,11 +2195,11 @@ static int ov84_0223DA14 (UnkStruct_ov84_0223B5A0 * param0)
switch (param0->unk_483) {
case 0:
{
u16 v0 = GetMoveFromTMOrHMItemID(param0->unk_C4->unk_66);
u16 v0 = Item_MoveForTMHM(param0->unk_C4->unk_66);
sub_0200B630(param0->unk_118, 0, v0);
if (Item_IsMoveHM(v0) == 1) {
if (Item_IsHMMove(v0) == 1) {
sub_0200B1B8(param0->unk_114, 59, param0->unk_3F8);
} else {
sub_0200B1B8(param0->unk_114, 58, param0->unk_3F8);
@@ -2317,7 +2317,7 @@ static Strbuf* ov84_0223DC9C (UnkStruct_ov84_0223B5A0 * param0, u16 param1)
return sub_0200B1EC(param0->unk_114, 62);
}
v0 = Item_GetAttribute(param1, 2, 6);
v0 = Item_LoadParam(param1, 2, 6);
ov84_0223B9F4(param0, (u8)v0);
param0->unk_488 = 1;
sub_02005748(1536);
@@ -2595,7 +2595,7 @@ static int ov84_0223E27C (UnkStruct_ov84_0223B5A0 * param0)
u8 v0 = ov84_0223C5B8(param0);
if (v0 == 1) {
if (Item_GetAttribute(param0->unk_C4->unk_66, 3, 6) != 0) {
if (Item_LoadParam(param0->unk_C4->unk_66, 3, 6) != 0) {
Strbuf* v1;
sub_0201ADA4(&param0->unk_04[6], 15);
@@ -2666,9 +2666,9 @@ static int ov84_0223E3BC (UnkStruct_ov84_0223B5A0 * param0)
sub_0200B70C(param0->unk_118, 0, param0->unk_C4->unk_66);
ov84_02240B34(param0, 2);
param0->unk_48C = Item_GetAttribute(param0->unk_C4->unk_66, 0, 6);
param0->unk_48C = Item_LoadParam(param0->unk_C4->unk_66, 0, 6);
if ((Item_GetAttribute(param0->unk_C4->unk_66, 3, 6) != 0) || (param0->unk_48C == 0)) {
if ((Item_LoadParam(param0->unk_C4->unk_66, 3, 6) != 0) || (param0->unk_48C == 0)) {
v1 = sub_0200B1EC(param0->unk_114, 74);
sub_0200C388(param0->unk_118, param0->unk_3F8, v1);
Strbuf_Free(v1);
@@ -2922,7 +2922,7 @@ static int ov84_0223EA18 (UnkStruct_ov84_0223B5A0 * param0)
if (v0 == 1) {
if (param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_08 == 0) {
if (Item_GetAttribute(param0->unk_C4->unk_66, 6, 6) != 13) {
if (Item_LoadParam(param0->unk_C4->unk_66, 6, 6) != 13) {
sub_0207CD34(param0->unk_CC, param0->unk_3F8, param0->unk_C4->unk_66, -1, 6);
sub_0201ADA4(&param0->unk_04[6], 15);
sub_0200E060(&param0->unk_04[6], 0, 1024 - 9 - (18 + 12), 12);

6
src/overlay084/ov84_0223F040.c
View File

@@ -210,7 +210,7 @@ void ov84_0223F528 (UnkStruct_ov84_0223B5A0 * param0, u16 param1)
if (param1 != 0xffff) {
v0 = Strbuf_Init(130, 6);
Item_GetDescriptionIntoString(v0, param1, 6);
Item_LoadDescription(v0, param1, 6);
} else {
v0 = sub_0200B1EC(param0->unk_114, 94);
}
@@ -227,7 +227,7 @@ void ov84_0223F584 (UnkStruct_ov84_0223B5A0 * param0, u16 param1)
u16 v3;
v0 = &param0->unk_04[1];
v2 = GetMoveFromTMOrHMItemID(param1);
v2 = Item_MoveForTMHM(param1);
v1 = sub_0200B1EC(param0->unk_114, 98);
sub_0201D78C(v0, 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
@@ -333,7 +333,7 @@ void ov84_0223F8D0 (UnkStruct_ov84_0223B5A0 * param0, BagItem * param1, u32 para
void ov84_0223F94C (UnkStruct_ov84_0223B5A0 * param0, BagItem * param1, u32 param2)
{
sub_0200C648(param0->unk_110, 2, sub_0207D344(param1->item) + 1, 2, 2, &param0->unk_04[0], 0, param2 + 5);
sub_0200C648(param0->unk_110, 2, Item_BerryNumber(param1->item) + 1, 2, 2, &param0->unk_04[0], 0, param2 + 5);
ov84_0223F81C(param0, param1->quantity, param2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))));
}

14
src/overlay084/ov84_022403F4.c
View File

@@ -234,12 +234,12 @@ static void ov84_022404C0 (UnkStruct_ov84_0223B5A0 * param0)
sub_0200CC3C(param0->unk_D8, param0->unk_DC, param0->unk_D4, 10, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 49405);
sub_0200CC3C(param0->unk_D8, param0->unk_DC, param0->unk_D4, 36, 0, NNS_G2D_VRAM_TYPE_2DSUB, 49406);
sub_0200CBDC(param0->unk_D8, param0->unk_DC, 62, 4, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 49408);
sub_0200CBDC(param0->unk_D8, param0->unk_DC, 16, sub_0207CE78(0, 1), 0, NNS_G2D_VRAM_TYPE_2DMAIN, 49407);
sub_0200CBDC(param0->unk_D8, param0->unk_DC, 16, Item_ID(0, 1), 0, NNS_G2D_VRAM_TYPE_2DMAIN, 49407);
sub_0207C948(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 49409);
sub_0207CAC4(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 49410);
sub_0200CD0C(param0->unk_D8, param0->unk_DC, param0->unk_D4, v1, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 49401);
sub_0200CD0C(param0->unk_D8, param0->unk_DC, param0->unk_D4, 20, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 49402);
sub_0200CC9C(param0->unk_D8, param0->unk_DC, 16, sub_0207CE78(0, 2), 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 49404);
sub_0200CC9C(param0->unk_D8, param0->unk_DC, 16, Item_ID(0, 2), 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 49404);
sub_0200CC9C(param0->unk_D8, param0->unk_DC, 62, 10, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 49405);
sub_0207C97C(param0->unk_D8, param0->unk_DC, NNS_G2D_VRAM_TYPE_2DMAIN, 49406);
sub_0200CD0C(param0->unk_D8, param0->unk_DC, param0->unk_D4, 37, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 49403);
@@ -249,7 +249,7 @@ static void ov84_022404C0 (UnkStruct_ov84_0223B5A0 * param0)
sub_0200CE24(param0->unk_D8, param0->unk_DC, param0->unk_D4, 30, 0, 49404);
sub_0200CE24(param0->unk_D8, param0->unk_DC, param0->unk_D4, 9, 0, 49405);
sub_0200CE24(param0->unk_D8, param0->unk_DC, param0->unk_D4, 35, 0, 49406);
sub_0200CE0C(param0->unk_D8, param0->unk_DC, 16, Item_GetIndexOfIconNCER(), 0, 49407);
sub_0200CE0C(param0->unk_D8, param0->unk_DC, 16, Item_IconNCERFile(), 0, 49407);
sub_0200CE0C(param0->unk_D8, param0->unk_DC, 62, 5, 0, 49408);
sub_0200CE54(param0->unk_D8, param0->unk_DC, param0->unk_D4, 0, 0, 49401);
sub_0200CE54(param0->unk_D8, param0->unk_DC, param0->unk_D4, 23, 0, 49402);
@@ -257,7 +257,7 @@ static void ov84_022404C0 (UnkStruct_ov84_0223B5A0 * param0)
sub_0200CE54(param0->unk_D8, param0->unk_DC, param0->unk_D4, 29, 0, 49404);
sub_0200CE54(param0->unk_D8, param0->unk_DC, param0->unk_D4, 8, 0, 49405);
sub_0200CE54(param0->unk_D8, param0->unk_DC, param0->unk_D4, 34, 0, 49406);
sub_0200CE3C(param0->unk_D8, param0->unk_DC, 16, Item_GetIndexOfIconNANR(), 0, 49407);
sub_0200CE3C(param0->unk_D8, param0->unk_DC, 16, Item_IconNANRFile(), 0, 49407);
sub_0200CE3C(param0->unk_D8, param0->unk_DC, 62, 6, 0, 49408);
sub_0207C9EC(param0->unk_D8, param0->unk_DC, 49409, 49409);
}
@@ -319,8 +319,8 @@ void ov84_02240ABC (UnkStruct_ov84_0223B5A0 * param0)
void ov84_02240AD8 (UnkStruct_ov84_0223B5A0 * param0, u16 param1)
{
sub_0200D948(param0->unk_D8, param0->unk_DC, 16, sub_0207CE78(param1, 1), 0, 49407);
sub_0200D97C(param0->unk_D8, param0->unk_DC, 16, sub_0207CE78(param1, 2), 0, 49404);
sub_0200D948(param0->unk_D8, param0->unk_DC, 16, Item_ID(param1, 1), 0, 49407);
sub_0200D97C(param0->unk_D8, param0->unk_DC, 16, Item_ID(param1, 2), 0, 49404);
}
void ov84_02240B34 (UnkStruct_ov84_0223B5A0 * param0, u8 param1)
@@ -442,7 +442,7 @@ void ov84_02240D5C (UnkStruct_ov84_0223B5A0 * param0, u16 param1, u8 param2)
return;
}
v0 = GetMoveFromTMOrHMItemID(param1);
v0 = Item_MoveForTMHM(param1);
v1 = MoveTable_LoadParam(v0, MOVEATTRIBUTE_TYPE);
v2 = MoveTable_LoadParam(v0, MOVEATTRIBUTE_CLASS);

2
src/overlay088/ov88_0223B140.c
View File

@@ -1387,7 +1387,7 @@ static void ov88_0223C8D8 (UnkStruct_0205AA50 * param0, int param1, Party * para
sub_0201ADA4(&param0[32 + param1], 0);
v1 = Strbuf_Init(20, 26);
Item_GetNameIntoString(v1, v2, 26);
Item_LoadName(v1, v2, 26);
ov88_0223EC78(&param0[32 + param1], v1, 9, 0, 3, 0);
Strbuf_Free(v1);
}

2
src/overlay094/ov94_0223D0C4.c
View File

@@ -544,7 +544,7 @@ void ov94_0223D910 (UnkStruct_0200B144 * param0, UnkStruct_0200B144 * param1, Un
v2 = sub_0200B29C(param2, param0, 102, 62);
v0 = sub_0200B1EC(param1, v10);
Item_GetNameIntoString(v5, v8, 62);
Item_LoadName(v5, v8, 62);
for (v9 = 0; v9 < 5; v9++) {
sub_0201ADA4(&param3[v9], 0x0);

4
src/overlay097/ov97_02233B18.c
View File

@@ -1250,10 +1250,10 @@ static void ov97_02234B0C (UnkStruct_ov97_02234A2C * param0, BoxPokemonGBA * par
v2 = GetGBABoxMonData(param1, 12, NULL);
if (v2) {
v3 = sub_0207CF10(v2);
v3 = Item_FromGBAID(v2);
v8 = Strbuf_Init(64, 78);
Item_GetNameIntoString(v8, v3, 78);
Item_LoadName(v8, v3, 78);
v4.unk_3C = v8;
v4.unk_34 = -1;

2
src/overlay097/ov97_02236380.c
View File

@@ -1370,7 +1370,7 @@ void BoxMonGBAToBoxMon (BoxPokemonGBA * param0, BoxPokemon * param1)
v1 = GetGBABoxMonData(param0, 12, NULL);
if (v1) {
v1 = sub_0207CF10(v1);
v1 = Item_FromGBAID(v1);
}
SetBoxMonData(param1, 6, (u8 *)&v1);

2
src/overlay097/ov97_02237694.c
View File

@@ -658,7 +658,7 @@ static void ov97_022380C8 (UnkStruct_ov97_0223F550 * param0, int param1, UnkStru
break;
}
ov97_02237B0C(16, sub_0207CE78(v0, 1), sub_0207CE78(v0, 2), Item_GetIndexOfIconNCER(), Item_GetIndexOfIconNANR(), 1);
ov97_02237B0C(16, Item_ID(v0, 1), Item_ID(v0, 2), Item_IconNCERFile(), Item_IconNANRFile(), 1);
ov97_02237C80((0 * FX32_ONE), (256 * FX32_ONE));
param0->unk_26C = ov97_02237D14(1, param0->unk_26C, HW_LCD_WIDTH / 2, 0, 0);

12
src/overlay107/ov107_02249604.c
View File

@@ -68,10 +68,10 @@ void ov107_02249604 (UnkStruct_ov107_02249954 * param0, Party * param1, u8 param
v1 = NARC_ctor(NARC_INDEX_ITEMTOOL__ITEMDATA__ITEM_ICON, 100);
param0->unk_1A0[1][0] = sub_02009A4C(param0->unk_190[0], v1, sub_0207CE78(0, 1), 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 100);
param0->unk_1A0[1][1] = sub_020098B8(param0->unk_190[1], 16, sub_0207CE78(0, 2), 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 3, 100);
param0->unk_1A0[1][2] = sub_02009BC4(param0->unk_190[2], v1, Item_GetIndexOfIconNCER(), 0, 1, 2, 100);
param0->unk_1A0[1][3] = sub_02009BC4(param0->unk_190[3], v1, Item_GetIndexOfIconNANR(), 0, 1, 3, 100);
param0->unk_1A0[1][0] = sub_02009A4C(param0->unk_190[0], v1, Item_ID(0, 1), 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 100);
param0->unk_1A0[1][1] = sub_020098B8(param0->unk_190[1], 16, Item_ID(0, 2), 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 3, 100);
param0->unk_1A0[1][2] = sub_02009BC4(param0->unk_190[2], v1, Item_IconNCERFile(), 0, 1, 2, 100);
param0->unk_1A0[1][3] = sub_02009BC4(param0->unk_190[3], v1, Item_IconNANRFile(), 0, 1, 3, 100);
NARC_dtor(v1);
ov107_02249A70(param0);
@@ -186,7 +186,7 @@ void ov107_022499BC (UnkStruct_ov107_02249954 * param0, u16 param1)
v0 = sub_02009DC8(param0->unk_190[0], 1);
sub_02009968(param0->unk_190[0], v0, 16, sub_0207CE78(param1, 1), 0, 100);
sub_02009968(param0->unk_190[0], v0, 16, Item_ID(param1, 1), 0, 100);
sub_0200A4C0(v0);
return;
@@ -198,7 +198,7 @@ void ov107_022499FC (UnkStruct_ov107_02249954 * param0, u16 param1)
v0 = sub_02009DC8(param0->unk_190[1], 1);
sub_020099D4(param0->unk_190[1], v0, 16, sub_0207CE78(param1, 2), 0, 100);
sub_020099D4(param0->unk_190[1], v0, 16, Item_ID(param1, 2), 0, 100);
sub_0200A6B8(v0);
return;

8
src/unk_0203A9C8.c
View File

@@ -1114,7 +1114,7 @@ BOOL sub_0203B7C0 (UnkStruct_020508D4 * param0)
{
UnkStruct_02097728 * v8;
v8 = sub_0203D920(v0, 2, v2->unk_22, sub_0207D2F0(v2->unk_24), 11);
v8 = sub_0203D920(v0, 2, v2->unk_22, Item_MailNumber(v2->unk_24), 11);
v1->unk_25C = v8;
if (v2->unk_20 == 10) {
@@ -1297,7 +1297,7 @@ static BOOL sub_0203BC5C (UnkStruct_020508D4 * param0)
v4.unk_04 = sub_0207CB94(v2);
v4.unk_06 = sub_0207CBA4(v2);
v4.unk_00 = param0;
v5 = Item_GetAttribute(v4.unk_04, 6, 11);
v5 = Item_LoadParam(v4.unk_04, 6, 11);
v3 = (UnkFuncPtr_0203BC5C)sub_020683F4(0, v5);
v3(&v4, &v1->unk_230);
}
@@ -1345,7 +1345,7 @@ static BOOL sub_0203BC5C (UnkStruct_020508D4 * param0)
UnkStruct_02097728 * v11;
UnkStruct_0203C540 * v12;
v11 = sub_0203D920(v0, 2, v9, sub_0207D2F0(v10), 11);
v11 = sub_0203D920(v0, 2, v9, Item_MailNumber(v10), 11);
v1->unk_25C = v11;
v1->unk_260 = sub_0203C540(v10, 0, (u8)v9);
sub_0203B674(v1, sub_0203C558);
@@ -1698,7 +1698,7 @@ static void sub_0203C2D8 (UnkStruct_020508D4 * param0, u16 param1)
v6 = 0;
for (v3 = 0; v3 < 64; v3++) {
param1 = sub_0207D354(v3);
param1 = Item_ForBerryNumber(v3);
if (sub_0207D688(v2, param1, 1, 11) == 1) {
sub_02097320(v1->unk_25C, param1, 0);

2
src/unk_020474B8.c
View File

@@ -139,7 +139,7 @@ BOOL sub_02047660 (UnkStruct_0203E724 * param0)
u16 v3 = inline_02049538(param0);
u16 v4;
v4 = GetMoveFromTMOrHMItemID(v3);
v4 = Item_MoveForTMHM(v3);
sub_0200B630(*v1, v2, v4);
return 0;

2
src/unk_0204CFFC.c
View File

@@ -313,7 +313,7 @@ BOOL sub_0204D614 (UnkStruct_0203E724 * param0)
v4 = GetMonData(v1, MON_DATA_FRIENDSHIP, NULL);
if (v2 > 0) {
if (Item_GetAttribute(GetMonData(v1, MON_DATA_HELD_ITEM, NULL), 1, 11) == 53) {
if (Item_LoadParam(GetMonData(v1, MON_DATA_HELD_ITEM, NULL), 1, 11) == 53) {
v2 = v2 * 150 / 100;
}

2
src/unk_0204E75C.c
View File

@@ -83,7 +83,7 @@ BOOL sub_0204E934 (UnkStruct_0203E724 * param0)
u16 v1 = inline_02049538(param0);
u16 * v2 = inline_0204FCAC(param0);
*v2 = (u16)Item_GetAttribute(v1, 5, 11);
*v2 = (u16)Item_LoadParam(v1, 5, 11);
return 0;
}

6
src/unk_020683F4.c
View File

@@ -605,7 +605,7 @@ static void sub_02068A34 (UnkStruct_02068630 * param0, const UnkStruct_020684D0
v2->unk_1C = v0;
v2->unk_24 = param0->unk_04;
v2->unk_22 = param0->unk_06;
v2->unk_26 = GetMoveFromTMOrHMItemID(param0->unk_04);
v2->unk_26 = Item_MoveForTMHM(param0->unk_04);
sub_0203CD84(v0, &Unk_020F1E88, v2);
v1->unk_25C = v2;
@@ -620,7 +620,7 @@ static void sub_02068ACC (UnkStruct_02068630 * param0, const UnkStruct_020684D0
v0 = sub_02050A60(param0->unk_00);
v1 = sub_02050A64(param0->unk_00);
v2 = sub_0203D94C(v0, 3, sub_0207D2F0(param0->unk_04), 11);
v2 = sub_0203D94C(v0, 3, Item_MailNumber(param0->unk_04), 11);
v1->unk_260 = sub_0203C540(param0->unk_04, 3, 0);
v1->unk_25C = v2;
@@ -1154,7 +1154,7 @@ BOOL sub_02069238 (UnkStruct_0203CDB0 * param0)
}
v3 = (u16)sub_0207D3FC(sub_0207D990(param0->unk_0C));
v4 = (u16)Item_GetAttribute(v3, 6, 11);
v4 = (u16)Item_LoadParam(v3, 6, 11);
v2 = (UnkFuncPtr_02069238)sub_020683F4(2, v4);
v1 = (UnkFuncPtr_020EF79C)sub_020683F4(1, v4);

2
src/unk_020722AC.c
View File

@@ -948,7 +948,7 @@ static void sub_02072F30 (UnkStruct_02072334 * param0, UnkStruct_021C0794 * para
v7->unk_01 = 1;
v7->unk_04 = sub_02028310(v6);
v7->unk_05 = sub_02028314(v6);
v7->unk_06 = sub_0207D310(v7->unk_05);
v7->unk_06 = Item_ForMailNumber(v7->unk_05);
Strbuf_CopyChars(v7->unk_08, sub_0202830C(v6));

8
src/unk_02073C2C.c
View File

@@ -1120,7 +1120,7 @@ static u32 sub_020745D0 (BoxPokemon * param0, int param1, void * param2)
case MON_DATA_177:
case MON_DATA_178:
if ((v2->species == SPECIES_ARCEUS) && (v2->unk_0D == 121)) {
v0 = sub_02077988(Item_GetAttribute(v2->item, 1, 0));
v0 = sub_02077988(Item_LoadParam(v2->item, 1, 0));
} else {
v0 = sub_020759CC(v2->species, v3->form, 6 + (param1 - 177));
}
@@ -2374,7 +2374,7 @@ void sub_02075C74 (Pokemon * param0, u8 param1, u16 param2)
}
v1 = GetMonData(param0, MON_DATA_HELD_ITEM, NULL);
v5 = Item_GetAttribute(v1, 1, 0);
v5 = Item_LoadParam(v1, 1, 0);
v4 = 0;
v2 = GetMonData(param0, MON_DATA_FRIENDSHIP, NULL);
@@ -3217,7 +3217,7 @@ u16 sub_02076B94 (Party * param0, Pokemon * param1, u8 param2, u16 param3, int *
v6 = GetMonData(param1, MON_DATA_PERSONALITY, NULL);
v8 = GetMonData(param1, MON_DATA_BEAUTY, NULL);
v9 = (v6 & 0xffff0000) >> 16;
v7 = Item_GetAttribute(v1, 1, 0);
v7 = Item_LoadParam(v1, 1, 0);
if (v0 != 64) {
if ((v7 == 64) && (param2 != 3)) {
@@ -4031,7 +4031,7 @@ void sub_02077930 (BoxPokemon * param0)
v2 = sub_02074570(param0, MON_DATA_HELD_ITEM, NULL);
if ((v0 == 493) && (v1 == 121)) {
v3 = sub_02077988(Item_GetAttribute(v2, 1, 0));
v3 = sub_02077988(Item_LoadParam(v2, 1, 0));
SetBoxMonData(param0, 112, &v3);
}
}

2
src/unk_0207D3B8.c
View File

@@ -83,7 +83,7 @@ void sub_0207D404 (UnkStruct_0207D3C0 * param0, u32 param1)
static u32 sub_0207D40C (UnkStruct_0207D3C0 * param0, u16 param1, BagItem ** param2, u32 * param3, u32 param4)
{
u32 v0 = Item_GetAttribute(param1, 5, param4);
u32 v0 = Item_LoadParam(param1, 5, param4);
switch (v0) {
case 7:

8
src/unk_0207E0B8.c
View File

@@ -2582,7 +2582,7 @@ static int sub_0208107C (UnkStruct_0207F248 * param0)
{
ItemData * v0;
v0 = Item_LoadDataOrGFX(param0->unk_5A4->unk_24, 0, 12);
v0 = Item_Load(param0->unk_5A4->unk_24, 0, 12);
if ((param0->unk_5A4->unk_24 == 466) && (sub_02077B14(Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11)) == 1)) {
param0->unk_5A4->unk_38 = 1;
@@ -2591,13 +2591,13 @@ static int sub_0208107C (UnkStruct_0207F248 * param0)
return 31;
}
if ((Item_GetAttributeFromStruct(v0, 34) != 0) || (Item_GetAttributeFromStruct(v0, 35) != 0)) {
if ((Item_Get(v0, 34) != 0) || (Item_Get(v0, 35) != 0)) {
Heap_FreeToHeap(v0);
sub_020866A0(param0, 0);
return 6;
}
if ((Item_GetAttributeFromStruct(v0, 36) != 0) && (Item_GetAttributeFromStruct(v0, 37) == 0)) {
if ((Item_Get(v0, 36) != 0) && (Item_Get(v0, 37) == 0)) {
Heap_FreeToHeap(v0);
sub_020866A0(param0, 1);
return 6;
@@ -2606,7 +2606,7 @@ static int sub_0208107C (UnkStruct_0207F248 * param0)
if (sub_0209693C(param0->unk_5A4->unk_00, param0->unk_5A4->unk_24, param0->unk_B11, 0, 12) == 1) {
sub_0207D60C(param0->unk_5A4->unk_04, param0->unk_5A4->unk_24, 1, 12);
if (Item_GetAttributeFromStruct(v0, 26) != 0) {
if (Item_Get(v0, 26) != 0) {
Pokemon * v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
param0->unk_5A4->unk_38 = sub_02076B94(NULL, v1, 3, param0->unk_5A4->unk_24, &param0->unk_5A4->unk_3C);

54
src/unk_02084B70.c
View File

@@ -55,34 +55,34 @@ static u8 sub_02084B70 (u16 param0)
ItemData * v0;
s32 v1;
v0 = Item_LoadDataOrGFX(param0, 0, 12);
v0 = Item_Load(param0, 0, 12);
if (Item_GetAttributeFromStruct(v0, 14) != 1) {
if (Item_Get(v0, 14) != 1) {
Heap_FreeToHeap(v0);
return 28;
}
if ((Item_GetAttributeFromStruct(v0, 27) != 0) || (Item_GetAttributeFromStruct(v0, 28) != 0) || (Item_GetAttributeFromStruct(v0, 29) != 0) || (Item_GetAttributeFromStruct(v0, 30) != 0) || (Item_GetAttributeFromStruct(v0, 31) != 0) || (Item_GetAttributeFromStruct(v0, 32) != 0) || (Item_GetAttributeFromStruct(v0, 33) != 0)) {
if ((Item_Get(v0, 27) != 0) || (Item_Get(v0, 28) != 0) || (Item_Get(v0, 29) != 0) || (Item_Get(v0, 30) != 0) || (Item_Get(v0, 31) != 0) || (Item_Get(v0, 32) != 0) || (Item_Get(v0, 33) != 0)) {
Heap_FreeToHeap(v0);
return 0;
}
if (Item_GetAttributeFromStruct(v0, 24) != 0) {
if (Item_Get(v0, 24) != 0) {
Heap_FreeToHeap(v0);
return 1;
}
if (Item_GetAttributeFromStruct(v0, 25) != 0) {
if (Item_Get(v0, 25) != 0) {
Heap_FreeToHeap(v0);
return 2;
}
v1 = Item_GetAttributeFromStruct(v0, 15);
v1 += (Item_GetAttributeFromStruct(v0, 16) << 1);
v1 += (Item_GetAttributeFromStruct(v0, 17) << 2);
v1 += (Item_GetAttributeFromStruct(v0, 18) << 3);
v1 += (Item_GetAttributeFromStruct(v0, 19) << 4);
v1 += (Item_GetAttributeFromStruct(v0, 20) << 5);
v1 = Item_Get(v0, 15);
v1 += (Item_Get(v0, 16) << 1);
v1 += (Item_Get(v0, 17) << 2);
v1 += (Item_Get(v0, 18) << 3);
v1 += (Item_Get(v0, 19) << 4);
v1 += (Item_Get(v0, 20) << 5);
switch (v1) {
case 0x1:
@@ -104,7 +104,7 @@ static u8 sub_02084B70 (u16 param0)
Heap_FreeToHeap(v0);
return 8;
case 0x3f:
if (Item_GetAttributeFromStruct(v0, 38) != 0) {
if (Item_Get(v0, 38) != 0) {
Heap_FreeToHeap(v0);
return 11;
} else {
@@ -113,17 +113,17 @@ static u8 sub_02084B70 (u16 param0)
}
}
if (Item_GetAttributeFromStruct(v0, 21) != 0) {
if (Item_Get(v0, 21) != 0) {
Heap_FreeToHeap(v0);
return 10;
}
if (Item_GetAttributeFromStruct(v0, 38) != 0) {
if (Item_Get(v0, 38) != 0) {
Heap_FreeToHeap(v0);
return 11;
}
v1 = Item_GetAttributeFromStruct(v0, 48);
v1 = Item_Get(v0, 48);
if (v1 > 0) {
Heap_FreeToHeap(v0);
@@ -135,7 +135,7 @@ static u8 sub_02084B70 (u16 param0)
return 18;
}
v1 = Item_GetAttributeFromStruct(v0, 49);
v1 = Item_Get(v0, 49);
if (v1 > 0) {
Heap_FreeToHeap(v0);
@@ -147,7 +147,7 @@ static u8 sub_02084B70 (u16 param0)
return 19;
}
v1 = Item_GetAttributeFromStruct(v0, 50);
v1 = Item_Get(v0, 50);
if (v1 > 0) {
Heap_FreeToHeap(v0);
@@ -159,7 +159,7 @@ static u8 sub_02084B70 (u16 param0)
return 20;
}
v1 = Item_GetAttributeFromStruct(v0, 51);
v1 = Item_Get(v0, 51);
if (v1 > 0) {
Heap_FreeToHeap(v0);
@@ -171,7 +171,7 @@ static u8 sub_02084B70 (u16 param0)
return 21;
}
v1 = Item_GetAttributeFromStruct(v0, 52);
v1 = Item_Get(v0, 52);
if (v1 > 0) {
Heap_FreeToHeap(v0);
@@ -183,7 +183,7 @@ static u8 sub_02084B70 (u16 param0)
return 22;
}
v1 = Item_GetAttributeFromStruct(v0, 53);
v1 = Item_Get(v0, 53);
if (v1 > 0) {
Heap_FreeToHeap(v0);
@@ -195,22 +195,22 @@ static u8 sub_02084B70 (u16 param0)
return 23;
}
if (Item_GetAttributeFromStruct(v0, 26) != 0) {
if (Item_Get(v0, 26) != 0) {
Heap_FreeToHeap(v0);
return 24;
}
if (Item_GetAttributeFromStruct(v0, 34) != 0) {
if (Item_Get(v0, 34) != 0) {
Heap_FreeToHeap(v0);
return 25;
}
if (Item_GetAttributeFromStruct(v0, 35) != 0) {
if (Item_Get(v0, 35) != 0) {
Heap_FreeToHeap(v0);
return 26;
}
if ((Item_GetAttributeFromStruct(v0, 36) != 0) || (Item_GetAttributeFromStruct(v0, 37) != 0)) {
if ((Item_Get(v0, 36) != 0) || (Item_Get(v0, 37) != 0)) {
Heap_FreeToHeap(v0);
return 27;
}
@@ -543,7 +543,7 @@ static int sub_02085704 (void * param0)
BOOL sub_020857A8 (u16 param0)
{
if (Item_GetAttribute(param0, 24, 12) != 0) {
if (Item_LoadParam(param0, 24, 12) != 0) {
return 1;
}
@@ -943,7 +943,7 @@ u8 sub_02086104 (UnkStruct_0207F248 * param0, Pokemon * param1)
}
}
if (sub_02077FB4(param1, Item_GetTMOrHMNumberFromID(param0->unk_5A4->unk_24)) == 0) {
if (sub_02077FB4(param1, Item_TMHMNumber(param0->unk_5A4->unk_24)) == 0) {
return 0xff;
}
@@ -1146,7 +1146,7 @@ static void sub_02086590 (UnkStruct_0207F248 * param0, Pokemon * param1, u32 par
sub_02074B30(param1, 58 + param2, &v0);
if (param0->unk_5A4->unk_24 != 0) {
if (Item_IsMoveHM(param0->unk_5A4->unk_26) == 0) {
if (Item_IsHMMove(param0->unk_5A4->unk_26) == 0) {
sub_0207D60C(param0->unk_5A4->unk_04, param0->unk_5A4->unk_24, 1, 12);
}

2
src/unk_0208C324.c
View File

@@ -771,7 +771,7 @@ static int sub_0208CD44 (UnkStruct_0208D7BC * param0)
sub_02005748(1501);
if (param0->unk_6A5_0 != 4) {
if ((Item_IsMoveHM(param0->unk_250.unk_34[param0->unk_6A5_0]) == 1) && (param0->unk_24C->unk_18 != 0)) {
if ((Item_IsHMMove(param0->unk_250.unk_34[param0->unk_6A5_0]) == 1) && (param0->unk_24C->unk_18 != 0)) {
sub_0200D3EC(param0->unk_41C[18], 0);
sub_0208E46C(param0);
sub_020914F8(param0);

140
src/unk_02096420.c
View File

@@ -24,44 +24,44 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
ItemData * v0;
s32 v1[8];
v0 = Item_LoadDataOrGFX(param1, 0, param3);
v0 = Item_Load(param1, 0, param3);
if (Item_GetAttributeFromStruct(v0, 14) != 1) {
if (Item_Get(v0, 14) != 1) {
Heap_FreeToHeap(v0);
return 0;
}
v1[0] = GetMonData(param0, MON_DATA_160, NULL);
if (Item_GetAttributeFromStruct(v0, 15) != 0) {
if (Item_Get(v0, 15) != 0) {
if ((v1[0] & 0x7) != 0) {
Heap_FreeToHeap(v0);
return 1;
}
}
if (Item_GetAttributeFromStruct(v0, 16) != 0) {
if (Item_Get(v0, 16) != 0) {
if ((v1[0] & (0x8 | 0x80)) != 0) {
Heap_FreeToHeap(v0);
return 1;
}
}
if (Item_GetAttributeFromStruct(v0, 17) != 0) {
if (Item_Get(v0, 17) != 0) {
if ((v1[0] & 0x10) != 0) {
Heap_FreeToHeap(v0);
return 1;
}
}
if (Item_GetAttributeFromStruct(v0, 18) != 0) {
if (Item_Get(v0, 18) != 0) {
if ((v1[0] & 0x20) != 0) {
Heap_FreeToHeap(v0);
return 1;
}
}
if (Item_GetAttributeFromStruct(v0, 19) != 0) {
if (Item_Get(v0, 19) != 0) {
if ((v1[0] & 0x40) != 0) {
Heap_FreeToHeap(v0);
return 1;
@@ -70,47 +70,47 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
v1[0] = GetMonData(param0, MON_DATA_163, NULL);
if (((Item_GetAttributeFromStruct(v0, 23) != 0) || (Item_GetAttributeFromStruct(v0, 24) != 0)) && (Item_GetAttributeFromStruct(v0, 25) == 0)) {
if (((Item_Get(v0, 23) != 0) || (Item_Get(v0, 24) != 0)) && (Item_Get(v0, 25) == 0)) {
if (v1[0] == 0) {
Heap_FreeToHeap(v0);
return 1;
}
} else if (Item_GetAttributeFromStruct(v0, 38) != 0) {
} else if (Item_Get(v0, 38) != 0) {
if ((v1[0] != 0) && (v1[0] < GetMonData(param0, MON_DATA_164, NULL))) {
Heap_FreeToHeap(v0);
return 1;
}
}
if (Item_GetAttributeFromStruct(v0, 25) != 0) {
if (Item_Get(v0, 25) != 0) {
if (GetMonData(param0, MON_DATA_161, NULL) < 100) {
Heap_FreeToHeap(v0);
return 1;
}
}
if (Item_GetAttributeFromStruct(v0, 26) != 0) {
if (Item_Get(v0, 26) != 0) {
if (sub_02076B94(NULL, param0, 3, param1, NULL) != 0) {
Heap_FreeToHeap(v0);
return 1;
}
}
if ((Item_GetAttributeFromStruct(v0, 34) != 0) || (Item_GetAttributeFromStruct(v0, 35) != 0)) {
if ((Item_Get(v0, 34) != 0) || (Item_Get(v0, 35) != 0)) {
if ((GetMonData(param0, MON_DATA_62 + param2, NULL) < 3) && (MoveTable_CalcMaxPP(GetMonData(param0, MON_DATA_MOVE1 + param2, NULL), 0) >= 5)) {
Heap_FreeToHeap(v0);
return 1;
}
}
if (Item_GetAttributeFromStruct(v0, 36) != 0) {
if (Item_Get(v0, 36) != 0) {
if (sub_02096F34(param0, param2) == 1) {
Heap_FreeToHeap(v0);
return 1;
}
}
if (Item_GetAttributeFromStruct(v0, 37) != 0) {
if (Item_Get(v0, 37) != 0) {
for (v1[0] = 0; v1[0] < 4; v1[0]++) {
if (sub_02096F34(param0, v1[0]) == 1) {
Heap_FreeToHeap(v0);
@@ -127,8 +127,8 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
v1[5] = GetMonData(param0, MON_DATA_SPDEF_EV, NULL);
if (GetMonData(param0, MON_DATA_SPECIES, NULL) != 292) {
if (Item_GetAttributeFromStruct(v0, 39) != 0) {
v1[6] = Item_GetAttributeFromStruct(v0, 48);
if (Item_Get(v0, 39) != 0) {
v1[6] = Item_Get(v0, 48);
if (v1[6] > 0) {
if ((v1[0] < 100) && ((v1[0] + v1[1] + v1[2] + v1[3] + v1[4] + v1[5]) < 510)) {
@@ -149,8 +149,8 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
}
}
if (Item_GetAttributeFromStruct(v0, 40) != 0) {
v1[6] = Item_GetAttributeFromStruct(v0, 49);
if (Item_Get(v0, 40) != 0) {
v1[6] = Item_Get(v0, 49);
if (v1[6] > 0) {
if ((v1[1] < 100) && ((v1[0] + v1[1] + v1[2] + v1[3] + v1[4] + v1[5]) < 510)) {
@@ -170,8 +170,8 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
}
}
if (Item_GetAttributeFromStruct(v0, 41) != 0) {
v1[6] = Item_GetAttributeFromStruct(v0, 50);
if (Item_Get(v0, 41) != 0) {
v1[6] = Item_Get(v0, 50);
if (v1[6] > 0) {
if ((v1[2] < 100) && ((v1[0] + v1[1] + v1[2] + v1[3] + v1[4] + v1[5]) < 510)) {
@@ -191,8 +191,8 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
}
}
if (Item_GetAttributeFromStruct(v0, 42) != 0) {
v1[6] = Item_GetAttributeFromStruct(v0, 51);
if (Item_Get(v0, 42) != 0) {
v1[6] = Item_Get(v0, 51);
if (v1[6] > 0) {
if ((v1[3] < 100) && ((v1[0] + v1[1] + v1[2] + v1[3] + v1[4] + v1[5]) < 510)) {
@@ -212,8 +212,8 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
}
}
if (Item_GetAttributeFromStruct(v0, 43) != 0) {
v1[6] = Item_GetAttributeFromStruct(v0, 52);
if (Item_Get(v0, 43) != 0) {
v1[6] = Item_Get(v0, 52);
if (v1[6] > 0) {
if ((v1[4] < 100) && ((v1[0] + v1[1] + v1[2] + v1[3] + v1[4] + v1[5]) < 510)) {
@@ -233,8 +233,8 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
}
}
if (Item_GetAttributeFromStruct(v0, 44) != 0) {
v1[6] = Item_GetAttributeFromStruct(v0, 53);
if (Item_Get(v0, 44) != 0) {
v1[6] = Item_Get(v0, 53);
if (v1[6] > 0) {
if ((v1[5] < 100) && ((v1[0] + v1[1] + v1[2] + v1[3] + v1[4] + v1[5]) < 510)) {
@@ -272,9 +272,9 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
u8 v2;
u8 v3;
v0 = Item_LoadDataOrGFX(param1, 0, param4);
v0 = Item_Load(param1, 0, param4);
if (Item_GetAttributeFromStruct(v0, 14) != 1) {
if (Item_Get(v0, 14) != 1) {
Heap_FreeToHeap(v0);
return 0;
}
@@ -285,27 +285,27 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
v1[0] = GetMonData(param0, MON_DATA_160, NULL);
v1[1] = v1[0];
if (Item_GetAttributeFromStruct(v0, 15) != 0) {
if (Item_Get(v0, 15) != 0) {
v1[1] &= (0x7 ^ 0xffffffff);
v3 = 1;
}
if (Item_GetAttributeFromStruct(v0, 16) != 0) {
if (Item_Get(v0, 16) != 0) {
v1[1] &= ((0x8 | 0x80 | 0xf00) ^ 0xffffffff);
v3 = 1;
}
if (Item_GetAttributeFromStruct(v0, 17) != 0) {
if (Item_Get(v0, 17) != 0) {
v1[1] &= (0x10 ^ 0xffffffff);
v3 = 1;
}
if (Item_GetAttributeFromStruct(v0, 18) != 0) {
if (Item_Get(v0, 18) != 0) {
v1[1] &= (0x20 ^ 0xffffffff);
v3 = 1;
}
if (Item_GetAttributeFromStruct(v0, 19) != 0) {
if (Item_Get(v0, 19) != 0) {
v1[1] &= (0x40 ^ 0xffffffff);
v3 = 1;
}
@@ -318,16 +318,16 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
v1[0] = GetMonData(param0, MON_DATA_163, NULL);
v1[1] = GetMonData(param0, MON_DATA_164, NULL);
if (((Item_GetAttributeFromStruct(v0, 23) != 0) || (Item_GetAttributeFromStruct(v0, 24) != 0)) && (Item_GetAttributeFromStruct(v0, 25) != 0)) {
if (((Item_Get(v0, 23) != 0) || (Item_Get(v0, 24) != 0)) && (Item_Get(v0, 25) != 0)) {
if (v1[0] == 0) {
sub_020970AC(param0, v1[0], v1[1], Item_GetAttributeFromStruct(v0, 54));
sub_020970AC(param0, v1[0], v1[1], Item_Get(v0, 54));
v2 = 1;
}
v3 = 1;
} else if (Item_GetAttributeFromStruct(v0, 38) != 0) {
} else if (Item_Get(v0, 38) != 0) {
if (v1[0] < v1[1]) {
sub_020970AC(param0, v1[0], v1[1], Item_GetAttributeFromStruct(v0, 54));
sub_020970AC(param0, v1[0], v1[1], Item_Get(v0, 54));
v2 = 1;
}
@@ -336,7 +336,7 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
v1[2] = GetMonData(param0, MON_DATA_161, NULL);
if (Item_GetAttributeFromStruct(v0, 25) != 0) {
if (Item_Get(v0, 25) != 0) {
if (v1[2] < 100) {
sub_0207536C(param0, MON_DATA_EXP, sub_02075A70(param0));
sub_0207418C(param0);
@@ -352,17 +352,17 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
v3 = 1;
}
if (Item_GetAttributeFromStruct(v0, 26) != 0) {
if (Item_Get(v0, 26) != 0) {
v3 = 1;
}
if (Item_GetAttributeFromStruct(v0, 34) != 0) {
if (Item_Get(v0, 34) != 0) {
if (sub_02097004(param0, param2, 1) == 1) {
v2 = 1;
}
v3 = 1;
} else if (Item_GetAttributeFromStruct(v0, 35) != 0) {
} else if (Item_Get(v0, 35) != 0) {
if (sub_02097004(param0, param2, 3) == 1) {
v2 = 1;
}
@@ -370,15 +370,15 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
v3 = 1;
}
if (Item_GetAttributeFromStruct(v0, 36) != 0) {
if (sub_02096F84(param0, param2, Item_GetAttributeFromStruct(v0, 55)) == 1) {
if (Item_Get(v0, 36) != 0) {
if (sub_02096F84(param0, param2, Item_Get(v0, 55)) == 1) {
v2 = 1;
}
v3 = 1;
} else if (Item_GetAttributeFromStruct(v0, 37) != 0) {
} else if (Item_Get(v0, 37) != 0) {
for (v1[0] = 0; v1[0] < 4; v1[0]++) {
if (sub_02096F84(param0, v1[0], Item_GetAttributeFromStruct(v0, 55)) == 1) {
if (sub_02096F84(param0, v1[0], Item_Get(v0, 55)) == 1) {
v2 = 1;
}
}
@@ -394,8 +394,8 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
v1[5] = GetMonData(param0, MON_DATA_SPDEF_EV, NULL);
if (GetMonData(param0, MON_DATA_SPECIES, NULL) != 292) {
if (Item_GetAttributeFromStruct(v0, 39) != 0) {
v1[7] = Item_GetAttributeFromStruct(v0, 48);
if (Item_Get(v0, 39) != 0) {
v1[7] = Item_Get(v0, 48);
v1[6] = sub_020970EC(v1[0], (v1[1] + v1[2] + v1[3] + v1[4] + v1[5]), v1[7]);
if (v1[6] != -1) {
@@ -411,8 +411,8 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
}
}
if (Item_GetAttributeFromStruct(v0, 40) != 0) {
v1[7] = Item_GetAttributeFromStruct(v0, 49);
if (Item_Get(v0, 40) != 0) {
v1[7] = Item_Get(v0, 49);
v1[6] = sub_020970EC(v1[1], (v1[0] + v1[2] + v1[3] + v1[4] + v1[5]), v1[7]);
if (v1[6] != -1) {
@@ -427,8 +427,8 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
}
}
if (Item_GetAttributeFromStruct(v0, 41) != 0) {
v1[7] = Item_GetAttributeFromStruct(v0, 50);
if (Item_Get(v0, 41) != 0) {
v1[7] = Item_Get(v0, 50);
v1[6] = sub_020970EC(v1[2], (v1[0] + v1[1] + v1[3] + v1[4] + v1[5]), v1[7]);
if (v1[6] != -1) {
@@ -443,8 +443,8 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
}
}
if (Item_GetAttributeFromStruct(v0, 42) != 0) {
v1[7] = Item_GetAttributeFromStruct(v0, 51);
if (Item_Get(v0, 42) != 0) {
v1[7] = Item_Get(v0, 51);
v1[6] = sub_020970EC(v1[3], (v1[0] + v1[1] + v1[2] + v1[4] + v1[5]), v1[7]);
if (v1[6] != -1) {
@@ -459,8 +459,8 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
}
}
if (Item_GetAttributeFromStruct(v0, 43) != 0) {
v1[7] = Item_GetAttributeFromStruct(v0, 52);
if (Item_Get(v0, 43) != 0) {
v1[7] = Item_Get(v0, 52);
v1[6] = sub_020970EC(v1[4], (v1[0] + v1[1] + v1[2] + v1[3] + v1[5]), v1[7]);
if (v1[6] != -1) {
@@ -475,8 +475,8 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
}
}
if (Item_GetAttributeFromStruct(v0, 44) != 0) {
v1[7] = Item_GetAttributeFromStruct(v0, 53);
if (Item_Get(v0, 44) != 0) {
v1[7] = Item_Get(v0, 53);
v1[6] = sub_020970EC(v1[5], (v1[0] + v1[1] + v1[2] + v1[3] + v1[4]), v1[7]);
if (v1[6] != -1) {
@@ -499,22 +499,22 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
v1[0] = GetMonData(param0, MON_DATA_FRIENDSHIP, NULL);
if (v1[0] < 100) {
if (Item_GetAttributeFromStruct(v0, 45) != 0) {
if (sub_020971D0(param0, v1[0], Item_GetAttributeFromStruct(v0, 56), param3, param4) == 0) {
if (Item_Get(v0, 45) != 0) {
if (sub_020971D0(param0, v1[0], Item_Get(v0, 56), param3, param4) == 0) {
Heap_FreeToHeap(v0);
return v2;
}
}
} else if ((v1[0] >= 100) && (v1[0] < 200)) {
if (Item_GetAttributeFromStruct(v0, 46) != 0) {
if (sub_020971D0(param0, v1[0], Item_GetAttributeFromStruct(v0, 57), param3, param4) == 0) {
if (Item_Get(v0, 46) != 0) {
if (sub_020971D0(param0, v1[0], Item_Get(v0, 57), param3, param4) == 0) {
Heap_FreeToHeap(v0);
return v2;
}
}
} else if ((v1[0] >= 200) && (v1[0] <= 255)) {
if (Item_GetAttributeFromStruct(v0, 47) != 0) {
if (sub_020971D0(param0, v1[0], Item_GetAttributeFromStruct(v0, 58), param3, param4) == 0) {
if (Item_Get(v0, 47) != 0) {
if (sub_020971D0(param0, v1[0], Item_Get(v0, 58), param3, param4) == 0) {
Heap_FreeToHeap(v0);
return v2;
}
@@ -685,24 +685,24 @@ static u8 sub_02097144 (Pokemon * param0, ItemData * param1)
}
if (v0 < 100) {
if (Item_GetAttributeFromStruct(param1, 45) != 0) {
if (Item_GetAttributeFromStruct(param1, 56) > 0) {
if (Item_Get(param1, 45) != 0) {
if (Item_Get(param1, 56) > 0) {
return 1;
}
}
return 0;
} else if ((v0 >= 100) && (v0 < 200)) {
if (Item_GetAttributeFromStruct(param1, 46) != 0) {
if (Item_GetAttributeFromStruct(param1, 57) > 0) {
if (Item_Get(param1, 46) != 0) {
if (Item_Get(param1, 57) > 0) {
return 1;
}
}
return 0;
} else if ((v0 >= 200) && (v0 < 255)) {
if (Item_GetAttributeFromStruct(param1, 47) != 0) {
if (Item_GetAttributeFromStruct(param1, 58) > 0) {
if (Item_Get(param1, 47) != 0) {
if (Item_Get(param1, 58) > 0) {
return 1;
}
}
@@ -724,7 +724,7 @@ static u8 sub_020971D0 (Pokemon * param0, s32 param1, s32 param2, u16 param3, u3
}
if (param2 > 0) {
if (Item_GetAttribute(GetMonData(param0, MON_DATA_HELD_ITEM, NULL), 1, param4) == 53) {
if (Item_LoadParam(GetMonData(param0, MON_DATA_HELD_ITEM, NULL), 1, param4) == 53) {
param2 = param2 * 150 / 100;
}

2
src/unk_02097624.c
View File

@@ -208,7 +208,7 @@ int sub_020977E4 (UnkStruct_02028430 * param0, u16 param1, Pokemon * param2, int
return 0xFFFFFFFF;
}
v0 = sub_0207D310(sub_02028314(v1));
v0 = Item_ForMailNumber(sub_02028314(v1));
sub_02074B30(param2, 170, v1);
sub_02074B30(param2, 6, &v0);