summaryrefslogtreecommitdiff
path: root/asm/reset_rtc_screen.s
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-10-09 21:40:05 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-10-09 21:40:05 +0200
commiteb59f15799d0b730bb5d792fb142174ade0ad891 (patch)
tree4a40bff70a4999b06b654297ee83d6de4e62979e /asm/reset_rtc_screen.s
parent7fb4a54e3997a3a77309c819fbde671fe2b2b104 (diff)
parent08a5efbd8144d2cb1f4b8da62ba484ffcc9a1f93 (diff)
mergin and chill
Diffstat (limited to 'asm/reset_rtc_screen.s')
-rw-r--r--asm/reset_rtc_screen.s4
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/reset_rtc_screen.s b/asm/reset_rtc_screen.s
index ac2c1181c..1f5ef83d8 100644
--- a/asm/reset_rtc_screen.s
+++ b/asm/reset_rtc_screen.s
@@ -291,7 +291,7 @@ sub_809EB04: @ 809EB04
lsrs r5, 24
ldr r0, =gUnknown_085104C4
bl LoadSpritePalette
- ldr r0, =gUnknown_085104F0
+ ldr r0, =gSpriteTemplate_85104F0
mov r8, r0
movs r1, 0x35
movs r2, 0x44
@@ -655,7 +655,7 @@ sub_809EDE8: @ 809EDE8
lsls r0, r4, 1
adds r0, r4
lsls r0, 2
- ldr r1, =gUnknown_0851041C
+ ldr r1, =gUnknown_08510420 - 0x4
adds r2, r0, r1
ldr r1, =gMain
ldrh r3, [r1, 0x2E]