diff options
| author | Made-s <made111@gmx.de> | 2018-01-06 19:09:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 19:09:47 +0100 |
| commit | 8906ac68e7c5caf7c62597abf16affafc2bb05a3 (patch) | |
| tree | 3c523aa3c85e1d112f06b34283ddc076d0916891 /include/ewram.h | |
| parent | f813e926e6438c04167a563225b9fca0939fa758 (diff) | |
| parent | b396c6038cec6eba5eed46ed8f70f6a465acc2a6 (diff) | |
Merge branch 'master' into master
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 fbc010853..a650d6847 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)) @@ -218,6 +219,7 @@ extern u8 gSharedMem[]; #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)) |