From 1641041becc8aee9b1f1c7e192b0c569c69e8dff Mon Sep 17 00:00:00 2001 From: Akashi Akira Date: Wed, 17 May 2023 04:27:24 +0100 Subject: [PATCH] SCRIPTENV_WAITING_ICON --- arm9/src/scrcmd.c | 4 ++-- include/render_window.h | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index f45531c9e..39b8f3c44 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -1150,14 +1150,14 @@ THUMB_FUNC static BOOL FUN_0203AB00(struct ScriptContext *ctx) THUMB_FUNC BOOL ScrCmd_ShowWaitingIcon(struct ScriptContext *ctx) { //018D struct Window *window = (struct Window *)FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_WINDOW); - WaitingIcon **waitingIcon = FieldSysGetAttrAddr(ctx->fieldSystem, 18); + WaitingIcon **waitingIcon = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_WAITING_ICON); *waitingIcon = WaitingIcon_new(window, 994); return FALSE; } THUMB_FUNC BOOL ScrCmd_HideWaitingIcon(struct ScriptContext *ctx) //018E { - WaitingIcon **waitingIcon = FieldSysGetAttrAddr(ctx->fieldSystem, 18); + WaitingIcon **waitingIcon = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_WAITING_ICON); FUN_0200DBFC(*waitingIcon); return FALSE; } diff --git a/include/render_window.h b/include/render_window.h index 9181a20ed..8f55c6c8d 100644 --- a/include/render_window.h +++ b/include/render_window.h @@ -81,8 +81,7 @@ void BlitRect4Bit(u8 *srcPixels, u16 width, u16 height); void FUN_0200D18C(struct Window *window, u16 fill_value); -void FUN_0200D274( - struct BgConfig *bg_config, u8 bg_id, u16 param2, u8 param3, u8 param4, u32 heap_id); +void FUN_0200D274(struct BgConfig *bg_config, u8 bg_id, u16 param2, u8 param3, u8 param4, u32 heap_id); //todo: LoadUserFrameGfx1? void FUN_0200D300(struct BgConfig *bg_config, u8 bg_id, u16 numtiles, @@ -90,8 +89,7 @@ void FUN_0200D300(struct BgConfig *bg_config, u8 param4, u16 param5, u32 heap_id); -void FUN_0200D378( - struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 param3, u16 param4, u32 heap_id); +void FUN_0200D378(struct BgConfig *bg_config, u8 bg_id, u16 numtiles, u8 param3, u16 param4, u32 heap_id); //todo: LoadUserFrameGfx2? void DrawFrame3(struct BgConfig *bgConfig, u8 bgId, u8 x, @@ -103,7 +101,7 @@ void DrawFrame3(struct BgConfig *bgConfig, void DrawWindowCorner(struct Window *window, u16 fillValue, u8 paletteNum); void DrawFrameAndWindow3(struct Window *window, BOOL copy_to_vram, u16 fillValue, u8 paletteNum, u8 param4); void ClearFrameAndWindow3(struct Window *window, u8 param1, BOOL copy_to_vram); -WaitingIcon *WaitingIcon_new(struct Window *window, u32 param1); +WaitingIcon *WaitingIcon_new(struct Window *window, u32 param1); //todo param1 -> u16 tileNum? void FUN_0200D980(WaitingIcon *waitingIcon, u32 param1); void FUN_0200DB7C(u32 param0, void *param1); void FUN_0200DBE8(u32 param0, void *param1);