Dump some pointers and move descriptions

Makefile

@@ -121,7 +121,7 @@ $(C_BUILDDIR)/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
 $(C_BUILDDIR)/isagbprn.o: CC1 := tools/agbcc/bin/old_agbcc
 $(C_BUILDDIR)/isagbprn.o: CFLAGS := -mthumb-interwork
 
-$(C_BUILDDIR)/trainer_tower.o: CFLAGS += -ffreestanding
+#$(C_BUILDDIR)/trainer_tower.o: CFLAGS += -ffreestanding
 
 ifeq ($(NODEP),1)
 $(C_BUILDDIR)/%.o: c_dep :=

asm/trainer_tower.s

@@ -5,21 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_815DD2C
-sub_815DD2C: @ 815DD2C
-	push {r4,lr}
-	ldr r4, _0815DD40 @ =gUnknown_203F458
-	ldr r0, [r4]
-	bl Free
-	movs r0, 0
-	str r0, [r4]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815DD40: .4byte gUnknown_203F458
-	thumb_func_end sub_815DD2C
-
 	thumb_func_start sub_815DD44
 sub_815DD44: @ 815DD44
 	push {r4,lr}

data/data_8471F00.s

@@ -350,10 +350,106 @@ gUnknown_847A890:: @ 847A890
 	.4byte gUnknown_8EA8408, gUnknown_8EA8CC8, gUnknown_8EA83C8
 	.4byte gUnknown_8EA8F40, gUnknown_8EA9588, gUnknown_8EA8F00
 
-	.incbin "baserom.gba", 0x47A8D8, 0x7ED4
+	.incbin "baserom.gba", 0x47A8D8, 0x2D4
 
 	// trainer_tower (again?)
 
+gUnknown_847ABAC::
+	.incbin "baserom.gba", 0x47ABAC, 0x3E0
+
+gUnknown_847AF8C::
+	.incbin "baserom.gba", 0x47AF8C, 0x3E0
+
+gUnknown_847B36C::
+	.incbin "baserom.gba", 0x47B36C, 0x3E0
+
+gUnknown_847B74C::
+	.incbin "baserom.gba", 0x47B74C, 0x3E0
+
+gUnknown_847BB2C::
+	.incbin "baserom.gba", 0x47BB2C, 0x3E0
+
+gUnknown_847BF0C::
+	.incbin "baserom.gba", 0x47BF0C, 0x3E0
+
+gUnknown_847C2EC::
+	.incbin "baserom.gba", 0x47C2EC, 0x3E0
+
+gUnknown_847C6CC::
+	.incbin "baserom.gba", 0x47C6CC, 0x3E0
+
+gUnknown_847CAAC::
+	.incbin "baserom.gba", 0x47CAAC, 0x3E0
+
+gUnknown_847CE8C::
+	.incbin "baserom.gba", 0x47CE8C, 0x3E0
+
+gUnknown_847D26C::
+	.incbin "baserom.gba", 0x47D26C, 0x3E0
+
+gUnknown_847D64C::
+	.incbin "baserom.gba", 0x47D64C, 0x3E0
+
+gUnknown_847DA2C::
+	.incbin "baserom.gba", 0x47DA2C, 0x3E0
+
+gUnknown_847DE0C::
+	.incbin "baserom.gba", 0x47DE0C, 0x3E0
+
+gUnknown_847E1EC::
+	.incbin "baserom.gba", 0x47E1EC, 0x3E0
+
+gUnknown_847E5CC::
+	.incbin "baserom.gba", 0x47E5CC, 0x3E0
+
+gUnknown_847E9AC::
+	.incbin "baserom.gba", 0x47E9AC, 0x3E0
+
+gUnknown_847ED8C::
+	.incbin "baserom.gba", 0x47ED8C, 0x3E0
+
+gUnknown_847F16C::
+	.incbin "baserom.gba", 0x47F16C, 0x3E0
+
+gUnknown_847F54C::
+	.incbin "baserom.gba", 0x47F54C, 0x3E0
+
+gUnknown_847F92C::
+	.incbin "baserom.gba", 0x47F92C, 0x3E0
+
+gUnknown_847FD0C::
+	.incbin "baserom.gba", 0x47FD0C, 0x3E0
+
+gUnknown_84800EC::
+	.incbin "baserom.gba", 0x4800EC, 0x3E0
+
+gUnknown_84804CC::
+	.incbin "baserom.gba", 0x4804CC, 0x3E0
+
+gUnknown_84808AC::
+	.incbin "baserom.gba", 0x4808AC, 0x3E0
+
+gUnknown_8480C8C::
+	.incbin "baserom.gba", 0x480C8C, 0x3E0
+
+gUnknown_848106C::
+	.incbin "baserom.gba", 0x48106C, 0x3E0
+
+gUnknown_848144C::
+	.incbin "baserom.gba", 0x48144C, 0x3E0
+
+gUnknown_848182C::
+	.incbin "baserom.gba", 0x48182C, 0x3E0
+
+gUnknown_8481C0C::
+	.incbin "baserom.gba", 0x481C0C, 0x3E0
+
+gUnknown_8481FEC::
+	.incbin "baserom.gba", 0x481FEC, 0x3E0
+
+gUnknown_84823CC::
+	.incbin "baserom.gba", 0x4823CC, 0x3E0
+
 	.align 2
 gUnknown_84827AC:: @ 84827AC
 	.byte 0x08, 0x01
@@ -361,7 +457,40 @@ gUnknown_84827AC:: @ 84827AC
 	.4byte 0
 
 gUnknown_84827B4:: @ 84827B4
-	.incbin "baserom.gba", 0x4827B4, 0x5F34
+	.4byte gUnknown_847F16C
+	.4byte gUnknown_847D26C
+	.4byte gUnknown_84808AC
+	.4byte gUnknown_847ABAC
+	.4byte gUnknown_847CAAC
+	.4byte gUnknown_847E9AC
+	.4byte gUnknown_847AF8C
+	.4byte gUnknown_847CE8C
+	.4byte gUnknown_847DA2C
+	.4byte gUnknown_847BF0C
+	.4byte gUnknown_847D64C
+	.4byte gUnknown_847DE0C
+	.4byte gUnknown_847B74C
+	.4byte gUnknown_847BB2C
+	.4byte gUnknown_848182C
+	.4byte gUnknown_847F92C
+	.4byte gUnknown_847C2EC
+	.4byte gUnknown_847C6CC
+	.4byte gUnknown_847E5CC
+	.4byte gUnknown_84804CC
+	.4byte gUnknown_84823CC
+	.4byte gUnknown_8481FEC
+	.4byte gUnknown_84800EC
+	.4byte gUnknown_847E1EC
+	.4byte gUnknown_847ED8C
+	.4byte gUnknown_848106C
+	.4byte gUnknown_8480C8C
+	.4byte gUnknown_847F92C
+	.4byte gUnknown_847F54C
+	.4byte gUnknown_847E1EC
+	.4byte gUnknown_847D64C
+	.4byte gUnknown_847C6CC
+
+	.include "data/text/move_descriptions.inc"
 
 gUnknown_84886E8:: @ 84886E8
 	.incbin "baserom.gba", 0x4886E8, 0x588

src/trainer_tower.c

@@ -393,3 +393,9 @@ void sub_815DC8C(void)
                 "_0815DD28: .4byte gUnknown_203F458");
 }
 #endif // NONMATCHING
+
+void sub_815DD2C(void)
+{
+    Free(gUnknown_203F458);
+    gUnknown_203F458 = NULL;
+}