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

audio/engine.asm

@@ -233,7 +233,7 @@ UpdateChannels: ; e8125
 	jp [hl]
 
 
-.ChannelFnPtrs
+.ChannelFnPtrs:
 	dw .Channel1
 	dw .Channel2
 	dw .Channel3
@@ -245,11 +245,11 @@ UpdateChannels: ; e8125
 	dw .Channel7
 	dw .Channel8
 
-.Channel1
+.Channel1:
 	ld a, [Danger]
 	bit 7, a
 	ret nz
-.Channel5
+.Channel5:
 	ld hl, Channel1NoteFlags - Channel1
 	add hl, bc
 	bit NOTE_UNKN_3, [hl]
@@ -317,8 +317,8 @@ UpdateChannels: ; e8125
 	ld [rNR14], a
 	ret
 
-.Channel2
+.Channel2:
-.Channel6
+.Channel6:
 	ld hl, Channel1NoteFlags - Channel1
 	add hl, bc
 	bit NOTE_REST, [hl] ; rest
@@ -377,8 +377,8 @@ UpdateChannels: ; e8125
 	ld [rNR24], a
 	ret
 
-.Channel3
+.Channel3:
-.Channel7
+.Channel7:
 	ld hl, Channel1NoteFlags - Channel1
 	add hl, bc
 	bit NOTE_REST, [hl] ; rest
@@ -478,8 +478,8 @@ endr
 	ld [rNR32], a
 	ret
 
-.Channel4
+.Channel4:
-.Channel8
+.Channel8:
 	ld hl, Channel1NoteFlags - Channel1
 	add hl, bc
 	bit NOTE_REST, [hl] ; rest

battle/ai/items.asm

@@ -318,7 +318,7 @@ AI_Items: ; 39196
 	jp c, .Use
 	jp .DontUse
 
-.StatusCheckContext
+.StatusCheckContext:
 	ld a, [EnemySubStatus5]
 	bit SUBSTATUS_TOXIC, a
 	jr z, .FailToxicCheck
@@ -328,7 +328,7 @@ AI_Items: ; 39196
 	call Random
 	cp 1 + 50 percent
 	jp c, .Use
-.FailToxicCheck
+.FailToxicCheck:
 	ld a, [EnemyMonStatus]
 	and 1 << FRZ | SLP
 	jp z, .DontUse
@@ -344,7 +344,7 @@ AI_Items: ; 39196
 	call .Status
 	jp c, .DontUse
 
-.UseFullRestore
+.UseFullRestore:
 	call EnemyUsedFullRestore
 	jp .Use
 ; 38220
@@ -676,7 +676,7 @@ AI_TrySwitch: ; 3844b
 	ld c, a
 	ld hl, OTPartyMon1HP
 	ld d, 0
-.SwitchLoop
+.SwitchLoop:
 	ld a, [hli]
 	ld b, a
 	ld a, [hld]

battle/ai/move.asm

@@ -31,24 +31,24 @@ endr
 
 	ld hl, EnemyMonMoves
 	ld c, 0
-.CheckDisabledMove
+.CheckDisabledMove:
 	cp [hl]
 	jr z, .ScoreDisabledMove
 	inc c
 	inc hl
 	jr .CheckDisabledMove
-.ScoreDisabledMove
+.ScoreDisabledMove:
 	ld hl, Buffer1
 	ld b, 0
 	add hl, bc
 	ld [hl], 80
 
 ; Don't pick moves with 0 PP.
-.CheckPP
+.CheckPP:
 	ld hl, Buffer1 - 1
 	ld de, EnemyMonPP
 	ld b, 0
-.CheckMovePP
+.CheckMovePP:
 	inc b
 	ld a, b
 	cp EnemyMonMovesEnd - EnemyMonMoves + 1
@@ -63,7 +63,7 @@ endr
 
 
 ; Apply AI scoring layers depending on the trainer class.
-.ApplyLayers
+.ApplyLayers:
 	ld hl, TrainerClassAttributes + TRNATTR_AI_MOVE_WEIGHTS
 
 	; If we have a battle in BattleTower just load the Attributes of the first TrainerClass (Falkner)
@@ -82,7 +82,7 @@ endr
 	push bc
 	push hl
 
-.CheckLayer
+.CheckLayer:
 	pop hl
 	pop bc
 
