Extract baseroms from and combine fldeff_emotion and trainer_see

Also extract from bike

5 files changed, 128 insertions, 30 deletions

diff --git a/data/bike.s b/data/bike.s
index 26bcc8745..ffb33e52b 100644
--- a/data/bike.s
+++ b/data/bike.s
@@ -5,19 +5,54 @@
 	.align 2, 0
 
 gUnknown_0859744C:: @ 859744C
-	.incbin "baserom.gba", 0x59744c, 0x10
+	.4byte sub_8119224
+	.4byte sub_8119238
+	.4byte sub_8119280
+	.4byte sub_8119344
 
+	.align 2
 gUnknown_0859745C:: @ 859745C
-	.incbin "baserom.gba", 0x59745c, 0xc
+	.4byte PlayerGoSpeed0
+	.4byte PlayerGoSpeed1
+	.4byte PlayerGoSpeed3
 
+	.align 2
 gUnknown_08597468:: @ 8597468
-	.incbin "baserom.gba", 0x597468, 0x34
+	.4byte sub_81197E4
+	.4byte sub_81197F4
+	.4byte sub_8119830
+	.4byte sub_81198C0
+	.4byte sub_81198FC
+	.4byte sub_8119938
+	.4byte sub_8119974
+	.4byte sub_81199B0
+	.4byte sub_8119A24
+	.4byte sub_8119A94
+	.4byte sub_8119AA4
+	.4byte sub_8119B34
+	.4byte sub_8119BC4
 
+	.align 2
 gUnknown_0859749C:: @ 859749C
-	.incbin "baserom.gba", 0x59749c, 0x1c
+	.4byte CheckMovementInputAcroBikeNormal
+	.4byte CheckMovementInputAcroBikeChangingDirection
+	.4byte CheckMovementInputAcroBikeStandingWheelie
+	.4byte CheckMovementInputAcroBikeBunnyHop
+	.4byte CheckMovementInputAcroBikeMovingWheelie
+	.4byte CheckMovementInputAcroBikeUnknownMode5
+	.4byte CheckMovementInputAcroBikeUnknownMode6
 
+	.align 2
 gUnknown_085974B8:: @ 85974B8
-	.incbin "baserom.gba", 0x5974b8, 0x8
+	.2byte 0x0001, 0x0002, 0x0004
 
+	.align 1
+gUnknown_085974BE:: @ 85974BE
+	.2byte 0x0004
+
+	.align 2
 gUnknown_085974C0:: @ 85974C0
-	.incbin "baserom.gba", 0x5974c0, 0x70
+	.4byte 0x00000001, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000001
+    .4byte 0x00000002, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000002
+    .4byte 0x00000003, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000003
+    .4byte 0x00000004, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000004
diff --git a/data/cable_club.s b/data/cable_club.s
index 4961cb1cc..f62b0b90a 100644
--- a/data/cable_club.s
+++ b/data/cable_club.s
@@ -4,8 +4,13 @@
     .section .rodata
     .align 2, 0
 
+	.align 2
 gUnknown_08550594:: @ 8550594
-	.incbin "baserom.gba", 0x550594, 0x8
+	window_template 0x00, 0x10, 0x0b, 0x0b, 0x02, 0x0f, 0x0125
 
+	.align 2
 gUnknown_0855059C:: @ 855059C
-	.incbin "baserom.gba", 0x55059c, 0x190
+	.4byte gText_BronzeCard
+	.4byte gText_CopperCard
+	.4byte gText_SilverCard
+	.4byte gText_GoldCard
diff --git a/data/fldeff_emotion.s b/data/fldeff_emotion.s
deleted file mode 100644
index f2c90d637..000000000
--- a/data/fldeff_emotion.s
+++ /dev/null
@@ -1,11 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_085507B4:: @ 85507B4
-	.incbin "baserom.gba", 0x5507b4, 0x18
-
-gUnknown_085507CC:: @ 85507CC
-	.incbin "baserom.gba", 0x5507cc, 0x18
diff --git a/data/strings.s b/data/strings.s
index 5fb8ca902..78e936b13 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -4452,16 +4452,16 @@ gText_ButtonTypeLEqualsA:: @ 85EE65D
 gText_XPLink:: @ 85EE667
 	.string "{STR_VAR_1}P LINK$"
 
