dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Rename some functions

Browse Source
This commit is contained in:
PikalaxALT
2017-09-14 08:38:21 -04:00
parent c1c12981fe
commit 0ae3347e47
4 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
asm/field_map_obj.s
View File

@@ -95,7 +95,7 @@ sub_808FB08: @ 808FB08
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r6, 0
bl sub_8097978
bl SetFieldObjectStepTimer
strh r4, [r6, 0x30]
movs r0, 0x1
b _0808FB3E
@@ -114,7 +114,7 @@ sub_808FB44: @ 808FB44
push {r4,lr}
adds r4, r1, 0
adds r0, r4, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _0808FB58
@@ -307,7 +307,7 @@ sub_808FC8C: @ 808FC8C
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r6, 0
bl sub_8097978
bl SetFieldObjectStepTimer
strh r4, [r6, 0x30]
movs r0, 0x1
b _0808FCC2
@@ -325,7 +325,7 @@ sub_808FCC8: @ 808FCC8
push {r4,lr}
adds r4, r1, 0
adds r0, r4, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _0808FCDC
@@ -910,7 +910,7 @@ sub_80900D4: @ 80900D4
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
bl sub_8097978
bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -931,7 +931,7 @@ sub_8090118: @ 8090118
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _08090136
@@ -965,7 +965,7 @@ sub_8090148: @ 8090148
bl memcpy
adds r0, r4, 0
movs r1, 0x1
bl sub_808F8BC
bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -1078,7 +1078,7 @@ sub_8090214: @ 8090214
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
bl sub_8097978
bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -1099,7 +1099,7 @@ sub_8090258: @ 8090258
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _08090276
@@ -1133,7 +1133,7 @@ sub_8090288: @ 8090288
bl memcpy
adds r0, r4, 0
movs r1, 0x2
bl sub_808F8BC
bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -1246,7 +1246,7 @@ sub_8090354: @ 8090354
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
bl sub_8097978
bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -1267,7 +1267,7 @@ sub_8090398: @ 8090398
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _080903B6
@@ -1301,7 +1301,7 @@ sub_80903C8: @ 80903C8
bl memcpy
adds r0, r4, 0
movs r1, 0x3
bl sub_808F8BC
bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -1414,7 +1414,7 @@ sub_8090494: @ 8090494
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
bl sub_8097978
bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -1435,7 +1435,7 @@ sub_80904D8: @ 80904D8
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _080904F6
@@ -1469,7 +1469,7 @@ sub_8090508: @ 8090508
bl memcpy
adds r0, r4, 0
movs r1, 0x4
bl sub_808F8BC
bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -1582,7 +1582,7 @@ sub_80905D4: @ 80905D4
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
bl sub_8097978
bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -1603,7 +1603,7 @@ sub_8090618: @ 8090618
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _08090636
@@ -1637,7 +1637,7 @@ sub_8090648: @ 8090648
bl memcpy
adds r0, r4, 0
movs r1, 0x5
bl sub_808F8BC
bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -1750,7 +1750,7 @@ sub_8090714: @ 8090714
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
bl sub_8097978
bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -1771,7 +1771,7 @@ sub_8090758: @ 8090758
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _08090776
@@ -1805,7 +1805,7 @@ sub_8090788: @ 8090788
bl memcpy
adds r0, r4, 0
movs r1, 0x6
bl sub_808F8BC
bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -1918,7 +1918,7 @@ sub_8090854: @ 8090854
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
bl sub_8097978
bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -1939,7 +1939,7 @@ sub_8090898: @ 8090898
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _080908B6
@@ -1973,7 +1973,7 @@ sub_80908C8: @ 80908C8
bl memcpy
adds r0, r4, 0
movs r1, 0x7
bl sub_808F8BC
bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -2086,7 +2086,7 @@ sub_8090994: @ 8090994
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
bl sub_8097978
bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -2107,7 +2107,7 @@ sub_80909D8: @ 80909D8
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _080909F6
@@ -2141,7 +2141,7 @@ sub_8090A08: @ 8090A08
bl memcpy
adds r0, r4, 0
movs r1, 0x8
bl sub_808F8BC
bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -2254,7 +2254,7 @@ sub_8090AD4: @ 8090AD4
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
bl sub_8097978
bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -2275,7 +2275,7 @@ sub_8090B18: @ 8090B18
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _08090B36
@@ -2309,7 +2309,7 @@ sub_8090B48: @ 8090B48
bl memcpy
adds r0, r4, 0
movs r1, 0x9
bl sub_808F8BC
bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -2422,7 +2422,7 @@ sub_8090C14: @ 8090C14
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
bl sub_8097978
bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -2443,7 +2443,7 @@ sub_8090C58: @ 8090C58
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _08090C76
@@ -2477,7 +2477,7 @@ sub_8090C88: @ 8090C88
bl memcpy
adds r0, r4, 0
movs r1, 0xA
bl sub_808F8BC
bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -2569,7 +2569,7 @@ sub_8090D40: @ 8090D40
beq _08090D5A
adds r0, r4, 0
movs r1, 0x30
bl sub_8097978
bl SetFieldObjectStepTimer
movs r0, 0x2
strh r0, [r4, 0x30]
_08090D5A:
@@ -2585,7 +2585,7 @@ sub_8090D64: @ 8090D64
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _08090D82
@@ -2617,7 +2617,7 @@ sub_8090D90: @ 8090D90
bl memcpy
adds r0, r4, 0
movs r1, 0
bl sub_808F8BC
bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -2709,7 +2709,7 @@ sub_8090E44: @ 8090E44
beq _08090E5E
adds r0, r4, 0
movs r1, 0x30
bl sub_8097978
bl SetFieldObjectStepTimer
movs r0, 0x2
strh r0, [r4, 0x30]
_08090E5E:
@@ -2725,7 +2725,7 @@ sub_8090E68: @ 8090E68
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _08090E86
@@ -2756,7 +2756,7 @@ sub_8090E94: @ 8090E94
bl memcpy
adds r0, r4, 0
movs r1, 0
bl sub_808F8BC
bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -12667,7 +12667,7 @@ sub_80955C8: @ 80955C8
beq _080955E4
adds r0, r4, 0
movs r1, 0x20
bl sub_8097978
bl SetFieldObjectStepTimer
movs r0, 0x2
strh r0, [r4, 0x32]
_080955E4:
@@ -12693,7 +12693,7 @@ sub_80955EC: @ 80955EC
orrs r0, r1
strb r0, [r4, 0x1]
adds r0, r5, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
beq _0809561E
@@ -12737,7 +12737,7 @@ sub_8095644: @ 8095644
beq _08095660
adds r0, r4, 0
movs r1, 0x20
bl sub_8097978
bl SetFieldObjectStepTimer
movs r0, 0x2
strh r0, [r4, 0x32]
_08095660:
@@ -12763,7 +12763,7 @@ sub_8095668: @ 8095668
orrs r0, r1
strb r0, [r4, 0x1]
adds r0, r5, 0
bl sub_809797C
bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
beq _0809569A

