diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-17 11:29:00 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-17 11:29:00 -0400 |
| commit | be93ab33a752fe0360c3b23dd4f33e1b0a05bf0e (patch) | |
| tree | 8fad7073f61b88e5080946d6f38669c3b67f2452 /engine/tilesets | |
| parent | 8019db3ea98ee60d3e6675431e07819b83daf04c (diff) | |
Harmonize engine/{phone, pokedex, pokegear, printer, rtc, tilesets} with pokegold
To do: engine/{menus, movie, overworld, pokemon}
Diffstat (limited to 'engine/tilesets')
| -rw-r--r-- | engine/tilesets/tileset_anims.asm | 22 | ||||
| -rw-r--r-- | engine/tilesets/timeofday_pals.asm | 14 |
2 files changed, 17 insertions, 19 deletions
diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm index f8869b59b..33e956df0 100644 --- a/engine/tilesets/tileset_anims.asm +++ b/engine/tilesets/tileset_anims.asm @@ -2,7 +2,7 @@ _AnimateTileset:: ; Iterate over a given pointer array of ; animation functions (one per frame). -; Typically in wra1, vra0 +; Typically in WRAM bank 1, VRAM bank 0. ld a, [wTilesetAnim] ld e, a @@ -214,16 +214,16 @@ TilesetIcePathAnim: dw NULL, DoneTileAnimation TilesetTowerAnim: - dw TowerPillarTilePointer9, AnimateTowerPillarTile + dw TowerPillarTilePointer9, AnimateTowerPillarTile dw TowerPillarTilePointer10, AnimateTowerPillarTile - dw TowerPillarTilePointer7, AnimateTowerPillarTile - dw TowerPillarTilePointer8, AnimateTowerPillarTile - dw TowerPillarTilePointer5, AnimateTowerPillarTile - dw TowerPillarTilePointer6, AnimateTowerPillarTile - dw TowerPillarTilePointer3, AnimateTowerPillarTile - dw TowerPillarTilePointer4, AnimateTowerPillarTile - dw TowerPillarTilePointer1, AnimateTowerPillarTile - dw TowerPillarTilePointer2, AnimateTowerPillarTile + dw TowerPillarTilePointer7, AnimateTowerPillarTile + dw TowerPillarTilePointer8, AnimateTowerPillarTile + dw TowerPillarTilePointer5, AnimateTowerPillarTile + dw TowerPillarTilePointer6, AnimateTowerPillarTile + dw TowerPillarTilePointer3, AnimateTowerPillarTile + dw TowerPillarTilePointer4, AnimateTowerPillarTile + dw TowerPillarTilePointer1, AnimateTowerPillarTile + dw TowerPillarTilePointer2, AnimateTowerPillarTile dw NULL, StandingTileFrame dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation @@ -658,7 +658,6 @@ FlowerTileFrames: INCBIN "gfx/tilesets/flower/cgb_2.2bpp" LavaBubbleAnim1: -; Splash in the bottom-right corner of the fountain. ld hl, sp+0 ld b, h ld c, l @@ -678,7 +677,6 @@ LavaBubbleAnim1: jp WriteTile LavaBubbleAnim2: -; Splash in the top-left corner of the fountain. ld hl, sp+0 ld b, h ld c, l diff --git a/engine/tilesets/timeofday_pals.asm b/engine/tilesets/timeofday_pals.asm index 814116660..27172a213 100644 --- a/engine/tilesets/timeofday_pals.asm +++ b/engine/tilesets/timeofday_pals.asm @@ -188,19 +188,19 @@ endr ReplaceTimeOfDayPals: ld hl, .BrightnessLevels ld a, [wMapTimeOfDay] - cp $4 ; Dark cave, needs Flash - jr z, .DarkCave + cp PALETTE_DARK + jr z, .NeedsFlash and $7 add l ld l, a - ld a, $0 + ld a, 0 adc h ld h, a ld a, [hl] ld [wTimeOfDayPalset], a ret -.DarkCave: +.NeedsFlash: ld a, [wStatusFlags] bit STATUSFLAGS_FLASH_F, a jr nz, .UsedFlash @@ -319,7 +319,7 @@ GetTimePalFade: ; get fade table push bc ld c, a - ld b, $0 + ld b, 0 ld hl, .dmgfades add hl, bc add hl, bc @@ -329,13 +329,13 @@ GetTimePalFade: pop bc ; get place in fade table - ld b, $0 + ld b, 0 add hl, bc ret .cgb ld hl, .cgbfade - ld b, $0 + ld b, 0 add hl, bc ret |