Merge branch 'master' into reverts
This commit is contained in:
@@ -46,7 +46,6 @@
|
||||
#include "constants/region_map_sections.h"
|
||||
#include "constants/rgb.h"
|
||||
#include "constants/songs.h"
|
||||
#include "constants/species.h"
|
||||
|
||||
// Screen titles (upper left)
|
||||
#define PSS_LABEL_WINDOW_POKEMON_INFO_TITLE 0
|
||||
@@ -3977,7 +3976,7 @@ static void StopPokemonAnimations(void) // A subtle effect, this function stops
|
||||
|
||||
static void CreateMonMarkingsSprite(struct Pokemon *mon)
|
||||
{
|
||||
struct Sprite *sprite = sub_811FF94(TAG_MON_MARKINGS, TAG_MON_MARKINGS, sSummaryMarkingsPalette);
|
||||
struct Sprite *sprite = CreateMonMarkingsSpriteWithPal(TAG_MON_MARKINGS, TAG_MON_MARKINGS, sSummaryMarkingsPalette);
|
||||
|
||||
sMonSummaryScreen->markingsSprite = sprite;
|
||||
if (sprite != NULL)
|
||||
|
||||
Reference in New Issue
Block a user