diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-28 20:18:00 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-28 20:18:00 -0500 |
| commit | 6bef5a2622b432049df9c8b581e21ae09965b02c (patch) | |
| tree | d764c1d61d17018c41ef9eab403137d5aeef17d0 /include/ewram.h | |
| parent | 4327bee485510b424cbf28e450d90ff50e6fe78b (diff) | |
| parent | e92ead0e159ccaa8301b189b9ef2bb1a33b2ea62 (diff) | |
merge
Diffstat (limited to 'include/ewram.h')
| -rw-r--r-- | include/ewram.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/ewram.h b/include/ewram.h index 6f42925c1..2f1c2d1ab 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -8,7 +8,7 @@ extern u8 gSharedMem[]; // regions overlap others but have different definitions. Until some // dupes can be determined to be the same, they will be deliberate // seperated. -#define eWeatherPaletteData (*(struct WeatherPaletteData *)gSharedMem) +#define eDroughtPaletteData (*(struct WeatherPaletteData *)gSharedMem) #define gBattleStruct ((struct BattleStruct *) (gSharedMem + 0x0)) #define ewram0_2 (*(struct Struct2000000 *)(gSharedMem + 0x0)) #define namingScreenData (*(struct NamingScreenData *)(gSharedMem + 0x0)) @@ -261,6 +261,7 @@ extern u8 gSharedMem[]; #define eHallOfFame (struct HallOfFame *)(gSharedMem + 0x1E000) #define HALL_OF_FAME_SHEET_0 ((u8 *)(gSharedMem + 0x1E000)) #define ewram1E000_2 (const u8 *)(gSharedMem + 0x1E000) +#define eContestLinkSendBuffer gSharedMem + 0x1E000 #define HALL_OF_FAME_SHEET_1 ((u8 *)(gSharedMem + 0x1E800)) #define ewram_1f000 (*(struct DecoPCPointers *)(gSharedMem + 0x1f000)) #define ewramSavedPokeballsPocket ((struct ItemSlot *)(gSharedMem + 0x1F000)) // saved Pokeballs pocket (for Wally battle) |