summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/cable_club.inc28
-rw-r--r--data/scripts/magma_chimney.inc2
-rw-r--r--data/scripts/players_house.inc34
3 files changed, 32 insertions, 32 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 121f33754..036324abb 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -88,7 +88,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88
OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2
special CloseLink
setvar VAR_CABLE_CLUB_STATE, 0
- applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358
+ applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
waitmovement 0
compare VAR_0x8007, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3DD9
@@ -105,14 +105,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C
applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356
waitmovement 0
- applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358
+ applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
waitmovement 0
applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354
waitmovement 0
return
OldaleTown_PokemonCenter_2F_EventScript_1A3E0C:: @ 81A3E0C
- applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358
+ applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
waitmovement 0
return
@@ -130,7 +130,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30
setvar VAR_CABLE_CLUB_STATE, 0
compare VAR_0x8007, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C
- applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4361
+ applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4361
waitmovement 0
applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356
waitmovement 0
@@ -139,7 +139,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30
playse SE_PIN
message OldaleTown_PokemonCenter_2F_Text_1A4E79
waitmessage
- applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358
+ applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
waitmovement 0
applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354
waitmovement 0
@@ -226,13 +226,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E
applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
waitmovement 0
closemessage
- applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B
+ applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435B
waitmovement 0
opendoor 5, 1
waitdooranim
- applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F
+ applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435F
waitmovement 0
- hideobjectat 255, MAP_PETALBURG_CITY
+ hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 5, 1
waitdooranim
release
@@ -390,13 +390,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166
applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
waitmovement 0
closemessage
- applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B
+ applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435B
waitmovement 0
opendoor 8, 1
waitdooranim
- applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F
+ applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435F
waitmovement 0
- hideobjectat 255, MAP_PETALBURG_CITY
+ hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 8, 1
waitdooranim
release
@@ -487,13 +487,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294
applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
waitmovement 0
closemessage
- applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B
+ applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435B
waitmovement 0
opendoor 11, 1
waitdooranim
- applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F
+ applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435F
waitmovement 0
- hideobjectat 255, MAP_PETALBURG_CITY
+ hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 11, 1
waitdooranim
release
diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc
index 5b946fbdb..a5b0c77bf 100644
--- a/data/scripts/magma_chimney.inc
+++ b/data/scripts/magma_chimney.inc
@@ -69,7 +69,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
call_if_eq MtChimney_EventScript_1B2D7D
compare VAR_FACING, 2
call_if_eq MtChimney_EventScript_1B2D88
- applymovement 255, Common_Movement_WalkInPlaceFastestLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
.ifdef SAPPHIRE
msgbox MtChimney_Text_1B3608, MSGBOX_DEFAULT
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index a74342b7b..473db0e30 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -15,19 +15,19 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956
msgbox LittlerootTown_BrendansHouse_1F_Text_172453, MSGBOX_DEFAULT
closemessage
setvar VAR_LITTLEROOT_INTRO_STATE, 4
- applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B69B5
+ applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B69B5
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
releaseall
end
LittlerootTown_BrendansHouse_1F_EventScript_1B699F:: @ 81B699F
- applymovement 255, Common_Movement_WalkInPlaceFastestRight
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_1B69AA:: @ 81B69AA
- applymovement 255, Common_Movement_WalkInPlaceFastestLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
@@ -40,7 +40,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7
msgbox LittlerootTown_BrendansHouse_1F_Text_172531, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
- applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC
+ applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC
waitmovement 0
releaseall
end
@@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31
addobject VAR_0x8008
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2
waitmovement 0
- applymovement 255, Common_Movement_WalkInPlaceFastestRight
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT
closemessage
@@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61
addobject VAR_0x8008
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD
waitmovement 0
- applymovement 255, Common_Movement_WalkInPlaceFastestLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT
closemessage
@@ -157,17 +157,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D
- applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC
+ applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC
waitmovement 0
playbgm MUS_INTER_V, FALSE
msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB
waitmovement 0
- applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2
+ applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2
waitmovement 0
call LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE
- applymovement 255, Common_Movement_WalkInPlaceFastestLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, MSGBOX_DEFAULT
msgbox LittlerootTown_BrendansHouse_1F_Text_172644, MSGBOX_DEFAULT
@@ -182,17 +182,17 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D
- applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4
+ applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1B6CD4
waitmovement 0
playbgm MUS_INTER_V, FALSE
msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE
waitmovement 0
- applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CDA
+ applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1B6CDA
waitmovement 0
call LittlerootTown_MaysHouse_1F_EventScript_1B6BBE
- applymovement 255, Common_Movement_WalkInPlaceFastestRight
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, MSGBOX_DEFAULT
msgbox LittlerootTown_MaysHouse_1F_Text_172644, MSGBOX_DEFAULT
@@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D
LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
- applymovement 255, Common_Movement_WalkInPlaceFastestUp
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_172841, MSGBOX_DEFAULT
fadedefaultbgm
@@ -433,24 +433,24 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE:: @ 81B6DEE
return
LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9:: @ 81B6DF9
- applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F
+ applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F
applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E3D
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B:: @ 81B6E0B
- applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F
+ applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F
applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E43
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D:: @ 81B6E1D
- applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E49
+ applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E49
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_1B6E28:: @ 81B6E28
- applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E54
+ applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E54
waitmovement 0
return
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-22 11:24:56 +0000