diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ewram.h | 5 | ||||
| -rw-r--r-- | include/pokedex_cry_screen.h | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/include/ewram.h b/include/ewram.h index 066aa5529..f19a882fe 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -47,6 +47,11 @@ extern u8 gSharedMem[]; #define ePokedexView3 (struct PokedexView *)(gSharedMem + 0x19000) #define ePokedexView4 (struct PokedexView *)(gSharedMem + 0x19800) +// pokedex_cry_screen.c +#define sCryWaveformWindowTiledata (&gSharedMem[0]) +#define ePokedexCryScreen (*(struct PokedexCryScreen *)(gSharedMem + 0x1C000)) +#define ePokedexCryScreen2 (*(struct PokedexCryMeterNeedle *)(gSharedMem + 0x1C800)) + #define ewram8000 (&gSharedMem[0x8000]) #define ewram8800 (&gSharedMem[0x8800]) #define ewram9000 (&gSharedMem[0x9000]) diff --git a/include/pokedex_cry_screen.h b/include/pokedex_cry_screen.h index 8e64bde8a..d2134eb51 100644 --- a/include/pokedex_cry_screen.h +++ b/include/pokedex_cry_screen.h @@ -3,16 +3,16 @@ struct CryScreenWindow { - u16 unk0; - u8 unk2; + u16 charBase; + u8 screenBase; u8 paletteNo; u8 xPos; u8 yPos; }; -u8 ShowPokedexCryScreen(struct CryScreenWindow *, u8); -u8 LoadCryWaveformWindow(struct CryScreenWindow *, u8); -void UpdateCryWaveformWindow(u8 a); +bool8 ShowPokedexCryScreen(struct CryScreenWindow * cry, u8 arg1); +bool8 LoadCryWaveformWindow(struct CryScreenWindow * cry, u8 bgId); +void UpdateCryWaveformWindow(u8 bgId); void CryScreenPlayButton(u16 species); void DestroyCryMeterNeedleSprite(); |