From e62cac4ddcb7e6200d9447963d84007e3e50a8fa Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 17 Dec 2019 18:47:29 +1000 Subject: [PATCH] Decompile chraiGetListIdByList --- src/files/setup/mp_setupame.c | 2 +- src/files/setup/mp_setuparch.c | 2 +- src/files/setup/mp_setuparec.c | 2 +- src/files/setup/mp_setupark.c | 2 +- src/files/setup/mp_setupash.c | 2 +- src/files/setup/mp_setupate.c | 2 +- src/files/setup/mp_setupazt.c | 2 +- src/files/setup/mp_setupcat.c | 2 +- src/files/setup/mp_setupcave.c | 2 +- src/files/setup/mp_setupcrad.c | 2 +- src/files/setup/mp_setupcryp.c | 2 +- src/files/setup/mp_setupdam.c | 2 +- src/files/setup/mp_setupdepo.c | 2 +- src/files/setup/mp_setupdest.c | 2 +- src/files/setup/mp_setupdish.c | 2 +- src/files/setup/mp_setupear.c | 2 +- src/files/setup/mp_setupeld.c | 2 +- src/files/setup/mp_setupimp.c | 2 +- src/files/setup/mp_setupjun.c | 2 +- src/files/setup/mp_setuplam.c | 2 +- src/files/setup/mp_setuplee.c | 2 +- src/files/setup/mp_setuplen.c | 2 +- src/files/setup/mp_setuplip.c | 2 +- src/files/setup/mp_setuplue.c | 2 +- src/files/setup/mp_setupmp1.c | 2 +- src/files/setup/mp_setupmp10.c | 2 +- src/files/setup/mp_setupmp11.c | 2 +- src/files/setup/mp_setupmp12.c | 2 +- src/files/setup/mp_setupmp13.c | 2 +- src/files/setup/mp_setupmp14.c | 2 +- src/files/setup/mp_setupmp15.c | 2 +- src/files/setup/mp_setupmp16.c | 2 +- src/files/setup/mp_setupmp17.c | 2 +- src/files/setup/mp_setupmp18.c | 2 +- src/files/setup/mp_setupmp19.c | 2 +- src/files/setup/mp_setupmp2.c | 2 +- src/files/setup/mp_setupmp20.c | 2 +- src/files/setup/mp_setupmp3.c | 2 +- src/files/setup/mp_setupmp4.c | 2 +- src/files/setup/mp_setupmp5.c | 2 +- src/files/setup/mp_setupmp6.c | 2 +- src/files/setup/mp_setupmp7.c | 2 +- src/files/setup/mp_setupmp8.c | 2 +- src/files/setup/mp_setupmp9.c | 2 +- src/files/setup/mp_setupoat.c | 2 +- src/files/setup/mp_setupold.c | 2 +- src/files/setup/mp_setuppam.c | 2 +- src/files/setup/mp_setuppete.c | 2 +- src/files/setup/mp_setupref.c | 2 +- src/files/setup/mp_setuprit.c | 2 +- src/files/setup/mp_setuprun.c | 2 +- src/files/setup/mp_setupsev.c | 2 +- src/files/setup/mp_setupsevb.c | 2 +- src/files/setup/mp_setupsevx.c | 2 +- src/files/setup/mp_setupsho.c | 2 +- src/files/setup/mp_setupsilo.c | 2 +- src/files/setup/mp_setupstat.c | 2 +- src/files/setup/mp_setuptra.c | 2 +- src/files/setup/mp_setupuff.c | 2 +- src/files/setup/mp_setupwax.c | 2 +- src/files/setup/setupame.c | 2 +- src/files/setup/setuparch.c | 2 +- src/files/setup/setuparec.c | 2 +- src/files/setup/setupark.c | 2 +- src/files/setup/setupash.c | 2 +- src/files/setup/setupate.c | 2 +- src/files/setup/setupazt.c | 2 +- src/files/setup/setupcat.c | 2 +- src/files/setup/setupcave.c | 2 +- src/files/setup/setupcrad.c | 2 +- src/files/setup/setupcryp.c | 2 +- src/files/setup/setupdam.c | 2 +- src/files/setup/setupdepo.c | 2 +- src/files/setup/setupdest.c | 2 +- src/files/setup/setupdish.c | 2 +- src/files/setup/setupear.c | 2 +- src/files/setup/setupeld.c | 2 +- src/files/setup/setupimp.c | 2 +- src/files/setup/setupjun.c | 2 +- src/files/setup/setuplam.c | 2 +- src/files/setup/setuplee.c | 2 +- src/files/setup/setuplen.c | 2 +- src/files/setup/setuplip.c | 2 +- src/files/setup/setuplue.c | 2 +- src/files/setup/setupmp1.c | 2 +- src/files/setup/setupmp10.c | 2 +- src/files/setup/setupmp11.c | 2 +- src/files/setup/setupmp12.c | 2 +- src/files/setup/setupmp13.c | 2 +- src/files/setup/setupmp14.c | 2 +- src/files/setup/setupmp15.c | 2 +- src/files/setup/setupmp16.c | 2 +- src/files/setup/setupmp17.c | 2 +- src/files/setup/setupmp18.c | 2 +- src/files/setup/setupmp19.c | 2 +- src/files/setup/setupmp2.c | 2 +- src/files/setup/setupmp20.c | 2 +- src/files/setup/setupmp3.c | 2 +- src/files/setup/setupmp4.c | 2 +- src/files/setup/setupmp5.c | 2 +- src/files/setup/setupmp6.c | 2 +- src/files/setup/setupmp7.c | 2 +- src/files/setup/setupmp8.c | 2 +- src/files/setup/setupmp9.c | 2 +- src/files/setup/setupoat.c | 2 +- src/files/setup/setupold.c | 2 +- src/files/setup/setuppam.c | 2 +- src/files/setup/setuppete.c | 2 +- src/files/setup/setupref.c | 2 +- src/files/setup/setuprit.c | 2 +- src/files/setup/setuprun.c | 2 +- src/files/setup/setupsev.c | 2 +- src/files/setup/setupsevb.c | 2 +- src/files/setup/setupsevx.c | 2 +- src/files/setup/setupsevxb.c | 2 +- src/files/setup/setupsho.c | 2 +- src/files/setup/setupsilo.c | 2 +- src/files/setup/setupstat.c | 2 +- src/files/setup/setuptra.c | 2 +- src/files/setup/setupuff.c | 2 +- src/files/setup/setupwax.c | 2 +- src/game/chr/chr.c | 4 +- src/game/chr/chrai.c | 75 +++++++++++----------------------- src/game/chr/chraicommands.c | 5 ++- src/game/game_00b820.c | 8 ++-- src/game/game_00c490.c | 12 +++--- src/game/game_0125a0.c | 4 +- src/game/game_015010.c | 2 +- src/game/game_066310.c | 4 +- src/game/game_114240.c | 20 ++++----- src/gvars/gvars.c | 9 +--- src/include/game/chr/chrai.h | 2 +- src/include/gvars/gvars.h | 4 +- src/include/types.h | 11 +++++ 134 files changed, 188 insertions(+), 214 deletions(-) diff --git a/src/files/setup/mp_setupame.c b/src/files/setup/mp_setupame.c index e7be7d853..a8791c33d 100644 --- a/src/files/setup/mp_setupame.c +++ b/src/files/setup/mp_setupame.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setuparch.c b/src/files/setup/mp_setuparch.c index 429ff9093..74ff148ac 100644 --- a/src/files/setup/mp_setuparch.c +++ b/src/files/setup/mp_setuparch.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setuparec.c b/src/files/setup/mp_setuparec.c index b0ef0c91b..b41114a23 100644 --- a/src/files/setup/mp_setuparec.c +++ b/src/files/setup/mp_setuparec.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupark.c b/src/files/setup/mp_setupark.c index c9f86d7e7..4e5a805b6 100644 --- a/src/files/setup/mp_setupark.c +++ b/src/files/setup/mp_setupark.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupash.c b/src/files/setup/mp_setupash.c index 6509674b9..257674d66 100644 --- a/src/files/setup/mp_setupash.c +++ b/src/files/setup/mp_setupash.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupate.c b/src/files/setup/mp_setupate.c index 52cee5aa7..cf22d532c 100644 --- a/src/files/setup/mp_setupate.c +++ b/src/files/setup/mp_setupate.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupazt.c b/src/files/setup/mp_setupazt.c index 3effda9c7..3e63a608a 100644 --- a/src/files/setup/mp_setupazt.c +++ b/src/files/setup/mp_setupazt.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupcat.c b/src/files/setup/mp_setupcat.c index 8aae01ed2..b7b025b50 100644 --- a/src/files/setup/mp_setupcat.c +++ b/src/files/setup/mp_setupcat.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupcave.c b/src/files/setup/mp_setupcave.c index 696d0c928..ef61b8856 100644 --- a/src/files/setup/mp_setupcave.c +++ b/src/files/setup/mp_setupcave.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupcrad.c b/src/files/setup/mp_setupcrad.c index e1439cbe0..f5f0d92a1 100644 --- a/src/files/setup/mp_setupcrad.c +++ b/src/files/setup/mp_setupcrad.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupcryp.c b/src/files/setup/mp_setupcryp.c index 1426910fe..f5efc898b 100644 --- a/src/files/setup/mp_setupcryp.c +++ b/src/files/setup/mp_setupcryp.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupdam.c b/src/files/setup/mp_setupdam.c index e595a81b7..457774e48 100644 --- a/src/files/setup/mp_setupdam.c +++ b/src/files/setup/mp_setupdam.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupdepo.c b/src/files/setup/mp_setupdepo.c index cabe41426..ce022cb4d 100644 --- a/src/files/setup/mp_setupdepo.c +++ b/src/files/setup/mp_setupdepo.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupdest.c b/src/files/setup/mp_setupdest.c index 2d933d3c4..fa9f92515 100644 --- a/src/files/setup/mp_setupdest.c +++ b/src/files/setup/mp_setupdest.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupdish.c b/src/files/setup/mp_setupdish.c index 03eccf635..012b7994d 100644 --- a/src/files/setup/mp_setupdish.c +++ b/src/files/setup/mp_setupdish.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupear.c b/src/files/setup/mp_setupear.c index 06c352af4..7ad058f66 100644 --- a/src/files/setup/mp_setupear.c +++ b/src/files/setup/mp_setupear.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupeld.c b/src/files/setup/mp_setupeld.c index 1550077a4..bff5c7b51 100644 --- a/src/files/setup/mp_setupeld.c +++ b/src/files/setup/mp_setupeld.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupimp.c b/src/files/setup/mp_setupimp.c index 09657a0c6..f931c2777 100644 --- a/src/files/setup/mp_setupimp.c +++ b/src/files/setup/mp_setupimp.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupjun.c b/src/files/setup/mp_setupjun.c index fde77c22f..6f052eebe 100644 --- a/src/files/setup/mp_setupjun.c +++ b/src/files/setup/mp_setupjun.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setuplam.c b/src/files/setup/mp_setuplam.c index dc373f1da..3d1273d22 100644 --- a/src/files/setup/mp_setuplam.c +++ b/src/files/setup/mp_setuplam.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setuplee.c b/src/files/setup/mp_setuplee.c index 3eeda450d..7a879799a 100644 --- a/src/files/setup/mp_setuplee.c +++ b/src/files/setup/mp_setuplee.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setuplen.c b/src/files/setup/mp_setuplen.c index 12c2a51a8..b8f61cb6b 100644 --- a/src/files/setup/mp_setuplen.c +++ b/src/files/setup/mp_setuplen.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setuplip.c b/src/files/setup/mp_setuplip.c index e668afc13..91b082c4a 100644 --- a/src/files/setup/mp_setuplip.c +++ b/src/files/setup/mp_setuplip.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setuplue.c b/src/files/setup/mp_setuplue.c index 8c9f27a8b..4e87569f0 100644 --- a/src/files/setup/mp_setuplue.c +++ b/src/files/setup/mp_setuplue.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp1.c b/src/files/setup/mp_setupmp1.c index 38f78cf55..7deb2c072 100644 --- a/src/files/setup/mp_setupmp1.c +++ b/src/files/setup/mp_setupmp1.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp10.c b/src/files/setup/mp_setupmp10.c index 2ae65a8c6..60b6afe6c 100644 --- a/src/files/setup/mp_setupmp10.c +++ b/src/files/setup/mp_setupmp10.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp11.c b/src/files/setup/mp_setupmp11.c index 05940dff3..fab7851fe 100644 --- a/src/files/setup/mp_setupmp11.c +++ b/src/files/setup/mp_setupmp11.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp12.c b/src/files/setup/mp_setupmp12.c index 411f9fb5c..8116fe891 100644 --- a/src/files/setup/mp_setupmp12.c +++ b/src/files/setup/mp_setupmp12.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp13.c b/src/files/setup/mp_setupmp13.c index d39616353..8a3b4d134 100644 --- a/src/files/setup/mp_setupmp13.c +++ b/src/files/setup/mp_setupmp13.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp14.c b/src/files/setup/mp_setupmp14.c index ae3710b20..9422052e7 100644 --- a/src/files/setup/mp_setupmp14.c +++ b/src/files/setup/mp_setupmp14.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp15.c b/src/files/setup/mp_setupmp15.c index 3210dc059..5a87a9527 100644 --- a/src/files/setup/mp_setupmp15.c +++ b/src/files/setup/mp_setupmp15.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp16.c b/src/files/setup/mp_setupmp16.c index edc2a35b3..cf68ae397 100644 --- a/src/files/setup/mp_setupmp16.c +++ b/src/files/setup/mp_setupmp16.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp17.c b/src/files/setup/mp_setupmp17.c index 1e55f30d4..66d01de5d 100644 --- a/src/files/setup/mp_setupmp17.c +++ b/src/files/setup/mp_setupmp17.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp18.c b/src/files/setup/mp_setupmp18.c index 5fa630bf8..3548a00e1 100644 --- a/src/files/setup/mp_setupmp18.c +++ b/src/files/setup/mp_setupmp18.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp19.c b/src/files/setup/mp_setupmp19.c index 0453649d0..b40caffbc 100644 --- a/src/files/setup/mp_setupmp19.c +++ b/src/files/setup/mp_setupmp19.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp2.c b/src/files/setup/mp_setupmp2.c index 703cdbc28..23e889845 100644 --- a/src/files/setup/mp_setupmp2.c +++ b/src/files/setup/mp_setupmp2.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp20.c b/src/files/setup/mp_setupmp20.c index 622b469ea..fa56772b7 100644 --- a/src/files/setup/mp_setupmp20.c +++ b/src/files/setup/mp_setupmp20.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp3.c b/src/files/setup/mp_setupmp3.c index e0d725578..dbf1dcf2a 100644 --- a/src/files/setup/mp_setupmp3.c +++ b/src/files/setup/mp_setupmp3.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp4.c b/src/files/setup/mp_setupmp4.c index e76a1df98..d924d92a2 100644 --- a/src/files/setup/mp_setupmp4.c +++ b/src/files/setup/mp_setupmp4.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp5.c b/src/files/setup/mp_setupmp5.c index f3df29093..1bfb0775d 100644 --- a/src/files/setup/mp_setupmp5.c +++ b/src/files/setup/mp_setupmp5.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp6.c b/src/files/setup/mp_setupmp6.c index 1ca06390d..5c472846b 100644 --- a/src/files/setup/mp_setupmp6.c +++ b/src/files/setup/mp_setupmp6.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp7.c b/src/files/setup/mp_setupmp7.c index 592431679..6be7359d7 100644 --- a/src/files/setup/mp_setupmp7.c +++ b/src/files/setup/mp_setupmp7.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp8.c b/src/files/setup/mp_setupmp8.c index 98e0dd40d..0ed3087ec 100644 --- a/src/files/setup/mp_setupmp8.c +++ b/src/files/setup/mp_setupmp8.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupmp9.c b/src/files/setup/mp_setupmp9.c index 4289cf0b0..59dc61107 100644 --- a/src/files/setup/mp_setupmp9.c +++ b/src/files/setup/mp_setupmp9.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupoat.c b/src/files/setup/mp_setupoat.c index 6d76814c0..a33d83f0d 100644 --- a/src/files/setup/mp_setupoat.c +++ b/src/files/setup/mp_setupoat.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupold.c b/src/files/setup/mp_setupold.c index f33c62cab..8dcef0c76 100644 --- a/src/files/setup/mp_setupold.c +++ b/src/files/setup/mp_setupold.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setuppam.c b/src/files/setup/mp_setuppam.c index 2171f89b0..1bcc4610e 100644 --- a/src/files/setup/mp_setuppam.c +++ b/src/files/setup/mp_setuppam.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setuppete.c b/src/files/setup/mp_setuppete.c index 12f95022b..f90a06d32 100644 --- a/src/files/setup/mp_setuppete.c +++ b/src/files/setup/mp_setuppete.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupref.c b/src/files/setup/mp_setupref.c index 61841ae16..c5837c211 100644 --- a/src/files/setup/mp_setupref.c +++ b/src/files/setup/mp_setupref.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setuprit.c b/src/files/setup/mp_setuprit.c index 1a7278009..2aa7aefd4 100644 --- a/src/files/setup/mp_setuprit.c +++ b/src/files/setup/mp_setuprit.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setuprun.c b/src/files/setup/mp_setuprun.c index 70698e073..d00b20048 100644 --- a/src/files/setup/mp_setuprun.c +++ b/src/files/setup/mp_setuprun.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupsev.c b/src/files/setup/mp_setupsev.c index c95bcc78e..ba8d4dcc3 100644 --- a/src/files/setup/mp_setupsev.c +++ b/src/files/setup/mp_setupsev.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupsevb.c b/src/files/setup/mp_setupsevb.c index 7126f9ea3..1fdb823fd 100644 --- a/src/files/setup/mp_setupsevb.c +++ b/src/files/setup/mp_setupsevb.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupsevx.c b/src/files/setup/mp_setupsevx.c index b3b0bf4b3..f9396d6c0 100644 --- a/src/files/setup/mp_setupsevx.c +++ b/src/files/setup/mp_setupsevx.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupsho.c b/src/files/setup/mp_setupsho.c index f6026a3af..7aa718f83 100644 --- a/src/files/setup/mp_setupsho.c +++ b/src/files/setup/mp_setupsho.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupsilo.c b/src/files/setup/mp_setupsilo.c index 8557cab30..b8c550ecf 100644 --- a/src/files/setup/mp_setupsilo.c +++ b/src/files/setup/mp_setupsilo.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupstat.c b/src/files/setup/mp_setupstat.c index e886d514d..5ebeec02c 100644 --- a/src/files/setup/mp_setupstat.c +++ b/src/files/setup/mp_setupstat.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setuptra.c b/src/files/setup/mp_setuptra.c index 1ce8d28b1..da4b557a3 100644 --- a/src/files/setup/mp_setuptra.c +++ b/src/files/setup/mp_setuptra.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupuff.c b/src/files/setup/mp_setupuff.c index 395db5a7b..f6fcd6f31 100644 --- a/src/files/setup/mp_setupuff.c +++ b/src/files/setup/mp_setupuff.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/mp_setupwax.c b/src/files/setup/mp_setupwax.c index cc0566b84..a64e1279f 100644 --- a/src/files/setup/mp_setupwax.c +++ b/src/files/setup/mp_setupwax.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupame.c b/src/files/setup/setupame.c index 44dea8733..ef0a884cc 100644 --- a/src/files/setup/setupame.c +++ b/src/files/setup/setupame.c @@ -138,7 +138,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setuparch.c b/src/files/setup/setuparch.c index b1e33e075..c6c9f37b3 100644 --- a/src/files/setup/setuparch.c +++ b/src/files/setup/setuparch.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setuparec.c b/src/files/setup/setuparec.c index 8c8a7c2f5..3b73f1683 100644 --- a/src/files/setup/setuparec.c +++ b/src/files/setup/setuparec.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupark.c b/src/files/setup/setupark.c index 2483df177..2737f3c5a 100644 --- a/src/files/setup/setupark.c +++ b/src/files/setup/setupark.c @@ -82,7 +82,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupash.c b/src/files/setup/setupash.c index 6509674b9..257674d66 100644 --- a/src/files/setup/setupash.c +++ b/src/files/setup/setupash.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupate.c b/src/files/setup/setupate.c index d77679aa3..3f9588fd1 100644 --- a/src/files/setup/setupate.c +++ b/src/files/setup/setupate.c @@ -30,7 +30,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupazt.c b/src/files/setup/setupazt.c index b03d02922..d10478382 100644 --- a/src/files/setup/setupazt.c +++ b/src/files/setup/setupazt.c @@ -62,7 +62,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupcat.c b/src/files/setup/setupcat.c index 8aae01ed2..b7b025b50 100644 --- a/src/files/setup/setupcat.c +++ b/src/files/setup/setupcat.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupcave.c b/src/files/setup/setupcave.c index b6c853dbe..0c46efbb5 100644 --- a/src/files/setup/setupcave.c +++ b/src/files/setup/setupcave.c @@ -83,7 +83,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupcrad.c b/src/files/setup/setupcrad.c index bab555cb4..cf3a740ee 100644 --- a/src/files/setup/setupcrad.c +++ b/src/files/setup/setupcrad.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupcryp.c b/src/files/setup/setupcryp.c index 3e0e0ee13..16e638cd2 100644 --- a/src/files/setup/setupcryp.c +++ b/src/files/setup/setupcryp.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupdam.c b/src/files/setup/setupdam.c index f0d6d3e10..d100485bb 100644 --- a/src/files/setup/setupdam.c +++ b/src/files/setup/setupdam.c @@ -91,7 +91,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupdepo.c b/src/files/setup/setupdepo.c index fe625f195..1b4a44353 100644 --- a/src/files/setup/setupdepo.c +++ b/src/files/setup/setupdepo.c @@ -103,7 +103,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupdest.c b/src/files/setup/setupdest.c index 8c9a3ca28..0f6aaee24 100644 --- a/src/files/setup/setupdest.c +++ b/src/files/setup/setupdest.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupdish.c b/src/files/setup/setupdish.c index b45ee9429..c4e90deda 100644 --- a/src/files/setup/setupdish.c +++ b/src/files/setup/setupdish.c @@ -99,7 +99,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupear.c b/src/files/setup/setupear.c index 3b98de21c..4916fddb8 100644 --- a/src/files/setup/setupear.c +++ b/src/files/setup/setupear.c @@ -94,7 +94,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupeld.c b/src/files/setup/setupeld.c index 35dcc2aa9..5bc37b500 100644 --- a/src/files/setup/setupeld.c +++ b/src/files/setup/setupeld.c @@ -90,7 +90,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupimp.c b/src/files/setup/setupimp.c index 99ad449e8..10dcd594d 100644 --- a/src/files/setup/setupimp.c +++ b/src/files/setup/setupimp.c @@ -146,7 +146,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupjun.c b/src/files/setup/setupjun.c index 97ef3c19d..f0190bf7b 100644 --- a/src/files/setup/setupjun.c +++ b/src/files/setup/setupjun.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setuplam.c b/src/files/setup/setuplam.c index dc373f1da..3d1273d22 100644 --- a/src/files/setup/setuplam.c +++ b/src/files/setup/setuplam.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setuplee.c b/src/files/setup/setuplee.c index f6ccc24ff..0a8e8115a 100644 --- a/src/files/setup/setuplee.c +++ b/src/files/setup/setuplee.c @@ -112,7 +112,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setuplen.c b/src/files/setup/setuplen.c index 626f121ec..bcddc780d 100644 --- a/src/files/setup/setuplen.c +++ b/src/files/setup/setuplen.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setuplip.c b/src/files/setup/setuplip.c index 42bb8d0a4..7120dd430 100644 --- a/src/files/setup/setuplip.c +++ b/src/files/setup/setuplip.c @@ -121,7 +121,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setuplue.c b/src/files/setup/setuplue.c index 358daa3ae..2013ab16e 100644 --- a/src/files/setup/setuplue.c +++ b/src/files/setup/setuplue.c @@ -81,7 +81,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp1.c b/src/files/setup/setupmp1.c index 8391754df..39930a205 100644 --- a/src/files/setup/setupmp1.c +++ b/src/files/setup/setupmp1.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp10.c b/src/files/setup/setupmp10.c index 33864b415..145d9d56e 100644 --- a/src/files/setup/setupmp10.c +++ b/src/files/setup/setupmp10.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp11.c b/src/files/setup/setupmp11.c index 8ddda399d..e20832c5e 100644 --- a/src/files/setup/setupmp11.c +++ b/src/files/setup/setupmp11.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp12.c b/src/files/setup/setupmp12.c index 07625fd7b..255c0e6ca 100644 --- a/src/files/setup/setupmp12.c +++ b/src/files/setup/setupmp12.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp13.c b/src/files/setup/setupmp13.c index fece5abf4..fb5ead8ea 100644 --- a/src/files/setup/setupmp13.c +++ b/src/files/setup/setupmp13.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp14.c b/src/files/setup/setupmp14.c index 76d0b408e..35094ff66 100644 --- a/src/files/setup/setupmp14.c +++ b/src/files/setup/setupmp14.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp15.c b/src/files/setup/setupmp15.c index d4118ec84..7fa512d5e 100644 --- a/src/files/setup/setupmp15.c +++ b/src/files/setup/setupmp15.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp16.c b/src/files/setup/setupmp16.c index 250c6b8d3..a7a79cc54 100644 --- a/src/files/setup/setupmp16.c +++ b/src/files/setup/setupmp16.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp17.c b/src/files/setup/setupmp17.c index 4463943ad..ee2aabc2a 100644 --- a/src/files/setup/setupmp17.c +++ b/src/files/setup/setupmp17.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp18.c b/src/files/setup/setupmp18.c index f309a7d44..8eb14c194 100644 --- a/src/files/setup/setupmp18.c +++ b/src/files/setup/setupmp18.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp19.c b/src/files/setup/setupmp19.c index 03bacb07c..f0c1c3803 100644 --- a/src/files/setup/setupmp19.c +++ b/src/files/setup/setupmp19.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp2.c b/src/files/setup/setupmp2.c index 75e9b87b2..6938c2375 100644 --- a/src/files/setup/setupmp2.c +++ b/src/files/setup/setupmp2.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp20.c b/src/files/setup/setupmp20.c index 979426ba3..6ca2b3fc2 100644 --- a/src/files/setup/setupmp20.c +++ b/src/files/setup/setupmp20.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp3.c b/src/files/setup/setupmp3.c index 9146a0552..d8a16f893 100644 --- a/src/files/setup/setupmp3.c +++ b/src/files/setup/setupmp3.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp4.c b/src/files/setup/setupmp4.c index 3a6f29363..973a177e9 100644 --- a/src/files/setup/setupmp4.c +++ b/src/files/setup/setupmp4.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp5.c b/src/files/setup/setupmp5.c index 126d41019..4e98fdec0 100644 --- a/src/files/setup/setupmp5.c +++ b/src/files/setup/setupmp5.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp6.c b/src/files/setup/setupmp6.c index 2e8980541..f5bdf9a4b 100644 --- a/src/files/setup/setupmp6.c +++ b/src/files/setup/setupmp6.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp7.c b/src/files/setup/setupmp7.c index 5f9d1395d..e48c771d9 100644 --- a/src/files/setup/setupmp7.c +++ b/src/files/setup/setupmp7.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp8.c b/src/files/setup/setupmp8.c index dc8b22a5d..1e7d339c6 100644 --- a/src/files/setup/setupmp8.c +++ b/src/files/setup/setupmp8.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupmp9.c b/src/files/setup/setupmp9.c index 1910fb18a..0e399674a 100644 --- a/src/files/setup/setupmp9.c +++ b/src/files/setup/setupmp9.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupoat.c b/src/files/setup/setupoat.c index c314b456f..6139f83c7 100644 --- a/src/files/setup/setupoat.c +++ b/src/files/setup/setupoat.c @@ -13,7 +13,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupold.c b/src/files/setup/setupold.c index aaad4d022..99598039a 100644 --- a/src/files/setup/setupold.c +++ b/src/files/setup/setupold.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setuppam.c b/src/files/setup/setuppam.c index f5368023f..4ccc65c15 100644 --- a/src/files/setup/setuppam.c +++ b/src/files/setup/setuppam.c @@ -100,7 +100,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setuppete.c b/src/files/setup/setuppete.c index 12aba24b8..8220a5dc1 100644 --- a/src/files/setup/setuppete.c +++ b/src/files/setup/setuppete.c @@ -98,7 +98,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupref.c b/src/files/setup/setupref.c index 4e3cbfc03..8a4fbd5c0 100644 --- a/src/files/setup/setupref.c +++ b/src/files/setup/setupref.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setuprit.c b/src/files/setup/setuprit.c index a7b434643..9dc5de636 100644 --- a/src/files/setup/setuprit.c +++ b/src/files/setup/setuprit.c @@ -118,7 +118,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setuprun.c b/src/files/setup/setuprun.c index 1c6f162aa..ea1c115bc 100644 --- a/src/files/setup/setuprun.c +++ b/src/files/setup/setuprun.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupsev.c b/src/files/setup/setupsev.c index 3c0ece994..899c0810e 100644 --- a/src/files/setup/setupsev.c +++ b/src/files/setup/setupsev.c @@ -45,7 +45,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupsevb.c b/src/files/setup/setupsevb.c index 7126f9ea3..1fdb823fd 100644 --- a/src/files/setup/setupsevb.c +++ b/src/files/setup/setupsevb.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupsevx.c b/src/files/setup/setupsevx.c index ce49aa7ba..6a9f75e2e 100644 --- a/src/files/setup/setupsevx.c +++ b/src/files/setup/setupsevx.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupsevxb.c b/src/files/setup/setupsevxb.c index a9f59ac00..9773a3a28 100644 --- a/src/files/setup/setupsevxb.c +++ b/src/files/setup/setupsevxb.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupsho.c b/src/files/setup/setupsho.c index 2e76c2b1b..3607381f3 100644 --- a/src/files/setup/setupsho.c +++ b/src/files/setup/setupsho.c @@ -106,7 +106,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupsilo.c b/src/files/setup/setupsilo.c index 8557cab30..b8c550ecf 100644 --- a/src/files/setup/setupsilo.c +++ b/src/files/setup/setupsilo.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupstat.c b/src/files/setup/setupstat.c index d7fa32d4d..65acfd3a4 100644 --- a/src/files/setup/setupstat.c +++ b/src/files/setup/setupstat.c @@ -59,7 +59,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setuptra.c b/src/files/setup/setuptra.c index e151be536..a830747c7 100644 --- a/src/files/setup/setuptra.c +++ b/src/files/setup/setuptra.c @@ -97,7 +97,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupuff.c b/src/files/setup/setupuff.c index 89d377ea7..2551ec99e 100644 --- a/src/files/setup/setupuff.c +++ b/src/files/setup/setupuff.c @@ -9,7 +9,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/files/setup/setupwax.c b/src/files/setup/setupwax.c index 99f3010fd..9d1e8ea5d 100644 --- a/src/files/setup/setupwax.c +++ b/src/files/setup/setupwax.c @@ -48,7 +48,7 @@ u8 props[]; struct aipaths paths[]; struct ailist ailists[]; -void *setup[] = { +struct stagesetup setup = { NULL, NULL, NULL, diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index b94f565bf..9b8aa2694 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -50867,8 +50867,8 @@ glabel func0f04a37c /* f04a448: 8e620000 */ lw $v0,0x0($s3) /* f04a44c: 8e6e0004 */ lw $t6,0x4($s3) .L0f04a450: -/* f04a450: 3c12800a */ lui $s2,%hi(var8009d030) -/* f04a454: 2652d030 */ addiu $s2,$s2,%lo(var8009d030) +/* f04a450: 3c12800a */ lui $s2,%hi(g_StageSetup) +/* f04a454: 2652d030 */ addiu $s2,$s2,%lo(g_StageSetup) /* f04a458: 8dd00000 */ lw $s0,0x0($t6) /* f04a45c: 00008825 */ or $s1,$zero,$zero /* f04a460: 06000018 */ bltz $s0,.L0f04a4c4 diff --git a/src/game/chr/chrai.c b/src/game/chr/chrai.c index ab61802d1..b6b59f0d1 100644 --- a/src/game/chr/chrai.c +++ b/src/game/chr/chrai.c @@ -1,6 +1,7 @@ #include #include "constants.h" #include "gvars/gvars.h" +#include "setup/ailists.h" #include "setup/setup_000000.h" #include "setup/setup_0160b0.h" #include "setup/setup_020df0.h" @@ -9,58 +10,28 @@ #include "library/library_12dc0.h" #include "library/library_16110.h" -GLOBAL_ASM( -glabel chraiEndList -/* f04d560: 3c08800a */ lui $t0,%hi(var8009d030) -/* f04d564: 2508d030 */ addiu $t0,$t0,%lo(var8009d030) -/* f04d568: 8d020018 */ lw $v0,0x18($t0) -/* f04d56c: 00a03825 */ or $a3,$a1,$zero -/* f04d570: 3c198008 */ lui $t9,0x8008 -/* f04d574: 10400013 */ beqz $v0,.L0f04d5c4 -/* f04d578: 00000000 */ sll $zero,$zero,0x0 -/* f04d57c: 8c4e0000 */ lw $t6,0x0($v0) -/* f04d580: 00001825 */ or $v1,$zero,$zero -/* f04d584: 00402825 */ or $a1,$v0,$zero -/* f04d588: 11c0000e */ beqz $t6,.L0f04d5c4 -/* f04d58c: 00000000 */ sll $zero,$zero,0x0 -/* f04d590: 8c460000 */ lw $a2,0x0($v0) -.L0f04d594: -/* f04d594: 54860007 */ bnel $a0,$a2,.L0f04d5b4 -/* f04d598: 8ca60008 */ lw $a2,0x8($a1) -/* f04d59c: ace00000 */ sw $zero,0x0($a3) -/* f04d5a0: 8d0f0018 */ lw $t7,0x18($t0) -/* f04d5a4: 01e3c021 */ addu $t8,$t7,$v1 -/* f04d5a8: 03e00008 */ jr $ra -/* f04d5ac: 8f020004 */ lw $v0,0x4($t8) -/* f04d5b0: 8ca60008 */ lw $a2,0x8($a1) -.L0f04d5b4: -/* f04d5b4: 24630008 */ addiu $v1,$v1,0x8 -/* f04d5b8: 24a50008 */ addiu $a1,$a1,0x8 -/* f04d5bc: 14c0fff5 */ bnez $a2,.L0f04d594 -/* f04d5c0: 00000000 */ sll $zero,$zero,0x0 -.L0f04d5c4: -/* f04d5c4: 8f39ac58 */ lw $t9,-0x53a8($t9) -/* f04d5c8: 3c098008 */ lui $t1,0x8008 -/* f04d5cc: 2523ac58 */ addiu $v1,$t1,-21416 -/* f04d5d0: 1320000b */ beqz $t9,.L0f04d600 -/* f04d5d4: 240a0001 */ addiu $t2,$zero,0x1 -/* f04d5d8: 8c620000 */ lw $v0,0x0($v1) -.L0f04d5dc: -/* f04d5dc: 54820005 */ bnel $a0,$v0,.L0f04d5f4 -/* f04d5e0: 8c620008 */ lw $v0,0x8($v1) -/* f04d5e4: acea0000 */ sw $t2,0x0($a3) -/* f04d5e8: 03e00008 */ jr $ra -/* f04d5ec: 8c620004 */ lw $v0,0x4($v1) -/* f04d5f0: 8c620008 */ lw $v0,0x8($v1) -.L0f04d5f4: -/* f04d5f4: 24630008 */ addiu $v1,$v1,0x8 -/* f04d5f8: 1440fff8 */ bnez $v0,.L0f04d5dc -/* f04d5fc: 00000000 */ sll $zero,$zero,0x0 -.L0f04d600: -/* f04d600: 2402ffff */ addiu $v0,$zero,-1 -/* f04d604: 03e00008 */ jr $ra -/* f04d608: 00000000 */ sll $zero,$zero,0x0 -); +s32 chraiGetListIdByList(u8 *ailist, bool *is_global) +{ + s32 i; + + if (g_StageSetup.ailists) { + for (i = 0; g_StageSetup.ailists[i].list != NULL; i++) { + if (g_StageSetup.ailists[i].list == ailist) { + *is_global = false; + return g_StageSetup.ailists[i].id; + } + } + } + + for (i = 0; g_GlobalAilists[i].list != NULL; i++) { + if (g_GlobalAilists[i].list == ailist) { + *is_global = true; + return g_GlobalAilists[i].id; + } + } + + return -1; +} u32 chraiGoToLabel(u8 *ailist, u32 aioffset, u8 label) { diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 4a5e28343..601f9701a 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -369,8 +369,9 @@ bool aiReturn(void) */ bool aiEndList(void) { - u64 unk; - chraiEndList(g_Vars.ailist, &unk); + s32 ailistid; + bool is_global; + ailistid = chraiGetListIdByList(g_Vars.ailist, &is_global); return true; } diff --git a/src/game/game_00b820.c b/src/game/game_00b820.c index 73d5a5717..0c23b2447 100644 --- a/src/game/game_00b820.c +++ b/src/game/game_00b820.c @@ -287,8 +287,8 @@ glabel func0f00bb70 GLOBAL_ASM( glabel func0f00bbc8 -/* f00bbc8: 3c0a800a */ lui $t2,%hi(var8009d030) -/* f00bbcc: 254ad030 */ addiu $t2,$t2,%lo(var8009d030) +/* f00bbc8: 3c0a800a */ lui $t2,%hi(g_StageSetup) +/* f00bbcc: 254ad030 */ addiu $t2,$t2,%lo(g_StageSetup) /* f00bbd0: 27bdf8f0 */ addiu $sp,$sp,-1808 /* f00bbd4: 8d450018 */ lw $a1,0x18($t2) /* f00bbd8: afb00018 */ sw $s0,0x18($sp) @@ -370,8 +370,8 @@ glabel func0f00bbc8 /* f00bcf8: 3b04000f */ xori $a0,$t8,0xf /* f00bcfc: 0c0048f2 */ jal func000123c8 /* f00bd00: 24050004 */ addiu $a1,$zero,0x4 -/* f00bd04: 3c0a800a */ lui $t2,%hi(var8009d030) -/* f00bd08: 254ad030 */ addiu $t2,$t2,%lo(var8009d030) +/* f00bd04: 3c0a800a */ lui $t2,%hi(g_StageSetup) +/* f00bd08: 254ad030 */ addiu $t2,$t2,%lo(g_StageSetup) /* f00bd0c: 8d450018 */ lw $a1,0x18($t2) /* f00bd10: ae020000 */ sw $v0,0x0($s0) /* f00bd14: 3c088006 */ lui $t0,%hi(var80067e58) diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 8efca1faf..6a80128cd 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -2965,7 +2965,7 @@ glabel func0f00eb64 /* f00ebbc: ac40fff8 */ sw $zero,-0x8($v0) /* f00ebc0: 28c1005a */ slti $at,$a2,0x5a /* f00ebc4: 1020014f */ beqz $at,.L0f00f104 -/* f00ebc8: 3c07800a */ lui $a3,%hi(var8009d030) +/* f00ebc8: 3c07800a */ lui $a3,%hi(g_StageSetup) /* f00ebcc: 3c0f800a */ lui $t7,0x800a /* f00ebd0: 8defa2d8 */ lw $t7,-0x5d28($t7) /* f00ebd4: 240c0004 */ addiu $t4,$zero,0x4 @@ -3004,8 +3004,8 @@ glabel func0f00eb64 /* f00ec50: 0fc5b9ca */ jal textSetBankSimple /* f00ec54: 00402025 */ or $a0,$v0,$zero /* f00ec58: 8fa90040 */ lw $t1,0x40($sp) -/* f00ec5c: 3c07800a */ lui $a3,%hi(var8009d030) -/* f00ec60: 24e7d030 */ addiu $a3,$a3,%lo(var8009d030) +/* f00ec5c: 3c07800a */ lui $a3,%hi(g_StageSetup) +/* f00ec60: 24e7d030 */ addiu $a3,$a3,%lo(g_StageSetup) /* f00ec64: 8d2d000c */ lw $t5,0xc($t1) /* f00ec68: 3c048008 */ lui $a0,0x8008 /* f00ec6c: 3c018006 */ lui $at,0x8006 @@ -3031,8 +3031,8 @@ glabel func0f00eb64 /* f00ecbc: 008f2021 */ addu $a0,$a0,$t7 /* f00ecc0: 0fc59c3f */ jal func0f1670fc /* f00ecc4: 9484fccc */ lhu $a0,-0x334($a0) -/* f00ecc8: 3c07800a */ lui $a3,%hi(var8009d030) -/* f00eccc: 24e7d030 */ addiu $a3,$a3,%lo(var8009d030) +/* f00ecc8: 3c07800a */ lui $a3,%hi(g_StageSetup) +/* f00eccc: 24e7d030 */ addiu $a3,$a3,%lo(g_StageSetup) /* f00ecd0: 8ce60018 */ lw $a2,0x18($a3) /* f00ecd4: ace2001c */ sw $v0,0x1c($a3) /* f00ecd8: 8fa90040 */ lw $t1,0x40($sp) @@ -3323,7 +3323,7 @@ glabel func0f00eb64 /* f00f0fc: 1000000c */ beqz $zero,.L0f00f130 /* f00f100: 00000000 */ sll $zero,$zero,0x0 .L0f00f104: -/* f00f104: 24e7d030 */ addiu $a3,$a3,%lo(var8009d030) +/* f00f104: 24e7d030 */ addiu $a3,$a3,%lo(g_StageSetup) /* f00f108: ace00000 */ sw $zero,0x0($a3) /* f00f10c: ace00004 */ sw $zero,0x4($a3) /* f00f110: ace0000c */ sw $zero,0xc($a3) diff --git a/src/game/game_0125a0.c b/src/game/game_0125a0.c index 5e3bbdcb3..39a8dc15f 100644 --- a/src/game/game_0125a0.c +++ b/src/game/game_0125a0.c @@ -352,8 +352,8 @@ GLOBAL_ASM( glabel func0f012aa0 /* f012aa0: 27bdfed0 */ addiu $sp,$sp,-304 /* f012aa4: afb5003c */ sw $s5,0x3c($sp) -/* f012aa8: 3c15800a */ lui $s5,%hi(var8009d030) -/* f012aac: 26b5d030 */ addiu $s5,$s5,%lo(var8009d030) +/* f012aa8: 3c15800a */ lui $s5,%hi(g_StageSetup) +/* f012aac: 26b5d030 */ addiu $s5,$s5,%lo(g_StageSetup) /* f012ab0: 8ea2001c */ lw $v0,0x1c($s5) /* f012ab4: 3c04800a */ lui $a0,%hi(var800a2350) /* f012ab8: 3c07800a */ lui $a3,%hi(var800a2354) diff --git a/src/game/game_015010.c b/src/game/game_015010.c index 0f49a5c28..f5536ce71 100644 --- a/src/game/game_015010.c +++ b/src/game/game_015010.c @@ -114,7 +114,7 @@ glabel setupParseObjects // Mismatch because it uses $s1 for OBJTYPE_END instead of $at. //void setupParseObjects(void) //{ -// u32 *ptr = g_LvSetupPtr_8009d040; +// u32 *ptr = g_StageSetup.props; // // if (ptr) { // u8 type = ptr[0]; diff --git a/src/game/game_066310.c b/src/game/game_066310.c index 10d8c5fe2..9d7cac06b 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -15234,8 +15234,8 @@ glabel func0f072144 GLOBAL_ASM( glabel func0f072650 -/* f072650: 3c09800a */ lui $t1,%hi(var8009d030) -/* f072654: 2529d030 */ addiu $t1,$t1,%lo(var8009d030) +/* f072650: 3c09800a */ lui $t1,%hi(g_StageSetup) +/* f072654: 2529d030 */ addiu $t1,$t1,%lo(g_StageSetup) /* f072658: 8d250014 */ lw $a1,0x14($t1) /* f07265c: 8c830088 */ lw $v1,0x88($a0) /* f072660: 00651023 */ subu $v0,$v1,$a1 diff --git a/src/game/game_114240.c b/src/game/game_114240.c index edcfef45c..31596218a 100644 --- a/src/game/game_114240.c +++ b/src/game/game_114240.c @@ -83,8 +83,8 @@ glabel func0f114254 /* f114320: 02402825 */ or $a1,$s2,$zero /* f114324: 2407ffff */ addiu $a3,$zero,-1 .L0f114328: -/* f114328: 3c1e800a */ lui $s8,%hi(var8009d030) -/* f11432c: 27ded030 */ addiu $s8,$s8,%lo(var8009d030) +/* f114328: 3c1e800a */ lui $s8,%hi(g_StageSetup) +/* f11432c: 27ded030 */ addiu $s8,$s8,%lo(g_StageSetup) /* f114330: 8fcb0000 */ lw $t3,0x0($s8) /* f114334: 87ac0360 */ lh $t4,0x360($sp) /* f114338: 51600128 */ beqzl $t3,.L0f1147dc @@ -879,9 +879,9 @@ glabel func0f114de0 /* f114e00: afb00018 */ sw $s0,0x18($sp) /* f114e04: 8c8e0008 */ lw $t6,0x8($a0) /* f114e08: 2416000c */ addiu $s6,$zero,0xc -/* f114e0c: 3c02800a */ lui $v0,%hi(var8009d030) +/* f114e0c: 3c02800a */ lui $v0,%hi(g_StageSetup) /* f114e10: 01d60019 */ multu $t6,$s6 -/* f114e14: 2442d030 */ addiu $v0,$v0,%lo(var8009d030) +/* f114e14: 2442d030 */ addiu $v0,$v0,%lo(g_StageSetup) /* f114e18: 8c510004 */ lw $s1,0x4($v0) /* f114e1c: 00809025 */ or $s2,$a0,$zero /* f114e20: 00c09825 */ or $s3,$a2,$zero @@ -1062,8 +1062,8 @@ glabel func0f11505c /* f115080: afb1001c */ sw $s1,0x1c($sp) /* f115084: afb00018 */ sw $s0,0x18($sp) /* f115088: 8c8e0004 */ lw $t6,0x4($a0) -/* f11508c: 3c02800a */ lui $v0,%hi(var8009d030) -/* f115090: 2442d030 */ addiu $v0,$v0,%lo(var8009d030) +/* f11508c: 3c02800a */ lui $v0,%hi(g_StageSetup) +/* f115090: 2442d030 */ addiu $v0,$v0,%lo(g_StageSetup) /* f115094: 8c530000 */ lw $s3,0x0($v0) /* f115098: 8c540004 */ lw $s4,0x4($v0) /* f11509c: afae006c */ sw $t6,0x6c($sp) @@ -1573,10 +1573,10 @@ glabel func0f1155e0 GLOBAL_ASM( glabel func0f115784 -/* f115784: 3c0b800a */ lui $t3,%hi(var8009d030) +/* f115784: 3c0b800a */ lui $t3,%hi(g_StageSetup) /* f115788: 8c8e0008 */ lw $t6,0x8($a0) /* f11578c: 8c8a0004 */ lw $t2,0x4($a0) -/* f115790: 256bd030 */ addiu $t3,$t3,%lo(var8009d030) +/* f115790: 256bd030 */ addiu $t3,$t3,%lo(g_StageSetup) /* f115794: 8d790000 */ lw $t9,0x0($t3) /* f115798: 8d490000 */ lw $t1,0x0($t2) /* f11579c: 000e7880 */ sll $t7,$t6,0x2 @@ -1706,10 +1706,10 @@ glabel func0f115784 GLOBAL_ASM( glabel func0f11594c -/* f11594c: 3c0a800a */ lui $t2,%hi(var8009d030) +/* f11594c: 3c0a800a */ lui $t2,%hi(g_StageSetup) /* f115950: 8c8e0008 */ lw $t6,0x8($a0) /* f115954: 8c890004 */ lw $t1,0x4($a0) -/* f115958: 254ad030 */ addiu $t2,$t2,%lo(var8009d030) +/* f115958: 254ad030 */ addiu $t2,$t2,%lo(g_StageSetup) /* f11595c: 8d590000 */ lw $t9,0x0($t2) /* f115960: 8d280000 */ lw $t0,0x0($t1) /* f115964: 000e7880 */ sll $t7,$t6,0x2 diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index 587921cac..908ae209c 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -16321,14 +16321,7 @@ u32 var8009d020 = 0; u32 var8009d024 = 0; u32 var8009d028 = 0; u32 var8009d02c = 0; -u32 var8009d030 = 0; -u32 var8009d034 = 0; -u32 var8009d038 = 0; -u32 var8009d03c = 0; -u32 *g_LvSetupPtr_8009d040 = NULL; -u32 var8009d044 = 0; -struct ailist *g_LvAilists = NULL; -u32 var8009d04c = 0; +struct stagesetup g_StageSetup = {0}; u32 var8009d050 = 0; u32 var8009d054 = 0; u32 var8009d058 = 0; diff --git a/src/include/game/chr/chrai.h b/src/include/game/chr/chrai.h index 77e7c6450..11a6e360c 100644 --- a/src/include/game/chr/chrai.h +++ b/src/include/game/chr/chrai.h @@ -2,7 +2,7 @@ #define _IN_CHR_CHRAI_H #include -s32 chraiEndList(u8 *ailist, u64 *unk); +s32 chraiGetListIdByList(u8 *ailist, bool *is_global); u32 chraiGoToLabel(u8 *ailist, u32 aioffset, u8 label); void chraiExecute(void *entity, s32 entity_type); u32 chraiGetCommandLength(u8 *ailist, u32 aioffset); diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index cc04a3c14..eb67c9c57 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -587,9 +587,7 @@ extern u32 var8009ce88; extern u32 var8009ce98; extern u32 var8009cf10; extern u32 var8009cf88; -extern u32 var8009d030; -extern u32 *g_LvSetupPtr_8009d040; -extern struct ailist *g_LvAilists; +extern struct stagesetup g_StageSetup; extern u32 var8009d050; extern u32 var8009d060; extern u32 var8009d088; diff --git a/src/include/types.h b/src/include/types.h index ce1dbc747..8ab67effa 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -2291,6 +2291,17 @@ struct aipaths { u8 type; }; +struct stagesetup { + /*0x00*/ void *unk00; + /*0x04*/ void *unk04; + /*0x08*/ void *unk08; + /*0x0c*/ u8 *intro; + /*0x10*/ u8 *props; + /*0x14*/ struct aipaths *paths; + /*0x18*/ struct ailist *ailists; + /*0x1c*/ void *unk1c; +}; + struct inventory_menupos { float x; float y;