Single newline at the end of files
This commit is contained in:
Rangi
@@ -1266,4 +1266,3 @@ BattleAnimFrameData:
|
||||
.Frameset_b8:
|
||||
frame BATTLEANIMOAMSET_D7, 8
|
||||
endanim
|
||||
|
||||
|
||||
@@ -197,4 +197,3 @@ EngineFlags:
|
||||
|
||||
engine_flag wSwarmFlags, SWARMFLAGS_DUNSPARCE_SWARM_F ; $a0
|
||||
engine_flag wSwarmFlags, SWARMFLAGS_YANMA_SWARM_F
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -48,4 +48,3 @@ Ghost: db "GHOST@"
|
||||
Steel: db "STEEL@"
|
||||
Dragon: db "DRAGON@"
|
||||
Dark: db "DARK@"
|
||||
|
||||
|
||||
@@ -216,4 +216,3 @@ CheckAnyOtherAliveMons:
|
||||
ld a, b
|
||||
and a
|
||||
ret
|
||||
|
||||
|
||||
@@ -32,4 +32,3 @@ BattleCommand_BellyDrum:
|
||||
.failed
|
||||
call AnimateFailedMove
|
||||
jp PrintButItFailed
|
||||
|
||||
|
||||
@@ -98,4 +98,3 @@ BattleCommand_UnleashEnergy:
|
||||
ld [wKickCounter], a
|
||||
call AnimateCurrentMove
|
||||
jp EndMoveEffect
|
||||
|
||||
|
||||
@@ -94,4 +94,3 @@ BattleCommand_Conversion:
|
||||
call AnimateCurrentMove
|
||||
ld hl, TransformedTypeText
|
||||
jp StdBattleTextBox
|
||||
|
||||
|
||||
@@ -62,4 +62,3 @@ BattleCommand_Conversion2:
|
||||
|
||||
.failed
|
||||
jp FailMove
|
||||
|
||||
|
||||
@@ -56,4 +56,3 @@ BattleCommand_Counter:
|
||||
xor a
|
||||
ld [wAttackMissed], a
|
||||
ret
|
||||
|
||||
|
||||
@@ -7,4 +7,3 @@ BattleCommand_DestinyBond:
|
||||
call AnimateCurrentMove
|
||||
ld hl, DestinyBondEffectText
|
||||
jp StdBattleTextBox
|
||||
|
||||
|
||||
@@ -70,4 +70,3 @@ BattleCommand_Disable:
|
||||
|
||||
.failed
|
||||
jp FailMove
|
||||
|
||||
|
||||
@@ -118,4 +118,3 @@ BattleCommand_Encore:
|
||||
|
||||
.failed
|
||||
jp PrintDidntAffect2
|
||||
|
||||
|
||||
@@ -46,4 +46,3 @@ BattleCommand_FalseSwipe:
|
||||
.done
|
||||
and a
|
||||
ret
|
||||
|
||||
|
||||
@@ -13,4 +13,3 @@ BattleCommand_FocusEnergy:
|
||||
.already_pumped
|
||||
call AnimateFailedMove
|
||||
jp PrintButItFailed
|
||||
|
||||
|
||||
@@ -25,4 +25,3 @@ BattleCommand_FrustrationPower:
|
||||
ld d, a
|
||||
pop bc
|
||||
ret
|
||||
|
||||
|
||||
@@ -54,4 +54,3 @@ ResetFuryCutterCount:
|
||||
|
||||
pop hl
|
||||
ret
|
||||
|
||||
|
||||
@@ -79,4 +79,3 @@ BattleCommand_FutureSight:
|
||||
call AnimateFailedMove
|
||||
call PrintButItFailed
|
||||
jp EndMoveEffect
|
||||
|
||||
|
||||
@@ -32,4 +32,3 @@ BattleCommand_HealBell:
|
||||
and a
|
||||
jp z, CalcPlayerStats
|
||||
jp CalcEnemyStats
|
||||
|
||||
|
||||
@@ -6,4 +6,3 @@ BattleCommand_HiddenPower:
|
||||
ret nz
|
||||
farcall HiddenPowerDamage
|
||||
ret
|
||||
|
||||
|
||||
@@ -38,4 +38,3 @@ BattleCommand_LeechSeed:
|
||||
call AnimateFailedMove
|
||||
ld hl, EvadedText
|
||||
jp StdBattleTextBox
|
||||
|
||||
|
||||
@@ -19,4 +19,3 @@ BattleCommand_LockOn:
|
||||
.fail
|
||||
call AnimateFailedMove
|
||||
jp PrintDidntAffect
|
||||
|
||||
|
||||
@@ -48,4 +48,3 @@ BattleCommand_Mimic:
|
||||
|
||||
.fail
|
||||
jp FailMimic
|
||||
|
||||
|
||||
@@ -57,4 +57,3 @@ BattleCommand_MirrorCoat:
|
||||
xor a
|
||||
ld [wAttackMissed], a
|
||||
ret
|
||||
|
||||
|
||||
@@ -13,4 +13,3 @@ BattleCommand_Mist:
|
||||
.already_mist
|
||||
call AnimateFailedMove
|
||||
jp PrintButItFailed
|
||||
|
||||
|
||||
@@ -91,4 +91,3 @@ BattleCommand_PainSplit:
|
||||
|
||||
.ButItFailed:
|
||||
jp PrintDidntAffect2
|
||||
|
||||
|
||||
@@ -24,4 +24,3 @@ BattleCommand_PayDay:
|
||||
.done
|
||||
ld hl, CoinsScatteredText
|
||||
jp StdBattleTextBox
|
||||
|
||||
|
||||
@@ -47,4 +47,3 @@ BattleCommand_PsychUp:
|
||||
call AnimateCurrentMove
|
||||
ld hl, CopiedStatsText
|
||||
jp StdBattleTextBox
|
||||
|
||||
|
||||
@@ -22,4 +22,3 @@ BattleCommand_Pursuit:
|
||||
ld [hli], a
|
||||
ld [hl], a
|
||||
ret
|
||||
|
||||
|
||||
@@ -4,4 +4,3 @@ BattleCommand_Rage:
|
||||
call GetBattleVarAddr
|
||||
set SUBSTATUS_RAGE, [hl]
|
||||
ret
|
||||
|
||||
|
||||
@@ -7,4 +7,3 @@ BattleCommand_StartRain:
|
||||
call AnimateCurrentMove
|
||||
ld hl, DownpourText
|
||||
jp StdBattleTextBox
|
||||
|
||||
|
||||
@@ -34,4 +34,3 @@ BattleCommand_ClearHazards:
|
||||
ld [de], a
|
||||
ld hl, ReleasedByText
|
||||
jp StdBattleTextBox
|
||||
|
||||
|
||||
@@ -23,4 +23,3 @@ BattleCommand_HappinessPower:
|
||||
ld d, a
|
||||
pop bc
|
||||
ret
|
||||
|
||||
|
||||
@@ -21,4 +21,3 @@ BattleCommand_Safeguard:
|
||||
.failed
|
||||
call AnimateFailedMove
|
||||
jp PrintButItFailed
|
||||
|
||||
|
||||
@@ -27,4 +27,3 @@ BattleCommand_Selfdestruct:
|
||||
farcall DrawEnemyHUD
|
||||
call WaitBGMap
|
||||
jp RefreshBattleHuds
|
||||
|
||||
|
||||
@@ -115,4 +115,3 @@ BattleCommand_Sketch:
|
||||
.fail
|
||||
call AnimateFailedMove
|
||||
jp PrintDidntAffect
|
||||
|
||||
|
||||
@@ -141,4 +141,3 @@ BattleCommand_SleepTalk:
|
||||
ret z
|
||||
cp EFFECT_BIDE
|
||||
ret
|
||||
|
||||
|
||||
@@ -9,4 +9,3 @@ BattleCommand_Snore:
|
||||
ld [wAttackMissed], a
|
||||
call FailMove
|
||||
jp EndMoveEffect
|
||||
|
||||
|
||||
@@ -84,4 +84,3 @@ BattleCommand_Spite:
|
||||
|
||||
.failed
|
||||
jp PrintDidntAffect2
|
||||
|
||||
|
||||
@@ -2,4 +2,3 @@ BattleCommand_Splash:
|
||||
call AnimateCurrentMove
|
||||
farcall StubbedTrainerRankings_Splash
|
||||
jp PrintNothingHappened
|
||||
|
||||
|
||||
@@ -86,4 +86,3 @@ BattleCommand_Substitute:
|
||||
ld hl, TooWeakSubText
|
||||
.jp_stdbattletextbox
|
||||
jp StdBattleTextBox
|
||||
|
||||
|
||||
@@ -7,4 +7,3 @@ BattleCommand_StartSun:
|
||||
call AnimateCurrentMove
|
||||
ld hl, SunGotBrightText
|
||||
jp StdBattleTextBox
|
||||
|
||||
|
||||
@@ -87,4 +87,3 @@ BattleCommand_Teleport:
|
||||
|
||||
ld hl, FledFromBattleText
|
||||
jp StdBattleTextBox
|
||||
|
||||
|
||||
@@ -16,4 +16,3 @@ BattleCommand_ThunderAccuracy:
|
||||
; Redundant with CheckHit guranteeing hit
|
||||
ld [hl], 100 percent
|
||||
ret
|
||||
|
||||
|
||||
@@ -137,4 +137,3 @@ BattleCommand_Transform:
|
||||
call nz, LoadAnim
|
||||
ld hl, TransformedText
|
||||
jp StdBattleTextBox
|
||||
|
||||
|
||||
@@ -32,4 +32,3 @@ BattleCommand_KickCounter:
|
||||
ld hl, wKickCounter
|
||||
inc [hl]
|
||||
ret
|
||||
|
||||
|
||||
@@ -2904,4 +2904,3 @@ BattleBGEffects_Cosine:
|
||||
callfar BattleAnim_Cosine_e
|
||||
ld a, e
|
||||
ret
|
||||
|
||||
|
||||
@@ -302,4 +302,3 @@ _ExecuteBGEffects:
|
||||
_QueueBGEffect:
|
||||
callfar QueueBGEffect
|
||||
ret
|
||||
|
||||
|
||||
@@ -120,4 +120,3 @@ LoadBattleAnimObj:
|
||||
call DecompressRequest2bpp
|
||||
pop bc
|
||||
ret
|
||||
|
||||
|
||||
@@ -310,4 +310,3 @@ CheckCaughtCelebi:
|
||||
|
||||
.done
|
||||
ret
|
||||
|
||||
|
||||
@@ -602,4 +602,3 @@ HOF_AnimatePlayerPic:
|
||||
|
||||
.PlayTime:
|
||||
db "PLAY TIME@"
|
||||
|
||||
|
||||
@@ -1384,4 +1384,3 @@ MailComposition_TryAddLastCharacter:
|
||||
jp NamingScreen_LoadNextCharacter
|
||||
|
||||
INCLUDE "data/text/mail_input_chars.asm"
|
||||
|
||||
|
||||
@@ -1261,4 +1261,3 @@ MomString: db "Mom@"
|
||||
DadString: db "Dad@"
|
||||
SisterString: db "Sister@"
|
||||
BrotherString: db "Brother@"
|
||||
|
||||
|
||||
@@ -2946,4 +2946,3 @@ Unreferenced_Function92311:
|
||||
xor a
|
||||
ld [hBGMapMode], a
|
||||
ret
|
||||
|
||||
|
||||
@@ -959,4 +959,3 @@ Unreferenced_DayCareMonPrintEmptyString:
|
||||
|
||||
.string
|
||||
db "@"
|
||||
|
||||
|
||||
@@ -190,4 +190,3 @@ HideCursor::
|
||||
ld l, a
|
||||
ld [hl], " "
|
||||
ret
|
||||
|
||||
|
||||
@@ -779,4 +779,3 @@ Unknown_16cfb9:
|
||||
RGB 18, 05, 02
|
||||
RGB 27, 11, 12
|
||||
RGB 07, 07, 07
|
||||
|
||||
|
||||
Reference in New Issue
Block a user