summaryrefslogtreecommitdiff
path: root/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/LittlerootTown_MaysHouse_2F.inc')
-rw-r--r--data/scripts/maps/LittlerootTown_MaysHouse_2F.inc46
1 files changed, 23 insertions, 23 deletions
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
index efe89144d..327112d2f 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
@@ -4,11 +4,11 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296
.byte 0
LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1
- compare_var_to_value VAR_0x408D, 2
+ compare VAR_0x408D, 2
call_if 0, LittlerootTown_MaysHouse_2F_EventScript_1F930A
- compare_var_to_value VAR_0x408D, 3
+ compare VAR_0x408D, 3
call_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F92CD
- compare_var_to_value VAR_0x4092, 4
+ compare VAR_0x4092, 4
call_if 1, LittlerootTown_MaysHouse_2F_EventScript_2926FE
call LittlerootTown_MaysHouse_2F_EventScript_275CE1
setvar VAR_0x4089, 0
@@ -17,15 +17,15 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1
LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD
checkflag FLAG_0x124
goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F92E6
- compare_var_to_value VAR_0x4084, 2
+ compare VAR_0x4084, 2
goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309
goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6
LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6
checkplayergender
- compare_var_to_value VAR_RESULT, 1
+ compare VAR_RESULT, 1
goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309
- compare_var_to_value VAR_0x40D3, 2
+ compare VAR_0x40D3, 2
goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309
setobjectxyperm 1, 8, 2
setobjectmovementtype 1, 7
@@ -37,7 +37,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309
LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A
checkplayergender
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317
return
@@ -51,13 +51,13 @@ LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D
LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327
checkplayergender
- compare_var_to_value VAR_RESULT, 1
+ compare VAR_RESULT, 1
goto_eq EventScript_275D0C
end
LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334
lockall
- compare_var_to_value VAR_0x408D, 2
+ compare VAR_0x408D, 2
goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A
msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, 4
releaseall
@@ -74,20 +74,20 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
applymovement 1, LittlerootTown_MaysHouse_2F_Movement_27259A
waitmovement 0
delay 10
- playbgm BGM_GIRL_SUP, 1
- compare_var_to_value VAR_FACING, 2
+ playbgm MUS_GIRL_SUP, 1
+ compare VAR_FACING, 2
call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93BA
- compare_var_to_value VAR_FACING, 1
+ compare VAR_FACING, 1
call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93E9
- compare_var_to_value VAR_FACING, 3
+ compare VAR_FACING, 3
call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9418
- compare_var_to_value VAR_FACING, 4
+ compare VAR_FACING, 4
call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9440
setvar VAR_0x408D, 3
setflag FLAG_0x332
clearflag FLAG_0x2D2
setvar VAR_0x4050, 1
- savebgm SE_STOP
+ savebgm MUS_DUMMY
fadedefaultbgm
releaseall
end
@@ -253,9 +253,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1
checkflag FLAG_0x124
goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94F7
checkplayergender
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3
- compare_var_to_value VAR_RESULT, 1
+ compare VAR_RESULT, 1
goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED
end
@@ -273,9 +273,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7
applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E
waitmovement 0
checkplayergender
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F951D
- compare_var_to_value VAR_RESULT, 1
+ compare VAR_RESULT, 1
call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F952F
setflag FLAG_0x125
releaseall
@@ -304,9 +304,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A
gUnknown_081F9553:: @ 81F9553
lockall
checkplayergender
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C
- compare_var_to_value VAR_RESULT, 1
+ compare VAR_RESULT, 1
goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576
end
@@ -317,7 +317,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C
LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
setvar VAR_0x8004, 2
- special sp0D9_ComputerRelated
+ special DoPCTurnOnEffect
playse SE_PC_ON
msgbox gUnknown_08272D87, 4
special sub_816AE58
@@ -328,7 +328,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
LittlerootTown_MaysHouse_2F_EventScript_1F958F:: @ 81F958F
setvar VAR_0x8004, 2
playse SE_PC_OFF
- special sub_8138E20
+ special DoPCTurnOffEffect
releaseall
end