diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/color.asm | 6 | ||||
| -rwxr-xr-x | engine/dummy_game.asm | 2 | ||||
| -rwxr-xr-x | engine/mystery_gift.asm | 4 | ||||
| -rwxr-xr-x | engine/namingscreen.asm | 4 | ||||
| -rwxr-xr-x | engine/pokegear.asm | 4 | ||||
| -rwxr-xr-x | engine/unown_puzzle.asm | 2 | ||||
| -rw-r--r-- | engine/unused_title.asm | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/engine/color.asm b/engine/color.asm index 35358934a..262bccbbb 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -1073,7 +1073,7 @@ SGBBorder_PushBGPals: ld bc, $100 tiles call CopyData call DrawDefaultTiles - ld a, rLCDC_DEFAULT + ld a, LCDC_DEFAULT ld [rLCDC], a ld hl, PalPacket_9d06 call PushSGBPals @@ -1107,7 +1107,7 @@ SGBBorder_MorePalPushing: ld bc, 16 palettes call CopyData call DrawDefaultTiles - ld a, rLCDC_DEFAULT + ld a, LCDC_DEFAULT ld [rLCDC], a ld hl, PalPacket_9d46 call PushSGBPals @@ -1131,7 +1131,7 @@ SGBBorder_YetMorePalPushing: dec b jr nz, .loop call DrawDefaultTiles - ld a, rLCDC_DEFAULT + ld a, LCDC_DEFAULT ld [rLCDC], a ld hl, PalPacket_9d36 call PushSGBPals diff --git a/engine/dummy_game.asm b/engine/dummy_game.asm index e5cc97dec..aecaa7425 100755 --- a/engine/dummy_game.asm +++ b/engine/dummy_game.asm @@ -34,7 +34,7 @@ _DummyGame: ; e1e5b (38:5e5b) ld [wJumptableIndex], a ld a, $1 ld [hBGMapMode], a - ld a, rLCDC_DEFAULT + ld a, LCDC_DEFAULT ld [rLCDC], a ld a, $e4 call DmgToCgbBGPals diff --git a/engine/mystery_gift.asm b/engine/mystery_gift.asm index 574436b15..67ce10168 100755 --- a/engine/mystery_gift.asm +++ b/engine/mystery_gift.asm @@ -116,7 +116,7 @@ DoMysteryGift: ; 1048ba (41:48ba) .PrintTextAndExit: ; 1049c5 (41:49c5) call PrintText - ld a, rLCDC_DEFAULT + ld a, LCDC_DEFAULT ld [rLCDC], a ret ; 1049cd (41:49cd) @@ -1497,7 +1497,7 @@ Function10571a: ; 10571a (41:571a) asm_105726: ; 105726 (41:5726) call PrintText - ld a, rLCDC_DEFAULT + ld a, LCDC_DEFAULT ld [rLCDC], a ret ; 10572e (41:572e) diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index 7eeed34a6..177f06f73 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -48,7 +48,7 @@ NamingScreen: ; 116c1 call DisableLCD call LoadNamingScreenGFX call NamingScreen_InitText - ld a, rLCDC_DEFAULT + ld a, LCDC_DEFAULT ld [rLCDC], a call .GetNamingScreenSetup call WaitBGMap @@ -1017,7 +1017,7 @@ _ComposeMailMessage: ; 11e75 (mail?) add hl, bc ld [hl], $0 call .InitCharset - ld a, rLCDC_DEFAULT + ld a, LCDC_DEFAULT ld [rLCDC], a call .initwNamingScreenMaxNameLength ld b, SCGB_DIPLOMA diff --git a/engine/pokegear.asm b/engine/pokegear.asm index fff5174bd..dba071b28 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -59,7 +59,7 @@ PokeGear: ; 90b8d (24:4b8d) call InitPokegearModeIndicatorArrow ld a, 8 call SkipMusic - ld a, rLCDC_DEFAULT + ld a, LCDC_DEFAULT ld [rLCDC], a call TownMap_InitCursorAndPlayerIconPositions xor a @@ -1851,7 +1851,7 @@ _TownMap: ; 9191c farcall ClearSpriteAnims ld a, 8 call SkipMusic - ld a, rLCDC_DEFAULT + ld a, LCDC_DEFAULT ld [rLCDC], a call TownMap_GetCurrentLandmark ld [wTownMapPlayerIconLandmark], a diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm index 3f76c7041..ee76f817c 100755 --- a/engine/unown_puzzle.asm +++ b/engine/unown_puzzle.asm @@ -85,7 +85,7 @@ UnownPuzzle: ; e1190 call ClearBGPalettes call ClearTileMap call ClearSprites - ld a, rLCDC_DEFAULT + ld a, LCDC_DEFAULT ld [rLCDC], a ret ; e124e diff --git a/engine/unused_title.asm b/engine/unused_title.asm index 0b7dc690d..650e17863 100644 --- a/engine/unused_title.asm +++ b/engine/unused_title.asm @@ -55,7 +55,7 @@ UnusedTitleScreen: ; 10c000 call EnableLCD ld a, [rLCDC] - set rLCDC_SPRITE_ENABLE, a + set rLCDC_SPRITES_ENABLE, a set rLCDC_SPRITE_SIZE, a ld [rLCDC], a |