diff options
Diffstat (limited to 'asm/scrcmd.s')
| -rw-r--r-- | asm/scrcmd.s | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/asm/scrcmd.s b/asm/scrcmd.s index ec78da1d5..0bff9395c 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -3065,7 +3065,7 @@ ScrCmd_resetobjectpriority: @ 806B58C thumb_func_start ScrCmd_faceplayer ScrCmd_faceplayer: @ 806B5BC push {r4,lr} - ldr r2, _0806B5EC @ =gUnknown_2036E38 + ldr r2, _0806B5EC @ =gMapObjects ldr r0, _0806B5F0 @ =gUnknown_3005074 ldrb r1, [r0] lsls r0, r1, 3 @@ -3088,7 +3088,7 @@ _0806B5E4: pop {r1} bx r1 .align 2, 0 -_0806B5EC: .4byte gUnknown_2036E38 +_0806B5EC: .4byte gMapObjects _0806B5F0: .4byte gUnknown_3005074 thumb_func_end ScrCmd_faceplayer @@ -3245,7 +3245,7 @@ ScrCmd_lock: @ 806B704 movs r0, 0 b _0806B752 _0806B714: - ldr r2, _0806B738 @ =gUnknown_2036E38 + ldr r2, _0806B738 @ =gMapObjects ldr r0, _0806B73C @ =gUnknown_3005074 ldrb r1, [r0] lsls r0, r1, 3 @@ -3262,7 +3262,7 @@ _0806B714: bl SetupNativeScript b _0806B750 .align 2, 0 -_0806B738: .4byte gUnknown_2036E38 +_0806B738: .4byte gMapObjects _0806B73C: .4byte gUnknown_3005074 _0806B740: .4byte sub_8069648 _0806B744: @@ -3294,7 +3294,7 @@ ScrCmd_releaseall: @ 806B75C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0806B790 @ =gUnknown_2036E38 + ldr r1, _0806B790 @ =gMapObjects adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished bl sub_80974D8 @@ -3303,14 +3303,14 @@ ScrCmd_releaseall: @ 806B75C pop {r1} bx r1 .align 2, 0 -_0806B790: .4byte gUnknown_2036E38 +_0806B790: .4byte gMapObjects thumb_func_end ScrCmd_releaseall thumb_func_start ScrCmd_release ScrCmd_release: @ 806B794 push {r4,lr} bl HideFieldMessageBox - ldr r4, _0806B7E4 @ =gUnknown_2036E38 + ldr r4, _0806B7E4 @ =gMapObjects ldr r0, _0806B7E8 @ =gUnknown_3005074 ldrb r1, [r0] lsls r0, r1, 3 @@ -3343,7 +3343,7 @@ _0806B7B6: pop {r1} bx r1 .align 2, 0 -_0806B7E4: .4byte gUnknown_2036E38 +_0806B7E4: .4byte gMapObjects _0806B7E8: .4byte gUnknown_3005074 thumb_func_end ScrCmd_release @@ -4022,7 +4022,7 @@ ScrCmd_bufferspeciesname: @ 806BC88 ldr r2, [r4] movs r1, 0xB muls r1, r0 - ldr r0, _0806BCC4 @ =gUnknown_8245EE0 + ldr r0, _0806BCC4 @ =gSpeciesNames adds r1, r0 adds r0, r2, 0 bl StringCopy @@ -4032,7 +4032,7 @@ ScrCmd_bufferspeciesname: @ 806BC88 bx r1 .align 2, 0 _0806BCC0: .4byte gUnknown_83A7294 -_0806BCC4: .4byte gUnknown_8245EE0 +_0806BCC4: .4byte gSpeciesNames thumb_func_end ScrCmd_bufferspeciesname thumb_func_start ScrCmd_bufferleadmonspeciesname @@ -4058,7 +4058,7 @@ ScrCmd_bufferleadmonspeciesname: @ 806BCC8 bl GetMonData movs r1, 0xB muls r1, r0 - ldr r0, _0806BD10 @ =gUnknown_8245EE0 + ldr r0, _0806BD10 @ =gSpeciesNames adds r1, r0 adds r0, r4, 0 bl StringCopy @@ -4069,7 +4069,7 @@ ScrCmd_bufferleadmonspeciesname: @ 806BCC8 .align 2, 0 _0806BD08: .4byte gUnknown_83A7294 _0806BD0C: .4byte gPlayerParty -_0806BD10: .4byte gUnknown_8245EE0 +_0806BD10: .4byte gSpeciesNames thumb_func_end ScrCmd_bufferleadmonspeciesname thumb_func_start ScrCmd_bufferpartymonnick @@ -5537,7 +5537,7 @@ ScrCmd_setmonobedient: @ 806C7D4 adds r0, r1 movs r1, 0x50 mov r2, sp - bl sub_804037C + bl SetMonData movs r0, 0 add sp, 0x4 pop {r1} @@ -5598,7 +5598,7 @@ sub_806C844: @ 806C844 adds r0, r1 movs r1, 0x23 mov r2, sp - bl sub_804037C + bl SetMonData _0806C87A: movs r0, 0 add sp, 0x4 |