diff options
| author | PikalaxALT <pikalax1@gmail.com> | 2017-05-26 20:22:45 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalax1@gmail.com> | 2017-05-26 20:23:56 -0400 |
| commit | 03e4f7c9cf592feefc10c1276fb8f648a7fe2bcd (patch) | |
| tree | 26ebd030ed1b613018a281b0e228152e329ba9a8 /include | |
| parent | 21efe53b6805a0dcc5dcba7d1f78e9a7e7bd93c4 (diff) | |
Rid code base of redundant SaveTVStruct and define unknown_2a98 as the last of 25 TVShow objects
Diffstat (limited to 'include')
| -rw-r--r--[-rwxr-xr-x] | include/asm.inc.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/field_effect_helpers.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/field_map_obj.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/field_player_avatar.h | 0 | ||||
| -rw-r--r-- | include/global.h | 7 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/trainer_see.h | 0 |
6 files changed, 1 insertions, 6 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index dbd3f0820..dbd3f0820 100755..100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 62f492bdc..62f492bdc 100755..100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 0347b90d4..0347b90d4 100755..100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index fc21c4e3c..fc21c4e3c 100755..100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h 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 index b80a41641..b80a41641 100755..100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h |