diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 27 | ||||
| -rw-r--r-- | include/ewram.h | 1 |
2 files changed, 8 insertions, 20 deletions
diff --git a/include/battle.h b/include/battle.h index 263bb3b0d..591a56a33 100644 --- a/include/battle.h +++ b/include/battle.h @@ -291,13 +291,15 @@ struct LinkPartnerHeader struct BattleEnigmaBerry battleEnigmaBerry; }; +union MultiBuffers +{ + struct LinkPartnerHeader linkPartnerHeader; + struct MultiBattlePokemonTx multiBattleMons[3]; +}; + struct BattleStruct /* 0x2000000 */ { - /*0x00000*/ union{ - struct LinkPartnerHeader linkPartnerHeader; - struct MultiBattlePokemonTx multiBattleMons[3]; - } multiBuffer; - u8 filler60[0x15FA0]; + u8 filler00000[0x16000]; /*0x16000*/ u8 turnEffectsTracker; /*0x16001*/ u8 turnEffectsBattlerId; /*0x16002*/ u8 animTurn; @@ -416,21 +418,6 @@ struct BattleStruct /* 0x2000000 */ /*0x16111*/ u8 wishPerishSongBattlerId; /*0x16112*/ u8 multihitMoveEffect; /*0x16113*/ u8 givenExpMons; - /*0x16114*/ u8 unk16114; - /*0x16115*/ u8 unk16115; - /*0x16116*/ u8 unk16116; - /*0x16117*/ u8 unk16117; - /*0x16118*/ u8 unk16118; - /*0x16119*/ u8 unk16119; - /*0x1611A*/ u8 unk1611A; - /*0x1611B*/ u8 unk1611B; - /*0x1611C*/ u8 unk1611C; - /*0x1611D*/ u8 unk1611D; - /*0x1611E*/ u8 unk1611E; - /*0x1611F*/ u8 unk1611F; - - //u8 filler2[0x72E]; - /* 0x16A00 */ struct BattleHistory unk_2016A00_2; }; struct ResourceFlags diff --git a/include/ewram.h b/include/ewram.h index 6e3ba6751..8aa244907 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -22,6 +22,7 @@ extern u8 gSharedMem[]; // battle etc. // This overlaps with so many things it's not even funny // The actual data starts at 0x02016000 +#define eMultiTxBuffer (*(union MultiBuffers *)gSharedMem) #define gBattleStruct ((struct BattleStruct *) (gSharedMem + 0x0)) #define namingScreenData (*(struct NamingScreenData *)(gSharedMem + 0x0)) #define ewramBerryPic (gSharedMem + 0x0) |