diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/copy.asm | 8 | ||||
| -rw-r--r-- | home/game_time.asm | 4 | ||||
| -rw-r--r-- | home/init.asm | 6 | ||||
| -rw-r--r-- | home/lcd.asm | 2 | ||||
| -rw-r--r-- | home/map.asm | 8 | ||||
| -rw-r--r-- | home/movement.asm | 4 | ||||
| -rw-r--r-- | home/palettes.asm | 38 | ||||
| -rw-r--r-- | home/video.asm | 4 |
8 files changed, 37 insertions, 37 deletions
diff --git a/home/copy.asm b/home/copy.asm index 8ee1c90f9..210fb773e 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -72,16 +72,16 @@ OldDMATransfer:: ; dfd call DelayFrame ; add $100 to hl and de ld a, l - add $100 % $100 + add LOW($100) ld l, a ld a, h - adc $100 / $100 + adc HIGH($100) ld h, a ld a, e - add $100 % $100 + add LOW($100) ld e, a ld a, d - adc $100 / $100 + adc HIGH($100) ld d, a jr .loop diff --git a/home/game_time.asm b/home/game_time.asm index 09d558eef..91dd381fc 100644 --- a/home/game_time.asm +++ b/home/game_time.asm @@ -106,11 +106,11 @@ UpdateGameTimer:: ; 20ad ; Cap the timer after 1000 hours. ld a, h - cp 1000 / $100 + cp HIGH(1000) jr c, .ok ld a, l - cp 1000 % $100 + cp LOW(1000) jr c, .ok ld hl, GameTimeCap diff --git a/home/init.asm b/home/init.asm index 630cfe622..9023fada2 100644 --- a/home/init.asm +++ b/home/init.asm @@ -141,9 +141,9 @@ Init:: ; 17d farcall InitCGBPals - ld a, VBGMap1 / $100 + ld a, HIGH(VBGMap1) ld [hBGMapAddress + 1], a - xor a ; VBGMap1 % $100 + xor a ; LOW(VBGMap1) ld [hBGMapAddress], a farcall StartClock @@ -201,7 +201,7 @@ ClearWRAM:: ; 25a push af ld [rSVBK], a xor a - ld hl, $d000 + ld hl, wRAM1Start ld bc, $1000 call ByteFill pop af diff --git a/home/lcd.asm b/home/lcd.asm index b73e9e5be..8ec1e02ce 100644 --- a/home/lcd.asm +++ b/home/lcd.asm @@ -23,7 +23,7 @@ LCD:: ; 552 push bc ld a, [rLY] ld c, a - ld b, LYOverrides >> 8 + ld b, HIGH(LYOverrides) ld a, [bc] ld b, a ld a, [hLCDCPointer] diff --git a/home/map.asm b/home/map.asm index 37022e234..1becaa64a 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1241,10 +1241,10 @@ ScrollMapUp:: ; 2748 ld h, a ld bc, $0200 add hl, bc -; cap d at VBGMap1 / $100 +; cap d at HIGH(VBGMap0) ld a, h and %00000011 - or VBGMap0 / $100 + or HIGH(VBGMap0) ld e, l ld d, a call UpdateBGMapRow @@ -1369,10 +1369,10 @@ UpdateBGMapColumn:: ; 27f8 ld e, a jr nc, .skip inc d -; cap d at VBGMap1 / $100 +; cap d at HIGH(VBGMap0) ld a, d and $3 - or VBGMap0 / $100 + or HIGH(VBGMap0) ld d, a .skip diff --git a/home/movement.asm b/home/movement.asm index 0a2623a09..a7c9dbb5b 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -4,9 +4,9 @@ InitMovementBuffer:: ; 1b1e ld [wMovementBufferCount], a ld a, $0 ; useless ld [wUnusedMovementBufferBank], a - ld a, MovementBuffer % $100 + ld a, LOW(MovementBuffer) ld [wUnusedMovementBufferPointer], a - ld a, MovementBuffer / $100 + ld a, HIGH(MovementBuffer) ld [wUnusedMovementBufferPointer + 1], a ret ; 1b35 diff --git a/home/palettes.asm b/home/palettes.asm index 4eec68b5d..80e4e25ec 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -24,18 +24,18 @@ ForceUpdateCGBPals:: ; c37 ld a, [rSVBK] push af - ld a, 5 ; BANK(BGPals) + ld a, BANK(BGPals) ld [rSVBK], a - ld hl, BGPals ; 5:d080 + ld hl, BGPals ; copy 8 pals to bgpd ld a, %10000000 ; auto increment, index 0 ld [rBGPI], a - ld c, rBGPD % $100 - ld b, 4 ; NUM_PALS / 2 + ld c, LOW(rBGPD) + ld b, 8 / 2 .bgp -rept 2 palettes +rept (1 palettes) * 2 ld a, [hli] ld [$ff00+c], a endr @@ -43,15 +43,15 @@ endr dec b jr nz, .bgp -; hl is now 5:d0c0 OBPals +; hl is now OBPals ; copy 8 pals to obpd ld a, %10000000 ; auto increment, index 0 ld [rOBPI], a - ld c, rOBPD % $100 - ld b, 4 ; NUM_PALS / 2 + ld c, LOW(rOBPD) + ld b, 8 / 2 .obp -rept 2 palettes +rept (1 palettes) * 2 ld a, [hli] ld [$ff00+c], a endr @@ -90,7 +90,7 @@ DmgToCgbBGPals:: ; c9f ld a, [rSVBK] push af - ld a, 5 ; gfx + ld a, BANK(BGPals) ld [rSVBK], a ; copy & reorder bg pal buffer @@ -138,7 +138,7 @@ DmgToCgbObjPals:: ; ccb ld a, [rSVBK] push af - ld a, 5 + ld a, BANK(OBPals) ld [rSVBK], a ; copy & reorder obj pal buffer @@ -178,11 +178,11 @@ DmgToCgbObjPal0:: ; cf8 ld a, [rSVBK] push af - ld a, 5 ; gfx + ld a, BANK(OBPals) ld [rSVBK], a - ld hl, OBPals - ld de, UnknOBPals + ld hl, OBPals palette 0 + ld de, UnknOBPals palette 0 ld a, [rOBP0] ld b, a ld c, 1 @@ -216,11 +216,11 @@ DmgToCgbObjPal1:: ; d24 ld a, [rSVBK] push af - ld a, 5 ; gfx + ld a, BANK(OBPals) ld [rSVBK], a - ld hl, OBPals + 1 palettes - ld de, UnknOBPals + 1 palettes + ld hl, OBPals palette 1 + ld de, UnknOBPals palette 1 ld a, [rOBP1] ld b, a ld c, 1 @@ -325,10 +325,10 @@ Special_ReloadSpritesNoPalettes:: ; d91 ret z ld a, [rSVBK] push af - ld a, 5 ; BANK(BGPals) + ld a, BANK(BGPals) ld [rSVBK], a ld hl, BGPals - ld bc, $40 + $10 + ld bc, (8 palettes) + (2 palettes) xor a call ByteFill pop af diff --git a/home/video.asm b/home/video.asm index e3c231b4f..3efa32550 100644 --- a/home/video.asm +++ b/home/video.asm @@ -143,9 +143,9 @@ UpdateBGMap:: ; 164c ld h, a push hl - xor a + xor a ; LOW(VBGMap1) ld [hBGMapAddress], a - ld a, VBGMap1 >> 8 + ld a, HIGH(VBGMap1) ld [hBGMapAddress + 1], a ld a, [hBGMapMode] |