diff options
| -rw-r--r-- | asm/pokenav.s | 21 | ||||
| -rw-r--r-- | src/pokenav_before.c | 10 |
2 files changed, 10 insertions, 21 deletions
diff --git a/asm/pokenav.s b/asm/pokenav.s index a636c3d69..37375ad0d 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -6,27 +6,6 @@ .text - thumb_func_start sub_80EED9C -sub_80EED9C: @ 80EED9C - push {lr} - ldr r2, _080EEDB8 @ =gUnknown_03000744 - ldr r0, _080EEDBC @ =0x02000000 - movs r1, 0xC0 - lsls r1, 2 - adds r0, r1 - ldr r1, [r0] - str r1, [r2] - ldr r1, _080EEDC0 @ =sub_80EEDC4 - str r1, [r0] - bl _call_via_r1 - pop {r0} - bx r0 - .align 2, 0 -_080EEDB8: .4byte gUnknown_03000744 -_080EEDBC: .4byte 0x02000000 -_080EEDC0: .4byte sub_80EEDC4 - thumb_func_end sub_80EED9C - thumb_func_start sub_80EEDC4 sub_80EEDC4: @ 80EEDC4 push {lr} diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 83ed3e0b5..c80aaa237 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -2856,3 +2856,13 @@ void sub_80EED2C(u8 param1) { break; } } + +void (*gUnknown_03000744)(void); +void _call_via_r1(); +void sub_80EEDC4(); + +void sub_80EED9C() { + gUnknown_03000744 = ewram0.var300; + ewram0.var300 = &sub_80EEDC4; + _call_via_r1(); +} |