Name a lot of text labels according to our conventions
This commit is contained in:
@@ -4546,21 +4546,21 @@ BattleCommand_StatUpMessage:
|
||||
jp BattleTextbox
|
||||
|
||||
.stat
|
||||
text_far UnknownText_0x1c0cc6
|
||||
text_far Text_BattleEffectActivate
|
||||
text_asm
|
||||
ld hl, .up
|
||||
ld hl, .BattleStatWentUpText
|
||||
ld a, [wLoweredStat]
|
||||
and $f0
|
||||
ret z
|
||||
ld hl, .wayup
|
||||
ld hl, .BattleStatWentWayUpText
|
||||
ret
|
||||
|
||||
.wayup
|
||||
text_far UnknownText_0x1c0cd0
|
||||
.BattleStatWentWayUpText:
|
||||
text_far _BattleStatWentWayUpText
|
||||
text_end
|
||||
|
||||
.up
|
||||
text_far UnknownText_0x1c0ce0
|
||||
.BattleStatWentUpText:
|
||||
text_far _BattleStatWentUpText
|
||||
text_end
|
||||
|
||||
BattleCommand_StatDownMessage:
|
||||
@@ -4576,21 +4576,21 @@ BattleCommand_StatDownMessage:
|
||||
jp BattleTextbox
|
||||
|
||||
.stat
|
||||
text_far UnknownText_0x1c0ceb
|
||||
text_far Text_BattleFoeEffectActivate
|
||||
text_asm
|
||||
ld hl, .fell
|
||||
ld hl, .BattleStatFellText
|
||||
ld a, [wLoweredStat]
|
||||
and $f0
|
||||
ret z
|
||||
ld hl, .sharplyfell
|
||||
ld hl, .BattleStatSharplyFellText
|
||||
ret
|
||||
|
||||
.sharplyfell
|
||||
text_far UnknownText_0x1c0cf5
|
||||
.BattleStatSharplyFellText:
|
||||
text_far _BattleStatSharplyFellText
|
||||
text_end
|
||||
|
||||
.fell
|
||||
text_far UnknownText_0x1c0d06
|
||||
.BattleStatFellText:
|
||||
text_far _BattleStatFellText
|
||||
text_end
|
||||
|
||||
TryLowerStat:
|
||||
@@ -5641,64 +5641,58 @@ BattleCommand_Charge:
|
||||
jp EndMoveEffect
|
||||
|
||||
.UsedText:
|
||||
text_far UnknownText_0x1c0d0e ; "<USER>"
|
||||
text_far Text_BattleUser ; "<USER>"
|
||||
text_asm
|
||||
ld a, BATTLE_VARS_MOVE_ANIM
|
||||
call GetBattleVar
|
||||
cp RAZOR_WIND
|
||||
ld hl, .RazorWind
|
||||
ld hl, .BattleMadeWhirlwindText
|
||||
jr z, .done
|
||||
|
||||
cp SOLARBEAM
|
||||
ld hl, .Solarbeam
|
||||
ld hl, .BattleTookSunlightText
|
||||
jr z, .done
|
||||
|
||||
cp SKULL_BASH
|
||||
ld hl, .SkullBash
|
||||
ld hl, .BattleLoweredHeadText
|
||||
jr z, .done
|
||||
|
||||
cp SKY_ATTACK
|
||||
ld hl, .SkyAttack
|
||||
ld hl, .BattleGlowingText
|
||||
jr z, .done
|
||||
|
||||
cp FLY
|
||||
ld hl, .Fly
|
||||
ld hl, .BattleFlewText
|
||||
jr z, .done
|
||||
|
||||
cp DIG
|
||||
ld hl, .Dig
|
||||
ld hl, .BattleDugText
|
||||
|
||||
.done
|
||||
ret
|
||||
|
||||
.RazorWind:
|
||||
; 'made a whirlwind!'
|
||||
text_far UnknownText_0x1c0d12
|
||||
.BattleMadeWhirlwindText:
|
||||
text_far _BattleMadeWhirlwindText
|
||||
text_end
|
||||
|
||||
.Solarbeam:
|
||||
; 'took in sunlight!'
|
||||
text_far UnknownText_0x1c0d26
|
||||
.BattleTookSunlightText:
|
||||
text_far _BattleTookSunlightText
|
||||
text_end
|
||||
|
||||
.SkullBash:
|
||||
; 'lowered its head!'
|
||||
text_far UnknownText_0x1c0d3a
|
||||
.BattleLoweredHeadText:
|
||||
text_far _BattleLoweredHeadText
|
||||
text_end
|
||||
|
||||
.SkyAttack:
|
||||
; 'is glowing!'
|
||||
text_far UnknownText_0x1c0d4e
|
||||
.BattleGlowingText:
|
||||
text_far _BattleGlowingText
|
||||
text_end
|
||||
|
||||
.Fly:
|
||||
; 'flew up high!'
|
||||
text_far UnknownText_0x1c0d5c
|
||||
.BattleFlewText:
|
||||
text_far _BattleFlewText
|
||||
text_end
|
||||
|
||||
.Dig:
|
||||
; 'dug a hole!'
|
||||
text_far UnknownText_0x1c0d6c
|
||||
.BattleDugText:
|
||||
text_far _BattleDugText
|
||||
text_end
|
||||
|
||||
BattleCommand3c:
|
||||
|
Reference in New Issue
Block a user