diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
| commit | 8cd4908fa3820b22a8b4e3d96780d725132549c4 (patch) | |
| tree | bcc8e697ce7dd0d4ab532a61fccafbbdb6d2400e /data/scripts/maps/Route101.inc | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
Diffstat (limited to 'data/scripts/maps/Route101.inc')
| -rw-r--r-- | data/scripts/maps/Route101.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 6536952c4..4d4334aca 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -18,7 +18,7 @@ Route101_EventScript_1EBCD5:: @ 81EBCD5 Route101_EventScript_1EBCDE:: @ 81EBCDE lockall - playbgm BGM_EVENT0, 1 + playbgm MUS_EVENT0, 1 msgbox Route101_Text_1EBE8F, 4 closemessage setobjectxy 2, 0, 15 @@ -230,7 +230,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 applymovement 2, Route101_Movement_1EBE8D waitmovement 0 msgbox Route101_Text_1EBF12, 4 - special sp000_heal_pokemon + special HealPlayerParty setflag FLAG_0x2D0 clearflag FLAG_0x2D1 setflag FLAG_0x2BC @@ -238,9 +238,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16 setvar VAR_0x4060, 3 clearflag FLAG_SPECIAL_FLAG_0x4000 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route101_EventScript_1EBE85 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route101_EventScript_1EBE89 warp LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate |