Potential fix for Issue #1 (#10)

replace all-zero incbins with .space and build fixes for certain Linux configurations

6 files changed, 317 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 51aedcc13..357c110b5 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ src/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
 $(C_OBJS): %.o : %.c
 	@$(CPP) $(CPPFLAGS) $< -o $*.i
 	@$(PREPROC) $*.i charmap.txt | $(CC1) $(CFLAGS) -o $*.s
-	@echo -e ".text\n\t.align\t2, 0\n" >> $*.s
+	@bash -c 'echo -e ".text\n\t.align\t2, 0\n"' >> $*.s
 	$(AS) $(ASFLAGS) -o $@ $*.s
 
 %.o : dep = $(shell $(SCANINC) $*.s)
diff --git a/build_tools.sh b/build_tools.sh
index 7d99d5d90..7d99d5d90 100644..100755
--- a/build_tools.sh
+++ b/build_tools.sh
diff --git a/data/data2.s b/data/data2.s
index 7cee632df..ecc6e6aea 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -23,7 +23,8 @@ gUnknown_081E795C: @ 81E795C
 
 	.global gUnknown_081E796C
 gUnknown_081E796C: @ 81E796C
-	.incbin "baserom.gba", 0x001e796c, 0x10
+@ replacing .incbin "baserom.gba", 0x001e796c, 0x10
+	.space 0x00000010
 
 	.global gUnknown_081E797C
 gUnknown_081E797C: @ 81E797C
@@ -3636,7 +3637,8 @@ gMapGroups:: @ 8308588
 	.include "data/maps/SafariZone_Southeast/connections.s"
 	.global gUnknown_08308E28
 gUnknown_08308E28: @ 8308E28
-	.incbin "baserom.gba", 0x00308e28, 0x4
+@ replacing .incbin "baserom.gba", 0x00308e28, 0x4
+	.space 0x00000004
 
 	.global gUnknown_08308E2C
 gUnknown_08308E2C: @ 8308E2C
@@ -5362,7 +5364,8 @@ gUnknown_08376290: @ 8376290
 
 	.global gUnknown_083762D8
 gUnknown_083762D8: @ 83762D8
-	.incbin "baserom.gba", 0x003762d8, 0x4
+@ replacing .incbin "baserom.gba", 0x003762d8, 0x4
+	.space 0x00000004
 
 	.global gUnknown_083762DC
 gUnknown_083762DC: @ 83762DC
@@ -5407,7 +5410,8 @@ gUnknown_083763E4: @ 83763E4
 
 	.global gUnknown_08376414
 gUnknown_08376414: @ 8376414
-	.incbin "baserom.gba", 0x00376414, 0x4
+@ replacing .incbin "baserom.gba", 0x00376414, 0x4
+	.space 0x00000004
 
 	.global gUnknown_08376418
 gUnknown_08376418: @ 8376418
@@ -6092,7 +6096,295 @@ gBattleAnimPicTable: @ 837E164
 
 	.global gBattleAnimPaletteTable
 gBattleAnimPaletteTable: @ 837EA6C
