diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-06 18:06:24 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-06 18:06:24 -0400 |
| commit | 736b89ae3d4ffb335ef9e073556bc630c5541b70 (patch) | |
| tree | e97d50e764c52c012092aecb2d80266442677a79 /asm/event_data.s | |
| parent | 5620b0ed1a330e38c0d4cdbbfea2c5ce75053925 (diff) | |
| parent | fb9b695f9a366f662b5262f440d77c770b131d0d (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'asm/event_data.s')
| -rw-r--r-- | asm/event_data.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/event_data.s b/asm/event_data.s index e219a7ed9..4c7c7c828 100644 --- a/asm/event_data.s +++ b/asm/event_data.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_806E0D0 -sub_806E0D0: @ 806E0D0 + thumb_func_start InitEventData +InitEventData: @ 806E0D0 push {r4,lr} ldr r4, _0806E108 @ =gSaveBlock1Ptr ldr r0, [r4] @@ -35,7 +35,7 @@ sub_806E0D0: @ 806E0D0 .align 2, 0 _0806E108: .4byte gSaveBlock1Ptr _0806E10C: .4byte gUnknown_20370E0 - thumb_func_end sub_806E0D0 + thumb_func_end InitEventData thumb_func_start sub_806E110 sub_806E110: @ 806E110 |