diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-06 12:28:12 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-06 12:28:12 -0600 |
| commit | 680d3fd7b980578024226eccffe2e01072826227 (patch) | |
| tree | 45bd58a6df683e25685a2a6bd9ff2d4c5116dcf5 /include/ewram.h | |
| parent | b3551bc2f328c286c6ecc45ea288665d46b44260 (diff) | |
| parent | 7bf330e9f2b048a9b3d7882c80c9aa413c55484a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'include/ewram.h')
| -rwxr-xr-x | include/ewram.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/ewram.h b/include/ewram.h index 60fa43b41..07f9d1ad2 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -185,6 +185,7 @@ extern u8 gSharedMem[]; #define ewram17000 (&gSharedMem[0x17000]) #define eLearnMoveStruct (struct LearnMoveStruct *)(gSharedMem + 0x17000) #define eSecretBaseRecord ((struct SecretBaseRecord *)(gSharedMem + 0x17000)) +#define eCableCar1 ((struct CableCarEwramStruct1 *)(gSharedMem + 0x17000)) #define ewram17002 (&gSharedMem[0x17002]) #define eFlashFireArr (*(struct Struct2017100 *)(gSharedMem + 0x17100)) #define B_BATTLESCRIPTS_STACK ((struct scriptsStack *) (gSharedMem + 0x17110)) @@ -213,6 +214,7 @@ extern u8 gSharedMem[]; #define ewram18800 (&gSharedMem[0x18800]) #define ePokedexView2 (struct PokedexView *)(gSharedMem + 0x18800) #define ewram19000 (&gSharedMem[0x19000]) +#define eCableCar2 ((struct CableCarEwramStruct2 *)(gSharedMem + 0x19000)) #define ePokedexView3 (struct PokedexView *)(gSharedMem + 0x19000) #define EWRAM_19348 (*(u16 *)(gSharedMem + 0x19348)) #define ewram19800 (&gSharedMem[0x19800]) |