Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-09-09 01:25:58 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

match ConvertMoneyItemToMoney

Browse Source
This commit is contained in:
DizzyEggg
2024-10-17 13:18:17 +02:00
parent f33e62f668
commit 54fdf25a43
1 changed files with 53 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
src/items.c
View File

@@ -578,55 +578,39 @@ bool8 AddItemToInventory(const Item* slot)
void ConvertMoneyItemToMoney(void)
{
s32 i = 0;
s32 i, j;
do {
UNUSED TeamInventory * _gTeamInventoryRef = gTeamInventoryRef;
UNUSED size_t offs = offsetof(TeamInventory, teamItems[i]);
Item* current_slot = &gTeamInventoryRef->teamItems[i];
if ((current_slot->flags & ITEM_FLAG_EXISTS) && (current_slot->id == ITEM_POKE)) {
u32 result;
result = GetMoneyValue(current_slot);
AddToTeamMoney(result);
current_slot->id = ITEM_NOTHING;
current_slot->quantity = 0;
current_slot->flags = 0;
}
} while (++i < INVENTORY_SIZE);
FillInventoryGaps();
i = 0;
do {
s32 lowest_index = -1;
UNUSED size_t offs = offsetof(TeamInventory, teamItems[i]);
bool8 item_occupied = i[gTeamInventoryRef->teamItems].flags & ITEM_FLAG_EXISTS;
s32 next = i + 1;
if (item_occupied) {
s32 lowest_order = GetItemOrder(gTeamInventoryRef->teamItems[i].id);
s32 j;
// find next lowest
for (j = next; j < INVENTORY_SIZE; j++) {
UNUSED size_t offs = offsetof(TeamInventory, teamItems[j]);
if ((j[gTeamInventoryRef->teamItems].flags & ITEM_FLAG_EXISTS) && (lowest_order > GetItemOrder(gTeamInventoryRef->teamItems[j].id))) {
lowest_index = j;
lowest_order = GetItemOrder(gTeamInventoryRef->teamItems[j].id);
for (i = 0; i < INVENTORY_SIZE; i++) {
Item *item = &gTeamInventoryRef->teamItems[i];
if (ItemExists(item) && item->id == ITEM_POKE) {
AddToTeamMoney(GetMoneyValue(item));
ZeroOutItem(item);
}
}
if (lowest_index >= 0) {
// swap the slots
Item current = gTeamInventoryRef->teamItems[i];
gTeamInventoryRef->teamItems[i] = gTeamInventoryRef->teamItems[lowest_index];
gTeamInventoryRef->teamItems[lowest_index] = current;
}
}
} while (++i < INVENTORY_SIZE);
FillInventoryGaps();
FillInventoryGaps();
for (i = 0; i < INVENTORY_SIZE; i++) {
s32 lowestIndex = -1;
if (ItemExists(&gTeamInventoryRef->teamItems[i])) {
s32 lowestOrder = GetItemOrder(gTeamInventoryRef->teamItems[i].id);
for (j = i + 1; j < INVENTORY_SIZE; j++) {
if (ItemExists(&gTeamInventoryRef->teamItems[j]) && lowestOrder > GetItemOrder(gTeamInventoryRef->teamItems[j].id)) {
lowestIndex = j;
lowestOrder = GetItemOrder(gTeamInventoryRef->teamItems[j].id);
}
}
if (lowestIndex >= 0) {
// swap the slots
Item temp = gTeamInventoryRef->teamItems[i];
gTeamInventoryRef->teamItems[i] = gTeamInventoryRef->teamItems[lowestIndex];
gTeamInventoryRef->teamItems[lowestIndex] = temp;
}
}
}
FillInventoryGaps();
}
void AddToTeamMoney(s32 amount)
@@ -1430,42 +1414,32 @@ s32 sub_8091E94(s32 a1, s32 a2, s32 a3)
#endif
}
void ClearAllItems_8091FB4() {
s32 i;
void ClearAllItems_8091FB4(void)
{
s32 i;
for (i = 0; i < INVENTORY_SIZE; i++) {
Item* slot = &gTeamInventoryRef->teamItems[i];
if (slot->flags & ITEM_FLAG_EXISTS) {
slot->flags &= 0xf7;
if (slot->id == ITEM_POKE) {
AddToTeamMoney(GetMoneyValue(slot));
slot->id = ITEM_NOTHING;
slot->quantity = 0;
slot->flags = 0;
}
}
}
FillInventoryGaps();
for (i = 0; i < NUM_MONSTERS; i++) {
PokemonStruct1* pokemon;
#ifdef NONMATCHING
pokemon = &i[gRecruitedPokemonRef->pokemon];
#else
register size_t offset asm("r1") = offsetof(unkStruct_203B45C, pokemon[i]);
PokemonStruct1* p = gRecruitedPokemonRef->pokemon;
size_t addr = offset + (size_t)p;
pokemon = (PokemonStruct1*)addr;
#endif
if ((u8)pokemon->unk0 & 1) {
if (pokemon->heldItem.id) {
if (pokemon->heldItem.id == ITEM_POKE) {
AddToTeamMoney(GetMoneyValueHeld(&pokemon->heldItem));
pokemon->heldItem.id = ITEM_NOTHING;
for (i = 0; i < INVENTORY_SIZE; i++) {
Item* slot = &gTeamInventoryRef->teamItems[i];
if (ItemExists(slot)) {
slot->flags &= ~(ITEM_FLAG_STICKY);
if (slot->id == ITEM_POKE) {
AddToTeamMoney(GetMoneyValue(slot));
ZeroOutItem(slot);
}
}
}
FillInventoryGaps();
for (i = 0; i < NUM_MONSTERS; i++) {
if (PokemonFlag1(&gRecruitedPokemonRef->pokemon[i])) {
PokemonStruct1 *pokemon = &gRecruitedPokemonRef->pokemon[i];
if (pokemon->heldItem.id) {
if (pokemon->heldItem.id == ITEM_POKE) {
AddToTeamMoney(GetMoneyValueHeld(&pokemon->heldItem));
pokemon->heldItem.id = ITEM_NOTHING;
}
}
}
}
}
}
}
bool8 IsInvalidItemReward(u8 itemID)