diff options
author | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:23:19 -0400 |
---|---|---|
committer | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:23:19 -0400 |
commit | 1ca1651cdcdfc2ca2f8c9214c88fd23b5196f85e (patch) | |
tree | a6c9f2edfb0f5c380cc35175024d18bd77ea243a /include/money.h | |
parent | 7c32f9d05f06303f5350eb079960e0d4fab40dcd (diff) | |
parent | d7a6ff0e4dab0c96ac49975a0695014bff2b9654 (diff) |
attempting to resolve conflict
Diffstat (limited to 'include/money.h')
-rw-r--r-- | include/money.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/money.h b/include/money.h index 49015ee19..06ac00e92 100644 --- a/include/money.h +++ b/include/money.h @@ -7,7 +7,7 @@ void sub_80B79E0(u32 *, u32); void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2); void sub_80B7A94(u32 arg0, u8 arg1, u8 x, u8 y); void sub_80B7AEC(u32, u8 left, u8 top); -void sub_80B7B34(void); +void sub_80B7B34(u8, u8, int); void sub_80B7BEC(u32, u8, u8); void sub_80B7C14(u32, u8, u8); void RemoveMoneyLabelObject(u8, u8); |