pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from pixel-stuck/master

Browse Source 
match func_800E97E4 and tidy up find_item
This commit is contained in:
Ethan Roseman 2020-08-09 01:26:55 -04:00 committed by GitHub
commit 8e5378cbb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
papermario/src/code_80850_len_3060.c
View File

@ -153,18 +153,18 @@ s32 find_item(s32 itemID) {
}
return i;
} else {
for(i = 0; i < ARRAY_COUNT(playerData->invItems); i++) {
if (playerData->invItems[i] == itemID)
break;
}
}
if (i == ARRAY_COUNT(playerData->invItems)) {
return -1;
}
return i;
}
for(i = 0; i < ARRAY_COUNT(playerData->invItems); i++) {
if (playerData->invItems[i] == itemID)
break;
}
if (i == ARRAY_COUNT(playerData->invItems)) {
return -1;
}
return i;
}
INCLUDE_ASM(code_80850_len_3060, sort_items);
@ -285,17 +285,16 @@ void func_800E97B8(void) {
}
}
INCLUDE_ASM(code_80850_len_3060, func_800E97E4);
/*void func_800E97E4(void) {
void func_800E97E4(void) {
ui_status* uiStatus = &gUIStatus;
uiStatus->showTimer = -100;
uiStatus->drawPosY = -100;
uiStatus->ignoreChanges = 0;
uiStatus->drawPosY = 0;
uiStatus->showTimer = 0;
uiStatus->hidden = 1;
uiStatus->unk_3B = 0;
uiStatus->unk_3C = 0;
}*/
}
void func_800E9810(void) {
ui_status* uiStatus = &gUIStatus;