diff options
Diffstat (limited to 'engine/tilesets')
| -rw-r--r-- | engine/tilesets/tileset_anims.asm | 50 | ||||
| -rw-r--r-- | engine/tilesets/timeofday_pals.asm | 20 |
2 files changed, 35 insertions, 35 deletions
diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm index 2827b3a92..5553eec10 100644 --- a/engine/tilesets/tileset_anims.asm +++ b/engine/tilesets/tileset_anims.asm @@ -9,10 +9,10 @@ _AnimateTileset:: ld a, [wTilesetAnim + 1] ld d, a - ld a, [hTileAnimFrame] + ldh a, [hTileAnimFrame] ld l, a inc a - ld [hTileAnimFrame], a + ldh [hTileAnimFrame], a ld h, 0 add hl, hl @@ -277,7 +277,7 @@ TilesetAerodactylWordRoomAnim: DoneTileAnimation: ; Reset the animation command loop. xor a - ld [hTileAnimFrame], a + ldh [hTileAnimFrame], a WaitTileAnimation: ; Do nothing this frame. @@ -636,7 +636,7 @@ AnimateFlowerTile: ld e, a ; CGB has different color mappings for flowers. - ld a, [hCGB] + ldh a, [hCGB] and 1 add e @@ -856,12 +856,12 @@ AnimateWaterPalette: ; Transition between color values 0-2 for color 0 in palette 3. ; No palette changes on DMG. - ld a, [hCGB] + ldh a, [hCGB] and a ret z ; We don't want to mess with non-standard palettes. - ld a, [rBGP] ; BGP + ldh a, [rBGP] ; BGP cp %11100100 ret nz @@ -874,12 +874,12 @@ AnimateWaterPalette: ; Ready for BGPD input... ld a, (1 << rBGPI_AUTO_INCREMENT) palette PAL_BG_WATER - ld [rBGPI], a + ldh [rBGPI], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, BANK(wBGPals1) - ld [rSVBK], a + ldh [rSVBK], a ; Update color 0 in order 0 1 2 1 ld a, l @@ -891,38 +891,38 @@ AnimateWaterPalette: .color1 ld hl, wBGPals1 palette PAL_BG_WATER color 1 ld a, [hli] - ld [rBGPD], a + ldh [rBGPD], a ld a, [hli] - ld [rBGPD], a + ldh [rBGPD], a jr .end .color0 ld hl, wBGPals1 palette PAL_BG_WATER color 0 ld a, [hli] - ld [rBGPD], a + ldh [rBGPD], a ld a, [hli] - ld [rBGPD], a + ldh [rBGPD], a jr .end .color2 ld hl, wBGPals1 palette PAL_BG_WATER color 2 ld a, [hli] - ld [rBGPD], a + ldh [rBGPD], a ld a, [hli] - ld [rBGPD], a + ldh [rBGPD], a .end pop af - ld [rSVBK], a + ldh [rSVBK], a ret FlickeringCaveEntrancePalette: ; No palette changes on DMG. - ld a, [hCGB] + ldh a, [hCGB] and a ret z ; We don't want to mess with non-standard palettes. - ld a, [rBGP] + ldh a, [rBGP] cp %11100100 ret nz ; We only want to be here if we're in a dark cave. @@ -930,14 +930,14 @@ FlickeringCaveEntrancePalette: cp %11111111 ; 3,3,3,3 ret nz - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, BANK(wBGPals1) - ld [rSVBK], a + ldh [rSVBK], a ; Ready for BGPD input... ld a, (1 << rBGPI_AUTO_INCREMENT) palette PAL_BG_YELLOW - ld [rBGPI], a - ld a, [hVBlankCounter] + ldh [rBGPI], a + ldh a, [hVBlankCounter] and %10 jr nz, .bit1set ld hl, wBGPals1 palette PAL_BG_YELLOW @@ -948,12 +948,12 @@ FlickeringCaveEntrancePalette: .okay ld a, [hli] - ld [rBGPD], a + ldh [rBGPD], a ld a, [hli] - ld [rBGPD], a + ldh [rBGPD], a pop af - ld [rSVBK], a + ldh [rSVBK], a ret TowerPillarTilePointer1: dw vTiles2 tile $2d, TowerPillarTile1 diff --git a/engine/tilesets/timeofday_pals.asm b/engine/tilesets/timeofday_pals.asm index 58bbe9183..99437cfe0 100644 --- a/engine/tilesets/timeofday_pals.asm +++ b/engine/tilesets/timeofday_pals.asm @@ -43,11 +43,11 @@ _TimeOfDayPals:: ld hl, wBGPals1 palette PAL_BG_TEXT ; save wram bank - ld a, [rSVBK] + ldh a, [rSVBK] ld b, a ld a, BANK(wBGPals1) - ld [rSVBK], a + ldh [rSVBK], a ; push palette ld c, NUM_PAL_COLORS @@ -62,7 +62,7 @@ _TimeOfDayPals:: ; restore wram bank ld a, b - ld [rSVBK], a + ldh [rSVBK], a ; update sgb pals ld b, SCGB_MAPPALS @@ -72,11 +72,11 @@ _TimeOfDayPals:: ld hl, wOBPals1 - 1 ; last byte in wBGPals1 ; save wram bank - ld a, [rSVBK] + ldh a, [rSVBK] ld d, a ld a, BANK(wOBPals1) - ld [rSVBK], a + ldh [rSVBK], a ; pop palette ld e, NUM_PAL_COLORS @@ -91,7 +91,7 @@ _TimeOfDayPals:: ; restore wram bank ld a, d - ld [rSVBK], a + ldh [rSVBK], a ; update palettes call _UpdateTimePals @@ -158,10 +158,10 @@ FadeBlackQuickly: ret FillWhiteBGColor: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, BANK(wBGPals1) - ld [rSVBK], a + ldh [rSVBK], a ld hl, wBGPals1 ld a, [hli] @@ -182,7 +182,7 @@ endr jr nz, .loop pop af - ld [rSVBK], a + ldh [rSVBK], a ret ReplaceTimeOfDayPals: @@ -306,7 +306,7 @@ ConvertTimePalsDecHL: GetTimePalFade: ; check cgb - ld a, [hCGB] + ldh a, [hCGB] and a jr nz, .cgb |