diff options
Diffstat (limited to 'home')
-rw-r--r-- | home/audio.asm | 6 | ||||
-rw-r--r-- | home/battle.asm | 6 | ||||
-rw-r--r-- | home/copy.asm | 4 | ||||
-rw-r--r-- | home/copy2.asm | 10 | ||||
-rw-r--r-- | home/decompress.asm | 16 | ||||
-rw-r--r-- | home/farcall.asm | 6 | ||||
-rw-r--r-- | home/handshake.asm | 16 | ||||
-rw-r--r-- | home/init.asm | 2 | ||||
-rw-r--r-- | home/joypad.asm | 60 | ||||
-rw-r--r-- | home/lcd.asm | 2 | ||||
-rw-r--r-- | home/map.asm | 34 | ||||
-rw-r--r-- | home/map_objects.asm | 6 | ||||
-rw-r--r-- | home/menu.asm | 6 | ||||
-rw-r--r-- | home/mobile.asm | 12 | ||||
-rw-r--r-- | home/movement.asm | 2 | ||||
-rw-r--r-- | home/palettes.asm | 16 | ||||
-rw-r--r-- | home/predef.asm | 4 | ||||
-rw-r--r-- | home/rtc.asm | 4 | ||||
-rw-r--r-- | home/serial.asm | 2 | ||||
-rw-r--r-- | home/text.asm | 20 | ||||
-rw-r--r-- | home/time.asm | 30 | ||||
-rw-r--r-- | home/vblank.asm | 2 | ||||
-rw-r--r-- | home/video.asm | 20 | ||||
-rw-r--r-- | home/window.asm | 2 |
24 files changed, 144 insertions, 144 deletions
diff --git a/home/audio.asm b/home/audio.asm index c7bb7fed3..c6982fbbc 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -185,7 +185,7 @@ endr pop af ld [hROMBank], a ld [MBC3RomBank], a - + pop af pop bc pop de @@ -247,7 +247,7 @@ WaitSFX:: ; 3c55 ; infinite loop until sfx is done playing push hl - + .wait ld hl, Channel5Flags bit 0, [hl] @@ -261,7 +261,7 @@ WaitSFX:: ; 3c55 ld hl, Channel8Flags bit 0, [hl] jr nz, .wait - + pop hl ret ; 3c74 diff --git a/home/battle.asm b/home/battle.asm index 3fd593630..ea228851e 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -167,7 +167,7 @@ endr and a jr z, .getvar inc hl - + .getvar ; var id ld a, [hl] @@ -182,9 +182,9 @@ endr ld a, [hli] ld h, [hl] ld l, a - + ld a, [hl] - + pop bc ret diff --git a/home/copy.asm b/home/copy.asm index 08eb5c10d..d4e3e2da7 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -246,7 +246,7 @@ Request2bpp:: ; eba ld a, $6 ld [hTilesPerCycle], a -.NotMobile +.NotMobile: ld a, e ld [Requested2bppSource], a ld a, d @@ -322,7 +322,7 @@ Request1bpp:: ; f1e ld a, $6 ld [hTilesPerCycle], a -.NotMobile +.NotMobile: ld a, e ld [Requested1bppSource], a ld a, d diff --git a/home/copy2.asm b/home/copy2.asm index 538be572f..23e1eca7f 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -3,11 +3,11 @@ CopyBytes:: ; 0x3026 inc b ; we bail the moment b hits 0, so include the last run inc c ; same thing; include last byte jr .HandleLoop -.CopyByte +.CopyByte: ld a, [hli] ld [de], a inc de -.HandleLoop +.HandleLoop: dec c jr nz, .CopyByte dec b @@ -16,7 +16,7 @@ CopyBytes:: ; 0x3026 SwapBytes:: ; 0x3034 ; swap bc bytes between hl and de -.Loop +.Loop: ; stash [hl] away on the stack ld a, [hl] push af @@ -42,9 +42,9 @@ ByteFill:: ; 0x3041 inc b ; we bail the moment b hits 0, so include the last run inc c ; same thing; include last byte jr .HandleLoop -.PutByte +.PutByte: ld [hli], a -.HandleLoop +.HandleLoop: dec c jr nz, .PutByte dec b diff --git a/home/decompress.asm b/home/decompress.asm index 13613f64a..373e9fe89 100644 --- a/home/decompress.asm +++ b/home/decompress.asm @@ -79,7 +79,7 @@ LZ_LONG_HI EQU %00000011 ld a, d ld [wLZAddress + 1], a -.Main +.Main: ld a, [hl] cp LZ_END ret z @@ -145,7 +145,7 @@ LZ_LONG_HI EQU %00000011 jr z, .Zero -.Literal +.Literal: ; Read literal data for bc bytes. .lloop dec c @@ -160,7 +160,7 @@ LZ_LONG_HI EQU %00000011 jr .lloop -.Iter +.Iter: ; Write the same byte for bc bytes. ld a, [hli] @@ -176,7 +176,7 @@ LZ_LONG_HI EQU %00000011 jr .iloop -.Alt +.Alt: ; Alternate two bytes for bc bytes. dec c jr nz, .anext1 @@ -206,7 +206,7 @@ LZ_LONG_HI EQU %00000011 jr .Main -.Zero +.Zero: ; Write 0 for bc bytes. xor a @@ -276,7 +276,7 @@ LZ_LONG_HI EQU %00000011 ; For now, it defaults to LZ_REPEAT. -.Repeat +.Repeat: ; Copy decompressed data for bc bytes. dec c jr nz, .rnext @@ -290,7 +290,7 @@ LZ_LONG_HI EQU %00000011 jr .Repeat -.Flip +.Flip: ; Copy bitflipped decompressed data for bc bytes. dec c jr nz, .fnext @@ -316,7 +316,7 @@ LZ_LONG_HI EQU %00000011 jr .Flip -.Reverse +.Reverse: ; Copy reversed decompressed data for bc bytes. dec c jr nz, .rvnext diff --git a/home/farcall.asm b/home/farcall.asm index 7c9fe1050..944087465 100644 --- a/home/farcall.asm +++ b/home/farcall.asm @@ -31,17 +31,17 @@ FarCall_hl:: ; 2d63 ReturnFarCall:: ; 2d6e ; We want to retain the contents of f. ; To do this, we can pop to bc instead of af. - + ld a, b ld [wFarCallBCBuffer], a ld a, c ld [wFarCallBCBuffer + 1], a - + ; Restore the working bank. pop bc ld a, b rst Bankswitch - + ld a, [wFarCallBCBuffer] ld b, a ld a, [wFarCallBCBuffer + 1] diff --git a/home/handshake.asm b/home/handshake.asm index e53e78a5b..2f067e7f6 100644 --- a/home/handshake.asm +++ b/home/handshake.asm @@ -16,35 +16,35 @@ AskSerial:: ; 2063 ld a, [wc2d4] bit 0, a ret z - + ld a, [wc2d5] and a ret nz - + ; once every 6 frames ld hl, wca8a inc [hl] ld a, [hl] cp 6 ret c - + xor a ld [hl], a - + ld a, $c ld [wc2d5], a - + ; handshake ld a, $88 ld [rSB], a - + ; switch to internal clock ld a, %00000001 ld [rSC], a - + ; start transfer ld a, %10000001 ld [rSC], a - + ret ; 208a diff --git a/home/init.asm b/home/init.asm index dacc5ff75..8c847ec76 100644 --- a/home/init.asm +++ b/home/init.asm @@ -71,7 +71,7 @@ Init:: ; 17d ; Clear WRAM bank 0 ld hl, wc000 ld bc, wd000 - wc000 -.ByteFill +.ByteFill: ld [hl], 0 inc hl dec bc diff --git a/home/joypad.asm b/home/joypad.asm index 390166bee..4c46111be 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -31,12 +31,12 @@ Joypad:: ; 935 ld a, [wcfbe] and %11010000 ret nz - + ; If we're saving, input is disabled. ld a, [wc2cd] and a ret nz - + ; We can only get four inputs at a time. ; We take d-pad first for no particular reason. ld a, R_DPAD @@ -45,16 +45,16 @@ Joypad:: ; 935 rept 2 ld a, [rJOYP] endr - + ; The Joypad register output is in the lo nybble (inversed). ; We make the hi nybble of our new container d-pad input. cpl and $f swap a - + ; We'll keep this in b for now. ld b, a - + ; Buttons make 8 total inputs (A, B, Select, Start). ; We can fit this into one byte. ld a, R_BUTTONS @@ -68,11 +68,11 @@ endr and $f or b ld b, a - + ; Reset the joypad register since we're done with it. ld a, $30 ld [rJOYP], a - + ; To get the delta we xor the last frame's input with the new one. ld a, [hJoypadDown] ; last frame ld e, a @@ -85,24 +85,24 @@ endr ld a, d and b ld [hJoypadPressed], a - + ; Add any new presses to the list of collective presses: ld c, a ld a, [hJoypadSum] or c ld [hJoypadSum], a - + ; Currently pressed: ld a, b ld [hJoypadDown], a - + ; Now that we have the input, we can do stuff with it. ; For example, soft reset: and A_BUTTON | B_BUTTON | SELECT | START cp A_BUTTON | B_BUTTON | SELECT | START jp z, Reset - + ret ; 984 @@ -127,7 +127,7 @@ GetJoypad:: ; 984 push hl push de push bc - + ; The player input can be automated using an input stream. ; See more below. ld a, [InputType] @@ -139,31 +139,31 @@ GetJoypad:: ; 984 ld b, a ld a, [hJoyDown] ; last frame mirror ld e, a - + ; Released this frame: xor b ld d, a and e ld [hJoyReleased], a - + ; Pressed this frame: ld a, d and b ld [hJoyPressed], a - + ; It looks like the collective presses got commented out here. ld c, a - + ; Currently pressed: ld a, b ld [hJoyDown], a ; frame input - + .quit pop bc pop de pop hl pop af - ret + ret .auto ; Use a predetermined input stream (used in the catching tutorial). @@ -176,45 +176,45 @@ GetJoypad:: ; 984 push af ld a, [AutoInputBank] rst Bankswitch - + ld hl, AutoInputAddress ld a, [hli] ld h, [hl] ld l, a - + ; We only update when the input duration has expired. ld a, [AutoInputLength] and a jr z, .updateauto - + ; Until then, don't change anything. dec a ld [AutoInputLength], a pop af rst Bankswitch jr .quit - - + + .updateauto ; An input of $ff will end the stream. ld a, [hli] cp a, -1 jr z, .stopauto ld b, a - + ; A duration of $ff will end the stream indefinitely. ld a, [hli] ld [AutoInputLength], a cp a, -1 jr nz, .next - + ; The current input is overwritten. rept 2 dec hl endr ld b, NO_INPUT jr .finishauto - + .next ; On to the next input... ld a, l @@ -222,11 +222,11 @@ endr ld a, h ld [AutoInputAddress+1], a jr .finishauto - + .stopauto call StopAutoInput ld b, NO_INPUT - + .finishauto pop af rst Bankswitch @@ -239,7 +239,7 @@ endr StartAutoInput:: ; 9ee ; Start reading automated input stream at a:hl. - + ld [AutoInputBank], a ld a, l ld [AutoInputAddress], a @@ -253,7 +253,7 @@ StartAutoInput:: ; 9ee ld [hJoyPressed], a ; pressed this frame ld [hJoyReleased], a ; released this frame ld [hJoyDown], a ; currently pressed - + ld a, AUTO_INPUT ld [InputType], a ret diff --git a/home/lcd.asm b/home/lcd.asm index 875043bc0..fd62808d2 100644 --- a/home/lcd.asm +++ b/home/lcd.asm @@ -50,7 +50,7 @@ DisableLCD:: ; 568 ld [rIF], a ld a, [rIE] ld b, a - + ; Disable VBlank res 0, a ; vblank ld [rIE], a diff --git a/home/map.asm b/home/map.asm index b3c62b33a..96eae7d37 100644 --- a/home/map.asm +++ b/home/map.asm @@ -255,7 +255,7 @@ GetDestinationWarpNumber:: ; 2252 ret ; 2266 -.GetDestinationWarpNumber ; 2266 +.GetDestinationWarpNumber: ; 2266 ld a, [PlayerStandingMapY] sub $4 ld e, a @@ -307,7 +307,7 @@ GetDestinationWarpNumber:: ; 2252 scf ret -.IncreaseHLTwice +.IncreaseHLTwice: inc hl inc hl scf @@ -327,7 +327,7 @@ CopyWarpData:: ; 22a7 ret ; 22b4 -.CopyWarpData ; 22b4 +.CopyWarpData: ; 22b4 push bc ld hl, wCurrMapWarpHeaderPointer ld a, [hli] @@ -815,7 +815,7 @@ FillMapConnections:: ; 2524 ld [hConnectedMapWidth], a call FillNorthConnectionStrip -.South +.South: ld a, [SouthConnectedMapGroup] cp $ff jr z, .West @@ -838,7 +838,7 @@ FillMapConnections:: ; 2524 ld [hConnectedMapWidth], a call FillSouthConnectionStrip -.West +.West: ld a, [WestConnectedMapGroup] cp $ff jr z, .East @@ -861,7 +861,7 @@ FillMapConnections:: ; 2524 ld [hConnectionStripLength], a call FillWestConnectionStrip -.East +.East: ld a, [EastConnectedMapGroup] cp $ff jr z, .Done @@ -884,7 +884,7 @@ FillMapConnections:: ; 2524 ld [hConnectionStripLength], a call FillEastConnectionStrip -.Done +.Done: ret ; 25d3 @@ -1592,7 +1592,7 @@ GetMovementPermissions:: ; 2914 ret ; 2945 -.MovementPermissionsData ; 2945 +.MovementPermissionsData: ; 2945 db 1 << DOWN db 1 << UP db 1 << LEFT @@ -1603,7 +1603,7 @@ GetMovementPermissions:: ; 2914 db (1 << UP) | (1 << LEFT) ; 294d -.UpDown +.UpDown: ld a, [PlayerStandingMapX] ld d, a ld a, [PlayerStandingMapY] @@ -1623,7 +1623,7 @@ GetMovementPermissions:: ; 2914 ret ; 296c -.LeftRight +.LeftRight: ld a, [PlayerStandingMapX] ld d, a ld a, [PlayerStandingMapY] @@ -1643,7 +1643,7 @@ GetMovementPermissions:: ; 2914 ret ; 298b -.Down +.Down: call .CheckHiNybble ret nz ld a, [TileDown] @@ -1662,7 +1662,7 @@ GetMovementPermissions:: ; 2914 ret ; 29a8 -.Up +.Up: call .CheckHiNybble ret nz ld a, [TileUp] @@ -1681,7 +1681,7 @@ GetMovementPermissions:: ; 2914 ret ; 29c5 -.Right +.Right: call .CheckHiNybble ret nz ld a, [TileRight] @@ -1700,7 +1700,7 @@ GetMovementPermissions:: ; 2914 ret ; 29e2 -.Left +.Left: call .CheckHiNybble ret nz ld a, [TileLeft] @@ -1719,7 +1719,7 @@ GetMovementPermissions:: ; 2914 ret ; 29ff -.CheckHiNybble +.CheckHiNybble: and $f0 cp $b0 ret z @@ -1760,7 +1760,7 @@ GetFacingTileCoord:: ; 2a07 ld a, [hl] ret -.Directions +.Directions: ; x, y db 0, 1 dw TileDown @@ -1919,7 +1919,7 @@ CheckCurrentMapXYTriggers:: ; 2ad4 rst Bankswitch ret -.TriggerCheck +.TriggerCheck: ; Checks to see if you are standing on an xy-trigger. If yes, copies the trigger to EngineBuffer1 and sets carry. ld hl, wCurrentMapXYTriggerHeaderPointer ld a, [hli] diff --git a/home/map_objects.asm b/home/map_objects.asm index f4a4d6d5b..3c70233eb 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -276,7 +276,7 @@ CheckObjectTime:: ; 18f5 and a ret -.TimeOfDayValues_191e +.TimeOfDayValues_191e: db 1 << MORN ; 1 db 1 << DAY ; 2 db 1 << NITE ; 4 @@ -351,7 +351,7 @@ ApplyDeletionToMapObject:: ; 1967 callba DeleteMapObject ret -.CheckStopFollow +.CheckStopFollow: ld hl, wObjectFollow_Leader cp [hl] jr z, .ok @@ -530,7 +530,7 @@ CopySpriteMovementData:: ; 1a61 ret ; 1a71 -.CopyData ; 1a71 +.CopyData: ; 1a71 ld hl, OBJECT_MOVEMENTTYPE add hl, de ld [hl], a diff --git a/home/menu.asm b/home/menu.asm index a8c2bb0b7..4fecdfaa6 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -39,7 +39,7 @@ LoadMenuTextBox:: ; 1d58 ret ; 1d5f -.MenuDataHeader ; 1d5f +.MenuDataHeader: ; 1d5f db $40 ; tile backup db 12, 0 ; start coords db 17, 19 ; end coords @@ -59,7 +59,7 @@ LoadStandardMenuDataHeader:: ; 1d6e ret ; 1d75 -.MenuDataHeader ; 1d75 +.MenuDataHeader: ; 1d75 db $40 ; tile backup db 0, 0 ; start coords db 17, 19 ; end coords @@ -190,7 +190,7 @@ YesNoMenuDataHeader:: ; 1e1d db 1 ; default option ; 1e25 -.MenuData2 ; 1e25 +.MenuData2: ; 1e25 db $c0 ; flags db 2 db "YES@" diff --git a/home/mobile.asm b/home/mobile.asm index 32692f6a9..afe5d1b59 100644 --- a/home/mobile.asm +++ b/home/mobile.asm @@ -221,7 +221,7 @@ MobileHome_PlaceBox: ; 3f47 push bc call .FillTop pop bc -.RowLoop +.RowLoop: push bc call .FillMiddle pop bc @@ -231,28 +231,28 @@ MobileHome_PlaceBox: ; 3f47 ret ; 3f58 -.FillTop +.FillTop: ld a, $63 ld d, $62 ld e, $64 jr .FillRow -.FillBottom +.FillBottom: ld a, $68 ld d, $67 ld e, $69 jr .FillRow -.FillMiddle +.FillMiddle: ld a, $7f ld d, $65 ld e, $66 -.FillRow +.FillRow: push hl ld [hl], d inc hl -.FillLoop +.FillLoop: ld [hli], a dec c jr nz, .FillLoop diff --git a/home/movement.asm b/home/movement.asm index 5353bbe4a..0e131e468 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -121,7 +121,7 @@ endr ret ; 1ba5 -.MovementData +.MovementData: slow_step_down slow_step_up slow_step_left diff --git a/home/palettes.asm b/home/palettes.asm index 2f179209b..1d060dbb4 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -42,9 +42,9 @@ endr dec b jr nz, .bgp - + ; hl is now 5:d0c0 OBPals - + ; copy 8 pals to obpd ld a, %10000000 ; auto increment, index 0 ld [rOBPI], a @@ -58,7 +58,7 @@ endr dec b jr nz, .obp - + pop af ld [rSVBK], a @@ -127,7 +127,7 @@ DmgToCgbObjPals:: ; ccb ld [rOBP0], a ld a, d ld [rOBP1], a - + ld a, [hCGB] and a ret z @@ -250,7 +250,7 @@ CopyPals:: ; d50 .loop push de push hl - + ; get pal color ld a, b and %11 ; color @@ -262,7 +262,7 @@ CopyPals:: ; d50 ld e, [hl] inc hl ld d, [hl] - + ; dest pop hl ; write color @@ -278,7 +278,7 @@ CopyPals:: ; d50 ; done pal? dec c jr nz, .loop - + ; de += 8 (next pal) ld a, 1 palettes ; NUM_PAL_COLORS * 2 ; bytes per pal add e @@ -286,7 +286,7 @@ CopyPals:: ; d50 inc d .ok ld e, a - + ; how many more pals? pop bc dec c diff --git a/home/predef.asm b/home/predef.asm index 03f741469..f99e85891 100644 --- a/home/predef.asm +++ b/home/predef.asm @@ -18,7 +18,7 @@ Predef:: ; 2d83 ld hl, .Return push hl - + ; Call the Predef function ld a, [PredefAddress] ld h, a @@ -33,7 +33,7 @@ Predef:: ; 2d83 ld l, a ret -.Return +.Return: ; Clean up after the Predef call ld a, h diff --git a/home/rtc.asm b/home/rtc.asm index 9fb71c0be..d343d118d 100644 --- a/home/rtc.asm +++ b/home/rtc.asm @@ -5,9 +5,9 @@ RTC:: ; 46f ld a, [wSpriteUpdatesEnabled] cp 0 ret z - + call UpdateTime - + ; obj update on? ld a, [VramState] bit 0, a ; obj update diff --git a/home/serial.asm b/home/serial.asm index ad7d96103..97e0c2442 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -366,7 +366,7 @@ LinkTransfer:: ; 8c1 ret ; 8f3 -.Receive ; 8f3 +.Receive: ; 8f3 ld a, [hSerialReceive] ld [wOtherPlayerLinkMode], a and $f0 diff --git a/home/text.asm b/home/text.asm index e0dc5ae9d..6b4ce4f78 100644 --- a/home/text.asm +++ b/home/text.asm @@ -41,7 +41,7 @@ ClearTileMap:: ; fc8 ld a, " " ld bc, TileMapEnd - TileMap call ByteFill - + ; Update the BG Map. ld a, [rLCDC] bit 7, a @@ -1153,7 +1153,7 @@ endr pop hl ret -.Days ; 15a2 +.Days: ; 15a2 dw .Sun dw .Mon dw .Tues @@ -1162,12 +1162,12 @@ endr dw .Fri dw .Satur -.Sun db "SUN@" -.Mon db "MON@" -.Tues db "TUES@" -.Wednes db "WEDNES@" -.Thurs db "THURS@" -.Fri db "FRI@" -.Satur db "SATUR@" -.Day db "DAY@" +.Sun: db "SUN@" +.Mon: db "MON@" +.Tues: db "TUES@" +.Wednes: db "WEDNES@" +.Thurs: db "THURS@" +.Fri: db "FRI@" +.Satur: db "SATUR@" +.Day: db "DAY@" ; 15d8 diff --git a/home/time.asm b/home/time.asm index 2d432be38..008b7a062 100644 --- a/home/time.asm +++ b/home/time.asm @@ -86,7 +86,7 @@ FixDays:: ; 5e8 ; reset dh (bit 8) res 0, a ld [hRTCDayHi], a ; DH - + ; mod 140 ; mod twice since bit 8 (DH) was set ld a, [hRTCDayLo] ; DL @@ -97,7 +97,7 @@ FixDays:: ; 5e8 sub 140 jr nc, .modl add 140 - + ; update dl ld [hRTCDayLo], a ; DL @@ -110,19 +110,19 @@ FixDays:: ; 5e8 ld a, [hRTCDayLo] ; DL cp 140 jr c, .quit - + ; mod 140 .mod sub 140 jr nc, .mod add 140 - + ; update dl ld [hRTCDayLo], a ; DL - + ; flag for sRTCStatusFlags ld a, %00100000 - + .set ; update clock with modded day value push af @@ -130,7 +130,7 @@ FixDays:: ; 5e8 pop af scf ret - + .quit xor a ret @@ -152,7 +152,7 @@ FixTime:: ; 61d add 60 .updatesec ld [hSeconds], a - + ; minute ccf ; carry is set, so turn it off ld a, [hRTCMinutes] ; M @@ -164,7 +164,7 @@ FixTime:: ; 61d add 60 .updatemin ld [hMinutes], a - + ; hour ccf ; carry is set, so turn it off ld a, [hRTCHours] ; H @@ -176,7 +176,7 @@ FixTime:: ; 61d add 24 .updatehr ld [hHours], a - + ; day ccf ; carry is set, so turn it off ld a, [hRTCDayLo] ; DL @@ -217,7 +217,7 @@ PanicResetClock:: ; 67e ret ; 685 -.ClearhRTC ; 685 +.ClearhRTC: ; 685 xor a ld [hRTCSeconds], a ld [hRTCMinutes], a @@ -234,21 +234,21 @@ SetClock:: ; 691 ; enable clock r/w ld a, SRAM_ENABLE ld [MBC3SRamEnable], a - + ; set clock data ; stored 'backwards' in hram call LatchClock ld hl, MBC3SRamBank ld de, MBC3RTC - + ; seems to be a halt check that got partially commented out ; this block is totally pointless ld [hl], RTC_DH ld a, [de] bit 6, a ; halt ld [de], a - + ; seconds ld [hl], RTC_S ld a, [hRTCSeconds] @@ -270,7 +270,7 @@ SetClock:: ; 691 ld a, [hRTCDayHi] res 6, a ; make sure timer is active ld [de], a - + ; cleanup call CloseSRAM ; unlatch clock, disable clock r/w ret diff --git a/home/vblank.asm b/home/vblank.asm index 1c0824c5e..b93519298 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -37,7 +37,7 @@ endr reti ; 2a1 -.VBlanks ; 2a1 +.VBlanks: ; 2a1 dw VBlank0 dw VBlank1 dw VBlank2 diff --git a/home/video.asm b/home/video.asm index c88e0e555..e3c231b4f 100644 --- a/home/video.asm +++ b/home/video.asm @@ -164,7 +164,7 @@ UpdateBGMap:: ; 164c ret -.Attr +.Attr: ld a, 1 ld [rVBK], a @@ -176,13 +176,13 @@ UpdateBGMap:: ; 164c ret -.Tiles +.Tiles: hlcoord 0, 0 .update ld [hSPBuffer], sp - + ; Which third? ld a, [hBGMapThird] and a ; 0 @@ -306,13 +306,13 @@ Serve1bppRequest:: ; 170a ld h, [hl] ld l, a ld sp, hl - + ; Destination ld hl, Requested1bppDest ld a, [hli] ld h, [hl] ld l, a - + ; # tiles to copy ld a, [Requested1bpp] ld b, a @@ -389,27 +389,27 @@ _Serve2bppRequest:: ; 177d ; Copy [Requested2bpp] 2bpp tiles from [Requested2bppSource] to [Requested2bppDest] ld [hSPBuffer], sp - + ; Source ld hl, Requested2bppSource ld a, [hli] ld h, [hl] ld l, a ld sp, hl - + ; Destination ld hl, Requested2bppDest ld a, [hli] ld h, [hl] ld l, a - + ; # tiles to copy ld a, [Requested2bpp] ld b, a xor a ld [Requested2bpp], a - + .next rept 7 @@ -451,7 +451,7 @@ AnimateTileset:: ; 17d3 ld a, [hMapAnims] and a ret z - + ; Back out if we're too far into VBlank ld a, [rLY] cp 144 diff --git a/home/window.asm b/home/window.asm index 32494ee34..d000b7fdd 100644 --- a/home/window.asm +++ b/home/window.asm @@ -31,7 +31,7 @@ CloseText:: ; 2dcf ret ; 2de2 -.CloseText ; 2de2 +.CloseText: ; 2de2 call ClearWindowData xor a ld [hBGMapMode], a |