diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 17:43:11 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 17:43:11 -0500 |
| commit | e86234ff99ffa4b60df180d462c2af0f1ed4d447 (patch) | |
| tree | 0d7240ce350146c6fa2189bf89aa96b08f3a6fdc /include/ewram.h | |
| parent | 1ff1e8ce9547d646b17b135b3013a516d17f35db (diff) | |
| parent | 7e3495747035d13f72ba869195b21f4e61ee283a (diff) | |
Merge branch 'master' into pokemon_storage_system
Diffstat (limited to 'include/ewram.h')
| -rwxr-xr-x | include/ewram.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/ewram.h b/include/ewram.h index 1b49e12de..23812cc4f 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -20,7 +20,7 @@ extern u8 gSharedMem[]; #define eBrendanSprite (gSharedMem + 0x0) #define ewram0_6 (u32)(&gSharedMem[0]) #define ewram0_7 (&gSharedMem[0]) -#define eSaveSection (struct SaveSection *)(gSharedMem + 0x0) +#define eSaveSection (struct SaveSector *)(gSharedMem + 0x0) #define ewram0arr ((u8 (*)[32])gSharedMem) #define eVoidSharedArr (void *)(ewram_addr + 0x0) #define eVoidSharedArr2 (u32)(ewram_addr) // ew(ram) @@ -231,6 +231,8 @@ extern u8 gSharedMem[]; #define eCableCar2 ((struct CableCarEwramStruct2 *)(gSharedMem + 0x19000)) #define ePokedexView3 (struct PokedexView *)(gSharedMem + 0x19000) #define eRoulette ((struct Roulette *)(gSharedMem + 0x19000)) +#define shared192D0 (*(struct UnknownContestStruct7 *)(gSharedMem + 0x192D0)) +#define eContestAI ((struct ContestAIInfo *)(gSharedMem + 0x192E4)) #define EWRAM_19348 (*(u16 *)(gSharedMem + 0x19348)) #define ewram19800 (&gSharedMem[0x19800]) #define ePokedexView4 (struct PokedexView *)(gSharedMem + 0x19800) |