diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/audio.asm | 7 | ||||
| -rw-r--r-- | home/copy.asm | 29 | ||||
| -rw-r--r-- | home/init.asm | 4 | ||||
| -rw-r--r-- | home/map.asm | 36 | ||||
| -rw-r--r-- | home/video.asm | 2 |
5 files changed, 41 insertions, 37 deletions
diff --git a/home/audio.asm b/home/audio.asm index 3e22a1540..a41fdbf00 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -312,13 +312,13 @@ VolumeOff:: ; 3ca3 ret ; 3ca8 -Function3ca8:: ; 3ca8 +FadeOutMusic:: ; 3ca8 ld a, 4 ld [MusicFade], a ret ; 3cae -CrankUpTheVolume:: ; 3cae +FadeInMusic:: ; 3cae ld a, 4 | 1 << 7 ld [MusicFade], a ret @@ -326,11 +326,12 @@ CrankUpTheVolume:: ; 3cae SkipMusic:: ; 3cb4 ; Skip a frames of music. +.loop and a ret z dec a call UpdateSound - jr SkipMusic + jr .loop ; 3cbc FadeToMapMusic:: ; 3cbc diff --git a/home/copy.asm b/home/copy.asm index e479ddeaf..08eb5c10d 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -232,10 +232,10 @@ Request2bpp:: ; eba ld a, b rst Bankswitch - ld a, [$ffd3] + ld a, [hTilesPerCycle] push af ld a, $8 - ld [$ffd3], a + ld [hTilesPerCycle], a ld a, [wLinkMode] cp LINK_MOBILE @@ -244,7 +244,7 @@ Request2bpp:: ; eba and a jr nz, .NotMobile ld a, $6 - ld [$ffd3], a + ld [hTilesPerCycle], a .NotMobile ld a, e @@ -257,7 +257,7 @@ Request2bpp:: ; eba ld [Requested2bppDest + 1], a .loop ld a, c - ld hl, $ffd3 + ld hl, hTilesPerCycle cp [hl] jr nc, .iterate @@ -269,7 +269,7 @@ Request2bpp:: ; eba jr nz, .wait pop af - ld [$ffd3], a + ld [hTilesPerCycle], a pop af rst Bankswitch @@ -279,7 +279,7 @@ Request2bpp:: ; eba ret .iterate - ld a, [$ffd3] + ld a, [hTilesPerCycle] ld [Requested2bpp], a .wait2 @@ -289,7 +289,7 @@ Request2bpp:: ; eba jr nz, .wait2 ld a, c - ld hl, $ffd3 + ld hl, hTilesPerCycle sub [hl] ld c, a jr .loop @@ -297,6 +297,7 @@ Request2bpp:: ; eba Request1bpp:: ; f1e +; Load 1bpp at b:de to occupy c tiles of hl. ld a, [hBGMapMode] push af xor a @@ -307,11 +308,11 @@ Request1bpp:: ; f1e ld a, b rst Bankswitch - ld a, [$ffd3] + ld a, [hTilesPerCycle] push af ld a, $8 - ld [$ffd3], a + ld [hTilesPerCycle], a ld a, [wLinkMode] cp LINK_MOBILE jr nz, .NotMobile @@ -319,7 +320,7 @@ Request1bpp:: ; f1e and a jr nz, .NotMobile ld a, $6 - ld [$ffd3], a + ld [hTilesPerCycle], a .NotMobile ld a, e @@ -332,7 +333,7 @@ Request1bpp:: ; f1e ld [Requested1bppDest + 1], a .loop ld a, c - ld hl, $ffd3 + ld hl, hTilesPerCycle cp [hl] jr nc, .iterate @@ -344,7 +345,7 @@ Request1bpp:: ; f1e jr nz, .wait pop af - ld [$ffd3], a + ld [hTilesPerCycle], a pop af rst Bankswitch @@ -354,7 +355,7 @@ Request1bpp:: ; f1e ret .iterate - ld a, [$ffd3] + ld a, [hTilesPerCycle] ld [Requested1bpp], a .wait2 @@ -364,7 +365,7 @@ Request1bpp:: ; f1e jr nz, .wait2 ld a, c - ld hl, $ffd3 + ld hl, hTilesPerCycle sub [hl] ld c, a jr .loop diff --git a/home/init.asm b/home/init.asm index 8325f6294..f78149dd6 100644 --- a/home/init.asm +++ b/home/init.asm @@ -2,7 +2,7 @@ Reset:: ; 150 di call SoundRestart xor a - ld [$ffde], a + ld [hMapAnims], a call ClearPalettes xor a ld [rIF], a @@ -109,7 +109,7 @@ Init:: ; 17d call LoadPushOAM xor a - ld [$ffde], a + ld [hMapAnims], a ld [hSCX], a ld [hSCY], a ld [rJOYP], a diff --git a/home/map.asm b/home/map.asm index fd68e5442..cb83a689d 100644 --- a/home/map.asm +++ b/home/map.asm @@ -96,19 +96,19 @@ GetMapTrigger:: ; 2147 ; 2173 Function2173:: ; 2173 - call Function217a + call LoadMapPart call FarCallSwapTextboxPalettes ret ; 217a -Function217a:: ; 217a +LoadMapPart:: ; 217a ld a, [hROMBank] push af ld a, [TilesetBlocksBank] rst Bankswitch - call Function2198 + call LoadMetatiles ld a, $60 hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT @@ -123,36 +123,38 @@ Function217a:: ; 217a ret ; 2198 -Function2198:: ; 2198 +LoadMetatiles:: ; 2198 ld a, [wd194] ld e, a ld a, [wd195] ld d, a - ld hl, wEnemyMoveStruct - ld b, $5 + ld hl, wMisc + ld b, 5 ; SCREEN_WIDTH / 4 .loop push de push hl - ld c, $6 + ld c, 6 ; SCREEN_HEIGHT / 3 .loop2 push de push hl ld a, [de] and a - jr nz, .asm_21b2 + jr nz, .ok ld a, [MapBorderBlock] -.asm_21b2 +.ok ld e, l ld d, h +; double a, load hl <- a, multiply hl by 8 add a ld l, a ld h, 0 rept 3 add hl,hl endr +; hl <- hl + [TilesetBlocksAddress] ld a, [TilesetBlocksAddress] add l ld l, a @@ -168,7 +170,7 @@ rept 4 endr ld a, e - add 20 + add 5 * 4 ld e, a jr nc, .next\@ inc d @@ -182,24 +184,24 @@ rept 4 endr pop hl - ld de, $0004 + ld de, 4 add hl, de pop de inc de dec c jp nz, .loop2 pop hl - ld de, $0060 + ld de, $60 add hl, de pop de ld a, [MapWidth] - add $6 + add 6 add e ld e, a - jr nc, .asm_2225 + jr nc, .ok2 inc d -.asm_2225 +.ok2 dec b jp nz, .loop ret @@ -2001,7 +2003,7 @@ Function2b74:: ; 0x2b74 call ClearSprites call Function2bae hlcoord 0, 12 - ld bc, $0412 + lb bc, 4, 18 call TextBox ld hl, VramState set 0, [hl] @@ -2013,7 +2015,7 @@ Function2b74:: ; 0x2b74 call UpdateTimePals call DelayFrame ld a, $1 - ld [$ffde], a + ld [hMapAnims], a pop af ret ; 0x2bae diff --git a/home/video.asm b/home/video.asm index b7e9f4db5..15ea9b72b 100644 --- a/home/video.asm +++ b/home/video.asm @@ -449,7 +449,7 @@ endr AnimateTileset:: ; 17d3 ; Only call during the first fifth of VBlank - ld a, [$ffde] + ld a, [hMapAnims] and a ret z |