falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cornucopia' into cornonthecob

This commit is contained in:
Ethan Roseman 2020-10-28 13:52:35 -04:00
parent 90e7a9acab ee17265064
commit 40d0eae53b
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/code_1a1f0_len_5390.c
View File

@ -31,14 +31,14 @@ ApiStatus func_8003EE98(ScriptInstance* script, s32 isInitialCall) {
if (isInitialCall) { if (isInitialCall) {
func_80045D00(0, 60); func_80045D00(0, 60);
} }
return (func_80045FA4() == 0) * 2; return (func_80045FA4() == 0) * ApiStatus_DONE2;
} }
ApiStatus func_8003EECC(ScriptInstance* script, s32 isInitialCall) { ApiStatus func_8003EECC(ScriptInstance* script, s32 isInitialCall) {
if (isInitialCall) { if (isInitialCall) {
func_80045D00(1, 60); func_80045D00(1, 60);
} }
return (func_80045FA4() == 0) * 2; return (func_80045FA4() == 0) * ApiStatus_DONE2;
} }
INCLUDE_ASM(s32, "code_1a1f0_len_5390", FadeBackgroundToBlack); INCLUDE_ASM(s32, "code_1a1f0_len_5390", FadeBackgroundToBlack);

11
src/code_fa4c0_len_3bf0.c
View File

@ -9,7 +9,7 @@ ApiStatus FadeOutMusic(ScriptInstance* script, s32 isInitialCall) {
s32 itemID = get_variable(script, *args++); s32 itemID = get_variable(script, *args++);
s32* ptrNextPos = 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) { ApiStatus SetMusicTrack(ScriptInstance* script, s32 isInitialCall) {
@ -19,7 +19,7 @@ ApiStatus SetMusicTrack(ScriptInstance* script, s32 isInitialCall) {
s32 variation = get_variable(script, *args++); s32 variation = get_variable(script, *args++);
s16 volume = 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) { ApiStatus FadeInMusic(ScriptInstance* script, s32 isInitialCall) {
@ -31,7 +31,7 @@ ApiStatus FadeInMusic(ScriptInstance* script, s32 isInitialCall) {
s16 var4 = get_variable(script, *args++); s16 var4 = get_variable(script, *args++);
s16 var5 = 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); INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D5EE0);
@ -81,14 +81,14 @@ ApiStatus ClearAmbientSounds(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
s32 flags = get_variable(script, *args++); 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) { ApiStatus PlayAmbientSounds(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
s32 soundID = get_variable(script, *args++); 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) { ApiStatus PlaySound(ScriptInstance* script, s32 isInitialCall) {
@ -483,7 +483,6 @@ ApiStatus GetItemPower(ScriptInstance* script, s32 isInitialCall) {
ApiStatus ShowGotItem(ScriptInstance* script, s32 isInitialCall) { ApiStatus ShowGotItem(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
ItemEntity* e;
if (isInitialCall) { if (isInitialCall) {
script->functionTemp[0].s = 0; script->functionTemp[0].s = 0;