Merge branch 'master' into joamag/color

# Conflicts: # frontends/sdl/src/main.rs

Merge branch 'master' into joamag/color
a914056c · João Magalhães · 4f513eed · 459f7167 · a914056c · a914056c
Verified Commit a914056c authored 1 year ago by João Magalhães
--- a/res/roms/paradius/cpu/06-ld r,r.gb
+++ b/res/roms/paradius/cpu/06-ld r,r.gb
--- a/res/roms/paradius/cpu/07-jr,jp,call,ret,rst.gb
+++ b/res/roms/paradius/cpu/07-jr,jp,call,ret,rst.gb
--- a/res/roms/paradius/cpu/08-misc instrs.gb
+++ b/res/roms/paradius/cpu/08-misc instrs.gb
--- a/res/roms/paradius/cpu/09-op r,r.gb
+++ b/res/roms/paradius/cpu/09-op r,r.gb
--- a/res/roms/paradius/cpu/10-bit ops.gb
+++ b/res/roms/paradius/cpu/10-bit ops.gb
--- a/res/roms/paradius/cpu/11-op a,(hl).gb
+++ b/res/roms/paradius/cpu/11-op a,(hl).gb
--- a/res/roms/paradius/cpu/cpu_instrs.gb
+++ b/res/roms/paradius/cpu/cpu_instrs.gb
--- a/res/roms/test/blargg/dmg_sound/dmg_sound.gb
+++ b/res/roms/test/blargg/dmg_sound/dmg_sound.gb
--- a/res/roms/test/blargg/halt_bug/halt_bug.gb
+++ b/res/roms/test/blargg/halt_bug/halt_bug.gb
--- a/res/roms/paradius/instr_timing/instr_timing.gb
+++ b/res/roms/paradius/instr_timing/instr_timing.gb
--- a/res/roms/paradius/interrupt_time/interrupt_time.gb
+++ b/res/roms/paradius/interrupt_time/interrupt_time.gb
--- a/res/roms/test/blargg/mem_timing-2/mem_timing.gb
+++ b/res/roms/test/blargg/mem_timing-2/mem_timing.gb
--- a/res/roms/paradius/mem_timing/mem_timing.gb
+++ b/res/roms/paradius/mem_timing/mem_timing.gb
--- a/res/roms/paradius/oam_bug/oam_bug.gb
+++ b/res/roms/paradius/oam_bug/oam_bug.gb
--- a/res/roms/dmg_acid2.gb
+++ b/res/roms/dmg_acid2.gb
--- a/res/roms/firstwhite.gb
+++ b/res/roms/firstwhite.gb
--- a/res/roms/test/gbprinter.gb
+++ b/res/roms/test/gbprinter.gb
--- a/res/roms/test/jayro.gb
+++ b/res/roms/test/jayro.gb
--- a/res/roms/rtc3test.gb
+++ b/res/roms/rtc3test.gb
--- a/res/roms/sprite_priority.gb
+++ b/res/roms/sprite_priority.gb