-	.incbin "baserom.gba", 0x37EA6C, 0x908
+	obj_pal 0x08d0369c, 0x2710
+	obj_pal 0x08d1caf8, 0x2711
+	obj_pal 0x08d20c14, 0x2712
+	obj_pal 0x08d036c0, 0x2713
+	obj_pal 0x08d036e8, 0x2714
+	obj_pal 0x08d036fc, 0x2715
+	obj_pal 0x08d03724, 0x2716
+	obj_pal 0x08d03918, 0x2717
+	obj_pal 0x08d03958, 0x2718
+	obj_pal 0x08d0405c, 0x2719
+	obj_pal 0x08d03974, 0x271a
+	obj_pal 0x08d040f4, 0x271b
+	obj_pal 0x08d04184, 0x271c
+	obj_pal 0x08d0423c, 0x271d
+	obj_pal 0x08d20014, 0x271e
+	obj_pal 0x08d042c0, 0x271f
+	obj_pal 0x08d04358, 0x2720
+	obj_pal 0x08d04358, 0x2721
+	obj_pal 0x08d25164, 0x2722
+	obj_pal 0x08d043ac, 0x2723
+	obj_pal 0x08d04554, 0x2724
+	obj_pal 0x08d047d0, 0x2725
+	obj_pal 0x08d04b30, 0x2726
+	obj_pal 0x08d0457c, 0x2727
+	obj_pal 0x08d04d3c, 0x2728
+	obj_pal 0x08d04b58, 0x2729
+	obj_pal 0x08d0559c, 0x272a
+	obj_pal 0x08d055c4, 0x272b
+	obj_pal 0x08d058e8, 0x272c
+	obj_pal 0x08d05f18, 0x272d
+	obj_pal 0x08d06300, 0x272e
+	obj_pal 0x08d05130, 0x272f
+	obj_pal 0x08d05150, 0x2730
+	obj_pal 0x08d06324, 0x2731
+	obj_pal 0x08d06324, 0x2732
+	obj_pal 0x08d06324, 0x2733
+	obj_pal 0x08d07420, 0x2734
+	obj_pal 0x08d07420, 0x2735
+	obj_pal 0x08d086e4, 0x2736
+	obj_pal 0x08d0870c, 0x2737
+	obj_pal 0x08d086e4, 0x2738
+	obj_pal 0x08d086e4, 0x2739
+	obj_pal 0x08d092d0, 0x273a
+	obj_pal 0x08d096f8, 0x273b
+	obj_pal 0x08d09720, 0x273c
+	obj_pal 0x08d099b4, 0x273d
+	obj_pal 0x08d0a23c, 0x273e
+	obj_pal 0x08d0a25c, 0x273e
+	obj_pal 0x08d0a518, 0x2740
+	obj_pal 0x08d0a540, 0x2741
+	obj_pal 0x08d0a568, 0x2742
+	obj_pal 0x08d0a568, 0x2743
+	obj_pal 0x08d0a568, 0x2744
+	obj_pal 0x08d0559c, 0x2745
+	obj_pal 0x08d0a964, 0x2746
+	obj_pal 0x08d0a568, 0x2747
+	obj_pal 0x08d0ae24, 0x2748
+	obj_pal 0x08d0af98, 0x2749
+	obj_pal 0x08d0b424, 0x274a
+	obj_pal 0x08d0b4ac, 0x274b
+	obj_pal 0x08d0b4f0, 0x274c
+	obj_pal 0x08d0b5bc, 0x274d
+	obj_pal 0x08d0b9ac, 0x274e
+	obj_pal 0x08d0bb90, 0x274f
+	obj_pal 0x08d235a0, 0x2750
+	obj_pal 0x08d0bd60, 0x2751
+	obj_pal 0x08d0bdcc, 0x2752
+	obj_pal 0x08e69608, 0x2753
+	obj_pal 0x08e69628, 0x2754
+	obj_pal 0x08d0bd60, 0x2755
+	obj_pal 0x08d0be74, 0x2756
+	obj_pal 0x08d0be74, 0x2757
+	obj_pal 0x08d0c198, 0x2758
+	obj_pal 0x08d0c2cc, 0x2759
+	obj_pal 0x08d1b668, 0x275a
+	obj_pal 0x08d0c568, 0x275b
+	obj_pal 0x08d150cc, 0x275c
+	obj_pal 0x08d150cc, 0x275d
+	obj_pal 0x08d0c724, 0x275e
+	obj_pal 0x08d0c724, 0x275f
+	obj_pal 0x08d0cee0, 0x2760
+	obj_pal 0x08d0cf88, 0x2761
+	obj_pal 0x08d0d144, 0x2762
+	obj_pal 0x08d0d158, 0x2763
+	obj_pal 0x08d0d180, 0x2764
+	obj_pal 0x08d0d1a8, 0x2765
+	obj_pal 0x08d0d1c0, 0x2766
+	obj_pal 0x08d25100, 0x2767
+	obj_pal 0x08d0d1e8, 0x2768
+	obj_pal 0x08d0d204, 0x2769
+	obj_pal 0x08d0d22c, 0x276a
+	obj_pal 0x08d0bc28, 0x276b
+	obj_pal 0x08d0d250, 0x276c
+	obj_pal 0x08d0d26c, 0x276d
+	obj_pal 0x08d0d294, 0x276e
+	obj_pal 0x08d0d2d4, 0x276f
+	obj_pal 0x08d0d2fc, 0x2770
+	obj_pal 0x08d0d318, 0x2771
+	obj_pal 0x08d0d294, 0x2772
+	obj_pal 0x08d281b8, 0x2773
+	obj_pal 0x08d0d340, 0x2774
+	obj_pal 0x08d0d35c, 0x2775
+	obj_pal 0x08d0d35c, 0x2776
+	obj_pal 0x08d0d384, 0x2777
+	obj_pal 0x08d0f6dc, 0x2778
+	obj_pal 0x08d0fc88, 0x2779
+	obj_pal 0x08d0fc88, 0x277a
+	obj_pal 0x08d1014c, 0x277b
+	obj_pal 0x08d1014c, 0x277c
+	obj_pal 0x08d10520, 0x277d
+	obj_pal 0x08d10520, 0x277e
+	obj_pal 0x08d10970, 0x277f
+	obj_pal 0x08d10cbc, 0x2780
+	obj_pal 0x08d10f50, 0x2781
+	obj_pal 0x08d1106c, 0x2782
+	obj_pal 0x08d0367c, 0x2783
+	obj_pal 0x08d132d8, 0x2784
+	obj_pal 0x08d1353c, 0x2785
+	obj_pal 0x08d136f0, 0x2786
+	obj_pal 0x08d1399c, 0x2787
+	obj_pal 0x08d13ab8, 0x2788
+	obj_pal 0x08d13b0c, 0x2789
+	obj_pal 0x08d13c2c, 0x278a
+	obj_pal 0x08d13c2c, 0x278b
+	obj_pal 0x08d1401c, 0x278c
+	obj_pal 0x08d14130, 0x278d
+	obj_pal 0x08d141c0, 0x278e
+	obj_pal 0x08d14380, 0x278f
+	obj_pal 0x08d14610, 0x2790
+	obj_pal 0x08d14610, 0x2791
+	obj_pal 0x08d14a64, 0x2792
+	obj_pal 0x08d14a64, 0x2793
+	obj_pal 0x08d14cfc, 0x2794
+	obj_pal 0x08d14d98, 0x2795
+	obj_pal 0x08d14d98, 0x2796
+	obj_pal 0x08d1a7dc, 0x2797
+	obj_pal 0x08d1a8c8, 0x2798
+	obj_pal 0x08d1a7dc, 0x2799
+	obj_pal 0x08d1a7dc, 0x279a
+	obj_pal 0x08d1ace4, 0x279b
+	obj_pal 0x08d1b070, 0x279c
+	obj_pal 0x08d1b198, 0x279d
+	obj_pal 0x08d1b198, 0x279e
+	obj_pal 0x08d2d188, 0x279f
+	obj_pal 0x08d1c040, 0x27a0
+	obj_pal 0x08d1ace4, 0x27a1
+	obj_pal 0x08d0367c, 0x27a2
+	obj_pal 0x08d1b3e4, 0x27a3
+	obj_pal 0x08d1b5c0, 0x27a4
+	obj_pal 0x08d1b5c0, 0x27a5
+	obj_pal 0x08d1b760, 0x27a6
+	obj_pal 0x08d1b760, 0x27a7
+	obj_pal 0x08d041e4, 0x27a8
+	obj_pal 0x08d1b8e0, 0x27a9
+	obj_pal 0x08d1b9a4, 0x27aa
+	obj_pal 0x08d1ba8c, 0x27ab
+	obj_pal 0x08d1bcc4, 0x27ac
+	obj_pal 0x08d1bd50, 0x27ad
+	obj_pal 0x08d1be30, 0x27ae
+	obj_pal 0x08d1bed0, 0x27af
+	obj_pal 0x08d1bfa0, 0x27b0
+	obj_pal 0x08d03774, 0x27b1
+	obj_pal 0x08d1c228, 0x27b2
+	obj_pal 0x08d1c2a8, 0x27b3
+	obj_pal 0x08d1c2d8, 0x27b4
+	obj_pal 0x08d1c2f0, 0x27b5
+	obj_pal 0x08d1c614, 0x27b6
+	obj_pal 0x08d1c634, 0x27b7
+	obj_pal 0x08d1c654, 0x27b8
+	obj_pal 0x08d1c674, 0x27b9
+	obj_pal 0x08d1c694, 0x27ba
+	obj_pal 0x08d1c700, 0x27bb
+	obj_pal 0x08d1c728, 0x27bc
+	obj_pal 0x08d1caf8, 0x27bd
+	obj_pal 0x08d1da00, 0x27be
+	obj_pal 0x08d1da8c, 0x27bf
+	obj_pal 0x08d1dc0c, 0x27c0
+	obj_pal 0x08d1dcf8, 0x27c1
+	obj_pal 0x08d1de78, 0x27c2
+	obj_pal 0x08d1dea0, 0x27c3
+	obj_pal 0x08d1dea0, 0x27c4
+	obj_pal 0x08d1dea0, 0x27c5
+	obj_pal 0x08d1e3f0, 0x27c6
+	obj_pal 0x08d1e690, 0x27c7
+	obj_pal 0x08d1e80c, 0x27c8
+	obj_pal 0x08d1ec48, 0x27c9
+	obj_pal 0x08d1f508, 0x27ca
+	obj_pal 0x08d1f11c, 0x27cb
+	obj_pal 0x08e7133c, 0x27cc
+	obj_pal 0x08d205c8, 0x27cd
+	obj_pal 0x08d2028c, 0x27ce
+	obj_pal 0x08d2051c, 0x27cf
+	obj_pal 0x08d20868, 0x27d0
+	obj_pal 0x08d209ec, 0x27d1
+	obj_pal 0x08d21330, 0x27d2
+	obj_pal 0x08d21410, 0x27d3
+	obj_pal 0x08d20fe0, 0x27d4
+	obj_pal 0x08d215a0, 0x27d5
+	obj_pal 0x08d219b8, 0x27d6
+	obj_pal 0x08d21aa8, 0x27d7
+	obj_pal 0x08d21c04, 0x27d8
+	obj_pal 0x08d22290, 0x27d9
+	obj_pal 0x08d225bc, 0x27da
+	obj_pal 0x08d2278c, 0x27db
+	obj_pal 0x08d2242c, 0x27dc
+	obj_pal 0x08d22c84, 0x27dd
+	obj_pal 0x08d229bc, 0x27de
+	obj_pal 0x08d22d74, 0x27df
+	obj_pal 0x08d1c634, 0x27e0
+	obj_pal 0x08d23490, 0x27e1
+	obj_pal 0x08d2364c, 0x27e2
+	obj_pal 0x08d24918, 0x27e3
+	obj_pal 0x08d24918, 0x27e4
+	obj_pal 0x08d24918, 0x27e5
+	obj_pal 0x08d235a0, 0x27e6
+	obj_pal 0x08d24d58, 0x27e7
+	obj_pal 0x08d2366c, 0x27e8
+	obj_pal 0x08d24408, 0x27e9
+	obj_pal 0x08d24fd4, 0x27ea
+	obj_pal 0x08d2362c, 0x27eb
+	obj_pal 0x08d25180, 0x27ec
+	obj_pal 0x08d252d4, 0x27ed
+	obj_pal 0x08d25844, 0x27ee
+	obj_pal 0x08d2586c, 0x27ef
+	obj_pal 0x08d25b20, 0x27f0
+	obj_pal 0x08d27c94, 0x27f1
+	obj_pal 0x08d27e90, 0x27f2
+	obj_pal 0x08d27e90, 0x27f3
+	obj_pal 0x08d25ea8, 0x27f4
+	obj_pal 0x08d28070, 0x27f5
+	obj_pal 0x08d25c3c, 0x27f6
+	obj_pal 0x08d28718, 0x27f7
+	obj_pal 0x08d28718, 0x27f8
+	obj_pal 0x08d28994, 0x27f9
+	obj_pal 0x08d28b7c, 0x27fa
+	obj_pal 0x08d28c7c, 0x27fb
+	obj_pal 0x08d28c98, 0x27fc
+	obj_pal 0x08d28cb4, 0x27fd
+	obj_pal 0x08d28c08, 0x27fe
+	obj_pal 0x08d2cf30, 0x27ff
+	obj_pal 0x08d2d240, 0x2800
+	obj_pal 0x08d2d7b8, 0x2801
+	obj_pal 0x08d2da58, 0x2802
+	obj_pal 0x08d2daa4, 0x2803
+	obj_pal 0x08d2e9dc, 0x2804
+	obj_pal 0x08d2e28c, 0x2805
+	obj_pal 0x08d2e28c, 0x2806
+	obj_pal 0x08d235a0, 0x2807
+	obj_pal 0x08d2ef68, 0x2808
+	obj_pal 0x08d2efd0, 0x2809
+	obj_pal 0x08d2efd0, 0x280a
+	obj_pal 0x08d2f248, 0x280b
+	obj_pal 0x08d2f378, 0x280c
+	obj_pal 0x08d2f578, 0x280d
+	obj_pal 0x08d2f6d8, 0x280e
+	obj_pal 0x08d2f778, 0x280f
+	obj_pal 0x08d2fc28, 0x2810
+	obj_pal 0x08d2fd6c, 0x2811
+	obj_pal 0x08d2f874, 0x2812
+	obj_pal 0x08d1b5e0, 0x2813
+	obj_pal 0x08e68764, 0x2814
+	obj_pal 0x08e68580, 0x2815
+	obj_pal 0x08e693dc, 0x2816
+	obj_pal 0x08e6e6ec, 0x2817
+	obj_pal 0x08e695d8, 0x2818
+	obj_pal 0x08e695f0, 0x2819
+	obj_pal 0x08e6e744, 0x281a
+	obj_pal 0x08e6e75c, 0x281b
+	obj_pal 0x08e6e774, 0x281c
+	obj_pal 0x08e69ae8, 0x281d
+	obj_pal 0x08e7e9e0, 0x281e
+	obj_pal 0x08e7eb24, 0x281f
+	obj_pal 0x08e69a48, 0x2820
+	obj_pal 0x08e69a48, 0x2821
+	obj_pal 0x08e69f54, 0x2822
+	obj_pal 0x08e69f54, 0x2823
+	obj_pal 0x08e69f54, 0x2824
+	obj_pal 0x08e6da2c, 0x2825
+	obj_pal 0x08e6e998, 0x2826
+	obj_pal 0x08e6ea00, 0x2827
+	obj_pal 0x08e6a6e4, 0x2828
+	obj_pal 0x08e6eba4, 0x2829
+	obj_pal 0x08e7e7d0, 0x282a
+	obj_pal 0x08e6dfc0, 0x282b
+	obj_pal 0x08e6f53c, 0x282c
+	obj_pal 0x08e6f5f8, 0x282d
+	obj_pal 0x08e71200, 0x282e
+	obj_pal 0x08e6bbb4, 0x282f
+	obj_pal 0x08d1c2c0, 0x2830
 
 	.global gUnknown_0837F374
 gUnknown_0837F374: @ 837F374
