summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-06-12 19:34:01 -0500
committercamthesaxman <cameronghall@cox.net>2017-06-12 19:34:01 -0500
commit2f437b0a94dd88cd78d0f6b4d92b9f5169531376 (patch)
tree0b4e97181982f145d2b3a0916edca7e3e0c9abd7
parent28364fcd3208e83b0e801fa1229fe3af5530b3aa (diff)
Struct30042E0
-rw-r--r--include/battle.h25
-rw-r--r--src/battle_2.c27
-rwxr-xr-xsrc/tv.c2
3 files changed, 27 insertions, 27 deletions
diff --git a/include/battle.h b/include/battle.h
index ec406d2e6..cfac2b44b 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -132,6 +132,31 @@ struct UnkBattleStruct4
/*0x17*/ u8 filler17[0x4];
};
+struct Struct30042E0
+{
+ 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];
+};
+
struct Struct2017800
{
u8 unk0_0:1;
diff --git a/src/battle_2.c b/src/battle_2.c
index f7051fbfd..498fcec31 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -55,31 +55,6 @@ struct UnknownPokemonStruct2
/*0x1D*/ u8 language;
};
-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];
-};
-
struct UnknownStruct12
{
u32 unk0;
@@ -217,7 +192,7 @@ extern u16 gUnknown_030042C0;
extern u16 gUnknown_030042C4;
extern MainCallback gUnknown_030042D0;
extern void (*gUnknown_030042D4)(void);
-extern struct UnknownStruct11 gUnknown_030042E0;
+extern struct Struct30042E0 gUnknown_030042E0;
extern u8 gUnknown_03004324;
extern void (*gUnknown_03004330[])(void);
extern u8 gUnknown_03004340[];
diff --git a/src/tv.c b/src/tv.c
index 566d547a6..4ab5dbd33 100755
--- a/src/tv.c
+++ b/src/tv.c
@@ -29,7 +29,7 @@ struct UnkTvStruct
s8 var0;
};
-extern struct UnknownStruct11 gUnknown_030042E0;
+extern struct Struct30042E0 gUnknown_030042E0;
extern u8 gUnknown_0300430A[11];
struct OutbreakPokemon