Split three files from data_835B488 and dump their data

10 files changed, 138 insertions, 33 deletions

diff --git a/asm/trainer_see.s b/asm/trainer_see.s
index 659e96c32..a2210173a 100644
--- a/asm/trainer_see.s
+++ b/asm/trainer_see.s
@@ -198,8 +198,8 @@ _08081C8C:
 _08081C98: .4byte gUnknown_83C7248
 	thumb_func_end sub_8081BEC
 
-	thumb_func_start sub_8081C9C
-sub_8081C9C: @ 8081C9C
+	thumb_func_start IsTrainerInRangeSouth
+IsTrainerInRangeSouth: @ 8081C9C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 16
@@ -242,7 +242,7 @@ _08081CE6:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8081C9C
+	thumb_func_end IsTrainerInRangeSouth
 
 	thumb_func_start IsTrainerInRangeNorth
 IsTrainerInRangeNorth: @ 8081CEC
diff --git a/baserom.ips b/baserom.ips
index 5fc13b159..e1033697c 100644
--- a/baserom.ips
+++ b/baserom.ips
diff --git a/data/cable_club.s b/data/cable_club.s
new file mode 100644
index 000000000..8ea8b9167
--- /dev/null
+++ b/data/cable_club.s
@@ -0,0 +1,15 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+	.align 2
+
+gUnknown_83C6AB0:: @ 83C6AB0
+	.byte 0, 16, 11, 11, 2, 15
+	.2byte 0x125
+
+gUnknown_83C6AB8:: @ 83C6AB8
+	.4byte gUnknown_841DF8B
+	.4byte gUnknown_841DF92
+	.4byte gUnknown_841DF99
+	.4byte gUnknown_841DFA0
diff --git a/data/data_835B488.s b/data/data_835B488.s
index 88c12b035..5973d0f11 100644
--- a/data/data_835B488.s
+++ b/data/data_835B488.s
@@ -4,34 +4,7 @@
 	.section .rodata
 	.align 2
 
-gUnknown_83C68E0:: @ 83C68E0
-	.incbin "baserom.gba", 0x3C68E0, 0x4
-
-gUnknown_83C68E4:: @ 83C68E4
-	.incbin "baserom.gba", 0x3C68E4, 0x8
-
-gUnknown_83C68EC:: @ 83C68EC
-	.incbin "baserom.gba", 0x3C68EC, 0x4
-
-	.section .rodata.83C6AB0
-
-gUnknown_83C6AB0:: @ 83C6AB0
-	.incbin "baserom.gba", 0x3C6AB0, 0x8
-
-gUnknown_83C6AB8:: @ 83C6AB8
-	.incbin "baserom.gba", 0x3C6AB8, 0x790
-
-gUnknown_83C7248:: @ 83C7248
-	.incbin "baserom.gba", 0x3C7248, 0x10
-
-gUnknown_83C7258:: @ 83C7258
-	.incbin "baserom.gba", 0x3C7258, 0x3C
-
-gUnknown_83C7294:: @ 83C7294
-	.incbin "baserom.gba", 0x3C7294, 0xF4
-
-gUnknown_83C7388:: @ 83C7388
-	.incbin "baserom.gba", 0x3C7388, 0x2930
+	.incbin "baserom.gba", 0x3C73A0, 0x2918
 
 gWildMonHeaders:: @ 83C9CB8
 	.incbin "baserom.gba", 0x3C9CB8, 0xA64
