From 533696bb58e68195d3229b609d976ebad8e20bbd Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 14 Aug 2016 00:55:34 +0200 Subject: [PATCH] Integrate data at 0x00981F4C, 0x00981F4E --- src/peep/peep.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/src/peep/peep.c b/src/peep/peep.c index 15f4a69c07..86064c1e6b 100644 --- a/src/peep/peep.c +++ b/src/peep/peep.c @@ -5969,6 +5969,42 @@ static void peep_update_patrolling(rct_peep* peep){ peep_update_patrolling_find_watering(peep); } +/** rct2: 0x00981F4C, 0x00981F4E */ +static const rct_xy16 _981F4C[] = { + { 7, 5 }, + { 5, 25 }, + { 25, 5 }, + { 5, 7 }, + { 7, 9 }, + { 9, 25 }, + { 25, 9 }, + { 9, 7 }, + { 7, 23 }, + { 23, 25 }, + { 25, 23 }, + { 23, 7 }, + { 7, 27 }, + { 27, 25 }, + { 25, 27 }, + { 27, 7 }, + { 7, 0 }, + { 0, 25 }, + { 25, 0 }, + { 0, 7 }, + { 7, 0 }, + { 0, 25 }, + { 25, 0 }, + { 0, 7 }, + { 7, 0 }, + { 0, 25 }, + { 25, 0 }, + { 0, 7 }, + { 7, 0 }, + { 0, 25 }, + { 25, 0 }, + { 0, 7 }, +}; + /** * * rct2: 0x0069030A @@ -6179,8 +6215,8 @@ static void peep_update_walking(rct_peep* peep){ peep->sub_state = 0; int ebx = peep->var_37 & 0x1F; - int x = (peep->x & 0xFFE0) + RCT2_ADDRESS(0x981F4C, uint16)[ebx * 2]; - int y = (peep->y & 0xFFE0) + RCT2_ADDRESS(0x981F4E, uint16)[ebx * 2]; + int x = (peep->x & 0xFFE0) + _981F4C[ebx].x; + int y = (peep->y & 0xFFE0) + _981F4C[ebx].y; peep->destination_x = x; peep->destination_y = y;