From fa8348a62aada7ef295cc8cfce9cdfeb9391e1a4 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 15 Jan 2023 02:03:09 +0000 Subject: [PATCH] MOD59_021D8914 --- arm9/modules/59/asm/mod59_021D74E0_asm.s | 11 +---------- arm9/modules/59/include/mod59_021D74E0.h | 1 + arm9/modules/59/src/mod59_021D74E0_src.c | 7 ++++++- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index 6da81be45..c93371aec 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -22,16 +22,7 @@ .extern MOD59_021D8624 .extern MOD59_021D8634 .extern MOD59_021D86BC - - thumb_func_start MOD59_021D8914 -MOD59_021D8914: ; 0x021D8914 - ldr r3, _021D891C ; =FUN_020178BC - mov r0, #2 - mov r1, #1 - bx r3 - .align 2, 0 -_021D891C: .word SetBgPriority - thumb_func_end MOD59_021D8914 + .extern MOD59_021D8914 thumb_func_start MOD59_021D8920 MOD59_021D8920: ; 0x021D8920 diff --git a/arm9/modules/59/include/mod59_021D74E0.h b/arm9/modules/59/include/mod59_021D74E0.h index 4510d9864..3bafa65a8 100644 --- a/arm9/modules/59/include/mod59_021D74E0.h +++ b/arm9/modules/59/include/mod59_021D74E0.h @@ -131,5 +131,6 @@ void MOD59_DisableBlend(void); void MOD59_021D8624(MOD59_OverlayData *data); BOOL MOD59_021D8634(MOD59_OverlayData *data); BOOL MOD59_021D86BC(MOD59_OverlayData *data, u32 *param1); +void MOD59_021D8914(void); #endif //POKEDIAMOND_MOD59_021D74E0_H diff --git a/arm9/modules/59/src/mod59_021D74E0_src.c b/arm9/modules/59/src/mod59_021D74E0_src.c index e72c319b3..007c0704d 100644 --- a/arm9/modules/59/src/mod59_021D74E0_src.c +++ b/arm9/modules/59/src/mod59_021D74E0_src.c @@ -1538,4 +1538,9 @@ _021D890A: pop {r3, r4, r5, r6, r7, pc} nop } -#endif \ No newline at end of file +#endif + +THUMB_FUNC void MOD59_021D8914(void) +{ + SetBgPriority(GF_BG_LYR_MAIN_2, 1); +}