summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asm/mevent_8145654.s77
-rw-r--r--src/mevent_8145654.c20
2 files changed, 20 insertions, 77 deletions
diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s
index b5e5dc019..8e3357763 100644
--- a/asm/mevent_8145654.s
+++ b/asm/mevent_8145654.s
@@ -5,83 +5,6 @@
.text
- thumb_func_start sub_81467EC
-sub_81467EC: @ 81467EC
- push {r4,r5,lr}
- ldr r4, =gUnknown_203F3CC
- ldr r2, [r4]
- movs r5, 0xE0
- lsls r5, 1
- adds r0, r2, r5
- ldrb r1, [r0]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- bne _08146826
- ldr r0, =0x000001c1
- adds r1, r2, r0
- ldrb r0, [r1]
- cmp r0, 0xFF
- beq _08146826
- bl RemoveScrollIndicatorArrowPair
- ldr r0, [r4]
- ldr r2, =0x000001c1
- adds r1, r0, r2
- movs r0, 0xFF
- strb r0, [r1]
- ldr r1, [r4]
- adds r1, r5
- ldrb r0, [r1]
- movs r2, 0x1
- orrs r0, r2
- strb r0, [r1]
-_08146826:
- pop {r4,r5}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_81467EC
-
- thumb_func_start sub_8146834
-sub_8146834: @ 8146834
- push {r4,lr}
- ldr r4, =gUnknown_203F3CC
- ldr r2, [r4]
- movs r1, 0xE0
- lsls r1, 1
- adds r0, r2, r1
- ldrb r1, [r0]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- beq _08146874
- movs r3, 0xE5
- lsls r3, 2
- adds r0, r2, r3
- movs r3, 0xE3
- lsls r3, 1
- adds r1, r2, r3
- bl AddScrollIndicatorArrowPair
- ldr r1, [r4]
- ldr r2, =0x000001c1
- adds r1, r2
- strb r0, [r1]
- ldr r1, [r4]
- movs r3, 0xE0
- lsls r3, 1
- adds r1, r3
- ldrb r2, [r1]
- movs r0, 0x2
- negs r0, r0
- ands r0, r2
- strb r0, [r1]
-_08146874:
- pop {r4}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8146834
-
thumb_func_start sub_8146884
sub_8146884: @ 8146884
push {r4-r6,lr}
diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c
index 5161d5380..04fac680e 100644
--- a/src/mevent_8145654.c
+++ b/src/mevent_8145654.c
@@ -638,3 +638,23 @@ s32 sub_8146604(bool32 flag)
++gUnknown_203F3CC->unk_01C0_1;
return 0;
}
+
+void sub_81467EC(void)
+{
+ if (!gUnknown_203F3CC->unk_01C0_0 && gUnknown_203F3CC->unk_01C1 != 0xFF)
+ {
+ RemoveScrollIndicatorArrowPair(gUnknown_203F3CC->unk_01C1);
+ gUnknown_203F3CC->unk_01C1 = 0xFF;
+ gUnknown_203F3CC->unk_01C0_0 = TRUE;
+ }
+}
+
+
+void sub_8146834(void)
+{
+ if (gUnknown_203F3CC->unk_01C0_0)
+ {
+ gUnknown_203F3CC->unk_01C1 = AddScrollIndicatorArrowPair(&gUnknown_203F3CC->unk_0394, &gUnknown_203F3CC->unk_01C6);
+ gUnknown_203F3CC->unk_01C0_0 = FALSE;
+ }
+} \ No newline at end of file