diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-23 16:45:58 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-23 16:45:58 -0400 |
| commit | 45561e5267602adc91847a3de3378e29a215e697 (patch) | |
| tree | 90cefd995fafa90ebd20f85014768b5dfea7cb8c /arm9/src/script_buffers.c | |
| parent | 57b9d8fd35548901ccd4ffcdfa7bca7140065036 (diff) | |
| parent | 8ffb7a0c637d74d2140fefc7e20e10288b43e286 (diff) | |
Merge remote-tracking branch 'origin/master' into pikalax_work
Diffstat (limited to 'arm9/src/script_buffers.c')
| -rw-r--r-- | arm9/src/script_buffers.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arm9/src/script_buffers.c b/arm9/src/script_buffers.c index 939781f4..596056b1 100644 --- a/arm9/src/script_buffers.c +++ b/arm9/src/script_buffers.c @@ -12,7 +12,6 @@ #include "trainer_data.h" #include "script_buffers.h" #include "unk_02024E64.h" -#include "window.h" #include "text.h" #pragma thumb on @@ -803,7 +802,7 @@ void MessagePrinter_delete(struct UnkStruct_0200B870 * a0) } } -void FUN_0200B9A8(struct UnkStruct_0200B870 * a0, int a1, struct Window * a2, int a3, int a4) +void FUN_0200B9A8(struct UnkStruct_0200B870 * a0, int a1, struct Window *a2, int a3, int a4) { BlitBitmapRectToWindow(a2, a0->unk_4->unk_14 + UNK_020ECE6C[a1][0], 0, 0, UNK_020ECE6C[a1][1], 8, (u16)a3, (u16)a4, UNK_020ECE6C[a1][1], 8); } |