@@ -6243,7 +6535,8 @@ gUnknown_0837F5A8: @ 837F5A8
 
 	.global gUnknown_0837F5AC
 gUnknown_0837F5AC: @ 837F5AC
-	.incbin "baserom.gba", 0x0037f5ac, 0x4
+@ replacing .incbin "baserom.gba", 0x0037f5ac, 0x4
+	.space 0x00000004
 
 	.global gUnknown_0837F5B0
 gUnknown_0837F5B0: @ 837F5B0
@@ -7188,7 +7481,8 @@ gUnknown_0839F2C4: @ 839F2C4
 
 	.global gUnknown_0839F2C8
 gUnknown_0839F2C8: @ 839F2C8
-	.incbin "baserom.gba", 0x0039f2c8, 0x4
+@ replacing .incbin "baserom.gba", 0x0039f2c8, 0x4
+	.space 0x00000004
 
 	.global gUnknown_0839F2CC
 gUnknown_0839F2CC: @ 839F2CC
@@ -7509,7 +7803,8 @@ gUnknown_083A05F8: @ 83A05F8
 
 	.global gUnknown_083B4EC4
 gUnknown_083B4EC4: @ 83B4EC4
-	.incbin "baserom.gba", 0x003b4ec4, 0x20
+@ replacing .incbin "baserom.gba", 0x003b4ec4, 0x20
+	.space 0x00000020
 
 @ 83B4EE4
 	.include "data/graphics/pokemon/footprint_table.s"
