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

2025-09-08 08:13:02 -07:00 · 2016-04-10 14:42:14 -04:00
parent 46ead9b849
commit bf73772a56
537 changed files with 4562 additions and 4562 deletions
--- a/event/buena.asm
+++ b/event/buena.asm
@@ -121,15 +121,15 @@ SpecialBuenaPrize: ; 8afd4
 	call PrintBlueCardBalance
 	jr .Purchase

-.InsufficientBalance
+.InsufficientBalance:
 	ld hl, .Text_NotEnoughPoints
 	jr .print

-.BagFull
+.BagFull:
 	ld hl, .Text_NoRoom
 	jr .print

-.Purchase
+.Purchase:
 	ld de, SFX_TRANSACTION
 	call PlaySFX
 	ld hl, .Text_HereYouGo
@@ -160,7 +160,7 @@ SpecialBuenaPrize: ; 8afd4
 	db "@"
 ; 0x8b07c

-.Text_HereYouGo	; Here you go!
+.Text_HereYouGo:	; Here you go!
 	text_jump UnknownText_0x1c58d1
 	db "@"
 ; 0x8b081
--- a/event/celebi.asm
+++ b/event/celebi.asm
@@ -53,7 +53,7 @@ Special_CelebiShrineEvent: ; 4989a
 	ld hl, Sprites + 2
 	xor a
 	ld c, $4
-.OAMloop
+.OAMloop:
 	ld [hli], a
 rept 3
 	inc hl
@@ -171,7 +171,7 @@ UpdateCelebiPosition: ; 49aa2 (12:5aa2)
 	jr nc, .ShiftY
 	cp 8 *  8 + 4
 	jr nc, .ReinitSpriteAnimFrame
-.ShiftY
+.ShiftY:
 	pop af
 	push af
 	cp d
@@ -203,7 +203,7 @@ UpdateCelebiPosition: ; 49aa2 (12:5aa2)
 	ld a, [hl]
 	add $1
 	ld [hl], a
-.ReinitSpriteAnimFrame
+.ReinitSpriteAnimFrame:
 	pop af
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
@@ -306,22 +306,22 @@ GetCelebiSpriteTile: ; 49bae
 	jr .restart


-.Frame1
+.Frame1:
 	ld a, $84
 	jr .load_tile


-.Frame2
+.Frame2:
 	ld a, $88
 	jr .load_tile


-.Frame3
+.Frame3:
 	ld a, $8c
 	jr .load_tile


-.Frame4
+.Frame4:
 	ld a, $90

 .load_tile
--- a/event/daycare.asm
+++ b/event/daycare.asm
@@ -37,7 +37,7 @@ Special_DayCareMan: ; 166d6
 	call DayCare_InitBreeding
 	ret

-.AskWithdrawMon
+.AskWithdrawMon:
 	callba GetBreedMon1LevelGrowth
 	ld hl, wBreedMon1Nick
 	call GetPriceToRetrieveBreedmon
@@ -76,7 +76,7 @@ Special_DayCareLady: ; 1672a
 	call DayCare_InitBreeding
 	ret

-.AskWithdrawMon
+.AskWithdrawMon:
 	callba GetBreedMon2LevelGrowth
 	ld hl, wBreedMon2Nick
 	call GetPriceToRetrieveBreedmon
@@ -144,27 +144,27 @@ DayCareAskDepositPokemon: ; 16798
 	and a
 	ret

-.Declined
+.Declined:
 	ld a, DAYCARETEXT_COME_AGAIN
 	scf
 	ret

-.Egg
+.Egg:
 	ld a, DAYCARETEXT_CANT_BREED_EGG
 	scf
 	ret

-.OnlyOneMon
+.OnlyOneMon:
 	ld a, DAYCARETEXT_LAST_MON
 	scf
 	ret

-.OutOfUsableMons
+.OutOfUsableMons:
 	ld a, DAYCARETEXT_LAST_ALIVE_MON
 	scf
 	ret

-.HoldingMail
+.HoldingMail:
 	ld a, DAYCARETEXT_REMOVE_MAIL
 	scf
 	ret
