dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald

Browse Source 
# Conflicts:
#	include/strings.h
This commit is contained in:
KDSKardabox
2018-02-13 10:02:27 +05:30
parent ae321d6e7c 398e775d90
commit aaea65c37b
27 changed files with 2535 additions and 6615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2448
src/item_menu.c Executable file
View File

File diff suppressed because it is too large Load Diff

2
src/item_use.c
View File

@@ -113,7 +113,7 @@ void sub_80FE024(u8 taskId);
void sub_80FE124(u8 taskId);
void sub_80FE164(u8 taskId);
void DisplayItemMessage(u8 taskId, u8 a, u8* str, void(*callback)(u8 taskId));
void DisplayItemMessage(u8 taskId, u8 a, const u8* str, void(*callback)(u8 taskId));
void DisplayItemMessageInBattlePyramid(u8 taskId, u8* str, void(*callback)(u8 taskId));
void DisplayItemMessageOnField(u8 taskId, u8* str, void(*callback)(u8 taskId));
void sub_81C6714(u8 taskId);