sub_810D24C
This commit is contained in:
@@ -5,33 +5,6 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_810D24C
|
||||
sub_810D24C: @ 810D24C
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
ldrb r1, [r4, 0x7]
|
||||
lsls r0, r1, 3
|
||||
adds r0, r1
|
||||
lsls r0, 2
|
||||
ldr r1, _0810D278 @ =gUnknown_2036E38
|
||||
adds r0, r1
|
||||
bl npc_sync_anim_pause_bits
|
||||
ldrb r0, [r4, 0x6]
|
||||
ldr r1, _0810D27C @ =gSaveBlock1Ptr
|
||||
ldr r2, [r1]
|
||||
ldrb r1, [r2, 0x5]
|
||||
ldrb r2, [r2, 0x4]
|
||||
adds r3, r5, 0
|
||||
bl ScriptMovement_StartObjectMovementScript
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0810D278: .4byte gUnknown_2036E38
|
||||
_0810D27C: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end sub_810D24C
|
||||
|
||||
thumb_func_start sub_810D280
|
||||
sub_810D280: @ 810D280
|
||||
push {r4-r7,lr}
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "random.h"
|
||||
#include "field_map_obj.h"
|
||||
#include "field_player_avatar.h"
|
||||
#include "map_obj_8097404.h"
|
||||
#include "unk_810c3a4.h"
|
||||
#include "vs_seeker.h"
|
||||
|
||||
@@ -1043,3 +1044,9 @@ u8 sub_810D1CC(void)
|
||||
|
||||
return 0xFF;
|
||||
}
|
||||
|
||||
void sub_810D24C(struct VsSeekerSubstruct * a0, const u8 * a1)
|
||||
{
|
||||
npc_sync_anim_pause_bits(&gUnknown_2036E38[a0->unk_7]);
|
||||
ScriptMovement_StartObjectMovementScript(a0->unk_6, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, a1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user