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]
ret
INCLUDE "audio/notes.asm"
INCLUDE "audio/wave_samples.asm"

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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