diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-16 17:45:16 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-16 17:45:16 -0500 |
| commit | 9e4d9171e3a2d1d239cb66f1fdff09f069941589 (patch) | |
| tree | bb5f83f567af2b1fa5ebe8ad41c67ab6162bfc5f /include/ewram.h | |
| parent | dc872c0cbf1983d06b382dc0747df9140c9ecc03 (diff) | |
| parent | 76250c7ab091bafe083f6024694549462dbfb100 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into fixes
Diffstat (limited to 'include/ewram.h')
| -rw-r--r-- | include/ewram.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ewram.h b/include/ewram.h index 36081dd2a..6f42925c1 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -9,7 +9,7 @@ extern u8 gSharedMem[]; // dupes can be determined to be the same, they will be deliberate // seperated. #define eWeatherPaletteData (*(struct WeatherPaletteData *)gSharedMem) -#define BATTLE_STRUCT ((struct BattleStruct *) (gSharedMem + 0x0)) +#define gBattleStruct ((struct BattleStruct *) (gSharedMem + 0x0)) #define ewram0_2 (*(struct Struct2000000 *)(gSharedMem + 0x0)) #define namingScreenData (*(struct NamingScreenData *)(gSharedMem + 0x0)) #define ewramBerryPic (gSharedMem + 0x0) |