diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-22 10:37:04 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-22 10:37:04 -0400 |
| commit | de6f8fc978e5297d3f425d2d6c8517e9bb8e75ff (patch) | |
| tree | 9a4e1be7cbadd711196e5efa1fafb9bfd2bba843 /include/script_buffers.h | |
| parent | 616cd9b1c1cf789ae990d4236085d1a6748d3850 (diff) | |
Merge conflicting prototypes
Diffstat (limited to 'include/script_buffers.h')
| -rw-r--r-- | include/script_buffers.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/script_buffers.h b/include/script_buffers.h index d0fff528..51a02e43 100644 --- a/include/script_buffers.h +++ b/include/script_buffers.h @@ -4,6 +4,7 @@ #include "pokemon.h" #include "pokemon_storage_system.h" #include "trainer_data.h" +#include "window.h" struct UnkStruct_0200AA80_sub_sub { @@ -105,7 +106,7 @@ void StringExpandPlaceholders(struct ScrStrBufs * mgr, struct String * dest, str void ScrStrBufs_ResetBuffers(struct ScrStrBufs * mgr); struct UnkStruct_0200B870 * MessagePrinter_new(u32 r5, u32 r6, u32 sp4, u32 r4); void MessagePrinter_delete(struct UnkStruct_0200B870 * a0); -void FUN_0200B9A8(struct UnkStruct_0200B870 * a0, int a1, int a2, int a3, int a4); -void FUN_0200B9EC(struct UnkStruct_0200B870 * string, u32 value, u32 n, enum PrintingMode mode, int sp30, int r5, int r7); +void FUN_0200B9A8(struct UnkStruct_0200B870 * a0, int a1, struct Window * a2, int a3, int a4); +void FUN_0200B9EC(struct UnkStruct_0200B870 * string, u32 value, u32 n, enum PrintingMode mode, struct Window *window, int x, int y); #endif //POKEDIAMOND_SCRIPT_BUFFERS_H |