diff --git a/.gitignore b/.gitignore index dadc3ff..b81b0ad 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,5 @@ shim.asm *.exe tools/scan_includes tools/pkmncompress +tools/gfx pret/ diff --git a/Makefile b/Makefile index f6d8f33..643b73e 100644 --- a/Makefile +++ b/Makefile @@ -1,74 +1,94 @@ +BUILD := build + MD5 := md5sum -c +PYTHON := python -.PHONY: all compare clean mostlyclean text +RGBASM := rgbasm +RGBGFX := rgbgfx +RGBLINK := rgblink +RGBFIX := rgbfix -.SUFFIXES: -.SUFFIXES: .asm .o .gb .png -.SECONDEXPANSION: -.PRECIOUS: %.1bpp %.2bpp %.pic +RGBASMFLAGS := -E -i $(BUILD)/ +tools/gfx := ROMS := pokegold-spaceworld.gb BASEROM := baserom.gb -OBJS := home.o main.o audio.o sram.o wram.o hram.o shim.o +DIRS := home engine data audio +OBJS := $(addprefix $(BUILD)/, gfx.o sram.o wram.o hram.o shim.o) -# Link objects together to build a rom. +rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2)) +OBJS += $(patsubst %.asm, $(BUILD)/%.o, $(call rwildcard, $(DIRS), *.asm)) + +GFX := $(patsubst %.png, $(BUILD)/%.2bpp, \ + $(patsubst %.1bpp.png, $(BUILD)/%.1bpp, \ + $(patsubst gfx/pokemon/%/front.png, $(BUILD)/gfx/pokemon/%/front.pic, \ + $(patsubst gfx/pokemon/%/back.png, $(BUILD)/gfx/pokemon/%/back.pic, \ + $(call rwildcard, gfx, *.png))))) + +.SECONDEXPANSION: + +.PHONY: all all: $(ROMS) compare -tools: +.PHONY: compare +compare: $(ROMS) + $(MD5) roms.md5 + +.PHONY: tools +tools tools/pkmncompress tools/gfx: $(MAKE) -C tools/ -define DEP -$1: $2 $$(shell tools/scan_includes $2) - rgbasm -E -o $$@ $$< -endef - -ifeq (,$(filter clean tools,$(MAKECMDGOALS))) -$(info $(shell $(MAKE) -C tools)) - -$(foreach obj, $(OBJS), $(eval $(call DEP,$(obj),$(obj:.o=.asm)))) - -endif - -shim.asm: tools/make_shim.py shim.sym - python tools/make_shim.py -w -- $(filter-out $<, $^) > $@ - -$(ROMS): $(OBJS) - rgblink -d -n $(ROMS:.gb=.sym) -m $(ROMS:.gb=.map) -O $(BASEROM) -o $@ $^ - rgbfix -f lh -k 01 -l 0x33 -m 0x03 -p 0 -r 3 -t "POKEMON2GOLD" $@ - -compare: $(ROMS) - @$(MD5) roms.md5 - # Remove files generated by the build process. +.PHONY: clean clean: - rm -rf $(ROMS) $(OBJS) $(ROMS:.gb=.sym) build/* shim.asm - find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' -o -iname '*.pcm' \) -exec rm {} + + rm -rf $(ROMS) $(BUILD) $(ROMS:.gb=.sym) $(ROMS:.gb=.map) # Remove files except for graphics. +.PHONY: mostlyclean mostlyclean: - rm -rf $(ROMS) $(OBJS) $(ROMS:.gb=.sym) build/* shim.asm - find . \( -iname '*.pcm' \) -exec rm {} + + rm -rf $(ROMS) $(OBJS) $(ROMS:.gb=.sym) $(ROMS:.gb=.map) -gfx/sgb/sgb_border_alt.2bpp: tools/gfx += --trim-whitespace -gfx/sgb/sgb_border.2bpp: tools/gfx += --trim-whitespace -gfx/title/title.2bpp: tools/gfx += --trim-whitespace -gfx/trainer_card/leaders.2bpp: tools/gfx += --trim-whitespace -gfx/minigames/slots.2bpp: tools/gfx += --trim-whitespace -gfx/minigames/poker.2bpp: tools/gfx += --trim-whitespace -gfx/intro/purin_pikachu.2bpp: tools/gfx += --trim-whitespace +$(ROMS): $(OBJS) + $(RGBLINK) -d -n $(@:.gb=.sym) -m $(@:.gb=.map) -O $(BASEROM) -o $@ $^ + $(RGBFIX) -f lh -k 01 -l 0x33 -m 0x03 -p 0 -r 3 -t "POKEMON2GOLD" $@ -%.2bpp: %.png - rgbgfx -o $@ $< - $(if $(tools/gfx),\ - tools/gfx $(tools/gfx) -o $@ $@) +$(BUILD)/shim.asm: tools/make_shim.py shim.sym | $$(dir $$@) + $(PYTHON) tools/make_shim.py -w -- $(filter-out $<, $^) > $@ -%.1bpp: %.png - rgbgfx -d1 -o $@ $< - $(if $(tools/gfx),\ - tools/gfx $(tools/gfx) -d1 -o $@ $@) +$(BUILD)/gfx.o: | $(GFX) +$(BUILD)/%.o: $(BUILD)/%.asm | $$(dir $$@) + $(RGBASM) $(RGBASMFLAGS) -M $(@:.o=.d) $(OUTPUT_OPTION) $< +$(BUILD)/%.o: %.asm | $$(dir $$@) + $(RGBASM) $(RGBASMFLAGS) -M $(@:.o=.d) $(OUTPUT_OPTION) $< -%.tilemap: %.png - rgbgfx -t $@ $< +$(BUILD)/gfx/sgb/sgb_border_alt.2bpp: tools/gfx += --trim-whitespace +$(BUILD)/gfx/sgb/sgb_border.2bpp: tools/gfx += --trim-whitespace +$(BUILD)/gfx/title/title.2bpp: tools/gfx += --trim-whitespace +$(BUILD)/gfx/trainer_card/leaders.2bpp: tools/gfx += --trim-whitespace +$(BUILD)/gfx/minigames/slots.2bpp: tools/gfx += --trim-whitespace +$(BUILD)/gfx/minigames/poker.2bpp: tools/gfx += --trim-whitespace +$(BUILD)/gfx/intro/purin_pikachu.2bpp: tools/gfx += --trim-whitespace -%.pic: %.2bpp +.PRECIOUS: $(BUILD)/%.pic +$(BUILD)/%.pic: $(BUILD)/%.2bpp tools/pkmncompress | $$(dir $$@) tools/pkmncompress $< $@ + +.PRECIOUS: $(BUILD)/%.2bpp +$(BUILD)/%.2bpp: %.png tools/gfx | $$(dir $$@) + $(RGBGFX) $(OUTPUT_OPTION) $< + tools/gfx $(tools/gfx) $(OUTPUT_OPTION) $@ + +.PRECIOUS: $(BUILD)/%.1bpp +$(BUILD)/%.1bpp: %.1bpp.png tools/gfx | $$(dir $$@) + $(RGBGFX) -d1 $(OUTPUT_OPTION) $< + tools/gfx $(tools/gfx) -d1 $(OUTPUT_OPTION) $@ + +.PRECIOUS: $(BUILD)/%.tilemap +$(BUILD)/%.tilemap: %.png | $$(dir $$@) + $(RGBGFX) -t $@ $< + +.PRECIOUS: %/ +%/: + mkdir -p $@ + +-include $(call rwildcard, $(BUILD)/, *.d) diff --git a/audio.asm b/audio.asm deleted file mode 100644 index aec654c..0000000 --- a/audio.asm +++ /dev/null @@ -1,11 +0,0 @@ -INCLUDE "constants.asm" - - -SECTION "Audio", ROMX[$4000],BANK[$3A] - -INCLUDE "audio/engine.asm" - - -SECTION "Cries", ROMX[$51CB],BANK[$3C] ; TODO: Temporary, please map 4000-51CA and move this section's base - -CryHeaders:: ; TODO: Rip the data, then INCBIN it diff --git a/audio/cries.asm b/audio/cries.asm new file mode 100644 index 0000000..3b57f4c --- /dev/null +++ b/audio/cries.asm @@ -0,0 +1,5 @@ +INCLUDE "constants.asm" + +SECTION "Cries", ROMX[$51CB], BANK[$3C] ; TODO: Temporary, please map 4000-51CA and move this section's base + +CryHeaders:: ; TODO: Rip the data, then INCBIN it diff --git a/audio/engine.asm b/audio/engine.asm index 779f7e0..561d778 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -1,3 +1,7 @@ +INCLUDE "constants.asm" + +SECTION "Audio", ROMX[$4000], BANK[$3A] + _DisableAudio:: ; 3a:4000 push hl push de diff --git a/data/items/names.asm b/data/items/names.asm index e4cb9cd..1262553 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -1,3 +1,7 @@ +INCLUDE "constants.asm" + +SECTION "ItemNames", ROMX[$6FEC], BANK[$01] + ItemNames:: db "マスターボール@" db "ハイパーボール@" diff --git a/data/moves/names.asm b/data/moves/names.asm index f73cf98..bc6c21b 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -1,3 +1,7 @@ +INCLUDE "constants.asm" + +SECTION "MoveNames", ROMX[$52A1], BANK[$10] + MoveNames:: db "はたく@" db "からてチョップ@" diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index c971bc7..454a7cd 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -1,3 +1,7 @@ +INCLUDE "constants.asm" + +SECTION "TM/HM Moves", ROMX[$52D1], BANK[$04] + ; This is a nearly-sequential table of new moves. ; It was probably meant for easy testing, not as ; a final set of TM moves. diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index c959f3d..59715d5 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -1,3 +1,7 @@ +INCLUDE "constants.asm" + +SECTION "Base Data", ROMX[$4F10], BANK[$14] + tmhm: MACRO ; used in data/pokemon/base_stats/*.asm tms1 = 0 ; TM01-TM24 (24) @@ -33,255 +37,255 @@ ENDM BaseData:: MonBaseStats:: -INCLUDE "data/pokemon/base_stats/fushigidane.asm" +INCLUDE "data/pokemon/base_stats/fushigidane.inc" MonBaseStatsEnd:: -INCLUDE "data/pokemon/base_stats/fushigisou.asm" -INCLUDE "data/pokemon/base_stats/fushigibana.asm" -INCLUDE "data/pokemon/base_stats/hitokage.asm" -INCLUDE "data/pokemon/base_stats/lizardo.asm" -INCLUDE "data/pokemon/base_stats/lizardon.asm" -INCLUDE "data/pokemon/base_stats/zenigame.asm" -INCLUDE "data/pokemon/base_stats/kameil.asm" -INCLUDE "data/pokemon/base_stats/kamex.asm" -INCLUDE "data/pokemon/base_stats/caterpie.asm" -INCLUDE "data/pokemon/base_stats/transel.asm" -INCLUDE "data/pokemon/base_stats/butterfree.asm" -INCLUDE "data/pokemon/base_stats/beedle.asm" -INCLUDE "data/pokemon/base_stats/cocoon.asm" -INCLUDE "data/pokemon/base_stats/spear.asm" -INCLUDE "data/pokemon/base_stats/poppo.asm" -INCLUDE "data/pokemon/base_stats/pigeon.asm" -INCLUDE "data/pokemon/base_stats/pigeot.asm" -INCLUDE "data/pokemon/base_stats/koratta.asm" -INCLUDE "data/pokemon/base_stats/ratta.asm" -INCLUDE "data/pokemon/base_stats/onisuzume.asm" -INCLUDE "data/pokemon/base_stats/onidrill.asm" -INCLUDE "data/pokemon/base_stats/arbo.asm" -INCLUDE "data/pokemon/base_stats/arbok.asm" -INCLUDE "data/pokemon/base_stats/pikachu.asm" -INCLUDE "data/pokemon/base_stats/raichu.asm" -INCLUDE "data/pokemon/base_stats/sand.asm" -INCLUDE "data/pokemon/base_stats/sandpan.asm" -INCLUDE "data/pokemon/base_stats/nidoran_f.asm" -INCLUDE "data/pokemon/base_stats/nidorina.asm" -INCLUDE "data/pokemon/base_stats/nidoqueen.asm" -INCLUDE "data/pokemon/base_stats/nidoran_m.asm" -INCLUDE "data/pokemon/base_stats/nidorino.asm" -INCLUDE "data/pokemon/base_stats/nidoking.asm" -INCLUDE "data/pokemon/base_stats/pippi.asm" -INCLUDE "data/pokemon/base_stats/pixy.asm" -INCLUDE "data/pokemon/base_stats/rokon.asm" -INCLUDE "data/pokemon/base_stats/kyukon.asm" -INCLUDE "data/pokemon/base_stats/purin.asm" -INCLUDE "data/pokemon/base_stats/pukurin.asm" -INCLUDE "data/pokemon/base_stats/zubat.asm" -INCLUDE "data/pokemon/base_stats/golbat.asm" -INCLUDE "data/pokemon/base_stats/nazonokusa.asm" -INCLUDE "data/pokemon/base_stats/kusaihana.asm" -INCLUDE "data/pokemon/base_stats/ruffresia.asm" -INCLUDE "data/pokemon/base_stats/paras.asm" -INCLUDE "data/pokemon/base_stats/parasect.asm" -INCLUDE "data/pokemon/base_stats/kongpang.asm" -INCLUDE "data/pokemon/base_stats/morphon.asm" -INCLUDE "data/pokemon/base_stats/digda.asm" -INCLUDE "data/pokemon/base_stats/dugtrio.asm" -INCLUDE "data/pokemon/base_stats/nyarth.asm" -INCLUDE "data/pokemon/base_stats/persian.asm" -INCLUDE "data/pokemon/base_stats/koduck.asm" -INCLUDE "data/pokemon/base_stats/golduck.asm" -INCLUDE "data/pokemon/base_stats/mankey.asm" -INCLUDE "data/pokemon/base_stats/okorizaru.asm" -INCLUDE "data/pokemon/base_stats/gardie.asm" -INCLUDE "data/pokemon/base_stats/windie.asm" -INCLUDE "data/pokemon/base_stats/nyoromo.asm" -INCLUDE "data/pokemon/base_stats/nyorozo.asm" -INCLUDE "data/pokemon/base_stats/nyorobon.asm" -INCLUDE "data/pokemon/base_stats/casey.asm" -INCLUDE "data/pokemon/base_stats/yungerer.asm" -INCLUDE "data/pokemon/base_stats/foodin.asm" -INCLUDE "data/pokemon/base_stats/wanriky.asm" -INCLUDE "data/pokemon/base_stats/goriky.asm" -INCLUDE "data/pokemon/base_stats/kairiky.asm" -INCLUDE "data/pokemon/base_stats/madatsubomi.asm" -INCLUDE "data/pokemon/base_stats/utsudon.asm" -INCLUDE "data/pokemon/base_stats/utsubot.asm" -INCLUDE "data/pokemon/base_stats/menokurage.asm" -INCLUDE "data/pokemon/base_stats/dokukurage.asm" -INCLUDE "data/pokemon/base_stats/isitsubute.asm" -INCLUDE "data/pokemon/base_stats/golone.asm" -INCLUDE "data/pokemon/base_stats/golonya.asm" -INCLUDE "data/pokemon/base_stats/ponyta.asm" -INCLUDE "data/pokemon/base_stats/gallop.asm" -INCLUDE "data/pokemon/base_stats/yadon.asm" -INCLUDE "data/pokemon/base_stats/yadoran.asm" -INCLUDE "data/pokemon/base_stats/coil.asm" -INCLUDE "data/pokemon/base_stats/rarecoil.asm" -INCLUDE "data/pokemon/base_stats/kamonegi.asm" -INCLUDE "data/pokemon/base_stats/dodo.asm" -INCLUDE "data/pokemon/base_stats/dodorio.asm" -INCLUDE "data/pokemon/base_stats/pawou.asm" -INCLUDE "data/pokemon/base_stats/jugon.asm" -INCLUDE "data/pokemon/base_stats/betbeter.asm" -INCLUDE "data/pokemon/base_stats/betbeton.asm" -INCLUDE "data/pokemon/base_stats/shellder.asm" -INCLUDE "data/pokemon/base_stats/parshen.asm" -INCLUDE "data/pokemon/base_stats/ghos.asm" -INCLUDE "data/pokemon/base_stats/ghost.asm" -INCLUDE "data/pokemon/base_stats/gangar.asm" -INCLUDE "data/pokemon/base_stats/iwark.asm" -INCLUDE "data/pokemon/base_stats/sleepe.asm" -INCLUDE "data/pokemon/base_stats/sleeper.asm" -INCLUDE "data/pokemon/base_stats/crab.asm" -INCLUDE "data/pokemon/base_stats/kingler.asm" -INCLUDE "data/pokemon/base_stats/biriridama.asm" -INCLUDE "data/pokemon/base_stats/marumine.asm" -INCLUDE "data/pokemon/base_stats/tamatama.asm" -INCLUDE "data/pokemon/base_stats/nassy.asm" -INCLUDE "data/pokemon/base_stats/karakara.asm" -INCLUDE "data/pokemon/base_stats/garagara.asm" -INCLUDE "data/pokemon/base_stats/sawamular.asm" -INCLUDE "data/pokemon/base_stats/ebiwalar.asm" -INCLUDE "data/pokemon/base_stats/beroringa.asm" -INCLUDE "data/pokemon/base_stats/dogars.asm" -INCLUDE "data/pokemon/base_stats/matadogas.asm" -INCLUDE "data/pokemon/base_stats/sihorn.asm" -INCLUDE "data/pokemon/base_stats/sidon.asm" -INCLUDE "data/pokemon/base_stats/lucky.asm" -INCLUDE "data/pokemon/base_stats/monjara.asm" -INCLUDE "data/pokemon/base_stats/garura.asm" -INCLUDE "data/pokemon/base_stats/tattu.asm" -INCLUDE "data/pokemon/base_stats/seadra.asm" -INCLUDE "data/pokemon/base_stats/tosakinto.asm" -INCLUDE "data/pokemon/base_stats/azumao.asm" -INCLUDE "data/pokemon/base_stats/hitodeman.asm" -INCLUDE "data/pokemon/base_stats/starmie.asm" -INCLUDE "data/pokemon/base_stats/barrierd.asm" -INCLUDE "data/pokemon/base_stats/strike.asm" -INCLUDE "data/pokemon/base_stats/rougela.asm" -INCLUDE "data/pokemon/base_stats/eleboo.asm" -INCLUDE "data/pokemon/base_stats/boober.asm" -INCLUDE "data/pokemon/base_stats/kailios.asm" -INCLUDE "data/pokemon/base_stats/kentauros.asm" -INCLUDE "data/pokemon/base_stats/koiking.asm" -INCLUDE "data/pokemon/base_stats/gyarados.asm" -INCLUDE "data/pokemon/base_stats/laplace.asm" -INCLUDE "data/pokemon/base_stats/metamon.asm" -INCLUDE "data/pokemon/base_stats/eievui.asm" -INCLUDE "data/pokemon/base_stats/showers.asm" -INCLUDE "data/pokemon/base_stats/thunders.asm" -INCLUDE "data/pokemon/base_stats/booster.asm" -INCLUDE "data/pokemon/base_stats/porygon.asm" -INCLUDE "data/pokemon/base_stats/omnite.asm" -INCLUDE "data/pokemon/base_stats/omstar.asm" -INCLUDE "data/pokemon/base_stats/kabuto.asm" -INCLUDE "data/pokemon/base_stats/kabutops.asm" -INCLUDE "data/pokemon/base_stats/ptera.asm" -INCLUDE "data/pokemon/base_stats/kabigon.asm" -INCLUDE "data/pokemon/base_stats/freezer.asm" -INCLUDE "data/pokemon/base_stats/thunder.asm" -INCLUDE "data/pokemon/base_stats/fire.asm" -INCLUDE "data/pokemon/base_stats/miniryu.asm" -INCLUDE "data/pokemon/base_stats/hakuryu.asm" -INCLUDE "data/pokemon/base_stats/kairyu.asm" -INCLUDE "data/pokemon/base_stats/mewtwo.asm" -INCLUDE "data/pokemon/base_stats/mew.asm" -INCLUDE "data/pokemon/base_stats/happa.asm" -INCLUDE "data/pokemon/base_stats/hanamogura.asm" -INCLUDE "data/pokemon/base_stats/hanaryu.asm" -INCLUDE "data/pokemon/base_stats/honoguma.asm" -INCLUDE "data/pokemon/base_stats/volbear.asm" -INCLUDE "data/pokemon/base_stats/dynabear.asm" -INCLUDE "data/pokemon/base_stats/kurusu.asm" -INCLUDE "data/pokemon/base_stats/aqua.asm" -INCLUDE "data/pokemon/base_stats/aquaria.asm" -INCLUDE "data/pokemon/base_stats/hoho.asm" -INCLUDE "data/pokemon/base_stats/bobo.asm" -INCLUDE "data/pokemon/base_stats/pachimee.asm" -INCLUDE "data/pokemon/base_stats/mokoko.asm" -INCLUDE "data/pokemon/base_stats/denryu.asm" -INCLUDE "data/pokemon/base_stats/mikon.asm" -INCLUDE "data/pokemon/base_stats/monja.asm" -INCLUDE "data/pokemon/base_stats/jaranra.asm" -INCLUDE "data/pokemon/base_stats/haneei.asm" -INCLUDE "data/pokemon/base_stats/puku.asm" -INCLUDE "data/pokemon/base_stats/shibirefugu.asm" -INCLUDE "data/pokemon/base_stats/pichu.asm" -INCLUDE "data/pokemon/base_stats/py.asm" -INCLUDE "data/pokemon/base_stats/pupurin.asm" -INCLUDE "data/pokemon/base_stats/mizuuo.asm" -INCLUDE "data/pokemon/base_stats/naty.asm" -INCLUDE "data/pokemon/base_stats/natio.asm" -INCLUDE "data/pokemon/base_stats/gyopin.asm" -INCLUDE "data/pokemon/base_stats/maril.asm" -INCLUDE "data/pokemon/base_stats/manbo1.asm" -INCLUDE "data/pokemon/base_stats/ikari.asm" -INCLUDE "data/pokemon/base_stats/grotess.asm" -INCLUDE "data/pokemon/base_stats/eksing.asm" -INCLUDE "data/pokemon/base_stats/para.asm" -INCLUDE "data/pokemon/base_stats/kokumo.asm" -INCLUDE "data/pokemon/base_stats/twohead.asm" -INCLUDE "data/pokemon/base_stats/yoroidori.asm" -INCLUDE "data/pokemon/base_stats/animon.asm" -INCLUDE "data/pokemon/base_stats/hinazu.asm" -INCLUDE "data/pokemon/base_stats/sunny.asm" -INCLUDE "data/pokemon/base_stats/paon.asm" -INCLUDE "data/pokemon/base_stats/donphan.asm" -INCLUDE "data/pokemon/base_stats/twinz.asm" -INCLUDE "data/pokemon/base_stats/kirinriki.asm" -INCLUDE "data/pokemon/base_stats/painter.asm" -INCLUDE "data/pokemon/base_stats/kounya.asm" -INCLUDE "data/pokemon/base_stats/rinrin.asm" -INCLUDE "data/pokemon/base_stats/berurun.asm" -INCLUDE "data/pokemon/base_stats/nyorotono.asm" -INCLUDE "data/pokemon/base_stats/yadoking.asm" -INCLUDE "data/pokemon/base_stats/annon.asm" -INCLUDE "data/pokemon/base_stats/rediba.asm" -INCLUDE "data/pokemon/base_stats/mitsuboshi.asm" -INCLUDE "data/pokemon/base_stats/puchicorn.asm" -INCLUDE "data/pokemon/base_stats/eifie.asm" -INCLUDE "data/pokemon/base_stats/blacky.asm" -INCLUDE "data/pokemon/base_stats/turban.asm" -INCLUDE "data/pokemon/base_stats/betbaby.asm" -INCLUDE "data/pokemon/base_stats/teppouo.asm" -INCLUDE "data/pokemon/base_stats/okutank.asm" -INCLUDE "data/pokemon/base_stats/gongu.asm" -INCLUDE "data/pokemon/base_stats/kapoerer.asm" -INCLUDE "data/pokemon/base_stats/pudie.asm" -INCLUDE "data/pokemon/base_stats/haneko.asm" -INCLUDE "data/pokemon/base_stats/poponeko.asm" -INCLUDE "data/pokemon/base_stats/wataneko.asm" -INCLUDE "data/pokemon/base_stats/baririna.asm" -INCLUDE "data/pokemon/base_stats/lip.asm" -INCLUDE "data/pokemon/base_stats/elebaby.asm" -INCLUDE "data/pokemon/base_stats/booby.asm" -INCLUDE "data/pokemon/base_stats/kireihana.asm" -INCLUDE "data/pokemon/base_stats/tsubomitto.asm" -INCLUDE "data/pokemon/base_stats/miltank.asm" -INCLUDE "data/pokemon/base_stats/bombseeker.asm" -INCLUDE "data/pokemon/base_stats/gift.asm" -INCLUDE "data/pokemon/base_stats/kotora.asm" -INCLUDE "data/pokemon/base_stats/raitora.asm" -INCLUDE "data/pokemon/base_stats/madame.asm" -INCLUDE "data/pokemon/base_stats/norowara.asm" -INCLUDE "data/pokemon/base_stats/kyonpan.asm" -INCLUDE "data/pokemon/base_stats/yamikarasu.asm" -INCLUDE "data/pokemon/base_stats/happi.asm" -INCLUDE "data/pokemon/base_stats/scissors.asm" -INCLUDE "data/pokemon/base_stats/purakkusu.asm" -INCLUDE "data/pokemon/base_stats/devil.asm" -INCLUDE "data/pokemon/base_stats/helgaa.asm" -INCLUDE "data/pokemon/base_stats/wolfman.asm" -INCLUDE "data/pokemon/base_stats/warwolf.asm" -INCLUDE "data/pokemon/base_stats/porygon2.asm" -INCLUDE "data/pokemon/base_stats/nameil.asm" -INCLUDE "data/pokemon/base_stats/haganeil.asm" -INCLUDE "data/pokemon/base_stats/kingdra.asm" -INCLUDE "data/pokemon/base_stats/rai.asm" -INCLUDE "data/pokemon/base_stats/en.asm" -INCLUDE "data/pokemon/base_stats/sui.asm" -INCLUDE "data/pokemon/base_stats/nyula.asm" -INCLUDE "data/pokemon/base_stats/houou.asm" -INCLUDE "data/pokemon/base_stats/togepy.asm" -INCLUDE "data/pokemon/base_stats/bulu.asm" -INCLUDE "data/pokemon/base_stats/tail.asm" -INCLUDE "data/pokemon/base_stats/leafy.asm" +INCLUDE "data/pokemon/base_stats/fushigisou.inc" +INCLUDE "data/pokemon/base_stats/fushigibana.inc" +INCLUDE "data/pokemon/base_stats/hitokage.inc" +INCLUDE "data/pokemon/base_stats/lizardo.inc" +INCLUDE "data/pokemon/base_stats/lizardon.inc" +INCLUDE "data/pokemon/base_stats/zenigame.inc" +INCLUDE "data/pokemon/base_stats/kameil.inc" +INCLUDE "data/pokemon/base_stats/kamex.inc" +INCLUDE "data/pokemon/base_stats/caterpie.inc" +INCLUDE "data/pokemon/base_stats/transel.inc" +INCLUDE "data/pokemon/base_stats/butterfree.inc" +INCLUDE "data/pokemon/base_stats/beedle.inc" +INCLUDE "data/pokemon/base_stats/cocoon.inc" +INCLUDE "data/pokemon/base_stats/spear.inc" +INCLUDE "data/pokemon/base_stats/poppo.inc" +INCLUDE "data/pokemon/base_stats/pigeon.inc" +INCLUDE "data/pokemon/base_stats/pigeot.inc" +INCLUDE "data/pokemon/base_stats/koratta.inc" +INCLUDE "data/pokemon/base_stats/ratta.inc" +INCLUDE "data/pokemon/base_stats/onisuzume.inc" +INCLUDE "data/pokemon/base_stats/onidrill.inc" +INCLUDE "data/pokemon/base_stats/arbo.inc" +INCLUDE "data/pokemon/base_stats/arbok.inc" +INCLUDE "data/pokemon/base_stats/pikachu.inc" +INCLUDE "data/pokemon/base_stats/raichu.inc" +INCLUDE "data/pokemon/base_stats/sand.inc" +INCLUDE "data/pokemon/base_stats/sandpan.inc" +INCLUDE "data/pokemon/base_stats/nidoran_f.inc" +INCLUDE "data/pokemon/base_stats/nidorina.inc" +INCLUDE "data/pokemon/base_stats/nidoqueen.inc" +INCLUDE "data/pokemon/base_stats/nidoran_m.inc" +INCLUDE "data/pokemon/base_stats/nidorino.inc" +INCLUDE "data/pokemon/base_stats/nidoking.inc" +INCLUDE "data/pokemon/base_stats/pippi.inc" +INCLUDE "data/pokemon/base_stats/pixy.inc" +INCLUDE "data/pokemon/base_stats/rokon.inc" +INCLUDE "data/pokemon/base_stats/kyukon.inc" +INCLUDE "data/pokemon/base_stats/purin.inc" +INCLUDE "data/pokemon/base_stats/pukurin.inc" +INCLUDE "data/pokemon/base_stats/zubat.inc" +INCLUDE "data/pokemon/base_stats/golbat.inc" +INCLUDE "data/pokemon/base_stats/nazonokusa.inc" +INCLUDE "data/pokemon/base_stats/kusaihana.inc" +INCLUDE "data/pokemon/base_stats/ruffresia.inc" +INCLUDE "data/pokemon/base_stats/paras.inc" +INCLUDE "data/pokemon/base_stats/parasect.inc" +INCLUDE "data/pokemon/base_stats/kongpang.inc" +INCLUDE "data/pokemon/base_stats/morphon.inc" +INCLUDE "data/pokemon/base_stats/digda.inc" +INCLUDE "data/pokemon/base_stats/dugtrio.inc" +INCLUDE "data/pokemon/base_stats/nyarth.inc" +INCLUDE "data/pokemon/base_stats/persian.inc" +INCLUDE "data/pokemon/base_stats/koduck.inc" +INCLUDE "data/pokemon/base_stats/golduck.inc" +INCLUDE "data/pokemon/base_stats/mankey.inc" +INCLUDE "data/pokemon/base_stats/okorizaru.inc" +INCLUDE "data/pokemon/base_stats/gardie.inc" +INCLUDE "data/pokemon/base_stats/windie.inc" +INCLUDE "data/pokemon/base_stats/nyoromo.inc" +INCLUDE "data/pokemon/base_stats/nyorozo.inc" +INCLUDE "data/pokemon/base_stats/nyorobon.inc" +INCLUDE "data/pokemon/base_stats/casey.inc" +INCLUDE "data/pokemon/base_stats/yungerer.inc" +INCLUDE "data/pokemon/base_stats/foodin.inc" +INCLUDE "data/pokemon/base_stats/wanriky.inc" +INCLUDE "data/pokemon/base_stats/goriky.inc" +INCLUDE "data/pokemon/base_stats/kairiky.inc" +INCLUDE "data/pokemon/base_stats/madatsubomi.inc" +INCLUDE "data/pokemon/base_stats/utsudon.inc" +INCLUDE "data/pokemon/base_stats/utsubot.inc" +INCLUDE "data/pokemon/base_stats/menokurage.inc" +INCLUDE "data/pokemon/base_stats/dokukurage.inc" +INCLUDE "data/pokemon/base_stats/isitsubute.inc" +INCLUDE "data/pokemon/base_stats/golone.inc" +INCLUDE "data/pokemon/base_stats/golonya.inc" +INCLUDE "data/pokemon/base_stats/ponyta.inc" +INCLUDE "data/pokemon/base_stats/gallop.inc" +INCLUDE "data/pokemon/base_stats/yadon.inc" +INCLUDE "data/pokemon/base_stats/yadoran.inc" +INCLUDE "data/pokemon/base_stats/coil.inc" +INCLUDE "data/pokemon/base_stats/rarecoil.inc" +INCLUDE "data/pokemon/base_stats/kamonegi.inc" +INCLUDE "data/pokemon/base_stats/dodo.inc" +INCLUDE "data/pokemon/base_stats/dodorio.inc" +INCLUDE "data/pokemon/base_stats/pawou.inc" +INCLUDE "data/pokemon/base_stats/jugon.inc" +INCLUDE "data/pokemon/base_stats/betbeter.inc" +INCLUDE "data/pokemon/base_stats/betbeton.inc" +INCLUDE "data/pokemon/base_stats/shellder.inc" +INCLUDE "data/pokemon/base_stats/parshen.inc" +INCLUDE "data/pokemon/base_stats/ghos.inc" +INCLUDE "data/pokemon/base_stats/ghost.inc" +INCLUDE "data/pokemon/base_stats/gangar.inc" +INCLUDE "data/pokemon/base_stats/iwark.inc" +INCLUDE "data/pokemon/base_stats/sleepe.inc" +INCLUDE "data/pokemon/base_stats/sleeper.inc" +INCLUDE "data/pokemon/base_stats/crab.inc" +INCLUDE "data/pokemon/base_stats/kingler.inc" +INCLUDE "data/pokemon/base_stats/biriridama.inc" +INCLUDE "data/pokemon/base_stats/marumine.inc" +INCLUDE "data/pokemon/base_stats/tamatama.inc" +INCLUDE "data/pokemon/base_stats/nassy.inc" +INCLUDE "data/pokemon/base_stats/karakara.inc" +INCLUDE "data/pokemon/base_stats/garagara.inc" +INCLUDE "data/pokemon/base_stats/sawamular.inc" +INCLUDE "data/pokemon/base_stats/ebiwalar.inc" +INCLUDE "data/pokemon/base_stats/beroringa.inc" +INCLUDE "data/pokemon/base_stats/dogars.inc" +INCLUDE "data/pokemon/base_stats/matadogas.inc" +INCLUDE "data/pokemon/base_stats/sihorn.inc" +INCLUDE "data/pokemon/base_stats/sidon.inc" +INCLUDE "data/pokemon/base_stats/lucky.inc" +INCLUDE "data/pokemon/base_stats/monjara.inc" +INCLUDE "data/pokemon/base_stats/garura.inc" +INCLUDE "data/pokemon/base_stats/tattu.inc" +INCLUDE "data/pokemon/base_stats/seadra.inc" +INCLUDE "data/pokemon/base_stats/tosakinto.inc" +INCLUDE "data/pokemon/base_stats/azumao.inc" +INCLUDE "data/pokemon/base_stats/hitodeman.inc" +INCLUDE "data/pokemon/base_stats/starmie.inc" +INCLUDE "data/pokemon/base_stats/barrierd.inc" +INCLUDE "data/pokemon/base_stats/strike.inc" +INCLUDE "data/pokemon/base_stats/rougela.inc" +INCLUDE "data/pokemon/base_stats/eleboo.inc" +INCLUDE "data/pokemon/base_stats/boober.inc" +INCLUDE "data/pokemon/base_stats/kailios.inc" +INCLUDE "data/pokemon/base_stats/kentauros.inc" +INCLUDE "data/pokemon/base_stats/koiking.inc" +INCLUDE "data/pokemon/base_stats/gyarados.inc" +INCLUDE "data/pokemon/base_stats/laplace.inc" +INCLUDE "data/pokemon/base_stats/metamon.inc" +INCLUDE "data/pokemon/base_stats/eievui.inc" +INCLUDE "data/pokemon/base_stats/showers.inc" +INCLUDE "data/pokemon/base_stats/thunders.inc" +INCLUDE "data/pokemon/base_stats/booster.inc" +INCLUDE "data/pokemon/base_stats/porygon.inc" +INCLUDE "data/pokemon/base_stats/omnite.inc" +INCLUDE "data/pokemon/base_stats/omstar.inc" +INCLUDE "data/pokemon/base_stats/kabuto.inc" +INCLUDE "data/pokemon/base_stats/kabutops.inc" +INCLUDE "data/pokemon/base_stats/ptera.inc" +INCLUDE "data/pokemon/base_stats/kabigon.inc" +INCLUDE "data/pokemon/base_stats/freezer.inc" +INCLUDE "data/pokemon/base_stats/thunder.inc" +INCLUDE "data/pokemon/base_stats/fire.inc" +INCLUDE "data/pokemon/base_stats/miniryu.inc" +INCLUDE "data/pokemon/base_stats/hakuryu.inc" +INCLUDE "data/pokemon/base_stats/kairyu.inc" +INCLUDE "data/pokemon/base_stats/mewtwo.inc" +INCLUDE "data/pokemon/base_stats/mew.inc" +INCLUDE "data/pokemon/base_stats/happa.inc" +INCLUDE "data/pokemon/base_stats/hanamogura.inc" +INCLUDE "data/pokemon/base_stats/hanaryu.inc" +INCLUDE "data/pokemon/base_stats/honoguma.inc" +INCLUDE "data/pokemon/base_stats/volbear.inc" +INCLUDE "data/pokemon/base_stats/dynabear.inc" +INCLUDE "data/pokemon/base_stats/kurusu.inc" +INCLUDE "data/pokemon/base_stats/aqua.inc" +INCLUDE "data/pokemon/base_stats/aquaria.inc" +INCLUDE "data/pokemon/base_stats/hoho.inc" +INCLUDE "data/pokemon/base_stats/bobo.inc" +INCLUDE "data/pokemon/base_stats/pachimee.inc" +INCLUDE "data/pokemon/base_stats/mokoko.inc" +INCLUDE "data/pokemon/base_stats/denryu.inc" +INCLUDE "data/pokemon/base_stats/mikon.inc" +INCLUDE "data/pokemon/base_stats/monja.inc" +INCLUDE "data/pokemon/base_stats/jaranra.inc" +INCLUDE "data/pokemon/base_stats/haneei.inc" +INCLUDE "data/pokemon/base_stats/puku.inc" +INCLUDE "data/pokemon/base_stats/shibirefugu.inc" +INCLUDE "data/pokemon/base_stats/pichu.inc" +INCLUDE "data/pokemon/base_stats/py.inc" +INCLUDE "data/pokemon/base_stats/pupurin.inc" +INCLUDE "data/pokemon/base_stats/mizuuo.inc" +INCLUDE "data/pokemon/base_stats/naty.inc" +INCLUDE "data/pokemon/base_stats/natio.inc" +INCLUDE "data/pokemon/base_stats/gyopin.inc" +INCLUDE "data/pokemon/base_stats/maril.inc" +INCLUDE "data/pokemon/base_stats/manbo1.inc" +INCLUDE "data/pokemon/base_stats/ikari.inc" +INCLUDE "data/pokemon/base_stats/grotess.inc" +INCLUDE "data/pokemon/base_stats/eksing.inc" +INCLUDE "data/pokemon/base_stats/para.inc" +INCLUDE "data/pokemon/base_stats/kokumo.inc" +INCLUDE "data/pokemon/base_stats/twohead.inc" +INCLUDE "data/pokemon/base_stats/yoroidori.inc" +INCLUDE "data/pokemon/base_stats/animon.inc" +INCLUDE "data/pokemon/base_stats/hinazu.inc" +INCLUDE "data/pokemon/base_stats/sunny.inc" +INCLUDE "data/pokemon/base_stats/paon.inc" +INCLUDE "data/pokemon/base_stats/donphan.inc" +INCLUDE "data/pokemon/base_stats/twinz.inc" +INCLUDE "data/pokemon/base_stats/kirinriki.inc" +INCLUDE "data/pokemon/base_stats/painter.inc" +INCLUDE "data/pokemon/base_stats/kounya.inc" +INCLUDE "data/pokemon/base_stats/rinrin.inc" +INCLUDE "data/pokemon/base_stats/berurun.inc" +INCLUDE "data/pokemon/base_stats/nyorotono.inc" +INCLUDE "data/pokemon/base_stats/yadoking.inc" +INCLUDE "data/pokemon/base_stats/annon.inc" +INCLUDE "data/pokemon/base_stats/rediba.inc" +INCLUDE "data/pokemon/base_stats/mitsuboshi.inc" +INCLUDE "data/pokemon/base_stats/puchicorn.inc" +INCLUDE "data/pokemon/base_stats/eifie.inc" +INCLUDE "data/pokemon/base_stats/blacky.inc" +INCLUDE "data/pokemon/base_stats/turban.inc" +INCLUDE "data/pokemon/base_stats/betbaby.inc" +INCLUDE "data/pokemon/base_stats/teppouo.inc" +INCLUDE "data/pokemon/base_stats/okutank.inc" +INCLUDE "data/pokemon/base_stats/gongu.inc" +INCLUDE "data/pokemon/base_stats/kapoerer.inc" +INCLUDE "data/pokemon/base_stats/pudie.inc" +INCLUDE "data/pokemon/base_stats/haneko.inc" +INCLUDE "data/pokemon/base_stats/poponeko.inc" +INCLUDE "data/pokemon/base_stats/wataneko.inc" +INCLUDE "data/pokemon/base_stats/baririna.inc" +INCLUDE "data/pokemon/base_stats/lip.inc" +INCLUDE "data/pokemon/base_stats/elebaby.inc" +INCLUDE "data/pokemon/base_stats/booby.inc" +INCLUDE "data/pokemon/base_stats/kireihana.inc" +INCLUDE "data/pokemon/base_stats/tsubomitto.inc" +INCLUDE "data/pokemon/base_stats/miltank.inc" +INCLUDE "data/pokemon/base_stats/bombseeker.inc" +INCLUDE "data/pokemon/base_stats/gift.inc" +INCLUDE "data/pokemon/base_stats/kotora.inc" +INCLUDE "data/pokemon/base_stats/raitora.inc" +INCLUDE "data/pokemon/base_stats/madame.inc" +INCLUDE "data/pokemon/base_stats/norowara.inc" +INCLUDE "data/pokemon/base_stats/kyonpan.inc" +INCLUDE "data/pokemon/base_stats/yamikarasu.inc" +INCLUDE "data/pokemon/base_stats/happi.inc" +INCLUDE "data/pokemon/base_stats/scissors.inc" +INCLUDE "data/pokemon/base_stats/purakkusu.inc" +INCLUDE "data/pokemon/base_stats/devil.inc" +INCLUDE "data/pokemon/base_stats/helgaa.inc" +INCLUDE "data/pokemon/base_stats/wolfman.inc" +INCLUDE "data/pokemon/base_stats/warwolf.inc" +INCLUDE "data/pokemon/base_stats/porygon2.inc" +INCLUDE "data/pokemon/base_stats/nameil.inc" +INCLUDE "data/pokemon/base_stats/haganeil.inc" +INCLUDE "data/pokemon/base_stats/kingdra.inc" +INCLUDE "data/pokemon/base_stats/rai.inc" +INCLUDE "data/pokemon/base_stats/en.inc" +INCLUDE "data/pokemon/base_stats/sui.inc" +INCLUDE "data/pokemon/base_stats/nyula.inc" +INCLUDE "data/pokemon/base_stats/houou.inc" +INCLUDE "data/pokemon/base_stats/togepy.inc" +INCLUDE "data/pokemon/base_stats/bulu.inc" +INCLUDE "data/pokemon/base_stats/tail.inc" +INCLUDE "data/pokemon/base_stats/leafy.inc" diff --git a/data/pokemon/base_stats/animon.asm b/data/pokemon/base_stats/animon.inc similarity index 100% rename from data/pokemon/base_stats/animon.asm rename to data/pokemon/base_stats/animon.inc diff --git a/data/pokemon/base_stats/annon.asm b/data/pokemon/base_stats/annon.inc similarity index 100% rename from data/pokemon/base_stats/annon.asm rename to data/pokemon/base_stats/annon.inc diff --git a/data/pokemon/base_stats/aqua.asm b/data/pokemon/base_stats/aqua.inc similarity index 100% rename from data/pokemon/base_stats/aqua.asm rename to data/pokemon/base_stats/aqua.inc diff --git a/data/pokemon/base_stats/aquaria.asm b/data/pokemon/base_stats/aquaria.inc similarity index 100% rename from data/pokemon/base_stats/aquaria.asm rename to data/pokemon/base_stats/aquaria.inc diff --git a/data/pokemon/base_stats/arbo.asm b/data/pokemon/base_stats/arbo.inc similarity index 100% rename from data/pokemon/base_stats/arbo.asm rename to data/pokemon/base_stats/arbo.inc diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.inc similarity index 100% rename from data/pokemon/base_stats/arbok.asm rename to data/pokemon/base_stats/arbok.inc diff --git a/data/pokemon/base_stats/azumao.asm b/data/pokemon/base_stats/azumao.inc similarity index 100% rename from data/pokemon/base_stats/azumao.asm rename to data/pokemon/base_stats/azumao.inc diff --git a/data/pokemon/base_stats/baririna.asm b/data/pokemon/base_stats/baririna.inc similarity index 100% rename from data/pokemon/base_stats/baririna.asm rename to data/pokemon/base_stats/baririna.inc diff --git a/data/pokemon/base_stats/barrierd.asm b/data/pokemon/base_stats/barrierd.inc similarity index 100% rename from data/pokemon/base_stats/barrierd.asm rename to data/pokemon/base_stats/barrierd.inc diff --git a/data/pokemon/base_stats/beedle.asm b/data/pokemon/base_stats/beedle.inc similarity index 100% rename from data/pokemon/base_stats/beedle.asm rename to data/pokemon/base_stats/beedle.inc diff --git a/data/pokemon/base_stats/beroringa.asm b/data/pokemon/base_stats/beroringa.inc similarity index 100% rename from data/pokemon/base_stats/beroringa.asm rename to data/pokemon/base_stats/beroringa.inc diff --git a/data/pokemon/base_stats/berurun.asm b/data/pokemon/base_stats/berurun.inc similarity index 100% rename from data/pokemon/base_stats/berurun.asm rename to data/pokemon/base_stats/berurun.inc diff --git a/data/pokemon/base_stats/betbaby.asm b/data/pokemon/base_stats/betbaby.inc similarity index 100% rename from data/pokemon/base_stats/betbaby.asm rename to data/pokemon/base_stats/betbaby.inc diff --git a/data/pokemon/base_stats/betbeter.asm b/data/pokemon/base_stats/betbeter.inc similarity index 100% rename from data/pokemon/base_stats/betbeter.asm rename to data/pokemon/base_stats/betbeter.inc diff --git a/data/pokemon/base_stats/betbeton.asm b/data/pokemon/base_stats/betbeton.inc similarity index 100% rename from data/pokemon/base_stats/betbeton.asm rename to data/pokemon/base_stats/betbeton.inc diff --git a/data/pokemon/base_stats/biriridama.asm b/data/pokemon/base_stats/biriridama.inc similarity index 100% rename from data/pokemon/base_stats/biriridama.asm rename to data/pokemon/base_stats/biriridama.inc diff --git a/data/pokemon/base_stats/blacky.asm b/data/pokemon/base_stats/blacky.inc similarity index 100% rename from data/pokemon/base_stats/blacky.asm rename to data/pokemon/base_stats/blacky.inc diff --git a/data/pokemon/base_stats/bobo.asm b/data/pokemon/base_stats/bobo.inc similarity index 100% rename from data/pokemon/base_stats/bobo.asm rename to data/pokemon/base_stats/bobo.inc diff --git a/data/pokemon/base_stats/bombseeker.asm b/data/pokemon/base_stats/bombseeker.inc similarity index 100% rename from data/pokemon/base_stats/bombseeker.asm rename to data/pokemon/base_stats/bombseeker.inc diff --git a/data/pokemon/base_stats/boober.asm b/data/pokemon/base_stats/boober.inc similarity index 100% rename from data/pokemon/base_stats/boober.asm rename to data/pokemon/base_stats/boober.inc diff --git a/data/pokemon/base_stats/booby.asm b/data/pokemon/base_stats/booby.inc similarity index 100% rename from data/pokemon/base_stats/booby.asm rename to data/pokemon/base_stats/booby.inc diff --git a/data/pokemon/base_stats/booster.asm b/data/pokemon/base_stats/booster.inc similarity index 100% rename from data/pokemon/base_stats/booster.asm rename to data/pokemon/base_stats/booster.inc diff --git a/data/pokemon/base_stats/bulu.asm b/data/pokemon/base_stats/bulu.inc similarity index 100% rename from data/pokemon/base_stats/bulu.asm rename to data/pokemon/base_stats/bulu.inc diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.inc similarity index 100% rename from data/pokemon/base_stats/butterfree.asm rename to data/pokemon/base_stats/butterfree.inc diff --git a/data/pokemon/base_stats/casey.asm b/data/pokemon/base_stats/casey.inc similarity index 100% rename from data/pokemon/base_stats/casey.asm rename to data/pokemon/base_stats/casey.inc diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.inc similarity index 100% rename from data/pokemon/base_stats/caterpie.asm rename to data/pokemon/base_stats/caterpie.inc diff --git a/data/pokemon/base_stats/cocoon.asm b/data/pokemon/base_stats/cocoon.inc similarity index 100% rename from data/pokemon/base_stats/cocoon.asm rename to data/pokemon/base_stats/cocoon.inc diff --git a/data/pokemon/base_stats/coil.asm b/data/pokemon/base_stats/coil.inc similarity index 100% rename from data/pokemon/base_stats/coil.asm rename to data/pokemon/base_stats/coil.inc diff --git a/data/pokemon/base_stats/crab.asm b/data/pokemon/base_stats/crab.inc similarity index 100% rename from data/pokemon/base_stats/crab.asm rename to data/pokemon/base_stats/crab.inc diff --git a/data/pokemon/base_stats/denryu.asm b/data/pokemon/base_stats/denryu.inc similarity index 100% rename from data/pokemon/base_stats/denryu.asm rename to data/pokemon/base_stats/denryu.inc diff --git a/data/pokemon/base_stats/devil.asm b/data/pokemon/base_stats/devil.inc similarity index 100% rename from data/pokemon/base_stats/devil.asm rename to data/pokemon/base_stats/devil.inc diff --git a/data/pokemon/base_stats/digda.asm b/data/pokemon/base_stats/digda.inc similarity index 100% rename from data/pokemon/base_stats/digda.asm rename to data/pokemon/base_stats/digda.inc diff --git a/data/pokemon/base_stats/dodo.asm b/data/pokemon/base_stats/dodo.inc similarity index 100% rename from data/pokemon/base_stats/dodo.asm rename to data/pokemon/base_stats/dodo.inc diff --git a/data/pokemon/base_stats/dodorio.asm b/data/pokemon/base_stats/dodorio.inc similarity index 100% rename from data/pokemon/base_stats/dodorio.asm rename to data/pokemon/base_stats/dodorio.inc diff --git a/data/pokemon/base_stats/dogars.asm b/data/pokemon/base_stats/dogars.inc similarity index 100% rename from data/pokemon/base_stats/dogars.asm rename to data/pokemon/base_stats/dogars.inc diff --git a/data/pokemon/base_stats/dokukurage.asm b/data/pokemon/base_stats/dokukurage.inc similarity index 100% rename from data/pokemon/base_stats/dokukurage.asm rename to data/pokemon/base_stats/dokukurage.inc diff --git a/data/pokemon/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.inc similarity index 100% rename from data/pokemon/base_stats/donphan.asm rename to data/pokemon/base_stats/donphan.inc diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.inc similarity index 100% rename from data/pokemon/base_stats/dugtrio.asm rename to data/pokemon/base_stats/dugtrio.inc diff --git a/data/pokemon/base_stats/dynabear.asm b/data/pokemon/base_stats/dynabear.inc similarity index 100% rename from data/pokemon/base_stats/dynabear.asm rename to data/pokemon/base_stats/dynabear.inc diff --git a/data/pokemon/base_stats/ebiwalar.asm b/data/pokemon/base_stats/ebiwalar.inc similarity index 100% rename from data/pokemon/base_stats/ebiwalar.asm rename to data/pokemon/base_stats/ebiwalar.inc diff --git a/data/pokemon/base_stats/eievui.asm b/data/pokemon/base_stats/eievui.inc similarity index 100% rename from data/pokemon/base_stats/eievui.asm rename to data/pokemon/base_stats/eievui.inc diff --git a/data/pokemon/base_stats/eifie.asm b/data/pokemon/base_stats/eifie.inc similarity index 100% rename from data/pokemon/base_stats/eifie.asm rename to data/pokemon/base_stats/eifie.inc diff --git a/data/pokemon/base_stats/eksing.asm b/data/pokemon/base_stats/eksing.inc similarity index 100% rename from data/pokemon/base_stats/eksing.asm rename to data/pokemon/base_stats/eksing.inc diff --git a/data/pokemon/base_stats/elebaby.asm b/data/pokemon/base_stats/elebaby.inc similarity index 100% rename from data/pokemon/base_stats/elebaby.asm rename to data/pokemon/base_stats/elebaby.inc diff --git a/data/pokemon/base_stats/eleboo.asm b/data/pokemon/base_stats/eleboo.inc similarity index 100% rename from data/pokemon/base_stats/eleboo.asm rename to data/pokemon/base_stats/eleboo.inc diff --git a/data/pokemon/base_stats/en.asm b/data/pokemon/base_stats/en.inc similarity index 100% rename from data/pokemon/base_stats/en.asm rename to data/pokemon/base_stats/en.inc diff --git a/data/pokemon/base_stats/fire.asm b/data/pokemon/base_stats/fire.inc similarity index 100% rename from data/pokemon/base_stats/fire.asm rename to data/pokemon/base_stats/fire.inc diff --git a/data/pokemon/base_stats/foodin.asm b/data/pokemon/base_stats/foodin.inc similarity index 100% rename from data/pokemon/base_stats/foodin.asm rename to data/pokemon/base_stats/foodin.inc diff --git a/data/pokemon/base_stats/freezer.asm b/data/pokemon/base_stats/freezer.inc similarity index 100% rename from data/pokemon/base_stats/freezer.asm rename to data/pokemon/base_stats/freezer.inc diff --git a/data/pokemon/base_stats/fushigibana.asm b/data/pokemon/base_stats/fushigibana.inc similarity index 100% rename from data/pokemon/base_stats/fushigibana.asm rename to data/pokemon/base_stats/fushigibana.inc diff --git a/data/pokemon/base_stats/fushigidane.asm b/data/pokemon/base_stats/fushigidane.inc similarity index 100% rename from data/pokemon/base_stats/fushigidane.asm rename to data/pokemon/base_stats/fushigidane.inc diff --git a/data/pokemon/base_stats/fushigisou.asm b/data/pokemon/base_stats/fushigisou.inc similarity index 100% rename from data/pokemon/base_stats/fushigisou.asm rename to data/pokemon/base_stats/fushigisou.inc diff --git a/data/pokemon/base_stats/gallop.asm b/data/pokemon/base_stats/gallop.inc similarity index 100% rename from data/pokemon/base_stats/gallop.asm rename to data/pokemon/base_stats/gallop.inc diff --git a/data/pokemon/base_stats/gangar.asm b/data/pokemon/base_stats/gangar.inc similarity index 100% rename from data/pokemon/base_stats/gangar.asm rename to data/pokemon/base_stats/gangar.inc diff --git a/data/pokemon/base_stats/garagara.asm b/data/pokemon/base_stats/garagara.inc similarity index 100% rename from data/pokemon/base_stats/garagara.asm rename to data/pokemon/base_stats/garagara.inc diff --git a/data/pokemon/base_stats/gardie.asm b/data/pokemon/base_stats/gardie.inc similarity index 100% rename from data/pokemon/base_stats/gardie.asm rename to data/pokemon/base_stats/gardie.inc diff --git a/data/pokemon/base_stats/garura.asm b/data/pokemon/base_stats/garura.inc similarity index 100% rename from data/pokemon/base_stats/garura.asm rename to data/pokemon/base_stats/garura.inc diff --git a/data/pokemon/base_stats/ghos.asm b/data/pokemon/base_stats/ghos.inc similarity index 100% rename from data/pokemon/base_stats/ghos.asm rename to data/pokemon/base_stats/ghos.inc diff --git a/data/pokemon/base_stats/ghost.asm b/data/pokemon/base_stats/ghost.inc similarity index 100% rename from data/pokemon/base_stats/ghost.asm rename to data/pokemon/base_stats/ghost.inc diff --git a/data/pokemon/base_stats/gift.asm b/data/pokemon/base_stats/gift.inc similarity index 100% rename from data/pokemon/base_stats/gift.asm rename to data/pokemon/base_stats/gift.inc diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.inc similarity index 100% rename from data/pokemon/base_stats/golbat.asm rename to data/pokemon/base_stats/golbat.inc diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.inc similarity index 100% rename from data/pokemon/base_stats/golduck.asm rename to data/pokemon/base_stats/golduck.inc diff --git a/data/pokemon/base_stats/golone.asm b/data/pokemon/base_stats/golone.inc similarity index 100% rename from data/pokemon/base_stats/golone.asm rename to data/pokemon/base_stats/golone.inc diff --git a/data/pokemon/base_stats/golonya.asm b/data/pokemon/base_stats/golonya.inc similarity index 100% rename from data/pokemon/base_stats/golonya.asm rename to data/pokemon/base_stats/golonya.inc diff --git a/data/pokemon/base_stats/gongu.asm b/data/pokemon/base_stats/gongu.inc similarity index 100% rename from data/pokemon/base_stats/gongu.asm rename to data/pokemon/base_stats/gongu.inc diff --git a/data/pokemon/base_stats/goriky.asm b/data/pokemon/base_stats/goriky.inc similarity index 100% rename from data/pokemon/base_stats/goriky.asm rename to data/pokemon/base_stats/goriky.inc diff --git a/data/pokemon/base_stats/grotess.asm b/data/pokemon/base_stats/grotess.inc similarity index 100% rename from data/pokemon/base_stats/grotess.asm rename to data/pokemon/base_stats/grotess.inc diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.inc similarity index 100% rename from data/pokemon/base_stats/gyarados.asm rename to data/pokemon/base_stats/gyarados.inc diff --git a/data/pokemon/base_stats/gyopin.asm b/data/pokemon/base_stats/gyopin.inc similarity index 100% rename from data/pokemon/base_stats/gyopin.asm rename to data/pokemon/base_stats/gyopin.inc diff --git a/data/pokemon/base_stats/haganeil.asm b/data/pokemon/base_stats/haganeil.inc similarity index 100% rename from data/pokemon/base_stats/haganeil.asm rename to data/pokemon/base_stats/haganeil.inc diff --git a/data/pokemon/base_stats/hakuryu.asm b/data/pokemon/base_stats/hakuryu.inc similarity index 100% rename from data/pokemon/base_stats/hakuryu.asm rename to data/pokemon/base_stats/hakuryu.inc diff --git a/data/pokemon/base_stats/hanamogura.asm b/data/pokemon/base_stats/hanamogura.inc similarity index 100% rename from data/pokemon/base_stats/hanamogura.asm rename to data/pokemon/base_stats/hanamogura.inc diff --git a/data/pokemon/base_stats/hanaryu.asm b/data/pokemon/base_stats/hanaryu.inc similarity index 100% rename from data/pokemon/base_stats/hanaryu.asm rename to data/pokemon/base_stats/hanaryu.inc diff --git a/data/pokemon/base_stats/haneei.asm b/data/pokemon/base_stats/haneei.inc similarity index 100% rename from data/pokemon/base_stats/haneei.asm rename to data/pokemon/base_stats/haneei.inc diff --git a/data/pokemon/base_stats/haneko.asm b/data/pokemon/base_stats/haneko.inc similarity index 100% rename from data/pokemon/base_stats/haneko.asm rename to data/pokemon/base_stats/haneko.inc diff --git a/data/pokemon/base_stats/happa.asm b/data/pokemon/base_stats/happa.inc similarity index 100% rename from data/pokemon/base_stats/happa.asm rename to data/pokemon/base_stats/happa.inc diff --git a/data/pokemon/base_stats/happi.asm b/data/pokemon/base_stats/happi.inc similarity index 100% rename from data/pokemon/base_stats/happi.asm rename to data/pokemon/base_stats/happi.inc diff --git a/data/pokemon/base_stats/helgaa.asm b/data/pokemon/base_stats/helgaa.inc similarity index 100% rename from data/pokemon/base_stats/helgaa.asm rename to data/pokemon/base_stats/helgaa.inc diff --git a/data/pokemon/base_stats/hinazu.asm b/data/pokemon/base_stats/hinazu.inc similarity index 100% rename from data/pokemon/base_stats/hinazu.asm rename to data/pokemon/base_stats/hinazu.inc diff --git a/data/pokemon/base_stats/hitodeman.asm b/data/pokemon/base_stats/hitodeman.inc similarity index 100% rename from data/pokemon/base_stats/hitodeman.asm rename to data/pokemon/base_stats/hitodeman.inc diff --git a/data/pokemon/base_stats/hitokage.asm b/data/pokemon/base_stats/hitokage.inc similarity index 100% rename from data/pokemon/base_stats/hitokage.asm rename to data/pokemon/base_stats/hitokage.inc diff --git a/data/pokemon/base_stats/hoho.asm b/data/pokemon/base_stats/hoho.inc similarity index 100% rename from data/pokemon/base_stats/hoho.asm rename to data/pokemon/base_stats/hoho.inc diff --git a/data/pokemon/base_stats/honoguma.asm b/data/pokemon/base_stats/honoguma.inc similarity index 100% rename from data/pokemon/base_stats/honoguma.asm rename to data/pokemon/base_stats/honoguma.inc diff --git a/data/pokemon/base_stats/houou.asm b/data/pokemon/base_stats/houou.inc similarity index 100% rename from data/pokemon/base_stats/houou.asm rename to data/pokemon/base_stats/houou.inc diff --git a/data/pokemon/base_stats/ikari.asm b/data/pokemon/base_stats/ikari.inc similarity index 100% rename from data/pokemon/base_stats/ikari.asm rename to data/pokemon/base_stats/ikari.inc diff --git a/data/pokemon/base_stats/isitsubute.asm b/data/pokemon/base_stats/isitsubute.inc similarity index 100% rename from data/pokemon/base_stats/isitsubute.asm rename to data/pokemon/base_stats/isitsubute.inc diff --git a/data/pokemon/base_stats/iwark.asm b/data/pokemon/base_stats/iwark.inc similarity index 100% rename from data/pokemon/base_stats/iwark.asm rename to data/pokemon/base_stats/iwark.inc diff --git a/data/pokemon/base_stats/jaranra.asm b/data/pokemon/base_stats/jaranra.inc similarity index 100% rename from data/pokemon/base_stats/jaranra.asm rename to data/pokemon/base_stats/jaranra.inc diff --git a/data/pokemon/base_stats/jugon.asm b/data/pokemon/base_stats/jugon.inc similarity index 100% rename from data/pokemon/base_stats/jugon.asm rename to data/pokemon/base_stats/jugon.inc diff --git a/data/pokemon/base_stats/kabigon.asm b/data/pokemon/base_stats/kabigon.inc similarity index 100% rename from data/pokemon/base_stats/kabigon.asm rename to data/pokemon/base_stats/kabigon.inc diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.inc similarity index 100% rename from data/pokemon/base_stats/kabuto.asm rename to data/pokemon/base_stats/kabuto.inc diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.inc similarity index 100% rename from data/pokemon/base_stats/kabutops.asm rename to data/pokemon/base_stats/kabutops.inc diff --git a/data/pokemon/base_stats/kailios.asm b/data/pokemon/base_stats/kailios.inc similarity index 100% rename from data/pokemon/base_stats/kailios.asm rename to data/pokemon/base_stats/kailios.inc diff --git a/data/pokemon/base_stats/kairiky.asm b/data/pokemon/base_stats/kairiky.inc similarity index 100% rename from data/pokemon/base_stats/kairiky.asm rename to data/pokemon/base_stats/kairiky.inc diff --git a/data/pokemon/base_stats/kairyu.asm b/data/pokemon/base_stats/kairyu.inc similarity index 100% rename from data/pokemon/base_stats/kairyu.asm rename to data/pokemon/base_stats/kairyu.inc diff --git a/data/pokemon/base_stats/kameil.asm b/data/pokemon/base_stats/kameil.inc similarity index 100% rename from data/pokemon/base_stats/kameil.asm rename to data/pokemon/base_stats/kameil.inc diff --git a/data/pokemon/base_stats/kamex.asm b/data/pokemon/base_stats/kamex.inc similarity index 100% rename from data/pokemon/base_stats/kamex.asm rename to data/pokemon/base_stats/kamex.inc diff --git a/data/pokemon/base_stats/kamonegi.asm b/data/pokemon/base_stats/kamonegi.inc similarity index 100% rename from data/pokemon/base_stats/kamonegi.asm rename to data/pokemon/base_stats/kamonegi.inc diff --git a/data/pokemon/base_stats/kapoerer.asm b/data/pokemon/base_stats/kapoerer.inc similarity index 100% rename from data/pokemon/base_stats/kapoerer.asm rename to data/pokemon/base_stats/kapoerer.inc diff --git a/data/pokemon/base_stats/karakara.asm b/data/pokemon/base_stats/karakara.inc similarity index 100% rename from data/pokemon/base_stats/karakara.asm rename to data/pokemon/base_stats/karakara.inc diff --git a/data/pokemon/base_stats/kentauros.asm b/data/pokemon/base_stats/kentauros.inc similarity index 100% rename from data/pokemon/base_stats/kentauros.asm rename to data/pokemon/base_stats/kentauros.inc diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.inc similarity index 100% rename from data/pokemon/base_stats/kingdra.asm rename to data/pokemon/base_stats/kingdra.inc diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.inc similarity index 100% rename from data/pokemon/base_stats/kingler.asm rename to data/pokemon/base_stats/kingler.inc diff --git a/data/pokemon/base_stats/kireihana.asm b/data/pokemon/base_stats/kireihana.inc similarity index 100% rename from data/pokemon/base_stats/kireihana.asm rename to data/pokemon/base_stats/kireihana.inc diff --git a/data/pokemon/base_stats/kirinriki.asm b/data/pokemon/base_stats/kirinriki.inc similarity index 100% rename from data/pokemon/base_stats/kirinriki.asm rename to data/pokemon/base_stats/kirinriki.inc diff --git a/data/pokemon/base_stats/koduck.asm b/data/pokemon/base_stats/koduck.inc similarity index 100% rename from data/pokemon/base_stats/koduck.asm rename to data/pokemon/base_stats/koduck.inc diff --git a/data/pokemon/base_stats/koiking.asm b/data/pokemon/base_stats/koiking.inc similarity index 100% rename from data/pokemon/base_stats/koiking.asm rename to data/pokemon/base_stats/koiking.inc diff --git a/data/pokemon/base_stats/kokumo.asm b/data/pokemon/base_stats/kokumo.inc similarity index 100% rename from data/pokemon/base_stats/kokumo.asm rename to data/pokemon/base_stats/kokumo.inc diff --git a/data/pokemon/base_stats/kongpang.asm b/data/pokemon/base_stats/kongpang.inc similarity index 100% rename from data/pokemon/base_stats/kongpang.asm rename to data/pokemon/base_stats/kongpang.inc diff --git a/data/pokemon/base_stats/koratta.asm b/data/pokemon/base_stats/koratta.inc similarity index 100% rename from data/pokemon/base_stats/koratta.asm rename to data/pokemon/base_stats/koratta.inc diff --git a/data/pokemon/base_stats/kotora.asm b/data/pokemon/base_stats/kotora.inc similarity index 100% rename from data/pokemon/base_stats/kotora.asm rename to data/pokemon/base_stats/kotora.inc diff --git a/data/pokemon/base_stats/kounya.asm b/data/pokemon/base_stats/kounya.inc similarity index 100% rename from data/pokemon/base_stats/kounya.asm rename to data/pokemon/base_stats/kounya.inc diff --git a/data/pokemon/base_stats/kurusu.asm b/data/pokemon/base_stats/kurusu.inc similarity index 100% rename from data/pokemon/base_stats/kurusu.asm rename to data/pokemon/base_stats/kurusu.inc diff --git a/data/pokemon/base_stats/kusaihana.asm b/data/pokemon/base_stats/kusaihana.inc similarity index 100% rename from data/pokemon/base_stats/kusaihana.asm rename to data/pokemon/base_stats/kusaihana.inc diff --git a/data/pokemon/base_stats/kyonpan.asm b/data/pokemon/base_stats/kyonpan.inc similarity index 100% rename from data/pokemon/base_stats/kyonpan.asm rename to data/pokemon/base_stats/kyonpan.inc diff --git a/data/pokemon/base_stats/kyukon.asm b/data/pokemon/base_stats/kyukon.inc similarity index 100% rename from data/pokemon/base_stats/kyukon.asm rename to data/pokemon/base_stats/kyukon.inc diff --git a/data/pokemon/base_stats/laplace.asm b/data/pokemon/base_stats/laplace.inc similarity index 100% rename from data/pokemon/base_stats/laplace.asm rename to data/pokemon/base_stats/laplace.inc diff --git a/data/pokemon/base_stats/leafy.asm b/data/pokemon/base_stats/leafy.inc similarity index 100% rename from data/pokemon/base_stats/leafy.asm rename to data/pokemon/base_stats/leafy.inc diff --git a/data/pokemon/base_stats/lip.asm b/data/pokemon/base_stats/lip.inc similarity index 100% rename from data/pokemon/base_stats/lip.asm rename to data/pokemon/base_stats/lip.inc diff --git a/data/pokemon/base_stats/lizardo.asm b/data/pokemon/base_stats/lizardo.inc similarity index 100% rename from data/pokemon/base_stats/lizardo.asm rename to data/pokemon/base_stats/lizardo.inc diff --git a/data/pokemon/base_stats/lizardon.asm b/data/pokemon/base_stats/lizardon.inc similarity index 100% rename from data/pokemon/base_stats/lizardon.asm rename to data/pokemon/base_stats/lizardon.inc diff --git a/data/pokemon/base_stats/lucky.asm b/data/pokemon/base_stats/lucky.inc similarity index 100% rename from data/pokemon/base_stats/lucky.asm rename to data/pokemon/base_stats/lucky.inc diff --git a/data/pokemon/base_stats/madame.asm b/data/pokemon/base_stats/madame.inc similarity index 100% rename from data/pokemon/base_stats/madame.asm rename to data/pokemon/base_stats/madame.inc diff --git a/data/pokemon/base_stats/madatsubomi.asm b/data/pokemon/base_stats/madatsubomi.inc similarity index 100% rename from data/pokemon/base_stats/madatsubomi.asm rename to data/pokemon/base_stats/madatsubomi.inc diff --git a/data/pokemon/base_stats/manbo1.asm b/data/pokemon/base_stats/manbo1.inc similarity index 100% rename from data/pokemon/base_stats/manbo1.asm rename to data/pokemon/base_stats/manbo1.inc diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.inc similarity index 100% rename from data/pokemon/base_stats/mankey.asm rename to data/pokemon/base_stats/mankey.inc diff --git a/data/pokemon/base_stats/maril.asm b/data/pokemon/base_stats/maril.inc similarity index 100% rename from data/pokemon/base_stats/maril.asm rename to data/pokemon/base_stats/maril.inc diff --git a/data/pokemon/base_stats/marumine.asm b/data/pokemon/base_stats/marumine.inc similarity index 100% rename from data/pokemon/base_stats/marumine.asm rename to data/pokemon/base_stats/marumine.inc diff --git a/data/pokemon/base_stats/matadogas.asm b/data/pokemon/base_stats/matadogas.inc similarity index 100% rename from data/pokemon/base_stats/matadogas.asm rename to data/pokemon/base_stats/matadogas.inc diff --git a/data/pokemon/base_stats/menokurage.asm b/data/pokemon/base_stats/menokurage.inc similarity index 100% rename from data/pokemon/base_stats/menokurage.asm rename to data/pokemon/base_stats/menokurage.inc diff --git a/data/pokemon/base_stats/metamon.asm b/data/pokemon/base_stats/metamon.inc similarity index 100% rename from data/pokemon/base_stats/metamon.asm rename to data/pokemon/base_stats/metamon.inc diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.inc similarity index 100% rename from data/pokemon/base_stats/mew.asm rename to data/pokemon/base_stats/mew.inc diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.inc similarity index 100% rename from data/pokemon/base_stats/mewtwo.asm rename to data/pokemon/base_stats/mewtwo.inc diff --git a/data/pokemon/base_stats/mikon.asm b/data/pokemon/base_stats/mikon.inc similarity index 100% rename from data/pokemon/base_stats/mikon.asm rename to data/pokemon/base_stats/mikon.inc diff --git a/data/pokemon/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.inc similarity index 100% rename from data/pokemon/base_stats/miltank.asm rename to data/pokemon/base_stats/miltank.inc diff --git a/data/pokemon/base_stats/miniryu.asm b/data/pokemon/base_stats/miniryu.inc similarity index 100% rename from data/pokemon/base_stats/miniryu.asm rename to data/pokemon/base_stats/miniryu.inc diff --git a/data/pokemon/base_stats/mitsuboshi.asm b/data/pokemon/base_stats/mitsuboshi.inc similarity index 100% rename from data/pokemon/base_stats/mitsuboshi.asm rename to data/pokemon/base_stats/mitsuboshi.inc diff --git a/data/pokemon/base_stats/mizuuo.asm b/data/pokemon/base_stats/mizuuo.inc similarity index 100% rename from data/pokemon/base_stats/mizuuo.asm rename to data/pokemon/base_stats/mizuuo.inc diff --git a/data/pokemon/base_stats/mokoko.asm b/data/pokemon/base_stats/mokoko.inc similarity index 100% rename from data/pokemon/base_stats/mokoko.asm rename to data/pokemon/base_stats/mokoko.inc diff --git a/data/pokemon/base_stats/monja.asm b/data/pokemon/base_stats/monja.inc similarity index 100% rename from data/pokemon/base_stats/monja.asm rename to data/pokemon/base_stats/monja.inc diff --git a/data/pokemon/base_stats/monjara.asm b/data/pokemon/base_stats/monjara.inc similarity index 100% rename from data/pokemon/base_stats/monjara.asm rename to data/pokemon/base_stats/monjara.inc diff --git a/data/pokemon/base_stats/morphon.asm b/data/pokemon/base_stats/morphon.inc similarity index 100% rename from data/pokemon/base_stats/morphon.asm rename to data/pokemon/base_stats/morphon.inc diff --git a/data/pokemon/base_stats/nameil.asm b/data/pokemon/base_stats/nameil.inc similarity index 100% rename from data/pokemon/base_stats/nameil.asm rename to data/pokemon/base_stats/nameil.inc diff --git a/data/pokemon/base_stats/nassy.asm b/data/pokemon/base_stats/nassy.inc similarity index 100% rename from data/pokemon/base_stats/nassy.asm rename to data/pokemon/base_stats/nassy.inc diff --git a/data/pokemon/base_stats/natio.asm b/data/pokemon/base_stats/natio.inc similarity index 100% rename from data/pokemon/base_stats/natio.asm rename to data/pokemon/base_stats/natio.inc diff --git a/data/pokemon/base_stats/naty.asm b/data/pokemon/base_stats/naty.inc similarity index 100% rename from data/pokemon/base_stats/naty.asm rename to data/pokemon/base_stats/naty.inc diff --git a/data/pokemon/base_stats/nazonokusa.asm b/data/pokemon/base_stats/nazonokusa.inc similarity index 100% rename from data/pokemon/base_stats/nazonokusa.asm rename to data/pokemon/base_stats/nazonokusa.inc diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.inc similarity index 100% rename from data/pokemon/base_stats/nidoking.asm rename to data/pokemon/base_stats/nidoking.inc diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.inc similarity index 100% rename from data/pokemon/base_stats/nidoqueen.asm rename to data/pokemon/base_stats/nidoqueen.inc diff --git a/data/pokemon/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.inc similarity index 100% rename from data/pokemon/base_stats/nidoran_f.asm rename to data/pokemon/base_stats/nidoran_f.inc diff --git a/data/pokemon/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.inc similarity index 100% rename from data/pokemon/base_stats/nidoran_m.asm rename to data/pokemon/base_stats/nidoran_m.inc diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.inc similarity index 100% rename from data/pokemon/base_stats/nidorina.asm rename to data/pokemon/base_stats/nidorina.inc diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.inc similarity index 100% rename from data/pokemon/base_stats/nidorino.asm rename to data/pokemon/base_stats/nidorino.inc diff --git a/data/pokemon/base_stats/norowara.asm b/data/pokemon/base_stats/norowara.inc similarity index 100% rename from data/pokemon/base_stats/norowara.asm rename to data/pokemon/base_stats/norowara.inc diff --git a/data/pokemon/base_stats/nyarth.asm b/data/pokemon/base_stats/nyarth.inc similarity index 100% rename from data/pokemon/base_stats/nyarth.asm rename to data/pokemon/base_stats/nyarth.inc diff --git a/data/pokemon/base_stats/nyorobon.asm b/data/pokemon/base_stats/nyorobon.inc similarity index 100% rename from data/pokemon/base_stats/nyorobon.asm rename to data/pokemon/base_stats/nyorobon.inc diff --git a/data/pokemon/base_stats/nyoromo.asm b/data/pokemon/base_stats/nyoromo.inc similarity index 100% rename from data/pokemon/base_stats/nyoromo.asm rename to data/pokemon/base_stats/nyoromo.inc diff --git a/data/pokemon/base_stats/nyorotono.asm b/data/pokemon/base_stats/nyorotono.inc similarity index 100% rename from data/pokemon/base_stats/nyorotono.asm rename to data/pokemon/base_stats/nyorotono.inc diff --git a/data/pokemon/base_stats/nyorozo.asm b/data/pokemon/base_stats/nyorozo.inc similarity index 100% rename from data/pokemon/base_stats/nyorozo.asm rename to data/pokemon/base_stats/nyorozo.inc diff --git a/data/pokemon/base_stats/nyula.asm b/data/pokemon/base_stats/nyula.inc similarity index 100% rename from data/pokemon/base_stats/nyula.asm rename to data/pokemon/base_stats/nyula.inc diff --git a/data/pokemon/base_stats/okorizaru.asm b/data/pokemon/base_stats/okorizaru.inc similarity index 100% rename from data/pokemon/base_stats/okorizaru.asm rename to data/pokemon/base_stats/okorizaru.inc diff --git a/data/pokemon/base_stats/okutank.asm b/data/pokemon/base_stats/okutank.inc similarity index 100% rename from data/pokemon/base_stats/okutank.asm rename to data/pokemon/base_stats/okutank.inc diff --git a/data/pokemon/base_stats/omnite.asm b/data/pokemon/base_stats/omnite.inc similarity index 100% rename from data/pokemon/base_stats/omnite.asm rename to data/pokemon/base_stats/omnite.inc diff --git a/data/pokemon/base_stats/omstar.asm b/data/pokemon/base_stats/omstar.inc similarity index 100% rename from data/pokemon/base_stats/omstar.asm rename to data/pokemon/base_stats/omstar.inc diff --git a/data/pokemon/base_stats/onidrill.asm b/data/pokemon/base_stats/onidrill.inc similarity index 100% rename from data/pokemon/base_stats/onidrill.asm rename to data/pokemon/base_stats/onidrill.inc diff --git a/data/pokemon/base_stats/onisuzume.asm b/data/pokemon/base_stats/onisuzume.inc similarity index 100% rename from data/pokemon/base_stats/onisuzume.asm rename to data/pokemon/base_stats/onisuzume.inc diff --git a/data/pokemon/base_stats/pachimee.asm b/data/pokemon/base_stats/pachimee.inc similarity index 100% rename from data/pokemon/base_stats/pachimee.asm rename to data/pokemon/base_stats/pachimee.inc diff --git a/data/pokemon/base_stats/painter.asm b/data/pokemon/base_stats/painter.inc similarity index 100% rename from data/pokemon/base_stats/painter.asm rename to data/pokemon/base_stats/painter.inc diff --git a/data/pokemon/base_stats/paon.asm b/data/pokemon/base_stats/paon.inc similarity index 100% rename from data/pokemon/base_stats/paon.asm rename to data/pokemon/base_stats/paon.inc diff --git a/data/pokemon/base_stats/para.asm b/data/pokemon/base_stats/para.inc similarity index 100% rename from data/pokemon/base_stats/para.asm rename to data/pokemon/base_stats/para.inc diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.inc similarity index 100% rename from data/pokemon/base_stats/paras.asm rename to data/pokemon/base_stats/paras.inc diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.inc similarity index 100% rename from data/pokemon/base_stats/parasect.asm rename to data/pokemon/base_stats/parasect.inc diff --git a/data/pokemon/base_stats/parshen.asm b/data/pokemon/base_stats/parshen.inc similarity index 100% rename from data/pokemon/base_stats/parshen.asm rename to data/pokemon/base_stats/parshen.inc diff --git a/data/pokemon/base_stats/pawou.asm b/data/pokemon/base_stats/pawou.inc similarity index 100% rename from data/pokemon/base_stats/pawou.asm rename to data/pokemon/base_stats/pawou.inc diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.inc similarity index 100% rename from data/pokemon/base_stats/persian.asm rename to data/pokemon/base_stats/persian.inc diff --git a/data/pokemon/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.inc similarity index 100% rename from data/pokemon/base_stats/pichu.asm rename to data/pokemon/base_stats/pichu.inc diff --git a/data/pokemon/base_stats/pigeon.asm b/data/pokemon/base_stats/pigeon.inc similarity index 100% rename from data/pokemon/base_stats/pigeon.asm rename to data/pokemon/base_stats/pigeon.inc diff --git a/data/pokemon/base_stats/pigeot.asm b/data/pokemon/base_stats/pigeot.inc similarity index 100% rename from data/pokemon/base_stats/pigeot.asm rename to data/pokemon/base_stats/pigeot.inc diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.inc similarity index 100% rename from data/pokemon/base_stats/pikachu.asm rename to data/pokemon/base_stats/pikachu.inc diff --git a/data/pokemon/base_stats/pippi.asm b/data/pokemon/base_stats/pippi.inc similarity index 100% rename from data/pokemon/base_stats/pippi.asm rename to data/pokemon/base_stats/pippi.inc diff --git a/data/pokemon/base_stats/pixy.asm b/data/pokemon/base_stats/pixy.inc similarity index 100% rename from data/pokemon/base_stats/pixy.asm rename to data/pokemon/base_stats/pixy.inc diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.inc similarity index 100% rename from data/pokemon/base_stats/ponyta.asm rename to data/pokemon/base_stats/ponyta.inc diff --git a/data/pokemon/base_stats/poponeko.asm b/data/pokemon/base_stats/poponeko.inc similarity index 100% rename from data/pokemon/base_stats/poponeko.asm rename to data/pokemon/base_stats/poponeko.inc diff --git a/data/pokemon/base_stats/poppo.asm b/data/pokemon/base_stats/poppo.inc similarity index 100% rename from data/pokemon/base_stats/poppo.asm rename to data/pokemon/base_stats/poppo.inc diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.inc similarity index 100% rename from data/pokemon/base_stats/porygon.asm rename to data/pokemon/base_stats/porygon.inc diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.inc similarity index 100% rename from data/pokemon/base_stats/porygon2.asm rename to data/pokemon/base_stats/porygon2.inc diff --git a/data/pokemon/base_stats/ptera.asm b/data/pokemon/base_stats/ptera.inc similarity index 100% rename from data/pokemon/base_stats/ptera.asm rename to data/pokemon/base_stats/ptera.inc diff --git a/data/pokemon/base_stats/puchicorn.asm b/data/pokemon/base_stats/puchicorn.inc similarity index 100% rename from data/pokemon/base_stats/puchicorn.asm rename to data/pokemon/base_stats/puchicorn.inc diff --git a/data/pokemon/base_stats/pudie.asm b/data/pokemon/base_stats/pudie.inc similarity index 100% rename from data/pokemon/base_stats/pudie.asm rename to data/pokemon/base_stats/pudie.inc diff --git a/data/pokemon/base_stats/puku.asm b/data/pokemon/base_stats/puku.inc similarity index 100% rename from data/pokemon/base_stats/puku.asm rename to data/pokemon/base_stats/puku.inc diff --git a/data/pokemon/base_stats/pukurin.asm b/data/pokemon/base_stats/pukurin.inc similarity index 100% rename from data/pokemon/base_stats/pukurin.asm rename to data/pokemon/base_stats/pukurin.inc diff --git a/data/pokemon/base_stats/pupurin.asm b/data/pokemon/base_stats/pupurin.inc similarity index 100% rename from data/pokemon/base_stats/pupurin.asm rename to data/pokemon/base_stats/pupurin.inc diff --git a/data/pokemon/base_stats/purakkusu.asm b/data/pokemon/base_stats/purakkusu.inc similarity index 100% rename from data/pokemon/base_stats/purakkusu.asm rename to data/pokemon/base_stats/purakkusu.inc diff --git a/data/pokemon/base_stats/purin.asm b/data/pokemon/base_stats/purin.inc similarity index 100% rename from data/pokemon/base_stats/purin.asm rename to data/pokemon/base_stats/purin.inc diff --git a/data/pokemon/base_stats/py.asm b/data/pokemon/base_stats/py.inc similarity index 100% rename from data/pokemon/base_stats/py.asm rename to data/pokemon/base_stats/py.inc diff --git a/data/pokemon/base_stats/rai.asm b/data/pokemon/base_stats/rai.inc similarity index 100% rename from data/pokemon/base_stats/rai.asm rename to data/pokemon/base_stats/rai.inc diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.inc similarity index 100% rename from data/pokemon/base_stats/raichu.asm rename to data/pokemon/base_stats/raichu.inc diff --git a/data/pokemon/base_stats/raitora.asm b/data/pokemon/base_stats/raitora.inc similarity index 100% rename from data/pokemon/base_stats/raitora.asm rename to data/pokemon/base_stats/raitora.inc diff --git a/data/pokemon/base_stats/rarecoil.asm b/data/pokemon/base_stats/rarecoil.inc similarity index 100% rename from data/pokemon/base_stats/rarecoil.asm rename to data/pokemon/base_stats/rarecoil.inc diff --git a/data/pokemon/base_stats/ratta.asm b/data/pokemon/base_stats/ratta.inc similarity index 100% rename from data/pokemon/base_stats/ratta.asm rename to data/pokemon/base_stats/ratta.inc diff --git a/data/pokemon/base_stats/rediba.asm b/data/pokemon/base_stats/rediba.inc similarity index 100% rename from data/pokemon/base_stats/rediba.asm rename to data/pokemon/base_stats/rediba.inc diff --git a/data/pokemon/base_stats/rinrin.asm b/data/pokemon/base_stats/rinrin.inc similarity index 100% rename from data/pokemon/base_stats/rinrin.asm rename to data/pokemon/base_stats/rinrin.inc diff --git a/data/pokemon/base_stats/rokon.asm b/data/pokemon/base_stats/rokon.inc similarity index 100% rename from data/pokemon/base_stats/rokon.asm rename to data/pokemon/base_stats/rokon.inc diff --git a/data/pokemon/base_stats/rougela.asm b/data/pokemon/base_stats/rougela.inc similarity index 100% rename from data/pokemon/base_stats/rougela.asm rename to data/pokemon/base_stats/rougela.inc diff --git a/data/pokemon/base_stats/ruffresia.asm b/data/pokemon/base_stats/ruffresia.inc similarity index 100% rename from data/pokemon/base_stats/ruffresia.asm rename to data/pokemon/base_stats/ruffresia.inc diff --git a/data/pokemon/base_stats/sand.asm b/data/pokemon/base_stats/sand.inc similarity index 100% rename from data/pokemon/base_stats/sand.asm rename to data/pokemon/base_stats/sand.inc diff --git a/data/pokemon/base_stats/sandpan.asm b/data/pokemon/base_stats/sandpan.inc similarity index 100% rename from data/pokemon/base_stats/sandpan.asm rename to data/pokemon/base_stats/sandpan.inc diff --git a/data/pokemon/base_stats/sawamular.asm b/data/pokemon/base_stats/sawamular.inc similarity index 100% rename from data/pokemon/base_stats/sawamular.asm rename to data/pokemon/base_stats/sawamular.inc diff --git a/data/pokemon/base_stats/scissors.asm b/data/pokemon/base_stats/scissors.inc similarity index 100% rename from data/pokemon/base_stats/scissors.asm rename to data/pokemon/base_stats/scissors.inc diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.inc similarity index 100% rename from data/pokemon/base_stats/seadra.asm rename to data/pokemon/base_stats/seadra.inc diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.inc similarity index 100% rename from data/pokemon/base_stats/shellder.asm rename to data/pokemon/base_stats/shellder.inc diff --git a/data/pokemon/base_stats/shibirefugu.asm b/data/pokemon/base_stats/shibirefugu.inc similarity index 100% rename from data/pokemon/base_stats/shibirefugu.asm rename to data/pokemon/base_stats/shibirefugu.inc diff --git a/data/pokemon/base_stats/showers.asm b/data/pokemon/base_stats/showers.inc similarity index 100% rename from data/pokemon/base_stats/showers.asm rename to data/pokemon/base_stats/showers.inc diff --git a/data/pokemon/base_stats/sidon.asm b/data/pokemon/base_stats/sidon.inc similarity index 100% rename from data/pokemon/base_stats/sidon.asm rename to data/pokemon/base_stats/sidon.inc diff --git a/data/pokemon/base_stats/sihorn.asm b/data/pokemon/base_stats/sihorn.inc similarity index 100% rename from data/pokemon/base_stats/sihorn.asm rename to data/pokemon/base_stats/sihorn.inc diff --git a/data/pokemon/base_stats/sleepe.asm b/data/pokemon/base_stats/sleepe.inc similarity index 100% rename from data/pokemon/base_stats/sleepe.asm rename to data/pokemon/base_stats/sleepe.inc diff --git a/data/pokemon/base_stats/sleeper.asm b/data/pokemon/base_stats/sleeper.inc similarity index 100% rename from data/pokemon/base_stats/sleeper.asm rename to data/pokemon/base_stats/sleeper.inc diff --git a/data/pokemon/base_stats/spear.asm b/data/pokemon/base_stats/spear.inc similarity index 100% rename from data/pokemon/base_stats/spear.asm rename to data/pokemon/base_stats/spear.inc diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.inc similarity index 100% rename from data/pokemon/base_stats/starmie.asm rename to data/pokemon/base_stats/starmie.inc diff --git a/data/pokemon/base_stats/strike.asm b/data/pokemon/base_stats/strike.inc similarity index 100% rename from data/pokemon/base_stats/strike.asm rename to data/pokemon/base_stats/strike.inc diff --git a/data/pokemon/base_stats/sui.asm b/data/pokemon/base_stats/sui.inc similarity index 100% rename from data/pokemon/base_stats/sui.asm rename to data/pokemon/base_stats/sui.inc diff --git a/data/pokemon/base_stats/sunny.asm b/data/pokemon/base_stats/sunny.inc similarity index 100% rename from data/pokemon/base_stats/sunny.asm rename to data/pokemon/base_stats/sunny.inc diff --git a/data/pokemon/base_stats/tail.asm b/data/pokemon/base_stats/tail.inc similarity index 100% rename from data/pokemon/base_stats/tail.asm rename to data/pokemon/base_stats/tail.inc diff --git a/data/pokemon/base_stats/tamatama.asm b/data/pokemon/base_stats/tamatama.inc similarity index 100% rename from data/pokemon/base_stats/tamatama.asm rename to data/pokemon/base_stats/tamatama.inc diff --git a/data/pokemon/base_stats/tattu.asm b/data/pokemon/base_stats/tattu.inc similarity index 100% rename from data/pokemon/base_stats/tattu.asm rename to data/pokemon/base_stats/tattu.inc diff --git a/data/pokemon/base_stats/teppouo.asm b/data/pokemon/base_stats/teppouo.inc similarity index 100% rename from data/pokemon/base_stats/teppouo.asm rename to data/pokemon/base_stats/teppouo.inc diff --git a/data/pokemon/base_stats/thunder.asm b/data/pokemon/base_stats/thunder.inc similarity index 100% rename from data/pokemon/base_stats/thunder.asm rename to data/pokemon/base_stats/thunder.inc diff --git a/data/pokemon/base_stats/thunders.asm b/data/pokemon/base_stats/thunders.inc similarity index 100% rename from data/pokemon/base_stats/thunders.asm rename to data/pokemon/base_stats/thunders.inc diff --git a/data/pokemon/base_stats/togepy.asm b/data/pokemon/base_stats/togepy.inc similarity index 100% rename from data/pokemon/base_stats/togepy.asm rename to data/pokemon/base_stats/togepy.inc diff --git a/data/pokemon/base_stats/tosakinto.asm b/data/pokemon/base_stats/tosakinto.inc similarity index 100% rename from data/pokemon/base_stats/tosakinto.asm rename to data/pokemon/base_stats/tosakinto.inc diff --git a/data/pokemon/base_stats/transel.asm b/data/pokemon/base_stats/transel.inc similarity index 100% rename from data/pokemon/base_stats/transel.asm rename to data/pokemon/base_stats/transel.inc diff --git a/data/pokemon/base_stats/tsubomitto.asm b/data/pokemon/base_stats/tsubomitto.inc similarity index 100% rename from data/pokemon/base_stats/tsubomitto.asm rename to data/pokemon/base_stats/tsubomitto.inc diff --git a/data/pokemon/base_stats/turban.asm b/data/pokemon/base_stats/turban.inc similarity index 100% rename from data/pokemon/base_stats/turban.asm rename to data/pokemon/base_stats/turban.inc diff --git a/data/pokemon/base_stats/twinz.asm b/data/pokemon/base_stats/twinz.inc similarity index 100% rename from data/pokemon/base_stats/twinz.asm rename to data/pokemon/base_stats/twinz.inc diff --git a/data/pokemon/base_stats/twohead.asm b/data/pokemon/base_stats/twohead.inc similarity index 100% rename from data/pokemon/base_stats/twohead.asm rename to data/pokemon/base_stats/twohead.inc diff --git a/data/pokemon/base_stats/utsubot.asm b/data/pokemon/base_stats/utsubot.inc similarity index 100% rename from data/pokemon/base_stats/utsubot.asm rename to data/pokemon/base_stats/utsubot.inc diff --git a/data/pokemon/base_stats/utsudon.asm b/data/pokemon/base_stats/utsudon.inc similarity index 100% rename from data/pokemon/base_stats/utsudon.asm rename to data/pokemon/base_stats/utsudon.inc diff --git a/data/pokemon/base_stats/volbear.asm b/data/pokemon/base_stats/volbear.inc similarity index 100% rename from data/pokemon/base_stats/volbear.asm rename to data/pokemon/base_stats/volbear.inc diff --git a/data/pokemon/base_stats/wanriky.asm b/data/pokemon/base_stats/wanriky.inc similarity index 100% rename from data/pokemon/base_stats/wanriky.asm rename to data/pokemon/base_stats/wanriky.inc diff --git a/data/pokemon/base_stats/warwolf.asm b/data/pokemon/base_stats/warwolf.inc similarity index 100% rename from data/pokemon/base_stats/warwolf.asm rename to data/pokemon/base_stats/warwolf.inc diff --git a/data/pokemon/base_stats/wataneko.asm b/data/pokemon/base_stats/wataneko.inc similarity index 100% rename from data/pokemon/base_stats/wataneko.asm rename to data/pokemon/base_stats/wataneko.inc diff --git a/data/pokemon/base_stats/windie.asm b/data/pokemon/base_stats/windie.inc similarity index 100% rename from data/pokemon/base_stats/windie.asm rename to data/pokemon/base_stats/windie.inc diff --git a/data/pokemon/base_stats/wolfman.asm b/data/pokemon/base_stats/wolfman.inc similarity index 100% rename from data/pokemon/base_stats/wolfman.asm rename to data/pokemon/base_stats/wolfman.inc diff --git a/data/pokemon/base_stats/yadoking.asm b/data/pokemon/base_stats/yadoking.inc similarity index 100% rename from data/pokemon/base_stats/yadoking.asm rename to data/pokemon/base_stats/yadoking.inc diff --git a/data/pokemon/base_stats/yadon.asm b/data/pokemon/base_stats/yadon.inc similarity index 100% rename from data/pokemon/base_stats/yadon.asm rename to data/pokemon/base_stats/yadon.inc diff --git a/data/pokemon/base_stats/yadoran.asm b/data/pokemon/base_stats/yadoran.inc similarity index 100% rename from data/pokemon/base_stats/yadoran.asm rename to data/pokemon/base_stats/yadoran.inc diff --git a/data/pokemon/base_stats/yamikarasu.asm b/data/pokemon/base_stats/yamikarasu.inc similarity index 100% rename from data/pokemon/base_stats/yamikarasu.asm rename to data/pokemon/base_stats/yamikarasu.inc diff --git a/data/pokemon/base_stats/yoroidori.asm b/data/pokemon/base_stats/yoroidori.inc similarity index 100% rename from data/pokemon/base_stats/yoroidori.asm rename to data/pokemon/base_stats/yoroidori.inc diff --git a/data/pokemon/base_stats/yungerer.asm b/data/pokemon/base_stats/yungerer.inc similarity index 100% rename from data/pokemon/base_stats/yungerer.asm rename to data/pokemon/base_stats/yungerer.inc diff --git a/data/pokemon/base_stats/zenigame.asm b/data/pokemon/base_stats/zenigame.inc similarity index 100% rename from data/pokemon/base_stats/zenigame.asm rename to data/pokemon/base_stats/zenigame.inc diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.inc similarity index 100% rename from data/pokemon/base_stats/zubat.asm rename to data/pokemon/base_stats/zubat.inc diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 3f7b5f6..1e6a6b5 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -1,3 +1,7 @@ +INCLUDE "constants.asm" + +SECTION "Alphabetical Pokedex Order", ROMX[$4943], BANK[$10] + ; Every Pokémon sorted alphabetically by name (gojūon order). AlphabeticalPokedexOrder: ; 0x40943 diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm index d662dce..e78a5d0 100644 --- a/data/pokemon/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -1,3 +1,7 @@ +INCLUDE "constants.asm" + +SECTION "Evolutions and Attacks", ROMX[$6493], BANK[$10] + ; Evolutions for Pokémon available in the demo were removed, ; and have been left in comments. @@ -5,7 +9,7 @@ ; so its data is corrupt. (See EievuiEvosAttacks.) -INCLUDE "data/pokemon/evos_attacks_pointers.asm" +INCLUDE "data/pokemon/evos_attacks_pointers.inc" EvosAttacks:: diff --git a/data/pokemon/evos_attacks_pointers.asm b/data/pokemon/evos_attacks_pointers.inc similarity index 100% rename from data/pokemon/evos_attacks_pointers.asm rename to data/pokemon/evos_attacks_pointers.inc diff --git a/data/predef_pointers.asm b/data/predef_pointers.inc similarity index 100% rename from data/predef_pointers.asm rename to data/predef_pointers.inc diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index a004938..5425b91 100644 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -1,3 +1,7 @@ +INCLUDE "constants.asm" + +SECTION "Tileset Headers", ROMX[$488D], BANK[$03] + Tileset_00: ; 0xc88d db $06 ; bank dw $4400 ; blocks diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm index 284876d..4fdbed0 100644 --- a/data/trainers/class_names.asm +++ b/data/trainers/class_names.asm @@ -1,3 +1,7 @@ +INCLUDE "constants.asm" + +SECTION "TrainerClassNames", ROMX[$4D90], BANK[$0E] + TrainerClassNames:: ; 38d90 db "ハヤト@" db "アカネ@" diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 74b1129..c3861cf 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + ; Trainer data structure: ; - db "NAME@", TRAINERTYPE_* constant ; - 1 to 6 Pokémon: @@ -10,9 +12,6 @@ ; TODO: decode data from the beginning -SECTION "TrainerGroups", ROMX[$5110],BANK[$E] -INCLUDE "data/trainers/party_pointers.asm" - SECTION "HayatoGroup", ROMX[$518A],BANK[$E] HayatoGroup:: diff --git a/data/trainers/party_pointers.asm b/data/trainers/party_pointers.asm index a23b165..f410435 100644 --- a/data/trainers/party_pointers.asm +++ b/data/trainers/party_pointers.asm @@ -1,3 +1,5 @@ +SECTION "TrainerGroups", ROMX[$5110],BANK[$E] + TrainerGroups: ; 0x039110 dw HayatoGroup dw AkaneGroup diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm index 170072b..a965da0 100644 --- a/data/types/type_matchups.asm +++ b/data/types/type_matchups.asm @@ -1,3 +1,7 @@ +INCLUDE "constants.asm" + +SECTION "Type Matchups", ROMX[$506D], BANK[$0D] + TypeMatchups: ; 3506d ; attacker, defender, *= db TYPE_NORMAL, TYPE_ROCK, NOT_VERY_EFFECTIVE diff --git a/engine/link/place_waiting_text.asm b/engine/link/place_waiting_text.asm index 2688322..c617dec 100644 --- a/engine/link/place_waiting_text.asm +++ b/engine/link/place_waiting_text.asm @@ -1,3 +1,7 @@ +INCLUDE "constants.asm" + +SECTION "PlaceWaitingText", ROMX[$4000], BANK[$01] + PlaceWaitingText:: ; 1:4000 hlcoord 3, 10 ld b, 1 diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm new file mode 100644 index 0000000..5701eba --- /dev/null +++ b/engine/menu/main_menu.asm @@ -0,0 +1,25 @@ +INCLUDE "constants.asm" + +SECTION "Main Menu Definition", ROMX[$5418], BANK[$01] + +MainMenuHeader: + db $40 + db 0, 0, 7, 13 + dw .data + db 1 ; default option + +.data + db $80 + db 0 ; number of options + + dw $5461 + db $8a, $1f + dw MainMenuStrings + +MainMenuStrings: ; 01:5428 + db "つづきから　はじめる@" + db "さいしょから　はじめる@" + db "せっていを　かえる@" + db "#を　あそぶ@" + db "じかんセット@" +; 01:5457 diff --git a/engine/predef.asm b/engine/predef.asm index 3c60faa..8210266 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -1,3 +1,7 @@ +INCLUDE "constants.asm" + +SECTION "Predef pointers", ROMX[$62B0], BANK[$01] + GetPredefPointer:: ; 1:62b0 ld a, h ld [wPredefHL], a @@ -25,4 +29,4 @@ GetPredefPointer:: ; 1:62b0 ld d, [hl] ret -INCLUDE "data/predef_pointers.asm" +INCLUDE "data/predef_pointers.inc" diff --git a/engine/title.asm b/engine/title.asm index cd4e194..2ddaa44 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -1,3 +1,7 @@ +INCLUDE "constants.asm" + +SECTION "Title screen", ROMX[$5D8C], BANK[$01] + IntroSequence:: ; 5d8c ; TODO diff --git a/main.asm b/gfx.asm similarity index 86% rename from main.asm rename to gfx.asm index b6f3200..8101db4 100644 --- a/main.asm +++ b/gfx.asm @@ -1,46 +1,11 @@ INCLUDE "constants.asm" -SECTION "PlaceWaitingText", ROMX[$4000],BANK[$01] -INCLUDE "engine/link/place_waiting_text.asm" - -SECTION "Title screen", ROMX[$5D8C],BANK[$01] -INCLUDE "engine/title.asm" - SECTION "Title Screen Sprites", ROMX[$5EB8], BANK[$01] TitleFireGFX:: INCBIN "gfx/title/fire.2bpp" TitleNotesGFX:: INCBIN "gfx/title/notes.2bpp" -SECTION "Predef pointers", ROMX[$62B0],BANK[$01] -INCLUDE "engine/predef.asm" - -SECTION "Main Menu Definition", ROMX[$5418], BANK[$01] -MainMenuHeader: - db $40 - db 0, 0, 7, 13 - dw .data - db 1 ; default option - -.data - db $80 - db 0 ; number of options - - dw $5461 - db $8a, $1f - dw MainMenuStrings - -MainMenuStrings: ; 01:5428 - db "つづきから　はじめる@" - db "さいしょから　はじめる@" - db "せっていを　かえる@" - db "#を　あそぶ@" - db "じかんセット@" -; 01:5457 - -SECTION "ItemNames", ROMX[$6FEC],BANK[$01] -INCLUDE "data/items/names.asm" - SECTION "Mon Nest Icon", ROMX[$4A0F], BANK[$02] PokedexNestIconGFX:: INCBIN "gfx/pokegear/dexmap_nest_icon.1bpp" @@ -68,9 +33,6 @@ SECTION "SGB Border GFX", ROMX[$6B1C], BANK[$02] SGBBorderGFX:: INCBIN "gfx/sgb/sgb_border.2bpp" -SECTION "Tileset Headers", ROMX[$488D], BANK[$03] -INCLUDE "data/tileset_headers.asm" - SECTION "Title Screen GFX", ROMX[$47CF], BANK[$04] TitleScreenGFX:: INCBIN "gfx/title/title.2bpp" @@ -79,9 +41,6 @@ SECTION "Mail Icon GFX", ROMX[$5BB1], BANK[$04] MailIconGFX:: INCBIN "gfx/icons/mail.2bpp" -SECTION "TM/HM Moves", ROMX[$52D1],BANK[$04] -INCLUDE "data/moves/tmhm_moves.asm" - SECTION "Trainer Card GFX", ROMX[$7171], BANK[$04] TrainerCardGFX:: INCBIN "gfx/trainer_card/trainer_card.2bpp" @@ -172,23 +131,6 @@ SECTION "Bank C Tilesets 0c", ROMX[$7100], BANK[$0C] Tileset_0c_GFX: INCBIN "gfx/tilesets/tileset_0c.2bpp" -SECTION "Type Matchups", ROMX[$506D],BANK[$0D] -INCLUDE "data/types/type_matchups.asm" - -SECTION "TrainerClassNames", ROMX[$4D90],BANK[$0E] -INCLUDE "data/trainers/class_names.asm" - -INCLUDE "data/trainers/parties.asm" - -SECTION "Alphabetical Pokedex Order", ROMX[$4943],BANK[$10] -INCLUDE "data/pokemon/dex_order_alpha.asm" - -SECTION "MoveNames", ROMX[$52A1],BANK[$10] -INCLUDE "data/moves/names.asm" - -SECTION "Evolutions and Attacks", ROMX[$6493],BANK[$10] -INCLUDE "data/pokemon/evos_attacks.asm" - SECTION "Pokedex GFX", ROMX[$40D5], BANK[$11] PokedexButtonsGFX:: INCBIN "gfx/pokedex/buttons.2bpp" @@ -215,9 +157,6 @@ SECTION "Bank 13 Tilesets 1a", ROMX[$6900], BANK[$13] Tileset_1a_GFX: INCBIN "gfx/tilesets/tileset_1a.2bpp" -SECTION "Base Data", ROMX[$4F10],BANK[$14] -INCLUDE "data/pokemon/base_stats.asm" - SECTION "PKMN Sprite Bank List", ROMX[$725C], BANK[$14] INCLUDE "gfx/pokemon/pkmn_pic_banks.asm" diff --git a/gfx/battle/hp_exp_bar_border.png b/gfx/battle/hp_exp_bar_border.1bpp.png similarity index 100% rename from gfx/battle/hp_exp_bar_border.png rename to gfx/battle/hp_exp_bar_border.1bpp.png diff --git a/gfx/font/alphabet.png b/gfx/font/alphabet.1bpp.png similarity index 100% rename from gfx/font/alphabet.png rename to gfx/font/alphabet.1bpp.png diff --git a/gfx/font/annon_alphabet.png b/gfx/font/annon_alphabet.1bpp.png similarity index 100% rename from gfx/font/annon_alphabet.png rename to gfx/font/annon_alphabet.1bpp.png diff --git a/gfx/font/font.png b/gfx/font/font.1bpp.png similarity index 100% rename from gfx/font/font.png rename to gfx/font/font.1bpp.png diff --git a/gfx/font/gfx_f9322.png b/gfx/font/gfx_f9322.1bpp.png similarity index 100% rename from gfx/font/gfx_f9322.png rename to gfx/font/gfx_f9322.1bpp.png diff --git a/gfx/frames/1.png b/gfx/frames/1.1bpp.png similarity index 100% rename from gfx/frames/1.png rename to gfx/frames/1.1bpp.png diff --git a/gfx/frames/2.png b/gfx/frames/2.1bpp.png similarity index 100% rename from gfx/frames/2.png rename to gfx/frames/2.1bpp.png diff --git a/gfx/frames/3.png b/gfx/frames/3.1bpp.png similarity index 100% rename from gfx/frames/3.png rename to gfx/frames/3.1bpp.png diff --git a/gfx/frames/4.png b/gfx/frames/4.1bpp.png similarity index 100% rename from gfx/frames/4.png rename to gfx/frames/4.1bpp.png diff --git a/gfx/frames/5.png b/gfx/frames/5.1bpp.png similarity index 100% rename from gfx/frames/5.png rename to gfx/frames/5.1bpp.png diff --git a/gfx/frames/6.png b/gfx/frames/6.1bpp.png similarity index 100% rename from gfx/frames/6.png rename to gfx/frames/6.1bpp.png diff --git a/gfx/frames/7.png b/gfx/frames/7.1bpp.png similarity index 100% rename from gfx/frames/7.png rename to gfx/frames/7.1bpp.png diff --git a/gfx/frames/8.png b/gfx/frames/8.1bpp.png similarity index 100% rename from gfx/frames/8.png rename to gfx/frames/8.1bpp.png diff --git a/gfx/frames/9.png b/gfx/frames/9.1bpp.png similarity index 100% rename from gfx/frames/9.png rename to gfx/frames/9.1bpp.png diff --git a/gfx/pokegear/dexmap_nest_icon.png b/gfx/pokegear/dexmap_nest_icon.1bpp.png similarity index 100% rename from gfx/pokegear/dexmap_nest_icon.png rename to gfx/pokegear/dexmap_nest_icon.1bpp.png diff --git a/gfx/splash/game_freak_logo.png b/gfx/splash/game_freak_logo.1bpp.png similarity index 100% rename from gfx/splash/game_freak_logo.png rename to gfx/splash/game_freak_logo.1bpp.png diff --git a/home/audio.asm b/home/audio.asm index cc0c0f9..a983bf3 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + SECTION "Audio interface", ROM0[$3CBF] DisableAudio:: ; 3cbf diff --git a/home/bankswitch.asm b/home/bankswitch.asm index 67fae1a..b8549bc 100644 --- a/home/bankswitch.asm +++ b/home/bankswitch.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + SECTION "Bankswitch", ROM0[$32C2] ; Moved to a rst vector in final US releases (not sure about JP) diff --git a/home/clear_sprites.asm b/home/clear_sprites.asm index 64f8706..c6ac3aa 100644 --- a/home/clear_sprites.asm +++ b/home/clear_sprites.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + SECTION "Sprite clearing", ROM0[$32DC] ClearSprites:: ; 32dc diff --git a/home/copy.asm b/home/copy.asm index ce66daf..ab0205f 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + SECTION "Copy functions", ROM0[$32F7] FarCopyBytes:: ; 32f7 diff --git a/home/copy_tilemap.asm b/home/copy_tilemap.asm index 950bb24..fceef45 100644 --- a/home/copy_tilemap.asm +++ b/home/copy_tilemap.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + SECTION "Tilemap copy/restore funcs", ROM0[$3355] BackUpTilesToBuffer:: ; 3355 diff --git a/home/farcall.asm b/home/farcall.asm index 68f8ab0..f7a97d0 100644 --- a/home/farcall.asm +++ b/home/farcall.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + SECTION "Farcall", ROM0[$2FA8] FarCall_hl:: ; 2fa8 diff --git a/home/init.asm b/home/init.asm index 2fc2105..0a31e69 100644 --- a/home/init.asm +++ b/home/init.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + SECTION "Entry point", ROM0[$100] nop jp Init diff --git a/home/interrupts.asm b/home/interrupts.asm index 91610e0..b7800f1 100644 --- a/home/interrupts.asm +++ b/home/interrupts.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + SECTION "VBlank interrupt vector", ROM0[$040] jp VBlank @@ -23,4 +25,4 @@ TimerDummy: ; 042a SECTION "Joypad dummy interrupt", ROM0[$7F7] JoypadDummy: ; 07f7 - reti \ No newline at end of file + reti diff --git a/home/lcd.asm b/home/lcd.asm index 1b23545..6641f05 100644 --- a/home/lcd.asm +++ b/home/lcd.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + SECTION "LCD functions", ROM0[$3AE] LCD:: ; 03ae diff --git a/home/oam_dma.asm b/home/oam_dma.asm index 1737456..d76df89 100644 --- a/home/oam_dma.asm +++ b/home/oam_dma.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + SECTION "OAM DMA", ROMX[$4153],BANK[1] WriteOAMDMACodeToHRAM:: ; 4153 diff --git a/home/predef.asm b/home/predef.asm index 53af045..69620ce 100644 --- a/home/predef.asm +++ b/home/predef.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + SECTION "Predef", ROM0[$2FDE] Predef:: ; 2fde diff --git a/home/serial.asm b/home/serial.asm index be747b8..61510b0 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + SECTION "Serial handler", ROM0[$602] Serial:: diff --git a/home/sram.asm b/home/sram.asm index c204b9b..5f9cfe2 100644 --- a/home/sram.asm +++ b/home/sram.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + SECTION "SRAM functions", ROM0[$32A7] OpenSRAM:: ; 32a7 diff --git a/home.asm b/home/unknown.asm similarity index 61% rename from home.asm rename to home/unknown.asm index 53df26e..e2046e3 100644 --- a/home.asm +++ b/home/unknown.asm @@ -1,13 +1,5 @@ INCLUDE "constants.asm" - -INCLUDE "home/rst.asm" -INCLUDE "home/interrupts.asm" -INCLUDE "home/init.asm" -INCLUDE "home/vblank.asm" -INCLUDE "home/lcd.asm" -INCLUDE "home/serial.asm" - SECTION "Empty function", ROM0[$2F97] InexplicablyEmptyFunction:: ; 2f97 @@ -16,16 +8,6 @@ REPT 16 ENDR ret -INCLUDE "home/farcall.asm" -INCLUDE "home/predef.asm" -INCLUDE "home/sram.asm" -INCLUDE "home/bankswitch.asm" -INCLUDE "home/clear_sprites.asm" -INCLUDE "home/copy.asm" -INCLUDE "home/copy_tilemap.asm" -INCLUDE "home/audio.asm" -INCLUDE "home/oam_dma.asm" - ; TODO: ; 1. Figure out what these are. Might be related to RTC, like ClearRTCStatus and the ilk. diff --git a/home/vblank.asm b/home/vblank.asm index efa7196..334cef4 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -1,3 +1,5 @@ +INCLUDE "constants.asm" + SECTION "VBlank handler", ROM0[$150] VBlank:: ; 0150 diff --git a/tools/Makefile b/tools/Makefile index accee0f..8a9a284 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,6 +1,5 @@ .PHONY: all clean -CC := gcc CFLAGS := -O3 -std=c99 -Wall -Wextra tools := \ @@ -9,11 +8,6 @@ tools := \ gfx all: $(tools) - @: clean: rm -f $(tools) - -%: %.c - $(CC) $(CFLAGS) -o $@ $< -