diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-28 17:39:21 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2021-02-28 17:11:46 -0600 |
| commit | ed0347476c73122ec9fb36a14b47ab3850c00231 (patch) | |
| tree | 0e5ea43af428742d395a5a334b3e9364ad075cef | |
| parent | 031da44cab0d99210aff87533333d59a71a0b85f (diff) | |
Remove old declaration and define
| -rw-r--r-- | include/mon_markings.h | 1 | ||||
| -rw-r--r-- | src/mon_markings.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/mon_markings.h b/include/mon_markings.h index 7ac88d8d2..4053c5f68 100644 --- a/include/mon_markings.h +++ b/include/mon_markings.h @@ -24,7 +24,6 @@ struct PokemonMarkMenu }; void InitMonMarkingsMenu(struct PokemonMarkMenu *ptr); -void BufferMonMarkingsMenuWindowTiles(void); void BufferMonMarkingsMenuTiles(void); void OpenMonMarkingsMenu(u8 markings, s16 x, s16 y); void FreeMonMarkingsMenu(void); diff --git a/src/mon_markings.c b/src/mon_markings.c index f27cca7c4..ed734e72f 100644 --- a/src/mon_markings.c +++ b/src/mon_markings.c @@ -16,8 +16,6 @@ #define SELECTION_OK NUM_MON_MARKINGS #define SELECTION_CANCEL (SELECTION_OK + 1) -#define MENU_TEXT_SPRITE_X_OFFSET 32 - static void CreateMonMarkingsMenuSprites(s16, s16, u16, u16); static void SpriteCB_Dummy(struct Sprite *); static void SpriteCB_Marking(struct Sprite *); @@ -528,7 +526,7 @@ static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 baseTileTag, u16 base sMenu->textSprite->oam.shape = SPRITE_SHAPE(32x32); sMenu->textSprite->oam.size = SPRITE_SIZE(32x32); StartSpriteAnim(sMenu->textSprite, ANIM_TEXT); - sMenu->textSprite->pos1.x = x + MENU_TEXT_SPRITE_X_OFFSET; + sMenu->textSprite->pos1.x = x + 32; sMenu->textSprite->pos1.y = y + 80; CalcCenterToCornerVec(sMenu->textSprite, SPRITE_SHAPE(32x16), SPRITE_SIZE(32x16), ST_OAM_AFFINE_OFF); } |