From adc6a3aac7d883f9833c7da3f5896935715291e7 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Fri, 8 Apr 2016 19:04:36 -0600 Subject: =?UTF-8?q?Clean=20up=20script=20labels=20in=20marts=20and=20Pok?= =?UTF-8?q?=C3=A9mon=20Centers.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/lavendermart.asm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'scripts/lavendermart.asm') diff --git a/scripts/lavendermart.asm b/scripts/lavendermart.asm index 85518fd2..51b64992 100755 --- a/scripts/lavendermart.asm +++ b/scripts/lavendermart.asm @@ -1,32 +1,32 @@ -LavenderMartScript: ; 5c92c (17:492c) +LavenderMartScript: jp EnableAutoTextBoxDrawing -LavenderMartTextPointers: ; 5c92f (17:492f) - dw LavenderMartText1 +LavenderMartTextPointers: + dw LavenderCashierText dw LavenderMartText2 dw LavenderMartText3 -LavenderMartText2: ; 5c935 (17:4935) +LavenderMartText2: TX_FAR _LavenderMartText2 db "@" -LavenderMartText3: ; 5c93a (17:493a) +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: ; 5c953 (17:4953) - TX_FAR _LavenderMart_5c953 +.ReviveText + TX_FAR _LavenderMartReviveText db "@" -LavenderMart_5c958: ; 5c958 (17:4958) - TX_FAR _LavenderMart_5c958 +.NuggetText + TX_FAR _LavenderMartNuggetText db "@" -- cgit v1.2.3