From 2a7cb5846f28320756612a7a0f9547de22e6de80 Mon Sep 17 00:00:00 2001 From: Henny022p Date: Fri, 19 Feb 2021 07:24:19 +0100 Subject: [PATCH] cleaned up some code --- src/code_0807CC3C.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/code_0807CC3C.c b/src/code_0807CC3C.c index 068f3e8d..db13b635 100644 --- a/src/code_0807CC3C.c +++ b/src/code_0807CC3C.c @@ -23,8 +23,6 @@ extern void CreateSpeechBubbleQuestionMark(Entity*, u32, u32); extern void DeleteThisEntity(void); extern u32 sub_080B180C(u32, const char*); extern void sub_0801C4A0(u32); -extern s32 __divsi3(s32, s32); -extern void _call_via_r6(Entity*, ScriptExecutionContext*); extern u16 sub_080B18DC(u16, const char*); void sub_0807DB88(ScriptExecutionContext* context, u16* unk1); @@ -255,15 +253,15 @@ void sub_0807DA70(void) { } ScriptExecutionContext* CreateScriptExecutionContext(void) { - ScriptExecutionContext* puVar1; + ScriptExecutionContext* context; - puVar1 = gScriptExecutionContextArray; + context = gScriptExecutionContextArray; do { - if (puVar1->unk_00 == 0) { - return puVar1; + if (context->unk_00 == 0) { + return context; } - puVar1++; - } while (puVar1 < gScriptExecutionContextArray + ARRAY_COUNT(gScriptExecutionContextArray)); + context++; + } while (context < gScriptExecutionContextArray + ARRAY_COUNT(gScriptExecutionContextArray)); return NULL; } @@ -272,13 +270,13 @@ void DestroyScriptExecutionContext(ScriptExecutionContext* context) { } ScriptExecutionContext* StartCutscene(Entity* entity, u16* unk_2) { - ScriptExecutionContext* puVar1; + ScriptExecutionContext* context; - puVar1 = CreateScriptExecutionContext(); - if (puVar1) { - sub_0807DAF0(entity, puVar1, unk_2); + context = CreateScriptExecutionContext(); + if (context) { + sub_0807DAF0(entity, context, unk_2); } - return puVar1; + return context; } void sub_0807DAF0(Entity* entity, ScriptExecutionContext* context, u16* unk1) {