diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2019-01-05 19:54:26 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2019-01-05 19:54:26 +0000 |
| commit | f8c2fcb9b22a1b9cf43e293fdcb6df2b9d0dd164 (patch) | |
| tree | 81b80d287c4fb3320a8143b9cfbb06e9fc4b34d5 /data/maps/RustboroCity_DevonCorp_2F | |
| parent | ee5a239534d7c4bd64ce7ced4146204579f5d598 (diff) | |
| parent | cbf7d6cee59e7aa2cdef6b9e89fa62fbeb4a07c5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base
Diffstat (limited to 'data/maps/RustboroCity_DevonCorp_2F')
| -rw-r--r-- | data/maps/RustboroCity_DevonCorp_2F/scripts.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 8ce86352d..cce9ae394 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -25,7 +25,7 @@ RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 faceplayer compare VAR_0x40C4, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 - goto_if_set FLAG_0x11F, RustboroCity_DevonCorp_2F_EventScript_2118A6 + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_2118A6 msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT release end @@ -40,7 +40,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 faceplayer compare VAR_0x40C4, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 - goto_if_set FLAG_0x0BC, RustboroCity_DevonCorp_2F_EventScript_2118D0 + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_2118D0 msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT release end @@ -200,7 +200,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AC4:: @ 8211AC4 RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7 setvar VAR_0x40C4, 0 - setflag FLAG_0x10B + setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON release end @@ -249,7 +249,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B67:: @ 8211B67 RustboroCity_DevonCorp_2F_EventScript_211B7A:: @ 8211B7A setvar VAR_0x40C4, 0 - setflag FLAG_0x10B + setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON release end |