ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-30 01:09:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1814 from AsparagusEduardo/pret/pr/storageDoc

Browse Source 
Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System
This commit is contained in:
GriffinR 2022-11-06 23:35:53 -05:00 committed by GitHub
commit 0a6de12b5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pokemon_storage_system.c
View File

@ -8825,12 +8825,12 @@ static void TakeItemFromMon(u8 cursorArea, u8 cursorPos)
if (cursorArea == CURSOR_AREA_IN_BOX) if (cursorArea == CURSOR_AREA_IN_BOX)
{ {
SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &itemId); SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &itemId);
SetBoxMonIconObjMode(cursorPos, 1); SetBoxMonIconObjMode(cursorPos, ST_OAM_OBJ_BLEND);
} }
else else
{ {
SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &itemId); SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &itemId);
SetPartyMonIconObjMode(cursorPos, 1); SetPartyMonIconObjMode(cursorPos, ST_OAM_OBJ_BLEND);
} }
sStorage->movingItemId = sStorage->displayMonItemId; sStorage->movingItemId = sStorage->displayMonItemId;
@ -8891,12 +8891,12 @@ static void GiveItemToMon(u8 cursorArea, u8 cursorPos)
if (cursorArea == CURSOR_AREA_IN_BOX) if (cursorArea == CURSOR_AREA_IN_BOX)
{ {
SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &sStorage->movingItemId); SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &sStorage->movingItemId);
SetBoxMonIconObjMode(cursorPos, 0); SetBoxMonIconObjMode(cursorPos, ST_OAM_OBJ_NORMAL);
} }
else else
{ {
SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &sStorage->movingItemId); SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &sStorage->movingItemId);
SetPartyMonIconObjMode(cursorPos, 0); SetPartyMonIconObjMode(cursorPos, ST_OAM_OBJ_NORMAL);
} }
} }
@ -8915,12 +8915,12 @@ static void MoveItemFromMonToBag(u8 cursorArea, u8 cursorPos)
if (cursorArea == CURSOR_AREA_IN_BOX) if (cursorArea == CURSOR_AREA_IN_BOX)
{ {
SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &itemId); SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &itemId);
SetBoxMonIconObjMode(cursorPos, 1); SetBoxMonIconObjMode(cursorPos, ST_OAM_OBJ_BLEND);
} }
else else
{ {
SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &itemId); SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &itemId);
SetPartyMonIconObjMode(cursorPos, 1); SetPartyMonIconObjMode(cursorPos, ST_OAM_OBJ_BLEND);
} }
} }