diff options
| author | dannye <33dannye@gmail.com> | 2025-11-12 17:56:10 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-11-12 17:56:10 -0600 |
| commit | 324ae167d15ae4eef3cda411e10201661e57d88d (patch) | |
| tree | 86c2b73ce1262f12c1b3eb82874e8572e80e583f /engine/movie | |
| parent | Separate surfing Pikachu graphics from audio engine code (diff) | |
| parent | Use features of RGBDS 1.0.0 (#537) (diff) | |
| download | pokeyellow-324ae167d15ae4eef3cda411e10201661e57d88d.tar.gz pokeyellow-324ae167d15ae4eef3cda411e10201661e57d88d.tar.xz pokeyellow-324ae167d15ae4eef3cda411e10201661e57d88d.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/movie')
| -rw-r--r-- | engine/movie/credits.asm | 4 | ||||
| -rw-r--r-- | engine/movie/hall_of_fame.asm | 2 | ||||
| -rw-r--r-- | engine/movie/oak_speech/oak_speech2.asm | 6 | ||||
| -rw-r--r-- | engine/movie/title.asm | 2 | ||||
| -rw-r--r-- | engine/movie/trade.asm | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index f7e13aab..149f51a7 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -171,7 +171,7 @@ FillFourRowsWithBlack: FillMiddleOfScreenWithWhite: hlcoord 0, 4 ld bc, SCREEN_WIDTH * 10 - ld a, " " + ld a, ' ' jp FillMemory FillLeftHalfOfScreenWithWhite: @@ -191,7 +191,7 @@ FillRightHalfOfScreenWithWhite: FillHalfOfScreenWithWhite: ld b, 10 ld c, 10 - ld a, " " + ld a, ' ' .loop push bc push hl diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm index fb77e073..4afb23d3 100644 --- a/engine/movie/hall_of_fame.asm +++ b/engine/movie/hall_of_fame.asm @@ -8,7 +8,7 @@ AnimateHallOfFame: call DisableLCD ld hl, vBGMap0 ld bc, 2 * TILEMAP_AREA - ld a, " " + ld a, ' ' call FillMemory call EnableLCD ld hl, rLCDC diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm index 300b5590..cedc8be7 100644 --- a/engine/movie/oak_speech/oak_speech2.asm +++ b/engine/movie/oak_speech/oak_speech2.asm @@ -16,7 +16,7 @@ ChoosePlayerName: ld [wNamingScreenType], a call DisplayNamingScreen ld a, [wStringBuffer] - cp "@" + cp '@' jr z, .customName call ClearScreen call Delay3 @@ -49,7 +49,7 @@ ChooseRivalName: ld [wNamingScreenType], a call DisplayNamingScreen ld a, [wStringBuffer] - cp "@" + cp '@' jr z, .customName call ClearScreen call Delay3 @@ -199,7 +199,7 @@ GetDefaultName: ld e, l .innerLoop ld a, [hli] - cp "@" + cp '@' jr nz, .innerLoop ld a, b cp c diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 495c8cfe..0e9b651e 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -53,7 +53,7 @@ DisplayTitleScreen: callfar LoadYellowTitleScreenGFX ld hl, vBGMap0 ld bc, (vBGMap1 tile $40) - vBGMap0 - ld a, " " + ld a, ' ' call FillMemory callfar TitleScreen_PlacePokemonLogo call FillSpriteBuffer0WithAA diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm index 852af717..1af97969 100644 --- a/engine/movie/trade.asm +++ b/engine/movie/trade.asm @@ -151,7 +151,7 @@ Trade_Delay80: Trade_ClearTileMap: hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' jp FillMemory LoadTradingGFXAndMonNames: @@ -169,7 +169,7 @@ LoadTradingGFXAndMonNames: call FarCopyData ld hl, vBGMap0 ld bc, 2 * TILEMAP_AREA - ld a, " " + ld a, ' ' call FillMemory call ClearSprites ld a, $ff |