diff options
| author | Raúl Peñacoba <raul.mikaop.zelda@gmail.com> | 2017-08-25 10:51:18 +0200 |
|---|---|---|
| committer | Raúl Peñacoba <raul.mikaop.zelda@gmail.com> | 2017-08-25 10:51:18 +0200 |
| commit | 70a73a6ac8adbbf036b5560957db7de56ca77adb (patch) | |
| tree | 1a397479a11597de898688ca5c857ca7b2219f89 | |
| parent | 81f5319df003163215c3fbd4716051048abe53f4 (diff) | |
sub_80EED2C
| -rw-r--r-- | asm/pokenav.s | 61 | ||||
| -rw-r--r-- | src/pokenav_before.c | 23 |
2 files changed, 22 insertions, 62 deletions
diff --git a/asm/pokenav.s b/asm/pokenav.s index dbfce8a0a..a636c3d69 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -6,67 +6,6 @@ .text - thumb_func_start sub_80EED2C -sub_80EED2C: @ 80EED2C - push {lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x5 - bhi _080EED98 - lsls r0, 2 - ldr r1, _080EED40 @ =_080EED44 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080EED40: .4byte _080EED44 - .align 2, 0 -_080EED44: - .4byte _080EED5C - .4byte _080EED66 - .4byte _080EED7E - .4byte _080EED74 - .4byte _080EED74 - .4byte _080EED8C -_080EED5C: - movs r1, 0x80 - lsls r1, 19 - movs r2, 0xFA - lsls r2, 5 - b _080EED94 -_080EED66: - movs r1, 0x80 - lsls r1, 19 - ldr r2, _080EED70 @ =0x00001741 - b _080EED94 - .align 2, 0 -_080EED70: .4byte 0x00001741 -_080EED74: - movs r1, 0x80 - lsls r1, 19 - movs r2, 0xFA - lsls r2, 5 - b _080EED94 -_080EED7E: - movs r1, 0x80 - lsls r1, 19 - ldr r2, _080EED88 @ =0x00007b40 - b _080EED94 - .align 2, 0 -_080EED88: .4byte 0x00007b40 -_080EED8C: - movs r1, 0x80 - lsls r1, 19 - movs r2, 0xFD - lsls r2, 6 -_080EED94: - adds r0, r2, 0 - strh r0, [r1] -_080EED98: - pop {r0} - bx r0 - thumb_func_end sub_80EED2C - thumb_func_start sub_80EED9C sub_80EED9C: @ 80EED9C push {lr} diff --git a/src/pokenav_before.c b/src/pokenav_before.c index b181068e8..83ed3e0b5 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -275,7 +275,7 @@ void sub_80EF248(); bool8 sub_80EF284(); void sub_80F1B8C(); bool8 sub_80F1BC8(u32 unk); -void sub_80EED2C(); +void sub_80EED2C(u8); void sub_80F1DF0(); bool8 sub_80F1E50(); void sub_80EF428(); @@ -2835,3 +2835,24 @@ void sub_80EED0C() { void sub_80EED1C() { REG_DISPCNT = 0x92 << 5; } + +void sub_80EED2C(u8 param1) { + switch (param1) { + case 0: + REG_DISPCNT = 0xFA << 5; + break; + case 1: + REG_DISPCNT = 0x1741; + break; + case 3: + case 4: + REG_DISPCNT = 0xFA << 5; + break; + case 2: + REG_DISPCNT = 0x7b40; + break; + case 5: + REG_DISPCNT = 0xFD << 6; + break; + } +} |