summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asm/pokenav.s10
-rw-r--r--src/pokenav_main.c6
2 files changed, 6 insertions, 10 deletions
diff --git a/asm/pokenav.s b/asm/pokenav.s
index c0fb9c48d..2d7981f10 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -5,16 +5,6 @@
.text
- thumb_func_start sub_81C7418
-sub_81C7418: @ 81C7418
- push {lr}
- bl TransferPlttBuffer
- bl LoadOam
- bl ProcessSpriteCopyRequests
- pop {r0}
- bx r0
- thumb_func_end sub_81C7418
-
thumb_func_start sub_81C742C
sub_81C742C: @ 81C742C
push {r4-r7,lr}
diff --git a/src/pokenav_main.c b/src/pokenav_main.c
index b39ab7bb1..bd57d6e05 100644
--- a/src/pokenav_main.c
+++ b/src/pokenav_main.c
@@ -238,4 +238,10 @@ void sub_81C7400() {
AnimateSprites();
BuildOamBuffer();
UpdatePaletteFade();
+}
+
+void sub_81C7418() {
+ TransferPlttBuffer();
+ LoadOam();
+ ProcessSpriteCopyRequests();
} \ No newline at end of file