diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-23 09:05:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 09:05:26 -0400 |
| commit | 6e36c229200e083ca005cbc448e99210d111f3b2 (patch) | |
| tree | aec86bd0f081a7ff207f68cba33315991b629be1 /asm/wild_encounter.s | |
| parent | 4bc284ff2c7d0ec3f24df8d94a77860fbaed588b (diff) | |
| parent | 3efd2e1210b4149628197446d063df0fc11281ab (diff) | |
Merge pull request #130 from PikalaxALT/trainers
Trainers, event flags, mystery_event_msg, map object gfx
Diffstat (limited to 'asm/wild_encounter.s')
| -rw-r--r-- | asm/wild_encounter.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/wild_encounter.s b/asm/wild_encounter.s index b7ac02d0a..dedcfa761 100644 --- a/asm/wild_encounter.s +++ b/asm/wild_encounter.s @@ -966,8 +966,8 @@ _08082E48: bx r1 thumb_func_end sub_8082CBC - thumb_func_start sub_8082E54 -sub_8082E54: @ 8082E54 + thumb_func_start Special_RockSmashEncounter +Special_RockSmashEncounter: @ 8082E54 push {r4,lr} bl sub_8082934 lsls r0, 16 @@ -1018,7 +1018,7 @@ _08082EB6: bx r0 .align 2, 0 _08082EBC: .4byte gSpecialVar_Result - thumb_func_end sub_8082E54 + thumb_func_end Special_RockSmashEncounter thumb_func_start SweetScentWildEncounter SweetScentWildEncounter: @ 8082EC0 |