diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
| commit | 65391a1eb2979dc050dd4a98afea02bb0ef310ea (patch) | |
| tree | e31a90d0966cec7e8713ead9ca8083d439c8d9b5 /data/maps/Route123/scripts.inc | |
| parent | eb48cc2f7eefc1e56c2dcec21c38381b4534b897 (diff) | |
| parent | abe56579c107af58e6f3a43968ba2257ff358189 (diff) | |
Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
# src/use_pokeblock.c
Diffstat (limited to 'data/maps/Route123/scripts.inc')
| -rw-r--r-- | data/maps/Route123/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 86a6e767e..8e1692114 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -1,5 +1,5 @@ Route123_MapScripts:: @ 81F6147 - map_script 3, Route123_MapScript1_1F614D + map_script MAP_SCRIPT_ON_TRANSITION, Route123_MapScript1_1F614D .byte 0 Route123_MapScript1_1F614D: @ 81F614D @@ -17,7 +17,7 @@ Route123_EventScript_1F6151:: @ 81F6151 msgbox Route123_Text_1F645D, MSGBOX_DEFAULT giveitem_std ITEM_TM19 compare VAR_RESULT, 0 - goto_if_eq Route123_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM19 msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT release |