diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/link.s | 4 | ||||
| -rw-r--r-- | asm/overworld.s | 4 | ||||
| -rw-r--r-- | asm/string_util.s | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/asm/link.s b/asm/link.s index b573e430b..378b1a2e8 100644 --- a/asm/link.s +++ b/asm/link.s @@ -200,7 +200,7 @@ sub_80095BC: @ 80095BC str r1, [r0, 0x4] movs r1, 0 str r1, [r0, 0x8] - ldr r0, _0800963C @ =gUnknown_8231E20 + ldr r0, _0800963C @ =gBGControlRegOffsets adds r6, r0 ldrb r0, [r6] lsls r4, 8 @@ -219,7 +219,7 @@ _0800962C: .4byte 0x040000d4 _08009630: .4byte gUnknown_8232598 _08009634: .4byte 0x80001000 _08009638: .4byte gUnknown_3003F70 -_0800963C: .4byte gUnknown_8231E20 +_0800963C: .4byte gBGControlRegOffsets thumb_func_end sub_80095BC thumb_func_start sub_8009640 diff --git a/asm/overworld.s b/asm/overworld.s index b9af2bf77..7bc1a8760 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -4547,7 +4547,7 @@ sub_8056F1C: @ 8056F1C movs r0, 0x46 adds r1, r4, 0 bl SetGpuReg - ldr r0, _08057018 @ =gUnknown_8231E10 + ldr r0, _08057018 @ =gBLDCNTTarget2BGFlags ldrh r1, [r0, 0x2] ldrh r2, [r0, 0x4] orrs r1, r2 @@ -4618,7 +4618,7 @@ sub_8056F1C: @ 8056F1C _0805700C: .4byte 0x00001f1f _08057010: .4byte 0x00000101 _08057014: .4byte 0x0000ffff -_08057018: .4byte gUnknown_8231E10 +_08057018: .4byte gBLDCNTTarget2BGFlags _0805701C: .4byte 0x0000070d _08057020: .4byte 0x00007060 thumb_func_end sub_8056F1C diff --git a/asm/string_util.s b/asm/string_util.s index abc11cfb4..b02b01518 100644 --- a/asm/string_util.s +++ b/asm/string_util.s @@ -612,10 +612,10 @@ _0800910A: thumb_func_start sub_8009118 sub_8009118: @ 8009118 - ldr r0, _0800911C @ =gUnknown_2022100 + ldr r0, _0800911C @ =gUnknownStringVar bx lr .align 2, 0 -_0800911C: .4byte gUnknown_2022100 +_0800911C: .4byte gUnknownStringVar thumb_func_end sub_8009118 thumb_func_start sub_8009120 |