diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/game_time.asm | 2 | ||||
| -rw-r--r-- | home/map.asm | 6 | ||||
| -rw-r--r-- | home/menu.asm | 9 |
3 files changed, 9 insertions, 8 deletions
diff --git a/home/game_time.asm b/home/game_time.asm index 1ae33cc47..5a6732414 100644 --- a/home/game_time.asm +++ b/home/game_time.asm @@ -22,7 +22,7 @@ GameTimer:: ldh [rSVBK], a ret -.Function +.Function: ; Increment the game timer by one frame. ; The game timer is capped at 999:59:59.00. diff --git a/home/map.asm b/home/map.asm index 7bc67823d..e329f6b6e 100644 --- a/home/map.asm +++ b/home/map.asm @@ -124,12 +124,12 @@ LoadMetatiles:: ld a, [wOverworldMapAnchor + 1] ld d, a ld hl, wSurroundingTiles - ld b, SURROUNDING_HEIGHT / METATILE_WIDTH ; 5 + ld b, SCREEN_META_HEIGHT .row push de push hl - ld c, SURROUNDING_WIDTH / METATILE_WIDTH ; 6 + ld c, SCREEN_META_WIDTH .col push de @@ -195,7 +195,7 @@ endr add hl, de pop de ld a, [wMapWidth] - add 6 + add MAP_CONNECTION_PADDING_WIDTH * 2 add e ld e, a jr nc, .ok2 diff --git a/home/menu.asm b/home/menu.asm index 41c39ede6..abbe45d7a 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -257,6 +257,7 @@ MenuBoxCoord2Tile:: ld c, a ld a, [wMenuBorderTopCoord] ld b, a + ; fallthrough Coord2Tile:: ; Return the address of wTilemap(c, b) in hl. @@ -430,12 +431,12 @@ _YesNoBox:: ld hl, YesNoMenuHeader call CopyMenuHeader pop bc -; This seems to be an overflow prevention, but -; it was coded wrong. +; This seems to be an overflow prevention, +; but it was coded wrong. ld a, b - cp SCREEN_WIDTH - 6 + cp SCREEN_WIDTH - 1 - 5 jr nz, .okay ; should this be "jr nc"? - ld a, SCREEN_WIDTH - 6 + ld a, SCREEN_WIDTH - 1 - 5 ld b, a .okay |