diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-11 16:01:59 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-11 16:01:59 -0500 |
| commit | 8b8ccbbc41141637297cfe847f1ce62e6139d965 (patch) | |
| tree | 9aaded6bb8e02ca4d264fccbac307c4cb6efc074 /src/rom_8077ABC.c | |
| parent | 3a70fa1ae461cab27443ac53faec35db1d6b89d3 (diff) | |
| parent | 9bf6448707a36bf7d530bf932347c1adb508192e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into visual_studio
Diffstat (limited to 'src/rom_8077ABC.c')
| -rw-r--r-- | src/rom_8077ABC.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 4a580eb41..a60fc1078 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -1,4 +1,5 @@ #include "global.h" +#include "constants/battle_anim.h" #include "constants/species.h" #include "rom_8077ABC.h" #include "battle.h" @@ -30,7 +31,7 @@ #define gCastformElevations gUnknownCastformData_0837F5A8 #define gCastformBackSpriteYCoords gUnknown_0837F5AC #define gTransformPersonalities gTransformedPersonalities -#define gBattleMonSprites gObjectBankIDs +#define gBattleMonSprites gBankSpriteIds struct TransformStatus { @@ -850,7 +851,7 @@ bool8 IsBankSpritePresent(u8 slot) { if (gBanksBySide[slot] == 0xff) return FALSE; - if (GetBankSide(slot)) + if (GetBankSide(slot) != SIDE_PLAYER) { if (GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0) return TRUE; |