@@ -119,12 +119,12 @@ endr
 	jr .CheckLayer
 
 ; Decrement the scores of all moves one by one until one reaches 0.
-.DecrementScores
+.DecrementScores:
 	ld hl, Buffer1
 	ld de, EnemyMonMoves
 	ld c, EnemyMonMovesEnd - EnemyMonMoves
 
-.DecrementNextScore
+.DecrementNextScore:
 	; If the enemy has no moves, this will infinite.
 	ld a, [de]
 	inc de
@@ -145,7 +145,7 @@ endr
 ; In order to avoid bias towards the moves located first in memory, increment the scores
 ; that were decremented one more time than the rest (in case there was a tie).
 ; This means that the minimum score will be 1.
-.PickLowestScoreMoves
+.PickLowestScoreMoves:
 	ld a, c
 
 .move_loop
@@ -184,7 +184,7 @@ endr
 	jr nz, .loop2
 
 ; Randomly choose one of the moves with a score of 1
-.ChooseMove
+.ChooseMove:
 	ld hl, Buffer1
 	call Random
 	and 3

battle/ai/scoring.asm

@@ -2233,7 +2233,7 @@ AI_Smart_Sandstorm: ; 38f7a
 	inc [hl]
 	ret
 
-.SandstormImmuneTypes
+.SandstormImmuneTypes:
 	db ROCK
 	db GROUND
 	db STEEL
@@ -3384,7 +3384,7 @@ AIDamageCalc: ; 393e7
 	callab BattleCommand_Stab
 	ret
 
-.ConstantDamageEffects
+.ConstantDamageEffects:
 	db EFFECT_SUPER_FANG
 	db EFFECT_STATIC_DAMAGE
 	db EFFECT_LEVEL_DAMAGE

battle/anims.asm

@@ -321,7 +321,7 @@ BattleAnim_ThrowPokeBall
 	anim_jump .Shake
 ; c92f2
 
-.TheTrainerBlockedTheBall
+.TheTrainerBlockedTheBall:
 	anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_HIT
 	anim_sound 6, 2, SFX_THROW_BALL
 	anim_obj ANIM_OBJ_16,   8, 0,  11, 4, $20
@@ -331,7 +331,7 @@ BattleAnim_ThrowPokeBall
 	anim_ret
 ; c9305
 
-.UltraBall
+.UltraBall:
 	anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE
 	anim_sound 6, 2, SFX_THROW_BALL
 	anim_obj ANIM_OBJ_POKE_BALL,   8, 4,  11, 4, $40
@@ -345,7 +345,7 @@ BattleAnim_ThrowPokeBall
 	anim_jump .Shake
 ; c9326
 
-.GreatBall
+.GreatBall:
 	anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE
 	anim_sound 6, 2, SFX_THROW_BALL
 	anim_obj ANIM_OBJ_POKE_BALL,   8, 4,  11, 4, $40
@@ -359,7 +359,7 @@ BattleAnim_ThrowPokeBall
 	anim_jump .Shake
 ; c9347
 
-.MasterBall
+.MasterBall:
 	anim_3gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE, ANIM_GFX_SPEED
 	anim_sound 6, 2, SFX_THROW_BALL
 	anim_obj ANIM_OBJ_POKE_BALL,   8, 0,  11, 4, $20
@@ -380,7 +380,7 @@ BattleAnim_ThrowPokeBall
 	anim_obj ANIM_OBJ_2B, -15, 0,   7, 0, $36
 	anim_obj ANIM_OBJ_2B, -15, 0,   7, 0, $37
 	anim_wait 64
-.Shake
+.Shake:
 	anim_bgeffect ANIM_BG_RETURN_MON, $0, $0, $0
 	anim_wait 8
 	anim_incobj  2
@@ -394,7 +394,7 @@ BattleAnim_ThrowPokeBall
 	anim_wait 32
 	anim_wait 8
 	anim_setvar $0
-.Loop
+.Loop:
 	anim_wait 48
 	anim_checkpokeball
 	anim_jumpvar $1, .Click
@@ -404,12 +404,12 @@ BattleAnim_ThrowPokeBall
 	anim_jump .Loop
 ; c93bc
 
-.Click
+.Click:
 	anim_clearsprites
 	anim_ret
 ; c93be
 
