Fixed BEAMCON0 issue (PAL/NTSC switching) (#851)

dirkwhoffmann · Dec 26, 2024 · 3a225aa · 3a225aa
1 parent 6cb522d
commit 3a225aa
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/Emulator/Components/Agnus/AgnusRegs.cpp b/Emulator/Components/Agnus/AgnusRegs.cpp
@@ -540,8 +540,7 @@ Agnus::pokeBEAMCON0(u16 value)
     // 12: VARVBEN       8: VARHSYEN    4: VARCSYEN     0: HSYTRUE
 
     // PAL
-    VideoFormat type = GET_BIT(value, 5) ? PAL : NTSC;
-    if (pos.type != type) agnus.setVideoFormat(type);
+    amiga.setOption(OPT_AMIGA_VIDEO_FORMAT, GET_BIT(value, 5) ? PAL : NTSC);
 
     // LOLDIS
     bool loldis = GET_BIT(value, 11);

diff --git a/Emulator/Components/Memory/Memory.cpp b/Emulator/Components/Memory/Memory.cpp
@@ -579,8 +579,6 @@ Memory::alloc(Allocator<u8> &allocator, isize bytes, u32 &mask, bool update)
 void
 Memory::fillRamWithInitPattern()
 {
-    assert(!isRunning());
-
     switch (config.ramInitPattern) {
 
         case RAM_INIT_RANDOMIZED:

diff --git a/Emulator/config.cpp b/Emulator/config.cpp
@@ -43,7 +43,7 @@ debugflag DMA_DEBUG       = 0;
 debugflag DDF_DEBUG       = 0;
 debugflag SEQ_DEBUG       = 0;
 debugflag SEQ_ON_STEROIDS = 0;
-debugflag NTSC_DEBUG      = 0;
+debugflag NTSC_DEBUG      = 1;
 
 // Copper
 debugflag COP_CHECKSUM    = 0;