Improve test output

This commit is contained in:
Marijn van der Werf 2016-09-16 15:47:04 +02:00
parent c526d0da3f
commit 9ca2f89831
2 changed files with 11 additions and 6 deletions

View File

@ -249,6 +249,7 @@ bool metal_b_supports_paint_setup(int supportType, uint8 segment, int special, i
enum { enum {
SPRITEGROUP_NONE, SPRITEGROUP_NONE,
SPRITEGROUP_FENCE_METAL_A, // 14568
SPRITEGROUP_FENCE_METAL_B, // 14990 SPRITEGROUP_FENCE_METAL_B, // 14990
SPRITEGROUP_FLOOR_CORK, // 22134 SPRITEGROUP_FLOOR_CORK, // 22134
SPRITEGROUP_FENCE_ROPE, // 22138 SPRITEGROUP_FENCE_ROPE, // 22138
@ -256,6 +257,10 @@ enum {
}; };
static int getSpriteGroup(uint16 spriteIndex) { static int getSpriteGroup(uint16 spriteIndex) {
if (spriteIndex >= 14568 && spriteIndex <= 14571) {
return SPRITEGROUP_FENCE_METAL_A;
}
if (spriteIndex >= 14990 && spriteIndex <= 14993) { if (spriteIndex >= 14990 && spriteIndex <= 14993) {
return SPRITEGROUP_FENCE_METAL_B; return SPRITEGROUP_FENCE_METAL_B;
} }

View File

@ -587,17 +587,17 @@ namespace Intercept2
} }
} }
if (!tunnelCallsLineUp(newTileTunnelCalls)) {
printf("Decompiled tunnel calls don\'t line up. [trackSequence:%d].\n", trackSequence);
printTunnelCalls(newTileTunnelCalls);
return false;
}
if (!tunnelCallsLineUp(tileTunnelCalls)) { if (!tunnelCallsLineUp(tileTunnelCalls)) {
printf("Original tunnel calls don\'t line up. Skipping tunnel validation [trackSequence:%d].\n", printf("Original tunnel calls don\'t line up. Skipping tunnel validation [trackSequence:%d].\n",
trackSequence); trackSequence);
printTunnelCalls(tileTunnelCalls); printTunnelCalls(tileTunnelCalls);
if (!tunnelCallsLineUp(newTileTunnelCalls)) {
printf("Decompiled tunnel calls don\'t line up. [trackSequence:%d].\n", trackSequence);
printTunnelCalls(newTileTunnelCalls);
return false;
}
continue; continue;
} }