diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-06 20:57:36 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-06 20:57:36 -0500 |
| commit | 86f0291f63ff6bc580476dae3c00fc4d6d7b15da (patch) | |
| tree | 37d03c82f0b43a4a0b856610c5b36fe96dc3ebed /include/ewram.h | |
| parent | deac7fd3706ea9de855330881e2555a8c70d72f3 (diff) | |
| parent | 680d3fd7b980578024226eccffe2e01072826227 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'include/ewram.h')
| -rwxr-xr-x | include/ewram.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/ewram.h b/include/ewram.h index 5a350840a..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,9 +214,9 @@ 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 ewram19348 (*(struct Struct2019348 *)(gSharedMem + 0x19348)) #define ewram19800 (&gSharedMem[0x19800]) #define ePokedexView4 (struct PokedexView *)(gSharedMem + 0x19800) #define ewram1A000 (&gSharedMem[0x1A000]) |