-gUnknown_085EE670:: @ 85EE670
+gText_BronzeCard:: @ 85EE670
 	.string "BRONZE$"
 
-gUnknown_085EE677:: @ 85EE677
+gText_CopperCard:: @ 85EE677
 	.string "COPPER$"
 
-gUnknown_085EE67E:: @ 85EE67E
+gText_SilverCard:: @ 85EE67E
 	.string "SILVER$"
 
-gUnknown_085EE685:: @ 85EE685
+gText_GoldCard:: @ 85EE685
 	.string "GOLD$"
 
 gText_Day:: @ 85EE68A
diff --git a/data/trainer_see.s b/data/trainer_see.s
index 7480cb290..79c1a9f98 100644
--- a/data/trainer_see.s
+++ b/data/trainer_see.s
@@ -2,13 +2,82 @@
     .include "constants/constants.inc"
 
     .section .rodata
-    .align 2, 0
 
-gUnknown_0855072C:: @ 855072C
-	.incbin "baserom.gba", 0x55072c, 0x10
+    .align 2
+gEmotion_ExclamationMarkGfx:: @ 85505AC
+	.incbin "graphics/misc/emotion_exclamation.4bpp"
 
-gUnknown_0855073C:: @ 855073C
-	.incbin "baserom.gba", 0x55073c, 0x30
+    .align 2
+gEmotion_QuestionMarkGfx:: @ 855062C
+	.incbin "graphics/misc/emotion_question.4bpp"
 
-gUnknown_0855076C:: @ 855076C
-	.incbin "baserom.gba", 0x55076c, 0x48
+    .align 2
+gEmotion_HeartGfx:: @ 85506AC
+	.incbin "graphics/misc/emotion_heart.4bpp"
+
+    .align 2
+gIsTrainerInRange:: @ 855072C
+	.4byte IsTrainerInRangeSouth
+	.4byte IsTrainerInRangeNorth
+	.4byte IsTrainerInRangeWest
+	.4byte IsTrainerInRangeEast
+
+    .align 2
+gTrainerSeeFuncList:: @ 855073C
+	.4byte sub_80B4178
+	.4byte sub_80B417C
+	.4byte sub_80B41C0
+	.4byte sub_80B4200
+	.4byte sub_80B425C
+	.4byte sub_80B4318
+	.4byte sub_80B435C
+	.4byte sub_80B4390
+	.4byte sub_80B43AC
+	.4byte sub_80B43E0
+	.4byte sub_80B4438
+	.4byte sub_80B44AC
+
+    .align 2
+gTrainerSeeFuncList2:: @ 855076C
+	.4byte sub_80B43AC
+	.4byte sub_80B43E0
+	.4byte sub_80B4438
+	.4byte sub_80B44AC
+
+	.align 2
+gOamData_855077C:: @ 855077C
+	.2byte 0x0000
+	.2byte 0x4000
+	.2byte 0x0400
+
+	.align 2
+gSpriteImageTable_8550784:: @ 8550784
+	obj_tiles gEmotion_ExclamationMarkGfx, 0x0080, 0x0000
+	obj_tiles gEmotion_QuestionMarkGfx, 0x0080, 0x0000
+
+	.align 2
+gSpriteImageTable_8550794:: @ 8550794
+	obj_tiles gEmotion_HeartGfx, 0x0080, 0x0000
+
+	.align 2
+gSpriteAnim_855079C:: @ 855079C
+	obj_image_anim_frame 0, 60
+	obj_image_anim_end
+
+	.align 2
+gSpriteAnim_85507A4:: @ 85507A4
+	obj_image_anim_frame 1, 60
+	obj_image_anim_end
+
+	.align 2
+gSpriteAnimTable_85507AC:: @ 85507AC
+	.4byte gSpriteAnim_855079C
+	.4byte gSpriteAnim_85507A4
+
+	.align 2
+gSpriteTemplate_85507B4:: @ 85507B4
+	spr_template 0xffff, 0xffff, gOamData_855077C, gSpriteAnimTable_85507AC, gSpriteImageTable_8550784, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably
+
+	.align 2
+gSpriteTemplate_85507CC:: @ 85507CC
+	spr_template 0xffff, 0x1004, gOamData_855077C, gSpriteAnimTable_85507AC, gSpriteImageTable_8550794, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably