Skip to content

Commit 3626cfe

Browse files
blkerbyblkerby
authored
Merge pull request #378 from blkerby/palette-swap
Move black from color 15 to color 8 on 4bpp palette 1
2 parents 601f983 + a732f6f commit 3626cfe

File tree

249 files changed

+3655
-3446
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+3655
-3446
lines changed

Diff for: ‎Projects/Base/ASM/Area FX.asm

+9-77
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ EnableTilesetSwapFlag:
251251
; Two bytes go here
252252
; DW $F0F0 ; vanilla = $147E
253253

254-
org $8AB502
254+
org $8AB5B0
255255
CheckTileset:
256256
; Enable tileset swapping only if the flag is set in the ROM or debug event flag is set:
257257
AND #$00FF
@@ -352,14 +352,14 @@ UpdateHeavySandColors: ;DB is 8D
352352
LoadSpeecialRoomTiles:
353353
PHK
354354
PLB
355-
; TODO, make some kind of check here to load different data
355+
356356
LoadSpeecialRoomTiles_Tube:
357357
LDY $0330
358-
LDA #$03E0
358+
LDA #$0400
359359
STA $00D0,Y
360360
LDA #$8A00
361361
STA $00D3,Y
362-
LDA.w #TubeGfx_1
362+
LDA.w #TubeGfx
363363
STA $00D2,Y
364364
LDA #$3E00 ; area after the CRE
365365
STA $00D5,Y
@@ -371,7 +371,7 @@ LoadSpeecialRoomTiles_Tube:
371371
STA $00D0,Y
372372
LDA #$8A00
373373
STA $00D3,Y
374-
LDA.w #TubeGfx_2
374+
LDA.w #TubeGfx+$0400
375375
STA $00D2,Y
376376
LDA #$2400 ; overwrite vileplumes
377377
STA $00D5,Y
@@ -389,82 +389,10 @@ LoadSpeecialRoomTiles_Tube:
389389

390390
LoadSpeecialRoomTiles_UnpauseHook:
391391
PHP
392-
;JSL $80836F ; force blank and lag a frame
393392
JSL LoadSpeecialRoomTiles_Tube
394-
;JSL $808C83 ; process dma queue immediatly
395-
;JSL $808382 ; unforce blank and lag a frame
396393
PLP
397394
RTL
398395

