diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-06 17:08:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-06 17:08:27 -0500 |
| commit | dea28a0a236412f267e3da8a7c200d947a9c5fe1 (patch) | |
| tree | 84300b68d6e6402c16edd4e1dc30f0d8d103ab40 /src/pokemon_3.c | |
| parent | 1bd7739ea6bf3d4d90e65cb7ea3dcf5e8fe286d4 (diff) | |
| parent | 7b88c7f2f0bceb6adc0ea3081c18e175dd4cb21c (diff) | |
Merge pull request #57 from DizzyEggg/decomp_battle2
Decompile battle2
Diffstat (limited to 'src/pokemon_3.c')
| -rw-r--r-- | src/pokemon_3.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/pokemon_3.c b/src/pokemon_3.c index d44c0cb2f..5ff99aee2 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -486,8 +486,8 @@ u16 SpeciesToCryId(u16 species) void sub_806D544(u16 species, u32 personality, u8 *dest) { if (species == SPECIES_SPINDA - && dest != gBattleSpritesGfx->sprites[0] - && dest != gBattleSpritesGfx->sprites[2]) + && dest != gMonSpritesGfxPtr->sprites[0] + && dest != gMonSpritesGfxPtr->sprites[2]) { int i; for (i = 0; i < 4; i++) @@ -1519,8 +1519,6 @@ void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u DoMonFrontSpriteAnimation(sprite, species, noCry, arg3); } -bool8 HasTwoFramesAnimation(u16 species); - extern void SpriteCallbackDummy_2(struct Sprite*); extern void sub_817F60C(struct Sprite*); |