From 401d6e7f36e86aa246a2c0591195e1f0f01e879f Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 11 Jun 2016 17:10:37 -0500 Subject: More syncing with pokered from April 8, 2016 to present --- scripts/lavendermart.asm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'scripts/lavendermart.asm') diff --git a/scripts/lavendermart.asm b/scripts/lavendermart.asm index 915c9662..51b64992 100755 --- a/scripts/lavendermart.asm +++ b/scripts/lavendermart.asm @@ -2,7 +2,7 @@ LavenderMartScript: jp EnableAutoTextBoxDrawing LavenderMartTextPointers: - dw LavenderMartText1 + dw LavenderCashierText dw LavenderMartText2 dw LavenderMartText3 @@ -13,20 +13,20 @@ LavenderMartText2: LavenderMartText3: TX_ASM CheckEvent EVENT_RESCUED_MR_FUJI - jr nz, .asm_c88d4 - ld hl, LavenderMart_5c953 + jr nz, .Nugget + ld hl, .ReviveText call PrintText - jr .asm_6d225 -.asm_c88d4 - ld hl, LavenderMart_5c958 + jr .done +.Nugget + ld hl, .NuggetText call PrintText -.asm_6d225 +.done jp TextScriptEnd -LavenderMart_5c953: - TX_FAR _LavenderMart_5c953 +.ReviveText + TX_FAR _LavenderMartReviveText db "@" -LavenderMart_5c958: - TX_FAR _LavenderMart_5c958 +.NuggetText + TX_FAR _LavenderMartNuggetText db "@" -- cgit v1.2.3