-.BreakFree
+.BreakFree:
 	anim_setobj $1, $b
 	anim_sound 0, 1, SFX_BALL_POOF
 	anim_obj ANIM_OBJ_1C, -15, 0,   8, 0, $10
@@ -434,7 +434,7 @@ BattleAnim_SendOutMon: ; c93d1
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
 
-.Unknown
+.Unknown:
 	anim_1gfx ANIM_GFX_SMOKE
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_2A, $0, $1, $0
@@ -449,7 +449,7 @@ BattleAnim_SendOutMon: ; c93d1
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
 
-.Shiny
+.Shiny:
 	anim_1gfx ANIM_GFX_SPEED
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $3
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
@@ -479,7 +479,7 @@ BattleAnim_SendOutMon: ; c93d1
 	anim_wait 32
 	anim_ret
 
-.Normal
+.Normal:
 	anim_1gfx ANIM_GFX_SMOKE
 	anim_sound 0, 0, SFX_BALL_POOF
 	anim_obj ANIM_OBJ_1C,   5, 4,  12, 0, $0

battle/bg_effects.asm

@@ -236,7 +236,7 @@ BattleBGEffect_WhiteHues: ; c812d (32:412d)
 	call EndBattleBGEffect
 	ret
 
-.Pals
+.Pals:
 	db %11100100
 	db %11100000
 	db %11010000
@@ -254,7 +254,7 @@ BattleBGEffect_BlackHues: ; c8141 (32:4141)
 	call EndBattleBGEffect
 	ret
 
-.Pals
+.Pals:
 	db %11100100
 	db %11110100
 	db %11111000
@@ -273,7 +273,7 @@ BattleBGEffect_AlternateHues: ; c8155 (32:4155)
 	call EndBattleBGEffect
 	ret
 
-.Pals
+.Pals:
 	db %11100100
 	db %11111000
 	db %11111100
@@ -298,12 +298,12 @@ BattleBGEffect_06: ; c8171 (32:4171)
 	ld [wOBP0], a
 	ret
 
-.PalsCGB
+.PalsCGB:
 	db %11100100
 	db %10010000
 	db -2
 
-.PalsSGB
+.PalsSGB:
 	db %11110000
 	db %11000000
 	db -2
@@ -322,12 +322,12 @@ BattleBGEffect_07: ; c818b (32:418b)
 	ld [wOBP0], a
 	ret
 
-.PalsCGB
+.PalsCGB:
 	db %11100100
 	db %11011000
 	db -2
 
-.PalsSGB
+.PalsSGB:
 	db %11110000
 	db %11001100
 	db -2
@@ -339,7 +339,7 @@ BattleBGEffect_08: ; c81a5 (32:41a5)
 	ld [wBGP], a
 	ret
 
-.Pals
+.Pals:
 	db %00011011
 	db %01100011
 	db %10000111
@@ -405,10 +405,10 @@ BattleBGEffect_ShowMon: ; c81ea (32:41ea)
 	call BattleBGEffect_RunPicResizeScript
 	ret
 
-.PlayerData
+.PlayerData:
 	db  0, $31, 0
 	db -1
-.EnemyData
+.EnemyData:
 	db  3, $00, 3
 	db -1
 ; c8214
@@ -670,12 +670,12 @@ BattleBGEffect_EnterMon: ; c837b (32:437b)
 	call BattleBGEffect_RunPicResizeScript
 	ret
 
-.PlayerData
+.PlayerData:
 	db  2, $31, 2
 	db  1, $31, 1
 	db  0, $31, 0
 	db -1
-.EnemyData
+.EnemyData:
 	db  5, $00, 5
 	db  4, $00, 4
 	db  3, $00, 3
@@ -698,7 +698,7 @@ BattleBGEffect_ReturnMon: ; c83a8 (32:43a8)
 	call BattleBGEffect_RunPicResizeScript
 	ret
 
-.PlayerData
+.PlayerData:
 	db  0, $31, 0
 	db -2, $66, 0
 	db  1, $31, 1
@@ -707,7 +707,7 @@ BattleBGEffect_ReturnMon: ; c83a8 (32:43a8)
 	db -2, $22, 2
 	db -3, $00, 0
 	db -1
-.EnemyData
+.EnemyData:
 	db  3, $00, 3
 	db -2, $77, 3
 	db  4, $00, 4
