diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-25 09:15:34 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-25 09:15:34 -0500 |
| commit | 10aa908f56599c155ecf70ccee6b07eea07fb643 (patch) | |
| tree | 0bec37a7083498f43dcf1124ceb0ce13c74ca420 /asm/fldeff_flash.s | |
| parent | 0e3d574276db954994b0be24c61813b0b0e28c0c (diff) | |
| parent | 46773995020da0bc7984933f7f407ff30394596d (diff) | |
Merge branch 'dism_more_data' of github.com:PikalaxALT/pokefirered into dism_more_data
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 |