diff options
Diffstat (limited to 'data/maps/MtMoon_B2F/scripts.inc')
| -rw-r--r-- | data/maps/MtMoon_B2F/scripts.inc | 61 |
1 files changed, 28 insertions, 33 deletions
diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 5c26a3ad1..71c458c12 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -1,10 +1,9 @@ MtMoon_B2F_MapScripts:: @ 8160699 - map_script 3, MtMoon_B2F_MapScript1_16069F + map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_B2F_OnTransition .byte 0 -MtMoon_B2F_MapScript1_16069F:: @ 816069F - checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON - call_if FALSE, EventScript_1606A9 +MtMoon_B2F_OnTransition:: @ 816069F + call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_1606A9 end EventScript_1606A9:: @ 81606A9 @@ -14,7 +13,7 @@ EventScript_1606A9:: @ 81606A9 MtMoon_B2F_EventScript_1606B0:: @ 81606B0 lockall - applymovement 3, Movement_1A75EB + applymovement 3, Movement_WalkInPlaceFastestRight waitmovement 0 call EventScript_1606DD releaseall @@ -23,10 +22,8 @@ MtMoon_B2F_EventScript_1606B0:: @ 81606B0 MtMoon_B2F_EventScript_1606C2:: @ 81606C2 lock faceplayer - checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON - goto_if TRUE, EventScript_160707 - checktrainerflag TRAINER_SUPER_NERD_MIGUEL - goto_if eq, EventScript_160711 + goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_160707 + goto_if_defeated TRAINER_SUPER_NERD_MIGUEL, EventScript_160711 call EventScript_1606DD release end @@ -38,7 +35,7 @@ EventScript_1606DD:: @ 81606DD playbgm MUS_EXEYE, 0 waitbuttonpress setvar VAR_LAST_TALKED, 3 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_MIGUEL, 0, Text_172B99 + trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, Text_172B99 setvar VAR_MAP_SCENE_MT_MOON_B2F, 1 msgbox gUnknown_8172BAB return @@ -57,11 +54,10 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B lock faceplayer msgbox gUnknown_8172E77, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1607DE + compare VAR_RESULT, NO + goto_if_eq EventScript_1607DE removeobject 1 - additem ITEM_DOME_FOSSIL, 1 - giveitemfanfaremsg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 + giveitem_msg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 @@ -80,21 +76,20 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B end Movement_16077A:: @ 816077A - step_13 - step_11 - step_11 - step_11 + walk_right + walk_up + walk_up + walk_up step_end MtMoon_B2F_EventScript_16077F:: @ 816077F lock faceplayer msgbox gUnknown_8172E94, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1607DE + compare VAR_RESULT, NO + goto_if_eq EventScript_1607DE removeobject 2 - additem ITEM_HELIX_FOSSIL, 1 - giveitemfanfaremsg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 + giveitem_msg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 closemessage special sub_8112364 delay 10 @@ -117,27 +112,27 @@ EventScript_1607DE:: @ 81607DE end Movement_1607E0:: @ 81607E0 - step_11 - step_11 - step_11 + walk_up + walk_up + walk_up step_end MtMoon_B2F_EventScript_1607E4:: @ 81607E4 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT, 0, Text_172C5A, Text_172CB8 - msgbox gUnknown_8172CCB, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, Text_172C5A, Text_172CB8 + msgbox gUnknown_8172CCB, MSGBOX_AUTOCLOSE end MtMoon_B2F_EventScript_1607FB:: @ 81607FB - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_2, 0, Text_172CFC, Text_172D46 - msgbox gUnknown_8172D51, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, Text_172CFC, Text_172D46 + msgbox gUnknown_8172D51, MSGBOX_AUTOCLOSE end MtMoon_B2F_EventScript_160812:: @ 8160812 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_3, 0, Text_172D82, Text_172DAF - msgbox gUnknown_8172DC1, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, Text_172D82, Text_172DAF + msgbox gUnknown_8172DC1, MSGBOX_AUTOCLOSE end MtMoon_B2F_EventScript_160829:: @ 8160829 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_4, 0, Text_172DF0, Text_172E3E - msgbox gUnknown_8172E4B, 6 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, Text_172DF0, Text_172E3E + msgbox gUnknown_8172E4B, MSGBOX_AUTOCLOSE end |