diff options
| -rwxr-xr-x | data/field_map_obj.s | 63 | ||||
| -rwxr-xr-x | include/field_map_obj.h | 4 | ||||
| -rwxr-xr-x | src/field_map_obj.c | 49 |
3 files changed, 33 insertions, 83 deletions
diff --git a/data/field_map_obj.s b/data/field_map_obj.s index 20e372201..00009e7fb 100755 --- a/data/field_map_obj.s +++ b/data/field_map_obj.s @@ -3,69 +3,6 @@ .section .rodata - -gUnknown_083755F4:: @ 83755F4 - .byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01 - -gUnknown_083755FD:: @ 83755FD - .byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05 - -gUnknown_08375606:: @ 8375606 - .byte 0x08, 0x08, 0x09, 0x0A, 0x0B, 0x08, 0x08, 0x09, 0x09 - -gUnknown_0837560F:: @ 837560F - .byte 0x0C, 0x0C, 0x0D, 0x0E, 0x0F, 0x0C, 0x0C, 0x0D, 0x0D - -gUnknown_08375618:: @ 8375618 - .byte 0x10, 0x10, 0x11, 0x12, 0x13, 0x10, 0x10, 0x11, 0x11 - -gUnknown_08375621:: @ 8375621 - .byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15 - -gUnknown_0837562A:: @ 837562A - .byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15 - -gUnknown_08375633:: @ 8375633 - .byte 0x18, 0x18, 0x19, 0x1A, 0x1B, 0x18, 0x18, 0x19, 0x19 - -gUnknown_0837563C:: @ 837563C - .byte 0x1C, 0x1C, 0x1D, 0x1E, 0x1F, 0x1C, 0x1C, 0x1D, 0x1D - -gUnknown_08375645:: @ 8375645 - .byte 0x20, 0x20, 0x21, 0x22, 0x23, 0x20, 0x20, 0x21, 0x21 - -gUnknown_0837564E:: @ 837564E - .byte 0x24, 0x24, 0x25, 0x26, 0x27, 0x24, 0x24, 0x25, 0x25 - -gUnknown_08375657:: @ 8375657 - .byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01 - -gUnknown_08375660:: @ 8375660 - .byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05 - -gUnknown_08375669:: @ 8375669 - .byte 0x08, 0x08, 0x09, 0x0A, 0x0B, 0x08, 0x08, 0x09, 0x09 - -gUnknown_08375672:: @ 8375672 - .byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15 - -gUnknown_0837567B:: @ 837567B - .byte 0x08, 0x08, 0x07, 0x09, 0x0A, 0x08, 0x08, 0x07, 0x07 - - .align 2 -gUnknown_08375684:: @ 8375684 - .4byte MetatileBehavior_IsSouthBlocked - .4byte MetatileBehavior_IsNorthBlocked - .4byte MetatileBehavior_IsWestBlocked - .4byte MetatileBehavior_IsEastBlocked - - .align 2 -gUnknown_08375694:: @ 8375694 - .4byte MetatileBehavior_IsNorthBlocked - .4byte MetatileBehavior_IsSouthBlocked - .4byte MetatileBehavior_IsEastBlocked - .4byte MetatileBehavior_IsWestBlocked - .align 1 gDirectionToVector:: @ 83756A4 .2byte 0, 0 diff --git a/include/field_map_obj.h b/include/field_map_obj.h index fd74b28e0..0a45b736b 100755 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -66,10 +66,6 @@ u8 oac_hopping(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)); u8 sub_805F3EC(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)); u8 sub_805F3EC(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)); -extern bool8 (*const gUnknown_08375684[4])(u8); -extern bool8 (*const gUnknown_08375694[4])(u8); - -extern const u8 gUnknown_0837567B[9]; extern const u8 gUnknown_0837574F[8]; extern const u8 gUnknown_08375757[4][4]; diff --git a/src/field_map_obj.c b/src/field_map_obj.c index 211a249db..81d275559 100755 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -343,6 +343,39 @@ const s16 gUnknown_0837521C[] = {0x20, 0x30, 0x40, 0x50}; #include "data/field_map_obj/callback_subroutine_pointers.h" +const u8 gUnknown_083755F4[] = {0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01}; +const u8 gUnknown_083755FD[] = {0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05}; +const u8 gUnknown_08375606[] = {0x08, 0x08, 0x09, 0x0A, 0x0B, 0x08, 0x08, 0x09, 0x09}; +const u8 gUnknown_0837560F[] = {0x0C, 0x0C, 0x0D, 0x0E, 0x0F, 0x0C, 0x0C, 0x0D, 0x0D}; +const u8 gUnknown_08375618[] = {0x10, 0x10, 0x11, 0x12, 0x13, 0x10, 0x10, 0x11, 0x11}; +const u8 gUnknown_08375621[] = {0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15}; +const u8 gUnknown_0837562A[] = {0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15}; +const u8 gUnknown_08375633[] = {0x18, 0x18, 0x19, 0x1A, 0x1B, 0x18, 0x18, 0x19, 0x19}; +const u8 gUnknown_0837563C[] = {0x1C, 0x1C, 0x1D, 0x1E, 0x1F, 0x1C, 0x1C, 0x1D, 0x1D}; +const u8 gUnknown_08375645[] = {0x20, 0x20, 0x21, 0x22, 0x23, 0x20, 0x20, 0x21, 0x21}; +const u8 gUnknown_0837564E[] = {0x24, 0x24, 0x25, 0x26, 0x27, 0x24, 0x24, 0x25, 0x25}; +const u8 gUnknown_08375657[] = {0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01}; +const u8 gUnknown_08375660[] = {0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05}; +const u8 gUnknown_08375669[] = {0x08, 0x08, 0x09, 0x0A, 0x0B, 0x08, 0x08, 0x09, 0x09}; +const u8 gUnknown_08375672[] = {0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15}; +const u8 gUnknown_0837567B[] = {0x08, 0x08, 0x07, 0x09, 0x0A, 0x08, 0x08, 0x07, 0x07}; + +bool8 (*const gUnknown_08375684[])(u8) = { + MetatileBehavior_IsSouthBlocked, + MetatileBehavior_IsNorthBlocked, + MetatileBehavior_IsWestBlocked, + MetatileBehavior_IsEastBlocked +}; + +bool8 (*const gUnknown_08375694[])(u8) = { + MetatileBehavior_IsNorthBlocked, + MetatileBehavior_IsSouthBlocked, + MetatileBehavior_IsEastBlocked, + MetatileBehavior_IsWestBlocked +}; + + + // text extern void strange_npc_table_clear(void); @@ -3687,22 +3720,6 @@ void npc_reset(struct MapObject *mapObject, struct Sprite *sprite) sprite->data1 = 0; } -extern const u8 gUnknown_083755F4[9]; -extern const u8 gUnknown_083755FD[9]; -extern const u8 gUnknown_08375606[9]; -extern const u8 gUnknown_0837560F[9]; -extern const u8 gUnknown_08375618[9]; -extern const u8 gUnknown_08375621[9]; -extern const u8 gUnknown_0837562A[9]; -extern const u8 gUnknown_08375633[9]; -extern const u8 gUnknown_0837563C[9]; -extern const u8 gUnknown_08375645[9]; -extern const u8 gUnknown_0837564E[9]; -extern const u8 gUnknown_08375657[9]; -extern const u8 gUnknown_08375660[9]; -extern const u8 gUnknown_08375669[9]; -extern const u8 gUnknown_08375672[9]; - u8 FieldObjectDirectionToImageAnimId(u8 direction) { return gUnknown_083755F4[direction]; |