diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-12 17:04:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 17:04:23 -0500 |
| commit | 92d99d4fd2e5579372b9f4cc39468000553ba3a8 (patch) | |
| tree | 4ff8e60d1ad6a25dad888a4e78011624b46ad9ec /data/maps/PokemonTower_2F | |
| parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) | |
| parent | 0676e732869d0e62322b001cbab57b8500361005 (diff) | |
Merge pull request #207 from GriffinRichards/sync-script
Sync scripts with pokeemerald
Diffstat (limited to 'data/maps/PokemonTower_2F')
| -rw-r--r-- | data/maps/PokemonTower_2F/scripts.inc | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index ff5fd8b9b..7180936fb 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -2,47 +2,47 @@ PokemonTower_2F_MapScripts:: @ 8163285 .byte 0 PokemonTower_2F_EventScript_163286:: @ 8163286 - msgbox gUnknown_8179EAE, 2 + msgbox gUnknown_8179EAE, MSGBOX_NPC end PokemonTower_2F_EventScript_16328F:: @ 816328F lockall - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 goto EventScript_1632A7 end PokemonTower_2F_EventScript_16329B:: @ 816329B lockall - setvar VAR_0x4001, 1 + setvar VAR_TEMP_1, 1 goto EventScript_1632A7 end EventScript_1632A7:: @ 81632A7 textcolor 0 playbgm MUS_RIVAL1, 0 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_163339 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16334B - applymovement 1, Movement_1A75DB + compare VAR_TEMP_1, 0 + call_if_eq EventScript_163339 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16334B + applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_1A75DD + applymovement 1, Movement_Delay48 waitmovement 0 msgbox gUnknown_8179CFF setvar VAR_LAST_TALKED, 1 - compare_var_to_value VAR_STARTER_MON, 2 - call_if eq, EventScript_16335D - compare_var_to_value VAR_STARTER_MON, 1 - call_if eq, EventScript_163368 - compare_var_to_value VAR_STARTER_MON, 0 - call_if eq, EventScript_163373 + compare VAR_STARTER_MON, 2 + call_if_eq EventScript_16335D + compare VAR_STARTER_MON, 1 + call_if_eq EventScript_163368 + compare VAR_STARTER_MON, 0 + call_if_eq EventScript_163373 msgbox gUnknown_8179DD4 closemessage playbgm MUS_RIVAL2, 0 - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16337E - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_163389 + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16337E + compare VAR_TEMP_1, 1 + call_if_eq EventScript_163389 playse SE_KAIDAN delay 25 fadedefaultbgm @@ -52,27 +52,27 @@ EventScript_1632A7:: @ 81632A7 end EventScript_163339:: @ 8163339 - applymovement 1, Movement_1A75EB - applymovement 255, Movement_1A75E7 + applymovement 1, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return EventScript_16334B:: @ 816334B - applymovement 1, Movement_1A75ED - applymovement 255, Movement_1A75E9 + applymovement 1, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return EventScript_16335D:: @ 816335D - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, 0, Text_179D73 + trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, Text_179D73 return EventScript_163368:: @ 8163368 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, 0, Text_179D73 + trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, Text_179D73 return EventScript_163373:: @ 8163373 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, 0, Text_179D73 + trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, Text_179D73 return EventScript_16337E:: @ 816337E @@ -86,23 +86,23 @@ EventScript_163389:: @ 8163389 return Movement_163394:: @ 8163394 - step_10 - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_30 + walk_down + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end Movement_16339D:: @ 816339D - step_13 - step_13 - step_10 - step_10 - step_10 - step_10 - step_10 - step_30 + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end |