From 03e4f7c9cf592feefc10c1276fb8f648a7fe2bcd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 26 May 2017 20:22:45 -0400 Subject: Rid code base of redundant SaveTVStruct and define unknown_2a98 as the last of 25 TVShow objects --- include/asm.inc.h | 0 include/field_effect_helpers.h | 0 include/field_map_obj.h | 0 include/field_player_avatar.h | 0 include/global.h | 7 +------ include/trainer_see.h | 0 6 files changed, 1 insertion(+), 6 deletions(-) mode change 100755 => 100644 include/asm.inc.h mode change 100755 => 100644 include/field_effect_helpers.h mode change 100755 => 100644 include/field_map_obj.h mode change 100755 => 100644 include/field_player_avatar.h mode change 100755 => 100644 include/trainer_see.h (limited to 'include') diff --git a/include/asm.inc.h b/include/asm.inc.h old mode 100755 new mode 100644 diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h old mode 100755 new mode 100644 diff --git a/include/field_map_obj.h b/include/field_map_obj.h old mode 100755 new mode 100644 diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h old mode 100755 new mode 100644 diff --git a/include/global.h b/include/global.h index 34946c895..efe67c55c 100644 --- a/include/global.h +++ b/include/global.h @@ -438,11 +438,6 @@ typedef union SB_Struct { } SB_Struct; // size is 0x198 -struct SaveTVStruct { - TVShow shows[24]; - TVShow unknown_2A98; -}; - struct UnknownSaveStruct2ABC { u8 val0; u8 val1; @@ -517,7 +512,7 @@ struct SaveBlock1 /* 0x02025734 */ /*0x2704*/ u8 decorDoll[40]; /*0x272C*/ u8 decorCushion[10]; /*0x2736*/ u8 padding_2736[2]; - /*0x2738*/ struct SaveTVStruct tvShows; + /*0x2738*/ TVShow tvShows[25]; /*0x2ABC*/ struct UnknownSaveStruct2ABC unknown_2ABC[16]; /*0x2AFC*/ u16 outbreakPokemonSpecies; /*0x2AFE*/ u8 outbreakLocationMapNum; diff --git a/include/trainer_see.h b/include/trainer_see.h old mode 100755 new mode 100644 -- cgit v1.2.3