From 3ff3db13f4a2de49f3abc5b4d47c7ea415fcc9b1 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 14 Aug 2016 21:38:30 +0200 Subject: [PATCH] Integrate data at 0x0097AF32 --- src/paint/supports.c | 45 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/src/paint/supports.c b/src/paint/supports.c index d5c6f7e85e..79ab7c7aae 100644 --- a/src/paint/supports.c +++ b/src/paint/supports.c @@ -32,6 +32,49 @@ const rct_xy8 loc_97AF20[] = { {16, 28} }; +/** rct2: 0x0097AF32 */ +static const uint8 _97AF32[] = { + 5, 2, 5, 2, 5, 2, 5, 2, + 7, 1, 7, 1, 7, 1, 7, 1, + 6, 3, 6, 3, 6, 3, 6, 3, + 8, 0, 8, 0, 8, 0, 8, 0, + 5, 3, 6, 0, 8, 1, 7, 2, + 1, 2, 1, 2, 1, 2, 1, 2, + 0, 3, 0, 3, 0, 3, 0, 3, + 3, 1, 3, 1, 3, 1, 3, 1, + 2, 0, 2, 0, 2, 0, 2, 0, + + 6, 1, 6, 1, 6, 1, 6, 1, + 5, 0, 5, 0, 5, 0, 5, 0, + 8, 2, 8, 2, 8, 2, 8, 2, + 7, 3, 7, 3, 7, 3, 7, 3, + 6, 0, 8, 1, 7, 2, 5, 3, + 0, 0, 0, 0, 0, 0, 0, 0, + 2, 1, 2, 1, 2, 1, 2, 1, + 1, 3, 1, 3, 1, 3, 1, 3, + 3, 2, 3, 2, 3, 2, 3, 2, + + 1, 6, 1, 6, 1, 6, 1, 6, + 3, 5, 3, 5, 3, 5, 3, 5, + 0, 7, 0, 7, 0, 7, 0, 7, + 2, 4, 2, 4, 2, 4, 2, 4, + 8, 1, 7, 2, 5, 3, 6, 0, + 4, 1, 4, 1, 4, 1, 4, 1, + 4, 2, 4, 2, 4, 2, 4, 2, + 4, 0, 4, 0, 4, 0, 4, 0, + 4, 3, 4, 3, 4, 3, 4, 3, + + 2, 5, 2, 5, 2, 5, 2, 5, + 0, 4, 0, 4, 0, 4, 0, 4, + 3, 6, 3, 6, 3, 6, 3, 6, + 1, 7, 1, 7, 1, 7, 1, 7, + 7, 2, 5, 3, 6, 0, 8, 1, + 8, 5, 8, 5, 8, 5, 8, 5, + 7, 6, 7, 6, 7, 6, 7, 6, + 6, 4, 6, 4, 6, 4, 6, 4, + 5, 7, 5, 7, 5, 7, 5, 7, +}; + /** rct2: 0x0097B052, 0x0097B053 */ const rct_xy16 loc_97B052[] = { {-15, -1}, @@ -459,7 +502,7 @@ bool metal_a_supports_paint_setup(int supportType, int segment, int special, int if (height < 0) return false; - uint8* esi = &(RCT2_ADDRESS(0x0097AF32, uint8)[rotation * 2]); + uint8* esi = &_97AF32[rotation * 2]; uint8 newSegment = esi[segment * 8]; if (height <= gSupportSegments[newSegment].height) {