diff options
| -rw-r--r-- | asm/pokenav.s | 37 | ||||
| -rw-r--r-- | src/pokenav_before.c | 17 |
2 files changed, 15 insertions, 39 deletions
diff --git a/asm/pokenav.s b/asm/pokenav.s index ebc317bc7..ddfc8b830 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -6,43 +6,6 @@ .text - thumb_func_start sub_80EE9C0 -sub_80EE9C0: @ 80EE9C0 - push {r4-r6,lr} - adds r4, r0, 0 - adds r5, r1, 0 - adds r6, r2, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - lsls r6, 24 - lsrs r6, 24 - bl sub_80F1E84 - ldr r1, _080EE9FC @ =0x02000000 - ldr r2, _080EEA00 @ =0x00006e14 - adds r0, r1, r2 - movs r2, 0 - strb r4, [r0] - ldr r3, _080EEA04 @ =0x00006e15 - adds r0, r1, r3 - strb r5, [r0] - adds r3, 0x1 - adds r0, r1, r3 - strb r2, [r0] - ldr r0, _080EEA08 @ =0x00006e17 - adds r1, r0 - strb r6, [r1] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080EE9FC: .4byte 0x02000000 -_080EEA00: .4byte 0x00006e14 -_080EEA04: .4byte 0x00006e15 -_080EEA08: .4byte 0x00006e17 - thumb_func_end sub_80EE9C0 - thumb_func_start sub_80EEA0C sub_80EEA0C: @ 80EEA0C push {r4,lr} diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 1d5015940..e782adf7c 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -33,7 +33,12 @@ struct UnknownPokenav0 { /* 0x6df0 */ s8 var6df0; /* 0x6df1 */ u8 fill6df1[0xB]; /* 0x6dfc */ u8 var6dfc; - /* 0x6dfd */ u8 fill6dfd[0x93]; + /* 0x6dfd */ u8 fill6dfd[0x17]; + /* 0x6e14 */ u8 var6e14; + /* 0x6e15 */ u8 var6e15; + /* 0x6e16 */ u8 var6e16; + /* 0x6e17 */ u8 var6e17; + /* 0x6e18 */ u8 fill6e18[0x78]; /* 0x6e90 */ u8 var6e90; /* 0x6e91 */ u8 fill6e91[0x4]; /* 0x6e95 */ u8 var6e95; @@ -414,7 +419,7 @@ void sub_80EC00C() { } void sub_80F2D04(u32); -void sub_80EE9C0(u32, u8, u32); +void sub_80EE9C0(u8, u8, u8); bool8 sub_80EEA0C(); void sub_80EC210() { @@ -2427,3 +2432,11 @@ void sub_80EE96C() { sub_805469C(); } } + +void sub_80EE9C0(u8 param1, u8 param2, u8 param3) { + sub_80F1E84(); + ewram0.var6e14 = param1; + ewram0.var6e15 = param2; + ewram0.var6e16 = 0; + ewram0.var6e17 = param3; +} |