399-
warnpc $8AB620
400-
org $8AB700
401-
TubeGfx_1:
402-
DB $3F, $FF, $9F, $FF, $E7, $FF, $79, $FF, $1E, $FF, $87, $FF, $E1, $FF, $F8, $FF, $FF, $01, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00
403-
DB $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $7F, $FF, $9F, $FF, $E7, $FF, $79, $FF, $FF, $9F, $FF, $67, $FF, $19, $FF, $06, $FF, $01, $FF, $00, $FF, $00, $FF, $00
404-
DB $1F, $FF, $07, $FF, $C1, $3F, $30, $CF, $0E, $F1, $C1, $3E, $F0, $0F, $3E, $C1, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00
405-
DB $1E, $FF, $C7, $FF, $F1, $FF, $3E, $FF, $07, $FF, $81, $7F, $70, $8F, $0C, $F3, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00
406-
DB $07, $F8, $E0, $1F, $1E, $E1, $81, $7E, $F8, $07, $FF, $00, $FF, $00, $1F, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00
407-
DB $C3, $3C, $F8, $07, $0E, $F1, $E1, $1E, $1C, $E3, $83, $7C, $F0, $0F, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00
408-
DB $C0, $00, $3E, $00, $01, $00, $00, $00, $00, $00, $00, $00, $00, $FF, $00, $FF, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $FF, $FF, $FF
409-
DB $FF, $00, $07, $00, $F0, $00, $0F, $00, $00, $00, $00, $00, $00, $00, $00, $FF, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $FF
410-
DB $FF, $FF, $FF, $FF, $FF, $FF, $F4, $E6, $FC, $F9, $B9, $BF, $E7, $FF, $9E, $FF, $FF, $79, $FF, $E6, $FF, $98, $FF, $60, $FF, $80, $FF, $00, $FF, $04, $FF, $18
411-
DB $F6, $FC, $CC, $FC, $9E, $DC, $2E, $3E, $FF, $7E, $EE, $F4, $84, $FC, $18, $F8, $FE, $84, $FE, $08, $FF, $18, $FF, $2C, $FF, $0C, $FE, $04, $FE, $04, $FC, $08
412-
DB $78, $FF, $E3, $FF, $97, $E6, $7E, $F8, $E8, $F7, $89, $FE, $0E, $F1, $F4, $CF, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00
413-
DB $FC, $EE, $86, $1C, $84, $FC, $0A, $F6, $77, $8E, $8E, $7F, $5E, $FC, $7C, $BC, $FE, $2C, $FE, $00, $FE, $00, $FF, $00, $FF, $02, $FF, $04, $FE, $48, $FE, $38
414-
DB $DB, $3C, $3F, $E0, $71, $8F, $86, $7B, $3C, $C4, $C5, $3E, $0B, $F0, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $03, $FF, $00, $FF, $04, $FF, $00, $FF, $00
415-
DB $EC, $18, $1C, $FC, $FC, $FE, $BE, $7F, $0F, $EE, $E7, $1E, $36, $46, $D7, $2E, $FC, $08, $FC, $08, $FE, $F8, $FF, $1C, $FF, $0C, $FF, $0C, $FF, $04, $FF, $04
416-
DB $FF, $80, $F8, $18, $0F, $07, $B2, $43, $0C, $0E, $38, $00, $C1, $04, $00, $DD, $FF, $00, $FF, $00, $FF, $03, $FF, $01, $FF, $06, $FF, $00, $FF, $00, $FF, $DD
417-
DB $06, $04, $7E, $0C, $8C, $8C, $4C, $4C, $38, $38, $18, $18, $BC, $58, $78, $B8, $FE, $04, $FE, $08, $FE, $08, $FE, $48, $FC, $30, $FC, $10, $FC, $50, $FC, $B0
418-
DB $00, $00, $00, $00, $00, $00, $00, $00, $03, $03, $0F, $0E, $3F, $3F, $FF, $FF, $00, $00, $00, $00, $00, $00, $00, $00, $03, $01, $0F, $06, $3F, $17, $FF, $3E
419-
DB $30, $68, $18, $14, $1C, $3A, $7A, $FE, $FC, $FA, $FC, $F4, $DC, $FC, $FD, $F6, $78, $00, $1C, $04, $3E, $08, $FE, $7A, $FE, $B8, $FC, $E4, $FD, $98, $FF, $64
420-
DB $C0, $C0, $F0, $F0, $FC, $FC, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $C0, $C0, $F0, $F0, $FC, $FC, $FF, $7F, $FF, $9F, $FF, $67, $FF, $19, $FF, $06
421-
DB $00, $00, $00, $00, $00, $00, $00, $00, $C0, $C0, $F0, $F0, $FC, $FC, $FF, $FF, $00, $00, $00, $00, $00, $00, $00, $00, $C0, $C0, $F0, $F0, $FC, $FC, $FF, $7F
422-
DB $88, $D4, $5E, $FD, $FF, $FB, $7F, $7F, $DF, $FF, $F7, $FF, $FF, $FF, $1E, $1E, $FC, $04, $FF, $08, $FF, $A0, $7F, $76, $FF, $89, $FF, $77, $FF, $FF, $1E, $1E
423-
DB $BC, $5E, $97, $EB, $DF, $FE, $FF, $FF, $FE, $F7, $FF, $FF, $7E, $7C, $18, $18, $FE, $00, $FF, $00, $FF, $08, $FF, $9F, $FF, $C9, $FF, $FF, $7E, $78, $18, $18
424-
DB $FF, $B0, $80, $0C, $B0, $FF, $FF, $30, $30, $30, $30, $30, $30, $30, $30, $FF, $FF, $B0, $FF, $0C, $FF, $B0, $FF, $30, $FF, $30, $FF, $30, $FF, $30, $FF, $FF
425-
DB $FB, $74, $5F, $30, $70, $F0, $FB, $04, $00, $00, $00, $00, $04, $00, $00, $FF, $FF, $70, $FF, $10, $FF, $70, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $FF
426-
DB $88, $FF, $88, $F8, $88, $88, $A8, $8F, $8F, $8F, $88, $88, $88, $88, $F9, $88, $F8, $77, $FF, $77, $FF, $07, $F8, $07, $F8, $07, $FF, $07, $FF, $07, $FF, $07
427-
DB $00, $FF, $30, $00, $40, $00, $00, $FF, $FF, $FF, $80, $00, $80, $00, $00, $00, $00, $FF, $F0, $F0, $C0, $C0, $00, $FF, $00, $FF, $80, $80, $80, $80, $00, $00
428-
DB $FF, $FF, $00, $00, $00, $00, $00, $FF, $00, $00, $00, $00, $00, $00, $00, $00, $00, $FF, $00, $00, $00, $00, $00, $FF, $FF, $FF, $00, $00, $00, $00, $00, $00
429-
DB $F0, $F0, $00, $00, $00, $00, $FF, $FF, $00, $00, $00, $00, $00, $00, $00, $00, $0F, $FF, $00, $00, $00, $00, $00, $FF, $FF, $FF, $00, $00, $00, $00, $00, $00
430-
DB $00, $00, $00, $00, $00, $00, $F0, $F0, $00, $00, $00, $00, $00, $00, $00, $00, $FF, $FF, $00, $00, $00, $00, $0F, $FF, $FF, $FF, $00, $00, $00, $00, $00, $00
431-
DB $00, $00, $00, $00, $00, $00, $00, $00, $FF, $00, $00, $00, $00, $00, $00, $00, $FF, $FF, $00, $00, $00, $00, $FF, $FF, $FF, $FF, $00, $00, $00, $00, $00, $00
432-
DB $8F, $F8, $F8, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $00, $FF, $88, $FF, $A8, $FF, $FF, $FF, $88, $FF, $FF, $FF, $FF, $FF, $FF
433-
;DB $F7, $08, $88, $FF, $FF, $FF, $FF, $FF, $FF, $F7, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $00, $FF, $00, $FF, $08, $FF, $FF, $FF, $08, $FF, $FF, $FF, $FF, $FF, $FF
434-
TubeGfx_2:
435-
DB $FF, $FF, $FF, $FF, $FF, $FD, $FA, $F8, $FF, $FD, $FF, $FA, $FF, $FD, $8A, $FA, $FF, $FF, $FF, $F8, $FF, $FF, $FF, $8F, $FF, $FF, $FF, $AF, $FF, $8F, $FD, $07
436-
DB $FF, $FF, $FF, $FF, $FF, $55, $AA, $00, $FF, $55, $FD, $A8, $AA, $00, $AA, $AA, $FF, $FF, $FF, $00, $FF, $FF, $FF, $FF, $FF, $FF, $FD, $FD, $AA, $AA, $55, $FF
437-
DB $FF, $FF, $FF, $FF, $FF, $55, $AA, $00, $FA, $50, $55, $00, $AA, $00, $AA, $AA, $FF, $FF, $FF, $00, $FF, $FF, $FF, $FF, $FA, $FA, $55, $55, $AA, $AA, $55, $FF
438-
DB $FF, $FF, $FF, $FF, $FE, $54, $AA, $00, $AA, $00, $55, $00, $AA, $00, $AA, $AA, $FF, $FF, $FF, $00, $FE, $FE, $FF, $FF, $AA, $AA, $55, $55, $AA, $AA, $55, $FF
439-
DB $FF, $FF, $FF, $FF, $AA, $00, $AA, $00, $AA, $00, $55, $00, $AA, $00, $AA, $AA, $FF, $FF, $FF, $00, $AA, $AA, $FF, $FF, $AA, $AA, $55, $55, $AA, $AA, $55, $FF
440-
DB $FF, $FF, $FF, $FF, $AA, $00, $AA, $00, $AA, $00, $55, $00, $AA, $00, $55, $00, $FF, $FF, $FF, $00, $AA, $AA, $FF, $FF, $AA, $AA, $55, $55, $AA, $AA, $FF, $FF
441-
DB $FE, $F8, $F8, $F8, $FE, $F8, $AD, $F8, $88, $F8, $F8, $F8, $F8, $F8, $88, $F8, $FE, $8E, $FD, $8D, $FE, $8E, $FD, $25, $F8, $00, $FF, $8F, $F8, $88, $F8, $00
442-
DB $AA, $00, $00, $00, $00, $00, $45, $00, $00, $00, $00, $00, $00, $00, $00, $00, $AA, $AA, $45, $45, $2A, $2A, $55, $55, $00, $00, $FF, $FF, $00, $00, $00, $00
443-
DB $AA, $00, $00, $00, $00, $00, $45, $00, $00, $00, $FF, $00, $00, $00, $00, $00, $AA, $AA, $45, $45, $2A, $2A, $55, $55, $00, $00, $FF, $FF, $00, $00, $00, $00
444-
DB $AA, $00, $00, $00, $00, $00, $45, $00, $00, $00, $00, $00, $00, $00, $00, $00, $AA, $AA, $45, $45, $2A, $2A, $55, $55, $00, $00, $00, $00, $00, $00, $00, $00
445-
DB $AA, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $AA, $AA, $41, $41, $28, $28, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
446-
DB $8C, $F8, $AC, $F8, $F8, $8F, $8F, $F8, $8F, $F8, $F8, $8F, $F8, $8F, $AF, $F8, $FC, $04, $FC, $04, $F8, $07, $FF, $07, $FF, $07, $F8, $07, $F8, $07, $FF, $07
447-
DB $00, $00, $00, $00, $FF, $FF, $00, $00, $FF, $00, $3F, $FF, $00, $FF, $FF, $00, $00, $00, $00, $00, $00, $FF, $00, $00, $FF, $FF, $00, $FF, $00, $FF, $FF, $FF
448-
DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $FC, $FC, $FF, $FF, $F0, $00, $00, $00, $00, $00, $FF, $FF, $00, $00, $00, $00, $03, $FF, $00, $FF, $F0, $F0
449-
DB $00, $00, $00, $00, $0F, $00, $00, $00, $00, $00, $00, $00, $C0, $C0, $00, $00, $00, $00, $00, $00, $FF, $FF, $00, $00, $00, $00, $FF, $FF, $3F, $FF, $00, $00
450-
DB $00, $00, $00, $00, $C0, $00, $00, $00, $00, $00, $FF, $00, $03, $00, $00, $00, $00, $00, $00, $00, $C0, $C0, $00, $00, $00, $00, $FF, $FF, $FF, $FF, $00, $00
451-
DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $FF, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $FF, $FF, $00, $00
452-
DB $8F, $F8, $FB, $88, $8A, $F8, $FF, $8F, $FA, $88, $D8, $AF, $F8, $8F, $89, $88, $FF, $07, $FF, $07, $FE, $06, $F8, $07, $FE, $06, $F8, $07, $F8, $07, $FF, $07
453-
DB $E0, $00, $00, $00, $00, $00, $FF, $FF, $00, $00, $3F, $FF, $0F, $FF, $00, $00, $E0, $E0, $00, $00, $00, $00, $00, $FF, $00, $00, $00, $FF, $00, $FF, $00, $00
454-
DB $00, $00, $00, $00, $00, $00, $0F, $00, $00, $00, $C0, $C0, $F0, $F0, $00, $00, $00, $00, $00, $00, $00, $00, $FF, $FF, $00, $00, $3F, $FF, $0F, $FF, $00, $00
455-
DB $00, $00, $00, $00, $00, $00, $C0, $00, $00, $00, $FC, $00, $0F, $00, $00, $00, $00, $00, $00, $00, $00, $00, $C0, $C0, $00, $00, $FC, $FC, $FF, $FF, $00, $00
456-
DB $00, $00, $00, $00, $00, $00, $FF, $00, $00, $00, $0F, $0F, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $FF, $FF, $00, $00, $F0, $FF, $FF, $FF, $00, $00
457-
DB $00, $00, $00, $00, $00, $00, $F0, $00, $00, $00, $FF, $FF, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $FF, $FF, $00, $00, $00, $FF, $FF, $FF, $00, $00
458-
DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $F0, $FF, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $FF, $FF, $00, $00, $00, $FF, $FF, $FF, $00, $00
459-
DB $F8, $88, $88, $88, $8F, $8F, $88, $8F, $A8, $88, $88, $8F, $8F, $F8, $88, $FF, $FF, $07, $FF, $07, $F8, $07, $F8, $07, $FF, $07, $F8, $07, $F8, $77, $FF, $77
460-
DB $80, $00, $60, $00, $FF, $FF, $00, $FF, $38, $00, $03, $FF, $FF, $00, $00, $FC, $80, $80, $E0, $E0, $00, $FF, $00, $FF, $F8, $F8, $00, $FF, $00, $FF, $FC, $FF
461-
DB $00, $00, $00, $00, $C0, $C0, $FF, $FF, $00, $00, $FC, $FC, $C0, $3F, $00, $00, $00, $00, $00, $00, $3F, $FF, $00, $FF, $00, $00, $03, $FF, $00, $FF, $00, $FF
462-
DB $00, $00, $00, $00, $07, $00, $00, $00, $00, $00, $00, $00, $FF, $FF, $00, $00, $00, $00, $00, $00, $FF, $FF, $FF, $FF, $00, $00, $FF, $FF, $00, $FF, $00, $FF
463-
DB $00, $00, $00, $00, $FC, $00, $00, $00, $00, $00, $0F, $00, $FF, $FF, $FF, $00, $00, $00, $00, $00, $FC, $FC, $FF, $FF, $00, $00, $FF, $FF, $00, $FF, $00, $FF
464-
DB $00, $00, $00, $00, $00, $00, $FF, $00, $00, $00, $FF, $00, $00, $00, $FF, $00, $00, $00, $00, $00, $00, $00, $FF, $FF, $00, $00, $FF, $FF, $FF, $FF, $00, $FF
465-
DB $00, $00, $00, $00, $FF, $FF, $F0, $FF, $FF, $00, $FF, $FF, $FF, $00, $00, $00, $00, $00, $00, $00, $00, $FF, $00, $FF, $FF, $FF, $00, $FF, $00, $FF, $00, $FF
466-
DB $F7, $08, $88, $FF, $FF, $FF, $FF, $FF, $FF, $F7, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $00, $FF, $00, $FF, $08, $FF, $FF, $FF, $08, $FF, $FF, $FF, $FF, $FF, $FF
467-
468396
CheckShutterEnemyRoom: ;DB is 8D
469397
LDA #$000E
470398
JSL $808233
@@ -520,6 +448,10 @@ Fireflies_Dark_:
520448
Fireflies_Light:
521449
DW $0000, $0300, $0600, $0A00, $1000, $1200
522450

