diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-15 01:24:44 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-15 01:24:44 +0100 |
| commit | 6d2302637dbc7dfd597c7f95de780b1a21079f15 (patch) | |
| tree | b1e67e0043114a0ecad9dfb1a59d636cbc16083d /include/ewram.h | |
| parent | 8602ff770030d84d2d18cccd961c07f195dc0a17 (diff) | |
| parent | 20de25004946139a601cd2965afc2e9645a56b96 (diff) | |
Merge remote-tracking branch 'upstream/master' into various_data
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 809d4ff66..36081dd2a 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) @@ -234,6 +234,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) |