@@ -227,7 +227,7 @@ DayCare_AskWithdrawBreedMon: ; 16807
 	scf
 	ret

-.PartyFull
+.PartyFull:
 	ld a, DAYCARETEXT_NOT_ENOUGH_MONEY
 	scf
 	ret
@@ -460,16 +460,16 @@ Special_DayCareManOutside: ; 16936
 	ld hl, .TakeGoodCareOfItText
 	jr .Load0

-.Declined
+.Declined:
 	ld hl, .IllKeepItThanksText

-.Load0
+.Load0:
 	call PrintText
 	xor a
 	ld [ScriptVar], a
 	ret

-.PartyFull
+.PartyFull:
 	ld hl, .PartyFullText
 	call PrintText
 	ld a, $1
@@ -575,7 +575,7 @@ DayCare_GiveEgg: ; 169ac
 	and a
 	ret

-.PartyFull
+.PartyFull:
 	scf
 	ret
 ; 16a31
@@ -644,14 +644,14 @@ DayCare_InitBreeding: ; 16a3b
 	jr z, .LoadWhichBreedmonIsTheMother
 	inc a

-.LoadWhichBreedmonIsTheMother
+.LoadWhichBreedmonIsTheMother:
 	ld [wBreedMotherOrNonDitto], a
 	and a
 	ld a, [wBreedMon1Species]
 	jr z, .GotMother
 	ld a, [wBreedMon2Species]

-.GotMother
+.GotMother:
 	ld [CurPartySpecies], a
 	callab GetPreEvolution
 	callab GetPreEvolution
@@ -666,7 +666,7 @@ DayCare_InitBreeding: ; 16a3b
 	ld a, NIDORAN_F
 	jr c, .GotEggSpecies
 	ld a, NIDORAN_M
-.GotEggSpecies
+.GotEggSpecies:
 	ld [CurPartySpecies], a
 	ld [CurSpecies], a
 	ld [wEggMonSpecies], a
@@ -739,14 +739,14 @@ DayCare_InitBreeding: ; 16a3b
 	ld e, c
 	jr .GotDVs

-.ParentCheck2
+.ParentCheck2:
 	ld a, [wBreedMotherOrNonDitto]
 	and a
 	jr nz, .GotDVs
 	ld d, b
 	ld e, c

-.GotDVs
+.GotDVs:
 	ld a, [de]
 	inc de
 	and $f
@@ -763,7 +763,7 @@ DayCare_InitBreeding: ; 16a3b
 	add b
 	ld [hl], a

-.SkipDVs
+.SkipDVs:
 	ld hl, StringBuffer1
 	ld de, wMonOrItemNameBuffer
 	ld bc, NAME_LENGTH
--- a/event/dratini.asm
+++ b/event/dratini.asm
@@ -13,7 +13,7 @@ SpecialDratini: ; 0x8b170
 	ld a, [bc]
 	ld c, a
 	ld de, PARTYMON_STRUCT_LENGTH
-.CheckForDratini
+.CheckForDratini:
 ; start at the end of the party and search backwards for a Dratini
 	ld a, [hl]
 	cp DRATINI
@@ -28,7 +28,7 @@ SpecialDratini: ; 0x8b170
 	jr nz, .CheckForDratini
 	ret

-.GiveMoveset
+.GiveMoveset:
 	push hl
 	ld a, [ScriptVar]
 	ld hl, .Movesets
@@ -41,7 +41,7 @@ rept 2
 	inc de
 endr

-.GiveMoves
+.GiveMoves:
 	ld a, [hl]
 	and a ; is the move 00?
 	ret z ; if so, we're done here
@@ -69,15 +69,15 @@ endr
 	inc hl
 	jr .GiveMoves

-.Movesets
-.Moveset0
+.Movesets:
+.Moveset0:
 ; Dratini does not normally learn Extremespeed. This is a special gift.
 	db WRAP
 	db THUNDER_WAVE
 	db TWISTER
 	db EXTREMESPEED
 	db 0
-.Moveset1
+.Moveset1:
 ; This is the normal moveset of a level 15 Dratini
 	db WRAP
 	db LEER
