diff options
| -rwxr-xr-x | include/data3.h | 50 | ||||
| -rwxr-xr-x | src/field_map_obj.c | 41 |
2 files changed, 40 insertions, 51 deletions
diff --git a/include/data3.h b/include/data3.h deleted file mode 100755 index 8151e418c..000000000 --- a/include/data3.h +++ /dev/null @@ -1,50 +0,0 @@ -// -// Created by Scott Norton on 9/8/17. -// - -#ifndef GUARD_DATA3_H -#define GUARD_DATA3_H - -struct PairedPalettes { - u16 tag; - const u16 *data; -}; - -extern u8 gUnknown_084975C4[0x10]; -extern const struct SpriteTemplate gUnknown_084975D4; -extern void (*const gUnknown_084975EC[3])(struct Sprite *); -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]; // {0x20, 0x40, 0x60, 0x80} -extern const s16 gUnknown_0850D6EC[4]; -extern const u8 gUnknown_0850D710[4]; // {DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST} -extern const u8 gUnknown_0850D770[2]; // {DIR_SOUTH, DIR_NORTH} -extern const u8 gUnknown_0850D790[2]; // {DIR_WEST, DIR_EAST} -extern const u8 gUnknown_0850D7F0[2]; // {DIR_NORTH, DIR_WEST} -extern const u8 gUnknown_0850D808[2]; // {DIR_NORTH, DIR_EAST} -extern const u8 gUnknown_0850D820[2]; // {DIR_SOUTH, DIR_WEST} -extern const u8 gUnknown_0850D838[2]; // {DIR_SOUTH, DIR_EAST} -extern const u8 gUnknown_0850D850[4]; -extern const u8 gUnknown_0850D868[4]; -extern const u8 gUnknown_0850D880[4]; -extern const u8 gUnknown_0850D898[4]; -extern const u8 gUnknown_0850D8AC[5]; -extern const u8 gUnknown_0850D8C4[5]; -extern const u8 gUnknown_0850D8E8[4]; -extern bool8 (*const gUnknown_0850DA64[])(struct MapObject *, struct Sprite *, u8, bool8(u8)); -extern bool8 (*const gUnknown_0850DB5C[])(u8); -extern bool8 (*const gUnknown_0850DB6C[])(u8); -extern const struct Coords16 gUnknown_0850DB7C[4]; -extern const u8 gUnknown_0850DC2F[4][4]; -extern const u8 gUnknown_0850DC3F[4][4]; - -extern const u8 gUnknown_0850DBA0[5]; - -extern bool8 (*const *const gUnknown_0850DC50[])(struct MapObject *, struct Sprite *); -extern u8 (*const gUnknown_0850DEE8[5])(u8); -extern const s16 gUnknown_0850DFBC[3]; -extern const s16 gUnknown_0850DFC2[3]; - -#endif //GUARD_DATA3_H diff --git a/src/field_map_obj.c b/src/field_map_obj.c index a79f78434..1ffa0a594 100755 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -5,7 +5,6 @@ #include "sprite.h" #include "rom4.h" #include "rng.h" -#include "data3.h" #include "event_scripts.h" #include "berry.h" #include "palette.h" @@ -134,6 +133,46 @@ const struct MapObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[7] const struct MapObjectGraphicsInfo *const gFieldObjectGraphicsInfoPointers[0xEF]; u8 (*const gUnknown_0850D714[11])(s16, s16, s16, s16); +struct PairedPalettes { + u16 tag; + const u16 *data; +}; + +u8 gUnknown_084975C4[0x10]; +const struct SpriteTemplate gUnknown_084975D4; +void (*const gUnknown_084975EC[3])(struct Sprite *); +const struct SpritePalette gUnknown_0850BBC8[39]; +const struct PairedPalettes gUnknown_0850BD00[15]; +const struct PairedPalettes gUnknown_0850BD78[15]; +const u16 *const gUnknown_0850BE38[2]; +const s16 gUnknown_0850D6DC[4]; // {0x20, 0x40, 0x60, 0x80} +const s16 gUnknown_0850D6EC[4]; +const u8 gUnknown_0850D710[4]; // {DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST} +const u8 gUnknown_0850D770[2]; // {DIR_SOUTH, DIR_NORTH} +const u8 gUnknown_0850D790[2]; // {DIR_WEST, DIR_EAST} +const u8 gUnknown_0850D7F0[2]; // {DIR_NORTH, DIR_WEST} +const u8 gUnknown_0850D808[2]; // {DIR_NORTH, DIR_EAST} +const u8 gUnknown_0850D820[2]; // {DIR_SOUTH, DIR_WEST} +const u8 gUnknown_0850D838[2]; // {DIR_SOUTH, DIR_EAST} +const u8 gUnknown_0850D850[4]; +const u8 gUnknown_0850D868[4]; +const u8 gUnknown_0850D880[4]; +const u8 gUnknown_0850D898[4]; +const u8 gUnknown_0850D8AC[5]; +const u8 gUnknown_0850D8C4[5]; +const u8 gUnknown_0850D8E8[4]; +bool8 (*const gUnknown_0850DA64[11])(struct MapObject *, struct Sprite *, u8, bool8(u8)); +bool8 (*const gUnknown_0850DB5C[4])(u8); +bool8 (*const gUnknown_0850DB6C[4])(u8); +const struct Coords16 gUnknown_0850DB7C[4]; +const u8 gUnknown_0850DC2F[4][4]; +const u8 gUnknown_0850DC3F[4][4]; +const u8 gUnknown_0850DBA0[5]; +bool8 (*const *const gUnknown_0850DC50[166])(struct MapObject *, struct Sprite *); +u8 (*const gUnknown_0850DEE8[5])(u8); +const s16 gUnknown_0850DFBC[3]; +const s16 gUnknown_0850DFC2[3]; + // Code static void npc_clear_ids_and_state(struct MapObject *mapObject) |