diff options
Diffstat (limited to 'arm9/modules/11/asm/module_11.s')
-rw-r--r-- | arm9/modules/11/asm/module_11.s | 204 |
1 files changed, 102 insertions, 102 deletions
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s index 719fca68..9fdabf6b 100644 --- a/arm9/modules/11/asm/module_11.s +++ b/arm9/modules/11/asm/module_11.s @@ -907,7 +907,7 @@ _0222DC42: mov r0, #5 lsl r0, r0, #6 mov r1, #5 - bl FUN_020219F4 + bl String_ctor str r0, [r4, #0x18] ldr r0, [r4, #0x28] mov r1, #0 @@ -3591,12 +3591,12 @@ _0222F30E: mov r0, #1 lsl r0, r0, #8 mov r1, #5 - bl FUN_020219F4 + bl String_ctor add r6, r0, #0 ldr r1, _0222F4D4 ; =0x0000039B add r0, r4, #0 add r2, r6, #0 - bl FUN_0200A8E0 + bl ReadMsgDataIntoString mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -3606,7 +3606,7 @@ _0222F30E: add r2, r6, #0 bl FUN_0201BD84 add r0, r6, #0 - bl FUN_02021A20 + bl String_dtor add r0, r4, #0 bl DestroyMsgData ldr r0, _0222F4D8 ; =MOD11_0222F0D4 @@ -8256,7 +8256,7 @@ _022316CC: bl FUN_0201BD84 add r5, r0, #0 add r0, r4, #0 - bl FUN_02021A20 + bl String_dtor b _02231778 _022316F6: cmp r7, #0x64 @@ -8277,7 +8277,7 @@ _02231708: bl NewMsgDataFromNarc add r1, r4, #0 add r7, r0, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData add r4, r0, #0 add r0, r6, #0 mov r1, #0xff @@ -8294,7 +8294,7 @@ _02231708: bl FUN_0201BD84 add r5, r0, #0 add r0, r4, #0 - bl FUN_02021A20 + bl String_dtor add r0, r7, #0 bl DestroyMsgData b _02231778 @@ -9608,14 +9608,14 @@ MOD11_022321EC: ; 0x022321EC add r5, r0, #0 add r0, r1, #0 ldrh r1, [r2, #2] - bl FUN_0200A914 + bl NewString_ReadMsgData add r4, r0, #0 ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 - bl FUN_02021A20 + bl String_dtor pop {r3, r4, r5, pc} thumb_func_start MOD11_0223220C @@ -31446,7 +31446,7 @@ _0223CF30: mov r1, #0x3b ldr r0, [sp, #0x28] lsl r1, r1, #4 - bl FUN_0200A914 + bl NewString_ReadMsgData add r6, r0, #0 b _0223CF5C _0223CF42: @@ -31454,13 +31454,13 @@ _0223CF42: bne _0223CF52 ldr r0, [sp, #0x28] ldr r1, _0223D05C ; =0x000003B1 - bl FUN_0200A914 + bl NewString_ReadMsgData add r6, r0, #0 b _0223CF5C _0223CF52: ldr r0, [sp, #0x28] ldr r1, _0223D060 ; =0x000003B2 - bl FUN_0200A914 + bl NewString_ReadMsgData add r6, r0, #0 _0223CF5C: ldr r0, [sp, #0x18] @@ -31484,9 +31484,9 @@ _0223CF5C: ldr r0, [sp, #0x24] ldr r1, [sp, #0x20] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 - bl FUN_02021A20 + bl String_dtor add r0, sp, #0x68 bl FUN_0201901C mov r0, #0 @@ -85839,12 +85839,12 @@ MOD11_022574F0: ; 0x022574F0 add r4, r0, #0 mov r0, #0x16 mov r1, #5 - bl FUN_020219F4 + bl String_ctor mov r1, #0xf1 str r0, [sp, #0x18] add r0, r7, #0 lsl r1, r1, #2 - bl FUN_0200A914 + bl NewString_ReadMsgData add r1, r5, #0 add r2, r5, #0 add r1, #0x24 @@ -85862,7 +85862,7 @@ MOD11_022574F0: ; 0x022574F0 ldr r1, [sp, #0x18] ldr r2, [sp, #0x1c] add r0, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 str r0, [sp] mov r0, #0xf @@ -85961,9 +85961,9 @@ MOD11_022574F0: ; 0x022574F0 add r0, sp, #0x24 bl FUN_02019178 ldr r0, [sp, #0x18] - bl FUN_02021A20 + bl String_dtor ldr r0, [sp, #0x1c] - bl FUN_02021A20 + bl String_dtor add sp, #0x34 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -86429,11 +86429,11 @@ MOD11_022579F8: ; 0x022579F8 tst r2, r1 beq _02257A20 sub r1, #0x4a - bl FUN_0200A914 + bl NewString_ReadMsgData b _02257A26 _02257A20: add r1, #0xc4 - bl FUN_0200A914 + bl NewString_ReadMsgData _02257A26: add r7, r0, #0 mov r0, #0 @@ -86507,7 +86507,7 @@ _02257A26: add r0, sp, #0x18 bl FUN_02019178 add r0, r7, #0 - bl FUN_02021A20 + bl String_dtor add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} nop @@ -86530,7 +86530,7 @@ MOD11_02257AD4: ; 0x02257AD4 add r7, r0, #0 mov r0, #0x1e mov r1, #5 - bl FUN_020219F4 + bl String_ctor mov r1, #1 add r6, r0, #0 lsl r1, r1, #0xa @@ -86539,13 +86539,13 @@ MOD11_02257AD4: ; 0x02257AD4 beq _02257B14 ldr r0, [sp, #0x20] sub r1, #0x49 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x18] b _02257B1E _02257B14: ldr r0, [sp, #0x20] add r1, #0xc5 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x18] _02257B1E: mov r0, #1 @@ -86561,7 +86561,7 @@ _02257B1E: ldr r2, [sp, #0x18] add r0, r7, #0 add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 str r0, [sp] mov r0, #0xf @@ -86632,9 +86632,9 @@ _02257B1E: add r0, sp, #0x24 bl FUN_02019178 add r0, r6, #0 - bl FUN_02021A20 + bl String_dtor ldr r0, [sp, #0x18] - bl FUN_02021A20 + bl String_dtor add sp, #0x34 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -89532,16 +89532,16 @@ MOD11_02259284: ; 0x02259284 beq _022592CA ldr r1, _02259488 ; =0x000003A3 add r0, r4, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData mov r1, #0xe9 str r0, [sp, #0x24] add r0, r4, #0 lsl r1, r1, #2 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x20] ldr r1, _0225948C ; =0x000003A5 add r0, r4, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x1c] b _0225931A _022592CA: @@ -89553,31 +89553,31 @@ _022592CA: beq _022592FA ldr r1, _02259490 ; =0x000004C7 add r0, r4, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData mov r1, #0xe9 str r0, [sp, #0x24] add r0, r4, #0 lsl r1, r1, #2 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x20] ldr r1, _0225948C ; =0x000003A5 add r0, r4, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x1c] b _0225931A _022592FA: mov r1, #0xe7 add r0, r4, #0 lsl r1, r1, #2 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x24] ldr r1, _02259494 ; =0x0000039D add r0, r4, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x20] ldr r1, _02259498 ; =0x0000039E add r0, r4, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x1c] _0225931A: ldr r0, [r5] @@ -89591,14 +89591,14 @@ _0225931A: mov r1, #0x3a add r0, r4, #0 lsl r1, r1, #4 - bl FUN_0200A914 + bl NewString_ReadMsgData add r4, r0, #0 mov r1, #1 b _0225934A _0225933E: ldr r1, _0225949C ; =0x0000039F add r0, r4, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData add r4, r0, #0 mov r1, #0 _0225934A: @@ -89682,13 +89682,13 @@ _0225934A: add r2, r4, #0 bl MOD11_0225A458 ldr r0, [sp, #0x24] - bl FUN_02021A20 + bl String_dtor ldr r0, [sp, #0x20] - bl FUN_02021A20 + bl String_dtor ldr r0, [sp, #0x1c] - bl FUN_02021A20 + bl String_dtor add r0, r4, #0 - bl FUN_02021A20 + bl String_dtor ldr r0, [r5] bl MOD11_0222FF74 mov r1, #0x22 @@ -90074,7 +90074,7 @@ _02259748: blt _022596BE ldr r0, [sp, #0x1c] ldr r1, _02259874 ; =0x000003A1 - bl FUN_0200A914 + bl NewString_ReadMsgData add r4, r0, #0 ldr r0, _02259878 ; =0x000A0B0C ldr r1, _0225987C ; =0x0000051C @@ -90096,7 +90096,7 @@ _02259748: add r2, r4, #0 bl MOD11_0225A458 add r0, r4, #0 - bl FUN_02021A20 + bl String_dtor mov r4, #0 mov r7, #3 b _022597B0 @@ -90223,11 +90223,11 @@ MOD11_02259898: ; 0x02259898 mov r1, #0xeb lsl r1, r1, #2 add r6, r0, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData add r4, r0, #0 ldr r1, _0225991C ; =0x000003AD add r0, r6, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData add r6, r0, #0 ldr r0, _02259920 ; =0x00010203 ldr r1, _02259924 ; =0x000004CC @@ -90269,9 +90269,9 @@ MOD11_02259898: ; 0x02259898 add r2, r6, #0 bl MOD11_0225A458 add r0, r4, #0 - bl FUN_02021A20 + bl String_dtor add r0, r6, #0 - bl FUN_02021A20 + bl String_dtor add sp, #0x1c pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -90290,11 +90290,11 @@ MOD11_02259930: ; 0x02259930 bl MOD11_022300C4 ldr r1, _022599B4 ; =0x0000049D add r6, r0, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData add r4, r0, #0 ldr r1, _022599B8 ; =0x0000049E add r0, r6, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData add r6, r0, #0 ldr r0, _022599BC ; =0x00010203 ldr r1, _022599C0 ; =0x000004CC @@ -90336,9 +90336,9 @@ MOD11_02259930: ; 0x02259930 add r2, r6, #0 bl MOD11_0225A458 add r0, r4, #0 - bl FUN_02021A20 + bl String_dtor add r0, r6, #0 - bl FUN_02021A20 + bl String_dtor add sp, #0x1c pop {r3, r4, r5, r6, pc} nop @@ -90362,19 +90362,19 @@ MOD11_022599CC: ; 0x022599CC add r4, r0, #0 ldr r1, _02259A98 ; =0x000004A2 add r0, r6, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x1c] ldr r1, _02259A9C ; =0x000004A3 add r0, r6, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x20] mov r0, #0x64 mov r1, #5 - bl FUN_020219F4 + bl String_ctor add r6, r0, #0 mov r0, #0x64 mov r1, #5 - bl FUN_020219F4 + bl String_ctor add r7, r0, #0 ldrh r2, [r5, #0x18] add r0, r4, #0 @@ -90383,11 +90383,11 @@ MOD11_022599CC: ; 0x022599CC ldr r2, [sp, #0x1c] add r0, r4, #0 add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r2, [sp, #0x20] add r0, r4, #0 add r1, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _02259AA0 ; =0x00010203 ldr r1, _02259AA4 ; =0x000004CC str r0, [sp] @@ -90428,13 +90428,13 @@ MOD11_022599CC: ; 0x022599CC add r2, r7, #0 bl MOD11_0225A458 ldr r0, [sp, #0x1c] - bl FUN_02021A20 + bl String_dtor ldr r0, [sp, #0x20] - bl FUN_02021A20 + bl String_dtor add r0, r6, #0 - bl FUN_02021A20 + bl String_dtor add r0, r7, #0 - bl FUN_02021A20 + bl String_dtor add sp, #0x24 pop {r4, r5, r6, r7, pc} nop @@ -90458,19 +90458,19 @@ MOD11_02259AB0: ; 0x02259AB0 add r4, r0, #0 ldr r1, _02259B7C ; =0x000004C1 add r0, r6, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x1c] ldr r1, _02259B80 ; =0x000004C2 add r0, r6, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x20] mov r0, #0x64 mov r1, #5 - bl FUN_020219F4 + bl String_ctor add r6, r0, #0 mov r0, #0x64 mov r1, #5 - bl FUN_020219F4 + bl String_ctor add r7, r0, #0 ldrh r2, [r5, #0x18] add r0, r4, #0 @@ -90479,11 +90479,11 @@ MOD11_02259AB0: ; 0x02259AB0 ldr r2, [sp, #0x1c] add r0, r4, #0 add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r2, [sp, #0x20] add r0, r4, #0 add r1, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _02259B84 ; =0x00010203 ldr r1, _02259B88 ; =0x000004CC str r0, [sp] @@ -90524,13 +90524,13 @@ MOD11_02259AB0: ; 0x02259AB0 add r2, r7, #0 bl MOD11_0225A458 ldr r0, [sp, #0x1c] - bl FUN_02021A20 + bl String_dtor ldr r0, [sp, #0x20] - bl FUN_02021A20 + bl String_dtor add r0, r6, #0 - bl FUN_02021A20 + bl String_dtor add r0, r7, #0 - bl FUN_02021A20 + bl String_dtor add sp, #0x24 pop {r4, r5, r6, r7, pc} nop @@ -90554,20 +90554,20 @@ MOD11_02259B94: ; 0x02259B94 add r4, r0, #0 ldr r1, _02259C60 ; =0x000004BF add r0, r6, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData mov r1, #0x13 str r0, [sp, #0x1c] add r0, r6, #0 lsl r1, r1, #6 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x20] mov r0, #0x64 mov r1, #5 - bl FUN_020219F4 + bl String_ctor add r6, r0, #0 mov r0, #0x64 mov r1, #5 - bl FUN_020219F4 + bl String_ctor add r7, r0, #0 ldrh r2, [r5, #0x18] add r0, r4, #0 @@ -90576,11 +90576,11 @@ MOD11_02259B94: ; 0x02259B94 ldr r2, [sp, #0x1c] add r0, r4, #0 add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r2, [sp, #0x20] add r0, r4, #0 add r1, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _02259C64 ; =0x00010203 ldr r1, _02259C68 ; =0x000004CC str r0, [sp] @@ -90621,13 +90621,13 @@ MOD11_02259B94: ; 0x02259B94 add r2, r7, #0 bl MOD11_0225A458 ldr r0, [sp, #0x1c] - bl FUN_02021A20 + bl String_dtor ldr r0, [sp, #0x20] - bl FUN_02021A20 + bl String_dtor add r0, r6, #0 - bl FUN_02021A20 + bl String_dtor add r0, r7, #0 - bl FUN_02021A20 + bl String_dtor add sp, #0x24 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -90678,7 +90678,7 @@ MOD11_02259C74: ; 0x02259C74 bl MOD11_022314E0 mov r0, #0x18 mov r1, #5 - bl FUN_020219F4 + bl String_ctor str r0, [sp, #0x28] ldr r0, _02259E38 ; =0x000004CC mov r4, #0 @@ -90705,7 +90705,7 @@ _02259CE0: bne _02259D0E ldr r0, [sp, #0x2c] ldr r1, _02259E3C ; =0x000003C2 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x24] b _02259D2A _02259D0E: @@ -90713,14 +90713,14 @@ _02259D0E: bne _02259D1E ldr r0, [sp, #0x2c] ldr r1, _02259E40 ; =0x000003C3 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x24] b _02259D2A _02259D1E: mov r1, #0xf1 ldr r0, [sp, #0x2c] lsl r1, r1, #2 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x24] _02259D2A: lsl r2, r6, #3 @@ -90737,7 +90737,7 @@ _02259D2A: ldr r0, [sp, #0x1c] ldr r1, [sp, #0x28] ldr r2, [sp, #0x24] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #1 tst r0, r4 beq _02259D5A @@ -90773,7 +90773,7 @@ _02259D5C: add r0, r5, #0 bl MOD11_0225A458 ldr r0, [sp, #0x24] - bl FUN_02021A20 + bl String_dtor cmp r4, #1 beq _02259DA2 cmp r4, #3 @@ -90823,10 +90823,10 @@ _02259DEC: b _02259CE0 _02259DF2: ldr r0, [sp, #0x28] - bl FUN_02021A20 + bl String_dtor ldr r0, [sp, #0x2c] ldr r1, _02259E54 ; =0x000003A2 - bl FUN_0200A914 + bl NewString_ReadMsgData add r4, r0, #0 ldr r0, _02259E58 ; =0x000A0B0C mov r3, #2 @@ -90849,7 +90849,7 @@ _02259DF2: add r1, r5, r1 bl MOD11_0225A458 add r0, r4, #0 - bl FUN_02021A20 + bl String_dtor add sp, #0x44 pop {r4, r5, r6, r7, pc} nop @@ -92051,18 +92051,18 @@ MOD11_0225A760: ; 0x0225A760 str r0, [sp, #0xc] ldr r1, _0225A95C ; =0x000003AA add r0, r4, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData str r0, [sp, #0x28] ldr r0, [r7] bl MOD11_02230138 str r0, [sp, #0x24] mov r0, #0x10 mov r1, #5 - bl FUN_020219F4 + bl String_ctor str r0, [sp, #0x30] ldr r1, _0225A960 ; =0x000003A9 add r0, r4, #0 - bl FUN_0200A914 + bl NewString_ReadMsgData ldr r4, [sp, #0x38] str r0, [sp, #0x2c] mov r0, #0 @@ -92125,7 +92125,7 @@ _0225A814: _0225A826: ldrh r0, [r5] mov r1, #5 - bl FUN_0200AA14 + bl GetMoveName str r0, [sp, #0x48] ldr r0, _0225A964 ; =0x00070809 ldr r1, [sp, #0x48] @@ -92135,7 +92135,7 @@ _0225A826: mov r2, #2 bl MOD11_0225A968 ldr r0, [sp, #0x48] - bl FUN_02021A20 + bl String_dtor _0225A846: add r0, r6, #0 add r0, #0x84 @@ -92183,7 +92183,7 @@ _0225A876: ldr r0, [sp, #0x24] ldr r1, [sp, #0x30] ldr r2, [sp, #0x2c] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldrh r0, [r5, #8] ldrh r1, [r5, #0x10] bl MOD11_0225B3D4 @@ -92255,11 +92255,11 @@ _0225A906: b _0225A7CE _0225A930: ldr r0, [sp, #0x28] - bl FUN_02021A20 + bl String_dtor ldr r0, [sp, #0x2c] - bl FUN_02021A20 + bl String_dtor ldr r0, [sp, #0x30] - bl FUN_02021A20 + bl String_dtor mov r0, #0xc _0225A944: ldr r1, [sp, #8] |