@@ -773,7 +773,7 @@ endr
 	call EndBattleBGEffect
 	ret
 
-.ClearBox
+.ClearBox:
 ; get dims
 	push bc
 	inc hl
@@ -798,7 +798,7 @@ endr
 	pop bc
 	ret
 
-.PlaceGraphic
+.PlaceGraphic:
 ; get dims
 	push bc
 	push hl
@@ -858,7 +858,7 @@ endr
 	pop bc
 	ret
 
-.Coords
+.Coords:
 	dwcoord  2,  6
 	dwcoord  3,  8
 	dwcoord  4, 10
@@ -866,7 +866,7 @@ endr
 	dwcoord 13,  2
 	dwcoord 14,  4
 
-.BGSquares
+.BGSquares:
 bgsquare: MACRO
 	dn \1,\2
 	dw \3
@@ -879,7 +879,7 @@ endm
 	bgsquare 5, 5, .FiveByFive
 	bgsquare 3, 3, .ThreeByThree
 
-.SixBySix
+.SixBySix:
 	db $00, $06, $0c, $12, $18, $1e
 	db $01, $07, $0d, $13, $19, $1f
 	db $02, $08, $0e, $14, $1a, $20
@@ -887,17 +887,17 @@ endm
 	db $04, $0a, $10, $16, $1c, $22
 	db $05, $0b, $11, $17, $1d, $23
 
-.FourByFour
+.FourByFour:
 	db $00, $0c, $12, $1e
 	db $02, $0e, $14, $20
 	db $03, $0f, $15, $21
 	db $05, $11, $17, $23
 
-.TwoByTwo
+.TwoByTwo:
 	db $00, $1e
 	db $05, $23
 
-.SevenBySeven
+.SevenBySeven:
 	db $00, $07, $0e, $15, $1c, $23, $2a
 	db $01, $08, $0f, $16, $1d, $24, $2b
 	db $02, $09, $10, $17, $1e, $25, $2c
@@ -906,14 +906,14 @@ endm
 	db $05, $0c, $13, $1a, $21, $28, $2f
 	db $06, $0d, $14, $1b, $22, $29, $30
 
-.FiveByFive
+.FiveByFive:
 	db $00, $07, $15, $23, $2a
 	db $01, $08, $16, $24, $2b
 	db $03, $0a, $18, $26, $2d
 	db $05, $0c, $1a, $28, $2f
 	db $06, $0d, $1b, $29, $30
 
-.ThreeByThree
+.ThreeByThree:
 	db $00, $15, $2a
 	db $03, $18, $2d
 	db $06, $1b, $30
@@ -945,7 +945,7 @@ BattleBGEffect_Surf: ; c8545 (32:4545)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-.RotatewSurfWaveBGEffect
+.RotatewSurfWaveBGEffect:
 	ld hl, wSurfWaveBGEffect
 	ld de, wSurfWaveBGEffect + 1
 	ld c, wSurfWaveBGEffectEnd - wSurfWaveBGEffect - 1
@@ -1218,7 +1218,7 @@ BattleBGEffect_DoubleTeam: ; c8689 (32:4689)
 .four
 	ret
 
-.UpdateLYOverrides
+.UpdateLYOverrides:
 	ld e, a
 	xor $ff
 	inc a
@@ -1893,7 +1893,7 @@ BattleBGEffect_2a: ; c8a3a (32:4a3a)
 	call BattleBGEffects_IncrementJumptable
 	ret
 
-.SetLYOverridesBackup
+.SetLYOverridesBackup:
 	ld e, a
 	ld a, [hFFC7]
 	ld l, a
@@ -1913,7 +1913,7 @@ BattleBGEffect_2a: ; c8a3a (32:4a3a)
 	call BattleBGEffects_ResetVideoHRAM
 	ret
 
-.GetLYOverride
+.GetLYOverride:
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
@@ -2042,7 +2042,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
 	ld [wOBP1], a
 	ret
 
-.DMG_LYOverrideLoads
+.DMG_LYOverrideLoads:
 	ld hl, LYOverridesBackup
 .loop1
 	ld [hl], d
@@ -2061,7 +2061,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
 	call BatttleBGEffects_GetNamedJumptablePointer
 	jp [hl]
 
