Merge branch 'master' of https://github.com/pret/pokeemerald
# Conflicts: # include/strings.h
This commit is contained in:
commit
aaea65c37b
27 files changed
+2535
-6615
No files matched your search
Executable
+2448
File diff suppressed because it is too large.
Load diff
+1
-1
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user