@@ -107,7 +107,7 @@ endr
 	jr nz, .loop
 	ret

-.EmptyParty
+.EmptyParty:
 	scf
 	ret
 ; 8b1e1
--- a/event/halloffame.asm
+++ b/event/halloffame.asm
@@ -310,7 +310,7 @@ _HallOfFamePC: ; 86650
 	call LoadFontsBattleExtra
 	xor a
 	ld [wJumptableIndex], a
-.MasterLoop
+.MasterLoop:
 	call LoadHOFTeam
 	ret c
 	call .DisplayTeam
@@ -319,7 +319,7 @@ _HallOfFamePC: ; 86650
 	inc [hl]
 	jr .MasterLoop

-.DisplayTeam
+.DisplayTeam:
 	xor a
 	ld [wcf64], a
 .next
@@ -353,7 +353,7 @@ _HallOfFamePC: ; 86650
 	and a
 	ret

-.DisplayMonAndStrings
+.DisplayMonAndStrings:
 ; Print the number of times the player has entered the Hall of Fame.
 ; If that number is above 200, print "HOF Master!" instead.
 	ld a, [wcf64]
@@ -616,7 +616,7 @@ HOF_AnimatePlayerPic: ; 86810
 	ret
 ; 868ed

-.PlayTime
+.PlayTime:
 	db "PLAY TIME@"
 ; 868f7

--- a/event/happiness_egg.asm
+++ b/event/happiness_egg.asm
@@ -102,7 +102,7 @@ endr
 	ld [BattleMonHappiness], a
 	ret

-.Actions
+.Actions:
 	db  +5,  +3,  +2 ; Gained a level
 	db  +5,  +3,  +2 ; Vitamin
 	db  +1,  +1,  +0 ; X Item
--- a/event/kurt.asm
+++ b/event/kurt.asm
@@ -315,7 +315,7 @@ Kurt_GiveUpSelectedQuantityOfSelectedApricorn: ; 88161
 	cp -1
 	jr nz, .loop2

-.OnlyOne
+.OnlyOne:
 	ld hl, wApricorns
 .loop4
 	ld a, [hl]
--- a/event/magikarp.asm
+++ b/event/magikarp.asm
@@ -10,7 +10,7 @@ Special_CheckMagikarpLength: ; fbb32
 	ld a, [CurPartySpecies]
 	cp MAGIKARP
 	jr nz, .not_magikarp
-	
+
 	; Now let's compute its length based on its DVs and ID.
 	ld a, [CurPartyMon]
 	ld hl, PartyMon1Species
@@ -31,14 +31,14 @@ Special_CheckMagikarpLength: ; fbb32
 	callba MagikarpLength_Mobile
 	ld hl, .MeasureItText
 	call PrintText
-	
+
 	; Did we beat the record?
 	ld hl, Buffer1
 	ld de, wBestMagikarpLengthFeet
 	ld c, 2
 	call StringCmp
 	jr nc, .not_long_enough
-	
+
 	; NEW RECORD!!! Let's save that.
 	ld hl, Buffer1
 	ld de, wBestMagikarpLengthFeet
--- a/event/magnet_train.asm
+++ b/event/magnet_train.asm
@@ -7,7 +7,7 @@ Special_MagnetTrain: ; 8cc04
 	lb de, (11 * 8) - (11 * 8 + 4), -$60
 	jr .continue

-.ToGoldenrod
+.ToGoldenrod:
 	ld a, -1 ; backwards
 	lb bc, -$40, -$60
 	lb de, (11 * 8) + (11 * 8 + 4), $60
@@ -187,7 +187,7 @@ DrawMagnetTrain: ; 8cd27
 	ret
 ; 8cd65

-.FillLine ; 8cd65
+.FillLine: ; 8cd65
 	ld a, [de]
 	inc de
 	ld [hli], a
@@ -196,7 +196,7 @@ DrawMagnetTrain: ; 8cd27
 	ret
 ; 8cd6c

-.FillAlt ; 8cd6c
+.FillAlt: ; 8cd6c
 	ld [hl], e
 	inc hl
 	ld [hl], d
