diff options
Diffstat (limited to 'asm/decoration.s')
| -rw-r--r-- | asm/decoration.s | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/asm/decoration.s b/asm/decoration.s index 4efc70e04..3aa7a0784 100644 --- a/asm/decoration.s +++ b/asm/decoration.s @@ -336,7 +336,7 @@ sub_8126C48: @ 8126C48 cmp r0, 0 bne _08126C7C ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA83D + ldr r1, =gText_NoDecorations adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8126DA4 @@ -376,7 +376,7 @@ sub_8126CA4: @ 8126CA4 cmp r0, 0 bne _08126CD8 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAAEC + ldr r1, =gText_NoDecorationsInUse adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8126DA4 @@ -420,7 +420,7 @@ sub_8126D10: @ 8126D10 cmp r0, 0 bne _08126D44 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA83D + ldr r1, =gText_NoDecorations adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8126DA4 @@ -656,7 +656,7 @@ _08126F0C: ldr r2, =gText_Cancel cmp r0, 0x2 bne _08126F2C - ldr r2, =gUnknown_085EB7EA + ldr r2, =gText_Exit _08126F2C: lsls r0, r4, 4 adds r0, 0x1 @@ -798,7 +798,7 @@ sub_8127058: @ 8127058 adds r5, r0, 0 lsls r4, r1, 24 lsrs r4, 24 - ldr r1, =gUnknown_085EA7C8 + ldr r1, =gText_Color161Shadow161 bl StringCopy cmp r4, 0x1 bne _08127078 @@ -909,7 +909,7 @@ _08127154: movs r0, 0x1 bl sub_8126A58 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA83D + ldr r1, =gText_NoDecorations adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8127180 @@ -2637,7 +2637,7 @@ sub_8127F68: @ 8127F68 cmp r0, 0x7 beq _08127FAC ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA9AE + ldr r1, =gText_CantPlaceInRoom adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8127A5C @@ -2682,13 +2682,13 @@ _08127FE8: cmp r0, 0 bne _08128018 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA8EA + ldr r1, =gText_NoMoreDecorations bl StringExpandPlaceholders b _08128020 .pool _08128018: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA931 + ldr r1, =gText_NoMoreDecorations2 bl StringExpandPlaceholders _08128020: ldr r1, =gStringVar4 @@ -2699,7 +2699,7 @@ _08128020: .pool _08128038: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA8D2 + ldr r1, =gText_InUseAlready adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8127A5C @@ -3169,7 +3169,7 @@ sub_8128414: @ 8128414 strh r2, [r0, 0x3C] bl sub_8128DE0 ldr r5, =gStringVar4 - ldr r1, =gUnknown_085EA8BF + ldr r1, =gText_CancelDecorating adds r0, r5, 0 bl StringExpandPlaceholders ldr r2, =sub_8128B80 @@ -3835,7 +3835,7 @@ sub_8128950: @ 8128950 cmp r0, 0x1 bne _081289A4 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA897 + ldr r1, =gText_PlaceItHere adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_81289D0 @@ -3848,7 +3848,7 @@ _081289A4: movs r0, 0x20 bl PlaySE ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA8A6 + ldr r1, =gText_CantBePlacedHere adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8129020 @@ -5810,7 +5810,7 @@ _08129968: cmp r0, 0x1 bne _08129994 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAAC5 + ldr r1, =gText_DecorationReturnedToPC adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8129D64 @@ -6137,7 +6137,7 @@ sub_8129BF8: @ 8129BF8 ldr r1, =SpriteCallbackDummy str r1, [r0] ldr r5, =gStringVar4 - ldr r1, =gUnknown_085EAA62 + ldr r1, =gText_StopPuttingAwayDecorations adds r0, r5, 0 bl StringExpandPlaceholders ldr r2, =sub_812A1F0 @@ -6162,7 +6162,7 @@ sub_8129C74: @ 8129C74 cmp r0, 0 beq _08129CA8 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAAA3 + ldr r1, =gText_ReturnDecorationToPC adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_812A1A0 @@ -6216,7 +6216,7 @@ _08129CDE: ldr r1, =SpriteCallbackDummy str r1, [r0] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAA62 + ldr r1, =gText_StopPuttingAwayDecorations adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_812A1F0 @@ -6228,7 +6228,7 @@ _08129D14: .pool _08129D3C: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAA81 + ldr r1, =gText_NoDecorationHere adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8129D64 @@ -7087,7 +7087,7 @@ sub_812A3D4: @ 812A3D4 adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAA14 + ldr r1, =gText_DecorationWillBeDiscarded adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_812A458 @@ -7098,7 +7098,7 @@ sub_812A3D4: @ 812A3D4 .pool _0812A430: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA9E0 + ldr r1, =gText_CantThrowAwayInUse adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8127A5C @@ -7151,7 +7151,7 @@ sub_812A478: @ 812A478 adds r0, r4, 0 bl sub_8127814 ldr r5, =gStringVar4 - ldr r1, =gUnknown_085EAA3D + ldr r1, =gText_DecorationThrownAway adds r0, r5, 0 bl StringExpandPlaceholders ldr r2, =sub_8127A5C |