@@ -8330,7 +8625,8 @@ gUnknown_083CA33C: @ 83CA33C
 
 	.global gUnknown_083CA340
 gUnknown_083CA340: @ 83CA340
-	.incbin "baserom.gba", 0x003ca340, 0x1
+@ replacing .incbin "baserom.gba", 0x003ca340, 0x1
+	.space 0x00000001
 
 	.global gUnknown_083CA341
 gUnknown_083CA341: @ 83CA341
@@ -10194,7 +10490,8 @@ gUnknown_083E5214: @ 83E5214
 
 	.global gUnknown_083E521C
 gUnknown_083E521C: @ 83E521C
-	.incbin "baserom.gba", 0x3E521C, 0x8
+@ replacing .incbin "baserom.gba", 0x003e521c, 0x8
+	.space 0x00000008
 Unknown_83E5224:
 	.incbin "baserom.gba", 0x3E5224, 0x8
 Unknown_83E522C:
@@ -10488,7 +10785,8 @@ gUnknown_083E7A50: @ 83E7A50
 
 	.global gUnknown_083EB6C4
 gUnknown_083EB6C4: @ 83EB6C4
-	.incbin "baserom.gba", 0x003eb6c4, 0x1
+@ replacing .incbin "baserom.gba", 0x003eb6c4, 0x1
+	.space 0x00000001
 
 	.global gUnknown_083EB6C5
 gUnknown_083EB6C5: @ 83EB6C5
