diff options
Diffstat (limited to 'data/maps/CeruleanCity/scripts.inc')
| -rw-r--r-- | data/maps/CeruleanCity/scripts.inc | 246 |
1 files changed, 121 insertions, 125 deletions
diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index bd660c660..2e75b82b4 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -1,11 +1,10 @@ CeruleanCity_MapScripts:: @ 8166471 - map_script 3, CeruleanCity_MapScript1_166477 + map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_OnTransition .byte 0 -CeruleanCity_MapScript1_166477:: @ 8166477 +CeruleanCity_OnTransition:: @ 8166477 setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY - checkflag FLAG_GOT_SS_TICKET - call_if FALSE, EventScript_166484 + call_if_unset FLAG_GOT_SS_TICKET, EventScript_166484 end EventScript_166484:: @ 8166484 @@ -16,20 +15,20 @@ EventScript_166484:: @ 8166484 CeruleanCity_EventScript_16649A:: @ 816649A lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_1664CC end CeruleanCity_EventScript_1664A6:: @ 81664A6 lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 8, 23, 0 goto EventScript_1664CC end CeruleanCity_EventScript_1664B9:: @ 81664B9 lockall - setvar VAR_0x4001, 2 + setvar VAR_TEMP_1, 2 setobjectxyperm 8, 24, 0 goto EventScript_1664CC end @@ -43,22 +42,22 @@ EventScript_1664CC:: @ 81664CC waitmovement 0 msgbox gUnknown_817EAD7 setvar VAR_LAST_TALKED, 8 - compare_var_to_value VAR_STARTER_MON, 2 - call_if eq, EventScript_166582 - compare_var_to_value VAR_STARTER_MON, 1 - call_if eq, EventScript_16658D - compare_var_to_value VAR_STARTER_MON, 0 - call_if eq, EventScript_166598 + compare VAR_STARTER_MON, 2 + call_if_eq EventScript_166582 + compare VAR_STARTER_MON, 1 + call_if_eq EventScript_16658D + compare VAR_STARTER_MON, 0 + call_if_eq EventScript_166598 famechecker FAMECHECKER_BILL, 0 msgbox gUnknown_817EB95 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_1665A3 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_1665A3 - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_1665B5 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_1665A3 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_1665A3 + compare VAR_TEMP_1, 2 + call_if_eq EventScript_1665B5 msgbox gUnknown_817ECD4 setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 setflag FLAG_GOT_FAME_CHECKER @@ -73,111 +72,110 @@ EventScript_1664CC:: @ 81664CC end EventScript_166582:: @ 8166582 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_SQUIRTLE, 0, Text_17EB71 + trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_SQUIRTLE, Text_17EB71 return EventScript_16658D:: @ 816658D - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_BULBASAUR, 0, Text_17EB71 + trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_BULBASAUR, Text_17EB71 return EventScript_166598:: @ 8166598 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_CERULEAN_CHARMANDER, 0, Text_17EB71 + trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_CHARMANDER, Text_17EB71 return EventScript_1665A3:: @ 81665A3 - applymovement 255, Movement_1665C7 + applymovement OBJ_EVENT_ID_PLAYER, Movement_1665C7 applymovement 8, Movement_1665D9 waitmovement 0 return EventScript_1665B5:: @ 81665B5 - applymovement 255, Movement_1665CD + applymovement OBJ_EVENT_ID_PLAYER, Movement_1665CD applymovement 8, Movement_1665EA waitmovement 0 return Movement_1665C7:: @ 81665C7 - step_1c - step_1b - step_30 - step_1c - step_2d + delay_16 + delay_8 + walk_in_place_fastest_right + delay_16 + walk_in_place_fastest_down step_end Movement_1665CD:: @ 81665CD - step_1c - step_1b - step_2f - step_1c - step_2d + delay_16 + delay_8 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down step_end Movement_1665D3:: @ 81665D3 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down step_end Movement_1665D9:: @ 81665D9 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_1c - step_1c - step_12 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + delay_16 + delay_16 + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_1665EA:: @ 81665EA - step_12 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_1c - step_1c - step_13 - step_11 - step_11 - step_11 - step_11 - step_11 + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + delay_16 + delay_16 + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up step_end Movement_1665FB:: @ 81665FB - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 - step_10 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end CeruleanCity_EventScript_166603:: @ 8166603 lock faceplayer - checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_5 - goto_if eq, EventScript_16662E + goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_5, EventScript_16662E message Text_17EE0E waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, Text_17EE70 setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 goto EventScript_16662E end @@ -185,15 +183,14 @@ CeruleanCity_EventScript_166603:: @ 8166603 EventScript_16662E:: @ 816662E msgbox gUnknown_817EE9C checkitemspace ITEM_TM28, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_166677 - additem ITEM_TM28, 1 - giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_166677 + giveitem_msg gUnknown_817EEBF, ITEM_TM28 msgbox gUnknown_817EEED closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 2 - fadescreen 0 + fadescreen FADE_FROM_BLACK setflag FLAG_GOT_TM28_FROM_ROCKET release end @@ -206,20 +203,20 @@ EventScript_166677:: @ 8166677 CeruleanCity_EventScript_166683:: @ 8166683 lockall - setvar VAR_0x4001, 0 - applymovement 2, Movement_1A75E9 + setvar VAR_TEMP_1, 0 + applymovement 2, Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 255, Movement_1A75ED + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 goto EventScript_1666C3 end CeruleanCity_EventScript_1666A3:: @ 81666A3 lockall - setvar VAR_0x4001, 1 - applymovement 2, Movement_1A75ED + setvar VAR_TEMP_1, 1 + applymovement 2, Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 255, Movement_1A75E9 + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 goto EventScript_1666C3 end @@ -228,7 +225,7 @@ EventScript_1666C3:: @ 81666C3 textcolor 0 msgbox Text_17EE0E setvar VAR_LAST_TALKED, 2 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70 + trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, Text_17EE70 setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 goto EventScript_16662E end @@ -238,7 +235,7 @@ CeruleanCity_EventScript_1666E7:: @ 81666E7 faceplayer msgbox gUnknown_817F0F1 closemessage - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end @@ -246,8 +243,7 @@ CeruleanCity_EventScript_1666E7:: @ 81666E7 CeruleanCity_EventScript_1666FE:: @ 81666FE lock faceplayer - checkflag FLAG_GOT_SS_TICKET - goto_if TRUE, EventScript_166713 + goto_if_set FLAG_GOT_SS_TICKET, EventScript_166713 msgbox gUnknown_817F01D release end @@ -258,15 +254,15 @@ EventScript_166713:: @ 8166713 end CeruleanCity_EventScript_16671D:: @ 816671D - msgbox gUnknown_817F0B2, 2 + msgbox gUnknown_817F0B2, MSGBOX_NPC end CeruleanCity_EventScript_166726:: @ 8166726 - msgbox gUnknown_817EF3F, 2 + msgbox gUnknown_817EF3F, MSGBOX_NPC end CeruleanCity_EventScript_16672F:: @ 816672F - msgbox gUnknown_817F319, 2 + msgbox gUnknown_817F319, MSGBOX_NPC end CeruleanCity_EventScript_166738:: @ 8166738 @@ -274,7 +270,7 @@ CeruleanCity_EventScript_166738:: @ 8166738 faceplayer msgbox gUnknown_817F2CF closemessage - applymovement 11, Movement_1A75E5 + applymovement 11, Movement_FaceOriginalDirection waitmovement 0 release end @@ -283,24 +279,24 @@ CeruleanCity_EventScript_16674F:: @ 816674F lock random 3 copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 - call_if eq, EventScript_1667B0 - compare_var_to_value VAR_0x8008, 1 - call_if eq, EventScript_1667B6 - compare_var_to_value VAR_0x8008, 2 - call_if eq, EventScript_1667BC + compare VAR_0x8008, 0 + call_if_eq EventScript_1667B0 + compare VAR_0x8008, 1 + call_if_eq EventScript_1667B6 + compare VAR_0x8008, 2 + call_if_eq EventScript_1667BC waitmessage delay 40 playse SE_PIN - applymovement 5, Movement_1A75D9 + applymovement 5, Movement_QuestionMark waitmovement 0 delay 30 - compare_var_to_value VAR_0x8008, 0 - call_if eq, EventScript_1667C2 - compare_var_to_value VAR_0x8008, 1 - call_if eq, EventScript_1667CB - compare_var_to_value VAR_0x8008, 2 - call_if eq, EventScript_1667D4 + compare VAR_0x8008, 0 + call_if_eq EventScript_1667C2 + compare VAR_0x8008, 1 + call_if_eq EventScript_1667CB + compare VAR_0x8008, 2 + call_if_eq EventScript_1667D4 release end @@ -332,14 +328,14 @@ CeruleanCity_EventScript_1667DD:: @ 81667DD lock random 4 copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 - call_if eq, EventScript_166814 - compare_var_to_value VAR_0x8008, 1 - call_if eq, EventScript_16681D - compare_var_to_value VAR_0x8008, 2 - call_if eq, EventScript_166826 - compare_var_to_value VAR_0x8008, 3 - call_if eq, EventScript_16682F + compare VAR_0x8008, 0 + call_if_eq EventScript_166814 + compare VAR_0x8008, 1 + call_if_eq EventScript_16681D + compare VAR_0x8008, 2 + call_if_eq EventScript_166826 + compare VAR_0x8008, 3 + call_if_eq EventScript_16682F release end @@ -360,15 +356,15 @@ EventScript_16682F:: @ 816682F return CeruleanCity_EventScript_166838:: @ 8166838 - msgbox gUnknown_817F420, 3 + msgbox gUnknown_817F420, MSGBOX_SIGN end CeruleanCity_EventScript_166841:: @ 8166841 - msgbox gUnknown_817F453, 3 + msgbox gUnknown_817F453, MSGBOX_SIGN end CeruleanCity_EventScript_16684A:: @ 816684A - msgbox gUnknown_817F4C5, 3 + msgbox gUnknown_817F4C5, MSGBOX_SIGN end CeruleanCity_EventScript_166853:: @ 8166853 |