16
asm/map_obj_8097404.s
View File

@@ -769,16 +769,16 @@ _08097964:
.pool
thumb_func_end sub_80978E4
thumb_func_start sub_8097978
@ void sub_8097978(struct obj *object, u16 a2)
sub_8097978: @ 8097978
thumb_func_start SetFieldObjectStepTimer
@ void SetFieldObjectStepTimer(struct obj *object, u16 a2)
SetFieldObjectStepTimer: @ 8097978
strh r1, [r0, 0x34]
bx lr
thumb_func_end sub_8097978
thumb_func_end SetFieldObjectStepTimer
thumb_func_start sub_809797C
@ bool8 sub_809797C(struct obj *object)
sub_809797C: @ 809797C
thumb_func_start RunFieldObjectStepTimer
@ bool8 RunFieldObjectStepTimer(struct obj *object)
RunFieldObjectStepTimer: @ 809797C
push {lr}
ldrh r1, [r0, 0x34]
subs r1, 0x1
@@ -793,7 +793,7 @@ _0809798E:
_08097990:
pop {r1}
bx r1
thumb_func_end sub_809797C
thumb_func_end RunFieldObjectStepTimer
thumb_func_start obj_anim_image_set_and_seek
obj_anim_image_set_and_seek: @ 8097994

