diff --git a/engine/battle/core.asm b/engine/battle/core.asm index e1f96641e..9c9c95bf9 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6852,6 +6852,11 @@ CalculateModifiedStat: ret ApplyBadgeStatBoosts: +IF DEF (_HARD) + ; Hard Mode does not have Badges boost your stats + ret +ELSE + ; Normal Mode keeps this in place ld a, [wLinkState] cp LINK_STATE_BATTLING ret z ; return if link battle @@ -6903,6 +6908,7 @@ ApplyBadgeStatBoosts: ld a, 999 % $100 ld [hld], a ret +ENDC LoadHudAndHpBarAndStatusTilePatterns: call LoadHpBarAndStatusTilePatterns diff --git a/text/maps/CinnabarGym.asm b/text/maps/CinnabarGym.asm index 4d7aad6b7..cd69b4bb4 100755 --- a/text/maps/CinnabarGym.asm +++ b/text/maps/CinnabarGym.asm @@ -31,11 +31,17 @@ _BlaineFireBlastText:: _BlaineBadgeText:: text "Hah!" +IF DEF(_HARD) + text "The VolcanoBadge" + line "puts you another" + cont "step closer to" + cont "Victory Road!" +ELSE para "The VolcanoBadge" line "heightens the" cont "Special abilities" cont "of your #mon!" - +ENDC para "Here, you can" line "have this too!" done diff --git a/text/maps/FuchsiaGym_2.asm b/text/maps/FuchsiaGym_2.asm index 2c28f1e82..109fd50ed 100755 --- a/text/maps/FuchsiaGym_2.asm +++ b/text/maps/FuchsiaGym_2.asm @@ -10,6 +10,13 @@ _KogaExplainToxicText:: done _FuchsiaGymText9:: +IF DEF(_HARD) + text "Now that you have" + line "the SoulBadge," + cont "it also lets you" + cont "Surf outside of" + cont "battle!" +ELSE text "Now that you have" line "the SoulBadge," cont "the Defense of" @@ -19,7 +26,7 @@ _FuchsiaGymText9:: para "It also lets you" line "Surf outside of" cont "battle!" - +ENDC para "Ah! Take this" line "too!" done diff --git a/text/maps/PewterGym_2.asm b/text/maps/PewterGym_2.asm index 8faba433b..2f83d520b 100755 --- a/text/maps/PewterGym_2.asm +++ b/text/maps/PewterGym_2.asm @@ -68,12 +68,16 @@ _PewterGymText_5c4c1:: para "That's an official" line "#mon League" cont "Badge!" - +IF DEF(_HARD) + para "It's your first" + line "step on the road" + cont "to the League!" +ELSE para "Its bearer's" line "#mon become" cont "more powerful!" - - para "The technique" +ENDC + para "Also, the move" line "Flash can now be" cont "used anytime!" prompt diff --git a/text/maps/VermilionGym_2.asm b/text/maps/VermilionGym_2.asm index 8e7139f2a..a94bb4f0c 100755 --- a/text/maps/VermilionGym_2.asm +++ b/text/maps/VermilionGym_2.asm @@ -11,6 +11,12 @@ _VermilionGymText_5cb72:: done _VermilionGymText_5cb77:: +IF DEF(_HARD) + text "The ThunderBadge" + line "lets your #mon" + cont "use Fly any time," + cont "kid!" +ELSE text "The ThunderBadge" line "cranks up your" cont "#mon's Speed!" @@ -18,6 +24,7 @@ _VermilionGymText_5cb77:: para "It also lets your" line "#mon Fly any-" cont "time, kid!" +ENDC para "You're special," line "kid! Take this!"