NotDoesScriptExist -> AwaitScriptComplete

This commit is contained in:
Ethan Roseman 2020-10-31 15:35:43 -04:00
parent 0f3d65f7c9
commit 9151bf2fe4
13 changed files with 13 additions and 13 deletions

View File

@ -92,7 +92,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434CC_96C68C);
INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243548_96C708);
#include "world/common/NotDoesScriptExist.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"

View File

@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421F0_A1D2F0);
INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024226C_A1D36C);
#include "world/common/NotDoesScriptExist.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"

View File

@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414F8_B360C8);
INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241574_B36144);
#include "world/common/NotDoesScriptExist.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"

View File

@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240308_AFDE48);
INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240384_AFDEC4);
#include "world/common/NotDoesScriptExist.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"

View File

@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802430B8_8B3128);
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243134_8B31A4);
#include "world/common/NotDoesScriptExist.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"

View File

@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412E8_8ED108);
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241364_8ED184);
#include "world/common/NotDoesScriptExist.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"

View File

@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241570_A87FC0);
INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802415EC_A8803C);
#include "world/common/NotDoesScriptExist.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"

View File

@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241650_A8E0D0);
INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802416CC_A8E14C);
#include "world/common/NotDoesScriptExist.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"

View File

@ -98,7 +98,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tutorial_draw_contents_80
INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243870_8040F0);
#include "world/common/NotDoesScriptExist.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"

View File

@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240AB4_9C5E94);
INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240B30_9C5F10);
#include "world/common/NotDoesScriptExist.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"

View File

@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240878_D05FA8);
INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802408F4_D06024);
#include "world/common/NotDoesScriptExist.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"

View File

@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F98_D21E28);
INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242014_D21EA4);
#include "world/common/NotDoesScriptExist.inc.c"
#include "world/common/AwaitScriptComplete.inc.c"
#include "world/common/PartnerToggleAbilityScript.inc.c"

View File

@ -1,5 +1,5 @@
#include "common.h"
static ApiStatus NotDoesScriptExist(ScriptInstance* script, s32 isInitialCall) {
static ApiStatus AwaitScriptComplete(ScriptInstance* script, s32 isInitialCall) {
return (!does_script_exist(get_variable(script, *script->ptrReadPos))) * ApiStatus_DONE2;
}