pret/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-10-01 15:31:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

sub_805D774

Browse Source
This commit is contained in:
PikalaxALT
2017-05-21 18:50:23 -04:00
parent d2b87517b1
commit b2d1cdc930
2 changed files with 66 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_map_obj.s
-173
View File
@@ -6,179 +6,6 @@
.text
thumb_func_start sub_805D774
sub_805D774: @ 805D774
push {lr}
adds r1, r0, 0
movs r0, 0x2E
ldrsh r2, [r1, r0]
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
ldr r2, _0805D790 @ =gMapObjects
adds r0, r2
ldr r2, _0805D794 @ =sub_805D798
bl meta_step
pop {r0}
bx r0
.align 2, 0
_0805D790: .4byte gMapObjects
_0805D794: .4byte sub_805D798
thumb_func_end sub_805D774
thumb_func_start sub_805D798
sub_805D798: @ 805D798
push {r4,lr}
ldr r3, _0805D7B4 @ =gUnknown_0837530C
movs r4, 0x30
ldrsh r2, [r1, r4]
lsls r2, 2
adds r2, r3
ldr r2, [r2]
bl _call_via_r2
lsls r0, 24
lsrs r0, 24
pop {r4}
pop {r1}
bx r1
.align 2, 0
_0805D7B4: .4byte gUnknown_0837530C
thumb_func_end sub_805D798
thumb_func_start sub_805D7B8
sub_805D7B8: @ 805D7B8
push {r4,lr}
adds r4, r1, 0
bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_805D7B8
thumb_func_start sub_805D7CC
sub_805D7CC: @ 805D7CC
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl GetFaceDirectionAnimId
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
bl FieldObjectSetRegularAnim
movs r0, 0x2
strh r0, [r5, 0x30]
movs r0, 0x1
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_805D7CC
thumb_func_start sub_805D7F8
sub_805D7F8: @ 805D7F8
push {r4-r7,lr}
adds r6, r0, 0
adds r7, r1, 0
bl FieldObjectExecRegularAnim
lsls r0, 24
cmp r0, 0
beq _0805D82E
ldr r4, _0805D838 @ =gUnknown_0837521C
bl Random
movs r5, 0x3
adds r1, r5, 0
ands r1, r0
lsls r1, 1
adds r1, r4
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
bl sub_8064820
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
ands r0, r1
strb r0, [r6]
strh r5, [r7, 0x30]
_0805D82E:
movs r0, 0
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_0805D838: .4byte gUnknown_0837521C
thumb_func_end sub_805D7F8
thumb_func_start sub_805D83C
sub_805D83C: @ 805D83C
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
bl sub_8064824
lsls r0, 24
cmp r0, 0
bne _0805D85A
adds r0, r4, 0
bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _0805D862
_0805D85A:
movs r0, 0x4
strh r0, [r5, 0x30]
movs r0, 0x1
b _0805D864
_0805D862:
movs r0, 0
_0805D864:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_805D83C
thumb_func_start sub_805D86C
sub_805D86C: @ 805D86C
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
adds r5, r1, 0
ldr r1, _0805D8B0 @ =gUnknown_08375320
mov r0, sp
movs r2, 0x2
bl memcpy
adds r0, r4, 0
movs r1, 0x3
bl sub_805CD60
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
bne _0805D89C
bl Random
movs r1, 0x1
ands r1, r0
mov r2, sp
adds r0, r2, r1
ldrb r1, [r0]
_0805D89C:
adds r0, r4, 0
bl FieldObjectSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_0805D8B0: .4byte gUnknown_08375320
thumb_func_end sub_805D86C
thumb_func_start sub_805D8B4
sub_805D8B4: @ 805D8B4
push {lr}
src/field_map_obj.c
+66 -1
View File
@@ -43,6 +43,7 @@ extern u8 (*const gUnknown_083752C4[])(struct MapObject *mapObject, struct Sprit
extern u8 (*const gUnknown_083752D0[])(struct MapObject *mapObject, struct Sprite *sprite);
extern u8 (*const gUnknown_083752E4[])(struct MapObject *mapObject, struct Sprite *sprite);
extern u8 (*const gUnknown_083752F8[])(struct MapObject *mapObject, struct Sprite *sprite);
extern u8 (*const gUnknown_0837530C[])(struct MapObject *mapObject, struct Sprite *sprite);
struct PairedPalettes
{
@@ -1559,6 +1560,7 @@ u8 sub_805C904(struct MapObject *mapObject, struct Sprite *sprite)
extern u8 FieldObjectExecRegularAnim(struct MapObject *, struct Sprite *);
extern const s16 gUnknown_0837520C[];
extern const s16 gUnknown_0837521C[];
extern void sub_8064820(struct Sprite *, s16);
u8 sub_805C930(struct MapObject *mapObject, struct Sprite *sprite)
@@ -1587,6 +1589,7 @@ u8 sub_805C96C(struct MapObject *mapObject, struct Sprite *sprite)
extern const u8 gUnknown_08375240[4];
extern const u8 gUnknown_083752A0[2];
extern const u8 gUnknown_083752C0[2];
extern const u8 gUnknown_08375320[2];
extern u8 sub_805FF20(struct MapObject *, u8);
u8 sub_805C98C(struct MapObject *mapObject, struct Sprite *sprite)
@@ -2350,7 +2353,69 @@ u8 sub_805D72C(struct MapObject *mapObject, struct Sprite *sprite)
return 1;
}
void sub_805D774(struct Sprite *sprite);
u8 sub_805D798(struct MapObject *mapObject, struct Sprite *sprite);
void sub_805D774(struct Sprite *sprite)
{
meta_step(&gMapObjects[sprite->data0], sprite, sub_805D798);
}
u8 sub_805D798(struct MapObject *mapObject, struct Sprite *sprite)
{
return gUnknown_0837530C[sprite->data1](mapObject, sprite);
}
u8 sub_805D7B8(struct MapObject *mapObject, struct Sprite *sprite)
{
npc_reset(mapObject, sprite);
sprite->data1 = 1;
return 1;
}
u8 sub_805D7CC(struct MapObject *mapObject, struct Sprite *sprite)
{
FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
sprite->data1 = 2;
return 1;
}
u8 sub_805D7F8(struct MapObject *mapObject, struct Sprite *sprite)
{
if (FieldObjectExecRegularAnim(mapObject, sprite))
{
sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
mapObject->mapobj_bit_1 = 0;
sprite->data1 = 3;
}
return 0;
}
u8 sub_805D83C(struct MapObject *mapObject, struct Sprite *sprite)
{
if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
{
sprite->data1 = 4;
return 1;
}
return 0;
}
u8 sub_805D86C(struct MapObject *mapObject, struct Sprite *sprite)
{
u8 direction;
u8 directions[2];
memcpy(directions, gUnknown_08375320, 2);
direction = sub_805CD60(mapObject, 3);
if (direction == 0)
{
direction = directions[Random() & 1];
}
FieldObjectSetDirection(mapObject, direction);
sprite->data1 = 1;
return 1;
}
void sub_805D8B4(struct Sprite *sprite);
void sub_805D9F4(struct Sprite *sprite);
void sub_805DB34(struct Sprite *sprite);