The-Homebrew-Cloud/N64FlashcartMenu
2
0
Fork 0
mirror of https://github.com/Polprzewodnikowy/N64FlashcartMenu.git synced 2025-02-17 02:26:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into cpak-management

Browse Source
This commit is contained in:
Robin Jones 2024-07-19 12:32:58 +01:00 committed by GitHub
commit 99abea6aa8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 79 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/menu/actions.c
View File

@ -21,8 +21,7 @@ static void actions_clear (menu_t *menu) {
menu->actions.back = false; menu->actions.back = false;
menu->actions.options = false; menu->actions.options = false;
menu->actions.settings = false; menu->actions.settings = false;
menu->actions.l_context = false; menu->actions.lz_context = false;
menu->actions.z_context = false;
} }
static void actions_update_direction (menu_t *menu) { static void actions_update_direction (menu_t *menu) {
@ -93,10 +92,8 @@ static void actions_update_buttons (menu_t *menu) {
menu->actions.options = true; menu->actions.options = true;
} else if (pressed.start) { } else if (pressed.start) {
menu->actions.settings = true; menu->actions.settings = true;
} else if (pressed.l) { } else if (pressed.l || pressed.z) {
menu->actions.l_context = true; menu->actions.lz_context = true;
} else if (pressed.z) {
menu->actions.z_context = true;
} }
} }

3
src/menu/menu.c
View File

@ -119,8 +119,9 @@ static void menu_init (boot_params_t *boot_params) {
__boot_tvtype = TV_NTSC; __boot_tvtype = TV_NTSC;
} }
sound_init_sfx();
if (menu->settings.sound_enabled) { if (menu->settings.sound_enabled) {
sound_init_sfx(); sound_use_sfx(true);
} }
display_init(RESOLUTION_640x480, DEPTH_16_BPP, 2, GAMMA_NONE, FILTERS_DISABLED); display_init(RESOLUTION_640x480, DEPTH_16_BPP, 2, GAMMA_NONE, FILTERS_DISABLED);

3
src/menu/menu_state.h
View File

