diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-30 11:05:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 11:05:30 -0700 |
| commit | e437b10eee6f843e1898ce9b0302afb17f8b81e9 (patch) | |
| tree | 28c3f2e2ab47d61a49e620083897ea4567c07e3b /include | |
| parent | 13b710f83b010584d807526e64f9f28071fd4133 (diff) | |
| parent | 3b096d8aa7cc422993496b0306ca77a5cf9b1440 (diff) | |
Merge pull request #605 from PikalaxALT/pokedex_cry_screen
Finish Pokedex Cry Screen
Diffstat (limited to 'include')
| -rw-r--r-- | include/ewram.h | 1 | ||||
| -rw-r--r-- | include/main.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/ewram.h b/include/ewram.h index 6b164648b..87af8dd53 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -248,7 +248,6 @@ extern u8 gSharedMem[]; #define ewram1c000 (*(struct Unk201C000 *)(gSharedMem + 0x1C000)) // FIXME, names too similar #define eHallOfFameMons1 (struct HallofFameMons*)(&gSharedMem[0x1C000]) #define eHOFPCScreenEffect (*(struct PCScreenEffectStruct *)(gSharedMem + 0x1c000)) -#define EWRAM_1C800 (*(struct Unk201C800 *)(gSharedMem + 0x1C800)) #define ewram1D000 ((struct Pokemon *)(gSharedMem + 0x1D000)) #define ewram1D000_2 ((u16 *)(gSharedMem + 0x1D000)) #define ewram1D400 ((u16 *)(gSharedMem + 0x1D400)) diff --git a/include/main.h b/include/main.h index f348e48f8..8a7c4d67c 100644 --- a/include/main.h +++ b/include/main.h @@ -65,5 +65,6 @@ void DoSoftReset(void); void ClearPokemonCrySongs(void); extern const char BuildDateTime[]; +extern s8 gPcmDmaCounter; #endif // GUARD_MAIN_H |