From 9bda2297e36bd4aa476326310d85ea26c9beeb7c Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Tue, 12 Feb 2019 01:39:27 -0500 Subject: [PATCH] Decompiled sub_81C72A4 --- asm/pokenav.s | 12 ------------ src/pokenav_main.c | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/asm/pokenav.s b/asm/pokenav.s index 92cde018a..64439e890 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -5,18 +5,6 @@ .text - thumb_func_start sub_81C72A4 -sub_81C72A4: @ 81C72A4 - push {lr} - ldr r0, =sub_81C72BC - bl SetMainCallback2 - movs r0, 0x1 - movs r1, 0 - bl FadeScreen - pop {r0} - bx r0 - .pool - thumb_func_end sub_81C72A4 thumb_func_start sub_81C72BC sub_81C72BC: @ 81C72BC diff --git a/src/pokenav_main.c b/src/pokenav_main.c index 437ca009f..13b6331a5 100644 --- a/src/pokenav_main.c +++ b/src/pokenav_main.c @@ -3,6 +3,7 @@ #include "task.h" #include "main.h" #include "overworld.h" +#include "field_weather.h" /* @@ -172,4 +173,26 @@ void CB2_PokeNav(void) SetMainCallback2(sub_81C7400); SetVBlankCallback(sub_81C7418); } +} + +/* + thumb_func_start sub_81C72A4 +sub_81C72A4: @ 81C72A4 + push {lr} + ldr r0, =sub_81C72BC + bl SetMainCallback2 + movs r0, 0x1 + movs r1, 0 + bl FadeScreen + pop {r0} + bx r0 + .pool + thumb_func_end sub_81C72A4 +*/ + +extern void sub_81C72BC(void); + +void sub_81C72A4() { + SetMainCallback2(sub_81C72BC); + FadeScreen(1, 0); } \ No newline at end of file