diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-14 01:17:28 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-14 01:17:28 +0100 |
| commit | 30858625ff6c82d7a6380a44acf5c75baa988f20 (patch) | |
| tree | 5814ac66984c481382418db28ff97f018ffc04d7 /include/ewram.h | |
| parent | 29d16a0af10c2de52de8ff37c13dd5aa3401c98f (diff) | |
| parent | 2e8f0cd4b33a7a3ea92b2b42742d78d98959d1e5 (diff) | |
Merge remote-tracking branch 'upstream/master' into battle_anim_data
Diffstat (limited to 'include/ewram.h')
| -rwxr-xr-x | include/ewram.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/ewram.h b/include/ewram.h index b07820090..809d4ff66 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -131,6 +131,11 @@ extern u8 gSharedMem[]; #define ewram16088_2 (*(u8 *)(gSharedMem + 0x16088)) #define ewram16089 (gSharedMem[0x16089]) #define ewram16089_2 (*(u8 *)(gSharedMem + 0x16089)) + +// src/battle/anim/battle_intro.c +#define ewram1608A gSharedMem[0x1608A] +#define ewram1608B gSharedMem[0x1608B] + #define ewram1608Carr(bank) (gSharedMem[0x1608C + bank]) #define EWRAM_1609D (gSharedMem[0x1609D]) #define ewram160A1 (gSharedMem[0x160A1]) |