From 306ce048ad07d62bed2028bfc8f30c03f5bc8db7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Sep 2019 21:07:54 -0400 Subject: Move gflib srcs and headers to gflib subdir --- src/use_pokeblock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/use_pokeblock.c') diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 655f38def..4d7605c50 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -1,7 +1,7 @@ #include "global.h" #include "main.h" #include "pokeblock.h" -#include "alloc.h" +#include "malloc.h" #include "decompress.h" #include "graphics.h" #include "palette.h" -- cgit v1.2.3 From c40879aa3693a18c23be42cce54d52ca7afe1bca Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Dec 2019 15:25:13 -0500 Subject: Use ST_OAM constants for OamData definitions --- src/use_pokeblock.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/use_pokeblock.c') diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 4d7605c50..794c2989c 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -299,9 +299,9 @@ const s16 gUnknown_085DFD28[][2] = const struct OamData gOamData_085DFD3C = { .y = 0, - .affineMode = 0, - .objMode = 0, - .bpp = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x16), .x = 0, .size = SPRITE_SIZE(32x16), @@ -342,9 +342,9 @@ const struct SpriteTemplate gSpriteTemplate_085DFD5C = const struct OamData gOamData_085DFD74 = { .y = 0, - .affineMode = 0, - .objMode = 0, - .bpp = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x32), .x = 0, .size = SPRITE_SIZE(64x32), -- cgit v1.2.3 From 27567719586859201cab665f9406ef8f39a39748 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Dec 2019 21:00:45 -0500 Subject: More usage of ST_OAM constants and SPRITE macros --- src/use_pokeblock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/use_pokeblock.c') diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 794c2989c..bd3abe0e4 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -1302,8 +1302,8 @@ void sub_8167760(void) if (spriteId != MAX_SPRITES) { gUnknown_0203BCAC->field_7B06[i] = spriteId; - gSprites[spriteId].oam.shape = 1; - gSprites[spriteId].oam.size = 2; + gSprites[spriteId].oam.shape = SPRITE_SHAPE(32x16); + gSprites[spriteId].oam.size = SPRITE_SIZE(32x16); } else { -- cgit v1.2.3 From ed1ff0ad774c67e7184fb0c862005e487fed42ec Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 10 Dec 2019 13:48:20 -0500 Subject: Document misc strings and text colors --- src/use_pokeblock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/use_pokeblock.c') diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index bd3abe0e4..a0c8d8e2d 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -178,11 +178,11 @@ const u8 gUnknown_085DFCC4[] = 1 // Sour/Tough }; -const u8 gUnknown_085DFCC9[] = +static const u8 sNatureTextColors[] = { - 0, - 8, - 1 + TEXT_COLOR_TRANSPARENT, + TEXT_COLOR_BLUE, + TEXT_COLOR_WHITE }; const struct BgTemplate gUnknown_085DFCCC[4] = @@ -1398,7 +1398,7 @@ void sub_8167BA0(u16 arg0, u8 copyToVramMode) nature = GetNature(&gPlayerParty[partyIndex]); str = StringCopy(gUnknown_0203BCAC->info.field_7A, gText_NatureSlash); str = StringCopy(str, gNatureNamePointers[nature]); - AddTextPrinterParameterized3(1, 1, 2, 1, gUnknown_085DFCC9, 0, gUnknown_0203BCAC->info.field_7A); + AddTextPrinterParameterized3(1, 1, 2, 1, sNatureTextColors, 0, gUnknown_0203BCAC->info.field_7A); } if (copyToVramMode) -- cgit v1.2.3