diff options
Diffstat (limited to 'scripts/PewterGym.asm')
| -rw-r--r-- | scripts/PewterGym.asm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm index 798285d3..016535c2 100644 --- a/scripts/PewterGym.asm +++ b/scripts/PewterGym.asm @@ -14,7 +14,8 @@ PewterGym_Script: .LoadNames: ld hl, .CityName ld de, .LeaderName - jp LoadGymLeaderAndCityName + call LoadGymLeaderAndCityName + ret .CityName: db "PEWTER CITY@" @@ -153,7 +154,7 @@ TM34NoRoomText: ReceivedBoulderBadgeText: text_far _ReceivedBoulderBadgeText - sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded + sound_get_item_1 text_far _BrockBoulerBadgeInfoText ; Text to tell that the flash technique can be used text_end @@ -186,6 +187,9 @@ PewterGymGuideText: ld a, [wCurrentMenuItem] and a jr nz, .PewterGymGuideBeginAdviceText + ld a, [wd472] + bit 7, a + jp nz, .asm_5c3fa ld hl, PewterGymGuideBeginAdviceText call PrintText jr .PewterGymGuideAdviceText @@ -201,6 +205,10 @@ PewterGymGuideText: call PrintText .done jp TextScriptEnd +.asm_5c3fa + ld hl, PewterGymText_5c41c + call PrintText + jp TextScriptEnd PewterGymGuidePreAdviceText: text_far _PewterGymGuidePreAdviceText @@ -221,3 +229,7 @@ PewterGymText_5c524: PewterGymGuidePostBattleText: text_far _PewterGymGuidePostBattleText text_end + +PewterGymText_5c41c: + text_far _PewterGymGuyText + text_end |