diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-03-04 23:32:12 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-03-04 23:32:12 -0600 |
| commit | d12fd5c5ce574dd920a968794591afe7d42659fb (patch) | |
| tree | 95a469d0243864473d13cd19082827cc89fe1a69 /asm/starter_choose.s | |
| parent | 56f5e8bdabdc9cb18f65eccc4de66b2932489db1 (diff) | |
| parent | 83ae14e2b9e2af7ce3eb01383fe3466357ac30b1 (diff) | |
Merge remote-tracking branch 'refs/remotes/pret/master'
Diffstat (limited to 'asm/starter_choose.s')
| -rw-r--r-- | asm/starter_choose.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/starter_choose.s b/asm/starter_choose.s index 1c23ea3aa..3bc828190 100644 --- a/asm/starter_choose.s +++ b/asm/starter_choose.s @@ -362,7 +362,7 @@ sub_813425C: @ 813425C adds r6, r0, r2 ldrh r7, [r6, 0x8] ldrb r4, [r6, 0x8] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r3, [r1, 0x2E] movs r0, 0x1 ands r0, r3 @@ -564,7 +564,7 @@ _08134426: ldrh r0, [r0, 0x8] strh r0, [r2] bl dp13_810BB8C - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] bl SetMainCallback2 b _0813449A @@ -898,7 +898,7 @@ sub_81346DC: @ 81346DC movs r1, 0x30 ldrsh r0, [r4, r1] movs r1, 0x8 - bl sine + bl Sin strh r0, [r4, 0x26] ldrh r0, [r4, 0x30] lsls r0, 24 |