2 files changed, 101 insertions, 17 deletions
diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s
index 682877f7e..9b6aa16eb 100644
--- a/data/data_83FECCC.s
+++ b/data/data_83FECCC.s
@@ -728,7 +728,13 @@ gUnknown_8416188:: @ 8416188
 	.incbin "baserom.gba", 0x416188, 0x8
 
 gUnknown_8416190:: @ 8416190
-	.incbin "baserom.gba", 0x416190, 0x31
+	.incbin "baserom.gba", 0x416190, 0x10
+
+gUnknown_84161A0::
+	.incbin "baserom.gba", 0x4161a0, 0x12
+
+gUnknown_84161B2::
+	.incbin "baserom.gba", 0x4161b2, 0xf
 
 gFameCheckerText_Cancel:: @ 84161C1
 	.string "CANCEL$"
diff --git a/data/tm_case.s b/data/tm_case.s
index 5720087d7..6237e4612 100644
--- a/data/tm_case.s
+++ b/data/tm_case.s
@@ -1,50 +1,128 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 	.section .rodata
+	.set NULL, 0
 
 	.align 2
 gUnknown_8463134:: @ 8463134
-	.incbin "baserom.gba", 0x463134, 0xC
+	.4byte 0x000011f0, 0x000001e1, 0x000021d2
 
 gUnknown_8463140:: @ 8463140
-	.incbin "baserom.gba", 0x463140, 0x10
+	.4byte sub_8132414
+	.4byte sub_8132868
+	.4byte sub_8132908
+	.4byte sub_81328B8
 
 gUnknown_8463150:: @ 8463150
-	.incbin "baserom.gba", 0x463150, 0x18
+	.4byte gUnknown_84161A0, sub_81325F0
+	.4byte gUnknown_84161B2, sub_813265C
+	.4byte gUnknown_84161C8, sub_81327FC
 
 gUnknown_8463168:: @ 8463168
-	.incbin "baserom.gba", 0x463168, 0x3
+	.byte 0x00, 0x01, 0x02
 
 gUnknown_846316B:: @ 846316B
-	.incbin "baserom.gba", 0x46316B, 0x5
+	.byte 0x01, 0x02, 0x00, 0x00, 0x00
 
 gUnknown_8463170:: @ 8463170
-	.incbin "baserom.gba", 0x463170, 0x8
+	.4byte sub_8132CAC
+	.4byte sub_8132A48
 
 gUnknown_8463178:: @ 8463178
-	.incbin "baserom.gba", 0x463178, 0x4
+	.string "{CLEAR_TO 18}$"
 
 gUnknown_846317C:: @ 846317C
-	.incbin "baserom.gba", 0x46317C, 0x4
+	.string " $"
 
+	.align 2, 0
 gUnknown_8463180:: @ 8463180
-	.incbin "baserom.gba", 0x463180, 0x4
+	.2byte 0x2108, 0x1a1e
 
 gUnknown_8463184:: @ 8463184
-	.incbin "baserom.gba", 0x463184, 0xC
+	.byte 0x00, 0x01, 0x02, 0x00, 0x02, 0x03, 0x00, 0x03, 0x06, 0x00, 0x0e, 0x0a
 
 gUnknown_8463190:: @ 8463190
