summaryrefslogtreecommitdiff
path: root/include/global.tv.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/global.tv.h')
-rw-r--r--include/global.tv.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/include/global.tv.h b/include/global.tv.h
index 2bc7dda99..e24ead3f2 100644
--- a/include/global.tv.h
+++ b/include/global.tv.h
@@ -61,7 +61,7 @@ typedef union // size = 0x24
/*0x0F*/ u8 filler_0F[1];
/*0x10*/ u8 nickname[PLAYER_NAME_LENGTH + 1];
/*0x18*/ u16 words18[2];
- /*0x1C*/ u16 words[4];
+ /*0x1C*/ u16 words[2];
} fanclubOpinions;
// TVSHOW_DUMMY
@@ -334,7 +334,7 @@ typedef union // size = 0x24
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
/*0x02*/ u8 avgLevel;
- /*0x03*/ u8 nDecorations;
+ /*0x03*/ u8 numDecorations;
/*0x04*/ u8 decorations[4];
/*0x08*/ u16 species;
/*0x0a*/ u16 move;
@@ -437,8 +437,8 @@ typedef union // size = 0x24
struct {
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
- /*0x02*/ u8 nMonsCaught;
- /*0x03*/ u8 nPkblkUsed;
+ /*0x02*/ u8 monsCaught;
+ /*0x03*/ u8 pokeblocksUsed;
/*0x04*/ u8 language;
/*0x05*/ u8 filler_05[14];
/*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
@@ -449,27 +449,27 @@ typedef union // size = 0x24
struct {
/*0x00*/ u8 kind;
/*0x01*/ bool8 active;
- /*0x02*/ u8 var02;
- /*0x03*/ u8 var03;
+ /*0x02*/ u8 unused1;
+ /*0x03*/ u8 unused3;
/*0x04*/ u16 moves[MAX_MON_MOVES];
/*0x0C*/ u16 species;
- /*0x0E*/ u16 var0E;
+ /*0x0E*/ u16 unused2;
/*0x10*/ u8 locationMapNum;
/*0x11*/ u8 locationMapGroup;
- /*0x12*/ u8 var12;
+ /*0x12*/ u8 unused4;
/*0x13*/ u8 probability;
/*0x14*/ u8 level;
- /*0x15*/ u8 var15;
+ /*0x15*/ u8 unused5;
/*0x16*/ u16 daysLeft;
/*0x18*/ u8 language;
} massOutbreak;
} TVShow;
-typedef struct // 2b50
+typedef struct
{
u8 kind;
u8 state;
- u16 days;
+ u16 dayCountdown;
} PokeNews;
struct GabbyAndTyData