diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-17 22:28:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-17 22:28:54 -0400 |
| commit | ed2ee1ca58c5623c5af1411d8cc1f81fe3386696 (patch) | |
| tree | 4fe49d033a5d0f9cddc7dfc2387d2b8a150225ee | |
| parent | a5ec66b9851572e75f0b9aaf5c40f4de4d3b40e4 (diff) | |
Decompile two s16[4]s
| -rwxr-xr-x | data/field_map_obj.s | 8 | ||||
| -rwxr-xr-x | src/field_map_obj.c | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/data/field_map_obj.s b/data/field_map_obj.s index 849ed6155..b52ec9581 100755 --- a/data/field_map_obj.s +++ b/data/field_map_obj.s @@ -3,14 +3,6 @@ .section .rodata - .align 1 -gUnknown_0837520C:: @ 837520C - .2byte 0x20, 0x40, 0x60, 0x80, 0x20, 0x40, 0x80, 0xC0 - - .align 1 -gUnknown_0837521C:: @ 837521C - .2byte 0x20, 0x30, 0x40, 0x50 - .align 2 gUnknown_08375224:: @ 8375224 .4byte sub_805C8F0 diff --git a/src/field_map_obj.c b/src/field_map_obj.c index 095b5fcd0..e6ce58d8c 100755 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -337,6 +337,10 @@ const u16 *const gUnknown_0837399C[] = { #include "data/berry_tree_graphics_tables.h" #include "data/field_effect_objects.h" +const s16 gUnknown_0837520C[] = {0x20, 0x40, 0x60, 0x80}; +const s16 gUnknown_08375204[] = {0x20, 0x40, 0x80, 0xc0}; +const s16 gUnknown_0837521C[] = {0x20, 0x30, 0x40, 0x50}; + // text extern void strange_npc_table_clear(void); @@ -1813,8 +1817,6 @@ 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) |