diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/berry_crush_3.s | 28 | ||||
| -rw-r--r-- | asm/pokemon_jump_2.s | 17 |
2 files changed, 24 insertions, 21 deletions
diff --git a/asm/berry_crush_3.s b/asm/berry_crush_3.s index 9e3334a7f..81bb22d8c 100644 --- a/asm/berry_crush_3.s +++ b/asm/berry_crush_3.s @@ -63,7 +63,7 @@ _0814D63A: ldr r0, _0814D65C @ =gReservedSpritePaletteCount strb r4, [r0] movs r0, 0x3 - bl sub_815C980 + bl DigitObjUtil_Init b _0814D878 .align 2, 0 _0814D658: .4byte 0x01000200 @@ -427,7 +427,7 @@ _0814D9A2: bl DestroyWirelessStatusIndicatorSprite adds r0, r5, 0 bl sub_814EF10 - bl sub_815C9F4 + bl DigitObjUtil_Teardown b _0814D9BA _0814D9B2: movs r0, 0 @@ -2578,15 +2578,15 @@ sub_814EAD4: @ 814EAD4 movs r0, 0x4 ldrsh r1, [r4, r0] movs r0, 0 - bl sub_815CD70 + bl DigitObjUtil_PrintNumOn movs r0, 0x6 ldrsh r1, [r4, r0] movs r0, 0x1 - bl sub_815CD70 + bl DigitObjUtil_PrintNumOn movs r0, 0x8 ldrsh r1, [r4, r0] movs r0, 0x2 - bl sub_815CD70 + bl DigitObjUtil_PrintNumOn pop {r4} pop {r0} bx r0 @@ -2608,13 +2608,13 @@ sub_814EB04: @ 814EB04 strb r0, [r1] movs r0, 0x2 movs r1, 0x1 - bl sub_815D1A8 + bl DigitObjUtil_HideOrShow movs r0, 0x1 movs r1, 0x1 - bl sub_815D1A8 + bl DigitObjUtil_HideOrShow movs r0, 0 movs r1, 0x1 - bl sub_815D1A8 + bl DigitObjUtil_HideOrShow pop {r0} bx r0 thumb_func_end sub_814EB04 @@ -3060,17 +3060,17 @@ _0814EE3E: movs r0, 0 movs r1, 0 adds r2, r4, 0 - bl sub_815CA40 + bl DigitObjUtil_CreatePrinter adds r2, r4, 0 adds r2, 0x10 movs r0, 0x1 movs r1, 0 - bl sub_815CA40 + bl DigitObjUtil_CreatePrinter adds r4, 0x20 movs r0, 0x2 movs r1, 0 adds r2, r4, 0 - bl sub_815CA40 + bl DigitObjUtil_CreatePrinter ldrh r0, [r6, 0x12] cmp r0, 0x1 bne _0814EED8 @@ -3130,11 +3130,11 @@ _0814EF46: cmp r4, 0x1 bls _0814EF46 movs r0, 0x2 - bl sub_815D108 + bl DigitObjUtil_DeletePrinter movs r0, 0x1 - bl sub_815D108 + bl DigitObjUtil_DeletePrinter movs r0, 0 - bl sub_815D108 + bl DigitObjUtil_DeletePrinter movs r4, 0 movs r1, 0xC2 lsls r1, 1 diff --git a/asm/pokemon_jump_2.s b/asm/pokemon_jump_2.s index 5d2aa8ff8..269ffc7bd 100644 --- a/asm/pokemon_jump_2.s +++ b/asm/pokemon_jump_2.s @@ -4665,7 +4665,7 @@ _08149D20: .4byte sub_8149DC8 sub_8149D24: @ 8149D24 push {lr} bl FreeAllWindowBuffers - bl sub_815C9F4 + bl DigitObjUtil_Teardown pop {r0} bx r0 thumb_func_end sub_8149D24 @@ -6284,7 +6284,10 @@ sub_814A9C8: @ 814A9C8 push {r4,lr} sub sp, 0x10 mov r1, sp - movs r0, 0x40 + movs r0, 0x40 @ strConvMode = 0 + @ shape = SPRITE_SHAPE(8x8) + @ size = SPRITE_SIZE(8x8) + @ priority = 1 strb r0, [r1] movs r0, 0x5 strb r0, [r1, 0x1] @@ -6299,11 +6302,11 @@ sub_814A9C8: @ 814A9C8 ldr r0, _0814AA20 @ =gUnknown_846D968 str r0, [sp, 0xC] movs r0, 0x2 - bl sub_815C980 + bl DigitObjUtil_Init movs r0, 0 movs r1, 0 mov r2, sp - bl sub_815CA40 + bl DigitObjUtil_CreatePrinter mov r1, sp movs r0, 0x4 strb r0, [r1, 0x1] @@ -6314,7 +6317,7 @@ sub_814A9C8: @ 814A9C8 movs r0, 0x1 movs r1, 0 mov r2, sp - bl sub_815CA40 + bl DigitObjUtil_CreatePrinter add sp, 0x10 pop {r4} pop {r0} @@ -6329,7 +6332,7 @@ sub_814AA24: @ 814AA24 push {lr} adds r1, r0, 0 movs r0, 0 - bl sub_815CD70 + bl DigitObjUtil_PrintNumOn pop {r0} bx r0 thumb_func_end sub_814AA24 @@ -6341,7 +6344,7 @@ sub_814AA34: @ 814AA34 lsls r1, 16 lsrs r1, 16 movs r0, 0x1 - bl sub_815CD70 + bl DigitObjUtil_PrintNumOn pop {r0} bx r0 thumb_func_end sub_814AA34 |