diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 14:24:47 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 14:24:47 -0500 |
| commit | 5a74c0e91354276a92ea01152b76a85462d30d4e (patch) | |
| tree | 8bca428892e561dcca4c75be7a91fed1406d4890 /asm/link.s | |
| parent | 3c63063831f7d26874dc49143e2d19f6acc1be18 (diff) | |
| parent | 19d2d73c7064375e6cef64ced734052170d4361b (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'asm/link.s')
| -rw-r--r-- | asm/link.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/link.s b/asm/link.s index 690c8cf8f..9ee94412d 100644 --- a/asm/link.s +++ b/asm/link.s @@ -1232,7 +1232,7 @@ _08009E8C: _08009EA8: ldr r0, =gUnknown_03003110 strh r2, [r0] - ldr r1, =gUnknown_0203CE7C + ldr r1, =gScriptItemId ldrh r1, [r1] b _08009F04 .pool @@ -21076,7 +21076,7 @@ sub_8014210: @ 8014210 str r0, [r1, 0x8] ldr r0, =gBattleTypeFlags str r6, [r0] - bl sub_806E64C + bl PlayBattleBGM pop {r4-r6} pop {r0} bx r0 @@ -31367,7 +31367,7 @@ sub_8019AD8: @ 8019AD8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02037350 + ldr r1, =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -31413,7 +31413,7 @@ sub_8019B3C: @ 8019B3C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02037350 + ldr r1, =gMapObjects adds r4, r0, r1 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished @@ -45605,7 +45605,7 @@ _08020D74: sub_8020D8C: @ 8020D8C push {r4,lr} sub sp, 0xC - ldr r1, =gUnknown_0203CE7C + ldr r1, =gScriptItemId ldrh r0, [r1] subs r0, 0x85 lsls r0, 16 @@ -45626,7 +45626,7 @@ _08020DB0: ldrb r0, [r2, 0x8] lsls r0, 5 adds r0, r2, r0 - ldr r1, =gUnknown_0203CE7C + ldr r1, =gScriptItemId ldrh r1, [r1] subs r1, 0x85 adds r0, 0xA4 |