diff options
| author | yenatch <yenatch@gmail.com> | 2015-10-13 19:23:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-10-13 19:23:12 -0400 |
| commit | d5f94e9ee5a2f5ec8fb26c29d74c02531fc79c5a (patch) | |
| tree | 003a0d9a296095020d110e3cdc6b2127a3e20e38 /engine/events_2.asm | |
| parent | 7176eff7aafda5378305a593c459d158ac27601f (diff) | |
| parent | d338a092c5a54d73e3e0a186569cc3b84e61c4ae (diff) | |
Merge pull request #320 from PikalaxALT/master
More labels, including fns responsible for partymon generation
Diffstat (limited to 'engine/events_2.asm')
| -rw-r--r-- | engine/events_2.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/events_2.asm b/engine/events_2.asm index 5a8ce7c2c..96ebfb515 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 |