diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 23:22:50 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 23:22:50 -0400 |
commit | 67d1364c7acfd5e8e2256080e16a14cfa59a5abc (patch) | |
tree | fcf1bcbc2990b8fdeb5d63159d15382a8bdf719a /engine/tilesets | |
parent | 91f914718a263839daef24d44eda857bfc7cca95 (diff) |
Fix triple newlines left over from removing address comments
Diffstat (limited to 'engine/tilesets')
-rw-r--r-- | engine/tilesets/mapgroup_roofs.asm | 1 | ||||
-rw-r--r-- | engine/tilesets/tileset_anims.asm | 22 | ||||
-rw-r--r-- | engine/tilesets/timeofday_pals.asm | 7 |
3 files changed, 0 insertions, 30 deletions
diff --git a/engine/tilesets/mapgroup_roofs.asm b/engine/tilesets/mapgroup_roofs.asm index 8262f57b1..b269e5277 100644 --- a/engine/tilesets/mapgroup_roofs.asm +++ b/engine/tilesets/mapgroup_roofs.asm @@ -15,5 +15,4 @@ LoadMapGroupRoof:: call CopyBytes ret - INCLUDE "data/maps/roofs.asm" diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm index 360bce88a..1e6abb968 100644 --- a/engine/tilesets/tileset_anims.asm +++ b/engine/tilesets/tileset_anims.asm @@ -290,7 +290,6 @@ StandingTileFrame8: ld [wTileAnimationTimer], a ret - ScrollTileRightLeft: ; Scroll right for 4 ticks, then left for 4 ticks. ld a, [wTileAnimationTimer] @@ -393,7 +392,6 @@ ScrollTileDown: jr nz, .loop ret - AnimateFountain: ld hl, sp+0 ld b, h @@ -431,7 +429,6 @@ AnimateFountain: .frame4 INCBIN "gfx/tilesets/fountain/4.2bpp" .frame5 INCBIN "gfx/tilesets/fountain/5.2bpp" - AnimateWaterTile: ; Draw a water tile for the current frame in VRAM tile at de. @@ -467,7 +464,6 @@ AnimateWaterTile: WaterTileFrames: INCBIN "gfx/tilesets/water/water.2bpp" - ForestTreeLeftAnimation: ld hl, sp+0 ld b, h @@ -497,7 +493,6 @@ ForestTreeLeftAnimation: ld hl, vTiles2 tile $0c jp WriteTile - ForestTreeLeftFrames: INCBIN "gfx/tilesets/forest-tree/1.2bpp" INCBIN "gfx/tilesets/forest-tree/2.2bpp" @@ -506,7 +501,6 @@ ForestTreeRightFrames: INCBIN "gfx/tilesets/forest-tree/3.2bpp" INCBIN "gfx/tilesets/forest-tree/4.2bpp" - ForestTreeRightAnimation: ld hl, sp+0 ld b, h @@ -540,7 +534,6 @@ ForestTreeRightAnimation: ld hl, vTiles2 tile $0f jp WriteTile - ForestTreeLeftAnimation2: ld hl, sp+0 ld b, h @@ -571,7 +564,6 @@ ForestTreeLeftAnimation2: ld hl, vTiles2 tile $0c jp WriteTile - ForestTreeRightAnimation2: ld hl, sp+0 ld b, h @@ -606,7 +598,6 @@ ForestTreeRightAnimation2: ld hl, vTiles2 tile $0f jp WriteTile - GetForestTreeFrame: ; Return 0 if a is even, or 2 if odd. and a @@ -631,7 +622,6 @@ GetForestTreeFrame: xor a ret - AnimateFlowerTile: ; No parameters. @@ -667,7 +657,6 @@ FlowerTileFrames: INCBIN "gfx/tilesets/flower/dmg_2.2bpp" INCBIN "gfx/tilesets/flower/cgb_2.2bpp" - LavaBubbleAnim1: ; Splash in the bottom-right corner of the fountain. ld hl, sp+0 @@ -688,7 +677,6 @@ LavaBubbleAnim1: ld hl, vTiles2 tile $5b jp WriteTile - LavaBubbleAnim2: ; Splash in the top-left corner of the fountain. ld hl, sp+0 @@ -707,14 +695,12 @@ LavaBubbleAnim2: ld hl, vTiles2 tile $38 jp WriteTile - LavaBubbleFrames: INCBIN "gfx/tilesets/lava/1.2bpp" INCBIN "gfx/tilesets/lava/2.2bpp" INCBIN "gfx/tilesets/lava/3.2bpp" INCBIN "gfx/tilesets/lava/4.2bpp" - AnimateTowerPillarTile: ; Read from struct at de: ; Destination (VRAM) @@ -761,13 +747,11 @@ AnimateTowerPillarTile: .frames db $00, $10, $20, $30, $40, $30, $20, $10 - StandingTileFrame: ld hl, wTileAnimationTimer inc [hl] ret - AnimateWhirlpoolTile: ; Update whirlpool tile using struct at de. @@ -812,7 +796,6 @@ AnimateWhirlpoolTile: jr WriteTile - WriteTileFromBuffer: ; Write tiledata at wTileAnimBuffer to de. ; wTileAnimBuffer is loaded to sp for WriteTile. @@ -828,7 +811,6 @@ WriteTileFromBuffer: ld l, e jr WriteTile - WriteTileToBuffer: ; Write tiledata de to wTileAnimBuffer. ; de is loaded to sp for WriteTile. @@ -870,7 +852,6 @@ endr ld sp, hl ret - TileAnimationPalette: ; Transition between color values 0-2 for color 0 in palette 3. @@ -935,7 +916,6 @@ TileAnimationPalette: ld [rSVBK], a ret - FlickeringCaveEntrancePalette: ; No palette changes on DMG. ld a, [hCGB] @@ -976,7 +956,6 @@ FlickeringCaveEntrancePalette: ld [rSVBK], a ret - TowerPillarTilePointer1: dw vTiles2 tile $2d, TowerPillarTile1 TowerPillarTilePointer2: dw vTiles2 tile $2f, TowerPillarTile2 TowerPillarTilePointer3: dw vTiles2 tile $3d, TowerPillarTile3 @@ -999,7 +978,6 @@ TowerPillarTile8: INCBIN "gfx/tilesets/tower-pillar/8.2bpp" TowerPillarTile9: INCBIN "gfx/tilesets/tower-pillar/9.2bpp" TowerPillarTile10: INCBIN "gfx/tilesets/tower-pillar/10.2bpp" - WhirlpoolFrames1: dw vTiles2 tile $32, WhirlpoolTiles1 WhirlpoolFrames2: dw vTiles2 tile $33, WhirlpoolTiles2 WhirlpoolFrames3: dw vTiles2 tile $42, WhirlpoolTiles3 diff --git a/engine/tilesets/timeofday_pals.asm b/engine/tilesets/timeofday_pals.asm index cda6e1e0d..58bbe9183 100644 --- a/engine/tilesets/timeofday_pals.asm +++ b/engine/tilesets/timeofday_pals.asm @@ -10,7 +10,6 @@ UpdateTimeOfDayPal:: ld [wTimeOfDayPal], a ret - _TimeOfDayPals:: ; return carry if pals are changed @@ -65,12 +64,10 @@ _TimeOfDayPals:: ld a, b ld [rSVBK], a - ; update sgb pals ld b, SCGB_MAPPALS call GetSGBLayout - ; restore bg palette 7 ld hl, wOBPals1 - 1 ; last byte in wBGPals1 @@ -109,7 +106,6 @@ _TimeOfDayPals:: and a ret - _UpdateTimePals:: ld c, $9 ; normal call GetTimePalFade @@ -161,7 +157,6 @@ FadeBlackQuickly: call ConvertTimePalsDecHL ret - FillWhiteBGColor: ld a, [rSVBK] push af @@ -271,7 +266,6 @@ GetTimePalette: rlca ret - DmgToCgbTimePals: push hl push de @@ -310,7 +304,6 @@ ConvertTimePalsDecHL: jr nz, .loop ret - GetTimePalFade: ; check cgb ld a, [hCGB] |