diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2019-07-30 21:31:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 21:31:27 -0500 |
| commit | bc159dbb03735db55e6a09bb7947dccc70d0532b (patch) | |
| tree | 5b27866fe839d0f2f7ae76e0f13580ecea2dd863 /include/ewram.h | |
| parent | b8393b3a799f92e7064c266600607d98f6baf4d9 (diff) | |
| parent | cf0da4c3bb5658908275068591fe51fb6f2ce49d (diff) | |
Merge pull request #752 from camthesaxman/emerald_diff
resolve some Emerald differences
Diffstat (limited to 'include/ewram.h')
| -rw-r--r-- | include/ewram.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ewram.h b/include/ewram.h index 390ad9d80..4042ea03b 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -195,9 +195,9 @@ extern u8 gSharedMem[]; #define eCableCar1 ((struct CableCarEwramStruct1 *)(gSharedMem + 0x17000)) #define ewram17002 (&gSharedMem[0x17002]) #define eFlashFireArr (*(struct Struct2017100 *)(gSharedMem + 0x17100)) -#define B_BATTLESCRIPTS_STACK ((struct scriptsStack *) (gSharedMem + 0x17110)) +#define B_BATTLESCRIPTS_STACK ((struct BattleScriptsStack *) (gSharedMem + 0x17110)) #define ewram17130 (gSharedMem[0x17130]) -#define B_FUNCTION_STACK ((struct funcStack *) (gSharedMem + 0x17140)) +#define B_FUNCTION_STACK ((struct BattleCallbacksStack *) (gSharedMem + 0x17140)) #define ewram17160 (gSharedMem[0x17160]) #define ewram17800 ((struct Struct2017800 *) (gSharedMem + 0x17800)) #define ewram17800_2 (&gSharedMem[0x17800]) |