mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-17 04:52:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

pal-final: Fix mismatches in tile files

Browse Source
This commit is contained in:
Ryan Dwyer
2020-04-14 17:27:00 +10:00
parent 8e65f7ae83
commit a839c439c3
2 changed files with 82 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/files/bgdata/bg_lue_tiles.s
+17 -2
View File
@@ -8410,7 +8410,14 @@ room8a:
tile3 0x00, 0x1b, 0x0002, 0x0100, 0x0000, 0x0002, 0x0333, /*1*/ 1152, -533, -21308, /*2*/ 917, -533, -21308, /*3*/ 1117, -533, -20891
tile4 0x00, 0x1b, 0x0002, 0x0000, 0x0002, 0x0002, 0x0333, /*1*/ 917, -533, -20891, /*2*/ 917, -533, -20883, /*3*/ 1062, -533, -20764, /*4*/ 1035, -533, -20891
tile3 0x20, 0x1b, 0x0002, 0x0000, 0x0200, 0x0200, 0x0222, /*1*/ 1117, -533, -20891, /*2*/ 1117, -533, -21350, /*3*/ 1117, -467, -21417
tile4 0x00, 0x1b, 0x0002, 0x0000, 0x0100, 0x0102, 0x0555, /*1*/ 917, -533, -20891, /*2*/ 917, -467, -21417, /*3*/ 917, -467, -20833, /*4*/ 917, -533, -20833
.if VERSION >= VERSION_PAL_FINAL
# Fix wrong tile type in medlab where you talk to the guard - tile should be wall
tile4 0x00, 0x1c, 0x0002, 0x0000, 0x0100, 0x0102, 0x0555, /*1*/ 917, -533, -20891, /*2*/ 917, -467, -21417, /*3*/ 917, -467, -20833, /*4*/ 917, -533, -20833
.else
tile4 0x00, 0x1b, 0x0002, 0x0000, 0x0100, 0x0102, 0x0555, /*1*/ 917, -533, -20891, /*2*/ 917, -467, -21417, /*3*/ 917, -467, -20833, /*4*/ 917, -533, -20833
.endif
tile3 0x00, 0x1c, 0x0002, 0x0000, 0x0100, 0x0200, 0x0777, /*1*/ 917, -467, -21483, /*2*/ 917, -467, -21533, /*3*/ 917, -417, -21533
tile3 0x00, 0x1b, 0x0002, 0x0001, 0x0200, 0x0000, 0x0555, /*1*/ 917, -417, -20833, /*2*/ 917, -467, -20833, /*3*/ 917, -467, -20883
tile4 0x00, 0x1c, 0x0002, 0x0001, 0x0101, 0x0200, 0x0888, /*1*/ 908, -408, -21517, /*2*/ 917, -417, -21533, /*3*/ 917, -200, -21533, /*4*/ 908, -208, -21517
@@ -9383,7 +9390,15 @@ room9a:
tile3 0x00, 0x1c, 0x0002, 0x0000, 0x0100, 0x0200, 0x0777, /*1*/ -1125, -467, -21483, /*2*/ -1125, -467, -21533, /*3*/ -1125, -417, -21533
tile3 0x00, 0x1b, 0x0002, 0x0001, 0x0200, 0x0000, 0x0555, /*1*/ -1125, -417, -20833, /*2*/ -1125, -467, -20833, /*3*/ -1125, -467, -20883
tile3 0x20, 0x1b, 0x0002, 0x0000, 0x0200, 0x0200, 0x0222, /*1*/ -925, -533, -20891, /*2*/ -925, -533, -21350, /*3*/ -925, -467, -21417
tile4 0x00, 0x1b, 0x0002, 0x0000, 0x0100, 0x0103, 0x0555, /*1*/ -1125, -533, -20891, /*2*/ -1125, -467, -21417, /*3*/ -1125, -467, -20833, /*4*/ -1125, -533, -20767
.if VERSION >= VERSION_PAL_FINAL
# Fix wrong tile type in medlab at end of Rescue - tile should be wall
tile4 0x00, 0x1c, 0x0002, 0x0000, 0x0100, 0x0102, 0x0555, /*1*/ -1125, -533, -20891, /*2*/ -1125, -467, -21417, /*3*/ -1125, -467, -20833, /*4*/ -1125, -533, -20833
tile3 0x00, 0x1b, 0x0002, 0x0001, 0x0000, 0x0001, 0x0555, /*1*/ -1125, -467, -20833, /*2*/ -1125, -533, -20767, /*3*/ -1125, -533, -20833
.else
tile4 0x00, 0x1b, 0x0002, 0x0000, 0x0100, 0x0103, 0x0555, /*1*/ -1125, -533, -20891, /*2*/ -1125, -467, -21417, /*3*/ -1125, -467, -20833, /*4*/ -1125, -533, -20767
.endif
tile3 0x00, 0x1b, 0x0002, 0x0200, 0x0100, 0x0100, 0x0333, /*1*/ -1125, -533, -20767, /*2*/ -1125, -467, -20833, /*3*/ -1175, -467, -20833
tile3 0x00, 0x1b, 0x0002, 0x0000, 0x0002, 0x0002, 0x0333, /*1*/ -1125, -533, -20883, /*2*/ -1125, -533, -20767, /*3*/ -980, -533, -20764
tile3 0x00, 0x1b, 0x0002, 0x0100, 0x0000, 0x0002, 0x0333, /*1*/ -889, -533, -21308, /*2*/ -1125, -533, -21308, /*3*/ -925, -533, -20891
src/files/bgdata/bg_mp9_tiles.s
+65 -7
View File
@@ -1082,8 +1082,15 @@ room53:
tile4 0x00, 0x1b, 0x0002, 0x0000, 0x0201, 0x0000, 0x0665, /*1*/ -2148, -608, 3783, /*2*/ -834, -608, 3783, /*3*/ -834, -608, 3017, /*4*/ -2148, -608, 3017
room54:
tile4 0x00, 0x1b, 0x0007, 0x0102, 0x0003, 0x0102, 0x0885, /*1*/ -2588, -412, 3604, /*2*/ -2629, -350, 3738, /*3*/ -2373, -458, 3789, /*4*/ -2370, -458, 3652
tile4 0x00, 0x1b, 0x0007, 0x0102, 0x0302, 0x0001, 0x0764, /*1*/ -2370, -458, 3652, /*2*/ -2373, -458, 3789, /*3*/ -2148, -502, 3783, /*4*/ -2148, -502, 3646
.if VERSION >= VERSION_PAL_FINAL
# These are floor tiles on the path down to the big empty outside room
tile4 0x20, 0x1b, 0x0007, 0x0102, 0x0003, 0x0102, 0x0885, /*1*/ -2588, -412, 3604, /*2*/ -2629, -350, 3738, /*3*/ -2373, -458, 3789, /*4*/ -2370, -458, 3652
tile4 0x20, 0x1b, 0x0007, 0x0102, 0x0302, 0x0001, 0x0764, /*1*/ -2370, -458, 3652, /*2*/ -2373, -458, 3789, /*3*/ -2148, -502, 3783, /*4*/ -2148, -502, 3646
.else
tile4 0x00, 0x1b, 0x0007, 0x0102, 0x0003, 0x0102, 0x0885, /*1*/ -2588, -412, 3604, /*2*/ -2629, -350, 3738, /*3*/ -2373, -458, 3789, /*4*/ -2370, -458, 3652
tile4 0x00, 0x1b, 0x0007, 0x0102, 0x0302, 0x0001, 0x0764, /*1*/ -2370, -458, 3652, /*2*/ -2373, -458, 3789, /*3*/ -2148, -502, 3783, /*4*/ -2148, -502, 3646
.endif
tile4 0x00, 0x1c, 0x0000, 0x0200, 0x0100, 0x0203, 0x0885, /*1*/ -2373, -458, 3789, /*2*/ -2629, -350, 3738, /*3*/ -2634, -240, 3752, /*4*/ -2373, -351, 3805
tile4 0x00, 0x1c, 0x0000, 0x0100, 0x0000, 0x0202, 0x0764, /*1*/ -2148, -502, 3783, /*2*/ -2373, -458, 3789, /*3*/ -2373, -351, 3805, /*4*/ -2148, -395, 3783
tile4 0x00, 0x1c, 0x0000, 0x0100, 0x0200, 0x0200, 0x0a96, /*1*/ -2373, -351, 3805, /*2*/ -2634, -240, 3752, /*3*/ -2629, -4, 3738, /*4*/ -2373, -113, 3789
@@ -1093,28 +1100,66 @@ room54:
tile4 0x00, 0x1c, 0x0000, 0x0001, 0x0101, 0x0303, 0x0776, /*1*/ -2370, -351, 3652, /*2*/ -2148, -395, 3646, /*3*/ -2148, -288, 3646, /*4*/ -2278, 415, 3681
tile4 0x00, 0x1c, 0x0000, 0x0301, 0x0002, 0x0202, 0x0553, /*1*/ -2588, -305, 3604, /*2*/ -2370, -351, 3652, /*3*/ -2278, 415, 3681, /*4*/ -2596, 308, 3630
.if VERSION >= VERSION_PAL_FINAL
tile4 0x00, 0x1c, 0x0000, 0x0203, 0x0100, 0x0103, 0x0885, /*1*/ -2373, -458, 3789, /*2*/ -2629, -350, 3738, /*3*/ -2634, -640, 3752, /*4*/ -2373, -751, 3805
tile4 0x00, 0x1c, 0x0000, 0x0103, 0x0000, 0x0102, 0x0764, /*1*/ -2148, -502, 3783, /*2*/ -2373, -458, 3789, /*3*/ -2373, -751, 3805, /*4*/ -2148, -795, 3783
tile4 0x00, 0x1c, 0x0000, 0x0002, 0x0001, 0x0001, 0x0553, /*1*/ -2588, -412, 3604, /*2*/ -2370, -458, 3652, /*3*/ -2370, -751, 3652, /*4*/ -2588, -705, 3604
tile4 0x00, 0x1c, 0x0000, 0x0002, 0x0101, 0x0000, 0x0764, /*1*/ -2370, -458, 3652, /*2*/ -2148, -502, 3646, /*3*/ -2148, -795, 3646, /*4*/ -2370, -751, 3652
.endif
room55:
tile4 0x00, 0x1b, 0x0007, 0x0103, 0x0003, 0x0102, 0x0875, /*1*/ -2697, -286, 3430, /*2*/ -2830, -181, 3502, /*3*/ -2629, -350, 3738, /*4*/ -2588, -412, 3604
.if VERSION >= VERSION_PAL_FINAL
tile4 0x20, 0x1b, 0x0007, 0x0103, 0x0003, 0x0102, 0x0875, /*1*/ -2697, -286, 3430, /*2*/ -2830, -181, 3502, /*3*/ -2629, -350, 3738, /*4*/ -2588, -412, 3604
.else
tile4 0x00, 0x1b, 0x0007, 0x0103, 0x0003, 0x0102, 0x0875, /*1*/ -2697, -286, 3430, /*2*/ -2830, -181, 3502, /*3*/ -2629, -350, 3738, /*4*/ -2588, -412, 3604
.endif
tile4 0x00, 0x1c, 0x0000, 0x0200, 0x0100, 0x0203, 0x0998, /*1*/ -2629, -350, 3738, /*2*/ -2830, -181, 3502, /*3*/ -2848, -60, 3512, /*4*/ -2634, -240, 3752
tile4 0x00, 0x1c, 0x0000, 0x0100, 0x0203, 0x0200, 0x0cc9, /*1*/ -2634, -240, 3752, /*2*/ -2848, -60, 3512, /*3*/ -2830, 303, 3502, /*4*/ -2629, -4, 3738
tile4 0x00, 0x1c, 0x0000, 0x0001, 0x0001, 0x0301, 0x0221, /*1*/ -2697, -286, 3430, /*2*/ -2588, -412, 3604, /*3*/ -2588, -305, 3604, /*4*/ -2697, -179, 3430
tile4 0x00, 0x1c, 0x0000, 0x0001, 0x0001, 0x0302, 0x0553, /*1*/ -2697, -179, 3430, /*2*/ -2588, -305, 3604, /*3*/ -2596, 308, 3630, /*4*/ -2697, 374, 3430
.if VERSION >= VERSION_PAL_FINAL
tile4 0x00, 0x1c, 0x0000, 0x0002, 0x0001, 0x0001, 0x0221, /*1*/ -2697, -286, 3430, /*2*/ -2588, -412, 3604, /*3*/ -2588, -705, 3604, /*4*/ -2697, -579, 3430
tile4 0x00, 0x1c, 0x0000, 0x0203, 0x0100, 0x0103, 0x0998, /*1*/ -2629, -350, 3738, /*2*/ -2830, -181, 3502, /*3*/ -2848, -460, 3512, /*4*/ -2634, -640, 3752
.endif
room56:
tile4 0x00, 0x1b, 0x0007, 0x0103, 0x0000, 0x0102, 0x0875, /*1*/ -2693, -188, 3225, /*2*/ -2845, -81, 3229, /*3*/ -2830, -181, 3502, /*4*/ -2697, -286, 3430
.if VERSION >= VERSION_PAL_FINAL
tile4 0x20, 0x1b, 0x0007, 0x0103, 0x0000, 0x0102, 0x0875, /*1*/ -2693, -188, 3225, /*2*/ -2845, -81, 3229, /*3*/ -2830, -181, 3502, /*4*/ -2697, -286, 3430
.else
tile4 0x00, 0x1b, 0x0007, 0x0103, 0x0000, 0x0102, 0x0875, /*1*/ -2693, -188, 3225, /*2*/ -2845, -81, 3229, /*3*/ -2830, -181, 3502, /*4*/ -2697, -286, 3430
.endif
tile4 0x00, 0x1c, 0x0000, 0x0300, 0x0100, 0x0203, 0x0998, /*1*/ -2830, -181, 3502, /*2*/ -2845, -81, 3229, /*3*/ -2845, 26, 3229, /*4*/ -2848, -60, 3512
tile4 0x00, 0x1c, 0x0000, 0x0000, 0x0103, 0x0200, 0x0cc9, /*1*/ -2848, -60, 3512, /*2*/ -2845, 26, 3229, /*3*/ -2845, 483, 3229, /*4*/ -2830, 303, 3502
tile4 0x00, 0x1c, 0x0000, 0x0101, 0x0000, 0x0301, 0x0221, /*1*/ -2693, -188, 3225, /*2*/ -2697, -286, 3430, /*3*/ -2697, -179, 3430, /*4*/ -2693, -81, 3225
tile4 0x00, 0x1c, 0x0000, 0x0101, 0x0000, 0x0301, 0x0763, /*1*/ -2693, -81, 3225, /*2*/ -2697, -179, 3430, /*3*/ -2697, 374, 3430, /*4*/ -2693, 428, 3225
.if VERSION >= VERSION_PAL_FINAL
tile4 0x00, 0x1c, 0x0000, 0x0303, 0x0100, 0x0103, 0x0998, /*1*/ -2830, -181, 3502, /*2*/ -2845, -81, 3229, /*3*/ -2845, -374, 3229, /*4*/ -2848, -460, 3512
tile4 0x00, 0x1c, 0x0000, 0x0102, 0x0000, 0x0001, 0x0221, /*1*/ -2693, -188, 3225, /*2*/ -2697, -286, 3430, /*3*/ -2697, -579, 3430, /*4*/ -2693, -481, 3225
.endif
room57:
.if VERSION >= VERSION_PAL_FINAL
tile3 0x00, 0x1c, 0x0000, 0x0001, 0x0101, 0x0200, 0x0db7, /*1*/ -2845, 483, 3229, /*2*/ -2432, 270, 2750, /*3*/ -2432, 628, 2750
tile3 0x00, 0x1c, 0x0000, 0x0001, 0x0202, 0x0000, 0x0ba7, /*1*/ -2845, 483, 3229, /*2*/ -2845, 26, 3229, /*3*/ -2432, 270, 2750
.endif
tile3 0x00, 0x1c, 0x0000, 0x0101, 0x0000, 0x0201, 0x0ba6, /*1*/ -1773, 573, 2563, /*2*/ -2278, 270, 2986, /*3*/ -2278, 628, 2986
tile4 0x00, 0x1b, 0x0007, 0x0000, 0x0302, 0x0001, 0x0cb7, /*1*/ -2432, 308, 2750, /*2*/ -2432, 308, 3094, /*3*/ -2278, 308, 2986, /*4*/ -2278, 308, 2643
tile3 0x00, 0x1b, 0x0007, 0x0202, 0x0000, 0x0002, 0x0a96, /*1*/ -1773, 116, 2563, /*2*/ -1969, 44, 2606, /*3*/ -2046, 28, 2757
tile3 0x00, 0x1b, 0x0007, 0x0201, 0x0100, 0x0002, 0x0774, /*1*/ -1773, 116, 2563, /*2*/ -1917, 43, 2530, /*3*/ -1969, 44, 2606
tile3 0x00, 0x1b, 0x0007, 0x0202, 0x0000, 0x0002, 0x0774, /*1*/ -2046, 28, 2757, /*2*/ -2326, -10, 2836, /*3*/ -2577, -79, 3045
tile3 0x00, 0x1b, 0x0007, 0x0202, 0x0100, 0x0002, 0x0a96, /*1*/ -2046, 28, 2757, /*2*/ -2116, 28, 2638, /*3*/ -2326, -10, 2836
tile4 0x00, 0x1b, 0x0007, 0x0203, 0x0100, 0x0102, 0x0764, /*1*/ -2577, -79, 3045, /*2*/ -2651, 3, 2928, /*3*/ -2845, -81, 3229, /*4*/ -2693, -188, 3225
.if VERSION >= VERSION_PAL_FINAL
tile4 0x20, 0x1b, 0x0007, 0x0203, 0x0100, 0x0102, 0x0764, /*1*/ -2577, -79, 3045, /*2*/ -2651, 3, 2928, /*3*/ -2845, -81, 3229, /*4*/ -2693, -188, 3225
.else
tile4 0x00, 0x1b, 0x0007, 0x0203, 0x0100, 0x0102, 0x0764, /*1*/ -2577, -79, 3045, /*2*/ -2651, 3, 2928, /*3*/ -2845, -81, 3229, /*4*/ -2693, -188, 3225
.endif
tile3 0x00, 0x1b, 0x0007, 0x0102, 0x0000, 0x0001, 0x0a96, /*1*/ -2116, 28, 2638, /*2*/ -2651, 3, 2928, /*3*/ -2326, -10, 2836
tile3 0x00, 0x1b, 0x0007, 0x0102, 0x0000, 0x0102, 0x0774, /*1*/ -2326, -10, 2836, /*2*/ -2651, 3, 2928, /*3*/ -2577, -79, 3045
tile3 0x00, 0x1b, 0x0007, 0x0101, 0x0000, 0x0002, 0x0a96, /*1*/ -1969, 44, 2606, /*2*/ -2116, 28, 2638, /*3*/ -2046, 28, 2757
@@ -1126,7 +1171,11 @@ room57:
tile3 0x00, 0x1c, 0x0000, 0x0200, 0x0101, 0x0102, 0x0885, /*1*/ -2127, 134, 2619, /*2*/ -1917, 628, 2530, /*3*/ -2278, 270, 2643
tile3 0x00, 0x1c, 0x0000, 0x0200, 0x0000, 0x0102, 0x0443, /*1*/ -2127, 134, 2619, /*2*/ -2278, 270, 2643, /*3*/ -2432, 270, 2750
tile3 0x00, 0x1c, 0x0000, 0x0000, 0x0101, 0x0200, 0x0443, /*1*/ -2651, 110, 2928, /*2*/ -2127, 134, 2619, /*3*/ -2432, 270, 2750
tile3 0x00, 0x1c, 0x0000, 0x0000, 0x0101, 0x0200, 0x0ba7, /*1*/ -2845, 26, 3229, /*2*/ -2432, 270, 2750, /*3*/ -2845, 483, 3229
.if VERSION < VERSION_PAL_FINAL
tile3 0x00, 0x1c, 0x0000, 0x0000, 0x0101, 0x0200, 0x0ba7, /*1*/ -2845, 26, 3229, /*2*/ -2432, 270, 2750, /*3*/ -2845, 483, 3229
.endif
tile4 0x00, 0x1c, 0x0000, 0x0001, 0x0200, 0x0000, 0x0553, /*1*/ -2278, 308, 2986, /*2*/ -2278, 270, 2986, /*3*/ -2278, 270, 2643, /*4*/ -2278, 308, 2643
tile4 0x00, 0x1c, 0x0000, 0x0001, 0x0000, 0x0002, 0x0553, /*1*/ -2432, 308, 2750, /*2*/ -2432, 270, 2750, /*3*/ -2432, 270, 3094, /*4*/ -2432, 308, 3094
tile4 0x00, 0x1c, 0x0000, 0x0101, 0x0003, 0x0301, 0x0897, /*1*/ -1773, 116, 2563, /*2*/ -2046, 28, 2757, /*3*/ -2046, 135, 2757, /*4*/ -1764, 228, 2565
@@ -1140,9 +1189,18 @@ room57:
tile3 0x00, 0x1c, 0x0000, 0x0101, 0x0200, 0x0201, 0x0ab8, /*1*/ -1764, 228, 2565, /*2*/ -2046, 135, 2757, /*3*/ -1773, 573, 2563
tile4 0x00, 0x1c, 0x0000, 0x0200, 0x0000, 0x0002, 0x0221, /*1*/ -2278, 270, 2643, /*2*/ -2278, 270, 2986, /*3*/ -2432, 270, 3094, /*4*/ -2432, 270, 2750
tile3 0x00, 0x1c, 0x0000, 0x0001, 0x0202, 0x0000, 0x0b95, /*1*/ -2278, 628, 2643, /*2*/ -2278, 270, 2643, /*3*/ -1917, 628, 2530
tile3 0x00, 0x1c, 0x0000, 0x0001, 0x0101, 0x0200, 0x0db7, /*1*/ -2845, 483, 3229, /*2*/ -2432, 270, 2750, /*3*/ -2432, 628, 2750
.if VERSION < VERSION_PAL_FINAL
tile3 0x00, 0x1c, 0x0000, 0x0001, 0x0101, 0x0200, 0x0db7, /*1*/ -2845, 483, 3229, /*2*/ -2432, 270, 2750, /*3*/ -2432, 628, 2750
.endif
tile3 0x00, 0x1c, 0x0000, 0x0100, 0x0000, 0x0201, 0x0b95, /*1*/ -2432, 270, 3094, /*2*/ -2693, 428, 3225, /*3*/ -2432, 651, 3094
.if VERSION >= VERSION_PAL_FINAL
tile3 0x00, 0x1c, 0x0000, 0x0001, 0x0202, 0x0000, 0x0ba7, /*1*/ -2845, 126, 3229, /*2*/ -2845, -231, 3229, /*3*/ -2432, -87, 2750
tile3 0x00, 0x1c, 0x0000, 0x0001, 0x0101, 0x0200, 0x0db7, /*1*/ -2845, 126, 3229, /*2*/ -2432, -87, 2750, /*3*/ -2432, 270, 2750
.endif
room58:
tile3 0x00, 0x1b, 0x0007, 0x0101, 0x0000, 0x0002, 0x0664, /*1*/ -1706, 161, 2361, /*2*/ -1917, 43, 2530, /*3*/ -1773, 116, 2563
tile3 0x00, 0x1b, 0x0007, 0x0202, 0x0100, 0x0102, 0x0443, /*1*/ -1706, 161, 2361, /*2*/ -1850, 162, 2328, /*3*/ -1917, 43, 2530