summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2021-02-05 09:45:11 -0800
committerGitHub <noreply@github.com>2021-02-05 09:45:11 -0800
commit4be482e587ab113df0b8eb52ab0feb37738f6261 (patch)
tree46d37152fd9e8273ff96f00be099202c62e7808f
parent4264d53eb681ea8a3b1a71426ac485078b80a8ca (diff)
parent8f4dcbcb590b1c6fb883bb767276c05d78be0d4c (diff)
Merge pull request #799 from FredrIQ/typo_fix
Battle Tower: fix typo in constant (PROGESS -> PROGRESS)
-rw-r--r--constants/battle_tower_constants.asm2
-rw-r--r--engine/events/battle_tower/battle_tower.asm2
2 files changed, 2 insertions, 2 deletions
diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm
index b230bb1ab..419d364c7 100644
--- a/constants/battle_tower_constants.asm
+++ b/constants/battle_tower_constants.asm
@@ -56,6 +56,6 @@ MOBILE_EVENT_OBJECT_GS_BALL EQU $b
const_def
const BATTLETOWER_NO_CHALLENGE
const BATTLETOWER_SAVED_AND_LEFT
- const BATTLETOWER_CHALLENGE_IN_PROGESS
+ const BATTLETOWER_CHALLENGE_IN_PROGRESS
const BATTLETOWER_WON_CHALLENGE
const BATTLETOWER_RECEIVED_REWARD
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm
index 0de1d1a28..5d1ca4844 100644
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -565,7 +565,7 @@ CopyBTTrainer_FromBT_OT_TowBT_OTTemp:
ld a, BANK(sBattleTowerChallengeState)
call OpenSRAM
- ld a, BATTLETOWER_CHALLENGE_IN_PROGESS
+ ld a, BATTLETOWER_CHALLENGE_IN_PROGRESS
ld [sBattleTowerChallengeState], a
ld hl, sNrOfBeatenBattleTowerTrainers
inc [hl]