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

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-09-03 14:31:04 -04:00
committed by GitHub
parent ab56ac41a1 ccd527b782
commit 0400ee2124
353 changed files with 20156 additions and 19152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PalletTown/scripts.inc
+11 -11
View File
@@ -190,10 +190,10 @@ PalletTown_EventScript_OakTrigger::
waitmessage
delay 85
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement OBJ_EVENT_ID_PLAYER, Movement_ExclamationMark
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark
waitmovement 0
delay 30
addobject LOCALID_PROF_OAK
@@ -332,12 +332,12 @@ PalletTown_EventScript_SignLady::
goto_if_eq SIGN_LADY_READY, TRUE, PalletTown_EventScript_SignLadyStartShowSign
goto_if_set FLAG_TEMP_2, PalletTown_EventScript_SignLadyGoReadSign
msgbox PalletTown_Text_HmmIsThatRight
applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
waitmovement 0
playse SE_PIN
applymovement LOCALID_SIGN_LADY, Movement_ExclamationMark
applymovement LOCALID_SIGN_LADY, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_SIGN_LADY, Movement_Delay48
applymovement LOCALID_SIGN_LADY, Common_Movement_Delay48
waitmovement 0
msgbox PalletTown_Text_OhLookLook
closemessage
@@ -359,21 +359,21 @@ PalletTown_EventScript_SignLadyMoveOutOfWayLeft::
return
PalletTown_EventScript_SignLadyDone::
applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
waitmovement 0
msgbox PalletTown_Text_RaisingMonsToo
release
end
PalletTown_EventScript_SignLadyGoReadSign::
applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
waitmovement 0
msgbox PalletTown_Text_ReadItReadIt
release
end
PalletTown_EventScript_SignLadyJustShowedSign::
applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
waitmovement 0
msgbox PalletTown_Text_SignsAreUsefulArentThey
release
@@ -421,8 +421,8 @@ PalletTown_EventScript_TrainerTips::
PalletTown_EventScript_SignLadyTrigger::
lockall
applymovement LOCALID_SIGN_LADY, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_SIGN_LADY, Common_Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
call PalletTown_EventScript_SignLadyShowSign
releaseall
@@ -445,7 +445,7 @@ PalletTown_EventScript_SignLadyShowSign::
return
PalletTown_EventScript_SignLadyStartShowSign::
applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
waitmovement 0
call PalletTown_EventScript_SignLadyShowSign
release