Tanks colors mapping and order from Adam

constants.asm

@@ -22,7 +22,10 @@ initialvaluesCount = *-initialvaluesstart  ; MAX 128 bytes !
 ;==========================CONSTANT TABLES, do not erase!===========================
 ;===================================================================================
 TankColoursTable        .BYTE $58,$2a,$96,$ca,$7a,$ed
-TankStatusColoursTable  .BYTE $54,$24,$92,$c4,$74,$e4
+;TankStatusColoursTable  .BYTE $54,$24,$92,$c4,$74,$e4	; standard order
+;TanksPMOrder	.BYTE 4,3,1,5,0,2 ; 0-3 = P0-P3 , 4 = M0+M1 , 5 = M2+M3
+TankStatusColoursTable  .BYTE $74,$c4,$24,$e4,$54,$94	; Adam's order
+TanksPMOrder	.BYTE 4,3,1,5,0,2 ; 0-3 = P0-P3 , 4 = M0+M1 , 5 = M2+M3
 TankShapesTable			.BYTE char_tank1___________,char_tank2___________,char_tank3___________
 						.BYTE char_tank1___________,char_tank2___________,char_tank3___________
 dliColorsBack

grafproc.asm

@@ -611,6 +611,8 @@ DrawNextTank
     bne SkipHidingPM ; if energy=0 then no tank
 
     ; hide P/M
+	lda TanksPMOrder,x
+	tax
     lda #0
     cpx #$4 ; 5th tank is defferent
     bne No5thTankHide
@@ -626,6 +628,7 @@ No5thTankHide
 No6thTankHide
     sta hposp0,x
 @
+	ldx TankNr
     jmp DoNotDrawTankNr
 SkipHidingPM
 
@@ -646,6 +649,8 @@ DrawTankNrX
     ; now P/M graphics on the screen (only for 5 tanks)
     ; horizontal position
     ldx TankNr
+	lda TanksPMOrder,x
+	tax
     mwa xdraw xbyte
     rorw xbyte ; divide by 2 (carry does not matter)
     lda xbyte