From 5036fa1914c18d5f4ae28599b2fdaadaa166bb05 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 26 Nov 2019 21:37:50 +1000 Subject: [PATCH] Discover PATHTYPE constants --- src/files/setup/setupame.c | 72 +++++++++++++++++------------------ src/files/setup/setupark.c | 6 +-- src/files/setup/setupazt.c | 26 ++++++------- src/files/setup/setupcave.c | 32 ++++++++-------- src/files/setup/setupdam.c | 10 ++--- src/files/setup/setupdepo.c | 8 ++-- src/files/setup/setupdish.c | 2 +- src/files/setup/setupear.c | 28 +++++++------- src/files/setup/setupeld.c | 4 +- src/files/setup/setupimp.c | 2 +- src/files/setup/setuplee.c | 12 +++--- src/files/setup/setuplip.c | 30 +++++++-------- src/files/setup/setuplue.c | 66 ++++++++++++++++---------------- src/files/setup/setupoat.c | 12 +++--- src/files/setup/setuppam.c | 18 ++++----- src/files/setup/setuppete.c | 28 +++++++------- src/files/setup/setuprit.c | 6 +-- src/files/setup/setupsev.c | 30 +++++++-------- src/files/setup/setupwax.c | 76 ++++++++++++++++++------------------- src/include/constants.h | 4 ++ 20 files changed, 238 insertions(+), 234 deletions(-) diff --git a/src/files/setup/setupame.c b/src/files/setup/setupame.c index 61fd45086..79bc672f8 100644 --- a/src/files/setup/setupame.c +++ b/src/files/setup/setupame.c @@ -4057,42 +4057,42 @@ struct ailist ailists[] = { }; struct aipaths paths[] = { - { path00, 0, 0 }, - { path01, 1, 2 }, - { path02, 2, 2 }, - { path03, 3, 2 }, - { path04, 4, 2 }, - { path05, 5, 2 }, - { path06, 6, 2 }, - { path07, 7, 2 }, - { path08, 8, 2 }, - { path09, 9, 2 }, - { path10, 10, 2 }, - { path11, 11, 2 }, - { path12, 12, 2 }, - { path13, 13, 2 }, - { path14, 14, 2 }, - { path15, 15, 2 }, - { path16, 16, 2 }, - { path17, 17, 2 }, - { path18, 18, 2 }, - { path19, 19, 2 }, - { path20, 20, 2 }, - { path21, 21, 2 }, - { path22, 22, 2 }, - { path23, 23, 2 }, - { path24, 24, 2 }, - { path25, 25, 2 }, - { path26, 26, 1 }, - { path27, 27, 0 }, - { path28, 28, 0 }, - { path29, 29, 0 }, - { path30, 30, 1 }, - { path31, 31, 0 }, - { path32, 32, 0 }, - { path33, 33, 0 }, - { path34, 34, 1 }, - { path35, 35, 0 }, + { path00, 0, PATHTYPE_BACKANDFORTH }, + { path01, 1, PATHTYPE_FLYING }, + { path02, 2, PATHTYPE_FLYING }, + { path03, 3, PATHTYPE_FLYING }, + { path04, 4, PATHTYPE_FLYING }, + { path05, 5, PATHTYPE_FLYING }, + { path06, 6, PATHTYPE_FLYING }, + { path07, 7, PATHTYPE_FLYING }, + { path08, 8, PATHTYPE_FLYING }, + { path09, 9, PATHTYPE_FLYING }, + { path10, 10, PATHTYPE_FLYING }, + { path11, 11, PATHTYPE_FLYING }, + { path12, 12, PATHTYPE_FLYING }, + { path13, 13, PATHTYPE_FLYING }, + { path14, 14, PATHTYPE_FLYING }, + { path15, 15, PATHTYPE_FLYING }, + { path16, 16, PATHTYPE_FLYING }, + { path17, 17, PATHTYPE_FLYING }, + { path18, 18, PATHTYPE_FLYING }, + { path19, 19, PATHTYPE_FLYING }, + { path20, 20, PATHTYPE_FLYING }, + { path21, 21, PATHTYPE_FLYING }, + { path22, 22, PATHTYPE_FLYING }, + { path23, 23, PATHTYPE_FLYING }, + { path24, 24, PATHTYPE_FLYING }, + { path25, 25, PATHTYPE_FLYING }, + { path26, 26, PATHTYPE_CIRCULAR }, + { path27, 27, PATHTYPE_BACKANDFORTH }, + { path28, 28, PATHTYPE_BACKANDFORTH }, + { path29, 29, PATHTYPE_BACKANDFORTH }, + { path30, 30, PATHTYPE_CIRCULAR }, + { path31, 31, PATHTYPE_BACKANDFORTH }, + { path32, 32, PATHTYPE_BACKANDFORTH }, + { path33, 33, PATHTYPE_BACKANDFORTH }, + { path34, 34, PATHTYPE_CIRCULAR }, + { path35, 35, PATHTYPE_BACKANDFORTH }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setupark.c b/src/files/setup/setupark.c index 5a3893f84..c8754f816 100644 --- a/src/files/setup/setupark.c +++ b/src/files/setup/setupark.c @@ -506,9 +506,9 @@ s32 path02[] = { }; struct aipaths paths[] = { - { path00, 0, 0 }, - { path01, 1, 0 }, - { path02, 2, 0 }, + { path00, 0, PATHTYPE_BACKANDFORTH }, + { path01, 1, PATHTYPE_BACKANDFORTH }, + { path02, 2, PATHTYPE_BACKANDFORTH }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setupazt.c b/src/files/setup/setupazt.c index 08e4c5b43..e32a79c37 100644 --- a/src/files/setup/setupazt.c +++ b/src/files/setup/setupazt.c @@ -362,19 +362,19 @@ s32 path12[] = { }; struct aipaths paths[] = { - { path00, 0, 0 }, - { path01, 1, 0 }, - { path02, 2, 0 }, - { path03, 3, 0 }, - { path04, 4, 0 }, - { path05, 5, 0 }, - { path06, 6, 0 }, - { path07, 7, 0 }, - { path08, 8, 0 }, - { path09, 9, 0 }, - { path10, 10, 0 }, - { path11, 11, 0 }, - { path12, 12, 0 }, + { path00, 0, PATHTYPE_BACKANDFORTH }, + { path01, 1, PATHTYPE_BACKANDFORTH }, + { path02, 2, PATHTYPE_BACKANDFORTH }, + { path03, 3, PATHTYPE_BACKANDFORTH }, + { path04, 4, PATHTYPE_BACKANDFORTH }, + { path05, 5, PATHTYPE_BACKANDFORTH }, + { path06, 6, PATHTYPE_BACKANDFORTH }, + { path07, 7, PATHTYPE_BACKANDFORTH }, + { path08, 8, PATHTYPE_BACKANDFORTH }, + { path09, 9, PATHTYPE_BACKANDFORTH }, + { path10, 10, PATHTYPE_BACKANDFORTH }, + { path11, 11, PATHTYPE_BACKANDFORTH }, + { path12, 12, PATHTYPE_BACKANDFORTH }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setupcave.c b/src/files/setup/setupcave.c index 015ec8858..886b0003c 100644 --- a/src/files/setup/setupcave.c +++ b/src/files/setup/setupcave.c @@ -705,22 +705,22 @@ s32 unregistered_path1[] = { }; struct aipaths paths[] = { - { path06, 6, 0 }, - { path07, 7, 0 }, - { path08, 8, 0 }, - { path09, 9, 0 }, - { path10, 10, 0 }, - { path11, 11, 0 }, - { path12, 12, 0 }, - { path13, 13, 0 }, - { path14, 14, 0 }, - { path15, 15, 0 }, - { path00, 0, 0 }, - { path01, 1, 0 }, - { path02, 2, 0 }, - { path03, 3, 0 }, - { path04, 4, 0 }, - { path05, 5, 0 }, + { path06, 6, PATHTYPE_BACKANDFORTH }, + { path07, 7, PATHTYPE_BACKANDFORTH }, + { path08, 8, PATHTYPE_BACKANDFORTH }, + { path09, 9, PATHTYPE_BACKANDFORTH }, + { path10, 10, PATHTYPE_BACKANDFORTH }, + { path11, 11, PATHTYPE_BACKANDFORTH }, + { path12, 12, PATHTYPE_BACKANDFORTH }, + { path13, 13, PATHTYPE_BACKANDFORTH }, + { path14, 14, PATHTYPE_BACKANDFORTH }, + { path15, 15, PATHTYPE_BACKANDFORTH }, + { path00, 0, PATHTYPE_BACKANDFORTH }, + { path01, 1, PATHTYPE_BACKANDFORTH }, + { path02, 2, PATHTYPE_BACKANDFORTH }, + { path03, 3, PATHTYPE_BACKANDFORTH }, + { path04, 4, PATHTYPE_BACKANDFORTH }, + { path05, 5, PATHTYPE_BACKANDFORTH }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setupdam.c b/src/files/setup/setupdam.c index 4e7fba003..5d5262a5a 100644 --- a/src/files/setup/setupdam.c +++ b/src/files/setup/setupdam.c @@ -631,11 +631,11 @@ s32 path04[] = { }; struct aipaths paths[] = { - { path00, 0, 1 }, - { path01, 1, 0 }, - { path02, 2, 1 }, - { path03, 3, 1 }, - { path04, 4, 1 }, + { path00, 0, PATHTYPE_CIRCULAR }, + { path01, 1, PATHTYPE_BACKANDFORTH }, + { path02, 2, PATHTYPE_CIRCULAR }, + { path03, 3, PATHTYPE_CIRCULAR }, + { path04, 4, PATHTYPE_CIRCULAR }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setupdepo.c b/src/files/setup/setupdepo.c index ddf75c902..ed1e27de0 100644 --- a/src/files/setup/setupdepo.c +++ b/src/files/setup/setupdepo.c @@ -3161,10 +3161,10 @@ struct ailist ailists[] = { }; struct aipaths paths[] = { - { path00, 0, 1 }, - { path01, 1, 1 }, - { path02, 2, 1 }, - { path03, 3, 1 }, + { path00, 0, PATHTYPE_CIRCULAR }, + { path01, 1, PATHTYPE_CIRCULAR }, + { path02, 2, PATHTYPE_CIRCULAR }, + { path03, 3, PATHTYPE_CIRCULAR }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setupdish.c b/src/files/setup/setupdish.c index 3459e91bc..9fa01a837 100644 --- a/src/files/setup/setupdish.c +++ b/src/files/setup/setupdish.c @@ -6123,7 +6123,7 @@ struct ailist ailists[] = { }; struct aipaths paths[] = { - { path00, 0, 1 }, + { path00, 0, PATHTYPE_CIRCULAR }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setupear.c b/src/files/setup/setupear.c index 83ba98233..36fd1de1e 100644 --- a/src/files/setup/setupear.c +++ b/src/files/setup/setupear.c @@ -3381,20 +3381,20 @@ struct ailist ailists[] = { }; struct aipaths paths[] = { - { path00, 0, 0 }, - { path01, 1, 0 }, - { path02, 2, 0 }, - { path03, 3, 0 }, - { path04, 4, 0 }, - { path05, 5, 0 }, - { path06, 6, 0 }, - { path07, 7, 0 }, - { path08, 8, 0 }, - { path09, 9, 0 }, - { path10, 10, 1 }, - { path11, 11, 0 }, - { path12, 12, 0 }, - { path13, 13, 0 }, + { path00, 0, PATHTYPE_BACKANDFORTH }, + { path01, 1, PATHTYPE_BACKANDFORTH }, + { path02, 2, PATHTYPE_BACKANDFORTH }, + { path03, 3, PATHTYPE_BACKANDFORTH }, + { path04, 4, PATHTYPE_BACKANDFORTH }, + { path05, 5, PATHTYPE_BACKANDFORTH }, + { path06, 6, PATHTYPE_BACKANDFORTH }, + { path07, 7, PATHTYPE_BACKANDFORTH }, + { path08, 8, PATHTYPE_BACKANDFORTH }, + { path09, 9, PATHTYPE_BACKANDFORTH }, + { path10, 10, PATHTYPE_CIRCULAR }, + { path11, 11, PATHTYPE_BACKANDFORTH }, + { path12, 12, PATHTYPE_BACKANDFORTH }, + { path13, 13, PATHTYPE_BACKANDFORTH }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setupeld.c b/src/files/setup/setupeld.c index 4a0e24adb..ada57f17c 100644 --- a/src/files/setup/setupeld.c +++ b/src/files/setup/setupeld.c @@ -3275,8 +3275,8 @@ struct ailist ailists[] = { }; struct aipaths paths[] = { - { path00, 0, 0 }, - { path01, 1, 0 }, + { path00, 0, PATHTYPE_BACKANDFORTH }, + { path01, 1, PATHTYPE_BACKANDFORTH }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setupimp.c b/src/files/setup/setupimp.c index 71a970ad4..ec648dd2f 100644 --- a/src/files/setup/setupimp.c +++ b/src/files/setup/setupimp.c @@ -4098,7 +4098,7 @@ struct ailist ailists[] = { }; struct aipaths paths[] = { - { path00, 0, 2 }, + { path00, 0, PATHTYPE_FLYING }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setuplee.c b/src/files/setup/setuplee.c index ca0278886..5a1378f62 100644 --- a/src/files/setup/setuplee.c +++ b/src/files/setup/setuplee.c @@ -3866,12 +3866,12 @@ struct ailist ailists[] = { }; struct aipaths paths[] = { - { path00, 0, 0 }, - { path01, 1, 0 }, - { path02, 2, 0 }, - { path03, 3, 0 }, - { path04, 4, 0 }, - { path05, 5, 0 }, + { path00, 0, PATHTYPE_BACKANDFORTH }, + { path01, 1, PATHTYPE_BACKANDFORTH }, + { path02, 2, PATHTYPE_BACKANDFORTH }, + { path03, 3, PATHTYPE_BACKANDFORTH }, + { path04, 4, PATHTYPE_BACKANDFORTH }, + { path05, 5, PATHTYPE_BACKANDFORTH }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setuplip.c b/src/files/setup/setuplip.c index 656aefef0..628e9a314 100644 --- a/src/files/setup/setuplip.c +++ b/src/files/setup/setuplip.c @@ -4813,21 +4813,21 @@ struct ailist ailists[] = { }; struct aipaths paths[] = { - { path00, 0, 0 }, - { path01, 1, 0 }, - { path02, 2, 0 }, - { path03, 3, 0 }, - { path04, 4, 0 }, - { path05, 5, 0 }, - { path06, 6, 0 }, - { path07, 7, 0 }, - { path08, 8, 0 }, - { path09, 9, 0 }, - { path10, 10, 0 }, - { path11, 11, 0 }, - { path12, 12, 0 }, - { path13, 13, 0 }, - { path14, 14, 0 }, + { path00, 0, PATHTYPE_BACKANDFORTH }, + { path01, 1, PATHTYPE_BACKANDFORTH }, + { path02, 2, PATHTYPE_BACKANDFORTH }, + { path03, 3, PATHTYPE_BACKANDFORTH }, + { path04, 4, PATHTYPE_BACKANDFORTH }, + { path05, 5, PATHTYPE_BACKANDFORTH }, + { path06, 6, PATHTYPE_BACKANDFORTH }, + { path07, 7, PATHTYPE_BACKANDFORTH }, + { path08, 8, PATHTYPE_BACKANDFORTH }, + { path09, 9, PATHTYPE_BACKANDFORTH }, + { path10, 10, PATHTYPE_BACKANDFORTH }, + { path11, 11, PATHTYPE_BACKANDFORTH }, + { path12, 12, PATHTYPE_BACKANDFORTH }, + { path13, 13, PATHTYPE_BACKANDFORTH }, + { path14, 14, PATHTYPE_BACKANDFORTH }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setuplue.c b/src/files/setup/setuplue.c index 3ebc595aa..a8a14c01c 100644 --- a/src/files/setup/setuplue.c +++ b/src/files/setup/setuplue.c @@ -804,39 +804,39 @@ s32 path33[] = { }; struct aipaths paths[] = { - { path00, 0, 0 }, - { path01, 1, 0 }, - { path02, 2, 1 }, - { path03, 3, 0 }, - { path04, 4, 0 }, - { path05, 5, 0 }, - { path08, 8, 0 }, - { path09, 9, 2 }, - { path10, 10, 2 }, - { path11, 11, 2 }, - { path12, 12, 2 }, - { path13, 13, 2 }, - { path14, 14, 2 }, - { path15, 15, 2 }, - { path16, 16, 2 }, - { path17, 17, 2 }, - { path18, 18, 2 }, - { path19, 19, 2 }, - { path20, 20, 2 }, - { path21, 21, 2 }, - { path22, 22, 2 }, - { path23, 23, 2 }, - { path24, 24, 2 }, - { path25, 25, 2 }, - { path26, 26, 2 }, - { path27, 27, 2 }, - { path28, 28, 2 }, - { path29, 29, 2 }, - { path30, 30, 2 }, - { path31, 31, 2 }, - { path32, 32, 2 }, - { path33, 33, 2 }, - { path34, 34, 2 }, + { path00, 0, PATHTYPE_BACKANDFORTH }, + { path01, 1, PATHTYPE_BACKANDFORTH }, + { path02, 2, PATHTYPE_CIRCULAR }, + { path03, 3, PATHTYPE_BACKANDFORTH }, + { path04, 4, PATHTYPE_BACKANDFORTH }, + { path05, 5, PATHTYPE_BACKANDFORTH }, + { path08, 8, PATHTYPE_BACKANDFORTH }, + { path09, 9, PATHTYPE_FLYING }, + { path10, 10, PATHTYPE_FLYING }, + { path11, 11, PATHTYPE_FLYING }, + { path12, 12, PATHTYPE_FLYING }, + { path13, 13, PATHTYPE_FLYING }, + { path14, 14, PATHTYPE_FLYING }, + { path15, 15, PATHTYPE_FLYING }, + { path16, 16, PATHTYPE_FLYING }, + { path17, 17, PATHTYPE_FLYING }, + { path18, 18, PATHTYPE_FLYING }, + { path19, 19, PATHTYPE_FLYING }, + { path20, 20, PATHTYPE_FLYING }, + { path21, 21, PATHTYPE_FLYING }, + { path22, 22, PATHTYPE_FLYING }, + { path23, 23, PATHTYPE_FLYING }, + { path24, 24, PATHTYPE_FLYING }, + { path25, 25, PATHTYPE_FLYING }, + { path26, 26, PATHTYPE_FLYING }, + { path27, 27, PATHTYPE_FLYING }, + { path28, 28, PATHTYPE_FLYING }, + { path29, 29, PATHTYPE_FLYING }, + { path30, 30, PATHTYPE_FLYING }, + { path31, 31, PATHTYPE_FLYING }, + { path32, 32, PATHTYPE_FLYING }, + { path33, 33, PATHTYPE_FLYING }, + { path34, 34, PATHTYPE_FLYING }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setupoat.c b/src/files/setup/setupoat.c index 3c05bef9a..c314b456f 100644 --- a/src/files/setup/setupoat.c +++ b/src/files/setup/setupoat.c @@ -258,12 +258,12 @@ s32 path04[] = { }; struct aipaths paths[] = { - { path00, 0, 0 }, - { path01, 1, 0 }, - { path00, 0, 0 }, - { path02, 2, 0 }, - { path03, 3, 0 }, - { path04, 4, 0 }, + { path00, 0, PATHTYPE_BACKANDFORTH }, + { path01, 1, PATHTYPE_BACKANDFORTH }, + { path00, 0, PATHTYPE_BACKANDFORTH }, + { path02, 2, PATHTYPE_BACKANDFORTH }, + { path03, 3, PATHTYPE_BACKANDFORTH }, + { path04, 4, PATHTYPE_BACKANDFORTH }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setuppam.c b/src/files/setup/setuppam.c index 3cd6ca4ae..10d345436 100644 --- a/src/files/setup/setuppam.c +++ b/src/files/setup/setuppam.c @@ -4855,15 +4855,15 @@ struct ailist ailists[] = { }; struct aipaths paths[] = { - { path02, 2, 0 }, - { path03, 3, 0 }, - { path04, 4, 0 }, - { path05, 5, 0 }, - { path06, 6, 0 }, - { path07, 7, 0 }, - { path08, 8, 0 }, - { path09, 9, 0 }, - { path10, 10, 0 }, + { path02, 2, PATHTYPE_BACKANDFORTH }, + { path03, 3, PATHTYPE_BACKANDFORTH }, + { path04, 4, PATHTYPE_BACKANDFORTH }, + { path05, 5, PATHTYPE_BACKANDFORTH }, + { path06, 6, PATHTYPE_BACKANDFORTH }, + { path07, 7, PATHTYPE_BACKANDFORTH }, + { path08, 8, PATHTYPE_BACKANDFORTH }, + { path09, 9, PATHTYPE_BACKANDFORTH }, + { path10, 10, PATHTYPE_BACKANDFORTH }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setuppete.c b/src/files/setup/setuppete.c index b0d6f275a..b48ec89c9 100644 --- a/src/files/setup/setuppete.c +++ b/src/files/setup/setuppete.c @@ -3322,20 +3322,20 @@ struct ailist ailists[] = { }; struct aipaths paths[] = { - { path00, 0, 0 }, - { path01, 1, 0 }, - { path02, 2, 0 }, - { path03, 3, 0 }, - { path04, 4, 0 }, - { path05, 5, 0 }, - { path06, 6, 0 }, - { path07, 7, 0 }, - { path08, 8, 0 }, - { path09, 9, 0 }, - { path10, 10, 0 }, - { path11, 11, 0 }, - { path12, 12, 0 }, - { path13, 13, 0 }, + { path00, 0, PATHTYPE_BACKANDFORTH }, + { path01, 1, PATHTYPE_BACKANDFORTH }, + { path02, 2, PATHTYPE_BACKANDFORTH }, + { path03, 3, PATHTYPE_BACKANDFORTH }, + { path04, 4, PATHTYPE_BACKANDFORTH }, + { path05, 5, PATHTYPE_BACKANDFORTH }, + { path06, 6, PATHTYPE_BACKANDFORTH }, + { path07, 7, PATHTYPE_BACKANDFORTH }, + { path08, 8, PATHTYPE_BACKANDFORTH }, + { path09, 9, PATHTYPE_BACKANDFORTH }, + { path10, 10, PATHTYPE_BACKANDFORTH }, + { path11, 11, PATHTYPE_BACKANDFORTH }, + { path12, 12, PATHTYPE_BACKANDFORTH }, + { path13, 13, PATHTYPE_BACKANDFORTH }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setuprit.c b/src/files/setup/setuprit.c index 5e0c49a1f..e98dbc6e1 100644 --- a/src/files/setup/setuprit.c +++ b/src/files/setup/setuprit.c @@ -4081,9 +4081,9 @@ struct ailist ailists[] = { }; struct aipaths paths[] = { - { path00, 0, 0 }, - { path01, 1, 0 }, - { path02, 2, 0 }, + { path00, 0, PATHTYPE_BACKANDFORTH }, + { path01, 1, PATHTYPE_BACKANDFORTH }, + { path02, 2, PATHTYPE_BACKANDFORTH }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setupsev.c b/src/files/setup/setupsev.c index 083c2dd27..dbd4865f4 100644 --- a/src/files/setup/setupsev.c +++ b/src/files/setup/setupsev.c @@ -845,21 +845,21 @@ s32 path14[] = { }; struct aipaths paths[] = { - { path00, 0, 0 }, - { path01, 1, 0 }, - { path02, 2, 0 }, - { path03, 3, 0 }, - { path04, 4, 0 }, - { path05, 5, 0 }, - { path06, 6, 0 }, - { path07, 7, 0 }, - { path08, 8, 0 }, - { path09, 9, 0 }, - { path10, 10, 0 }, - { path11, 11, 0 }, - { path12, 12, 0 }, - { path13, 13, 0 }, - { path14, 14, 0 }, + { path00, 0, PATHTYPE_BACKANDFORTH }, + { path01, 1, PATHTYPE_BACKANDFORTH }, + { path02, 2, PATHTYPE_BACKANDFORTH }, + { path03, 3, PATHTYPE_BACKANDFORTH }, + { path04, 4, PATHTYPE_BACKANDFORTH }, + { path05, 5, PATHTYPE_BACKANDFORTH }, + { path06, 6, PATHTYPE_BACKANDFORTH }, + { path07, 7, PATHTYPE_BACKANDFORTH }, + { path08, 8, PATHTYPE_BACKANDFORTH }, + { path09, 9, PATHTYPE_BACKANDFORTH }, + { path10, 10, PATHTYPE_BACKANDFORTH }, + { path11, 11, PATHTYPE_BACKANDFORTH }, + { path12, 12, PATHTYPE_BACKANDFORTH }, + { path13, 13, PATHTYPE_BACKANDFORTH }, + { path14, 14, PATHTYPE_BACKANDFORTH }, { NULL, 0, 0 }, }; diff --git a/src/files/setup/setupwax.c b/src/files/setup/setupwax.c index 336c31d4e..394ab1b53 100644 --- a/src/files/setup/setupwax.c +++ b/src/files/setup/setupwax.c @@ -952,44 +952,44 @@ s32 path29[] = { }; struct aipaths paths[] = { - { path00, 0, 0 }, - { path01, 1, 2 }, - { path02, 2, 2 }, - { path03, 3, 2 }, - { path04, 4, 2 }, - { path05, 5, 2 }, - { path06, 6, 2 }, - { path07, 7, 2 }, - { path08, 8, 2 }, - { path09, 9, 2 }, - { path10, 10, 2 }, - { path11, 11, 2 }, - { path12, 12, 2 }, - { path13, 13, 2 }, - { path14, 14, 2 }, - { path15, 15, 2 }, - { path16, 16, 2 }, - { path17, 17, 2 }, - { path18, 18, 2 }, - { path19, 19, 2 }, - { path20, 20, 2 }, - { path21, 21, 2 }, - { path22, 22, 2 }, - { path23, 23, 2 }, - { path24, 24, 2 }, - { path25, 25, 2 }, - { path26, 26, 1 }, - { path27, 27, 0 }, - { path28, 28, 0 }, - { path29, 29, 0 }, - { path30, 30, 1 }, - { path31, 31, 0 }, - { path32, 32, 0 }, - { path33, 33, 0 }, - { path34, 34, 1 }, - { path35, 35, 1 }, - { path36, 36, 1 }, - { path37, 37, 0 }, + { path00, 0, PATHTYPE_BACKANDFORTH }, + { path01, 1, PATHTYPE_FLYING }, + { path02, 2, PATHTYPE_FLYING }, + { path03, 3, PATHTYPE_FLYING }, + { path04, 4, PATHTYPE_FLYING }, + { path05, 5, PATHTYPE_FLYING }, + { path06, 6, PATHTYPE_FLYING }, + { path07, 7, PATHTYPE_FLYING }, + { path08, 8, PATHTYPE_FLYING }, + { path09, 9, PATHTYPE_FLYING }, + { path10, 10, PATHTYPE_FLYING }, + { path11, 11, PATHTYPE_FLYING }, + { path12, 12, PATHTYPE_FLYING }, + { path13, 13, PATHTYPE_FLYING }, + { path14, 14, PATHTYPE_FLYING }, + { path15, 15, PATHTYPE_FLYING }, + { path16, 16, PATHTYPE_FLYING }, + { path17, 17, PATHTYPE_FLYING }, + { path18, 18, PATHTYPE_FLYING }, + { path19, 19, PATHTYPE_FLYING }, + { path20, 20, PATHTYPE_FLYING }, + { path21, 21, PATHTYPE_FLYING }, + { path22, 22, PATHTYPE_FLYING }, + { path23, 23, PATHTYPE_FLYING }, + { path24, 24, PATHTYPE_FLYING }, + { path25, 25, PATHTYPE_FLYING }, + { path26, 26, PATHTYPE_CIRCULAR }, + { path27, 27, PATHTYPE_BACKANDFORTH }, + { path28, 28, PATHTYPE_BACKANDFORTH }, + { path29, 29, PATHTYPE_BACKANDFORTH }, + { path30, 30, PATHTYPE_CIRCULAR }, + { path31, 31, PATHTYPE_BACKANDFORTH }, + { path32, 32, PATHTYPE_BACKANDFORTH }, + { path33, 33, PATHTYPE_BACKANDFORTH }, + { path34, 34, PATHTYPE_CIRCULAR }, + { path35, 35, PATHTYPE_CIRCULAR }, + { path36, 36, PATHTYPE_CIRCULAR }, + { path37, 37, PATHTYPE_BACKANDFORTH }, { NULL, 0, 0 }, }; diff --git a/src/include/constants.h b/src/include/constants.h index 942ae4561..d7faee411 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -544,6 +544,10 @@ #define PADEFFECT_SMOKE 0x04 #define PADEFFECT_SMOKE_TEMPORARY 0x05 +#define PATHTYPE_BACKANDFORTH 0 +#define PATHTYPE_CIRCULAR 1 +#define PATHTYPE_FLYING 2 + #define SPEED_WALK 0 #define SPEED_JOG 1 #define SPEED_RUN 2