diff options
Diffstat (limited to 'data/maps/PewterCity/scripts.inc')
| -rw-r--r-- | data/maps/PewterCity/scripts.inc | 62 |
1 files changed, 29 insertions, 33 deletions
diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index d4c461de2..352da6d31 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -4,7 +4,7 @@ PewterCity_MapScripts:: @ 8165B8E PewterCity_MapScript1_165B94:: @ 8165B94 setworldmapflag FLAG_WORLD_MAP_PEWTER_CITY - setvar VAR_0x4061, 0 + setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 0 end PewterCity_EventScript_165B9D:: @ 8165B9D @@ -14,14 +14,14 @@ PewterCity_EventScript_165B9D:: @ 8165B9D closemessage playbgm MUS_ANNAI, 0 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_165BD3 + call_if eq, EventScript_165BD3 msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 waitmovement 0 fadedefaultbgm removeobject 5 - clearflag FLAG_0x02E + clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE release end @@ -446,18 +446,18 @@ EventScript_165DBE:: @ 8165DBE closemessage playbgm MUS_ANNAI, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_165E0A + call_if eq, EventScript_165E0A compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_165E26 + call_if eq, EventScript_165E26 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_165E42 + call_if eq, EventScript_165E42 msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 waitmovement 0 fadedefaultbgm removeobject 5 - clearflag FLAG_0x02E + clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE releaseall end @@ -1033,19 +1033,19 @@ PewterCity_EventScript_16607E:: @ 816607E faceplayer msgbox gUnknown_817E53E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_166136 + goto_if eq, EventScript_166136 msgbox gUnknown_817E589 closemessage delay 10 playbgm MUS_ANNAI, 0 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1660EE + call_if eq, EventScript_1660EE compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_166100 + call_if eq, EventScript_166100 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_166112 + call_if eq, EventScript_166112 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_166124 + call_if eq, EventScript_166124 msgbox gUnknown_817E5AC closemessage delay 10 @@ -1053,7 +1053,7 @@ PewterCity_EventScript_16607E:: @ 816607E waitmovement 0 fadedefaultbgm removeobject 2 - clearflag FLAG_0x050 + clearflag FLAG_HIDE_PEWTER_MUSEUM_GUIDE release end @@ -1342,9 +1342,7 @@ Movement_16621C:: @ 816621C PewterCity_EventScript_16622B:: @ 816622B lock faceplayer - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BROCK, 2 msgbox gUnknown_817E49F release end @@ -1354,7 +1352,7 @@ PewterCity_EventScript_166244:: @ 8166244 faceplayer msgbox gUnknown_817E602, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_166263 + goto_if eq, EventScript_166263 msgbox gUnknown_817E644 release end @@ -1378,9 +1376,7 @@ PewterCity_EventScript_16627F:: @ 816627F PewterCity_EventScript_166288:: @ 8166288 lockall - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BROCK, 0 msgbox gUnknown_817E7DE releaseall end @@ -1421,11 +1417,11 @@ PewterCity_EventScript_1662D1:: @ 81662D1 EventScript_1662DE:: @ 81662DE textcolor 0 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1663CA + call_if eq, EventScript_1663CA compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1663CA + call_if eq, EventScript_1663CA compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1663CA + call_if eq, EventScript_1663CA waitse playse SE_PIN applymovement 7, Movement_1A75DB @@ -1434,13 +1430,13 @@ EventScript_1662DE:: @ 81662DE waitmovement 0 msgbox gUnknown_817E902 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1663D5 + call_if eq, EventScript_1663D5 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1663DA + call_if eq, EventScript_1663DA compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1663E6 + call_if eq, EventScript_1663E6 compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1663FC + call_if eq, EventScript_1663FC msgbox gUnknown_817E90C textcolor 3 playfanfare MUS_FAN5 @@ -1456,20 +1452,20 @@ EventScript_1662DE:: @ 81662DE msgbox gUnknown_817EA06 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_166412 + call_if eq, EventScript_166412 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16641D + call_if eq, EventScript_16641D compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_166428 + call_if eq, EventScript_166428 compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_166433 + call_if eq, EventScript_166433 delay 30 textcolor 3 msgbox gUnknown_817EA36 closemessage removeobject 7 - setflag FLAG_0x82F - setvar VAR_0x406C, 2 + setflag FLAG_SYS_RUNNING_SHOES + setvar VAR_MAP_SCENE_PEWTER_CITY, 2 return EventScript_1663CA:: @ 81663CA |