summaryrefslogtreecommitdiff
path: root/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc')
-rw-r--r--data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
index 2786c930c..02558e9d3 100644
--- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
+++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
@@ -3,8 +3,8 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: @ 8159AAD
LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE
lockall
- move 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839
- waitmove 0
+ applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839
+ waitmovement 0
msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, 5
switch RESULT
case 1, LilycoveCity_MoveDeletersHouse_EventScript_159ADE
@@ -17,19 +17,19 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
special sub_80F9A0C
waitstate
compare 0x8004, 255
- jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B7B
+ goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B
special sub_80FA148
compare RESULT, 1
- jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B71
+ goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71
special ScrSpecial_CountPokemonMoves
compare RESULT, 1
- jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B64
+ goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64
msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4
fadescreen 1
special sub_80F9EEC
fadescreen 0
compare 0x8005, 4
- jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159ADE
+ goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE
special ScrSpecial_GetPokemonNicknameAndMoveName
msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5
switch RESULT
@@ -40,7 +40,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53
special sub_80FA0DC
- fanfare 378
+ playfanfare 378
waitfanfare
msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4
releaseall