diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-31 21:05:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 21:05:45 -0400 |
| commit | 193c12d401ac5b1016d77e60c36e8d9960af9d82 (patch) | |
| tree | 83da7d0c549974e392aa3eb897fb038e889fbd20 /data/event_scripts.s | |
| parent | c6cd74fed25cbb6e2fa0296960fbcda795311b06 (diff) | |
| parent | f0a7ee8d16f40707fbec80d7224f410ae455c071 (diff) | |
Merge pull request #137 from PikalaxALT/split_835b488
Split 835b488
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index a3943d494..eb2c8ed60 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -10397,7 +10397,7 @@ EventScript_1BE06F:: @ 81BE06F applymovement VAR_LAST_TALKED, Movement_1BE08F waitmovement 0 removeobject VAR_LAST_TALKED - special Special_RockSmashEncounter + special ScrSpecial_RockSmashWildEncounter compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1BE08D waitstate @@ -11731,7 +11731,7 @@ EventScript_81BFB5F:: @ 81BFB5F setflashradius 0 end -EventScript_1BFB65:: @ 81BFB65 +EventScript_RepelWoreOff:: @ 81BFB65 msgbox Text_1BFB6E, 3 end |