diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-02-05 17:38:23 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-02-05 17:38:23 -0600 |
| commit | 607cba8c2e5253874f378cd6280fd066b0c9fa3d (patch) | |
| tree | 8894b0b686adc29286d078500932306fabbc2973 /src/diploma.c | |
| parent | 663ecd00145da49fda7d2509d629d737ea633cd8 (diff) | |
| parent | eb6aed50e56f36ce416f7ecc8edfacea1da61bf1 (diff) | |
Merge branch 'master' into battle_refactor
Diffstat (limited to 'src/diploma.c')
| -rw-r--r-- | src/diploma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/diploma.c b/src/diploma.c index fedc10bd0..89447c5ba 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -3,7 +3,7 @@ #include "palette.h" #include "main.h" #include "gpu_regs.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "task.h" #include "malloc.h" #include "decompress.h" @@ -17,7 +17,7 @@ extern int decompress_and_copy_tile_data_to_vram(u8 bg_id, void *src, int size, extern bool8 free_temp_tile_data_buffers_if_possible(void); extern void sub_80861E8(void); // rom4 extern bool16 sub_80C0944(void); -extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, u8 *str); +extern void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, u8 *str); extern u16 gUnknown_0860F074[]; @@ -215,5 +215,5 @@ static void PrintDiplomaText(u8 *text, u8 var1, u8 var2) .shadowColor = 3, }; - AddTextPrinterParametrized2(0, 1, var1, var2, 0, 0, &color, -1, text); + AddTextPrinterParameterized2(0, 1, var1, var2, 0, 0, &color, -1, text); } |