diff options
| author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-05-23 06:47:12 +0200 |
|---|---|---|
| committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-05-23 06:47:12 +0200 |
| commit | 4ea5a0c4aa1605f625d860f55894ac656bdcbd49 (patch) | |
| tree | c7f40d9e03335c1b29980a8b79bf2ddb51764a5f /arm9/src/scrcmd.c | |
| parent | 412bd487ed5513e52ad47f6eb3709b4d1aab1353 (diff) | |
| parent | 121208bd6db271ae766a614da82fa00498bb7856 (diff) | |
Merge branch 'master' into unk_02016B94
Diffstat (limited to 'arm9/src/scrcmd.c')
| -rw-r--r-- | arm9/src/scrcmd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index 9ef7c10d..75ddbc8e 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -33,9 +33,9 @@ extern u32 FUN_02058510(u32 param0, u32 param1); extern void MOD05_021E8128(u32 param0, u8 type, u16 map); extern void MOD05_021E8130(u32 param0, u32 param1); extern void MOD05_021E8158(struct UnkSavStruct80 *unk80); -extern u32 MOD05_021E8140(u32 param0); +extern struct Window * MOD05_021E8140(u32 param0); extern BOOL MOD05_021E8148(u32 param0); -extern u8 FUN_02054658(u32 param0, struct String *str, struct Options *opt, u32 param3); +extern u8 FUN_02054658(struct Window * param0, struct String *str, struct Options *opt, u32 param3); extern void MOD05_021E8144(u32 param0); extern void FUN_0200CB00(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5); extern u32 Std_CreateYesNoMenu(u32 param0, u8 **param1, u32 param2, u32 param3, u32 param4); @@ -892,7 +892,7 @@ THUMB_FUNC BOOL ScrCmd_CreateMessageBox(struct ScriptContext* ctx) MOD05_021E8158(unk80); ReadMsgDataIntoString(ctx->msgData, msg, *unk1); StringExpandPlaceholders(*unk3, *unk2, *unk1); - AddTextPrinterParameterized(MOD05_021E8140(unk80->unk60), 1, (u16 *)*unk2, 0, 0, 0, NULL); + AddTextPrinterParameterized(MOD05_021E8140(unk80->unk60), 1, *unk2, 0, 0, 0, NULL); return TRUE; } |