diff options
Diffstat (limited to 'data/maps/ViridianCity_Mart/scripts.inc')
| -rw-r--r-- | data/maps/ViridianCity_Mart/scripts.inc | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 95c45ea7d..fb77b7924 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -1,11 +1,10 @@ ViridianCity_Mart_MapScripts:: @ 816A1D3 - map_script 1, ViridianCity_Mart_MapScript1_16A1DE - map_script 2, ViridianCity_Mart_MapScript2_16A1FB + map_script MAP_SCRIPT_ON_LOAD, ViridianCity_Mart_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, ViridianCity_Mart_OnFrame .byte 0 -ViridianCity_Mart_MapScript1_16A1DE:: @ 816A1DE - checkflag FLAG_SYS_POKEDEX_GET - goto_if FALSE, EventScript_16A1E8 +ViridianCity_Mart_OnLoad:: @ 816A1DE + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_16A1E8 end EventScript_16A1E8:: @ 816A1E8 @@ -13,56 +12,55 @@ EventScript_16A1E8:: @ 816A1E8 setmetatile 1, 4, 704, 1 end -ViridianCity_Mart_MapScript2_16A1FB:: @ 816A1FB +ViridianCity_Mart_OnFrame:: @ 816A1FB map_script_2 VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 0, EventScript_16A205 .2byte 0 EventScript_16A205:: @ 816A205 lockall textcolor 0 - applymovement 1, Movement_1A75ED + applymovement 1, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox gUnknown_819021A closemessage applymovement 1, Movement_16A262 - applymovement 255, Movement_16A25C + applymovement OBJ_EVENT_ID_PLAYER, Movement_16A25C waitmovement 0 msgbox gUnknown_819023A setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - additem ITEM_OAKS_PARCEL, 1 - giveitemfanfaremsg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, MUS_FAN5 + giveitem_msg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, MUS_FAN5 setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5 releaseall end Movement_16A25C:: @ 816A25C - step_11 - step_11 - step_11 - step_11 - step_2f + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_left step_end Movement_16A262:: @ 816A262 - step_1c - step_1c - step_1c - step_1c - step_30 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_right step_end ViridianCity_Mart_EventScript_16A268:: @ 816A268 lock faceplayer - compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if eq, EventScript_16A2A4 + compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 + goto_if_eq EventScript_16A2A4 special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 - message Text_1A6211 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 + message Text_MayIHelpYou waitmessage pokemart Items_16A298 - msgbox gUnknown_81A5190 + msgbox Text_PleaseComeAgain release end @@ -82,9 +80,9 @@ EventScript_16A2A4:: @ 816A2A4 end ViridianCity_Mart_EventScript_16A2AE:: @ 816A2AE - msgbox gUnknown_81902F5, 2 + msgbox gUnknown_81902F5, MSGBOX_NPC end ViridianCity_Mart_EventScript_16A2B7:: @ 816A2B7 - msgbox gUnknown_819032C, 2 + msgbox gUnknown_819032C, MSGBOX_NPC end |