dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove old declaration and define

Browse Source
This commit is contained in:
GriffinR
2021-02-28 17:39:21 -05:00
committed by huderlem
parent 031da44cab
commit ed0347476c
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mon_markings.h
-1
View File
@@ -24,7 +24,6 @@ struct PokemonMarkMenu
}; };
void InitMonMarkingsMenu(struct PokemonMarkMenu *ptr); void InitMonMarkingsMenu(struct PokemonMarkMenu *ptr);
void BufferMonMarkingsMenuWindowTiles(void);
void BufferMonMarkingsMenuTiles(void); void BufferMonMarkingsMenuTiles(void);
void OpenMonMarkingsMenu(u8 markings, s16 x, s16 y); void OpenMonMarkingsMenu(u8 markings, s16 x, s16 y);
void FreeMonMarkingsMenu(void); void FreeMonMarkingsMenu(void);
src/mon_markings.c
+1 -3
View File
@@ -16,8 +16,6 @@
#define SELECTION_OK NUM_MON_MARKINGS #define SELECTION_OK NUM_MON_MARKINGS
#define SELECTION_CANCEL (SELECTION_OK + 1) #define SELECTION_CANCEL (SELECTION_OK + 1)
#define MENU_TEXT_SPRITE_X_OFFSET 32
static void CreateMonMarkingsMenuSprites(s16, s16, u16, u16); static void CreateMonMarkingsMenuSprites(s16, s16, u16, u16);
static void SpriteCB_Dummy(struct Sprite *); static void SpriteCB_Dummy(struct Sprite *);
static void SpriteCB_Marking(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.shape = SPRITE_SHAPE(32x32);
sMenu->textSprite->oam.size = SPRITE_SIZE(32x32); sMenu->textSprite->oam.size = SPRITE_SIZE(32x32);
StartSpriteAnim(sMenu->textSprite, ANIM_TEXT); 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; sMenu->textSprite->pos1.y = y + 80;
CalcCenterToCornerVec(sMenu->textSprite, SPRITE_SHAPE(32x16), SPRITE_SIZE(32x16), ST_OAM_AFFINE_OFF); CalcCenterToCornerVec(sMenu->textSprite, SPRITE_SHAPE(32x16), SPRITE_SIZE(32x16), ST_OAM_AFFINE_OFF);
} }