diff options
| author | Narishma-gb <194818981+Narishma-gb@users.noreply.github.com> | 2025-09-10 06:31:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-10 00:31:11 -0400 |
| commit | d237b01cfb241f417567c964e0df0658cf921570 (patch) | |
| tree | 799e92e48259443aa6cf4c553ed7adf38bd442d4 /engine/movie | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| download | pokeyellow-d237b01cfb241f417567c964e0df0658cf921570.tar.gz pokeyellow-d237b01cfb241f417567c964e0df0658cf921570.tar.xz pokeyellow-d237b01cfb241f417567c964e0df0658cf921570.zip | |
Misc. naming and cleanup (#139)
* Name some printer/diploma routines
* Name `wd434`
* Name `NAME_LENGTH_JP`
* Rename `callabd`/`calladb` to `farcall`/`callfar`
Diffstat (limited to 'engine/movie')
| -rw-r--r-- | engine/movie/hall_of_fame.asm | 6 | ||||
| -rw-r--r-- | engine/movie/intro_yellow.asm | 8 | ||||
| -rw-r--r-- | engine/movie/oak_speech/oak_speech.asm | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm index 38d937f6..fb77e073 100644 --- a/engine/movie/hall_of_fame.asm +++ b/engine/movie/hall_of_fame.asm @@ -156,7 +156,7 @@ HoFDisplayAndRecordMonInfo: call HoFDisplayMonInfo ld a, [wHoFPartyMonIndex] ld [wWhichPokemon], a - callfar IsThisPartymonStarterPikachu_Party + callfar IsThisPartyMonStarterPikachu jr nc, .asm_70336 ldpikacry e, PikachuCry35 callfar PlayPikachuSoundClip @@ -200,11 +200,11 @@ HoFLoadPlayerPics: ld de, RedPicFront ld a, BANK(RedPicFront) call UncompressSpriteFromDE - ld a, $0 + ld a, BANK("Sprite Buffers") call OpenSRAM ld hl, sSpriteBuffer1 ld de, sSpriteBuffer0 - ld bc, $310 + ld bc, 2 * SPRITEBUFFERSIZE call CopyData call CloseSRAM ld de, vFrontPic diff --git a/engine/movie/intro_yellow.asm b/engine/movie/intro_yellow.asm index 8b8866e5..cd411548 100644 --- a/engine/movie/intro_yellow.asm +++ b/engine/movie/intro_yellow.asm @@ -575,15 +575,15 @@ YellowIntroScene14: call MaskAllAnimatedObjectStructs call YellowIntro_BlankOAMBuffer ld hl, wTileMap - ld bc, $50 + ld bc, SCREEN_WIDTH * 4 ld a, $1 call Bank3E_FillMemory hlcoord 0, 4 - ld bc, CopyVideoDataAlternate + ld bc, SCREEN_WIDTH * 10 xor a call Bank3E_FillMemory hlcoord 0, 14 - ld bc, $50 + ld bc, SCREEN_WIDTH * 4 ld a, $1 call Bank3E_FillMemory ld a, $1 @@ -827,7 +827,7 @@ InitYellowIntroGFXAndMusic: ld a, $1 call Bank3E_FillMemory hlcoord 0, 4 - ld bc, CopyVideoDataAlternate + ld bc, SCREEN_WIDTH * 10 xor a call Bank3E_FillMemory ld a, $1 diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm index 1591fefc..5cc80745 100644 --- a/engine/movie/oak_speech/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -49,7 +49,7 @@ PrepareOakSpeech: ret OakSpeech: - call StopAllMusic ; stop music + call StopAllMusic ld a, BANK(Music_Routes2) ld c, a ld a, MUSIC_ROUTES2 @@ -231,11 +231,11 @@ IntroDisplayPicCenteredOrUpperRight: push bc ld a, b call UncompressSpriteFromDE - ld a, $0 + ld a, BANK("Sprite Buffers") call OpenSRAM ld hl, sSpriteBuffer1 ld de, sSpriteBuffer0 - ld bc, $310 + ld bc, 2 * SPRITEBUFFERSIZE call CopyData call CloseSRAM ld de, vFrontPic |