summaryrefslogtreecommitdiff
path: root/data/scripts/maps/PacifidlogTown_House2.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/PacifidlogTown_House2.inc')
-rw-r--r--data/scripts/maps/PacifidlogTown_House2.inc34
1 files changed, 17 insertions, 17 deletions
diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc
index e45f09de4..cef40ecd3 100644
--- a/data/scripts/maps/PacifidlogTown_House2.inc
+++ b/data/scripts/maps/PacifidlogTown_House2.inc
@@ -4,30 +4,30 @@ PacifidlogTown_House2_MapScripts:: @ 8154167
PacifidlogTown_House2_EventScript_154168:: @ 8154168
lock
faceplayer
- checkdailyflags
+ dodailyevents
call PacifidlogTown_House2_EventScript_1541B4
checkflag 299
- jumpeq PacifidlogTown_House2_EventScript_154254
+ goto_if_eq PacifidlogTown_House2_EventScript_154254
checkflag 300
- callif 1, PacifidlogTown_House2_EventScript_1541CE
+ call_if 1, PacifidlogTown_House2_EventScript_1541CE
checkflag 300
- callif 0, PacifidlogTown_House2_EventScript_1541D7
+ call_if 0, PacifidlogTown_House2_EventScript_1541D7
setflag 300
- specialval RESULT, GetLeadMonFriendshipScore
+ specialvar RESULT, GetLeadMonFriendshipScore
compare RESULT, 4
- jumpif 4, PacifidlogTown_House2_EventScript_1541EC
- specialval RESULT, GetLeadMonFriendshipScore
+ goto_if 4, PacifidlogTown_House2_EventScript_1541EC
+ specialvar RESULT, GetLeadMonFriendshipScore
compare RESULT, 2
- jumpif 4, PacifidlogTown_House2_EventScript_15421B
- jump PacifidlogTown_House2_EventScript_154225
+ goto_if 4, PacifidlogTown_House2_EventScript_15421B
+ goto PacifidlogTown_House2_EventScript_154225
end
PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4
checkflag 299
- jumpif 0, PacifidlogTown_House2_EventScript_1A14DC
- specialval RESULT, sub_810F908
+ goto_if 0, PacifidlogTown_House2_EventScript_1A14DC
+ specialvar RESULT, sub_810F908
compare RESULT, 0
- callif 1, PacifidlogTown_House2_EventScript_1541E8
+ call_if 1, PacifidlogTown_House2_EventScript_1541E8
return
PacifidlogTown_House2_EventScript_1541CE:: @ 81541CE
@@ -47,7 +47,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC
msgbox PacifidlogTown_House2_Text_179169, 4
giveitem ITEM_TM27
compare RESULT, 0
- jumpeq PacifidlogTown_House2_EventScript_1A029B
+ goto_if_eq PacifidlogTown_House2_EventScript_1A029B
setflag 299
special sub_810F950
msgbox PacifidlogTown_House2_Text_179283, 4
@@ -63,7 +63,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225
msgbox PacifidlogTown_House2_Text_17922D, 4
giveitem ITEM_TM21
compare RESULT, 0
- jumpeq PacifidlogTown_House2_EventScript_1A029B
+ goto_if_eq PacifidlogTown_House2_EventScript_1A029B
setflag 299
special sub_810F950
msgbox PacifidlogTown_House2_Text_179283, 4
@@ -71,7 +71,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225
end
PacifidlogTown_House2_EventScript_154254:: @ 8154254
- specialval RESULT, sub_810F908
+ specialvar RESULT, sub_810F908
buffernum 0, RESULT
msgbox PacifidlogTown_House2_Text_1792F2, 4
release
@@ -80,7 +80,7 @@ PacifidlogTown_House2_EventScript_154254:: @ 8154254
PacifidlogTown_House2_EventScript_154267:: @ 8154267
lock
faceplayer
- checksound
+ waitse
pokecry SPECIES_AZURILL, 0
msgbox PacifidlogTown_House2_Text_17938B, 4
waitpokecry
@@ -91,7 +91,7 @@ PacifidlogTown_House2_EventScript_154267:: @ 8154267
PacifidlogTown_House2_EventScript_154282:: @ 8154282
lock
faceplayer
- checksound
+ waitse
pokecry SPECIES_AZURILL, 2
msgbox PacifidlogTown_House2_Text_1793CC, 4
waitpokecry