dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Common_ to movements.inc

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/cable_club.inc
+1 -1
View File
@@ -181,7 +181,7 @@ CableClub_EventScript_PlayerExitLinkRoom::
CableClub_EventScript_Tutorial::
lockall
textcolor NPC_TEXT_COLOR_FEMALE
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox CableClub_Text_FirstTimeRightThisWay
closemessage
data/scripts/movement.inc
+17 -17
View File
@@ -1,55 +1,55 @@
Movement_QuestionMark::
Common_Movement_QuestionMark::
emote_question_mark
step_end
Movement_ExclamationMark::
Common_Movement_ExclamationMark::
emote_exclamation_mark
step_end
Movement_Delay48::
Common_Movement_Delay48::
delay_16
delay_16
delay_16
step_end
Movement_FacePlayer::
Common_Movement_FacePlayer::
face_player
step_end
@ Unused
Movement_FaceAwayPlayer::
Common_Movement_FaceAwayPlayer::
face_away_player
step_end
Movement_FaceOriginalDirection::
Common_Movement_FaceOriginalDirection::
face_original_direction
step_end
Movement_WalkInPlaceFasterLeft::
Common_Movement_WalkInPlaceFasterLeft::
walk_in_place_faster_left
step_end
Movement_WalkInPlaceFasterUp::
Common_Movement_WalkInPlaceFasterUp::
walk_in_place_faster_up
step_end
Movement_WalkInPlaceFasterRight::
Common_Movement_WalkInPlaceFasterRight::
walk_in_place_faster_right
step_end
Movement_WalkInPlaceFasterDown::
Common_Movement_WalkInPlaceFasterDown::
walk_in_place_faster_down
step_end
Movement_FaceRight::
Common_Movement_FaceRight::
face_right
step_end
Movement_FaceDown::
Common_Movement_FaceDown::
face_down
step_end
Movement_WalkUp5::
Common_Movement_WalkUp5::
walk_up
walk_up
walk_up
@@ -58,25 +58,25 @@ Movement_WalkUp5::
step_end
@ Unused
Movement_WalkUp4::
Common_Movement_WalkUp4::
walk_up
walk_up
walk_up
walk_up
step_end
Movement_Delay32::
Common_Movement_Delay32::
delay_16
delay_16
step_end
@ Unused
Movement_WalkUp::
Common_Movement_WalkUp::
walk_up
step_end
@ Unused
Movement_WalkUp2::
Common_Movement_WalkUp2::
walk_up
walk_up
step_end
data/scripts/pkmn_center_nurse.inc
+2 -2
View File
@@ -19,11 +19,11 @@ EventScript_PkmnCenterNurse_HealPkmn::
end
EventScript_PkmnCenterNurse_TakeAndHealPkmn::
applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFasterLeft
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
dofieldeffect FLDEFF_POKECENTER_HEAL
waitfieldeffect FLDEFF_POKECENTER_HEAL
applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFasterDown
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
special HealPlayerParty
return
data/scripts/pokemon_league.inc
+3 -3
View File
@@ -1,5 +1,5 @@
PokemonLeague_EventScript_OpenDoor::
applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
waitmovement 0
playse SE_RS_DOOR
call PokemonLeague_EventScript_SetDoorOpen
@@ -8,7 +8,7 @@ PokemonLeague_EventScript_OpenDoor::
return
PokemonLeague_EventScript_EnterRoom::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp5
waitmovement 0
setflag FLAG_TEMP_2
playse SE_UNLOCK
@@ -32,7 +32,7 @@ PokemonLeague_EventScript_PreventExit::
end
PokemonLeague_EventScript_OpenDoorLance::
applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
waitmovement 0
playse SE_RS_DOOR
setmetatile 6, 4, METATILE_PokemonLeague_Door_Top_Open, 1
data/scripts/questionnaire.inc
+4 -4
View File
@@ -15,12 +15,12 @@ EventScript_Questionnaire::
end
EventScript_EnableMysteryGift::
applymovement VAR_0x8008, Movement_FaceDown
applymovement VAR_0x8008, Common_Movement_FaceDown
waitmovement 0
playse SE_PIN
applymovement VAR_0x8008, Movement_ExclamationMark
applymovement VAR_0x8008, Common_Movement_ExclamationMark
waitmovement 0
applymovement VAR_0x8008, Movement_Delay48
applymovement VAR_0x8008, Common_Movement_Delay48
waitmovement 0
msgbox Text_YouKnowThoseWords
setflag FLAG_SYS_MYSTERY_GIFT_ENABLED
@@ -37,7 +37,7 @@ EventScript_DeclineQuestionnaire::
end
EventScript_TookQuestionnaire::
applymovement VAR_0x8008, Movement_FaceDown
applymovement VAR_0x8008, Common_Movement_FaceDown
waitmovement 0
msgbox Text_QuestionnaireThankYou
releaseall
data/scripts/route23.inc
+3 -3
View File
@@ -114,7 +114,7 @@ Route23_EventScript_RecognizeBadge::
Route23_EventScript_BadgeGuardTrigger::
textcolor NPC_TEXT_COLOR_MALE
applymovement VAR_0x8009, Movement_WalkInPlaceFasterLeft
applymovement VAR_0x8009, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
switch VAR_TEMP_1
case 1, Route23_EventScript_CheckBoulderBadgeTrigger
@@ -173,7 +173,7 @@ Route23_EventScript_MissingBoulderBadgeTrigger::
msgbox Text_CantLetYouPass
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown
applymovement VAR_0x8009, Movement_WalkInPlaceFasterDown
applymovement VAR_0x8009, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
releaseall
end
@@ -186,7 +186,7 @@ Route23_EventScript_MissingBadgeTrigger::
closemessage
waitse
applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown
applymovement VAR_0x8009, Movement_WalkInPlaceFasterDown
applymovement VAR_0x8009, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
releaseall
end
data/scripts/seagallop.inc
+1 -1
View File
@@ -117,7 +117,7 @@ EventScript_CancelSail::
VermilionCity_EventScript_WalkUpPier::
closemessage
applymovement LOCALID_FERRY_SAILOR, Movement_FaceOriginalDirection
applymovement LOCALID_FERRY_SAILOR, Common_Movement_FaceOriginalDirection
applymovement OBJ_EVENT_ID_PLAYER, VermilionCity_Movement_WalkUp
waitmovement 0
releaseall
data/scripts/trainer_card.inc
+4 -4
View File
@@ -74,12 +74,12 @@ FourIsland_House2_EventScript_StickerMan::
FourIsland_House2_EventScript_MeetStickerMan::
setflag FLAG_MET_STICKER_MAN
msgbox FourIsland_House2_Text_WishICouldShowOffStickers
applymovement LOCALID_STICKER_MAN, Movement_FacePlayer
applymovement LOCALID_STICKER_MAN, Common_Movement_FacePlayer
waitmovement 0
playse SE_PIN
applymovement LOCALID_STICKER_MAN, Movement_ExclamationMark
applymovement LOCALID_STICKER_MAN, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_STICKER_MAN, Movement_Delay48
applymovement LOCALID_STICKER_MAN, Common_Movement_Delay48
waitmovement 0
goto_if_eq VAR_0x8008, 0, FourIsland_House2_EventScript_StickerManNothingToBrag
message FourIsland_House2_Text_GiveYouStickerIfYouBrag
@@ -88,7 +88,7 @@ FourIsland_House2_EventScript_MeetStickerMan::
end
FourIsland_House2_EventScript_StickerManAskForBrag::
applymovement LOCALID_STICKER_MAN, Movement_FacePlayer
applymovement LOCALID_STICKER_MAN, Common_Movement_FacePlayer
waitmovement 0
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_CutRecording
data/scripts/trainer_tower.inc
+12 -12
View File
@@ -109,9 +109,9 @@ TrainerTower_EventScript_TriggerBattle::
TrainerTower_EventScript_DoSingleBattle:
ttower_encountermusic
applymovement LOCALID_TRAINER_SINGLES, Movement_ExclamationMark
applymovement LOCALID_TRAINER_SINGLES, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_SINGLES, Movement_Delay48
applymovement LOCALID_TRAINER_SINGLES, Common_Movement_Delay48
waitmovement 0
setvar DISABLE_SINGLES_TRIGGER, TRUE
applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_SingleTrainerApproach
@@ -144,9 +144,9 @@ TrainerTower_EventScript_DoKnockoutBattle::
TrainerTower_EventScript_DoKnockoutBattle1:
ttower_encountermusic
applymovement LOCALID_TRAINER_KNOCKOUT, Movement_ExclamationMark
applymovement LOCALID_TRAINER_KNOCKOUT, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_KNOCKOUT, Movement_Delay48
applymovement LOCALID_TRAINER_KNOCKOUT, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_TRAINER_KNOCKOUT, TrainerTower_Movement_BottomKnockoutTrainerApproach
waitmovement 0
@@ -154,9 +154,9 @@ TrainerTower_EventScript_DoKnockoutBattle1:
TrainerTower_EventScript_DoKnockoutBattle2::
ttower_encountermusic
applymovement LOCALID_TRAINER_DOUBLES1, Movement_ExclamationMark
applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_DOUBLES1, Movement_Delay48
applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_TopKnockoutTrainerApproach
waitmovement 0
@@ -164,9 +164,9 @@ TrainerTower_EventScript_DoKnockoutBattle2::
TrainerTower_EventScript_DoKnockoutBattle3::
ttower_encountermusic
applymovement LOCALID_TRAINER_SINGLES, Movement_ExclamationMark
applymovement LOCALID_TRAINER_SINGLES, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_SINGLES, Movement_Delay48
applymovement LOCALID_TRAINER_SINGLES, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_RightKnockoutTrainerApproach
waitmovement 0
@@ -339,9 +339,9 @@ TrainerTower_EventScript_DoubleBattleTriggerTop::
ttower_checkdoubles
goto_if_ne VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS, TrainerTower_EventScript_IneligibleForDoubleBattle
ttower_encountermusic
applymovement LOCALID_TRAINER_DOUBLES1, Movement_ExclamationMark
applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_DOUBLES1, Movement_Delay48
applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_Delay48
goto TrainerTower_EventScript_TriggerDoubleBattle
TrainerTower_EventScript_DoubleBattleTriggerBottom::
@@ -349,9 +349,9 @@ TrainerTower_EventScript_DoubleBattleTriggerBottom::
ttower_checkdoubles
goto_if_ne VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS, TrainerTower_EventScript_IneligibleForDoubleBattle
ttower_encountermusic
applymovement LOCALID_TRAINER_DOUBLES2, Movement_ExclamationMark
applymovement LOCALID_TRAINER_DOUBLES2, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_DOUBLES2, Movement_Delay48
applymovement LOCALID_TRAINER_DOUBLES2, Common_Movement_Delay48
TrainerTower_EventScript_TriggerDoubleBattle:
waitmovement 0
setvar DISABLE_DOUBLES_TRIGGER, TRUE
data/scripts/white_out.inc
+1 -1
View File
@@ -24,7 +24,7 @@ EventScript_AfterWhiteOutHealMsg::
EventScript_AfterWhiteOutMomHeal::
lockall
textcolor NPC_TEXT_COLOR_FEMALE
applymovement LOCALID_MOM, Movement_WalkInPlaceFasterDown
applymovement LOCALID_MOM, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox Text_HadQuiteAnExperienceTakeRest
call EventScript_OutOfCenterPartyHeal