Decompile new_menu_helpers.s
This commit is contained in:
@@ -12385,7 +12385,7 @@ sub_81A0C9C: @ 81A0C9C
|
||||
bl sub_808BCF4
|
||||
movs r0, 0
|
||||
movs r1, 0x1
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
bl sub_81A0A70
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -14586,7 +14586,7 @@ sub_81A1EA8: @ 81A1EA8
|
||||
strb r0, [r4]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
@@ -14874,7 +14874,7 @@ sub_81A2134: @ 81A2134
|
||||
strb r0, [r4]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
@@ -15227,7 +15227,7 @@ sub_81A2460: @ 81A2460
|
||||
strb r0, [r4]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
@@ -15475,7 +15475,7 @@ sub_81A2698: @ 81A2698
|
||||
strb r0, [r6]
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
@@ -15778,7 +15778,7 @@ sub_81A2968: @ 81A2968
|
||||
strb r0, [r5]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
@@ -16153,7 +16153,7 @@ sub_81A2C94: @ 81A2C94
|
||||
strb r0, [r4]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
@@ -16448,7 +16448,7 @@ sub_81A2F38: @ 81A2F38
|
||||
strb r0, [r5]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
@@ -16526,7 +16526,7 @@ sub_81A2FF8: @ 81A2FF8
|
||||
strb r0, [r4]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
@@ -19573,7 +19573,7 @@ sub_81A4AA0: @ 81A4AA0
|
||||
strb r0, [r4]
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
|
||||
@@ -667,7 +667,7 @@ sub_813C4BC: @ 813C4BC
|
||||
strb r0, [r6]
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
|
||||
@@ -57,7 +57,7 @@ _08098182:
|
||||
_08098188:
|
||||
movs r0, 0
|
||||
movs r1, 0x1
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
_08098190:
|
||||
ldrh r0, [r4, 0x8]
|
||||
adds r0, 0x1
|
||||
@@ -313,7 +313,7 @@ sub_8098358: @ 8098358
|
||||
bl task_del_textbox
|
||||
movs r0, 0
|
||||
movs r1, 0x1
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldr r1, =gUnknown_020375BC
|
||||
movs r0, 0
|
||||
strb r0, [r1]
|
||||
|
||||
26
asm/link.s
26
asm/link.s
@@ -18242,7 +18242,7 @@ _08012938:
|
||||
bl CopyWindowToVram
|
||||
ldrb r0, [r6, 0xF]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldr r0, =gMultiuseListMenuTemplate
|
||||
adds r2, r0, 0
|
||||
ldr r1, =gUnknown_082F015C
|
||||
@@ -18258,7 +18258,7 @@ _08012938:
|
||||
strb r0, [r6, 0x12]
|
||||
ldrb r0, [r6, 0x11]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r6, 0x11]
|
||||
bl PutWindowTilemap
|
||||
ldrb r0, [r6, 0x11]
|
||||
@@ -19723,7 +19723,7 @@ _0801360C:
|
||||
bl CopyWindowToVram
|
||||
ldrb r0, [r6, 0xB]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldr r0, =gMultiuseListMenuTemplate
|
||||
adds r2, r0, 0
|
||||
ldr r1, =gUnknown_082F0204
|
||||
@@ -19739,7 +19739,7 @@ _0801360C:
|
||||
strb r0, [r6, 0xE]
|
||||
ldrb r0, [r6, 0xD]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r6, 0xD]
|
||||
bl PutWindowTilemap
|
||||
ldrb r0, [r6, 0xD]
|
||||
@@ -26036,7 +26036,7 @@ sub_8017020: @ 8017020
|
||||
bl sub_81973A4
|
||||
movs r0, 0
|
||||
movs r1, 0x1
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
ldr r0, =gStringVar4
|
||||
adds r1, r4, 0
|
||||
bl StringExpandPlaceholders
|
||||
@@ -26081,7 +26081,7 @@ _08017076:
|
||||
bl sub_81973A4
|
||||
movs r0, 0
|
||||
movs r1, 0x1
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
ldr r0, =gStringVar4
|
||||
adds r1, r5, 0
|
||||
bl StringExpandPlaceholders
|
||||
@@ -26173,7 +26173,7 @@ sub_8017118: @ 8017118
|
||||
lsrs r4, 24
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
adds r0, r4, 0
|
||||
movs r1, 0xFF
|
||||
bl FillWindowPixelBuffer
|
||||
@@ -26269,7 +26269,7 @@ _080171DC:
|
||||
strb r0, [r5]
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldr r0, =gMultiuseListMenuTemplate
|
||||
adds r2, r0, 0
|
||||
ldr r1, [sp, 0x24]
|
||||
@@ -26382,7 +26382,7 @@ _080172C8:
|
||||
strb r0, [r6]
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldr r0, =gMultiuseListMenuTemplate
|
||||
adds r2, r0, 0
|
||||
ldr r1, [sp, 0x24]
|
||||
@@ -49423,7 +49423,7 @@ _08022D38:
|
||||
_08022D42:
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
ldrb r1, [r5, 0x1]
|
||||
movs r0, 0x2
|
||||
mov r8, r0
|
||||
@@ -52021,7 +52021,7 @@ _080241A6:
|
||||
beq _0802421E
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
ldr r2, =gText_SavingDontTurnOffPower
|
||||
movs r0, 0
|
||||
str r0, [sp]
|
||||
@@ -52378,7 +52378,7 @@ _0802445A:
|
||||
_08024460:
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
ldrh r1, [r5, 0x14]
|
||||
cmp r1, 0x3
|
||||
bne _08024490
|
||||
@@ -64111,7 +64111,7 @@ _0802A3A4:
|
||||
_0802A3AE:
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
ldr r2, =gText_SavingDontTurnOffPower
|
||||
str r4, [sp]
|
||||
movs r0, 0x2
|
||||
|
||||
@@ -800,7 +800,7 @@ sub_8120708: @ 8120708
|
||||
adds r5, r0, 0
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
movs r4, 0x1
|
||||
str r4, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -463,7 +463,7 @@ sub_816B21C: @ 816B21C
|
||||
adds r4, r0, 0
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
movs r0, 0x1
|
||||
str r0, [sp]
|
||||
movs r0, 0
|
||||
@@ -599,7 +599,7 @@ mapldr_080EBC0C: @ 816B33C
|
||||
bl sub_81973A4
|
||||
movs r0, 0
|
||||
movs r1, 0x1
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
ldr r0, =sub_816B368
|
||||
movs r1, 0
|
||||
bl CreateTask
|
||||
@@ -2540,7 +2540,7 @@ bx_battle_menu_t3: @ 816C3A4
|
||||
bne _0816C3F2
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
movs r1, 0x6
|
||||
ldrsh r0, [r5, r1]
|
||||
cmp r0, 0
|
||||
|
||||
@@ -211,7 +211,7 @@ _080C72AC:
|
||||
bl sub_81973A4
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
movs r0, 0
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
@@ -627,7 +627,7 @@ sub_80C75FC: @ 80C75FC
|
||||
lsrs r4, 24
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x5
|
||||
mov r2, r8
|
||||
|
||||
@@ -461,7 +461,7 @@ sub_80E70F4: @ 80E70F4
|
||||
adds r4, r0, 0
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
movs r0, 0x1
|
||||
str r0, [sp]
|
||||
movs r0, 0
|
||||
|
||||
@@ -508,7 +508,7 @@ _081406E0:
|
||||
ldr r4, =gUnknown_0203AB8C
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r4]
|
||||
ldr r2, =gUnknown_082A5B89
|
||||
movs r1, 0x1
|
||||
@@ -740,7 +740,7 @@ sub_8140914: @ 8140914
|
||||
ldr r5, =gUnknown_0203AB8C
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r5]
|
||||
ldr r2, =gUnknown_082A5C13
|
||||
movs r1, 0x1
|
||||
@@ -2631,7 +2631,7 @@ sub_814189C: @ 814189C
|
||||
ldr r4, =gUnknown_0203AB8C
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r4]
|
||||
ldr r2, =gUnknown_082A5BD7
|
||||
b _08141902
|
||||
@@ -2643,7 +2643,7 @@ _081418EC:
|
||||
ldr r4, =gUnknown_0203AB8C
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r4]
|
||||
ldr r2, =gUnknown_082A5BCB
|
||||
_08141902:
|
||||
@@ -2667,7 +2667,7 @@ _08141928:
|
||||
ldr r4, =gUnknown_0203AB8C
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r4]
|
||||
ldr r2, =gUnknown_082A5BE0
|
||||
movs r1, 0x1
|
||||
@@ -2805,7 +2805,7 @@ sub_8141A18: @ 8141A18
|
||||
ldr r5, =gUnknown_0203AB8C
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0x1
|
||||
str r1, [sp]
|
||||
@@ -3001,7 +3001,7 @@ _08141BB0:
|
||||
ldr r4, =gUnknown_0203AB8C
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r4]
|
||||
ldr r2, =gUnknown_082A5C21
|
||||
movs r1, 0x1
|
||||
@@ -3028,7 +3028,7 @@ _08141C58:
|
||||
ldr r4, =gUnknown_0203AB8C
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r4]
|
||||
ldr r2, =gUnknown_082A5C61
|
||||
movs r1, 0x1
|
||||
@@ -3060,7 +3060,7 @@ _08141CBC:
|
||||
ldr r4, =gUnknown_0203AB8C
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r4]
|
||||
ldr r2, =gUnknown_082A5C04
|
||||
movs r1, 0x1
|
||||
@@ -3147,7 +3147,7 @@ _08141D44:
|
||||
ldr r4, =gUnknown_0203AB8C
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldrb r0, [r4]
|
||||
ldr r2, =gUnknown_082A5C61
|
||||
movs r1, 0x1
|
||||
@@ -4667,7 +4667,7 @@ sub_81429F0: @ 81429F0
|
||||
bl StringExpandPlaceholders
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
str r5, [sp]
|
||||
movs r0, 0xFF
|
||||
str r0, [sp, 0x4]
|
||||
@@ -4744,7 +4744,7 @@ sub_8142A88: @ 8142A88
|
||||
beq _08142B28
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldr r2, =gUnknown_082A5B6B
|
||||
str r7, [sp]
|
||||
movs r0, 0xFF
|
||||
@@ -4768,7 +4768,7 @@ _08142B28:
|
||||
bl StringExpandPlaceholders
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
movs r0, 0x1
|
||||
str r0, [sp]
|
||||
movs r0, 0xFF
|
||||
@@ -4798,7 +4798,7 @@ _08142B78:
|
||||
bl StringExpandPlaceholders
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
str r7, [sp]
|
||||
movs r0, 0xFF
|
||||
str r0, [sp, 0x4]
|
||||
|
||||
@@ -975,7 +975,7 @@ sub_812ACF4: @ 812ACF4
|
||||
sub sp, 0xC
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
ldr r2, =gText_YouDontHaveThreeCoins
|
||||
movs r0, 0x1
|
||||
str r0, [sp]
|
||||
@@ -1543,7 +1543,7 @@ sub_812B158: @ 812B158
|
||||
sub sp, 0xC
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
ldr r2, =gText_QuitTheGame
|
||||
movs r0, 0x1
|
||||
str r0, [sp]
|
||||
@@ -1633,7 +1633,7 @@ sub_812B214: @ 812B214
|
||||
sub sp, 0xC
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
ldr r2, =gText_YouveGot9999Coins
|
||||
movs r0, 0x1
|
||||
str r0, [sp]
|
||||
@@ -1686,7 +1686,7 @@ sub_812B280: @ 812B280
|
||||
sub sp, 0xC
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
ldr r2, =gText_YouveRunOutOfCoins
|
||||
movs r0, 0x1
|
||||
str r0, [sp]
|
||||
|
||||
@@ -148,7 +148,7 @@ _0809F8E4:
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldr r1, =gUnknown_02037619
|
||||
movs r0, 0
|
||||
strb r0, [r1, 0x1]
|
||||
@@ -1832,7 +1832,7 @@ _080A06EC:
|
||||
strb r0, [r6]
|
||||
ldrb r0, [r6]
|
||||
movs r1, 0
|
||||
bl sub_81973FC
|
||||
bl NewMenuHelpers_DrawStdWindowFrame
|
||||
ldr r0, =gSaveBlock2Ptr
|
||||
ldr r0, [r0]
|
||||
ldrb r0, [r0, 0x8]
|
||||
|
||||
@@ -409,7 +409,7 @@ _080C2A2C:
|
||||
bl sub_800AC34
|
||||
movs r0, 0
|
||||
movs r1, 0x1
|
||||
bl sub_81973C4
|
||||
bl NewMenuHelpers_DrawDialogueFrame
|
||||
ldr r2, =gText_WaitingTrainerFinishReading
|
||||
movs r0, 0x1
|
||||
str r0, [sp]
|
||||
|
||||
Reference in New Issue
Block a user