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/pokedex_screen.s | |
| parent | 2177f1f40b4dda2091ac3be3522c1bc4f6690e88 (diff) | |
| parent | 2b2dfa7e49a0d28983a4e516ca44aee8cb7c66bb (diff) | |
Merge pull request #160 from jiangzhengwenjz/party_menu
party_menu
Diffstat (limited to 'asm/pokedex_screen.s')
| -rw-r--r-- | asm/pokedex_screen.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s index 8320c5809..9c57cff88 100644 --- a/asm/pokedex_screen.s +++ b/asm/pokedex_screen.s @@ -428,13 +428,13 @@ sub_8102858: @ 8102858 lsls r1, 7 movs r0, 0 bl SetGpuRegBits - ldr r0, _08102878 @ =CB2_ReturnToStartMenu + ldr r0, _08102878 @ =CB2_ReturnToFieldWithOpenMenu bl SetMainCallback2 _08102874: pop {r0} bx r0 .align 2, 0 -_08102878: .4byte CB2_ReturnToStartMenu +_08102878: .4byte CB2_ReturnToFieldWithOpenMenu thumb_func_end sub_8102858 thumb_func_start sub_810287C |