From 6e8c3883e430b567f7aa8f9230e366e03610bd5a Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Wed, 8 Jun 2016 05:44:58 -0600 Subject: Part 1 of syncing with pokered. --- scripts/pewtermart.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'scripts/pewtermart.asm') diff --git a/scripts/pewtermart.asm b/scripts/pewtermart.asm index 62831d1b..33a0a4c2 100755 --- a/scripts/pewtermart.asm +++ b/scripts/pewtermart.asm @@ -1,30 +1,30 @@ -PewterMartScript: ; 74cad (1d:4cad) +PewterMartScript: call EnableAutoTextBoxDrawing ld a, $1 ld [wAutoTextBoxDrawingControl], a ret -PewterMartTextPointers: ; 74cb6 (1d:4cb6) +PewterMartTextPointers: dw PewterMartText1 dw PewterMartText2 dw PewterMartText3 -PewterMartText2: ; 74cbc (1d:4cbc) +PewterMartText2: TX_ASM ld hl, PewterMartText_74cc6 call PrintText jp TextScriptEnd -PewterMartText_74cc6: ; 74cc6 (1d:4cc6) +PewterMartText_74cc6: TX_FAR _PewterMartText_74cc6 db "@" -PewterMartText3: ; 74ccb (1d:4ccb) +PewterMartText3: TX_ASM ld hl, PewterMartText_74cd5 call PrintText jp TextScriptEnd -PewterMartText_74cd5: ; 74cd5 (1d:4cd5) +PewterMartText_74cd5: TX_FAR _PewterMartText_74cd5 db "@" -- cgit v1.2.3 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/pewtermart.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'scripts/pewtermart.asm') diff --git a/scripts/pewtermart.asm b/scripts/pewtermart.asm index 33a0a4c2..64915563 100755 --- a/scripts/pewtermart.asm +++ b/scripts/pewtermart.asm @@ -5,26 +5,26 @@ PewterMartScript: ret PewterMartTextPointers: - dw PewterMartText1 + dw PewterCashierText dw PewterMartText2 dw PewterMartText3 PewterMartText2: TX_ASM - ld hl, PewterMartText_74cc6 + ld hl, .Text call PrintText jp TextScriptEnd -PewterMartText_74cc6: - TX_FAR _PewterMartText_74cc6 +.Text + TX_FAR _PewterMartText2 db "@" PewterMartText3: TX_ASM - ld hl, PewterMartText_74cd5 + ld hl, .Text call PrintText jp TextScriptEnd -PewterMartText_74cd5: - TX_FAR _PewterMartText_74cd5 +.Text + TX_FAR _PewterMartText3 db "@" -- cgit v1.2.3