diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-11 22:13:15 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-11 22:13:15 -0600 |
| commit | a4787bc06a323071d32d3e0705e9cd39d9221452 (patch) | |
| tree | 2d28f4c71469281f6c1edbeb14205551642b25bd /src/egg_hatch.c | |
| parent | 98860220e9317a86b9171677086c9dc7cbeaf0f0 (diff) | |
| parent | 1bb05809d21fc86017e49e722e9d22a2f0c111fc (diff) | |
Merge pull request #207 from DizzyEggg/decompile_pokemon_123
Decompile and clean pokemon files
Diffstat (limited to 'src/egg_hatch.c')
| -rw-r--r-- | src/egg_hatch.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c index fbbc8428a..b78b9433e 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[]; @@ -434,12 +433,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; |