diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-10 20:43:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 20:43:27 -0500 |
| commit | 47b0d8a5970a75862279bde9d19a06c3d7f96eee (patch) | |
| tree | 462ebc6e6bce61be28d862cd89c8bec08ebfa61e /src/battle_pyramid_bag.c | |
| parent | 77bf40d32b7bbab40db36030399586430ae57010 (diff) | |
| parent | 49f1a90534180445d293761e2bdac165b49319a2 (diff) | |
Merge branch 'master' into doc-matchcall
Diffstat (limited to 'src/battle_pyramid_bag.c')
| -rw-r--r-- | src/battle_pyramid_bag.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index c904d4e98..59592e49d 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -278,10 +278,10 @@ static const struct WindowTemplate gUnknown_0861F350[] = static const struct OamData gOamData_861F378 = { .y = 0, - .affineMode = 1, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_NORMAL, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, @@ -589,7 +589,7 @@ static void PyramidBag_CopyItemName(u8 *dst, u16 itemId) { ConvertIntToDecimalStringN(gStringVar1, ITEM_TO_BERRY(itemId), STR_CONV_MODE_LEADING_ZEROS, 2); CopyItemName(itemId, gStringVar2); - StringExpandPlaceholders(dst, gText_UnkF908Var1Clear7Var2); + StringExpandPlaceholders(dst, gText_NumberVar1Clear7Var2); } else { |