summaryrefslogtreecommitdiff
path: root/data-de
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-01-01 13:59:39 -0600
committerMarcus Huderle <huderlem@gmail.com>2018-01-01 17:06:17 -0600
commit7158286302493c6fe34068926b351292af2cb6a9 (patch)
tree6a5266856de549509179018871d850d6ed6c649d /data-de
parent56e2fe07d4e46ab73320d33a457802da48f9729a (diff)
Label a bunch more specials
Diffstat (limited to 'data-de')
-rw-r--r--data-de/event_scripts.s8
-rw-r--r--data-de/field_move_scripts.inc2
2 files changed, 5 insertions, 5 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 7f3b89081..e786a6ab1 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -490,7 +490,7 @@ EventScript_15F4A1:
goto_if_eq EventScript_15F4E0
compare RESULT, 2
goto_if_eq EventScript_15F503
- special sub_80BC224
+ special BufferSecretBaseOwnerName
msgbox UnknownString_81A3958, 5
compare RESULT, 0
goto_if_eq EventScript_15F452
@@ -2544,7 +2544,7 @@ MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678
RustboroCity_DevonCorp_2F_EventScript_1A0678:: @ 81A0678
SlateportCity_House1_EventScript_1A0678:: @ 81A0678
fadescreen 1
- special sub_80BF9F8
+ special ChangePokemonNickname
waitstate
return
@@ -3813,7 +3813,7 @@ EventScript_1A2E45:
compare RESULT, 0
goto_if_eq EventScript_1A2F3A
fadescreen 1
- special sub_80BC50C
+ special MoveSecretBase
closemessage
fadescreen 0
msgbox UnknownString_81A3CC9, 5
@@ -4317,7 +4317,7 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A
special sub_80BCE1C
setvar VAR_SPECIAL_4, 1
setvar VAR_SPECIAL_5, 0
- special sub_813556C
+ special StartSpecialBattle
waitstate
special ScrSpecial_HealPlayerParty
release
diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc
index 2b86dc4dc..edecb0312 100644
--- a/data-de/field_move_scripts.inc
+++ b/data-de/field_move_scripts.inc
@@ -90,7 +90,7 @@ DoRockSmashMovement: @ 81B0F0C
applymovement LAST_TALKED, RockSmashMovement
waitmovement 0
removeobject LAST_TALKED
- specialvar RESULT, sub_810F5BC
+ specialvar RESULT, TryUpdateRusturfTunnelState
compare RESULT, 1
goto_if_eq DoRockSmashMovement_Done
special ScrSpecial_RockSmashWildEncounter