diff options
| author | Raúl Peñacoba <raul.mikaop.zelda@gmail.com> | 2017-08-25 11:02:41 +0200 |
|---|---|---|
| committer | Raúl Peñacoba <raul.mikaop.zelda@gmail.com> | 2017-08-25 11:02:41 +0200 |
| commit | 3809edbf86b4709b66bf73db76b788adfd88d251 (patch) | |
| tree | 95d553aa3381ed4cb780babc565f7702873a8c7f | |
| parent | 68d07ec4dfd6842e67760c4da6261a62c1456084 (diff) | |
sub_80EEDC4
| -rw-r--r-- | asm/pokenav.s | 21 | ||||
| -rw-r--r-- | src/pokenav_before.c | 6 |
2 files changed, 6 insertions, 21 deletions
diff --git a/asm/pokenav.s b/asm/pokenav.s index 37375ad0d..b8eda471c 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -6,27 +6,6 @@ .text - thumb_func_start sub_80EEDC4 -sub_80EEDC4: @ 80EEDC4 - push {lr} - bl sub_8055870 - cmp r0, 0x1 - beq _080EEDDC - ldr r0, _080EEDE0 @ =0x02000000 - movs r1, 0xC0 - lsls r1, 2 - adds r0, r1 - ldr r1, _080EEDE4 @ =gUnknown_03000744 - ldr r1, [r1] - str r1, [r0] -_080EEDDC: - pop {r0} - bx r0 - .align 2, 0 -_080EEDE0: .4byte 0x02000000 -_080EEDE4: .4byte gUnknown_03000744 - thumb_func_end sub_80EEDC4 - thumb_func_start sub_80EEDE8 sub_80EEDE8: @ 80EEDE8 ldr r0, _080EEE04 @ =REG_BG0HOFS diff --git a/src/pokenav_before.c b/src/pokenav_before.c index c80aaa237..28be782de 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -2866,3 +2866,9 @@ void sub_80EED9C() { ewram0.var300 = &sub_80EEDC4; _call_via_r1(); } + +void sub_80EEDC4() { + if (sub_8055870() != 0x1) { + ewram0.var300 = gUnknown_03000744; + } +} |