@ -86,8 +86,7 @@ typedef struct {
bool back; bool back;
bool options; bool options;
bool settings; bool settings;
bool l_context; bool lz_context;
bool z_context;
} actions; } actions;
struct { struct {

8
src/menu/sound.c
View File

@ -50,6 +50,14 @@ void sound_init_sfx (void) {
sfx_enabled = true; sfx_enabled = true;
} }
void sound_use_sfx(bool state) {
if (state) {
sfx_enabled = true;
}
else {
sfx_enabled = false;
}
}
void sound_play_effect(sound_effect_t sfx) { void sound_play_effect(sound_effect_t sfx) {
if(sfx_enabled) { if(sfx_enabled) {

2
src/menu/sound.h
View File

@ -7,6 +7,7 @@
#ifndef SOUND_H__ #ifndef SOUND_H__
#define SOUND_H__ #define SOUND_H__
#include <stdbool.h>
#define SOUND_MP3_PLAYER_CHANNEL (0) #define SOUND_MP3_PLAYER_CHANNEL (0)
#define SOUND_SFX_CHANNEL (2) #define SOUND_SFX_CHANNEL (2)
@ -23,6 +24,7 @@ typedef enum {
void sound_init_default (void); void sound_init_default (void);
void sound_init_mp3_playback (void); void sound_init_mp3_playback (void);
void sound_init_sfx (void); void sound_init_sfx (void);
void sound_use_sfx(bool);
void sound_play_effect(sound_effect_t sfx); void sound_play_effect(sound_effect_t sfx);
void sound_deinit (void); void sound_deinit (void);
void sound_poll (void); void sound_poll (void);

96
src/menu/views/load_rom.c
View File

@ -4,7 +4,7 @@
#include "../sound.h" #include "../sound.h"
#include "views.h" #include "views.h"
static bool show_extra_info_message = false;
static bool load_pending; static bool load_pending;
static component_boxart_t *boxart; static component_boxart_t *boxart;
@ -66,16 +66,16 @@ static const char *format_rom_destination_market (rom_destination_type_t market_
} }
} }
static const char *format_rom_save_type (rom_save_type_t save_type) { static const char *format_rom_save_type (rom_save_type_t save_type, bool supports_cpak) {
switch (save_type) { switch (save_type) {
case SAVE_TYPE_NONE: return "None"; case SAVE_TYPE_NONE: return supports_cpak ? "Controller PAK" : "None";
case SAVE_TYPE_EEPROM_4KBIT: return "EEPROM 4kbit"; case SAVE_TYPE_EEPROM_4KBIT: return supports_cpak ? "EEPROM 4kbit | Controller PAK" : "EEPROM 4kbit";
case SAVE_TYPE_EEPROM_16KBIT: return "EEPROM 16kbit"; case SAVE_TYPE_EEPROM_16KBIT: return supports_cpak ? "EEPROM 16kbit | Controller PAK" : "EEPROM 16kbit";
case SAVE_TYPE_SRAM_256KBIT: return "SRAM 256kbit"; case SAVE_TYPE_SRAM_256KBIT: return supports_cpak ? "SRAM 256kbit | Controller PAK" : "SRAM 256kbit";
case SAVE_TYPE_SRAM_BANKED: return "SRAM 768kbit / 3 banks"; case SAVE_TYPE_SRAM_BANKED: return supports_cpak ? "SRAM 768kbit / 3 banks | Controller PAK" : "SRAM 768kbit / 3 banks";
case SAVE_TYPE_SRAM_1MBIT: return "SRAM 1Mbit"; case SAVE_TYPE_SRAM_1MBIT: return supports_cpak ? "SRAM 1Mbit | Controller PAK" : "SRAM 1Mbit";
case SAVE_TYPE_FLASHRAM_1MBIT: return "FlashRAM 1Mbit"; case SAVE_TYPE_FLASHRAM_1MBIT: return supports_cpak ? "FlashRAM 1Mbit | Controller PAK" : "FlashRAM 1Mbit";
case SAVE_TYPE_FLASHRAM_PKST2: return "FlashRAM (Pokemon Stadium 2)"; case SAVE_TYPE_FLASHRAM_PKST2: return supports_cpak ? "FlashRAM (Pokemon Stadium 2) | Controller PAK" : "FlashRAM (Pokemon Stadium 2)";
default: return "Unknown"; default: return "Unknown";
} }
} }
@ -203,6 +203,13 @@ static void process (menu_t *menu) {
} else if (menu->actions.options) { } else if (menu->actions.options) {
component_context_menu_show(&options_context_menu); component_context_menu_show(&options_context_menu);
sound_play_effect(SFX_SETTING); sound_play_effect(SFX_SETTING);
} else if (menu->actions.lz_context) {
if (show_extra_info_message) {
show_extra_info_message = false;
} else {
show_extra_info_message = true;
}
sound_play_effect(SFX_SETTING);
} }
} }
@ -230,50 +237,61 @@ static void draw (menu_t *menu, surface_t *d) {
"\n" "\n"
"\n" "\n"
"\n" "\n"
" Endianness: %s\n" "Description:\n None.\n\n\n\n\n\n\n\n"
" Title: %.20s\n" "Expansion PAK: %s\n"
" Game code: %c%c%c%c\n" "TV type: %s\n"
" Media type: %s\n" "CIC: %s\n"
" Destination market: %s\n" "GS/AR Cheats: Off\n"
" Version: %hhu\n" "Patches: Off\n"
" Check code: 0x%016llX\n" "Save type: %s\n",
" Save type: %s\n"
" TV type: %s\n"
" Expansion PAK: %s\n"
" CIC: %s\n"
" Boot address: 0x%08lX\n"
" SDK version: %.1f%c\n"
" Clock Rate: %.2fMHz\n",
format_rom_endianness(menu->load.rom_info.endianness),
menu->load.rom_info.title,
menu->load.rom_info.game_code[0], menu->load.rom_info.game_code[1], menu->load.rom_info.game_code[2], menu->load.rom_info.game_code[3],
format_rom_media_type(menu->load.rom_info.category_code),
format_rom_destination_market(menu->load.rom_info.destination_code),
menu->load.rom_info.version,
menu->load.rom_info.check_code,
format_rom_save_type(rom_info_get_save_type(&menu->load.rom_info)),
format_rom_tv_type(rom_info_get_tv_type(&menu->load.rom_info)),
format_rom_expansion_pak_info(menu->load.rom_info.features.expansion_pak), format_rom_expansion_pak_info(menu->load.rom_info.features.expansion_pak),
format_rom_tv_type(rom_info_get_tv_type(&menu->load.rom_info)),
format_cic_type(rom_info_get_cic_type(&menu->load.rom_info)), format_cic_type(rom_info_get_cic_type(&menu->load.rom_info)),
menu->load.rom_info.boot_address, format_rom_save_type(rom_info_get_save_type(&menu->load.rom_info), menu->load.rom_info.features.controller_pak)
(menu->load.rom_info.libultra.version / 10.0f), menu->load.rom_info.libultra.revision,
menu->load.rom_info.clock_rate
); );
component_actions_bar_text_draw( component_actions_bar_text_draw(
ALIGN_LEFT, VALIGN_TOP, ALIGN_LEFT, VALIGN_TOP,
"A: Load and run ROM\n" "A: Load and run ROM\n"
"B: Exit" "B: Back"
); );
component_actions_bar_text_draw( component_actions_bar_text_draw(
ALIGN_RIGHT, VALIGN_TOP, ALIGN_RIGHT, VALIGN_TOP,
"\n" "L|Z: Extra Info\n"
"R: Options" "R: Options"
); );
component_boxart_draw(boxart); component_boxart_draw(boxart);
if (show_extra_info_message) {
component_messagebox_draw(
"EXTRA ROM INFO\n"
"\n"
"Endianness: %s\n"
"Title: %.20s\n"
"Game code: %c%c%c%c\n"
"Media type: %s\n"
"Variant: %s\n"
"Version: %hhu\n"
"Check code: 0x%016llX\n"
"Boot address: 0x%08lX\n"
"SDK version: %.1f%c\n"
"Clock Rate: %.2fMHz\n\n\n"
"Press L|Z to return.\n",
format_rom_endianness(menu->load.rom_info.endianness),
menu->load.rom_info.title,
menu->load.rom_info.game_code[0], menu->load.rom_info.game_code[1], menu->load.rom_info.game_code[2], menu->load.rom_info.game_code[3],
format_rom_media_type(menu->load.rom_info.category_code),
format_rom_destination_market(menu->load.rom_info.destination_code),
menu->load.rom_info.version,
menu->load.rom_info.check_code,
menu->load.rom_info.boot_address,
(menu->load.rom_info.libultra.version / 10.0f), menu->load.rom_info.libultra.revision,
menu->load.rom_info.clock_rate
);
}
component_context_menu_draw(&options_context_menu); component_context_menu_draw(&options_context_menu);
} }

