diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-24 08:44:21 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-24 08:44:21 -0500 |
commit | bb8c712f75e6ed5ec66b2ee94c6da1157693c284 (patch) | |
tree | dc8d135873f6a7cc8ca1fad8bb5d1a7a84e4b0f7 /asm/fldeff_flash.s | |
parent | 2177f1f40b4dda2091ac3be3522c1bc4f6690e88 (diff) | |
parent | 2b2dfa7e49a0d28983a4e516ca44aee8cb7c66bb (diff) |
Merge pull request #160 from jiangzhengwenjz/party_menu
party_menu
Diffstat (limited to 'asm/fldeff_flash.s')
-rw-r--r-- | asm/fldeff_flash.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s index 51e55de63..23f86d6b7 100644 --- a/asm/fldeff_flash.s +++ b/asm/fldeff_flash.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80C9B2C -sub_80C9B2C: @ 80C9B2C + thumb_func_start SetUpFieldMove_Flash +SetUpFieldMove_Flash: @ 80C9B2C push {lr} ldr r0, _080C9B54 @ =gMapHeader ldrb r0, [r0, 0x15] @@ -37,7 +37,7 @@ _080C9B6C: _080C9B6E: pop {r1} bx r1 - thumb_func_end sub_80C9B2C + thumb_func_end SetUpFieldMove_Flash thumb_func_start sub_80C9B74 sub_80C9B74: @ 80C9B74 |