From 8f8eb69b3a902d1106fdb64ac214d9fabbec4bbd Mon Sep 17 00:00:00 2001 From: PonderMan Date: Fri, 12 Feb 2021 11:43:59 -0600 Subject: [PATCH] 80238000 Part 1 Update --- include/common_structs.h | 2 +- src/battle/partner/twink_714CF0.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/common_structs.h b/include/common_structs.h index 0f59aa8b7b..8f712bd2bd 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -123,7 +123,7 @@ typedef struct Npc { /* 0x078 */ s32 shadowIndex; /* 0x07C */ f32 shadowScale; /* 0x080 */ s32 unk_80; - /* 0x084 */ s32 unk_84; + /* 0x084 */ char unk_84[4]; /* 0x088 */ s16 isFacingAway; /* 0x08A */ s16 yawCamOffset; /* 0x08C */ s16 unk_8C; diff --git a/src/battle/partner/twink_714CF0.c b/src/battle/partner/twink_714CF0.c index 281485b231..dcff298056 100644 --- a/src/battle/partner/twink_714CF0.c +++ b/src/battle/partner/twink_714CF0.c @@ -1,12 +1,14 @@ #include "common.h" -ApiStatus func_80238000_714CF0(ScriptInstance *arg0) { +ApiStatus func_80238000_714CF0(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = BATTLE_STATUS; - if ((battleStatus->flags2 & 0x40) != 0) { - arg0->varTable[0] = 1; + + if (battleStatus->flags2 & 0x40) { + script->varTable[0] = 1; } else { - arg0->varTable[0] = 0; + script->varTable[0] = 0; } return ApiStatus_DONE2; } + INCLUDE_ASM(s32, "battle/partner/twink_714CF0", func_80238028_714D18);