diff options
| author | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
| commit | 6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch) | |
| tree | 39736ab1dd8ebcc57f8e981db6103285743d5530 /engine/movie/title.asm | |
| parent | Identify unnamed functions in map_sprites.asm (#126) (diff) | |
| parent | Fix some label typos, and add some constants instead of raw numbers (#492) (diff) | |
| download | pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/movie/title.asm')
| -rw-r--r-- | engine/movie/title.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 2c4b61fb..96ce948c 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -13,9 +13,9 @@ PrepareTitleScreen:: ld [wLetterPrintingDelayFlags], a ld hl, wStatusFlags6 ld [hli], a - assert wStatusFlags6 + 1 == wStatusFlags7 + ASSERT wStatusFlags6 + 1 == wStatusFlags7 ld [hli], a - assert wStatusFlags7 + 1 == wElite4Flags + ASSERT wStatusFlags7 + 1 == wElite4Flags ld [hl], a ld a, BANK(Music_TitleScreen) ld [wAudioROMBank], a @@ -76,7 +76,7 @@ DisplayTitleScreen: call GBPalNormal ld a, %11100000 ldh [rOBP0], a - call UpdateGBCPal_OBP0 + call UpdateCGBPal_OBP0 ; make pokemon logo bounce up and down ld bc, hSCY ; background scroll Y |