diff --git a/data/field_screen_effect.s b/data/field_screen_effect.s
new file mode 100644
index 000000000..92078287d
--- /dev/null
+++ b/data/field_screen_effect.s
@@ -0,0 +1,15 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+	.align 2
+
+gUnknown_83C68E0:: @ 83C68E0
+	.4byte 4
+
+gUnknown_83C68E4:: @ 83C68E4
+	.byte 0, 0, 5, 30, 11, 15
+	.2byte 0x001
+
+gUnknown_83C68EC:: @ 83C68EC
+	.byte 0, 1, 2
diff --git a/data/trainer_see.s b/data/trainer_see.s
new file mode 100644
index 000000000..3392f090f
--- /dev/null
+++ b/data/trainer_see.s
@@ -0,0 +1,97 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+	.align 2
+
+gUnknown_83C6AC8::
+	.incbin "graphics/map_objects/emoticons.4bpp"
+
+gUnknown_83C7248:: @ 83C7248
+	.4byte IsTrainerInRangeSouth
+	.4byte IsTrainerInRangeNorth
+	.4byte IsTrainerInRangeWest
+	.4byte IsTrainerInRangeEast
+
+gUnknown_83C7258:: @ 83C7258
+	.4byte sub_8081F34
+	.4byte sub_8081F38
+	.4byte sub_8081F90
+	.4byte sub_8081FD0
+	.4byte sub_808202C
+	.4byte sub_80820BC
+	.4byte sub_8082100
+	.4byte sub_8082134
+	.4byte sub_8082150
+	.4byte sub_8082184
+	.4byte sub_80821DC
+	.4byte sub_8082250
+	.4byte sub_808226C
+	.4byte sub_80822CC
+	.4byte sub_808237C
+
+gUnknown_83C7294:: @ 83C7294
+	.4byte sub_8082150
+	.4byte sub_8082184
+	.4byte sub_80821DC
+	.4byte sub_8082250
+
+gOamData_83C72A4::
+	.4byte 0x40000000, 0x00000400
+
+gSpriteImages_83C72AC::
+	.4byte gUnknown_83C6AC8 + 0x000, 0x80
+	.4byte gUnknown_83C6AC8 + 0x080, 0x80
+	.4byte gUnknown_83C6AC8 + 0x100, 0x80
+	.4byte gUnknown_83C6AC8 + 0x300, 0x80
+	.4byte gUnknown_83C6AC8 + 0x380, 0x80
+	.4byte gUnknown_83C6AC8 + 0x400, 0x80
+	.4byte gUnknown_83C6AC8 + 0x180, 0x80
+	.4byte gUnknown_83C6AC8 + 0x200, 0x80
+	.4byte gUnknown_83C6AC8 + 0x280, 0x80
+	.4byte gUnknown_83C6AC8 + 0x480, 0x80
+	.4byte gUnknown_83C6AC8 + 0x500, 0x80
+	.4byte gUnknown_83C6AC8 + 0x580, 0x80
+	.4byte gUnknown_83C6AC8 + 0x600, 0x80
+	.4byte gUnknown_83C6AC8 + 0x680, 0x80
+	.4byte gUnknown_83C6AC8 + 0x700, 0x80
+
+gAnimCmd_83C7324::
+	obj_image_anim_frame 0x0000, 0x0004
+	obj_image_anim_frame 0x0001, 0x0004
+	obj_image_anim_frame 0x0002, 0x0034
+	obj_image_anim_end
+
+gAnimCmd_83C7334::
+	obj_image_anim_frame 0x0006, 0x0004
+	obj_image_anim_frame 0x0007, 0x0004
+	obj_image_anim_frame 0x0008, 0x0034
+	obj_image_anim_end
+
+gAnimCmd_83C7344::
+	obj_image_anim_frame 0x0003, 0x0004
+	obj_image_anim_frame 0x0004, 0x0004
+	obj_image_anim_frame 0x0005, 0x0034
+	obj_image_anim_end
+
+gAnimCmd_83C7354::
+	obj_image_anim_frame 0x0009, 0x0004
+	obj_image_anim_frame 0x000a, 0x0004
+	obj_image_anim_frame 0x000b, 0x0034
+	obj_image_anim_end
+
+gAnimCmd_83C7364::
+	obj_image_anim_frame 0x000c, 0x0004
+	obj_image_anim_frame 0x000d, 0x0004
+	obj_image_anim_frame 0x000e, 0x0034
+	obj_image_anim_end
+
+gSpriteAnimTable_83C7374::
+	.4byte gAnimCmd_83C7324
+    .4byte gAnimCmd_83C7334
+    .4byte gAnimCmd_83C7344
+    .4byte gAnimCmd_83C7354
+    .4byte gAnimCmd_83C7364
+
+gUnknown_83C7388:: @ 83C7388
+	spr_template 65535, 65535, gOamData_83C72A4, gSpriteAnimTable_83C7374, gSpriteImages_83C72AC, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably
diff --git a/data/unknown_serial_data.bin b/data/unknown_serial_data.bin
new file mode 100644
index 000000000..63d26ca2a
--- /dev/null
+++ b/data/unknown_serial_data.bin
diff --git a/graphics/map_objects/emoticons.png b/graphics/map_objects/emoticons.png
new file mode 100644
index 000000000..43cb818da
--- /dev/null
+++ b/graphics/map_objects/emoticons.png
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 3a42a3cea..26c525272 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -521,3 +521,6 @@ graphics/pokemon/heracross/unk_icon.4bpp: %.4bpp: %.png
 
 graphics/map_objects/151.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 8 -mheight 4
+
+graphics/map_objects/emoticons.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
diff --git a/ld_script.txt b/ld_script.txt
index f8e33aa9f..6893d0666 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -426,9 +426,11 @@ SECTIONS {
         data/battle_anim_status_effects.o(.rodata);
         src/title_screen.o(.rodata);
         data/field_weather.o(.rodata);
-        data/data_835B488.o(.rodata);
+        data/field_screen_effect.o(.rodata);
         src/battle_setup.o(.rodata);
-        data/data_835B488.o(.rodata.83C6AB0);
+        data/cable_club.o(.rodata);
+        data/trainer_see.o(.rodata);
+        data/data_835B488.o(.rodata);
         src/pokemon_icon.o(.rodata);
         data/data_835B488.o(.rodata.83D4100);
         src/item_menu_icons.o(.rodata);