summaryrefslogtreecommitdiff
path: root/data/scripts/maps/PetalburgWoods.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/PetalburgWoods.inc')
-rw-r--r--data/scripts/maps/PetalburgWoods.inc128
1 files changed, 64 insertions, 64 deletions
diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc
index c24f7c195..0b0c72f70 100644
--- a/data/scripts/maps/PetalburgWoods.inc
+++ b/data/scripts/maps/PetalburgWoods.inc
@@ -9,108 +9,108 @@ PetalburgWoods_MapScript1_15CCA2:: @ 815CCA2
PetalburgWoods_EventScript_15CCA8:: @ 815CCA8
lockall
call PetalburgWoods_EventScript_15CDE6
- move 4, PetalburgWoods_Movement_15CE89
- waitmove 0
+ applymovement 4, PetalburgWoods_Movement_15CE89
+ waitmovement 0
msgbox PetalburgWoods_Text_194D92, 4
- closebutton
- playmusic BGM_EVIL_TEAM, 0
- move 3, PetalburgWoods_Movement_15CEC3
- waitmove 0
+ closemessage
+ playbgm BGM_EVIL_TEAM, 0
+ applymovement 3, PetalburgWoods_Movement_15CEC3
+ waitmovement 0
msgbox PetalburgWoods_Text_194DED, 4
- closebutton
- move 3, PetalburgWoods_Movement_15CEB0
- waitmove 0
- move 4, PetalburgWoods_Movement_1A0841
- waitmove 0
+ closemessage
+ applymovement 3, PetalburgWoods_Movement_15CEB0
+ waitmovement 0
+ applymovement 4, PetalburgWoods_Movement_1A0841
+ waitmovement 0
msgbox PetalburgWoods_Text_194E6B, 4
- closebutton
- move 4, PetalburgWoods_Movement_15CE9E
- waitmove 0
+ closemessage
+ applymovement 4, PetalburgWoods_Movement_15CE9E
+ waitmovement 0
msgbox PetalburgWoods_Text_194E9A, 4
- move 3, PetalburgWoods_Movement_15CEC8
- waitmove 0
+ applymovement 3, PetalburgWoods_Movement_15CEC8
+ waitmovement 0
msgbox PetalburgWoods_Text_194EE8, 4
trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
- move 3, PetalburgWoods_Movement_15CEB3
- waitmove 0
+ applymovement 3, PetalburgWoods_Movement_15CEB3
+ waitmovement 0
call PetalburgWoods_EventScript_15CDFA
- move 4, PetalburgWoods_Movement_15CE80
- waitmove 0
- jump PetalburgWoods_EventScript_15CE69
+ applymovement 4, PetalburgWoods_Movement_15CE80
+ waitmovement 0
+ goto PetalburgWoods_EventScript_15CE69
end
PetalburgWoods_EventScript_15CD42:: @ 815CD42
lockall
call PetalburgWoods_EventScript_15CDE6
- move 4, PetalburgWoods_Movement_15CE8E
- waitmove 0
- move 255, PetalburgWoods_Movement_1A083F
- waitmove 0
+ applymovement 4, PetalburgWoods_Movement_15CE8E
+ waitmovement 0
+ applymovement 255, PetalburgWoods_Movement_1A083F
+ waitmovement 0
msgbox PetalburgWoods_Text_194D92, 4
- closebutton
- playmusic BGM_EVIL_TEAM, 0
- move 3, PetalburgWoods_Movement_15CEC3
- waitmove 0
+ closemessage
+ playbgm BGM_EVIL_TEAM, 0
+ applymovement 3, PetalburgWoods_Movement_15CEC3
+ waitmovement 0
msgbox PetalburgWoods_Text_194DED, 4
- closebutton
- move 3, PetalburgWoods_Movement_15CEBF
- waitmove 0
- move 4, PetalburgWoods_Movement_1A0841
- waitmove 0
+ closemessage
+ applymovement 3, PetalburgWoods_Movement_15CEBF
+ waitmovement 0
+ applymovement 4, PetalburgWoods_Movement_1A0841
+ waitmovement 0
msgbox PetalburgWoods_Text_194E6B, 4
- closebutton
- move 4, PetalburgWoods_Movement_15CEA4
- waitmove 0
+ closemessage
+ applymovement 4, PetalburgWoods_Movement_15CEA4
+ waitmovement 0
msgbox PetalburgWoods_Text_194E9A, 4
- move 255, PetalburgWoods_Movement_1A0841
- waitmove 0
+ applymovement 255, PetalburgWoods_Movement_1A0841
+ waitmovement 0
msgbox PetalburgWoods_Text_194EE8, 4
trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
- move 3, PetalburgWoods_Movement_15CEB3
- waitmove 0
+ applymovement 3, PetalburgWoods_Movement_15CEB3
+ waitmovement 0
call PetalburgWoods_EventScript_15CDFA
- move 4, PetalburgWoods_Movement_15CE95
- waitmove 0
- jump PetalburgWoods_EventScript_15CE69
+ applymovement 4, PetalburgWoods_Movement_15CE95
+ waitmovement 0
+ goto PetalburgWoods_EventScript_15CE69
end
PetalburgWoods_EventScript_15CDE6:: @ 815CDE6
- move 4, PetalburgWoods_Movement_15CE73
- waitmove 0
+ applymovement 4, PetalburgWoods_Movement_15CE73
+ waitmovement 0
msgbox PetalburgWoods_Text_194D71, 4
- closebutton
+ closemessage
return
PetalburgWoods_EventScript_15CDFA:: @ 815CDFA
msgbox PetalburgWoods_Text_194FA4, 4
- closebutton
- move 3, PetalburgWoods_Movement_15CEB7
- waitmove 0
- disappear 3
- move 255, PetalburgWoods_Movement_1A0845
- waitmove 0
+ closemessage
+ applymovement 3, PetalburgWoods_Movement_15CEB7
+ waitmovement 0
+ removeobject 3
+ applymovement 255, PetalburgWoods_Movement_1A0845
+ waitmovement 0
msgbox PetalburgWoods_Text_19507E, 4
giveitem ITEM_GREAT_BALL
compare RESULT, 0
- jumpeq PetalburgWoods_EventScript_15CE3F
- jump PetalburgWoods_EventScript_15CE4D
+ goto_if_eq PetalburgWoods_EventScript_15CE3F
+ goto PetalburgWoods_EventScript_15CE4D
end
PetalburgWoods_EventScript_15CE3F:: @ 815CE3F
msgbox PetalburgWoods_Text_195182, 4
- jump PetalburgWoods_EventScript_15CE4D
+ goto PetalburgWoods_EventScript_15CE4D
end
PetalburgWoods_EventScript_15CE4D:: @ 815CE4D
msgbox PetalburgWoods_Text_19510A, 4
- move 4, PetalburgWoods_Movement_15CEA8
- waitmove 0
+ applymovement 4, PetalburgWoods_Movement_15CEA8
+ waitmovement 0
msgbox PetalburgWoods_Text_195153, 4
- closebutton
+ closemessage
return
PetalburgWoods_EventScript_15CE69:: @ 815CE69
- disappear 4
+ removeobject 4
setvar 0x4098, 1
releaseall
end
@@ -242,11 +242,11 @@ PetalburgWoods_EventScript_15CEDC:: @ 815CEDC
lock
faceplayer
checkflag 297
- jumpeq PetalburgWoods_EventScript_15CF0B
+ goto_if_eq PetalburgWoods_EventScript_15CF0B
msgbox PetalburgWoods_Text_19549E, 4
giveitem ITEM_MIRACLE_SEED
compare RESULT, 0
- jumpeq PetalburgWoods_EventScript_1A029B
+ goto_if_eq PetalburgWoods_EventScript_1A029B
setflag 297
release
end
@@ -271,9 +271,9 @@ PetalburgWoods_EventScript_15CF27:: @ 815CF27
PetalburgWoods_EventScript_15CF3E:: @ 815CF3E
trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE
- specialval RESULT, sub_8082C68
+ specialvar RESULT, sub_8082C68
compare RESULT, 1
- jumpeq PetalburgWoods_EventScript_15CF65
+ goto_if_eq PetalburgWoods_EventScript_15CF65
msgbox PetalburgWoods_Text_1952CC, 6
end