ref: 5693cc49cfe6db05890c6f5fa8fbe460048f02c2
parent: 9f3e9145f9466ba93810dc6cd34fee7e7e835832
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Mon Jun 25 08:07:35 EDT 2018
Single newline at the end of files
--- a/data/battle_anims/framesets.asm
+++ b/data/battle_anims/framesets.asm
@@ -1266,4 +1266,3 @@
.Frameset_b8:
frame BATTLEANIMOAMSET_D7, 8
endanim
-
--- a/data/engine_flags.asm
+++ b/data/engine_flags.asm
@@ -197,4 +197,3 @@
engine_flag wSwarmFlags, SWARMFLAGS_DUNSPARCE_SWARM_F ; $a0
engine_flag wSwarmFlags, SWARMFLAGS_YANMA_SWARM_F
-
--- a/data/events/pokedex_ratings.asm
+++ b/data/events/pokedex_ratings.asm
@@ -25,4 +25,3 @@
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
--- a/data/trainers/attributes.asm
+++ b/data/trainers/attributes.asm
@@ -402,4 +402,3 @@
db 25 ; base reward
dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
dw CONTEXT_USE | SWITCH_SOMETIMES
-
--- a/data/types/names.asm
+++ b/data/types/names.asm
@@ -48,4 +48,3 @@
Steel: db "STEEL@"
Dragon: db "DRAGON@"
Dark: db "DARK@"
-
--- a/engine/battle/move_effects/baton_pass.asm
+++ b/engine/battle/move_effects/baton_pass.asm
@@ -216,4 +216,3 @@
ld a, b
and a
ret
-
--- a/engine/battle/move_effects/belly_drum.asm
+++ b/engine/battle/move_effects/belly_drum.asm
@@ -32,4 +32,3 @@
.failed
call AnimateFailedMove
jp PrintButItFailed
-
--- a/engine/battle/move_effects/bide.asm
+++ b/engine/battle/move_effects/bide.asm
@@ -98,4 +98,3 @@
ld [wKickCounter], a
call AnimateCurrentMove
jp EndMoveEffect
-
--- a/engine/battle/move_effects/conversion.asm
+++ b/engine/battle/move_effects/conversion.asm
@@ -94,4 +94,3 @@
call AnimateCurrentMove
ld hl, TransformedTypeText
jp StdBattleTextBox
-
--- a/engine/battle/move_effects/conversion2.asm
+++ b/engine/battle/move_effects/conversion2.asm
@@ -62,4 +62,3 @@
.failed
jp FailMove
-
--- a/engine/battle/move_effects/counter.asm
+++ b/engine/battle/move_effects/counter.asm
@@ -56,4 +56,3 @@
xor a
ld [wAttackMissed], a
ret
-
--- a/engine/battle/move_effects/destiny_bond.asm
+++ b/engine/battle/move_effects/destiny_bond.asm
@@ -7,4 +7,3 @@
call AnimateCurrentMove
ld hl, DestinyBondEffectText
jp StdBattleTextBox
-
--- a/engine/battle/move_effects/disable.asm
+++ b/engine/battle/move_effects/disable.asm
@@ -70,4 +70,3 @@
.failed
jp FailMove
-
--- a/engine/battle/move_effects/encore.asm
+++ b/engine/battle/move_effects/encore.asm
@@ -118,4 +118,3 @@
.failed
jp PrintDidntAffect2
-
--- a/engine/battle/move_effects/false_swipe.asm
+++ b/engine/battle/move_effects/false_swipe.asm
@@ -46,4 +46,3 @@
.done
and a
ret
-
--- a/engine/battle/move_effects/focus_energy.asm
+++ b/engine/battle/move_effects/focus_energy.asm
@@ -13,4 +13,3 @@
.already_pumped
call AnimateFailedMove
jp PrintButItFailed
-
--- a/engine/battle/move_effects/frustration.asm
+++ b/engine/battle/move_effects/frustration.asm
@@ -25,4 +25,3 @@
ld d, a
pop bc
ret
-
--- a/engine/battle/move_effects/fury_cutter.asm
+++ b/engine/battle/move_effects/fury_cutter.asm
@@ -54,4 +54,3 @@
pop hl
ret
-
--- a/engine/battle/move_effects/future_sight.asm
+++ b/engine/battle/move_effects/future_sight.asm
@@ -79,4 +79,3 @@
call AnimateFailedMove
call PrintButItFailed
jp EndMoveEffect
-
--- a/engine/battle/move_effects/heal_bell.asm
+++ b/engine/battle/move_effects/heal_bell.asm
@@ -32,4 +32,3 @@
and a
jp z, CalcPlayerStats
jp CalcEnemyStats
-
--- a/engine/battle/move_effects/hidden_power.asm
+++ b/engine/battle/move_effects/hidden_power.asm
@@ -6,4 +6,3 @@
ret nz
farcall HiddenPowerDamage
ret
-
--- a/engine/battle/move_effects/leech_seed.asm
+++ b/engine/battle/move_effects/leech_seed.asm
@@ -38,4 +38,3 @@
call AnimateFailedMove
ld hl, EvadedText
jp StdBattleTextBox
-
--- a/engine/battle/move_effects/lock_on.asm
+++ b/engine/battle/move_effects/lock_on.asm
@@ -19,4 +19,3 @@
.fail
call AnimateFailedMove
jp PrintDidntAffect
-
--- a/engine/battle/move_effects/mimic.asm
+++ b/engine/battle/move_effects/mimic.asm
@@ -48,4 +48,3 @@
.fail
jp FailMimic
-
--- a/engine/battle/move_effects/mirror_coat.asm
+++ b/engine/battle/move_effects/mirror_coat.asm
@@ -57,4 +57,3 @@
xor a
ld [wAttackMissed], a
ret
-
--- a/engine/battle/move_effects/mist.asm
+++ b/engine/battle/move_effects/mist.asm
@@ -13,4 +13,3 @@
.already_mist
call AnimateFailedMove
jp PrintButItFailed
-
--- a/engine/battle/move_effects/pain_split.asm
+++ b/engine/battle/move_effects/pain_split.asm
@@ -91,4 +91,3 @@
.ButItFailed:
jp PrintDidntAffect2
-
--- a/engine/battle/move_effects/pay_day.asm
+++ b/engine/battle/move_effects/pay_day.asm
@@ -24,4 +24,3 @@
.done
ld hl, CoinsScatteredText
jp StdBattleTextBox
-
--- a/engine/battle/move_effects/psych_up.asm
+++ b/engine/battle/move_effects/psych_up.asm
@@ -47,4 +47,3 @@
call AnimateCurrentMove
ld hl, CopiedStatsText
jp StdBattleTextBox
-
--- a/engine/battle/move_effects/pursuit.asm
+++ b/engine/battle/move_effects/pursuit.asm
@@ -22,4 +22,3 @@
ld [hli], a
ld [hl], a
ret
-
--- a/engine/battle/move_effects/rage.asm
+++ b/engine/battle/move_effects/rage.asm
@@ -4,4 +4,3 @@
call GetBattleVarAddr
set SUBSTATUS_RAGE, [hl]
ret
-
--- a/engine/battle/move_effects/rain_dance.asm
+++ b/engine/battle/move_effects/rain_dance.asm
@@ -7,4 +7,3 @@
call AnimateCurrentMove
ld hl, DownpourText
jp StdBattleTextBox
-
--- a/engine/battle/move_effects/rapid_spin.asm
+++ b/engine/battle/move_effects/rapid_spin.asm
@@ -34,4 +34,3 @@
ld [de], a
ld hl, ReleasedByText
jp StdBattleTextBox
-
--- a/engine/battle/move_effects/return.asm
+++ b/engine/battle/move_effects/return.asm
@@ -23,4 +23,3 @@
ld d, a
pop bc
ret
-
--- a/engine/battle/move_effects/safeguard.asm
+++ b/engine/battle/move_effects/safeguard.asm
@@ -21,4 +21,3 @@
.failed
call AnimateFailedMove
jp PrintButItFailed
-
--- a/engine/battle/move_effects/selfdestruct.asm
+++ b/engine/battle/move_effects/selfdestruct.asm
@@ -27,4 +27,3 @@
farcall DrawEnemyHUD
call WaitBGMap
jp RefreshBattleHuds
-
--- a/engine/battle/move_effects/sketch.asm
+++ b/engine/battle/move_effects/sketch.asm
@@ -115,4 +115,3 @@
.fail
call AnimateFailedMove
jp PrintDidntAffect
-
--- a/engine/battle/move_effects/sleep_talk.asm
+++ b/engine/battle/move_effects/sleep_talk.asm
@@ -141,4 +141,3 @@
ret z
cp EFFECT_BIDE
ret
-
--- a/engine/battle/move_effects/snore.asm
+++ b/engine/battle/move_effects/snore.asm
@@ -9,4 +9,3 @@
ld [wAttackMissed], a
call FailMove
jp EndMoveEffect
-
--- a/engine/battle/move_effects/spite.asm
+++ b/engine/battle/move_effects/spite.asm
@@ -84,4 +84,3 @@
.failed
jp PrintDidntAffect2
-
--- a/engine/battle/move_effects/splash.asm
+++ b/engine/battle/move_effects/splash.asm
@@ -2,4 +2,3 @@
call AnimateCurrentMove
farcall StubbedTrainerRankings_Splash
jp PrintNothingHappened
-
--- a/engine/battle/move_effects/substitute.asm
+++ b/engine/battle/move_effects/substitute.asm
@@ -86,4 +86,3 @@
ld hl, TooWeakSubText
.jp_stdbattletextbox
jp StdBattleTextBox
-
--- a/engine/battle/move_effects/sunny_day.asm
+++ b/engine/battle/move_effects/sunny_day.asm
@@ -7,4 +7,3 @@
call AnimateCurrentMove
ld hl, SunGotBrightText
jp StdBattleTextBox
-
--- a/engine/battle/move_effects/teleport.asm
+++ b/engine/battle/move_effects/teleport.asm
@@ -87,4 +87,3 @@
ld hl, FledFromBattleText
jp StdBattleTextBox
-
--- a/engine/battle/move_effects/thunder.asm
+++ b/engine/battle/move_effects/thunder.asm
@@ -16,4 +16,3 @@
; Redundant with CheckHit guranteeing hit
ld [hl], 100 percent
ret
-
--- a/engine/battle/move_effects/transform.asm
+++ b/engine/battle/move_effects/transform.asm
@@ -137,4 +137,3 @@
call nz, LoadAnim
ld hl, TransformedText
jp StdBattleTextBox
-
--- a/engine/battle/move_effects/triple_kick.asm
+++ b/engine/battle/move_effects/triple_kick.asm
@@ -32,4 +32,3 @@
ld hl, wKickCounter
inc [hl]
ret
-
--- a/engine/battle_anims/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
@@ -2904,4 +2904,3 @@
callfar BattleAnim_Cosine_e
ld a, e
ret
-
--- a/engine/battle_anims/core.asm
+++ b/engine/battle_anims/core.asm
@@ -302,4 +302,3 @@
_QueueBGEffect:
callfar QueueBGEffect
ret
-
--- a/engine/battle_anims/helpers.asm
+++ b/engine/battle_anims/helpers.asm
@@ -120,4 +120,3 @@
call DecompressRequest2bpp
pop bc
ret
-
--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
@@ -310,4 +310,3 @@
.done
ret
-
--- a/engine/events/halloffame.asm
+++ b/engine/events/halloffame.asm
@@ -602,4 +602,3 @@
.PlayTime:
db "PLAY TIME@"
-
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -1384,4 +1384,3 @@
jp NamingScreen_LoadNextCharacter
INCLUDE "data/text/mail_input_chars.asm"
-
--- a/engine/phone/generic_calls.asm
+++ b/engine/phone/generic_calls.asm
@@ -1261,4 +1261,3 @@
DadString: db "Dad@"
SisterString: db "Sister@"
BrotherString: db "Brother@"
-
--- a/engine/pokegear/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
@@ -2946,4 +2946,3 @@
xor a
ld [hBGMapMode], a
ret
-
--- a/engine/pokemon/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -959,4 +959,3 @@
.string
db "@"
-
--- a/home/movement.asm
+++ b/home/movement.asm
@@ -190,4 +190,3 @@
ld l, a
ld [hl], " "
ret
-
--- a/mobile/mobile_5b.asm
+++ b/mobile/mobile_5b.asm
@@ -779,4 +779,3 @@
RGB 18, 05, 02
RGB 27, 11, 12
RGB 07, 07, 07
-