From 9aaa5f24bb7334421b056f72594db0d28a464739 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 1 Dec 2013 17:54:09 -0500 Subject: shorten redundant text_jump macros --- engine/scripting.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/scripting.asm') diff --git a/engine/scripting.asm b/engine/scripting.asm index 4fabec928..861b0553a 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -589,7 +589,7 @@ GiveItemScript: ; 96f77 ; 96f89 ReceivedItemText: ; 96f89 - text_jump UnknownText_0x1c4719, BANK(UnknownText_0x1c4719) + text_jump UnknownText_0x1c4719 db "@" ; 96f8e @@ -706,12 +706,12 @@ CurItemName: ; 97051 PutItemInPocketText: ; 9705b - text_jump UnknownText_0x1c472c, BANK(UnknownText_0x1c472c) + text_jump UnknownText_0x1c472c db "@" ; 97060 PocketIsFullText: ; 97060 - text_jump UnknownText_0x1c474b, BANK(UnknownText_0x1c474b) + text_jump UnknownText_0x1c474b db "@" ; 97065 -- cgit v1.2.3 From 3de254f7a2db89070f8821646885d438c74c0ad3 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 2 Dec 2013 14:18:03 -0500 Subject: more 3pt macro labels; shorten 3pt macros to take just a label static addresses should be avoided anyway --- engine/scripting.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/scripting.asm') diff --git a/engine/scripting.asm b/engine/scripting.asm index 861b0553a..df1215f40 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -573,7 +573,7 @@ Function96f76: ; 96f76 ; 96f77 GiveItemScript: ; 96f77 - 3callasm BANK(Function96f76), Function96f76 + 3callasm Function96f76 2writetext ReceivedItemText iffalse .Full waitbutton -- cgit v1.2.3 From be0c7962b00e612543a8d3653cc9a876e68adf70 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 4 Dec 2013 02:49:12 -0500 Subject: YesNoBox --- engine/scripting.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/scripting.asm') diff --git a/engine/scripting.asm b/engine/scripting.asm index df1215f40..f0d064d8e 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -455,7 +455,7 @@ Script_keeptextopen: ; 0x96edc Script_yesorno: ; 0x96eed ; script command 0x4e - call Function1dcf + call YesNoBox ld a, $0 jr c, .asm_96ef6 ; 0x96ef2 $2 ld a, $1 @@ -792,7 +792,7 @@ Script_askforphonenumber: ; 0x970be ; parameters: ; number (SingleByteParam) - call Function1dcf + call YesNoBox jr c, .asm_970d6 ; 0x970c1 $13 call GetScriptByte ld c, a -- cgit v1.2.3 From 4612670768476db26cd87ed69e43bd0ba0728a6f Mon Sep 17 00:00:00 2001 From: yenatch Date: Fri, 27 Dec 2013 22:20:24 -0500 Subject: more npc trade cleanup --- engine/scripting.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/scripting.asm') diff --git a/engine/scripting.asm b/engine/scripting.asm index f0d064d8e..58648514b 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -761,7 +761,7 @@ Script_trade: ; 0x97099 call GetScriptByte ld e, a - callba Functionfcba8 + callba NPCTrade ret ; 0x970a4 -- cgit v1.2.3