summaryrefslogtreecommitdiff
path: root/include/battle.h
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-06-07 14:09:45 -0500
committercamthesaxman <cameronghall@cox.net>2017-06-07 14:09:45 -0500
commit61101812ca750393ba24cae103cb86b40001251a (patch)
tree47c56ca9aed0504f7425dc065dd66fdf0d59ecc1 /include/battle.h
parent6e203fc646494445f28670f14a95067d58d3785d (diff)
decompile sub_811FAE4 - sub_811FCE8
Diffstat (limited to 'include/battle.h')
-rw-r--r--include/battle.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h
index be474b59f..f72333a9d 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -35,7 +35,7 @@ extern u8 unk_2000000[];
// to do: maybe try to reduce the defines needed to match?
#define BATTLE_STRUCT ((struct BattleStruct *)(unk_2000000))
#define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(unk_2000000 + 0x16800))
-#define UNK_2016A00_STRUCT ((struct UnknownStruct1 *)(unk_2000000 + 0x16A00))
+#define UNK_2016A00_STRUCT ((struct UnkBattleStruct1 *)(unk_2000000 + 0x16A00))
#define AI_STACK ((struct AI_Stack *)(unk_2000000 + 0x16C00))
#define AI_ARRAY_160CC ((struct SmallItemStruct *)(unk_2000000 + 0x160CC))
@@ -61,7 +61,7 @@ struct Trainer
/*0x24*/ void *party;
};
-struct UnknownStruct1 // AI_Opponent_Info?
+struct UnkBattleStruct1 // AI_Opponent_Info?
{
/*0x00*/ u16 movesUsed[2][8]; // 0xFFFF means move not used (confuse self hit, etc)
/*0x20*/ u8 unk20[2];
@@ -119,7 +119,7 @@ struct BattleStruct /* 0x2000000 */
u8 filler2[0x72E];
/* 0x16800 */ struct AI_ThinkingStruct ai; /* 0x2016800 */
u8 filler1681C[0x1E4];
- /* 0x16A00 */ struct UnknownStruct1 unk_2016A00_2;
+ /* 0x16A00 */ struct UnkBattleStruct1 unk_2016A00_2;
};
struct UnknownStruct4