summaryrefslogtreecommitdiff
path: root/scripts/CeladonMansion1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/CeladonMansion1F.asm')
-rwxr-xr-xscripts/CeladonMansion1F.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/CeladonMansion1F.asm b/scripts/CeladonMansion1F.asm
index 1d7c37b4..61d53da7 100755
--- a/scripts/CeladonMansion1F.asm
+++ b/scripts/CeladonMansion1F.asm
@@ -10,39 +10,39 @@ CeladonMansion1F_TextPointers:
dw CeladonMansion1Text5
CeladonMansion1Text1:
- TX_FAR _CeladonMansion1Text1
- TX_ASM
+ text_far _CeladonMansion1Text1
+ text_asm
ld a, MEOWTH
call PlayCry
jp TextScriptEnd
CeladonMansion1Text2:
- TX_ASM
- callba Func_f1e70
+ text_asm
+ farcall Func_f1e70
ld a, [wPikachuHappiness]
cp 251
jr c, .asm_485d9
ld c, 50
call DelayFrames
ldpikacry e, PikachuCry23
- callab PlayPikachuSoundClip
+ callfar PlayPikachuSoundClip
.asm_485d9
jp TextScriptEnd
CeladonMansion1Text3:
- TX_FAR _CeladonMansion1Text3
- TX_ASM
+ text_far _CeladonMansion1Text3
+ text_asm
ld a, CLEFAIRY
call PlayCry
jp TextScriptEnd
CeladonMansion1Text4:
- TX_FAR _CeladonMansion1Text4
- TX_ASM
+ text_far _CeladonMansion1Text4
+ text_asm
ld a, NIDORAN_F
call PlayCry
jp TextScriptEnd
CeladonMansion1Text5:
- TX_FAR _CeladonMansion1Text5
- db "@"
+ text_far _CeladonMansion1Text5
+ text_end