pokemon PNGs and palettes

.gitattributes

@@ -0,0 +1,9 @@
+*.pal text eol=crlf
+
+*.s text eol=lf
+*.txt text eol=lf
+Makefile text eol=lf
+*.mk text eol=lf
+
+*.png binary
+*.bin binary

.gitignore

@@ -0,0 +1,12 @@
+*.exe
+*.o
+*.elf
+*.gba
+*.1bpp
+*.4bpp
+*.8bpp
+*.gbapal
+*.lz
+pokeas
+pokeld
+pokeobjcopy

Makefile

@@ -0,0 +1,67 @@
+AS = ./pokeas
+ASFLAGS = -mcpu=arm7tdmi
+
+SHA1 := sha1sum -c
+
+# Clear the default suffixes.
+.SUFFIXES:
+
+# Secondary expansion is required for dependency variables in object rules.
+.SECONDEXPANSION:
+
+.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz
+
+.PHONY: rom tools clean compare
+
+gfx     := tools/gbagfx/gbagfx
+1bpp    := $(gfx) 1bpp
+4bpp    := $(gfx) 4bpp
+8bpp    := $(gfx) 8bpp
+gbapal  := $(gfx) gbapal
+lz      := $(gfx) lz
+scaninc := tools/scaninc/scaninc
+
+objs = asm/emerald.o
+
+$(foreach obj, $(objs), \
+	$(eval $(obj)_deps := $(shell $(scaninc) $(obj:.o=.s))) \
+)
+
+rom := pokeemerald.gba
+elf := $(rom:.gba=.elf)
+
+rom: $(rom)
+
+tools: $(gfx) $(scaninc)
+
+# For contributors to make sure a change didn't affect the contents of the ROM.
+compare: $(rom)
+	@$(SHA1) rom.sha1
+
+clean:
+	$(RM) $(rom) $(elf) $(objs)
+	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' \) -exec rm {} +
+
+include graphics_file_rules.mk
+
+%.png: ;
+%.pal: ;
+%.1bpp: %.png  ; @$(1bpp) $<
+%.4bpp: %.png  ; @$(4bpp) $<
+%.8bpp: %.png  ; @$(8bpp) $<
+%.gbapal: %.pal ; @$(gbapal) $<
+%.lz: % ; @$(lz) $<
+
+%.o: %.s $$($$@_deps)
+	$(AS) $(ASFLAGS) -o $@ $<
+
+# Link objects to produce the ROM.
+$(rom): $(objs)
+	./pokeld -T ld_script.txt -T wram_syms.txt -o $(elf) $(objs)
+	./pokeobjcopy -O binary $(elf) $(rom)
+
+$(gfx):
+	cd tools/gbagfx && make clean && make
+
+$(scaninc):
+	cd tools/scaninc && make clean && make

build.bat

@@ -1,4 +1,4 @@
-as -mcpu=arm7tdmi asm/emerald.s
+as -mcpu=arm7tdmi asm/emerald.s -o emerald.o
-ld -T ld_script.txt -T wram_syms.txt -o emerald.o a.out
+ld -T ld_script.txt -T wram_syms.txt -o emerald.elf emerald.o
-objcopy -O binary emerald.o emerald.gba
+objcopy -O binary emerald.elf emerald.gba
 fc /b base_emerald.gba emerald.gba

data/data2.s

@@ -12368,12 +12368,12 @@ gUnknown_08C2EA9C: ; 8C2EA9C
 	.align 2, 0
 
 gMonIcon_QuestionMark: ; 8D774D0
-	.incbin "base_emerald.gba", 0xd774d0, 0x400
+	.incbin "data/graphics/pokemon/icons/question_mark_icon.4bpp"
 
 	.align 2, 0
 
 gMonFootprint_QuestionMark: ; 8D778D0
-	.incbin "base_emerald.gba", 0xd778d0, 0x20
+	.incbin "data/graphics/pokemon/footprints/question_mark_footprint.1bpp"
 
 gUnknown_08D778F0: ; 8D778F0
 	.incbin "base_emerald.gba", 0xd778f0, 0xe8
@@ -12615,7 +12615,7 @@ gUnknown_08D8FB9C: ; 8D8FB9C
 	.align 2, 0
 
 gMonIcon_Egg: ; 8D8FC74
-	.incbin "base_emerald.gba", 0xd8fc74, 0x400
+	.incbin "data/graphics/pokemon/icons/egg_icon.4bpp"
 
 	.incbin "base_emerald.gba", 0xd90074, 0x1524
 
@@ -13178,7 +13178,9 @@ gUnknown_08DDE12C: ; 8DDE12C
 	.incbin "base_emerald.gba", 0xdde12c, 0xcc
 
 gMonIconPalettes: ; 8DDE1F8
-	.incbin "base_emerald.gba", 0xdde1f8, 0x60
+	.incbin "data/graphics/pokemon/icon_palettes/icon_palette_0.gbapal"
+	.incbin "data/graphics/pokemon/icon_palettes/icon_palette_1.gbapal"
+	.incbin "data/graphics/pokemon/icon_palettes/icon_palette_2.gbapal"
 
 gTitleScreenBgPalette: ; 8DDE258
 	.incbin "base_emerald.gba", 0xdde258, 0x1e0