diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-11-14 16:41:53 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 16:41:53 -0600 |
| commit | 118bf4f4b115ad6840427b00ba6a5ea0732574c8 (patch) | |
| tree | 82a810a25c289b7679da5599d754d8175dc3f5fb /asm/battle_setup.s | |
| parent | 72b57b342eaf6e4a3ea77fae8b40e4ab11c64ae2 (diff) | |
| parent | 6e2b1d4315cd2bcc5fd68c216810038818c37e5b (diff) | |
Merge pull request #108 from DizzyEggg/decompile_starter_choose
Decompile starter choose
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 |