diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 20:17:19 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 20:17:19 -0400 |
| commit | ce62efbcecec4465c1b03578957513ca33dd3b80 (patch) | |
| tree | d2960d7261c32ff7b65d3ac4677265039d5b883d /include/battle.h | |
| parent | 0882b456934e87b3b5fa1415ca6ab34087c68a4a (diff) | |
Split out multi buffers from battle struct
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 27 |
1 files changed, 7 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 |