diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-04-02 18:29:51 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-04-02 18:29:51 -0500 |
| commit | 181baf9fe561e893023f71a5793a8b1ac6d644d6 (patch) | |
| tree | 8ac4906fc6f70fb000fc3fbcd73a325dc6114d20 /asm/mevent_server.s | |
| parent | 1241700b204b9f450221299c6e837c0f522f60b2 (diff) | |
| parent | d8c9f1b30fb92289e7aa4d44dfcf1b2120bea8d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into misc_docs
# Conflicts:
# src/field_weather_effect.c
Diffstat (limited to 'asm/mevent_server.s')
| -rwxr-xr-x | asm/mevent_server.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/mevent_server.s b/asm/mevent_server.s index c89867474..8c76e2d0d 100755 --- a/asm/mevent_server.s +++ b/asm/mevent_server.s @@ -39,8 +39,8 @@ mevent_srv_new_wcard: @ 801D0A0 .pool thumb_func_end mevent_srv_new_wcard - thumb_func_start sub_801D0C4 -sub_801D0C4: @ 801D0C4 + thumb_func_start mevent_srv_common_do_exec +mevent_srv_common_do_exec: @ 801D0C4 push {r4-r6,lr} adds r6, r0, 0 ldr r4, =gUnknown_02022C7C @@ -69,7 +69,7 @@ _0801D0F8: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_801D0C4 + thumb_func_end mevent_srv_common_do_exec thumb_func_start mevent_srv_init_common mevent_srv_init_common: @ 801D100 @@ -493,7 +493,7 @@ _0801D422: b _0801D464 _0801D43C: ldr r4, [r5, 0x1C] - bl sub_801B00C + bl sav1_get_mevent_buffer_0 adds r1, r0, 0 movs r2, 0xDE lsls r2, 1 |