-.Jumptable
+.Jumptable:
 	dw .cgb_zero
 	dw .cgb_one
 	dw .cgb_two
@@ -2118,12 +2118,12 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
 	call EndBattleBGEffect
 	ret
 
-.CGB_DMGEnemyData
+.CGB_DMGEnemyData:
 	db $e4, $e4
 	db $f8, $90
 	db $fc, $40
 	db $f8, $90
-.DMG_PlayerData
+.DMG_PlayerData:
 	db $e4, $e4
 	db $90, $f8
 	db $40, $fc
@@ -2135,7 +2135,7 @@ BattleBGEffect_RapidFlash: ; c8be8 (32:4be8)
 	call BGEffect_RapidCyclePals
 	ret
 
-.FlashPals
+.FlashPals:
 	db $e4, $6c, $fe
 ; c8bf2
 
@@ -2144,7 +2144,7 @@ BattleBGEffect_16: ; c8bf2 (32:4bf2)
 	call BGEffect_RapidCyclePals
 	ret
 
-.Pals
+.Pals:
 	db $e4, $90, $40, $ff
 ; c8bfd
 
@@ -2153,7 +2153,7 @@ BattleBGEffect_17: ; c8bfd (32:4bfd)
 	call BGEffect_RapidCyclePals
 	ret
 
-.Pals
+.Pals:
 	db $e4, $f8, $fc, $ff
 ; c8c08
 
@@ -2162,7 +2162,7 @@ BattleBGEffect_18: ; c8c08 (32:4c08)
 	call BGEffect_RapidCyclePals
 	ret
 
-.Pals
+.Pals:
 	db $e4, $90, $40, $90, $fe
 ; c8c14
 
@@ -2171,7 +2171,7 @@ BattleBGEffect_19: ; c8c14 (32:4c14)
 	call BGEffect_RapidCyclePals
 	ret
 
-.Pals
+.Pals:
 	db $e4, $f8, $fc, $f8, $fe
 ; c8c20
 
@@ -2180,7 +2180,7 @@ BattleBGEffect_1a: ; c8c20 (32:4c20)
 	call BGEffect_RapidCyclePals
 	ret
 
-.Pals
+.Pals:
 	db $e4, $f8, $fc, $f8, $e4, $90, $40, $90, $fe
 ; c8c30
 
@@ -2189,7 +2189,7 @@ BattleBGEffect_1b: ; c8c30 (32:4c30)
 	call BGEffect_RapidCyclePals
 	ret
 
-.Pals
+.Pals:
 	db $e4, $fc, $e4, $00, $fe
 ; c8c3c
 
@@ -2198,7 +2198,7 @@ BattleBGEffect_1d: ; c8c3c (32:4c3c)
 	call BGEffect_RapidCyclePals
 	ret
 
-.Pals
+.Pals:
 	db $e4, $90, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $90, $e4, $ff
 ; c8c55
 
@@ -2207,7 +2207,7 @@ BattleBGEffect_1e: ; c8c55 (32:4c55)
 	call BGEffect_RapidCyclePals
 	ret
 
-.Pals
+.Pals:
 	db $00, $40, $90, $e4, $ff
 ; c8c61
 
@@ -2423,7 +2423,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
 	pop de
 	jp [hl]
 
-.Jumptable_DMG
+.Jumptable_DMG:
 	dw .zero_dmg
 	dw .one_dmg
 	dw .two_dmg
@@ -2836,7 +2836,7 @@ Functionc8f9a: ; c8f9a (32:4f9a)
 	and a
 	ret
 
-.GetLYOverrideBackupAddrOffset
+.GetLYOverrideBackupAddrOffset:
 	ld a, [hFFC7]
 	ld e, a
 	ld a, [wBattleAnimTemp0]

battle/effects/metronome.asm

@@ -14,7 +14,7 @@ BattleCommand_Metronome: ; 37418
 .asm_3742b
 	call LoadMoveAnim
 
-.GetMove
+.GetMove:
 	call BattleRandom
 
 ; No invalid moves.

battle/effects/present.asm

@@ -85,7 +85,7 @@ BattleCommand_Present: ; 37874
 .do_animation
 	jp EndMoveEffect
 
-.PresentPower
+.PresentPower:
 	db 40 percent,     40
 	db 70 percent + 1, 80
 	db 80 percent,    120