451+
org $8AD000
452+
TubeGfx:
453+
incbin Tube.gfx
454+
523455
org $8FC11B ; Room init code for ocean rooms no longer used due to scrolling sky
524456
JSL LoadSpeecialRoomTiles
525457
RTS

Diff for: ‎Projects/Base/ASM/Bowling.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ CloseBowlingStairs:
2424
RTS
2525
warnpc $849D59
2626

27-
org $8AB620 ; free space (due to scrolling sky)
27+
org $8AB502 ; free space (due to scrolling sky)
2828
OpenBowlingStairs_2:
2929
PHX
3030
PHY

Diff for: ‎Projects/Base/ASM/Tube.gfx

0 Bytes
Binary file not shown.

Diff for: ‎Projects/Base/Data/Tileset/CRE/00.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<Collision>
44
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
55
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
6-
9-00 9-00 9-00 9-00 8-00 8-00 8-00 8-00 8-00 8-00 NULL NULL NULL NULL NULL NULL NULL NULL C-00 NULL NULL NULL A-00 C-08 F-00 8-00 8-00 2-00 2-00 8-00 8-00 8-00
6+
9-00 9-00 9-00 9-00 8-00 8-00 8-00 8-00 8-00 8-00 NULL 0-00 0-00 0-00 0-00 0-00 0-00 0-00 C-00 NULL NULL NULL A-00 C-08 F-00 8-00 8-00 2-00 2-00 8-00 8-00 8-00
77
9-00 9-00 9-00 9-00 8-00 8-00 8-00 8-00 8-00 8-00 NULL 2-00 8-00 8-00 8-00 8-00 8-00 8-00 C-00 C-00 C-00 NULL NULL NULL NULL NULL 8-00 8-00 8-00 8-00 8-00 8-00
88
8-00 8-00 2-00 2-00 2-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 NULL NULL NULL NULL NULL NULL NULL NULL A-01 5-FF A-02 A-03 5-FF E-00 A-00 8-00 8-00 C-0A
99
NULL 2-00 2-00 1-14 1-00 1-00 1-00 1-00 1-00 1-00 NULL NULL NULL NULL 8-00 NULL NULL NULL 8-00 8-00 NULL NULL C-0E E-01 D-FF D-FF D-FF 8-00 B-00 8-00 8-00 NULL
1010
NULL 8-00 8-00 1-01 8-00 8-00 8-00 8-00 8-00 8-00 NULL NULL NULL NULL 8-00 NULL NULL NULL NULL NULL NULL NULL 8-00 8-00 NULL NULL NULL NULL NULL 1-41 NULL NULL
11-
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 0-00
11+
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 0-00 NULL 0-00 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 0-00
1212
</Collision>
1313
</Tileset>

