diff options
| author | YamaArashi <shadow962@live.com> | 2016-09-23 21:23:38 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-09-23 21:23:38 -0700 |
| commit | 67eb0f4812a2b02dfceb795a34fe489c66cc3dca (patch) | |
| tree | 1d0e5a5cbf591e40a030a8e3d3a4183000a30e8b /src | |
| parent | 003e25a603fb0ccfd1170c49a3e63f482c2e70da (diff) | |
name ClearStandardMessageBox()
Diffstat (limited to 'src')
| -rw-r--r-- | src/field_message_box.c | 2 | ||||
| -rw-r--r-- | src/text_window.c | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/field_message_box.c b/src/field_message_box.c index b516866f4..7232de2b3 100644 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -132,7 +132,7 @@ static void PrintFieldMessageFromStringVar4(void) void HideFieldMessageBox(void) { DestroyFieldMessageBoxTask(); - sub_806536C(&gFieldMessageBoxWindow); + ClearStandardMessageBox(&gFieldMessageBoxWindow); sMessageBoxMode = FIELD_MESSAGE_BOX_HIDDEN; } diff --git a/src/text_window.c b/src/text_window.c index ab14fe1fb..e7f72a80b 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -3,6 +3,11 @@ #include "text.h" #include "text_window.h" +#define STD_MSG_BOX_LEFT 0 +#define STD_MSG_BOX_TOP 14 +#define STD_MSG_BOX_WIDTH 26 +#define STD_MSG_BOX_HEIGHT 4 + u16 SetTextWindowBaseTileNum(u16); void LoadTextWindowGraphics(struct Window *); void LoadTextWindowGraphics_OverridePalSlot(struct Window *, u8); @@ -19,7 +24,7 @@ static u16 GetMessageBoxTilemapEntry(u16 tilemapEntry, u8 x, u8 y, u8 width, u8 static void DrawMessageBox(struct Window *win, u8 left, u8 top, u8 width, u8 height); void DrawStandardMessageBox(struct Window *win); void LoadMessageBoxTiles(struct Window *win); -void sub_806536C(struct Window *win); +void ClearStandardMessageBox(struct Window *win); static u16 sTextWindowBaseTileNum; static u16 sMessageBoxBaseTileNum; @@ -176,7 +181,7 @@ static void DrawMessageBox(struct Window *win, u8 left, u8 top, u8 width, u8 hei void DrawStandardMessageBox(struct Window *win) { - DrawMessageBox(win, 0, 14, 26, 4); + DrawMessageBox(win, STD_MSG_BOX_LEFT, STD_MSG_BOX_TOP, STD_MSG_BOX_WIDTH, STD_MSG_BOX_HEIGHT); } void LoadMessageBoxTiles(struct Window *win) @@ -185,12 +190,12 @@ void LoadMessageBoxTiles(struct Window *win) CpuFastCopy(gMessageBox_Gfx, tileData + 32 * sMessageBoxBaseTileNum, 14 * TILE_SIZE_4BPP); } -void sub_806536C(struct Window *win) +void ClearStandardMessageBox(struct Window *win) { u8 i; - u16 *tilemap = win->config->tilemap + 0x1C0; + u16 *tilemap = win->config->tilemap + (STD_MSG_BOX_TOP * 32); u16 tilemapEntry = win->paletteNum << 12; - for (i = 0; i < 0xC0; i++) + for (i = 0; i < ((STD_MSG_BOX_HEIGHT + 2) * 32); i++) tilemap[i] = tilemapEntry; } |