diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-11 18:27:54 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-11 18:27:54 +0200 |
| commit | 8e88f2790af8e98d695c35088cf7b493356ae03c (patch) | |
| tree | 649249b1d5e4f6cc396a473f9b18d6bd22053c34 /include/battle.h | |
| parent | 5394435520c4942ec9935454ff420acbab2ff4e4 (diff) | |
pokemon2 get mon data troubles
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/battle.h b/include/battle.h index 61270bed0..01d89fc35 100644 --- a/include/battle.h +++ b/include/battle.h @@ -33,9 +33,13 @@ #define BATTLE_TYPE_RAYQUAZA 0x40000000 #define STEVEN_PARTNER_ID 0xC03 +#define SECRET_BASE_OPPONENT 0x400 #define BATTLE_TYPE_FRONTIER (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID) +#define SIDE_PLAYER 0x0 +#define SIDE_OPPONENT 0x1 + #define BATTLE_WON 0x1 #define BATTLE_LOST 0x2 #define BATTLE_DREW 0x3 @@ -513,12 +517,15 @@ struct BattleScripting extern struct BattleScripting gBattleScripting; -struct BattleDecompressedSprites +#include "sprite.h" + +struct BattleSpritesGfx { void* firstDecompressed; // ptr to the decompressed sprite of the first pokemon void* sprites[4]; + struct SpriteTemplate templates[4]; }; -extern struct BattleDecompressedSprites* gBattleDecompressedSprites; +extern struct BattleSpritesGfx* gBattleSpritesGfx; #endif // GUARD_BATTLE_H |