diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-08 00:57:06 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-08 00:57:06 -0500 |
| commit | d82f540378be826c1eb5ba85a5e5f61b582cc36b (patch) | |
| tree | 7d48fb94de4c42dbcadb9b012911d2b2c9eda6de /include/ewram.h | |
| parent | 897107d1eae649e71213539aba7146fe2b2e2e70 (diff) | |
| parent | 0f3b635525cb19056d64560c01dbfed8fe21ceac (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into assert
Diffstat (limited to 'include/ewram.h')
| -rwxr-xr-x | include/ewram.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/ewram.h b/include/ewram.h index 17ca3508a..b07820090 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -200,13 +200,14 @@ extern u8 gSharedMem[]; #define B_FUNCTION_STACK ((struct funcStack *) (gSharedMem + 0x17140)) #define ewram17160 (gSharedMem[0x17160]) #define ewram17800 ((struct Struct2017800 *) (gSharedMem + 0x17800)) +#define ewram17800_2 (&gSharedMem[0x17800]) #define EWRAM_17800 ((struct UnknownStruct1 *)(gSharedMem + 0x17800)) #define eTransformStatuses ((struct TransformStatus *)(gSharedMem + 0x17800)) -#define ewram17800_2 (&gSharedMem[0x17800]) #define ewram17810 ((struct Struct2017810 *) (gSharedMem + 0x17810)) #define EWRAM_17810 ((struct UnknownStruct3 *)(gSharedMem + 0x17810)) #define ewram17840 (*(struct Struct2017840 *) (gSharedMem + 0x17840)) #define ewram17850 ((struct UnknownStruct5 *)(gSharedMem + 0x17850)) +#define ewram17E00 ((u16 *)(gSharedMem + 0x17E00)) #define ewram_2018000 (*(struct PlayerRecords *)(gSharedMem + 0x18000)) #define EWRAM_18000 ((u16 *)(gSharedMem + 0x18000)) #define ewram18000 ((u16 *)(gSharedMem + 0x18000)) @@ -220,9 +221,14 @@ extern u8 gSharedMem[]; #define ewram18300 ((u16 *)(gSharedMem + 0x18300)) #define ewram18800 (&gSharedMem[0x18800]) #define ePokedexView2 (struct PokedexView *)(gSharedMem + 0x18800) +#define ewram189a0 ((u16 *)(gSharedMem + 0x189A0)) +#define ewram18a20 ((u16 *)(gSharedMem + 0x18A20)) +#define ewram18a32 ((u16 *)(gSharedMem + 0x18A32)) +#define ewram18a80 ((u16 *)(gSharedMem + 0x18a80)) #define ewram19000 (&gSharedMem[0x19000]) #define eCableCar2 ((struct CableCarEwramStruct2 *)(gSharedMem + 0x19000)) #define ePokedexView3 (struct PokedexView *)(gSharedMem + 0x19000) +#define eRoulette ((struct Roulette *)(gSharedMem + 0x19000)) #define EWRAM_19348 (*(u16 *)(gSharedMem + 0x19348)) #define ewram19800 (&gSharedMem[0x19800]) #define ePokedexView4 (struct PokedexView *)(gSharedMem + 0x19800) |