-
Notifications
You must be signed in to change notification settings - Fork 0
/
ok.patch
4286 lines (4015 loc) · 132 KB
/
ok.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -ENwbur src/asm.cpp src/asm.cpp
--- src/asm.cpp 2018-06-20 11:40:06.185109800 +0500
+++ src/asm.cpp 2018-06-20 10:36:41.366296200 +0500
@@ -44,8 +44,10 @@
if (!strlen(astr)) {
//Implied instructions
if (!strcmp(ins,"BRK")) output[0] = 0x00;
+ else if (!strcmp(ins,"TAZ")) output[0] = 0x02;
else if (!strcmp(ins,"PHP")) output[0] = 0x08;
else if (!strcmp(ins,"ASL")) output[0] = 0x0A;
+ else if (!strcmp(ins,"TZA")) output[0] = 0x12;
else if (!strcmp(ins,"CLC")) output[0] = 0x18;
else if (!strcmp(ins,"PLP")) output[0] = 0x28;
else if (!strcmp(ins,"ROL")) output[0] = 0x2A;
@@ -58,6 +60,8 @@
else if (!strcmp(ins,"PLA")) output[0] = 0x68;
else if (!strcmp(ins,"ROR")) output[0] = 0x6A;
else if (!strcmp(ins,"SEI")) output[0] = 0x78;
+ else if (!strcmp(ins,"PLZ")) output[0] = 0x7A;
+ else if (!strcmp(ins,"PHZ")) output[0] = 0x80;
else if (!strcmp(ins,"DEY")) output[0] = 0x88;
else if (!strcmp(ins,"TXA")) output[0] = 0x8A;
else if (!strcmp(ins,"TYA")) output[0] = 0x98;
@@ -68,6 +72,8 @@
else if (!strcmp(ins,"TSX")) output[0] = 0xBA;
else if (!strcmp(ins,"INY")) output[0] = 0xC8;
else if (!strcmp(ins,"DEX")) output[0] = 0xCA;
+ else if (!strcmp(ins,"INZ")) output[0] = 0xFA;
+ else if (!strcmp(ins,"DEZ")) output[0] = 0xFB;
else if (!strcmp(ins,"CLD")) output[0] = 0xD8;
else if (!strcmp(ins,"INX")) output[0] = 0xE8;
else if (!strcmp(ins,"NOP")) output[0] = 0xEA;
@@ -98,6 +104,7 @@
else if (!strcmp(ins,"LDY")) output[0] = 0xA0;
else if (!strcmp(ins,"LDA")) output[0] = 0xA1;
else if (!strcmp(ins,"LDX")) output[0] = 0xA2;
+ else if (!strcmp(ins,"LDZ")) output[0] = 0xA3;
else if (!strcmp(ins,"BCS")) output[0] = 0xB0;
else if (!strcmp(ins,"CPY")) output[0] = 0xC0;
else if (!strcmp(ins,"CMP")) output[0] = 0xC1;
@@ -262,6 +269,7 @@
//these may be replaced later with passed-in values to make a lighter-weight disassembly mode that may not query the referenced values
#define RX (X.X)
#define RY (X.Y)
+ #define RZ (X.Z)
switch (opcode[0]) {
#define relative(a) { \
@@ -293,8 +301,10 @@
#endif
//odd, 1-byte opcodes
+ case 0x02: strcpy(str,"TAZ"); break;
case 0x08: strcpy(str,"PHP"); break;
case 0x0A: strcpy(str,"ASL"); break;
+ case 0x12: strcpy(str,"TZA"); break;
case 0x18: strcpy(str,"CLC"); break;
case 0x28: strcpy(str,"PLP"); break;
case 0x2A: strcpy(str,"ROL"); break;
@@ -307,6 +317,8 @@
case 0x68: strcpy(str,"PLA"); break;
case 0x6A: strcpy(str,"ROR"); break;
case 0x78: strcpy(str,"SEI"); break;
+ case 0x7A: strcpy(str,"PLZ"); break;
+ case 0x80: strcpy(str,"PHZ"); break;
case 0x88: strcpy(str,"DEY"); break;
case 0x8A: strcpy(str,"TXA"); break;
case 0x98: strcpy(str,"TYA"); break;
@@ -316,6 +328,8 @@
case 0xB8: strcpy(str,"CLV"); break;
case 0xBA: strcpy(str,"TSX"); break;
case 0xC8: strcpy(str,"INY"); break;
+ case 0xFA: strcpy(str,"INZ"); break;
+ case 0xFB: strcpy(str,"DEZ"); break;
case 0xCA: strcpy(str,"DEX"); break;
case 0xD8: strcpy(str,"CLD"); break;
case 0xE8: strcpy(str,"INX"); break;
@@ -352,12 +366,14 @@
case 0xA4: strcpy(chr,"LDY"); goto _zeropage;
case 0xA5: strcpy(chr,"LDA"); goto _zeropage;
case 0xA6: strcpy(chr,"LDX"); goto _zeropage;
+ case 0xA7: strcpy(chr,"LDZ"); goto _zeropage;
case 0xC4: strcpy(chr,"CPY"); goto _zeropage;
case 0xC5: strcpy(chr,"CMP"); goto _zeropage;
case 0xC6: strcpy(chr,"DEC"); goto _zeropage;
case 0xE4: strcpy(chr,"CPX"); goto _zeropage;
case 0xE5: strcpy(chr,"SBC"); goto _zeropage;
case 0xE6: strcpy(chr,"INC"); goto _zeropage;
+ case 0x82: strcpy(chr,"STZ"); goto _zeropage;
_zeropage:
// ################################## Start of SP CODE ###########################
// Change width to %04X // don't!
@@ -373,11 +389,14 @@
//case 0x89: strcpy(chr,"STA"); goto _immediate; //baka, no STA #imm!!
case 0xA0: strcpy(chr,"LDY"); goto _immediate;
case 0xA2: strcpy(chr,"LDX"); goto _immediate;
+ case 0xA3: strcpy(chr,"LDZ"); goto _immediate;
case 0xA9: strcpy(chr,"LDA"); goto _immediate;
case 0xC0: strcpy(chr,"CPY"); goto _immediate;
case 0xC9: strcpy(chr,"CMP"); goto _immediate;
case 0xE0: strcpy(chr,"CPX"); goto _immediate;
case 0xE9: strcpy(chr,"SBC"); goto _immediate;
+ case 0xF2: strcpy(chr,"DMA"); goto _immediate;
+ case 0xF3: strcpy(chr,"DVA"); goto _immediate;
_immediate:
sprintf(str,"%s #$%02X", chr,opcode[1]);
break;
@@ -385,6 +404,7 @@
//Absolute
case 0x0D: strcpy(chr,"ORA"); goto _absolute;
case 0x0E: strcpy(chr,"ASL"); goto _absolute;
+ case 0x22: strcpy(chr,"LDZ"); goto _absolute;
case 0x2C: strcpy(chr,"BIT"); goto _absolute;
case 0x2D: strcpy(chr,"AND"); goto _absolute;
case 0x2E: strcpy(chr,"ROL"); goto _absolute;
@@ -404,6 +424,7 @@
case 0xEC: strcpy(chr,"CPX"); goto _absolute;
case 0xED: strcpy(chr,"SBC"); goto _absolute;
case 0xEE: strcpy(chr,"INC"); goto _absolute;
+ case 0x92: strcpy(chr,"STZ"); goto _absolute;
_absolute:
absolute(tmp);
sprintf(str,"%s $%04X = #$%02X", chr,tmp,GetMem(tmp));
@@ -448,12 +469,14 @@
case 0x76: strcpy(chr,"ROR"); goto _zeropagex;
case 0x94: strcpy(chr,"STY"); goto _zeropagex;
case 0x95: strcpy(chr,"STA"); goto _zeropagex;
+ case 0xAB: strcpy(chr,"LDZ"); goto _zeropagex;
case 0xB4: strcpy(chr,"LDY"); goto _zeropagex;
case 0xB5: strcpy(chr,"LDA"); goto _zeropagex;
case 0xD5: strcpy(chr,"CMP"); goto _zeropagex;
case 0xD6: strcpy(chr,"DEC"); goto _zeropagex;
case 0xF5: strcpy(chr,"SBC"); goto _zeropagex;
case 0xF6: strcpy(chr,"INC"); goto _zeropagex;
+ case 0x83: strcpy(chr,"STZ"); goto _zeropagex;
_zeropagex:
zpIndex(tmp,RX);
// ################################## Start of SP CODE ###########################
@@ -461,12 +484,25 @@
sprintf(str,"%s $%02X,X @ $%04X = #$%02X", chr,opcode[1],tmp,GetMem(tmp));
// ################################## End of SP CODE ###########################
break;
-
+ case 0x87: strcpy(chr,"STA"); goto _zeropagez;
+ case 0x89: strcpy(chr,"STX"); goto _zeropagez;
+ case 0x8B: strcpy(chr,"STY"); goto _zeropagez;
+ case 0xB7: strcpy(chr,"LDA"); goto _zeropagez;
+ case 0xBF: strcpy(chr,"LDX"); goto _zeropagez;
+ case 0x42: strcpy(chr,"LDY"); goto _zeropagez;
+ _zeropagez:
+ zpIndex(tmp,RZ);
+ // ################################## Start of SP CODE ###########################
+ // Change width to %04X // don't!
+ sprintf(str,"%s $%02X,Z @ $%04X = #$%02X", chr,opcode[1],tmp,GetMem(tmp));
+ // ################################## End of SP CODE ###########################
+ break;
//Absolute,Y
case 0x19: strcpy(chr,"ORA"); goto _absolutey;
case 0x39: strcpy(chr,"AND"); goto _absolutey;
case 0x59: strcpy(chr,"EOR"); goto _absolutey;
case 0x79: strcpy(chr,"ADC"); goto _absolutey;
+ case 0x97: strcpy(chr,"STZ"); goto _absolutey;
case 0x99: strcpy(chr,"STA"); goto _absolutey;
case 0xB9: strcpy(chr,"LDA"); goto _absolutey;
case 0xBE: strcpy(chr,"LDX"); goto _absolutey;
@@ -488,18 +524,36 @@
case 0x7D: strcpy(chr,"ADC"); goto _absolutex;
case 0x7E: strcpy(chr,"ROR"); goto _absolutex;
case 0x9D: strcpy(chr,"STA"); goto _absolutex;
+ case 0xB2: strcpy(chr,"LDZ"); goto _absolutex;
case 0xBC: strcpy(chr,"LDY"); goto _absolutex;
case 0xBD: strcpy(chr,"LDA"); goto _absolutex;
case 0xDD: strcpy(chr,"CMP"); goto _absolutex;
case 0xDE: strcpy(chr,"DEC"); goto _absolutex;
case 0xFD: strcpy(chr,"SBC"); goto _absolutex;
case 0xFE: strcpy(chr,"INC"); goto _absolutex;
+ case 0x93: strcpy(chr,"STZ"); goto _absolutex;
_absolutex:
absolute(tmp);
tmp2=(tmp+RX);
sprintf(str,"%s $%04X,X @ $%04X = #$%02X", chr,tmp,tmp2,GetMem(tmp2));
break;
-
+ case 0xBB: strcpy(chr,"LDA"); goto _absolutez;
+ case 0x9B: strcpy(chr,"STA"); goto _absolutez;
+ case 0x9C: strcpy(chr,"STX"); goto _absolutez;
+ case 0x9E: strcpy(chr,"STY"); goto _absolutez;
+ case 0x32: strcpy(chr,"LDX"); goto _absolutez;
+ case 0x52: strcpy(chr,"LDY"); goto _absolutez;
+ case 0xC3: strcpy(chr,"ADC"); goto _absolutez;
+ case 0xD3: strcpy(chr,"SBC"); goto _absolutez;
+ case 0xCF: strcpy(chr,"DEC"); goto _absolutez;
+ case 0xDF: strcpy(chr,"ORA"); goto _absolutez;
+ case 0xDB: strcpy(chr,"AND"); goto _absolutez;
+ case 0xEF: strcpy(chr,"INC"); goto _absolutez;
+ _absolutez:
+ absolute(tmp);
+ tmp2=(tmp+RZ);
+ sprintf(str,"%s $%04X,Z @ $%04X = #$%02X", chr,tmp,tmp2,GetMem(tmp2));
+ break;
//jumps
case 0x20: strcpy(chr,"JSR"); goto _jump;
case 0x4C: strcpy(chr,"JMP"); goto _jump;
@@ -510,8 +564,10 @@
break;
//Zero Page,Y
+ case 0x8F: strcpy(chr,"STZ"); goto _zeropagey;
case 0x96: strcpy(chr,"STX"); goto _zeropagey;
case 0xB6: strcpy(chr,"LDX"); goto _zeropagey;
+ case 0xAF: strcpy(chr,"LDZ"); goto _zeropagey;
_zeropagey:
zpIndex(tmp,RY);
// ################################## Start of SP CODE ###########################
diff -ENwbur src/cart.cpp src/cart.cpp
--- src/cart.cpp 2018-06-20 11:40:06.231986100 +0500
+++ src/cart.cpp 2018-06-20 11:37:10.466503400 +0500
@@ -38,11 +38,12 @@
#include <cstdio>
#include <climits>
-uint8 *Page[32], *VPage[8];
+uint8 *Page[128];
+uint8 *VPage[40];
uint8 **VPageR = VPage;
-uint8 *VPageG[8];
-uint8 *MMC5SPRVPage[8];
-uint8 *MMC5BGVPage[8];
+uint8 *VPageG[40];
+uint8 *MMC5SPRVPage[32];
+uint8 *MMC5BGVPage[32];
static uint8 PRGIsRAM[32]; /* This page is/is not PRG RAM. */
@@ -51,7 +52,7 @@
uint8 PRGram[32];
uint8 *PRGptr[32];
-uint8 *CHRptr[32];
+uint8 *CHRptr[128];
uint32 PRGsize[32];
uint32 CHRsize[32];
@@ -95,6 +96,7 @@
}
static uint8 nothing[8192];
+static uint8 nothing2[8192*5];
void ResetCartMapping(void) {
int x;
@@ -104,9 +106,19 @@
Page[x] = nothing - x * 2048;
PRGptr[x] = CHRptr[x] = 0;
PRGsize[x] = CHRsize[x] = 0;
+ for (x = 0; x < 32; x++)
+ CHRptr[x] = 0;
}
+
+
for (x = 0; x < 8; x++) {
- MMC5SPRVPage[x] = MMC5BGVPage[x] = VPageR[x] = nothing - 0x400 * x;
+ MMC5SPRVPage[x] = MMC5BGVPage[x] = nothing2- 0x400 * x;
+ //VPageR[x]= VPage[x] = 0;
+ VPageR[x]= VPage[x] = nothing2 - 0x400 * x;
+ }
+ for (x = 16; x < 24; x++) {
+ MMC5SPRVPage[x] = MMC5BGVPage[x] = nothing - 0x400 * x;
+ VPageR[x]= VPage[x] = nothing2 - 0x2000 * x;
}
}
@@ -256,27 +268,46 @@
void setchr8r(int r, uint32 V) {
int x;
+ int y;
+
if (!CHRptr[r]) return;
FCEUPPU_LineUpdate();
V &= CHRmask8[r];
- for (x = 7; x >= 0; x--)
+ //for (x = 39; x >= 32; x--)
+ // VPageR[x] = &CHRptr[r][V << 13];
+
+ if (vt03_mode)
+ {
+ for (x = 31; x >= 16; x--)
+ {
+ VPageR[x] = &CHRptr[r][V << 13]-0x2000;
+
+ }
+ // for (x=0x4000; x<=0x6000; x++)
+ // extra_ppu[x+0x4000] = VPageR[x>>10][x];
+
+ }
+ for (x = 31; x >= 0; x--)
VPageR[x] = &CHRptr[r][V << 13];
if (CHRram[r])
- PPUCHRRAM |= (255);
+ PPUCHRRAM |= 0xFF;
else
PPUCHRRAM = 0;
}
void setchr1(uint32 A, uint32 V) {
+// if (A > 0xFFF)A += 0x3000;
setchr1r(0, A, V);
}
void setchr2(uint32 A, uint32 V) {
+// if (A > 0xFFF)A += 0x3000;
setchr2r(0, A, V);
}
void setchr4(uint32 A, uint32 V) {
+// if (A > 0xFFF)A += 0x3000;
setchr4r(0, A, V);
}
@@ -289,6 +320,7 @@
void setntamem(uint8 *p, int ram, uint32 b) {
FCEUPPU_LineUpdate();
vnapage[b] = p;
+ vnapage2[b] = p;
PPUNTARAM &= ~(1 << b);
if (ram)
PPUNTARAM |= 1 << b;
@@ -301,6 +333,10 @@
vnapage[1] = NTARAM + b * 0x400;
vnapage[2] = NTARAM + c * 0x400;
vnapage[3] = NTARAM + d * 0x400;
+ vnapage2[0] = NTARAM2 + a * 0x400;
+ vnapage2[1] = NTARAM2 + b * 0x400;
+ vnapage2[2] = NTARAM2 + c * 0x400;
+ vnapage2[3] = NTARAM2 + d * 0x400;
}
void setmirror(int t) {
@@ -309,15 +345,19 @@
switch (t) {
case MI_H:
vnapage[0] = vnapage[1] = NTARAM; vnapage[2] = vnapage[3] = NTARAM + 0x400;
+ vnapage2[0] = vnapage2[1] = NTARAM2; vnapage2[2] = vnapage2[3] = NTARAM2 + 0x400;
break;
case MI_V:
vnapage[0] = vnapage[2] = NTARAM; vnapage[1] = vnapage[3] = NTARAM + 0x400;
+ vnapage2[0] = vnapage2[2] = NTARAM2; vnapage2[1] = vnapage2[3] = NTARAM2 + 0x400;
break;
case MI_0:
vnapage[0] = vnapage[1] = vnapage[2] = vnapage[3] = NTARAM;
+ vnapage2[0] = vnapage2[1] = vnapage2[2] = vnapage2[3] = NTARAM2;
break;
case MI_1:
vnapage[0] = vnapage[1] = vnapage[2] = vnapage[3] = NTARAM + 0x400;
+ vnapage2[0] = vnapage2[1] = vnapage2[2] = vnapage2[3] = NTARAM2 + 0x400;
break;
}
PPUNTARAM = 0xF;
@@ -502,6 +542,7 @@
GenieBackup[x] = GetReadHandler(genieaddr[x]);
SetReadHandler(genieaddr[x], genieaddr[x], tmp[x]);
}
+
}
void FCEU_GeniePower(void) {
@@ -522,7 +563,7 @@
SetReadHandler(0x8000, 0xFFFF, GenieRead);
for (x = 0; x < 8; x++)
- VPage[x] = GENIEROM + 4096 - 0x400 * x;
+ VPage[x] = GENIEROM + 4096+0x4000 - 0x400 * x;
if (AllocGenieRW())
VPageR = VPageG;
diff -ENwbur src/cart.h src/cart.h
--- src/cart.h 2018-06-20 11:40:06.247613100 +0500
+++ src/cart.h 2018-06-20 10:38:23.872394400 +0500
@@ -31,8 +31,10 @@
void FCEU_LoadGameSave(CartInfo *LocalHWInfo);
void FCEU_ClearGameSave(CartInfo *LocalHWInfo);
-extern uint8 *Page[32], *VPage[8], *MMC5SPRVPage[8], *MMC5BGVPage[8];
-
+extern uint8 *Page[128], *MMC5SPRVPage[32], *MMC5BGVPage[32];
+extern uint8 *VPage[40];
+extern uint8 extra_ppu[0x10000];
+extern uint8 extra_ppu2[0x2000];
void ResetCartMapping(void);
void SetupCartPRGMapping(int chip, uint8 *p, uint32 size, int ram);
void SetupCartCHRMapping(int chip, uint8 *p, uint32 size, int ram);
@@ -46,7 +48,7 @@
extern uint8 CHRram[32];
extern uint8 *PRGptr[32];
-extern uint8 *CHRptr[32];
+extern uint8 *CHRptr[128];
extern uint32 PRGsize[32];
extern uint32 CHRsize[32];
diff -ENwbur src/debug.cpp src/debug.cpp
--- src/debug.cpp 2018-06-20 11:40:06.310109800 +0500
+++ src/debug.cpp 2018-06-20 10:45:15.722799100 +0500
@@ -74,10 +74,11 @@
case 'B': return _P & B_FLAG ? 1 : 0;
case 'D': return _P & D_FLAG ? 1 : 0;
case 'I': return _P & I_FLAG ? 1 : 0;
- case 'Z': return _P & Z_FLAG ? 1 : 0;
+ // case 'Z': return _P & Z_FLAG ? 1 : 0;
case 'C': return _P & C_FLAG ? 1 : 0;
case 'P': return _PC;
case 'S': return _S;
+ case 'Z':return _Z;
}
return 0;
@@ -301,9 +302,9 @@
}
uint8 GetPPUMem(uint8 A) {
- uint16 tmp = FCEUPPU_PeekAddress() & 0x3FFF;
+ uint16 tmp = FCEUPPU_PeekAddress() & 0x4FFF;
- if (tmp<0x2000) return VPage[tmp>>10][tmp];
+ if (tmp<0x2000 || tmp>0x3fff) return VPage[tmp>>10][tmp];
if (tmp>=0x3F00) return PALRAM[tmp&0x1F];
return vnapage[(tmp>>10)&0x3][tmp&0x3FF];
}
@@ -332,6 +333,7 @@
case 13: return _Y&(((address-_X)>>8)+1); // (SHY)
case 14: return _X&(((address-_Y)>>8)+1); // (SHX)
case 15: return _S& (((address-_Y)>>8)+1); // (TAS)
+ case 16: return _Z; // STY
}
return 0;
}
@@ -856,6 +858,8 @@
case 6: A = (opcode[1] | (opcode[2] << 8)) + _Y; break;
case 7: A = (opcode[1] | (opcode[2] << 8)) + _X; break;
case 8: A = opcode[1] + _Y; break;
+ case 9: A = (opcode[1] | (opcode[2] << 8)) + _Z; break;
+ case 10: A = opcode[1] + _Z; break;
}
if (numWPs || dbgstate.step || dbgstate.runline || dbgstate.stepout || watchpoint[64].flags || dbgstate.badopbreak || break_on_cycles || break_on_instructions || break_asap)
diff -ENwbur src/debug.h src/debug.h
--- src/debug.h 2018-06-20 11:40:06.325792000 +0500
+++ src/debug.h 2018-06-20 10:45:52.690937800 +0500
@@ -28,16 +28,16 @@
/*0, 1, 2, 3, 4, 5, 6, 7, 8, 9, A, B, C, D, E, F*/
/*0x00*/ 0, WP_R, 0, 0, 0, WP_R, WP_R|WP_W, 0, 0, 0, 0, 0, 0, WP_R, WP_R|WP_W, 0,
/*0x10*/ 0, WP_R, 0, 0, 0, WP_R, WP_R|WP_W, 0, 0, WP_R, 0, 0, 0, WP_R, WP_R|WP_W, 0,
-/*0x20*/ 0, WP_R, 0, 0, WP_R, WP_R, WP_R|WP_W, 0, 0, 0, 0, 0, WP_R, WP_R, WP_R|WP_W, 0,
-/*0x30*/ 0, WP_R, 0, 0, 0, WP_R, WP_R|WP_W, 0, 0, WP_R, 0, 0, 0, WP_R, WP_R|WP_W, 0,
-/*0x40*/ 0, WP_R, 0, 0, 0, WP_R, WP_R|WP_W, 0, 0, 0, 0, 0, 0, WP_R, WP_R|WP_W, 0,
-/*0x50*/ 0, WP_R, 0, 0, 0, WP_R, WP_R|WP_W, 0, 0, WP_R, 0, 0, 0, WP_R, WP_R|WP_W, 0,
+/*0x20*/ 0, WP_R, WP_R, 0, WP_R, WP_R, WP_R|WP_W, 0, 0, 0, 0, 0, WP_R, WP_R, WP_R|WP_W, 0,
+/*0x30*/ 0, WP_R, WP_R, 0, 0, WP_R, WP_R|WP_W, 0, 0, WP_R, 0, 0, 0, WP_R, WP_R|WP_W, 0,
+/*0x40*/ 0, WP_R, WP_R, 0, 0, WP_R, WP_R|WP_W, 0, 0, 0, 0, 0, 0, WP_R, WP_R|WP_W, 0,
+/*0x50*/ 0, WP_R, WP_R, 0, 0, WP_R, WP_R|WP_W, 0, 0, WP_R, 0, 0, 0, WP_R, WP_R|WP_W, 0,
/*0x60*/ 0, WP_R, 0, 0, 0, WP_R, WP_R|WP_W, 0, 0, 0, 0, 0, WP_R, WP_R, WP_R|WP_W, 0,
/*0x70*/ 0, WP_R, 0, 0, 0, WP_R, WP_R|WP_W, 0, 0, WP_R, 0, 0, 0, WP_R, WP_R|WP_W, 0,
-/*0x80*/ 0, WP_W, 0, 0, WP_W, WP_W, WP_W, 0, 0, 0, 0, 0, WP_W, WP_W, WP_W, 0,
-/*0x90*/ 0, WP_W, 0, 0, WP_W, WP_W, WP_W, 0, 0, WP_W, 0, 0, 0, WP_W, 0, 0,
-/*0xA0*/ 0, WP_R, 0, 0, WP_R, WP_R, WP_R, 0, 0, 0, 0, 0, WP_R, WP_R, WP_R, 0,
-/*0xB0*/ 0, WP_R, 0, 0, WP_R, WP_R, WP_R, 0, 0, WP_R, 0, 0, WP_R, WP_R, WP_R, 0,
+/*0x80*/ 0, WP_W, WP_W, WP_W, WP_W, WP_W, WP_W, WP_W, 0, WP_W, 0, WP_W, WP_W, WP_W, WP_W, WP_W,
+/*0x90*/ 0, WP_W, WP_W, WP_W, WP_W, WP_W, WP_W, WP_W, 0, WP_W, 0, WP_W, WP_W, WP_W, WP_W, 0,
+/*0xA0*/ 0, WP_R, 0, WP_R, WP_R, WP_R, WP_R, WP_R, 0, 0, 0, WP_R, WP_R, WP_R, WP_R, WP_R,
+/*0xB0*/ 0, WP_R, WP_R, WP_R, WP_R, WP_R, WP_R, WP_R, 0, WP_R, 0, WP_R, WP_R, WP_R, WP_R,WP_R,
/*0xC0*/ 0, WP_R, 0, 0, WP_R, WP_R, WP_R|WP_W, 0, 0, 0, 0, 0, WP_R, WP_R, WP_R|WP_W, 0,
/*0xD0*/ 0, WP_R, 0, 0, 0, WP_R, WP_R|WP_W, 0, 0, WP_R, 0, 0, 0, WP_R, WP_R|WP_W, 0,
/*0xE0*/ 0, WP_R, 0, 0, WP_R, WP_R, WP_R|WP_W, 0, 0, 0, 0, 0, WP_R, WP_R, WP_R|WP_W, 0,
@@ -112,11 +112,12 @@
//-------------
//internal variables that debuggers will want access to
-extern uint8 *vnapage[4],*VPage[8];
-extern uint8 PPU[4],PALRAM[0x20],SPRAM[0x100],VRAMBuffer,PPUGenLatch,XOffset;
+extern uint8 *vnapage[4];
+extern uint8 *VPage[40];
+extern uint8 PALRAM[0x100],SPRAM[0x400],VRAMBuffer,PPUGenLatch,XOffset;
extern uint32 FCEUPPU_PeekAddress();
extern int numWPs;
-
+extern int PPU[4];
///encapsulates the operational state of the debugger core
class DebuggerState {
public:
diff -ENwbur src/drivers/win/cdlogger.cpp src/drivers/win/cdlogger.cpp
--- src/drivers/win/cdlogger.cpp 2018-06-20 11:40:11.703253200 +0500
+++ src/drivers/win/cdlogger.cpp 2018-06-20 10:16:18.150880700 +0500
@@ -563,7 +563,7 @@
cdloggervdata = (unsigned char*)malloc(cdloggerVideoDataSize);
} else {
cdloggerVideoDataSize = 0;
- cdloggervdata = (unsigned char*)malloc(8192);
+ cdloggervdata = (unsigned char*)malloc(8192*4);
}
}
@@ -576,8 +576,8 @@
undefinedvromcount = cdloggerVideoDataSize;
ZeroMemory(cdloggervdata, cdloggerVideoDataSize);
} else {
- undefinedvromcount = 8192;
- ZeroMemory(cdloggervdata, 8192);
+ undefinedvromcount = 8192*4;
+ ZeroMemory(cdloggervdata, 8192*4);
}
}
diff -ENwbur src/drivers/win/debugger.cpp src/drivers/win/debugger.cpp
--- src/drivers/win/debugger.cpp 2018-06-20 11:40:11.828253600 +0500
+++ src/drivers/win/debugger.cpp 2018-06-20 10:32:56.032089700 +0500
@@ -823,6 +823,7 @@
X.X = GetEditHex(hwndDlg,IDC_DEBUGGER_VAL_X);
X.Y = GetEditHex(hwndDlg,IDC_DEBUGGER_VAL_Y);
X.PC = GetEditHex(hwndDlg,IDC_DEBUGGER_VAL_PC);
+ X.Z = GetEditHex(hwndDlg,IDC_DEBUGGER_VAL_Z);
}
}
@@ -968,6 +969,8 @@
SetDlgItemText(hDebug, IDC_DEBUGGER_VAL_X, str);
sprintf(str, "%02X", X.Y);
SetDlgItemText(hDebug, IDC_DEBUGGER_VAL_Y, str);
+ sprintf(str, "%02X", X.Z);
+ SetDlgItemText(hDebug, IDC_DEBUGGER_VAL_Z, str);
sprintf(str, "%04X", (int)X.PC);
SetDlgItemText(hDebug, IDC_DEBUGGER_VAL_PC, str);
diff -ENwbur src/drivers/win/input.cpp src/drivers/win/input.cpp
--- src/drivers/win/input.cpp 2018-06-20 11:40:12.000128300 +0500
+++ src/drivers/win/input.cpp 2018-06-20 10:34:00.869823400 +0500
@@ -128,7 +128,7 @@
#define GPZ() {MKZ(), MKZ(), MKZ(), MKZ(), MKZ(), MKZ(), MKZ(), MKZ()}
-ButtConfig GamePadConfig[4][12]={
+ButtConfig GamePadConfig[8][12]={
//Gamepad 1
{
MK(F), MK(D), MK(S), MK(ENTER),
@@ -142,9 +142,18 @@
GPZ(),
//Gamepad 4
+ GPZ(),
+ GPZ(),
+
+ //Gamepad 3
+ GPZ(),
+
+ //Gamepad 4
+ GPZ(),
GPZ()
};
+
ButtConfig GamePadPreset1[4][12]={GPZ(),GPZ(),GPZ(),GPZ()};
ButtConfig GamePadPreset2[4][12]={GPZ(),GPZ(),GPZ(),GPZ()};
ButtConfig GamePadPreset3[4][12]={GPZ(),GPZ(),GPZ(),GPZ()};
diff -ENwbur src/drivers/win/memview.cpp src/drivers/win/memview.cpp
--- src/drivers/win/memview.cpp 2018-06-20 11:40:12.453306000 +0500
+++ src/drivers/win/memview.cpp 2018-06-20 10:33:32.010023100 +0500
@@ -117,9 +117,9 @@
{0x0000,0x2000, MODE_NES_MEMORY, ID_ADDRESS_FRZ_SUBMENU, "Freeze/Unfreeze This Address"},
{0x6000,0x7FFF, MODE_NES_MEMORY, ID_ADDRESS_FRZ_SUBMENU, "Freeze/Unfreeze This Address"},
{0x0000,0xFFFF, MODE_NES_MEMORY, ID_ADDRESS_ADDBP_R, "Add Debugger Read Breakpoint"},
- {0x0000,0x3FFF, MODE_NES_PPU, ID_ADDRESS_ADDBP_R, "Add Debugger Read Breakpoint"},
+ {0x0000,0x7fff, MODE_NES_PPU, ID_ADDRESS_ADDBP_R, "Add Debugger Read Breakpoint"},
{0x0000,0xFFFF, MODE_NES_MEMORY, ID_ADDRESS_ADDBP_W, "Add Debugger Write Breakpoint"},
- {0x0000,0x3FFF, MODE_NES_PPU, ID_ADDRESS_ADDBP_W, "Add Debugger Write Breakpoint"},
+ {0x0000,0x7fff, MODE_NES_PPU, ID_ADDRESS_ADDBP_W, "Add Debugger Write Breakpoint"},
{0x0000,0xFFFF, MODE_NES_MEMORY, ID_ADDRESS_ADDBP_X, "Add Debugger Execute Breakpoint"},
{0x8000,0xFFFF, MODE_NES_MEMORY, ID_ADDRESS_SEEK_IN_ROM, "Go Here In ROM File"},
{0x8000,0xFFFF, MODE_NES_MEMORY, ID_ADDRESS_CREATE_GG_CODE, "Create Game Genie Code At This Address"},
@@ -673,8 +673,11 @@
if (EditingMode == MODE_NES_PPU)
{
- i &= 0x3FFF;
- if(i < 0x2000)return VPage[(i)>>10][(i)];
+ i &= 0x3fff;
+ int i2;
+ i2 &= 0x3fff;
+ if(i < 0x2000 || i > 0x3fff)return VPage[(i)>>10][(i)];
+ //if (i2 > 0x3fff && i2 <0x5000)return VPage[(i) >> 10][(i)];
//NSF PPU Viewer crash here (UGETAB) (Also disabled by 'MaxSize = 0x2000')
if (GameInfo->type==GIT_NSF)
{
@@ -1010,13 +1013,13 @@
} else if (EditingMode == MODE_NES_PPU)
{
// PPU
- addr &= 0x3FFF;
- if(addr < 0x2000)
+ addr &= 0x7fff;
+ if(addr < 0x2000 || addr > 0x3fff)
VPage[addr>>10][addr] = data[i]; //todo: detect if this is vrom and turn it red if so
if((addr >= 0x2000) && (addr < 0x3F00))
vnapage[(addr>>10)&0x3][addr&0x3FF] = data[i]; //todo: this causes 0x3000-0x3f00 to mirror 0x2000-0x2f00, is this correct?
- if((addr >= 0x3F00) && (addr < 0x3FFF))
- PALRAM[addr&0x1F] = data[i];
+ if((addr >= 0x3F00) || addr <=0x3fff)
+ PALRAM[addr&0xFF] = data[i];
} else if (EditingMode == MODE_NES_OAM)
{
addr &= 0xFF;
@@ -1890,7 +1893,7 @@
case MENU_MV_FILE_DUMP_RAM:
{
- char bar[0x800];
+ char bar[0x2000];
unsigned int i;
for (i=0;i<sizeof(bar);i++) bar[i] = GetMem(i);
@@ -1914,26 +1917,26 @@
for (i=0;i<sizeof(bar);i++)
{
// bar[i] = GetPPUMem(i);
- i &= 0x3FFF;
- if(i < 0x2000) bar[i] = VPage[(i)>>10][(i)];
+ // i &= 0x4fff;
+ if(i < 0x2000 || i > 0x3fff) bar[i] = VPage[(i)>>10][(i)];
else if(i < 0x3F00) bar[i] = vnapage[(i>>10)&0x3][i&0x3FF];
- else bar[i] = PALRAM[i&0x1F];
+ else bar[i] = PALRAM[i&0xFF];
}
dumpToFile(bar, sizeof(bar));
return 0;
}
case MENU_MV_FILE_DUMP_OAM:
{
- char bar[0x100];
+ char bar[0x400];
unsigned int i;
- for (i=0;i<0x100;i++) bar[i] = SPRAM[i];
- dumpToFile(bar,0x100);
+ for (i=0;i<0x400;i++) bar[i] = SPRAM[i];
+ dumpToFile(bar,0x400);
return 0;
}
case MENU_MV_FILE_LOAD_RAM:
{
- char bar[0x800];
+ char bar[0x2000];
if (loadFromFile(bar, sizeof(bar)))
{
for (uint16 addr=0; addr<sizeof(bar); ++addr)
@@ -1949,12 +1952,12 @@
for (uint16 addr=0; addr<sizeof(bar); ++addr)
{
char v = bar[addr];
- if(addr < 0x2000)
+ if(addr < 0x2000 || addr > 0x3fff)
VPage[addr>>10][addr] = v; //todo: detect if this is vrom and turn it red if so
if((addr >= 0x2000) && (addr < 0x3F00))
vnapage[(addr>>10)&0x3][addr&0x3FF] = v; //todo: this causes 0x3000-0x3f00 to mirror 0x2000-0x2f00, is this correct?
- if((addr >= 0x3F00) && (addr < 0x3FFF))
- PALRAM[addr&0x1F] = v;
+ if((addr >= 0x3F00) && (addr < 0x4000))
+ PALRAM[addr&0xFF] = v;
}
}
return 0;
@@ -2044,8 +2047,8 @@
MaxSize = 0x10000;
if (EditingMode == MODE_NES_PPU)
{
- if (GameInfo->type==GIT_NSF) {MaxSize = 0x2000;} //Also disabled under GetMemViewData
- else {MaxSize = 0x4000;}
+ if (GameInfo->type==GIT_NSF) {MaxSize = 0x3000;} //Also disabled under GetMemViewData
+ else {MaxSize = 0x8000;}
}
if (EditingMode == MODE_NES_OAM)
MaxSize = 0x100;
diff -ENwbur src/drivers/win/ntview.cpp src/drivers/win/ntview.cpp
--- src/drivers/win/ntview.cpp 2018-06-20 11:40:12.625131100 +0500
+++ src/drivers/win/ntview.cpp 2018-06-20 10:34:25.404205500 +0500
@@ -46,7 +46,7 @@
int NTViewPosX,NTViewPosY;
-static uint8 palcache[36]; //palette cache
+static uint8 palcache[256+4]; //palette cache
int NTViewScanline=0,NTViewer=0;
int NTViewSkip;
int NTViewRefresh = 0;
@@ -191,17 +191,21 @@
INLINE void DrawChr(uint8 *pbitmap,const uint8 *chr,int pal){
int y, x, tmp, index=0, p=0;
- uint8 chr0, chr1;
+ uint8 chr0, chr1, chr2, chr3;
//uint8 *table = &VPage[0][0]; //use the background table
//pbitmap += 3*
for (y = 0; y < 8; y++) { //todo: use index for y?
chr0 = chr[index];
chr1 = chr[index+8];
+ chr2 = chr[index+16];
+ chr3 = chr[index+24];
tmp=7;
for (x = 0; x < 8; x++) { //todo: use tmp for x?
p = (chr0>>tmp)&1;
p |= ((chr1>>tmp)&1)<<1;
+ p |= ((chr2>>tmp)&1)<<2;
+ p |= ((chr3>>tmp)&1)<<3;
p = palcache[p+(pal*4)];
tmp--;
diff -ENwbur src/drivers/win/ppuview.cpp src/drivers/win/ppuview.cpp
--- src/drivers/win/ppuview.cpp 2018-06-20 11:40:12.703254200 +0500
+++ src/drivers/win/ppuview.cpp 2018-06-20 10:35:36.653734700 +0500
@@ -27,16 +27,16 @@
HWND hPPUView;
-extern uint8 *VPage[8];
-extern uint8 PALRAM[0x20];
+extern uint8 *VPage[40];
+extern uint8 PALRAM[0x100];
int PPUViewPosX, PPUViewPosY;
bool PPUView_maskUnusedGraphics = true;
bool PPUView_invertTheMask = false;
int PPUView_sprite16Mode = 0;
-static uint8 palcache[36] = { 0xFF }; //palette cache
-uint8 chrcache0[0x1000], chrcache1[0x1000], logcache0[0x1000], logcache1[0x1000]; //cache CHR, fixes a refresh problem when right-clicking
+static uint8 palcache[256] = { 0xFF }; //palette cache
+uint8 chrcache0[0x4000], chrcache1[0x4000], logcache0[0x4000], logcache1[0x4000]; //cache CHR, fixes a refresh problem when right-clicking
uint8 *pattern0, *pattern1; //pattern table bitmap arrays
uint8 *ppuv_palette;
static int pindex0 = 0, pindex1 = 0;
@@ -45,15 +45,15 @@
int PPUViewRefresh = 0;
int mouse_x, mouse_y;
-#define PATTERNWIDTH 128
-#define PATTERNHEIGHT 128
+#define PATTERNWIDTH 128 // 128*1,5
+#define PATTERNHEIGHT 256
#define PATTERNBITWIDTH PATTERNWIDTH*3
#define PATTERNDESTX_BASE 7
-#define PATTERNDESTY_BASE 18
+#define PATTERNDESTY_BASE 24
#define ZOOM 2
#define PALETTEWIDTH 32*4*4
-#define PALETTEHEIGHT 32*2
+#define PALETTEHEIGHT 32*8
#define PALETTEBITWIDTH PALETTEWIDTH*3
#define PALETTEDESTX_BASE 7
#define PALETTEDESTY_BASE 18
@@ -89,9 +89,9 @@
}
PPUViewSkip = 0;
- StretchBlt(pDC, patternDestX, patternDestY, PATTERNWIDTH * ZOOM, PATTERNHEIGHT * ZOOM, TmpDC0, 0, PATTERNHEIGHT - 1, PATTERNWIDTH, -PATTERNHEIGHT, SRCCOPY);
- StretchBlt(pDC, patternDestX + (PATTERNWIDTH * ZOOM) + 1, patternDestY, PATTERNWIDTH * ZOOM, PATTERNHEIGHT * ZOOM, TmpDC1, 0, PATTERNHEIGHT - 1, PATTERNWIDTH, -PATTERNHEIGHT, SRCCOPY);
- StretchBlt(pDC, paletteDestX, paletteDestY, PALETTEWIDTH, PALETTEHEIGHT, TmpDC2, 0, PALETTEHEIGHT - 1, PALETTEWIDTH, -PALETTEHEIGHT, SRCCOPY);
+ StretchBlt(pDC, patternDestX, patternDestY, PATTERNWIDTH * ZOOM, PATTERNHEIGHT * ZOOM, TmpDC0, 0, PATTERNHEIGHT - 0, PATTERNWIDTH, -PATTERNHEIGHT, SRCCOPY);
+ StretchBlt(pDC, patternDestX + (PATTERNWIDTH * ZOOM) + 1, patternDestY, PATTERNWIDTH * ZOOM, PATTERNHEIGHT * ZOOM, TmpDC1, 0, PATTERNHEIGHT - 0, PATTERNWIDTH, -PATTERNHEIGHT, SRCCOPY);
+ StretchBlt(pDC, paletteDestX, paletteDestY, PALETTEWIDTH, PALETTEHEIGHT, TmpDC2, 0, PALETTEHEIGHT - 0, PALETTEWIDTH, -PALETTEHEIGHT, SRCCOPY);
}
//---------CDLogger VROM
@@ -102,11 +102,13 @@
{
int i,j,k,x,y,index=0;
int p=0,tmp;
- uint8 chr0,chr1,logs,shift;
+ uint8 chr0,chr1,logs,shift,chr2,chr3;
uint8 *pbitmap = bitmap;
- pal <<= 2;
- for (i = 0; i < (16 >> PPUView_sprite16Mode); i++) //Columns
+ if(vt03_mode)pal <<= 4;
+ else pal <<=2;
+
+ for (i = 0; i < (32 >> PPUView_sprite16Mode); i++) //Columns
{
for (j = 0; j < 16; j++) //Rows
{
@@ -116,13 +118,24 @@
{
chr0 = table[index];
chr1 = table[index + 8];
+ chr2 = table[index + 16];
+ chr3 = table[index + 24];
+ if(vt03_mode)logs = log[index] & log[index + 8] & log[index + 16] & log[index + 24];
+ else
logs = log[index] & log[index + 8];
tmp = 7;
- shift=(PPUView_maskUnusedGraphics && debug_loggingCD && (((logs & 3) != 0) == PPUView_invertTheMask))?3:0;
+ if(vt03_mode)shift=(PPUView_maskUnusedGraphics && debug_loggingCD && (((logs & 0xF) != 0) == PPUView_invertTheMask))?0xF:0;
+ else
+ shift=(PPUView_maskUnusedGraphics && debug_loggingCD && (((logs & 0x3) != 0) == PPUView_invertTheMask))?0x3:0;
for (x = 0; x < 8; x++)
{
p = (chr0 >> tmp) & 1;
p |= ((chr1 >> tmp) & 1) << 1;
+ if(vt03_mode)
+ {
+ p |= ((chr2 >> tmp) & 1) << 2;
+ p |= ((chr3 >> tmp) & 1) << 3;
+ }
p = palcache[p | pal];
tmp--;
*(uint8*)(pbitmap++) = palo[p].b >> shift;
@@ -132,6 +145,8 @@
index++;
pbitmap += (PATTERNBITWIDTH-24);
}
+ if(vt03_mode)index+=24;
+ else
index+=8;
}
pbitmap -= ((PATTERNBITWIDTH<<(3+PPUView_sprite16Mode))-24);
@@ -154,18 +169,33 @@
if(refreshchr)
{
- for (i = 0, x=0x1000; i < 0x1000; i++, x++)
+ for (i = 0, x=0x8000; i < 0x4000; i++, x++)
+ {
+ if(i<0x2000)chrcache0[i] = VPage[i>>10][i];
+ else chrcache0[i] = extra_ppu[x-0x2000];
+ if(vt03_mode)
+ {
+ if(i<0x2000)chrcache1[i] = extra_ppu[0x2000+x];
+ else chrcache1[i] = extra_ppu[i+0xC000];
+ }
+ else
{
- chrcache0[i] = VPage[i>>10][i];
- chrcache1[i] = VPage[x>>10][x];
+ if(i<0x2000)chrcache1[i] = extra_ppu[x];
+ else chrcache1[i] = extra_ppu[i+0xC000];
+ }
if (debug_loggingCD) {
if (cdloggerVideoDataSize)
{
int addr;
- addr = &VPage[i >> 10][i] - CHRptr[0];
+ if(vt03_mode)
+ {
+ if(i<0x2000)addr = (uint8*)&VPage[i >> 10][i] - CHRptr[0];
+ else addr = (uint8*)&extra_ppu[x-0x2000] - CHRptr[0];
+ }
if ((addr >= 0) && (addr < (int)cdloggerVideoDataSize))
logcache0[i] = cdloggervdata[addr];
- addr = &VPage[x >> 10][x] - CHRptr[0];
+ if(i<0x2000)addr = (uint8*)&extra_ppu[0x2000+x] - CHRptr[0];
+ else addr = (uint8*)&extra_ppu[i+0xC000] - CHRptr[0];
if ((addr >= 0) && (addr < (int)cdloggerVideoDataSize))
logcache1[i] = cdloggervdata[addr];
} else {
@@ -177,25 +207,100 @@
}
// update palette only if required
- if (memcmp(palcache, PALRAM, 32) != 0)
+ if (memcmp(palcache, PALRAM, 256) != 0)
{
// bbit note: let para know that this if is useless and
// will not work because of the lines below that change
// palcache which will make it not equal next time
// cache palette content
- memcpy(palcache,PALRAM,32);
+ memcpy(palcache,PALRAM,256);
palcache[0x10] = palcache[0x00];
+
+if(!vt03_mode){
palcache[0x14] = palcache[0x00];
palcache[0x18] = palcache[0x00];
palcache[0x1C] = palcache[0x00];
+palcache[0x24] = palcache[0x00];
+palcache[0x28] = palcache[0x00];
+palcache[0x2C] = palcache[0x00];
+palcache[0x34] = palcache[0x00];
+palcache[0x38] = palcache[0x00];
+palcache[0x3C] = palcache[0x00];
+palcache[0x44] = palcache[0x00];
+palcache[0x48] = palcache[0x00];
+palcache[0x4C] = palcache[0x00];
+palcache[0x54] = palcache[0x00];
+palcache[0x58] = palcache[0x00];
+palcache[0x5C] = palcache[0x00];
+palcache[0x64] = palcache[0x00];
+palcache[0x68] = palcache[0x00];
+palcache[0x6C] = palcache[0x00];
+palcache[0x74] = palcache[0x00];
+palcache[0x78] = palcache[0x00];
+palcache[0x7C] = palcache[0x00];
+palcache[0x84] = palcache[0x00];
+palcache[0x88] = palcache[0x00];
+palcache[0x8C] = palcache[0x00];
+palcache[0x94] = palcache[0x00];
+palcache[0x98] = palcache[0x00];
+palcache[0x9C] = palcache[0x00];
+palcache[0xA4] = palcache[0x00];
+palcache[0xA8] = palcache[0x00];
+palcache[0xAC] = palcache[0x00];
+palcache[0xB4] = palcache[0x00];
+palcache[0xB8] = palcache[0x00];
+palcache[0xBC] = palcache[0x00];
+palcache[0xC4] = palcache[0x00];
+palcache[0xC8] = palcache[0x00];
+palcache[0xCC] = palcache[0x00];
+palcache[0xD4] = palcache[0x00];
+palcache[0xD8] = palcache[0x00];
+palcache[0xDC] = palcache[0x00];
+palcache[0xE4] = palcache[0x00];
+palcache[0xE8] = palcache[0x00];
+palcache[0xEC] = palcache[0x00];
+palcache[0xF4] = palcache[0x00];
+ palcache[0xF8] = palcache[0x00];
+ palcache[0xFC] = palcache[0x00];
+
+ }
+palcache[0x20] = palcache[0x00];
+
+palcache[0x30] = palcache[0x00];
+
+palcache[0x40] = palcache[0x00];
+
+palcache[0x50] = palcache[0x00];
+
+palcache[0x60] = palcache[0x00];
+
+palcache[0x70] = palcache[0x00];
+
+palcache[0x80] = palcache[0x00];
+
+palcache[0x90] = palcache[0x00];
+
+ palcache[0xA0] = palcache[0x00];
+
+ palcache[0xB0] = palcache[0x00];
+
+ palcache[0xC0] = palcache[0x00];
+
+ palcache[0xD0] = palcache[0x00];
+
+ palcache[0xE0] = palcache[0x00];
+
+ palcache[0xF0] = palcache[0x00];
+
+
//draw palettes
for (y = 0; y < PALETTEHEIGHT; y++)
{
for (x = 0; x < PALETTEWIDTH; x++)
{
- i = (((y>>5)<<4)+(x>>5));
+ i = (((y>>4)<<4)+(x>>5));
*(uint8*)(pbitmap++) = palo[palcache[i]].b;
*(uint8*)(pbitmap++) = palo[palcache[i]].g;
*(uint8*)(pbitmap++) = palo[palcache[i]].r;
@@ -211,7 +316,7 @@
*(uint8*)(pbitmap++) = 0;
}
pbitmap = (ppuv_palette-3);
- for (y = 0; y < 64*3; y++)
+ for (y = 0; y < 64*3*4; y++)
{
if (!(y%3)) pbitmap += (32*4*3);
for (x = 0; x < 6; x++)
@@ -220,7 +325,7 @@
}
pbitmap += ((32*4*3)-6);
}
- memcpy(palcache,PALRAM,32); //palcache which will make it not equal next time
+ memcpy(palcache,PALRAM,256); //palcache which will make it not equal next time
}
DrawPatternTable(pattern0,chrcache0,logcache0,pindex0);
@@ -429,10 +534,10 @@
//clear cache
memset(palcache,0,32);
- memset(chrcache0,0,0x1000);
- memset(chrcache1,0,0x1000);
- memset(logcache0,0,0x1000);
- memset(logcache1,0,0x1000);
+ memset(chrcache0,0,0x4000);
+ memset(chrcache1,0,0x4000);
+ memset(logcache0,0,0x4000);
+ memset(logcache1,0,0x4000);