Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
budude2 committed Nov 25, 2024
2 parents 7ea48cc + 35b0655 commit 33a4ee7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 24 deletions.
14 changes: 4 additions & 10 deletions pkg/gb/Cores/budude2.GB/video.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@
}
],
"display_modes": [
{
"id": "0x10"
},
{
"id": "0x20"
},
{
"id": "0x21"
},
Expand All @@ -36,13 +30,13 @@
"id": "0x23"
},
{
"id": "0x30"
"id": "0x10"
},
{
"id": "0x31"
"id": "0x20"
},
{
"id": "0x32"
"id": "0x30"
},
{
"id": "0x40"
Expand All @@ -55,4 +49,4 @@
}
]
}
}
}
19 changes: 5 additions & 14 deletions pkg/gbc/Cores/budude2.GBC/video.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,20 @@
],
"display_modes": [
{
"id": "0x10"
},
{
"id": "0x20"
"id": "0x31"
},
{
"id": "0x21"
"id": "0x32"
},
{
"id": "0x22"
"id": "0x10"
},
{
"id": "0x23"
"id": "0x20"
},
{
"id": "0x30"
},
{
"id": "0x31"
},
{
"id": "0x32"
},
{
"id": "0x40"
},
Expand All @@ -47,4 +38,4 @@
}
]
}
}
}

0 comments on commit 33a4ee7

Please sign in to comment.