diff options
Diffstat (limited to 'data/maps/ThreeIsland_BerryForest/scripts.inc')
| -rw-r--r-- | data/maps/ThreeIsland_BerryForest/scripts.inc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 3119a1d44..9ac90a4c4 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -1,8 +1,8 @@ ThreeIsland_BerryForest_MapScripts:: @ 8163C71 - map_script 3, ThreeIsland_BerryForest_MapScript1_163C77 + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_BerryForest_OnTransition .byte 0 -ThreeIsland_BerryForest_MapScript1_163C77:: @ 8163C77 +ThreeIsland_BerryForest_OnTransition:: @ 8163C77 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6 end @@ -12,26 +12,26 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 faceplayer msgbox gUnknown_817ADD6 playse SE_PIN - applymovement 1, Movement_1A75DB + applymovement 1, Movement_ExclamationMark waitmovement 0 applymovement 1, Movement_163D22 waitmovement 0 msgbox gUnknown_817AE8E special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 waitse playmoncry SPECIES_HYPNO, 2 waitmoncry setwildbattle SPECIES_HYPNO, 30, ITEM_NONE dowildbattle special sub_8112364 - applymovement 1, Movement_1A75E1 + applymovement 1, Movement_FacePlayer waitmovement 0 msgbox gUnknown_817AEE1 giveitem ITEM_IAPAPA_BERRY - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_163D19 + compare VAR_RESULT, 0 + call_if_eq EventScript_163D19 special Special_BufferBigGuyOrBigGirlString msgbox gUnknown_817AF3B closemessage @@ -49,17 +49,17 @@ EventScript_163D19:: @ 8163D19 return Movement_163D22:: @ 8163D22 - step_2f - step_1c - step_30 - step_1b - step_2f + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_left step_end ThreeIsland_BerryForest_EventScript_163D28:: @ 8163D28 - msgbox gUnknown_817AFD6, 3 + msgbox gUnknown_817AFD6, MSGBOX_SIGN end ThreeIsland_BerryForest_EventScript_163D31:: @ 8163D31 - msgbox gUnknown_817B029, 3 + msgbox gUnknown_817B029, MSGBOX_SIGN end |