diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-04 23:42:42 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-04 23:42:42 -0600 |
| commit | 3d49abfecb20b9b86311cbd83ff92a20761ea256 (patch) | |
| tree | 9e65e0cf9a6ce4ba318f0e144553248e6709eb61 /data/scripts/mauville_man.inc | |
| parent | 501482beadd05c5ade13f6919c3c2cd42c86952d (diff) | |
| parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) | |
fix merge conflicts
Diffstat (limited to 'data/scripts/mauville_man.inc')
| -rw-r--r-- | data/scripts/mauville_man.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 58dacb2f3..0e1835ae4 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -141,7 +141,7 @@ do_trader_menu_get: waitstate compare VAR_SPECIAL_4, 0 goto_if_eq cancelled_get_menu - compare VAR_SPECIAL_4, 65535 + compare VAR_SPECIAL_4, -1 goto_if_eq rare_item_cant_trade_away msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO compare RESULT, NO @@ -178,7 +178,7 @@ do_trader_menu_give: waitstate compare VAR_SPECIAL_6, 0 goto_if_eq cancelled_give_menu - compare VAR_SPECIAL_6, 65535 + compare VAR_SPECIAL_6, -1 goto_if_eq decoration_is_in_use special ScrSpecial_IsDecorationFull compare RESULT, 1 |