Decompile map object data (nonmatching wip 1)

2 files changed, 3 insertions, 251 deletions

diff --git a/data/field_map_obj.s b/data/field_map_obj.s
index ef39f3df6..d061be4d5 100644
--- a/data/field_map_obj.s
+++ b/data/field_map_obj.s
@@ -3,258 +3,14 @@
 
 	.section .rodata
 
-@ 830FD48
-	.include "data/graphics/field_objects/map_object_graphics.inc"
-
-@ 8368528
-	.include "data/graphics/field_objects/field_effect_object_graphics.inc"
-
-	.align 2
-gUnknown_0836DA88:: @ 836DA88
-	.4byte sub_805C884
-	.4byte sub_805CDE8
-	.4byte sub_805C8AC
-	.4byte sub_805CF28
-	.4byte sub_805CF28
-	.4byte sub_805D0AC
-	.4byte sub_805D0AC
-	.4byte sub_805D230
-	.4byte sub_805D230
-	.4byte sub_805D230
-	.4byte sub_805D230
-	.4byte sub_80587B4
-	.4byte FieldObjectCB_BerryTree
-	.4byte sub_805D4F4
-	.4byte sub_805D634
-	.4byte sub_805D774
-	.4byte sub_805D8B4
-	.4byte sub_805D9F4
-	.4byte sub_805DB34
-	.4byte sub_805DC74
-	.4byte sub_805DDB4
-	.4byte sub_805DEF4
-	.4byte sub_805E034
-	.4byte sub_805E174
-	.4byte sub_805E278
-	.4byte sub_805E37C
-	.4byte sub_805E37C
-	.4byte sub_805E37C
-	.4byte sub_805E37C
-	.4byte sub_805E5DC
-	.4byte sub_805E668
-	.4byte sub_805E6F4
-	.4byte sub_805E780
-	.4byte sub_805E80C
-	.4byte sub_805E898
-	.4byte sub_805E924
-	.4byte sub_805E9B0
-	.4byte sub_805EA3C
-	.4byte sub_805EAC8
-	.4byte sub_805EB54
-	.4byte sub_805EBE0
-	.4byte sub_805EC6C
-	.4byte sub_805ECF8
-	.4byte sub_805ED84
-	.4byte sub_805EE10
-	.4byte sub_805EE9C
-	.4byte sub_805EF28
-	.4byte sub_805EFB4
-	.4byte sub_805F040
-	.4byte sub_805F0CC
-	.4byte sub_805F158
-	.4byte sub_805F1E4
-	.4byte sub_805F270
-	.4byte sub_805F2FC
-	.4byte sub_805F2FC
-	.4byte sub_805F2FC
-	.4byte sub_805F2FC
-	.4byte FieldObjectCB_TreeDisguise
-	.4byte FieldObjectCB_MountainDisguise
-	.4byte sub_805F8E0
-	.4byte sub_805F8E0
-	.4byte sub_805F8E0
-	.4byte sub_805F8E0
-	.4byte FieldObjectCB_Hidden1
-	.4byte sub_805FB20
-	.4byte sub_805FB20
-	.4byte sub_805FB20
-	.4byte sub_805FB20
-	.4byte sub_805FB90
-	.4byte sub_805FB90
-	.4byte sub_805FB90
-	.4byte sub_805FB90
-	.4byte sub_805FC00
-	.4byte sub_805FC00
-	.4byte sub_805FC00
-	.4byte sub_805FC00
-	.4byte sub_805FC70
-
-gUnknown_0836DBBC:: @ 836DBBC
-	.byte 0
-	.byte 0
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-
-gUnknown_0836DC09:: @ 836DC09
-	.byte DIR_SOUTH
-	.byte DIR_SOUTH
-	.byte DIR_SOUTH
-	.byte DIR_NORTH
-	.byte DIR_SOUTH
-	.byte DIR_WEST
-	.byte DIR_EAST
-	.byte DIR_NORTH
-	.byte DIR_SOUTH
-	.byte DIR_WEST
-	.byte DIR_EAST
-	.byte DIR_SOUTH
-	.byte DIR_SOUTH
-	.byte DIR_SOUTH
-	.byte DIR_WEST
-	.byte DIR_NORTH
-	.byte DIR_NORTH
-	.byte DIR_SOUTH
-	.byte DIR_SOUTH
-	.byte DIR_SOUTH
-	.byte DIR_SOUTH
-	.byte DIR_NORTH
-	.byte DIR_SOUTH
-	.byte DIR_SOUTH
-	.byte DIR_SOUTH
-	.byte DIR_NORTH
-	.byte DIR_SOUTH
-	.byte DIR_WEST
-	.byte DIR_EAST
-	.byte DIR_NORTH
-	.byte DIR_EAST
-	.byte DIR_SOUTH
-	.byte DIR_WEST
-	.byte DIR_NORTH
-	.byte DIR_WEST
-	.byte DIR_SOUTH
-	.byte DIR_EAST
-	.byte DIR_WEST
-	.byte DIR_NORTH
-	.byte DIR_EAST
-	.byte DIR_SOUTH
-	.byte DIR_EAST
-	.byte DIR_NORTH
-	.byte DIR_WEST
-	.byte DIR_SOUTH
-	.byte DIR_NORTH
-	.byte DIR_SOUTH
-	.byte DIR_WEST
-	.byte DIR_EAST
-	.byte DIR_NORTH
-	.byte DIR_SOUTH
-	.byte DIR_WEST
-	.byte DIR_EAST
-	.byte DIR_NORTH
-	.byte DIR_SOUTH
-	.byte DIR_WEST
-	.byte DIR_EAST
-	.byte DIR_SOUTH
-	.byte DIR_SOUTH
-	.byte DIR_NORTH
-	.byte DIR_SOUTH
-	.byte DIR_WEST
-	.byte DIR_EAST
-	.byte DIR_SOUTH
-	.byte DIR_SOUTH
-	.byte DIR_NORTH
-	.byte DIR_WEST
-	.byte DIR_EAST
-	.byte DIR_SOUTH
-	.byte DIR_NORTH
-	.byte DIR_WEST
-	.byte DIR_EAST
-	.byte DIR_SOUTH
-	.byte DIR_NORTH
-	.byte DIR_WEST
-	.byte DIR_EAST
-	.byte DIR_SOUTH
-
 @ 836DC58
-	.include "data/graphics/field_objects/map_object_graphics_info_pointers.inc"
+@ 	.include "data/graphics/field_objects/map_object_graphics_info_pointers.inc"
 
 @ 836DFC0
-	.include "data/graphics/field_objects/field_effect_object_template_pointers.inc"
+@ 	.include "data/graphics/field_objects/field_effect_object_template_pointers.inc"
 
 @ 836E050
-	.include "data/graphics/field_objects/map_object_pic_tables.inc"
+@	.include "data/graphics/field_objects/map_object_pic_tables.inc"
 
 @ 83708C8
 	.include "data/graphics/field_objects/map_object_anims.inc"
diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s
deleted file mode 100644
index 7935c693e..000000000
--- a/data/field_player_avatar.s
+++ /dev/null
@@ -1,4 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata