Refactored functions

The decompiled versions were inconsistent.
This commit is contained in:
arookas 2016-02-22 21:42:49 -05:00
parent c56444d7ca
commit 5e25a1aada
2 changed files with 11 additions and 18 deletions

View file

@ -62,16 +62,10 @@ builtin startMareBottleDemo();
builtin isFinishMareBottleDemo(); builtin isFinishMareBottleDemo();
function waitForFinishDemo() { function waitForFinishDemo() {
while (true) { while (!isDemoMode()) {
if (isDemoMode()) {
break;
}
yield; yield;
} }
while (true) { while (isDemoMode()) {
if (isDemoMode() == false) {
break;
}
yield; yield;
} }
} }

View file

@ -56,7 +56,7 @@ function talk(msgID, flags) {
} }
else { else {
yield; yield;
while (getTalkMode() != true) { while (!getTalkMode()) {
yield; yield;
} }
} }
@ -81,10 +81,9 @@ function select(msgID, flags) {
} }
} }
else { else {
do {
yield; yield;
while (getTalkMode() != true) { } while (!getTalkMode());
yield;
}
} }
return getTalkSelectedValue(); return getTalkSelectedValue();
} }
@ -103,20 +102,20 @@ builtin forceCloseTalk();
// functions // functions
function forceTalk(handle) { function forceTalk(handle) {
var res = __forceStartTalk(handle); var result = __forceStartTalk(handle);
if (res == true) { if (result) {
while (!isTalkModeNow()) { while (!isTalkModeNow()) {
yield; yield;
} }
} }
return res; return result;
} }
function forceTalkExceptNpc(handle) { function forceTalkExceptNpc(handle) {
var res = __forceStartTalkExceptNpc(handle); var result = __forceStartTalkExceptNpc(handle);
if (res == true) { if (result) {
while (!isTalkModeNow()) { while (!isTalkModeNow()) {
yield; yield;
} }
} }
return res; return result;
} }