diff options
| author | YamaArashi <shadow962@live.com> | 2016-12-18 10:32:14 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-12-18 10:32:14 -0800 |
| commit | bfe868c4fbd3e9bd216be3d05b9f4a573cf66c42 (patch) | |
| tree | 0df35e567d6b88fd0ec3a87ba1f59d086421b06f | |
| parent | b3187c45ff041df8b8404548ef8f3f221a752939 (diff) | |
decompile unref_sub_8083CF0
| -rw-r--r-- | asm/cable_club.s | 45 | ||||
| -rw-r--r-- | src/mori_debug_menu.c | 17 |
2 files changed, 17 insertions, 45 deletions
diff --git a/asm/cable_club.s b/asm/cable_club.s index 2a45d386b..0518e721c 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -2066,49 +2066,4 @@ _08083CE8: .4byte gTasks _08083CEC: .4byte sub_8083CA4 thumb_func_end unref_sub_8083CC8 - thumb_func_start unref_sub_8083CF0 -unref_sub_8083CF0: @ 8083CF0 - push {r4-r7,lr} - ldr r0, _08083D38 @ =0x04000128 - ldr r4, [r0] - lsls r4, 26 - lsrs r4, 30 - ldr r0, _08083D3C @ =gUnknown_03004DA0 - movs r1, 0xFF - strb r1, [r0] - ldr r1, _08083D40 @ =gUnknown_0839B24A - bl StringAppend - movs r5, 0 - ldr r0, _08083D44 @ =word_3002910 - movs r6, 0x1 - eors r4, r6 - lsls r4, 1 - adds r7, r4, r0 - movs r4, 0 -_08083D14: - ldrh r0, [r7] - asrs r0, r5 - ands r0, r6 - cmp r0, 0 - beq _08083D28 - ldr r1, _08083D48 @ =gUnknown_0839B22C - adds r1, r4, r1 - ldr r0, _08083D3C @ =gUnknown_03004DA0 - bl StringAppend -_08083D28: - adds r4, 0x3 - adds r5, 0x1 - cmp r5, 0x9 - ble _08083D14 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08083D38: .4byte 0x04000128 -_08083D3C: .4byte gUnknown_03004DA0 -_08083D40: .4byte gUnknown_0839B24A -_08083D44: .4byte word_3002910 -_08083D48: .4byte gUnknown_0839B22C - thumb_func_end unref_sub_8083CF0 - .align 2, 0 @ Don't pad with nop. diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c index fbb796ca4..44f8542a5 100644 --- a/src/mori_debug_menu.c +++ b/src/mori_debug_menu.c @@ -5,9 +5,15 @@ #include "menu.h" #include "main.h" #include "string_util.h" +#include "link.h" +#define SIO_MULTI_CNT ((struct SioMultiCnt *)REG_ADDR_SIOCNT) + +extern u8 gUnknown_03004DA0[]; extern u8 (*gCallback_03004AE8)(void); +extern u8 gUnknown_0839B22C[][3]; +extern u8 gUnknown_0839B24A[]; extern u8 gUnknown_0839B24D[]; extern u8 gUnknown_0839B255[]; extern u8 gUnknown_0839B257[]; @@ -16,6 +22,17 @@ extern const struct MenuAction gMoriDebugMenuActions[]; extern u8 gSpeciesNames[][11]; +void unref_sub_8083CF0(void) +{ + int i; + int id = SIO_MULTI_CNT->id; + gUnknown_03004DA0[0] = EOS; + StringAppend(gUnknown_03004DA0, gUnknown_0839B24A); + for (i = 0; i < 10; i++) + if ((word_3002910[id ^ 1] >> i) & 1) + StringAppend(gUnknown_03004DA0, gUnknown_0839B22C[i]); +} + bool8 sub_8083D4C(void) { if ( gMain.newKeys & A_BUTTON ) |