summaryrefslogtreecommitdiff
path: root/data/maps/CeruleanCity_House4/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/CeruleanCity_House4/scripts.inc')
-rw-r--r--data/maps/CeruleanCity_House4/scripts.inc58
1 files changed, 29 insertions, 29 deletions
diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc
index afbb35c5f..432f1a9f3 100644
--- a/data/maps/CeruleanCity_House4/scripts.inc
+++ b/data/maps/CeruleanCity_House4/scripts.inc
@@ -3,26 +3,26 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE
CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF
special sub_8110AB4
- compare_var_to_value VAR_RESULT, 2
- goto_if eq, EventScript_1A7AE0
+ compare VAR_RESULT, 2
+ goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState
copyvar VAR_0x8008, VAR_RESULT
- compare_var_to_value VAR_0x8004, 0
- goto_if eq, EventScript_CeruleanCity_House4_NoNews
- compare_var_to_value VAR_0x8004, 1
- goto_if eq, EventScript_CeruleanCity_House4_News1
- compare_var_to_value VAR_0x8004, 2
- goto_if eq, EventScript_CeruleanCity_House4_News2
- compare_var_to_value VAR_0x8004, 3
- goto_if eq, EventScript_CeruleanCity_House4_NewsNotSpread
- compare_var_to_value VAR_0x8004, 4
- goto_if eq, EventScript_CeruleanCity_House4_NewsSpread1
- compare_var_to_value VAR_0x8004, 5
- goto_if eq, EventScript_CeruleanCity_House4_NewsSpread2
- compare_var_to_value VAR_0x8004, 6
- goto_if eq, EventScript_CeruleanCity_House4_NewsDone
+ compare VAR_0x8004, 0
+ goto_if_eq EventScript_CeruleanCity_House4_NoNews
+ compare VAR_0x8004, 1
+ goto_if_eq EventScript_CeruleanCity_House4_News1
+ compare VAR_0x8004, 2
+ goto_if_eq EventScript_CeruleanCity_House4_News2
+ compare VAR_0x8004, 3
+ goto_if_eq EventScript_CeruleanCity_House4_NewsNotSpread
+ compare VAR_0x8004, 4
+ goto_if_eq EventScript_CeruleanCity_House4_NewsSpread1
+ compare VAR_0x8004, 5
+ goto_if_eq EventScript_CeruleanCity_House4_NewsSpread2
+ compare VAR_0x8004, 6
+ goto_if_eq EventScript_CeruleanCity_House4_NewsDone
end
EventScript_CeruleanCity_House4_NoNews:: @ 816AD59
@@ -34,8 +34,8 @@ EventScript_CeruleanCity_House4_News1:: @ 816AD63
call EventScript_CeruleanCity_House4_MovementReactionToNews
msgbox gUnknown_8192B43
giveitem VAR_0x8008
- compare_var_to_value VAR_RESULT, 0
- goto_if eq, EventScript_16AE45
+ compare VAR_RESULT, 0
+ goto_if_eq EventScript_16AE45
release
end
@@ -43,13 +43,13 @@ EventScript_CeruleanCity_House4_News2:: @ 816AD89
call EventScript_CeruleanCity_House4_MovementReactionToNews
msgbox gUnknown_8192C07
giveitem VAR_0x8008, 4
- compare_var_to_value VAR_RESULT, 0
- goto_if eq, EventScript_16AE45
+ compare VAR_RESULT, 0
+ goto_if_eq EventScript_16AE45
release
end
EventScript_CeruleanCity_House4_NewsNotSpread:: @ 816ADAF
- applymovement 1, Movement_1A75E1
+ applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_8192CD5
release
@@ -59,8 +59,8 @@ EventScript_CeruleanCity_House4_NewsSpread1:: @ 816ADC3
call EventScript_CeruleanCity_House4_MovementReactionToNews
msgbox gUnknown_8192D4B
giveitem VAR_0x8008
- compare_var_to_value VAR_RESULT, 0
- goto_if eq, EventScript_16AE45
+ compare VAR_RESULT, 0
+ goto_if_eq EventScript_16AE45
release
end
@@ -68,13 +68,13 @@ EventScript_CeruleanCity_House4_NewsSpread2:: @ 816ADE9
call EventScript_CeruleanCity_House4_MovementReactionToNews
msgbox gUnknown_8192DE3
giveitem VAR_0x8008, 4
- compare_var_to_value VAR_RESULT, 0
- goto_if eq, EventScript_16AE45
+ compare VAR_RESULT, 0
+ goto_if_eq EventScript_16AE45
release
end
EventScript_CeruleanCity_House4_NewsDone:: @ 816AE0F
- applymovement 1, Movement_1A75E1
+ applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_8192EC5
release
@@ -82,11 +82,11 @@ EventScript_CeruleanCity_House4_NewsDone:: @ 816AE0F
EventScript_CeruleanCity_House4_MovementReactionToNews:: @ 816AE23
playse SE_PIN
- applymovement 1, Movement_1A75DB
+ applymovement 1, Movement_ExclamationMark
waitmovement 0
- applymovement 1, Movement_1A75E1
+ applymovement 1, Movement_FacePlayer
waitmovement 0
- applymovement 1, Movement_1A75DD
+ applymovement 1, Movement_Delay48
waitmovement 0
return