Remove more triple newlines

This commit is contained in:
Rangi 2018-06-25 12:01:02 -04:00
parent 0f074e2ad1
commit 9f3e9145f9
22 changed files with 0 additions and 194 deletions

View File

@ -2752,7 +2752,6 @@ LoadMusicByte::
ld a, [wCurMusicByte] ld a, [wCurMusicByte]
ret ret
INCLUDE "audio/notes.asm" INCLUDE "audio/notes.asm"
INCLUDE "audio/wave_samples.asm" INCLUDE "audio/wave_samples.asm"

View File

@ -550,7 +550,6 @@ BattleTowerMons1:
db "BARIYA-DO@@" db "BARIYA-DO@@"
BattleTowerMons2: BattleTowerMons2:
db UMBREON db UMBREON
@ -1100,7 +1099,6 @@ BattleTowerMons2:
db "NUO-@@@@@@@" db "NUO-@@@@@@@"
BattleTowerMons3: BattleTowerMons3:
db JOLTEON db JOLTEON
@ -1650,7 +1648,6 @@ BattleTowerMons3:
db "OKORIZARU@@" db "OKORIZARU@@"
BattleTowerMons4: BattleTowerMons4:
db TAUROS db TAUROS
@ -2200,7 +2197,6 @@ BattleTowerMons4:
db "EREBU-@@@@@" db "EREBU-@@@@@"
BattleTowerMons5: BattleTowerMons5:
db KINGDRA db KINGDRA
@ -2750,7 +2746,6 @@ BattleTowerMons5:
db "HURI-ZA-@@@" db "HURI-ZA-@@@"
BattleTowerMons6: BattleTowerMons6:
db KINGDRA db KINGDRA
@ -3300,7 +3295,6 @@ BattleTowerMons6:
db "GORO-NIya@@" db "GORO-NIya@@"
BattleTowerMons7: BattleTowerMons7:
db JOLTEON db JOLTEON
@ -3850,7 +3844,6 @@ BattleTowerMons7:
db "KAMEtuKUSU@" db "KAMEtuKUSU@"
BattleTowerMons8: BattleTowerMons8:
db JOLTEON db JOLTEON
@ -4400,7 +4393,6 @@ BattleTowerMons8:
db "GURANBURU@@" db "GURANBURU@@"
BattleTowerMons9: BattleTowerMons9:
db UMBREON db UMBREON
@ -4950,7 +4942,6 @@ BattleTowerMons9:
db "BETOBETON@@" db "BETOBETON@@"
BattleTowerMons10: BattleTowerMons10:
db HOUNDOOM db HOUNDOOM

File diff suppressed because it is too large Load Diff

View File

@ -79,7 +79,6 @@ BattleCommand_BatonPass:
jr ResetBatonPassStatus jr ResetBatonPassStatus
BatonPass_LinkPlayerSwitch: BatonPass_LinkPlayerSwitch:
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
@ -97,7 +96,6 @@ BatonPass_LinkPlayerSwitch:
ld [wBattlePlayerAction], a ld [wBattlePlayerAction], a
ret ret
BatonPass_LinkEnemySwitch: BatonPass_LinkEnemySwitch:
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
@ -123,12 +121,10 @@ BatonPass_LinkEnemySwitch:
.switch .switch
jp CloseWindow jp CloseWindow
FailedBatonPass: FailedBatonPass:
call AnimateFailedMove call AnimateFailedMove
jp PrintButItFailed jp PrintButItFailed
ResetBatonPassStatus: ResetBatonPassStatus:
; Reset status changes that aren't passed by Baton Pass. ; Reset status changes that aren't passed by Baton Pass.
@ -168,7 +164,6 @@ ResetBatonPassStatus:
ld [wEnemyWrapCount], a ld [wEnemyWrapCount], a
ret ret
CheckAnyOtherAlivePartyMons: CheckAnyOtherAlivePartyMons:
ld hl, wPartyMon1HP ld hl, wPartyMon1HP
ld a, [wPartyCount] ld a, [wPartyCount]
@ -177,7 +172,6 @@ CheckAnyOtherAlivePartyMons:
ld e, a ld e, a
jr CheckAnyOtherAliveMons jr CheckAnyOtherAliveMons
CheckAnyOtherAliveEnemyMons: CheckAnyOtherAliveEnemyMons:
ld hl, wOTPartyMon1HP ld hl, wOTPartyMon1HP
ld a, [wOTPartyCount] ld a, [wOTPartyCount]

View File

@ -193,12 +193,10 @@ BattleCommand_BeatUp:
ld d, a ld d, a
ret ret
.beatup_fail .beatup_fail
ld b, buildopponentrage_command ld b, buildopponentrage_command
jp SkipToBattleCommand jp SkipToBattleCommand
BattleCommand_BeatUpFailText: BattleCommand_BeatUpFailText:
; beatupfailtext ; beatupfailtext
@ -208,7 +206,6 @@ BattleCommand_BeatUpFailText:
jp PrintButItFailed jp PrintButItFailed
GetBeatupMonLocation: GetBeatupMonLocation:
push bc push bc
ld c, a ld c, a

View File

@ -69,7 +69,6 @@ BattleCommand_StoreEnergy:
call StdBattleTextBox call StdBattleTextBox
jp EndMoveEffect jp EndMoveEffect
BattleCommand_UnleashEnergy: BattleCommand_UnleashEnergy:
; unleashenergy ; unleashenergy

