diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-25 12:07:35 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-25 12:07:35 -0400 |
commit | 5693cc49cfe6db05890c6f5fa8fbe460048f02c2 (patch) | |
tree | 0d420df4efa32e3fee68754b4034b72bbeb9fb3c | |
parent | 9f3e9145f9466ba93810dc6cd34fee7e7e835832 (diff) |
Single newline at the end of files
58 files changed, 0 insertions, 58 deletions
diff --git a/data/battle_anims/framesets.asm b/data/battle_anims/framesets.asm index 35cb3e5a8..e0fe57007 100644 --- a/data/battle_anims/framesets.asm +++ b/data/battle_anims/framesets.asm @@ -1266,4 +1266,3 @@ BattleAnimFrameData: .Frameset_b8: frame BATTLEANIMOAMSET_D7, 8 endanim - diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 9099953ca..21f8ca0fe 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -197,4 +197,3 @@ EngineFlags: engine_flag wSwarmFlags, SWARMFLAGS_DUNSPARCE_SWARM_F ; $a0 engine_flag wSwarmFlags, SWARMFLAGS_YANMA_SWARM_F - diff --git a/data/events/pokedex_ratings.asm b/data/events/pokedex_ratings.asm index 881ab1ab9..2a0488603 100644 --- a/data/events/pokedex_ratings.asm +++ b/data/events/pokedex_ratings.asm @@ -25,4 +25,3 @@ OakRatings: rating 239, SFX_DEX_FANFARE_230_PLUS, OakRating17 rating 248, SFX_DEX_FANFARE_230_PLUS, OakRating18 rating 255, SFX_DEX_FANFARE_230_PLUS, OakRating19 -
\ No newline at end of file diff --git a/data/trainers/attributes.asm b/data/trainers/attributes.asm index 364f62492..67d852d83 100644 --- a/data/trainers/attributes.asm +++ b/data/trainers/attributes.asm @@ -402,4 +402,3 @@ TrainerClassAttributes: db 25 ; base reward dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY dw CONTEXT_USE | SWITCH_SOMETIMES - diff --git a/data/types/names.asm b/data/types/names.asm index 2fe9e959c..62d8e13bf 100644 --- a/data/types/names.asm +++ b/data/types/names.asm @@ -48,4 +48,3 @@ Ghost: db "GHOST@" Steel: db "STEEL@" Dragon: db "DRAGON@" Dark: db "DARK@" - diff --git a/engine/battle/move_effects/baton_pass.asm b/engine/battle/move_effects/baton_pass.asm index bde7e18c0..cdb4bb75f 100644 --- a/engine/battle/move_effects/baton_pass.asm +++ b/engine/battle/move_effects/baton_pass.asm @@ -216,4 +216,3 @@ CheckAnyOtherAliveMons: ld a, b and a ret - diff --git a/engine/battle/move_effects/belly_drum.asm b/engine/battle/move_effects/belly_drum.asm index aec3a1d68..27ef1a542 100644 --- a/engine/battle/move_effects/belly_drum.asm +++ b/engine/battle/move_effects/belly_drum.asm @@ -32,4 +32,3 @@ BattleCommand_BellyDrum: .failed call AnimateFailedMove jp PrintButItFailed - diff --git a/engine/battle/move_effects/bide.asm b/engine/battle/move_effects/bide.asm index 53abd2e07..871e0e7a8 100644 --- a/engine/battle/move_effects/bide.asm +++ b/engine/battle/move_effects/bide.asm @@ -98,4 +98,3 @@ BattleCommand_UnleashEnergy: ld [wKickCounter], a call AnimateCurrentMove jp EndMoveEffect - diff --git a/engine/battle/move_effects/conversion.asm b/engine/battle/move_effects/conversion.asm index bc2c746df..f9307056c 100644 --- a/engine/battle/move_effects/conversion.asm +++ b/engine/battle/move_effects/conversion.asm @@ -94,4 +94,3 @@ BattleCommand_Conversion: call AnimateCurrentMove ld hl, TransformedTypeText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/conversion2.asm b/engine/battle/move_effects/conversion2.asm index b1d0e6282..14a7e257a 100644 --- a/engine/battle/move_effects/conversion2.asm +++ b/engine/battle/move_effects/conversion2.asm @@ -62,4 +62,3 @@ BattleCommand_Conversion2: .failed jp FailMove - diff --git a/engine/battle/move_effects/counter.asm b/engine/battle/move_effects/counter.asm index 9d10d1865..f92e1b3ac 100644 --- a/engine/battle/move_effects/counter.asm +++ b/engine/battle/move_effects/counter.asm @@ -56,4 +56,3 @@ BattleCommand_Counter: xor a ld [wAttackMissed], a ret - diff --git a/engine/battle/move_effects/destiny_bond.asm b/engine/battle/move_effects/destiny_bond.asm index 427c8b08a..55809d98a 100644 --- a/engine/battle/move_effects/destiny_bond.asm +++ b/engine/battle/move_effects/destiny_bond.asm @@ -7,4 +7,3 @@ BattleCommand_DestinyBond: call AnimateCurrentMove ld hl, DestinyBondEffectText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/disable.asm b/engine/battle/move_effects/disable.asm index b1055b200..44017e30d 100644 --- a/engine/battle/move_effects/disable.asm +++ b/engine/battle/move_effects/disable.asm @@ -70,4 +70,3 @@ BattleCommand_Disable: .failed jp FailMove - diff --git a/engine/battle/move_effects/encore.asm b/engine/battle/move_effects/encore.asm index e65925f52..f436fd970 100644 --- a/engine/battle/move_effects/encore.asm +++ b/engine/battle/move_effects/encore.asm @@ -118,4 +118,3 @@ BattleCommand_Encore: .failed jp PrintDidntAffect2 - diff --git a/engine/battle/move_effects/false_swipe.asm b/engine/battle/move_effects/false_swipe.asm index c61aa534a..4f4eb329c 100644 --- a/engine/battle/move_effects/false_swipe.asm +++ b/engine/battle/move_effects/false_swipe.asm @@ -46,4 +46,3 @@ BattleCommand_FalseSwipe: .done and a ret - diff --git a/engine/battle/move_effects/focus_energy.asm b/engine/battle/move_effects/focus_energy.asm index 8fa6b19ff..ffdc7b136 100644 --- a/engine/battle/move_effects/focus_energy.asm +++ b/engine/battle/move_effects/focus_energy.asm @@ -13,4 +13,3 @@ BattleCommand_FocusEnergy: .already_pumped call AnimateFailedMove jp PrintButItFailed - diff --git a/engine/battle/move_effects/frustration.asm b/engine/battle/move_effects/frustration.asm index 5e45636be..3d395b510 100644 --- a/engine/battle/move_effects/frustration.asm +++ b/engine/battle/move_effects/frustration.asm @@ -25,4 +25,3 @@ BattleCommand_FrustrationPower: ld d, a pop bc ret - diff --git a/engine/battle/move_effects/fury_cutter.asm b/engine/battle/move_effects/fury_cutter.asm index ab096b447..8d6a5597b 100644 --- a/engine/battle/move_effects/fury_cutter.asm +++ b/engine/battle/move_effects/fury_cutter.asm @@ -54,4 +54,3 @@ ResetFuryCutterCount: pop hl ret - diff --git a/engine/battle/move_effects/future_sight.asm b/engine/battle/move_effects/future_sight.asm index 8b08ce982..c28841b35 100644 --- a/engine/battle/move_effects/future_sight.asm +++ b/engine/battle/move_effects/future_sight.asm @@ -79,4 +79,3 @@ BattleCommand_FutureSight: call AnimateFailedMove call PrintButItFailed jp EndMoveEffect - diff --git a/engine/battle/move_effects/heal_bell.asm b/engine/battle/move_effects/heal_bell.asm index 060ac3423..2570a53ba 100644 --- a/engine/battle/move_effects/heal_bell.asm +++ b/engine/battle/move_effects/heal_bell.asm @@ -32,4 +32,3 @@ BattleCommand_HealBell: and a jp z, CalcPlayerStats jp CalcEnemyStats - diff --git a/engine/battle/move_effects/hidden_power.asm b/engine/battle/move_effects/hidden_power.asm index 19d7e0b32..3b40a6c31 100644 --- a/engine/battle/move_effects/hidden_power.asm +++ b/engine/battle/move_effects/hidden_power.asm @@ -6,4 +6,3 @@ BattleCommand_HiddenPower: ret nz farcall HiddenPowerDamage ret - diff --git a/engine/battle/move_effects/leech_seed.asm b/engine/battle/move_effects/leech_seed.asm index 44019a6ad..5602e7f62 100644 --- a/engine/battle/move_effects/leech_seed.asm +++ b/engine/battle/move_effects/leech_seed.asm @@ -38,4 +38,3 @@ BattleCommand_LeechSeed: call AnimateFailedMove ld hl, EvadedText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/lock_on.asm b/engine/battle/move_effects/lock_on.asm index 7b6503575..7dc4a013d 100644 --- a/engine/battle/move_effects/lock_on.asm +++ b/engine/battle/move_effects/lock_on.asm @@ -19,4 +19,3 @@ BattleCommand_LockOn: .fail call AnimateFailedMove jp PrintDidntAffect - diff --git a/engine/battle/move_effects/mimic.asm b/engine/battle/move_effects/mimic.asm index 2f91d6a1d..b1c6608fa 100644 --- a/engine/battle/move_effects/mimic.asm +++ b/engine/battle/move_effects/mimic.asm @@ -48,4 +48,3 @@ BattleCommand_Mimic: .fail jp FailMimic - diff --git a/engine/battle/move_effects/mirror_coat.asm b/engine/battle/move_effects/mirror_coat.asm index f8b8ca114..8743c389d 100644 --- a/engine/battle/move_effects/mirror_coat.asm +++ b/engine/battle/move_effects/mirror_coat.asm @@ -57,4 +57,3 @@ BattleCommand_MirrorCoat: xor a ld [wAttackMissed], a ret - diff --git a/engine/battle/move_effects/mist.asm b/engine/battle/move_effects/mist.asm index 52e4e59f4..199a30045 100644 --- a/engine/battle/move_effects/mist.asm +++ b/engine/battle/move_effects/mist.asm @@ -13,4 +13,3 @@ BattleCommand_Mist: .already_mist call AnimateFailedMove jp PrintButItFailed - diff --git a/engine/battle/move_effects/pain_split.asm b/engine/battle/move_effects/pain_split.asm index a94ccff6f..4e4380b23 100644 --- a/engine/battle/move_effects/pain_split.asm +++ b/engine/battle/move_effects/pain_split.asm @@ -91,4 +91,3 @@ BattleCommand_PainSplit: .ButItFailed: jp PrintDidntAffect2 - diff --git a/engine/battle/move_effects/pay_day.asm b/engine/battle/move_effects/pay_day.asm index 53705d434..ba1dce884 100644 --- a/engine/battle/move_effects/pay_day.asm +++ b/engine/battle/move_effects/pay_day.asm @@ -24,4 +24,3 @@ BattleCommand_PayDay: .done ld hl, CoinsScatteredText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/psych_up.asm b/engine/battle/move_effects/psych_up.asm index 743e93c86..02fdef5d2 100644 --- a/engine/battle/move_effects/psych_up.asm +++ b/engine/battle/move_effects/psych_up.asm @@ -47,4 +47,3 @@ BattleCommand_PsychUp: call AnimateCurrentMove ld hl, CopiedStatsText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/pursuit.asm b/engine/battle/move_effects/pursuit.asm index 640957516..18c358144 100644 --- a/engine/battle/move_effects/pursuit.asm +++ b/engine/battle/move_effects/pursuit.asm @@ -22,4 +22,3 @@ BattleCommand_Pursuit: ld [hli], a ld [hl], a ret - diff --git a/engine/battle/move_effects/rage.asm b/engine/battle/move_effects/rage.asm index 1f40cc1fb..df206a6bf 100644 --- a/engine/battle/move_effects/rage.asm +++ b/engine/battle/move_effects/rage.asm @@ -4,4 +4,3 @@ BattleCommand_Rage: call GetBattleVarAddr set SUBSTATUS_RAGE, [hl] ret - diff --git a/engine/battle/move_effects/rain_dance.asm b/engine/battle/move_effects/rain_dance.asm index fa8881c3c..e9ef5d123 100644 --- a/engine/battle/move_effects/rain_dance.asm +++ b/engine/battle/move_effects/rain_dance.asm @@ -7,4 +7,3 @@ BattleCommand_StartRain: call AnimateCurrentMove ld hl, DownpourText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/rapid_spin.asm b/engine/battle/move_effects/rapid_spin.asm index 089be7667..0dc8b7de2 100644 --- a/engine/battle/move_effects/rapid_spin.asm +++ b/engine/battle/move_effects/rapid_spin.asm @@ -34,4 +34,3 @@ BattleCommand_ClearHazards: ld [de], a ld hl, ReleasedByText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/return.asm b/engine/battle/move_effects/return.asm index ee83843b3..d3071d23a 100644 --- a/engine/battle/move_effects/return.asm +++ b/engine/battle/move_effects/return.asm @@ -23,4 +23,3 @@ BattleCommand_HappinessPower: ld d, a pop bc ret - diff --git a/engine/battle/move_effects/safeguard.asm b/engine/battle/move_effects/safeguard.asm index e4e2e0951..a926bdccc 100644 --- a/engine/battle/move_effects/safeguard.asm +++ b/engine/battle/move_effects/safeguard.asm @@ -21,4 +21,3 @@ BattleCommand_Safeguard: .failed call AnimateFailedMove jp PrintButItFailed - diff --git a/engine/battle/move_effects/selfdestruct.asm b/engine/battle/move_effects/selfdestruct.asm index 3c7b05ef9..d6eeac484 100644 --- a/engine/battle/move_effects/selfdestruct.asm +++ b/engine/battle/move_effects/selfdestruct.asm @@ -27,4 +27,3 @@ BattleCommand_Selfdestruct: farcall DrawEnemyHUD call WaitBGMap jp RefreshBattleHuds - diff --git a/engine/battle/move_effects/sketch.asm b/engine/battle/move_effects/sketch.asm index 1f2e67dd4..4c15dbe02 100644 --- a/engine/battle/move_effects/sketch.asm +++ b/engine/battle/move_effects/sketch.asm @@ -115,4 +115,3 @@ BattleCommand_Sketch: .fail call AnimateFailedMove jp PrintDidntAffect - diff --git a/engine/battle/move_effects/sleep_talk.asm b/engine/battle/move_effects/sleep_talk.asm index ce7a27ed5..ae2d252b7 100644 --- a/engine/battle/move_effects/sleep_talk.asm +++ b/engine/battle/move_effects/sleep_talk.asm @@ -141,4 +141,3 @@ BattleCommand_SleepTalk: ret z cp EFFECT_BIDE ret - diff --git a/engine/battle/move_effects/snore.asm b/engine/battle/move_effects/snore.asm index 4544b7fbd..e2432c59f 100644 --- a/engine/battle/move_effects/snore.asm +++ b/engine/battle/move_effects/snore.asm @@ -9,4 +9,3 @@ BattleCommand_Snore: ld [wAttackMissed], a call FailMove jp EndMoveEffect - diff --git a/engine/battle/move_effects/spite.asm b/engine/battle/move_effects/spite.asm index 7c9499074..8aba187a4 100644 --- a/engine/battle/move_effects/spite.asm +++ b/engine/battle/move_effects/spite.asm @@ -84,4 +84,3 @@ BattleCommand_Spite: .failed jp PrintDidntAffect2 - diff --git a/engine/battle/move_effects/splash.asm b/engine/battle/move_effects/splash.asm index ed9eeb4ca..493ea8ca6 100644 --- a/engine/battle/move_effects/splash.asm +++ b/engine/battle/move_effects/splash.asm @@ -2,4 +2,3 @@ BattleCommand_Splash: call AnimateCurrentMove farcall StubbedTrainerRankings_Splash jp PrintNothingHappened - diff --git a/engine/battle/move_effects/substitute.asm b/engine/battle/move_effects/substitute.asm index f439afd78..8f14bc315 100644 --- a/engine/battle/move_effects/substitute.asm +++ b/engine/battle/move_effects/substitute.asm @@ -86,4 +86,3 @@ BattleCommand_Substitute: ld hl, TooWeakSubText .jp_stdbattletextbox jp StdBattleTextBox - diff --git a/engine/battle/move_effects/sunny_day.asm b/engine/battle/move_effects/sunny_day.asm index ad2298401..f5825930f 100644 --- a/engine/battle/move_effects/sunny_day.asm +++ b/engine/battle/move_effects/sunny_day.asm @@ -7,4 +7,3 @@ BattleCommand_StartSun: call AnimateCurrentMove ld hl, SunGotBrightText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/teleport.asm b/engine/battle/move_effects/teleport.asm index b9c7f9fb2..1c67ef112 100644 --- a/engine/battle/move_effects/teleport.asm +++ b/engine/battle/move_effects/teleport.asm @@ -87,4 +87,3 @@ BattleCommand_Teleport: ld hl, FledFromBattleText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/thunder.asm b/engine/battle/move_effects/thunder.asm index 1a87176bd..b2a643787 100644 --- a/engine/battle/move_effects/thunder.asm +++ b/engine/battle/move_effects/thunder.asm @@ -16,4 +16,3 @@ BattleCommand_ThunderAccuracy: ; Redundant with CheckHit guranteeing hit ld [hl], 100 percent ret - diff --git a/engine/battle/move_effects/transform.asm b/engine/battle/move_effects/transform.asm index fe85658e6..ef8071290 100644 --- a/engine/battle/move_effects/transform.asm +++ b/engine/battle/move_effects/transform.asm @@ -137,4 +137,3 @@ BattleCommand_Transform: call nz, LoadAnim ld hl, TransformedText jp StdBattleTextBox - diff --git a/engine/battle/move_effects/triple_kick.asm b/engine/battle/move_effects/triple_kick.asm index 8c0253858..e41044c9d 100644 --- a/engine/battle/move_effects/triple_kick.asm +++ b/engine/battle/move_effects/triple_kick.asm @@ -32,4 +32,3 @@ BattleCommand_KickCounter: ld hl, wKickCounter inc [hl] ret - diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 3cbaa9a22..e5e186ab7 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -2904,4 +2904,3 @@ BattleBGEffects_Cosine: callfar BattleAnim_Cosine_e ld a, e ret - diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm index 16842269b..0f3bb8488 100644 --- a/engine/battle_anims/core.asm +++ b/engine/battle_anims/core.asm @@ -302,4 +302,3 @@ _ExecuteBGEffects: _QueueBGEffect: callfar QueueBGEffect ret - diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm index 742897429..63177b1b1 100644 --- a/engine/battle_anims/helpers.asm +++ b/engine/battle_anims/helpers.asm @@ -120,4 +120,3 @@ LoadBattleAnimObj: call DecompressRequest2bpp pop bc ret - diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm index 51c5b04a1..76bdbaa76 100644 --- a/engine/events/celebi.asm +++ b/engine/events/celebi.asm @@ -310,4 +310,3 @@ CheckCaughtCelebi: .done ret - diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index f69a0d8fe..6cbc749d5 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -602,4 +602,3 @@ HOF_AnimatePlayerPic: .PlayTime: db "PLAY TIME@" - diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index da6e0f30a..8a8303067 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -1384,4 +1384,3 @@ MailComposition_TryAddLastCharacter: jp NamingScreen_LoadNextCharacter INCLUDE "data/text/mail_input_chars.asm" - diff --git a/engine/phone/generic_calls.asm b/engine/phone/generic_calls.asm index 9abcf95af..407480d36 100644 --- a/engine/phone/generic_calls.asm +++ b/engine/phone/generic_calls.asm @@ -1261,4 +1261,3 @@ MomString: db "Mom@" DadString: db "Dad@" SisterString: db "Sister@" BrotherString: db "Brother@" - diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index 0dd0b85dd..6e83b453d 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -2946,4 +2946,3 @@ Unreferenced_Function92311: xor a ld [hBGMapMode], a ret - diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index 5940e9b1f..7e7f0e097 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -959,4 +959,3 @@ Unreferenced_DayCareMonPrintEmptyString: .string db "@" - diff --git a/home/movement.asm b/home/movement.asm index fe36511c5..2c19b6355 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -190,4 +190,3 @@ HideCursor:: ld l, a ld [hl], " " ret - diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm index b6575f8c4..9388e8d04 100644 --- a/mobile/mobile_5b.asm +++ b/mobile/mobile_5b.asm @@ -779,4 +779,3 @@ Unknown_16cfb9: RGB 18, 05, 02 RGB 27, 11, 12 RGB 07, 07, 07 - |