battle/misc.asm

@@ -58,7 +58,7 @@ DoWeatherModifiers: ; fbda4
 	ld a, [wd265] ; move type
 	ld c, a
 
-.CheckWeatherType
+.CheckWeatherType:
 	ld a, [de]
 	inc de
 	cp $ff
@@ -71,7 +71,7 @@ DoWeatherModifiers: ; fbda4
 	cp c
 	jr z, .ApplyModifier
 
-.NextWeatherType
+.NextWeatherType:
 rept 2
 	inc de
 endr
@@ -85,7 +85,7 @@ endr
 	call GetBattleVar
 	ld c, a
 
-.CheckWeatherMove
+.CheckWeatherMove:
 	ld a, [de]
 	inc de
 	cp $ff
@@ -98,13 +98,13 @@ endr
 	cp c
 	jr z, .ApplyModifier
 
-.NextWeatherMove
+.NextWeatherMove:
 rept 2
 	inc de
 endr
 	jr .CheckWeatherMove
 
-.ApplyModifier
+.ApplyModifier:
 	xor a
 	ld [hMultiplicand + 0], a
 	ld hl, CurDamage
@@ -138,7 +138,7 @@ endr
 
 	ld bc, 1
 
-.Update
+.Update:
 	ld a, b
 	ld [CurDamage], a
 	ld a, c
@@ -147,14 +147,14 @@ endr
 .done
 	ret
 
-.WeatherTypeModifiers
+.WeatherTypeModifiers:
 	db WEATHER_RAIN, WATER, 15
 	db WEATHER_RAIN, FIRE,  05
 	db WEATHER_SUN,  FIRE,  15
 	db WEATHER_SUN,  WATER, 05
 	db $ff
 
-.WeatherMoveModifiers
+.WeatherMoveModifiers:
 	db WEATHER_RAIN, EFFECT_SOLARBEAM, 05
 	db $ff
 ; fbe24
@@ -183,7 +183,7 @@ DoBadgeTypeBoosts: ; fbe24
 	ld a, [JohtoBadges]
 	ld c, a
 
-.CheckBadge
+.CheckBadge:
 	ld a, [hl]
 	cp $ff
 	jr z, .done
@@ -196,11 +196,11 @@ DoBadgeTypeBoosts: ; fbe24
 	cp [hl]
 	jr z, .ApplyBoost
 
-.NextBadge
+.NextBadge:
 	inc hl
 	jr .CheckBadge
 
-.ApplyBoost
+.ApplyBoost:
 	ld a, [CurDamage]
 	ld h, a
 	ld d, a
@@ -226,7 +226,7 @@ DoBadgeTypeBoosts: ; fbe24
 
 	ld hl, $ffff
 
-.Update
+.Update:
 	ld a, h
 	ld [CurDamage], a
 	ld a, l
@@ -237,7 +237,7 @@ DoBadgeTypeBoosts: ; fbe24
 	pop de
 	ret
 
-.BadgeTypes
+.BadgeTypes:
 	db FLYING   ; zephyrbadge
 	db BUG      ; hivebadge
 	db NORMAL   ; plainbadge

battle/objects/functions.asm

@@ -12,7 +12,7 @@ DoBattleAnimFrame: ; ccfbe
 	jp [hl]
 ; ccfce
 
-.Jumptable
+.Jumptable:
 	dw BattleAnimFunction_00 ; 00
 	dw BattleAnimFunction_01 ; 01
 	dw BattleAnimFunction_02 ; 02
@@ -425,7 +425,7 @@ GetBallAnimPal: ; cd249 (33:5249)
 	ld e, a
 	pop af
 	ld [rSVBK], a
-.IsInArray
+.IsInArray:
 	ld a, [hli]
 	cp -1
 	jr z, .load
@@ -634,7 +634,7 @@ BattleAnimFunction_08: ; cd306 (33:5306)
 	call .SetCoords
 	ret
 
-.SetCoords
+.SetCoords:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -4100,7 +4100,7 @@ BattleAnim_Sine: ; ce734 (33:6734)
 	inc a
 	ret
 
-.ApplySineWave
+.ApplySineWave:
 	ld e, a
 	ld a, d
 	ld d, 0

battle/used_move_text.asm