@@ -306,7 +306,7 @@ endr
 ; 8ce06

 .Jumptable: ; 8ce06
-	
+
 	dw .InitPlayerSpriteAnim
 	dw .WaitScene
 	dw .MoveTrain1
@@ -367,7 +367,7 @@ endr
 	ld [hl], a
 	ret

-.PrepareToHoldTrain
+.PrepareToHoldTrain:
 	call .Next
 	ld a, $80
 	ld [wcf66], a
@@ -382,7 +382,7 @@ endr
 	dec [hl]
 	ret

-.DoneWaiting
+.DoneWaiting:
 	call .Next
 	ret
 ; 8ce7a
@@ -414,7 +414,7 @@ endr

 	ret

-.PrepareToFinishAnim
+.PrepareToFinishAnim:
 	call .Next
 	ret
 ; 8cea2
--- a/event/mom.asm
+++ b/event/mom.asm
@@ -33,7 +33,7 @@ endr
 ; 16242

 .dw: ; 16242
-	
+
 	dw .CheckIfBankInitialized
 	dw .InitializeBank
 	dw .IsThisAboutYourMoney
@@ -72,7 +72,7 @@ endr
 	ld a, %10000001
 	jr .done_1

-.DontSaveMoney
+.DontSaveMoney:
 	ld a, %10000000

 .done_1
@@ -188,17 +188,17 @@ endr
 	ld a, $8
 	jr .done_4

-.DontHaveThatMuchToDeposit
+.DontHaveThatMuchToDeposit:
 	ld hl, UnknownText_0x1667b
 	call PrintText
 	ret

-.CantDepositThatMuch
+.CantDepositThatMuch:
 	ld hl, UnknownText_0x16680
 	call PrintText
 	ret

-.CancelDeposit
+.CancelDeposit:
 	ld a, $7

 .done_4
@@ -256,17 +256,17 @@ endr
 	ld a, $8
 	jr .done_5

-.InsufficientFundsInBank
+.InsufficientFundsInBank:
 	ld hl, UnknownText_0x16671
 	call PrintText
 	ret

-.NotEnoughRoomInWallet
+.NotEnoughRoomInWallet:
 	ld hl, UnknownText_0x16676
 	call PrintText
 	ret

-.CancelWithdraw
+.CancelWithdraw:
 	ld a, $7

 .done_5
@@ -287,7 +287,7 @@ endr
 	ld [wJumptableIndex], a
 	ret

-.StopSavingMoney
+.StopSavingMoney:
 	ld a, $80
 	ld [wMomSavingMoney], a
 	ld a, $7
@@ -315,12 +315,12 @@ DSTChecks: ; 16439
 	jr z, .LostBooklet
 	jr .loop

-.NotDST
+.NotDST:
 	cp 23 ; within one hour of 23:00?
 	jr nz, .loop
 	; fallthrough

-.LostBooklet
+.LostBooklet:
 	call .ClearBox
 	bccoord 1, 14
 	ld hl, .Text_AdjustClock
@@ -353,7 +353,7 @@ DSTChecks: ; 16439
 	call PlaceWholeStringInBoxAtOnce
 	ret

-.SetDST
+.SetDST:
 	ld hl, .Text_SwitchToDST
 	call PlaceWholeStringInBoxAtOnce
 	call YesNoBox
@@ -375,7 +375,7 @@ DSTChecks: ; 16439
 	sub 24
 	jr nc, .DontLoopHourForward
 	add 24
-.DontLoopHourForward
+.DontLoopHourForward:
 	ld [StartHour], a
 	ccf
 	ld a, [StartDay]
@@ -389,13 +389,13 @@ DSTChecks: ; 16439
 	sub 1
 	jr nc, .DontLoopHourBack
 	add 24
-.DontLoopHourBack
+.DontLoopHourBack:
 	ld [StartHour], a
 	ld a, [StartDay]
 	sbc 0
 	jr nc, .DontLoopDayBack
 	add 7
-.DontLoopDayBack
+.DontLoopDayBack:
 	ld [StartDay], a
 	ret
 ; 164ea
