From e30bb5cb4a4239c65a53fe94896d864bf45fbd4a Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 17 Nov 2019 08:30:04 +1000 Subject: [PATCH] Rename symbols related to ailists --- src/files/setup/mp_setupame.c | 6 +++--- src/files/setup/mp_setuparch.c | 6 +++--- src/files/setup/mp_setuparec.c | 6 +++--- src/files/setup/mp_setupark.c | 6 +++--- src/files/setup/mp_setupash.c | 6 +++--- src/files/setup/mp_setupate.c | 6 +++--- src/files/setup/mp_setupazt.c | 6 +++--- src/files/setup/mp_setupcat.c | 6 +++--- src/files/setup/mp_setupcave.c | 6 +++--- src/files/setup/mp_setupcrad.c | 6 +++--- src/files/setup/mp_setupcryp.c | 6 +++--- src/files/setup/mp_setupdam.c | 6 +++--- src/files/setup/mp_setupdepo.c | 6 +++--- src/files/setup/mp_setupdest.c | 6 +++--- src/files/setup/mp_setupdish.c | 6 +++--- src/files/setup/mp_setupear.c | 6 +++--- src/files/setup/mp_setupeld.c | 6 +++--- src/files/setup/mp_setupimp.c | 6 +++--- src/files/setup/mp_setupjun.c | 6 +++--- src/files/setup/mp_setuplam.c | 6 +++--- src/files/setup/mp_setuplee.c | 6 +++--- src/files/setup/mp_setuplen.c | 6 +++--- src/files/setup/mp_setuplip.c | 6 +++--- src/files/setup/mp_setuplue.c | 6 +++--- src/files/setup/mp_setupmp1.c | 6 +++--- src/files/setup/mp_setupmp10.c | 6 +++--- src/files/setup/mp_setupmp11.c | 6 +++--- src/files/setup/mp_setupmp12.c | 6 +++--- src/files/setup/mp_setupmp13.c | 6 +++--- src/files/setup/mp_setupmp14.c | 6 +++--- src/files/setup/mp_setupmp15.c | 6 +++--- src/files/setup/mp_setupmp16.c | 6 +++--- src/files/setup/mp_setupmp17.c | 6 +++--- src/files/setup/mp_setupmp18.c | 6 +++--- src/files/setup/mp_setupmp19.c | 6 +++--- src/files/setup/mp_setupmp2.c | 6 +++--- src/files/setup/mp_setupmp20.c | 6 +++--- src/files/setup/mp_setupmp3.c | 6 +++--- src/files/setup/mp_setupmp4.c | 6 +++--- src/files/setup/mp_setupmp5.c | 6 +++--- src/files/setup/mp_setupmp6.c | 6 +++--- src/files/setup/mp_setupmp7.c | 6 +++--- src/files/setup/mp_setupmp8.c | 6 +++--- src/files/setup/mp_setupmp9.c | 6 +++--- src/files/setup/mp_setupoat.c | 6 +++--- src/files/setup/mp_setupold.c | 6 +++--- src/files/setup/mp_setuppam.c | 6 +++--- src/files/setup/mp_setuppete.c | 6 +++--- src/files/setup/mp_setupref.c | 6 +++--- src/files/setup/mp_setuprit.c | 6 +++--- src/files/setup/mp_setuprun.c | 6 +++--- src/files/setup/mp_setupsev.c | 6 +++--- src/files/setup/mp_setupsevb.c | 6 +++--- src/files/setup/mp_setupsevx.c | 6 +++--- src/files/setup/mp_setupsho.c | 6 +++--- src/files/setup/mp_setupsilo.c | 6 +++--- src/files/setup/mp_setupstat.c | 6 +++--- src/files/setup/mp_setuptra.c | 6 +++--- src/files/setup/mp_setupuff.c | 6 +++--- src/files/setup/mp_setupwax.c | 6 +++--- src/files/setup/setupame.c | 8 ++++---- src/files/setup/setuparch.c | 6 +++--- src/files/setup/setuparec.c | 6 +++--- src/files/setup/setupark.c | 6 +++--- src/files/setup/setupash.c | 6 +++--- src/files/setup/setupate.c | 6 +++--- src/files/setup/setupazt.c | 6 +++--- src/files/setup/setupcat.c | 6 +++--- src/files/setup/setupcave.c | 6 +++--- src/files/setup/setupcrad.c | 6 +++--- src/files/setup/setupcryp.c | 6 +++--- src/files/setup/setupdam.c | 6 +++--- src/files/setup/setupdepo.c | 6 +++--- src/files/setup/setupdest.c | 6 +++--- src/files/setup/setupdish.c | 6 +++--- src/files/setup/setupear.c | 6 +++--- src/files/setup/setupeld.c | 6 +++--- src/files/setup/setupimp.c | 6 +++--- src/files/setup/setupjun.c | 6 +++--- src/files/setup/setuplam.c | 6 +++--- src/files/setup/setuplee.c | 6 +++--- src/files/setup/setuplen.c | 6 +++--- src/files/setup/setuplip.c | 6 +++--- src/files/setup/setuplue.c | 6 +++--- src/files/setup/setupmp1.c | 6 +++--- src/files/setup/setupmp10.c | 6 +++--- src/files/setup/setupmp11.c | 6 +++--- src/files/setup/setupmp12.c | 6 +++--- src/files/setup/setupmp13.c | 6 +++--- src/files/setup/setupmp14.c | 6 +++--- src/files/setup/setupmp15.c | 6 +++--- src/files/setup/setupmp16.c | 6 +++--- src/files/setup/setupmp17.c | 6 +++--- src/files/setup/setupmp18.c | 6 +++--- src/files/setup/setupmp19.c | 6 +++--- src/files/setup/setupmp2.c | 6 +++--- src/files/setup/setupmp20.c | 6 +++--- src/files/setup/setupmp3.c | 6 +++--- src/files/setup/setupmp4.c | 6 +++--- src/files/setup/setupmp5.c | 6 +++--- src/files/setup/setupmp6.c | 6 +++--- src/files/setup/setupmp7.c | 6 +++--- src/files/setup/setupmp8.c | 6 +++--- src/files/setup/setupmp9.c | 6 +++--- src/files/setup/setupoat.c | 6 +++--- src/files/setup/setupold.c | 6 +++--- src/files/setup/setuppam.c | 10 +++++----- src/files/setup/setuppete.c | 6 +++--- src/files/setup/setupref.c | 6 +++--- src/files/setup/setuprit.c | 10 +++++----- src/files/setup/setuprun.c | 6 +++--- src/files/setup/setupsev.c | 6 +++--- src/files/setup/setupsevb.c | 6 +++--- src/files/setup/setupsevx.c | 6 +++--- src/files/setup/setupsevxb.c | 6 +++--- src/files/setup/setupsho.c | 8 ++++---- src/files/setup/setupsilo.c | 6 +++--- src/files/setup/setupstat.c | 6 +++--- src/files/setup/setuptra.c | 6 +++--- src/files/setup/setupuff.c | 6 +++--- src/files/setup/setupwax.c | 6 +++--- src/game/game_00c490.c | 16 ++++++++-------- src/gvars/gvars.c | 2 +- src/include/gvars/gvars.h | 1 + src/include/library/library.h | 2 +- src/include/setup/ailists.h | 3 ++- src/include/setup/setup_000000.h | 4 ++-- src/include/types.h | 2 +- src/library/library.c | 5 +++-- src/setup/ailists.c | 2 +- src/setup/setup_000000.c | 4 ++-- 131 files changed, 391 insertions(+), 388 deletions(-) diff --git a/src/files/setup/mp_setupame.c b/src/files/setup/mp_setupame.c index 6e5ec2cdb..e7be7d853 100644 --- a/src/files/setup/mp_setupame.c +++ b/src/files/setup/mp_setupame.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -40,7 +40,7 @@ u8 func0000_0034[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setuparch.c b/src/files/setup/mp_setuparch.c index 58eb9bde6..429ff9093 100644 --- a/src/files/setup/mp_setuparch.c +++ b/src/files/setup/mp_setuparch.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -32,7 +32,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setuparec.c b/src/files/setup/mp_setuparec.c index b5cb3e486..b0ef0c91b 100644 --- a/src/files/setup/mp_setuparec.c +++ b/src/files/setup/mp_setuparec.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -141,7 +141,7 @@ u8 func1000_1b30[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_1b30, 0x1000 }, { func1001_start_lift, 0x1001 }, { NULL, 0 }, diff --git a/src/files/setup/mp_setupark.c b/src/files/setup/mp_setupark.c index 3ba0e7ba4..c9f86d7e7 100644 --- a/src/files/setup/mp_setupark.c +++ b/src/files/setup/mp_setupark.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -36,7 +36,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupash.c b/src/files/setup/mp_setupash.c index bdba6a588..6509674b9 100644 --- a/src/files/setup/mp_setupash.c +++ b/src/files/setup/mp_setupash.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -40,7 +40,7 @@ u8 func0000_0034[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupate.c b/src/files/setup/mp_setupate.c index b9307e5d2..52cee5aa7 100644 --- a/src/files/setup/mp_setupate.c +++ b/src/files/setup/mp_setupate.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupazt.c b/src/files/setup/mp_setupazt.c index cfad98090..3effda9c7 100644 --- a/src/files/setup/mp_setupazt.c +++ b/src/files/setup/mp_setupazt.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -40,7 +40,7 @@ u8 func0000_0034[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupcat.c b/src/files/setup/mp_setupcat.c index 899451fd3..8aae01ed2 100644 --- a/src/files/setup/mp_setupcat.c +++ b/src/files/setup/mp_setupcat.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -32,7 +32,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupcave.c b/src/files/setup/mp_setupcave.c index a27a42181..696d0c928 100644 --- a/src/files/setup/mp_setupcave.c +++ b/src/files/setup/mp_setupcave.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -32,7 +32,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupcrad.c b/src/files/setup/mp_setupcrad.c index ef06bfe2c..e1439cbe0 100644 --- a/src/files/setup/mp_setupcrad.c +++ b/src/files/setup/mp_setupcrad.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -133,7 +133,7 @@ u8 func1000_14e0[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_14e0, 0x1000 }, { func1001_start_lift, 0x1001 }, { NULL, 0 }, diff --git a/src/files/setup/mp_setupcryp.c b/src/files/setup/mp_setupcryp.c index 41aad49a8..1426910fe 100644 --- a/src/files/setup/mp_setupcryp.c +++ b/src/files/setup/mp_setupcryp.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -130,7 +130,7 @@ u8 func1000_13e0[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_13e0, 0x1000 }, { func1001_13d4, 0x1001 }, { NULL, 0 }, diff --git a/src/files/setup/mp_setupdam.c b/src/files/setup/mp_setupdam.c index 205ccbb75..e595a81b7 100644 --- a/src/files/setup/mp_setupdam.c +++ b/src/files/setup/mp_setupdam.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -43,6 +43,6 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupdepo.c b/src/files/setup/mp_setupdepo.c index 4fcd4be23..cabe41426 100644 --- a/src/files/setup/mp_setupdepo.c +++ b/src/files/setup/mp_setupdepo.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -32,7 +32,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupdest.c b/src/files/setup/mp_setupdest.c index 065eed1c6..2d933d3c4 100644 --- a/src/files/setup/mp_setupdest.c +++ b/src/files/setup/mp_setupdest.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -32,7 +32,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupdish.c b/src/files/setup/mp_setupdish.c index 79e8a129b..03eccf635 100644 --- a/src/files/setup/mp_setupdish.c +++ b/src/files/setup/mp_setupdish.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -32,7 +32,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupear.c b/src/files/setup/mp_setupear.c index cd36d964a..06c352af4 100644 --- a/src/files/setup/mp_setupear.c +++ b/src/files/setup/mp_setupear.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -42,7 +42,7 @@ u8 func0000_004c[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupeld.c b/src/files/setup/mp_setupeld.c index ba9ab8050..1550077a4 100644 --- a/src/files/setup/mp_setupeld.c +++ b/src/files/setup/mp_setupeld.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -42,7 +42,7 @@ u8 func0000_004c[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupimp.c b/src/files/setup/mp_setupimp.c index 36dd06dbf..09657a0c6 100644 --- a/src/files/setup/mp_setupimp.c +++ b/src/files/setup/mp_setupimp.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -40,7 +40,7 @@ u8 func0000_0034[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupjun.c b/src/files/setup/mp_setupjun.c index 41eab742a..fde77c22f 100644 --- a/src/files/setup/mp_setupjun.c +++ b/src/files/setup/mp_setupjun.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -129,7 +129,7 @@ u8 func1000_1898[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_1898, 0x1000 }, { NULL, 0 }, }; diff --git a/src/files/setup/mp_setuplam.c b/src/files/setup/mp_setuplam.c index f9df37a67..dc373f1da 100644 --- a/src/files/setup/mp_setuplam.c +++ b/src/files/setup/mp_setuplam.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setuplee.c b/src/files/setup/mp_setuplee.c index 51f97ecc7..3eeda450d 100644 --- a/src/files/setup/mp_setuplee.c +++ b/src/files/setup/mp_setuplee.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -42,7 +42,7 @@ u8 func0000_004c[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setuplen.c b/src/files/setup/mp_setuplen.c index a1e9a3850..12c2a51a8 100644 --- a/src/files/setup/mp_setuplen.c +++ b/src/files/setup/mp_setuplen.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -41,7 +41,7 @@ u8 func0000_003c[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setuplip.c b/src/files/setup/mp_setuplip.c index 82f13f7fd..e668afc13 100644 --- a/src/files/setup/mp_setuplip.c +++ b/src/files/setup/mp_setuplip.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -40,7 +40,7 @@ u8 func0000_0034[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setuplue.c b/src/files/setup/mp_setuplue.c index 4ce72b01c..8c9f27a8b 100644 --- a/src/files/setup/mp_setuplue.c +++ b/src/files/setup/mp_setuplue.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -40,7 +40,7 @@ u8 func0000_0034[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupmp1.c b/src/files/setup/mp_setupmp1.c index db7d91006..38f78cf55 100644 --- a/src/files/setup/mp_setupmp1.c +++ b/src/files/setup/mp_setupmp1.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -158,7 +158,7 @@ u8 func1000_21d4[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_21d4, 0x1000 }, { func1001_start_lifts, 0x1001 }, { NULL, 0 }, diff --git a/src/files/setup/mp_setupmp10.c b/src/files/setup/mp_setupmp10.c index 46ba74b38..2ae65a8c6 100644 --- a/src/files/setup/mp_setupmp10.c +++ b/src/files/setup/mp_setupmp10.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -132,7 +132,7 @@ u8 func1000_1680[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_1680, 0x1000 }, { func1001_start_lifts, 0x1001 }, { NULL, 0 }, diff --git a/src/files/setup/mp_setupmp11.c b/src/files/setup/mp_setupmp11.c index ada214e7f..05940dff3 100644 --- a/src/files/setup/mp_setupmp11.c +++ b/src/files/setup/mp_setupmp11.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -142,7 +142,7 @@ u8 func1000_26fc[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_26fc, 0x1000 }, { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupmp12.c b/src/files/setup/mp_setupmp12.c index f4ff92cad..411f9fb5c 100644 --- a/src/files/setup/mp_setupmp12.c +++ b/src/files/setup/mp_setupmp12.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -201,7 +201,7 @@ u8 func1000_3cc8[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_3cc8, 0x1000 }, { func1001_start_lifts, 0x1001 }, { NULL, 0 }, diff --git a/src/files/setup/mp_setupmp13.c b/src/files/setup/mp_setupmp13.c index 1a58085d4..d39616353 100644 --- a/src/files/setup/mp_setupmp13.c +++ b/src/files/setup/mp_setupmp13.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -115,7 +115,7 @@ u8 func1000_1368[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_1368, 0x1000 }, { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupmp14.c b/src/files/setup/mp_setupmp14.c index 6970f4ee0..ae3710b20 100644 --- a/src/files/setup/mp_setupmp14.c +++ b/src/files/setup/mp_setupmp14.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -41,7 +41,7 @@ u8 unregistered_func1[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupmp15.c b/src/files/setup/mp_setupmp15.c index e765d788b..3210dc059 100644 --- a/src/files/setup/mp_setupmp15.c +++ b/src/files/setup/mp_setupmp15.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -153,7 +153,7 @@ u8 func1000_2400[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_2400, 0x1000 }, { func1001_start_lift, 0x1001 }, { NULL, 0 }, diff --git a/src/files/setup/mp_setupmp16.c b/src/files/setup/mp_setupmp16.c index e64a9a599..edc2a35b3 100644 --- a/src/files/setup/mp_setupmp16.c +++ b/src/files/setup/mp_setupmp16.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -40,7 +40,7 @@ u8 unregistered_func1[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupmp17.c b/src/files/setup/mp_setupmp17.c index c430e72a5..1e55f30d4 100644 --- a/src/files/setup/mp_setupmp17.c +++ b/src/files/setup/mp_setupmp17.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -47,7 +47,7 @@ u8 func1000_0044[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_0044, 0x1000 }, { func1001_0038, 0x1001 }, { NULL, 0 }, diff --git a/src/files/setup/mp_setupmp18.c b/src/files/setup/mp_setupmp18.c index f8c44a48f..5fa630bf8 100644 --- a/src/files/setup/mp_setupmp18.c +++ b/src/files/setup/mp_setupmp18.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -41,7 +41,7 @@ u8 func1000_0038[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_0038, 0x1000 }, { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupmp19.c b/src/files/setup/mp_setupmp19.c index 842c76d72..0453649d0 100644 --- a/src/files/setup/mp_setupmp19.c +++ b/src/files/setup/mp_setupmp19.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -41,7 +41,7 @@ u8 func1000_0038[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_0038, 0x1000 }, { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupmp2.c b/src/files/setup/mp_setupmp2.c index ad6a42cea..703cdbc28 100644 --- a/src/files/setup/mp_setupmp2.c +++ b/src/files/setup/mp_setupmp2.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -48,7 +48,7 @@ u8 unregistered_func2[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupmp20.c b/src/files/setup/mp_setupmp20.c index c5f1c4d21..622b469ea 100644 --- a/src/files/setup/mp_setupmp20.c +++ b/src/files/setup/mp_setupmp20.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -41,7 +41,7 @@ u8 func1000_0038[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_0038, 0x1000 }, { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupmp3.c b/src/files/setup/mp_setupmp3.c index 691225b79..e0d725578 100644 --- a/src/files/setup/mp_setupmp3.c +++ b/src/files/setup/mp_setupmp3.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -150,7 +150,7 @@ u8 func1000_27ec[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_27ec, 0x1000 }, { func1001_27e0, 0x1001 }, { NULL, 0 }, diff --git a/src/files/setup/mp_setupmp4.c b/src/files/setup/mp_setupmp4.c index d72f93228..e76a1df98 100644 --- a/src/files/setup/mp_setupmp4.c +++ b/src/files/setup/mp_setupmp4.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -124,7 +124,7 @@ u8 func1000_159c[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_159c, 0x1000 }, { func1001_1590, 0x1001 }, { NULL, 0 }, diff --git a/src/files/setup/mp_setupmp5.c b/src/files/setup/mp_setupmp5.c index 765ecca9c..f3df29093 100644 --- a/src/files/setup/mp_setupmp5.c +++ b/src/files/setup/mp_setupmp5.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -134,7 +134,7 @@ u8 func1000_1dcc[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_1dcc, 0x1000 }, { func1001_1dc0, 0x1001 }, { NULL, 0 }, diff --git a/src/files/setup/mp_setupmp6.c b/src/files/setup/mp_setupmp6.c index 3cd58a509..1ca06390d 100644 --- a/src/files/setup/mp_setupmp6.c +++ b/src/files/setup/mp_setupmp6.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -40,7 +40,7 @@ u8 unregistered_func1[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupmp7.c b/src/files/setup/mp_setupmp7.c index 9cc49c386..592431679 100644 --- a/src/files/setup/mp_setupmp7.c +++ b/src/files/setup/mp_setupmp7.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -41,7 +41,7 @@ u8 func1000_0038[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_0038, 0x1000 }, { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupmp8.c b/src/files/setup/mp_setupmp8.c index 4dc42212e..98e0dd40d 100644 --- a/src/files/setup/mp_setupmp8.c +++ b/src/files/setup/mp_setupmp8.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -41,7 +41,7 @@ u8 func1000_0038[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_0038, 0x1000 }, { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupmp9.c b/src/files/setup/mp_setupmp9.c index 39ed1be84..4289cf0b0 100644 --- a/src/files/setup/mp_setupmp9.c +++ b/src/files/setup/mp_setupmp9.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -129,7 +129,7 @@ u8 func1000_1cf8[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_1cf8, 0x1000 }, { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupoat.c b/src/files/setup/mp_setupoat.c index 56d6163a4..6d76814c0 100644 --- a/src/files/setup/mp_setupoat.c +++ b/src/files/setup/mp_setupoat.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -138,7 +138,7 @@ u8 func1000_1c08[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_1c08, 0x1000 }, { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupold.c b/src/files/setup/mp_setupold.c index b75f58b0b..f33c62cab 100644 --- a/src/files/setup/mp_setupold.c +++ b/src/files/setup/mp_setupold.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setuppam.c b/src/files/setup/mp_setuppam.c index 8ab1fe465..2171f89b0 100644 --- a/src/files/setup/mp_setuppam.c +++ b/src/files/setup/mp_setuppam.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -42,7 +42,7 @@ u8 func0000_004c[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setuppete.c b/src/files/setup/mp_setuppete.c index 60825bd5b..12f95022b 100644 --- a/src/files/setup/mp_setuppete.c +++ b/src/files/setup/mp_setuppete.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -58,6 +58,6 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupref.c b/src/files/setup/mp_setupref.c index 18bc7b1e6..61841ae16 100644 --- a/src/files/setup/mp_setupref.c +++ b/src/files/setup/mp_setupref.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -136,7 +136,7 @@ u8 func1000_1598[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_1598, 0x1000 }, { NULL, 0 }, }; diff --git a/src/files/setup/mp_setuprit.c b/src/files/setup/mp_setuprit.c index 4b5b8e16d..1a7278009 100644 --- a/src/files/setup/mp_setuprit.c +++ b/src/files/setup/mp_setuprit.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -42,7 +42,7 @@ u8 func0000_004c[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setuprun.c b/src/files/setup/mp_setuprun.c index c67a15dfb..70698e073 100644 --- a/src/files/setup/mp_setuprun.c +++ b/src/files/setup/mp_setuprun.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -46,7 +46,7 @@ u8 unregistered_func2[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupsev.c b/src/files/setup/mp_setupsev.c index 04fe0c24e..c95bcc78e 100644 --- a/src/files/setup/mp_setupsev.c +++ b/src/files/setup/mp_setupsev.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupsevb.c b/src/files/setup/mp_setupsevb.c index 6cda81118..7126f9ea3 100644 --- a/src/files/setup/mp_setupsevb.c +++ b/src/files/setup/mp_setupsevb.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupsevx.c b/src/files/setup/mp_setupsevx.c index 4effd2545..b3b0bf4b3 100644 --- a/src/files/setup/mp_setupsevx.c +++ b/src/files/setup/mp_setupsevx.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -32,7 +32,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupsho.c b/src/files/setup/mp_setupsho.c index d4beb8bd4..f6026a3af 100644 --- a/src/files/setup/mp_setupsho.c +++ b/src/files/setup/mp_setupsho.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -28,7 +28,7 @@ u8 intro[] = { endintro }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupsilo.c b/src/files/setup/mp_setupsilo.c index dfe20c80c..8557cab30 100644 --- a/src/files/setup/mp_setupsilo.c +++ b/src/files/setup/mp_setupsilo.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupstat.c b/src/files/setup/mp_setupstat.c index 7db69b3f0..e886d514d 100644 --- a/src/files/setup/mp_setupstat.c +++ b/src/files/setup/mp_setupstat.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -32,7 +32,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setuptra.c b/src/files/setup/mp_setuptra.c index f94ed5ae6..1ce8d28b1 100644 --- a/src/files/setup/mp_setuptra.c +++ b/src/files/setup/mp_setuptra.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -32,7 +32,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupuff.c b/src/files/setup/mp_setupuff.c index 38e4536d9..395db5a7b 100644 --- a/src/files/setup/mp_setupuff.c +++ b/src/files/setup/mp_setupuff.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -40,7 +40,7 @@ u8 func0000_0034[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/mp_setupwax.c b/src/files/setup/mp_setupwax.c index 446eb6a3a..cc0566b84 100644 --- a/src/files/setup/mp_setupwax.c +++ b/src/files/setup/mp_setupwax.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -40,7 +40,7 @@ u8 func0000_0034[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupame.c b/src/files/setup/setupame.c index 309c5a753..61fd45086 100644 --- a/src/files/setup/setupame.c +++ b/src/files/setup/setupame.c @@ -136,7 +136,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -145,7 +145,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -2745,7 +2745,7 @@ u8 unregistered_function6[] = { /** * This is the most ridiculous way of doing an intro cutscene. This is how all - * the functions call each other: + * the ailists call each other: * * func0422_intro calls 041b with return to 041e * 041e calls 041a with return to 041f @@ -3969,7 +3969,7 @@ u8 unregistered_function8[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func0401_do_some_animation, 0x0401 }, { func0402_guard_with_chrflag, 0x0402 }, { func0403_shielded_guard, 0x0403 }, diff --git a/src/files/setup/setuparch.c b/src/files/setup/setuparch.c index 89f783e07..b1e33e075 100644 --- a/src/files/setup/setuparch.c +++ b/src/files/setup/setuparch.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setuparec.c b/src/files/setup/setuparec.c index 7511efa2a..8c8a7c2f5 100644 --- a/src/files/setup/setuparec.c +++ b/src/files/setup/setuparec.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -43,7 +43,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupark.c b/src/files/setup/setupark.c index 675dd27d1..5a3893f84 100644 --- a/src/files/setup/setupark.c +++ b/src/files/setup/setupark.c @@ -80,7 +80,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -89,7 +89,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -3140,7 +3140,7 @@ u8 func101d_setup_rtracker[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func0401_drcaroll_following, 0x0401 }, { func0402_start_drcaroll, 0x0402 }, { func0403_stop_and_idle, 0x0403 }, diff --git a/src/files/setup/setupash.c b/src/files/setup/setupash.c index bdba6a588..6509674b9 100644 --- a/src/files/setup/setupash.c +++ b/src/files/setup/setupash.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -40,7 +40,7 @@ u8 func0000_0034[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupate.c b/src/files/setup/setupate.c index 392e2a093..d77679aa3 100644 --- a/src/files/setup/setupate.c +++ b/src/files/setup/setupate.c @@ -28,7 +28,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -37,7 +37,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -565,7 +565,7 @@ u8 func0407_trent_init[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_counterop_setup, 0x1000 }, { func1001_objectives_failed, 0x1001 }, { func1002_first_walk, 0x1002 }, diff --git a/src/files/setup/setupazt.c b/src/files/setup/setupazt.c index a28343201..08e4c5b43 100644 --- a/src/files/setup/setupazt.c +++ b/src/files/setup/setupazt.c @@ -60,7 +60,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -69,7 +69,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -2043,7 +2043,7 @@ u8 func1415_setup_lighting[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1400_setup_counterop, 0x1400 }, { func1001_objectives_failed_msg, 0x1001 }, { func1002_intro, 0x1002 }, diff --git a/src/files/setup/setupcat.c b/src/files/setup/setupcat.c index 899451fd3..8aae01ed2 100644 --- a/src/files/setup/setupcat.c +++ b/src/files/setup/setupcat.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -32,7 +32,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupcave.c b/src/files/setup/setupcave.c index bcaf1fdd6..015ec8858 100644 --- a/src/files/setup/setupcave.c +++ b/src/files/setup/setupcave.c @@ -81,7 +81,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -90,7 +90,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -4352,7 +4352,7 @@ u8 func1420_setup_portals[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_rebuild_groups, 0x1000 }, { func1401_setup_counterop, 0x1401 }, { func1002_objectives_failed_msg, 0x1002 }, diff --git a/src/files/setup/setupcrad.c b/src/files/setup/setupcrad.c index abeecbc59..bab555cb4 100644 --- a/src/files/setup/setupcrad.c +++ b/src/files/setup/setupcrad.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -34,7 +34,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupcryp.c b/src/files/setup/setupcryp.c index 41cb51a42..3e0e0ee13 100644 --- a/src/files/setup/setupcryp.c +++ b/src/files/setup/setupcryp.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupdam.c b/src/files/setup/setupdam.c index 16709585f..4e7fba003 100644 --- a/src/files/setup/setupdam.c +++ b/src/files/setup/setupdam.c @@ -89,7 +89,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -98,7 +98,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -2935,7 +2935,7 @@ u8 func1421_setup_lighting[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1400_setup_counterop, 0x1400 }, { func1001_objectives_failed_msg, 0x1001 }, { func1002_intro, 0x1002 }, diff --git a/src/files/setup/setupdepo.c b/src/files/setup/setupdepo.c index 99ea9bed5..ddf75c902 100644 --- a/src/files/setup/setupdepo.c +++ b/src/files/setup/setupdepo.c @@ -101,7 +101,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -110,7 +110,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -3094,7 +3094,7 @@ u8 func102c_set_lightswitch_guard_team[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func0401_init_swat1, 0x0401 }, { func0402_init_swat2, 0x0402 }, { func0403_walk_from_meeting, 0x0403 }, diff --git a/src/files/setup/setupdest.c b/src/files/setup/setupdest.c index f0d718780..8c9a3ca28 100644 --- a/src/files/setup/setupdest.c +++ b/src/files/setup/setupdest.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupdish.c b/src/files/setup/setupdish.c index 55d4f0c73..3459e91bc 100644 --- a/src/files/setup/setupdish.c +++ b/src/files/setup/setupdish.c @@ -97,7 +97,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -106,7 +106,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -5991,7 +5991,7 @@ u8 func1043_remove_hovercrate[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_jo_typing, 0x1000 }, { func1001_set_jo_team, 0x1001 }, { func1002_devicetraining_camspy, 0x1002 }, diff --git a/src/files/setup/setupear.c b/src/files/setup/setupear.c index 3613544bc..83ba98233 100644 --- a/src/files/setup/setupear.c +++ b/src/files/setup/setupear.c @@ -92,7 +92,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -101,7 +101,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -3316,7 +3316,7 @@ u8 func1424_start_lift[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func0401_init_chr_with_flag, 0x0401 }, { func0402_k7_guard, 0x0402 }, { func0403_k7_scientist, 0x0403 }, diff --git a/src/files/setup/setupeld.c b/src/files/setup/setupeld.c index 9fbcf36f6..4a0e24adb 100644 --- a/src/files/setup/setupeld.c +++ b/src/files/setup/setupeld.c @@ -88,7 +88,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -97,7 +97,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -3215,7 +3215,7 @@ u8 func1025_check_basement_entered_without_subdue[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1400_setup_counterop, 0x1400 }, { func1001_objectives_failed_msg, 0x1001 }, { func1002_intro, 0x1002 }, diff --git a/src/files/setup/setupimp.c b/src/files/setup/setupimp.c index f6e2ef3d0..71a970ad4 100644 --- a/src/files/setup/setupimp.c +++ b/src/files/setup/setupimp.c @@ -144,7 +144,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -153,7 +153,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -3988,7 +3988,7 @@ u8 func102d_firingrange_taker_invincibility[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1400_setup_counterop, 0x1400 }, { func1001_objectives_failed_msg, 0x1001 }, { func1002_intro, 0x1002 }, diff --git a/src/files/setup/setupjun.c b/src/files/setup/setupjun.c index 57c4d2279..97ef3c19d 100644 --- a/src/files/setup/setupjun.c +++ b/src/files/setup/setupjun.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -34,7 +34,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setuplam.c b/src/files/setup/setuplam.c index f9df37a67..dc373f1da 100644 --- a/src/files/setup/setuplam.c +++ b/src/files/setup/setuplam.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setuplee.c b/src/files/setup/setuplee.c index 18d0d1a1c..ca0278886 100644 --- a/src/files/setup/setuplee.c +++ b/src/files/setup/setuplee.c @@ -110,7 +110,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -119,7 +119,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -3777,7 +3777,7 @@ u8 func0428_set_uncloaked[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1400_setup_counterop, 0x1400 }, { func1001_objectives_failed_msg, 0x1001 }, { func1002_hangar_shuttle, 0x1002 }, diff --git a/src/files/setup/setuplen.c b/src/files/setup/setuplen.c index ab18b4529..626f121ec 100644 --- a/src/files/setup/setuplen.c +++ b/src/files/setup/setuplen.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -34,7 +34,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setuplip.c b/src/files/setup/setuplip.c index 558ed32cc..656aefef0 100644 --- a/src/files/setup/setuplip.c +++ b/src/files/setup/setuplip.c @@ -119,7 +119,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -128,7 +128,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -4705,7 +4705,7 @@ u8 func1036_check_door_terminal_destroyed[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1400_give_datauplinks, 0x1400 }, { func1001_objectives_failed_msg, 0x1001 }, { func1002_intro, 0x1002 }, diff --git a/src/files/setup/setuplue.c b/src/files/setup/setuplue.c index bf471b7f4..3ebc595aa 100644 --- a/src/files/setup/setuplue.c +++ b/src/files/setup/setuplue.c @@ -79,7 +79,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -88,7 +88,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -3270,7 +3270,7 @@ u8 func142f_setup_lighting[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func0401_start_path00, 0x0401 }, { func0402_start_path01, 0x0402 }, { func0403_start_path02, 0x0403 }, diff --git a/src/files/setup/setupmp1.c b/src/files/setup/setupmp1.c index b7ff09564..8391754df 100644 --- a/src/files/setup/setupmp1.c +++ b/src/files/setup/setupmp1.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp10.c b/src/files/setup/setupmp10.c index 98d2460b3..33864b415 100644 --- a/src/files/setup/setupmp10.c +++ b/src/files/setup/setupmp10.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -36,7 +36,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp11.c b/src/files/setup/setupmp11.c index 153f55390..8ddda399d 100644 --- a/src/files/setup/setupmp11.c +++ b/src/files/setup/setupmp11.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp12.c b/src/files/setup/setupmp12.c index db77a36c9..07625fd7b 100644 --- a/src/files/setup/setupmp12.c +++ b/src/files/setup/setupmp12.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp13.c b/src/files/setup/setupmp13.c index 38eacad26..fece5abf4 100644 --- a/src/files/setup/setupmp13.c +++ b/src/files/setup/setupmp13.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp14.c b/src/files/setup/setupmp14.c index 046e549dd..76d0b408e 100644 --- a/src/files/setup/setupmp14.c +++ b/src/files/setup/setupmp14.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp15.c b/src/files/setup/setupmp15.c index 909ced806..d4118ec84 100644 --- a/src/files/setup/setupmp15.c +++ b/src/files/setup/setupmp15.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp16.c b/src/files/setup/setupmp16.c index f0434ae3c..250c6b8d3 100644 --- a/src/files/setup/setupmp16.c +++ b/src/files/setup/setupmp16.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp17.c b/src/files/setup/setupmp17.c index 6749ed4ac..4463943ad 100644 --- a/src/files/setup/setupmp17.c +++ b/src/files/setup/setupmp17.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp18.c b/src/files/setup/setupmp18.c index fe99ab79e..f309a7d44 100644 --- a/src/files/setup/setupmp18.c +++ b/src/files/setup/setupmp18.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp19.c b/src/files/setup/setupmp19.c index 032d4c0ff..03bacb07c 100644 --- a/src/files/setup/setupmp19.c +++ b/src/files/setup/setupmp19.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp2.c b/src/files/setup/setupmp2.c index 2d2820752..75e9b87b2 100644 --- a/src/files/setup/setupmp2.c +++ b/src/files/setup/setupmp2.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp20.c b/src/files/setup/setupmp20.c index 7d40c833e..979426ba3 100644 --- a/src/files/setup/setupmp20.c +++ b/src/files/setup/setupmp20.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp3.c b/src/files/setup/setupmp3.c index 21f73eab5..9146a0552 100644 --- a/src/files/setup/setupmp3.c +++ b/src/files/setup/setupmp3.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -39,7 +39,7 @@ u8 func1000_0038[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_0038, 0x1000 }, { NULL, 0 }, }; diff --git a/src/files/setup/setupmp4.c b/src/files/setup/setupmp4.c index 0d26e17cd..3a6f29363 100644 --- a/src/files/setup/setupmp4.c +++ b/src/files/setup/setupmp4.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -40,7 +40,7 @@ u8 func0000_0034[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp5.c b/src/files/setup/setupmp5.c index 5ab65ca98..126d41019 100644 --- a/src/files/setup/setupmp5.c +++ b/src/files/setup/setupmp5.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp6.c b/src/files/setup/setupmp6.c index d7dd890a2..2e8980541 100644 --- a/src/files/setup/setupmp6.c +++ b/src/files/setup/setupmp6.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp7.c b/src/files/setup/setupmp7.c index 4ab3bcb24..5f9d1395d 100644 --- a/src/files/setup/setupmp7.c +++ b/src/files/setup/setupmp7.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -32,7 +32,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp8.c b/src/files/setup/setupmp8.c index d8fcd666e..dc8b22a5d 100644 --- a/src/files/setup/setupmp8.c +++ b/src/files/setup/setupmp8.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -36,7 +36,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupmp9.c b/src/files/setup/setupmp9.c index 518611f0a..1910fb18a 100644 --- a/src/files/setup/setupmp9.c +++ b/src/files/setup/setupmp9.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupoat.c b/src/files/setup/setupoat.c index 2e538ea76..3c05bef9a 100644 --- a/src/files/setup/setupoat.c +++ b/src/files/setup/setupoat.c @@ -11,7 +11,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -20,7 +20,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -202,7 +202,7 @@ u8 func0407_defend_pad[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func0401_init_enemy, 0x0401 }, { func0402_init_maian, 0x0402 }, { func0403_init_some_sound, 0x0403 }, diff --git a/src/files/setup/setupold.c b/src/files/setup/setupold.c index a1d293737..aaad4d022 100644 --- a/src/files/setup/setupold.c +++ b/src/files/setup/setupold.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -163,7 +163,7 @@ u8 func0c00_017c[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func0c00_017c, 0x0401 }, { func0c00_017c, 0x0c00 }, { NULL, 0 }, diff --git a/src/files/setup/setuppam.c b/src/files/setup/setuppam.c index c0c9a0970..3cd6ca4ae 100644 --- a/src/files/setup/setuppam.c +++ b/src/files/setup/setuppam.c @@ -98,7 +98,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -107,7 +107,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -2331,7 +2331,7 @@ u8 func1009_msg_getoutofhere[] = { /** * Entry point for all of Joanna's teleports. * - * Map of how these functions call each other: + * Map of how these ailists call each other: * * 100a func100a_bond_teleports * - calls 0414 teleport_bond_to_sapa @@ -2701,7 +2701,7 @@ u8 func0416_teleport_bond_to_a_pa_drcaroll[] = { /** * Entry point for all of Velvet's teleports. * - * Map of how these functions call each other: + * Map of how these ailists call each other: * * 100b func100b_coop_teleports * - calls 0417 teleport_coop_to_sapa @@ -4746,7 +4746,7 @@ u8 unregistered_function4[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func0401_unused, 0x0401 }, { func1400_setup_counterop, 0x1400 }, { func1001_objectives_failed_msg, 0x1001 }, diff --git a/src/files/setup/setuppete.c b/src/files/setup/setuppete.c index 49cb71a8b..b0d6f275a 100644 --- a/src/files/setup/setuppete.c +++ b/src/files/setup/setuppete.c @@ -96,7 +96,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -105,7 +105,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -3245,7 +3245,7 @@ u8 func1027_untrack_dumpster[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func0401_3ae8, 0x0401 }, { func0402_3bb4, 0x0402 }, { func0403_3c74, 0x0403 }, diff --git a/src/files/setup/setupref.c b/src/files/setup/setupref.c index ebaf7b388..4e3cbfc03 100644 --- a/src/files/setup/setupref.c +++ b/src/files/setup/setupref.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -35,7 +35,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setuprit.c b/src/files/setup/setuprit.c index c4d9e085f..5e0c49a1f 100644 --- a/src/files/setup/setuprit.c +++ b/src/files/setup/setuprit.c @@ -116,7 +116,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -125,7 +125,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -596,7 +596,7 @@ u8 func1024_give_objects[] = { endfunction }; -u8 func1004_reassign_functions_during_conversation[] = { +u8 func1004_reassign_ailists_during_conversation[] = { // Wait until player in president's room beginloop(0x04) consider_coop_for_p1p2_chr(CHR_SELF) @@ -3992,12 +3992,12 @@ u8 func1026_buddy_floor_hatch[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1400_setup_counterop, 0x1400 }, { func1001_objectives_failed_msg, 0x1001 }, { func1002_intro, 0x1002 }, { func1003_rebuild_groups, 0x1003 }, - { func1004_reassign_functions_during_conversation, 0x1004 }, + { func1004_reassign_ailists_during_conversation, 0x1004 }, { func1005_check_neutrals_killed, 0x1005 }, { func1006_hijack, 0x1006 }, { func1007_check_pod_destroyed, 0x1007 }, diff --git a/src/files/setup/setuprun.c b/src/files/setup/setuprun.c index 3c33f88af..1c6f162aa 100644 --- a/src/files/setup/setuprun.c +++ b/src/files/setup/setuprun.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupsev.c b/src/files/setup/setupsev.c index 9245adf8a..083c2dd27 100644 --- a/src/files/setup/setupsev.c +++ b/src/files/setup/setupsev.c @@ -43,7 +43,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -52,7 +52,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -1901,7 +1901,7 @@ u8 func0414_unload[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_setup_counterop, 0x1000 }, { func1001_objectives_failed_msg, 0x1001 }, { func1002_intro, 0x1002 }, diff --git a/src/files/setup/setupsevb.c b/src/files/setup/setupsevb.c index 6cda81118..7126f9ea3 100644 --- a/src/files/setup/setupsevb.c +++ b/src/files/setup/setupsevb.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupsevx.c b/src/files/setup/setupsevx.c index c45b9d1aa..ce49aa7ba 100644 --- a/src/files/setup/setupsevx.c +++ b/src/files/setup/setupsevx.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupsevxb.c b/src/files/setup/setupsevxb.c index 0852a0456..a9f59ac00 100644 --- a/src/files/setup/setupsevxb.c +++ b/src/files/setup/setupsevxb.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupsho.c b/src/files/setup/setupsho.c index 56848d9ca..c35c29f00 100644 --- a/src/files/setup/setupsho.c +++ b/src/files/setup/setupsho.c @@ -104,7 +104,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -113,7 +113,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -3912,7 +3912,7 @@ u8 func1028_buddybridge[] = { if_timer_gt(300, /*goto*/ 0x2d) endloop(0x04) - // This flag is set by global functions + // This flag is set by global ailists label(0x2d) if_stage_flag_eq(STAGEFLAG_AI_BUDDY_EXISTS, FALSE, /*goto*/ 0x2d) set_function(CHR_SELF, GFUNC_IDLE) @@ -3926,7 +3926,7 @@ u8 func1028_buddybridge[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func0401_init_unarmed_skedar, 0x0401 }, { func0402_unarmed_skedar, 0x0402 }, { func0403_init_miniskedar, 0x0403 }, diff --git a/src/files/setup/setupsilo.c b/src/files/setup/setupsilo.c index dfe20c80c..8557cab30 100644 --- a/src/files/setup/setupsilo.c +++ b/src/files/setup/setupsilo.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupstat.c b/src/files/setup/setupstat.c index d2fe0304e..085e064e1 100644 --- a/src/files/setup/setupstat.c +++ b/src/files/setup/setupstat.c @@ -57,7 +57,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -66,7 +66,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -1380,7 +1380,7 @@ u8 func1010_init_lighting[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1000_counterop, 0x1000 }, { func1001_objectives_failed_msg, 0x1001 }, { func1002_intro, 0x1002 }, diff --git a/src/files/setup/setuptra.c b/src/files/setup/setuptra.c index dd00cc8e2..dc56ddfed 100644 --- a/src/files/setup/setuptra.c +++ b/src/files/setup/setuptra.c @@ -95,7 +95,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -104,7 +104,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -3798,7 +3798,7 @@ u8 func1434_setup_lighting[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func1400_setup_counterop, 0x1400 }, { func1001_objectives_failed_msg, 0x1001 }, { func1002_intro, 0x1002 }, diff --git a/src/files/setup/setupuff.c b/src/files/setup/setupuff.c index 2ed696f3b..89d377ea7 100644 --- a/src/files/setup/setupuff.c +++ b/src/files/setup/setupuff.c @@ -7,7 +7,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -16,7 +16,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -33,7 +33,7 @@ struct aipaths paths[] = { { NULL, 0, 0 }, }; -struct ailists functions[] = { +struct ailist ailists[] = { { NULL, 0 }, }; diff --git a/src/files/setup/setupwax.c b/src/files/setup/setupwax.c index a86371ab9..336c31d4e 100644 --- a/src/files/setup/setupwax.c +++ b/src/files/setup/setupwax.c @@ -46,7 +46,7 @@ u8 intro[]; u8 props[]; struct aipaths paths[]; -struct ailists functions[]; +struct ailist ailists[]; void *setup[] = { NULL, @@ -55,7 +55,7 @@ void *setup[] = { intro, props, paths, - functions, + ailists, NULL, }; @@ -2165,7 +2165,7 @@ u8 func1012_chief_lift[] = { endfunction }; -struct ailists functions[] = { +struct ailist ailists[] = { { func0401_init_hovercar, 0x0401 }, { func0402_start_path26, 0x0402 }, { func0403_start_path27, 0x0403 }, diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index ab6dc0009..fac881bdd 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -3055,15 +3055,15 @@ glabel func0f00eb64 /* f00ed1c: 5480fffa */ bnezl $a0,.L0f00ed08 /* f00ed20: 0089c821 */ addu $t9,$a0,$t1 .L0f00ed24: -/* f00ed24: 3c088008 */ lui $t0,%hi(functions) -/* f00ed28: 2508ac58 */ addiu $t0,$t0,%lo(functions) +/* f00ed24: 3c088008 */ lui $t0,%hi(g_GlobalAilists) +/* f00ed28: 2508ac58 */ addiu $t0,$t0,%lo(g_GlobalAilists) /* f00ed2c: 27a40050 */ addiu $a0,$sp,0x50 /* f00ed30: 8d0a0008 */ lw $t2,0x8($t0) .L0f00ed34: -/* f00ed34: 3c028008 */ lui $v0,%hi(functions) +/* f00ed34: 3c028008 */ lui $v0,%hi(g_GlobalAilists) /* f00ed38: 00002825 */ or $a1,$zero,$zero /* f00ed3c: 11400017 */ beqz $t2,.L0f00ed9c -/* f00ed40: 2442ac58 */ addiu $v0,$v0,%lo(functions) +/* f00ed40: 2442ac58 */ addiu $v0,$v0,%lo(g_GlobalAilists) /* f00ed44: 8c4b000c */ lw $t3,0xc($v0) .L0f00ed48: /* f00ed48: 8c4c0004 */ lw $t4,0x4($v0) @@ -3132,8 +3132,8 @@ glabel func0f00eb64 /* f00ee2c: 0000c0c0 */ sll $t8,$zero,0x3 /* f00ee30: 0118c821 */ addu $t9,$t0,$t8 /* f00ee34: 8f2a0000 */ lw $t2,0x0($t9) -/* f00ee38: 3c038006 */ lui $v1,%hi(var8005ef30) -/* f00ee3c: 2463ef30 */ addiu $v1,$v1,%lo(var8005ef30) +/* f00ee38: 3c038006 */ lui $v1,%hi(g_NumGlobalAilists) +/* f00ee3c: 2463ef30 */ addiu $v1,$v1,%lo(g_NumGlobalAilists) /* f00ee40: ac600000 */ sw $zero,0x0($v1) /* f00ee44: 11400009 */ beqz $t2,.L0f00ee6c /* f00ee48: 00001025 */ or $v0,$zero,$zero @@ -3147,8 +3147,8 @@ glabel func0f00eb64 /* f00ee64: 55c0fffa */ bnezl $t6,.L0f00ee50 /* f00ee68: 244b0001 */ addiu $t3,$v0,0x1 .L0f00ee6c: -/* f00ee6c: 3c038006 */ lui $v1,%hi(var8005ef34) -/* f00ee70: 2463ef34 */ addiu $v1,$v1,%lo(var8005ef34) +/* f00ee6c: 3c038006 */ lui $v1,%hi(g_NumLvAilists) +/* f00ee70: 2463ef34 */ addiu $v1,$v1,%lo(g_NumLvAilists) /* f00ee74: 000078c0 */ sll $t7,$zero,0x3 /* f00ee78: 00cfc021 */ addu $t8,$a2,$t7 /* f00ee7c: ac600000 */ sw $zero,0x0($v1) diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index e14f5f112..2273f267d 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -16327,7 +16327,7 @@ u32 var8009d038 = 0; u32 var8009d03c = 0; u32 *g_LvSetupPtr_8009d040 = NULL; u32 var8009d044 = 0; -u32 var8009d048 = 0; +struct ailist *g_LvAilists = NULL; u32 var8009d04c = 0; u32 var8009d050 = 0; u32 var8009d054 = 0; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 666147353..d70209685 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -584,6 +584,7 @@ extern u32 var8009cf10; extern u32 var8009cf88; extern u32 var8009d030; extern u32 *g_LvSetupPtr_8009d040; +extern struct ailist *g_LvAilists; extern u32 var8009d050; extern u32 var8009d060; extern u32 var8009d088; diff --git a/src/include/library/library.h b/src/include/library/library.h index 0c8b64c80..e7b90a9a8 100644 --- a/src/include/library/library.h +++ b/src/include/library/library.h @@ -2,7 +2,7 @@ #define _IN_LIBRARY_H #include -u8 *ailistFindById(u32 ailistid); +u8 *ailistFindById(s32 ailistid); s32 getCurrentStageId(void); diff --git a/src/include/setup/ailists.h b/src/include/setup/ailists.h index eed4a62cd..c28a652a1 100644 --- a/src/include/setup/ailists.h +++ b/src/include/setup/ailists.h @@ -1,6 +1,7 @@ #ifndef IN_SETUP_AILISTS_H #define IN_SETUP_AILISTS_H #include -extern struct ailists functions[]; + +extern struct ailist g_GlobalAilists[]; #endif diff --git a/src/include/setup/setup_000000.h b/src/include/setup/setup_000000.h index 41307c391..e2c3625ff 100644 --- a/src/include/setup/setup_000000.h +++ b/src/include/setup/setup_000000.h @@ -118,8 +118,8 @@ extern u32 var8005eee4; extern u32 var8005eee8; extern u32 var8005ef08; extern u32 var8005ef10; -extern u32 var8005ef30; -extern u32 var8005ef34; +extern s32 g_NumGlobalAilists; +extern s32 g_NumLvAilists; extern u32 var8005ef40; extern u32 var8005ef5c; extern u32 var8005ef7c; diff --git a/src/include/types.h b/src/include/types.h index 090fb2023..8ffc4ba47 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -757,7 +757,7 @@ struct player { /*0x480*/ u32 unk480; }; -struct ailists { +struct ailist { u8 *list; u32 id; }; diff --git a/src/library/library.c b/src/library/library.c index 0bd57cb37..efe7d9224 100644 --- a/src/library/library.c +++ b/src/library/library.c @@ -3,6 +3,7 @@ #include "gvars/gvars.h" #include "library/library.h" #include "setup/setup_000000.h" +#include "setup/ailists.h" #include "types.h" u32 var00052430 = 0x70002d68; @@ -31220,10 +31221,10 @@ glabel ailistFindById /* 18554: 00001025 */ or $v0,$zero,$zero .L00018558: /* 18558: 8ca5ef30 */ lw $a1,-0x10d0($a1) -/* 1855c: 3c098008 */ lui $t1,%hi(functions) +/* 1855c: 3c098008 */ lui $t1,%hi(g_GlobalAilists) /* 18560: 00001825 */ or $v1,$zero,$zero /* 18564: 04a00017 */ bltz $a1,.L000185c4 -/* 18568: 2529ac58 */ addiu $t1,$t1,%lo(functions) +/* 18568: 2529ac58 */ addiu $t1,$t1,%lo(g_GlobalAilists) /* 1856c: 00653821 */ addu $a3,$v1,$a1 .L00018570: /* 18570: 04e10003 */ bgez $a3,.L00018580 diff --git a/src/setup/ailists.c b/src/setup/ailists.c index 1bcc42408..c81552feb 100644 --- a/src/setup/ailists.c +++ b/src/setup/ailists.c @@ -5444,7 +5444,7 @@ u8 func002a_ai_bot_alive[] = { }; // 20c78 -struct ailists functions[] = { +struct ailist g_GlobalAilists[] = { { func0000_idle, 0x0000 }, { func0001_unalerted_0001, 0x0001 }, { func0004_unalerted_0004, 0x0004 }, diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 668b3ce5c..fccbe4e67 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -4561,8 +4561,8 @@ u32 var8005ef20 = 0xfe000000; u32 var8005ef24 = 0x00000000; u32 var8005ef28 = 0x00000000; u32 var8005ef2c = 0x00000000; -u32 var8005ef30 = 0x00000000; -u32 var8005ef34 = 0x00000000; +s32 g_NumGlobalAilists = 0; +s32 g_NumLvAilists = 0; u32 var8005ef38 = 0x00000000; u32 var8005ef3c = 0x00000000; u32 var8005ef40 = 0x00040800;