@@ -82,10 +82,10 @@ UsedMoveText_CheckObedience: ; 105e10
 	ret
 ; 105e1a
 
-.UsedInsteadText
+.UsedInsteadText:
 	text_jump _UsedInsteadText
 	start_asm
-.GetMoveNameText
+.GetMoveNameText:
 	ld hl, MoveNameText
 	ret
 ; 105e23

data/battle_tower.asm

@@ -97,7 +97,7 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081
 	ld a, BANK(sBTPkmnPrevTrainer1)
 	call GetSRAMBank
 
-.FindARandomBattleTowerPkmn
+.FindARandomBattleTowerPkmn:
 	; From Which LevelGroup are the Pkmn loaded
 	; a = 1..10
 	ld a, [wBTChoiceOfLvlGroup] ; [$d800]

data/odd_eggs.asm

@@ -91,10 +91,10 @@ GiveOddEgg: ; 1fb4b6
 	ret
 ; 1fb546
 
-.Odd
+.Odd:
 	db "ODD@@@@@@@@@"
 
-.Probabilities
+.Probabilities:
 
 prob: MACRO
 prob_total = prob_total + (\1)

engine/anim_hp_bar.asm

@@ -2,7 +2,7 @@ _AnimateHPBar: ; d627
 	call .IsMaximumMoreThan48Pixels
 	jr c, .MoreThan48Pixels
 	call .ComputePixels
-.ShortAnimLoop
+.ShortAnimLoop:
 	push bc
 	push hl
 	call ShortAnim_UpdateVariables
@@ -19,9 +19,9 @@ _AnimateHPBar: ; d627
 	jr nc, .ShortAnimLoop
 	ret
 
-.MoreThan48Pixels
+.MoreThan48Pixels:
 	call .ComputePixels
-.LongAnimLoop
+.LongAnimLoop:
 	push bc
 	push hl
 	call LongAnim_UpdateVariables

engine/billspc.asm

@@ -437,7 +437,7 @@ endr
 	ld [wBillsPC_CursorPosition], a
 	ld [wBillsPC_ScrollPosition], a
 	ret
-.FailedWithdraw
+.FailedWithdraw:
 	ld de, PCString_WhatsUp
 	call BillsPC_PlaceString
 	ret
@@ -483,7 +483,7 @@ endr
 	ld [wBillsPC_ScrollPosition], a
 	pop af
 	ret
-.FailedRelease
+.FailedRelease:
 	ld de, PCString_WhatsUp
 	call BillsPC_PlaceString
 	pop af
@@ -1664,21 +1664,21 @@ BillsPC_CheckMail_PreventBlackout: ; e2f18 (38:6f18)
 	ld a, [wBillsPC_MonHasMail]
 	and a
 	jr nz, .HasMail
-.Okay
+.Okay:
 	and a
 	ret
 
-.HasMail
+.HasMail:
 	ld de, PCString_RemoveMail
 	jr .NotOkay
 
-.AllOthersFainted
+.AllOthersFainted:
 	ld de, PCString_NoMoreUsablePKMN
 	jr .NotOkay
 
-.ItsYourLastPokemon
+.ItsYourLastPokemon:
 	ld de, PCString_ItsYourLastPKMN
-.NotOkay
+.NotOkay:
 	call BillsPC_PlaceString
 	ld de, SFX_WRONG
 	call WaitPlaySFX
@@ -1918,7 +1918,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
 	and a
 	ret
 
-.PartyFull
+.PartyFull:
 	ld de, PCString_PartyFull
 	call BillsPC_PlaceString
 	ld de, SFX_WRONG
@@ -2519,7 +2519,7 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
 	and a
 	ret
 
-.Print
+.Print:
 	call GetBoxCount
 	and a
 	jr z, .EmptyBox
@@ -2533,12 +2533,12 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
 	and a
 	ret
 
-.EmptyBox
+.EmptyBox:
 	call BillsPC_PlaceEmptyBoxString_SFX
 	and a
 	ret
 
-.Switch
+.Switch:
 	ld a, [MenuSelection]
 	dec a
 	ld e, a
@@ -2548,7 +2548,7 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
 	callba ChangeBoxSaveGame
 	ret
 
-.Name
+.Name:
 	ld b, $4 ; box
 	ld de, wd002
 	callba NamingScreen