Add Common_ to movements.inc

This commit is contained in:
Jaizu
2022-08-28 16:51:45 +02:00
parent 7c0b46f6da
commit ce612de462
67 changed files with 312 additions and 312 deletions
@@ -140,7 +140,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
@@ -150,18 +150,18 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
@@ -215,7 +215,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene::
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
waitmovement 0
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterUp
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
clearflag FLAG_DONT_TRANSITION_MUSIC
savebgm MUS_DUMMY
@@ -262,7 +262,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalReact::
PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_PROF_OAK, Movement_FaceDown
applymovement LOCALID_PROF_OAK, Common_Movement_FaceDown
waitmovement 0
msgbox PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet
closemessage
@@ -296,13 +296,13 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight::
PalletTown_ProfessorOaksLab_EventScript_RivalBattle::
textcolor NPC_TEXT_COLOR_MALE
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons
closemessage
applymovement LOCALID_PROF_OAK, Movement_FaceDown
applymovement LOCALID_PROF_OAK, Common_Movement_FaceDown
waitmovement 0
goto_if_eq VAR_STARTER_MON, 0, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander
goto_if_eq VAR_STARTER_MON, 1, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur
@@ -625,9 +625,9 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
closemessage
delay 30
playse SE_PIN
applymovement LOCALID_PROF_OAK, Movement_ExclamationMark
applymovement LOCALID_PROF_OAK, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_PROF_OAK, Movement_Delay48
applymovement LOCALID_PROF_OAK, Common_Movement_Delay48
waitmovement 0
call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth
call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast
@@ -644,7 +644,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
delay 40
msgbox PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou
closemessage
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterUp
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
removeobject LOCALID_POKEDEX_1
delay 10
@@ -804,7 +804,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexCompleted::
call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth
call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast
call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest
applymovement LOCALID_PROF_OAK, Movement_FacePlayer
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
closemessage
delay 70
@@ -966,7 +966,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth::
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
@@ -975,52 +975,52 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest::
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth::
applymovement LOCALID_PROF_OAK, Movement_FacePlayer
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
delay 15
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest::
applymovement LOCALID_PROF_OAK, Movement_FacePlayer
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
delay 15
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast::
applymovement LOCALID_PROF_OAK, Movement_FacePlayer
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
delay 15
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth::
applymovement LOCALID_RIVAL, Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth::
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest::
applymovement LOCALID_RIVAL, Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -1036,7 +1036,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalExit::
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
@@ -1088,7 +1088,7 @@ PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall::
end
PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice::
applymovement LOCALID_PROF_OAK, Movement_FaceRight
applymovement LOCALID_PROF_OAK, Common_Movement_FaceRight
waitmovement 0
showmonpic PLAYER_STARTER_SPECIES, 10, 3
textcolor NPC_TEXT_COLOR_MALE