summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--.gitmodules3
-rw-r--r--asm/field_map_obj.s143
-rw-r--r--include/field_map_obj.h43
-rw-r--r--src/field_map_obj.c261
-rw-r--r--src/field_player_avatar.c12
m---------tools/agbcc0
7 files changed, 92 insertions, 371 deletions
diff --git a/.gitignore b/.gitignore
index 78af8c737..13752b437 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@
*.bat
sound/**/*.bin
src/*.s
-tools/agbcc
ld_script_ruby.txt
ld_script_sapphire.txt
*.map
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..7dbd4ef6d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tools/agbcc"]
+ path = tools/agbcc
+ url = git@github.com:pret/agbcc
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index c3b867525..3db00279d 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -6,149 +6,6 @@
.text
- thumb_func_start sub_805E278
-sub_805E278: @ 805E278
- 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, _0805E294 @ =gMapObjects
- adds r0, r2
- ldr r2, _0805E298 @ =sub_805E29C
- bl meta_step
- pop {r0}
- bx r0
- .align 2, 0
-_0805E294: .4byte gMapObjects
-_0805E298: .4byte sub_805E29C
- thumb_func_end sub_805E278
-
- thumb_func_start sub_805E29C
-sub_805E29C: @ 805E29C
- push {r4,lr}
- ldr r3, _0805E2B8 @ =gUnknown_083753E4
- 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
-_0805E2B8: .4byte gUnknown_083753E4
- thumb_func_end sub_805E29C
-
- thumb_func_start sub_805E2BC
-sub_805E2BC: @ 805E2BC
- push {r4,r5,lr}
- adds r4, r0, 0
- adds r5, r1, 0
- bl npc_reset
- 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, 0x1
- strh r0, [r5, 0x30]
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_805E2BC
-
- thumb_func_start sub_805E2E8
-sub_805E2E8: @ 805E2E8
- push {r4,lr}
- adds r4, r1, 0
- bl FieldObjectExecRegularAnim
- lsls r0, 24
- cmp r0, 0
- beq _0805E302
- adds r0, r4, 0
- movs r1, 0x30
- bl sub_8064820
- movs r0, 0x2
- strh r0, [r4, 0x30]
-_0805E302:
- movs r0, 0
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_805E2E8
-
- thumb_func_start sub_805E30C
-sub_805E30C: @ 805E30C
- 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 _0805E32A
- adds r0, r4, 0
- bl FieldObjectIsTrainerAndCloseToPlayer
- lsls r0, 24
- cmp r0, 0
- beq _0805E32E
-_0805E32A:
- movs r0, 0x3
- strh r0, [r5, 0x30]
-_0805E32E:
- movs r0, 0
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_805E30C
-
- thumb_func_start sub_805E338
-sub_805E338: @ 805E338
- push {r4,r5,lr}
- sub sp, 0x8
- adds r4, r0, 0
- adds r5, r1, 0
- ldr r1, _0805E378 @ =gUnknown_083753F4
- mov r0, sp
- movs r2, 0x5
- bl memcpy
- adds r0, r4, 0
- movs r1, 0
- bl sub_805CD60
- lsls r0, 24
- lsrs r1, r0, 24
- cmp r1, 0
- bne _0805E364
- ldrb r0, [r4, 0x18]
- lsls r0, 28
- lsrs r0, 28
- add r0, sp
- ldrb r1, [r0]
-_0805E364:
- adds r0, r4, 0
- bl FieldObjectSetDirection
- movs r0, 0
- strh r0, [r5, 0x30]
- movs r0, 0x1
- add sp, 0x8
- pop {r4,r5}
- pop {r1}
- bx r1
- .align 2, 0
-_0805E378: .4byte gUnknown_083753F4
- thumb_func_end sub_805E338
-
thumb_func_start sub_805E37C
sub_805E37C: @ 805E37C
push {lr}
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 4c2d4c705..00fda8358 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -3,40 +3,49 @@
#include "sprite.h"
+#define fieldmap_object_cb(setup, callback, table) \
+extern u8 (*const table[])(struct MapObject *, struct Sprite *);\
+static u8 callback(struct MapObject *, struct Sprite *);\
+void setup(struct Sprite *sprite)\
+{\
+ meta_step(&gMapObjects[sprite->data0], sprite, callback);\
+}\
+static u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\
+{\
+ return table[sprite->data1](mapObject, sprite);\
+}
+
+#define fieldmap_object_null_cb(setup, callback) \
+static u8 callback(struct MapObject *, struct Sprite *);\
+void setup(struct Sprite *sprite)\
+{\
+ meta_step(&gMapObjects[sprite->data0], sprite, callback);\
+}\
+static u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\
+{\
+ return 0;\
+}
+
void sub_805C058(struct MapObject *mapObject, s16 a, s16 b);
void FieldObjectSetDirection(struct MapObject *pObject, u8 unk_18);
void MoveCoords(u8 direction, s16 *x, s16 *y);
-void meta_step(struct MapObject *pObject, struct Sprite *pSprite, u8 (*d8)());
+void meta_step(struct MapObject *pObject, struct Sprite *pSprite, u8 (*d8)(struct MapObject *, struct Sprite *));
+void npc_reset(struct MapObject *mapObject, struct Sprite *sprite);
extern const u8 gUnknown_08375240[4];
extern u8 (*const gUnknown_08375244[])(s16 a0, s16 a1, s16 a2, s16 a3);
-extern u8 (*const gUnknown_08375270[])(struct MapObject *mapObject, struct Sprite *sprite);
-extern u8 (*const gUnknown_08375284[])(struct MapObject *mapObject, struct Sprite *sprite);
extern const u8 gUnknown_083752A0[2];
-extern u8 (*const gUnknown_083752A4[])(struct MapObject *mapObject, struct Sprite *sprite);
extern const u8 gUnknown_083752C0[2];
-extern u8 (*const gUnknown_083752C4[])(struct MapObject *mapObject, struct Sprite *sprite);
-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);
extern const u8 gUnknown_08375320[2];
-extern u8 (*const gUnknown_08375324[])(struct MapObject *mapObject, struct Sprite *sprite);
extern const u8 gUnknown_08375338[2];
-extern u8 (*const gUnknown_0837533C[])(struct MapObject *mapObject, struct Sprite *sprite);
extern const u8 gUnknown_08375350[2];
-extern u8 (*const gUnknown_08375354[])(struct MapObject *mapObject, struct Sprite *sprite);
extern const u8 gUnknown_08375368[2];
-extern u8 (*const gUnknown_0837536C[])(struct MapObject *mapObject, struct Sprite *sprite);
extern const u8 gUnknown_08375380[2];
-extern u8 (*const gUnknown_08375384[])(struct MapObject *mapObject, struct Sprite *sprite);
extern const u8 gUnknown_08375398[2];
-extern u8 (*const gUnknown_0837539C[])(struct MapObject *mapObject, struct Sprite *sprite);
extern const u8 gUnknown_083753B0[2];
-extern u8 (*const gUnknown_083753B4[])(struct MapObject *mapObject, struct Sprite *sprite);
extern const u8 gUnknown_083753C8[2];
-extern u8 (*const gUnknown_083753CC[])(struct MapObject *mapObject, struct Sprite *sprite);
extern const u8 gUnknown_083753DC[5];
+extern const u8 gUnknown_083753F4[5];
#endif // GUARD_FIELD_MAP_OBJ_H
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 475620c28..b75f16d54 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -12,6 +12,7 @@
extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[36];
+
extern void strange_npc_table_clear(void);
extern void ClearPlayerAvatarInfo(void);
extern void npc_load_two_palettes__no_record(u16, u8);
@@ -1505,33 +1506,8 @@ u16 npc_paltag_by_palslot(u8 a)
return 0x11FF;
}
-u8 sub_805C8A8(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805C884(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805C8A8);
-}
-
-u8 sub_805C8A8(struct MapObject *mapObject, struct Sprite *sprite)
-{
- return 0;
-}
-
-u8 sub_805C8D0(struct MapObject *, struct Sprite *);
-
-void sub_805C8AC(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805C8D0);
-}
-
-extern u8 (*const gUnknown_08375224[])();
-
-u8 sub_805C8D0(struct MapObject *mapObject, struct Sprite *sprite)
-{
- return gUnknown_08375224[sprite->data1](mapObject, sprite);
-}
-
-void npc_reset(struct MapObject *mapObject, struct Sprite *sprite);
+fieldmap_object_null_cb(sub_805C884, sub_805C8A8);
+fieldmap_object_cb(sub_805C8AC, sub_805C8D0, gUnknown_08375224);
u8 sub_805C8F0(struct MapObject *mapObject, struct Sprite *sprite)
{
@@ -1849,17 +1825,7 @@ u8 sub_805CD60(struct MapObject *mapObject, u8 a1)
return gUnknown_08375244[a1](x, y, x2, y2);
}
-u8 sub_805CE0C(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805CDE8(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805CE0C);
-}
-
-u8 sub_805CE0C(struct MapObject *mapObject, struct Sprite *sprite)
-{
- return gUnknown_08375270[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805CDE8, sub_805CE0c, gUnknown_08375270);
u8 sub_805CE2C(struct MapObject *mapObject, struct Sprite *sprite)
{
@@ -1911,17 +1877,7 @@ u8 sub_805CEE0(struct MapObject *mapObject, struct Sprite *sprite)
return 1;
}
-u8 sub_805CF4C(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805CF28(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805CF4C);
-}
-
-u8 sub_805CF4C(struct MapObject *mapObject, struct Sprite *sprite)
-{
- return gUnknown_08375284[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805CF28, sub_805CF4C, gUnknown_08375284);
u8 sub_805CF6C(struct MapObject *mapObject, struct Sprite *sprite)
{
@@ -1991,17 +1947,7 @@ u8 sub_805D084(struct MapObject *mapObject, struct Sprite *sprite)
return 0;
}
-u8 sub_805D0D0(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805D0AC(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805D0D0);
-}
-
-u8 sub_805D0D0(struct MapObject *mapObject, struct Sprite *sprite)
-{
- return gUnknown_083752A4[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805D0AC, sub_805D0D0, gUnknown_083752A4);
u8 sub_805D0F0(struct MapObject *mapObject, struct Sprite *sprite)
{
@@ -2071,17 +2017,7 @@ u8 sub_805D208(struct MapObject *mapObject, struct Sprite *sprite)
return 0;
}
-u8 sub_805D254(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805D230(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805D254);
-}
-
-u8 sub_805D254(struct MapObject *mapObject, struct Sprite *sprite)
-{
- return gUnknown_083752C4[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805D230, sub_805D254, gUnknown_083752C4);
u8 sub_805D274(struct MapObject *mapObject, struct Sprite *sprite)
{
@@ -2108,6 +2044,7 @@ u8 sub_805D2C0(struct MapObject *mapObject, struct Sprite *sprite)
}
u8 sub_805D314(struct MapObject *mapObject, struct Sprite *sprite);
+extern u8 (*const gUnknown_083752D0[])(struct MapObject *mapObject, struct Sprite *sprite);
void FieldObjectCB_BerryTree(struct Sprite *sprite)
{
@@ -2215,17 +2152,7 @@ u8 sub_805D4A8(struct MapObject *mapObject, struct Sprite *sprite)
return 0;
}
-u8 sub_805D518(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805D4F4(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805D518);
-}
-
-u8 sub_805D518(struct MapObject *mapObject, struct Sprite *sprite)
-{
- return gUnknown_083752E4[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805D4F4, sub_805D518, gUnknown_083752E4);
u8 sub_805D538(struct MapObject *mapObject, struct Sprite *sprite)
{
@@ -2277,18 +2204,7 @@ u8 sub_805D5EC(struct MapObject *mapObject, struct Sprite *sprite)
return 1;
}
-
-u8 sub_805D658(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805D634(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805D658);
-}
-
-u8 sub_805D658(struct MapObject *mapObject, struct Sprite *sprite)
-{
- return gUnknown_083752F8[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805D634, sub_805D658, gUnknown_083752F8);
u8 sub_805D678(struct MapObject *mapObject, struct Sprite *sprite)
{
@@ -2340,18 +2256,7 @@ u8 sub_805D72C(struct MapObject *mapObject, struct Sprite *sprite)
return 1;
}
-
-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);
-}
+fieldmap_object_cb(sub_805D774, sub_805D798, gUnknown_0837530C);
u8 sub_805D7B8(struct MapObject *mapObject, struct Sprite *sprite)
{
@@ -2403,18 +2308,7 @@ u8 sub_805D86C(struct MapObject *mapObject, struct Sprite *sprite)
return 1;
}
-
-u8 sub_805D8D8(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805D8B4(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805D8D8);
-}
-
-u8 sub_805D8D8(struct MapObject *mapObject, struct Sprite *sprite)
-{
- return gUnknown_08375324[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805D8B4, sub_805D8D8, gUnknown_08375324);
u8 sub_805D8F8(struct MapObject *mapObject, struct Sprite *sprite)
{
@@ -2466,18 +2360,7 @@ u8 sub_805D9AC(struct MapObject *mapObject, struct Sprite *sprite)
return 1;
}
-
-u8 sub_805DA18(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805D9F4(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805DA18);
-}
-
-u8 sub_805DA18(struct MapObject *mapObject, struct Sprite *sprite)
-{
- return gUnknown_0837533C[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805D9F4, sub_805DA18, gUnknown_0837533C);
u8 sub_805DA38(struct MapObject *mapObject, struct Sprite *sprite)
{
@@ -2529,18 +2412,7 @@ u8 sub_805DAEC(struct MapObject *mapObject, struct Sprite *sprite)
return 1;
}
-
-u8 sub_805DB58(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805DB34(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805DB58);
-}
-
-u8 sub_805DB58(struct MapObject *mapObject, struct Sprite *sprite)
-{
- return gUnknown_08375354[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805DB34, sub_805DB58, gUnknown_08375354);
u8 sub_805DB78(struct MapObject *mapObject, struct Sprite *sprite)
{
@@ -2592,18 +2464,7 @@ u8 sub_805DC2C(struct MapObject *mapObject, struct Sprite *sprite)
return 1;
}
-
-u8 sub_805DC98(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805DC74(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805DC98);
-}
-
-u8 sub_805DC98(struct MapObject *mapObject, struct Sprite *sprite)
-{
- return gUnknown_0837536C[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805DC74, sub_805DC98, gUnknown_0837536C);
u8 sub_805DCB8(struct MapObject *mapObject, struct Sprite *sprite)
{
@@ -2655,17 +2516,7 @@ u8 sub_805DD6C(struct MapObject *mapObject, struct Sprite *sprite)
return 1;
}
-u8 sub_805DDD8(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805DDB4(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805DDD8);
-}
-
-u8 sub_805DDD8(struct MapObject *mapObject, struct Sprite *sprite)
-{
- return gUnknown_08375384[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805DDB4, sub_805DDD8, gUnknown_08375384);
u8 sub_805DDF8(struct MapObject *mapObject, struct Sprite *sprite)
{
@@ -2717,17 +2568,7 @@ u8 sub_805DEAC(struct MapObject *mapObject, struct Sprite *sprite)
return 1;
}
-u8 sub_805DF18(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805DEF4(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805DF18);
-}
-
-u8 sub_805DF18(struct MapObject *mapObject, struct Sprite *sprite)
-{
- return gUnknown_0837539C[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805DEF4, sub_805DF18, gUnknown_0837539C);
u8 sub_805DF38(struct MapObject *mapObject, struct Sprite *sprite)
{
@@ -2779,18 +2620,7 @@ u8 sub_805DFEC(struct MapObject *mapObject, struct Sprite *sprite)
return 1;
}
-
-u8 sub_805E058(struct MapObject *mapObject, struct Sprite *sprite);
-
-void sub_805E034(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805E058);
-}
-
-u8 sub_805E058(struct MapObject *mapObject, struct Sprite *sprite)
-{
- return gUnknown_083753B4[sprite->data1](mapObject, sprite);
-}
+fieldmap_object_cb(sub_805E034, sub_805E058, gUnknown_083753B4);
u8 sub_805E078(struct MapObject *mapObject, struct Sprite *sprite)
{
@@ -2842,20 +2672,53 @@ u8 sub_805E12C(struct MapObject *mapObject, struct Sprite *sprite)
return 1;
}
+fieldmap_object_cb(sub_805E174, sub_805E198, gUnknown_083753CC);
-u8 sub_805E198(struct MapObject *mapObject, struct Sprite *sprite);
+u8 sub_805E1B8(struct MapObject *mapObject, struct Sprite *sprite)
+{
+ npc_reset(mapObject, sprite);
+ FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
+ sprite->data1 = 1;
+ return 1;
+}
-void sub_805E174(struct Sprite *sprite)
+u8 sub_805E1E4(struct MapObject *mapObject, struct Sprite *sprite)
{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_805E198);
+ if (FieldObjectExecRegularAnim(mapObject, sprite))
+ {
+ sub_8064820(sprite, 0x30);
+ sprite->data1 = 2;
+ }
+ return 0;
}
-u8 sub_805E198(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_805E208(struct MapObject *mapObject, struct Sprite *sprite)
{
- return gUnknown_083753CC[sprite->data1](mapObject, sprite);
+ if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+ {
+ sprite->data1 = 3;
+ }
+ return 0;
}
-u8 sub_805E1B8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_805E234(struct MapObject *mapObject, struct Sprite *sprite)
+{
+ u8 direction;
+ u8 directions[5];
+ memcpy(directions, gUnknown_083753DC, 5);
+ direction = sub_805CD60(mapObject, 0);
+ if (direction == 0)
+ {
+ direction = directions[mapObject->mapobj_unk_18];
+ }
+ FieldObjectSetDirection(mapObject, direction);
+ sprite->data1 = 0;
+ return 1;
+}
+
+fieldmap_object_cb(sub_805E278, sub_803E29C, gUnknown_083753E4);
+
+u8 sub_805E2BC(struct MapObject *mapObject, struct Sprite *sprite)
{
npc_reset(mapObject, sprite);
FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
@@ -2863,7 +2726,7 @@ u8 sub_805E1B8(struct MapObject *mapObject, struct Sprite *sprite)
return 1;
}
-u8 sub_805E1E4(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_805E2E8(struct MapObject *mapObject, struct Sprite *sprite)
{
if (FieldObjectExecRegularAnim(mapObject, sprite))
{
@@ -2873,7 +2736,7 @@ u8 sub_805E1E4(struct MapObject *mapObject, struct Sprite *sprite)
return 0;
}
-u8 sub_805E208(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_805E30C(struct MapObject *mapObject, struct Sprite *sprite)
{
if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
{
@@ -2882,11 +2745,11 @@ u8 sub_805E208(struct MapObject *mapObject, struct Sprite *sprite)
return 0;
}
-u8 sub_805E234(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_805E338(struct MapObject *mapObject, struct Sprite *sprite)
{
u8 direction;
u8 directions[5];
- memcpy(directions, gUnknown_083753DC, 5);
+ memcpy(directions, gUnknown_083753F4, 5);
direction = sub_805CD60(mapObject, 0);
if (direction == 0)
{
@@ -2897,7 +2760,7 @@ u8 sub_805E234(struct MapObject *mapObject, struct Sprite *sprite)
return 1;
}
-void sub_805E278(struct Sprite *sprite);
+
void sub_805E37C(struct Sprite *sprite);
void sub_805E5DC(struct Sprite *sprite);
void sub_805E668(struct Sprite *sprite);
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 3a280f58a..1e1162350 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -23,7 +23,6 @@
extern u32 gUnknown_0202FF84[];
//Functions
-static u8 sub_80587D8(void);
static bool8 sub_8058854(struct MapObject *, u8);
static void npc_clear_strange_bits(struct MapObject *a);
static void MovePlayerAvatarUsingKeypadInput(u8 a, u16 b, u16 c);
@@ -242,16 +241,7 @@ static u8 (*const gUnknown_0830FC98[])(struct Task *, struct MapObject *) =
sub_805A1B8,
};
-
-void sub_80587B4(struct Sprite *sprite)
-{
- meta_step(&gMapObjects[sprite->data0], sprite, sub_80587D8);
-}
-
-static u8 sub_80587D8(void)
-{
- return 0;
-}
+fieldmap_object_null_cb(sub_80587B4, sub_80587D8);
void player_step(u8 direction, u16 newKeys, u16 heldKeys)
{
diff --git a/tools/agbcc b/tools/agbcc
new file mode 160000
+Subproject 928b1951972d7ff8c46347b3dce9e254cf6c215
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 12:31:13 +0000