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

Merge branch 'master' into movement-action

Browse Source
This commit is contained in:
cbt6
2022-08-15 12:54:47 +08:00
committed by GitHub
parent 7233b2ed0a b3c2c7291f
commit 2644dd9c21
286 changed files with 8970 additions and 9432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/ViridianCity_Mart/scripts.inc
+2 -3
View File
@@ -20,7 +20,7 @@ ViridianCity_Mart_OnFrame::
ViridianCity_Mart_EventScript_ParcelScene::
lockall
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_CLERK, Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox ViridianCity_Mart_Text_YouCameFromPallet
@@ -54,8 +54,7 @@ ViridianCity_Mart_Movement_FacePlayer::
ViridianCity_Mart_EventScript_Clerk::
lock
faceplayer
compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
goto_if_eq ViridianCity_Mart_EventScript_SayHiToOak
goto_if_eq VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1, ViridianCity_Mart_EventScript_SayHiToOak
goto_if_questlog EventScript_ReleaseEnd
message Text_MayIHelpYou
waitmessage