diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-11 11:35:41 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-11 11:35:41 +0200 |
| commit | 154a70e22829891ec56561e454a73a67e609679d (patch) | |
| tree | 850d26c7955d58249b33eb5d7c9979a61e155548 /include/battle.h | |
| parent | 6292b82503bf2eb611e5fea6f1710b25578d4fc8 (diff) | |
start pokemon3 decomp
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h index 1db546de3..81d3e2c82 100644 --- a/include/battle.h +++ b/include/battle.h @@ -187,8 +187,7 @@ struct Trainer { /*0x00*/ u8 partyFlags; /*0x01*/ u8 trainerClass; - /*0x02*/ u8 encounterMusic:7; - /*0x02*/ u8 gender:1; + /*0x02*/ u8 encounterMusic_gender; // last bit is gender /*0x03*/ u8 trainerPic; /*0x04*/ u8 trainerName[12]; /*0x10*/ u16 items[4]; @@ -200,6 +199,8 @@ struct Trainer extern const struct Trainer gTrainers[]; +#define TRAINER_ENCOUNTER_MUSIC(trainer)((gTrainers[trainer].encounterMusic_gender & 0x7F)) + struct UnknownFlags { u32 flags[4]; @@ -412,4 +413,12 @@ struct BattleScripting extern struct BattleScripting gBattleScripting; -#endif +struct BattleDecompressedSprites +{ + void* firstDecompressed; // ptr to the decompressed sprite of the first pokemon + void* sprites[4]; +}; + +extern struct BattleDecompressedSprites* gBattleDecompressedSprites; + +#endif // GUARD_BATTLE_H |