diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-08 18:05:47 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-08 18:05:47 +0100 |
commit | 61408456e82d3818fb8a7ab0e6b389c43ea47492 (patch) | |
tree | 7caedfabd13d12e53486893bfaa2fffd6676d0c2 /asm/battle_setup.s | |
parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) |
starter choose file is decompiled
Diffstat (limited to 'asm/battle_setup.s')
-rw-r--r-- | asm/battle_setup.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 5c7196579..2e3f5ab92 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -1328,7 +1328,7 @@ _080B1120: thumb_func_start sub_80B1138 sub_80B1138: @ 80B1138 push {lr} - ldr r0, =set_256color_bg_bg0 + ldr r0, =CB2_ChooseStarter bl SetMainCallback2 ldr r1, =gMain ldr r0, =sub_80B1158 @@ -1348,7 +1348,7 @@ sub_80B1158: @ 80B1158 ldrh r1, [r2] strh r1, [r0] ldrh r0, [r2] - bl sub_8133EDC + bl GetStarterPokemon lsls r0, 16 lsrs r0, 16 movs r1, 0 |