diff --git a/readme.txt b/readme.txt index d211a76..8a0a97c 100644 --- a/readme.txt +++ b/readme.txt @@ -38,7 +38,7 @@ https://github.com/dborth/vbagx/releases |0Oื๘oท UPDATE HISTORY ทo๘ืO0| `จ•จจจจจ จจจจจจจจจจจจจจจจ จจจจจจจจจจจจจจจ จจจจจจจจจจจจจจจจจจจจ จจจจจจจจจจจจจ' -[2.3.7 - August 14, 2018] +[2.3.7] * Allow loader to pass two arguments instead of three (libertyernie) * don't reset settings when going back to an older version diff --git a/source/images/battery.png b/source/images/battery.png index 1733f41..6a723d0 100644 Binary files a/source/images/battery.png and b/source/images/battery.png differ diff --git a/source/images/battery_bar.png b/source/images/battery_bar.png index 474f24d..d864b57 100644 Binary files a/source/images/battery_bar.png and b/source/images/battery_bar.png differ diff --git a/source/images/battery_red.png b/source/images/battery_red.png index fd7d995..5d111c2 100644 Binary files a/source/images/battery_red.png and b/source/images/battery_red.png differ diff --git a/source/images/bg_bottom.png b/source/images/bg_bottom.png index c2516b3..40a04f4 100644 Binary files a/source/images/bg_bottom.png and b/source/images/bg_bottom.png differ diff --git a/source/images/bg_game_selection.png b/source/images/bg_game_selection.png index f900327..9a5e6ed 100644 Binary files a/source/images/bg_game_selection.png and b/source/images/bg_game_selection.png differ diff --git a/source/images/bg_game_selection_entry.png b/source/images/bg_game_selection_entry.png index a071513..c7627dc 100644 Binary files a/source/images/bg_game_selection_entry.png and b/source/images/bg_game_selection_entry.png differ diff --git a/source/images/bg_options.png b/source/images/bg_options.png index 16b09d9..f8fd28c 100644 Binary files a/source/images/bg_options.png and b/source/images/bg_options.png differ diff --git a/source/images/bg_options_entry.png b/source/images/bg_options_entry.png index a1d24d6..5ccc0ad 100644 Binary files a/source/images/bg_options_entry.png and b/source/images/bg_options_entry.png differ diff --git a/source/images/bg_preview.png b/source/images/bg_preview.png index a1ad253..a11ad20 100644 Binary files a/source/images/bg_preview.png and b/source/images/bg_preview.png differ diff --git a/source/images/bg_top.png b/source/images/bg_top.png index 6ab2bc3..02f3e9a 100644 Binary files a/source/images/bg_top.png and b/source/images/bg_top.png differ diff --git a/source/images/button.png b/source/images/button.png index 7e1f62e..039134e 100644 Binary files a/source/images/button.png and b/source/images/button.png differ diff --git a/source/images/button_arrow_down.png b/source/images/button_arrow_down.png index 99dce0a..5bc2f22 100644 Binary files a/source/images/button_arrow_down.png and b/source/images/button_arrow_down.png differ diff --git a/source/images/button_arrow_down_over.png b/source/images/button_arrow_down_over.png index 7214e37..a8fb2aa 100644 Binary files a/source/images/button_arrow_down_over.png and b/source/images/button_arrow_down_over.png differ diff --git a/source/images/button_arrow_left.png b/source/images/button_arrow_left.png index cdd38cc..e88bba7 100644 Binary files a/source/images/button_arrow_left.png and b/source/images/button_arrow_left.png differ diff --git a/source/images/button_arrow_left_over.png b/source/images/button_arrow_left_over.png index 9dfcd55..70e6dac 100644 Binary files a/source/images/button_arrow_left_over.png and b/source/images/button_arrow_left_over.png differ diff --git a/source/images/button_arrow_right.png b/source/images/button_arrow_right.png index bcb2d1a..a961ce7 100644 Binary files a/source/images/button_arrow_right.png and b/source/images/button_arrow_right.png differ diff --git a/source/images/button_arrow_right_over.png b/source/images/button_arrow_right_over.png index fa77a5a..246ff2c 100644 Binary files a/source/images/button_arrow_right_over.png and b/source/images/button_arrow_right_over.png differ diff --git a/source/images/button_arrow_up.png b/source/images/button_arrow_up.png index 2ee47d1..d2922b6 100644 Binary files a/source/images/button_arrow_up.png and b/source/images/button_arrow_up.png differ diff --git a/source/images/button_arrow_up_over.png b/source/images/button_arrow_up_over.png index ccea587..60713c9 100644 Binary files a/source/images/button_arrow_up_over.png and b/source/images/button_arrow_up_over.png differ diff --git a/source/images/button_gamesave.png b/source/images/button_gamesave.png index 389e920..eaddc3a 100644 Binary files a/source/images/button_gamesave.png and b/source/images/button_gamesave.png differ diff --git a/source/images/button_gamesave_blank.png b/source/images/button_gamesave_blank.png index b782ec6..cf2f10e 100644 Binary files a/source/images/button_gamesave_blank.png and b/source/images/button_gamesave_blank.png differ diff --git a/source/images/button_gamesave_over.png b/source/images/button_gamesave_over.png index 28bb677..27780ca 100644 Binary files a/source/images/button_gamesave_over.png and b/source/images/button_gamesave_over.png differ diff --git a/source/images/button_large.png b/source/images/button_large.png index d1a4656..ea19fd1 100644 Binary files a/source/images/button_large.png and b/source/images/button_large.png differ diff --git a/source/images/button_large_over.png b/source/images/button_large_over.png index 9fd0df8..42e88ae 100644 Binary files a/source/images/button_large_over.png and b/source/images/button_large_over.png differ diff --git a/source/images/button_long.png b/source/images/button_long.png index 8b2db08..404f0af 100644 Binary files a/source/images/button_long.png and b/source/images/button_long.png differ diff --git a/source/images/button_long_over.png b/source/images/button_long_over.png index 7bd7a54..f8e84d6 100644 Binary files a/source/images/button_long_over.png and b/source/images/button_long_over.png differ diff --git a/source/images/button_over.png b/source/images/button_over.png index a55dbd4..fd8e6f7 100644 Binary files a/source/images/button_over.png and b/source/images/button_over.png differ diff --git a/source/images/button_prompt.png b/source/images/button_prompt.png index 7e1f62e..039134e 100644 Binary files a/source/images/button_prompt.png and b/source/images/button_prompt.png differ diff --git a/source/images/button_prompt_over.png b/source/images/button_prompt_over.png index a55dbd4..fd8e6f7 100644 Binary files a/source/images/button_prompt_over.png and b/source/images/button_prompt_over.png differ diff --git a/source/images/button_short.png b/source/images/button_short.png index 4b5b1e3..0ed34f0 100644 Binary files a/source/images/button_short.png and b/source/images/button_short.png differ diff --git a/source/images/button_short_over.png b/source/images/button_short_over.png index dd55f84..9b86a4c 100644 Binary files a/source/images/button_short_over.png and b/source/images/button_short_over.png differ diff --git a/source/images/button_small.png b/source/images/button_small.png index 9813159..9883105 100644 Binary files a/source/images/button_small.png and b/source/images/button_small.png differ diff --git a/source/images/button_small_over.png b/source/images/button_small_over.png index fbec6ac..dbb68b8 100644 Binary files a/source/images/button_small_over.png and b/source/images/button_small_over.png differ diff --git a/source/images/credits_box.png b/source/images/credits_box.png index 0ce9aa0..9ed4be1 100644 Binary files a/source/images/credits_box.png and b/source/images/credits_box.png differ diff --git a/source/images/dialogue_box.png b/source/images/dialogue_box.png index 575b8c5..1231ba9 100644 Binary files a/source/images/dialogue_box.png and b/source/images/dialogue_box.png differ diff --git a/source/images/icon_dvd.png b/source/images/icon_dvd.png index c8e7356..a40c84c 100644 Binary files a/source/images/icon_dvd.png and b/source/images/icon_dvd.png differ diff --git a/source/images/icon_folder.png b/source/images/icon_folder.png index 14fab1d..aabc7c9 100644 Binary files a/source/images/icon_folder.png and b/source/images/icon_folder.png differ diff --git a/source/images/icon_game_cheats.png b/source/images/icon_game_cheats.png index e45c70c..af9d02c 100644 Binary files a/source/images/icon_game_cheats.png and b/source/images/icon_game_cheats.png differ diff --git a/source/images/icon_game_delete.png b/source/images/icon_game_delete.png index 0502b49..4d3bb5d 100644 Binary files a/source/images/icon_game_delete.png and b/source/images/icon_game_delete.png differ diff --git a/source/images/icon_game_load.png b/source/images/icon_game_load.png index 19c11d3..54735d0 100644 Binary files a/source/images/icon_game_load.png and b/source/images/icon_game_load.png differ diff --git a/source/images/icon_game_reset.png b/source/images/icon_game_reset.png index 4366373..fb81da6 100644 Binary files a/source/images/icon_game_reset.png and b/source/images/icon_game_reset.png differ diff --git a/source/images/icon_game_save.png b/source/images/icon_game_save.png index 121c462..eea1701 100644 Binary files a/source/images/icon_game_save.png and b/source/images/icon_game_save.png differ diff --git a/source/images/icon_game_settings.png b/source/images/icon_game_settings.png index b47dabe..e396335 100644 Binary files a/source/images/icon_game_settings.png and b/source/images/icon_game_settings.png differ diff --git a/source/images/icon_home.png b/source/images/icon_home.png index b1fac47..2417a47 100644 Binary files a/source/images/icon_home.png and b/source/images/icon_home.png differ diff --git a/source/images/icon_sd.png b/source/images/icon_sd.png index 7f12ae8..d7b7fb3 100644 Binary files a/source/images/icon_sd.png and b/source/images/icon_sd.png differ diff --git a/source/images/icon_settings.png b/source/images/icon_settings.png index 690763f..75266ac 100644 Binary files a/source/images/icon_settings.png and b/source/images/icon_settings.png differ diff --git a/source/images/icon_settings_classic.png b/source/images/icon_settings_classic.png index bce6d72..63b8bf0 100644 Binary files a/source/images/icon_settings_classic.png and b/source/images/icon_settings_classic.png differ diff --git a/source/images/icon_settings_file.png b/source/images/icon_settings_file.png index 41ab994..42816e4 100644 Binary files a/source/images/icon_settings_file.png and b/source/images/icon_settings_file.png differ diff --git a/source/images/icon_settings_gamecube.png b/source/images/icon_settings_gamecube.png index 1c113a1..331e730 100644 Binary files a/source/images/icon_settings_gamecube.png and b/source/images/icon_settings_gamecube.png differ diff --git a/source/images/icon_settings_mappings.png b/source/images/icon_settings_mappings.png index f29ca36..09e7193 100644 Binary files a/source/images/icon_settings_mappings.png and b/source/images/icon_settings_mappings.png differ diff --git a/source/images/icon_settings_menu.png b/source/images/icon_settings_menu.png index b0c86c2..1191990 100644 Binary files a/source/images/icon_settings_menu.png and b/source/images/icon_settings_menu.png differ diff --git a/source/images/icon_settings_network.png b/source/images/icon_settings_network.png index fc53f51..dc6e025 100644 Binary files a/source/images/icon_settings_network.png and b/source/images/icon_settings_network.png differ diff --git a/source/images/icon_settings_nunchuk.png b/source/images/icon_settings_nunchuk.png index 55052a1..e997d28 100644 Binary files a/source/images/icon_settings_nunchuk.png and b/source/images/icon_settings_nunchuk.png differ diff --git a/source/images/icon_settings_screenshot.png b/source/images/icon_settings_screenshot.png index 6cc3a45..618ddbf 100644 Binary files a/source/images/icon_settings_screenshot.png and b/source/images/icon_settings_screenshot.png differ diff --git a/source/images/icon_settings_video.png b/source/images/icon_settings_video.png index 19eab99..50f0567 100644 Binary files a/source/images/icon_settings_video.png and b/source/images/icon_settings_video.png differ diff --git a/source/images/icon_settings_wiimote.png b/source/images/icon_settings_wiimote.png index d337aec..a39f52d 100644 Binary files a/source/images/icon_settings_wiimote.png and b/source/images/icon_settings_wiimote.png differ diff --git a/source/images/icon_smb.png b/source/images/icon_smb.png index 5b62deb..d31ca56 100644 Binary files a/source/images/icon_smb.png and b/source/images/icon_smb.png differ diff --git a/source/images/icon_usb.png b/source/images/icon_usb.png index 9b6c82a..276aff0 100644 Binary files a/source/images/icon_usb.png and b/source/images/icon_usb.png differ diff --git a/source/images/keyboard_key.png b/source/images/keyboard_key.png index 86ad85d..013f93f 100644 Binary files a/source/images/keyboard_key.png and b/source/images/keyboard_key.png differ diff --git a/source/images/keyboard_key_over.png b/source/images/keyboard_key_over.png index 6e734cf..a624fce 100644 Binary files a/source/images/keyboard_key_over.png and b/source/images/keyboard_key_over.png differ diff --git a/source/images/keyboard_largekey.png b/source/images/keyboard_largekey.png index 7b7a2d2..1c7ed56 100644 Binary files a/source/images/keyboard_largekey.png and b/source/images/keyboard_largekey.png differ diff --git a/source/images/keyboard_largekey_over.png b/source/images/keyboard_largekey_over.png index 13905e9..614c70f 100644 Binary files a/source/images/keyboard_largekey_over.png and b/source/images/keyboard_largekey_over.png differ diff --git a/source/images/keyboard_mediumkey.png b/source/images/keyboard_mediumkey.png index 351ba48..315de9a 100644 Binary files a/source/images/keyboard_mediumkey.png and b/source/images/keyboard_mediumkey.png differ diff --git a/source/images/keyboard_mediumkey_over.png b/source/images/keyboard_mediumkey_over.png index b38e6d0..d1aeb9b 100644 Binary files a/source/images/keyboard_mediumkey_over.png and b/source/images/keyboard_mediumkey_over.png differ diff --git a/source/images/keyboard_textbox.png b/source/images/keyboard_textbox.png index 48cacce..da484d5 100644 Binary files a/source/images/keyboard_textbox.png and b/source/images/keyboard_textbox.png differ diff --git a/source/images/logo.png b/source/images/logo.png index 1700726..277cd97 100644 Binary files a/source/images/logo.png and b/source/images/logo.png differ diff --git a/source/images/logo_over.png b/source/images/logo_over.png index eccb043..e9f8a9b 100644 Binary files a/source/images/logo_over.png and b/source/images/logo_over.png differ diff --git a/source/images/player1_grab.png b/source/images/player1_grab.png index d95c2b3..df5c6a7 100644 Binary files a/source/images/player1_grab.png and b/source/images/player1_grab.png differ diff --git a/source/images/player1_point.png b/source/images/player1_point.png index 19f94e8..6e34355 100644 Binary files a/source/images/player1_point.png and b/source/images/player1_point.png differ diff --git a/source/images/player2_grab.png b/source/images/player2_grab.png index 5f3f6ab..1b015fe 100644 Binary files a/source/images/player2_grab.png and b/source/images/player2_grab.png differ diff --git a/source/images/player2_point.png b/source/images/player2_point.png index f4b1232..cfc99b8 100644 Binary files a/source/images/player2_point.png and b/source/images/player2_point.png differ diff --git a/source/images/player3_grab.png b/source/images/player3_grab.png index c0c3546..3513bb7 100644 Binary files a/source/images/player3_grab.png and b/source/images/player3_grab.png differ diff --git a/source/images/player3_point.png b/source/images/player3_point.png index e88b90f..e0a124f 100644 Binary files a/source/images/player3_point.png and b/source/images/player3_point.png differ diff --git a/source/images/player4_grab.png b/source/images/player4_grab.png index 7e9a814..157945a 100644 Binary files a/source/images/player4_grab.png and b/source/images/player4_grab.png differ diff --git a/source/images/player4_point.png b/source/images/player4_point.png index 68bb3aa..68f537f 100644 Binary files a/source/images/player4_point.png and b/source/images/player4_point.png differ diff --git a/source/images/progressbar.png b/source/images/progressbar.png index 87ec09d..cb21352 100644 Binary files a/source/images/progressbar.png and b/source/images/progressbar.png differ diff --git a/source/images/progressbar_empty.png b/source/images/progressbar_empty.png index ddf53cd..d7781b2 100644 Binary files a/source/images/progressbar_empty.png and b/source/images/progressbar_empty.png differ diff --git a/source/images/progressbar_outline.png b/source/images/progressbar_outline.png index c3fdcf7..7d7c73d 100644 Binary files a/source/images/progressbar_outline.png and b/source/images/progressbar_outline.png differ diff --git a/source/images/screen_position.png b/source/images/screen_position.png index 21e4311..5c6111e 100644 Binary files a/source/images/screen_position.png and b/source/images/screen_position.png differ diff --git a/source/images/scrollbar.png b/source/images/scrollbar.png index 9d99f6f..42b3a4d 100644 Binary files a/source/images/scrollbar.png and b/source/images/scrollbar.png differ diff --git a/source/images/scrollbar_arrowdown.png b/source/images/scrollbar_arrowdown.png index e0705f5..ac2aa53 100644 Binary files a/source/images/scrollbar_arrowdown.png and b/source/images/scrollbar_arrowdown.png differ diff --git a/source/images/scrollbar_arrowdown_over.png b/source/images/scrollbar_arrowdown_over.png index e9fb63f..4f4416f 100644 Binary files a/source/images/scrollbar_arrowdown_over.png and b/source/images/scrollbar_arrowdown_over.png differ diff --git a/source/images/scrollbar_arrowup.png b/source/images/scrollbar_arrowup.png index ae1d26a..57fe071 100644 Binary files a/source/images/scrollbar_arrowup.png and b/source/images/scrollbar_arrowup.png differ diff --git a/source/images/scrollbar_arrowup_over.png b/source/images/scrollbar_arrowup_over.png index 5614854..6488d2c 100644 Binary files a/source/images/scrollbar_arrowup_over.png and b/source/images/scrollbar_arrowup_over.png differ diff --git a/source/images/scrollbar_box.png b/source/images/scrollbar_box.png index 1c9d501..383c504 100644 Binary files a/source/images/scrollbar_box.png and b/source/images/scrollbar_box.png differ diff --git a/source/images/scrollbar_box_over.png b/source/images/scrollbar_box_over.png index 4e9828a..cf868e2 100644 Binary files a/source/images/scrollbar_box_over.png and b/source/images/scrollbar_box_over.png differ diff --git a/source/images/throbber.png b/source/images/throbber.png index 3ffdb2d..3097ff0 100644 Binary files a/source/images/throbber.png and b/source/images/throbber.png differ diff --git a/source/preferences.cpp b/source/preferences.cpp index 714a0a5..c704fb5 100644 --- a/source/preferences.cpp +++ b/source/preferences.cpp @@ -607,7 +607,7 @@ void FixInvalidSettings() if(!(GCSettings.yshift > -50 && GCSettings.yshift < 50)) GCSettings.yshift = 0; if(!(GCSettings.MusicVolume >= 0 && GCSettings.MusicVolume <= 100)) - GCSettings.MusicVolume = 40; + GCSettings.MusicVolume = 20; if(!(GCSettings.SFXVolume >= 0 && GCSettings.SFXVolume <= 100)) GCSettings.SFXVolume = 40; if(GCSettings.language < 0 || GCSettings.language >= LANG_LENGTH) @@ -663,7 +663,7 @@ DefaultSettings () GCSettings.WiimoteOrientation = 0; GCSettings.ExitAction = 0; - GCSettings.MusicVolume = 40; + GCSettings.MusicVolume = 20; GCSettings.SFXVolume = 40; GCSettings.Rumble = 1; GCSettings.PreviewImage = 0; diff --git a/source/sounds/bg_music.ogg b/source/sounds/bg_music.ogg index 1f212af..2cbe091 100644 Binary files a/source/sounds/bg_music.ogg and b/source/sounds/bg_music.ogg differ