Clean many labels of scripts of all gyms

This commit is contained in:
Yoann Fievez 2021-05-17 12:48:26 +02:00
parent 7b2eb6b252
commit a448ac897d
18 changed files with 547 additions and 543 deletions

View file

@ -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