Skip to content

Commit

Permalink
fix mistake and rename beginBattle and afterVictory
Browse files Browse the repository at this point in the history
  • Loading branch information
kqesar committed May 14, 2021
1 parent 6d29f5c commit 10991f1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions scripts/CeladonGym.asm
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ CeladonGym_TextPointers:
dw CeladonGymTrainerText5
dw CeladonGymTrainerText6
dw CeladonGymTrainerText7
dw ErikaRainvowbadgeInfoText
dw ErikaRainbowbadgeInfoText
dw ReceivedTM21Text
dw TM21NoRoomText

Expand All @@ -104,17 +104,17 @@ CeladonGymTrainerHeader6:
ErikaText:
text_asm
CheckEvent EVENT_BEAT_ERIKA
jr z, .beginBattle
jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM21
jr nz, .afterVictory
jr nz, .afterBeat
call z, CeladonGymReceiveTM21
call DisableWaitingAfterTextDisplay
jr .done
.afterVictory
.afterBeat
ld hl, ErikaPostBattleAdviceText
call PrintText
jr .done
.beginBattle
.beforeBeat
ld hl, ErikaPreBattleText
call PrintText
ld hl, wd72d
Expand Down Expand Up @@ -147,8 +147,8 @@ ErikaPostBattleAdviceText:
text_far _ErikaPostBattleAdviceText
text_end

ErikaRainvowbadgeInfoText:
text_far _ErikaRainvowbadgeInfoText
ErikaRainbowbadgeInfoText:
text_far _ErikaRainbowbadgeInfoText
text_end

ReceivedTM21Text:
Expand Down
2 changes: 1 addition & 1 deletion text/CeladonGym.asm
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ _ErikaPostBattleAdviceText::
cont "unattractive."
done

_ErikaRainvowbadgeInfoText::
_ErikaRainbowbadgeInfoText::
text "The RAINBOWBADGE"
line "will make #MON"
cont "up to L50 obey."
Expand Down

0 comments on commit 10991f1

Please sign in to comment.