diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-24 14:12:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 14:12:14 -0600 |
| commit | b827bd9a5a44e17fa9fced591465fc64a619a134 (patch) | |
| tree | 473525953b1ac35be06b26cd2e6926fb7b0278cb /data/scripts/maps/Route103.inc | |
| parent | 30c77aa4ca5502b07a9ccdf2012a7da265e8bffa (diff) | |
| parent | 2c4d972f7c5a79ca94dca599b6e7b9e2c769cf70 (diff) | |
Merge pull request #500 from huderlem/vars
Use constants for vars
Diffstat (limited to 'data/scripts/maps/Route103.inc')
| -rw-r--r-- | data/scripts/maps/Route103.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index ee9decedc..35994cd45 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -26,7 +26,7 @@ Route103_EventScript_14EBAB:: @ 814EBAB applymovement 2, Route103_Movement_1A0835 waitmovement 0 msgbox Route103_Text_16D5B6, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route103_EventScript_14EC5D case 1, Route103_EventScript_14EC6D case 2, Route103_EventScript_14EC7D @@ -42,7 +42,7 @@ Route103_EventScript_14EC04:: @ 814EC04 applymovement 2, Route103_Movement_1A0835 waitmovement 0 msgbox Route103_Text_16D7A9, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route103_EventScript_14EC8D case 1, Route103_EventScript_14EC9D case 2, Route103_EventScript_14ECAD @@ -117,11 +117,11 @@ Route103_EventScript_14ED29:: @ 814ED29 Route103_EventScript_14ED46:: @ 814ED46 removeobject 2 - setvar 0x4062, 1 - setvar 0x4084, 4 + setvar VAR_ROUTE103_STATE, 1 + setvar VAR_BIRCH_LAB_STATE, 4 clearflag FLAG_HIDE_RIVAL_BIRCH_LAB setflag FLAG_DEFEATED_RIVAL_ROUTE103 - setvar 0x40c7, 1 + setvar VAR_OLDALE_STATE, 1 clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN savebgm 0 fadedefaultbgm |