diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-21 17:10:02 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-21 17:10:02 +0200 |
| commit | 092462d83dcbbacf21c03252d760732617d45da5 (patch) | |
| tree | 19e8620b02fccaa9f5c4b9693d2103761e438959 /asm/link_rfu.s | |
| parent | e396bcdb7229645f4a4893b8e3c1d364a0e7930c (diff) | |
| parent | 26ca9acfa5858f1caaa67f2a5e0509a6b47ee644 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/link_rfu.s')
| -rw-r--r-- | asm/link_rfu.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/link_rfu.s b/asm/link_rfu.s index 3f8d3735c..b6c34eeef 100644 --- a/asm/link_rfu.s +++ b/asm/link_rfu.s @@ -3575,7 +3575,7 @@ _080FEEEC: b _080FEF08 _080FEEF4: ldr r2, _080FEF18 @ =gSaveBlock1Ptr - ldr r0, _080FEF1C @ =gUnknown_20370C2 + ldr r0, _080FEF1C @ =gSpecialVar_0x8005 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -3594,7 +3594,7 @@ _080FEF12: bx r0 .align 2, 0 _080FEF18: .4byte gSaveBlock1Ptr -_080FEF1C: .4byte gUnknown_20370C2 +_080FEF1C: .4byte gSpecialVar_0x8005 _080FEF20: .4byte 0x00002cd0 _080FEF24: .4byte gUnknown_20370C0 _080FEF28: .4byte sub_80568C4 @@ -7766,7 +7766,7 @@ _08100DAC: str r0, [sp, 0x8] adds r0, r5, 0 adds r2, r6, 0 - bl PrintTextOnWindow + bl AddTextPrinterParameterized add sp, 0xC pop {r4-r6} pop {r0} |