View File

@ -38,7 +38,6 @@ BattleCommand_FuryCutter:
ld [hl], a ld [hl], a
ret ret
ResetFuryCutterCount: ResetFuryCutterCount:
push hl push hl

View File

@ -26,7 +26,6 @@ BattleCommand_TripleKick:
ld [hl], a ld [hl], a
ret ret
BattleCommand_KickCounter: BattleCommand_KickCounter:
; kickcounter ; kickcounter

View File

@ -530,8 +530,6 @@ BTWinM25:
text_jump UnknownText_0x1ec99b text_jump UnknownText_0x1ec99b
db "@" db "@"
BTGreetingF1: BTGreetingF1:
text_jump UnknownText_0x1ec9bd text_jump UnknownText_0x1ec9bd
db "@" db "@"

View File

@ -301,7 +301,6 @@ CalcMagikarpLength:
INCLUDE "data/events/magikarp_lengths.asm" INCLUDE "data/events/magikarp_lengths.asm"
MagikarpHouseSign: MagikarpHouseSign:
ld a, [wBestMagikarpLengthFeet] ld a, [wBestMagikarpLengthFeet]
ld [wMagikarpLength], a ld [wMagikarpLength], a

View File

@ -2784,7 +2784,6 @@ ApplyPPUp:
inc de inc de
jr .loop jr .loop
ComputeMaxPP: ComputeMaxPP:
push bc push bc
; Divide the base PP by 5. ; Divide the base PP by 5.

View File

@ -55,7 +55,6 @@ _InterpretMobileMenu::
and a and a
ret ret
Draw2DMenu: Draw2DMenu:
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a

View File

@ -1409,7 +1409,6 @@ TradeAnim_WaitAnim2:
call TradeAnim_AdvanceScriptPointer call TradeAnim_AdvanceScriptPointer
ret ret
Unreferenced_DebugTrade: Unreferenced_DebugTrade:
; This function is not referenced. ; This function is not referenced.
; It was meant for use in Japanese versions, so the ; It was meant for use in Japanese versions, so the

View File

@ -215,7 +215,6 @@ Function6fa1:
scf scf
ret ret
CheckFacingObject:: CheckFacingObject::
call GetFacingTileCoord call GetFacingTileCoord

View File

@ -161,7 +161,6 @@ LoadUsedSpritesGFX:
farcall LoadEmote farcall LoadEmote
ret ret
SafeGetSprite: SafeGetSprite:
push hl push hl
call GetSprite call GetSprite

View File

@ -1609,7 +1609,6 @@ Pokedex_CheckSeen:
pop de pop de
ret ret
Pokedex_OrderMonsByMode: Pokedex_OrderMonsByMode:
ld hl, wPokedexOrder ld hl, wPokedexOrder
ld bc, wPokedexOrderEnd - wPokedexOrder ld bc, wPokedexOrderEnd - wPokedexOrder

View File

@ -130,7 +130,6 @@ PlayMusic2::
pop hl pop hl
ret ret
PlayCry:: PlayCry::
; Play cry de. ; Play cry de.

View File

@ -93,12 +93,10 @@ OldDMATransfer::
ld [hBGMapMode], a ld [hBGMapMode], a
ret ret
ReplaceKrisSprite:: ReplaceKrisSprite::
farcall _ReplaceKrisSprite farcall _ReplaceKrisSprite
ret ret
LoadStandardFont:: LoadStandardFont::
farcall _LoadStandardFont farcall _LoadStandardFont
ret ret
@ -107,7 +105,6 @@ LoadFontsBattleExtra::
farcall _LoadFontsBattleExtra farcall _LoadFontsBattleExtra
ret ret
LoadFontsExtra:: LoadFontsExtra::
farcall _LoadFontsExtra1 farcall _LoadFontsExtra1
farcall _LoadFontsExtra2 farcall _LoadFontsExtra2
@ -135,7 +132,6 @@ DecompressRequest2bpp::
call CloseSRAM call CloseSRAM
ret ret
FarCopyBytes:: FarCopyBytes::
; copy bc bytes from a:hl to de ; copy bc bytes from a:hl to de

View File

@ -229,7 +229,6 @@ DmgToCgbObjPal1::
pop af pop af
ret ret
CopyPals:: CopyPals::
; copy c palettes in order b from de to hl ; copy c palettes in order b from de to hl

View File

@ -196,7 +196,6 @@ InitTime::
farcall _InitTime farcall _InitTime
ret ret
PanicResetClock:: PanicResetClock::
call .ClearhRTC call .ClearhRTC
call SetClock call SetClock

View File

@ -2037,7 +2037,6 @@ Function100db0:
xor a xor a
ret ret
Function100dc0: Function100dc0:
ld a, [wLinkMode] ld a, [wLinkMode]
cp LINK_MOBILE cp LINK_MOBILE

View File

@ -1304,7 +1304,6 @@ BattleTowerRoomMenu_UpdatePickLevelMenu:
ld [wMobileInactivityTimerFrames], a ld [wMobileInactivityTimerFrames], a
ret ret
Function118a54: Function118a54:
ld a, [wcd55] ld a, [wcd55]
ld l, a ld l, a