summaryrefslogtreecommitdiff
path: root/engine/events_2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/events_2.asm')
-rw-r--r--engine/events_2.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/events_2.asm b/engine/events_2.asm
index 44189d7bd..494d796a3 100644
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -95,10 +95,10 @@ CheckFacingTileEvent:: ; 97c5f
; 97cc0
-RockSmashEncounter:: ; 97cc0
-; Rock Smash encounter
+RandomEncounter:: ; 97cc0
+; Random encounter
- call Function968c7
+ call CheckWildEncounterCooldown
jr c, .nope
call CanUseSweetScent
jr nc, .nope
@@ -120,8 +120,8 @@ RockSmashEncounter:: ; 97cc0
ret
.ok
- ld a, BANK(RockSmashBattleScript)
- ld hl, RockSmashBattleScript
+ ld a, BANK(WildBattleScript)
+ ld hl, WildBattleScript
jr .done
.ok_bug_contest
@@ -135,7 +135,7 @@ RockSmashEncounter:: ; 97cc0
ret
; 97cf9
-RockSmashBattleScript: ; 97cf9
+WildBattleScript: ; 97cf9
battlecheck
startbattle
returnafterbattle