--- a/event/mom_phone.asm
+++ b/event/mom_phone.asm
@@ -103,7 +103,7 @@ CheckBalance_MomItem2: ; fd044
 	scf
 	ret

-.AddMoney
+.AddMoney:
 	ld de, MomItemTriggerBalance
 	ld bc, hMoneyTemp
 	callba AddMoney
@@ -198,7 +198,7 @@ GetItemFromMom: ; fd117
 .ok
 	ld de, MomItems_2

-.GetFromList1
+.GetFromList1:
 	ld l, a
 	ld h, 0
 rept 3 ; multiply hl by 8
--- a/event/overworld.asm
+++ b/event/overworld.asm
@@ -128,7 +128,7 @@ CutFunction: ; c785
 	ret

 .Jumptable: ; c796 (3:4796)
-	
+
 	dw .CheckAble
 	dw .DoCut
 	dw .FailCut
@@ -529,7 +529,7 @@ CheckDirection: ; c9cb
 	scf
 	ret

-.Directions
+.Directions:
 	db FACE_DOWN
 	db FACE_UP
 	db FACE_LEFT
@@ -605,7 +605,7 @@ FlyFunction: ; ca3b
 	ld [wFieldMoveSucceeded], a
 	ret

-.Jumptable
+.Jumptable:
 	dw .TryFly
 	dw .DoFly
 	dw .FailFly
@@ -954,7 +954,7 @@ TeleportFunction: ; cc61
 	jr z, .CheckIfSpawnPoint
 	jr .nope

-.CheckIfSpawnPoint
+.CheckIfSpawnPoint:
 	ld a, [wLastSpawnMapGroup]
 	ld d, a
 	ld a, [wLastSpawnMapNumber]
@@ -1708,7 +1708,7 @@ BikeFunction: ; d0b3
 	jr z, .GetOffBike
 	jr .CannotUseBike

-.GetOnBike
+.GetOnBike:
 	ld hl, Script_GetOnBike
 	ld de, Script_GetOnBike_Register
 	call .CheckIfRegistered
@@ -1726,7 +1726,7 @@ BikeFunction: ; d0b3
 	ld a, $1
 	ret

-.GetOffBike
+.GetOffBike:
 	ld hl, BikeFlags
 	bit 1, [hl]
 	jr nz, .CantGetOffBike
@@ -1736,11 +1736,11 @@ BikeFunction: ; d0b3
 	ld a, BANK(Script_GetOffBike)
 	jr .done

-.CantGetOffBike
+.CantGetOffBike:
 	ld hl, Script_CantGetOffBike
 	jr .done

-.CannotUseBike
+.CannotUseBike:
 	ld a, $0
 	ret

--- a/event/poke_seer.asm
+++ b/event/poke_seer.asm
@@ -248,7 +248,7 @@ GetCaughtLocation: ; 4f20a
 	and a
 	ret

-.Unknown
+.Unknown:
 	ld de, wSeerCaughtLocation
 	jp UnknownCaughtData

--- a/event/special.asm
+++ b/event/special.asm
@@ -60,7 +60,7 @@ SpecialGiveShuckle: ; 7305
 	ld [ScriptVar], a
 	ret

-.NotGiven
+.NotGiven:
 	xor a
 	ld [ScriptVar], a
 	ret
@@ -96,7 +96,7 @@ SpecialReturnShuckle: ; 737e
 	ld hl, PartyMonOT
 	call SkipNames
 	ld de, SpecialShuckleOT
-.CheckOT
+.CheckOT:
 	ld a, [de]
 	cp [hl]
 	jr nz, .DontReturn
@@ -121,7 +121,7 @@ SpecialReturnShuckle: ; 737e
 	ld [wPokemonWithdrawDepositParameter], a
 	callab RemoveMonFromPartyOrBox
 	ld a, $2
-.HappyToStayWithYou
+.HappyToStayWithYou:
 	ld [ScriptVar], a
 	ret

@@ -130,7 +130,7 @@ SpecialReturnShuckle: ; 737e
 	ld [ScriptVar], a
 	ret

-.DontReturn
+.DontReturn:
 	xor a
 	ld [ScriptVar], a
 	ret