Merge pull request #137 from PikalaxALT/split_835b488

Split 835b488

7 files changed, 133 insertions, 37 deletions

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..623c252c6 100644
--- a/data/data_835B488.s
+++ b/data/data_835B488.s
@@ -1,43 +1,12 @@
+#include "constants/maps.h"
+#include "constants/species.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
 	.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
-
-gWildMonHeaders:: @ 83C9CB8
-	.incbin "baserom.gba", 0x3C9CB8, 0xA64
-
-gUnknown_83CA71C:: @ 83CA71C
-	.incbin "baserom.gba", 0x3CA71C, 0xED4
+	.incbin "baserom.gba", 0x3CA770, 0xE80
 
 gUnknown_83CB5F0:: @ 83CB5F0
 	.incbin "baserom.gba", 0x3CB5F0, 0x200
diff --git a/data/event_scripts.s b/data/event_scripts.s
index a3943d494..eb2c8ed60 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -10397,7 +10397,7 @@ EventScript_1BE06F:: @ 81BE06F
 	applymovement VAR_LAST_TALKED, Movement_1BE08F
 	waitmovement 0
 	removeobject VAR_LAST_TALKED
-	special Special_RockSmashEncounter
+	special ScrSpecial_RockSmashWildEncounter
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_1BE08D
 	waitstate
@@ -11731,7 +11731,7 @@ EventScript_81BFB5F:: @ 81BFB5F
 	setflashradius 0
 	end
 
-EventScript_1BFB65:: @ 81BFB65
+EventScript_RepelWoreOff:: @ 81BFB65
 	msgbox Text_1BFB6E, 3
 	end
 
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/specials.inc b/data/specials.inc
index 516b5f768..9da9bdfc7 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -179,7 +179,7 @@ gSpecials:: @ 815FD60
 	def_special sub_8113510
 	def_special sub_81130A8
 	def_special sub_8113530
-	def_special Special_RockSmashEncounter
+	def_special ScrSpecial_RockSmashWildEncounter
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special nullsub_75
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