diff options
| author | dannye <33dannye@gmail.com> | 2020-11-04 00:06:44 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-11-04 00:06:44 -0600 |
| commit | 5647ca687b92954dcf37a6ea6bfbc9a341c32de4 (patch) | |
| tree | dde1937a1bfdb3a835f4155e1c2eb8f1aaf86f63 /scripts/CeladonMansion1F.asm | |
| parent | Merge pull request #55 from Deokishisu/patch-1 (diff) | |
| download | pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.tar.gz pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.tar.xz pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.zip | |
Sync with pokered
Diffstat (limited to 'scripts/CeladonMansion1F.asm')
| -rwxr-xr-x | scripts/CeladonMansion1F.asm | 22 |
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 |