start working on battle interface

This commit is contained in:
DizzyEggg
2017-10-16 18:12:27 +02:00
parent 0d38d443b5
commit 4b45282dd3
21 changed files with 706 additions and 917 deletions

View File

@@ -903,11 +903,21 @@ struct BattleHealthboxInfo
u8 field_B;
};
struct BattleBarInfo
{
u8 healthboxSpriteId;
u32 maxValue;
u32 currentValue;
bool32 isDoubleBattle;
s32 field_10;
};
struct BattleSpriteData
{
struct BattleSpriteInfo *bankData;
struct BattleHealthboxInfo *healthBoxesData;
struct BattleAnimationInfo *animationData;
struct BattleBarInfo *battleBars;
};
extern struct BattleSpriteData *gBattleSpritesDataPtr;

View File

@@ -39,18 +39,18 @@ struct PlttData
struct OamData
{
/*0x00*/ u32 y:8;
/*0x01*/ u32 affineMode:2;
u32 objMode:2;
u32 mosaic:1;
u32 bpp:1;
u32 shape:2;
/*0x01*/ u32 affineMode:2; // 0x1, 0x2 -> 0x4
u32 objMode:2; // 0x4, 0x8 -> 0xC
u32 mosaic:1; // 0x10
u32 bpp:1; // 0x20
u32 shape:2; // 0x40, 0x80 -> 0xC0
/*0x02*/ u32 x:9;
u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode
u32 size:2;
/*0x04*/ u16 tileNum:10;
u16 priority:2;
/*0x04*/ u16 tileNum:10; // 0x33F
u16 priority:2; // 0x400, 0x800 -> 0xC00
u16 paletteNum:4;
/*0x06*/ u16 affineParam;
};