diff options
author | red031000 <rubenru09@aol.com> | 2020-06-23 23:18:29 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-23 23:18:29 +0100 |
commit | c82f923bb095740ec58c389deb08083dbeddc769 (patch) | |
tree | 88f3668e52db0815504875cb1d08e78ef902a03b /include/proto.h | |
parent | 64595272f97d0ada42b69e442c7f52766ed60d63 (diff) | |
parent | 291f2d27d36b5c437c6c1908d5217bb954799402 (diff) |
Merge branch 'master' into master
Diffstat (limited to 'include/proto.h')
-rw-r--r-- | include/proto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/proto.h b/include/proto.h index 4a0012d3..bcb95ee0 100644 --- a/include/proto.h +++ b/include/proto.h @@ -10,7 +10,7 @@ void StringCopy(u16 * dest, struct String * src); void String_dtor(void * ptr); void FUN_02021E28(u16 * dest, u16 * src); void FUN_02021EF0(const struct String * src, u16 * dest, u32 count); -u32 FUN_0206E7B8(u16 item, u32 a1, u32 a2); +u32 GetItemAttr(u16 item, u32 a1, u32 a2); int FUN_02014C3C(u8); void FUN_02014C54(int, int, struct UnkStruct_02069038 *, u8); u32 IsNighttime(void); // is day or night |