summaryrefslogtreecommitdiff
path: root/asm/mystery_event_script.s
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2017-01-14 11:53:20 -0800
committerYamaArashi <shadow962@live.com>2017-01-14 14:20:49 -0800
commit12681346688870e71b1a33dae7e52f9e1302080f (patch)
tree4b489a31e653ca27d43bd5f8c3c6d00c25394134 /asm/mystery_event_script.s
parent2f76de380c28a7c0f2163e1f45e1ff007258f877 (diff)
decompile string_util
Diffstat (limited to 'asm/mystery_event_script.s')
-rw-r--r--asm/mystery_event_script.s76
1 files changed, 38 insertions, 38 deletions
diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s
index d888aad52..94a42060d 100644
--- a/asm/mystery_event_script.s
+++ b/asm/mystery_event_script.s
@@ -42,9 +42,9 @@ _081537FE:
thumb_func_start sub_8153804
sub_8153804: @ 8153804
push {lr}
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_08674C86
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x3
bl sub_81538C4
pop {r0}
@@ -152,7 +152,7 @@ sub_81538C4: @ 81538C4
sub_81538D0: @ 81538D0
push {lr}
movs r2, 0
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x00003b18
adds r3, r0, r1
@@ -173,7 +173,7 @@ _081538DE:
thumb_func_start sub_81538F8
sub_81538F8: @ 81538F8
push {r4,r5,lr}
- ldr r5, =gUnknown_03005D8C
+ ldr r5, =gSaveBlock1Ptr
ldr r0, [r5]
ldr r1, =0x00003b18
adds r4, r0, r1
@@ -215,7 +215,7 @@ sub_8153944: @ 8153944
mov r1, sp
movs r0, 0
strh r0, [r1]
- ldr r0, =gUnknown_03005D8C
+ ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, =0x00003b14
adds r1, r0
@@ -250,7 +250,7 @@ _08153990:
bl sub_8153944
b _081539BC
_08153996:
- ldr r4, =gUnknown_03005D8C
+ ldr r4, =gSaveBlock1Ptr
ldr r0, [r4]
ldr r1, =0x00003b18
adds r0, r1
@@ -278,7 +278,7 @@ _081539BC:
thumb_func_start sub_81539D4
sub_81539D4: @ 81539D4
push {r4-r6,lr}
- ldr r6, =gUnknown_03005D8C
+ ldr r6, =gSaveBlock1Ptr
ldr r0, [r6]
ldr r1, =0x00003b18
adds r4, r0, r1
@@ -399,8 +399,8 @@ sub_8153A94: @ 8153A94
cmp r5, r0
bne _08153ABE
_08153AB8:
- ldr r0, =gUnknown_02021FC4
- bl ExpandStringRefs
+ ldr r0, =gStringVar4
+ bl StringExpandPlaceholders
_08153ABE:
movs r0, 0
pop {r4,r5}
@@ -441,44 +441,44 @@ sub_8153AE8: @ 8153AE8
subs r4, r0
ldr r0, [r7, 0x64]
adds r4, r0
- ldr r0, =gUnknown_02021CC4
+ ldr r0, =gStringVar1
mov r9, r0
- ldr r6, =gUnknown_03005D8C
+ ldr r6, =gSaveBlock1Ptr
ldr r1, [r6]
ldr r5, =0x000031f8
adds r1, r5
movs r2, 0x7
- bl CopyString_LimitN
+ bl StringCopyN
adds r0, r4, 0
bl sub_80E15E4
- ldr r4, =gUnknown_02021DC4
+ ldr r4, =gStringVar2
ldr r1, [r6]
adds r1, r5
adds r0, r4, 0
movs r2, 0x7
- bl CopyString_LimitN
+ bl StringCopyN
mov r0, r8
cmp r0, 0
bne _08153B54
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_08674AE4
b _08153B74
.pool
_08153B54:
mov r0, r9
adds r1, r4, 0
- bl CompareString
+ bl StringCompare
cmp r0, 0
beq _08153B70
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_08674B16
b _08153B74
.pool
_08153B70:
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_08674B42
_08153B74:
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r7, 0x6C]
bl sub_80E162C
@@ -514,9 +514,9 @@ sub_8153BB0: @ 8153BB0
adds r2, 0x1
str r2, [r4, 0x8]
bl sub_80F9B30
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_08674B6A
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
@@ -583,9 +583,9 @@ sub_8153C4C: @ 8153C4C
push {r4,lr}
adds r4, r0, 0
bl sub_809D3E8
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_08674B9E
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
@@ -604,9 +604,9 @@ sub_8153C70: @ 8153C70
adds r1, 0x1
str r1, [r4, 0x8]
bl sub_811EFC0
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_08674BD4
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
@@ -668,25 +668,25 @@ sub_8153CC8: @ 8153CC8
lsls r0, 1
cmp r4, r0
bne _08153D18
- ldr r0, =gUnknown_02021CC4
+ ldr r0, =gStringVar1
ldr r1, =gUnknown_085E8264
movs r2, 0xB
- bl CopyString_LimitN
+ bl StringCopyN
b _08153D22
.pool
_08153D18:
- ldr r0, =gUnknown_02021CC4
+ ldr r0, =gStringVar1
ldr r1, =gUnknown_085E8268
movs r2, 0xB
- bl CopyString_LimitN
+ bl StringCopyN
_08153D22:
ldr r0, =gUnknown_020244E9
ldrb r0, [r0]
cmp r0, 0x6
bne _08153D4C
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_08674C02
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x3
b _08153DB6
.pool
@@ -731,9 +731,9 @@ _08153D86:
_08153DA4:
bl party_compaction
bl calc_player_party_count
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_08674BF0
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x2
_08153DB6:
str r0, [r6, 0x6C]
@@ -757,16 +757,16 @@ sub_8153DD4: @ 8153DD4
subs r1, r0
ldr r0, [r4, 0x64]
adds r1, r0
- ldr r0, =gUnknown_03005D90
+ ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000bec
adds r0, r2
movs r2, 0xBC
bl memcpy
bl sub_81652B4
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_08674C31
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
@@ -781,9 +781,9 @@ sub_8153E1C: @ 8153E1C
push {r4,lr}
adds r4, r0, 0
bl sub_809D5F4
- ldr r0, =gUnknown_02021FC4
+ ldr r0, =gStringVar4
ldr r1, =gUnknown_085ECAD8
- bl ExpandStringRefs
+ bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0