@@ -11264,7 +11562,8 @@ gUnknown_083F6138: @ 83F6138
 
 	.global gUnknown_083F6140
 gUnknown_083F6140: @ 83F6140
-	.incbin "baserom.gba", 0x003f6140, 0x4
+@ replacing .incbin "baserom.gba", 0x003f6140, 0x4
+	.space 0x00000004
 
 	.global gUnknown_083F6144
 gUnknown_083F6144: @ 83F6144
@@ -11553,7 +11852,8 @@ gUnknown_083F804C: @ 83F804C
 
 	.global gUnknown_083F806C
 gUnknown_083F806C: @ 83F806C
-	.incbin "baserom.gba", 0x003f806c, 0x20
+@ replacing .incbin "baserom.gba", 0x003f806c, 0x20
+	.space 0x00000020
 
 	.global gUnknown_083F808C
 gUnknown_083F808C: @ 83F808C
diff --git a/tools/gbagfx/Makefile b/tools/gbagfx/Makefile
index e7f089445..3eb7f0b22 100644
--- a/tools/gbagfx/Makefile
+++ b/tools/gbagfx/Makefile
@@ -1,6 +1,6 @@
 CC = gcc
 
-CFLAGS = -Wall -Wextra -std=c11 -O2
+CFLAGS = -Wall -Wextra -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK
 
 LIBS = -lz -lpng
 
diff --git a/tools/preproc/Makefile b/tools/preproc/Makefile
index 24f60e3f6..2d577c79f 100644
--- a/tools/preproc/Makefile
+++ b/tools/preproc/Makefile
@@ -1,6 +1,6 @@
 CXX := g++
 
-CXXFLAGS := -std=c++14 -O2 -Wall -Wno-switch
+CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch
 
 SRCS := asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp \
 	utf8.cpp
diff --git a/tools/rsfont/Makefile b/tools/rsfont/Makefile
index 78e0cab3a..9ad47cfcf 100644
--- a/tools/rsfont/Makefile
+++ b/tools/rsfont/Makefile
@@ -1,6 +1,6 @@
 CC = gcc
 
-CFLAGS = -Wall -Wextra -std=c11 -O2
+CFLAGS = -Wall -Wextra -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK
 
 LIBS = -lz -lpng