Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style

This commit is contained in:
pikalaxalt
2016-04-10 14:42:14 -04:00
parent 46ead9b849
commit bf73772a56
537 changed files with 4562 additions and 4562 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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]

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -50,7 +50,7 @@ DisableLCD:: ; 568
ld [rIF], a
ld a, [rIE]
ld b, a
; Disable VBlank
res 0, a ; vblank
ld [rIE], a

View File

@@ -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]

View File

@@ -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

View File

@@ -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@"

View File

@@ -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

View File

@@ -121,7 +121,7 @@ endr
ret
; 1ba5
.MovementData
.MovementData:
slow_step_down
slow_step_up
slow_step_left

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -366,7 +366,7 @@ LinkTransfer:: ; 8c1
ret
; 8f3
.Receive ; 8f3
.Receive: ; 8f3
ld a, [hSerialReceive]
ld [wOtherPlayerLinkMode], a
and $f0

View File

@@ -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

Some files were not shown because too many files have changed in this diff Show More