summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle.h4
-rw-r--r--include/main.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h
index 34910781b..954d33b07 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -344,7 +344,7 @@ struct BattleTvMovePoints
s16 points[2][PARTY_SIZE * 4];
};
-struct MultiPartnerEnigmaBerry
+struct LinkBattlerHeader
{
u8 versionSignatureLo;
u8 versionSignatureHi;
@@ -429,7 +429,7 @@ struct BattleStruct
u8 lastTakenMoveFrom[MAX_BATTLERS_COUNT * MAX_BATTLERS_COUNT * 2]; // a 3-D array [target][attacker][byte]
u16 castformPalette[MAX_BATTLERS_COUNT][16];
union {
- struct MultiPartnerEnigmaBerry multiPartnerEnigmaBerry;
+ struct LinkBattlerHeader linkBattlerHeader;
u32 battleVideo[2];
} multiBuffer;
u8 wishPerishSongState;
diff --git a/include/main.h b/include/main.h
index ef5430cd8..cad5c0ef9 100644
--- a/include/main.h
+++ b/include/main.h
@@ -37,7 +37,7 @@ struct Main
/*0x439*/ u8 oamLoadDisabled:1;
/*0x439*/ u8 inBattle:1;
- /*0x439*/ u8 isFrontierBattle:1;
+ /*0x439*/ u8 anyLinkBattlerHasFrontierPass:1;
};
extern const u8 gGameVersion;