diff options
| author | dannye <33dannye@gmail.com> | 2025-05-25 19:46:44 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-05-25 19:46:44 -0500 |
| commit | 4500fe42963c0de3cf3f2160b1c8e4c30b42cc0b (patch) | |
| tree | f8709c989a831284973172b526c070172ec0a3e3 /engine/movie | |
| parent | tools/unnamed.py supports RGBDS 0.9.2 (object revision 12) (diff) | |
| download | pokeyellow-4500fe42963c0de3cf3f2160b1c8e4c30b42cc0b.tar.gz pokeyellow-4500fe42963c0de3cf3f2160b1c8e4c30b42cc0b.tar.xz pokeyellow-4500fe42963c0de3cf3f2160b1c8e4c30b42cc0b.zip | |
Use more ldpikacry
Diffstat (limited to 'engine/movie')
| -rw-r--r-- | engine/movie/hall_of_fame.asm | 2 | ||||
| -rw-r--r-- | engine/movie/title.asm | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm index 21848bb9..defe5502 100644 --- a/engine/movie/hall_of_fame.asm +++ b/engine/movie/hall_of_fame.asm @@ -158,7 +158,7 @@ HoFDisplayAndRecordMonInfo: ld [wWhichPokemon], a callfar IsThisPartymonStarterPikachu_Party jr nc, .asm_70336 - ld e, $22 + ldpikacry e, PikachuCry35 callfar PlayPikachuSoundClip jr .asm_7033c .asm_70336 diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 96ce948c..ec7a2aa3 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -35,7 +35,6 @@ DisplayTitleScreen: call ClearScreen call DisableLCD call LoadFontTilePatterns -; todo: fix hl pointers ld hl, NintendoCopyrightLogoGraphics ld de, vTitleLogo tile $60 ld bc, 5 tiles @@ -140,12 +139,11 @@ DisplayTitleScreen: ld a, SFX_INTRO_WHOOSH call PlaySound -; scroll game version in from the right callfar TitleScreen_PlacePikaSpeechBubble ld a, SCREEN_HEIGHT_PX ldh [hWY], a call Delay3 - ld e, 0 + ldpikacry e, PikachuCry1 call TitleScreen_PlayPikachuPCM call WaitForSoundToFinish call StopAllMusic @@ -179,7 +177,7 @@ ENDC jr .titleScreenLoop .go_to_main_menu - ld e, $a + ldpikacry e, PikachuCry11 call TitleScreen_PlayPikachuPCM call GBPalWhiteOutWithDelay3 call ClearSprites @@ -218,9 +216,9 @@ ENDC ; unreferenced ld a, [wTitleScreenScene + 4] inc a - cp $2a + cp NUM_PIKA_CRIES jr c, .asm_4305 - ld a, $f + ldpikacry a, PikachuCry16 .asm_4305 ld [wTitleScreenScene + 4], a ld e, a |