diff options
| author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-03-15 21:54:01 +0100 |
|---|---|---|
| committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-03-16 13:55:35 +0100 |
| commit | 31439d0c354fb6db2adea8cf695e4f9fde4368fd (patch) | |
| tree | d2622f24f78accb3c89897020162313af89aacdb | |
| parent | f3adb8eda9602941397cac94e76caf8b51781d0b (diff) | |
decomp MOD52_021D7528
| -rw-r--r-- | arm9/global.inc | 3 | ||||
| -rw-r--r-- | arm9/modules/52/asm/module_52.s | 16 | ||||
| -rw-r--r-- | arm9/modules/52/src/module_52_c.c | 7 |
3 files changed, 9 insertions, 17 deletions
diff --git a/arm9/global.inc b/arm9/global.inc index 83a492ba..aee60c7b 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -8521,4 +8521,5 @@ .extern CountAlivePokemon .extern MOD52_021D74E0 .extern MOD52_021D74F8 -.extern MOD52_021D750C
\ No newline at end of file +.extern MOD52_021D750C +.extern MOD52_021D7528
\ No newline at end of file diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s index 5c456f0c..82abcf6e 100644 --- a/arm9/modules/52/asm/module_52.s +++ b/arm9/modules/52/asm/module_52.s @@ -3,22 +3,6 @@ .section .text .balign 4, 0 - - - thumb_func_start MOD52_021D7528 -MOD52_021D7528: ; 0x021D7528 - push {r3, lr} - mov r2, #2 - mov r0, #3 - mov r1, #0x4d - lsl r2, r2, #0x10 - bl FUN_0201681C - bl InitializeMainRNG - mov r0, #1 - pop {r3, pc} - .align 2, 0 - thumb_func_end MOD52_021D7528 - thumb_func_start MOD52_021D7540 MOD52_021D7540: ; 0x021D7540 push {r4, lr} diff --git a/arm9/modules/52/src/module_52_c.c b/arm9/modules/52/src/module_52_c.c index bc059dff..4e73a078 100644 --- a/arm9/modules/52/src/module_52_c.c +++ b/arm9/modules/52/src/module_52_c.c @@ -28,4 +28,11 @@ THUMB_FUNC int MOD52_021D750C() { RegisterMainOverlay(-1, &UNK_020FD144); return 1; +} + +THUMB_FUNC int MOD52_021D7528() { + FUN_0201681C(3, 0x4d, 2 << 16); + InitializeMainRNG(); + + return 1; }
\ No newline at end of file |