From d979ac3bf3924051de8bb4154e8398083535eabb Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Mon, 11 Feb 2019 00:05:20 -0500 Subject: Document main_menu state machine, name window constants The new names for the constants (and newly named functions) give a much better understanding of what the window system is trying to do. --- include/window.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'include/window.h') diff --git a/include/window.h b/include/window.h index 25573ac3e..4138ce948 100644 --- a/include/window.h +++ b/include/window.h @@ -1,6 +1,13 @@ #ifndef GUARD_WINDOW_H #define GUARD_WINDOW_H +// The tile ID for a transparent tile in the window tilesheet +#define TRANSPARENT_TILE_NUMBER 0 + +#define PIXEL_BUFFER_TRANSPARENT 0x00 +#define PIXEL_BUFFER_WHITE 0x11 +#define PIXEL_BUFFER_UNKNOWN 0xFF + enum { WINDOW_BG, @@ -73,6 +80,7 @@ extern u32 filler_03002F58; extern u32 filler_03002F5C; extern u32 filler_03002F64; -extern u8 gUnknown_03002F60; +// This global is set to TRANSPARENT_TILE_NUMBER and never changed. +extern u8 gTransparentTileNumber; #endif // GUARD_WINDOW_H -- cgit v1.2.3 From c96f8751cddf1a203bd5f310683ea35bf9cb8db2 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Thu, 21 Feb 2019 23:27:12 -0500 Subject: Improve window palette macros --- include/window.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'include/window.h') diff --git a/include/window.h b/include/window.h index 4138ce948..1daee39ef 100644 --- a/include/window.h +++ b/include/window.h @@ -1,12 +1,7 @@ #ifndef GUARD_WINDOW_H #define GUARD_WINDOW_H -// The tile ID for a transparent tile in the window tilesheet -#define TRANSPARENT_TILE_NUMBER 0 - -#define PIXEL_BUFFER_TRANSPARENT 0x00 -#define PIXEL_BUFFER_WHITE 0x11 -#define PIXEL_BUFFER_UNKNOWN 0xFF +#define PALETTE_NUM_TO_FILL_VALUE(num) ((num) | ((num) << 4)) enum { @@ -80,7 +75,7 @@ extern u32 filler_03002F58; extern u32 filler_03002F5C; extern u32 filler_03002F64; -// This global is set to TRANSPARENT_TILE_NUMBER and never changed. +// This global is set to 0 and never changed. extern u8 gTransparentTileNumber; #endif // GUARD_WINDOW_H -- cgit v1.2.3 From 44e92ce2596981c8d42b70922e5ae84d6b321ab1 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 01:40:11 -0500 Subject: Give window drawing functions better names --- include/window.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include/window.h') diff --git a/include/window.h b/include/window.h index 1daee39ef..ece1ecd21 100644 --- a/include/window.h +++ b/include/window.h @@ -75,7 +75,4 @@ extern u32 filler_03002F58; extern u32 filler_03002F5C; extern u32 filler_03002F64; -// This global is set to 0 and never changed. -extern u8 gTransparentTileNumber; - #endif // GUARD_WINDOW_H -- cgit v1.2.3 From 3716da5430a976d05afecdf82f43f14fc2584949 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sat, 2 Mar 2019 17:25:39 -0500 Subject: Rename macro with correct name for pixel values --- include/window.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/window.h') diff --git a/include/window.h b/include/window.h index ece1ecd21..10e447789 100644 --- a/include/window.h +++ b/include/window.h @@ -1,7 +1,7 @@ #ifndef GUARD_WINDOW_H #define GUARD_WINDOW_H -#define PALETTE_NUM_TO_FILL_VALUE(num) ((num) | ((num) << 4)) +#define PIXEL_FILL(num) ((num) | ((num) << 4)) enum { -- cgit v1.2.3