diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 10 | ||||
| -rw-r--r-- | include/battle_main.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/battle.h b/include/battle.h index 74a72b332..54e33455d 100644 --- a/include/battle.h +++ b/include/battle.h @@ -357,7 +357,7 @@ struct BattleResults extern struct BattleResults gBattleResults; -struct MultiPartnerEnigmaBerry +struct LinkPartnerHeader { u8 versionSignatureLo; u8 versionSignatureHi; @@ -375,7 +375,7 @@ struct BattleStruct u8 wrappedMove[MAX_BATTLERS_COUNT * 2]; // Leftover from Ruby's ewram access. u8 moveTarget[MAX_BATTLERS_COUNT]; u8 expGetterMonId; - u8 field_11; // unuused + u8 field_11; // unused u8 wildVictorySong; u8 dynamicMoveType; u8 wrappedBy[MAX_BATTLERS_COUNT]; @@ -448,8 +448,8 @@ struct BattleStruct u8 field_182; // align 4 union { - struct MultiPartnerEnigmaBerry multiPartnerEnigmaBerry; - struct UnknownPokemonStruct4 multiBattleMons[3]; + struct LinkPartnerHeader linkPartnerHeader; + struct MultiBattlePokemonTx multiBattleMons[3]; } multiBuffer; u8 padding_1E4[0x1C]; }; // size == 0x200 bytes @@ -713,7 +713,7 @@ extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT]; extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT]; extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT]; extern u8 gBattleTerrain; -extern struct UnknownPokemonStruct4 gMultiPartnerParty[3]; +extern struct MultiBattlePokemonTx gMultiPartnerParty[3]; extern u16 *sUnknownDebugSpriteDataBuffer; extern u16 gRandomTurnNumber; diff --git a/include/battle_main.h b/include/battle_main.h index e980bde70..bc46be6b4 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -9,7 +9,7 @@ struct TrainerMoney u8 value; }; -struct UnknownPokemonStruct4 +struct MultiBattlePokemonTx { /*0x00*/ u16 species; /*0x02*/ u16 heldItem; |