4
include/data3.h
View File

@@ -17,7 +17,7 @@ extern const struct SpritePalette gUnknown_0850BBC8[];
extern const struct PairedPalettes gUnknown_0850BD00[15];
extern const struct PairedPalettes gUnknown_0850BD78[15];
extern const u16 *const gUnknown_0850BE38[2];
extern const s16 gUnknown_0850D6DC[4];
extern const u8 gUnknown_0850D710[4];
extern const s16 gUnknown_0850D6DC[4]; // {0x20, 0x40, 0x60, 0x80}
extern const u8 gUnknown_0850D710[4]; // {DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST}
#endif //POKEEMERALD_DATA3_H

16
src/field_map_obj.c
View File

@@ -81,8 +81,8 @@ void npc_reset(struct MapObject *, struct Sprite *);
void FieldObjectSetRegularAnim(struct MapObject *, struct Sprite *, u8);
u8 GetFaceDirectionAnimId(u8);
bool8 FieldObjectExecRegularAnim(struct MapObject *, struct Sprite *);
void sub_8097978(struct Sprite *, s16);
bool8 sub_809797C(struct Sprite *);
void SetFieldObjectStepTimer(struct Sprite *, s16);
bool8 RunFieldObjectStepTimer(struct Sprite *);
bool8 sub_8092B88(struct MapObject *, u8);
u8 GetGoSpeed0AnimId(u8);
@@ -1752,14 +1752,14 @@ bool8 sub_808F48C(struct MapObject *mapObject, struct Sprite *sprite)
{
return FALSE;
}
sub_8097978(sprite, gUnknown_0850D6DC[Random() & 0x03]);
SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]);
sprite->data1 = 3;
return TRUE;
}
bool8 sub_808F4C8(struct MapObject *mapObject, struct Sprite *sprite)
{
if (sub_809797C(sprite))
if (RunFieldObjectStepTimer(sprite))
{
sprite->data1 = 4;
return TRUE;
@@ -2025,7 +2025,7 @@ u8 GetNonNorthRunningPastFacingDirection(s16 dx, s16 dy, s16 absdx, s16 absdy)
return direction;
}
u8 sub_808F8BC(struct MapObject *mapObject, u8 movementType)
u8 GetRunningPastFacingDirection(struct MapObject *mapObject, u8 movementType)
{
s16 dx;
s16 dy;
@@ -2072,7 +2072,7 @@ bool8 sub_808F9C8(struct MapObject *mapObject, struct Sprite *sprite)
{
if (FieldObjectExecRegularAnim(mapObject, sprite))
{
sub_8097978(sprite, gUnknown_0850D6DC[Random() & 0x03]);
SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]);
mapObject->mapobj_bit_1 = FALSE;
sprite->data1 = 3;
}
@@ -2081,7 +2081,7 @@ bool8 sub_808F9C8(struct MapObject *mapObject, struct Sprite *sprite)
bool8 sub_808FA0C(struct MapObject *mapObject, struct Sprite *sprite)
{
if (sub_809797C(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
{
sprite->data1 = 4;
return TRUE;
@@ -2095,7 +2095,7 @@ bool8 sub_808FA3C(struct MapObject *mapObject, struct Sprite *sprite)
u8 direction;
memcpy(directions, gUnknown_0850D710, sizeof directions);
direction = sub_808F8BC(mapObject, 0);
direction = GetRunningPastFacingDirection(mapObject, 0);
if (direction == 0)
{
direction = directions[Random() & 0x03];