11
src/menu/views/settings_editor.c
View File

@ -30,6 +30,7 @@ static void set_use_saves_folder_type (menu_t *menu, void *arg) {
static void set_sound_enabled_type (menu_t *menu, void *arg) { static void set_sound_enabled_type (menu_t *menu, void *arg) {
menu->settings.sound_enabled = (bool) (arg); menu->settings.sound_enabled = (bool) (arg);
sound_use_sfx(menu->settings.sound_enabled);
settings_save(&menu->settings); settings_save(&menu->settings);
} }
@ -134,19 +135,19 @@ static void draw (menu_t *menu, surface_t *d) {
component_main_text_draw( component_main_text_draw(
ALIGN_LEFT, VALIGN_TOP, ALIGN_LEFT, VALIGN_TOP,
"\n\n" "\n\n"
" Default Directory : %s\n\n" " Default Directory : %s\n\n"
"To change the menu settings, press 'A'.\n\n" "To change the following menu settings, press 'A':\n"
" PAL60 Mode : %s\n" "* PAL60 Mode : %s\n"
" Show Hidden Files : %s\n" " Show Hidden Files : %s\n"
" Use Saves folder : %s\n" " Use Saves folder : %s\n"
"* Sound Effects : %s\n" " Sound Effects : %s\n"
#ifdef BETA_SETTINGS #ifdef BETA_SETTINGS
" Background Music : %s\n" " Background Music : %s\n"
" Rumble Feedback : %s\n" " Rumble Feedback : %s\n"
#endif #endif
"\n\n"
"Note: Certain settings have the following caveats:\n\n" "Note: Certain settings have the following caveats:\n\n"
"* Requires a flashcart reboot.\n", "* Requires a flashcart reboot.\n",
"\n",
menu->settings.default_directory, menu->settings.default_directory,
format_switch(menu->settings.pal60_enabled), format_switch(menu->settings.pal60_enabled),
format_switch(menu->settings.show_protected_entries), format_switch(menu->settings.show_protected_entries),