Skip to content

Commit

Permalink
Merge branch 'ocornut:master' into 11-hap-gam-boy-2000
Browse files Browse the repository at this point in the history
  • Loading branch information
@bsittler
bsittler committed May 11, 2023
2 parents 39163a4 + 7c635bd commit 4aff576
Show file tree
Hide file tree
Showing 7 changed files with 149 additions and 114 deletions.
12 changes: 6 additions & 6 deletions meka/compat.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,15 +217,15 @@
Fushigi no Oshiro Pit Pot [Proto] (JP) - Ok
Gaegujangi Kkachi (KR) - Ok
Game Mo-eumjip 188 Hap [v0] (KR) - Ok
Game Mo-eumjip 188 Hap [v1] (KR) - **Ok
Game Mo-eumjip 188 Hap [v1] (KR) - Ok
Gain Ground 1 - Ok
Gain Ground [Proto] - Ok
Galactic Protector (JP) FM,PAD Ok
Galaxian (KR) - Ok
Galaxy Force FM Ok
Galaxy Force (US) FM Ok
Game Box Série Esportes Radicais (BR) FM Ok
Game Chongjiphap 200 (KR) - *Ok
Game Chongjiphap 200 (KR) - Ok
Game De Check! Koutsuu Anzen [Proto] (JP) FM Ok
Game Jiphap 30 Hap [SMS-MD] (KR) - *Ok
Gangcheol RoboCop (KR) - Ok
Expand Down Expand Up @@ -421,7 +421,7 @@
Phantasy Star (BR) - Ok
Phantasy Star (KR) - Ok
Phantasy Star Fukkokuban [SMS-MD] (JP) FM Ok
Pigu-Wang 7 Hap - Jaemiiss-neun Game Mo-eumjip (KR) - *Ok
Pigu-Wang 7 Hap - Jaemiiss-neun Game Mo-eumjip (KR) - Ok
Pit-Fighter - Ok
Pit-Fighter (BR) - Ok
Populous - Ok
Expand Down Expand Up @@ -559,8 +559,8 @@
Super Bubble Bobble (KR) - Ok
Super Columns (KR) - Ok
Super Futebol II [Game Box Série Esportes] (BR)- Ok
Super Game 45 (KR) - *Ok
Super Game 52 Hap (KR) - *Ok
Super Game 45 (KR) - Ok
Super Game 52 Hap (KR) - Ok
Super Game 150 (KR) - *Ok
Super Game 180 (KR) - *Ok
Super Game 200 (KR) - *Ok
Expand All @@ -578,7 +578,7 @@
Super Monaco GP [Proto 2] (US) - Ok
Super Monaco GP II (Ayrton Senna's) - Ok
Super Multi Game - Super 75 in 1 (KR) - *Ok
Super Multi Game - Super 125 in 1 (KR) - *Ok
Super Multi Game - Super 125 in 1 (KR) - Ok
Super Off Road - Ok
Super Off Road [Proto] - Ok
Super Penguin (KR) - Ok
Expand Down
204 changes: 103 additions & 101 deletions meka/history.txt
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion meka/meka.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@
Close current window .............. CTRL+F4
Cycle thru inputs windows ......... CTRL+TAB

Quit emulator ..................... F10
Quit emulator ..................... ALT+F4
Save screen to a file ............. PrintScreen

(*1) Debugger must be activated. See "How to use the debugger".
Expand Down
37 changes: 35 additions & 2 deletions meka/srcs/app_techinfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

t_app_tech_info TechInfo;

extern u8 * FM_Regs;

//-----------------------------------------------------------------------------
// Functions
//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -185,13 +187,44 @@ void TechInfo_Update(void)
// - PSG
{
t_psg *psg = &PSG;
sprintf(line, " [PSG] Tone 0: %03X,%01X Tone 1: %03X,%01X Tone 2: %03X,%01X Noise:%02X,%01X (%s)",
sprintf(line, " [PSG] Tone 0: %03X,%01X Tone 1: %03X,%01X Tone 2: %03X,%01X Noise:%02X,%01X (%s) Stereo:%02X",
psg->Registers[0], psg->Registers[1], psg->Registers[2], psg->Registers[3],
psg->Registers[4], psg->Registers[5], psg->Registers[6], psg->Registers[7],
((psg->Registers[6] & 0x04) ? "White" : "Periodic"));
((psg->Registers[6] & 0x04) ? "White" : "Periodic"),
psg->Stereo);
TechInfo_SetLine(app, line, line_idx++);
}

{
if (FM_Regs != NULL)
{
sprintf(line, " [YM2413] Custom inst: %02X/%02X/%02X/%02X/%02X/%02X/%02X/%02X Rhythm: %02X",
FM_Regs[0], FM_Regs[1], FM_Regs[2], FM_Regs[3], FM_Regs[4], FM_Regs[5], FM_Regs[6], FM_Regs[7],
FM_Regs[0xe]);
TechInfo_SetLine(app, line, line_idx++);
char* p = line;
p += sprintf(p, " [YM2413]");
for (int i = 0; i < 9; ++i)
{
p += sprintf(p, " Tone %d: %01X,%03X,%c,%c,%01X,%01X",
i,
(FM_Regs[i + 0x20] & 0x6) >> 1, // Block
FM_Regs[i + 0x10] | ((FM_Regs[i + 0x20] & 1) << 8), // F-num
(FM_Regs[i + 0x20] & 0x20) != 0 ? 'S' : '-', // Sustain
(FM_Regs[i + 0x20] & 0x10) != 0 ? 'K' : '-', // Key
FM_Regs[i + 0x30] & 0x0f, // Volume
FM_Regs[i + 0x30] >> 4 // Instrument
);
if (i % 3 == 2)
{
TechInfo_SetLine(app, line, line_idx++);
p = line;
p += sprintf(p, " [YM2413]");
}
}
}
}

// - Memory
{
char mapper_regs[256];
Expand Down
4 changes: 2 additions & 2 deletions meka/srcs/app_techinfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
// Definitions
//-----------------------------------------------------------------------------

#define TECHINFO_LINES (10)
#define TECHINFO_COLUMNS (80)
#define TECHINFO_LINES (14)
#define TECHINFO_COLUMNS (90)

//-----------------------------------------------------------------------------
// Data
Expand Down
2 changes: 1 addition & 1 deletion meka/srcs/g_menu_i.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ void gui_menus_init()
menu_add_separator(menus_ID.file);
menu_add_item (menus_ID.file, Msg_Get(MSG_Menu_Main_Options), "Alt+O", MENU_ITEM_FLAG_ACTIVE | Is_Checked (Options.active), (t_menu_callback)Options_Switch, NULL);
Langs_Menu_Add (menus_ID.file);
menu_add_item (menus_ID.file, Msg_Get(MSG_Menu_Main_Quit), "F10", MENU_ITEM_FLAG_ACTIVE, (t_menu_callback)Action_Quit, NULL);
menu_add_item (menus_ID.file, Msg_Get(MSG_Menu_Main_Quit), "Alt+F4", MENU_ITEM_FLAG_ACTIVE, (t_menu_callback)Action_Quit, NULL);

//-------------------------------------------------------------------------
// DEBUG
Expand Down
2 changes: 1 addition & 1 deletion meka/srcs/inputs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ void Inputs_Check_GUI (bool sk1100_pressed)
}

// Quit emulator
if (Inputs_KeyDown(Inputs.Cabinet_Mode ? ALLEGRO_KEY_ESCAPE : ALLEGRO_KEY_F10))
if (Inputs.Cabinet_Mode && Inputs_KeyDown(ALLEGRO_KEY_ESCAPE))
opt.Force_Quit = TRUE;

// Debugger switch
Expand Down

0 comments on commit 4aff576

Please sign in to comment.