diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-25 09:22:50 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-25 09:22:50 +0800 |
| commit | 2f87855072fb4fdca6ce22d60bfb1b7fdc000134 (patch) | |
| tree | a3a6d928910ed170904b5b367084afb2d1fb8b3d /asm/pokemon_storage_system.s | |
| parent | 6ca932e5e98fcd69c281d798406e53aee5a4d816 (diff) | |
| parent | 7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'asm/pokemon_storage_system.s')
| -rw-r--r-- | asm/pokemon_storage_system.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 71e0e2e0e..ec0e9e53c 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1751,8 +1751,8 @@ _0808C69C: _0808C6A4: .4byte gPaletteFade thumb_func_end c3_0808C39C - thumb_func_start sub_808C6A8 -sub_808C6A8: @ 808C6A8 + thumb_func_start ShowPokemonStorageSystem +ShowPokemonStorageSystem: @ 808C6A8 push {lr} ldr r0, _0808C6D0 @ =c3_0808C39C movs r1, 0x50 @@ -1773,7 +1773,7 @@ sub_808C6A8: @ 808C6A8 .align 2, 0 _0808C6D0: .4byte c3_0808C39C _0808C6D4: .4byte gTasks - thumb_func_end sub_808C6A8 + thumb_func_end ShowPokemonStorageSystem thumb_func_start mapldr_0808C6D8 mapldr_0808C6D8: @ 808C6D8 |