diff options
| author | MCboy <atasro2@gmail.com> | 2018-08-12 23:26:00 +0430 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-12 23:26:00 +0430 |
| commit | 1bc93c5a66ebc7ec790e3cb17f246aee75dcc73c (patch) | |
| tree | f6edf1981a206483d1691e5ac388055abfc64424 /data/maps/RustboroCity | |
| parent | 9e9ec8dc963c4786ac3af19102ebe690cb7785d5 (diff) | |
| parent | 21060091d109a6ebc4d1d76b8487878bb91cd5e1 (diff) | |
Merge branch 'master' into player_field_avatar
Diffstat (limited to 'data/maps/RustboroCity')
| -rw-r--r-- | data/maps/RustboroCity/scripts.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 6eb8d48bc..f4c8d5434 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -306,7 +306,7 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD clearflag FLAG_0x2DC setflag FLAG_0x08E setvar VAR_0x405A, 2 - setvar VAR_0x409A, 2 + setvar VAR_RUSTURF_TUNNEL_STATE, 2 setvar VAR_0x406F, 1 clearflag FLAG_0x37B clearflag FLAG_0x370 @@ -869,7 +869,7 @@ RustboroCity_EventScript_1E1070:: @ 81E1070 RustboroCity_EventScript_1E1092:: @ 81E1092 msgbox RustboroCity_Text_1E1C84, 4 - switch VAR_FIRST_POKE + switch VAR_STARTER_MON case 0, RustboroCity_EventScript_1E10DB case 1, RustboroCity_EventScript_1E10EE case 2, RustboroCity_EventScript_1E1101 @@ -940,7 +940,7 @@ RustboroCity_EventScript_1E1174:: @ 81E1174 RustboroCity_EventScript_1E1191:: @ 81E1191 msgbox RustboroCity_Text_1E1FA9, 4 - switch VAR_FIRST_POKE + switch VAR_STARTER_MON case 0, RustboroCity_EventScript_1E11D5 case 1, RustboroCity_EventScript_1E11E8 case 2, RustboroCity_EventScript_1E11FB |