diff options
Diffstat (limited to 'scripts/CeladonMansion1F.asm')
| -rw-r--r-- | scripts/CeladonMansion1F.asm | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/scripts/CeladonMansion1F.asm b/scripts/CeladonMansion1F.asm index fa901ff9..61d53da7 100644 --- a/scripts/CeladonMansion1F.asm +++ b/scripts/CeladonMansion1F.asm @@ -1,5 +1,6 @@ CeladonMansion1F_Script: - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret CeladonMansion1F_TextPointers: dw CeladonMansion1Text1 @@ -8,31 +9,39 @@ CeladonMansion1F_TextPointers: dw CeladonMansion1Text4 dw CeladonMansion1Text5 -CeladonMansion1_PlayCryScript: - call PlayCry - jp TextScriptEnd - CeladonMansion1Text1: text_far _CeladonMansion1Text1 text_asm ld a, MEOWTH - jp CeladonMansion1_PlayCryScript + call PlayCry + jp TextScriptEnd CeladonMansion1Text2: - text_far _CeladonMansion1Text2 - text_end + text_asm + farcall Func_f1e70 + ld a, [wPikachuHappiness] + cp 251 + jr c, .asm_485d9 + ld c, 50 + call DelayFrames + ldpikacry e, PikachuCry23 + callfar PlayPikachuSoundClip +.asm_485d9 + jp TextScriptEnd CeladonMansion1Text3: text_far _CeladonMansion1Text3 text_asm ld a, CLEFAIRY - jp CeladonMansion1_PlayCryScript + call PlayCry + jp TextScriptEnd CeladonMansion1Text4: text_far _CeladonMansion1Text4 text_asm ld a, NIDORAN_F - jp CeladonMansion1_PlayCryScript + call PlayCry + jp TextScriptEnd CeladonMansion1Text5: text_far _CeladonMansion1Text5 |