diff options
| author | Rangi42 <sylvie.oukaour+rangi42@gmail.com> | 2025-07-02 23:39:15 -0400 |
|---|---|---|
| committer | Rangi42 <sylvie.oukaour+rangi42@gmail.com> | 2025-07-02 23:39:15 -0400 |
| commit | 5a142e3fee043ad950c361bdd0e5d7e9e9f1e467 (patch) | |
| tree | af8573a5f2683de5467cf5ffb0a4cdc7cd0a7d4c /engine | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| download | pokeyellow-5a142e3fee043ad950c361bdd0e5d7e9e9f1e467.tar.gz pokeyellow-5a142e3fee043ad950c361bdd0e5d7e9e9f1e467.tar.xz pokeyellow-5a142e3fee043ad950c361bdd0e5d7e9e9f1e467.zip | |
Use hardware.inc constants in places unique to Yellow
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/gfx/palettes.asm | 16 | ||||
| -rw-r--r-- | engine/minigame/surfing_pikachu.asm | 6 | ||||
| -rw-r--r-- | engine/movie/intro_yellow.asm | 6 | ||||
| -rw-r--r-- | engine/printer/printer.asm | 4 |
4 files changed, 16 insertions, 16 deletions
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 16869869..e2924c91 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -817,7 +817,7 @@ DMGPalToCGBPal:: ldh a, [rOBP1] ld [wLastOBP1], a .convert - FOR color_index, NUM_PAL_COLORS + FOR color_index, PAL_COLORS ld b, a and %11 call .GetColorAddress @@ -826,7 +826,7 @@ DMGPalToCGBPal:: ld a, [hl] ld [wCGBPal + color_index * 2 + 1], a - IF color_index < NUM_PAL_COLORS - 1 + IF color_index < PAL_COLORS - 1 ld a, b rrca rrca @@ -855,12 +855,12 @@ TransferCurBGPData:: ldh a, [rLCDC] and LCDC_ON jr nz, .lcdEnabled - REPT NUM_PAL_COLORS + REPT PAL_COLORS call TransferPalColorLCDDisabled ENDR jr .done .lcdEnabled - REPT NUM_PAL_COLORS + REPT PAL_COLORS call TransferPalColorLCDEnabled ENDR .done @@ -879,7 +879,7 @@ BufferBGPPal:: ld de, wBGPPalsBuffer add hl, de ld de, wCGBPal - ld c, PALETTE_SIZE + ld c, PAL_SIZE .loop ld a, [de] ld [hli], a @@ -910,7 +910,7 @@ TransferBGPPals:: ldh [rBGPI], a ld de, rBGPD ld hl, wBGPPalsBuffer - ld c, 4 * PALETTE_SIZE + ld c, 4 * PAL_SIZE .loop ld a, [hli] ld [de], a @@ -931,12 +931,12 @@ TransferCurOBPData: ldh a, [rLCDC] and LCDC_ON jr nz, .lcdEnabled - REPT NUM_PAL_COLORS + REPT PAL_COLORS call TransferPalColorLCDDisabled ENDR jr .done .lcdEnabled - REPT NUM_PAL_COLORS + REPT PAL_COLORS call TransferPalColorLCDEnabled ENDR .done diff --git a/engine/minigame/surfing_pikachu.asm b/engine/minigame/surfing_pikachu.asm index 79e5bc3e..65e4f5e5 100644 --- a/engine/minigame/surfing_pikachu.asm +++ b/engine/minigame/surfing_pikachu.asm @@ -1453,7 +1453,7 @@ SurfingMinigame_DrawHP: SurfingMinigame_DrawResultsScreen: ld hl, wTileMap - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + ld bc, SCREEN_AREA xor a call FillMemory ld hl, .BeachTilemap @@ -2396,7 +2396,7 @@ SurfingPikachuMinigameIntro: DrawSurfingPikachuMinigameIntroBackground: ld hl, wTileMap - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + ld bc, SCREEN_AREA ld a, $ff call FillMemory ld hl, Tilemap_f90bc @@ -2536,7 +2536,7 @@ SurfingPikachuMinigame_NormalPals: SurfingPikachu_ClearTileMap: ld hl, wTileMap - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + ld bc, SCREEN_AREA xor a call FillMemory ret diff --git a/engine/movie/intro_yellow.asm b/engine/movie/intro_yellow.asm index 47203580..37eee6f8 100644 --- a/engine/movie/intro_yellow.asm +++ b/engine/movie/intro_yellow.asm @@ -43,7 +43,7 @@ PlayIntroScene: ldh [hWY], a call ClearObjectAnimationBuffers ld hl, wTileMap - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + ld bc, SCREEN_AREA xor a call Bank3E_FillMemory call YellowIntro_BlankOAMBuffer @@ -823,7 +823,7 @@ InitYellowIntroGFXAndMusic: ldh [hAutoBGTransferDest + 1], a call YellowIntro_BlankTileMap ld hl, wTileMap - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + ld bc, SCREEN_AREA ld a, $1 call Bank3E_FillMemory hlcoord 0, 4 @@ -881,7 +881,7 @@ LoadYellowIntroObjectAnimationDataPointers: YellowIntro_BlankTileMap: ld hl, wTileMap - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + ld bc, SCREEN_AREA ld a, $7f call Bank3E_FillMemory ret diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index f0d2cb34..18161e6a 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -466,14 +466,14 @@ Printer_CheckPressingB: Printer_CopyTileMapToPrinterTileBuffer: hlcoord 0, 0 decoord 0, 0, wPrinterTileBuffer - ld bc, SCREEN_HEIGHT * SCREEN_WIDTH + ld bc, SCREEN_AREA call CopyData ret Printer_CopyTileMapFromPrinterTileBuffer: hlcoord 0, 0, wPrinterTileBuffer decoord 0, 0 - ld bc, SCREEN_HEIGHT * SCREEN_WIDTH + ld bc, SCREEN_AREA call CopyData ret |