Merge branch 'master' of https://github.com/pret/pokeemerald

also started fixing pointers in my dumps

data/mauville_old_man.s

@@ -5,30 +5,27 @@
 	.align 2, 0
 
 gUnknown_0859EFE4:: @ 859EFE4
-@ replacing .incbin "baserom.gba", 0x0059efe4, 0xc
-.2byte 0x2811, 0x1029, 0x1018, 0x0e0d, 0x1a1a, 0x1a1d
+	.2byte 0x2811, 0x1029, 0x1018, 0xE0D, 0x1A1A, 0x1A1D
 
 gUnknown_0859EFF0:: @ 859EFF0
-@ replacing .incbin "baserom.gba", 0x0059eff0, 0x20
-.4byte 0x8294295
-.4byte 0x82942a1
-.4byte 0x82942ae
-.4byte 0x82942bb
-.4byte 0x82942c6
-.4byte 0x82942d5
-.4byte 0x82942e3
-.4byte 0x82942f0
+	.4byte 0x8294295
+	.4byte 0x82942a1
+	.4byte 0x82942ae
+	.4byte 0x82942bb
+	.4byte 0x82942c6
+	.4byte 0x82942d5
+	.4byte 0x82942e3
+	.4byte 0x82942f0
 
 gUnknown_0859F010:: @ 859F010
-@ replacing .incbin "baserom.gba", 0x0059f010, 0x20
-.4byte 0x8294313
-.4byte 0x8294359
-.4byte 0x8294398
-.4byte 0x82943da
-.4byte 0x829441c
-.4byte 0x8294460
-.4byte 0x82944a0
-.4byte 0x82944d5
+	.4byte 0x8294313
+	.4byte 0x8294359
+	.4byte 0x8294398
+	.4byte 0x82943da
+	.4byte 0x829441c
+	.4byte 0x8294460
+	.4byte 0x82944a0
+	.4byte 0x82944d5
 
 gUnknown_0859F030:: @ 859F030
 	.incbin "baserom.gba", 0x59f030, 0x18
@@ -40,6 +37,4 @@ gUnknown_0859F278:: @ 859F278
 	.incbin "baserom.gba", 0x59f278, 0x10
 
 gUnknown_0859F288:: @ 859F288
-@ replacing .incbin "baserom.gba", 0x0059f288, 0x8
-.4byte 0x00000024, 0x00000008
-
+	.4byte 0x00000024, 0x00000008