diff options
Diffstat (limited to 'arm9/modules')
-rw-r--r-- | arm9/modules/05/asm/mod05_021E1374.s | 2 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E2B80.s | 60 | ||||
-rw-r--r-- | arm9/modules/05/asm/module_05.s | 8 | ||||
-rw-r--r-- | arm9/modules/06/asm/module_06.s | 14 | ||||
-rw-r--r-- | arm9/modules/18/asm/module_18.s | 28 | ||||
-rw-r--r-- | arm9/modules/54/asm/module_54.s | 6 | ||||
-rw-r--r-- | arm9/modules/55/asm/module_55.s | 4 | ||||
-rw-r--r-- | arm9/modules/56/asm/module_56.s | 24 | ||||
-rw-r--r-- | arm9/modules/61/asm/module_61.s | 2 | ||||
-rw-r--r-- | arm9/modules/64/asm/module_64.s | 2 | ||||
-rw-r--r-- | arm9/modules/65/asm/module_65.s | 2 | ||||
-rw-r--r-- | arm9/modules/71/asm/module_71.s | 2 | ||||
-rw-r--r-- | arm9/modules/75/asm/module_75.s | 2 | ||||
-rw-r--r-- | arm9/modules/76/asm/module_76.s | 2 | ||||
-rw-r--r-- | arm9/modules/77/asm/module_77.s | 4 | ||||
-rw-r--r-- | arm9/modules/80/asm/module_80.s | 2 | ||||
-rw-r--r-- | arm9/modules/82/asm/module_82.s | 2 |
17 files changed, 83 insertions, 83 deletions
diff --git a/arm9/modules/05/asm/mod05_021E1374.s b/arm9/modules/05/asm/mod05_021E1374.s index e3bb69a4..df43ddb9 100644 --- a/arm9/modules/05/asm/mod05_021E1374.s +++ b/arm9/modules/05/asm/mod05_021E1374.s @@ -915,7 +915,7 @@ MOD05_021E1A30: ; 0x021E1A30 str r0, [sp, #0xc] bl FUN_020395F4 str r0, [sp, #8] - bl FUN_0203962C + bl Field_TrainerIsDoubleBattle cmp r0, #0 bne _021E1A60 add sp, #0x10 diff --git a/arm9/modules/05/asm/mod05_021E2B80.s b/arm9/modules/05/asm/mod05_021E2B80.s index 2722d177..16e19ae0 100644 --- a/arm9/modules/05/asm/mod05_021E2B80.s +++ b/arm9/modules/05/asm/mod05_021E2B80.s @@ -42,7 +42,7 @@ MOD05_021E2BB8: ; 0x021E2BB8 push {r4, lr} add r4, r0, #0 add r0, r1, #0 - bl MOD05_021E2D00 + bl MOD05_ScriptContext_GetTextFrameDelay strb r0, [r4] mov r0, #0 strb r0, [r4, #1] @@ -68,15 +68,15 @@ MOD05_021E2BD0: ; 0x021E2BD0 add r0, #0x80 ldr r0, [r0] add r1, sp, #8 - bl MOD05_021E2D9C + bl MOD05_CreateMessageBox add r0, sp, #8 add r1, r6, #0 add r2, r7, #0 - bl MOD05_021E2DD4 + bl MOD05_ReadAndExpandMsgDataViaBuffer cmp r4, #0 bne _021E2C10 add r0, r5, #0 - bl MOD05_021E2D00 + bl MOD05_ScriptContext_GetTextFrameDelay add r2, r0, #0 mov r0, #0 mov r1, #1 @@ -89,7 +89,7 @@ _021E2C16: str r0, [sp] ldr r3, [sp, #4] add r0, sp, #8 - bl MOD05_021E2E40 + bl MOD05_DrawFieldMessage add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} @@ -107,14 +107,14 @@ MOD05_ShowMessageInField: ; 0x021E2C24 add r5, #0x80 ldr r0, [r5] add r1, sp, #0 - bl MOD05_021E2D9C + bl MOD05_CreateMessageBox add r0, sp, #0 add r1, r4, #0 add r2, r6, #0 - bl MOD05_021E2DD4 + bl MOD05_ReadAndExpandMsgDataViaBuffer add r0, sp, #0 mov r1, #1 - bl MOD05_021E2E68 + bl MOD05_AddTextPrinterParameterized add sp, #0x18 pop {r4, r5, r6, pc} @@ -134,7 +134,7 @@ MOD05_021E2C58: ; 0x021E2C58 add r0, #0x80 ldr r0, [r0] add r1, sp, #4 - bl MOD05_021E2D9C + bl MOD05_CreateMessageBox add r0, sp, #0x20 ldrh r0, [r0, #0x10] add r1, r4, #0 @@ -142,13 +142,13 @@ MOD05_021E2C58: ; 0x021E2C58 str r0, [sp] add r0, sp, #4 add r3, r7, #0 - bl MOD05_021E2DF0 + bl MOD05_ExpandEasyChatMessage add r0, sp, #0x20 ldrb r0, [r0, #0x14] cmp r0, #0xff beq _021E2CB0 add r0, r5, #0 - bl MOD05_021E2D00 + bl MOD05_ScriptContext_GetTextFrameDelay add r2, r0, #0 mov r0, #0 str r0, [sp] @@ -156,13 +156,13 @@ MOD05_021E2C58: ; 0x021E2C58 ldrb r3, [r3, #0x14] add r0, sp, #4 mov r1, #1 - bl MOD05_021E2E40 + bl MOD05_DrawFieldMessage add sp, #0x1c pop {r4, r5, r6, r7, pc} _021E2CB0: add r0, sp, #4 mov r1, #1 - bl MOD05_021E2E68 + bl MOD05_AddTextPrinterParameterized add sp, #0x1c pop {r4, r5, r6, r7, pc} @@ -181,25 +181,25 @@ MOD05_021E2CBC: ; 0x021E2CBC add r0, #0x80 ldr r0, [r0] add r1, sp, #4 - bl MOD05_021E2D9C + bl MOD05_CreateMessageBox ldr r1, [r5, #0x78] add r0, sp, #4 add r2, r4, #0 - bl MOD05_021E2DD4 + bl MOD05_ReadAndExpandMsgDataViaBuffer add r0, r5, #0 - bl MOD05_021E2D00 + bl MOD05_ScriptContext_GetTextFrameDelay add r2, r0, #0 mov r0, #0 str r0, [sp] add r0, sp, #4 mov r1, #1 add r3, r6, #0 - bl MOD05_021E2E40 + bl MOD05_DrawFieldMessage add sp, #0x1c pop {r3, r4, r5, r6, pc} - thumb_func_start MOD05_021E2D00 -MOD05_021E2D00: ; 0x021E2D00 + thumb_func_start MOD05_ScriptContext_GetTextFrameDelay +MOD05_ScriptContext_GetTextFrameDelay: ; 0x021E2D00 push {r3, lr} add r0, #0x80 ldr r0, [r0] @@ -272,8 +272,8 @@ MOD05_021E2D5C: ; 0x021E2D5C str r0, [r4, #0x14] pop {r4, r5, r6, pc} - thumb_func_start MOD05_021E2D9C -MOD05_021E2D9C: ; 0x021E2D9C + thumb_func_start MOD05_CreateMessageBox +MOD05_CreateMessageBox: ; 0x021E2D9C push {r3, r4, r5, lr} add r4, r1, #0 add r5, r0, #0 @@ -300,8 +300,8 @@ _021E2DC8: pop {r3, r4, r5, pc} .balign 4, 0 - thumb_func_start MOD05_021E2DD4 -MOD05_021E2DD4: ; 0x021E2DD4 + thumb_func_start MOD05_ReadAndExpandMsgDataViaBuffer +MOD05_ReadAndExpandMsgDataViaBuffer: ; 0x021E2DD4 push {r4, lr} add r4, r0, #0 add r0, r1, #0 @@ -315,8 +315,8 @@ MOD05_021E2DD4: ; 0x021E2DD4 pop {r4, pc} .balign 4, 0 - thumb_func_start MOD05_021E2DF0 -MOD05_021E2DF0: ; 0x021E2DF0 + thumb_func_start MOD05_ExpandEasyChatMessage +MOD05_ExpandEasyChatMessage: ; 0x021E2DF0 push {r3, r4, r5, r6, r7, lr} sub sp, #8 add r5, r0, #0 @@ -351,8 +351,8 @@ MOD05_021E2DF0: ; 0x021E2DF0 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 - thumb_func_start MOD05_021E2E40 -MOD05_021E2E40: ; 0x021E2E40 + thumb_func_start MOD05_DrawFieldMessage +MOD05_DrawFieldMessage: ; 0x021E2E40 push {r4, r5, r6, lr} sub sp, #8 add r4, r0, #0 @@ -367,14 +367,14 @@ MOD05_021E2E40: ; 0x021E2E40 ldr r1, [r4] add r2, r6, #0 add r3, r5, #0 - bl FUN_02054690 + bl DrawFieldMessage ldr r1, [r4, #0x14] strb r0, [r1] add sp, #8 pop {r4, r5, r6, pc} - thumb_func_start MOD05_021E2E68 -MOD05_021E2E68: ; 0x021E2E68 + thumb_func_start MOD05_AddTextPrinterParameterized +MOD05_AddTextPrinterParameterized: ; 0x021E2E68 push {r3, r4, lr} sub sp, #0xc mov r3, #0 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 597bd083..23f6ea7b 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -14988,7 +14988,7 @@ MOD05_021EFD40: ; 0x021EFD40 ldr r0, [r0, #8] ldr r2, _021EFD78 ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #0x44] mov r0, #3 str r0, [r4, #0x48] @@ -15079,7 +15079,7 @@ MOD05_021EFDF0: ; 0x021EFDF0 ldr r0, [r0, #8] ldr r2, _021EFE28 ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #0x44] mov r0, #5 str r0, [r4, #0x48] @@ -15145,7 +15145,7 @@ MOD05_021EFE70: ; 0x021EFE70 ldr r0, [r0, #8] ldr r2, _021EFEA8 ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #0x44] mov r0, #7 str r0, [r4, #0x48] @@ -15392,7 +15392,7 @@ MOD05_021F0080: ; 0x021F0080 ldr r0, [r0, #8] ldr r2, _021F00B8 ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #0x44] mov r0, #0xb str r0, [r4, #0x48] diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index ac0c3eeb..d39eedbd 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -10293,7 +10293,7 @@ _0223E5FE: ldr r0, [r4] ldr r1, _0223E618 ; =0x0224F348 mov r2, #0x1f - bl FUN_02002198 + bl Std_CreateYesNoMenu add r4, #0x80 str r0, [r4] mov r0, #8 @@ -12384,7 +12384,7 @@ MOD06_0223F720: ; 0x0223F720 ldr r0, [r0, #0x68] mov r3, #0xb ldr r0, [r0, #8] - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #0x60] ldr r0, _0223F76C ; =MOD06_0223F770 bl MOD06_0223F8BC @@ -13438,7 +13438,7 @@ MOD06_0223FFD4: ; 0x0223FFD4 ldr r0, [r0, #0x68] mov r3, #0xb ldr r0, [r0, #8] - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #0x60] ldr r0, _0224002C ; =MOD06_02240030 bl MOD06_0223F8BC @@ -13698,7 +13698,7 @@ MOD06_02240204: ; 0x02240204 ldr r0, [r0, #0x68] mov r3, #0xb ldr r0, [r0, #8] - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #0x60] ldr r0, _02240254 ; =MOD06_02240258 bl MOD06_0223F8BC @@ -13821,7 +13821,7 @@ MOD06_02240310: ; 0x02240310 ldr r0, [r0, #0x68] mov r3, #0xb ldr r0, [r0, #8] - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #0x60] ldr r0, _02240360 ; =MOD06_0223FD08 bl MOD06_0223F8BC @@ -19372,7 +19372,7 @@ _02242FA6: ldr r0, [r0, #8] ldr r2, _02242FE8 ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #0x64] add r0, r4, #0 mov r1, #0x24 @@ -42800,7 +42800,7 @@ MOD06_0224E470: ; 0x0224E470 mov r2, #0x1f mov r3, #0xb str r4, [sp] - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r5, #4] str r4, [r5, #8] mov r0, #1 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index d09c0d20..6581e679 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -1223,7 +1223,7 @@ MOD18_02239F98: ; 0x02239F98 ldr r0, [r0] mov r3, #0xb ldr r0, [r0, #8] - bl FUN_02002198 + bl Std_CreateYesNoMenu ldr r2, _0223A044 ; =0x02251380 ldr r1, _0223A050 ; =0x000007E4 ldr r3, [r2] @@ -25227,7 +25227,7 @@ _02245898: ldr r1, _022459E0 ; =0x022504F8 ldr r2, _022459E4 ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #4] mov r0, #2 str r0, [r4, #0xc] @@ -25262,7 +25262,7 @@ _022458D4: ldr r1, _022459E0 ; =0x022504F8 ldr r2, _022459E4 ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #4] mov r0, #4 str r0, [r4, #0xc] @@ -25302,7 +25302,7 @@ _0224592A: ldr r1, _022459E0 ; =0x022504F8 ldr r2, _022459E4 ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #4] mov r0, #6 str r0, [r4, #0xc] @@ -25669,7 +25669,7 @@ _02245C14: ldr r1, _02245E08 ; =0x022504F8 ldr r2, _02245E0C ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #4] mov r0, #2 str r0, [r4, #0xc] @@ -25715,7 +25715,7 @@ _02245C7C: ldr r1, _02245E08 ; =0x022504F8 ldr r2, _02245E0C ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #4] mov r0, #5 str r0, [r4, #0xc] @@ -27379,7 +27379,7 @@ _022469E0: ldr r1, _02246AD8 ; =0x022504F8 ldr r2, _02246ADC ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #8] mov r0, #6 str r0, [r4, #0xc] @@ -30583,7 +30583,7 @@ _0224830C: ldr r0, [r0, #8] ldr r2, _022484D4 ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #0x24] add r0, r4, #0 mov r1, #0x14 @@ -31535,7 +31535,7 @@ _02248AAE: ldr r0, [r0, #8] ldr r2, _02248D94 ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #0x20] b _02248DB6 _02248AD8: @@ -31664,7 +31664,7 @@ _02248BC2: ldr r0, [r0, #8] ldr r2, _02248D94 ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #0x20] b _02248DB6 _02248BEC: @@ -35073,7 +35073,7 @@ MOD18_0224A710: ; 0x0224A710 ldr r0, [r0, #8] ldr r2, _0224A744 ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #0x5c] ldr r0, _0224A748 ; =0x00000246 mov r1, #0xc @@ -35224,7 +35224,7 @@ MOD18_0224A844: ; 0x0224A844 ldr r0, [r0, #8] ldr r2, _0224A878 ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #0x5c] ldr r0, _0224A87C ; =0x00000246 mov r1, #1 @@ -37895,7 +37895,7 @@ _0224BE0A: ldr r0, [r0, #8] ldr r2, _0224BE80 ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #8] mov r0, #1 str r0, [r4] @@ -40208,7 +40208,7 @@ _0224D0DA: ldr r0, [r0, #8] ldr r2, _0224D1EC ; =0x000003D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r4, #0x5c] ldr r0, _0224D1D8 ; =0x00000246 mov r1, #0xe diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 11026c32..49c51d11 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -1502,7 +1502,7 @@ MOD54_021D8120: ; 0x021D8120 ldr r1, _021D814C ; =0x021D9678 mov r2, #0x1f mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x32 lsl r1, r1, #4 str r0, [r5, r1] @@ -1767,7 +1767,7 @@ MOD54_021D8340: ; 0x021D8340 ldr r1, _021D836C ; =0x021D9678 mov r2, #0x1f mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x32 lsl r1, r1, #4 str r0, [r5, r1] @@ -2128,7 +2128,7 @@ MOD54_021D8600: ; 0x021D8600 ldr r1, _021D862C ; =0x021D9678 mov r2, #0x1f mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x32 lsl r1, r1, #4 str r0, [r5, r1] diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index 8c06cc76..b6f57d67 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -2031,7 +2031,7 @@ MOD55_021D8544: ; 0x021D8544 ldr r1, _021D857C ; =0x021DA2AC ldr r2, _021D8580 ; =0x000001D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu add r1, r5, #0 add r1, #0xe8 str r0, [r1] @@ -5253,7 +5253,7 @@ MOD55_021D9FDC: ; 0x021D9FDC ldr r1, _021DA014 ; =0x021DA2AC ldr r2, _021DA018 ; =0x000001D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu add r1, r5, #0 add r1, #0xe8 str r0, [r1] diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 309d4cc0..97d746da 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -1565,7 +1565,7 @@ _02212A9A: ldr r1, _02212B34 ; =0x02216310 ldr r2, _02212B38 ; =0x000001D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x5f lsl r1, r1, #2 str r0, [r5, r1] @@ -1627,7 +1627,7 @@ MOD56_02212B3C: ; 0x02212B3C ldr r1, _02212B7C ; =0x022162F8 ldr r2, _02212B80 ; =0x000001D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x5f lsl r1, r1, #2 str r0, [r5, r1] @@ -1727,7 +1727,7 @@ MOD56_02212BE8: ; 0x02212BE8 ldr r1, _02212C48 ; =0x02216310 ldr r2, _02212C4C ; =0x000001D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x5f lsl r1, r1, #2 str r0, [r5, r1] @@ -1786,7 +1786,7 @@ _02212C74: ldr r1, _02212CC4 ; =0x02216310 ldr r2, _02212CC8 ; =0x000001D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x5f lsl r1, r1, #2 str r0, [r5, r1] @@ -2378,7 +2378,7 @@ MOD56_022130F4: ; 0x022130F4 ldr r1, _02213134 ; =0x02216308 ldr r2, _02213138 ; =0x000001D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x5f lsl r1, r1, #2 str r0, [r5, r1] @@ -4575,7 +4575,7 @@ MOD56_02214238: ; 0x02214238 ldr r1, _02214284 ; =0x02216308 ldr r2, _02214288 ; =0x000001D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x5f lsl r1, r1, #2 str r0, [r5, r1] @@ -4968,7 +4968,7 @@ MOD56_02214520: ; 0x02214520 ldr r1, _02214560 ; =0x02216308 ldr r2, _02214564 ; =0x000001D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x5f lsl r1, r1, #2 str r0, [r5, r1] @@ -6212,7 +6212,7 @@ MOD56_02214F0C: ; 0x02214F0C ldr r1, _02214F4C ; =0x02216308 ldr r2, _02214F50 ; =0x000001D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x5f lsl r1, r1, #2 str r0, [r5, r1] @@ -6317,7 +6317,7 @@ MOD56_02214FD8: ; 0x02214FD8 ldr r1, _02215018 ; =0x02216308 ldr r2, _0221501C ; =0x000001D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x5f lsl r1, r1, #2 str r0, [r5, r1] @@ -7646,7 +7646,7 @@ MOD56_02215A8C: ; 0x02215A8C ldr r1, _02215ACC ; =0x02216308 ldr r2, _02215AD0 ; =0x000001D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x5f lsl r1, r1, #2 str r0, [r5, r1] @@ -7831,7 +7831,7 @@ _02215BF0: ldr r1, _02215C28 ; =0x02216308 ldr r2, _02215C2C ; =0x000001D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x5f lsl r1, r1, #2 str r0, [r5, r1] @@ -7985,7 +7985,7 @@ MOD56_02215D20: ; 0x02215D20 ldr r1, _02215D60 ; =0x02216308 ldr r2, _02215D64 ; =0x000001D9 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x5f lsl r1, r1, #2 str r0, [r5, r1] diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index 861757e8..ed38301b 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -374,7 +374,7 @@ MOD61_021D7790: ; 0x021D7790 ldr r0, [r4, #0x18] mov r2, #1 mov r3, #5 - bl FUN_02002198 + bl Std_CreateYesNoMenu add r4, #0xa4 str r0, [r4] add sp, #4 diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 71dc63ea..645c9569 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -2212,7 +2212,7 @@ _021D8604: ldr r2, _021D86D8 ; =0x0000029E add r1, #0xb0 mov r3, #1 - bl FUN_02002198 + bl Std_CreateYesNoMenu add r1, r4, #0 add r1, #0xb8 str r0, [r1] diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 25ca7a88..4ff5aca1 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -2418,7 +2418,7 @@ MOD65_021D87B0: ; 0x021D87B0 ldr r0, [r4, #0x24] mov r2, #0x1f mov r3, #0xf - bl FUN_02002198 + bl Std_CreateYesNoMenu add r4, #0xd4 str r0, [r4] add sp, #4 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 21cf712a..e7f0b24d 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -7038,7 +7038,7 @@ _02230FC8: ldr r1, _02230FFC ; =0x022313CC ldr r2, _02231000 ; =0x000001F7 mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu str r0, [r5] ldr r0, [r4] add r0, r0, #1 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index 214736ee..87c9c55a 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -9515,7 +9515,7 @@ MOD75_021EB6E0: ; 0x021EB6E0 ldr r1, _021EB700 ; =0x021EC6AC ldr r2, _021EB704 ; =0x000003F7 mov r3, #0xe - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x56 lsl r1, r1, #2 str r0, [r4, r1] diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 7f49e675..d81a7697 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -735,7 +735,7 @@ MOD76_021D7AB4: ; 0x021D7AB4 ldr r1, _021D7AD8 ; =0x021D9034 mov r2, #1 mov r3, #0xc - bl FUN_02002198 + bl Std_CreateYesNoMenu mov r1, #0x43 lsl r1, r1, #2 str r0, [r4, r1] diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 67824222..4536decb 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -291,7 +291,7 @@ _021D7744: ldr r2, _021D7998 ; =0x000001D9 ldr r0, [r4, r0] mov r3, #7 - bl FUN_02002198 + bl Std_CreateYesNoMenu ldr r1, _021D799C ; =0x0000C05C str r0, [r4, r1] mov r0, #6 @@ -499,7 +499,7 @@ _021D78EE: ldr r2, _021D7998 ; =0x000001D9 ldr r0, [r4, r0] mov r3, #7 - bl FUN_02002198 + bl Std_CreateYesNoMenu ldr r1, _021D799C ; =0x0000C05C str r0, [r4, r1] mov r0, #0xd diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index ef7fab2d..9e91c64e 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -2192,7 +2192,7 @@ MOD80_0222E6A8: ; 0x0222E6A8 add r1, r3, #0 mov r2, #0x1f mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu add sp, #0xc pop {r3, r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 89f24d96..f1cd74ed 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -1230,7 +1230,7 @@ MOD82_0222DF38: ; 0x0222DF38 add r1, r3, #0 mov r2, #0x1f mov r3, #0xb - bl FUN_02002198 + bl Std_CreateYesNoMenu add sp, #0xc pop {r3, r4, r5, r6, pc} .align 2, 0 |