summaryrefslogtreecommitdiff
path: root/engine/specials.asm
diff options
context:
space:
mode:
authorsurskitty <surskitty@gmail.com>2017-12-03 16:23:33 -0500
committersurskitty <surskitty@gmail.com>2017-12-03 16:23:33 -0500
commitd059358d929e6ef691e6c2c96ea4c9e44120fc9b (patch)
tree45463092114948a39e07c7f397a6dbbd3c8c1db1 /engine/specials.asm
parent15015e48779386ae01fe3b3a07a0b776f9933f60 (diff)
parent7a2a20528136b9a2452a313cd50c46a45f9a5cb0 (diff)
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/specials.asm')
-rw-r--r--engine/specials.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/specials.asm b/engine/specials.asm
index 2d9b6f998..2548cf076 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -138,7 +138,7 @@ SpecialsPointers:: ; c029
add_special Function11b879
add_special Function11b920
add_special Function11b93b
- add_special Function1700b0
+ add_special BattleTowerRoomMenu
add_special Function1700ba
add_special Function170114
add_special BattleTowerBattle
@@ -161,7 +161,7 @@ SpecialsPointers:: ; c029
add_special Special_Menu_ChallengeExplanationCancel
add_special Function17d2b6
add_special Function17d2ce
- add_special Function17f53d
+ add_special BattleTowerMobileError
add_special AskMobileOrCable
add_special SpecialHoOhChamber
add_special Function102142