summaryrefslogtreecommitdiff
path: root/src/field
diff options
context:
space:
mode:
Diffstat (limited to 'src/field')
-rw-r--r--src/field/choose_party.c2
-rw-r--r--src/field/field_player_avatar.c4
-rw-r--r--src/field/party_menu.c2
-rw-r--r--src/field/secret_base.c6
4 files changed, 7 insertions, 7 deletions
diff --git a/src/field/choose_party.c b/src/field/choose_party.c
index fd5808fc3..b2d950e35 100644
--- a/src/field/choose_party.c
+++ b/src/field/choose_party.c
@@ -540,7 +540,7 @@ void debug_sub_81381B4()
" add r0, r4, #0\n"
" mov r1, #0x0\n"
" mov r2, #0x60\n"
- " bl gMysteryEventScriptCmdTableEnd+0x5c24\n"
+ " bl memset\n"
" mov r7, #0x0\n"
" mov r8, r4\n"
" mov r0, #0x4\n"
diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c
index 85cfdb829..c382db19f 100644
--- a/src/field/field_player_avatar.c
+++ b/src/field/field_player_avatar.c
@@ -291,7 +291,7 @@ u8 TryDoMetatileBehaviorForcedMovement()
" lsr r0, r0, #0x16\n"
" add r0, r0, r4\n"
" ldr r0, [r0]\n"
- " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n"
+ " bl _call_via_r0\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x18\n"
"._26:\n"
@@ -513,7 +513,7 @@ void MovePlayerNotOnBike(u8 u81, u16 u161)
" ldr r2, [r0]\n"
" add r0, r5, #0\n"
" add r1, r6, #0\n"
- " bl gMysteryEventScriptCmdTableEnd+0x3cfc\n"
+ " bl _call_via_r2\n"
"._83:\n"
" pop {r4, r5, r6}\n"
" pop {r0}\n"
diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index 4fdb17786..4108145c1 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -989,7 +989,7 @@ bool8 InitPartyMenu(void)
add r2, r2, #0x4\n\
add r0, r0, r2\n\
ldr r0, [r0]\n\
- bl gMysteryEventScriptCmdTableEnd+0x3cf4\n\
+ bl _call_via_r0\n\
lsl r0, r0, #0x18\n\
lsr r0, r0, #0x18\n\
cmp r0, #0x1\n\
diff --git a/src/field/secret_base.c b/src/field/secret_base.c
index 082e8ebc6..01e9711dc 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -1686,13 +1686,13 @@ void sub_80BD674(void *playerRecords, u32 size, u8 c)
add r0, r6, r4\n\
mov r1, #0x0\n\
add r2, r5, #0\n\
- bl gMysteryEventScriptCmdTableEnd+0x5c24\n\
+ bl memset\n\
add r4, r4, r5\n\
add r4, r6, r4\n\
add r0, r4, #0\n\
mov r1, #0x0\n\
add r2, r5, #0\n\
- bl gMysteryEventScriptCmdTableEnd+0x5c24\n\
+ bl memset\n\
b ._505\n\
._501:\n\
lsl r0, r5, #0x1\n\
@@ -1700,7 +1700,7 @@ void sub_80BD674(void *playerRecords, u32 size, u8 c)
add r0, r6, r0\n\
mov r1, #0x0\n\
add r2, r5, #0\n\
- bl gMysteryEventScriptCmdTableEnd+0x5c24\n\
+ bl memset\n\
._505:\n\
cmp r7, #0x1\n\
beq ._506 @cond_branch\n\