diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /data/scripts/maps/OldaleTown.inc | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'data/scripts/maps/OldaleTown.inc')
| -rw-r--r-- | data/scripts/maps/OldaleTown.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index df1aeb595..3c075cad0 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -43,7 +43,7 @@ OldaleTown_EventScript_1E8EFC:: @ 81E8EFC checkflag FLAG_0x001 goto_eq OldaleTown_EventScript_1E8FB9 setflag FLAG_0x001 - playbgm BGM_TSURETEK, 0 + playbgm MUS_TSURETEK, 0 msgbox OldaleTown_Text_1E91C0, 4 closemessage switch VAR_FACING @@ -76,7 +76,7 @@ OldaleTown_EventScript_1E8F75:: @ 81E8F75 OldaleTown_EventScript_1E8F8C:: @ 81E8F8C msgbox OldaleTown_Text_1E91FD, 4 giveitem_std ITEM_POTION - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_EventScript_1E8FC3 msgbox OldaleTown_Text_1E92AF, 4 setflag FLAG_0x084 @@ -261,9 +261,9 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6 OldaleTown_EventScript_1E90E6:: @ 81E90E6 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_EventScript_1E90FE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_EventScript_1E910C end @@ -279,9 +279,9 @@ OldaleTown_EventScript_1E910C:: @ 81E910C OldaleTown_EventScript_1E911A:: @ 81E911A closemessage - compare_var_to_value VAR_0x8009, 0 + compare VAR_0x8009, 0 call_if 1, OldaleTown_EventScript_1E9148 - compare_var_to_value VAR_0x8009, 1 + compare VAR_0x8009, 1 call_if 1, OldaleTown_EventScript_1E915E applymovement 4, OldaleTown_Movement_1E9177 waitmovement 0 @@ -292,7 +292,7 @@ OldaleTown_EventScript_1E911A:: @ 81E911A end OldaleTown_EventScript_1E9148:: @ 81E9148 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 goto_if 5, OldaleTown_EventScript_1E915E applymovement 4, OldaleTown_Movement_1E9177 waitmovement 0 |