From ee172650648f1741b88f51ef891d6b2b16833b8b Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 28 Oct 2020 13:34:02 -0400 Subject: [PATCH] PR comments --- src/code_1a1f0_len_5390.c | 4 ++-- src/code_fa4c0_len_3bf0.c | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/code_1a1f0_len_5390.c b/src/code_1a1f0_len_5390.c index ea3e0e9fe9..44bcc7e2d9 100644 --- a/src/code_1a1f0_len_5390.c +++ b/src/code_1a1f0_len_5390.c @@ -31,14 +31,14 @@ ApiStatus func_8003EE98(ScriptInstance* script, s32 isInitialCall) { if (isInitialCall) { func_80045D00(0, 60); } - return (func_80045FA4() == 0) * 2; + return (func_80045FA4() == 0) * ApiStatus_DONE2; } ApiStatus func_8003EECC(ScriptInstance* script, s32 isInitialCall) { if (isInitialCall) { func_80045D00(1, 60); } - return (func_80045FA4() == 0) * 2; + return (func_80045FA4() == 0) * ApiStatus_DONE2; } INCLUDE_ASM(s32, "code_1a1f0_len_5390", FadeBackgroundToBlack); diff --git a/src/code_fa4c0_len_3bf0.c b/src/code_fa4c0_len_3bf0.c index f01862a7a4..049cdfdfbc 100644 --- a/src/code_fa4c0_len_3bf0.c +++ b/src/code_fa4c0_len_3bf0.c @@ -9,7 +9,7 @@ ApiStatus FadeOutMusic(ScriptInstance* script, s32 isInitialCall) { s32 itemID = get_variable(script, *args++); s32* ptrNextPos = args++; - return (set_music_track(itemID, -1, 0, get_variable(script, *ptrNextPos++), 8) != 0) * 2; + return (set_music_track(itemID, -1, 0, get_variable(script, *ptrNextPos++), 8) != 0) * ApiStatus_DONE2; } ApiStatus SetMusicTrack(ScriptInstance* script, s32 isInitialCall) { @@ -19,7 +19,7 @@ ApiStatus SetMusicTrack(ScriptInstance* script, s32 isInitialCall) { s32 variation = get_variable(script, *args++); s16 volume = get_variable(script, *args++); - return (set_music_track(musicPlayer, songID, variation, 0x1F4, volume) != 0) * 2; + return (set_music_track(musicPlayer, songID, variation, 0x1F4, volume) != 0) * ApiStatus_DONE2; } ApiStatus FadeInMusic(ScriptInstance* script, s32 isInitialCall) { @@ -31,7 +31,7 @@ ApiStatus FadeInMusic(ScriptInstance* script, s32 isInitialCall) { s16 var4 = get_variable(script, *args++); s16 var5 = get_variable(script, *args++); - return (func_8014A964(var0, var1, var2, var3, var4, var5) != 0) * 2; + return (func_8014A964(var0, var1, var2, var3, var4, var5) != 0) * ApiStatus_DONE2; } INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D5EE0); @@ -77,19 +77,18 @@ ApiStatus func_802D6090(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -//INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", ClearAmbientSounds); ApiStatus ClearAmbientSounds(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 flags = get_variable(script, *args++); - return (play_ambient_sounds(-1, flags) != 0) * 2; + return (play_ambient_sounds(-1, flags) != 0) * ApiStatus_DONE2; } ApiStatus PlayAmbientSounds(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 soundID = get_variable(script, *args++); - return (play_ambient_sounds(soundID, 0xFA) != 0) * 2; + return (play_ambient_sounds(soundID, 0xFA) != 0) * ApiStatus_DONE2; } ApiStatus PlaySound(ScriptInstance* script, s32 isInitialCall) { @@ -484,7 +483,6 @@ ApiStatus GetItemPower(ScriptInstance* script, s32 isInitialCall) { ApiStatus ShowGotItem(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ItemEntity* e; if (isInitialCall) { script->functionTemp[0].s = 0;