summaryrefslogtreecommitdiff
path: root/include/battle.h
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-06-14 00:05:22 -0400
committerGitHub <noreply@github.com>2017-06-14 00:05:22 -0400
commit48a15638c63f2b3d4b2d12d346e466ddca006570 (patch)
tree89942e8cf1e40968b48759bf2b4e575912a2271b /include/battle.h
parente09e1da6c252e17cf6db429ad142b05dbf156548 (diff)
parent4e7297790f29987b1dd502fcf3b03ca76042c622 (diff)
Merge pull request #316 from PikalaxALT/decoration
Decoration
Diffstat (limited to 'include/battle.h')
-rw-r--r--include/battle.h48
1 files changed, 24 insertions, 24 deletions
diff --git a/include/battle.h b/include/battle.h
index 9714c6add..47ddef71d 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -107,9 +107,9 @@ struct SmallItemStruct
struct BattleStruct /* 0x2000000 */
{
u8 filler0[0x15DDE];
- /*0x15DDE*/ u8 unk15DDE;
- /*0x15DDF*/ u8 unk15DDF;
- /*0x15DE0*/ u8 filler15DE0[0x23C]; // 0xAF off?
+ /*0x15DDE*/ u8 unk15DDE;
+ /*0x15DDF*/ u8 unk15DDF;
+ /*0x15DE0*/ u8 filler15DE0[0x23C]; // 0xAF off?
struct SmallBattleStruct1 unk;
u8 filler1[0x68];
/* 0x16089 */ u8 safariFleeRate;
@@ -148,27 +148,27 @@ extern struct AI_ThinkingStruct gAIThinkingSpace;
struct UnknownStruct11
{
- u8 unk0;
- u8 unk1;
- u8 unk2;
- u8 unk3;
- u8 unk4;
- u8 unk5_0:1;
- u8 unk5_1:1;
- u16 unk6;
- u8 unk8[10];
- u8 unk12;
- u8 unk13;
- u8 unk14[10];
- u8 filler1E[2];
- u16 unk20;
- u16 unk22;
- u16 unk24;
- u16 unk26;
- u16 unk28;
- u8 unk2A[10];
- u8 filler34[2];
- u8 unk36[10];
+ u8 unk0;
+ u8 unk1;
+ u8 unk2;
+ u8 unk3;
+ u8 unk4;
+ u8 unk5_0:1;
+ u8 unk5_1:1;
+ u16 unk6;
+ u8 unk8[10];
+ u8 unk12;
+ u8 unk13;
+ u8 unk14[10];
+ u8 filler1E[2];
+ u16 unk20;
+ u16 unk22;
+ u16 unk24;
+ u16 unk26;
+ u16 unk28;
+ u8 unk2A[10];
+ u8 filler34[2];
+ u8 unk36[10];
};
#endif // GUARD_BATTLE_H