diff options
| author | KDSKardabox <bollygame94@gmail.com> | 2018-02-13 10:02:27 +0530 |
|---|---|---|
| committer | KDSKardabox <bollygame94@gmail.com> | 2018-02-13 10:02:27 +0530 |
| commit | aaea65c37bb6dbe04de602492f6e175cabc87f22 (patch) | |
| tree | dca7115e05ed132733c1e5ea0b4a3322a2d41e9a /src/item_use.c | |
| parent | ae321d6e7c99b557cafd594eb945e7ca1a566ba8 (diff) | |
| parent | 398e775d906ff4f1e5aaad3d8a9eee530c7b122d (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
# Conflicts:
# include/strings.h
Diffstat (limited to 'src/item_use.c')
| -rwxr-xr-x | src/item_use.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/item_use.c b/src/item_use.c index bcd453660..2e47e6f14 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -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); |