diff options
| -rw-r--r-- | asm/pokenav.s | 22 | ||||
| -rw-r--r-- | src/pokenav_main.c | 12 |
2 files changed, 12 insertions, 22 deletions
diff --git a/asm/pokenav.s b/asm/pokenav.s index dbe58020a..7a878c373 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,28 +5,6 @@ .text - thumb_func_start sub_81C7334 -sub_81C7334: @ 81C7334 - push {r4,lr} - movs r4, 0 -_081C7338: - adds r0, r4, 0 - bl sub_81C7650 - adds r4, 0x1 - cmp r4, 0x12 - ble _081C7338 - ldr r4, =gUnknown_0203CF40 - ldr r0, [r4] - bl Free - movs r0, 0 - str r0, [r4] - bl InitKeys - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C7334 - thumb_func_start sub_81C7360 sub_81C7360: @ 81C7360 push {r4,r5,lr} diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 0712b95d5..f1973ea15 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -23,6 +23,7 @@ extern void sub_81C7400(void); extern void sub_81C7418(void); extern void sub_81C7170(u8 a0); extern void sub_81C71E4(u8 a0); +extern void sub_81C7650(s32 a0); void sub_81C72BC(void); @@ -171,4 +172,15 @@ void sub_81C72BC() { SetVBlankCallback(sub_81C7418); } } +} + +void sub_81C7334() { + s32 i; + for (i = 0; i < 19; i++) { + sub_81C7650(i); + } + + Free(gUnknown_0203CF40); + gUnknown_0203CF40 = NULL; + InitKeys(); }
\ No newline at end of file |