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/celadonmansion1.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'scripts/celadonmansion1.asm') diff --git a/scripts/celadonmansion1.asm b/scripts/celadonmansion1.asm index b29ee196..59d9d1d8 100755 --- a/scripts/celadonmansion1.asm +++ b/scripts/celadonmansion1.asm @@ -1,22 +1,22 @@ -CeladonMansion1Script: ; 48694 (12:4694) +CeladonMansion1Script: call EnableAutoTextBoxDrawing ret -CeladonMansion1TextPointers: ; 48697 (12:4697) +CeladonMansion1TextPointers: dw CeladonMansion1Text1 dw CeladonMansion1Text2 dw CeladonMansion1Text3 dw CeladonMansion1Text4 dw CeladonMansion1Text5 -CeladonMansion1Text1: ; 486a7 (12:46a7) +CeladonMansion1Text1: TX_FAR _CeladonMansion1Text1 TX_ASM ld a, MEOWTH call PlayCry jp TextScriptEnd -CeladonMansion1Text2: ; 486b1 (12:46b1) +CeladonMansion1Text2: TX_ASM callba Func_f1e70 ld a, [wPikachuHappiness] @@ -29,20 +29,20 @@ CeladonMansion1Text2: ; 486b1 (12:46b1) .asm_485d9 jp TextScriptEnd -CeladonMansion1Text3: ; 486b6 (12:46b6) +CeladonMansion1Text3: TX_FAR _CeladonMansion1Text3 TX_ASM ld a, CLEFAIRY call PlayCry jp TextScriptEnd -CeladonMansion1Text4: ; 486c0 (12:46c0) +CeladonMansion1Text4: TX_FAR _CeladonMansion1Text4 TX_ASM ld a, NIDORAN_F call PlayCry jp TextScriptEnd -CeladonMansion1Text5: ; 486ca (12:46ca) +CeladonMansion1Text5: TX_FAR _CeladonMansion1Text5 db "@" -- cgit v1.3.1-sl0p