Extract data from map_obj_8097404

2 files changed, 100 insertions, 51 deletions

diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s
index be5639406..113814721 100644
--- a/data/field_ground_effect.s
+++ b/data/field_ground_effect.s
@@ -65,40 +65,4 @@ gUnknown_0850E674:: @ 850E674
 	.4byte GroundEffect_ShortGrass
 	.4byte GroundEffect_HotSprings
 	.4byte GroundEffect_Seaweed
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte triple_little_steps
-	.4byte triple_little_steps
-	.4byte double_little_steps
-	.4byte triple_little_steps
-	.4byte triple_little_steps
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-	.4byte oct_little_steps
-	.4byte oct_little_steps
 
diff --git a/data/map_obj_8097404.s b/data/map_obj_8097404.s
index 161796765..719a78266 100644
--- a/data/map_obj_8097404.s
+++ b/data/map_obj_8097404.s
@@ -2,44 +2,129 @@
     .include "constants/constants.inc"
 
     .section .rodata
-    .align 2, 0
+    .align 2
+gUnknown_0850E6C4:: @ 850E6C4
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
 
+    .align 2
+gUnknown_0850E704:: @ 850E704
+	.4byte double_little_steps
+	.4byte double_little_steps
+	.4byte double_little_steps
+	.4byte double_little_steps
+	.4byte double_little_steps
+	.4byte double_little_steps
+	.4byte double_little_steps
+	.4byte double_little_steps
+
+    .align 2
+gUnknown_0850E724:: @ 850E724
+	.4byte double_little_steps
+	.4byte triple_little_steps
+	.4byte triple_little_steps
+	.4byte double_little_steps
+	.4byte triple_little_steps
+	.4byte triple_little_steps
+
+    .align 2
+gUnknown_0850E73C:: @ 850E73C
+	.4byte quad_little_steps
+	.4byte quad_little_steps
+	.4byte quad_little_steps
+	.4byte quad_little_steps
+
+    .align 2
+gUnknown_0850E74C:: @ 850E74C
+	.4byte oct_little_steps
+	.4byte oct_little_steps
+
+    .align 2
 gUnknown_0850E754:: @ 850E754
-	.incbin "baserom.gba", 0x50e754, 0x14
+	.4byte gUnknown_0850E6C4
+	.4byte gUnknown_0850E704
+	.4byte gUnknown_0850E724
+	.4byte gUnknown_0850E73C
+	.4byte gUnknown_0850E74C
 
+    .align 1
 gUnknown_0850E768:: @ 850E768
-	.incbin "baserom.gba", 0x50e768, 0xa
+	.2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002
 
 gUnknown_0850E772:: @ 850E772
-	.incbin "baserom.gba", 0x50e772, 0x48
+	.byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01
+	.byte 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00
+	.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
 gUnknown_0850E7BA:: @ 850E7BA
-	.incbin "baserom.gba", 0x50e7ba, 0x7a
+	.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00
+	.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe
+
+gUnknown_0850E802:: @ 850E802
+	.byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00
+
+gUnknown_0850E812:: @ 850E812
+	.byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00
+
+gUnknown_0850E822:: @ 850E822
+	.byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00
 
+    .align 2
 gUnknown_0850E834:: @ 850E834
-	.incbin "baserom.gba", 0x50e834, 0xc
+	.4byte gUnknown_0850E802
+	.4byte gUnknown_0850E812
+	.4byte gUnknown_0850E822
 
+    .align 1
 gUnknown_0850E840:: @ 850E840
-	.incbin "baserom.gba", 0x50e840, 0x6
+	.byte 0x10, 0x00, 0x10, 0x00, 0x20, 0x00
 
+    .align 1
 gUnknown_0850E846:: @ 850E846
-	.incbin "baserom.gba", 0x50e846, 0x4
+	.byte 0x00, 0x00, 0x01, 0x00
 
+    .align 1
 gUnknown_0850E84A:: @ 850E84A
-	.incbin "baserom.gba", 0x50e84a, 0x6
+	.byte 0x20, 0x00, 0x20, 0x00, 0x40, 0x00
 
+    .align 1
 gUnknown_0850E850:: @ 850E850
-	.incbin "baserom.gba", 0x50e850, 0x4
+	.byte 0x01, 0x01, 0x02, 0x00
 
-// referenced in src/field_map_obj.o
+// referenced in data/field_map_obj.s
+    .align 2
 gUnknown_0850E854::
-    .incbin "baserom.gba", 0x50e854, 0x8
+	.4byte sub_8097E50
+	.4byte sub_80964B8
 
+    .align 2
 gUnknown_0850E85C::
-    .incbin "baserom.gba", 0x50e85C, 0x8
+	.4byte sub_8097EF0
+	.4byte sub_80964B8
 
+    .align 2
 gUnknown_0850E864::
-    .incbin "baserom.gba", 0x50e864, 0xc
+	.4byte sub_80980C0
+	.4byte sub_80980D0
+	.4byte sub_8098124
 
+    .align 2
 gUnknown_0850E870::
-    .incbin "baserom.gba", 0x50e870, 0xc
+	.4byte sub_80980F4
+	.4byte sub_8098108
+	.4byte sub_8098124