Diff for: ‎Projects/Base/Data/Tileset/SCE/0B.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
8-00 8-00 8-00 8-00 8-00 1-17 1-01 1-17 8-00 8-00 1-01 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 NULL NULL NULL NULL NULL NULL 1-15 1-15 NULL NULL NULL
55
1-12 8-00 8-00 8-00 1-16 1-17 8-00 1-14 8-00 8-00 1-1B 1-1C 8-00 8-00 1-14 1-01 1-00 1-00 1-00 1-15 8-00 1-01 1-01 1-01 1-01 8-00 NULL NULL 0-00 0-00 NULL NULL
66
1-12 8-00 8-00 8-00 8-00 1-17 8-00 8-00 8-00 8-00 8-00 0-00 8-00 8-00 8-00 8-00 0-00 0-00 1-15 1-15 1-15 1-15 8-00 8-00 0-00 0-00 0-00 1-15 1-15 NULL NULL NULL
7-
8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 NULL 8-00 1-00 8-00 1-15 0-00 1-12 0-00 0-00 0-00 0-00 1-95 0-00 NULL NULL NULL NULL
7+
8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 NULL 8-00 1-00 8-00 1-15 0-00 1-12 0-00 0-00 0-00 0-00 1-95 NULL NULL NULL NULL NULL
88
8-00 1-00 8-00 8-00 1-00 8-00 8-00 1-01 8-00 1-14 1-15 8-00 8-00 8-00 1-01 8-00 1-9C 8-00 0-00 0-00 1-92 8-00 1-94 1-95 8-00 8-00 8-00 1-00 1-00 NULL 1-00 1-02
99
8-00 1-00 8-00 1-16 8-00 1-17 8-00 1-12 8-00 8-00 1-01 8-00 8-00 8-00 8-00 8-00 1-82 1-80 0-00 0-00 0-00 0-00 0-00 0-00 0-00 8-00 8-00 8-00 NULL NULL NULL NULL
1010
8-00 8-00 NULL NULL NULL 1-17 8-00 8-00 8-00 8-00 8-00 NULL NULL NULL NULL NULL NULL NULL 0-00 NULL NULL NULL 8-00 NULL NULL NULL 8-00 8-00 NULL NULL NULL NULL
@@ -18,11 +18,11 @@ NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
1818
NULL NULL NULL 0-00 0-00 0-00 0-00 0-00 0-00 NULL NULL 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 1-00 1-00 1-01 1-01 NULL
1919
NULL NULL NULL NULL NULL NULL 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 1-00 1-00 1-01 1-01 NULL
2020
1-00 1-00 1-00 1-00 0-00 0-00 0-00 0-00 1-00 1-00 1-00 1-00 0-00 0-00 0-00 0-00 NULL NULL 1-00 1-00 1-80 1-00 8-00 1-00 1-00 8-00 8-00 8-00 NULL NULL 8-00 8-00
21-
0-00 8-00 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 0-00 0-00 0-00 0-00 NULL 8-00 8-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 NULL 1-14
21+
0-00 8-00 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 8-00 8-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 NULL 1-14
2222
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1-00 1-00 1-00 1-80 1-80 1-80 1-80 8-00 8-00
2323
1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00
2424
0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 8-00 8-00
25-
NULL NULL 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 NULL NULL NULL NULL NULL NULL 1-96 NULL 8-00 NULL 8-00 8-00 8-00 8-00 2-02 2-00 NULL NULL NULL NULL NULL NULL
25+
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1-96 NULL 8-00 NULL 8-00 8-00 8-00 8-00 2-02 2-00 NULL NULL NULL NULL NULL NULL
2626
1-00 1-00 1-00 1-00 1-00 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 8-00 NULL 8-00 NULL NULL 3-85 8-00 8-00 8-00 8-00 3-80 8-00 3-80 8-00 3-80 8-00 3-80
2727
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 8-00 1-80 1-80 8-00 8-00 8-00 1-96 1-80 8-00 8-00 3-85 3-85 3-85 3-83 3-83 3-82 3-82 8-00 8-00 8-00 8-00 8-00
2828
</Collision>

