diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 15:29:45 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 15:29:45 -0400 |
| commit | 2c1048f683f06ee0753ae43ab2c2225be7ae0a56 (patch) | |
| tree | 191765eae6d9b9f5610295471270666b88fe7c9b /include | |
| parent | d172b9ed71485e45f4896beb637ab536e10cc138 (diff) | |
Merge roulette ewram pointers
Diffstat (limited to 'include')
| -rw-r--r-- | include/ewram.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/ewram.h b/include/ewram.h index 24d7d9033..0a66c15d9 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -167,13 +167,12 @@ extern u8 gSharedMem[]; #define eBerryBlenderData (struct BerryBlenderData*)(&gSharedMem[0x18000]) #define eEggHatchData (struct EggHatchData*)(&gSharedMem[0x18000]) #define pssData (*(struct PokemonSummaryScreenStruct *)(gSharedMem + 0x18000)) -#define ewram18800 (&gSharedMem[0x18800]) -#define ewram189a0 ((u16 *)(gSharedMem + 0x189A0)) -#define ewram18a20 ((u16 *)(gSharedMem + 0x18A20)) -#define ewram18a32 ((u16 *)(gSharedMem + 0x18A32)) -#define ewram18a80 ((u16 *)(gSharedMem + 0x18a80)) -#define eCableCar2 ((struct CableCarEwramStruct2 *)(gSharedMem + 0x19000)) + +// roulette.c +#define ewram18800 ((u16 *)(gSharedMem + 0x18800)) #define eRoulette ((struct Roulette *)(gSharedMem + 0x19000)) + +#define eCableCar2 ((struct CableCarEwramStruct2 *)(gSharedMem + 0x19000)) #define ewram1A000 (&gSharedMem[0x1A000]) #define ePartyMenu2 (*(struct Unk201B000 *)(gSharedMem + 0x1B000)) #define gPartyMenu (*(struct PartyMenu *)(gSharedMem + 0x1C000)) |