summaryrefslogtreecommitdiff
path: root/asm/berry_blender.s
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2017-02-03 16:44:06 -0800
committerYamaArashi <shadow962@live.com>2017-02-03 16:44:06 -0800
commite2b834d21d96332c5bcf788b390a09e285c7a5cb (patch)
tree03034791bdc8e08ccbeeec1bce4777305c46e486 /asm/berry_blender.s
parentae1f731e60360437044c724675627c56bf404f25 (diff)
begin decompiling main.s
Diffstat (limited to 'asm/berry_blender.s')
-rw-r--r--asm/berry_blender.s14
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/berry_blender.s b/asm/berry_blender.s
index c3711015c..16c04e024 100644
--- a/asm/berry_blender.s
+++ b/asm/berry_blender.s
@@ -3657,7 +3657,7 @@ _0808175A:
ldrb r0, [r0, 0x13]
cmp r0, 0x2
bne _080817A8
- ldr r2, =gUnknown_030022C0
+ ldr r2, =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -3672,7 +3672,7 @@ _0808175A:
b _080817BA
.pool
_080817A8:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -3758,7 +3758,7 @@ _0808185A:
ldrb r0, [r0]
cmp r0, 0
beq _0808187E
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x80
lsls r0, 2
@@ -5367,7 +5367,7 @@ _08082558:
ldr r0, [r1]
adds r0, 0x1
str r0, [r1]
- ldr r1, =gUnknown_03002700
+ ldr r1, =gSoftResetDisabled
movs r0, 0x1
strb r0, [r1]
b _0808263C
@@ -5456,7 +5456,7 @@ _0808261A:
str r0, [r1]
cmp r0, 0x5
ble _0808263C
- ldr r1, =gUnknown_03002700
+ ldr r1, =gSoftResetDisabled
movs r0, 0
strb r0, [r1]
movs r0, 0x1
@@ -7540,7 +7540,7 @@ _0808361A:
b _08083898
.pool
_08083790:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -8296,7 +8296,7 @@ _08083DC8:
strb r0, [r2]
b _08083E12
_08083DE2:
- ldr r0, =gUnknown_030022C0
+ ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1