Diff for: ‎Projects/Base/Data/Tileset/SCE/0C.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
1818
0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 NULL NULL 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00
1919
NULL NULL NULL NULL NULL NULL 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 NULL NULL NULL NULL NULL
2020
1-00 1-00 1-00 1-00 0-00 0-00 0-00 0-00 1-00 1-00 1-00 1-00 0-00 0-00 0-00 0-00 NULL NULL 1-00 1-00 1-80 1-00 NULL NULL 8-00 8-00 8-00 8-00 NULL NULL 8-00 8-00
21-
0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 NULL NULL NULL NULL NULL 0-00 0-00 0-00 0-00 NULL 8-00 8-00 NULL NULL NULL NULL 0-00 8-00 0-00 NULL NULL
21+
0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 8-00 8-00 NULL NULL NULL NULL 0-00 8-00 0-00 NULL NULL
2222
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1-00 1-00 1-80 1-80 NULL NULL 8-00 8-00
2323
1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 1-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00 8-00
2424
0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 8-00 8-00
25-
NULL NULL 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 0-00 NULL 2-02 2-00 NULL NULL NULL NULL NULL NULL
25+
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 0-00 0-00 NULL NULL NULL NULL NULL NULL NULL 0-00 0-00 0-00 0-00 NULL 2-02 2-00 NULL NULL NULL NULL NULL NULL
2626
1-00 1-00 1-00 1-00 1-00 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 8-00 NULL 8-00 NULL NULL NULL 8-00 8-00 8-00 8-00 3-80 8-00 3-80 8-00 3-80 8-00 3-80
2727
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 8-00 1-80 1-80 8-00 8-00 8-00 1-96 1-80 8-00 8-00 3-85 3-85 3-85 3-83 3-83 3-82 3-82 8-00 8-00 8-00 8-00 8-00
2828
</Collision>

0 commit comments

Comments
 (0)