Skip to content

Commit

Permalink
pokemon PNGs and palettes
Browse files Browse the repository at this point in the history
  • Loading branch information
YamaArashi committed Nov 14, 2015
1 parent 3d1b659 commit 4c733f3
Show file tree
Hide file tree
Showing 2,871 changed files with 19,547 additions and 2,830 deletions.
9 changes: 9 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -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
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
*.exe
*.o
*.elf
*.gba
*.1bpp
*.4bpp
*.8bpp
*.gbapal
*.lz
pokeas
pokeld
pokeobjcopy
67 changes: 67 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions build.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as -mcpu=arm7tdmi asm/emerald.s
ld -T ld_script.txt -T wram_syms.txt -o emerald.o a.out
objcopy -O binary emerald.o emerald.gba
as -mcpu=arm7tdmi asm/emerald.s -o emerald.o
ld -T ld_script.txt -T wram_syms.txt -o emerald.elf emerald.o
objcopy -O binary emerald.elf emerald.gba
fc /b base_emerald.gba emerald.gba
10 changes: 6 additions & 4 deletions data/data2.s
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
Binary file added data/graphics/pokemon/back_pics/abra_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/absol_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/aggron_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/aipom_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/altaria_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/anorith_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/arbok_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/ariados_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/armaldo_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/aron_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/azurill_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/bagon_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/baltoy_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/banette_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/bayleef_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/beldum_back_pic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/graphics/pokemon/back_pics/blissey_back_pic.png
Binary file added data/graphics/pokemon/back_pics/breloom_back_pic.png
Binary file added data/graphics/pokemon/back_pics/cacnea_back_pic.png
Binary file added data/graphics/pokemon/back_pics/cascoon_back_pic.png
Binary file added data/graphics/pokemon/back_pics/celebi_back_pic.png
Binary file added data/graphics/pokemon/back_pics/chansey_back_pic.png
Binary file added data/graphics/pokemon/back_pics/claydol_back_pic.png
Binary file added data/graphics/pokemon/back_pics/cleffa_back_pic.png
Binary file added data/graphics/pokemon/back_pics/corsola_back_pic.png
Binary file added data/graphics/pokemon/back_pics/cradily_back_pic.png
Binary file added data/graphics/pokemon/back_pics/crobat_back_pic.png
Binary file added data/graphics/pokemon/back_pics/cubone_back_pic.png
Binary file added data/graphics/pokemon/back_pics/dewgong_back_pic.png
Binary file added data/graphics/pokemon/back_pics/diglett_back_pic.png
Binary file added data/graphics/pokemon/back_pics/ditto_back_pic.png
Binary file added data/graphics/pokemon/back_pics/dodrio_back_pic.png
Binary file added data/graphics/pokemon/back_pics/doduo_back_pic.png
Binary file added data/graphics/pokemon/back_pics/donphan_back_pic.png
Binary file added data/graphics/pokemon/back_pics/dratini_back_pic.png
Binary file added data/graphics/pokemon/back_pics/drowzee_back_pic.png
Binary file added data/graphics/pokemon/back_pics/dugtrio_back_pic.png
Binary file added data/graphics/pokemon/back_pics/duskull_back_pic.png
Binary file added data/graphics/pokemon/back_pics/dustox_back_pic.png
Binary file added data/graphics/pokemon/back_pics/eevee_back_pic.png
Binary file added data/graphics/pokemon/back_pics/ekans_back_pic.png
Binary file added data/graphics/pokemon/back_pics/elekid_back_pic.png
Binary file added data/graphics/pokemon/back_pics/entei_back_pic.png
Binary file added data/graphics/pokemon/back_pics/espeon_back_pic.png
Binary file added data/graphics/pokemon/back_pics/exploud_back_pic.png
Binary file added data/graphics/pokemon/back_pics/fearow_back_pic.png
Binary file added data/graphics/pokemon/back_pics/feebas_back_pic.png
Binary file added data/graphics/pokemon/back_pics/flaaffy_back_pic.png
Binary file added data/graphics/pokemon/back_pics/flareon_back_pic.png
Binary file added data/graphics/pokemon/back_pics/flygon_back_pic.png
Binary file added data/graphics/pokemon/back_pics/furret_back_pic.png
Binary file added data/graphics/pokemon/back_pics/gastly_back_pic.png
Binary file added data/graphics/pokemon/back_pics/gengar_back_pic.png
Binary file added data/graphics/pokemon/back_pics/geodude_back_pic.png
Binary file added data/graphics/pokemon/back_pics/glalie_back_pic.png
Binary file added data/graphics/pokemon/back_pics/gligar_back_pic.png
Binary file added data/graphics/pokemon/back_pics/gloom_back_pic.png
Binary file added data/graphics/pokemon/back_pics/golbat_back_pic.png
Binary file added data/graphics/pokemon/back_pics/goldeen_back_pic.png
Binary file added data/graphics/pokemon/back_pics/golduck_back_pic.png
Binary file added data/graphics/pokemon/back_pics/golem_back_pic.png
Binary file added data/graphics/pokemon/back_pics/grimer_back_pic.png
Binary file added data/graphics/pokemon/back_pics/groudon_back_pic.png
Binary file added data/graphics/pokemon/back_pics/grovyle_back_pic.png
Binary file added data/graphics/pokemon/back_pics/grumpig_back_pic.png
Binary file added data/graphics/pokemon/back_pics/gulpin_back_pic.png
Binary file added data/graphics/pokemon/back_pics/haunter_back_pic.png
Binary file added data/graphics/pokemon/back_pics/ho_oh_back_pic.png
Binary file added data/graphics/pokemon/back_pics/hoppip_back_pic.png
Binary file added data/graphics/pokemon/back_pics/horsea_back_pic.png
Binary file added data/graphics/pokemon/back_pics/huntail_back_pic.png
Binary file added data/graphics/pokemon/back_pics/hypno_back_pic.png
Binary file added data/graphics/pokemon/back_pics/ivysaur_back_pic.png
Binary file added data/graphics/pokemon/back_pics/jirachi_back_pic.png
Binary file added data/graphics/pokemon/back_pics/jolteon_back_pic.png
Binary file added data/graphics/pokemon/back_pics/jynx_back_pic.png
Binary file added data/graphics/pokemon/back_pics/kabuto_back_pic.png
Binary file added data/graphics/pokemon/back_pics/kadabra_back_pic.png
Binary file added data/graphics/pokemon/back_pics/kakuna_back_pic.png
Binary file added data/graphics/pokemon/back_pics/kecleon_back_pic.png
Binary file added data/graphics/pokemon/back_pics/kingdra_back_pic.png
Binary file added data/graphics/pokemon/back_pics/kingler_back_pic.png
Binary file added data/graphics/pokemon/back_pics/kirlia_back_pic.png
Binary file added data/graphics/pokemon/back_pics/koffing_back_pic.png
Binary file added data/graphics/pokemon/back_pics/krabby_back_pic.png
Binary file added data/graphics/pokemon/back_pics/kyogre_back_pic.png
Binary file added data/graphics/pokemon/back_pics/lairon_back_pic.png
Binary file added data/graphics/pokemon/back_pics/lanturn_back_pic.png
Binary file added data/graphics/pokemon/back_pics/lapras_back_pic.png
Binary file added data/graphics/pokemon/back_pics/latias_back_pic.png
Binary file added data/graphics/pokemon/back_pics/latios_back_pic.png
Binary file added data/graphics/pokemon/back_pics/ledian_back_pic.png
Binary file added data/graphics/pokemon/back_pics/ledyba_back_pic.png
Binary file added data/graphics/pokemon/back_pics/lileep_back_pic.png
Binary file added data/graphics/pokemon/back_pics/linoone_back_pic.png
Binary file added data/graphics/pokemon/back_pics/lombre_back_pic.png
Binary file added data/graphics/pokemon/back_pics/lotad_back_pic.png
Binary file added data/graphics/pokemon/back_pics/loudred_back_pic.png
Binary file added data/graphics/pokemon/back_pics/lugia_back_pic.png
Binary file added data/graphics/pokemon/back_pics/luvdisc_back_pic.png
Binary file added data/graphics/pokemon/back_pics/machamp_back_pic.png
Binary file added data/graphics/pokemon/back_pics/machoke_back_pic.png
Binary file added data/graphics/pokemon/back_pics/machop_back_pic.png
Binary file added data/graphics/pokemon/back_pics/magby_back_pic.png
Binary file added data/graphics/pokemon/back_pics/magmar_back_pic.png
Binary file added data/graphics/pokemon/back_pics/mankey_back_pic.png
Binary file added data/graphics/pokemon/back_pics/mantine_back_pic.png
Binary file added data/graphics/pokemon/back_pics/mareep_back_pic.png
Binary file added data/graphics/pokemon/back_pics/marill_back_pic.png
Binary file added data/graphics/pokemon/back_pics/marowak_back_pic.png
Binary file added data/graphics/pokemon/back_pics/mawile_back_pic.png
Binary file added data/graphics/pokemon/back_pics/meowth_back_pic.png
Binary file added data/graphics/pokemon/back_pics/metang_back_pic.png
Binary file added data/graphics/pokemon/back_pics/metapod_back_pic.png
Binary file added data/graphics/pokemon/back_pics/mew_back_pic.png
Binary file added data/graphics/pokemon/back_pics/mewtwo_back_pic.png
Binary file added data/graphics/pokemon/back_pics/milotic_back_pic.png
Binary file added data/graphics/pokemon/back_pics/miltank_back_pic.png
Binary file added data/graphics/pokemon/back_pics/minun_back_pic.png
Binary file added data/graphics/pokemon/back_pics/moltres_back_pic.png
Binary file added data/graphics/pokemon/back_pics/mr_mime_back_pic.png
Binary file added data/graphics/pokemon/back_pics/mudkip_back_pic.png
Binary file added data/graphics/pokemon/back_pics/muk_back_pic.png
Binary file added data/graphics/pokemon/back_pics/murkrow_back_pic.png
Binary file added data/graphics/pokemon/back_pics/natu_back_pic.png
Binary file added data/graphics/pokemon/back_pics/nincada_back_pic.png
Binary file added data/graphics/pokemon/back_pics/ninjask_back_pic.png
Binary file added data/graphics/pokemon/back_pics/noctowl_back_pic.png
Binary file added data/graphics/pokemon/back_pics/numel_back_pic.png
Binary file added data/graphics/pokemon/back_pics/nuzleaf_back_pic.png
Binary file added data/graphics/pokemon/back_pics/oddish_back_pic.png
Binary file added data/graphics/pokemon/back_pics/omanyte_back_pic.png
Binary file added data/graphics/pokemon/back_pics/omastar_back_pic.png
Binary file added data/graphics/pokemon/back_pics/onix_back_pic.png
Binary file added data/graphics/pokemon/back_pics/paras_back_pic.png
Binary file added data/graphics/pokemon/back_pics/persian_back_pic.png
Binary file added data/graphics/pokemon/back_pics/phanpy_back_pic.png
Binary file added data/graphics/pokemon/back_pics/pichu_back_pic.png
Binary file added data/graphics/pokemon/back_pics/pidgeot_back_pic.png
Binary file added data/graphics/pokemon/back_pics/pidgey_back_pic.png
Binary file added data/graphics/pokemon/back_pics/pikachu_back_pic.png
Binary file added data/graphics/pokemon/back_pics/pineco_back_pic.png
Binary file added data/graphics/pokemon/back_pics/pinsir_back_pic.png
Binary file added data/graphics/pokemon/back_pics/plusle_back_pic.png
Binary file added data/graphics/pokemon/back_pics/poliwag_back_pic.png
Binary file added data/graphics/pokemon/back_pics/ponyta_back_pic.png
Binary file added data/graphics/pokemon/back_pics/porygon_back_pic.png
Binary file added data/graphics/pokemon/back_pics/psyduck_back_pic.png
Binary file added data/graphics/pokemon/back_pics/pupitar_back_pic.png
Binary file added data/graphics/pokemon/back_pics/quilava_back_pic.png
Binary file added data/graphics/pokemon/back_pics/raichu_back_pic.png
Binary file added data/graphics/pokemon/back_pics/raikou_back_pic.png
Binary file added data/graphics/pokemon/back_pics/ralts_back_pic.png
Binary file added data/graphics/pokemon/back_pics/rattata_back_pic.png
Binary file added data/graphics/pokemon/back_pics/regice_back_pic.png
Binary file added data/graphics/pokemon/back_pics/rhydon_back_pic.png
Binary file added data/graphics/pokemon/back_pics/rhyhorn_back_pic.png
Binary file added data/graphics/pokemon/back_pics/roselia_back_pic.png
Binary file added data/graphics/pokemon/back_pics/sableye_back_pic.png
Binary file added data/graphics/pokemon/back_pics/scizor_back_pic.png
Binary file added data/graphics/pokemon/back_pics/scyther_back_pic.png
Binary file added data/graphics/pokemon/back_pics/seadra_back_pic.png
Binary file added data/graphics/pokemon/back_pics/seaking_back_pic.png
Binary file added data/graphics/pokemon/back_pics/sealeo_back_pic.png
Binary file added data/graphics/pokemon/back_pics/seedot_back_pic.png
Binary file added data/graphics/pokemon/back_pics/seel_back_pic.png
Binary file added data/graphics/pokemon/back_pics/sentret_back_pic.png
Binary file added data/graphics/pokemon/back_pics/seviper_back_pic.png
Loading

0 comments on commit 4c733f3

Please sign in to comment.