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-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/ViridianCity_Mart/scripts.inc
+5 -6
View File
@@ -20,8 +20,8 @@ ViridianCity_Mart_OnFrame::
ViridianCity_Mart_EventScript_ParcelScene::
lockall
textcolor 0
applymovement LOCALID_CLERK, Movement_WalkInPlaceFastestDown
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_CLERK, Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox ViridianCity_Mart_Text_YouCameFromPallet
closemessage
@@ -40,7 +40,7 @@ ViridianCity_Mart_Movement_ApproachCounter::
walk_up
walk_up
walk_up
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
ViridianCity_Mart_Movement_FacePlayer::
@@ -48,14 +48,13 @@ ViridianCity_Mart_Movement_FacePlayer::
delay_16
delay_16
delay_16
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
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