diff options
| author | Nebuleon Fumika | 2013-02-08 05:50:22 -0500 |
|---|---|---|
| committer | Nebuleon Fumika | 2013-02-08 05:50:22 -0500 |
| commit | 927d456306672110870eb3386742c1c1ef8eb4f6 (patch) | |
| tree | 509da9ac1727570b02572068aefb9cdf102ad75b /source/nds/gui.h | |
| parent | 433749b6ef1e2b070755c3bb7fc0d81b5ecaa7b1 (diff) | |
| parent | d4fcf2697c9a45594e3ee0b8bf82e480ddd0b69b (diff) | |
| download | snes9x2005-927d456306672110870eb3386742c1c1ef8eb4f6.tar.gz snes9x2005-927d456306672110870eb3386742c1c1ef8eb4f6.tar.bz2 snes9x2005-927d456306672110870eb3386742c1c1ef8eb4f6.zip | |
Merge branch 'master' into 8bitsound
Conflicts:
source/nds/entry.cpp
Diffstat (limited to 'source/nds/gui.h')
| -rw-r--r-- | source/nds/gui.h | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/source/nds/gui.h b/source/nds/gui.h index 87c14e4..290a927 100644 --- a/source/nds/gui.h +++ b/source/nds/gui.h @@ -59,7 +59,20 @@ struct _GAME_CONFIG u32 HotkeyReturnToMenu; u32 HotkeyTemporaryFastForward; u32 HotkeyToggleSound; - u32 Reserved2[45]; + u32 SoundSync; + /* + * PreviouslyUsed_20130206_1 was for a second meaning of + * frameskip_value that is now dropped. + * THIS VALUE IS NOT GUARANTEED TO BE RESERVED AND SET TO 0. + */ + u32 PreviouslyUsed_20130206_1; + /* + * PreviouslyUsed_20130206_2 was for a second meaning of + * clock_speed_number that is now dropped. + * THIS VALUE IS NOT GUARANTEED TO BE RESERVED AND SET TO 0. + */ + u32 PreviouslyUsed_20130206_2; + u32 Reserved2[42]; }; typedef enum @@ -124,10 +137,13 @@ extern GAME_CONFIG game_config; /****************************************************************************** ******************************************************************************/ extern void gui_init(u32 lang_id); -extern u32 menu(u16 *original_screen); +extern u32 menu(u16 *original_screen, bool8 FirstInvocation); extern void game_disableAudio(); extern void game_set_frameskip(); -extern void set_cpu_clock(u32 num); +extern void game_set_fluidity(); +extern void LowFrequencyCPU(); +extern void HighFrequencyCPU(); +extern void GameFrequencyCPU(); extern int load_language_msg(char *filename, u32 language); #ifdef __cplusplus |