-	.incbin "baserom.gba", 0x463190, 0x50
+	.align 2
+	.byte 0x00, 0x0a, 0x01, 0x13, 0x0a, 0x0f
+	.2byte 0x0081
+	@ {0x00, 0x0a, 0x01, 0x13, 0x0a, 0x0f, 0x0081}
+	.align 2
+	.byte 0x00, 0x0c, 0x0c, 0x12, 0x08, 0x0a
+	.2byte 0x013f
+	@ {0x00, 0x0c, 0x0c, 0x12, 0x08, 0x0a, 0x013f}
+	.align 2
+	.byte 0x01, 0x05, 0x0f, 0x0f, 0x04, 0x0d
+	.2byte 0x01f9
+	@ {0x01, 0x05, 0x0f, 0x0f, 0x04, 0x0d, 0x01f9}
+	.align 2
+	.byte 0x00, 0x00, 0x01, 0x0a, 0x02, 0x0f
+	.2byte 0x0235
+	@ {0x00, 0x00, 0x01, 0x0a, 0x02, 0x0f, 0x0235}
+	.align 2
+	.byte 0x00, 0x01, 0x0d, 0x05, 0x06, 0x0c
+	.2byte 0x0249
+	@ {0x00, 0x01, 0x0d, 0x05, 0x06, 0x0c, 0x0249}
+	.align 2
+	.byte 0x00, 0x07, 0x0d, 0x05, 0x06, 0x0c
+	.2byte 0x0267
+	@ {0x00, 0x07, 0x0d, 0x05, 0x06, 0x0c, 0x0267}
+	.align 2
+	.byte 0x01, 0x02, 0x0f, 0x1a, 0x04, 0x0b
+	.2byte 0x0285
+	@ {0x01, 0x02, 0x0f, 0x1a, 0x04, 0x0b, 0x0285}
+	.align 2
+	.byte 0x01, 0x11, 0x09, 0x0c, 0x04, 0x0f
+	.2byte 0x02ed
+	@ {0x01, 0x11, 0x09, 0x0c, 0x04, 0x0f, 0x02ed}
+	.align 2
+	.byte 0x01, 0x01, 0x01, 0x08, 0x03, 0x0d
+	.2byte 0x031d
+	@ {0x01, 0x01, 0x01, 0x08, 0x03, 0x0d, 0x031d}
+	.align 2
+	.byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00
+	.2byte 0x0000
+	@ {0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000}
 
 gUnknown_84631E0:: @ 84631E0
-	.incbin "baserom.gba", 0x4631E0, 0x8
+	.align 2
+	.byte 0x01, 0x15, 0x09, 0x06, 0x04, 0x0f
+	.2byte 0x0335
+	@ {0x01, 0x15, 0x09, 0x06, 0x04, 0x0f, 0x0335}
 
 gUnknown_84631E8:: @ 84631E8
-	.incbin "baserom.gba", 0x4631E8, 0x30
+	.align 2
+	.byte 0x01, 0x16, 0x0d, 0x07, 0x06, 0x0f
+	.2byte 0x01cf
+	@ {0x01, 0x16, 0x0d, 0x07, 0x06, 0x0f, 0x01cf}
+	.align 2
+	.byte 0x01, 0x16, 0x0f, 0x07, 0x04, 0x0f
+	.2byte 0x01cf
+
+	.align 2
+gOamData_84631F8::
+	.2byte 0x0000, 0x8000, 0x0800, 0x0000
+
+	.align 2
+gUnknown_8463200::
+	obj_image_anim_frame 0, 0
+	obj_image_anim_end
+
+	.align 2
+gUnknown_8463208::
+	obj_image_anim_frame 16, 0
+	obj_image_anim_end
+
+	.align 2
+gUnknown_8463210::
+	.4byte gUnknown_8463200
+	.4byte gUnknown_8463208
 
 gUnknown_8463218:: @ 8463218
-	.incbin "baserom.gba", 0x463218, 0x8
+	obj_tiles gUnknown_8E84D90, 0x400, 0x0190
 
 gUnknown_8463220:: @ 8463220
-	.incbin "baserom.gba", 0x463220, 0x18
+	spr_template 0x0190, 0x0190, gOamData_84631F8, gUnknown_8463210, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_8463238:: @ 8463238
-	.incbin "baserom.gba", 0x463238, 0x24
+	.2byte 0x0000, 0x0090, 0x0080, 0x00c0, 0x0060, 0x0050, 0x00b0, 0x00a0, 0x00e0, 0x0000, 0x0010, 0x0020, 0x0030, 0x0040, 0x00d0, 0x0070
+	.2byte 0x0100, 0x00f0