Merge branch 'master' into cable_car

1 files changed, 35 insertions, 43 deletions

diff --git a/include/global.h b/include/global.h
index 3b295cf2c..8c13ad502 100644
--- a/include/global.h
+++ b/include/global.h
@@ -5,7 +5,7 @@
 #include "config.h"
 
 // IDE support
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__CYGWIN__)
 #define _(x) x
 #define __(x) x
 #define INCBIN_U8 {0}
@@ -27,14 +27,6 @@ int strcmp (const char *, const char *);
 
 #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided\n")
 
-#define nonmatching(fndec, x) {\
-__attribute__((naked))\
-fndec\
-{\
-    asm_unified(x);\
-}\
-}
-
 #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))
 
 #define POKEMON_SLOTS_NUMBER 412
@@ -241,8 +233,8 @@ struct EasyChatPair
 
 struct TVShowCommon
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
+    /*0x00*/ u8 kind;
+    /*0x01*/ bool8 active;
     /*0x02*/ u8 pad02[20];
     /*0x16*/ u16 var16[3];
     /*0x1C*/ u8 srcTrainerId3Lo;
@@ -257,8 +249,8 @@ struct TVShowCommon
 
 struct TVShowFanClubLetter
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
+    /*0x00*/ u8 kind;
+    /*0x01*/ bool8 active;
     /*0x02*/ u16 species;
     /*0x04*/ u16 pad04[6];
     /*0x10*/ u8 playerName[8];
@@ -267,8 +259,8 @@ struct TVShowFanClubLetter
 
 struct TVShowRecentHappenings
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
+    /*0x00*/ u8 kind;
+    /*0x01*/ bool8 active;
     /*0x02*/ u16 var02;
     /*0x04*/ u16 var04[6];
     /*0x10*/ u8 playerName[8];
@@ -278,8 +270,8 @@ struct TVShowRecentHappenings
 
 struct TVShowFanclubOpinions
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
+    /*0x00*/ u8 kind;
+    /*0x01*/ bool8 active;
     /*0x02*/ u16 var02;
     /*0x04*/ u8 var04A:4;
     /*0x04*/ u8 var04B:4;
@@ -294,16 +286,16 @@ struct TVShowFanclubOpinions
 
 struct TVShowUnknownType04
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
+    /*0x00*/ u8 kind;
+    /*0x01*/ bool8 active;
     /*0x02*/ u8 pad02[4];
     /*0x06*/ u16 var06;
 };
 
 struct TVShowNameRaterShow
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
+    /*0x00*/ u8 kind;
+    /*0x01*/ bool8 active;
     /*0x02*/ u16 species;
     /*0x04*/ u8 pokemonName[11];
     /*0x0F*/ u8 trainerName[11];
@@ -316,8 +308,8 @@ struct TVShowNameRaterShow
 
 struct TVShowBravoTrainerPokemonProfiles
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
+    /*0x00*/ u8 kind;
+    /*0x01*/ bool8 active;
     /*0x02*/ u16 species;
     /*0x04*/ u16 var04[2];
     /*0x08*/ u8 pokemonNickname[11];
@@ -333,8 +325,8 @@ struct TVShowBravoTrainerPokemonProfiles
 
 struct TVShowBravoTrainerBattleTowerSpotlight
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
+    /*0x00*/ u8 kind;
+    /*0x01*/ bool8 active;
     /*0x02*/ u8 trainerName[8];
     /*0x0A*/ u16 species;
     /*0x0C*/ u8 pokemonName[8];
@@ -349,8 +341,8 @@ struct TVShowBravoTrainerBattleTowerSpotlight
 
 struct TVShowPokemonToday
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
+    /*0x00*/ u8 kind;
+    /*0x01*/ bool8 active;
     /*0x02*/ u8 language;
     /*0x03*/ u8 language2;
     /*0x04*/ u8 nickname[11];
@@ -362,8 +354,8 @@ struct TVShowPokemonToday
 
 struct TVShowSmartShopper
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
+    /*0x00*/ u8 kind;
+    /*0x01*/ bool8 active;
     /*0x02*/ u8 priceReduced;
     /*0x03*/ u8 language;
     /*0x04*/ u8 pad04[2];
@@ -375,8 +367,8 @@ struct TVShowSmartShopper
 
 struct TVShowPokemonTodayFailed
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
+    /*0x00*/ u8 kind;
+    /*0x01*/ bool8 active;
     /*0x02*/ u8 language;
     /*0x03*/ u8 pad03[9];
     /*0x0c*/ u16 species;
@@ -389,8 +381,8 @@ struct TVShowPokemonTodayFailed
 
 struct TVShowPokemonAngler
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
+    /*0x00*/ u8 kind;
+    /*0x01*/ bool8 active;
     /*0x02*/ u8 var02;
     /*0x03*/ u8 var03;
     /*0x04*/ u16 var04;
@@ -401,8 +393,8 @@ struct TVShowPokemonAngler
 
 struct TVShowWorldOfMasters
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
+    /*0x00*/ u8 kind;
+    /*0x01*/ bool8 active;
     /*0x02*/ u16 var02;
     /*0x04*/ u16 var04;
     /*0x06*/ u16 var06;
@@ -415,8 +407,8 @@ struct TVShowWorldOfMasters
 
 struct TVShowMassOutbreak
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
+    /*0x00*/ u8 kind;
+    /*0x01*/ bool8 active;
     /*0x02*/ u8 var02;
     /*0x03*/ u8 var03;
     /*0x04*/ u16 moves[4];
@@ -428,7 +420,7 @@ struct TVShowMassOutbreak
     /*0x13*/ u8 probability;
     /*0x14*/ u8 level;
     /*0x15*/ u8 var15;
-    /*0x16*/ u16 var16;
+    /*0x16*/ u16 daysLeft;
     /*0x18*/ u8 language;
              u8 pad19[11];
 };
@@ -524,11 +516,11 @@ union MauvilleMan
     u8 filler[0x40];  // needed to pad out the struct
 };
 
-struct UnknownSaveStruct2ABC
+struct PokeNews
 {
-    u8 val0;
-    u8 val1;
-    u16 val2;
+    u8 kind;
+    u8 state;
+    u16 days;
 };
 
 struct GabbyAndTyData
@@ -671,7 +663,7 @@ struct SaveBlock1 /* 0x02025734 */
     /*0x272C*/ u8 decorCushion[10];
     /*0x2736*/ u8 padding_2736[2];
     /*0x2738*/ TVShow tvShows[25];
-    /*0x2ABC*/ struct UnknownSaveStruct2ABC unknown_2ABC[16];
+    /*0x2ABC*/ struct PokeNews pokeNews[16];
     /*0x2AFC*/ u16 outbreakPokemonSpecies;
     /*0x2AFE*/ u8 outbreakLocationMapNum;
     /*0x2AFF*/ u8 outbreakLocationMapGroup;