diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-07 16:10:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-07 16:10:35 -0400 |
commit | a2655ba9ab82646a54f60abc6078df372179f8d4 (patch) | |
tree | 95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /src/pokeblock.c | |
parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) |
Merge branch 'master' into doc-union
Diffstat (limited to 'src/pokeblock.c')
-rw-r--r-- | src/pokeblock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokeblock.c b/src/pokeblock.c index fad6858ec..89c2bc962 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -36,8 +36,8 @@ #define MAX_MENU_ITEMS 9 #define MENU_MIDPOINT (MAX_MENU_ITEMS / 2) -#define TILE_HIGHLIGHT_NONE 0x0005 // Tile number for the bg of an unselected menu item -#define TILE_HIGHLIGHT_BLUE 0x1005 // Tile number for the bg of a selected menu item +#define TILE_HIGHLIGHT_NONE 0x0005 // Tile number for the bg of an unselected menu item +#define TILE_HIGHLIGHT_BLUE 0x1005 // Tile number for the bg of a selected menu item #define TILE_HIGHLIGHT_RED 0x2005 // Tile number for the bg of a menu item to swap #define TAG_POKEBLOCK_CASE 14800 @@ -792,7 +792,7 @@ static void DrawPokeblockInfo(s32 pkblId) } CopyToBgTilemapBufferRect(2, rectTilemapSrc, (i / 3 * 6) + 1, (i % 3 * 2) + 13, 1, 2); } - + // Print the Pokéblock's feel ConvertIntToDecimalStringN(gStringVar1, GetPokeblocksFeel(pokeblock), STR_CONV_MODE_RIGHT_ALIGN, 2); PrintOnPokeblockWindow(WIN_FEEL, gStringVar1, 4); |