From 2f0b152e5a52d39bfe938f8f19cdd49d3dcd4671 Mon Sep 17 00:00:00 2001 From: 2Tie Date: Mon, 18 Jun 2018 22:53:06 -0600 Subject: this is how you fix conflicts, right? --- data/predef_pointers.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data') diff --git a/data/predef_pointers.inc b/data/predef_pointers.inc index 3f5e848..7d2e65a 100644 --- a/data/predef_pointers.inc +++ b/data/predef_pointers.inc @@ -16,14 +16,14 @@ PredefPointers:: ; 1:62d3 add_predef Function6713 add_predef Function66b1 add_predef DebugMenu - add_predef Functionce10 - add_predef Functioncd6f - add_predef Functioncde3 - add_predef Functioncde3_2 ; 8 - add_predef Functioncde3_3 - add_predef Functioncdf9 - add_predef Functionce10_2 - add_predef Functioncd33 + add_predef GetItemAmount + add_predef HealParty + add_predef AddBCD + dba AddBCD ; 8 + dba AddBCD + add_predef SubBCD + dba GetItemAmount + add_predef SmallFarFlagAction GiveItemPredef:: dbw 3, GiveItem add_predef Functionce3c -- cgit v1.2.3