summaryrefslogtreecommitdiff
path: root/src/egg_hatch.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-02-11 17:35:01 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2018-02-11 17:35:01 +0100
commitfd17ca59b0f5eaa3231628f7b9da66e77dfb8bd9 (patch)
tree75408f976619fb24ee60a5cf2b7812c27444c34e /src/egg_hatch.c
parent084ba7a7a47af9744acd7d9bdf7abffb10fba87d (diff)
more pokemon work
Diffstat (limited to 'src/egg_hatch.c')
-rw-r--r--src/egg_hatch.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 5a2fe5ca2..90f920192 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -44,7 +44,6 @@ struct EggHatchData
u8 textColor[3];
};
-extern struct SpriteTemplate gUnknown_0202499C;
extern void (*gFieldCallback)(void);
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
@@ -440,12 +439,12 @@ static u8 EggHatchCreateMonSprite(u8 a0, u8 switchID, u8 pokeID, u16* speciesLoc
HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species],
gMonSpritesGfxPtr->sprites[(a0 * 2) + 1],
species, pid);
- LoadCompressedObjectPalette(sub_806E794(mon));
+ LoadCompressedObjectPalette(GetMonSpritePalStruct(mon));
*speciesLoc = species;
}
break;
case 1:
- sub_806A068(sub_806E794(mon)->tag, r5);
+ sub_806A068(GetMonSpritePalStruct(mon)->tag, r5);
spriteID = CreateSprite(&gUnknown_0202499C, 120, 75, 6);
gSprites[spriteID].invisible = 1;
gSprites[spriteID].callback = SpriteCallbackDummy;