summaryrefslogtreecommitdiff
path: root/scripts/VermilionGym.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2021-05-31 15:42:41 -0500
committerGitHub <noreply@github.com>2021-05-31 15:42:41 -0500
commitc5bb400e085880793b41a3cb0e55976090ab5ad0 (patch)
tree56841e633c8018cb25492c1e3f0b39aa93caa517 /scripts/VermilionGym.asm
parentf9ae7b1240863b4311d24944ae7ec3c1d9b24507 (diff)
parenta448ac897d5480bba4b40b4be8a4bfe5a5c31be7 (diff)
Merge pull request #323 from KqesaR/master
Clean many labels of scripts of gyms
Diffstat (limited to 'scripts/VermilionGym.asm')
-rw-r--r--scripts/VermilionGym.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/scripts/VermilionGym.asm b/scripts/VermilionGym.asm
index 3673f9b9..3bbb8743 100644
--- a/scripts/VermilionGym.asm
+++ b/scripts/VermilionGym.asm
@@ -94,8 +94,8 @@ VermilionGym_TextPointers:
dw VermilionGymTrainerText1
dw VermilionGymTrainerText2
dw VermilionGymTrainerText3
- dw VermilionGymFanText
- dw LTSurgeThunderbadgeInfoText
+ dw VermilionGymGuideText
+ dw LTSurgeThunderBadgeInfoText
dw ReceivedTM24Text
dw TM24NoRoomText
@@ -128,8 +128,8 @@ LTSurgeText:
ld hl, wd72d
set 6, [hl]
set 7, [hl]
- ld hl, ReceivedThunderbadgeText
- ld de, ReceivedThunderbadgeText
+ ld hl, ReceivedThunderBadgeText
+ ld de, ReceivedThunderBadgeText
call SaveEndBattleTextPointers
ldh a, [hSpriteIndex]
ld [wSpriteIndex], a
@@ -153,8 +153,8 @@ LTSurgePostBattleAdviceText:
text_far _LTSurgePostBattleAdviceText
text_end
-LTSurgeThunderbadgeInfoText:
- text_far _LTSurgeThunderbadgeInfoText
+LTSurgeThunderBadgeInfoText:
+ text_far _LTSurgeThunderBadgeInfoText
text_end
ReceivedTM24Text:
@@ -167,8 +167,8 @@ TM24NoRoomText:
text_far _TM24NoRoomText
text_end
-ReceivedThunderbadgeText:
- text_far _ReceivedThunderbadgeText
+ReceivedThunderBadgeText:
+ text_far _ReceivedThunderBadgeText
text_end
VermilionGymTrainerText1:
@@ -225,24 +225,24 @@ VermilionGymAfterBattleText3:
text_far _VermilionGymAfterBattleText3
text_end
-VermilionGymFanText:
+VermilionGymGuideText:
text_asm
ld a, [wBeatGymFlags]
bit BIT_THUNDERBADGE, a
jr nz, .afterBeat
- ld hl, VermilionGymFanPreBattleText
+ ld hl, VermilionGymGuidePreBattleText
call PrintText
jr .done
.afterBeat
- ld hl, VermilionGymFanPostBattleText
+ ld hl, VermilionGymGuidePostBattleText
call PrintText
.done
jp TextScriptEnd
-VermilionGymFanPreBattleText:
- text_far _VermilionGymFanPreBattleText
+VermilionGymGuidePreBattleText:
+ text_far _VermilionGymGuidePreBattleText
text_end
-VermilionGymFanPostBattleText:
- text_far _VermilionGymFanPostBattleText
+VermilionGymGuidePostBattleText:
+ text_far _VermilionGymGuidePostBattleText
text_end